diff --git a/.arcignore b/.arcignore
deleted file mode 100644
index cd917b06fb7..00000000000
--- a/.arcignore
+++ /dev/null
@@ -1,12 +0,0 @@
-# .arcignore is the same as .gitignore but for Arc VCS.
-# Arc VCS is a proprietary VCS in Yandex that is very similar to Git
-# from the user perspective but with the following differences:
-# 1. Data is stored in distributed object storage.
-# 2. Local copy works via FUSE without downloading all the objects.
-# For this reason, it is better suited for huge monorepositories that can be found in large companies (e.g. Yandex, Google).
-# As ClickHouse developers, we don't use Arc as a VCS (we use Git).
-# But the ClickHouse source code is also mirrored into internal monorepository and our collegues are using Arc.
-# You can read more about Arc here: https://habr.com/en/company/yandex/blog/482926/
-
-# Repository is synchronized without 3rd-party submodules.
-contrib
diff --git a/.clang-tidy b/.clang-tidy
index b0971418e0e..ecb8ac6dcbf 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -203,3 +203,5 @@ CheckOptions:
     value: CamelCase
   - key: readability-identifier-naming.UsingCase
     value: CamelCase
+  - key: modernize-loop-convert.UseCxx20ReverseRanges
+    value: false
diff --git a/.github/ISSUE_TEMPLATE/40_bug-report.md b/.github/ISSUE_TEMPLATE/85_bug-report.md
similarity index 91%
rename from .github/ISSUE_TEMPLATE/40_bug-report.md
rename to .github/ISSUE_TEMPLATE/85_bug-report.md
index d62ec578f8d..87a2d877e30 100644
--- a/.github/ISSUE_TEMPLATE/40_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/85_bug-report.md
@@ -1,15 +1,15 @@
 ---
 name: Bug report
-about: Create a report to help us improve ClickHouse
+about: Wrong behaviour (visible to users) in official ClickHouse release.
 title: ''
-labels: bug
+labels: 'potential bug'
 assignees: ''
 
 ---
 
 > You have to provide the following information whenever possible.
 
-**Describe the bug**
+**Describe what's wrong**
 
 > A clear and concise description of what works not as it is supposed to.
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d3fac8670e8..82a16d0589f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,7 @@
-I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
-
 Changelog category (leave one):
 - New Feature
 - Improvement
-- Bug Fix
+- Bug Fix (user-visible misbehaviour in official stable or prestable release)
 - Performance Improvement
 - Backward Incompatible Change
 - Build/Testing/Packaging Improvement
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
new file mode 100644
index 00000000000..03e1007b841
--- /dev/null
+++ b/.github/workflows/cancel.yml
@@ -0,0 +1,13 @@
+name: Cancel
+on: # yamllint disable-line rule:truthy
+  workflow_run:
+    workflows: ["CIGithubActions"]
+    types:
+      - requested
+jobs:
+  cancel:
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          workflow_id: ${{ github.event.workflow.id }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000000..69dc2e94e15
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,210 @@
+name: CIGithubActions
+on: # yamllint disable-line rule:truthy
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - reopened
+      - opened
+    branches:
+      - master
+jobs:
+  CheckLabels:
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Labels check
+        run: |
+          cd $GITHUB_WORKSPACE/tests/ci
+          python3 run_check.py
+  DockerHubPush:
+    needs: CheckLabels
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'pr-documentation') && !contains(github.event.pull_request.labels.*.name, 'pr-doc-fix') }}
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Images check
+        run: |
+          cd $GITHUB_WORKSPACE/tests/ci
+          python3 docker_images_check.py
+      - name: Upload images files to artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: changed_images
+          path: ${{ runner.temp }}/docker_images_check/changed_images.json
+  StyleCheck:
+    needs: DockerHubPush
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Download changed images
+        uses: actions/download-artifact@v2
+        with:
+          name: changed_images
+          path: ${{ runner.temp }}/style_check
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Style Check
+        env:
+          TEMP_PATH: ${{ runner.temp }}/style_check
+        run: |
+          cd $GITHUB_WORKSPACE/tests/ci
+          python3 style_check.py
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          sudo rm -fr $TEMP_PATH
+  BuilderDebDebug:
+    needs: DockerHubPush
+    runs-on: [self-hosted, builder]
+    steps:
+      - name: Download changed images
+        uses: actions/download-artifact@v2
+        with:
+          name: changed_images
+          path: ${{ runner.temp }}/images_path
+      - name: Check out repository code
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+          fetch-depth: 0 # otherwise we will have no info about contributors
+      - name: Build
+        env:
+          TEMP_PATH: ${{runner.temp}}/build_check
+          IMAGES_PATH: ${{runner.temp}}/images_path
+          REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
+          CACHES_PATH: ${{runner.temp}}/../ccaches
+          CHECK_NAME: 'ClickHouse build check (actions)'
+          BUILD_NUMBER: 7
+        run: |
+          sudo rm -fr $TEMP_PATH
+          mkdir -p $TEMP_PATH
+          cp -r $GITHUB_WORKSPACE $TEMP_PATH
+          cd $REPO_COPY/tests/ci && python3 build_check.py "$CHECK_NAME" $BUILD_NUMBER
+      - name: Upload build URLs to artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.BUILD_NAME }}
+          path: ${{ runner.temp }}/build_check/${{ env.BUILD_NAME }}.json
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          sudo rm -fr $TEMP_PATH
+  BuilderReport:
+    needs: [BuilderDebDebug]
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{runner.temp}}/reports_dir
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Report Builder
+        env:
+          TEMP_PATH: ${{runner.temp}}/report_check
+          REPORTS_PATH: ${{runner.temp}}/reports_dir
+          CHECK_NAME: 'ClickHouse build check (actions)'
+        run: |
+          sudo rm -fr $TEMP_PATH
+          mkdir -p $TEMP_PATH
+          cd $GITHUB_WORKSPACE/tests/ci
+          python3 build_report_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          sudo rm -fr $TEMP_PATH
+  FunctionalStatelessTestDebug:
+    needs: [BuilderDebDebug]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{runner.temp}}/reports_dir
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Functional test
+        env:
+          TEMP_PATH: ${{runner.temp}}/stateless_debug
+          REPORTS_PATH: ${{runner.temp}}/reports_dir
+          CHECK_NAME: 'Stateless tests (debug, actions)'
+          REPO_COPY: ${{runner.temp}}/stateless_debug/ClickHouse
+          REQUIRED_BUILD_NUMBER: 7
+          KILL_TIMEOUT: 10800
+        run: |
+          sudo rm -fr $TEMP_PATH
+          mkdir -p $TEMP_PATH
+          cp -r $GITHUB_WORKSPACE $TEMP_PATH
+          cd $REPO_COPY/tests/ci
+          python3 functional_test_check.py "$CHECK_NAME" $REQUIRED_BUILD_NUMBER $KILL_TIMEOUT
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          sudo rm -fr $TEMP_PATH
+  FunctionalStatefulTestDebug:
+    needs: [BuilderDebDebug]
+    runs-on: [self-hosted, func-tester]
+    steps:
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{runner.temp}}/reports_dir
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Functional test
+        env:
+          TEMP_PATH: ${{runner.temp}}/stateful_debug
+          REPORTS_PATH: ${{runner.temp}}/reports_dir
+          CHECK_NAME: 'Stateful tests (debug, actions)'
+          REPO_COPY: ${{runner.temp}}/stateful_debug/ClickHouse
+          REQUIRED_BUILD_NUMBER: 7
+          KILL_TIMEOUT: 3600
+        run: |
+          sudo rm -fr $TEMP_PATH
+          mkdir -p $TEMP_PATH
+          cp -r $GITHUB_WORKSPACE $TEMP_PATH
+          cd $REPO_COPY/tests/ci
+          python3 functional_test_check.py "$CHECK_NAME" $REQUIRED_BUILD_NUMBER $KILL_TIMEOUT
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          sudo rm -fr $TEMP_PATH
+  FastTest:
+    needs: DockerHubPush
+    runs-on: [self-hosted, builder]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Fast Test
+        env:
+          TEMP_PATH: ${{runner.temp}}/fasttest
+          REPO_COPY: ${{runner.temp}}/fasttest/ClickHouse
+          CACHES_PATH: ${{runner.temp}}/../ccaches
+        run: |
+          sudo rm -fr $TEMP_PATH
+          mkdir -p $TEMP_PATH
+          cp -r $GITHUB_WORKSPACE $TEMP_PATH
+          cd $REPO_COPY/tests/ci && python3 fast_test_check.py
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          sudo rm -fr $TEMP_PATH
+  FinishCheck:
+    needs: [StyleCheck, DockerHubPush, CheckLabels, BuilderReport, FastTest, FunctionalStatelessTestDebug, FunctionalStatefulTestDebug]
+    runs-on: [self-hosted, style-checker]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Finish label
+        run: |
+          cd $GITHUB_WORKSPACE/tests/ci
+          python3 finish_check.py
diff --git a/.gitignore b/.gitignore
index a469ff7bca1..0bf31508419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,9 @@
 /docs/ja/single.md
 /docs/fa/single.md
 /docs/en/development/cmake-in-clickhouse.md
+/docs/ja/development/cmake-in-clickhouse.md
+/docs/zh/development/cmake-in-clickhouse.md
+/docs/ru/development/cmake-in-clickhouse.md
 
 # callgrind files
 callgrind.out.*
diff --git a/.gitmodules b/.gitmodules
index 43c878427ec..e0404c1269d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -140,7 +140,7 @@
 	url = https://github.com/ClickHouse-Extras/libc-headers.git
 [submodule "contrib/replxx"]
 	path = contrib/replxx
-	url = https://github.com/ClickHouse-Extras/replxx.git
+	url = https://github.com/AmokHuginnsson/replxx.git
 [submodule "contrib/avro"]
 	path = contrib/avro
 	url = https://github.com/ClickHouse-Extras/avro.git
@@ -213,6 +213,7 @@
 [submodule "contrib/boringssl"]
 	path = contrib/boringssl
 	url = https://github.com/ClickHouse-Extras/boringssl.git
+	branch = MergeWithUpstream
 [submodule "contrib/NuRaft"]
 	path = contrib/NuRaft
 	url = https://github.com/ClickHouse-Extras/NuRaft.git
@@ -243,3 +244,15 @@
 [submodule "contrib/s2geometry"]
 	path = contrib/s2geometry
 	url = https://github.com/ClickHouse-Extras/s2geometry.git
+[submodule "contrib/bzip2"]
+	path = contrib/bzip2
+	url = https://github.com/ClickHouse-Extras/bzip2.git
+[submodule "contrib/magic_enum"]
+	path = contrib/magic_enum
+	url = https://github.com/Neargye/magic_enum
+[submodule "contrib/libprotobuf-mutator"]
+	path = contrib/libprotobuf-mutator
+	url = https://github.com/google/libprotobuf-mutator
+[submodule "contrib/sysroot"]
+	path = contrib/sysroot
+	url = https://github.com/ClickHouse-Extras/sysroot.git
diff --git a/AUTHORS b/AUTHORS
index 12838d7fa14..1d2e5adc523 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-To see the list of authors who created the source code of ClickHouse, published and distributed by YANDEX LLC as the owner,
+To see the list of authors who created the source code of ClickHouse, published and distributed by ClickHouse, Inc. as the owner,
 run "SELECT * FROM system.contributors;" query on any ClickHouse server.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34d11c6a2cd..adaaa0f1bc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,416 @@
+### ClickHouse release v21.10, 2021-10-16
+
+#### Backward Incompatible Change
+
+* Now the following MergeTree table-level settings: `replicated_max_parallel_sends`, `replicated_max_parallel_sends_for_table`, `replicated_max_parallel_fetches`, `replicated_max_parallel_fetches_for_table` do nothing. They never worked well and were replaced with `max_replicated_fetches_network_bandwidth`, `max_replicated_sends_network_bandwidth` and `background_fetches_pool_size`. [#28404](https://github.com/ClickHouse/ClickHouse/pull/28404) ([alesapin](https://github.com/alesapin)).
+
+#### New Feature
+
+* Add feature for creating user-defined functions (UDF) as lambda expressions. Syntax `CREATE FUNCTION {function_name} as ({parameters}) -> {function core}`. Example `CREATE FUNCTION plus_one as (a) -> a + 1`. Authors @Realist007. [#27796](https://github.com/ClickHouse/ClickHouse/pull/27796) ([Maksim Kita](https://github.com/kitaisreal)) [#23978](https://github.com/ClickHouse/ClickHouse/pull/23978) ([Realist007](https://github.com/Realist007)).
+* Added `Executable` storage engine and `executable` table function. It enables data processing with external scripts in streaming fashion. [#28102](https://github.com/ClickHouse/ClickHouse/pull/28102) ([Maksim Kita](https://github.com/kitaisreal)) ([ruct](https://github.com/ruct)).
+* Added `ExecutablePool` storage engine. Similar to `Executable` but it's using a pool of long running processes. [#28518](https://github.com/ClickHouse/ClickHouse/pull/28518) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add `ALTER TABLE ... MATERIALIZE COLUMN` query. [#27038](https://github.com/ClickHouse/ClickHouse/pull/27038) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Support for partitioned write into `s3` table function. [#23051](https://github.com/ClickHouse/ClickHouse/pull/23051) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Support `lz4` compression format (in addition to `gz`, `bz2`, `xz`, `zstd`) for data import / export. [#25310](https://github.com/ClickHouse/ClickHouse/pull/25310) ([Bharat Nallan](https://github.com/bharatnc)).
+* Allow positional arguments under setting `enable_positional_arguments`. Closes [#2592](https://github.com/ClickHouse/ClickHouse/issues/2592). [#27530](https://github.com/ClickHouse/ClickHouse/pull/27530) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Accept user settings related to file formats in `SETTINGS` clause in `CREATE` query for s3 tables. This closes [#27580](https://github.com/ClickHouse/ClickHouse/issues/27580). [#28037](https://github.com/ClickHouse/ClickHouse/pull/28037) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow SSL connection for `RabbitMQ` engine. [#28365](https://github.com/ClickHouse/ClickHouse/pull/28365) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add `getServerPort` function to allow getting server port. When the port is not used by the server, throw an exception. [#27900](https://github.com/ClickHouse/ClickHouse/pull/27900) ([Amos Bird](https://github.com/amosbird)).
+* Add conversion functions between "snowflake id" and `DateTime`, `DateTime64`. See [#27058](https://github.com/ClickHouse/ClickHouse/issues/27058). [#27704](https://github.com/ClickHouse/ClickHouse/pull/27704) ([jasine](https://github.com/jasine)).
+* Add function `SHA512`. [#27830](https://github.com/ClickHouse/ClickHouse/pull/27830) ([zhanglistar](https://github.com/zhanglistar)).
+* Add `log_queries_probability` setting that allows user to write to query_log only a sample of queries. Closes [#16609](https://github.com/ClickHouse/ClickHouse/issues/16609). [#27527](https://github.com/ClickHouse/ClickHouse/pull/27527) ([Nikolay Degterinsky](https://github.com/evillique)).
+
+#### Experimental Feature
+
+* `web` type of disks to store readonly tables on web server in form of static files. See [#23982](https://github.com/ClickHouse/ClickHouse/issues/23982). [#25251](https://github.com/ClickHouse/ClickHouse/pull/25251) ([Kseniia Sumarokova](https://github.com/kssenii)). This is mostly needed to faciliate testing of operation on shared storage and for easy importing of datasets. Not recommended to use before release 21.11.
+* Added new commands `BACKUP` and `RESTORE`. [#21945](https://github.com/ClickHouse/ClickHouse/pull/21945) ([Vitaly Baranov](https://github.com/vitlibar)). This is under development and not intended to be used in current version.
+
+#### Performance Improvement
+
+* Speed up `sumIf` and `countIf` aggregation functions. [#28272](https://github.com/ClickHouse/ClickHouse/pull/28272) ([Raúl Marín](https://github.com/Algunenano)).
+* Create virtual projection for `minmax` indices. Now, when `allow_experimental_projection_optimization` is enabled, queries will use minmax index instead of reading the data when possible. [#26286](https://github.com/ClickHouse/ClickHouse/pull/26286) ([Amos Bird](https://github.com/amosbird)).
+* Introducing two checks in `sequenceMatch` and `sequenceCount` that allow for early exit when some deterministic part of the sequence pattern is missing from the events list. This change unlocks many queries that would previously fail due to reaching operations cap, and generally speeds up the pipeline. [#27729](https://github.com/ClickHouse/ClickHouse/pull/27729) ([Jakub Kuklis](https://github.com/jkuklis)).
+* Enhance primary key analysis with always monotonic information of binary functions, notably non-zero constant division. [#28302](https://github.com/ClickHouse/ClickHouse/pull/28302) ([Amos Bird](https://github.com/amosbird)).
+* Make `hasAll` filter condition leverage bloom filter data-skipping indexes. [#27984](https://github.com/ClickHouse/ClickHouse/pull/27984) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
+* Speed up data parts loading by delaying table startup process. [#28313](https://github.com/ClickHouse/ClickHouse/pull/28313) ([Amos Bird](https://github.com/amosbird)).
+* Fixed possible excessive number of conditions moved from `WHERE` to `PREWHERE` (optimization controlled by settings `optimize_move_to_prewhere`). [#28139](https://github.com/ClickHouse/ClickHouse/pull/28139) ([lthaooo](https://github.com/lthaooo)).
+* Enable `optimize_distributed_group_by_sharding_key` by default. [#28105](https://github.com/ClickHouse/ClickHouse/pull/28105) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Improvement
+
+* Check cluster name before creating `Distributed` table, do not allow to create a table with incorrect cluster name. Fixes [#27832](https://github.com/ClickHouse/ClickHouse/issues/27832). [#27927](https://github.com/ClickHouse/ClickHouse/pull/27927) ([tavplubix](https://github.com/tavplubix)).
+* Add aggregate function `quantileBFloat16Weighted` similarly to other quantile...Weighted functions. This closes [#27745](https://github.com/ClickHouse/ClickHouse/issues/27745). [#27758](https://github.com/ClickHouse/ClickHouse/pull/27758) ([Ivan Novitskiy](https://github.com/RedClusive)).
+* Allow to create dictionaries with empty attributes list. [#27905](https://github.com/ClickHouse/ClickHouse/pull/27905) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add interactive documentation in `clickhouse-client` about how to reset the password. This is useful in scenario when user has installed ClickHouse, set up the password and instantly forget it. See [#27750](https://github.com/ClickHouse/ClickHouse/issues/27750). [#27903](https://github.com/ClickHouse/ClickHouse/pull/27903) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Support the case when the data is enclosed in array in `JSONAsString` input format. Closes [#25517](https://github.com/ClickHouse/ClickHouse/issues/25517). [#25633](https://github.com/ClickHouse/ClickHouse/pull/25633) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add new column `last_queue_update_exception` to `system.replicas` table. [#26843](https://github.com/ClickHouse/ClickHouse/pull/26843) ([nvartolomei](https://github.com/nvartolomei)).
+* Support reconnections on failover for `MaterializedPostgreSQL` tables. Closes [#28529](https://github.com/ClickHouse/ClickHouse/issues/28529). [#28614](https://github.com/ClickHouse/ClickHouse/pull/28614) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Generate a unique server UUID on first server start. [#20089](https://github.com/ClickHouse/ClickHouse/pull/20089) ([Bharat Nallan](https://github.com/bharatnc)).
+* Introduce `connection_wait_timeout` (default to 5 seconds, 0 - do not wait) setting for `MySQL` engine. [#28474](https://github.com/ClickHouse/ClickHouse/pull/28474) ([Azat Khuzhin](https://github.com/azat)).
+* Do not allow creating `MaterializedPostgreSQL` with bad arguments. Closes [#28423](https://github.com/ClickHouse/ClickHouse/issues/28423). [#28430](https://github.com/ClickHouse/ClickHouse/pull/28430) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Use real tmp file instead of predefined "rows_sources" for vertical merges. This avoids generating garbage directories in tmp disks. [#28299](https://github.com/ClickHouse/ClickHouse/pull/28299) ([Amos Bird](https://github.com/amosbird)).
+* Added `libhdfs3_conf` in server config instead of export env `LIBHDFS3_CONF` in clickhouse-server.service. This is for configuration of interaction with HDFS. [#28268](https://github.com/ClickHouse/ClickHouse/pull/28268) ([Zhichang Yu](https://github.com/yuzhichang)).
+* Fix removing of parts in a Temporary state which can lead to an unexpected exception (`Part %name% doesn't exist`). Fixes [#23661](https://github.com/ClickHouse/ClickHouse/issues/23661). [#28221](https://github.com/ClickHouse/ClickHouse/pull/28221) [#28221](https://github.com/ClickHouse/ClickHouse/issues/28221)) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `zookeeper_log.address` (before the first patch in this PR the address was always `::`) and reduce number of calls `getpeername(2)` for this column (since each time entry for `zookeeper_log` is added `getpeername()` is called, cache this address in the zookeeper client to avoid this). [#28212](https://github.com/ClickHouse/ClickHouse/pull/28212) ([Azat Khuzhin](https://github.com/azat)).
+* Support implicit conversions between index in operator `[]` and key of type `Map` (e.g. different `Int` types, `String` and `FixedString`). [#28096](https://github.com/ClickHouse/ClickHouse/pull/28096) ([Anton Popov](https://github.com/CurtizJ)).
+* Support `ON CONFLICT` clause when inserting into PostgreSQL table engine or table function. Closes [#27727](https://github.com/ClickHouse/ClickHouse/issues/27727). [#28081](https://github.com/ClickHouse/ClickHouse/pull/28081) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Lower restrictions for `Enum` data type to allow attaching compatible data. Closes [#26672](https://github.com/ClickHouse/ClickHouse/issues/26672). [#28028](https://github.com/ClickHouse/ClickHouse/pull/28028) ([Dmitry Novik](https://github.com/novikd)).
+* Add a setting `empty_result_for_aggregation_by_constant_keys_on_empty_set` to control the behavior of grouping by constant keys on empty set. This is to bring back the old baviour of [#6842](https://github.com/ClickHouse/ClickHouse/issues/6842). [#27932](https://github.com/ClickHouse/ClickHouse/pull/27932) ([Amos Bird](https://github.com/amosbird)).
+* Added `replication_wait_for_inactive_replica_timeout` setting. It allows to specify how long to wait for inactive replicas to execute `ALTER`/`OPTIMZE`/`TRUNCATE` query (default is 120 seconds). If `replication_alter_partitions_sync` is 2 and some replicas are not active for more than `replication_wait_for_inactive_replica_timeout` seconds, then `UNFINISHED` will be thrown. [#27931](https://github.com/ClickHouse/ClickHouse/pull/27931) ([tavplubix](https://github.com/tavplubix)).
+* Support lambda argument for `APPLY` column transformer which allows applying functions with more than one argument. This is for [#27877](https://github.com/ClickHouse/ClickHouse/issues/27877). [#27901](https://github.com/ClickHouse/ClickHouse/pull/27901) ([Amos Bird](https://github.com/amosbird)).
+* Enable `tcp_keep_alive_timeout` by default. [#27882](https://github.com/ClickHouse/ClickHouse/pull/27882) ([Azat Khuzhin](https://github.com/azat)).
+* Improve remote query cancelation (in case of remote server abnormaly terminated). [#27881](https://github.com/ClickHouse/ClickHouse/pull/27881) ([Azat Khuzhin](https://github.com/azat)).
+* Use Multipart copy upload for large S3 objects. [#27858](https://github.com/ClickHouse/ClickHouse/pull/27858) ([ianton-ru](https://github.com/ianton-ru)).
+* Allow symlink traversal for library dictionaty path. [#27815](https://github.com/ClickHouse/ClickHouse/pull/27815) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Now `ALTER MODIFY COLUM` `T` to `Nullable(T)` doesn't require mutation. [#27787](https://github.com/ClickHouse/ClickHouse/pull/27787) ([victorgao](https://github.com/kafka1991)).
+* Don't silently ignore errors and don't count delays in `ReadBufferFromS3`. [#27484](https://github.com/ClickHouse/ClickHouse/pull/27484) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Improve `ALTER ... MATERIALIZE TTL` by recalculating metadata only without actual TTL action. [#27019](https://github.com/ClickHouse/ClickHouse/pull/27019) ([lthaooo](https://github.com/lthaooo)).
+* Allow reading the list of custom top level domains without a new line at EOF. [#28213](https://github.com/ClickHouse/ClickHouse/pull/28213) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Bug Fix
+
+* Fix cases, when reading compressed data from `carbon-clickhouse` fails with 'attempt to read after end of file'. Closes [#26149](https://github.com/ClickHouse/ClickHouse/issues/26149). [#28150](https://github.com/ClickHouse/ClickHouse/pull/28150) ([FArthur-cmd](https://github.com/FArthur-cmd)).
+* Fix checking access grants when executing `GRANT WITH REPLACE` statement with `ON CLUSTER` clause. This PR improves fix [#27001](https://github.com/ClickHouse/ClickHouse/pull/27701). [#27983](https://github.com/ClickHouse/ClickHouse/pull/27983) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Allow selecting with `extremes = 1` from a column of the type `LowCardinality(UUID)`. [#27918](https://github.com/ClickHouse/ClickHouse/pull/27918) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix PostgreSQL-style cast (`::` operator) with negative numbers. [#27876](https://github.com/ClickHouse/ClickHouse/pull/27876) ([Anton Popov](https://github.com/CurtizJ)).
+* After [#26864](https://github.com/ClickHouse/ClickHouse/pull/26864). Fix shutdown of `NamedSessionStorage`: session contexts stored in `NamedSessionStorage` are now destroyed before destroying the global context. [#27875](https://github.com/ClickHouse/ClickHouse/pull/27875) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Bugfix for `windowFunnel` "strict" mode. This fixes [#27469](https://github.com/ClickHouse/ClickHouse/issues/27469). [#27563](https://github.com/ClickHouse/ClickHouse/pull/27563) ([achimbab](https://github.com/achimbab)).
+* Fix infinite loop while reading truncated `bzip2` archive. [#28543](https://github.com/ClickHouse/ClickHouse/pull/28543) ([Azat Khuzhin](https://github.com/azat)).
+* Fix UUID overlap in `DROP TABLE` for internal DDL from `MaterializedMySQL`. MaterializedMySQL is an experimental feature. [#28533](https://github.com/ClickHouse/ClickHouse/pull/28533) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `There is no subcolumn` error, while select from tables, which have `Nested` columns and scalar columns with dot in name and the same prefix as `Nested` (e.g. `n.id UInt32, n.arr1 Array(UInt64), n.arr2 Array(UInt64)`). [#28531](https://github.com/ClickHouse/ClickHouse/pull/28531) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bug which can lead to error `Existing table metadata in ZooKeeper differs in sorting key expression.` after ALTER of `ReplicatedVersionedCollapsingMergeTree`. Fixes [#28515](https://github.com/ClickHouse/ClickHouse/issues/28515). [#28528](https://github.com/ClickHouse/ClickHouse/pull/28528) ([alesapin](https://github.com/alesapin)).
+* Fixed possible ZooKeeper watches leak (minor issue) on background processing of distributed DDL queue. Closes [#26036](https://github.com/ClickHouse/ClickHouse/issues/26036). [#28446](https://github.com/ClickHouse/ClickHouse/pull/28446) ([tavplubix](https://github.com/tavplubix)).
+* Fix missing quoting of table names in `MaterializedPostgreSQL` engine. Closes [#28316](https://github.com/ClickHouse/ClickHouse/issues/28316). [#28433](https://github.com/ClickHouse/ClickHouse/pull/28433) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix the wrong behaviour of non joined rows from nullable column. Close [#27691](https://github.com/ClickHouse/ClickHouse/issues/27691). [#28349](https://github.com/ClickHouse/ClickHouse/pull/28349) ([vdimir](https://github.com/vdimir)).
+* Fix NOT-IN index optimization when not all key columns are used. This fixes [#28120](https://github.com/ClickHouse/ClickHouse/issues/28120). [#28315](https://github.com/ClickHouse/ClickHouse/pull/28315) ([Amos Bird](https://github.com/amosbird)).
+* Fix intersecting parts due to new part had been replaced with an empty part. [#28310](https://github.com/ClickHouse/ClickHouse/pull/28310) ([Azat Khuzhin](https://github.com/azat)).
+* Fix inconsistent result in queries with `ORDER BY` and `Merge` tables with enabled setting `optimize_read_in_order`. [#28266](https://github.com/ClickHouse/ClickHouse/pull/28266) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible read of uninitialized memory for queries with `Nullable(LowCardinality)` type and the setting `extremes` set to 1. Fixes [#28165](https://github.com/ClickHouse/ClickHouse/issues/28165). [#28205](https://github.com/ClickHouse/ClickHouse/pull/28205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Multiple small fixes for projections. See detailed description in the PR. [#28178](https://github.com/ClickHouse/ClickHouse/pull/28178) ([Amos Bird](https://github.com/amosbird)).
+* Fix extremely rare segfaults on shutdown due to incorrect order of context/config reloader shutdown. [#28088](https://github.com/ClickHouse/ClickHouse/pull/28088) ([nvartolomei](https://github.com/nvartolomei)).
+* Fix handling null value with type of `Nullable(String)` in function `JSONExtract`. This fixes [#27929](https://github.com/ClickHouse/ClickHouse/issues/27929) and [#27930](https://github.com/ClickHouse/ClickHouse/issues/27930). This was introduced in https://github.com/ClickHouse/ClickHouse/pull/25452 . [#27939](https://github.com/ClickHouse/ClickHouse/pull/27939) ([Amos Bird](https://github.com/amosbird)).
+* Multiple fixes for the new `clickhouse-keeper` tool. Fix a rare bug in `clickhouse-keeper` when the client can receive a watch response before request-response. [#28197](https://github.com/ClickHouse/ClickHouse/pull/28197) ([alesapin](https://github.com/alesapin)). Fix incorrect behavior in `clickhouse-keeper` when list watches (`getChildren`) triggered with `set` requests for children. [#28190](https://github.com/ClickHouse/ClickHouse/pull/28190) ([alesapin](https://github.com/alesapin)). Fix rare case when changes of `clickhouse-keeper` settings may lead to lost logs and server hung. [#28360](https://github.com/ClickHouse/ClickHouse/pull/28360) ([alesapin](https://github.com/alesapin)). Fix bug in `clickhouse-keeper` which can lead to endless logs when `rotate_logs_interval` decreased. [#28152](https://github.com/ClickHouse/ClickHouse/pull/28152) ([alesapin](https://github.com/alesapin)).
+
+#### Build/Testing/Packaging Improvement
+
+* Enable Thread Fuzzer in Stress Test. Thread Fuzzer is ClickHouse feature that allows to test more permutations of thread scheduling and discover more potential issues. This closes [#9813](https://github.com/ClickHouse/ClickHouse/issues/9813). This closes [#9814](https://github.com/ClickHouse/ClickHouse/issues/9814). This closes [#9515](https://github.com/ClickHouse/ClickHouse/issues/9515). This closes [#9516](https://github.com/ClickHouse/ClickHouse/issues/9516). [#27538](https://github.com/ClickHouse/ClickHouse/pull/27538) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add new log level `test` for testing environments. It is even more verbose than the default `trace`. [#28559](https://github.com/ClickHouse/ClickHouse/pull/28559) ([alesapin](https://github.com/alesapin)).
+* Print out git status information at CMake configure stage. [#28047](https://github.com/ClickHouse/ClickHouse/pull/28047) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
+* Temporarily switched ubuntu apt repository to mirror ru.archive.ubuntu.com as the default one (archive.ubuntu.com) is not responding from our CI. [#28016](https://github.com/ClickHouse/ClickHouse/pull/28016) ([Ilya Yatsishin](https://github.com/qoega)).
+
+
+
+### ClickHouse release v21.9, 2021-09-09
+
+#### Backward Incompatible Change
+
+* Do not output trailing zeros in text representation of `Decimal` types. Example: `1.23` will be printed instead of `1.230000` for decimal with scale 6. This closes [#15794](https://github.com/ClickHouse/ClickHouse/issues/15794). It may introduce slight incompatibility if your applications somehow relied on the trailing zeros. Serialization in output formats can be controlled with the setting `output_format_decimal_trailing_zeros`. Implementation of `toString` and casting to String is changed unconditionally. [#27680](https://github.com/ClickHouse/ClickHouse/pull/27680) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Do not allow to apply parametric aggregate function with `-Merge` combinator to aggregate function state if state was produced by aggregate function with different parameters. For example, state of `fooState(42)(x)` cannot be finalized with `fooMerge(s)` or `fooMerge(123)(s)`, parameters must be specified explicitly like `fooMerge(42)(s)` and must be equal. It does not affect some special aggregate functions like `quantile` and `sequence*` that use parameters for finalization only. [#26847](https://github.com/ClickHouse/ClickHouse/pull/26847) ([tavplubix](https://github.com/tavplubix)).
+* Under clickhouse-local, always treat local addresses with a port as remote. [#26736](https://github.com/ClickHouse/ClickHouse/pull/26736) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix the issue that in case of some sophisticated query with column aliases identical to the names of expressions, bad cast may happen. This fixes [#25447](https://github.com/ClickHouse/ClickHouse/issues/25447). This fixes [#26914](https://github.com/ClickHouse/ClickHouse/issues/26914). This fix may introduce backward incompatibility: if there are different expressions with identical names, exception will be thrown. It may break some rare cases when `enable_optimize_predicate_expression` is set. [#26639](https://github.com/ClickHouse/ClickHouse/pull/26639) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Now, scalar subquery always returns `Nullable` result if it's type can be `Nullable`. It is needed because in case of empty subquery it's result should be `Null`. Previously, it was possible to get error about incompatible types (type deduction does not execute scalar subquery, and it could use not-nullable type). Scalar subquery with empty result which can't be converted to `Nullable` (like `Array` or `Tuple`) now throws error. Fixes [#25411](https://github.com/ClickHouse/ClickHouse/issues/25411). [#26423](https://github.com/ClickHouse/ClickHouse/pull/26423) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Introduce syntax for here documents. Example `SELECT $doc$ VALUE $doc$`. [#26671](https://github.com/ClickHouse/ClickHouse/pull/26671) ([Maksim Kita](https://github.com/kitaisreal)). This change is backward incompatible if in query there are identifiers that contain `$` [#28768](https://github.com/ClickHouse/ClickHouse/issues/28768).
+* Now indices can handle Nullable types, including `isNull` and `isNotNull`. [#12433](https://github.com/ClickHouse/ClickHouse/pull/12433) and [#12455](https://github.com/ClickHouse/ClickHouse/pull/12455) ([Amos Bird](https://github.com/amosbird)) and [#27250](https://github.com/ClickHouse/ClickHouse/pull/27250) ([Azat Khuzhin](https://github.com/azat)). But this was done with on-disk format changes, and even though new server can read old data, old server cannot. Also, in case you have `MINMAX` data skipping indices, you may get `Data after mutation/merge is not byte-identical` error, since new index will have `.idx2` extension while before it was `.idx`. That said, that you should not delay updating all existing replicas, in this case, otherwise, if old replica (<21.9) will download data from new replica with 21.9+ it will not be able to apply index for downloaded part.
+
+#### New Feature
+
+* Implementation of short circuit function evaluation, closes [#12587](https://github.com/ClickHouse/ClickHouse/issues/12587). Add settings `short_circuit_function_evaluation` to configure short circuit function evaluation. [#23367](https://github.com/ClickHouse/ClickHouse/pull/23367) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for INTERSECT, EXCEPT, ANY, ALL operators. [#24757](https://github.com/ClickHouse/ClickHouse/pull/24757) ([Kirill Ershov](https://github.com/zdikov)). ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add support for encryption at the virtual file system level (data encryption at rest) using AES-CTR algorithm. [#24206](https://github.com/ClickHouse/ClickHouse/pull/24206) ([Latysheva Alexandra](https://github.com/alexelex)). ([Vitaly Baranov](https://github.com/vitlibar)) [#26733](https://github.com/ClickHouse/ClickHouse/pull/26733) [#26377](https://github.com/ClickHouse/ClickHouse/pull/26377) [#26465](https://github.com/ClickHouse/ClickHouse/pull/26465).
+* Added natural language processing (NLP) functions for tokenization, stemming, lemmatizing and search in synonyms extensions. [#24997](https://github.com/ClickHouse/ClickHouse/pull/24997) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added integration with S2 geometry library. [#24980](https://github.com/ClickHouse/ClickHouse/pull/24980) ([Andr0901](https://github.com/Andr0901)). ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add SQLite table engine, table function, database engine. [#24194](https://github.com/ClickHouse/ClickHouse/pull/24194) ([Arslan Gumerov](https://github.com/g-arslan)). ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Added support for custom query for `MySQL`, `PostgreSQL`, `ClickHouse`, `JDBC`, `Cassandra` dictionary source. Closes [#1270](https://github.com/ClickHouse/ClickHouse/issues/1270). [#26995](https://github.com/ClickHouse/ClickHouse/pull/26995) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add shared (replicated) storage of user, roles, row policies, quotas and settings profiles through ZooKeeper. [#27426](https://github.com/ClickHouse/ClickHouse/pull/27426) ([Kevin Michel](https://github.com/kmichel-aiven)).
+* Add compression for `INTO OUTFILE` that automatically choose compression algorithm. Closes [#3473](https://github.com/ClickHouse/ClickHouse/issues/3473). [#27134](https://github.com/ClickHouse/ClickHouse/pull/27134) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Add `INSERT ... FROM INFILE` similarly to `SELECT ... INTO OUTFILE`. [#27655](https://github.com/ClickHouse/ClickHouse/pull/27655) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Added `complex_key_range_hashed` dictionary. Closes [#22029](https://github.com/ClickHouse/ClickHouse/issues/22029). [#27629](https://github.com/ClickHouse/ClickHouse/pull/27629) ([Maksim Kita](https://github.com/kitaisreal)).
+* Support expressions in JOIN ON section. Close [#21868](https://github.com/ClickHouse/ClickHouse/issues/21868). [#24420](https://github.com/ClickHouse/ClickHouse/pull/24420) ([Vladimir C](https://github.com/vdimir)).
+* When client connects to server, it receives information about all warnings that are already were collected by server. (It can be disabled by using option `--no-warnings`). Add `system.warnings` table to collect warnings about server configuration. [#26246](https://github.com/ClickHouse/ClickHouse/pull/26246) ([Filatenkov Artur](https://github.com/FArthur-cmd)). [#26282](https://github.com/ClickHouse/ClickHouse/pull/26282) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Allow using constant expressions from with and select in aggregate function parameters. Close [#10945](https://github.com/ClickHouse/ClickHouse/issues/10945). [#27531](https://github.com/ClickHouse/ClickHouse/pull/27531) ([abel-cheng](https://github.com/abel-cheng)).
+* Add `tupleToNameValuePairs`, a function that turns a named tuple into an array of pairs. [#27505](https://github.com/ClickHouse/ClickHouse/pull/27505) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
+* Add support for `bzip2` compression method for import/export. Closes [#22428](https://github.com/ClickHouse/ClickHouse/issues/22428). [#27377](https://github.com/ClickHouse/ClickHouse/pull/27377) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Added `bitmapSubsetOffsetLimit(bitmap, offset, cardinality_limit)` function. It creates a subset of bitmap limit the results to `cardinality_limit` with offset of `offset`. [#27234](https://github.com/ClickHouse/ClickHouse/pull/27234) ([DHBin](https://github.com/DHBin)).
+* Add column `default_database` to `system.users`. [#27054](https://github.com/ClickHouse/ClickHouse/pull/27054) ([kevin wan](https://github.com/MaxWk)).
+* Supported `cluster` macros inside table functions 'cluster' and 'clusterAllReplicas'. [#26913](https://github.com/ClickHouse/ClickHouse/pull/26913) ([polyprogrammist](https://github.com/PolyProgrammist)).
+* Add new functions `currentRoles()`, `enabledRoles()`, `defaultRoles()`. [#26780](https://github.com/ClickHouse/ClickHouse/pull/26780) ([Vitaly Baranov](https://github.com/vitlibar)).
+* New functions `currentProfiles()`, `enabledProfiles()`, `defaultProfiles()`. [#26714](https://github.com/ClickHouse/ClickHouse/pull/26714) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add functions that return (initial_)query_id of the current query. This closes [#23682](https://github.com/ClickHouse/ClickHouse/issues/23682). [#26410](https://github.com/ClickHouse/ClickHouse/pull/26410) ([Alexey Boykov](https://github.com/mathalex)).
+* Add `REPLACE GRANT` feature. [#26384](https://github.com/ClickHouse/ClickHouse/pull/26384) ([Caspian](https://github.com/Cas-pian)).
+* `EXPLAIN` query now has `EXPLAIN ESTIMATE ...` mode that will show information about read rows, marks and parts from MergeTree tables. Closes [#23941](https://github.com/ClickHouse/ClickHouse/issues/23941). [#26131](https://github.com/ClickHouse/ClickHouse/pull/26131) ([fastio](https://github.com/fastio)).
+* Added `system.zookeeper_log` table. All actions of ZooKeeper client are logged into this table. Implements [#25449](https://github.com/ClickHouse/ClickHouse/issues/25449). [#26129](https://github.com/ClickHouse/ClickHouse/pull/26129) ([tavplubix](https://github.com/tavplubix)).
+* Zero-copy replication for `ReplicatedMergeTree` over `HDFS` storage. [#25918](https://github.com/ClickHouse/ClickHouse/pull/25918) ([Zhichang Yu](https://github.com/yuzhichang)).
+* Allow to insert Nested type as array of structs in `Arrow`, `ORC` and `Parquet` input format. [#25902](https://github.com/ClickHouse/ClickHouse/pull/25902) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add a new datatype `Date32` (store data as Int32), support date range same with `DateTime64` support load parquet date32 to ClickHouse `Date32` Add new function `toDate32` like `toDate`. [#25774](https://github.com/ClickHouse/ClickHouse/pull/25774) ([LiuNeng](https://github.com/liuneng1994)).
+* Allow setting default database for users. [#25268](https://github.com/ClickHouse/ClickHouse/issues/25268). [#25687](https://github.com/ClickHouse/ClickHouse/pull/25687) ([kevin wan](https://github.com/MaxWk)).
+* Add an optional parameter to `MongoDB` engine to accept connection string options and support SSL connection. Closes [#21189](https://github.com/ClickHouse/ClickHouse/issues/21189). Closes [#21041](https://github.com/ClickHouse/ClickHouse/issues/21041). [#22045](https://github.com/ClickHouse/ClickHouse/pull/22045) ([Omar Bazaraa](https://github.com/OmarBazaraa)).
+
+#### Experimental Feature
+
+* Added a compression codec `AES_128_GCM_SIV` which encrypts columns instead of compressing them. [#19896](https://github.com/ClickHouse/ClickHouse/pull/19896) ([PHO](https://github.com/depressed-pho)). Will be rewritten, do not use.
+* Rename `MaterializeMySQL` to `MaterializedMySQL`. [#26822](https://github.com/ClickHouse/ClickHouse/pull/26822) ([tavplubix](https://github.com/tavplubix)).
+
+#### Performance Improvement
+
+* Improve the performance of fast queries when `max_execution_time = 0` by reducing the number of `clock_gettime` system calls. [#27325](https://github.com/ClickHouse/ClickHouse/pull/27325) ([filimonov](https://github.com/filimonov)).
+* Specialize date time related comparison to achieve better performance. This fixes [#27083](https://github.com/ClickHouse/ClickHouse/issues/27083) . [#27122](https://github.com/ClickHouse/ClickHouse/pull/27122) ([Amos Bird](https://github.com/amosbird)).
+* Share file descriptors in concurrent reads of the same files. There is no noticeable performance difference on Linux. But the number of opened files will be significantly (10..100 times) lower on typical servers and it makes operations easier. See [#26214](https://github.com/ClickHouse/ClickHouse/issues/26214). [#26768](https://github.com/ClickHouse/ClickHouse/pull/26768) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve latency of short queries, that require reading from tables with large number of columns. [#26371](https://github.com/ClickHouse/ClickHouse/pull/26371) ([Anton Popov](https://github.com/CurtizJ)).
+* Don't build sets for indices when analyzing a query. [#26365](https://github.com/ClickHouse/ClickHouse/pull/26365) ([Raúl Marín](https://github.com/Algunenano)).
+* Vectorize the SUM of Nullable integer types with native representation ([David Manzanares](https://github.com/davidmanzanares), [Raúl Marín](https://github.com/Algunenano)). [#26248](https://github.com/ClickHouse/ClickHouse/pull/26248) ([Raúl Marín](https://github.com/Algunenano)).
+* Compile expressions involving columns with `Enum` types. [#26237](https://github.com/ClickHouse/ClickHouse/pull/26237) ([Maksim Kita](https://github.com/kitaisreal)).
+* Compile aggregate functions `groupBitOr`, `groupBitAnd`, `groupBitXor`. [#26161](https://github.com/ClickHouse/ClickHouse/pull/26161) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improved memory usage with better block size prediction when reading empty DEFAULT columns. Closes [#17317](https://github.com/ClickHouse/ClickHouse/issues/17317). [#25917](https://github.com/ClickHouse/ClickHouse/pull/25917) ([Vladimir Chebotarev](https://github.com/excitoon)).
+* Reduce memory usage and number of read rows in queries with `ORDER BY primary_key`. [#25721](https://github.com/ClickHouse/ClickHouse/pull/25721) ([Anton Popov](https://github.com/CurtizJ)).
+* Enable `distributed_push_down_limit` by default. [#27104](https://github.com/ClickHouse/ClickHouse/pull/27104) ([Azat Khuzhin](https://github.com/azat)).
+* Make `toTimeZone` monotonicity when timeZone is a constant value to support partition puring when use sql like:. [#26261](https://github.com/ClickHouse/ClickHouse/pull/26261) ([huangzhaowei](https://github.com/SaintBacchus)).
+
+#### Improvement
+
+* Mark window functions as ready for general use. Remove the `allow_experimental_window_functions` setting. [#27184](https://github.com/ClickHouse/ClickHouse/pull/27184) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Improve compatibility with non-whole-minute timezone offsets. [#27080](https://github.com/ClickHouse/ClickHouse/pull/27080) ([Raúl Marín](https://github.com/Algunenano)).
+* If file descriptor in `File` table is regular file - allow to read multiple times from it. It allows `clickhouse-local` to read multiple times from stdin (with multiple SELECT queries or subqueries) if stdin is a regular file like `clickhouse-local --query "SELECT * FROM table UNION ALL SELECT * FROM table" ... < file`. This closes [#11124](https://github.com/ClickHouse/ClickHouse/issues/11124). Co-authored with ([alexey-milovidov](https://github.com/alexey-milovidov)). [#25960](https://github.com/ClickHouse/ClickHouse/pull/25960) ([BoloniniD](https://github.com/BoloniniD)).
+* Remove duplicate index analysis and avoid possible invalid limit checks during projection analysis. [#27742](https://github.com/ClickHouse/ClickHouse/pull/27742) ([Amos Bird](https://github.com/amosbird)).
+* Enable query parameters to be passed in the body of HTTP requests. [#27706](https://github.com/ClickHouse/ClickHouse/pull/27706) ([Hermano Lustosa](https://github.com/hllustosa)).
+* Disallow `arrayJoin` on partition expressions. [#27648](https://github.com/ClickHouse/ClickHouse/pull/27648) ([Raúl Marín](https://github.com/Algunenano)).
+* Log client IP address if authentication fails. [#27514](https://github.com/ClickHouse/ClickHouse/pull/27514) ([Misko Lee](https://github.com/imiskolee)).
+* Use bytes instead of strings for binary data in the GRPC protocol. [#27431](https://github.com/ClickHouse/ClickHouse/pull/27431) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Send response with error message if HTTP port is not set and user tries to send HTTP request to TCP port. [#27385](https://github.com/ClickHouse/ClickHouse/pull/27385) ([Braulio Valdivielso Martínez](https://github.com/BraulioVM)).
+* Add `_CAST` function for internal usage, which will not preserve type nullability, but non-internal cast will preserve according to setting `cast_keep_nullable`. Closes [#12636](https://github.com/ClickHouse/ClickHouse/issues/12636). [#27382](https://github.com/ClickHouse/ClickHouse/pull/27382) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add setting `log_formatted_queries` to log additional formatted query into `system.query_log`. It's useful for normalized query analysis because functions like `normalizeQuery` and `normalizeQueryKeepNames` don't parse/format queries in order to achieve better performance. [#27380](https://github.com/ClickHouse/ClickHouse/pull/27380) ([Amos Bird](https://github.com/amosbird)).
+* Add two settings `max_hyperscan_regexp_length` and `max_hyperscan_regexp_total_length` to prevent huge regexp being used in hyperscan related functions, such as `multiMatchAny`. [#27378](https://github.com/ClickHouse/ClickHouse/pull/27378) ([Amos Bird](https://github.com/amosbird)).
+* Memory consumed by bitmap aggregate functions now is taken into account for memory limits. This closes [#26555](https://github.com/ClickHouse/ClickHouse/issues/26555). [#27252](https://github.com/ClickHouse/ClickHouse/pull/27252) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add 10 seconds cache for S3 proxy resolver. [#27216](https://github.com/ClickHouse/ClickHouse/pull/27216) ([ianton-ru](https://github.com/ianton-ru)).
+* Split global mutex into individual regexp construction. This helps avoid huge regexp construction blocking other related threads. [#27211](https://github.com/ClickHouse/ClickHouse/pull/27211) ([Amos Bird](https://github.com/amosbird)).
+* Support schema for PostgreSQL database engine. Closes [#27166](https://github.com/ClickHouse/ClickHouse/issues/27166). [#27198](https://github.com/ClickHouse/ClickHouse/pull/27198) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Track memory usage in clickhouse-client. [#27191](https://github.com/ClickHouse/ClickHouse/pull/27191) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
+* Try recording `query_kind` in `system.query_log` even when query fails to start. [#27182](https://github.com/ClickHouse/ClickHouse/pull/27182) ([Amos Bird](https://github.com/amosbird)).
+* Added columns `replica_is_active` that maps replica name to is replica active status to table `system.replicas`. Closes [#27138](https://github.com/ClickHouse/ClickHouse/issues/27138). [#27180](https://github.com/ClickHouse/ClickHouse/pull/27180) ([Maksim Kita](https://github.com/kitaisreal)).
+* Allow to pass query settings via server URI in Web UI. [#27177](https://github.com/ClickHouse/ClickHouse/pull/27177) ([kolsys](https://github.com/kolsys)).
+* Add a new metric called `MaxPushedDDLEntryID` which is the maximum ddl entry id that current node push to zookeeper. [#27174](https://github.com/ClickHouse/ClickHouse/pull/27174) ([Fuwang Hu](https://github.com/fuwhu)).
+* Improved the existence condition judgment and empty string node judgment when `clickhouse-keeper` creates znode. [#27125](https://github.com/ClickHouse/ClickHouse/pull/27125) ([小路](https://github.com/nicelulu)).
+* Merge JOIN correctly handles empty set in the right. [#27078](https://github.com/ClickHouse/ClickHouse/pull/27078) ([Vladimir C](https://github.com/vdimir)).
+* Now functions can be shard-level constants, which means if it's executed in the context of some distributed table, it generates a normal column, otherwise it produces a constant value. Notable functions are: `hostName()`, `tcpPort()`, `version()`, `buildId()`, `uptime()`, etc. [#27020](https://github.com/ClickHouse/ClickHouse/pull/27020) ([Amos Bird](https://github.com/amosbird)).
+* Updated `extractAllGroupsHorizontal` - upper limit on the number of matches per row can be set via optional third argument. [#26961](https://github.com/ClickHouse/ClickHouse/pull/26961) ([Vasily Nemkov](https://github.com/Enmk)).
+* Expose `RocksDB` statistics via system.rocksdb table. Read rocksdb options from ClickHouse config (`rocksdb...` keys). NOTE: ClickHouse does not rely on RocksDB, it is just one of the additional integration storage engines. [#26821](https://github.com/ClickHouse/ClickHouse/pull/26821) ([Azat Khuzhin](https://github.com/azat)).
+* Less verbose internal RocksDB logs. NOTE: ClickHouse does not rely on RocksDB, it is just one of the additional integration storage engines. This closes [#26252](https://github.com/ClickHouse/ClickHouse/issues/26252). [#26789](https://github.com/ClickHouse/ClickHouse/pull/26789) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Changing default roles affects new sessions only. [#26759](https://github.com/ClickHouse/ClickHouse/pull/26759) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Watchdog is disabled in docker by default. Fix for not handling ctrl+c. [#26757](https://github.com/ClickHouse/ClickHouse/pull/26757) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* `SET PROFILE` now applies constraints too if they're set for a passed profile. [#26730](https://github.com/ClickHouse/ClickHouse/pull/26730) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Improve handling of `KILL QUERY` requests. [#26675](https://github.com/ClickHouse/ClickHouse/pull/26675) ([Raúl Marín](https://github.com/Algunenano)).
+* `mapPopulatesSeries` function supports `Map` type. [#26663](https://github.com/ClickHouse/ClickHouse/pull/26663) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Fix excessive (x2) connect attempts with `skip_unavailable_shards`. [#26658](https://github.com/ClickHouse/ClickHouse/pull/26658) ([Azat Khuzhin](https://github.com/azat)).
+* Avoid hanging `clickhouse-benchmark` if connection fails (i.e. on EMFILE). [#26656](https://github.com/ClickHouse/ClickHouse/pull/26656) ([Azat Khuzhin](https://github.com/azat)).
+* Allow more threads to be used by the Kafka engine. [#26642](https://github.com/ClickHouse/ClickHouse/pull/26642) ([feihengye](https://github.com/feihengye)).
+* Add round-robin support for `clickhouse-benchmark` (it does not differ from the regular multi host/port run except for statistics report). [#26607](https://github.com/ClickHouse/ClickHouse/pull/26607) ([Azat Khuzhin](https://github.com/azat)).
+* Executable dictionaries (`executable`, `executable_pool`) enable creation with DDL query using `clickhouse-local`. Closes [#22355](https://github.com/ClickHouse/ClickHouse/issues/22355). [#26510](https://github.com/ClickHouse/ClickHouse/pull/26510) ([Maksim Kita](https://github.com/kitaisreal)).
+* Set client query kind for `mysql` and `postgresql` compatibility protocol handlers. [#26498](https://github.com/ClickHouse/ClickHouse/pull/26498) ([anneji-dev](https://github.com/anneji-dev)).
+* Apply `LIMIT` on the shards for queries like `SELECT * FROM dist ORDER BY key LIMIT 10` w/ `distributed_push_down_limit=1`. Avoid running `Distinct`/`LIMIT BY` steps for queries like `SELECT DISTINCT shading_key FROM dist ORDER BY key`. Now `distributed_push_down_limit` is respected by `optimize_distributed_group_by_sharding_key` optimization. [#26466](https://github.com/ClickHouse/ClickHouse/pull/26466) ([Azat Khuzhin](https://github.com/azat)).
+* Updated protobuf to 3.17.3. Changelogs are available on https://github.com/protocolbuffers/protobuf/releases. [#26424](https://github.com/ClickHouse/ClickHouse/pull/26424) ([Ilya Yatsishin](https://github.com/qoega)).
+* Enable `use_hedged_requests` setting that allows to mitigate tail latencies on large clusters. [#26380](https://github.com/ClickHouse/ClickHouse/pull/26380) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Improve behaviour with non-existing host in user allowed host list. [#26368](https://github.com/ClickHouse/ClickHouse/pull/26368) ([ianton-ru](https://github.com/ianton-ru)).
+* Add ability to set `Distributed` directory monitor settings via CREATE TABLE (i.e. `CREATE TABLE dist (key Int) Engine=Distributed(cluster, db, table) SETTINGS monitor_batch_inserts=1` and similar). [#26336](https://github.com/ClickHouse/ClickHouse/pull/26336) ([Azat Khuzhin](https://github.com/azat)).
+* Save server address in history URLs in web UI if it differs from the origin of web UI. This closes [#26044](https://github.com/ClickHouse/ClickHouse/issues/26044). [#26322](https://github.com/ClickHouse/ClickHouse/pull/26322) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add events to profile calls to `sleep` / `sleepEachRow`. [#26320](https://github.com/ClickHouse/ClickHouse/pull/26320) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow to reuse connections of shards among different clusters. It also avoids creating new connections when using `cluster` table function. [#26318](https://github.com/ClickHouse/ClickHouse/pull/26318) ([Amos Bird](https://github.com/amosbird)).
+* Control the execution period of clear old temporary directories by parameter with default value. [#26212](https://github.com/ClickHouse/ClickHouse/issues/26212). [#26313](https://github.com/ClickHouse/ClickHouse/pull/26313) ([fastio](https://github.com/fastio)).
+* Add a setting `function_range_max_elements_in_block` to tune the safety threshold for data volume generated by function `range`. This closes [#26303](https://github.com/ClickHouse/ClickHouse/issues/26303). [#26305](https://github.com/ClickHouse/ClickHouse/pull/26305) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check hash function at table creation, not at sampling. Add settings for MergeTree, if someone create a table with incorrect sampling column but sampling never be used, disable this settings for starting the server without exception. [#26256](https://github.com/ClickHouse/ClickHouse/pull/26256) ([zhaoyu](https://github.com/zxc111)).
+* Added `output_format_avro_string_column_pattern` setting to put specified String columns to Avro as string instead of default bytes. Implements [#22414](https://github.com/ClickHouse/ClickHouse/issues/22414). [#26245](https://github.com/ClickHouse/ClickHouse/pull/26245) ([Ilya Golshtein](https://github.com/ilejn)).
+* Add information about column sizes in `system.columns` table for `Log` and `TinyLog` tables. This closes [#9001](https://github.com/ClickHouse/ClickHouse/issues/9001). [#26241](https://github.com/ClickHouse/ClickHouse/pull/26241) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Don't throw exception when querying `system.detached_parts` table if there is custom disk configuration and `detached` directory does not exist on some disks. This closes [#26078](https://github.com/ClickHouse/ClickHouse/issues/26078). [#26236](https://github.com/ClickHouse/ClickHouse/pull/26236) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Check for non-deterministic functions in keys, including constant expressions like `now()`, `today()`. This closes [#25875](https://github.com/ClickHouse/ClickHouse/issues/25875). This closes [#11333](https://github.com/ClickHouse/ClickHouse/issues/11333). [#26235](https://github.com/ClickHouse/ClickHouse/pull/26235) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* convert timestamp and timestamptz data types to `DateTime64` in PostgreSQL table engine. [#26234](https://github.com/ClickHouse/ClickHouse/pull/26234) ([jasine](https://github.com/jasine)).
+* Apply aggressive IN index analysis for projections so that better projection candidate can be selected. [#26218](https://github.com/ClickHouse/ClickHouse/pull/26218) ([Amos Bird](https://github.com/amosbird)).
+* Remove GLOBAL keyword for IN when scalar function is passed. In previous versions, if user specified `GLOBAL IN f(x)` exception was thrown. [#26217](https://github.com/ClickHouse/ClickHouse/pull/26217) ([Amos Bird](https://github.com/amosbird)).
+* Add error id (like `BAD_ARGUMENTS`) to exception messages. This closes [#25862](https://github.com/ClickHouse/ClickHouse/issues/25862). [#26172](https://github.com/ClickHouse/ClickHouse/pull/26172) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix incorrect output with --progress option for clickhouse-local. Progress bar will be cleared once it gets to 100% - same as it is done for clickhouse-client. Closes [#17484](https://github.com/ClickHouse/ClickHouse/issues/17484). [#26128](https://github.com/ClickHouse/ClickHouse/pull/26128) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add `merge_selecting_sleep_ms` setting. [#26120](https://github.com/ClickHouse/ClickHouse/pull/26120) ([lthaooo](https://github.com/lthaooo)).
+* Remove complicated usage of Linux AIO with one block readahead and replace it with plain simple synchronous IO with O_DIRECT. In previous versions, the setting `min_bytes_to_use_direct_io` may not work correctly if `max_threads` is greater than one. Reading with direct IO (that is disabled by default for queries and enabled by default for large merges) will work in less efficient way. This closes [#25997](https://github.com/ClickHouse/ClickHouse/issues/25997). [#26003](https://github.com/ClickHouse/ClickHouse/pull/26003) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Flush `Distributed` table on `REPLACE TABLE` query. Resolves [#24566](https://github.com/ClickHouse/ClickHouse/issues/24566) - Do not replace (or create) table on `[CREATE OR] REPLACE TABLE ... AS SELECT` query if insertion into new table fails. Resolves [#23175](https://github.com/ClickHouse/ClickHouse/issues/23175). [#25895](https://github.com/ClickHouse/ClickHouse/pull/25895) ([tavplubix](https://github.com/tavplubix)).
+* Add `views` column to system.query_log containing the names of the (materialized or live) views executed by the query. Adds a new log table (`system.query_views_log`) that contains information about each view executed during a query. Modifies view execution: When an exception is thrown while executing a view, any view that has already startedwill continue running until it finishes. This used to be the behaviour under parallel_view_processing=true and now it's always the same behaviour. - Dependent views now report reading progress to the context. [#25714](https://github.com/ClickHouse/ClickHouse/pull/25714) ([Raúl Marín](https://github.com/Algunenano)).
+* Do connection draining asynchonously upon finishing executing distributed queries. A new server setting is added `max_threads_for_connection_collector` which specifies the number of workers to recycle connections in background. If the pool is full, connection will be drained synchronously but a bit different than before: It's drained after we send EOS to client, query will succeed immediately after receiving enough data, and any exception will be logged instead of throwing to the client. Added setting `drain_timeout` (3 seconds by default). Connection draining will disconnect upon timeout. [#25674](https://github.com/ClickHouse/ClickHouse/pull/25674) ([Amos Bird](https://github.com/amosbird)).
+* Support for multiple includes in configuration. It is possible to include users configuration, remote servers configuration from multiple sources. Simply place `<include />` element with `from_zk`, `from_env` or `incl` attribute and it will be replaced with the substitution. [#24404](https://github.com/ClickHouse/ClickHouse/pull/24404) ([nvartolomei](https://github.com/nvartolomei)).
+* Fix multiple block insertion into distributed table with `insert_distributed_one_random_shard = 1`. This is a marginal feature. Mark as improvement. [#23140](https://github.com/ClickHouse/ClickHouse/pull/23140) ([Amos Bird](https://github.com/amosbird)).
+* Support `LowCardinality` and `FixedString` keys/values for `Map` type. [#21543](https://github.com/ClickHouse/ClickHouse/pull/21543) ([hexiaoting](https://github.com/hexiaoting)).
+* Enable reloading of local disk config. [#19526](https://github.com/ClickHouse/ClickHouse/pull/19526) ([taiyang-li](https://github.com/taiyang-li)).
+
+#### Bug Fix
+
+* Fix a couple of bugs that may cause replicas to diverge. [#27808](https://github.com/ClickHouse/ClickHouse/pull/27808) ([tavplubix](https://github.com/tavplubix)).
+* Fix a rare bug in `DROP PART` which can lead to the error `Unexpected merged part intersects drop range`. [#27807](https://github.com/ClickHouse/ClickHouse/pull/27807) ([alesapin](https://github.com/alesapin)).
+* Prevent crashes for some formats when NULL (tombstone) message was coming from Kafka. Closes [#19255](https://github.com/ClickHouse/ClickHouse/issues/19255). [#27794](https://github.com/ClickHouse/ClickHouse/pull/27794) ([filimonov](https://github.com/filimonov)).
+* Fix column filtering with union distinct in subquery. Closes [#27578](https://github.com/ClickHouse/ClickHouse/issues/27578). [#27689](https://github.com/ClickHouse/ClickHouse/pull/27689) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix bad type cast when functions like `arrayHas` are applied to arrays of LowCardinality of Nullable of different non-numeric types like `DateTime` and `DateTime64`. In previous versions bad cast occurs. In new version it will lead to exception. This closes [#26330](https://github.com/ClickHouse/ClickHouse/issues/26330). [#27682](https://github.com/ClickHouse/ClickHouse/pull/27682) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix postgresql table function resulting in non-closing connections. Closes [#26088](https://github.com/ClickHouse/ClickHouse/issues/26088). [#27662](https://github.com/ClickHouse/ClickHouse/pull/27662) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed another case of `Unexpected merged part ... intersecting drop range ...` error. [#27656](https://github.com/ClickHouse/ClickHouse/pull/27656) ([tavplubix](https://github.com/tavplubix)).
+* Fix an error with aliased column in `Distributed` table. [#27652](https://github.com/ClickHouse/ClickHouse/pull/27652) ([Vladimir C](https://github.com/vdimir)).
+* After setting `max_memory_usage*` to non-zero value it was not possible to reset it back to 0 (unlimited). It's fixed. [#27638](https://github.com/ClickHouse/ClickHouse/pull/27638) ([tavplubix](https://github.com/tavplubix)).
+* Fixed underflow of the time value when constructing it from components. Closes [#27193](https://github.com/ClickHouse/ClickHouse/issues/27193). [#27605](https://github.com/ClickHouse/ClickHouse/pull/27605) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix crash during projection materialization when some parts contain missing columns. This fixes [#27512](https://github.com/ClickHouse/ClickHouse/issues/27512). [#27528](https://github.com/ClickHouse/ClickHouse/pull/27528) ([Amos Bird](https://github.com/amosbird)).
+* fix metric `BackgroundMessageBrokerSchedulePoolTask`, maybe mistyped. [#27452](https://github.com/ClickHouse/ClickHouse/pull/27452) ([Ben](https://github.com/benbiti)).
+* Fix distributed queries with zero shards and aggregation. [#27427](https://github.com/ClickHouse/ClickHouse/pull/27427) ([Azat Khuzhin](https://github.com/azat)).
+* Compatibility when `/proc/meminfo` does not contain KB suffix. [#27361](https://github.com/ClickHouse/ClickHouse/pull/27361) ([Mike Kot](https://github.com/myrrc)).
+* Fix incorrect result for query with row-level security, PREWHERE and LowCardinality filter. Fixes [#27179](https://github.com/ClickHouse/ClickHouse/issues/27179). [#27329](https://github.com/ClickHouse/ClickHouse/pull/27329) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fixed incorrect validation of partition id for MergeTree tables that created with old syntax. [#27328](https://github.com/ClickHouse/ClickHouse/pull/27328) ([tavplubix](https://github.com/tavplubix)).
+* Fix MySQL protocol when using parallel formats (CSV / TSV). [#27326](https://github.com/ClickHouse/ClickHouse/pull/27326) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix `Cannot find column` error for queries with sampling. Was introduced in [#24574](https://github.com/ClickHouse/ClickHouse/issues/24574). Fixes [#26522](https://github.com/ClickHouse/ClickHouse/issues/26522). [#27301](https://github.com/ClickHouse/ClickHouse/pull/27301) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix errors like `Expected ColumnLowCardinality, gotUInt8` or `Bad cast from type DB::ColumnVector<char8_t> to DB::ColumnLowCardinality` for some queries with `LowCardinality` in `PREWHERE`. And more importantly, fix the lack of whitespace in the error message. Fixes [#23515](https://github.com/ClickHouse/ClickHouse/issues/23515). [#27298](https://github.com/ClickHouse/ClickHouse/pull/27298) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `distributed_group_by_no_merge = 2` with `distributed_push_down_limit = 1` or `optimize_distributed_group_by_sharding_key = 1` with `LIMIT BY` and `LIMIT OFFSET`. [#27249](https://github.com/ClickHouse/ClickHouse/pull/27249) ([Azat Khuzhin](https://github.com/azat)). These are obscure combination of settings that no one is using.
+* Fix mutation stuck on invalid partitions in non-replicated MergeTree. [#27248](https://github.com/ClickHouse/ClickHouse/pull/27248) ([Azat Khuzhin](https://github.com/azat)).
+* In case of ambiguity, lambda functions prefer its arguments to other aliases or identifiers. [#27235](https://github.com/ClickHouse/ClickHouse/pull/27235) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix column structure in merge join, close [#27091](https://github.com/ClickHouse/ClickHouse/issues/27091). [#27217](https://github.com/ClickHouse/ClickHouse/pull/27217) ([Vladimir C](https://github.com/vdimir)).
+* In rare cases `system.detached_parts` table might contain incorrect information for some parts, it's fixed. Fixes [#27114](https://github.com/ClickHouse/ClickHouse/issues/27114). [#27183](https://github.com/ClickHouse/ClickHouse/pull/27183) ([tavplubix](https://github.com/tavplubix)).
+* Fix uninitialized memory in functions `multiSearch*` with empty array, close [#27169](https://github.com/ClickHouse/ClickHouse/issues/27169). [#27181](https://github.com/ClickHouse/ClickHouse/pull/27181) ([Vladimir C](https://github.com/vdimir)).
+* Fix synchronization in GRPCServer. This PR fixes [#27024](https://github.com/ClickHouse/ClickHouse/issues/27024). [#27064](https://github.com/ClickHouse/ClickHouse/pull/27064) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed `cache`, `complex_key_cache`, `ssd_cache`, `complex_key_ssd_cache` configuration parsing. Options `allow_read_expired_keys`, `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds` were not parsed for dictionaries with non `cache` type. [#27032](https://github.com/ClickHouse/ClickHouse/pull/27032) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix possible mutation stack due to race with DROP_RANGE. [#27002](https://github.com/ClickHouse/ClickHouse/pull/27002) ([Azat Khuzhin](https://github.com/azat)).
+* Now partition ID in queries like `ALTER TABLE ... PARTITION ID xxx` validates for correctness. Fixes [#25718](https://github.com/ClickHouse/ClickHouse/issues/25718). [#26963](https://github.com/ClickHouse/ClickHouse/pull/26963) ([alesapin](https://github.com/alesapin)).
+* Fix "Unknown column name" error with multiple JOINs in some cases, close [#26899](https://github.com/ClickHouse/ClickHouse/issues/26899). [#26957](https://github.com/ClickHouse/ClickHouse/pull/26957) ([Vladimir C](https://github.com/vdimir)).
+* Fix reading of custom TLDs (stops processing with lower buffer or bigger file). [#26948](https://github.com/ClickHouse/ClickHouse/pull/26948) ([Azat Khuzhin](https://github.com/azat)).
+* Fix error `Missing columns: 'xxx'` when `DEFAULT` column references other non materialized column without `DEFAULT` expression. Fixes [#26591](https://github.com/ClickHouse/ClickHouse/issues/26591). [#26900](https://github.com/ClickHouse/ClickHouse/pull/26900) ([alesapin](https://github.com/alesapin)).
+* Fix loading of dictionary keys in `library-bridge` for `library` dictionary source. [#26834](https://github.com/ClickHouse/ClickHouse/pull/26834) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Aggregate function parameters might be lost when applying some combinators causing exceptions like `Conversion from AggregateFunction(topKArray, Array(String)) to AggregateFunction(topKArray(10), Array(String)) is not supported`. It's fixed. Fixes [#26196](https://github.com/ClickHouse/ClickHouse/issues/26196) and [#26433](https://github.com/ClickHouse/ClickHouse/issues/26433). [#26814](https://github.com/ClickHouse/ClickHouse/pull/26814) ([tavplubix](https://github.com/tavplubix)).
+* Add `event_time_microseconds` value for `REMOVE_PART` in `system.part_log`. In previous versions is was not set. [#26720](https://github.com/ClickHouse/ClickHouse/pull/26720) ([Azat Khuzhin](https://github.com/azat)).
+* Do not remove data on ReplicatedMergeTree table shutdown to avoid creating data to metadata inconsistency. [#26716](https://github.com/ClickHouse/ClickHouse/pull/26716) ([nvartolomei](https://github.com/nvartolomei)).
+* Sometimes `SET ROLE` could work incorrectly, this PR fixes that. [#26707](https://github.com/ClickHouse/ClickHouse/pull/26707) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Some fixes for parallel formatting (https://github.com/ClickHouse/ClickHouse/issues/26694). [#26703](https://github.com/ClickHouse/ClickHouse/pull/26703) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix potential nullptr dereference in window functions. This fixes [#25276](https://github.com/ClickHouse/ClickHouse/issues/25276). [#26668](https://github.com/ClickHouse/ClickHouse/pull/26668) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix clickhouse-client history file conversion (when upgrading from the format of 3 years old version of clickhouse-client) if file is empty. [#26589](https://github.com/ClickHouse/ClickHouse/pull/26589) ([Azat Khuzhin](https://github.com/azat)).
+* Fix incorrect function names of groupBitmapAnd/Or/Xor (can be displayed in some occasions). This fixes. [#26557](https://github.com/ClickHouse/ClickHouse/pull/26557) ([Amos Bird](https://github.com/amosbird)).
+* Update `chown` cmd check in clickhouse-server docker entrypoint. It fixes the bug that cluster pod restart failed (or timeout) on kubernetes. [#26545](https://github.com/ClickHouse/ClickHouse/pull/26545) ([Ky Li](https://github.com/Kylinrix)).
+* Fix crash in `RabbitMQ` shutdown in case `RabbitMQ` setup was not started. Closes [#26504](https://github.com/ClickHouse/ClickHouse/issues/26504). [#26529](https://github.com/ClickHouse/ClickHouse/pull/26529) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix issues with `CREATE DICTIONARY` query if dictionary name or database name was quoted. Closes [#26491](https://github.com/ClickHouse/ClickHouse/issues/26491). [#26508](https://github.com/ClickHouse/ClickHouse/pull/26508) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix broken column name resolution after rewriting column aliases. This fixes [#26432](https://github.com/ClickHouse/ClickHouse/issues/26432). [#26475](https://github.com/ClickHouse/ClickHouse/pull/26475) ([Amos Bird](https://github.com/amosbird)).
+* Fix some fuzzed msan crash. Fixes [#22517](https://github.com/ClickHouse/ClickHouse/issues/22517). [#26428](https://github.com/ClickHouse/ClickHouse/pull/26428) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix infinite non joined block stream in `partial_merge_join` close [#26325](https://github.com/ClickHouse/ClickHouse/issues/26325). [#26374](https://github.com/ClickHouse/ClickHouse/pull/26374) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible crash when login as dropped user. This PR fixes [#26073](https://github.com/ClickHouse/ClickHouse/issues/26073). [#26363](https://github.com/ClickHouse/ClickHouse/pull/26363) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix `optimize_distributed_group_by_sharding_key` for multiple columns (leads to incorrect result w/ `optimize_skip_unused_shards=1`/`allow_nondeterministic_optimize_skip_unused_shards=1` and multiple columns in sharding key expression). [#26353](https://github.com/ClickHouse/ClickHouse/pull/26353) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed rare bug in lost replica recovery that may cause replicas to diverge. [#26321](https://github.com/ClickHouse/ClickHouse/pull/26321) ([tavplubix](https://github.com/tavplubix)).
+* Fix zstd decompression (for import/export in zstd framing format that is unrelated to tables data) in case there are escape sequences at the end of internal buffer. Closes [#26013](https://github.com/ClickHouse/ClickHouse/issues/26013). [#26314](https://github.com/ClickHouse/ClickHouse/pull/26314) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix logical error on join with totals, close [#26017](https://github.com/ClickHouse/ClickHouse/issues/26017). [#26250](https://github.com/ClickHouse/ClickHouse/pull/26250) ([Vladimir C](https://github.com/vdimir)).
+* Remove excessive newline in `thread_name` column in `system.stack_trace` table. This fixes [#24124](https://github.com/ClickHouse/ClickHouse/issues/24124). [#26210](https://github.com/ClickHouse/ClickHouse/pull/26210) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix potential crash if more than one `untuple` expression is used. [#26179](https://github.com/ClickHouse/ClickHouse/pull/26179) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Don't throw exception in `toString` for Nullable Enum if Enum does not have a value for zero, close [#25806](https://github.com/ClickHouse/ClickHouse/issues/25806). [#26123](https://github.com/ClickHouse/ClickHouse/pull/26123) ([Vladimir C](https://github.com/vdimir)).
+* Fixed incorrect `sequence_id` in MySQL protocol packets that ClickHouse sends on exception during query execution. It might cause MySQL client to reset connection to ClickHouse server. Fixes [#21184](https://github.com/ClickHouse/ClickHouse/issues/21184). [#26051](https://github.com/ClickHouse/ClickHouse/pull/26051) ([tavplubix](https://github.com/tavplubix)).
+* Fix for the case that `cutToFirstSignificantSubdomainCustom()`/`cutToFirstSignificantSubdomainCustomWithWWW()`/`firstSignificantSubdomainCustom()` returns incorrect type for consts, and hence `optimize_skip_unused_shards` does not work:. [#26041](https://github.com/ClickHouse/ClickHouse/pull/26041) ([Azat Khuzhin](https://github.com/azat)).
+* Fix possible mismatched header when using normal projection with prewhere. This fixes [#26020](https://github.com/ClickHouse/ClickHouse/issues/26020). [#26038](https://github.com/ClickHouse/ClickHouse/pull/26038) ([Amos Bird](https://github.com/amosbird)).
+* Fix sharding_key from column w/o function for remote() (before `select * from remote('127.1', system.one, dummy)` leads to `Unknown column: dummy, there are only columns .` error). [#25824](https://github.com/ClickHouse/ClickHouse/pull/25824) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `Not found column ...` and `Missing column ...` errors when selecting from `MaterializeMySQL`. Fixes [#23708](https://github.com/ClickHouse/ClickHouse/issues/23708), [#24830](https://github.com/ClickHouse/ClickHouse/issues/24830), [#25794](https://github.com/ClickHouse/ClickHouse/issues/25794). [#25822](https://github.com/ClickHouse/ClickHouse/pull/25822) ([tavplubix](https://github.com/tavplubix)).
+* Fix `optimize_skip_unused_shards_rewrite_in` for non-UInt64 types (may select incorrect shards eventually or throw `Cannot infer type of an empty tuple` or `Function tuple requires at least one argument`). [#25798](https://github.com/ClickHouse/ClickHouse/pull/25798) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Build/Testing/Packaging Improvement
+
+* Now we ran stateful and stateless tests in random timezones. Fixes [#12439](https://github.com/ClickHouse/ClickHouse/issues/12439). Reading String as DateTime and writing DateTime as String in Protobuf format now respect timezone. Reading UInt16 as DateTime in Arrow and Parquet formats now treat it as Date and then converts to DateTime with respect to DateTime's timezone, because Date is serialized in Arrow and Parquet as UInt16. GraphiteMergeTree now respect time zone for rounding of times. Fixes [#5098](https://github.com/ClickHouse/ClickHouse/issues/5098). Author: @alexey-milovidov. [#15408](https://github.com/ClickHouse/ClickHouse/pull/15408) ([alesapin](https://github.com/alesapin)).
+* `clickhouse-test` supports SQL tests with [Jinja2](https://jinja.palletsprojects.com/en/3.0.x/templates/#synopsis) templates. [#26579](https://github.com/ClickHouse/ClickHouse/pull/26579) ([Vladimir C](https://github.com/vdimir)).
+* Add support for build with `clang-13`. This closes [#27705](https://github.com/ClickHouse/ClickHouse/issues/27705). [#27714](https://github.com/ClickHouse/ClickHouse/pull/27714) ([alexey-milovidov](https://github.com/alexey-milovidov)). [#27777](https://github.com/ClickHouse/ClickHouse/pull/27777) ([Sergei Semin](https://github.com/syominsergey))
+* Add CMake options to build with or without specific CPU instruction set. This is for [#17469](https://github.com/ClickHouse/ClickHouse/issues/17469) and [#27509](https://github.com/ClickHouse/ClickHouse/issues/27509). [#27508](https://github.com/ClickHouse/ClickHouse/pull/27508) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix linking of auxiliar programs when using dynamic libraries. [#26958](https://github.com/ClickHouse/ClickHouse/pull/26958) ([Raúl Marín](https://github.com/Algunenano)).
+* Update RocksDB to `2021-07-16` master. [#26411](https://github.com/ClickHouse/ClickHouse/pull/26411) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+
+### ClickHouse release v21.8, 2021-08-12
+
+#### Upgrade Notes
+* New version is using `Map` data type for system logs tables (`system.query_log`, `system.query_thread_log`, `system.processes`, `system.opentelemetry_span_log`). These tables will be auto-created with new data types. Virtual columns are created to support old queries. Closes [#18698](https://github.com/ClickHouse/ClickHouse/issues/18698). [#23934](https://github.com/ClickHouse/ClickHouse/pull/23934), [#25773](https://github.com/ClickHouse/ClickHouse/pull/25773) ([hexiaoting](https://github.com/hexiaoting), [sundy-li](https://github.com/sundy-li), [Maksim Kita](https://github.com/kitaisreal)). If you want to *downgrade* from version 21.8 to older versions, you will need to cleanup system tables with logs manually. Look at `/var/lib/clickhouse/data/system/*_log`.
+
+#### New Features
+
+* Add support for a part of SQL/JSON standard. [#24148](https://github.com/ClickHouse/ClickHouse/pull/24148) ([l1tsolaiki](https://github.com/l1tsolaiki), [Kseniia Sumarokova](https://github.com/kssenii)).
+* Collect common system metrics (in `system.asynchronous_metrics` and `system.asynchronous_metric_log`) on CPU usage, disk usage, memory usage, IO, network, files, load average, CPU frequencies, thermal sensors, EDAC counters, system uptime; also added metrics about the scheduling jitter and the time spent collecting the metrics. It works similar to `atop` in ClickHouse and allows access to monitoring data even if you have no additional tools installed. Close [#9430](https://github.com/ClickHouse/ClickHouse/issues/9430). [#24416](https://github.com/ClickHouse/ClickHouse/pull/24416) ([alexey-milovidov](https://github.com/alexey-milovidov), [Yegor Levankov](https://github.com/elevankoff)).
+* Add MaterializedPostgreSQL table engine and database engine. This database engine allows replicating a whole database or any subset of database tables. [#20470](https://github.com/ClickHouse/ClickHouse/pull/20470) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add new functions `leftPad()`, `rightPad()`, `leftPadUTF8()`, `rightPadUTF8()`. [#26075](https://github.com/ClickHouse/ClickHouse/pull/26075) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Add the `FIRST` keyword to the `ADD INDEX` command to be able to add the index at the beginning of the indices list. [#25904](https://github.com/ClickHouse/ClickHouse/pull/25904) ([xjewer](https://github.com/xjewer)).
+* Introduce `system.data_skipping_indices` table containing information about existing data skipping indices. Close [#7659](https://github.com/ClickHouse/ClickHouse/issues/7659). [#25693](https://github.com/ClickHouse/ClickHouse/pull/25693) ([Dmitry Novik](https://github.com/novikd)).
+* Add `bin`/`unbin` functions. [#25609](https://github.com/ClickHouse/ClickHouse/pull/25609) ([zhaoyu](https://github.com/zxc111)).
+* Support `Map` and `UInt128`, `Int128`, `UInt256`, `Int256` types in `mapAdd` and `mapSubtract` functions. [#25596](https://github.com/ClickHouse/ClickHouse/pull/25596) ([Ildus Kurbangaliev](https://github.com/ildus)).
+* Support `DISTINCT ON (columns)` expression, close [#25404](https://github.com/ClickHouse/ClickHouse/issues/25404). [#25589](https://github.com/ClickHouse/ClickHouse/pull/25589) ([Zijie Lu](https://github.com/TszKitLo40)).
+* Add an ability to reset a custom setting to default and remove it from the table's metadata. It allows rolling back the change without knowing the system/config's default.  Closes [#14449](https://github.com/ClickHouse/ClickHouse/issues/14449). [#17769](https://github.com/ClickHouse/ClickHouse/pull/17769) ([xjewer](https://github.com/xjewer)).
+* Render pipelines as graphs in Web UI if `EXPLAIN PIPELINE graph = 1` query is submitted. [#26067](https://github.com/ClickHouse/ClickHouse/pull/26067) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Performance Improvements
+
+* Compile aggregate functions. Use option `compile_aggregate_expressions` to enable it. [#24789](https://github.com/ClickHouse/ClickHouse/pull/24789) ([Maksim Kita](https://github.com/kitaisreal)).
+* Improve latency of short queries that require reading from tables with many columns. [#26371](https://github.com/ClickHouse/ClickHouse/pull/26371) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Improvements
+
+* Use `Map` data type for system logs tables (`system.query_log`, `system.query_thread_log`, `system.processes`, `system.opentelemetry_span_log`). These tables will be auto-created with new data types. Virtual columns are created to support old queries. Closes [#18698](https://github.com/ClickHouse/ClickHouse/issues/18698). [#23934](https://github.com/ClickHouse/ClickHouse/pull/23934), [#25773](https://github.com/ClickHouse/ClickHouse/pull/25773) ([hexiaoting](https://github.com/hexiaoting), [sundy-li](https://github.com/sundy-li), [Maksim Kita](https://github.com/kitaisreal)).
+* For a dictionary with a complex key containing only one attribute, allow not wrapping the key expression in tuple for functions `dictGet`, `dictHas`. [#26130](https://github.com/ClickHouse/ClickHouse/pull/26130) ([Maksim Kita](https://github.com/kitaisreal)).
+* Implement function `bin`/`hex` from `AggregateFunction` states. [#26094](https://github.com/ClickHouse/ClickHouse/pull/26094) ([zhaoyu](https://github.com/zxc111)).
+* Support arguments of `UUID` type for `empty` and `notEmpty` functions. `UUID` is empty if it is all zeros (nil UUID). Closes [#3446](https://github.com/ClickHouse/ClickHouse/issues/3446). [#25974](https://github.com/ClickHouse/ClickHouse/pull/25974) ([zhaoyu](https://github.com/zxc111)).
+* Add support for `SET SQL_SELECT_LIMIT` in MySQL protocol. Closes [#17115](https://github.com/ClickHouse/ClickHouse/issues/17115). [#25972](https://github.com/ClickHouse/ClickHouse/pull/25972) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* More instrumentation for network interaction: add counters for recv/send bytes; add gauges for recvs/sends. Added missing documentation. Close [#5897](https://github.com/ClickHouse/ClickHouse/issues/5897). [#25962](https://github.com/ClickHouse/ClickHouse/pull/25962) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add setting `optimize_move_to_prewhere_if_final`. If query has `FINAL`, the optimization `move_to_prewhere` will be enabled only if both `optimize_move_to_prewhere` and `optimize_move_to_prewhere_if_final` are enabled. Closes [#8684](https://github.com/ClickHouse/ClickHouse/issues/8684). [#25940](https://github.com/ClickHouse/ClickHouse/pull/25940) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow complex quoted identifiers of JOINed tables. Close [#17861](https://github.com/ClickHouse/ClickHouse/issues/17861). [#25924](https://github.com/ClickHouse/ClickHouse/pull/25924) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Add support for Unicode (e.g. Chinese, Cyrillic) components in `Nested` data types. Close [#25594](https://github.com/ClickHouse/ClickHouse/issues/25594). [#25923](https://github.com/ClickHouse/ClickHouse/pull/25923) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow `quantiles*` functions to work with `aggregate_functions_null_for_empty`. Close [#25892](https://github.com/ClickHouse/ClickHouse/issues/25892). [#25919](https://github.com/ClickHouse/ClickHouse/pull/25919) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Allow parameters for parametric aggregate functions to be arbitrary constant expressions (e.g., `1 + 2`), not just literals. It also allows using the query parameters (in parameterized queries like `{param:UInt8}`) inside parametric aggregate functions. Closes [#11607](https://github.com/ClickHouse/ClickHouse/issues/11607). [#25910](https://github.com/ClickHouse/ClickHouse/pull/25910) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Correctly throw the exception on the attempt to parse an invalid `Date`. Closes [#6481](https://github.com/ClickHouse/ClickHouse/issues/6481). [#25909](https://github.com/ClickHouse/ClickHouse/pull/25909) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Support for multiple includes in configuration. It is possible to include users configuration, remote server configuration from multiple sources. Simply place `<include />` element with `from_zk`, `from_env` or `incl` attribute, and it will be replaced with the substitution. [#24404](https://github.com/ClickHouse/ClickHouse/pull/24404) ([nvartolomei](https://github.com/nvartolomei)).
+* Support for queries with a column named `"null"` (it must be specified in back-ticks or double quotes) and `ON CLUSTER`. Closes [#24035](https://github.com/ClickHouse/ClickHouse/issues/24035). [#25907](https://github.com/ClickHouse/ClickHouse/pull/25907) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Support `LowCardinality`, `Decimal`, and `UUID` for `JSONExtract`. Closes [#24606](https://github.com/ClickHouse/ClickHouse/issues/24606). [#25900](https://github.com/ClickHouse/ClickHouse/pull/25900) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Convert history file from `readline` format to `replxx` format. [#25888](https://github.com/ClickHouse/ClickHouse/pull/25888) ([Azat Khuzhin](https://github.com/azat)).
+* Fix an issue which can lead to intersecting parts after `DROP PART` or background deletion of an empty part. [#25884](https://github.com/ClickHouse/ClickHouse/pull/25884) ([alesapin](https://github.com/alesapin)).
+* Better handling of lost parts for `ReplicatedMergeTree` tables. Fixes rare inconsistencies in `ReplicationQueue`. Fixes [#10368](https://github.com/ClickHouse/ClickHouse/issues/10368). [#25820](https://github.com/ClickHouse/ClickHouse/pull/25820) ([alesapin](https://github.com/alesapin)).
+* Allow starting clickhouse-client with unreadable working directory. [#25817](https://github.com/ClickHouse/ClickHouse/pull/25817) ([ianton-ru](https://github.com/ianton-ru)).
+* Fix "No available columns" error for `Merge` storage. [#25801](https://github.com/ClickHouse/ClickHouse/pull/25801) ([Azat Khuzhin](https://github.com/azat)).
+* MySQL Engine now supports the exchange of column comments between MySQL and ClickHouse. [#25795](https://github.com/ClickHouse/ClickHouse/pull/25795) ([Storozhuk Kostiantyn](https://github.com/sand6255)).
+* Fix inconsistent behaviour of `GROUP BY` constant on empty set. Closes [#6842](https://github.com/ClickHouse/ClickHouse/issues/6842). [#25786](https://github.com/ClickHouse/ClickHouse/pull/25786) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Cancel already running merges in partition on `DROP PARTITION` and `TRUNCATE` for `ReplicatedMergeTree`. Resolves [#17151](https://github.com/ClickHouse/ClickHouse/issues/17151). [#25684](https://github.com/ClickHouse/ClickHouse/pull/25684) ([tavplubix](https://github.com/tavplubix)).
+* Support ENUM` data type for MaterializeMySQL. [#25676](https://github.com/ClickHouse/ClickHouse/pull/25676) ([Storozhuk Kostiantyn](https://github.com/sand6255)).
+* Support materialized and aliased columns in JOIN, close [#13274](https://github.com/ClickHouse/ClickHouse/issues/13274). [#25634](https://github.com/ClickHouse/ClickHouse/pull/25634) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible logical race condition between `ALTER TABLE ... DETACH` and background merges. [#25605](https://github.com/ClickHouse/ClickHouse/pull/25605) ([Azat Khuzhin](https://github.com/azat)).
+* Make `NetworkReceiveElapsedMicroseconds` metric to correctly include the time spent waiting for data from the client to `INSERT`. Close [#9958](https://github.com/ClickHouse/ClickHouse/issues/9958). [#25602](https://github.com/ClickHouse/ClickHouse/pull/25602) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Support `TRUNCATE TABLE` for S3 and HDFS. Close [#25530](https://github.com/ClickHouse/ClickHouse/issues/25530). [#25550](https://github.com/ClickHouse/ClickHouse/pull/25550) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Support for dynamic reloading of config to change number of threads in pool for background jobs execution (merges, mutations, fetches). [#25548](https://github.com/ClickHouse/ClickHouse/pull/25548) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow extracting of non-string element as string using `JSONExtract`. This is for [#25414](https://github.com/ClickHouse/ClickHouse/issues/25414). [#25452](https://github.com/ClickHouse/ClickHouse/pull/25452) ([Amos Bird](https://github.com/amosbird)).
+* Support regular expression in `Database` argument for `StorageMerge`. Close [#776](https://github.com/ClickHouse/ClickHouse/issues/776). [#25064](https://github.com/ClickHouse/ClickHouse/pull/25064) ([flynn](https://github.com/ucasfl)).
+* Web UI: if the value looks like a URL, automatically generate a link. [#25965](https://github.com/ClickHouse/ClickHouse/pull/25965) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Make `sudo service clickhouse-server start` to work on systems with `systemd` like Centos 8. Close [#14298](https://github.com/ClickHouse/ClickHouse/issues/14298). Close [#17799](https://github.com/ClickHouse/ClickHouse/issues/17799). [#25921](https://github.com/ClickHouse/ClickHouse/pull/25921) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+
+#### Bug Fixes
+
+* Fix incorrect `SET ROLE` in some cases. [#26707](https://github.com/ClickHouse/ClickHouse/pull/26707) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix potential `nullptr` dereference in window functions. Fix [#25276](https://github.com/ClickHouse/ClickHouse/issues/25276). [#26668](https://github.com/ClickHouse/ClickHouse/pull/26668) ([Alexander Kuzmenkov](https://github.com/akuzm)).
+* Fix incorrect function names of `groupBitmapAnd/Or/Xor`. Fix [#26557](https://github.com/ClickHouse/ClickHouse/pull/26557) ([Amos Bird](https://github.com/amosbird)).
+* Fix crash in RabbitMQ shutdown in case RabbitMQ setup was not started. Closes [#26504](https://github.com/ClickHouse/ClickHouse/issues/26504). [#26529](https://github.com/ClickHouse/ClickHouse/pull/26529) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix issues with `CREATE DICTIONARY` query if dictionary name or database name was quoted. Closes [#26491](https://github.com/ClickHouse/ClickHouse/issues/26491). [#26508](https://github.com/ClickHouse/ClickHouse/pull/26508) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix broken name resolution after rewriting column aliases. Fix [#26432](https://github.com/ClickHouse/ClickHouse/issues/26432). [#26475](https://github.com/ClickHouse/ClickHouse/pull/26475) ([Amos Bird](https://github.com/amosbird)).
+* Fix infinite non-joined block stream in `partial_merge_join` close [#26325](https://github.com/ClickHouse/ClickHouse/issues/26325). [#26374](https://github.com/ClickHouse/ClickHouse/pull/26374) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible crash when login as dropped user. Fix [#26073](https://github.com/ClickHouse/ClickHouse/issues/26073). [#26363](https://github.com/ClickHouse/ClickHouse/pull/26363) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix `optimize_distributed_group_by_sharding_key` for multiple columns (leads to incorrect result w/ `optimize_skip_unused_shards=1`/`allow_nondeterministic_optimize_skip_unused_shards=1` and multiple columns in sharding key expression). [#26353](https://github.com/ClickHouse/ClickHouse/pull/26353) ([Azat Khuzhin](https://github.com/azat)).
+* `CAST` from `Date` to `DateTime` (or `DateTime64`) was not using the timezone of the `DateTime` type. It can also affect the comparison between `Date` and `DateTime`. Inference of the common type for `Date` and `DateTime` also was not using the corresponding timezone. It affected the results of function `if` and array construction. Closes [#24128](https://github.com/ClickHouse/ClickHouse/issues/24128). [#24129](https://github.com/ClickHouse/ClickHouse/pull/24129) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fixed rare bug in lost replica recovery that may cause replicas to diverge. [#26321](https://github.com/ClickHouse/ClickHouse/pull/26321) ([tavplubix](https://github.com/tavplubix)).
+* Fix zstd decompression in case there are escape sequences at the end of internal buffer. Closes [#26013](https://github.com/ClickHouse/ClickHouse/issues/26013). [#26314](https://github.com/ClickHouse/ClickHouse/pull/26314) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix logical error on join with totals, close [#26017](https://github.com/ClickHouse/ClickHouse/issues/26017). [#26250](https://github.com/ClickHouse/ClickHouse/pull/26250) ([Vladimir C](https://github.com/vdimir)).
+* Remove excessive newline in `thread_name` column in `system.stack_trace` table. Fix [#24124](https://github.com/ClickHouse/ClickHouse/issues/24124). [#26210](https://github.com/ClickHouse/ClickHouse/pull/26210) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix `joinGet` with `LowCarinality` columns, close [#25993](https://github.com/ClickHouse/ClickHouse/issues/25993). [#26118](https://github.com/ClickHouse/ClickHouse/pull/26118) ([Vladimir C](https://github.com/vdimir)).
+* Fix possible crash in `pointInPolygon` if the setting `validate_polygons` is turned off. [#26113](https://github.com/ClickHouse/ClickHouse/pull/26113) ([alexey-milovidov](https://github.com/alexey-milovidov)).
+* Fix throwing exception when iterate over non-existing remote directory. [#26087](https://github.com/ClickHouse/ClickHouse/pull/26087) ([ianton-ru](https://github.com/ianton-ru)).
+* Fix rare server crash because of `abort` in ZooKeeper client. Fixes [#25813](https://github.com/ClickHouse/ClickHouse/issues/25813). [#26079](https://github.com/ClickHouse/ClickHouse/pull/26079) ([alesapin](https://github.com/alesapin)).
+* Fix wrong thread count estimation for right subquery join in some cases. Close [#24075](https://github.com/ClickHouse/ClickHouse/issues/24075). [#26052](https://github.com/ClickHouse/ClickHouse/pull/26052) ([Vladimir C](https://github.com/vdimir)).
+* Fixed incorrect `sequence_id` in MySQL protocol packets that ClickHouse sends on exception during query execution. It might cause MySQL client to reset connection to ClickHouse server. Fixes [#21184](https://github.com/ClickHouse/ClickHouse/issues/21184). [#26051](https://github.com/ClickHouse/ClickHouse/pull/26051) ([tavplubix](https://github.com/tavplubix)).
+* Fix possible mismatched header when using normal projection with `PREWHERE`. Fix [#26020](https://github.com/ClickHouse/ClickHouse/issues/26020). [#26038](https://github.com/ClickHouse/ClickHouse/pull/26038) ([Amos Bird](https://github.com/amosbird)).
+* Fix formatting of type `Map` with integer keys to `JSON`. [#25982](https://github.com/ClickHouse/ClickHouse/pull/25982) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible deadlock during query profiler stack unwinding. Fix [#25968](https://github.com/ClickHouse/ClickHouse/issues/25968). [#25970](https://github.com/ClickHouse/ClickHouse/pull/25970) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix crash on call `dictGet()` with bad arguments. [#25913](https://github.com/ClickHouse/ClickHouse/pull/25913) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fixed `scram-sha-256` authentication for PostgreSQL engines. Closes [#24516](https://github.com/ClickHouse/ClickHouse/issues/24516). [#25906](https://github.com/ClickHouse/ClickHouse/pull/25906) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix extremely long backoff for background tasks when the background pool is full. Fixes [#25836](https://github.com/ClickHouse/ClickHouse/issues/25836). [#25893](https://github.com/ClickHouse/ClickHouse/pull/25893) ([alesapin](https://github.com/alesapin)).
+* Fix ARM exception handling with non default page size. Fixes [#25512](https://github.com/ClickHouse/ClickHouse/issues/25512), [#25044](https://github.com/ClickHouse/ClickHouse/issues/25044), [#24901](https://github.com/ClickHouse/ClickHouse/issues/24901), [#23183](https://github.com/ClickHouse/ClickHouse/issues/23183), [#20221](https://github.com/ClickHouse/ClickHouse/issues/20221), [#19703](https://github.com/ClickHouse/ClickHouse/issues/19703), [#19028](https://github.com/ClickHouse/ClickHouse/issues/19028), [#18391](https://github.com/ClickHouse/ClickHouse/issues/18391), [#18121](https://github.com/ClickHouse/ClickHouse/issues/18121), [#17994](https://github.com/ClickHouse/ClickHouse/issues/17994), [#12483](https://github.com/ClickHouse/ClickHouse/issues/12483). [#25854](https://github.com/ClickHouse/ClickHouse/pull/25854) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix sharding_key from column w/o function for `remote()` (before `select * from remote('127.1', system.one, dummy)` leads to `Unknown column: dummy, there are only columns .` error). [#25824](https://github.com/ClickHouse/ClickHouse/pull/25824) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed `Not found column ...` and `Missing column ...` errors when selecting from `MaterializeMySQL`. Fixes [#23708](https://github.com/ClickHouse/ClickHouse/issues/23708), [#24830](https://github.com/ClickHouse/ClickHouse/issues/24830), [#25794](https://github.com/ClickHouse/ClickHouse/issues/25794). [#25822](https://github.com/ClickHouse/ClickHouse/pull/25822) ([tavplubix](https://github.com/tavplubix)).
+* Fix `optimize_skip_unused_shards_rewrite_in` for non-UInt64 types (may select incorrect shards eventually or throw `Cannot infer type of an empty tuple` or `Function tuple requires at least one argument`). [#25798](https://github.com/ClickHouse/ClickHouse/pull/25798) ([Azat Khuzhin](https://github.com/azat)).
+* Fix rare bug with `DROP PART` query for `ReplicatedMergeTree` tables which can lead to error message `Unexpected merged part intersecting drop range`. [#25783](https://github.com/ClickHouse/ClickHouse/pull/25783) ([alesapin](https://github.com/alesapin)).
+* Fix bug in `TTL` with `GROUP BY` expression which refuses to execute `TTL` after first execution in part. [#25743](https://github.com/ClickHouse/ClickHouse/pull/25743) ([alesapin](https://github.com/alesapin)).
+* Allow StorageMerge to access tables with aliases. Closes [#6051](https://github.com/ClickHouse/ClickHouse/issues/6051). [#25694](https://github.com/ClickHouse/ClickHouse/pull/25694) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix slow dict join in some cases, close [#24209](https://github.com/ClickHouse/ClickHouse/issues/24209). [#25618](https://github.com/ClickHouse/ClickHouse/pull/25618) ([Vladimir C](https://github.com/vdimir)).
+* Fix `ALTER MODIFY COLUMN` of columns, which participates in TTL expressions. [#25554](https://github.com/ClickHouse/ClickHouse/pull/25554) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix assertion in `PREWHERE` with non-UInt8 type, close [#19589](https://github.com/ClickHouse/ClickHouse/issues/19589). [#25484](https://github.com/ClickHouse/ClickHouse/pull/25484) ([Vladimir C](https://github.com/vdimir)).
+* Fix some fuzzed msan crash. Fixes [#22517](https://github.com/ClickHouse/ClickHouse/issues/22517). [#26428](https://github.com/ClickHouse/ClickHouse/pull/26428) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update `chown` cmd check in `clickhouse-server` docker entrypoint. It fixes error 'cluster pod restart failed (or timeout)' on kubernetes. [#26545](https://github.com/ClickHouse/ClickHouse/pull/26545) ([Ky Li](https://github.com/Kylinrix)).
+
+
 ### ClickHouse release v21.7, 2021-07-09
 
 #### Backward Incompatible Change
@@ -1043,7 +1456,7 @@
 * Export current max ddl entry executed by DDLWorker via server metric. It's useful to check if DDLWorker hangs somewhere. [#17464](https://github.com/ClickHouse/ClickHouse/pull/17464) ([Amos Bird](https://github.com/amosbird)).
 * Export asynchronous metrics of all servers current threads. It's useful to track down issues like [this](https://github.com/ClickHouse-Extras/poco/pull/28). [#17463](https://github.com/ClickHouse/ClickHouse/pull/17463) ([Amos Bird](https://github.com/amosbird)).
 * Include dynamic columns like MATERIALIZED / ALIAS for wildcard query when settings `asterisk_include_materialized_columns` and `asterisk_include_alias_columns` are turned on. [#17462](https://github.com/ClickHouse/ClickHouse/pull/17462) ([Ken Chen](https://github.com/chenziliang)).
-* Allow specifying [TTL](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl) to remove old entries from [system log tables](https://clickhouse.tech/docs/en/operations/system-tables/), using the `<ttl>` attribute in `config.xml`. [#17438](https://github.com/ClickHouse/ClickHouse/pull/17438) ([Du Chuan](https://github.com/spongedu)).
+* Allow specifying [TTL](https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl) to remove old entries from [system log tables](https://clickhouse.com/docs/en/operations/system-tables/), using the `<ttl>` attribute in `config.xml`. [#17438](https://github.com/ClickHouse/ClickHouse/pull/17438) ([Du Chuan](https://github.com/spongedu)).
 * Now queries coming to the server via MySQL and PostgreSQL protocols have distinctive interface types (which can be seen in the `interface` column of the table`system.query_log`): `4` for MySQL, and `5` for PostgreSQL, instead of formerly used `1` which is now used for the native protocol only. [#17437](https://github.com/ClickHouse/ClickHouse/pull/17437) ([Vitaly Baranov](https://github.com/vitlibar)).
 * Fix parsing of SETTINGS clause of the `INSERT ... SELECT ... SETTINGS` query. [#17414](https://github.com/ClickHouse/ClickHouse/pull/17414) ([Azat Khuzhin](https://github.com/azat)).
 * Correctly account memory in RadixSort. [#17412](https://github.com/ClickHouse/ClickHouse/pull/17412) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
@@ -1183,13 +1596,6 @@
 * PODArray: Avoid call to memcpy with (nullptr, 0) arguments (Fix UBSan report). This fixes [#18525](https://github.com/ClickHouse/ClickHouse/issues/18525). [#18526](https://github.com/ClickHouse/ClickHouse/pull/18526) ([alexey-milovidov](https://github.com/alexey-milovidov)).
 * Minor improvement for path concatenation of zookeeper paths inside DDLWorker. [#17767](https://github.com/ClickHouse/ClickHouse/pull/17767) ([Bharat Nallan](https://github.com/bharatnc)).
 * Allow to reload symbols from debug file. This PR also fixes a build-id issue. [#17637](https://github.com/ClickHouse/ClickHouse/pull/17637) ([Amos Bird](https://github.com/amosbird)).
-* TestFlows: fixes to LDAP tests that fail due to slow test execution. [#18790](https://github.com/ClickHouse/ClickHouse/pull/18790) ([vzakaznikov](https://github.com/vzakaznikov)).
-* TestFlows: Merging requirements for AES encryption functions. Updating aes_encryption tests to use new requirements. Updating TestFlows version to 1.6.72. [#18221](https://github.com/ClickHouse/ClickHouse/pull/18221) ([vzakaznikov](https://github.com/vzakaznikov)).
-* TestFlows: Updating TestFlows version to the latest 1.6.72. Re-generating requirements.py. [#18208](https://github.com/ClickHouse/ClickHouse/pull/18208) ([vzakaznikov](https://github.com/vzakaznikov)).
-* TestFlows: Updating TestFlows README.md to include "How To Debug Why Test Failed" section. [#17808](https://github.com/ClickHouse/ClickHouse/pull/17808) ([vzakaznikov](https://github.com/vzakaznikov)).
-* TestFlows: tests for RBAC [ACCESS MANAGEMENT](https://clickhouse.tech/docs/en/sql-reference/statements/grant/#grant-access-management) privileges. [#17804](https://github.com/ClickHouse/ClickHouse/pull/17804) ([MyroTk](https://github.com/MyroTk)).
-* TestFlows: RBAC tests for SHOW, TRUNCATE, KILL, and OPTIMIZE. - Updates to old tests. - Resolved comments from #https://github.com/ClickHouse/ClickHouse/pull/16977. [#17657](https://github.com/ClickHouse/ClickHouse/pull/17657) ([MyroTk](https://github.com/MyroTk)).
-* TestFlows: Added RBAC tests for `ATTACH`, `CREATE`, `DROP`, and `DETACH`. [#16977](https://github.com/ClickHouse/ClickHouse/pull/16977) ([MyroTk](https://github.com/MyroTk)).
 
 
 ## [Changelog for 2020](https://github.com/ClickHouse/ClickHouse/blob/master/docs/en/whats-new/changelog/2020.md)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24022c256ec..ede70b09d94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.14)
 
 foreach(policy
         CMP0023
@@ -45,6 +45,7 @@ include (cmake/arch.cmake)
 include (cmake/target.cmake)
 include (cmake/tools.cmake)
 include (cmake/analysis.cmake)
+include (cmake/git_status.cmake)
 
 # Ignore export() since we don't use it,
 # but it gets broken with a global targets via link_libraries()
@@ -79,16 +80,16 @@ include (cmake/find/ccache.cmake)
 # ccache ignore it.
 option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile too long or to take too much memory while compiling." OFF)
 if (ENABLE_CHECK_HEAVY_BUILDS)
-    # set DATA (since RSS does not work since 2.6.x+) to 2G
+    # set DATA (since RSS does not work since 2.6.x+) to 5G
     set (RLIMIT_DATA 5000000000)
     # set VIRT (RLIMIT_AS) to 10G (DATA*10)
     set (RLIMIT_AS 10000000000)
-    # set CPU time limit to 600 seconds
-    set (RLIMIT_CPU 600)
+    # set CPU time limit to 1000 seconds
+    set (RLIMIT_CPU 1000)
 
     # gcc10/gcc10/clang -fsanitize=memory is too heavy
     if (SANITIZE STREQUAL "memory" OR COMPILER_GCC)
-       set (RLIMIT_DATA 10000000000)
+       set (RLIMIT_DATA 10000000000) # 10G
     endif()
 
     set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=${RLIMIT_CPU} ${CMAKE_CXX_COMPILER_LAUNCHER})
@@ -126,13 +127,28 @@ if (USE_STATIC_LIBRARIES)
     list(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
 endif ()
 
-# Implies ${WITH_COVERAGE}
 option (ENABLE_FUZZING "Fuzzy testing using libfuzzer" OFF)
 
 if (ENABLE_FUZZING)
+    # Also set WITH_COVERAGE=1 for better fuzzing process
+    # By default this is disabled, because fuzzers are built in CI with the clickhouse itself.
+    # And we don't want to enable coverage for it.
     message (STATUS "Fuzzing instrumentation enabled")
-    set (WITH_COVERAGE ON)
     set (FUZZER "libfuzzer")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib++")
+    set (ENABLE_CLICKHOUSE_ODBC_BRIDGE OFF)
+    set (ENABLE_LIBRARIES 0)
+    set (ENABLE_SSL 1)
+    set (USE_INTERNAL_SSL_LIBRARY 1)
+    set (USE_UNWIND ON)
+    set (ENABLE_EMBEDDED_COMPILER 0)
+    set (ENABLE_EXAMPLES 0)
+    set (ENABLE_UTILS 0)
+    set (ENABLE_THINLTO 0)
+    set (ENABLE_TCMALLOC 0)
+    set (ENABLE_JEMALLOC 0)
+    set (ENABLE_CHECK_HEAVY_BUILDS 1)
+    set (GLIBC_COMPATIBILITY OFF)
 endif()
 
 # Global libraries
@@ -150,6 +166,7 @@ if (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT DISABLE_COLORED_BUILD)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
 endif ()
 
+include (cmake/check_flags.cmake)
 include (cmake/add_warning.cmake)
 
 if (NOT MSVC)
@@ -163,27 +180,46 @@ if (COMPILER_CLANG)
     if (NOT CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE")
         set(COMPILER_FLAGS "${COMPILER_FLAGS} -gdwarf-aranges")
     endif ()
+
+    if (HAS_USE_CTOR_HOMING)
+        # For more info see https://blog.llvm.org/posts/2021-04-05-constructor-homing-for-debug-info/
+		if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO")
+            set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xclang -fuse-ctor-homing")
+            set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xclang -fuse-ctor-homing")
+        endif()
+    endif()
+endif ()
+
+# If compiler has support for -Wreserved-identifier. It is difficult to detect by clang version,
+# because there are two different branches of clang: clang and AppleClang.
+# (AppleClang is not supported by ClickHouse, but some developers have misfortune to use it).
+if (HAS_RESERVED_IDENTIFIER)
+    add_compile_definitions (HAS_RESERVED_IDENTIFIER)
 endif ()
 
 # If turned `ON`, assumes the user has either the system GTest library or the bundled one.
 option(ENABLE_TESTS "Provide unit_test_dbms target with Google.Test unit tests" ON)
 option(ENABLE_EXAMPLES "Build all example programs in 'examples' subdirectories" OFF)
 
-if (OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64) AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND CMAKE_VERSION VERSION_GREATER "3.9.0")
+if (OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64) AND NOT UNBUNDLED AND MAKE_STATIC_LIBRARIES AND NOT SPLIT_SHARED_LIBRARIES AND NOT USE_MUSL)
     # Only for Linux, x86_64 or aarch64.
     option(GLIBC_COMPATIBILITY "Enable compatibility with older glibc libraries." ON)
 elseif(GLIBC_COMPATIBILITY)
     message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
 endif ()
 
-if (NOT CMAKE_VERSION VERSION_GREATER "3.9.0")
-    message (WARNING "CMake version must be greater than 3.9.0 for production builds.")
-endif ()
+if (GLIBC_COMPATIBILITY)
+    # NOTE: we may also want to check glibc version and add -include only for 2.32+
+    # however this is extra complexity, especially for cross compiling.
+    # And anyway it should not break anything for <2.32.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/base/glibc-compatibility/glibc-compat-2.32.h")
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -include ${CMAKE_CURRENT_SOURCE_DIR}/base/glibc-compatibility/glibc-compat-2.32.h")
+endif()
 
 # Make sure the final executable has symbols exported
 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
 
-find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
+find_program (OBJCOPY_PATH NAMES "llvm-objcopy" "llvm-objcopy-13" "llvm-objcopy-12" "llvm-objcopy-11" "llvm-objcopy-10" "llvm-objcopy-9" "llvm-objcopy-8" "objcopy")
 
 if (NOT OBJCOPY_PATH AND OS_DARWIN)
     find_program (BREW_PATH NAMES "brew")
@@ -271,12 +307,6 @@ endif()
 
 include(cmake/cpu_features.cmake)
 
-option(ARCH_NATIVE "Add -march=native compiler flag. This makes your binaries non-portable but more performant code may be generated.")
-
-if (ARCH_NATIVE)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=native")
-endif ()
-
 # Asynchronous unwind tables are needed for Query Profiler.
 # They are already by default on some platforms but possibly not on all platforms.
 # Enable it explicitly.
@@ -315,6 +345,10 @@ if (COMPILER_GCC OR COMPILER_CLANG)
     set(COMPILER_FLAGS "${COMPILER_FLAGS} -falign-functions=32")
 endif ()
 
+if (COMPILER_GCC)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcoroutines")
+endif ()
+
 # Compiler-specific coverage flags e.g. -fcoverage-mapping for gcc
 option(WITH_COVERAGE "Profile the resulting binary/binaries" OFF)
 
@@ -376,7 +410,7 @@ if (COMPILER_CLANG)
     endif ()
 
     # Always prefer llvm tools when using clang. For instance, we cannot use GNU ar when llvm LTO is enabled
-    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+    find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
 
     if (LLVM_AR_PATH)
         message(STATUS "Using llvm-ar: ${LLVM_AR_PATH}.")
@@ -385,7 +419,7 @@ if (COMPILER_CLANG)
         message(WARNING "Cannot find llvm-ar. System ar will be used instead. It does not work with ThinLTO.")
     endif ()
 
-    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
+    find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9" "llvm-ranlib-8")
 
     if (LLVM_RANLIB_PATH)
         message(STATUS "Using llvm-ranlib: ${LLVM_RANLIB_PATH}.")
@@ -401,9 +435,10 @@ endif ()
 # Turns on all external libs like s3, kafka, ODBC, ...
 option(ENABLE_LIBRARIES "Enable all external libraries by default" ON)
 
-# We recommend avoiding this mode for production builds because we can't guarantee all needed libraries exist in your
-# system.
+# We recommend avoiding this mode for production builds because we can't guarantee
+# all needed libraries exist in your system.
 # This mode exists for enthusiastic developers who are searching for trouble.
+# The whole idea of using unknown version of libraries from the OS distribution is deeply flawed.
 # Useful for maintainers of OS packages.
 option (UNBUNDLED "Use system libraries instead of ones in contrib/" OFF)
 
@@ -543,6 +578,8 @@ include (cmake/find/nuraft.cmake)
 include (cmake/find/yaml-cpp.cmake)
 include (cmake/find/s2geometry.cmake)
 include (cmake/find/nlp.cmake)
+include (cmake/find/bzip2.cmake)
+include (cmake/find/filelog.cmake)
 
 if(NOT USE_INTERNAL_PARQUET_LIBRARY)
     set (ENABLE_ORC OFF CACHE INTERNAL "")
@@ -555,6 +592,7 @@ include (cmake/find/cassandra.cmake)
 include (cmake/find/sentry.cmake)
 include (cmake/find/stats.cmake)
 include (cmake/find/datasketches.cmake)
+include (cmake/find/libprotobuf-mutator.cmake)
 
 set (USE_INTERNAL_CITYHASH_LIBRARY ON CACHE INTERNAL "")
 find_contrib_lib(cityhash)
@@ -597,7 +635,23 @@ macro (add_executable target)
         # disabled for TSAN and gcc since libtsan.a provides overrides too
         if (TARGET clickhouse_new_delete)
             # operator::new/delete for executables (MemoryTracker stuff)
-            target_link_libraries (${target} PRIVATE clickhouse_new_delete ${MALLOC_LIBRARIES})
+            target_link_libraries (${target} PRIVATE clickhouse_new_delete)
+        endif()
+
+        # In case of static jemalloc, because zone_register() is located in zone.c and
+        # is never used outside (it is declared as constructor) it is omitted
+        # by the linker, and so jemalloc will not be registered as system
+        # allocator under osx [1], and clickhouse will SIGSEGV.
+        #
+        #   [1]: https://github.com/jemalloc/jemalloc/issues/708
+        #
+        # About symbol name:
+        # - _zone_register not zone_register due to Mach-O binary format,
+        # - _je_zone_register due to JEMALLOC_PRIVATE_NAMESPACE=je_ under OS X.
+        # - but jemalloc-cmake does not run private_namespace.sh
+        #   so symbol name should be _zone_register
+        if (ENABLE_JEMALLOC AND MAKE_STATIC_LIBRARIES AND OS_DARWIN)
+            set_property(TARGET ${target} APPEND PROPERTY LINK_OPTIONS -u_zone_register)
         endif()
     endif()
 endmacro()
@@ -608,9 +662,6 @@ include_directories(${ConfigIncludePath})
 # Add as many warnings as possible for our own code.
 include (cmake/warnings.cmake)
 
-# Check if needed compiler flags are supported
-include (cmake/check_flags.cmake)
-
 add_subdirectory (base)
 add_subdirectory (src)
 add_subdirectory (programs)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e16957b759d..8628d7a01fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,38 +6,6 @@ Thank you.
 
 ## Technical Info
 
-We have a [developer's guide](https://clickhouse.yandex/docs/en/development/developer_instruction/) for writing code for ClickHouse. Besides this guide, you can find [Overview of ClickHouse Architecture](https://clickhouse.yandex/docs/en/development/architecture/) and instructions on how to build ClickHouse in different environments.
+We have a [developer's guide](https://clickhouse.com/docs/en/development/developer_instruction/) for writing code for ClickHouse. Besides this guide, you can find [Overview of ClickHouse Architecture](https://clickhouse.com/docs/en/development/architecture/) and instructions on how to build ClickHouse in different environments.
 
 If you want to contribute to documentation, read the [Contributing to ClickHouse Documentation](docs/README.md) guide.
-
-## Legal Info
-
-In order for us (YANDEX LLC) to accept patches and other contributions from you, you may adopt our Yandex Contributor License Agreement (the "**CLA**"). The current version of the CLA you may find here:
-1) https://yandex.ru/legal/cla/?lang=en (in English) and
-2) https://yandex.ru/legal/cla/?lang=ru (in Russian).
-
-By adopting the CLA, you state the following:
-
-* You obviously wish and are willingly licensing your contributions to us for our open source projects under the terms of the CLA,
-* You have read the terms and conditions of the CLA and agree with them in full,
-* You are legally able to provide and license your contributions as stated,
-* We may use your contributions for our open source projects and for any other our project too,
-* We rely on your assurances concerning the rights of third parties in relation to your contributions.
-
-If you agree with these principles, please read and adopt our CLA. By providing us your contributions, you hereby declare that you have already read and adopt our CLA, and we may freely merge your contributions with our corresponding open source project and use it in further in accordance with terms and conditions of the CLA.
-
-If you have already adopted terms and conditions of the CLA, you are able to provide your contributes. When you submit your pull request, please add the following information into it:
-
-```
-I hereby agree to the terms of the CLA available at: [link].
-```
-
-Replace the bracketed text as follows:
-* [link] is the link at the current version of the CLA (you may add here a link https://yandex.ru/legal/cla/?lang=en (in English) or a link https://yandex.ru/legal/cla/?lang=ru (in Russian).
-
-It is enough to provide us such notification once.
-
-As an alternative, you can provide DCO instead of CLA. You can find the text of DCO here: https://developercertificate.org/
-It is enough to read and copy it verbatim to your pull request.
-
-If you don't agree with the CLA and don't want to provide DCO, you still can open a pull request to provide your contributions.
diff --git a/LICENSE b/LICENSE
index 9167b80e269..80dbd30140b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2016-2021 Yandex LLC
+Copyright 2016-2021 ClickHouse, Inc.
 
                                  Apache License
                            Version 2.0, January 2004
@@ -188,7 +188,7 @@ Copyright 2016-2021 Yandex LLC
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2016-2021 Yandex LLC
+   Copyright 2016-2021 ClickHouse, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 496a6357f44..e12238577a7 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,14 @@
-[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/ClickHouse/raw/master/website/images/logo-400x240.png)](https://clickhouse.tech)
+[![ClickHouse — open source distributed column-oriented DBMS](https://github.com/ClickHouse/ClickHouse/raw/master/website/images/logo-400x240.png)](https://clickhouse.com)
 
-ClickHouse® is an open-source column-oriented database management system that allows generating analytical data reports in real time.
+ClickHouse® is an open-source column-oriented database management system that allows generating analytical data reports in real-time.
 
 ## Useful Links
 
-* [Official website](https://clickhouse.tech/) has quick high-level overview of ClickHouse on main page.
-* [Tutorial](https://clickhouse.tech/docs/en/getting_started/tutorial/) shows how to set up and query small ClickHouse cluster.
-* [Documentation](https://clickhouse.tech/docs/en/) provides more in-depth information.
+* [Official website](https://clickhouse.com/) has a quick high-level overview of ClickHouse on the main page.
+* [Tutorial](https://clickhouse.com/docs/en/getting_started/tutorial/) shows how to set up and query a small ClickHouse cluster.
+* [Documentation](https://clickhouse.com/docs/en/) provides more in-depth information.
 * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format.
-* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg) and [Telegram](https://telegram.me/clickhouse_en) allow to chat with ClickHouse users in real-time.
-* [Blog](https://clickhouse.yandex/blog/en/) contains various ClickHouse-related articles, as well as announcements and reports about events.
-* [Code Browser](https://clickhouse.tech/codebrowser/html_report/ClickHouse/index.html) with syntax highlight and navigation.
-* [Contacts](https://clickhouse.tech/#contacts) can help to get your questions answered if there are any.
-* You can also [fill this form](https://clickhouse.tech/#meet) to meet Yandex ClickHouse team in person.
+* [Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg) and [Telegram](https://telegram.me/clickhouse_en) allow chatting with ClickHouse users in real-time.
+* [Blog](https://clickhouse.com/blog/en/) contains various ClickHouse-related articles, as well as announcements and reports about events.
+* [Code Browser](https://clickhouse.com/codebrowser/html_report/ClickHouse/index.html) with syntax highlight and navigation.
+* [Contacts](https://clickhouse.com/company/#contact) can help to get your questions answered if there are any.
diff --git a/SECURITY.md b/SECURITY.md
index 906b2966348..6b82c97e7d9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,28 +1,52 @@
 # Security Policy
 
-## Supported Versions
+## Security Announcements
+Security fixes will be announced by posting them in the [security changelog](https://clickhouse.com/docs/en/whats-new/security-changelog/).
 
-The following versions of ClickHouse server are
-currently being supported with security updates:
+## Scope and Supported Versions
+
+The following versions of ClickHouse server are currently being supported with security updates:
 
 | Version | Supported          |
 | ------- | ------------------ |
 | 1.x   | :x: |
 | 18.x   | :x:                |
 | 19.x   | :x:                |
-| 20.1   | :x: |
-| 20.3   | :white_check_mark: |
-| 20.4   | :x: |
-| 20.5   | :x: |
-| 20.6   | :x: |
-| 20.7   | :x: |
-| 20.8   | :white_check_mark: |
-| 20.9   | :x: |
-| 20.10  | :x: |
-| 20.11  | :white_check_mark: |
-| 20.12  | :white_check_mark: |
-| 21.1   | :white_check_mark: |
+| 20.x   | :x: |
+| 21.1   | :x: |
+| 21.2   | :x: |
+| 21.3   | ✅ |
+| 21.4   | :x: |
+| 21.5   | :x: |
+| 21.6   | :x: |
+| 21.7   | ✅ |
+| 21.8   | ✅ |
+| 21.9   | ✅ |
 
 ## Reporting a Vulnerability
 
-To report a potential vulnerability in ClickHouse please send the details about it to [clickhouse-feedback@yandex-team.com](mailto:clickhouse-feedback@yandex-team.com).
+We're extremely grateful for security researchers and users that report vulnerabilities to the ClickHouse Open Source Community. All reports are thoroughly investigated by developers.
+
+To report a potential vulnerability in ClickHouse please send the details about it to [security@clickhouse.com](mailto:security@clickhouse.com).
+
+### When Should I Report a Vulnerability?
+
+- You think you discovered a potential security vulnerability in ClickHouse
+- You are unsure how a vulnerability affects ClickHouse
+
+### When Should I NOT Report a Vulnerability?
+
+- You need help tuning ClickHouse components for security
+- You need help applying security related updates
+- Your issue is not security related
+
+## Security Vulnerability Response
+
+Each report is acknowledged and analyzed by ClickHouse maintainers within 5 working days.
+As the security issue moves from triage, to identified fix, to release planning we will keep the reporter updated.
+
+## Public Disclosure Timing
+
+A public disclosure date is negotiated by the ClickHouse maintainers and the bug submitter. We prefer to fully disclose the bug as soon as possible once a user mitigation is available. It is reasonable to delay disclosure when the bug or the fix is not yet fully understood, the solution is not well-tested, or for vendor coordination. The timeframe for disclosure is from immediate (especially if it's already publicly known) to 90 days. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days. 
+
+
diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 023dcaaccae..452b483fb6a 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -2,7 +2,7 @@ if (USE_CLANG_TIDY)
     set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
 endif ()
 
-add_subdirectory (common)
+add_subdirectory (base)
 add_subdirectory (daemon)
 add_subdirectory (loggers)
 add_subdirectory (pcg-random)
diff --git a/base/common/BorrowedObjectPool.h b/base/base/BorrowedObjectPool.h
similarity index 95%
rename from base/common/BorrowedObjectPool.h
rename to base/base/BorrowedObjectPool.h
index 6a90a7e7122..10dcc41d862 100644
--- a/base/common/BorrowedObjectPool.h
+++ b/base/base/BorrowedObjectPool.h
@@ -6,8 +6,8 @@
 #include <mutex>
 #include <condition_variable>
 
-#include <common/defines.h>
-#include <common/MoveOrCopyIfThrow.h>
+#include <base/defines.h>
+#include <base/MoveOrCopyIfThrow.h>
 
 /** Pool for limited size objects that cannot be used from different threads simultaneously.
   * The main use case is to have fixed size of objects that can be reused in difference threads during their lifetime
@@ -88,10 +88,12 @@ public:
     /// Return object into pool. Client must return same object that was borrowed.
     inline void returnObject(T && object_to_return)
     {
-        std::unique_lock<std::mutex> lck(objects_mutex);
+        {
+            std::lock_guard<std::mutex> lock(objects_mutex);
 
-        objects.emplace_back(std::move(object_to_return));
-        --borrowed_objects_size;
+            objects.emplace_back(std::move(object_to_return));
+            --borrowed_objects_size;
+        }
 
         condition_variable.notify_one();
     }
diff --git a/base/common/CMakeLists.txt b/base/base/CMakeLists.txt
similarity index 97%
rename from base/common/CMakeLists.txt
rename to base/base/CMakeLists.txt
index e5e18669ebe..281374b7121 100644
--- a/base/common/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@@ -29,7 +29,7 @@ elseif (ENABLE_READLINE)
 endif ()
 
 if (USE_DEBUG_HELPERS)
-    set (INCLUDE_DEBUG_HELPERS "-include \"${ClickHouse_SOURCE_DIR}/base/common/iostream_debug_helpers.h\"")
+    set (INCLUDE_DEBUG_HELPERS "-include \"${ClickHouse_SOURCE_DIR}/base/base/iostream_debug_helpers.h\"")
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INCLUDE_DEBUG_HELPERS}")
 endif ()
 
@@ -85,6 +85,7 @@ target_link_libraries (common
         replxx
         cctz
         fmt
+        magic_enum
 )
 
 if (ENABLE_TESTS)
diff --git a/base/base/CachedFn.h b/base/base/CachedFn.h
new file mode 100644
index 00000000000..ed1dbdbd48c
--- /dev/null
+++ b/base/base/CachedFn.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#include <map>
+#include <tuple>
+#include <mutex>
+#include "FnTraits.h"
+
+/**
+ * Caching proxy for a functor that decays to a pointer-to-function.
+ * Saves pairs (func args, func result on args).
+ * Cache size is unlimited. Cache items are evicted only on manual drop.
+ * Invocation/update is O(log(saved cache values)).
+ *
+ * See Common/tests/cached_fn.cpp for examples.
+  */
+template <auto * Func>
+struct CachedFn
+{
+private:
+    using Traits = FnTraits<decltype(Func)>;
+    using DecayedArgs = TLMap<std::decay_t, typename Traits::Args>;
+    using Key = TLChangeRoot<std::tuple, DecayedArgs>;
+    using Result = typename Traits::Ret;
+
+    std::map<Key, Result> cache; // Can't use hashmap as tuples are unhashable by default
+    mutable std::mutex mutex;
+
+public:
+    template <class ...Args>
+    Result operator()(Args && ...args)
+    {
+        Key key{std::forward<Args>(args)...};
+
+        {
+            std::lock_guard lock(mutex);
+
+            if (auto it = cache.find(key); it != cache.end())
+                return it->second;
+        }
+
+        Result res = std::apply(Func, key);
+
+        {
+            std::lock_guard lock(mutex);
+            cache.emplace(std::move(key), res);
+        }
+
+        return res;
+    }
+
+    template <class ...Args>
+    void update(Args && ...args)
+    {
+        Key key{std::forward<Args>(args)...};
+        Result res = std::apply(Func, key);
+
+        {
+            std::lock_guard lock(mutex);
+            // TODO Can't use emplace(std::move(key), ..), causes test_host_ip_change errors.
+            cache[key] = std::move(res);
+        }
+    }
+
+    size_t size() const
+    {
+        std::lock_guard lock(mutex);
+        return cache.size();
+    }
+
+    void drop()
+    {
+        std::lock_guard lock(mutex);
+        cache.clear();
+    }
+};
diff --git a/base/common/DateLUT.cpp b/base/base/DateLUT.cpp
similarity index 100%
rename from base/common/DateLUT.cpp
rename to base/base/DateLUT.cpp
diff --git a/base/common/DateLUT.h b/base/base/DateLUT.h
similarity index 100%
rename from base/common/DateLUT.h
rename to base/base/DateLUT.h
diff --git a/base/common/DateLUTImpl.cpp b/base/base/DateLUTImpl.cpp
similarity index 97%
rename from base/common/DateLUTImpl.cpp
rename to base/base/DateLUTImpl.cpp
index e7faeb63760..bbce3b111d3 100644
--- a/base/common/DateLUTImpl.cpp
+++ b/base/base/DateLUTImpl.cpp
@@ -3,7 +3,7 @@
 #include <cctz/civil_time.h>
 #include <cctz/time_zone.h>
 #include <cctz/zone_info_source.h>
-#include <common/getResource.h>
+#include <base/getResource.h>
 #include <Poco/Exception.h>
 
 #include <algorithm>
@@ -60,6 +60,7 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
     offset_at_start_of_epoch = cctz_time_zone.lookup(cctz_time_zone.lookup(epoch).pre).offset;
     offset_at_start_of_lut = cctz_time_zone.lookup(cctz_time_zone.lookup(lut_start).pre).offset;
     offset_is_whole_number_of_hours_during_epoch = true;
+    offset_is_whole_number_of_minutes_during_epoch = true;
 
     cctz::civil_day date = lut_start;
 
@@ -108,6 +109,9 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
         if (offset_is_whole_number_of_hours_during_epoch && start_of_day > 0 && start_of_day % 3600)
             offset_is_whole_number_of_hours_during_epoch = false;
 
+        if (offset_is_whole_number_of_minutes_during_epoch && start_of_day > 0 && start_of_day % 60)
+            offset_is_whole_number_of_minutes_during_epoch = false;
+
         /// If UTC offset was changed this day.
         /// Change in time zone without transition is possible, e.g. Moscow 1991 Sun, 31 Mar, 02:00 MSK to EEST
         cctz::time_zone::civil_transition transition{};
@@ -173,8 +177,6 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
 }
 
 
-#if !defined(ARCADIA_BUILD) /// Arcadia's variant of CCTZ already has the same implementation.
-
 /// Prefer to load timezones from blobs linked to the binary.
 /// The blobs are provided by "tzdata" library.
 /// This allows to avoid dependency on system tzdata.
@@ -230,5 +232,3 @@ namespace cctz_extension
 
     ZoneInfoSourceFactory zone_info_source_factory = custom_factory;
 }
-
-#endif
diff --git a/base/common/DateLUTImpl.h b/base/base/DateLUTImpl.h
similarity index 95%
rename from base/common/DateLUTImpl.h
rename to base/base/DateLUTImpl.h
index 202eb88a361..012d2cefe84 100644
--- a/base/common/DateLUTImpl.h
+++ b/base/base/DateLUTImpl.h
@@ -193,6 +193,7 @@ private:
     /// UTC offset at the beginning of the first supported year.
     Time offset_at_start_of_lut;
     bool offset_is_whole_number_of_hours_during_epoch;
+    bool offset_is_whole_number_of_minutes_during_epoch;
 
     /// Time zone name.
     std::string time_zone;
@@ -251,18 +252,23 @@ private:
     }
 
     template <typename T, typename Divisor>
-    static inline T roundDown(T x, Divisor divisor)
+    inline T roundDown(T x, Divisor divisor) const
     {
         static_assert(std::is_integral_v<T> && std::is_integral_v<Divisor>);
         assert(divisor > 0);
 
-        if (likely(x >= 0))
-            return x / divisor * divisor;
+        if (likely(offset_is_whole_number_of_hours_during_epoch))
+        {
+            if (likely(x >= 0))
+                return x / divisor * divisor;
 
-        /// Integer division for negative numbers rounds them towards zero (up).
-        /// We will shift the number so it will be rounded towards -inf (down).
+            /// Integer division for negative numbers rounds them towards zero (up).
+            /// We will shift the number so it will be rounded towards -inf (down).
+            return (x + 1 - divisor) / divisor * divisor;
+        }
 
-        return (x + 1 - divisor) / divisor * divisor;
+        Time date = find(x).date;
+        return date + (x - date) / divisor * divisor;
     }
 
 public:
@@ -459,10 +465,21 @@ public:
 
     inline unsigned toSecond(Time t) const
     {
-        auto res = t % 60;
-        if (likely(res >= 0))
-            return res;
-        return res + 60;
+        if (likely(offset_is_whole_number_of_minutes_during_epoch))
+        {
+            Time res = t % 60;
+            if (likely(res >= 0))
+                return res;
+            return res + 60;
+        }
+
+        LUTIndex index = findIndex(t);
+        Time time = t - lut[index].date;
+
+        if (time >= lut[index].time_at_offset_change())
+            time += lut[index].amount_of_offset_change();
+
+        return time % 60;
     }
 
     inline unsigned toMinute(Time t) const
@@ -483,29 +500,11 @@ public:
     }
 
     /// NOTE: Assuming timezone offset is a multiple of 15 minutes.
-    inline Time toStartOfMinute(Time t) const { return roundDown(t, 60); }
-    inline Time toStartOfFiveMinute(Time t) const { return roundDown(t, 300); }
-    inline Time toStartOfFifteenMinutes(Time t) const { return roundDown(t, 900); }
-
-    inline Time toStartOfTenMinutes(Time t) const
-    {
-        if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
-            return t / 600 * 600;
-
-        /// More complex logic is for Nepal - it has offset 05:45. Australia/Eucla is also unfortunate.
-        Time date = find(t).date;
-        return date + (t - date) / 600 * 600;
-    }
-
-    /// NOTE: Assuming timezone transitions are multiple of hours. Lord Howe Island in Australia is a notable exception.
-    inline Time toStartOfHour(Time t) const
-    {
-        if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
-            return t / 3600 * 3600;
-
-        Time date = find(t).date;
-        return date + (t - date) / 3600 * 3600;
-    }
+    inline Time toStartOfMinute(Time t) const { return toStartOfMinuteInterval(t, 1); }
+    inline Time toStartOfFiveMinute(Time t) const { return toStartOfMinuteInterval(t, 5); }
+    inline Time toStartOfFifteenMinutes(Time t) const { return toStartOfMinuteInterval(t, 15); }
+    inline Time toStartOfTenMinutes(Time t) const { return toStartOfMinuteInterval(t, 10); }
+    inline Time toStartOfHour(Time t) const { return roundDown(t, 3600); }
 
     /** Number of calendar day since the beginning of UNIX epoch (1970-01-01 is zero)
       * We use just two bytes for it. It covers the range up to 2105 and slightly more.
@@ -903,25 +902,24 @@ public:
 
     inline Time toStartOfMinuteInterval(Time t, UInt64 minutes) const
     {
-        if (minutes == 1)
-            return toStartOfMinute(t);
+        UInt64 divisor = 60 * minutes;
+        if (likely(offset_is_whole_number_of_minutes_during_epoch))
+        {
+            if (likely(t >= 0))
+                return t / divisor * divisor;
+            return (t + 1 - divisor) / divisor * divisor;
+        }
 
-        /** In contrast to "toStartOfHourInterval" function above,
-          * the minute intervals are not aligned to the midnight.
-          * You will get unexpected results if for example, you round down to 60 minute interval
-          * and there was a time shift to 30 minutes.
-          *
-          * But this is not specified in docs and can be changed in future.
-          */
-
-        UInt64 seconds = 60 * minutes;
-        return roundDown(t, seconds);
+        Time date = find(t).date;
+        return date + (t - date) / divisor * divisor;
     }
 
     inline Time toStartOfSecondInterval(Time t, UInt64 seconds) const
     {
         if (seconds == 1)
             return t;
+        if (seconds % 60 == 0)
+            return toStartOfMinuteInterval(t, seconds / 60);
 
         return roundDown(t, seconds);
     }
@@ -955,7 +953,7 @@ public:
     inline Time makeDateTime(Int16 year, UInt8 month, UInt8 day_of_month, UInt8 hour, UInt8 minute, UInt8 second) const
     {
         size_t index = makeLUTIndex(year, month, day_of_month);
-        UInt32 time_offset = hour * 3600 + minute * 60 + second;
+        Time time_offset = hour * 3600 + minute * 60 + second;
 
         if (time_offset >= lut[index].time_at_offset_change())
             time_offset -= lut[index].amount_of_offset_change();
diff --git a/base/common/DayNum.h b/base/base/DayNum.h
similarity index 82%
rename from base/common/DayNum.h
rename to base/base/DayNum.h
index 5cf4d4635c8..b707579ca0a 100644
--- a/base/common/DayNum.h
+++ b/base/base/DayNum.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/strong_typedef.h>
+#include <base/types.h>
+#include <base/strong_typedef.h>
 
 /** Represents number of days since 1970-01-01.
   * See DateLUTImpl for usage examples.
diff --git a/base/base/Decimal.h b/base/base/Decimal.h
new file mode 100644
index 00000000000..aefe852b749
--- /dev/null
+++ b/base/base/Decimal.h
@@ -0,0 +1,157 @@
+#pragma once
+#include <base/extended_types.h>
+
+#if !defined(NO_SANITIZE_UNDEFINED)
+#if defined(__clang__)
+    #define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#else
+    #define NO_SANITIZE_UNDEFINED
+#endif
+#endif
+
+namespace DB
+{
+template <class> struct Decimal;
+class DateTime64;
+
+using Decimal32 = Decimal<Int32>;
+using Decimal64 = Decimal<Int64>;
+using Decimal128 = Decimal<Int128>;
+using Decimal256 = Decimal<Int256>;
+
+template <class T>
+concept is_decimal =
+    std::is_same_v<T, Decimal32>
+    || std::is_same_v<T, Decimal64>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>
+    || std::is_same_v<T, DateTime64>;
+
+template <class T>
+concept is_over_big_int =
+    std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>
+    || std::is_same_v<T, Decimal128>
+    || std::is_same_v<T, Decimal256>;
+
+template <class T> struct NativeTypeT { using Type = T; };
+template <is_decimal T> struct NativeTypeT<T> { using Type = typename T::NativeType; };
+template <class T> using NativeType = typename NativeTypeT<T>::Type;
+
+/// Own FieldType for Decimal.
+/// It is only a "storage" for decimal.
+/// To perform operations, you also have to provide a scale (number of digits after point).
+template <typename T>
+struct Decimal
+{
+    using NativeType = T;
+
+    constexpr Decimal() = default;
+    constexpr Decimal(Decimal<T> &&) = default;
+    constexpr Decimal(const Decimal<T> &) = default;
+
+    constexpr Decimal(const T & value_): value(value_) {}
+
+    template <typename U>
+    constexpr Decimal(const Decimal<U> & x): value(x.value) {}
+
+    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
+    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
+
+    constexpr operator T () const { return value; }
+
+    template <typename U>
+    constexpr U convertTo() const
+    {
+        if constexpr (is_decimal<U>)
+            return convertTo<typename U::NativeType>();
+        else
+            return static_cast<U>(value);
+    }
+
+    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
+    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
+    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
+    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
+    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
+
+    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
+    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
+
+    /// This is to avoid UB for sumWithOverflow()
+    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
+
+    T value;
+};
+
+template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
+template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
+template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
+template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
+template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
+template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
+
+template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
+template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
+template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
+template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
+template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
+
+/// Distinguishable type to allow function resolution/deduction based on value type,
+/// but also relatively easy to convert to/from Decimal64.
+class DateTime64 : public Decimal64
+{
+public:
+    using Base = Decimal64;
+    using Base::Base;
+    using NativeType = Base::NativeType;
+
+    constexpr DateTime64(const Base & v): Base(v) {}
+};
+}
+
+constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
+
+namespace std
+{
+    template <typename T>
+    struct hash<DB::Decimal<T>>
+    {
+        size_t operator()(const DB::Decimal<T> & x) const { return hash<T>()(x.value); }
+    };
+
+    template <>
+    struct hash<DB::Decimal128>
+    {
+        size_t operator()(const DB::Decimal128 & x) const
+        {
+            return std::hash<DB::Int64>()(x.value >> 64)
+                ^ std::hash<DB::Int64>()(x.value & max_uint_mask);
+        }
+    };
+
+    template <>
+    struct hash<DB::DateTime64>
+    {
+        size_t operator()(const DB::DateTime64 & x) const
+        {
+            return std::hash<DB::DateTime64::NativeType>()(x);
+        }
+    };
+
+    template <>
+    struct hash<DB::Decimal256>
+    {
+        size_t operator()(const DB::Decimal256 & x) const
+        {
+            // FIXME temp solution
+            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
+                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
+        }
+    };
+}
diff --git a/base/common/DecomposedFloat.h b/base/base/DecomposedFloat.h
similarity index 99%
rename from base/common/DecomposedFloat.h
rename to base/base/DecomposedFloat.h
index 21034908fe7..652b28966b2 100644
--- a/base/common/DecomposedFloat.h
+++ b/base/base/DecomposedFloat.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <cstddef>
 #include <cstring>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 
 
 /// Allows to check the internals of IEEE-754 floating point number.
diff --git a/base/base/EnumReflection.h b/base/base/EnumReflection.h
new file mode 100644
index 00000000000..0d1f8ae0a40
--- /dev/null
+++ b/base/base/EnumReflection.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <magic_enum.hpp>
+#include <fmt/format.h>
+
+template <class T> concept is_enum = std::is_enum_v<T>;
+
+namespace detail
+{
+template <is_enum E, class F, size_t ...I>
+constexpr void static_for(F && f, std::index_sequence<I...>)
+{
+    (std::forward<F>(f)(std::integral_constant<E, magic_enum::enum_value<E>(I)>()) , ...);
+}
+}
+
+/**
+ * Iterate over enum values in compile-time (compile-time switch/case, loop unrolling).
+ *
+ * @example static_for<E>([](auto enum_value) { return template_func<enum_value>(); }
+ * ^ enum_value can be used as a template parameter
+ */
+template <is_enum E, class F>
+constexpr void static_for(F && f)
+{
+    constexpr size_t count = magic_enum::enum_count<E>();
+    detail::static_for<E>(std::forward<F>(f), std::make_index_sequence<count>());
+}
+
+/// Enable printing enum values as strings via fmt + magic_enum
+template <is_enum T>
+struct fmt::formatter<T> : fmt::formatter<std::string_view>
+{
+    constexpr auto format(T value, auto& format_context)
+    {
+        return formatter<string_view>::format(magic_enum::enum_name(value), format_context);
+    }
+};
diff --git a/base/common/ErrorHandlers.h b/base/base/ErrorHandlers.h
similarity index 96%
rename from base/common/ErrorHandlers.h
rename to base/base/ErrorHandlers.h
index 67194ee043b..bce92cad458 100644
--- a/base/common/ErrorHandlers.h
+++ b/base/base/ErrorHandlers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/ErrorHandler.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 
 
diff --git a/base/base/FnTraits.h b/base/base/FnTraits.h
new file mode 100644
index 00000000000..6b8dc7cd0d2
--- /dev/null
+++ b/base/base/FnTraits.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "Typelist.h"
+
+namespace detail
+{
+template <class T>
+struct FnTraits { template <class> static constexpr bool value = false; };
+
+template <class R, class ...A>
+struct FnTraits<R(A...)>
+{
+    template <class F>
+    static constexpr bool value = std::is_invocable_r_v<R, F, A...>;
+
+    using Ret = R;
+    using Args = Typelist<A...>;
+};
+
+template <class R, class ...A>
+struct FnTraits<R(*)(A...)> : FnTraits<R(A...)> {};
+}
+
+template <class T> using FnTraits = detail::FnTraits<T>;
+
+/**
+ * A less-typing alias for std::is_invokable_r_v.
+ * @example void foo(Fn<bool(int, char)> auto && functor)
+ */
+template <class F, class FS>
+concept Fn = FnTraits<FS>::template value<F>;
+
+template <auto Value>
+using Constant = std::integral_constant<decltype(Value), Value>;
diff --git a/base/common/FunctorToStaticMethodAdaptor.h b/base/base/FunctorToStaticMethodAdaptor.h
similarity index 100%
rename from base/common/FunctorToStaticMethodAdaptor.h
rename to base/base/FunctorToStaticMethodAdaptor.h
diff --git a/base/common/JSON.cpp b/base/base/JSON.cpp
similarity index 99%
rename from base/common/JSON.cpp
rename to base/base/JSON.cpp
index 9823591a2b6..bf65e6d455b 100644
--- a/base/common/JSON.cpp
+++ b/base/base/JSON.cpp
@@ -3,9 +3,9 @@
 
 #include <Poco/UTF8Encoding.h>
 #include <Poco/NumberParser.h>
-#include <common/JSON.h>
-#include <common/find_symbols.h>
-#include <common/preciseExp10.h>
+#include <base/JSON.h>
+#include <base/find_symbols.h>
+#include <base/preciseExp10.h>
 
 #include <iostream>
 
diff --git a/base/common/JSON.h b/base/base/JSON.h
similarity index 99%
rename from base/common/JSON.h
rename to base/base/JSON.h
index 7039036eeb3..5965b2b17a9 100644
--- a/base/common/JSON.h
+++ b/base/base/JSON.h
@@ -2,8 +2,8 @@
 
 #include <typeinfo>
 #include <Poco/Exception.h>
-#include <common/StringRef.h>
-#include <common/types.h>
+#include <base/StringRef.h>
+#include <base/types.h>
 
 
 /** Очень простой класс для чтения JSON (или его кусочков).
diff --git a/base/common/LineReader.cpp b/base/base/LineReader.cpp
similarity index 96%
rename from base/common/LineReader.cpp
rename to base/base/LineReader.cpp
index a32906dd5a5..5beebb58b3b 100644
--- a/base/common/LineReader.cpp
+++ b/base/base/LineReader.cpp
@@ -1,10 +1,14 @@
-#include <common/LineReader.h>
+#include <base/LineReader.h>
 
 #include <iostream>
 #include <string_view>
 
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
 
 #ifdef OS_LINUX
 /// We can detect if code is linked with one or another readline variants or open the library dynamically.
@@ -16,6 +20,10 @@ extern "C"
 }
 #endif
 
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace
 {
 
@@ -95,7 +103,6 @@ String LineReader::readLine(const String & first_prompt, const String & second_p
                 continue;
         }
 
-#if !defined(ARCADIA_BUILD) /// C++20
         const char * has_extender = nullptr;
         for (const auto * extender : extenders)
         {
@@ -125,7 +132,6 @@ String LineReader::readLine(const String & first_prompt, const String & second_p
             if (input.empty())
                 continue;
         }
-#endif
 
         line += (line.empty() ? "" : "\n") + input;
 
diff --git a/base/common/LineReader.h b/base/base/LineReader.h
similarity index 98%
rename from base/common/LineReader.h
rename to base/base/LineReader.h
index 159a93ce40d..0e36a9e01d1 100644
--- a/base/common/LineReader.h
+++ b/base/base/LineReader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <atomic>
 #include <vector>
diff --git a/base/common/LocalDate.h b/base/base/LocalDate.h
similarity index 99%
rename from base/common/LocalDate.h
rename to base/base/LocalDate.h
index 484847e1ff4..d199b9dbb4b 100644
--- a/base/common/LocalDate.h
+++ b/base/base/LocalDate.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <sstream>
 #include <exception>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 
 /** Stores a calendar date in broken-down form (year, month, day-in-month).
diff --git a/base/common/LocalDateTime.h b/base/base/LocalDateTime.h
similarity index 98%
rename from base/common/LocalDateTime.h
rename to base/base/LocalDateTime.h
index dde283e5ebb..0edc12374bb 100644
--- a/base/common/LocalDateTime.h
+++ b/base/base/LocalDateTime.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <iomanip>
 #include <exception>
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
 
 
 /** Stores calendar date and time in broken-down form.
diff --git a/base/common/MoveOrCopyIfThrow.h b/base/base/MoveOrCopyIfThrow.h
similarity index 96%
rename from base/common/MoveOrCopyIfThrow.h
rename to base/base/MoveOrCopyIfThrow.h
index caa1b51e2bc..d826bcb3d34 100644
--- a/base/common/MoveOrCopyIfThrow.h
+++ b/base/base/MoveOrCopyIfThrow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace detail
 {
diff --git a/base/common/ReadlineLineReader.cpp b/base/base/ReadlineLineReader.cpp
similarity index 98%
rename from base/common/ReadlineLineReader.cpp
rename to base/base/ReadlineLineReader.cpp
index f2c2b60f327..de444a0b1d9 100644
--- a/base/common/ReadlineLineReader.cpp
+++ b/base/base/ReadlineLineReader.cpp
@@ -1,6 +1,6 @@
-#include <common/ReadlineLineReader.h>
-#include <common/errnoToString.h>
-#include <common/scope_guard.h>
+#include <base/ReadlineLineReader.h>
+#include <base/errnoToString.h>
+#include <base/scope_guard.h>
 
 #include <errno.h>
 #include <signal.h>
diff --git a/base/common/ReadlineLineReader.h b/base/base/ReadlineLineReader.h
similarity index 100%
rename from base/common/ReadlineLineReader.h
rename to base/base/ReadlineLineReader.h
diff --git a/base/common/ReplxxLineReader.cpp b/base/base/ReplxxLineReader.cpp
similarity index 98%
rename from base/common/ReplxxLineReader.cpp
rename to base/base/ReplxxLineReader.cpp
index c79013f1850..38867faf5d5 100644
--- a/base/common/ReplxxLineReader.cpp
+++ b/base/base/ReplxxLineReader.cpp
@@ -1,5 +1,5 @@
-#include <common/ReplxxLineReader.h>
-#include <common/errnoToString.h>
+#include <base/ReplxxLineReader.h>
+#include <base/errnoToString.h>
 
 #include <chrono>
 #include <cerrno>
@@ -177,6 +177,10 @@ ReplxxLineReader::ReplxxLineReader(
     /// bind C-p/C-n to history-previous/history-next like readline.
     rx.bind_key(Replxx::KEY::control('N'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_NEXT, code); });
     rx.bind_key(Replxx::KEY::control('P'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::HISTORY_PREVIOUS, code); });
+
+    /// bind C-j to ENTER action.
+    rx.bind_key(Replxx::KEY::control('J'), [this](char32_t code) { return rx.invoke(Replxx::ACTION::COMMIT_LINE, code); });
+
     /// By default COMPLETE_NEXT/COMPLETE_PREV was binded to C-p/C-n, re-bind
     /// to M-P/M-N (that was used for HISTORY_COMMON_PREFIX_SEARCH before, but
     /// it also binded to M-p/M-n).
diff --git a/base/common/ReplxxLineReader.h b/base/base/ReplxxLineReader.h
similarity index 100%
rename from base/common/ReplxxLineReader.h
rename to base/base/ReplxxLineReader.h
diff --git a/base/common/StringRef.cpp b/base/base/StringRef.cpp
similarity index 100%
rename from base/common/StringRef.cpp
rename to base/base/StringRef.cpp
diff --git a/base/common/StringRef.h b/base/base/StringRef.h
similarity index 83%
rename from base/common/StringRef.h
rename to base/base/StringRef.h
index ac9d7c47b72..d0184dbc24c 100644
--- a/base/common/StringRef.h
+++ b/base/base/StringRef.h
@@ -7,8 +7,8 @@
 #include <functional>
 #include <iosfwd>
 
-#include <common/types.h>
-#include <common/unaligned.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 
 #include <city.h>
 
@@ -96,6 +96,39 @@ inline bool compareSSE2x4(const char * p1, const char * p2)
 
 inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
 {
+    /** The order of branches and the trick with overlapping comparisons
+      * are the same as in memcpy implementation.
+      * See the comments in base/glibc-compatibility/memcpy/memcpy.h
+      */
+
+    if (size <= 16)
+    {
+        if (size >= 8)
+        {
+            /// Chunks of 8..16 bytes.
+            return unalignedLoad<uint64_t>(p1) == unalignedLoad<uint64_t>(p2)
+                && unalignedLoad<uint64_t>(p1 + size - 8) == unalignedLoad<uint64_t>(p2 + size - 8);
+        }
+        else if (size >= 4)
+        {
+            /// Chunks of 4..7 bytes.
+            return unalignedLoad<uint32_t>(p1) == unalignedLoad<uint32_t>(p2)
+                && unalignedLoad<uint32_t>(p1 + size - 4) == unalignedLoad<uint32_t>(p2 + size - 4);
+        }
+        else if (size >= 2)
+        {
+            /// Chunks of 2..3 bytes.
+            return unalignedLoad<uint16_t>(p1) == unalignedLoad<uint16_t>(p2)
+                && unalignedLoad<uint16_t>(p1 + size - 2) == unalignedLoad<uint16_t>(p2 + size - 2);
+        }
+        else if (size >= 1)
+        {
+            /// A single byte.
+            return *p1 == *p2;
+        }
+        return true;
+    }
+
     while (size >= 64)
     {
         if (compareSSE2x4(p1, p2))
@@ -108,39 +141,14 @@ inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
             return false;
     }
 
-    switch ((size % 64) / 16)
+    switch (size / 16)
     {
         case 3: if (!compareSSE2(p1 + 32, p2 + 32)) return false; [[fallthrough]];
         case 2: if (!compareSSE2(p1 + 16, p2 + 16)) return false; [[fallthrough]];
-        case 1: if (!compareSSE2(p1     , p2     )) return false; [[fallthrough]];
-        case 0: break;
+        case 1: if (!compareSSE2(p1, p2)) return false;
     }
 
-    p1 += (size % 64) / 16 * 16;
-    p2 += (size % 64) / 16 * 16;
-
-    switch (size % 16)
-    {
-        case 15: if (p1[14] != p2[14]) return false; [[fallthrough]];
-        case 14: if (p1[13] != p2[13]) return false; [[fallthrough]];
-        case 13: if (p1[12] != p2[12]) return false; [[fallthrough]];
-        case 12: if (unalignedLoad<uint32_t>(p1 + 8) == unalignedLoad<uint32_t>(p2 + 8)) goto l8; else return false;
-        case 11: if (p1[10] != p2[10]) return false; [[fallthrough]];
-        case 10: if (p1[9] != p2[9]) return false; [[fallthrough]];
-        case 9:  if (p1[8] != p2[8]) return false;
-        l8: [[fallthrough]];
-        case 8:  return unalignedLoad<uint64_t>(p1) == unalignedLoad<uint64_t>(p2);
-        case 7:  if (p1[6] != p2[6]) return false; [[fallthrough]];
-        case 6:  if (p1[5] != p2[5]) return false; [[fallthrough]];
-        case 5:  if (p1[4] != p2[4]) return false; [[fallthrough]];
-        case 4:  return unalignedLoad<uint32_t>(p1) == unalignedLoad<uint32_t>(p2);
-        case 3:  if (p1[2] != p2[2]) return false; [[fallthrough]];
-        case 2:  return unalignedLoad<uint16_t>(p1) == unalignedLoad<uint16_t>(p2);
-        case 1:  if (p1[0] != p2[0]) return false; [[fallthrough]];
-        case 0:  break;
-    }
-
-    return true;
+    return compareSSE2(p1 + size - 16, p2 + size - 16);
 }
 
 #endif
diff --git a/base/base/TypeName.h b/base/base/TypeName.h
new file mode 100644
index 00000000000..b3ea47fad5d
--- /dev/null
+++ b/base/base/TypeName.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "Decimal.h"
+#include "UUID.h"
+
+namespace DB
+{
+struct Array;
+struct Tuple;
+struct Map;
+struct AggregateFunctionStateData;
+
+/**
+ * Obtain type string representation from real type if possible.
+ * @example TypeName<UInt8> == "UInt8"
+ */
+template <class T> constexpr inline std::string_view TypeName;
+
+#define TN_MAP(_A) \
+    template <> constexpr inline std::string_view TypeName<_A> = #_A;
+
+TN_MAP(UInt8)
+TN_MAP(UInt16)
+TN_MAP(UInt32)
+TN_MAP(UInt64)
+TN_MAP(UInt128)
+TN_MAP(UInt256)
+TN_MAP(Int8)
+TN_MAP(Int16)
+TN_MAP(Int32)
+TN_MAP(Int64)
+TN_MAP(Int128)
+TN_MAP(Int256)
+TN_MAP(Float32)
+TN_MAP(Float64)
+TN_MAP(String)
+TN_MAP(UUID)
+TN_MAP(Decimal32)
+TN_MAP(Decimal64)
+TN_MAP(Decimal128)
+TN_MAP(Decimal256)
+TN_MAP(DateTime64)
+TN_MAP(Array)
+TN_MAP(Tuple)
+TN_MAP(Map)
+
+/// Special case
+template <> constexpr inline std::string_view TypeName<AggregateFunctionStateData> = "AggregateFunctionState";
+
+#undef TN_MAP
+}
diff --git a/base/base/TypePair.h b/base/base/TypePair.h
new file mode 100644
index 00000000000..54f31831241
--- /dev/null
+++ b/base/base/TypePair.h
@@ -0,0 +1,4 @@
+#pragma once
+
+template <class T, class V> struct TypePair { };
+template <class T> struct Id { };
diff --git a/base/base/Typelist.h b/base/base/Typelist.h
new file mode 100644
index 00000000000..74abaf9e388
--- /dev/null
+++ b/base/base/Typelist.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <cstddef>
+#include <type_traits>
+#include <utility>
+#include "defines.h"
+#include "TypePair.h"
+
+/// General-purpose typelist. Easy on compilation times as it does not use recursion.
+template <class ...Args>
+struct Typelist { static constexpr size_t size = sizeof...(Args); };
+
+namespace TLUtils /// In some contexts it's more handy to use functions instead of aliases
+{
+template <class ...LArgs, class ...RArgs>
+constexpr Typelist<LArgs..., RArgs...> concat(Typelist<LArgs...>, Typelist<RArgs...>) { return {}; }
+
+template <class T, class ...Args>
+constexpr Typelist<T, Args...> prepend(Typelist<Args...>) { return {}; }
+
+template <class T, class ...Args>
+constexpr Typelist<Args..., T> append(Typelist<Args...>) { return {}; }
+
+template <template<class> class F, class ...Args>
+constexpr Typelist<F<Args>...> map(Typelist<Args...>) { return {}; }
+
+template <template<class...> class Root, class ...Args>
+constexpr Root<Args...> changeRoot(Typelist<Args...>) { return {}; }
+
+template <class F, class ...Args>
+constexpr void forEach(Typelist<Args...>, F && f) { (std::forward<F>(f)(Id<Args>{}), ...); }
+}
+
+template <class TLLeft, class TLRight>
+using TLConcat = decltype(TLUtils::concat(TLLeft{}, TLRight{}));
+
+template <class T, class Typelist> using TLPrepend = decltype(TLUtils::prepend<T>(Typelist{}));
+template <class T, class Typelist> using TLAppend = decltype(TLUtils::append<T>(Typelist{}));
+
+template <template<class> class F, class Typelist>
+using TLMap = decltype(TLUtils::map<F>(Typelist{}));
+
+template <template<class...> class Root, class Typelist>
+using TLChangeRoot = decltype(TLUtils::changeRoot<Root>(Typelist{}));
diff --git a/base/base/Typelists.h b/base/base/Typelists.h
new file mode 100644
index 00000000000..d5d58be96cc
--- /dev/null
+++ b/base/base/Typelists.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Typelist.h"
+#include "extended_types.h"
+#include "Decimal.h"
+#include "UUID.h"
+
+namespace DB
+{
+using TLIntegral = Typelist<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64>;
+using TLExtendedIntegral = Typelist<UInt128, Int128, UInt256, Int256>;
+using TLDecimals = Typelist<Decimal32, Decimal64, Decimal128, Decimal256>;
+
+using TLIntegralWithExtended = TLConcat<TLIntegral, TLExtendedIntegral>;
+
+using TLNumbers = TLConcat<TLIntegralWithExtended, TLDecimals>;
+using TLNumbersWithUUID = TLAppend<UUID, TLNumbers>;
+}
diff --git a/base/base/UUID.h b/base/base/UUID.h
new file mode 100644
index 00000000000..8b1ed16ea2f
--- /dev/null
+++ b/base/base/UUID.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "strong_typedef.h"
+#include "extended_types.h"
+
+namespace DB
+{
+using UUID = StrongTypedef<UInt128, struct UUIDTag>;
+}
diff --git a/base/common/argsToConfig.cpp b/base/base/argsToConfig.cpp
similarity index 100%
rename from base/common/argsToConfig.cpp
rename to base/base/argsToConfig.cpp
diff --git a/base/common/argsToConfig.h b/base/base/argsToConfig.h
similarity index 100%
rename from base/common/argsToConfig.h
rename to base/base/argsToConfig.h
diff --git a/base/common/arithmeticOverflow.h b/base/base/arithmeticOverflow.h
similarity index 91%
rename from base/common/arithmeticOverflow.h
rename to base/base/arithmeticOverflow.h
index 175e75a62f4..9a0e27505e1 100644
--- a/base/common/arithmeticOverflow.h
+++ b/base/base/arithmeticOverflow.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/extended_types.h>
-#include <common/defines.h>
+#include <base/extended_types.h>
+#include <base/defines.h>
 
 
 namespace common
@@ -145,6 +145,19 @@ namespace common
         return __builtin_mul_overflow(x, y, &res);
     }
 
+    template <typename T, typename U, typename R>
+    inline bool mulOverflow(T x, U y, R & res)
+    {
+        // not built in type, wide integer
+        if constexpr (is_big_int_v<T>  || is_big_int_v<R> || is_big_int_v<U>)
+        {
+            res = mulIgnoreOverflow<R>(x, y);
+            return false;
+        }
+        else
+            return __builtin_mul_overflow(x, y, &res);
+    }
+
     template <>
     inline bool mulOverflow(int x, int y, int & res)
     {
diff --git a/base/common/arraySize.h b/base/base/arraySize.h
similarity index 100%
rename from base/common/arraySize.h
rename to base/base/arraySize.h
diff --git a/base/common/bit_cast.h b/base/base/bit_cast.h
similarity index 100%
rename from base/common/bit_cast.h
rename to base/base/bit_cast.h
diff --git a/base/common/chrono_io.h b/base/base/chrono_io.h
similarity index 100%
rename from base/common/chrono_io.h
rename to base/base/chrono_io.h
diff --git a/base/common/constexpr_helpers.h b/base/base/constexpr_helpers.h
similarity index 100%
rename from base/common/constexpr_helpers.h
rename to base/base/constexpr_helpers.h
diff --git a/base/common/coverage.cpp b/base/base/coverage.cpp
similarity index 100%
rename from base/common/coverage.cpp
rename to base/base/coverage.cpp
diff --git a/base/common/coverage.h b/base/base/coverage.h
similarity index 100%
rename from base/common/coverage.h
rename to base/base/coverage.h
diff --git a/base/common/defines.h b/base/base/defines.h
similarity index 80%
rename from base/common/defines.h
rename to base/base/defines.h
index ada8245f494..21a3c09f532 100644
--- a/base/common/defines.h
+++ b/base/base/defines.h
@@ -8,38 +8,25 @@
 /// NOTE:
 /// - __has_feature cannot be simply undefined,
 ///   since this will be broken if some C++ header will be included after
-///   including <common/defines.h>
+///   including <base/defines.h>
 /// - it should not have fallback to 0,
 ///   since this may create false-positive detection (common problem)
 #if defined(__clang__) && defined(__has_feature)
 #    define ch_has_feature __has_feature
 #endif
 
-#if defined(_MSC_VER)
-#   if !defined(likely)
-#      define likely(x)   (x)
-#   endif
-#   if !defined(unlikely)
-#      define unlikely(x) (x)
-#   endif
-#else
-#   if !defined(likely)
-#       define likely(x)   (__builtin_expect(!!(x), 1))
-#   endif
-#   if !defined(unlikely)
-#       define unlikely(x) (__builtin_expect(!!(x), 0))
-#   endif
+#if !defined(likely)
+#    define likely(x)   (__builtin_expect(!!(x), 1))
+#endif
+#if !defined(unlikely)
+#    define unlikely(x) (__builtin_expect(!!(x), 0))
 #endif
 
-#if defined(_MSC_VER)
-#    define ALWAYS_INLINE __forceinline
-#    define NO_INLINE static __declspec(noinline)
-#    define MAY_ALIAS
-#else
-#    define ALWAYS_INLINE __attribute__((__always_inline__))
-#    define NO_INLINE __attribute__((__noinline__))
-#    define MAY_ALIAS __attribute__((__may_alias__))
-#endif
+// more aliases: https://mailman.videolan.org/pipermail/x264-devel/2014-May/010660.html
+
+#define ALWAYS_INLINE __attribute__((__always_inline__))
+#define NO_INLINE __attribute__((__noinline__))
+#define MAY_ALIAS __attribute__((__may_alias__))
 
 #if !defined(__x86_64__) && !defined(__aarch64__) && !defined(__PPC__)
 #    error "The only supported platforms are x86_64 and AArch64, PowerPC (work in progress)"
@@ -96,10 +83,6 @@
 #    define BOOST_USE_UCONTEXT 1
 #endif
 
-#if defined(ARCADIA_BUILD) && defined(BOOST_USE_UCONTEXT)
-#    undef BOOST_USE_UCONTEXT
-#endif
-
 /// TODO: Strange enough, there is no way to detect UB sanitizer.
 
 /// Explicitly allow undefined behaviour for certain functions. Use it as a function attribute.
@@ -117,6 +100,11 @@
 #    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED ALWAYS_INLINE
 #endif
 
+#if !__has_include(<sanitizer/asan_interface.h>) || !defined(ADDRESS_SANITIZER)
+#   define ASAN_UNPOISON_MEMORY_REGION(a, b)
+#   define ASAN_POISON_MEMORY_REGION(a, b)
+#endif
+
 /// A template function for suppressing warnings about unused variables or function results.
 template <typename... Args>
 constexpr void UNUSED(Args &&... args [[maybe_unused]])
diff --git a/base/common/demangle.cpp b/base/base/demangle.cpp
similarity index 67%
rename from base/common/demangle.cpp
rename to base/base/demangle.cpp
index d7fac7c6990..54bb075be4d 100644
--- a/base/common/demangle.cpp
+++ b/base/base/demangle.cpp
@@ -1,19 +1,4 @@
-#include <common/demangle.h>
-
-#if defined(_MSC_VER)
-
-DemangleResult tryDemangle(const char *)
-{
-    return DemangleResult{};
-}
-
-std::string demangle(const char * name, int & status)
-{
-    status = 0;
-    return name;
-}
-
-#else
+#include <base/demangle.h>
 
 #include <stdlib.h>
 #include <cxxabi.h>
@@ -39,6 +24,3 @@ std::string demangle(const char * name, int & status)
 
     return name;
 }
-
-
-#endif
diff --git a/base/common/demangle.h b/base/base/demangle.h
similarity index 100%
rename from base/common/demangle.h
rename to base/base/demangle.h
diff --git a/base/common/errnoToString.cpp b/base/base/errnoToString.cpp
similarity index 100%
rename from base/common/errnoToString.cpp
rename to base/base/errnoToString.cpp
diff --git a/base/common/errnoToString.h b/base/base/errnoToString.h
similarity index 100%
rename from base/common/errnoToString.h
rename to base/base/errnoToString.h
diff --git a/base/common/extended_types.h b/base/base/extended_types.h
similarity index 83%
rename from base/common/extended_types.h
rename to base/base/extended_types.h
index 79209568ef5..7deb8e17b8e 100644
--- a/base/common/extended_types.h
+++ b/base/base/extended_types.h
@@ -2,8 +2,8 @@
 
 #include <type_traits>
 
-#include <common/types.h>
-#include <common/wide_integer.h>
+#include <base/types.h>
+#include <base/wide_integer.h>
 
 
 using Int128 = wide::integer<128, signed>;
@@ -41,22 +41,14 @@ template <> struct is_unsigned<UInt256> { static constexpr bool value = true; };
 template <typename T>
 inline constexpr bool is_unsigned_v = is_unsigned<T>::value;
 
+template <class T> concept is_integer =
+    std::is_integral_v<T>
+    || std::is_same_v<T, Int128>
+    || std::is_same_v<T, UInt128>
+    || std::is_same_v<T, Int256>
+    || std::is_same_v<T, UInt256>;
 
-/// TODO: is_integral includes char, char8_t and wchar_t.
-template <typename T>
-struct is_integer
-{
-    static constexpr bool value = std::is_integral_v<T>;
-};
-
-template <> struct is_integer<Int128> { static constexpr bool value = true; };
-template <> struct is_integer<UInt128> { static constexpr bool value = true; };
-template <> struct is_integer<Int256> { static constexpr bool value = true; };
-template <> struct is_integer<UInt256> { static constexpr bool value = true; };
-
-template <typename T>
-inline constexpr bool is_integer_v = is_integer<T>::value;
-
+template <class T> concept is_floating_point = std::is_floating_point_v<T>;
 
 template <typename T>
 struct is_arithmetic
diff --git a/base/common/find_symbols.h b/base/base/find_symbols.h
similarity index 90%
rename from base/common/find_symbols.h
rename to base/base/find_symbols.h
index a5921b813a1..b28749afda6 100644
--- a/base/common/find_symbols.h
+++ b/base/base/find_symbols.h
@@ -36,18 +36,7 @@
 
 namespace detail
 {
-
-template <char s0>
-inline bool is_in(char x)
-{
-    return x == s0;
-}
-
-template <char s0, char s1, char... tail>
-inline bool is_in(char x)
-{
-    return x == s0 || is_in<s1, tail...>(x);
-}
+template <char ...chars> constexpr bool is_in(char x) { return ((x == chars) || ...); }
 
 #if defined(__SSE2__)
 template <char s0>
@@ -67,16 +56,10 @@ inline __m128i mm_is_in(__m128i bytes)
 #endif
 
 template <bool positive>
-bool maybe_negate(bool x)
-{
-    if constexpr (positive)
-        return x;
-    else
-        return !x;
-}
+constexpr bool maybe_negate(bool x) { return x == positive; }
 
 template <bool positive>
-uint16_t maybe_negate(uint16_t x)
+constexpr uint16_t maybe_negate(uint16_t x)
 {
     if constexpr (positive)
         return x;
@@ -149,12 +132,13 @@ template <bool positive, ReturnMode return_mode, size_t num_chars,
     char c05 = 0, char c06 = 0, char c07 = 0, char c08 = 0,
     char c09 = 0, char c10 = 0, char c11 = 0, char c12 = 0,
     char c13 = 0, char c14 = 0, char c15 = 0, char c16 = 0>
-inline const char * find_first_symbols_sse42_impl(const char * const begin, const char * const end)
+inline const char * find_first_symbols_sse42(const char * const begin, const char * const end)
 {
     const char * pos = begin;
 
 #if defined(__SSE4_2__)
-#define MODE (_SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT)
+    constexpr int mode = _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_LEAST_SIGNIFICANT;
+
     __m128i set = _mm_setr_epi8(c01, c02, c03, c04, c05, c06, c07, c08, c09, c10, c11, c12, c13, c14, c15, c16);
 
     for (; pos + 15 < end; pos += 16)
@@ -163,16 +147,15 @@ inline const char * find_first_symbols_sse42_impl(const char * const begin, cons
 
         if constexpr (positive)
         {
-            if (_mm_cmpestrc(set, num_chars, bytes, 16, MODE))
-                return pos + _mm_cmpestri(set, num_chars, bytes, 16, MODE);
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode);
         }
         else
         {
-            if (_mm_cmpestrc(set, num_chars, bytes, 16, MODE | _SIDD_NEGATIVE_POLARITY))
-                return pos + _mm_cmpestri(set, num_chars, bytes, 16, MODE | _SIDD_NEGATIVE_POLARITY);
+            if (_mm_cmpestrc(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY))
+                return pos + _mm_cmpestri(set, num_chars, bytes, 16, mode | _SIDD_NEGATIVE_POLARITY);
         }
     }
-#undef MODE
 #endif
 
     for (; pos < end; ++pos)
@@ -197,20 +180,15 @@ inline const char * find_first_symbols_sse42_impl(const char * const begin, cons
 }
 
 
-template <bool positive, ReturnMode return_mode, char... symbols>
-inline const char * find_first_symbols_sse42(const char * begin, const char * end)
-{
-    return find_first_symbols_sse42_impl<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
-}
-
 /// NOTE No SSE 4.2 implementation for find_last_symbols_or_null. Not worth to do.
 
 template <bool positive, ReturnMode return_mode, char... symbols>
 inline const char * find_first_symbols_dispatch(const char * begin, const char * end)
+    requires(0 <= sizeof...(symbols) && sizeof...(symbols) <= 16)
 {
 #if defined(__SSE4_2__)
     if (sizeof...(symbols) >= 5)
-        return find_first_symbols_sse42<positive, return_mode, symbols...>(begin, end);
+        return find_first_symbols_sse42<positive, return_mode, sizeof...(symbols), symbols...>(begin, end);
     else
 #endif
         return find_first_symbols_sse2<positive, return_mode, symbols...>(begin, end);
diff --git a/base/common/getFQDNOrHostName.cpp b/base/base/getFQDNOrHostName.cpp
similarity index 91%
rename from base/common/getFQDNOrHostName.cpp
rename to base/base/getFQDNOrHostName.cpp
index f67b37bd71c..2a4ba8e2e11 100644
--- a/base/common/getFQDNOrHostName.cpp
+++ b/base/base/getFQDNOrHostName.cpp
@@ -1,5 +1,5 @@
 #include <Poco/Net/DNS.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 
 
 namespace
diff --git a/base/common/getFQDNOrHostName.h b/base/base/getFQDNOrHostName.h
similarity index 100%
rename from base/common/getFQDNOrHostName.h
rename to base/base/getFQDNOrHostName.h
diff --git a/base/common/getMemoryAmount.cpp b/base/base/getMemoryAmount.cpp
similarity index 90%
rename from base/common/getMemoryAmount.cpp
rename to base/base/getMemoryAmount.cpp
index 1f1b2b8c5dd..59ad10335ed 100644
--- a/base/common/getMemoryAmount.cpp
+++ b/base/base/getMemoryAmount.cpp
@@ -1,6 +1,6 @@
 #include <stdexcept>
-#include "common/getMemoryAmount.h"
-#include "common/getPageSize.h"
+#include <base/getMemoryAmount.h>
+#include <base/getPageSize.h>
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/base/common/getMemoryAmount.h b/base/base/getMemoryAmount.h
similarity index 100%
rename from base/common/getMemoryAmount.h
rename to base/base/getMemoryAmount.h
diff --git a/base/common/getPageSize.cpp b/base/base/getPageSize.cpp
similarity index 71%
rename from base/common/getPageSize.cpp
rename to base/base/getPageSize.cpp
index e96149cc1fb..6f7e0c6e259 100644
--- a/base/common/getPageSize.cpp
+++ b/base/base/getPageSize.cpp
@@ -1,7 +1,7 @@
-#include "common/getPageSize.h"
-
+#include <base/getPageSize.h>
 #include <unistd.h>
 
+
 Int64 getPageSize()
 {
     return sysconf(_SC_PAGESIZE);
diff --git a/base/common/getPageSize.h b/base/base/getPageSize.h
similarity index 70%
rename from base/common/getPageSize.h
rename to base/base/getPageSize.h
index 8a35acbfe9b..ce9fc740713 100644
--- a/base/common/getPageSize.h
+++ b/base/base/getPageSize.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "common/types.h"
+#include <base/types.h>
+
 
 /// Get memory page size
 Int64 getPageSize();
diff --git a/base/common/getResource.cpp b/base/base/getResource.cpp
similarity index 100%
rename from base/common/getResource.cpp
rename to base/base/getResource.cpp
diff --git a/base/common/getResource.h b/base/base/getResource.h
similarity index 100%
rename from base/common/getResource.h
rename to base/base/getResource.h
diff --git a/base/common/getThreadId.cpp b/base/base/getThreadId.cpp
similarity index 96%
rename from base/common/getThreadId.cpp
rename to base/base/getThreadId.cpp
index 054e9be9074..21167b19d32 100644
--- a/base/common/getThreadId.cpp
+++ b/base/base/getThreadId.cpp
@@ -1,4 +1,4 @@
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 #if defined(OS_ANDROID)
     #include <sys/types.h>
diff --git a/base/common/getThreadId.h b/base/base/getThreadId.h
similarity index 100%
rename from base/common/getThreadId.h
rename to base/base/getThreadId.h
diff --git a/base/base/insertAtEnd.h b/base/base/insertAtEnd.h
new file mode 100644
index 00000000000..c4fef664511
--- /dev/null
+++ b/base/base/insertAtEnd.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <vector>
+
+/// Appends a specified vector with elements of another vector.
+template <typename T>
+void insertAtEnd(std::vector<T> & dest, const std::vector<T> & src)
+{
+    if (src.empty())
+        return;
+    dest.reserve(dest.size() + src.size());
+    dest.insert(dest.end(), src.begin(), src.end());
+}
+
+template <typename T>
+void insertAtEnd(std::vector<T> & dest, std::vector<T> && src)
+{
+    if (src.empty())
+        return;
+    if (dest.empty())
+    {
+        dest.swap(src);
+        return;
+    }
+    dest.reserve(dest.size() + src.size());
+    dest.insert(dest.end(), std::make_move_iterator(src.begin()), std::make_move_iterator(src.end()));
+    src.clear();
+}
diff --git a/base/common/iostream_debug_helpers.h b/base/base/iostream_debug_helpers.h
similarity index 100%
rename from base/common/iostream_debug_helpers.h
rename to base/base/iostream_debug_helpers.h
diff --git a/base/common/itoa.h b/base/base/itoa.h
similarity index 99%
rename from base/common/itoa.h
rename to base/base/itoa.h
index 4c86239de36..da7c2ffc73e 100644
--- a/base/common/itoa.h
+++ b/base/base/itoa.h
@@ -30,7 +30,7 @@
 #include <cstddef>
 #include <cstring>
 #include <type_traits>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 
 
 namespace impl
diff --git a/base/common/logger_useful.h b/base/base/logger_useful.h
similarity index 94%
rename from base/common/logger_useful.h
rename to base/base/logger_useful.h
index d3b4d38d546..1237c6bd47c 100644
--- a/base/common/logger_useful.h
+++ b/base/base/logger_useful.h
@@ -42,18 +42,10 @@ namespace
 } while (false)
 
 
+#define LOG_TEST(logger, ...)    LOG_IMPL(logger, DB::LogsLevel::test, Poco::Message::PRIO_TEST, __VA_ARGS__)
 #define LOG_TRACE(logger, ...)   LOG_IMPL(logger, DB::LogsLevel::trace, Poco::Message::PRIO_TRACE, __VA_ARGS__)
 #define LOG_DEBUG(logger, ...)   LOG_IMPL(logger, DB::LogsLevel::debug, Poco::Message::PRIO_DEBUG, __VA_ARGS__)
 #define LOG_INFO(logger, ...)    LOG_IMPL(logger, DB::LogsLevel::information, Poco::Message::PRIO_INFORMATION, __VA_ARGS__)
 #define LOG_WARNING(logger, ...) LOG_IMPL(logger, DB::LogsLevel::warning, Poco::Message::PRIO_WARNING, __VA_ARGS__)
 #define LOG_ERROR(logger, ...)   LOG_IMPL(logger, DB::LogsLevel::error, Poco::Message::PRIO_ERROR, __VA_ARGS__)
 #define LOG_FATAL(logger, ...)   LOG_IMPL(logger, DB::LogsLevel::error, Poco::Message::PRIO_FATAL, __VA_ARGS__)
-
-
-/// Compatibility for external projects.
-#if defined(ARCADIA_BUILD)
-    using Poco::Logger;
-    using Poco::Message;
-    using DB::LogsLevel;
-    using DB::CurrentThread;
-#endif
diff --git a/base/common/map.h b/base/base/map.h
similarity index 100%
rename from base/common/map.h
rename to base/base/map.h
diff --git a/base/common/mremap.cpp b/base/base/mremap.cpp
similarity index 80%
rename from base/common/mremap.cpp
rename to base/base/mremap.cpp
index d2d8d7fde4f..e2ca4701b7f 100644
--- a/base/common/mremap.cpp
+++ b/base/base/mremap.cpp
@@ -1,4 +1,4 @@
-#include <common/mremap.h>
+#include <base/mremap.h>
 
 #include <cstddef>
 #include <cstdlib>
@@ -19,22 +19,14 @@ void * mremap_fallback(
         return MAP_FAILED;
     }
 
-#if defined(_MSC_VER)
-    void * new_address = ::operator new(new_size);
-#else
     void * new_address = mmap(nullptr, new_size, mmap_prot, mmap_flags, mmap_fd, mmap_offset);
     if (MAP_FAILED == new_address)
         return MAP_FAILED;
-#endif
 
     memcpy(new_address, old_address, old_size);
 
-#if defined(_MSC_VER)
-    delete old_address;
-#else
     if (munmap(old_address, old_size))
         abort();
-#endif
 
     return new_address;
 }
diff --git a/base/common/mremap.h b/base/base/mremap.h
similarity index 98%
rename from base/common/mremap.h
rename to base/base/mremap.h
index f488393278a..7a5b03e7c31 100644
--- a/base/common/mremap.h
+++ b/base/base/mremap.h
@@ -2,9 +2,7 @@
 
 #include <cstddef>
 #include <sys/types.h>
-#if !defined(_MSC_VER)
 #include <sys/mman.h>
-#endif
 
 
 #ifdef MREMAP_MAYMOVE
diff --git a/base/common/phdr_cache.cpp b/base/base/phdr_cache.cpp
similarity index 93%
rename from base/common/phdr_cache.cpp
rename to base/base/phdr_cache.cpp
index 49d566dac19..8ae10f6bf83 100644
--- a/base/common/phdr_cache.cpp
+++ b/base/base/phdr_cache.cpp
@@ -1,8 +1,12 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 /// This code was based on the code by Fedor Korotkiy (prime@yandex-team.ru) for YT product in Yandex.
 
-#include <common/defines.h>
+#include <base/defines.h>
 
-#if defined(__linux__) && !defined(THREAD_SANITIZER)
+#if defined(__linux__) && !defined(THREAD_SANITIZER) && !defined(USE_MUSL)
     #define USE_PHDR_CACHE 1
 #endif
 
diff --git a/base/common/phdr_cache.h b/base/base/phdr_cache.h
similarity index 100%
rename from base/common/phdr_cache.h
rename to base/base/phdr_cache.h
diff --git a/base/common/preciseExp10.cpp b/base/base/preciseExp10.cpp
similarity index 100%
rename from base/common/preciseExp10.cpp
rename to base/base/preciseExp10.cpp
diff --git a/base/common/preciseExp10.h b/base/base/preciseExp10.h
similarity index 100%
rename from base/common/preciseExp10.h
rename to base/base/preciseExp10.h
diff --git a/base/common/range.h b/base/base/range.h
similarity index 100%
rename from base/common/range.h
rename to base/base/range.h
diff --git a/base/common/removeDuplicates.h b/base/base/removeDuplicates.h
similarity index 100%
rename from base/common/removeDuplicates.h
rename to base/base/removeDuplicates.h
diff --git a/base/common/scope_guard.h b/base/base/scope_guard.h
similarity index 100%
rename from base/common/scope_guard.h
rename to base/base/scope_guard.h
diff --git a/base/common/scope_guard_safe.h b/base/base/scope_guard_safe.h
similarity index 97%
rename from base/common/scope_guard_safe.h
rename to base/base/scope_guard_safe.h
index a52b4a14f48..73c85b65b57 100644
--- a/base/common/scope_guard_safe.h
+++ b/base/base/scope_guard_safe.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/scope_guard.h>
-#include <common/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
 #include <Common/MemoryTracker.h>
 
 /// Same as SCOPE_EXIT() but block the MEMORY_LIMIT_EXCEEDED errors.
diff --git a/base/common/setTerminalEcho.cpp b/base/base/setTerminalEcho.cpp
similarity index 90%
rename from base/common/setTerminalEcho.cpp
rename to base/base/setTerminalEcho.cpp
index 66db216a235..2f478f10933 100644
--- a/base/common/setTerminalEcho.cpp
+++ b/base/base/setTerminalEcho.cpp
@@ -1,5 +1,5 @@
-#include <common/setTerminalEcho.h>
-#include <common/errnoToString.h>
+#include <base/setTerminalEcho.h>
+#include <base/errnoToString.h>
 #include <stdexcept>
 #include <cstring>
 #include <string>
diff --git a/base/common/setTerminalEcho.h b/base/base/setTerminalEcho.h
similarity index 100%
rename from base/common/setTerminalEcho.h
rename to base/base/setTerminalEcho.h
diff --git a/base/common/shared_ptr_helper.h b/base/base/shared_ptr_helper.h
similarity index 100%
rename from base/common/shared_ptr_helper.h
rename to base/base/shared_ptr_helper.h
diff --git a/base/common/shift10.cpp b/base/base/shift10.cpp
similarity index 99%
rename from base/common/shift10.cpp
rename to base/base/shift10.cpp
index b7b39182145..db2f4a6963e 100644
--- a/base/common/shift10.cpp
+++ b/base/base/shift10.cpp
@@ -1,4 +1,4 @@
-#include <common/shift10.h>
+#include <base/shift10.h>
 
 #include "defines.h"
 
diff --git a/base/common/shift10.h b/base/base/shift10.h
similarity index 93%
rename from base/common/shift10.h
rename to base/base/shift10.h
index c50121cfb27..0f54d1f2988 100644
--- a/base/common/shift10.h
+++ b/base/base/shift10.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 /** Almost the same as x = x * exp10(exponent), but gives more accurate result.
   * Example:
diff --git a/base/common/sleep.cpp b/base/base/sleep.cpp
similarity index 98%
rename from base/common/sleep.cpp
rename to base/base/sleep.cpp
index 85bbc8edfcc..88cb53556cd 100644
--- a/base/common/sleep.cpp
+++ b/base/base/sleep.cpp
@@ -1,4 +1,4 @@
-#include "common/sleep.h"
+#include <base/sleep.h>
 
 #include <time.h>
 #include <errno.h>
diff --git a/base/common/sleep.h b/base/base/sleep.h
similarity index 100%
rename from base/common/sleep.h
rename to base/base/sleep.h
diff --git a/base/common/sort.h b/base/base/sort.h
similarity index 57%
rename from base/common/sort.h
rename to base/base/sort.h
index 2128014ca5e..1f12cc62218 100644
--- a/base/common/sort.h
+++ b/base/base/sort.h
@@ -1,37 +1,26 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <miniselect/floyd_rivest_select.h>  // Y_IGNORE
-#else
-#    include <algorithm>
-#endif
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+
+#include <miniselect/floyd_rivest_select.h>
 
 template <class RandomIt>
 void nth_element(RandomIt first, RandomIt nth, RandomIt last)
 {
-#if !defined(ARCADIA_BUILD)
     ::miniselect::floyd_rivest_select(first, nth, last);
-#else
-    ::std::nth_element(first, nth, last);
-#endif
 }
 
 template <class RandomIt>
 void partial_sort(RandomIt first, RandomIt middle, RandomIt last)
 {
-#if !defined(ARCADIA_BUILD)
     ::miniselect::floyd_rivest_partial_sort(first, middle, last);
-#else
-    ::std::partial_sort(first, middle, last);
-#endif
 }
 
 template <class RandomIt, class Compare>
 void partial_sort(RandomIt first, RandomIt middle, RandomIt last, Compare compare)
 {
-#if !defined(ARCADIA_BUILD)
     ::miniselect::floyd_rivest_partial_sort(first, middle, last, compare);
-#else
-    ::std::partial_sort(first, middle, last, compare);
-#endif
 }
+
+#pragma GCC diagnostic pop
diff --git a/base/common/strong_typedef.h b/base/base/strong_typedef.h
similarity index 85%
rename from base/common/strong_typedef.h
rename to base/base/strong_typedef.h
index a1e2b253aa7..0c2e9ca7e8e 100644
--- a/base/common/strong_typedef.h
+++ b/base/base/strong_typedef.h
@@ -15,15 +15,15 @@ private:
 public:
     using UnderlyingType = T;
     template <class Enable = typename std::is_copy_constructible<T>::type>
-    explicit StrongTypedef(const T & t_) : t(t_) {}
+    constexpr explicit StrongTypedef(const T & t_) : t(t_) {}
     template <class Enable = typename std::is_move_constructible<T>::type>
-    explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
+    constexpr explicit StrongTypedef(T && t_) : t(std::move(t_)) {}
 
     template <class Enable = typename std::is_default_constructible<T>::type>
-    StrongTypedef(): t() {}
+    constexpr StrongTypedef(): t() {}
 
-    StrongTypedef(const Self &) = default;
-    StrongTypedef(Self &&) = default;
+    constexpr StrongTypedef(const Self &) = default;
+    constexpr StrongTypedef(Self &&) = default;
 
     Self & operator=(const Self &) = default;
     Self & operator=(Self &&) = default;
diff --git a/base/common/terminalColors.cpp b/base/base/terminalColors.cpp
similarity index 97%
rename from base/common/terminalColors.cpp
rename to base/base/terminalColors.cpp
index af1f02d331f..4c2013c6499 100644
--- a/base/common/terminalColors.cpp
+++ b/base/base/terminalColors.cpp
@@ -1,5 +1,5 @@
 #include <string>
-#include <common/terminalColors.h>
+#include <base/terminalColors.h>
 
 
 std::string setColor(UInt64 hash)
diff --git a/base/common/terminalColors.h b/base/base/terminalColors.h
similarity index 94%
rename from base/common/terminalColors.h
rename to base/base/terminalColors.h
index 9de9693bca7..971c2b9efb0 100644
--- a/base/common/terminalColors.h
+++ b/base/base/terminalColors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <common/types.h>
+#include <base/types.h>
 
 
 /** Set color in terminal based on 64-bit hash value.
diff --git a/base/common/tests/CMakeLists.txt b/base/base/tests/CMakeLists.txt
similarity index 100%
rename from base/common/tests/CMakeLists.txt
rename to base/base/tests/CMakeLists.txt
diff --git a/base/common/tests/dump_variable.cpp b/base/base/tests/dump_variable.cpp
similarity index 96%
rename from base/common/tests/dump_variable.cpp
rename to base/base/tests/dump_variable.cpp
index 17d2f9f69ec..9addc298ecb 100644
--- a/base/common/tests/dump_variable.cpp
+++ b/base/base/tests/dump_variable.cpp
@@ -1,4 +1,4 @@
-#include <common/iostream_debug_helpers.h>
+#include <base/iostream_debug_helpers.h>
 
 #include <iostream>
 #include <memory>
diff --git a/base/common/throwError.h b/base/base/throwError.h
similarity index 100%
rename from base/common/throwError.h
rename to base/base/throwError.h
diff --git a/base/common/time.h b/base/base/time.h
similarity index 100%
rename from base/common/time.h
rename to base/base/time.h
diff --git a/base/common/types.h b/base/base/types.h
similarity index 100%
rename from base/common/types.h
rename to base/base/types.h
diff --git a/base/common/unaligned.h b/base/base/unaligned.h
similarity index 100%
rename from base/common/unaligned.h
rename to base/base/unaligned.h
diff --git a/base/base/unit.h b/base/base/unit.h
new file mode 100644
index 00000000000..c6333e41a89
--- /dev/null
+++ b/base/base/unit.h
@@ -0,0 +1,14 @@
+#pragma once
+#include <cstddef>
+
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
+constexpr size_t KiB = 1024;
+constexpr size_t MiB = 1024 * KiB;
+constexpr size_t GiB = 1024 * MiB;
+
+constexpr size_t operator"" _KiB(unsigned long long val) { return val * KiB; }
+constexpr size_t operator"" _MiB(unsigned long long val) { return val * MiB; }
+constexpr size_t operator"" _GiB(unsigned long long val) { return val * GiB; }
diff --git a/base/common/wide_integer.h b/base/base/wide_integer.h
similarity index 100%
rename from base/common/wide_integer.h
rename to base/base/wide_integer.h
diff --git a/base/common/wide_integer_impl.h b/base/base/wide_integer_impl.h
similarity index 96%
rename from base/common/wide_integer_impl.h
rename to base/base/wide_integer_impl.h
index d2ef8b22d65..b8de5efb859 100644
--- a/base/common/wide_integer_impl.h
+++ b/base/base/wide_integer_impl.h
@@ -9,6 +9,7 @@
 #include <cmath>
 #include <cfloat>
 #include <cassert>
+#include <tuple>
 #include <limits>
 
 
@@ -39,6 +40,18 @@ static constexpr bool IntegralConcept() noexcept
     return std::is_integral_v<T> || IsWideInteger<T>::value;
 }
 
+template <typename T>
+class IsTupleLike
+{
+    template <typename U>
+    static auto check(U * p) -> decltype(std::tuple_size<U>::value, int());
+    template <typename>
+    static void check(...);
+
+public:
+    static constexpr const bool value = !std::is_void<decltype(check<T>(nullptr))>::value;
+};
+
 }
 
 namespace std
@@ -152,7 +165,7 @@ namespace wide
 template <size_t Bits, typename Signed>
 struct integer<Bits, Signed>::_impl
 {
-    static constexpr size_t _Bits = Bits;
+    static constexpr size_t _bits = Bits;
     static constexpr const unsigned byte_count = Bits / 8;
     static constexpr const unsigned item_count = byte_count / sizeof(base_type);
     static constexpr const unsigned base_bits = sizeof(base_type) * 8;
@@ -227,6 +240,19 @@ struct integer<Bits, Signed>::_impl
             self.items[i] = 0;
     }
 
+    template <typename TupleLike, size_t i = 0>
+    constexpr static void wide_integer_from_tuple_like(integer<Bits, Signed> & self, const TupleLike & tuple) noexcept
+    {
+        if constexpr (i < item_count)
+        {
+            if constexpr (i < std::tuple_size_v<TupleLike>)
+                self.items[i] = std::get<i>(tuple);
+            else
+                self.items[i] = 0;
+            wide_integer_from_tuple_like<TupleLike, i + 1>(self, tuple);
+        }
+    }
+
     /**
      * N.B. t is constructed from double, so max(t) = max(double) ~ 2^310
      * the recursive call happens when t / 2^64 > 2^64, so there won't be more than 5 of them.
@@ -614,8 +640,8 @@ public:
         else
         {
             static_assert(IsWideInteger<T>::value);
-            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_Bits, Signed>>::_impl::operator_plus(
-                integer<T::_impl::_Bits, Signed>(lhs), rhs);
+            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_bits, Signed>>::_impl::operator_plus(
+                integer<T::_impl::_bits, Signed>(lhs), rhs);
         }
     }
 
@@ -632,8 +658,8 @@ public:
         else
         {
             static_assert(IsWideInteger<T>::value);
-            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_Bits, Signed>>::_impl::operator_minus(
-                integer<T::_impl::_Bits, Signed>(lhs), rhs);
+            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_bits, Signed>>::_impl::operator_minus(
+                integer<T::_impl::_bits, Signed>(lhs), rhs);
         }
     }
 
@@ -857,7 +883,7 @@ public:
         else
         {
             static_assert(IsWideInteger<T>::value);
-            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_Bits, Signed>>::operator_slash(T(lhs), rhs);
+            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_bits, Signed>>::operator_slash(T(lhs), rhs);
         }
     }
 
@@ -877,7 +903,7 @@ public:
         else
         {
             static_assert(IsWideInteger<T>::value);
-            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_Bits, Signed>>::operator_percent(T(lhs), rhs);
+            return std::common_type_t<integer<Bits, Signed>, integer<T::_impl::_bits, Signed>>::operator_percent(T(lhs), rhs);
         }
     }
 
@@ -966,6 +992,8 @@ constexpr integer<Bits, Signed>::integer(T rhs) noexcept
 {
     if constexpr (IsWideInteger<T>::value)
         _impl::wide_integer_from_wide_integer(*this, rhs);
+    else if  constexpr (IsTupleLike<T>::value)
+        _impl::wide_integer_from_tuple_like(*this, rhs);
     else
         _impl::wide_integer_from_builtin(*this, rhs);
 }
@@ -979,6 +1007,8 @@ constexpr integer<Bits, Signed>::integer(std::initializer_list<T> il) noexcept
     {
         if constexpr (IsWideInteger<T>::value)
             _impl::wide_integer_from_wide_integer(*this, *il.begin());
+        else if  constexpr (IsTupleLike<T>::value)
+            _impl::wide_integer_from_tuple_like(*this, *il.begin());
         else
             _impl::wide_integer_from_builtin(*this, *il.begin());
     }
@@ -1007,7 +1037,10 @@ template <size_t Bits, typename Signed>
 template <typename T>
 constexpr integer<Bits, Signed> & integer<Bits, Signed>::operator=(T rhs) noexcept
 {
-    _impl::wide_integer_from_builtin(*this, rhs);
+    if  constexpr (IsTupleLike<T>::value)
+        _impl::wide_integer_from_tuple_like(*this, rhs);
+    else
+        _impl::wide_integer_from_builtin(*this, rhs);
     return *this;
 }
 
diff --git a/base/common/wide_integer_to_string.h b/base/base/wide_integer_to_string.h
similarity index 100%
rename from base/common/wide_integer_to_string.h
rename to base/base/wide_integer_to_string.h
diff --git a/base/bridge/IBridge.cpp b/base/bridge/IBridge.cpp
index 35a9b95c97f..553973b645d 100644
--- a/base/bridge/IBridge.cpp
+++ b/base/bridge/IBridge.cpp
@@ -4,12 +4,12 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
 
-#include <common/logger_useful.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/SensitiveDataMasker.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 #include <IO/ReadHelpers.h>
 #include <Formats/registerFormats.h>
 #include <Server/HTTP/HTTPServer.h>
diff --git a/base/common/SimpleCache.h b/base/common/SimpleCache.h
deleted file mode 100644
index c3bf019c226..00000000000
--- a/base/common/SimpleCache.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-
-#include <map>
-#include <tuple>
-#include <mutex>
-#include <common/function_traits.h>
-
-
-/** The simplest cache for a free function.
-  * You can also pass a static class method or lambda without captures.
-  * The size is unlimited. Values are stored permanently and never evicted.
-  * But single record or all cache can be manually dropped.
-  * Mutex is used for synchronization.
-  * Suitable only for the simplest cases.
-  *
-  * Usage
-  *
-  * SimpleCache<decltype(func), &func> func_cached;
-  * std::cerr << func_cached(args...);
-  */
-template <typename F, F* f>
-class SimpleCache
-{
-private:
-    using Key = typename function_traits<F>::arguments_decay;
-    using Result = typename function_traits<F>::result;
-
-    std::map<Key, Result> cache;
-    mutable std::mutex mutex;
-
-public:
-    template <typename... Args>
-    Result operator() (Args &&... args)
-    {
-        Key key{std::forward<Args>(args)...};
-
-        {
-            std::lock_guard lock(mutex);
-
-            auto it = cache.find(key);
-
-            if (cache.end() != it)
-                return it->second;
-        }
-
-        /// The calculations themselves are not done under mutex.
-        Result res = std::apply(f, key);
-
-        {
-            std::lock_guard lock(mutex);
-
-            cache.emplace(std::forward_as_tuple(args...), res);
-        }
-
-        return res;
-    }
-
-    template <typename... Args>
-    void update(Args &&... args)
-    {
-        Key key{std::forward<Args>(args)...};
-
-        Result res = std::apply(f, key);
-
-        {
-            std::lock_guard lock(mutex);
-            cache[key] = std::move(res);
-        }
-    }
-
-    size_t size() const
-    {
-        std::lock_guard lock(mutex);
-        return cache.size();
-    }
-
-    void drop()
-    {
-        std::lock_guard lock(mutex);
-        cache.clear();
-    }
-};
diff --git a/base/common/function_traits.h b/base/common/function_traits.h
deleted file mode 100644
index 9cd104925a7..00000000000
--- a/base/common/function_traits.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <tuple>
-#include <type_traits>
-
-
-template <typename T>
-struct function_traits;
-
-template <typename ReturnType, typename... Args>
-struct function_traits<ReturnType(Args...)>
-{
-    using result = ReturnType;
-    using arguments = std::tuple<Args...>;
-    using arguments_decay = std::tuple<typename std::decay<Args>::type...>;
-};
diff --git a/base/common/memory.h b/base/common/memory.h
deleted file mode 100644
index e82c019ceab..00000000000
--- a/base/common/memory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-
-#include <new>
-#include "defines.h"
-
-#if USE_JEMALLOC
-#    include <jemalloc/jemalloc.h>
-#endif
-
-#if !USE_JEMALLOC || JEMALLOC_VERSION_MAJOR < 4
-#    include <cstdlib>
-#endif
-
-
-namespace Memory
-{
-
-inline ALWAYS_INLINE void * newImpl(std::size_t size)
-{
-    auto * ptr = malloc(size);
-    if (likely(ptr != nullptr))
-        return ptr;
-
-    /// @note no std::get_new_handler logic implemented
-    throw std::bad_alloc{};
-}
-
-inline ALWAYS_INLINE void * newNoExept(std::size_t size) noexcept
-{
-    return malloc(size);
-}
-
-inline ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
-{
-    free(ptr);
-}
-
-#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 4
-
-inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
-{
-    if (unlikely(ptr == nullptr))
-        return;
-
-    sdallocx(ptr, size, 0);
-}
-
-#else
-
-inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size [[maybe_unused]]) noexcept
-{
-    free(ptr);
-}
-
-#endif
-
-}
diff --git a/base/common/ya.make b/base/common/ya.make
deleted file mode 100644
index fd88760c933..00000000000
--- a/base/common/ya.make
+++ /dev/null
@@ -1,63 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    GLOBAL clickhouse/base
-)
-
-CFLAGS (GLOBAL -DARCADIA_BUILD)
-
-CFLAGS (GLOBAL -DUSE_CPUID=1)
-CFLAGS (GLOBAL -DUSE_JEMALLOC=0)
-CFLAGS (GLOBAL -DUSE_RAPIDJSON=1)
-CFLAGS (GLOBAL -DUSE_SSL=1)
-
-IF (OS_DARWIN)
-    CFLAGS (GLOBAL -DOS_DARWIN)
-ELSEIF (OS_FREEBSD)
-    CFLAGS (GLOBAL -DOS_FREEBSD)
-ELSEIF (OS_LINUX)
-    CFLAGS (GLOBAL -DOS_LINUX)
-ENDIF ()
-
-PEERDIR(
-    contrib/libs/cctz
-    contrib/libs/cxxsupp/libcxx-filesystem
-    contrib/libs/poco/Net
-    contrib/libs/poco/Util
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/fmt
-    contrib/restricted/boost
-    contrib/restricted/cityhash-1.0.2
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    DateLUT.cpp
-    DateLUTImpl.cpp
-    JSON.cpp
-    LineReader.cpp
-    StringRef.cpp
-    argsToConfig.cpp
-    coverage.cpp
-    demangle.cpp
-    errnoToString.cpp
-    getFQDNOrHostName.cpp
-    getMemoryAmount.cpp
-    getPageSize.cpp
-    getResource.cpp
-    getThreadId.cpp
-    mremap.cpp
-    phdr_cache.cpp
-    preciseExp10.cpp
-    setTerminalEcho.cpp
-    shift10.cpp
-    sleep.cpp
-    terminalColors.cpp
-
-)
-
-END()
diff --git a/base/common/ya.make.in b/base/common/ya.make.in
deleted file mode 100644
index 3deb36a2c71..00000000000
--- a/base/common/ya.make.in
+++ /dev/null
@@ -1,41 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    GLOBAL clickhouse/base
-)
-
-CFLAGS (GLOBAL -DARCADIA_BUILD)
-
-CFLAGS (GLOBAL -DUSE_CPUID=1)
-CFLAGS (GLOBAL -DUSE_JEMALLOC=0)
-CFLAGS (GLOBAL -DUSE_RAPIDJSON=1)
-CFLAGS (GLOBAL -DUSE_SSL=1)
-
-IF (OS_DARWIN)
-    CFLAGS (GLOBAL -DOS_DARWIN)
-ELSEIF (OS_FREEBSD)
-    CFLAGS (GLOBAL -DOS_FREEBSD)
-ELSEIF (OS_LINUX)
-    CFLAGS (GLOBAL -DOS_LINUX)
-ENDIF ()
-
-PEERDIR(
-    contrib/libs/cctz
-    contrib/libs/cxxsupp/libcxx-filesystem
-    contrib/libs/poco/Net
-    contrib/libs/poco/Util
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/fmt
-    contrib/restricted/boost
-    contrib/restricted/cityhash-1.0.2
-)
-
-CFLAGS(-g0)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F examples | grep -v -F Replxx | grep -v -F Readline | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/base/daemon/BaseDaemon.cpp b/base/daemon/BaseDaemon.cpp
index 745e020c8bb..70915a520b3 100644
--- a/base/daemon/BaseDaemon.cpp
+++ b/base/daemon/BaseDaemon.cpp
@@ -1,3 +1,7 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <daemon/BaseDaemon.h>
 #include <daemon/SentryWriter.h>
 
@@ -21,7 +25,7 @@
 #include <fstream>
 #include <sstream>
 #include <memory>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Poco/Observer.h>
 #include <Poco/AutoPtr.h>
@@ -34,12 +38,12 @@
 #include <Poco/SyslogChannel.h>
 #include <Poco/DirectoryIterator.h>
 
-#include <common/logger_useful.h>
-#include <common/ErrorHandlers.h>
-#include <common/argsToConfig.h>
-#include <common/getThreadId.h>
-#include <common/coverage.h>
-#include <common/sleep.h>
+#include <base/logger_useful.h>
+#include <base/ErrorHandlers.h>
+#include <base/argsToConfig.h>
+#include <base/getThreadId.h>
+#include <base/coverage.h>
+#include <base/sleep.h>
 
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromFileDescriptorDiscardOnFailure.h>
@@ -59,9 +63,7 @@
 #include <Common/Elf.h>
 #include <filesystem>
 
-#if !defined(ARCADIA_BUILD)
-#   include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 #if defined(OS_DARWIN)
 #   pragma GCC diagnostic ignored "-Wunused-macros"
diff --git a/base/daemon/BaseDaemon.h b/base/daemon/BaseDaemon.h
index 3d47d85a9f5..54a74369dce 100644
--- a/base/daemon/BaseDaemon.h
+++ b/base/daemon/BaseDaemon.h
@@ -16,9 +16,9 @@
 #include <Poco/Util/ServerApplication.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/Version.h>
-#include <common/types.h>
-#include <common/logger_useful.h>
-#include <common/getThreadId.h>
+#include <base/types.h>
+#include <base/logger_useful.h>
+#include <base/getThreadId.h>
 #include <daemon/GraphiteWriter.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/StatusFile.h>
diff --git a/base/daemon/GraphiteWriter.cpp b/base/daemon/GraphiteWriter.cpp
index f28019dec01..176b48372d9 100644
--- a/base/daemon/GraphiteWriter.cpp
+++ b/base/daemon/GraphiteWriter.cpp
@@ -2,7 +2,7 @@
 #include <daemon/BaseDaemon.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 
 #include <mutex>
 #include <iomanip>
diff --git a/base/daemon/GraphiteWriter.h b/base/daemon/GraphiteWriter.h
index fc07d2b7a40..ef44d82bced 100644
--- a/base/daemon/GraphiteWriter.h
+++ b/base/daemon/GraphiteWriter.h
@@ -5,7 +5,7 @@
 #include <Poco/Net/StreamSocket.h>
 #include <Poco/Net/SocketStream.h>
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 /// пишет в Graphite данные в формате
diff --git a/base/daemon/SentryWriter.cpp b/base/daemon/SentryWriter.cpp
index 3571c64edd6..6996b63b5dd 100644
--- a/base/daemon/SentryWriter.cpp
+++ b/base/daemon/SentryWriter.cpp
@@ -3,24 +3,24 @@
 #include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
-#include <common/defines.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/getMemoryAmount.h>
-#include <common/logger_useful.h>
+#include <base/defines.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/getMemoryAmount.h>
+#include <base/logger_useful.h>
 
 #include <Common/formatReadable.h>
 #include <Common/SymbolIndex.h>
 #include <Common/StackTrace.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
+#include <Core/ServerUUID.h>
+#include <Common/hex.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "Common/config_version.h"
-#    include <Common/config.h>
-#endif
+#include "Common/config_version.h"
+#include <Common/config.h>
 
 #if USE_SENTRY
 
-#    include <sentry.h> // Y_IGNORE
+#    include <sentry.h>
 #    include <stdio.h>
 #    include <filesystem>
 
@@ -38,6 +38,13 @@ void setExtras()
     if (!anonymize)
         sentry_set_extra("server_name", sentry_value_new_string(getFQDNOrHostName().c_str()));
 
+    DB::UUID server_uuid = DB::ServerUUID::get();
+    if (server_uuid != DB::UUIDHelpers::Nil)
+    {
+        std::string server_uuid_str = DB::toString(server_uuid);
+        sentry_set_extra("server_uuid", sentry_value_new_string(server_uuid_str.c_str()));
+    }
+
     sentry_set_tag("version", VERSION_STRING);
     sentry_set_extra("version_githash", sentry_value_new_string(VERSION_GITHASH));
     sentry_set_extra("version_describe", sentry_value_new_string(VERSION_DESCRIBE));
@@ -56,41 +63,6 @@ void setExtras()
         sentry_set_extra("disk_free_space", sentry_value_new_string(formatReadableSizeWithBinarySuffix(fs::space(server_data_path).free).c_str()));
 }
 
-void sentry_logger(sentry_level_e level, const char * message, va_list args, void *)
-{
-    auto * logger = &Poco::Logger::get("SentryWriter");
-    size_t size = 1024;
-    char buffer[size];
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wformat-nonliteral"
-#endif
-    if (vsnprintf(buffer, size, message, args) >= 0)
-    {
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-        switch (level)
-        {
-            case SENTRY_LEVEL_DEBUG:
-                logger->debug(buffer);
-                break;
-            case SENTRY_LEVEL_INFO:
-                logger->information(buffer);
-                break;
-            case SENTRY_LEVEL_WARNING:
-                logger->warning(buffer);
-                break;
-            case SENTRY_LEVEL_ERROR:
-                logger->error(buffer);
-                break;
-            case SENTRY_LEVEL_FATAL:
-                logger->fatal(buffer);
-                break;
-        }
-    }
-}
-
 }
 
 
@@ -99,13 +71,13 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
     bool enabled = false;
     bool debug = config.getBool("send_crash_reports.debug", false);
     auto * logger = &Poco::Logger::get("SentryWriter");
+
     if (config.getBool("send_crash_reports.enabled", false))
     {
         if (debug || (strlen(VERSION_OFFICIAL) > 0)) //-V560
-        {
             enabled = true;
-        }
     }
+
     if (enabled)
     {
         server_data_path = config.getString("path", "");
@@ -118,7 +90,6 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
 
         sentry_options_t * options = sentry_options_new();  /// will be freed by sentry_init or sentry_shutdown
         sentry_options_set_release(options, VERSION_STRING_SHORT);
-        sentry_options_set_logger(options, &sentry_logger, nullptr);
         if (debug)
         {
             sentry_options_set_debug(options, 1);
@@ -191,34 +162,34 @@ void SentryWriter::onFault(int sig, const std::string & error_message, const Sta
         if (stack_size > 0)
         {
             ssize_t offset = stack_trace.getOffset();
-            char instruction_addr[100];
+
+            char instruction_addr[19]
+            {
+                '0', 'x',
+                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+                '\0'
+            };
+
             StackTrace::Frames frames;
             StackTrace::symbolize(stack_trace.getFramePointers(), offset, stack_size, frames);
+
             for (ssize_t i = stack_size - 1; i >= offset; --i)
             {
                 const StackTrace::Frame & current_frame = frames[i];
                 sentry_value_t sentry_frame = sentry_value_new_object();
                 UInt64 frame_ptr = reinterpret_cast<UInt64>(current_frame.virtual_addr);
 
-                if (std::snprintf(instruction_addr, sizeof(instruction_addr), "0x%" PRIx64, frame_ptr) >= 0)
-                {
-                    sentry_value_set_by_key(sentry_frame, "instruction_addr", sentry_value_new_string(instruction_addr));
-                }
+                writeHexUIntLowercase(frame_ptr, instruction_addr + 2);
+                sentry_value_set_by_key(sentry_frame, "instruction_addr", sentry_value_new_string(instruction_addr));
 
                 if (current_frame.symbol.has_value())
-                {
                     sentry_value_set_by_key(sentry_frame, "function", sentry_value_new_string(current_frame.symbol.value().c_str()));
-                }
 
                 if (current_frame.file.has_value())
-                {
                     sentry_value_set_by_key(sentry_frame, "filename", sentry_value_new_string(current_frame.file.value().c_str()));
-                }
 
                 if (current_frame.line.has_value())
-                {
                     sentry_value_set_by_key(sentry_frame, "lineno", sentry_value_new_int32(current_frame.line.value()));
-                }
 
                 sentry_value_append(sentry_frames, sentry_frame);
             }
diff --git a/base/daemon/ya.make b/base/daemon/ya.make
deleted file mode 100644
index f3b4059f002..00000000000
--- a/base/daemon/ya.make
+++ /dev/null
@@ -1,19 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    BaseDaemon.cpp
-    GraphiteWriter.cpp
-    SentryWriter.cpp
-)
-
-END()
diff --git a/base/glibc-compatibility/CMakeLists.txt b/base/glibc-compatibility/CMakeLists.txt
index 8cba91de33f..4fc2a002cd8 100644
--- a/base/glibc-compatibility/CMakeLists.txt
+++ b/base/glibc-compatibility/CMakeLists.txt
@@ -9,10 +9,6 @@ if (GLIBC_COMPATIBILITY)
 
     check_include_file("sys/random.h" HAVE_SYS_RANDOM_H)
 
-    if(COMPILER_CLANG)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-builtin-requires-header")
-    endif()
-
     add_headers_and_sources(glibc_compatibility .)
     add_headers_and_sources(glibc_compatibility musl)
     if (ARCH_AARCH64)
@@ -35,11 +31,9 @@ if (GLIBC_COMPATIBILITY)
 
     add_library(glibc-compatibility STATIC ${glibc_compatibility_sources})
 
-    if (COMPILER_CLANG)
-        target_compile_options(glibc-compatibility PRIVATE -Wno-unused-command-line-argument)
-    elseif (COMPILER_GCC)
-        target_compile_options(glibc-compatibility PRIVATE -Wno-unused-but-set-variable)
-    endif ()
+    target_no_warning(glibc-compatibility unused-command-line-argument)
+    target_no_warning(glibc-compatibility unused-but-set-variable)
+    target_no_warning(glibc-compatibility builtin-requires-header)
 
     target_include_directories(glibc-compatibility PRIVATE libcxxabi ${musl_arch_include_dir})
 
diff --git a/base/glibc-compatibility/glibc-compat-2.32.h b/base/glibc-compatibility/glibc-compat-2.32.h
new file mode 100644
index 00000000000..53ed34d60fa
--- /dev/null
+++ b/base/glibc-compatibility/glibc-compat-2.32.h
@@ -0,0 +1,50 @@
+/// In glibc 2.32 new version of some symbols had been added [1]:
+///
+///     $ nm -D clickhouse | fgrep -e @GLIBC_2.32
+///                      U pthread_getattr_np@GLIBC_2.32
+///                      U pthread_sigmask@GLIBC_2.32
+///
+///   [1]: https://www.spinics.net/lists/fedora-devel/msg273044.html
+///
+/// Right now ubuntu 20.04 is used as official image for building
+/// ClickHouse, however once it will be switched someone may not be happy
+/// with that fact that he/she cannot use official binaries anymore because
+/// they have glibc < 2.32.
+///
+/// To avoid this dependency, let's force previous version of those
+/// symbols from glibc.
+///
+/// Also note, that the following approach had been tested:
+/// a) -Wl,--wrap -- but it goes into endless recursion whey you try to do
+///    something like this:
+///
+///     int __pthread_getattr_np_compact(pthread_t thread, pthread_attr_t *attr);
+///     GLIBC_COMPAT_SYMBOL(__pthread_getattr_np_compact, pthread_getattr_np)
+///     int __pthread_getattr_np_compact(pthread_t thread, pthread_attr_t *attr);
+///     int __wrap_pthread_getattr_np(pthread_t thread, pthread_attr_t *attr)
+///     {
+///         return __pthread_getattr_np_compact(thread, attr);
+///     }
+///
+///     int __pthread_sigmask_compact(int how, const sigset_t *set, sigset_t *oldset);
+///     GLIBC_COMPAT_SYMBOL(__pthread_sigmask_compact, pthread_sigmask)
+///     int __pthread_sigmask_compact(int how, const sigset_t *set, sigset_t *oldset);
+///     int __wrap_pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset)
+///     {
+///         return __pthread_sigmask_compact(how, set, oldset);
+///     }
+///
+/// b) -Wl,--defsym -- same problems (and you cannot use version of symbol with
+///    version in the expression)
+/// c) this approach -- simply add this file with -include directive.
+
+#if defined(__amd64__)
+#define GLIBC_COMPAT_SYMBOL(func) __asm__(".symver " #func "," #func "@GLIBC_2.2.5");
+#elif defined(__aarch64__)
+#define GLIBC_COMPAT_SYMBOL(func) __asm__(".symver " #func "," #func "@GLIBC_2.17");
+#else
+#error Your platform is not supported.
+#endif
+
+GLIBC_COMPAT_SYMBOL(pthread_sigmask)
+GLIBC_COMPAT_SYMBOL(pthread_getattr_np)
diff --git a/base/glibc-compatibility/memcpy/memcpy.h b/base/glibc-compatibility/memcpy/memcpy.h
index 211d144cecb..9bee26a3722 100644
--- a/base/glibc-compatibility/memcpy/memcpy.h
+++ b/base/glibc-compatibility/memcpy/memcpy.h
@@ -1,4 +1,4 @@
-#include <cstddef>
+#include <stddef.h>
 
 #include <emmintrin.h>
 
diff --git a/base/glibc-compatibility/musl/getauxval.c b/base/glibc-compatibility/musl/getauxval.c
index a429273fa1a..dad7aa938d7 100644
--- a/base/glibc-compatibility/musl/getauxval.c
+++ b/base/glibc-compatibility/musl/getauxval.c
@@ -1,4 +1,5 @@
 #include <sys/auxv.h>
+#include "atomic.h"
 #include <unistd.h> // __environ
 #include <errno.h>
 
@@ -17,18 +18,7 @@ static size_t __find_auxv(unsigned long type)
     return (size_t) -1;
 }
 
-__attribute__((constructor)) static void __auxv_init()
-{
-    size_t i;
-    for (i = 0; __environ[i]; i++);
-    __auxv = (unsigned long *) (__environ + i + 1);
-
-    size_t secure_idx = __find_auxv(AT_SECURE);
-    if (secure_idx != ((size_t) -1))
-        __auxv_secure = __auxv[secure_idx];
-}
-
-unsigned long getauxval(unsigned long type)
+unsigned long __getauxval(unsigned long type)
 {
     if (type == AT_SECURE)
         return __auxv_secure;
@@ -43,3 +33,38 @@ unsigned long getauxval(unsigned long type)
     errno = ENOENT;
     return 0;
 }
+
+static void * volatile getauxval_func;
+
+static unsigned long  __auxv_init(unsigned long type)
+{
+    if (!__environ)
+    {
+        // __environ is not initialized yet so we can't initialize __auxv right now.
+        // That's normally occurred only when getauxval() is called from some sanitizer's internal code.
+        errno = ENOENT;
+        return 0;
+    }
+
+    // Initialize __auxv and __auxv_secure.
+    size_t i;
+    for (i = 0; __environ[i]; i++);
+    __auxv = (unsigned long *) (__environ + i + 1);
+
+    size_t secure_idx = __find_auxv(AT_SECURE);
+    if (secure_idx != ((size_t) -1))
+        __auxv_secure = __auxv[secure_idx];
+
+    // Now we've initialized __auxv, next time getauxval() will only call __get_auxval().
+    a_cas_p(&getauxval_func, (void *)__auxv_init, (void *)__getauxval);
+
+    return __getauxval(type);
+}
+
+// First time getauxval() will call __auxv_init().
+static void * volatile getauxval_func = (void *)__auxv_init;
+
+unsigned long getauxval(unsigned long type)
+{
+    return ((unsigned long (*)(unsigned long))getauxval_func)(type);
+}
diff --git a/base/loggers/ExtendedLogChannel.cpp b/base/loggers/ExtendedLogChannel.cpp
index 4ab6ad5c96a..fa414216aa5 100644
--- a/base/loggers/ExtendedLogChannel.cpp
+++ b/base/loggers/ExtendedLogChannel.cpp
@@ -3,7 +3,7 @@
 #include <sys/time.h>
 #include <Common/CurrentThread.h>
 #include <Common/Exception.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 
 namespace DB
diff --git a/base/loggers/Loggers.cpp b/base/loggers/Loggers.cpp
index 80e62d0a6d6..0f41296819e 100644
--- a/base/loggers/Loggers.cpp
+++ b/base/loggers/Loggers.cpp
@@ -84,7 +84,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
 
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, log_file);
         log->setLevel(log_level);
-        split->addChannel(log);
+        split->addChannel(log, "log");
     }
 
     const auto errorlog_path = config.getString("logger.errorlog", "");
@@ -116,7 +116,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         Poco::AutoPtr<DB::OwnFormattingChannel> errorlog = new DB::OwnFormattingChannel(pf, error_log_file);
         errorlog->setLevel(errorlog_level);
         errorlog->open();
-        split->addChannel(errorlog);
+        split->addChannel(errorlog, "errorlog");
     }
 
     if (config.getBool("logger.use_syslog", false))
@@ -155,7 +155,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, syslog_channel);
         log->setLevel(syslog_level);
 
-        split->addChannel(log);
+        split->addChannel(log, "syslog");
     }
 
     bool should_log_to_console = isatty(STDIN_FILENO) || isatty(STDERR_FILENO);
@@ -177,7 +177,7 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
         Poco::AutoPtr<DB::OwnFormattingChannel> log = new DB::OwnFormattingChannel(pf, new Poco::ConsoleChannel);
         logger.warning("Logging " + console_log_level_string + " to console");
         log->setLevel(console_log_level);
-        split->addChannel(log);
+        split->addChannel(log, "console");
     }
 
     split->open();
@@ -224,6 +224,89 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
     }
 }
 
+void Loggers::updateLevels(Poco::Util::AbstractConfiguration & config, Poco::Logger & logger)
+{
+    int max_log_level = 0;
+
+    const auto log_level_string = config.getString("logger.level", "trace");
+    int log_level = Poco::Logger::parseLevel(log_level_string);
+    if (log_level > max_log_level)
+        max_log_level = log_level;
+
+    const auto log_path = config.getString("logger.log", "");
+    if (!log_path.empty())
+        split->setLevel("log", log_level);
+    else
+        split->setLevel("log", 0);
+
+    // Set level to console
+    bool is_daemon = config.getBool("application.runAsDaemon", false);
+    bool should_log_to_console = isatty(STDIN_FILENO) || isatty(STDERR_FILENO);
+    if (config.getBool("logger.console", false)
+        || (!config.hasProperty("logger.console") && !is_daemon && should_log_to_console))
+        split->setLevel("console", log_level);
+    else
+        split->setLevel("console", 0);
+
+    // Set level to errorlog
+    int errorlog_level = 0;
+    const auto errorlog_path = config.getString("logger.errorlog", "");
+    if (!errorlog_path.empty())
+    {
+        errorlog_level = Poco::Logger::parseLevel(config.getString("logger.errorlog_level", "notice"));
+        if (errorlog_level > max_log_level)
+            max_log_level = errorlog_level;
+    }
+    split->setLevel("errorlog", errorlog_level);
+
+    // Set level to syslog
+    int syslog_level = 0;
+    if (config.getBool("logger.use_syslog", false))
+    {
+        syslog_level = Poco::Logger::parseLevel(config.getString("logger.syslog_level", log_level_string));
+        if (syslog_level > max_log_level)
+            max_log_level = syslog_level;
+    }
+    split->setLevel("syslog", syslog_level);
+
+    // Global logging level (it can be overridden for specific loggers).
+    logger.setLevel(max_log_level);
+
+    // Set level to all already created loggers
+    std::vector<std::string> names;
+
+    logger.root().names(names);
+    for (const auto & name : names)
+        logger.root().get(name).setLevel(max_log_level);
+
+    logger.root().setLevel(max_log_level);
+
+    // Explicitly specified log levels for specific loggers.
+    {
+        Poco::Util::AbstractConfiguration::Keys loggers_level;
+        config.keys("logger.levels", loggers_level);
+
+        if (!loggers_level.empty())
+        {
+            for (const auto & key : loggers_level)
+            {
+                if (key == "logger" || key.starts_with("logger["))
+                {
+                    const std::string name(config.getString("logger.levels." + key + ".name"));
+                    const std::string level(config.getString("logger.levels." + key + ".level"));
+                    logger.root().get(name).setLevel(level);
+                }
+                else
+                {
+                    // Legacy syntax
+                    const std::string level(config.getString("logger.levels." + key, "trace"));
+                    logger.root().get(key).setLevel(level);
+                }
+            }
+        }
+    }
+}
+
 void Loggers::closeLogs(Poco::Logger & logger)
 {
     if (log_file)
diff --git a/base/loggers/Loggers.h b/base/loggers/Loggers.h
index 151c1d3566f..e8afd749534 100644
--- a/base/loggers/Loggers.h
+++ b/base/loggers/Loggers.h
@@ -19,6 +19,8 @@ class Loggers
 public:
     void buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Logger & logger, const std::string & cmd_name = "");
 
+    void updateLevels(Poco::Util::AbstractConfiguration & config, Poco::Logger & logger);
+
     /// Close log files. On next log write files will be reopened.
     void closeLogs(Poco::Logger & logger);
 
diff --git a/base/loggers/OwnFormattingChannel.h b/base/loggers/OwnFormattingChannel.h
index 2336dacad04..0480d0d5061 100644
--- a/base/loggers/OwnFormattingChannel.h
+++ b/base/loggers/OwnFormattingChannel.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <atomic>
 #include <Poco/AutoPtr.h>
 #include <Poco/Channel.h>
 #include <Poco/FormattingChannel.h>
@@ -14,7 +15,7 @@ class OwnFormattingChannel : public Poco::Channel, public ExtendedLogChannel
 public:
     explicit OwnFormattingChannel(
         Poco::AutoPtr<OwnPatternFormatter> pFormatter_ = nullptr, Poco::AutoPtr<Poco::Channel> pChannel_ = nullptr)
-        : pFormatter(std::move(pFormatter_)), pChannel(std::move(pChannel_))
+        : pFormatter(std::move(pFormatter_)), pChannel(std::move(pChannel_)), priority(Poco::Message::PRIO_TRACE)
     {
     }
 
@@ -45,7 +46,7 @@ public:
 private:
     Poco::AutoPtr<OwnPatternFormatter> pFormatter;
     Poco::AutoPtr<Poco::Channel> pChannel;
-    Poco::Message::Priority priority = Poco::Message::PRIO_TRACE;
+    std::atomic<Poco::Message::Priority> priority;
 };
 
 }
diff --git a/base/loggers/OwnPatternFormatter.cpp b/base/loggers/OwnPatternFormatter.cpp
index e62039f4a27..3e1c66acba3 100644
--- a/base/loggers/OwnPatternFormatter.cpp
+++ b/base/loggers/OwnPatternFormatter.cpp
@@ -8,8 +8,8 @@
 #include <Common/HashTable/Hash.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Common/CurrentThread.h>
-#include <common/getThreadId.h>
-#include <common/terminalColors.h>
+#include <base/getThreadId.h>
+#include <base/terminalColors.h>
 #include "Loggers.h"
 
 
diff --git a/base/loggers/OwnSplitChannel.cpp b/base/loggers/OwnSplitChannel.cpp
index eb881e4a661..2ae1e65729c 100644
--- a/base/loggers/OwnSplitChannel.cpp
+++ b/base/loggers/OwnSplitChannel.cpp
@@ -1,4 +1,5 @@
 #include "OwnSplitChannel.h"
+#include "OwnFormattingChannel.h"
 
 #include <iostream>
 #include <Core/Block.h>
@@ -9,7 +10,7 @@
 #include <Poco/Message.h>
 #include <Common/CurrentThread.h>
 #include <Common/DNSResolver.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/IO.h>
 
@@ -75,7 +76,7 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
     ExtendedLogMessage msg_ext = ExtendedLogMessage::getFrom(msg);
 
     /// Log data to child channels
-    for (auto & channel : channels)
+    for (auto & [name, channel] : channels)
     {
         if (channel.second)
             channel.second->logExtended(msg_ext); // extended child
@@ -100,7 +101,7 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
         columns[i++]->insert(msg.getSource());
         columns[i++]->insert(msg.getText());
 
-        logs_queue->emplace(std::move(columns));
+        [[maybe_unused]] bool push_result = logs_queue->emplace(std::move(columns));
     }
 
     /// Also log to system.text_log table, if message is not too noisy
@@ -137,9 +138,9 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
 }
 
 
-void OwnSplitChannel::addChannel(Poco::AutoPtr<Poco::Channel> channel)
+void OwnSplitChannel::addChannel(Poco::AutoPtr<Poco::Channel> channel, const std::string & name)
 {
-    channels.emplace_back(std::move(channel), dynamic_cast<ExtendedLogChannel *>(channel.get()));
+    channels.emplace(name, ExtendedChannelPtrPair(std::move(channel), dynamic_cast<ExtendedLogChannel *>(channel.get())));
 }
 
 void OwnSplitChannel::addTextLog(std::shared_ptr<DB::TextLog> log, int max_priority)
@@ -149,4 +150,14 @@ void OwnSplitChannel::addTextLog(std::shared_ptr<DB::TextLog> log, int max_prior
     text_log_max_priority.store(max_priority, std::memory_order_relaxed);
 }
 
+void OwnSplitChannel::setLevel(const std::string & name, int level)
+{
+     auto it = channels.find(name);
+     if (it != channels.end())
+     {
+         if (auto * channel = dynamic_cast<DB::OwnFormattingChannel *>(it->second.first.get()))
+            channel->setLevel(level);
+     }
+}
+
 }
diff --git a/base/loggers/OwnSplitChannel.h b/base/loggers/OwnSplitChannel.h
index 03ff7b57745..fdc580e65f8 100644
--- a/base/loggers/OwnSplitChannel.h
+++ b/base/loggers/OwnSplitChannel.h
@@ -18,10 +18,12 @@ public:
     /// Makes an extended message from msg and passes it to the client logs queue and child (if possible)
     void log(const Poco::Message & msg) override;
     /// Adds a child channel
-    void addChannel(Poco::AutoPtr<Poco::Channel> channel);
+    void addChannel(Poco::AutoPtr<Poco::Channel> channel, const std::string & name);
 
     void addTextLog(std::shared_ptr<DB::TextLog> log, int max_priority);
 
+    void setLevel(const std::string & name, int level);
+
 private:
     void logSplit(const Poco::Message & msg);
     void tryLogSplit(const Poco::Message & msg);
@@ -29,7 +31,7 @@ private:
     using ChannelPtr = Poco::AutoPtr<Poco::Channel>;
     /// Handler and its pointer casted to extended interface
     using ExtendedChannelPtrPair = std::pair<ChannelPtr, ExtendedLogChannel *>;
-    std::vector<ExtendedChannelPtrPair> channels;
+    std::map<std::string, ExtendedChannelPtrPair> channels;
 
     std::mutex text_log_mutex;
 
diff --git a/base/loggers/ya.make b/base/loggers/ya.make
deleted file mode 100644
index 943b6f12b73..00000000000
--- a/base/loggers/ya.make
+++ /dev/null
@@ -1,19 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    ExtendedLogChannel.cpp
-    Loggers.cpp
-    OwnFormattingChannel.cpp
-    OwnPatternFormatter.cpp
-    OwnSplitChannel.cpp
-)
-
-END()
diff --git a/base/mysqlxx/CMakeLists.txt b/base/mysqlxx/CMakeLists.txt
index c5230c2b49f..947f61f9051 100644
--- a/base/mysqlxx/CMakeLists.txt
+++ b/base/mysqlxx/CMakeLists.txt
@@ -49,6 +49,8 @@ if (NOT USE_INTERNAL_MYSQL_LIBRARY AND OPENSSL_INCLUDE_DIR)
     target_include_directories (mysqlxx SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
 endif ()
 
+target_no_warning(mysqlxx reserved-macro-identifier)
+
 if (NOT USE_INTERNAL_MYSQL_LIBRARY AND USE_STATIC_LIBRARIES)
    message(WARNING "Statically linking with system mysql/mariadb only works "
            "if mysql client libraries are built with same openssl version as "
diff --git a/base/mysqlxx/Pool.cpp b/base/mysqlxx/Pool.cpp
index 386b4544b78..a74feb54cd3 100644
--- a/base/mysqlxx/Pool.cpp
+++ b/base/mysqlxx/Pool.cpp
@@ -7,10 +7,22 @@
 #endif
 
 #include <mysqlxx/Pool.h>
-
-#include <common/sleep.h>
-
+#include <base/sleep.h>
 #include <Poco/Util/LayeredConfiguration.h>
+#include <ctime>
+
+
+namespace
+{
+
+inline uint64_t clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
+{
+    struct timespec ts;
+    clock_gettime(clock_type, &ts);
+    return uint64_t(ts.tv_sec * 1000000000LL + ts.tv_nsec);
+}
+
+}
 
 
 namespace mysqlxx
@@ -124,10 +136,15 @@ Pool::~Pool()
 }
 
 
-Pool::Entry Pool::get()
+Pool::Entry Pool::get(uint64_t wait_timeout)
 {
     std::unique_lock<std::mutex> lock(mutex);
 
+    uint64_t deadline = 0;
+    /// UINT64_MAX -- wait indefinitely
+    if (wait_timeout && wait_timeout != UINT64_MAX)
+        deadline = clock_gettime_ns() + wait_timeout * 1'000'000'000;
+
     initialize();
     for (;;)
     {
@@ -153,6 +170,12 @@ Pool::Entry Pool::get()
             logger.trace("(%s): Unable to create a new connection: Max number of connections has been reached.", getDescription());
         }
 
+        if (!wait_timeout)
+            throw Poco::Exception("mysqlxx::Pool is full (wait is disabled, see connection_wait_timeout setting)");
+
+        if (deadline && clock_gettime_ns() >= deadline)
+            throw Poco::Exception("mysqlxx::Pool is full (connection_wait_timeout is exceeded)");
+
         lock.unlock();
         logger.trace("(%s): Sleeping for %d seconds.", getDescription(), MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
         sleepForSeconds(MYSQLXX_POOL_SLEEP_ON_CONNECT_FAIL);
@@ -296,7 +319,7 @@ void Pool::initialize()
 
 Pool::Connection * Pool::allocConnection(bool dont_throw_if_failed_first_time)
 {
-    std::unique_ptr<Connection> conn_ptr{new Connection};
+    std::unique_ptr conn_ptr = std::make_unique<Connection>();
 
     try
     {
diff --git a/base/mysqlxx/Pool.h b/base/mysqlxx/Pool.h
index 530e2c78cf2..f542c3d3b76 100644
--- a/base/mysqlxx/Pool.h
+++ b/base/mysqlxx/Pool.h
@@ -189,7 +189,7 @@ public:
     ~Pool();
 
     /// Allocates connection.
-    Entry get();
+    Entry get(uint64_t wait_timeout = UINT64_MAX);
 
     /// Allocates connection.
     /// If database is not accessible, returns empty Entry object.
diff --git a/base/mysqlxx/PoolFactory.cpp b/base/mysqlxx/PoolFactory.cpp
index f0a5543d723..1d2f9fc74c7 100644
--- a/base/mysqlxx/PoolFactory.cpp
+++ b/base/mysqlxx/PoolFactory.cpp
@@ -79,7 +79,7 @@ PoolWithFailover PoolFactory::get(const Poco::Util::AbstractConfiguration & conf
     std::lock_guard<std::mutex> lock(impl->mutex);
     if (auto entry = impl->pools.find(config_name); entry != impl->pools.end())
     {
-        return *(entry->second.get());
+        return *(entry->second);
     }
     else
     {
@@ -100,7 +100,7 @@ PoolWithFailover PoolFactory::get(const Poco::Util::AbstractConfiguration & conf
             impl->pools.insert_or_assign(config_name, pool);
             impl->pools_by_ids.insert_or_assign(entry_name, config_name);
         }
-        return *(pool.get());
+        return *pool;
     }
 }
 
diff --git a/base/mysqlxx/PoolWithFailover.cpp b/base/mysqlxx/PoolWithFailover.cpp
index e317ab7f228..14c0db9ecd5 100644
--- a/base/mysqlxx/PoolWithFailover.cpp
+++ b/base/mysqlxx/PoolWithFailover.cpp
@@ -21,8 +21,9 @@ PoolWithFailover::PoolWithFailover(
         const unsigned max_connections_,
         const size_t max_tries_)
     : max_tries(max_tries_)
+    , shareable(config_.getBool(config_name_ + ".share_connection", false))
+    , wait_timeout(UINT64_MAX)
 {
-    shareable = config_.getBool(config_name_ + ".share_connection", false);
     if (config_.has(config_name_ + ".replica"))
     {
         Poco::Util::AbstractConfiguration::Keys replica_keys;
@@ -80,9 +81,11 @@ PoolWithFailover::PoolWithFailover(
         const std::string & password,
         unsigned default_connections_,
         unsigned max_connections_,
-        size_t max_tries_)
+        size_t max_tries_,
+        uint64_t wait_timeout_)
     : max_tries(max_tries_)
     , shareable(false)
+    , wait_timeout(wait_timeout_)
 {
     /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
     for (const auto & [host, port] : addresses)
@@ -101,6 +104,7 @@ PoolWithFailover::PoolWithFailover(
 PoolWithFailover::PoolWithFailover(const PoolWithFailover & other)
     : max_tries{other.max_tries}
     , shareable{other.shareable}
+    , wait_timeout(other.wait_timeout)
 {
     if (shareable)
     {
@@ -140,7 +144,7 @@ PoolWithFailover::Entry PoolWithFailover::get()
 
                 try
                 {
-                    Entry entry = shareable ? pool->get() : pool->tryGet();
+                    Entry entry = shareable ? pool->get(wait_timeout) : pool->tryGet();
 
                     if (!entry.isNull())
                     {
@@ -172,7 +176,7 @@ PoolWithFailover::Entry PoolWithFailover::get()
     if (full_pool)
     {
         app.logger().error("All connections failed, trying to wait on a full pool " + (*full_pool)->getDescription());
-        return (*full_pool)->get();
+        return (*full_pool)->get(wait_timeout);
     }
 
     std::stringstream message;
diff --git a/base/mysqlxx/PoolWithFailover.h b/base/mysqlxx/PoolWithFailover.h
index 1c7a63e76c0..2bd5ec9f30a 100644
--- a/base/mysqlxx/PoolWithFailover.h
+++ b/base/mysqlxx/PoolWithFailover.h
@@ -80,6 +80,8 @@ namespace mysqlxx
         std::mutex mutex;
         /// Can the Pool be shared
         bool shareable;
+        /// Timeout for waiting free connection.
+        uint64_t wait_timeout = 0;
 
     public:
         using Entry = Pool::Entry;
@@ -96,6 +98,7 @@ namespace mysqlxx
          * default_connections   Number of connection in pool to each replica at start.
          * max_connections       Maximum number of connections in pool to each replica.
          * max_tries_            Max number of connection tries.
+         * wait_timeout_         Timeout for waiting free connection.
          */
         PoolWithFailover(
             const std::string & config_name_,
@@ -117,7 +120,8 @@ namespace mysqlxx
             const std::string & password,
             unsigned default_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
             unsigned max_connections_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_CONNECTIONS,
-            size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
+            size_t max_tries_ = MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES,
+            uint64_t wait_timeout_ = UINT64_MAX);
 
         PoolWithFailover(const PoolWithFailover & other);
 
diff --git a/base/mysqlxx/Query.cpp b/base/mysqlxx/Query.cpp
index c0d5c20fdfd..d4514c3e988 100644
--- a/base/mysqlxx/Query.cpp
+++ b/base/mysqlxx/Query.cpp
@@ -2,7 +2,7 @@
 #include <errmsg.h>
 #include <mysql.h>
 #else
-#include <mysql/errmsg.h> //Y_IGNORE
+#include <mysql/errmsg.h>
 #include <mysql/mysql.h>
 #endif
 
diff --git a/base/mysqlxx/Value.h b/base/mysqlxx/Value.h
index 57cfd452045..6d3b2e96ebd 100644
--- a/base/mysqlxx/Value.h
+++ b/base/mysqlxx/Value.h
@@ -8,12 +8,12 @@
 #include <string>
 #include <limits>
 
-#include <common/preciseExp10.h>
-#include <common/types.h>
-#include <common/DateLUT.h>
+#include <base/preciseExp10.h>
+#include <base/types.h>
+#include <base/DateLUT.h>
 
 #include <mysqlxx/Types.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 
 
 namespace mysqlxx
diff --git a/base/mysqlxx/mysqlxx.h b/base/mysqlxx/mysqlxx.h
index d64dadfc367..0caadcbb720 100644
--- a/base/mysqlxx/mysqlxx.h
+++ b/base/mysqlxx/mysqlxx.h
@@ -3,8 +3,8 @@
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/Transaction.h>
 #include <mysqlxx/Pool.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
 #include <mysqlxx/Null.h>
 
 
diff --git a/base/mysqlxx/ya.make b/base/mysqlxx/ya.make
deleted file mode 100644
index aabc9922e72..00000000000
--- a/base/mysqlxx/ya.make
+++ /dev/null
@@ -1,39 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-LIBRARY()
-
-OWNER(g:clickhouse)
-
-CFLAGS(-g0)
-
-PEERDIR(
-    contrib/restricted/boost/libs
-    contrib/libs/libmysql_r
-    contrib/libs/poco/Foundation
-    contrib/libs/poco/Util
-)
-
-ADDINCL(
-    GLOBAL clickhouse/base
-    clickhouse/base
-    contrib/libs/libmysql_r
-)
-
-NO_COMPILER_WARNINGS()
-
-NO_UTIL()
-
-SRCS(
-    Connection.cpp
-    Exception.cpp
-    Pool.cpp
-    PoolFactory.cpp
-    PoolWithFailover.cpp
-    Query.cpp
-    ResultBase.cpp
-    Row.cpp
-    UseQueryResult.cpp
-    Value.cpp
-
-)
-
-END()
diff --git a/base/mysqlxx/ya.make.in b/base/mysqlxx/ya.make.in
deleted file mode 100644
index 10755078e20..00000000000
--- a/base/mysqlxx/ya.make.in
+++ /dev/null
@@ -1,28 +0,0 @@
-LIBRARY()
-
-OWNER(g:clickhouse)
-
-CFLAGS(-g0)
-
-PEERDIR(
-    contrib/restricted/boost/libs
-    contrib/libs/libmysql_r
-    contrib/libs/poco/Foundation
-    contrib/libs/poco/Util
-)
-
-ADDINCL(
-    GLOBAL clickhouse/base
-    clickhouse/base
-    contrib/libs/libmysql_r
-)
-
-NO_COMPILER_WARNINGS()
-
-NO_UTIL()
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests/ | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/base/pcg-random/ya.make b/base/pcg-random/ya.make
deleted file mode 100644
index 705cdc05341..00000000000
--- a/base/pcg-random/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL (GLOBAL clickhouse/base/pcg-random)
-
-END()
diff --git a/base/readpassphrase/readpassphrase.c b/base/readpassphrase/readpassphrase.c
index 8a7d3153915..b8707770e6c 100644
--- a/base/readpassphrase/readpassphrase.c
+++ b/base/readpassphrase/readpassphrase.c
@@ -27,6 +27,10 @@
 #define _PATH_TTY "/dev/tty"
 #endif
 
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <termios.h>
 #include <signal.h>
 #include <ctype.h>
diff --git a/base/readpassphrase/ya.make b/base/readpassphrase/ya.make
deleted file mode 100644
index d1ace8925ae..00000000000
--- a/base/readpassphrase/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-CFLAGS(-g0)
-
-SRCS(
-    readpassphrase.c
-)
-
-END()
diff --git a/base/widechar_width/ya.make b/base/widechar_width/ya.make
deleted file mode 100644
index 0d61e0dbf70..00000000000
--- a/base/widechar_width/ya.make
+++ /dev/null
@@ -1,13 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(GLOBAL clickhouse/base/widechar_width)
-
-CFLAGS(-g0)
-
-SRCS(
-    widechar_width.cpp
-)
-
-END()
diff --git a/base/ya.make b/base/ya.make
deleted file mode 100644
index 19a16044280..00000000000
--- a/base/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-OWNER(g:clickhouse)
-
-RECURSE(
-    common
-    daemon
-    loggers
-    mysqlxx
-    pcg-random
-    widechar_width
-    readpassphrase
-)
diff --git a/benchmark/hardware.sh b/benchmark/hardware.sh
index e4a94ef1854..69e05cf804b 100755
--- a/benchmark/hardware.sh
+++ b/benchmark/hardware.sh
@@ -11,8 +11,9 @@ DATASET="${TABLE}_v1.tar.xz"
 QUERIES_FILE="queries.sql"
 TRIES=3
 
-AMD64_BIN_URL="https://builds.clickhouse.tech/master/amd64/clickhouse"
-AARCH64_BIN_URL="https://builds.clickhouse.tech/master/aarch64/clickhouse"
+AMD64_BIN_URL="https://builds.clickhouse.com/master/amd64/clickhouse"
+AARCH64_BIN_URL="https://builds.clickhouse.com/master/aarch64/clickhouse"
+POWERPC64_BIN_URL="https://builds.clickhouse.com/master/ppc64le/clickhouse"
 
 # Note: on older Ubuntu versions, 'axel' does not support IPv6. If you are using IPv6-only servers on very old Ubuntu, just don't install 'axel'.
 
@@ -38,6 +39,8 @@ if [[ ! -f clickhouse ]]; then
         $FASTER_DOWNLOAD "$AMD64_BIN_URL"
     elif [[ $CPU == aarch64 ]]; then
         $FASTER_DOWNLOAD "$AARCH64_BIN_URL"
+    elif [[ $CPU == powerpc64le ]]; then
+        $FASTER_DOWNLOAD "$POWERPC64_BIN_URL"
     else
         echo "Unsupported CPU type: $CPU"
         exit 1
@@ -52,7 +55,7 @@ fi
 
 if [[ ! -d data ]]; then
     if [[ ! -f $DATASET ]]; then
-        $FASTER_DOWNLOAD "https://clickhouse-datasets.s3.yandex.net/hits/partitions/$DATASET"
+        $FASTER_DOWNLOAD "https://datasets.clickhouse.com/hits/partitions/$DATASET"
     fi
 
     tar $TAR_PARAMS --strip-components=1 --directory=. -x -v -f $DATASET
diff --git a/benchmark/monetdb/instruction.md b/benchmark/monetdb/instruction.md
index 482693d6485..b48bb19ecc1 100644
--- a/benchmark/monetdb/instruction.md
+++ b/benchmark/monetdb/instruction.md
@@ -179,7 +179,7 @@ CREATE TABLE hits
 # How to prepare data
 
 Download the 100 million rows dataset from here and insert into ClickHouse:
-https://clickhouse.tech/docs/en/getting-started/example-datasets/metrica/
+https://clickhouse.com/docs/en/getting-started/example-datasets/metrica/
 
 Create the dataset from ClickHouse:
 
diff --git a/benchmark/omnisci/instruction.md b/benchmark/omnisci/instruction.md
index 81b45241277..e81e3783e44 100644
--- a/benchmark/omnisci/instruction.md
+++ b/benchmark/omnisci/instruction.md
@@ -38,7 +38,7 @@ https://github.com/omnisci/omniscidb/issues?q=is%3Aissue+author%3Aalexey-milovid
 # How to prepare data
 
 Download the 100 million rows dataset from here and insert into ClickHouse:
-https://clickhouse.tech/docs/en/getting-started/example-datasets/metrica/
+https://clickhouse.com/docs/en/getting-started/example-datasets/metrica/
 
 Convert the CREATE TABLE query:
 
diff --git a/cmake/add_warning.cmake b/cmake/add_warning.cmake
index 3a776c98ab6..bc9642c9cc6 100644
--- a/cmake/add_warning.cmake
+++ b/cmake/add_warning.cmake
@@ -27,3 +27,22 @@ endmacro ()
 macro (no_warning flag)
     add_warning(no-${flag})
 endmacro ()
+
+
+# The same but only for specified target.
+macro (target_add_warning target flag)
+    string (REPLACE "-" "_" underscored_flag ${flag})
+    string (REPLACE "+" "x" underscored_flag ${underscored_flag})
+
+    check_cxx_compiler_flag("-W${flag}" SUPPORTS_CXXFLAG_${underscored_flag})
+
+    if (SUPPORTS_CXXFLAG_${underscored_flag})
+        target_compile_options (${target} PRIVATE "-W${flag}")
+    else ()
+        message (WARNING "Flag -W${flag} is unsupported")
+    endif ()
+endmacro ()
+
+macro (target_no_warning target flag)
+    target_add_warning(${target} no-${flag})
+endmacro ()
diff --git a/cmake/analysis.cmake b/cmake/analysis.cmake
index 267bb34248b..d1b9c86f15f 100644
--- a/cmake/analysis.cmake
+++ b/cmake/analysis.cmake
@@ -6,7 +6,7 @@ if (ENABLE_CLANG_TIDY)
         message(FATAL_ERROR "clang-tidy requires CMake version at least 3.6.")
     endif()
 
-    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
+    find_program (CLANG_TIDY_PATH NAMES "clang-tidy" "clang-tidy-13" "clang-tidy-12" "clang-tidy-11" "clang-tidy-10" "clang-tidy-9" "clang-tidy-8")
 
     if (CLANG_TIDY_PATH)
         message(STATUS
diff --git a/cmake/arch.cmake b/cmake/arch.cmake
index 60e0346dbbf..00cc16fbd10 100644
--- a/cmake/arch.cmake
+++ b/cmake/arch.cmake
@@ -13,7 +13,6 @@ endif ()
 if ((ARCH_ARM AND NOT ARCH_AARCH64) OR ARCH_I386)
     message (FATAL_ERROR "32bit platforms are not supported")
 endif ()
-
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(ppc64le.*|PPC64LE.*)")
     set (ARCH_PPC64LE 1)
 endif ()
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index 18072566d04..dd6ead7d97f 100644
--- a/cmake/autogenerated_versions.txt
+++ b/cmake/autogenerated_versions.txt
@@ -2,11 +2,11 @@
 
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54454)
+SET(VERSION_REVISION 54456)
 SET(VERSION_MAJOR 21)
-SET(VERSION_MINOR 9)
+SET(VERSION_MINOR 11)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH f48c5af90c2ad51955d1ee3b6b05d006b03e4238)
-SET(VERSION_DESCRIBE v21.9.1.1-prestable)
-SET(VERSION_STRING 21.9.1.1)
+SET(VERSION_GITHASH 7a4a0b0edef0ad6e0aa662cd3b90c3f4acf796e7)
+SET(VERSION_DESCRIBE v21.11.1.1-prestable)
+SET(VERSION_STRING 21.11.1.1)
 # end of autochange
diff --git a/cmake/check_flags.cmake b/cmake/check_flags.cmake
index 5a4ff472868..5d680a8ccbb 100644
--- a/cmake/check_flags.cmake
+++ b/cmake/check_flags.cmake
@@ -1,6 +1,8 @@
 include (CheckCXXCompilerFlag)
 include (CheckCCompilerFlag)
 
+check_cxx_compiler_flag("-Wreserved-identifier" HAS_RESERVED_IDENTIFIER)
 check_cxx_compiler_flag("-Wsuggest-destructor-override" HAS_SUGGEST_DESTRUCTOR_OVERRIDE)
 check_cxx_compiler_flag("-Wshadow" HAS_SHADOW)
 check_cxx_compiler_flag("-Wsuggest-override" HAS_SUGGEST_OVERRIDE)
+check_cxx_compiler_flag("-Xclang -fuse-ctor-homing" HAS_USE_CTOR_HOMING)
diff --git a/cmake/cpu_features.cmake b/cmake/cpu_features.cmake
index d12eac2e3c4..199d1717723 100644
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@@ -5,109 +5,183 @@ include (CMakePushCheckState)
 
 cmake_push_check_state ()
 
-# gcc -dM -E -mno-sse2 - < /dev/null | sort > gcc-dump-nosse2
-# gcc -dM -E -msse2 - < /dev/null | sort > gcc-dump-sse2
-#define __SSE2__ 1
-#define __SSE2_MATH__ 1
+# The variables HAVE_* determine if compiler has support for the flag to use the corresponding instruction set.
+# The options ENABLE_* determine if we will tell compiler to actually use the corresponding instruction set if compiler can do it.
 
-# gcc -dM -E -msse4.1 - < /dev/null | sort > gcc-dump-sse41
-#define __SSE4_1__ 1
+# All of them are unrelated to the instruction set at the host machine
+# (you can compile for newer instruction set on old machines and vice versa).
 
-set (TEST_FLAG "-msse4.1")
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    #include <smmintrin.h>
-    int main() {
-        auto a = _mm_insert_epi8(__m128i(), 0, 0);
-        (void)a;
-        return 0;
-    }
-" HAVE_SSE41)
-if (HAVE_SSE41)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
-endif ()
+option (ENABLE_SSSE3 "Use SSSE3 instructions on x86_64" 1)
+option (ENABLE_SSE41 "Use SSE4.1 instructions on x86_64" 1)
+option (ENABLE_SSE42 "Use SSE4.2 instructions on x86_64" 1)
+option (ENABLE_PCLMULQDQ "Use pclmulqdq instructions on x86_64" 1)
+option (ENABLE_POPCNT "Use popcnt instructions on x86_64" 1)
+option (ENABLE_AVX "Use AVX instructions on x86_64" 0)
+option (ENABLE_AVX2 "Use AVX2 instructions on x86_64" 0)
+option (ENABLE_AVX512 "Use AVX512 instructions on x86_64" 0)
+option (ENABLE_BMI "Use BMI instructions on x86_64" 0)
+option (ENABLE_AVX2_FOR_SPEC_OP "Use avx2 instructions for specific operations on x86_64" 0)
+option (ENABLE_AVX512_FOR_SPEC_OP "Use avx512 instructions for specific operations on x86_64" 0)
 
-if (ARCH_PPC64LE)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
-endif ()
+option (ARCH_NATIVE "Add -march=native compiler flag. This makes your binaries non-portable but more performant code may be generated. This option overrides ENABLE_* options for specific instruction set. Highly not recommended to use." 0)
 
-# gcc -dM -E -msse4.2 - < /dev/null | sort > gcc-dump-sse42
-#define __SSE4_2__ 1
+if (ARCH_NATIVE)
+    set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=native")
 
-set (TEST_FLAG "-msse4.2")
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    #include <nmmintrin.h>
-    int main() {
-        auto a = _mm_crc32_u64(0, 0);
-        (void)a;
-        return 0;
-    }
-" HAVE_SSE42)
-if (HAVE_SSE42)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
-endif ()
+else ()
+    set (TEST_FLAG "-mssse3")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <tmmintrin.h>
+        int main() {
+            __m64 a = _mm_abs_pi8(__m64());
+            (void)a;
+            return 0;
+        }
+    " HAVE_SSSE3)
+    if (HAVE_SSSE3 AND ENABLE_SSSE3)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
 
-set (TEST_FLAG "-mssse3")
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    #include <tmmintrin.h>
-    int main() {
-        __m64 a = _mm_abs_pi8(__m64());
-        (void)a;
-        return 0;
-    }
-" HAVE_SSSE3)
 
-set (TEST_FLAG "-mavx")
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    #include <immintrin.h>
-    int main() {
-        auto a = _mm256_insert_epi8(__m256i(), 0, 0);
-        (void)a;
-        return 0;
-    }
-" HAVE_AVX)
+    set (TEST_FLAG "-msse4.1")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <smmintrin.h>
+        int main() {
+            auto a = _mm_insert_epi8(__m128i(), 0, 0);
+            (void)a;
+            return 0;
+        }
+    " HAVE_SSE41)
+    if (HAVE_SSE41 AND ENABLE_SSE41)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
 
-set (TEST_FLAG "-mavx2")
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    #include <immintrin.h>
-    int main() {
-        auto a = _mm256_add_epi16(__m256i(), __m256i());
-        (void)a;
-        return 0;
-    }
-" HAVE_AVX2)
+    if (ARCH_PPC64LE)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} -maltivec -D__SSE2__=1 -DNO_WARN_X86_INTRINSICS")
+    endif ()
 
-set (TEST_FLAG "-mpclmul")
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    #include <wmmintrin.h>
-    int main() {
-        auto a = _mm_clmulepi64_si128(__m128i(), __m128i(), 0);
-        (void)a;
-        return 0;
-    }
-" HAVE_PCLMULQDQ)
+    set (TEST_FLAG "-msse4.2")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <nmmintrin.h>
+        int main() {
+            auto a = _mm_crc32_u64(0, 0);
+            (void)a;
+            return 0;
+        }
+    " HAVE_SSE42)
+    if (HAVE_SSE42 AND ENABLE_SSE42)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
 
-# gcc -dM -E -mpopcnt - < /dev/null | sort > gcc-dump-popcnt
-#define __POPCNT__ 1
+    set (TEST_FLAG "-mpclmul")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <wmmintrin.h>
+        int main() {
+            auto a = _mm_clmulepi64_si128(__m128i(), __m128i(), 0);
+            (void)a;
+            return 0;
+        }
+    " HAVE_PCLMULQDQ)
+    if (HAVE_PCLMULQDQ AND ENABLE_PCLMULQDQ)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
 
-set (TEST_FLAG "-mpopcnt")
+    set (TEST_FLAG "-mpopcnt")
 
-set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
-check_cxx_source_compiles("
-    int main() {
-        auto a = __builtin_popcountll(0);
-        (void)a;
-        return 0;
-    }
-" HAVE_POPCNT)
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        int main() {
+            auto a = __builtin_popcountll(0);
+            (void)a;
+            return 0;
+        }
+    " HAVE_POPCNT)
+    if (HAVE_POPCNT AND ENABLE_POPCNT)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
 
-if (HAVE_POPCNT AND NOT ARCH_AARCH64)
-    set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    set (TEST_FLAG "-mavx")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <immintrin.h>
+        int main() {
+            auto a = _mm256_insert_epi8(__m256i(), 0, 0);
+            (void)a;
+            return 0;
+        }
+    " HAVE_AVX)
+    if (HAVE_AVX AND ENABLE_AVX)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
+
+    set (TEST_FLAG "-mavx2")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <immintrin.h>
+        int main() {
+            auto a = _mm256_add_epi16(__m256i(), __m256i());
+            (void)a;
+            return 0;
+        }
+    " HAVE_AVX2)
+    if (HAVE_AVX2 AND ENABLE_AVX2)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
+
+    set (TEST_FLAG "-mavx512f -mavx512bw")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <immintrin.h>
+        int main() {
+            auto a = _mm512_setzero_epi32();
+            (void)a;            
+            auto b = _mm512_add_epi16(__m512i(), __m512i());
+            (void)b;
+            return 0;
+        }
+    " HAVE_AVX512)
+    if (HAVE_AVX512 AND ENABLE_AVX512)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()
+
+    set (TEST_FLAG "-mbmi")
+    set (CMAKE_REQUIRED_FLAGS "${TEST_FLAG} -O0")
+    check_cxx_source_compiles("
+        #include <immintrin.h>
+        int main() {
+            auto a = _blsr_u32(0);
+            (void)a;
+            return 0;
+        }
+    " HAVE_BMI)
+    if (HAVE_BMI AND ENABLE_BMI)
+        set (COMPILER_FLAGS "${COMPILER_FLAGS} ${TEST_FLAG}")
+    endif ()   
+
+#Limit avx2/avx512 flag for specific source build
+    set (X86_INTRINSICS_FLAGS "")
+    if (ENABLE_AVX2_FOR_SPEC_OP)
+        if (HAVE_BMI)
+            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mbmi")
+        endif ()
+        if (HAVE_AVX AND HAVE_AVX2)
+            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx -mavx2")
+        endif ()
+    endif ()
+
+    if (ENABLE_AVX512_FOR_SPEC_OP)
+        set (X86_INTRINSICS_FLAGS "")
+        if (HAVE_BMI)
+            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mbmi")
+        endif ()
+        if (HAVE_AVX512)
+            set (X86_INTRINSICS_FLAGS "${X86_INTRINSICS_FLAGS} -mavx512f -mavx512bw -mprefer-vector-width=256")
+        endif ()
+    endif ()
 endif ()
 
 cmake_pop_check_state ()
diff --git a/cmake/dbms_glob_sources.cmake b/cmake/dbms_glob_sources.cmake
index 9c8c53c63b6..0f5c6106b70 100644
--- a/cmake/dbms_glob_sources.cmake
+++ b/cmake/dbms_glob_sources.cmake
@@ -1,14 +1,7 @@
-if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.12")
-    macro(add_glob cur_list)
-        file(GLOB __tmp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS ${ARGN})
-        list(APPEND ${cur_list} ${__tmp})
-    endmacro()
-else ()
-    macro(add_glob cur_list)
-        file(GLOB __tmp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN})
-        list(APPEND ${cur_list} ${__tmp})
-    endmacro()
-endif ()
+macro(add_glob cur_list)
+    file(GLOB __tmp RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${ARGN})
+    list(APPEND ${cur_list} ${__tmp})
+endmacro()
 
 macro(add_headers_and_sources prefix common_path)
     add_glob(${prefix}_headers ${CMAKE_CURRENT_SOURCE_DIR} ${common_path}/*.h)
diff --git a/cmake/find/amqpcpp.cmake b/cmake/find/amqpcpp.cmake
index a4a58349508..374e6dd6d7e 100644
--- a/cmake/find/amqpcpp.cmake
+++ b/cmake/find/amqpcpp.cmake
@@ -10,14 +10,14 @@ if (NOT ENABLE_AMQPCPP)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/CMakeLists.txt")
-    message (WARNING "submodule contrib/AMQP-CPP is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/AMQP-CPP is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal AMQP-CPP library")
     set (USE_AMQPCPP 0)
     return()
 endif ()
 
 set (USE_AMQPCPP 1)
-set (AMQPCPP_LIBRARY amqp-cpp)
+set (AMQPCPP_LIBRARY amqp-cpp ${OPENSSL_LIBRARIES})
 
 set (AMQPCPP_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/AMQP-CPP/include")
 list (APPEND AMQPCPP_INCLUDE_DIR
diff --git a/cmake/find/avro.cmake b/cmake/find/avro.cmake
index 74ccda3489f..351fa15d2d3 100644
--- a/cmake/find/avro.cmake
+++ b/cmake/find/avro.cmake
@@ -13,7 +13,7 @@ option (USE_INTERNAL_AVRO_LIBRARY
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/avro/lang/c++/CMakeLists.txt")
     if (USE_INTERNAL_AVRO_LIBRARY)
-        message(WARNING "submodule contrib/avro is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/avro is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot find internal avro")
         set(USE_INTERNAL_AVRO_LIBRARY 0)
     endif()
diff --git a/cmake/find/base64.cmake b/cmake/find/base64.cmake
index acade11eb2f..ee12fbb11ba 100644
--- a/cmake/find/base64.cmake
+++ b/cmake/find/base64.cmake
@@ -10,11 +10,11 @@ endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64/LICENSE")
     set (MISSING_INTERNAL_BASE64_LIBRARY 1)
-    message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init")
 endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/base64")
-    message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/base64 is missing. to fix try run: \n git submodule update --init")
 else()
     set (BASE64_LIBRARY base64)
     set (USE_BASE64 1)
diff --git a/cmake/find/brotli.cmake b/cmake/find/brotli.cmake
index bf498802922..4b2ee3d6de0 100644
--- a/cmake/find/brotli.cmake
+++ b/cmake/find/brotli.cmake
@@ -16,7 +16,7 @@ endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/brotli/c/include/brotli/decode.h")
     if (USE_INTERNAL_BROTLI_LIBRARY)
-        message (WARNING "submodule contrib/brotli is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/brotli is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot find internal brotli")
         set (USE_INTERNAL_BROTLI_LIBRARY 0)
     endif ()
diff --git a/cmake/find/bzip2.cmake b/cmake/find/bzip2.cmake
new file mode 100644
index 00000000000..5e6a6fb5841
--- /dev/null
+++ b/cmake/find/bzip2.cmake
@@ -0,0 +1,19 @@
+option(ENABLE_BZIP2 "Enable bzip2 compression support" ${ENABLE_LIBRARIES})
+
+if (NOT ENABLE_BZIP2)
+    message (STATUS "bzip2 compression disabled")
+    return()
+endif()
+
+if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/bzip2/bzlib.h")
+    message (WARNING "submodule contrib/bzip2 is missing. to fix try run: \n git submodule update --init")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal bzip2 library")
+    set (USE_NLP 0)
+    return()
+endif ()
+
+set (USE_BZIP2 1)
+set (BZIP2_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/bzip2")
+set (BZIP2_LIBRARY bzip2)
+
+message (STATUS "Using bzip2=${USE_BZIP2}: ${BZIP2_INCLUDE_DIR} : ${BZIP2_LIBRARY}")
diff --git a/cmake/find/capnp.cmake b/cmake/find/capnp.cmake
index ee4735bd175..3d0d767bd0c 100644
--- a/cmake/find/capnp.cmake
+++ b/cmake/find/capnp.cmake
@@ -11,7 +11,7 @@ option (USE_INTERNAL_CAPNP_LIBRARY "Set to FALSE to use system capnproto library
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/capnproto/CMakeLists.txt")
     if(USE_INTERNAL_CAPNP_LIBRARY)
-        message(WARNING "submodule contrib/capnproto is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/capnproto is missing. to fix try run: \n git submodule update --init")
         message(${RECONFIGURE_MESSAGE_LEVEL} "cannot find internal capnproto")
         set(USE_INTERNAL_CAPNP_LIBRARY 0)
     endif()
@@ -34,8 +34,6 @@ endif()
 if (CAPNP_LIBRARIES)
     set (USE_CAPNP 1)
 elseif(NOT MISSING_INTERNAL_CAPNP_LIBRARY)
-    add_subdirectory(contrib/capnproto-cmake)
-
     set (CAPNP_LIBRARIES capnpc)
     set (USE_CAPNP 1)
     set (USE_INTERNAL_CAPNP_LIBRARY 1)
diff --git a/cmake/find/cassandra.cmake b/cmake/find/cassandra.cmake
index b6e97ff5ef8..7fcbdbb90a5 100644
--- a/cmake/find/cassandra.cmake
+++ b/cmake/find/cassandra.cmake
@@ -14,7 +14,7 @@ if (APPLE)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cassandra")
-    message (ERROR "submodule contrib/cassandra is missing. to fix try run: \n git submodule update --init --recursive")
+    message (ERROR "submodule contrib/cassandra is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal Cassandra")
     set (USE_CASSANDRA 0)
     return()
diff --git a/cmake/find/ccache.cmake b/cmake/find/ccache.cmake
index 986c9cb5fe2..43c2de0c921 100644
--- a/cmake/find/ccache.cmake
+++ b/cmake/find/ccache.cmake
@@ -51,8 +51,8 @@ if (CCACHE_FOUND AND NOT COMPILER_MATCHES_CCACHE)
          message(STATUS "ccache is 4.2+ no quirks for SOURCE_DATE_EPOCH required")
       elseif (CCACHE_VERSION VERSION_GREATER_EQUAL "4.0")
          message(STATUS "Ignore SOURCE_DATE_EPOCH for ccache")
-         set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE "env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND}")
-         set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK "env -u SOURCE_DATE_EPOCH ${CCACHE_FOUND}")
+         set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE "env -u SOURCE_DATE_EPOCH")
+         set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK "env -u SOURCE_DATE_EPOCH")
       endif()
    else ()
       message(${RECONFIGURE_MESSAGE_LEVEL} "Not using ${CCACHE_FOUND} ${CCACHE_VERSION} bug: https://bugzilla.samba.org/show_bug.cgi?id=8118")
diff --git a/cmake/find/cxx.cmake b/cmake/find/cxx.cmake
index b1da125e219..f38ac77b1ea 100644
--- a/cmake/find/cxx.cmake
+++ b/cmake/find/cxx.cmake
@@ -17,7 +17,7 @@ option (USE_INTERNAL_LIBCXX_LIBRARY "Disable to use system libcxx and libcxxabi
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libcxx/CMakeLists.txt")
     if (USE_INTERNAL_LIBCXX_LIBRARY)
-        message(WARNING "submodule contrib/libcxx is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/libcxx is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libcxx")
         set(USE_INTERNAL_LIBCXX_LIBRARY 0)
     endif()
diff --git a/cmake/find/cyrus-sasl.cmake b/cmake/find/cyrus-sasl.cmake
index 974b8148fdc..f0c088995b0 100644
--- a/cmake/find/cyrus-sasl.cmake
+++ b/cmake/find/cyrus-sasl.cmake
@@ -6,7 +6,7 @@ endif()
 
 OPTION(ENABLE_CYRUS_SASL "Enable cyrus-sasl" ${DEFAULT_ENABLE_CYRUS_SASL})
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cyrus-sasl/README")
-    message (WARNING "submodule contrib/cyrus-sasl is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/cyrus-sasl is missing. to fix try run: \n git submodule update --init")
     set (ENABLE_CYRUS_SASL 0)
 endif ()
 
diff --git a/cmake/find/datasketches.cmake b/cmake/find/datasketches.cmake
index 44ef324a9f2..2d7e644890a 100644
--- a/cmake/find/datasketches.cmake
+++ b/cmake/find/datasketches.cmake
@@ -6,7 +6,7 @@ option (USE_INTERNAL_DATASKETCHES_LIBRARY "Set to FALSE to use system DataSketch
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/datasketches-cpp/theta/CMakeLists.txt")
     if (USE_INTERNAL_DATASKETCHES_LIBRARY)
-       message(WARNING "submodule contrib/datasketches-cpp is missing. to fix try run: \n git submodule update --init --recursive")
+       message(WARNING "submodule contrib/datasketches-cpp is missing. to fix try run: \n git submodule update --init")
     endif()
     set(MISSING_INTERNAL_DATASKETCHES_LIBRARY 1)
     set(USE_INTERNAL_DATASKETCHES_LIBRARY 0)
diff --git a/cmake/find/fast_float.cmake b/cmake/find/fast_float.cmake
index 4b215c710ad..3e8b7cc5280 100644
--- a/cmake/find/fast_float.cmake
+++ b/cmake/find/fast_float.cmake
@@ -1,5 +1,5 @@
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/fast_float/include/fast_float/fast_float.h")
-    message (FATAL_ERROR "submodule contrib/fast_float is missing. to fix try run: \n git submodule update --init --recursive")
+    message (FATAL_ERROR "submodule contrib/fast_float is missing. to fix try run: \n git submodule update --init")
 endif ()
 
 set(FAST_FLOAT_LIBRARY fast_float)
diff --git a/cmake/find/fastops.cmake b/cmake/find/fastops.cmake
index 1675646654e..72426eb5912 100644
--- a/cmake/find/fastops.cmake
+++ b/cmake/find/fastops.cmake
@@ -10,7 +10,7 @@ if(NOT ENABLE_FASTOPS)
 endif()
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/fastops/fastops/fastops.h")
-    message(WARNING "submodule contrib/fastops is missing. to fix try run: \n git submodule update --init --recursive")
+    message(WARNING "submodule contrib/fastops is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal fastops library")
     set(MISSING_INTERNAL_FASTOPS_LIBRARY 1)
 endif()
diff --git a/cmake/find/filelog.cmake b/cmake/find/filelog.cmake
new file mode 100644
index 00000000000..4d2f94f3f20
--- /dev/null
+++ b/cmake/find/filelog.cmake
@@ -0,0 +1,15 @@
+option (ENABLE_FILELOG "Enable FILELOG" ON)
+
+if (NOT ENABLE_FILELOG)
+	message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use StorageFileLog with ENABLE_FILELOG=OFF")
+    return()
+endif()
+
+# StorageFileLog only support Linux platform
+if (OS_LINUX)
+    set (USE_FILELOG 1)
+    message (STATUS "Using StorageFileLog = 1")
+else()
+    message(STATUS "StorageFileLog is only supported on Linux")
+endif ()
+
diff --git a/cmake/find/grpc.cmake b/cmake/find/grpc.cmake
index 1e440b3b350..f4b280876ef 100644
--- a/cmake/find/grpc.cmake
+++ b/cmake/find/grpc.cmake
@@ -26,7 +26,7 @@ option(USE_INTERNAL_GRPC_LIBRARY "Set to FALSE to use system gRPC library instea
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/grpc/CMakeLists.txt")
   if(USE_INTERNAL_GRPC_LIBRARY)
-    message(WARNING "submodule contrib/grpc is missing. to fix try run: \n git submodule update --init --recursive")
+    message(WARNING "submodule contrib/grpc is missing. to fix try run: \n git submodule update --init")
     message(${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal grpc")
     set(USE_INTERNAL_GRPC_LIBRARY 0)
   endif()
diff --git a/cmake/find/gtest.cmake b/cmake/find/gtest.cmake
index 9d4ab2608cb..c5f987d7368 100644
--- a/cmake/find/gtest.cmake
+++ b/cmake/find/gtest.cmake
@@ -4,7 +4,7 @@ option (USE_INTERNAL_GTEST_LIBRARY "Set to FALSE to use system Google Test inste
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/googletest/googletest/CMakeLists.txt")
    if (USE_INTERNAL_GTEST_LIBRARY)
-       message (WARNING "submodule contrib/googletest is missing. to fix try run: \n git submodule update --init --recursive")
+       message (WARNING "submodule contrib/googletest is missing. to fix try run: \n git submodule update --init")
        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal gtest")
        set (USE_INTERNAL_GTEST_LIBRARY 0)
    endif ()
diff --git a/cmake/find/h3.cmake b/cmake/find/h3.cmake
index 03b6f32fc3c..e692b431e90 100644
--- a/cmake/find/h3.cmake
+++ b/cmake/find/h3.cmake
@@ -11,7 +11,7 @@ option(USE_INTERNAL_H3_LIBRARY "Set to FALSE to use system h3 library instead of
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/h3/src/h3lib/include/h3Index.h")
     if(USE_INTERNAL_H3_LIBRARY)
-        message(WARNING "submodule contrib/h3 is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/h3 is missing. to fix try run: \n git submodule update --init")
         message(${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal h3 library")
         set(USE_INTERNAL_H3_LIBRARY 0)
     endif()
diff --git a/cmake/find/hdfs3.cmake b/cmake/find/hdfs3.cmake
index 3aab2b612ef..aac6b99dfa2 100644
--- a/cmake/find/hdfs3.cmake
+++ b/cmake/find/hdfs3.cmake
@@ -16,7 +16,7 @@ option(USE_INTERNAL_HDFS3_LIBRARY "Set to FALSE to use system HDFS3 instead of b
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libhdfs3/include/hdfs/hdfs.h")
     if(USE_INTERNAL_HDFS3_LIBRARY)
-        message(WARNING "submodule contrib/libhdfs3 is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/libhdfs3 is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal HDFS3 library")
         set(USE_INTERNAL_HDFS3_LIBRARY 0)
     endif()
diff --git a/cmake/find/icu.cmake b/cmake/find/icu.cmake
index 40fb391656d..0b775a68eda 100644
--- a/cmake/find/icu.cmake
+++ b/cmake/find/icu.cmake
@@ -16,7 +16,7 @@ option (USE_INTERNAL_ICU_LIBRARY "Set to FALSE to use system ICU library instead
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/icu/icu4c/LICENSE")
     if (USE_INTERNAL_ICU_LIBRARY)
-        message (WARNING "submodule contrib/icu is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/icu is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal ICU")
         set (USE_INTERNAL_ICU_LIBRARY 0)
     endif ()
diff --git a/cmake/find/krb5.cmake b/cmake/find/krb5.cmake
index 49b7462b710..24cc51325dc 100644
--- a/cmake/find/krb5.cmake
+++ b/cmake/find/krb5.cmake
@@ -1,7 +1,7 @@
 OPTION(ENABLE_KRB5 "Enable krb5" ${ENABLE_LIBRARIES})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/krb5/README")
-    message (WARNING "submodule contrib/krb5 is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/krb5 is missing. to fix try run: \n git submodule update --init")
     set (ENABLE_KRB5 0)
 endif ()
 
diff --git a/cmake/find/ldap.cmake b/cmake/find/ldap.cmake
index d8baea89429..0d14e2c4199 100644
--- a/cmake/find/ldap.cmake
+++ b/cmake/find/ldap.cmake
@@ -15,7 +15,7 @@ option (USE_INTERNAL_LDAP_LIBRARY "Set to FALSE to use system *LDAP library inst
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/openldap/README")
     if (USE_INTERNAL_LDAP_LIBRARY)
-        message (WARNING "Submodule contrib/openldap is missing. To fix try running:\n git submodule update --init --recursive")
+        message (WARNING "Submodule contrib/openldap is missing. To fix try running:\n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal LDAP library")
     endif ()
 
@@ -64,6 +64,7 @@ if (NOT OPENLDAP_FOUND AND NOT MISSING_INTERNAL_LDAP_LIBRARY)
         ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "aarch64" ) OR
         ( "${_system_name}" STREQUAL "linux"   AND "${_system_processor}" STREQUAL "ppc64le" ) OR
         ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "x86_64"  ) OR
+        ( "${_system_name}" STREQUAL "freebsd" AND "${_system_processor}" STREQUAL "aarch64" ) OR
         ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "x86_64"  ) OR
         ( "${_system_name}" STREQUAL "darwin"  AND "${_system_processor}" STREQUAL "aarch64"   )
     )
diff --git a/cmake/find/libgsasl.cmake b/cmake/find/libgsasl.cmake
index 3c742af2566..3aec5c0c30a 100644
--- a/cmake/find/libgsasl.cmake
+++ b/cmake/find/libgsasl.cmake
@@ -16,7 +16,7 @@ endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libgsasl/src/gsasl.h")
     if (USE_INTERNAL_LIBGSASL_LIBRARY)
-        message (WARNING "submodule contrib/libgsasl is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/libgsasl is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libgsasl")
         set (USE_INTERNAL_LIBGSASL_LIBRARY 0)
     endif ()
diff --git a/cmake/find/libpqxx.cmake b/cmake/find/libpqxx.cmake
index f981df19aaa..b2a1e217b10 100644
--- a/cmake/find/libpqxx.cmake
+++ b/cmake/find/libpqxx.cmake
@@ -5,14 +5,14 @@ if (NOT ENABLE_LIBPQXX)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libpqxx/CMakeLists.txt")
-    message (WARNING "submodule contrib/libpqxx is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/libpqxx is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libpqxx library")
     set (USE_LIBPQXX 0)
     return()
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libpq/include")
-    message (ERROR "submodule contrib/libpq is missing. to fix try run: \n git submodule update --init --recursive")
+    message (ERROR "submodule contrib/libpq is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libpq needed for libpqxx")
     set (USE_LIBPQXX 0)
     return()
diff --git a/cmake/find/libprotobuf-mutator.cmake b/cmake/find/libprotobuf-mutator.cmake
new file mode 100644
index 00000000000..a308db67c8b
--- /dev/null
+++ b/cmake/find/libprotobuf-mutator.cmake
@@ -0,0 +1,11 @@
+option(USE_LIBPROTOBUF_MUTATOR "Enable libprotobuf-mutator" ${ENABLE_FUZZING})
+
+if (NOT USE_LIBPROTOBUF_MUTATOR)
+    return()
+endif()
+
+set(LibProtobufMutator_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libprotobuf-mutator")
+
+if (NOT EXISTS "${LibProtobufMutator_SOURCE_DIR}/README.md")
+    message (ERROR "submodule contrib/libprotobuf-mutator is missing. to fix try run: \n git submodule update --init")
+endif()
diff --git a/cmake/find/libuv.cmake b/cmake/find/libuv.cmake
index f0023209309..c94dfd50b76 100644
--- a/cmake/find/libuv.cmake
+++ b/cmake/find/libuv.cmake
@@ -5,7 +5,7 @@ if (OS_DARWIN AND COMPILER_GCC)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libuv")
-    message (WARNING "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/libuv is missing. to fix try run: \n git submodule update --init")
     SET(MISSING_INTERNAL_LIBUV_LIBRARY 1)
     return()
 endif()
diff --git a/cmake/find/libxml2.cmake b/cmake/find/libxml2.cmake
index cdf079c33d2..8f7e79d84c9 100644
--- a/cmake/find/libxml2.cmake
+++ b/cmake/find/libxml2.cmake
@@ -2,7 +2,7 @@ option (USE_INTERNAL_LIBXML2_LIBRARY "Set to FALSE to use system libxml2 library
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libxml2/libxml.h")
     if (USE_INTERNAL_LIBXML2_LIBRARY)
-        message (WARNING "submodule contrib/libxml2 is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/libxml2 is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libxml")
         set (USE_INTERNAL_LIBXML2_LIBRARY 0)
     endif ()
diff --git a/cmake/find/llvm.cmake b/cmake/find/llvm.cmake
index 816164bef10..ece5d5434a0 100644
--- a/cmake/find/llvm.cmake
+++ b/cmake/find/llvm.cmake
@@ -1,8 +1,10 @@
-if (APPLE OR SPLIT_SHARED_LIBRARIES OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
-    set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
+if (APPLE OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
+    set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
+else()
+    set (ENABLE_EMBEDDED_COMPILER_DEFAULT ON)
 endif()
 
-option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ON)
+option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ${ENABLE_EMBEDDED_COMPILER_DEFAULT})
 
 if (NOT ENABLE_EMBEDDED_COMPILER)
     set (USE_EMBEDDED_COMPILER 0)
@@ -10,7 +12,7 @@ if (NOT ENABLE_EMBEDDED_COMPILER)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt")
-    message (${RECONFIGURE_MESSAGE_LEVEL} "submodule /contrib/llvm is missing. to fix try run: \n git submodule update --init --recursive")
+    message (${RECONFIGURE_MESSAGE_LEVEL} "submodule /contrib/llvm is missing. to fix try run: \n git submodule update --init")
 endif ()
 
 set (USE_EMBEDDED_COMPILER 1)
diff --git a/cmake/find/msgpack.cmake b/cmake/find/msgpack.cmake
index 130aa007ad5..c15fedd0e30 100644
--- a/cmake/find/msgpack.cmake
+++ b/cmake/find/msgpack.cmake
@@ -11,7 +11,7 @@ option (USE_INTERNAL_MSGPACK_LIBRARY "Set to FALSE to use system msgpack library
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include/msgpack.hpp")
     if(USE_INTERNAL_MSGPACK_LIBRARY)
-        message(WARNING "Submodule contrib/msgpack-c is missing. To fix try run: \n git submodule update --init --recursive")
+        message(WARNING "Submodule contrib/msgpack-c is missing. To fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal msgpack")
         set(USE_INTERNAL_MSGPACK_LIBRARY 0)
     endif()
diff --git a/cmake/find/mysqlclient.cmake b/cmake/find/mysqlclient.cmake
index 634681d98f6..0af03676d71 100644
--- a/cmake/find/mysqlclient.cmake
+++ b/cmake/find/mysqlclient.cmake
@@ -16,7 +16,7 @@ option(USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient librar
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/README")
     if(USE_INTERNAL_MYSQL_LIBRARY)
-        message(WARNING "submodule contrib/mariadb-connector-c is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/mariadb-connector-c is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal mysql library")
         set(USE_INTERNAL_MYSQL_LIBRARY 0)
     endif()
diff --git a/cmake/find/nanodbc.cmake b/cmake/find/nanodbc.cmake
index 894a2a60bad..d48e294c9e5 100644
--- a/cmake/find/nanodbc.cmake
+++ b/cmake/find/nanodbc.cmake
@@ -7,7 +7,7 @@ if (NOT USE_INTERNAL_NANODBC_LIBRARY)
 endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/nanodbc/CMakeLists.txt")
-    message (FATAL_ERROR "submodule contrib/nanodbc is missing. to fix try run: \n git submodule update --init --recursive")
+    message (FATAL_ERROR "submodule contrib/nanodbc is missing. to fix try run: \n git submodule update --init")
 endif()
 
 set (NANODBC_LIBRARY nanodbc)
diff --git a/cmake/find/nlp.cmake b/cmake/find/nlp.cmake
index f1204a85dea..efa9b39ddae 100644
--- a/cmake/find/nlp.cmake
+++ b/cmake/find/nlp.cmake
@@ -7,21 +7,21 @@ if (NOT ENABLE_NLP)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libstemmer_c/Makefile")
-    message (WARNING "submodule contrib/libstemmer_c is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/libstemmer_c is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal libstemmer_c library, NLP functions will be disabled")
     set (USE_NLP 0)
     return()
 endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/wordnet-blast/CMakeLists.txt")
-    message (WARNING "submodule contrib/wordnet-blast is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/wordnet-blast is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal wordnet-blast library, NLP functions will be disabled")
     set (USE_NLP 0)
     return()
 endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/lemmagen-c/README.md")
-    message (WARNING "submodule contrib/lemmagen-c is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/lemmagen-c is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal lemmagen-c library, NLP functions will be disabled")
     set (USE_NLP 0)
     return()
diff --git a/cmake/find/nuraft.cmake b/cmake/find/nuraft.cmake
index 4e5258e132f..59caa9e7373 100644
--- a/cmake/find/nuraft.cmake
+++ b/cmake/find/nuraft.cmake
@@ -5,7 +5,7 @@ if (NOT ENABLE_NURAFT)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/NuRaft/CMakeLists.txt")
-    message (WARNING "submodule contrib/NuRaft is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/NuRaft is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal NuRaft library")
     set (USE_NURAFT 0)
     return()
diff --git a/cmake/find/orc.cmake b/cmake/find/orc.cmake
index 86a72e65093..a5c3f57468a 100644
--- a/cmake/find/orc.cmake
+++ b/cmake/find/orc.cmake
@@ -2,7 +2,7 @@ option (ENABLE_ORC "Enable ORC" ${ENABLE_LIBRARIES})
 
 if(NOT ENABLE_ORC)
     if(USE_INTERNAL_ORC_LIBRARY)
-        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal ORC library with ENABLE_ORD=OFF")
+        message (${RECONFIGURE_MESSAGE_LEVEL} "Cannot use internal ORC library with ENABLE_ORC=OFF")
     endif()
     return()
 endif()
@@ -18,7 +18,7 @@ include(cmake/find/snappy.cmake)
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include/orc/OrcFile.hh")
    if(USE_INTERNAL_ORC_LIBRARY)
-       message(WARNING "submodule contrib/orc is missing. to fix try run: \n git submodule update --init --recursive")
+       message(WARNING "submodule contrib/orc is missing. to fix try run: \n git submodule update --init")
        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal ORC")
        set(USE_INTERNAL_ORC_LIBRARY 0)
    endif()
diff --git a/cmake/find/parquet.cmake b/cmake/find/parquet.cmake
index eb1b529fbfe..4b56a829df5 100644
--- a/cmake/find/parquet.cmake
+++ b/cmake/find/parquet.cmake
@@ -20,7 +20,7 @@ endif()
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/CMakeLists.txt")
     if(USE_INTERNAL_PARQUET_LIBRARY)
-        message(WARNING "submodule contrib/arrow (required for Parquet) is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/arrow (required for Parquet) is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal parquet library")
         set(USE_INTERNAL_PARQUET_LIBRARY 0)
     endif()
diff --git a/cmake/find/protobuf.cmake b/cmake/find/protobuf.cmake
index eb9fbe3edef..096288fd2ab 100644
--- a/cmake/find/protobuf.cmake
+++ b/cmake/find/protobuf.cmake
@@ -15,7 +15,7 @@ option(USE_INTERNAL_PROTOBUF_LIBRARY "Set to FALSE to use system protobuf instea
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/protobuf/cmake/CMakeLists.txt")
   if(USE_INTERNAL_PROTOBUF_LIBRARY)
-    message(WARNING "submodule contrib/protobuf is missing. to fix try run: \n git submodule update --init --recursive")
+    message(WARNING "submodule contrib/protobuf is missing. to fix try run: \n git submodule update --init")
     message(${RECONFIGURE_MESSAGE_LEVEL} "Can't use internal protobuf")
     set(USE_INTERNAL_PROTOBUF_LIBRARY 0)
   endif()
diff --git a/cmake/find/rapidjson.cmake b/cmake/find/rapidjson.cmake
index f880d19143e..62db4695c58 100644
--- a/cmake/find/rapidjson.cmake
+++ b/cmake/find/rapidjson.cmake
@@ -10,7 +10,7 @@ option(USE_INTERNAL_RAPIDJSON_LIBRARY "Set to FALSE to use system rapidjson libr
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rapidjson/include/rapidjson/rapidjson.h")
     if(USE_INTERNAL_RAPIDJSON_LIBRARY)
-       message(WARNING "submodule contrib/rapidjson is missing. to fix try run: \n git submodule update --init --recursive")
+       message(WARNING "submodule contrib/rapidjson is missing. to fix try run: \n git submodule update --init")
        message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal rapidjson library")
        set(USE_INTERNAL_RAPIDJSON_LIBRARY 0)
     endif()
diff --git a/cmake/find/rdkafka.cmake b/cmake/find/rdkafka.cmake
index f6460c1d9a3..5b370a42cdc 100644
--- a/cmake/find/rdkafka.cmake
+++ b/cmake/find/rdkafka.cmake
@@ -11,7 +11,7 @@ option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka inst
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/cppkafka/CMakeLists.txt")
     if(USE_INTERNAL_RDKAFKA_LIBRARY)
-        message (WARNING "submodule contrib/cppkafka is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/cppkafka is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal cppkafka")
         set (USE_INTERNAL_RDKAFKA_LIBRARY 0)
     endif()
@@ -20,7 +20,7 @@ endif ()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/CMakeLists.txt")
     if(USE_INTERNAL_RDKAFKA_LIBRARY OR MISSING_INTERNAL_CPPKAFKA_LIBRARY)
-        message (WARNING "submodule contrib/librdkafka is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/librdkafka is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal rdkafka")
         set (USE_INTERNAL_RDKAFKA_LIBRARY 0)
     endif()
diff --git a/cmake/find/re2.cmake b/cmake/find/re2.cmake
index 87bc974c788..09240f33f7d 100644
--- a/cmake/find/re2.cmake
+++ b/cmake/find/re2.cmake
@@ -2,7 +2,7 @@ option (USE_INTERNAL_RE2_LIBRARY "Set to FALSE to use system re2 library instead
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/re2/CMakeLists.txt")
     if(USE_INTERNAL_RE2_LIBRARY)
-        message(WARNING "submodule contrib/re2 is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/re2 is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal re2 library")
     endif()
     set(USE_INTERNAL_RE2_LIBRARY 0)
diff --git a/cmake/find/rocksdb.cmake b/cmake/find/rocksdb.cmake
index 94278a603d7..109eabc271b 100644
--- a/cmake/find/rocksdb.cmake
+++ b/cmake/find/rocksdb.cmake
@@ -15,7 +15,7 @@ option(USE_INTERNAL_ROCKSDB_LIBRARY "Set to FALSE to use system ROCKSDB library
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/rocksdb/CMakeLists.txt")
     if (USE_INTERNAL_ROCKSDB_LIBRARY)
-        message (WARNING "submodule contrib is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib is missing. to fix try run: \n git submodule update --init")
         message(${RECONFIGURE_MESSAGE_LEVEL} "cannot find internal rocksdb")
     endif()
     set (MISSING_INTERNAL_ROCKSDB 1)
diff --git a/cmake/find/s2geometry.cmake b/cmake/find/s2geometry.cmake
index 2364c6ba193..348805b342e 100644
--- a/cmake/find/s2geometry.cmake
+++ b/cmake/find/s2geometry.cmake
@@ -3,7 +3,7 @@ option(ENABLE_S2_GEOMETRY "Enable S2 geometry library" ${ENABLE_LIBRARIES})
 
 if (ENABLE_S2_GEOMETRY)
     if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/s2geometry")
-        message (WARNING "submodule contrib/s2geometry is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/s2geometry is missing. to fix try run: \n git submodule update --init")
         set (ENABLE_S2_GEOMETRY 0)
         set (USE_S2_GEOMETRY 0)
     else()
diff --git a/cmake/find/s3.cmake b/cmake/find/s3.cmake
index a2ed3e416d0..9a10c3f13ef 100644
--- a/cmake/find/s3.cmake
+++ b/cmake/find/s3.cmake
@@ -23,7 +23,7 @@ if (NOT USE_INTERNAL_AWS_S3_LIBRARY)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/aws/aws-cpp-sdk-s3")
-    message (WARNING "submodule contrib/aws is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/aws is missing. to fix try run: \n git submodule update --init")
     if (USE_INTERNAL_AWS_S3_LIBRARY)
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal S3 library")
     endif ()
diff --git a/cmake/find/sentry.cmake b/cmake/find/sentry.cmake
index a986599abce..4283e75f9ef 100644
--- a/cmake/find/sentry.cmake
+++ b/cmake/find/sentry.cmake
@@ -2,7 +2,7 @@ set (SENTRY_LIBRARY "sentry")
 
 set (SENTRY_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/sentry-native/include")
 if (NOT EXISTS "${SENTRY_INCLUDE_DIR}/sentry.h")
-    message (WARNING "submodule contrib/sentry-native is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/sentry-native is missing. to fix try run: \n git submodule update --init")
     if (USE_SENTRY)
          message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal sentry library")
     endif()
diff --git a/cmake/find/simdjson.cmake b/cmake/find/simdjson.cmake
index cffe20bdb2d..bf22a331f04 100644
--- a/cmake/find/simdjson.cmake
+++ b/cmake/find/simdjson.cmake
@@ -1,7 +1,7 @@
 option (USE_SIMDJSON "Use simdjson" ${ENABLE_LIBRARIES})
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/simdjson/include/simdjson.h")
-    message (WARNING "submodule contrib/simdjson is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/simdjson is missing. to fix try run: \n git submodule update --init")
     if (USE_SIMDJSON)
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal simdjson library")
     endif()
diff --git a/cmake/find/sqlite.cmake b/cmake/find/sqlite.cmake
index cfa33fdebbb..083a9faea59 100644
--- a/cmake/find/sqlite.cmake
+++ b/cmake/find/sqlite.cmake
@@ -5,7 +5,7 @@ if (NOT ENABLE_SQLITE)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/sqlite-amalgamation/sqlite3.c")
-    message (WARNING "submodule contrib/sqlite3-amalgamation is missing. to fix try run: \n git submodule update --init --recursive")
+    message (WARNING "submodule contrib/sqlite3-amalgamation is missing. to fix try run: \n git submodule update --init")
     message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal sqlite library")
     set (USE_SQLITE 0)
     return()
diff --git a/cmake/find/ssl.cmake b/cmake/find/ssl.cmake
index fd6ed56dcdb..fb411b93593 100644
--- a/cmake/find/ssl.cmake
+++ b/cmake/find/ssl.cmake
@@ -13,7 +13,7 @@ option(USE_INTERNAL_SSL_LIBRARY "Set to FALSE to use system *ssl library instead
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/boringssl/README.md")
     if(USE_INTERNAL_SSL_LIBRARY)
-        message(WARNING "submodule contrib/boringssl is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/boringssl is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal ssl library")
     endif()
     set(USE_INTERNAL_SSL_LIBRARY 0)
@@ -53,12 +53,7 @@ endif ()
 if (NOT OPENSSL_FOUND AND NOT MISSING_INTERNAL_SSL_LIBRARY)
     set (USE_INTERNAL_SSL_LIBRARY 1)
     set (OPENSSL_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/boringssl")
-
-    if (ARCH_AMD64)
-        set (OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
-    elseif (ARCH_AARCH64)
-        set (OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
-    endif ()
+    set (OPENSSL_INCLUDE_DIR "${OPENSSL_ROOT_DIR}/include")
     set (OPENSSL_CRYPTO_LIBRARY crypto)
     set (OPENSSL_SSL_LIBRARY ssl)
     set (OPENSSL_FOUND 1)
diff --git a/cmake/find/stats.cmake b/cmake/find/stats.cmake
index dea108ed920..589da1603d5 100644
--- a/cmake/find/stats.cmake
+++ b/cmake/find/stats.cmake
@@ -2,11 +2,11 @@ option(ENABLE_STATS "Enable StatsLib library" ${ENABLE_LIBRARIES})
 
 if (ENABLE_STATS)
     if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/stats")
-        message (WARNING "submodule contrib/stats is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/stats is missing. to fix try run: \n git submodule update --init")
         set (ENABLE_STATS 0)
         set (USE_STATS 0)
     elseif (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/gcem")
-        message (WARNING "submodule contrib/gcem is missing. to fix try run: \n git submodule update --init --recursive")
+        message (WARNING "submodule contrib/gcem is missing. to fix try run: \n git submodule update --init")
         set (ENABLE_STATS 0)
         set (USE_STATS 0)
     else()
diff --git a/cmake/find/xz.cmake b/cmake/find/xz.cmake
index 0d19859c6b1..f4c230859bc 100644
--- a/cmake/find/xz.cmake
+++ b/cmake/find/xz.cmake
@@ -2,7 +2,7 @@ option (USE_INTERNAL_XZ_LIBRARY "Set to OFF to use system xz (lzma) library inst
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/xz/src/liblzma/api/lzma.h")
     if(USE_INTERNAL_XZ_LIBRARY)
-        message(WARNING "submodule contrib/xz is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/xz is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal xz (lzma) library")
         set(USE_INTERNAL_XZ_LIBRARY 0)
     endif()
diff --git a/cmake/find/yaml-cpp.cmake b/cmake/find/yaml-cpp.cmake
index 4633d559980..2aba6808e31 100644
--- a/cmake/find/yaml-cpp.cmake
+++ b/cmake/find/yaml-cpp.cmake
@@ -5,5 +5,5 @@ if (NOT USE_YAML_CPP)
 endif()
 
 if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/yaml-cpp/README.md")
-    message (ERROR "submodule contrib/yaml-cpp is missing. to fix try run: \n git submodule update --init --recursive")
+    message (ERROR "submodule contrib/yaml-cpp is missing. to fix try run: \n git submodule update --init")
 endif()
diff --git a/cmake/find/zlib.cmake b/cmake/find/zlib.cmake
index bd96424b60d..50a5bc63d15 100644
--- a/cmake/find/zlib.cmake
+++ b/cmake/find/zlib.cmake
@@ -12,7 +12,7 @@ endif ()
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}/zlib.h")
     if(USE_INTERNAL_ZLIB_LIBRARY)
-        message(WARNING "submodule contrib/${INTERNAL_ZLIB_NAME} is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/${INTERNAL_ZLIB_NAME} is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal zlib library")
     endif()
     set(USE_INTERNAL_ZLIB_LIBRARY 0)
@@ -29,6 +29,9 @@ if (NOT USE_INTERNAL_ZLIB_LIBRARY)
 endif ()
 
 if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)
+    # https://github.com/zlib-ng/zlib-ng/pull/733
+    # This is disabed by default
+    add_compile_definitions(Z_TLS=__thread)
     set (USE_INTERNAL_ZLIB_LIBRARY 1)
     set (ZLIB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}" "${ClickHouse_BINARY_DIR}/contrib/${INTERNAL_ZLIB_NAME}" CACHE INTERNAL "") # generated zconf.h
     set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) # for poco
diff --git a/cmake/find/zstd.cmake b/cmake/find/zstd.cmake
index b12bb701e0e..812e1eed139 100644
--- a/cmake/find/zstd.cmake
+++ b/cmake/find/zstd.cmake
@@ -2,7 +2,7 @@ option (USE_INTERNAL_ZSTD_LIBRARY "Set to FALSE to use system zstd library inste
 
 if(NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/zstd/lib/zstd.h")
     if(USE_INTERNAL_ZSTD_LIBRARY)
-        message(WARNING "submodule contrib/zstd is missing. to fix try run: \n git submodule update --init --recursive")
+        message(WARNING "submodule contrib/zstd is missing. to fix try run: \n git submodule update --init")
         message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find internal zstd library")
         set(USE_INTERNAL_ZSTD_LIBRARY 0)
     endif()
diff --git a/cmake/freebsd/toolchain-aarch64.cmake b/cmake/freebsd/toolchain-aarch64.cmake
new file mode 100644
index 00000000000..b8fdb4bbb7c
--- /dev/null
+++ b/cmake/freebsd/toolchain-aarch64.cmake
@@ -0,0 +1,22 @@
+set (CMAKE_SYSTEM_NAME "FreeBSD")
+set (CMAKE_SYSTEM_PROCESSOR "aarch64")
+set (CMAKE_C_COMPILER_TARGET "aarch64-unknown-freebsd12")
+set (CMAKE_CXX_COMPILER_TARGET "aarch64-unknown-freebsd12")
+set (CMAKE_ASM_COMPILER_TARGET "aarch64-unknown-freebsd12")
+set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/freebsd-aarch64")
+
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
+
+set (CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB "/usr/bin/ranlib" CACHE FILEPATH "" FORCE)
+
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
+
+set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
+set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+
+set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
diff --git a/cmake/freebsd/toolchain-x86_64.cmake b/cmake/freebsd/toolchain-x86_64.cmake
index d9839ec74ee..f9e45686db7 100644
--- a/cmake/freebsd/toolchain-x86_64.cmake
+++ b/cmake/freebsd/toolchain-x86_64.cmake
@@ -10,7 +10,7 @@ set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it
 set (CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "" FORCE)
 set (CMAKE_RANLIB "/usr/bin/ranlib" CACHE FILEPATH "" FORCE)
 
-set (LINKER_NAME "lld" CACHE STRING "" FORCE)
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
 
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
diff --git a/cmake/git_status.cmake b/cmake/git_status.cmake
new file mode 100644
index 00000000000..8748aacfedd
--- /dev/null
+++ b/cmake/git_status.cmake
@@ -0,0 +1,17 @@
+# Print the status of the git repository (if git is available).
+# This is useful for troubleshooting build failure reports
+find_package(Git)
+
+if (Git_FOUND)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_COMMIT_ID
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message(STATUS "HEAD's commit hash ${GIT_COMMIT_ID}")
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} status
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+else()
+  message(STATUS "The git program could not be found.")
+endif()
diff --git a/cmake/linux/default_libs.cmake b/cmake/linux/default_libs.cmake
index c1e4d450389..4abd0a951e1 100644
--- a/cmake/linux/default_libs.cmake
+++ b/cmake/linux/default_libs.cmake
@@ -5,7 +5,7 @@ set (DEFAULT_LIBS "-nodefaultlibs")
 
 # We need builtins from Clang's RT even without libcxx - for ubsan+int128.
 # See https://bugs.llvm.org/show_bug.cgi?id=16404
-if (COMPILER_CLANG AND NOT (CMAKE_CROSSCOMPILING AND ARCH_AARCH64))
+if (COMPILER_CLANG AND NOT CMAKE_CROSSCOMPILING)
     execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-libgcc-file-name --rtlib=compiler-rt OUTPUT_VARIABLE BUILTINS_LIBRARY OUTPUT_STRIP_TRAILING_WHITESPACE)
 else ()
     set (BUILTINS_LIBRARY "-lgcc")
@@ -14,6 +14,8 @@ endif ()
 if (OS_ANDROID)
     # pthread and rt are included in libc
     set (DEFAULT_LIBS "${DEFAULT_LIBS} ${BUILTINS_LIBRARY} ${COVERAGE_OPTION} -lc -lm -ldl")
+elseif (USE_MUSL)
+    set (DEFAULT_LIBS "${DEFAULT_LIBS} ${BUILTINS_LIBRARY} ${COVERAGE_OPTION} -static -lc")
 else ()
     set (DEFAULT_LIBS "${DEFAULT_LIBS} ${BUILTINS_LIBRARY} ${COVERAGE_OPTION} -lc -lm -lrt -lpthread -ldl")
 endif ()
@@ -26,7 +28,7 @@ set(CMAKE_C_STANDARD_LIBRARIES ${DEFAULT_LIBS})
 # glibc-compatibility library relies to constant version of libc headers
 # (because minor changes in function attributes between different glibc versions will introduce incompatibilities)
 # This is for x86_64. For other architectures we have separate toolchains.
-if (ARCH_AMD64 AND NOT_UNBUNDLED)
+if (ARCH_AMD64 AND NOT_UNBUNDLED AND NOT CMAKE_CROSSCOMPILING)
     set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
     set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${ClickHouse_SOURCE_DIR}/contrib/libc-headers/x86_64-linux-gnu ${ClickHouse_SOURCE_DIR}/contrib/libc-headers)
 endif ()
@@ -37,8 +39,10 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
 if (NOT OS_ANDROID)
-    # Our compatibility layer doesn't build under Android, many errors in musl.
-    add_subdirectory(base/glibc-compatibility)
+    if (NOT USE_MUSL)
+        # Our compatibility layer doesn't build under Android, many errors in musl.
+        add_subdirectory(base/glibc-compatibility)
+    endif ()
     add_subdirectory(base/harmful)
 endif ()
 
diff --git a/cmake/linux/toolchain-aarch64.cmake b/cmake/linux/toolchain-aarch64.cmake
index e3924fdc537..fa814d8d59b 100644
--- a/cmake/linux/toolchain-aarch64.cmake
+++ b/cmake/linux/toolchain-aarch64.cmake
@@ -1,19 +1,26 @@
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
 set (CMAKE_SYSTEM_NAME "Linux")
 set (CMAKE_SYSTEM_PROCESSOR "aarch64")
 set (CMAKE_C_COMPILER_TARGET "aarch64-linux-gnu")
 set (CMAKE_CXX_COMPILER_TARGET "aarch64-linux-gnu")
 set (CMAKE_ASM_COMPILER_TARGET "aarch64-linux-gnu")
-set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64/aarch64-linux-gnu/libc")
 
-# We don't use compiler from toolchain because it's gcc-8, and we provide support only for gcc-9.
-set (CMAKE_AR "${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64/bin/aarch64-linux-gnu-ar" CACHE FILEPATH "" FORCE)
-set (CMAKE_RANLIB "${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64/bin/aarch64-linux-gnu-ranlib" CACHE FILEPATH "" FORCE)
+set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-aarch64")
 
-set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64")
-set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64")
-set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${CMAKE_CURRENT_LIST_DIR}/../toolchain/linux-aarch64")
+set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/aarch64-linux-gnu/libc")
 
-set (LINKER_NAME "lld" CACHE STRING "" FORCE)
+find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
+
+set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
+
+set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
 
 set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
 set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
diff --git a/cmake/linux/toolchain-ppc64le.cmake b/cmake/linux/toolchain-ppc64le.cmake
new file mode 100644
index 00000000000..cf85fc20fc4
--- /dev/null
+++ b/cmake/linux/toolchain-ppc64le.cmake
@@ -0,0 +1,32 @@
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+set (CMAKE_SYSTEM_NAME "Linux")
+set (CMAKE_SYSTEM_PROCESSOR "ppc64le")
+set (CMAKE_C_COMPILER_TARGET "ppc64le-linux-gnu")
+set (CMAKE_CXX_COMPILER_TARGET "ppc64le-linux-gnu")
+set (CMAKE_ASM_COMPILER_TARGET "ppc64le-linux-gnu")
+
+set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-powerpc64le")
+
+set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/powerpc64le-linux-gnu/libc")
+
+find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
+
+set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
+
+set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
+
+set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
+set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+
+set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
diff --git a/cmake/linux/toolchain-riscv64.cmake b/cmake/linux/toolchain-riscv64.cmake
new file mode 100644
index 00000000000..1ccbd3ee0da
--- /dev/null
+++ b/cmake/linux/toolchain-riscv64.cmake
@@ -0,0 +1,32 @@
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+set (CMAKE_SYSTEM_NAME "Linux")
+set (CMAKE_SYSTEM_PROCESSOR "riscv64")
+set (CMAKE_C_COMPILER_TARGET "riscv64-linux-gnu")
+set (CMAKE_CXX_COMPILER_TARGET "riscv64-linux-gnu")
+set (CMAKE_ASM_COMPILER_TARGET "riscv64-linux-gnu")
+
+set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-riscv64")
+
+set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
+
+find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
+
+set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
+
+set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
+
+set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
+set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+
+set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
diff --git a/cmake/linux/toolchain-x86_64-musl.cmake b/cmake/linux/toolchain-x86_64-musl.cmake
new file mode 100644
index 00000000000..0406b5de0ba
--- /dev/null
+++ b/cmake/linux/toolchain-x86_64-musl.cmake
@@ -0,0 +1,35 @@
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+set (CMAKE_SYSTEM_NAME "Linux")
+set (CMAKE_SYSTEM_PROCESSOR "x86_64")
+set (CMAKE_C_COMPILER_TARGET "x86_64-linux-musl")
+set (CMAKE_CXX_COMPILER_TARGET "x86_64-linux-musl")
+set (CMAKE_ASM_COMPILER_TARGET "x86_64-linux-musl")
+
+set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-x86_64-musl")
+
+set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}")
+
+find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
+
+set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
+
+set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
+
+set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
+set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+
+set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (USE_MUSL 1)
+add_definitions(-DUSE_MUSL=1)
diff --git a/cmake/linux/toolchain-x86_64.cmake b/cmake/linux/toolchain-x86_64.cmake
new file mode 100644
index 00000000000..1e139cec062
--- /dev/null
+++ b/cmake/linux/toolchain-x86_64.cmake
@@ -0,0 +1,32 @@
+set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+set (CMAKE_SYSTEM_NAME "Linux")
+set (CMAKE_SYSTEM_PROCESSOR "x86_64")
+set (CMAKE_C_COMPILER_TARGET "x86_64-linux-gnu")
+set (CMAKE_CXX_COMPILER_TARGET "x86_64-linux-gnu")
+set (CMAKE_ASM_COMPILER_TARGET "x86_64-linux-gnu")
+
+set (TOOLCHAIN_PATH "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/linux-x86_64")
+
+set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/x86_64-linux-gnu/libc")
+
+find_program (LLVM_AR_PATH NAMES "llvm-ar" "llvm-ar-13" "llvm-ar-12" "llvm-ar-11" "llvm-ar-10" "llvm-ar-9" "llvm-ar-8")
+find_program (LLVM_RANLIB_PATH NAMES "llvm-ranlib" "llvm-ranlib-13" "llvm-ranlib-12" "llvm-ranlib-11" "llvm-ranlib-10" "llvm-ranlib-9")
+
+set (CMAKE_AR "${LLVM_AR_PATH}" CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB "${LLVM_RANLIB_PATH}" CACHE FILEPATH "" FORCE)
+
+set (CMAKE_C_FLAGS_INIT "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+set (CMAKE_ASM_FLAGS_INIT "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
+
+set (LINKER_NAME "ld.lld" CACHE STRING "" FORCE)
+
+set (CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
+set (CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")
+
+set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
+
+set (HAS_POST_2038_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
+set (HAS_POST_2038_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
diff --git a/cmake/target.cmake b/cmake/target.cmake
index d1a0b8f9cbf..3c02c4313f1 100644
--- a/cmake/target.cmake
+++ b/cmake/target.cmake
@@ -20,40 +20,30 @@ endif ()
 if (CMAKE_CROSSCOMPILING)
     if (OS_DARWIN)
         # FIXME: broken dependencies
-        set (ENABLE_PROTOBUF OFF CACHE INTERNAL "")
         set (ENABLE_GRPC OFF CACHE INTERNAL "") # no protobuf -> no grpc
-
-        set (USE_SNAPPY OFF CACHE INTERNAL "")
-        set (ENABLE_PARQUET OFF CACHE INTERNAL "") # no snappy and protobuf -> no parquet
-        set (ENABLE_ORC OFF CACHE INTERNAL "") # no arrow (parquet) -> no orc
-
         set (ENABLE_ICU OFF CACHE INTERNAL "")
         set (ENABLE_FASTOPS OFF CACHE INTERNAL "")
     elseif (OS_LINUX OR OS_ANDROID)
         if (ARCH_AARCH64)
             # FIXME: broken dependencies
-            set (ENABLE_PROTOBUF OFF CACHE INTERNAL "")
             set (ENABLE_GRPC OFF CACHE INTERNAL "")
-
-            set (ENABLE_PARQUET OFF CACHE INTERNAL "")
-            set (ENABLE_ORC OFF CACHE INTERNAL "")
-
-            set (ENABLE_MYSQL OFF CACHE INTERNAL "")
+            set (USE_SENTRY OFF CACHE INTERNAL "")
+        elseif (ARCH_PPC64LE)
+            set (ENABLE_GRPC OFF CACHE INTERNAL "")
+            set (USE_SENTRY OFF CACHE INTERNAL "")
         endif ()
     elseif (OS_FREEBSD)
         # FIXME: broken dependencies
-        set (ENABLE_PROTOBUF OFF CACHE INTERNAL "")
+        set (ENABLE_PARQUET OFF CACHE INTERNAL "")
+        set (ENABLE_ORC OFF CACHE INTERNAL "")
         set (ENABLE_GRPC OFF CACHE INTERNAL "")
-
-        set (ENABLE_ORC OFF CACHE INTERNAL "")  # no protobuf -> no parquet -> no orc
-
         set (ENABLE_EMBEDDED_COMPILER OFF CACHE INTERNAL "")
     else ()
         message (FATAL_ERROR "Trying to cross-compile to unsupported system: ${CMAKE_SYSTEM_NAME}!")
     endif ()
 
     # Don't know why but CXX_STANDARD doesn't work for cross-compilation
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
 
     message (STATUS "Cross-compiling for target: ${CMAKE_CXX_COMPILE_TARGET}")
 endif ()
diff --git a/cmake/toolchain/linux-aarch64/README.txt b/cmake/toolchain/linux-aarch64/README.txt
deleted file mode 100644
index 3183d30b70d..00000000000
--- a/cmake/toolchain/linux-aarch64/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-wget 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en' -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz
-tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz --strip-components=1
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 8ff94ab867b..7a6e3672d17 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -8,7 +8,7 @@ endif ()
 
 if (COMPILER_GCC)
     # Require minimum version of gcc
-    set (GCC_MINIMUM_VERSION 10)
+    set (GCC_MINIMUM_VERSION 11)
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${GCC_MINIMUM_VERSION} AND NOT CMAKE_VERSION VERSION_LESS 2.8.9)
         message (FATAL_ERROR "GCC version must be at least ${GCC_MINIMUM_VERSION}. For example, if GCC ${GCC_MINIMUM_VERSION} is available under gcc-${GCC_MINIMUM_VERSION}, g++-${GCC_MINIMUM_VERSION} names, do the following: export CC=gcc-${GCC_MINIMUM_VERSION} CXX=g++-${GCC_MINIMUM_VERSION}; rm -rf CMakeCache.txt CMakeFiles; and re run cmake or ./release.")
     endif ()
@@ -18,6 +18,10 @@ if (COMPILER_GCC)
 elseif (COMPILER_CLANG)
     # Require minimum version of clang/apple-clang
     if (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
+        # If you are developer you can figure out what exact versions of AppleClang are Ok,
+        # simply remove the following line.
+        message (FATAL_ERROR "AppleClang is not supported, you should install clang from brew. See the instruction: https://clickhouse.com/docs/en/development/build-osx/")
+
         # AppleClang 10.0.1 (Xcode 10.2) corresponds to LLVM/Clang upstream version 7.0.0
         # AppleClang 11.0.0 (Xcode 11.0) corresponds to LLVM/Clang upstream version 8.0.0
         set (XCODE_MINIMUM_VERSION 10.2)
@@ -31,7 +35,7 @@ elseif (COMPILER_CLANG)
             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fchar8_t")
         endif ()
     else ()
-        set (CLANG_MINIMUM_VERSION 9)
+        set (CLANG_MINIMUM_VERSION 12)
         if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${CLANG_MINIMUM_VERSION})
             message (FATAL_ERROR "Clang version must be at least ${CLANG_MINIMUM_VERSION}.")
         endif ()
@@ -79,8 +83,9 @@ endif ()
 
 if (LINKER_NAME)
     if (COMPILER_CLANG AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 12.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 12.0.0))
-        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LINKER_NAME}")
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LINKER_NAME}")
+        find_program (LLD_PATH NAMES ${LINKER_NAME})
+        set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --ld-path=${LLD_PATH}")
+        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --ld-path=${LLD_PATH}")
     else ()
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
         set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=${LINKER_NAME}")
@@ -88,4 +93,3 @@ if (LINKER_NAME)
 
     message(STATUS "Using custom linker by name: ${LINKER_NAME}")
 endif ()
-
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index a85fe8963c7..394c04d5c89 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -43,16 +43,26 @@ if (COMPILER_CLANG)
     add_warning(range-loop-analysis)
     add_warning(redundant-parens)
     add_warning(reserved-id-macro)
-    add_warning(shadow-field) # clang 8+
+    add_warning(shadow-field)
     add_warning(shadow-uncaptured-local)
     add_warning(shadow)
-    add_warning(string-plus-int) # clang 8+
+    add_warning(string-plus-int)
     add_warning(undef)
     add_warning(unreachable-code-return)
     add_warning(unreachable-code)
     add_warning(unused-exception-parameter)
     add_warning(unused-macros)
     add_warning(unused-member-function)
+    add_warning(unneeded-internal-declaration)
+    add_warning(implicit-int-float-conversion)
+    add_warning(no-delete-null-pointer-checks)
+    add_warning(anon-enum-enum-conversion)
+    add_warning(assign-enum)
+    add_warning(bitwise-op-parentheses)
+    add_warning(int-in-bool-context)
+    add_warning(sometimes-uninitialized)
+    add_warning(tautological-bitwise-compare)
+
     # XXX: libstdc++ has some of these for 3way compare
     if (USE_LIBCXX)
         add_warning(zero-as-null-pointer-constant)
@@ -192,4 +202,29 @@ elseif (COMPILER_GCC)
         # For some reason (bug in gcc?) macro 'GCC diagnostic ignored "-Wstringop-overflow"' doesn't help.
         add_cxx_compile_options(-Wno-stringop-overflow)
     endif()
+
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
+        # reinterpretAs.cpp:182:31: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of non-trivial type
+        # ‘using ToFieldType = using FieldType = using UUID = struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’
+        # {aka ‘struct StrongTypedef<wide::integer<128, unsigned int>, DB::UUIDTag>’} from an array of ‘const char8_t’
+        add_cxx_compile_options(-Wno-error=class-memaccess)
+
+        # Maybe false positive...
+        # In file included from /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:673,
+        # In function ‘void std::__1::__libcpp_operator_delete(_Args ...) [with _Args = {void*, long unsigned int}]’,
+        # inlined from ‘void std::__1::__do_deallocate_handle_size(void*, size_t, _Args ...) [with _Args = {}]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:271:34,
+        # inlined from ‘void std::__1::__libcpp_deallocate(void*, size_t, size_t)’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:285:41,
+        # inlined from ‘constexpr void std::__1::allocator<_Tp>::deallocate(_Tp*, size_t) [with _Tp = char]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/memory:849:39,
+        # inlined from ‘static constexpr void std::__1::allocator_traits<_Alloc>::deallocate(std::__1::allocator_traits<_Alloc>::allocator_type&, std::__1::allocator_traits<_Alloc>::pointer, std::__1::allocator_traits<_Alloc>::size_type) [with _Alloc = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/__memory/allocator_traits.h:476:24,
+        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2219:35,
+        # inlined from ‘std::__1::basic_string<_CharT, _Traits, _Allocator>::~basic_string() [with _CharT = char; _Traits = std::__1::char_traits<char>; _Allocator = std::__1::allocator<char>]’ at /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/string:2213:1,
+        # inlined from ‘DB::JSONBuilder::JSONMap::Pair::~Pair()’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:90:12,
+        # inlined from ‘void DB::JSONBuilder::JSONMap::add(std::__1::string, DB::JSONBuilder::ItemPtr)’ at /home/jakalletti/ClickHouse/ClickHouse/src/Common/JSONBuilder.h:97:68,
+        # inlined from ‘virtual void DB::ExpressionStep::describeActions(DB::JSONBuilder::JSONMap&) const’ at /home/jakalletti/ClickHouse/ClickHouse/src/Processors/QueryPlan/ExpressionStep.cpp:102:12:
+        # /home/jakalletti/ClickHouse/ClickHouse/contrib/libcxx/include/new:247:20: error: ‘void operator delete(void*, size_t)’ called on a pointer to an unallocated object ‘7598543875853023301’ [-Werror=free-nonheap-object]
+        add_cxx_compile_options(-Wno-error=free-nonheap-object)
+
+        # AggregateFunctionAvg.h:203:100: error: ‘this’ pointer is null [-Werror=nonnull]
+        add_cxx_compile_options(-Wno-error=nonnull)
+    endif()
 endif ()
diff --git a/cmake/yandex/ya.make.versions.inc b/cmake/yandex/ya.make.versions.inc
deleted file mode 100644
index 6910164d0aa..00000000000
--- a/cmake/yandex/ya.make.versions.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/autogenerated_versions.txt)
-
-# TODO: not sure if this is customizable per-binary
-SET(VERSION_NAME "ClickHouse")
-
-# TODO: not quite sure how to replace dash with space in ya.make
-SET(VERSION_FULL "${VERSION_NAME}-${VERSION_STRING}")
-
-CFLAGS (GLOBAL -DDBMS_NAME=\"ClickHouse\")
-CFLAGS (GLOBAL -DDBMS_VERSION_MAJOR=${VERSION_MAJOR})
-CFLAGS (GLOBAL -DDBMS_VERSION_MINOR=${VERSION_MINOR})
-CFLAGS (GLOBAL -DDBMS_VERSION_PATCH=${VERSION_PATCH})
-CFLAGS (GLOBAL -DVERSION_FULL=\"\\\"${VERSION_FULL}\\\"\")
-CFLAGS (GLOBAL -DVERSION_MAJOR=${VERSION_MAJOR})
-CFLAGS (GLOBAL -DVERSION_MINOR=${VERSION_MINOR})
-CFLAGS (GLOBAL -DVERSION_PATCH=${VERSION_PATCH})
-
-# TODO: not supported yet, not sure if ya.make supports arithmetic.
-CFLAGS (GLOBAL -DVERSION_INTEGER=0)
-
-CFLAGS (GLOBAL -DVERSION_NAME=\"\\\"${VERSION_NAME}\\\"\")
-CFLAGS (GLOBAL -DVERSION_OFFICIAL=\"-arcadia\")
-CFLAGS (GLOBAL -DVERSION_REVISION=${VERSION_REVISION})
-CFLAGS (GLOBAL -DVERSION_STRING=\"\\\"${VERSION_STRING}\\\"\")
-
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 82cddb0ace0..676654452de 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -1,16 +1,5 @@
 # Third-party libraries may have substandard code.
 
-# Put all targets defined here and in added subfolders under "contrib/" folder in GUI-based IDEs by default.
-# Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they will
-# appear not in "contrib/" as originally planned here.
-get_filename_component (_current_dir_name "${CMAKE_CURRENT_LIST_DIR}" NAME)
-if (CMAKE_FOLDER)
-    set (CMAKE_FOLDER "${CMAKE_FOLDER}/${_current_dir_name}")
-else ()
-    set (CMAKE_FOLDER "${_current_dir_name}")
-endif ()
-unset (_current_dir_name)
-
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
 
@@ -33,6 +22,7 @@ endif()
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL 1)
 
 add_subdirectory (abseil-cpp-cmake)
+add_subdirectory (magic-enum-cmake)
 add_subdirectory (boost-cmake)
 add_subdirectory (cctz-cmake)
 add_subdirectory (consistent-hashing)
@@ -48,6 +38,14 @@ add_subdirectory (replxx-cmake)
 add_subdirectory (unixodbc-cmake)
 add_subdirectory (nanodbc-cmake)
 
+if (USE_INTERNAL_CAPNP_LIBRARY AND NOT MISSING_INTERNAL_CAPNP_LIBRARY)
+    add_subdirectory(capnproto-cmake)
+endif ()
+
+if (ENABLE_FUZZING)
+    add_subdirectory (libprotobuf-mutator-cmake)
+endif()
+
 if (USE_YAML_CPP)
     add_subdirectory (yaml-cpp-cmake)
 endif()
@@ -162,7 +160,7 @@ endif ()
 if(USE_INTERNAL_SNAPPY_LIBRARY)
     set(SNAPPY_BUILD_TESTS 0 CACHE INTERNAL "")
 
-    add_subdirectory(snappy)
+    add_subdirectory(snappy-cmake)
 
     set (SNAPPY_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/snappy")
 endif()
@@ -206,12 +204,15 @@ elseif(GTEST_SRC_DIR)
     target_compile_definitions(gtest INTERFACE GTEST_HAS_POSIX_RE=0)
 endif()
 
-if (USE_EMBEDDED_COMPILER)
+function(add_llvm)
     # ld: unknown option: --color-diagnostics
     if (APPLE)
         set (LINKER_SUPPORTS_COLOR_DIAGNOSTICS 0 CACHE INTERNAL "")
     endif ()
 
+    # Do not adjust RPATH in llvm, since then it will not be able to find libcxx/libcxxabi/libunwind
+    set (CMAKE_INSTALL_RPATH "ON")
+    set (LLVM_COMPILER_CHECKED 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_EH 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
     set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")
@@ -219,13 +220,12 @@ if (USE_EMBEDDED_COMPILER)
 
     # Need to use C++17 since the compilation is not possible with C++20 currently, due to ambiguous operator != etc.
     # LLVM project will set its default value for the -std=... but our global setting from CMake will override it.
-    set (CMAKE_CXX_STANDARD_bak ${CMAKE_CXX_STANDARD})
     set (CMAKE_CXX_STANDARD 17)
 
     add_subdirectory (llvm/llvm)
-
-    set (CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_bak})
-    unset (CMAKE_CXX_STANDARD_bak)
+endfunction()
+if (USE_EMBEDDED_COMPILER)
+    add_llvm()
 endif ()
 
 if (USE_INTERNAL_LIBGSASL_LIBRARY)
@@ -275,7 +275,7 @@ if (USE_FASTOPS)
 endif()
 
 if (USE_AMQPCPP OR USE_CASSANDRA)
-    add_subdirectory (libuv)
+    add_subdirectory (libuv-cmake)
 endif()
 if (USE_AMQPCPP)
     add_subdirectory (amqpcpp-cmake)
@@ -334,6 +334,10 @@ if (USE_NLP)
     add_subdirectory(lemmagen-c-cmake)
 endif()
 
+if (USE_BZIP2)
+    add_subdirectory(bzip2-cmake)
+endif()
+
 if (USE_SQLITE)
     add_subdirectory(sqlite-cmake)
 endif()
@@ -341,3 +345,76 @@ endif()
 if (USE_S2_GEOMETRY)
     add_subdirectory(s2geometry-cmake)
 endif()
+
+# Put all targets defined here and in subdirectories under "contrib/<immediate-subdir>" folders in GUI-based IDEs.
+# Some of third-party projects may override CMAKE_FOLDER or FOLDER property of their targets, so they would not appear
+# in "contrib/..." as originally planned, so we workaround this by fixing FOLDER properties of all targets manually,
+# instead of controlling it via CMAKE_FOLDER.
+
+function (ensure_target_rooted_in _target _folder)
+    # Skip INTERFACE library targets, since FOLDER property is not available for them.
+    get_target_property (_target_type "${_target}" TYPE)
+    if (_target_type STREQUAL "INTERFACE_LIBRARY")
+        return ()
+    endif ()
+
+    # Read the original FOLDER property value, if any.
+    get_target_property (_folder_prop "${_target}" FOLDER)
+
+    # Normalize that value, so we avoid possible repetitions in folder names.
+
+    if (NOT _folder_prop)
+        set (_folder_prop "")
+    endif ()
+
+    if (CMAKE_FOLDER AND _folder_prop MATCHES "^${CMAKE_FOLDER}/(.*)\$")
+        set (_folder_prop "${CMAKE_MATCH_1}")
+    endif ()
+
+    if (_folder AND _folder_prop MATCHES "^${_folder}/(.*)\$")
+        set (_folder_prop "${CMAKE_MATCH_1}")
+    endif ()
+
+    if (_folder)
+        set (_folder_prop "${_folder}/${_folder_prop}")
+    endif ()
+
+    if (CMAKE_FOLDER)
+        set (_folder_prop "${CMAKE_FOLDER}/${_folder_prop}")
+    endif ()
+
+    # Set the updated FOLDER property value back.
+    set_target_properties ("${_target}" PROPERTIES FOLDER "${_folder_prop}")
+endfunction ()
+
+function (ensure_own_targets_are_rooted_in _dir _folder)
+    get_directory_property (_targets DIRECTORY "${_dir}" BUILDSYSTEM_TARGETS)
+    foreach (_target IN LISTS _targets)
+        ensure_target_rooted_in ("${_target}" "${_folder}")
+    endforeach ()
+endfunction ()
+
+function (ensure_all_targets_are_rooted_in _dir _folder)
+    ensure_own_targets_are_rooted_in ("${_dir}" "${_folder}")
+
+    get_property (_sub_dirs DIRECTORY "${_dir}" PROPERTY SUBDIRECTORIES)
+    foreach (_sub_dir IN LISTS _sub_dirs)
+        ensure_all_targets_are_rooted_in ("${_sub_dir}" "${_folder}")
+    endforeach ()
+endfunction ()
+
+function (organize_ide_folders_2_level _dir)
+    get_filename_component (_dir_name "${_dir}" NAME)
+    ensure_own_targets_are_rooted_in ("${_dir}" "${_dir_name}")
+
+    # Note, that we respect only first two levels of nesting, we don't want to
+    # reorganize target folders further within each third-party dir.
+
+    get_property (_sub_dirs DIRECTORY "${_dir}" PROPERTY SUBDIRECTORIES)
+    foreach (_sub_dir IN LISTS _sub_dirs)
+        get_filename_component (_sub_dir_name "${_sub_dir}" NAME)
+        ensure_all_targets_are_rooted_in ("${_sub_dir}" "${_dir_name}/${_sub_dir_name}")
+    endforeach ()
+endfunction ()
+
+organize_ide_folders_2_level ("${CMAKE_CURRENT_LIST_DIR}")
diff --git a/contrib/NuRaft b/contrib/NuRaft
index 0ce94900930..d10351f312c 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit 0ce9490093021c63564cca159571a8b27772ad48
+Subproject commit d10351f312c1ae1ca3fdda433693dfbef3acfece
diff --git a/contrib/abseil-cpp b/contrib/abseil-cpp
index 4f3b686f86c..b004a8a0241 160000
--- a/contrib/abseil-cpp
+++ b/contrib/abseil-cpp
@@ -1 +1 @@
-Subproject commit 4f3b686f86c3ebaba7e4e926e62a79cb1c659a54
+Subproject commit b004a8a02418b83de8b686caa0b0f6e39ac2191f
diff --git a/contrib/amqpcpp-cmake/CMakeLists.txt b/contrib/amqpcpp-cmake/CMakeLists.txt
index 5637db4cf41..faef7bd4a1c 100644
--- a/contrib/amqpcpp-cmake/CMakeLists.txt
+++ b/contrib/amqpcpp-cmake/CMakeLists.txt
@@ -41,6 +41,4 @@ target_compile_options (amqp-cpp
 )
 
 target_include_directories (amqp-cpp SYSTEM PUBLIC "${LIBRARY_DIR}/include")
-
-target_link_libraries (amqp-cpp PUBLIC ssl)
-
+target_link_libraries(amqp-cpp PUBLIC ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
diff --git a/contrib/arrow-cmake/CMakeLists.txt b/contrib/arrow-cmake/CMakeLists.txt
index 2c72055a3e7..841c280d192 100644
--- a/contrib/arrow-cmake/CMakeLists.txt
+++ b/contrib/arrow-cmake/CMakeLists.txt
@@ -54,7 +54,7 @@ target_link_libraries (${THRIFT_LIBRARY} PRIVATE boost::headers_only)
 set(ORC_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/orc/c++")
 set(ORC_INCLUDE_DIR "${ORC_SOURCE_DIR}/include")
 set(ORC_SOURCE_SRC_DIR "${ORC_SOURCE_DIR}/src")
-set(ORC_SOURCE_WRAP_DIR "${ORC_SOURCE_DIR}/wrap")
+# set(ORC_SOURCE_WRAP_DIR "${ORC_SOURCE_DIR}/wrap")
 
 set(ORC_BUILD_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/src")
 set(ORC_BUILD_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/../orc/c++/include")
@@ -101,7 +101,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CXX11_FLAGS "-std=c++0x")
 endif ()
 
-include("${ClickHouse_SOURCE_DIR}/contrib/orc/cmake_modules/CheckSourceCompiles.cmake")
+set (ORC_CXX_HAS_INITIALIZER_LIST 1)
+set (ORC_CXX_HAS_NOEXCEPT 1)
+set (ORC_CXX_HAS_NULLPTR 1)
+set (ORC_CXX_HAS_OVERRIDE 1)
+set (ORC_CXX_HAS_UNIQUE_PTR 1)
+set (ORC_CXX_HAS_CSTDINT 1)
+set (ORC_CXX_HAS_THREAD_LOCAL 1)
+
 include(orc_check.cmake)
 configure_file("${ORC_INCLUDE_DIR}/orc/orc-config.hh.in" "${ORC_BUILD_INCLUDE_DIR}/orc/orc-config.hh")
 configure_file("${ORC_SOURCE_SRC_DIR}/Adaptor.hh.in" "${ORC_BUILD_INCLUDE_DIR}/Adaptor.hh")
@@ -119,12 +126,9 @@ set(ORC_SRCS
         "${ORC_SOURCE_SRC_DIR}/ColumnWriter.cc"
         "${ORC_SOURCE_SRC_DIR}/Common.cc"
         "${ORC_SOURCE_SRC_DIR}/Compression.cc"
-        "${ORC_SOURCE_SRC_DIR}/Exceptions.cc"
         "${ORC_SOURCE_SRC_DIR}/Int128.cc"
         "${ORC_SOURCE_SRC_DIR}/LzoDecompressor.cc"
         "${ORC_SOURCE_SRC_DIR}/MemoryPool.cc"
-        "${ORC_SOURCE_SRC_DIR}/OrcFile.cc"
-        "${ORC_SOURCE_SRC_DIR}/Reader.cc"
         "${ORC_SOURCE_SRC_DIR}/RLE.cc"
         "${ORC_SOURCE_SRC_DIR}/RLEv1.cc"
         "${ORC_SOURCE_SRC_DIR}/RLEv2.cc"
diff --git a/contrib/arrow-cmake/orc_check.cmake b/contrib/arrow-cmake/orc_check.cmake
index ad3b72e44cf..523e1cf1d86 100644
--- a/contrib/arrow-cmake/orc_check.cmake
+++ b/contrib/arrow-cmake/orc_check.cmake
@@ -1,130 +1,14 @@
-# Not changed part of contrib/orc/c++/src/CMakeLists.txt
+set (HAS_PREAD 1)
+set (HAS_STRPTIME 1)
+set (HAS_STOLL 1)
+set (INT64_IS_LL 1)
+set (HAS_DIAGNOSTIC_PUSH 1)
+set (HAS_STD_ISNAN 1)
+set (HAS_STD_MUTEX 1)
+set (NEEDS_REDUNDANT_MOVE 1)
+set (HAS_PRE_1970 1)
+set (HAS_POST_2038 1)
+set (NEEDS_Z_PREFIX 0)
 
-INCLUDE(CheckCXXSourceCompiles)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<fcntl.h>
-    #include<unistd.h>
-    int main(int,char*[]){
-      int f = open(\"/x/y\", O_RDONLY);
-      char buf[100];
-      return pread(f, buf, 100, 1000) == 0;
-    }"
-  HAS_PREAD
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<time.h>
-    int main(int,char*[]){
-      struct tm time2020;
-      return !strptime(\"2020-02-02 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2020);
-    }"
-  HAS_STRPTIME
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<string>
-    int main(int,char* argv[]){
-      return static_cast<int>(std::stoll(argv[0]));
-    }"
-  HAS_STOLL
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<stdint.h>
-    #include<stdio.h>
-    int main(int,char*[]){
-      int64_t x = 1; printf(\"%lld\",x);
-    }"
-  INT64_IS_LL
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #ifdef __clang__
-      #pragma clang diagnostic push
-      #pragma clang diagnostic ignored \"-Wdeprecated\"
-      #pragma clang diagnostic pop
-   #elif defined(__GNUC__)
-      #pragma GCC diagnostic push
-      #pragma GCC diagnostic ignored \"-Wdeprecated\"
-      #pragma GCC diagnostic pop
-   #elif defined(_MSC_VER)
-      #pragma warning( push )
-      #pragma warning( disable : 4996 )
-      #pragma warning( pop )
-   #else
-     unknownCompiler!
-   #endif
-   int main(int, char *[]) {}"
-  HAS_DIAGNOSTIC_PUSH
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<cmath>
-    int main(int, char *[]) {
-      return std::isnan(1.0f);
-    }"
-  HAS_STD_ISNAN
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<mutex>
-    int main(int, char *[]) {
-       std::mutex test_mutex;
-       std::lock_guard<std::mutex> lock_mutex(test_mutex);
-    }"
-  HAS_STD_MUTEX
-)
-
-CHECK_CXX_SOURCE_COMPILES("
-    #include<string>
-    std::string func() {
-      std::string var = \"test\";
-      return std::move(var);
-    }
-    int main(int, char *[]) {}"
-  NEEDS_REDUNDANT_MOVE
-)
-
-INCLUDE(CheckCXXSourceRuns)
-
-CHECK_CXX_SOURCE_RUNS("
-    #include<time.h>
-    int main(int, char *[]) {
-      time_t t = -14210715; // 1969-07-20 12:34:45
-      struct tm *ptm = gmtime(&t);
-      return !(ptm && ptm->tm_year == 69);
-    }"
-  HAS_PRE_1970
-)
-
-CHECK_CXX_SOURCE_RUNS("
-    #include<stdlib.h>
-    #include<time.h>
-    int main(int, char *[]) {
-      setenv(\"TZ\", \"America/Los_Angeles\", 1);
-      tzset();
-      struct tm time2037;
-      struct tm time2038;
-      strptime(\"2037-05-05 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2037);
-      strptime(\"2038-05-05 12:34:56\", \"%Y-%m-%d %H:%M:%S\", &time2038);
-      return mktime(&time2038) - mktime(&time2037) != 31536000;
-    }"
-  HAS_POST_2038
-)
-
-set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-set(CMAKE_REQUIRED_LIBRARIES zlib)
-CHECK_CXX_SOURCE_COMPILES("
-    #define Z_PREFIX
-    #include<zlib.h>
-    z_stream strm;
-    int main(int, char *[]) {
-        deflateReset(&strm);
-    }"
-  NEEDS_Z_PREFIX
-)
-
-# See https://cmake.org/cmake/help/v3.14/policy/CMP0075.html. Without unsetting it breaks thrift.
 set(CMAKE_REQUIRED_INCLUDES)
 set(CMAKE_REQUIRED_LIBRARIES)
diff --git a/contrib/aws b/contrib/aws
index 7d48b2c8193..00b03604543 160000
--- a/contrib/aws
+++ b/contrib/aws
@@ -1 +1 @@
-Subproject commit 7d48b2c8193679cc4516e5bd68ae4a64b94dae7d
+Subproject commit 00b03604543367d7e310cb0993973fdcb723ea79
diff --git a/contrib/boost b/contrib/boost
index 9cf09dbfd55..79358a3106a 160000
--- a/contrib/boost
+++ b/contrib/boost
@@ -1 +1 @@
-Subproject commit 9cf09dbfd55a5c6202dedbdf40781a51b02c2675
+Subproject commit 79358a3106aab6af464430ed67c7efafebf5cd6f
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index 675931d319f..27072910135 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -16,7 +16,7 @@ if (NOT USE_INTERNAL_BOOST_LIBRARY)
         graph
     )
 
-    if(Boost_INCLUDE_DIR AND Boost_FILESYSTEM_LIBRARY AND Boost_FILESYSTEM_LIBRARY AND
+    if(Boost_INCLUDE_DIR AND Boost_FILESYSTEM_LIBRARY AND
         Boost_PROGRAM_OPTIONS_LIBRARY AND Boost_REGEX_LIBRARY AND Boost_SYSTEM_LIBRARY AND Boost_CONTEXT_LIBRARY AND
         Boost_COROUTINE_LIBRARY AND Boost_GRAPH_LIBRARY)
 
@@ -238,4 +238,14 @@ if (NOT EXTERNAL_BOOST_FOUND)
     target_include_directories (_boost_graph PRIVATE ${LIBRARY_DIR})
     target_link_libraries(_boost_graph PRIVATE _boost_regex)
 
+    # circular buffer
+    add_library(_boost_circular_buffer INTERFACE)
+    add_library(boost::circular_buffer ALIAS _boost_circular_buffer)
+    target_include_directories(_boost_circular_buffer SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
+
+    # heap
+    add_library(_boost_heap INTERFACE)
+    add_library(boost::heap ALIAS _boost_heap)
+    target_include_directories(_boost_heap SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
+
 endif ()
diff --git a/contrib/boringssl b/contrib/boringssl
index a6a2e2ab3e4..c1e01a441d6 160000
--- a/contrib/boringssl
+++ b/contrib/boringssl
@@ -1 +1 @@
-Subproject commit a6a2e2ab3e44d97ce98e51c558e989f211de7eb3
+Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1
diff --git a/contrib/boringssl-cmake/CMakeLists.txt b/contrib/boringssl-cmake/CMakeLists.txt
index 9d8c6ca6083..474e32f3b91 100644
--- a/contrib/boringssl-cmake/CMakeLists.txt
+++ b/contrib/boringssl-cmake/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 # This file is created by generate_build_files.py and edited accordingly.
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 
 project(BoringSSL LANGUAGES C CXX)
 
@@ -15,17 +15,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fvisibility=hidden -fno-common -fno-exceptions -fno-rtti")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -fno-exceptions -fno-rtti")
   if(APPLE AND CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
   endif()
 
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fno-common")
-  if((CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.8.99") OR CLANG)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-  else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-  endif()
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -std=c11")
 endif()
 
 # pthread_rwlock_t requires a feature flag.
@@ -55,7 +50,7 @@ add_definitions(-DBORINGSSL_IMPLEMENTATION)
 # builds.
 if(NOT OPENSSL_NO_ASM AND CMAKE_OSX_ARCHITECTURES)
   list(LENGTH CMAKE_OSX_ARCHITECTURES NUM_ARCHES)
-  if(NOT ${NUM_ARCHES} EQUAL 1)
+  if(NOT NUM_ARCHES EQUAL 1)
     message(FATAL_ERROR "Universal binaries not supported.")
   endif()
   list(GET CMAKE_OSX_ARCHITECTURES 0 CMAKE_SYSTEM_PROCESSOR)
@@ -78,7 +73,13 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
   set(ARCH "x86")
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386")
-  set(ARCH "x86")
+  # cmake uses `uname -p` to set the system processor, but Solaris
+  # systems support multiple architectures.
+  if((${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(ARCH "x86_64")
+  else()
+    set(ARCH "x86")
+  endif()
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
   set(ARCH "x86")
 elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
@@ -289,6 +290,21 @@ set(
   mac-x86_64/crypto/test/trampoline-x86_64.S
 )
 
+set(
+  CRYPTO_win_aarch64_SOURCES
+
+  win-aarch64/crypto/chacha/chacha-armv8.S
+  win-aarch64/crypto/fipsmodule/aesv8-armx64.S
+  win-aarch64/crypto/fipsmodule/armv8-mont.S
+  win-aarch64/crypto/fipsmodule/ghash-neon-armv8.S
+  win-aarch64/crypto/fipsmodule/ghashv8-armx64.S
+  win-aarch64/crypto/fipsmodule/sha1-armv8.S
+  win-aarch64/crypto/fipsmodule/sha256-armv8.S
+  win-aarch64/crypto/fipsmodule/sha512-armv8.S
+  win-aarch64/crypto/fipsmodule/vpaes-armv8.S
+  win-aarch64/crypto/test/trampoline-armv8.S
+)
+
 set(
   CRYPTO_win_x86_SOURCES
 
@@ -331,9 +347,9 @@ set(
   win-x86_64/crypto/test/trampoline-x86_64.asm
 )
 
-if(APPLE AND ${ARCH} STREQUAL "aarch64")
+if(APPLE AND ARCH STREQUAL "aarch64")
   set(CRYPTO_ARCH_SOURCES ${CRYPTO_ios_aarch64_SOURCES})
-elseif(APPLE AND ${ARCH} STREQUAL "arm")
+elseif(APPLE AND ARCH STREQUAL "arm")
   set(CRYPTO_ARCH_SOURCES ${CRYPTO_ios_arm_SOURCES})
 elseif(APPLE)
   set(CRYPTO_ARCH_SOURCES ${CRYPTO_mac_${ARCH}_SOURCES})
@@ -360,6 +376,7 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_object.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_octet.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_print.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strex.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_strnid.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_time.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/asn1/a_type.c"
@@ -389,6 +406,7 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/bio/printf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bio/socket_helper.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/blake2/blake2.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/bn_asn1.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/bn_extra/convert.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/buf/buf.c"
@@ -413,6 +431,7 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/conf/conf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-fuchsia.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-linux.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/cpu-aarch64-win.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm-linux.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-arm.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/cpu-intel.c"
@@ -452,7 +471,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/ex_data.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/bcm.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/fips_shared_support.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/fipsmodule/is_fips.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/hkdf/hkdf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/hpke/hpke.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/hrss/hrss.c"
@@ -499,13 +517,13 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/trust_token/voprf.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_digest.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_sign.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_strex.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/a_verify.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/algorithm.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/asn1_gen.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_dir.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/by_file.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/i2d_pr.c"
+  "${BORINGSSL_SOURCE_DIR}/crypto/x509/name_print.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/rsa_pss.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_crl.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/t_req.c"
@@ -519,7 +537,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_ext.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_lu.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_obj.c"
-  "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_r2x.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_req.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_set.c"
   "${BORINGSSL_SOURCE_DIR}/crypto/x509/x509_trs.c"
@@ -589,6 +606,8 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/ssl/d1_srtp.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/dtls_method.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/dtls_record.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/encrypted_client_hello.cc"
+  "${BORINGSSL_SOURCE_DIR}/ssl/extensions.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/handoff.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/handshake.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/handshake_client.cc"
@@ -611,7 +630,6 @@ add_library(
   "${BORINGSSL_SOURCE_DIR}/ssl/ssl_versions.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/ssl_x509.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/t1_enc.cc"
-  "${BORINGSSL_SOURCE_DIR}/ssl/t1_lib.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/tls13_both.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/tls13_client.cc"
   "${BORINGSSL_SOURCE_DIR}/ssl/tls13_enc.cc"
@@ -633,6 +651,7 @@ add_executable(
   "${BORINGSSL_SOURCE_DIR}/tool/digest.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/fd.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/file.cc"
+  "${BORINGSSL_SOURCE_DIR}/tool/generate_ech.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/generate_ed25519.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/genrsa.cc"
   "${BORINGSSL_SOURCE_DIR}/tool/pkcs12.cc"
diff --git a/contrib/bzip2 b/contrib/bzip2
new file mode 160000
index 00000000000..bf905ea2251
--- /dev/null
+++ b/contrib/bzip2
@@ -0,0 +1 @@
+Subproject commit bf905ea2251191ff9911ae7ec0cfc35d41f9f7f6
diff --git a/contrib/bzip2-cmake/CMakeLists.txt b/contrib/bzip2-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..a9d2efa43c1
--- /dev/null
+++ b/contrib/bzip2-cmake/CMakeLists.txt
@@ -0,0 +1,23 @@
+set(BZIP2_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/bzip2")
+set(BZIP2_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/bzip2")
+
+set(SRCS
+    "${BZIP2_SOURCE_DIR}/blocksort.c"
+    "${BZIP2_SOURCE_DIR}/huffman.c"
+    "${BZIP2_SOURCE_DIR}/crctable.c"
+    "${BZIP2_SOURCE_DIR}/randtable.c"
+    "${BZIP2_SOURCE_DIR}/compress.c"
+    "${BZIP2_SOURCE_DIR}/decompress.c"
+    "${BZIP2_SOURCE_DIR}/bzlib.c"
+)
+
+# From bzip2/CMakeLists.txt 
+set(BZ_VERSION "1.0.7")
+configure_file (
+    "${BZIP2_SOURCE_DIR}/bz_version.h.in"
+    "${BZIP2_BINARY_DIR}/bz_version.h"
+)
+
+add_library(bzip2 ${SRCS})
+
+target_include_directories(bzip2 PUBLIC "${BZIP2_SOURCE_DIR}" "${BZIP2_BINARY_DIR}")
diff --git a/contrib/capnproto b/contrib/capnproto
index a00ccd91b37..c8189ec3c27 160000
--- a/contrib/capnproto
+++ b/contrib/capnproto
@@ -1 +1 @@
-Subproject commit a00ccd91b3746ef2ab51d40fe3265829949d1ace
+Subproject commit c8189ec3c27dacbd4a3288e682473010e377f593
diff --git a/contrib/capnproto-cmake/CMakeLists.txt b/contrib/capnproto-cmake/CMakeLists.txt
index 9f6e076cc7d..05446355535 100644
--- a/contrib/capnproto-cmake/CMakeLists.txt
+++ b/contrib/capnproto-cmake/CMakeLists.txt
@@ -45,6 +45,7 @@ set (CAPNP_SRCS
     "${CAPNPROTO_SOURCE_DIR}/capnp/serialize-packed.c++"
 
     "${CAPNPROTO_SOURCE_DIR}/capnp/schema.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/stream.capnp.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/schema-loader.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/dynamic.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/stringify.c++"
@@ -63,6 +64,7 @@ set (CAPNPC_SRCS
     "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/lexer.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/grammar.capnp.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/parser.c++"
+    "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/generics.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/node-translator.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/compiler/compiler.c++"
     "${CAPNPROTO_SOURCE_DIR}/capnp/schema-parser.c++"
diff --git a/contrib/cctz b/contrib/cctz
index c0f1bcb97fd..9edd0861d83 160000
--- a/contrib/cctz
+++ b/contrib/cctz
@@ -1 +1 @@
-Subproject commit c0f1bcb97fd2782f7c3f972fadd5aad5affac4b8
+Subproject commit 9edd0861d8328b2ae77e8fb5f4d7dcd1cf33b42b
diff --git a/contrib/croaring-cmake/CMakeLists.txt b/contrib/croaring-cmake/CMakeLists.txt
index f4a5d8a01dc..3d327d068c1 100644
--- a/contrib/croaring-cmake/CMakeLists.txt
+++ b/contrib/croaring-cmake/CMakeLists.txt
@@ -24,3 +24,15 @@ add_library(roaring ${SRCS})
 target_include_directories(roaring PRIVATE "${LIBRARY_DIR}/include/roaring")
 target_include_directories(roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/include")
 target_include_directories(roaring SYSTEM BEFORE PUBLIC "${LIBRARY_DIR}/cpp")
+
+# We redirect malloc/free family of functions to different functions that will track memory in ClickHouse.
+# Also note that we exploit implicit function declarations.
+target_compile_definitions(roaring PRIVATE
+    -Dmalloc=clickhouse_malloc
+    -Dcalloc=clickhouse_calloc
+    -Drealloc=clickhouse_realloc
+    -Dreallocarray=clickhouse_reallocarray
+    -Dfree=clickhouse_free
+    -Dposix_memalign=clickhouse_posix_memalign)
+
+target_link_libraries(roaring PUBLIC clickhouse_common_io)
diff --git a/contrib/fastops b/contrib/fastops
index 88752a5e03c..1460583af7d 160000
--- a/contrib/fastops
+++ b/contrib/fastops
@@ -1 +1 @@
-Subproject commit 88752a5e03cf34639a4a37a4b41d8b463fffd2b5
+Subproject commit 1460583af7d13c0e980ce46aec8ee9400314669a
diff --git a/contrib/grpc b/contrib/grpc
index 60c986e15ca..7eac189a6ba 160000
--- a/contrib/grpc
+++ b/contrib/grpc
@@ -1 +1 @@
-Subproject commit 60c986e15cae70aade721d26badabab1f822fdd6
+Subproject commit 7eac189a6badddac593580ec2ad1478bd2656fc7
diff --git a/contrib/grpc-cmake/protobuf_generate_grpc.cmake b/contrib/grpc-cmake/protobuf_generate_grpc.cmake
index 08d2976c26a..71ee69caf3e 100644
--- a/contrib/grpc-cmake/protobuf_generate_grpc.cmake
+++ b/contrib/grpc-cmake/protobuf_generate_grpc.cmake
@@ -187,12 +187,12 @@ function(protobuf_generate_grpc)
 
     add_custom_command(
       OUTPUT ${_generated_srcs}
-      COMMAND protobuf::protoc
+      COMMAND $<TARGET_FILE:protoc>
       ARGS --${protobuf_generate_grpc_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_grpc_PROTOC_OUT_DIR}
            --grpc_out ${_dll_export_decl}${protobuf_generate_grpc_PROTOC_OUT_DIR}
            --plugin=protoc-gen-grpc=$<TARGET_FILE:${protobuf_generate_grpc_PLUGIN}>
            ${_dll_desc_out} ${_protobuf_include_path} ${_abs_file}
-      DEPENDS ${_abs_file} protobuf::protoc ${protobuf_generate_grpc_PLUGIN}
+      DEPENDS ${_abs_file} protoc ${protobuf_generate_grpc_PLUGIN}
       COMMENT "Running ${protobuf_generate_grpc_LANGUAGE} protocol buffer compiler on ${_proto}"
       VERBATIM)
   endforeach()
@@ -204,4 +204,4 @@ function(protobuf_generate_grpc)
   if(protobuf_generate_grpc_TARGET)
     target_sources(${protobuf_generate_grpc_TARGET} PRIVATE ${_generated_srcs_all})
   endif()
-endfunction()
\ No newline at end of file
+endfunction()
diff --git a/contrib/jemalloc-cmake/CMakeLists.txt b/contrib/jemalloc-cmake/CMakeLists.txt
index 9531a5a4f9e..30dd3baa55b 100644
--- a/contrib/jemalloc-cmake/CMakeLists.txt
+++ b/contrib/jemalloc-cmake/CMakeLists.txt
@@ -139,9 +139,5 @@ target_compile_options(jemalloc PRIVATE -Wno-redundant-decls)
 target_compile_options(jemalloc PRIVATE -D_GNU_SOURCE)
 
 set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS USE_JEMALLOC=1)
-if (MAKE_STATIC_LIBRARIES)
-    # To detect whether we need to register jemalloc for osx as default zone.
-    set_property(TARGET jemalloc APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS BUNDLED_STATIC_JEMALLOC=1)
-endif()
 
 message (STATUS "Using jemalloc")
diff --git a/contrib/jemalloc-cmake/include/jemalloc/jemalloc_defs.h b/contrib/jemalloc-cmake/include/jemalloc/jemalloc_defs.h
index 6a03a231a0e..0aa4033f859 100644
--- a/contrib/jemalloc-cmake/include/jemalloc/jemalloc_defs.h
+++ b/contrib/jemalloc-cmake/include/jemalloc/jemalloc_defs.h
@@ -18,8 +18,10 @@
  * Define overrides for non-standard allocator-related functions if they are
  * present on the system.
  */
-#define JEMALLOC_OVERRIDE_MEMALIGN
-#define JEMALLOC_OVERRIDE_VALLOC
+#if !defined(USE_MUSL)
+    #define JEMALLOC_OVERRIDE_MEMALIGN
+    #define JEMALLOC_OVERRIDE_VALLOC
+#endif
 
 /*
  * At least Linux omits the "const" in:
diff --git a/contrib/jemalloc-cmake/include/jemalloc/jemalloc_protos.h b/contrib/jemalloc-cmake/include/jemalloc/jemalloc_protos.h
index 8506237729d..2e35e7b6249 100644
--- a/contrib/jemalloc-cmake/include/jemalloc/jemalloc_protos.h
+++ b/contrib/jemalloc-cmake/include/jemalloc/jemalloc_protos.h
@@ -1,6 +1,6 @@
 // OSX does not have this for system alloc functions, so you will get
 // "exception specification in declaration" error.
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(USE_MUSL)
 # undef JEMALLOC_NOTHROW
 # define JEMALLOC_NOTHROW
 
diff --git a/contrib/jemalloc-cmake/include_freebsd_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_freebsd_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
index 44c59e1ce7d..3db0e14b268 100644
--- a/contrib/jemalloc-cmake/include_freebsd_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_freebsd_aarch64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -161,7 +161,7 @@
  * JEMALLOC_DSS enables use of sbrk(2) to allocate extents from the data storage
  * segment (DSS).
  */
-#define JEMALLOC_DSS
+/* #undef JEMALLOC_DSS */
 
 /* Support memory filling (junk/zero). */
 #define JEMALLOC_FILL
diff --git a/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
index 8068861041f..97d0d4d8471 100644
--- a/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_ppc64le/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -81,7 +81,7 @@
 /* #undef JEMALLOC_HAVE_ISSETUGID */
 
 /* Defined if pthread_atfork(3) is available. */
-#define JEMALLOC_HAVE_PTHREAD_ATFORK
+/* #undef JEMALLOC_HAVE_PTHREAD_ATFORK */
 
 /* Defined if pthread_setname_np(3) is available. */
 #define JEMALLOC_HAVE_PTHREAD_SETNAME_NP
@@ -284,7 +284,7 @@
 #define JEMALLOC_PURGE_MADVISE_DONTNEED_ZEROS
 
 /* Defined if madvise(2) is available but MADV_FREE is not (x86 Linux only). */
-/* #undef JEMALLOC_DEFINE_MADVISE_FREE */
+#define JEMALLOC_DEFINE_MADVISE_FREE
 
 /*
  * Defined if MADV_DO[NT]DUMP is supported as an argument to madvise.
diff --git a/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in b/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in
index d5cf0e719ef..44ff2d9fad1 100644
--- a/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in
+++ b/contrib/jemalloc-cmake/include_linux_x86_64/jemalloc/internal/jemalloc_internal_defs.h.in
@@ -13,12 +13,14 @@
  * Define overrides for non-standard allocator-related functions if they are
  * present on the system.
  */
-#define JEMALLOC_OVERRIDE___LIBC_CALLOC
-#define JEMALLOC_OVERRIDE___LIBC_FREE
-#define JEMALLOC_OVERRIDE___LIBC_MALLOC
-#define JEMALLOC_OVERRIDE___LIBC_MEMALIGN
-#define JEMALLOC_OVERRIDE___LIBC_REALLOC
-#define JEMALLOC_OVERRIDE___LIBC_VALLOC
+#if !defined(USE_MUSL)
+    #define JEMALLOC_OVERRIDE___LIBC_CALLOC
+    #define JEMALLOC_OVERRIDE___LIBC_FREE
+    #define JEMALLOC_OVERRIDE___LIBC_MALLOC
+    #define JEMALLOC_OVERRIDE___LIBC_MEMALIGN
+    #define JEMALLOC_OVERRIDE___LIBC_REALLOC
+    #define JEMALLOC_OVERRIDE___LIBC_VALLOC
+#endif
 /* #undef JEMALLOC_OVERRIDE___POSIX_MEMALIGN */
 
 /*
diff --git a/contrib/krb5-cmake/CMakeLists.txt b/contrib/krb5-cmake/CMakeLists.txt
index 7c750ca12b6..d6c3c23b14e 100644
--- a/contrib/krb5-cmake/CMakeLists.txt
+++ b/contrib/krb5-cmake/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_program(AWK_PROGRAM awk)
 if(NOT AWK_PROGRAM)
-	message(FATAL_ERROR "You need the awk program to build ClickHouse with krb5 enabled.")
+    message(FATAL_ERROR "You need the awk program to build ClickHouse with krb5 enabled.")
 endif()
 
 set(KRB5_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/src")
diff --git a/contrib/libc-headers b/contrib/libc-headers
index a720b7105a6..aa5429bf67a 160000
--- a/contrib/libc-headers
+++ b/contrib/libc-headers
@@ -1 +1 @@
-Subproject commit a720b7105a610acbd7427eea475a5b6810c151eb
+Subproject commit aa5429bf67a346e48ad60efd88bcefc286644bf3
diff --git a/contrib/libcxx b/contrib/libcxx
index 2fa892f69ac..61e60294b1d 160000
--- a/contrib/libcxx
+++ b/contrib/libcxx
@@ -1 +1 @@
-Subproject commit 2fa892f69acbaa40f8a18c6484854a6183a34482
+Subproject commit 61e60294b1de01483caa9f5d00f437c99b674de6
diff --git a/contrib/libcxx-cmake/CMakeLists.txt b/contrib/libcxx-cmake/CMakeLists.txt
index 0cfb4191619..2ec6dbff1a1 100644
--- a/contrib/libcxx-cmake/CMakeLists.txt
+++ b/contrib/libcxx-cmake/CMakeLists.txt
@@ -47,6 +47,7 @@ set(SRCS
 )
 
 add_library(cxx ${SRCS})
+set_target_properties(cxx PROPERTIES FOLDER "contrib/libcxx-cmake")
 
 target_include_directories(cxx SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBCXX_SOURCE_DIR}/include>)
 target_compile_definitions(cxx PRIVATE -D_LIBCPP_BUILDING_LIBRARY -DLIBCXX_BUILDING_LIBCXXABI)
@@ -56,6 +57,10 @@ if (USE_UNWIND)
     target_compile_definitions(cxx PUBLIC -DSTD_EXCEPTION_HAS_STACK_TRACE=1)
 endif ()
 
+if (USE_MUSL)
+    target_compile_definitions(cxx PUBLIC -D_LIBCPP_HAS_MUSL_LIBC=1)
+endif ()
+
 # Override the deduced attribute support that causes error.
 if (OS_DARWIN AND COMPILER_GCC)
     add_compile_definitions(_LIBCPP_INIT_PRIORITY_MAX)
diff --git a/contrib/libcxxabi-cmake/CMakeLists.txt b/contrib/libcxxabi-cmake/CMakeLists.txt
index 0bb5d663633..425111d9b26 100644
--- a/contrib/libcxxabi-cmake/CMakeLists.txt
+++ b/contrib/libcxxabi-cmake/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SRCS
 )
 
 add_library(cxxabi ${SRCS})
+set_target_properties(cxxabi PROPERTIES FOLDER "contrib/libcxxabi-cmake")
 
 # Third party library may have substandard code.
 target_compile_options(cxxabi PRIVATE -w)
diff --git a/contrib/libhdfs3 b/contrib/libhdfs3
index 095b9d48b40..082e55f17d1 160000
--- a/contrib/libhdfs3
+++ b/contrib/libhdfs3
@@ -1 +1 @@
-Subproject commit 095b9d48b400abb72d967cb0539af13b1e3d90cf
+Subproject commit 082e55f17d1c58bf124290fb044fea40e985ec11
diff --git a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileNestedException.cpp b/contrib/libhdfs3-cmake/CMake/CMakeTestCompileNestedException.cpp
deleted file mode 100644
index 66918ca516e..00000000000
--- a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileNestedException.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <exception>
-#include <stdexcept>
-
-int main() {
-    try {
-        throw 2;
-    } catch (int) {
-        std::throw_with_nested(std::runtime_error("test"));
-    }
-}
diff --git a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileSteadyClock.cpp b/contrib/libhdfs3-cmake/CMake/CMakeTestCompileSteadyClock.cpp
deleted file mode 100644
index afcbe1b83b2..00000000000
--- a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileSteadyClock.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <chrono>
-
-using std::chrono::steady_clock;
-
-void foo(const steady_clock &clock) {
-    return;
-}
diff --git a/contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.cpp b/contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.c
similarity index 100%
rename from contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.cpp
rename to contrib/libhdfs3-cmake/CMake/CMakeTestCompileStrerror.c
diff --git a/contrib/libhdfs3-cmake/CMake/Options.cmake b/contrib/libhdfs3-cmake/CMake/Options.cmake
index 04ab823eedc..402aceac2fa 100644
--- a/contrib/libhdfs3-cmake/CMake/Options.cmake
+++ b/contrib/libhdfs3-cmake/CMake/Options.cmake
@@ -1,4 +1,4 @@
-OPTION(ENABLE_SSE "enable SSE4.2 buildin function" ON)
+OPTION(ENABLE_SSE "enable SSE4.2 builtin function" ON)
 
 INCLUDE (CheckFunctionExists)
 CHECK_FUNCTION_EXISTS(dladdr HAVE_DLADDR)
@@ -21,30 +21,21 @@ ADD_DEFINITIONS(-D_GNU_SOURCE)
 ADD_DEFINITIONS(-D_GLIBCXX_USE_NANOSLEEP)
 
 TRY_COMPILE(STRERROR_R_RETURN_INT
-	${CMAKE_CURRENT_BINARY_DIR}
-	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileStrerror.cpp"
+    ${CMAKE_CURRENT_BINARY_DIR}
+    "${CMAKE_CURRENT_SOURCE_DIR}/CMake/CMakeTestCompileStrerror.c"
     CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
-	OUTPUT_VARIABLE OUTPUT)
+    OUTPUT_VARIABLE OUTPUT)
 
 MESSAGE(STATUS "Checking whether strerror_r returns an int")
 
 IF(STRERROR_R_RETURN_INT)
-	MESSAGE(STATUS "Checking whether strerror_r returns an int -- yes")
+    MESSAGE(STATUS "Checking whether strerror_r returns an int -- yes")
 ELSE(STRERROR_R_RETURN_INT)
-	MESSAGE(STATUS "Checking whether strerror_r returns an int -- no")
+    MESSAGE(STATUS "Checking whether strerror_r returns an int -- no")
 ENDIF(STRERROR_R_RETURN_INT)
 
-TRY_COMPILE(HAVE_STEADY_CLOCK
-	${CMAKE_CURRENT_BINARY_DIR}
-	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileSteadyClock.cpp"
-    CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
-	OUTPUT_VARIABLE OUTPUT)
-
-TRY_COMPILE(HAVE_NESTED_EXCEPTION
-	${CMAKE_CURRENT_BINARY_DIR}
-	"${HDFS3_ROOT_DIR}/CMake/CMakeTestCompileNestedException.cpp"
-    CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'"
-	OUTPUT_VARIABLE OUTPUT)
+set(HAVE_STEADY_CLOCK 1)
+set(HAVE_NESTED_EXCEPTION 1)
 
 SET(HAVE_BOOST_CHRONO 0)
 SET(HAVE_BOOST_ATOMIC 0)
diff --git a/contrib/libmetrohash/CMakeLists.txt b/contrib/libmetrohash/CMakeLists.txt
index 9304cb3644c..4ec5a58717d 100644
--- a/contrib/libmetrohash/CMakeLists.txt
+++ b/contrib/libmetrohash/CMakeLists.txt
@@ -2,9 +2,5 @@ set (SRCS
     src/metrohash64.cpp
     src/metrohash128.cpp
 )
-if (HAVE_SSE42) # Not used. Pretty easy to port.
-    list (APPEND SRCS src/metrohash128crc.cpp)
-endif ()
-
 add_library(metrohash ${SRCS})
 target_include_directories(metrohash PUBLIC src)
diff --git a/contrib/libpqxx-cmake/CMakeLists.txt b/contrib/libpqxx-cmake/CMakeLists.txt
index ae35538ccf4..65fa94cb3fd 100644
--- a/contrib/libpqxx-cmake/CMakeLists.txt
+++ b/contrib/libpqxx-cmake/CMakeLists.txt
@@ -22,6 +22,7 @@ set (SRCS
     "${LIBRARY_DIR}/src/transaction.cxx"
     "${LIBRARY_DIR}/src/transaction_base.cxx"
     "${LIBRARY_DIR}/src/row.cxx"
+    "${LIBRARY_DIR}/src/params.cxx"
     "${LIBRARY_DIR}/src/util.cxx"
     "${LIBRARY_DIR}/src/version.cxx"
 )
@@ -31,6 +32,7 @@ set (SRCS
 # conflicts with all includes of <array>.
 set (HDRS
     "${LIBRARY_DIR}/include/pqxx/array.hxx"
+    "${LIBRARY_DIR}/include/pqxx/params.hxx"
     "${LIBRARY_DIR}/include/pqxx/binarystring.hxx"
     "${LIBRARY_DIR}/include/pqxx/composite.hxx"
     "${LIBRARY_DIR}/include/pqxx/connection.hxx"
@@ -75,4 +77,3 @@ set(CM_CONFIG_PQ "${LIBRARY_DIR}/include/pqxx/config-internal-libpq.h")
 configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_INT}" @ONLY)
 configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_PUB}" @ONLY)
 configure_file("${CM_CONFIG_H_IN}" "${CM_CONFIG_PQ}" @ONLY)
-
diff --git a/contrib/libprotobuf-mutator b/contrib/libprotobuf-mutator
new file mode 160000
index 00000000000..ffd86a32874
--- /dev/null
+++ b/contrib/libprotobuf-mutator
@@ -0,0 +1 @@
+Subproject commit ffd86a32874e5c08a143019aad1aaf0907294c9f
diff --git a/contrib/libprotobuf-mutator-cmake/CMakeLists.txt b/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..978b1e732ba
--- /dev/null
+++ b/contrib/libprotobuf-mutator-cmake/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/libprotobuf-mutator)
+
+add_library(protobuf-mutator
+    ${LIBRARY_DIR}/src/libfuzzer/libfuzzer_macro.cc
+    ${LIBRARY_DIR}/src/libfuzzer/libfuzzer_mutator.cc
+    ${LIBRARY_DIR}/src/binary_format.cc
+    ${LIBRARY_DIR}/src/mutator.cc
+    ${LIBRARY_DIR}/src/text_format.cc
+    ${LIBRARY_DIR}/src/utf8_fix.cc)
+
+target_include_directories(protobuf-mutator BEFORE PRIVATE "${LIBRARY_DIR}")
+target_include_directories(protobuf-mutator BEFORE PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/protobuf/src")
+
+target_link_libraries(protobuf-mutator ${Protobuf_LIBRARY})
diff --git a/contrib/librdkafka b/contrib/librdkafka
index 43491d33ca2..b8554f16820 160000
--- a/contrib/librdkafka
+++ b/contrib/librdkafka
@@ -1 +1 @@
-Subproject commit 43491d33ca2826531d1e3cae70d4bf1e5249e3c9
+Subproject commit b8554f1682062c85ba519eb54ef2f90e02b812cb
diff --git a/contrib/libunwind b/contrib/libunwind
index 6b816d2fba3..c4ea9848a69 160000
--- a/contrib/libunwind
+++ b/contrib/libunwind
@@ -1 +1 @@
-Subproject commit 6b816d2fba3991f8fd6aaec17d92f68947eab667
+Subproject commit c4ea9848a697747dfa35325af9b3452f30841685
diff --git a/contrib/libunwind-cmake/CMakeLists.txt b/contrib/libunwind-cmake/CMakeLists.txt
index 1a9f5e50abd..155853a0bca 100644
--- a/contrib/libunwind-cmake/CMakeLists.txt
+++ b/contrib/libunwind-cmake/CMakeLists.txt
@@ -39,6 +39,7 @@ set(LIBUNWIND_SOURCES
     ${LIBUNWIND_ASM_SOURCES})
 
 add_library(unwind ${LIBUNWIND_SOURCES})
+set_target_properties(unwind PROPERTIES FOLDER "contrib/libunwind-cmake")
 
 target_include_directories(unwind SYSTEM BEFORE PUBLIC $<BUILD_INTERFACE:${LIBUNWIND_SOURCE_DIR}/include>)
 target_compile_definitions(unwind PRIVATE -D_LIBUNWIND_NO_HEAP=1 -D_DEBUG -D_LIBUNWIND_IS_NATIVE_ONLY)
diff --git a/contrib/libuv b/contrib/libuv
index e2e9b7e9f97..95081e7c16c 160000
--- a/contrib/libuv
+++ b/contrib/libuv
@@ -1 +1 @@
-Subproject commit e2e9b7e9f978ce8a1367b5fe781d97d1ce9f94ab
+Subproject commit 95081e7c16c9857babe6d4e2bc1c779198ea89ae
diff --git a/contrib/libuv-cmake/CMakeLists.txt b/contrib/libuv-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..4fbd0575b55
--- /dev/null
+++ b/contrib/libuv-cmake/CMakeLists.txt
@@ -0,0 +1,160 @@
+# This file is a modified version of contrib/libuv/CMakeLists.txt
+
+include(CMakeDependentOption)
+
+set (SOURCE_DIR "${CMAKE_SOURCE_DIR}/contrib/libuv")
+set (BINARY_DIR "${CMAKE_BINARY_DIR}/contrib/libuv")
+
+
+if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU")
+  list(APPEND uv_cflags -fvisibility=hidden --std=gnu89)
+  list(APPEND uv_cflags -Wall -Wextra -Wstrict-prototypes)
+  list(APPEND uv_cflags -Wno-unused-parameter)
+endif()
+
+set(uv_sources
+    src/fs-poll.c
+    src/idna.c
+    src/inet.c
+    src/random.c
+    src/strscpy.c
+    src/threadpool.c
+    src/timer.c
+    src/uv-common.c
+    src/uv-data-getter-setters.c
+    src/version.c
+    src/unix/async.c
+    src/unix/core.c
+    src/unix/dl.c
+    src/unix/fs.c
+    src/unix/getaddrinfo.c
+    src/unix/getnameinfo.c
+    src/unix/loop-watcher.c
+    src/unix/loop.c
+    src/unix/pipe.c
+    src/unix/poll.c
+    src/unix/process.c
+    src/unix/random-devurandom.c
+    src/unix/signal.c
+    src/unix/stream.c
+    src/unix/tcp.c
+    src/unix/thread.c
+    src/unix/tty.c
+    src/unix/udp.c)
+
+if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Android|Linux|OS/390")
+  list(APPEND uv_sources src/unix/proctitle.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD")
+  list(APPEND uv_sources src/unix/freebsd.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
+  list(APPEND uv_sources src/unix/posix-hrtime.c src/unix/bsd-proctitle.c)
+endif()
+
+if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
+  list(APPEND uv_sources src/unix/bsd-ifaddrs.c src/unix/kqueue.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+  list(APPEND uv_sources src/unix/random-getrandom.c)
+endif()
+
+if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+  list(APPEND uv_sources src/unix/random-getentropy.c)
+endif()
+
+if(APPLE)
+  list(APPEND uv_defines _DARWIN_UNLIMITED_SELECT=1 _DARWIN_USE_64_BIT_INODE=1)
+  list(APPEND uv_sources
+       src/unix/darwin-proctitle.c
+       src/unix/darwin.c
+       src/unix/fsevents.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  list(APPEND uv_defines _GNU_SOURCE _POSIX_C_SOURCE=200112)
+  list(APPEND uv_libraries dl rt)
+  list(APPEND uv_sources
+       src/unix/linux-core.c
+       src/unix/linux-inotify.c
+       src/unix/linux-syscalls.c
+       src/unix/procfs-exepath.c
+       src/unix/random-getrandom.c
+       src/unix/random-sysctl-linux.c
+       src/unix/sysinfo-loadavg.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+  list(APPEND uv_sources src/unix/netbsd.c)
+  list(APPEND uv_libraries kvm)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+  list(APPEND uv_sources src/unix/openbsd.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "OS/390")
+  list(APPEND uv_defines PATH_MAX=255)
+  list(APPEND uv_defines _AE_BIMODAL)
+  list(APPEND uv_defines _ALL_SOURCE)
+  list(APPEND uv_defines _LARGE_TIME_API)
+  list(APPEND uv_defines _OPEN_MSGQ_EXT)
+  list(APPEND uv_defines _OPEN_SYS_FILE_EXT)
+  list(APPEND uv_defines _OPEN_SYS_IF_EXT)
+  list(APPEND uv_defines _OPEN_SYS_SOCK_EXT3)
+  list(APPEND uv_defines _OPEN_SYS_SOCK_IPV6)
+  list(APPEND uv_defines _UNIX03_SOURCE)
+  list(APPEND uv_defines _UNIX03_THREADS)
+  list(APPEND uv_defines _UNIX03_WITHDRAWN)
+  list(APPEND uv_defines _XOPEN_SOURCE_EXTENDED)
+  list(APPEND uv_sources
+       src/unix/pthread-fixes.c
+       src/unix/pthread-barrier.c
+       src/unix/os390.c
+       src/unix/os390-syscalls.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+  list(APPEND uv_defines __EXTENSIONS__ _XOPEN_SOURCE=500)
+  list(APPEND uv_libraries kstat nsl sendfile socket)
+  list(APPEND uv_sources src/unix/no-proctitle.c src/unix/sunos.c)
+endif()
+
+set(uv_sources_tmp "")
+foreach(file ${uv_sources})
+  list(APPEND uv_sources_tmp "${SOURCE_DIR}/${file}")
+endforeach(file)
+set(uv_sources "${uv_sources_tmp}")
+
+list(APPEND uv_defines CLICKHOUSE_GLIBC_COMPATIBILITY)
+
+add_library(uv ${uv_sources})
+target_compile_definitions(uv
+                           INTERFACE USING_UV_SHARED=1
+                           PRIVATE ${uv_defines} BUILDING_UV_SHARED=1)
+target_compile_options(uv PRIVATE ${uv_cflags})
+target_include_directories(uv PUBLIC ${SOURCE_DIR}/include PRIVATE ${SOURCE_DIR}/src)
+target_link_libraries(uv ${uv_libraries})
+
+add_library(uv_a STATIC ${uv_sources})
+target_compile_definitions(uv_a PRIVATE ${uv_defines})
+target_compile_options(uv_a PRIVATE ${uv_cflags})
+target_include_directories(uv_a PUBLIC ${SOURCE_DIR}/include PRIVATE ${SOURCE_DIR}/src)
+target_link_libraries(uv_a ${uv_libraries})
+
+if(UNIX)
+  # Now for some gibbering horrors from beyond the stars...
+  foreach(x ${uv_libraries})
+    set(LIBS "${LIBS} -l${x}")
+  endforeach(x)
+  file(STRINGS ${SOURCE_DIR}/configure.ac configure_ac REGEX ^AC_INIT)
+  string(REGEX MATCH [0-9]+[.][0-9]+[.][0-9]+ PACKAGE_VERSION "${configure_ac}")
+  string(REGEX MATCH ^[0-9]+ UV_VERSION_MAJOR "${PACKAGE_VERSION}")
+  # The version in the filename is mirroring the behaviour of autotools.
+  set_target_properties(uv PROPERTIES VERSION ${UV_VERSION_MAJOR}.0.0
+                      SOVERSION ${UV_VERSION_MAJOR})
+endif()
+
diff --git a/contrib/llvm b/contrib/llvm
index e5751459412..20607e61728 160000
--- a/contrib/llvm
+++ b/contrib/llvm
@@ -1 +1 @@
-Subproject commit e5751459412bce1391fb7a2e9bbc01e131bf72f1
+Subproject commit 20607e61728e97c969e536644c3c0c1bb1a50672
diff --git a/contrib/magic-enum-cmake/CMakeLists.txt b/contrib/magic-enum-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..142f9c7c755
--- /dev/null
+++ b/contrib/magic-enum-cmake/CMakeLists.txt
@@ -0,0 +1,3 @@
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/magic_enum")
+add_library (magic_enum INTERFACE)
+target_include_directories(magic_enum INTERFACE ${LIBRARY_DIR}/include)
diff --git a/contrib/magic_enum b/contrib/magic_enum
new file mode 160000
index 00000000000..38f86e4d093
--- /dev/null
+++ b/contrib/magic_enum
@@ -0,0 +1 @@
+Subproject commit 38f86e4d093cfc9034a140d37de2168e3951bef3
diff --git a/contrib/nanodbc b/contrib/nanodbc
index 9fc45967551..df52a1232df 160000
--- a/contrib/nanodbc
+++ b/contrib/nanodbc
@@ -1 +1 @@
-Subproject commit 9fc459675515d491401727ec67fca38db721f28c
+Subproject commit df52a1232dfa182f9af60974d001b91823afe9bc
diff --git a/contrib/openldap-cmake/freebsd_aarch64/include/lber_types.h b/contrib/openldap-cmake/freebsd_aarch64/include/lber_types.h
new file mode 100644
index 00000000000..dbd59430527
--- /dev/null
+++ b/contrib/openldap-cmake/freebsd_aarch64/include/lber_types.h
@@ -0,0 +1,63 @@
+/* include/lber_types.h. Generated from lber_types.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * LBER types
+ */
+
+#ifndef _LBER_TYPES_H
+#define _LBER_TYPES_H
+
+#include <ldap_cdefs.h>
+
+LDAP_BEGIN_DECL
+
+/* LBER boolean, enum, integers (32 bits or larger) */
+#define LBER_INT_T int
+
+/* LBER tags (32 bits or larger) */
+#define LBER_TAG_T long
+
+/* LBER socket descriptor */
+#define LBER_SOCKET_T int
+
+/* LBER lengths (32 bits or larger) */
+#define LBER_LEN_T long
+
+/* ------------------------------------------------------------ */
+
+/* booleans, enumerations, and integers */
+typedef LBER_INT_T ber_int_t;
+
+/* signed and unsigned versions */
+typedef signed LBER_INT_T ber_sint_t;
+typedef unsigned LBER_INT_T ber_uint_t;
+
+/* tags */
+typedef unsigned LBER_TAG_T ber_tag_t;
+
+/* "socket" descriptors */
+typedef LBER_SOCKET_T ber_socket_t;
+
+/* lengths */
+typedef unsigned LBER_LEN_T ber_len_t;
+
+/* signed lengths */
+typedef signed LBER_LEN_T ber_slen_t;
+
+LDAP_END_DECL
+
+#endif /* _LBER_TYPES_H */
diff --git a/contrib/openldap-cmake/freebsd_aarch64/include/ldap_config.h b/contrib/openldap-cmake/freebsd_aarch64/include/ldap_config.h
new file mode 100644
index 00000000000..89f7b40b884
--- /dev/null
+++ b/contrib/openldap-cmake/freebsd_aarch64/include/ldap_config.h
@@ -0,0 +1,74 @@
+/* include/ldap_config.h. Generated from ldap_config.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * This file works in conjunction with OpenLDAP configure system.
+ * If you do no like the values below, adjust your configure options.
+ */
+
+#ifndef _LDAP_CONFIG_H
+#define _LDAP_CONFIG_H
+
+/* directory separator */
+#ifndef LDAP_DIRSEP
+#ifndef _WIN32
+#define LDAP_DIRSEP "/"
+#else
+#define LDAP_DIRSEP "\\"
+#endif
+#endif
+
+/* directory for temporary files */
+#if defined(_WIN32)
+# define LDAP_TMPDIR "C:\\." /* we don't have much of a choice */
+#elif defined( _P_tmpdir )
+# define LDAP_TMPDIR _P_tmpdir
+#elif defined( P_tmpdir )
+# define LDAP_TMPDIR P_tmpdir
+#elif defined( _PATH_TMPDIR )
+# define LDAP_TMPDIR _PATH_TMPDIR
+#else
+# define LDAP_TMPDIR LDAP_DIRSEP "tmp"
+#endif
+
+/* directories */
+#ifndef LDAP_BINDIR
+#define LDAP_BINDIR        "/tmp/ldap-prefix/bin"
+#endif
+#ifndef LDAP_SBINDIR
+#define LDAP_SBINDIR       "/tmp/ldap-prefix/sbin"
+#endif
+#ifndef LDAP_DATADIR
+#define LDAP_DATADIR       "/tmp/ldap-prefix/share/openldap"
+#endif
+#ifndef LDAP_SYSCONFDIR
+#define LDAP_SYSCONFDIR    "/tmp/ldap-prefix/etc/openldap"
+#endif
+#ifndef LDAP_LIBEXECDIR
+#define LDAP_LIBEXECDIR    "/tmp/ldap-prefix/libexec"
+#endif
+#ifndef LDAP_MODULEDIR
+#define LDAP_MODULEDIR     "/tmp/ldap-prefix/libexec/openldap"
+#endif
+#ifndef LDAP_RUNDIR
+#define LDAP_RUNDIR        "/tmp/ldap-prefix/var"
+#endif
+#ifndef LDAP_LOCALEDIR
+#define LDAP_LOCALEDIR     ""
+#endif
+
+
+#endif /* _LDAP_CONFIG_H */
diff --git a/contrib/openldap-cmake/freebsd_aarch64/include/ldap_features.h b/contrib/openldap-cmake/freebsd_aarch64/include/ldap_features.h
new file mode 100644
index 00000000000..f0cc7c3626f
--- /dev/null
+++ b/contrib/openldap-cmake/freebsd_aarch64/include/ldap_features.h
@@ -0,0 +1,61 @@
+/* include/ldap_features.h. Generated from ldap_features.hin by configure. */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/*
+ * LDAP Features
+ */
+
+#ifndef _LDAP_FEATURES_H
+#define _LDAP_FEATURES_H 1
+
+/* OpenLDAP API version macros */
+#define LDAP_VENDOR_VERSION 20501
+#define LDAP_VENDOR_VERSION_MAJOR 2
+#define LDAP_VENDOR_VERSION_MINOR 5
+#define LDAP_VENDOR_VERSION_PATCH X
+
+/*
+** WORK IN PROGRESS!
+**
+** OpenLDAP reentrancy/thread-safeness should be dynamically
+** checked using ldap_get_option().
+**
+** The -lldap implementation is not thread-safe.
+**
+** The -lldap_r implementation is:
+**     LDAP_API_FEATURE_THREAD_SAFE (basic thread safety)
+** but also be:
+**     LDAP_API_FEATURE_SESSION_THREAD_SAFE
+**     LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+**
+** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+** can be used to determine if -lldap_r is available at compile
+** time.  You must define LDAP_THREAD_SAFE if and only if you
+** link with -lldap_r.
+**
+** If you fail to define LDAP_THREAD_SAFE when linking with
+** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
+** provided header definitions and declarations may be incorrect.
+**
+*/
+
+/* is -lldap_r available or not */
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+
+/* LDAP v2 Referrals */
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+#endif /* LDAP_FEATURES */
diff --git a/contrib/openldap-cmake/freebsd_aarch64/include/portable.h b/contrib/openldap-cmake/freebsd_aarch64/include/portable.h
new file mode 100644
index 00000000000..10a15fe3ca1
--- /dev/null
+++ b/contrib/openldap-cmake/freebsd_aarch64/include/portable.h
@@ -0,0 +1,1169 @@
+/* include/portable.h. Generated from portable.hin by configure. */
+/* include/portable.hin. Generated from configure.in by autoheader. */
+
+
+/* begin of portable.h.pre */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2020 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+#ifndef _LDAP_PORTABLE_H
+#define _LDAP_PORTABLE_H
+
+/* define this if needed to get reentrant functions */
+#ifndef REENTRANT
+#define REENTRANT 1
+#endif
+#ifndef _REENTRANT
+#define _REENTRANT 1
+#endif
+
+/* define this if needed to get threadsafe functions */
+#ifndef THREADSAFE
+#define THREADSAFE 1
+#endif
+#ifndef _THREADSAFE
+#define _THREADSAFE 1
+#endif
+#ifndef THREAD_SAFE
+#define THREAD_SAFE 1
+#endif
+#ifndef _THREAD_SAFE
+#define _THREAD_SAFE 1
+#endif
+
+#ifndef _SGI_MP_SOURCE
+#define _SGI_MP_SOURCE 1
+#endif
+
+/* end of portable.h.pre */
+
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* define to use both <string.h> and <strings.h> */
+/* #undef BOTH_STRINGS_H */
+
+/* define if cross compiling */
+/* #undef CROSS_COMPILING */
+
+/* set to the number of arguments ctime_r() expects */
+#define CTIME_R_NARGS 2
+
+/* define if toupper() requires islower() */
+/* #undef C_UPPER_LOWER */
+
+/* define if sys_errlist is not declared in stdio.h or errno.h */
+/* #undef DECL_SYS_ERRLIST */
+
+/* define to enable slapi library */
+/* #undef ENABLE_SLAPI */
+
+/* defined to be the EXE extension */
+#define EXEEXT ""
+
+/* set to the number of arguments gethostbyaddr_r() expects */
+#define GETHOSTBYADDR_R_NARGS 8
+
+/* set to the number of arguments gethostbyname_r() expects */
+#define GETHOSTBYNAME_R_NARGS 6
+
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
+/* #undef GWINSZ_IN_SYS_IOCTL */
+
+/* define if you have AIX security lib */
+/* #undef HAVE_AIX_SECURITY */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+#define HAVE_ARPA_NAMESER_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `bcopy' function. */
+#define HAVE_BCOPY 1
+
+/* Define to 1 if you have the <bits/types.h> header file. */
+/* #undef HAVE_BITS_TYPES_H */
+
+/* Define to 1 if you have the `chroot' function. */
+#define HAVE_CHROOT 1
+
+/* Define to 1 if you have the `closesocket' function. */
+/* #undef HAVE_CLOSESOCKET */
+
+/* Define to 1 if you have the <conio.h> header file. */
+/* #undef HAVE_CONIO_H */
+
+/* define if crypt(3) is available */
+/* #undef HAVE_CRYPT */
+
+/* Define to 1 if you have the <crypt.h> header file. */
+/* #undef HAVE_CRYPT_H */
+
+/* define if crypt_r() is also available */
+/* #undef HAVE_CRYPT_R */
+
+/* Define to 1 if you have the `ctime_r' function. */
+#define HAVE_CTIME_R 1
+
+/* define if you have Cyrus SASL */
+/* #undef HAVE_CYRUS_SASL */
+
+/* define if your system supports /dev/poll */
+/* #undef HAVE_DEVPOLL */
+
+/* Define to 1 if you have the <direct.h> header file. */
+/* #undef HAVE_DIRECT_H */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* define if system uses EBCDIC instead of ASCII */
+/* #undef HAVE_EBCDIC */
+
+/* Define to 1 if you have the `endgrent' function. */
+#define HAVE_ENDGRENT 1
+
+/* Define to 1 if you have the `endpwent' function. */
+#define HAVE_ENDPWENT 1
+
+/* define if your system supports epoll */
+/* #undef HAVE_EPOLL */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the `fcntl' function. */
+#define HAVE_FCNTL 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* define if you actually have FreeBSD fetch(3) */
+/* #undef HAVE_FETCH */
+
+/* Define to 1 if you have the <filio.h> header file. */
+/* #undef HAVE_FILIO_H */
+
+/* Define to 1 if you have the `flock' function. */
+#define HAVE_FLOCK 1
+
+/* Define to 1 if you have the `fstat' function. */
+#define HAVE_FSTAT 1
+
+/* Define to 1 if you have the `gai_strerror' function. */
+#define HAVE_GAI_STRERROR 1
+
+/* Define to 1 if you have the `getaddrinfo' function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if you have the `getdtablesize' function. */
+#define HAVE_GETDTABLESIZE 1
+
+/* Define to 1 if you have the `geteuid' function. */
+#define HAVE_GETEUID 1
+
+/* Define to 1 if you have the `getgrgid' function. */
+#define HAVE_GETGRGID 1
+
+/* Define to 1 if you have the `gethostbyaddr_r' function. */
+#define HAVE_GETHOSTBYADDR_R 1
+
+/* Define to 1 if you have the `gethostbyname_r' function. */
+#define HAVE_GETHOSTBYNAME_R 1
+
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the `getnameinfo' function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `getpassphrase' function. */
+/* #undef HAVE_GETPASSPHRASE */
+
+/* Define to 1 if you have the `getpeereid' function. */
+#define HAVE_GETPEEREID 1
+
+/* Define to 1 if you have the `getpeerucred' function. */
+/* #undef HAVE_GETPEERUCRED */
+
+/* Define to 1 if you have the `getpwnam' function. */
+#define HAVE_GETPWNAM 1
+
+/* Define to 1 if you have the `getpwuid' function. */
+#define HAVE_GETPWUID 1
+
+/* Define to 1 if you have the `getspnam' function. */
+/* #undef HAVE_GETSPNAM */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <gmp.h> header file. */
+/* #undef HAVE_GMP_H */
+
+/* Define to 1 if you have the `gmtime_r' function. */
+#define HAVE_GMTIME_R 1
+
+/* define if you have GNUtls */
+/* #undef HAVE_GNUTLS */
+
+/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
+/* #undef HAVE_GNUTLS_GNUTLS_H */
+
+/* if you have GNU Pth */
+/* #undef HAVE_GNU_PTH */
+
+/* Define to 1 if you have the <grp.h> header file. */
+#define HAVE_GRP_H 1
+
+/* Define to 1 if you have the `hstrerror' function. */
+#define HAVE_HSTRERROR 1
+
+/* define to you inet_aton(3) is available */
+#define HAVE_INET_ATON 1
+
+/* Define to 1 if you have the `inet_ntoa_b' function. */
+/* #undef HAVE_INET_NTOA_B */
+
+/* Define to 1 if you have the `inet_ntop' function. */
+#define HAVE_INET_NTOP 1
+
+/* Define to 1 if you have the `initgroups' function. */
+#define HAVE_INITGROUPS 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `ioctl' function. */
+#define HAVE_IOCTL 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* define if your system supports kqueue */
+#define HAVE_KQUEUE 1
+
+/* Define to 1 if you have the `gen' library (-lgen). */
+/* #undef HAVE_LIBGEN */
+
+/* Define to 1 if you have the `gmp' library (-lgmp). */
+/* #undef HAVE_LIBGMP */
+
+/* Define to 1 if you have the `inet' library (-linet). */
+/* #undef HAVE_LIBINET */
+
+/* define if you have libtool -ltdl */
+/* #undef HAVE_LIBLTDL */
+
+/* Define to 1 if you have the `net' library (-lnet). */
+/* #undef HAVE_LIBNET */
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+/* #undef HAVE_LIBNSL */
+
+/* Define to 1 if you have the `nsl_s' library (-lnsl_s). */
+/* #undef HAVE_LIBNSL_S */
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the <libutil.h> header file. */
+#define HAVE_LIBUTIL_H 1
+
+/* Define to 1 if you have the `V3' library (-lV3). */
+/* #undef HAVE_LIBV3 */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* if you have LinuxThreads */
+/* #undef HAVE_LINUX_THREADS */
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if you have the `lockf' function. */
+#define HAVE_LOCKF 1
+
+/* Define to 1 if the system has the type `long long'. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if you have the <ltdl.h> header file. */
+/* #undef HAVE_LTDL_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memrchr' function. */
+#define HAVE_MEMRCHR 1
+
+/* Define to 1 if you have the `mkstemp' function. */
+#define HAVE_MKSTEMP 1
+
+/* Define to 1 if you have the `mktemp' function. */
+#define HAVE_MKTEMP 1
+
+/* define this if you have mkversion */
+#define HAVE_MKVERSION 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* define if strerror_r returns char* instead of int */
+/* #undef HAVE_NONPOSIX_STRERROR_R */
+
+/* if you have NT Event Log */
+/* #undef HAVE_NT_EVENT_LOG */
+
+/* if you have NT Service Manager */
+/* #undef HAVE_NT_SERVICE_MANAGER */
+
+/* if you have NT Threads */
+/* #undef HAVE_NT_THREADS */
+
+/* define if you have OpenSSL */
+#define HAVE_OPENSSL 1
+
+/* Define to 1 if you have the <openssl/bn.h> header file. */
+#define HAVE_OPENSSL_BN_H 1
+
+/* define if you have OpenSSL with CRL checking capability */
+#define HAVE_OPENSSL_CRL 1
+
+/* Define to 1 if you have the <openssl/crypto.h> header file. */
+#define HAVE_OPENSSL_CRYPTO_H 1
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#define HAVE_OPENSSL_SSL_H 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the <process.h> header file. */
+/* #undef HAVE_PROCESS_H */
+
+/* Define to 1 if you have the <psap.h> header file. */
+/* #undef HAVE_PSAP_H */
+
+/* define to pthreads API spec revision */
+#define HAVE_PTHREADS 10
+
+/* define if you have pthread_detach function */
+#define HAVE_PTHREAD_DETACH 1
+
+/* Define to 1 if you have the `pthread_getconcurrency' function. */
+#define HAVE_PTHREAD_GETCONCURRENCY 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the `pthread_kill' function. */
+#define HAVE_PTHREAD_KILL 1
+
+/* Define to 1 if you have the `pthread_kill_other_threads_np' function. */
+/* #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP */
+
+/* define if you have pthread_rwlock_destroy function */
+#define HAVE_PTHREAD_RWLOCK_DESTROY 1
+
+/* Define to 1 if you have the `pthread_setconcurrency' function. */
+#define HAVE_PTHREAD_SETCONCURRENCY 1
+
+/* Define to 1 if you have the `pthread_yield' function. */
+#define HAVE_PTHREAD_YIELD 1
+
+/* Define to 1 if you have the <pth.h> header file. */
+/* #undef HAVE_PTH_H */
+
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#define HAVE_PTRDIFF_T 1
+
+/* Define to 1 if you have the <pwd.h> header file. */
+#define HAVE_PWD_H 1
+
+/* Define to 1 if you have the `read' function. */
+#define HAVE_READ 1
+
+/* Define to 1 if you have the `recv' function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the `recvfrom' function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
+/* Define to 1 if you have the <resolv.h> header file. */
+/* #undef HAVE_RESOLV_H */
+
+/* define if you have res_query() */
+/* #undef HAVE_RES_QUERY */
+
+/* define if OpenSSL needs RSAref */
+/* #undef HAVE_RSAREF */
+
+/* Define to 1 if you have the <sasl.h> header file. */
+/* #undef HAVE_SASL_H */
+
+/* Define to 1 if you have the <sasl/sasl.h> header file. */
+/* #undef HAVE_SASL_SASL_H */
+
+/* define if your SASL library has sasl_version() */
+/* #undef HAVE_SASL_VERSION */
+
+/* Define to 1 if you have the <sched.h> header file. */
+#define HAVE_SCHED_H 1
+
+/* Define to 1 if you have the `sched_yield' function. */
+#define HAVE_SCHED_YIELD 1
+
+/* Define to 1 if you have the `send' function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the `sendmsg' function. */
+#define HAVE_SENDMSG 1
+
+/* Define to 1 if you have the `sendto' function. */
+#define HAVE_SENDTO 1
+
+/* Define to 1 if you have the `setegid' function. */
+#define HAVE_SETEGID 1
+
+/* Define to 1 if you have the `seteuid' function. */
+#define HAVE_SETEUID 1
+
+/* Define to 1 if you have the `setgid' function. */
+#define HAVE_SETGID 1
+
+/* Define to 1 if you have the `setpwfile' function. */
+/* #undef HAVE_SETPWFILE */
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `setuid' function. */
+#define HAVE_SETUID 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+/* #undef HAVE_SGTTY_H */
+
+/* Define to 1 if you have the <shadow.h> header file. */
+/* #undef HAVE_SHADOW_H */
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `signal' function. */
+#define HAVE_SIGNAL 1
+
+/* Define to 1 if you have the `sigset' function. */
+#define HAVE_SIGSET 1
+
+/* define if you have -lslp */
+/* #undef HAVE_SLP */
+
+/* Define to 1 if you have the <slp.h> header file. */
+/* #undef HAVE_SLP_H */
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* if you have spawnlp() */
+/* #undef HAVE_SPAWNLP */
+
+/* Define to 1 if you have the <sqlext.h> header file. */
+/* #undef HAVE_SQLEXT_H */
+
+/* Define to 1 if you have the <sql.h> header file. */
+/* #undef HAVE_SQL_H */
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strerror_r' function. */
+#define HAVE_STRERROR_R 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strpbrk' function. */
+#define HAVE_STRPBRK 1
+
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
+/* Define to 1 if you have the `strsep' function. */
+#define HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strspn' function. */
+#define HAVE_STRSPN 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#define HAVE_STRTOLL 1
+
+/* Define to 1 if you have the `strtoq' function. */
+#define HAVE_STRTOQ 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the `strtoull' function. */
+#define HAVE_STRTOULL 1
+
+/* Define to 1 if you have the `strtouq' function. */
+#define HAVE_STRTOUQ 1
+
+/* Define to 1 if `msg_accrightslen' is a member of `struct msghdr'. */
+/* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN */
+
+/* Define to 1 if `msg_control' is a member of `struct msghdr'. */
+/* #undef HAVE_STRUCT_MSGHDR_MSG_CONTROL */
+
+/* Define to 1 if `pw_gecos' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_GECOS 1
+
+/* Define to 1 if `pw_passwd' is a member of `struct passwd'. */
+#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
+
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+
+/* Define to 1 if `st_fstype' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE */
+
+/* define to 1 if st_fstype is char * */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE_CHAR */
+
+/* define to 1 if st_fstype is int */
+/* #undef HAVE_STRUCT_STAT_ST_FSTYPE_INT */
+
+/* Define to 1 if `st_vfstype' is a member of `struct stat'. */
+/* #undef HAVE_STRUCT_STAT_ST_VFSTYPE */
+
+/* Define to 1 if you have the <synch.h> header file. */
+/* #undef HAVE_SYNCH_H */
+
+/* Define to 1 if you have the `sysconf' function. */
+#define HAVE_SYSCONF 1
+
+/* Define to 1 if you have the <sysexits.h> header file. */
+#define HAVE_SYSEXITS_H 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/devpoll.h> header file. */
+/* #undef HAVE_SYS_DEVPOLL_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef HAVE_SYS_EPOLL_H */
+
+/* define if you actually have sys_errlist in your libs */
+#define HAVE_SYS_ERRLIST 1
+
+/* Define to 1 if you have the <sys/errno.h> header file. */
+#define HAVE_SYS_ERRNO_H 1
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#define HAVE_SYS_EVENT_H 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#define HAVE_SYS_FILIO_H 1
+
+/* Define to 1 if you have the <sys/fstyp.h> header file. */
+/* #undef HAVE_SYS_FSTYP_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
+/* Define to 1 if you have the <sys/privgrp.h> header file. */
+/* #undef HAVE_SYS_PRIVGRP_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/syslog.h> header file. */
+#define HAVE_SYS_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/ucred.h> header file. */
+#define HAVE_SYS_UCRED_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
+/* Define to 1 if you have the <sys/uuid.h> header file. */
+/* #undef HAVE_SYS_UUID_H */
+
+/* Define to 1 if you have the <sys/vmount.h> header file. */
+/* #undef HAVE_SYS_VMOUNT_H */
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* define if you have -lwrap */
+/* #undef HAVE_TCPD */
+
+/* Define to 1 if you have the <tcpd.h> header file. */
+/* #undef HAVE_TCPD_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+#define HAVE_TERMIOS_H 1
+
+/* if you have Solaris LWP (thr) package */
+/* #undef HAVE_THR */
+
+/* Define to 1 if you have the <thread.h> header file. */
+/* #undef HAVE_THREAD_H */
+
+/* Define to 1 if you have the `thr_getconcurrency' function. */
+/* #undef HAVE_THR_GETCONCURRENCY */
+
+/* Define to 1 if you have the `thr_setconcurrency' function. */
+/* #undef HAVE_THR_SETCONCURRENCY */
+
+/* Define to 1 if you have the `thr_yield' function. */
+/* #undef HAVE_THR_YIELD */
+
+/* define if you have TLS */
+#define HAVE_TLS 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* define if you have uuid_generate() */
+/* #undef HAVE_UUID_GENERATE */
+
+/* define if you have uuid_to_str() */
+/* #undef HAVE_UUID_TO_STR */
+
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+/* #undef HAVE_UUID_UUID_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `wait4' function. */
+#define HAVE_WAIT4 1
+
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
+
+/* define if you have winsock */
+/* #undef HAVE_WINSOCK */
+
+/* define if you have winsock2 */
+/* #undef HAVE_WINSOCK2 */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <winsock.h> header file. */
+/* #undef HAVE_WINSOCK_H */
+
+/* Define to 1 if you have the <wiredtiger.h> header file. */
+/* #undef HAVE_WIREDTIGER_H */
+
+/* Define to 1 if you have the `write' function. */
+#define HAVE_WRITE 1
+
+/* define if select implicitly yields */
+#define HAVE_YIELDING_SELECT 1
+
+/* Define to 1 if you have the `_vsnprintf' function. */
+/* #undef HAVE__VSNPRINTF */
+
+/* define to 32-bit or greater integer type */
+#define LBER_INT_T int
+
+/* define to large integer type */
+#define LBER_LEN_T long
+
+/* define to socket descriptor type */
+#define LBER_SOCKET_T int
+
+/* define to large integer type */
+#define LBER_TAG_T long
+
+/* define to 1 if library is thread safe */
+#define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
+
+/* define to LDAP VENDOR VERSION */
+/* #undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
+
+/* define this to add debugging code */
+/* #undef LDAP_DEBUG */
+
+/* define if LDAP libs are dynamic */
+/* #undef LDAP_LIBS_DYNAMIC */
+
+/* define to support PF_INET6 */
+#define LDAP_PF_INET6 1
+
+/* define to support PF_LOCAL */
+#define LDAP_PF_LOCAL 1
+
+/* define this to add SLAPI code */
+/* #undef LDAP_SLAPI */
+
+/* define this to add syslog code */
+/* #undef LDAP_SYSLOG */
+
+/* Version */
+#define LDAP_VENDOR_VERSION 20501
+
+/* Major */
+#define LDAP_VENDOR_VERSION_MAJOR 2
+
+/* Minor */
+#define LDAP_VENDOR_VERSION_MINOR 5
+
+/* Patch */
+#define LDAP_VENDOR_VERSION_PATCH X
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* define if memcmp is not 8-bit clean or is otherwise broken */
+/* #undef NEED_MEMCMP_REPLACEMENT */
+
+/* define if you have (or want) no threads */
+/* #undef NO_THREADS */
+
+/* define to use the original debug style */
+/* #undef OLD_DEBUG */
+
+/* Package */
+#define OPENLDAP_PACKAGE "OpenLDAP"
+
+/* Version */
+#define OPENLDAP_VERSION "2.5.X"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* define if sched_yield yields the entire process */
+/* #undef REPLACE_BROKEN_YIELD */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to the type of arg 1 for `select'. */
+#define SELECT_TYPE_ARG1 int
+
+/* Define to the type of args 2, 3 and 4 for `select'. */
+#define SELECT_TYPE_ARG234 (fd_set *)
+
+/* Define to the type of arg 5 for `select'. */
+#define SELECT_TYPE_ARG5 (struct timeval *)
+
+/* The size of `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of `long long', as computed by sizeof. */
+#define SIZEOF_LONG_LONG 8
+
+/* The size of `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
+/* The size of `wchar_t', as computed by sizeof. */
+#define SIZEOF_WCHAR_T 4
+
+/* define to support per-object ACIs */
+/* #undef SLAPD_ACI_ENABLED */
+
+/* define to support LDAP Async Metadirectory backend */
+/* #undef SLAPD_ASYNCMETA */
+
+/* define to support cleartext passwords */
+/* #undef SLAPD_CLEARTEXT */
+
+/* define to support crypt(3) passwords */
+/* #undef SLAPD_CRYPT */
+
+/* define to support DNS SRV backend */
+/* #undef SLAPD_DNSSRV */
+
+/* define to support LDAP backend */
+/* #undef SLAPD_LDAP */
+
+/* define to support MDB backend */
+/* #undef SLAPD_MDB */
+
+/* define to support LDAP Metadirectory backend */
+/* #undef SLAPD_META */
+
+/* define to support modules */
+/* #undef SLAPD_MODULES */
+
+/* dynamically linked module */
+#define SLAPD_MOD_DYNAMIC 2
+
+/* statically linked module */
+#define SLAPD_MOD_STATIC 1
+
+/* define to support cn=Monitor backend */
+/* #undef SLAPD_MONITOR */
+
+/* define to support NDB backend */
+/* #undef SLAPD_NDB */
+
+/* define to support NULL backend */
+/* #undef SLAPD_NULL */
+
+/* define for In-Directory Access Logging overlay */
+/* #undef SLAPD_OVER_ACCESSLOG */
+
+/* define for Audit Logging overlay */
+/* #undef SLAPD_OVER_AUDITLOG */
+
+/* define for Automatic Certificate Authority overlay */
+/* #undef SLAPD_OVER_AUTOCA */
+
+/* define for Collect overlay */
+/* #undef SLAPD_OVER_COLLECT */
+
+/* define for Attribute Constraint overlay */
+/* #undef SLAPD_OVER_CONSTRAINT */
+
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DDS */
+
+/* define for Dynamic Directory Services overlay */
+/* #undef SLAPD_OVER_DEREF */
+
+/* define for Dynamic Group overlay */
+/* #undef SLAPD_OVER_DYNGROUP */
+
+/* define for Dynamic List overlay */
+/* #undef SLAPD_OVER_DYNLIST */
+
+/* define for Reverse Group Membership overlay */
+/* #undef SLAPD_OVER_MEMBEROF */
+
+/* define for Password Policy overlay */
+/* #undef SLAPD_OVER_PPOLICY */
+
+/* define for Proxy Cache overlay */
+/* #undef SLAPD_OVER_PROXYCACHE */
+
+/* define for Referential Integrity overlay */
+/* #undef SLAPD_OVER_REFINT */
+
+/* define for Return Code overlay */
+/* #undef SLAPD_OVER_RETCODE */
+
+/* define for Rewrite/Remap overlay */
+/* #undef SLAPD_OVER_RWM */
+
+/* define for Sequential Modify overlay */
+/* #undef SLAPD_OVER_SEQMOD */
+
+/* define for ServerSideSort/VLV overlay */
+/* #undef SLAPD_OVER_SSSVLV */
+
+/* define for Syncrepl Provider overlay */
+/* #undef SLAPD_OVER_SYNCPROV */
+
+/* define for Translucent Proxy overlay */
+/* #undef SLAPD_OVER_TRANSLUCENT */
+
+/* define for Attribute Uniqueness overlay */
+/* #undef SLAPD_OVER_UNIQUE */
+
+/* define for Value Sorting overlay */
+/* #undef SLAPD_OVER_VALSORT */
+
+/* define to support PASSWD backend */
+/* #undef SLAPD_PASSWD */
+
+/* define to support PERL backend */
+/* #undef SLAPD_PERL */
+
+/* define to support relay backend */
+/* #undef SLAPD_RELAY */
+
+/* define to support reverse lookups */
+/* #undef SLAPD_RLOOKUPS */
+
+/* define to support SHELL backend */
+/* #undef SLAPD_SHELL */
+
+/* define to support SOCK backend */
+/* #undef SLAPD_SOCK */
+
+/* define to support SASL passwords */
+/* #undef SLAPD_SPASSWD */
+
+/* define to support SQL backend */
+/* #undef SLAPD_SQL */
+
+/* define to support WiredTiger backend */
+/* #undef SLAPD_WT */
+
+/* define to support run-time loadable ACL */
+/* #undef SLAP_DYNACL */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* set to urandom device */
+#define URANDOM_DEVICE "/dev/urandom"
+
+/* define to use OpenSSL BIGNUM for MP */
+/* #undef USE_MP_BIGNUM */
+
+/* define to use GMP for MP */
+/* #undef USE_MP_GMP */
+
+/* define to use 'long' for MP */
+/* #undef USE_MP_LONG */
+
+/* define to use 'long long' for MP */
+/* #undef USE_MP_LONG_LONG */
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to the type of arg 3 for `accept'. */
+#define ber_socklen_t socklen_t
+
+/* Define to `char *' if <sys/types.h> does not define. */
+/* #undef caddr_t */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef mode_t */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `int' if <signal.h> does not define. */
+/* #undef sig_atomic_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* define to snprintf routine */
+/* #undef snprintf */
+
+/* Define like ber_socklen_t if <sys/socket.h> does not define. */
+/* #undef socklen_t */
+
+/* Define to `signed int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
+
+/* define as empty if volatile is not supported */
+/* #undef volatile */
+
+/* define to snprintf routine */
+/* #undef vsnprintf */
+
+
+/* begin of portable.h.post */
+
+#ifdef _WIN32
+/* don't suck in all of the win32 api */
+# define WIN32_LEAN_AND_MEAN 1
+#endif
+
+#ifndef LDAP_NEEDS_PROTOTYPES
+/* force LDAP_P to always include prototypes */
+#define LDAP_NEEDS_PROTOTYPES 1
+#endif
+
+#ifndef LDAP_REL_ENG
+#if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL)
+#define LDAP_DEVEL
+#endif
+#if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
+#define LDAP_TEST
+#endif
+#endif
+
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_EBCDIC
+/* ASCII/EBCDIC converting replacements for stdio funcs
+ * vsnprintf and snprintf are used too, but they are already
+ * checked by the configure script
+ */
+#define fputs ber_pvt_fputs
+#define fgets ber_pvt_fgets
+#define printf ber_pvt_printf
+#define fprintf ber_pvt_fprintf
+#define vfprintf ber_pvt_vfprintf
+#define vsprintf ber_pvt_vsprintf
+#endif
+
+#include "ac/fdset.h"
+
+#include "ldap_cdefs.h"
+#include "ldap_features.h"
+
+#include "ac/assert.h"
+#include "ac/localize.h"
+
+#endif /* _LDAP_PORTABLE_H */
+/* end of portable.h.post */
+
diff --git a/contrib/openldap-cmake/linux_x86_64/include/portable.h b/contrib/openldap-cmake/linux_x86_64/include/portable.h
index 2924b6713a4..ab7052bda91 100644
--- a/contrib/openldap-cmake/linux_x86_64/include/portable.h
+++ b/contrib/openldap-cmake/linux_x86_64/include/portable.h
@@ -98,7 +98,9 @@
 #define HAVE_BCOPY 1
 
 /* Define to 1 if you have the <bits/types.h> header file. */
-#define HAVE_BITS_TYPES_H 1
+#if !defined(USE_MUSL)
+    #define HAVE_BITS_TYPES_H 1
+#endif
 
 /* Define to 1 if you have the `chroot' function. */
 #define HAVE_CHROOT 1
diff --git a/contrib/poco b/contrib/poco
index 7351c4691b5..39fd359765a 160000
--- a/contrib/poco
+++ b/contrib/poco
@@ -1 +1 @@
-Subproject commit 7351c4691b5d401f59e3959adfc5b4fa263b32da
+Subproject commit 39fd359765a3a77b46d94ec3c5def3c7802a920f
diff --git a/contrib/protobuf b/contrib/protobuf
index 75601841d17..c1c5d020260 160000
--- a/contrib/protobuf
+++ b/contrib/protobuf
@@ -1 +1 @@
-Subproject commit 75601841d172c73ae6bf4ce8121f42b875cdbabd
+Subproject commit c1c5d02026059f4c3cb51aaa08e82288d3e08b89
diff --git a/contrib/protobuf-cmake/CMakeLists.txt b/contrib/protobuf-cmake/CMakeLists.txt
index a4993030d04..37215b91dbb 100644
--- a/contrib/protobuf-cmake/CMakeLists.txt
+++ b/contrib/protobuf-cmake/CMakeLists.txt
@@ -10,8 +10,92 @@ else ()
     set(protobuf_BUILD_SHARED_LIBS ON CACHE INTERNAL "" FORCE)
 endif ()
 
+if (CMAKE_CROSSCOMPILING)
+    # Will build 'protoc' for host arch instead of cross-compiling
+    set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE INTERNAL "" FORCE)
+endif ()
+
 add_subdirectory("${protobuf_SOURCE_DIR}/cmake" "${protobuf_BINARY_DIR}")
 
+if (ENABLE_FUZZING)
+    # `protoc` will be built with sanitizer and it could fail during ClickHouse build
+    # It easily reproduces in oss-fuzz building pipeline
+    # To avoid this we can try to build `protoc` without any sanitizer with option `-fno-sanitize=all`, but
+    # it this case we will face with linker errors, because libcxx still will be built with sanitizer
+    # So, we can simply suppress all of these failures with a combination this flag and an environment variable
+    # export MSAN_OPTIONS=exit_code=0
+    target_compile_options(protoc PRIVATE "-fsanitize-recover=all")
+endif()
+
 # We don't want to stop compilation on warnings in protobuf's headers.
-# The following line overrides the value assigned by the command target_include_directories() in libprotobuf.cmake 
+# The following line overrides the value assigned by the command target_include_directories() in libprotobuf.cmake
 set_property(TARGET libprotobuf PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${protobuf_SOURCE_DIR}/src")
+
+if (CMAKE_CROSSCOMPILING)
+    # Build 'protoc' for host arch
+    set (PROTOC_BUILD_DIR "${protobuf_BINARY_DIR}/build")
+
+    if (NOT EXISTS "${PROTOC_BUILD_DIR}/protoc")
+
+        # This is quite ugly but I cannot make dependencies work propery.
+
+        execute_process(
+            COMMAND mkdir -p ${PROTOC_BUILD_DIR}
+            COMMAND_ECHO STDOUT)
+
+        execute_process(
+            COMMAND ${CMAKE_COMMAND}
+                "-G${CMAKE_GENERATOR}"
+                "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}"
+                "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
+                "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+                "-Dprotobuf_BUILD_TESTS=0"
+                "-Dprotobuf_BUILD_CONFORMANCE=0"
+                "-Dprotobuf_BUILD_EXAMPLES=0"
+                "-Dprotobuf_BUILD_PROTOC_BINARIES=1"
+                "${protobuf_SOURCE_DIR}/cmake"
+            WORKING_DIRECTORY "${PROTOC_BUILD_DIR}"
+            COMMAND_ECHO STDOUT)
+
+        execute_process(
+            COMMAND ${CMAKE_COMMAND} --build "${PROTOC_BUILD_DIR}"
+            COMMAND_ECHO STDOUT)
+    endif ()
+
+#    add_custom_command (
+#        OUTPUT ${PROTOC_BUILD_DIR}
+#        COMMAND mkdir -p ${PROTOC_BUILD_DIR})
+#
+#    add_custom_command (
+#        OUTPUT "${PROTOC_BUILD_DIR}/CMakeCache.txt"
+#
+#        COMMAND ${CMAKE_COMMAND}
+#             -G"${CMAKE_GENERATOR}"
+#             -DCMAKE_MAKE_PROGRAM="${CMAKE_MAKE_PROGRAM}"
+#             -DCMAKE_C_COMPILER="${CMAKE_C_COMPILER}"
+#             -DCMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}"
+#             -Dprotobuf_BUILD_TESTS=0
+#             -Dprotobuf_BUILD_CONFORMANCE=0
+#             -Dprotobuf_BUILD_EXAMPLES=0
+#             -Dprotobuf_BUILD_PROTOC_BINARIES=1
+#             "${protobuf_SOURCE_DIR}/cmake"
+#
+#         DEPENDS "${PROTOC_BUILD_DIR}"
+#         WORKING_DIRECTORY "${PROTOC_BUILD_DIR}"
+#         COMMENT "Configuring 'protoc' for host architecture."
+#         USES_TERMINAL)
+#
+#     add_custom_command (
+#         OUTPUT "${PROTOC_BUILD_DIR}/protoc"
+#         COMMAND ${CMAKE_COMMAND} --build "${PROTOC_BUILD_DIR}"
+#         DEPENDS "${PROTOC_BUILD_DIR}/CMakeCache.txt"
+#         COMMENT "Building 'protoc' for host architecture."
+#         USES_TERMINAL)
+#
+#     add_custom_target (protoc-host DEPENDS "${PROTOC_BUILD_DIR}/protoc")
+
+    add_executable(protoc IMPORTED GLOBAL)
+    set_target_properties (protoc PROPERTIES IMPORTED_LOCATION "${PROTOC_BUILD_DIR}/protoc")
+    add_dependencies(protoc "${PROTOC_BUILD_DIR}/protoc")
+
+endif ()
diff --git a/contrib/protobuf-cmake/protobuf_generate.cmake b/contrib/protobuf-cmake/protobuf_generate.cmake
index fc1dfd9cc11..3e30b4e40fd 100644
--- a/contrib/protobuf-cmake/protobuf_generate.cmake
+++ b/contrib/protobuf-cmake/protobuf_generate.cmake
@@ -181,11 +181,11 @@ function(protobuf_generate)
 
     add_custom_command(
       OUTPUT ${_generated_srcs}
-      COMMAND  protobuf::protoc
+      COMMAND $<TARGET_FILE:protoc>
       ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR} ${_dll_desc_out} ${_protobuf_include_path} ${_abs_file}
-      DEPENDS ${_abs_file} protobuf::protoc
+      DEPENDS ${_abs_file} protoc
       COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
-      VERBATIM )
+      VERBATIM)
   endforeach()
 
   set_source_files_properties(${_generated_srcs_all} PROPERTIES GENERATED TRUE)
diff --git a/contrib/replxx b/contrib/replxx
index c81be6c68b1..b0c266c2d8a 160000
--- a/contrib/replxx
+++ b/contrib/replxx
@@ -1 +1 @@
-Subproject commit c81be6c68b146f15f2096b7ef80e3f21fe27004c
+Subproject commit b0c266c2d8a835784181e17292b421848c78c6b8
diff --git a/contrib/rocksdb b/contrib/rocksdb
index b6480c69bf3..296c1b8b95f 160000
--- a/contrib/rocksdb
+++ b/contrib/rocksdb
@@ -1 +1 @@
-Subproject commit b6480c69bf3ab6e298e0d019a07fd4f69029b26a
+Subproject commit 296c1b8b95fd448b8097a1b2cc9f704ff4a73a2c
diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt
index e7ff1f548e3..4c4cdf07544 100644
--- a/contrib/rocksdb-cmake/CMakeLists.txt
+++ b/contrib/rocksdb-cmake/CMakeLists.txt
@@ -106,18 +106,6 @@ if(NOT MSVC)
   set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
 endif()
 
-CHECK_CXX_SOURCE_COMPILES("
-#include <cstdint>
-#include <nmmintrin.h>
-#include <wmmintrin.h>
-int main() {
-  volatile uint32_t x = _mm_crc32_u32(0, 0);
-  const auto a = _mm_set_epi64x(0, 0);
-  const auto b = _mm_set_epi64x(0, 0);
-  const auto c = _mm_clmulepi64_si128(a, b, 0x00);
-  auto d = _mm_cvtsi128_si64(c);
-}
-" HAVE_SSE42)
 unset(CMAKE_REQUIRED_FLAGS)
 if(HAVE_SSE42)
   add_definitions(-DHAVE_SSE42)
@@ -126,14 +114,7 @@ elseif(FORCE_SSE42)
   message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
 endif()
 
-CHECK_CXX_SOURCE_COMPILES("
-#if defined(_MSC_VER) && !defined(__thread)
-#define __thread __declspec(thread)
-#endif
-int main() {
-  static __thread int tls;
-}
-" HAVE_THREAD_LOCAL)
+set (HAVE_THREAD_LOCAL 1)
 if(HAVE_THREAD_LOCAL)
   add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
 endif()
@@ -174,7 +155,7 @@ endif()
 
 option(WITH_FALLOCATE "build with fallocate" ON)
 if(WITH_FALLOCATE)
-  CHECK_CXX_SOURCE_COMPILES("
+  CHECK_C_SOURCE_COMPILES("
 #include <fcntl.h>
 #include <linux/falloc.h>
 int main() {
@@ -187,7 +168,7 @@ int main() {
   endif()
 endif()
 
-CHECK_CXX_SOURCE_COMPILES("
+CHECK_C_SOURCE_COMPILES("
 #include <fcntl.h>
 int main() {
   int fd = open(\"/dev/null\", 0);
@@ -198,7 +179,7 @@ if(HAVE_SYNC_FILE_RANGE_WRITE)
   add_definitions(-DROCKSDB_RANGESYNC_PRESENT)
 endif()
 
-CHECK_CXX_SOURCE_COMPILES("
+CHECK_C_SOURCE_COMPILES("
 #include <pthread.h>
 int main() {
   (void) PTHREAD_MUTEX_ADAPTIVE_NP;
@@ -228,6 +209,11 @@ if(HAVE_AUXV_GETAUXVAL)
   add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
 endif()
 
+check_cxx_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
+if(HAVE_ELF_AUX_INFO)
+  add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
+endif()
+
 include_directories(${ROCKSDB_SOURCE_DIR})
 include_directories("${ROCKSDB_SOURCE_DIR}/include")
 if(WITH_FOLLY_DISTRIBUTED_MUTEX)
diff --git a/contrib/s2geometry b/contrib/s2geometry
index 20ea540d81f..38b7a290f92 160000
--- a/contrib/s2geometry
+++ b/contrib/s2geometry
@@ -1 +1 @@
-Subproject commit 20ea540d81f4575a3fc0aea585aac611bcd03ede
+Subproject commit 38b7a290f927cc372218c2094602b83e35b18c05
diff --git a/contrib/simdjson-cmake/CMakeLists.txt b/contrib/simdjson-cmake/CMakeLists.txt
index d3bcf6c046c..862d8dc50f8 100644
--- a/contrib/simdjson-cmake/CMakeLists.txt
+++ b/contrib/simdjson-cmake/CMakeLists.txt
@@ -4,3 +4,6 @@ set(SIMDJSON_SRC "${SIMDJSON_SRC_DIR}/simdjson.cpp")
 
 add_library(simdjson ${SIMDJSON_SRC})
 target_include_directories(simdjson SYSTEM PUBLIC "${SIMDJSON_INCLUDE_DIR}" PRIVATE "${SIMDJSON_SRC_DIR}")
+
+# simdjson is using its own CPU dispatching and get confused if we enable AVX/AVX2 flags.
+target_compile_options(simdjson PRIVATE -mno-avx -mno-avx2)
diff --git a/contrib/snappy-cmake/CMakeLists.txt b/contrib/snappy-cmake/CMakeLists.txt
new file mode 100644
index 00000000000..0407e8bb30d
--- /dev/null
+++ b/contrib/snappy-cmake/CMakeLists.txt
@@ -0,0 +1,47 @@
+set (SOURCE_DIR "${CMAKE_SOURCE_DIR}/contrib/snappy")
+
+set(SNAPPY_IS_BIG_ENDIAN 0)
+
+include(CheckIncludeFile)
+check_include_file("byteswap.h" HAVE_BYTESWAP_H)
+check_include_file("sys/endian.h" HAVE_SYS_ENDIAN_H)
+check_include_file("sys/mman.h" HAVE_SYS_MMAN_H)
+check_include_file("sys/resource.h" HAVE_SYS_RESOURCE_H)
+check_include_file("sys/time.h" HAVE_SYS_TIME_H)
+check_include_file("sys/uio.h" HAVE_SYS_UIO_H)
+check_include_file("unistd.h" HAVE_UNISTD_H)
+check_include_file("windows.h" HAVE_WINDOWS_H)
+
+set (HAVE_BUILTIN_EXPECT 1)
+set (HAVE_BUILTIN_CTZ 1)
+set (HAVE_FUNC_MMAP 1)
+set (HAVE_FUNC_SYSCONF 1)
+
+if (ARCH_AMD64 AND ENABLE_SSSE3)
+    set (SNAPPY_HAVE_SSSE3 1)
+else ()
+    set (SNAPPY_HAVE_SSSE3 0)
+endif ()
+
+configure_file(
+  "${SOURCE_DIR}/cmake/config.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+
+set(HAVE_SYS_UIO_H_01 1)
+
+configure_file(
+  "${SOURCE_DIR}/snappy-stubs-public.h.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/snappy-stubs-public.h")
+
+add_library(snappy "")
+target_sources(snappy
+  PRIVATE
+    "${SOURCE_DIR}/snappy-internal.h"
+    "${SOURCE_DIR}/snappy-stubs-internal.h"
+    "${SOURCE_DIR}/snappy-c.cc"
+    "${SOURCE_DIR}/snappy-sinksource.cc"
+    "${SOURCE_DIR}/snappy-stubs-internal.cc"
+    "${SOURCE_DIR}/snappy.cc")
+
+target_include_directories(snappy PUBLIC ${SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+target_compile_definitions(snappy PRIVATE -DHAVE_CONFIG_H)
diff --git a/contrib/sysroot b/contrib/sysroot
new file mode 160000
index 00000000000..6172893931e
--- /dev/null
+++ b/contrib/sysroot
@@ -0,0 +1 @@
+Subproject commit 6172893931e19b028f9cabb7095a44361be863df
diff --git a/contrib/zlib-ng b/contrib/zlib-ng
index db232d30b4c..6a5e93b9007 160000
--- a/contrib/zlib-ng
+++ b/contrib/zlib-ng
@@ -1 +1 @@
-Subproject commit db232d30b4c72fd58e6d7eae2d12cebf9c3d90db
+Subproject commit 6a5e93b9007782115f7f7e5235dedc81c4f1facb
diff --git a/debian/changelog b/debian/changelog
index 38f740ae062..460424bdb36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-clickhouse (21.9.1.1) unstable; urgency=low
+clickhouse (21.11.1.1) unstable; urgency=low
 
   * Modified source code
 
- -- clickhouse-release <clickhouse-release@yandex-team.ru>  Sat, 10 Jul 2021 08:22:49 +0300
+ -- clickhouse-release <clickhouse-release@yandex-team.ru>  Thu, 09 Sep 2021 12:03:26 +0300
diff --git a/debian/clickhouse-server.init b/debian/clickhouse-server.init
index 4e70d382b36..1dd87fe80ae 100755
--- a/debian/clickhouse-server.init
+++ b/debian/clickhouse-server.init
@@ -3,10 +3,17 @@
 # Provides:          clickhouse-server
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Required-Start:    $network
-# Required-Stop:     $network
+# Should-Start:      $time $network
+# Should-Stop:       $network
 # Short-Description: Yandex clickhouse-server daemon
 ### END INIT INFO
+#
+# NOTES:
+# - Should-* -- script can start if the listed facilities are missing, unlike Required-*
+#
+# For the documentation [1]:
+#
+#   [1]: https://wiki.debian.org/LSBInitScripts
 
 CLICKHOUSE_USER=clickhouse
 CLICKHOUSE_GROUP=${CLICKHOUSE_USER}
diff --git a/debian/clickhouse-server.service b/debian/clickhouse-server.service
index b9681f9279e..bc19235cb3a 100644
--- a/debian/clickhouse-server.service
+++ b/debian/clickhouse-server.service
@@ -1,7 +1,12 @@
 [Unit]
 Description=ClickHouse Server (analytic DBMS for big data)
 Requires=network-online.target
-After=network-online.target
+# NOTE: that After/Wants=time-sync.target is not enough, you need to ensure
+# that the time was adjusted already, if you use systemd-timesyncd you are
+# safe, but if you use ntp or some other daemon, you should configure it
+# additionaly.
+After=time-sync.target network-online.target
+Wants=time-sync.target
 
 [Service]
 Type=simple
@@ -16,4 +21,5 @@ LimitNOFILE=500000
 CapabilityBoundingSet=CAP_NET_ADMIN CAP_IPC_LOCK CAP_SYS_NICE
 
 [Install]
+# ClickHouse should not start from the rescue shell (rescue.target).
 WantedBy=multi-user.target
diff --git a/debian/control b/debian/control
index 9b34e982698..ac75b00df22 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,14 @@
 Source: clickhouse
 Section: database
 Priority: optional
-Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
+Maintainer: Alexey Milovidov <milovidov@clickhouse.com>
 Build-Depends: debhelper (>= 9),
                cmake | cmake3,
                ninja-build,
-               clang-11,
-               llvm-11,
+               clang-13,
+               llvm-13,
+               lld-13,
                libc6-dev,
-               libicu-dev,
-               libreadline-dev,
-               gperf,
                tzdata
 Standards-Version: 3.9.8
 
diff --git a/debian/rules b/debian/rules
index 73d1f3d3b34..4562d24bec4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,8 @@ endif
 
 CMAKE_FLAGS += -DENABLE_UTILS=0
 
-DEB_CC ?= $(shell which gcc-10 gcc-9 gcc | head -n1)
-DEB_CXX ?= $(shell which g++-10 g++-9 g++ | head -n1)
+DEB_CC ?= $(shell which gcc-11 gcc-10 gcc-9 gcc | head -n1)
+DEB_CXX ?= $(shell which g++-11 g++-10 g++-9 g++ | head -n1)
 
 ifdef DEB_CXX
     DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
diff --git a/docker-compose.yml b/docker-compose.yml
index 23773bd75d0..3e3cfc38218 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,14 +2,14 @@ version: "2"
 
 services:
   builder:
-    image: yandex/clickhouse-builder
+    image: clickhouse/clickhouse-builder
     build: docker/builder
   client:
-    image: yandex/clickhouse-client
+    image: clickhouse/clickhouse-client
     build: docker/client
     command: ['--host', 'server']
   server:
-    image: yandex/clickhouse-server
+    image: clickhouse/clickhouse-server
     build: docker/server
     ports:
       - 8123:8123
diff --git a/docker/bare/prepare b/docker/bare/prepare
index 912b16634c7..a6b271714fb 100755
--- a/docker/bare/prepare
+++ b/docker/bare/prepare
@@ -6,7 +6,7 @@ SRC_DIR=../..
 BUILD_DIR=${SRC_DIR}/build
 
 # BTW, .so files are acceptable from any Linux distribution for the last 12 years (at least).
-# See https://presentations.clickhouse.tech/cpp_russia_2020/ for the details.
+# See https://presentations.clickhouse.com/cpp_russia_2020/ for the details.
 
 mkdir root
 pushd root
diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile
index 199b5217d79..5a998ffbe3e 100644
--- a/docker/builder/Dockerfile
+++ b/docker/builder/Dockerfile
@@ -1,6 +1,8 @@
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/builder/build.sh b/docker/builder/build.sh
index d4cf662e91b..1025af3f96e 100755
--- a/docker/builder/build.sh
+++ b/docker/builder/build.sh
@@ -4,7 +4,7 @@ set -e
 #ccache -s # uncomment to display CCache statistics
 mkdir -p /server/build_docker
 cd /server/build_docker
-cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-11)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-11)"
+cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-13)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-13)"
 
 # Set the number of build jobs to the half of number of virtual CPU cores (rounded up).
 # By default, ninja use all virtual CPU cores, that leads to very high memory consumption without much improvement in build time.
diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile
index f17fa8ade16..926014da9e6 100644
--- a/docker/client/Dockerfile
+++ b/docker/client/Dockerfile
@@ -1,7 +1,9 @@
 FROM ubuntu:18.04
 
-ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.9.1.*
+ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/"
+ARG version=21.11.1.*
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install --yes --no-install-recommends \
diff --git a/docker/client/README.md b/docker/client/README.md
index b8cb51adb1e..bbcc7d60794 100644
--- a/docker/client/README.md
+++ b/docker/client/README.md
@@ -1,6 +1,6 @@
 # ClickHouse Client Docker Image
 
-For more information see [ClickHouse Server Docker Image](https://hub.docker.com/r/yandex/clickhouse-server/).
+For more information see [ClickHouse Server Docker Image](https://hub.docker.com/r/clickhouse/clickhouse-server/).
 
 ## License
 
diff --git a/docker/images.json b/docker/images.json
index e2e22468596..3e8adda868c 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -1,12 +1,12 @@
 {
     "docker/packager/deb": {
-        "name": "yandex/clickhouse-deb-builder",
+        "name": "clickhouse/deb-builder",
         "dependent": [
             "docker/packager/unbundled"
         ]
     },
     "docker/packager/binary": {
-        "name": "yandex/clickhouse-binary-builder",
+        "name": "clickhouse/binary-builder",
         "dependent": [
             "docker/test/split_build_smoke_test",
             "docker/test/pvs",
@@ -14,155 +14,157 @@
         ]
     },
     "docker/packager/unbundled": {
-        "name": "yandex/clickhouse-unbundled-builder",
+        "name": "clickhouse/unbundled-builder",
         "dependent": []
     },
     "docker/test/compatibility/centos": {
-        "name": "yandex/clickhouse-test-old-centos",
+        "name": "clickhouse/test-old-centos",
         "dependent": []
     },
     "docker/test/compatibility/ubuntu": {
-        "name": "yandex/clickhouse-test-old-ubuntu",
+        "name": "clickhouse/test-old-ubuntu",
         "dependent": []
     },
     "docker/test/integration/base": {
-        "name": "yandex/clickhouse-integration-test",
+        "name": "clickhouse/integration-test",
         "dependent": []
     },
     "docker/test/fuzzer": {
-        "name": "yandex/clickhouse-fuzzer",
+        "name": "clickhouse/fuzzer",
         "dependent": []
     },
     "docker/test/performance-comparison": {
-        "name": "yandex/clickhouse-performance-comparison",
+        "name": "clickhouse/performance-comparison",
         "dependent": []
     },
     "docker/test/pvs": {
-        "name": "yandex/clickhouse-pvs-test",
+        "name": "clickhouse/pvs-test",
         "dependent": []
     },
+    "docker/test/util": {
+        "name": "clickhouse/test-util",
+        "dependent": [
+            "docker/test/base",
+            "docker/test/fasttest"
+        ]
+    },
     "docker/test/stateless": {
-        "name": "yandex/clickhouse-stateless-test",
+        "name": "clickhouse/stateless-test",
         "dependent": [
             "docker/test/stateful",
             "docker/test/coverage",
             "docker/test/unit"
         ]
     },
-    "docker/test/stateless_pytest": {
-        "name": "yandex/clickhouse-stateless-pytest",
-        "dependent": []
-    },
     "docker/test/stateful": {
-        "name": "yandex/clickhouse-stateful-test",
+        "name": "clickhouse/stateful-test",
         "dependent": [
             "docker/test/stress"
         ]
     },
     "docker/test/coverage": {
-        "name": "yandex/clickhouse-test-coverage",
+        "name": "clickhouse/test-coverage",
         "dependent": []
     },
     "docker/test/unit": {
-        "name": "yandex/clickhouse-unit-test",
+        "name": "clickhouse/unit-test",
         "dependent": []
     },
     "docker/test/stress": {
-        "name": "yandex/clickhouse-stress-test",
+        "name": "clickhouse/stress-test",
         "dependent": []
     },
     "docker/test/split_build_smoke_test": {
-        "name": "yandex/clickhouse-split-build-smoke-test",
+        "name": "clickhouse/split-build-smoke-test",
         "dependent": []
     },
     "docker/test/codebrowser": {
-        "name": "yandex/clickhouse-codebrowser",
+        "name": "clickhouse/codebrowser",
         "dependent": []
     },
     "docker/test/integration/runner": {
-        "name": "yandex/clickhouse-integration-tests-runner",
+        "name": "clickhouse/integration-tests-runner",
         "dependent": []
     },
     "docker/test/testflows/runner": {
-        "name": "yandex/clickhouse-testflows-runner",
+        "name": "clickhouse/testflows-runner",
         "dependent": []
     },
     "docker/test/fasttest": {
-        "name": "yandex/clickhouse-fasttest",
+        "name": "clickhouse/fasttest",
         "dependent": []
     },
     "docker/test/style": {
-        "name": "yandex/clickhouse-style-test",
+        "name": "clickhouse/style-test",
         "dependent": []
     },
     "docker/test/integration/s3_proxy": {
-        "name": "yandex/clickhouse-s3-proxy",
+        "name": "clickhouse/s3-proxy",
         "dependent": []
     },
     "docker/test/integration/resolver": {
-        "name": "yandex/clickhouse-python-bottle",
+        "name": "clickhouse/python-bottle",
         "dependent": []
     },
     "docker/test/integration/helper_container": {
-        "name": "yandex/clickhouse-integration-helper",
+        "name": "clickhouse/integration-helper",
         "dependent": []
     },
     "docker/test/integration/mysql_golang_client": {
-        "name": "yandex/clickhouse-mysql-golang-client",
+        "name": "clickhouse/mysql-golang-client",
         "dependent": []
     },
     "docker/test/integration/mysql_java_client": {
-        "name": "yandex/clickhouse-mysql-java-client",
+        "name": "clickhouse/mysql-java-client",
         "dependent": []
     },
     "docker/test/integration/mysql_js_client": {
-        "name": "yandex/clickhouse-mysql-js-client",
+        "name": "clickhouse/mysql-js-client",
         "dependent": []
     },
     "docker/test/integration/mysql_php_client": {
-        "name": "yandex/clickhouse-mysql-php-client",
+        "name": "clickhouse/mysql-php-client",
         "dependent": []
     },
     "docker/test/integration/postgresql_java_client": {
-        "name": "yandex/clickhouse-postgresql-java-client",
+        "name": "clickhouse/postgresql-java-client",
         "dependent": []
     },
     "docker/test/integration/kerberos_kdc": {
-        "name": "yandex/clickhouse-kerberos-kdc",
+        "name": "clickhouse/kerberos-kdc",
         "dependent": []
     },
     "docker/test/base": {
-         "name": "yandex/clickhouse-test-base",
+         "name": "clickhouse/test-base",
          "dependent": [
             "docker/test/stateless",
             "docker/test/stateless_unbundled",
-            "docker/test/stateless_pytest",
             "docker/test/integration/base",
             "docker/test/fuzzer",
             "docker/test/keeper-jepsen"
          ]
     },
     "docker/packager/unbundled": {
-         "name": "yandex/clickhouse-unbundled-builder",
+         "name": "clickhouse/unbundled-builder",
          "dependent": [
             "docker/test/stateless_unbundled"
          ]
     },
     "docker/test/stateless_unbundled": {
-         "name": "yandex/clickhouse-stateless-unbundled-test",
+         "name": "clickhouse/stateless-unbundled-test",
          "dependent": [
          ]
     },
     "docker/test/integration/kerberized_hadoop": {
-        "name": "yandex/clickhouse-kerberized-hadoop",
+        "name": "clickhouse/kerberized-hadoop",
         "dependent": []
     },
     "docker/test/sqlancer": {
-        "name": "yandex/clickhouse-sqlancer-test",
+        "name": "clickhouse/sqlancer-test",
         "dependent": []
     },
     "docker/test/keeper-jepsen": {
-        "name": "yandex/clickhouse-keeper-jepsen-test",
+        "name": "clickhouse/keeper-jepsen-test",
         "dependent": []
     }
 }
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 29225bbfeb8..51d29b822e8 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,7 +1,9 @@
-#  docker build -t yandex/clickhouse-binary-builder .
+#  docker build -t clickhouse/binary-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install \
@@ -37,20 +39,18 @@ RUN apt-get update \
         bash \
         build-essential \
         ccache \
-        clang-11 \
-        clang-tidy-11 \
         cmake \
         curl \
-        g++-10 \
-        gcc-10 \
         gdb \
         git \
         gperf \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         libicu-dev \
         libreadline-dev \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
         moreutils \
         ninja-build \
         pigz \
@@ -93,22 +93,13 @@ RUN git clone https://github.com/tpoechtrager/cctools-port.git \
 # Download toolchain and SDK for Darwin
 RUN wget -nv https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.0.sdk.tar.xz
 
-# Download toolchain for ARM
-# It contains all required headers and libraries. Note that it's named as "gcc" but actually we are using clang for cross compiling.
-RUN wget -nv "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en" -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz
-
 # Download toolchain for FreeBSD 11.3
 RUN wget -nv https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
 
-# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
-# Current workaround is to use latest version proposed repo. Remove as soon as
-# gcc-10.2 appear in stable repo.
-RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
-
-RUN apt-get update \
-    && apt-get install gcc-10 g++-10 --yes
-
-RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
+# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
+    && apt-get update \
+    && apt-get install gcc-11 g++-11 --yes
 
 
 COPY build.sh /
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index d6614bbb9e2..f78af924b66 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -4,12 +4,8 @@ set -x -e
 
 mkdir -p build/cmake/toolchain/darwin-x86_64
 tar xJf MacOSX11.0.sdk.tar.xz -C build/cmake/toolchain/darwin-x86_64 --strip-components=1
-
 ln -sf darwin-x86_64 build/cmake/toolchain/darwin-aarch64
 
-mkdir -p build/cmake/toolchain/linux-aarch64
-tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build/cmake/toolchain/linux-aarch64 --strip-components=1
-
 mkdir -p build/cmake/toolchain/freebsd-x86_64
 tar xJf freebsd-11.3-toolchain.tar.xz -C build/cmake/toolchain/freebsd-x86_64 --strip-components=1
 
@@ -23,6 +19,7 @@ cd build/build_docker
 rm -f CMakeCache.txt
 # Read cmake arguments into array (possibly empty)
 read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
+env
 cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA "-DCMAKE_BUILD_TYPE=$BUILD_TYPE" "-DSANITIZE=$SANITIZER" -DENABLE_CHECK_HEAVY_BUILDS=1 "${CMAKE_FLAGS[@]}" ..
 
 ccache --show-config ||:
@@ -83,6 +80,16 @@ then
     mv "$COMBINED_OUTPUT.tgz" /output
 fi
 
+# Also build fuzzers if any sanitizer specified
+if [ -n "$SANITIZER" ]
+then
+  # Currently we are in build/build_docker directory
+  ../docker/packager/other/fuzzer.sh
+fi
+
+ccache --show-config ||:
+ccache --show-stats ||:
+
 if [ "${CCACHE_DEBUG:-}" == "1" ]
 then
     find . -name '*.ccache-*' -print0 \
@@ -95,4 +102,3 @@ then
     # files in place, and will fail because this directory is not writable.
     tar -cv -I pixz -f /output/ccache.log.txz "$CCACHE_LOGFILE"
 fi
-
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 241b691cd23..318b960e0b4 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -1,7 +1,9 @@
-# docker build -t yandex/clickhouse-deb-builder .
+# docker build -t clickhouse/deb-builder .
 FROM ubuntu:20.04
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
@@ -35,17 +37,17 @@ RUN curl -O https://clickhouse-datasets.s3.yandex.net/utils/1/dpkg-deb \
 RUN apt-get update \
     && apt-get install \
         alien \
-        clang-11 \
-        clang-tidy-11 \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
         cmake \
         debhelper \
         devscripts \
         gdb  \
         git \
         gperf \
-        lld-11 \
-        llvm-11 \
-        llvm-11-dev \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         moreutils \
         ninja-build \
         perl \
@@ -55,15 +57,11 @@ RUN apt-get update \
         tzdata \
         --yes --no-install-recommends
 
-# NOTE: For some reason we have outdated version of gcc-10 in ubuntu 20.04 stable.
-# Current workaround is to use latest version proposed repo. Remove as soon as
-# gcc-10.2 appear in stable repo.
-RUN echo 'deb http://archive.ubuntu.com/ubuntu/ focal-proposed restricted main multiverse universe' > /etc/apt/sources.list.d/proposed-repositories.list
+# NOTE: Seems like gcc-11 is too new for ubuntu20 repository
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
+    && apt-get update \
+    && apt-get install gcc-11 g++-11 --yes
 
-RUN apt-get update \
-    && apt-get install gcc-10 g++-10 --yes --no-install-recommends
-
-RUN rm /etc/apt/sources.list.d/proposed-repositories.list && apt-get update
 
 # This symlink required by gcc to find lld compiler
 RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
diff --git a/docker/packager/deb/build.sh b/docker/packager/deb/build.sh
index 4e14574b738..46f6404363d 100755
--- a/docker/packager/deb/build.sh
+++ b/docker/packager/deb/build.sh
@@ -23,12 +23,24 @@ then
   echo "Place $BINARY_OUTPUT to output"
   mkdir /output/binary ||: # if exists
   mv /build/obj-*/programs/clickhouse* /output/binary
+
   if [ "$BINARY_OUTPUT" = "tests" ]
   then
     mv /build/obj-*/src/unit_tests_dbms /output/binary
   fi
 fi
 
+# Also build fuzzers if any sanitizer specified
+if [ -n "$SANITIZER" ]
+then
+  # Script is supposed that we are in build directory.
+  mkdir -p build/build_docker
+  cd build/build_docker
+  # Launching build script
+  ../docker/packager/other/fuzzer.sh
+  cd
+fi
+
 ccache --show-config ||:
 ccache --show-stats ||:
 
diff --git a/docker/packager/other/fuzzer.sh b/docker/packager/other/fuzzer.sh
new file mode 100755
index 00000000000..baaf3c4bedf
--- /dev/null
+++ b/docker/packager/other/fuzzer.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# This script is responsible for building all fuzzers, and copy them to output directory
+# as an archive.
+# Script is supposed that we are in build directory.
+
+set -x -e
+
+printenv
+
+# Delete previous cache, because we add a new flags -DENABLE_FUZZING=1 and -DFUZZER=libfuzzer
+rm -f CMakeCache.txt
+read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}"
+# Hope, that the most part of files will be in cache, so we just link new executables
+# Please, add or change flags directly in cmake
+cmake --debug-trycompile --verbose=1 -DCMAKE_VERBOSE_MAKEFILE=1 -LA -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
+    -DSANITIZE="$SANITIZER" -DENABLE_FUZZING=1 -DFUZZER='libfuzzer' -DENABLE_PROTOBUF=1 -DUSE_INTERNAL_PROTOBUF_LIBRARY=1 "${CMAKE_FLAGS[@]}" ..
+
+FUZZER_TARGETS=$(find ../src -name '*_fuzzer.cpp' -execdir basename {} .cpp ';' | tr '\n' ' ')
+
+NUM_JOBS=$(($(nproc || grep -c ^processor /proc/cpuinfo)))
+
+mkdir -p /output/fuzzers
+for FUZZER_TARGET in $FUZZER_TARGETS
+do
+    # shellcheck disable=SC2086 # No quotes because I want it to expand to nothing if empty.
+    ninja $NINJA_FLAGS $FUZZER_TARGET -j $NUM_JOBS
+    # Find this binary in build directory and strip it
+    FUZZER_PATH=$(find ./src -name "$FUZZER_TARGET")
+    strip --strip-unneeded "$FUZZER_PATH"
+    mv "$FUZZER_PATH" /output/fuzzers
+done
+
+tar -zcvf /output/fuzzers.tar.gz /output/fuzzers
+rm -rf /output/fuzzers
diff --git a/docker/packager/packager b/docker/packager/packager
index c05c85d3e28..ae7b99200ee 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -9,9 +9,9 @@ import sys
 SCRIPT_PATH = os.path.realpath(__file__)
 
 IMAGE_MAP = {
-    "deb": "yandex/clickhouse-deb-builder",
-    "binary": "yandex/clickhouse-binary-builder",
-    "unbundled": "yandex/clickhouse-unbundled-builder"
+    "deb": "clickhouse/deb-builder",
+    "binary": "clickhouse/binary-builder",
+    "unbundled": "clickhouse/unbundled-builder"
 }
 
 def check_image_exists_locally(image_name):
@@ -61,6 +61,7 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     DARWIN_ARM_SUFFIX = "-darwin-aarch64"
     ARM_SUFFIX = "-aarch64"
     FREEBSD_SUFFIX = "-freebsd"
+    PPC_SUFFIX = '-ppc64le'
 
     result = []
     cmake_flags = ['$CMAKE_FLAGS', '-DADD_GDB_INDEX_FOR_GOLD=1']
@@ -69,13 +70,14 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     is_cross_darwin = compiler.endswith(DARWIN_SUFFIX)
     is_cross_darwin_arm = compiler.endswith(DARWIN_ARM_SUFFIX)
     is_cross_arm = compiler.endswith(ARM_SUFFIX)
+    is_cross_ppc = compiler.endswith(PPC_SUFFIX)
     is_cross_freebsd = compiler.endswith(FREEBSD_SUFFIX)
-    is_cross_compile = is_cross_darwin or is_cross_darwin_arm or is_cross_arm or is_cross_freebsd
+    is_cross_compile = is_cross_darwin or is_cross_darwin_arm or is_cross_arm or is_cross_freebsd or is_cross_ppc
 
     # Explicitly use LLD with Clang by default.
     # Don't force linker for cross-compilation.
     if is_clang and not is_cross_compile:
-        cmake_flags.append("-DLINKER_NAME=lld")
+        cmake_flags.append("-DLINKER_NAME=ld.lld")
 
     if is_cross_darwin:
         cc = compiler[:-len(DARWIN_SUFFIX)]
@@ -97,6 +99,9 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     elif is_cross_freebsd:
         cc = compiler[:-len(FREEBSD_SUFFIX)]
         cmake_flags.append("-DCMAKE_TOOLCHAIN_FILE=/build/cmake/freebsd/toolchain-x86_64.cmake")
+    elif is_cross_ppc:
+        cc = compiler[:-len(PPC_SUFFIX)]
+        cmake_flags.append("-DCMAKE_TOOLCHAIN_FILE=/build/cmake/linux/toolchain-ppc64le.cmake")
     else:
         cc = compiler
 
@@ -105,6 +110,9 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
     if image_type == "deb" or image_type == "unbundled":
         result.append("DEB_CC={}".format(cc))
         result.append("DEB_CXX={}".format(cxx))
+        # For building fuzzers
+        result.append("CC={}".format(cc))
+        result.append("CXX={}".format(cxx))
     elif image_type == "binary":
         result.append("CC={}".format(cc))
         result.append("CXX={}".format(cxx))
@@ -151,8 +159,14 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, image_typ
         cmake_flags.append('-DENABLE_TESTS=1')
         cmake_flags.append('-DUSE_GTEST=1')
 
+    # "Unbundled" build is not suitable for any production usage.
+    # But it is occasionally used by some developers.
+    # The whole idea of using unknown version of libraries from the OS distribution is deeply flawed.
+    # We wish these developers good luck.
     if unbundled:
-        cmake_flags.append('-DUNBUNDLED=1 -DUSE_INTERNAL_RDKAFKA_LIBRARY=1 -DENABLE_ARROW=0 -DENABLE_AVRO=0 -DENABLE_ORC=0 -DENABLE_PARQUET=0')
+        # We also disable all CPU features except basic x86_64.
+        # It is only slightly related to "unbundled" build, but it is a good place to test if code compiles without these instruction sets.
+        cmake_flags.append('-DUNBUNDLED=1 -DUSE_INTERNAL_RDKAFKA_LIBRARY=1 -DENABLE_ARROW=0 -DENABLE_AVRO=0 -DENABLE_ORC=0 -DENABLE_PARQUET=0 -DENABLE_SSSE3=0 -DENABLE_SSE41=0 -DENABLE_SSE42=0 -DENABLE_PCLMULQDQ=0 -DENABLE_POPCNT=0 -DENABLE_AVX=0 -DENABLE_AVX2=0')
 
     if split_binary:
         cmake_flags.append('-DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1')
@@ -195,7 +209,9 @@ if __name__ == "__main__":
     parser.add_argument("--output-dir", required=True)
     parser.add_argument("--build-type", choices=("debug", ""), default="")
     parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-darwin-aarch64", "clang-11-aarch64",
-                                               "clang-11-freebsd", "gcc-10"), default="clang-11")
+                                               "clang-12", "clang-12-darwin", "clang-12-darwin-aarch64", "clang-12-aarch64",
+                                               "clang-13", "clang-13-darwin", "clang-13-darwin-aarch64", "clang-13-aarch64", "clang-13-ppc64le",
+                                               "clang-11-freebsd", "clang-12-freebsd", "clang-13-freebsd", "gcc-11"), default="clang-13")
     parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
     parser.add_argument("--unbundled", action="store_true")
     parser.add_argument("--split-binary", action="store_true")
diff --git a/docker/packager/unbundled/Dockerfile b/docker/packager/unbundled/Dockerfile
index 07031aa2d1b..f3d8e1ea658 100644
--- a/docker/packager/unbundled/Dockerfile
+++ b/docker/packager/unbundled/Dockerfile
@@ -1,10 +1,12 @@
-# docker build -t yandex/clickhouse-unbundled-builder .
-FROM yandex/clickhouse-deb-builder
+# docker build -t clickhouse/unbundled-builder .
+FROM clickhouse/deb-builder
 
 RUN export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
     && wget -nv -O /tmp/arrow-keyring.deb "https://apache.jfrog.io/artifactory/arrow/ubuntu/apache-arrow-apt-source-latest-${CODENAME}.deb" \
     && dpkg -i /tmp/arrow-keyring.deb
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 # Libraries from OS are only needed to test the "unbundled" build (that is not used in production).
 RUN apt-get update \
     && apt-get install \
@@ -15,15 +17,7 @@ RUN apt-get update \
         devscripts \
         libc++-dev \
         libc++abi-dev \
-        libboost-program-options-dev \
-        libboost-system-dev \
-        libboost-filesystem-dev \
-        libboost-thread-dev \
-        libboost-iostreams-dev \
-        libboost-regex-dev \
-        libboost-context-dev \
-        libboost-coroutine-dev \
-        libboost-graph-dev \
+        libboost-all-dev \
         zlib1g-dev \
         liblz4-dev \
         libdouble-conversion-dev \
diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile
index 5da9e703f4d..48b59d1e754 100644
--- a/docker/server/Dockerfile
+++ b/docker/server/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 
-ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.9.1.*
+ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/"
+ARG version=21.11.1.*
 ARG gosu_ver=1.10
 
 # set non-empty deb_location_url url to create a docker image
@@ -12,7 +12,7 @@ ARG deb_location_url=""
 # set non-empty single_binary_location_url to create docker image
 # from a single binary url (useful for non-standard builds - with sanitizers, for arm64).
 # for example (run on aarch64 server):
-# docker build . --network host --build-arg single_binary_location_url="https://builds.clickhouse.tech/master/aarch64/clickhouse" -t altinity/clickhouse-server:master-testing-arm
+# docker build . --network host --build-arg single_binary_location_url="https://builds.clickhouse.com/master/aarch64/clickhouse" -t altinity/clickhouse-server:master-testing-arm
 # note: clickhouse-odbc-bridge is not supported there.
 ARG single_binary_location_url=""
 
@@ -26,6 +26,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 RUN groupadd -r clickhouse --gid=101 \
     && useradd -r -g clickhouse --uid=101 --home-dir=/var/lib/clickhouse --shell=/bin/bash clickhouse \
     && apt-get update \
diff --git a/docker/server/README.md b/docker/server/README.md
index 6f799d68185..c63bb980c13 100644
--- a/docker/server/README.md
+++ b/docker/server/README.md
@@ -6,30 +6,30 @@ ClickHouse is an open-source column-oriented database management system that all
 
 ClickHouse manages extremely large volumes of data in a stable and sustainable manner. It currently powers [Yandex.Metrica](https://metrica.yandex.com/), world’s [second largest](http://w3techs.com/technologies/overview/traffic_analysis/all) web analytics platform, with over 13 trillion database records and over 20 billion events a day, generating customized reports on-the-fly, directly from non-aggregated data. This system was successfully implemented at [CERN’s LHCb experiment](https://www.yandex.com/company/press_center/press_releases/2012/2012-04-10/) to store and process metadata on 10bn events with over 1000 attributes per event registered in 2011.
 
-For more information and documentation see https://clickhouse.yandex/.
+For more information and documentation see https://clickhouse.com/.
 
 ## How to use this image
 
 ### start server instance
 ```bash
-$ docker run -d --name some-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
+$ docker run -d --name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server
 ```
 
 By default ClickHouse will be accessible only via docker network. See the [networking section below](#networking).
 
 ### connect to it from a native client
 ```bash
-$ docker run -it --rm --link some-clickhouse-server:clickhouse-server yandex/clickhouse-client --host clickhouse-server
+$ docker run -it --rm --link some-clickhouse-server:clickhouse-server clickhouse/clickhouse-client --host clickhouse-server
 ```
 
-More information about [ClickHouse client](https://clickhouse.yandex/docs/en/interfaces/cli/).
+More information about [ClickHouse client](https://clickhouse.com/docs/en/interfaces/cli/).
 
 ### connect to it using curl
 
 ```bash
 echo "SELECT 'Hello, ClickHouse!'" | docker run -i --rm --link some-clickhouse-server:clickhouse-server curlimages/curl 'http://clickhouse-server:8123/?query=' -s --data-binary @-
 ```
-More information about [ClickHouse HTTP Interface](https://clickhouse.tech/docs/en/interfaces/http/).
+More information about [ClickHouse HTTP Interface](https://clickhouse.com/docs/en/interfaces/http/).
 
 ### stopping / removing the containter
 
@@ -43,7 +43,7 @@ $ docker rm some-clickhouse-server
 You can expose you ClickHouse running in docker by [mapping particular port](https://docs.docker.com/config/containers/container-networking/) from inside container to a host ports:
 
 ```bash
-$ docker run -d -p 18123:8123 -p19000:9000 --name some-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
+$ docker run -d -p 18123:8123 -p19000:9000 --name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server
 $ echo 'SELECT version()' | curl 'http://localhost:18123/' --data-binary @-
 20.12.3.3
 ```
@@ -51,7 +51,7 @@ $ echo 'SELECT version()' | curl 'http://localhost:18123/' --data-binary @-
 or by allowing container to use [host ports directly](https://docs.docker.com/network/host/) using `--network=host` (also allows archiving better network performance):
 
 ```bash
-$ docker run -d --network=host --name some-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
+$ docker run -d --network=host --name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server
 $ echo 'SELECT version()' | curl 'http://localhost:8123/' --data-binary @-
 20.12.3.3
 ```
@@ -67,7 +67,7 @@ Typically you may want to mount the following folders inside your container to a
 $ docker run -d \
 	-v $(realpath ./ch_data):/var/lib/clickhouse/ \
 	-v $(realpath ./ch_logs):/var/log/clickhouse-server/ \
-	--name some-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
+	--name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server
 ```
 
 You may also want to mount:
@@ -85,30 +85,30 @@ It is optional and can be enabled using the following [docker command line agrum
 ```bash
 $ docker run -d \
 	--cap-add=SYS_NICE --cap-add=NET_ADMIN --cap-add=IPC_LOCK \
-	--name some-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
+	--name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server
 ```
 
 ## Configuration
 
-Container exposes 8123 port for [HTTP interface](https://clickhouse.yandex/docs/en/interfaces/http_interface/) and 9000 port for [native client](https://clickhouse.yandex/docs/en/interfaces/tcp/).
+Container exposes 8123 port for [HTTP interface](https://clickhouse.com/docs/en/interfaces/http_interface/) and 9000 port for [native client](https://clickhouse.com/docs/en/interfaces/tcp/).
 
-ClickHouse configuration represented with a file "config.xml" ([documentation](https://clickhouse.yandex/docs/en/operations/configuration_files/))
+ClickHouse configuration represented with a file "config.xml" ([documentation](https://clickhouse.com/docs/en/operations/configuration_files/))
 
 ### Start server instance with custom configuration
 ```bash
-$ docker run -d --name some-clickhouse-server --ulimit nofile=262144:262144 -v /path/to/your/config.xml:/etc/clickhouse-server/config.xml yandex/clickhouse-server
+$ docker run -d --name some-clickhouse-server --ulimit nofile=262144:262144 -v /path/to/your/config.xml:/etc/clickhouse-server/config.xml clickhouse/clickhouse-server
 ```
 
 ### Start server as custom user
 ```
 # $(pwd)/data/clickhouse should exist and be owned by current user
-$ docker run --rm --user ${UID}:${GID} --name some-clickhouse-server --ulimit nofile=262144:262144 -v "$(pwd)/logs/clickhouse:/var/log/clickhouse-server" -v "$(pwd)/data/clickhouse:/var/lib/clickhouse" yandex/clickhouse-server
+$ docker run --rm --user ${UID}:${GID} --name some-clickhouse-server --ulimit nofile=262144:262144 -v "$(pwd)/logs/clickhouse:/var/log/clickhouse-server" -v "$(pwd)/data/clickhouse:/var/lib/clickhouse" clickhouse/clickhouse-server
 ```
 When you use the image with mounting local directories inside you probably would like to not mess your directory tree with files owner and permissions. Then you could use `--user` argument. In this case, you should mount every necessary directory (`/var/lib/clickhouse` and `/var/log/clickhouse-server`) inside the container. Otherwise, image will complain and not start.
 
 ### Start server from root (useful in case of userns enabled)
 ```
-$ docker run --rm -e CLICKHOUSE_UID=0 -e CLICKHOUSE_GID=0 --name clickhouse-server-userns -v "$(pwd)/logs/clickhouse:/var/log/clickhouse-server" -v "$(pwd)/data/clickhouse:/var/lib/clickhouse" yandex/clickhouse-server
+$ docker run --rm -e CLICKHOUSE_UID=0 -e CLICKHOUSE_GID=0 --name clickhouse-server-userns -v "$(pwd)/logs/clickhouse:/var/log/clickhouse-server" -v "$(pwd)/data/clickhouse:/var/lib/clickhouse" clickhouse/clickhouse-server
 ```
 
 ### How to create default database and user on starting
@@ -116,7 +116,7 @@ $ docker run --rm -e CLICKHOUSE_UID=0 -e CLICKHOUSE_GID=0 --name clickhouse-serv
 Sometimes you may want to create user (user named `default` is used by default) and database on image starting. You can do it using environment variables `CLICKHOUSE_DB`, `CLICKHOUSE_USER`, `CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT` and `CLICKHOUSE_PASSWORD`:
 
 ```
-$ docker run --rm -e CLICKHOUSE_DB=my_database -e CLICKHOUSE_USER=username -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1 -e CLICKHOUSE_PASSWORD=password -p 9000:9000/tcp yandex/clickhouse-server
+$ docker run --rm -e CLICKHOUSE_DB=my_database -e CLICKHOUSE_USER=username -e CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT=1 -e CLICKHOUSE_PASSWORD=password -p 9000:9000/tcp clickhouse/clickhouse-server
 ```
 
 ## How to extend this image
diff --git a/docker/server/alpine-build.sh b/docker/server/alpine-build.sh
index 329888f2fcb..1b448c61fbb 100755
--- a/docker/server/alpine-build.sh
+++ b/docker/server/alpine-build.sh
@@ -4,7 +4,7 @@ set -x
 REPO_CHANNEL="${REPO_CHANNEL:-stable}" # lts / testing / prestable / etc
 REPO_URL="${REPO_URL:-"https://repo.yandex.ru/clickhouse/tgz/${REPO_CHANNEL}"}"
 VERSION="${VERSION:-20.9.3.45}"
-DOCKER_IMAGE="${DOCKER_IMAGE:-yandex/clickhouse-server}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-clickhouse/clickhouse-server}"
 
 # where original files live
 DOCKER_BUILD_FOLDER="${BASH_SOURCE%/*}"
diff --git a/docker/server/docker_related_config.xml b/docker/server/docker_related_config.xml
index a1563c88b85..3025dc2697c 100644
--- a/docker/server/docker_related_config.xml
+++ b/docker/server/docker_related_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
      <!-- Listen wildcard address to allow accepting connections from other containers and host network. -->
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>
@@ -9,4 +9,4 @@
         <console>1</console>
     </logger>
     -->
-</yandex>
+</clickhouse>
diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index 40ba9f730cb..4dd54074d55 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -87,7 +87,7 @@ if [ -n "$CLICKHOUSE_USER" ] && [ "$CLICKHOUSE_USER" != "default" ] || [ -n "$CL
     echo "$0: create new user '$CLICKHOUSE_USER' instead 'default'"
     cat <<EOT > /etc/clickhouse-server/users.d/default-user.xml
     <yandex>
-      <!-- Docs: <https://clickhouse.tech/docs/en/operations/settings/settings_users/> -->
+      <!-- Docs: <https://clickhouse.com/docs/en/operations/settings/settings_users/> -->
       <users>
         <!-- Remove default user -->
         <default remove="remove">
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index 5768753cd7c..fc8c2ebbe6e 100644
--- a/docker/test/Dockerfile
+++ b/docker/test/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 
-ARG repository="deb https://repo.clickhouse.tech/deb/stable/ main/"
-ARG version=21.9.1.*
+ARG repository="deb https://repo.clickhouse.com/deb/stable/ main/"
+ARG version=21.11.1.*
 
 RUN apt-get update && \
     apt-get install -y apt-transport-https dirmngr && \
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index 29ac7a925b8..caaeff912e7 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -1,7 +1,9 @@
-# docker build -t yandex/clickhouse-test-base .
-FROM ubuntu:20.04
+# docker build -t clickhouse/test-base .
+FROM clickhouse/test-util
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile
index bb35258bed8..94aa321252b 100644
--- a/docker/test/codebrowser/Dockerfile
+++ b/docker/test/codebrowser/Dockerfile
@@ -1,6 +1,8 @@
-# docker build --network=host -t yandex/clickhouse-codebrowser .
-# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output yandex/clickhouse-codebrowser
-FROM yandex/clickhouse-binary-builder
+# docker build --network=host -t clickhouse/codebrowser .
+# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output clickhouse/codebrowser
+FROM clickhouse/binary-builder
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update && apt-get --yes --allow-unauthenticated install clang-9 libllvm9 libclang-9-dev
 
@@ -9,7 +11,7 @@ RUN apt-get update && apt-get --yes --allow-unauthenticated install clang-9 libl
 # https://github.com/ClickHouse-Extras/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
 RUN git clone https://github.com/ClickHouse-Extras/woboq_codebrowser
 
-RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-9 -DCMAKE_C_COMPILER=clang-9 && make -j
+RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-13 -DCMAKE_C_COMPILER=clang-13 && make -j
 
 ENV CODEGEN=/woboq_codebrowser/generator/codebrowser_generator
 ENV CODEINDEX=/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator
@@ -22,7 +24,7 @@ ENV SHA=nosha
 ENV DATA="data"
 
 CMD mkdir -p $BUILD_DIRECTORY && cd $BUILD_DIRECTORY && \
-    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-11 -DCMAKE_C_COMPILER=/usr/bin/clang-11 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
+    cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-13 -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
     mkdir -p $HTML_RESULT_DIRECTORY && \
     $CODEGEN -b $BUILD_DIRECTORY -a -o $HTML_RESULT_DIRECTORY -p ClickHouse:$SOURCE_DIRECTORY:$SHA -d $DATA | ts '%Y-%m-%d %H:%M:%S' && \
     cp -r $STATIC_DATA $HTML_RESULT_DIRECTORY/ &&\
diff --git a/docker/test/compatibility/centos/Dockerfile b/docker/test/compatibility/centos/Dockerfile
index 0ef119d1bb1..628609e374f 100644
--- a/docker/test/compatibility/centos/Dockerfile
+++ b/docker/test/compatibility/centos/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-old-centos .
+# docker build -t clickhouse/test-old-centos .
 FROM centos:5
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/docker/test/compatibility/ubuntu/Dockerfile b/docker/test/compatibility/ubuntu/Dockerfile
index 28f89e47b95..ddd0a76bd44 100644
--- a/docker/test/compatibility/ubuntu/Dockerfile
+++ b/docker/test/compatibility/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-test-old-ubuntu .
+# docker build -t clickhouse/test-old-ubuntu .
 FROM ubuntu:12.04
 
 CMD /bin/sh -c "/clickhouse server --config /config/config.xml > /var/log/clickhouse-server/stderr.log 2>&1 & \
diff --git a/docker/test/coverage/Dockerfile b/docker/test/coverage/Dockerfile
index 681f65e0f6f..ccf0bbc7c83 100644
--- a/docker/test/coverage/Dockerfile
+++ b/docker/test/coverage/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-test-coverage .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/test-coverage .
+FROM clickhouse/stateless-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/coverage/run.sh b/docker/test/coverage/run.sh
index 11b6ce13ea1..807efdf1e47 100755
--- a/docker/test/coverage/run.sh
+++ b/docker/test/coverage/run.sh
@@ -80,7 +80,7 @@ LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "RENAM
 LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "RENAME TABLE datasets.visits_v1 TO test.visits"
 LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-client --query "SHOW TABLES FROM test"
 
-LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test -j 8 --testname --shard --zookeeper --print-time --use-skip-list 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee /test_result.txt
+LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test -j 8 --testname --shard --zookeeper --print-time 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee /test_result.txt
 
 readarray -t FAILED_TESTS < <(awk '/FAIL|TIMEOUT|ERROR/ { print substr($3, 1, length($3)-1) }' "/test_result.txt")
 
@@ -97,7 +97,7 @@ then
 
     echo "Going to run again: ${FAILED_TESTS[*]}"
 
-    LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test --order=random --testname --shard --zookeeper --use-skip-list "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a /test_result.txt
+    LLVM_PROFILE_FILE='client_coverage_%5m.profraw' clickhouse-test --order=random --testname --shard --zookeeper "${FAILED_TESTS[@]}" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee -a /test_result.txt
 else
     echo "No failed tests"
 fi
diff --git a/docker/test/coverage/s3downloader b/docker/test/coverage/s3downloader
index 363ece8dac6..eb3b3cd9faf 100755
--- a/docker/test/coverage/s3downloader
+++ b/docker/test/coverage/s3downloader
@@ -92,7 +92,7 @@ if __name__ == "__main__":
             logging.info("Some exception occured %s", str(ex))
             raise
         finally:
-            logging.info("Will remove dowloaded file %s from filesystem if it exists", temp_archive_path)
+            logging.info("Will remove downloaded file %s from filesystem if it exists", temp_archive_path)
             if os.path.exists(temp_archive_path):
                 os.remove(temp_archive_path)
         logging.info("Processing of %s finished", dataset)
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index 916c94e7311..798910fb952 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -1,7 +1,9 @@
-#  docker build -t yandex/clickhouse-fasttest .
-FROM ubuntu:20.04
+#  docker build -t clickhouse/fasttest .
+FROM clickhouse/test-util
 
-ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=11
+ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
+
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
 
 RUN apt-get update \
     && apt-get install ca-certificates lsb-release wget gnupg apt-transport-https \
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 6419ea3659c..2e37522f1b4 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -9,7 +9,7 @@ trap 'kill $(jobs -pr) ||:' EXIT
 stage=${stage:-}
 
 # Compiler version, normally set by Dockerfile
-export LLVM_VERSION=${LLVM_VERSION:-11}
+export LLVM_VERSION=${LLVM_VERSION:-13}
 
 # A variable to pass additional flags to CMake.
 # Here we explicitly default it to nothing so that bash doesn't complain about
@@ -159,6 +159,7 @@ function clone_submodules
         cd "$FASTTEST_SOURCE"
 
         SUBMODULES_TO_UPDATE=(
+            contrib/magic_enum
             contrib/abseil-cpp
             contrib/boost
             contrib/zlib-ng
@@ -188,7 +189,7 @@ function clone_submodules
         )
 
         git submodule sync
-        git submodule update --depth 1 --init --recursive "${SUBMODULES_TO_UPDATE[@]}"
+        git submodule update --depth 1 --init "${SUBMODULES_TO_UPDATE[@]}"
         git submodule foreach git reset --hard
         git submodule foreach git checkout @ -f
         git submodule foreach git clean -xfd
@@ -261,142 +262,13 @@ function run_tests
 
     start_server
 
-    TESTS_TO_SKIP=(
-        00105_shard_collations
-        00109_shard_totals_after_having
-        00110_external_sort
-        00302_http_compression
-        00417_kill_query
-        00436_convert_charset
-        00490_special_line_separators_and_characters_outside_of_bmp
-        00652_replicated_mutations_zookeeper
-        00682_empty_parts_merge
-        00701_rollup
-        00834_cancel_http_readonly_queries_on_client_close
-        00911_tautological_compare
-
-        # Hyperscan
-        00926_multimatch
-        00929_multi_match_edit_distance
-        01681_hyperscan_debug_assertion
-
-        01176_mysql_client_interactive          # requires mysql client
-        01031_mutations_interpreter_and_context
-        01053_ssd_dictionary # this test mistakenly requires acces to /var/lib/clickhouse -- can't run this locally, disabled
-        01083_expressions_in_engine_arguments
-        01092_memory_profiler
-        01098_msgpack_format
-        01098_temporary_and_external_tables
-        01103_check_cpu_instructions_at_startup # avoid dependency on qemu -- invonvenient when running locally
-        01193_metadata_loading
-        01238_http_memory_tracking              # max_memory_usage_for_user can interfere another queries running concurrently
-        01251_dict_is_in_infinite_loop
-        01259_dictionary_custom_settings_ddl
-        01268_dictionary_direct_layout
-        01280_ssd_complex_key_dictionary
-        01281_group_by_limit_memory_tracking    # max_memory_usage_for_user can interfere another queries running concurrently
-        01318_encrypt                           # Depends on OpenSSL
-        01318_decrypt                           # Depends on OpenSSL
-        01663_aes_msan                          # Depends on OpenSSL
-        01667_aes_args_check                    # Depends on OpenSSL
-        01683_codec_encrypted                   # Depends on OpenSSL
-        01776_decrypt_aead_size_check           # Depends on OpenSSL
-        01811_filter_by_null                    # Depends on OpenSSL
-        01281_unsucceeded_insert_select_queries_counter
-        01292_create_user
-        01294_lazy_database_concurrent
-        01305_replica_create_drop_zookeeper
-        01354_order_by_tuple_collate_const
-        01355_ilike
-        01411_bayesian_ab_testing
-        01798_uniq_theta_sketch
-        01799_long_uniq_theta_sketch
-        01890_stem                               # depends on libstemmer_c
-        collate
-        collation
-        _orc_
-        arrow
-        avro
-        base64
-        brotli
-        capnproto
-        client
-        ddl_dictionaries
-        h3
-        hashing
-        hdfs
-        java_hash
-        json
-        limit_memory
-        live_view
-        memory_leak
-        memory_limit
-        mysql
-        odbc
-        parallel_alter
-        parquet
-        protobuf
-        secure
-        sha256
-        xz
-
-        # Not sure why these two fail even in sequential mode. Disabled for now
-        # to make some progress.
-        00646_url_engine
-        00974_query_profiler
-
-         # In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
-        01504_rocksdb
-        01686_rocksdb
-
-        # Look at DistributedFilesToInsert, so cannot run in parallel.
-        01460_DistributedFilesToInsert
-
-        01541_max_memory_usage_for_user_long
-
-        # Require python libraries like scipy, pandas and numpy
-        01322_ttest_scipy
-        01561_mann_whitney_scipy
-
-        01545_system_errors
-        # Checks system.errors
-        01563_distributed_query_finish
-
-        # nc - command not found
-        01601_proxy_protocol
-        01622_defaults_for_url_engine
-
-        # JSON functions
-        01666_blns
-
-        # Requires postgresql-client
-        01802_test_postgresql_protocol_with_row_policy
-
-        # Depends on AWS
-        01801_s3_cluster
-
-        # needs psql
-        01889_postgresql_protocol_null_fields
-
-        # needs pv
-        01923_network_receive_time_metric_insert
-
-        01889_sqlite_read_write
-
-        # needs s2
-        01849_geoToS2
-        01851_s2_to_geo
-        01852_s2_get_neighbours
-        01853_s2_cells_intersect
-        01854_s2_cap_contains
-        01854_s2_cap_union
-    )
-
-    time clickhouse-test --hung-check -j 8 --order=random --use-skip-list \
-            --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" \
+    set +e
+    time clickhouse-test --hung-check -j 8 --order=random \
+            --fast-tests-only --no-long --testname --shard --zookeeper \
             -- "$FASTTEST_FOCUS" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
-        | tee "$FASTTEST_OUTPUT/test_log.txt"
+        | tee "$FASTTEST_OUTPUT/test_result.txt"
+    set -e
 }
 
 case "$stage" in
@@ -445,6 +317,9 @@ case "$stage" in
     ;&
 "run_tests")
     run_tests
+    /process_functional_tests_result.py --in-results-dir "$FASTTEST_OUTPUT/" \
+        --out-results-file "$FASTTEST_OUTPUT/test_results.tsv" \
+        --out-status-file "$FASTTEST_OUTPUT/check_status.tsv" || echo -e "failure\tCannot parse results" > "$FASTTEST_OUTPUT/check_status.tsv"
     ;;
 *)
     echo "Unknown test stage '$stage'"
diff --git a/docker/test/fuzzer/Dockerfile b/docker/test/fuzzer/Dockerfile
index 57daba9cfd6..6444e745c47 100644
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@@ -1,10 +1,12 @@
-# docker build -t yandex/clickhouse-fuzzer .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/fuzzer .
+FROM clickhouse/test-base
 
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
             ca-certificates \
@@ -14,6 +16,8 @@ RUN apt-get update \
             p7zip-full \
             parallel \
             psmisc \
+            python3 \
+            python3-pip \
             rsync \
             tree \
             tzdata \
@@ -23,6 +27,8 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+RUN pip3 install Jinja2
+
 COPY * /
 
 SHELL ["/bin/bash", "-c"]
@@ -30,5 +36,5 @@ CMD set -o pipefail \
     && cd /workspace \
     && /run-fuzzer.sh 2>&1 | ts "$(printf '%%Y-%%m-%%d %%H:%%M:%%S\t')" | tee main.log
 
-# docker run --network=host --volume <workspace>:/workspace -e PR_TO_TEST=<> -e SHA_TO_TEST=<> yandex/clickhouse-fuzzer
+# docker run --network=host --volume <workspace>:/workspace -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/fuzzer
 
diff --git a/docker/test/fuzzer/generate-test-j2.py b/docker/test/fuzzer/generate-test-j2.py
new file mode 100755
index 00000000000..bcc1bf6bc84
--- /dev/null
+++ b/docker/test/fuzzer/generate-test-j2.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+from argparse import ArgumentParser
+import os
+import jinja2
+
+
+def removesuffix(text, suffix):
+    """
+    Added in python 3.9
+    https://www.python.org/dev/peps/pep-0616/
+    """
+    if suffix and text.endswith(suffix):
+        return text[:-len(suffix)]
+    else:
+        return text[:]
+
+
+def render_test_template(j2env, suite_dir, test_name):
+    """
+    Render template for test and reference file if needed
+    """
+
+    test_base_name = removesuffix(test_name, ".sql.j2")
+
+    reference_file_name = test_base_name + ".reference.j2"
+    reference_file_path = os.path.join(suite_dir, reference_file_name)
+    if os.path.isfile(reference_file_path):
+        tpl = j2env.get_template(reference_file_name)
+        tpl.stream().dump(os.path.join(suite_dir, test_base_name) + ".gen.reference")
+
+    if test_name.endswith(".sql.j2"):
+        tpl = j2env.get_template(test_name)
+        generated_test_name = test_base_name + ".gen.sql"
+        tpl.stream().dump(os.path.join(suite_dir, generated_test_name))
+        return generated_test_name
+
+    return test_name
+
+
+def main(args):
+    suite_dir = args.path
+
+    print(f"Scanning {suite_dir} directory...")
+
+    j2env = jinja2.Environment(
+        loader=jinja2.FileSystemLoader(suite_dir),
+        keep_trailing_newline=True,
+    )
+
+    test_names = os.listdir(suite_dir)
+    for test_name in test_names:
+        if not test_name.endswith(".sql.j2"):
+            continue
+        new_name = render_test_template(j2env, suite_dir, test_name)
+        print(f"File {new_name} generated")
+
+
+if __name__ == "__main__":
+    parser = ArgumentParser(description="Jinja2 test generator")
+    parser.add_argument("-p", "--path", help="Path to test dir", required=True)
+    main(parser.parse_args())
diff --git a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
index dd6b7467afc..2f09573f942 100644
--- a/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
+++ b/docker/test/fuzzer/query-fuzzer-tweaks-users.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_execution_time>10</max_execution_time>
@@ -17,4 +17,4 @@
             </constraints>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 3b074ae46cd..0c11e0a615d 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# shellcheck disable=SC2086
+# shellcheck disable=SC2086,SC2001,SC2046
 
 set -eux
 set -o pipefail
@@ -12,25 +12,49 @@ stage=${stage:-}
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 echo "$script_dir"
 repo_dir=ch
-BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-11_debug_none_bundled_unsplitted_disable_False_binary"}
+BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-13_debug_none_bundled_unsplitted_disable_False_binary"}
+BINARY_URL_TO_DOWNLOAD=${BINARY_URL_TO_DOWNLOAD:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse"}
 
 function clone
 {
-    # The download() function is dependent on CI binaries anyway, so we can take
-    # the repo from the CI as well. For local runs, start directly from the "fuzz"
-    # stage.
-    rm -rf ch ||:
-    mkdir ch ||:
-    wget -nv -nd -c "https://clickhouse-test-reports.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/repo/clickhouse_no_subs.tar.gz"
-    tar -C ch --strip-components=1 -xf clickhouse_no_subs.tar.gz
+    # For local runs, start directly from the "fuzz" stage.
+    rm -rf "$repo_dir" ||:
+    mkdir "$repo_dir" ||:
+
+    git clone --depth 1 https://github.com/ClickHouse/ClickHouse.git -- "$repo_dir" 2>&1 | ts '%Y-%m-%d %H:%M:%S'
+    (
+        cd "$repo_dir"
+        if [ "$PR_TO_TEST" != "0" ]; then
+            if git fetch --depth 1 origin "+refs/pull/$PR_TO_TEST/merge"; then
+                git checkout FETCH_HEAD
+                echo "Checked out pull/$PR_TO_TEST/merge ($(git rev-parse FETCH_HEAD))"
+            else
+                git fetch --depth 1 origin "+refs/pull/$PR_TO_TEST/head"
+                git checkout "$SHA_TO_TEST"
+                echo "Checked out nominal SHA $SHA_TO_TEST for PR $PR_TO_TEST"
+            fi
+            git diff --name-only master HEAD | tee ci-changed-files.txt
+        else
+            if [ -v COMMIT_SHA ]; then
+                git fetch --depth 2 origin "$SHA_TO_TEST"
+                git checkout "$SHA_TO_TEST"
+                echo "Checked out nominal SHA $SHA_TO_TEST for master"
+            else
+                git fetch --depth 2 origin
+                echo "Using default repository head $(git rev-parse HEAD)"
+            fi
+            git diff --name-only HEAD~1 HEAD | tee ci-changed-files.txt
+        fi
+        cd -
+    )
+
     ls -lath ||:
+
 }
 
 function download
 {
-    wget -nv -nd -c "https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/$BINARY_TO_DOWNLOAD/clickhouse" &
-    wget -nv -nd -c "https://clickhouse-test-reports.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/repo/ci-changed-files.txt" &
-    wait
+    wget -nv -nd -c "$BINARY_URL_TO_DOWNLOAD"
 
     chmod +x clickhouse
     ln -s ./clickhouse ./clickhouse-server
@@ -71,25 +95,51 @@ function watchdog
     kill -9 -- $fuzzer_pid ||:
 }
 
-function filter_exists
+function filter_exists_and_template
 {
     local path
     for path in "$@"; do
         if [ -e "$path" ]; then
-            echo "$path"
+            # SC2001 shellcheck suggests:
+            # echo ${path//.sql.j2/.gen.sql}
+            # but it doesn't allow to use regex
+            echo "$path" | sed 's/\.sql\.j2$/.gen.sql/'
         else
             echo "'$path' does not exists" >&2
         fi
     done
 }
 
+function stop_server
+{
+    clickhouse-client --query "select elapsed, query from system.processes" ||:
+    killall clickhouse-server ||:
+    for _ in {1..10}
+    do
+        if ! pgrep -f clickhouse-server
+        then
+            break
+        fi
+        sleep 1
+    done
+    killall -9 clickhouse-server ||:
+
+    # Debug.
+    date
+    sleep 10
+    jobs
+    pstree -aspgT
+}
+
 function fuzz
 {
+    /generate-test-j2.py --path ch/tests/queries/0_stateless
+
     # Obtain the list of newly added tests. They will be fuzzed in more extreme way than other tests.
     # Don't overwrite the NEW_TESTS_OPT so that it can be set from the environment.
-    NEW_TESTS="$(sed -n 's!\(^tests/queries/0_stateless/.*\.sql\)$!ch/\1!p' ci-changed-files.txt | sort -R)"
+    NEW_TESTS="$(sed -n 's!\(^tests/queries/0_stateless/.*\.sql\(\.j2\)\?\)$!ch/\1!p' $repo_dir/ci-changed-files.txt | sort -R)"
     # ci-changed-files.txt contains also files that has been deleted/renamed, filter them out.
-    NEW_TESTS="$(filter_exists $NEW_TESTS)"
+    NEW_TESTS="$(filter_exists_and_template $NEW_TESTS)"
     if [[ -n "$NEW_TESTS" ]]
     then
         NEW_TESTS_OPT="${NEW_TESTS_OPT:---interleave-queries-file ${NEW_TESTS}}"
@@ -97,9 +147,12 @@ function fuzz
         NEW_TESTS_OPT="${NEW_TESTS_OPT:-}"
     fi
 
-    export CLICKHOUSE_WATCHDOG_ENABLE=0 # interferes with gdb
-    clickhouse-server --config-file db/config.xml -- --path db 2>&1 | tail -100000 > server.log &
+    # interferes with gdb
+    export CLICKHOUSE_WATCHDOG_ENABLE=0
+    # NOTE: we use process substitution here to preserve keep $! as a pid of clickhouse-server
+    clickhouse-server --config-file db/config.xml -- --path db > >(tail -100000 > server.log) 2>&1 &
     server_pid=$!
+
     kill -0 $server_pid
 
     echo "
@@ -134,6 +187,7 @@ continue
     clickhouse-client \
         --receive_timeout=10 \
         --receive_data_timeout_ms=10000 \
+        --stacktrace \
         --query-fuzzer-runs=1000 \
         --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) \
         $NEW_TESTS_OPT \
@@ -175,25 +229,10 @@ continue
         server_died=1
     fi
 
-    # Stop the server.
-    clickhouse-client --query "select elapsed, query from system.processes" ||:
-    killall clickhouse-server ||:
-    for _ in {1..10}
-    do
-        if ! pgrep -f clickhouse-server
-        then
-            break
-        fi
-        sleep 1
-    done
-    killall -9 clickhouse-server ||:
-
-    # Debug.
-    date
-    sleep 10
-    jobs
-    pstree -aspgT
-
+    # wait in background to call wait in foreground and ensure that the
+    # process is alive, since w/o job control this is the only way to obtain
+    # the exit code
+    stop_server &
     server_exit_code=0
     wait $server_pid || server_exit_code=$?
     echo "Server exit code is $server_exit_code"
@@ -226,7 +265,7 @@ continue
         task_exit_code=$fuzzer_exit_code
         echo "failure" > status.txt
         { grep --text -o "Found error:.*" fuzzer.log \
-            || grep --text -o "Exception.*" fuzzer.log \
+            || grep --text -ao "Exception:.*" fuzzer.log \
             || echo "Fuzzer failed ($fuzzer_exit_code). See the logs." ; } \
             | tail -1 > description.txt
     fi
diff --git a/docker/test/integration/base/Dockerfile b/docker/test/integration/base/Dockerfile
index 344c1b9a698..519c64297e5 100644
--- a/docker/test/integration/base/Dockerfile
+++ b/docker/test/integration/base/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-integration-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/integration-test .
+FROM clickhouse/test-base
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/docker/test/integration/helper_container/Dockerfile b/docker/test/integration/helper_container/Dockerfile
index 922eb2c6f22..6a093081bf2 100644
--- a/docker/test/integration/helper_container/Dockerfile
+++ b/docker/test/integration/helper_container/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-integration-helper .
+# docker build -t clickhouse/integration-helper .
 # Helper docker container to run iptables without sudo
 
 FROM alpine
diff --git a/docker/test/integration/kerberized_hadoop/Dockerfile b/docker/test/integration/kerberized_hadoop/Dockerfile
index 6a2fd96e7a7..00944cbfc00 100644
--- a/docker/test/integration/kerberized_hadoop/Dockerfile
+++ b/docker/test/integration/kerberized_hadoop/Dockerfile
@@ -1,16 +1,22 @@
-# docker build -t yandex/clickhouse-kerberized-hadoop .
+# docker build -t clickhouse/kerberized-hadoop .
 
 FROM sequenceiq/hadoop-docker:2.7.0
-RUN sed -i -e 's/^\#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo
-RUN sed -i -e 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/CentOS-Base.repo
-RUN sed -i -e 's#http://mirror.centos.org/#http://vault.centos.org/#' /etc/yum.repos.d/CentOS-Base.repo
+
+RUN sed -i -e 's/^\#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo && \
+	sed -i -e 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/CentOS-Base.repo && \
+	sed -i -e 's#http://mirror.centos.org/#http://vault.centos.org/#' /etc/yum.repos.d/CentOS-Base.repo
+
+# https://community.letsencrypt.org/t/rhel-centos-6-openssl-client-compatibility-after-dst-root-ca-x3-expiration/161032/81
+RUN sed -i s/xMDkzMDE0MDExNVow/0MDkzMDE4MTQwM1ow/ /etc/pki/tls/certs/ca-bundle.crt
+
 RUN yum clean all && \
 	rpm --rebuilddb &&	\
 	yum -y update && \
 	yum -y install yum-plugin-ovl && \
 	yum --quiet -y install krb5-workstation.x86_64
+
 RUN cd /tmp && \
-	curl http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz   -o  commons-daemon-1.0.15-src.tar.gz && \
+	curl http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz -o commons-daemon-1.0.15-src.tar.gz && \
 	tar xzf commons-daemon-1.0.15-src.tar.gz && \
 	cd commons-daemon-1.0.15-src/src/native/unix && \
 	./configure && \
diff --git a/docker/test/integration/kerberos_kdc/Dockerfile b/docker/test/integration/kerberos_kdc/Dockerfile
index ea231b1191d..a203c33a331 100644
--- a/docker/test/integration/kerberos_kdc/Dockerfile
+++ b/docker/test/integration/kerberos_kdc/Dockerfile
@@ -1,9 +1,9 @@
-# docker build -t yandex/clickhouse-kerberos-kdc .
+# docker build -t clickhouse/kerberos-kdc .
+FROM centos:6
 
-FROM centos:6.6
-# old OS to make is faster and smaller
+RUN sed -i '/^mirrorlist/s/^/#/;/^#baseurl/{s/#//;s/mirror.centos.org\/centos\/$releasever/vault.centos.org\/6.10/}' /etc/yum.repos.d/*B*
 
-RUN yum install -y krb5-server krb5-libs krb5-auth-dialog krb5-workstation
+RUN yum install -y ca-certificates krb5-server krb5-libs krb5-auth-dialog krb5-workstation
 
 EXPOSE 88 749
 
diff --git a/docker/test/integration/mysql_golang_client/Dockerfile b/docker/test/integration/mysql_golang_client/Dockerfile
index 4380383d1fb..68b0aaab42c 100644
--- a/docker/test/integration/mysql_golang_client/Dockerfile
+++ b/docker/test/integration/mysql_golang_client/Dockerfile
@@ -1,7 +1,7 @@
-# docker build -t yandex/clickhouse-mysql-golang-client .
+# docker build -t clickhouse/mysql-golang-client .
 # MySQL golang client docker container
 
-FROM golang:1.12.2
+FROM golang:1.13
 
 RUN go get "github.com/go-sql-driver/mysql"
 
diff --git a/docker/test/integration/mysql_java_client/Dockerfile b/docker/test/integration/mysql_java_client/Dockerfile
index fcb6a39f33b..0abf50cd493 100644
--- a/docker/test/integration/mysql_java_client/Dockerfile
+++ b/docker/test/integration/mysql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-java-client .
+# docker build -t clickhouse/mysql-java-client .
 # MySQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/docker/test/integration/mysql_js_client/Dockerfile b/docker/test/integration/mysql_js_client/Dockerfile
index 4f12de004ac..b1397b40d38 100644
--- a/docker/test/integration/mysql_js_client/Dockerfile
+++ b/docker/test/integration/mysql_js_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-js-client .
+# docker build -t clickhouse/mysql-js-client .
 # MySQL JavaScript client docker container
 
 FROM node:8
diff --git a/docker/test/integration/mysql_php_client/Dockerfile b/docker/test/integration/mysql_php_client/Dockerfile
index e2ceb62f44f..0fb77bf8ffb 100644
--- a/docker/test/integration/mysql_php_client/Dockerfile
+++ b/docker/test/integration/mysql_php_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-mysql-php-client .
+# docker build -t clickhouse/mysql-php-client .
 # MySQL PHP client docker container
 
 FROM php:7.3-cli
diff --git a/docker/test/integration/postgresql_java_client/Dockerfile b/docker/test/integration/postgresql_java_client/Dockerfile
index eab236c9590..f5484028ec9 100644
--- a/docker/test/integration/postgresql_java_client/Dockerfile
+++ b/docker/test/integration/postgresql_java_client/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-postgresql-java-client .
+# docker build -t clickhouse/postgresql-java-client .
 # PostgreSQL Java client docker container
 
 FROM ubuntu:18.04
diff --git a/docker/test/integration/resolver/Dockerfile b/docker/test/integration/resolver/Dockerfile
index b0efb4b46d5..01b9b777614 100644
--- a/docker/test/integration/resolver/Dockerfile
+++ b/docker/test/integration/resolver/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-python-bottle .
+# docker build -t clickhouse/python-bottle .
 # Helper docker container to run python bottle apps
 
 FROM python:3
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index 6bde4ef60db..06e1f64ced2 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -1,6 +1,8 @@
-# docker build -t yandex/clickhouse-integration-tests-runner .
+# docker build -t clickhouse/integration-tests-runner .
 FROM ubuntu:20.04
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 RUN apt-get update \
     && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     ca-certificates \
@@ -77,8 +79,9 @@ RUN python3 -m pip install \
     pytest-timeout \
     pytest-xdist \
     pytest-repeat \
+    pytz \
     redis \
-    tzlocal \
+    tzlocal==2.1 \
     urllib3 \
     requests-kerberos \
     pyhdfs
@@ -95,6 +98,8 @@ RUN set -x \
   && echo 'dockremap:165536:65536' >> /etc/subuid \
     && echo 'dockremap:165536:65536' >> /etc/subgid
 
+RUN echo '127.0.0.1 localhost test.com' >> /etc/hosts
+
 EXPOSE 2375
 ENTRYPOINT ["dockerd-entrypoint.sh"]
 CMD ["sh", "-c", "pytest $PYTEST_OPTS"]
diff --git a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
index a65ef629df6..b3686adc21c 100644
--- a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
+++ b/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   bridge1:
-    image: yandex/clickhouse-jdbc-bridge
+    image: clickhouse/jdbc-bridge
     command: |
       /bin/bash -c 'cat << EOF > config/datasources/self.json
       {
diff --git a/docker/test/integration/runner/compose/docker_compose_keeper.yml b/docker/test/integration/runner/compose/docker_compose_keeper.yml
index e11a13e6eab..134ffbff1f7 100644
--- a/docker/test/integration/runner/compose/docker_compose_keeper.yml
+++ b/docker/test/integration/runner/compose/docker_compose_keeper.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
     zoo1:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
@@ -31,7 +31,7 @@ services:
             - inet6
             - rotate
     zoo2:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
@@ -61,7 +61,7 @@ services:
             - inet6
             - rotate
     zoo3:
-        image: ${image:-yandex/clickhouse-integration-test}
+        image: ${image:-clickhouse/integration-test}
         restart: always
         user: ${user:-}
         volumes:
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
index b09e75a8515..88be3e45085 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
@@ -4,7 +4,7 @@ services:
   kerberizedhdfs1:
     cap_add:
       - DAC_READ_SEARCH
-    image: yandex/clickhouse-kerberized-hadoop:16621
+    image: clickhouse/kerberized-hadoop
     hostname: kerberizedhdfs1
     restart: always
     volumes:
@@ -22,7 +22,7 @@ services:
     entrypoint: /etc/bootstrap.sh -d
 
   hdfskerberos:
-    image: yandex/clickhouse-kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: hdfskerberos
     volumes:
       - ${KERBERIZED_HDFS_DIR}/secrets:/tmp/keytab
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml b/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
index 081b90c4f27..d57e4e4d5be 100644
--- a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
+++ b/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
@@ -50,7 +50,7 @@ services:
       - label:disable
 
   kafka_kerberos:
-    image: yandex/clickhouse-kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
+    image: clickhouse/kerberos-kdc:${DOCKER_KERBEROS_KDC_TAG:-latest}
     hostname: kafka_kerberos
     volumes:
       - ${KERBERIZED_KAFKA_DIR}/secrets:/tmp/keytab
diff --git a/docker/test/integration/runner/compose/docker_compose_minio.yml b/docker/test/integration/runner/compose/docker_compose_minio.yml
index 96a5f8bdc31..6e8c826b234 100644
--- a/docker/test/integration/runner/compose/docker_compose_minio.yml
+++ b/docker/test/integration/runner/compose/docker_compose_minio.yml
@@ -2,7 +2,9 @@ version: '2.3'
 
 services:
   minio1:
-    image: minio/minio
+    # Newer version of minio results in such errors:
+    # "AWSErrorMarshaller: Encountered AWSError 'InternalError': We encountered an internal error, please try again"
+    image: minio/minio:RELEASE.2021-09-23T04-46-24Z
     volumes:
       - data1-1:/data1
       - ${MINIO_CERTS_DIR:-}:/certs
@@ -19,14 +21,14 @@ services:
 
   # HTTP proxies for Minio.
   proxy1:
-    image: yandex/clickhouse-s3-proxy
+    image: clickhouse/s3-proxy
     expose:
       - "8080" # Redirect proxy port
       - "80"   # Reverse proxy port
       - "443"  # Reverse proxy port (secure)
 
   proxy2:
-    image: yandex/clickhouse-s3-proxy
+    image: clickhouse/s3-proxy
     expose:
       - "8080"
       - "80"
@@ -34,7 +36,7 @@ services:
 
   # Empty container to run proxy resolver.
   resolver:
-    image: yandex/clickhouse-python-bottle
+    image: clickhouse/python-bottle
     expose:
       - "8080"
     tty: true
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
index a6a338eb6a8..56cc0410574 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   golang1:
-    image: yandex/clickhouse-mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-golang-client:${DOCKER_MYSQL_GOLANG_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
index 21d927df82c..eb5ffb01baa 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   java1:
-    image: yandex/clickhouse-mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-java-client:${DOCKER_MYSQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
index dbd85cf2382..90939449c5f 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   mysqljs1:
-    image: yandex/clickhouse-mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-js-client:${DOCKER_MYSQL_JS_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml b/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
index f24f5337a7e..408b8ff089a 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
@@ -1,6 +1,6 @@
 version: '2.3'
 services:
   php1:
-    image: yandex/clickhouse-mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
+    image: clickhouse/mysql-php-client:${DOCKER_MYSQL_PHP_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/runner/compose/docker_compose_nginx.yml b/docker/test/integration/runner/compose/docker_compose_nginx.yml
new file mode 100644
index 00000000000..d0fb9fc1ff4
--- /dev/null
+++ b/docker/test/integration/runner/compose/docker_compose_nginx.yml
@@ -0,0 +1,11 @@
+version: '2.3'
+services:
+    # nginx server to host static files.
+    # Accepts only PUT data by test.com/path and GET already existing data on test.com/path.
+    # Files will be put into /usr/share/nginx/files.
+
+    nginx:
+        image: kssenii/nginx-test:1.1
+        restart: always
+        ports:
+            - 80:80
diff --git a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml b/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
index 38191f1bdd6..904bfffdfd5 100644
--- a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
+++ b/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
@@ -1,6 +1,6 @@
 version: '2.2'
 services:
   java:
-    image: yandex/clickhouse-postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
+    image: clickhouse/postgresql-java-client:${DOCKER_POSTGRESQL_JAVA_CLIENT_TAG:-latest}
     # to keep container running
     command: sleep infinity
diff --git a/docker/test/integration/s3_proxy/Dockerfile b/docker/test/integration/s3_proxy/Dockerfile
index d8b1754fa71..5858218e4e4 100644
--- a/docker/test/integration/s3_proxy/Dockerfile
+++ b/docker/test/integration/s3_proxy/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t yandex/clickhouse-s3-proxy .
+# docker build -t clickhouse/s3-proxy .
 FROM nginx:alpine
 
 COPY run.sh /run.sh
diff --git a/docker/test/keeper-jepsen/Dockerfile b/docker/test/keeper-jepsen/Dockerfile
index 1a62d5e793f..5bb7f9433c2 100644
--- a/docker/test/keeper-jepsen/Dockerfile
+++ b/docker/test/keeper-jepsen/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-keeper-jepsen-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/keeper-jepsen-test .
+FROM clickhouse/test-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV CLOJURE_VERSION=1.10.3.814
diff --git a/docker/test/keeper-jepsen/run.sh b/docker/test/keeper-jepsen/run.sh
index 352585e16e3..d7534270e2c 100644
--- a/docker/test/keeper-jepsen/run.sh
+++ b/docker/test/keeper-jepsen/run.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 
-CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-11_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
+CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-13_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
 CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}
 
 
diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index 5ec048de657..73d9454ab7f 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -1,10 +1,12 @@
-# docker build -t yandex/clickhouse-performance-comparison .
+# docker build -t clickhouse/performance-comparison .
 FROM ubuntu:18.04
 
 ENV LANG=C.UTF-8
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
             bash \
@@ -31,7 +33,7 @@ RUN apt-get update \
             tzdata \
             vim \
             wget \
-    && pip3 --no-cache-dir install 'git+https://github.com/mymarilyn/clickhouse-driver.git' scipy \
+    && pip3 --no-cache-dir install 'clickhouse-driver==0.2.1' scipy \
     && apt-get purge --yes python3-dev g++ \
     && apt-get autoremove --yes \
     && apt-get clean \
@@ -52,4 +54,4 @@ COPY * /
 # it gives '/bin/sh: 1: [bash,: not found' otherwise.
 CMD ["bash", "-c", "node=$((RANDOM % $(numactl --hardware | sed -n 's/^.*available:\\(.*\\)nodes.*$/\\1/p'))); echo Will bind to NUMA node $node; numactl --cpunodebind=$node --membind=$node /entrypoint.sh"]
 
-# docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> yandex/clickhouse-performance-comparison
+# docker run --network=host --volume <workspace>:/workspace --volume=<output>:/output -e PR_TO_TEST=<> -e SHA_TO_TEST=<> clickhouse/performance-comparison
diff --git a/docker/test/performance-comparison/README.md b/docker/test/performance-comparison/README.md
index 782644a81dd..75213fad077 100644
--- a/docker/test/performance-comparison/README.md
+++ b/docker/test/performance-comparison/README.md
@@ -116,7 +116,7 @@ pull requests (0 for master) manually.
 docker run --network=host --volume=$(pwd)/workspace:/workspace --volume=$(pwd)/output:/output
     [-e REF_PR={} -e REF_SHA={}]
     -e PR_TO_TEST={} -e SHA_TO_TEST={}
-    yandex/clickhouse-performance-comparison
+    clickhouse/performance-comparison
 ```
 
 Then see the `report.html` in the `output` directory.
diff --git a/docker/test/performance-comparison/compare-releases.sh b/docker/test/performance-comparison/compare-releases.sh
index 456661362b3..dc7681815d4 100755
--- a/docker/test/performance-comparison/compare-releases.sh
+++ b/docker/test/performance-comparison/compare-releases.sh
@@ -21,9 +21,9 @@ function download_package() # (version, path)
     version="$1"
     path="$2"
     cd "$path"
-    wget -nv -nd -nc "https://repo.clickhouse.tech/deb/stable/main/clickhouse-common-static-dbg_${version}_amd64.deb" ||:
-    wget -nv -nd -nc "https://repo.clickhouse.tech/deb/stable/main/clickhouse-common-static_${version}_amd64.deb" ||:
-    wget -nv -nd -nc "https://repo.clickhouse.tech/deb/stable/main/clickhouse-test_${version}_all.deb" ||:
+    wget -nv -nd -nc "https://repo.clickhouse.com/deb/stable/main/clickhouse-common-static-dbg_${version}_amd64.deb" ||:
+    wget -nv -nd -nc "https://repo.clickhouse.com/deb/stable/main/clickhouse-common-static_${version}_amd64.deb" ||:
+    wget -nv -nd -nc "https://repo.clickhouse.com/deb/stable/main/clickhouse-test_${version}_all.deb" ||:
     mkdir tmp ||:
     for x in *.deb; do dpkg-deb -x "$x" tmp ; done
     mv tmp/usr/bin/clickhouse ./clickhouse
diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index a6e1ee482d6..38595d47528 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -196,7 +196,6 @@ function run_tests
         test_files=$(ls "$test_prefix" | grep "$CHPC_TEST_GREP" | xargs -I{} -n1 readlink -f "$test_prefix/{}")
     elif [ "$PR_TO_TEST" -ne 0 ] \
         && [ "$(wc -l < changed-test-definitions.txt)" -gt 0 ] \
-        && [ "$(wc -l < changed-test-scripts.txt)" -eq 0 ] \
         && [ "$(wc -l < other-changed-files.txt)" -eq 0 ]
     then
         # If only the perf tests were changed in the PR, we will run only these
@@ -208,15 +207,15 @@ function run_tests
         test_files=$(ls "$test_prefix"/*.xml)
     fi
 
-    # For PRs w/o changes in test definitons and scripts, test only a subset of
-    # queries, and run them less times. If the corresponding environment variables
-    # are already set, keep those values.
-    if [ "$PR_TO_TEST" -ne 0 ] \
-        && [ "$(wc -l < changed-test-definitions.txt)" -eq 0 ] \
-        && [ "$(wc -l < changed-test-scripts.txt)" -eq 0 ]
+    # For PRs w/o changes in test definitons, test only a subset of queries,
+    # and run them less times. If the corresponding environment variables are
+    # already set, keep those values.
+    #
+    # NOTE: too high CHPC_RUNS/CHPC_MAX_QUERIES may hit internal CI timeout.
+    if [ "$PR_TO_TEST" -ne 0 ] && [ "$(wc -l < changed-test-definitions.txt)" -eq 0 ]
     then
         CHPC_RUNS=${CHPC_RUNS:-7}
-        CHPC_MAX_QUERIES=${CHPC_MAX_QUERIES:-20}
+        CHPC_MAX_QUERIES=${CHPC_MAX_QUERIES:-10}
     else
         CHPC_RUNS=${CHPC_RUNS:-13}
         CHPC_MAX_QUERIES=${CHPC_MAX_QUERIES:-0}
@@ -319,14 +318,14 @@ function get_profiles
 
     wait
 
-    clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.query_log where type = 'QueryFinish' format TSVWithNamesAndTypes" > left-query-log.tsv ||: &
+    clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.query_log where type in ('QueryFinish', 'ExceptionWhileProcessing') format TSVWithNamesAndTypes" > left-query-log.tsv ||: &
     clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.query_thread_log format TSVWithNamesAndTypes" > left-query-thread-log.tsv ||: &
     clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.trace_log format TSVWithNamesAndTypes" > left-trace-log.tsv ||: &
     clickhouse-client --port $LEFT_SERVER_PORT --query "select arrayJoin(trace) addr, concat(splitByChar('/', addressToLine(addr))[-1], '#', demangle(addressToSymbol(addr)) ) name from system.trace_log group by addr format TSVWithNamesAndTypes" > left-addresses.tsv ||: &
     clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.metric_log format TSVWithNamesAndTypes" > left-metric-log.tsv ||: &
     clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.asynchronous_metric_log format TSVWithNamesAndTypes" > left-async-metric-log.tsv ||: &
 
-    clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.query_log where type = 'QueryFinish' format TSVWithNamesAndTypes" > right-query-log.tsv ||: &
+    clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.query_log where type in ('QueryFinish', 'ExceptionWhileProcessing') format TSVWithNamesAndTypes" > right-query-log.tsv ||: &
     clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.query_thread_log format TSVWithNamesAndTypes" > right-query-thread-log.tsv ||: &
     clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.trace_log format TSVWithNamesAndTypes" > right-trace-log.tsv ||: &
     clickhouse-client --port $RIGHT_SERVER_PORT --query "select arrayJoin(trace) addr, concat(splitByChar('/', addressToLine(addr))[-1], '#', demangle(addressToSymbol(addr)) ) name from system.trace_log group by addr format TSVWithNamesAndTypes" > right-addresses.tsv ||: &
@@ -641,6 +640,7 @@ create view partial_query_times as select * from
 -- Report for partial queries that we could only run on the new server (e.g.
 -- queries with new functions added in the tested PR).
 create table partial_queries_report engine File(TSV, 'report/partial-queries-report.tsv')
+    settings output_format_decimal_trailing_zeros = 1
     as select toDecimal64(time_median, 3) time,
         toDecimal64(time_stddev / time_median, 3) relative_time_stddev,
         test, query_index, query_display_name
@@ -713,8 +713,9 @@ create table queries engine File(TSVWithNamesAndTypes, 'report/queries.tsv')
     order by test, query_index, metric_name
     ;
 
-create table changed_perf_report engine File(TSV, 'report/changed-perf.tsv') as
-    with
+create table changed_perf_report engine File(TSV, 'report/changed-perf.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as with
         -- server_time is sometimes reported as zero (if it's less than 1 ms),
         -- so we have to work around this to not get an error about conversion
         -- of NaN to decimal.
@@ -730,8 +731,9 @@ create table changed_perf_report engine File(TSV, 'report/changed-perf.tsv') as
         changed_fail, test, query_index, query_display_name
     from queries where changed_show order by abs(diff) desc;
 
-create table unstable_queries_report engine File(TSV, 'report/unstable-queries.tsv') as
-    select
+create table unstable_queries_report engine File(TSV, 'report/unstable-queries.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as select
         toDecimal64(left, 3), toDecimal64(right, 3), toDecimal64(diff, 3),
         toDecimal64(stat_threshold, 3), unstable_fail, test, query_index, query_display_name
     from queries where unstable_show order by stat_threshold desc;
@@ -761,8 +763,9 @@ create view total_speedup as
     from test_speedup
     ;
 
-create table test_perf_changes_report engine File(TSV, 'report/test-perf-changes.tsv') as
-    with
+create table test_perf_changes_report engine File(TSV, 'report/test-perf-changes.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as with
         (times_speedup >= 1
             ? '-' || toString(toDecimal64(times_speedup, 3)) || 'x'
             : '+' || toString(toDecimal64(1 / times_speedup, 3)) || 'x')
@@ -788,8 +791,9 @@ create view total_client_time_per_query as select *
     from file('analyze/client-times.tsv', TSV,
         'test text, query_index int, client float, server float');
 
-create table slow_on_client_report engine File(TSV, 'report/slow-on-client.tsv') as
-    select client, server, toDecimal64(client/server, 3) p,
+create table slow_on_client_report engine File(TSV, 'report/slow-on-client.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as select client, server, toDecimal64(client/server, 3) p,
         test, query_display_name
     from total_client_time_per_query left join query_display_names using (test, query_index)
     where p > toDecimal64(1.02, 3) order by p desc;
@@ -874,8 +878,9 @@ create view test_times_view_total as
     from test_times_view
     ;
 
-create table test_times_report engine File(TSV, 'report/test-times.tsv') as
-    select
+create table test_times_report engine File(TSV, 'report/test-times.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as select
         test,
         toDecimal64(real, 3),
         toDecimal64(total_client_time, 3),
@@ -893,8 +898,9 @@ create table test_times_report engine File(TSV, 'report/test-times.tsv') as
     ;
 
 -- report for all queries page, only main metric
-create table all_tests_report engine File(TSV, 'report/all-queries.tsv') as
-    with
+create table all_tests_report engine File(TSV, 'report/all-queries.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as with
         -- server_time is sometimes reported as zero (if it's less than 1 ms),
         -- so we have to work around this to not get an error about conversion
         -- of NaN to decimal.
@@ -1057,9 +1063,10 @@ create table unstable_run_traces engine File(TSVWithNamesAndTypes,
     ;
 
 create table metric_devation engine File(TSVWithNamesAndTypes,
-        'report/metric-deviation.$version.tsv') as
+        'report/metric-deviation.$version.tsv')
+    settings output_format_decimal_trailing_zeros = 1
     -- first goes the key used to split the file with grep
-    select test, query_index, query_display_name,
+    as select test, query_index, query_display_name,
         toDecimal64(d, 3) d, q, metric
     from (
         select
@@ -1187,8 +1194,9 @@ create table metrics engine File(TSV, 'metrics/metrics.tsv') as
     ;
 
 -- Show metrics that have changed
-create table changes engine File(TSV, 'metrics/changes.tsv') as
-    select metric, left, right,
+create table changes engine File(TSV, 'metrics/changes.tsv')
+    settings output_format_decimal_trailing_zeros = 1
+    as select metric, left, right,
         toDecimal64(diff, 3), toDecimal64(times_diff, 3)
     from (
         select metric, median(left) as left, median(right) as right,
diff --git a/docker/test/performance-comparison/config/config.d/top_level_domains_lists.xml b/docker/test/performance-comparison/config/config.d/top_level_domains_lists.xml
index 7b5e6a5638a..aa6214e439e 100644
--- a/docker/test/performance-comparison/config/config.d/top_level_domains_lists.xml
+++ b/docker/test/performance-comparison/config/config.d/top_level_domains_lists.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <top_level_domains_lists>
         <public_suffix_list>public_suffix_list.dat</public_suffix_list>
     </top_level_domains_lists>
-</yandex>
+</clickhouse>
diff --git a/docker/test/performance-comparison/config/config.d/user_files.xml b/docker/test/performance-comparison/config/config.d/user_files.xml
index 9dc8daab66b..c6a9091e056 100644
--- a/docker/test/performance-comparison/config/config.d/user_files.xml
+++ b/docker/test/performance-comparison/config/config.d/user_files.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Directory with user provided files that are accessible by 'file' table function. -->
     <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
 
@@ -7,4 +7,4 @@
 
     <!-- Path to directory where users created by SQL commands are stored. -->
     <access_control_path>access/</access_control_path>
-</yandex>
+</clickhouse>
diff --git a/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml b/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
index 7b941f844de..cc5dc3795bb 100644
--- a/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
+++ b/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <http_port remove="remove"/>
     <mysql_port remove="remove"/>
     <postgresql_port remove="remove"/>
@@ -27,4 +27,4 @@
     <asynchronous_metrics_update_period_s>10</asynchronous_metrics_update_period_s>
 
     <remap_executable replace="replace">true</remap_executable>
-</yandex>
+</clickhouse>
diff --git a/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml b/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml
index 1f5218c2d10..093834943a3 100644
--- a/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml
+++ b/docker/test/performance-comparison/config/users.d/perf-comparison-tweaks-users.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
@@ -18,12 +18,19 @@
             <!-- One NUMA node w/o hyperthreading -->
             <max_threads>12</max_threads>
 
-            <!-- mmap shows some improvements in perf tests -->
-            <min_bytes_to_use_mmap_io>64Mi</min_bytes_to_use_mmap_io>
-
-            <!-- disable jit for perf tests -->
+            <!-- disable JIT for perf tests -->
             <compile_expressions>0</compile_expressions>
             <compile_aggregate_expressions>0</compile_aggregate_expressions>
+
+            <!-- Don't fail some prewarm queries too early -->
+            <timeout_before_checking_execution_speed>60</timeout_before_checking_execution_speed>
+
+            <!-- Query profiler enabled only for prewarm queries explicitly (see perf.py)
+                 This is needed for flamegraphs.  -->
+            <query_profiler_real_time_period_ns>0</query_profiler_real_time_period_ns>
+            <query_profiler_cpu_time_period_ns>0</query_profiler_cpu_time_period_ns>
+            <!-- Disable memory profiler too, since due to max_untracked_memory some queries may add trace entry and some may not -->
+            <memory_profiler_step>0</memory_profiler_step>
         </default>
     </profiles>
     <users>
@@ -31,4 +38,4 @@
             <access_management>1</access_management>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/docker/test/performance-comparison/download.sh b/docker/test/performance-comparison/download.sh
index bd72547ec1c..49323c28700 100755
--- a/docker/test/performance-comparison/download.sh
+++ b/docker/test/performance-comparison/download.sh
@@ -13,7 +13,7 @@ left_sha=$2
 # right_pr=$3 not used for now
 right_sha=$4
 
-datasets=${CHPC_DATASETS:-"hits1 hits10 hits100 values"}
+datasets=${CHPC_DATASETS-"hits1 hits10 hits100 values"}
 
 declare -A dataset_paths
 dataset_paths["hits10"]="https://s3.mds.yandex.net/clickhouse-private-datasets/hits_10m_single/partitions/hits_10m_single.tar"
diff --git a/docker/test/performance-comparison/entrypoint.sh b/docker/test/performance-comparison/entrypoint.sh
index 614debce1c1..d87b95b1129 100755
--- a/docker/test/performance-comparison/entrypoint.sh
+++ b/docker/test/performance-comparison/entrypoint.sh
@@ -102,7 +102,6 @@ then
     base=$(git -C right/ch merge-base pr origin/master)
     git -C right/ch diff --name-only "$base" pr -- . | tee all-changed-files.txt
     git -C right/ch diff --name-only "$base" pr -- tests/performance | tee changed-test-definitions.txt
-    git -C right/ch diff --name-only "$base" pr -- docker/test/performance-comparison | tee changed-test-scripts.txt
     git -C right/ch diff --name-only "$base" pr -- :!tests/performance :!docker/test/performance-comparison | tee other-changed-files.txt
 fi
 
@@ -127,6 +126,15 @@ export PATH
 export REF_PR
 export REF_SHA
 
+# Try to collect some core dumps. I've seen two patterns in Sandbox:
+# 1) |/home/zomb-sandbox/venv/bin/python /home/zomb-sandbox/client/sandbox/bin/coredumper.py %e %p %g %u %s %P %c
+#    Not sure what this script does (puts them to sandbox resources, logs some messages?),
+#    and it's not accessible from inside docker anyway.
+# 2) something like %e.%p.core.dmp. The dump should end up in the workspace directory.
+# At least we remove the ulimit and then try to pack some common file names into output.
+ulimit -c unlimited
+cat /proc/sys/kernel/core_pattern
+
 # Start the main comparison script.
 { \
     time ../download.sh "$REF_PR" "$REF_SHA" "$PR_TO_TEST" "$SHA_TO_TEST" && \
@@ -144,8 +152,11 @@ done
 
 dmesg -T > dmesg.log
 
+ls -lath
+
 7z a '-x!*/tmp' /output/output.7z ./*.{log,tsv,html,txt,rep,svg,columns} \
     {right,left}/{performance,scripts} {{right,left}/db,db0}/preprocessed_configs \
-    report analyze benchmark metrics
+    report analyze benchmark metrics \
+    ./*.core.dmp ./*.core
 
 cp compare.log /output
diff --git a/docker/test/performance-comparison/perf.py b/docker/test/performance-comparison/perf.py
index a6e7e397e32..301c5cc7d73 100755
--- a/docker/test/performance-comparison/perf.py
+++ b/docker/test/performance-comparison/perf.py
@@ -283,8 +283,11 @@ for query_index in queries_to_run:
                 #   test coverage. We disable profiler for normal runs because
                 #   it makes the results unstable.
                 res = c.execute(q, query_id = prewarm_id,
-                    settings = {'max_execution_time': args.max_query_seconds,
-                        'query_profiler_real_time_period_ns': 10000000})
+                    settings = {
+                        'max_execution_time': args.max_query_seconds,
+                        'query_profiler_real_time_period_ns': 10000000,
+                        'memory_profiler_step': '4Mi',
+                    })
             except clickhouse_driver.errors.Error as e:
                 # Add query id to the exception to make debugging easier.
                 e.args = (prewarm_id, *e.args)
diff --git a/docker/test/pvs/Dockerfile b/docker/test/pvs/Dockerfile
index 2983be2305f..77cbd910922 100644
--- a/docker/test/pvs/Dockerfile
+++ b/docker/test/pvs/Dockerfile
@@ -1,6 +1,6 @@
-# docker build -t yandex/clickhouse-pvs-test .
+# docker build -t clickhouse/pvs-test .
 
-FROM yandex/clickhouse-binary-builder
+FROM clickhouse/binary-builder
 
 RUN apt-get update --yes \
     && apt-get install \
@@ -28,7 +28,7 @@ RUN apt-get update --yes \
 ENV PKG_VERSION="pvs-studio-latest"
 
 RUN set -x \
-    && export PUBKEY_HASHSUM="486a0694c7f92e96190bbfac01c3b5ac2cb7823981db510a28f744c99eabbbf17a7bcee53ca42dc6d84d4323c2742761" \
+    && export PUBKEY_HASHSUM="ad369a2e9d8b8c30f5a9f2eb131121739b79c78e03fef0f016ea51871a5f78cd4e6257b270dca0ac3be3d1f19d885516" \
     && wget -nv https://files.viva64.com/etc/pubkey.txt -O /tmp/pubkey.txt \
     && echo "${PUBKEY_HASHSUM} /tmp/pubkey.txt" | sha384sum -c \
     && apt-key add /tmp/pubkey.txt \
@@ -37,8 +37,10 @@ RUN set -x \
     || echo "WARNING: Some file was just downloaded from the internet without any validation and we are installing it into the system"; } \
     && dpkg -i "${PKG_VERSION}.deb"
 
-CMD echo "Running PVS version $PKG_VERSION" && cd /repo_folder && pvs-studio-analyzer credentials $LICENCE_NAME $LICENCE_KEY -o ./licence.lic  \
-    && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF \
+ENV CCACHE_DIR=/test_output/ccache
+
+CMD echo "Running PVS version $PKG_VERSION" && mkdir -p $CCACHE_DIR && cd /repo_folder && pvs-studio-analyzer credentials $LICENCE_NAME $LICENCE_KEY -o ./licence.lic  \
+    && cmake . -D"ENABLE_EMBEDDED_COMPILER"=OFF -D"USE_INTERNAL_PROTOBUF_LIBRARY"=OFF -D"USE_INTERNAL_GRPC_LIBRARY"=OFF -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang\+\+-13 \
     && ninja re2_st clickhouse_grpc_protos \
     && pvs-studio-analyzer analyze -o pvs-studio.log -e contrib -j 4 -l ./licence.lic; \
     cp /repo_folder/pvs-studio.log /test_output; \
diff --git a/docker/test/split_build_smoke_test/Dockerfile b/docker/test/split_build_smoke_test/Dockerfile
index 54a9eb17868..3cc2f26a507 100644
--- a/docker/test/split_build_smoke_test/Dockerfile
+++ b/docker/test/split_build_smoke_test/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-split-build-smoke-test .
-FROM yandex/clickhouse-binary-builder
+# docker build -t clickhouse/split-build-smoke-test .
+FROM clickhouse/binary-builder
 
 COPY run.sh /run.sh
 COPY process_split_build_smoke_test_result.py /
diff --git a/docker/test/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 253ca1b729a..e73fd03fb6d 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -1,7 +1,9 @@
-# docker build -t yandex/clickhouse-sqlancer-test .
+# docker build -t clickhouse/sqlancer-test .
 FROM ubuntu:20.04
 
-RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git openjdk-14-jdk maven python3 --yes --no-install-recommends
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
+RUN apt-get update --yes && env DEBIAN_FRONTEND=noninteractive apt-get install wget unzip git default-jdk maven python3 --yes --no-install-recommends
 RUN wget https://github.com/sqlancer/sqlancer/archive/master.zip -O /sqlancer.zip
 RUN mkdir /sqlancer && \
 	cd /sqlancer && \
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index 07aad75a2ea..b6e9fad600c 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateful-test .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/stateful-test .
+FROM clickhouse/stateless-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
@@ -9,6 +9,7 @@ RUN apt-get update -y \
 
 COPY s3downloader /s3downloader
 
+ENV S3_URL="https://clickhouse-datasets.s3.yandex.net"
 ENV DATASETS="hits visits"
 
 COPY run.sh /
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index de058469192..fcee2fd055d 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -56,7 +56,7 @@ function start()
 
 start
 # shellcheck disable=SC2086 # No quotes because I want to split it into words.
-/s3downloader --dataset-names $DATASETS
+/s3downloader --url-prefix "$S3_URL" --dataset-names $DATASETS
 chmod 777 -R /var/lib/clickhouse
 clickhouse-client --query "SHOW DATABASES"
 
@@ -108,8 +108,10 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('--replicated-database')
     fi
 
-    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --use-skip-list --print-time "${ADDITIONAL_OPTIONS[@]}" \
+    set +e
+    clickhouse-test --testname --shard --zookeeper --no-stateless --hung-check --print-time "${ADDITIONAL_OPTIONS[@]}" \
         "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+    set -e
 }
 
 export -f run_tests
diff --git a/docker/test/stateful/s3downloader b/docker/test/stateful/s3downloader
index 363ece8dac6..eb3b3cd9faf 100755
--- a/docker/test/stateful/s3downloader
+++ b/docker/test/stateful/s3downloader
@@ -92,7 +92,7 @@ if __name__ == "__main__":
             logging.info("Some exception occured %s", str(ex))
             raise
         finally:
-            logging.info("Will remove dowloaded file %s from filesystem if it exists", temp_archive_path)
+            logging.info("Will remove downloaded file %s from filesystem if it exists", temp_archive_path)
             if os.path.exists(temp_archive_path):
                 os.remove(temp_archive_path)
         logging.info("Processing of %s finished", dataset)
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index f5fa86a6f33..7de8c061673 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-test .
+FROM clickhouse/test-base
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
@@ -24,6 +24,8 @@ RUN apt-get update -y \
             python3-pip \
             qemu-user-static \
             sudo \
+            # golang version 1.13 on Ubuntu 20 is enough for tests
+            golang \
             telnet \
             tree \
             unixodbc \
@@ -47,6 +49,16 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ENV NUM_TRIES=1
 ENV MAX_RUN_TIME=0
 
+
+# Download Minio-related binaries
+RUN wget 'https://dl.min.io/server/minio/release/linux-amd64/minio' \
+    && chmod +x ./minio \
+    && wget 'https://dl.min.io/client/mc/release/linux-amd64/mc' \
+    && chmod +x ./mc
+
+ENV MINIO_ROOT_USER="clickhouse"
+ENV MINIO_ROOT_PASSWORD="clickhouse"
+
 COPY run.sh /
-COPY process_functional_tests_result.py /
+COPY setup_minio.sh /
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index e5ef72e747a..44e87fb68fd 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -17,6 +17,8 @@ dpkg -i package_folder/clickhouse-test_*.deb
 # install test configs
 /usr/share/clickhouse-test/config/install.sh
 
+./setup_minio.sh
+
 # For flaky check we also enable thread fuzzer
 if [ "$NUM_TRIES" -gt "1" ]; then
     export THREAD_FUZZER_CPU_TIME_PERIOD_US=1000
@@ -94,10 +96,12 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('8')
     fi
 
+    set +e
     clickhouse-test --testname --shard --zookeeper --hung-check --print-time \
-            --use-skip-list --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
+            --test-runs "$NUM_TRIES" "${ADDITIONAL_OPTIONS[@]}" 2>&1 \
         | ts '%Y-%m-%d %H:%M:%S' \
         | tee -a test_output/test_result.txt
+    set -e
 }
 
 export -f run_tests
@@ -112,12 +116,6 @@ grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server.log ||:
 pigz < /var/log/clickhouse-server/clickhouse-server.log > /test_output/clickhouse-server.log.gz &
 clickhouse-client -q "select * from system.query_log format TSVWithNamesAndTypes" | pigz > /test_output/query-log.tsv.gz &
 clickhouse-client -q "select * from system.query_thread_log format TSVWithNamesAndTypes" | pigz > /test_output/query-thread-log.tsv.gz &
-clickhouse-client --allow_introspection_functions=1 -q "
-    WITH
-        arrayMap(x -> concat(demangle(addressToSymbol(x)), ':', addressToLine(x)), trace) AS trace_array,
-        arrayStringConcat(trace_array, '\n') AS trace_string
-    SELECT * EXCEPT(trace), trace_string FROM system.trace_log FORMAT TSVWithNamesAndTypes
-" | pigz > /test_output/trace-log.tsv.gz &
 
 # Also export trace log in flamegraph-friendly format.
 for trace_type in CPU Memory Real
@@ -141,11 +139,17 @@ mv /var/log/clickhouse-server/stderr.log /test_output/ ||:
 if [[ -n "$WITH_COVERAGE" ]] && [[ "$WITH_COVERAGE" -eq 1 ]]; then
     tar -chf /test_output/clickhouse_coverage.tar.gz /profraw ||:
 fi
-tar -chf /test_output/text_log_dump.tar /var/lib/clickhouse/data/system/text_log ||:
-tar -chf /test_output/query_log_dump.tar /var/lib/clickhouse/data/system/query_log ||:
-tar -chf /test_output/zookeeper_log_dump.tar /var/lib/clickhouse/data/system/zookeeper_log ||:
+
 tar -chf /test_output/coordination.tar /var/lib/clickhouse/coordination ||:
 
+# Replace the engine with Ordinary to avoid extra symlinks stuff in artifacts.
+# (so that clickhouse-local --path can read it w/o extra care).
+sed -i -e "s/ATTACH DATABASE _ UUID '[^']*'/ATTACH DATABASE system/" -e "s/Atomic/Ordinary/" /var/lib/clickhouse/metadata/system.sql
+for table in text_log query_log zookeeper_log trace_log; do
+    sed -i "s/ATTACH TABLE _ UUID '[^']*'/ATTACH TABLE $table/" /var/lib/clickhouse/metadata/system/${table}.sql
+    tar -chf /test_output/${table}_dump.tar /var/lib/clickhouse/metadata/system.sql /var/lib/clickhouse/metadata/system/${table}.sql /var/lib/clickhouse/data/system/${table} ||:
+done
+
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
     grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server1.log ||:
     grep -Fa "Fatal" /var/log/clickhouse-server/clickhouse-server2.log ||:
diff --git a/docker/test/stateless/setup_minio.sh b/docker/test/stateless/setup_minio.sh
new file mode 100755
index 00000000000..7f8b90ee741
--- /dev/null
+++ b/docker/test/stateless/setup_minio.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# Usage for local run:
+#
+# ./docker/test/stateless/setup_minio.sh ./tests/
+#
+
+set -e -x -a -u
+
+ls -lha
+
+mkdir -p ./minio_data
+
+if [ ! -f ./minio ]; then
+  echo 'MinIO binary not found, downloading...'
+
+  BINARY_TYPE=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+  wget "https://dl.min.io/server/minio/release/${BINARY_TYPE}-amd64/minio" \
+    && chmod +x ./minio \
+    && wget "https://dl.min.io/client/mc/release/${BINARY_TYPE}-amd64/mc" \
+    && chmod +x ./mc
+fi
+
+MINIO_ROOT_USER=${MINIO_ROOT_USER:-clickhouse}
+MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-clickhouse}
+
+./minio server --address ":11111" ./minio_data &
+
+while ! curl -v --silent http://localhost:11111 2>&1 | grep AccessDenied
+do
+  echo "Trying to connect to minio"
+  sleep 1
+done
+
+lsof -i :11111
+
+sleep 5
+
+./mc alias set clickminio http://localhost:11111 clickhouse clickhouse
+./mc admin user add clickminio test testtest
+./mc admin policy set clickminio readwrite user=test
+./mc mb clickminio/test
+
+
+# Upload data to Minio. By default after unpacking all tests will in
+# /usr/share/clickhouse-test/queries
+
+TEST_PATH=${1:-/usr/share/clickhouse-test}
+MINIO_DATA_PATH=${TEST_PATH}/queries/0_stateless/data_minio
+
+# Iterating over globs will cause redudant FILE variale to be a path to a file, not a filename
+# shellcheck disable=SC2045
+for FILE in $(ls "${MINIO_DATA_PATH}"); do
+    echo "$FILE";
+    ./mc cp "${MINIO_DATA_PATH}"/"$FILE" clickminio/test/"$FILE";
+done
diff --git a/docker/test/stateless_pytest/Dockerfile b/docker/test/stateless_pytest/Dockerfile
index 947a70426d6..c1e47523f6d 100644
--- a/docker/test/stateless_pytest/Dockerfile
+++ b/docker/test/stateless_pytest/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-pytest .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-pytest .
+FROM clickhouse/test-base
 
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
diff --git a/docker/test/stateless_unbundled/Dockerfile b/docker/test/stateless_unbundled/Dockerfile
index 53857a90ac7..dfe441e08a6 100644
--- a/docker/test/stateless_unbundled/Dockerfile
+++ b/docker/test/stateless_unbundled/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stateless-unbundled-test .
-FROM yandex/clickhouse-test-base
+# docker build -t clickhouse/stateless-unbundled-test .
+FROM clickhouse/test-base
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
diff --git a/docker/test/stateless_unbundled/run.sh b/docker/test/stateless_unbundled/run.sh
index 8b8612d4211..f8396706ed2 100755
--- a/docker/test/stateless_unbundled/run.sh
+++ b/docker/test/stateless_unbundled/run.sh
@@ -13,8 +13,4 @@ dpkg -i package_folder/clickhouse-test_*.deb
 
 service clickhouse-server start && sleep 5
 
-if grep -q -- "--use-skip-list" /usr/bin/clickhouse-test; then
-    SKIP_LIST_OPT="--use-skip-list"
-fi
-
-clickhouse-test --testname --shard --zookeeper "$SKIP_LIST_OPT" "$ADDITIONAL_OPTIONS" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
+clickhouse-test --testname --shard --zookeeper "$ADDITIONAL_OPTIONS" "$SKIP_TESTS_OPTION" 2>&1 | ts '%Y-%m-%d %H:%M:%S' | tee test_output/test_result.txt
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index e1df32ec3d7..3fe1b790d5a 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-stress-test .
-FROM yandex/clickhouse-stateful-test
+# docker build -t clickhouse/stress-test .
+FROM clickhouse/stateful-test
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/stress/README.md b/docker/test/stress/README.md
index f747996fa2d..b1519e7968d 100644
--- a/docker/test/stress/README.md
+++ b/docker/test/stress/README.md
@@ -6,7 +6,7 @@ Usage:
 ```
 $ ls $HOME/someclickhouse
 clickhouse-client_18.14.9_all.deb clickhouse-common-static_18.14.9_amd64.deb clickhouse-server_18.14.9_all.deb clickhouse-test_18.14.9_all.deb
-$ docker run --volume=$HOME/someclickhouse:/package_folder --volume=$HOME/test_output:/test_output yandex/clickhouse-stress-test
+$ docker run --volume=$HOME/someclickhouse:/package_folder --volume=$HOME/test_output:/test_output clickhouse/stress-test
 Selecting previously unselected package clickhouse-common-static.
 (Reading database ... 14442 files and directories currently installed.)
 ...
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 87d127ab946..f42a3af17c9 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -4,6 +4,28 @@
 
 set -x
 
+# Thread Fuzzer allows to check more permutations of possible thread scheduling
+# and find more potential issues.
+
+export THREAD_FUZZER_CPU_TIME_PERIOD_US=1000
+export THREAD_FUZZER_SLEEP_PROBABILITY=0.1
+export THREAD_FUZZER_SLEEP_TIME_US=100000
+
+export THREAD_FUZZER_pthread_mutex_lock_BEFORE_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_MIGRATE_PROBABILITY=1
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_MIGRATE_PROBABILITY=1
+
+export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_PROBABILITY=0.001
+export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US=10000
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US=10000
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US=10000
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US=10000
+
+
 dpkg -i package_folder/clickhouse-common-static_*.deb
 dpkg -i package_folder/clickhouse-common-static-dbg_*.deb
 dpkg -i package_folder/clickhouse-server_*.deb
@@ -53,12 +75,12 @@ function start()
     counter=0
     until clickhouse-client --query "SELECT 1"
     do
-        if [ "$counter" -gt 120 ]
+        if [ "$counter" -gt 240 ]
         then
             echo "Cannot start clickhouse-server"
             cat /var/log/clickhouse-server/stdout.log
             tail -n1000 /var/log/clickhouse-server/stderr.log
-            tail -n100000 /var/log/clickhouse-server/clickhouse-server.log | grep -F -v '<Warning> RaftInstance:' -e '<Information> RaftInstance' | tail -n1000
+            tail -n100000 /var/log/clickhouse-server/clickhouse-server.log | grep -F -v -e '<Warning> RaftInstance:' -e '<Information> RaftInstance' | tail -n1000
             break
         fi
         # use root to match with current uid
@@ -161,8 +183,14 @@ done
 
 tar -chf /test_output/coordination.tar /var/lib/clickhouse/coordination ||:
 mv /var/log/clickhouse-server/stderr.log /test_output/
-tar -chf /test_output/query_log_dump.tar /var/lib/clickhouse/data/system/query_log ||:
-tar -chf /test_output/trace_log_dump.tar /var/lib/clickhouse/data/system/trace_log ||:
+
+# Replace the engine with Ordinary to avoid extra symlinks stuff in artifacts.
+# (so that clickhouse-local --path can read it w/o extra care).
+sed -i -e "s/ATTACH DATABASE _ UUID '[^']*'/ATTACH DATABASE system/" -e "s/Atomic/Ordinary/" /var/lib/clickhouse/metadata/system.sql
+for table in query_log trace_log; do
+    sed -i "s/ATTACH TABLE _ UUID '[^']*'/ATTACH TABLE $table/" /var/lib/clickhouse/metadata/system/${table}.sql
+    tar -chf /test_output/${table}_dump.tar /var/lib/clickhouse/metadata/system.sql /var/lib/clickhouse/metadata/system/${table}.sql /var/lib/clickhouse/data/system/${table} ||:
+done
 
 # Write check result into check_status.tsv
 clickhouse-local --structure "test String, res String" -q "SELECT 'failure', test FROM table WHERE res != 'OK' order by (lower(test) like '%hung%') LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv
diff --git a/docker/test/stress/stress b/docker/test/stress/stress
index c71722809d7..5e98c67d8e1 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -10,14 +10,6 @@ import logging
 import time
 
 
-def get_skip_list_cmd(path):
-    with open(path, 'r') as f:
-        for line in f:
-            if '--use-skip-list' in line:
-                return '--use-skip-list'
-    return ''
-
-
 def get_options(i):
     options = []
     client_options = []
@@ -56,8 +48,6 @@ def get_options(i):
 
 
 def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_time_limit):
-    skip_list_opt = get_skip_list_cmd(cmd)
-
     global_time_limit_option = ''
     if global_time_limit:
         global_time_limit_option = "--global_time_limit={}".format(global_time_limit)
@@ -66,7 +56,7 @@ def run_func_test(cmd, output_prefix, num_processes, skip_tests_option, global_t
     pipes = []
     for i in range(0, len(output_paths)):
         f = open(output_paths[i], 'w')
-        full_command = "{} {} {} {} {}".format(cmd, skip_list_opt, get_options(i), global_time_limit_option, skip_tests_option)
+        full_command = "{} {} {} {}".format(cmd, get_options(i), global_time_limit_option, skip_tests_option)
         logging.info("Run func tests '%s'", full_command)
         p = Popen(full_command, shell=True, stdout=f, stderr=f)
         pipes.append(p)
@@ -80,40 +70,43 @@ def compress_stress_logs(output_path, files_prefix):
 def prepare_for_hung_check(drop_databases):
     # FIXME this function should not exist, but...
 
+    # ThreadFuzzer significantly slows down server and causes false-positive hung check failures
+    call("clickhouse client -q 'SYSTEM STOP THREAD FUZZER'", shell=True, stderr=STDOUT, timeout=30)
+
     # We attach gdb to clickhouse-server before running tests
     # to print stacktraces of all crashes even if clickhouse cannot print it for some reason.
     # However, it obstruct checking for hung queries.
     logging.info("Will terminate gdb (if any)")
-    call("kill -TERM $(pidof gdb)", shell=True, stderr=STDOUT)
+    call("kill -TERM $(pidof gdb)", shell=True, stderr=STDOUT, timeout=30)
 
     # Some tests set too low memory limit for default user and forget to reset in back.
     # It may cause SYSTEM queries to fail, let's disable memory limit.
-    call("clickhouse client --max_memory_usage_for_user=0 -q 'SELECT 1 FORMAT Null'", shell=True, stderr=STDOUT)
+    call("clickhouse client --max_memory_usage_for_user=0 -q 'SELECT 1 FORMAT Null'", shell=True, stderr=STDOUT, timeout=30)
 
     # Some tests execute SYSTEM STOP MERGES or similar queries.
     # It may cause some ALTERs to hang.
     # Possibly we should fix tests and forbid to use such queries without specifying table.
-    call("clickhouse client -q 'SYSTEM START MERGES'", shell=True, stderr=STDOUT)
-    call("clickhouse client -q 'SYSTEM START DISTRIBUTED SENDS'", shell=True, stderr=STDOUT)
-    call("clickhouse client -q 'SYSTEM START TTL MERGES'", shell=True, stderr=STDOUT)
-    call("clickhouse client -q 'SYSTEM START MOVES'", shell=True, stderr=STDOUT)
-    call("clickhouse client -q 'SYSTEM START FETCHES'", shell=True, stderr=STDOUT)
-    call("clickhouse client -q 'SYSTEM START REPLICATED SENDS'", shell=True, stderr=STDOUT)
-    call("clickhouse client -q 'SYSTEM START REPLICATION QUEUES'", shell=True, stderr=STDOUT)
+    call("clickhouse client -q 'SYSTEM START MERGES'", shell=True, stderr=STDOUT, timeout=30)
+    call("clickhouse client -q 'SYSTEM START DISTRIBUTED SENDS'", shell=True, stderr=STDOUT, timeout=30)
+    call("clickhouse client -q 'SYSTEM START TTL MERGES'", shell=True, stderr=STDOUT, timeout=30)
+    call("clickhouse client -q 'SYSTEM START MOVES'", shell=True, stderr=STDOUT, timeout=30)
+    call("clickhouse client -q 'SYSTEM START FETCHES'", shell=True, stderr=STDOUT, timeout=30)
+    call("clickhouse client -q 'SYSTEM START REPLICATED SENDS'", shell=True, stderr=STDOUT, timeout=30)
+    call("clickhouse client -q 'SYSTEM START REPLICATION QUEUES'", shell=True, stderr=STDOUT, timeout=30)
 
     # Issue #21004, live views are experimental, so let's just suppress it
-    call("""clickhouse client -q "KILL QUERY WHERE upper(query) LIKE 'WATCH %'" """, shell=True, stderr=STDOUT)
+    call("""clickhouse client -q "KILL QUERY WHERE upper(query) LIKE 'WATCH %'" """, shell=True, stderr=STDOUT, timeout=30)
 
     # Kill other queries which known to be slow
     # It's query from 01232_preparing_sets_race_condition_long, it may take up to 1000 seconds in slow builds
-    call("""clickhouse client -q "KILL QUERY WHERE query LIKE 'insert into tableB select %'" """, shell=True, stderr=STDOUT)
+    call("""clickhouse client -q "KILL QUERY WHERE query LIKE 'insert into tableB select %'" """, shell=True, stderr=STDOUT, timeout=30)
     # Long query from 00084_external_agregation
-    call("""clickhouse client -q "KILL QUERY WHERE query LIKE 'SELECT URL, uniq(SearchPhrase) AS u FROM test.hits GROUP BY URL ORDER BY u %'" """, shell=True, stderr=STDOUT)
+    call("""clickhouse client -q "KILL QUERY WHERE query LIKE 'SELECT URL, uniq(SearchPhrase) AS u FROM test.hits GROUP BY URL ORDER BY u %'" """, shell=True, stderr=STDOUT, timeout=30)
 
     if drop_databases:
         # Here we try to drop all databases in async mode. If some queries really hung, than drop will hung too.
         # Otherwise we will get rid of queries which wait for background pool. It can take a long time on slow builds (more than 900 seconds).
-        databases = check_output('clickhouse client -q "SHOW DATABASES"', shell=True).decode('utf-8').strip().split()
+        databases = check_output('clickhouse client -q "SHOW DATABASES"', shell=True, timeout=30).decode('utf-8').strip().split()
         for db in databases:
             if db == "system":
                 continue
@@ -124,13 +117,13 @@ def prepare_for_hung_check(drop_databases):
     # Wait for last queries to finish if any, not longer than 300 seconds
     call("""clickhouse client -q "select sleepEachRow((
             select maxOrDefault(300 - elapsed) + 1 from system.processes where query not like '%from system.processes%' and elapsed < 300
-            ) / 300) from numbers(300) format Null" """, shell=True, stderr=STDOUT)
+            ) / 300) from numbers(300) format Null" """, shell=True, stderr=STDOUT, timeout=330)
 
     # Even if all clickhouse-test processes are finished, there are probably some sh scripts,
     # which still run some new queries. Let's ignore them.
     try:
         query = """clickhouse client -q "SELECT count() FROM system.processes where where elapsed > 300" """
-        output = check_output(query, shell=True, stderr=STDOUT).decode('utf-8').strip()
+        output = check_output(query, shell=True, stderr=STDOUT, timeout=30).decode('utf-8').strip()
         if int(output) == 0:
             return False
     except:
@@ -183,6 +176,7 @@ if __name__ == "__main__":
         if res != 0 and have_long_running_queries:
             logging.info("Hung check failed with exit code {}".format(res))
             hung_check_status = "Hung check failed\tFAIL\n"
-        open(os.path.join(args.output_folder, "test_results.tsv"), 'w+').write(hung_check_status)
+        with open(os.path.join(args.output_folder, "test_results.tsv"), 'w+') as results:
+            results.write(hung_check_status)
 
     logging.info("Stress test finished")
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index 86595a77a54..a9c1eca8de4 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -1,6 +1,8 @@
-# docker build -t yandex/clickhouse-style-test .
+# docker build -t clickhouse/style-test .
 FROM ubuntu:20.04
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     shellcheck \
     libxml2-utils \
@@ -8,7 +10,7 @@ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     python3-pip \
     pylint \
     yamllint \
-    && pip3 install codespell
+    && pip3 install codespell PyGithub boto3 unidiff
 
 COPY run.sh /
 COPY process_style_check_result.py /
diff --git a/docker/test/style/run.sh b/docker/test/style/run.sh
index 424bfe71b15..0118e6df764 100755
--- a/docker/test/style/run.sh
+++ b/docker/test/style/run.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# yaml check is not the best one
+
 cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
 ./check-style -n              |& tee /test_output/style_output.txt
 ./check-typos                 |& tee /test_output/typos_output.txt
diff --git a/docker/test/test_runner.sh b/docker/test/test_runner.sh
index cd6367b2964..0c99c8c2b32 100755
--- a/docker/test/test_runner.sh
+++ b/docker/test/test_runner.sh
@@ -49,7 +49,7 @@ fi
 
 # Build server image (optional) from local packages
 if [ -z "${CLICKHOUSE_SERVER_IMAGE}" ]; then
-    CLICKHOUSE_SERVER_IMAGE="yandex/clickhouse-server:local"
+    CLICKHOUSE_SERVER_IMAGE="clickhouse/server:local"
 
     if [ "${CLICKHOUSE_PACKAGES_ARG}" != "${NO_REBUILD_FLAG}" ]; then
         docker build --network=host \
diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile
index 264b98c669d..91d0eb844d9 100644
--- a/docker/test/testflows/runner/Dockerfile
+++ b/docker/test/testflows/runner/Dockerfile
@@ -1,6 +1,8 @@
-# docker build -t yandex/clickhouse-testflows-runner .
+# docker build -t clickhouse/testflows-runner .
 FROM ubuntu:20.04
 
+RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
+
 RUN apt-get update \
     && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
     ca-certificates \
@@ -35,7 +37,7 @@ RUN apt-get update \
 ENV TZ=Europe/Moscow
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN pip3 install urllib3 testflows==1.7.20 docker-compose==1.29.1 docker==5.0.0 dicttoxml kazoo tzlocal python-dateutil numpy
+RUN pip3 install urllib3 testflows==1.7.20 docker-compose==1.29.1 docker==5.0.0 dicttoxml kazoo tzlocal==2.1 pytz python-dateutil numpy
 
 ENV DOCKER_CHANNEL stable
 ENV DOCKER_VERSION 20.10.6
diff --git a/docker/test/unit/Dockerfile b/docker/test/unit/Dockerfile
index e111611eecd..20d67773363 100644
--- a/docker/test/unit/Dockerfile
+++ b/docker/test/unit/Dockerfile
@@ -1,5 +1,5 @@
-# docker build -t yandex/clickhouse-unit-test .
-FROM yandex/clickhouse-stateless-test
+# docker build -t clickhouse/unit-test .
+FROM clickhouse/stateless-test
 
 RUN apt-get install gdb
 
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
new file mode 100644
index 00000000000..d9894451528
--- /dev/null
+++ b/docker/test/util/Dockerfile
@@ -0,0 +1,4 @@
+# docker build -t clickhouse/test-util .
+
+FROM ubuntu:20.04
+COPY process_functional_tests_result.py /
diff --git a/docker/test/stateless/process_functional_tests_result.py b/docker/test/util/process_functional_tests_result.py
similarity index 92%
rename from docker/test/stateless/process_functional_tests_result.py
rename to docker/test/util/process_functional_tests_result.py
index e60424ad4d1..82df170686d 100755
--- a/docker/test/stateless/process_functional_tests_result.py
+++ b/docker/test/util/process_functional_tests_result.py
@@ -28,6 +28,7 @@ def process_test_log(log_path):
     test_results = []
     with open(log_path, 'r') as test_file:
         for line in test_file:
+            original_line = line
             line = line.strip()
             if any(s in line for s in NO_TASK_TIMEOUT_SIGNS):
                 task_timeout = False
@@ -49,19 +50,24 @@ def process_test_log(log_path):
                 total += 1
                 if TIMEOUT_SIGN in line:
                     failed += 1
-                    test_results.append((test_name, "Timeout", test_time))
+                    test_results.append((test_name, "Timeout", test_time, []))
                 elif FAIL_SIGN in line:
                     failed += 1
-                    test_results.append((test_name, "FAIL", test_time))
+                    test_results.append((test_name, "FAIL", test_time, []))
                 elif UNKNOWN_SIGN in line:
                     unknown += 1
-                    test_results.append((test_name, "FAIL", test_time))
+                    test_results.append((test_name, "FAIL", test_time, []))
                 elif SKIPPED_SIGN in line:
                     skipped += 1
-                    test_results.append((test_name, "SKIPPED", test_time))
+                    test_results.append((test_name, "SKIPPED", test_time, []))
                 else:
                     success += int(OK_SIGN in line)
-                    test_results.append((test_name, "OK", test_time))
+                    test_results.append((test_name, "OK", test_time, []))
+            elif len(test_results) > 0 and test_results[-1][1] == "FAIL":
+                test_results[-1][3].append(original_line)
+
+    test_results = [(test[0], test[1], test[2], ''.join(test[3])) for test in test_results]
+
     return total, skipped, unknown, failed, success, hung, task_timeout, retries, test_results
 
 def process_result(result_path):
@@ -89,14 +95,14 @@ def process_result(result_path):
         if hung:
             description = "Some queries hung, "
             state = "failure"
-            test_results.append(("Some queries hung", "FAIL", "0"))
+            test_results.append(("Some queries hung", "FAIL", "0", ""))
         elif task_timeout:
             description = "Timeout, "
             state = "failure"
-            test_results.append(("Timeout", "FAIL", "0"))
+            test_results.append(("Timeout", "FAIL", "0", ""))
         elif retries:
             description = "Some tests restarted, "
-            test_results.append(("Some tests restarted", "SKIPPED", "0"))
+            test_results.append(("Some tests restarted", "SKIPPED", "0", ""))
         else:
             description = ""
 
diff --git a/docs/README.md b/docs/README.md
index d71e92f20d1..cd5c1af0cbd 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -38,7 +38,7 @@ Writing the docs is extremely useful for project's users and developers, and gro
 
 The documentation contains information about all the aspects of the ClickHouse lifecycle: developing, testing, installing, operating, and using. The base language of the documentation is English. The English version is the most actual. All other languages are supported as much as they can by contributors from different countries.
 
-At the moment, [documentation](https://clickhouse.tech/docs) exists in English, Russian, Chinese, Japanese, and Farsi. We store the documentation besides the ClickHouse source code in the [GitHub repository](https://github.com/ClickHouse/ClickHouse/tree/master/docs).
+At the moment, [documentation](https://clickhouse.com/docs) exists in English, Russian, Chinese, Japanese, and Farsi. We store the documentation besides the ClickHouse source code in the [GitHub repository](https://github.com/ClickHouse/ClickHouse/tree/master/docs).
 
 Each language lays in the corresponding folder. Files that are not translated from English are the symbolic links to the English ones.
 
@@ -54,7 +54,7 @@ You can contribute to the documentation in many ways, for example:
 
 - Open a required file in the ClickHouse repository and edit it from the GitHub web interface.
 
-    You can do it on GitHub, or on the [ClickHouse Documentation](https://clickhouse.tech/docs/en/) site. Each page of ClickHouse Documentation site contains an "Edit this page" (🖋) element in the upper right corner. Clicking this symbol, you get to the ClickHouse docs file opened for editing.
+    You can do it on GitHub, or on the [ClickHouse Documentation](https://clickhouse.com/docs/en/) site. Each page of ClickHouse Documentation site contains an "Edit this page" (🖋) element in the upper right corner. Clicking this symbol, you get to the ClickHouse docs file opened for editing.
 
     When you are saving a file, GitHub opens a pull-request for your contribution. Add the `documentation` label to this pull request for proper automatic checks applying. If you have no permissions for adding labels, the reviewer of your PR adds it.
 
@@ -128,7 +128,7 @@ Contribute all new information in English language. Other languages are translat
 
 When you add a new file, it should end with a link like:
 
-`[Original article](https://clickhouse.tech/docs/<path-to-the-page>) <!--hide-->`
+`[Original article](https://clickhouse.com/docs/<path-to-the-page>) <!--hide-->`
 
 and there should be **a new empty line** after it.
 
@@ -164,7 +164,7 @@ When writing documentation, think about people who read it. Each audience has sp
 
 ClickHouse documentation can be divided by the audience for the following parts:
 
-- Conceptual topics in [Introduction](https://clickhouse.tech/docs/en/), tutorials and overviews, changelog.
+- Conceptual topics in [Introduction](https://clickhouse.com/docs/en/), tutorials and overviews, changelog.
 
     These topics are for the most common auditory. When editing text in them, use the most common terms that are comfortable for the audience with basic technical skills.
 
diff --git a/docs/_description_templates/template-data-type.md b/docs/_description_templates/template-data-type.md
index d39be305838..239edb2808b 100644
--- a/docs/_description_templates/template-data-type.md
+++ b/docs/_description_templates/template-data-type.md
@@ -26,4 +26,4 @@ The name of an additional section can be any, for example, **Usage**.
 
 -   [link](#)
 
-[Original article](https://clickhouse.tech/docs/en/data-types/<data-type-name>/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data-types/<data-type-name>/) <!--hide-->
diff --git a/docs/_description_templates/template-statement.md b/docs/_description_templates/template-statement.md
index bca015a2ac6..238570c2217 100644
--- a/docs/_description_templates/template-statement.md
+++ b/docs/_description_templates/template-statement.md
@@ -12,9 +12,9 @@ Syntax of the statement.
 
 Examples of descriptions with a complicated structure:
 
-- https://clickhouse.tech/docs/en/sql-reference/statements/grant/
-- https://clickhouse.tech/docs/en/sql-reference/statements/revoke/
-- https://clickhouse.tech/docs/en/sql-reference/statements/select/join/
+- https://clickhouse.com/docs/en/sql-reference/statements/grant/
+- https://clickhouse.com/docs/en/sql-reference/statements/revoke/
+- https://clickhouse.com/docs/en/sql-reference/statements/select/join/
 
 
 **See Also** (Optional)
diff --git a/docs/_includes/install/arm.sh b/docs/_includes/install/arm.sh
index d6f6020a1a1..c6b1f7d12f8 100644
--- a/docs/_includes/install/arm.sh
+++ b/docs/_includes/install/arm.sh
@@ -1,6 +1,6 @@
 # ARM (AArch64) build works on Amazon Graviton, Oracle Cloud, Huawei Cloud ARM machines.
 # The support for AArch64 is pre-production ready.
 
-wget 'https://builds.clickhouse.tech/master/aarch64/clickhouse'
+wget 'https://builds.clickhouse.com/master/aarch64/clickhouse'
 chmod a+x ./clickhouse
 sudo ./clickhouse install
diff --git a/docs/_includes/install/deb.sh b/docs/_includes/install/deb.sh
index 6686a1f64cd..7dcca601d33 100644
--- a/docs/_includes/install/deb.sh
+++ b/docs/_includes/install/deb.sh
@@ -1,7 +1,7 @@
 sudo apt-get install apt-transport-https ca-certificates dirmngr
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E0C56BD4
 
-echo "deb https://repo.clickhouse.tech/deb/stable/ main/" | sudo tee \
+echo "deb https://repo.clickhouse.com/deb/stable/ main/" | sudo tee \
     /etc/apt/sources.list.d/clickhouse.list
 sudo apt-get update
 
diff --git a/docs/_includes/install/freebsd.sh b/docs/_includes/install/freebsd.sh
index d664ea19a18..50e3bc02cb7 100644
--- a/docs/_includes/install/freebsd.sh
+++ b/docs/_includes/install/freebsd.sh
@@ -1,3 +1,3 @@
-wget 'https://builds.clickhouse.tech/master/freebsd/clickhouse'
+wget 'https://builds.clickhouse.com/master/freebsd/clickhouse'
 chmod a+x ./clickhouse
 sudo ./clickhouse install
diff --git a/docs/_includes/install/mac-arm.sh b/docs/_includes/install/mac-arm.sh
index 9fc5c0cef22..5863d5b090d 100644
--- a/docs/_includes/install/mac-arm.sh
+++ b/docs/_includes/install/mac-arm.sh
@@ -1,3 +1,3 @@
-wget 'https://builds.clickhouse.tech/master/macos-aarch64/clickhouse'
+wget 'https://builds.clickhouse.com/master/macos-aarch64/clickhouse'
 chmod a+x ./clickhouse
 ./clickhouse
diff --git a/docs/_includes/install/mac-x86.sh b/docs/_includes/install/mac-x86.sh
index 1423769b6d5..2a216b534b4 100644
--- a/docs/_includes/install/mac-x86.sh
+++ b/docs/_includes/install/mac-x86.sh
@@ -1,3 +1,3 @@
-wget 'https://builds.clickhouse.tech/master/macos/clickhouse'
+wget 'https://builds.clickhouse.com/master/macos/clickhouse'
 chmod a+x ./clickhouse
 ./clickhouse
diff --git a/docs/_includes/install/rpm.sh b/docs/_includes/install/rpm.sh
index 972d50124c4..de4a07420f7 100644
--- a/docs/_includes/install/rpm.sh
+++ b/docs/_includes/install/rpm.sh
@@ -1,6 +1,6 @@
 sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/clickhouse.repo
+sudo rpm --import https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG
+sudo yum-config-manager --add-repo https://repo.clickhouse.com/rpm/clickhouse.repo
 sudo yum install clickhouse-server clickhouse-client
 
 sudo /etc/init.d/clickhouse-server start
diff --git a/docs/_includes/install/tgz.sh b/docs/_includes/install/tgz.sh
index 52ea45bdf90..0994510755b 100644
--- a/docs/_includes/install/tgz.sh
+++ b/docs/_includes/install/tgz.sh
@@ -1,9 +1,9 @@
-export LATEST_VERSION=$(curl -s https://repo.clickhouse.tech/tgz/stable/ | \
+export LATEST_VERSION=$(curl -s https://repo.clickhouse.com/tgz/stable/ | \
     grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
-curl -O https://repo.clickhouse.tech/tgz/stable/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/stable/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/stable/clickhouse-client-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/stable/clickhouse-common-static-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/stable/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/stable/clickhouse-server-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/stable/clickhouse-client-$LATEST_VERSION.tgz
 
 tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
 sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
diff --git a/docs/_includes/install/universal.sh b/docs/_includes/install/universal.sh
new file mode 100755
index 00000000000..eaea4cc69ed
--- /dev/null
+++ b/docs/_includes/install/universal.sh
@@ -0,0 +1,63 @@
+#!/bin/sh -e
+
+OS=$(uname -s)
+ARCH=$(uname -m)
+
+DIR=
+
+if [ "${OS}" = "Linux" ]
+then
+    if [ "${ARCH}" = "x86_64" ]
+    then
+        DIR="amd64"
+    elif [ "${ARCH}" = "aarch64" ]
+    then
+        DIR="aarch64"
+    elif [ "${ARCH}" = "powerpc64le" ]
+    then
+        DIR="powerpc64le"
+    fi
+elif [ "${OS}" = "FreeBSD" ]
+then
+    if [ "${ARCH}" = "x86_64" ]
+    then
+        DIR="freebsd"
+    elif [ "${ARCH}" = "aarch64" ]
+    then
+        DIR="freebsd-aarch64"
+    elif [ "${ARCH}" = "powerpc64le" ]
+    then
+        DIR="freebsd-powerpc64le"
+    fi
+elif [ "${OS}" = "Darwin" ]
+then
+    if [ "${ARCH}" = "x86_64" ]
+    then
+        DIR="macos"
+    elif [ "${ARCH}" = "aarch64" ]
+    then
+        DIR="macos-aarch64"
+    fi
+fi
+
+if [ -z "${DIR}" ]
+then
+    echo "The '${OS}' operating system with the '${ARCH}' architecture is not supported."
+    exit 1
+fi
+
+URL="https://builds.clickhouse.com/master/${DIR}/clickhouse"
+echo
+echo "Will download ${URL}"
+echo
+curl -O "${URL}" && chmod a+x clickhouse &&
+echo
+echo "Successfully downloaded the ClickHouse binary, you can run it as:
+    ./clickhouse"
+
+if [ "${OS}" = "Linux" ]
+then
+    echo
+    echo "You can also install it:
+    sudo ./clickhouse install"
+fi
diff --git a/docs/en/commercial/cloud.md b/docs/en/commercial/cloud.md
index a30d17828ab..afa2e23b7a8 100644
--- a/docs/en/commercial/cloud.md
+++ b/docs/en/commercial/cloud.md
@@ -3,60 +3,7 @@ toc_priority: 1
 toc_title: Cloud
 ---
 
-# ClickHouse Cloud Service Providers {#clickhouse-cloud-service-providers}
+# ClickHouse Cloud Service {#clickhouse-cloud-service}
 
 !!! info "Info"
-    If you have launched a public cloud with managed ClickHouse service, feel free to [open a pull-request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) adding it to the following list.
-
-## Yandex Cloud {#yandex-cloud}
-
-[Yandex Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) provides the following key features:
-
--   Fully managed ZooKeeper service for [ClickHouse replication](../engines/table-engines/mergetree-family/replication.md)
--   Multiple storage type choices
--   Replicas in different availability zones
--   Encryption and isolation
--   Automated maintenance
-
-## Altinity.Cloud {#altinity.cloud}
-
-[Altinity.Cloud](https://altinity.com/cloud-database/) is a fully managed ClickHouse-as-a-Service for the Amazon public cloud.
-
--   Fast deployment of ClickHouse clusters on Amazon resources
--   Easy scale-out/scale-in as well as vertical scaling of nodes
--   Isolated per-tenant VPCs with public endpoint or VPC peering
--   Configurable storage types and volume configurations
--   Cross-AZ scaling for performance and high availability
--   Built-in monitoring and SQL query editor
-
-## Alibaba Cloud {#alibaba-cloud}
-
-[Alibaba Cloud Managed Service for ClickHouse](https://www.alibabacloud.com/product/clickhouse) provides the following key features:
-
--   Highly reliable cloud disk storage engine based on [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack) distributed system
--   Expand capacity on demand without manual data migration
--   Support single-node, single-replica, multi-node, and multi-replica architectures, and support hot and cold data tiering
--   Support access allow-list, one-key recovery, multi-layer network security protection, cloud disk encryption
--   Seamless integration with cloud log systems, databases, and data application tools
--   Built-in monitoring and database management platform
--   Professional database expert technical support and service
-
-## SberCloud {#sbercloud}
-
-[SberCloud.Advanced](https://sbercloud.ru/en/advanced) provides [MapReduce Service (MRS)](https://docs.sbercloud.ru/mrs/ug/topics/ug__clickhouse.html), a reliable, secure, and easy-to-use enterprise-level platform for storing, processing, and analyzing big data. MRS allows you to quickly create and manage ClickHouse clusters.
-
--   A ClickHouse instance consists of three ZooKeeper nodes and multiple ClickHouse nodes. The Dedicated Replica mode is used to ensure high reliability of dual data copies.
--   MRS provides smooth and elastic scaling capabilities to quickly meet service growth requirements in scenarios where the cluster storage capacity or CPU computing resources are not enough. When you expand the capacity of ClickHouse nodes in a cluster, MRS provides a one-click data balancing tool and gives you the initiative to balance data. You can determine the data balancing mode and time based on service characteristics to ensure service availability, implementing smooth scaling.
--   MRS uses the Elastic Load Balance ensuring high availability deployment architecture to automatically distribute user access traffic to multiple backend nodes, expanding service capabilities to external systems and improving fault tolerance. With the ELB polling mechanism, data is written to local tables and read from distributed tables on different nodes. In this way, data read/write load and high availability of application access are guaranteed.
-
-## Tencent Cloud {#tencent-cloud}
-
-[Tencent Managed Service for ClickHouse](https://cloud.tencent.com/product/cdwch) provides the following key features:
-
--   Easy to deploy and manage on Tencent Cloud
--   Highly scalable and available
--   Integrated monitor and alert service
--   High security with isolated per cluster VPCs
--   On-demand pricing with no upfront costs or long-term commitments
-
-{## [Original article](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/en/commercial/index.md b/docs/en/commercial/index.md
index 90e74d88ea8..1f1911b8c4d 100644
--- a/docs/en/commercial/index.md
+++ b/docs/en/commercial/index.md
@@ -6,12 +6,8 @@ toc_title: Introduction
 
 # ClickHouse Commercial Services {#clickhouse-commercial-services}
 
-This section is a directory of commercial service providers specializing in ClickHouse. They are independent companies not necessarily affiliated with Yandex.
-
 Service categories:
 
 -   [Cloud](../commercial/cloud.md)
 -   [Support](../commercial/support.md)
 
-!!! note "For service providers"
-    If you happen to represent one of them, feel free to open a pull request adding your company to the respective section (or even adding a new section if the service does not fit into existing categories). The easiest way to open a pull-request for documentation page is by using a “pencil” edit button in the top-right corner. If your service available in some local market, make sure to mention it in a localized documentation page as well (or at least point it out in a pull-request description).
diff --git a/docs/en/commercial/support.md b/docs/en/commercial/support.md
index 27f3f0c6a22..33b69b40b2d 100644
--- a/docs/en/commercial/support.md
+++ b/docs/en/commercial/support.md
@@ -3,23 +3,7 @@ toc_priority: 3
 toc_title: Support
 ---
 
-# ClickHouse Commercial Support Service Providers {#clickhouse-commercial-support-service-providers}
+# ClickHouse Commercial Support Service  {#clickhouse-commercial-support-service}
 
 !!! info "Info"
-    If you have launched a ClickHouse commercial support service, feel free to [open a pull-request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) adding it to the following list.
-
-## Yandex.Cloud
-
-ClickHouse worldwide support from the authors of ClickHouse. Supports on-premise and cloud deployments. Ask details on clickhouse-support@yandex-team.com
-
-## Altinity {#altinity}
-
-Altinity has offered enterprise ClickHouse support and services since 2017. Altinity customers range from Fortune 100 enterprises to startups. Visit [www.altinity.com](https://www.altinity.com/) for more information.
-
-## Mafiree {#mafiree}
-
-[Service description](http://mafiree.com/clickhouse-analytics-services.php)
-
-## MinervaDB {#minervadb}
-
-[Service description](https://minervadb.com/index.php/clickhouse-consulting-and-support-by-minervadb/)
+    Detailed public description for ClickHouse support services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/en/development/adding_test_queries.md b/docs/en/development/adding_test_queries.md
index 4da027b8fb1..a73b0e1ac5d 100644
--- a/docs/en/development/adding_test_queries.md
+++ b/docs/en/development/adding_test_queries.md
@@ -63,7 +63,7 @@ git checkout -b name_for_a_branch_with_my_test upstream/master
 
 #### Install & run clickhouse
 
-1) install `clickhouse-server` (follow [official docs](https://clickhouse.tech/docs/en/getting-started/install/))
+1) install `clickhouse-server` (follow [official docs](https://clickhouse.com/docs/en/getting-started/install/))
 2) install test configurations (it will use Zookeeper mock implementation and adjust some settings)
 ```
 cd ~/workspace/ClickHouse/tests/config
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index e2e40603d30..44e68d645b7 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -196,4 +196,4 @@ Besides, each replica stores its state in ZooKeeper as the set of parts and its
 !!! note "Note"
     The ClickHouse cluster consists of independent shards, and each shard consists of replicas. The cluster is **not elastic**, so after adding a new shard, data is not rebalanced between shards automatically. Instead, the cluster load is supposed to be adjusted to be uneven. This implementation gives you more control, and it is ok for relatively small clusters, such as tens of nodes. But for clusters with hundreds of nodes that we are using in production, this approach becomes a significant drawback. We should implement a table engine that spans across the cluster with dynamically replicated regions that could be split and balanced between clusters automatically.
 
-{## [Original article](https://clickhouse.tech/docs/en/development/architecture/) ##}
+{## [Original article](https://clickhouse.com/docs/en/development/architecture/) ##}
diff --git a/docs/en/development/browse-code.md b/docs/en/development/browse-code.md
index e65a4d5e549..35555bbd79c 100644
--- a/docs/en/development/browse-code.md
+++ b/docs/en/development/browse-code.md
@@ -5,7 +5,7 @@ toc_title: Source Code Browser
 
 # Browse ClickHouse Source Code {#browse-clickhouse-source-code}
 
-You can use **Woboq** online code browser available [here](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). It provides code navigation and semantic highlighting, search and indexing. The code snapshot is updated daily.
+You can use **Woboq** online code browser available [here](https://clickhouse.com/codebrowser/html_report/ClickHouse/src/index.html). It provides code navigation and semantic highlighting, search and indexing. The code snapshot is updated daily.
 
 Also, you can browse sources on [GitHub](https://github.com/ClickHouse/ClickHouse) as usual.
 
diff --git a/docs/en/development/build-cross-arm.md b/docs/en/development/build-cross-arm.md
index 7c2b002d638..eb99105a857 100644
--- a/docs/en/development/build-cross-arm.md
+++ b/docs/en/development/build-cross-arm.md
@@ -9,15 +9,11 @@ This is for the case when you have Linux machine and want to use it to build `cl
 
 The cross-build for AARCH64 is based on the [Build instructions](../development/build.md), follow them first.
 
-## Install Clang-8 {#install-clang-8}
+## Install Clang-13
 
-Follow the instructions from https://apt.llvm.org/ for your Ubuntu or Debian setup.
-For example, in Ubuntu Bionic you can use the following commands:
-
-``` bash
-echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-sudo apt-get update
-sudo apt-get install clang-8
+Follow the instructions from https://apt.llvm.org/ for your Ubuntu or Debian setup or do
+```
+sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 ```
 
 ## Install Cross-Compilation Toolset {#install-cross-compilation-toolset}
@@ -34,7 +30,7 @@ tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build-aarch64/cma
 ``` bash
 cd ClickHouse
 mkdir build-arm64
-CC=clang-8 CXX=clang++-8 cmake . -Bbuild-arm64 -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-aarch64.cmake
+CC=clang-13 CXX=clang++-13 cmake . -Bbuild-arm64 -DCMAKE_TOOLCHAIN_FILE=cmake/linux/toolchain-aarch64.cmake
 ninja -C build-arm64
 ```
 
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index 687e0179e07..0cd69312bb6 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -3,9 +3,15 @@ toc_priority: 65
 toc_title: Build on Mac OS X
 ---
 
+# You don't have to build ClickHouse
+
+You can install ClickHouse as follows: https://clickhouse.com/#quick-start
+Choose Mac x86 or M1.
+
 # How to Build ClickHouse on Mac OS X {#how-to-build-clickhouse-on-mac-os-x}
 
-Build should work on x86_64 (Intel) and arm64 (Apple Silicon) based macOS 10.15 (Catalina) and higher with recent Xcode's native AppleClang, or Homebrew's vanilla Clang or GCC compilers.
+Build should work on x86_64 (Intel) and arm64 (Apple Silicon) based macOS 10.15 (Catalina) and higher with Homebrew's vanilla Clang.
+It is always recommended to use `clang` compiler. It is possible to use XCode's `AppleClang` or `gcc` but it's strongly discouraged.
 
 ## Install Homebrew {#install-homebrew}
 
@@ -45,18 +51,6 @@ git clone --recursive git@github.com:ClickHouse/ClickHouse.git
 
 ## Build ClickHouse {#build-clickhouse}
 
-To build using Xcode's native AppleClang compiler:
-
-``` bash
-cd ClickHouse
-rm -rf build
-mkdir build
-cd build
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
-cmake --build . --config RelWithDebInfo
-cd ..
-```
-
 To build using Homebrew's vanilla Clang compiler:
 
 ``` bash
@@ -69,14 +63,26 @@ cmake --build . --config RelWithDebInfo
 cd ..
 ```
 
-To build using Homebrew's vanilla GCC compiler:
+To build using Xcode's native AppleClang compiler (this option is strongly not recommended; use the option above):
 
 ``` bash
 cd ClickHouse
 rm -rf build
 mkdir build
 cd build
-cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake --build . --config RelWithDebInfo
+cd ..
+```
+
+To build using Homebrew's vanilla GCC compiler (this option is absolutely not recommended, I'm wondering why do we ever have it):
+
+``` bash
+cd ClickHouse
+rm -rf build
+mkdir build
+cd build
+cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-11 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-11 -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 cmake --build . --config RelWithDebInfo
 cd ..
 ```
@@ -114,15 +120,25 @@ To do so, create the `/Library/LaunchDaemons/limit.maxfiles.plist` file with the
 </plist>
 ```
 
-Execute the following command:
+Give the file correct permissions:
 
 ``` bash
 sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 ```
 
-Reboot.
+Validate that the file is correct:
 
-To check if it’s working, you can use `ulimit -n` command.
+``` bash
+plutil /Library/LaunchDaemons/limit.maxfiles.plist
+```
+
+Load the file (or reboot):
+
+``` bash
+sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist
+```
+
+To check if it’s working, use the `ulimit -n` or `launchctl limit maxfiles` commands.
 
 ## Run ClickHouse server:
 
@@ -131,4 +147,4 @@ cd ClickHouse
 ./build/programs/clickhouse-server --config-file ./programs/server/config.xml
 ```
 
-[Original article](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index 97b477d55a5..633549c68f3 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -23,7 +23,7 @@ $ sudo apt-get install git cmake python ninja-build
 
 Or cmake3 instead of cmake on older systems.
 
-### Install clang-11 (recommended) {#install-clang-11}
+### Install clang-13 (recommended) {#install-clang-13}
 
 On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
 
@@ -33,11 +33,11 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 For other Linux distribution - check the availability of the [prebuild packages](https://releases.llvm.org/download.html) or build clang [from sources](https://clang.llvm.org/get_started.html).
 
-#### Use clang-11 for Builds
+#### Use clang-13 for Builds
 
 ``` bash
-$ export CC=clang-11
-$ export CXX=clang++-11
+$ export CC=clang-13
+$ export CXX=clang++-13
 ```
 
 Gcc can also be used though it is discouraged.
@@ -155,6 +155,10 @@ Normally ClickHouse is statically linked into a single static `clickhouse` binar
 -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1
 ```
 
-Note that in this configuration there is no single `clickhouse` binary, and you have to run `clickhouse-server`, `clickhouse-client` etc.
+Note that the split build has several drawbacks:
+* There is no single `clickhouse` binary, and you have to run `clickhouse-server`, `clickhouse-client`, etc.
+* Risk of segfault if you run any of the programs while rebuilding the project.
+* You cannot run the integration tests since they only work a single complete binary.
+* You can't easily copy the binaries elsewhere. Instead of moving a single binary you'll need to copy all binaries and libraries.
 
-[Original article](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/build/) <!--hide-->
diff --git a/docs/en/development/continuous-integration.md b/docs/en/development/continuous-integration.md
index 95a7e7bbc69..0176a2dcb76 100644
--- a/docs/en/development/continuous-integration.md
+++ b/docs/en/development/continuous-integration.md
@@ -117,7 +117,7 @@ described [here](tests.md#functional-test-locally).
 
 ## Build Check {#build-check}
 
-Builds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The `cmake` options can be found in the build log, grepping for `cmake`. Use these options and follow the [general build process](build.md).
+Builds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The `cmake` options can be found in the build log, grepping for `cmake`. Use these options and follow the [general build process](../development/build.md).
 
 ### Report Details
 
@@ -127,7 +127,7 @@ Builds ClickHouse in various configurations for use in further steps. You have t
 - **Build type**: `Debug` or `RelWithDebInfo` (cmake).
 - **Sanitizer**: `none` (without sanitizers), `address` (ASan), `memory` (MSan), `undefined` (UBSan), or `thread` (TSan).
 - **Bundled**: `bundled` build uses libraries from `contrib` folder, and `unbundled` build uses system libraries.
-- **Splitted** `splitted` is a [split build](build.md#split-build)
+- **Splitted** `splitted` is a [split build](../development/build.md#split-build)
 - **Status**: `success` or `fail`
 - **Build log**: link to the building and files copying log, useful when build failed.
 - **Build time**.
@@ -157,7 +157,7 @@ etc. Look at the report to see which tests fail, then reproduce the failure
 locally as described [here](tests.md#functional-test-locally). Note that you
 have to use the correct build configuration to reproduce -- a test might fail
 under AddressSanitizer but pass in Debug. Download the binary from [CI build
-checks page](build.md#you-dont-have-to-build-clickhouse), or build it locally.
+checks page](../development/build.md#you-dont-have-to-build-clickhouse), or build it locally.
 
 
 ## Functional Stateful Tests
@@ -183,11 +183,11 @@ concurrency-related errors. If it fails:
 
 ## Split Build Smoke Test
 
-Checks that the server build in [split build](build.md#split-build)
+Checks that the server build in [split build](../development/build.md#split-build)
 configuration can start and run simple queries.  If it fails:
 
     * Fix other test errors first;
-    * Build the server in [split build](build.md#split-build) configuration
+    * Build the server in [split build](../development/build.md#split-build) configuration
       locally and check whether it can start and run `select 1`.
 
 
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 9daf6148324..a9b9a5d1e44 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -5,91 +5,93 @@ toc_title: Third-Party Libraries Used
 
 # Third-Party Libraries Used {#third-party-libraries-used}
 
+The list of third-party libraries:
+
+| Library name | License type |
+|:-|:-|
+| abseil-cpp | [Apache](https://github.com/ClickHouse-Extras/abseil-cpp/blob/4f3b686f86c3ebaba7e4e926e62a79cb1c659a54/LICENSE) |
+| AMQP-CPP | [Apache](https://github.com/ClickHouse-Extras/AMQP-CPP/blob/1a6c51f4ac51ac56610fa95081bd2f349911375a/LICENSE) |
+| arrow | [Apache](https://github.com/ClickHouse-Extras/arrow/blob/078e21bad344747b7656ef2d7a4f7410a0a303eb/LICENSE.txt) |
+| avro | [Apache](https://github.com/ClickHouse-Extras/avro/blob/e43c46e87fd32eafdc09471e95344555454c5ef8/LICENSE.txt) |
+| aws | [Apache](https://github.com/ClickHouse-Extras/aws-sdk-cpp/blob/7d48b2c8193679cc4516e5bd68ae4a64b94dae7d/LICENSE.txt) |
+| aws-c-common | [Apache](https://github.com/ClickHouse-Extras/aws-c-common/blob/736a82d1697c108b04a277e66438a7f4e19b6857/LICENSE) |
+| aws-c-event-stream | [Apache](https://github.com/ClickHouse-Extras/aws-c-event-stream/blob/3bc33662f9ccff4f4cbcf9509cc78c26e022fde0/LICENSE) |
+| aws-checksums | [Apache](https://github.com/ClickHouse-Extras/aws-checksums/blob/519d6d9093819b6cf89ffff589a27ef8f83d0f65/LICENSE) |
+| base64 | [BSD 2-clause](https://github.com/ClickHouse-Extras/Turbo-Base64/blob/af9b331f2b4f30b41c70f3a571ff904a8251c1d3/LICENSE) |
+| boost | [Boost](https://github.com/ClickHouse-Extras/boost/blob/9cf09dbfd55a5c6202dedbdf40781a51b02c2675/LICENSE_1_0.txt) |
+| boringssl | [BSD](https://github.com/ClickHouse-Extras/boringssl/blob/a6a2e2ab3e44d97ce98e51c558e989f211de7eb3/LICENSE) |
+| brotli | [MIT](https://github.com/google/brotli/blob/63be8a99401992075c23e99f7c84de1c653e39e2/LICENSE) |
+| capnproto | [MIT](https://github.com/capnproto/capnproto/blob/a00ccd91b3746ef2ab51d40fe3265829949d1ace/LICENSE) |
+| cassandra | [Apache](https://github.com/ClickHouse-Extras/cpp-driver/blob/eb9b68dadbb4417a2c132ad4a1c2fa76e65e6fc1/LICENSE.txt) |
+| cctz | [Apache](https://github.com/ClickHouse-Extras/cctz/blob/c0f1bcb97fd2782f7c3f972fadd5aad5affac4b8/LICENSE.txt) |
+| cityhash102 | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/cityhash102/COPYING) |
+| cppkafka | [BSD 2-clause](https://github.com/mfontanini/cppkafka/blob/5a119f689f8a4d90d10a9635e7ee2bee5c127de1/LICENSE) |
+| croaring | [Apache](https://github.com/RoaringBitmap/CRoaring/blob/2c867e9f9c9e2a3a7032791f94c4c7ae3013f6e0/LICENSE) |
+| curl | [Apache](https://github.com/curl/curl/blob/3b8bbbbd1609c638a3d3d0acb148a33dedb67be3/docs/LICENSE-MIXING.md) |
+| cyrus-sasl | [BSD 2-clause](https://github.com/ClickHouse-Extras/cyrus-sasl/blob/e6466edfd638cc5073debe941c53345b18a09512/COPYING) |
+| double-conversion | [BSD 3-clause](https://github.com/google/double-conversion/blob/cf2f0f3d547dc73b4612028a155b80536902ba02/LICENSE) |
+| dragonbox | [Apache](https://github.com/ClickHouse-Extras/dragonbox/blob/923705af6fd953aa948fc175f6020b15f7359838/LICENSE-Apache2-LLVM) |
+| fast_float | [Apache](https://github.com/fastfloat/fast_float/blob/7eae925b51fd0f570ccd5c880c12e3e27a23b86f/LICENSE) |
+| fastops | [MIT](https://github.com/ClickHouse-Extras/fastops/blob/88752a5e03cf34639a4a37a4b41d8b463fffd2b5/LICENSE) |
+| flatbuffers | [Apache](https://github.com/ClickHouse-Extras/flatbuffers/blob/eb3f827948241ce0e701516f16cd67324802bce9/LICENSE.txt) |
+| fmtlib | [Unknown](https://github.com/fmtlib/fmt/blob/c108ee1d590089ccf642fc85652b845924067af2/LICENSE.rst) |
+| gcem | [Apache](https://github.com/kthohr/gcem/blob/8d4f1b5d76ea8f6ff12f3f4f34cda45424556b00/LICENSE) |
+| googletest | [BSD 3-clause](https://github.com/google/googletest/blob/e7e591764baba0a0c3c9ad0014430e7a27331d16/LICENSE) |
+| grpc | [Apache](https://github.com/ClickHouse-Extras/grpc/blob/60c986e15cae70aade721d26badabab1f822fdd6/LICENSE) |
+| h3 | [Apache](https://github.com/ClickHouse-Extras/h3/blob/c7f46cfd71fb60e2fefc90e28abe81657deff735/LICENSE) |
+| hyperscan | [Boost](https://github.com/ClickHouse-Extras/hyperscan/blob/e9f08df0213fc637aac0a5bbde9beeaeba2fe9fa/LICENSE) |
+| icu | [Public Domain](https://github.com/unicode-org/icu/blob/faa2f9f9e1fe74c5ed00eba371d2830134cdbea1/icu4c/LICENSE) |
+| icudata | [Public Domain](https://github.com/ClickHouse-Extras/icudata/blob/f020820388e3faafb44cc643574a2d563dfde572/LICENSE) |
+| jemalloc | [BSD 2-clause](https://github.com/ClickHouse-Extras/jemalloc/blob/e6891d9746143bf2cf617493d880ba5a0b9a3efd/COPYING) |
+| krb5 | [MIT](https://github.com/ClickHouse-Extras/krb5/blob/5149dea4e2be0f67707383d2682b897c14631374/src/lib/gssapi/LICENSE) |
+| libc-headers | [LGPL](https://github.com/ClickHouse-Extras/libc-headers/blob/a720b7105a610acbd7427eea475a5b6810c151eb/LICENSE) |
+| libcpuid | [BSD 2-clause](https://github.com/ClickHouse-Extras/libcpuid/blob/8db3b8d2d32d22437f063ce692a1b9bb15e42d18/COPYING) |
+| libcxx | [Apache](https://github.com/ClickHouse-Extras/libcxx/blob/2fa892f69acbaa40f8a18c6484854a6183a34482/LICENSE.TXT) |
+| libcxxabi | [Apache](https://github.com/ClickHouse-Extras/libcxxabi/blob/df8f1e727dbc9e2bedf2282096fa189dc3fe0076/LICENSE.TXT) |
+| libdivide | [zLib](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libdivide/LICENSE.txt) |
+| libfarmhash | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libfarmhash/COPYING) |
+| libgsasl | [LGPL](https://github.com/ClickHouse-Extras/libgsasl/blob/383ee28e82f69fa16ed43b48bd9c8ee5b313ab84/LICENSE) |
+| libhdfs3 | [Apache](https://github.com/ClickHouse-Extras/libhdfs3/blob/095b9d48b400abb72d967cb0539af13b1e3d90cf/LICENSE.txt) |
+| libmetrohash | [Apache](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libmetrohash/LICENSE) |
+| libpq | [Unknown](https://github.com/ClickHouse-Extras/libpq/blob/e071ea570f8985aa00e34f5b9d50a3cfe666327e/COPYRIGHT) |
+| libpqxx | [BSD 3-clause](https://github.com/ClickHouse-Extras/libpqxx/blob/357608d11b7a1961c3fb7db2ef9a5dbb2e87da77/COPYING) |
+| librdkafka | [MIT](https://github.com/ClickHouse-Extras/librdkafka/blob/b8554f1682062c85ba519eb54ef2f90e02b812cb/LICENSE.murmur2) |
+| libunwind | [Apache](https://github.com/ClickHouse-Extras/libunwind/blob/6b816d2fba3991f8fd6aaec17d92f68947eab667/LICENSE.TXT) |
+| libuv | [BSD](https://github.com/ClickHouse-Extras/libuv/blob/e2e9b7e9f978ce8a1367b5fe781d97d1ce9f94ab/LICENSE) |
+| llvm | [Apache](https://github.com/ClickHouse-Extras/llvm/blob/e5751459412bce1391fb7a2e9bbc01e131bf72f1/llvm/LICENSE.TXT) |
+| lz4 | [BSD](https://github.com/lz4/lz4/blob/f39b79fb02962a1cd880bbdecb6dffba4f754a11/LICENSE) |
+| mariadb-connector-c | [LGPL](https://github.com/ClickHouse-Extras/mariadb-connector-c/blob/5f4034a3a6376416504f17186c55fe401c6d8e5e/COPYING.LIB) |
+| miniselect | [Boost](https://github.com/danlark1/miniselect/blob/be0af6bd0b6eb044d1acc4f754b229972d99903a/LICENSE_1_0.txt) |
+| msgpack-c | [Boost](https://github.com/msgpack/msgpack-c/blob/46684265d50b5d1b062d4c5c428ba08462844b1d/LICENSE_1_0.txt) |
+| murmurhash | [Public Domain](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/murmurhash/LICENSE) |
+| NuRaft | [Apache](https://github.com/ClickHouse-Extras/NuRaft/blob/7ecb16844af6a9c283ad432d85ecc2e7d1544676/LICENSE) |
+| openldap | [Unknown](https://github.com/ClickHouse-Extras/openldap/blob/0208811b6043ca06fda8631a5e473df1ec515ccb/LICENSE) |
+| orc | [Apache](https://github.com/ClickHouse-Extras/orc/blob/0a936f6bbdb9303308973073f8623b5a8d82eae1/LICENSE) |
+| poco | [Boost](https://github.com/ClickHouse-Extras/poco/blob/7351c4691b5d401f59e3959adfc5b4fa263b32da/LICENSE) |
+| protobuf | [BSD 3-clause](https://github.com/ClickHouse-Extras/protobuf/blob/75601841d172c73ae6bf4ce8121f42b875cdbabd/LICENSE) |
+| rapidjson | [MIT](https://github.com/ClickHouse-Extras/rapidjson/blob/c4ef90ccdbc21d5d5a628d08316bfd301e32d6fa/bin/jsonschema/LICENSE) |
+| re2 | [BSD 3-clause](https://github.com/google/re2/blob/13ebb377c6ad763ca61d12dd6f88b1126bd0b911/LICENSE) |
+| replxx | [BSD 3-clause](https://github.com/ClickHouse-Extras/replxx/blob/c81be6c68b146f15f2096b7ef80e3f21fe27004c/LICENSE.md) |
+| rocksdb | [BSD 3-clause](https://github.com/ClickHouse-Extras/rocksdb/blob/b6480c69bf3ab6e298e0d019a07fd4f69029b26a/LICENSE.leveldb) |
+| s2geometry | [Apache](https://github.com/ClickHouse-Extras/s2geometry/blob/20ea540d81f4575a3fc0aea585aac611bcd03ede/LICENSE) |
+| sentry-native | [MIT](https://github.com/ClickHouse-Extras/sentry-native/blob/94644e92f0a3ff14bd35ed902a8622a2d15f7be4/LICENSE) |
+| simdjson | [Apache](https://github.com/simdjson/simdjson/blob/8df32cea3359cb30120795da6020b3b73da01d38/LICENSE) |
+| snappy | [Public Domain](https://github.com/google/snappy/blob/3f194acb57e0487531c96b97af61dcbd025a78a3/COPYING) |
+| sparsehash-c11 | [BSD 3-clause](https://github.com/sparsehash/sparsehash-c11/blob/cf0bffaa456f23bc4174462a789b90f8b6f5f42f/LICENSE) |
+| stats | [Apache](https://github.com/kthohr/stats/blob/b6dd459c10a88c7ea04693c007e9e35820c5d9ad/LICENSE) |
+| thrift | [Apache](https://github.com/apache/thrift/blob/010ccf0a0c7023fea0f6bf4e4078ebdff7e61982/LICENSE) |
+| unixodbc | [LGPL](https://github.com/ClickHouse-Extras/UnixODBC/blob/b0ad30f7f6289c12b76f04bfb9d466374bb32168/COPYING) |
+| xz | [Public Domain](https://github.com/xz-mirror/xz/blob/869b9d1b4edd6df07f819d360d306251f8147353/COPYING) |
+| zlib-ng | [zLib](https://github.com/ClickHouse-Extras/zlib-ng/blob/6a5e93b9007782115f7f7e5235dedc81c4f1facb/LICENSE.md) |
+| zstd | [BSD](https://github.com/facebook/zstd/blob/a488ba114ec17ea1054b9057c26a046fc122b3b6/LICENSE) |
+
 The list of third-party libraries can be obtained by the following query:
 
 ``` sql
 SELECT library_name, license_type, license_path FROM system.licenses ORDER BY library_name COLLATE 'en';
 ```
 
-[Example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
-
-| library_name | license_type | license_path |
-|:-|:-|:-|
-| abseil-cpp | Apache | /contrib/abseil-cpp/LICENSE |
-| AMQP-CPP | Apache | /contrib/AMQP-CPP/LICENSE |
-| arrow | Apache | /contrib/arrow/LICENSE.txt |
-| avro | Apache | /contrib/avro/LICENSE.txt |
-| aws | Apache | /contrib/aws/LICENSE.txt |
-| aws-c-common | Apache | /contrib/aws-c-common/LICENSE |
-| aws-c-event-stream | Apache | /contrib/aws-c-event-stream/LICENSE |
-| aws-checksums | Apache | /contrib/aws-checksums/LICENSE |
-| base64 | BSD 2-clause | /contrib/base64/LICENSE |
-| boost | Boost | /contrib/boost/LICENSE_1_0.txt |
-| boringssl | BSD | /contrib/boringssl/LICENSE |
-| brotli | MIT | /contrib/brotli/LICENSE |
-| capnproto | MIT | /contrib/capnproto/LICENSE |
-| cassandra | Apache | /contrib/cassandra/LICENSE.txt |
-| cctz | Apache | /contrib/cctz/LICENSE.txt |
-| cityhash102 | MIT | /contrib/cityhash102/COPYING |
-| cppkafka | BSD 2-clause | /contrib/cppkafka/LICENSE |
-| croaring | Apache | /contrib/croaring/LICENSE |
-| curl | Apache | /contrib/curl/docs/LICENSE-MIXING.md |
-| cyrus-sasl | BSD 2-clause | /contrib/cyrus-sasl/COPYING |
-| double-conversion | BSD 3-clause | /contrib/double-conversion/LICENSE |
-| dragonbox | Apache | /contrib/dragonbox/LICENSE-Apache2-LLVM |
-| fast_float | Apache | /contrib/fast_float/LICENSE |
-| fastops | MIT | /contrib/fastops/LICENSE |
-| flatbuffers | Apache | /contrib/flatbuffers/LICENSE.txt |
-| fmtlib | Unknown | /contrib/fmtlib/LICENSE.rst |
-| gcem | Apache | /contrib/gcem/LICENSE |
-| googletest | BSD 3-clause | /contrib/googletest/LICENSE |
-| grpc | Apache | /contrib/grpc/LICENSE |
-| h3 | Apache | /contrib/h3/LICENSE |
-| hyperscan | Boost | /contrib/hyperscan/LICENSE |
-| icu | Public Domain | /contrib/icu/icu4c/LICENSE |
-| icudata | Public Domain | /contrib/icudata/LICENSE |
-| jemalloc | BSD 2-clause | /contrib/jemalloc/COPYING |
-| krb5 | MIT | /contrib/krb5/src/lib/gssapi/LICENSE |
-| libc-headers | LGPL | /contrib/libc-headers/LICENSE |
-| libcpuid | BSD 2-clause | /contrib/libcpuid/COPYING |
-| libcxx | Apache | /contrib/libcxx/LICENSE.TXT |
-| libcxxabi | Apache | /contrib/libcxxabi/LICENSE.TXT |
-| libdivide | zLib | /contrib/libdivide/LICENSE.txt |
-| libfarmhash | MIT | /contrib/libfarmhash/COPYING |
-| libgsasl | LGPL | /contrib/libgsasl/LICENSE |
-| libhdfs3 | Apache | /contrib/libhdfs3/LICENSE.txt |
-| libmetrohash | Apache | /contrib/libmetrohash/LICENSE |
-| libpq | Unknown | /contrib/libpq/COPYRIGHT |
-| libpqxx | BSD 3-clause | /contrib/libpqxx/COPYING |
-| librdkafka | MIT | /contrib/librdkafka/LICENSE.murmur2 |
-| libunwind | Apache | /contrib/libunwind/LICENSE.TXT |
-| libuv | BSD | /contrib/libuv/LICENSE |
-| llvm | Apache | /contrib/llvm/llvm/LICENSE.TXT |
-| lz4 | BSD | /contrib/lz4/LICENSE |
-| mariadb-connector-c | LGPL | /contrib/mariadb-connector-c/COPYING.LIB |
-| miniselect | Boost | /contrib/miniselect/LICENSE_1_0.txt |
-| msgpack-c | Boost | /contrib/msgpack-c/LICENSE_1_0.txt |
-| murmurhash | Public Domain | /contrib/murmurhash/LICENSE |
-| NuRaft | Apache | /contrib/NuRaft/LICENSE |
-| openldap | Unknown | /contrib/openldap/LICENSE |
-| orc | Apache | /contrib/orc/LICENSE |
-| poco | Boost | /contrib/poco/LICENSE |
-| protobuf | BSD 3-clause | /contrib/protobuf/LICENSE |
-| rapidjson | MIT | /contrib/rapidjson/bin/jsonschema/LICENSE |
-| re2 | BSD 3-clause | /contrib/re2/LICENSE |
-| replxx | BSD 3-clause | /contrib/replxx/LICENSE.md |
-| rocksdb | BSD 3-clause | /contrib/rocksdb/LICENSE.leveldb |
-| s2geometry | Apache | /contrib/s2geometry/LICENSE |
-| sentry-native | MIT | /contrib/sentry-native/LICENSE |
-| simdjson | Apache | /contrib/simdjson/LICENSE |
-| snappy | Public Domain | /contrib/snappy/COPYING |
-| sparsehash-c11 | BSD 3-clause | /contrib/sparsehash-c11/LICENSE |
-| stats | Apache | /contrib/stats/LICENSE |
-| thrift | Apache | /contrib/thrift/LICENSE |
-| unixodbc | LGPL | /contrib/unixodbc/COPYING |
-| xz | Public Domain | /contrib/xz/COPYING |
-| zlib-ng | zLib | /contrib/zlib-ng/LICENSE.md |
-| zstd | BSD | /contrib/zstd/LICENSE |
+[Example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
 
 ## Guidelines for adding new third-party libraries and maintaining custom changes in them {#adding-third-party-libraries}
 
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index 537ed6a9c4f..024ce27d60d 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -37,7 +37,7 @@ Next, you need to download the source files onto your working machine. This is c
 
 In the command line terminal run:
 
-    git clone --recursive git@github.com:your_github_username/ClickHouse.git
+    git clone git@github.com:your_github_username/ClickHouse.git
     cd ClickHouse
 
 Note: please, substitute *your_github_username* with what is appropriate!
@@ -79,7 +79,7 @@ After successfully running this command you will be able to pull updates from th
 
 Working with submodules in git could be painful. Next commands will help to manage it:
 
-    # ! each command accepts --recursive
+    # ! each command accepts
     # Update remote URLs for submodules. Barely rare case
     git submodule sync
     # Add new submodules
@@ -92,16 +92,16 @@ Working with submodules in git could be painful. Next commands will help to mana
 The next commands would help you to reset all submodules to the initial state (!WARNING! - any changes inside will be deleted):
 
     # Synchronizes submodules' remote URL with .gitmodules
-    git submodule sync --recursive
+    git submodule sync
     # Update the registered submodules with initialize not yet initialized
-    git submodule update --init --recursive
+    git submodule update --init
     # Reset all changes done after HEAD
     git submodule foreach git reset --hard
     # Clean files from .gitignore
     git submodule foreach git clean -xfd
     # Repeat last 4 commands for all submodule
-    git submodule foreach git submodule sync --recursive
-    git submodule foreach git submodule update --init --recursive
+    git submodule foreach git submodule sync
+    git submodule foreach git submodule update --init
     git submodule foreach git submodule foreach git reset --hard
     git submodule foreach git submodule foreach git clean -xfd
 
@@ -233,13 +233,13 @@ Just in case, it is worth mentioning that CLion creates `build` path on its own,
 
 ## Writing Code {#writing-code}
 
-The description of ClickHouse architecture can be found here: https://clickhouse.tech/docs/en/development/architecture/
+The description of ClickHouse architecture can be found here: https://clickhouse.com/docs/en/development/architecture/
 
-The Code Style Guide: https://clickhouse.tech/docs/en/development/style/
+The Code Style Guide: https://clickhouse.com/docs/en/development/style/
 
-Adding third-party libraries: https://clickhouse.tech/docs/en/development/contrib/#adding-third-party-libraries
+Adding third-party libraries: https://clickhouse.com/docs/en/development/contrib/#adding-third-party-libraries
 
-Writing tests: https://clickhouse.tech/docs/en/development/tests/
+Writing tests: https://clickhouse.com/docs/en/development/tests/
 
 List of tasks: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
@@ -249,8 +249,8 @@ Developing ClickHouse often requires loading realistic datasets. It is particula
 
     sudo apt install wget xz-utils
 
-    wget https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz
-    wget https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz
 
     xz -v -d hits_v1.tsv.xz
     xz -v -d visits_v1.tsv.xz
diff --git a/docs/en/development/index.md b/docs/en/development/index.md
index bb4158554d3..f9f0d644973 100644
--- a/docs/en/development/index.md
+++ b/docs/en/development/index.md
@@ -7,4 +7,4 @@ toc_title: hidden
 
 # ClickHouse Development {#clickhouse-development}
 
-[Original article](https://clickhouse.tech/docs/en/development/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/) <!--hide-->
diff --git a/docs/en/development/style.md b/docs/en/development/style.md
index 987df275c1d..bc38f0711cf 100644
--- a/docs/en/development/style.md
+++ b/docs/en/development/style.md
@@ -828,4 +828,4 @@ function(
       size_t limit)
 ```
 
-[Original article](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/style/) <!--hide-->
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index c7c0ec88be4..0e2aa348483 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -239,7 +239,7 @@ Google OSS-Fuzz can be found at `docker/fuzz`.
 We also use simple fuzz test to generate random SQL queries and to check that the server does not die executing them.
 You can find it in `00746_sql_fuzzy.pl`. This test should be run continuously (overnight and longer).
 
-We also use sophisticated AST-based query fuzzer that is able to find huge amount of corner cases. It does random permutations and substitutions in queries AST. It remembers AST nodes from previous tests to use them for fuzzing of subsequent tests while processing them in random order. You can learn more about this fuzzer in [this blog article](https://clickhouse.tech/blog/en/2021/fuzzing-clickhouse/).
+We also use sophisticated AST-based query fuzzer that is able to find huge amount of corner cases. It does random permutations and substitutions in queries AST. It remembers AST nodes from previous tests to use them for fuzzing of subsequent tests while processing them in random order. You can learn more about this fuzzer in [this blog article](https://clickhouse.com/blog/en/2021/fuzzing-clickhouse/).
 
 ## Stress test
 
@@ -341,4 +341,4 @@ Build jobs and tests are run in Sandbox on per commit basis. Resulting packages
 We do not use Travis CI due to the limit on time and computational power.
 We do not use Jenkins. It was used before and now we are happy we are not using Jenkins.
 
-[Original article](https://clickhouse.tech/docs/en/development/tests/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/tests/) <!--hide-->
diff --git a/docs/en/engines/database-engines/atomic.md b/docs/en/engines/database-engines/atomic.md
index bdab87aa4b1..1e555a0a502 100644
--- a/docs/en/engines/database-engines/atomic.md
+++ b/docs/en/engines/database-engines/atomic.md
@@ -5,12 +5,12 @@ toc_title: Atomic
 
 # Atomic {#atomic}
 
-It supports non-blocking [DROP TABLE](#drop-detach-table) and [RENAME TABLE](#rename-table) queries and atomic [EXCHANGE TABLES t1 AND t2](#exchange-tables) queries. `Atomic` database engine is used by default.
+It supports non-blocking [DROP TABLE](#drop-detach-table) and [RENAME TABLE](#rename-table) queries and atomic [EXCHANGE TABLES](#exchange-tables) queries. `Atomic` database engine is used by default.
 
 ## Creating a Database {#creating-a-database}
 
 ``` sql
-    CREATE DATABASE test[ ENGINE = Atomic];
+CREATE DATABASE test [ENGINE = Atomic];
 ```
 
 ## Specifics and recommendations {#specifics-and-recommendations}
@@ -25,16 +25,16 @@ CREATE TABLE name UUID '28f1c61c-2970-457a-bffe-454156ddcfef' (n UInt64) ENGINE
 ```
 ### RENAME TABLE {#rename-table}
 
-`RENAME` queries are performed without changing UUID and moving table data. These queries do not wait for the completion of queries using the table and will be executed instantly.
+[RENAME](../../sql-reference/statements/rename.md) queries are performed without changing UUID and moving table data. These queries do not wait for the completion of queries using the table and are executed instantly.
 
 ### DROP/DETACH TABLE {#drop-detach-table}
 
-On `DROP TABLE` no data is removed, database `Atomic` just marks table as dropped by moving metadata to `/clickhouse_path/metadata_dropped/` and notifies background thread. Delay before final table data deletion is specify by [database_atomic_delay_before_drop_table_sec](../../operations/server-configuration-parameters/settings.md#database_atomic_delay_before_drop_table_sec) setting.
+On `DROP TABLE` no data is removed, database `Atomic` just marks table as dropped by moving metadata to `/clickhouse_path/metadata_dropped/` and notifies background thread. Delay before final table data deletion is specified by the [database_atomic_delay_before_drop_table_sec](../../operations/server-configuration-parameters/settings.md#database_atomic_delay_before_drop_table_sec) setting.
 You can specify synchronous mode using `SYNC` modifier. Use the [database_atomic_wait_for_drop_and_detach_synchronously](../../operations/settings/settings.md#database_atomic_wait_for_drop_and_detach_synchronously) setting to do this. In this case `DROP` waits for running `SELECT`, `INSERT` and other queries which are using the table to finish. Table will be actually removed when it's not in use.
 
-### EXCHANGE TABLES {#exchange-tables}
+### EXCHANGE TABLES/DICTIONARIES {#exchange-tables}
 
-`EXCHANGE` query swaps tables atomically. So instead of this non-atomic operation:
+[EXCHANGE](../../sql-reference/statements/exchange.md) query swaps tables or dictionaries atomically. For instance, instead of this non-atomic operation:
 
 ```sql
 RENAME TABLE new_table TO tmp, old_table TO new_table, tmp TO old_table;
@@ -47,7 +47,7 @@ EXCHANGE TABLES new_table AND old_table;
 
 ### ReplicatedMergeTree in Atomic Database {#replicatedmergetree-in-atomic-database}
 
-For [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) tables, it is recommended to not specify engine parameters - path in ZooKeeper and replica name. In this case, configuration parameters will be used [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) and [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). If you want to specify engine parameters explicitly, it is recommended to use `{uuid}` macros. This is useful so that unique paths are automatically generated for each table in ZooKeeper.
+For [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) tables, it is recommended not to specify engine parameters - path in ZooKeeper and replica name. In this case, configuration parameters [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) and [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name) will be used. If you want to specify engine parameters explicitly, it is recommended to use `{uuid}` macros. This is useful so that unique paths are automatically generated for each table in ZooKeeper.
 
 ## See Also
 
diff --git a/docs/en/engines/database-engines/index.md b/docs/en/engines/database-engines/index.md
index 264f7a44a4e..dd8959d2700 100644
--- a/docs/en/engines/database-engines/index.md
+++ b/docs/en/engines/database-engines/index.md
@@ -8,7 +8,7 @@ toc_title: Introduction
 
 Database engines allow you to work with tables.
 
-By default, ClickHouse uses database engine [Atomic](../../engines/database-engines/atomic.md). It is provides configurable [table engines](../../engines/table-engines/index.md) and an [SQL dialect](../../sql-reference/syntax.md).
+By default, ClickHouse uses database engine [Atomic](../../engines/database-engines/atomic.md). It provides configurable [table engines](../../engines/table-engines/index.md) and an [SQL dialect](../../sql-reference/syntax.md).
 
 You can also use the following database engines:
 
@@ -23,3 +23,5 @@ You can also use the following database engines:
 -   [PostgreSQL](../../engines/database-engines/postgresql.md)
 
 -   [Replicated](../../engines/database-engines/replicated.md)
+
+-   [SQLite](../../engines/database-engines/sqlite.md)
diff --git a/docs/en/engines/database-engines/lazy.md b/docs/en/engines/database-engines/lazy.md
index c59abec0ba5..ecd4b94f579 100644
--- a/docs/en/engines/database-engines/lazy.md
+++ b/docs/en/engines/database-engines/lazy.md
@@ -13,4 +13,4 @@ It’s optimized for storing many small \*Log tables, for which there is a long
 
     CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
 
-[Original article](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/en/engines/database-engines/materialized-mysql.md b/docs/en/engines/database-engines/materialized-mysql.md
index 20e16473115..5aa969daf88 100644
--- a/docs/en/engines/database-engines/materialized-mysql.md
+++ b/docs/en/engines/database-engines/materialized-mysql.md
@@ -3,16 +3,15 @@ toc_priority: 29
 toc_title: MaterializedMySQL
 ---
 
-# MaterializedMySQL {#materialized-mysql}
+# [experimental] MaterializedMySQL {#materialized-mysql}
 
-**This is experimental feature that should not be used in production.**
+!!! warning "Warning"
+    This is an experimental feature that should not be used in production.
 
 Creates ClickHouse database with all the tables existing in MySQL, and all the data in those tables.
 
 ClickHouse server works as MySQL replica. It reads binlog and performs DDL and DML queries.
 
-This feature is experimental.
-
 ## Creating a Database {#creating-a-database}
 
 ``` sql
@@ -28,28 +27,33 @@ ENGINE = MaterializedMySQL('host:port', ['database' | database], 'user', 'passwo
 -   `password` — User password.
 
 **Engine Settings**
--   `max_rows_in_buffer` — Max rows that data is allowed to cache in memory(for single table and the cache data unable to query). when rows is exceeded, the data will be materialized. Default: `65505`.
--   `max_bytes_in_buffer` —  Max bytes that data is allowed to cache in memory(for single table and the cache data unable to query). when rows is exceeded, the data will be materialized. Default: `1048576`.
--   `max_rows_in_buffers` — Max rows that data is allowed to cache in memory(for database and the cache data unable to query). when rows is exceeded, the data will be materialized. Default: `65505`.
--   `max_bytes_in_buffers` — Max bytes that data is allowed to cache in memory(for database and the cache data unable to query). when rows is exceeded, the data will be materialized. Default: `1048576`.
--   `max_flush_data_time` — Max milliseconds that data is allowed to cache in memory(for database and the cache data unable to query). when this time is exceeded, the data will be materialized. Default: `1000`.
--   `max_wait_time_when_mysql_unavailable` — Retry interval when MySQL is not available (milliseconds). Negative value disable retry. Default: `1000`.
--   `allows_query_when_mysql_lost` — Allow query materialized table when mysql is lost. Default: `0` (`false`).
-```
+
+-   `max_rows_in_buffer` — Maximum number of rows that data is allowed to cache in memory (for single table and the cache data unable to query). When this number is exceeded, the data will be materialized. Default: `65 505`.
+-   `max_bytes_in_buffer` —  Maximum number of bytes that data is allowed to cache in memory (for single table and the cache data unable to query). When this number is exceeded, the data will be materialized. Default: `1 048 576`.
+-   `max_rows_in_buffers` — Maximum number of rows that data is allowed to cache in memory (for database and the cache data unable to query). When this number is exceeded, the data will be materialized. Default: `65 505`.
+-   `max_bytes_in_buffers` — Maximum number of bytes that data is allowed to cache in memory (for database and the cache data unable to query). When this number is exceeded, the data will be materialized. Default: `1 048 576`.
+-   `max_flush_data_time` — Maximum number of milliseconds that data is allowed to cache in memory (for database and the cache data unable to query). When this time is exceeded, the data will be materialized. Default: `1000`.
+-   `max_wait_time_when_mysql_unavailable` — Retry interval when MySQL is not available (milliseconds). Negative value disables retry. Default: `1000`.
+-   `allows_query_when_mysql_lost` — Allows to query a materialized table when MySQL is lost. Default: `0` (`false`).
+
+```sql
 CREATE DATABASE mysql ENGINE = MaterializedMySQL('localhost:3306', 'db', 'user', '***')
      SETTINGS
         allows_query_when_mysql_lost=true,
         max_wait_time_when_mysql_unavailable=10000;
 ```
 
-**Settings on MySQL-server side**
+**Settings on MySQL-server Side**
 
-For the correct work of `MaterializeMySQL`, there are few mandatory `MySQL`-side configuration settings that should be set:
+For the correct work of `MaterializedMySQL`, there are few mandatory `MySQL`-side configuration settings that must be set:
 
-- `default_authentication_plugin = mysql_native_password` since `MaterializeMySQL` can only authorize with this method.
-- `gtid_mode = on` since GTID based logging is a mandatory for providing correct `MaterializeMySQL` replication. Pay attention that while turning this mode `On` you should also specify `enforce_gtid_consistency = on`.
+- `default_authentication_plugin = mysql_native_password` since `MaterializedMySQL` can only authorize with this method.
+- `gtid_mode = on` since GTID based logging is a mandatory for providing correct `MaterializedMySQL` replication.
 
-## Virtual columns {#virtual-columns}
+!!! attention "Attention"
+    While turning on `gtid_mode` you should also specify `enforce_gtid_consistency = on`.
+
+## Virtual Columns {#virtual-columns}
 
 When working with the `MaterializedMySQL` database engine, [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) tables are used with virtual `_sign` and `_version` columns.
 
@@ -79,13 +83,13 @@ When working with the `MaterializedMySQL` database engine, [ReplacingMergeTree](
 | BLOB                    | [String](../../sql-reference/data-types/string.md)           |
 | BINARY                  | [FixedString](../../sql-reference/data-types/fixedstring.md) |
 
-Other types are not supported. If MySQL table contains a column of such type, ClickHouse throws exception "Unhandled data type" and stops replication.
-
 [Nullable](../../sql-reference/data-types/nullable.md) is supported.
 
+Other types are not supported. If MySQL table contains a column of such type, ClickHouse throws exception "Unhandled data type" and stops replication.
+
 ## Specifics and Recommendations {#specifics-and-recommendations}
 
-### Compatibility restrictions
+### Compatibility Restrictions {#compatibility-restrictions}
 
 Apart of the data types limitations there are few restrictions comparing to `MySQL` databases, that should be resolved before replication will be possible:
 
@@ -193,4 +197,4 @@ SELECT * FROM mysql.test;
 └───┴─────┴──────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/database-engines/materialized-mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/database-engines/materialized-mysql/) <!--hide-->
diff --git a/docs/en/engines/database-engines/materialized-postgresql.md b/docs/en/engines/database-engines/materialized-postgresql.md
index 6b8c6e86952..0f0ffaca343 100644
--- a/docs/en/engines/database-engines/materialized-postgresql.md
+++ b/docs/en/engines/database-engines/materialized-postgresql.md
@@ -3,45 +3,76 @@ toc_priority: 30
 toc_title: MaterializedPostgreSQL
 ---
 
-# MaterializedPostgreSQL {#materialize-postgresql}
+# [experimental] MaterializedPostgreSQL {#materialize-postgresql}
+
+Creates ClickHouse database with an initial data dump of PostgreSQL database tables and starts replication process, i.e. executes background job to apply new changes as they happen on PostgreSQL database tables in the remote PostgreSQL database.
+
+ClickHouse server works as PostgreSQL replica. It reads WAL and performs DML queries. DDL is not replicated, but can be handled (described below).
 
 ## Creating a Database {#creating-a-database}
 
 ``` sql
-CREATE DATABASE test_database
-ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password'
-
-SELECT * FROM test_database.postgres_table;
+CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
+ENGINE = MaterializedPostgreSQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
 ```
 
+**Engine Parameters**
+
+-   `host:port` — PostgreSQL server endpoint.
+-   `database` — PostgreSQL database name.
+-   `user` — PostgreSQL user.
+-   `password` — User password.
+
+## Dynamically adding new tables to replication
+
+``` sql
+ATTACH TABLE postgres_database.new_table;
+```
+
+It will work as well if there is a setting `materialized_postgresql_tables_list`.
+
+## Dynamically removing tables from replication
+
+``` sql
+DETACH TABLE postgres_database.table_to_remove;
+```
 
 ## Settings {#settings}
 
-1. `materialized_postgresql_max_block_size` - Number of rows collected before flushing data into table. Default: `65536`.
+-   [materialized_postgresql_max_block_size](../../operations/settings/settings.md#materialized-postgresql-max-block-size)
 
-2. `materialized_postgresql_tables_list` - List of tables for MaterializedPostgreSQL database engine. Default: `whole database`.
+-   [materialized_postgresql_tables_list](../../operations/settings/settings.md#materialized-postgresql-tables-list)
 
-3. `materialized_postgresql_allow_automatic_update` - Allow to reload table in the background, when schema changes are detected. Default: `0` (`false`).
+-   [materialized_postgresql_allow_automatic_update](../../operations/settings/settings.md#materialized-postgresql-allow-automatic-update)
+
+-   [materialized_postgresql_replication_slot](../../operations/settings/settings.md#materialized-postgresql-replication-slot)
+
+-   [materialized_postgresql_snapshot](../../operations/settings/settings.md#materialized-postgresql-snapshot)
 
 ``` sql
-CREATE DATABASE test_database
-ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password'
+CREATE DATABASE database1
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password')
 SETTINGS materialized_postgresql_max_block_size = 65536,
          materialized_postgresql_tables_list = 'table1,table2,table3';
 
-SELECT * FROM test_database.table1;
+SELECT * FROM database1.table1;
 ```
 
+It is also possible to change settings at run time.
+
+``` sql
+ALTER DATABASE postgres_database MODIFY SETTING materialized_postgresql_max_block_size = <new_size>;
+```
 
 ## Requirements {#requirements}
 
-- Setting `wal_level`to `logical` and `max_replication_slots` to at least `2` in the postgresql config file.
+1. The [wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html) setting must have a value `logical` and `max_replication_slots` parameter must have a value at least `2` in the PostgreSQL config file.
 
-- Each replicated table must have one of the following **replica identity**:
+2. Each replicated table must have one of the following [replica identity](https://www.postgresql.org/docs/10/sql-altertable.html#SQL-CREATETABLE-REPLICA-IDENTITY):
 
-1. **default** (primary key)
+-   primary key (by default)
 
-2. **index**
+-   index
 
 ``` bash
 postgres# CREATE TABLE postgres_table (a Integer NOT NULL, b Integer, c Integer NOT NULL, d Integer, e Integer NOT NULL);
@@ -49,9 +80,8 @@ postgres# CREATE unique INDEX postgres_table_index on postgres_table(a, c, e);
 postgres# ALTER TABLE postgres_table REPLICA IDENTITY USING INDEX postgres_table_index;
 ```
 
-
-Primary key is always checked first. If it is absent, then index, defined as replica identity index, is checked.
-If index is used as replica identity, there has to be only one such index in a table.
+The primary key is always checked first. If it is absent, then the index, defined as replica identity index, is checked.
+If the index is used as a replica identity, there has to be only one such index in a table.
 You can check what type is used for a specific table with the following command:
 
 ``` bash
@@ -65,7 +95,70 @@ FROM pg_class
 WHERE oid = 'postgres_table'::regclass;
 ```
 
+!!! warning "Warning"
+    Replication of [**TOAST**](https://www.postgresql.org/docs/9.5/storage-toast.html) values is not supported. The default value for the data type will be used.
 
-## Warning {#warning}
+## Example of Use {#example-of-use}
 
-1. **TOAST** values convertion is not supported. Default value for the data type will be used.
+``` sql
+CREATE DATABASE postgresql_db
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password');
+
+SELECT * FROM postgresql_db.postgres_table;
+```
+
+## Notes {#notes}
+
+### Failover of the logical replication slot {#logical-replication-slot-failover}
+
+Logical Replication Slots which exist on the primary are not available on standby replicas.
+So if there is a failover, new primary (the old physical standby) won’t be aware of any slots which were existing with old primary. This will lead to a broken replication from PostgreSQL.
+A solution to this is to manage replication slots yourself and define a permanent replication slot (some information can be found [here](https://patroni.readthedocs.io/en/latest/SETTINGS.html)). You'll need to pass slot name via [materialized_postgresql_replication_slot](../../operations/settings/settings.md#materialized-postgresql-replication-slot) setting, and it has to be exported with `EXPORT SNAPSHOT` option. The snapshot identifier needs to be passed via [materialized_postgresql_snapshot](../../operations/settings/settings.md#materialized-postgresql-snapshot) setting.
+
+Please note that this should be used only if it is actually needed. If there is no real need for that or full understanding why, then it is better to allow the table engine to create and manage its own replication slot.
+
+**Example (from [@bchrobot](https://github.com/bchrobot))** 
+
+1. Configure replication slot in PostgreSQL.
+
+```yaml
+apiVersion: "acid.zalan.do/v1"
+kind: postgresql
+metadata:
+  name: acid-demo-cluster
+spec:
+  numberOfInstances: 2
+  postgresql:
+    parameters:
+      wal_level: logical
+  patroni:
+    slots:
+      clickhouse_sync:
+        type: logical
+        database: demodb
+        plugin: pgoutput
+```
+
+2. Wait for replication slot to be ready, then begin a transaction and export the transaction snapshot identifier:
+
+```sql
+BEGIN;
+SELECT pg_export_snapshot();
+```
+
+3. In ClickHouse create database:
+
+```sql
+CREATE DATABASE demodb
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password')
+SETTINGS
+  materialized_postgresql_replication_slot = 'clickhouse_sync',
+  materialized_postgresql_snapshot = '0000000A-0000023F-3',
+  materialized_postgresql_tables_list = 'table1,table2,table3';
+```
+
+4. End the PostgreSQL transaction once replication to ClickHouse DB is confirmed. Verify that replication continues after failover:
+
+```bash
+kubectl exec acid-demo-cluster-0 -c postgres -- su postgres -c 'patronictl failover --candidate acid-demo-cluster-1 --force'
+```
diff --git a/docs/en/engines/database-engines/mysql.md b/docs/en/engines/database-engines/mysql.md
index 0507be6bd46..c5a1bba44b2 100644
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@@ -147,4 +147,4 @@ SELECT * FROM mysql_db.mysql_table
 └────────┴───────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/en/engines/database-engines/postgresql.md b/docs/en/engines/database-engines/postgresql.md
index 9b250f16e78..76ef484e773 100644
--- a/docs/en/engines/database-engines/postgresql.md
+++ b/docs/en/engines/database-engines/postgresql.md
@@ -15,7 +15,7 @@ Supports table structure modifications (`ALTER TABLE ... ADD|DROP COLUMN`). If `
 
 ``` sql
 CREATE DATABASE test_database
-ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use_table_cache`]);
 ```
 
 **Engine Parameters**
@@ -24,6 +24,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cac
 -   `database` — Remote database name.
 -   `user` — PostgreSQL user.
 -   `password` — User password.
+-   `schema` — PostgreSQL schema.
 -   `use_table_cache` —  Defines if the database table structure is cached or not. Optional. Default value: `0`.
 
 ## Data Types Support {#data_types-support}
@@ -135,4 +136,4 @@ DESCRIBE TABLE test_database.test_table;
 └────────┴───────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/database-engines/postgresql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/database-engines/postgresql/) <!--hide-->
diff --git a/docs/en/engines/database-engines/replicated.md b/docs/en/engines/database-engines/replicated.md
index ed8406e6a86..bdc17d32393 100644
--- a/docs/en/engines/database-engines/replicated.md
+++ b/docs/en/engines/database-engines/replicated.md
@@ -1,3 +1,8 @@
+---
+toc_priority: 36
+toc_title: Replicated
+---
+
 # [experimental] Replicated {#replicated}
 
 The engine is based on the [Atomic](../../engines/database-engines/atomic.md) engine. It supports replication of metadata via DDL log being written to ZooKeeper and executed on all of the replicas for a given database.
@@ -30,6 +35,8 @@ The [system.clusters](../../operations/system-tables/clusters.md) system table c
 
 When creating a new replica of the database, this replica creates tables by itself. If the replica has been unavailable for a long time and has lagged behind the replication log — it checks its local metadata with the current metadata in ZooKeeper, moves the extra tables with data to a separate non-replicated database (so as not to accidentally delete anything superfluous), creates the missing tables, updates the table names if they have been renamed. The data is replicated at the `ReplicatedMergeTree` level, i.e. if the table is not replicated, the data will not be replicated (the database is responsible only for metadata).
 
+[`ALTER TABLE ATTACH|FETCH|DROP|DROP DETACHED|DETACH PARTITION|PART`](../../sql-reference/statements/alter/partition.md) queries are allowed but not replicated. The database engine will only add/fetch/remove the partition/part to the current replica. However, if the table itself uses a Replicated table engine, then the data will be replicated after using `ATTACH`.
+
 ## Usage Example {#usage-example}
 
 Creating a cluster with three hosts:
diff --git a/docs/en/engines/database-engines/sqlite.md b/docs/en/engines/database-engines/sqlite.md
new file mode 100644
index 00000000000..ee9db90859f
--- /dev/null
+++ b/docs/en/engines/database-engines/sqlite.md
@@ -0,0 +1,80 @@
+---
+toc_priority: 32
+toc_title: SQLite
+---
+
+# SQLite {#sqlite}
+
+Allows to connect to [SQLite](https://www.sqlite.org/index.html) database and perform `INSERT` and `SELECT` queries to exchange data between ClickHouse and SQLite. 
+
+## Creating a Database {#creating-a-database}
+
+``` sql
+    CREATE DATABASE sqlite_database 
+    ENGINE = SQLite('db_path')
+```
+
+**Engine Parameters**
+
+-   `db_path` — Path to a file with SQLite database.
+    
+## Data Types Support {#data_types-support}
+
+|  SQLite   | ClickHouse                                              |
+|---------------|---------------------------------------------------------|
+| INTEGER       | [Int32](../../sql-reference/data-types/int-uint.md)     |
+| REAL          | [Float32](../../sql-reference/data-types/float.md)      |
+| TEXT          | [String](../../sql-reference/data-types/string.md)      |
+| BLOB          | [String](../../sql-reference/data-types/string.md)      |
+
+## Specifics and Recommendations {#specifics-and-recommendations}
+
+SQLite stores the entire database (definitions, tables, indices, and the data itself) as a single cross-platform file on a host machine. During writing SQLite locks the entire database file, therefore write operations are performed sequentially. Read operations can be multitasked.
+SQLite does not require service management (such as startup scripts) or access control based on `GRANT` and passwords. Access control is handled by means of file-system permissions given to the database file itself.
+
+## Usage Example {#usage-example}
+
+Database in ClickHouse, connected to the SQLite:
+
+``` sql
+CREATE DATABASE sqlite_db ENGINE = SQLite('sqlite.db');
+SHOW TABLES FROM sqlite_db;
+```
+
+``` text
+┌──name───┐
+│ table1  │
+│ table2  │  
+└─────────┘
+```
+
+Shows the tables:
+
+``` sql
+SELECT * FROM sqlite_db.table1;
+```
+
+``` text
+┌─col1──┬─col2─┐
+│ line1 │    1 │
+│ line2 │    2 │
+│ line3 │    3 │
+└───────┴──────┘
+```
+Inserting data into SQLite table from ClickHouse table:
+
+``` sql
+CREATE TABLE clickhouse_table(`col1` String,`col2` Int16) ENGINE = MergeTree() ORDER BY col2;
+INSERT INTO clickhouse_table VALUES ('text',10);
+INSERT INTO sqlite_db.table1 SELECT * FROM clickhouse_table;
+SELECT * FROM sqlite_db.table1;
+```
+
+``` text
+┌─col1──┬─col2─┐
+│ line1 │    1 │
+│ line2 │    2 │
+│ line3 │    3 │
+│ text  │   10 │
+└───────┴──────┘
+```
diff --git a/docs/en/engines/index.md b/docs/en/engines/index.md
index 6b2b6509e8b..b3f4a4f7b69 100644
--- a/docs/en/engines/index.md
+++ b/docs/en/engines/index.md
@@ -12,4 +12,4 @@ There are two key engine kinds in ClickHouse:
 -   [Table engines](../engines/table-engines/index.md)
 -   [Database engines](../engines/database-engines/index.md)
 
-{## [Original article](https://clickhouse.tech/docs/en/engines/) ##}
+{## [Original article](https://clickhouse.com/docs/en/engines/) ##}
diff --git a/docs/en/engines/table-engines/index.md b/docs/en/engines/table-engines/index.md
index 13b3395e15b..09e0147bbf7 100644
--- a/docs/en/engines/table-engines/index.md
+++ b/docs/en/engines/table-engines/index.md
@@ -86,4 +86,4 @@ To select data from a virtual column, you must specify its name in the `SELECT`
 
 If you create a table with a column that has the same name as one of the table virtual columns, the virtual column becomes inaccessible. We do not recommend doing this. To help avoid conflicts, virtual column names are usually prefixed with an underscore.
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
index b55f1b68aea..7b9f8b8c400 100644
--- a/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/en/engines/table-engines/integrations/embedded-rocksdb.md
@@ -81,4 +81,4 @@ You can also change any [rocksdb options](https://github.com/facebook/rocksdb/wi
 </rocksdb>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/hdfs.md b/docs/en/engines/table-engines/integrations/hdfs.md
index cf4bb5ecbf7..0fcf7a63dd8 100644
--- a/docs/en/engines/table-engines/integrations/hdfs.md
+++ b/docs/en/engines/table-engines/integrations/hdfs.md
@@ -50,11 +50,11 @@ SELECT * FROM hdfs_engine_table LIMIT 2
 
 ## Implementation Details {#implementation-details}
 
--   Reads and writes can be parallel
+-   Reads and writes can be parallel.
+-   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is supported.  
 -   Not supported:
     -   `ALTER` and `SELECT...SAMPLE` operations.
     -   Indexes.
-    -   Replication.
 
 **Globs in path**
 
@@ -71,12 +71,12 @@ Constructions with `{}` are similar to the [remote](../../../sql-reference/table
 
 1.  Suppose we have several files in TSV format with the following URIs on HDFS:
 
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
+-   'hdfs://hdfs1:9000/some_dir/some_file_1'
+-   'hdfs://hdfs1:9000/some_dir/some_file_2'
+-   'hdfs://hdfs1:9000/some_dir/some_file_3'
+-   'hdfs://hdfs1:9000/another_dir/some_file_1'
+-   'hdfs://hdfs1:9000/another_dir/some_file_2'
+-   'hdfs://hdfs1:9000/another_dir/some_file_3'
 
 1.  There are several ways to make a table consisting of all six files:
 
@@ -126,8 +126,9 @@ Similar to GraphiteMergeTree, the HDFS engine supports extended configuration us
   </hdfs_root>
 ```
 
-### List of possible configuration options with default values
-#### Supported by libhdfs3
+### Configuration Options {#configuration-options}
+
+#### Supported by libhdfs3 {#supported-by-libhdfs3}
 
 
 | **parameter**                                         | **default value**       |
@@ -183,9 +184,10 @@ Similar to GraphiteMergeTree, the HDFS engine supports extended configuration us
 |hadoop\_kerberos\_keytab                               | ""                      |
 |hadoop\_kerberos\_principal                            | ""                      |
 |hadoop\_kerberos\_kinit\_command                       | kinit                   |
+|libhdfs3\_conf                                         | ""                      |
 
-#### Limitations {#limitations}
-  * hadoop\_security\_kerberos\_ticket\_cache\_path can be global only, not user specific
+### Limitations {#limitations}
+  * hadoop\_security\_kerberos\_ticket\_cache\_path and libhdfs3\_conf can be global only, not user specific
 
 ## Kerberos support {#kerberos-support}
 
@@ -197,6 +199,22 @@ security approach). Use tests/integration/test\_storage\_kerberized\_hdfs/hdfs_c
 
 If hadoop\_kerberos\_keytab, hadoop\_kerberos\_principal or hadoop\_kerberos\_kinit\_command is specified, kinit will be invoked. hadoop\_kerberos\_keytab and hadoop\_kerberos\_principal are mandatory in this case. kinit tool and krb5 configuration files are required.
 
+## HDFS Namenode HA support{#namenode-ha}
+
+libhdfs3 support HDFS namenode HA.
+
+- Copy `hdfs-site.xml` from an HDFS node to `/etc/clickhouse-server/`.
+- Add following piece to ClickHouse config file:
+
+``` xml
+  <hdfs>
+    <libhdfs3_conf>/etc/clickhouse-server/hdfs-site.xml</libhdfs3_conf>
+  </hdfs>
+```
+
+- Then use `dfs.nameservices` tag value of `hdfs-site.xml` as the namenode address in the HDFS URI. For example, replace `hdfs://appadmin@192.168.101.11:8020/abc/` with `hdfs://appadmin@my_nameservice/abc/`.
+
+
 ## Virtual Columns {#virtual-columns}
 
 -   `_path` — Path to the file.
@@ -206,4 +224,4 @@ If hadoop\_kerberos\_keytab, hadoop\_kerberos\_principal or hadoop\_kerberos\_ki
 
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/hdfs/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/hdfs/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/index.md b/docs/en/engines/table-engines/integrations/index.md
index eb1c5411e18..743d25ad616 100644
--- a/docs/en/engines/table-engines/integrations/index.md
+++ b/docs/en/engines/table-engines/integrations/index.md
@@ -19,3 +19,4 @@ List of supported integrations:
 -   [EmbeddedRocksDB](../../../engines/table-engines/integrations/embedded-rocksdb.md)
 -   [RabbitMQ](../../../engines/table-engines/integrations/rabbitmq.md)
 -   [PostgreSQL](../../../engines/table-engines/integrations/postgresql.md)
+-   [SQLite](../../../engines/table-engines/integrations/sqlite.md)
diff --git a/docs/en/engines/table-engines/integrations/jdbc.md b/docs/en/engines/table-engines/integrations/jdbc.md
index e43e782a420..2f442fd7753 100644
--- a/docs/en/engines/table-engines/integrations/jdbc.md
+++ b/docs/en/engines/table-engines/integrations/jdbc.md
@@ -92,4 +92,4 @@ FROM system.numbers
 
 -   [JDBC table function](../../../sql-reference/table-functions/jdbc.md).
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/jdbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/jdbc/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/kafka.md b/docs/en/engines/table-engines/integrations/kafka.md
index a3a13f9d152..879e919e823 100644
--- a/docs/en/engines/table-engines/integrations/kafka.md
+++ b/docs/en/engines/table-engines/integrations/kafka.md
@@ -194,4 +194,4 @@ Example:
 -   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns)
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/kafka/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/kafka/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/materialized-postgresql.md b/docs/en/engines/table-engines/integrations/materialized-postgresql.md
index 142639507d6..d02a11257c2 100644
--- a/docs/en/engines/table-engines/integrations/materialized-postgresql.md
+++ b/docs/en/engines/table-engines/integrations/materialized-postgresql.md
@@ -5,42 +5,52 @@ toc_title: MaterializedPostgreSQL
 
 # MaterializedPostgreSQL {#materialize-postgresql}
 
+Creates ClickHouse table with an initial data dump of PostgreSQL table and starts replication process, i.e. executes background job to apply new changes as they happen on PostgreSQL table in the remote PostgreSQL database.
+
+If more than one table is required, it is highly recommended to use the [MaterializedPostgreSQL](../../../engines/database-engines/materialized-postgresql.md) database engine instead of the table engine and use the [materialized_postgresql_tables_list](../../../operations/settings/settings.md#materialized-postgresql-tables-list) setting, which specifies the tables to be replicated. It will be much better in terms of CPU, fewer connections and fewer replication slots inside the remote PostgreSQL database.
+
 ## Creating a Table {#creating-a-table}
 
 ``` sql
-CREATE TABLE test.postgresql_replica (key UInt64, value UInt64)
+CREATE TABLE postgresql_db.postgresql_replica (key UInt64, value UInt64)
 ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgresql_replica', 'postgres_user', 'postgres_password')
 PRIMARY KEY key;
 ```
 
+**Engine Parameters**
+
+-   `host:port` — PostgreSQL server address.
+-   `database` — Remote database name.
+-   `table` — Remote table name.
+-   `user` — PostgreSQL user.
+-   `password` — User password.
 
 ## Requirements {#requirements}
 
-- Setting `wal_level`to `logical` and `max_replication_slots` to at least `2` in the postgresql config file.
+1. The [wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html) setting must have a value `logical` and `max_replication_slots` parameter must have a value at least `2` in the PostgreSQL config file.
 
-- A table with engine `MaterializedPostgreSQL` must have a primary key - the same as a replica identity index (default: primary key) of a postgres table (See [details on replica identity index](../../database-engines/materialized-postgresql.md#requirements)).
+2. A table with `MaterializedPostgreSQL` engine must have a primary key — the same as a replica identity index (by default: primary key) of a PostgreSQL table (see [details on replica identity index](../../../engines/database-engines/materialized-postgresql.md#requirements)).
 
-- Only database `Atomic` is allowed.
+3. Only database [Atomic](https://en.wikipedia.org/wiki/Atomicity_(database_systems)) is allowed.
 
+## Virtual columns {#virtual-columns}
 
-## Virtual columns {#creating-a-table}
+-   `_version` — Transaction counter. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 
-- `_version` (`UInt64`)
+-   `_sign` — Deletion mark. Type: [Int8](../../../sql-reference/data-types/int-uint.md). Possible values:
+    - `1` — Row is not deleted, 
+    - `-1` — Row is deleted.
 
-- `_sign` (`Int8`)
-
-These columns do not need to be added, when table is created. They are always accessible in `SELECT` query.
+These columns do not need to be added when a table is created. They are always accessible in `SELECT` query.
 `_version` column equals `LSN` position in `WAL`, so it might be used to check how up-to-date replication is.
 
 ``` sql
-CREATE TABLE test.postgresql_replica (key UInt64, value UInt64)
+CREATE TABLE postgresql_db.postgresql_replica (key UInt64, value UInt64)
 ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgresql_replica', 'postgres_user', 'postgres_password')
 PRIMARY KEY key;
 
-SELECT key, value, _version FROM test.postgresql_replica;
+SELECT key, value, _version FROM postgresql_db.postgresql_replica;
 ```
 
-
-## Warning {#warning}
-
-1. **TOAST** values convertion is not supported. Default value for the data type will be used.
+!!! warning "Warning"
+    Replication of [**TOAST**](https://www.postgresql.org/docs/9.5/storage-toast.html) values is not supported. The default value for the data type will be used.
diff --git a/docs/en/engines/table-engines/integrations/mongodb.md b/docs/en/engines/table-engines/integrations/mongodb.md
index 9839893d4e8..52876674475 100644
--- a/docs/en/engines/table-engines/integrations/mongodb.md
+++ b/docs/en/engines/table-engines/integrations/mongodb.md
@@ -36,7 +36,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name
 
 Create a table in ClickHouse which allows to read data from MongoDB collection:
 
-``` text
+``` sql
 CREATE TABLE mongo_table
 (
     key UInt64,
@@ -46,7 +46,7 @@ CREATE TABLE mongo_table
 
 To read from an SSL secured MongoDB server:
 
-``` text
+``` sql
 CREATE TABLE mongo_table_ssl
 (
     key UInt64,
@@ -66,4 +66,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/mysql.md b/docs/en/engines/table-engines/integrations/mysql.md
index a6402e00bc9..b0e5959c0c2 100644
--- a/docs/en/engines/table-engines/integrations/mysql.md
+++ b/docs/en/engines/table-engines/integrations/mysql.md
@@ -19,6 +19,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 SETTINGS
     [connection_pool_size=16, ]
     [connection_max_tries=3, ]
+    [connection_wait_timeout=5, ] /* 0 -- do not wait */
     [connection_auto_close=true ]
 ;
 ```
@@ -112,4 +113,4 @@ SELECT * FROM mysql_table
 -   [The ‘mysql’ table function](../../../sql-reference/table-functions/mysql.md)
 -   [Using MySQL as a source of external dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/mysql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/odbc.md b/docs/en/engines/table-engines/integrations/odbc.md
index ab39fb7a811..0ef21d8565a 100644
--- a/docs/en/engines/table-engines/integrations/odbc.md
+++ b/docs/en/engines/table-engines/integrations/odbc.md
@@ -128,4 +128,4 @@ SELECT * FROM odbc_t
 -   [ODBC external dictionaries](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC table function](../../../sql-reference/table-functions/odbc.md)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/odbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/odbc/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/postgresql.md b/docs/en/engines/table-engines/integrations/postgresql.md
index 4c763153a36..0bdb54e0c16 100644
--- a/docs/en/engines/table-engines/integrations/postgresql.md
+++ b/docs/en/engines/table-engines/integrations/postgresql.md
@@ -34,6 +34,7 @@ The table structure can differ from the original PostgreSQL table structure:
 -   `user` — PostgreSQL user.
 -   `password` — User password.
 -   `schema` — Non-default table schema. Optional.
+-   `on conflict ...` — example: `ON CONFLICT DO NOTHING`. Optional. Note: adding this option will make insertion less efficient.
 
 ## Implementation Details {#implementation-details}
 
@@ -148,4 +149,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [The `postgresql` table function](../../../sql-reference/table-functions/postgresql.md)
 -   [Using PostgreSQL as a source of external dictionary](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/rabbitmq.md b/docs/en/engines/table-engines/integrations/rabbitmq.md
index 5fb9ce5b151..ebb42461204 100644
--- a/docs/en/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/en/engines/table-engines/integrations/rabbitmq.md
@@ -21,11 +21,12 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2],
     ...
 ) ENGINE = RabbitMQ SETTINGS
-    rabbitmq_host_port = 'host:port',
+    rabbitmq_host_port = 'host:port' [or rabbitmq_address = 'amqp(s)://guest:guest@localhost/vhost'],
     rabbitmq_exchange_name = 'exchange_name',
     rabbitmq_format = 'data_format'[,]
     [rabbitmq_exchange_type = 'exchange_type',]
     [rabbitmq_routing_key_list = 'key1,key2,...',]
+    [rabbitmq_secure = 0,]
     [rabbitmq_row_delimiter = 'delimiter_symbol',]
     [rabbitmq_schema = '',]
     [rabbitmq_num_consumers = N,]
@@ -59,6 +60,11 @@ Optional parameters:
 -   `rabbitmq_max_block_size`
 -   `rabbitmq_flush_interval_ms`
 
+SSL connection:
+
+Use either `rabbitmq_secure = 1` or `amqps` in connection address: `rabbitmq_address = 'amqps://guest:guest@localhost/vhost'`.
+The default behaviour of the used library is not to check if the created TLS connection is sufficiently secure. Whether the certificate is expired, self-signed, missing or invalid: the connection is simply permitted. More strict checking of certificates can possibly be implemented in the future.
+
 Also format settings can be added along with rabbitmq-related settings.
 
 Example:
@@ -164,4 +170,4 @@ Example:
 -   `_message_id` - messageID of the received message; non-empty if was set, when message was published.
 -   `_timestamp` - timestamp of the received message; non-empty if was set, when message was published.
 
-[Original article](https://clickhouse.tech/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
diff --git a/docs/en/engines/table-engines/integrations/s3.md b/docs/en/engines/table-engines/integrations/s3.md
index e763d940752..e494e9aec6a 100644
--- a/docs/en/engines/table-engines/integrations/s3.md
+++ b/docs/en/engines/table-engines/integrations/s3.md
@@ -57,10 +57,10 @@ For more information about virtual columns see [here](../../../engines/table-eng
 ## Implementation Details {#implementation-details}
 
 -   Reads and writes can be parallel
+-   [Zero-copy](../../../operations/storing-data.md#zero-copy) replication is supported.  
 -   Not supported:
     -   `ALTER` and `SELECT...SAMPLE` operations.
     -   Indexes.
-    -   Replication.
 
 ## Wildcards In Path {#wildcards-in-path}
 
@@ -77,12 +77,12 @@ Constructions with `{}` are similar to the [remote](../../../sql-reference/table
 
 1. Suppose we have several files in CSV format with the following URIs on S3:
 
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv’
--   ‘https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv’
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/some_prefix/some_file_3.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_1.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_2.csv'
+-   'https://storage.yandexcloud.net/my-test-bucket-768/another_prefix/some_file_3.csv'
 
 There are several ways to make a table consisting of all six files:
 
@@ -210,4 +210,4 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-
 
 ## See also
 
--  [S3 table function](../../../sql-reference/table-functions/s3.md)
+-  [s3 table function](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/en/engines/table-engines/integrations/sqlite.md b/docs/en/engines/table-engines/integrations/sqlite.md
new file mode 100644
index 00000000000..391f1696291
--- /dev/null
+++ b/docs/en/engines/table-engines/integrations/sqlite.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 7
+toc_title: SQLite
+---
+
+# SQLite {#sqlite}
+
+The engine allows to import and export data to SQLite and supports queries to SQLite tables directly from ClickHouse.
+
+## Creating a Table {#creating-a-table}
+
+``` sql
+    CREATE TABLE [IF NOT EXISTS] [db.]table_name 
+    (
+        name1 [type1], 
+        name2 [type2], ...
+    ) ENGINE = SQLite('db_path', 'table')
+```
+
+**Engine Parameters**
+
+-   `db_path` — Path to SQLite file with a database.
+-   `table` — Name of a table in the SQLite database.
+
+## Usage Example {#usage-example}
+
+Shows a query creating the SQLite table:
+
+```sql
+SHOW CREATE TABLE sqlite_db.table2;
+```
+
+``` text
+CREATE TABLE SQLite.table2
+( 
+    `col1` Nullable(Int32), 
+    `col2` Nullable(String)
+) 
+ENGINE = SQLite('sqlite.db','table2');
+```
+
+Returns the data from the table:
+
+``` sql
+SELECT * FROM sqlite_db.table2 ORDER BY col1;
+```
+
+```text
+┌─col1─┬─col2──┐
+│    1 │ text1 │
+│    2 │ text2 │
+│    3 │ text3 │
+└──────┴───────┘
+```
+
+**See Also**
+
+-   [SQLite](../../../engines/database-engines/sqlite.md) engine
+-   [sqlite](../../../sql-reference/table-functions/sqlite.md) table function
\ No newline at end of file
diff --git a/docs/en/engines/table-engines/log-family/index.md b/docs/en/engines/table-engines/log-family/index.md
index b505fe1c474..910df09e67f 100644
--- a/docs/en/engines/table-engines/log-family/index.md
+++ b/docs/en/engines/table-engines/log-family/index.md
@@ -44,4 +44,4 @@ The `TinyLog` engine is the simplest in the family and provides the poorest func
 
 The `Log` and `StripeLog` engines support parallel data reading. When reading data, ClickHouse uses multiple threads. Each thread processes a separate data block. The `Log` engine uses a separate file for each column of the table. `StripeLog` stores all the data in one file. As a result, the `StripeLog` engine uses fewer file descriptors, but the `Log` engine provides higher efficiency when reading data.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/en/engines/table-engines/log-family/stripelog.md b/docs/en/engines/table-engines/log-family/stripelog.md
index 693f5a21db2..62703245062 100644
--- a/docs/en/engines/table-engines/log-family/stripelog.md
+++ b/docs/en/engines/table-engines/log-family/stripelog.md
@@ -90,4 +90,4 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
 └─────────────────────┴──────────────┴────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/en/engines/table-engines/log-family/tinylog.md b/docs/en/engines/table-engines/log-family/tinylog.md
index ea2138e36fe..2407355a857 100644
--- a/docs/en/engines/table-engines/log-family/tinylog.md
+++ b/docs/en/engines/table-engines/log-family/tinylog.md
@@ -11,4 +11,4 @@ This table engine is typically used with the write-once method: write data one t
 
 Queries are executed in a single stream. In other words, this engine is intended for relatively small tables (up to about 1,000,000 rows). It makes sense to use this table engine if you have many small tables, since it’s simpler than the [Log](../../../engines/table-engines/log-family/log.md) engine (fewer files need to be opened).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/tinylog/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 818830646cb..8c9f8dd8ce3 100644
--- a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -100,4 +100,4 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
index 4ec976eda30..271b8b20fdb 100644
--- a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -303,4 +303,4 @@ select * FROM UAct
 └─────────────────────┴───────────┴──────────┴──────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 535922875ef..2711c76aeb6 100644
--- a/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/en/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -5,6 +5,9 @@ toc_title: Custom Partitioning Key
 
 # Custom Partitioning Key {#custom-partitioning-key}
 
+!!! warning "Warning"
+    In most cases you don't need partition key, and in most other cases you don't need partition key more granular than by months. Partitioning does not speed up queries (in contrast to the ORDER BY expression). You should never use too granular partitioning. Don't partition your data by client identifiers or names (instead make client identifier or name the first column in the ORDER BY expression).
+
 Partitioning is available for the [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) family tables (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) tables). [Materialized views](../../../engines/table-engines/special/materializedview.md#materializedview) based on MergeTree tables support partitioning, as well.
 
 A partition is a logical combination of records in a table by a specified criterion. You can set a partition by an arbitrary criterion, such as by month, by day, or by event type. Each partition is stored separately to simplify manipulations of this data. When accessing the data, ClickHouse uses the smallest subset of partitions possible.
@@ -124,4 +127,4 @@ Note that on the operating server, you cannot manually change the set of parts o
 
 ClickHouse allows you to perform operations with the partitions: delete them, copy from one table to another, or create a backup. See the list of all operations in the section [Manipulations With Partitions and Parts](../../../sql-reference/statements/alter/partition.md#alter_manipulations-with-partitions).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
index 3ead798503d..79ba06096b2 100644
--- a/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -38,9 +38,7 @@ A table for the Graphite data should have the following columns for the followin
 
 -   Value of the metric. Data type: any numeric.
 
--   Version of the metric. Data type: any numeric.
-
-    ClickHouse saves the rows with the highest version or the last written if versions are the same. Other rows are deleted during the merge of data parts.
+-   Version of the metric. Data type: any numeric (ClickHouse saves the rows with the highest version or the last written if versions are the same. Other rows are deleted during the merge of data parts).
 
 The names of these columns should be set in the rollup configuration.
 
@@ -132,7 +130,7 @@ Fields for `pattern` and `default` sections:
 -   `regexp`– A pattern for the metric name.
 -   `age` – The minimum age of the data in seconds.
 -   `precision`– How precisely to define the age of the data in seconds. Should be a divisor for 86400 (seconds in a day).
--   `function` – The name of the aggregating function to apply to data whose age falls within the range `[age, age + precision]`.
+-   `function` – The name of the aggregating function to apply to data whose age falls within the range `[age, age + precision]`. Accepted functions: min / max / any / avg. The average is calculated imprecisely, like the average of the averages. 
 
 ### Configuration Example {#configuration-example}
 
@@ -169,4 +167,7 @@ Fields for `pattern` and `default` sections:
 </graphite_rollup>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
+!!! warning "Warning"
+    Data rollup is performed during merges. Usually, for old partitions, merges are not started, so for rollup it is necessary to trigger an unscheduled merge using [optimize](../../../sql-reference/statements/optimize.md). Or use additional tools, for example [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer).
+
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 561b0ad8023..aeaf39e28cb 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -39,7 +39,10 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     name2 [type2] [DEFAULT|MATERIALIZED|ALIAS expr2] [TTL expr2],
     ...
     INDEX index_name1 expr1 TYPE type1(...) GRANULARITY value1,
-    INDEX index_name2 expr2 TYPE type2(...) GRANULARITY value2
+    INDEX index_name2 expr2 TYPE type2(...) GRANULARITY value2,
+    ...
+    PROJECTION projection_name_1 (SELECT <COLUMN LIST EXPR> [GROUP BY] [ORDER BY]),
+    PROJECTION projection_name_2 (SELECT <COLUMN LIST EXPR> [GROUP BY] [ORDER BY])
 ) ENGINE = MergeTree()
 ORDER BY expr
 [PARTITION BY expr]
@@ -66,7 +69,7 @@ For a description of parameters, see the [CREATE query description](../../../sql
 
     Use the `ORDER BY tuple()` syntax, if you do not need sorting. See [Selecting the Primary Key](#selecting-the-primary-key).
 
--   `PARTITION BY` — The [partitioning key](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Optional.
+-   `PARTITION BY` — The [partitioning key](../../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Optional. In most cases you don't need partition key, and in most other cases you don't need partition key more granular than by months. Partitioning does not speed up queries (in contrast to the ORDER BY expression). You should never use too granular partitioning. Don't partition your data by client identifiers or names (instead make client identifier or name the first column in the ORDER BY expression).
 
     For partitioning by month, use the `toYYYYMM(date_column)` expression, where `date_column` is a column with a date of the type [Date](../../../sql-reference/data-types/date.md). The partition names here have the `"YYYYMM"` format.
 
@@ -76,7 +79,7 @@ For a description of parameters, see the [CREATE query description](../../../sql
 
 -   `SAMPLE BY` — An expression for sampling. Optional.
 
-    If a sampling expression is used, the primary key must contain it. The result of sampling expression must be unsigned integer. Example: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
+    If a sampling expression is used, the primary key must contain it. The result of a sampling expression must be an unsigned integer. Example: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
 
 -   `TTL` — A list of rules specifying storage duration of rows and defining logic of automatic parts movement [between disks and volumes](#table_engine-mergetree-multiple-volumes). Optional.
 
@@ -96,7 +99,9 @@ For a description of parameters, see the [CREATE query description](../../../sql
     -   `use_minimalistic_part_header_in_zookeeper` — Storage method of the data parts headers in ZooKeeper. If `use_minimalistic_part_header_in_zookeeper=1`, then ZooKeeper stores less data. For more information, see the [setting description](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) in “Server configuration parameters”.
     -   `min_merge_bytes_to_use_direct_io` — The minimum data volume for merge operation that is required for using direct I/O access to the storage disk. When merging data parts, ClickHouse calculates the total storage volume of all the data to be merged. If the volume exceeds `min_merge_bytes_to_use_direct_io` bytes, ClickHouse reads and writes the data to the storage disk using the direct I/O interface (`O_DIRECT` option). If `min_merge_bytes_to_use_direct_io = 0`, then direct I/O is disabled. Default value: `10 * 1024 * 1024 * 1024` bytes.
         <a name="mergetree_setting-merge_with_ttl_timeout"></a>
-    -   `merge_with_ttl_timeout` — Minimum delay in seconds before repeating a merge with TTL. Default value: 86400 (1 day).
+    -   `merge_with_ttl_timeout` — Minimum delay in seconds before repeating a merge with delete TTL. Default value: `14400` seconds (4 hours).
+    -   `merge_with_recompression_ttl_timeout` — Minimum delay in seconds before repeating a merge with recompression TTL. Default value: `14400` seconds (4 hours).
+    -   `try_fetch_recompressed_part_timeout` — Timeout (in seconds) before starting merge with recompression. During this time ClickHouse tries to fetch recompressed part from replica which assigned this merge with recompression. Default value: `7200` seconds (2 hours).
     -   `write_final_mark` — Enables or disables writing the final index mark at the end of data part (after the last byte). Default value: 1. Don’t turn it off.
     -   `merge_max_block_size` — Maximum number of rows in block for merge operations. Default value: 8192.
     -   `storage_policy` — Storage policy. See [Using Multiple Block Devices for Data Storage](#table_engine-mergetree-multiple-volumes).
@@ -315,7 +320,7 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 
 -   `ngrambf_v1(n, size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)`
 
-    Stores a [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter) that contains all ngrams from a block of data. Works only with strings. Can be used for optimization of `equals`, `like` and `in` expressions.
+    Stores a [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter) that contains all ngrams from a block of data. Works only with datatypes: [String](../../../sql-reference/data-types/string.md), [FixedString](../../../sql-reference/data-types/fixedstring.md) and [Map](../../../sql-reference/data-types/map.md). Can be used for optimization of `EQUALS`, `LIKE` and `IN` expressions.
 
     -   `n` — ngram size,
     -   `size_of_bloom_filter_in_bytes` — Bloom filter size in bytes (you can use large values here, for example, 256 or 512, because it can be compressed well).
@@ -330,11 +335,19 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 
     The optional `false_positive` parameter is the probability of receiving a false positive response from the filter. Possible values: (0, 1). Default value: 0.025.
 
-    Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`.
+    Supported data types: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`, `Array`, `LowCardinality`, `Nullable`, `UUID`, `Map`.
 
-    The following functions can use it: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [has](../../../sql-reference/functions/array-functions.md).
+    For `Map` data type client can specify if index should be created for keys or values using [mapKeys](../../../sql-reference/functions/tuple-map-functions.md#mapkeys) or [mapValues](../../../sql-reference/functions/tuple-map-functions.md#mapvalues) function.
+
+    The following functions can use the filter: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [has](../../../sql-reference/functions/array-functions.md#hasarr-elem).
+
+    Example of index creation for `Map` data type
+
+```
+INDEX map_key_index mapKeys(map_column) TYPE bloom_filter GRANULARITY 1
+INDEX map_key_index mapValues(map_column) TYPE bloom_filter GRANULARITY 1
+```
 
-<!-- -->
 
 ``` sql
 INDEX sample_index (u64 * length(s)) TYPE minmax GRANULARITY 4
@@ -385,6 +398,31 @@ Functions with a constant argument that is less than ngram size can’t be used
     -   `s != 1`
     -   `NOT startsWith(s, 'test')`
 
+## Projections {#projections}
+Projections are like [materialized views](../../../sql-reference/statements/create/view.md#materialized) but defined in part-level. It provides consistency guarantees along with automatic usage in queries.
+
+Projections are an experimental feature. To enable them you must set the [allow_experimental_projection_optimization](../../../operations/settings/settings.md#allow-experimental-projection-optimization) to `1`. See also the [force_optimize_projection](../../../operations/settings/settings.md#force-optimize-projection) setting.
+
+Projections are not supported in the `SELECT` statements with the [FINAL](../../../sql-reference/statements/select/from.md#select-from-final) modifier.
+
+### Projection Query {#projection-query}
+A projection query is what defines a projection. It implicitly selects data from the parent table.
+**Syntax**
+
+```sql
+SELECT <column list expr> [GROUP BY] <group keys expr> [ORDER BY] <expr>
+```
+
+Projections can be modified or dropped with the [ALTER](../../../sql-reference/statements/alter/projection.md) statement.
+
+### Projection Storage {#projection-storage}
+Projections are stored inside the part directory. It's similar to an index but contains a subdirectory that stores an anonymous `MergeTree` table's part. The table is induced by the definition query of the projection. If there is a `GROUP BY` clause, the underlying storage engine becomes [AggregatingMergeTree](aggregatingmergetree.md), and all aggregate functions are converted to `AggregateFunction`. If there is an `ORDER BY` clause, the `MergeTree` table uses it as its primary key expression. During the merge process the projection part is merged via its storage's merge routine. The checksum of the parent table's part is combined with the projection's part. Other maintenance jobs are similar to skip indices.
+
+### Query Analysis {#projection-query-analysis}
+1. Check if the projection can be used to answer the given query, that is, it generates the same answer as querying the base table.
+2. Select the best feasible match, which contains the least granules to read.
+3. The query pipeline which uses projections will be different from the one that uses the original parts. If the projection is absent in some parts, we can add the pipeline to "project" it on the fly.
+
 ## Concurrent Data Access {#concurrent-data-access}
 
 For concurrent table access, we use multi-versioning. In other words, when a table is simultaneously read and updated, data is read from a set of parts that is current at the time of the query. There are no lengthy locks. Inserts do not get in the way of read operations.
@@ -395,18 +433,20 @@ Reading from a table is automatically parallelized.
 
 Determines the lifetime of values.
 
-The `TTL` clause can be set for the whole table and for each individual column. Table-level TTL can also specify logic of automatic move of data between disks and volumes.
+The `TTL` clause can be set for the whole table and for each individual column. Table-level `TTL` can also specify the logic of automatic moving data between disks and volumes, or recompressing parts where all the data has been expired.
 
 Expressions must evaluate to [Date](../../../sql-reference/data-types/date.md) or [DateTime](../../../sql-reference/data-types/datetime.md) data type.
 
-Example:
+**Syntax**
+
+Setting time-to-live for a column:
 
 ``` sql
 TTL time_column
 TTL time_column + interval
 ```
 
-To define `interval`, use [time interval](../../../sql-reference/operators/index.md#operators-datetime) operators.
+To define `interval`, use [time interval](../../../sql-reference/operators/index.md#operators-datetime) operators, for example:
 
 ``` sql
 TTL date_time + INTERVAL 1 MONTH
@@ -419,9 +459,9 @@ When the values in the column expire, ClickHouse replaces them with the default
 
 The `TTL` clause can’t be used for key columns.
 
-Examples:
+**Examples**
 
-Creating a table with TTL
+Creating a table with `TTL`:
 
 ``` sql
 CREATE TABLE example_table
@@ -454,11 +494,11 @@ ALTER TABLE example_table
 
 ### Table TTL {#mergetree-table-ttl}
 
-Table can have an expression for removal of expired rows, and multiple expressions for automatic move of parts between [disks or volumes](#table_engine-mergetree-multiple-volumes). When rows in the table expire, ClickHouse deletes all corresponding rows. For parts moving feature, all rows of a part must satisfy the movement expression criteria.
+Table can have an expression for removal of expired rows, and multiple expressions for automatic move of parts between [disks or volumes](#table_engine-mergetree-multiple-volumes). When rows in the table expire, ClickHouse deletes all corresponding rows. For parts moving or recompressing, all rows of a part must satisfy the `TTL` expression criteria.
 
 ``` sql
 TTL expr
-    [DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'][, DELETE|TO DISK 'aaa'|TO VOLUME 'bbb'] ...
+    [DELETE|RECOMPRESS codec_name1|TO DISK 'xxx'|TO VOLUME 'xxx'][, DELETE|RECOMPRESS codec_name2|TO DISK 'aaa'|TO VOLUME 'bbb'] ...
     [WHERE conditions]
     [GROUP BY key_expr [SET v1 = aggr_func(v1) [, v2 = aggr_func(v2) ...]] ]
 ```
@@ -466,11 +506,12 @@ TTL expr
 Type of TTL rule may follow each TTL expression. It affects an action which is to be done once the expression is satisfied (reaches current time):
 
 -   `DELETE` - delete expired rows (default action);
+-   `RECOMPRESS codec_name` - recompress data part with the `codec_name`;
 -   `TO DISK 'aaa'` - move part to the disk `aaa`;
 -   `TO VOLUME 'bbb'` - move part to the disk `bbb`;
 -   `GROUP BY` - aggregate expired rows.
 
-With `WHERE` clause you may specify which of the expired rows to delete or aggregate (it cannot be applied to moves).
+With `WHERE` clause you may specify which of the expired rows to delete or aggregate (it cannot be applied to moves or recompression).
 
 `GROUP BY` expression must be a prefix of the table primary key.
 
@@ -478,7 +519,7 @@ If a column is not part of the `GROUP BY` expression and is not set explicitly i
 
 **Examples**
 
-Creating a table with TTL:
+Creating a table with `TTL`:
 
 ``` sql
 CREATE TABLE example_table
@@ -494,7 +535,7 @@ TTL d + INTERVAL 1 MONTH [DELETE],
     d + INTERVAL 2 WEEK TO DISK 'bbb';
 ```
 
-Altering TTL of the table:
+Altering `TTL` of the table:
 
 ``` sql
 ALTER TABLE example_table
@@ -515,6 +556,21 @@ ORDER BY d
 TTL d + INTERVAL 1 MONTH DELETE WHERE toDayOfWeek(d) = 1;
 ```
 
+Creating a table, where expired rows are recompressed:
+
+```sql
+CREATE TABLE table_for_recompression
+(
+    d DateTime,
+    key UInt64,
+    value String
+) ENGINE MergeTree()
+ORDER BY tuple()
+PARTITION BY key
+TTL d + INTERVAL 1 MONTH RECOMPRESS CODEC(ZSTD(17)), d + INTERVAL 1 YEAR RECOMPRESS CODEC(LZ4HC(10))
+SETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0;
+```
+
 Creating a table, where expired rows are aggregated. In result rows `x` contains the maximum value accross the grouped rows, `y` — the minimum value, and `d` — any occasional value from grouped rows.
 
 ``` sql
@@ -531,14 +587,19 @@ ORDER BY (k1, k2)
 TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 ```
 
-**Removing Data**
+### Removing Expired Data {#mergetree-removing-expired-data}
 
-Data with an expired TTL is removed when ClickHouse merges data parts.
+Data with an expired `TTL` is removed when ClickHouse merges data parts.
 
-When ClickHouse see that data is expired, it performs an off-schedule merge. To control the frequency of such merges, you can set `merge_with_ttl_timeout`. If the value is too low, it will perform many off-schedule merges that may consume a lot of resources.
+When ClickHouse detects that data is expired, it performs an off-schedule merge. To control the frequency of such merges, you can set `merge_with_ttl_timeout`. If the value is too low, it will perform many off-schedule merges that may consume a lot of resources.
 
 If you perform the `SELECT` query between merges, you may get expired data. To avoid it, use the [OPTIMIZE](../../../sql-reference/statements/optimize.md) query before `SELECT`.
 
+**See Also**
+
+- [ttl_only_drop_parts](../../../operations/settings/settings.md#ttl_only_drop_parts) setting
+
+
 ## Using Multiple Block Devices for Data Storage {#table_engine-mergetree-multiple-volumes}
 
 ### Introduction {#introduction}
@@ -626,7 +687,7 @@ Tags:
 -   `policy_name_N` — Policy name. Policy names must be unique.
 -   `volume_name_N` — Volume name. Volume names must be unique.
 -   `disk` — a disk within a volume.
--   `max_data_part_size_bytes` — the maximum size of a part that can be stored on any of the volume’s disks.
+-   `max_data_part_size_bytes` — the maximum size of a part that can be stored on any of the volume’s disks. If the a size of a merged part estimated to be bigger than `max_data_part_size_bytes` then this part will be written to a next volume. Basically this feature allows to keep new/small parts on a hot (SSD) volume and move them to a cold (HDD) volume when they reach large size. Do not use this setting if your policy has only one volume.
 -   `move_factor` — when the amount of available space gets lower than this factor, data automatically start to move on the next volume if any (by default, 0.1).
 -   `prefer_not_to_merge` — Disables merging of data parts on this volume. When this setting is enabled, merging data on this volume is not allowed. This allows controlling how ClickHouse works with slow disks.
 
@@ -823,44 +884,3 @@ S3 disk can be configured as `main` or `cold` storage:
 ```
 
 In case of `cold` option a data can be moved to S3 if local disk free size will be smaller than `move_factor * disk_size` or by TTL move rule.
-
-## Using HDFS for Data Storage {#table_engine-mergetree-hdfs}
-
-[HDFS](https://hadoop.apache.org/docs/r1.2.1/hdfs_design.html) is a distributed file system for remote data storage.
-
-`MergeTree` family table engines can store data to HDFS using a disk with type `HDFS`.
-
-Configuration markup:
-``` xml
-<yandex>
-    <storage_configuration>
-        <disks>
-            <hdfs>
-                <type>hdfs</type>
-                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
-            </hdfs>
-        </disks>
-        <policies>
-            <hdfs>
-                <volumes>
-                    <main>
-                        <disk>hdfs</disk>
-                    </main>
-                </volumes>
-            </hdfs>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
-</yandex>
-```
-
-Required parameters:
-
--   `endpoint` — HDFS endpoint URL in `path` format. Endpoint URL should contain a root path to store data.
-
-Optional parameters:
-
--   `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1 Mb`.
diff --git a/docs/en/engines/table-engines/mergetree-family/replication.md b/docs/en/engines/table-engines/mergetree-family/replication.md
index 4fc30355927..7cd58d35362 100644
--- a/docs/en/engines/table-engines/mergetree-family/replication.md
+++ b/docs/en/engines/table-engines/mergetree-family/replication.md
@@ -137,7 +137,7 @@ CREATE TABLE table_name
 ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', ver)
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
-SAMPLE BY intHash32(UserID)
+SAMPLE BY intHash32(UserID);
 ```
 
 <details markdown="1">
@@ -150,12 +150,12 @@ CREATE TABLE table_name
     EventDate DateTime,
     CounterID UInt32,
     UserID UInt32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID), EventTime), 8192)
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID), EventTime), 8192);
 ```
 
 </details>
 
-As the example shows, these parameters can contain substitutions in curly brackets. The substituted values are taken from the «[macros](../../../operations/server-configuration-parameters/settings/#macros) section of the configuration file.
+As the example shows, these parameters can contain substitutions in curly brackets. The substituted values are taken from the [macros](../../../operations/server-configuration-parameters/settings.md#macros) section of the configuration file.
 
 Example:
 
@@ -288,5 +288,7 @@ If the data in ZooKeeper was lost or damaged, you can save data by moving it to
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
+-   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
index 36840e6fd0b..5726acf000e 100644
--- a/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/summingmergetree.md
@@ -136,4 +136,4 @@ When requesting data, use the [sumMap(key, value)](../../../sql-reference/aggreg
 
 For nested data structure, you do not need to specify its columns in the tuple of columns for summation.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 93c35344e24..8266bf34876 100644
--- a/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -233,4 +233,4 @@ SELECT * FROM UAct FINAL
 
 This is a very inefficient way to select data. Don’t use it for large tables.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/buffer.md b/docs/en/engines/table-engines/special/buffer.md
index cacb310a15c..884774cbfae 100644
--- a/docs/en/engines/table-engines/special/buffer.md
+++ b/docs/en/engines/table-engines/special/buffer.md
@@ -56,6 +56,9 @@ The same thing happens if the subordinate table does not exist when the buffer i
 
 If you need to run ALTER for a subordinate table, and the Buffer table, we recommend first deleting the Buffer table, running ALTER for the subordinate table, then creating the Buffer table again.
 
+!!! attention "Attention"
+    Running ALTER on the Buffer table in releases made before 28 Sep 2020 will cause a `Block structure mismatch` error (see [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117)), so deleting the Buffer table and then recreating is the only option. It is advisable to check that this error is fixed in your release before trying to run ALTER on the Buffer table.
+
 If the server is restarted abnormally, the data in the buffer is lost.
 
 `FINAL` and `SAMPLE` do not work correctly for Buffer tables. These conditions are passed to the destination table, but are not used for processing data in the buffer. If these features are required we recommend only using the Buffer table for writing, while reading from the destination table.
@@ -72,4 +75,4 @@ A Buffer table is used when too many INSERTs are received from a large number of
 
 Note that it does not make sense to insert data one row at a time, even for Buffer tables. This will only produce a speed of a few thousand rows per second, while inserting larger blocks of data can produce over a million rows per second (see the section “Performance”).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/buffer/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/distributed.md b/docs/en/engines/table-engines/special/distributed.md
index 5c911c6cc0a..708dab6fb7d 100644
--- a/docs/en/engines/table-engines/special/distributed.md
+++ b/docs/en/engines/table-engines/special/distributed.md
@@ -5,7 +5,7 @@ toc_title: Distributed
 
 # Distributed Table Engine {#distributed}
 
-Tables with Distributed engine do not store any data by their own, but allow distributed query processing on multiple servers.
+Tables with Distributed engine do not store any data of their own, but allow distributed query processing on multiple servers.
 Reading is automatically parallelized. During a read, the table indexes on remote servers are used, if there are any.
 
 The Distributed engine accepts parameters:
@@ -167,20 +167,20 @@ If this parameter is set to `true`, the write operation selects the first health
 
 If it is set to `false` (the default), data is written to all replicas. In essence, this means that the Distributed table replicates data itself. This is worse than using replicated tables, because the consistency of replicas is not checked, and over time they will contain slightly different data.
 
-To select the shard that a row of data is sent to, the sharding expression is analyzed, and its remainder is taken from dividing it by the total weight of the shards. The row is sent to the shard that corresponds to the half-interval of the remainders from `prev_weight` to `prev_weights + weight`, where `prev_weights` is the total weight of the shards with the smallest number, and `weight` is the weight of this shard. For example, if there are two shards, and the first has a weight of 9 while the second has a weight of 10, the row will be sent to the first shard for the remainders from the range \[0, 9), and to the second for the remainders from the range \[9, 19).
+To select the shard that a row of data is sent to, the sharding expression is analyzed, and its remainder is taken from dividing it by the total weight of the shards. The row is sent to the shard that corresponds to the half-interval of the remainders from `prev_weights` to `prev_weights + weight`, where `prev_weights` is the total weight of the shards with the smallest number, and `weight` is the weight of this shard. For example, if there are two shards, and the first has a weight of 9 while the second has a weight of 10, the row will be sent to the first shard for the remainders from the range \[0, 9), and to the second for the remainders from the range \[9, 19).
 
 The sharding expression can be any expression from constants and table columns that returns an integer. For example, you can use the expression `rand()` for random distribution of data, or `UserID` for distribution by the remainder from dividing the user’s ID (then the data of a single user will reside on a single shard, which simplifies running IN and JOIN by users). If one of the columns is not distributed evenly enough, you can wrap it in a hash function: intHash64(UserID).
 
-A simple reminder from the division is a limited solution for sharding and isn’t always appropriate. It works for medium and large volumes of data (dozens of servers), but not for very large volumes of data (hundreds of servers or more). In the latter case, use the sharding scheme required by the subject area, rather than using entries in Distributed tables.
+A simple remainder from the division is a limited solution for sharding and isn’t always appropriate. It works for medium and large volumes of data (dozens of servers), but not for very large volumes of data (hundreds of servers or more). In the latter case, use the sharding scheme required by the subject area, rather than using entries in Distributed tables.
 
-SELECT queries are sent to all the shards and work regardless of how data is distributed across the shards (they can be distributed completely randomly). When you add a new shard, you do not have to transfer the old data to it. You can write new data with a heavier weight – the data will be distributed slightly unevenly, but queries will work correctly and efficiently.
+SELECT queries are sent to all the shards and work regardless of how data is distributed across the shards (they can be distributed completely randomly). When you add a new shard, you do not have to transfer old data into it. Instead, you can write new data to it by using a heavier weight – the data will be distributed slightly unevenly, but queries will work correctly and efficiently.
 
 You should be concerned about the sharding scheme in the following cases:
 
 -   Queries are used that require joining data (IN or JOIN) by a specific key. If data is sharded by this key, you can use local IN or JOIN instead of GLOBAL IN or GLOBAL JOIN, which is much more efficient.
 -   A large number of servers is used (hundreds or more) with a large number of small queries (queries of individual clients - websites, advertisers, or partners). In order for the small queries to not affect the entire cluster, it makes sense to locate data for a single client on a single shard. Alternatively, as we’ve done in Yandex.Metrica, you can set up bi-level sharding: divide the entire cluster into “layers”, where a layer may consist of multiple shards. Data for a single client is located on a single layer, but shards can be added to a layer as necessary, and data is randomly distributed within them. Distributed tables are created for each layer, and a single shared distributed table is created for global queries.
 
-Data is written asynchronously. When inserted in the table, the data block is just written to the local file system. The data is sent to the remote servers in the background as soon as possible. The period for sending data is managed by the [distributed_directory_monitor_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_sleep_time_ms) and [distributed_directory_monitor_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_max_sleep_time_ms) settings. The `Distributed` engine sends each file with inserted data separately, but you can enable batch sending of files with the [distributed_directory_monitor_batch_inserts](../../../operations/settings/settings.md#distributed_directory_monitor_batch_inserts) setting. This setting improves cluster performance by better utilizing local server and network resources. You should check whether data is sent successfully by checking the list of files (data waiting to be sent) in the table directory: `/var/lib/clickhouse/data/database/table/`. The number of threads performing background tasks can be set by [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size) setting.
+Data is written asynchronously. When inserted in the table, the data block is just written to the local file system. The data is sent to the remote servers in the background as soon as possible. The periodicity for sending data is managed by the [distributed_directory_monitor_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_sleep_time_ms) and [distributed_directory_monitor_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_directory_monitor_max_sleep_time_ms) settings. The `Distributed` engine sends each file with inserted data separately, but you can enable batch sending of files with the [distributed_directory_monitor_batch_inserts](../../../operations/settings/settings.md#distributed_directory_monitor_batch_inserts) setting. This setting improves cluster performance by better utilizing local server and network resources. You should check whether data is sent successfully by checking the list of files (data waiting to be sent) in the table directory: `/var/lib/clickhouse/data/database/table/`. The number of threads performing background tasks can be set by [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size) setting.
 
 If the server ceased to exist or had a rough restart (for example, after a device failure) after an INSERT to a Distributed table, the inserted data might be lost. If a damaged data part is detected in the table directory, it is transferred to the `broken` subdirectory and no longer used.
 
@@ -188,14 +188,15 @@ When the `max_parallel_replicas` option is enabled, query processing is parallel
 
 ## Virtual Columns {#virtual-columns}
 
--   `_shard_num` — Contains the `shard_num` (from `system.clusters`). Type: [UInt32](../../../sql-reference/data-types/int-uint.md).
+-   `_shard_num` — Contains the `shard_num` value from the table `system.clusters`. Type: [UInt32](../../../sql-reference/data-types/int-uint.md).
 
 !!! note "Note"
-    Since [`remote`](../../../sql-reference/table-functions/remote.md)/`cluster` table functions internally create temporary instance of the same Distributed engine, `_shard_num` is available there too.
+    Since [remote](../../../sql-reference/table-functions/remote.md) and [cluster](../../../sql-reference/table-functions/cluster.md) table functions internally create temporary Distributed table, `_shard_num` is available there too.
 
 **See Also**
 
--   [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
--   [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size)
+-   [Virtual columns](../../../engines/table-engines/index.md#table_engines-virtual_columns) description
+-   [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size) setting
+-   [shardNum()](../../../sql-reference/functions/other-functions.md#shard-num) and [shardCount()](../../../sql-reference/functions/other-functions.md#shard-count) functions
+
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/external-data.md b/docs/en/engines/table-engines/special/external-data.md
index b5429ccad12..4ec90905fe5 100644
--- a/docs/en/engines/table-engines/special/external-data.md
+++ b/docs/en/engines/table-engines/special/external-data.md
@@ -63,4 +63,4 @@ $ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+coun
 
 For distributed query processing, the temporary tables are sent to all the remote servers.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/external_data/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/file.md b/docs/en/engines/table-engines/special/file.md
index 17eef2b4941..7673f45ca8d 100644
--- a/docs/en/engines/table-engines/special/file.md
+++ b/docs/en/engines/table-engines/special/file.md
@@ -24,7 +24,7 @@ The `Format` parameter specifies one of the available file formats. To perform
 `INSERT` queries – for output. The available formats are listed in the
 [Formats](../../../interfaces/formats.md#formats) section.
 
-ClickHouse does not allow specifying filesystem path for`File`. It will use folder defined by [path](../../../operations/server-configuration-parameters/settings.md) setting in server configuration.
+ClickHouse does not allow specifying filesystem path for `File`. It will use folder defined by [path](../../../operations/server-configuration-parameters/settings.md) setting in server configuration.
 
 When creating table using `File(Format)` it creates empty subdirectory in that folder. When data is written to that table, it’s put into `data.Format` file in that subdirectory.
 
@@ -85,4 +85,4 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   Indices
     -   Replication
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/generate.md b/docs/en/engines/table-engines/special/generate.md
index 393f7ccab23..fabe31897bb 100644
--- a/docs/en/engines/table-engines/special/generate.md
+++ b/docs/en/engines/table-engines/special/generate.md
@@ -56,4 +56,4 @@ SELECT * FROM generate_engine_table LIMIT 3
     -   Indices
     -   Replication
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/join.md b/docs/en/engines/table-engines/special/join.md
index 4cd1c741352..4e4a5e9fc03 100644
--- a/docs/en/engines/table-engines/special/join.md
+++ b/docs/en/engines/table-engines/special/join.md
@@ -30,65 +30,27 @@ See the detailed description of the [CREATE TABLE](../../../sql-reference/statem
 
 Enter `join_strictness` and `join_type` parameters without quotes, for example, `Join(ANY, LEFT, col1)`. They must match the `JOIN` operation that the table will be used for. If the parameters do not match, ClickHouse does not throw an exception and may return incorrect data.
 
-## Table Usage {#table-usage}
+## Specifics and Recommendations {#specifics-and-recommendations}
 
-### Example {#example}
+### Data Storage {#data-storage}
 
-Creating the left-side table:
+`Join` table data is always located in the RAM. When inserting rows into a table, ClickHouse writes data blocks to the directory on the disk so that they can be restored when the server restarts.
 
-``` sql
-CREATE TABLE id_val(`id` UInt32, `val` UInt32) ENGINE = TinyLog
-```
-
-``` sql
-INSERT INTO id_val VALUES (1,11)(2,12)(3,13)
-```
-
-Creating the right-side `Join` table:
-
-``` sql
-CREATE TABLE id_val_join(`id` UInt32, `val` UInt8) ENGINE = Join(ANY, LEFT, id)
-```
-
-``` sql
-INSERT INTO id_val_join VALUES (1,21)(1,22)(3,23)
-```
-
-Joining the tables:
-
-``` sql
-SELECT * FROM id_val ANY LEFT JOIN id_val_join USING (id) SETTINGS join_use_nulls = 1
-```
-
-``` text
-┌─id─┬─val─┬─id_val_join.val─┐
-│  1 │  11 │              21 │
-│  2 │  12 │            ᴺᵁᴸᴸ │
-│  3 │  13 │              23 │
-└────┴─────┴─────────────────┘
-```
-
-As an alternative, you can retrieve data from the `Join` table, specifying the join key value:
-
-``` sql
-SELECT joinGet('id_val_join', 'val', toUInt32(1))
-```
-
-``` text
-┌─joinGet('id_val_join', 'val', toUInt32(1))─┐
-│                                         21 │
-└────────────────────────────────────────────┘
-```
+If the server restarts incorrectly, the data block on the disk might get lost or damaged. In this case, you may need to manually delete the file with damaged data.
 
 ### Selecting and Inserting Data {#selecting-and-inserting-data}
 
 You can use `INSERT` queries to add data to the `Join`-engine tables. If the table was created with the `ANY` strictness, data for duplicate keys are ignored. With the `ALL` strictness, all rows are added.
 
-You cannot perform a `SELECT` query directly from the table. Instead, use one of the following methods:
+Main use-cases for `Join`-engine tables are following:
 
 -   Place the table to the right side in a `JOIN` clause.
 -   Call the [joinGet](../../../sql-reference/functions/other-functions.md#joinget) function, which lets you extract data from the table the same way as from a dictionary.
 
+### Deleting Data {#deleting-data}
+
+`ALTER DELETE` queries for `Join`-engine tables are implemented as [mutations](../../../sql-reference/statements/alter/index.md#mutations). `DELETE` mutation reads filtered data and overwrites data of memory and disk.
+
 ### Limitations and Settings {#join-limitations-and-settings}
 
 When creating a table, the following settings are applied:
@@ -102,12 +64,64 @@ When creating a table, the following settings are applied:
 
 The `Join`-engine tables can’t be used in `GLOBAL JOIN` operations.
 
-The `Join`-engine allows use [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls) setting in the `CREATE TABLE` statement. And [SELECT](../../../sql-reference/statements/select/index.md) query allows use `join_use_nulls` too. If you have different `join_use_nulls` settings, you can get an error joining table. It depends on kind of JOIN. When you use [joinGet](../../../sql-reference/functions/other-functions.md#joinget) function, you have to use the same `join_use_nulls` setting in `CRATE TABLE` and `SELECT` statements.
+The `Join`-engine allows to specify [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls) setting in the `CREATE TABLE` statement. [SELECT](../../../sql-reference/statements/select/index.md) query should have the same `join_use_nulls` value.
 
-## Data Storage {#data-storage}
+## Usage Examples {#example}
 
-`Join` table data is always located in the RAM. When inserting rows into a table, ClickHouse writes data blocks to the directory on the disk so that they can be restored when the server restarts.
+Creating the left-side table:
 
-If the server restarts incorrectly, the data block on the disk might get lost or damaged. In this case, you may need to manually delete the file with damaged data.
+``` sql
+CREATE TABLE id_val(`id` UInt32, `val` UInt32) ENGINE = TinyLog;
+```
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
+``` sql
+INSERT INTO id_val VALUES (1,11)(2,12)(3,13);
+```
+
+Creating the right-side `Join` table:
+
+``` sql
+CREATE TABLE id_val_join(`id` UInt32, `val` UInt8) ENGINE = Join(ANY, LEFT, id);
+```
+
+``` sql
+INSERT INTO id_val_join VALUES (1,21)(1,22)(3,23);
+```
+
+Joining the tables:
+
+``` sql
+SELECT * FROM id_val ANY LEFT JOIN id_val_join USING (id);
+```
+
+``` text
+┌─id─┬─val─┬─id_val_join.val─┐
+│  1 │  11 │              21 │
+│  2 │  12 │               0 │
+│  3 │  13 │              23 │
+└────┴─────┴─────────────────┘
+```
+
+As an alternative, you can retrieve data from the `Join` table, specifying the join key value:
+
+``` sql
+SELECT joinGet('id_val_join', 'val', toUInt32(1));
+```
+
+``` text
+┌─joinGet('id_val_join', 'val', toUInt32(1))─┐
+│                                         21 │
+└────────────────────────────────────────────┘
+```
+
+Deleting a row from the `Join` table:
+
+```sql
+ALTER TABLE id_val_join DELETE WHERE id = 3;
+```
+
+```text
+┌─id─┬─val─┐
+│  1 │  21 │
+└────┴─────┘
+```
diff --git a/docs/en/engines/table-engines/special/materializedview.md b/docs/en/engines/table-engines/special/materializedview.md
index 1d98eb2e3b7..75161829a7e 100644
--- a/docs/en/engines/table-engines/special/materializedview.md
+++ b/docs/en/engines/table-engines/special/materializedview.md
@@ -7,4 +7,4 @@ toc_title: MaterializedView
 
 Used for implementing materialized views (for more information, see [CREATE VIEW](../../../sql-reference/statements/create/view.md#materialized)). For storing data, it uses a different engine that was specified when creating the view. When reading from a table, it just uses that engine.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/memory.md b/docs/en/engines/table-engines/special/memory.md
index b6402c2030b..eb557d36c50 100644
--- a/docs/en/engines/table-engines/special/memory.md
+++ b/docs/en/engines/table-engines/special/memory.md
@@ -15,4 +15,4 @@ Normally, using this table engine is not justified. However, it can be used for
 
 The Memory engine is used by the system for temporary tables with external query data (see the section “External data for processing a query”), and for implementing `GLOBAL IN` (see the section “IN operators”).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/memory/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/merge.md b/docs/en/engines/table-engines/special/merge.md
index 07cb778c6e9..19ce19fcc64 100644
--- a/docs/en/engines/table-engines/special/merge.md
+++ b/docs/en/engines/table-engines/special/merge.md
@@ -69,4 +69,4 @@ FROM WatchLog
 
 -   [Virtual columns](../../../engines/table-engines/special/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/null.md b/docs/en/engines/table-engines/special/null.md
index 5f9a2ac679b..39ed9c1c1a6 100644
--- a/docs/en/engines/table-engines/special/null.md
+++ b/docs/en/engines/table-engines/special/null.md
@@ -10,4 +10,4 @@ When writing to a `Null` table, data is ignored. When reading from a `Null` tabl
 !!! info "Hint"
     However, you can create a materialized view on a `Null` table. So the data written to the table will end up affecting the view, but original raw data will still be discarded.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/set.md b/docs/en/engines/table-engines/special/set.md
index a5a7e46af13..c38c2418093 100644
--- a/docs/en/engines/table-engines/special/set.md
+++ b/docs/en/engines/table-engines/special/set.md
@@ -20,4 +20,4 @@ When creating a table, the following settings are applied:
 
 -   [persistent](../../../operations/settings/settings.md#persistent)
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/url.md b/docs/en/engines/table-engines/special/url.md
index d3f577f8f4f..04f035206b5 100644
--- a/docs/en/engines/table-engines/special/url.md
+++ b/docs/en/engines/table-engines/special/url.md
@@ -78,4 +78,4 @@ SELECT * FROM url_engine_table
     -   Indexes.
     -   Replication.
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/en/engines/table-engines/special/view.md b/docs/en/engines/table-engines/special/view.md
index c4f95adfa6d..9b847a0e2d5 100644
--- a/docs/en/engines/table-engines/special/view.md
+++ b/docs/en/engines/table-engines/special/view.md
@@ -7,4 +7,4 @@ toc_title: View
 
 Used for implementing views (for more information, see the `CREATE VIEW query`). It does not store data, but only stores the specified `SELECT` query. When reading from a table, it runs this query (and deletes all unnecessary columns from the query).
 
-[Original article](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/en/faq/general/columnar-database.md b/docs/en/faq/general/columnar-database.md
index e30b4a94a87..cbc5f77d0ba 100644
--- a/docs/en/faq/general/columnar-database.md
+++ b/docs/en/faq/general/columnar-database.md
@@ -17,9 +17,9 @@ Key columnar database advantages are:
 Here is the illustration of the difference between traditional row-oriented systems and columnar databases when building reports:
 
 **Traditional row-oriented**
-![Traditional row-oriented](https://clickhouse.tech/docs/en/images/row-oriented.gif#)
+![Traditional row-oriented](https://clickhouse.com/docs/en/images/row-oriented.gif#)
 
 **Columnar**
-![Columnar](https://clickhouse.tech/docs/en/images/column-oriented.gif#)
+![Columnar](https://clickhouse.com/docs/en/images/column-oriented.gif#)
 
 A columnar database is a preferred choice for analytical applications because it allows to have many columns in a table just in case, but do not pay the cost for unused columns on read query execution time. Column-oriented databases are designed for big data processing because and data warehousing, they often natively scale using distributed clusters of low-cost hardware to increase throughput. ClickHouse does it with combination of [distributed](../../engines/table-engines/special/distributed.md) and [replicated](../../engines/table-engines/mergetree-family/replication.md) tables.
diff --git a/docs/en/faq/general/index.md b/docs/en/faq/general/index.md
index 8b4a1432a61..cd2368be1cf 100644
--- a/docs/en/faq/general/index.md
+++ b/docs/en/faq/general/index.md
@@ -21,4 +21,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/general/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/general/) ##}
diff --git a/docs/en/faq/general/ne-tormozit.md b/docs/en/faq/general/ne-tormozit.md
index 17c5479fa6d..26ae741216d 100644
--- a/docs/en/faq/general/ne-tormozit.md
+++ b/docs/en/faq/general/ne-tormozit.md
@@ -23,4 +23,4 @@ If you haven’t seen one of those t-shirts in person, you can check them out on
 
 ![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
 
-P.S. These t-shirts are not for sale, they are given away for free on most [ClickHouse Meetups](https://clickhouse.tech/#meet), usually for best questions or other forms of active participation.
+P.S. These t-shirts are not for sale, they are given away for free on most [ClickHouse Meetups](https://clickhouse.com/#meet), usually for best questions or other forms of active participation.
diff --git a/docs/en/faq/index.md b/docs/en/faq/index.md
index 1e9c3b8ae64..d845b8c5898 100644
--- a/docs/en/faq/index.md
+++ b/docs/en/faq/index.md
@@ -43,4 +43,4 @@ Question candidates:
 - Window function workarounds (row_number, lag/lead, running diff/sum/average)
 ##}
 
-{## [Original article](https://clickhouse.tech/docs/en/faq) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq) ##}
diff --git a/docs/en/faq/integration/index.md b/docs/en/faq/integration/index.md
index 74ff4d04c49..51a2593b751 100644
--- a/docs/en/faq/integration/index.md
+++ b/docs/en/faq/integration/index.md
@@ -16,4 +16,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/integration/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/integration/) ##}
diff --git a/docs/en/faq/operations/index.md b/docs/en/faq/operations/index.md
index bb354771086..c0a6d85b66d 100644
--- a/docs/en/faq/operations/index.md
+++ b/docs/en/faq/operations/index.md
@@ -15,4 +15,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/production/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/production/) ##}
diff --git a/docs/en/faq/use-cases/index.md b/docs/en/faq/use-cases/index.md
index 27090af3830..aac5493b105 100644
--- a/docs/en/faq/use-cases/index.md
+++ b/docs/en/faq/use-cases/index.md
@@ -15,4 +15,4 @@ Questions:
 !!! info "Don’t see what you were looking for?"
     Check out [other F.A.Q. categories](../../faq/index.md) or browse around main documentation articles found in the left sidebar.
 
-{## [Original article](https://clickhouse.tech/docs/en/faq/use-cases/) ##}
+{## [Original article](https://clickhouse.com/docs/en/faq/use-cases/) ##}
diff --git a/docs/en/faq/use-cases/time-series.md b/docs/en/faq/use-cases/time-series.md
index 4fc53c0bea4..bf97ac4b1e2 100644
--- a/docs/en/faq/use-cases/time-series.md
+++ b/docs/en/faq/use-cases/time-series.md
@@ -6,7 +6,7 @@ toc_priority: 101
 
 # Can I Use ClickHouse As a Time-Series Database? {#can-i-use-clickhouse-as-a-time-series-database}
 
-ClickHouse is a generic data storage solution for [OLAP](../../faq/general/olap.md) workloads, while there are many specialized time-series database management systems. Nevertheless, ClickHouse’s [focus on query execution speed](../../faq/general/why-clickhouse-is-so-fast.md) allows it to outperform specialized systems in many cases. There are many independent benchmarks on this topic out there ([example](https://medium.com/@AltinityDB/clickhouse-for-time-series-scalability-benchmarks-e181132a895b)), so we’re not going to conduct one here. Instead, let’s focus on ClickHouse features that are important to use if that’s your use case.
+ClickHouse is a generic data storage solution for [OLAP](../../faq/general/olap.md) workloads, while there are many specialized time-series database management systems. Nevertheless, ClickHouse’s [focus on query execution speed](../../faq/general/why-clickhouse-is-so-fast.md) allows it to outperform specialized systems in many cases. There are many independent benchmarks on this topic out there, so we’re not going to conduct one here. Instead, let’s focus on ClickHouse features that are important to use if that’s your use case.
 
 First of all, there are **[specialized codecs](../../sql-reference/statements/create/table.md#create-query-specialized-codecs)** which make typical time-series. Either common algorithms like `DoubleDelta` and `Gorilla` or specific to ClickHouse like `T64`.
 
diff --git a/docs/en/getting-started/example-datasets/amplab-benchmark.md b/docs/en/getting-started/example-datasets/amplab-benchmark.md
index 27ddfd27f78..b410a3595ec 100644
--- a/docs/en/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/en/getting-started/example-datasets/amplab-benchmark.md
@@ -124,4 +124,4 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/brown-benchmark.md b/docs/en/getting-started/example-datasets/brown-benchmark.md
index c9b74a84a54..93049d1f76a 100644
--- a/docs/en/getting-started/example-datasets/brown-benchmark.md
+++ b/docs/en/getting-started/example-datasets/brown-benchmark.md
@@ -9,7 +9,7 @@ toc_title: Brown University Benchmark
 
 Download the data:
 ```
-wget https://datasets.clickhouse.tech/mgbench{1..3}.csv.xz
+wget https://datasets.clickhouse.com/mgbench{1..3}.csv.xz
 ```
 
 Unpack the data:
@@ -411,6 +411,6 @@ ORDER BY yr,
          mo;
 ```
 
-The data is also available for interactive queries in the [Playground](https://gh-api.clickhouse.tech/play?user=play), [example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
+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==).
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/brown-benchmark/) <!--hide-->
+[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 7028b650ad1..1f681fc32d8 100644
--- a/docs/en/getting-started/example-datasets/cell-towers.md
+++ b/docs/en/getting-started/example-datasets/cell-towers.md
@@ -14,7 +14,7 @@ OpenCelliD Project is licensed under a Creative Commons Attribution-ShareAlike 4
 
 ## Get the Dataset {#get-the-dataset}
 
-1. Download the snapshot of the dataset from February 2021: [https://datasets.clickhouse.tech/cell_towers.csv.xz] (729 MB).
+1. Download the snapshot of the dataset from February 2021: [https://datasets.clickhouse.com/cell_towers.csv.xz] (729 MB).
 
 2. Validate the integrity (optional step):
 ```
@@ -127,6 +127,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.tech/play?user=play), [example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=).
+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=).
 
 Although you cannot create temporary tables there.
\ No newline at end of file
diff --git a/docs/en/getting-started/example-datasets/criteo.md b/docs/en/getting-started/example-datasets/criteo.md
index 261d1606fa4..08298172c70 100644
--- a/docs/en/getting-started/example-datasets/criteo.md
+++ b/docs/en/getting-started/example-datasets/criteo.md
@@ -76,4 +76,4 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/github-events.md b/docs/en/getting-started/example-datasets/github-events.md
index a6c71733832..e470e88b182 100644
--- a/docs/en/getting-started/example-datasets/github-events.md
+++ b/docs/en/getting-started/example-datasets/github-events.md
@@ -7,5 +7,5 @@ toc_title: GitHub Events
 
 Dataset contains all events on GitHub from 2011 to Dec 6 2020, the size is 3.1 billion records. Download size is 75 GB and it will require up to 200 GB space on disk if stored in a table with lz4 compression.
 
-Full dataset description, insights, download instruction and interactive queries are posted [here](https://github-sql.github.io/explorer/).
+Full dataset description, insights, download instruction and interactive queries are posted [here](https://ghe.clickhouse.tech/).
 
diff --git a/docs/en/getting-started/example-datasets/index.md b/docs/en/getting-started/example-datasets/index.md
index 53007c33306..6dae6c20073 100644
--- a/docs/en/getting-started/example-datasets/index.md
+++ b/docs/en/getting-started/example-datasets/index.md
@@ -13,13 +13,16 @@ The list of documented datasets:
 -   [GitHub Events](../../getting-started/example-datasets/github-events.md)
 -   [Anonymized Yandex.Metrica Dataset](../../getting-started/example-datasets/metrica.md)
 -   [Recipes](../../getting-started/example-datasets/recipes.md)
--   [OnTime](../../getting-started/example-datasets/ontime.md)
--   [New York Taxi Data](../../getting-started/example-datasets/nyc-taxi.md)
 -   [Star Schema Benchmark](../../getting-started/example-datasets/star-schema.md)
 -   [WikiStat](../../getting-started/example-datasets/wikistat.md)
 -   [Terabyte of Click Logs from Criteo](../../getting-started/example-datasets/criteo.md)
 -   [AMPLab Big Data Benchmark](../../getting-started/example-datasets/amplab-benchmark.md)
 -   [Brown University Benchmark](../../getting-started/example-datasets/brown-benchmark.md)
+-   [New York Taxi Data](../../getting-started/example-datasets/nyc-taxi.md)
+-   [OpenSky](../../getting-started/example-datasets/opensky.md)
+-   [UK Property Price Paid](../../getting-started/example-datasets/uk-price-paid.md)
 -   [Cell Towers](../../getting-started/example-datasets/cell-towers.md)
+-   [What's on the Menu?](../../getting-started/example-datasets/menus.md)
+-   [OnTime](../../getting-started/example-datasets/ontime.md)
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/menus.md b/docs/en/getting-started/example-datasets/menus.md
new file mode 100644
index 00000000000..665944b3e6f
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/menus.md
@@ -0,0 +1,355 @@
+---
+toc_priority: 21
+toc_title: Menus
+---
+
+# New York Public Library "What's on the Menu?" Dataset {#menus-dataset}
+
+The dataset is created by the New York Public Library. It contains historical data on the menus of hotels, restaurants and cafes with the dishes along with their prices.
+
+Source: http://menus.nypl.org/data
+The data is in public domain.
+
+The data is from library's archive and it may be incomplete and difficult for statistical analysis. Nevertheless it is also very yummy.
+The size is just 1.3 million records about dishes in the menus — it's a very small data volume for ClickHouse, but it's still a good example.
+
+## Download the Dataset {#download-dataset}
+
+Run the command:
+
+```bash
+wget https://s3.amazonaws.com/menusdata.nypl.org/gzips/2021_08_01_07_01_17_data.tgz
+```
+
+Replace the link to the up to date link from http://menus.nypl.org/data if needed.
+Download size is about 35 MB.
+
+## Unpack the Dataset {#unpack-dataset}
+
+```bash
+tar xvf 2021_08_01_07_01_17_data.tgz
+```
+
+Uncompressed size is about 150 MB.
+
+The data is normalized consisted of four tables:
+- `Menu` — Information about menus: the name of the restaurant, the date when menu was seen, etc.
+- `Dish` — Information about dishes: the name of the dish along with some characteristic.
+- `MenuPage` — Information about the pages in the menus, because every page belongs to some menu.
+- `MenuItem` — An item of the menu. A dish along with its price on some menu page: links to dish and menu page.
+
+## Create the Tables {#create-tables}
+
+We use [Decimal](../../sql-reference/data-types/decimal.md) data type to store prices.
+
+```sql
+CREATE TABLE dish
+(
+    id UInt32,
+    name String,
+    description String,
+    menus_appeared UInt32,
+    times_appeared Int32,
+    first_appeared UInt16,
+    last_appeared UInt16,
+    lowest_price Decimal64(3),
+    highest_price Decimal64(3)
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu
+(
+    id UInt32,
+    name String,
+    sponsor String,
+    event String,
+    venue String,
+    place String,
+    physical_description String,
+    occasion String,
+    notes String,
+    call_number String,
+    keywords String,
+    language String,
+    date String,
+    location String,
+    location_type String,
+    currency String,
+    currency_symbol String,
+    status String,
+    page_count UInt16,
+    dish_count UInt16
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu_page
+(
+    id UInt32,
+    menu_id UInt32,
+    page_number UInt16,
+    image_id String,
+    full_height UInt16,
+    full_width UInt16,
+    uuid UUID
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu_item
+(
+    id UInt32,
+    menu_page_id UInt32,
+    price Decimal64(3),
+    high_price Decimal64(3),
+    dish_id UInt32,
+    created_at DateTime,
+    updated_at DateTime,
+    xpos Float64,
+    ypos Float64
+) ENGINE = MergeTree ORDER BY id;
+```
+
+## Import the Data {#import-data}
+
+Upload data into ClickHouse, run:
+
+```bash
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO dish FORMAT CSVWithNames" < Dish.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO menu FORMAT CSVWithNames" < Menu.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO menu_page FORMAT CSVWithNames" < MenuPage.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --date_time_input_format best_effort --query "INSERT INTO menu_item FORMAT CSVWithNames" < MenuItem.csv
+```
+
+We use [CSVWithNames](../../interfaces/formats.md#csvwithnames) format as the data is represented by CSV with header.
+
+We disable `format_csv_allow_single_quotes` as only double quotes are used for data fields and single quotes can be inside the values and should not confuse the CSV parser.
+
+We disable [input_format_null_as_default](../../operations/settings/settings.md#settings-input-format-null-as-default) as our data does not have [NULL](../../sql-reference/syntax.md#null-literal). Otherwise ClickHouse will try to parse `\N` sequences and can be confused with `\` in data.
+
+The setting [date_time_input_format best_effort](../../operations/settings/settings.md#settings-date_time_input_format) allows to parse [DateTime](../../sql-reference/data-types/datetime.md)  fields in wide variety of formats. For example, ISO-8601 without seconds like '2000-01-01 01:02' will be recognized. Without this setting only fixed DateTime format is allowed.
+
+## Denormalize the Data {#denormalize-data}
+
+Data is presented in multiple tables in [normalized form](https://en.wikipedia.org/wiki/Database_normalization#Normal_forms). It means you have to perform [JOIN](../../sql-reference/statements/select/join.md#select-join) if you want to query, e.g. dish names from menu items.
+For typical analytical tasks it is way more efficient to deal with pre-JOINed data to avoid doing `JOIN` every time. It is called "denormalized" data.
+
+We will create a table `menu_item_denorm` where will contain all the data JOINed together:
+
+```sql
+CREATE TABLE menu_item_denorm
+ENGINE = MergeTree ORDER BY (dish_name, created_at)
+AS SELECT
+    price,
+    high_price,
+    created_at,
+    updated_at,
+    xpos,
+    ypos,
+    dish.id AS dish_id,
+    dish.name AS dish_name,
+    dish.description AS dish_description,
+    dish.menus_appeared AS dish_menus_appeared,
+    dish.times_appeared AS dish_times_appeared,
+    dish.first_appeared AS dish_first_appeared,
+    dish.last_appeared AS dish_last_appeared,
+    dish.lowest_price AS dish_lowest_price,
+    dish.highest_price AS dish_highest_price,
+    menu.id AS menu_id,
+    menu.name AS menu_name,
+    menu.sponsor AS menu_sponsor,
+    menu.event AS menu_event,
+    menu.venue AS menu_venue,
+    menu.place AS menu_place,
+    menu.physical_description AS menu_physical_description,
+    menu.occasion AS menu_occasion,
+    menu.notes AS menu_notes,
+    menu.call_number AS menu_call_number,
+    menu.keywords AS menu_keywords,
+    menu.language AS menu_language,
+    menu.date AS menu_date,
+    menu.location AS menu_location,
+    menu.location_type AS menu_location_type,
+    menu.currency AS menu_currency,
+    menu.currency_symbol AS menu_currency_symbol,
+    menu.status AS menu_status,
+    menu.page_count AS menu_page_count,
+    menu.dish_count AS menu_dish_count
+FROM menu_item
+    JOIN dish ON menu_item.dish_id = dish.id
+    JOIN menu_page ON menu_item.menu_page_id = menu_page.id
+    JOIN menu ON menu_page.menu_id = menu.id;
+```
+
+## Validate the Data {#validate-data}
+
+Query:
+
+```sql
+SELECT count() FROM menu_item_denorm;
+```
+
+Result:
+
+```text
+┌─count()─┐
+│ 1329175 │
+└─────────┘
+```
+
+## Run Some Queries {#run-queries}
+
+### Averaged historical prices of dishes {#query-averaged-historical-prices}
+
+Query:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 100, 100)
+FROM menu_item_denorm
+WHERE (menu_currency = 'Dollars') AND (d > 0) AND (d < 2022)
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Result:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 100, 100)─┐
+│ 1850 │     618 │                  1.5 │ █▍                           │
+│ 1860 │    1634 │                 1.29 │ █▎                           │
+│ 1870 │    2215 │                 1.36 │ █▎                           │
+│ 1880 │    3909 │                 1.01 │ █                            │
+│ 1890 │    8837 │                  1.4 │ █▍                           │
+│ 1900 │  176292 │                 0.68 │ ▋                            │
+│ 1910 │  212196 │                 0.88 │ ▊                            │
+│ 1920 │  179590 │                 0.74 │ ▋                            │
+│ 1930 │   73707 │                  0.6 │ ▌                            │
+│ 1940 │   58795 │                 0.57 │ ▌                            │
+│ 1950 │   41407 │                 0.95 │ ▊                            │
+│ 1960 │   51179 │                 1.32 │ █▎                           │
+│ 1970 │   12914 │                 1.86 │ █▋                           │
+│ 1980 │    7268 │                 4.35 │ ████▎                        │
+│ 1990 │   11055 │                 6.03 │ ██████                       │
+│ 2000 │    2467 │                11.85 │ ███████████▋                 │
+│ 2010 │     597 │                25.66 │ █████████████████████████▋   │
+└──────┴─────────┴──────────────────────┴──────────────────────────────┘
+```
+
+Take it with a grain of salt.
+
+### Burger Prices {#query-burger-prices}
+
+Query:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100)
+FROM menu_item_denorm
+WHERE (menu_currency = 'Dollars') AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%burger%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Result:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)───────────┐
+│ 1880 │       2 │                 0.42 │ ▋                                     │
+│ 1890 │       7 │                 0.85 │ █▋                                    │
+│ 1900 │     399 │                 0.49 │ ▊                                     │
+│ 1910 │     589 │                 0.68 │ █▎                                    │
+│ 1920 │     280 │                 0.56 │ █                                     │
+│ 1930 │      74 │                 0.42 │ ▋                                     │
+│ 1940 │     119 │                 0.59 │ █▏                                    │
+│ 1950 │     134 │                 1.09 │ ██▏                                   │
+│ 1960 │     272 │                 0.92 │ █▋                                    │
+│ 1970 │     108 │                 1.18 │ ██▎                                   │
+│ 1980 │      88 │                 2.82 │ █████▋                                │
+│ 1990 │     184 │                 3.68 │ ███████▎                              │
+│ 2000 │      21 │                 7.14 │ ██████████████▎                       │
+│ 2010 │       6 │                18.42 │ ████████████████████████████████████▋ │
+└──────┴─────────┴──────────────────────┴───────────────────────────────────────┘
+```
+
+### Vodka {#query-vodka}
+
+Query:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100)
+FROM menu_item_denorm
+WHERE (menu_currency IN ('Dollars', '')) AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%vodka%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Result:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)─┐
+│ 1910 │       2 │                    0 │                             │
+│ 1920 │       1 │                  0.3 │ ▌                           │
+│ 1940 │      21 │                 0.42 │ ▋                           │
+│ 1950 │      14 │                 0.59 │ █▏                          │
+│ 1960 │     113 │                 2.17 │ ████▎                       │
+│ 1970 │      37 │                 0.68 │ █▎                          │
+│ 1980 │      19 │                 2.55 │ █████                       │
+│ 1990 │      86 │                  3.6 │ ███████▏                    │
+│ 2000 │       2 │                 3.98 │ ███████▊                    │
+└──────┴─────────┴──────────────────────┴─────────────────────────────┘
+```
+
+To get vodka we have to write `ILIKE '%vodka%'` and this definitely makes a statement.
+
+### Caviar {#query-caviar}
+
+Let's print caviar prices. Also let's print a name of any dish with caviar.
+
+Query:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100),
+    any(dish_name)
+FROM menu_item_denorm
+WHERE (menu_currency IN ('Dollars', '')) AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%caviar%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Result:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)──────┬─any(dish_name)──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ 1090 │       1 │                    0 │                                  │ Caviar                                                                                                                              │
+│ 1880 │       3 │                    0 │                                  │ Caviar                                                                                                                              │
+│ 1890 │      39 │                 0.59 │ █▏                               │ Butter and caviar                                                                                                                   │
+│ 1900 │    1014 │                 0.34 │ ▋                                │ Anchovy Caviar on Toast                                                                                                             │
+│ 1910 │    1588 │                 1.35 │ ██▋                              │ 1/1 Brötchen Caviar                                                                                                                 │
+│ 1920 │     927 │                 1.37 │ ██▋                              │ ASTRAKAN CAVIAR                                                                                                                     │
+│ 1930 │     289 │                 1.91 │ ███▋                             │ Astrachan caviar                                                                                                                    │
+│ 1940 │     201 │                 0.83 │ █▋                               │ (SPECIAL) Domestic Caviar Sandwich                                                                                                  │
+│ 1950 │      81 │                 2.27 │ ████▌                            │ Beluga Caviar                                                                                                                       │
+│ 1960 │     126 │                 2.21 │ ████▍                            │ Beluga Caviar                                                                                                                       │
+│ 1970 │     105 │                 0.95 │ █▊                               │ BELUGA MALOSSOL CAVIAR AMERICAN DRESSING                                                                                            │
+│ 1980 │      12 │                 7.22 │ ██████████████▍                  │ Authentic Iranian Beluga Caviar the world's finest black caviar presented in ice garni and a sampling of chilled 100° Russian vodka │
+│ 1990 │      74 │                14.42 │ ████████████████████████████▋    │ Avocado Salad, Fresh cut avocado with caviare                                                                                       │
+│ 2000 │       3 │                 7.82 │ ███████████████▋                 │ Aufgeschlagenes Kartoffelsueppchen mit Forellencaviar                                                                               │
+│ 2010 │       6 │                15.58 │ ███████████████████████████████▏ │ "OYSTERS AND PEARLS" "Sabayon" of Pearl Tapioca with Island Creek Oysters and Russian Sevruga Caviar                                │
+└──────┴─────────┴──────────────────────┴──────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+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==).
diff --git a/docs/en/getting-started/example-datasets/metrica.md b/docs/en/getting-started/example-datasets/metrica.md
index 159c99b15a0..483220d12ee 100644
--- a/docs/en/getting-started/example-datasets/metrica.md
+++ b/docs/en/getting-started/example-datasets/metrica.md
@@ -7,14 +7,14 @@ toc_title: Yandex.Metrica Data
 
 Dataset consists of two tables containing anonymized data about hits (`hits_v1`) and visits (`visits_v1`) of Yandex.Metrica. You can read more about Yandex.Metrica in [ClickHouse history](../../introduction/history.md) section.
 
-The dataset consists of two tables, either of them can be downloaded as a compressed `tsv.xz` file or as prepared partitions. In addition to that, an extended version of the `hits` table containing 100 million rows is available as TSV at https://datasets.clickhouse.tech/hits/tsv/hits_100m_obfuscated_v1.tsv.xz and as prepared partitions at https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz.
+The dataset consists of two tables, either of them can be downloaded as a compressed `tsv.xz` file or as prepared partitions. In addition to that, an extended version of the `hits` table containing 100 million rows is available as TSV at https://datasets.clickhouse.com/hits/tsv/hits_100m_obfuscated_v1.tsv.xz and as prepared partitions at https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz.
 
 ## Obtaining Tables from Prepared Partitions {#obtaining-tables-from-prepared-partitions}
 
 Download and import hits table:
 
 ``` bash
-curl -O https://datasets.clickhouse.tech/hits/partitions/hits_v1.tar
+curl -O https://datasets.clickhouse.com/hits/partitions/hits_v1.tar
 tar xvf hits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 # check permissions on unpacked data, fix if required
 sudo service clickhouse-server restart
@@ -24,7 +24,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 Download and import visits:
 
 ``` bash
-curl -O https://datasets.clickhouse.tech/visits/partitions/visits_v1.tar
+curl -O https://datasets.clickhouse.com/visits/partitions/visits_v1.tar
 tar xvf visits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 # check permissions on unpacked data, fix if required
 sudo service clickhouse-server restart
@@ -36,13 +36,17 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
 Download and import hits from compressed TSV file:
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
 # Validate the checksum
 md5sum hits_v1.tsv
 # Checksum should be equal to: f3631b6295bf06989c1437491f7592cb
 # now create table
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
+# for hits_v1
 clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+# for hits_100m_obfuscated
+clickhouse-client --query="CREATE TABLE  hits_100m_obfuscated (WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, Refresh UInt8, RefererCategoryID UInt16, RefererRegionID UInt32, URLCategoryID UInt16, URLRegionID UInt32, ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, OriginalURL String, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), LocalEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, RemoteIP UInt32, WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming UInt32, DNSTiming UInt32, ConnectTiming UInt32, ResponseStartTiming UInt32, ResponseEndTiming UInt32, FetchTiming UInt32, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER  BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+
 # import data
 cat hits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.hits_v1 FORMAT TSV" --max_insert_block_size=100000
 # optionally you can optimize table
@@ -53,7 +57,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 Download and import visits from compressed tsv-file:
 
 ``` bash
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 # Validate the checksum
 md5sum visits_v1.tsv
 # Checksum should be equal to: 6dafe1a0f24e59e3fc2d0fed85601de6
diff --git a/docs/en/getting-started/example-datasets/nyc-taxi.md b/docs/en/getting-started/example-datasets/nyc-taxi.md
index 38a87a674f9..b3233315db3 100644
--- a/docs/en/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/en/getting-started/example-datasets/nyc-taxi.md
@@ -283,7 +283,7 @@ Among other things, you can run the OPTIMIZE query on MergeTree. But it’s not
 ## Download of Prepared Partitions {#download-of-prepared-partitions}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/trips_mergetree/partitions/trips_mergetree.tar
+$ curl -O https://datasets.clickhouse.com/trips_mergetree/partitions/trips_mergetree.tar
 $ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 $ # check permissions of unpacked data, fix if required
 $ sudo service clickhouse-server restart
@@ -385,4 +385,4 @@ We ran queries using a client located in a Yandex datacenter in Finland on a clu
 | 3       | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140     | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/ontime.md b/docs/en/getting-started/example-datasets/ontime.md
index dfa1d7ff964..bcba4cfb77d 100644
--- a/docs/en/getting-started/example-datasets/ontime.md
+++ b/docs/en/getting-started/example-datasets/ontime.md
@@ -149,7 +149,7 @@ ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | se
 ## Download of Prepared Partitions {#download-of-prepared-partitions}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/ontime/partitions/ontime.tar
+$ 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
@@ -393,7 +393,7 @@ ORDER BY c DESC
 LIMIT 10;
 ```
 
-You can also play with the data in Playground, [example](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIERheU9mV2VlaywgY291bnQoKikgQVMgYwpGUk9NIG9udGltZQpXSEVSRSBZZWFyPj0yMDAwIEFORCBZZWFyPD0yMDA4CkdST1VQIEJZIERheU9mV2VlawpPUkRFUiBCWSBjIERFU0M7Cg==).
+You can also play with the data in Playground, [example](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIERheU9mV2VlaywgY291bnQoKikgQVMgYwpGUk9NIG9udGltZQpXSEVSRSBZZWFyPj0yMDAwIEFORCBZZWFyPD0yMDA4CkdST1VQIEJZIERheU9mV2VlawpPUkRFUiBCWSBjIERFU0M7Cg==).
 
 This performance test was created by Vadim Tkachenko. See:
 
@@ -404,4 +404,4 @@ This performance test was created by Vadim Tkachenko. See:
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/opensky.md b/docs/en/getting-started/example-datasets/opensky.md
new file mode 100644
index 00000000000..2d901397cb2
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/opensky.md
@@ -0,0 +1,420 @@
+---
+toc_priority: 20
+toc_title: OpenSky
+---
+
+# Crowdsourced air traffic data from The OpenSky Network 2020 {#opensky}
+
+"The data in this dataset is derived and cleaned from the full OpenSky dataset to illustrate the development of air traffic during the COVID-19 pandemic. It spans all flights seen by the network's more than 2500 members since 1 January 2019. More data will be periodically included in the dataset until the end of the COVID-19 pandemic".
+
+Source: https://zenodo.org/record/5092942#.YRBCyTpRXYd
+
+Martin Strohmeier, Xavier Olive, Jannis Lübbe, Matthias Schäfer, and Vincent Lenders
+"Crowdsourced air traffic data from the OpenSky Network 2019–2020"
+Earth System Science Data 13(2), 2021
+https://doi.org/10.5194/essd-13-357-2021
+
+## Download the Dataset {#download-dataset}
+
+Run the command:
+
+```bash
+wget -O- https://zenodo.org/record/5092942 | grep -oP 'https://zenodo.org/record/5092942/files/flightlist_\d+_\d+\.csv\.gz' | xargs wget
+```
+
+Download will take about 2 minutes with good internet connection. There are 30 files with total size of 4.3 GB.
+
+## Create the Table {#create-table}
+
+```sql
+CREATE TABLE opensky
+(
+    callsign String,
+    number String,
+    icao24 String,
+    registration String,
+    typecode String,
+    origin String,
+    destination String,
+    firstseen DateTime,
+    lastseen DateTime,
+    day DateTime,
+    latitude_1 Float64,
+    longitude_1 Float64,
+    altitude_1 Float64,
+    latitude_2 Float64,
+    longitude_2 Float64,
+    altitude_2 Float64
+) ENGINE = MergeTree ORDER BY (origin, destination, callsign);
+```
+
+## Import Data {#import-data}
+
+Upload data into ClickHouse in parallel:
+
+```bash
+ls -1 flightlist_*.csv.gz | xargs -P100 -I{} bash -c 'gzip -c -d "{}" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"'
+```
+
+- Here we pass the list of files (`ls -1 flightlist_*.csv.gz`) to `xargs` for parallel processing.
+`xargs -P100` specifies to use up to 100 parallel workers but as we only have 30 files, the number of workers will be only 30.
+- For every file, `xargs` will run a script with `bash -c`. The script has substitution in form of `{}` and the `xargs` command will substitute the filename to it (we have asked it for `xargs` with `-I{}`).
+- The script will decompress the file (`gzip -c -d "{}"`) to standard output (`-c` parameter) and the output is redirected to `clickhouse-client`.
+- We also asked to parse [DateTime](../../sql-reference/data-types/datetime.md) fields with extended parser ([--date_time_input_format best_effort](../../operations/settings/settings.md#settings-date_time_input_format)) to recognize ISO-8601 format with timezone offsets.
+
+Finally, `clickhouse-client` will do insertion. It will read input data in [CSVWithNames](../../interfaces/formats.md#csvwithnames) format. 
+
+Parallel upload takes 24 seconds.
+
+If you don't like parallel upload, here is sequential variant:
+
+```bash
+for file in flightlist_*.csv.gz; do gzip -c -d "$file" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"; done
+```
+
+## Validate the Data {#validate-data}
+
+Query:
+
+```sql
+SELECT count() FROM opensky;
+```
+
+Result:
+
+```text
+┌──count()─┐
+│ 66010819 │
+└──────────┘
+```
+
+The size of dataset in ClickHouse is just 2.66 GiB, check it.
+
+Query:
+
+```sql
+SELECT formatReadableSize(total_bytes) FROM system.tables WHERE name = 'opensky';
+```
+
+Result:
+
+```text
+┌─formatReadableSize(total_bytes)─┐
+│ 2.66 GiB                        │
+└─────────────────────────────────┘
+```
+
+## Run Some Queries {#run-queries}
+
+Total distance travelled is 68 billion kilometers.
+
+Query:
+
+```sql
+SELECT formatReadableQuantity(sum(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) / 1000) FROM opensky;
+```
+
+Result:
+
+```text
+┌─formatReadableQuantity(divide(sum(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)), 1000))─┐
+│ 68.72 billion                                                                                            │
+└──────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+Average flight distance is around 1000 km.
+
+Query:
+
+```sql
+SELECT avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) FROM opensky;
+```
+
+Result:
+
+```text
+┌─avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))─┐
+│                                                 1041090.6465708319 │
+└────────────────────────────────────────────────────────────────────┘
+```
+
+### Most busy origin airports and the average distance seen {#busy-airports-average-distance}
+
+Query:
+
+```sql
+SELECT
+    origin,
+    count(),
+    round(avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))) AS distance,
+    bar(distance, 0, 10000000, 100) AS bar
+FROM opensky
+WHERE origin != ''
+GROUP BY origin
+ORDER BY count() DESC
+LIMIT 100;
+```
+
+Result:
+
+```text
+     ┌─origin─┬─count()─┬─distance─┬─bar────────────────────────────────────┐
+  1. │ KORD   │  745007 │  1546108 │ ███████████████▍                       │
+  2. │ KDFW   │  696702 │  1358721 │ █████████████▌                         │
+  3. │ KATL   │  667286 │  1169661 │ ███████████▋                           │
+  4. │ KDEN   │  582709 │  1287742 │ ████████████▊                          │
+  5. │ KLAX   │  581952 │  2628393 │ ██████████████████████████▎            │
+  6. │ KLAS   │  447789 │  1336967 │ █████████████▎                         │
+  7. │ KPHX   │  428558 │  1345635 │ █████████████▍                         │
+  8. │ KSEA   │  412592 │  1757317 │ █████████████████▌                     │
+  9. │ KCLT   │  404612 │   880355 │ ████████▋                              │
+ 10. │ VIDP   │  363074 │  1445052 │ ██████████████▍                        │
+ 11. │ EDDF   │  362643 │  2263960 │ ██████████████████████▋                │
+ 12. │ KSFO   │  361869 │  2445732 │ ████████████████████████▍              │
+ 13. │ KJFK   │  349232 │  2996550 │ █████████████████████████████▊         │
+ 14. │ KMSP   │  346010 │  1287328 │ ████████████▋                          │
+ 15. │ LFPG   │  344748 │  2206203 │ ██████████████████████                 │
+ 16. │ EGLL   │  341370 │  3216593 │ ████████████████████████████████▏      │
+ 17. │ EHAM   │  340272 │  2116425 │ █████████████████████▏                 │
+ 18. │ KEWR   │  337696 │  1826545 │ ██████████████████▎                    │
+ 19. │ KPHL   │  320762 │  1291761 │ ████████████▊                          │
+ 20. │ OMDB   │  308855 │  2855706 │ ████████████████████████████▌          │
+ 21. │ UUEE   │  307098 │  1555122 │ ███████████████▌                       │
+ 22. │ KBOS   │  304416 │  1621675 │ ████████████████▏                      │
+ 23. │ LEMD   │  291787 │  1695097 │ ████████████████▊                      │
+ 24. │ YSSY   │  272979 │  1875298 │ ██████████████████▋                    │
+ 25. │ KMIA   │  265121 │  1923542 │ ███████████████████▏                   │
+ 26. │ ZGSZ   │  263497 │   745086 │ ███████▍                               │
+ 27. │ EDDM   │  256691 │  1361453 │ █████████████▌                         │
+ 28. │ WMKK   │  254264 │  1626688 │ ████████████████▎                      │
+ 29. │ CYYZ   │  251192 │  2175026 │ █████████████████████▋                 │
+ 30. │ KLGA   │  248699 │  1106935 │ ███████████                            │
+ 31. │ VHHH   │  248473 │  3457658 │ ██████████████████████████████████▌    │
+ 32. │ RJTT   │  243477 │  1272744 │ ████████████▋                          │
+ 33. │ KBWI   │  241440 │  1187060 │ ███████████▋                           │
+ 34. │ KIAD   │  239558 │  1683485 │ ████████████████▋                      │
+ 35. │ KIAH   │  234202 │  1538335 │ ███████████████▍                       │
+ 36. │ KFLL   │  223447 │  1464410 │ ██████████████▋                        │
+ 37. │ KDAL   │  212055 │  1082339 │ ██████████▋                            │
+ 38. │ KDCA   │  207883 │  1013359 │ ██████████▏                            │
+ 39. │ LIRF   │  207047 │  1427965 │ ██████████████▎                        │
+ 40. │ PANC   │  206007 │  2525359 │ █████████████████████████▎             │
+ 41. │ LTFJ   │  205415 │   860470 │ ████████▌                              │
+ 42. │ KDTW   │  204020 │  1106716 │ ███████████                            │
+ 43. │ VABB   │  201679 │  1300865 │ █████████████                          │
+ 44. │ OTHH   │  200797 │  3759544 │ █████████████████████████████████████▌ │
+ 45. │ KMDW   │  200796 │  1232551 │ ████████████▎                          │
+ 46. │ KSAN   │  198003 │  1495195 │ ██████████████▊                        │
+ 47. │ KPDX   │  197760 │  1269230 │ ████████████▋                          │
+ 48. │ SBGR   │  197624 │  2041697 │ ████████████████████▍                  │
+ 49. │ VOBL   │  189011 │  1040180 │ ██████████▍                            │
+ 50. │ LEBL   │  188956 │  1283190 │ ████████████▋                          │
+ 51. │ YBBN   │  188011 │  1253405 │ ████████████▌                          │
+ 52. │ LSZH   │  187934 │  1572029 │ ███████████████▋                       │
+ 53. │ YMML   │  187643 │  1870076 │ ██████████████████▋                    │
+ 54. │ RCTP   │  184466 │  2773976 │ ███████████████████████████▋           │
+ 55. │ KSNA   │  180045 │   778484 │ ███████▋                               │
+ 56. │ EGKK   │  176420 │  1694770 │ ████████████████▊                      │
+ 57. │ LOWW   │  176191 │  1274833 │ ████████████▋                          │
+ 58. │ UUDD   │  176099 │  1368226 │ █████████████▋                         │
+ 59. │ RKSI   │  173466 │  3079026 │ ██████████████████████████████▋        │
+ 60. │ EKCH   │  172128 │  1229895 │ ████████████▎                          │
+ 61. │ KOAK   │  171119 │  1114447 │ ███████████▏                           │
+ 62. │ RPLL   │  170122 │  1440735 │ ██████████████▍                        │
+ 63. │ KRDU   │  167001 │   830521 │ ████████▎                              │
+ 64. │ KAUS   │  164524 │  1256198 │ ████████████▌                          │
+ 65. │ KBNA   │  163242 │  1022726 │ ██████████▏                            │
+ 66. │ KSDF   │  162655 │  1380867 │ █████████████▋                         │
+ 67. │ ENGM   │  160732 │   910108 │ █████████                              │
+ 68. │ LIMC   │  160696 │  1564620 │ ███████████████▋                       │
+ 69. │ KSJC   │  159278 │  1081125 │ ██████████▋                            │
+ 70. │ KSTL   │  157984 │  1026699 │ ██████████▎                            │
+ 71. │ UUWW   │  156811 │  1261155 │ ████████████▌                          │
+ 72. │ KIND   │  153929 │   987944 │ █████████▊                             │
+ 73. │ ESSA   │  153390 │  1203439 │ ████████████                           │
+ 74. │ KMCO   │  153351 │  1508657 │ ███████████████                        │
+ 75. │ KDVT   │  152895 │    74048 │ ▋                                      │
+ 76. │ VTBS   │  152645 │  2255591 │ ██████████████████████▌                │
+ 77. │ CYVR   │  149574 │  2027413 │ ████████████████████▎                  │
+ 78. │ EIDW   │  148723 │  1503985 │ ███████████████                        │
+ 79. │ LFPO   │  143277 │  1152964 │ ███████████▌                           │
+ 80. │ EGSS   │  140830 │  1348183 │ █████████████▍                         │
+ 81. │ KAPA   │  140776 │   420441 │ ████▏                                  │
+ 82. │ KHOU   │  138985 │  1068806 │ ██████████▋                            │
+ 83. │ KTPA   │  138033 │  1338223 │ █████████████▍                         │
+ 84. │ KFFZ   │  137333 │    55397 │ ▌                                      │
+ 85. │ NZAA   │  136092 │  1581264 │ ███████████████▋                       │
+ 86. │ YPPH   │  133916 │  1271550 │ ████████████▋                          │
+ 87. │ RJBB   │  133522 │  1805623 │ ██████████████████                     │
+ 88. │ EDDL   │  133018 │  1265919 │ ████████████▋                          │
+ 89. │ ULLI   │  130501 │  1197108 │ ███████████▊                           │
+ 90. │ KIWA   │  127195 │   250876 │ ██▌                                    │
+ 91. │ KTEB   │  126969 │  1189414 │ ███████████▊                           │
+ 92. │ VOMM   │  125616 │  1127757 │ ███████████▎                           │
+ 93. │ LSGG   │  123998 │  1049101 │ ██████████▍                            │
+ 94. │ LPPT   │  122733 │  1779187 │ █████████████████▋                     │
+ 95. │ WSSS   │  120493 │  3264122 │ ████████████████████████████████▋      │
+ 96. │ EBBR   │  118539 │  1579939 │ ███████████████▋                       │
+ 97. │ VTBD   │  118107 │   661627 │ ██████▌                                │
+ 98. │ KVNY   │  116326 │   692960 │ ██████▊                                │
+ 99. │ EDDT   │  115122 │   941740 │ █████████▍                             │
+100. │ EFHK   │  114860 │  1629143 │ ████████████████▎                      │
+     └────────┴─────────┴──────────┴────────────────────────────────────────┘
+```
+
+### Number of flights from three major Moscow airports, weekly {#flights-from-moscow}
+
+Query:
+
+```sql
+SELECT
+    toMonday(day) AS k,
+    count() AS c,
+    bar(c, 0, 10000, 100) AS bar
+FROM opensky
+WHERE origin IN ('UUEE', 'UUDD', 'UUWW')
+GROUP BY k
+ORDER BY k ASC;
+```
+
+Result:
+
+```text
+     ┌──────────k─┬────c─┬─bar──────────────────────────────────────────────────────────────────────────┐
+  1. │ 2018-12-31 │ 5248 │ ████████████████████████████████████████████████████▍                        │
+  2. │ 2019-01-07 │ 6302 │ ███████████████████████████████████████████████████████████████              │
+  3. │ 2019-01-14 │ 5701 │ █████████████████████████████████████████████████████████                    │
+  4. │ 2019-01-21 │ 5638 │ ████████████████████████████████████████████████████████▍                    │
+  5. │ 2019-01-28 │ 5731 │ █████████████████████████████████████████████████████████▎                   │
+  6. │ 2019-02-04 │ 5683 │ ████████████████████████████████████████████████████████▋                    │
+  7. │ 2019-02-11 │ 5759 │ █████████████████████████████████████████████████████████▌                   │
+  8. │ 2019-02-18 │ 5736 │ █████████████████████████████████████████████████████████▎                   │
+  9. │ 2019-02-25 │ 5873 │ ██████████████████████████████████████████████████████████▋                  │
+ 10. │ 2019-03-04 │ 5965 │ ███████████████████████████████████████████████████████████▋                 │
+ 11. │ 2019-03-11 │ 5900 │ ███████████████████████████████████████████████████████████                  │
+ 12. │ 2019-03-18 │ 5823 │ ██████████████████████████████████████████████████████████▏                  │
+ 13. │ 2019-03-25 │ 5899 │ ██████████████████████████████████████████████████████████▊                  │
+ 14. │ 2019-04-01 │ 6043 │ ████████████████████████████████████████████████████████████▍                │
+ 15. │ 2019-04-08 │ 6098 │ ████████████████████████████████████████████████████████████▊                │
+ 16. │ 2019-04-15 │ 6196 │ █████████████████████████████████████████████████████████████▊               │
+ 17. │ 2019-04-22 │ 6486 │ ████████████████████████████████████████████████████████████████▋            │
+ 18. │ 2019-04-29 │ 6682 │ ██████████████████████████████████████████████████████████████████▋          │
+ 19. │ 2019-05-06 │ 6739 │ ███████████████████████████████████████████████████████████████████▍         │
+ 20. │ 2019-05-13 │ 6600 │ ██████████████████████████████████████████████████████████████████           │
+ 21. │ 2019-05-20 │ 6575 │ █████████████████████████████████████████████████████████████████▋           │
+ 22. │ 2019-05-27 │ 6786 │ ███████████████████████████████████████████████████████████████████▋         │
+ 23. │ 2019-06-03 │ 6872 │ ████████████████████████████████████████████████████████████████████▋        │
+ 24. │ 2019-06-10 │ 7045 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 25. │ 2019-06-17 │ 7045 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 26. │ 2019-06-24 │ 6852 │ ████████████████████████████████████████████████████████████████████▌        │
+ 27. │ 2019-07-01 │ 7248 │ ████████████████████████████████████████████████████████████████████████▍    │
+ 28. │ 2019-07-08 │ 7284 │ ████████████████████████████████████████████████████████████████████████▋    │
+ 29. │ 2019-07-15 │ 7142 │ ███████████████████████████████████████████████████████████████████████▍     │
+ 30. │ 2019-07-22 │ 7108 │ ███████████████████████████████████████████████████████████████████████      │
+ 31. │ 2019-07-29 │ 7251 │ ████████████████████████████████████████████████████████████████████████▌    │
+ 32. │ 2019-08-05 │ 7403 │ ██████████████████████████████████████████████████████████████████████████   │
+ 33. │ 2019-08-12 │ 7457 │ ██████████████████████████████████████████████████████████████████████████▌  │
+ 34. │ 2019-08-19 │ 7502 │ ███████████████████████████████████████████████████████████████████████████  │
+ 35. │ 2019-08-26 │ 7540 │ ███████████████████████████████████████████████████████████████████████████▍ │
+ 36. │ 2019-09-02 │ 7237 │ ████████████████████████████████████████████████████████████████████████▎    │
+ 37. │ 2019-09-09 │ 7328 │ █████████████████████████████████████████████████████████████████████████▎   │
+ 38. │ 2019-09-16 │ 5566 │ ███████████████████████████████████████████████████████▋                     │
+ 39. │ 2019-09-23 │ 7049 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 40. │ 2019-09-30 │ 6880 │ ████████████████████████████████████████████████████████████████████▋        │
+ 41. │ 2019-10-07 │ 6518 │ █████████████████████████████████████████████████████████████████▏           │
+ 42. │ 2019-10-14 │ 6688 │ ██████████████████████████████████████████████████████████████████▊          │
+ 43. │ 2019-10-21 │ 6667 │ ██████████████████████████████████████████████████████████████████▋          │
+ 44. │ 2019-10-28 │ 6303 │ ███████████████████████████████████████████████████████████████              │
+ 45. │ 2019-11-04 │ 6298 │ ██████████████████████████████████████████████████████████████▊              │
+ 46. │ 2019-11-11 │ 6137 │ █████████████████████████████████████████████████████████████▎               │
+ 47. │ 2019-11-18 │ 6051 │ ████████████████████████████████████████████████████████████▌                │
+ 48. │ 2019-11-25 │ 5820 │ ██████████████████████████████████████████████████████████▏                  │
+ 49. │ 2019-12-02 │ 5942 │ ███████████████████████████████████████████████████████████▍                 │
+ 50. │ 2019-12-09 │ 4891 │ ████████████████████████████████████████████████▊                            │
+ 51. │ 2019-12-16 │ 5682 │ ████████████████████████████████████████████████████████▋                    │
+ 52. │ 2019-12-23 │ 6111 │ █████████████████████████████████████████████████████████████                │
+ 53. │ 2019-12-30 │ 5870 │ ██████████████████████████████████████████████████████████▋                  │
+ 54. │ 2020-01-06 │ 5953 │ ███████████████████████████████████████████████████████████▌                 │
+ 55. │ 2020-01-13 │ 5698 │ ████████████████████████████████████████████████████████▊                    │
+ 56. │ 2020-01-20 │ 5339 │ █████████████████████████████████████████████████████▍                       │
+ 57. │ 2020-01-27 │ 5566 │ ███████████████████████████████████████████████████████▋                     │
+ 58. │ 2020-02-03 │ 5801 │ ██████████████████████████████████████████████████████████                   │
+ 59. │ 2020-02-10 │ 5692 │ ████████████████████████████████████████████████████████▊                    │
+ 60. │ 2020-02-17 │ 5912 │ ███████████████████████████████████████████████████████████                  │
+ 61. │ 2020-02-24 │ 6031 │ ████████████████████████████████████████████████████████████▎                │
+ 62. │ 2020-03-02 │ 6105 │ █████████████████████████████████████████████████████████████                │
+ 63. │ 2020-03-09 │ 5823 │ ██████████████████████████████████████████████████████████▏                  │
+ 64. │ 2020-03-16 │ 4659 │ ██████████████████████████████████████████████▌                              │
+ 65. │ 2020-03-23 │ 3720 │ █████████████████████████████████████▏                                       │
+ 66. │ 2020-03-30 │ 1720 │ █████████████████▏                                                           │
+ 67. │ 2020-04-06 │  849 │ ████████▍                                                                    │
+ 68. │ 2020-04-13 │  710 │ ███████                                                                      │
+ 69. │ 2020-04-20 │  725 │ ███████▏                                                                     │
+ 70. │ 2020-04-27 │  920 │ █████████▏                                                                   │
+ 71. │ 2020-05-04 │  859 │ ████████▌                                                                    │
+ 72. │ 2020-05-11 │ 1047 │ ██████████▍                                                                  │
+ 73. │ 2020-05-18 │ 1135 │ ███████████▎                                                                 │
+ 74. │ 2020-05-25 │ 1266 │ ████████████▋                                                                │
+ 75. │ 2020-06-01 │ 1793 │ █████████████████▊                                                           │
+ 76. │ 2020-06-08 │ 1979 │ ███████████████████▋                                                         │
+ 77. │ 2020-06-15 │ 2297 │ ██████████████████████▊                                                      │
+ 78. │ 2020-06-22 │ 2788 │ ███████████████████████████▊                                                 │
+ 79. │ 2020-06-29 │ 3389 │ █████████████████████████████████▊                                           │
+ 80. │ 2020-07-06 │ 3545 │ ███████████████████████████████████▍                                         │
+ 81. │ 2020-07-13 │ 3569 │ ███████████████████████████████████▋                                         │
+ 82. │ 2020-07-20 │ 3784 │ █████████████████████████████████████▋                                       │
+ 83. │ 2020-07-27 │ 3960 │ ███████████████████████████████████████▌                                     │
+ 84. │ 2020-08-03 │ 4323 │ ███████████████████████████████████████████▏                                 │
+ 85. │ 2020-08-10 │ 4581 │ █████████████████████████████████████████████▋                               │
+ 86. │ 2020-08-17 │ 4791 │ ███████████████████████████████████████████████▊                             │
+ 87. │ 2020-08-24 │ 4928 │ █████████████████████████████████████████████████▎                           │
+ 88. │ 2020-08-31 │ 4687 │ ██████████████████████████████████████████████▋                              │
+ 89. │ 2020-09-07 │ 4643 │ ██████████████████████████████████████████████▍                              │
+ 90. │ 2020-09-14 │ 4594 │ █████████████████████████████████████████████▊                               │
+ 91. │ 2020-09-21 │ 4478 │ ████████████████████████████████████████████▋                                │
+ 92. │ 2020-09-28 │ 4382 │ ███████████████████████████████████████████▋                                 │
+ 93. │ 2020-10-05 │ 4261 │ ██████████████████████████████████████████▌                                  │
+ 94. │ 2020-10-12 │ 4243 │ ██████████████████████████████████████████▍                                  │
+ 95. │ 2020-10-19 │ 3941 │ ███████████████████████████████████████▍                                     │
+ 96. │ 2020-10-26 │ 3616 │ ████████████████████████████████████▏                                        │
+ 97. │ 2020-11-02 │ 3586 │ ███████████████████████████████████▋                                         │
+ 98. │ 2020-11-09 │ 3403 │ ██████████████████████████████████                                           │
+ 99. │ 2020-11-16 │ 3336 │ █████████████████████████████████▎                                           │
+100. │ 2020-11-23 │ 3230 │ ████████████████████████████████▎                                            │
+101. │ 2020-11-30 │ 3183 │ ███████████████████████████████▋                                             │
+102. │ 2020-12-07 │ 3285 │ ████████████████████████████████▋                                            │
+103. │ 2020-12-14 │ 3367 │ █████████████████████████████████▋                                           │
+104. │ 2020-12-21 │ 3748 │ █████████████████████████████████████▍                                       │
+105. │ 2020-12-28 │ 3986 │ ███████████████████████████████████████▋                                     │
+106. │ 2021-01-04 │ 3906 │ ███████████████████████████████████████                                      │
+107. │ 2021-01-11 │ 3425 │ ██████████████████████████████████▎                                          │
+108. │ 2021-01-18 │ 3144 │ ███████████████████████████████▍                                             │
+109. │ 2021-01-25 │ 3115 │ ███████████████████████████████▏                                             │
+110. │ 2021-02-01 │ 3285 │ ████████████████████████████████▋                                            │
+111. │ 2021-02-08 │ 3321 │ █████████████████████████████████▏                                           │
+112. │ 2021-02-15 │ 3475 │ ██████████████████████████████████▋                                          │
+113. │ 2021-02-22 │ 3549 │ ███████████████████████████████████▍                                         │
+114. │ 2021-03-01 │ 3755 │ █████████████████████████████████████▌                                       │
+115. │ 2021-03-08 │ 3080 │ ██████████████████████████████▋                                              │
+116. │ 2021-03-15 │ 3789 │ █████████████████████████████████████▊                                       │
+117. │ 2021-03-22 │ 3804 │ ██████████████████████████████████████                                       │
+118. │ 2021-03-29 │ 4238 │ ██████████████████████████████████████████▍                                  │
+119. │ 2021-04-05 │ 4307 │ ███████████████████████████████████████████                                  │
+120. │ 2021-04-12 │ 4225 │ ██████████████████████████████████████████▎                                  │
+121. │ 2021-04-19 │ 4391 │ ███████████████████████████████████████████▊                                 │
+122. │ 2021-04-26 │ 4868 │ ████████████████████████████████████████████████▋                            │
+123. │ 2021-05-03 │ 4977 │ █████████████████████████████████████████████████▋                           │
+124. │ 2021-05-10 │ 5164 │ ███████████████████████████████████████████████████▋                         │
+125. │ 2021-05-17 │ 4986 │ █████████████████████████████████████████████████▋                           │
+126. │ 2021-05-24 │ 5024 │ ██████████████████████████████████████████████████▏                          │
+127. │ 2021-05-31 │ 4824 │ ████████████████████████████████████████████████▏                            │
+128. │ 2021-06-07 │ 5652 │ ████████████████████████████████████████████████████████▌                    │
+129. │ 2021-06-14 │ 5613 │ ████████████████████████████████████████████████████████▏                    │
+130. │ 2021-06-21 │ 6061 │ ████████████████████████████████████████████████████████████▌                │
+131. │ 2021-06-28 │ 2554 │ █████████████████████████▌                                                   │
+     └────────────┴──────┴──────────────────────────────────────────────────────────────────────────────┘
+```
+
+### 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.
diff --git a/docs/en/getting-started/example-datasets/recipes.md b/docs/en/getting-started/example-datasets/recipes.md
index 22c068af358..70a56a0547f 100644
--- a/docs/en/getting-started/example-datasets/recipes.md
+++ b/docs/en/getting-started/example-datasets/recipes.md
@@ -335,6 +335,6 @@ Result:
 
 ### Online Playground
 
-The dataset is also available in the [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+The dataset is also available in the [Online Playground](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
 
-[Original article](https://clickhouse.tech/docs/en/getting-started/example-datasets/recipes/) <!--hide-->
+[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 8a019e7ded3..14fa7cef654 100644
--- a/docs/en/getting-started/example-datasets/star-schema.md
+++ b/docs/en/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/en/getting-started/example-datasets/uk-price-paid.md b/docs/en/getting-started/example-datasets/uk-price-paid.md
new file mode 100644
index 00000000000..4b0ba25907d
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1,649 @@
+---
+toc_priority: 20
+toc_title: UK Property Price Paid
+---
+
+# UK Property Price Paid {#uk-property-price-paid}
+
+The dataset contains data about prices paid for real-estate property in England and Wales. The data is available since year 1995.
+The size of the dataset in uncompressed form is about 4 GiB and it will take about 278 MiB in ClickHouse.
+
+Source: https://www.gov.uk/government/statistical-data-sets/price-paid-data-downloads
+Description of the fields: https://www.gov.uk/guidance/about-the-price-paid-data
+
+Contains HM Land Registry data © Crown copyright and database right 2021. This data is licensed under the Open Government Licence v3.0.
+
+## Download the Dataset {#download-dataset}
+
+Run the command:
+
+```bash
+wget http://prod.publicdata.landregistry.gov.uk.s3-website-eu-west-1.amazonaws.com/pp-complete.csv
+```
+
+Download will take about 2 minutes with good internet connection.
+
+## Create the Table {#create-table}
+
+```sql
+CREATE TABLE uk_price_paid
+(
+    price UInt32,
+    date Date,
+    postcode1 LowCardinality(String),
+    postcode2 LowCardinality(String),
+    type Enum8('terraced' = 1, 'semi-detached' = 2, 'detached' = 3, 'flat' = 4, 'other' = 0),
+    is_new UInt8,
+    duration Enum8('freehold' = 1, 'leasehold' = 2, 'unknown' = 0),
+    addr1 String,
+    addr2 String,
+    street LowCardinality(String),
+    locality LowCardinality(String),
+    town LowCardinality(String),
+    district LowCardinality(String),
+    county LowCardinality(String),
+    category UInt8
+) ENGINE = MergeTree ORDER BY (postcode1, postcode2, addr1, addr2);
+```
+
+## Preprocess and Import Data {#preprocess-import-data}
+
+We will use `clickhouse-local` tool for data preprocessing and `clickhouse-client` to upload it.
+
+In this example, we define the structure of source data from the CSV file and specify a query to preprocess the data with `clickhouse-local`.
+
+The preprocessing is:
+- splitting the postcode to two different columns `postcode1` and `postcode2` that is better for storage and queries;
+- coverting the `time` field to date as it only contains 00:00 time;
+- ignoring the [UUid](../../sql-reference/data-types/uuid.md) field because we don't need it for analysis;
+- transforming `type` and `duration` to more readable Enum fields with function [transform](../../sql-reference/functions/other-functions.md#transform);
+- transforming `is_new` and `category` fields from single-character string (`Y`/`N` and `A`/`B`) to [UInt8](../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-uint256-int8-int16-int32-int64-int128-int256) field with 0 and 1.
+
+Preprocessed data is piped directly to `clickhouse-client` to be inserted into ClickHouse table in streaming fashion.
+
+```bash
+clickhouse-local --input-format CSV --structure '
+    uuid String,
+    price UInt32,
+    time DateTime,
+    postcode String,
+    a String,
+    b String,
+    c String,
+    addr1 String,
+    addr2 String,
+    street String,
+    locality String,
+    town String,
+    district String,
+    county String,
+    d String,
+    e String
+' --query "
+    WITH splitByChar(' ', postcode) AS p
+    SELECT
+        price,
+        toDate(time) AS date,
+        p[1] AS postcode1,
+        p[2] AS postcode2,
+        transform(a, ['T', 'S', 'D', 'F', 'O'], ['terraced', 'semi-detached', 'detached', 'flat', 'other']) AS type,
+        b = 'Y' AS is_new,
+        transform(c, ['F', 'L', 'U'], ['freehold', 'leasehold', 'unknown']) AS duration,
+        addr1,
+        addr2,
+        street,
+        locality,
+        town,
+        district,
+        county,
+        d = 'B' AS category
+    FROM table" --date_time_input_format best_effort < pp-complete.csv | clickhouse-client --query "INSERT INTO uk_price_paid FORMAT TSV"
+```
+
+It will take about 40 seconds.
+
+## Validate the Data {#validate-data}
+
+Query:
+
+```sql
+SELECT count() FROM uk_price_paid;
+```
+
+Result:
+
+```text
+┌──count()─┐
+│ 26321785 │
+└──────────┘
+```
+
+The size of dataset in ClickHouse is just 278 MiB, check it.
+
+Query:
+
+```sql
+SELECT formatReadableSize(total_bytes) FROM system.tables WHERE name = 'uk_price_paid';
+```
+
+Result:
+
+```text
+┌─formatReadableSize(total_bytes)─┐
+│ 278.80 MiB                      │
+└─────────────────────────────────┘
+```
+
+## Run Some Queries {#run-queries}
+
+### Query 1. Average Price Per Year {#average-price}
+
+Query:
+
+```sql
+SELECT toYear(date) AS year, round(avg(price)) AS price, bar(price, 0, 1000000, 80) FROM uk_price_paid GROUP BY year ORDER BY year;
+```
+
+Result:
+
+```text
+┌─year─┬──price─┬─bar(round(avg(price)), 0, 1000000, 80)─┐
+│ 1995 │  67932 │ █████▍                                 │
+│ 1996 │  71505 │ █████▋                                 │
+│ 1997 │  78532 │ ██████▎                                │
+│ 1998 │  85436 │ ██████▋                                │
+│ 1999 │  96037 │ ███████▋                               │
+│ 2000 │ 107479 │ ████████▌                              │
+│ 2001 │ 118885 │ █████████▌                             │
+│ 2002 │ 137941 │ ███████████                            │
+│ 2003 │ 155889 │ ████████████▍                          │
+│ 2004 │ 178885 │ ██████████████▎                        │
+│ 2005 │ 189351 │ ███████████████▏                       │
+│ 2006 │ 203528 │ ████████████████▎                      │
+│ 2007 │ 219378 │ █████████████████▌                     │
+│ 2008 │ 217056 │ █████████████████▎                     │
+│ 2009 │ 213419 │ █████████████████                      │
+│ 2010 │ 236109 │ ██████████████████▊                    │
+│ 2011 │ 232805 │ ██████████████████▌                    │
+│ 2012 │ 238367 │ ███████████████████                    │
+│ 2013 │ 256931 │ ████████████████████▌                  │
+│ 2014 │ 279915 │ ██████████████████████▍                │
+│ 2015 │ 297266 │ ███████████████████████▋               │
+│ 2016 │ 313201 │ █████████████████████████              │
+│ 2017 │ 346097 │ ███████████████████████████▋           │
+│ 2018 │ 350116 │ ████████████████████████████           │
+│ 2019 │ 351013 │ ████████████████████████████           │
+│ 2020 │ 369420 │ █████████████████████████████▌         │
+│ 2021 │ 386903 │ ██████████████████████████████▊        │
+└──────┴────────┴────────────────────────────────────────┘
+```
+
+### Query 2. Average Price per Year in London {#average-price-london}
+
+Query:
+
+```sql
+SELECT toYear(date) AS year, round(avg(price)) AS price, bar(price, 0, 2000000, 100) FROM uk_price_paid WHERE town = 'LONDON' GROUP BY year ORDER BY year;
+```
+
+Result:
+
+```text
+┌─year─┬───price─┬─bar(round(avg(price)), 0, 2000000, 100)───────────────┐
+│ 1995 │  109116 │ █████▍                                                │
+│ 1996 │  118667 │ █████▊                                                │
+│ 1997 │  136518 │ ██████▋                                               │
+│ 1998 │  152983 │ ███████▋                                              │
+│ 1999 │  180637 │ █████████                                             │
+│ 2000 │  215838 │ ██████████▋                                           │
+│ 2001 │  232994 │ ███████████▋                                          │
+│ 2002 │  263670 │ █████████████▏                                        │
+│ 2003 │  278394 │ █████████████▊                                        │
+│ 2004 │  304666 │ ███████████████▏                                      │
+│ 2005 │  322875 │ ████████████████▏                                     │
+│ 2006 │  356191 │ █████████████████▋                                    │
+│ 2007 │  404054 │ ████████████████████▏                                 │
+│ 2008 │  420741 │ █████████████████████                                 │
+│ 2009 │  427753 │ █████████████████████▍                                │
+│ 2010 │  480306 │ ████████████████████████                              │
+│ 2011 │  496274 │ ████████████████████████▋                             │
+│ 2012 │  519442 │ █████████████████████████▊                            │
+│ 2013 │  616212 │ ██████████████████████████████▋                       │
+│ 2014 │  724154 │ ████████████████████████████████████▏                 │
+│ 2015 │  792129 │ ███████████████████████████████████████▌              │
+│ 2016 │  843655 │ ██████████████████████████████████████████▏           │
+│ 2017 │  982642 │ █████████████████████████████████████████████████▏    │
+│ 2018 │ 1016835 │ ██████████████████████████████████████████████████▋   │
+│ 2019 │ 1042849 │ ████████████████████████████████████████████████████▏ │
+│ 2020 │ 1011889 │ ██████████████████████████████████████████████████▌   │
+│ 2021 │  960343 │ ████████████████████████████████████████████████      │
+└──────┴─────────┴───────────────────────────────────────────────────────┘
+```
+
+Something happened in 2013. I don't have a clue. Maybe you have a clue what happened in 2020?
+
+### Query 3. The Most Expensive Neighborhoods {#most-expensive-neighborhoods}
+
+Query:
+
+```sql
+SELECT
+    town,
+    district,
+    count() AS c,
+    round(avg(price)) AS price,
+    bar(price, 0, 5000000, 100)
+FROM uk_price_paid
+WHERE date >= '2020-01-01'
+GROUP BY
+    town,
+    district
+HAVING c >= 100
+ORDER BY price DESC
+LIMIT 100;
+```
+
+Result:
+
+```text
+
+┌─town─────────────────┬─district───────────────┬────c─┬───price─┬─bar(round(avg(price)), 0, 5000000, 100)────────────────────────────┐
+│ LONDON               │ CITY OF WESTMINSTER    │ 3606 │ 3280239 │ █████████████████████████████████████████████████████████████████▌ │
+│ LONDON               │ CITY OF LONDON         │  274 │ 3160502 │ ███████████████████████████████████████████████████████████████▏   │
+│ LONDON               │ KENSINGTON AND CHELSEA │ 2550 │ 2308478 │ ██████████████████████████████████████████████▏                    │
+│ LEATHERHEAD          │ ELMBRIDGE              │  114 │ 1897407 │ █████████████████████████████████████▊                             │
+│ LONDON               │ CAMDEN                 │ 3033 │ 1805404 │ ████████████████████████████████████                               │
+│ VIRGINIA WATER       │ RUNNYMEDE              │  156 │ 1753247 │ ███████████████████████████████████                                │
+│ WINDLESHAM           │ SURREY HEATH           │  108 │ 1677613 │ █████████████████████████████████▌                                 │
+│ THORNTON HEATH       │ CROYDON                │  546 │ 1671721 │ █████████████████████████████████▍                                 │
+│ BARNET               │ ENFIELD                │  124 │ 1505840 │ ██████████████████████████████                                     │
+│ COBHAM               │ ELMBRIDGE              │  387 │ 1237250 │ ████████████████████████▋                                          │
+│ LONDON               │ ISLINGTON              │ 2668 │ 1236980 │ ████████████████████████▋                                          │
+│ OXFORD               │ SOUTH OXFORDSHIRE      │  321 │ 1220907 │ ████████████████████████▍                                          │
+│ LONDON               │ RICHMOND UPON THAMES   │  704 │ 1215551 │ ████████████████████████▎                                          │
+│ LONDON               │ HOUNSLOW               │  671 │ 1207493 │ ████████████████████████▏                                          │
+│ ASCOT                │ WINDSOR AND MAIDENHEAD │  407 │ 1183299 │ ███████████████████████▋                                           │
+│ BEACONSFIELD         │ BUCKINGHAMSHIRE        │  330 │ 1175615 │ ███████████████████████▌                                           │
+│ RICHMOND             │ RICHMOND UPON THAMES   │  874 │ 1110444 │ ██████████████████████▏                                            │
+│ LONDON               │ HAMMERSMITH AND FULHAM │ 3086 │ 1053983 │ █████████████████████                                              │
+│ SURBITON             │ ELMBRIDGE              │  100 │ 1011800 │ ████████████████████▏                                              │
+│ RADLETT              │ HERTSMERE              │  283 │ 1011712 │ ████████████████████▏                                              │
+│ SALCOMBE             │ SOUTH HAMS             │  127 │ 1011624 │ ████████████████████▏                                              │
+│ WEYBRIDGE            │ ELMBRIDGE              │  655 │ 1007265 │ ████████████████████▏                                              │
+│ ESHER                │ ELMBRIDGE              │  485 │  986581 │ ███████████████████▋                                               │
+│ LEATHERHEAD          │ GUILDFORD              │  202 │  977320 │ ███████████████████▌                                               │
+│ BURFORD              │ WEST OXFORDSHIRE       │  111 │  966893 │ ███████████████████▎                                               │
+│ BROCKENHURST         │ NEW FOREST             │  129 │  956675 │ ███████████████████▏                                               │
+│ HINDHEAD             │ WAVERLEY               │  137 │  953753 │ ███████████████████                                                │
+│ GERRARDS CROSS       │ BUCKINGHAMSHIRE        │  419 │  951121 │ ███████████████████                                                │
+│ EAST MOLESEY         │ ELMBRIDGE              │  192 │  936769 │ ██████████████████▋                                                │
+│ CHALFONT ST GILES    │ BUCKINGHAMSHIRE        │  146 │  925515 │ ██████████████████▌                                                │
+│ LONDON               │ TOWER HAMLETS          │ 4388 │  918304 │ ██████████████████▎                                                │
+│ OLNEY                │ MILTON KEYNES          │  235 │  910646 │ ██████████████████▏                                                │
+│ HENLEY-ON-THAMES     │ SOUTH OXFORDSHIRE      │  540 │  902418 │ ██████████████████                                                 │
+│ LONDON               │ SOUTHWARK              │ 3885 │  892997 │ █████████████████▋                                                 │
+│ KINGSTON UPON THAMES │ KINGSTON UPON THAMES   │  960 │  885969 │ █████████████████▋                                                 │
+│ LONDON               │ EALING                 │ 2658 │  871755 │ █████████████████▍                                                 │
+│ CRANBROOK            │ TUNBRIDGE WELLS        │  431 │  862348 │ █████████████████▏                                                 │
+│ LONDON               │ MERTON                 │ 2099 │  859118 │ █████████████████▏                                                 │
+│ BELVEDERE            │ BEXLEY                 │  346 │  842423 │ ████████████████▋                                                  │
+│ GUILDFORD            │ WAVERLEY               │  143 │  841277 │ ████████████████▋                                                  │
+│ HARPENDEN            │ ST ALBANS              │  657 │  841216 │ ████████████████▋                                                  │
+│ LONDON               │ HACKNEY                │ 3307 │  837090 │ ████████████████▋                                                  │
+│ LONDON               │ WANDSWORTH             │ 6566 │  832663 │ ████████████████▋                                                  │
+│ MAIDENHEAD           │ BUCKINGHAMSHIRE        │  123 │  824299 │ ████████████████▍                                                  │
+│ KINGS LANGLEY        │ DACORUM                │  145 │  821331 │ ████████████████▍                                                  │
+│ BERKHAMSTED          │ DACORUM                │  543 │  818415 │ ████████████████▎                                                  │
+│ GREAT MISSENDEN      │ BUCKINGHAMSHIRE        │  226 │  802807 │ ████████████████                                                   │
+│ BILLINGSHURST        │ CHICHESTER             │  144 │  797829 │ ███████████████▊                                                   │
+│ WOKING               │ GUILDFORD              │  176 │  793494 │ ███████████████▋                                                   │
+│ STOCKBRIDGE          │ TEST VALLEY            │  178 │  793269 │ ███████████████▋                                                   │
+│ EPSOM                │ REIGATE AND BANSTEAD   │  172 │  791862 │ ███████████████▋                                                   │
+│ TONBRIDGE            │ TUNBRIDGE WELLS        │  360 │  787876 │ ███████████████▋                                                   │
+│ TEDDINGTON           │ RICHMOND UPON THAMES   │  595 │  786492 │ ███████████████▋                                                   │
+│ TWICKENHAM           │ RICHMOND UPON THAMES   │ 1155 │  786193 │ ███████████████▋                                                   │
+│ LYNDHURST            │ NEW FOREST             │  102 │  785593 │ ███████████████▋                                                   │
+│ LONDON               │ LAMBETH                │ 5228 │  774574 │ ███████████████▍                                                   │
+│ LONDON               │ BARNET                 │ 3955 │  773259 │ ███████████████▍                                                   │
+│ OXFORD               │ VALE OF WHITE HORSE    │  353 │  772088 │ ███████████████▍                                                   │
+│ TONBRIDGE            │ MAIDSTONE              │  305 │  770740 │ ███████████████▍                                                   │
+│ LUTTERWORTH          │ HARBOROUGH             │  538 │  768634 │ ███████████████▎                                                   │
+│ WOODSTOCK            │ WEST OXFORDSHIRE       │  140 │  766037 │ ███████████████▎                                                   │
+│ MIDHURST             │ CHICHESTER             │  257 │  764815 │ ███████████████▎                                                   │
+│ MARLOW               │ BUCKINGHAMSHIRE        │  327 │  761876 │ ███████████████▏                                                   │
+│ LONDON               │ NEWHAM                 │ 3237 │  761784 │ ███████████████▏                                                   │
+│ ALDERLEY EDGE        │ CHESHIRE EAST          │  178 │  757318 │ ███████████████▏                                                   │
+│ LUTON                │ CENTRAL BEDFORDSHIRE   │  212 │  754283 │ ███████████████                                                    │
+│ PETWORTH             │ CHICHESTER             │  154 │  754220 │ ███████████████                                                    │
+│ ALRESFORD            │ WINCHESTER             │  219 │  752718 │ ███████████████                                                    │
+│ POTTERS BAR          │ WELWYN HATFIELD        │  174 │  748465 │ ██████████████▊                                                    │
+│ HASLEMERE            │ CHICHESTER             │  128 │  746907 │ ██████████████▊                                                    │
+│ TADWORTH             │ REIGATE AND BANSTEAD   │  502 │  743252 │ ██████████████▋                                                    │
+│ THAMES DITTON        │ ELMBRIDGE              │  244 │  741913 │ ██████████████▋                                                    │
+│ REIGATE              │ REIGATE AND BANSTEAD   │  581 │  738198 │ ██████████████▋                                                    │
+│ BOURNE END           │ BUCKINGHAMSHIRE        │  138 │  735190 │ ██████████████▋                                                    │
+│ SEVENOAKS            │ SEVENOAKS              │ 1156 │  730018 │ ██████████████▌                                                    │
+│ OXTED                │ TANDRIDGE              │  336 │  729123 │ ██████████████▌                                                    │
+│ INGATESTONE          │ BRENTWOOD              │  166 │  728103 │ ██████████████▌                                                    │
+│ LONDON               │ BRENT                  │ 2079 │  720605 │ ██████████████▍                                                    │
+│ LONDON               │ HARINGEY               │ 3216 │  717780 │ ██████████████▎                                                    │
+│ PURLEY               │ CROYDON                │  575 │  716108 │ ██████████████▎                                                    │
+│ WELWYN               │ WELWYN HATFIELD        │  222 │  710603 │ ██████████████▏                                                    │
+│ RICKMANSWORTH        │ THREE RIVERS           │  798 │  704571 │ ██████████████                                                     │
+│ BANSTEAD             │ REIGATE AND BANSTEAD   │  401 │  701293 │ ██████████████                                                     │
+│ CHIGWELL             │ EPPING FOREST          │  261 │  701203 │ ██████████████                                                     │
+│ PINNER               │ HARROW                 │  528 │  698885 │ █████████████▊                                                     │
+│ HASLEMERE            │ WAVERLEY               │  280 │  696659 │ █████████████▊                                                     │
+│ SLOUGH               │ BUCKINGHAMSHIRE        │  396 │  694917 │ █████████████▊                                                     │
+│ WALTON-ON-THAMES     │ ELMBRIDGE              │  946 │  692395 │ █████████████▋                                                     │
+│ READING              │ SOUTH OXFORDSHIRE      │  318 │  691988 │ █████████████▋                                                     │
+│ NORTHWOOD            │ HILLINGDON             │  271 │  690643 │ █████████████▋                                                     │
+│ FELTHAM              │ HOUNSLOW               │  763 │  688595 │ █████████████▋                                                     │
+│ ASHTEAD              │ MOLE VALLEY            │  303 │  687923 │ █████████████▋                                                     │
+│ BARNET               │ BARNET                 │  975 │  686980 │ █████████████▋                                                     │
+│ WOKING               │ SURREY HEATH           │  283 │  686669 │ █████████████▋                                                     │
+│ MALMESBURY           │ WILTSHIRE              │  323 │  683324 │ █████████████▋                                                     │
+│ AMERSHAM             │ BUCKINGHAMSHIRE        │  496 │  680962 │ █████████████▌                                                     │
+│ CHISLEHURST          │ BROMLEY                │  430 │  680209 │ █████████████▌                                                     │
+│ HYTHE                │ FOLKESTONE AND HYTHE   │  490 │  676908 │ █████████████▌                                                     │
+│ MAYFIELD             │ WEALDEN                │  101 │  676210 │ █████████████▌                                                     │
+│ ASCOT                │ BRACKNELL FOREST       │  168 │  676004 │ █████████████▌                                                     │
+└──────────────────────┴────────────────────────┴──────┴─────────┴────────────────────────────────────────────────────────────────────┘
+```
+
+## Let's Speed Up Queries Using Projections {#speedup-with-projections}
+
+[Projections](../../sql-reference/statements/alter/projection.md) allow to improve queries speed by storing pre-aggregated data.
+
+### Build a Projection {#build-projection}
+
+Create an aggregate projection by dimensions `toYear(date)`, `district`, `town`:
+
+```sql
+ALTER TABLE uk_price_paid
+    ADD PROJECTION projection_by_year_district_town
+    (
+        SELECT
+            toYear(date),
+            district,
+            town,
+            avg(price),
+            sum(price),
+            count()
+        GROUP BY
+            toYear(date),
+            district,
+            town
+    );
+```
+
+Populate the projection for existing data (without it projection will be created for only newly inserted data):
+
+```sql
+ALTER TABLE uk_price_paid
+    MATERIALIZE PROJECTION projection_by_year_district_town
+SETTINGS mutations_sync = 1;
+```
+
+## Test Performance {#test-performance}
+
+Let's run the same 3 queries.
+
+[Enable](../../operations/settings/settings.md#allow-experimental-projection-optimization) projections for selects:
+
+```sql
+SET allow_experimental_projection_optimization = 1;
+```
+
+### Query 1. Average Price Per Year {#average-price-projections}
+
+Query:
+
+```sql
+SELECT
+    toYear(date) AS year,
+    round(avg(price)) AS price,
+    bar(price, 0, 1000000, 80)
+FROM uk_price_paid
+GROUP BY year
+ORDER BY year ASC;
+```
+
+Result:
+
+```text
+┌─year─┬──price─┬─bar(round(avg(price)), 0, 1000000, 80)─┐
+│ 1995 │  67932 │ █████▍                                 │
+│ 1996 │  71505 │ █████▋                                 │
+│ 1997 │  78532 │ ██████▎                                │
+│ 1998 │  85436 │ ██████▋                                │
+│ 1999 │  96037 │ ███████▋                               │
+│ 2000 │ 107479 │ ████████▌                              │
+│ 2001 │ 118885 │ █████████▌                             │
+│ 2002 │ 137941 │ ███████████                            │
+│ 2003 │ 155889 │ ████████████▍                          │
+│ 2004 │ 178885 │ ██████████████▎                        │
+│ 2005 │ 189351 │ ███████████████▏                       │
+│ 2006 │ 203528 │ ████████████████▎                      │
+│ 2007 │ 219378 │ █████████████████▌                     │
+│ 2008 │ 217056 │ █████████████████▎                     │
+│ 2009 │ 213419 │ █████████████████                      │
+│ 2010 │ 236109 │ ██████████████████▊                    │
+│ 2011 │ 232805 │ ██████████████████▌                    │
+│ 2012 │ 238367 │ ███████████████████                    │
+│ 2013 │ 256931 │ ████████████████████▌                  │
+│ 2014 │ 279915 │ ██████████████████████▍                │
+│ 2015 │ 297266 │ ███████████████████████▋               │
+│ 2016 │ 313201 │ █████████████████████████              │
+│ 2017 │ 346097 │ ███████████████████████████▋           │
+│ 2018 │ 350116 │ ████████████████████████████           │
+│ 2019 │ 351013 │ ████████████████████████████           │
+│ 2020 │ 369420 │ █████████████████████████████▌         │
+│ 2021 │ 386903 │ ██████████████████████████████▊        │
+└──────┴────────┴────────────────────────────────────────┘
+```
+
+### Query 2. Average Price Per Year in London {#average-price-london-projections}
+
+Query:
+
+```sql
+SELECT
+    toYear(date) AS year,
+    round(avg(price)) AS price,
+    bar(price, 0, 2000000, 100)
+FROM uk_price_paid
+WHERE town = 'LONDON'
+GROUP BY year
+ORDER BY year ASC;
+```
+
+Result:
+
+```text
+┌─year─┬───price─┬─bar(round(avg(price)), 0, 2000000, 100)───────────────┐
+│ 1995 │  109116 │ █████▍                                                │
+│ 1996 │  118667 │ █████▊                                                │
+│ 1997 │  136518 │ ██████▋                                               │
+│ 1998 │  152983 │ ███████▋                                              │
+│ 1999 │  180637 │ █████████                                             │
+│ 2000 │  215838 │ ██████████▋                                           │
+│ 2001 │  232994 │ ███████████▋                                          │
+│ 2002 │  263670 │ █████████████▏                                        │
+│ 2003 │  278394 │ █████████████▊                                        │
+│ 2004 │  304666 │ ███████████████▏                                      │
+│ 2005 │  322875 │ ████████████████▏                                     │
+│ 2006 │  356191 │ █████████████████▋                                    │
+│ 2007 │  404054 │ ████████████████████▏                                 │
+│ 2008 │  420741 │ █████████████████████                                 │
+│ 2009 │  427753 │ █████████████████████▍                                │
+│ 2010 │  480306 │ ████████████████████████                              │
+│ 2011 │  496274 │ ████████████████████████▋                             │
+│ 2012 │  519442 │ █████████████████████████▊                            │
+│ 2013 │  616212 │ ██████████████████████████████▋                       │
+│ 2014 │  724154 │ ████████████████████████████████████▏                 │
+│ 2015 │  792129 │ ███████████████████████████████████████▌              │
+│ 2016 │  843655 │ ██████████████████████████████████████████▏           │
+│ 2017 │  982642 │ █████████████████████████████████████████████████▏    │
+│ 2018 │ 1016835 │ ██████████████████████████████████████████████████▋   │
+│ 2019 │ 1042849 │ ████████████████████████████████████████████████████▏ │
+│ 2020 │ 1011889 │ ██████████████████████████████████████████████████▌   │
+│ 2021 │  960343 │ ████████████████████████████████████████████████      │
+└──────┴─────────┴───────────────────────────────────────────────────────┘
+```
+
+### Query 3. The Most Expensive Neighborhoods {#most-expensive-neighborhoods-projections}
+
+The condition (date >= '2020-01-01') needs to be modified to match projection dimension (toYear(date) >= 2020).
+
+Query:
+
+```sql
+SELECT
+    town,
+    district,
+    count() AS c,
+    round(avg(price)) AS price,
+    bar(price, 0, 5000000, 100)
+FROM uk_price_paid
+WHERE toYear(date) >= 2020
+GROUP BY
+    town,
+    district
+HAVING c >= 100
+ORDER BY price DESC
+LIMIT 100;
+```
+
+Result:
+
+```text
+┌─town─────────────────┬─district───────────────┬────c─┬───price─┬─bar(round(avg(price)), 0, 5000000, 100)────────────────────────────┐
+│ LONDON               │ CITY OF WESTMINSTER    │ 3606 │ 3280239 │ █████████████████████████████████████████████████████████████████▌ │
+│ LONDON               │ CITY OF LONDON         │  274 │ 3160502 │ ███████████████████████████████████████████████████████████████▏   │
+│ LONDON               │ KENSINGTON AND CHELSEA │ 2550 │ 2308478 │ ██████████████████████████████████████████████▏                    │
+│ LEATHERHEAD          │ ELMBRIDGE              │  114 │ 1897407 │ █████████████████████████████████████▊                             │
+│ LONDON               │ CAMDEN                 │ 3033 │ 1805404 │ ████████████████████████████████████                               │
+│ VIRGINIA WATER       │ RUNNYMEDE              │  156 │ 1753247 │ ███████████████████████████████████                                │
+│ WINDLESHAM           │ SURREY HEATH           │  108 │ 1677613 │ █████████████████████████████████▌                                 │
+│ THORNTON HEATH       │ CROYDON                │  546 │ 1671721 │ █████████████████████████████████▍                                 │
+│ BARNET               │ ENFIELD                │  124 │ 1505840 │ ██████████████████████████████                                     │
+│ COBHAM               │ ELMBRIDGE              │  387 │ 1237250 │ ████████████████████████▋                                          │
+│ LONDON               │ ISLINGTON              │ 2668 │ 1236980 │ ████████████████████████▋                                          │
+│ OXFORD               │ SOUTH OXFORDSHIRE      │  321 │ 1220907 │ ████████████████████████▍                                          │
+│ LONDON               │ RICHMOND UPON THAMES   │  704 │ 1215551 │ ████████████████████████▎                                          │
+│ LONDON               │ HOUNSLOW               │  671 │ 1207493 │ ████████████████████████▏                                          │
+│ ASCOT                │ WINDSOR AND MAIDENHEAD │  407 │ 1183299 │ ███████████████████████▋                                           │
+│ BEACONSFIELD         │ BUCKINGHAMSHIRE        │  330 │ 1175615 │ ███████████████████████▌                                           │
+│ RICHMOND             │ RICHMOND UPON THAMES   │  874 │ 1110444 │ ██████████████████████▏                                            │
+│ LONDON               │ HAMMERSMITH AND FULHAM │ 3086 │ 1053983 │ █████████████████████                                              │
+│ SURBITON             │ ELMBRIDGE              │  100 │ 1011800 │ ████████████████████▏                                              │
+│ RADLETT              │ HERTSMERE              │  283 │ 1011712 │ ████████████████████▏                                              │
+│ SALCOMBE             │ SOUTH HAMS             │  127 │ 1011624 │ ████████████████████▏                                              │
+│ WEYBRIDGE            │ ELMBRIDGE              │  655 │ 1007265 │ ████████████████████▏                                              │
+│ ESHER                │ ELMBRIDGE              │  485 │  986581 │ ███████████████████▋                                               │
+│ LEATHERHEAD          │ GUILDFORD              │  202 │  977320 │ ███████████████████▌                                               │
+│ BURFORD              │ WEST OXFORDSHIRE       │  111 │  966893 │ ███████████████████▎                                               │
+│ BROCKENHURST         │ NEW FOREST             │  129 │  956675 │ ███████████████████▏                                               │
+│ HINDHEAD             │ WAVERLEY               │  137 │  953753 │ ███████████████████                                                │
+│ GERRARDS CROSS       │ BUCKINGHAMSHIRE        │  419 │  951121 │ ███████████████████                                                │
+│ EAST MOLESEY         │ ELMBRIDGE              │  192 │  936769 │ ██████████████████▋                                                │
+│ CHALFONT ST GILES    │ BUCKINGHAMSHIRE        │  146 │  925515 │ ██████████████████▌                                                │
+│ LONDON               │ TOWER HAMLETS          │ 4388 │  918304 │ ██████████████████▎                                                │
+│ OLNEY                │ MILTON KEYNES          │  235 │  910646 │ ██████████████████▏                                                │
+│ HENLEY-ON-THAMES     │ SOUTH OXFORDSHIRE      │  540 │  902418 │ ██████████████████                                                 │
+│ LONDON               │ SOUTHWARK              │ 3885 │  892997 │ █████████████████▋                                                 │
+│ KINGSTON UPON THAMES │ KINGSTON UPON THAMES   │  960 │  885969 │ █████████████████▋                                                 │
+│ LONDON               │ EALING                 │ 2658 │  871755 │ █████████████████▍                                                 │
+│ CRANBROOK            │ TUNBRIDGE WELLS        │  431 │  862348 │ █████████████████▏                                                 │
+│ LONDON               │ MERTON                 │ 2099 │  859118 │ █████████████████▏                                                 │
+│ BELVEDERE            │ BEXLEY                 │  346 │  842423 │ ████████████████▋                                                  │
+│ GUILDFORD            │ WAVERLEY               │  143 │  841277 │ ████████████████▋                                                  │
+│ HARPENDEN            │ ST ALBANS              │  657 │  841216 │ ████████████████▋                                                  │
+│ LONDON               │ HACKNEY                │ 3307 │  837090 │ ████████████████▋                                                  │
+│ LONDON               │ WANDSWORTH             │ 6566 │  832663 │ ████████████████▋                                                  │
+│ MAIDENHEAD           │ BUCKINGHAMSHIRE        │  123 │  824299 │ ████████████████▍                                                  │
+│ KINGS LANGLEY        │ DACORUM                │  145 │  821331 │ ████████████████▍                                                  │
+│ BERKHAMSTED          │ DACORUM                │  543 │  818415 │ ████████████████▎                                                  │
+│ GREAT MISSENDEN      │ BUCKINGHAMSHIRE        │  226 │  802807 │ ████████████████                                                   │
+│ BILLINGSHURST        │ CHICHESTER             │  144 │  797829 │ ███████████████▊                                                   │
+│ WOKING               │ GUILDFORD              │  176 │  793494 │ ███████████████▋                                                   │
+│ STOCKBRIDGE          │ TEST VALLEY            │  178 │  793269 │ ███████████████▋                                                   │
+│ EPSOM                │ REIGATE AND BANSTEAD   │  172 │  791862 │ ███████████████▋                                                   │
+│ TONBRIDGE            │ TUNBRIDGE WELLS        │  360 │  787876 │ ███████████████▋                                                   │
+│ TEDDINGTON           │ RICHMOND UPON THAMES   │  595 │  786492 │ ███████████████▋                                                   │
+│ TWICKENHAM           │ RICHMOND UPON THAMES   │ 1155 │  786193 │ ███████████████▋                                                   │
+│ LYNDHURST            │ NEW FOREST             │  102 │  785593 │ ███████████████▋                                                   │
+│ LONDON               │ LAMBETH                │ 5228 │  774574 │ ███████████████▍                                                   │
+│ LONDON               │ BARNET                 │ 3955 │  773259 │ ███████████████▍                                                   │
+│ OXFORD               │ VALE OF WHITE HORSE    │  353 │  772088 │ ███████████████▍                                                   │
+│ TONBRIDGE            │ MAIDSTONE              │  305 │  770740 │ ███████████████▍                                                   │
+│ LUTTERWORTH          │ HARBOROUGH             │  538 │  768634 │ ███████████████▎                                                   │
+│ WOODSTOCK            │ WEST OXFORDSHIRE       │  140 │  766037 │ ███████████████▎                                                   │
+│ MIDHURST             │ CHICHESTER             │  257 │  764815 │ ███████████████▎                                                   │
+│ MARLOW               │ BUCKINGHAMSHIRE        │  327 │  761876 │ ███████████████▏                                                   │
+│ LONDON               │ NEWHAM                 │ 3237 │  761784 │ ███████████████▏                                                   │
+│ ALDERLEY EDGE        │ CHESHIRE EAST          │  178 │  757318 │ ███████████████▏                                                   │
+│ LUTON                │ CENTRAL BEDFORDSHIRE   │  212 │  754283 │ ███████████████                                                    │
+│ PETWORTH             │ CHICHESTER             │  154 │  754220 │ ███████████████                                                    │
+│ ALRESFORD            │ WINCHESTER             │  219 │  752718 │ ███████████████                                                    │
+│ POTTERS BAR          │ WELWYN HATFIELD        │  174 │  748465 │ ██████████████▊                                                    │
+│ HASLEMERE            │ CHICHESTER             │  128 │  746907 │ ██████████████▊                                                    │
+│ TADWORTH             │ REIGATE AND BANSTEAD   │  502 │  743252 │ ██████████████▋                                                    │
+│ THAMES DITTON        │ ELMBRIDGE              │  244 │  741913 │ ██████████████▋                                                    │
+│ REIGATE              │ REIGATE AND BANSTEAD   │  581 │  738198 │ ██████████████▋                                                    │
+│ BOURNE END           │ BUCKINGHAMSHIRE        │  138 │  735190 │ ██████████████▋                                                    │
+│ SEVENOAKS            │ SEVENOAKS              │ 1156 │  730018 │ ██████████████▌                                                    │
+│ OXTED                │ TANDRIDGE              │  336 │  729123 │ ██████████████▌                                                    │
+│ INGATESTONE          │ BRENTWOOD              │  166 │  728103 │ ██████████████▌                                                    │
+│ LONDON               │ BRENT                  │ 2079 │  720605 │ ██████████████▍                                                    │
+│ LONDON               │ HARINGEY               │ 3216 │  717780 │ ██████████████▎                                                    │
+│ PURLEY               │ CROYDON                │  575 │  716108 │ ██████████████▎                                                    │
+│ WELWYN               │ WELWYN HATFIELD        │  222 │  710603 │ ██████████████▏                                                    │
+│ RICKMANSWORTH        │ THREE RIVERS           │  798 │  704571 │ ██████████████                                                     │
+│ BANSTEAD             │ REIGATE AND BANSTEAD   │  401 │  701293 │ ██████████████                                                     │
+│ CHIGWELL             │ EPPING FOREST          │  261 │  701203 │ ██████████████                                                     │
+│ PINNER               │ HARROW                 │  528 │  698885 │ █████████████▊                                                     │
+│ HASLEMERE            │ WAVERLEY               │  280 │  696659 │ █████████████▊                                                     │
+│ SLOUGH               │ BUCKINGHAMSHIRE        │  396 │  694917 │ █████████████▊                                                     │
+│ WALTON-ON-THAMES     │ ELMBRIDGE              │  946 │  692395 │ █████████████▋                                                     │
+│ READING              │ SOUTH OXFORDSHIRE      │  318 │  691988 │ █████████████▋                                                     │
+│ NORTHWOOD            │ HILLINGDON             │  271 │  690643 │ █████████████▋                                                     │
+│ FELTHAM              │ HOUNSLOW               │  763 │  688595 │ █████████████▋                                                     │
+│ ASHTEAD              │ MOLE VALLEY            │  303 │  687923 │ █████████████▋                                                     │
+│ BARNET               │ BARNET                 │  975 │  686980 │ █████████████▋                                                     │
+│ WOKING               │ SURREY HEATH           │  283 │  686669 │ █████████████▋                                                     │
+│ MALMESBURY           │ WILTSHIRE              │  323 │  683324 │ █████████████▋                                                     │
+│ AMERSHAM             │ BUCKINGHAMSHIRE        │  496 │  680962 │ █████████████▌                                                     │
+│ CHISLEHURST          │ BROMLEY                │  430 │  680209 │ █████████████▌                                                     │
+│ HYTHE                │ FOLKESTONE AND HYTHE   │  490 │  676908 │ █████████████▌                                                     │
+│ MAYFIELD             │ WEALDEN                │  101 │  676210 │ █████████████▌                                                     │
+│ ASCOT                │ BRACKNELL FOREST       │  168 │  676004 │ █████████████▌                                                     │
+└──────────────────────┴────────────────────────┴──────┴─────────┴────────────────────────────────────────────────────────────────────┘
+```
+
+### Summary {#summary}
+
+All 3 queries work much faster and read fewer rows.
+
+```text
+Query 1
+
+no projection: 27 rows in set. Elapsed: 0.158 sec. Processed 26.32 million rows, 157.93 MB (166.57 million rows/s., 999.39 MB/s.)
+   projection: 27 rows in set. Elapsed: 0.007 sec. Processed 105.96 thousand rows, 3.33 MB (14.58 million rows/s., 458.13 MB/s.)
+
+
+Query 2
+
+no projection: 27 rows in set. Elapsed: 0.163 sec. Processed 26.32 million rows, 80.01 MB (161.75 million rows/s., 491.64 MB/s.)
+   projection: 27 rows in set. Elapsed: 0.008 sec. Processed 105.96 thousand rows, 3.67 MB (13.29 million rows/s., 459.89 MB/s.)
+
+Query 3
+
+no projection: 100 rows in set. Elapsed: 0.069 sec. Processed 26.32 million rows, 62.47 MB (382.13 million rows/s., 906.93 MB/s.)
+   projection: 100 rows in set. Elapsed: 0.029 sec. Processed 8.08 thousand rows, 511.08 KB (276.06 thousand rows/s., 17.47 MB/s.)
+```
+
+### Test It in Playground {#playground}
+
+The dataset is also available in the [Online Playground](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIHRvd24sIGRpc3RyaWN0LCBjb3VudCgpIEFTIGMsIHJvdW5kKGF2ZyhwcmljZSkpIEFTIHByaWNlLCBiYXIocHJpY2UsIDAsIDUwMDAwMDAsIDEwMCkgRlJPTSB1a19wcmljZV9wYWlkIFdIRVJFIGRhdGUgPj0gJzIwMjAtMDEtMDEnIEdST1VQIEJZIHRvd24sIGRpc3RyaWN0IEhBVklORyBjID49IDEwMCBPUkRFUiBCWSBwcmljZSBERVNDIExJTUlUIDEwMA==).
diff --git a/docs/en/getting-started/example-datasets/wikistat.md b/docs/en/getting-started/example-datasets/wikistat.md
index 619711582f4..3e3f7b164ce 100644
--- a/docs/en/getting-started/example-datasets/wikistat.md
+++ b/docs/en/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,4 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/en/getting-started/index.md b/docs/en/getting-started/index.md
index 066809aac89..372e8d7bd64 100644
--- a/docs/en/getting-started/index.md
+++ b/docs/en/getting-started/index.md
@@ -12,4 +12,4 @@ If you are new to ClickHouse and want to get a hands-on feeling of its performan
 -   [Go through detailed tutorial](../getting-started/tutorial.md)
 -   [Experiment with example datasets](../getting-started/example-datasets/ontime.md)
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/) <!--hide-->
diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index 517be8704e4..4a97ab6589d 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -27,9 +27,9 @@ It is recommended to use official pre-compiled `deb` packages for Debian or Ubun
 {% include 'install/deb.sh' %}
 ```
 
-If you want to use the most recent version, replace `stable` with `testing` (this is recommended for your testing environments).
+You can replace `stable` with `lts` or `testing` to use different [release trains](../faq/operations/production.md) based on your needs.
 
-You can also download and install packages manually from [here](https://repo.clickhouse.tech/deb/stable/main/).
+You can also download and install packages manually from [here](https://repo.clickhouse.com/deb/stable/main/).
 
 #### Packages {#packages}
 
@@ -38,6 +38,10 @@ You can also download and install packages manually from [here](https://repo.cli
 -   `clickhouse-client` — Creates a symbolic link for `clickhouse-client` and other client-related tools. and installs client configuration files.
 -   `clickhouse-common-static-dbg` — Installs ClickHouse compiled binary files with debug info.
 
+!!! attention "Attention"
+    If you need to install specific version of ClickHouse you have to install all packages with the same version:
+    `sudo apt-get install clickhouse-server=21.8.5.7 clickhouse-client=21.8.5.7 clickhouse-common-static=21.8.5.7`
+
 ### From RPM Packages {#from-rpm-packages}
 
 It is recommended to use official pre-compiled `rpm` packages for CentOS, RedHat, and all other rpm-based Linux distributions.
@@ -46,8 +50,8 @@ First, you need to add the official repository:
 
 ``` bash
 sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
+sudo rpm --import https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG
+sudo yum-config-manager --add-repo https://repo.clickhouse.com/rpm/stable/x86_64
 ```
 
 If you want to use the most recent version, replace `stable` with `testing` (this is recommended for your testing environments). `prestable` is sometimes also available.
@@ -58,21 +62,21 @@ Then run these commands to install packages:
 sudo yum install clickhouse-server clickhouse-client
 ```
 
-You can also download and install packages manually from [here](https://repo.clickhouse.tech/rpm/stable/x86_64).
+You can also download and install packages manually from [here](https://repo.clickhouse.com/rpm/stable/x86_64).
 
 ### From Tgz Archives {#from-tgz-archives}
 
 It is recommended to use official pre-compiled `tgz` archives for all Linux distributions, where installation of `deb` or `rpm` packages is not possible.
 
-The required version can be downloaded with `curl` or `wget` from repository https://repo.clickhouse.tech/tgz/.
+The required version can be downloaded with `curl` or `wget` from repository https://repo.clickhouse.com/tgz/.
 After that downloaded archives should be unpacked and installed with installation scripts. Example for the latest version:
 
 ``` bash
 export LATEST_VERSION=`curl https://api.github.com/repos/ClickHouse/ClickHouse/tags 2>/dev/null | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1`
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-client-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-server-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-client-$LATEST_VERSION.tgz
 
 tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
 sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
@@ -92,14 +96,14 @@ For production environments, it’s recommended to use the latest `stable`-versi
 
 ### From Docker Image {#from-docker-image}
 
-To run ClickHouse inside Docker follow the guide on [Docker Hub](https://hub.docker.com/r/yandex/clickhouse-server/). Those images use official `deb` packages inside.
+To run ClickHouse inside Docker follow the guide on [Docker Hub](https://hub.docker.com/r/clickhouse/clickhouse-server/). Those images use official `deb` packages inside.
 
 ### Single Binary {#from-single-binary}
 
-You can install ClickHouse on Linux using a single portable binary from the latest commit of the `master` branch: [https://builds.clickhouse.tech/master/amd64/clickhouse].
+You can install ClickHouse on Linux using a single portable binary from the latest commit of the `master` branch: [https://builds.clickhouse.com/master/amd64/clickhouse].
 
 ``` bash
-curl -O 'https://builds.clickhouse.tech/master/amd64/clickhouse' && chmod a+x clickhouse
+curl -O 'https://builds.clickhouse.com/master/amd64/clickhouse' && chmod a+x clickhouse
 sudo ./clickhouse install
 ```
 
@@ -107,10 +111,10 @@ sudo ./clickhouse install
 
 For non-Linux operating systems and for AArch64 CPU arhitecture, ClickHouse builds are provided as a cross-compiled binary from the latest commit of the `master` branch (with a few hours delay).
 
--   [MacOS x86_64](https://builds.clickhouse.tech/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos/clickhouse' && chmod a+x ./clickhouse`
--   [MacOS Aarch64 (Apple Silicon)](https://builds.clickhouse.tech/master/macos-aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos-aarch64/clickhouse' && chmod a+x ./clickhouse`
--   [FreeBSD x86_64](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
--   [Linux AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
+-   [MacOS x86_64](https://builds.clickhouse.com/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/macos/clickhouse' && chmod a+x ./clickhouse`
+-   [MacOS Aarch64 (Apple Silicon)](https://builds.clickhouse.com/master/macos-aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/macos-aarch64/clickhouse' && chmod a+x ./clickhouse`
+-   [FreeBSD x86_64](https://builds.clickhouse.com/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
+-   [Linux AArch64](https://builds.clickhouse.com/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
 
 After downloading, you can use the `clickhouse client` to connect to the server, or `clickhouse local` to process local data.
 
@@ -199,6 +203,6 @@ SELECT 1
 
 **Congratulations, the system works!**
 
-To continue experimenting, you can download one of the test data sets or go through [tutorial](https://clickhouse.tech/tutorial.html).
+To continue experimenting, you can download one of the test data sets or go through [tutorial](https://clickhouse.com/tutorial.html).
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/en/getting-started/playground.md b/docs/en/getting-started/playground.md
index 9adf0423cf3..90e3eedb764 100644
--- a/docs/en/getting-started/playground.md
+++ b/docs/en/getting-started/playground.md
@@ -5,7 +5,7 @@ toc_title: Playground
 
 # ClickHouse Playground {#clickhouse-playground}
 
-[ClickHouse Playground](https://play.clickhouse.tech) allows people to experiment with ClickHouse by running queries instantly, without setting up their server or cluster.
+[ClickHouse Playground](https://play.clickhouse.com) allows people to experiment with ClickHouse by running queries instantly, without setting up their server or cluster.
 Several example datasets are available in Playground as well as sample queries that show ClickHouse features. There’s also a selection of ClickHouse LTS releases to experiment with.
 
 ClickHouse Playground gives the experience of m2.small [Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse) instance (4 vCPU, 32 GB RAM) hosted in [Yandex.Cloud](https://cloud.yandex.com/). More information about [cloud providers](../commercial/cloud.md).
@@ -16,15 +16,15 @@ You can make queries to Playground using any HTTP client, for example [curl](htt
 
 | Parameter           | Value                                   |
 |:--------------------|:----------------------------------------|
-| HTTPS endpoint      | `https://play-api.clickhouse.tech:8443` |
-| Native TCP endpoint | `play-api.clickhouse.tech:9440`         |
+| HTTPS endpoint      | `https://play-api.clickhouse.com:8443` |
+| Native TCP endpoint | `play-api.clickhouse.com:9440`         |
 | User                | `playground`                            |
 | Password            | `clickhouse`                            |
 
 There are additional endpoints with specific ClickHouse releases to experiment with their differences (ports and user/password are the same as above):
 
--   20.3 LTS: `play-api-v20-3.clickhouse.tech`
--   19.14 LTS: `play-api-v19-14.clickhouse.tech`
+-   20.3 LTS: `play-api-v20-3.clickhouse.com`
+-   19.14 LTS: `play-api-v19-14.clickhouse.com`
 
 !!! note "Note"
     All these endpoints require a secure TLS connection.
@@ -48,13 +48,13 @@ The following settings are also enforced:
 HTTPS endpoint example with `curl`:
 
 ``` bash
-curl "https://play-api.clickhouse.tech:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
+curl "https://play-api.clickhouse.com:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
 ```
 
 TCP endpoint example with [CLI](../interfaces/cli.md):
 
 ``` bash
-clickhouse client --secure -h play-api.clickhouse.tech --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
+clickhouse client --secure -h play-api.clickhouse.com --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
 ```
 
 ## Implementation Details {#implementation-details}
diff --git a/docs/en/getting-started/tutorial.md b/docs/en/getting-started/tutorial.md
index 694a82e100e..e08b319f2a4 100644
--- a/docs/en/getting-started/tutorial.md
+++ b/docs/en/getting-started/tutorial.md
@@ -85,8 +85,8 @@ Now it’s time to fill our ClickHouse server with some sample data. In this tut
 ### Download and Extract Table Data {#download-and-extract-table-data}
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 ```
 
 The extracted files are about 10GB in size.
@@ -659,4 +659,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 
 Replication operates in multi-master mode. Data can be loaded into any replica, and the system then syncs it with other instances automatically. Replication is asynchronous so at a given moment, not all replicas may contain recently inserted data. At least one replica should be up to allow data ingestion. Others will sync up data and repair consistency once they will become active again. Note that this approach allows for the low possibility of a loss of recently inserted data.
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/en/guides/apply-catboost-model.md b/docs/en/guides/apply-catboost-model.md
index b354a42a843..9fd48fcc62d 100644
--- a/docs/en/guides/apply-catboost-model.md
+++ b/docs/en/guides/apply-catboost-model.md
@@ -239,4 +239,4 @@ FROM
 !!! note "Note"
     More info about [avg()](../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) and [log()](../sql-reference/functions/math-functions.md) functions.
 
-[Original article](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/en/guides/index.md b/docs/en/guides/index.md
index 8a48a411b7a..eb4ca9af367 100644
--- a/docs/en/guides/index.md
+++ b/docs/en/guides/index.md
@@ -11,4 +11,4 @@ List of detailed step-by-step instructions that help to solve various tasks usin
 -   [Tutorial on simple cluster set-up](../getting-started/tutorial.md)
 -   [Applying a CatBoost model in ClickHouse](../guides/apply-catboost-model.md)
 
-[Original article](https://clickhouse.tech/docs/en/guides/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/guides/) <!--hide-->
diff --git a/docs/en/index.md b/docs/en/index.md
index 12e72ebdf3b..532be035bbc 100644
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -92,4 +92,4 @@ This is not done in “normal” databases, because it does not make sense when
 
 Note that for CPU efficiency, the query language must be declarative (SQL or MDX), or at least a vector (J, K). The query should only contain implicit loops, allowing for optimization.
 
-{## [Original article](https://clickhouse.tech/docs/en/) ##}
+{## [Original article](https://clickhouse.com/docs/en/) ##}
diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index 8457ea41857..eaf7a96ce42 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -127,6 +127,9 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 -   `--secure` – If specified, will connect to server over secure connection.
 -   `--history_file` — Path to a file containing command history.
 -   `--param_<name>` — Value for a [query with parameters](#cli-queries-with-parameters).
+-   `--hardware-utilization` — Print hardware utilization information in progress bar.
+-   `--print-profile-events` – Print `ProfileEvents` packets.
+-   `--profile-events-delay-ms` – Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet).
 
 Since version 20.5, `clickhouse-client` has automatic syntax highlighting (always enabled).
 
@@ -141,7 +144,7 @@ Since version 20.5, `clickhouse-client` has automatic syntax highlighting (alway
 
 Example of a config file:
 
-``` xml
+```xml
 <config>
     <user>username</user>
     <password>password</password>
@@ -149,4 +152,30 @@ Example of a config file:
 </config>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/cli/) <!--hide-->
+### Query ID Format {#query-id-format}
+
+In interactive mode `clickhouse-client` shows query ID for every query. By default, the ID is formatted like this:
+
+```sql
+Query id: 927f137d-00f1-4175-8914-0dd066365e96
+```
+
+A custom format may be specified in a configuration file inside a `query_id_formats` tag. `{query_id}` placeholder in the format string is replaced with the ID of a query. Several format strings are allowed inside the tag.
+This feature can be used to generate URLs to facilitate profiling of queries.
+
+**Example**
+
+```xml
+<config>
+  <query_id_formats>
+    <speedscope>http://speedscope-host/#profileURL=qp%3Fid%3D{query_id}</speedscope>
+  </query_id_formats>
+</config>
+```
+
+If the configuration above is applied, the ID of a query is shown in the following format:
+
+``` text
+speedscope:http://speedscope-host/#profileURL=qp%3Fid%3Dc8ecc783-e753-4b38-97f1-42cddfb98b7d
+```
+
diff --git a/docs/en/interfaces/cpp.md b/docs/en/interfaces/cpp.md
index 479b0ac87d9..dcd1228ea0f 100644
--- a/docs/en/interfaces/cpp.md
+++ b/docs/en/interfaces/cpp.md
@@ -7,4 +7,4 @@ toc_title: C++ Client Library
 
 See README at [clickhouse-cpp](https://github.com/ClickHouse/clickhouse-cpp) repository.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/cpp/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/cpp/) <!--hide-->
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index 015afd1cd24..8fc031834be 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -23,20 +23,19 @@ The supported formats are:
 | [CustomSeparated](#format-customseparated)                                              | ✔     | ✔      |
 | [Values](#data-format-values)                                                           | ✔     | ✔      |
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
-| [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
 | [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
-| [JSONString](#jsonstring)                                                               | ✗     | ✔      |
+| [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
 | [JSONCompact](#jsoncompact)                                                             | ✗     | ✔      |
-| [JSONCompactString](#jsoncompactstring)                                                 | ✗     | ✔      |
+| [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗     | ✔      |
 | [JSONEachRow](#jsoneachrow)                                                             | ✔     | ✔      |
 | [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                     | ✗     | ✔      |
 | [JSONStringsEachRow](#jsonstringseachrow)                                               | ✔     | ✔      |
 | [JSONStringsEachRowWithProgress](#jsonstringseachrowwithprogress)                       | ✗     | ✔      |
 | [JSONCompactEachRow](#jsoncompacteachrow)                                               | ✔     | ✔      |
 | [JSONCompactEachRowWithNamesAndTypes](#jsoncompacteachrowwithnamesandtypes)             | ✔     | ✔      |
-| [JSONCompactStringEachRow](#jsoncompactstringeachrow)                                   | ✔     | ✔      |
-| [JSONCompactStringEachRowWithNamesAndTypes](#jsoncompactstringeachrowwithnamesandtypes) | ✔     | ✔      |
+| [JSONCompactStringsEachRow](#jsoncompactstringseachrow)                                   | ✔     | ✔      |
+| [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔     | ✔      |
 | [TSKV](#tskv)                                                                           | ✔     | ✔      |
 | [Pretty](#pretty)                                                                       | ✗     | ✔      |
 | [PrettyCompact](#prettycompact)                                                         | ✗     | ✔      |
@@ -60,6 +59,7 @@ The supported formats are:
 | [LineAsString](#lineasstring)                                                           | ✔     | ✗      |
 | [Regexp](#data-format-regexp)                                                           | ✔     | ✗      |
 | [RawBLOB](#rawblob)                                                                     | ✔     | ✔      |
+| [MsgPack](#msgpack)                                                                     | ✔     | ✔      |
 
 You can control some format processing parameters with the ClickHouse settings. For more information read the [Settings](../operations/settings/settings.md) section.
 
@@ -74,7 +74,7 @@ The `TabSeparated` format is convenient for processing data using custom program
 The `TabSeparated` format supports outputting total values (when using WITH TOTALS) and extreme values (when ‘extremes’ is set to 1). In these cases, the total values and extremes are output after the main data. The main result, total values, and extremes are separated from each other by an empty line. Example:
 
 ``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated``
+SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated
 ```
 
 ``` text
@@ -164,8 +164,7 @@ This format is also available under the name `TSVRaw`.
 ## TabSeparatedWithNames {#tabseparatedwithnames}
 
 Differs from the `TabSeparated` format in that the column names are written in the first row.
-During parsing, the first row is completely ignored. You can’t use column names to determine their position or to check their correctness.
-(Support for parsing the header row may be added in the future.)
+During parsing, the first row is expected to contain the column names. You can use column names to determine their position and to check their correctness.
 
 This format is also available under the name `TSVWithNames`.
 
@@ -386,7 +385,7 @@ The CSV format supports the output of totals and extremes the same way as `TabSe
 
 ## CSVWithNames {#csvwithnames}
 
-Also prints the header row, similar to `TabSeparatedWithNames`.
+Also prints the header row, similar to [TabSeparatedWithNames](#tabseparatedwithnames).
 
 ## CustomSeparated {#format-customseparated}
 
@@ -464,7 +463,7 @@ ClickHouse supports [NULL](../sql-reference/syntax.md), which is displayed as `n
 -   [JSONEachRow](#jsoneachrow) format
 -   [output_format_json_array_of_rows](../operations/settings/settings.md#output-format-json-array-of-rows) setting
 
-## JSONString {#jsonstring}
+## JSONStrings {#jsonstrings}
 
 Differs from JSON only in that data fields are output in strings, not in typed JSON values.
 
@@ -515,11 +514,11 @@ Example:
 
 ## JSONAsString {#jsonasstring}
 
-In this format, a single JSON object is interpreted as a single value. If the input has several JSON objects (comma separated) they will be interpreted as separate rows.
+In this format, a single JSON object is interpreted as a single value. If the input has several JSON objects (comma separated), they are interpreted as separate rows. If the input data is enclosed in square brackets, it is interpreted as an array of JSONs.
 
 This format can only be parsed for table with a single field of type [String](../sql-reference/data-types/string.md). The remaining columns must be set to [DEFAULT](../sql-reference/statements/create/table.md#default) or [MATERIALIZED](../sql-reference/statements/create/table.md#materialized), or omitted. Once you collect whole JSON object to string you can use [JSON functions](../sql-reference/functions/json-functions.md) to process it.
 
-**Example**
+**Examples**
 
 Query:
 
@@ -540,8 +539,28 @@ Result:
 └───────────────────────────────────┘
 ```
 
+**An array of JSON objects**
+
+Query:
+
+``` sql
+CREATE TABLE json_square_brackets (field String) ENGINE = Memory;
+INSERT INTO json_square_brackets FORMAT JSONAsString [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
+
+SELECT * FROM json_square_brackets;
+```
+
+Result:
+
+```text
+┌─field──────────────────────┐
+│ {"id": 1, "name": "name1"} │
+│ {"id": 2, "name": "name2"} │
+└────────────────────────────┘
+```
+
 ## JSONCompact {#jsoncompact}
-## JSONCompactString {#jsoncompactstring}
+## JSONCompactStrings {#jsoncompactstrings}
 
 Differs from JSON only in that data rows are output in arrays, not in objects.
 
@@ -580,7 +599,7 @@ Example:
 ```
 
 ```
-// JSONCompactString
+// JSONCompactStrings
 {
         "meta":
         [
@@ -614,7 +633,7 @@ Example:
 ## JSONEachRow {#jsoneachrow}
 ## JSONStringsEachRow {#jsonstringseachrow}
 ## JSONCompactEachRow {#jsoncompacteachrow}
-## JSONCompactStringEachRow {#jsoncompactstringeachrow}
+## JSONCompactStringsEachRow {#jsoncompactstringseachrow}
 
 When using these formats, ClickHouse outputs rows as separated, newline-delimited JSON values, but the data as a whole is not valid JSON.
 
@@ -639,9 +658,9 @@ Differs from `JSONEachRow`/`JSONStringsEachRow` in that ClickHouse will also yie
 ```
 
 ## JSONCompactEachRowWithNamesAndTypes {#jsoncompacteachrowwithnamesandtypes}
-## JSONCompactStringEachRowWithNamesAndTypes {#jsoncompactstringeachrowwithnamesandtypes}
+## JSONCompactStringsEachRowWithNamesAndTypes {#jsoncompactstringseachrowwithnamesandtypes}
 
-Differs from `JSONCompactEachRow`/`JSONCompactStringEachRow` in that the column names and types are written as the first two rows.
+Differs from `JSONCompactEachRow`/`JSONCompactStringsEachRow` in that the column names and types are written as the first two rows.
 
 ```json
 ["'hello'", "multiply(42, number)", "range(5)"]
@@ -943,10 +962,6 @@ test: string with 'quotes' and      with some special
 
 This format is only appropriate for outputting a query result, but not for parsing (retrieving data to insert in a table).
 
-## VerticalRaw {#verticalraw}
-
-Similar to [Vertical](#vertical), but with escaping disabled. This format is only suitable for outputting query results, not for parsing (receiving data and inserting it in the table).
-
 ## XML {#xml}
 
 XML format is suitable only for output, not for parsing. Example:
@@ -1270,6 +1285,8 @@ You can insert Parquet data from a file into ClickHouse table by the following c
 $ cat {filename} | clickhouse-client --query="INSERT INTO {some_table} FORMAT Parquet"
 ```
 
+To insert data into [Nested](../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs values you must switch on the [input_format_parquet_import_nested](../operations/settings/settings.md#input_format_parquet_import_nested) setting.
+
 You can select data from a ClickHouse table and save them into some file in the Parquet format by the following command:
 
 ``` bash
@@ -1328,6 +1345,8 @@ You can insert Arrow data from a file into ClickHouse table by the following com
 $ cat filename.arrow | clickhouse-client --query="INSERT INTO some_table FORMAT Arrow"
 ```
 
+To insert data into [Nested](../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs values you must switch on the [input_format_arrow_import_nested](../operations/settings/settings.md#input_format_arrow_import_nested) setting.
+
 ### Selecting Data {#selecting-data-arrow}
 
 You can select data from a ClickHouse table and save them into some file in the Arrow format by the following command:
@@ -1384,6 +1403,8 @@ You can insert ORC data from a file into ClickHouse table by the following comma
 $ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
 ```
 
+To insert data into [Nested](../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs values you must switch on the [input_format_orc_import_nested](../operations/settings/settings.md#input_format_orc_import_nested) setting.
+
 ### Selecting Data {#selecting-data-2}
 
 You can select data from a ClickHouse table and save them into some file in the ORC format by the following command:
@@ -1545,4 +1566,33 @@ Result:
 f9725a22f9191e064120d718e26862a9  -
 ```
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
+## MsgPack {#msgpack}
+
+ClickHouse supports reading and writing [MessagePack](https://msgpack.org/) data files.
+
+### Data Types Matching {#data-types-matching-msgpack}
+
+| MessagePack data type (`INSERT`)                                   | ClickHouse data type                                      | MessagePack data type (`SELECT`)   |
+|--------------------------------------------------------------------|-----------------------------------------------------------|------------------------------------|
+| `uint N`, `positive fixint`                                        | [UIntN](../sql-reference/data-types/int-uint.md)          | `uint N`                           |
+| `int N`                                                            | [IntN](../sql-reference/data-types/int-uint.md)           | `int N`                            |
+| `bool`                                                             | [UInt8](../sql-reference/data-types/int-uint.md)          | `uint 8`                           |
+| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [String](../sql-reference/data-types/string.md)           | `bin 8`, `bin 16`, `bin 32`        |
+| `fixstr`, `str 8`, `str 16`, `str 32`, `bin 8`, `bin 16`, `bin 32` | [FixedString](../sql-reference/data-types/fixedstring.md) | `bin 8`, `bin 16`, `bin 32`        |
+| `float 32`                                                         | [Float32](../sql-reference/data-types/float.md)           | `float 32`                         |
+| `float 64`                                                         | [Float64](../sql-reference/data-types/float.md)           | `float 64`                         |
+| `uint 16`                                                          | [Date](../sql-reference/data-types/date.md)               | `uint 16`                          |
+| `uint 32`                                                          | [DateTime](../sql-reference/data-types/datetime.md)       | `uint 32`                          |
+| `uint 64`                                                          | [DateTime64](../sql-reference/data-types/datetime.md)     | `uint 64`                          |
+| `fixarray`, `array 16`, `array 32`                                 | [Array](../sql-reference/data-types/array.md)             | `fixarray`, `array 16`, `array 32` |
+| `fixmap`, `map 16`, `map 32`                                       | [Map](../sql-reference/data-types/map.md)                 | `fixmap`, `map 16`, `map 32`       |
+
+Example:
+
+Writing to a file ".msgpk":
+
+```sql
+$ clickhouse-client --query="CREATE TABLE msgpack (array Array(UInt8)) ENGINE = Memory;"
+$ clickhouse-client --query="INSERT INTO msgpack VALUES ([0, 1, 2, 3, 42, 253, 254, 255]), ([255, 254, 253, 42, 3, 2, 1, 0])";
+$ clickhouse-client --query="SELECT * FROM msgpack FORMAT MsgPack" > tmp_msgpack.msgpk;
+```
diff --git a/docs/en/interfaces/index.md b/docs/en/interfaces/index.md
index 1613e8508a5..10f15ae47d6 100644
--- a/docs/en/interfaces/index.md
+++ b/docs/en/interfaces/index.md
@@ -24,4 +24,4 @@ There are also a wide range of third-party libraries for working with ClickHouse
 -   [Integrations](../interfaces/third-party/integrations.md)
 -   [Visual interfaces](../interfaces/third-party/gui.md)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/) <!--hide-->
diff --git a/docs/en/interfaces/jdbc.md b/docs/en/interfaces/jdbc.md
index ec3fa2fe89a..cf97568a8de 100644
--- a/docs/en/interfaces/jdbc.md
+++ b/docs/en/interfaces/jdbc.md
@@ -10,4 +10,4 @@ toc_title: JDBC Driver
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/jdbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/jdbc/) <!--hide-->
diff --git a/docs/en/interfaces/mysql.md b/docs/en/interfaces/mysql.md
index ee9af925671..38bcc2b68f8 100644
--- a/docs/en/interfaces/mysql.md
+++ b/docs/en/interfaces/mysql.md
@@ -44,4 +44,10 @@ Restrictions:
 
 -   some data types are sent as strings
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
+To cancel a long query use `KILL QUERY connection_id` statement (it is replaced with `KILL QUERY WHERE query_id = connection_id` while proceeding). For example:
+
+``` bash
+$ mysql --protocol tcp -h mysql_server -P 9004 default -u default --password=123 -e "KILL QUERY 123456;"
+```
+
+[Original article](https://clickhouse.com/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/en/interfaces/odbc.md b/docs/en/interfaces/odbc.md
index 42ae4cf5b53..fa58ed8b43e 100644
--- a/docs/en/interfaces/odbc.md
+++ b/docs/en/interfaces/odbc.md
@@ -7,4 +7,4 @@ toc_title: ODBC Driver
 
 -   [Official driver](https://github.com/ClickHouse/clickhouse-odbc)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/odbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/odbc/) <!--hide-->
diff --git a/docs/en/interfaces/tcp.md b/docs/en/interfaces/tcp.md
index 75ca3e3fd91..b23f8110320 100644
--- a/docs/en/interfaces/tcp.md
+++ b/docs/en/interfaces/tcp.md
@@ -7,4 +7,4 @@ toc_title: Native Interface (TCP)
 
 The native protocol is used in the [command-line client](../interfaces/cli.md), for inter-server communication during distributed query processing, and also in other C++ programs. Unfortunately, native ClickHouse protocol does not have formal specification yet, but it can be reverse-engineered from ClickHouse source code (starting [around here](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)) and/or by intercepting and analyzing TCP traffic.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/client-libraries.md b/docs/en/interfaces/third-party/client-libraries.md
index 835e3c6e98a..cb8679e4bdd 100644
--- a/docs/en/interfaces/third-party/client-libraries.md
+++ b/docs/en/interfaces/third-party/client-libraries.md
@@ -67,4 +67,4 @@ toc_title: Client Libraries
 -   Haskell
     -   [hdbc-clickhouse](https://github.com/zaneli/hdbc-clickhouse)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index 2d7f3a24011..593019bfb2e 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -84,7 +84,7 @@ Features:
 -   Table data preview.
 -   Full-text search.
 
-By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set session_id to a random string (it uses the http connection under the hood). Then you can use any setting from the query window 
+By default, DBeaver does not connect using a session (the CLI for example does). If you require session support (for example to set settings for your session), edit the driver connection properties and set `session_id` to a random string (it uses the http connection under the hood). Then you can use any setting from the query window.
 
 ### clickhouse-cli {#clickhouse-cli}
 
@@ -113,6 +113,36 @@ Features:
 
 [MindsDB](https://mindsdb.com/) is an open-source AI layer for databases including ClickHouse that allows you to effortlessly develop, train and deploy state-of-the-art machine learning models. MindsDB Studio(GUI) allows you to train new models from database, interpret predictions made by the model, identify potential data biases, and evaluate and visualize model accuracy using the Explainable AI function to adapt and tune your Machine Learning models faster.
 
+### DBM {#dbm}
+
+[DBM](https://dbm.incubator.edurt.io/) DBM is a visual management tool for ClickHouse!
+
+Features:
+
+-   Support query history (pagination, clear all, etc.)
+-   Support selected sql clauses query
+-   Support terminating query
+-   Support table management (metadata, delete, preview)
+-   Support database management (delete, create)
+-   Support custom query
+-   Support multiple data sources management(connection test, monitoring)
+-   Support monitor (processor, connection, query)
+-   Support migrate data
+
+### Bytebase {#bytebase}
+
+[Bytebase](https://bytebase.com) is a web-based, open source schema change and version control tool for teams. It supports various databases including ClickHouse.
+
+Features:
+
+-   Schema review between developers and DBAs.
+-   Database-as-Code, version control the schema in VCS such GitLab and trigger the deployment upon code commit.
+-   Streamlined deployment with per-environment policy.
+-   Full migration history.
+-   Schema drift detection.
+-   Backup and restore.
+-   RBAC.
+
 ## Commercial {#commercial}
 
 ### DataGrip {#datagrip}
@@ -190,4 +220,4 @@ SeekTable is [free](https://www.seektable.com/help/cloud-pricing) for personal/i
 
 [Chadmin](https://github.com/bun4uk/chadmin) is a simple UI where you can visualize your currently running queries on your ClickHouse cluster and info about them and kill them if you want.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md
index 48782268940..4a4eee770dc 100644
--- a/docs/en/interfaces/third-party/integrations.md
+++ b/docs/en/interfaces/third-party/integrations.md
@@ -42,7 +42,7 @@ toc_title: Integrations
         -   [mfedotov/clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
 -   Monitoring
     -   [Graphite](https://graphiteapp.org)
-        -   [graphouse](https://github.com/yandex/graphouse)
+        -   [graphouse](https://github.com/ClickHouse/graphouse)
         -   [carbon-clickhouse](https://github.com/lomik/carbon-clickhouse)
         -   [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
         -   [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer) - optimizes staled partitions in [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) if rules from [rollup configuration](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) could be applied
@@ -108,4 +108,4 @@ toc_title: Integrations
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/en/interfaces/third-party/proxy.md b/docs/en/interfaces/third-party/proxy.md
index fc01568e35a..31a2d5afae9 100644
--- a/docs/en/interfaces/third-party/proxy.md
+++ b/docs/en/interfaces/third-party/proxy.md
@@ -41,4 +41,4 @@ Features:
 
 Implemented in Go.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/en/introduction/adopters.md b/docs/en/introduction/adopters.md
index d408a3d6849..787cd451d96 100644
--- a/docs/en/introduction/adopters.md
+++ b/docs/en/introduction/adopters.md
@@ -15,22 +15,28 @@ toc_title: Adopters
 | <a href="http://www.adscribe.tv/" class="favicon">AdScribe</a> | Ads | TV Analytics | — | — | [A quote from CTO](https://altinity.com/24x7-support/) |
 | <a href="https://ahrefs.com/" class="favicon">Ahrefs</a> | SEO | Analytics | — | — | [Job listing](https://ahrefs.com/jobs/data-scientist-search) |
 | <a href="https://cn.aliyun.com/" class="favicon">Alibaba Cloud</a> | Cloud | Managed Service | — | — | [Official Website](https://help.aliyun.com/product/144466.html) |
-| <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a> | Mobile App | Browser backend | — | — | [Slides in Russian, May 2019](https://presentations.clickhouse.tech/meetup22/aloha.pdf) |
+| <a href="https://cn.aliyun.com/" class="favicon">Alibaba Cloud</a> | Cloud | E-MapReduce | — | — | [Official Website](https://help.aliyun.com/document_detail/212195.html) |
+| <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a> | Mobile App | Browser backend | — | — | [Slides in Russian, May 2019](https://presentations.clickhouse.com/meetup22/aloha.pdf) |
 | <a href="https://altinity.com/" class="favicon">Altinity</a> | Cloud, SaaS | Main product | — | — | [Official Website](https://altinity.com/) |
 | <a href="https://amadeus.com/" class="favicon">Amadeus</a> | Travel | Analytics | — | — | [Press Release, April 2018](https://www.altinity.com/blog/2018/4/5/amadeus-technologies-launches-investment-and-insights-tool-based-on-machine-learning-and-strategy-algorithms) |
 | <a href="https://apiroad.net/" class="favicon">ApiRoad</a> | API marketplace | Analytics | — | — | [Blog post, Nov 2018, Mar 2020](https://pixeljets.com/blog/clickhouse-vs-elasticsearch/) |
 | <a href="https://www.appsflyer.com" class="favicon">Appsflyer</a> | Mobile analytics | Main product | — | — | [Talk in Russian, July 2019](https://www.youtube.com/watch?v=M3wbRlcpBbY) |
 | <a href="https://arenadata.tech/" class="favicon">ArenaData</a> | Data Platform | Main product | — | — | [Slides in Russian, December 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup38/indexes.pdf) |
+| <a href="https://www.argedor.com/en/clickhouse/" class="favicon">Argedor</a> | ClickHouse support | — | — | — | [Official website](https://www.argedor.com/en/clickhouse/) |
 | <a href="https://avito.ru/" class="favicon">Avito</a> | Classifieds | Monitoring | — | — | [Meetup, April 2020](https://www.youtube.com/watch?v=n1tm4j4W8ZQ) |
-| <a href="https://badoo.com" class="favicon">Badoo</a> | Dating | Timeseries | — | — | [Slides in Russian, December 2019](https://presentations.clickhouse.tech/meetup38/forecast.pdf) |
+| <a href="https://badoo.com" class="favicon">Badoo</a> | Dating | Timeseries | — | 1.6 mln events/sec (2018) | [Slides in Russian, December 2019](https://presentations.clickhouse.com/meetup38/forecast.pdf) |
+| <a href="https://beeline.ru/" class="favicon">Beeline</a> | Telecom | Data Platform | — | — | [Blog post, July 2021](https://habr.com/en/company/beeline/blog/567508/) |
 | <a href="https://www.benocs.com/" class="favicon">Benocs</a> | Network Telemetry and Analytics | Main Product | — | — | [Slides in English, October 2017](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup9/lpm.pdf) |
 | <a href="https://www.bigo.sg/" class="favicon">BIGO</a> | Video | Computing Platform | — | — | [Blog Article, August 2020](https://www.programmersought.com/article/44544895251/) |
-| <a href="https://www.bloomberg.com/" class="favicon">Bloomberg</a> | Finance, Media | Monitoring | 102 servers | — | [Slides, May 2018](https://www.slideshare.net/Altinity/http-analytics-for-6m-requests-per-second-using-clickhouse-by-alexander-bocharov) |
+| <a href="https://www.bilibili.com/" class="favicon">BiliBili</a> | Video sharing | — | — | — | [Blog post, June 2021](https://chowdera.com/2021/06/20210622012241476b.html) |
+| <a href="https://www.bloomberg.com/">Bloomberg</a> | Finance, Media | Monitoring | — | — | [Slides, May 2018](https://www.slideshare.net/Altinity/http-analytics-for-6m-requests-per-second-using-clickhouse-by-alexander-bocharov) |
 | <a href="https://bloxy.info" class="favicon">Bloxy</a> | Blockchain | Analytics | — | — | [Slides in Russian, August 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/4_bloxy.pptx) |
 | <a href="https://www.bytedance.com" class="favicon">Bytedance</a> | Social platforms | — | — | — | [The ClickHouse Meetup East, October 2020](https://www.youtube.com/watch?v=ckChUkC3Pns) |
 | <a href="https://cardsmobile.ru/" class="favicon">CardsMobile</a> | Finance | Analytics | — | — | [VC.ru](https://vc.ru/s/cardsmobile/143449-rukovoditel-gruppy-analiza-dannyh) |
 | <a href="https://carto.com/" class="favicon">CARTO</a> | Business Intelligence | Geo analytics | — | — | [Geospatial processing with ClickHouse](https://carto.com/blog/geospatial-processing-with-clickhouse/) |
 | <a href="http://public.web.cern.ch/public/" class="favicon">CERN</a> | Research | Experiment | — | — | [Press release, April 2012](https://www.yandex.com/company/press_center/press_releases/2012/2012-04-10/) |
+| <a href="https://www.checklyhq.com/" class="favicon">Checkly</a> | Software Development | Analytics | — | — | [Tweet, October 2021](https://twitter.com/tim_nolet/status/1445810665743081474?s=20) |
+| <a href="https://chelpipegroup.com/" class="favicon">ChelPipe Group</a> | Analytics | — | — | — | [Blog post, June 2021](https://vc.ru/trade/253172-tyazhelomu-proizvodstvu-user-friendly-sayt-internet-magazin-trub-dlya-chtpz) |
 | <a href="http://cisco.com/" class="favicon">Cisco</a> | Networking | Traffic analysis | — | — | [Lightning talk, October 2019](https://youtu.be/-hI1vDR2oPY?t=5057) |
 | <a href="https://www.citadelsecurities.com/" class="favicon">Citadel Securities</a> | Finance | — | — | — | [Contribution, March 2019](https://github.com/ClickHouse/ClickHouse/pull/4774) |
 | <a href="https://city-mobil.ru" class="favicon">Citymobil</a> | Taxi | Analytics | — | — | [Blog Post in Russian, March 2020](https://habr.com/en/company/citymobil/blog/490660/) |
@@ -46,6 +52,7 @@ toc_title: Adopters
 | <a href="https://db.com" class="favicon">Deutsche Bank</a> | Finance | BI Analytics | — | — | [Slides in English, October 2019](https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf) |
 | <a href="https://deeplay.io/eng/" class="favicon">Deeplay</a> | Gaming Analytics | — | — | — | [Job advertisement, 2020](https://career.habr.com/vacancies/1000062568) |
 | <a href="https://www.diva-e.com" class="favicon">Diva-e</a> | Digital consulting | Main Product | — | — | [Slides in English, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup29/ClickHouse-MeetUp-Unusual-Applications-sd-2019-09-17.pdf) |
+| <a href="https://ecommpay.com/" class="favicon">Ecommpay</a> | Payment Processing | Logs | — | — | [Video, Nov 2019](https://www.youtube.com/watch?v=d3GdZTOWGLk) |
 | <a href="https://www.ecwid.com/" class="favicon">Ecwid</a> | E-commerce SaaS | Metrics, Logging | — | — | [Slides in Russian, April 2019](https://nastachku.ru/var/files/1/presentation/backend/2_Backend_6.pdf) |
 | <a href="https://www.ebay.com/" class="favicon">eBay</a> | E-commerce | Logs, Metrics and Events | — | — | [Official website, Sep 2020](https://tech.ebayinc.com/engineering/ou-online-analytical-processing/) |
 | <a href="https://www.exness.com/" class="favicon">Exness</a> | Trading | Metrics, Logging | — | — | [Talk in Russian, May 2019](https://youtu.be/_rpU-TvSfZ8?t=3215) |
@@ -55,10 +62,13 @@ toc_title: Adopters
 | <a href="https://fun.co/rp" class="favicon">FunCorp</a> | Games | | — | 14 bn records/day as of Jan 2021 | [Article](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse) |
 | <a href="https://geniee.co.jp" class="favicon">Geniee</a> | Ad network | Main product | — | — | [Blog post in Japanese, July 2017](https://tech.geniee.co.jp/entry/2017/07/20/160100) |
 | <a href="https://www.genotek.ru/" class="favicon">Genotek</a> | Bioinformatics | Main product | — | — | [Video, August 2020](https://youtu.be/v3KyZbz9lEE) |
+| <a href="https://gigapipe.com/" class="favicon">Gigapipe</a> | Managed ClickHouse | Main product | — | — | [Official website](https://gigapipe.com/) |
 | <a href="https://glaber.io/" class="favicon">Glaber</a> | Monitoring | Main product | — | — | [Website](https://glaber.io/) |
+| <a href="https://graphcdn.io/" class="favicon">GraphCDN</a> | CDN | Traffic Analytics | — | — | [Blog Post in English, August 2021](https://altinity.com/blog/delivering-insight-on-graphql-apis-with-clickhouse-at-graphcdn/) |
 | <a href="https://www.huya.com/" class="favicon">HUYA</a> | Video Streaming | Analytics | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf) |
+| <a href="https://www.hydrolix.io/" class="favicon">Hydrolix</a> | Cloud data platform | Main product | — | — | [Documentation](https://docs.hydrolix.io/guide/query) |
 | <a href="https://www.the-ica.com/" class="favicon">ICA</a> | FinTech | Risk Management | — | — | [Blog Post in English, Sep 2020](https://altinity.com/blog/clickhouse-vs-redshift-performance-for-fintech-risk-management?utm_campaign=ClickHouse%20vs%20RedShift&utm_content=143520807&utm_medium=social&utm_source=twitter&hss_channel=tw-3894792263) |
-| <a href="https://www.idealista.com" class="favicon">Idealista</a> | Real Estate | Analytics | — | — | [Blog Post in English, April 2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019) |
+| <a href="https://www.idealista.com" class="favicon">Idealista</a> | Real Estate | Analytics | — | — | [Blog Post in English, April 2019](https://clickhouse.com/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019) |
 | <a href="https://infobaleen.com" class="favicon">Infobaleen</a> | AI markting tool  | Analytics | — | — | [Official site](https://infobaleen.com) |
 | <a href="https://www.infovista.com/" class="favicon">Infovista</a> | Networks | Analytics | — | — | [Slides in English, October 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf) |
 | <a href="https://www.innogames.com" class="favicon">InnoGames</a> | Games | Metrics, Logging | — | — | [Slides in Russian, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf) |
@@ -68,9 +78,11 @@ toc_title: Adopters
 | <a href="https://ippon.tech" class="favicon">Ippon Technologies</a> | Technology Consulting | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=205) |
 | <a href="https://www.ivi.ru/" class="favicon">Ivi</a> | Online Cinema | Analytics, Monitoring | — | — | [Article in Russian, Jan 2018](https://habr.com/en/company/ivi/blog/347408/) |
 | <a href="https://jinshuju.net" class="favicon">Jinshuju 金数据</a> | BI Analytics | Main product | — | — | [Slides in Chinese, October 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/3.%20金数据数据架构调整方案Public.pdf) |
+| <a href="https://www.kakaocorp.com/" class="favicon">kakaocorp</a> | Internet company | — | — | — | [if(kakao)2020 conference](https://if.kakao.com/session/117) |
 | <a href="https://www.kodiakdata.com/" class="favicon">Kodiak Data</a> | Clouds | Main product | — | — | [Slides in Engish, April 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup13/kodiak_data.pdf) |
 | <a href="https://kontur.ru" class="favicon">Kontur</a> | Software Development | Metrics | — | — | [Talk in Russian, November 2018](https://www.youtube.com/watch?v=U4u4Bd0FtrY) |
-| <a href="https://www.kuaishou.com/" class="favicon">Kuaishou</a> | Video | — | — | — | [ClickHouse Meetup, October 2018](https://clickhouse.tech/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/) |
+| <a href="https://www.kuaishou.com/" class="favicon">Kuaishou</a> | Video | — | — | — | [ClickHouse Meetup, October 2018](https://clickhouse.com/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/) |
+| <a href="https://www.kgk-global.com/en/" class="favicon">KGK Global</a> | Vehicle monitoring | — | — | — | [Press release, June 2021](https://zoom.cnews.ru/news/item/530921) |
 | <a href="https://www.lbl.gov" class="favicon">Lawrence Berkeley National Laboratory</a> | Research | Traffic analysis | 1 server | 11.8 TiB | [Slides in English, April 2019](https://www.smitasin.com/presentations/2019-04-17_DOE-NSM.pdf) |
 | <a href="https://lifestreet.com/" class="favicon">LifeStreet</a> | Ad network | Main product | 75 servers (3 replicas) | 5.27 PiB | [Blog post in Russian, February 2017](https://habr.com/en/post/322620/) |
 | <a href="https://mcs.mail.ru/" class="favicon">Mail.ru Cloud Solutions</a> | Cloud services | Main product | — | — | [Article in Russian](https://mcs.mail.ru/help/db-create/clickhouse#) |
@@ -85,7 +97,10 @@ toc_title: Adopters
 | <a href="https://www.netskope.com/" class="favicon">Netskope</a> | Network Security | — | — | — | [Job advertisement, March 2021](https://www.mendeley.com/careers/job/senior-software-developer-backend-developer-1346348) |
 | <a href="https://niclabs.cl/" class="favicon">NIC Labs</a> | Network Monitoring | RaTA-DNS | — | — | [Blog post, March 2021](https://niclabs.cl/ratadns/2021/03/Clickhouse) |
 | <a href="https://getnoc.com/" class="favicon">NOC Project</a> | Network Monitoring | Analytics | Main Product | — | [Official Website](https://getnoc.com/features/big-data/) |
+| <a href="https://www.noction.com" class="favicon">Noction</a> | Network Technology | Main Product | — | — | [Official Website](https://www.noction.com/news/irp-3-11-remote-triggered-blackholing-capability)
 | <a href="https://www.nuna.com/" class="favicon">Nuna Inc.</a> | Health Data Analytics | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=170) |
+| <a href="https://ok.ru" class="favicon">Ok.ru</a> | Social Network | — | 72 servers | 810 TB compressed, 50bn rows/day, 1.5 TB/day | [SmartData conference, Oct 2021](https://assets.ctfassets.net/oxjq45e8ilak/4JPHkbJenLgZhBGGyyonFP/57472ec6987003ec4078d0941740703b/____________________ClickHouse_______________________.pdf) |
+| <a href="https://omnicomm.ru/" class="favicon">Omnicomm</a> | Transportation Monitoring | — | — | — | [Facebook post, Oct 2021](https://www.facebook.com/OmnicommTeam/posts/2824479777774500) |
 | <a href="https://www.oneapm.com/" class="favicon">OneAPM</a> | Monitorings and Data Analysis | Main product | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/8.%20clickhouse在OneAPM的应用%20杜龙.pdf) |
 | <a href="https://corp.ozon.com/" class="favicon">OZON</a> | E-commerce | — | — | — | [Official website](https://job.ozon.ru/vacancy/razrabotchik-clickhouse-ekspluatatsiya-40991870/) |
 | <a href="https://panelbear.com/" class="favicon">Panelbear | Analytics | Monitoring and Analytics | — | — | [Tech Stack, November 2020](https://panelbear.com/blog/tech-stack/) |
@@ -100,7 +115,9 @@ toc_title: Adopters
 | <a href="https://qrator.net" class="favicon">Qrator</a> | DDoS protection | Main product | — | — | [Blog Post, March 2019](https://blog.qrator.net/en/clickhouse-ddos-mitigation_37/) |
 | <a href="https://www.rbinternational.com/" class="favicon">Raiffeisenbank</a> | Banking | Analytics | — | — | [Lecture in Russian, December 2020](https://cs.hse.ru/announcements/421965599.html) |
 | <a href="https://rambler.ru" class="favicon">Rambler</a> | Internet services | Analytics | — | — | [Talk in Russian, April 2018](https://medium.com/@ramblertop/разработка-api-clickhouse-для-рамблер-топ-100-f4c7e56f3141) |
+| <a href="https://replicahq.com" class="favicon">Replica</a> | Urban Planning | Analytics | — | — | [Job advertisement](https://boards.greenhouse.io/replica/jobs/5547732002?gh_jid=5547732002) |
 | <a href="https://retell.cc/" class="favicon">Retell</a> | Speech synthesis | Analytics | — | — | [Blog Article, August 2020](https://vc.ru/services/153732-kak-sozdat-audiostati-na-vashem-sayte-i-zachem-eto-nuzhno) |
+| <a href="https://www.rollbar.com" class="favicon">Rollbar</a> | Software Development | Main Product | — | — | [Official Website](https://www.rollbar.com) |
 | <a href="https://rspamd.com/" class="favicon">Rspamd</a> | Antispam | Analytics | — | — | [Official Website](https://rspamd.com/doc/modules/clickhouse.html) |
 | <a href="https://rusiem.com/en" class="favicon">RuSIEM</a> | SIEM | Main Product | — | — | [Official Website](https://rusiem.com/en/products/architecture) |
 | <a href="https://www.s7.ru" class="favicon">S7 Airlines</a> | Airlines | Metrics, Logging | — | — | [Talk in Russian, March 2019](https://www.youtube.com/watch?v=nwG68klRpPg&t=15s) |
@@ -112,7 +129,9 @@ toc_title: Adopters
 | <a href="https://sentry.io/" class="favicon">Sentry</a> | Software Development | Main product | — | — | [Blog Post in English, May 2019](https://blog.sentry.io/2019/05/16/introducing-snuba-sentrys-new-search-infrastructure) |
 | <a href="https://seo.do/" class="favicon">seo.do</a> | Analytics | Main product | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/CH%20Presentation-%20Metehan%20Çetinkaya.pdf) |
 | <a href="http://www.sgk.gov.tr/wps/portal/sgk/tr" class="favicon">SGK</a> | Government Social Security | Analytics | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup35/ClickHouse%20Meetup-Ramazan%20POLAT.pdf) |
+| <a href="https://signoz.io/" class="favicon">SigNoz</a> | Observability Platform | Main Product | — | — | [Source code](https://github.com/SigNoz/signoz) |
 | <a href="http://english.sina.com/index.html" class="favicon">Sina</a> | News | — | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/6.%20ClickHouse最佳实践%20高鹏_新浪.pdf) |
+| <a href="https://www.sipfront.com/" class="favicon">Sipfront</a> | Software Development | Analytics | — | — | [Tweet, October 2021](https://twitter.com/andreasgranig/status/1446404332337913895?s=20) |
 | <a href="https://smi2.ru/" class="favicon">SMI2</a> | News | Analytics | — | — | [Blog Post in Russian, November 2017](https://habr.com/ru/company/smi2/blog/314558/) |
 | <a href="https://www.spark.co.nz/" class="favicon">Spark New Zealand</a> | Telecommunications | Security Operations | — | — | [Blog Post, Feb 2020](https://blog.n0p.me/2020/02/2020-02-05-dnsmonster/) |
 | <a href="https://splitbee.io" class="favicon">Splitbee</a> | Analytics | Main Product | — | — | [Blog Post, Mai 2021](https://splitbee.io/blog/new-pricing) |
@@ -124,12 +143,14 @@ toc_title: Adopters
 | <a href="https://www.tencent.com" class="favicon">Tencent</a> | Big Data | Data processing | — | — | [Slides in Chinese, October 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/5.%20ClickHouse大数据集群应用_李俊飞腾讯网媒事业部.pdf) |
 | <a href="https://www.tencent.com" class="favicon">Tencent</a> | Messaging | Logging | — | — | [Talk in Chinese, November 2019](https://youtu.be/T-iVQRuw-QY?t=5050) |
 | <a href="https://www.tencentmusic.com/" class="favicon">Tencent Music Entertainment (TME)</a> | BigData | Data processing | — | — | [Blog in Chinese, June 2020](https://cloud.tencent.com/developer/article/1637840) |
+| <a href="https://www.tesla.com/" class="favicon">Tesla</a> | Electric vehicle and clean energy company | — | — | — | [Vacancy description, March 2021](https://news.ycombinator.com/item?id=26306170) |
+| <a href="https://timeflow.systems" class="favicon">Timeflow</a> | Software | Analytics | — | — | [Blog](https://timeflow.systems/why-we-moved-from-druid-to-clickhouse/ ) |
 | <a href="https://www.tinybird.co/" class="favicon">Tinybird</a> | Real-time Data Products | Data processing | — | — | [Official website](https://www.tinybird.co/) |
-| <a href="https://trafficstars.com/" class="favicon">Traffic Stars</a> | AD network | — | — | — | [Slides in Russian, May 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup15/lightning/ninja.pdf) |
-| <a href="https://www.uber.com" class="favicon">Uber</a> | Taxi | Logging | — | — | [Slides, February 2020](https://presentations.clickhouse.tech/meetup40/uber.pdf) |
+| <a href="https://trafficstars.com/" class="favicon">Traffic Stars</a> | AD network | — | 300 servers in Europe/US | 1.8 PiB, 700 000 insert rps (as of 2021) | [Slides in Russian, May 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup15/lightning/ninja.pdf) |
+| <a href="https://www.uber.com" class="favicon">Uber</a> | Taxi | Logging | — | — | [Slides, February 2020](https://presentations.clickhouse.com/meetup40/uber.pdf) |
 | <a href="https://hello.utmstat.com/" class="favicon">UTMSTAT</a> | Analytics | Main product | — | — | [Blog post, June 2020](https://vc.ru/tribuna/133956-striming-dannyh-iz-servisa-skvoznoy-analitiki-v-clickhouse) |
 | <a href="https://vk.com" class="favicon">VKontakte</a> | Social Network | Statistics, Logging | — | — | [Slides in Russian, August 2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/3_vk.pdf) |
-| <a href="https://www.vmware.com/" class="favicon">VMWare</a> | Cloud | VeloCloud, SDN | — | — | [Product documentation](https://docs.vmware.com/en/vRealize-Operations-Manager/8.3/com.vmware.vcom.metrics.doc/GUID-A9AD72E1-C948-4CA2-971B-919385AB3CA8.html) |
+| <a href="https://www.vmware.com/" class="favicon">VMware</a> | Cloud | VeloCloud, SDN | — | — | [Product documentation](https://docs.vmware.com/en/vRealize-Operations-Manager/8.3/com.vmware.vcom.metrics.doc/GUID-A9AD72E1-C948-4CA2-971B-919385AB3CA8.html) |
 | <a href="https://www.walmartlabs.com/" class="favicon">Walmart Labs</a> | Internet, Retail | — | — | — | [Talk in English, July 2020](https://youtu.be/GMiXCMFDMow?t=144) |
 | <a href="https://wargaming.com/en/" class="favicon">Wargaming</a> | Games | | — | — | [Interview](https://habr.com/en/post/496954/) |
 | <a href="https://www.wildberries.ru/" class="favicon">Wildberries</a> | E-commerce | | — | — | [Official website](https://it.wildberries.ru/) |
@@ -139,25 +160,16 @@ toc_title: Adopters
 | <a href="http://www.xiaoxintech.cn/" class="favicon">Xiaoxin Tech</a> | Education | Common purpose | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/sync-clickhouse-with-mysql-mongodb.pptx) |
 | <a href="https://www.ximalaya.com/" class="favicon">Ximalaya</a> | Audio sharing | OLAP | — | — | [Slides in English, November 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/ximalaya.pdf) |
 | <a href="https://cloud.yandex.ru/services/managed-clickhouse" class="favicon">Yandex Cloud</a> | Public Cloud | Main product | — | — | [Talk in Russian, December 2019](https://www.youtube.com/watch?v=pgnak9e_E0o) |
-| <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a> | Business Intelligence | Main product | — | — | [Slides in Russian, December 2019](https://presentations.clickhouse.tech/meetup38/datalens.pdf) |
+| <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a> | Business Intelligence | Main product | — | — | [Slides in Russian, December 2019](https://presentations.clickhouse.com/meetup38/datalens.pdf) |
 | <a href="https://market.yandex.ru/" class="favicon">Yandex Market</a> | e-Commerce | Metrics, Logging | — | — | [Talk in Russian, January 2019](https://youtu.be/_l1qP0DyBcA?t=478) |
-| <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a> | Web analytics | Main product | 630 servers in one cluster, 360 servers in another cluster, 1862 servers in one department | 133 PiB / 8.31 PiB / 120 trillion records | [Slides, February 2020](https://presentations.clickhouse.tech/meetup40/introduction/#13) |
+| <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a> | Web analytics | Main product | 630 servers in one cluster, 360 servers in another cluster, 1862 servers in one department | 133 PiB / 8.31 PiB / 120 trillion records | [Slides, February 2020](https://presentations.clickhouse.com/meetup40/introduction/#13) |
 | <a href="https://www.yotascale.com/" class="favicon">Yotascale</a> | Cloud | Data pipeline | — | 2 bn records/day | [LinkedIn (Accomplishments)](https://www.linkedin.com/in/adilsaleem/) |
+| <a href="https://zagravagames.com/en/" class="favicon">Zagrava Trading</a> | — | — | — | — | [Job offer, May 2021](https://twitter.com/datastackjobs/status/1394707267082063874) |
 | <a href="https://htc-cs.ru/" class="favicon">ЦВТ</a> | Software Development | Metrics, Logging | — | — | [Blog Post, March 2019, in Russian](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk) |
 | <a href="https://mkb.ru/" class="favicon">МКБ</a> | Bank | Web-system monitoring | — | — | [Slides in Russian, September 2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf) |
 | <a href="https://cft.ru/" class="favicon">ЦФТ</a> | Banking, Financial products, Payments | — | — | — | [Meetup in Russian, April 2020](https://team.cft.ru/events/162) |
 | <a href="https://promo.croc.ru/digitalworker" class="favicon">Цифровой Рабочий</a> | Industrial IoT, Analytics | — | — | — | [Blog post in Russian, March 2021](https://habr.com/en/company/croc/blog/548018/) |
-| <a href="https://www.kakaocorp.com/" class="favicon">kakaocorp</a> | Internet company | — | — | — | [if(kakao)2020 conference](https://if.kakao.com/session/117) |
 | <a href="https://shop.okraina.ru/" class="favicon">ООО «МПЗ Богородский»</a> | Agriculture | — | — | — | [Article in Russian, November 2020](https://cloud.yandex.ru/cases/okraina) |
-| <a href="https://www.tesla.com/" class="favicon">Tesla</a> | Electric vehicle and clean energy company | — | — | — | [Vacancy description, March 2021](https://news.ycombinator.com/item?id=26306170) |
-| <a href="https://www.kgk-global.com/en/" class="favicon">KGK Global</a> | Vehicle monitoring | — | — | — | [Press release, June 2021](https://zoom.cnews.ru/news/item/530921) |
-| <a href="https://www.bilibili.com/" class="favicon">BiliBili</a> | Video sharing | — | — | — | [Blog post, June 2021](https://chowdera.com/2021/06/20210622012241476b.html) |
-| <a href="https://gigapipe.com/" class="favicon">Gigapipe</a> | Managed ClickHouse | Main product | — | — | [Official website](https://gigapipe.com/) |
-| <a href="https://www.hydrolix.io/" class="favicon">Hydrolix</a> | Cloud data platform | Main product | — | — | [Documentation](https://docs.hydrolix.io/guide/query) |
-| <a href="https://www.argedor.com/en/clickhouse/" class="favicon">Argedor</a> | ClickHouse support | — | — | — | [Official website](https://www.argedor.com/en/clickhouse/) |
-| <a href="https://signoz.io/" class="favicon">SigNoz</a> | Observability Platform | Main Product | — | — | [Source code](https://github.com/SigNoz/signoz) |
-| <a href="https://chelpipegroup.com/" class="favicon">ChelPipe Group</a> | Analytics | — | — | — | [Blog post, June 2021](https://vc.ru/trade/253172-tyazhelomu-proizvodstvu-user-friendly-sayt-internet-magazin-trub-dlya-chtpz) |
-| <a href="https://zagravagames.com/en/" class="favicon">Zagrava Trading</a> | — | — | — | — | [Job offer, May 2021](https://twitter.com/datastackjobs/status/1394707267082063874) |
-| <a href="https://beeline.ru/" class="favicon">Beeline</a> | Telecom | Data Platform | — | — | [Blog post, July 2021](https://habr.com/en/company/beeline/blog/567508/) |
+| <a href="https://domclick.ru/" class="favicon">ДомКлик</a> | Real Estate | — | — | — | [Article in Russian, October 2021](https://habr.com/ru/company/domclick/blog/585936/) |
 
-[Original article](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/en/introduction/distinctive-features.md b/docs/en/introduction/distinctive-features.md
index ee9f9484c67..951a8a9d3e5 100644
--- a/docs/en/introduction/distinctive-features.md
+++ b/docs/en/introduction/distinctive-features.md
@@ -39,9 +39,9 @@ In ClickHouse, data can reside on different shards. Each shard can be a group of
 
 ClickHouse supports a [declarative query language based on SQL](../sql-reference/index.md) that is identical to the ANSI SQL standard in [many cases](../sql-reference/ansi.md).
 
-Supported queries include [GROUP BY](../sql-reference/statements/select/group-by.md), [ORDER BY](../sql-reference/statements/select/order-by.md), subqueries in [FROM](../sql-reference/statements/select/from.md), [JOIN](../sql-reference/statements/select/join.md) clause, [IN](../sql-reference/operators/in.md) operator, and scalar subqueries.
+Supported queries include [GROUP BY](../sql-reference/statements/select/group-by.md), [ORDER BY](../sql-reference/statements/select/order-by.md), subqueries in [FROM](../sql-reference/statements/select/from.md), [JOIN](../sql-reference/statements/select/join.md) clause, [IN](../sql-reference/operators/in.md) operator, [window functions](../sql-reference/window-functions/index.md) and scalar subqueries.
 
-Correlated (dependent) subqueries and window functions are not supported at the time of writing but might become available in the future.
+Correlated (dependent) subqueries are not supported at the time of writing but might become available in the future.
 
 ## Vector Computation Engine {#vector-engine}
 
@@ -93,4 +93,4 @@ ClickHouse implements user account management using SQL queries and allows for [
 2.  Lack of ability to modify or delete already inserted data with a high rate and low latency. There are batch deletes and updates available to clean up or modify data, for example, to comply with [GDPR](https://gdpr-info.eu).
 3.  The sparse index makes ClickHouse not so efficient for point queries retrieving single rows by their keys.
 
-[Original article](https://clickhouse.tech/docs/en/introduction/distinctive-features/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/distinctive-features/) <!--hide-->
diff --git a/docs/en/introduction/history.md b/docs/en/introduction/history.md
index 247c4afc375..d192eff80ea 100644
--- a/docs/en/introduction/history.md
+++ b/docs/en/introduction/history.md
@@ -51,4 +51,4 @@ OLAPServer worked well for non-aggregated data, but it had many restrictions tha
 
 The initial goal for ClickHouse was to remove the limitations of OLAPServer and solve the problem of working with non-aggregated data for all reports, but over the years, it has grown into a general-purpose database management system suitable for a wide range of analytical tasks.
 
-[Original article](https://clickhouse.tech/docs/en/introduction/history/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/history/) <!--hide-->
diff --git a/docs/en/introduction/info.md b/docs/en/introduction/info.md
deleted file mode 100644
index a397c40950d..00000000000
--- a/docs/en/introduction/info.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-toc_priority: 100
----
-
-# Information support {#information-support}
-
-- Email address: <a class="feedback-email"></a>
-- Phone: <a href="tel:+74957806510">+7-495-780-6510</a>
-
-[Original article](https://clickhouse.tech/docs/en/introduction/info/) <!--hide-->
\ No newline at end of file
diff --git a/docs/en/introduction/performance.md b/docs/en/introduction/performance.md
index 6e5710347a1..6ae37086181 100644
--- a/docs/en/introduction/performance.md
+++ b/docs/en/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: Performance
 
 # Performance {#performance}
 
-According to internal testing results at Yandex, ClickHouse shows the best performance (both the highest throughput for long queries and the lowest latency on short queries) for comparable operating scenarios among systems of its class that were available for testing. You can view the test results on a [separate page](https://clickhouse.tech/benchmark/dbms/).
+According to internal testing results at Yandex, ClickHouse shows the best performance (both the highest throughput for long queries and the lowest latency on short queries) for comparable operating scenarios among systems of its class that were available for testing. You can view the test results on a [separate page](https://clickhouse.com/benchmark/dbms/).
 
-Numerous independent benchmarks came to similar conclusions. They are not difficult to find using an internet search, or you can see [our small collection of related links](https://clickhouse.tech/#independent-benchmarks).
+Numerous independent benchmarks came to similar conclusions. They are not difficult to find using an internet search, or you can see [our small collection of related links](https://clickhouse.com/#independent-benchmarks).
 
 ## Throughput for a Single Large Query {#throughput-for-a-single-large-query}
 
@@ -27,4 +27,4 @@ Under the same conditions, ClickHouse can handle several hundred queries per sec
 
 We recommend inserting data in packets of at least 1000 rows, or no more than a single request per second. When inserting to a MergeTree table from a tab-separated dump, the insertion speed can be from 50 to 200 MB/s. If the inserted rows are around 1 KB in size, the speed will be from 50,000 to 200,000 rows per second. If the rows are small, the performance can be higher in rows per second (on Banner System data -`>` 500,000 rows per second; on Graphite data -`>` 1,000,000 rows per second). To improve performance, you can make multiple INSERT queries in parallel, which scales linearly.
 
-{## [Original article](https://clickhouse.tech/docs/en/introduction/performance/) ##}
+{## [Original article](https://clickhouse.com/docs/en/introduction/performance/) ##}
diff --git a/docs/en/operations/access-rights.md b/docs/en/operations/access-rights.md
index 8d48218f417..52f7fb87ffd 100644
--- a/docs/en/operations/access-rights.md
+++ b/docs/en/operations/access-rights.md
@@ -149,4 +149,4 @@ Management queries:
 
     By default, SQL-driven access control and account management is disabled for all users. You need to configure at least one user in the `users.xml` configuration file and set the value of the [access_management](../operations/settings/settings-users.md#access_management-user-setting) setting to 1.
 
-[Original article](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index 9c8f5389ccd..7f0ed48928a 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -37,4 +37,4 @@ For more information about queries related to partition manipulations, see the [
 
 A third-party tool is available to automate this approach: [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup).
 
-[Original article](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/en/operations/caches.md b/docs/en/operations/caches.md
index ec7e4239a9d..279204a8af1 100644
--- a/docs/en/operations/caches.md
+++ b/docs/en/operations/caches.md
@@ -26,4 +26,4 @@ Indirectly used:
 
 To drop cache, use [SYSTEM DROP ... CACHE](../sql-reference/statements/system.md) statements.
 
-[Original article](https://clickhouse.tech/docs/en/operations/caches/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/caches/) <!--hide-->
diff --git a/docs/en/operations/clickhouse-keeper.md b/docs/en/operations/clickhouse-keeper.md
index 5fc1baa003c..58c59ce9f79 100644
--- a/docs/en/operations/clickhouse-keeper.md
+++ b/docs/en/operations/clickhouse-keeper.md
@@ -3,58 +3,58 @@ toc_priority: 66
 toc_title: ClickHouse Keeper
 ---
 
-# [pre-production] clickhouse-keeper
+# [pre-production] ClickHouse Keeper
 
-ClickHouse server use [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
+ClickHouse server uses [ZooKeeper](https://zookeeper.apache.org/) coordination system for data [replication](../engines/table-engines/mergetree-family/replication.md) and [distributed DDL](../sql-reference/distributed-ddl.md) queries execution. ClickHouse Keeper is an alternative coordination system compatible with ZooKeeper.
 
 !!! warning "Warning"
-    This feature currently in pre-production stage. We test it in our CI and on small internal installations.
+    This feature is currently in the pre-production stage. We test it in our CI and on small internal installations.
 
 ## Implementation details
 
-ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper `clickhouse-keeper` written in C++ and use [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
+ZooKeeper is one of the first well-known open-source coordination systems. It's implemented in Java, has quite a simple and powerful data model. ZooKeeper's coordination algorithm called ZAB (ZooKeeper Atomic Broadcast) doesn't provide linearizability guarantees for reads, because each ZooKeeper node serves reads locally. Unlike ZooKeeper ClickHouse Keeper is written in C++ and uses [RAFT algorithm](https://raft.github.io/) [implementation](https://github.com/eBay/NuRaft). This algorithm allows to have linearizability for reads and writes, has several open-source implementations in different languages.
 
-By default, `clickhouse-keeper` provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with `clickhouse-keeper`. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to `clickhouse-keeper` snapshot. Interserver protocol in `clickhouse-keeper` also incompatible with ZooKeeper so mixed ZooKeeper/clickhouse-keeper cluster is impossible.
+By default, ClickHouse Keeper provides the same guarantees as ZooKeeper (linearizable writes, non-linearizable reads). It has a compatible client-server protocol, so any standard ZooKeeper client can be used to interact with ClickHouse Keeper. Snapshots and logs have an incompatible format with ZooKeeper, but `clickhouse-keeper-converter` tool allows to convert ZooKeeper data to ClickHouse Keeper snapshot. Interserver protocol in ClickHouse Keeper is also incompatible with ZooKeeper so mixed ZooKeeper / ClickHouse Keeper cluster is impossible.
 
 ## Configuration
 
-`clickhouse-keeper` can be used as a standalone replacement for ZooKeeper or as an internal part of the `clickhouse-server`, but in both cases configuration is almost the same `.xml` file. The main `clickhouse-keeper` configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
+ClickHouse Keeper can be used as a standalone replacement for ZooKeeper or as an internal part of the ClickHouse server, but in both cases configuration is almost the same `.xml` file. The main ClickHouse Keeper configuration tag is `<keeper_server>`. Keeper configuration has the following parameters:
 
--    `tcp_port` — the port for a client to connect (default for ZooKeeper is `2181`)
--    `tcp_port_secure` — the secure port for a client to connect
--    `server_id` — unique server id, each participant of the clickhouse-keeper cluster must have a unique number (1, 2, 3, and so on)
--    `log_storage_path` — path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper)
--    `snapshot_storage_path` — path to coordination snapshots
+-    `tcp_port` — Port for a client to connect (default for ZooKeeper is `2181`).
+-    `tcp_port_secure` — Secure port for a client to connect.
+-    `server_id` — Unique server id, each participant of the ClickHouse Keeper cluster must have a unique number (1, 2, 3, and so on).
+-    `log_storage_path` — Path to coordination logs, better to store logs on the non-busy device (same for ZooKeeper).
+-    `snapshot_storage_path` — Path to coordination snapshots.
 
-Other common parameters are inherited from clickhouse-server config (`listen_host`, `logger` and so on).
+Other common parameters are inherited from the ClickHouse server config (`listen_host`, `logger`, and so on).
 
 Internal coordination settings are located in `<keeper_server>.<coordination_settings>` section:
 
--    `operation_timeout_ms` — timeout for a single client operation (default: 10000)
--    `session_timeout_ms` — timeout for client session (default: 30000)
--    `dead_session_check_period_ms` — how often clickhouse-keeper check dead sessions and remove them (default: 500)
--    `heart_beat_interval_ms` — how often a clickhouse-keeper leader will send heartbeats to followers (default: 500)
--    `election_timeout_lower_bound_ms` — if follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000)
--    `election_timeout_upper_bound_ms` — if follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000)
--    `rotate_log_storage_interval` — how many log records to store in a single file (default: 100000)
--    `reserved_log_items` — how many coordination log records to store before compaction (default: 100000)
--    `snapshot_distance` — how often clickhouse-keeper will create new snapshots (in the number of records in logs) (default: 100000)
--    `snapshots_to_keep` — how many snapshots to keep (default: 3)
--    `stale_log_gap` — the threshold when leader consider follower as stale and send snapshot to it instead of logs (default: 10000)
--    `fresh_log_gap` - when node became fresh (default: 200)
--    `max_requests_batch_size` - max size of batch in requests count before it will be sent to RAFT (default: 100)
--    `force_sync` — call `fsync` on each write to coordination log (default: true)
--    `quorum_reads` - execute read requests as writes through whole RAFT consesus with similar speed (default: false)
--    `raft_logs_level` — text logging level about coordination (trace, debug, and so on) (default: system default)
--    `auto_forwarding` - allow to forward write requests from followers to leader (default: true)
--    `shutdown_timeout` — wait to finish internal connections and shutdown (ms) (default: 5000)
--    `startup_timeout` — if the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000)
+-    `operation_timeout_ms` — Timeout for a single client operation (ms) (default: 10000).
+-    `session_timeout_ms` — Timeout for client session (ms) (default: 30000).
+-    `dead_session_check_period_ms` — How often ClickHouse Keeper check dead sessions and remove them (ms) (default: 500).
+-    `heart_beat_interval_ms` — How often a ClickHouse Keeper leader will send heartbeats to followers (ms) (default: 500).
+-    `election_timeout_lower_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it can initiate leader election (default: 1000).
+-    `election_timeout_upper_bound_ms` — If the follower didn't receive heartbeats from the leader in this interval, then it must initiate leader election (default: 2000).
+-    `rotate_log_storage_interval` — How many log records to store in a single file (default: 100000).
+-    `reserved_log_items` — How many coordination log records to store before compaction (default: 100000).
+-    `snapshot_distance` — How often ClickHouse Keeper will create new snapshots (in the number of records in logs) (default: 100000).
+-    `snapshots_to_keep` — How many snapshots to keep (default: 3).
+-    `stale_log_gap` — Threshold when leader considers follower as stale and sends the snapshot to it instead of logs (default: 10000).
+-    `fresh_log_gap` — When node became fresh (default: 200).
+-    `max_requests_batch_size` - Max size of batch in requests count before it will be sent to RAFT (default: 100).
+-    `force_sync` — Call `fsync` on each write to coordination log (default: true).
+-    `quorum_reads` — Execute read requests as writes through whole RAFT consensus with similar speed (default: false).
+-    `raft_logs_level` — Text logging level about coordination (trace, debug, and so on) (default: system default).
+-    `auto_forwarding` — Allow to forward write requests from followers to the leader (default: true).
+-    `shutdown_timeout` — Wait to finish internal connections and shutdown (ms) (default: 5000).
+-    `startup_timeout` — If the server doesn't connect to other quorum participants in the specified timeout it will terminate (ms) (default: 30000).
 
 Quorum configuration is located in `<keeper_server>.<raft_configuration>` section and contain servers description. The only parameter for the whole quorum is `secure`, which enables encrypted connection for communication between quorum participants. The main parameters for each `<server>` are:
 
--    `id` — server_id in quorum
--    `hostname` — hostname where this server placed
--    `port` — port where this server listen for connections
+-    `id` — Server identifier in a quorum.
+-    `hostname` — Hostname where this server is placed.
+-    `port` — Port where this server listens for connections.
 
 
 Examples of configuration for quorum with three nodes can be found in [integration tests](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) with `test_keeper_` prefix. Example configuration for server #1:
@@ -94,7 +94,7 @@ Examples of configuration for quorum with three nodes can be found in [integrati
 
 ## How to run
 
-`clickhouse-keeper` is bundled into `clickhouse-server` package, just add configuration of `<keeper_server>` and start clickhouse-server as always. If you want to run standalone `clickhouse-keeper` you can start it in a similar way with:
+ClickHouse Keeper is bundled into the ClickHouse server package, just add configuration of `<keeper_server>` and start ClickHouse server as always. If you want to run standalone ClickHouse Keeper you can start it in a similar way with:
 
 ```bash
 clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
@@ -102,17 +102,18 @@ clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
 
 ## [experimental] Migration from ZooKeeper
 
-Seamlessly migration from ZooKeeper to `clickhouse-keeper` is impossible you have to stop your ZooKeeper cluster, convert data and start `clickhouse-keeper`. `clickhouse-keeper-converter` tool allows to convert ZooKeeper logs and snapshots to `clickhouse-keeper` snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
+Seamlessly migration from ZooKeeper to ClickHouse Keeper is impossible you have to stop your ZooKeeper cluster, convert data and start ClickHouse Keeper. `clickhouse-keeper-converter` tool allows converting ZooKeeper logs and snapshots to ClickHouse Keeper snapshot. It works only with ZooKeeper > 3.4. Steps for migration:
 
 1. Stop all ZooKeeper nodes.
 
-2. [optional, but recommended] Found ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create consistent snapshot.
+2. Optional, but recommended: find ZooKeeper leader node, start and stop it again. It will force ZooKeeper to create a consistent snapshot.
 
-3. Run `clickhouse-keeper-converter` on leader, example
+3. Run `clickhouse-keeper-converter` on a leader, for example:
 
 ```bash
 clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
 ```
 
-4. Copy snapshot to `clickhouse-server` nodes with configured `keeper` or start `clickhouse-keeper` instead of ZooKeeper. Snapshot must persist only on leader node, leader will sync it automatically to other nodes.
+4. Copy snapshot to ClickHouse server nodes with a configured `keeper` or start ClickHouse Keeper instead of ZooKeeper. The snapshot must persist on all nodes, otherwise, empty nodes can be faster and one of them can become a leader.
 
+[Original article](https://clickhouse.com/docs/en/operations/clickhouse-keeper/) <!--hide-->
diff --git a/docs/en/operations/configuration-files.md b/docs/en/operations/configuration-files.md
index 5c942efc77f..f5073afcc23 100644
--- a/docs/en/operations/configuration-files.md
+++ b/docs/en/operations/configuration-files.md
@@ -7,7 +7,7 @@ toc_title: Configuration Files
 
 ClickHouse supports multi-file configuration management. The main server configuration file is `/etc/clickhouse-server/config.xml` or `/etc/clickhouse-server/config.yaml`. Other files must be in the `/etc/clickhouse-server/config.d` directory. Note, that any configuration file can be written either in XML or YAML, but mixing formats in one file is not supported. For example, you can have main configs as `config.xml` and `users.xml` and write additional files in `config.d` and `users.d` directories in `.yaml`.
 
-All the configuration files should be in XML or YAML formats. All XML files should have the same root element, usually `<yandex>`. As for YAML, `yandex:` should not be present, the parser will insert it automatically.
+All XML files should have the same root element, usually `<yandex>`. As for YAML, `yandex:` should not be present, the parser will insert it automatically.
 
 ## Override {#override}
 
@@ -18,9 +18,21 @@ Some settings specified in the main configuration file can be overridden in othe
 -   If `replace` is specified, it replaces the entire element with the specified one.
 -   If `remove` is specified, it deletes the element.
 
+You can also declare attributes as coming from environment variables by using `from_env="VARIABLE_NAME"`:
+
+```xml
+<yandex>
+    <macros>
+        <replica from_env="REPLICA" />
+        <layer from_env="LAYER" />
+        <shard from_env="SHARD" />
+    </macros>
+</yandex>
+```
+
 ## Substitution {#substitution}
 
-The config can also define “substitutions”. If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/yandex/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md)).
+The config can also define “substitutions”. If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/clickhouse/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md#macros)).
 
 If you want to replace an entire element with a substitution use `include` as element name.
 
@@ -144,4 +156,4 @@ For each config file, the server also generates `file-preprocessed.xml` files wh
 
 The server tracks changes in config files, as well as files and ZooKeeper nodes that were used when performing substitutions and overrides, and reloads the settings for users and clusters on the fly. This means that you can modify the cluster, users, and their settings without restarting the server.
 
-[Original article](https://clickhouse.tech/docs/en/operations/configuration-files/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/configuration-files/) <!--hide-->
diff --git a/docs/en/operations/external-authenticators/index.md b/docs/en/operations/external-authenticators/index.md
index aa220f50ef8..13b07b8e51e 100644
--- a/docs/en/operations/external-authenticators/index.md
+++ b/docs/en/operations/external-authenticators/index.md
@@ -13,4 +13,4 @@ The following external authenticators and directories are supported:
 - [LDAP](./ldap.md#external-authenticators-ldap) [Authenticator](./ldap.md#ldap-external-authenticator) and [Directory](./ldap.md#ldap-external-user-directory)
 - Kerberos [Authenticator](./kerberos.md#external-authenticators-kerberos)
 
-[Original article](https://clickhouse.tech/docs/en/operations/external-authenticators/index/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/external-authenticators/index/) <!--hide-->
diff --git a/docs/en/operations/external-authenticators/ldap.md b/docs/en/operations/external-authenticators/ldap.md
index 5a3db6faf55..c33700f0e31 100644
--- a/docs/en/operations/external-authenticators/ldap.md
+++ b/docs/en/operations/external-authenticators/ldap.md
@@ -179,4 +179,4 @@ Note that `my_ldap_server` referred in the `ldap` section inside the `user_direc
         - `attribute` — Attribute name whose values will be returned by the LDAP search. `cn`, by default.
         - `prefix` — Prefix, that will be expected to be in front of each string in the original list of strings returned by the LDAP search. The prefix will be removed from the original strings and the resulting strings will be treated as local role names. Empty by default.
 
-[Original article](https://clickhouse.tech/docs/en/operations/external-authenticators/ldap/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/external-authenticators/ldap/) <!--hide-->
diff --git a/docs/en/operations/index.md b/docs/en/operations/index.md
index 3364598ebc2..b78633f2d6b 100644
--- a/docs/en/operations/index.md
+++ b/docs/en/operations/index.md
@@ -23,4 +23,4 @@ ClickHouse operations manual consists of the following major sections:
 -   [Settings](../operations/settings/index.md)
 -   [Utilities](../operations/utilities/index.md)
 
-{## [Original article](https://clickhouse.tech/docs/en/operations/) ##}
+{## [Original article](https://clickhouse.com/docs/en/operations/) ##}
diff --git a/docs/en/operations/opentelemetry.md b/docs/en/operations/opentelemetry.md
index 74c9c6dd18f..6dac8736372 100644
--- a/docs/en/operations/opentelemetry.md
+++ b/docs/en/operations/opentelemetry.md
@@ -61,4 +61,4 @@ FROM system.opentelemetry_span_log
 
 In case of any errors, the part of the log data for which the error has occurred will be silently lost. Check the server log for error messages if the data does not arrive.
 
-[Original article](https://clickhouse.tech/docs/en/operations/opentelemetry/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/opentelemetry/) <!--hide-->
diff --git a/docs/en/operations/performance-test.md b/docs/en/operations/performance-test.md
index d6d9cdb55cc..2880793962a 100644
--- a/docs/en/operations/performance-test.md
+++ b/docs/en/operations/performance-test.md
@@ -25,7 +25,7 @@ chmod a+x ./hardware.sh
 
 3. Copy the output and send it to clickhouse-feedback@yandex-team.com
 
-All the results are published here: https://clickhouse.tech/benchmark/hardware/
+All the results are published here: https://clickhouse.com/benchmark/hardware/
 
 
 ## Manual Run
@@ -35,9 +35,9 @@ Alternatively you can perform benchmark in the following steps.
 1.  ssh to the server and download the binary with wget:
 ```bash
 # For amd64:
-wget https://builds.clickhouse.tech/master/amd64/clickhouse
+wget https://builds.clickhouse.com/master/amd64/clickhouse
 # For aarch64:
-wget https://builds.clickhouse.tech/master/aarch64/clickhouse
+wget https://builds.clickhouse.com/master/aarch64/clickhouse
 # Then do:
 chmod a+x clickhouse
 ```
@@ -49,7 +49,7 @@ wget https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/benchmark/cl
 ```
 3.  Download test data according to the [Yandex.Metrica dataset](../getting-started/example-datasets/metrica.md) instruction (“hits” table containing 100 million rows).
 ```bash
-wget https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz
+wget https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz
 tar xvf hits_100m_obfuscated_v1.tar.xz -C .
 mv hits_100m_obfuscated_v1/* .
 ```
@@ -68,4 +68,4 @@ mv hits_100m_obfuscated_v1/* .
 ```
 7.  Send the numbers and the info about your hardware configuration to clickhouse-feedback@yandex-team.com
 
-All the results are published here: https://clickhouse.tech/benchmark/hardware/
+All the results are published here: https://clickhouse.com/benchmark/hardware/
diff --git a/docs/en/operations/quotas.md b/docs/en/operations/quotas.md
index bbea735cdba..eec8961b595 100644
--- a/docs/en/operations/quotas.md
+++ b/docs/en/operations/quotas.md
@@ -117,4 +117,4 @@ For distributed query processing, the accumulated amounts are stored on the requ
 
 When the server is restarted, quotas are reset.
 
-[Original article](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/en/operations/server-configuration-parameters/index.md b/docs/en/operations/server-configuration-parameters/index.md
index 02bbe7362cf..a95d198bd0d 100644
--- a/docs/en/operations/server-configuration-parameters/index.md
+++ b/docs/en/operations/server-configuration-parameters/index.md
@@ -14,4 +14,4 @@ Other settings are described in the “[Settings](../../operations/settings/inde
 
 Before studying the settings, read the [Configuration files](../../operations/configuration-files.md#configuration_files) section and note the use of substitutions (the `incl` and `optional` attributes).
 
-[Original article](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index aedd1c107c4..8bb50144180 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -45,7 +45,7 @@ Configuration template:
 -   `min_part_size` – The minimum size of a data part.
 -   `min_part_size_ratio` – The ratio of the data part size to the table size.
 -   `method` – Compression method. Acceptable values: `lz4`, `lz4hc`, `zstd`.
--   `level` – Compression level. See [Codecs](../../sql-reference/statements/create/table/#create-query-general-purpose-codecs).
+-   `level` – Compression level. See [Codecs](../../sql-reference/statements/create/table.md#create-query-general-purpose-codecs).
 
 You can configure multiple `<case>` sections.
 
@@ -69,28 +69,89 @@ If no conditions met for a data part, ClickHouse uses the `lz4` compression.
 </compression>
 ```
 
+<!--
+
 ## encryption {#server-settings-encryption}
 
-Configures a command to obtain a key to be used by [encryption codecs](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). The command, or a shell script, is expected to write a Base64-encoded key of any length to the stdout.
+Configures a command to obtain a key to be used by [encryption codecs](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). Key (or keys) should be written in environment variables or set in the configuration file.
+
+Keys can be hex or string with a length equal to 16 bytes.
 
 **Example**
 
-For Linux with systemd:
+Loading from config:
 
 ```xml
-<encryption>
-    <key_command>/usr/bin/systemd-ask-password --id="clickhouse-server" --timeout=0 "Enter the ClickHouse encryption passphrase:" | base64</key_command>
-</encryption>
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key>1234567812345678</key>
+    </aes_128_gcm_siv>
+</encryption_codecs>
 ```
 
-For other systems:
+!!! note "NOTE"
+    Storing keys in the configuration file is not recommended. It isn't secure. You can move the keys into a separate config file on a secure disk and put a symlink to that config file to `config.d/` folder.
+
+Loading from config, when the key is in hex:
 
 ```xml
-<encryption>
-    <key_command><![CDATA[IFS=; echo -n >/dev/tty "Enter the ClickHouse encryption passphrase: "; stty=`stty -F /dev/tty -g`; stty -F /dev/tty -echo; read k </dev/tty; stty -F /dev/tty "$stty"; echo -n $k | base64]]></key_command>
-</encryption>
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex>00112233445566778899aabbccddeeff</key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
 ```
 
+Loading key from the environment variable:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex from_env="KEY"></key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Here `current_key_id` sets the current key for encryption, and all specified keys can be used for decryption.
+
+Each of these methods can be applied for multiple keys:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+        <key_hex id="1" from_env=".."></key_hex>
+        <current_key_id>1</current_key_id>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Here `current_key_id` shows current key for encryption.
+
+Also, users can add nonce that must be 12 bytes long (by default encryption and decryption processes use nonce that consists of zero bytes):
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce>012345678910</nonce>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Or it can be set in hex:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce_hex>abcdefabcdef</nonce_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Everything mentioned above can be applied for `aes_256_gcm_siv` (but the key must be 32 bytes long).
+
+-->
+
 ## custom_settings_prefixes {#custom_settings_prefixes}
 
 List of prefixes for [custom settings](../../operations/settings/index.md#custom_settings). The prefixes must be separated with commas.
@@ -125,6 +186,7 @@ Default value: `1073741824` (1 GB).
     <size_limit>1073741824</size_limit>
 </core_dump>
 ```
+
 ## database_atomic_delay_before_drop_table_sec {#database_atomic_delay_before_drop_table_sec}
 
 Sets the delay before remove table data in seconds. If the query has `SYNC` modifier, this setting is ignored.
@@ -307,6 +369,15 @@ Opens `https://tabix.io/` when accessing `http://localhost: http_port`.
 <http_server_default_response>
   <![CDATA[<html ng-app="SMI2"><head><base href="http://ui.tabix.io/"></head><body><div ui-view="" class="content-ui"></div><script src="http://loader.tabix.io/master.js"></script></body></html>]]>
 </http_server_default_response>
+```  
+## hsts_max_age  
+  
+Expired time for HSTS in seconds. The default value is 0 means clickhouse disabled HSTS. If you set a positive number, the HSTS will be enabled and the max-age is the number you set.  
+  
+**Example**  
+
+```xml
+<hsts_max_age>600000</hsts_max_age>
 ```
 
 ## include_from {#server_configuration_parameters-include_from}
@@ -389,12 +460,12 @@ This section contains the following parameters:
 
 ## keep_alive_timeout {#keep-alive-timeout}
 
-The number of seconds that ClickHouse waits for incoming requests before closing the connection. Defaults to 3 seconds.
+The number of seconds that ClickHouse waits for incoming requests before closing the connection. Defaults to 10 seconds.
 
 **Example**
 
 ``` xml
-<keep_alive_timeout>3</keep_alive_timeout>
+<keep_alive_timeout>10</keep_alive_timeout>
 ```
 
 ## listen_host {#server_configuration_parameters-listen_host}
@@ -408,6 +479,30 @@ Examples:
 <listen_host>127.0.0.1</listen_host>
 ```
 
+## listen_backlog {#server_configuration_parameters-listen_backlog}
+
+Backlog (queue size of pending connections) of the listen socket.
+
+Default value: `4096` (as in linux [5.4+](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=19f92a030ca6d772ab44b22ee6a01378a8cb32d4)).
+
+Usually this value does not need to be changed, since:
+- default value is large enough,
+- and for accepting client's connections server has separate thread.
+
+So even if you have `TcpExtListenOverflows` (from `nstat`) non zero and this
+counter grows for ClickHouse server it does not mean that this value need to be
+increased, since:
+- usually if 4096 is not enough it shows some internal ClickHouse scaling
+  issue, so it is better to report an issue.
+- and it does not mean that the server can handle more connections later (and
+  even if it can, clients can already goes away / disconnect).
+
+Examples:
+
+``` xml
+<listen_backlog>4096</listen_backlog>
+```
+
 ## logger {#server_configuration_parameters-logger}
 
 Logging settings.
@@ -485,7 +580,7 @@ Parameter substitutions for replicated tables.
 
 Can be omitted if replicated tables are not used.
 
-For more information, see the section “[Creating replicated tables](../../engines/table-engines/mergetree-family/replication.md)”.
+For more information, see the section [Creating replicated tables](../../engines/table-engines/mergetree-family/replication.md#creating-replicated-tables).
 
 **Example**
 
@@ -534,7 +629,7 @@ Possible values:
 -   Positive double.
 -   0 — The ClickHouse server can use all available RAM.
 
-Default value: `0`.
+Default value: `0.9`.
 
 **Usage**
 
@@ -552,7 +647,7 @@ On hosts with low RAM and swap, you possibly need setting `max_server_memory_usa
 
 ## max_concurrent_queries {#max-concurrent-queries}
 
-The maximum number of simultaneously processed queries related to MergeTree table. Queries may be limited by other settings: [max_concurrent_queries_for_all_users](#max-concurrent-queries-for-all-users), [min_marks_to_honor_max_concurrent_queries](#min-marks-to-honor-max-concurrent-queries).
+The maximum number of simultaneously processed queries related to MergeTree table. Queries may be limited by other settings: [max_concurrent_queries_for_user](#max-concurrent-queries-for-user), [max_concurrent_queries_for_all_users](#max-concurrent-queries-for-all-users), [min_marks_to_honor_max_concurrent_queries](#min-marks-to-honor-max-concurrent-queries).
 
 !!! info "Note"
 	These settings can be modified at runtime and will take effect immediately. Queries that are already running will remain unchanged.
@@ -568,6 +663,21 @@ Possible values:
 <max_concurrent_queries>100</max_concurrent_queries>
 ```
 
+## max_concurrent_queries_for_user {#max-concurrent-queries-for-user}
+
+The maximum number of simultaneously processed queries related to MergeTree table per user.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Disabled.
+
+**Example**
+
+``` xml
+<max_concurrent_queries_for_user>5</max_concurrent_queries_for_user>
+```
+
 ## max_concurrent_queries_for_all_users {#max-concurrent-queries-for-all-users}
 
 Throw exception if the value of this setting is less or equal than the current number of simultaneously processed queries.
@@ -804,7 +914,7 @@ Use the following parameters to configure logging:
 
 The path to the directory containing data.
 
-!!! note "Note"
+!!! warning "Warning"
     The trailing slash is mandatory.
 
 **Example**
@@ -891,6 +1001,33 @@ If the table does not exist, ClickHouse will create it. If the structure of the
 </query_thread_log>
 ```
 
+## query_views_log {#server_configuration_parameters-query_views_log}
+
+Setting for logging views (live, materialized etc) dependant of queries received with the [log_query_views=1](../../operations/settings/settings.md#settings-log-query-views) setting.
+
+Queries are logged in the [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) table, not in a separate file. You can change the name of the table in the `table` parameter (see below).
+
+Use the following parameters to configure logging:
+
+-   `database` – Name of the database.
+-   `table` – Name of the system table the queries will be logged in.
+-   `partition_by` — [Custom partitioning key](../../engines/table-engines/mergetree-family/custom-partitioning-key.md) for a system table. Can't be used if `engine` defined.
+-   `engine` - [MergeTree Engine Definition](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) for a system table. Can't be used if `partition_by` defined.
+-   `flush_interval_milliseconds` – Interval for flushing data from the buffer in memory to the table.
+
+If the table does not exist, ClickHouse will create it. If the structure of the query views log changed when the ClickHouse server was updated, the table with the old structure is renamed, and a new table is created automatically.
+
+**Example**
+
+``` xml
+<query_views_log>
+    <database>system</database>
+    <table>query_views_log</table>
+    <partition_by>toYYYYMM(event_date)</partition_by>
+    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+</query_views_log>
+```
+
 ## text_log {#server_configuration_parameters-text_log}
 
 Settings for the [text_log](../../operations/system-tables/text_log.md#system_tables-text_log) system table for logging text messages.
@@ -946,8 +1083,7 @@ The default server configuration file `config.xml` contains the following settin
 
 Regexp-based rules, which will be applied to queries as well as all log messages before storing them in server logs,
 `system.query_log`, `system.text_log`, `system.processes` tables, and in logs sent to the client. That allows preventing
-sensitive data leakage from SQL queries (like names, emails, personal
-identifiers or credit card numbers) to logs.
+sensitive data leakage from SQL queries (like names, emails, personal identifiers or credit card numbers) to logs.
 
 **Example**
 
@@ -1045,7 +1181,7 @@ Example
 
 Path to temporary data for processing large queries.
 
-!!! note "Note"
+!!! warning "Note"
     The trailing slash is mandatory.
 
 **Example**
@@ -1062,9 +1198,9 @@ If not set, [tmp_path](#tmp-path) is used, otherwise it is ignored.
 
 !!! note "Note"
     - `move_factor` is ignored.
-- `keep_free_space_bytes` is ignored.
-- `max_data_part_size_bytes` is ignored.
-- Уou must have exactly one volume in that policy.
+    - `keep_free_space_bytes` is ignored.
+    - `max_data_part_size_bytes` is ignored.
+    - Уou must have exactly one volume in that policy.
 
 ## uncompressed_cache_size {#server-settings-uncompressed_cache_size}
 
@@ -1128,9 +1264,10 @@ This section contains the following parameters:
 
       The `index` attribute specifies the node order when trying to connect to the ZooKeeper cluster.
 
--   `session_timeout` — Maximum timeout for the client session in milliseconds.
--   `root` — The [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes) that is used as the root for znodes used by the ClickHouse server. Optional.
--   `identity` — User and password, that can be required by ZooKeeper to give access to requested znodes. Optional.
+- `session_timeout_ms` — Maximum timeout for the client session in milliseconds.
+- `operation_timeout_ms` — Maximum timeout for one operation in milliseconds.
+- `root` — The [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes) that is used as the root for znodes used by the ClickHouse server. Optional.
+- `identity` — User and password, that can be required by ZooKeeper to give access to requested znodes. Optional.
 
 **Example configuration**
 
@@ -1204,6 +1341,39 @@ The update is performed asynchronously, in a separate system thread.
 
 -   [background_schedule_pool_size](../../operations/settings/settings.md#background_schedule_pool_size)
 
+## distributed_ddl {#server-settings-distributed_ddl}
+
+Manage executing [distributed ddl queries](../../sql-reference/distributed-ddl.md)  (CREATE, DROP, ALTER, RENAME) on cluster.
+Works only if [ZooKeeper](#server-settings_zookeeper) is enabled.
+
+**Example**
+
+```xml
+<distributed_ddl>
+    <!-- Path in ZooKeeper to queue with DDL queries -->
+    <path>/clickhouse/task_queue/ddl</path>
+
+    <!-- Settings from this profile will be used to execute DDL queries -->
+    <profile>default</profile>
+
+    <!-- Controls how much ON CLUSTER queries can be run simultaneously. -->
+    <pool_size>1</pool_size>
+
+    <!--
+         Cleanup settings (active tasks will not be removed)
+    -->
+
+    <!-- Controls task TTL (default 1 week) -->
+    <task_max_lifetime>604800</task_max_lifetime>
+
+    <!-- Controls how often cleanup should be performed (in seconds) -->
+    <cleanup_delay_period>60</cleanup_delay_period>
+
+    <!-- Controls how many tasks could be in the queue -->
+    <max_tasks_in_queue>1000</max_tasks_in_queue>
+</distributed_ddl>
+```
+
 ## access_control_path {#access_control_path}
 
 Path to a folder where a ClickHouse server stores user and role configurations created by SQL commands.
@@ -1212,19 +1382,20 @@ Default value: `/var/lib/clickhouse/access/`.
 
 **See also**
 
--   [Access Control and Account Management](../../operations/access-rights.md#access-control)
+- [Access Control and Account Management](../../operations/access-rights.md#access-control)
 
 ## user_directories {#user_directories}
 
 Section of the configuration file that contains settings:
 -   Path to configuration file with predefined users.
 -   Path to folder where users created by SQL commands are stored.
+-   ZooKeeper node path where users created by SQL commands are stored and replicated (experimental).
 
 If this section is specified, the path from [users_config](../../operations/server-configuration-parameters/settings.md#users-config) and [access_control_path](../../operations/server-configuration-parameters/settings.md#access_control_path) won't be used.
 
 The `user_directories` section can contain any number of items, the order of the items means their precedence (the higher the item the higher the precedence).
 
-**Example**
+**Examples**
 
 ``` xml
 <user_directories>
@@ -1237,7 +1408,20 @@ The `user_directories` section can contain any number of items, the order of the
 </user_directories>
 ```
 
-You can also specify settings `memory` — means storing information only in memory, without writing to disk, and `ldap` — means storing information on an LDAP server.
+Users, roles, row policies, quotas, and profiles can be also stored in ZooKeeper:
+
+``` xml
+<user_directories>
+    <users_xml>
+        <path>/etc/clickhouse-server/users.xml</path>
+    </users_xml>
+    <replicated>
+        <zookeeper_path>/clickhouse/access/</zookeeper_path>
+    </replicated>
+</user_directories>
+```
+
+You can also define sections `memory` — means storing information only in memory, without writing to disk, and `ldap` — means storing information on an LDAP server.
 
 To add an LDAP server as a remote user directory of users that are not defined locally, define a single `ldap` section with a following parameters:
 -   `server` — one of LDAP server names defined in `ldap_servers` config section. This parameter is mandatory and cannot be empty.
@@ -1255,4 +1439,4 @@ To add an LDAP server as a remote user directory of users that are not defined l
 </ldap>
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/en/operations/settings/constraints-on-settings.md b/docs/en/operations/settings/constraints-on-settings.md
index 2fe75aaad58..338949c5a6a 100644
--- a/docs/en/operations/settings/constraints-on-settings.md
+++ b/docs/en/operations/settings/constraints-on-settings.md
@@ -70,4 +70,4 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **Note:** the `default` profile has special handling: all the constraints defined for the `default` profile become the default constraints, so they restrict all the users until they’re overridden explicitly for these users.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/en/operations/settings/index.md b/docs/en/operations/settings/index.md
index b5dcef932e8..f2a6bfc515a 100644
--- a/docs/en/operations/settings/index.md
+++ b/docs/en/operations/settings/index.md
@@ -55,4 +55,4 @@ SELECT getSetting('custom_a');
 
 -   [Server Configuration Settings](../../operations/server-configuration-parameters/settings.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index 65d63438aea..a3a258234e1 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -181,6 +181,44 @@ Possible values:
 
 Default value: 0.
 
+## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches. This setting is applied to a particular table, unlike the [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server) setting, which is applied to the server.
+
+You can limit both server network and network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_fetches_network_bandwidth_for_server` setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating data to add or replace new nodes.
+
+## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends. This setting is applied to a particular table, unlike the [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server) setting, which is applied to the server.
+
+You can limit both server network and network for a particular table, but for this the value of the table-level setting should be less than server-level one. Otherwise the server considers only the `max_replicated_sends_network_bandwidth_for_server` setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating data to add or replace new nodes.
+
 ## old_parts_lifetime {#old-parts-lifetime}
 
 The time (in seconds) of storing inactive parts to protect against data loss during spontaneous server reboots.
diff --git a/docs/en/operations/settings/permissions-for-queries.md b/docs/en/operations/settings/permissions-for-queries.md
index 2ab13216d9e..47551f288bb 100644
--- a/docs/en/operations/settings/permissions-for-queries.md
+++ b/docs/en/operations/settings/permissions-for-queries.md
@@ -56,4 +56,4 @@ You can’t execute `SET allow_ddl = 1` if `allow_ddl = 0` for the current sessi
 
 Default value: 1
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 236359bfe55..3287caacdf8 100644
--- a/docs/en/operations/settings/query-complexity.md
+++ b/docs/en/operations/settings/query-complexity.md
@@ -312,4 +312,4 @@ When inserting data, ClickHouse calculates the number of partitions in the inser
 
 > “Too many partitions for single INSERT block (more than” + toString(max_parts) + “). The limit is controlled by ‘max_partitions_per_insert_block’ setting. A large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).”
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/en/operations/settings/settings-profiles.md b/docs/en/operations/settings/settings-profiles.md
index c7a01466462..1939b21bfc3 100644
--- a/docs/en/operations/settings/settings-profiles.md
+++ b/docs/en/operations/settings/settings-profiles.md
@@ -76,4 +76,4 @@ The `default` profile has a special purpose: it must always be present and is ap
 
 The `web` profile is a regular profile that can be set using the `SET` query or using a URL parameter in an HTTP query.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/en/operations/settings/settings-users.md b/docs/en/operations/settings/settings-users.md
index 2c8315ad069..1a1d2e2a0fa 100644
--- a/docs/en/operations/settings/settings-users.md
+++ b/docs/en/operations/settings/settings-users.md
@@ -159,4 +159,4 @@ The following configuration forces that user `user1` can only see the rows of `t
 
 The `filter` can be any expression resulting in a [UInt8](../../sql-reference/data-types/int-uint.md)-type value. It usually contains comparisons and logical operators. Rows from `database_name.table1` where filter results to 0 are not returned for this user. The filtering is incompatible with `PREWHERE` operations and disables `WHERE→PREWHERE` optimization.
 
-[Original article](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index 689798d9519..46806d7d101 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -93,6 +93,17 @@ Works with tables in the MergeTree family.
 
 If `force_primary_key=1`, ClickHouse checks to see if the query has a primary key condition that can be used for restricting data ranges. If there is no suitable condition, it throws an exception. However, it does not check whether the condition reduces the amount of data to read. For more information about data ranges in MergeTree tables, see [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md).
 
+## use_skip_indexes {#settings-use_skip_indexes}
+
+Use data skipping indexes during query execution.
+
+Possible values:
+
+-   0 — Disabled.
+-   1 — Enabled.
+
+Default value: 1.
+
 ## force_data_skipping_indices {#settings-force_data_skipping_indices}
 
 Disables query execution if passed data skipping indices wasn't used.
@@ -132,6 +143,21 @@ Enables or disables [fsync](http://pubs.opengroup.org/onlinepubs/9699919799/func
 
 It makes sense to disable it if the server has millions of tiny tables that are constantly being created and destroyed.
 
+## function_range_max_elements_in_block {#settings-function_range_max_elements_in_block}
+
+Sets the safety threshold for data volume generated by function [range](../../sql-reference/functions/array-functions.md#range). Defines the maximum number of values generated by function per block of data (sum of array sizes for every row in a block).
+
+Possible values:
+
+-   Positive integer.
+
+Default value: `500,000,000`.
+
+**See Also**
+
+-   [max_block_size](#setting-max_block_size)
+-   [min_insert_block_size_rows](#min-insert-block-size-rows)
+
 ## enable_http_compression {#settings-enable_http_compression}
 
 Enables or disables data compression in the response to an HTTP request.
@@ -245,6 +271,39 @@ If an error occurred while reading rows but the error counter is still less than
 
 If both `input_format_allow_errors_num` and `input_format_allow_errors_ratio` are exceeded, ClickHouse throws an exception.
 
+## input_format_parquet_import_nested {#input_format_parquet_import_nested}
+
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [Parquet](../../interfaces/formats.md#data-format-parquet) input format.
+
+Possible values:
+
+-   0 — Data can not be inserted into `Nested` columns as an array of structs.
+-   1 — Data can be inserted into `Nested` columns as an array of structs.
+
+Default value: `0`.
+
+## input_format_arrow_import_nested {#input_format_arrow_import_nested}
+
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [Arrow](../../interfaces/formats.md#data_types-matching-arrow) input format.
+
+Possible values:
+
+-   0 — Data can not be inserted into `Nested` columns as an array of structs.
+-   1 — Data can be inserted into `Nested` columns as an array of structs.
+
+Default value: `0`.
+
+## input_format_orc_import_nested {#input_format_orc_import_nested}
+
+Enables or disables the ability to insert the data into [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) columns as an array of structs in [ORC](../../interfaces/formats.md#data-format-orc) input format.
+
+Possible values:
+
+-   0 — Data can not be inserted into `Nested` columns as an array of structs.
+-   1 — Data can be inserted into `Nested` columns as an array of structs.
+
+Default value: `0`.
+
 ## input_format_values_interpret_expressions {#settings-input_format_values_interpret_expressions}
 
 Enables or disables the full SQL parser if the fast stream parser can’t parse the data. This setting is used only for the [Values](../../interfaces/formats.md#data-format-values) format at the data insertion. For more information about syntax parsing, see the [Syntax](../../sql-reference/syntax.md) section.
@@ -762,12 +821,32 @@ If ClickHouse should read more than `merge_tree_max_bytes_to_use_cache` bytes in
 
 The cache of uncompressed blocks stores data extracted for queries. ClickHouse uses this cache to speed up responses to repeated small queries. This setting protects the cache from trashing by queries that read a large amount of data. The [uncompressed_cache_size](../../operations/server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) server setting defines the size of the cache of uncompressed blocks.
 
-Possible value:
+Possible values:
 
 -   Any positive integer.
 
 Default value: 2013265920.
 
+## merge_tree_clear_old_temporary_directories_interval_seconds {#setting-merge-tree-clear-old-temporary-directories-interval-seconds}
+
+Sets the interval in seconds for ClickHouse to execute the cleanup of old temporary directories.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: `60` seconds.
+
+## merge_tree_clear_old_parts_interval_seconds {#setting-merge-tree-clear-old-parts-interval-seconds}
+
+Sets the interval in seconds for ClickHouse to execute the cleanup of old parts, WALs, and mutations.
+
+Possible values:
+
+-   Any positive integer.
+
+Default value: `1` second.
+
 ## min_bytes_to_use_direct_io {#settings-min-bytes-to-use-direct-io}
 
 The minimum data volume required for using direct I/O access to the storage disk.
@@ -855,7 +934,7 @@ log_queries_min_type='EXCEPTION_WHILE_PROCESSING'
 
 Setting up query threads logging.
 
-Queries’ threads runned by ClickHouse with this setup are logged according to the rules in the [query_thread_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query_thread_log) server configuration parameter.
+Queries’ threads run by ClickHouse with this setup are logged according to the rules in the [query_thread_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query_thread_log) server configuration parameter.
 
 Example:
 
@@ -863,6 +942,19 @@ Example:
 log_query_threads=1
 ```
 
+## log_query_views {#settings-log-query-views}
+
+Setting up query views logging.
+
+When a query run by ClickHouse with this setup on has associated views (materialized or live views), they are logged in the [query_views_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query_views_log) server configuration parameter.
+
+Example:
+
+``` text
+log_query_views=1
+```
+
+
 ## log_comment {#settings-log-comment}
 
 Specifies the value for the `log_comment` field of the [system.query_log](../system-tables/query_log.md) table and comment text for the server log.
@@ -1059,6 +1151,40 @@ Possible values:
 
 Default value: `5`.
 
+## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) fetches for the server. Only has meaning at server startup. You can also limit the speed for a particular table with [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth) setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
+## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
+
+Limits the maximum speed of data exchange over the network in bytes per second for [replicated](../../engines/table-engines/mergetree-family/replication.md) sends for the server. Only has meaning at server startup.  You can also limit the speed for a particular table with [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth) setting.
+
+The setting isn't followed perfectly accurately.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Unlimited.
+
+Default value: `0`.
+
+**Usage**
+
+Could be used for throttling speed when replicating the data to add or replace new nodes.
+
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 The timeout in milliseconds for connecting to a remote server for a Distributed table engine, if the ‘shard’ and ‘replica’ sections are used in the cluster definition.
@@ -1625,9 +1751,11 @@ Do not merge aggregation states from different servers for distributed query pro
 
 Possible values:
 
--   0 — Disabled (final query processing is done on the initiator node).
--   1 - Do not merge aggregation states from different servers for distributed query processing (query completelly processed on the shard, initiator only proxy the data), can be used in case it is for certain that there are different keys on different shards.
--   2 - Same as `1` but applies `ORDER BY` and `LIMIT` (it is not possible when the query processed completelly on the remote node, like for `distributed_group_by_no_merge=1`) on the initiator (can be used for queries with `ORDER BY` and/or `LIMIT`).
+-   `0` — Disabled (final query processing is done on the initiator node).
+-   `1` - Do not merge aggregation states from different servers for distributed query processing (query completelly processed on the shard, initiator only proxy the data), can be used in case it is for certain that there are different keys on different shards.
+-   `2` - Same as `1` but applies `ORDER BY` and `LIMIT` (it is not possible when the query processed completelly on the remote node, like for `distributed_group_by_no_merge=1`) on the initiator (can be used for queries with `ORDER BY` and/or `LIMIT`).
+
+Default value: `0`
 
 **Example**
 
@@ -1658,19 +1786,33 @@ FORMAT PrettyCompactMonoBlock
 └───────┘
 ```
 
-Default value: 0
+## distributed_push_down_limit {#distributed-push-down-limit}
 
-## distributed_push_down_limit (#distributed-push-down-limit}
+Enables or disables [LIMIT](#limit) applying on each shard separatelly.
 
-LIMIT will be applied on each shard separatelly. Usually you don't need to use it, since this will be done automatically if it is possible, i.e. for simple query SELECT FROM LIMIT.
+This will allow to avoid:
+-  Sending extra rows over network;
+-  Processing rows behind the limit on the initiator.
+
+Starting from 21.9 version you cannot get inaccurate results anymore, since `distributed_push_down_limit` changes query execution only if at least one of the conditions met:
+-  [distributed_group_by_no_merge](#distributed-group-by-no-merge) > 0.
+-  Query **does not have** `GROUP BY`/`DISTINCT`/`LIMIT BY`, but it has `ORDER BY`/`LIMIT`.
+-  Query **has** `GROUP BY`/`DISTINCT`/`LIMIT BY` with `ORDER BY`/`LIMIT` and:
+    -  [optimize_skip_unused_shards](#optimize-skip-unused-shards) is enabled.
+    -  [optimize_distributed_group_by_sharding_key](#optimize-distributed-group-by-sharding-key) is enabled.
 
 Possible values:
 
--  0 - Disabled
--  1 - Enabled
+-  0 — Disabled.
+-  1 — Enabled.
 
-!!! note "Note"
-    That with this setting the result of the query may be inaccurate.
+Default value: `1`.
+
+See also:
+
+-   [distributed_group_by_no_merge](#distributed-group-by-no-merge)
+-   [optimize_skip_unused_shards](#optimize-skip-unused-shards)
+-   [optimize_distributed_group_by_sharding_key](#optimize-distributed-group-by-sharding-key)
 
 ## optimize_skip_unused_shards_limit {#optimize-skip-unused-shards-limit}
 
@@ -1682,7 +1824,7 @@ Default value: 1000
 
 ## optimize_skip_unused_shards {#optimize-skip-unused-shards}
 
-Enables or disables skipping of unused shards for [SELECT](../../sql-reference/statements/select/index.md) queries that have sharding key condition in `WHERE/PREWHERE` (assuming that the data is distributed by sharding key, otherwise does nothing).
+Enables or disables skipping of unused shards for [SELECT](../../sql-reference/statements/select/index.md) queries that have sharding key condition in `WHERE/PREWHERE` (assuming that the data is distributed by sharding key, otherwise a query yields incorrect result).
 
 Possible values:
 
@@ -1778,6 +1920,7 @@ Default value: 0
 See also:
 
 -   [distributed_group_by_no_merge](#distributed-group-by-no-merge)
+-   [distributed_push_down_limit](#distributed-push-down-limit)
 -   [optimize_skip_unused_shards](#optimize-skip-unused-shards)
 
 !!! note "Note"
@@ -1818,6 +1961,21 @@ Possible values:
 
 Default value: `0`.
 
+## optimize_trivial_count_query {#optimize-trivial-count-query}
+
+Enables or disables the optimization to trivial query `SELECT count() FROM table` using metadata from MergeTree. If you need to use row-level security, disable this setting.
+
+Possible values:
+
+   - 0 — Optimization disabled.
+   - 1 — Optimization enabled.
+   
+Default value: `1`.
+
+See also:
+
+-   [optimize_functions_to_subcolumns](#optimize-functions-to-subcolumns)
+
 ## distributed_replica_error_half_life {#settings-distributed_replica_error_half_life}
 
 -   Type: seconds
@@ -1993,10 +2151,25 @@ Default value: 0.
 
 ## input_format_parallel_parsing {#input-format-parallel-parsing}
 
--   Type: bool
--   Default value: True
+Enables or disables order-preserving parallel parsing of data formats. Supported only for [TSV](../../interfaces/formats.md#tabseparated), [TKSV](../../interfaces/formats.md#tskv), [CSV](../../interfaces/formats.md#csv) and [JSONEachRow](../../interfaces/formats.md#jsoneachrow) formats.
 
-Enable order-preserving parallel parsing of data formats. Supported only for TSV, TKSV, CSV, and JSONEachRow formats.
+Possible values:
+
+-   1 — Enabled.
+-   0 — Disabled.
+
+Default value: `0`.
+
+## output_format_parallel_formatting {#output-format-parallel-formatting}
+
+Enables or disables parallel formatting of data formats. Supported only for [TSV](../../interfaces/formats.md#tabseparated), [TKSV](../../interfaces/formats.md#tskv), [CSV](../../interfaces/formats.md#csv) and [JSONEachRow](../../interfaces/formats.md#jsoneachrow) formats.
+
+Possible values:
+
+-   1 — Enabled.
+-   0 — Disabled.
+
+Default value: `0`.
 
 ## min_chunk_bytes_for_parallel_parsing {#min-chunk-bytes-for-parallel-parsing}
 
@@ -2703,6 +2876,43 @@ Possible values:
 
 Default value: `1`.
 
+## output_format_csv_null_representation {#output_format_csv_null_representation}
+
+Defines the representation of `NULL` for [CSV](../../interfaces/formats.md#csv) output format. User can set any string as a value, for example, `My NULL`.
+
+Default value: `\N`.
+
+**Examples**
+
+Query
+
+```sql
+SELECT * from csv_custom_null FORMAT CSV;
+```
+
+Result
+
+```text
+788
+\N
+\N
+```
+
+Query
+
+```sql
+SET output_format_csv_null_representation = 'My NULL';
+SELECT * FROM csv_custom_null FORMAT CSV;
+```
+
+Result
+
+```text
+788
+My NULL
+My NULL
+```
+
 ## output_format_tsv_null_representation {#output_format_tsv_null_representation}
 
 Defines the representation of `NULL` for [TSV](../../interfaces/formats.md#tabseparated) output format. User can set any string as a value, for example, `My NULL`.
@@ -3176,7 +3386,7 @@ Result:
 └─────┘
 ```
 
-## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+## optimize_syntax_fuse_functions {#optimize_syntax_fuse_functions}
 
 Enables to fuse aggregate functions with identical argument. It rewrites query contains at least two aggregate functions from [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum), [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) or [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) with identical argument to [sumCount](../../sql-reference/aggregate-functions/reference/sumcount.md#agg_function-sumCount).
 
@@ -3193,7 +3403,7 @@ Query:
 
 ``` sql
 CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
-SET optimize_fuse_sum_count_avg = 1;
+SET optimize_syntax_fuse_functions = 1;
 EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
 ```
 
@@ -3345,3 +3555,362 @@ Possible values:
 -   1 — The `LowCardinality` type is converted to the `DICTIONARY` type.
 
 Default value: `0`.
+
+## materialized_postgresql_max_block_size {#materialized-postgresql-max-block-size}
+
+Sets the number of rows collected in memory before flushing data into PostgreSQL database table.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: `65536`.
+
+## materialized_postgresql_tables_list {#materialized-postgresql-tables-list}
+
+Sets a comma-separated list of PostgreSQL database tables, which will be replicated via [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md) database engine.
+
+Default value: empty list — means whole PostgreSQL database will be replicated.
+
+## materialized_postgresql_allow_automatic_update {#materialized-postgresql-allow-automatic-update}
+
+Allows reloading table in the background, when schema changes are detected. DDL queries on the PostgreSQL side are not replicated via ClickHouse [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md) engine, because it is not allowed with PostgreSQL logical replication protocol, but the fact of DDL changes is detected transactionally. In this case, the default behaviour is to stop replicating those tables once DDL is detected. However, if this setting is enabled, then, instead of stopping the replication of those tables, they will be reloaded in the background via database snapshot without data losses and replication will continue for them.
+
+Possible values:
+
+-   0 — The table is not automatically updated in the background, when schema changes are detected.
+-   1 — The table is automatically updated in the background, when schema changes are detected.
+
+Default value: `0`.
+
+## materialized_postgresql_replication_slot {#materialized-postgresql-replication-slot}
+
+A user-created replication slot. Must be used together with [materialized_postgresql_snapshot](#materialized-postgresql-snapshot).
+
+## materialized_postgresql_snapshot {#materialized-postgresql-snapshot}
+
+A text string identifying a snapshot, from which [initial dump of PostgreSQL tables](../../engines/database-engines/materialized-postgresql.md) will be performed. Must be used together with [materialized_postgresql_replication_slot](#materialized-postgresql-replication-slot).
+
+## allow_experimental_projection_optimization {#allow-experimental-projection-optimization}
+
+Enables or disables [projection](../../engines/table-engines/mergetree-family/mergetree.md#projections) optimization when processing `SELECT` queries.
+
+Possible values:
+
+-   0 — Projection optimization disabled.
+-   1 — Projection optimization enabled.
+
+Default value: `0`.
+
+## force_optimize_projection {#force-optimize-projection}
+
+Enables or disables the obligatory use of [projections](../../engines/table-engines/mergetree-family/mergetree.md#projections) in `SELECT` queries, when projection optimization is enabled (see [allow_experimental_projection_optimization](#allow-experimental-projection-optimization) setting).
+
+Possible values:
+
+-   0 — Projection optimization is not obligatory.
+-   1 — Projection optimization is obligatory.
+
+Default value: `0`.
+
+## replication_alter_partitions_sync {#replication-alter-partitions-sync}
+
+Allows to set up waiting for actions to be executed on replicas by [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) or [TRUNCATE](../../sql-reference/statements/truncate.md) queries.
+
+Possible values:
+
+-   0 — Do not wait.
+-   1 — Wait for own execution.
+-   2 — Wait for everyone.
+
+Default value: `1`.
+
+## replication_wait_for_inactive_replica_timeout {#replication-wait-for-inactive-replica-timeout}
+
+Specifies how long (in seconds) to wait for inactive replicas to execute [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) or [TRUNCATE](../../sql-reference/statements/truncate.md) queries.
+
+Possible values:
+
+-   0 — Do not wait.
+-   Negative integer — Wait for unlimited time.
+-   Positive integer — The number of seconds to wait.
+
+Default value: `120` seconds.
+
+## regexp_max_matches_per_row {#regexp-max-matches-per-row}
+
+Sets the maximum number of matches for a single regular expression per row. Use it to protect against memory overload when using greedy regular expression in the [extractAllGroupsHorizontal](../../sql-reference/functions/string-search-functions.md#extractallgroups-horizontal) function.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: `1000`.
+
+## http_max_single_read_retries {#http-max-single-read-retries}
+
+Sets the maximum number of retries during a single HTTP read.
+
+Possible values:
+
+-   Positive integer.
+
+Default value: `1024`.
+
+## log_queries_probability {#log-queries-probability}
+
+Allows a user to write to [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md), and [query_views_log](../../operations/system-tables/query_views_log.md) system tables only a sample of queries selected randomly with the specified probability. It helps to reduce the load with a large volume of queries in a second.
+
+Possible values:
+
+-   0 — Queries are not logged in the system tables.
+-   Positive floating-point number in the range [0..1]. For example, if the setting value is `0.5`, about half of the queries are logged in the system tables.
+-   1 — All queries are logged in the system tables.
+
+Default value: `1`.
+
+## short_circuit_function_evaluation {#short-circuit-function-evaluation}
+
+Allows calculating the [if](../../sql-reference/functions/conditional-functions.md#if), [multiIf](../../sql-reference/functions/conditional-functions.md#multiif), [and](../../sql-reference/functions/logical-functions.md#logical-and-function), and [or](../../sql-reference/functions/logical-functions.md#logical-or-function) functions according to a [short scheme](https://en.wikipedia.org/wiki/Short-circuit_evaluation). This helps optimize the execution of complex expressions in these functions and prevent possible exceptions (such as division by zero when it is not expected).
+
+Possible values:
+
+-   `enable` — Enables short-circuit function evaluation for functions that are suitable for it (can throw an exception or computationally heavy).
+-   `force_enable` — Enables short-circuit function evaluation for all functions.
+-   `disable` — Disables short-circuit function evaluation.
+
+Default value: `enable`.
+
+## max_hyperscan_regexp_length {#max-hyperscan-regexp-length}
+
+Defines the maximum length for each regular expression in the [hyperscan multi-match functions](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn).
+
+Possible values:
+
+-   Positive integer.
+-   0 - The length is not limited.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 3;
+```
+
+Result:
+
+```text
+┌─multiMatchAny('abcd', ['ab', 'bcd', 'c', 'd'])─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 2;
+```
+
+Result:
+
+```text
+Exception: Regexp length too large.
+```
+
+**See Also**
+
+-   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+
+## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
+
+Sets the maximum length total of all regular expressions in each [hyperscan multi-match function](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn).
+
+Possible values:
+
+-   Positive integer.
+-   0 - The length is not limited.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['a','b','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Result:
+
+```text
+┌─multiMatchAny('abcd', ['a', 'b', 'c', 'd'])─┐
+│                                           1 │
+└─────────────────────────────────────────────┘
+```
+
+Query:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bc','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Result:
+
+```text
+Exception: Total regexp lengths too large.
+```
+
+**See Also**
+
+-   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
+
+## enable_positional_arguments {#enable-positional-arguments}
+
+Enables or disables supporting positional arguments for [GROUP BY](../../sql-reference/statements/select/group-by.md), [LIMIT BY](../../sql-reference/statements/select/limit-by.md), [ORDER BY](../../sql-reference/statements/select/order-by.md) statements. When you want to use column numbers instead of column names in these clauses, set `enable_positional_arguments = 1`.
+
+Possible values:
+
+-   0 — Positional arguments aren't supported.
+-   1 — Positional arguments are supported: column numbers can use instead of column names.
+
+Default value: `0`.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE positional_arguments(one Int, two Int, three Int) ENGINE=Memory();
+
+INSERT INTO positional_arguments VALUES (10, 20, 30), (20, 20, 10), (30, 10, 20);
+
+SET enable_positional_arguments = 1;
+
+SELECT * FROM positional_arguments ORDER BY 2,3;
+```
+
+Result:
+
+```text
+┌─one─┬─two─┬─three─┐
+│  30 │  10 │   20  │
+│  20 │  20 │   10  │
+│  10 │  20 │   30  │
+└─────┴─────┴───────┘
+```
+
+## optimize_move_to_prewhere {#optimize_move_to_prewhere}
+
+Enables or disables automatic [PREWHERE](../../sql-reference/statements/select/prewhere.md) optimization in [SELECT](../../sql-reference/statements/select/index.md) queries.
+
+Works only for [*MergeTree](../../engines/table-engines/mergetree-family/index.md) tables.
+
+Possible values:
+
+-   0 — Automatic `PREWHERE` optimization is disabled.
+-   1 — Automatic `PREWHERE` optimization is enabled.
+
+Default value: `1`.
+
+## optimize_move_to_prewhere_if_final {#optimize_move_to_prewhere_if_final}
+
+Enables or disables automatic [PREWHERE](../../sql-reference/statements/select/prewhere.md) optimization in [SELECT](../../sql-reference/statements/select/index.md) queries with [FINAL](../../sql-reference/statements/select/from.md#select-from-final) modifier.
+
+Works only for [*MergeTree](../../engines/table-engines/mergetree-family/index.md) tables.
+
+Possible values:
+
+-   0 — Automatic `PREWHERE` optimization in `SELECT` queries with `FINAL` modifier is disabled.
+-   1 — Automatic `PREWHERE` optimization in `SELECT` queries with `FINAL` modifier is enabled.
+
+Default value: `0`.
+
+**See Also**
+
+-   [optimize_move_to_prewhere](#optimize_move_to_prewhere) setting
+
+## async_insert {#async-insert}
+
+Enables or disables asynchronous inserts. This makes sense only for insertion over HTTP protocol. Note that deduplication isn't working for such inserts.
+
+If enabled, the data is combined into batches before the insertion into tables, so it is possible to do small and frequent insertions into ClickHouse (up to 15000 queries per second) without buffer tables.
+
+The data is inserted either after the [async_insert_max_data_size](#async-insert-max-data-size) is exceeded or after [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) milliseconds since the first `INSERT` query. If the [async_insert_stale_timeout_ms](#async-insert-stale-timeout-ms) is set to a non-zero value, the data is inserted after `async_insert_stale_timeout_ms` milliseconds since the last query.
+
+If [wait_for_async_insert](#wait-for-async-insert) is enabled, every client will wait for the data to be processed and flushed to the table. Otherwise, the query would be processed almost instantly, even if the data is not inserted.
+
+Possible values:
+
+-   0 — Insertions are made synchronously, one after another. 
+-   1 — Multiple asynchronous insertions enabled. 
+
+Default value: `0`.
+
+## async_insert_threads {#async-insert-threads}
+
+The maximum number of threads for background data parsing and insertion.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Asynchronous insertions are disabled.
+
+Default value: `16`.
+
+## wait_for_async_insert {#wait-for-async-insert}
+
+Enables or disables waiting for processing of asynchronous insertion. If enabled, server will return `OK` only after the data is inserted. Otherwise, it will return `OK` even if the data wasn't inserted.
+
+Possible values:
+
+-   0 — Server returns `OK` even if the data is not yet inserted.
+-   1 — Server returns `OK` only after the data is inserted.
+
+Default value: `1`.
+
+## wait_for_async_insert_timeout {#wait-for-async-insert-timeout}
+
+The timeout in seconds for waiting for processing of asynchronous insertion.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Disabled.
+
+Default value: [lock_acquire_timeout](#lock_acquire_timeout).
+
+## async_insert_max_data_size {#async-insert-max-data-size}
+
+The maximum size of the unparsed data in bytes collected per query before being inserted.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Asynchronous insertions are disabled.
+
+Default value: `1000000`.
+
+## async_insert_busy_timeout_ms {#async-insert-busy-timeout-ms}
+
+The maximum timeout in milliseconds since the first `INSERT` query before inserting collected data.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Timeout disabled.
+
+Default value: `200`.
+
+## async_insert_stale_timeout_ms {#async-insert-stale-timeout-ms}
+
+The maximum timeout in milliseconds since the last `INSERT` query before dumping collected data. If enabled, the settings prolongs the [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) with every `INSERT` query as long as [async_insert_max_data_size](#async-insert-max-data-size) is not exceeded.
+
+Possible values:
+
+-   Positive integer.
+-   0 — Timeout disabled.
+
+Default value: `0`.
diff --git a/docs/en/operations/storing-data.md b/docs/en/operations/storing-data.md
new file mode 100644
index 00000000000..bc764a909b8
--- /dev/null
+++ b/docs/en/operations/storing-data.md
@@ -0,0 +1,318 @@
+---
+toc_priority: 68
+toc_title: External Disks for Storing Data
+---
+
+# External Disks for Storing Data {#external-disks}
+
+Data, processed in ClickHouse, is usually stored in the local file system — on the same machine with the ClickHouse server. That requires large-capacity disks, which can be expensive enough. To avoid that you can store the data remotely — on [Amazon S3](https://aws.amazon.com/s3/) disks or in the Hadoop Distributed File System ([HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html)). 
+
+To work with data stored on `Amazon S3` disks use [S3](../engines/table-engines/integrations/s3.md) table engine, and to work with data in the Hadoop Distributed File System — [HDFS](../engines/table-engines/integrations/hdfs.md) table engine.
+
+To load data from a web server with static files use a disk with type [web](#storing-data-on-webserver).
+
+## Zero-copy Replication {#zero-copy}
+
+ClickHouse supports zero-copy replication for `S3` and `HDFS` disks, which means that if the data is stored remotely on several machines and needs to be synchronized, then only the metadata is replicated (paths to the data parts), but not the data itself.
+
+## Configuring HDFS {#configuring-hdfs}
+
+[MergeTree](../engines/table-engines/mergetree-family/mergetree.md) and [Log](../engines/table-engines/log-family/log.md) family table engines can store data to HDFS using a disk with type `HDFS`.
+
+Configuration markup:
+
+``` xml
+<yandex>
+    <storage_configuration>
+        <disks>
+            <hdfs>
+                <type>hdfs</type>
+                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
+            </hdfs>
+        </disks>
+        <policies>
+            <hdfs>
+                <volumes>
+                    <main>
+                        <disk>hdfs</disk>
+                    </main>
+                </volumes>
+            </hdfs>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+    </merge_tree>
+</yandex>
+```
+
+Required parameters:
+
+-   `endpoint` — HDFS endpoint URL in `path` format. Endpoint URL should contain a root path to store data.
+
+Optional parameters:
+
+-   `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1 Mb`.
+
+## Using Virtual File System for Data Encryption {#encrypted-virtual-file-system}
+
+You can encrypt the data stored on [S3](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-s3), or [HDFS](#configuring-hdfs) external disks, or on a local disk. To turn on the encryption mode, in the configuration file you must define a disk with the type `encrypted` and choose a disk on which the data will be saved. An `encrypted` disk ciphers all written files on the fly, and when you read files from an `encrypted` disk it deciphers them automatically. So you can work with an `encrypted` disk like with a normal one.
+
+Example of disk configuration:
+
+``` xml
+<disks>
+  <disk1>
+    <type>local</type>
+    <path>/path1/</path>
+  </disk1>
+  <disk2>
+    <type>encrypted</type>
+    <disk>disk1</disk>
+    <path>path2/</path>
+    <key>_16_ascii_chars_</key>
+  </disk2>
+</disks>
+```
+
+For example, when ClickHouse writes data from some table to a file `store/all_1_1_0/data.bin` to `disk1`, then in fact this file will be written to the physical disk along the path `/path1/store/all_1_1_0/data.bin`.
+
+When writing the same file to `disk2`, it will actually be written to the physical disk at the path `/path1/path2/store/all_1_1_0/data.bin` in encrypted mode.
+
+Required parameters:
+
+-   `type` — `encrypted`. Otherwise the encrypted disk is not created.
+-   `disk` — Type of disk for data storage.
+-   `key` — The key for encryption and decryption. Type: [Uint64](../sql-reference/data-types/int-uint.md). You can use `key_hex` parameter to encrypt in hexadecimal form.
+    You can specify multiple keys using the `id` attribute (see example above).
+
+Optional parameters:
+
+-   `path` — Path to the location on the disk where the data will be saved. If not specified, the data will be saved in the root directory.
+-   `current_key_id` — The key used for encryption. All the specified keys can be used for decryption, and you can always switch to another key while maintaining access to previously encrypted data.
+-   `algorithm` — [Algorithm](../sql-reference/statements/create/table.md#create-query-encryption-codecs) for encryption. Possible values: `AES_128_CTR`, `AES_192_CTR` or `AES_256_CTR`. Default value: `AES_128_CTR`. The key length depends on the algorithm: `AES_128_CTR` — 16 bytes, `AES_192_CTR` — 24 bytes, `AES_256_CTR` — 32 bytes.
+
+Example of disk configuration:
+
+``` xml
+<yandex>
+    <storage_configuration>
+        <disks>
+            <disk_s3>
+                <type>s3</type>
+                <endpoint>...
+            </disk_s3>
+            <disk_s3_encrypted>
+                <type>encrypted</type>
+                <disk>disk_s3</disk>
+                <algorithm>AES_128_CTR</algorithm>
+                <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+                <key_hex id="1">ffeeddccbbaa99887766554433221100</key_hex>
+                <current_key_id>1</current_key_id>
+            </disk_s3_encrypted>
+        </disks>
+    </storage_configuration>
+</yandex>
+```
+
+## Storing Data on Web Server {#storing-data-on-webserver}
+
+There is a tool `clickhouse-static-files-uploader`, which prepares a data directory for a given table (`SELECT data_paths FROM system.tables WHERE name = 'table_name'`). For each table you need, you get a directory of files. These files can be uploaded to, for example, a web server with static files. After this preparation, you can load this table into any ClickHouse server via `DiskWeb`.
+
+This is a read-only disk. Its data is only read and never modified. A new table is loaded to this disk via `ATTACH TABLE` query (see example below). Local disk is not actually used, each `SELECT` query will result in a `http` request to fetch required data. All modification of the table data will result in an exception, i.e. the following types of queries are not allowed: [CREATE TABLE](../sql-reference/statements/create/table.md), [ALTER TABLE](../sql-reference/statements/alter/index.md), [RENAME TABLE](../sql-reference/statements/rename.md#misc_operations-rename_table), [DETACH TABLE](../sql-reference/statements/detach.md) and [TRUNCATE TABLE](../sql-reference/statements/truncate.md).
+
+Web server storage is supported only for the [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) and [Log](../engines/table-engines/log-family/log.md) engine families. To access the data stored on a `web` disk, use the [storage_policy](../engines/table-engines/mergetree-family/mergetree.md#terms) setting when executing the query. For example, `ATTACH TABLE table_web UUID '{}' (id Int32) ENGINE = MergeTree() ORDER BY id SETTINGS storage_policy = 'web'`.
+
+A ready test case. You need to add this configuration to config:
+
+``` xml
+<yandex>
+    <storage_configuration>
+        <disks>
+            <web>
+                <type>web</type>
+                <endpoint>https://clickhouse-datasets.s3.yandex.net/disk-with-static-files-tests/test-hits/</endpoint>
+            </web>
+        </disks>
+        <policies>
+            <web>
+                <volumes>
+                    <main>
+                        <disk>web</disk>
+                    </main>
+                </volumes>
+            </web>
+        </policies>
+    </storage_configuration>
+</yandex>
+```
+
+And then execute this query:
+
+```sql
+ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218'
+(
+    WatchID UInt64,
+    JavaEnable UInt8,
+    Title String,
+    GoodEvent Int16,
+    EventTime DateTime,
+    EventDate Date,
+    CounterID UInt32,
+    ClientIP UInt32,
+    ClientIP6 FixedString(16),
+    RegionID UInt32,
+    UserID UInt64,
+    CounterClass Int8,
+    OS UInt8,
+    UserAgent UInt8,
+    URL String,
+    Referer String,
+    URLDomain String,
+    RefererDomain String,
+    Refresh UInt8,
+    IsRobot UInt8,
+    RefererCategories Array(UInt16),
+    URLCategories Array(UInt16),
+    URLRegions Array(UInt32),
+    RefererRegions Array(UInt32),
+    ResolutionWidth UInt16,
+    ResolutionHeight UInt16,
+    ResolutionDepth UInt8,
+    FlashMajor UInt8,
+    FlashMinor UInt8,
+    FlashMinor2 String,
+    NetMajor UInt8,
+    NetMinor UInt8,
+    UserAgentMajor UInt16,
+    UserAgentMinor FixedString(2),
+    CookieEnable UInt8,
+    JavascriptEnable UInt8,
+    IsMobile UInt8,
+    MobilePhone UInt8,
+    MobilePhoneModel String,
+    Params String,
+    IPNetworkID UInt32,
+    TraficSourceID Int8,
+    SearchEngineID UInt16,
+    SearchPhrase String,
+    AdvEngineID UInt8,
+    IsArtifical UInt8,
+    WindowClientWidth UInt16,
+    WindowClientHeight UInt16,
+    ClientTimeZone Int16,
+    ClientEventTime DateTime,
+    SilverlightVersion1 UInt8,
+    SilverlightVersion2 UInt8,
+    SilverlightVersion3 UInt32,
+    SilverlightVersion4 UInt16,
+    PageCharset String,
+    CodeVersion UInt32,
+    IsLink UInt8,
+    IsDownload UInt8,
+    IsNotBounce UInt8,
+    FUniqID UInt64,
+    HID UInt32,
+    IsOldCounter UInt8,
+    IsEvent UInt8,
+    IsParameter UInt8,
+    DontCountHits UInt8,
+    WithHash UInt8,
+    HitColor FixedString(1),
+    UTCEventTime DateTime,
+    Age UInt8,
+    Sex UInt8,
+    Income UInt8,
+    Interests UInt16,
+    Robotness UInt8,
+    GeneralInterests Array(UInt16),
+    RemoteIP UInt32,
+    RemoteIP6 FixedString(16),
+    WindowName Int32,
+    OpenerName Int32,
+    HistoryLength Int16,
+    BrowserLanguage FixedString(2),
+    BrowserCountry FixedString(2),
+    SocialNetwork String,
+    SocialAction String,
+    HTTPError UInt16,
+    SendTiming Int32,
+    DNSTiming Int32,
+    ConnectTiming Int32,
+    ResponseStartTiming Int32,
+    ResponseEndTiming Int32,
+    FetchTiming Int32,
+    RedirectTiming Int32,
+    DOMInteractiveTiming Int32,
+    DOMContentLoadedTiming Int32,
+    DOMCompleteTiming Int32,
+    LoadEventStartTiming Int32,
+    LoadEventEndTiming Int32,
+    NSToDOMContentLoadedTiming Int32,
+    FirstPaintTiming Int32,
+    RedirectCount Int8,
+    SocialSourceNetworkID UInt8,
+    SocialSourcePage String,
+    ParamPrice Int64,
+    ParamOrderID String,
+    ParamCurrency FixedString(3),
+    ParamCurrencyID UInt16,
+    GoalsReached Array(UInt32),
+    OpenstatServiceName String,
+    OpenstatCampaignID String,
+    OpenstatAdID String,
+    OpenstatSourceID String,
+    UTMSource String,
+    UTMMedium String,
+    UTMCampaign String,
+    UTMContent String,
+    UTMTerm String,
+    FromTag String,
+    HasGCLID UInt8,
+    RefererHash UInt64,
+    URLHash UInt64,
+    CLID UInt32,
+    YCLID UInt64,
+    ShareService String,
+    ShareURL String,
+    ShareTitle String,
+    ParsedParams Nested(
+        Key1 String,
+        Key2 String,
+        Key3 String,
+        Key4 String,
+        Key5 String,
+        ValueDouble Float64),
+    IslandID FixedString(16),
+    RequestNum UInt32,
+    RequestTry UInt8
+)
+ENGINE = MergeTree()
+PARTITION BY toYYYYMM(EventDate)
+ORDER BY (CounterID, EventDate, intHash32(UserID))
+SAMPLE BY intHash32(UserID)
+SETTINGS storage_policy='web';
+```
+
+Required parameters:
+
+-   `type` — `web`. Otherwise the disk is not created.
+-   `endpoint` — The endpoint URL in `path` format. Endpoint URL must contain a root path to store data, where they were uploaded.
+
+Optional parameters:
+
+-   `min_bytes_for_seek` — The minimal number of bytes to use seek operation instead of sequential read. Default value: `1` Mb.
+-   `remote_fs_read_backoff_threashold` — The maximum wait time when trying to read data for remote disk. Default value: `10000` seconds.
+-   `remote_fs_read_backoff_max_tries` — The maximum number of attempts to read with backoff. Default value: `5`.
+
+If a query fails with an exception `DB:Exception Unreachable URL`, then you can try to adjust the settings: [http_connection_timeout](../operations/settings/settings.md#http_connection_timeout), [http_receive_timeout](../operations/settings/settings.md#http_receive_timeout), [keep_alive_timeout](../operations/server-configuration-parameters/settings.md#keep-alive-timeout).
+
+To get files for upload run:
+`clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>` (`--metadata-path` can be found in query `SELECT data_paths FROM system.tables WHERE name = 'table_name'`).
+
+When loading files by `endpoint`, they must be loaded into `<endpoint>/store/` path, but config must contain only `endpoint`.
+
+If URL is not reachable on disk load when the server is starting up tables, then all errors are caught. If in this case there were errors, tables can be reloaded (become visible) via `DETACH TABLE table_name` -> `ATTACH TABLE table_name`. If metadata was successfully loaded at server startup, then tables are available straight away.
+
+Use [http_max_single_read_retries](../operations/settings/settings.md#http-max-single-read-retries) setting to limit the maximum number of retries during a single HTTP read.
diff --git a/docs/en/operations/system-tables/asynchronous_metric_log.md b/docs/en/operations/system-tables/asynchronous_metric_log.md
index de2e8faab10..273f1f00d71 100644
--- a/docs/en/operations/system-tables/asynchronous_metric_log.md
+++ b/docs/en/operations/system-tables/asynchronous_metric_log.md
@@ -36,4 +36,4 @@ SELECT * FROM system.asynchronous_metric_log LIMIT 10
 - [system.asynchronous_metrics](../system-tables/asynchronous_metrics.md) — Contains metrics, calculated periodically in the background.
 - [system.metric_log](../system-tables/metric_log.md) — Contains history of metrics values from tables `system.metrics` and `system.events`, periodically flushed to disk.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/asynchronous_metric_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/asynchronous_metric_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/asynchronous_metrics.md b/docs/en/operations/system-tables/asynchronous_metrics.md
index fc801aa1c80..11255a868cc 100644
--- a/docs/en/operations/system-tables/asynchronous_metrics.md
+++ b/docs/en/operations/system-tables/asynchronous_metrics.md
@@ -35,4 +35,4 @@ SELECT * FROM system.asynchronous_metrics LIMIT 10
 -   [system.events](../../operations/system-tables/events.md#system_tables-events) — Contains a number of events that have occurred.
 -   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` and `system.events`.
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/asynchronous_metrics) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/asynchronous_metrics) <!--hide-->
diff --git a/docs/en/operations/system-tables/clusters.md b/docs/en/operations/system-tables/clusters.md
index 16cf183de53..18a4152df70 100644
--- a/docs/en/operations/system-tables/clusters.md
+++ b/docs/en/operations/system-tables/clusters.md
@@ -68,4 +68,4 @@ estimated_recovery_time: 0
 -   [distributed_replica_error_cap setting](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
 -   [distributed_replica_error_half_life setting](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/clusters) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/clusters) <!--hide-->
diff --git a/docs/en/operations/system-tables/columns.md b/docs/en/operations/system-tables/columns.md
index da4bcec48ed..de878cce793 100644
--- a/docs/en/operations/system-tables/columns.md
+++ b/docs/en/operations/system-tables/columns.md
@@ -86,4 +86,4 @@ The `system.columns` table contains the following columns (the column type is sh
 -   `is_in_primary_key` (UInt8) — Flag that indicates whether the column is in the primary key expression.
 -   `is_in_sampling_key` (UInt8) — Flag that indicates whether the column is in the sampling key expression.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/columns) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/columns) <!--hide-->
diff --git a/docs/en/operations/system-tables/contributors.md b/docs/en/operations/system-tables/contributors.md
index a718c403c11..0b6e977e0e3 100644
--- a/docs/en/operations/system-tables/contributors.md
+++ b/docs/en/operations/system-tables/contributors.md
@@ -38,4 +38,4 @@ SELECT * FROM system.contributors WHERE name = 'Olga Khvostikova'
 │ Olga Khvostikova │
 └──────────────────┘
 ```
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/contributors) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/contributors) <!--hide-->
diff --git a/docs/en/operations/system-tables/crash-log.md b/docs/en/operations/system-tables/crash-log.md
index 5e9fec53429..404010afc05 100644
--- a/docs/en/operations/system-tables/crash-log.md
+++ b/docs/en/operations/system-tables/crash-log.md
@@ -45,4 +45,4 @@ build_id:
 **See also**
 -   [trace_log](../../operations/system-tables/trace_log.md) system table
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/crash-log)
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/crash-log)
diff --git a/docs/en/operations/system-tables/current-roles.md b/docs/en/operations/system-tables/current-roles.md
index 56dbb602637..c029f367998 100644
--- a/docs/en/operations/system-tables/current-roles.md
+++ b/docs/en/operations/system-tables/current-roles.md
@@ -8,4 +8,4 @@ Columns:
  - `with_admin_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `current_role` is a role with `ADMIN OPTION` privilege.
  - `is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `current_role` is a default role.
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/current-roles) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/current-roles) <!--hide-->
diff --git a/docs/en/operations/system-tables/data_skipping_indices.md b/docs/en/operations/system-tables/data_skipping_indices.md
index 683666e1f77..add89ae9144 100644
--- a/docs/en/operations/system-tables/data_skipping_indices.md
+++ b/docs/en/operations/system-tables/data_skipping_indices.md
@@ -10,6 +10,9 @@ Columns:
 -   `type` ([String](../../sql-reference/data-types/string.md)) — Index type.
 -   `expr` ([String](../../sql-reference/data-types/string.md)) — Expression for the index calculation.
 -   `granularity` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The number of granules in the block.
+-   `data_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of compressed data, in bytes.
+-   `data_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of decompressed data, in bytes.
+-   `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) — The size of marks, in bytes.
 
 **Example**
 
@@ -26,6 +29,9 @@ name:        clicks_idx
 type:        minmax
 expr:        clicks
 granularity: 1
+data_compressed_bytes:   58
+data_uncompressed_bytes: 6
+marks:                   48
 
 Row 2:
 ──────
@@ -35,4 +41,7 @@ name:        contacts_null_idx
 type:        minmax
 expr:        assumeNotNull(contacts_null)
 granularity: 1
+data_compressed_bytes:   58
+data_uncompressed_bytes: 6
+marks:                   48
 ```
diff --git a/docs/en/operations/system-tables/data_type_families.md b/docs/en/operations/system-tables/data_type_families.md
index fdce9c33b37..0d11b1cfefb 100644
--- a/docs/en/operations/system-tables/data_type_families.md
+++ b/docs/en/operations/system-tables/data_type_families.md
@@ -33,4 +33,4 @@ SELECT * FROM system.data_type_families WHERE alias_to = 'String'
 
 -   [Syntax](../../sql-reference/syntax.md) — Information about supported syntax.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/data_type_families) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/data_type_families) <!--hide-->
diff --git a/docs/en/operations/system-tables/databases.md b/docs/en/operations/system-tables/databases.md
index 2c78fd25c2b..c9fc8786333 100644
--- a/docs/en/operations/system-tables/databases.md
+++ b/docs/en/operations/system-tables/databases.md
@@ -35,4 +35,4 @@ SELECT * FROM system.databases
 └────────────────────────────────┴────────┴────────────────────────────┴─────────────────────────────────────────────────────────────────────┴──────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/databases) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/databases) <!--hide-->
diff --git a/docs/en/operations/system-tables/detached_parts.md b/docs/en/operations/system-tables/detached_parts.md
index a5748128426..7345aa4ba6c 100644
--- a/docs/en/operations/system-tables/detached_parts.md
+++ b/docs/en/operations/system-tables/detached_parts.md
@@ -8,4 +8,4 @@ For the description of other columns, see [system.parts](../../operations/system
 
 If part name is invalid, values of some columns may be `NULL`. Such parts can be deleted with [ALTER TABLE DROP DETACHED PART](../../sql-reference/statements/alter/partition.md#alter_drop-detached).
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/detached_parts) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/detached_parts) <!--hide-->
diff --git a/docs/en/operations/system-tables/dictionaries.md b/docs/en/operations/system-tables/dictionaries.md
index a34e893599c..bf8dcb9b5e4 100644
--- a/docs/en/operations/system-tables/dictionaries.md
+++ b/docs/en/operations/system-tables/dictionaries.md
@@ -61,4 +61,4 @@ SELECT * FROM system.dictionaries
 └──────────┴──────┴────────┴─────────────┴──────┴────────┴──────────────────────────────────────┴─────────────────────┴─────────────────┴─────────────┴──────────┴───────────────┴───────────────────────┴────────────────────────────┴──────────────┴──────────────┴─────────────────────┴──────────────────────────────┘───────────────────────┴────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/dictionaries) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/dictionaries) <!--hide-->
diff --git a/docs/en/operations/system-tables/disks.md b/docs/en/operations/system-tables/disks.md
index 027e722dc55..f643e3fcfe1 100644
--- a/docs/en/operations/system-tables/disks.md
+++ b/docs/en/operations/system-tables/disks.md
@@ -24,4 +24,4 @@ Columns:
 1 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/disks) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/disks) <!--hide-->
diff --git a/docs/en/operations/system-tables/distributed_ddl_queue.md b/docs/en/operations/system-tables/distributed_ddl_queue.md
index 07f72d76324..47899ae5628 100644
--- a/docs/en/operations/system-tables/distributed_ddl_queue.md
+++ b/docs/en/operations/system-tables/distributed_ddl_queue.md
@@ -61,4 +61,4 @@ exception_code:    ZOK
 2 rows in set. Elapsed: 0.025 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/distributed_ddl_queuedistributed_ddl_queue.md) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/distributed_ddl_queuedistributed_ddl_queue.md) <!--hide-->
diff --git a/docs/en/operations/system-tables/distribution_queue.md b/docs/en/operations/system-tables/distribution_queue.md
index a7037a23312..2b0ca536119 100644
--- a/docs/en/operations/system-tables/distribution_queue.md
+++ b/docs/en/operations/system-tables/distribution_queue.md
@@ -47,4 +47,4 @@ last_exception:
 
 -   [Distributed table engine](../../engines/table-engines/special/distributed.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/distribution_queue) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/distribution_queue) <!--hide-->
diff --git a/docs/en/operations/system-tables/enabled-roles.md b/docs/en/operations/system-tables/enabled-roles.md
index ecfb889b6ef..54569ebbca6 100644
--- a/docs/en/operations/system-tables/enabled-roles.md
+++ b/docs/en/operations/system-tables/enabled-roles.md
@@ -9,4 +9,4 @@ Columns:
 - `is_current` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `enabled_role` is a current role of a current user.
 - `is_default` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Flag that shows whether `enabled_role` is a default role.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/enabled-roles) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/enabled-roles) <!--hide-->
diff --git a/docs/en/operations/system-tables/events.md b/docs/en/operations/system-tables/events.md
index 2fcb5d8edec..719216a54be 100644
--- a/docs/en/operations/system-tables/events.md
+++ b/docs/en/operations/system-tables/events.md
@@ -31,4 +31,4 @@ SELECT * FROM system.events LIMIT 5
 -   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
 -   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/events) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/events) <!--hide-->
diff --git a/docs/en/operations/system-tables/functions.md b/docs/en/operations/system-tables/functions.md
index 38aa62c9c09..b952c103310 100644
--- a/docs/en/operations/system-tables/functions.md
+++ b/docs/en/operations/system-tables/functions.md
@@ -30,4 +30,4 @@ Columns:
 10 rows in set. Elapsed: 0.002 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/functions) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/functions) <!--hide-->
diff --git a/docs/en/operations/system-tables/grants.md b/docs/en/operations/system-tables/grants.md
index 927fa4f3227..bd0d8c3c5b8 100644
--- a/docs/en/operations/system-tables/grants.md
+++ b/docs/en/operations/system-tables/grants.md
@@ -21,4 +21,4 @@ Columns:
 
 -    `grant_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Permission is granted `WITH GRANT OPTION`, see [GRANT](../../sql-reference/statements/grant.md#grant-privigele-syntax).
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/grants) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/grants) <!--hide-->
diff --git a/docs/en/operations/system-tables/graphite_retentions.md b/docs/en/operations/system-tables/graphite_retentions.md
index 0d56242dc95..af35da1f6e5 100644
--- a/docs/en/operations/system-tables/graphite_retentions.md
+++ b/docs/en/operations/system-tables/graphite_retentions.md
@@ -14,4 +14,4 @@ Columns:
 -   `Tables.database` (Array(String)) - Array of names of database tables that use the `config_name` parameter.
 -   `Tables.table` (Array(String)) - Array of table names that use the `config_name` parameter.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/graphite_retentions) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/graphite_retentions) <!--hide-->
diff --git a/docs/en/operations/system-tables/index.md b/docs/en/operations/system-tables/index.md
index ab3ba25493a..0cc5e834af1 100644
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@@ -71,4 +71,4 @@ If procfs is supported and enabled on the system, ClickHouse server collects the
 -   `OSReadBytes`
 -   `OSWriteBytes`
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/) <!--hide-->
diff --git a/docs/en/operations/system-tables/licenses.md b/docs/en/operations/system-tables/licenses.md
index d1c3e1cc5de..caef97697a6 100644
--- a/docs/en/operations/system-tables/licenses.md
+++ b/docs/en/operations/system-tables/licenses.md
@@ -36,4 +36,4 @@ SELECT library_name, license_type, license_path FROM system.licenses LIMIT 15
 
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/licenses) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/licenses) <!--hide-->
diff --git a/docs/en/operations/system-tables/merge_tree_settings.md b/docs/en/operations/system-tables/merge_tree_settings.md
index ce82cd09b8a..1f24bdbe0cf 100644
--- a/docs/en/operations/system-tables/merge_tree_settings.md
+++ b/docs/en/operations/system-tables/merge_tree_settings.md
@@ -51,4 +51,4 @@ type:        SettingUInt64
 4 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/merge_tree_settings) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/merge_tree_settings) <!--hide-->
diff --git a/docs/en/operations/system-tables/merges.md b/docs/en/operations/system-tables/merges.md
index c7bdaee42e1..e9ca30d5f2c 100644
--- a/docs/en/operations/system-tables/merges.md
+++ b/docs/en/operations/system-tables/merges.md
@@ -22,4 +22,4 @@ Columns:
 -   `merge_type` — The type of current merge. Empty if it's an mutation.
 -   `merge_algorithm` — The algorithm used in current merge. Empty if it's an mutation.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/merges) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/merges) <!--hide-->
diff --git a/docs/en/operations/system-tables/metric_log.md b/docs/en/operations/system-tables/metric_log.md
index ab149703309..875e443d0a6 100644
--- a/docs/en/operations/system-tables/metric_log.md
+++ b/docs/en/operations/system-tables/metric_log.md
@@ -48,4 +48,4 @@ CurrentMetric_DistributedFilesToInsert:                          0
 -   [system.metrics](../../operations/system-tables/metrics.md) — Contains instantly calculated metrics.
 -   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/metric_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/metric_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/metrics.md b/docs/en/operations/system-tables/metrics.md
index 4afab40764b..551c63d1aa3 100644
--- a/docs/en/operations/system-tables/metrics.md
+++ b/docs/en/operations/system-tables/metrics.md
@@ -38,4 +38,4 @@ SELECT * FROM system.metrics LIMIT 10
 -   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — Contains a history of metrics values from tables `system.metrics` и `system.events`.
 -   [Monitoring](../../operations/monitoring.md) — Base concepts of ClickHouse monitoring.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/metrics) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/metrics) <!--hide-->
diff --git a/docs/en/operations/system-tables/mutations.md b/docs/en/operations/system-tables/mutations.md
index e7d3e90b806..66ce500f213 100644
--- a/docs/en/operations/system-tables/mutations.md
+++ b/docs/en/operations/system-tables/mutations.md
@@ -45,4 +45,4 @@ If there were problems with mutating some data parts, the following columns cont
 -   [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) table engine
 -   [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/mutations) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/mutations) <!--hide-->
diff --git a/docs/en/operations/system-tables/numbers.md b/docs/en/operations/system-tables/numbers.md
index e9d64483525..774fdf86b76 100644
--- a/docs/en/operations/system-tables/numbers.md
+++ b/docs/en/operations/system-tables/numbers.md
@@ -29,4 +29,4 @@ Reads from this table are not parallelized.
 10 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/numbers) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/numbers) <!--hide-->
diff --git a/docs/en/operations/system-tables/numbers_mt.md b/docs/en/operations/system-tables/numbers_mt.md
index e11515d4c06..978a6565b71 100644
--- a/docs/en/operations/system-tables/numbers_mt.md
+++ b/docs/en/operations/system-tables/numbers_mt.md
@@ -27,4 +27,4 @@ Used for tests.
 10 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/numbers_mt) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/numbers_mt) <!--hide-->
diff --git a/docs/en/operations/system-tables/one.md b/docs/en/operations/system-tables/one.md
index 4a00e118b05..293f0412955 100644
--- a/docs/en/operations/system-tables/one.md
+++ b/docs/en/operations/system-tables/one.md
@@ -20,4 +20,4 @@ This is similar to the `DUAL` table found in other DBMSs.
 1 rows in set. Elapsed: 0.001 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/one) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/one) <!--hide-->
diff --git a/docs/en/operations/system-tables/opentelemetry_span_log.md b/docs/en/operations/system-tables/opentelemetry_span_log.md
index e45a989742c..521c155d0f7 100644
--- a/docs/en/operations/system-tables/opentelemetry_span_log.md
+++ b/docs/en/operations/system-tables/opentelemetry_span_log.md
@@ -4,7 +4,7 @@ Contains information about [trace spans](https://opentracing.io/docs/overview/sp
 
 Columns:
 
--   `trace_id` ([UUID](../../sql-reference/data-types/uuid.md) — ID of the trace for executed query.
+-   `trace_id` ([UUID](../../sql-reference/data-types/uuid.md)) — ID of the trace for executed query.
 
 -   `span_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — ID of the `trace span`.
 
@@ -50,4 +50,4 @@ attribute.values: []
 
 -   [OpenTelemetry](../../operations/opentelemetry.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/opentelemetry_span_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/opentelemetry_span_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/part_log.md b/docs/en/operations/system-tables/part_log.md
index ce983282880..1fb5b12e87e 100644
--- a/docs/en/operations/system-tables/part_log.md
+++ b/docs/en/operations/system-tables/part_log.md
@@ -66,4 +66,4 @@ error:                         0
 exception:
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/part_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/part_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/parts.md b/docs/en/operations/system-tables/parts.md
index cd5b3fc799a..45fdcc40451 100644
--- a/docs/en/operations/system-tables/parts.md
+++ b/docs/en/operations/system-tables/parts.md
@@ -38,6 +38,12 @@ Columns:
 
 -   `marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The size of the file with marks.
 
+-   `secondary_indices_compressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of compressed data for secondary indices in the data part. All the auxiliary files (for example, files with marks) are not included.
+
+-   `secondary_indices_uncompressed_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – Total size of uncompressed data for secondary indices in the data part. All the auxiliary files (for example, files with marks) are not included.
+
+-   `secondary_indices_marks_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md)) – The size of the file with marks for secondary indices.
+
 -   `modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The time the directory with the data part was modified. This usually corresponds to the time of data part creation.
 
 -   `remove_time` ([DateTime](../../sql-reference/data-types/datetime.md)) – The time when the data part became inactive.
@@ -119,6 +125,9 @@ rows:                                  6
 bytes_on_disk:                         310
 data_compressed_bytes:                 157
 data_uncompressed_bytes:               91
+secondary_indices_compressed_bytes:    58
+secondary_indices_uncompressed_bytes:  6
+secondary_indices_marks_bytes:         48
 marks_bytes:                           144
 modification_time:                     2020-06-18 13:01:49
 remove_time:                           1970-01-01 00:00:00
@@ -155,4 +164,4 @@ move_ttl_info.max:                     []
 -   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
 -   [TTL for Columns and Tables](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/parts) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/parts) <!--hide-->
diff --git a/docs/en/operations/system-tables/parts_columns.md b/docs/en/operations/system-tables/parts_columns.md
index 81529544a8b..0be4324bab5 100644
--- a/docs/en/operations/system-tables/parts_columns.md
+++ b/docs/en/operations/system-tables/parts_columns.md
@@ -145,4 +145,4 @@ column_marks_bytes:                    48
 
 -   [MergeTree family](../../engines/table-engines/mergetree-family/mergetree.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/parts_columns) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/parts_columns) <!--hide-->
diff --git a/docs/en/operations/system-tables/processes.md b/docs/en/operations/system-tables/processes.md
index 6090c5e4555..ee8daf0e5bf 100644
--- a/docs/en/operations/system-tables/processes.md
+++ b/docs/en/operations/system-tables/processes.md
@@ -58,4 +58,4 @@ Settings:             {'background_pool_size':'32','load_balancing':'random','al
 1 rows in set. Elapsed: 0.002 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/processes) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/processes) <!--hide-->
diff --git a/docs/en/operations/system-tables/query_log.md b/docs/en/operations/system-tables/query_log.md
index 987f1968356..0cadc975bd4 100644
--- a/docs/en/operations/system-tables/query_log.md
+++ b/docs/en/operations/system-tables/query_log.md
@@ -24,6 +24,8 @@ Each query creates one or two rows in the `query_log` table, depending on the st
 2.  If an error occurred during query processing, two events with the `QueryStart` and `ExceptionWhileProcessing` types are created.
 3.  If an error occurred before launching the query, a single event with the `ExceptionBeforeStart` type is created.
 
+You can use the [log_queries_probability](../../operations/settings/settings.md#log-queries-probability) setting to reduce the number of queries, registered in the `query_log` table.
+
 Columns:
 
 -   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of an event that occurred when executing the query. Values:
@@ -50,6 +52,7 @@ Columns:
 -   `query_kind` ([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)) — Type of the query.
 -   `databases` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the databases present in the query.
 -   `tables` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the tables present in the query.
+-   `views` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the (materialized or live) views present in the query.
 -   `columns` ([Array](../../sql-reference/data-types/array.md)([LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md))) — Names of the columns present in the query.
 -   `projections` ([String](../../sql-reference/data-types/string.md)) — Names of the projections used during the query execution.
 -   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
@@ -180,5 +183,6 @@ used_table_functions:                  []
 **See Also**
 
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
+-   [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) — This table contains information about each view executed during a query.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/query_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/query_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/query_thread_log.md b/docs/en/operations/system-tables/query_thread_log.md
index 7ecea2971b4..aa064d675ce 100644
--- a/docs/en/operations/system-tables/query_thread_log.md
+++ b/docs/en/operations/system-tables/query_thread_log.md
@@ -11,6 +11,8 @@ The flushing period of data is set in `flush_interval_milliseconds` parameter of
 
 ClickHouse does not delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
 
+You can use the [log_queries_probability](../../operations/settings/settings.md#log-queries-probability) setting to reduce the number of queries, registered in the `query_thread_log` table.
+
 Columns:
 
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the thread has finished execution of the query.
@@ -112,5 +114,6 @@ ProfileEvents:        {'Query':1,'SelectQuery':1,'ReadCompressedBytes':36,'Compr
 **See Also**
 
 -   [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
+-   [system.query_views_log](../../operations/system-tables/query_views_log.md#system_tables-query_views_log) — This table contains information about each view executed during a query.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/query_thread_log) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/query_thread_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/query_views_log.md b/docs/en/operations/system-tables/query_views_log.md
new file mode 100644
index 00000000000..25d7f6522f5
--- /dev/null
+++ b/docs/en/operations/system-tables/query_views_log.md
@@ -0,0 +1,86 @@
+# system.query_views_log {#system_tables-query_views_log}
+
+Contains information about the dependent views executed when running a query, for example, the view type or the execution time.
+
+To start logging:
+
+1.  Configure parameters in the [query_views_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query_views_log) section.
+2.  Set [log_query_views](../../operations/settings/settings.md#settings-log-query-views) to 1.
+
+The flushing period of data is set in `flush_interval_milliseconds` parameter of the [query_views_log](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-query_views_log) server settings section. To force flushing, use the [SYSTEM FLUSH LOGS](../../sql-reference/statements/system.md#query_language-system-flush_logs) query.
+
+ClickHouse does not delete data from the table automatically. See [Introduction](../../operations/system-tables/index.md#system-tables-introduction) for more details.
+
+You can use the [log_queries_probability](../../operations/settings/settings.md#log-queries-probability) setting to reduce the number of queries, registered in the `query_views_log` table.
+
+Columns:
+
+-   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the last event of the view happened.
+-   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the view finished execution.
+-   `event_time_microseconds` ([DateTime](../../sql-reference/data-types/datetime.md)) — The date and time when the view finished execution with microseconds precision.
+-   `view_duration_ms` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Duration of view execution (sum of its stages) in milliseconds.
+-   `initial_query_id` ([String](../../sql-reference/data-types/string.md)) — ID of the initial query (for distributed query execution).
+-   `view_name` ([String](../../sql-reference/data-types/string.md)) — Name of the view.
+-   `view_uuid` ([UUID](../../sql-reference/data-types/uuid.md)) — UUID of the view.
+-   `view_type` ([Enum8](../../sql-reference/data-types/enum.md)) — Type of the view. Values:
+    -   `'Default' = 1` — [Default views](../../sql-reference/statements/create/view.md#normal). Should not appear in this log.
+    -   `'Materialized' = 2` — [Materialized views](../../sql-reference/statements/create/view.md#materialized).
+    -   `'Live' = 3` — [Live views](../../sql-reference/statements/create/view.md#live-view).
+-   `view_query` ([String](../../sql-reference/data-types/string.md)) — The query executed by the view.
+-   `view_target` ([String](../../sql-reference/data-types/string.md)) — The name of the view target table.
+-   `read_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read rows.
+-   `read_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of read bytes.
+-   `written_rows` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of written rows.
+-   `written_bytes` ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Number of written bytes.
+-   `peak_memory_usage` ([Int64](../../sql-reference/data-types/int-uint.md)) — The maximum difference between the amount of allocated and freed memory in context of this view.
+-   `ProfileEvents` ([Map(String, UInt64)](../../sql-reference/data-types/array.md)) — ProfileEvents that measure different metrics. The description of them could be found in the table [system.events](../../operations/system-tables/events.md#system_tables-events).
+-   `status` ([Enum8](../../sql-reference/data-types/enum.md)) — Status of the view. Values:
+    -   `'QueryStart' = 1` — Successful start the view execution. Should not appear.
+    -   `'QueryFinish' = 2` — Successful end of the view execution.
+    -   `'ExceptionBeforeStart' = 3` — Exception before the start of the view execution.
+    -   `'ExceptionWhileProcessing' = 4` — Exception during the view execution.
+-   `exception_code` ([Int32](../../sql-reference/data-types/int-uint.md)) — Code of an exception.
+-   `exception` ([String](../../sql-reference/data-types/string.md)) — Exception message.
+-   `stack_trace` ([String](../../sql-reference/data-types/string.md)) — [Stack trace](https://en.wikipedia.org/wiki/Stack_trace). An empty string, if the query was completed successfully.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT * FROM system.query_views_log LIMIT 1 \G;
+```
+
+Result:
+
+``` text
+Row 1:
+──────
+event_date:              2021-06-22
+event_time:              2021-06-22 13:23:07
+event_time_microseconds: 2021-06-22 13:23:07.738221
+view_duration_ms:        0
+initial_query_id:        c3a1ac02-9cad-479b-af54-9e9c0a7afd70
+view_name:               default.matview_inner
+view_uuid:               00000000-0000-0000-0000-000000000000
+view_type:               Materialized
+view_query:              SELECT * FROM default.table_b
+view_target:             default.`.inner.matview_inner`
+read_rows:               4
+read_bytes:              64
+written_rows:            2
+written_bytes:           32
+peak_memory_usage:       4196188
+ProfileEvents:           {'FileOpen':2,'WriteBufferFromFileDescriptorWrite':2,'WriteBufferFromFileDescriptorWriteBytes':187,'IOBufferAllocs':3,'IOBufferAllocBytes':3145773,'FunctionExecute':3,'DiskWriteElapsedMicroseconds':13,'InsertedRows':2,'InsertedBytes':16,'SelectedRows':4,'SelectedBytes':48,'ContextLock':16,'RWLockAcquiredReadLocks':1,'RealTimeMicroseconds':698,'SoftPageFaults':4,'OSReadChars':463}
+status:                  QueryFinish
+exception_code:          0
+exception:
+stack_trace:
+```
+
+**See Also**
+
+-   [system.query_log](../../operations/system-tables/query_log.md#system_tables-query_log) — Description of the `query_log` system table which contains common information about queries execution.
+-   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — This table contains information about each query execution thread.
+
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/query_thread_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/quota_limits.md b/docs/en/operations/system-tables/quota_limits.md
index 0088b086e8c..708c4e4e33e 100644
--- a/docs/en/operations/system-tables/quota_limits.md
+++ b/docs/en/operations/system-tables/quota_limits.md
@@ -18,4 +18,4 @@ Columns:
 - `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum number of bytes read from all tables and table functions participated in queries.
 - `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Maximum of the query execution time, in seconds.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quota_limits) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quota_limits) <!--hide-->
diff --git a/docs/en/operations/system-tables/quota_usage.md b/docs/en/operations/system-tables/quota_usage.md
index 2f35b6b7dae..6f4d3c9c8ee 100644
--- a/docs/en/operations/system-tables/quota_usage.md
+++ b/docs/en/operations/system-tables/quota_usage.md
@@ -29,4 +29,4 @@ Columns:
 
 -   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quota_usage) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quota_usage) <!--hide-->
diff --git a/docs/en/operations/system-tables/quotas.md b/docs/en/operations/system-tables/quotas.md
index 6acc349a54f..bdcc13340f0 100644
--- a/docs/en/operations/system-tables/quotas.md
+++ b/docs/en/operations/system-tables/quotas.md
@@ -10,7 +10,7 @@ Columns:
     - `[]` — All users share the same quota.
     - `['user_name']` — Connections with the same user name share the same quota.
     - `['ip_address']` — Connections from the same IP share the same quota.
-    - `['client_key']` — Connections with the same key share the same quota. A key must be explicitly provided by a client. When using [clickhouse-client](../../interfaces/cli.md), pass a key value in the `--quota-key` parameter, or use the `quota_key` parameter in the client configuration file. When using HTTP interface, use the `X-ClickHouse-Quota` header.
+    - `['client_key']` — Connections with the same key share the same quota. A key must be explicitly provided by a client. When using [clickhouse-client](../../interfaces/cli.md), pass a key value in the `--quota_key` parameter, or use the `quota_key` parameter in the client configuration file. When using HTTP interface, use the `X-ClickHouse-Quota` header.
     - `['user_name', 'client_key']` — Connections with the same `client_key` share the same quota. If a key isn’t provided by a client, the qouta is tracked for `user_name`.
     - `['client_key', 'ip_address']` — Connections with the same `client_key` share the same quota. If a key isn’t provided by a client, the qouta is tracked for `ip_address`.
 - `durations` ([Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Time interval lengths in seconds.
@@ -24,5 +24,5 @@ Columns:
 
 -   [SHOW QUOTAS](../../sql-reference/statements/show.md#show-quotas-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quotas) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quotas) <!--hide-->
 
diff --git a/docs/en/operations/system-tables/quotas_usage.md b/docs/en/operations/system-tables/quotas_usage.md
index 6ba88cb935a..7d39af0f601 100644
--- a/docs/en/operations/system-tables/quotas_usage.md
+++ b/docs/en/operations/system-tables/quotas_usage.md
@@ -32,4 +32,4 @@ Columns:
 
 -   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/quotas_usage) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/quotas_usage) <!--hide-->
diff --git a/docs/en/operations/system-tables/replicas.md b/docs/en/operations/system-tables/replicas.md
index e2cc607f6d8..ff1057ca8b1 100644
--- a/docs/en/operations/system-tables/replicas.md
+++ b/docs/en/operations/system-tables/replicas.md
@@ -8,43 +8,48 @@ Example:
 ``` sql
 SELECT *
 FROM system.replicas
-WHERE table = 'visits'
+WHERE table = 'test_table'
 FORMAT Vertical
 ```
 
 ``` text
+Query id: dc6dcbcb-dc28-4df9-ae27-4354f5b3b13e
+
 Row 1:
-──────
-database:                   merge
-table:                      visits
-engine:                     ReplicatedCollapsingMergeTree
-is_leader:                  1
-can_become_leader:          1
-is_readonly:                0
-is_session_expired:         0
-future_parts:               1
-parts_to_check:             0
-zookeeper_path:             /clickhouse/tables/01-06/visits
-replica_name:               example01-06-1.yandex.ru
-replica_path:               /clickhouse/tables/01-06/visits/replicas/example01-06-1.yandex.ru
-columns_version:            9
-queue_size:                 1
-inserts_in_queue:           0
-merges_in_queue:            1
-part_mutations_in_queue:    0
-queue_oldest_time:          2020-02-20 08:34:30
-inserts_oldest_time:        1970-01-01 00:00:00
-merges_oldest_time:         2020-02-20 08:34:30
-part_mutations_oldest_time: 1970-01-01 00:00:00
-oldest_part_to_get:
-oldest_part_to_merge_to:    20200220_20284_20840_7
-oldest_part_to_mutate_to:
-log_max_index:              596273
-log_pointer:                596274
-last_queue_update:          2020-02-20 08:34:32
-absolute_delay:             0
-total_replicas:             2
-active_replicas:            2
+───────
+database:                    db
+table:                       test_table
+engine:                      ReplicatedMergeTree
+is_leader:                   1
+can_become_leader:           1
+is_readonly:                 0
+is_session_expired:          0
+future_parts:                0
+parts_to_check:              0
+zookeeper_path:              /test/test_table
+replica_name:                r1
+replica_path:                /test/test_table/replicas/r1
+columns_version:             -1
+queue_size:                  27
+inserts_in_queue:            27
+merges_in_queue:             0
+part_mutations_in_queue:     0
+queue_oldest_time:           2021-10-12 14:48:48
+inserts_oldest_time:         2021-10-12 14:48:48
+merges_oldest_time:          1970-01-01 03:00:00
+part_mutations_oldest_time:  1970-01-01 03:00:00
+oldest_part_to_get:          1_17_17_0
+oldest_part_to_merge_to:     
+oldest_part_to_mutate_to:    
+log_max_index:               206
+log_pointer:                 207
+last_queue_update:           2021-10-12 14:50:08
+absolute_delay:              99
+total_replicas:              5
+active_replicas:             5
+last_queue_update_exception: 
+zookeeper_exception:         
+replica_is_active:           {'r1':1,'r2':1}
 ```
 
 Columns:
@@ -82,6 +87,8 @@ The next 4 columns have a non-zero value only where there is an active session w
 -   `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
 -   `total_replicas` (`UInt8`) - The total number of known replicas of this table.
 -   `active_replicas` (`UInt8`) - The number of replicas of this table that have a session in ZooKeeper (i.e., the number of functioning replicas).
+-   `last_queue_update_exception` (`String`) - When the queue contains broken entries. Especially important when ClickHouse breaks backward compatibility between versions and log entries written by newer versions aren't parseable by old versions.
+-   `zookeeper_exception` (`String`) - The last exception message, got if the error happened when fetching the info from ZooKeeper. 
 -   `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — Map between replica name and is replica active.
 
 If you request all the columns, the table may work a bit slowly, since several reads from ZooKeeper are made for each row.
@@ -121,5 +128,5 @@ WHERE
 
 If this query does not return anything, it means that everything is fine.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/replicas) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/replicas) <!--hide-->
 
diff --git a/docs/en/operations/system-tables/replicated_fetches.md b/docs/en/operations/system-tables/replicated_fetches.md
index bc7e6335c0d..241bb609853 100644
--- a/docs/en/operations/system-tables/replicated_fetches.md
+++ b/docs/en/operations/system-tables/replicated_fetches.md
@@ -67,4 +67,4 @@ thread_id:                   54
 
 -   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system/#query-language-system-replicated)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/replicated_fetches) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/replicated_fetches) <!--hide-->
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index 965774b81bf..ac4cdddb37b 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -88,4 +88,4 @@ last_postpone_time:     1970-01-01 03:00:00
 
 -   [Managing ReplicatedMergeTree Tables](../../sql-reference/statements/system.md#query-language-system-replicated)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system_tables/replication_queue) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system_tables/replication_queue) <!--hide-->
diff --git a/docs/en/operations/system-tables/role-grants.md b/docs/en/operations/system-tables/role-grants.md
index d754c6d7fb5..6da221af1a4 100644
--- a/docs/en/operations/system-tables/role-grants.md
+++ b/docs/en/operations/system-tables/role-grants.md
@@ -18,4 +18,4 @@ Columns:
     -   1 — The role has `ADMIN OPTION` privilege.
     -   0 — The role without `ADMIN OPTION` privilege.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/role-grants) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/role-grants) <!--hide-->
diff --git a/docs/en/operations/system-tables/roles.md b/docs/en/operations/system-tables/roles.md
index e68d5ed290a..7a71270b6c4 100644
--- a/docs/en/operations/system-tables/roles.md
+++ b/docs/en/operations/system-tables/roles.md
@@ -12,4 +12,4 @@ Columns:
 
 -   [SHOW ROLES](../../sql-reference/statements/show.md#show-roles-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/roles) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/roles) <!--hide-->
diff --git a/docs/en/operations/system-tables/row_policies.md b/docs/en/operations/system-tables/row_policies.md
index 157ec75f05e..95a26efe952 100644
--- a/docs/en/operations/system-tables/row_policies.md
+++ b/docs/en/operations/system-tables/row_policies.md
@@ -31,4 +31,4 @@ Columns:
 
 -   [SHOW POLICIES](../../sql-reference/statements/show.md#show-policies-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/row_policies) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/row_policies) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings.md b/docs/en/operations/system-tables/settings.md
index cfd9f43655a..5d5eda2abc1 100644
--- a/docs/en/operations/system-tables/settings.md
+++ b/docs/en/operations/system-tables/settings.md
@@ -50,4 +50,4 @@ SELECT * FROM system.settings WHERE changed AND name='load_balancing'
 -   [Constraints on Settings](../../operations/settings/constraints-on-settings.md)
 -   [SHOW SETTINGS](../../sql-reference/statements/show.md#show-settings) statement
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/settings) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/settings) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings_profile_elements.md b/docs/en/operations/system-tables/settings_profile_elements.md
index 3c8c728e645..d812d8f74e0 100644
--- a/docs/en/operations/system-tables/settings_profile_elements.md
+++ b/docs/en/operations/system-tables/settings_profile_elements.md
@@ -27,4 +27,4 @@ Columns:
 
 -    `inherit_profile` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — A parent profile for this setting profile. `NULL` if not set. Setting profile will inherit all the settings' values and constraints (`min`, `max`, `readonly`) from its parent profiles.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/settings_profile_elements) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/settings_profile_elements) <!--hide-->
diff --git a/docs/en/operations/system-tables/settings_profiles.md b/docs/en/operations/system-tables/settings_profiles.md
index 7339c5c2ef6..f9b62cf5194 100644
--- a/docs/en/operations/system-tables/settings_profiles.md
+++ b/docs/en/operations/system-tables/settings_profiles.md
@@ -21,4 +21,4 @@ Columns:
 
 -   [SHOW PROFILES](../../sql-reference/statements/show.md#show-profiles-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/settings_profiles) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/settings_profiles) <!--hide-->
diff --git a/docs/en/operations/system-tables/storage_policies.md b/docs/en/operations/system-tables/storage_policies.md
index 4b07b593926..3d5be4b952b 100644
--- a/docs/en/operations/system-tables/storage_policies.md
+++ b/docs/en/operations/system-tables/storage_policies.md
@@ -14,4 +14,4 @@ Columns:
 
 If the storage policy contains more then one volume, then information for each volume is stored in the individual row of the table.
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/storage_policies) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/storage_policies) <!--hide-->
diff --git a/docs/en/operations/system-tables/table_engines.md b/docs/en/operations/system-tables/table_engines.md
index 45ff6f1ac19..57fb5b0ff37 100644
--- a/docs/en/operations/system-tables/table_engines.md
+++ b/docs/en/operations/system-tables/table_engines.md
@@ -35,4 +35,4 @@ WHERE name in ('Kafka', 'MergeTree', 'ReplicatedCollapsingMergeTree')
 -   Kafka [settings](../../engines/table-engines/integrations/kafka.md#table_engine-kafka-creating-a-table)
 -   Join [settings](../../engines/table-engines/special/join.md#join-limitations-and-settings)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/table_engines) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/table_engines) <!--hide-->
diff --git a/docs/en/operations/system-tables/tables.md b/docs/en/operations/system-tables/tables.md
index f37da02cf5b..f7da8a39856 100644
--- a/docs/en/operations/system-tables/tables.md
+++ b/docs/en/operations/system-tables/tables.md
@@ -117,4 +117,4 @@ lifetime_bytes:             ᴺᵁᴸᴸ
 comment:
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/tables) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/tables) <!--hide-->
diff --git a/docs/en/operations/system-tables/text_log.md b/docs/en/operations/system-tables/text_log.md
index e97af34beec..9ed0aa1ee5b 100644
--- a/docs/en/operations/system-tables/text_log.md
+++ b/docs/en/operations/system-tables/text_log.md
@@ -50,4 +50,4 @@ source_file:             /ClickHouse/src/Interpreters/DNSCacheUpdater.cpp; void
 source_line:             45
 ```
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/text_log) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/text_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/time_zones.md b/docs/en/operations/system-tables/time_zones.md
index fa467124884..68f16a665cc 100644
--- a/docs/en/operations/system-tables/time_zones.md
+++ b/docs/en/operations/system-tables/time_zones.md
@@ -27,4 +27,4 @@ SELECT * FROM system.time_zones LIMIT 10
 └────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/time_zones) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/time_zones) <!--hide-->
diff --git a/docs/en/operations/system-tables/trace_log.md b/docs/en/operations/system-tables/trace_log.md
index cc70b2d8236..4902b09004d 100644
--- a/docs/en/operations/system-tables/trace_log.md
+++ b/docs/en/operations/system-tables/trace_log.md
@@ -54,4 +54,4 @@ trace:                   [371912858,371912789,371798468,371799717,371801313,3717
 size:                    5244400
 ```
 
- [Original article](https://clickhouse.tech/docs/en/operations/system-tables/trace_log) <!--hide-->
+ [Original article](https://clickhouse.com/docs/en/operations/system-tables/trace_log) <!--hide-->
diff --git a/docs/en/operations/system-tables/users.md b/docs/en/operations/system-tables/users.md
index 0170c85a6d5..e6ab63b9df5 100644
--- a/docs/en/operations/system-tables/users.md
+++ b/docs/en/operations/system-tables/users.md
@@ -31,4 +31,4 @@ Columns:
 
 -   [SHOW USERS](../../sql-reference/statements/show.md#show-users-statement)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/users) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/users) <!--hide-->
diff --git a/docs/en/operations/system-tables/zookeeper.md b/docs/en/operations/system-tables/zookeeper.md
index 52d1c686e52..bec1d1272d6 100644
--- a/docs/en/operations/system-tables/zookeeper.md
+++ b/docs/en/operations/system-tables/zookeeper.md
@@ -72,4 +72,4 @@ numChildren:    7
 pzxid:          987021252247
 path:           /clickhouse/tables/01-08/visits/replicas
 ```
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/zookeeper) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/zookeeper) <!--hide-->
diff --git a/docs/en/operations/system-tables/zookeeper_log.md b/docs/en/operations/system-tables/zookeeper_log.md
new file mode 100644
index 00000000000..f7d86c6689b
--- /dev/null
+++ b/docs/en/operations/system-tables/zookeeper_log.md
@@ -0,0 +1,129 @@
+# system.zookeeper_log {#system-zookeeper_log}
+
+This table contains information about the parameters of the request to the ZooKeeper server and the response from it.
+
+For requests, only columns with request parameters are filled in, and the remaining columns are filled with default values (`0` or `NULL`). When the response arrives, the data from the response is added to the other columns.
+
+Columns with request parameters:
+
+-   `type` ([Enum](../../sql-reference/data-types/enum.md)) — Event type in the ZooKeeper client. Can have one of the following values:
+    -   `Request` — The request has been sent.
+    -   `Response` — The response was received.
+    -   `Finalize` — The connection is lost, no response was received.
+-   `event_date` ([Date](../../sql-reference/data-types/date.md)) — The date when the event happened.
+-   `event_time` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — The date and time when the event happened.
+-   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP address of ZooKeeper server that was used to make the request.
+-   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — The port of ZooKeeper server that was used to make the request.
+-   `session_id` ([Int64](../../sql-reference/data-types/int-uint.md)) — The session ID that the ZooKeeper server sets for each connection.
+-   `xid` ([Int32](../../sql-reference/data-types/int-uint.md)) — The ID of the request within the session. This is usually a sequential request number. It is the same for the request row and the paired `response`/`finalize` row.
+-   `has_watch` ([UInt8](../../sql-reference/data-types/int-uint.md)) — The request whether the [watch](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#ch_zkWatches) has been set.
+-   `op_num` ([Enum](../../sql-reference/data-types/enum.md)) — The type of request or response.
+-   `path` ([String](../../sql-reference/data-types/string.md)) — The path to the ZooKeeper node specified in the request, or an empty string  if the request not requires specifying a path.
+-   `data` ([String](../../sql-reference/data-types/string.md)) — The data written to the ZooKeeper node (for the `SET` and `CREATE` requests — what the request wanted to write, for the response to the `GET` request — what was read) or an empty string.
+-   `is_ephemeral` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the ZooKeeper node being created as an [ephemeral](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Ephemeral+Nodes).
+-   `is_sequential` ([UInt8](../../sql-reference/data-types/int-uint.md)) — Is the ZooKeeper node being created as an [sequential](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming).
+-   `version` ([Nullable(Int32)](../../sql-reference/data-types/nullable.md)) — The version of the ZooKeeper node that the request expects when executing. This is supported for `CHECK`, `SET`, `REMOVE` requests (is relevant `-1` if the request does not check the version or `NULL` for other requests that do not support version checking).
+-   `requests_size` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of requests included in the multi request (this is a special request that consists of several consecutive ordinary requests and executes them atomically). All requests included in multi request will have the same `xid`.
+-   `request_idx` ([UInt32](../../sql-reference/data-types/int-uint.md)) — The number of the request included in multi request (for multi request — `0`, then in order from `1`).
+
+Columns with request response parameters:
+
+-   `zxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — ZooKeeper transaction ID. The serial number issued by the ZooKeeper server in response to a successfully executed request (`0` if the request was not executed/returned an error/the client does not know whether the request was executed).
+-   `error` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — Error code. Can have many values, here are just some of them:
+    -   `ZOK` — The request was executed seccessfully.
+    -   `ZCONNECTIONLOSS` — The connection was lost.
+    -   `ZOPERATIONTIMEOUT` — The request execution timeout has expired.
+	-   `ZSESSIONEXPIRED` — The session has expired.
+    -   `NULL` — The request is completed.
+-   `watch_type` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — The type of the `watch` event (for responses with `op_num` = `Watch`), for the remaining responses: `NULL`.
+-   `watch_state` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — The status of the `watch` event (for responses with `op_num` = `Watch`), for the remaining responses: `NULL`.
+-   `path_created` ([String](../../sql-reference/data-types/string.md)) — The path to the created ZooKeeper node (for responses to the `CREATE` request), may differ from the `path` if the node is created as a `sequential`.
+-   `stat_czxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The `zxid` of the change that caused this ZooKeeper node to be created.
+-   `stat_mzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The `zxid` of the change that last modified this ZooKeeper node.
+-   `stat_pzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — The transaction ID of the change that last modified childern of this ZooKeeper node.
+-   `stat_version` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of changes to the data of this ZooKeeper node.
+-   `stat_cversion` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of changes to the children of this ZooKeeper node.
+-   `stat_dataLength` ([Int32](../../sql-reference/data-types/int-uint.md)) — The length of the data field of this ZooKeeper node.
+-   `stat_numChildren` ([Int32](../../sql-reference/data-types/int-uint.md)) — The number of children of this ZooKeeper node.
+-   `children` ([Array(String)](../../sql-reference/data-types/array.md)) — The list of child ZooKeeper nodes (for responses to `LIST` request).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT * FROM system.zookeeper_log WHERE (session_id = '106662742089334927') AND (xid = '10858') FORMAT Vertical;
+```
+
+Result:
+
+``` text
+Row 1:
+──────
+type:             Request
+event_date:       2021-08-09
+event_time:       2021-08-09 21:38:30.291792
+address:          ::
+port:             2181
+session_id:       106662742089334927
+xid:              10858
+has_watch:        1
+op_num:           List
+path:             /clickhouse/task_queue/ddl
+data:             
+is_ephemeral:     0
+is_sequential:    0
+version:          ᴺᵁᴸᴸ
+requests_size:    0
+request_idx:      0
+zxid:             0
+error:            ᴺᵁᴸᴸ
+watch_type:       ᴺᵁᴸᴸ
+watch_state:      ᴺᵁᴸᴸ
+path_created:     
+stat_czxid:       0
+stat_mzxid:       0
+stat_pzxid:       0
+stat_version:     0
+stat_cversion:    0
+stat_dataLength:  0
+stat_numChildren: 0
+children:         []
+
+Row 2:
+──────
+type:             Response
+event_date:       2021-08-09
+event_time:       2021-08-09 21:38:30.292086
+address:          ::
+port:             2181
+session_id:       106662742089334927
+xid:              10858
+has_watch:        1
+op_num:           List
+path:             /clickhouse/task_queue/ddl
+data:             
+is_ephemeral:     0
+is_sequential:    0
+version:          ᴺᵁᴸᴸ
+requests_size:    0
+request_idx:      0
+zxid:             16926267
+error:            ZOK
+watch_type:       ᴺᵁᴸᴸ
+watch_state:      ᴺᵁᴸᴸ
+path_created:     
+stat_czxid:       16925469
+stat_mzxid:       16925469
+stat_pzxid:       16926179
+stat_version:     0
+stat_cversion:    7
+stat_dataLength:  0
+stat_numChildren: 7
+children:         ['query-0000000006','query-0000000005','query-0000000004','query-0000000003','query-0000000002','query-0000000001','query-0000000000']
+```
+
+**See Also**
+
+-   [ZooKeeper](../../operations/tips.md#zookeeper)
+-   [ZooKeeper guide](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html)
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index 4291b91b41d..54c66bb8d13 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -1,4 +1,3 @@
----
 toc_priority: 58
 toc_title: Usage Recommendations
 ---
@@ -33,6 +32,9 @@ $ echo 0 | sudo tee /proc/sys/vm/overcommit_memory
 Use `perf top` to watch the time spent in the kernel for memory management.
 Permanent huge pages also do not need to be allocated.
 
+!!! warning "Attention"
+    If your system has less than 16 GB of RAM you may experience various memory exceptions because default settings does not match this amount of RAM. Recommended amount of RAM is 32 GB or more. You can use ClickHouse in system with small amount of RAM, even with 2 GB of RAM, but it requires an additional tuning and able to process small ingestion rate.
+
 ## Storage Subsystem {#storage-subsystem}
 
 If your budget allows you to use SSD, use SSD.
@@ -57,7 +59,7 @@ $ echo 4096 | sudo tee /sys/block/md2/md/stripe_cache_size
 
 Calculate the exact number from the number of devices and the block size, using the formula: `2 * num_devices * chunk_size_in_bytes / 4096`.
 
-A block size of 1024 KB is sufficient for all RAID configurations.
+A block size of 64 KB is sufficient for most RAID configurations. The average clickhouse-server write size is approximately 1 MB (1024 KB), and thus the recommended stripe size is also 1 MB. The block size can be optimized if needed when set to 1 MB divided by the number of non-parity disks in the RAID array, such that each write is parallelized across all available non-parity disks.
 Never set the block size too small or too large.
 
 You can use RAID-0 on SSD.
@@ -68,7 +70,7 @@ For HDD, enable the write cache.
 
 ## File System {#file-system}
 
-Ext4 is the most reliable option. Set the mount options `noatime, nobarrier`.
+Ext4 is the most reliable option. Set the mount options `noatime`.
 XFS is also suitable, but it hasn’t been as thoroughly tested with ClickHouse.
 Most other file systems should also work fine. File systems with delayed allocation work better.
 
@@ -259,4 +261,4 @@ script
 end script
 ```
 
-{## [Original article](https://clickhouse.tech/docs/en/operations/tips/) ##}
+{## [Original article](https://clickhouse.com/docs/en/operations/tips/) ##}
diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index 5971fc0f9b3..6aa5ea556fc 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -160,4 +160,4 @@ localhost:9000, queries 10, QPS: 6.082, RPS: 121959604.568, MiB/s: 930.478, resu
 99.990%     0.172 sec.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark.md) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark.md) <!--hide-->
diff --git a/docs/en/operations/utilities/clickhouse-copier.md b/docs/en/operations/utilities/clickhouse-copier.md
index d9c209f2101..3e729a3a3dd 100644
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ b/docs/en/operations/utilities/clickhouse-copier.md
@@ -73,7 +73,7 @@ Parameters:
             <!--
                 source cluster & destination clusters accept exactly the same
                 parameters as parameters for the usual Distributed table
-                see https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/
+                see https://clickhouse.com/docs/en/engines/table-engines/special/distributed/
             -->
             <shard>
                 <internal_replication>false</internal_replication>
@@ -184,4 +184,4 @@ Parameters:
 
 `clickhouse-copier` tracks the changes in `/task/path/description` and applies them on the fly. For instance, if you change the value of `max_workers`, the number of processes running tasks will also change.
 
-[Original article](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/en/operations/utilities/clickhouse-local.md b/docs/en/operations/utilities/clickhouse-local.md
index b166e2f1b3c..9d28dffbc16 100644
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@@ -114,4 +114,4 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[Original article](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/parametric-functions.md b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
index bdf115acb34..3adedd0ae70 100644
--- a/docs/en/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
@@ -154,7 +154,7 @@ SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 3) FROM
 └──────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-In this case, the function couldn’t find the event chain matching the pattern, because the event for number 3 occured between 1 and 2. If in the same case we checked the condition for number 4, the sequence would match the pattern.
+In this case, the function couldn’t find the event chain matching the pattern, because the event for number 3 occurred between 1 and 2. If in the same case we checked the condition for number 4, the sequence would match the pattern.
 
 ``` sql
 SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM t
@@ -255,7 +255,7 @@ windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 
 -   `window` — Length of the sliding window, it is the time interval between the first and the last condition. The unit of `window` depends on the `timestamp` itself and varies. Determined using the expression `timestamp of cond1 <= timestamp of cond2 <= ... <= timestamp of condN <= timestamp of cond1 + window`.
 -   `mode` — It is an optional argument. One or more modes can be set.
-    -   `'strict'` — If same condition holds for sequence of events then such non-unique events would be skipped.
+    -   `'strict_deduplication'` — If the same condition holds for the sequence of events, then such repeating event interrupts further processing.
     -   `'strict_order'` — Don't allow interventions of other events. E.g. in the case of `A->B->D->C`, it stops finding `A->B->C` at the `D` and the max event level is 2.
     -   `'strict_increase'` — Apply conditions only to events with strictly increasing timestamps.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/avg.md b/docs/en/sql-reference/aggregate-functions/reference/avg.md
index 14a4a4c5ad5..9a22faedf7c 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/avg.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/avg.md
@@ -63,4 +63,4 @@ Result:
 └────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avg/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/count.md b/docs/en/sql-reference/aggregate-functions/reference/count.md
index 51ebf2fc0b0..073fd267c42 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/count.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/count.md
@@ -29,7 +29,7 @@ In both cases the type of the returned value is [UInt64](../../../sql-reference/
 
 ClickHouse supports the `COUNT(DISTINCT ...)` syntax. The behavior of this construction depends on the [count_distinct_implementation](../../../operations/settings/settings.md#settings-count_distinct_implementation) setting. It defines which of the [uniq\*](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) functions is used to perform the operation. The default is the [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact) function.
 
-The `SELECT count() FROM table` query is not optimized, because the number of entries in the table is not stored separately. It chooses a small column from the table and counts the number of values in it.
+The `SELECT count() FROM table` query is optimized by default using metadata from MergeTree. If you need to use row-level security, disable optimization using the [optimize_trivial_count_query](../../../operations/settings/settings.md#optimize-trivial-count-query) setting.
 
 However `SELECT count(nullable_column) FROM table` query can be optimized by enabling the [optimize_functions_to_subcolumns](../../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [null](../../../sql-reference/data-types/nullable.md#finding-null) subcolumn instead of reading and processing the whole column data. The query `SELECT count(n) FROM table` transforms to `SELECT sum(NOT n.null) FROM table`.
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/entropy.md b/docs/en/sql-reference/aggregate-functions/reference/entropy.md
new file mode 100644
index 00000000000..5ebb678e6b5
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/entropy.md
@@ -0,0 +1,43 @@
+---
+toc_priority: 302
+---
+
+# entropy {#entropy}
+
+Calculates [Shannon entropy](https://en.wikipedia.org/wiki/Entropy_(information_theory)) of a column of values.
+
+**Syntax**
+
+``` sql
+entropy(val)
+```
+
+**Arguments**
+
+-   `val` — Column of values of any type.
+
+**Returned value**
+
+-   Shannon entropy.
+
+Type: [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE entropy (`vals` UInt32,`strings` String) ENGINE = Memory;
+
+INSERT INTO entropy VALUES (1, 'A'), (1, 'A'), (1,'A'), (1,'A'), (2,'B'), (2,'B'), (2,'C'), (2,'D');
+
+SELECT entropy(vals), entropy(strings) FROM entropy;
+```
+
+Result:
+
+``` text
+┌─entropy(vals)─┬─entropy(strings)─┐
+│             1 │             1.75 │
+└───────────────┴──────────────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/index.md b/docs/en/sql-reference/aggregate-functions/reference/index.md
index b96fa887279..59befed8785 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/index.md
@@ -66,9 +66,11 @@ ClickHouse-specific aggregate functions:
 -   [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
 -   [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
 -   [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
+-   [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
+-   [quantileBFloat16Weighted](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
 -   [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
 -   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
 -   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
 -   [categoricalInformationValue](../../../sql-reference/aggregate-functions/reference/categoricalinformationvalue.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
index 8c57a3eb896..fe97f7edbf8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -71,4 +71,4 @@ Result:
 -   [Mann–Whitney U test](https://en.wikipedia.org/wiki/Mann%E2%80%93Whitney_U_test)
 -   [Stochastic ordering](https://en.wikipedia.org/wiki/Stochastic_ordering)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
index 25c7233aa56..728c200441d 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -58,6 +58,10 @@ Result:
 ```
 Note that all floating point values in the example are truncated to 1.0 when converting to `bfloat16`.
 
+# quantileBFloat16Weighted {#quantilebfloat16weighted}
+
+Like `quantileBFloat16` but takes into account the weight of each sequence member.
+
 **See Also**
 
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
index 36f80ae6cd7..fd391298bc3 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/studentttest.md
@@ -63,4 +63,4 @@ Result:
 -   [Student's t-test](https://en.wikipedia.org/wiki/Student%27s_t-test)
 -   [welchTTest function](welchttest.md#welchttest)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/studentttest/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/studentttest/) <!--hide-->
diff --git a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
index 2986511e01a..00a7a9fc9f1 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/sumcount.md
@@ -43,4 +43,4 @@ Result:
 
 **See also**
 
-- [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg) setting.
+- [optimize_syntax_fuse_functions](../../../operations/settings/settings.md#optimize_syntax_fuse_functions) setting.
diff --git a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
index 2c1a043aed6..62f5761b32e 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/welchttest.md
@@ -63,4 +63,4 @@ Result:
 -   [Welch's t-test](https://en.wikipedia.org/wiki/Welch%27s_t-test)
 -   [studentTTest function](studentttest.md#studentttest)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/welchTTest/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/welchTTest/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/aggregatefunction.md b/docs/en/sql-reference/data-types/aggregatefunction.md
index 5bc8ffc666b..81945eeece6 100644
--- a/docs/en/sql-reference/data-types/aggregatefunction.md
+++ b/docs/en/sql-reference/data-types/aggregatefunction.md
@@ -65,4 +65,4 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 See [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) engine description.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/boolean.md b/docs/en/sql-reference/data-types/boolean.md
index 5890725da8f..ca44238277c 100644
--- a/docs/en/sql-reference/data-types/boolean.md
+++ b/docs/en/sql-reference/data-types/boolean.md
@@ -7,4 +7,4 @@ toc_title: Boolean
 
 There is no separate type for boolean values. Use UInt8 type, restricted to the values 0 or 1.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/boolean/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/boolean/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/date.md b/docs/en/sql-reference/data-types/date.md
index 0cfac4d59fe..bd39de14d47 100644
--- a/docs/en/sql-reference/data-types/date.md
+++ b/docs/en/sql-reference/data-types/date.md
@@ -9,9 +9,9 @@ A date. Stored in two bytes as the number of days since 1970-01-01 (unsigned). A
 
 The date value is stored without the time zone.
 
-## Examples {#examples}
+**Example**
 
-**1.** Creating a table with a `DateTime`-type column and inserting data into it:
+Creating a table with a `Date`-type column and inserting data into it:
 
 ``` sql
 CREATE TABLE dt
@@ -23,10 +23,7 @@ ENGINE = TinyLog;
 ```
 
 ``` sql
-INSERT INTO dt Values (1546300800, 1), ('2019-01-01', 2);
-```
-
-``` sql
+INSERT INTO dt VALUES (1546300800, 1), ('2019-01-01', 2);
 SELECT * FROM dt;
 ```
 
@@ -37,11 +34,8 @@ SELECT * FROM dt;
 └────────────┴──────────┘
 ```
 
-## See Also {#see-also}
+**See Also**
 
 -   [Functions for working with dates and times](../../sql-reference/functions/date-time-functions.md)
 -   [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
 -   [`DateTime` data type](../../sql-reference/data-types/datetime.md)
-
-
-[Original article](https://clickhouse.tech/docs/en/data_types/date/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/date32.md b/docs/en/sql-reference/data-types/date32.md
new file mode 100644
index 00000000000..592f952e1be
--- /dev/null
+++ b/docs/en/sql-reference/data-types/date32.md
@@ -0,0 +1,40 @@
+---
+toc_priority: 48
+toc_title: Date32
+---
+
+# Date32 {#data_type-datetime32}
+
+A date. Supports the date range same with [Datetime64](../../sql-reference/data-types/datetime64.md). Stored in four bytes as the number of days since 1925-01-01. Allows storing values till 2283-11-11. 
+
+**Examples**
+
+Creating a table with a `Date32`-type column and inserting data into it:
+
+``` sql
+CREATE TABLE new
+(
+    `timestamp` Date32,
+    `event_id` UInt8
+)
+ENGINE = TinyLog;
+```
+
+``` sql
+INSERT INTO new VALUES (4102444800, 1), ('2100-01-01', 2);
+SELECT * FROM new;
+```
+
+``` text
+┌──timestamp─┬─event_id─┐
+│ 2100-01-01 │        1 │
+│ 2100-01-01 │        2 │
+└────────────┴──────────┘
+```
+
+**See Also**
+
+-   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
+-   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
+-   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null) 
+
diff --git a/docs/en/sql-reference/data-types/datetime.md b/docs/en/sql-reference/data-types/datetime.md
index ed07f599b91..1f9a79b5444 100644
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@@ -145,4 +145,4 @@ Time shifts for multiple days. Some pacific islands changed their timezone offse
 -   [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
 -   [The `Date` data type](../../sql-reference/data-types/date.md)
 
-[Original article](https://clickhouse.tech/docs/en/data_types/datetime/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/datetime/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index 1d3725b9fb3..bac1a080a80 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -7,7 +7,8 @@ toc_title: DateTime64
 
 Allows to store an instant in time, that can be expressed as a calendar date and a time of a day, with defined sub-second precision
 
-Tick size (precision): 10<sup>-precision</sup> seconds
+Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ]. 
+Typically are used - 3 (milliseconds), 6 (microseconds), 9 (nanoseconds).
 
 **Syntax:**
 
@@ -17,7 +18,7 @@ DateTime64(precision, [timezone])
 
 Internally, stores data as a number of ‘ticks’ since epoch start (1970-01-01 00:00:00 UTC) as Int64. The tick resolution is determined by the precision parameter. Additionally, the `DateTime64` type can store time zone that is the same for the entire column, that affects how the values of the `DateTime64` type values are displayed in text format and how the values specified as strings are parsed (‘2020-01-01 05:00:01.000’). The time zone is not stored in the rows of the table (or in resultset), but is stored in the column metadata. See details in [DateTime](../../sql-reference/data-types/datetime.md).
 
-Supported range from January 1, 1925 till December 31, 2283.
+Supported range from January 1, 1925 till November 11, 2283.
 
 ## Examples {#examples}
 
diff --git a/docs/en/sql-reference/data-types/decimal.md b/docs/en/sql-reference/data-types/decimal.md
index af2655cd0c2..fae0bb6dbb9 100644
--- a/docs/en/sql-reference/data-types/decimal.md
+++ b/docs/en/sql-reference/data-types/decimal.md
@@ -111,4 +111,4 @@ DB::Exception: Can't compare.
 -   [isDecimalOverflow](../../sql-reference/functions/other-functions.md#is-decimal-overflow)
 -   [countDigits](../../sql-reference/functions/other-functions.md#count-digits)
 
-[Original article](https://clickhouse.tech/docs/en/data_types/decimal/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/decimal/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/domains/index.md b/docs/en/sql-reference/data-types/domains/index.md
index 143aafe4db3..57db0c4263c 100644
--- a/docs/en/sql-reference/data-types/domains/index.md
+++ b/docs/en/sql-reference/data-types/domains/index.md
@@ -28,4 +28,4 @@ You can use domains anywhere corresponding base type can be used, for example:
 -   Can’t implicitly convert string values into domain values when inserting data from another column or table.
 -   Domain adds no constrains on stored values.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/domains/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/domains/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/domains/ipv4.md b/docs/en/sql-reference/data-types/domains/ipv4.md
index 1237514b9e7..aafd46edef8 100644
--- a/docs/en/sql-reference/data-types/domains/ipv4.md
+++ b/docs/en/sql-reference/data-types/domains/ipv4.md
@@ -31,16 +31,16 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 `IPv4` domain supports custom input format as IPv4-strings:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+│ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
 │ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
+│ https://clickhouse.com          │ 183.247.232.58 │
 └────────────────────────────────────┴────────────────┘
 ```
 
@@ -79,4 +79,4 @@ SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
 └──────────────────────────────────┴────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/domains/ipv6.md b/docs/en/sql-reference/data-types/domains/ipv6.md
index bc57202bf66..30b3c8add69 100644
--- a/docs/en/sql-reference/data-types/domains/ipv6.md
+++ b/docs/en/sql-reference/data-types/domains/ipv6.md
@@ -31,15 +31,15 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 `IPv6` domain supports custom input as IPv6-strings:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+│ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+│ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
 │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
 └────────────────────────────────────┴───────────────────────────────┘
 ```
@@ -81,4 +81,4 @@ SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
 └───────────────────────────────────────────┴─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/enum.md b/docs/en/sql-reference/data-types/enum.md
index 8c1e42aec79..ae22e60a5f3 100644
--- a/docs/en/sql-reference/data-types/enum.md
+++ b/docs/en/sql-reference/data-types/enum.md
@@ -127,4 +127,4 @@ The Enum type can be changed without cost using ALTER, if only the set of values
 
 Using ALTER, it is possible to change an Enum8 to an Enum16 or vice versa, just like changing an Int8 to Int16.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/enum/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/enum/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/fixedstring.md b/docs/en/sql-reference/data-types/fixedstring.md
index 6f5725b017c..59ed123fb10 100644
--- a/docs/en/sql-reference/data-types/fixedstring.md
+++ b/docs/en/sql-reference/data-types/fixedstring.md
@@ -58,4 +58,4 @@ This behaviour differs from MySQL for the `CHAR` type (where strings are padded
 
 Note that the length of the `FixedString(N)` value is constant. The [length](../../sql-reference/functions/array-functions.md#array_functions-length) function returns `N` even if the `FixedString(N)` value is filled only with null bytes, but the [empty](../../sql-reference/functions/string-functions.md#empty) function returns `1` in this case.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/float.md b/docs/en/sql-reference/data-types/float.md
index 1e3486cdae7..fcc071b9f9a 100644
--- a/docs/en/sql-reference/data-types/float.md
+++ b/docs/en/sql-reference/data-types/float.md
@@ -89,4 +89,4 @@ SELECT 0 / 0
 
 See the rules for `NaN` sorting in the section [ORDER BY clause](../../sql-reference/statements/select/order-by.md).
 
-[Original article](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/geo.md b/docs/en/sql-reference/data-types/geo.md
index d44f86a4262..e6d32ef3305 100644
--- a/docs/en/sql-reference/data-types/geo.md
+++ b/docs/en/sql-reference/data-types/geo.md
@@ -103,4 +103,4 @@ Result:
 └─────────────────────────────────────────────────────────────────────────────────────────────────┴─────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data-types/geo/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data-types/geo/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/index.md b/docs/en/sql-reference/data-types/index.md
index 92a4d034278..831b8d19d94 100644
--- a/docs/en/sql-reference/data-types/index.md
+++ b/docs/en/sql-reference/data-types/index.md
@@ -12,4 +12,4 @@ This section describes the supported data types and special considerations for u
 
 You can check whether data type name is case-sensitive in the [system.data_type_families](../../operations/system-tables/data_type_families.md#system_tables-data_type_families) table.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/int-uint.md b/docs/en/sql-reference/data-types/int-uint.md
index 95d1120ed3d..588b5a2d7d6 100644
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@@ -25,14 +25,13 @@ Aliases:
 -   `Int32` — `INT`, `INT4`, `INTEGER`.
 -   `Int64` — `BIGINT`.
 
-## Uint Ranges {#uint-ranges}
+## UInt Ranges {#uint-ranges}
 
 -   `UInt8` — \[0 : 255\]
 -   `UInt16` — \[0 : 65535\]
 -   `UInt32` — \[0 : 4294967295\]
 -   `UInt64` — \[0 : 18446744073709551615\]
+-   `UInt128` — \[0 : 340282366920938463463374607431768211455\]
 -   `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
 
-`UInt128` is not supported yet.
-
-[Original article](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/lowcardinality.md b/docs/en/sql-reference/data-types/lowcardinality.md
index b3ff26a943d..3a813103335 100644
--- a/docs/en/sql-reference/data-types/lowcardinality.md
+++ b/docs/en/sql-reference/data-types/lowcardinality.md
@@ -55,6 +55,5 @@ Functions:
 
 ## See Also {#see-also}
 
--   [A Magical Mystery Tour of the LowCardinality Data Type](https://www.altinity.com/blog/2019/3/27/low-cardinality).
 -   [Reducing ClickHouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/).
--   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/yandex/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
+-   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
diff --git a/docs/en/sql-reference/data-types/map.md b/docs/en/sql-reference/data-types/map.md
index bfad4375f28..cdc3c874043 100644
--- a/docs/en/sql-reference/data-types/map.md
+++ b/docs/en/sql-reference/data-types/map.md
@@ -108,4 +108,4 @@ Result:
 -   [map()](../../sql-reference/functions/tuple-map-functions.md#function-map) function
 -   [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast) function
 
-[Original article](https://clickhouse.tech/docs/en/data-types/map/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data-types/map/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/multiword-types.md b/docs/en/sql-reference/data-types/multiword-types.md
index 5012fbb404e..bd91dd10ad6 100644
--- a/docs/en/sql-reference/data-types/multiword-types.md
+++ b/docs/en/sql-reference/data-types/multiword-types.md
@@ -26,4 +26,4 @@ When creating tables, you can use data types with a name consisting of several w
 | BINARY LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)           |
 | BINARY VARYING                   | [String](../../sql-reference/data-types/string.md)           |
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/data-types/multiword-types/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nested-data-structures/index.md b/docs/en/sql-reference/data-types/nested-data-structures/index.md
index 14562254e57..b383fc53464 100644
--- a/docs/en/sql-reference/data-types/nested-data-structures/index.md
+++ b/docs/en/sql-reference/data-types/nested-data-structures/index.md
@@ -7,4 +7,4 @@ toc_title: hidden
 
 # Nested Data Structures {#nested-data-structures}
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nested_data_structures/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nested-data-structures/nested.md b/docs/en/sql-reference/data-types/nested-data-structures/nested.md
index ec6c613a956..e08b7e0de3e 100644
--- a/docs/en/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/en/sql-reference/data-types/nested-data-structures/nested.md
@@ -3,7 +3,9 @@ toc_priority: 57
 toc_title: Nested(Name1 Type1, Name2 Type2, ...)
 ---
 
-# Nested(name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
+# Nested {#nested}
+
+## Nested(name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
 
 A nested data structure is like a table inside a cell. The parameters of a nested data structure – the column names and types – are specified the same way as in a [CREATE TABLE](../../../sql-reference/statements/create/table.md) query. Each table row can correspond to any number of rows in a nested data structure.
 
@@ -101,4 +103,4 @@ For a DESCRIBE query, the columns in a nested data structure are listed separate
 
 The ALTER query for elements in a nested data structure has limitations.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/nullable.md b/docs/en/sql-reference/data-types/nullable.md
index de53a47afb7..2154315d269 100644
--- a/docs/en/sql-reference/data-types/nullable.md
+++ b/docs/en/sql-reference/data-types/nullable.md
@@ -68,4 +68,4 @@ SELECT x + y FROM t_null
 └────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/simpleaggregatefunction.md b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
index e0d8001dcbb..7a4c4375541 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -38,4 +38,4 @@ The following aggregate functions are supported:
 CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/expression.md b/docs/en/sql-reference/data-types/special-data-types/expression.md
index c707a01cf26..e1ffba478e6 100644
--- a/docs/en/sql-reference/data-types/special-data-types/expression.md
+++ b/docs/en/sql-reference/data-types/special-data-types/expression.md
@@ -7,4 +7,4 @@ toc_title: Expression
 
 Expressions are used for representing lambdas in high-order functions.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/expression/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/index.md b/docs/en/sql-reference/data-types/special-data-types/index.md
index 83919eee56b..3398af94c70 100644
--- a/docs/en/sql-reference/data-types/special-data-types/index.md
+++ b/docs/en/sql-reference/data-types/special-data-types/index.md
@@ -9,4 +9,4 @@ toc_title: hidden
 
 Special data type values can’t be serialized for saving in a table or output in query results, but can be used as an intermediate result during query execution.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/nothing.md b/docs/en/sql-reference/data-types/special-data-types/nothing.md
index 0edd5a0cd6d..e69272a665e 100644
--- a/docs/en/sql-reference/data-types/special-data-types/nothing.md
+++ b/docs/en/sql-reference/data-types/special-data-types/nothing.md
@@ -21,4 +21,4 @@ SELECT toTypeName(array())
 └─────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/nothing/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/special-data-types/set.md b/docs/en/sql-reference/data-types/special-data-types/set.md
index fdc03ad3de1..6babd047888 100644
--- a/docs/en/sql-reference/data-types/special-data-types/set.md
+++ b/docs/en/sql-reference/data-types/special-data-types/set.md
@@ -7,4 +7,4 @@ toc_title: Set
 
 Used for the right half of an [IN](../../../sql-reference/operators/in.md#select-in-operators) expression.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/special_data_types/set/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/string.md b/docs/en/sql-reference/data-types/string.md
index cb3a70ec7f8..5b0059b330e 100644
--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@@ -15,6 +15,6 @@ When creating tables, numeric parameters for string fields can be set (e.g. `VAR
 ClickHouse does not have the concept of encodings. Strings can contain an arbitrary set of bytes, which are stored and output as-is.
 If you need to store texts, we recommend using UTF-8 encoding. At the very least, if your terminal uses UTF-8 (as recommended), you can read and write your values without making conversions.
 Similarly, certain functions for working with strings have separate variations that work under the assumption that the string contains a set of bytes representing a UTF-8 encoded text.
-For example, the ‘length’ function calculates the string length in bytes, while the ‘lengthUTF8’ function calculates the string length in Unicode code points, assuming that the value is UTF-8 encoded.
+For example, the [length](../functions/string-functions.md#length) function calculates the string length in bytes, while the [lengthUTF8](../functions/string-functions.md#lengthutf8) function calculates the string length in Unicode code points, assuming that the value is UTF-8 encoded.
 
-[Original article](https://clickhouse.tech/docs/en/data_types/string/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/string/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/tuple.md b/docs/en/sql-reference/data-types/tuple.md
index dea5e10365f..b28bef67af5 100644
--- a/docs/en/sql-reference/data-types/tuple.md
+++ b/docs/en/sql-reference/data-types/tuple.md
@@ -75,4 +75,4 @@ Result:
 └────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/data_types/tuple/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/tuple/) <!--hide-->
diff --git a/docs/en/sql-reference/data-types/uuid.md b/docs/en/sql-reference/data-types/uuid.md
index 1e22b41b508..528534de0a0 100644
--- a/docs/en/sql-reference/data-types/uuid.md
+++ b/docs/en/sql-reference/data-types/uuid.md
@@ -72,4 +72,4 @@ The UUID data type only supports functions which [String](../../sql-reference/da
 
 The UUID data type is not supported by arithmetic operations (for example, [abs](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)) or aggregate functions, such as [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum) and [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg).
 
-[Original article](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/uuid/) <!--hide-->
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 ffa0fd6f29e..40f9db12315 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
@@ -53,14 +53,17 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 -   [flat](#flat)
 -   [hashed](#dicts-external_dicts_dict_layout-hashed)
 -   [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed)
--   [cache](#cache)
--   [ssd_cache](#ssd-cache)
--   [direct](#direct)
--   [range_hashed](#range-hashed)
 -   [complex_key_hashed](#complex-key-hashed)
+-   [complex_key_sparse_hashed](#complex-key-sparse-hashed)
+-   [hashed_array](#dicts-external_dicts_dict_layout-hashed-array)
+-   [complex_key_hashed_array](#complex-key-hashed-array)
+-   [range_hashed](#range-hashed)
+-   [complex_key_range_hashed](#complex-key-range-hashed)
+-   [cache](#cache)
 -   [complex_key_cache](#complex-key-cache)
 -   [ssd_cache](#ssd-cache)
--   [ssd_complex_key_cache](#complex-key-ssd-cache)
+-   [complex_key_ssd_cache](#complex-key-ssd-cache)
+-   [direct](#direct)
 -   [complex_key_direct](#complex-key-direct)
 -   [ip_trie](#ip-trie)
 
@@ -150,10 +153,69 @@ Configuration example:
 </layout>
 ```
 
+or
+
 ``` sql
 LAYOUT(COMPLEX_KEY_HASHED())
 ```
 
+### complex_key_sparse_hashed {#complex-key-sparse-hashed}
+
+This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed).
+
+Configuration example:
+
+``` xml
+<layout>
+  <complex_key_sparse_hashed />
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(COMPLEX_KEY_SPARSE_HASHED())
+```
+
+### hashed_array {#dicts-external_dicts_dict_layout-hashed-array}
+
+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.
+
+All types of sources are supported. When updating, data (from a file or from a table) is read in its entirety.
+
+Configuration example:
+
+``` xml
+<layout>
+  <hashed_array>
+  </hashed_array>
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(HASHED_ARRAY())
+```
+
+### complex_key_hashed_array {#complex-key-hashed-array}
+
+This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Similar to [hashed_array](#dicts-external_dicts_dict_layout-hashed-array).
+
+Configuration example:
+
+``` xml
+<layout>
+  <complex_key_hashed_array />
+</layout>
+```
+
+or
+
+``` sql
+LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
+```
+
 ### range_hashed {#range-hashed}
 
 The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values.
@@ -174,7 +236,10 @@ Example: The table contains discounts for each advertiser in the format:
 +---------|-------------|-------------|------+
 ```
 
-To use a sample for date ranges, define the `range_min` and `range_max` elements in the [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). These elements must contain elements `name` and`type` (if `type` is not specified, the default type will be used - Date). `type` can be any numeric type (Date / DateTime / UInt64 / Int32 / others).
+To use a sample for date ranges, define the `range_min` and `range_max` elements in the [structure](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). These elements must contain elements `name` and `type` (if `type` is not specified, the default type will be used - Date). `type` can be any numeric type (Date / DateTime / UInt64 / Int32 / others).
+
+!!! warning "Warning"
+    Values of `range_min` and `range_max` should fit in `Int64` type.
 
 Example:
 
@@ -225,34 +290,33 @@ Configuration example:
 
 ``` xml
 <yandex>
-        <dictionary>
+    <dictionary>
+        ...
 
-                ...
+        <layout>
+            <range_hashed />
+        </layout>
 
-                <layout>
-                        <range_hashed />
-                </layout>
+        <structure>
+            <id>
+                <name>Abcdef</name>
+            </id>
+            <range_min>
+                <name>StartTimeStamp</name>
+                <type>UInt64</type>
+            </range_min>
+            <range_max>
+                <name>EndTimeStamp</name>
+                <type>UInt64</type>
+            </range_max>
+            <attribute>
+                <name>XXXType</name>
+                <type>String</type>
+                <null_value />
+            </attribute>
+        </structure>
 
-                <structure>
-                        <id>
-                                <name>Abcdef</name>
-                        </id>
-                        <range_min>
-                                <name>StartTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_min>
-                        <range_max>
-                                <name>EndTimeStamp</name>
-                                <type>UInt64</type>
-                        </range_max>
-                        <attribute>
-                                <name>XXXType</name>
-                                <type>String</type>
-                                <null_value />
-                        </attribute>
-                </structure>
-
-        </dictionary>
+    </dictionary>
 </yandex>
 ```
 
@@ -269,6 +333,28 @@ PRIMARY KEY Abcdef
 RANGE(MIN StartTimeStamp MAX EndTimeStamp)
 ```
 
+### complex_key_range_hashed {#complex-key-range-hashed}
+
+The dictionary is stored in memory in the form of a hash table with an ordered array of ranges and their corresponding values (see [range_hashed](#range-hashed)). This type of storage is for use with composite [keys](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md).
+
+Configuration example:
+
+``` sql
+CREATE DICTIONARY range_dictionary
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64 DEFAULT 0.2
+)
+PRIMARY KEY CountryID, CountryKey
+SOURCE(CLICKHOUSE(TABLE 'date_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+```
+
 ### cache {#cache}
 
 The dictionary is stored in a cache that has a fixed number of cells. These cells contain frequently used elements.
@@ -277,8 +363,9 @@ When searching for a dictionary, the cache is searched first. For each block of
 
 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`.
 
-For cache dictionaries, the expiration [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) of data in the cache can be set. If more time than `lifetime` has passed since loading the data in a cell, the cell’s value is not used and key becomes expired, and it is re-requested the next time it needs to be used this behaviour can be configured with setting `allow_read_expired_keys`.
-This is the least effective of all the ways to store dictionaries. The speed of the cache depends strongly on correct settings and the usage scenario. A cache type dictionary performs well only when the hit rates are high enough (recommended 99% and higher). You can view the average hit rate in the `system.dictionaries` table.
+For cache dictionaries, the expiration [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) of data in the cache can be set. If more time than `lifetime` has passed since loading the data in a cell, the cell’s value is not used and key becomes expired. The key is re-requested the next time it needs to be used. This behaviour can be configured with setting `allow_read_expired_keys`.
+
+This is the least effective of all the ways to store dictionaries. The speed of the cache depends strongly on correct settings and the usage scenario. A cache type dictionary performs well only when the hit rates are high enough (recommended 99% and higher). You can view the average hit rate in the [system.dictionaries](../../../operations/system-tables/dictionaries.md) table.
 
 If setting `allow_read_expired_keys` is set to 1, by default 0. Then dictionary can support asynchronous updates. If a client requests keys and all of them are in cache, but some of them are expired, then dictionary will return expired keys for a client and request them asynchronously from the source.
 
@@ -343,7 +430,7 @@ Similar to `cache`, but stores data on SSD and index in RAM. All cache dictionar
         <!-- Size of RAM buffer in bytes for aggregating elements before flushing to SSD. -->
         <write_buffer_size>1048576</write_buffer_size>
         <!-- Path where cache file will be stored. -->
-        <path>/var/lib/clickhouse/clickhouse_dictionaries/test_dict</path>
+        <path>/var/lib/clickhouse/user_files/test_dict</path>
     </ssd_cache>
 </layout>
 ```
@@ -352,7 +439,7 @@ or
 
 ``` sql
 LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH ./user_files/test_dict))
+    PATH '/var/lib/clickhouse/user_files/test_dict'))
 ```
 
 ### complex_key_ssd_cache {#complex-key-ssd-cache}
@@ -466,4 +553,3 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 Other types are not supported yet. The function returns the attribute for the prefix that corresponds to this IP address. If there are overlapping prefixes, the most specific one is returned.
 
 Data must completely fit into RAM.
-
diff --git a/docs/en/sql-reference/functions/arithmetic-functions.md b/docs/en/sql-reference/functions/arithmetic-functions.md
index 3187f13b5b9..40fadf34eab 100644
--- a/docs/en/sql-reference/functions/arithmetic-functions.md
+++ b/docs/en/sql-reference/functions/arithmetic-functions.md
@@ -82,3 +82,76 @@ An exception is thrown when dividing by zero or when dividing a minimal negative
 Returns the least common multiple of the numbers.
 An exception is thrown when dividing by zero or when dividing a minimal negative number by minus one.
 
+## max2 {#max2}
+
+Compares two values and returns the maximum. The returned value is converted to [Float64](../../sql-reference/data-types/float.md).
+
+**Syntax**
+
+```sql
+max2(value1, value2)
+```
+
+**Arguments**
+
+-   `value1` — First value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+-   `value2` — Second value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+
+**Returned value**
+
+-   The maximum of two values.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT max2(-1, 2);
+```
+
+Result:
+
+```text
+┌─max2(-1, 2)─┐
+│           2 │
+└─────────────┘
+```
+
+## min2 {#min2}
+
+Compares two values and returns the minimum. The returned value is converted to [Float64](../../sql-reference/data-types/float.md).
+
+**Syntax**
+
+```sql
+max2(value1, value2)
+```
+
+**Arguments**
+
+-   `value1` — First value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+-   `value2` — Second value. [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+
+**Returned value**
+
+-   The minimum of two values.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT min2(-1, 2);
+```
+
+Result:
+
+```text
+┌─min2(-1, 2)─┐
+│          -1 │
+└─────────────┘
+```
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index b56d403edf6..d85092d683a 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -7,19 +7,89 @@ toc_title: Arrays
 
 ## empty {#function-empty}
 
-Returns 1 for an empty array, or 0 for a non-empty array.
-The result type is UInt8.
-The function also works for strings.
+Checks whether the input array is empty.
 
-Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [size0](../../sql-reference/data-types/array.md#array-size) subcolumn instead of reading and processing the whole array column. The query `SELECT empty(arr) FROM table` transforms to `SELECT arr.size0 = 0 FROM TABLE`.
+**Syntax**
+
+``` sql
+empty([x])
+```
+
+An array is considered empty if it does not contain any elements.
+
+!!! note "Note"
+    Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [size0](../../sql-reference/data-types/array.md#array-size) subcolumn instead of reading and processing the whole array column. The query `SELECT empty(arr) FROM TABLE;` transforms to `SELECT arr.size0 = 0 FROM TABLE;`.
+
+The function also works for [strings](string-functions.md#empty) or [UUID](uuid-functions.md#empty).
+
+**Arguments**
+
+-   `[x]` — Input array. [Array](../data-types/array.md).
+
+**Returned value**
+
+-   Returns `1` for an empty array or `0` for a non-empty array.
+
+Type: [UInt8](../data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT empty([]);
+```
+
+Result:
+
+```text
+┌─empty(array())─┐
+│              1 │
+└────────────────┘
+```
 
 ## notEmpty {#function-notempty}
 
-Returns 0 for an empty array, or 1 for a non-empty array.
-The result type is UInt8.
-The function also works for strings.
+Checks whether the input array is non-empty.
 
-Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [size0](../../sql-reference/data-types/array.md#array-size) subcolumn instead of reading and processing the whole array column. The query `SELECT notEmpty(arr) FROM table` transforms to `SELECT arr.size0 != 0 FROM TABLE`.
+**Syntax**
+
+``` sql
+notEmpty([x])
+```
+
+An array is considered non-empty if it contains at least one element.
+
+!!! note "Note"
+    Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns) setting. With `optimize_functions_to_subcolumns = 1` the function reads only [size0](../../sql-reference/data-types/array.md#array-size) subcolumn instead of reading and processing the whole array column. The query `SELECT notEmpty(arr) FROM table` transforms to `SELECT arr.size0 != 0 FROM TABLE`.
+
+The function also works for [strings](string-functions.md#notempty) or [UUID](uuid-functions.md#notempty).
+
+**Arguments**
+
+-   `[x]` — Input array. [Array](../data-types/array.md).
+
+**Returned value**
+
+-   Returns `1` for a non-empty array or `0` for an empty array.
+
+Type: [UInt8](../data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT notEmpty([1,2]);
+```
+
+Result:
+
+```text
+┌─notEmpty([1, 2])─┐
+│                1 │
+└──────────────────┘
+```
 
 ## length {#array_functions-length}
 
@@ -68,7 +138,7 @@ range([start, ] end [, step])
 **Implementation details**
 
 -   All arguments must be positive values: `start`, `end`, `step` are `UInt` data types, as well as elements of the returned array.
--   An exception is thrown if query results in arrays with a total length of more than 100,000,000 elements.
+-   An exception is thrown if query results in arrays with a total length of more than number of elements specified by the [function_range_max_elements_in_block](../../operations/settings/settings.md#settings-function_range_max_elements_in_block) setting.
 
 
 **Examples**
@@ -790,13 +860,13 @@ arrayDifference(array)
 
 **Arguments**
 
--   `array` – [Array](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
 
 **Returned values**
 
 Returns an array of differences between adjacent elements.
 
-Type: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.tech/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.tech/docs/en/data_types/float/).
+Type: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [Float\*](https://clickhouse.com/docs/en/data_types/float/).
 
 **Example**
 
@@ -842,7 +912,7 @@ arrayDistinct(array)
 
 **Arguments**
 
--   `array` – [Array](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [Array](https://clickhouse.com/docs/en/data_types/array/).
 
 **Returned values**
 
@@ -882,7 +952,7 @@ SELECT arrayEnumerateDense([10, 20, 10, 30])
 
 ## arrayIntersect(arr) {#array-functions-arrayintersect}
 
-Takes multiple arrays, returns an array with elements that are present in all source arrays. Elements order in the resulting array is the same as in the first array.
+Takes multiple arrays, returns an array with elements that are present in all source arrays.
 
 Example:
 
diff --git a/docs/en/sql-reference/functions/bitmap-functions.md b/docs/en/sql-reference/functions/bitmap-functions.md
index c695c894784..a6104835469 100644
--- a/docs/en/sql-reference/functions/bitmap-functions.md
+++ b/docs/en/sql-reference/functions/bitmap-functions.md
@@ -107,7 +107,7 @@ bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 
 The subset.
 
-Type: `Bitmap object`.
+Type: [Bitmap object](#bitmap_functions-bitmapbuild).
 
 **Example**
 
@@ -125,6 +125,44 @@ Result:
 └───────────────────────────┘
 ```
 
+## subBitmap {#subbitmap}
+
+Returns the bitmap elements, starting from the `offset` position. The number of returned elements is limited by the `cardinality_limit` parameter. Analog of the [substring](string-functions.md#substring)) string function, but for bitmap.
+
+**Syntax**
+
+``` sql
+subBitmap(bitmap, offset, cardinality_limit)
+```
+
+**Arguments**
+
+-   `bitmap` – The bitmap. Type: [Bitmap object](#bitmap_functions-bitmapbuild).
+-   `offset` – The position of the first element of the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `cardinality_limit` – The maximum number of elements in the subset. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+The subset.
+
+Type: [Bitmap object](#bitmap_functions-bitmapbuild).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT bitmapToArray(subBitmap(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(10), toUInt32(10))) AS res;
+```
+
+Result:
+
+``` text
+┌─res─────────────────────────────┐
+│ [10,11,12,13,14,15,16,17,18,19] │
+└─────────────────────────────────┘
+```
+
 ## bitmapContains {#bitmap_functions-bitmapcontains}
 
 Checks whether the bitmap contains an element.
diff --git a/docs/en/sql-reference/functions/conditional-functions.md b/docs/en/sql-reference/functions/conditional-functions.md
index a23da82a9c6..241112f7f7f 100644
--- a/docs/en/sql-reference/functions/conditional-functions.md
+++ b/docs/en/sql-reference/functions/conditional-functions.md
@@ -12,11 +12,13 @@ Controls conditional branching. Unlike most systems, ClickHouse always evaluate
 **Syntax**
 
 ``` sql
-SELECT if(cond, then, else)
+if(cond, then, else)
 ```
 
 If the condition `cond` evaluates to a non-zero value, returns the result of the expression `then`, and the result of the expression `else`, if present, is skipped. If the `cond` is zero or `NULL`, then the result of the `then` expression is skipped and the result of the `else` expression, if present, is returned.
 
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `if` function according to a short scheme. If this setting is enabled, `then` expression is evaluated only on rows where `cond` is true, `else` expression – where `cond` is false. For example, an exception about division by zero is not thrown when executing the query `SELECT if(number = 0, 0, intDiv(42, number)) FROM numbers(10)`, because `intDiv(42, number)` will be evaluated only for numbers that doesn't satisfy condition `number = 0`.
+
 **Arguments**
 
 -   `cond` – The condition for evaluation that can be zero or not. The type is UInt8, Nullable(UInt8) or NULL.
@@ -115,9 +117,15 @@ Returns `then` if the `cond` evaluates to be true (greater than zero), otherwise
 
 Allows you to write the [CASE](../../sql-reference/operators/index.md#operator_case) operator more compactly in the query.
 
-Syntax: `multiIf(cond_1, then_1, cond_2, then_2, ..., else)`
+**Syntax**
 
-**Arguments:**
+``` sql
+multiIf(cond_1, then_1, cond_2, then_2, ..., else)
+```
+
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `multiIf` function according to a short scheme. If this setting is enabled, `then_i` expression is evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}) AND cond_i)` is true, `cond_i` will be evaluated only on rows where `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}))` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT multiIf(number = 2, intDiv(1, number), number = 5) FROM numbers(10)`.
+
+**Arguments**
 
 -   `cond_N` — The condition for the function to return `then_N`.
 -   `then_N` — The result of the function when executed.
@@ -201,4 +209,3 @@ FROM LEFT_RIGHT
 │    4 │  ᴺᵁᴸᴸ │ Both equal       │
 └──────┴───────┴──────────────────┘
 ```
-
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index db36a5b5637..b85f105758b 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -26,6 +26,7 @@ SELECT
 ## timeZone {#timezone}
 
 Returns the timezone of the server.
+If it is executed in the context of a distributed table, then it generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
 
 **Syntax**
 
@@ -322,7 +323,7 @@ Truncates sub-seconds.
 **Syntax**
 
 ``` sql
-toStartOfSecond(value[, timezone])
+toStartOfSecond(value, [timezone])
 ```
 
 **Arguments**
diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index c22f041e0c3..69dd14da1bf 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -87,7 +87,23 @@ The function is using uppercase letters `A-F` and not using any prefixes (like `
 
 For integer arguments, it prints hex digits (“nibbles”) from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints both digits of every byte even if the leading digit is zero.
 
-**Example**
+Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
+
+For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
+
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+
+**Arguments**
+
+-   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Returned value**
+
+-   A string with the hexadecimal representation of the argument.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Examples**
 
 Query:
 
@@ -101,28 +117,10 @@ Result:
 01
 ```
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
-
-Values of floating point and Decimal types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
-
-**Arguments**
-
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
-
-**Returned value**
-
--   A string with the hexadecimal representation of the argument.
-
-Type: `String`.
-
-**Example**
-
 Query:
 
 ``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat32(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -137,7 +135,7 @@ Result:
 Query:
 
 ``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat64(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -210,52 +208,52 @@ Result:
 
 Returns a string containing the argument’s binary representation.
 
-Alias: `BIN`.
-
 **Syntax**
 
 ``` sql
 bin(arg)
 ```
 
+Alias: `BIN`.
+
 For integer arguments, it prints bin digits from the most significant to least significant (big-endian or “human-readable” order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints eight digits of every byte if the leading digit is zero.
 
-**Example**
+Values of type [Date](../../sql-reference/data-types/date.md) and [DateTime](../../sql-reference/data-types/datetime.md) are formatted as corresponding integers (the number of days since Epoch for `Date` and the value of Unix Timestamp for `DateTime`).
 
-Query:
+For [String](../../sql-reference/data-types/string.md) and [FixedString](../../sql-reference/data-types/fixedstring.md), all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
 
-``` sql
-SELECT bin(1);
-```
-
-Result:
-
-``` text
-00000001
-```
-
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as eight binary numbers. Zero bytes are not omitted.
-
-Values of floating-point and Decimal types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
+Values of [Float](../../sql-reference/data-types/float.md) and [Decimal](../../sql-reference/data-types/decimal.md) types are encoded as their representation in memory. As we support little-endian architecture, they are encoded in little-endian. Zero leading/trailing bytes are not omitted.
 
 **Arguments**
 
--   `arg` — A value to convert to binary. Types: [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) or [DateTime](../../sql-reference/data-types/datetime.md).
+-   `arg` — A value to convert to binary. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md), or [DateTime](../../sql-reference/data-types/datetime.md).
 
 **Returned value**
 
 -   A string with the binary representation of the argument.
 
-Type: `String`.
+Type: [String](../../sql-reference/data-types/string.md).
 
-**Example**
+**Examples**
 
 Query:
 
 ``` sql
-SELECT bin(toFloat32(number)) as bin_presentation FROM numbers(15, 2);
+SELECT bin(14);
+```
+
+Result:
+
+``` text
+┌─bin(14)──┐
+│ 00001110 │
+└──────────┘
+```
+
+Query:
+
+``` sql
+SELECT bin(toFloat32(number)) AS bin_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -270,7 +268,7 @@ Result:
 Query:
 
 ``` sql
-SELECT bin(toFloat64(number)) as bin_presentation FROM numbers(15, 2);
+SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
 ```
 
 Result:
@@ -284,14 +282,7 @@ Result:
 
 ## unbin {#unbinstr}
 
-Performs the opposite operation of [bin](#bin). It interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The return value is a binary string (BLOB).
-
-If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#type-conversion-functions) functions.
-
-!!! note "Note"
-    If `unbin` is invoked from within the `clickhouse-client`, binary strings display using UTF-8.
-
-Alias: `UNBIN`.
+Interprets each pair of binary digits (in the argument) as a number and converts it to the byte represented by the number. The functions performs the opposite operation to [bin](#bin).
 
 **Syntax**
 
@@ -299,11 +290,18 @@ Alias: `UNBIN`.
 unbin(arg)
 ```
 
+Alias: `UNBIN`.
+
+For a numeric argument `unbin()` does not return the inverse of `bin()`. If you want to convert the result to a number, you can use the [reverse](../../sql-reference/functions/string-functions.md#reverse) and [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264) functions.
+
+!!! note "Note"
+    If `unbin` is invoked from within the `clickhouse-client`, binary strings are displayed using UTF-8.
+
+Supports binary digits `0` and `1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). 
+
 **Arguments**
 
--   `arg` — A string containing any number of binary digits. Type: [String](../../sql-reference/data-types/string.md).
-
-Supports binary digits `0-1`. The number of binary digits does not have to be multiples of eight. If the argument string contains anything other than binary digits, some implementation-defined result is returned (an exception isn’t thrown). For a numeric argument the inverse of bin(N) is not performed by unbin().
+-   `arg` — A string containing any number of binary digits. [String](../../sql-reference/data-types/string.md).
 
 **Returned value**
 
@@ -311,7 +309,7 @@ Supports binary digits `0-1`. The number of binary digits does not have to be mu
 
 Type: [String](../../sql-reference/data-types/string.md).
 
-**Example**
+**Examples**
 
 Query:
 
@@ -330,14 +328,14 @@ Result:
 Query:
 
 ``` sql
-SELECT reinterpretAsUInt64(reverse(unbin('1010'))) AS num;
+SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
 ```
 
 Result:
 
 ``` text
 ┌─num─┐
-│  10 │
+│  14 │
 └─────┘
 ```
 
@@ -396,7 +394,7 @@ Result:
 Query:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) as bit_positions;
+SELECT bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Result:
diff --git a/docs/en/sql-reference/functions/encryption-functions.md b/docs/en/sql-reference/functions/encryption-functions.md
index 8dc59c65904..ea4d0f84488 100644
--- a/docs/en/sql-reference/functions/encryption-functions.md
+++ b/docs/en/sql-reference/functions/encryption-functions.md
@@ -358,4 +358,4 @@ Result:
 └───────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/encryption_functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/encryption_functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/coordinates.md b/docs/en/sql-reference/functions/geo/coordinates.md
index fd1d46e48ff..b0862dded67 100644
--- a/docs/en/sql-reference/functions/geo/coordinates.md
+++ b/docs/en/sql-reference/functions/geo/coordinates.md
@@ -41,6 +41,13 @@ SELECT greatCircleDistance(55.755831, 37.617673, -55.755831, -37.617673)
 └───────────────────────────────────────────────────────────────────┘
 ```
 
+## geoDistance
+
+Similar to `greatCircleDistance` but calculates the distance on WGS-84 ellipsoid instead of sphere. This is more precise approximation of the Earth Geoid.
+The performance is the same as for `greatCircleDistance` (no performance drawback). It is recommended to use `geoDistance` to calculate the distances on Earth.
+
+Technical note: for close enough points we calculate the distance using planar approximation with the metric on the tangent plane at the midpoint of the coordinates.
+
 ## greatCircleAngle {#greatcircleangle}
 
 Calculates the central angle between two points on the Earth’s surface using [the great-circle formula](https://en.wikipedia.org/wiki/Great-circle_distance).
@@ -137,4 +144,4 @@ SELECT pointInPolygon((3., 3.), [(6, 0), (8, 4), (5, 8), (0, 2)]) AS res
 ```
 
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/coordinates) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/coordinates) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/geohash.md b/docs/en/sql-reference/functions/geo/geohash.md
index 5fbd286eba6..1192ed5f56a 100644
--- a/docs/en/sql-reference/functions/geo/geohash.md
+++ b/docs/en/sql-reference/functions/geo/geohash.md
@@ -109,4 +109,4 @@ Result:
 └─────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/geohash) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/geohash) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/h3.md b/docs/en/sql-reference/functions/geo/h3.md
index e178603dc45..048834806d1 100644
--- a/docs/en/sql-reference/functions/geo/h3.md
+++ b/docs/en/sql-reference/functions/geo/h3.md
@@ -40,7 +40,7 @@ Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT h3IsValid(630814730351855103) as h3IsValid;
+SELECT h3IsValid(630814730351855103) AS h3IsValid;
 ```
 
 Result:
@@ -77,7 +77,7 @@ Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT h3GetResolution(639821929606596015) as resolution;
+SELECT h3GetResolution(639821929606596015) AS resolution;
 ```
 
 Result:
@@ -111,7 +111,7 @@ h3EdgeAngle(resolution)
 Query:
 
 ``` sql
-SELECT h3EdgeAngle(10) as edgeAngle;
+SELECT h3EdgeAngle(10) AS edgeAngle;
 ```
 
 Result:
@@ -145,7 +145,7 @@ h3EdgeLengthM(resolution)
 Query:
 
 ``` sql
-SELECT h3EdgeLengthM(15) as edgeLengthM;
+SELECT h3EdgeLengthM(15) AS edgeLengthM;
 ```
 
 Result:
@@ -184,7 +184,7 @@ Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index;
+SELECT geoToH3(37.79506683, 55.71290588, 15) AS h3Index;
 ```
 
 Result:
@@ -197,7 +197,7 @@ Result:
 
 ## h3ToGeo {#h3togeo}
 
-Returns `(lon, lat)` that corresponds to the provided H3 index.
+Returns the geographical coordinates of longitude and latitude corresponding to the provided [H3](#h3index) index.
 
 **Syntax**
 
@@ -207,20 +207,18 @@ h3ToGeo(h3Index)
 
 **Arguments**
 
--   `h3Index` — H3 Index. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `h3Index` — H3 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned values**
 
--   `lon` — Longitude. Type: [Float64](../../../sql-reference/data-types/float.md).
--   `lat` — Latitude. Type: [Float64](../../../sql-reference/data-types/float.md).
-
+-   A tuple consisting of two values: `tuple(lon,lat)`. `lon` — Longitude. [Float64](../../../sql-reference/data-types/float.md). `lat` — Latitude. [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
 Query:
 
 ``` sql
-SELECT h3ToGeo(644325524701193974) coordinates;
+SELECT h3ToGeo(644325524701193974) AS coordinates;
 ```
 
 Result:
@@ -230,6 +228,43 @@ Result:
 │ (37.79506616830252,55.71290243145668) │
 └───────────────────────────────────────┘
 ```
+
+## h3ToGeoBoundary {#h3togeoboundary}
+
+Returns array of pairs `(lon, lat)`, which corresponds to the boundary of the provided H3 index.
+
+**Syntax**
+
+``` sql
+h3ToGeoBoundary(h3Index)
+```
+
+**Arguments**
+
+-   `h3Index` — H3 Index. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-    Array of pairs '(lon, lat)'.
+Type: [Array](../../../sql-reference/data-types/array.md)([Float64](../../../sql-reference/data-types/float.md), [Float64](../../../sql-reference/data-types/float.md)).
+
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3ToGeoBoundary(644325524701193974) AS coordinates;
+```
+
+Result:
+
+``` text
+┌─h3ToGeoBoundary(599686042433355775)────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ [(37.2713558667319,-121.91508032705622),(37.353926450852256,-121.8622232890249),(37.42834118609435,-121.92354999630156),(37.42012867767779,-122.03773496427027),(37.33755608435299,-122.090428929044),(37.26319797461824,-122.02910130919001)] │
+└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
 ## h3kRing {#h3kring}
 
  Lists all the [H3](#h3index) hexagons in the raduis of `k` from the given hexagon in random order.
@@ -298,7 +333,7 @@ Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT h3GetBaseCell(612916788725809151) as basecell;
+SELECT h3GetBaseCell(612916788725809151) AS basecell;
 ```
 
 Result:
@@ -334,7 +369,7 @@ Type: [Float64](../../../sql-reference/data-types/float.md).
 Query:
 
 ``` sql
-SELECT h3HexAreaM2(13) as area;
+SELECT h3HexAreaM2(13) AS area;
 ```
 
 Result:
@@ -446,7 +481,7 @@ Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
 Query:
 
 ``` sql
-SELECT h3ToParent(599405990164561919, 3) as parent;
+SELECT h3ToParent(599405990164561919, 3) AS parent;
 ```
 
 Result:
@@ -480,7 +515,7 @@ Type: [String](../../../sql-reference/data-types/string.md).
 Query:
 
 ``` sql
-SELECT h3ToString(617420388352917503) as h3_string;
+SELECT h3ToString(617420388352917503) AS h3_string;
 ```
 
 Result:
@@ -514,7 +549,7 @@ stringToH3(index_str)
 Query:
 
 ``` sql
-SELECT stringToH3('89184926cc3ffff') as index;
+SELECT stringToH3('89184926cc3ffff') AS index;
 ```
 
 Result:
@@ -548,7 +583,7 @@ h3GetResolution(index)
 Query:
 
 ``` sql
-SELECT h3GetResolution(617420388352917503) as res;
+SELECT h3GetResolution(617420388352917503) AS res;
 ```
 
 Result:
@@ -559,4 +594,114 @@ Result:
 └─────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/h3) <!--hide-->
+## h3IsResClassIII {#h3isresclassIII}
+
+Returns whether [H3](#h3index) index has a resolution with Class III orientation.
+
+**Syntax**
+
+``` sql
+h3IsResClassIII(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   `1` — Index has a resolution with Class III orientation.
+-   `0` — Index doesn't have a resolution with Class III orientation.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3IsResClassIII(617420388352917503) AS res;
+```
+
+Result:
+
+``` text
+┌─res─┐
+│   1 │
+└─────┘
+```
+
+## h3IsPentagon {#h3ispentagon}
+
+Returns whether this [H3](#h3index) index represents a pentagonal cell.
+
+**Syntax**
+
+``` sql
+h3IsPentagon(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+-   `1` — Index represents a pentagonal cell.
+-   `0` — Index doesn't represent a pentagonal cell.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3IsPentagon(644721767722457330) AS pentagon;
+```
+
+Result:
+
+``` text
+┌─pentagon─┐
+│        0 │
+└──────────┘
+```
+
+## h3GetFaces {#h3getfaces}
+
+Returns icosahedron faces intersected by a given [H3](#h3index) index.
+
+**Syntax**
+
+``` sql
+h3GetFaces(index)
+```
+
+**Parameter**
+
+-   `index` — Hexagon index number. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   Array containing icosahedron faces intersected by a given H3 index.
+
+Type: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT h3GetFaces(599686042433355775) AS faces;
+```
+
+Result:
+
+``` text
+┌─faces─┐
+│ [7]   │
+└───────┘
+```
+
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/h3) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/index.md b/docs/en/sql-reference/functions/geo/index.md
index 10b42332ece..65bf2ab83cb 100644
--- a/docs/en/sql-reference/functions/geo/index.md
+++ b/docs/en/sql-reference/functions/geo/index.md
@@ -5,4 +5,4 @@ toc_folder_title: Geo
 ---
 
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/geo/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/geo/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/geo/s2.md b/docs/en/sql-reference/functions/geo/s2.md
new file mode 100644
index 00000000000..f8736bcc61a
--- /dev/null
+++ b/docs/en/sql-reference/functions/geo/s2.md
@@ -0,0 +1,376 @@
+--- 
+toc_title: S2 Geometry
+---
+
+# Functions for Working with S2 Index {#s2index}
+
+[S2](https://s2geometry.io/) is a geographical indexing system where all geographical data is represented on a three-dimensional sphere (similar to a globe).
+
+In the S2 library points are represented as the S2 Index - a specific number which encodes internally a point on the surface of a unit sphere, unlike traditional (latitude, longitude) pairs. To get the S2 point index for a given point specified in the format (latitude, longitude) use the [geoToS2](#geotos2) function. Also, you can use the [s2ToGeo](#s2togeo) function for getting geographical coordinates corresponding to the specified S2 point index.
+
+## geoToS2 {#geotos2}
+
+Returns [S2](#s2index) point index corresponding to the provided coordinates `(longitude, latitude)`.
+
+**Syntax**
+
+``` sql
+geoToS2(lon, lat)
+```
+
+**Arguments**
+
+-   `lon` — Longitude. [Float64](../../../sql-reference/data-types/float.md).
+-   `lat` — Latitude. [Float64](../../../sql-reference/data-types/float.md).
+
+**Returned values**
+
+-   S2 point index.
+
+Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT geoToS2(37.79506683, 55.71290588) AS s2Index;
+```
+
+Result:
+
+``` text
+┌─────────────s2Index─┐
+│ 4704772434919038107 │
+└─────────────────────┘
+```
+
+## s2ToGeo {#s2togeo}
+
+Returns geo coordinates `(longitude, latitude)` corresponding to the provided [S2](#s2index) point index.
+
+**Syntax**
+
+``` sql
+s2ToGeo(s2index)
+```
+
+**Arguments**
+
+-   `s2index` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   A tuple consisting of two values: `tuple(lon,lat)`.
+
+Type: `lon` — [Float64](../../../sql-reference/data-types/float.md). `lat` — [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2ToGeo(4704772434919038107) AS s2Coodrinates;
+```
+
+Result:
+
+``` text
+┌─s2Coodrinates────────────────────────┐
+│ (37.79506681471008,55.7129059052841) │
+└──────────────────────────────────────┘
+```
+
+## s2GetNeighbors {#s2getneighbors}
+
+Returns S2 neighbor indixes corresponding to the provided [S2](#s2index). Each cell in the S2 system is a quadrilateral bounded by four geodesics. So, each cell has 4 neighbors. 
+
+**Syntax**
+
+``` sql
+s2GetNeighbors(s2index)
+```
+
+**Arguments**
+
+-   `s2index` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   An array consisting of 4 neighbor indexes: `array[s2index1, s2index3, s2index2, s2index4]`.
+
+Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2GetNeighbors(5074766849661468672) AS s2Neighbors;
+```
+
+Result:
+
+``` text
+┌─s2Neighbors───────────────────────────────────────────────────────────────────────┐
+│ [5074766987100422144,5074766712222515200,5074767536856236032,5074767261978329088] │
+└───────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## s2CellsIntersect {#s2cellsintersect}
+
+Determines if the two provided [S2](#s2index) cells intersect or not.
+
+**Syntax**
+
+``` sql
+s2CellsIntersect(s2index1, s2index2)
+```
+
+**Arguments**
+
+-   `siIndex1`, `s2index2` — S2 Index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   1 — If the cells intersect.
+-   0 — If the cells don't intersect.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2CellsIntersect(9926595209846587392, 9926594385212866560) AS intersect;
+```
+
+Result:
+
+``` text
+┌─intersect─┐
+│         1 │
+└───────────┘
+```
+
+## s2CapContains {#s2capcontains}
+
+Determines if a cap contains a S2 point. A cap represents a part of the sphere that has been cut off by a plane. It is defined by a point on a sphere and a radius in degrees.
+
+**Syntax**
+
+``` sql
+s2CapContains(center, degrees, point)
+```
+
+**Arguments**
+
+-   `center` — S2 point index corresponding to the cap. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `degrees` — Radius of the cap in degrees. [Float64](../../../sql-reference/data-types/float.md).
+-   `point` — S2 point index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   1 — If the cap contains the S2 point index.
+-   0 — If the cap doesn't contain the S2 point index.
+
+Type: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2CapContains(1157339245694594829, 1.0, 1157347770437378819) AS capContains;
+```
+
+Result:
+
+``` text
+┌─capContains─┐
+│           1 │
+└─────────────┘
+```
+
+## s2CapUnion {#s2capunion}
+
+Determines the smallest cap that contains the given two input caps. A cap represents a portion of the sphere that has been cut off by a plane. It is defined by a point on a sphere and a radius in degrees.
+
+**Syntax**
+
+``` sql
+s2CapUnion(center1, radius1, center2, radius2)
+```
+
+**Arguments**
+
+-   `center1`, `center2` — S2 point indixes corresponding to the two input caps. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `radius1`, `radius2` — Radius of the two input caps in degrees. [Float64](../../../sql-reference/data-types/float.md).
+
+**Returned values**
+
+-   `center` — S2 point index corresponding the center of the smallest cap containing the two input caps. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `radius` — Radius of the smallest cap containing the two input caps. Type: [Float64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2CapUnion(3814912406305146967, 1.0, 1157347770437378819, 1.0) AS capUnion;
+```
+
+Result:
+
+``` text
+┌─capUnion───────────────────────────────┐
+│ (4534655147792050737,60.2088283994957) │
+└────────────────────────────────────────┘
+```
+
+## s2RectAdd {#s2rectadd}
+
+Increases the size of the bounding rectangle to include the given S2 point. In the S2 system, a rectangle is represented by a type of S2Region called a `S2LatLngRect` that represents a rectangle in latitude-longitude space.
+
+**Syntax**
+
+``` sql
+s2RectAdd(s2pointLow, s2pointHigh, s2Point)
+```
+
+**Arguments**
+
+-   `s2PointLow` — Low S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2PointHigh` — High S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Point` — Target S2 point index that the bound rectangle should be grown to include. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   `s2PointLow` — Low S2 cell id corresponding to the grown rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2PointHigh` — Hight S2 cell id corresponding to the grown rectangle. Type: [UInt64](../../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2RectAdd(5178914411069187297, 5177056748191934217, 5179056748191934217) AS rectAdd;
+```
+
+Result:
+
+``` text
+┌─rectAdd───────────────────────────────────┐
+│ (5179062030687166815,5177056748191934217) │
+└───────────────────────────────────────────┘
+```
+
+## s2RectContains {#s2rectcontains}
+
+Determines if a given rectangle contains a S2 point. In the S2 system, a rectangle is represented by a type of S2Region called a `S2LatLngRect` that represents a rectangle in latitude-longitude space.
+
+**Syntax**
+
+``` sql
+s2RectContains(s2PointLow, s2PointHi, s2Point)
+```
+
+**Arguments**
+
+-   `s2PointLow` — Low S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2PointHigh` — High S2 point index corresponding to the rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Point` — Target S2 point index. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   1 — If the rectangle contains the given S2 point.
+-   0 — If the rectangle doesn't contain the given S2 point.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2RectContains(5179062030687166815, 5177056748191934217, 5177914411069187297) AS rectContains;
+```
+
+Result:
+
+``` text
+┌─rectContains─┐
+│            0 │
+└──────────────┘
+```
+
+## s2RectUinion {#s2rectunion}
+
+Returns the smallest rectangle containing the union of this rectangle and the given rectangle. In the S2 system, a rectangle is represented by a type of S2Region called a `S2LatLngRect` that represents a rectangle in latitude-longitude space.
+
+**Syntax**
+
+``` sql
+s2RectUnion(s2Rect1PointLow, s2Rect1PointHi, s2Rect2PointLow, s2Rect2PointHi)
+```
+
+**Arguments**
+
+-   `s2Rect1PointLow`, `s2Rect1PointHi` — Low and High S2 point indexes corresponding to the first rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Rect2PointLow`, `s2Rect2PointHi` — Low and High S2 point indexes corresponding to the second rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   `s2UnionRect2PointLow` — Low S2 cell id corresponding to the union rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2UnionRect2PointHi` — High S2 cell id corresponding to the union rectangle. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2RectUnion(5178914411069187297, 5177056748191934217, 5179062030687166815, 5177056748191934217) AS rectUnion;
+```
+
+Result:
+
+``` text
+┌─rectUnion─────────────────────────────────┐
+│ (5179062030687166815,5177056748191934217) │
+└───────────────────────────────────────────┘
+```
+
+## s2RectIntersection {#s2rectintersection}
+
+Returns the smallest rectangle containing the intersection of this rectangle and the given rectangle. In the S2 system, a rectangle is represented by a type of S2Region called a `S2LatLngRect` that represents a rectangle in latitude-longitude space.
+
+**Syntax**
+
+``` sql
+s2RectIntersection(s2Rect1PointLow, s2Rect1PointHi, s2Rect2PointLow, s2Rect2PointHi)
+```
+
+**Arguments**
+
+-   `s2Rect1PointLow`, `s2Rect1PointHi` — Low and High S2 point indexes corresponding to the first rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Rect2PointLow`, `s2Rect2PointHi` — Low and High S2 point indexes corresponding to the second rectangle. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   `s2UnionRect2PointLow` — Low S2 cell id corresponding to the rectangle containing the intersection of the given rectangles. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2UnionRect2PointHi` — High S2 cell id corresponding to the rectangle containing the intersection of the given rectangles. Type: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT s2RectIntersection(5178914411069187297, 5177056748191934217, 5179062030687166815, 5177056748191934217) AS rectIntersection;
+```
+
+Result:
+
+``` text
+┌─rectIntersection──────────────────────────┐
+│ (5178914411069187297,5177056748191934217) │
+└───────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 35a42c49a41..21ed8d33098 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -40,6 +40,10 @@ SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')
 └────────────────────┴────────┘
 ```
 
+## MD4 {#hash_functions-md4}
+
+Calculates the MD4 from a string and returns the resulting set of bytes as FixedString(16).
+
 ## MD5 {#hash_functions-md5}
 
 Calculates the MD5 from a string and returns the resulting set of bytes as FixedString(16).
@@ -137,16 +141,49 @@ This is a relatively fast non-cryptographic hash function of average quality for
 Calculates a 64-bit hash code from any type of integer.
 It works faster than intHash32. Average quality.
 
-## SHA1 {#sha1}
+## SHA1, SHA224, SHA256, SHA512 {#sha}
 
-## SHA224 {#sha224}
+Calculates SHA-1, SHA-224, SHA-256, SHA-512 hash from a string and returns the resulting set of bytes as [FixedString](../data-types/fixedstring.md).
 
-## SHA256 {#sha256}
+**Syntax**
+
+``` sql
+SHA1('s')
+...
+SHA512('s')
+```
 
-Calculates SHA-1, SHA-224, or SHA-256 from a string and returns the resulting set of bytes as FixedString(20), FixedString(28), or FixedString(32).
 The function works fairly slowly (SHA-1 processes about 5 million short strings per second per processor core, while SHA-224 and SHA-256 process about 2.2 million).
 We recommend using this function only in cases when you need a specific hash function and you can’t select it.
-Even in these cases, we recommend applying the function offline and pre-calculating values when inserting them into the table, instead of applying it in SELECTS.
+Even in these cases, we recommend applying the function offline and pre-calculating values when inserting them into the table, instead of applying it in `SELECT` queries.
+
+**Arguments**
+
+-   `s` — Input string for SHA hash calculation. [String](../data-types/string.md).
+
+**Returned value**
+
+-   SHA hash as a hex-unencoded FixedString. SHA-1 returns as FixedString(20), SHA-224 as FixedString(28), SHA-256 — FixedString(32), SHA-512 — FixedString(64).
+
+Type: [FixedString](../data-types/fixedstring.md).
+
+**Example**
+
+Use the [hex](../functions/encoding-functions.md#hex) function to represent the result as a hex-encoded string.
+
+Query:
+
+``` sql
+SELECT hex(SHA1('abc'));
+```
+
+Result:
+
+``` text
+┌─hex(SHA1('abc'))─────────────────────────┐
+│ A9993E364706816ABA3E25717850C26C9CD0D89D │
+└──────────────────────────────────────────┘
+```
 
 ## URLHash(url\[, N\]) {#urlhashurl-n}
 
diff --git a/docs/en/sql-reference/functions/index.md b/docs/en/sql-reference/functions/index.md
index 54afd461e1d..e86e6b37998 100644
--- a/docs/en/sql-reference/functions/index.md
+++ b/docs/en/sql-reference/functions/index.md
@@ -59,6 +59,69 @@ A lambda function that accepts multiple arguments can also be passed to a higher
 
 For some functions the first argument (the lambda function) can be omitted. In this case, identical mapping is assumed.
 
+## SQL User Defined Functions {#user-defined-functions}
+
+Custom functions from lambda expressions can be created using the [CREATE FUNCTION](../statements/create/function.md) statement. To delete these functions use the [DROP FUNCTION](../statements/drop.md#drop-function) statement.
+
+## Executable User Defined Functions {#executable-user-defined-functions}
+ClickHouse can call any external executable program or script to process data. Describe such functions in a [configuration file](../../operations/configuration-files.md) and add the path of that file to the main configuration in `user_defined_executable_functions_config` setting. If a wildcard symbol `*` is used in the path, then all files matching the pattern are loaded. Example:
+``` xml
+<user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
+```
+User defined function configurations are searched relative to the path specified in the `user_files_path` setting.
+
+A function configuration contains the following settings:
+
+-   `name` - a function name.
+-   `command` - a command or a script to execute.
+-   `argument` - argument description with the `type` of an argument. Each argument is described in a separate setting.
+-   `format` - a [format](../../interfaces/formats.md) in which arguments are passed to the command.
+-   `return_type` - the type of a returned value.
+-   `type` - an executable type. If `type` is set to `executable` then single command is started. If it is set to `executable_pool` then a pool of commands is created.
+-   `max_command_execution_time` - maximum execution time in seconds for processing block of data. This setting is valid for `executable_pool` commands only. Optional. Default value is `10`.
+-   `command_termination_timeout` - time in seconds during which a command should finish after its pipe is closed. After that time `SIGTERM` is sent to the process executing the command. This setting is valid for `executable_pool` commands only. Optional. Default value is `10`.
+-   `pool_size` - the size of a command pool. Optional. Default value is `16`.
+-   `lifetime` - the reload interval of a function in seconds. If it is set to `0` then the function is not reloaded.
+-   `send_chunk_header` - controls whether to send row count before sending a chunk of data to process. Optional. Default value is `false`.
+
+The command must read arguments from `STDIN` and must output the result to `STDOUT`. The command must process arguments iteratively. That is after processing a chunk of arguments it must wait for the next chunk.
+
+**Example**
+Creating `test_function` using XML configuration:
+```
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function</name>
+        <return_type>UInt64</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>cd /; clickhouse-local --input-format TabSeparated --output-format TabSeparated --structure 'x UInt64, y UInt64' --query "SELECT x + y FROM table"</command>
+        <lifetime>0</lifetime>
+    </function>
+</functions>
+```
+
+Query:
+
+``` sql
+SELECT test_function(toUInt64(2), toUInt64(2));
+```
+
+Result:
+
+``` text
+┌─test_function(toUInt64(2), toUInt64(2))─┐
+│                                       4 │
+└─────────────────────────────────────────┘
+```
+
+
 ## Error Handling {#error-handling}
 
 Some functions might throw an exception if the data is invalid. In this case, the query is canceled and an error text is returned to the client. For distributed processing, when an exception occurs on one of the servers, the other servers also attempt to abort the query.
diff --git a/docs/en/sql-reference/functions/introspection.md b/docs/en/sql-reference/functions/introspection.md
index 44685e3cb67..21b570c65d4 100644
--- a/docs/en/sql-reference/functions/introspection.md
+++ b/docs/en/sql-reference/functions/introspection.md
@@ -308,7 +308,7 @@ clone
 ```
 ## tid {#tid}
 
-Returns id of the thread, in which current [Block](https://clickhouse.tech/docs/en/development/architecture/#block) is processed.
+Returns id of the thread, in which current [Block](https://clickhouse.com/docs/en/development/architecture/#block) is processed.
 
 **Syntax**
 
@@ -338,7 +338,7 @@ Result:
 
 ## logTrace {#logtrace}
 
-Emits trace log message to server log for each [Block](https://clickhouse.tech/docs/en/development/architecture/#block).
+Emits trace log message to server log for each [Block](https://clickhouse.com/docs/en/development/architecture/#block).
 
 **Syntax**
 
diff --git a/docs/en/sql-reference/functions/json-functions.md b/docs/en/sql-reference/functions/json-functions.md
index fc49d3a810d..f3617082522 100644
--- a/docs/en/sql-reference/functions/json-functions.md
+++ b/docs/en/sql-reference/functions/json-functions.md
@@ -306,6 +306,77 @@ Result:
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
+## JSON_EXISTS(json, path) {#json-exists}
+
+If the value exists in the JSON document, `1` will be returned.
+
+If the value does not exist, `0` will be returned.
+
+Examples:
+
+``` sql
+SELECT JSON_EXISTS('{"hello":1}', '$.hello');
+SELECT JSON_EXISTS('{"hello":{"world":1}}', '$.hello.world');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[*]');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[0]');
+```
+
+!!! note "Note"
+    before version 21.11 the order of arguments was wrong, i.e. JSON_EXISTS(path, json)
+
+## JSON_QUERY(json, path) {#json-query}
+
+Parses a JSON and extract a value as JSON array or JSON object.
+
+If the value does not exist, an empty string will be returned.
+
+Example:
+
+``` sql
+SELECT JSON_QUERY('{"hello":"world"}', '$.hello');
+SELECT JSON_QUERY('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
+SELECT JSON_QUERY('{"hello":2}', '$.hello');
+SELECT toTypeName(JSON_QUERY('{"hello":2}', '$.hello'));
+```
+
+Result:
+
+``` text
+["world"]
+[0, 1, 4, 0, -1, -4]
+[2]
+String
+```
+!!! note "Note"
+    before version 21.11 the order of arguments was wrong, i.e. JSON_QUERY(path, json)
+
+## JSON_VALUE(json, path) {#json-value}
+
+Parses a JSON and extract a value as JSON scalar.
+
+If the value does not exist, an empty string will be returned.
+
+Example:
+
+``` sql
+SELECT JSON_VALUE('{"hello":"world"}', '$.hello');
+SELECT JSON_VALUE('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
+SELECT JSON_VALUE('{"hello":2}', '$.hello');
+SELECT toTypeName(JSON_VALUE('{"hello":2}', '$.hello'));
+```
+
+Result:
+
+``` text
+"world"
+0
+2
+String
+```
+
+!!! note "Note"
+    before version 21.11 the order of arguments was wrong, i.e. JSON_VALUE(path, json)
+
 ## toJSONString {#tojsonstring}
 
 Serializes a value to its JSON representation. Various data types and nested structures are supported.
diff --git a/docs/en/sql-reference/functions/logical-functions.md b/docs/en/sql-reference/functions/logical-functions.md
index 965ed97f20c..dcdb01e2059 100644
--- a/docs/en/sql-reference/functions/logical-functions.md
+++ b/docs/en/sql-reference/functions/logical-functions.md
@@ -19,6 +19,8 @@ Calculates the result of the logical conjunction between two or more values. Cor
 and(val1, val2...)
 ```
 
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `and` function according to a short scheme. If this setting is enabled, `vali` is evaluated only on rows where `(val1 AND val2 AND ... AND val{i-1})` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT and(number = 2, intDiv(1, number)) FROM numbers(10)`.
+
 **Arguments**
 
 -   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
@@ -68,9 +70,11 @@ Calculates the result of the logical disjunction between two or more values. Cor
 **Syntax**
 
 ``` sql
-and(val1, val2...)
+or(val1, val2...)
 ```
 
+You can use the [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation) setting to calculate the `or` function according to a short scheme. If this setting is enabled, `vali` is evaluated only on rows where `((NOT val1) AND (NOT val2) AND ... AND (NOT val{i-1}))` is true. For example, an exception about division by zero is not thrown when executing the query `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(10)`.
+
 **Arguments**
 
 -   `val1, val2, ...` — List of at least two values. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Nullable](../../sql-reference/data-types/nullable.md).
diff --git a/docs/en/sql-reference/functions/nlp-functions.md b/docs/en/sql-reference/functions/nlp-functions.md
index 1654771574b..8a1a44cf079 100644
--- a/docs/en/sql-reference/functions/nlp-functions.md
+++ b/docs/en/sql-reference/functions/nlp-functions.md
@@ -28,7 +28,7 @@ stem('language', word)
 Query:
 
 ``` sql
-SELECT SELECT arrayMap(x -> stem('en', x), ['I', 'think', 'it', 'is', 'a', 'blessing', 'in', 'disguise']) as res;
+SELECT arrayMap(x -> stem('en', x), ['I', 'think', 'it', 'is', 'a', 'blessing', 'in', 'disguise']) as res;
 ```
 
 Result:
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 30e2e427158..11c1e9ad3cf 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -8,6 +8,7 @@ toc_title: Other
 ## hostName() {#hostname}
 
 Returns a string with the name of the host that this function was performed on. For distributed processing, this is the name of the remote server host, if the function is performed on a remote server.
+If it is executed in the context of a distributed table, then it generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
 
 ## getMacro {#getmacro}
 
@@ -691,10 +692,18 @@ Returns the largest value of a and b.
 ## uptime() {#uptime}
 
 Returns the server’s uptime in seconds.
+If it is executed in the context of a distributed table, then it generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
 
 ## version() {#version}
 
 Returns the version of the server as a string.
+If it is executed in the context of a distributed table, then it generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
+
+## buildId() {#buildid}
+
+Returns the build ID generated by a compiler for the running ClickHouse server binary.
+If it is executed in the context of a distributed table, then it generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
+
 
 ## blockNumber {#blocknumber}
 
@@ -1201,7 +1210,7 @@ SELECT * FROM table WHERE indexHint(<expression>)
 
 **Returned value**
 
-1. Type: [Uint8](https://clickhouse.yandex/docs/en/data_types/int_uint/#diapazony-uint).
+1. Type: [Uint8](https://clickhouse.com/docs/en/data_types/int_uint/#diapazony-uint).
 
 **Example**
 
@@ -2101,6 +2110,7 @@ UNSUPPORTED_METHOD
 ## tcpPort {#tcpPort}
 
 Returns [native interface](../../interfaces/tcp.md) TCP port number listened by this server.
+If it is executed in the context of a distributed table, then it generates a normal column, otherwise it produces a constant value.
 
 **Syntax**
 
@@ -2138,3 +2148,318 @@ Result:
 
 -   [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port)
 
+## currentProfiles {#current-profiles}
+
+Returns a list of the current [settings profiles](../../operations/access-rights.md#settings-profiles-management) for the current user. 
+
+The command [SET PROFILE](../../sql-reference/statements/set.md#query-set) could be used to change the current setting profile. If the command `SET PROFILE` was not used the function returns the profiles specified at the current user's definition (see [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement)).
+
+**Syntax**
+
+``` sql
+currentProfiles()
+```
+
+**Returned value**
+
+-   List of the current user settings profiles. 
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## enabledProfiles {#enabled-profiles}
+
+ Returns settings profiles, assigned to the current user both explicitly and implicitly. Explicitly assigned profiles are the same as returned by the [currentProfiles](#current-profiles) function. Implicitly assigned profiles include parent profiles of other assigned profiles, profiles assigned via granted roles, profiles assigned via their own settings, and the main default profile (see the `default_profile` section in the main server configuration file).
+
+**Syntax**
+
+``` sql
+enabledProfiles()
+```
+
+**Returned value**
+
+-   List of the enabled settings profiles. 
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## defaultProfiles {#default-profiles}
+
+Returns all the profiles specified at the current user's definition (see [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement) statement).
+
+**Syntax**
+
+``` sql
+defaultProfiles()
+```
+
+**Returned value**
+
+-   List of the default settings profiles. 
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## currentRoles {#current-roles}
+
+Returns the names of the roles which are current for the current user. The current roles can be changed by the [SET ROLE](../../sql-reference/statements/set-role.md#set-role-statement) statement. If the `SET ROLE` statement was not used, the function `currentRoles` returns the same as `defaultRoles`.
+
+**Syntax**
+
+``` sql
+currentRoles()
+```
+
+**Returned value**
+
+-   List of the current roles for the current user. 
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## enabledRoles {#enabled-roles}
+
+Returns the names of the current roles and the roles, granted to some of the current roles.
+
+**Syntax**
+
+``` sql
+enabledRoles()
+```
+
+**Returned value**
+
+-   List of the enabled roles for the current user. 
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## defaultRoles {#default-roles}
+
+Returns the names of the roles which are enabled by default for the current user when he logins. Initially these are all roles granted to the current user (see [GRANT](../../sql-reference/statements/grant/#grant-select)), but that can be changed with the [SET DEFAULT ROLE](../../sql-reference/statements/set-role.md#set-default-role-statement) statement. 
+
+**Syntax**
+
+``` sql
+defaultRoles()
+```
+
+**Returned value**
+
+-   List of the default roles for the current user. 
+
+Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## getServerPort {#getserverport}
+
+Returns the number of the server port. When the port is not used by the server, throws an exception.
+
+**Syntax**
+
+``` sql
+getServerPort(port_name)
+```
+
+**Arguments**
+
+-   `port_name` — The name of the server port. [String](../../sql-reference/data-types/string.md#string). Possible values:
+
+    -   'tcp_port'
+    -   'tcp_port_secure'
+    -   'http_port'
+    -   'https_port'
+    -   'interserver_http_port'
+    -   'interserver_https_port'
+    -   'mysql_port'
+    -   'postgresql_port'
+    -   'grpc_port'
+    -   'prometheus.port'
+
+**Returned value**
+
+-   The number of the server port.
+
+Type: [UInt16](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT getServerPort('tcp_port');
+```
+
+Result:
+
+``` text
+┌─getServerPort('tcp_port')─┐
+│ 9000                      │
+└───────────────────────────┘
+```
+
+## queryID {#query-id}
+
+Returns the ID of the current query. Other parameters of a query can be extracted from the [system.query_log](../../operations/system-tables/query_log.md) table via `query_id`.
+
+In contrast to [initialQueryID](#initial-query-id) function, `queryID` can return different results on different shards (see example).
+
+**Syntax**
+
+``` sql
+queryID()
+```
+
+**Returned value**
+
+-   The ID of the current query.
+
+Type: [String](../../sql-reference/data-types/string.md)
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE tmp (str String) ENGINE = Log;
+INSERT INTO tmp (*) VALUES ('a');
+SELECT count(DISTINCT t) FROM (SELECT queryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
+```
+
+Result:
+
+``` text
+┌─count()─┐
+│ 3       │
+└─────────┘
+```
+
+## initialQueryID {#initial-query-id}
+
+Returns the ID of the initial current query. Other parameters of a query can be extracted from the [system.query_log](../../operations/system-tables/query_log.md) table via `initial_query_id`.
+
+In contrast to [queryID](#query-id) function, `initialQueryID` returns the same results on different shards (see example).
+
+**Syntax**
+
+``` sql
+initialQueryID()
+```
+
+**Returned value**
+
+-   The ID of the initial current query.
+
+Type: [String](../../sql-reference/data-types/string.md)
+
+**Example**
+
+Query:
+
+``` sql
+CREATE TABLE tmp (str String) ENGINE = Log;
+INSERT INTO tmp (*) VALUES ('a');
+SELECT count(DISTINCT t) FROM (SELECT initialQueryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
+```
+
+Result:
+
+``` text
+┌─count()─┐
+│ 1       │
+└─────────┘
+```
+
+## shardNum {#shard-num}
+
+Returns the index of a shard which processes a part of data for a distributed query. Indices are started from `1`.
+If a query is not distributed then constant value `0` is returned.
+
+**Syntax**
+
+``` sql
+shardNum()
+```
+
+**Returned value**
+
+-   Shard index or constant `0`.
+
+Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Example**
+
+In the following example a configuration with two shards is used. The query is executed on the [system.one](../../operations/system-tables/one.md) table on every shard.
+
+Query:
+
+``` sql
+CREATE TABLE shard_num_example (dummy UInt8) 
+    ENGINE=Distributed(test_cluster_two_shards_localhost, system, one, dummy);
+SELECT dummy, shardNum(), shardCount() FROM shard_num_example;
+```
+
+Result:
+
+``` text
+┌─dummy─┬─shardNum()─┬─shardCount()─┐
+│     0 │          2 │            2 │
+│     0 │          1 │            2 │
+└───────┴────────────┴──────────────┘
+```
+
+**See Also**
+
+-   [Distributed Table Engine](../../engines/table-engines/special/distributed.md)
+
+## shardCount {#shard-count}
+
+Returns the total number of shards for a distributed query.
+If a query is not distributed then constant value `0` is returned.
+
+**Syntax**
+
+``` sql
+shardCount()
+```
+
+**Returned value**
+
+-   Total number of shards or `0`.
+
+Type: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**See Also**
+
+- [shardNum()](#shard-num) function example also contains `shardCount()` function call.
+
+## getOSKernelVersion {#getoskernelversion}
+
+Returns a string with the current OS kernel version.
+
+**Syntax**
+
+``` sql
+getOSKernelVersion()
+```
+
+**Arguments**
+
+-   None.
+
+**Returned value**
+
+-   The current OS kernel version.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT getOSKernelVersion();
+```
+
+Result:
+
+``` text
+┌─getOSKernelVersion()────┐
+│ Linux 4.15.0-55-generic │
+└─────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/rounding-functions.md b/docs/en/sql-reference/functions/rounding-functions.md
index 5f74c6329d1..ad92ba502e1 100644
--- a/docs/en/sql-reference/functions/rounding-functions.md
+++ b/docs/en/sql-reference/functions/rounding-functions.md
@@ -29,7 +29,7 @@ Returns the round number with largest absolute value that has an absolute value
 
 Rounds a value to a specified number of decimal places.
 
-The function returns the nearest number of the specified order. In case when given number has equal distance to surrounding numbers, the function uses banker’s rounding for float number types and rounds away from zero for the other number types.
+The function returns the nearest number of the specified order. In case when given number has equal distance to surrounding numbers, the function uses banker’s rounding for float number types and rounds away from zero for the other number types (Decimal).
 
 ``` sql
 round(expression [, decimal_places])
@@ -49,7 +49,7 @@ The rounded number of the same type as the input number.
 
 ### Examples {#examples}
 
-**Example of use**
+**Example of use with Float**
 
 ``` sql
 SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
@@ -63,6 +63,20 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 └─────┴──────────────────────────┘
 ```
 
+**Example of use with Decimal**
+
+``` sql
+SELECT cast(number / 2 AS  Decimal(10,4)) AS x, round(x) FROM system.numbers LIMIT 3
+```
+
+``` text
+┌──────x─┬─round(CAST(divide(number, 2), 'Decimal(10, 4)'))─┐
+│ 0.0000 │                                           0.0000 │
+│ 0.5000 │                                           1.0000 │
+│ 1.0000 │                                           1.0000 │
+└────────┴──────────────────────────────────────────────────┘
+```
+
 **Examples of rounding**
 
 Rounding to the nearest number.
@@ -162,7 +176,7 @@ roundBankers(4.5) = 4
 roundBankers(3.55, 1) = 3.6
 roundBankers(3.65, 1) = 3.6
 roundBankers(10.35, 1) = 10.4
-roundBankers(10.755, 2) = 11,76
+roundBankers(10.755, 2) = 10.76
 ```
 
 **See Also**
diff --git a/docs/en/sql-reference/functions/splitting-merging-functions.md b/docs/en/sql-reference/functions/splitting-merging-functions.md
index 718d5a977b9..9b812ea6663 100644
--- a/docs/en/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/en/sql-reference/functions/splitting-merging-functions.md
@@ -213,7 +213,7 @@ SELECT splitByNonAlpha('  1!  a,  b.  ');
 
 ## arrayStringConcat(arr\[, separator\]) {#arraystringconcatarr-separator}
 
-Concatenates the strings listed in the array with the separator.’separator’ is an optional parameter: a constant string, set to an empty string by default.
+Concatenates the strings (values of type String or Nullable(String)) listed in the array with the separator. ’separator’ is an optional parameter: a constant string, set to an empty string by default.
 Returns the string.
 
 ## alphaTokens(s) {#alphatokenss}
@@ -270,3 +270,40 @@ Result:
 │ [['abc','123'],['8','"hkl"']]                                         │
 └───────────────────────────────────────────────────────────────────────┘
 ```
+
+## ngrams {#ngrams}
+
+Splits the UTF-8 string into n-grams of `ngramsize` symbols.
+
+**Syntax** 
+
+``` sql
+ngrams(string, ngramsize)
+```
+
+**Arguments**
+
+-   `string` — String. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+-   `ngramsize` — The size of an n-gram. [UInt](../../sql-reference/data-types/int-uint.md).
+
+**Returned values**
+
+-   Array with n-grams.
+
+Type: [Array](../../sql-reference/data-types/array.md)([FixedString](../../sql-reference/data-types/fixedstring.md)).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT ngrams('ClickHouse', 3);
+```
+
+Result:
+
+``` text
+┌─ngrams('ClickHouse', 3)───────────────────────────┐
+│ ['Cli','lic','ick','ckH','kHo','Hou','ous','use'] │
+└───────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/string-functions.md b/docs/en/sql-reference/functions/string-functions.md
index 8ec8aa7339d..4391d013440 100644
--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@@ -10,17 +10,83 @@ toc_title: Strings
 
 ## empty {#empty}
 
-Returns 1 for an empty string or 0 for a non-empty string.
-The result type is UInt8.
+Checks whether the input string is empty.
+
+**Syntax**
+
+``` sql
+empty(x)
+```
+
 A string is considered non-empty if it contains at least one byte, even if this is a space or a null byte.
-The function also works for arrays or UUID.
-UUID is empty if it is all zeros (nil UUID).
+
+The function also works for [arrays](array-functions.md#function-empty) or [UUID](uuid-functions.md#empty).
+
+**Arguments**
+
+-   `x` — Input value. [String](../data-types/string.md).
+
+**Returned value**
+
+-   Returns `1` for an empty string or `0` for a non-empty string.
+
+Type: [UInt8](../data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT empty('');
+```
+
+Result:
+
+```text
+┌─empty('')─┐
+│         1 │
+└───────────┘
+```
 
 ## notEmpty {#notempty}
 
-Returns 0 for an empty string or 1 for a non-empty string.
-The result type is UInt8.
-The function also works for arrays or UUID.
+Checks whether the input string is non-empty.
+
+**Syntax**
+
+``` sql
+notEmpty(x)
+```
+
+A string is considered non-empty if it contains at least one byte, even if this is a space or a null byte.
+
+The function also works for [arrays](array-functions.md#function-notempty) or [UUID](uuid-functions.md#notempty).
+
+**Arguments**
+
+-   `x` — Input value. [String](../data-types/string.md).
+
+**Returned value**
+
+-   Returns `1` for a non-empty string or `0` for an empty string string.
+
+Type: [UInt8](../data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT notEmpty('text');
+```
+
+Result:
+
+```text
+┌─notEmpty('text')─┐
+│                1 │
+└──────────────────┘
+```
 
 ## length {#length}
 
@@ -43,6 +109,158 @@ The result type is UInt64.
 Returns the length of a string in Unicode code points (not in characters), assuming that the string contains a set of bytes that make up UTF-8 encoded text. If this assumption is not met, it returns some result (it does not throw an exception).
 The result type is UInt64.
 
+## leftPad {#leftpad}
+
+Pads the current string from the left with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `LPAD` function.
+
+**Syntax**
+
+``` sql
+leftPad('string', 'length'[, 'pad_string'])
+```
+
+**Arguments**
+
+-   `string` — Input string that needs to be padded. [String](../data-types/string.md).
+-   `length` — The length of the resulting string. [UInt](../data-types/int-uint.md). If the value is less than the input string length, then the input string is returned as-is.
+-   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+
+**Returned value**
+
+-   The resulting string of the given length.
+
+Type: [String](../data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT leftPad('abc', 7, '*'), leftPad('def', 7);
+```
+
+Result:
+
+``` text
+┌─leftPad('abc', 7, '*')─┬─leftPad('def', 7)─┐
+│ ****abc                │     def           │
+└────────────────────────┴───────────────────┘
+```
+
+## leftPadUTF8 {#leftpadutf8}
+
+Pads the current string from the left with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `LPAD` function. While in the [leftPad](#leftpad) function the length is measured in bytes, here in the `leftPadUTF8` function it is measured in code points.
+
+**Syntax**
+
+``` sql
+leftPadUTF8('string','length'[, 'pad_string'])
+```
+
+**Arguments**
+
+-   `string` — Input string that needs to be padded. [String](../data-types/string.md).
+-   `length` — The length of the resulting string. [UInt](../data-types/int-uint.md). If the value is less than the input string length, then the input string is returned as-is.
+-   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+
+**Returned value**
+
+-   The resulting string of the given length.
+
+Type: [String](../data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT leftPadUTF8('абвг', 7, '*'), leftPadUTF8('дежз', 7);
+```
+
+Result:
+
+``` text
+┌─leftPadUTF8('абвг', 7, '*')─┬─leftPadUTF8('дежз', 7)─┐
+│ ***абвг                     │    дежз                │
+└─────────────────────────────┴────────────────────────┘
+```
+
+## rightPad {#rightpad}
+
+Pads the current string from the right with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `RPAD` function.
+
+**Syntax**
+
+``` sql
+rightPad('string', 'length'[, 'pad_string'])
+```
+
+**Arguments**
+
+-   `string` — Input string that needs to be padded. [String](../data-types/string.md).
+-   `length` — The length of the resulting string. [UInt](../data-types/int-uint.md). If the value is less than the input string length, then the input string is returned as-is.
+-   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+
+**Returned value**
+
+-   The resulting string of the given length.
+
+Type: [String](../data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT rightPad('abc', 7, '*'), rightPad('abc', 7);
+```
+
+Result:
+
+``` text
+┌─rightPad('abc', 7, '*')─┬─rightPad('abc', 7)─┐
+│ abc****                 │ abc                │
+└─────────────────────────┴────────────────────┘
+```
+
+## rightPadUTF8 {#rightpadutf8}
+
+Pads the current string from the right with spaces or a specified string (multiple times, if needed) until the resulting string reaches the given length. Similarly to the MySQL `RPAD` function. While in the [rightPad](#rightpad) function the length is measured in bytes, here in the `rightPadUTF8` function it is measured in code points.
+
+**Syntax**
+
+``` sql
+rightPadUTF8('string','length'[, 'pad_string'])
+```
+
+**Arguments**
+
+-   `string` — Input string that needs to be padded. [String](../data-types/string.md).
+-   `length` — The length of the resulting string. [UInt](../data-types/int-uint.md). If the value is less than the input string length, then the input string is returned as-is.
+-   `pad_string` — The string to pad the input string with. [String](../data-types/string.md). Optional. If not specified, then the input string is padded with spaces.
+
+**Returned value**
+
+-   The resulting string of the given length.
+
+Type: [String](../data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT rightPadUTF8('абвг', 7, '*'), rightPadUTF8('абвг', 7);
+```
+
+Result:
+
+``` text
+┌─rightPadUTF8('абвг', 7, '*')─┬─rightPadUTF8('абвг', 7)─┐
+│ абвг***                      │ абвг                    │
+└──────────────────────────────┴─────────────────────────┘
+```
+
 ## lower, lcase {#lower}
 
 Converts ASCII Latin symbols in a string to lowercase.
@@ -95,6 +313,32 @@ SELECT toValidUTF8('\x61\xF0\x80\x80\x80b');
 └───────────────────────┘
 ```
 
+## tokens {#tokens}
+
+Split string into tokens using non-alpha numeric ASCII characters as separators.
+
+**Arguments**
+
+-   `input_string` — Any set of bytes represented as the [String](../../sql-reference/data-types/string.md) data type object.
+
+**Returned value**
+
+-   The resulting array of tokens from input string.
+
+Type: [Array](../data-types/array.md).
+
+**Example**
+
+``` sql
+SELECT tokens('test1,;\\ test2,;\\ test3,;\\   test4') AS tokens;
+```
+
+``` text
+┌─tokens────────────────────────────┐
+│ ['test1','test2','test3','test4'] │
+└───────────────────────────────────┘
+```
+
 ## repeat {#repeat}
 
 Repeats a string as many times as specified and concatenates the replicated values as a single string.
@@ -566,6 +810,150 @@ Result:
 └─────┘
 ```
 
+## normalizeUTF8NFC {#normalizeutf8nfc}
+
+Converts a string to [NFC normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+
+**Syntax**
+
+``` sql
+normalizeUTF8NFC(words)
+```
+
+**Arguments**
+
+-   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   String transformed to NFC normalization form.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFC('â') AS nfc, length(nfc) AS nfc_len;
+```
+
+Result:
+
+``` text
+┌─length('â')─┬─nfc─┬─nfc_len─┐
+│           2 │ â   │       2 │
+└─────────────┴─────┴─────────┘
+```
+
+## normalizeUTF8NFD {#normalizeutf8nfd}
+
+Converts a string to [NFD normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+
+**Syntax**
+
+``` sql
+normalizeUTF8NFD(words)
+```
+
+**Arguments**
+
+-   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   String transformed to NFD normalization form.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFD('â') AS nfd, length(nfd) AS nfd_len;
+```
+
+Result:
+
+``` text
+┌─length('â')─┬─nfd─┬─nfd_len─┐
+│           2 │ â   │       3 │
+└─────────────┴─────┴─────────┘
+```
+
+## normalizeUTF8NFKC {#normalizeutf8nfkc}
+
+Converts a string to [NFKC normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+
+**Syntax**
+
+``` sql
+normalizeUTF8NFKC(words)
+```
+
+**Arguments**
+
+-   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   String transformed to NFKC normalization form.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFKC('â') AS nfkc, length(nfkc) AS nfkc_len;
+```
+
+Result:
+
+``` text
+┌─length('â')─┬─nfkc─┬─nfkc_len─┐
+│           2 │ â    │        2 │
+└─────────────┴──────┴──────────┘
+```
+
+## normalizeUTF8NFKD {#normalizeutf8nfkd}
+
+Converts a string to [NFKD normalized form](https://en.wikipedia.org/wiki/Unicode_equivalence#Normal_forms), assuming the string contains a set of bytes that make up a UTF-8 encoded text.
+
+**Syntax**
+
+``` sql
+normalizeUTF8NFKD(words)
+```
+
+**Arguments**
+
+-   `words` — Input string that contains UTF-8 encoded text. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   String transformed to NFKD normalization form.
+
+Type: [String](../../sql-reference/data-types/string.md).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFKD('â') AS nfkd, length(nfkd) AS nfkd_len;
+```
+
+Result:
+
+``` text
+┌─length('â')─┬─nfkd─┬─nfkd_len─┐
+│           2 │ â    │        3 │
+└─────────────┴──────┴──────────┘
+```
+
 ## encodeXMLComponent {#encode-xml-component}
 
 Escapes characters to place string into XML text node or attribute.
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index d3b4fc908cc..a036482463a 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -502,7 +502,7 @@ The same thing as ‘like’, but negative.
 
 ## ilike {#ilike}
 
-Case insensitive variant of [like](https://clickhouse.tech/docs/en/sql-reference/functions/string-search-functions/#function-like) function. You can use `ILIKE` operator instead of the `ilike` function.
+Case insensitive variant of [like](https://clickhouse.com/docs/en/sql-reference/functions/string-search-functions/#function-like) function. You can use `ILIKE` operator instead of the `ilike` function.
 
 **Syntax**
 
@@ -558,7 +558,7 @@ Result:
 
 **See Also**
 
--   [like](https://clickhouse.tech/docs/en/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
+-   [like](https://clickhouse.com/docs/en/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
 
 ## ngramDistance(haystack, needle) {#ngramdistancehaystack-needle}
 
diff --git a/docs/en/sql-reference/functions/tuple-functions.md b/docs/en/sql-reference/functions/tuple-functions.md
index 39e59ae2ba9..08720bb4d60 100644
--- a/docs/en/sql-reference/functions/tuple-functions.md
+++ b/docs/en/sql-reference/functions/tuple-functions.md
@@ -165,3 +165,805 @@ Result:
 │               2 │
 └─────────────────┘
 ```
+
+## tuplePlus {#tupleplus}
+
+Calculates the sum of corresponding values of two tuples of the same size.
+
+**Syntax**
+
+```sql
+tuplePlus(tuple1, tuple2)
+```
+
+Alias: `vectorSum`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Tuple with the sum.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tuplePlus((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─tuplePlus((1, 2), (2, 3))─┐
+│ (3,5)                     │
+└───────────────────────────┘
+```
+
+## tupleMinus {#tupleminus}
+
+Calculates the subtraction of corresponding values of two tuples of the same size.
+
+**Syntax**
+
+```sql
+tupleMinus(tuple1, tuple2)
+```
+
+Alias: `vectorDifference`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Tuple with the result of subtraction.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tupleMinus((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─tupleMinus((1, 2), (2, 3))─┐
+│ (-1,-1)                    │
+└────────────────────────────┘
+```
+
+## tupleMultiply {#tuplemultiply}
+
+Calculates the multiplication of corresponding values of two tuples of the same size.
+
+**Syntax**
+
+```sql
+tupleMultiply(tuple1, tuple2)
+```
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Tuple with the multiplication.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tupleMultiply((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─tupleMultiply((1, 2), (2, 3))─┐
+│ (2,6)                         │
+└───────────────────────────────┘
+```
+
+## tupleDivide {#tupledivide}
+
+Calculates the division of corresponding values of two tuples of the same size. Note that division by zero will return `inf`.
+
+**Syntax**
+
+```sql
+tupleDivide(tuple1, tuple2)
+```
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Tuple with the result of division.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tupleDivide((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─tupleDivide((1, 2), (2, 3))─┐
+│ (0.5,0.6666666666666666)    │
+└─────────────────────────────┘
+```
+
+## tupleNegate {#tuplenegate}
+
+Calculates the negation of the tuple values.
+
+**Syntax**
+
+```sql
+tupleNegate(tuple)
+```
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Tuple with the result of negation.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tupleNegate((1,  2));
+```
+
+Result:
+
+```text
+┌─tupleNegate((1, 2))─┐
+│ (-1,-2)             │
+└─────────────────────┘
+```
+
+## tupleMultiplyByNumber {#tuplemultiplybynumber}
+
+Returns a tuple with all values multiplied by a number.
+
+**Syntax**
+
+```sql
+tupleMultiplyByNumber(tuple, number)
+```
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+-   `number` — Multiplier. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Returned value**
+
+-   Tuple with multiplied values.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tupleMultiplyByNumber((1, 2), -2.1);
+```
+
+Result:
+
+```text
+┌─tupleMultiplyByNumber((1, 2), -2.1)─┐
+│ (-2.1,-4.2)                         │
+└─────────────────────────────────────┘
+```
+
+## tupleDivideByNumber {#tupledividebynumber}
+
+Returns a tuple with all values divided by a number. Note that division by zero will return `inf`.
+
+**Syntax**
+
+```sql
+tupleDivideByNumber(tuple, number)
+```
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+-   `number` — Divider. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Returned value**
+
+-   Tuple with divided values.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT tupleDivideByNumber((1, 2), 0.5);
+```
+
+Result:
+
+```text
+┌─tupleDivideByNumber((1, 2), 0.5)─┐
+│ (2,4)                            │
+└──────────────────────────────────┘
+```
+
+## dotProduct {#dotproduct}
+
+Calculates the scalar product of two tuples of the same size.
+
+**Syntax**
+
+```sql
+dotProduct(tuple1, tuple2)
+```
+
+Alias: `scalarProduct`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Scalar product.
+
+Type: [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT dotProduct((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─dotProduct((1, 2), (2, 3))─┐
+│                          8 │
+└────────────────────────────┘
+```
+
+## L1Norm {#l1norm}
+
+Calculates the sum of absolute values of a tuple.
+
+**Syntax**
+
+```sql
+L1Norm(tuple)
+```
+
+Alias: `normL1`.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   L1-norm or [taxicab geometry](https://en.wikipedia.org/wiki/Taxicab_geometry) distance.
+
+Type: [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L1Norm((1, 2));
+```
+
+Result:
+
+```text
+┌─L1Norm((1, 2))─┐
+│              3 │
+└────────────────┘
+```
+
+## L2Norm {#l2norm}
+
+Calculates the square root of the sum of the squares of the tuple values.
+
+**Syntax**
+
+```sql
+L2Norm(tuple)
+```
+
+Alias: `normL2`.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   L2-norm or [Euclidean distance](https://en.wikipedia.org/wiki/Euclidean_distance).
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L2Norm((1, 2));
+```
+
+Result:
+
+```text
+┌───L2Norm((1, 2))─┐
+│ 2.23606797749979 │
+└──────────────────┘
+```
+
+## LinfNorm {#linfnorm}
+
+Calculates the maximum of absolute values of a tuple.
+
+**Syntax**
+
+```sql
+LinfNorm(tuple)
+```
+
+Alias: `normLinf`.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Linf-norm or the maximum absolute value.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT LinfNorm((1, -2));
+```
+
+Result:
+
+```text
+┌─LinfNorm((1, -2))─┐
+│                 2 │
+└───────────────────┘
+```
+
+## LpNorm {#lpnorm}
+
+Calculates the root of `p`-th power of the sum of the absolute values of a tuple in the power of `p`.
+
+**Syntax**
+
+```sql
+LpNorm(tuple, p)
+```
+
+Alias: `normLp`.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+-   `p` — The power. Possible values: real number in `[1; inf)`. [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+
+**Returned value**
+
+-   [Lp-norm](https://en.wikipedia.org/wiki/Norm_(mathematics)#p-norm)
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT LpNorm((1, -2), 2);
+```
+
+Result:
+
+```text
+┌─LpNorm((1, -2), 2)─┐
+│   2.23606797749979 │
+└────────────────────┘
+```
+
+## L1Distance {#l1distance}
+
+Calculates the distance between two points (the values of the tuples are the coordinates) in `L1` space (1-norm ([taxicab geometry](https://en.wikipedia.org/wiki/Taxicab_geometry) distance)).
+
+**Syntax**
+
+```sql
+L1Distance(tuple1, tuple2)
+```
+
+Alias: `distanceL1`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple1` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   1-norm distance.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L1Distance((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─L1Distance((1, 2), (2, 3))─┐
+│                          2 │
+└────────────────────────────┘
+```
+
+## L2Distance {#l2distance}
+
+Calculates the distance between two points (the values of the tuples are the coordinates) in Euclidean space ([Euclidean distance](https://en.wikipedia.org/wiki/Euclidean_distance)).
+
+**Syntax**
+
+```sql
+L2Distance(tuple1, tuple2)
+```
+
+Alias: `distanceL2`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple1` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   2-norm distance.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L2Distance((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─L2Distance((1, 2), (2, 3))─┐
+│         1.4142135623730951 │
+└────────────────────────────┘
+```
+
+## LinfDistance {#linfdistance}
+
+Calculates the distance between two points (the values of the tuples are the coordinates) in `L_{inf}` space ([maximum norm](https://en.wikipedia.org/wiki/Norm_(mathematics)#Maximum_norm_(special_case_of:_infinity_norm,_uniform_norm,_or_supremum_norm))).
+
+**Syntax**
+
+```sql
+LinfDistance(tuple1, tuple2)
+```
+
+Alias: `distanceLinf`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple1` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Infinity-norm distance.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT LinfDistance((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─LinfDistance((1, 2), (2, 3))─┐
+│                            1 │
+└──────────────────────────────┘
+```
+
+## LpDistance {#lpdistance}
+
+Calculates the distance between two points (the values of the tuples are the coordinates) in `Lp` space ([p-norm distance](https://en.wikipedia.org/wiki/Norm_(mathematics)#p-norm)).
+
+**Syntax**
+
+```sql
+LpDistance(tuple1, tuple2, p)
+```
+
+Alias: `distanceLp`.
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple1` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `p` — The power. Possible values: real number from `[1; inf)`. [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+
+**Returned value**
+
+-   p-norm distance.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT LpDistance((1, 2), (2, 3), 3);
+```
+
+Result:
+
+```text
+┌─LpDistance((1, 2), (2, 3), 3)─┐
+│            1.2599210498948732 │
+└───────────────────────────────┘
+```
+
+## L1Normalize {#l1normalize}
+
+Calculates the unit vector of a given vector (the values of the tuple are the coordinates) in `L1` space ([taxicab geometry](https://en.wikipedia.org/wiki/Taxicab_geometry)).
+
+**Syntax**
+
+```sql
+L1Normalize(tuple)
+```
+
+Alias: `normalizeL1`.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Unit vector.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L1Normalize((1, 2));
+```
+
+Result:
+
+```text
+┌─L1Normalize((1, 2))─────────────────────┐
+│ (0.3333333333333333,0.6666666666666666) │
+└─────────────────────────────────────────┘
+```
+
+## L2Normalize {#l2normalize}
+
+Calculates the unit vector of a given vector (the values of the tuple are the coordinates) in Euclidean space (using [Euclidean distance](https://en.wikipedia.org/wiki/Euclidean_distance)).
+
+**Syntax**
+
+```sql
+L2Normalize(tuple)
+```
+
+Alias: `normalizeL1`.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Unit vector.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L2Normalize((3, 4));
+```
+
+Result:
+
+```text
+┌─L2Normalize((3, 4))─┐
+│ (0.6,0.8)           │
+└─────────────────────┘
+```
+
+## LinfNormalize {#linfnormalize}
+
+Calculates the unit vector of a given vector (the values of the tuple are the coordinates) in `L_{inf}` space (using [maximum norm](https://en.wikipedia.org/wiki/Norm_(mathematics)#Maximum_norm_(special_case_of:_infinity_norm,_uniform_norm,_or_supremum_norm))).
+
+**Syntax**
+
+```sql
+LinfNormalize(tuple)
+```
+
+Alias: `normalizeLinf `.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Unit vector.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT LinfNormalize((3, 4));
+```
+
+Result:
+
+```text
+┌─LinfNormalize((3, 4))─┐
+│ (0.75,1)              │
+└───────────────────────┘
+```
+
+## LpNormalize {#lpnormalize}
+
+Calculates the unit vector of a given vector (the values of the tuple are the coordinates) in `Lp` space (using [p-norm](https://en.wikipedia.org/wiki/Norm_(mathematics)#p-norm)).
+
+
+**Syntax**
+
+```sql
+LpNormalize(tuple, p)
+```
+
+Alias: `normalizeLp `.
+
+**Arguments**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+-   `p` — The power. Possible values: any number from [1;inf). [UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
+
+**Returned value**
+
+-   Unit vector.
+
+Type: [Tuple](../../sql-reference/data-types/tuple.md) of [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT LpNormalize((3, 4),5);
+```
+
+Result:
+
+```text
+┌─LpNormalize((3, 4), 5)──────────────────┐
+│ (0.7187302630182624,0.9583070173576831) │
+└─────────────────────────────────────────┘
+```
+
+## cosineDistance {#cosinedistance}
+
+Calculates the cosine distance between two vectors (the values of the tuples are the coordinates). The less the returned value is, the more similar are the vectors.
+
+**Syntax**
+
+```sql
+cosineDistance(tuple1, tuple2)
+```
+
+**Arguments**
+
+-   `tuple1` — First tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — Second tuple. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Returned value**
+
+-   Cosine of the angle between two vectors substracted from one.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT cosineDistance((1, 2), (2, 3));
+```
+
+Result:
+
+```text
+┌─cosineDistance((1, 2), (2, 3))─┐
+│           0.007722123286332261 │
+└────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/tuple-map-functions.md b/docs/en/sql-reference/functions/tuple-map-functions.md
index 414bfb9de37..843cb16f572 100644
--- a/docs/en/sql-reference/functions/tuple-map-functions.md
+++ b/docs/en/sql-reference/functions/tuple-map-functions.md
@@ -11,7 +11,7 @@ Arranges `key:value` pairs into [Map(key, value)](../../sql-reference/data-types
 
 **Syntax**
 
-``` sql
+```sql
 map(key1, value1[, key2, value2, ...])
 ```
 
@@ -22,7 +22,7 @@ map(key1, value1[, key2, value2, ...])
 
 **Returned value**
 
--  Data structure as `key:value` pairs.
+-   Data structure as `key:value` pairs.
 
 Type: [Map(key, value)](../../sql-reference/data-types/map.md).
 
@@ -30,7 +30,7 @@ Type: [Map(key, value)](../../sql-reference/data-types/map.md).
 
 Query:
 
-``` sql
+```sql
 SELECT map('key1', number, 'key2', number * 2) FROM numbers(3);
 ```
 
@@ -46,7 +46,7 @@ Result:
 
 Query:
 
-``` sql
+```sql
 CREATE TABLE table_map (a Map(String, UInt64)) ENGINE = MergeTree() ORDER BY a;
 INSERT INTO table_map SELECT map('key1', number, 'key2', number * 2) FROM numbers(3);
 SELECT a['key2'] FROM table_map;
@@ -54,7 +54,7 @@ SELECT a['key2'] FROM table_map;
 
 Result:
 
-``` text
+```text
 ┌─arrayElement(a, 'key2')─┐
 │                       0 │
 │                       2 │
@@ -72,12 +72,60 @@ Collect all the keys and sum corresponding values.
 
 **Syntax**
 
-``` sql
+```sql
 mapAdd(arg1, arg2 [, ...])
 ```
 
 **Arguments**
 
+Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promoted to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
+
+**Returned value**
+
+-   Depending on the arguments returns one [map](../../sql-reference/data-types/map.md) or [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), where the first array contains the sorted keys and the second array contains values.
+
+**Example**
+
+Query with a tuple:
+
+```sql
+SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;
+```
+
+Result:
+
+```text
+┌─res───────────┬─type───────────────────────────────┐
+│ ([1,2],[2,2]) │ Tuple(Array(UInt8), Array(UInt64)) │
+└───────────────┴────────────────────────────────────┘
+```
+
+Query with `Map` type:
+
+```sql
+SELECT mapAdd(map(1,1), map(1,1));
+```
+
+Result:
+
+```text
+┌─mapAdd(map(1, 1), map(1, 1))─┐
+│ {1:2}                        │
+└──────────────────────────────┘
+```
+
+## mapSubtract {#function-mapsubtract}
+
+Collect all the keys and subtract corresponding values.
+
+**Syntax**
+
+```sql
+mapSubtract(Tuple(Array, Array), Tuple(Array, Array) [, ...])
+```
+
+**Arguments**
+
 Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promote to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
 
 **Returned value**
@@ -88,45 +136,6 @@ Arguments are [maps](../../sql-reference/data-types/map.md) or [tuples](../../sq
 
 Query with a tuple map:
 
-``` sql
-SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;
-```
-
-Result:
-
-``` text
-┌─res───────────┬─type───────────────────────────────┐
-│ ([1,2],[2,2]) │ Tuple(Array(UInt8), Array(UInt64)) │
-└───────────────┴────────────────────────────────────┘
-```
-
-Query with `Map` type:
-
-``` sql
-```
-
-## mapSubtract {#function-mapsubtract}
-
-Collect all the keys and subtract corresponding values.
-
-**Syntax**
-
-``` sql
-mapSubtract(Tuple(Array, Array), Tuple(Array, Array) [, ...])
-```
-
-**Arguments**
-
-Arguments are [tuples](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array), where items in the first array represent keys, and the second array contains values for the each key. All key arrays should have same type, and all value arrays should contain items which are promote to the one type ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) or [Float64](../../sql-reference/data-types/float.md#float32-float64)). The common promoted type is used as a type for the result array.
-
-**Returned value**
-
--   Returns one [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), where the first array contains the sorted keys and the second array contains values.
-
-**Example**
-
-Query:
-
 ```sql
 SELECT mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt32(2), 1])) as res, toTypeName(res) as type;
 ```
@@ -139,35 +148,59 @@ Result:
 └────────────────┴───────────────────────────────────┘
 ```
 
+Query with `Map` type:
+
+```sql
+SELECT mapSubtract(map(1,1), map(1,1));
+```
+
+Result:
+
+```text
+┌─mapSubtract(map(1, 1), map(1, 1))─┐
+│ {1:0}                             │
+└───────────────────────────────────┘
+```
+
 ## mapPopulateSeries {#function-mappopulateseries}
 
 Fills missing keys in the maps (key and value array pair), where keys are integers. Also, it supports specifying the max key, which is used to extend the keys array.
 
 **Syntax**
 
-``` sql
+```sql
 mapPopulateSeries(keys, values[, max])
+mapPopulateSeries(map[, max])
 ```
 
-Generates a map, where keys are a series of numbers, from minimum to maximum keys (or `max` argument if it specified) taken from `keys` array with a step size of one, and corresponding values taken from `values` array. If the value is not specified for the key, then it uses the default value in the resulting map. For repeated keys, only the first value (in order of appearing) gets associated with the key.
+Generates a map (a tuple with two arrays or a value of `Map` type, depending on the arguments), where keys are a series of numbers, from minimum to maximum keys (or `max` argument if it specified) taken from the map with a step size of one, and corresponding values. If the value is not specified for the key, then it uses the default value in the resulting map. For repeated keys, only the first value (in order of appearing) gets associated with the key.
 
-The number of elements in `keys` and `values` must be the same for each row.
+For array arguments the number of elements in `keys` and `values` must be the same for each row.
 
 **Arguments**
 
+Arguments are [maps](../../sql-reference/data-types/map.md) or two [arrays](../../sql-reference/data-types/array.md#data-type-array), where the first array represent keys, and the second array contains values for the each key.
+
+Mapped arrays:
+
 -   `keys` — Array of keys. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#uint-ranges)).
 -   `values` — Array of values. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#uint-ranges)).
+-   `max` — Maximum key value. Optional. [Int8, Int16, Int32, Int64, Int128, Int256](../../sql-reference/data-types/int-uint.md#int-ranges).
+
+or
+
+-   `map` — Map with integer keys. [Map](../../sql-reference/data-types/map.md).
 
 **Returned value**
 
--  Returns a [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array): keys in sorted order, and values the corresponding keys.
+-   Depending on the arguments returns a [map](../../sql-reference/data-types/map.md) or a [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2) of two [arrays](../../sql-reference/data-types/array.md#data-type-array): keys in sorted order, and values the corresponding keys.
 
 **Example**
 
-Query:
+Query with mapped arrays:
 
 ```sql
-select mapPopulateSeries([1,2,4], [11,22,44], 5) as res, toTypeName(res) as type;
+SELECT mapPopulateSeries([1,2,4], [11,22,44], 5) AS res, toTypeName(res) AS type;
 ```
 
 Result:
@@ -178,13 +211,27 @@ Result:
 └──────────────────────────────┴───────────────────────────────────┘
 ```
 
+Query with `Map` type:
+
+```sql
+SELECT mapPopulateSeries(map(1, 10, 5, 20), 6);
+```
+
+Result:
+
+```text
+┌─mapPopulateSeries(map(1, 10, 5, 20), 6)─┐
+│ {1:10,2:0,3:0,4:0,5:20,6:0}             │
+└─────────────────────────────────────────┘
+```
+
 ## mapContains {#mapcontains}
 
 Determines  whether the `map` contains the `key` parameter.
 
 **Syntax**
 
-``` sql
+```sql
 mapContains(map, key)
 ```
 
@@ -305,6 +352,45 @@ Result:
 │ ['eleven','11']  │
 │ ['twelve','6.0'] │
 └──────────────────┘
-```
+```  
+  
+## mapContainsKeyLike {#mapContainsKeyLike}  
+  
+**Syntax**
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/functions/tuple-map-functions/) <!--hide-->
+```sql
+mapContainsKeyLike(map, pattern)
+```  
+  
+**Parameters**
+  
+-   `map` — Map. [Map](../../sql-reference/data-types/map.md).  
+-   `pattern`  - String pattern to match.  
+  
+**Returned value**
+
+-   `1` if `map` contains `key` like specified pattern, `0` if not.  
+  
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE test (a Map(String,String)) ENGINE = Memory;
+
+INSERT INTO test VALUES ({'abc':'abc','def':'def'}), ({'hij':'hij','klm':'klm'});
+
+SELECT mapContainsKeyLike(a, 'a%') FROM test;
+```  
+  
+Result:  
+  
+```text
+┌─mapContainsKeyLike(a, 'a%')─┐
+│                           1 │
+│                           0 │
+└─────────────────────────────┘  
+```  
+  
+
+[Original article](https://clickhouse.com/docs/en/sql-reference/functions/tuple-map-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index efd28def688..88e1cf47592 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -90,6 +90,27 @@ Result:
 └─────────────────────────┴───────────────────────────┘
 ```
 
+## toInt(8\|16\|32\|64\|128\|256)OrDefault {#toint8163264128256orDefault}
+
+It takes an argument of type String and tries to parse it into Int (8 \| 16 \| 32 \| 64 \| 128 \| 256). If failed, returns the default type value.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toInt64OrDefault('123123', cast('-1' as Int64)), toInt8OrDefault('123qwe123', cast('-1' as Int8));
+```
+
+Result:
+
+``` text
+┌─toInt64OrDefault('123123', CAST('-1', 'Int64'))─┬─toInt8OrDefault('123qwe123', CAST('-1', 'Int8'))─┐
+│                                          123123 │                                               -1 │
+└─────────────────────────────────────────────────┴──────────────────────────────────────────────────┘
+```
+
+
 ## toUInt(8\|16\|32\|64\|256) {#touint8163264256}
 
 Converts an input value to the [UInt](../../sql-reference/data-types/int-uint.md) data type. This function family includes:
@@ -132,12 +153,16 @@ Result:
 
 ## toUInt(8\|16\|32\|64\|256)OrNull {#touint8163264256ornull}
 
+## toUInt(8\|16\|32\|64\|256)OrDefault {#touint8163264256ordefault}
+
 ## toFloat(32\|64) {#tofloat3264}
 
 ## toFloat(32\|64)OrZero {#tofloat3264orzero}
 
 ## toFloat(32\|64)OrNull {#tofloat3264ornull}
 
+## toFloat(32\|64)OrDefault {#tofloat3264ordefault}
+
 ## toDate {#todate}
 
 Alias: `DATE`.
@@ -146,12 +171,136 @@ Alias: `DATE`.
 
 ## toDateOrNull {#todateornull}
 
+## toDateOrDefault {#todateordefault}
+
 ## toDateTime {#todatetime}
 
 ## toDateTimeOrZero {#todatetimeorzero}
 
 ## toDateTimeOrNull {#todatetimeornull}
 
+## toDateTimeOrDefault {#todatetimeordefault}
+
+## toDate32 {#todate32}
+
+Converts the argument to the [Date32](../../sql-reference/data-types/date32.md) data type. If the value is outside the range returns the border values supported by `Date32`. If the argument has [Date](../../sql-reference/data-types/date.md) type, borders of `Date` are taken into account.
+
+**Syntax**
+
+``` sql
+toDate32(expr)
+```
+
+**Arguments**
+
+-   `expr` — The value. [String](../../sql-reference/data-types/string.md), [UInt32](../../sql-reference/data-types/int-uint.md) or [Date](../../sql-reference/data-types/date.md).
+
+**Returned value**
+
+-   A calendar date.
+
+Type: [Date32](../../sql-reference/data-types/date32.md).
+
+**Example**
+
+1. The value is within the range:
+
+``` sql
+SELECT toDate32('1955-01-01') AS value, toTypeName(value);
+```
+
+``` text
+┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
+│ 1955-01-01 │ Date32                             │
+└────────────┴────────────────────────────────────┘
+```
+
+2. The value is outside the range:
+
+``` sql
+SELECT toDate32('1924-01-01') AS value, toTypeName(value);
+```
+
+``` text
+┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
+│ 1925-01-01 │ Date32                             │
+└────────────┴────────────────────────────────────┘
+```
+
+3. With `Date`-type argument:
+
+``` sql
+SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
+```
+
+``` text
+┌──────value─┬─toTypeName(toDate32(toDate('1924-01-01')))─┐
+│ 1970-01-01 │ Date32                                     │
+└────────────┴────────────────────────────────────────────┘
+```
+
+## toDate32OrZero {#todate32-or-zero}
+
+The same as [toDate32](#todate32) but returns the min value of [Date32](../../sql-reference/data-types/date32.md) if invalid argument is received.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toDate32OrZero('1924-01-01'), toDate32OrZero('');
+```
+
+Result:
+
+``` text
+┌─toDate32OrZero('1924-01-01')─┬─toDate32OrZero('')─┐
+│                   1925-01-01 │         1925-01-01 │
+└──────────────────────────────┴────────────────────┘
+```
+
+## toDate32OrNull {#todate32-or-null}
+
+The same as [toDate32](#todate32) but returns `NULL` if invalid argument is received.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toDate32OrNull('1955-01-01'), toDate32OrNull('');
+```
+
+Result:
+
+``` text
+┌─toDate32OrNull('1955-01-01')─┬─toDate32OrNull('')─┐
+│                   1955-01-01 │               ᴺᵁᴸᴸ │
+└──────────────────────────────┴────────────────────┘
+```
+
+## toDate32OrDefault {#todate32-or-default}
+
+Converts the argument to the [Date32](../../sql-reference/data-types/date32.md) data type. If the value is outside the range returns the lower border value supported by `Date32`. If the argument has [Date](../../sql-reference/data-types/date.md) type, borders of `Date` are taken into account. Returns default value if invalid argument is received.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT
+    toDate32OrDefault('1930-01-01', toDate32('2020-01-01')),
+    toDate32OrDefault('xx1930-01-01', toDate32('2020-01-01'));
+```
+
+Result:
+
+``` text
+┌─toDate32OrDefault('1930-01-01', toDate32('2020-01-01'))─┬─toDate32OrDefault('xx1930-01-01', toDate32('2020-01-01'))─┐
+│                                              1930-01-01 │                                                2020-01-01 │
+└─────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────┘
+```
+
 ## toDecimal(32\|64\|128\|256) {#todecimal3264128256}
 
 Converts `value` to the [Decimal](../../sql-reference/data-types/decimal.md) data type with precision of `S`. The `value` can be a number or a string. The `S` (scale) parameter specifies the number of decimal places.
@@ -214,6 +363,60 @@ Result:
 └──────┴────────────────────────────────────────────────────┘
 ```
 
+
+## toDecimal(32\|64\|128\|256)OrDefault {#todecimal3264128256ordefault}
+
+Converts an input string to a [Decimal(P,S)](../../sql-reference/data-types/decimal.md) data type value. This family of functions include:
+
+-   `toDecimal32OrDefault(expr, S)` — Results in `Decimal32(S)` data type.
+-   `toDecimal64OrDefault(expr, S)` — Results in `Decimal64(S)` data type.
+-   `toDecimal128OrDefault(expr, S)` — Results in `Decimal128(S)` data type.
+-   `toDecimal256OrDefault(expr, S)` — Results in `Decimal256(S)` data type.
+
+These functions should be used instead of `toDecimal*()` functions, if you prefer to get a default value instead of an exception in the event of an input value parsing error.
+
+**Arguments**
+
+-   `expr` — [Expression](../../sql-reference/syntax.md#syntax-expressions), returns a value in the [String](../../sql-reference/data-types/string.md) data type. ClickHouse expects the textual representation of the decimal number. For example, `'1.111'`.
+-   `S` — Scale, the number of decimal places in the resulting value.
+
+**Returned value**
+
+A value in the `Decimal(P,S)` data type. The value contains:
+
+-   Number with `S` decimal places, if ClickHouse interprets the input string as a number.
+-   Default `Decimal(P,S)` data type value, if ClickHouse can’t interpret the input string as a number or if the input number contains more than `S` decimal places.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT toDecimal32OrDefault(toString(-1.111), 5) AS val, toTypeName(val);
+```
+
+Result:
+
+``` text
+┌────val─┬─toTypeName(toDecimal32OrDefault(toString(-1.111), 5))─┐
+│ -1.111 │ Decimal(9, 5)                                         │
+└────────┴───────────────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT toDecimal32OrDefault(toString(-1.111), 2) AS val, toTypeName(val);
+```
+
+Result:
+
+``` text
+┌─val─┬─toTypeName(toDecimal32OrDefault(toString(-1.111), 2))─┐
+│   0 │ Decimal(9, 2)                                         │
+└─────┴───────────────────────────────────────────────────────┘
+```
+
 ## toDecimal(32\|64\|128\|256)OrZero {#todecimal3264128256orzero}
 
 Converts an input value to the [Decimal(P,S)](../../sql-reference/data-types/decimal.md) data type. This family of functions include:
@@ -653,6 +856,63 @@ Result:
 └───────┴──────┴──────────────┘
 ```
 
+
+## accurateCastOrDefault(x, T[, default_value]) {#type_conversion_function-accurate-cast_or_default}
+
+Converts input value `x` to the specified data type `T`. Returns default type value or `default_value` if specified if the casted value is not representable in the target type.
+
+**Syntax**
+
+```sql
+accurateCastOrDefault(x, T)
+```
+
+**Parameters**
+
+-   `x` — Input value.
+-   `T` — The name of the returned data type.
+-   `default_value` — Default value of returned data type.
+
+**Returned value**
+
+-   The value converted to the specified data type `T`.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT toTypeName(accurateCastOrDefault(5, 'UInt8'));
+```
+
+Result:
+
+``` text
+┌─toTypeName(accurateCastOrDefault(5, 'UInt8'))─┐
+│ UInt8                                         │
+└───────────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT
+    accurateCastOrDefault(-1, 'UInt8') as uint8,
+    accurateCastOrDefault(-1, 'UInt8', 5) as uint8_default,
+    accurateCastOrDefault(128, 'Int8') as int8,
+    accurateCastOrDefault(128, 'Int8', 5) as int8_default,
+    accurateCastOrDefault('Test', 'FixedString(2)') as fixed_string,
+    accurateCastOrDefault('Test', 'FixedString(2)', 'Te') as fixed_string_default;
+```
+
+Result:
+
+``` text
+┌─uint8─┬─uint8_default─┬─int8─┬─int8_default─┬─fixed_string─┬─fixed_string_default─┐
+│     0 │             5 │    0 │            5 │              │ Te                   │
+└───────┴───────────────┴──────┴──────────────┴──────────────┴──────────────────────┘
+```
+
 ## toInterval(Year\|Quarter\|Month\|Week\|Day\|Hour\|Minute\|Second) {#function-tointerval}
 
 Converts a Number type argument to an [Interval](../../sql-reference/data-types/special-data-types/interval.md) data type.
@@ -1339,3 +1599,143 @@ Result:
 │ 2,"good"                                  │
 └───────────────────────────────────────────┘
 ```
+
+## snowflakeToDateTime {#snowflaketodatetime}
+
+Extracts time from [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) as [DateTime](../data-types/datetime.md) format.
+
+**Syntax**
+
+``` sql
+snowflakeToDateTime(value [, time_zone])
+```
+
+**Parameters**
+
+-   `value` — Snowflake ID. [Int64](../data-types/int-uint.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-  Input value converted to the [DateTime](../data-types/datetime.md) data type.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT snowflakeToDateTime(CAST('1426860702823350272', 'Int64'), 'UTC');
+```
+
+Result:
+
+``` text
+
+┌─snowflakeToDateTime(CAST('1426860702823350272', 'Int64'), 'UTC')─┐
+│                                              2021-08-15 10:57:56 │
+└──────────────────────────────────────────────────────────────────┘
+```
+
+## snowflakeToDateTime64 {#snowflaketodatetime64}
+
+Extracts time from [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) as [DateTime64](../data-types/datetime64.md) format.
+
+**Syntax**
+
+``` sql
+snowflakeToDateTime64(value [, time_zone])
+```
+
+**Parameters**
+
+-   `value` — Snowflake ID. [Int64](../data-types/int-uint.md).
+-   `time_zone` — [Timezone](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). The function parses `time_string` according to the timezone. Optional. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-  Input value converted to the [DateTime64](../data-types/datetime64.md) data type.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT snowflakeToDateTime64(CAST('1426860802823350272', 'Int64'), 'UTC');
+```
+
+Result:
+
+``` text
+
+┌─snowflakeToDateTime64(CAST('1426860802823350272', 'Int64'), 'UTC')─┐
+│                                            2021-08-15 10:58:19.841 │
+└────────────────────────────────────────────────────────────────────┘
+```
+
+## dateTimeToSnowflake {#datetimetosnowflake}
+
+Converts [DateTime](../data-types/datetime.md) value to the first [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) at the giving time.
+
+**Syntax**
+
+``` sql
+dateTimeToSnowflake(value)
+```
+
+**Parameters**
+
+-   `value` — Date and time. [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Returned value**
+
+-   Input value converted to the [Int64](../data-types/int-uint.md) data type as the first Snowflake ID at that time.
+
+**Example**
+
+Query:
+
+``` sql
+WITH toDateTime('2021-08-15 18:57:56', 'Asia/Shanghai') AS dt SELECT dateTimeToSnowflake(dt);
+```
+
+Result:
+
+``` text
+┌─dateTimeToSnowflake(dt)─┐
+│     1426860702823350272 │
+└─────────────────────────┘
+```
+
+## dateTime64ToSnowflake {#datetime64tosnowflake}
+
+Convert [DateTime64](../data-types/datetime64.md) to the first [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) at the giving time.
+
+**Syntax**
+
+``` sql
+dateTime64ToSnowflake(value)
+```
+
+**Parameters**
+
+-   `value` — Date and time. [DateTime64](../../sql-reference/data-types/datetime64.md).
+
+**Returned value**
+
+-   Input value converted to the [Int64](../data-types/int-uint.md) data type as the first Snowflake ID at that time.
+
+**Example**
+
+Query:
+
+``` sql
+WITH toDateTime64('2021-08-15 18:57:56.492', 3, 'Asia/Shanghai') AS dt64 SELECT dateTime64ToSnowflake(dt64);
+```
+
+Result:
+
+``` text
+┌─dateTime64ToSnowflake(dt64)─┐
+│         1426860704886947840 │
+└─────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/uuid-functions.md b/docs/en/sql-reference/functions/uuid-functions.md
index e7e55c699cd..3616b587bf7 100644
--- a/docs/en/sql-reference/functions/uuid-functions.md
+++ b/docs/en/sql-reference/functions/uuid-functions.md
@@ -9,7 +9,7 @@ The functions for working with UUID are listed below.
 
 ## generateUUIDv4 {#uuid-function-generate}
 
-Generates the [UUID](../../sql-reference/data-types/uuid.md) of [version 4](https://tools.ietf.org/html/rfc4122#section-4.4).
+Generates the [UUID](../data-types/uuid.md) of [version 4](https://tools.ietf.org/html/rfc4122#section-4.4).
 
 ``` sql
 generateUUIDv4()
@@ -37,6 +37,90 @@ SELECT * FROM t_uuid
 └──────────────────────────────────────┘
 ```
 
+## empty {#empty}
+
+Checks whether the input UUID is empty.
+
+**Syntax**
+
+```sql
+empty(UUID)
+```
+
+The UUID is considered empty if it contains all zeros (zero UUID).
+
+The function also works for [arrays](array-functions.md#function-empty) or [strings](string-functions.md#empty).
+
+**Arguments**
+
+-   `x` — Input UUID. [UUID](../data-types/uuid.md).
+
+**Returned value**
+
+-   Returns `1` for an empty UUID or `0` for a non-empty UUID. 
+
+Type: [UInt8](../data-types/int-uint.md).
+
+**Example**
+
+To generate the UUID value, ClickHouse provides the [generateUUIDv4](#uuid-function-generate) function.
+
+Query:
+
+```sql
+SELECT empty(generateUUIDv4());
+```
+
+Result:
+
+```text
+┌─empty(generateUUIDv4())─┐
+│                       0 │
+└─────────────────────────┘
+```
+
+## notEmpty {#notempty}
+
+Checks whether the input UUID is non-empty.
+
+**Syntax**
+
+```sql
+notEmpty(UUID)
+```
+
+The UUID is considered empty if it contains all zeros (zero UUID).
+
+The function also works for [arrays](array-functions.md#function-notempty) or [strings](string-functions.md#notempty).
+
+**Arguments**
+
+-   `x` — Input UUID. [UUID](../data-types/uuid.md).
+
+**Returned value**
+
+-   Returns `1` for a non-empty UUID or `0` for an empty UUID. 
+
+Type: [UInt8](../data-types/int-uint.md).
+
+**Example**
+
+To generate the UUID value, ClickHouse provides the [generateUUIDv4](#uuid-function-generate) function.
+
+Query:
+
+```sql
+SELECT notEmpty(generateUUIDv4());
+```
+
+Result:
+
+```text
+┌─notEmpty(generateUUIDv4())─┐
+│                          1 │
+└────────────────────────────┘
+```
+
 ## toUUID (x) {#touuid-x}
 
 Converts String type value to UUID type.
@@ -161,7 +245,22 @@ SELECT
 └──────────────────┴──────────────────────────────────────┘
 ```
 
+## serverUUID() {#server-uuid}
+
+Returns the random and unique UUID, which is generated when the server is first started and stored forever. The result writes to the file `uuid` created in the ClickHouse server directory `/var/lib/clickhouse/`. 
+
+**Syntax**
+
+```sql
+serverUUID()
+```
+
+**Returned value**
+
+-   The UUID of the server. 
+
+Type: [UUID](../data-types/uuid.md).
+
 ## See Also {#see-also}
 
 -   [dictGetUUID](../../sql-reference/functions/ext-dict-functions.md#ext_dict_functions-other)
-
diff --git a/docs/en/sql-reference/index.md b/docs/en/sql-reference/index.md
index 07e0cadd3a8..e8fe092e622 100644
--- a/docs/en/sql-reference/index.md
+++ b/docs/en/sql-reference/index.md
@@ -15,4 +15,4 @@ ClickHouse supports the following types of queries:
 -   [ALTER](../sql-reference/statements/alter/index.md)
 -   [Other types of queries](../sql-reference/statements/index.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/) <!--hide-->
diff --git a/docs/en/sql-reference/operators/index.md b/docs/en/sql-reference/operators/index.md
index dbda5f5dd69..efbc600fdd4 100644
--- a/docs/en/sql-reference/operators/index.md
+++ b/docs/en/sql-reference/operators/index.md
@@ -17,20 +17,30 @@ ClickHouse transforms operators to their corresponding functions at the query pa
 
 `-a` – The `negate (a)` function.
 
+For tuple negation: [tupleNegate](../../sql-reference/functions/tuple-functions.md#tuplenegate).
+
 ## Multiplication and Division Operators {#multiplication-and-division-operators}
 
 `a * b` – The `multiply (a, b)` function.
 
+For multiplying tuple by number: [tupleMultiplyByNumber](../../sql-reference/functions/tuple-functions.md#tuplemultiplybynumber), for scalar profuct: [dotProduct](../../sql-reference/functions/tuple-functions.md#dotproduct).
+
 `a / b` – The `divide(a, b)` function.
 
+For dividing tuple by number: [tupleDivideByNumber](../../sql-reference/functions/tuple-functions.md#tupledividebynumber).
+
 `a % b` – The `modulo(a, b)` function.
 
 ## Addition and Subtraction Operators {#addition-and-subtraction-operators}
 
 `a + b` – The `plus(a, b)` function.
 
+For tuple addiction: [tuplePlus](../../sql-reference/functions/tuple-functions.md#tupleplus).
+
 `a - b` – The `minus(a, b)` function.
 
+For tuple subtraction: [tupleMinus](../../sql-reference/functions/tuple-functions.md#tupleminus).
+
 ## Comparison Operators {#comparison-operators}
 
 `a = b` – The `equals(a, b)` function.
@@ -71,6 +81,53 @@ ClickHouse transforms operators to their corresponding functions at the query pa
 
 `a GLOBAL NOT IN ...` – The `globalNotIn(a, b)` function.
 
+`a = ANY (subquery)` – The `in(a, subquery)` function.  
+
+`a != ANY (subquery)` – The same as `a NOT IN (SELECT singleValueOrNull(*) FROM subquery)`.
+
+`a = ALL (subquery)` – The same as `a IN (SELECT singleValueOrNull(*) FROM subquery)`.
+
+`a != ALL (subquery)` – The `notIn(a, subquery)` function. 
+
+
+**Examples**
+
+Query with ALL:
+
+``` sql
+SELECT number AS a FROM numbers(10) WHERE a > ALL (SELECT number FROM numbers(3, 3));
+```
+
+Result:
+
+``` text
+┌─a─┐
+│ 6 │
+│ 7 │
+│ 8 │
+│ 9 │
+└───┘
+```
+
+Query with ANY:
+
+``` sql
+SELECT number AS a FROM numbers(10) WHERE a > ANY (SELECT number FROM numbers(3, 3));
+```
+
+Result:
+
+``` text
+┌─a─┐
+│ 4 │
+│ 5 │
+│ 6 │
+│ 7 │
+│ 8 │
+│ 9 │
+└───┘
+```
+
 ## Operators for Working with Dates and Times {#operators-datetime}
 
 ### EXTRACT {#operator-extract}
diff --git a/docs/en/sql-reference/statements/alter/column.md b/docs/en/sql-reference/statements/alter/column.md
index 801690afbb2..4eb251b88cd 100644
--- a/docs/en/sql-reference/statements/alter/column.md
+++ b/docs/en/sql-reference/statements/alter/column.md
@@ -10,7 +10,7 @@ A set of queries that allow changing the table structure.
 Syntax:
 
 ``` sql
-ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN ...
+ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|RENAME|CLEAR|COMMENT|MODIFY|MATERIALIZE COLUMN ...
 ```
 
 In the query, specify a list of one or more comma-separated actions.
@@ -25,6 +25,7 @@ The following actions are supported:
 -   [COMMENT COLUMN](#alter_comment-column) — Adds a text comment to the column.
 -   [MODIFY COLUMN](#alter_modify-column) — Changes column’s type, default expression and TTL.
 -   [MODIFY COLUMN REMOVE](#modify-remove) — Removes one of the column properties.
+-   [MATERIALIZE COLUMN](#materialize-column) — Materializes the column in the parts where the column is missing.
 
 These actions are described in detail below.
 
@@ -193,6 +194,39 @@ ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 
 - [REMOVE TTL](ttl.md).
 
+## MATERIALIZE COLUMN {#materialize-column}
+
+Materializes the column in the parts where the column is missing. This is useful in case of creating a new column with complicated `DEFAULT` or `MATERIALIZED` expression. Calculation of the column directly on `SELECT` query can cause bigger request execution time, so it is reasonable to use `MATERIALIZE COLUMN` for such columns. To perform same manipulation for existing column, use `FINAL` modifier.
+
+Syntax:
+
+```sql
+ALTER TABLE table MATERIALIZE COLUMN col [FINAL];
+```
+
+**Example**
+
+```sql
+DROP TABLE IF EXISTS tmp;
+SET mutations_sync = 2;
+CREATE TABLE tmp (x Int64) ENGINE = MergeTree() ORDER BY tuple() PARTITION BY tuple();
+INSERT INTO tmp SELECT * FROM system.numbers LIMIT 10;
+ALTER TABLE tmp ADD COLUMN s String MATERIALIZED toString(x);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+```
+
+**Result:**
+
+```sql
+┌─groupArray(x)─────────┬─groupArray(s)─────────────────────────────┐
+│ [0,1,2,3,4,5,6,7,8,9] │ ['0','1','2','3','4','5','6','7','8','9'] │
+└───────────────────────┴───────────────────────────────────────────┘
+```
+
+**See Also**
+
+- [MATERIALIZED](../../statements/create/table.md#materialized).
+
 ## Limitations {#alter-query-limitations}
 
 The `ALTER` query lets you create and delete separate elements (columns) in nested data structures, but not whole nested data structures. To add a nested data structure, you can add columns with a name like `name.nested_name` and the type `Array(T)`. A nested data structure is equivalent to multiple array columns with a name that has the same prefix before the dot.
diff --git a/docs/en/sql-reference/statements/alter/index.md b/docs/en/sql-reference/statements/alter/index.md
index 71333e6fcce..dbf695edf3b 100644
--- a/docs/en/sql-reference/statements/alter/index.md
+++ b/docs/en/sql-reference/statements/alter/index.md
@@ -5,7 +5,7 @@ toc_title: ALTER
 
 ## ALTER {#query_language_queries_alter}
 
-Most `ALTER` queries modify table settings or data:
+Most `ALTER TABLE` queries modify table settings or data:
 
 -   [COLUMN](../../../sql-reference/statements/alter/column.md)
 -   [PARTITION](../../../sql-reference/statements/alter/partition.md)
@@ -17,9 +17,14 @@ Most `ALTER` queries modify table settings or data:
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
 !!! note "Note"
-    Most `ALTER` queries are supported only for [\*MergeTree](../../../engines/table-engines/mergetree-family/index.md) tables, as well as [Merge](../../../engines/table-engines/special/merge.md) and [Distributed](../../../engines/table-engines/special/distributed.md).
+    Most `ALTER TABLE` queries are supported only for [\*MergeTree](../../../engines/table-engines/mergetree-family/index.md) tables, as well as [Merge](../../../engines/table-engines/special/merge.md) and [Distributed](../../../engines/table-engines/special/distributed.md).
 
-While these `ALTER` settings modify entities related to role-based access control:
+These `ALTER` statements manipulate views:
+
+-   [ALTER TABLE ... MODIFY QUERY](../../../sql-reference/statements/alter/view.md) — Modifies a [Materialized view](../create/view.md#materialized) structure.
+-   [ALTER LIVE VIEW](../../../sql-reference/statements/alter/view.md#alter-live-view) — Refreshes a [Live view](../create/view.md#live-view).
+
+These `ALTER` statements modify entities related to role-based access control:
 
 -   [USER](../../../sql-reference/statements/alter/user.md)
 -   [ROLE](../../../sql-reference/statements/alter/role.md)
@@ -43,7 +48,11 @@ Entries for finished mutations are not deleted right away (the number of preserv
 
 For non-replicated tables, all `ALTER` queries are performed synchronously. For replicated tables, the query just adds instructions for the appropriate actions to `ZooKeeper`, and the actions themselves are performed as soon as possible. However, the query can wait for these actions to be completed on all the replicas.
 
-For `ALTER ... ATTACH|DETACH|DROP` queries, you can use the `replication_alter_partitions_sync` setting to set up waiting. Possible values: `0` – do not wait; `1` – only wait for own execution (default); `2` – wait for all.
+For all `ALTER` queries, you can use the [replication_alter_partitions_sync](../../../operations/settings/settings.md#replication-alter-partitions-sync) setting to set up waiting.
+
+You can specify how long (in seconds) to wait for inactive replicas to execute all `ALTER` queries with the [replication_wait_for_inactive_replica_timeout](../../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    For all `ALTER` queries, if `replication_alter_partitions_sync = 2` and some replicas are not active for more than the time, specified in the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 
 For `ALTER TABLE ... UPDATE|DELETE` queries the synchronicity is defined by the [mutations_sync](../../../operations/settings/settings.md#mutations_sync) setting.
-
diff --git a/docs/en/sql-reference/statements/alter/index/index.md b/docs/en/sql-reference/statements/alter/index/index.md
index fd5657c3666..4e2943d37f3 100644
--- a/docs/en/sql-reference/statements/alter/index/index.md
+++ b/docs/en/sql-reference/statements/alter/index/index.md
@@ -12,7 +12,7 @@ The following operations are available:
 
 -   `ALTER TABLE [db].name DROP INDEX name` - Removes index description from tables metadata and deletes index files from disk.
 
--   `ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name` - The query rebuilds the secondary index `name` in the partition `partition_name`. Implemented as a [mutation](../../../../sql-reference/statements/alter/index.md#mutations).
+-   `ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name` - The query rebuilds the secondary index `name` in the partition `partition_name`. Implemented as a [mutation](../../../../sql-reference/statements/alter/index.md#mutations). To rebuild index over the whole data in the table you need to remove `IN PARTITION` from query.
 
 The first two commands are lightweight in a sense that they only change metadata or remove files.
 
diff --git a/docs/en/sql-reference/statements/alter/order-by.md b/docs/en/sql-reference/statements/alter/order-by.md
index d41b9a91724..16f9ace206d 100644
--- a/docs/en/sql-reference/statements/alter/order-by.md
+++ b/docs/en/sql-reference/statements/alter/order-by.md
@@ -11,7 +11,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] MODIFY ORDER BY new_expression
 
 The command changes the [sorting key](../../../engines/table-engines/mergetree-family/mergetree.md) of the table to `new_expression` (an expression or a tuple of expressions). Primary key remains the same.
 
-The command is lightweight in a sense that it only changes metadata. To keep the property that data part rows are ordered by the sorting key expression you cannot add expressions containing existing columns to the sorting key (only columns added by the `ADD COLUMN` command in the same `ALTER` query).
+The command is lightweight in a sense that it only changes metadata. To keep the property that data part rows are ordered by the sorting key expression you cannot add expressions containing existing columns to the sorting key (only columns added by the `ADD COLUMN` command in the same `ALTER` query, without default column value).
 
 !!! note "Note"
     It only works for tables in the [`MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) family (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) tables).
diff --git a/docs/en/sql-reference/statements/alter/projection.md b/docs/en/sql-reference/statements/alter/projection.md
new file mode 100644
index 00000000000..429241ebf13
--- /dev/null
+++ b/docs/en/sql-reference/statements/alter/projection.md
@@ -0,0 +1,23 @@
+---
+toc_priority: 49
+toc_title: PROJECTION
+---
+
+# Manipulating Projections {#manipulations-with-projections}
+
+The following operations with [projections](../../../engines/table-engines/mergetree-family/mergetree.md#projections) are available:
+
+-   `ALTER TABLE [db].name ADD PROJECTION name AS SELECT <COLUMN LIST EXPR> [GROUP BY] [ORDER BY]` - Adds projection description to tables metadata.
+
+-   `ALTER TABLE [db].name DROP PROJECTION name` - Removes projection description from tables metadata and deletes projection files from disk.
+
+-   `ALTER TABLE [db.]table MATERIALIZE PROJECTION name IN PARTITION partition_name` - The query rebuilds the projection `name` in the partition `partition_name`. Implemented as a [mutation](../../../sql-reference/statements/alter/index.md#mutations).
+
+-   `ALTER TABLE [db.]table CLEAR PROJECTION name IN PARTITION partition_name` - Deletes projection files from disk without removing description.
+
+The commands `ADD`, `DROP` and `CLEAR` are lightweight in a sense that they only change metadata or remove files.
+
+Also, they are replicated, syncing projections metadata via ZooKeeper.
+
+!!! note "Note"
+    Projection manipulation is supported only for tables with [`*MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) engine (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) variants).
diff --git a/docs/en/sql-reference/statements/alter/sample-by.md b/docs/en/sql-reference/statements/alter/sample-by.md
index df8ff90f196..21b20be8b78 100644
--- a/docs/en/sql-reference/statements/alter/sample-by.md
+++ b/docs/en/sql-reference/statements/alter/sample-by.md
@@ -16,5 +16,4 @@ The command changes the [sampling key](../../../engines/table-engines/mergetree-
 The command is lightweight in the sense that it only changes metadata. The primary key must contain the new sample key.
 
 !!! note "Note"
-    It only works for tables in the [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) family (including
-[replicated](../../../engines/table-engines/mergetree-family/replication.md) tables).
\ No newline at end of file
+    It only works for tables in the [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md) family (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) tables).
diff --git a/docs/en/sql-reference/statements/alter/view.md b/docs/en/sql-reference/statements/alter/view.md
new file mode 100644
index 00000000000..0fb1c4be0ff
--- /dev/null
+++ b/docs/en/sql-reference/statements/alter/view.md
@@ -0,0 +1,44 @@
+---
+toc_priority: 50
+toc_title: VIEW
+---
+
+# ALTER TABLE … MODIFY QUERY Statement {#alter-modify-query}
+
+You can modify `SELECT` query that was specified when a [materialized view](../create/view.md#materialized) was created with the `ALTER TABLE … MODIFY QUERY` statement. Use it when the materialized view was created without the `TO [db.]name` clause. The `allow_experimental_alter_materialized_view_structure` setting must be enabled. 
+
+If a materialized view uses the `TO [db.]name` construction, you must [DETACH](../detach.md) the view, run [ALTER TABLE](index.md) query for the target table, and then [ATTACH](../attach.md) the previously detached (`DETACH`) view.
+
+**Example**
+
+```sql
+CREATE TABLE src_table (`a` UInt32) ENGINE = MergeTree ORDER BY a;
+CREATE MATERIALIZED VIEW mv (`a` UInt32) ENGINE = MergeTree ORDER BY a AS SELECT a FROM src_table; 
+INSERT INTO src_table (a) VALUES (1), (2);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+```sql
+ALTER TABLE mv MODIFY QUERY SELECT a * 2 as a FROM src_table;
+INSERT INTO src_table (a) VALUES (3), (4);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 6 │
+│ 8 │
+└───┘
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+
+## ALTER LIVE VIEW Statement {#alter-live-view}
+
+`ALTER LIVE VIEW ... REFRESH` statement refreshes a [Live view](../create/view.md#live-view). See [Force Live View Refresh](../create/view.md#live-view-alter-refresh).
diff --git a/docs/en/sql-reference/statements/attach.md b/docs/en/sql-reference/statements/attach.md
index 84165d30357..2949ac6db38 100644
--- a/docs/en/sql-reference/statements/attach.md
+++ b/docs/en/sql-reference/statements/attach.md
@@ -5,14 +5,21 @@ toc_title: ATTACH
 
 # ATTACH Statement {#attach}
 
-Attaches the table, for example, when moving a database to another server.
+Attaches a table or a dictionary, for example, when moving a database to another server.
 
-The query does not create data on the disk, but assumes that data is already in the appropriate places, and just adds information about the table to the server. After executing an `ATTACH` query, the server will know about the existence of the table.
+**Syntax**
 
-If the table was previously detached ([DETACH](../../sql-reference/statements/detach.md)) query, meaning that its structure is known, you can use shorthand without defining the structure.
+``` sql
+ATTACH TABLE|DICTIONARY [IF NOT EXISTS] [db.]name [ON CLUSTER cluster] ...
+```
 
-## Syntax Forms {#syntax-forms}
-### Attach Existing Table {#attach-existing-table}
+The query does not create data on the disk, but assumes that data is already in the appropriate places, and just adds information about the table or the dictionary to the server. After executing the `ATTACH` query, the server will know about the existence of the table or the dictionary.
+
+If a table was previously detached ([DETACH](../../sql-reference/statements/detach.md) query), meaning that its structure is known, you can use shorthand without defining the structure.
+
+## Attach Existing Table {#attach-existing-table}
+
+**Syntax**
 
 ``` sql
 ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
@@ -22,16 +29,18 @@ This query is used when starting the server. The server stores table metadata as
 
 If the table was detached permanently, it won't be reattached at the server start, so you need to use `ATTACH` query explicitly.
 
-### Сreate New Table And Attach Data {#create-new-table-and-attach-data}
+## Create New Table And Attach Data {#create-new-table-and-attach-data}
 
-**With specify path to table data**
+### With Specified Path to Table Data {#attach-with-specified-path}
+
+The query creates a new table with provided structure and attaches table data from the provided directory in `user_files`.
+
+**Syntax**
 
 ```sql
 ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...)
 ```
 
-It creates new table with provided structure and attaches table data from provided directory in `user_files`.
-
 **Example**
 
 Query:
@@ -50,10 +59,23 @@ Result:
 └──────┴────┘
 ```
 
-**With specify table UUID** (Only for `Atomic` database)
+### With Specified Table UUID {#attach-with-specified-uuid}
+
+This query creates a new table with provided structure and attaches data from the table with the specified UUID.
+It is supported by the [Atomic](../../engines/database-engines/atomic.md) database engine.
+
+**Syntax**
 
 ```sql
 ATTACH TABLE name UUID '<uuid>' (col1 Type1, ...)
 ```
 
-It creates new table with provided structure and attaches data from table with the specified UUID.
+## Attach Existing Dictionary {#attach-existing-dictionary}
+
+Attaches a previously detached dictionary.
+
+**Syntax**
+
+``` sql
+ATTACH DICTIONARY [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
+```
diff --git a/docs/en/sql-reference/statements/create/dictionary.md b/docs/en/sql-reference/statements/create/dictionary.md
index 3fe94e267e4..889669da5c8 100644
--- a/docs/en/sql-reference/statements/create/dictionary.md
+++ b/docs/en/sql-reference/statements/create/dictionary.md
@@ -12,10 +12,10 @@ Syntax:
 ``` sql
 CREATE DICTIONARY [IF NOT EXISTS] [db.]dictionary_name [ON CLUSTER cluster]
 (
-    key1 type1  [DEFAULT|EXPRESSION expr1] [HIERARCHICAL|INJECTIVE|IS_OBJECT_ID],
-    key2 type2  [DEFAULT|EXPRESSION expr2] [HIERARCHICAL|INJECTIVE|IS_OBJECT_ID],
-    attr1 type2 [DEFAULT|EXPRESSION expr3],
-    attr2 type2 [DEFAULT|EXPRESSION expr4]
+    key1 type1  [DEFAULT|EXPRESSION expr1] [IS_OBJECT_ID],
+    key2 type2  [DEFAULT|EXPRESSION expr2] ,
+    attr1 type2 [DEFAULT|EXPRESSION expr3] [HIERARCHICAL|INJECTIVE],
+    attr2 type2 [DEFAULT|EXPRESSION expr4] [HIERARCHICAL|INJECTIVE]
 )
 PRIMARY KEY key1, key2
 SOURCE(SOURCE_NAME([param1 value1 ... paramN valueN]))
diff --git a/docs/en/sql-reference/statements/create/function.md b/docs/en/sql-reference/statements/create/function.md
new file mode 100644
index 00000000000..ddfcdfef521
--- /dev/null
+++ b/docs/en/sql-reference/statements/create/function.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 38
+toc_title: FUNCTION
+---
+
+# CREATE FUNCTION {#create-function}
+
+Creates a user defined function from a lambda expression. The expression must consist of function parameters, constants, operators, or other function calls.
+
+**Syntax**
+
+```sql
+CREATE FUNCTION name AS (parameter0, ...) -> expression
+```
+A function can have an arbitrary number of parameters.
+
+There are a few restrictions:
+
+-   The name of a function must be unique among user defined and system functions.
+-   Recursive functions are not allowed.
+-   All variables used by a function must be specified in its parameter list.
+
+If any restriction is violated then an exception is raised.
+
+**Example**
+
+Query:
+
+```sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
+```
+
+Result:
+
+``` text
+┌─number─┬─plus(multiply(2, number), 1)─┐
+│      0 │                            1 │
+│      1 │                            3 │
+│      2 │                            5 │
+└────────┴──────────────────────────────┘
+```
+
+A [conditional function](../../../sql-reference/functions/conditional-functions.md) is called in a user defined function in the following query:
+
+```sql
+CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity_str(number) FROM numbers(3);
+```
+
+Result:
+
+``` text
+┌─number─┬─if(modulo(number, 2), 'odd', 'even')─┐
+│      0 │ even                                 │
+│      1 │ odd                                  │
+│      2 │ even                                 │
+└────────┴──────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/statements/create/index.md b/docs/en/sql-reference/statements/create/index.md
index 902a4348bac..3df62869e2b 100644
--- a/docs/en/sql-reference/statements/create/index.md
+++ b/docs/en/sql-reference/statements/create/index.md
@@ -12,10 +12,11 @@ Create queries make a new entity of one of the following kinds:
 -   [TABLE](../../../sql-reference/statements/create/table.md)
 -   [VIEW](../../../sql-reference/statements/create/view.md)
 -   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+-   [FUNCTION](../../../sql-reference/statements/create/function.md)
 -   [USER](../../../sql-reference/statements/create/user.md)
 -   [ROLE](../../../sql-reference/statements/create/role.md)
 -   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
 -   [QUOTA](../../../sql-reference/statements/create/quota.md)
 -   [SETTINGS PROFILE](../../../sql-reference/statements/create/settings-profile.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/create/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index c20981b6bbf..5334532a54f 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -207,8 +207,6 @@ ALTER TABLE codec_example MODIFY COLUMN float_value CODEC(Default);
 
 Codecs can be combined in a pipeline, for example, `CODEC(Delta, Default)`.
 
-To select the best codec combination for you project, pass benchmarks similar to described in the Altinity [New Encodings to Improve ClickHouse Efficiency](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse) article. One thing to note is that codec can't be applied for ALIAS column type.
-
 !!! warning "Warning"
     You can’t decompress ClickHouse database files with external utilities like `lz4`. Instead, use the special [clickhouse-compressor](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) utility.
 
@@ -254,6 +252,7 @@ CREATE TABLE codec_example
 ENGINE = MergeTree()
 ```
 
+<!--
 ### Encryption Codecs {#create-query-encryption-codecs}
 
 These codecs don't actually compress data, but instead encrypt data on disk. These are only available when an encryption key is specified by [encryption](../../../operations/server-configuration-parameters/settings.md#server-settings-encryption) settings. Note that encryption only makes sense at the end of codec pipelines, because encrypted data usually can't be compressed in any meaningful way.
@@ -267,7 +266,7 @@ Encryption codecs:
 
 !!! attention "Attention"
     If you perform a SELECT query mentioning a specific value in an encrypted column (such as in its WHERE clause), the value may appear in [system.query_log](../../../operations/system-tables/query_log.md). You may want to disable the logging.
-
+-->
 ## Temporary Tables {#temporary-tables}
 
 ClickHouse supports temporary tables which have the following characteristics:
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index 9693f584761..ec34c57a4cd 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -5,9 +5,9 @@ toc_title: VIEW
 
 # CREATE VIEW {#create-view}
 
-Creates a new view. There are two types of views: normal and materialized.
+Creates a new view. Views can be [normal](#normal), [materialized](#materialized) and [live](#live-view) (the latter is an experimental feature).
 
-## Normal {#normal}
+## Normal View {#normal}
 
 Syntax:
 
@@ -35,7 +35,7 @@ This query is fully equivalent to using the subquery:
 SELECT a, b, c FROM (SELECT ...)
 ```
 
-## Materialized {#materialized}
+## Materialized View {#materialized}
 
 ``` sql
 CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
@@ -50,13 +50,15 @@ When creating a materialized view with `TO [db].[table]`, you must not use `POPU
 A materialized view is implemented as follows: when inserting data to the table specified in `SELECT`, part of the inserted data is converted by this `SELECT` query, and the result is inserted in the view.
 
 !!! important "Important"
+    Materialized views in ClickHouse use **column names** instead of column order during insertion into destination table. If some column names are not present in the `SELECT` query result, ClickHouse uses a default value, even if the column is not [Nullable](../../data-types/nullable.md). A safe practice would be to add aliases for every column when using Materialized views.
+
     Materialized views in ClickHouse are implemented more like insert triggers. If there’s some aggregation in the view query, it’s applied only to the batch of freshly inserted data. Any changes to existing data of source table (like update, delete, drop partition, etc.) does not change the materialized view.
 
-If you specify `POPULATE`, the existing table data is inserted in the view when creating it, as if making a `CREATE TABLE ... AS SELECT ...` . Otherwise, the query contains only the data inserted in the table after creating the view. We **do not recommend** using POPULATE, since data inserted in the table during the view creation will not be inserted in it.
+If you specify `POPULATE`, the existing table data is inserted into the view when creating it, as if making a `CREATE TABLE ... AS SELECT ...` . Otherwise, the query contains only the data inserted in the table after creating the view. We **do not recommend** using `POPULATE`, since data inserted in the table during the view creation will not be inserted in it.
 
-A `SELECT` query can contain `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`… Note that the corresponding conversions are performed independently on each block of inserted data. For example, if `GROUP BY` is set, data is aggregated during insertion, but only within a single packet of inserted data. The data won’t be further aggregated. The exception is when using an `ENGINE` that independently performs data aggregation, such as `SummingMergeTree`.
+A `SELECT` query can contain `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`. Note that the corresponding conversions are performed independently on each block of inserted data. For example, if `GROUP BY` is set, data is aggregated during insertion, but only within a single packet of inserted data. The data won’t be further aggregated. The exception is when using an `ENGINE` that independently performs data aggregation, such as `SummingMergeTree`.
 
-The execution of [ALTER](../../../sql-reference/statements/alter/index.md) queries on materialized views has limitations, so they might be inconvenient. If the materialized view uses the construction `TO [db.]name`, you can `DETACH` the view, run `ALTER` for the target table, and then `ATTACH` the previously detached (`DETACH`) view.
+The execution of [ALTER](../../../sql-reference/statements/alter/view.md) queries on materialized views has limitations, so they might be inconvenient. If the materialized view uses the construction `TO [db.]name`, you can `DETACH` the view, run `ALTER` for the target table, and then `ATTACH` the previously detached (`DETACH`) view.
 
 Note that materialized view is influenced by [optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert) setting. The data is merged before the insertion into a view.
 
@@ -64,7 +66,7 @@ Views look the same as normal tables. For example, they are listed in the result
 
 To delete a view, use [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Although `DROP TABLE` works for VIEWs as well.
 
-## Live View (Experimental) {#live-view}
+## Live View [Experimental] {#live-view}
 
 !!! important "Important"
     This is an experimental feature that may change in backwards-incompatible ways in the future releases.
@@ -90,7 +92,7 @@ Live views work similarly to how a query in a distributed table works. But inste
 
     See [WITH REFRESH](#live-view-with-refresh) to force periodic updates of a live view that in some cases can be used as a workaround.
 
-### Monitoring Changes {#live-view-monitoring}
+### Monitoring Live View Changes {#live-view-monitoring}
 
 You can monitor changes in the `LIVE VIEW` query result using [WATCH](../../../sql-reference/statements/watch.md) query.
 
@@ -115,12 +117,11 @@ WATCH lv;
 │      1 │        1 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
-│      2 │        2 │
+│      3 │        2 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
 │      6 │        3 │
 └────────┴──────────┘
-...
 ```
 
 ```sql
@@ -151,7 +152,6 @@ WATCH lv EVENTS;
 ┌─version─┐
 │       3 │
 └─────────┘
-...
 ```
 
 You can execute [SELECT](../../../sql-reference/statements/select/index.md) query on a live view in the same way as for any regular view or a table. If the query result is cached it will return the result immediately without running the stored query on the underlying tables.
@@ -160,7 +160,7 @@ You can execute [SELECT](../../../sql-reference/statements/select/index.md) quer
 SELECT * FROM [db.]live_view WHERE ...
 ```
 
-### Force Refresh {#live-view-alter-refresh}
+### Force Live View Refresh {#live-view-alter-refresh}
 
 You can force live view refresh using the `ALTER LIVE VIEW [db.]table_name REFRESH` statement.
 
@@ -232,7 +232,7 @@ WATCH lv
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv does not exist..
 ```
 
-### Usage {#live-view-usage}
+### Live View Usage {#live-view-usage}
 
 Most common uses of live view tables include:
 
@@ -241,4 +241,5 @@ Most common uses of live view tables include:
 - Watching for table changes and triggering a follow-up select queries.
 - Watching metrics from system tables using periodic refresh.
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/create/view/) <!--hide-->
+**See Also**
+-   [ALTER LIVE VIEW](../alter/view.md#alter-live-view)
diff --git a/docs/en/sql-reference/statements/detach.md b/docs/en/sql-reference/statements/detach.md
index 049c5a5dad9..b77bcbc00fb 100644
--- a/docs/en/sql-reference/statements/detach.md
+++ b/docs/en/sql-reference/statements/detach.md
@@ -5,17 +5,18 @@ toc_title: DETACH
 
 # DETACH Statement {#detach}
 
-Makes the server "forget" about the existence of the table or materialized view.
+Makes the server "forget" about the existence of a table, a materialized view, or a dictionary.
 
-Syntax:
+**Syntax**
 
 ``` sql
-DETACH TABLE|VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
+DETACH TABLE|VIEW|DICTIONARY [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
 ```
 
-Detaching does not delete the data or metadata for the table or materialized view. If the table or view was not detached `PERMANENTLY`, on the next server launch the server will read the metadata and recall the table/view again. If the table or view was detached `PERMANENTLY`, there will be no automatic recall.
+Detaching does not delete the data or metadata of a table, a materialized view or a dictionary. If an entity was not detached `PERMANENTLY`, on the next server launch the server will read the metadata and recall the table/view/dictionary again. If an entity was detached `PERMANENTLY`, there will be no automatic recall.
 
-Whether the table was detached permanently or not, in both cases you can reattach it using the [ATTACH](../../sql-reference/statements/attach.md). System log tables can be also attached back (e.g. `query_log`, `text_log`, etc). Other system tables can't be reattached. On the next server launch the server will recall those tables again.
+Whether a table or a dictionary was detached permanently or not, in both cases you can reattach them using the [ATTACH](../../sql-reference/statements/attach.md) query.
+System log tables can be also attached back (e.g. `query_log`, `text_log`, etc). Other system tables can't be reattached. On the next server launch the server will recall those tables again.
 
 `ATTACH MATERIALIZED VIEW` does not work with short syntax (without `SELECT`), but you can attach it using the `ATTACH TABLE` query.
 
@@ -67,4 +68,7 @@ Received exception from server (version 21.4.1):
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.test does not exist.
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/detach/) <!--hide-->
+**See Also**
+
+-   [Materialized View](../../sql-reference/statements/create/view.md#materialized)
+-   [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 90a2a46c7cf..552a7b5f1a9 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -97,4 +97,20 @@ Syntax:
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
-[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/drop/) <!--hide-->
+## DROP FUNCTION {#drop-function}
+
+Deletes a user defined function created by [CREATE FUNCTION](./create/function.md).
+System functions can not be dropped.
+
+**Syntax**
+
+``` sql
+DROP FUNCTION [IF EXISTS] function_name
+```
+
+**Example**
+
+``` sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+DROP FUNCTION linear_equation;
+```
diff --git a/docs/en/sql-reference/statements/exchange.md b/docs/en/sql-reference/statements/exchange.md
new file mode 100644
index 00000000000..91b0c48ddcf
--- /dev/null
+++ b/docs/en/sql-reference/statements/exchange.md
@@ -0,0 +1,42 @@
+---
+toc_priority: 49
+toc_title: EXCHANGE
+---
+
+# EXCHANGE Statement {#exchange}
+
+Exchanges the names of two tables or dictionaries atomically.
+This task can also be accomplished with a [RENAME](./rename.md) query using a temporary name, but the operation is not atomic in that case.
+
+!!! note "Note"
+    The `EXCHANGE` query is supported by the [Atomic](../../engines/database-engines/atomic.md) database engine only.
+
+**Syntax**
+
+```sql
+EXCHANGE TABLES|DICTIONARIES [db0.]name_A AND [db1.]name_B
+```
+
+## EXCHANGE TABLES {#exchange_tables}
+
+Exchanges the names of two tables.
+
+**Syntax**
+
+```sql
+EXCHANGE TABLES [db0.]table_A AND [db1.]table_B
+```
+
+## EXCHANGE DICTIONARIES {#exchange_dictionaries}
+
+Exchanges the names of two dictionaries.
+
+**Syntax**
+
+```sql
+EXCHANGE DICTIONARIES [db0.]dict_A AND [db1.]dict_B
+```
+
+**See Also**
+
+-   [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/en/sql-reference/statements/explain.md b/docs/en/sql-reference/statements/explain.md
index 0ab2cedd73e..2d129f1bc60 100644
--- a/docs/en/sql-reference/statements/explain.md
+++ b/docs/en/sql-reference/statements/explain.md
@@ -384,5 +384,32 @@ ExpressionTransform
             (ReadFromStorage)
             NumbersMt × 2 0 → 1
 ```
+### EXPLAIN ESTIMATE {#explain-estimate}
 
-[Оriginal article](https://clickhouse.tech/docs/en/sql-reference/statements/explain/) <!--hide-->
+Shows the estimated number of rows, marks and parts to be read from the tables while processing the query. Works with tables in the [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engines-mergetree) family. 
+
+**Example**
+
+Creating a table:
+
+```sql
+CREATE TABLE ttt (i Int64) ENGINE = MergeTree() ORDER BY i SETTINGS index_granularity = 16, write_final_mark = 0;
+INSERT INTO ttt SELECT number FROM numbers(128);
+OPTIMIZE TABLE ttt;
+```
+
+Query:
+
+```sql
+EXPLAIN ESTIMATE SELECT * FROM ttt;
+```
+
+Result:
+
+```text
+┌─database─┬─table─┬─parts─┬─rows─┬─marks─┐
+│ default  │ ttt   │     1 │  128 │     8 │
+└──────────┴───────┴───────┴──────┴───────┘
+```
+
+[Оriginal article](https://clickhouse.com/docs/en/sql-reference/statements/explain/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index 25dffc36954..f04952746a6 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -107,11 +107,13 @@ Hierarchy of privileges:
         -   `CREATE TEMPORARY TABLE`
     -   `CREATE VIEW`
     -   `CREATE DICTIONARY`
+    -   `CREATE FUNCTION`
 -   [DROP](#grant-drop)
     -   `DROP DATABASE`
     -   `DROP TABLE`
     -   `DROP VIEW`
     -   `DROP DICTIONARY`
+    -   `DROP FUNCTION`
 -   [TRUNCATE](#grant-truncate)
 -   [OPTIMIZE](#grant-optimize)
 -   [SHOW](#grant-show)
@@ -153,6 +155,8 @@ Hierarchy of privileges:
         -   `SYSTEM RELOAD CONFIG`
         -   `SYSTEM RELOAD DICTIONARY`
             -   `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+        -   `SYSTEM RELOAD FUNCTION`
+        -   `SYSTEM RELOAD FUNCTIONS`
     -   `SYSTEM MERGES`
     -   `SYSTEM TTL MERGES`
     -   `SYSTEM FETCHES`
diff --git a/docs/en/sql-reference/statements/insert-into.md b/docs/en/sql-reference/statements/insert-into.md
index 31b4d30835f..cc166686793 100644
--- a/docs/en/sql-reference/statements/insert-into.md
+++ b/docs/en/sql-reference/statements/insert-into.md
@@ -119,3 +119,14 @@ Performance will not decrease if:
 -   Data is added in real time.
 -   You upload data that is usually sorted by time.
 
+It's also possible to asynchronously insert data in small but frequent inserts. The data from such insertions is combined into batches and then safely inserted into a table. To enable the asynchronous mode, switch on the [async_insert](../../operations/settings/settings.md#async-insert) setting. Note that asynchronous insertions are supported only over HTTP protocol, and deduplication is not supported for them.
+
+**See Also**
+
+-   [async_insert](../../operations/settings/settings.md#async-insert)
+-   [async_insert_threads](../../operations/settings/settings.md#async-insert-threads)
+-   [wait_for_async_insert](../../operations/settings/settings.md#wait-for-async-insert)
+-   [wait_for_async_insert_timeout](../../operations/settings/settings.md#wait-for-async-insert-timeout)
+-   [async_insert_max_data_size](../../operations/settings/settings.md#async-insert-max-data-size)
+-   [async_insert_busy_timeout_ms](../../operations/settings/settings.md#async-insert-busy-timeout-ms)
+-   [async_insert_stale_timeout_ms](../../operations/settings/settings.md#async-insert-stale-timeout-ms)
diff --git a/docs/en/sql-reference/statements/optimize.md b/docs/en/sql-reference/statements/optimize.md
index 864509cec94..4054f373cc1 100644
--- a/docs/en/sql-reference/statements/optimize.md
+++ b/docs/en/sql-reference/statements/optimize.md
@@ -18,13 +18,17 @@ OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION I
 
 The `OPTMIZE` query is supported for [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md) family, the [MaterializedView](../../engines/table-engines/special/materializedview.md) and the [Buffer](../../engines/table-engines/special/buffer.md) engines. Other table engines aren’t supported.
 
-When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all nodes (if the `replication_alter_partitions_sync` setting is enabled).
+When `OPTIMIZE` is used with the [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md) family of table engines, ClickHouse creates a task for merging and waits for execution on all replicas (if the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting is set to `2`) or on current replica (if the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting is set to `1`).
 
 -   If `OPTIMIZE` does not perform a merge for any reason, it does not notify the client. To enable notifications, use the [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop) setting.
 -   If you specify a `PARTITION`, only the specified partition is optimized. [How to set partition expression](../../sql-reference/statements/alter/index.md#alter-how-to-specify-part-expr).
 -   If you specify `FINAL`, optimization is performed even when all the data is already in one part. Also merge is forced even if concurrent merges are performed.
 -   If you specify `DEDUPLICATE`, then completely identical rows (unless by-clause is specified) will be deduplicated (all columns are compared), it makes sense only for the MergeTree engine.
 
+You can specify how long (in seconds) to wait for inactive replicas to execute `OPTIMIZE` queries by the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    If the `replication_alter_partitions_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 
 ## BY expression {#by-expression}
 
diff --git a/docs/en/sql-reference/statements/rename.md b/docs/en/sql-reference/statements/rename.md
index 3591c187e93..c2192f1a6e1 100644
--- a/docs/en/sql-reference/statements/rename.md
+++ b/docs/en/sql-reference/statements/rename.md
@@ -5,18 +5,57 @@ toc_title: RENAME
 
 # RENAME Statement {#misc_operations-rename}
 
-## RENAME DATABASE {#misc_operations-rename_database}
-Renames database, it is supported only for Atomic database engine.
+Renames databases, tables, or dictionaries. Several entities can be renamed in a single query.
+Note that the `RENAME` query with several entities is non-atomic operation. To swap entities names atomically, use the [EXCHANGE](./exchange.md) statement.
 
+!!! note "Note"
+    The `RENAME` query is supported by the [Atomic](../../engines/database-engines/atomic.md) database engine only.
+
+**Syntax**
+
+```sql
+RENAME DATABASE|TABLE|DICTIONARY name TO new_name [,...] [ON CLUSTER cluster]
 ```
-RENAME DATABASE atomic_database1 TO atomic_database2 [ON CLUSTER cluster]
+
+## RENAME DATABASE {#misc_operations-rename_database}
+
+Renames databases.
+
+**Syntax**
+
+```sql
+RENAME DATABASE atomic_database1 TO atomic_database2 [,...] [ON CLUSTER cluster]
 ```
 
 ## RENAME TABLE {#misc_operations-rename_table}
+
 Renames one or more tables.
 
+Renaming tables is a light operation. If you pass a different database after `TO`, the table will be moved to this database. However, the directories with databases must reside in the same file system. Otherwise, an error is returned. 
+If you rename multiple tables in one query, the operation is not atomic. It may be partially executed, and queries in other sessions may get `Table ... does not exist ...` error.
+
+**Syntax**
+
 ``` sql
-RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ... [ON CLUSTER cluster]
+RENAME TABLE [db1.]name1 TO [db2.]name2 [,...] [ON CLUSTER cluster]
 ```
 
-Renaming tables is a light operation. If you indicated another database after `TO`, the table will be moved to this database. However, the directories with databases must reside in the same file system (otherwise, an error is returned). If you rename multiple tables in one query, this is a non-atomic operation, it may be partially executed, queries in other sessions may receive the error `Table ... does not exist ..`.
+**Example**
+
+```sql
+RENAME TABLE table_A TO table_A_bak, table_B TO table_B_bak;
+```
+
+## RENAME DICTIONARY {#rename_dictionary}
+
+Renames one or several dictionaries. This query can be used to move dictionaries between databases.
+
+**Syntax**
+
+```sql
+RENAME DICTIONARY [db0.]dict_A TO [db1.]dict_B [,...] [ON CLUSTER cluster]
+```
+
+**See Also**
+
+-   [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/en/sql-reference/statements/revoke.md b/docs/en/sql-reference/statements/revoke.md
index 71a76546096..75005260c4a 100644
--- a/docs/en/sql-reference/statements/revoke.md
+++ b/docs/en/sql-reference/statements/revoke.md
@@ -45,4 +45,4 @@ GRANT SELECT ON accounts.staff TO mira;
 REVOKE SELECT(wage) ON accounts.staff FROM mira;
 ```
 
-{## [Original article](https://clickhouse.tech/docs/en/operations/settings/settings/) ##}
+{## [Original article](https://clickhouse.com/docs/en/operations/settings/settings/) ##}
diff --git a/docs/en/sql-reference/statements/select/all.md b/docs/en/sql-reference/statements/select/all.md
index 891b82c4319..ba66f63b447 100644
--- a/docs/en/sql-reference/statements/select/all.md
+++ b/docs/en/sql-reference/statements/select/all.md
@@ -18,4 +18,4 @@ equals to
 SELECT sum(number) FROM numbers(10);
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/all) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/all) <!--hide-->
diff --git a/docs/en/sql-reference/statements/select/distinct.md b/docs/en/sql-reference/statements/select/distinct.md
index 87154cba05a..390afa46248 100644
--- a/docs/en/sql-reference/statements/select/distinct.md
+++ b/docs/en/sql-reference/statements/select/distinct.md
@@ -6,23 +6,55 @@ toc_title: DISTINCT
 
 If `SELECT DISTINCT` is specified, only unique rows will remain in a query result. Thus only a single row will remain out of all the sets of fully matching rows in the result.
 
-## Null Processing {#null-processing}
+You can specify the list of columns that must have unique values: `SELECT DISTINCT ON (column1, column2,...)`. If the columns are not specified, all of them are taken into consideration.
 
-`DISTINCT` works with [NULL](../../../sql-reference/syntax.md#null-literal) as if `NULL` were a specific value, and `NULL==NULL`. In other words, in the `DISTINCT` results, different combinations with `NULL` occur only once. It differs from `NULL` processing in most other contexts.
+Consider the table:
 
-## Alternatives {#alternatives}
+```text
+┌─a─┬─b─┬─c─┐
+│ 1 │ 1 │ 1 │
+│ 1 │ 1 │ 1 │
+│ 2 │ 2 │ 2 │
+│ 2 │ 2 │ 2 │
+│ 1 │ 1 │ 2 │
+│ 1 │ 2 │ 2 │
+└───┴───┴───┘
+```
 
-It is possible to obtain the same result by applying [GROUP BY](../../../sql-reference/statements/select/group-by.md) across the same set of values as specified as `SELECT` clause, without using any aggregate functions. But there are few differences from `GROUP BY` approach:
+Using `DISTINCT` without specifying columns:
 
--   `DISTINCT` can be applied together with `GROUP BY`.
--   When [ORDER BY](../../../sql-reference/statements/select/order-by.md) is omitted and [LIMIT](../../../sql-reference/statements/select/limit.md) is defined, the query stops running immediately after the required number of different rows has been read.
--   Data blocks are output as they are processed, without waiting for the entire query to finish running.
+```sql
+SELECT DISTINCT * FROM t1;
+```
 
-## Examples {#examples}
+```text
+┌─a─┬─b─┬─c─┐
+│ 1 │ 1 │ 1 │
+│ 2 │ 2 │ 2 │
+│ 1 │ 1 │ 2 │
+│ 1 │ 2 │ 2 │
+└───┴───┴───┘
+```
+
+Using `DISTINCT` with specified columns:
+
+```sql
+SELECT DISTINCT ON (a,b) * FROM t1;
+```
+
+```text
+┌─a─┬─b─┬─c─┐
+│ 1 │ 1 │ 1 │
+│ 2 │ 2 │ 2 │
+│ 1 │ 2 │ 2 │
+└───┴───┴───┘
+```
+
+## DISTINCT and ORDER BY {#distinct-orderby}
 
 ClickHouse supports using the `DISTINCT` and `ORDER BY` clauses for different columns in one query. The `DISTINCT` clause is executed before the `ORDER BY` clause.
 
-Example table:
+Consider the table:
 
 ``` text
 ┌─a─┬─b─┐
@@ -33,7 +65,11 @@ Example table:
 └───┴───┘
 ```
 
-When selecting data with the `SELECT DISTINCT a FROM t1 ORDER BY b ASC` query, we get the following result:
+Selecting data:
+
+```sql
+SELECT DISTINCT a FROM t1 ORDER BY b ASC;
+```
 
 ``` text
 ┌─a─┐
@@ -42,8 +78,11 @@ When selecting data with the `SELECT DISTINCT a FROM t1 ORDER BY b ASC` query, w
 │ 3 │
 └───┘
 ```
+Selecting data with the different sorting direction:
 
-If we change the sorting direction `SELECT DISTINCT a FROM t1 ORDER BY b DESC`, we get the following result:
+```sql
+SELECT DISTINCT a FROM t1 ORDER BY b DESC;
+```
 
 ``` text
 ┌─a─┐
@@ -56,3 +95,15 @@ If we change the sorting direction `SELECT DISTINCT a FROM t1 ORDER BY b DESC`,
 Row `2, 4` was cut before sorting.
 
 Take this implementation specificity into account when programming queries.
+
+## Null Processing {#null-processing}
+
+`DISTINCT` works with [NULL](../../../sql-reference/syntax.md#null-literal) as if `NULL` were a specific value, and `NULL==NULL`. In other words, in the `DISTINCT` results, different combinations with `NULL` occur only once. It differs from `NULL` processing in most other contexts.
+
+## Alternatives {#alternatives}
+
+It is possible to obtain the same result by applying [GROUP BY](../../../sql-reference/statements/select/group-by.md) across the same set of values as specified as `SELECT` clause, without using any aggregate functions. But there are few differences from `GROUP BY` approach:
+
+-   `DISTINCT` can be applied together with `GROUP BY`.
+-   When [ORDER BY](../../../sql-reference/statements/select/order-by.md) is omitted and [LIMIT](../../../sql-reference/statements/select/limit.md) is defined, the query stops running immediately after the required number of different rows has been read.
+-   Data blocks are output as they are processed, without waiting for the entire query to finish running.
diff --git a/docs/en/sql-reference/statements/select/except.md b/docs/en/sql-reference/statements/select/except.md
new file mode 100644
index 00000000000..e6d9b365a91
--- /dev/null
+++ b/docs/en/sql-reference/statements/select/except.md
@@ -0,0 +1,69 @@
+---
+toc_title: EXCEPT
+---
+
+# EXCEPT Clause {#except-clause}
+
+The `EXCEPT` clause returns only those rows that result from the first query without the second. The queries must match the number of columns, order, and type. The result of `EXCEPT` can contain duplicate rows.
+
+Multiple `EXCEPT` statements are executed left to right if parenthesis are not specified. The `EXCEPT` operator has the same priority as the `UNION` clause and lower priority than the `INTERSECT` clause.
+
+``` sql
+SELECT column1 [, column2 ]
+FROM table1
+[WHERE condition]
+
+EXCEPT
+
+SELECT column1 [, column2 ]
+FROM table2
+[WHERE condition]
+
+```
+The condition could be any expression based on your requirements.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT number FROM numbers(1,10) EXCEPT SELECT number FROM numbers(3,6);
+```
+
+Result:
+
+``` text
+┌─number─┐
+│      1 │
+│      2 │
+│      9 │
+│     10 │
+└────────┘
+```
+
+Query:
+
+``` sql
+CREATE TABLE t1(one String, two String, three String) ENGINE=Memory();
+CREATE TABLE t2(four String, five String, six String) ENGINE=Memory();
+
+INSERT INTO t1 VALUES ('q', 'm', 'b'), ('s', 'd', 'f'), ('l', 'p', 'o'), ('s', 'd', 'f'), ('s', 'd', 'f'), ('k', 't', 'd'), ('l', 'p', 'o');
+INSERT INTO t2 VALUES ('q', 'm', 'b'), ('b', 'd', 'k'), ('s', 'y', 't'), ('s', 'd', 'f'), ('m', 'f', 'o'), ('k', 'k', 'd');
+
+SELECT * FROM t1 EXCEPT SELECT * FROM t2;
+```
+
+Result:
+
+``` text
+┌─one─┬─two─┬─three─┐
+│ l   │ p   │ o     │
+│ k   │ t   │ d     │
+│ l   │ p   │ o     │
+└─────┴─────┴───────┘
+```
+
+**See Also**
+
+-   [UNION](union.md#union-clause)
+-   [INTERSECT](intersect.md#intersect-clause)
diff --git a/docs/en/sql-reference/statements/select/from.md b/docs/en/sql-reference/statements/select/from.md
index 7c5ea732122..df30a0fb0d2 100644
--- a/docs/en/sql-reference/statements/select/from.md
+++ b/docs/en/sql-reference/statements/select/from.md
@@ -20,7 +20,7 @@ Subquery is another `SELECT` query that may be specified in parenthesis inside `
 
 When `FINAL` is specified, ClickHouse fully merges the data before returning the result and thus performs all data transformations that happen during merges for the given table engine.
 
-It is applicable when selecting data from tables that use the [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)-engine family (except `GraphiteMergeTree`). Also supported for:
+It is applicable when selecting data from tables that use the [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)-engine family. Also supported for:
 
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) versions of `MergeTree` engines.
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md), and [MaterializedView](../../../engines/table-engines/special/materializedview.md) engines that operate over other engines, provided they were created over `MergeTree`-engine tables.
diff --git a/docs/en/sql-reference/statements/select/group-by.md b/docs/en/sql-reference/statements/select/group-by.md
index 7c2d3a20f43..26dd51d806d 100644
--- a/docs/en/sql-reference/statements/select/group-by.md
+++ b/docs/en/sql-reference/statements/select/group-by.md
@@ -10,6 +10,8 @@ toc_title: GROUP BY
 -   All the expressions in the [SELECT](../../../sql-reference/statements/select/index.md), [HAVING](../../../sql-reference/statements/select/having.md), and [ORDER BY](../../../sql-reference/statements/select/order-by.md) clauses **must** be calculated based on key expressions **or** on [aggregate functions](../../../sql-reference/aggregate-functions/index.md) over non-key expressions (including plain columns). In other words, each column selected from the table must be used either in a key expression or inside an aggregate function, but not both.
 -   Result of aggregating `SELECT` query will contain as many rows as there were unique values of “grouping key” in source table. Usually this signficantly reduces the row count, often by orders of magnitude, but not necessarily: row count stays the same if all “grouping key” values were distinct.
 
+When you want to group data in the table by column numbers instead of column names, enable the setting [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).
+
 !!! note "Note"
     There’s an additional way to run aggregation over a table. If a query contains table columns only inside aggregate functions, the `GROUP BY clause` can be omitted, and aggregation by an empty set of keys is assumed. Such queries always return exactly one row.
 
diff --git a/docs/en/sql-reference/statements/select/index.md b/docs/en/sql-reference/statements/select/index.md
index 04273ca1d4d..39d12f880e4 100644
--- a/docs/en/sql-reference/statements/select/index.md
+++ b/docs/en/sql-reference/statements/select/index.md
@@ -13,7 +13,7 @@ toc_title: Overview
 
 ``` sql
 [WITH expr_list|(subquery)]
-SELECT [DISTINCT] expr_list
+SELECT [DISTINCT [ON (column1, column2, ...)]] expr_list
 [FROM [db.]table | (subquery) | table_function] [FINAL]
 [SAMPLE sample_coeff]
 [ARRAY JOIN ...]
@@ -36,6 +36,8 @@ All clauses are optional, except for the required list of expressions immediatel
 Specifics of each optional clause are covered in separate sections, which are listed in the same order as they are executed:
 
 -   [WITH clause](../../../sql-reference/statements/select/with.md)
+-   [SELECT clause](#select-clause)
+-   [DISTINCT clause](../../../sql-reference/statements/select/distinct.md)
 -   [FROM clause](../../../sql-reference/statements/select/from.md)
 -   [SAMPLE clause](../../../sql-reference/statements/select/sample.md)
 -   [JOIN clause](../../../sql-reference/statements/select/join.md)
@@ -44,11 +46,11 @@ Specifics of each optional clause are covered in separate sections, which are li
 -   [GROUP BY clause](../../../sql-reference/statements/select/group-by.md)
 -   [LIMIT BY clause](../../../sql-reference/statements/select/limit-by.md)
 -   [HAVING clause](../../../sql-reference/statements/select/having.md)
--   [SELECT clause](#select-clause)
--   [DISTINCT clause](../../../sql-reference/statements/select/distinct.md)
 -   [LIMIT clause](../../../sql-reference/statements/select/limit.md)
 -   [OFFSET clause](../../../sql-reference/statements/select/offset.md)
 -   [UNION clause](../../../sql-reference/statements/select/union.md)
+-   [INTERSECT clause](../../../sql-reference/statements/select/intersect.md)
+-   [EXCEPT clause](../../../sql-reference/statements/select/except.md)
 -   [INTO OUTFILE clause](../../../sql-reference/statements/select/into-outfile.md)
 -   [FORMAT clause](../../../sql-reference/statements/select/format.md)
 
@@ -144,7 +146,7 @@ Extreme values are calculated for rows before `LIMIT`, but after `LIMIT BY`. How
 
 You can use synonyms (`AS` aliases) in any part of a query.
 
-The `GROUP BY` and `ORDER BY` clauses do not support positional arguments. This contradicts MySQL, but conforms to standard SQL. For example, `GROUP BY 1, 2` will be interpreted as grouping by constants (i.e. aggregation of all rows into one).
+The `GROUP BY`, `ORDER BY`, and `LIMIT BY` clauses can support positional arguments. To enable this, switch on the [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments) setting. Then, for example, `ORDER BY 1,2` will be sorting rows in the table on the first and then the second column.
 
 ## Implementation Details {#implementation-details}
 
@@ -282,4 +284,4 @@ Other ways to make settings see [here](../../../operations/settings/index.md).
 SELECT * FROM some_table SETTINGS optimize_read_in_order=1, cast_keep_nullable=1;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/)<!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/)<!--hide-->
diff --git a/docs/en/sql-reference/statements/select/intersect.md b/docs/en/sql-reference/statements/select/intersect.md
new file mode 100644
index 00000000000..2243a35e4d8
--- /dev/null
+++ b/docs/en/sql-reference/statements/select/intersect.md
@@ -0,0 +1,73 @@
+---
+toc_title: INTERSECT
+---
+
+# INTERSECT Clause {#intersect-clause}
+
+The `INTERSECT` clause returns only those rows that result from both the first and the second queries. The queries must match the number of columns, order, and type. The result of `INTERSECT` can contain duplicate rows.
+
+Multiple `INTERSECT` statements are executes left to right if parenthesis are not specified. The `INTERSECT` operator has a higher priority than the `UNION` and `EXCEPT` clause.
+
+
+``` sql
+SELECT column1 [, column2 ]
+FROM table1
+[WHERE condition]
+
+INTERSECT
+
+SELECT column1 [, column2 ]
+FROM table2
+[WHERE condition]
+
+```
+The condition could be any expression based on your requirements.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT number FROM numbers(1,10) INTERSECT SELECT number FROM numbers(3,6);
+```
+
+Result:
+
+``` text
+┌─number─┐
+│      3 │
+│      4 │
+│      5 │
+│      6 │
+│      7 │
+│      8 │
+└────────┘
+```
+
+Query:
+
+``` sql
+CREATE TABLE t1(one String, two String, three String) ENGINE=Memory();
+CREATE TABLE t2(four String, five String, six String) ENGINE=Memory();
+
+INSERT INTO t1 VALUES ('q', 'm', 'b'), ('s', 'd', 'f'), ('l', 'p', 'o'), ('s', 'd', 'f'), ('s', 'd', 'f'), ('k', 't', 'd'), ('l', 'p', 'o');
+INSERT INTO t2 VALUES ('q', 'm', 'b'), ('b', 'd', 'k'), ('s', 'y', 't'), ('s', 'd', 'f'), ('m', 'f', 'o'), ('k', 'k', 'd');
+
+SELECT * FROM t1 INTERSECT SELECT * FROM t2;
+```
+
+Result:
+
+``` text
+┌─one─┬─two─┬─three─┐
+│ q   │ m   │ b     │
+│ s   │ d   │ f     │
+│ s   │ d   │ f     │
+│ s   │ d   │ f     │
+└─────┴─────┴───────┘
+```
+
+**See Also**
+
+-   [UNION](union.md#union-clause)
+-   [EXCEPT](except.md#except-clause)
diff --git a/docs/en/sql-reference/statements/select/join.md b/docs/en/sql-reference/statements/select/join.md
index 0002e6db313..aa61348d2a0 100644
--- a/docs/en/sql-reference/statements/select/join.md
+++ b/docs/en/sql-reference/statements/select/join.md
@@ -6,7 +6,7 @@ toc_title: JOIN
 
 Join produces a new table by combining columns from one or multiple tables by using values common to each. It is a common operation in databases with SQL support, which corresponds to [relational algebra](https://en.wikipedia.org/wiki/Relational_algebra#Joins_and_join-like_operators) join. The special case of one table join is often referred to as “self-join”.
 
-Syntax:
+**Syntax**
 
 ``` sql
 SELECT <expr_list>
@@ -36,9 +36,12 @@ Additional join types available in ClickHouse:
 -   `LEFT ANY JOIN`, `RIGHT ANY JOIN` and `INNER ANY JOIN`, partially (for opposite side of `LEFT` and `RIGHT`) or completely (for `INNER` and `FULL`) disables the cartesian product for standard `JOIN` types.
 -   `ASOF JOIN` and `LEFT ASOF JOIN`, joining sequences with a non-exact match. `ASOF JOIN` usage is described below.
 
+!!! note "Note"
+    When [join_algorithm](../../../operations/settings/settings.md#settings-join_algorithm) is set to `partial_merge`, `RIGHT JOIN` and `FULL JOIN` are supported only with `ALL` strictness (`SEMI`, `ANTI`, `ANY`, and `ASOF` are not supported).
+
 ## Settings {#join-settings}
 
-The default join type can be overriden using [join_default_strictness](../../../operations/settings/settings.md#settings-join_default_strictness) setting.
+The default join type can be overridden using [join_default_strictness](../../../operations/settings/settings.md#settings-join_default_strictness) setting.
 
 The behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys) setting.
 
@@ -52,6 +55,61 @@ The behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_
 - [join_on_disk_max_files_to_merge](../../../operations/settings/settings.md#join_on_disk_max_files_to_merge)
 - [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys)
 
+## ON Section Conditions {on-section-conditions}
+
+An `ON` section can contain several conditions combined using the `AND` operator. Conditions specifying join keys must refer both left and right tables and must use the equality operator. Other conditions may use other logical operators but they must refer either the left or the right table of a query.
+Rows are joined if the whole complex condition is met. If the conditions are not met, still rows may be included in the result depending on the `JOIN` type. Note that if the same conditions are placed in a `WHERE` section and they are not met, then rows are always filtered out from the result.
+
+!!! note "Note"
+    The `OR` operator inside an `ON` section is not supported yet.
+
+!!! note "Note"
+    If a condition refers columns from different tables, then only the equality operator (`=`) is supported so far.
+
+**Example**
+
+Consider `table_1` and `table_2`:
+
+```
+┌─Id─┬─name─┐     ┌─Id─┬─text───────────┬─scores─┐
+│  1 │ A    │     │  1 │ Text A         │     10 │
+│  2 │ B    │     │  1 │ Another text A │     12 │
+│  3 │ C    │     │  2 │ Text B         │     15 │
+└────┴──────┘     └────┴────────────────┴────────┘
+```
+
+Query with one join key condition and an additional condition for `table_2`:
+
+``` sql
+SELECT name, text FROM table_1 LEFT OUTER JOIN table_2 
+    ON table_1.Id = table_2.Id AND startsWith(table_2.text, 'Text');
+```
+
+Note that the result contains the row with the name `C` and the empty text column. It is included into the result because an `OUTER` type of a join is used.
+
+```
+┌─name─┬─text───┐
+│ A    │ Text A │
+│ B    │ Text B │
+│ C    │        │
+└──────┴────────┘
+```
+
+Query with `INNER` type of a join and multiple conditions:
+
+``` sql
+SELECT name, text, scores FROM table_1 INNER JOIN table_2 
+    ON table_1.Id = table_2.Id AND table_2.scores > 10 AND startsWith(table_2.text, 'Text');
+```
+
+Result:
+
+```
+┌─name─┬─text───┬─scores─┐
+│ B    │ Text B │     15 │
+└──────┴────────┴────────┘
+```
+
 ## ASOF JOIN Usage {#asof-join-usage}
 
 `ASOF JOIN` is useful when you need to join records that have no exact match.
@@ -59,7 +117,7 @@ The behavior of ClickHouse server for `ANY JOIN` operations depends on the [any_
 Algorithm requires the special column in tables. This column:
 
 -   Must contain an ordered sequence.
--   Can be one of the following types: [Int*, UInt*](../../../sql-reference/data-types/int-uint.md), [Float\*](../../../sql-reference/data-types/float.md), [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md), [Decimal\*](../../../sql-reference/data-types/decimal.md).
+-   Can be one of the following types: [Int, UInt](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md), [Date](../../../sql-reference/data-types/date.md), [DateTime](../../../sql-reference/data-types/datetime.md), [Decimal](../../../sql-reference/data-types/decimal.md).
 -   Can’t be the only column in the `JOIN` clause.
 
 Syntax `ASOF JOIN ... ON`:
@@ -84,7 +142,7 @@ ASOF JOIN table_2
 USING (equi_column1, ... equi_columnN, asof_column)
 ```
 
-`ASOF JOIN` uses `equi_columnX` for joining on equality and `asof_column` for joining on the closest match with the `table_1.asof_column >= table_2.asof_column` condition. The `asof_column` column always the last one in the `USING` clause.
+`ASOF JOIN` uses `equi_columnX` for joining on equality and `asof_column` for joining on the closest match with the `table_1.asof_column >= table_2.asof_column` condition. The `asof_column` column is always the last one in the `USING` clause.
 
 For example, consider the following tables:
 
diff --git a/docs/en/sql-reference/statements/select/limit-by.md b/docs/en/sql-reference/statements/select/limit-by.md
index 34645b68b03..e1ca58cdec8 100644
--- a/docs/en/sql-reference/statements/select/limit-by.md
+++ b/docs/en/sql-reference/statements/select/limit-by.md
@@ -16,6 +16,9 @@ During query processing, ClickHouse selects data ordered by sorting key. The sor
 !!! note "Note"
     `LIMIT BY` is not related to [LIMIT](../../../sql-reference/statements/select/limit.md). They can both be used in the same query.
 
+If you want to use column numbers instead of column names in the `LIMIT BY` clause, enable the setting [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).	
+	
+
 ## Examples {#examples}
 
 Sample table:
diff --git a/docs/en/sql-reference/statements/select/order-by.md b/docs/en/sql-reference/statements/select/order-by.md
index 156f68935b5..ee6893812cc 100644
--- a/docs/en/sql-reference/statements/select/order-by.md
+++ b/docs/en/sql-reference/statements/select/order-by.md
@@ -4,7 +4,9 @@ toc_title: ORDER BY
 
 # ORDER BY Clause {#select-order-by}
 
-The `ORDER BY` clause contains a list of expressions, which can each be attributed with `DESC` (descending) or `ASC` (ascending) modifier which determine the sorting direction. If the direction is not specified, `ASC` is assumed, so it’s usually omitted. The sorting direction applies to a single expression, not to the entire list. Example: `ORDER BY Visits DESC, SearchPhrase`
+The `ORDER BY` clause contains a list of expressions, which can each be attributed with `DESC` (descending) or `ASC` (ascending) modifier which determine the sorting direction. If the direction is not specified, `ASC` is assumed, so it’s usually omitted. The sorting direction applies to a single expression, not to the entire list. Example: `ORDER BY Visits DESC, SearchPhrase`.
+
+If you want to sort by column numbers instead of column names, enable the setting [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).
 
 Rows that have identical values for the list of sorting expressions are output in an arbitrary order, which can also be non-deterministic (different each time).
 If the ORDER BY clause is omitted, the order of the rows is also undefined, and may be non-deterministic as well.
@@ -400,4 +402,4 @@ Result:
 └────────────┴────────────┴──────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/order-by/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/order-by/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/select/prewhere.md b/docs/en/sql-reference/statements/select/prewhere.md
index ada8fff7012..646bb83e692 100644
--- a/docs/en/sql-reference/statements/select/prewhere.md
+++ b/docs/en/sql-reference/statements/select/prewhere.md
@@ -6,7 +6,7 @@ toc_title: PREWHERE
 
 Prewhere is an optimization to apply filtering more efficiently. It is enabled by default even if `PREWHERE` clause is not specified explicitly. It works by automatically moving part of [WHERE](../../../sql-reference/statements/select/where.md) condition to prewhere stage. The role of `PREWHERE` clause is only to control this optimization if you think that you know how to do it better than it happens by default.
 
-With prewhere optimization, at first only the columns necessary for executing prewhere expression are read. Then the other columns are read that are needed for running the rest of the query, but only those blocks where the prewhere expression is “true” at least for some rows. If there are a lot of blocks where prewhere expression is “false” for all rows and prewhere needs less columns than other parts of query, this often allows to read a lot less data from disk for query execution.
+With prewhere optimization, at first only the columns necessary for executing prewhere expression are read. Then the other columns are read that are needed for running the rest of the query, but only those blocks where the prewhere expression is `true` at least for some rows. If there are a lot of blocks where prewhere expression is `false` for all rows and prewhere needs less columns than other parts of query, this often allows to read a lot less data from disk for query execution.
 
 ## Controlling Prewhere Manually {#controlling-prewhere-manually}
 
@@ -14,11 +14,13 @@ The clause has the same meaning as the `WHERE` clause. The difference is in whic
 
 A query may simultaneously specify `PREWHERE` and `WHERE`. In this case, `PREWHERE` precedes `WHERE`.
 
-If the `optimize_move_to_prewhere` setting is set to 0, heuristics to automatically move parts of expressions from `WHERE` to `PREWHERE` are disabled.
+If the [optimize_move_to_prewhere](../../../operations/settings/settings.md#optimize_move_to_prewhere) setting is set to 0, heuristics to automatically move parts of expressions from `WHERE` to `PREWHERE` are disabled.
+
+If query has [FINAL](from.md#select-from-final) modifier, the `PREWHERE` optimization is not always correct. It is enabled only if both settings [optimize_move_to_prewhere](../../../operations/settings/settings.md#optimize_move_to_prewhere) and [optimize_move_to_prewhere_if_final](../../../operations/settings/settings.md#optimize_move_to_prewhere_if_final) are turned on.
 
 !!! note "Attention"
-     The `PREWHERE` section is executed before` FINAL`, so the results of `FROM FINAL` queries may be skewed when using` PREWHERE` with fields not in the `ORDER BY` section of a table.
+     The `PREWHERE` section is executed before `FINAL`, so the results of `FROM ... FINAL` queries may be skewed when using `PREWHERE` with fields not in the `ORDER BY` section of a table.
 
 ## Limitations {#limitations}
 
-`PREWHERE` is only supported by tables from the `*MergeTree` family.
+`PREWHERE` is only supported by tables from the [*MergeTree](../../../engines/table-engines/mergetree-family/index.md) family.
diff --git a/docs/en/sql-reference/statements/select/sample.md b/docs/en/sql-reference/statements/select/sample.md
index 2ed0a804736..2405cb0a03c 100644
--- a/docs/en/sql-reference/statements/select/sample.md
+++ b/docs/en/sql-reference/statements/select/sample.md
@@ -10,7 +10,7 @@ When data sampling is enabled, the query is not performed on all the data, but o
 
 Approximated query processing can be useful in the following cases:
 
--   When you have strict timing requirements (like \<100ms) but you can’t justify the cost of additional hardware resources to meet them.
+-   When you have strict latency requirements (like below 100ms) but you can’t justify the cost of additional hardware resources to meet them.
 -   When your raw data is not accurate, so approximation does not noticeably degrade the quality.
 -   Business requirements target approximate results (for cost-effectiveness, or to market exact results to premium users).
 
diff --git a/docs/en/sql-reference/statements/select/union.md b/docs/en/sql-reference/statements/select/union.md
index 6cedfb89787..6dfe554edf0 100644
--- a/docs/en/sql-reference/statements/select/union.md
+++ b/docs/en/sql-reference/statements/select/union.md
@@ -84,4 +84,4 @@ Queries that are parts of `UNION/UNION ALL/UNION DISTINCT` can be run simultaneo
 -   [union_default_mode](../../../operations/settings/settings.md#union-default-mode) setting.
 
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/union/) <!-- hide -->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/union/) <!-- hide -->
diff --git a/docs/en/sql-reference/statements/select/where.md b/docs/en/sql-reference/statements/select/where.md
index f1532115e55..69505a51db4 100644
--- a/docs/en/sql-reference/statements/select/where.md
+++ b/docs/en/sql-reference/statements/select/where.md
@@ -6,7 +6,7 @@ toc_title: WHERE
 
 `WHERE` clause allows to filter the data that is coming from [FROM](../../../sql-reference/statements/select/from.md) clause of `SELECT`.
 
-If there is a `WHERE` clause, it must contain an expression with the `UInt8` type. This is usually an expression with comparison and logical operators. Rows where this expression evaluates to 0 are expluded from further transformations or result.
+If there is a `WHERE` clause, it must contain an expression with the `UInt8` type. This is usually an expression with comparison and logical operators. Rows where this expression evaluates to 0 are excluded from further transformations or result.
 
 `WHERE` expression is evaluated on the ability to use indexes and partition pruning, if the underlying table engine supports that.
 
diff --git a/docs/en/sql-reference/statements/select/with.md b/docs/en/sql-reference/statements/select/with.md
index 2dca9650340..d6c8da261cb 100644
--- a/docs/en/sql-reference/statements/select/with.md
+++ b/docs/en/sql-reference/statements/select/with.md
@@ -67,4 +67,4 @@ WITH test1 AS (SELECT i + 1, j + 1 FROM test1)
 SELECT * FROM test1;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/select/with/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/select/with/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/set.md b/docs/en/sql-reference/statements/set.md
index c6c8d28257d..e5de5c41284 100644
--- a/docs/en/sql-reference/statements/set.md
+++ b/docs/en/sql-reference/statements/set.md
@@ -1,5 +1,5 @@
 ---
-toc_priority: 49
+toc_priority: 50
 toc_title: SET
 ---
 
diff --git a/docs/en/sql-reference/statements/show.md b/docs/en/sql-reference/statements/show.md
index b5df38642ad..e00d58dfed4 100644
--- a/docs/en/sql-reference/statements/show.md
+++ b/docs/en/sql-reference/statements/show.md
@@ -8,7 +8,7 @@ toc_title: SHOW
 ## SHOW CREATE TABLE {#show-create-table}
 
 ``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY] [db.]table [INTO OUTFILE filename] [FORMAT format]
+SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY|VIEW] [db.]table|view [INTO OUTFILE filename] [FORMAT format]
 ```
 
 Returns a single `String`-type ‘statement’ column, which contains a single value – the `CREATE` query used for creating the specified object.
@@ -91,7 +91,7 @@ Result:
 
 ### See Also {#see-also}
 
--   [CREATE DATABASE](https://clickhouse.tech/docs/en/sql-reference/statements/create/database/#query-language-create-database)
+-   [CREATE DATABASE](https://clickhouse.com/docs/en/sql-reference/statements/create/database/#query-language-create-database)
 
 ## SHOW PROCESSLIST {#show-processlist}
 
@@ -190,8 +190,8 @@ Result:
 
 ### See Also {#see-also}
 
--   [Create Tables](https://clickhouse.tech/docs/en/getting-started/tutorial/#create-tables)
--   [SHOW CREATE TABLE](https://clickhouse.tech/docs/en/sql-reference/statements/show/#show-create-table)
+-   [Create Tables](https://clickhouse.com/docs/en/getting-started/tutorial/#create-tables)
+-   [SHOW CREATE TABLE](https://clickhouse.com/docs/en/sql-reference/statements/show/#show-create-table)
 
 ## SHOW DICTIONARIES {#show-dictionaries}
 
@@ -493,4 +493,4 @@ Result:
 
 -   [system.settings](../../operations/system-tables/settings.md) table
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/statements/show/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/statements/show/) <!--hide-->
diff --git a/docs/en/sql-reference/statements/system.md b/docs/en/sql-reference/statements/system.md
index d1526c10203..23d57c22586 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -12,6 +12,8 @@ The list of available `SYSTEM` statements:
 -   [RELOAD DICTIONARY](#query_language-system-reload-dictionary)
 -   [RELOAD MODELS](#query_language-system-reload-models)
 -   [RELOAD MODEL](#query_language-system-reload-model)
+-   [RELOAD FUNCTIONS](#query_language-system-reload-functions)
+-   [RELOAD FUNCTION](#query_language-system-reload-functions)
 -   [DROP DNS CACHE](#query_language-system-drop-dns-cache)
 -   [DROP MARK CACHE](#query_language-system-drop-mark-cache)
 -   [DROP UNCOMPRESSED CACHE](#query_language-system-drop-uncompressed-cache)
@@ -83,6 +85,17 @@ Completely reloads a CatBoost model `model_name` if the configuration was update
 SYSTEM RELOAD MODEL <model_name>
 ```
 
+## RELOAD FUNCTIONS {#query_language-system-reload-functions}
+
+Reloads all registered [executable user defined functions](../functions/index.md#executable-user-defined-functions) or one of them from a configuration file.
+
+**Syntax**
+
+```sql
+RELOAD FUNCTIONS
+RELOAD FUNCTION function_name
+```
+
 ## DROP DNS CACHE {#query_language-system-drop-dns-cache}
 
 Resets ClickHouse’s internal DNS cache. Sometimes (for old ClickHouse versions) it is necessary to use this command when changing the infrastructure (changing the IP address of another ClickHouse server or the server used by dictionaries).
@@ -128,7 +141,7 @@ This will also create system tables even if message queue is empty.
 
 ## RELOAD CONFIG {#query_language-system-reload-config}
 
-Reloads ClickHouse configuration. Used when configuration is stored in ZooKeeeper.
+Reloads ClickHouse configuration. Used when configuration is stored in ZooKeeper.
 
 ## SHUTDOWN {#query_language-system-shutdown}
 
@@ -311,12 +324,12 @@ One may execute query after:
   - Individual replica path `/replicas/replica_name/` loss.
 
 Replica attaches locally found parts and sends info about them to Zookeeper.
-Parts present on replica before metadata loss are not re-fetched from other replicas if not being outdated
-(so replica restoration does not mean re-downloading all data over the network).
+Parts present on a replica before metadata loss are not re-fetched from other ones if not being outdated (so replica restoration does not mean re-downloading all data over the network).
 
-Caveat: parts in all states are moved to `detached/` folder. Parts active before data loss (Committed) are attached.
+!!! warning "Warning"
+    Parts in all states are moved to `detached/` folder. Parts active before data loss (committed) are attached.
 
-#### Syntax
+**Syntax**
 
 ```sql
 SYSTEM RESTORE REPLICA [db.]replicated_merge_tree_family_table_name [ON CLUSTER cluster_name]
@@ -328,11 +341,11 @@ Alternative syntax:
 SYSTEM RESTORE REPLICA [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_table_name
 ```
 
-#### Example
+**Example**
+
+Creating a table on multiple servers. After the replica's metadata in ZooKeeper is lost, the table will attach as read-only as metadata is missing. The last query needs to execute on every replica.
 
 ```sql
--- Creating table on multiple servers
-
 CREATE TABLE test(n UInt32)
 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/', '{replica}')
 ORDER BY n PARTITION BY n % 10;
@@ -341,8 +354,14 @@ INSERT INTO test SELECT * FROM numbers(1000);
 
 -- zookeeper_delete_path("/clickhouse/tables/test", recursive=True) <- root loss.
 
-SYSTEM RESTART REPLICA test; -- Table will attach as readonly as metadata is missing.
-SYSTEM RESTORE REPLICA test; -- Need to execute on every replica, another way: RESTORE REPLICA test ON CLUSTER cluster
+SYSTEM RESTART REPLICA test;
+SYSTEM RESTORE REPLICA test;
+```
+
+Another way:
+
+```sql
+SYSTEM RESTORE REPLICA test ON CLUSTER cluster;
 ```
 
 ### RESTART REPLICAS {#query_language-system-restart-replicas}
diff --git a/docs/en/sql-reference/statements/truncate.md b/docs/en/sql-reference/statements/truncate.md
index f302a8605e2..b5354196fa4 100644
--- a/docs/en/sql-reference/statements/truncate.md
+++ b/docs/en/sql-reference/statements/truncate.md
@@ -12,3 +12,10 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 Removes all data from a table. When the clause `IF EXISTS` is omitted, the query returns an error if the table does not exist.
 
 The `TRUNCATE` query is not supported for [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md), [Buffer](../../engines/table-engines/special/buffer.md) and [Null](../../engines/table-engines/special/null.md) table engines.
+
+You can use the [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) setting to set up waiting for actions to be executed on replicas.
+
+You can specify how long (in seconds) to wait for inactive replicas to execute `TRUNCATE` queries with the [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout) setting.
+
+!!! info "Note"
+    If the `replication_alter_partitions_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
diff --git a/docs/en/sql-reference/syntax.md b/docs/en/sql-reference/syntax.md
index 573e35d2f71..207b2b82cd2 100644
--- a/docs/en/sql-reference/syntax.md
+++ b/docs/en/sql-reference/syntax.md
@@ -104,6 +104,28 @@ There are many nuances to processing `NULL`. For example, if at least one of the
 
 In queries, you can check `NULL` using the [IS NULL](../sql-reference/operators/index.md#operator-is-null) and [IS NOT NULL](../sql-reference/operators/index.md) operators and the related functions `isNull` and `isNotNull`.
 
+### Heredoc {#heredeoc}
+
+A [heredoc](https://en.wikipedia.org/wiki/Here_document) is a way to define a string (often multiline), while maintaining the original formatting. A heredoc is defined as a custom string literal, placed between two `$` symbols, for example `$heredoc$`. A value between two heredocs is processed "as-is". 
+
+You can use a heredoc to embed snippets of SQL, HTML, or XML code, etc. 
+
+**Example**
+
+Query:
+
+```sql
+SELECT $smth$SHOW CREATE VIEW my_view$smth$;
+```
+
+Result:
+
+```text
+┌─'SHOW CREATE VIEW my_view'─┐
+│ SHOW CREATE VIEW my_view   │
+└────────────────────────────┘
+```
+
 ## Functions {#functions}
 
 Function calls are written like an identifier with a list of arguments (possibly empty) in round brackets. In contrast to standard SQL, the brackets are required, even for an empty argument list. Example: `now()`.
@@ -183,4 +205,4 @@ An expression is a function, identifier, literal, application of an operator, ex
 A list of expressions is one or more expressions separated by commas.
 Functions and operators, in turn, can have expressions as arguments.
 
-[Original article](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/cluster.md b/docs/en/sql-reference/table-functions/cluster.md
index 2856e66db9b..a02c2a10fb7 100644
--- a/docs/en/sql-reference/table-functions/cluster.md
+++ b/docs/en/sql-reference/table-functions/cluster.md
@@ -6,12 +6,13 @@ toc_title: cluster
 # cluster, clusterAllReplicas {#cluster-clusterallreplicas}
 
 Allows to access all shards in an existing cluster which configured in `remote_servers` section without creating a [Distributed](../../engines/table-engines/special/distributed.md) table. One replica of each shard is queried.
-`clusterAllReplicas` - same as `cluster` but all replicas are queried. Each replica in a cluster is used as separate shard/connection.
+
+`clusterAllReplicas` function — same as `cluster`, but all replicas are queried. Each replica in a cluster is used as a separate shard/connection.
 
 !!! note "Note"
-    All available clusters are listed in the `system.clusters` table.
+    All available clusters are listed in the [system.clusters](../../operations/system-tables/clusters.md) table.
 
-Signatures:
+**Syntax**
 
 ``` sql
 cluster('cluster_name', db.table[, sharding_key])
@@ -19,10 +20,27 @@ cluster('cluster_name', db, table[, sharding_key])
 clusterAllReplicas('cluster_name', db.table[, sharding_key])
 clusterAllReplicas('cluster_name', db, table[, sharding_key])
 ```
+**Arguments**
 
-`cluster_name` – Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers.
+- `cluster_name` – Name of a cluster that is used to build a set of addresses and connection parameters to remote and local servers. 
+- `db.table` or `db`, `table` - Name of a database and a table.  
+- `sharding_key` -  A sharding key. Optional. Needs to be specified if the cluster has more than one shard. 
 
-`sharding_key` - When insert into cluster function with more than one shard, sharding_key need to be provided.
+**Returned value**
+
+The dataset from clusters.
+
+**Using Macros**
+
+`cluster_name` can contain macros — substitution in curly brackets. The substituted value is taken from the [macros](../../operations/server-configuration-parameters/settings.md#macros) section of the server configuration file.
+
+Example:
+
+```sql
+SELECT * FROM cluster('{cluster}', default.example_table);
+```
+
+**Usage and Recommendations**
 
 Using the `cluster` and `clusterAllReplicas` table functions are less efficient than creating a `Distributed` table because in this case, the server connection is re-established for every request. When processing a large number of queries, please always create the `Distributed` table ahead of time, and do not use the `cluster` and `clusterAllReplicas` table functions.
 
diff --git a/docs/en/sql-reference/table-functions/file.md b/docs/en/sql-reference/table-functions/file.md
index e1459b5e254..f7c2a9e6d5b 100644
--- a/docs/en/sql-reference/table-functions/file.md
+++ b/docs/en/sql-reference/table-functions/file.md
@@ -126,4 +126,4 @@ SELECT count(*) FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String,
 
 -   [Virtual columns](../../engines/table-engines/index.md#table_engines-virtual_columns)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/file/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/file/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/index.md b/docs/en/sql-reference/table-functions/index.md
index d65a18ab985..c32ae0c2a86 100644
--- a/docs/en/sql-reference/table-functions/index.md
+++ b/docs/en/sql-reference/table-functions/index.md
@@ -14,7 +14,7 @@ You can use table functions in:
 
         The method for creating a temporary table that is available only in the current query. The table is deleted when the query finishes.
 
--   [CREATE TABLE AS \<table_function()\>](../../sql-reference/statements/create/table.md) query.
+-   [CREATE TABLE AS table_function()](../../sql-reference/statements/create/table.md) query.
 
         It's one of the methods of creating a table.
 
@@ -34,5 +34,6 @@ You can use table functions in:
 | [odbc](../../sql-reference/table-functions/odbc.md)              | Creates a [ODBC](../../engines/table-engines/integrations/odbc.md)-engine table.                                                       |
 | [hdfs](../../sql-reference/table-functions/hdfs.md)              | Creates a [HDFS](../../engines/table-engines/integrations/hdfs.md)-engine table.                                                       |
 | [s3](../../sql-reference/table-functions/s3.md)                  | Creates a [S3](../../engines/table-engines/integrations/s3.md)-engine table.                                                           |
+| [sqlite](../../sql-reference/table-functions/sqlite.md)          | Creates a [sqlite](../../engines/table-engines/integrations/sqlite.md)-engine table.                                                       |
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/jdbc.md b/docs/en/sql-reference/table-functions/jdbc.md
index 4943e0291df..9fe1333fc94 100644
--- a/docs/en/sql-reference/table-functions/jdbc.md
+++ b/docs/en/sql-reference/table-functions/jdbc.md
@@ -35,4 +35,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/mysql.md b/docs/en/sql-reference/table-functions/mysql.md
index 627b81a3ddb..b45ab86f60f 100644
--- a/docs/en/sql-reference/table-functions/mysql.md
+++ b/docs/en/sql-reference/table-functions/mysql.md
@@ -110,4 +110,4 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 -   [The ‘MySQL’ table engine](../../engines/table-engines/integrations/mysql.md)
 -   [Using MySQL as a source of external dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table_functions/mysql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table_functions/mysql/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/null.md b/docs/en/sql-reference/table-functions/null.md
index 273091f8fd1..4a8d221d620 100644
--- a/docs/en/sql-reference/table-functions/null.md
+++ b/docs/en/sql-reference/table-functions/null.md
@@ -40,4 +40,4 @@ See also:
 
 -   [Null table engine](../../engines/table-engines/special/null.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/null/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/null/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/postgresql.md b/docs/en/sql-reference/table-functions/postgresql.md
index 85c9366daf9..b2bdc2495e5 100644
--- a/docs/en/sql-reference/table-functions/postgresql.md
+++ b/docs/en/sql-reference/table-functions/postgresql.md
@@ -129,4 +129,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [The PostgreSQL table engine](../../engines/table-engines/integrations/postgresql.md)
 -   [Using PostgreSQL as a source of external dictionary](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index d84edb3f46e..599213561f2 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -3,7 +3,7 @@ toc_priority: 45
 toc_title: s3
 ---
 
-# S3 Table Function {#s3-table-function}
+# s3 Table Function {#s3-table-function}
 
 Provides table-like interface to select/insert files in [Amazon S3](https://aws.amazon.com/s3/). This table function is similar to [hdfs](../../sql-reference/table-functions/hdfs.md), but provides S3-specific features.
 
@@ -125,8 +125,32 @@ INSERT INTO FUNCTION s3('https://storage.yandexcloud.net/my-test-bucket-768/test
 SELECT name, value FROM existing_table;
 ```
 
+## Partitioned Write {#partitioned-write}
+
+If you specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data into separate files helps to improve reading operations efficiency.
+
+**Examples**
+
+1. Using partition ID in a key creates separate files:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a String, b UInt32, c UInt32')
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
+```
+As a result, the data is written into three files: `file_x.csv`, `file_y.csv`, and `file_z.csv`.
+
+2. Using partition ID in a bucket name creates files in different buckets:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
+```
+As a result, the data is written into three files in different buckets: `my_bucket_1/file.csv`, `my_bucket_10/file.csv`, and `my_bucket_20/file.csv`.
+
 **See Also**
 
 -   [S3 engine](../../engines/table-engines/integrations/s3.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/s3/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/s3/) <!--hide-->
diff --git a/docs/en/sql-reference/table-functions/sqlite.md b/docs/en/sql-reference/table-functions/sqlite.md
new file mode 100644
index 00000000000..be7bd92d7e7
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/sqlite.md
@@ -0,0 +1,45 @@
+---
+toc_priority: 55
+toc_title: sqlite
+---
+
+## sqlite {#sqlite}
+
+Allows to perform queries on a data stored in an [SQLite](../../engines/database-engines/sqlite.md) database.
+
+**Syntax** 
+
+``` sql
+    sqlite('db_path', 'table_name')
+```
+
+**Arguments** 
+
+-   `db_path` — Path to a file with an SQLite database. [String](../../sql-reference/data-types/string.md).
+-   `table_name` — Name of a table in the SQLite database. [String](../../sql-reference/data-types/string.md).
+
+**Returned value**
+
+-   A table object with the same columns as in the original `SQLite` table.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT * FROM sqlite('sqlite.db', 'table1') ORDER BY col2;
+```
+
+Result:
+
+``` text
+┌─col1──┬─col2─┐
+│ line1 │    1 │
+│ line2 │    2 │
+│ line3 │    3 │
+└───────┴──────┘
+```
+
+**See Also** 
+
+-   [SQLite](../../engines/table-engines/integrations/sqlite.md) table engine
\ No newline at end of file
diff --git a/docs/en/sql-reference/table-functions/view.md b/docs/en/sql-reference/table-functions/view.md
index 18323ec4e92..f78120c370e 100644
--- a/docs/en/sql-reference/table-functions/view.md
+++ b/docs/en/sql-reference/table-functions/view.md
@@ -5,7 +5,7 @@ toc_title: view
 
 ## view {#view}
 
-Turns a subquery into a table. The function implements views (see [CREATE VIEW](https://clickhouse.tech/docs/en/sql-reference/statements/create/view/#create-view)). The resulting table does not store data, but only stores the specified `SELECT` query. When reading from the table, ClickHouse executes the query and deletes all unnecessary columns from the result.
+Turns a subquery into a table. The function implements views (see [CREATE VIEW](https://clickhouse.com/docs/en/sql-reference/statements/create/view/#create-view)). The resulting table does not store data, but only stores the specified `SELECT` query. When reading from the table, ClickHouse executes the query and deletes all unnecessary columns from the result.
 
 **Syntax**
 
@@ -51,7 +51,7 @@ Result:
 └──────────┘
 ```
 
-You can use the `view` function as a parameter of the [remote](https://clickhouse.tech/docs/en/sql-reference/table-functions/remote/#remote-remotesecure) and [cluster](https://clickhouse.tech/docs/en/sql-reference/table-functions/cluster/#cluster-clusterallreplicas) table functions:
+You can use the `view` function as a parameter of the [remote](https://clickhouse.com/docs/en/sql-reference/table-functions/remote/#remote-remotesecure) and [cluster](https://clickhouse.com/docs/en/sql-reference/table-functions/cluster/#cluster-clusterallreplicas) table functions:
 
 ``` sql
 SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name));
@@ -63,6 +63,6 @@ SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 
 **See Also**
 
--   [View Table Engine](https://clickhouse.tech/docs/en/engines/table-engines/special/view/)
+-   [View Table Engine](https://clickhouse.com/docs/en/engines/table-engines/special/view/)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/view/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/view/) <!--hide-->
diff --git a/docs/en/whats-new/changelog/2017.md b/docs/en/whats-new/changelog/2017.md
index 9ceca2b6c4a..af82c69386a 100644
--- a/docs/en/whats-new/changelog/2017.md
+++ b/docs/en/whats-new/changelog/2017.md
@@ -24,7 +24,7 @@ This release contains bug fixes for the previous release 1.1.54310:
 #### New Features: {#new-features}
 
 -   Custom partitioning key for the MergeTree family of table engines.
--   [Kafka](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) table engine.
+-   [Kafka](https://clickhouse.com/docs/en/operations/table_engines/kafka/) table engine.
 -   Added support for loading [CatBoost](https://catboost.yandex/) models and applying them to data stored in ClickHouse.
 -   Added support for time zones with non-integer offsets from UTC.
 -   Added support for arithmetic operations with time intervals.
diff --git a/docs/en/whats-new/roadmap.md b/docs/en/whats-new/roadmap.md
index 4abc36b5136..8872c42818f 100644
--- a/docs/en/whats-new/roadmap.md
+++ b/docs/en/whats-new/roadmap.md
@@ -7,4 +7,4 @@ toc_title: Roadmap
 
 The roadmap for the year 2021 is published for open discussion [here](https://github.com/ClickHouse/ClickHouse/issues/17623).
 
-{## [Original article](https://clickhouse.tech/docs/en/roadmap/) ##}
+{## [Original article](https://clickhouse.com/docs/en/roadmap/) ##}
diff --git a/docs/en/whats-new/security-changelog.md b/docs/en/whats-new/security-changelog.md
index 97cad9965fd..bcfeaa06e24 100644
--- a/docs/en/whats-new/security-changelog.md
+++ b/docs/en/whats-new/security-changelog.md
@@ -81,4 +81,4 @@ Incorrect configuration in deb package could lead to the unauthorized use of the
 
 Credits: the UK’s National Cyber Security Centre (NCSC)
 
-{## [Original article](https://clickhouse.tech/docs/en/security_changelog/) ##}
+{## [Original article](https://clickhouse.com/docs/en/security_changelog/) ##}
diff --git a/docs/ja/commercial/cloud.md b/docs/ja/commercial/cloud.md
index 62fc75ecbda..312b8aed6ea 100644
--- a/docs/ja/commercial/cloud.md
+++ b/docs/ja/commercial/cloud.md
@@ -5,31 +5,7 @@ toc_priority: 1
 toc_title: "\u30AF\u30E9\u30A6\u30C9"
 ---
 
-# ClickHouseの雲のサービス提供者 {#clickhouse-cloud-service-providers}
+# ClickHouse Cloud Service {#clickhouse-cloud-service}
 
-!!! info "情報"
-    Managed ClickHouse serviceを使用してパブリッククラウドを起動した場合は、以下をお気軽にご利用ください [プル要求を開く](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) それを次のリストに追加します。
-
-## Yandexクラウド {#yandex-cloud}
-
-[ClickHouseのためのYandexの管理サービス](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) 次の主な機能を提供します:
-
--   完全に管理された飼育係サービス [クリックハウス複製](../engines/table-engines/mergetree-family/replication.md)
--   複数の記憶域タイプの選択肢
--   異なる可用性ゾーンのレプリカ
--   暗号化と分離
--   自動メンテナンス
-
-## Alibaba Cloud {#alibaba-cloud}
-
-[ClickHouseのためのAlibaba Cloudの管理サービス](https://www.alibabacloud.com/product/clickhouse) 次の主な機能を提供します:
-
--   Alibaba Cloud Apsara分散システムをベースにした信頼性の高いクラウドディスクストレージエンジン
--   手動でのデータ移行を必要とせずに、オン・デマンドで容量を拡張
--   シングル・ノード、シングル・レプリカ、マルチ・ノード、マルチ・レプリカ・アーキテクチャをサポートし、ホット・データとコールド・データの階層化をサポート
--   アクセスホワイトリスト、OneKey Recovery、マルチレイヤーネットワークセキュリティ保護、クラウドディスク暗号化をサポート
--   クラウドログシステム、データベース、およびデータアプリケーションツールとのシームレスな統合
--   組み込み型の監視およびデータベース管理プラットフォーム
--   プロフェッショナルデータベースエキスパートによるテクニカル・サポートとサービス
-
-{## [元の記事](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
+!!! info "Info"
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/ja/commercial/index.md b/docs/ja/commercial/index.md
index 75e13112d9e..75bbe782750 100644
--- a/docs/ja/commercial/index.md
+++ b/docs/ja/commercial/index.md
@@ -6,4 +6,9 @@ toc_priority: 70
 toc_title: "\u5546\u696D"
 ---
 
+# ClickHouse Commercial Services {#clickhouse-commercial-services}
 
+Service categories:
+
+-   [Cloud](../commercial/cloud.md)
+-   [Support](../commercial/support.md)
diff --git a/docs/ja/development/adding_test_queries.md b/docs/ja/development/adding_test_queries.md
new file mode 120000
index 00000000000..def9c4077be
--- /dev/null
+++ b/docs/ja/development/adding_test_queries.md
@@ -0,0 +1 @@
+../../en/development/adding_test_queries.md
\ No newline at end of file
diff --git a/docs/ja/development/architecture.md b/docs/ja/development/architecture.md
index 8dc1d471007..7e5460bb9cf 100644
--- a/docs/ja/development/architecture.md
+++ b/docs/ja/development/architecture.md
@@ -200,4 +200,4 @@ ClickHouseでのレプリケーションは、テーブルごとに構成でき
 !!! note "注"
     ClickHouseクラスターは独立したシャードで構成され、各シャードはレプリカで構成されます。 クラスターは **弾性ではない** したがって、新しいシャードを追加した後、データはシャード間で自動的に再調整されません。 代わりに、クラスタ負荷は不均一に調整されることになっています。 この実装はより多くの制御を提供し、数十のノードなどの比較的小さなクラスタでもokです。 しかし、運用環境で使用している数百のノードを持つクラスターでは、このアプローチは重大な欠点になります。 を実行すべきである"と述べていテーブルエンジンで広がる、クラスターを動的に再現れる可能性がある地域分割のバランスとクラスターの動します。
 
-{## [元の記事](https://clickhouse.tech/docs/en/development/architecture/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/development/architecture/) ##}
diff --git a/docs/ja/development/browse-code.md b/docs/ja/development/browse-code.md
index 45eba084f4a..6539014eaf0 100644
--- a/docs/ja/development/browse-code.md
+++ b/docs/ja/development/browse-code.md
@@ -7,7 +7,7 @@ toc_title: "\u30BD\u30FC\u30B9\u30B3\u30FC\u30C9\u306E\u53C2\u7167"
 
 # ClickHouseのソースコードを参照 {#browse-clickhouse-source-code}
 
-以下を使用できます **Woboq** オンラインのコードブラウザをご利用 [ここに](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). このコードナビゲーションや意味のハイライト表示、検索インデックス. コードのスナップショットは随時更新中です。
+以下を使用できます **Woboq** オンラインのコードブラウザをご利用 [ここに](https://clickhouse.com/codebrowser/html_report/ClickHouse/src/index.html). このコードナビゲーションや意味のハイライト表示、検索インデックス. コードのスナップショットは随時更新中です。
 
 また、ソースを参照することもできます [GitHub](https://github.com/ClickHouse/ClickHouse) いつものように
 
diff --git a/docs/ja/development/build-cross-arm.md b/docs/ja/development/build-cross-arm.md
index a5fb0595d08..06df5f1936e 100644
--- a/docs/ja/development/build-cross-arm.md
+++ b/docs/ja/development/build-cross-arm.md
@@ -10,7 +10,7 @@ toc_title: "Aarch64\u7528\u306ELinux\u4E0A\u3067ClickHouse\u3092\u69CB\u7BC9\u30
 
 これは、Linuxマシンを使用してビルドする場合のためのものです `clickhouse` AARCH64CPUアーキテクチャを持つ別のLinuxマシン上で実行されるバイナリ。 この目的のために継続的インテグレーションをチェックを実行Linuxサーバー
 
-AARCH64のクロスビルドは [ビルド命令](build.md) 先について来い
+AARCH64のクロスビルドは [ビルド命令](../development/build.md) 先について来い
 
 # Clang-8をインストール {#install-clang-8}
 
diff --git a/docs/ja/development/build-cross-osx.md b/docs/ja/development/build-cross-osx.md
index 7444a384e05..9ca1070cf27 100644
--- a/docs/ja/development/build-cross-osx.md
+++ b/docs/ja/development/build-cross-osx.md
@@ -8,9 +8,9 @@ toc_title: "Mac OS X\u7528\u306ELinux\u4E0A\u3067ClickHouse\u3092\u69CB\u7BC9\u3
 
 # Mac OS X用のLinux上でClickHouseを構築する方法 {#how-to-build-clickhouse-on-linux-for-mac-os-x}
 
-これは、Linuxマシンを使用してビルドする場合のためのものです `clickhouse` これは、Linuxサーバー上で実行される継続的な統合チェックを目的としています。 Mac OS X上でClickHouseを直接ビルドする場合は、次の手順に進みます [別の命令](build-osx.md).
+これは、Linuxマシンを使用してビルドする場合のためのものです `clickhouse` これは、Linuxサーバー上で実行される継続的な統合チェックを目的としています。 Mac OS X上でClickHouseを直接ビルドする場合は、次の手順に進みます [別の命令](../development/build-osx.md).
 
-Mac OS X用のクロスビルドは [ビルド命令](build.md) 先について来い
+Mac OS X用のクロスビルドは [ビルド命令](../development/build.md) 先について来い
 
 # Clang-8をインストール {#install-clang-8}
 
diff --git a/docs/ja/development/build-osx.md b/docs/ja/development/build-osx.md
index 5d0af7d8f43..16557951b02 100644
--- a/docs/ja/development/build-osx.md
+++ b/docs/ja/development/build-osx.md
@@ -90,4 +90,4 @@ $ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 
 チェックの場合は、利用できる `ulimit -n` コマンド
 
-[元の記事](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/ja/development/build.md b/docs/ja/development/build.md
index 191fa665ccd..807b02714b4 100644
--- a/docs/ja/development/build.md
+++ b/docs/ja/development/build.md
@@ -127,4 +127,4 @@ $ cd ClickHouse
 $ ./release
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/build/) <!--hide-->
diff --git a/docs/ja/development/continuous-integration.md b/docs/ja/development/continuous-integration.md
new file mode 120000
index 00000000000..f68058a436e
--- /dev/null
+++ b/docs/ja/development/continuous-integration.md
@@ -0,0 +1 @@
+../../en/development/continuous-integration.md
\ No newline at end of file
diff --git a/docs/ja/development/developer-instruction.md b/docs/ja/development/developer-instruction.md
index d7e5217b3b6..c95dc0e2ea4 100644
--- a/docs/ja/development/developer-instruction.md
+++ b/docs/ja/development/developer-instruction.md
@@ -41,7 +41,7 @@ Ubuntuでこれを行うには、コマンドラインターミナルで実行
 
 コマンドラインターミナルで実行:
 
-    git clone --recursive git@github.com:your_github_username/ClickHouse.git
+    git clone git@github.com:your_github_username/ClickHouse.git
     cd ClickHouse
 
 注:、代理して下さい *your_github_username* 適切なもので！
@@ -83,7 +83,7 @@ ClickHouseリポジトリは以下を使用します `submodules`. That is what
 
 Gitでサブモジュールを操作するのは苦痛です。 次のコマンドは管理に役立ちます:
 
-    # ! each command accepts --recursive
+    # ! each command accepts
     # Update remote URLs for submodules. Barely rare case
     git submodule sync
     # Add new submodules
@@ -96,16 +96,16 @@ Gitでサブモジュールを操作するのは苦痛です。 次のコマン
 次のコマンドは、すべてのサブモジュールを初期状態にリセットするのに役立ちます（！ﾂづﾂつｷﾂ。 -内部の変更は削除されます):
 
     # Synchronizes submodules' remote URL with .gitmodules
-    git submodule sync --recursive
+    git submodule sync
     # Update the registered submodules with initialize not yet initialized
-    git submodule update --init --recursive
+    git submodule update --init
     # Reset all changes done after HEAD
     git submodule foreach git reset --hard
     # Clean files from .gitignore
     git submodule foreach git clean -xfd
     # Repeat last 4 commands for all submodule
-    git submodule foreach git submodule sync --recursive
-    git submodule foreach git submodule update --init --recursive
+    git submodule foreach git submodule sync
+    git submodule foreach git submodule update --init
     git submodule foreach git submodule foreach git reset --hard
     git submodule foreach git submodule foreach git clean -xfd
 
@@ -236,11 +236,11 @@ KDevelopとQTCreatorは、ClickHouseを開発するためのIDEの他の優れ
 
 # コードの作成 {#writing-code}
 
-の説明ClickHouse建築で、できるだけ早く送ってくださhttps://clickhouse.tech/docs/en/開発/アーキテクチャ/
+の説明ClickHouse建築で、できるだけ早く送ってくださhttps://clickhouse.com/docs/en/開発/アーキテクチャ/
 
-コードのスタイルガイド:https://clickhouse.tech/docs/en/開発/スタイル/
+コードのスタイルガイド:https://clickhouse.com/docs/en/開発/スタイル/
 
-筆記試験：https://clickhouse.tech/docs/en/development/tests/
+筆記試験：https://clickhouse.com/docs/en/development/tests/
 
 タスクのリスト：https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
@@ -250,8 +250,8 @@ KDevelopとQTCreatorは、ClickHouseを開発するためのIDEの他の優れ
 
     sudo apt install wget xz-utils
 
-    wget https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz
-    wget https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz
 
     xz -v -d hits_v1.tsv.xz
     xz -v -d visits_v1.tsv.xz
diff --git a/docs/ja/development/index.md b/docs/ja/development/index.md
index 4e14fd1a032..d69e9ea0d9e 100644
--- a/docs/ja/development/index.md
+++ b/docs/ja/development/index.md
@@ -9,4 +9,4 @@ toc_title: "\u96A0\u3057"
 
 # ClickHouse開発 {#clickhouse-development}
 
-[元の記事](https://clickhouse.tech/docs/en/development/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/) <!--hide-->
diff --git a/docs/ja/development/style.md b/docs/ja/development/style.md
index 596e29f4414..8c5451e4b63 100644
--- a/docs/ja/development/style.md
+++ b/docs/ja/development/style.md
@@ -830,4 +830,4 @@ function(
       size_t limit)
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/development/style/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/atomic.md b/docs/ja/engines/database-engines/atomic.md
index f019b94a00b..8f76d832764 100644
--- a/docs/ja/engines/database-engines/atomic.md
+++ b/docs/ja/engines/database-engines/atomic.md
@@ -14,4 +14,4 @@ It is supports non-blocking `DROP` and `RENAME TABLE` queries and atomic `EXCHAN
 CREATE DATABASE test ENGINE = Atomic;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/engines/database_engines/atomic/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/index.md b/docs/ja/engines/database-engines/index.md
index 1cdd1912b5f..9702430d1f3 100644
--- a/docs/ja/engines/database-engines/index.md
+++ b/docs/ja/engines/database-engines/index.md
@@ -18,4 +18,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 -   [怠け者](lazy.md)
 
-[元の記事](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/database_engines/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/lazy.md b/docs/ja/engines/database-engines/lazy.md
index 504907f6894..5086a2e000e 100644
--- a/docs/ja/engines/database-engines/lazy.md
+++ b/docs/ja/engines/database-engines/lazy.md
@@ -15,4 +15,4 @@ RAM内のテーブルのみを保持 `expiration_time_in_seconds` 最後のア
 
     CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
 
-[元の記事](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/materialized-mysql.md b/docs/ja/engines/database-engines/materialized-mysql.md
new file mode 120000
index 00000000000..02118b85df4
--- /dev/null
+++ b/docs/ja/engines/database-engines/materialized-mysql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/materialized-mysql.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/materialized-postgresql.md b/docs/ja/engines/database-engines/materialized-postgresql.md
new file mode 120000
index 00000000000..e501cb344bb
--- /dev/null
+++ b/docs/ja/engines/database-engines/materialized-postgresql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/materialized-postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/mysql.md b/docs/ja/engines/database-engines/mysql.md
index efb3893a385..506295af5da 100644
--- a/docs/ja/engines/database-engines/mysql.md
+++ b/docs/ja/engines/database-engines/mysql.md
@@ -132,4 +132,4 @@ SELECT * FROM mysql_db.mysql_table
 └────────┴───────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/ja/engines/database-engines/postgresql.md b/docs/ja/engines/database-engines/postgresql.md
new file mode 120000
index 00000000000..9405ec25dc2
--- /dev/null
+++ b/docs/ja/engines/database-engines/postgresql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/replicated.md b/docs/ja/engines/database-engines/replicated.md
new file mode 120000
index 00000000000..065fadff7fd
--- /dev/null
+++ b/docs/ja/engines/database-engines/replicated.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/replicated.md
\ No newline at end of file
diff --git a/docs/ja/engines/database-engines/sqlite.md b/docs/ja/engines/database-engines/sqlite.md
new file mode 120000
index 00000000000..776734647c2
--- /dev/null
+++ b/docs/ja/engines/database-engines/sqlite.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/sqlite.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/index.md b/docs/ja/engines/table-engines/index.md
index e1a7b085a29..b904729f45b 100644
--- a/docs/ja/engines/table-engines/index.md
+++ b/docs/ja/engines/table-engines/index.md
@@ -82,4 +82,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 テーブル仮想列のいずれかと同じ名前の列を持つテーブルを作成すると、仮想列にアクセスできなくなります。 これはお勧めしません。 競合を避けるために、仮想列名には通常、アンダースコアが付けられます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/ExternalDistributed.md b/docs/ja/engines/table-engines/integrations/ExternalDistributed.md
new file mode 120000
index 00000000000..f843983ad4d
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/ExternalDistributed.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/ExternalDistributed.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/embedded-rocksdb.md b/docs/ja/engines/table-engines/integrations/embedded-rocksdb.md
new file mode 120000
index 00000000000..a1eaf673ce1
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/embedded-rocksdb.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/embedded-rocksdb.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/hdfs.md b/docs/ja/engines/table-engines/integrations/hdfs.md
index 53e5cd3df34..b6042582890 100644
--- a/docs/ja/engines/table-engines/integrations/hdfs.md
+++ b/docs/ja/engines/table-engines/integrations/hdfs.md
@@ -120,4 +120,4 @@ CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 
 -   [仮想列](../index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/jdbc.md b/docs/ja/engines/table-engines/integrations/jdbc.md
index d2ac8e9cbfe..6c5bb895ae7 100644
--- a/docs/ja/engines/table-engines/integrations/jdbc.md
+++ b/docs/ja/engines/table-engines/integrations/jdbc.md
@@ -93,4 +93,4 @@ FROM system.numbers
 
 -   [JDBCテーブル関数](../../../sql-reference/table-functions/jdbc.md).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/kafka.md b/docs/ja/engines/table-engines/integrations/kafka.md
index 08e3e951263..e54b7b4252c 100644
--- a/docs/ja/engines/table-engines/integrations/kafka.md
+++ b/docs/ja/engines/table-engines/integrations/kafka.md
@@ -177,4 +177,4 @@ GraphiteMergeTreeと同様に、KafkaエンジンはClickHouse設定ファイル
 
 -   [仮想列](../index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/kafka/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/materialized-postgresql.md b/docs/ja/engines/table-engines/integrations/materialized-postgresql.md
new file mode 120000
index 00000000000..c8dcba4bc19
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/materialized-postgresql.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/materialized-postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/mongodb.md b/docs/ja/engines/table-engines/integrations/mongodb.md
new file mode 120000
index 00000000000..fe2f6b256ce
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/mongodb.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/mongodb.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/mysql.md b/docs/ja/engines/table-engines/integrations/mysql.md
index 6b92c8a36ce..1f08486be7d 100644
--- a/docs/ja/engines/table-engines/integrations/mysql.md
+++ b/docs/ja/engines/table-engines/integrations/mysql.md
@@ -102,4 +102,4 @@ SELECT * FROM mysql_table
 -   [その ‘mysql’ テーブル関数](../../../sql-reference/table-functions/mysql.md)
 -   [外部辞書のソースとしてMySQLを使用する](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/odbc.md b/docs/ja/engines/table-engines/integrations/odbc.md
index 78709e65e09..7a50f5d6fc0 100644
--- a/docs/ja/engines/table-engines/integrations/odbc.md
+++ b/docs/ja/engines/table-engines/integrations/odbc.md
@@ -129,4 +129,4 @@ SELECT * FROM odbc_t
 -   [ODBC外部辞書](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBCテーブル関数](../../../sql-reference/table-functions/odbc.md)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/integrations/postgresql.md b/docs/ja/engines/table-engines/integrations/postgresql.md
new file mode 120000
index 00000000000..af3fc116c02
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/postgresql.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/postgresql.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/rabbitmq.md b/docs/ja/engines/table-engines/integrations/rabbitmq.md
new file mode 120000
index 00000000000..938c968c15b
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/rabbitmq.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/rabbitmq.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/s3.md b/docs/ja/engines/table-engines/integrations/s3.md
new file mode 120000
index 00000000000..68fc96be8e0
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/s3.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/s3.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/integrations/sqlite.md b/docs/ja/engines/table-engines/integrations/sqlite.md
new file mode 120000
index 00000000000..56d0a490f52
--- /dev/null
+++ b/docs/ja/engines/table-engines/integrations/sqlite.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/sqlite.md
\ No newline at end of file
diff --git a/docs/ja/engines/table-engines/log-family/index.md b/docs/ja/engines/table-engines/log-family/index.md
index 91bbdb0db47..c5729481092 100644
--- a/docs/ja/engines/table-engines/log-family/index.md
+++ b/docs/ja/engines/table-engines/log-family/index.md
@@ -44,4 +44,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 その `Log` と `StripeLog` エンジンの支援並列データです。 読み込み時にデータClickHouse使複数のスレッド）。 各スレッドプロセス別データブロックです。 その `Log` エンジンは、テーブルの各列に個別のファイルを使用します。 `StripeLog` すべてのデータファイルです。 その結果、 `StripeLog` エンジンは、オペレーティングシス `Log` エンジンはデータを読むとき高性能を提供する。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/log-family/log.md b/docs/ja/engines/table-engines/log-family/log.md
index 904c601257f..a609d111ace 100644
--- a/docs/ja/engines/table-engines/log-family/log.md
+++ b/docs/ja/engines/table-engines/log-family/log.md
@@ -13,4 +13,4 @@ toc_title: "\u30ED\u30B0"
 同時データアクセスの場合、読み取り操作は同時に実行できますが、書き込み操作は読み取りをブロックします。
 ログエンジ 同様に、テーブルへの書き込みが失敗した場合、テーブルは壊れ、そこから読み込むとエラーが返されます。 ログエンジンは、一時データ、書き込み一度テーブル、およびテストまたはデモの目的に適しています。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/log/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/log/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/log-family/stripelog.md b/docs/ja/engines/table-engines/log-family/stripelog.md
index bbecd50bbea..5083115f127 100644
--- a/docs/ja/engines/table-engines/log-family/stripelog.md
+++ b/docs/ja/engines/table-engines/log-family/stripelog.md
@@ -92,4 +92,4 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
 └─────────────────────┴──────────────┴────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/log-family/tinylog.md b/docs/ja/engines/table-engines/log-family/tinylog.md
index 1bee48fc53e..d38d02514fc 100644
--- a/docs/ja/engines/table-engines/log-family/tinylog.md
+++ b/docs/ja/engines/table-engines/log-family/tinylog.md
@@ -13,4 +13,4 @@ toc_title: TinyLog
 
 クエリは単一のストリームで実行されます。 言い換えれば、このエンジンは比較的小さなテーブル（最大約1,000,000行）を対象としています。 小さなテーブルが多い場合は、このテーブルエンジンを使用するのが理にかなっています。 [ログ](log.md) エンジン(開く必要の少ないファイル)。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/tinylog/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md
index d304ec2802d..04c99a1f2dd 100644
--- a/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -102,4 +102,4 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md
index e26172c1fd5..e2506da146d 100644
--- a/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -303,4 +303,4 @@ select * FROM UAct
 └─────────────────────┴───────────┴──────────┴──────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 30cd3c72af5..047595984ba 100644
--- a/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/ja/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -124,4 +124,4 @@ drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
 
 ClickHouseでは、パーティションの削除、テーブル間のコピー、またはバックアップの作成などの操作を実行できます。 セクションのすべての操作の一覧を参照してください [パーティションとパーツの操作](../../../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md
index 18ab9390f0f..aa2cacbcdaa 100644
--- a/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -171,4 +171,4 @@ default
 </graphite_rollup>
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/mergetree.md b/docs/ja/engines/table-engines/mergetree-family/mergetree.md
index f93d5ea4a64..83ea6866178 100644
--- a/docs/ja/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/mergetree.md
@@ -651,4 +651,4 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 バックグラウンドマージと突然変異の完了後、古い部分は一定時間後にのみ削除されます (`old_parts_lifetime`).
 この間、他のボリュームまたはディスクには移動されません。 したがって、部品が最終的に除去されるまで、それらは占有されたディスク領域の評価のために考慮される。
 
-[元の記事](https://clickhouse.tech/docs/ru/operations/table_engines/mergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/ru/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md
index c3df9559415..dcc4c6b1785 100644
--- a/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -66,4 +66,4 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 </details>
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/replication.md b/docs/ja/engines/table-engines/mergetree-family/replication.md
index 4e0d2bc0831..195c2453467 100644
--- a/docs/ja/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ja/engines/table-engines/mergetree-family/replication.md
@@ -215,4 +215,4 @@ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 
 ZooKeeperのデータが紛失または破損している場合は、上記のように再生されていないテーブルに移動することでデータを保存できます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md
index 356b10037d2..988dd62ca1e 100644
--- a/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/summingmergetree.md
@@ -138,4 +138,4 @@ Columnが主キーになく、集計されていない場合は、既存の値
 
 入れ子になったデータ構造の場合、合計のために列のタプルにその列を指定する必要はありません。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 2d323629c4e..7b542199cdc 100644
--- a/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/ja/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -236,4 +236,4 @@ SELECT * FROM UAct FINAL
 
 これは、データを選択する非常に非効率的な方法です。 大きなテーブルには使用しないでください。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/buffer.md b/docs/ja/engines/table-engines/special/buffer.md
index deb38c04692..c93ea279885 100644
--- a/docs/ja/engines/table-engines/special/buffer.md
+++ b/docs/ja/engines/table-engines/special/buffer.md
@@ -68,4 +68,4 @@ DROP TABLEまたはDETACH TABLEを使用してサーバーを停止すると、
 
 バッファテーブルであっても、一度にデータ行を挿入することは意味がありません。 これにより、毎秒数千行の速度が生成されますが、より大きなデータブロックを挿入すると、毎秒百万行を超える速度が生成されます（セクションを参照 “Performance”).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/buffer/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/dictionary.md b/docs/ja/engines/table-engines/special/dictionary.md
index 9de7c7b78db..09d42aaa7df 100644
--- a/docs/ja/engines/table-engines/special/dictionary.md
+++ b/docs/ja/engines/table-engines/special/dictionary.md
@@ -94,4 +94,4 @@ select * from products limit 1;
 └───────────────┴─────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/distributed.md b/docs/ja/engines/table-engines/special/distributed.md
index 87d8c1bc6d5..7d347b3eeb2 100644
--- a/docs/ja/engines/table-engines/special/distributed.md
+++ b/docs/ja/engines/table-engines/special/distributed.md
@@ -149,4 +149,4 @@ Max_parallel_replicasオプションを有効にすると、単一のシャー
 
 -   [仮想列](index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/external-data.md b/docs/ja/engines/table-engines/special/external-data.md
index ffa726be923..eac722c92fb 100644
--- a/docs/ja/engines/table-engines/special/external-data.md
+++ b/docs/ja/engines/table-engines/special/external-data.md
@@ -65,4 +65,4 @@ $ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+coun
 
 分散クエリ処理では、一時テーブルがすべてのリモートサーバーに送信されます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/external_data/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/file.md b/docs/ja/engines/table-engines/special/file.md
index 8427c369c2a..b51468407ef 100644
--- a/docs/ja/engines/table-engines/special/file.md
+++ b/docs/ja/engines/table-engines/special/file.md
@@ -87,4 +87,4 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   指数
     -   複製
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/generate.md b/docs/ja/engines/table-engines/special/generate.md
index 58005ed2717..54c209aaf53 100644
--- a/docs/ja/engines/table-engines/special/generate.md
+++ b/docs/ja/engines/table-engines/special/generate.md
@@ -58,4 +58,4 @@ SELECT * FROM generate_engine_table LIMIT 3
     -   指数
     -   複製
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/join.md b/docs/ja/engines/table-engines/special/join.md
index bf96f64e7fc..300a76297c8 100644
--- a/docs/ja/engines/table-engines/special/join.md
+++ b/docs/ja/engines/table-engines/special/join.md
@@ -108,4 +108,4 @@ SELECT joinGet('id_val_join', 'val', toUInt32(1))
 
 場合はサーバが再起動誤り、データブロックのディスクがいます。 この場合、破損したデータを含むファイルを手動で削除する必要がある場合があります。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/join/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/materializedview.md b/docs/ja/engines/table-engines/special/materializedview.md
index 64b13600bbb..6cfea4249b6 100644
--- a/docs/ja/engines/table-engines/special/materializedview.md
+++ b/docs/ja/engines/table-engines/special/materializedview.md
@@ -9,4 +9,4 @@ toc_title: "\u30DE\u30C6\u30EA\u30A2\u30E9\u30A4\u30BA\u30C9\u30D3\u30E5\u30FC"
 
 マテリアライズドビューの実装に使用されます(詳細については、 [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query)). データを格納するために、ビューの作成時に指定された別のエンジンを使用します。 読み込み時にテーブルから、使用してこのエンジンです。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/memory.md b/docs/ja/engines/table-engines/special/memory.md
index c2b50553023..a09d6658463 100644
--- a/docs/ja/engines/table-engines/special/memory.md
+++ b/docs/ja/engines/table-engines/special/memory.md
@@ -16,4 +16,4 @@ toc_title: "\u30E1\u30E2\u30EA"
 
 メモリーのエンジンを使用するシステムの一時テーブルの外部クエリデータの項をご参照ください “External data for processing a query”グローバルでの実装については、セクションを参照 “IN operators”).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/memory/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/merge.md b/docs/ja/engines/table-engines/special/merge.md
index 0a22b71964e..10248f98060 100644
--- a/docs/ja/engines/table-engines/special/merge.md
+++ b/docs/ja/engines/table-engines/special/merge.md
@@ -67,4 +67,4 @@ FROM WatchLog
 
 -   [仮想列](index.md#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/null.md b/docs/ja/engines/table-engines/special/null.md
index 588500cdcde..328591e6af9 100644
--- a/docs/ja/engines/table-engines/special/null.md
+++ b/docs/ja/engines/table-engines/special/null.md
@@ -11,4 +11,4 @@ Nullテーブルに書き込む場合、データは無視されます。 Null
 
 ただし、Nullテーブルにマテリアライズドビューを作成できます。 したがって、テーブルに書き込まれたデータはビュー内で終了します。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/set.md b/docs/ja/engines/table-engines/special/set.md
index 2b6cd0a2a9e..5b9a2f0adcc 100644
--- a/docs/ja/engines/table-engines/special/set.md
+++ b/docs/ja/engines/table-engines/special/set.md
@@ -16,4 +16,4 @@ INSERTを使用すると、テーブルにデータを挿入できます。 新
 
 ラサーバを再起動し、ブロックのデータのディスクが失われることも想定されます。 後者の場合、破損したデータを含むファイルを手動で削除する必要がある場合があります。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/url.md b/docs/ja/engines/table-engines/special/url.md
index bf920d23be8..ac86f2480db 100644
--- a/docs/ja/engines/table-engines/special/url.md
+++ b/docs/ja/engines/table-engines/special/url.md
@@ -79,4 +79,4 @@ SELECT * FROM url_engine_table
     -   インデックス。
     -   複製。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/ja/engines/table-engines/special/view.md b/docs/ja/engines/table-engines/special/view.md
index 270246bedb9..3ac429b812b 100644
--- a/docs/ja/engines/table-engines/special/view.md
+++ b/docs/ja/engines/table-engines/special/view.md
@@ -9,4 +9,4 @@ toc_title: "\u8868\u793A"
 
 ビューの実装に使用されます(詳細については、 `CREATE VIEW query`). これはデータを格納せず、指定されたデータのみを格納します `SELECT` クエリ。 テーブルから読み取るときに、このクエリが実行されます（クエリから不要な列がすべて削除されます）。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/ja/faq/general.md b/docs/ja/faq/general.md
index e7e3f9328f4..5807ef980bc 100644
--- a/docs/ja/faq/general.md
+++ b/docs/ja/faq/general.md
@@ -57,4 +57,4 @@ $ clickhouse-client --query "SELECT * from table" --format FormatName > result.t
 
 見る [clickhouse-クライアント](../interfaces/cli.md).
 
-{## [元の記事](https://clickhouse.tech/docs/en/faq/general/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/faq/general/) ##}
diff --git a/docs/ja/faq/general/columnar-database.md b/docs/ja/faq/general/columnar-database.md
new file mode 120000
index 00000000000..b7557b62010
--- /dev/null
+++ b/docs/ja/faq/general/columnar-database.md
@@ -0,0 +1 @@
+../../../en/faq/general/columnar-database.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/dbms-naming.md b/docs/ja/faq/general/dbms-naming.md
new file mode 120000
index 00000000000..0df856af0ca
--- /dev/null
+++ b/docs/ja/faq/general/dbms-naming.md
@@ -0,0 +1 @@
+../../../en/faq/general/dbms-naming.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/index.md b/docs/ja/faq/general/index.md
new file mode 120000
index 00000000000..5ff33ccb360
--- /dev/null
+++ b/docs/ja/faq/general/index.md
@@ -0,0 +1 @@
+../../../en/faq/general/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/mapreduce.md b/docs/ja/faq/general/mapreduce.md
new file mode 120000
index 00000000000..49b79ad4841
--- /dev/null
+++ b/docs/ja/faq/general/mapreduce.md
@@ -0,0 +1 @@
+../../../en/faq/general/mapreduce.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/ne-tormozit.md b/docs/ja/faq/general/ne-tormozit.md
new file mode 120000
index 00000000000..a8273c56b2d
--- /dev/null
+++ b/docs/ja/faq/general/ne-tormozit.md
@@ -0,0 +1 @@
+../../../en/faq/general/ne-tormozit.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/olap.md b/docs/ja/faq/general/olap.md
new file mode 120000
index 00000000000..99caa8218c8
--- /dev/null
+++ b/docs/ja/faq/general/olap.md
@@ -0,0 +1 @@
+../../../en/faq/general/olap.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/who-is-using-clickhouse.md b/docs/ja/faq/general/who-is-using-clickhouse.md
new file mode 120000
index 00000000000..b4e9782df7e
--- /dev/null
+++ b/docs/ja/faq/general/who-is-using-clickhouse.md
@@ -0,0 +1 @@
+../../../en/faq/general/who-is-using-clickhouse.md
\ No newline at end of file
diff --git a/docs/ja/faq/general/why-clickhouse-is-so-fast.md b/docs/ja/faq/general/why-clickhouse-is-so-fast.md
new file mode 120000
index 00000000000..77b8c3fcd68
--- /dev/null
+++ b/docs/ja/faq/general/why-clickhouse-is-so-fast.md
@@ -0,0 +1 @@
+../../../en/faq/general/why-clickhouse-is-so-fast.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/file-export.md b/docs/ja/faq/integration/file-export.md
new file mode 120000
index 00000000000..19a5c67148b
--- /dev/null
+++ b/docs/ja/faq/integration/file-export.md
@@ -0,0 +1 @@
+../../../en/faq/integration/file-export.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/index.md b/docs/ja/faq/integration/index.md
new file mode 120000
index 00000000000..8323d6218a3
--- /dev/null
+++ b/docs/ja/faq/integration/index.md
@@ -0,0 +1 @@
+../../../en/faq/integration/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/json-import.md b/docs/ja/faq/integration/json-import.md
new file mode 120000
index 00000000000..e90f4386602
--- /dev/null
+++ b/docs/ja/faq/integration/json-import.md
@@ -0,0 +1 @@
+../../../en/faq/integration/json-import.md
\ No newline at end of file
diff --git a/docs/ja/faq/integration/oracle-odbc.md b/docs/ja/faq/integration/oracle-odbc.md
new file mode 120000
index 00000000000..47fe6189ee3
--- /dev/null
+++ b/docs/ja/faq/integration/oracle-odbc.md
@@ -0,0 +1 @@
+../../../en/faq/integration/oracle-odbc.md
\ No newline at end of file
diff --git a/docs/ja/faq/operations/delete-old-data.md b/docs/ja/faq/operations/delete-old-data.md
new file mode 120000
index 00000000000..aef26953cd3
--- /dev/null
+++ b/docs/ja/faq/operations/delete-old-data.md
@@ -0,0 +1 @@
+../../../en/faq/operations/delete-old-data.md
\ No newline at end of file
diff --git a/docs/ja/faq/operations/index.md b/docs/ja/faq/operations/index.md
new file mode 120000
index 00000000000..fd141164fdc
--- /dev/null
+++ b/docs/ja/faq/operations/index.md
@@ -0,0 +1 @@
+../../../en/faq/operations/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/operations/production.md b/docs/ja/faq/operations/production.md
new file mode 120000
index 00000000000..8203988975c
--- /dev/null
+++ b/docs/ja/faq/operations/production.md
@@ -0,0 +1 @@
+../../../en/faq/operations/production.md
\ No newline at end of file
diff --git a/docs/ja/faq/use-cases/index.md b/docs/ja/faq/use-cases/index.md
new file mode 120000
index 00000000000..cc545acb000
--- /dev/null
+++ b/docs/ja/faq/use-cases/index.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/index.md
\ No newline at end of file
diff --git a/docs/ja/faq/use-cases/key-value.md b/docs/ja/faq/use-cases/key-value.md
new file mode 120000
index 00000000000..63140458d12
--- /dev/null
+++ b/docs/ja/faq/use-cases/key-value.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/key-value.md
\ No newline at end of file
diff --git a/docs/ja/faq/use-cases/time-series.md b/docs/ja/faq/use-cases/time-series.md
new file mode 120000
index 00000000000..55cbcfc243f
--- /dev/null
+++ b/docs/ja/faq/use-cases/time-series.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/time-series.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/amplab-benchmark.md b/docs/ja/getting-started/example-datasets/amplab-benchmark.md
index a3f66e1a0de..23d287d8354 100644
--- a/docs/ja/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/ja/getting-started/example-datasets/amplab-benchmark.md
@@ -126,4 +126,4 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/brown-benchmark.md b/docs/ja/getting-started/example-datasets/brown-benchmark.md
new file mode 120000
index 00000000000..1f6e2be14fa
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/brown-benchmark.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/brown-benchmark.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/cell-towers.md b/docs/ja/getting-started/example-datasets/cell-towers.md
new file mode 120000
index 00000000000..899946803d1
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/cell-towers.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/criteo.md b/docs/ja/getting-started/example-datasets/criteo.md
index 7690b7d966d..8b85ec11313 100644
--- a/docs/ja/getting-started/example-datasets/criteo.md
+++ b/docs/ja/getting-started/example-datasets/criteo.md
@@ -76,4 +76,4 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/github-events.md b/docs/ja/getting-started/example-datasets/github-events.md
new file mode 120000
index 00000000000..c9649c0a61f
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/github-events.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/github-events.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/index.md b/docs/ja/getting-started/example-datasets/index.md
index 302d062eab9..f85cead6582 100644
--- a/docs/ja/getting-started/example-datasets/index.md
+++ b/docs/ja/getting-started/example-datasets/index.md
@@ -17,4 +17,4 @@ toc_title: "イントロダクション"
 -   [ニューヨークタクシ](nyc-taxi.md)
 -   [オンタイム](ontime.md)
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/menus.md b/docs/ja/getting-started/example-datasets/menus.md
new file mode 120000
index 00000000000..d82b3198962
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/menus.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/menus.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/metrica.md b/docs/ja/getting-started/example-datasets/metrica.md
index 5caf32928c3..c51b43ddda0 100644
--- a/docs/ja/getting-started/example-datasets/metrica.md
+++ b/docs/ja/getting-started/example-datasets/metrica.md
@@ -9,14 +9,14 @@ toc_title: "Yandex.Metrica データ"
 Yandex.Metricaについての詳細は [ClickHouse history](../../introduction/history.md) のセクションを参照してください。
 
 データセットは2つのテーブルから構成されており、どちらも圧縮された `tsv.xz` ファイルまたは準備されたパーティションとしてダウンロードすることができます。
-さらに、1億行を含む`hits`テーブルの拡張版が TSVとして https://datasets.clickhouse.tech/hits/tsv/hits_100m_obfuscated_v1.tsv.xz に、準備されたパーティションとして https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz にあります。
+さらに、1億行を含む`hits`テーブルの拡張版が TSVとして https://datasets.clickhouse.com/hits/tsv/hits_100m_obfuscated_v1.tsv.xz に、準備されたパーティションとして https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz にあります。
 
 ## パーティション済みテーブルの取得 {#obtaining-tables-from-prepared-partitions}
 
 hits テーブルのダウンロードとインポート:
 
 ``` bash
-curl -O https://datasets.clickhouse.tech/hits/partitions/hits_v1.tar
+curl -O https://datasets.clickhouse.com/hits/partitions/hits_v1.tar
 tar xvf hits_v1.tar -C /var/lib/clickhouse # ClickHouse のデータディレクトリへのパス
 # 展開されたデータのパーミッションをチェックし、必要に応じて修正します。
 sudo service clickhouse-server restart
@@ -26,7 +26,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 visits のダウンロードとインポート:
 
 ``` bash
-curl -O https://datasets.clickhouse.tech/visits/partitions/visits_v1.tar
+curl -O https://datasets.clickhouse.com/visits/partitions/visits_v1.tar
 tar xvf visits_v1.tar -C /var/lib/clickhouse # ClickHouse のデータディレクトリへのパス
 # 展開されたデータのパーミッションをチェックし、必要に応じて修正します。
 sudo service clickhouse-server restart
@@ -38,7 +38,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
  圧縮TSVファイルのダウンロードと hits テーブルのインポート:
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
 # now create table
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
 clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
@@ -52,7 +52,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 圧縮TSVファイルのダウンロードと visits テーブルのインポート:
 
 ``` bash
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 # now create table
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
 clickhouse-client --query "CREATE TABLE datasets.visits_v1 ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  Goals Nested(ID UInt32, Serial UInt32, EventTime DateTime,  Price Int64,  OrderID String, CurrencyID UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  TraficSource    Nested(ID Int8,  SearchEngineID UInt16, AdvEngineID UInt8, PlaceID UInt16, SocialSourceNetworkID UInt8, Domain String, SearchPhrase String, SocialSourcePage String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  ParsedParams    Nested(Key1 String,  Key2 String,  Key3 String,  Key4 String, Key5 String, ValueDouble    Float64),  Market Nested(Type UInt8, GoalID UInt32, OrderID String,  OrderPrice Int64,  PP UInt32,  DirectPlaceID UInt32,  DirectOrderID  UInt32,  DirectBannerID UInt32,  GoodID String, GoodName String, GoodQuantity Int32,  GoodPrice Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
diff --git a/docs/ja/getting-started/example-datasets/nyc-taxi.md b/docs/ja/getting-started/example-datasets/nyc-taxi.md
index a717b64b2b2..e4864c74358 100644
--- a/docs/ja/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/ja/getting-started/example-datasets/nyc-taxi.md
@@ -286,7 +286,7 @@ SELECT formatReadableSize(sum(bytes)) FROM system.parts WHERE table = 'trips_mer
 ## パーティションされたデータのダウンロード {#download-of-prepared-partitions}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/trips_mergetree/partitions/trips_mergetree.tar
+$ curl -O https://datasets.clickhouse.com/trips_mergetree/partitions/trips_mergetree.tar
 $ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 $ # check permissions of unpacked data, fix if required
 $ sudo service clickhouse-server restart
@@ -388,4 +388,4 @@ Q4:0.072秒
 | 3      | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140    | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/ontime.md b/docs/ja/getting-started/example-datasets/ontime.md
index d12d8a36069..2a951af6026 100644
--- a/docs/ja/getting-started/example-datasets/ontime.md
+++ b/docs/ja/getting-started/example-datasets/ontime.md
@@ -155,7 +155,7 @@ ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | se
 ## パーティション済みデータのダウンロード {#download-of-prepared-partitions}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/ontime/partitions/ontime.tar
+$ 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
@@ -408,4 +408,4 @@ LIMIT 10;
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/opensky.md b/docs/ja/getting-started/example-datasets/opensky.md
new file mode 120000
index 00000000000..4305c0cac3c
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/opensky.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/opensky.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/recipes.md b/docs/ja/getting-started/example-datasets/recipes.md
new file mode 120000
index 00000000000..4fdaa5de5b8
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/recipes.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/recipes.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/star-schema.md b/docs/ja/getting-started/example-datasets/star-schema.md
index a01074ba50a..b8aa38c737f 100644
--- a/docs/ja/getting-started/example-datasets/star-schema.md
+++ b/docs/ja/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/ja/getting-started/example-datasets/uk-price-paid.md b/docs/ja/getting-started/example-datasets/uk-price-paid.md
new file mode 120000
index 00000000000..e48bcf21d7b
--- /dev/null
+++ b/docs/ja/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/uk-price-paid.md
\ No newline at end of file
diff --git a/docs/ja/getting-started/example-datasets/wikistat.md b/docs/ja/getting-started/example-datasets/wikistat.md
index 50d71faf963..0ef80455b66 100644
--- a/docs/ja/getting-started/example-datasets/wikistat.md
+++ b/docs/ja/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,4 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/ja/getting-started/index.md b/docs/ja/getting-started/index.md
index fffa07f2a2c..7c3592318ae 100644
--- a/docs/ja/getting-started/index.md
+++ b/docs/ja/getting-started/index.md
@@ -13,4 +13,4 @@ toc_title: hidden
 -   [詳細なチュートリアル](../getting-started/tutorial.md)
 -   [データセット例を用いて試す](../getting-started/example-datasets/ontime.md)
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/) <!--hide-->
diff --git a/docs/ja/getting-started/install.md b/docs/ja/getting-started/install.md
index 81df2df7da7..7a2a822fe52 100644
--- a/docs/ja/getting-started/install.md
+++ b/docs/ja/getting-started/install.md
@@ -30,7 +30,7 @@ Debian や Ubuntu 用にコンパイル済みの公式パッケージ `deb` を
 
 最新版を使いたい場合は、`stable`を`testing`に置き換えてください。（テスト環境ではこれを推奨します）
 
-同様に、[こちら](https://repo.clickhouse.tech/deb/stable/main/)からパッケージをダウンロードして、手動でインストールすることもできます。
+同様に、[こちら](https://repo.clickhouse.com/deb/stable/main/)からパッケージをダウンロードして、手動でインストールすることもできます。
 
 #### パッケージ {#packages}
 
@@ -47,8 +47,8 @@ CentOS、RedHat、その他すべてのrpmベースのLinuxディストリビュ
 
 ``` bash
 sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
+sudo rpm --import https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG
+sudo yum-config-manager --add-repo https://repo.clickhouse.com/rpm/stable/x86_64
 ```
 
 最新版を使いたい場合は `stable` を `testing` に置き換えてください。(テスト環境ではこれが推奨されています)。`prestable` もしばしば同様に利用できます。
@@ -59,20 +59,20 @@ sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_6
 sudo yum install clickhouse-server clickhouse-client
 ```
 
-同様に、[こちら](https://repo.clickhouse.tech/rpm/stable/x86_64) からパッケージをダウンロードして、手動でインストールすることもできます。
+同様に、[こちら](https://repo.clickhouse.com/rpm/stable/x86_64) からパッケージをダウンロードして、手動でインストールすることもできます。
 
 ### Tgzアーカイブから {#from-tgz-archives}
 
 すべての Linux ディストリビューションで、`deb` や `rpm` パッケージがインストールできない場合は、公式のコンパイル済み `tgz` アーカイブを使用することをお勧めします。
 
-必要なバージョンは、リポジトリ https://repo.clickhouse.tech/tgz/ から `curl` または `wget` でダウンロードできます。その後、ダウンロードしたアーカイブを解凍し、インストールスクリプトでインストールしてください。最新版の例は以下です:
+必要なバージョンは、リポジトリ https://repo.clickhouse.com/tgz/ から `curl` または `wget` でダウンロードできます。その後、ダウンロードしたアーカイブを解凍し、インストールスクリプトでインストールしてください。最新版の例は以下です:
 
 ``` bash
 export LATEST_VERSION=`curl https://api.github.com/repos/ClickHouse/ClickHouse/tags 2>/dev/null | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1`
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-client-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-server-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-client-$LATEST_VERSION.tgz
 
 tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
 sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
@@ -92,16 +92,16 @@ sudo clickhouse-client-$LATEST_VERSION/install/doinst.sh
 
 ### Dockerイメージから {#from-docker-image}
 
-Docker内でClickHouseを実行するには、次の [DockerHub](https://hub.docker.com/r/yandex/clickhouse-server/) のガイドに従います。それらのイメージでは内部で公式の `deb` パッケージを使っています。
+Docker内でClickHouseを実行するには、次の [DockerHub](https://hub.docker.com/r/clickhouse/clickhouse-server/) のガイドに従います。それらのイメージでは内部で公式の `deb` パッケージを使っています。
 
 ### 非標準環境向けの事前コンパイルされたバイナリから {#from-binaries-non-linux}
 
 非LinuxオペレーティングシステムとAArch64 CPUアーキテクチャのために、ClickHouseのビルドは `master` ブランチの最新のコミットからクロスコンパイルされたバイナリを提供しています。(数時間の遅延があります)
 
 
--   [macOS](https://builds.clickhouse.tech/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos/clickhouse' && chmod a+x ./clickhouse`
--   [FreeBSD](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
--   [AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
+-   [macOS](https://builds.clickhouse.com/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/macos/clickhouse' && chmod a+x ./clickhouse`
+-   [FreeBSD](https://builds.clickhouse.com/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
+-   [AArch64](https://builds.clickhouse.com/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
 
 ダウンロード後、`clickhouse client` を使ってサーバーに接続したり、`clickhouse local` を使ってローカルデータを処理したりすることができます。`clickhouse server` を実行するには、GitHubから[server](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.xml)と[users](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/users.xml)の設定ファイルを追加でダウンロードする必要があります。
 
@@ -186,6 +186,6 @@ SELECT 1
 
 **おめでとうございます！システムが動きました！**
 
-動作確認を続けるには、テストデータセットをダウンロードするか、[チュートリアル](https://clickhouse.tech/tutorial.html)を参照してください。
+動作確認を続けるには、テストデータセットをダウンロードするか、[チュートリアル](https://clickhouse.com/tutorial.html)を参照してください。
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/ja/getting-started/playground.md b/docs/ja/getting-started/playground.md
index 3a2e59aa104..905a26d6570 100644
--- a/docs/ja/getting-started/playground.md
+++ b/docs/ja/getting-started/playground.md
@@ -5,7 +5,7 @@ toc_title: Playground
 
 # ClickHouse Playground {#clickhouse-playground}
 
-[ClickHouse Playground](https://play.clickhouse.tech) では、サーバーやクラスタを設定することなく、即座にクエリを実行して ClickHouse を試すことができます。
+[ClickHouse Playground](https://play.clickhouse.com) では、サーバーやクラスタを設定することなく、即座にクエリを実行して ClickHouse を試すことができます。
 いくつかの例のデータセットは、Playground だけでなく、ClickHouse の機能を示すサンプルクエリとして利用可能です. また、 ClickHouse の LTS リリースで試すこともできます。
 
 ClickHouse Playground は、[Yandex.Cloud](https://cloud.yandex.com/)にホストされている m2.small [Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse) インスタンス(4 vCPU, 32 GB RAM) で提供されています。クラウドプロバイダの詳細情報については[こちら](../commercial/cloud.md)。
@@ -17,16 +17,16 @@ ClickHouse をサポートするソフトウェア製品の詳細情報は[こ
 
 | パラメータ                    | 値                                      |
 | :---------------------------- | :-------------------------------------- |
-| HTTPS エンドポイント          | `https://play-api.clickhouse.tech:8443` |
-| ネイティブ TCP エンドポイント | `play-api.clickhouse.tech:9440`         |
+| HTTPS エンドポイント          | `https://play-api.clickhouse.com:8443` |
+| ネイティブ TCP エンドポイント | `play-api.clickhouse.com:9440`         |
 | ユーザ名                      | `playgrounnd`                           |
 | パスワード                    | `clickhouse`                            |
 
 
 特定のClickHouseのリリースで試すために、追加のエンドポイントがあります。（ポートとユーザー/パスワードは上記と同じです）。
 
-- 20.3 LTS: `play-api-v20-3.clickhouse.tech`
-- 19.14 LTS: `play-api-v19-14.clickhouse.tech`
+- 20.3 LTS: `play-api-v20-3.clickhouse.com`
+- 19.14 LTS: `play-api-v19-14.clickhouse.com`
 
 !!! note "備考"
 これらのエンドポイントはすべて、安全なTLS接続が必要です。
@@ -51,13 +51,13 @@ ClickHouse をサポートするソフトウェア製品の詳細情報は[こ
 `curl` を用いて HTTPSエンドポイントへ接続する例:
 
 ``` bash
-curl "https://play-api.clickhouse.tech:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
+curl "https://play-api.clickhouse.com:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
 ```
 
 [CLI](../interfaces/cli.md) で TCP エンドポイントへ接続する例:
 
 ``` bash
-clickhouse client --secure -h play-api.clickhouse.tech --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
+clickhouse client --secure -h play-api.clickhouse.com --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
 ```
 
 ## 実装の詳細 {#implementation-details}
diff --git a/docs/ja/getting-started/tutorial.md b/docs/ja/getting-started/tutorial.md
index 82459944015..f80343cbad6 100644
--- a/docs/ja/getting-started/tutorial.md
+++ b/docs/ja/getting-started/tutorial.md
@@ -92,8 +92,8 @@ ClickHouseサーバーにいくつかのサンプルデータを入れてみま
 ### テーブルデータのダウンロードと展開 {#download-and-extract-table-data}
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 ```
 
 展開されたファイルのサイズは約10GBです。
@@ -687,4 +687,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 他のレプリカはデータを同期させ、再びアクティブになると整合性を修復します。
 この方法では、最近挿入されたデータが失われる可能性が低いことに注意してください。
 
-[元の記事](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/ja/guides/apply-catboost-model.md b/docs/ja/guides/apply-catboost-model.md
index e3adb19c6c7..3fb90d90619 100644
--- a/docs/ja/guides/apply-catboost-model.md
+++ b/docs/ja/guides/apply-catboost-model.md
@@ -236,4 +236,4 @@ FROM
 !!! note "注"
     詳細について [avg()](../sql-reference/aggregate-functions/reference.md#agg_function-avg) と [ログ()](../sql-reference/functions/math-functions.md) 機能。
 
-[元の記事](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/ja/guides/index.md b/docs/ja/guides/index.md
index 585fe7fa983..97d6d4f9ad7 100644
--- a/docs/ja/guides/index.md
+++ b/docs/ja/guides/index.md
@@ -13,4 +13,4 @@ ClickHouseを使用してさまざまなタスクを解決するのに役立つ
 -   [簡単なクラスター設定のチュートリアル](../getting-started/tutorial.md)
 -   [ClickHouseでのCatBoostモデルの適用](apply-catboost-model.md)
 
-[元の記事](https://clickhouse.tech/docs/en/guides/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/guides/) <!--hide-->
diff --git a/docs/ja/index.md b/docs/ja/index.md
index 3c5117b3a2c..b45bb2ba385 100644
--- a/docs/ja/index.md
+++ b/docs/ja/index.md
@@ -94,4 +94,4 @@ OLAPシナリオは、他の一般的なシナリオ（OLTPやKey-Valueアクセ
 
 CPU効率のために、クエリ言語は宣言型（SQLまたはMDX）、または少なくともベクトル（J、K）でなければなりません。 クエリには、最適化を可能にする暗黙的なループのみを含める必要があります。
 
-{## [元の記事](https://clickhouse.tech/docs/en/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/) ##}
diff --git a/docs/ja/interfaces/cli.md b/docs/ja/interfaces/cli.md
index 7037fcf5512..2cc9f6246bb 100644
--- a/docs/ja/interfaces/cli.md
+++ b/docs/ja/interfaces/cli.md
@@ -146,4 +146,4 @@ $ clickhouse-client --param_tuple_in_tuple="(10, ('dt', 10))" -q "SELECT * FROM
 </config>
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/cli/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/cli/) <!--hide-->
diff --git a/docs/ja/interfaces/cpp.md b/docs/ja/interfaces/cpp.md
index caec195e85d..468b2a90fc0 100644
--- a/docs/ja/interfaces/cpp.md
+++ b/docs/ja/interfaces/cpp.md
@@ -9,4 +9,4 @@ toc_title: "C++\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30E9\u30A4"
 
 のREADMEを参照してください [クリックハウス-cpp](https://github.com/ClickHouse/clickhouse-cpp) リポジトリ。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/cpp/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/cpp/) <!--hide-->
diff --git a/docs/ja/interfaces/formats.md b/docs/ja/interfaces/formats.md
index 35cfd4f67fb..bebfd438c1e 100644
--- a/docs/ja/interfaces/formats.md
+++ b/docs/ja/interfaces/formats.md
@@ -26,7 +26,6 @@ aの結果 `SELECT`、および実行する `INSERT`ファイルバックアッ
 | [カスタム区切り](#format-customseparated)                       | ✔    | ✔    |
 | [値](#data-format-values)                                       | ✔    | ✔    |
 | [垂直](#vertical)                                               | ✗    | ✔    |
-| [VerticalRaw](#verticalraw)                                     | ✗    | ✔    |
 | [JSON](#json)                                                   | ✗    | ✔    |
 | [JSONCompact](#jsoncompact)                                     | ✗    | ✔    |
 | [JSONEachRow](#jsoneachrow)                                     | ✔    | ✔    |
@@ -819,10 +818,6 @@ test: string with 'quotes' and      with some special
 
 この形式は、クエリ結果の出力にのみ適していますが、解析(テーブルに挿入するデータの取得)には適していません。
 
-## VerticalRaw {#verticalraw}
-
-に類似した [垂直](#vertical) しかし、エスケープ無効で。 この形式は、クエリ結果の出力にのみ適しており、解析（データの受信とテーブルへの挿入）には適していません。
-
 ## XML {#xml}
 
 XML形式は出力にのみ適しており、解析には適していません。 例:
@@ -1210,4 +1205,4 @@ e.g. `schemafile.proto:MessageType`.
 -解析エラーの場合 `JSONEachRow` 新しい行(またはEOF)まですべてのデータをスキップします。 `\n` エラーを正しく数える。
 - `Template` と `CustomSeparated` 最後の列の後にdelimiterを使用し、行の間にdelimiterを使用すると、次の行の先頭を見つけることができます。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/formats/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/formats/) <!--hide-->
diff --git a/docs/ja/interfaces/http.md b/docs/ja/interfaces/http.md
index 84850c159a4..4ac9cd9e472 100644
--- a/docs/ja/interfaces/http.md
+++ b/docs/ja/interfaces/http.md
@@ -614,4 +614,4 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 * Connection #0 to host localhost left intact
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/http_interface/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/http_interface/) <!--hide-->
diff --git a/docs/ja/interfaces/index.md b/docs/ja/interfaces/index.md
index bf93b4f8f66..860742d8290 100644
--- a/docs/ja/interfaces/index.md
+++ b/docs/ja/interfaces/index.md
@@ -26,4 +26,4 @@ ClickHouseを操作するための幅広いサードパーティのライブラ
 -   [統合](third-party/integrations.md)
 -   [視界面](third-party/gui.md)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/) <!--hide-->
diff --git a/docs/ja/interfaces/jdbc.md b/docs/ja/interfaces/jdbc.md
index 6dc8f36c58d..077c4a13a17 100644
--- a/docs/ja/interfaces/jdbc.md
+++ b/docs/ja/interfaces/jdbc.md
@@ -12,4 +12,4 @@ toc_title: "JDBC\u30C9\u30E9\u30A4\u30D0"
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/jdbc/) <!--hide-->
diff --git a/docs/ja/interfaces/mysql.md b/docs/ja/interfaces/mysql.md
index 21a3f0fb98a..30eb3bc7618 100644
--- a/docs/ja/interfaces/mysql.md
+++ b/docs/ja/interfaces/mysql.md
@@ -46,4 +46,4 @@ mysql>
 
 -   一部のデータ型は文字列として送信されます
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/ja/interfaces/odbc.md b/docs/ja/interfaces/odbc.md
index a40047eb04f..570d53df791 100644
--- a/docs/ja/interfaces/odbc.md
+++ b/docs/ja/interfaces/odbc.md
@@ -9,4 +9,4 @@ toc_title: "ODBC\u30C9\u30E9\u30A4\u30D0"
 
 -   [公式ドライバー](https://github.com/ClickHouse/clickhouse-odbc).
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/odbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/odbc/) <!--hide-->
diff --git a/docs/ja/interfaces/tcp.md b/docs/ja/interfaces/tcp.md
index 6f7df838be6..549a031bf6b 100644
--- a/docs/ja/interfaces/tcp.md
+++ b/docs/ja/interfaces/tcp.md
@@ -9,4 +9,4 @@ toc_title: "\u30CD\u30A4\u30C6\u30A3\u30D6\u30A4)"
 
 ネイティブプロトコルは [コマンド行クライアント](cli.md)、分散クエリ処理中のサーバー間通信、および他のC++プログラムでも使用できます。 残念ながら、ネイティブClickHouseプロトコルは形式的仕様記述を利用できるバーからClickHouseソースコードを開始 [この辺り](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client) や傍受し、分析すTCPます。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/client-libraries.md b/docs/ja/interfaces/third-party/client-libraries.md
index c7bd368bc4c..d7766687f23 100644
--- a/docs/ja/interfaces/third-party/client-libraries.md
+++ b/docs/ja/interfaces/third-party/client-libraries.md
@@ -59,4 +59,4 @@ toc_title: "\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8"
 -   Nim
     -   [ニム-クリックハウス](https://github.com/leonardoce/nim-clickhouse)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/gui.md b/docs/ja/interfaces/third-party/gui.md
index 13b178984d3..d10bec7af5f 100644
--- a/docs/ja/interfaces/third-party/gui.md
+++ b/docs/ja/interfaces/third-party/gui.md
@@ -153,4 +153,4 @@ toc_title: "\u8996\u754C\u9762"
 
 [LookerでClickHouseを設定する方法。](https://docs.looker.com/setup-and-management/database-config/clickhouse)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/integrations.md b/docs/ja/interfaces/third-party/integrations.md
index 1cf996a3011..58ff96c728d 100644
--- a/docs/ja/interfaces/third-party/integrations.md
+++ b/docs/ja/interfaces/third-party/integrations.md
@@ -44,7 +44,7 @@ toc_title: "\u7D71\u5408"
         -   [mfedotov/クリックハウス](https://forge.puppet.com/mfedotov/clickhouse)
 -   監視
     -   [黒鉛](https://graphiteapp.org)
-        -   [グラファウス](https://github.com/yandex/graphouse)
+        -   [グラファウス](https://github.com/ClickHouse/graphouse)
         -   [カーボンクリックハウス](https://github.com/lomik/carbon-clickhouse)
         -   [グラファイト-クリック](https://github.com/lomik/graphite-clickhouse)
         -   [黒鉛-ch-オプティマイザー](https://github.com/innogames/graphite-ch-optimizer) -staled仕切りを最大限に活用する [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) からのルールの場合 [ロールアップ構成](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) 応用できます
@@ -107,4 +107,4 @@ toc_title: "\u7D71\u5408"
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/ja/interfaces/third-party/proxy.md b/docs/ja/interfaces/third-party/proxy.md
index e817b743787..5bd5b042d7b 100644
--- a/docs/ja/interfaces/third-party/proxy.md
+++ b/docs/ja/interfaces/third-party/proxy.md
@@ -43,4 +43,4 @@ Goで実装。
 
 Goで実装。
 
-[元の記事](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/ja/introduction/adopters.md b/docs/ja/introduction/adopters.md
index a1a89f6795f..6f878bf1dfe 100644
--- a/docs/ja/introduction/adopters.md
+++ b/docs/ja/introduction/adopters.md
@@ -13,11 +13,11 @@ toc_title: "\u30A2\u30C0\u30D7\u30BF\u30FC"
 | 会社                                                                                           | 産業                         | Usecase              | 集りのサイズ                                      | (Un)圧縮データサイズ<abbr title="of single replica"><sup>\*</sup></abbr> | 参照                                                                                                                                                                                                              |
 |------------------------------------------------------------------------------------------------|------------------------------|----------------------|---------------------------------------------------|--------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <a href="https://2gis.ru" class="favicon">2gis</a>                                             | 地図                         | 監視                 | —                                                 | —                                                                        | [2019年ロシア語](https://youtu.be/58sPkXfq6nw)                                                                                                                                                                    |
-| <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a>                          | モバイルアプリ               | ブラウザバックエンド | —                                                 | —                                                                        | [ロシア語でのスライド,月2019](https://github.com/yandex/clickhouse-presentations/blob/master/meetup22/aloha.pdf)                                                                                                  |
+| <a href="https://alohabrowser.com/" class="favicon">Aloha Browser</a>                          | モバイルアプリ               | ブラウザバックエンド | —                                                 | —                                                                        | [ロシア語でのスライド,月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/aloha.pdf)                                                                                                  |
 | <a href="https://amadeus.com/" class="favicon">アマデウス</a>                                  | 旅行                         | 分析                 | —                                                 | —                                                                        | [プレスリリース,April2018](https://www.altinity.com/blog/2018/4/5/amadeus-technologies-launches-investment-and-insights-tool-based-on-machine-learning-and-strategy-algorithms)                                   |
 | <a href="https://www.appsflyer.com" class="favicon">Appsflyer</a>                              | モバイル分析                 | 主な製品             | —                                                 | —                                                                        | [2019年ロシア語](https://www.youtube.com/watch?v=M3wbRlcpBbY)                                                                                                                                                     |
 | <a href="https://arenadata.tech/" class="favicon">ArenaData</a>                                | データ基盤                   | 主な製品             | —                                                 | —                                                                        | [2019年ロシア](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup38/indexes.pdf)                                                                                                           |
-| <a href="https://badoo.com" class="favicon">バドゥ</a>                                         | デート                       | 時系列               | —                                                 | —                                                                        | [2019年ロシア](https://presentations.clickhouse.tech/meetup38/forecast.pdf)                                                                                                                                       |
+| <a href="https://badoo.com" class="favicon">バドゥ</a>                                         | デート                       | 時系列               | —                                                 | —                                                                        | [2019年ロシア](https://presentations.clickhouse.com/meetup38/forecast.pdf)                                                                                                                                       |
 | <a href="https://www.benocs.com/" class="favicon">ベノク</a>                                   | ネットワークテレメトリと分析 | 主な製品             | —                                                 | —                                                                        | [スライド英語,October2017](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup9/lpm.pdf)                                                                                                    |
 | <a href="https://www.bloomberg.com/" class="favicon">ブルームバーグ</a>                        | 金融、メディア               | 監視                 | 102サーバー                                       | —                                                                        | [スライド2018](https://www.slideshare.net/Altinity/http-analytics-for-6m-requests-per-second-using-clickhouse-by-alexander-bocharov)                                                                              |
 | <a href="https://bloxy.info" class="favicon">Bloxy</a>                                         | Blockchain                   | 分析                 | —                                                 | —                                                                        | [ロシア語でのスライド,八月2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/4_bloxy.pptx)                                                                                         |
@@ -37,7 +37,7 @@ toc_title: "\u30A2\u30C0\u30D7\u30BF\u30FC"
 | <a href="https://www.exness.com" class="favicon">Exness</a>                                    | 取引                         | 指標、ロギング       | —                                                 | —                                                                        | [ロシア語で話す,May2019](https://youtu.be/_rpU-TvSfZ8?t=3215)                                                                                                                                                     |
 | <a href="https://geniee.co.jp" class="favicon">魔神</a>                                        | 広告ネットワーク             | 主な製品             | —                                                 | —                                                                        | [ブログ投稿日本語,July2017](https://tech.geniee.co.jp/entry/2017/07/20/160100)                                                                                                                                    |
 | <a href="https://www.huya.com/" class="favicon">HUYA</a>                                       | ビデオストリーミング         | 分析                 | —                                                 | —                                                                        | [中国語でのスライド,October2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf)                                       |
-| <a href="https://www.idealista.com" class="favicon">イデアリスタ</a>                           | 不動産                       | 分析                 | —                                                 | —                                                                        | [ブログ投稿英語,April2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                         |
+| <a href="https://www.idealista.com" class="favicon">イデアリスタ</a>                           | 不動産                       | 分析                 | —                                                 | —                                                                        | [ブログ投稿英語,April2019](https://clickhouse.com/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                         |
 | <a href="https://www.infovista.com/" class="favicon">インフォビスタ</a>                        | ネット                       | 分析                 | —                                                 | —                                                                        | [2019年のスライド](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf)                                                                                                     |
 | <a href="https://www.innogames.com" class="favicon">InnoGames</a>                              | ゲーム                       | 指標、ロギング       | —                                                 | —                                                                        | [2019年ロシア](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf)                                                                                           |
 | <a href="https://integros.com" class="favicon">インテグロス</a>                                | Platformビデオサービス       | 分析                 | —                                                 | —                                                                        | [ロシア語でのスライド,月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                         |
@@ -66,15 +66,15 @@ toc_title: "\u30A2\u30C0\u30D7\u30BF\u30FC"
 | <a href="https://www.splunk.com/" class="favicon">Splunk</a>                                   | ビジネス分析                 | 主な製品             | —                                                 | —                                                                        | [2018年のスライド](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup12/splunk.pdf)                                                                                                        |
 | <a href="https://www.spotify.com" class="favicon">Spotify</a>                                  | 音楽                         | 実験                 | —                                                 | —                                                                        | [スライド2018](https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173)                                                                                                                  |
 | <a href="https://www.tencent.com" class="favicon">テンセント</a>                               | ビッグデータ                 | データ処理           | —                                                 | —                                                                        | [中国語でのスライド,October2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/5.%20ClickHouse大数据集群应用_李俊飞腾讯网媒事业部.pdf)                                              |
-| <a href="https://www.uber.com" class="favicon">Uber</a>                                        | タクシー                     | ロギング             | —                                                 | —                                                                        | [スライド2020](https://presentations.clickhouse.tech/meetup40/uber.pdf)                                                                                                                                           |
+| <a href="https://www.uber.com" class="favicon">Uber</a>                                        | タクシー                     | ロギング             | —                                                 | —                                                                        | [スライド2020](https://presentations.clickhouse.com/meetup40/uber.pdf)                                                                                                                                           |
 | <a href="https://vk.com" class="favicon">VKontakte</a>                                         | ソーシャルネ                 | 統計、ロギング       | —                                                 | —                                                                        | [ロシア語でのスライド,八月2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/3_vk.pdf)                                                                                             |
 | <a href="https://wisebits.com/" class="favicon">Wisebits</a>                                   | ITソリューショ               | 分析                 | —                                                 | —                                                                        | [ロシア語でのスライド,月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                         |
 | <a href="http://www.xiaoxintech.cn/" class="favicon">Xiaoxin Tech</a>                          | 教育                         | 共通の目的           | —                                                 | —                                                                        | [2019年のスライド](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/sync-clickhouse-with-mysql-mongodb.pptx)                                                                           |
 | <a href="https://www.ximalaya.com/" class="favicon">シマラヤ</a>                               | オーディオ共有               | OLAP                 | —                                                 | —                                                                        | [2019年のスライド](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/ximalaya.pdf)                                                                                                      |
 | <a href="https://cloud.yandex.ru/services/managed-clickhouse" class="favicon">Yandex Cloud</a> | パブリック                   | 主な製品             | —                                                 | —                                                                        | [2019年ロシア語](https://www.youtube.com/watch?v=pgnak9e_E0o)                                                                                                                                                     |
-| <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a>        | ビジネス情報                 | 主な製品             | —                                                 | —                                                                        | [2019年ロシア](https://presentations.clickhouse.tech/meetup38/datalens.pdf)                                                                                                                                       |
+| <a href="https://cloud.yandex.ru/services/datalens" class="favicon">Yandex DataLens</a>        | ビジネス情報                 | 主な製品             | —                                                 | —                                                                        | [2019年ロシア](https://presentations.clickhouse.com/meetup38/datalens.pdf)                                                                                                                                       |
 | <a href="https://market.yandex.ru/" class="favicon">Yandex Market</a>                          | eコマース                    | 指標、ロギング       | —                                                 | —                                                                        | [2019年ロシア語](https://youtu.be/_l1qP0DyBcA?t=478)                                                                                                                                                              |
-| <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a>                        | ウェブ分析                   | 主な製品             | 一つのクラスタに360台、一つの部門に1862台のサーバ | 66.41PiB/5.68PiB                                                         | [スライド2020](https://presentations.clickhouse.tech/meetup40/introduction/#13)                                                                                                                                   |
+| <a href="https://metrica.yandex.com" class="favicon">Yandex Metrica</a>                        | ウェブ分析                   | 主な製品             | 一つのクラスタに360台、一つの部門に1862台のサーバ | 66.41PiB/5.68PiB                                                         | [スライド2020](https://presentations.clickhouse.com/meetup40/introduction/#13)                                                                                                                                   |
 | <a href="https://htc-cs.ru/" class="favicon">ЦВТ</a>                                           | ソフトウェア開発             | 指標、ロギング       | —                                                 | —                                                                        | [ブログ投稿,月2019,ロシア語で](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk)                                                                                                  |
 | <a href="https://mkb.ru/" class="favicon">МКБ</a>                                              | 銀行                         | Webシステム監視      | —                                                 | —                                                                        | [2019年ロシア](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf)                                                                                                               |
 | <a href="https://jinshuju.net" class="favicon">Jinshuju 金数据</a>                             | BI分析                       | 主な製品             | —                                                 | —                                                                        | [2019年の中国](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/3.%20金数据数据架构调整方案Public.pdf)                                                                                 |
@@ -83,4 +83,4 @@ toc_title: "\u30A2\u30C0\u30D7\u30BF\u30FC"
 | <a href="https://crazypanda.ru/en/" class="favicon">Crazypanda</a>                             | ゲーム                       |                      | —                                                 | —                                                                        | ClickHouse meetupのライブセッション                                                                                                                                                                               |
 | <a href="https://fun.co/rp" class="favicon">FunCorp</a>                                        | ゲーム                       |                      | —                                                 | —                                                                        | [記事](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse)                                                                                                                                       |
 
-[元の記事](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/ja/introduction/distinctive-features.md b/docs/ja/introduction/distinctive-features.md
index 88dc91e0a3b..154b7d6ace3 100644
--- a/docs/ja/introduction/distinctive-features.md
+++ b/docs/ja/introduction/distinctive-features.md
@@ -69,4 +69,4 @@ ClickHouseには、精度を犠牲にしてパフォーマンスを得るため
 2.  既に挿入されたデータの変更または削除を、高頻度かつ低遅延に行う機能はありません。 [GDPR](https://gdpr-info.eu)に準拠するなど、データをクリーンアップまたは変更するために、バッチ削除およびバッチ更新が利用可能です。
 3.  インデックスが疎であるため、ClickHouseは、キーで単一行を取得するようなクエリにはあまり適していません。
 
-[Original article](https://clickhouse.tech/docs/en/introduction/distinctive_features/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/ja/introduction/history.md b/docs/ja/introduction/history.md
index 162ed3ba415..c1f82c0b2cf 100644
--- a/docs/ja/introduction/history.md
+++ b/docs/ja/introduction/history.md
@@ -48,4 +48,4 @@ Yandex.Metricaには、Metrageと呼ばれるデータを集計するための
 
 OLAPServerの制限を取り除き、レポートのための非集計データを扱う問題を解決するために、私達は ClickHouse DBMSを開発しました。
 
-[Original article](https://clickhouse.tech/docs/en/introduction/history/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/introduction/history/) <!--hide-->
diff --git a/docs/ja/introduction/performance.md b/docs/ja/introduction/performance.md
index 7750a10c0ec..412ddb65211 100644
--- a/docs/ja/introduction/performance.md
+++ b/docs/ja/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: "\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9"
 
 # パフォーマンス {#pahuomansu}
 
-Yandexの内部テスト結果によると、ClickHouseは、テスト可能なクラスのシステム間で同等の動作シナリオで最高のパフォーマンス(長時間のクエリで最も高いスループットと、短時間のクエリで最小のレイテンシの両方)を示します。 [別のページで](https://clickhouse.tech/benchmark/dbms/)テスト結果を表示できます 。
+Yandexの内部テスト結果によると、ClickHouseは、テスト可能なクラスのシステム間で同等の動作シナリオで最高のパフォーマンス(長時間のクエリで最も高いスループットと、短時間のクエリで最小のレイテンシの両方)を示します。 [別のページで](https://clickhouse.com/benchmark/dbms/)テスト結果を表示できます 。
 
-これは、多数の独立したベンチマークでも確認されています。インターネット検索で見つけることは難しくありませんし、 [私達がまとめた関連リンク集](https://clickhouse.tech/#independent-benchmarks) から見つけることもできます。
+これは、多数の独立したベンチマークでも確認されています。インターネット検索で見つけることは難しくありませんし、 [私達がまとめた関連リンク集](https://clickhouse.com/#independent-benchmarks) から見つけることもできます。
 
 ## 単一の巨大なクエリのスループット {#dan-yi-noju-da-nakuerinosurupututo}
 
@@ -27,4 +27,4 @@ Yandexの内部テスト結果によると、ClickHouseは、テスト可能な
 
 少なくとも1000行のパケットにデータを挿入することをお勧めします。または、1秒あたり1回のリクエストを超えないでください。タブ区切りのダンプデータをMergeTreeテーブルに挿入する場合、挿入速度は50〜200MB/sになります。挿入された行のサイズが約1Kbの場合、速度は毎秒50,000〜200,000行になります。行が小さい場合、パフォーマンスは1秒あたりの行数で高くなります(Banner System データ- `>` 500,000行/秒、Graphite データ- `>` 1,000,000行/秒)。パフォーマンスを向上させるために、複数のINSERTクエリを並行して作成することで、パフォーマンスを線形に向上できます。
 
-[Original article](https://clickhouse.tech/docs/ja/introduction/performance/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ja/introduction/performance/) <!--hide-->
diff --git a/docs/ja/operations/access-rights.md b/docs/ja/operations/access-rights.md
index c3fea6bfe5c..9b11d95033e 100644
--- a/docs/ja/operations/access-rights.md
+++ b/docs/ja/operations/access-rights.md
@@ -141,4 +141,4 @@ Roleは、ユーザーアカウントに付与できるaccessエンティティ
 
     デフォルトのSQL型のアクセス制御及び特別口座の口座管理オのすべてのユーザー ユーザーを設定する必要があります。 `users.xml` に1を割り当てます。 [access_management](settings/settings-users.md#access_management-user-setting) 設定。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/ja/operations/backup.md b/docs/ja/operations/backup.md
index b0cde00e23c..208c535eb57 100644
--- a/docs/ja/operations/backup.md
+++ b/docs/ja/operations/backup.md
@@ -38,4 +38,4 @@ ClickHouseは、 `ALTER TABLE ... FREEZE PARTITION ...` クエリをコピーの
 
 第三者ツールを自動化するこのアプローチ: [clickhouse-バックアップ](https://github.com/AlexAkulov/clickhouse-backup).
 
-[元の記事](https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/ja/operations/caches.md b/docs/ja/operations/caches.md
new file mode 120000
index 00000000000..ab229298e5f
--- /dev/null
+++ b/docs/ja/operations/caches.md
@@ -0,0 +1 @@
+../../en/operations/caches.md
\ No newline at end of file
diff --git a/docs/ja/operations/clickhouse-keeper.md b/docs/ja/operations/clickhouse-keeper.md
new file mode 120000
index 00000000000..528ba82fea4
--- /dev/null
+++ b/docs/ja/operations/clickhouse-keeper.md
@@ -0,0 +1 @@
+../../en/operations/clickhouse-keeper.md
\ No newline at end of file
diff --git a/docs/ja/operations/configuration-files.md b/docs/ja/operations/configuration-files.md
index b269508f408..f170ceab907 100644
--- a/docs/ja/operations/configuration-files.md
+++ b/docs/ja/operations/configuration-files.md
@@ -20,7 +20,7 @@ ClickHouseは複数のファイル構成管理をサポートします。 主サ
 
 もし `remove` 指定されると、要素を削除します。
 
-この設定はまた、 “substitutions”. 要素が `incl` 属性は、ファイルからの対応する置換が値として使用されます。 デフォルトでは、ファイルへのパスとの置換を行う `/etc/metrika.xml`. これはで変えることができます [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from) サーバー設定の要素。 置換値は、次のように指定されます `/yandex/substitution_name` このファイル内の要素。 で指定された置換の場合 `incl` 存在しない場合は、ログに記録されます。 ClickHouseが不足している置換をログに記録しないようにするには、 `optional="true"` 属性(たとえば、 [マクロ](server-configuration-parameters/settings.md)).
+この設定はまた、 “substitutions”. 要素が `incl` 属性は、ファイルからの対応する置換が値として使用されます。 デフォルトでは、ファイルへのパスとの置換を行う `/etc/metrika.xml`. これはで変えることができます [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from) サーバー設定の要素。 置換値は、次のように指定されます `/clickhouse/substitution_name` このファイル内の要素。 で指定された置換の場合 `incl` 存在しない場合は、ログに記録されます。 ClickHouseが不足している置換をログに記録しないようにするには、 `optional="true"` 属性(たとえば、 [マクロ](server-configuration-parameters/settings.md)).
 
 置換はZooKeeperからも実行できます。 これを行うには、属性を指定します `from_zk = "/path/to/node"`. 要素の値は、ノードの内容に置き換えられます。 `/path/to/node` 飼育係で。 また、ZooKeeperノードにXMLサブツリー全体を配置することもできます。
 
@@ -54,4 +54,4 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 サーバーは、設定ファイルの変更、置換および上書きの実行時に使用されたファイルおよびZooKeeperノードを追跡し、ユーザーおよびクラスターの設定をその場で再ロード つまり、サーバーを再起動せずにクラスター、ユーザー、およびその設定を変更できます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/configuration_files/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/configuration_files/) <!--hide-->
diff --git a/docs/ja/operations/external-authenticators/index.md b/docs/ja/operations/external-authenticators/index.md
new file mode 120000
index 00000000000..5f656246c9d
--- /dev/null
+++ b/docs/ja/operations/external-authenticators/index.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/index.md
\ No newline at end of file
diff --git a/docs/ja/operations/external-authenticators/kerberos.md b/docs/ja/operations/external-authenticators/kerberos.md
new file mode 120000
index 00000000000..b5a4d557de4
--- /dev/null
+++ b/docs/ja/operations/external-authenticators/kerberos.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/kerberos.md
\ No newline at end of file
diff --git a/docs/ja/operations/external-authenticators/ldap.md b/docs/ja/operations/external-authenticators/ldap.md
new file mode 120000
index 00000000000..a171d0ac05a
--- /dev/null
+++ b/docs/ja/operations/external-authenticators/ldap.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/ldap.md
\ No newline at end of file
diff --git a/docs/ja/operations/index.md b/docs/ja/operations/index.md
index 3fc7d869800..dcc5479bda8 100644
--- a/docs/ja/operations/index.md
+++ b/docs/ja/operations/index.md
@@ -25,4 +25,4 @@ ClickHouse操作マニュアルの以下の主要部:
 -   [設定](settings/index.md)
 -   [ユーティリ](utilities/index.md)
 
-{## [元の記事](https://clickhouse.tech/docs/en/operations/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/operations/) ##}
diff --git a/docs/ja/operations/opentelemetry.md b/docs/ja/operations/opentelemetry.md
new file mode 120000
index 00000000000..a4d96e36a4e
--- /dev/null
+++ b/docs/ja/operations/opentelemetry.md
@@ -0,0 +1 @@
+../../en/operations/opentelemetry.md
\ No newline at end of file
diff --git a/docs/ja/operations/performance-test.md b/docs/ja/operations/performance-test.md
index a60a8872a16..068eb4fbc04 100644
--- a/docs/ja/operations/performance-test.md
+++ b/docs/ja/operations/performance-test.md
@@ -48,7 +48,7 @@ toc_title: "\u30CF\u30FC\u30C9\u30A6\u30A7\u30A2\u8A66\u9A13"
 
 <!-- -->
 
-      wget https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz
+      wget https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz
       tar xvf hits_100m_obfuscated_v1.tar.xz -C .
       mv hits_100m_obfuscated_v1/* .
 
diff --git a/docs/ja/operations/quotas.md b/docs/ja/operations/quotas.md
index bca708cd041..2de45397350 100644
--- a/docs/ja/operations/quotas.md
+++ b/docs/ja/operations/quotas.md
@@ -109,4 +109,4 @@ toc_title: "\u30AF\u30A9\u30FC\u30BF"
 
 サーバーを再起動すると、クォータがリセットされます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/ja/operations/server-configuration-parameters/index.md b/docs/ja/operations/server-configuration-parameters/index.md
index f8e63412a1c..77f406482e8 100644
--- a/docs/ja/operations/server-configuration-parameters/index.md
+++ b/docs/ja/operations/server-configuration-parameters/index.md
@@ -16,4 +16,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 設定を勉強する前に、 [設定ファイル](../configuration-files.md#configuration_files) セクションと置換の使用に注意してください( `incl` と `optional` 属性）。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/ja/operations/server-configuration-parameters/settings.md b/docs/ja/operations/server-configuration-parameters/settings.md
index f544a92e377..7e0d5ebcc22 100644
--- a/docs/ja/operations/server-configuration-parameters/settings.md
+++ b/docs/ja/operations/server-configuration-parameters/settings.md
@@ -284,12 +284,12 @@ ClickHouseサーバー間でデータを交換するポート。
 
 ## keep_alive_timeout {#keep-alive-timeout}
 
-ClickHouseが接続を閉じる前に受信要求を待機する秒数。 既定値は3秒です。
+ClickHouseが接続を閉じる前に受信要求を待機する秒数。 既定値は10秒です。
 
 **例**
 
 ``` xml
-<keep_alive_timeout>3</keep_alive_timeout>
+<keep_alive_timeout>10</keep_alive_timeout>
 ```
 
 ## listen_host {#server_configuration_parameters-listen_host}
@@ -903,4 +903,4 @@ ClickHouse内部DNSキャッシュに格納されているIPアドレスの更
 
 -   [アクセス制御とアカウント管理](../access-rights.md#access-control)
 
-[元の記事](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/ja/operations/settings/constraints-on-settings.md b/docs/ja/operations/settings/constraints-on-settings.md
index da7371564b4..4c73fdb3667 100644
--- a/docs/ja/operations/settings/constraints-on-settings.md
+++ b/docs/ja/operations/settings/constraints-on-settings.md
@@ -72,4 +72,4 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **注:** その `default` プロファイルには特別な処理があります。 `default` プロのデフォルトの制約、その制限するすべてのユーザーまでの彼らのメソッドを明示的にこれらのユーザー
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/ja/operations/settings/index.md b/docs/ja/operations/settings/index.md
index f64c339ef9e..da8343484d2 100644
--- a/docs/ja/operations/settings/index.md
+++ b/docs/ja/operations/settings/index.md
@@ -30,4 +30,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 
 サーバー設定ファイルでのみ行うことができる設定は、このセクションでは説明しません。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/ja/operations/settings/merge-tree-settings.md b/docs/ja/operations/settings/merge-tree-settings.md
new file mode 120000
index 00000000000..51825e80601
--- /dev/null
+++ b/docs/ja/operations/settings/merge-tree-settings.md
@@ -0,0 +1 @@
+../../../en/operations/settings/merge-tree-settings.md
\ No newline at end of file
diff --git a/docs/ja/operations/settings/permissions-for-queries.md b/docs/ja/operations/settings/permissions-for-queries.md
index d77bed96464..48bd2d06506 100644
--- a/docs/ja/operations/settings/permissions-for-queries.md
+++ b/docs/ja/operations/settings/permissions-for-queries.md
@@ -58,4 +58,4 @@ toc_title: "\u30AF\u30A8\u30EA\u306E\u6A29\u9650"
 
 デフォルト値:1
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/ja/operations/settings/query-complexity.md b/docs/ja/operations/settings/query-complexity.md
index f98e55ef572..d893bd7ee60 100644
--- a/docs/ja/operations/settings/query-complexity.md
+++ b/docs/ja/operations/settings/query-complexity.md
@@ -298,4 +298,4 @@ ClickHouseは、制限に達したときにさまざまなアクションを続
 
 > “Too many partitions for single INSERT block (more than” +toString(max_parts)+ “). The limit is controlled by ‘max_partitions_per_insert_block’ setting. A large number of partitions is a common misconception. It will lead to severe negative performance impact, including slow server startup, slow INSERT queries and slow SELECT queries. Recommended total number of partitions for a table is under 1000..10000. Please note, that partitioning is not intended to speed up SELECT queries (ORDER BY key is sufficient to make range queries fast). Partitions are intended for data manipulation (DROP PARTITION, etc).”
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/ja/operations/settings/settings-profiles.md b/docs/ja/operations/settings/settings-profiles.md
index 09f10a231cf..dfbb4f1df85 100644
--- a/docs/ja/operations/settings/settings-profiles.md
+++ b/docs/ja/operations/settings/settings-profiles.md
@@ -78,4 +78,4 @@ SET profile = 'web'
 
 その `web` プロファイルは通常のプロファイルです。 `SET` クエリまたはHTTPクエリでURLパラメータを使用する。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/ja/operations/settings/settings-users.md b/docs/ja/operations/settings/settings-users.md
index dc72c6ceb6f..65545790614 100644
--- a/docs/ja/operations/settings/settings-users.md
+++ b/docs/ja/operations/settings/settings-users.md
@@ -161,4 +161,4 @@ toc_title: "\u30E6\u30FC\u30B6\u30FC\u8A2D\u5B9A"
 
 その `filter` 任意の式にすることができます。 [UInt8](../../sql-reference/data-types/int-uint.md)-タイプ値。 通常、比較演算子と論理演算子が含まれています。 からの行 `database_name.table1` る結果をフィルターを0においても返却いたしませんこのユーザーです。 このフィルタリングは `PREWHERE` 操作と無効 `WHERE→PREWHERE` 最適化。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/ja/operations/settings/settings.md b/docs/ja/operations/settings/settings.md
index 8ba30f318ab..91c442d3165 100644
--- a/docs/ja/operations/settings/settings.md
+++ b/docs/ja/operations/settings/settings.md
@@ -1235,4 +1235,4 @@ PREWHERE/WHEREにシャーディングキー条件があるSELECTクエリの未
 
 デフォルト値は16です。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
+[元の記事](https://clickhouse.com/docs/en/operations/settings/settings/) <!-- hide -->
diff --git a/docs/ja/operations/storing-data.md b/docs/ja/operations/storing-data.md
new file mode 120000
index 00000000000..16722fb5a39
--- /dev/null
+++ b/docs/ja/operations/storing-data.md
@@ -0,0 +1 @@
+../../en/operations/storing-data.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables.md b/docs/ja/operations/system-tables.md
index be0c3356247..4a18028c084 100644
--- a/docs/ja/operations/system-tables.md
+++ b/docs/ja/operations/system-tables.md
@@ -1162,4 +1162,4 @@ path:           /clickhouse/tables/01-08/visits/replicas
 
 ストレージポリシーに複数のボリュームが含まれている場合は、各ボリュームの情報がテーブルの個々の行に格納されます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/system_tables/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/system_tables/) <!--hide-->
diff --git a/docs/ja/operations/system-tables/asynchronous_metric_log.md b/docs/ja/operations/system-tables/asynchronous_metric_log.md
new file mode 120000
index 00000000000..8ffe4dca1ba
--- /dev/null
+++ b/docs/ja/operations/system-tables/asynchronous_metric_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/asynchronous_metric_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/asynchronous_metrics.md b/docs/ja/operations/system-tables/asynchronous_metrics.md
new file mode 120000
index 00000000000..fcaf428f59c
--- /dev/null
+++ b/docs/ja/operations/system-tables/asynchronous_metrics.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/asynchronous_metrics.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/clusters.md b/docs/ja/operations/system-tables/clusters.md
new file mode 120000
index 00000000000..41c8a05c3b8
--- /dev/null
+++ b/docs/ja/operations/system-tables/clusters.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/clusters.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/columns.md b/docs/ja/operations/system-tables/columns.md
new file mode 120000
index 00000000000..ff7fb750f7e
--- /dev/null
+++ b/docs/ja/operations/system-tables/columns.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/columns.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/contributors.md b/docs/ja/operations/system-tables/contributors.md
new file mode 120000
index 00000000000..2eb2c01f5a1
--- /dev/null
+++ b/docs/ja/operations/system-tables/contributors.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/contributors.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/crash-log.md b/docs/ja/operations/system-tables/crash-log.md
new file mode 120000
index 00000000000..d1aa67601bc
--- /dev/null
+++ b/docs/ja/operations/system-tables/crash-log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/crash-log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/current-roles.md b/docs/ja/operations/system-tables/current-roles.md
new file mode 120000
index 00000000000..b9f1f9d6e9d
--- /dev/null
+++ b/docs/ja/operations/system-tables/current-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/current-roles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/data_skipping_indices.md b/docs/ja/operations/system-tables/data_skipping_indices.md
new file mode 120000
index 00000000000..2820987bf69
--- /dev/null
+++ b/docs/ja/operations/system-tables/data_skipping_indices.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/data_skipping_indices.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/data_type_families.md b/docs/ja/operations/system-tables/data_type_families.md
new file mode 120000
index 00000000000..6d47b6f3f20
--- /dev/null
+++ b/docs/ja/operations/system-tables/data_type_families.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/data_type_families.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/databases.md b/docs/ja/operations/system-tables/databases.md
new file mode 120000
index 00000000000..058c2f32350
--- /dev/null
+++ b/docs/ja/operations/system-tables/databases.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/databases.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/detached_parts.md b/docs/ja/operations/system-tables/detached_parts.md
new file mode 120000
index 00000000000..5199756766a
--- /dev/null
+++ b/docs/ja/operations/system-tables/detached_parts.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/detached_parts.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/dictionaries.md b/docs/ja/operations/system-tables/dictionaries.md
new file mode 120000
index 00000000000..6c7d41422da
--- /dev/null
+++ b/docs/ja/operations/system-tables/dictionaries.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/dictionaries.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/disks.md b/docs/ja/operations/system-tables/disks.md
new file mode 120000
index 00000000000..faace23e9d7
--- /dev/null
+++ b/docs/ja/operations/system-tables/disks.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/disks.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/distributed_ddl_queue.md b/docs/ja/operations/system-tables/distributed_ddl_queue.md
new file mode 120000
index 00000000000..a9cadc74af2
--- /dev/null
+++ b/docs/ja/operations/system-tables/distributed_ddl_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distributed_ddl_queue.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/distribution_queue.md b/docs/ja/operations/system-tables/distribution_queue.md
new file mode 120000
index 00000000000..3831b85000c
--- /dev/null
+++ b/docs/ja/operations/system-tables/distribution_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distribution_queue.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/enabled-roles.md b/docs/ja/operations/system-tables/enabled-roles.md
new file mode 120000
index 00000000000..04ffee25343
--- /dev/null
+++ b/docs/ja/operations/system-tables/enabled-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/enabled-roles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/errors.md b/docs/ja/operations/system-tables/errors.md
new file mode 120000
index 00000000000..2bb8c1dff0d
--- /dev/null
+++ b/docs/ja/operations/system-tables/errors.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/errors.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/events.md b/docs/ja/operations/system-tables/events.md
new file mode 120000
index 00000000000..b9eb57426f2
--- /dev/null
+++ b/docs/ja/operations/system-tables/events.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/events.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/functions.md b/docs/ja/operations/system-tables/functions.md
new file mode 120000
index 00000000000..7a0f2d1853f
--- /dev/null
+++ b/docs/ja/operations/system-tables/functions.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/functions.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/grants.md b/docs/ja/operations/system-tables/grants.md
new file mode 120000
index 00000000000..ec7f50b118e
--- /dev/null
+++ b/docs/ja/operations/system-tables/grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/grants.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/graphite_retentions.md b/docs/ja/operations/system-tables/graphite_retentions.md
new file mode 120000
index 00000000000..b8c049625ac
--- /dev/null
+++ b/docs/ja/operations/system-tables/graphite_retentions.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/graphite_retentions.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/index.md b/docs/ja/operations/system-tables/index.md
new file mode 120000
index 00000000000..77d10f24c7f
--- /dev/null
+++ b/docs/ja/operations/system-tables/index.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/index.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/licenses.md b/docs/ja/operations/system-tables/licenses.md
new file mode 120000
index 00000000000..a84b4bbf3e3
--- /dev/null
+++ b/docs/ja/operations/system-tables/licenses.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/licenses.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/merge_tree_settings.md b/docs/ja/operations/system-tables/merge_tree_settings.md
new file mode 120000
index 00000000000..dbff2462867
--- /dev/null
+++ b/docs/ja/operations/system-tables/merge_tree_settings.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/merge_tree_settings.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/merges.md b/docs/ja/operations/system-tables/merges.md
new file mode 120000
index 00000000000..21406d070e7
--- /dev/null
+++ b/docs/ja/operations/system-tables/merges.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/merges.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/metric_log.md b/docs/ja/operations/system-tables/metric_log.md
new file mode 120000
index 00000000000..57c04f0fd54
--- /dev/null
+++ b/docs/ja/operations/system-tables/metric_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/metric_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/metrics.md b/docs/ja/operations/system-tables/metrics.md
new file mode 120000
index 00000000000..06359d159b2
--- /dev/null
+++ b/docs/ja/operations/system-tables/metrics.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/metrics.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/mutations.md b/docs/ja/operations/system-tables/mutations.md
new file mode 120000
index 00000000000..598f05d4381
--- /dev/null
+++ b/docs/ja/operations/system-tables/mutations.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/mutations.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/numbers.md b/docs/ja/operations/system-tables/numbers.md
new file mode 120000
index 00000000000..29fce9b3569
--- /dev/null
+++ b/docs/ja/operations/system-tables/numbers.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/numbers.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/numbers_mt.md b/docs/ja/operations/system-tables/numbers_mt.md
new file mode 120000
index 00000000000..7547a8e014c
--- /dev/null
+++ b/docs/ja/operations/system-tables/numbers_mt.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/numbers_mt.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/one.md b/docs/ja/operations/system-tables/one.md
new file mode 120000
index 00000000000..ad50d714928
--- /dev/null
+++ b/docs/ja/operations/system-tables/one.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/one.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/opentelemetry_span_log.md b/docs/ja/operations/system-tables/opentelemetry_span_log.md
new file mode 120000
index 00000000000..59aab8cd11d
--- /dev/null
+++ b/docs/ja/operations/system-tables/opentelemetry_span_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/opentelemetry_span_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/part_log.md b/docs/ja/operations/system-tables/part_log.md
new file mode 120000
index 00000000000..274900a57ad
--- /dev/null
+++ b/docs/ja/operations/system-tables/part_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/part_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/parts.md b/docs/ja/operations/system-tables/parts.md
new file mode 120000
index 00000000000..900bb5240a0
--- /dev/null
+++ b/docs/ja/operations/system-tables/parts.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/parts.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/parts_columns.md b/docs/ja/operations/system-tables/parts_columns.md
new file mode 120000
index 00000000000..f2c7d4dde34
--- /dev/null
+++ b/docs/ja/operations/system-tables/parts_columns.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/parts_columns.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/processes.md b/docs/ja/operations/system-tables/processes.md
new file mode 120000
index 00000000000..b565db02713
--- /dev/null
+++ b/docs/ja/operations/system-tables/processes.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/processes.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/query_log.md b/docs/ja/operations/system-tables/query_log.md
new file mode 120000
index 00000000000..df9c4d8ba58
--- /dev/null
+++ b/docs/ja/operations/system-tables/query_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/query_thread_log.md b/docs/ja/operations/system-tables/query_thread_log.md
new file mode 120000
index 00000000000..98be3538c4c
--- /dev/null
+++ b/docs/ja/operations/system-tables/query_thread_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_thread_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/query_views_log.md b/docs/ja/operations/system-tables/query_views_log.md
new file mode 120000
index 00000000000..f606e4108ca
--- /dev/null
+++ b/docs/ja/operations/system-tables/query_views_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_views_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quota_limits.md b/docs/ja/operations/system-tables/quota_limits.md
new file mode 120000
index 00000000000..3fecf881c92
--- /dev/null
+++ b/docs/ja/operations/system-tables/quota_limits.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_limits.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quota_usage.md b/docs/ja/operations/system-tables/quota_usage.md
new file mode 120000
index 00000000000..c79f1a75033
--- /dev/null
+++ b/docs/ja/operations/system-tables/quota_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_usage.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quotas.md b/docs/ja/operations/system-tables/quotas.md
new file mode 120000
index 00000000000..b6a26bf77f3
--- /dev/null
+++ b/docs/ja/operations/system-tables/quotas.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/quotas_usage.md b/docs/ja/operations/system-tables/quotas_usage.md
new file mode 120000
index 00000000000..ba204a4d9c0
--- /dev/null
+++ b/docs/ja/operations/system-tables/quotas_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas_usage.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/replicas.md b/docs/ja/operations/system-tables/replicas.md
new file mode 120000
index 00000000000..dd231c5c80d
--- /dev/null
+++ b/docs/ja/operations/system-tables/replicas.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replicas.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/replicated_fetches.md b/docs/ja/operations/system-tables/replicated_fetches.md
new file mode 120000
index 00000000000..bf4547ebd07
--- /dev/null
+++ b/docs/ja/operations/system-tables/replicated_fetches.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replicated_fetches.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/replication_queue.md b/docs/ja/operations/system-tables/replication_queue.md
new file mode 120000
index 00000000000..cdc452594e6
--- /dev/null
+++ b/docs/ja/operations/system-tables/replication_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replication_queue.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/role-grants.md b/docs/ja/operations/system-tables/role-grants.md
new file mode 120000
index 00000000000..6a25ffa31ce
--- /dev/null
+++ b/docs/ja/operations/system-tables/role-grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/role-grants.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/roles.md b/docs/ja/operations/system-tables/roles.md
new file mode 120000
index 00000000000..391bc980a48
--- /dev/null
+++ b/docs/ja/operations/system-tables/roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/roles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/row_policies.md b/docs/ja/operations/system-tables/row_policies.md
new file mode 120000
index 00000000000..b194161cf1d
--- /dev/null
+++ b/docs/ja/operations/system-tables/row_policies.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/row_policies.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/settings.md b/docs/ja/operations/system-tables/settings.md
new file mode 120000
index 00000000000..69b03c2312c
--- /dev/null
+++ b/docs/ja/operations/system-tables/settings.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/settings_profile_elements.md b/docs/ja/operations/system-tables/settings_profile_elements.md
new file mode 120000
index 00000000000..3b0e70ead49
--- /dev/null
+++ b/docs/ja/operations/system-tables/settings_profile_elements.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profile_elements.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/settings_profiles.md b/docs/ja/operations/system-tables/settings_profiles.md
new file mode 120000
index 00000000000..1c559bf2445
--- /dev/null
+++ b/docs/ja/operations/system-tables/settings_profiles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profiles.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/stack_trace.md b/docs/ja/operations/system-tables/stack_trace.md
new file mode 120000
index 00000000000..8dea20028f1
--- /dev/null
+++ b/docs/ja/operations/system-tables/stack_trace.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/stack_trace.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/storage_policies.md b/docs/ja/operations/system-tables/storage_policies.md
new file mode 120000
index 00000000000..b225b8d7cf6
--- /dev/null
+++ b/docs/ja/operations/system-tables/storage_policies.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/storage_policies.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/table_engines.md b/docs/ja/operations/system-tables/table_engines.md
new file mode 120000
index 00000000000..4bdfb34cb7e
--- /dev/null
+++ b/docs/ja/operations/system-tables/table_engines.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/table_engines.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/tables.md b/docs/ja/operations/system-tables/tables.md
new file mode 120000
index 00000000000..6b2ae90a766
--- /dev/null
+++ b/docs/ja/operations/system-tables/tables.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/tables.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/text_log.md b/docs/ja/operations/system-tables/text_log.md
new file mode 120000
index 00000000000..0419e4c2080
--- /dev/null
+++ b/docs/ja/operations/system-tables/text_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/text_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/time_zones.md b/docs/ja/operations/system-tables/time_zones.md
new file mode 120000
index 00000000000..d7b0f07d326
--- /dev/null
+++ b/docs/ja/operations/system-tables/time_zones.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/time_zones.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/trace_log.md b/docs/ja/operations/system-tables/trace_log.md
new file mode 120000
index 00000000000..f092330b46a
--- /dev/null
+++ b/docs/ja/operations/system-tables/trace_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/trace_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/users.md b/docs/ja/operations/system-tables/users.md
new file mode 120000
index 00000000000..540c5ac6620
--- /dev/null
+++ b/docs/ja/operations/system-tables/users.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/users.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/zookeeper.md b/docs/ja/operations/system-tables/zookeeper.md
new file mode 120000
index 00000000000..3e761b0e676
--- /dev/null
+++ b/docs/ja/operations/system-tables/zookeeper.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/zookeeper.md
\ No newline at end of file
diff --git a/docs/ja/operations/system-tables/zookeeper_log.md b/docs/ja/operations/system-tables/zookeeper_log.md
new file mode 120000
index 00000000000..c7db82e978a
--- /dev/null
+++ b/docs/ja/operations/system-tables/zookeeper_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/zookeeper_log.md
\ No newline at end of file
diff --git a/docs/ja/operations/tips.md b/docs/ja/operations/tips.md
index 5c64a216e1d..b5c67f0e17f 100644
--- a/docs/ja/operations/tips.md
+++ b/docs/ja/operations/tips.md
@@ -78,7 +78,7 @@ HDDの場合、ライトキャッシュを有効にします。
 
 ## ファイルシス {#file-system}
 
-Ext4は最も信頼性の高いオプションです。 マウントオプションの設定 `noatime, nobarrier`.
+Ext4は最も信頼性の高いオプションです。 マウントオプションの設定 `noatime`.
 XFSも適していますが、ClickHouseで徹底的にテストされていません。
 他のほとんどのファイルシステム仕様。 ファイルシステムの遅配ます。
 
@@ -248,4 +248,4 @@ script
 end script
 ```
 
-{## [元の記事](https://clickhouse.tech/docs/en/operations/tips/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/operations/tips/) ##}
diff --git a/docs/ja/operations/utilities/clickhouse-compressor.md b/docs/ja/operations/utilities/clickhouse-compressor.md
new file mode 120000
index 00000000000..98b1d8c4c7c
--- /dev/null
+++ b/docs/ja/operations/utilities/clickhouse-compressor.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-compressor.md
\ No newline at end of file
diff --git a/docs/ja/operations/utilities/clickhouse-copier.md b/docs/ja/operations/utilities/clickhouse-copier.md
index 43e96647775..4d825f02b76 100644
--- a/docs/ja/operations/utilities/clickhouse-copier.md
+++ b/docs/ja/operations/utilities/clickhouse-copier.md
@@ -173,4 +173,4 @@ $ clickhouse-copier copier --daemon --config zookeeper.xml --task-path /task/pat
 
 `clickhouse-copier` の変更を追跡します `/task/path/description` そしてその場でそれらを適用します。 たとえば、次の値を変更すると `max_workers`、タスクを実行しているプロセスの数も変更されます。
 
-[元の記事](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/ja/operations/utilities/clickhouse-format.md b/docs/ja/operations/utilities/clickhouse-format.md
new file mode 120000
index 00000000000..d71a78cd40b
--- /dev/null
+++ b/docs/ja/operations/utilities/clickhouse-format.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-format.md
\ No newline at end of file
diff --git a/docs/ja/operations/utilities/clickhouse-local.md b/docs/ja/operations/utilities/clickhouse-local.md
index 5f665bde19f..25714aec8d9 100644
--- a/docs/ja/operations/utilities/clickhouse-local.md
+++ b/docs/ja/operations/utilities/clickhouse-local.md
@@ -78,4 +78,4 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/ja/operations/utilities/clickhouse-obfuscator.md b/docs/ja/operations/utilities/clickhouse-obfuscator.md
new file mode 120000
index 00000000000..06d1df70693
--- /dev/null
+++ b/docs/ja/operations/utilities/clickhouse-obfuscator.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-obfuscator.md
\ No newline at end of file
diff --git a/docs/ja/operations/utilities/index.md b/docs/ja/operations/utilities/index.md
index 8dd37072b50..99d168fe670 100644
--- a/docs/ja/operations/utilities/index.md
+++ b/docs/ja/operations/utilities/index.md
@@ -12,4 +12,4 @@ toc_title: "\u6982\u8981"
 -   [クリックハウス-複写機](clickhouse-copier.md) — Copies (and reshards) data from one cluster to another cluster.
 -   [clickhouse-ベンチマーク](clickhouse-benchmark.md) — Loads server with the custom queries and settings.
 
-[元の記事](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/ja/operations/utilities/odbc-bridge.md b/docs/ja/operations/utilities/odbc-bridge.md
new file mode 120000
index 00000000000..c5772389199
--- /dev/null
+++ b/docs/ja/operations/utilities/odbc-bridge.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/odbc-bridge.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/combinators.md b/docs/ja/sql-reference/aggregate-functions/combinators.md
index c5121f5259a..f44bf4f6e7e 100644
--- a/docs/ja/sql-reference/aggregate-functions/combinators.md
+++ b/docs/ja/sql-reference/aggregate-functions/combinators.md
@@ -242,4 +242,4 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/ja/sql-reference/aggregate-functions/index.md b/docs/ja/sql-reference/aggregate-functions/index.md
index bf1e47103ba..3f40eeb7221 100644
--- a/docs/ja/sql-reference/aggregate-functions/index.md
+++ b/docs/ja/sql-reference/aggregate-functions/index.md
@@ -59,4 +59,4 @@ SELECT groupArray(y) FROM t_null_big
 
 `groupArray` 含まない `NULL` 結果の配列で。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/aggregate-functions/parametric-functions.md b/docs/ja/sql-reference/aggregate-functions/parametric-functions.md
index 9eba5baf8a7..82396f9bf95 100644
--- a/docs/ja/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/ja/sql-reference/aggregate-functions/parametric-functions.md
@@ -492,7 +492,7 @@ Problem: Generate a report that shows only keywords that produced at least 5 uni
 Solution: Write in the GROUP BY query SearchPhrase HAVING uniqUpTo(4)(UserID) >= 5
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
 
 ## sumMapFiltered(keys_to_keep)(キー,値) {#summapfilteredkeys-to-keepkeys-values}
 
diff --git a/docs/ja/sql-reference/aggregate-functions/reference.md b/docs/ja/sql-reference/aggregate-functions/reference.md
index c66e9b54746..636992e19a8 100644
--- a/docs/ja/sql-reference/aggregate-functions/reference.md
+++ b/docs/ja/sql-reference/aggregate-functions/reference.md
@@ -1911,4 +1911,4 @@ SELECT arraySort(bitmapToArray(groupBitmapXorState(z))) FROM bitmap_column_expr_
 └──────────────────────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/agg_functions/reference/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/agg_functions/reference/) <!--hide-->
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/any.md b/docs/ja/sql-reference/aggregate-functions/reference/any.md
new file mode 120000
index 00000000000..1a180fae79b
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/any.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/any.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/anyheavy.md b/docs/ja/sql-reference/aggregate-functions/reference/anyheavy.md
new file mode 120000
index 00000000000..3dd65a5a6ac
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/anyheavy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/anyheavy.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/anylast.md b/docs/ja/sql-reference/aggregate-functions/reference/anylast.md
new file mode 120000
index 00000000000..d2f88acf37d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/anylast.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/anylast.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/argmax.md b/docs/ja/sql-reference/aggregate-functions/reference/argmax.md
new file mode 120000
index 00000000000..9260aa64e32
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/argmax.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/argmax.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/argmin.md b/docs/ja/sql-reference/aggregate-functions/reference/argmin.md
new file mode 120000
index 00000000000..cc04e48011a
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/argmin.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/argmin.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/avg.md b/docs/ja/sql-reference/aggregate-functions/reference/avg.md
new file mode 120000
index 00000000000..dce5db3d1f8
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/avg.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/avg.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/avgweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/avgweighted.md
new file mode 120000
index 00000000000..c7584607600
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/avgweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/avgweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md b/docs/ja/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
new file mode 120000
index 00000000000..22a84e3e5d2
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/corr.md b/docs/ja/sql-reference/aggregate-functions/reference/corr.md
new file mode 120000
index 00000000000..582cc9c15cd
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/corr.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/corr.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/count.md b/docs/ja/sql-reference/aggregate-functions/reference/count.md
new file mode 120000
index 00000000000..d17713f7fe6
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/count.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/count.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/covarpop.md b/docs/ja/sql-reference/aggregate-functions/reference/covarpop.md
new file mode 120000
index 00000000000..c31a289939b
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/covarpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/covarpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/covarsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/covarsamp.md
new file mode 120000
index 00000000000..21282114272
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/covarsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/covarsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/deltasum.md b/docs/ja/sql-reference/aggregate-functions/reference/deltasum.md
new file mode 120000
index 00000000000..b9a8bdce6fe
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/deltasum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/deltasum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/ja/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
new file mode 120000
index 00000000000..3720d4f7b98
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparray.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparray.md
new file mode 120000
index 00000000000..cbc4b5ed5b7
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparray.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparray.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparrayinsertat.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
new file mode 120000
index 00000000000..9710872316e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparrayinsertat.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingavg.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
new file mode 120000
index 00000000000..2e7abdd3184
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingsum.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
new file mode 120000
index 00000000000..5d5eb7e6884
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/grouparraysample.md b/docs/ja/sql-reference/aggregate-functions/reference/grouparraysample.md
new file mode 120000
index 00000000000..797f57e7457
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/grouparraysample.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/grouparraysample.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitand.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitand.md
new file mode 120000
index 00000000000..464b68b114d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitand.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitand.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmap.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmap.md
new file mode 120000
index 00000000000..04386983f6c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapand.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapand.md
new file mode 120000
index 00000000000..861ac2c3dd3
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapand.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapand.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapor.md
new file mode 120000
index 00000000000..0fcb851d0a4
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapxor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapxor.md
new file mode 120000
index 00000000000..13c79b37200
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitmapxor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitor.md
new file mode 120000
index 00000000000..06664ee3fdb
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupbitxor.md b/docs/ja/sql-reference/aggregate-functions/reference/groupbitxor.md
new file mode 120000
index 00000000000..d98130b4b30
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupbitxor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitxor.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/groupuniqarray.md b/docs/ja/sql-reference/aggregate-functions/reference/groupuniqarray.md
new file mode 120000
index 00000000000..f739df80064
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/groupuniqarray.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupuniqarray.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/index.md b/docs/ja/sql-reference/aggregate-functions/reference/index.md
new file mode 120000
index 00000000000..bde1a622626
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/ja/sql-reference/aggregate-functions/reference/intervalLengthSum.md
new file mode 120000
index 00000000000..b69019d0cf2
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/kurtpop.md b/docs/ja/sql-reference/aggregate-functions/reference/kurtpop.md
new file mode 120000
index 00000000000..ee8f9be79fd
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/kurtpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/kurtpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/kurtsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/kurtsamp.md
new file mode 120000
index 00000000000..dbc05efec9e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/kurtsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/kurtsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/mannwhitneyutest.md b/docs/ja/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
new file mode 120000
index 00000000000..7cbd9ceb1be
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/mannwhitneyutest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/max.md b/docs/ja/sql-reference/aggregate-functions/reference/max.md
new file mode 120000
index 00000000000..ae47679c80e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/max.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/max.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/maxmap.md b/docs/ja/sql-reference/aggregate-functions/reference/maxmap.md
new file mode 120000
index 00000000000..ffd64c34667
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/maxmap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/maxmap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/median.md b/docs/ja/sql-reference/aggregate-functions/reference/median.md
new file mode 120000
index 00000000000..d05756b8978
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/median.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/median.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/min.md b/docs/ja/sql-reference/aggregate-functions/reference/min.md
new file mode 120000
index 00000000000..61417b347a8
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/min.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/min.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/minmap.md b/docs/ja/sql-reference/aggregate-functions/reference/minmap.md
new file mode 120000
index 00000000000..bf075897bd9
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/minmap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/minmap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantile.md b/docs/ja/sql-reference/aggregate-functions/reference/quantile.md
new file mode 120000
index 00000000000..12d80246267
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantile.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/ja/sql-reference/aggregate-functions/reference/quantilebfloat16.md
new file mode 120000
index 00000000000..dd4fd12eb40
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiledeterministic.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiledeterministic.md
new file mode 120000
index 00000000000..60be9721f31
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiledeterministic.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiledeterministic.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantileexact.md b/docs/ja/sql-reference/aggregate-functions/reference/quantileexact.md
new file mode 120000
index 00000000000..06fe3567621
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantileexact.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantileexact.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantileexactweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/quantileexactweighted.md
new file mode 120000
index 00000000000..f5dd2a23c1c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantileexactweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantileexactweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiles.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiles.md
new file mode 120000
index 00000000000..67e5037b8fa
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiles.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiles.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigest.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigest.md
new file mode 120000
index 00000000000..360c513eca1
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletdigest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
new file mode 120000
index 00000000000..a130216554f
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletiming.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletiming.md
new file mode 120000
index 00000000000..eda78f3382a
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletiming.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletiming.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/quantiletimingweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
new file mode 120000
index 00000000000..b333a6726b1
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantiletimingweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/rankCorr.md b/docs/ja/sql-reference/aggregate-functions/reference/rankCorr.md
new file mode 120000
index 00000000000..d1809ad364d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/rankCorr.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/rankCorr.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/simplelinearregression.md b/docs/ja/sql-reference/aggregate-functions/reference/simplelinearregression.md
new file mode 120000
index 00000000000..8a07049140c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/simplelinearregression.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/simplelinearregression.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/skewpop.md b/docs/ja/sql-reference/aggregate-functions/reference/skewpop.md
new file mode 120000
index 00000000000..2ce2f5259d7
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/skewpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/skewpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/skewsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/skewsamp.md
new file mode 120000
index 00000000000..3d2f39e8063
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/skewsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/skewsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stddevpop.md b/docs/ja/sql-reference/aggregate-functions/reference/stddevpop.md
new file mode 120000
index 00000000000..e6f6719f3cf
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stddevpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stddevpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stddevsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/stddevsamp.md
new file mode 120000
index 00000000000..55d8a4ea6db
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stddevsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stddevsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
new file mode 120000
index 00000000000..cfa196bc3f3
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
new file mode 120000
index 00000000000..377807709d1
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/studentttest.md b/docs/ja/sql-reference/aggregate-functions/reference/studentttest.md
new file mode 120000
index 00000000000..ef39bb83322
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/studentttest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/studentttest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sum.md b/docs/ja/sql-reference/aggregate-functions/reference/sum.md
new file mode 120000
index 00000000000..d81cdf86f04
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sum.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sumcount.md b/docs/ja/sql-reference/aggregate-functions/reference/sumcount.md
new file mode 120000
index 00000000000..9f0299a5fe7
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sumcount.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumcount.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sumkahan.md b/docs/ja/sql-reference/aggregate-functions/reference/sumkahan.md
new file mode 120000
index 00000000000..650f8a34d9d
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sumkahan.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumkahan.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/summap.md b/docs/ja/sql-reference/aggregate-functions/reference/summap.md
new file mode 120000
index 00000000000..acdb0c63e38
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/summap.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/summap.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/sumwithoverflow.md b/docs/ja/sql-reference/aggregate-functions/reference/sumwithoverflow.md
new file mode 120000
index 00000000000..7c9342b0e1e
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/sumwithoverflow.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumwithoverflow.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/topk.md b/docs/ja/sql-reference/aggregate-functions/reference/topk.md
new file mode 120000
index 00000000000..08da6abe743
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/topk.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/topk.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/ja/sql-reference/aggregate-functions/reference/topkweighted.md
new file mode 120000
index 00000000000..7d1ce22ed6a
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/topkweighted.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniq.md b/docs/ja/sql-reference/aggregate-functions/reference/uniq.md
new file mode 120000
index 00000000000..e52d21ff731
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniq.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniq.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined.md
new file mode 120000
index 00000000000..d8d59dfd8bb
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqcombined.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined64.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined64.md
new file mode 120000
index 00000000000..e1750183f01
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqcombined64.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqcombined64.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqexact.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqexact.md
new file mode 120000
index 00000000000..080ea046e2f
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqexact.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqexact.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqhll12.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqhll12.md
new file mode 120000
index 00000000000..3aa80e68d6c
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqhll12.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqhll12.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/ja/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 120000
index 00000000000..ac61a28677f
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/varpop.md b/docs/ja/sql-reference/aggregate-functions/reference/varpop.md
new file mode 120000
index 00000000000..52ba6246b3b
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/varpop.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/varpop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/varsamp.md b/docs/ja/sql-reference/aggregate-functions/reference/varsamp.md
new file mode 120000
index 00000000000..f9cd855fea6
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/varsamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/varsamp.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/aggregate-functions/reference/welchttest.md b/docs/ja/sql-reference/aggregate-functions/reference/welchttest.md
new file mode 120000
index 00000000000..b0c6ca1ad68
--- /dev/null
+++ b/docs/ja/sql-reference/aggregate-functions/reference/welchttest.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/welchttest.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/aggregatefunction.md b/docs/ja/sql-reference/data-types/aggregatefunction.md
index 45aea71a2a9..036988066a7 100644
--- a/docs/ja/sql-reference/data-types/aggregatefunction.md
+++ b/docs/ja/sql-reference/data-types/aggregatefunction.md
@@ -67,4 +67,4 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 見る [AggregatingMergeTree](../../engines/table-engines/mergetree-family/aggregatingmergetree.md) エンジンの説明。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/array.md b/docs/ja/sql-reference/data-types/array.md
index 93fbb057701..18d9b483d8f 100644
--- a/docs/ja/sql-reference/data-types/array.md
+++ b/docs/ja/sql-reference/data-types/array.md
@@ -74,4 +74,4 @@ Received exception from server (version 1.1.54388):
 Code: 386. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: There is no supertype for types UInt8, String because some of them are String/FixedString and some of them are not.
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/array/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/array/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/boolean.md b/docs/ja/sql-reference/data-types/boolean.md
index bcf5aa0289c..075e5d2ec7a 100644
--- a/docs/ja/sql-reference/data-types/boolean.md
+++ b/docs/ja/sql-reference/data-types/boolean.md
@@ -9,4 +9,4 @@ toc_title: "\u30D6\u30FC\u30EB\u5024"
 
 ブール値には別の型はありません。 UInt8型を使用し、値0または1に制限します。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/boolean/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/boolean/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/date.md b/docs/ja/sql-reference/data-types/date.md
index bcdc8f7224d..47b105627c2 100644
--- a/docs/ja/sql-reference/data-types/date.md
+++ b/docs/ja/sql-reference/data-types/date.md
@@ -9,4 +9,4 @@ toc_title: "\u65E5\u4ED8"
 
 日付値は、タイムゾーンなしで格納されます。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/date/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/date/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/date32.md b/docs/ja/sql-reference/data-types/date32.md
new file mode 120000
index 00000000000..2c8eca18107
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/date32.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/date32.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/datetime.md b/docs/ja/sql-reference/data-types/datetime.md
index 8c6164881d8..50f06cee21c 100644
--- a/docs/ja/sql-reference/data-types/datetime.md
+++ b/docs/ja/sql-reference/data-types/datetime.md
@@ -126,4 +126,4 @@ FROM dt
 -   [日付と時刻を操作する演算子](../../sql-reference/operators/index.md#operators-datetime)
 -   [その `Date` データ型](date.md)
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/datetime/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/datetime/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/decimal.md b/docs/ja/sql-reference/data-types/decimal.md
index 52fc336d331..e9c68f3c625 100644
--- a/docs/ja/sql-reference/data-types/decimal.md
+++ b/docs/ja/sql-reference/data-types/decimal.md
@@ -106,4 +106,4 @@ SELECT toDecimal32(1, 8) < 100
 DB::Exception: Can't compare.
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/decimal/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/decimal/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/domains/index.md b/docs/ja/sql-reference/data-types/domains/index.md
index 4f8c2b7add8..9a1688d94e6 100644
--- a/docs/ja/sql-reference/data-types/domains/index.md
+++ b/docs/ja/sql-reference/data-types/domains/index.md
@@ -30,4 +30,4 @@ toc_title: "\u6982\u8981"
 -   別の列または表からデータを挿入するときに、文字列値を暗黙的にドメイン値に変換できません。
 -   ドメインは、格納された値に制約を追加しません。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/domains/overview) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/domains/overview) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/domains/ipv4.md b/docs/ja/sql-reference/data-types/domains/ipv4.md
index c329028ad40..fd1f3b84096 100644
--- a/docs/ja/sql-reference/data-types/domains/ipv4.md
+++ b/docs/ja/sql-reference/data-types/domains/ipv4.md
@@ -33,16 +33,16 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 `IPv4` ドメインはIPv4文字列としてカスタム入力形式をサポート:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+│ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
 │ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
+│ https://clickhouse.com          │ 183.247.232.58 │
 └────────────────────────────────────┴────────────────┘
 ```
 
@@ -81,4 +81,4 @@ SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
 └──────────────────────────────────┴────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/domains/ipv6.md b/docs/ja/sql-reference/data-types/domains/ipv6.md
index 26583429ec8..d0576341301 100644
--- a/docs/ja/sql-reference/data-types/domains/ipv6.md
+++ b/docs/ja/sql-reference/data-types/domains/ipv6.md
@@ -33,15 +33,15 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 `IPv6` ドメイ:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+│ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+│ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
 │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
 └────────────────────────────────────┴───────────────────────────────┘
 ```
@@ -83,4 +83,4 @@ SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
 └───────────────────────────────────────────┴─────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/enum.md b/docs/ja/sql-reference/data-types/enum.md
index aef4855ef06..e995d05febe 100644
--- a/docs/ja/sql-reference/data-types/enum.md
+++ b/docs/ja/sql-reference/data-types/enum.md
@@ -129,4 +129,4 @@ Most numeric and string operations are not defined for Enum values, e.g. adding
 
 ALTERを使用すると、Int8をInt16に変更するのと同じように、Enum8をEnum16に変更することも、その逆も可能です。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/enum/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/enum/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/fixedstring.md b/docs/ja/sql-reference/data-types/fixedstring.md
index ef94410e285..3db284b3338 100644
--- a/docs/ja/sql-reference/data-types/fixedstring.md
+++ b/docs/ja/sql-reference/data-types/fixedstring.md
@@ -60,4 +60,4 @@ WHERE a = 'b\0'
 
 の長さに注意してください。 `FixedString(N)` 値は一定です。 その [長さ](../../sql-reference/functions/array-functions.md#array_functions-length) 関数の戻り値 `N` たとえ `FixedString(N)` 値はnullバイトのみで埋められますが、 [空](../../sql-reference/functions/string-functions.md#empty) 関数の戻り値 `1` この場合。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/float.md b/docs/ja/sql-reference/data-types/float.md
index b9333ae297d..c1344edbc1c 100644
--- a/docs/ja/sql-reference/data-types/float.md
+++ b/docs/ja/sql-reference/data-types/float.md
@@ -84,4 +84,4 @@ SELECT 0 / 0
 
     See the rules for `NaN` sorting in the section [ORDER BY clause](../sql_reference/statements/select/order-by.md).
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/float/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/float/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/geo.md b/docs/ja/sql-reference/data-types/geo.md
new file mode 120000
index 00000000000..e25bc66b201
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/geo.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/geo.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/index.md b/docs/ja/sql-reference/data-types/index.md
index 5f82d86ce46..0db65e66630 100644
--- a/docs/ja/sql-reference/data-types/index.md
+++ b/docs/ja/sql-reference/data-types/index.md
@@ -12,4 +12,4 @@ ClickHouseは、表のセルにさまざまな種類のデータを格納でき
 
 この章ではサポートされているデータの種類と特別な配慮のための利用および/または実施しています。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/int-uint.md b/docs/ja/sql-reference/data-types/int-uint.md
index e6ac277b3b5..1248c2940b7 100644
--- a/docs/ja/sql-reference/data-types/int-uint.md
+++ b/docs/ja/sql-reference/data-types/int-uint.md
@@ -24,4 +24,4 @@ toc_title: "UInt8\u3001UInt16\u3001UInt32\u3001UInt64\u3001Int8\u3001Int16\u3001
 -   UInt32-\[0:4294967295\]
 -   UInt64-\[0:18446744073709551615\]
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/int_uint/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/int_uint/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/map.md b/docs/ja/sql-reference/data-types/map.md
new file mode 120000
index 00000000000..20de64e06d7
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/map.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/map.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/multiword-types.md b/docs/ja/sql-reference/data-types/multiword-types.md
new file mode 120000
index 00000000000..aeb86eadd2b
--- /dev/null
+++ b/docs/ja/sql-reference/data-types/multiword-types.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/multiword-types.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/data-types/nested-data-structures/index.md b/docs/ja/sql-reference/data-types/nested-data-structures/index.md
index d003868a135..c4b1f387bfe 100644
--- a/docs/ja/sql-reference/data-types/nested-data-structures/index.md
+++ b/docs/ja/sql-reference/data-types/nested-data-structures/index.md
@@ -9,4 +9,4 @@ toc_title: "\u96A0\u3057"
 
 # 入れ子データ構造 {#nested-data-structures}
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nested_data_structures/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nested_data_structures/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/nested-data-structures/nested.md b/docs/ja/sql-reference/data-types/nested-data-structures/nested.md
index 68b6337a15e..2b1461d4e65 100644
--- a/docs/ja/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/ja/sql-reference/data-types/nested-data-structures/nested.md
@@ -103,4 +103,4 @@ DESCRIBEクエリの場合、入れ子になったデータ構造の列は、同
 
 入れ子になったデータ構造内の要素のALTERクエリには制限があります。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nested_data_structures/nested/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/nullable.md b/docs/ja/sql-reference/data-types/nullable.md
index 5c6631aa99a..007e7ad1668 100644
--- a/docs/ja/sql-reference/data-types/nullable.md
+++ b/docs/ja/sql-reference/data-types/nullable.md
@@ -43,4 +43,4 @@ SELECT x + y FROM t_null
 └────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/simpleaggregatefunction.md b/docs/ja/sql-reference/data-types/simpleaggregatefunction.md
index 9d28bcdb62c..f486feddb2b 100644
--- a/docs/ja/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/ja/sql-reference/data-types/simpleaggregatefunction.md
@@ -37,4 +37,4 @@ CREATE TABLE t
 ) ENGINE = ...
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/expression.md b/docs/ja/sql-reference/data-types/special-data-types/expression.md
index f777929abb6..f2f7f881ee1 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/expression.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/expression.md
@@ -9,4 +9,4 @@ toc_title: "\u5F0F"
 
 式は、高次関数のラムダを表すために使用されます。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/expression/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/expression/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/index.md b/docs/ja/sql-reference/data-types/special-data-types/index.md
index 4ad98970909..9ae66028cc1 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/index.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/index.md
@@ -11,4 +11,4 @@ toc_title: "\u96A0\u3057"
 
 特別なデータ型の値は、テーブルへの保存やクエリ結果の出力のためにシリアル化することはできませんが、クエリ実行時の中間結果として使用でき
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/nothing.md b/docs/ja/sql-reference/data-types/special-data-types/nothing.md
index 796a11f7a29..c4339a86752 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/nothing.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/nothing.md
@@ -23,4 +23,4 @@ SELECT toTypeName(array())
 └─────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/nothing/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/nothing/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/special-data-types/set.md b/docs/ja/sql-reference/data-types/special-data-types/set.md
index bb4cded3df2..01bfff2e8c1 100644
--- a/docs/ja/sql-reference/data-types/special-data-types/set.md
+++ b/docs/ja/sql-reference/data-types/special-data-types/set.md
@@ -9,4 +9,4 @@ toc_title: "\u30BB\u30C3\u30C8"
 
 の右半分に使用されます [IN](../../operators/in.md#select-in-operators) 式。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/special_data_types/set/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/special_data_types/set/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/string.md b/docs/ja/sql-reference/data-types/string.md
index f487314e5cb..266c0260022 100644
--- a/docs/ja/sql-reference/data-types/string.md
+++ b/docs/ja/sql-reference/data-types/string.md
@@ -17,4 +17,4 @@ ClickHouseにはエンコーディングの概念はありません。 文字列
 同様に、文字列を操作するための特定の関数には、UTF-8でエンコードされたテキストを表すバイトセットが文字列に含まれているという前提の下で
 例えば、 ‘length’ 関数は、文字列の長さをバイト単位で計算します。 ‘lengthUTF8’ 関数は、値がUTF-8でエンコードされていると仮定して、Unicodeコードポイントで文字列の長さを計算します。
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/string/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/string/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/tuple.md b/docs/ja/sql-reference/data-types/tuple.md
index 7dbd2f3ea17..10ee6046daa 100644
--- a/docs/ja/sql-reference/data-types/tuple.md
+++ b/docs/ja/sql-reference/data-types/tuple.md
@@ -49,4 +49,4 @@ SELECT tuple(1, NULL) AS x, toTypeName(x)
 └──────────┴─────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/tuple/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/tuple/) <!--hide-->
diff --git a/docs/ja/sql-reference/data-types/uuid.md b/docs/ja/sql-reference/data-types/uuid.md
index 3c691dda362..ca5cccfa8cd 100644
--- a/docs/ja/sql-reference/data-types/uuid.md
+++ b/docs/ja/sql-reference/data-types/uuid.md
@@ -74,4 +74,4 @@ UUIDデータ型は、以下の関数のみをサポートします [文字列](
 
 Uuidデータ型は、算術演算ではサポートされません(たとえば, [abs](../../sql-reference/functions/arithmetic-functions.md#arithm_func-abs)）または、以下のような集計関数 [和](../../sql-reference/aggregate-functions/reference.md#agg_function-sum) と [avg](../../sql-reference/aggregate-functions/reference.md#agg_function-avg).
 
-[元の記事](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/data_types/uuid/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
index 1e99b782043..38eab3f38e2 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
@@ -67,4 +67,4 @@ ClickHouseは、階層辞書をサポートしています [数値キー](extern
 </dictionary>
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index ac632b99332..3286cf04113 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -399,4 +399,4 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 
 データは `trie`. それはRAMに完全に収まる必要があります。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index 154c5b40bfb..2ead32f409a 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -88,4 +88,4 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
new file mode 120000
index 00000000000..a8e9c37c515
--- /dev/null
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index f29a608b85e..5aefd7050e3 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -627,4 +627,4 @@ SOURCE(REDIS(
 -   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` は簡単な源のためのハッシュされたシングルキー源, `hash_map` 二つのキーを持つハッシュソース用です。 距源およびキャッシュ源の複雑な鍵サポートされていません。 省略可能であり、デフォルト値は `simple`.
 -   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index b35b0477b75..c8d9cb969b9 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -172,4 +172,4 @@ CREATE DICTIONARY somename (
 
 -   [外部辞書を操作するための関数](../../../sql-reference/functions/ext-dict-functions.md).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
index 6972e09e324..6276b69bbfd 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
@@ -50,4 +50,4 @@ LIFETIME(...) -- Lifetime of dictionary in memory
 -   [構造](external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
 -   [生涯](external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 01e6e57d2ca..4f90ac18267 100644
--- a/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/ja/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -59,4 +59,4 @@ toc_title: "\u4E00\u822C\u7684\u306A\u8AAC\u660E"
 -   [辞書キーとフィールド](external-dicts-dict-structure.md)
 -   [外部辞書を操作するための関数](../../../sql-reference/functions/ext-dict-functions.md)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/index.md b/docs/ja/sql-reference/dictionaries/index.md
index cb6bb168e1f..f4e6b9b2706 100644
--- a/docs/ja/sql-reference/dictionaries/index.md
+++ b/docs/ja/sql-reference/dictionaries/index.md
@@ -19,4 +19,4 @@ ClickHouseサポート:
 -   [組み込み辞書](internal-dicts.md#internal_dicts) 特定の [関数のセット](../../sql-reference/functions/ym-dict-functions.md).
 -   [プラグイン(外部)辞書](external-dictionaries/external-dicts.md#dicts-external-dicts) と [関数のセット](../../sql-reference/functions/ext-dict-functions.md).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/ja/sql-reference/dictionaries/internal-dicts.md b/docs/ja/sql-reference/dictionaries/internal-dicts.md
index 81b75075c27..74eb384d427 100644
--- a/docs/ja/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/ja/sql-reference/dictionaries/internal-dicts.md
@@ -52,4 +52,4 @@ Geobaseで辞書を定期的に更新することをお勧めします。 更新
 
 OS識別子とYandexを操作するための機能もあります。Metricaの調査エンジン、しかしそれらは使用されるべきではない。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/ja/sql-reference/distributed-ddl.md b/docs/ja/sql-reference/distributed-ddl.md
new file mode 120000
index 00000000000..705fba9bc0f
--- /dev/null
+++ b/docs/ja/sql-reference/distributed-ddl.md
@@ -0,0 +1 @@
+../../en/sql-reference/distributed-ddl.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/arithmetic-functions.md b/docs/ja/sql-reference/functions/arithmetic-functions.md
index 0afd85b63bc..77cc76d2f82 100644
--- a/docs/ja/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ja/sql-reference/functions/arithmetic-functions.md
@@ -84,4 +84,4 @@ You can also calculate integer numbers from a date or date with time. The idea i
 数値の最小公倍数を返します。
 例外は、ゼロで除算するとき、または最小の負の数をマイナスで除算するときにスローされます。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/array-functions.md b/docs/ja/sql-reference/functions/array-functions.md
index 6eab7656c25..efb6cebab61 100644
--- a/docs/ja/sql-reference/functions/array-functions.md
+++ b/docs/ja/sql-reference/functions/array-functions.md
@@ -702,13 +702,13 @@ arrayDifference(array)
 
 **パラメータ**
 
--   `array` – [配列](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [配列](https://clickhouse.com/docs/en/data_types/array/).
 
 **戻り値**
 
 隣接する要素間の差分の配列を返します。
 
-タイプ: [UInt\*](https://clickhouse.tech/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.tech/docs/en/data_types/int_uint/#int-ranges), [フロート\*](https://clickhouse.tech/docs/en/data_types/float/).
+タイプ: [UInt\*](https://clickhouse.com/docs/en/data_types/int_uint/#uint-ranges), [Int\*](https://clickhouse.com/docs/en/data_types/int_uint/#int-ranges), [フロート\*](https://clickhouse.com/docs/en/data_types/float/).
 
 **例**
 
@@ -754,7 +754,7 @@ arrayDistinct(array)
 
 **パラメータ**
 
--   `array` – [配列](https://clickhouse.tech/docs/en/data_types/array/).
+-   `array` – [配列](https://clickhouse.com/docs/en/data_types/array/).
 
 **戻り値**
 
@@ -1058,4 +1058,4 @@ select arrayAUC([0.1, 0.4, 0.35, 0.8], [0, 0, 1, 1])
 └────────────────────────────────────────---──┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/array-join.md b/docs/ja/sql-reference/functions/array-join.md
index d3a2ab76398..c50be7750a9 100644
--- a/docs/ja/sql-reference/functions/array-join.md
+++ b/docs/ja/sql-reference/functions/array-join.md
@@ -34,4 +34,4 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
 └─────┴───────────┴─────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/bit-functions.md b/docs/ja/sql-reference/functions/bit-functions.md
index 6ea1189f6a4..909cbf6f01f 100644
--- a/docs/ja/sql-reference/functions/bit-functions.md
+++ b/docs/ja/sql-reference/functions/bit-functions.md
@@ -252,4 +252,4 @@ SELECT bitCount(333)
 └───────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/bit_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/bitmap-functions.md b/docs/ja/sql-reference/functions/bitmap-functions.md
index de3ce938444..89a165d7ff8 100644
--- a/docs/ja/sql-reference/functions/bitmap-functions.md
+++ b/docs/ja/sql-reference/functions/bitmap-functions.md
@@ -493,4 +493,4 @@ SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
 └─────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/comparison-functions.md b/docs/ja/sql-reference/functions/comparison-functions.md
index ab223c36c6b..0e09ebe2e62 100644
--- a/docs/ja/sql-reference/functions/comparison-functions.md
+++ b/docs/ja/sql-reference/functions/comparison-functions.md
@@ -34,4 +34,4 @@ toc_title: "\u6BD4\u8F03"
 
 ## greaterOrEquals,\>=演算子 {#function-greaterorequals}
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/conditional-functions.md b/docs/ja/sql-reference/functions/conditional-functions.md
index 2a18caf743f..c553d6a61f7 100644
--- a/docs/ja/sql-reference/functions/conditional-functions.md
+++ b/docs/ja/sql-reference/functions/conditional-functions.md
@@ -204,4 +204,4 @@ FROM LEFT_RIGHT
 └──────┴───────┴──────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/date-time-functions.md b/docs/ja/sql-reference/functions/date-time-functions.md
index a0d51439339..565b10eaece 100644
--- a/docs/ja/sql-reference/functions/date-time-functions.md
+++ b/docs/ja/sql-reference/functions/date-time-functions.md
@@ -447,4 +447,4 @@ Function formats a Time according given Format string. N.B.: Format is a constan
 | %Y     | 年                                              | 2018       |
 | %%     | %記号                                           | %          |
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/encoding-functions.md b/docs/ja/sql-reference/functions/encoding-functions.md
index c3eaeaa18c3..91811489028 100644
--- a/docs/ja/sql-reference/functions/encoding-functions.md
+++ b/docs/ja/sql-reference/functions/encoding-functions.md
@@ -172,4 +172,4 @@ FixedString(16)値を受け取ります。 36文字を含む文字列をテキ
 
 整数を受け取ります。 合計されたときにソース番号を合計する二つのべき乗のリストを含むUInt64数値の配列を返します。 配列内の数値は昇順です。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/encryption-functions.md b/docs/ja/sql-reference/functions/encryption-functions.md
new file mode 120000
index 00000000000..8d33d60a5ba
--- /dev/null
+++ b/docs/ja/sql-reference/functions/encryption-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/encryption-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/ext-dict-functions.md b/docs/ja/sql-reference/functions/ext-dict-functions.md
index 8a438d6e935..6a90d99a5f0 100644
--- a/docs/ja/sql-reference/functions/ext-dict-functions.md
+++ b/docs/ja/sql-reference/functions/ext-dict-functions.md
@@ -202,4 +202,4 @@ dictGet[Type]OrDefault('dict_name', 'attr_name', id_expr, default_value_expr)
 
 ClickHouseは、属性の値を解析できない場合、または値が属性データ型と一致しない場合に例外をスローします。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/files.md b/docs/ja/sql-reference/functions/files.md
new file mode 120000
index 00000000000..df6eac6031e
--- /dev/null
+++ b/docs/ja/sql-reference/functions/files.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/files.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/functions-for-nulls.md b/docs/ja/sql-reference/functions/functions-for-nulls.md
index cbd981a3530..5b509735945 100644
--- a/docs/ja/sql-reference/functions/functions-for-nulls.md
+++ b/docs/ja/sql-reference/functions/functions-for-nulls.md
@@ -309,4 +309,4 @@ SELECT toTypeName(toNullable(10))
 └────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/geo.md b/docs/ja/sql-reference/functions/geo.md
index 4237e43b8dc..01444843f9c 100644
--- a/docs/ja/sql-reference/functions/geo.md
+++ b/docs/ja/sql-reference/functions/geo.md
@@ -507,4 +507,4 @@ SELECT h3GetResolution(617420388352917503) as res
 └─────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/geo/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/geo/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/geo/coordinates.md b/docs/ja/sql-reference/functions/geo/coordinates.md
new file mode 120000
index 00000000000..f3f694c50c9
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/coordinates.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/coordinates.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/geo/geohash.md b/docs/ja/sql-reference/functions/geo/geohash.md
new file mode 120000
index 00000000000..5b17ac944bb
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/geohash.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/geohash.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/geo/h3.md b/docs/ja/sql-reference/functions/geo/h3.md
new file mode 120000
index 00000000000..eb3926f4e3e
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/h3.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/h3.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/geo/index.md b/docs/ja/sql-reference/functions/geo/index.md
new file mode 120000
index 00000000000..8eb51e63d5b
--- /dev/null
+++ b/docs/ja/sql-reference/functions/geo/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/hash-functions.md b/docs/ja/sql-reference/functions/hash-functions.md
index a98ae60690d..098e446a8c9 100644
--- a/docs/ja/sql-reference/functions/hash-functions.md
+++ b/docs/ja/sql-reference/functions/hash-functions.md
@@ -40,6 +40,10 @@ SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')
 └────────────────────┴────────┘
 ```
 
+## MD4 {#hash_functions-md4}
+
+文字列からMD4を計算し、結果のバイトセットをFixedString(16)として返します。
+
 ## MD5 {#hash_functions-md5}
 
 文字列からMD5を計算し、結果のバイトセットをFixedString(16)として返します。
@@ -143,7 +147,11 @@ SELECT groupBitXor(cityHash64(*)) FROM table
 
 ## SHA256 {#sha256}
 
-文字列からSHA-1、SHA-224、またはSHA-256を計算し、結果のバイトセットをFixedString(20)、FixedString(28)、またはFixedString(32)として返します。
+## SHA384 {#sha384}
+
+## SHA512 {#sha512}
+
+文字列からSHA-1、SHA-224、SHA-256、SHA-384、またはSHA-512を計算し、結果のバイトセットをFixedString(20)、FixedString(28)、FixedString(32)、FixedString(48)またはFixedString(64)として返します。
 この機能はかなりゆっくりと動作します（SHA-1はプロセッサコア毎秒約5万の短い文字列を処理しますが、SHA-224とSHA-256は約2.2万の短い文字列を処理
 この関数は、特定のハッシュ関数が必要で選択できない場合にのみ使用することをお勧めします。
 このような場合でも、SELECTに適用するのではなく、関数をオフラインで適用し、テーブルに挿入するときに値を事前に計算することをお勧めします。
@@ -481,4 +489,4 @@ SELECT xxHash32('Hello, world!');
 
 -   [xxHash](http://cyan4973.github.io/xxHash/).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/hash_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/higher-order-functions.md b/docs/ja/sql-reference/functions/higher-order-functions.md
index f130f9a2ee4..2d6a86c527d 100644
--- a/docs/ja/sql-reference/functions/higher-order-functions.md
+++ b/docs/ja/sql-reference/functions/higher-order-functions.md
@@ -261,4 +261,4 @@ SELECT arrayReverseSort((x, y) -> y, ['hello', 'world'], [2, 1]) as res;
 
 詳細については、 `arrayReverseSort` 方法は、参照してください [配列を操作するための関数](array-functions.md#array_functions-reverse-sort) セクション
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/in-functions.md b/docs/ja/sql-reference/functions/in-functions.md
index 575f9787ec2..11149665474 100644
--- a/docs/ja/sql-reference/functions/in-functions.md
+++ b/docs/ja/sql-reference/functions/in-functions.md
@@ -23,4 +23,4 @@ For columns with the types T1, T2, …, it returns a Tuple(T1, T2, …) type tup
 ‘N’ 1から始まる列インデックスです。 Nは定数でなければなりません。 ‘N’ 定数でなければなりません。 ‘N’ 組のサイズより大きくない厳密なpostive整数でなければなりません。
 関数を実行するコストはありません。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/index.md b/docs/ja/sql-reference/functions/index.md
index 0a51bbb778e..9125df5bf8e 100644
--- a/docs/ja/sql-reference/functions/index.md
+++ b/docs/ja/sql-reference/functions/index.md
@@ -71,4 +71,4 @@ Functions can't change the values of their arguments – any changes are returne
 
 クエリ内の関数がリクエスタサーバで実行されているが、リモートサーバで実行する必要がある場合は、リクエスタサーバにラップすることができます。 ‘any’ 関数を集計するか、キーに追加します `GROUP BY`.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/ip-address-functions.md b/docs/ja/sql-reference/functions/ip-address-functions.md
index 295a6f673b9..567ca0693b0 100644
--- a/docs/ja/sql-reference/functions/ip-address-functions.md
+++ b/docs/ja/sql-reference/functions/ip-address-functions.md
@@ -245,4 +245,4 @@ SELECT
 └───────────────────────────────────┴──────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/json-functions.md b/docs/ja/sql-reference/functions/json-functions.md
index 7ceb26c9c9d..8901af41e86 100644
--- a/docs/ja/sql-reference/functions/json-functions.md
+++ b/docs/ja/sql-reference/functions/json-functions.md
@@ -294,4 +294,4 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello"
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/logical-functions.md b/docs/ja/sql-reference/functions/logical-functions.md
index b1b35c56c43..3f55fd9610b 100644
--- a/docs/ja/sql-reference/functions/logical-functions.md
+++ b/docs/ja/sql-reference/functions/logical-functions.md
@@ -19,4 +19,4 @@ toc_title: "\u8AD6\u7406"
 
 ## xor {#xor}
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/math-functions.md b/docs/ja/sql-reference/functions/math-functions.md
index 656d1350043..732c92fd669 100644
--- a/docs/ja/sql-reference/functions/math-functions.md
+++ b/docs/ja/sql-reference/functions/math-functions.md
@@ -113,4 +113,4 @@ Yの累乗に近いFloat64の数値を返します。
 
 数値引数を受け取り、xの累乗に10に近いUInt64の数値を返します。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/nlp-functions.md b/docs/ja/sql-reference/functions/nlp-functions.md
new file mode 120000
index 00000000000..612039dcb2c
--- /dev/null
+++ b/docs/ja/sql-reference/functions/nlp-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/nlp-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/other-functions.md b/docs/ja/sql-reference/functions/other-functions.md
index c590612aeeb..1c5d138e22e 100644
--- a/docs/ja/sql-reference/functions/other-functions.md
+++ b/docs/ja/sql-reference/functions/other-functions.md
@@ -1202,4 +1202,4 @@ SELECT number, randomPrintableASCII(30) as str, length(str) FROM system.numbers
 └────────┴────────────────────────────────┴──────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/random-functions.md b/docs/ja/sql-reference/functions/random-functions.md
index b976ed513ea..364b6d88e3b 100644
--- a/docs/ja/sql-reference/functions/random-functions.md
+++ b/docs/ja/sql-reference/functions/random-functions.md
@@ -62,4 +62,4 @@ FROM numbers(3)
 └────────────┴────────────┴──────────────┴────────────────┴─────────────────┴──────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/rounding-functions.md b/docs/ja/sql-reference/functions/rounding-functions.md
index d4f566e53f6..de9bc11ef96 100644
--- a/docs/ja/sql-reference/functions/rounding-functions.md
+++ b/docs/ja/sql-reference/functions/rounding-functions.md
@@ -187,4 +187,4 @@ roundBankers(10.755, 2) = 11,76
 
 数値を受け取り、指定された配列内の要素に切り捨てます。 値が最低限界より小さい場合は、最低限界が返されます。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/splitting-merging-functions.md b/docs/ja/sql-reference/functions/splitting-merging-functions.md
index 5f95efc793e..b348c3a8184 100644
--- a/docs/ja/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/ja/sql-reference/functions/splitting-merging-functions.md
@@ -114,4 +114,4 @@ SELECT alphaTokens('abca1abc')
 └─────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/string-functions.md b/docs/ja/sql-reference/functions/string-functions.md
index 2c436cd2419..09e00ab1ce5 100644
--- a/docs/ja/sql-reference/functions/string-functions.md
+++ b/docs/ja/sql-reference/functions/string-functions.md
@@ -486,4 +486,4 @@ CRC-64-ECMA多項式を使用して、文字列のCRC64チェックサムを返
 
 結果の型はUInt64です。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/string-replace-functions.md b/docs/ja/sql-reference/functions/string-replace-functions.md
index ea1b9cb66cd..b0621c99029 100644
--- a/docs/ja/sql-reference/functions/string-replace-functions.md
+++ b/docs/ja/sql-reference/functions/string-replace-functions.md
@@ -91,4 +91,4 @@ SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
 この実装はre2::RE2::QuoteMetaとは若干異なります。 ゼロバイトは00の代わりに\\0としてエスケープされ、必要な文字のみがエスケープされます。
 詳細は、リンクを参照してください: [RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/string-search-functions.md b/docs/ja/sql-reference/functions/string-search-functions.md
index e5858ba4941..faa904e39ba 100644
--- a/docs/ja/sql-reference/functions/string-search-functions.md
+++ b/docs/ja/sql-reference/functions/string-search-functions.md
@@ -380,4 +380,4 @@ SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])
 !!! note "注"
     For UTF-8 case we use 3-gram distance. All these are not perfectly fair n-gram distances. We use 2-byte hashes to hash n-grams and then calculate the (non-)symmetric difference between these hash tables – collisions may occur. With UTF-8 case-insensitive format we do not use fair `tolower` function – we zero the 5-th bit (starting from zero) of each codepoint byte and first bit of zeroth byte if bytes more than one – this works for Latin and mostly for all Cyrillic letters.
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/tuple-functions.md b/docs/ja/sql-reference/functions/tuple-functions.md
new file mode 120000
index 00000000000..daaf22f11f4
--- /dev/null
+++ b/docs/ja/sql-reference/functions/tuple-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/tuple-map-functions.md b/docs/ja/sql-reference/functions/tuple-map-functions.md
new file mode 120000
index 00000000000..e77338e1118
--- /dev/null
+++ b/docs/ja/sql-reference/functions/tuple-map-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-map-functions.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/functions/type-conversion-functions.md b/docs/ja/sql-reference/functions/type-conversion-functions.md
index 7058407d5b5..fd935c23d5f 100644
--- a/docs/ja/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ja/sql-reference/functions/type-conversion-functions.md
@@ -531,4 +531,4 @@ SELECT parseDateTimeBestEffort('10 20:19')
 
 同じように [parseDateTimeBestEffort](#parsedatetimebesteffort) ただし、処理できない日付形式が検出されたときにゼロの日付またはゼロの日付時刻を返します。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/url-functions.md b/docs/ja/sql-reference/functions/url-functions.md
index 22e8dbd028d..02da4602618 100644
--- a/docs/ja/sql-reference/functions/url-functions.md
+++ b/docs/ja/sql-reference/functions/url-functions.md
@@ -206,4 +206,4 @@ URLに類似のものがない場合、URLは変更されません。
 
 を削除します。 ‘name’ URLパラメータが存在する場合。 この関数は、パラメータ名が渡された引数とまったく同じ方法でURLにエンコードされるという前提の下で機能します。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/uuid-functions.md b/docs/ja/sql-reference/functions/uuid-functions.md
index 138d54b4d84..230a719eef1 100644
--- a/docs/ja/sql-reference/functions/uuid-functions.md
+++ b/docs/ja/sql-reference/functions/uuid-functions.md
@@ -119,4 +119,4 @@ SELECT
 
 -   [dictGetUUID](ext-dict-functions.md#ext_dict_functions-other)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/ja/sql-reference/functions/ym-dict-functions.md b/docs/ja/sql-reference/functions/ym-dict-functions.md
index 53721e07103..f6120172249 100644
--- a/docs/ja/sql-reference/functions/ym-dict-functions.md
+++ b/docs/ja/sql-reference/functions/ym-dict-functions.md
@@ -152,4 +152,4 @@ Accepts a UInt32 number – the region ID from the Yandex geobase. A string with
 
 `ua` と `uk` もうクです。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/index.md b/docs/ja/sql-reference/index.md
index 31d451b63a9..f548d4e0ed3 100644
--- a/docs/ja/sql-reference/index.md
+++ b/docs/ja/sql-reference/index.md
@@ -17,4 +17,4 @@ ClickHouseは次の種類のクエリをサポートします:
 -   [ALTER](statements/alter.md#query_language_queries_alter)
 -   [その他の種類のクエリ](statements/misc.md)
 
-[元の記事](https://clickhouse.tech/docs/en/sql-reference/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/sql-reference/) <!--hide-->
diff --git a/docs/ja/sql-reference/operators/index.md b/docs/ja/sql-reference/operators/index.md
index 37be3231a6c..1629229ad7e 100644
--- a/docs/ja/sql-reference/operators/index.md
+++ b/docs/ja/sql-reference/operators/index.md
@@ -274,4 +274,4 @@ SELECT * FROM t_null WHERE y IS NOT NULL
 └───┴───┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/alter.md b/docs/ja/sql-reference/statements/alter.md
index 0967f60e06a..5f17471747d 100644
--- a/docs/ja/sql-reference/statements/alter.md
+++ b/docs/ja/sql-reference/statements/alter.md
@@ -599,4 +599,4 @@ ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/alter/column.md b/docs/ja/sql-reference/statements/alter/column.md
new file mode 120000
index 00000000000..e1123d197fe
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/column.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/column.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/constraint.md b/docs/ja/sql-reference/statements/alter/constraint.md
new file mode 120000
index 00000000000..e3b245408d1
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/constraint.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/constraint.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/delete.md b/docs/ja/sql-reference/statements/alter/delete.md
new file mode 120000
index 00000000000..b9d6a233197
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/delete.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/delete.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/index.md b/docs/ja/sql-reference/statements/alter/index.md
new file mode 120000
index 00000000000..cd1bda718a5
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/index/index.md b/docs/ja/sql-reference/statements/alter/index/index.md
new file mode 120000
index 00000000000..b754fa71b83
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/index/index.md
@@ -0,0 +1 @@
+../../../../../en/sql-reference/statements/alter/index/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/order-by.md b/docs/ja/sql-reference/statements/alter/order-by.md
new file mode 120000
index 00000000000..ef5a22dc165
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/order-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/order-by.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/partition.md b/docs/ja/sql-reference/statements/alter/partition.md
new file mode 120000
index 00000000000..09a6fa34645
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/partition.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/partition.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/projection.md b/docs/ja/sql-reference/statements/alter/projection.md
new file mode 120000
index 00000000000..b7365ec9fe4
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/projection.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/projection.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/quota.md b/docs/ja/sql-reference/statements/alter/quota.md
new file mode 120000
index 00000000000..c6c477c3b61
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/quota.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/role.md b/docs/ja/sql-reference/statements/alter/role.md
new file mode 120000
index 00000000000..ce1f0a94eb3
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/role.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/row-policy.md b/docs/ja/sql-reference/statements/alter/row-policy.md
new file mode 120000
index 00000000000..09ad2d301f3
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/row-policy.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/sample-by.md b/docs/ja/sql-reference/statements/alter/sample-by.md
new file mode 120000
index 00000000000..fda9d991f40
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/sample-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/sample-by.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/setting.md b/docs/ja/sql-reference/statements/alter/setting.md
new file mode 120000
index 00000000000..12fdba11505
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/setting.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/setting.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/settings-profile.md b/docs/ja/sql-reference/statements/alter/settings-profile.md
new file mode 120000
index 00000000000..0e71ac4e831
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/settings-profile.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/ttl.md b/docs/ja/sql-reference/statements/alter/ttl.md
new file mode 120000
index 00000000000..94a112e7a17
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/ttl.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/ttl.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/update.md b/docs/ja/sql-reference/statements/alter/update.md
new file mode 120000
index 00000000000..fa9be21c070
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/update.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/update.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/user.md b/docs/ja/sql-reference/statements/alter/user.md
new file mode 120000
index 00000000000..9379ef3aaf6
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/user.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/alter/view.md b/docs/ja/sql-reference/statements/alter/view.md
new file mode 120000
index 00000000000..89bdcee5912
--- /dev/null
+++ b/docs/ja/sql-reference/statements/alter/view.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/view.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/attach.md b/docs/ja/sql-reference/statements/attach.md
new file mode 120000
index 00000000000..54672449823
--- /dev/null
+++ b/docs/ja/sql-reference/statements/attach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/attach.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/check-table.md b/docs/ja/sql-reference/statements/check-table.md
new file mode 120000
index 00000000000..1ce3a05c6ea
--- /dev/null
+++ b/docs/ja/sql-reference/statements/check-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/check-table.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create.md b/docs/ja/sql-reference/statements/create.md
index 1d1f2c57556..0117b082faf 100644
--- a/docs/ja/sql-reference/statements/create.md
+++ b/docs/ja/sql-reference/statements/create.md
@@ -147,8 +147,6 @@ ENGINE = <Engine>
 ...
 ```
 
-コーデックが指定されている場合、既定のコーデックは適用されません。 コーデックはパイプラインで結合できます。, `CODEC(Delta, ZSTD)`. の選定と大型ブリッジダイオードコーデックの組み合わせますプロジェクト、ベンチマークと同様に記載のAltinity [ClickHouseの効率を改善する新しい符号化](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse) 記事だ
-
 !!! warning "警告"
     できない解凍ClickHouseデータベースファイルを外部の事のように `lz4`. 代わりに、特別な [clickhouse-コンプレッサー](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor) ユーティリティ
 
@@ -499,4 +497,4 @@ CREATE SETTINGS PROFILE [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_na
 CREATE SETTINGS PROFILE max_memory_usage_profile SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/create/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/create/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/create/database.md b/docs/ja/sql-reference/statements/create/database.md
new file mode 120000
index 00000000000..4c8069ab92b
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/database.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/database.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/dictionary.md b/docs/ja/sql-reference/statements/create/dictionary.md
new file mode 120000
index 00000000000..e9eff6ba066
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/dictionary.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/dictionary.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/function.md b/docs/ja/sql-reference/statements/create/function.md
new file mode 120000
index 00000000000..d41429cb260
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/function.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/function.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/index.md b/docs/ja/sql-reference/statements/create/index.md
new file mode 120000
index 00000000000..0f8d5c71d28
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/index.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/quota.md b/docs/ja/sql-reference/statements/create/quota.md
new file mode 120000
index 00000000000..f941b7bcdad
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/quota.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/role.md b/docs/ja/sql-reference/statements/create/role.md
new file mode 120000
index 00000000000..d48b490bb1f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/role.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/row-policy.md b/docs/ja/sql-reference/statements/create/row-policy.md
new file mode 120000
index 00000000000..383ef88ed1f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/row-policy.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/settings-profile.md b/docs/ja/sql-reference/statements/create/settings-profile.md
new file mode 120000
index 00000000000..093dd9adcde
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/settings-profile.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/table.md b/docs/ja/sql-reference/statements/create/table.md
new file mode 120000
index 00000000000..61a92816de6
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/table.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/table.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/user.md b/docs/ja/sql-reference/statements/create/user.md
new file mode 120000
index 00000000000..5c4882bede7
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/user.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/create/view.md b/docs/ja/sql-reference/statements/create/view.md
new file mode 120000
index 00000000000..7fbc2d67bec
--- /dev/null
+++ b/docs/ja/sql-reference/statements/create/view.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/view.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/describe-table.md b/docs/ja/sql-reference/statements/describe-table.md
new file mode 120000
index 00000000000..eb76534f3cd
--- /dev/null
+++ b/docs/ja/sql-reference/statements/describe-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/describe-table.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/detach.md b/docs/ja/sql-reference/statements/detach.md
new file mode 120000
index 00000000000..19d37ee535a
--- /dev/null
+++ b/docs/ja/sql-reference/statements/detach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/detach.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/drop.md b/docs/ja/sql-reference/statements/drop.md
new file mode 120000
index 00000000000..48fe0648c6b
--- /dev/null
+++ b/docs/ja/sql-reference/statements/drop.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/drop.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/exchange.md b/docs/ja/sql-reference/statements/exchange.md
new file mode 120000
index 00000000000..8213eac93b7
--- /dev/null
+++ b/docs/ja/sql-reference/statements/exchange.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/exchange.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/exists.md b/docs/ja/sql-reference/statements/exists.md
new file mode 120000
index 00000000000..d69e8224fe6
--- /dev/null
+++ b/docs/ja/sql-reference/statements/exists.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/exists.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/explain.md b/docs/ja/sql-reference/statements/explain.md
new file mode 120000
index 00000000000..36f1f2cc9d4
--- /dev/null
+++ b/docs/ja/sql-reference/statements/explain.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/explain.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/grant.md b/docs/ja/sql-reference/statements/grant.md
index 4a088e0e78b..6300ecd2987 100644
--- a/docs/ja/sql-reference/statements/grant.md
+++ b/docs/ja/sql-reference/statements/grant.md
@@ -475,4 +475,4 @@ GRANT INSERT(x,y) ON db.table TO john
 
 この `ADMIN OPTION` 特典できるユーザー補助金の役割を他のユーザーです。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/insert-into.md b/docs/ja/sql-reference/statements/insert-into.md
index 2709137a04e..d9e8821a70c 100644
--- a/docs/ja/sql-reference/statements/insert-into.md
+++ b/docs/ja/sql-reference/statements/insert-into.md
@@ -77,4 +77,4 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 -   データはリアルタイムで追加されます。
 -   アップロードしたデータとは、通常はソートされました。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/kill.md b/docs/ja/sql-reference/statements/kill.md
new file mode 120000
index 00000000000..1afbc9008f3
--- /dev/null
+++ b/docs/ja/sql-reference/statements/kill.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/kill.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/misc.md b/docs/ja/sql-reference/statements/misc.md
index d4f4b245c9a..71202782ab4 100644
--- a/docs/ja/sql-reference/statements/misc.md
+++ b/docs/ja/sql-reference/statements/misc.md
@@ -355,4 +355,4 @@ USE db
 現在のデータベースは、データベースがクエリで明示的に定義されていない場合、テーブルの検索に使用されます。
 セッションの概念がないため、HTTPプロトコルを使用する場合は、このクエリを実行できません。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/misc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/misc/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/rename.md b/docs/ja/sql-reference/statements/rename.md
new file mode 120000
index 00000000000..889822decaa
--- /dev/null
+++ b/docs/ja/sql-reference/statements/rename.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/rename.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/select/all.md b/docs/ja/sql-reference/statements/select/all.md
new file mode 120000
index 00000000000..871440515a0
--- /dev/null
+++ b/docs/ja/sql-reference/statements/select/all.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/select/all.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/set-role.md b/docs/ja/sql-reference/statements/set-role.md
new file mode 120000
index 00000000000..a6525622a68
--- /dev/null
+++ b/docs/ja/sql-reference/statements/set-role.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set-role.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/set.md b/docs/ja/sql-reference/statements/set.md
new file mode 120000
index 00000000000..02e106afc9f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/set.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/show.md b/docs/ja/sql-reference/statements/show.md
index 8f2ee59a259..a68b5bf130f 100644
--- a/docs/ja/sql-reference/statements/show.md
+++ b/docs/ja/sql-reference/statements/show.md
@@ -166,4 +166,4 @@ Aで使用されたパラメータを示します [設定プロファイルの
 SHOW CREATE [SETTINGS] PROFILE name
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/show/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/system.md b/docs/ja/sql-reference/statements/system.md
index c15c3a79cd5..08c077e4fac 100644
--- a/docs/ja/sql-reference/statements/system.md
+++ b/docs/ja/sql-reference/statements/system.md
@@ -110,4 +110,4 @@ MergeTreeファミリ内のテーブルのバックグラウンドマージを
 SYSTEM START MERGES [[db.]merge_tree_family_table_name]
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/ja/sql-reference/statements/truncate.md b/docs/ja/sql-reference/statements/truncate.md
new file mode 120000
index 00000000000..92fbd705e8f
--- /dev/null
+++ b/docs/ja/sql-reference/statements/truncate.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/truncate.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/use.md b/docs/ja/sql-reference/statements/use.md
new file mode 120000
index 00000000000..7bdbf049326
--- /dev/null
+++ b/docs/ja/sql-reference/statements/use.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/use.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/statements/watch.md b/docs/ja/sql-reference/statements/watch.md
new file mode 120000
index 00000000000..a79631bf222
--- /dev/null
+++ b/docs/ja/sql-reference/statements/watch.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/watch.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/syntax.md b/docs/ja/sql-reference/syntax.md
index 5d15f408b5d..49dd17e0cb1 100644
--- a/docs/ja/sql-reference/syntax.md
+++ b/docs/ja/sql-reference/syntax.md
@@ -184,4 +184,4 @@ Code: 184. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception
 式のリストは、カンマで区切られた一つ以上の式です。
 関数と演算子は、引数として式を持つことができます。
 
-[元の記事](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/cluster.md b/docs/ja/sql-reference/table-functions/cluster.md
new file mode 120000
index 00000000000..4721debec48
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/cluster.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/dictionary.md b/docs/ja/sql-reference/table-functions/dictionary.md
new file mode 120000
index 00000000000..f9f453831a4
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/dictionary.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/dictionary.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/file.md b/docs/ja/sql-reference/table-functions/file.md
index 7f93df69495..fe7484ace49 100644
--- a/docs/ja/sql-reference/table-functions/file.md
+++ b/docs/ja/sql-reference/table-functions/file.md
@@ -116,6 +116,6 @@ FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
 
 **も参照。**
 
--   [仮想列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [仮想列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/generate.md b/docs/ja/sql-reference/table-functions/generate.md
index 0e76b88945e..1fa8fdcbb94 100644
--- a/docs/ja/sql-reference/table-functions/generate.md
+++ b/docs/ja/sql-reference/table-functions/generate.md
@@ -41,4 +41,4 @@ SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(
 └──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/hdfs.md b/docs/ja/sql-reference/table-functions/hdfs.md
index 23772bc2400..b166b13d698 100644
--- a/docs/ja/sql-reference/table-functions/hdfs.md
+++ b/docs/ja/sql-reference/table-functions/hdfs.md
@@ -99,6 +99,6 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 **も参照。**
 
--   [仮想列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [仮想列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/index.md b/docs/ja/sql-reference/table-functions/index.md
index 10ef4b991af..5ea4266466c 100644
--- a/docs/ja/sql-reference/table-functions/index.md
+++ b/docs/ja/sql-reference/table-functions/index.md
@@ -35,4 +35,4 @@ toc_title: "\u306F\u3058\u3081\u306B"
 | [odbc](odbc.md)       | を作成します。 [ODBC](../../engines/table-engines/integrations/odbc.md)-エンジンテーブル。                                             |
 | [hdfs](hdfs.md)       | を作成します。 [HDFS](../../engines/table-engines/integrations/hdfs.md)-エンジンテーブル。                                             |
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/input.md b/docs/ja/sql-reference/table-functions/input.md
index f40be9d250f..ea3d64241fe 100644
--- a/docs/ja/sql-reference/table-functions/input.md
+++ b/docs/ja/sql-reference/table-functions/input.md
@@ -44,4 +44,4 @@ $ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/jdbc.md b/docs/ja/sql-reference/table-functions/jdbc.md
index 313aefdf581..670c53a6663 100644
--- a/docs/ja/sql-reference/table-functions/jdbc.md
+++ b/docs/ja/sql-reference/table-functions/jdbc.md
@@ -37,4 +37,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/merge.md b/docs/ja/sql-reference/table-functions/merge.md
index 46981706844..097b020f65a 100644
--- a/docs/ja/sql-reference/table-functions/merge.md
+++ b/docs/ja/sql-reference/table-functions/merge.md
@@ -11,4 +11,4 @@ toc_title: "\u30DE\u30FC\u30B8"
 
 テーブル構造は、正規表現に一致する最初に検出されたテーブルから取得されます。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/mysql.md b/docs/ja/sql-reference/table-functions/mysql.md
index d7b494bb423..50c3dacaf3a 100644
--- a/docs/ja/sql-reference/table-functions/mysql.md
+++ b/docs/ja/sql-reference/table-functions/mysql.md
@@ -83,4 +83,4 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123')
 -   [その ‘MySQL’ 表エンジン](../../engines/table-engines/integrations/mysql.md)
 -   [外部辞書のソースとしてMySQLを使用する](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/mysql/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/null.md b/docs/ja/sql-reference/table-functions/null.md
new file mode 120000
index 00000000000..bff05386e28
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/null.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/null.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/numbers.md b/docs/ja/sql-reference/table-functions/numbers.md
index 3cc35fc2d82..04f1e10c459 100644
--- a/docs/ja/sql-reference/table-functions/numbers.md
+++ b/docs/ja/sql-reference/table-functions/numbers.md
@@ -27,4 +27,4 @@ SELECT * FROM system.numbers LIMIT 10;
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/odbc.md b/docs/ja/sql-reference/table-functions/odbc.md
index 746a8e44ddf..10d285d66be 100644
--- a/docs/ja/sql-reference/table-functions/odbc.md
+++ b/docs/ja/sql-reference/table-functions/odbc.md
@@ -105,4 +105,4 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 -   [ODBC外部辞書](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBCテーブルエンジン](../../engines/table-engines/integrations/odbc.md).
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/postgresql.md b/docs/ja/sql-reference/table-functions/postgresql.md
new file mode 120000
index 00000000000..4fb04199780
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/postgresql.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/postgresql.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/remote.md b/docs/ja/sql-reference/table-functions/remote.md
index b2ec55ec182..19a3b17beb6 100644
--- a/docs/ja/sql-reference/table-functions/remote.md
+++ b/docs/ja/sql-reference/table-functions/remote.md
@@ -82,4 +82,4 @@ example01-{01..02}-{1|2}
 
 `remoteSecure` -同じように `remote` but with secured connection. Default port — [tcp_port_secure](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port_secure) 設定または9440から。
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/s3.md b/docs/ja/sql-reference/table-functions/s3.md
new file mode 120000
index 00000000000..1878638f6e2
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/s3.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/s3.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/s3Cluster.md b/docs/ja/sql-reference/table-functions/s3Cluster.md
new file mode 120000
index 00000000000..48e5367084e
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/s3Cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/s3Cluster.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/sqlite.md b/docs/ja/sql-reference/table-functions/sqlite.md
new file mode 120000
index 00000000000..7f203c4d062
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/sqlite.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/sqlite.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/table-functions/url.md b/docs/ja/sql-reference/table-functions/url.md
index 245bbae29e0..13362f9cff2 100644
--- a/docs/ja/sql-reference/table-functions/url.md
+++ b/docs/ja/sql-reference/table-functions/url.md
@@ -23,4 +23,4 @@ structure-テーブルの構造 `'UserID UInt64, Name String'` 形式。 列名
 SELECT * FROM url('http://127.0.0.1:12345/', CSV, 'column1 String, column2 UInt32') LIMIT 3
 ```
 
-[元の記事](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
+[元の記事](https://clickhouse.com/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/ja/sql-reference/table-functions/view.md b/docs/ja/sql-reference/table-functions/view.md
new file mode 120000
index 00000000000..19a5bf245cd
--- /dev/null
+++ b/docs/ja/sql-reference/table-functions/view.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/view.md
\ No newline at end of file
diff --git a/docs/ja/sql-reference/window-functions/index.md b/docs/ja/sql-reference/window-functions/index.md
new file mode 120000
index 00000000000..206505bf0eb
--- /dev/null
+++ b/docs/ja/sql-reference/window-functions/index.md
@@ -0,0 +1 @@
+../../../en/sql-reference/window-functions/index.md
\ No newline at end of file
diff --git a/docs/ja/whats-new/changelog/2020.md b/docs/ja/whats-new/changelog/2020.md
new file mode 120000
index 00000000000..f0fb97311d2
--- /dev/null
+++ b/docs/ja/whats-new/changelog/2020.md
@@ -0,0 +1 @@
+../../../en/whats-new/changelog/2020.md
\ No newline at end of file
diff --git a/docs/ja/whats-new/roadmap.md b/docs/ja/whats-new/roadmap.md
index 468d4599b8f..c67f7d977ea 100644
--- a/docs/ja/whats-new/roadmap.md
+++ b/docs/ja/whats-new/roadmap.md
@@ -16,4 +16,4 @@ toc_title: "\u30ED\u30FC\u30C9"
 -   外部認証サービスとの統合
 -   資源のプールのためのより精密な分布のクラスター能力とユーザー
 
-{## [元の記事](https://clickhouse.tech/docs/en/roadmap/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/roadmap/) ##}
diff --git a/docs/ja/whats-new/security-changelog.md b/docs/ja/whats-new/security-changelog.md
index aa93f9c42ae..73665a2bc0b 100644
--- a/docs/ja/whats-new/security-changelog.md
+++ b/docs/ja/whats-new/security-changelog.md
@@ -73,4 +73,4 @@ Debパッケージ内の不適切な構成は、データベースの不正使
 
 クレジット：英国の国立サイバーセキュリティセンター（NCSC)
 
-{## [元の記事](https://clickhouse.tech/docs/en/security_changelog/) ##}
+{## [元の記事](https://clickhouse.com/docs/en/security_changelog/) ##}
diff --git a/docs/ru/commercial/cloud.md b/docs/ru/commercial/cloud.md
index e00fc3be673..549978f3cdf 100644
--- a/docs/ru/commercial/cloud.md
+++ b/docs/ru/commercial/cloud.md
@@ -5,54 +5,5 @@ toc_title: "Поставщики облачных услуг ClickHouse"
 
 # Поставщики облачных услуг ClickHouse {#clickhouse-cloud-service-providers}
 
-!!! info "Инфо"
-    Если вы запустили публичный облачный сервис с управляемым ClickHouse, не стесняйтесь [открыть pull request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) c добавлением его в последующий список.
-
-## Yandex Cloud {#yandex-cloud}
-
-[Yandex Managed Service for ClickHouse](https://cloud.yandex.ru/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) предоставляет следующие ключевые возможности:
-
--   полностью управляемый сервис ZooKeeper для [репликации ClickHouse](../engines/table-engines/mergetree-family/replication.md)
--   выбор типа хранилища
--   реплики в разных зонах доступности
--   шифрование и изоляция
--   автоматизированное техническое обслуживание
-
-## Altinity.Cloud {#altinity.cloud}
-
-[Altinity.Cloud](https://altinity.com/cloud-database/) — это полностью управляемый ClickHouse-as-a-Service для публичного облака Amazon.
-
--   быстрое развертывание кластеров ClickHouse на ресурсах Amazon.
--   легкое горизонтальное масштабирование также, как и вертикальное масштабирование узлов.
--   изолированные виртуальные сети для каждого клиента с общедоступным эндпоинтом или пирингом VPC.
--   настраиваемые типы и объемы хранилищ
--   cross-az масштабирование для повышения производительности и обеспечения высокой доступности
--   встроенный мониторинг и редактор SQL-запросов
-
-## Alibaba Cloud {#alibaba-cloud}
-
-Управляемый облачный сервис Alibaba для ClickHouse: [китайская площадка](https://www.aliyun.com/product/clickhouse), будет доступен на международной площадке в мае 2021 года. Сервис предоставляет следующие возможности:
-
--   надежный сервер для облачного хранилища на основе распределенной системы [Alibaba Cloud Apsara](https://www.alibabacloud.com/product/apsara-stack);
--   расширяемая по запросу емкость, без переноса данных вручную;
--   поддержка одноузловой и многоузловой архитектуры, архитектуры с одной или несколькими репликами, а также многоуровневого хранения cold и hot data;
--   поддержка прав доступа, one-key восстановления, многоуровневая защита сети, шифрование облачного диска;
--   полная интеграция с облачными системами логирования, базами данных и инструментами обработки данных;
--   встроенная платформа для мониторинга и управления базами данных;
--   техническая поддержка от экспертов по работе с базами данных.
-
-## SberCloud {#sbercloud}
-
-[Облачная платформа SberCloud.Advanced](https://sbercloud.ru/ru/advanced):
-
--   предоставляет более 50 высокотехнологичных сервисов;
--   позволяет быстро создавать и эффективно управлять ИТ-инфраструктурой, приложениями и интернет-сервисами;
--   радикально минимизирует ресурсы, требуемые для работы корпоративных ИТ-систем;
--   в разы сокращает время вывода новых продуктов на рынок.
-
-SberCloud.Advanced предоставляет [MapReduce Service (MRS)](https://docs.sbercloud.ru/mrs/ug/topics/ug__clickhouse.html) — надежную, безопасную и простую в использовании платформу корпоративного уровня для хранения, обработки и анализа больших данных. MRS позволяет быстро создавать и управлять кластерами ClickHouse.
-
--   Инстанс ClickHouse состоит из трех узлов ZooKeeper и нескольких узлов ClickHouse. Выделенный режим реплики используется для обеспечения высокой надежности двойных копий данных.
--   MRS предлагает возможности гибкого масштабирования при быстром росте сервисов в сценариях, когда емкости кластерного хранилища или вычислительных ресурсов процессора недостаточно. MRS в один клик предоставляет инструмент для балансировки данных при расширении узлов ClickHouse в кластере. Вы можете определить режим и время балансировки данных на основе характеристик сервиса, чтобы обеспечить доступность сервиса.
--   MRS использует архитектуру развертывания высокой доступности на основе Elastic Load Balance (ELB) — сервиса для автоматического распределения трафика на несколько внутренних узлов. Благодаря ELB, данные записываются в локальные таблицы и считываются из распределенных таблиц на разных узлах. Такая архитектура повышает отказоустойчивость кластера и гарантирует высокую доступность приложений.
-
+!!! info "Info"
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/ru/commercial/index.md b/docs/ru/commercial/index.md
index 66b1b125823..00fb1be7625 100644
--- a/docs/ru/commercial/index.md
+++ b/docs/ru/commercial/index.md
@@ -10,8 +10,5 @@ toc_title: "Коммерческие услуги"
 
 Категории услуг:
 
--   Облачные услуги [Cloud](../commercial/cloud.md)
--   Поддержка [Support](../commercial/support.md)
-
-!!! note "Для поставщиков услуг"
-    Если вы — представитель компании-поставщика услуг, вы можете отправить запрос на добавление вашей компании и ваших услуг в соответствующий раздел данной документации (или на добавление нового раздела, если ваши услуги не соответствуют ни одной из существующих категорий). Чтобы отправить запрос (pull-request) на добавление описания в документацию, нажмите на значок "карандаша" в правом верхнем углу страницы. Если ваши услуги доступны в только отдельных регионах, не забудьте указать это на соответствующих локализованных страницах (и обязательно отметьте это при отправке заявки).
+-   [Облачные услуги](../commercial/cloud.md)
+-   [Поддержка](../commercial/support.md)
diff --git a/docs/ru/development/adding_test_queries.md b/docs/ru/development/adding_test_queries.md
new file mode 120000
index 00000000000..def9c4077be
--- /dev/null
+++ b/docs/ru/development/adding_test_queries.md
@@ -0,0 +1 @@
+../../en/development/adding_test_queries.md
\ No newline at end of file
diff --git a/docs/ru/development/architecture.md b/docs/ru/development/architecture.md
index d2cfc44b711..77effe5916a 100644
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@@ -36,7 +36,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 `IDataType` и `IColumn` слабо связаны друг с другом. Различные типы данных могут быть представлены в памяти с помощью одной реализации `IColumn`. Например, и `DataTypeUInt32`, и `DataTypeDateTime` в памяти представлены как `ColumnUInt32` или `ColumnConstUInt32`. В добавок к этому, один тип данных может быть представлен различными реализациями `IColumn`. Например, `DataTypeUInt8` может быть представлен как `ColumnUInt8` и `ColumnConstUInt8`.
 
-`IDataType` хранит только метаданные. Например, `DataTypeUInt8` не хранить ничего (кроме скрытого указателя `vptr`), а `DataTypeFixedString` хранит только `N` (фиксированный размер строки).
+`IDataType` хранит только метаданные. Например, `DataTypeUInt8` не хранит ничего (кроме скрытого указателя `vptr`), а `DataTypeFixedString` хранит только `N` (фиксированный размер строки).
 
 В `IDataType` есть вспомогательные методы для данных различного формата. Среди них методы сериализации значений, допускающих использование кавычек, сериализации значения в JSON или XML. Среди них нет прямого соответствия форматам данных. Например, различные форматы `Pretty` и `TabSeparated` могут использовать один вспомогательный метод `serializeTextEscaped` интерфейса `IDataType`.
 
@@ -62,7 +62,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 > Потоки блоков используют «втягивающий» (pull) подход к управлению потоком выполнения: когда вы вытягиваете блок из первого потока, он, следовательно, вытягивает необходимые блоки из вложенных потоков, так и работает весь конвейер выполнения. Ни «pull» ни «push» не имеют явного преимущества, потому что поток управления неявный, и это ограничивает в реализации различных функций, таких как одновременное выполнение нескольких запросов (слияние нескольких конвейеров вместе). Это ограничение можно преодолеть с помощью сопрограмм (coroutines) или просто запуском дополнительных потоков, которые ждут друг друга. У нас может быть больше возможностей, если мы сделаем поток управления явным: если мы локализуем логику для передачи данных из одной расчетной единицы в другую вне этих расчетных единиц. Читайте эту [статью](http://journal.stuffwithstuff.com/2013/01/13/iteration-inside-and-out/) для углубленного изучения.
 
-Следует отметить, что конвейер выполнения запроса создает временные данные на каждом шаге. Мы стараемся сохранить размер блока достаточно маленьким, чтобы временные данные помещались в кэш процессора. При таком допущении запись и чтение временных данных практически бесплатны по сравнению с другими расчетами. Мы могли бы рассмотреть альтернативу, которая заключается в том, чтобы объединить многие операции в конвеере вместе. Это может сделать конвейер как можно короче и удалить большую часть временных данных, что может быть преимуществом, но у такого подхода также есть недостатки. Например, разделенный конвейер позволяет легко реализовать кэширование промежуточных данных, использование промежуточных данных из аналогичных запросов, выполняемых одновременно, и объединение конвейеров для аналогичных запросов.
+Следует отметить, что конвейер выполнения запроса создает временные данные на каждом шаге. Мы стараемся сохранить размер блока достаточно маленьким, чтобы временные данные помещались в кэш процессора. При таком допущении запись и чтение временных данных практически бесплатны по сравнению с другими расчетами. Мы могли бы рассмотреть альтернативу, которая заключается в том, чтобы объединить многие операции в конвейере вместе. Это может сделать конвейер как можно короче и удалить большую часть временных данных, что может быть преимуществом, но у такого подхода также есть недостатки. Например, разделенный конвейер позволяет легко реализовать кэширование промежуточных данных, использование промежуточных данных из аналогичных запросов, выполняемых одновременно, и объединение конвейеров для аналогичных запросов.
 
 ## Форматы {#formats}
 
@@ -119,7 +119,7 @@ ClickHouse - полноценная колоночная СУБД. Данные
 
 Существуют обычные функции и агрегатные функции. Агрегатные функции смотрите в следующем разделе.
 
-Обычный функции не изменяют число строк и  работают так, как если бы обрабатывали каждую строку независимо. В действительности же, функции вызываются не к отдельным строкам, а блокам данных для реализации векторизованного выполнения запросов.
+Обычные функции не изменяют число строк и  работают так, как если бы обрабатывали каждую строку независимо. В действительности же, функции вызываются не к отдельным строкам, а блокам данных для реализации векторизованного выполнения запросов.
 
 Некоторые функции, такие как [blockSize](../sql-reference/functions/other-functions.md#function-blocksize), [rowNumberInBlock](../sql-reference/functions/other-functions.md#function-rownumberinblock), и [runningAccumulate](../sql-reference/functions/other-functions.md#runningaccumulate), эксплуатируют блочную обработку и нарушают независимость строк.
 
@@ -162,7 +162,7 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 
 Сервера в кластере в основном независимы. Вы можете создать `Распределенную` (`Distributed`) таблицу на одном или всех серверах в кластере. Такая таблица сама по себе не хранит данные - она только предоставляет возможность "просмотра" всех локальных таблиц на нескольких узлах кластера. При выполнении `SELECT` распределенная таблица переписывает запрос, выбирает удаленные узлы в соответствии с настройками балансировки нагрузки и отправляет им запрос. Распределенная таблица просит удаленные сервера обработать запрос до той стадии, когда промежуточные результаты с разных серверов могут быть объединены. Затем он получает промежуточные результаты и объединяет их. Распределенная таблица пытается возложить как можно больше работы на удаленные серверы и сократить объем промежуточных данных, передаваемых по сети.
 
-Ситуация усложняется, при использовании подзапросов в случае `IN` или `JOIN`, когда каждый из них использует таблицу `Distributed`. Есть разные стратегии для выполнения таких запросов.
+Ситуация усложняется при использовании подзапросов в случае `IN` или `JOIN`, когда каждый из них использует таблицу `Distributed`. Есть разные стратегии для выполнения таких запросов.
 
 Глобального плана выполнения распределенных запросов не существует. Каждый узел имеет собственный локальный план для своей части работы. У нас есть простое однонаправленное выполнение распределенных запросов: мы отправляем запросы на удаленные узлы и затем объединяем результаты. Но это невозможно для сложных запросов `GROUP BY` высокой кардинальности или запросов с большим числом временных данных в `JOIN`: в таких случаях нам необходимо перераспределить («reshuffle») данные между серверами, что требует дополнительной координации. ClickHouse не поддерживает выполнение запросов такого рода, и нам нужно работать над этим.
 
@@ -199,4 +199,4 @@ ClickHouse имеет сильную типизацию, поэтому нет 
 !!! note "Note"
     Кластер ClickHouse состоит из независимых шардов, а каждый шард состоит из реплик. Кластер **не является эластичным** (not elastic), поэтому после добавления нового шарда данные не будут автоматически распределены между ними. Вместо этого нужно изменить настройки, чтобы выровнять нагрузку на кластер. Эта реализация дает вам больший контроль, и вполне приемлема для относительно небольших кластеров, таких как десятки узлов. Но для кластеров с сотнями узлов, которые мы используем в эксплуатации, такой подход становится существенным недостатком. Движки таблиц, которые охватывают весь кластер с динамически реплицируемыми областями, которые могут быть автоматически разделены и сбалансированы между кластерами, еще предстоит реализовать.
 
-{## [Original article](https://clickhouse.tech/docs/ru/development/architecture/) ##}
+{## [Original article](https://clickhouse.com/docs/ru/development/architecture/) ##}
diff --git a/docs/ru/development/browse-code.md b/docs/ru/development/browse-code.md
index 3f6de574abe..196054c3307 100644
--- a/docs/ru/development/browse-code.md
+++ b/docs/ru/development/browse-code.md
@@ -6,7 +6,7 @@ toc_title: "Навигация по коду ClickHouse"
 
 # Навигация по коду ClickHouse {#navigatsiia-po-kodu-clickhouse}
 
-Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.tech/codebrowser/html_report///ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно.
+Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.com/codebrowser/html_report///ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно.
 
 Также вы можете просматривать исходники на [GitHub](https://github.com/ClickHouse/ClickHouse).
 
diff --git a/docs/ru/development/build-osx.md b/docs/ru/development/build-osx.md
index 8d5d06a544c..a1192b509df 100644
--- a/docs/ru/development/build-osx.md
+++ b/docs/ru/development/build-osx.md
@@ -74,7 +74,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
   $ rm -rf build
   $ mkdir build
   $ cd build
-  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-10 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-10 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
+  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix gcc)/bin/gcc-11 -DCMAKE_CXX_COMPILER=$(brew --prefix gcc)/bin/g++-11 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
   $ cmake --build . --config RelWithDebInfo
   $ cd ..
   ```
@@ -122,4 +122,4 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
 
 4. Чтобы проверить, как это работает, выполните команду `ulimit -n`.
 
-[Original article](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/ru/development/continuous-integration.md b/docs/ru/development/continuous-integration.md
new file mode 120000
index 00000000000..f68058a436e
--- /dev/null
+++ b/docs/ru/development/continuous-integration.md
@@ -0,0 +1 @@
+../../en/development/continuous-integration.md
\ No newline at end of file
diff --git a/docs/ru/development/contrib.md b/docs/ru/development/contrib.md
index 33a533d7f75..3d6e5e4cb1b 100644
--- a/docs/ru/development/contrib.md
+++ b/docs/ru/development/contrib.md
@@ -4,40 +4,95 @@ toc_title: "Используемые сторонние библиотеки"
 ---
 
 
-# Используемые сторонние библиотеки {#ispolzuemye-storonnie-biblioteki}
+# Используемые сторонние библиотеки {#third-party-libraries-used}
 
-| Библиотека          | Лицензия                                                                                                                                     |
-|---------------------|----------------------------------------------------------------------------------------------------------------------------------------------|
-| base64              | [BSD 2-Clause License](https://github.com/aklomp/base64/blob/a27c565d1b6c676beaf297fe503c4518185666f7/LICENSE)                               |
-| boost               | [Boost Software License 1.0](https://github.com/ClickHouse-Extras/boost-extra/blob/6883b40449f378019aec792f9983ce3afc7ff16e/LICENSE_1_0.txt) |
-| brotli              | [MIT](https://github.com/google/brotli/blob/master/LICENSE)                                                                                  |
-| capnproto           | [MIT](https://github.com/capnproto/capnproto/blob/master/LICENSE)                                                                            |
-| cctz                | [Apache License 2.0](https://github.com/google/cctz/blob/4f9776a310f4952454636363def82c2bf6641d5f/LICENSE.txt)                               |
-| double-conversion   | [BSD 3-Clause License](https://github.com/google/double-conversion/blob/cf2f0f3d547dc73b4612028a155b80536902ba02/LICENSE)                    |
-| FastMemcpy          | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libmemcpy/impl/LICENSE)                                                      |
-| googletest          | [BSD 3-Clause License](https://github.com/google/googletest/blob/master/LICENSE)                                                             |
-| h3                  | [Apache License 2.0](https://github.com/uber/h3/blob/master/LICENSE)                                                                         |
-| hyperscan           | [BSD 3-Clause License](https://github.com/intel/hyperscan/blob/master/LICENSE)                                                               |
-| libcxxabi           | [BSD + MIT](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libglibc-compatibility/libcxxabi/LICENSE.TXT)                          |
-| libdivide           | [Zlib License](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libdivide/LICENSE.txt)                                           |
-| libgsasl            | [LGPL v2.1](https://github.com/ClickHouse-Extras/libgsasl/blob/3b8948a4042e34fb00b4fb987535dc9e02e39040/LICENSE)                             |
-| libhdfs3            | [Apache License 2.0](https://github.com/ClickHouse-Extras/libhdfs3/blob/bd6505cbb0c130b0db695305b9a38546fa880e5a/LICENSE.txt)                |
-| libmetrohash        | [Apache License 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libmetrohash/LICENSE)                                      |
-| libpcg-random       | [Apache License 2.0](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libpcg-random/LICENSE-APACHE.txt)                          |
-| libressl            | [OpenSSL License](https://github.com/ClickHouse-Extras/ssl/blob/master/COPYING)                                                              |
-| librdkafka          | [BSD 2-Clause License](https://github.com/edenhill/librdkafka/blob/363dcad5a23dc29381cc626620e68ae418b3af19/LICENSE)                         |
-| libwidechar_width  | [CC0 1.0 Universal](https://github.com/ClickHouse/ClickHouse/blob/master/libs/libwidechar_width/LICENSE)                                     |
-| llvm                | [BSD 3-Clause License](https://github.com/ClickHouse-Extras/llvm/blob/163def217817c90fb982a6daf384744d8472b92b/llvm/LICENSE.TXT)             |
-| lz4                 | [BSD 2-Clause License](https://github.com/lz4/lz4/blob/c10863b98e1503af90616ae99725ecd120265dfb/LICENSE)                                     |
-| mariadb-connector-c | [LGPL v2.1](https://github.com/ClickHouse-Extras/mariadb-connector-c/blob/3.1/COPYING.LIB)                                                   |
-| murmurhash          | [Public Domain](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/murmurhash/LICENSE)                                             |
-| pdqsort             | [Zlib License](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/pdqsort/license.txt)                                             |
-| poco                | [Boost Software License - Version 1.0](https://github.com/ClickHouse-Extras/poco/blob/fe5505e56c27b6ecb0dcbc40c49dc2caf4e9637f/LICENSE)      |
-| protobuf            | [BSD 3-Clause License](https://github.com/ClickHouse-Extras/protobuf/blob/12735370922a35f03999afff478e1c6d7aa917a4/LICENSE)                  |
-| re2                 | [BSD 3-Clause License](https://github.com/google/re2/blob/7cf8b88e8f70f97fd4926b56aa87e7f53b2717e0/LICENSE)                                  |
-| UnixODBC            | [LGPL v2.1](https://github.com/ClickHouse-Extras/UnixODBC/tree/b0ad30f7f6289c12b76f04bfb9d466374bb32168)                                     |
-| zlib-ng             | [Zlib License](https://github.com/ClickHouse-Extras/zlib-ng/blob/develop/LICENSE.md)                                                         |
-| zstd                | [BSD 3-Clause License](https://github.com/facebook/zstd/blob/dev/LICENSE)                                                                    |
+Список сторонних библиотек:
+
+| Библиотека | Тип лицензии |
+|:-|:-|
+| abseil-cpp | [Apache](https://github.com/ClickHouse-Extras/abseil-cpp/blob/4f3b686f86c3ebaba7e4e926e62a79cb1c659a54/LICENSE) |
+| AMQP-CPP | [Apache](https://github.com/ClickHouse-Extras/AMQP-CPP/blob/1a6c51f4ac51ac56610fa95081bd2f349911375a/LICENSE) |
+| arrow | [Apache](https://github.com/ClickHouse-Extras/arrow/blob/078e21bad344747b7656ef2d7a4f7410a0a303eb/LICENSE.txt) |
+| avro | [Apache](https://github.com/ClickHouse-Extras/avro/blob/e43c46e87fd32eafdc09471e95344555454c5ef8/LICENSE.txt) |
+| aws | [Apache](https://github.com/ClickHouse-Extras/aws-sdk-cpp/blob/7d48b2c8193679cc4516e5bd68ae4a64b94dae7d/LICENSE.txt) |
+| aws-c-common | [Apache](https://github.com/ClickHouse-Extras/aws-c-common/blob/736a82d1697c108b04a277e66438a7f4e19b6857/LICENSE) |
+| aws-c-event-stream | [Apache](https://github.com/ClickHouse-Extras/aws-c-event-stream/blob/3bc33662f9ccff4f4cbcf9509cc78c26e022fde0/LICENSE) |
+| aws-checksums | [Apache](https://github.com/ClickHouse-Extras/aws-checksums/blob/519d6d9093819b6cf89ffff589a27ef8f83d0f65/LICENSE) |
+| base64 | [BSD 2-clause](https://github.com/ClickHouse-Extras/Turbo-Base64/blob/af9b331f2b4f30b41c70f3a571ff904a8251c1d3/LICENSE) |
+| boost | [Boost](https://github.com/ClickHouse-Extras/boost/blob/9cf09dbfd55a5c6202dedbdf40781a51b02c2675/LICENSE_1_0.txt) |
+| boringssl | [BSD](https://github.com/ClickHouse-Extras/boringssl/blob/a6a2e2ab3e44d97ce98e51c558e989f211de7eb3/LICENSE) |
+| brotli | [MIT](https://github.com/google/brotli/blob/63be8a99401992075c23e99f7c84de1c653e39e2/LICENSE) |
+| capnproto | [MIT](https://github.com/capnproto/capnproto/blob/a00ccd91b3746ef2ab51d40fe3265829949d1ace/LICENSE) |
+| cassandra | [Apache](https://github.com/ClickHouse-Extras/cpp-driver/blob/eb9b68dadbb4417a2c132ad4a1c2fa76e65e6fc1/LICENSE.txt) |
+| cctz | [Apache](https://github.com/ClickHouse-Extras/cctz/blob/c0f1bcb97fd2782f7c3f972fadd5aad5affac4b8/LICENSE.txt) |
+| cityhash102 | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/cityhash102/COPYING) |
+| cppkafka | [BSD 2-clause](https://github.com/mfontanini/cppkafka/blob/5a119f689f8a4d90d10a9635e7ee2bee5c127de1/LICENSE) |
+| croaring | [Apache](https://github.com/RoaringBitmap/CRoaring/blob/2c867e9f9c9e2a3a7032791f94c4c7ae3013f6e0/LICENSE) |
+| curl | [Apache](https://github.com/curl/curl/blob/3b8bbbbd1609c638a3d3d0acb148a33dedb67be3/docs/LICENSE-MIXING.md) |
+| cyrus-sasl | [BSD 2-clause](https://github.com/ClickHouse-Extras/cyrus-sasl/blob/e6466edfd638cc5073debe941c53345b18a09512/COPYING) |
+| double-conversion | [BSD 3-clause](https://github.com/google/double-conversion/blob/cf2f0f3d547dc73b4612028a155b80536902ba02/LICENSE) |
+| dragonbox | [Apache](https://github.com/ClickHouse-Extras/dragonbox/blob/923705af6fd953aa948fc175f6020b15f7359838/LICENSE-Apache2-LLVM) |
+| fast_float | [Apache](https://github.com/fastfloat/fast_float/blob/7eae925b51fd0f570ccd5c880c12e3e27a23b86f/LICENSE) |
+| fastops | [MIT](https://github.com/ClickHouse-Extras/fastops/blob/88752a5e03cf34639a4a37a4b41d8b463fffd2b5/LICENSE) |
+| flatbuffers | [Apache](https://github.com/ClickHouse-Extras/flatbuffers/blob/eb3f827948241ce0e701516f16cd67324802bce9/LICENSE.txt) |
+| fmtlib | [Unknown](https://github.com/fmtlib/fmt/blob/c108ee1d590089ccf642fc85652b845924067af2/LICENSE.rst) |
+| gcem | [Apache](https://github.com/kthohr/gcem/blob/8d4f1b5d76ea8f6ff12f3f4f34cda45424556b00/LICENSE) |
+| googletest | [BSD 3-clause](https://github.com/google/googletest/blob/e7e591764baba0a0c3c9ad0014430e7a27331d16/LICENSE) |
+| grpc | [Apache](https://github.com/ClickHouse-Extras/grpc/blob/60c986e15cae70aade721d26badabab1f822fdd6/LICENSE) |
+| h3 | [Apache](https://github.com/ClickHouse-Extras/h3/blob/c7f46cfd71fb60e2fefc90e28abe81657deff735/LICENSE) |
+| hyperscan | [Boost](https://github.com/ClickHouse-Extras/hyperscan/blob/e9f08df0213fc637aac0a5bbde9beeaeba2fe9fa/LICENSE) |
+| icu | [Public Domain](https://github.com/unicode-org/icu/blob/faa2f9f9e1fe74c5ed00eba371d2830134cdbea1/icu4c/LICENSE) |
+| icudata | [Public Domain](https://github.com/ClickHouse-Extras/icudata/blob/f020820388e3faafb44cc643574a2d563dfde572/LICENSE) |
+| jemalloc | [BSD 2-clause](https://github.com/ClickHouse-Extras/jemalloc/blob/e6891d9746143bf2cf617493d880ba5a0b9a3efd/COPYING) |
+| krb5 | [MIT](https://github.com/ClickHouse-Extras/krb5/blob/5149dea4e2be0f67707383d2682b897c14631374/src/lib/gssapi/LICENSE) |
+| libc-headers | [LGPL](https://github.com/ClickHouse-Extras/libc-headers/blob/a720b7105a610acbd7427eea475a5b6810c151eb/LICENSE) |
+| libcpuid | [BSD 2-clause](https://github.com/ClickHouse-Extras/libcpuid/blob/8db3b8d2d32d22437f063ce692a1b9bb15e42d18/COPYING) |
+| libcxx | [Apache](https://github.com/ClickHouse-Extras/libcxx/blob/2fa892f69acbaa40f8a18c6484854a6183a34482/LICENSE.TXT) |
+| libcxxabi | [Apache](https://github.com/ClickHouse-Extras/libcxxabi/blob/df8f1e727dbc9e2bedf2282096fa189dc3fe0076/LICENSE.TXT) |
+| libdivide | [zLib](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libdivide/LICENSE.txt) |
+| libfarmhash | [MIT](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libfarmhash/COPYING) |
+| libgsasl | [LGPL](https://github.com/ClickHouse-Extras/libgsasl/blob/383ee28e82f69fa16ed43b48bd9c8ee5b313ab84/LICENSE) |
+| libhdfs3 | [Apache](https://github.com/ClickHouse-Extras/libhdfs3/blob/095b9d48b400abb72d967cb0539af13b1e3d90cf/LICENSE.txt) |
+| libmetrohash | [Apache](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/libmetrohash/LICENSE) |
+| libpq | [Unknown](https://github.com/ClickHouse-Extras/libpq/blob/e071ea570f8985aa00e34f5b9d50a3cfe666327e/COPYRIGHT) |
+| libpqxx | [BSD 3-clause](https://github.com/ClickHouse-Extras/libpqxx/blob/357608d11b7a1961c3fb7db2ef9a5dbb2e87da77/COPYING) |
+| librdkafka | [MIT](https://github.com/ClickHouse-Extras/librdkafka/blob/b8554f1682062c85ba519eb54ef2f90e02b812cb/LICENSE.murmur2) |
+| libunwind | [Apache](https://github.com/ClickHouse-Extras/libunwind/blob/6b816d2fba3991f8fd6aaec17d92f68947eab667/LICENSE.TXT) |
+| libuv | [BSD](https://github.com/ClickHouse-Extras/libuv/blob/e2e9b7e9f978ce8a1367b5fe781d97d1ce9f94ab/LICENSE) |
+| llvm | [Apache](https://github.com/ClickHouse-Extras/llvm/blob/e5751459412bce1391fb7a2e9bbc01e131bf72f1/llvm/LICENSE.TXT) |
+| lz4 | [BSD](https://github.com/lz4/lz4/blob/f39b79fb02962a1cd880bbdecb6dffba4f754a11/LICENSE) |
+| mariadb-connector-c | [LGPL](https://github.com/ClickHouse-Extras/mariadb-connector-c/blob/5f4034a3a6376416504f17186c55fe401c6d8e5e/COPYING.LIB) |
+| miniselect | [Boost](https://github.com/danlark1/miniselect/blob/be0af6bd0b6eb044d1acc4f754b229972d99903a/LICENSE_1_0.txt) |
+| msgpack-c | [Boost](https://github.com/msgpack/msgpack-c/blob/46684265d50b5d1b062d4c5c428ba08462844b1d/LICENSE_1_0.txt) |
+| murmurhash | [Public Domain](https://github.com/ClickHouse/ClickHouse/blob/master/contrib/murmurhash/LICENSE) |
+| NuRaft | [Apache](https://github.com/ClickHouse-Extras/NuRaft/blob/7ecb16844af6a9c283ad432d85ecc2e7d1544676/LICENSE) |
+| openldap | [Unknown](https://github.com/ClickHouse-Extras/openldap/blob/0208811b6043ca06fda8631a5e473df1ec515ccb/LICENSE) |
+| orc | [Apache](https://github.com/ClickHouse-Extras/orc/blob/0a936f6bbdb9303308973073f8623b5a8d82eae1/LICENSE) |
+| poco | [Boost](https://github.com/ClickHouse-Extras/poco/blob/7351c4691b5d401f59e3959adfc5b4fa263b32da/LICENSE) |
+| protobuf | [BSD 3-clause](https://github.com/ClickHouse-Extras/protobuf/blob/75601841d172c73ae6bf4ce8121f42b875cdbabd/LICENSE) |
+| rapidjson | [MIT](https://github.com/ClickHouse-Extras/rapidjson/blob/c4ef90ccdbc21d5d5a628d08316bfd301e32d6fa/bin/jsonschema/LICENSE) |
+| re2 | [BSD 3-clause](https://github.com/google/re2/blob/13ebb377c6ad763ca61d12dd6f88b1126bd0b911/LICENSE) |
+| replxx | [BSD 3-clause](https://github.com/ClickHouse-Extras/replxx/blob/c81be6c68b146f15f2096b7ef80e3f21fe27004c/LICENSE.md) |
+| rocksdb | [BSD 3-clause](https://github.com/ClickHouse-Extras/rocksdb/blob/b6480c69bf3ab6e298e0d019a07fd4f69029b26a/LICENSE.leveldb) |
+| s2geometry | [Apache](https://github.com/ClickHouse-Extras/s2geometry/blob/20ea540d81f4575a3fc0aea585aac611bcd03ede/LICENSE) |
+| sentry-native | [MIT](https://github.com/ClickHouse-Extras/sentry-native/blob/94644e92f0a3ff14bd35ed902a8622a2d15f7be4/LICENSE) |
+| simdjson | [Apache](https://github.com/simdjson/simdjson/blob/8df32cea3359cb30120795da6020b3b73da01d38/LICENSE) |
+| snappy | [Public Domain](https://github.com/google/snappy/blob/3f194acb57e0487531c96b97af61dcbd025a78a3/COPYING) |
+| sparsehash-c11 | [BSD 3-clause](https://github.com/sparsehash/sparsehash-c11/blob/cf0bffaa456f23bc4174462a789b90f8b6f5f42f/LICENSE) |
+| stats | [Apache](https://github.com/kthohr/stats/blob/b6dd459c10a88c7ea04693c007e9e35820c5d9ad/LICENSE) |
+| thrift | [Apache](https://github.com/apache/thrift/blob/010ccf0a0c7023fea0f6bf4e4078ebdff7e61982/LICENSE) |
+| unixodbc | [LGPL](https://github.com/ClickHouse-Extras/UnixODBC/blob/b0ad30f7f6289c12b76f04bfb9d466374bb32168/COPYING) |
+| xz | [Public Domain](https://github.com/xz-mirror/xz/blob/869b9d1b4edd6df07f819d360d306251f8147353/COPYING) |
+| zlib-ng | [zLib](https://github.com/ClickHouse-Extras/zlib-ng/blob/6a5e93b9007782115f7f7e5235dedc81c4f1facb/LICENSE.md) |
+| zstd | [BSD](https://github.com/facebook/zstd/blob/a488ba114ec17ea1054b9057c26a046fc122b3b6/LICENSE) |
+
+Список всех сторонних библиотек можно получить с помощью запроса:
+
+``` sql
+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==)
 
 ## Рекомендации по добавлению сторонних библиотек и поддержанию в них пользовательских изменений {#adding-third-party-libraries}
 
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index 391d28d5a89..8466c709ad1 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -40,10 +40,10 @@ ClickHouse не работает и не собирается на 32-битны
 
 Выполните в терминале:
 
-    git clone --recursive git@github.com:ClickHouse/ClickHouse.git
+    git clone git@github.com:ClickHouse/ClickHouse.git
     cd ClickHouse
 
-Замените *yandex* на имя вашего аккаунта на GitHub.
+Замените первое вхождение слова `ClickHouse` в команде для git на имя вашего аккаунта на GitHub.
 
 Эта команда создаст директорию ClickHouse, содержащую рабочую копию проекта.
 
@@ -82,7 +82,7 @@ ClickHouse не работает и не собирается на 32-битны
 
 Работа с сабмодулями git может быть достаточно болезненной. Следующие команды позволят содержать их в порядке:
 
-    # ! Каждая команда принимает аргумент --recursive
+    # ! Каждая команда принимает аргумент
     # Обновить URLs удалённого репозитория для каждого сабмодуля, используется относительно редко
     git submodule sync
     # Добавить новые сабмодули
@@ -92,21 +92,20 @@ ClickHouse не работает и не собирается на 32-битны
     # Две последние команды могут быть объединены вместе:
     git submodule update --init
 
-The next commands would help you to reset all submodules to the initial state (!WARING! - any changes inside will be deleted):
 Следующие команды помогут сбросить все сабмодули в изначальное состояние (!ВНИМАНИЕ! - все изменения в сабмодулях будут утеряны):
 
     # Synchronizes submodules' remote URL with .gitmodules
     # Обновить URLs удалённого репозитория для каждого сабмодуля
-    git submodule sync --recursive
+    git submodule sync
     # Обновить существующие модули и добавить отсутствующие
-    git submodule update --init --recursive
+    git submodule update --init
     # Удалить все изменения в сабмодуле относительно HEAD
     git submodule foreach git reset --hard
     # Очистить игнорируемые файлы
     git submodule foreach git clean -xfd
     # Повторить последние 4 команды для каждого из сабмодулей
-    git submodule foreach git submodule sync --recursive
-    git submodule foreach git submodule update --init --recursive
+    git submodule foreach git submodule sync
+    git submodule foreach git submodule update --init
     git submodule foreach git submodule foreach git reset --hard
     git submodule foreach git submodule foreach git clean -xfd
 
@@ -140,7 +139,7 @@ ClickHouse использует для сборки некоторое коли
 
 Впрочем, наша среда continuous integration проверяет около десятка вариантов сборки, включая gcc, но сборка с помощью gcc непригодна для использования в продакшене.
 
-On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
+На Ubuntu и Debian вы можете использовать скрипт для автоматической установки (см. [официальный сайт](https://apt.llvm.org/))
 
 ```bash
 sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
@@ -163,13 +162,19 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
     export CC=clang CXX=clang++
     cmake ..
 
-Переменная CC отвечает за компилятор C (сокращение от слов C Compiler), переменная CXX отвечает за выбор компилятора C++ (символ X - это как плюс, но положенный набок, ради того, чтобы превратить его в букву).
+Переменная CC отвечает за компилятор C (сокращение от слов C Compiler), переменная CXX отвечает за выбор компилятора C++ (символ X - это как плюс, но положенный набок, ради того, чтобы превратить его в букву). При получении ошибки типа `Could not find compiler set in environment variable CC: clang` необходимо указать в значениях для переменных CC и CXX явную версию компилятора, например, `clang-12` и `clang++-12`.
 
 Для более быстрой сборки, можно использовать debug вариант - сборку без оптимизаций. Для этого, укажите параметр `-D CMAKE_BUILD_TYPE=Debug`:
 
     cmake -D CMAKE_BUILD_TYPE=Debug ..
 
-Вы можете изменить вариант сборки, выполнив эту команду в директории build.
+В случае использования на разработческой машине старого HDD или SSD, а также при желании использовать меньше места для артефактов сборки можно использовать следующую команду:
+```bash
+cmake -DUSE_DEBUG_HELPERS=1 -DUSE_STATIC_LIBRARIES=0 -DSPLIT_SHARED_LIBRARIES=1 -DCLICKHOUSE_SPLIT_BINARY=1 ..
+```
+При этом надо учесть, что получаемые в результате сборки исполнимые файлы будут динамически слинкованы с библиотеками, и поэтому фактически станут непереносимыми на другие компьютеры (либо для этого нужно будет предпринять значительно больше усилий по сравнению со статической сборкой). Плюсом же в данном случае является значительно меньшее время сборки (это проявляется не на первой сборке, а на последующих, после внесения изменений в исходный код - тратится меньшее время на линковку по сравнению со статической сборкой) и значительно меньшее использование места на жёстком диске (экономия более, чем в 3 раза по сравнению со статической сборкой). Для целей разработки, когда планируются только отладочные запуски на том же компьютере, где осуществлялась сборка, это может быть наиболее удобным вариантом.
+
+Вы можете изменить вариант сборки, выполнив новую команду в директории build.
 
 Запустите ninja для сборки:
 
@@ -195,6 +200,14 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 В процессе сборки могут появится сообщения `libprotobuf WARNING` про protobuf файлы в библиотеке libhdfs2. Это не имеет значения.
 
+В случае получения ошибок вида `error: variable 'y' set but not used [-Werror,-Wunused-but-set-variable]` ножно попробовать использовать другую версию компилятора сlang. Например, на момент написания данного текста описанная выше команда по установке clang для Ubuntu 20.04 по-умолчанию устанавливает clang-13, с которым возникает эта ошибка. Для решения проблемы можно установить clang-12 с помощью команд:
+```bash
+wget https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
+sudo ./llvm.sh 12
+```
+И далее использовать именно его, указав соответствующую версию при установке переменных окружения CC и CXX перед вызовом cmake.
+
 При успешной сборке, вы получите готовый исполняемый файл `ClickHouse/build/programs/clickhouse`:
 
     ls -l programs/clickhouse
@@ -234,17 +247,17 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 В качестве простых редакторов кода можно использовать Sublime Text или Visual Studio Code или Kate (все варианты доступны под Linux).
 
-На всякий случай заметим, что CLion самостоятельно создаёт свою build директорию, самостоятельно выбирает тип сборки debug по-умолчанию, для конфигурации использует встроенную в CLion версию CMake вместо установленного вами, а для запуска задач использует make вместо ninja. Это нормально, просто имейте это ввиду, чтобы не возникало путаницы.
+На всякий случай заметим, что CLion самостоятельно создаёт свою build директорию, самостоятельно выбирает тип сборки debug по-умолчанию, для конфигурации использует встроенную в CLion версию CMake вместо установленного вами, а для запуска задач использует make вместо ninja (но при желании начиная с версии CLion 2019.3 EAP можно настроить использование ninja, см. подробнее [тут](https://blog.jetbrains.com/clion/2019/10/clion-2019-3-eap-ninja-cmake-generators/)). Это нормально, просто имейте это ввиду, чтобы не возникало путаницы.
 
 ## Написание кода {#napisanie-koda}
 
-Описание архитектуры ClickHouse: https://clickhouse.tech/docs/ru/development/architecture/
+Описание архитектуры ClickHouse: https://clickhouse.com/docs/ru/development/architecture/
 
-Стиль кода: https://clickhouse.tech/docs/ru/development/style/
+Стиль кода: https://clickhouse.com/docs/ru/development/style/
 
-Рекомендации по добавлению сторонних библиотек и поддержанию в них пользовательских изменений: https://clickhouse.tech/docs/ru/development/contrib/#adding-third-party-libraries
+Рекомендации по добавлению сторонних библиотек и поддержанию в них пользовательских изменений: https://clickhouse.com/docs/ru/development/contrib/#adding-third-party-libraries
 
-Разработка тестов: https://clickhouse.tech/docs/ru/development/tests/
+Разработка тестов: https://clickhouse.com/docs/ru/development/tests/
 
 Список задач: https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
@@ -254,8 +267,8 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
     sudo apt install wget xz-utils
 
-    wget https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz
-    wget https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz
 
     xz -v -d hits_v1.tsv.xz
     xz -v -d visits_v1.tsv.xz
diff --git a/docs/ru/engines/database-engines/atomic.md b/docs/ru/engines/database-engines/atomic.md
index ecdd809b6ec..8ccb3b968cf 100644
--- a/docs/ru/engines/database-engines/atomic.md
+++ b/docs/ru/engines/database-engines/atomic.md
@@ -5,12 +5,12 @@ toc_title: Atomic
 
 # Atomic {#atomic}
 
-Поддерживает неблокирующие запросы [DROP TABLE](#drop-detach-table) и [RENAME TABLE](#rename-table) и атомарные запросы [EXCHANGE TABLES t1 AND t](#exchange-tables). Движок `Atomic` используется по умолчанию.
+Поддерживает неблокирующие запросы [DROP TABLE](#drop-detach-table) и [RENAME TABLE](#rename-table) и атомарные запросы [EXCHANGE TABLES](#exchange-tables). Движок `Atomic` используется по умолчанию.
 
 ## Создание БД {#creating-a-database}
 
 ``` sql
-    CREATE DATABASE test[ ENGINE = Atomic];
+CREATE DATABASE test [ENGINE = Atomic];
 ```
 
 ## Особенности и рекомендации {#specifics-and-recommendations}
@@ -25,16 +25,16 @@ CREATE TABLE name UUID '28f1c61c-2970-457a-bffe-454156ddcfef' (n UInt64) ENGINE
 ```
 ### RENAME TABLE {#rename-table}
 
-Запросы `RENAME` выполняются без изменения UUID и перемещения табличных данных. Эти запросы не ожидают завершения использующих таблицу запросов и будут выполнены мгновенно.
+Запросы [RENAME](../../sql-reference/statements/rename.md) выполняются без изменения UUID и перемещения табличных данных. Эти запросы не ожидают завершения использующих таблицу запросов и выполняются мгновенно.
 
 ### DROP/DETACH TABLE {#drop-detach-table}
 
 При выполнении запроса `DROP TABLE` никакие данные не удаляются. Таблица помечается как удаленная, метаданные перемещаются в папку `/clickhouse_path/metadata_dropped/` и база данных уведомляет фоновый поток. Задержка перед окончательным удалением данных задается настройкой [database_atomic_delay_before_drop_table_sec](../../operations/server-configuration-parameters/settings.md#database_atomic_delay_before_drop_table_sec).
 Вы можете задать синхронный режим, определяя модификатор `SYNC`. Используйте для этого настройку [database_atomic_wait_for_drop_and_detach_synchronously](../../operations/settings/settings.md#database_atomic_wait_for_drop_and_detach_synchronously). В этом случае запрос `DROP` ждет завершения `SELECT`, `INSERT` и других запросов, которые используют таблицу. Таблица будет фактически удалена, когда она не будет использоваться.
 
-### EXCHANGE TABLES {#exchange-tables}
+### EXCHANGE TABLES/DICTIONARIES {#exchange-tables}
 
-Запрос `EXCHANGE` меняет местами две таблицы атомарно. Вместо неатомарной операции:
+Запрос [EXCHANGE](../../sql-reference/statements/exchange.md) атомарно меняет местами две таблицы или два словаря. Например, вместо неатомарной операции:
 
 ```sql
 RENAME TABLE new_table TO tmp, old_table TO new_table, tmp TO old_table;
@@ -47,7 +47,7 @@ EXCHANGE TABLES new_table AND old_table;
 
 ### ReplicatedMergeTree in Atomic Database {#replicatedmergetree-in-atomic-database}
 
-Для таблиц [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) рекомендуется не указывать параметры движка - путь в ZooKeeper и имя реплики. В этом случае будут использоваться параметры конфигурации: [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) и [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). Если вы хотите определить параметры движка явно, рекомендуется использовать макрос {uuid}. Это удобно, так как автоматически генерируются уникальные пути для каждой таблицы в ZooKeeper.
+Для таблиц [ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication) рекомендуется не указывать параметры движка - путь в ZooKeeper и имя реплики. В этом случае будут использоваться параметры конфигурации: [default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path) и [default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name). Если вы хотите определить параметры движка явно, рекомендуется использовать макрос `{uuid}`. Это удобно, так как автоматически генерируются уникальные пути для каждой таблицы в ZooKeeper.
 
 ## Смотрите также
 
diff --git a/docs/ru/engines/database-engines/materialized-mysql.md b/docs/ru/engines/database-engines/materialized-mysql.md
index f5f0166c9dc..4073df7b7ec 100644
--- a/docs/ru/engines/database-engines/materialized-mysql.md
+++ b/docs/ru/engines/database-engines/materialized-mysql.md
@@ -1,17 +1,16 @@
-
 ---
 toc_priority: 29
-toc_title: MaterializedMySQL
+toc_title: "[experimental] MaterializedMySQL"
 ---
 
-# MaterializedMySQL {#materialized-mysql}
+# [экспериментальный] MaterializedMySQL {#materialized-mysql}
+
+**Это экспериментальный движок, который не следует использовать в продакшене.**
 
 Создает базу данных ClickHouse со всеми таблицами, существующими в MySQL, и всеми данными в этих таблицах.
 
 Сервер ClickHouse работает как реплика MySQL. Он читает файл binlog и выполняет DDL and DML-запросы.
 
-`MaterializedMySQL` — экспериментальный движок баз данных.
-
 ## Создание базы данных {#creating-a-database}
 
 ``` sql
@@ -26,6 +25,32 @@ ENGINE = MaterializedMySQL('host:port', ['database' | database], 'user', 'passwo
 -   `user` — пользователь MySQL.
 -   `password` — пароль пользователя.
 
+**Настройки движка**
+
+-   `max_rows_in_buffer` — максимальное количество строк, содержимое которых может кешироваться в памяти (для одной таблицы и данных кеша, которые невозможно запросить). При превышении количества строк, данные будут материализованы. Значение по умолчанию: `65 505`.
+-   `max_bytes_in_buffer` —  максимальное количество байтов, которое разрешено кешировать в памяти (для одной таблицы и данных кеша, которые невозможно запросить). При превышении количества строк, данные будут материализованы. Значение по умолчанию: `1 048 576`.
+-   `max_rows_in_buffers` — максимальное количество строк, содержимое которых может кешироваться в памяти (для базы данных и данных кеша, которые невозможно запросить). При превышении количества строк, данные будут материализованы. Значение по умолчанию: `65 505`.
+-   `max_bytes_in_buffers` — максимальное количество байтов, которое разрешено кешировать данным в памяти (для базы данных и данных кеша, которые невозможно запросить). При превышении количества строк, данные будут материализованы. Значение по умолчанию: `1 048 576`.
+-   `max_flush_data_time` — максимальное время в миллисекундах, в течение которого разрешено кешировать данные в памяти (для базы данных и данных кеша, которые невозможно запросить). При превышении количества указанного периода, данные будут материализованы. Значение по умолчанию: `1000`.
+-   `max_wait_time_when_mysql_unavailable` — интервал между повторными попытками, если MySQL недоступен. Указывается в миллисекундах. Отрицательное значение отключает повторные попытки. Значение по умолчанию: `1000`.
+-   `allows_query_when_mysql_lost` — признак, разрешен ли запрос к материализованной таблице при потере соединения с MySQL. Значение по умолчанию: `0` (`false`).
+
+```sql
+CREATE DATABASE mysql ENGINE = MaterializedMySQL('localhost:3306', 'db', 'user', '***')
+     SETTINGS
+        allows_query_when_mysql_lost=true,
+        max_wait_time_when_mysql_unavailable=10000;
+```
+
+**Настройки на стороне MySQL-сервера**
+
+Для правильной работы `MaterializedMySQL` следует обязательно указать на сервере MySQL следующие параметры конфигурации:
+- `default_authentication_plugin = mysql_native_password` — `MaterializedMySQL` может авторизоваться только с помощью этого метода.
+- `gtid_mode = on` — ведение журнала на основе GTID является обязательным для обеспечения правильной репликации.
+
+!!! attention "Внимание"
+    При включении `gtid_mode` вы также должны указать `enforce_gtid_consistency = on`.
+
 ## Виртуальные столбцы {#virtual-columns}
 
 При работе с движком баз данных `MaterializedMySQL` используются таблицы семейства [ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md) с виртуальными столбцами `_sign` и `_version`.
@@ -54,13 +79,21 @@ ENGINE = MaterializedMySQL('host:port', ['database' | database], 'user', 'passwo
 | STRING                  | [String](../../sql-reference/data-types/string.md)           |
 | VARCHAR, VAR_STRING     | [String](../../sql-reference/data-types/string.md)           |
 | BLOB                    | [String](../../sql-reference/data-types/string.md)           |
-
-Другие типы не поддерживаются. Если таблица MySQL содержит столбец другого типа, ClickHouse выдаст исключение "Неподдерживаемый тип данных" ("Unhandled data type") и остановит репликацию.
+| BINARY                  | [FixedString](../../sql-reference/data-types/fixedstring.md) |
 
 Тип [Nullable](../../sql-reference/data-types/nullable.md) поддерживается.
 
+Другие типы не поддерживаются. Если таблица MySQL содержит столбец другого типа, ClickHouse выдаст исключение "Неподдерживаемый тип данных" ("Unhandled data type") и остановит репликацию.
+
 ## Особенности и рекомендации {#specifics-and-recommendations}
 
+### Ограничения совместимости {#compatibility-restrictions}
+
+Кроме ограничений на типы данных, существует несколько ограничений по сравнению с базами данных MySQL, которые следует решить до того, как станет возможной репликация:
+
+- Каждая таблица в MySQL должна содержать `PRIMARY KEY`.
+- Репликация для таблиц, содержащих строки со значениями полей `ENUM` вне диапазона значений (определяется размерностью `ENUM`), не будет работать.
+
 ### DDL-запросы {#ddl-queries}
 
 DDL-запросы в MySQL конвертируются в соответствующие DDL-запросы в ClickHouse ([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md)). Если ClickHouse не может конвертировать какой-либо DDL-запрос, он его игнорирует.
@@ -161,3 +194,4 @@ SELECT * FROM mysql.test;
 └───┴─────┴──────┘
 ```
 
+[Оригинальная статья](https://clickhouse.com/docs/ru/engines/database-engines/materialized-mysql/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/materialized-postgresql.md b/docs/ru/engines/database-engines/materialized-postgresql.md
new file mode 100644
index 00000000000..10f86543e73
--- /dev/null
+++ b/docs/ru/engines/database-engines/materialized-postgresql.md
@@ -0,0 +1,143 @@
+---
+toc_priority: 30
+toc_title: MaterializedPostgreSQL
+---
+
+# [экспериментальный] MaterializedPostgreSQL {#materialize-postgresql}
+
+Создает базу данных ClickHouse с исходным дампом данных таблиц PostgreSQL и запускает процесс репликации, т.е. выполняется применение новых изменений в фоне, как эти изменения происходят в таблице PostgreSQL в удаленной базе данных PostgreSQL.
+
+Сервер ClickHouse работает как реплика PostgreSQL. Он читает WAL и выполняет DML запросы. Данные, полученные в результате DDL запросов, не реплицируются, но сами запросы могут быть обработаны (описано ниже).
+
+## Создание базы данных {#creating-a-database}
+
+``` sql
+CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
+ENGINE = MaterializedPostgreSQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
+```
+
+**Параметры движка**
+
+-   `host:port` — адрес сервера PostgreSQL.
+-   `database` — имя базы данных на удалённом сервере.
+-   `user` — пользователь PostgreSQL.
+-   `password` — пароль пользователя.
+
+## Настройки {#settings}
+
+-   [materialized_postgresql_max_block_size](../../operations/settings/settings.md#materialized-postgresql-max-block-size)
+
+-   [materialized_postgresql_tables_list](../../operations/settings/settings.md#materialized-postgresql-tables-list)
+
+-   [materialized_postgresql_allow_automatic_update](../../operations/settings/settings.md#materialized-postgresql-allow-automatic-update)
+
+-   [materialized_postgresql_replication_slot](../../operations/settings/settings.md#materialized-postgresql-replication-slot)
+
+-   [materialized_postgresql_snapshot](../../operations/settings/settings.md#materialized-postgresql-snapshot)
+
+``` sql
+CREATE DATABASE database1
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password')
+SETTINGS materialized_postgresql_max_block_size = 65536,
+         materialized_postgresql_tables_list = 'table1,table2,table3';
+
+SELECT * FROM database1.table1;
+```
+
+## Требования {#requirements}
+
+1. Настройка [wal_level](https://postgrespro.ru/docs/postgrespro/10/runtime-config-wal) должна иметь значение `logical`, параметр `max_replication_slots` должен быть равен по меньшей мере `2` в конфигурационном файле в PostgreSQL.
+
+2. Каждая реплицируемая таблица должна иметь один из следующих [репликационных идентификаторов](https://postgrespro.ru/docs/postgresql/10/sql-altertable#SQL-CREATETABLE-REPLICA-IDENTITY):
+
+-   первичный ключ (по умолчанию)
+
+-   индекс
+
+``` bash
+postgres# CREATE TABLE postgres_table (a Integer NOT NULL, b Integer, c Integer NOT NULL, d Integer, e Integer NOT NULL);
+postgres# CREATE unique INDEX postgres_table_index on postgres_table(a, c, e);
+postgres# ALTER TABLE postgres_table REPLICA IDENTITY USING INDEX postgres_table_index;
+```
+
+Первичный ключ всегда проверяется первым. Если он отсутствует, то проверяется индекс, определенный как replica identity index (репликационный идентификатор).
+Если индекс используется в качестве репликационного идентификатора, то в таблице должен быть только один такой индекс.
+Вы можете проверить, какой тип используется для указанной таблицы, выполнив следующую команду:
+
+``` bash
+postgres# SELECT CASE relreplident
+          WHEN 'd' THEN 'default'
+          WHEN 'n' THEN 'nothing'
+          WHEN 'f' THEN 'full'
+          WHEN 'i' THEN 'index'
+       END AS replica_identity
+FROM pg_class
+WHERE oid = 'postgres_table'::regclass;
+```
+
+!!! warning "Предупреждение"
+    Репликация **TOAST**-значений не поддерживается. Для типа данных будет использоваться значение по умолчанию.
+	
+## Пример использования {#example-of-use}
+
+``` sql
+CREATE DATABASE postgresql_db
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password');
+
+SELECT * FROM postgresql_db.postgres_table;
+```
+## Примечания {#notes}
+
+### Сбой слота логической репликации {#logical-replication-slot-failover}
+
+Слоты логической репликации, которые есть на основном сервере, не доступны на резервных репликах.
+Поэтому в случае сбоя новый основной сервер (который раньше был резевным) не будет знать о слотах репликации, которые были созданы на вышедшем из строя основном сервере. Это приведет к нарушению репликации из PostgreSQL.
+Решением этой проблемы может стать ручное управление слотами репликации и определение постоянного слота репликации (об этом можно прочитать [здесь](https://patroni.readthedocs.io/en/latest/SETTINGS.html)). Этот слот нужно передать с помощью настройки [materialized_postgresql_replication_slot](../../operations/settings/settings.md#materialized-postgresql-replication-slot), и он должен быть экспортирован в параметре `EXPORT SNAPSHOT`. Идентификатор снэпшота нужно передать в настройке [materialized_postgresql_snapshot](../../operations/settings/settings.md#materialized-postgresql-snapshot).
+
+Имейте в виду, что это стоит делать только если есть реальная необходимость. Если такой необходимости нет, или если нет полного понимания того, как это работает, то самостоятельно слот репликации конфигурировать не стоит, он будет создан таблицей.
+
+**Пример (от [@bchrobot](https://github.com/bchrobot))** 
+
+1. Сконфигурируйте слот репликации в PostgreSQL.
+
+```yaml
+apiVersion: "acid.zalan.do/v1"
+kind: postgresql
+metadata:
+  name: acid-demo-cluster
+spec:
+  numberOfInstances: 2
+  postgresql:
+    parameters:
+      wal_level: logical
+  patroni:
+    slots:
+      clickhouse_sync:
+        type: logical
+        database: demodb
+        plugin: pgoutput
+```
+
+2. Дождитесь готовности слота репликации, затем инициируйте транзакцию и экспортируйте идентификатор снэпшота этой транзакции:
+
+```sql
+BEGIN;
+SELECT pg_export_snapshot();
+```
+
+3. Создайте базу данных в ClickHouse:
+
+```sql
+CREATE DATABASE demodb
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password')
+SETTINGS
+  materialized_postgresql_replication_slot = 'clickhouse_sync',
+  materialized_postgresql_snapshot = '0000000A-0000023F-3',
+  materialized_postgresql_tables_list = 'table1,table2,table3';
+```
+
+4. Когда начнет выполняться репликация БД в ClickHouse, прервите транзакцию в PostgreSQL. Убедитесь, что репликация продолжается после сбоя:
+
+```bash
+kubectl exec acid-demo-cluster-0 -c postgres -- su postgres -c 'patronictl failover --candidate acid-demo-cluster-1 --force'
+```
diff --git a/docs/ru/engines/database-engines/postgresql.md b/docs/ru/engines/database-engines/postgresql.md
index 06e2b35b002..092abaf0b4d 100644
--- a/docs/ru/engines/database-engines/postgresql.md
+++ b/docs/ru/engines/database-engines/postgresql.md
@@ -15,7 +15,7 @@ toc_title: PostgreSQL
 
 ``` sql
 CREATE DATABASE test_database
-ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `schema`, `use_table_cache`]);
 ```
 
 **Параметры движка**
@@ -24,6 +24,7 @@ ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cac
 -   `database` — имя удаленной БД.
 -   `user` — пользователь PostgreSQL.
 -   `password` — пароль пользователя.
+ -  `schema` — схема PostgreSQL.
 -   `use_table_cache` —  определяет кеширование структуры таблиц БД. Необязательный параметр. Значение по умолчанию: `0`.
 
 ## Поддерживаемые типы данных {#data_types-support}
@@ -135,4 +136,4 @@ DESCRIBE TABLE test_database.test_table;
 └────────┴───────────────────┘
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/database-engines/postgresql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/database-engines/postgresql/) <!--hide-->
diff --git a/docs/ru/engines/database-engines/replicated.md b/docs/ru/engines/database-engines/replicated.md
index f1d5755647a..b4850a8dafd 100644
--- a/docs/ru/engines/database-engines/replicated.md
+++ b/docs/ru/engines/database-engines/replicated.md
@@ -1,3 +1,7 @@
+---
+toc_priority: 36
+toc_title: Replicated
+---
 
 # [экспериментальный] Replicated {#replicated}
 
diff --git a/docs/ru/engines/database-engines/sqlite.md b/docs/ru/engines/database-engines/sqlite.md
new file mode 100644
index 00000000000..987ac187429
--- /dev/null
+++ b/docs/ru/engines/database-engines/sqlite.md
@@ -0,0 +1,79 @@
+---
+toc_priority: 32
+toc_title: SQLite
+---
+
+# SQLite {#sqlite}
+
+Движок баз данных позволяет подключаться к базе [SQLite](https://www.sqlite.org/index.html) и выполнять запросы `INSERT` и `SELECT` для обмена данными между ClickHouse и SQLite.
+
+## Создание базы данных {#creating-a-database}
+
+``` sql
+    CREATE DATABASE sqlite_database 
+    ENGINE = SQLite('db_path')
+```
+
+**Параметры движка**
+
+-   `db_path` — путь к файлу с базой данных SQLite.
+    
+## Поддерживаемые типы данных {#data_types-support}
+
+| SQLite       | ClickHouse                                              |
+|---------------|---------------------------------------------------------|
+| INTEGER       | [Int32](../../sql-reference/data-types/int-uint.md)     |
+| REAL          | [Float32](../../sql-reference/data-types/float.md)      |
+| TEXT          | [String](../../sql-reference/data-types/string.md)      |
+| BLOB          | [String](../../sql-reference/data-types/string.md)      |
+
+## Особенности и рекомендации {#specifics-and-recommendations}
+
+SQLite хранит всю базу данных (определения, таблицы, индексы и сами данные) в виде единого кроссплатформенного файла на хост-машине. Во время записи SQLite блокирует весь файл базы данных, поэтому операции записи выполняются последовательно. Операции чтения могут быть многозадачными.
+SQLite не требует управления службами (например, сценариями запуска) или контроля доступа на основе `GRANT` и паролей. Контроль доступа осуществляется с помощью разрешений файловой системы, предоставляемых самому файлу базы данных.
+
+## Примеры использования {#usage-example}
+
+Отобразим список таблиц базы данных в ClickHouse, подключенной к SQLite:
+
+``` sql
+CREATE DATABASE sqlite_db ENGINE = SQLite('sqlite.db');
+SHOW TABLES FROM sqlite_db;
+```
+
+``` text
+┌──name───┐
+│ table1  │
+│ table2  │  
+└─────────┘
+```
+Отобразим содержимое таблицы:
+
+``` sql
+SELECT * FROM sqlite_db.table1;
+```
+
+``` text
+┌─col1──┬─col2─┐
+│ line1 │    1 │
+│ line2 │    2 │
+│ line3 │    3 │
+└───────┴──────┘
+```
+Вставим данные в таблицу SQLite из таблицы ClickHouse:
+
+``` sql
+CREATE TABLE clickhouse_table(`col1` String,`col2` Int16) ENGINE = MergeTree() ORDER BY col2;
+INSERT INTO clickhouse_table VALUES ('text',10);
+INSERT INTO sqlite_db.table1 SELECT * FROM clickhouse_table;
+SELECT * FROM sqlite_db.table1;
+```
+
+``` text
+┌─col1──┬─col2─┐
+│ line1 │    1 │
+│ line2 │    2 │
+│ line3 │    3 │
+│ text  │   10 │
+└───────┴──────┘
+```
diff --git a/docs/ru/engines/table-engines/integrations/hdfs.md b/docs/ru/engines/table-engines/integrations/hdfs.md
index c96ac12cd2a..5949cc8a0d7 100644
--- a/docs/ru/engines/table-engines/integrations/hdfs.md
+++ b/docs/ru/engines/table-engines/integrations/hdfs.md
@@ -7,7 +7,7 @@ toc_title: HDFS
 
 Управляет данными в HDFS. Данный движок похож на движки [File](../special/file.md#table_engines-file) и [URL](../special/url.md#table_engines-url).
 
-## Использование движка {#ispolzovanie-dvizhka}
+## Использование движка {#usage}
 
 ``` sql
 ENGINE = HDFS(URI, format)
@@ -44,13 +44,13 @@ SELECT * FROM hdfs_engine_table LIMIT 2
 └──────┴───────┘
 ```
 
-## Детали реализации {#detali-realizatsii}
+## Детали реализации {#implementation-details}
 
 -   Поддерживается многопоточное чтение и запись.
+-   Поддерживается репликация без копирования данных ([zero-copy](../../../operations/storing-data.md#zero-copy)).  
 -   Не поддерживается:
     -   использование операций `ALTER` и `SELECT...SAMPLE`;
-    -   индексы;
-    -   репликация.
+    -   индексы.
 
 **Шаблоны в пути**
 
@@ -67,12 +67,12 @@ SELECT * FROM hdfs_engine_table LIMIT 2
 
 1.  Предположим, у нас есть несколько файлов со следующими URI в HDFS:
 
--   ‘hdfs://hdfs1:9000/some_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/some_dir/some_file_3’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_1’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_2’
--   ‘hdfs://hdfs1:9000/another_dir/some_file_3’
+-   'hdfs://hdfs1:9000/some_dir/some_file_1'
+-   'hdfs://hdfs1:9000/some_dir/some_file_2'
+-   'hdfs://hdfs1:9000/some_dir/some_file_3'
+-   'hdfs://hdfs1:9000/another_dir/some_file_1'
+-   'hdfs://hdfs1:9000/another_dir/some_file_2'
+-   'hdfs://hdfs1:9000/another_dir/some_file_3'
 
 1.  Есть несколько возможностей создать таблицу, состояющую из этих шести файлов:
 
@@ -122,8 +122,9 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
   </hdfs_root>
 ```
 
-### Список возможных опций конфигурации со значениями по умолчанию
-#### Поддерживаемые из libhdfs3
+### Параметры конфигурации {#configuration-options}
+
+#### Поддерживаемые из libhdfs3 {#supported-by-libhdfs3}
 
 
 | **параметр**                                          | **по умолчанию**        |
@@ -180,7 +181,7 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 |hadoop\_kerberos\_principal                            | ""                      |
 |hadoop\_kerberos\_kinit\_command                       | kinit                   |
 
-#### Ограничения {#limitations}
+### Ограничения {#limitations}
   * hadoop\_security\_kerberos\_ticket\_cache\_path могут быть определены только на глобальном уровне
 
 ## Поддержка Kerberos {#kerberos-support}
@@ -193,7 +194,7 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 
 Если hadoop\_kerberos\_keytab, hadoop\_kerberos\_principal или hadoop\_kerberos\_kinit\_command указаны в настройках, kinit будет вызван. hadoop\_kerberos\_keytab и hadoop\_kerberos\_principal обязательны в этом случае. Необходимо также будет установить kinit и файлы конфигурации krb5.
 
-## Виртуальные столбцы {#virtualnye-stolbtsy}
+## Виртуальные столбцы {#virtual-columns}
 
 -   `_path` — Путь к файлу.
 -   `_file` — Имя файла.
@@ -201,4 +202,3 @@ CREATE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 **См. также**
 
 -   [Виртуальные колонки](../../../engines/table-engines/index.md#table_engines-virtual_columns)
-
diff --git a/docs/ru/engines/table-engines/integrations/materialized-postgresql.md b/docs/ru/engines/table-engines/integrations/materialized-postgresql.md
new file mode 100644
index 00000000000..0f707749f07
--- /dev/null
+++ b/docs/ru/engines/table-engines/integrations/materialized-postgresql.md
@@ -0,0 +1,55 @@
+---
+toc_priority: 12
+toc_title: MaterializedPostgreSQL
+---
+
+# MaterializedPostgreSQL {#materialize-postgresql}
+
+Создает таблицу ClickHouse с исходным дампом данных таблицы PostgreSQL и запускает процесс репликации, т.е. выполняется применение новых изменений в фоне, как эти изменения происходят в таблице PostgreSQL в удаленной базе данных PostgreSQL.
+
+Если требуется более одной таблицы, вместо движка таблиц рекомендуется использовать движок баз данных [MaterializedPostgreSQL](../../../engines/database-engines/materialized-postgresql.md) и с помощью настройки [materialized_postgresql_tables_list](../../../operations/settings/settings.md#materialized-postgresql-tables-list) указывать таблицы, которые нужно реплицировать. Это будет намного лучше с точки зрения нагрузки на процессор, уменьшит количество подключений и количество слотов репликации внутри удаленной базы данных PostgreSQL.
+
+## Создание таблицы {#creating-a-table}
+
+``` sql
+CREATE TABLE postgresql_db.postgresql_replica (key UInt64, value UInt64)
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgresql_replica', 'postgres_user', 'postgres_password')
+PRIMARY KEY key;
+```
+
+**Параметры движка**
+
+-   `host:port` — адрес сервера PostgreSQL.
+-   `database` — имя базы данных на удалённом сервере.
+-   `table` — имя таблицы на удалённом сервере.
+-   `user` — пользователь PostgreSQL.
+-   `password` — пароль пользователя.
+
+## Требования {#requirements}
+
+1. Настройка [wal_level](https://postgrespro.ru/docs/postgrespro/10/runtime-config-wal) должна иметь значение `logical`, параметр `max_replication_slots` должен быть равен по меньшей мере `2` в конфигурационном файле в PostgreSQL.
+
+2. Таблица, созданная с помощью движка `MaterializedPostgreSQL`, должна иметь первичный ключ — такой же, как replica identity index (по умолчанию: первичный ключ) таблицы PostgreSQL (смотрите [replica identity index](../../../engines/database-engines/materialized-postgresql.md#requirements)).
+
+3. Допускается только база данных [Atomic](https://en.wikipedia.org/wiki/Atomicity_(database_systems)).
+
+## Виртуальные столбцы {#virtual-columns}
+
+-   `_version` — счетчик транзакций. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `_sign` — метка удаления. Тип: [Int8](../../../sql-reference/data-types/int-uint.md). Возможные значения:
+    - `1` — строка не удалена, 
+    - `-1` — строка удалена.
+
+Эти столбцы не нужно добавлять при создании таблицы. Они всегда доступны в `SELECT` запросе.
+Столбец `_version` равен позиции `LSN` в `WAL`, поэтому его можно использовать для проверки актуальности репликации.
+
+``` sql
+CREATE TABLE postgresql_db.postgresql_replica (key UInt64, value UInt64)
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgresql_replica', 'postgres_user', 'postgres_password')
+PRIMARY KEY key;
+
+SELECT key, value, _version FROM postgresql_db.postgresql_replica;
+```
+
+!!! warning "Предупреждение"
+    Репликация **TOAST**-значений не поддерживается. Для типа данных будет использоваться значение по умолчанию.
diff --git a/docs/ru/engines/table-engines/integrations/mongodb.md b/docs/ru/engines/table-engines/integrations/mongodb.md
index 05820d03fe6..35c100b7837 100644
--- a/docs/ru/engines/table-engines/integrations/mongodb.md
+++ b/docs/ru/engines/table-engines/integrations/mongodb.md
@@ -15,7 +15,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name
     name1 [type1],
     name2 [type2],
     ...
-) ENGINE = MongoDB(host:port, database, collection, user, password);
+) ENGINE = MongoDB(host:port, database, collection, user, password [, options]);
 ```
 
 **Параметры движка**
@@ -30,11 +30,13 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name
 
 -   `password` — пароль пользователя.
 
+-   `options` — MongoDB connection string options (optional parameter).
+
 ## Примеры использования {#usage-example}
 
-Таблица в ClickHouse для чтения данных из колекции MongoDB:
+Создание таблицы в ClickHouse для чтения данных из коллекции MongoDB:
 
-``` text
+``` sql
 CREATE TABLE mongo_table
 (
     key UInt64,
@@ -42,6 +44,18 @@ CREATE TABLE mongo_table
 ) ENGINE = MongoDB('mongo1:27017', 'test', 'simple_table', 'testuser', 'clickhouse');
 ```
 
+Чтение с сервера MongoDB, защищенного SSL:
+
+``` sql
+CREATE TABLE mongo_table_ssl
+(
+    key UInt64,
+    data String
+) ENGINE = MongoDB('mongo2:27017', 'test', 'simple_table', 'testuser', 'clickhouse', 'ssl=true');
+```
+
+
+
 Запрос к таблице:
 
 ``` sql
@@ -54,4 +68,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/mongodb/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/postgresql.md b/docs/ru/engines/table-engines/integrations/postgresql.md
index b2b0db3067a..e19527415bc 100644
--- a/docs/ru/engines/table-engines/integrations/postgresql.md
+++ b/docs/ru/engines/table-engines/integrations/postgresql.md
@@ -148,4 +148,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [Табличная функция `postgresql`](../../../sql-reference/table-functions/postgresql.md)
 -   [Использование PostgreSQL в качестве источника для внешнего словаря](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/engines/table-engines/integrations/postgresql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/ru/engines/table-engines/integrations/s3.md b/docs/ru/engines/table-engines/integrations/s3.md
index 4c910db4b92..c90b7293e1c 100644
--- a/docs/ru/engines/table-engines/integrations/s3.md
+++ b/docs/ru/engines/table-engines/integrations/s3.md
@@ -47,10 +47,10 @@ SELECT * FROM s3_engine_table LIMIT 2;
 ## Детали реализации {#implementation-details}
 
 -   Чтение и запись могут быть параллельными.
+-   Поддерживается репликация без копирования данных ([zero-copy](../../../operations/storing-data.md#zero-copy)).
 -   Не поддерживаются:
     -   запросы `ALTER` и `SELECT...SAMPLE`,
-    -   индексы,
-    -   репликация.
+    -   индексы.
 
 ## Символы подстановки  {#wildcards-in-path}
 
@@ -72,7 +72,7 @@ SELECT * FROM s3_engine_table LIMIT 2;
 -   `s3_max_redirects` — максимальное количество разрешенных переадресаций S3. Значение по умолчанию — `10`.
 -   `s3_single_read_retries` — максимальное количество попыток запроса при единичном чтении. Значение по умолчанию — `4`.
 
-Соображение безопасности: если злонамеренный пользователь попробует указать произвольные URL-адреса S3, параметр `s3_max_redirects` должен быть установлен в ноль, чтобы избежать атак [SSRF] (https://en.wikipedia.org/wiki/Server-side_request_forgery). Как альтернатива, в конфигурации сервера должен быть указан `remote_host_filter`.
+Соображение безопасности: если злонамеренный пользователь попробует указать произвольные URL-адреса S3, параметр `s3_max_redirects` должен быть установлен в ноль, чтобы избежать атак [SSRF](https://en.wikipedia.org/wiki/Server-side_request_forgery). Как альтернатива, в конфигурации сервера должен быть указан `remote_host_filter`.
 
 ## Настройки точки приема запроса {#endpoint-settings}
 
@@ -151,4 +151,4 @@ ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/big_prefix/file-
 
 **Смотрите также**
 
--  [Табличная функция S3](../../../sql-reference/table-functions/s3.md)
+-  [Табличная функция s3](../../../sql-reference/table-functions/s3.md)
diff --git a/docs/ru/engines/table-engines/integrations/sqlite.md b/docs/ru/engines/table-engines/integrations/sqlite.md
new file mode 100644
index 00000000000..825b49cfde6
--- /dev/null
+++ b/docs/ru/engines/table-engines/integrations/sqlite.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 7
+toc_title: SQLite
+---
+
+# SQLite {#sqlite}
+
+Движок позволяет импортировать и экспортировать данные из SQLite, а также поддерживает отправку запросов к таблицам SQLite напрямую из ClickHouse.
+
+## Создание таблицы {#creating-a-table}
+
+``` sql
+    CREATE TABLE [IF NOT EXISTS] [db.]table_name 
+    (
+        name1 [type1], 
+        name2 [type2], ...
+    ) ENGINE = SQLite('db_path', 'table')
+```
+
+**Параметры движка**
+
+-   `db_path` — путь к файлу с базой данных SQLite.
+-   `table` — имя таблицы в базе данных SQLite.
+
+## Примеры использования {#usage-example}
+
+Отобразим запрос, с помощью которого была создана таблица SQLite:
+
+```sql
+SHOW CREATE TABLE sqlite_db.table2;
+```
+
+``` text
+CREATE TABLE SQLite.table2
+( 
+    `col1` Nullable(Int32), 
+    `col2` Nullable(String)
+) 
+ENGINE = SQLite('sqlite.db','table2');
+```
+
+Получим данные из таблицы:
+
+``` sql
+SELECT * FROM sqlite_db.table2 ORDER BY col1;
+```
+
+```text
+┌─col1─┬─col2──┐
+│    1 │ text1 │
+│    2 │ text2 │
+│    3 │ text3 │
+└──────┴───────┘
+```
+
+**См. также**
+
+-   [SQLite](../../../engines/database-engines/sqlite.md) движок баз данных
+-   [sqlite](../../../sql-reference/table-functions/sqlite.md) табличная функция
diff --git a/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
index f3e915a413b..9cd8eda0b87 100644
--- a/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -38,9 +38,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 -   Значение метрики. Тип данных: любой числовой.
 
--   Версия метрики. Тип данных: любой числовой.
-
-        ClickHouse сохраняет строки с последней версией или последнюю записанную строку, если версии совпадают. Другие строки удаляются при слиянии кусков данных.
+-   Версия метрики. Тип данных: любой числовой (ClickHouse сохраняет строки с последней версией или последнюю записанную строку, если версии совпадают. Другие строки удаляются при слиянии кусков данных).
 
 Имена этих столбцов должны быть заданы в конфигурации rollup.
 
@@ -134,7 +132,7 @@ default
 -   `regexp` – шаблон имени метрики.
 -   `age` – минимальный возраст данных в секундах.
 -   `precision` – точность определения возраста данных в секундах. Должен быть делителем для 86400 (количество секунд в сутках).
--   `function` – имя агрегирующей функции, которую следует применить к данным, чей возраст оказался в интервале `[age, age + precision]`.
+-   `function` – имя агрегирующей функции, которую следует применить к данным, чей возраст оказался в интервале `[age, age + precision]`. Допустимые функции: min/max/any/avg. Avg вычисляется неточно, как среднее от средних.
 
 ### Пример конфигурации {#configuration-example}
 
@@ -171,3 +169,6 @@ default
 </graphite_rollup>
 ```
 
+
+!!! warning "Внимание"
+    Прореживание данных производится во время слияний. Обычно для старых партиций слияния не запускаются, поэтому для прореживания надо инициировать незапланированное слияние используя [optimize](../../../sql-reference/statements/optimize.md). Или использовать дополнительные инструменты, например [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer).
diff --git a/docs/ru/engines/table-engines/mergetree-family/mergetree.md b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
index 4bced6254d1..07e67ad1b85 100644
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@@ -68,7 +68,7 @@ ORDER BY expr
 
 -   `SAMPLE BY` — выражение для сэмплирования. Необязательный параметр.
 
-    Если используется выражение для сэмплирования, то первичный ключ должен содержать его. Пример: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
+    Если используется выражение для сэмплирования, то первичный ключ должен содержать его. Результат выражения для сэмплирования должен быть беззнаковым целым числом. Пример: `SAMPLE BY intHash32(UserID) ORDER BY (CounterID, EventDate, intHash32(UserID))`.
 
 -   `TTL` — список правил, определяющих длительности хранения строк, а также задающих правила перемещения частей на определённые тома или диски. Необязательный параметр.
 
@@ -86,7 +86,9 @@ ORDER BY expr
     -   `enable_mixed_granularity_parts` — включает или выключает переход к ограничению размера гранул с помощью настройки `index_granularity_bytes`. Настройка `index_granularity_bytes` улучшает производительность ClickHouse при выборке данных из таблиц с большими (десятки и сотни мегабайтов) строками. Если у вас есть таблицы с большими строками, можно включить эту настройку, чтобы повысить эффективность запросов `SELECT`.
     -   `use_minimalistic_part_header_in_zookeeper` — Способ хранения заголовков кусков данных в ZooKeeper. Если  `use_minimalistic_part_header_in_zookeeper = 1`, то ZooKeeper хранит меньше данных. Подробнее читайте в [описании настройки](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) в разделе "Конфигурационные параметры сервера".
     -   `min_merge_bytes_to_use_direct_io` — минимальный объём данных при слиянии, необходимый для прямого (небуферизованного) чтения/записи (direct I/O) на диск. При слиянии частей данных ClickHouse вычисляет общий объём хранения всех данных, подлежащих слиянию. Если общий объём хранения всех данных для чтения превышает `min_bytes_to_use_direct_io` байт, тогда ClickHouse  использует флаг `O_DIRECT` при чтении данных с диска. Если `min_merge_bytes_to_use_direct_io = 0`, тогда прямой ввод-вывод отключен. Значение по умолчанию: `10 * 1024 * 1024 * 1024` байтов.
-    -   <a name="mergetree_setting-merge_with_ttl_timeout"></a>`merge_with_ttl_timeout` — минимальное время в секундах перед повторным слиянием с TTL. По умолчанию — 86400 (1 день).
+    -   `merge_with_ttl_timeout` — минимальное время в секундах перед повторным слиянием для удаления данных с истекшим TTL. По умолчанию: `14400` секунд (4 часа).
+    -   `merge_with_recompression_ttl_timeout` — минимальное время в секундах перед повторным слиянием для повторного сжатия данных с истекшим TTL. По умолчанию: `14400` секунд (4 часа).
+    -   `try_fetch_recompressed_part_timeout` — время ожидания (в секундах) перед началом слияния с повторным сжатием. В течение этого времени ClickHouse пытается извлечь сжатую часть из реплики, которая назначила это слияние. Значение по умолчанию: `7200` секунд (2 часа).   
     -   `write_final_mark` — включает или отключает запись последней засечки индекса в конце куска данных, указывающей за последний байт. По умолчанию — 1. Не отключайте её.
     -   `merge_max_block_size` — максимальное количество строк в блоке для операций слияния. Значение по умолчанию: 8192.
     -   `storage_policy` — политика хранения данных. Смотрите [Хранение данных таблицы на нескольких блочных устройствах](#table_engine-mergetree-multiple-volumes).
@@ -314,17 +316,26 @@ SELECT count() FROM table WHERE u64 * i32 == 10 AND u64 * length(s) >= 1234
 
 #### Доступные индексы {#available-types-of-indices}
 
--   `minmax` — Хранит минимум и максимум выражения (если выражение - `tuple`, то для каждого элемента `tuple`), используя их для пропуска блоков аналогично первичному ключу.
+-   `minmax` — хранит минимум и максимум выражения (если выражение - [Tuple](../../../sql-reference/data-types/tuple.md), то для каждого элемента `Tuple`), используя их для пропуска блоков аналогично первичному ключу.
 
--   `set(max_rows)` — Хранит уникальные значения выражения на блоке в количестве не более `max_rows` (если `max_rows = 0`, то ограничений нет), используя их для пропуска блоков, оценивая выполнимость `WHERE` выражения на хранимых данных.
+-   `set(max_rows)` — хранит уникальные значения выражения на блоке в количестве не более `max_rows` (если `max_rows = 0`, то ограничений нет), используя их для пропуска блоков, оценивая выполнимость `WHERE` выражения на хранимых данных.
+
+-   `ngrambf_v1(n, size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)` — хранит [фильтр Блума](https://en.wikipedia.org/wiki/Bloom_filter), содержащий все N-граммы блока данных. Работает только с данными форматов [String](../../../sql-reference/data-types/string.md), [FixedString](../../../sql-reference/data-types/fixedstring.md) и [Map](../../../sql-reference/data-types/map.md) с ключами типа `String` или `fixedString`. Может быть использован для оптимизации выражений `EQUALS`, `LIKE` и `IN`.
+
+    -   `n` — размер N-граммы,
+    -   `size_of_bloom_filter_in_bytes` — размер в байтах фильтра Блума (можно использовать большие значения, например, 256 или 512, поскольку сжатие компенсирует возможные издержки).
+    -   `number_of_hash_functions` — количество хеш-функций, использующихся в фильтре Блума.
+    -   `random_seed` — состояние генератора случайных чисел для хеш-функций фильтра Блума.
+
+-   `tokenbf_v1(size_of_bloom_filter_in_bytes, number_of_hash_functions, random_seed)` — то же, что и`ngrambf_v1`, но хранит токены вместо N-грамм. Токены — это последовательности символов, разделенные не буквенно-цифровыми символами.
 
 -   `bloom_filter([false_positive])` — [фильтр Блума](https://en.wikipedia.org/wiki/Bloom_filter) для указанных стоблцов.
 
     Необязательный параметр `false_positive` — это вероятность получения ложноположительного срабатывания. Возможные значения: (0, 1). Значение по умолчанию: 0.025.
 
-    Поддержанные типы данных: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`.
+    Поддерживаемые типы данных: `Int*`, `UInt*`, `Float*`, `Enum`, `Date`, `DateTime`, `String`, `FixedString`.
 
-    Фильтром могут пользоваться функции: [equals](../../../engines/table-engines/mergetree-family/mergetree.md), [notEquals](../../../engines/table-engines/mergetree-family/mergetree.md), [in](../../../engines/table-engines/mergetree-family/mergetree.md), [notIn](../../../engines/table-engines/mergetree-family/mergetree.md).
+    Фильтром могут пользоваться функции: [equals](../../../sql-reference/functions/comparison-functions.md), [notEquals](../../../sql-reference/functions/comparison-functions.md), [in](../../../sql-reference/functions/in-functions.md), [notIn](../../../sql-reference/functions/in-functions.md), [has](../../../sql-reference/functions/array-functions.md#hasarr-elem).
 
 **Примеры**
 
@@ -375,6 +386,34 @@ INDEX b (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARIT
     -   `s != 1`
     -   `NOT startsWith(s, 'test')`
 
+## Проекции {#projections}
+Проекции похожи на [материализованные представления](../../../sql-reference/statements/create/view.md#materialized), но определяются на уровне кусков данных. Это обеспечивает гарантии согласованности данных наряду с автоматическим использованием в запросах.
+
+Проекции — это экспериментальная возможность. Чтобы включить поддержку проекций, установите настройку [allow_experimental_projection_optimization](../../../operations/settings/settings.md#allow-experimental-projection-optimization) в значение `1`. См. также настройку [force_optimize_projection ](../../../operations/settings/settings.md#force-optimize-projection).
+
+Проекции не поддерживаются для запросов `SELECT` с модификатором [FINAL](../../../sql-reference/statements/select/from.md#select-from-final).
+
+### Запрос проекции {#projection-query}
+Запрос проекции — это то, что определяет проекцию. Такой запрос неявно выбирает данные из родительской таблицы. 
+**Синтаксис**
+
+```sql
+SELECT <column list expr> [GROUP BY] <group keys expr> [ORDER BY] <expr>
+```
+
+Проекции можно изменить или удалить с помощью запроса [ALTER](../../../sql-reference/statements/alter/projection.md).
+
+### Хранение проекции {#projection-storage}
+Проекции хранятся в каталоге куска данных. Это похоже на хранение индексов, но используется подкаталог, в котором хранится анонимный кусок таблицы `MergeTree`. Таблица создается запросом определения проекции. 
+Если присутствует секция `GROUP BY`, то используется движок [AggregatingMergeTree](aggregatingmergetree.md), а все агрегатные функции преобразуются в `AggregateFunction`. 
+Если присутствует секция `ORDER BY`, таблица `MergeTree` использует ее в качестве выражения для первичного ключа. 
+Во время процесса слияния кусок данных проекции объединяется с помощью процедуры слияния хранилища. Контрольная сумма куска данных родительской таблицы включает кусок данных проекции. Другие процедуры аналогичны индексам пропуска данных.
+
+### Анализ запросов {#projection-query-analysis}
+1. Проверьте, можно ли использовать проекцию в данном запросе, то есть, что с ней получается тот же результат, что и с запросом к базовой таблице.
+2. Выберите наиболее подходящее совпадение, содержащее наименьшее количество гранул для чтения.
+3. План запроса, который использует проекции, отличается от того, который использует исходные куски данных. Если в некоторых кусках проекции отсутствуют, можно расширить план, чтобы «проецировать» на лету.
+
 ## Конкурентный доступ к данным {#concurrent-data-access}
 
 Для конкурентного доступа к таблице используется мультиверсионность. То есть, при одновременном чтении и обновлении таблицы, данные будут читаться из набора кусочков, актуального на момент запроса. Длинных блокировок нет. Вставки никак не мешают чтениям.
@@ -383,20 +422,22 @@ INDEX b (u64 * length(str), i32 + f64 * 100, date, str) TYPE set(100) GRANULARIT
 
 ## TTL для столбцов и таблиц {#table_engine-mergetree-ttl}
 
-Определяет время жизни значений, а также правила перемещения данных на другой диск или том.
+Определяет время жизни значений.
 
-Секция `TTL` может быть установлена как для всей таблицы, так и для каждого отдельного столбца. Правила `TTL` для таблицы позволяют указать целевые диски или тома для фонового перемещения на них частей данных.
+Секция `TTL` может быть установлена как для всей таблицы, так и для каждого отдельного столбца. Для таблиц можно установить правила `TTL` для фонового перемещения кусков данных на целевые диски или тома, или правила повторного сжатия кусков данных.
 
 Выражения должны возвращать тип [Date](../../../engines/table-engines/mergetree-family/mergetree.md) или [DateTime](../../../engines/table-engines/mergetree-family/mergetree.md).
 
-Для задания времени жизни столбца, например:
+**Синтаксис**
+
+Для задания времени жизни столбца:
 
 ``` sql
 TTL time_column
 TTL time_column + interval
 ```
 
-Чтобы задать `interval`, используйте операторы [интервала времени](../../../engines/table-engines/mergetree-family/mergetree.md#operators-datetime).
+Чтобы задать `interval`, используйте операторы [интервала времени](../../../engines/table-engines/mergetree-family/mergetree.md#operators-datetime), например:
 
 ``` sql
 TTL date_time + INTERVAL 1 MONTH
@@ -405,13 +446,13 @@ TTL date_time + INTERVAL 15 HOUR
 
 ### TTL столбца {#mergetree-column-ttl}
 
-Когда срок действия значений в столбце истечет, ClickHouse заменит их значениями по умолчанию для типа данных столбца. Если срок действия всех значений столбцов в части данных истек, ClickHouse удаляет столбец из куска данных в файловой системе.
+Когда срок действия значений в столбце истечёт, ClickHouse заменит их значениями по умолчанию для типа данных столбца. Если срок действия всех значений столбцов в части данных истек, ClickHouse удаляет столбец из куска данных в файловой системе.
 
 Секцию `TTL` нельзя использовать для ключевых столбцов.
 
-Примеры:
+**Примеры**
 
-Создание таблицы с TTL
+Создание таблицы с `TTL`:
 
 ``` sql
 CREATE TABLE example_table
@@ -426,7 +467,7 @@ PARTITION BY toYYYYMM(d)
 ORDER BY d;
 ```
 
-Добавление TTL на колонку существующей таблицы
+Добавление `TTL` на колонку существующей таблицы:
 
 ``` sql
 ALTER TABLE example_table
@@ -434,7 +475,7 @@ ALTER TABLE example_table
     c String TTL d + INTERVAL 1 DAY;
 ```
 
-Изменение TTL у колонки
+Изменение `TTL` у колонки:
 
 ``` sql
 ALTER TABLE example_table
@@ -444,23 +485,24 @@ ALTER TABLE example_table
 
 ### TTL таблицы {#mergetree-table-ttl}
 
-Для таблицы можно задать одно выражение для устаревания данных, а также несколько выражений, по срабатывании которых данные переместятся на [некоторый диск или том](#table_engine-mergetree-multiple-volumes). Когда некоторые данные в таблице устаревают, ClickHouse удаляет все соответствующие строки.
+Для таблицы можно задать одно выражение для устаревания данных, а также несколько выражений, при срабатывании которых данные будут перемещены на [некоторый диск или том](#table_engine-mergetree-multiple-volumes). Когда некоторые данные в таблице устаревают, ClickHouse удаляет все соответствующие строки. Операции перемещения или повторного сжатия данных выполняются только когда устаревают все данные в куске.
 
 ``` sql
 TTL expr
-    [DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'][, DELETE|TO DISK 'aaa'|TO VOLUME 'bbb'] ...
+    [DELETE|RECOMPRESS codec_name1|TO DISK 'xxx'|TO VOLUME 'xxx'][, DELETE|RECOMPRESS codec_name2|TO DISK 'aaa'|TO VOLUME 'bbb'] ...
     [WHERE conditions]
     [GROUP BY key_expr [SET v1 = aggr_func(v1) [, v2 = aggr_func(v2) ...]] ]
 ```
 
-За каждым TTL выражением может следовать тип действия, которое выполняется после достижения времени, соответствующего результату TTL выражения:
+За каждым `TTL` выражением может следовать тип действия, которое выполняется после достижения времени, соответствующего результату `TTL` выражения:
 
 -   `DELETE` - удалить данные (действие по умолчанию);
+-   `RECOMPRESS codec_name` - повторно сжать данные с помощью кодека `codec_name`;   
 -   `TO DISK 'aaa'` - переместить данные на диск `aaa`;
 -   `TO VOLUME 'bbb'` - переместить данные на том `bbb`;
 -   `GROUP BY` -  агрегировать данные.
 
-В секции `WHERE` можно задать условие удаления или агрегирования устаревших строк (для перемещения условие `WHERE` не применимо).
+В секции `WHERE` можно задать условие удаления или агрегирования устаревших строк (для перемещения и сжатия условие `WHERE` не применимо).
 
 Колонки, по которым агрегируются данные в `GROUP BY`, должны являться префиксом первичного ключа таблицы.
 
@@ -468,7 +510,7 @@ TTL expr
 
 **Примеры**
 
-Создание таблицы с TTL:
+Создание таблицы с `TTL`:
 
 ``` sql
 CREATE TABLE example_table
@@ -484,7 +526,7 @@ TTL d + INTERVAL 1 MONTH [DELETE],
     d + INTERVAL 2 WEEK TO DISK 'bbb';
 ```
 
-Изменение TTL:
+Изменение `TTL`:
 
 ``` sql
 ALTER TABLE example_table
@@ -505,6 +547,21 @@ ORDER BY d
 TTL d + INTERVAL 1 MONTH DELETE WHERE toDayOfWeek(d) = 1;
 ```
 
+Создание таблицы, в которой куски с устаревшими данными повторно сжимаются:
+
+```sql
+CREATE TABLE table_for_recompression
+(
+    d DateTime,
+    key UInt64,
+    value String
+) ENGINE MergeTree()
+ORDER BY tuple()
+PARTITION BY key
+TTL d + INTERVAL 1 MONTH RECOMPRESS CODEC(ZSTD(17)), d + INTERVAL 1 YEAR RECOMPRESS CODEC(LZ4HC(10))
+SETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0;
+```
+
 Создание таблицы, где устаревшие строки агрегируются. В результирующих строках колонка `x` содержит максимальное значение по сгруппированным строкам, `y` — минимальное значение, а `d` — случайное значение из одной из сгуппированных строк.
 
 ``` sql
@@ -521,14 +578,18 @@ ORDER BY (k1, k2)
 TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 ```
 
-**Удаление данных**
+### Удаление устаревших данных {#mergetree-removing-expired-data}
 
-Данные с истекшим TTL удаляются, когда ClickHouse мёржит куски данных.
+Данные с истекшим `TTL` удаляются, когда ClickHouse мёржит куски данных.
 
 Когда ClickHouse видит, что некоторые данные устарели, он выполняет внеплановые мёржи. Для управление частотой подобных мёржей, можно задать настройку `merge_with_ttl_timeout`. Если её значение слишком низкое, придется выполнять много внеплановых мёржей, которые могут начать потреблять значительную долю ресурсов сервера.
 
 Если вы выполните запрос `SELECT` между слияниями вы можете получить устаревшие данные. Чтобы избежать этого используйте запрос [OPTIMIZE](../../../engines/table-engines/mergetree-family/mergetree.md#misc_operations-optimize) перед `SELECT`.
 
+**См. также**
+
+- настройку [ttl_only_drop_parts](../../../operations/settings/settings.md#ttl_only_drop_parts)
+
 ## Хранение данных таблицы на нескольких блочных устройствах {#table_engine-mergetree-multiple-volumes}
 
 ### Введение {#introduction}
@@ -616,7 +677,7 @@ TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 -   `policy_name_N` — название политики. Названия политик должны быть уникальны.
 -   `volume_name_N` — название тома. Названия томов должны быть уникальны.
 -   `disk` — диск, находящийся внутри тома.
--   `max_data_part_size_bytes` — максимальный размер куска данных, который может находится на любом из дисков этого тома.
+-   `max_data_part_size_bytes` — максимальный размер куска данных, который может находится на любом из дисков этого тома. Если в результате слияния размер куска ожидается больше, чем max_data_part_size_bytes, то этот кусок будет записан в следующий том. В основном эта функция позволяет хранить новые / мелкие куски на горячем (SSD) томе и перемещать их на холодный (HDD) том, когда они достигают большого размера. Не используйте этот параметр, если политика имеет только один том. 
 -   `move_factor` — доля доступного свободного места на томе, если места становится меньше, то данные начнут перемещение на следующий том, если он есть (по умолчанию 0.1).
 -   `prefer_not_to_merge` — Отключает слияние кусков данных, хранящихся на данном томе. Если данная настройка включена, то слияние данных, хранящихся на данном томе, не допускается. Это позволяет контролировать работу ClickHouse с медленными дисками.
 
@@ -809,44 +870,3 @@ SETTINGS storage_policy = 'moving_from_ssd_to_hdd'
 ```
 
 Если диск сконфигурирован как `cold`, данные будут переноситься в S3 при срабатывании правил TTL или когда свободное место на локальном диске станет меньше порогового значения, которое определяется как `move_factor * disk_size`.
-
-## Использование сервиса HDFS для хранения данных {#table_engine-mergetree-hdfs}
-
-[HDFS](https://hadoop.apache.org/docs/r1.2.1/hdfs_design.html) — это распределенная файловая система для удаленного хранения данных.
-
-Таблицы семейства `MergeTree` могут хранить данные в сервисе HDFS при использовании диска типа `HDFS`.
-
-Пример конфигурации:
-``` xml
-<yandex>
-    <storage_configuration>
-        <disks>
-            <hdfs>
-                <type>hdfs</type>
-                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
-            </hdfs>
-        </disks>
-        <policies>
-            <hdfs>
-                <volumes>
-                    <main>
-                        <disk>hdfs</disk>
-                    </main>
-                </volumes>
-            </hdfs>
-        </policies>
-    </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
-</yandex>
-```
-
-Обязательные параметры:
-
--   `endpoint` — URL точки приема запроса на стороне HDFS в формате `path`. URL точки должен содержать путь к корневой директории на сервере, где хранятся данные.
-
-Необязательные параметры:
-
--   `min_bytes_for_seek` — минимальное количество байтов, которые используются для операций поиска вместо последовательного чтения. Значение по умолчанию: 1 МБайт.
diff --git a/docs/ru/engines/table-engines/mergetree-family/replication.md b/docs/ru/engines/table-engines/mergetree-family/replication.md
index 6a259ebd3b8..a7c1a7d2d1b 100644
--- a/docs/ru/engines/table-engines/mergetree-family/replication.md
+++ b/docs/ru/engines/table-engines/mergetree-family/replication.md
@@ -102,7 +102,7 @@ CREATE TABLE table_name
 ) ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', ver)
 PARTITION BY toYYYYMM(EventDate)
 ORDER BY (CounterID, EventDate, intHash32(UserID))
-SAMPLE BY intHash32(UserID)
+SAMPLE BY intHash32(UserID);
 ```
 
 <details markdown="1">
@@ -115,12 +115,12 @@ CREATE TABLE table_name
     EventDate DateTime,
     CounterID UInt32,
     UserID UInt32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID), EventTime), 8192)
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/table_name', '{replica}', EventDate, intHash32(UserID), (CounterID, EventDate, intHash32(UserID), EventTime), 8192);
 ```
 
 </details>
 
-Как видно в примере, эти параметры могут содержать подстановки в фигурных скобках. Подставляемые значения достаются из конфигурационного файла, из секции «[macros](../../../operations/server-configuration-parameters/settings/#macros)».
+Как видно в примере, эти параметры могут содержать подстановки в фигурных скобках. Эти подстановки заменяются на соответствующие значения из конфигурационного файла, из секции [macros](../../../operations/server-configuration-parameters/settings.md#macros).
 
 Пример:
 
@@ -253,4 +253,5 @@ $ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 -   [background_schedule_pool_size](../../../operations/settings/settings.md#background_schedule_pool_size)
 -   [background_fetches_pool_size](../../../operations/settings/settings.md#background_fetches_pool_size)
 -   [execute_merges_on_single_replica_time_threshold](../../../operations/settings/settings.md#execute-merges-on-single-replica-time-threshold)
-
+-   [max_replicated_fetches_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth)
+-   [max_replicated_sends_network_bandwidth](../../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth)
diff --git a/docs/ru/engines/table-engines/special/buffer.md b/docs/ru/engines/table-engines/special/buffer.md
index ba865b72b78..0c1ae591ae3 100644
--- a/docs/ru/engines/table-engines/special/buffer.md
+++ b/docs/ru/engines/table-engines/special/buffer.md
@@ -48,7 +48,10 @@ CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10
 Если у одного из столбцов таблицы Buffer и подчинённой таблицы не совпадает тип, то в лог сервера будет записано сообщение об ошибке и буфер будет очищен.
 То же самое происходит, если подчинённая таблица не существует в момент сброса буфера.
 
-Если есть необходимость выполнить ALTER для подчинённой таблицы и для таблицы Buffer, то рекомендуется удалить таблицу Buffer, затем выполнить ALTER подчинённой таблицы, а затем создать таблицу Buffer заново.
+Если есть необходимость выполнить ALTER для подчинённой таблицы и для таблицы Buffer, то рекомендуется удалить таблицу Buffer, затем выполнить ALTER подчинённой таблицы, а после создать таблицу Buffer заново. 
+
+!!! attention "Внимание"
+    В релизах до 28 сентября 2020 года выполнение ALTER на таблице Buffer ломает структуру блоков и вызывает ошибку (см. [#15117](https://github.com/ClickHouse/ClickHouse/issues/15117)), поэтому удаление буфера и его пересоздание — единственный вариант миграции для данного движка. Перед выполнением ALTER на таблице Buffer убедитесь, что в вашей версии эта ошибка устранена.
 
 При нештатном перезапуске сервера, данные, находящиеся в буфере, будут потеряны.
 
diff --git a/docs/ru/engines/table-engines/special/distributed.md b/docs/ru/engines/table-engines/special/distributed.md
index b1f6f56623d..3d7b8cf32d3 100644
--- a/docs/ru/engines/table-engines/special/distributed.md
+++ b/docs/ru/engines/table-engines/special/distributed.md
@@ -136,3 +136,15 @@ logs - имя кластера в конфигурационном файле с
 
 При выставлении опции max_parallel_replicas выполнение запроса распараллеливается по всем репликам внутри одного шарда. Подробнее смотрите раздел [max_parallel_replicas](../../../operations/settings/settings.md#settings-max_parallel_replicas).
 
+## Виртуальные столбцы {#virtual-columns}
+
+-   `_shard_num` — содержит значение `shard_num` из таблицы `system.clusters`. Тип: [UInt32](../../../sql-reference/data-types/int-uint.md).
+
+!!! note "Примечание"
+    Так как табличные функции [remote](../../../sql-reference/table-functions/remote.md) и [cluster](../../../sql-reference/table-functions/cluster.md) создают временную таблицу на движке `Distributed`, то в ней также доступен столбец `_shard_num`.
+
+**См. также**
+
+-   общее описание [виртуальных столбцов](../../../engines/table-engines/index.md#table_engines-virtual_columns)
+-   настройка [background_distributed_schedule_pool_size](../../../operations/settings/settings.md#background_distributed_schedule_pool_size)
+-   функции [shardNum()](../../../sql-reference/functions/other-functions.md#shard-num) и [shardCount()](../../../sql-reference/functions/other-functions.md#shard-count)
diff --git a/docs/ru/engines/table-engines/special/join.md b/docs/ru/engines/table-engines/special/join.md
index ef27ac3f10f..28bbfe6dea4 100644
--- a/docs/ru/engines/table-engines/special/join.md
+++ b/docs/ru/engines/table-engines/special/join.md
@@ -27,68 +27,30 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 Вводите параметры `join_strictness` и `join_type` без кавычек, например, `Join(ANY, LEFT, col1)`. Они должны быть такими же как и в той операции `JOIN`, в которой таблица будет использоваться. Если параметры не совпадают, ClickHouse не генерирует исключение и может возвращать неверные данные.
 
-## Использование таблицы {#ispolzovanie-tablitsy}
+## Особенности и рекомендации {#specifics-and-recommendations}
 
-### Пример {#primer}
+### Хранение данных {#data-storage}
 
-Создание левой таблицы:
+Данные таблиц `Join` всегда находятся в оперативной памяти. При вставке строк в таблицу ClickHouse записывает блоки данных в каталог на диске, чтобы их можно было восстановить при перезапуске сервера.
 
-``` sql
-CREATE TABLE id_val(`id` UInt32, `val` UInt32) ENGINE = TinyLog
-```
+При аварийном перезапуске сервера блок данных на диске может быть потерян или повреждён. В последнем случае может потребоваться вручную удалить файл с повреждёнными данными.
 
-``` sql
-INSERT INTO id_val VALUES (1,11)(2,12)(3,13)
-```
-
-Создание правой таблицы с движком `Join`:
-
-``` sql
-CREATE TABLE id_val_join(`id` UInt32, `val` UInt8) ENGINE = Join(ANY, LEFT, id)
-```
-
-``` sql
-INSERT INTO id_val_join VALUES (1,21)(1,22)(3,23)
-```
-
-Объединение таблиц:
-
-``` sql
-SELECT * FROM id_val ANY LEFT JOIN id_val_join USING (id) SETTINGS join_use_nulls = 1
-```
-
-``` text
-┌─id─┬─val─┬─id_val_join.val─┐
-│  1 │  11 │              21 │
-│  2 │  12 │            ᴺᵁᴸᴸ │
-│  3 │  13 │              23 │
-└────┴─────┴─────────────────┘
-```
-
-В качестве альтернативы, можно извлечь данные из таблицы `Join`, указав значение ключа объединения:
-
-``` sql
-SELECT joinGet('id_val_join', 'val', toUInt32(1))
-```
-
-``` text
-┌─joinGet('id_val_join', 'val', toUInt32(1))─┐
-│                                         21 │
-└────────────────────────────────────────────┘
-```
-
-### Выборка и вставка данных {#vyborka-i-vstavka-dannykh}
+### Выборка и добавление данных {#selecting-and-inserting-data}
 
 Для добавления данных в таблицы с движком `Join` используйте запрос `INSERT`. Если таблица создавалась со строгостью `ANY`, то данные с повторяющимися ключами игнорируются. Если задавалась строгость `ALL`, то добавляются все строки.
 
-Из таблиц нельзя выбрать данные с помощью запроса `SELECT`. Вместо этого, используйте один из следующих методов:
+Основные применения `Join` таблиц:
 
--   Используйте таблицу как правую в секции `JOIN`.
--   Используйте функцию [joinGet](../../../engines/table-engines/special/join.md#joinget), которая позволяет извлекать данные из таблицы таким же образом как из словаря.
+-   Использование в правой части секции `JOIN`.
+-   Извлечение данных из таблицы таким же образом как из словаря с помощью функции [joinGet](../../../engines/table-engines/special/join.md#joinget).
+
+### Удаление данных {#deleting-data}
+
+Запросы `ALTER DELETE` для таблиц с движком `Join` выполняются как [мутации](../../../sql-reference/statements/alter/index.md#mutations). При выполнении мутации `DELETE` считываются отфильтрованные данные и перезаписываются в оперативную память и на диск.
 
 ### Ограничения и настройки {#join-limitations-and-settings}
 
-При создании таблицы, применяются следующие параметры :
+При создании таблицы применяются следующие настройки:
 
 -   [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls)
 -   [max_rows_in_join](../../../operations/settings/query-complexity.md#settings-max_rows_in_join)
@@ -99,11 +61,64 @@ SELECT joinGet('id_val_join', 'val', toUInt32(1))
 
 Таблицы с движком `Join` нельзя использовать в операциях `GLOBAL JOIN`.
 
-Движок `Join` позволяет использовать параметр [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls) в запросе `CREATE TABLE`, который также можно использовать в запросе [SELECT](../../../engines/table-engines/special/join.md). Если у вас разные настройки `join_use_nulls`, вы можете получить сообщение об ошибке при объединении таблиц. Это зависит от типа соединения. Когда вы используете функцию [joinGet](../../../engines/table-engines/special/join.md#joinget), вам необходимо использовать один и тот же параметр `join_use_nulls` в запросах `CRATE TABLE` и `SELECT`.
+Движок `Join` позволяет использовать настройку [join_use_nulls](../../../operations/settings/settings.md#join_use_nulls) в запросе `CREATE TABLE`. Необходимо использовать одно и то же значение параметра `join_use_nulls` в запросах `CRATE TABLE` и `SELECT`.
 
-## Хранение данных {#khranenie-dannykh}
+## Примеры использования {#example}
 
-Данные таблиц `Join` всегда находятся в RAM. При вставке строк в таблицу ClickHouse записывает блоки данных в каталог на диске, чтобы их можно было восстановить при перезапуске сервера.
+Создание левой таблицы:
 
-При аварийном перезапуске сервера блок данных на диске может быть потерян или повреждён. В последнем случае, может потребоваться вручную удалить файл с повреждёнными данными.
+``` sql
+CREATE TABLE id_val(`id` UInt32, `val` UInt32) ENGINE = TinyLog;
+```
 
+``` sql
+INSERT INTO id_val VALUES (1,11)(2,12)(3,13);
+```
+
+Создание правой таблицы с движком `Join`:
+
+``` sql
+CREATE TABLE id_val_join(`id` UInt32, `val` UInt8) ENGINE = Join(ANY, LEFT, id);
+```
+
+``` sql
+INSERT INTO id_val_join VALUES (1,21)(1,22)(3,23);
+```
+
+Объединение таблиц:
+
+``` sql
+SELECT * FROM id_val ANY LEFT JOIN id_val_join USING (id);
+```
+
+``` text
+┌─id─┬─val─┬─id_val_join.val─┐
+│  1 │  11 │              21 │
+│  2 │  12 │               0 │
+│  3 │  13 │              23 │
+└────┴─────┴─────────────────┘
+```
+
+В качестве альтернативы, можно извлечь данные из таблицы `Join`, указав значение ключа объединения:
+
+``` sql
+SELECT joinGet('id_val_join', 'val', toUInt32(1));
+```
+
+``` text
+┌─joinGet('id_val_join', 'val', toUInt32(1))─┐
+│                                         21 │
+└────────────────────────────────────────────┘
+```
+
+Удаление данных из таблицы `Join`:
+
+```sql
+ALTER TABLE id_val_join DELETE WHERE id = 3;
+```
+
+```text
+┌─id─┬─val─┐
+│  1 │  21 │
+└────┴─────┘
+```
diff --git a/docs/ru/faq/general/columnar-database.md b/docs/ru/faq/general/columnar-database.md
index 5ed6185736d..3931051b2b7 100644
--- a/docs/ru/faq/general/columnar-database.md
+++ b/docs/ru/faq/general/columnar-database.md
@@ -17,9 +17,9 @@ toc_priority: 101
 Ниже — иллюстрация того, как извлекаются данные для отчетов при использовании обычной строковой СУБД и столбцовой СУБД:
 
 **Стандартная строковая СУБД**
-![Стандартная строковая СУБД](https://clickhouse.tech/docs/en/images/row-oriented.gif#)
+![Стандартная строковая СУБД](/docs/en/images/row-oriented.gif#)
 
 **Столбцовая СУБД**
-![Столбцовая СУБД](https://clickhouse.tech/docs/en/images/column-oriented.gif#)
+![Столбцовая СУБД](/docs/en/images/column-oriented.gif#)
 
 Для аналитических приложений столбцовые СУБД предпочтительнее, так как в них можно хранить много столбцов в таблице просто на всякий случай, и это не будет сказываться на скорости чтения данных. Столбцовые СУБД предназначены для обработки и хранения больших данных. Они прекрасно масштабируются при помощи распределенных кластеров на относительно недорогих серверах — для увеличения производительности. В ClickHouse для этого используются [распределенные](../../engines/table-engines/special/distributed.md) и [реплицированные](../../engines/table-engines/mergetree-family/replication.md) таблицы.
diff --git a/docs/ru/faq/general/index.md b/docs/ru/faq/general/index.md
index cf105eaf8bb..cb30771aa49 100644
--- a/docs/ru/faq/general/index.md
+++ b/docs/ru/faq/general/index.md
@@ -21,4 +21,4 @@ toc_title: Общие вопросы
 !!! info "Если вы не нашли то, что искали:"
     Загляните в другие категории F.A.Q. или поищите в остальных разделах документации, ориентируясь по оглавлению слева.
 
-[Original article](https://clickhouse.tech/docs/ru/faq/general/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/faq/general/) <!--hide-->
diff --git a/docs/ru/faq/general/ne-tormozit.md b/docs/ru/faq/general/ne-tormozit.md
index c1cf87d5b0c..35b6de72a67 100644
--- a/docs/ru/faq/general/ne-tormozit.md
+++ b/docs/ru/faq/general/ne-tormozit.md
@@ -22,4 +22,4 @@ toc_priority: 11
 
 ![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
 
-P.S. Эти футболки не продаются, а распространяются бесплатно на большинстве митапов [ClickHouse](https://clickhouse.tech/#meet), обычно в награду за самые интересные вопросы или другие виды активного участия.
+P.S. Эти футболки не продаются, а распространяются бесплатно на большинстве митапов [ClickHouse](https://clickhouse.com/#meet), обычно в награду за самые интересные вопросы или другие виды активного участия.
diff --git a/docs/ru/faq/integration/index.md b/docs/ru/faq/integration/index.md
index fdb9039d066..54e7e2c8e40 100644
--- a/docs/ru/faq/integration/index.md
+++ b/docs/ru/faq/integration/index.md
@@ -16,4 +16,4 @@ toc_title: Интеграция
 !!! info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
 
-[Original article](https://clickhouse.tech/docs/ru/faq/integration/)
+[Original article](https://clickhouse.com/docs/ru/faq/integration/)
diff --git a/docs/ru/faq/operations/index.md b/docs/ru/faq/operations/index.md
index 723ae2d10d3..53fda842472 100644
--- a/docs/ru/faq/operations/index.md
+++ b/docs/ru/faq/operations/index.md
@@ -15,4 +15,4 @@ toc_title: Операции
 !!! info "Если вы не нашли то, что искали"
     Загляните в другие подразделы F.A.Q. или поищите в остальных разделах документации, ориентируйтесь по оглавлению слева.
 
-[Original article](https://clickhouse.tech/docs/en/faq/operations/)
+[Original article](https://clickhouse.com/docs/en/faq/operations/)
diff --git a/docs/ru/faq/use-cases/time-series.md b/docs/ru/faq/use-cases/time-series.md
index ea56660cc10..5b46de78274 100644
--- a/docs/ru/faq/use-cases/time-series.md
+++ b/docs/ru/faq/use-cases/time-series.md
@@ -6,7 +6,7 @@ toc_priority: 101
 
 # Можно ли использовать ClickHouse как базу данных временных рядов? {#can-i-use-clickhouse-as-a-time-series-database}
 
-ClickHouse — это универсальное решение для [OLAP](../../faq/general/olap.md) операций, в то время как существует много специализированных СУБД временных рядов. Однако [высокая скорость выполнения запросов](../../faq/general/why-clickhouse-is-so-fast.md) позволяет CLickHouse во многих случаях "побеждать" специализированные аналоги. В подтверждение этому есть много [примеров](https://medium.com/@AltinityDB/clickhouse-for-time-series-scalability-benchmarks-e181132a895b) с конкретными показателями производительности, так что мы не будем останавливаться на этом подробно. Лучше рассмотрим те возможности ClickHouse, которые стоит использовать.
+ClickHouse — это универсальное решение для [OLAP](../../faq/general/olap.md) операций, в то время как существует много специализированных СУБД временных рядов. Однако [высокая скорость выполнения запросов](../../faq/general/why-clickhouse-is-so-fast.md) позволяет CLickHouse во многих случаях "побеждать" специализированные аналоги. В подтверждение этому есть много примеров с конкретными показателями производительности, так что мы не будем останавливаться на этом подробно. Лучше рассмотрим те возможности ClickHouse, которые стоит использовать.
 
 Во-первых, есть **[специальные кодеки](../../sql-reference/statements/create/table.md#create-query-specialized-codecs)**, которые составляют типичные временные ряды. Это могут быть либо стандартные алгоритмы, такие как `DoubleDelta` или `Gorilla`, либо специфические для ClickHouse, например `T64`.
 
diff --git a/docs/ru/getting-started/example-datasets/brown-benchmark.md b/docs/ru/getting-started/example-datasets/brown-benchmark.md
index f1aad06b743..7f357c74368 100644
--- a/docs/ru/getting-started/example-datasets/brown-benchmark.md
+++ b/docs/ru/getting-started/example-datasets/brown-benchmark.md
@@ -9,7 +9,7 @@ toc_title: Brown University Benchmark
 
 Скачать данные:
 ```
-wget https://datasets.clickhouse.tech/mgbench{1..3}.csv.xz
+wget https://datasets.clickhouse.com/mgbench{1..3}.csv.xz
 ```
 
 Распаковать данные:
@@ -411,5 +411,5 @@ ORDER BY yr,
          mo;
 ```
 
-Данные также доступны для работы с интерактивными запросами через [Playground](https://gh-api.clickhouse.tech/play?user=play), [пример](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1hY2hpbmVfbmFtZSwKICAgICAgIE1JTihjcHUpIEFTIGNwdV9taW4sCiAgICAgICBNQVgoY3B1KSBBUyBjcHVfbWF4LAogICAgICAgQVZHKGNwdSkgQVMgY3B1X2F2ZywKICAgICAgIE1JTihuZXRfaW4pIEFTIG5ldF9pbl9taW4sCiAgICAgICBNQVgobmV0X2luKSBBUyBuZXRfaW5fbWF4LAogICAgICAgQVZHKG5ldF9pbikgQVMgbmV0X2luX2F2ZywKICAgICAgIE1JTihuZXRfb3V0KSBBUyBuZXRfb3V0X21pbiwKICAgICAgIE1BWChuZXRfb3V0KSBBUyBuZXRfb3V0X21heCwKICAgICAgIEFWRyhuZXRfb3V0KSBBUyBuZXRfb3V0X2F2ZwpGUk9NICgKICBTRUxFQ1QgbWFjaGluZV9uYW1lLAogICAgICAgICBDT0FMRVNDRShjcHVfdXNlciwgMC4wKSBBUyBjcHUsCiAgICAgICAgIENPQUxFU0NFKGJ5dGVzX2luLCAwLjApIEFTIG5ldF9pbiwKICAgICAgICAgQ09BTEVTQ0UoYnl0ZXNfb3V0LCAwLjApIEFTIG5ldF9vdXQKICBGUk9NIG1nYmVuY2gubG9nczEKICBXSEVSRSBtYWNoaW5lX25hbWUgSU4gKCdhbmFuc2knLCdhcmFnb2cnLCd1cmQnKQogICAgQU5EIGxvZ190aW1lID49IFRJTUVTVEFNUCAnMjAxNy0wMS0xMSAwMDowMDowMCcKKSBBUyByCkdST1VQIEJZIG1hY2hpbmVfbmFtZQ==).
+Данные также доступны для работы с интерактивными запросами через [Playground](https://gh-api.clickhouse.com/play?user=play), [пример](https://gh-api.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 a5524248019..19a9851def4 100644
--- a/docs/ru/getting-started/example-datasets/cell-towers.md
+++ b/docs/ru/getting-started/example-datasets/cell-towers.md
@@ -11,7 +11,7 @@ OpenCelliD Project имеет лицензию Creative Commons Attribution-Shar
 
 ## Как получить набор данных {#get-the-dataset}
 
-1. Загрузите снэпшот набора данных за февраль 2021 [отсюда](https://datasets.clickhouse.tech/cell_towers.csv.xz) (729 MB).
+1. Загрузите снэпшот набора данных за февраль 2021 [отсюда](https://datasets.clickhouse.com/cell_towers.csv.xz) (729 MB).
 
 2. Если нужно, проверьте полноту и целостность при помощи команды:
 
@@ -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.tech/play?user=play). Например, [вот так](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=). Однако, обратите внимание, что здесь нельзя создавать временные таблицы.
+Вы можете протестировать другие запросы с помощью интерактивного ресурса [Playground](https://gh-api.clickhouse.com/play?user=play). Например, [вот так](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUIG1jYywgY291bnQoKSBGUk9NIGNlbGxfdG93ZXJzIEdST1VQIEJZIG1jYyBPUkRFUiBCWSBjb3VudCgpIERFU0M=). Однако, обратите внимание, что здесь нельзя создавать временные таблицы.
diff --git a/docs/ru/getting-started/example-datasets/github-events.md b/docs/ru/getting-started/example-datasets/github-events.md
new file mode 120000
index 00000000000..c9649c0a61f
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/github-events.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/github-events.md
\ No newline at end of file
diff --git a/docs/ru/getting-started/example-datasets/index.md b/docs/ru/getting-started/example-datasets/index.md
index 756b3a75dee..2049ddd5d86 100644
--- a/docs/ru/getting-started/example-datasets/index.md
+++ b/docs/ru/getting-started/example-datasets/index.md
@@ -9,12 +9,16 @@ toc_title: "Введение"
 Этот раздел описывает как получить тестовые массивы данных и загрузить их в ClickHouse.
 Для некоторых тестовых массивов данных также доступны тестовые запросы.
 
--   [Анонимизированные данные Яндекс.Метрики](metrica.md)
--   [Star Schema Benchmark](star-schema.md)
--   [WikiStat](wikistat.md)
--   [Терабайт логов кликов от Criteo](criteo.md)
--   [AMPLab Big Data Benchmark](amplab-benchmark.md)
--   [Данные о такси в Нью-Йорке](nyc-taxi.md)
--   [OnTime](ontime.md)
+-   [Анонимизированные данные Яндекс.Метрики](../../getting-started/example-datasets/metrica.md)
+-   [Star Schema Benchmark](../../getting-started/example-datasets/star-schema.md)
+-   [Набор данных кулинарных рецептов](../../getting-started/example-datasets/recipes.md)
+-   [WikiStat](../../getting-started/example-datasets/wikistat.md)
+-   [Терабайт логов кликов от Criteo](../../getting-started/example-datasets/criteo.md)
+-   [AMPLab Big Data Benchmark](../../getting-started/example-datasets/amplab-benchmark.md)
+-   [Данные о такси в Нью-Йорке](../../getting-started/example-datasets/nyc-taxi.md)
+-   [Набор данных о воздушном движении OpenSky Network 2020](../../getting-started/example-datasets/opensky.md)
+-   [Данные о стоимости недвижимости в Великобритании](../../getting-started/example-datasets/uk-price-paid.md)
+-   [OnTime](../../getting-started/example-datasets/ontime.md)
 -   [Вышки сотовой связи](../../getting-started/example-datasets/cell-towers.md)
 
+[Оригинальная статья](https://clickhouse.tech/docs/ru/getting_started/example_datasets) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/menus.md b/docs/ru/getting-started/example-datasets/menus.md
new file mode 100644
index 00000000000..5b549975b8f
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/menus.md
@@ -0,0 +1,360 @@
+---
+toc_priority: 21
+toc_title: Меню
+---
+
+# Набор данных публичной библиотеки Нью-Йорка "Что в меню?" {#menus-dataset}
+
+Набор данных создан Нью-Йоркской публичной библиотекой. Он содержит исторические данные о меню отелей, ресторанов и кафе с блюдами, а также их ценами.
+
+Источник: http://menus.nypl.org/data
+Эти данные находятся в открытом доступе.
+
+Данные взяты из архива библиотеки, и они могут быть неполными и сложными для статистического анализа. Тем не менее, это тоже очень интересно.
+В наборе всего 1,3 миллиона записей о блюдах в меню — очень небольшой объем данных для ClickHouse, но это все равно хороший пример.
+
+## Загрузите набор данных {#download-dataset}
+
+Выполните команду:
+
+```bash
+wget https://s3.amazonaws.com/menusdata.nypl.org/gzips/2021_08_01_07_01_17_data.tgz
+```
+
+При необходимости замените ссылку на актуальную ссылку с http://menus.nypl.org/data.
+Размер архива составляет около 35 МБ.
+
+## Распакуйте набор данных {#unpack-dataset}
+
+```bash
+tar xvf 2021_08_01_07_01_17_data.tgz
+```
+
+Размер распакованных данных составляет около 150 МБ.
+
+Данные нормализованы и состоят из четырех таблиц:
+- `Menu` — информация о меню: название ресторана, дата, когда было просмотрено меню, и т.д.
+- `Dish` — информация о блюдах: название блюда вместе с некоторыми характеристиками.
+- `MenuPage` — информация о страницах в меню, потому что каждая страница принадлежит какому-либо меню.
+- `MenuItem` — один из пунктов меню. Блюдо вместе с его ценой на какой-либо странице меню: ссылки на блюдо и страницу меню.
+
+## Создайте таблицы {#create-tables}
+
+Для хранения цен используется тип данных [Decimal](../../sql-reference/data-types/decimal.md).
+
+```sql
+CREATE TABLE dish
+(
+    id UInt32,
+    name String,
+    description String,
+    menus_appeared UInt32,
+    times_appeared Int32,
+    first_appeared UInt16,
+    last_appeared UInt16,
+    lowest_price Decimal64(3),
+    highest_price Decimal64(3)
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu
+(
+    id UInt32,
+    name String,
+    sponsor String,
+    event String,
+    venue String,
+    place String,
+    physical_description String,
+    occasion String,
+    notes String,
+    call_number String,
+    keywords String,
+    language String,
+    date String,
+    location String,
+    location_type String,
+    currency String,
+    currency_symbol String,
+    status String,
+    page_count UInt16,
+    dish_count UInt16
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu_page
+(
+    id UInt32,
+    menu_id UInt32,
+    page_number UInt16,
+    image_id String,
+    full_height UInt16,
+    full_width UInt16,
+    uuid UUID
+) ENGINE = MergeTree ORDER BY id;
+
+CREATE TABLE menu_item
+(
+    id UInt32,
+    menu_page_id UInt32,
+    price Decimal64(3),
+    high_price Decimal64(3),
+    dish_id UInt32,
+    created_at DateTime,
+    updated_at DateTime,
+    xpos Float64,
+    ypos Float64
+) ENGINE = MergeTree ORDER BY id;
+```
+
+## Импортируйте данные {#import-data}
+
+Импортируйте данные в ClickHouse, выполните команды:
+
+```bash
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO dish FORMAT CSVWithNames" < Dish.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO menu FORMAT CSVWithNames" < Menu.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --query "INSERT INTO menu_page FORMAT CSVWithNames" < MenuPage.csv
+clickhouse-client --format_csv_allow_single_quotes 0 --input_format_null_as_default 0 --date_time_input_format best_effort --query "INSERT INTO menu_item FORMAT CSVWithNames" < MenuItem.csv
+```
+
+Поскольку данные представлены в формате CSV с заголовком, используется формат [CSVWithNames](../../interfaces/formats.md#csvwithnames).
+
+Отключите `format_csv_allow_single_quotes`, так как для данных используются только двойные кавычки, а одинарные кавычки могут находиться внутри значений и не должны сбивать с толку CSV-парсер.
+
+Отключите [input_format_null_as_default](../../operations/settings/settings.md#settings-input-format-null-as-default), поскольку в данных нет значений [NULL](../../sql-reference/syntax.md#null-literal).
+
+В противном случае ClickHouse попытается проанализировать последовательности `\N` и может перепутать с `\` в данных.
+
+Настройка [date_time_input_format best_effort](../../operations/settings/settings.md#settings-date_time_input_format) позволяет анализировать поля [DateTime](../../sql-reference/data-types/datetime.md) в самых разных форматах. К примеру, будет распознан ISO-8601 без секунд: '2000-01-01 01:02'. Без этой настройки допускается только фиксированный формат даты и времени.
+
+## Денормализуйте данные {#denormalize-data}
+
+Данные представлены в нескольких таблицах в [нормализованном виде](https://ru.wikipedia.org/wiki/%D0%9D%D0%BE%D1%80%D0%BC%D0%B0%D0%BB%D1%8C%D0%BD%D0%B0%D1%8F_%D1%84%D0%BE%D1%80%D0%BC%D0%B0). 
+
+Это означает, что вам нужно использовать условие объединения [JOIN](../../sql-reference/statements/select/join.md#select-join), если вы хотите получить, например, названия блюд из пунктов меню.
+
+Для типовых аналитических задач гораздо эффективнее работать с предварительно объединенными данными, чтобы не использовать `JOIN` каждый раз. Такие данные называются денормализованными.
+
+Создайте таблицу `menu_item_denorm`, которая будет содержать все данные, объединенные вместе:
+
+```sql
+CREATE TABLE menu_item_denorm
+ENGINE = MergeTree ORDER BY (dish_name, created_at)
+AS SELECT
+    price,
+    high_price,
+    created_at,
+    updated_at,
+    xpos,
+    ypos,
+    dish.id AS dish_id,
+    dish.name AS dish_name,
+    dish.description AS dish_description,
+    dish.menus_appeared AS dish_menus_appeared,
+    dish.times_appeared AS dish_times_appeared,
+    dish.first_appeared AS dish_first_appeared,
+    dish.last_appeared AS dish_last_appeared,
+    dish.lowest_price AS dish_lowest_price,
+    dish.highest_price AS dish_highest_price,
+    menu.id AS menu_id,
+    menu.name AS menu_name,
+    menu.sponsor AS menu_sponsor,
+    menu.event AS menu_event,
+    menu.venue AS menu_venue,
+    menu.place AS menu_place,
+    menu.physical_description AS menu_physical_description,
+    menu.occasion AS menu_occasion,
+    menu.notes AS menu_notes,
+    menu.call_number AS menu_call_number,
+    menu.keywords AS menu_keywords,
+    menu.language AS menu_language,
+    menu.date AS menu_date,
+    menu.location AS menu_location,
+    menu.location_type AS menu_location_type,
+    menu.currency AS menu_currency,
+    menu.currency_symbol AS menu_currency_symbol,
+    menu.status AS menu_status,
+    menu.page_count AS menu_page_count,
+    menu.dish_count AS menu_dish_count
+FROM menu_item
+    JOIN dish ON menu_item.dish_id = dish.id
+    JOIN menu_page ON menu_item.menu_page_id = menu_page.id
+    JOIN menu ON menu_page.menu_id = menu.id;
+```
+
+## Проверьте загруженные данные {#validate-data}
+
+Запрос:
+
+```sql
+SELECT count() FROM menu_item_denorm;
+```
+
+Результат:
+
+```text
+┌─count()─┐
+│ 1329175 │
+└─────────┘
+```
+
+## Примеры запросов {#run-queries}
+
+### Усредненные исторические цены на блюда {#query-averaged-historical-prices}
+
+Запрос:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 100, 100)
+FROM menu_item_denorm
+WHERE (menu_currency = 'Dollars') AND (d > 0) AND (d < 2022)
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Результат:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 100, 100)─┐
+│ 1850 │     618 │                  1.5 │ █▍                           │
+│ 1860 │    1634 │                 1.29 │ █▎                           │
+│ 1870 │    2215 │                 1.36 │ █▎                           │
+│ 1880 │    3909 │                 1.01 │ █                            │
+│ 1890 │    8837 │                  1.4 │ █▍                           │
+│ 1900 │  176292 │                 0.68 │ ▋                            │
+│ 1910 │  212196 │                 0.88 │ ▊                            │
+│ 1920 │  179590 │                 0.74 │ ▋                            │
+│ 1930 │   73707 │                  0.6 │ ▌                            │
+│ 1940 │   58795 │                 0.57 │ ▌                            │
+│ 1950 │   41407 │                 0.95 │ ▊                            │
+│ 1960 │   51179 │                 1.32 │ █▎                           │
+│ 1970 │   12914 │                 1.86 │ █▋                           │
+│ 1980 │    7268 │                 4.35 │ ████▎                        │
+│ 1990 │   11055 │                 6.03 │ ██████                       │
+│ 2000 │    2467 │                11.85 │ ███████████▋                 │
+│ 2010 │     597 │                25.66 │ █████████████████████████▋   │
+└──────┴─────────┴──────────────────────┴──────────────────────────────┘
+```
+
+Просто не принимайте это всерьез.
+
+### Цены на бургеры {#query-burger-prices}
+
+Запрос:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100)
+FROM menu_item_denorm
+WHERE (menu_currency = 'Dollars') AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%burger%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Результат:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)───────────┐
+│ 1880 │       2 │                 0.42 │ ▋                                     │
+│ 1890 │       7 │                 0.85 │ █▋                                    │
+│ 1900 │     399 │                 0.49 │ ▊                                     │
+│ 1910 │     589 │                 0.68 │ █▎                                    │
+│ 1920 │     280 │                 0.56 │ █                                     │
+│ 1930 │      74 │                 0.42 │ ▋                                     │
+│ 1940 │     119 │                 0.59 │ █▏                                    │
+│ 1950 │     134 │                 1.09 │ ██▏                                   │
+│ 1960 │     272 │                 0.92 │ █▋                                    │
+│ 1970 │     108 │                 1.18 │ ██▎                                   │
+│ 1980 │      88 │                 2.82 │ █████▋                                │
+│ 1990 │     184 │                 3.68 │ ███████▎                              │
+│ 2000 │      21 │                 7.14 │ ██████████████▎                       │
+│ 2010 │       6 │                18.42 │ ████████████████████████████████████▋ │
+└──────┴─────────┴──────────────────────┴───────────────────────────────────────┘
+```
+
+### Водка {#query-vodka}
+
+Запрос:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100)
+FROM menu_item_denorm
+WHERE (menu_currency IN ('Dollars', '')) AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%vodka%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Результат:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)─┐
+│ 1910 │       2 │                    0 │                             │
+│ 1920 │       1 │                  0.3 │ ▌                           │
+│ 1940 │      21 │                 0.42 │ ▋                           │
+│ 1950 │      14 │                 0.59 │ █▏                          │
+│ 1960 │     113 │                 2.17 │ ████▎                       │
+│ 1970 │      37 │                 0.68 │ █▎                          │
+│ 1980 │      19 │                 2.55 │ █████                       │
+│ 1990 │      86 │                  3.6 │ ███████▏                    │
+│ 2000 │       2 │                 3.98 │ ███████▊                    │
+└──────┴─────────┴──────────────────────┴─────────────────────────────┘
+```
+
+Чтобы получить водку, мы должны написать `ILIKE '%vodka%'`, и это хорошая идея.
+
+### Икра {#query-caviar}
+
+Посмотрите цены на икру. Получите название любого блюда с икрой.
+
+Запрос:
+
+```sql
+SELECT
+    round(toUInt32OrZero(extract(menu_date, '^\\d{4}')), -1) AS d,
+    count(),
+    round(avg(price), 2),
+    bar(avg(price), 0, 50, 100),
+    any(dish_name)
+FROM menu_item_denorm
+WHERE (menu_currency IN ('Dollars', '')) AND (d > 0) AND (d < 2022) AND (dish_name ILIKE '%caviar%')
+GROUP BY d
+ORDER BY d ASC;
+```
+
+Результат:
+
+```text
+┌────d─┬─count()─┬─round(avg(price), 2)─┬─bar(avg(price), 0, 50, 100)──────┬─any(dish_name)──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+│ 1090 │       1 │                    0 │                                  │ Caviar                                                                                                                              │
+│ 1880 │       3 │                    0 │                                  │ Caviar                                                                                                                              │
+│ 1890 │      39 │                 0.59 │ █▏                               │ Butter and caviar                                                                                                                   │
+│ 1900 │    1014 │                 0.34 │ ▋                                │ Anchovy Caviar on Toast                                                                                                             │
+│ 1910 │    1588 │                 1.35 │ ██▋                              │ 1/1 Brötchen Caviar                                                                                                                 │
+│ 1920 │     927 │                 1.37 │ ██▋                              │ ASTRAKAN CAVIAR                                                                                                                     │
+│ 1930 │     289 │                 1.91 │ ███▋                             │ Astrachan caviar                                                                                                                    │
+│ 1940 │     201 │                 0.83 │ █▋                               │ (SPECIAL) Domestic Caviar Sandwich                                                                                                  │
+│ 1950 │      81 │                 2.27 │ ████▌                            │ Beluga Caviar                                                                                                                       │
+│ 1960 │     126 │                 2.21 │ ████▍                            │ Beluga Caviar                                                                                                                       │
+│ 1970 │     105 │                 0.95 │ █▊                               │ BELUGA MALOSSOL CAVIAR AMERICAN DRESSING                                                                                            │
+│ 1980 │      12 │                 7.22 │ ██████████████▍                  │ Authentic Iranian Beluga Caviar the world's finest black caviar presented in ice garni and a sampling of chilled 100° Russian vodka │
+│ 1990 │      74 │                14.42 │ ████████████████████████████▋    │ Avocado Salad, Fresh cut avocado with caviare                                                                                       │
+│ 2000 │       3 │                 7.82 │ ███████████████▋                 │ Aufgeschlagenes Kartoffelsueppchen mit Forellencaviar                                                                               │
+│ 2010 │       6 │                15.58 │ ███████████████████████████████▏ │ "OYSTERS AND PEARLS" "Sabayon" of Pearl Tapioca with Island Creek Oysters and Russian Sevruga Caviar                                │
+└──────┴─────────┴──────────────────────┴──────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+По крайней мере, есть икра с водкой. Очень мило.
+
+## Online Playground {#playground}
+
+Этот набор данных доступен в интерактивном ресурсе [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICByb3VuZCh0b1VJbnQzMk9yWmVybyhleHRyYWN0KG1lbnVfZGF0ZSwgJ15cXGR7NH0nKSksIC0xKSBBUyBkLAogICAgY291bnQoKSwKICAgIHJvdW5kKGF2ZyhwcmljZSksIDIpLAogICAgYmFyKGF2ZyhwcmljZSksIDAsIDUwLCAxMDApLAogICAgYW55KGRpc2hfbmFtZSkKRlJPTSBtZW51X2l0ZW1fZGVub3JtCldIRVJFIChtZW51X2N1cnJlbmN5IElOICgnRG9sbGFycycsICcnKSkgQU5EIChkID4gMCkgQU5EIChkIDwgMjAyMikgQU5EIChkaXNoX25hbWUgSUxJS0UgJyVjYXZpYXIlJykKR1JPVVAgQlkgZApPUkRFUiBCWSBkIEFTQw==).
diff --git a/docs/ru/getting-started/example-datasets/metrica.md b/docs/ru/getting-started/example-datasets/metrica.md
index 7deacdb836c..ee764ff4879 100644
--- a/docs/ru/getting-started/example-datasets/metrica.md
+++ b/docs/ru/getting-started/example-datasets/metrica.md
@@ -5,28 +5,28 @@ toc_title: "Анонимизированные данные Яндекс.Мет
 
 # Анонимизированные данные Яндекс.Метрики {#anonimizirovannye-dannye-iandeks-metriki}
 
-Датасет состоит из двух таблиц, содержащих анонимизированные данные о хитах (`hits_v1`) и визитах (`visits_v1`) Яндекс.Метрики. Каждую из таблиц можно скачать в виде сжатого `.tsv.xz`-файла или в виде уже готовых партиций. Также можно скачать расширенную версию таблицы `hits`, содержащую 100 миллионов строк в виде [архива c файлами TSV](https://datasets.clickhouse.tech/hits/tsv/hits_100m_obfuscated_v1.tsv.xz) и в виде [готовых партиций](https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz).
+Датасет состоит из двух таблиц, содержащих анонимизированные данные о хитах (`hits_v1`) и визитах (`visits_v1`) Яндекс.Метрики. Каждую из таблиц можно скачать в виде сжатого `.tsv.xz`-файла или в виде уже готовых партиций. Также можно скачать расширенную версию таблицы `hits`, содержащую 100 миллионов строк в виде [архива c файлами TSV](https://datasets.clickhouse.com/hits/tsv/hits_100m_obfuscated_v1.tsv.xz) и в виде [готовых партиций](https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz).
 
 ## Получение таблиц из партиций {#poluchenie-tablits-iz-partitsii}
 
 **Скачивание и импортирование партиций hits:**
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/hits/partitions/hits_v1.tar
-$ tar xvf hits_v1.tar -C /var/lib/clickhouse # путь к папке с данными ClickHouse
-$ # убедитесь, что установлены корректные права доступа на файлы
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
+curl -O https://datasets.clickhouse.com/hits/partitions/hits_v1.tar
+tar xvf hits_v1.tar -C /var/lib/clickhouse # путь к папке с данными ClickHouse
+# убедитесь, что установлены корректные права доступа на файлы
+sudo service clickhouse-server restart
+clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 ```
 
 **Скачивание и импортирование партиций visits:**
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/visits/partitions/visits_v1.tar
-$ tar xvf visits_v1.tar -C /var/lib/clickhouse # путь к папке с данными ClickHouse
-$ # убедитесь, что установлены корректные права доступа на файлы
-$ sudo service clickhouse-server restart
-$ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
+curl -O https://datasets.clickhouse.com/visits/partitions/visits_v1.tar
+tar xvf visits_v1.tar -C /var/lib/clickhouse # путь к папке с данными ClickHouse
+# убедитесь, что установлены корректные права доступа на файлы
+sudo service clickhouse-server restart
+clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
 ```
 
 ## Получение таблиц из сжатых tsv-файлов {#poluchenie-tablits-iz-szhatykh-tsv-failov}
@@ -34,29 +34,32 @@ $ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
 **Скачивание и импортирование hits из сжатого tsv-файла**
 
 ``` bash
-$ curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-$ # теперь создадим таблицу
-$ clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
-$ clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
-$ # импортируем данные
-$ cat hits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.hits_v1 FORMAT TSV" --max_insert_block_size=100000
-$ # опционально можно оптимизировать таблицу
-$ clickhouse-client --query "OPTIMIZE TABLE datasets.hits_v1 FINAL"
-$ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+# создадим таблицу hits_v1
+clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
+clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64, JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+# создадим таблицу hits_100m_obfuscated
+clickhouse-client --query="CREATE TABLE  hits_100m_obfuscated (WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, Refresh UInt8, RefererCategoryID UInt16, RefererRegionID UInt32, URLCategoryID UInt16, URLRegionID UInt32, ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, OriginalURL String, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), LocalEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, RemoteIP UInt32, WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming UInt32, DNSTiming UInt32, ConnectTiming UInt32, ResponseStartTiming UInt32, ResponseEndTiming UInt32, FetchTiming UInt32, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER  BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+
+# импортируем данные
+cat hits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.hits_v1 FORMAT TSV" --max_insert_block_size=100000
+# опционально можно оптимизировать таблицу
+clickhouse-client --query "OPTIMIZE TABLE datasets.hits_v1 FINAL"
+clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 ```
 
 **Скачивание и импортирование visits из сжатого tsv-файла**
 
 ``` bash
-$ curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
-$ # теперь создадим таблицу
-$ clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
-$ clickhouse-client --query "CREATE TABLE datasets.visits_v1 ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  Goals Nested(ID UInt32, Serial UInt32, EventTime DateTime,  Price Int64,  OrderID String, CurrencyID UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  TraficSource    Nested(ID Int8,  SearchEngineID UInt16, AdvEngineID UInt8, PlaceID UInt16, SocialSourceNetworkID UInt8, Domain String, SearchPhrase String, SocialSourcePage String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  ParsedParams    Nested(Key1 String,  Key2 String,  Key3 String,  Key4 String, Key5 String, ValueDouble    Float64),  Market Nested(Type UInt8, GoalID UInt32, OrderID String,  OrderPrice Int64,  PP UInt32,  DirectPlaceID UInt32,  DirectOrderID  UInt32,  DirectBannerID UInt32,  GoodID String, GoodName String, GoodQuantity Int32,  GoodPrice Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
-$ # импортируем данные
-$ cat visits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.visits_v1 FORMAT TSV" --max_insert_block_size=100000
-$ # опционально можно оптимизировать таблицу
-$ clickhouse-client --query "OPTIMIZE TABLE datasets.visits_v1 FINAL"
-$ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+# теперь создадим таблицу
+clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
+clickhouse-client --query "CREATE TABLE datasets.visits_v1 ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  Goals Nested(ID UInt32, Serial UInt32, EventTime DateTime,  Price Int64,  OrderID String, CurrencyID UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  TraficSource    Nested(ID Int8,  SearchEngineID UInt16, AdvEngineID UInt8, PlaceID UInt16, SocialSourceNetworkID UInt8, Domain String, SearchPhrase String, SocialSourcePage String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  ParsedParams    Nested(Key1 String,  Key2 String,  Key3 String,  Key4 String, Key5 String, ValueDouble    Float64),  Market Nested(Type UInt8, GoalID UInt32, OrderID String,  OrderPrice Int64,  PP UInt32,  DirectPlaceID UInt32,  DirectOrderID  UInt32,  DirectBannerID UInt32,  GoodID String, GoodName String, GoodQuantity Int32,  GoodPrice Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
+# импортируем данные
+cat visits_v1.tsv | clickhouse-client --query "INSERT INTO datasets.visits_v1 FORMAT TSV" --max_insert_block_size=100000
+# опционально можно оптимизировать таблицу
+clickhouse-client --query "OPTIMIZE TABLE datasets.visits_v1 FINAL"
+clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
 ```
 
 ## Запросы {#zaprosy}
diff --git a/docs/ru/getting-started/example-datasets/nyc-taxi.md b/docs/ru/getting-started/example-datasets/nyc-taxi.md
index 38a60ed1b2d..9c3ef6b0652 100644
--- a/docs/ru/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/ru/getting-started/example-datasets/nyc-taxi.md
@@ -283,7 +283,7 @@ SELECT formatReadableSize(sum(bytes)) FROM system.parts WHERE table = 'trips_mer
 ## Скачивание готовых партиций {#skachivanie-gotovykh-partitsii}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/trips_mergetree/partitions/trips_mergetree.tar
+$ curl -O https://datasets.clickhouse.com/trips_mergetree/partitions/trips_mergetree.tar
 $ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # путь к папке с данными ClickHouse
 $ # убедитесь, что установлены корректные права доступа на файлы
 $ sudo service clickhouse-server restart
diff --git a/docs/ru/getting-started/example-datasets/ontime.md b/docs/ru/getting-started/example-datasets/ontime.md
index d46b7e75e7f..e1d47a5a9e7 100644
--- a/docs/ru/getting-started/example-datasets/ontime.md
+++ b/docs/ru/getting-started/example-datasets/ontime.md
@@ -153,7 +153,7 @@ ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | se
 ## Скачивание готовых партиций {#skachivanie-gotovykh-partitsii}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/ontime/partitions/ontime.tar
+$ curl -O https://datasets.clickhouse.com/ontime/partitions/ontime.tar
 $ tar xvf ontime.tar -C /var/lib/clickhouse # путь к папке с данными ClickHouse
 $ # убедитесь, что установлены корректные права доступа на файлы
 $ sudo service clickhouse-server restart
diff --git a/docs/ru/getting-started/example-datasets/opensky.md b/docs/ru/getting-started/example-datasets/opensky.md
new file mode 100644
index 00000000000..bda5dec3c47
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/opensky.md
@@ -0,0 +1,422 @@
+---
+toc_priority: 20
+toc_title: Набор данных о воздушном движении OpenSky Network 2020
+---
+
+# Набор данных о воздушном движении OpenSky Network 2020 {#opensky}
+
+"Данные в этом наборе получены и отфильтрованы из полного набора данных OpenSky, чтобы проиллюстрировать развитие воздушного движения во время пандемии COVID-19. Набор включает в себя все рейсы, которые видели более 2500 участников сети с 1 января 2019 года. Дополнительные данные будут периодически включаться в набор данных до окончания пандемии COVID-19".
+
+Источник: https://zenodo.org/record/5092942#.YRBCyTpRXYd
+
+Martin Strohmeier, Xavier Olive, Jannis Lübbe, Matthias Schäfer, and Vincent Lenders
+"Crowdsourced air traffic data from the OpenSky Network 2019–2020"
+Earth System Science Data 13(2), 2021
+https://doi.org/10.5194/essd-13-357-2021
+
+## Загрузите набор данных {#download-dataset}
+
+Выполните команду:
+
+```bash
+wget -O- https://zenodo.org/record/5092942 | grep -oP 'https://zenodo.org/record/5092942/files/flightlist_\d+_\d+\.csv\.gz' | xargs wget
+```
+
+Загрузка займет около 2 минут при хорошем подключении к интернету. Будет загружено 30 файлов общим размером 4,3 ГБ.
+
+## Создайте таблицу {#create-table}
+
+```sql
+CREATE TABLE opensky
+(
+    callsign String,
+    number String,
+    icao24 String,
+    registration String,
+    typecode String,
+    origin String,
+    destination String,
+    firstseen DateTime,
+    lastseen DateTime,
+    day DateTime,
+    latitude_1 Float64,
+    longitude_1 Float64,
+    altitude_1 Float64,
+    latitude_2 Float64,
+    longitude_2 Float64,
+    altitude_2 Float64
+) ENGINE = MergeTree ORDER BY (origin, destination, callsign);
+```
+
+## Импортируйте данные в ClickHouse {#import-data}
+
+Загрузите данные в ClickHouse параллельными потоками:
+
+```bash
+ls -1 flightlist_*.csv.gz | xargs -P100 -I{} bash -c 'gzip -c -d "{}" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"'
+```
+
+- Список файлов передаётся (`ls -1 flightlist_*.csv.gz`) в `xargs` для параллельной обработки.
+- `xargs -P100` указывает на возможность использования до 100 параллельных обработчиков, но поскольку у нас всего 30 файлов, то количество обработчиков будет всего 30.
+- Для каждого файла `xargs` будет запускать скрипт с `bash -c`. Сценарий имеет подстановку в виде `{}`, а команда `xargs` заменяет имя файла на указанные в подстановке символы (мы указали это для `xargs` с помощью `-I{}`).
+- Скрипт распакует файл (`gzip -c -d "{}"`) в стандартный вывод (параметр `-c`) и перенаправит его в `clickhouse-client`.
+- Чтобы распознать формат ISO-8601 со смещениями часовых поясов в полях типа [DateTime](../../sql-reference/data-types/datetime.md), указывается параметр парсера [--date_time_input_format best_effort](../../operations/settings/settings.md#settings-date_time_input_format).
+
+В итоге: клиент clickhouse добавит данные в таблицу `opensky`. Входные данные импортируются в формате [CSVWithNames](../../interfaces/formats.md#csvwithnames).
+
+
+Загрузка параллельными потоками займёт около 24 секунд.
+
+Также вы можете использовать вариант последовательной загрузки:
+
+```bash
+for file in flightlist_*.csv.gz; do gzip -c -d "$file" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"; done
+```
+
+## Проверьте импортированные данные {#validate-data}
+
+Запрос:
+
+```sql
+SELECT count() FROM opensky;
+```
+
+Результат:
+
+```text
+┌──count()─┐
+│ 66010819 │
+└──────────┘
+```
+
+Убедитесь, что размер набора данных в ClickHouse составляет всего 2,66 GiB.
+
+Запрос:
+
+```sql
+SELECT formatReadableSize(total_bytes) FROM system.tables WHERE name = 'opensky';
+```
+
+Результат:
+
+```text
+┌─formatReadableSize(total_bytes)─┐
+│ 2.66 GiB                        │
+└─────────────────────────────────┘
+```
+
+## Примеры {#run-queries}
+
+Общее пройденное расстояние составляет 68 миллиардов километров.
+
+Запрос:
+
+```sql
+SELECT formatReadableQuantity(sum(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) / 1000) FROM opensky;
+```
+
+Результат:
+
+```text
+┌─formatReadableQuantity(divide(sum(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)), 1000))─┐
+│ 68.72 billion                                                                                            │
+└──────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+Средняя дальность полета составляет около 1000 км.
+
+Запрос:
+
+```sql
+SELECT avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) FROM opensky;
+```
+
+Результат:
+
+```text
+┌─avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))─┐
+│                                                 1041090.6465708319 │
+└────────────────────────────────────────────────────────────────────┘
+```
+
+### Наиболее загруженные аэропорты в указанных координатах и среднее пройденное расстояние {#busy-airports-average-distance}
+
+Запрос:
+
+```sql
+SELECT
+    origin,
+    count(),
+    round(avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))) AS distance,
+    bar(distance, 0, 10000000, 100) AS bar
+FROM opensky
+WHERE origin != ''
+GROUP BY origin
+ORDER BY count() DESC
+LIMIT 100;
+```
+
+Результат:
+
+```text
+     ┌─origin─┬─count()─┬─distance─┬─bar────────────────────────────────────┐
+  1. │ KORD   │  745007 │  1546108 │ ███████████████▍                       │
+  2. │ KDFW   │  696702 │  1358721 │ █████████████▌                         │
+  3. │ KATL   │  667286 │  1169661 │ ███████████▋                           │
+  4. │ KDEN   │  582709 │  1287742 │ ████████████▊                          │
+  5. │ KLAX   │  581952 │  2628393 │ ██████████████████████████▎            │
+  6. │ KLAS   │  447789 │  1336967 │ █████████████▎                         │
+  7. │ KPHX   │  428558 │  1345635 │ █████████████▍                         │
+  8. │ KSEA   │  412592 │  1757317 │ █████████████████▌                     │
+  9. │ KCLT   │  404612 │   880355 │ ████████▋                              │
+ 10. │ VIDP   │  363074 │  1445052 │ ██████████████▍                        │
+ 11. │ EDDF   │  362643 │  2263960 │ ██████████████████████▋                │
+ 12. │ KSFO   │  361869 │  2445732 │ ████████████████████████▍              │
+ 13. │ KJFK   │  349232 │  2996550 │ █████████████████████████████▊         │
+ 14. │ KMSP   │  346010 │  1287328 │ ████████████▋                          │
+ 15. │ LFPG   │  344748 │  2206203 │ ██████████████████████                 │
+ 16. │ EGLL   │  341370 │  3216593 │ ████████████████████████████████▏      │
+ 17. │ EHAM   │  340272 │  2116425 │ █████████████████████▏                 │
+ 18. │ KEWR   │  337696 │  1826545 │ ██████████████████▎                    │
+ 19. │ KPHL   │  320762 │  1291761 │ ████████████▊                          │
+ 20. │ OMDB   │  308855 │  2855706 │ ████████████████████████████▌          │
+ 21. │ UUEE   │  307098 │  1555122 │ ███████████████▌                       │
+ 22. │ KBOS   │  304416 │  1621675 │ ████████████████▏                      │
+ 23. │ LEMD   │  291787 │  1695097 │ ████████████████▊                      │
+ 24. │ YSSY   │  272979 │  1875298 │ ██████████████████▋                    │
+ 25. │ KMIA   │  265121 │  1923542 │ ███████████████████▏                   │
+ 26. │ ZGSZ   │  263497 │   745086 │ ███████▍                               │
+ 27. │ EDDM   │  256691 │  1361453 │ █████████████▌                         │
+ 28. │ WMKK   │  254264 │  1626688 │ ████████████████▎                      │
+ 29. │ CYYZ   │  251192 │  2175026 │ █████████████████████▋                 │
+ 30. │ KLGA   │  248699 │  1106935 │ ███████████                            │
+ 31. │ VHHH   │  248473 │  3457658 │ ██████████████████████████████████▌    │
+ 32. │ RJTT   │  243477 │  1272744 │ ████████████▋                          │
+ 33. │ KBWI   │  241440 │  1187060 │ ███████████▋                           │
+ 34. │ KIAD   │  239558 │  1683485 │ ████████████████▋                      │
+ 35. │ KIAH   │  234202 │  1538335 │ ███████████████▍                       │
+ 36. │ KFLL   │  223447 │  1464410 │ ██████████████▋                        │
+ 37. │ KDAL   │  212055 │  1082339 │ ██████████▋                            │
+ 38. │ KDCA   │  207883 │  1013359 │ ██████████▏                            │
+ 39. │ LIRF   │  207047 │  1427965 │ ██████████████▎                        │
+ 40. │ PANC   │  206007 │  2525359 │ █████████████████████████▎             │
+ 41. │ LTFJ   │  205415 │   860470 │ ████████▌                              │
+ 42. │ KDTW   │  204020 │  1106716 │ ███████████                            │
+ 43. │ VABB   │  201679 │  1300865 │ █████████████                          │
+ 44. │ OTHH   │  200797 │  3759544 │ █████████████████████████████████████▌ │
+ 45. │ KMDW   │  200796 │  1232551 │ ████████████▎                          │
+ 46. │ KSAN   │  198003 │  1495195 │ ██████████████▊                        │
+ 47. │ KPDX   │  197760 │  1269230 │ ████████████▋                          │
+ 48. │ SBGR   │  197624 │  2041697 │ ████████████████████▍                  │
+ 49. │ VOBL   │  189011 │  1040180 │ ██████████▍                            │
+ 50. │ LEBL   │  188956 │  1283190 │ ████████████▋                          │
+ 51. │ YBBN   │  188011 │  1253405 │ ████████████▌                          │
+ 52. │ LSZH   │  187934 │  1572029 │ ███████████████▋                       │
+ 53. │ YMML   │  187643 │  1870076 │ ██████████████████▋                    │
+ 54. │ RCTP   │  184466 │  2773976 │ ███████████████████████████▋           │
+ 55. │ KSNA   │  180045 │   778484 │ ███████▋                               │
+ 56. │ EGKK   │  176420 │  1694770 │ ████████████████▊                      │
+ 57. │ LOWW   │  176191 │  1274833 │ ████████████▋                          │
+ 58. │ UUDD   │  176099 │  1368226 │ █████████████▋                         │
+ 59. │ RKSI   │  173466 │  3079026 │ ██████████████████████████████▋        │
+ 60. │ EKCH   │  172128 │  1229895 │ ████████████▎                          │
+ 61. │ KOAK   │  171119 │  1114447 │ ███████████▏                           │
+ 62. │ RPLL   │  170122 │  1440735 │ ██████████████▍                        │
+ 63. │ KRDU   │  167001 │   830521 │ ████████▎                              │
+ 64. │ KAUS   │  164524 │  1256198 │ ████████████▌                          │
+ 65. │ KBNA   │  163242 │  1022726 │ ██████████▏                            │
+ 66. │ KSDF   │  162655 │  1380867 │ █████████████▋                         │
+ 67. │ ENGM   │  160732 │   910108 │ █████████                              │
+ 68. │ LIMC   │  160696 │  1564620 │ ███████████████▋                       │
+ 69. │ KSJC   │  159278 │  1081125 │ ██████████▋                            │
+ 70. │ KSTL   │  157984 │  1026699 │ ██████████▎                            │
+ 71. │ UUWW   │  156811 │  1261155 │ ████████████▌                          │
+ 72. │ KIND   │  153929 │   987944 │ █████████▊                             │
+ 73. │ ESSA   │  153390 │  1203439 │ ████████████                           │
+ 74. │ KMCO   │  153351 │  1508657 │ ███████████████                        │
+ 75. │ KDVT   │  152895 │    74048 │ ▋                                      │
+ 76. │ VTBS   │  152645 │  2255591 │ ██████████████████████▌                │
+ 77. │ CYVR   │  149574 │  2027413 │ ████████████████████▎                  │
+ 78. │ EIDW   │  148723 │  1503985 │ ███████████████                        │
+ 79. │ LFPO   │  143277 │  1152964 │ ███████████▌                           │
+ 80. │ EGSS   │  140830 │  1348183 │ █████████████▍                         │
+ 81. │ KAPA   │  140776 │   420441 │ ████▏                                  │
+ 82. │ KHOU   │  138985 │  1068806 │ ██████████▋                            │
+ 83. │ KTPA   │  138033 │  1338223 │ █████████████▍                         │
+ 84. │ KFFZ   │  137333 │    55397 │ ▌                                      │
+ 85. │ NZAA   │  136092 │  1581264 │ ███████████████▋                       │
+ 86. │ YPPH   │  133916 │  1271550 │ ████████████▋                          │
+ 87. │ RJBB   │  133522 │  1805623 │ ██████████████████                     │
+ 88. │ EDDL   │  133018 │  1265919 │ ████████████▋                          │
+ 89. │ ULLI   │  130501 │  1197108 │ ███████████▊                           │
+ 90. │ KIWA   │  127195 │   250876 │ ██▌                                    │
+ 91. │ KTEB   │  126969 │  1189414 │ ███████████▊                           │
+ 92. │ VOMM   │  125616 │  1127757 │ ███████████▎                           │
+ 93. │ LSGG   │  123998 │  1049101 │ ██████████▍                            │
+ 94. │ LPPT   │  122733 │  1779187 │ █████████████████▋                     │
+ 95. │ WSSS   │  120493 │  3264122 │ ████████████████████████████████▋      │
+ 96. │ EBBR   │  118539 │  1579939 │ ███████████████▋                       │
+ 97. │ VTBD   │  118107 │   661627 │ ██████▌                                │
+ 98. │ KVNY   │  116326 │   692960 │ ██████▊                                │
+ 99. │ EDDT   │  115122 │   941740 │ █████████▍                             │
+100. │ EFHK   │  114860 │  1629143 │ ████████████████▎                      │
+     └────────┴─────────┴──────────┴────────────────────────────────────────┘
+```
+
+### Номера рейсов из трех крупных аэропортов Москвы, еженедельно {#flights-from-moscow}
+
+Запрос:
+
+```sql
+SELECT
+    toMonday(day) AS k,
+    count() AS c,
+    bar(c, 0, 10000, 100) AS bar
+FROM opensky
+WHERE origin IN ('UUEE', 'UUDD', 'UUWW')
+GROUP BY k
+ORDER BY k ASC;
+```
+
+Результат:
+
+```text
+     ┌──────────k─┬────c─┬─bar──────────────────────────────────────────────────────────────────────────┐
+  1. │ 2018-12-31 │ 5248 │ ████████████████████████████████████████████████████▍                        │
+  2. │ 2019-01-07 │ 6302 │ ███████████████████████████████████████████████████████████████              │
+  3. │ 2019-01-14 │ 5701 │ █████████████████████████████████████████████████████████                    │
+  4. │ 2019-01-21 │ 5638 │ ████████████████████████████████████████████████████████▍                    │
+  5. │ 2019-01-28 │ 5731 │ █████████████████████████████████████████████████████████▎                   │
+  6. │ 2019-02-04 │ 5683 │ ████████████████████████████████████████████████████████▋                    │
+  7. │ 2019-02-11 │ 5759 │ █████████████████████████████████████████████████████████▌                   │
+  8. │ 2019-02-18 │ 5736 │ █████████████████████████████████████████████████████████▎                   │
+  9. │ 2019-02-25 │ 5873 │ ██████████████████████████████████████████████████████████▋                  │
+ 10. │ 2019-03-04 │ 5965 │ ███████████████████████████████████████████████████████████▋                 │
+ 11. │ 2019-03-11 │ 5900 │ ███████████████████████████████████████████████████████████                  │
+ 12. │ 2019-03-18 │ 5823 │ ██████████████████████████████████████████████████████████▏                  │
+ 13. │ 2019-03-25 │ 5899 │ ██████████████████████████████████████████████████████████▊                  │
+ 14. │ 2019-04-01 │ 6043 │ ████████████████████████████████████████████████████████████▍                │
+ 15. │ 2019-04-08 │ 6098 │ ████████████████████████████████████████████████████████████▊                │
+ 16. │ 2019-04-15 │ 6196 │ █████████████████████████████████████████████████████████████▊               │
+ 17. │ 2019-04-22 │ 6486 │ ████████████████████████████████████████████████████████████████▋            │
+ 18. │ 2019-04-29 │ 6682 │ ██████████████████████████████████████████████████████████████████▋          │
+ 19. │ 2019-05-06 │ 6739 │ ███████████████████████████████████████████████████████████████████▍         │
+ 20. │ 2019-05-13 │ 6600 │ ██████████████████████████████████████████████████████████████████           │
+ 21. │ 2019-05-20 │ 6575 │ █████████████████████████████████████████████████████████████████▋           │
+ 22. │ 2019-05-27 │ 6786 │ ███████████████████████████████████████████████████████████████████▋         │
+ 23. │ 2019-06-03 │ 6872 │ ████████████████████████████████████████████████████████████████████▋        │
+ 24. │ 2019-06-10 │ 7045 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 25. │ 2019-06-17 │ 7045 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 26. │ 2019-06-24 │ 6852 │ ████████████████████████████████████████████████████████████████████▌        │
+ 27. │ 2019-07-01 │ 7248 │ ████████████████████████████████████████████████████████████████████████▍    │
+ 28. │ 2019-07-08 │ 7284 │ ████████████████████████████████████████████████████████████████████████▋    │
+ 29. │ 2019-07-15 │ 7142 │ ███████████████████████████████████████████████████████████████████████▍     │
+ 30. │ 2019-07-22 │ 7108 │ ███████████████████████████████████████████████████████████████████████      │
+ 31. │ 2019-07-29 │ 7251 │ ████████████████████████████████████████████████████████████████████████▌    │
+ 32. │ 2019-08-05 │ 7403 │ ██████████████████████████████████████████████████████████████████████████   │
+ 33. │ 2019-08-12 │ 7457 │ ██████████████████████████████████████████████████████████████████████████▌  │
+ 34. │ 2019-08-19 │ 7502 │ ███████████████████████████████████████████████████████████████████████████  │
+ 35. │ 2019-08-26 │ 7540 │ ███████████████████████████████████████████████████████████████████████████▍ │
+ 36. │ 2019-09-02 │ 7237 │ ████████████████████████████████████████████████████████████████████████▎    │
+ 37. │ 2019-09-09 │ 7328 │ █████████████████████████████████████████████████████████████████████████▎   │
+ 38. │ 2019-09-16 │ 5566 │ ███████████████████████████████████████████████████████▋                     │
+ 39. │ 2019-09-23 │ 7049 │ ██████████████████████████████████████████████████████████████████████▍      │
+ 40. │ 2019-09-30 │ 6880 │ ████████████████████████████████████████████████████████████████████▋        │
+ 41. │ 2019-10-07 │ 6518 │ █████████████████████████████████████████████████████████████████▏           │
+ 42. │ 2019-10-14 │ 6688 │ ██████████████████████████████████████████████████████████████████▊          │
+ 43. │ 2019-10-21 │ 6667 │ ██████████████████████████████████████████████████████████████████▋          │
+ 44. │ 2019-10-28 │ 6303 │ ███████████████████████████████████████████████████████████████              │
+ 45. │ 2019-11-04 │ 6298 │ ██████████████████████████████████████████████████████████████▊              │
+ 46. │ 2019-11-11 │ 6137 │ █████████████████████████████████████████████████████████████▎               │
+ 47. │ 2019-11-18 │ 6051 │ ████████████████████████████████████████████████████████████▌                │
+ 48. │ 2019-11-25 │ 5820 │ ██████████████████████████████████████████████████████████▏                  │
+ 49. │ 2019-12-02 │ 5942 │ ███████████████████████████████████████████████████████████▍                 │
+ 50. │ 2019-12-09 │ 4891 │ ████████████████████████████████████████████████▊                            │
+ 51. │ 2019-12-16 │ 5682 │ ████████████████████████████████████████████████████████▋                    │
+ 52. │ 2019-12-23 │ 6111 │ █████████████████████████████████████████████████████████████                │
+ 53. │ 2019-12-30 │ 5870 │ ██████████████████████████████████████████████████████████▋                  │
+ 54. │ 2020-01-06 │ 5953 │ ███████████████████████████████████████████████████████████▌                 │
+ 55. │ 2020-01-13 │ 5698 │ ████████████████████████████████████████████████████████▊                    │
+ 56. │ 2020-01-20 │ 5339 │ █████████████████████████████████████████████████████▍                       │
+ 57. │ 2020-01-27 │ 5566 │ ███████████████████████████████████████████████████████▋                     │
+ 58. │ 2020-02-03 │ 5801 │ ██████████████████████████████████████████████████████████                   │
+ 59. │ 2020-02-10 │ 5692 │ ████████████████████████████████████████████████████████▊                    │
+ 60. │ 2020-02-17 │ 5912 │ ███████████████████████████████████████████████████████████                  │
+ 61. │ 2020-02-24 │ 6031 │ ████████████████████████████████████████████████████████████▎                │
+ 62. │ 2020-03-02 │ 6105 │ █████████████████████████████████████████████████████████████                │
+ 63. │ 2020-03-09 │ 5823 │ ██████████████████████████████████████████████████████████▏                  │
+ 64. │ 2020-03-16 │ 4659 │ ██████████████████████████████████████████████▌                              │
+ 65. │ 2020-03-23 │ 3720 │ █████████████████████████████████████▏                                       │
+ 66. │ 2020-03-30 │ 1720 │ █████████████████▏                                                           │
+ 67. │ 2020-04-06 │  849 │ ████████▍                                                                    │
+ 68. │ 2020-04-13 │  710 │ ███████                                                                      │
+ 69. │ 2020-04-20 │  725 │ ███████▏                                                                     │
+ 70. │ 2020-04-27 │  920 │ █████████▏                                                                   │
+ 71. │ 2020-05-04 │  859 │ ████████▌                                                                    │
+ 72. │ 2020-05-11 │ 1047 │ ██████████▍                                                                  │
+ 73. │ 2020-05-18 │ 1135 │ ███████████▎                                                                 │
+ 74. │ 2020-05-25 │ 1266 │ ████████████▋                                                                │
+ 75. │ 2020-06-01 │ 1793 │ █████████████████▊                                                           │
+ 76. │ 2020-06-08 │ 1979 │ ███████████████████▋                                                         │
+ 77. │ 2020-06-15 │ 2297 │ ██████████████████████▊                                                      │
+ 78. │ 2020-06-22 │ 2788 │ ███████████████████████████▊                                                 │
+ 79. │ 2020-06-29 │ 3389 │ █████████████████████████████████▊                                           │
+ 80. │ 2020-07-06 │ 3545 │ ███████████████████████████████████▍                                         │
+ 81. │ 2020-07-13 │ 3569 │ ███████████████████████████████████▋                                         │
+ 82. │ 2020-07-20 │ 3784 │ █████████████████████████████████████▋                                       │
+ 83. │ 2020-07-27 │ 3960 │ ███████████████████████████████████████▌                                     │
+ 84. │ 2020-08-03 │ 4323 │ ███████████████████████████████████████████▏                                 │
+ 85. │ 2020-08-10 │ 4581 │ █████████████████████████████████████████████▋                               │
+ 86. │ 2020-08-17 │ 4791 │ ███████████████████████████████████████████████▊                             │
+ 87. │ 2020-08-24 │ 4928 │ █████████████████████████████████████████████████▎                           │
+ 88. │ 2020-08-31 │ 4687 │ ██████████████████████████████████████████████▋                              │
+ 89. │ 2020-09-07 │ 4643 │ ██████████████████████████████████████████████▍                              │
+ 90. │ 2020-09-14 │ 4594 │ █████████████████████████████████████████████▊                               │
+ 91. │ 2020-09-21 │ 4478 │ ████████████████████████████████████████████▋                                │
+ 92. │ 2020-09-28 │ 4382 │ ███████████████████████████████████████████▋                                 │
+ 93. │ 2020-10-05 │ 4261 │ ██████████████████████████████████████████▌                                  │
+ 94. │ 2020-10-12 │ 4243 │ ██████████████████████████████████████████▍                                  │
+ 95. │ 2020-10-19 │ 3941 │ ███████████████████████████████████████▍                                     │
+ 96. │ 2020-10-26 │ 3616 │ ████████████████████████████████████▏                                        │
+ 97. │ 2020-11-02 │ 3586 │ ███████████████████████████████████▋                                         │
+ 98. │ 2020-11-09 │ 3403 │ ██████████████████████████████████                                           │
+ 99. │ 2020-11-16 │ 3336 │ █████████████████████████████████▎                                           │
+100. │ 2020-11-23 │ 3230 │ ████████████████████████████████▎                                            │
+101. │ 2020-11-30 │ 3183 │ ███████████████████████████████▋                                             │
+102. │ 2020-12-07 │ 3285 │ ████████████████████████████████▋                                            │
+103. │ 2020-12-14 │ 3367 │ █████████████████████████████████▋                                           │
+104. │ 2020-12-21 │ 3748 │ █████████████████████████████████████▍                                       │
+105. │ 2020-12-28 │ 3986 │ ███████████████████████████████████████▋                                     │
+106. │ 2021-01-04 │ 3906 │ ███████████████████████████████████████                                      │
+107. │ 2021-01-11 │ 3425 │ ██████████████████████████████████▎                                          │
+108. │ 2021-01-18 │ 3144 │ ███████████████████████████████▍                                             │
+109. │ 2021-01-25 │ 3115 │ ███████████████████████████████▏                                             │
+110. │ 2021-02-01 │ 3285 │ ████████████████████████████████▋                                            │
+111. │ 2021-02-08 │ 3321 │ █████████████████████████████████▏                                           │
+112. │ 2021-02-15 │ 3475 │ ██████████████████████████████████▋                                          │
+113. │ 2021-02-22 │ 3549 │ ███████████████████████████████████▍                                         │
+114. │ 2021-03-01 │ 3755 │ █████████████████████████████████████▌                                       │
+115. │ 2021-03-08 │ 3080 │ ██████████████████████████████▋                                              │
+116. │ 2021-03-15 │ 3789 │ █████████████████████████████████████▊                                       │
+117. │ 2021-03-22 │ 3804 │ ██████████████████████████████████████                                       │
+118. │ 2021-03-29 │ 4238 │ ██████████████████████████████████████████▍                                  │
+119. │ 2021-04-05 │ 4307 │ ███████████████████████████████████████████                                  │
+120. │ 2021-04-12 │ 4225 │ ██████████████████████████████████████████▎                                  │
+121. │ 2021-04-19 │ 4391 │ ███████████████████████████████████████████▊                                 │
+122. │ 2021-04-26 │ 4868 │ ████████████████████████████████████████████████▋                            │
+123. │ 2021-05-03 │ 4977 │ █████████████████████████████████████████████████▋                           │
+124. │ 2021-05-10 │ 5164 │ ███████████████████████████████████████████████████▋                         │
+125. │ 2021-05-17 │ 4986 │ █████████████████████████████████████████████████▋                           │
+126. │ 2021-05-24 │ 5024 │ ██████████████████████████████████████████████████▏                          │
+127. │ 2021-05-31 │ 4824 │ ████████████████████████████████████████████████▏                            │
+128. │ 2021-06-07 │ 5652 │ ████████████████████████████████████████████████████████▌                    │
+129. │ 2021-06-14 │ 5613 │ ████████████████████████████████████████████████████████▏                    │
+130. │ 2021-06-21 │ 6061 │ ████████████████████████████████████████████████████████████▌                │
+131. │ 2021-06-28 │ 2554 │ █████████████████████████▌                                                   │
+     └────────────┴──────┴──────────────────────────────────────────────────────────────────────────────┘
+```
+
+### Online Playground {#playground}
+
+Вы можете протестировать другие запросы к этому набору данным с помощью интерактивного ресурса [Online Playground](https://gh-api.clickhouse.tech/play?user=play). Например, [вот так](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUCiAgICBvcmlnaW4sCiAgICBjb3VudCgpLAogICAgcm91bmQoYXZnKGdlb0Rpc3RhbmNlKGxvbmdpdHVkZV8xLCBsYXRpdHVkZV8xLCBsb25naXR1ZGVfMiwgbGF0aXR1ZGVfMikpKSBBUyBkaXN0YW5jZSwKICAgIGJhcihkaXN0YW5jZSwgMCwgMTAwMDAwMDAsIDEwMCkgQVMgYmFyCkZST00gb3BlbnNreQpXSEVSRSBvcmlnaW4gIT0gJycKR1JPVVAgQlkgb3JpZ2luCk9SREVSIEJZIGNvdW50KCkgREVTQwpMSU1JVCAxMDA=). Однако обратите внимание, что здесь нельзя создавать временные таблицы.
+
diff --git a/docs/ru/getting-started/example-datasets/recipes.md b/docs/ru/getting-started/example-datasets/recipes.md
index 75e385150e8..3ec06320ed7 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.tech/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
+Этот набор данных доступен в [Online Playground](https://gh-api.clickhouse.com/play?user=play#U0VMRUNUCiAgICBhcnJheUpvaW4oTkVSKSBBUyBrLAogICAgY291bnQoKSBBUyBjCkZST00gcmVjaXBlcwpHUk9VUCBCWSBrCk9SREVSIEJZIGMgREVTQwpMSU1JVCA1MA==).
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/getting-started/example-datasets/recipes/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/getting-started/example-datasets/recipes/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/star-schema.md b/docs/ru/getting-started/example-datasets/star-schema.md
index f7502e8409d..d9a875752dd 100644
--- a/docs/ru/getting-started/example-datasets/star-schema.md
+++ b/docs/ru/getting-started/example-datasets/star-schema.md
@@ -365,4 +365,4 @@ ORDER BY
     P_BRAND ASC;
 ```
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/ru/getting-started/example-datasets/uk-price-paid.md b/docs/ru/getting-started/example-datasets/uk-price-paid.md
new file mode 100644
index 00000000000..1a0991015bd
--- /dev/null
+++ b/docs/ru/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1,650 @@
+---
+toc_priority: 20
+toc_title: Набор данных о стоимости недвижимости в Великобритании
+---
+
+# Набор данных о стоимости недвижимости в Великобритании {#uk-property-price-paid}
+
+Набор содержит данные о стоимости недвижимости в Англии и Уэльсе. Данные доступны с 1995 года.
+Размер набора данных в несжатом виде составляет около 4 GiB, а в ClickHouse он займет около 278 MiB.
+
+Источник: https://www.gov.uk/government/statistical-data-sets/price-paid-data-downloads
+Описание полей таблицы: https://www.gov.uk/guidance/about-the-price-paid-data
+
+Набор содержит данные HM Land Registry data © Crown copyright and database right 2021. Эти данные лицензированы в соответствии с Open Government Licence v3.0.
+
+## Загрузите набор данных {#download-dataset}
+
+Выполните команду:
+
+```bash
+wget http://prod.publicdata.landregistry.gov.uk.s3-website-eu-west-1.amazonaws.com/pp-complete.csv
+```
+
+Загрузка займет около 2 минут при хорошем подключении к интернету.
+
+## Создайте таблицу {#create-table}
+
+```sql
+CREATE TABLE uk_price_paid
+(
+    price UInt32,
+    date Date,
+    postcode1 LowCardinality(String),
+    postcode2 LowCardinality(String),
+    type Enum8('terraced' = 1, 'semi-detached' = 2, 'detached' = 3, 'flat' = 4, 'other' = 0),
+    is_new UInt8,
+    duration Enum8('freehold' = 1, 'leasehold' = 2, 'unknown' = 0),
+    addr1 String,
+    addr2 String,
+    street LowCardinality(String),
+    locality LowCardinality(String),
+    town LowCardinality(String),
+    district LowCardinality(String),
+    county LowCardinality(String),
+    category UInt8
+) ENGINE = MergeTree ORDER BY (postcode1, postcode2, addr1, addr2);
+```
+
+## Обработайте и импортируйте данные {#preprocess-import-data}
+
+В этом примере используется `clickhouse-local` для предварительной обработки данных и `clickhouse-client` для импорта данных.
+
+Указывается структура исходных данных CSV-файла и запрос для предварительной обработки данных с помощью `clickhouse-local`.
+
+Предварительная обработка включает:
+- разделение почтового индекса на два разных столбца `postcode1` и `postcode2`, что лучше подходит для хранения данных и выполнения запросов к ним;
+- преобразование поля `time` в дату, поскольку оно содержит только время 00:00;
+- поле [UUid](../../sql-reference/data-types/uuid.md) игнорируется, потому что оно не будет использовано для анализа;
+- преобразование полей `type` и `duration` в более читаемые поля типа `Enum` с помощью функции [transform](../../sql-reference/functions/other-functions.md#transform);
+- преобразование полей `is_new` и `category` из односимвольной строки (`Y`/`N` и `A`/`B`) в поле [UInt8](../../sql-reference/data-types/int-uint.md#uint8-uint16-uint32-uint64-uint256-int8-int16-int32-int64-int128-int256) со значениями 0 и 1 соответственно.
+
+Обработанные данные передаются в `clickhouse-client` и импортируются в таблицу ClickHouse потоковым способом.
+
+```bash
+clickhouse-local --input-format CSV --structure '
+    uuid String,
+    price UInt32,
+    time DateTime,
+    postcode String,
+    a String,
+    b String,
+    c String,
+    addr1 String,
+    addr2 String,
+    street String,
+    locality String,
+    town String,
+    district String,
+    county String,
+    d String,
+    e String
+' --query "
+    WITH splitByChar(' ', postcode) AS p
+    SELECT
+        price,
+        toDate(time) AS date,
+        p[1] AS postcode1,
+        p[2] AS postcode2,
+        transform(a, ['T', 'S', 'D', 'F', 'O'], ['terraced', 'semi-detached', 'detached', 'flat', 'other']) AS type,
+        b = 'Y' AS is_new,
+        transform(c, ['F', 'L', 'U'], ['freehold', 'leasehold', 'unknown']) AS duration,
+        addr1,
+        addr2,
+        street,
+        locality,
+        town,
+        district,
+        county,
+        d = 'B' AS category
+    FROM table" --date_time_input_format best_effort < pp-complete.csv | clickhouse-client --query "INSERT INTO uk_price_paid FORMAT TSV"
+```
+
+Выполнение запроса займет около 40 секунд.
+
+## Проверьте импортированные данные {#validate-data}
+
+Запрос:
+
+```sql
+SELECT count() FROM uk_price_paid;
+```
+
+Результат:
+
+```text
+┌──count()─┐
+│ 26321785 │
+└──────────┘
+```
+
+Размер набора данных в ClickHouse составляет всего 278 MiB, проверьте это.
+
+Запрос:
+
+```sql
+SELECT formatReadableSize(total_bytes) FROM system.tables WHERE name = 'uk_price_paid';
+```
+
+Результат:
+
+```text
+┌─formatReadableSize(total_bytes)─┐
+│ 278.80 MiB                      │
+└─────────────────────────────────┘
+```
+
+## Примеры запросов {#run-queries}
+
+### Запрос 1. Средняя цена за год {#average-price}
+
+Запрос:
+
+```sql
+SELECT toYear(date) AS year, round(avg(price)) AS price, bar(price, 0, 1000000, 80) FROM uk_price_paid GROUP BY year ORDER BY year;
+```
+
+Результат:
+
+```text
+┌─year─┬──price─┬─bar(round(avg(price)), 0, 1000000, 80)─┐
+│ 1995 │  67932 │ █████▍                                 │
+│ 1996 │  71505 │ █████▋                                 │
+│ 1997 │  78532 │ ██████▎                                │
+│ 1998 │  85436 │ ██████▋                                │
+│ 1999 │  96037 │ ███████▋                               │
+│ 2000 │ 107479 │ ████████▌                              │
+│ 2001 │ 118885 │ █████████▌                             │
+│ 2002 │ 137941 │ ███████████                            │
+│ 2003 │ 155889 │ ████████████▍                          │
+│ 2004 │ 178885 │ ██████████████▎                        │
+│ 2005 │ 189351 │ ███████████████▏                       │
+│ 2006 │ 203528 │ ████████████████▎                      │
+│ 2007 │ 219378 │ █████████████████▌                     │
+│ 2008 │ 217056 │ █████████████████▎                     │
+│ 2009 │ 213419 │ █████████████████                      │
+│ 2010 │ 236109 │ ██████████████████▊                    │
+│ 2011 │ 232805 │ ██████████████████▌                    │
+│ 2012 │ 238367 │ ███████████████████                    │
+│ 2013 │ 256931 │ ████████████████████▌                  │
+│ 2014 │ 279915 │ ██████████████████████▍                │
+│ 2015 │ 297266 │ ███████████████████████▋               │
+│ 2016 │ 313201 │ █████████████████████████              │
+│ 2017 │ 346097 │ ███████████████████████████▋           │
+│ 2018 │ 350116 │ ████████████████████████████           │
+│ 2019 │ 351013 │ ████████████████████████████           │
+│ 2020 │ 369420 │ █████████████████████████████▌         │
+│ 2021 │ 386903 │ ██████████████████████████████▊        │
+└──────┴────────┴────────────────────────────────────────┘
+```
+
+### Запрос 2. Средняя цена за год в Лондоне {#average-price-london}
+
+Запрос:
+
+```sql
+SELECT toYear(date) AS year, round(avg(price)) AS price, bar(price, 0, 2000000, 100) FROM uk_price_paid WHERE town = 'LONDON' GROUP BY year ORDER BY year;
+```
+
+Результат:
+
+```text
+┌─year─┬───price─┬─bar(round(avg(price)), 0, 2000000, 100)───────────────┐
+│ 1995 │  109116 │ █████▍                                                │
+│ 1996 │  118667 │ █████▊                                                │
+│ 1997 │  136518 │ ██████▋                                               │
+│ 1998 │  152983 │ ███████▋                                              │
+│ 1999 │  180637 │ █████████                                             │
+│ 2000 │  215838 │ ██████████▋                                           │
+│ 2001 │  232994 │ ███████████▋                                          │
+│ 2002 │  263670 │ █████████████▏                                        │
+│ 2003 │  278394 │ █████████████▊                                        │
+│ 2004 │  304666 │ ███████████████▏                                      │
+│ 2005 │  322875 │ ████████████████▏                                     │
+│ 2006 │  356191 │ █████████████████▋                                    │
+│ 2007 │  404054 │ ████████████████████▏                                 │
+│ 2008 │  420741 │ █████████████████████                                 │
+│ 2009 │  427753 │ █████████████████████▍                                │
+│ 2010 │  480306 │ ████████████████████████                              │
+│ 2011 │  496274 │ ████████████████████████▋                             │
+│ 2012 │  519442 │ █████████████████████████▊                            │
+│ 2013 │  616212 │ ██████████████████████████████▋                       │
+│ 2014 │  724154 │ ████████████████████████████████████▏                 │
+│ 2015 │  792129 │ ███████████████████████████████████████▌              │
+│ 2016 │  843655 │ ██████████████████████████████████████████▏           │
+│ 2017 │  982642 │ █████████████████████████████████████████████████▏    │
+│ 2018 │ 1016835 │ ██████████████████████████████████████████████████▋   │
+│ 2019 │ 1042849 │ ████████████████████████████████████████████████████▏ │
+│ 2020 │ 1011889 │ ██████████████████████████████████████████████████▌   │
+│ 2021 │  960343 │ ████████████████████████████████████████████████      │
+└──────┴─────────┴───────────────────────────────────────────────────────┘
+```
+
+Что-то случилось в 2013 году. Я понятия не имею. Может быть, вы имеете представление о том, что произошло в 2020 году?
+
+### Запрос 3. Самые дорогие районы {#most-expensive-neighborhoods}
+
+Запрос:
+
+```sql
+SELECT
+    town,
+    district,
+    count() AS c,
+    round(avg(price)) AS price,
+    bar(price, 0, 5000000, 100)
+FROM uk_price_paid
+WHERE date >= '2020-01-01'
+GROUP BY
+    town,
+    district
+HAVING c >= 100
+ORDER BY price DESC
+LIMIT 100;
+```
+
+Результат:
+
+```text
+
+┌─town─────────────────┬─district───────────────┬────c─┬───price─┬─bar(round(avg(price)), 0, 5000000, 100)────────────────────────────┐
+│ LONDON               │ CITY OF WESTMINSTER    │ 3606 │ 3280239 │ █████████████████████████████████████████████████████████████████▌ │
+│ LONDON               │ CITY OF LONDON         │  274 │ 3160502 │ ███████████████████████████████████████████████████████████████▏   │
+│ LONDON               │ KENSINGTON AND CHELSEA │ 2550 │ 2308478 │ ██████████████████████████████████████████████▏                    │
+│ LEATHERHEAD          │ ELMBRIDGE              │  114 │ 1897407 │ █████████████████████████████████████▊                             │
+│ LONDON               │ CAMDEN                 │ 3033 │ 1805404 │ ████████████████████████████████████                               │
+│ VIRGINIA WATER       │ RUNNYMEDE              │  156 │ 1753247 │ ███████████████████████████████████                                │
+│ WINDLESHAM           │ SURREY HEATH           │  108 │ 1677613 │ █████████████████████████████████▌                                 │
+│ THORNTON HEATH       │ CROYDON                │  546 │ 1671721 │ █████████████████████████████████▍                                 │
+│ BARNET               │ ENFIELD                │  124 │ 1505840 │ ██████████████████████████████                                     │
+│ COBHAM               │ ELMBRIDGE              │  387 │ 1237250 │ ████████████████████████▋                                          │
+│ LONDON               │ ISLINGTON              │ 2668 │ 1236980 │ ████████████████████████▋                                          │
+│ OXFORD               │ SOUTH OXFORDSHIRE      │  321 │ 1220907 │ ████████████████████████▍                                          │
+│ LONDON               │ RICHMOND UPON THAMES   │  704 │ 1215551 │ ████████████████████████▎                                          │
+│ LONDON               │ HOUNSLOW               │  671 │ 1207493 │ ████████████████████████▏                                          │
+│ ASCOT                │ WINDSOR AND MAIDENHEAD │  407 │ 1183299 │ ███████████████████████▋                                           │
+│ BEACONSFIELD         │ BUCKINGHAMSHIRE        │  330 │ 1175615 │ ███████████████████████▌                                           │
+│ RICHMOND             │ RICHMOND UPON THAMES   │  874 │ 1110444 │ ██████████████████████▏                                            │
+│ LONDON               │ HAMMERSMITH AND FULHAM │ 3086 │ 1053983 │ █████████████████████                                              │
+│ SURBITON             │ ELMBRIDGE              │  100 │ 1011800 │ ████████████████████▏                                              │
+│ RADLETT              │ HERTSMERE              │  283 │ 1011712 │ ████████████████████▏                                              │
+│ SALCOMBE             │ SOUTH HAMS             │  127 │ 1011624 │ ████████████████████▏                                              │
+│ WEYBRIDGE            │ ELMBRIDGE              │  655 │ 1007265 │ ████████████████████▏                                              │
+│ ESHER                │ ELMBRIDGE              │  485 │  986581 │ ███████████████████▋                                               │
+│ LEATHERHEAD          │ GUILDFORD              │  202 │  977320 │ ███████████████████▌                                               │
+│ BURFORD              │ WEST OXFORDSHIRE       │  111 │  966893 │ ███████████████████▎                                               │
+│ BROCKENHURST         │ NEW FOREST             │  129 │  956675 │ ███████████████████▏                                               │
+│ HINDHEAD             │ WAVERLEY               │  137 │  953753 │ ███████████████████                                                │
+│ GERRARDS CROSS       │ BUCKINGHAMSHIRE        │  419 │  951121 │ ███████████████████                                                │
+│ EAST MOLESEY         │ ELMBRIDGE              │  192 │  936769 │ ██████████████████▋                                                │
+│ CHALFONT ST GILES    │ BUCKINGHAMSHIRE        │  146 │  925515 │ ██████████████████▌                                                │
+│ LONDON               │ TOWER HAMLETS          │ 4388 │  918304 │ ██████████████████▎                                                │
+│ OLNEY                │ MILTON KEYNES          │  235 │  910646 │ ██████████████████▏                                                │
+│ HENLEY-ON-THAMES     │ SOUTH OXFORDSHIRE      │  540 │  902418 │ ██████████████████                                                 │
+│ LONDON               │ SOUTHWARK              │ 3885 │  892997 │ █████████████████▋                                                 │
+│ KINGSTON UPON THAMES │ KINGSTON UPON THAMES   │  960 │  885969 │ █████████████████▋                                                 │
+│ LONDON               │ EALING                 │ 2658 │  871755 │ █████████████████▍                                                 │
+│ CRANBROOK            │ TUNBRIDGE WELLS        │  431 │  862348 │ █████████████████▏                                                 │
+│ LONDON               │ MERTON                 │ 2099 │  859118 │ █████████████████▏                                                 │
+│ BELVEDERE            │ BEXLEY                 │  346 │  842423 │ ████████████████▋                                                  │
+│ GUILDFORD            │ WAVERLEY               │  143 │  841277 │ ████████████████▋                                                  │
+│ HARPENDEN            │ ST ALBANS              │  657 │  841216 │ ████████████████▋                                                  │
+│ LONDON               │ HACKNEY                │ 3307 │  837090 │ ████████████████▋                                                  │
+│ LONDON               │ WANDSWORTH             │ 6566 │  832663 │ ████████████████▋                                                  │
+│ MAIDENHEAD           │ BUCKINGHAMSHIRE        │  123 │  824299 │ ████████████████▍                                                  │
+│ KINGS LANGLEY        │ DACORUM                │  145 │  821331 │ ████████████████▍                                                  │
+│ BERKHAMSTED          │ DACORUM                │  543 │  818415 │ ████████████████▎                                                  │
+│ GREAT MISSENDEN      │ BUCKINGHAMSHIRE        │  226 │  802807 │ ████████████████                                                   │
+│ BILLINGSHURST        │ CHICHESTER             │  144 │  797829 │ ███████████████▊                                                   │
+│ WOKING               │ GUILDFORD              │  176 │  793494 │ ███████████████▋                                                   │
+│ STOCKBRIDGE          │ TEST VALLEY            │  178 │  793269 │ ███████████████▋                                                   │
+│ EPSOM                │ REIGATE AND BANSTEAD   │  172 │  791862 │ ███████████████▋                                                   │
+│ TONBRIDGE            │ TUNBRIDGE WELLS        │  360 │  787876 │ ███████████████▋                                                   │
+│ TEDDINGTON           │ RICHMOND UPON THAMES   │  595 │  786492 │ ███████████████▋                                                   │
+│ TWICKENHAM           │ RICHMOND UPON THAMES   │ 1155 │  786193 │ ███████████████▋                                                   │
+│ LYNDHURST            │ NEW FOREST             │  102 │  785593 │ ███████████████▋                                                   │
+│ LONDON               │ LAMBETH                │ 5228 │  774574 │ ███████████████▍                                                   │
+│ LONDON               │ BARNET                 │ 3955 │  773259 │ ███████████████▍                                                   │
+│ OXFORD               │ VALE OF WHITE HORSE    │  353 │  772088 │ ███████████████▍                                                   │
+│ TONBRIDGE            │ MAIDSTONE              │  305 │  770740 │ ███████████████▍                                                   │
+│ LUTTERWORTH          │ HARBOROUGH             │  538 │  768634 │ ███████████████▎                                                   │
+│ WOODSTOCK            │ WEST OXFORDSHIRE       │  140 │  766037 │ ███████████████▎                                                   │
+│ MIDHURST             │ CHICHESTER             │  257 │  764815 │ ███████████████▎                                                   │
+│ MARLOW               │ BUCKINGHAMSHIRE        │  327 │  761876 │ ███████████████▏                                                   │
+│ LONDON               │ NEWHAM                 │ 3237 │  761784 │ ███████████████▏                                                   │
+│ ALDERLEY EDGE        │ CHESHIRE EAST          │  178 │  757318 │ ███████████████▏                                                   │
+│ LUTON                │ CENTRAL BEDFORDSHIRE   │  212 │  754283 │ ███████████████                                                    │
+│ PETWORTH             │ CHICHESTER             │  154 │  754220 │ ███████████████                                                    │
+│ ALRESFORD            │ WINCHESTER             │  219 │  752718 │ ███████████████                                                    │
+│ POTTERS BAR          │ WELWYN HATFIELD        │  174 │  748465 │ ██████████████▊                                                    │
+│ HASLEMERE            │ CHICHESTER             │  128 │  746907 │ ██████████████▊                                                    │
+│ TADWORTH             │ REIGATE AND BANSTEAD   │  502 │  743252 │ ██████████████▋                                                    │
+│ THAMES DITTON        │ ELMBRIDGE              │  244 │  741913 │ ██████████████▋                                                    │
+│ REIGATE              │ REIGATE AND BANSTEAD   │  581 │  738198 │ ██████████████▋                                                    │
+│ BOURNE END           │ BUCKINGHAMSHIRE        │  138 │  735190 │ ██████████████▋                                                    │
+│ SEVENOAKS            │ SEVENOAKS              │ 1156 │  730018 │ ██████████████▌                                                    │
+│ OXTED                │ TANDRIDGE              │  336 │  729123 │ ██████████████▌                                                    │
+│ INGATESTONE          │ BRENTWOOD              │  166 │  728103 │ ██████████████▌                                                    │
+│ LONDON               │ BRENT                  │ 2079 │  720605 │ ██████████████▍                                                    │
+│ LONDON               │ HARINGEY               │ 3216 │  717780 │ ██████████████▎                                                    │
+│ PURLEY               │ CROYDON                │  575 │  716108 │ ██████████████▎                                                    │
+│ WELWYN               │ WELWYN HATFIELD        │  222 │  710603 │ ██████████████▏                                                    │
+│ RICKMANSWORTH        │ THREE RIVERS           │  798 │  704571 │ ██████████████                                                     │
+│ BANSTEAD             │ REIGATE AND BANSTEAD   │  401 │  701293 │ ██████████████                                                     │
+│ CHIGWELL             │ EPPING FOREST          │  261 │  701203 │ ██████████████                                                     │
+│ PINNER               │ HARROW                 │  528 │  698885 │ █████████████▊                                                     │
+│ HASLEMERE            │ WAVERLEY               │  280 │  696659 │ █████████████▊                                                     │
+│ SLOUGH               │ BUCKINGHAMSHIRE        │  396 │  694917 │ █████████████▊                                                     │
+│ WALTON-ON-THAMES     │ ELMBRIDGE              │  946 │  692395 │ █████████████▋                                                     │
+│ READING              │ SOUTH OXFORDSHIRE      │  318 │  691988 │ █████████████▋                                                     │
+│ NORTHWOOD            │ HILLINGDON             │  271 │  690643 │ █████████████▋                                                     │
+│ FELTHAM              │ HOUNSLOW               │  763 │  688595 │ █████████████▋                                                     │
+│ ASHTEAD              │ MOLE VALLEY            │  303 │  687923 │ █████████████▋                                                     │
+│ BARNET               │ BARNET                 │  975 │  686980 │ █████████████▋                                                     │
+│ WOKING               │ SURREY HEATH           │  283 │  686669 │ █████████████▋                                                     │
+│ MALMESBURY           │ WILTSHIRE              │  323 │  683324 │ █████████████▋                                                     │
+│ AMERSHAM             │ BUCKINGHAMSHIRE        │  496 │  680962 │ █████████████▌                                                     │
+│ CHISLEHURST          │ BROMLEY                │  430 │  680209 │ █████████████▌                                                     │
+│ HYTHE                │ FOLKESTONE AND HYTHE   │  490 │  676908 │ █████████████▌                                                     │
+│ MAYFIELD             │ WEALDEN                │  101 │  676210 │ █████████████▌                                                     │
+│ ASCOT                │ BRACKNELL FOREST       │  168 │  676004 │ █████████████▌                                                     │
+└──────────────────────┴────────────────────────┴──────┴─────────┴────────────────────────────────────────────────────────────────────┘
+```
+
+## Ускорьте запросы с помощью проекций {#speedup-with-projections}
+
+[Проекции](../../sql-reference/statements/alter/projection.md) позволяют повысить скорость запросов за счет хранения предварительно агрегированных данных.
+
+### Создайте проекцию {#build-projection}
+
+Создайте агрегирующую проекцию по параметрам `toYear(date)`, `district`, `town`:
+
+```sql
+ALTER TABLE uk_price_paid
+    ADD PROJECTION projection_by_year_district_town
+    (
+        SELECT
+            toYear(date),
+            district,
+            town,
+            avg(price),
+            sum(price),
+            count()
+        GROUP BY
+            toYear(date),
+            district,
+            town
+    );
+```
+
+Заполните проекцию для текущих данных (иначе проекция будет создана только для добавляемых данных):
+
+```sql
+ALTER TABLE uk_price_paid
+    MATERIALIZE PROJECTION projection_by_year_district_town
+SETTINGS mutations_sync = 1;
+```
+
+## Проверьте производительность {#test-performance}
+
+Давайте выполним те же 3 запроса.
+
+[Включите](../../operations/settings/settings.md#allow-experimental-projection-optimization) поддержку проекций:
+
+```sql
+SET allow_experimental_projection_optimization = 1;
+```
+
+### Запрос 1. Средняя цена за год {#average-price-projections}
+
+Запрос:
+
+```sql
+SELECT
+    toYear(date) AS year,
+    round(avg(price)) AS price,
+    bar(price, 0, 1000000, 80)
+FROM uk_price_paid
+GROUP BY year
+ORDER BY year ASC;
+```
+
+Результат:
+
+```text
+┌─year─┬──price─┬─bar(round(avg(price)), 0, 1000000, 80)─┐
+│ 1995 │  67932 │ █████▍                                 │
+│ 1996 │  71505 │ █████▋                                 │
+│ 1997 │  78532 │ ██████▎                                │
+│ 1998 │  85436 │ ██████▋                                │
+│ 1999 │  96037 │ ███████▋                               │
+│ 2000 │ 107479 │ ████████▌                              │
+│ 2001 │ 118885 │ █████████▌                             │
+│ 2002 │ 137941 │ ███████████                            │
+│ 2003 │ 155889 │ ████████████▍                          │
+│ 2004 │ 178885 │ ██████████████▎                        │
+│ 2005 │ 189351 │ ███████████████▏                       │
+│ 2006 │ 203528 │ ████████████████▎                      │
+│ 2007 │ 219378 │ █████████████████▌                     │
+│ 2008 │ 217056 │ █████████████████▎                     │
+│ 2009 │ 213419 │ █████████████████                      │
+│ 2010 │ 236109 │ ██████████████████▊                    │
+│ 2011 │ 232805 │ ██████████████████▌                    │
+│ 2012 │ 238367 │ ███████████████████                    │
+│ 2013 │ 256931 │ ████████████████████▌                  │
+│ 2014 │ 279915 │ ██████████████████████▍                │
+│ 2015 │ 297266 │ ███████████████████████▋               │
+│ 2016 │ 313201 │ █████████████████████████              │
+│ 2017 │ 346097 │ ███████████████████████████▋           │
+│ 2018 │ 350116 │ ████████████████████████████           │
+│ 2019 │ 351013 │ ████████████████████████████           │
+│ 2020 │ 369420 │ █████████████████████████████▌         │
+│ 2021 │ 386903 │ ██████████████████████████████▊        │
+└──────┴────────┴────────────────────────────────────────┘
+```
+
+### Запрос 2. Средняя цена за год в Лондоне {#average-price-london-projections}
+
+Запрос:
+
+```sql
+SELECT
+    toYear(date) AS year,
+    round(avg(price)) AS price,
+    bar(price, 0, 2000000, 100)
+FROM uk_price_paid
+WHERE town = 'LONDON'
+GROUP BY year
+ORDER BY year ASC;
+```
+
+Результат:
+
+```text
+┌─year─┬───price─┬─bar(round(avg(price)), 0, 2000000, 100)───────────────┐
+│ 1995 │  109116 │ █████▍                                                │
+│ 1996 │  118667 │ █████▊                                                │
+│ 1997 │  136518 │ ██████▋                                               │
+│ 1998 │  152983 │ ███████▋                                              │
+│ 1999 │  180637 │ █████████                                             │
+│ 2000 │  215838 │ ██████████▋                                           │
+│ 2001 │  232994 │ ███████████▋                                          │
+│ 2002 │  263670 │ █████████████▏                                        │
+│ 2003 │  278394 │ █████████████▊                                        │
+│ 2004 │  304666 │ ███████████████▏                                      │
+│ 2005 │  322875 │ ████████████████▏                                     │
+│ 2006 │  356191 │ █████████████████▋                                    │
+│ 2007 │  404054 │ ████████████████████▏                                 │
+│ 2008 │  420741 │ █████████████████████                                 │
+│ 2009 │  427753 │ █████████████████████▍                                │
+│ 2010 │  480306 │ ████████████████████████                              │
+│ 2011 │  496274 │ ████████████████████████▋                             │
+│ 2012 │  519442 │ █████████████████████████▊                            │
+│ 2013 │  616212 │ ██████████████████████████████▋                       │
+│ 2014 │  724154 │ ████████████████████████████████████▏                 │
+│ 2015 │  792129 │ ███████████████████████████████████████▌              │
+│ 2016 │  843655 │ ██████████████████████████████████████████▏           │
+│ 2017 │  982642 │ █████████████████████████████████████████████████▏    │
+│ 2018 │ 1016835 │ ██████████████████████████████████████████████████▋   │
+│ 2019 │ 1042849 │ ████████████████████████████████████████████████████▏ │
+│ 2020 │ 1011889 │ ██████████████████████████████████████████████████▌   │
+│ 2021 │  960343 │ ████████████████████████████████████████████████      │
+└──────┴─────────┴───────────────────────────────────────────────────────┘
+```
+
+### Запрос 3. Самые дорогие районы {#most-expensive-neighborhoods-projections}
+
+Условие (date >= '2020-01-01') необходимо изменить, чтобы оно соответствовало проекции (toYear(date) >= 2020).
+
+Запрос:
+
+```sql
+SELECT
+    town,
+    district,
+    count() AS c,
+    round(avg(price)) AS price,
+    bar(price, 0, 5000000, 100)
+FROM uk_price_paid
+WHERE toYear(date) >= 2020
+GROUP BY
+    town,
+    district
+HAVING c >= 100
+ORDER BY price DESC
+LIMIT 100;
+```
+
+Результат:
+
+```text
+┌─town─────────────────┬─district───────────────┬────c─┬───price─┬─bar(round(avg(price)), 0, 5000000, 100)────────────────────────────┐
+│ LONDON               │ CITY OF WESTMINSTER    │ 3606 │ 3280239 │ █████████████████████████████████████████████████████████████████▌ │
+│ LONDON               │ CITY OF LONDON         │  274 │ 3160502 │ ███████████████████████████████████████████████████████████████▏   │
+│ LONDON               │ KENSINGTON AND CHELSEA │ 2550 │ 2308478 │ ██████████████████████████████████████████████▏                    │
+│ LEATHERHEAD          │ ELMBRIDGE              │  114 │ 1897407 │ █████████████████████████████████████▊                             │
+│ LONDON               │ CAMDEN                 │ 3033 │ 1805404 │ ████████████████████████████████████                               │
+│ VIRGINIA WATER       │ RUNNYMEDE              │  156 │ 1753247 │ ███████████████████████████████████                                │
+│ WINDLESHAM           │ SURREY HEATH           │  108 │ 1677613 │ █████████████████████████████████▌                                 │
+│ THORNTON HEATH       │ CROYDON                │  546 │ 1671721 │ █████████████████████████████████▍                                 │
+│ BARNET               │ ENFIELD                │  124 │ 1505840 │ ██████████████████████████████                                     │
+│ COBHAM               │ ELMBRIDGE              │  387 │ 1237250 │ ████████████████████████▋                                          │
+│ LONDON               │ ISLINGTON              │ 2668 │ 1236980 │ ████████████████████████▋                                          │
+│ OXFORD               │ SOUTH OXFORDSHIRE      │  321 │ 1220907 │ ████████████████████████▍                                          │
+│ LONDON               │ RICHMOND UPON THAMES   │  704 │ 1215551 │ ████████████████████████▎                                          │
+│ LONDON               │ HOUNSLOW               │  671 │ 1207493 │ ████████████████████████▏                                          │
+│ ASCOT                │ WINDSOR AND MAIDENHEAD │  407 │ 1183299 │ ███████████████████████▋                                           │
+│ BEACONSFIELD         │ BUCKINGHAMSHIRE        │  330 │ 1175615 │ ███████████████████████▌                                           │
+│ RICHMOND             │ RICHMOND UPON THAMES   │  874 │ 1110444 │ ██████████████████████▏                                            │
+│ LONDON               │ HAMMERSMITH AND FULHAM │ 3086 │ 1053983 │ █████████████████████                                              │
+│ SURBITON             │ ELMBRIDGE              │  100 │ 1011800 │ ████████████████████▏                                              │
+│ RADLETT              │ HERTSMERE              │  283 │ 1011712 │ ████████████████████▏                                              │
+│ SALCOMBE             │ SOUTH HAMS             │  127 │ 1011624 │ ████████████████████▏                                              │
+│ WEYBRIDGE            │ ELMBRIDGE              │  655 │ 1007265 │ ████████████████████▏                                              │
+│ ESHER                │ ELMBRIDGE              │  485 │  986581 │ ███████████████████▋                                               │
+│ LEATHERHEAD          │ GUILDFORD              │  202 │  977320 │ ███████████████████▌                                               │
+│ BURFORD              │ WEST OXFORDSHIRE       │  111 │  966893 │ ███████████████████▎                                               │
+│ BROCKENHURST         │ NEW FOREST             │  129 │  956675 │ ███████████████████▏                                               │
+│ HINDHEAD             │ WAVERLEY               │  137 │  953753 │ ███████████████████                                                │
+│ GERRARDS CROSS       │ BUCKINGHAMSHIRE        │  419 │  951121 │ ███████████████████                                                │
+│ EAST MOLESEY         │ ELMBRIDGE              │  192 │  936769 │ ██████████████████▋                                                │
+│ CHALFONT ST GILES    │ BUCKINGHAMSHIRE        │  146 │  925515 │ ██████████████████▌                                                │
+│ LONDON               │ TOWER HAMLETS          │ 4388 │  918304 │ ██████████████████▎                                                │
+│ OLNEY                │ MILTON KEYNES          │  235 │  910646 │ ██████████████████▏                                                │
+│ HENLEY-ON-THAMES     │ SOUTH OXFORDSHIRE      │  540 │  902418 │ ██████████████████                                                 │
+│ LONDON               │ SOUTHWARK              │ 3885 │  892997 │ █████████████████▋                                                 │
+│ KINGSTON UPON THAMES │ KINGSTON UPON THAMES   │  960 │  885969 │ █████████████████▋                                                 │
+│ LONDON               │ EALING                 │ 2658 │  871755 │ █████████████████▍                                                 │
+│ CRANBROOK            │ TUNBRIDGE WELLS        │  431 │  862348 │ █████████████████▏                                                 │
+│ LONDON               │ MERTON                 │ 2099 │  859118 │ █████████████████▏                                                 │
+│ BELVEDERE            │ BEXLEY                 │  346 │  842423 │ ████████████████▋                                                  │
+│ GUILDFORD            │ WAVERLEY               │  143 │  841277 │ ████████████████▋                                                  │
+│ HARPENDEN            │ ST ALBANS              │  657 │  841216 │ ████████████████▋                                                  │
+│ LONDON               │ HACKNEY                │ 3307 │  837090 │ ████████████████▋                                                  │
+│ LONDON               │ WANDSWORTH             │ 6566 │  832663 │ ████████████████▋                                                  │
+│ MAIDENHEAD           │ BUCKINGHAMSHIRE        │  123 │  824299 │ ████████████████▍                                                  │
+│ KINGS LANGLEY        │ DACORUM                │  145 │  821331 │ ████████████████▍                                                  │
+│ BERKHAMSTED          │ DACORUM                │  543 │  818415 │ ████████████████▎                                                  │
+│ GREAT MISSENDEN      │ BUCKINGHAMSHIRE        │  226 │  802807 │ ████████████████                                                   │
+│ BILLINGSHURST        │ CHICHESTER             │  144 │  797829 │ ███████████████▊                                                   │
+│ WOKING               │ GUILDFORD              │  176 │  793494 │ ███████████████▋                                                   │
+│ STOCKBRIDGE          │ TEST VALLEY            │  178 │  793269 │ ███████████████▋                                                   │
+│ EPSOM                │ REIGATE AND BANSTEAD   │  172 │  791862 │ ███████████████▋                                                   │
+│ TONBRIDGE            │ TUNBRIDGE WELLS        │  360 │  787876 │ ███████████████▋                                                   │
+│ TEDDINGTON           │ RICHMOND UPON THAMES   │  595 │  786492 │ ███████████████▋                                                   │
+│ TWICKENHAM           │ RICHMOND UPON THAMES   │ 1155 │  786193 │ ███████████████▋                                                   │
+│ LYNDHURST            │ NEW FOREST             │  102 │  785593 │ ███████████████▋                                                   │
+│ LONDON               │ LAMBETH                │ 5228 │  774574 │ ███████████████▍                                                   │
+│ LONDON               │ BARNET                 │ 3955 │  773259 │ ███████████████▍                                                   │
+│ OXFORD               │ VALE OF WHITE HORSE    │  353 │  772088 │ ███████████████▍                                                   │
+│ TONBRIDGE            │ MAIDSTONE              │  305 │  770740 │ ███████████████▍                                                   │
+│ LUTTERWORTH          │ HARBOROUGH             │  538 │  768634 │ ███████████████▎                                                   │
+│ WOODSTOCK            │ WEST OXFORDSHIRE       │  140 │  766037 │ ███████████████▎                                                   │
+│ MIDHURST             │ CHICHESTER             │  257 │  764815 │ ███████████████▎                                                   │
+│ MARLOW               │ BUCKINGHAMSHIRE        │  327 │  761876 │ ███████████████▏                                                   │
+│ LONDON               │ NEWHAM                 │ 3237 │  761784 │ ███████████████▏                                                   │
+│ ALDERLEY EDGE        │ CHESHIRE EAST          │  178 │  757318 │ ███████████████▏                                                   │
+│ LUTON                │ CENTRAL BEDFORDSHIRE   │  212 │  754283 │ ███████████████                                                    │
+│ PETWORTH             │ CHICHESTER             │  154 │  754220 │ ███████████████                                                    │
+│ ALRESFORD            │ WINCHESTER             │  219 │  752718 │ ███████████████                                                    │
+│ POTTERS BAR          │ WELWYN HATFIELD        │  174 │  748465 │ ██████████████▊                                                    │
+│ HASLEMERE            │ CHICHESTER             │  128 │  746907 │ ██████████████▊                                                    │
+│ TADWORTH             │ REIGATE AND BANSTEAD   │  502 │  743252 │ ██████████████▋                                                    │
+│ THAMES DITTON        │ ELMBRIDGE              │  244 │  741913 │ ██████████████▋                                                    │
+│ REIGATE              │ REIGATE AND BANSTEAD   │  581 │  738198 │ ██████████████▋                                                    │
+│ BOURNE END           │ BUCKINGHAMSHIRE        │  138 │  735190 │ ██████████████▋                                                    │
+│ SEVENOAKS            │ SEVENOAKS              │ 1156 │  730018 │ ██████████████▌                                                    │
+│ OXTED                │ TANDRIDGE              │  336 │  729123 │ ██████████████▌                                                    │
+│ INGATESTONE          │ BRENTWOOD              │  166 │  728103 │ ██████████████▌                                                    │
+│ LONDON               │ BRENT                  │ 2079 │  720605 │ ██████████████▍                                                    │
+│ LONDON               │ HARINGEY               │ 3216 │  717780 │ ██████████████▎                                                    │
+│ PURLEY               │ CROYDON                │  575 │  716108 │ ██████████████▎                                                    │
+│ WELWYN               │ WELWYN HATFIELD        │  222 │  710603 │ ██████████████▏                                                    │
+│ RICKMANSWORTH        │ THREE RIVERS           │  798 │  704571 │ ██████████████                                                     │
+│ BANSTEAD             │ REIGATE AND BANSTEAD   │  401 │  701293 │ ██████████████                                                     │
+│ CHIGWELL             │ EPPING FOREST          │  261 │  701203 │ ██████████████                                                     │
+│ PINNER               │ HARROW                 │  528 │  698885 │ █████████████▊                                                     │
+│ HASLEMERE            │ WAVERLEY               │  280 │  696659 │ █████████████▊                                                     │
+│ SLOUGH               │ BUCKINGHAMSHIRE        │  396 │  694917 │ █████████████▊                                                     │
+│ WALTON-ON-THAMES     │ ELMBRIDGE              │  946 │  692395 │ █████████████▋                                                     │
+│ READING              │ SOUTH OXFORDSHIRE      │  318 │  691988 │ █████████████▋                                                     │
+│ NORTHWOOD            │ HILLINGDON             │  271 │  690643 │ █████████████▋                                                     │
+│ FELTHAM              │ HOUNSLOW               │  763 │  688595 │ █████████████▋                                                     │
+│ ASHTEAD              │ MOLE VALLEY            │  303 │  687923 │ █████████████▋                                                     │
+│ BARNET               │ BARNET                 │  975 │  686980 │ █████████████▋                                                     │
+│ WOKING               │ SURREY HEATH           │  283 │  686669 │ █████████████▋                                                     │
+│ MALMESBURY           │ WILTSHIRE              │  323 │  683324 │ █████████████▋                                                     │
+│ AMERSHAM             │ BUCKINGHAMSHIRE        │  496 │  680962 │ █████████████▌                                                     │
+│ CHISLEHURST          │ BROMLEY                │  430 │  680209 │ █████████████▌                                                     │
+│ HYTHE                │ FOLKESTONE AND HYTHE   │  490 │  676908 │ █████████████▌                                                     │
+│ MAYFIELD             │ WEALDEN                │  101 │  676210 │ █████████████▌                                                     │
+│ ASCOT                │ BRACKNELL FOREST       │  168 │  676004 │ █████████████▌                                                     │
+└──────────────────────┴────────────────────────┴──────┴─────────┴────────────────────────────────────────────────────────────────────┘
+```
+
+### Резюме {#summary}
+
+Все три запроса работают намного быстрее и читают меньшее количество строк.
+
+```text
+Query 1
+
+no projection: 27 rows in set. Elapsed: 0.158 sec. Processed 26.32 million rows, 157.93 MB (166.57 million rows/s., 999.39 MB/s.)
+   projection: 27 rows in set. Elapsed: 0.007 sec. Processed 105.96 thousand rows, 3.33 MB (14.58 million rows/s., 458.13 MB/s.)
+
+
+Query 2
+
+no projection: 27 rows in set. Elapsed: 0.163 sec. Processed 26.32 million rows, 80.01 MB (161.75 million rows/s., 491.64 MB/s.)
+   projection: 27 rows in set. Elapsed: 0.008 sec. Processed 105.96 thousand rows, 3.67 MB (13.29 million rows/s., 459.89 MB/s.)
+
+Query 3
+
+no projection: 100 rows in set. Elapsed: 0.069 sec. Processed 26.32 million rows, 62.47 MB (382.13 million rows/s., 906.93 MB/s.)
+   projection: 100 rows in set. Elapsed: 0.029 sec. Processed 8.08 thousand rows, 511.08 KB (276.06 thousand rows/s., 17.47 MB/s.)
+```
+
+### Online Playground {#playground}
+
+Этот набор данных доступен в [Online Playground](https://gh-api.clickhouse.tech/play?user=play#U0VMRUNUIHRvd24sIGRpc3RyaWN0LCBjb3VudCgpIEFTIGMsIHJvdW5kKGF2ZyhwcmljZSkpIEFTIHByaWNlLCBiYXIocHJpY2UsIDAsIDUwMDAwMDAsIDEwMCkgRlJPTSB1a19wcmljZV9wYWlkIFdIRVJFIGRhdGUgPj0gJzIwMjAtMDEtMDEnIEdST1VQIEJZIHRvd24sIGRpc3RyaWN0IEhBVklORyBjID49IDEwMCBPUkRFUiBCWSBwcmljZSBERVNDIExJTUlUIDEwMA==).
+
diff --git a/docs/ru/getting-started/install.md b/docs/ru/getting-started/install.md
index 1cbeb70ef96..a12773a75b0 100644
--- a/docs/ru/getting-started/install.md
+++ b/docs/ru/getting-started/install.md
@@ -27,9 +27,22 @@ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not su
 {% include 'install/deb.sh' %}
 ```
 
-Также эти пакеты можно скачать и установить вручную отсюда: https://repo.clickhouse.tech/deb/stable/main/.
+Также эти пакеты можно скачать и установить вручную отсюда: https://repo.clickhouse.com/deb/stable/main/.
 
-Если вы хотите использовать наиболее свежую версию, замените `stable` на `testing` (рекомендуется для тестовых окружений).
+Чтобы использовать различные [версии ClickHouse](../faq/operations/production.md) в зависимости от ваших потребностей, вы можете заменить `stable` на `lts` или `testing`.
+
+Также вы можете вручную скачать и установить пакеты из [репозитория](https://repo.clickhouse.com/deb/stable/main/).
+
+#### Пакеты {#packages}
+
+-   `clickhouse-common-static` — Устанавливает исполняемые файлы ClickHouse.
+-   `clickhouse-server` — Создает символические ссылки для `clickhouse-server` и устанавливает конфигурационные файлы.
+-   `clickhouse-client` — Создает символические ссылки для `clickhouse-client` и других клиентских инструментов и устанавливает конфигурационные файлы `clickhouse-client`.
+-   `clickhouse-common-static-dbg` — Устанавливает исполняемые файлы ClickHouse собранные с отладочной информацией.
+
+!!! attention "Внимание"
+    Если вам нужно установить ClickHouse определенной версии, вы должны установить все пакеты одной версии:
+    `sudo apt-get install clickhouse-server=21.8.5.7 clickhouse-client=21.8.5.7 clickhouse-common-static=21.8.5.7`
 
 ### Из RPM пакетов {#from-rpm-packages}
 
@@ -39,8 +52,8 @@ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not su
 
 ``` bash
 sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
+sudo rpm --import https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG
+sudo yum-config-manager --add-repo https://repo.clickhouse.com/rpm/stable/x86_64
 ```
 
 Для использования наиболее свежих версий нужно заменить `stable` на `testing` (рекомендуется для тестовых окружений). Также иногда доступен `prestable`.
@@ -51,21 +64,21 @@ sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_6
 sudo yum install clickhouse-server clickhouse-client
 ```
 
-Также есть возможность установить пакеты вручную, скачав отсюда: https://repo.clickhouse.tech/rpm/stable/x86_64.
+Также есть возможность установить пакеты вручную, скачав отсюда: https://repo.clickhouse.com/rpm/stable/x86_64.
 
 ### Из Tgz архивов {#from-tgz-archives}
 
 Команда ClickHouse в Яндексе рекомендует использовать предкомпилированные бинарники из `tgz` архивов для всех дистрибутивов, где невозможна установка `deb` и `rpm` пакетов.
 
-Интересующую версию архивов можно скачать вручную с помощью `curl` или `wget` из репозитория https://repo.clickhouse.tech/tgz/.
+Интересующую версию архивов можно скачать вручную с помощью `curl` или `wget` из репозитория https://repo.clickhouse.com/tgz/.
 После этого архивы нужно распаковать и воспользоваться скриптами установки. Пример установки самой свежей версии:
 
 ``` bash
 export LATEST_VERSION=`curl https://api.github.com/repos/ClickHouse/ClickHouse/tags 2>/dev/null | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1`
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-client-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-server-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-client-$LATEST_VERSION.tgz
 
 tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
 sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
@@ -85,14 +98,14 @@ sudo clickhouse-client-$LATEST_VERSION/install/doinst.sh
 
 ### Из Docker образа {#from-docker-image}
 
-Для запуска ClickHouse в Docker нужно следовать инструкции на [Docker Hub](https://hub.docker.com/r/yandex/clickhouse-server/). Внутри образов используются официальные `deb` пакеты.
+Для запуска ClickHouse в Docker нужно следовать инструкции на [Docker Hub](https://hub.docker.com/r/clickhouse/clickhouse-server/). Внутри образов используются официальные `deb` пакеты.
 
 ### Из единого бинарного файла {#from-single-binary}
 
-Для установки ClickHouse под Linux можно использовать единый переносимый бинарный файл из последнего коммита ветки `master`: [https://builds.clickhouse.tech/master/amd64/clickhouse].
+Для установки ClickHouse под Linux можно использовать единый переносимый бинарный файл из последнего коммита ветки `master`: [https://builds.clickhouse.com/master/amd64/clickhouse].
 
 ``` bash
-curl -O 'https://builds.clickhouse.tech/master/amd64/clickhouse' && chmod a+x clickhouse
+curl -O 'https://builds.clickhouse.com/master/amd64/clickhouse' && chmod a+x clickhouse
 sudo ./clickhouse install
 ```
 
@@ -100,9 +113,9 @@ sudo ./clickhouse install
 
 Для других операционных систем и архитектуры AArch64 сборки ClickHouse предоставляются в виде кросс-компилированного бинарного файла из последнего коммита ветки `master` (с задержкой в несколько часов).
 
--   [macOS](https://builds.clickhouse.tech/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos/clickhouse' && chmod a+x ./clickhouse`
--   [FreeBSD](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
--   [AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
+-   [macOS](https://builds.clickhouse.com/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/macos/clickhouse' && chmod a+x ./clickhouse`
+-   [FreeBSD](https://builds.clickhouse.com/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
+-   [AArch64](https://builds.clickhouse.com/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
 
 После скачивания можно воспользоваться `clickhouse client` для подключения к серверу или `clickhouse local` для обработки локальных данных.
 
@@ -182,4 +195,4 @@ SELECT 1
 
 **Поздравляем, система работает!**
 
-Для дальнейших экспериментов можно попробовать загрузить один из тестовых наборов данных или пройти [пошаговое руководство для начинающих](https://clickhouse.tech/tutorial.html).
+Для дальнейших экспериментов можно попробовать загрузить один из тестовых наборов данных или пройти [пошаговое руководство для начинающих](https://clickhouse.com/tutorial.html).
diff --git a/docs/ru/getting-started/playground.md b/docs/ru/getting-started/playground.md
index d3101213b78..029fa706576 100644
--- a/docs/ru/getting-started/playground.md
+++ b/docs/ru/getting-started/playground.md
@@ -5,7 +5,7 @@ toc_title: Playground
 
 # ClickHouse Playground {#clickhouse-playground}
 
-[ClickHouse Playground](https://play.clickhouse.tech) позволяет пользователям экспериментировать с ClickHouse, мгновенно выполняя запросы без настройки своего сервера или кластера.
+[ClickHouse Playground](https://play.clickhouse.com) позволяет пользователям экспериментировать с ClickHouse, мгновенно выполняя запросы без настройки своего сервера или кластера.
 В Playground доступны несколько тестовых массивов данных, а также примеры запросов, которые показывают возможности ClickHouse. Кроме того, вы можете выбрать LTS релиз ClickHouse, который хотите протестировать.
 
 ClickHouse Playground дает возможность поработать с  [Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse) в конфигурации m2.small (4 vCPU, 32 ГБ ОЗУ), которую предосталяет [Яндекс.Облако](https://cloud.yandex.com/). Дополнительную информацию об облачных провайдерах читайте в разделе [Поставщики облачных услуг ClickHouse](../commercial/cloud.md).
@@ -16,15 +16,15 @@ ClickHouse Playground дает возможность поработать с  [
 
 | Параметр            | Значение                                |
 |:--------------------|:----------------------------------------|
-| Конечная точка HTTPS| `https://play-api.clickhouse.tech:8443` |
-| Конечная точка TCP  | `play-api.clickhouse.tech:9440`         |
+| Конечная точка HTTPS| `https://play-api.clickhouse.com:8443` |
+| Конечная точка TCP  | `play-api.clickhouse.com:9440`         |
 | Пользователь        | `playground`                            |
 | Пароль              | `clickhouse`                            |
 
 Также можно подключаться к ClickHouse определённых релизов, чтобы протестировать их различия (порты и пользователь / пароль остаются неизменными):
 
--   20.3 LTS: `play-api-v20-3.clickhouse.tech`
--   19.14 LTS: `play-api-v19-14.clickhouse.tech`
+-   20.3 LTS: `play-api-v20-3.clickhouse.com`
+-   19.14 LTS: `play-api-v19-14.clickhouse.com`
 
 !!! note "Примечание"
     Для всех этих конечных точек требуется безопасное соединение TLS.
@@ -46,13 +46,13 @@ ClickHouse Playground дает возможность поработать с  [
 Пример конечной точки HTTPS с `curl`:
 
 ``` bash
-curl "https://play-api.clickhouse.tech:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
+curl "https://play-api.clickhouse.com:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
 ```
 
 Пример конечной точки TCP с [CLI](../interfaces/cli.md):
 
 ``` bash
-clickhouse client --secure -h play-api.clickhouse.tech --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
+clickhouse client --secure -h play-api.clickhouse.com --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
 ```
 
 ## Детали реализации {#implementation-details}
diff --git a/docs/ru/getting-started/tutorial.md b/docs/ru/getting-started/tutorial.md
index 68b3e4dbae7..6deb1166602 100644
--- a/docs/ru/getting-started/tutorial.md
+++ b/docs/ru/getting-started/tutorial.md
@@ -85,8 +85,8 @@ Now it’s time to fill our ClickHouse server with some sample data. In this tut
 ### Download and Extract Table Data {#download-and-extract-table-data}
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 ```
 
 The extracted files are about 10GB in size.
@@ -659,4 +659,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 
 Replication operates in multi-master mode. Data can be loaded into any replica, and the system then syncs it with other instances automatically. Replication is asynchronous so at a given moment, not all replicas may contain recently inserted data. At least one replica should be up to allow data ingestion. Others will sync up data and repair consistency once they will become active again. Note that this approach allows for the low possibility of a loss of recently inserted data.
 
-[Original article](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index 277b73a6d36..bbb66b70371 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -26,7 +26,7 @@ Connected to ClickHouse server version 20.13.1 revision 54442.
 
 Клиент может быть использован в интерактивном и не интерактивном (batch) режиме.
 Чтобы использовать batch режим, укажите параметр query, или отправьте данные в stdin (проверяется, что stdin - не терминал), или и то, и другое.
-Аналогично HTTP интерфейсу, при использовании одновременно параметра query и отправке данных в stdin, запрос составляется из конкатенации параметра query, перевода строки, и данных в stdin. Это удобно для больших INSERT запросов.
+Аналогично HTTP интерфейсу, при использовании одновременно параметра query и отправке данных в stdin, запрос составляется из конкатенации параметра query, перевода строки и данных в stdin. Это удобно для больших `INSERT` запросов.
 
 Примеры использования клиента для вставки данных:
 
@@ -41,17 +41,17 @@ _EOF
 $ cat file.csv | clickhouse-client --database=test --query="INSERT INTO test FORMAT CSV";
 ```
 
-В batch режиме в качестве формата данных по умолчанию используется формат TabSeparated. Формат может быть указан в секции FORMAT запроса.
+В batch режиме в качестве формата данных по умолчанию используется формат `TabSeparated`. Формат может быть указан в запросе в секции `FORMAT`.
 
-По умолчанию, в batch режиме вы можете выполнить только один запрос. Чтобы выполнить несколько запросов из «скрипта», используйте параметр –multiquery. Это работает для всех запросов кроме INSERT. Результаты запросов выводятся подряд без дополнительных разделителей.
-Также, при необходимости выполнить много запросов, вы можете запускать clickhouse-client на каждый запрос. Заметим, что запуск программы clickhouse-client может занимать десятки миллисекунд.
+По умолчанию в batch режиме вы можете выполнить только один запрос. Чтобы выполнить несколько запросов из «скрипта», используйте параметр `–-multiquery`. Это работает для всех запросов кроме `INSERT`. Результаты запросов выводятся подряд без дополнительных разделителей.
+Если нужно выполнить много запросов, вы можете запускать clickhouse-client отдельно на каждый запрос. Заметим, что запуск программы clickhouse-client может занимать десятки миллисекунд.
 
-В интерактивном режиме, вы получите командную строку, в которую можно вводить запросы.
+В интерактивном режиме вы получаете командную строку, в которую можно вводить запросы.
 
 Если не указано multiline (по умолчанию):
-Чтобы выполнить запрос, нажмите Enter. Точка с запятой на конце запроса не обязательна. Чтобы ввести запрос, состоящий из нескольких строк, перед переводом строки, введите символ обратного слеша: `\` - тогда после нажатия Enter, вам предложат ввести следующую строку запроса.
+Чтобы выполнить запрос, нажмите Enter. Точка с запятой на конце запроса необязательна. Чтобы ввести запрос, состоящий из нескольких строк, в конце строки поставьте символ обратного слеша `\`, тогда после нажатия Enter вы сможете ввести следующую строку запроса.
 
-Если указано multiline (многострочный режим):
+Если указан параметр `--multiline` (многострочный режим):
 Чтобы выполнить запрос, завершите его точкой с запятой и нажмите Enter. Если в конце введённой строки не было точки с запятой, то вам предложат ввести следующую строчку запроса.
 
 Исполняется только один запрос, поэтому всё, что введено после точки с запятой, игнорируется.
@@ -61,20 +61,20 @@ $ cat file.csv | clickhouse-client --database=test --query="INSERT INTO test FOR
 Командная строка сделана на основе readline (и history) (или libedit, или без какой-либо библиотеки, в зависимости от сборки) - то есть, в ней работают привычные сочетания клавиш, а также присутствует история.
 История пишется в `~/.clickhouse-client-history`.
 
-По умолчанию, в качестве формата, используется формат PrettyCompact (красивые таблички). Вы можете изменить формат с помощью секции FORMAT запроса, или с помощью указания `\G` на конце запроса, с помощью аргумента командной строки `--format` или `--vertical`, или с помощью конфигурационного файла клиента.
+По умолчанию используется формат вывода `PrettyCompact` (он поддерживает красивый вывод таблиц). Вы можете изменить формат вывода результатов запроса следующими способами: с помощью секции `FORMAT` в запросе, указав символ `\G` в конце запроса, используя аргументы командной строки `--format` или `--vertical` или с помощью конфигурационного файла клиента.
 
-Чтобы выйти из клиента, нажмите Ctrl+D, или наберите вместо запроса одно из: «exit», «quit», «logout», «учше», «йгше», «дщпщге», «exit;», «quit;», «logout;», «учшеж», «йгшеж», «дщпщгеж», «q», «й», «q», «Q», «:q», «й», «Й», «Жй»
+Чтобы выйти из клиента, нажмите Ctrl+D или наберите вместо запроса одно из: «exit», «quit», «logout», «учше», «йгше», «дщпщге», «exit;», «quit;», «logout;», «учшеж», «йгшеж», «дщпщгеж», «q», «й», «q», «Q», «:q», «й», «Й», «Жй».
 
-При выполнении запроса, клиент показывает:
+При выполнении запроса клиент показывает:
 
-1.  Прогресс выполнение запроса, который обновляется не чаще, чем 10 раз в секунду (по умолчанию). При быстрых запросах, прогресс может не успеть отобразиться.
+1.  Прогресс выполнение запроса, который обновляется не чаще, чем 10 раз в секунду (по умолчанию). При быстрых запросах прогресс может не успеть отобразиться.
 2.  Отформатированный запрос после его парсинга - для отладки.
 3.  Результат в заданном формате.
 4.  Количество строк результата, прошедшее время, а также среднюю скорость выполнения запроса.
 
-Вы можете прервать длинный запрос, нажав Ctrl+C. При этом вам всё равно придётся чуть-чуть подождать, пока сервер остановит запрос. На некоторых стадиях выполнения, запрос невозможно прервать. Если вы не дождётесь и нажмёте Ctrl+C второй раз, то клиент будет завершён.
+Вы можете прервать длинный запрос, нажав Ctrl+C. При этом вам всё равно придётся чуть-чуть подождать, пока сервер остановит запрос. На некоторых стадиях выполнения запрос невозможно прервать. Если вы не дождётесь и нажмёте Ctrl+C второй раз, то клиент будет завершён.
 
-Клиент командной строки позволяет передать внешние данные (внешние временные таблицы) для использования запроса. Подробнее смотрите раздел «Внешние данные для обработки запроса»
+Клиент командной строки позволяет передать внешние данные (внешние временные таблицы) для выполнения запроса. Подробнее смотрите раздел «Внешние данные для обработки запроса».
 
 ### Запросы с параметрами {#cli-queries-with-parameters}
 
@@ -84,7 +84,7 @@ $ cat file.csv | clickhouse-client --database=test --query="INSERT INTO test FOR
 clickhouse-client --param_parName="[1, 2]"  -q "SELECT * FROM table WHERE a = {parName:Array(UInt16)}"
 ```
 
-#### Cинтаксис запроса {#cli-queries-with-parameters-syntax}
+#### Синтаксис запроса {#cli-queries-with-parameters-syntax}
 
 Отформатируйте запрос обычным способом. Представьте значения, которые вы хотите передать из параметров приложения в запрос в следующем формате:
 
@@ -155,3 +155,29 @@ $ clickhouse-client --param_tbl="numbers" --param_db="system" --param_col="numbe
 </config>
 ```
 
+### Формат ID запроса {#query-id-format}
+
+В интерактивном режиме `clickhouse-client` показывает ID для каждого запроса. По умолчанию ID выводится в таком виде:
+
+```sql
+Query id: 927f137d-00f1-4175-8914-0dd066365e96
+```
+
+Произвольный формат ID можно задать в конфигурационном файле внутри тега `query_id_formats`. ID подставляется вместо `{query_id}` в строке формата. В теге может быть перечислено несколько строк формата.
+Эта возможность может быть полезна для генерации URL, с помощью которых выполняется профилирование запросов.
+
+**Пример**
+
+```xml
+<config>
+  <query_id_formats>
+    <speedscope>http://speedscope-host/#profileURL=qp%3Fid%3D{query_id}</speedscope>
+  </query_id_formats>
+</config>
+```
+
+Если применить приведённую выше конфигурацию, то ID запроса будет выводиться в следующем виде:
+
+``` text
+speedscope:http://speedscope-host/#profileURL=qp%3Fid%3Dc8ecc783-e753-4b38-97f1-42cddfb98b7d
+```
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index 563a137ac17..712cc425c5b 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -22,20 +22,19 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [CustomSeparated](#format-customseparated)                                              | ✔     | ✔      |
 | [Values](#data-format-values)                                                           | ✔     | ✔      |
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
-| [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
 | [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
-| [JSONString](#jsonstring)                                                               | ✗     | ✔      |
+| [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
 | [JSONCompact](#jsoncompact)                                                             | ✗     | ✔      |
-| [JSONCompactString](#jsoncompactstring)                                                 | ✗     | ✔      |
+| [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗     | ✔      |
 | [JSONEachRow](#jsoneachrow)                                                             | ✔     | ✔      |
 | [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                     | ✗     | ✔      |
-| [JSONStringEachRow](#jsonstringeachrow)                                                 | ✔     | ✔      |
-| [JSONStringEachRowWithProgress](#jsonstringeachrowwithprogress)                         | ✗     | ✔      |
+| [JSONStringsEachRow](#jsonstringseachrow)                                                 | ✔     | ✔      |
+| [JSONStringsEachRowWithProgress](#jsonstringseachrowwithprogress)                         | ✗     | ✔      |
 | [JSONCompactEachRow](#jsoncompacteachrow)                                               | ✔     | ✔      |
 | [JSONCompactEachRowWithNamesAndTypes](#jsoncompacteachrowwithnamesandtypes)             | ✔     | ✔      |
-| [JSONCompactStringEachRow](#jsoncompactstringeachrow)                                   | ✔     | ✔      |
-| [JSONCompactStringEachRowWithNamesAndTypes](#jsoncompactstringeachrowwithnamesandtypes) | ✔     | ✔      |
+| [JSONCompactStringsEachRow](#jsoncompactstringseachrow)                                   | ✔     | ✔      |
+| [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔     | ✔      |
 | [TSKV](#tskv)                                                                           | ✔     | ✔      |
 | [Pretty](#pretty)                                                                       | ✗     | ✔      |
 | [PrettyCompact](#prettycompact)                                                         | ✗     | ✔      |
@@ -59,6 +58,7 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 | [LineAsString](#lineasstring)                                                           | ✔     | ✗      |
 | [Regexp](#data-format-regexp)                                                           | ✔     | ✗      |
 | [RawBLOB](#rawblob)                                                                     | ✔     | ✔      |
+| [MsgPack](#msgpack)                                                                     | ✔     | ✔      |
 
 Вы можете регулировать некоторые параметры работы с форматами с помощью настроек ClickHouse. За дополнительной информацией обращайтесь к разделу [Настройки](../operations/settings/settings.md).
 
@@ -73,7 +73,7 @@ ClickHouse может принимать (`INSERT`) и отдавать (`SELECT
 Формат `TabSeparated` поддерживает вывод тотальных значений (при использовании WITH TOTALS) и экстремальных значений (при настройке extremes выставленной в 1). В этих случаях, после основных данных выводятся тотальные значения, и экстремальные значения. Основной результат, тотальные значения и экстремальные значения, отделяются друг от друга пустой строкой. Пример:
 
 ``` sql
-SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated``
+SELECT EventDate, count() AS c FROM test.hits GROUP BY EventDate WITH TOTALS ORDER BY EventDate FORMAT TabSeparated
 ```
 
 ``` text
@@ -364,7 +364,7 @@ $ clickhouse-client --format_csv_delimiter="|" --query="INSERT INTO test.csv FOR
 
 ## CSVWithNames {#csvwithnames}
 
-Выводит также заголовок, аналогично `TabSeparatedWithNames`.
+Выводит также заголовок, аналогично [TabSeparatedWithNames](#tabseparatedwithnames).
 
 ## CustomSeparated {#format-customseparated}
 
@@ -442,7 +442,7 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 -   Формат [JSONEachRow](#jsoneachrow)
 -   Настройка [output_format_json_array_of_rows](../operations/settings/settings.md#output-format-json-array-of-rows)
 
-## JSONString {#jsonstring}
+## JSONStrings {#jsonstrings}
 
 Отличается от JSON только тем, что поля данных выводятся в строках, а не в типизированных значениях JSON.
 
@@ -493,7 +493,7 @@ ClickHouse поддерживает [NULL](../sql-reference/syntax.md), кото
 
 ## JSONAsString {#jsonasstring}
 
-В этом формате один объект JSON интерпретируется как одно строковое значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они будут интерпретироваться как отдельные строки таблицы.
+В этом формате один объект JSON интерпретируется как одно строковое значение. Если входные данные имеют несколько объектов JSON, разделенных запятой, то они интерпретируются как отдельные строки таблицы. Если входные данные заключены в квадратные скобки, они интерпретируются как массив JSON-объектов.
 
 В этом формате парситься может только таблица с единственным полем типа [String](../sql-reference/data-types/string.md). Остальные столбцы должны быть заданы как `DEFAULT` или `MATERIALIZED`(смотрите раздел [Значения по умолчанию](../sql-reference/statements/create/table.md#create-default-values)), либо отсутствовать. Для дальнейшей обработки объекта JSON, представленного в строке, вы можете использовать [функции для работы с JSON](../sql-reference/functions/json-functions.md).
 
@@ -518,8 +518,30 @@ SELECT * FROM json_as_string;
 └───────────────────────────────────┘
 ```
 
+**Пример с массивом объектов JSON**
+
+Запрос:
+
+``` sql
+DROP TABLE IF EXISTS json_square_brackets;
+CREATE TABLE json_square_brackets (field String) ENGINE = Memory;
+INSERT INTO json_square_brackets FORMAT JSONAsString [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
+
+SELECT * FROM json_square_brackets;
+```
+
+Результат:
+
+```text
+┌─field──────────────────────┐
+│ {"id": 1, "name": "name1"} │
+│ {"id": 2, "name": "name2"} │
+└────────────────────────────┘
+```
+
+
 ## JSONCompact {#jsoncompact}
-## JSONCompactString {#jsoncompactstring}
+## JSONCompactStrings {#jsoncompactstrings}
 
 Отличается от JSON только тем, что строчки данных выводятся в массивах, а не в object-ах.
 
@@ -558,7 +580,7 @@ SELECT * FROM json_as_string;
 ```
 
 ```json
-// JSONCompactString
+// JSONCompactStrings
 {
         "meta":
         [
@@ -590,9 +612,9 @@ SELECT * FROM json_as_string;
 ```
 
 ## JSONEachRow {#jsoneachrow}
-## JSONStringEachRow {#jsonstringeachrow}
+## JSONStringsEachRow {#jsonstringseachrow}
 ## JSONCompactEachRow {#jsoncompacteachrow}
-## JSONCompactStringEachRow {#jsoncompactstringeachrow}
+## JSONCompactStringsEachRow {#jsoncompactstringseachrow}
 
 При использовании этих форматов ClickHouse выводит каждую запись как значения JSON (каждое значение отдельной строкой), при этом данные в целом — невалидный JSON.
 
@@ -605,9 +627,9 @@ SELECT * FROM json_as_string;
 При вставке данных вы должны предоставить отдельное значение JSON для каждой строки.
 
 ## JSONEachRowWithProgress {#jsoneachrowwithprogress}
-## JSONStringEachRowWithProgress {#jsonstringeachrowwithprogress}
+## JSONStringsEachRowWithProgress {#jsonstringseachrowwithprogress}
 
-Отличается от `JSONEachRow`/`JSONStringEachRow` тем, что ClickHouse будет выдавать информацию о ходе выполнения в виде значений JSON.
+Отличается от `JSONEachRow`/`JSONStringsEachRow` тем, что ClickHouse будет выдавать информацию о ходе выполнения в виде значений JSON.
 
 ```json
 {"row":{"'hello'":"hello","multiply(42, number)":"0","range(5)":[0,1,2,3,4]}}
@@ -617,9 +639,9 @@ SELECT * FROM json_as_string;
 ```
 
 ## JSONCompactEachRowWithNamesAndTypes {#jsoncompacteachrowwithnamesandtypes}
-## JSONCompactStringEachRowWithNamesAndTypes {#jsoncompactstringeachrowwithnamesandtypes}
+## JSONCompactStringsEachRowWithNamesAndTypes {#jsoncompactstringseachrowwithnamesandtypes}
 
-Отличается от `JSONCompactEachRow`/`JSONCompactStringEachRow` тем, что имена и типы столбцов записываются как первые две строки.
+Отличается от `JSONCompactEachRow`/`JSONCompactStringsEachRow` тем, что имена и типы столбцов записываются как первые две строки.
 
 ```json
 ["'hello'", "multiply(42, number)", "range(5)"]
@@ -915,10 +937,6 @@ test: string with 'quotes' and   with some special
 
 Этот формат подходит только для вывода результата выполнения запроса, но не для парсинга (приёма данных для вставки в таблицу).
 
-## VerticalRaw {#verticalraw}
-
-Аналогичен [Vertical](#vertical), но с отключенным выходом. Этот формат подходит только для вывода результата выполнения запроса, но не для парсинга (приёма данных для вставки в таблицу).
-
 ## XML {#xml}
 
 Формат XML подходит только для вывода данных, не для парсинга. Пример:
@@ -1180,7 +1198,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Типы данных столбцов в ClickHouse могут отличаться от типов данных соответствующих полей файла в формате Parquet. При вставке данных ClickHouse интерпретирует типы данных в соответствии с таблицей выше, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к тому типу, который установлен для столбца таблицы.
 
-### Вставка и выборка данных {#vstavka-i-vyborka-dannykh}
+### Вставка и выборка данных {#inserting-and-selecting-data}
 
 Чтобы вставить в ClickHouse данные из файла в формате Parquet, выполните команду следующего вида:
 
@@ -1188,6 +1206,8 @@ ClickHouse поддерживает настраиваемую точность
 $ cat {filename} | clickhouse-client --query="INSERT INTO {some_table} FORMAT Parquet"
 ```
 
+Чтобы вставить данные в колонки типа [Nested](../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур, нужно включить настройку [input_format_parquet_import_nested](../operations/settings/settings.md#input_format_parquet_import_nested).
+
 Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата Parquet, используйте команду следующего вида:
 
 ``` bash
@@ -1246,6 +1266,8 @@ ClickHouse поддерживает настраиваемую точность
 $ cat filename.arrow | clickhouse-client --query="INSERT INTO some_table FORMAT Arrow"
 ```
 
+Чтобы вставить данные в колонки типа [Nested](../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур, нужно включить настройку [input_format_arrow_import_nested](../operations/settings/settings.md#input_format_arrow_import_nested).
+
 ### Вывод данных {#selecting-data-arrow}
 
 Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата Arrow, используйте команду следующего вида:
@@ -1294,7 +1316,7 @@ ClickHouse поддерживает настраиваемую точность
 
 Типы данных столбцов в таблицах ClickHouse могут отличаться от типов данных для соответствующих полей ORC. При вставке данных ClickHouse интерпретирует типы данных ORC согласно таблице соответствия, а затем [приводит](../sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) данные к типу, установленному для столбца таблицы ClickHouse.
 
-### Вставка данных {#vstavka-dannykh-1}
+### Вставка данных {#inserting-data-2}
 
 Чтобы вставить в ClickHouse данные из файла в формате ORC, используйте команду следующего вида:
 
@@ -1302,7 +1324,9 @@ ClickHouse поддерживает настраиваемую точность
 $ cat filename.orc | clickhouse-client --query="INSERT INTO some_table FORMAT ORC"
 ```
 
-### Вывод данных {#vyvod-dannykh-1}
+Чтобы вставить данные в колонки типа [Nested](../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур, нужно включить настройку [input_format_orc_import_nested](../operations/settings/settings.md#input_format_orc_import_nested).
+
+### Вывод данных {#selecting-data-2}
 
 Чтобы получить данные из таблицы ClickHouse и сохранить их в файл формата ORC, используйте команду следующего вида:
 
@@ -1458,3 +1482,32 @@ $ clickhouse-client --query "SELECT * FROM {some_table} FORMAT RawBLOB" | md5sum
 ``` text
 f9725a22f9191e064120d718e26862a9  -
 ```
+
+## MsgPack {#msgpack}
+
+ClickHouse поддерживает запись и чтение из файлов в формате [MessagePack](https://msgpack.org/).
+
+### Соответствие типов данных {#data-types-matching-msgpack}
+
+| Тип данных MsgPack              | Тип данных ClickHouse                                                              |
+|---------------------------------|------------------------------------------------------------------------------------|
+| `uint N`, `positive fixint`         | [UIntN](../sql-reference/data-types/int-uint.md)                               |
+| `int N`                           | [IntN](../sql-reference/data-types/int-uint.md)                                  |
+| `fixstr`, `str 8`, `str 16`, `str 32`   | [String](../sql-reference/data-types/string.md), [FixedString](../sql-reference/data-types/fixedstring.md)                   |
+| `float 32`                        | [Float32](../sql-reference/data-types/float.md)                                  |
+| `float 64`                        | [Float64](../sql-reference/data-types/float.md)                                  |
+| `uint 16`                         | [Date](../sql-reference/data-types/date.md)                                      |
+| `uint 32`                         | [DateTime](../sql-reference/data-types/datetime.md)                              |
+| `uint 64`                         | [DateTime64](../sql-reference/data-types/datetime.md)                            |
+| `fixarray`, `array 16`, `array 32`| [Array](../sql-reference/data-types/array.md)                                    |
+| `nil`                             | [Nothing](../sql-reference/data-types/special-data-types/nothing.md)             |
+
+Пример:
+
+Запись в файл ".msgpk":
+
+```sql
+$ clickhouse-client --query="CREATE TABLE msgpack (array Array(UInt8)) ENGINE = Memory;"
+$ clickhouse-client --query="INSERT INTO msgpack VALUES ([0, 1, 2, 3, 42, 253, 254, 255]), ([255, 254, 253, 42, 3, 2, 1, 0])";
+$ clickhouse-client --query="SELECT * FROM msgpack FORMAT MsgPack" > tmp_msgpack.msgpk;
+```
diff --git a/docs/ru/interfaces/mysql.md b/docs/ru/interfaces/mysql.md
index 925b1113109..34150e0f96e 100644
--- a/docs/ru/interfaces/mysql.md
+++ b/docs/ru/interfaces/mysql.md
@@ -43,3 +43,9 @@ mysql>
 -   не поддерживаются подготовленные запросы
 
 -   некоторые типы данных отправляются как строки
+
+Чтобы прервать долго выполняемый запрос, используйте запрос `KILL QUERY connection_id` (во время выполнения он будет заменен на `KILL QUERY WHERE query_id = connection_id`). Например:
+
+``` bash
+$ mysql --protocol tcp -h mysql_server -P 9004 default -u default --password=123 -e "KILL QUERY 123456;"
+```
\ No newline at end of file
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index 9cb28a2c9a2..8e987fab554 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -75,11 +75,13 @@ toc_title: "Визуальные интерфейсы от сторонних р
 
 Основные возможности:
 
--   Построение запросов с подсветкой синтаксиса;
--   Просмотр таблиц;
--   Автодополнение команд;
+-   Построение запросов с подсветкой синтаксиса.
+-   Просмотр таблиц.
+-   Автодополнение команд.
 -   Полнотекстовый поиск.
 
+По умолчанию DBeaver не использует сессии при подключении (в отличие от CLI, например). Если вам нужна поддержка сессий (например, для установки настроек на сессию), измените настройки подключения драйвера и укажите для настройки `session_id` любое произвольное значение (драйвер использует подключение по http). После этого вы можете использовать любую настройку (setting) в окне запроса. 
+
 ### clickhouse-cli {#clickhouse-cli}
 
 [clickhouse-cli](https://github.com/hatarist/clickhouse-cli) - это альтернативный клиент командной строки для ClickHouse, написанный на Python 3.
@@ -187,4 +189,4 @@ SeekTable [бесплатен](https://www.seektable.com/help/cloud-pricing) д
 
 [Chadmin](https://github.com/bun4uk/chadmin) — простой графический интерфейс для визуализации запущенных запросов на вашем кластере ClickHouse. Он отображает информацию о запросах и дает возможность их завершать.
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/gui/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/ru/interfaces/third-party/integrations.md b/docs/ru/interfaces/third-party/integrations.md
index 70a4d233277..62557edff53 100644
--- a/docs/ru/interfaces/third-party/integrations.md
+++ b/docs/ru/interfaces/third-party/integrations.md
@@ -42,7 +42,7 @@ toc_title: "Библиотеки для интеграции от сторонн
         -   [mfedotov/clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
 -   Мониторинг
     -   [Graphite](https://graphiteapp.org)
-        -   [graphouse](https://github.com/yandex/graphouse)
+        -   [graphouse](https://github.com/ClickHouse/graphouse)
         -   [carbon-clickhouse](https://github.com/lomik/carbon-clickhouse)
         -   [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
         -   [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer) - оптимизирует партиции таблиц [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) согласно правилам в [конфигурации rollup](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration)
diff --git a/docs/ru/introduction/info.md b/docs/ru/introduction/info.md
deleted file mode 100644
index a5e7efffc7e..00000000000
--- a/docs/ru/introduction/info.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-toc_priority: 100
----
-
-# Информационная поддержка {#informatsionnaia-podderzhka}
-
-Информационная поддержка ClickHouse осуществляется на всей территории Российской Федерации без ограничений посредством использования телефонной связи и средств электронной почты на русском языке в круглосуточном режиме:
-
--   Адрес электронной почты: <a class="feedback-email"></a>
--   Телефон: <a href="tel:+74957806510">+7-495-780-6510</a>
-
diff --git a/docs/ru/introduction/performance.md b/docs/ru/introduction/performance.md
index eec1dcf4d0a..246d88f5886 100644
--- a/docs/ru/introduction/performance.md
+++ b/docs/ru/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: "Производительность"
 
 # Производительность {#proizvoditelnost}
 
-По результатам внутреннего тестирования в Яндексе, ClickHouse обладает наиболее высокой производительностью (как наиболее высокой пропускной способностью на длинных запросах, так и наиболее низкой задержкой на коротких запросах), при соответствующем сценарии работы, среди доступных для тестирования систем подобного класса. Результаты тестирования можно посмотреть на [отдельной странице](https://clickhouse.tech/benchmark/dbms/).
+По результатам внутреннего тестирования в Яндексе, ClickHouse обладает наиболее высокой производительностью (как наиболее высокой пропускной способностью на длинных запросах, так и наиболее низкой задержкой на коротких запросах), при соответствующем сценарии работы, среди доступных для тестирования систем подобного класса. Результаты тестирования можно посмотреть на [отдельной странице](https://clickhouse.com/benchmark/dbms/).
 
-Также это подтверждают многочисленные независимые бенчмарки. Их не сложно найти в Интернете самостоятельно, либо можно воспользоваться [небольшой коллекцией ссылок по теме](https://clickhouse.tech/#independent-benchmarks).
+Также это подтверждают многочисленные независимые бенчмарки. Их не сложно найти в Интернете самостоятельно, либо можно воспользоваться [небольшой коллекцией ссылок по теме](https://clickhouse.com/#independent-benchmarks).
 
 ## Пропускная способность при обработке одного большого запроса {#propusknaia-sposobnost-pri-obrabotke-odnogo-bolshogo-zaprosa}
 
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
new file mode 100644
index 00000000000..14d95ebae68
--- /dev/null
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -0,0 +1,119 @@
+---
+toc_priority: 66
+toc_title: ClickHouse Keeper
+---
+
+# [пре-продакшн] ClickHouse Keeper
+
+Сервер ClickHouse использует сервис координации [ZooKeeper](https://zookeeper.apache.org/) для [репликации](../engines/table-engines/mergetree-family/replication.md) данных и выполнения [распределенных DDL запросов](../sql-reference/distributed-ddl.md). ClickHouse Keeper — это альтернативный сервис координации, совместимый с ZooKeeper.
+
+!!! warning "Предупреждение"
+    ClickHouse Keeper находится в стадии пре-продакшн и тестируется в CI ClickHouse и на нескольких внутренних инсталляциях.
+
+## Детали реализации
+
+ZooKeeper — один из первых широко известных сервисов координации с открытым исходным кодом. Он реализован на языке программирования Java, имеет достаточно простую и мощную модель данных. Алгоритм координации Zookeeper называется ZAB (ZooKeeper Atomic Broadcast). Он не гарантирует линеаризуемость операций чтения, поскольку каждый узел ZooKeeper обслуживает чтения локально. В отличие от ZooKeeper, ClickHouse Keeper реализован на C++ и использует алгоритм [RAFT](https://raft.github.io/), [реализация](https://github.com/eBay/NuRaft). Этот алгоритм позволяет достичь линеаризуемости чтения и записи, имеет несколько реализаций с открытым исходным кодом на разных языках.
+
+По умолчанию ClickHouse Keeper предоставляет те же гарантии, что и ZooKeeper (линеаризуемость записей, последовательная согласованность чтений). У него есть совместимый клиент-серверный протокол, поэтому любой стандартный клиент ZooKeeper может использоваться для взаимодействия с ClickHouse Keeper. Снэпшоты и журналы имеют несовместимый с ZooKeeper формат, однако можно конвертировать данные Zookeeper в снэпшот ClickHouse Keeper с помощью `clickhouse-keeper-converter`. Межсерверный протокол ClickHouse Keeper также несовместим с ZooKeeper, поэтому создание смешанного кластера ZooKeeper / ClickHouse Keeper невозможно.
+
+## Конфигурация
+
+ClickHouse Keeper может использоваться как равноценная замена ZooKeeper или как внутренняя часть сервера ClickHouse, но в обоих случаях конфигурация представлена файлом `.xml`. Главный тег конфигурации ClickHouse Keeper — это `<keeper_server>`. Параметры конфигурации:
+
+-    `tcp_port` — порт для подключения клиента (по умолчанию для ZooKeeper: `2181`).
+-    `tcp_port_secure` — зашифрованный порт для подключения клиента.
+-    `server_id` — уникальный идентификатор сервера, каждый участник кластера должен иметь уникальный номер&nbsp;(1,&nbsp;2,&nbsp;3&nbsp;и&nbsp;т.&nbsp;д.).
+-    `log_storage_path` — путь к журналам координации, лучше хранить их на незанятом устройстве (актуально и для ZooKeeper).
+-    `snapshot_storage_path` — путь к снэпшотам координации.
+
+Другие общие параметры наследуются из конфигурации сервера ClickHouse (`listen_host`, `logger`, и т. д.).
+
+Настройки внутренней координации находятся в `<keeper_server>.<coordination_settings>`:
+
+-    `operation_timeout_ms` — максимальное время ожидания для одной клиентской операции в миллисекундах (по умолчанию: 10000).
+-    `session_timeout_ms` — максимальное время ожидания для клиентской сессии в миллисекундах (по умолчанию: 30000).
+-    `dead_session_check_period_ms` — частота, с которой ClickHouse Keeper проверяет мертвые сессии и удаляет их, в миллисекундах (по умолчанию: 500).
+-    `heart_beat_interval_ms` — частота, с которой узел-лидер ClickHouse Keeper отправляет хартбиты узлам-последователям, в миллисекундах (по умолчанию: 500).
+-    `election_timeout_lower_bound_ms` — время, после которого последователь может инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 1000).
+-    `election_timeout_upper_bound_ms` — время, после которого последователь должен инициировать выборы лидера, если не получил от него сердцебиения (по умолчанию: 2000).
+-    `rotate_log_storage_interval` — количество записей в журнале  координации для хранения в одном файле (по умолчанию: 100000).
+-    `reserved_log_items` — минимальное количество записей в журнале координации которые нужно сохранять после снятия снепшота (по умолчанию: 100000).
+-    `snapshot_distance` — частота, с которой ClickHouse Keeper делает новые снэпшоты (по количеству записей в журналах), в миллисекундах (по умолчанию: 100000).
+-    `snapshots_to_keep` — количество снэпшотов для сохранения (по умолчанию: 3).
+-    `stale_log_gap` — время, после которого лидер считает последователя устаревшим и отправляет ему снэпшот вместо журналов (по умолчанию: 10000).
+-    `fresh_log_gap` — максимальное отставание от лидера в количестве записей журнала после которого последователь считает себя не отстающим (по умолчанию: 200).
+-    `max_requests_batch_size` — количество запросов на запись, которые будут сгруппированы в один перед отправкой через RAFT (по умолчанию: 100).
+-    `force_sync` — вызывать `fsync` при каждой записи в журнал координации (по умолчанию: true).
+-    `quorum_reads` — выполнять запросы чтения аналогично запросам записи через весь консенсус RAFT с негативным эффектом на производительность и размер журналов (по умолчанию: false).
+-    `raft_logs_level` — уровень логгирования сообщений в текстовый лог  (trace, debug и т. д.) (по умолчанию: information).
+-    `auto_forwarding` — разрешить пересылку запросов на запись от последователей лидеру (по умолчанию: true).
+-    `shutdown_timeout` — время ожидания завершения внутренних подключений и выключения, в миллисекундах (по умолчанию: 5000).
+-    `startup_timeout` — время отключения сервера, если он не подключается к другим участникам кворума, в миллисекундах (по умолчанию: 30000).
+
+Конфигурация кворума находится в `<keeper_server>.<raft_configuration>` и содержит описание серверов. Единственный параметр для всего кворума — `secure`, который включает зашифрованное соединение для связи между участниками кворума. Параметры для каждого `<server>`:
+
+-    `id` — идентификатор сервера в кворуме.
+-    `hostname` — имя хоста, на котором размещен сервер.
+-    `port` — порт, на котором серверу доступны соединения для внутренней коммуникации.
+
+
+Примеры конфигурации кворума с тремя узлами можно найти в [интеграционных тестах](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) с префиксом `test_keeper_`. Пример конфигурации для сервера №1:
+
+```xml
+<keeper_server>
+    <tcp_port>2181</tcp_port>
+    <server_id>1</server_id>
+    <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+    <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+    <coordination_settings>
+        <operation_timeout_ms>10000</operation_timeout_ms>
+        <session_timeout_ms>30000</session_timeout_ms>
+        <raft_logs_level>trace</raft_logs_level>
+    </coordination_settings>
+
+    <raft_configuration>
+        <server>
+            <id>1</id>
+            <hostname>zoo1</hostname>
+            <port>9444</port>
+        </server>
+        <server>
+            <id>2</id>
+            <hostname>zoo2</hostname>
+            <port>9444</port>
+        </server>
+        <server>
+            <id>3</id>
+            <hostname>zoo3</hostname>
+            <port>9444</port>
+        </server>
+    </raft_configuration>
+</keeper_server>
+```
+
+## Как запустить
+
+ClickHouse Keeper входит в пакет `clickhouse-server`, просто добавьте кофигурацию `<keeper_server>` и запустите сервер ClickHouse как обычно. Если вы хотите запустить ClickHouse Keeper автономно, сделайте это аналогичным способом:
+
+```bash
+clickhouse-keeper --config /etc/your_path_to_config/config.xml --daemon
+```
+
+## [экспериментально] Переход с ZooKeeper
+
+Плавный переход с ZooKeeper на ClickHouse Keeper невозможен, необходимо остановить кластер ZooKeeper, преобразовать данные и запустить ClickHouse Keeper. Утилита `clickhouse-keeper-converter` конвертирует журналы и снэпшоты ZooKeeper в снэпшот ClickHouse Keeper. Работа утилиты проверена только для версий ZooKeeper выше 3.4. Для миграции необходимо выполнить следующие шаги:
+
+1. Остановите все узлы ZooKeeper.
+
+2. Необязательно, но рекомендуется: найдите узел-лидер ZooKeeper, запустите и снова остановите его. Это заставит ZooKeeper создать консистентный снэпшот.
+
+3. Запустите `clickhouse-keeper-converter` на лидере, например:
+
+```bash
+clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/version-2 --output-dir /path/to/clickhouse/keeper/snapshots
+```
+
+4. Скопируйте снэпшот на узлы сервера ClickHouse с настроенным `keeper` или запустите ClickHouse Keeper вместо ZooKeeper. Снэпшот должен сохраняться на всех узлах: в противном случае пустые узлы могут захватить лидерство и сконвертированные данные могут быть отброшены на старте.
+
+[Original article](https://clickhouse.com/docs/en/operations/clickhouse-keeper/) <!--hide-->
diff --git a/docs/ru/operations/configuration-files.md b/docs/ru/operations/configuration-files.md
index 8b4b0da8f2b..343fffdfaa5 100644
--- a/docs/ru/operations/configuration-files.md
+++ b/docs/ru/operations/configuration-files.md
@@ -6,19 +6,51 @@ toc_title: "Конфигурационные файлы"
 
 # Конфигурационные файлы {#configuration_files}
 
-Основной конфигурационный файл сервера - `config.xml` или `config.yaml`. Он расположен в директории `/etc/clickhouse-server/`.
+ClickHouse поддерживает многофайловое управление конфигурацией. Основной конфигурационный файл сервера — `/etc/clickhouse-server/config.xml` или `/etc/clickhouse-server/config.yaml`. Остальные файлы должны находиться в директории `/etc/clickhouse-server/config.d`. Обратите внимание, что конфигурационные файлы могут быть записаны в форматах XML или YAML, но смешение этих форматов в одном файле не поддерживается. Например, можно хранить основные конфигурационные файлы как `config.xml` и `users.xml`, а дополнительные файлы записать в директории `config.d` и `users.d` в формате `.yaml`.
 
-Отдельные настройки могут быть переопределены в файлах `*.xml` и `*.conf`, а также `.yaml` (для файлов в формате YAML) из директории `config.d` рядом с конфигом.
+Все XML файлы должны иметь одинаковый корневой элемент, обычно `<yandex>`. Для YAML элемент `yandex:` должен отсутствовать, так как парсер вставляет его автоматически.
 
-У элементов этих конфигурационных файлов могут быть указаны атрибуты `replace` или `remove`.
+## Переопределение {#override}
 
-Если ни один не указан - объединить содержимое элементов рекурсивно с заменой значений совпадающих детей.
+Некоторые настройки, определенные в основном конфигурационном файле, могут быть переопределены в других файлах:
 
-Если указано `replace` - заменить весь элемент на указанный.
+-   У элементов этих конфигурационных файлов могут быть указаны атрибуты `replace` или `remove`.
+-   Если ни один атрибут не указан, сервер объединит содержимое элементов рекурсивно, заменяя совпадающие значения дочерних элементов.
+-   Если указан атрибут `replace`, сервер заменит весь элемент на указанный.
+-   Если указан атрибут `remove`, сервер удалит элемент.
 
-Если указано `remove` - удалить элемент.
+Также возможно указать атрибуты как переменные среды с помощью `from_env="VARIABLE_NAME"`:
 
-Также в конфиге могут быть указаны «подстановки». Если у элемента присутствует атрибут `incl`, то в качестве значения будет использована соответствующая подстановка из файла. По умолчанию, путь к файлу с подстановками - `/etc/metrika.xml`. Он может быть изменён в конфигурации сервера в элементе [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from). Значения подстановок указываются в элементах `/yandex/имя_подстановки` этого файла. Если подстановка, заданная в `incl` отсутствует, то в лог попадает соответствующая запись. Чтобы ClickHouse не писал в лог об отсутствии подстановки, необходимо указать атрибут `optional="true"` (например, настройка [macros](server-configuration-parameters/settings.md)).
+```xml
+<yandex>
+    <macros>
+        <replica from_env="REPLICA" />
+        <layer from_env="LAYER" />
+        <shard from_env="SHARD" />
+    </macros>
+</yandex>
+```
+
+## Подстановки {#substitution}
+
+В конфигурационном файле могут быть указаны «подстановки». Если у элемента присутствует атрибут `incl`, то в качестве значения будет использована соответствующая подстановка из файла. По умолчанию путь к файлу с подстановками - `/etc/metrika.xml`. Он может быть изменён в конфигурации сервера в элементе [include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from). Значения подстановок указываются в элементах `/clickhouse/имя_подстановки` этого файла. Если подстановка, заданная в `incl`, отсутствует, то делается соответствующая запись в лог. Чтобы ClickHouse фиксировал в логе отсутствие подстановки, необходимо указать атрибут `optional="true"` (например, настройки для [macros](server-configuration-parameters/settings.md#macros)).
+
+Если нужно заменить весь элемент подстановкой, можно использовать `include` как имя элемента.
+
+Пример подстановки XML:
+
+```xml
+<yandex>
+    <!-- Appends XML subtree found at `/profiles-in-zookeeper` ZK path to `<profiles>` element. -->
+    <profiles from_zk="/profiles-in-zookeeper" />
+
+    <users>
+        <!-- Replaces `include` element with the subtree found at `/users-in-zookeeper` ZK path. -->
+        <include from_zk="/users-in-zookeeper" />
+        <include from_zk="/other-users-in-zookeeper" />
+    </users>
+</yandex>
+```
 
 Подстановки могут также выполняться из ZooKeeper. Для этого укажите у элемента атрибут `from_zk = "/path/to/node"`. Значение элемента заменится на содержимое узла `/path/to/node` в ZooKeeper. В ZooKeeper-узел также можно положить целое XML-поддерево, оно будет целиком вставлено в исходный элемент.
 
@@ -115,3 +147,9 @@ seq:
 <seq attr1="value1" attr2="value2">123</seq>
 <seq attr1="value1" attr2="value2">abc</seq>
 ```
+
+## Детали реализации {#implementation-details}
+
+При старте сервера для каждого конфигурационного файла создаются файлы предобработки `file-preprocessed.xml`. Они содержат все выполненные подстановки и переопределения (эти сведения записываются просто для информации). Если в конфигурационном файле настроены подстановки ZooKeeper, но при старте сервера ZooKeeper не доступен, то сервер загружает конфигурацию из соответствующего файла предобработки.
+
+Сервер отслеживает как изменения в конфигурационных файлах, так и файлы и узы ZooKeeper, которые были использованы при выполнении подстановок и переопределений, и на ходу перезагружает настройки для пользователей и кластеров. Это означает, что можно изменять кластеры, пользователей и их настройки без перезапуска сервера.
diff --git a/docs/ru/operations/external-authenticators/index.md b/docs/ru/operations/external-authenticators/index.md
index c2ed9750562..8465e57d792 100644
--- a/docs/ru/operations/external-authenticators/index.md
+++ b/docs/ru/operations/external-authenticators/index.md
@@ -13,4 +13,4 @@ ClickHouse поддерживает аутентификацию и управл
 - [LDAP](./ldap.md#external-authenticators-ldap) [аутентификатор](./ldap.md#ldap-external-authenticator) и [каталог](./ldap.md#ldap-external-user-directory)
 - Kerberos [аутентификатор](./kerberos.md#external-authenticators-kerberos)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/external-authenticators/index/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/operations/external-authenticators/index/) <!--hide-->
diff --git a/docs/ru/operations/external-authenticators/ldap.md b/docs/ru/operations/external-authenticators/ldap.md
index 8f1328c9aa6..7b4bab0290c 100644
--- a/docs/ru/operations/external-authenticators/ldap.md
+++ b/docs/ru/operations/external-authenticators/ldap.md
@@ -179,4 +179,4 @@ CREATE USER my_user IDENTIFIED WITH ldap SERVER 'my_ldap_server';
         - `attribute` — имя атрибута, значение которого будет возвращаться LDAP поиском. По умолчанию: `cn`.
         - `prefix` — префикс, который, как предполагается, будет находиться перед началом каждой строки в исходном списке строк, возвращаемых LDAP поиском. Префикс будет удален из исходных строк, а сами они будут рассматриваться как имена локальных ролей. По умолчанию: пустая строка.
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/operations/external-authenticators/ldap) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/en/operations/external-authenticators/ldap) <!--hide-->
diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md
index 6b4e25eb692..2d4ca1d3dcd 100644
--- a/docs/ru/operations/server-configuration-parameters/settings.md
+++ b/docs/ru/operations/server-configuration-parameters/settings.md
@@ -69,6 +69,85 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </compression>
 ```
 
+## encryption {#server-settings-encryption}
+
+Настраивает команду для получения ключа, используемого [кодеками шифрования](../../sql-reference/statements/create/table.md#create-query-encryption-codecs). Ключ (или несколько ключей) должен быть записан в переменные окружения или установлен в конфигурационном файле.
+
+Ключи могут быть представлены в шестнадцатеричной или строковой форме. Их длина должна быть равна 16 байтам.
+
+**Пример**
+
+Загрузка из файла конфигурации:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key>12345567812345678</key>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+!!! note "Примечание"
+    Хранение ключей в конфигурационном файле не рекомендовано. Это не безопасно. Вы можете переместить ключи в отдельный файл на секретном диске и сделать symlink к этому конфигурационному файлу в папке `config.d/`.
+
+Загрузка из файла конфигурации, когда ключ представлен в шестнадцатеричной форме:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex>00112233445566778899aabbccddeeff</key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Загрузка ключа из переменной окружения:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex from_env="KEY"></key_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Параметр `current_key_id` устанавливает текущий ключ для шифрования, и все указанные ключи можно использовать для расшифровки.
+
+Все эти методы могут быть применены для нескольких ключей:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+        <key_hex id="1" from_env=".."></key_hex>
+        <current_key_id>1</current_key_id>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Параметр `current_key_id` указывает текущий ключ для шифрования.
+
+Также пользователь может добавить одноразовое случайное число длинной 12 байт (по умолчанию шифрование и дешифровка будут использовать одноразовое число длинной 12 байт, заполненное нулями):
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce>0123456789101</nonce>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Одноразовое число также может быть представлено в шестнадцатеричной форме:
+
+```xml
+<encryption_codecs>
+    <aes_128_gcm_siv>
+        <nonce_hex>abcdefabcdef</nonce_hex>
+    </aes_128_gcm_siv>
+</encryption_codecs>
+```
+
+Всё вышеперечисленное также применимо для алгоритма `aes_256_gcm_siv` (но ключ должен быть длиной 32 байта).
+
 ## custom_settings_prefixes {#custom_settings_prefixes}
 
 Список префиксов для [пользовательских настроек](../../operations/settings/index.md#custom_settings). Префиксы должны перечисляться через запятую.
@@ -134,6 +213,25 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <default_profile>default</default_profile>
 ```
 
+## default_replica_path {#default_replica_path}
+
+Путь к таблице в ZooKeeper.
+
+**Пример**
+
+``` xml
+<default_replica_path>/clickhouse/tables/{uuid}/{shard}</default_replica_path>
+```
+## default_replica_name {#default_replica_name}
+
+Имя реплики в ZooKeeper.
+
+**Пример**
+
+``` xml
+<default_replica_name>{replica}</default_replica_name>
+```
+
 ## dictionaries_config {#server_configuration_parameters-dictionaries_config}
 
 Путь к конфигурации внешних словарей.
@@ -326,8 +424,6 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <interserver_https_host>example.yandex.ru</interserver_https_host>
 ```
 
-
-
 ## interserver_http_credentials {#server-settings-interserver-http-credentials}
 
 Имя пользователя и пароль, использующиеся для аутентификации при [репликации](../../operations/server-configuration-parameters/settings.md) движками Replicated\*. Это имя пользователя и пароль используются только для взаимодействия между репликами кластера и никак не связаны с аутентификацией клиентов ClickHouse. Сервер проверяет совпадение имени и пароля для соединяющихся с ним реплик, а также использует это же имя и пароль для соединения с другими репликами. Соответственно, эти имя и пароль должны быть прописаны одинаковыми для всех реплик кластера.
@@ -352,12 +448,12 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 ## keep_alive_timeout {#keep-alive-timeout}
 
-Время в секундах, в течение которого ClickHouse ожидает входящих запросов прежде, чем закрыть соединение.
+Время в секундах, в течение которого ClickHouse ожидает входящих запросов прежде чем закрыть соединение. Значение по умолчанию: 10 секунд.
 
 **Пример**
 
 ``` xml
-<keep_alive_timeout>3</keep_alive_timeout>
+<keep_alive_timeout>10</keep_alive_timeout>
 ```
 
 ## listen_host {#server_configuration_parameters-listen_host}
@@ -395,7 +491,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </logger>
 ```
 
-Также, существует поддержка записи в syslog. Пример конфига:
+Также, существует поддержка записи в syslog. Пример настроек:
 
 ``` xml
 <logger>
@@ -446,9 +542,9 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 Подстановки параметров реплицируемых таблиц.
 
-Можно не указывать, если реплицируемых таблицы не используются.
+Можно не указывать, если реплицируемые таблицы не используются.
 
-Подробнее смотрите в разделе «[Создание реплицируемых таблиц](../../engines/table-engines/mergetree-family/replication.md)».
+Подробнее смотрите в разделе [Создание реплицируемых таблиц](../../engines/table-engines/mergetree-family/replication.md#creating-replicated-tables).
 
 **Пример**
 
@@ -497,7 +593,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 -   Положительное число с плавающей запятой.
 -   0 — сервер Clickhouse может использовать всю оперативную память.
 
-Значение по умолчанию: `0`.
+Значение по умолчанию: `0.9`.
 
 **Использование**
 
@@ -515,7 +611,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 
 ## max_concurrent_queries {#max-concurrent-queries}
 
-Определяет максимальное количество одновременно обрабатываемых запросов, связанных с таблицей семейства `MergeTree`. Запросы также могут быть ограничены настройками: [max_concurrent_queries_for_all_users](#max-concurrent-queries-for-all-users), [min_marks_to_honor_max_concurrent_queries](#min-marks-to-honor-max-concurrent-queries).
+Определяет максимальное количество одновременно обрабатываемых запросов, связанных с таблицей семейства `MergeTree`. Запросы также могут быть ограничены настройками: [max_concurrent_queries_for_user](#max-concurrent-queries-for-user), [max_concurrent_queries_for_all_users](#max-concurrent-queries-for-all-users), [min_marks_to_honor_max_concurrent_queries](#min-marks-to-honor-max-concurrent-queries).
 
 !!! info "Примечание"
 	Параметры этих настроек могут быть изменены во время выполнения запросов и вступят в силу немедленно. Запросы, которые уже запущены, выполнятся без изменений.
@@ -531,6 +627,21 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 <max_concurrent_queries>100</max_concurrent_queries>
 ```
 
+## max_concurrent_queries_for_user {#max-concurrent-queries-for-user}
+
+Определяет максимальное количество одновременно обрабатываемых запросов, связанных с таблицей семейства `MergeTree`, для пользователя.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — выключена.
+
+**Пример**
+
+``` xml
+<max_concurrent_queries_for_user>5</max_concurrent_queries_for_user>
+```
+
 ## max_concurrent_queries_for_all_users {#max-concurrent-queries-for-all-users}
 
 Если значение этой настройки меньше или равно текущему количеству одновременно обрабатываемых запросов, то будет сгенерировано исключение.
@@ -854,6 +965,33 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 </query_thread_log>
 ```
 
+## query_views_log {#server_configuration_parameters-query_views_log}
+
+Настройки логирования информации о зависимых представлениях (materialized, live и т.п.) в запросах принятых с настройкой [log_query_views=1](../../operations/settings/settings.md#settings-log-query-views).
+
+Запросы сохраняются в таблицу system.query_views_log. Вы можете изменить название этой таблицы в параметре `table` (см. ниже).
+
+При настройке логирования используются следующие параметры:
+
+-   `database` – имя базы данных.
+-   `table` – имя таблицы куда будут записываться использованные представления.
+-   `partition_by` — устанавливает [произвольный ключ партиционирования](../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Нельзя использовать если используется `engine`
+-   `engine` - устанавливает [настройки MergeTree Engine](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) для системной таблицы. Нельзя использовать если используется `partition_by`.
+-   `flush_interval_milliseconds` — период сброса данных из буфера в памяти в таблицу.
+
+Если таблица не существует, то ClickHouse создаст её. Если структура журнала запросов изменилась при обновлении сервера ClickHouse, то таблица со старой структурой переименовывается, а новая таблица создается автоматически.
+
+**Example**
+
+``` xml
+<query_views_log>
+    <database>system</database>
+    <table>query_views_log</table>
+    <partition_by>toYYYYMM(event_date)</partition_by>
+    <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+</query_views_log>
+```
+
 ## text_log {#server_configuration_parameters-text_log}
 
 Настройка логирования текстовых сообщений в системную таблицу [text_log](../../operations/system-tables/text_log.md#system_tables-text_log).
@@ -863,7 +1001,7 @@ ClickHouse проверяет условия для `min_part_size` и `min_part
 -   `level` — Максимальный уровень сообщения (по умолчанию `Trace`) которое будет сохранено в таблице.
 -   `database` — имя базы данных для хранения таблицы.
 -   `table` — имя таблицы, куда будут записываться текстовые сообщения.
--   `partition_by` — устанавливает [произвольный ключ партиционирования](../../operations/server-configuration-parameters/settings.md). Нельзя использовать если используется `engine`
+-   `partition_by` — устанавливает [произвольный ключ партиционирования](../../engines/table-engines/mergetree-family/custom-partitioning-key.md). Нельзя использовать если используется `engine`
 -   `engine` - устанавливает [настройки MergeTree Engine](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) для системной таблицы. Нельзя использовать если используется `partition_by`.
 -   `flush_interval_milliseconds` — период сброса данных из буфера в памяти в таблицу.
 
@@ -894,7 +1032,7 @@ Parameters:
 -   `engine` - устанавливает [настройки MergeTree Engine](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-creating-a-table) для системной таблицы. Нельзя использовать если используется `partition_by`.
 -   `flush_interval_milliseconds` — Interval for flushing data from the buffer in memory to the table.
 
-The default server configuration file `config.xml` contains the following settings section:
+По умолчанию файл настроек сервера `config.xml` содержит следующие настройки:
 
 ``` xml
 <trace_log>
@@ -1077,7 +1215,7 @@ ClickHouse использует ZooKeeper для хранения метадан
 
 -   `node` — адрес ноды (сервера) ZooKeeper. Можно сконфигурировать несколько нод.
 
-        Например:
+    Например:
 
 <!-- -->
 
@@ -1090,9 +1228,10 @@ ClickHouse использует ZooKeeper для хранения метадан
 
       Атрибут `index` задает порядок опроса нод при попытках подключиться к кластеру ZooKeeper.
 
--   `session_timeout` — максимальный таймаут клиентской сессии в миллисекундах.
--   `root` — [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes), который используется как корневой для всех znode, которые использует сервер ClickHouse. Необязательный.
--   `identity` — пользователь и пароль, которые может потребовать ZooKeeper для доступа к запрошенным znode. Необязательный.
+- `session_timeout_ms` — максимальный таймаут клиентской сессии в миллисекундах.
+- `operation_timeout_ms` — максимальный таймаут для одной операции в миллисекундах.
+- `root` — [znode](http://zookeeper.apache.org/doc/r3.5.5/zookeeperOver.html#Nodes+and+ephemeral+nodes), который используется как корневой для всех znode, которые использует сервер ClickHouse. Необязательный.
+- `identity` — пользователь и пароль, которые может потребовать ZooKeeper для доступа к запрошенным znode. Необязательный.
 
 **Пример конфигурации**
 
@@ -1166,6 +1305,39 @@ ClickHouse использует ZooKeeper для хранения метадан
 
 -   [background_schedule_pool_size](../settings/settings.md#background_schedule_pool_size)
 
+## distributed_ddl {#server-settings-distributed_ddl}
+
+Управление запуском [распределенных ddl запросов](../../sql-reference/distributed-ddl.md) (CREATE, DROP, ALTER, RENAME) в кластере.
+Работает только если разрешена [работа с ZooKeeper](#server-settings_zookeeper).
+
+**Пример**
+
+```xml
+<distributed_ddl>
+    <!-- Путь в ZooKeeper для очереди содержащей DDL запросы -->
+    <path>/clickhouse/task_queue/ddl</path>
+
+    <!-- Настройки из этого профиля будут использованы для запуска DDL запросов -->
+    <profile>default</profile>
+
+    <!-- Контроль того как много ON CLUSTER запросов могут исполняться одновременно. -->
+    <pool_size>1</pool_size>
+
+    <!--
+         Настройки очистки (активные задачи в очереди не будут удаляться)
+    -->
+
+    <!-- Время TTL для задач в секундах (по умолчанию 1 week) -->
+    <task_max_lifetime>604800</task_max_lifetime>
+
+    <!-- Как часто будет запускаться очистка данных  (в секундах) -->
+    <cleanup_delay_period>60</cleanup_delay_period>
+
+    <!-- Как много задач может быть в очереди -->
+    <max_tasks_in_queue>1000</max_tasks_in_queue>
+</distributed_ddl>
+```
+
 ## access_control_path {#access_control_path}
 
 Путь к каталогу, где сервер ClickHouse хранит конфигурации пользователей и ролей, созданные командами SQL.
@@ -1174,19 +1346,20 @@ ClickHouse использует ZooKeeper для хранения метадан
 
 **Смотрите также**
 
-- [Управление доступом](../access-rights.md#access-control)
+- [Управление доступом](../../operations/access-rights.md#access-control)
 
 ## user_directories {#user_directories}
 
 Секция конфигурационного файла,которая содержит настройки:
 -   Путь к конфигурационному файлу с предустановленными пользователями.
 -   Путь к файлу, в котором содержатся пользователи, созданные при помощи SQL команд.
+-   Путь к узлу ZooKeeper, где хранятся и реплицируются пользователи, созданные с помощью команд SQL (экспериментальная функциональность).
 
 Если эта секция определена, путь из [users_config](../../operations/server-configuration-parameters/settings.md#users-config) и [access_control_path](../../operations/server-configuration-parameters/settings.md#access_control_path) не используется.
 
 Секция `user_directories` может содержать любое количество элементов, порядок расположения элементов обозначает их приоритет (чем выше элемент, тем выше приоритет).
 
-**Пример**
+**Примеры**
 
 ``` xml
 <user_directories>
@@ -1199,7 +1372,20 @@ ClickHouse использует ZooKeeper для хранения метадан
 </user_directories>
 ```
 
-Также вы можете указать настройку `memory` — означает хранение информации только в памяти, без записи на диск, и `ldap` — означает хранения информации на [LDAP-сервере](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol).
+Пользователи, роли, политики доступа к строкам, квоты и профили могут храниться в ZooKeeper:
+
+``` xml
+<user_directories>
+    <users_xml>
+        <path>/etc/clickhouse-server/users.xml</path>
+    </users_xml>
+    <replicated>
+        <zookeeper_path>/clickhouse/access/</zookeeper_path>
+    </replicated>
+</user_directories>
+```
+
+Также вы можете добавить секции `memory` — означает хранение информации только в памяти, без записи на диск, и `ldap` — означает хранения информации на [LDAP-сервере](https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol).
 
 Чтобы добавить LDAP-сервер в качестве удаленного каталога пользователей, которые не определены локально, определите один раздел `ldap` со следующими параметрами:
 -   `server` — имя одного из LDAP-серверов, определенных в секции `ldap_servers` конфигурациионного файла. Этот параметр явялется необязательным и может быть пустым.
diff --git a/docs/ru/operations/settings/merge-tree-settings.md b/docs/ru/operations/settings/merge-tree-settings.md
index 88c511d4d80..08ea9979426 100644
--- a/docs/ru/operations/settings/merge-tree-settings.md
+++ b/docs/ru/operations/settings/merge-tree-settings.md
@@ -201,6 +201,44 @@ Eсли суммарное число активных кусков во все
 
 Значение по умолчанию: `0`.
 
+## max_replicated_fetches_network_bandwidth {#max_replicated_fetches_network_bandwidth}
+
+Ограничивает максимальную скорость скачивания данных в сети (в байтах в секунду) для синхронизаций между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_fetches_network_bandwidth_for_server](settings.md#max_replicated_fetches_network_bandwidth_for_server), которая применяется к серверу.
+
+Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_fetches_network_bandwidth_for_server`.
+
+Настройка соблюдается неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости передачи данных при репликации данных для добавления или замены новых узлов.
+
+## max_replicated_sends_network_bandwidth {#max_replicated_sends_network_bandwidth}
+
+Ограничивает максимальную скорость отправки данных по сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Настройка применяется к конкретной таблице, в отличие от [max_replicated_sends_network_bandwidth_for_server](settings.md#max_replicated_sends_network_bandwidth_for_server), которая применяется к серверу.
+
+Можно ограничить скорость обмена данными как для всего сервера, так и для конкретной таблицы, но для этого значение табличной настройки должно быть меньше серверной. Иначе сервер будет учитывать только настройку `max_replicated_sends_network_bandwidth_for_server`.
+
+Настройка следуется неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
+
 ## max_bytes_to_merge_at_max_space_in_pool {#max-bytes-to-merge-at-max-space-in-pool}
 
 Максимальный суммарный размер кусков (в байтах) в одном слиянии, если есть свободные ресурсы в фоновом пуле.
diff --git a/docs/ru/operations/settings/settings-users.md b/docs/ru/operations/settings/settings-users.md
index 6a10e518817..4570ce38bad 100644
--- a/docs/ru/operations/settings/settings-users.md
+++ b/docs/ru/operations/settings/settings-users.md
@@ -28,7 +28,7 @@ toc_title: "Настройки пользователей"
         <profile>profile_name</profile>
 
         <quota>default</quota>
-
+        <default_database>default<default_database>
         <databases>
             <database_name>
                 <table_name>
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index c74b3f5f2a5..70dc0e349e4 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -109,6 +109,21 @@ ClickHouse применяет настройку в тех случаях, ко
 
 Имеет смысл выключать, если на сервере миллионы мелких таблиц-чанков, которые постоянно создаются и уничтожаются.
 
+## function_range_max_elements_in_block {#settings-function_range_max_elements_in_block}
+
+Устанавливает порог безопасности для объема данных, создаваемого функцией [range](../../sql-reference/functions/array-functions.md#range). Задаёт максимальное количество значений, генерируемых функцией на блок данных (сумма размеров массивов для каждой строки в блоке).
+
+Возможные значения:
+
+-   Положительное целое.
+
+Значение по умолчанию: `500 000 000`.
+
+**См. также**
+
+-   [max_block_size](#setting-max_block_size)
+-   [min_insert_block_size_rows](#min-insert-block-size-rows)
+
 ## enable_http_compression {#settings-enable_http_compression}
 
 Включает или отключает сжатие данных в ответе на HTTP-запрос.
@@ -222,6 +237,39 @@ ClickHouse применяет настройку в тех случаях, ко
 
 В случае превышения `input_format_allow_errors_ratio` ClickHouse генерирует исключение.
 
+## input_format_parquet_import_nested {#input_format_parquet_import_nested}
+
+Включает или отключает возможность вставки данных в колонки типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур  в формате ввода [Parquet](../../interfaces/formats.md#data-format-parquet).
+
+Возможные значения:
+
+-   0 — данные не могут быть вставлены в колонки типа `Nested` в виде массива структур.
+-   0 — данные могут быть вставлены в колонки типа `Nested` в виде массива структур.
+
+Значение по умолчанию: `0`.
+
+## input_format_arrow_import_nested {#input_format_arrow_import_nested}
+
+Включает или отключает возможность вставки данных в колонки типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур в формате ввода [Arrow](../../interfaces/formats.md#data_types-matching-arrow).
+
+Возможные значения:
+
+-   0 — данные не могут быть вставлены в колонки типа `Nested` в виде массива структур.
+-   0 — данные могут быть вставлены в колонки типа `Nested` в виде массива структур.
+
+Значение по умолчанию: `0`.
+
+## input_format_orc_import_nested {#input_format_orc_import_nested}
+
+Включает или отключает возможность вставки данных в колонки типа [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) в виде массива структур в формате ввода [ORC](../../interfaces/formats.md#data-format-orc).
+
+Возможные значения:
+
+-   0 — данные не могут быть вставлены в колонки типа `Nested` в виде массива структур.
+-   0 — данные могут быть вставлены в колонки типа `Nested` в виде массива структур.
+
+Значение по умолчанию: `0`.
+
 ## input_format_values_interpret_expressions {#settings-input_format_values_interpret_expressions}
 
 Включает или отключает парсер SQL, если потоковый парсер не может проанализировать данные. Этот параметр используется только для формата [Values](../../interfaces/formats.md#data-format-values) при вставке данных. Дополнительные сведения о парсерах читайте в разделе [Синтаксис](../../sql-reference/syntax.md).
@@ -753,12 +801,32 @@ ClickHouse может парсить только базовый формат `Y
 
 Кэш несжатых блоков хранит данные, извлечённые при выполнении запросов. ClickHouse использует кэш для ускорения ответов на повторяющиеся небольшие запросы. Настройка защищает кэш от переполнения. Настройка сервера [uncompressed_cache_size](../server-configuration-parameters/settings.md#server-settings-uncompressed_cache_size) определяет размер кэша несжатых блоков.
 
-Возможное значение:
+Возможные значения:
 
 -   Положительное целое число.
 
 Значение по умолчанию: 2013265920.
 
+## merge_tree_clear_old_temporary_directories_interval_seconds {#setting-merge-tree-clear-old-temporary-directories-interval-seconds}
+
+Задает интервал в секундах для удаления старых временных каталогов на сервере ClickHouse.
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `60` секунд.
+
+## merge_tree_clear_old_parts_interval_seconds {#setting-merge-tree-clear-old-parts-interval-seconds}
+
+Задает интервал в секундах для удаления старых кусков данных, журналов предзаписи (WAL) и мутаций на сервере ClickHouse .
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `1` секунда.
+
 ## min_bytes_to_use_direct_io {#settings-min-bytes-to-use-direct-io}
 
 Минимальный объём данных, необходимый для прямого (небуферизованного) чтения/записи (direct I/O) на диск.
@@ -1050,6 +1118,40 @@ SELECT type, query FROM system.query_log WHERE log_comment = 'log_comment test'
 
 Значение по умолчанию: `5`.
 
+## max_replicated_fetches_network_bandwidth_for_server {#max_replicated_fetches_network_bandwidth_for_server}
+
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для синхронизации между [репликами](../../engines/table-engines/mergetree-family/replication.md). Применяется только при запуске сервера. Можно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_fetches_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_fetches_network_bandwidth).
+
+Значение настройки соблюдается неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
+
+## max_replicated_sends_network_bandwidth_for_server {#max_replicated_sends_network_bandwidth_for_server}
+
+Ограничивает максимальную скорость обмена данными в сети (в байтах в секунду) для [репликационных](../../engines/table-engines/mergetree-family/replication.md) отправок. Применяется только при запуске сервера. Можно также ограничить скорость для конкретной таблицы с помощью настройки [max_replicated_sends_network_bandwidth](../../operations/settings/merge-tree-settings.md#max_replicated_sends_network_bandwidth).
+
+Значение настройки соблюдается неточно.
+
+Возможные значения:
+
+-   Любое целое положительное число.
+-   0 — Скорость не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Использование**
+
+Может быть использована для ограничения скорости сети при репликации данных для добавления или замены новых узлов.
+
 ## connect_timeout_with_failover_ms {#connect-timeout-with-failover-ms}
 
 Таймаут в миллисекундах на соединение с удалённым сервером, для движка таблиц Distributed, если используются секции shard и replica в описании кластера.
@@ -1603,9 +1705,35 @@ ClickHouse генерирует исключение
 
 Значение по умолчанию: 0.
 
+## distributed_push_down_limit {#distributed-push-down-limit}
+
+Включает или отключает [LIMIT](#limit), применяемый к каждому шарду по отдельности. 
+
+Это позволяет избежать:
+- отправки дополнительных строк по сети;
+- обработки строк за пределами ограничения для инициатора.
+
+Начиная с версии 21.9 вы больше не сможете получить неточные результаты, так как `distributed_push_down_limit` изменяет выполнение запроса только в том случае, если выполнено хотя бы одно из условий:
+- `distributed_group_by_no_merge` > 0.
+- запрос **не содержит** `GROUP BY`/`DISTINCT`/`LIMIT BY`, но содержит `ORDER BY`/`LIMIT`.
+- запрос **содержит** `GROUP BY`/`DISTINCT`/`LIMIT BY` с `ORDER BY`/`LIMIT` и:
+  - включена настройка [optimize_skip_unused_shards](#optimize-skip-unused-shards).
+  - включена настройка `optimize_distributed_group_by_sharding_key`.
+
+Возможные значения:
+
+-    0 — выключена.
+-    1 — включена.
+
+Значение по умолчанию: `1`.
+
+См. также:
+
+-   [optimize_skip_unused_shards](#optimize-skip-unused-shards)
+
 ## optimize_skip_unused_shards {#optimize-skip-unused-shards}
 
-Включает или отключает пропуск неиспользуемых шардов для запросов [SELECT](../../sql-reference/statements/select/index.md) , в которых условие ключа шардирования задано в секции `WHERE/PREWHERE`. Предполагается, что данные распределены с помощью ключа шардирования, в противном случае настройка ничего не делает.
+Включает или отключает пропуск неиспользуемых шардов для запросов [SELECT](../../sql-reference/statements/select/index.md) , в которых условие ключа шардирования задано в секции `WHERE/PREWHERE`. Предполагается, что данные распределены с помощью ключа шардирования, в противном случае запрос выдаст неверный результат.
 
 Возможные значения:
 
@@ -1696,6 +1824,21 @@ ClickHouse генерирует исключение
 
 Значение по умолчанию: `0`.
 
+## optimize_trivial_count_query {#optimize-trivial-count-query}
+
+Включает или отключает оптимизацию простого запроса `SELECT count() FROM table` с использованием метаданных MergeTree. Если вы хотите управлять безопасностью на уровне строк, отключите оптимизацию.
+
+Возможные значения:
+
+   - 0 — оптимизация отключена.
+   - 1 — оптимизация включена.
+   
+Значение по умолчанию: `1`.
+
+См. также:
+
+-   [optimize_functions_to_subcolumns](#optimize-functions-to-subcolumns)
+
 ## distributed_replica_error_half_life {#settings-distributed_replica_error_half_life}
 
 -   Тип: секунды
@@ -1850,10 +1993,25 @@ ClickHouse генерирует исключение
 
 ## input_format_parallel_parsing {#input-format-parallel-parsing}
 
--   Тип: bool
--   Значение по умолчанию: True
+Включает или отключает режим, при котором входящие данные разбиваются на части, парсинг каждой из которых осуществляется параллельно с сохранением исходного порядка. Поддерживается только для форматов [TSV](../../interfaces/formats.md#tabseparated), [TKSV](../../interfaces/formats.md#tskv), [CSV](../../interfaces/formats.md#csv) и [JSONEachRow](../../interfaces/formats.md#jsoneachrow).
 
-Включает режим, при котором входящие данные парсятся параллельно, но с сохранением исходного порядка следования. Поддерживается только для форматов TSV, TKSV, CSV и JSONEachRow.
+Возможные значения:
+
+-   1 — включен режим параллельного разбора.
+-   0 — отключен режим параллельного разбора.
+
+Значение по умолчанию: `0`.
+
+## output_format_parallel_formatting {#output-format-parallel-formatting}
+
+Включает или отключает режим, при котором исходящие данные форматируются параллельно с сохранением исходного порядка. Поддерживается только для форматов [TSV](../../interfaces/formats.md#tabseparated), [TKSV](../../interfaces/formats.md#tskv), [CSV](../../interfaces/formats.md#csv) и [JSONEachRow](../../interfaces/formats.md#jsoneachrow).
+
+Возможные значения:
+
+-   1 — включен режим параллельного форматирования.
+-   0 — отключен режим параллельного форматирования.
+
+Значение по умолчанию: `0`.
 
 ## min_chunk_bytes_for_parallel_parsing {#min-chunk-bytes-for-parallel-parsing}
 
@@ -2552,6 +2710,43 @@ SELECT CAST(toNullable(toInt32(0)) AS Int32) as x, toTypeName(x);
 
 Значение по умолчанию: `1`.
 
+## output_format_csv_null_representation {#output_format_csv_null_representation}
+
+Определяет представление `NULL` для формата выходных данных [CSV](../../interfaces/formats.md#csv). Пользователь может установить в качестве значения любую строку, например, `My NULL`.
+
+Значение по умолчанию: `\N`.
+
+**Примеры**
+
+Запрос:
+
+```sql
+SELECT * FROM csv_custom_null FORMAT CSV;
+```
+
+Результат:
+
+```text
+788
+\N
+\N
+```
+
+Запрос:
+
+```sql
+SET output_format_csv_null_representation = 'My NULL';
+SELECT * FROM csv_custom_null FORMAT CSV;
+```
+
+Результат:
+
+```text
+788
+My NULL
+My NULL
+```
+
 ## output_format_tsv_null_representation {#output_format_tsv_null_representation}
 
 Определяет представление `NULL` для формата выходных данных [TSV](../../interfaces/formats.md#tabseparated). Пользователь может установить в качестве значения любую строку.
@@ -3025,7 +3220,7 @@ SELECT * FROM test LIMIT 10 OFFSET 100;
 
 Значение по умолчанию: `1800`.
 
-## optimize_fuse_sum_count_avg {#optimize_fuse_sum_count_avg}
+## optimize_syntax_fuse_functions {#optimize_syntax_fuse_functions}
 
 Позволяет объединить агрегатные функции с одинаковым аргументом. Запрос, содержащий по крайней мере две агрегатные функции: [sum](../../sql-reference/aggregate-functions/reference/sum.md#agg_function-sum), [count](../../sql-reference/aggregate-functions/reference/count.md#agg_function-count) или [avg](../../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) с одинаковым аргументом, перезаписывается как [sumCount](../../sql-reference/aggregate-functions/reference/sumcount.md#agg_function-sumCount).
 
@@ -3042,7 +3237,7 @@ SELECT * FROM test LIMIT 10 OFFSET 100;
 
 ``` sql
 CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
-SET optimize_fuse_sum_count_avg = 1;
+SET optimize_syntax_fuse_functions = 1;
 EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b), avg(b) from fuse_tbl FORMAT TSV;
 ```
 
@@ -3195,3 +3390,363 @@ SETTINGS index_granularity = 8192 │
 -   1 — тип `LowCardinality` конвертируется в тип `DICTIONARY`.
 
 Значение по умолчанию: `0`.
+
+## materialized_postgresql_max_block_size {#materialized-postgresql-max-block-size}
+
+Задает максимальное количество строк, собранных в памяти перед вставкой данных в таблицу базы данных PostgreSQL.
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `65536`.
+
+## materialized_postgresql_tables_list {#materialized-postgresql-tables-list}
+
+Задает список таблиц базы данных PostgreSQL, разделенных запятыми, которые будут реплицироваться с помощью движка базы данных [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md).
+
+Значение по умолчанию: пустой список — база данных PostgreSQL будет полностью реплицирована.
+
+## materialized_postgresql_allow_automatic_update {#materialized-postgresql-allow-automatic-update}
+
+Позволяет автоматически обновить таблицу в фоновом режиме при обнаружении изменений схемы. DDL-запросы на стороне сервера PostgreSQL не реплицируются с помощью движка ClickHouse [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md), поскольку это запрещено протоколом логической репликации PostgreSQL, но факт DDL-измененений обнаруживается транзакционно.  После обнаружения DDL по умолчанию прекращается репликация этих таблиц. Однако, если эта настройка включена, то вместо остановки репликации, таблицы будут перезагружены в фоновом режиме с помощью снимка базы данных без потери информации, и репликация для них будет продолжена.
+
+Возможные значения:
+
+-   0 — таблица не обновляется автоматически в фоновом режиме при обнаружении изменений схемы.
+-   1 — таблица обновляется автоматически в фоновом режиме при обнаружении изменений схемы.
+
+Значение по умолчанию: `0`.
+
+## materialized_postgresql_replication_slot {#materialized-postgresql-replication-slot}
+
+Строка с идентификатором слота репликации, созданного пользователем вручную. Эта настройка должна использоваться совместно с [materialized_postgresql_snapshot](#materialized-postgresql-snapshot).
+
+## materialized_postgresql_snapshot {#materialized-postgresql-snapshot}
+
+Строка с идентификатором снэпшота, из которого будет выполняться [исходный дамп таблиц PostgreSQL](../../engines/database-engines/materialized-postgresql.md). Эта настройка должна использоваться совместно с [materialized_postgresql_replication_slot](#materialized-postgresql-replication-slot).
+
+## allow_experimental_projection_optimization {#allow-experimental-projection-optimization}
+
+Включает или отключает поддержку [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) при обработке запросов `SELECT`.
+
+Возможные значения:
+
+-   0 — Проекции не поддерживаются.
+-   1 — Проекции поддерживаются.
+
+Значение по умолчанию: `0`.
+
+## force_optimize_projection {#force-optimize-projection}
+
+Включает или отключает обязательное использование [проекций](../../engines/table-engines/mergetree-family/mergetree.md#projections) в запросах `SELECT`, если поддержка проекций включена (см. настройку [allow_experimental_projection_optimization](#allow-experimental-projection-optimization)).
+
+Возможные значения:
+
+-   0 — Проекции используются опционально.
+-   1 — Проекции обязательно используются.
+
+Значение по умолчанию: `0`.
+
+## replication_alter_partitions_sync {#replication-alter-partitions-sync}
+
+Позволяет настроить ожидание выполнения действий на репликах запросами [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) или [TRUNCATE](../../sql-reference/statements/truncate.md).
+
+Возможные значения:
+
+-   0 — не ждать.
+-   1 — ждать выполнения действий на своей реплике.
+-   2 — ждать выполнения действий на всех репликах.
+
+Значение по умолчанию: `1`.
+
+## replication_wait_for_inactive_replica_timeout {#replication-wait-for-inactive-replica-timeout}
+
+Указывает время ожидания (в секундах) выполнения запросов [ALTER](../../sql-reference/statements/alter/index.md), [OPTIMIZE](../../sql-reference/statements/optimize.md) или [TRUNCATE](../../sql-reference/statements/truncate.md) для неактивных реплик.
+
+Возможные значения:
+
+-   0 — не ждать.
+-   Отрицательное целое число — ждать неограниченное время.
+-   Положительное целое число — установить соответствующее количество секунд ожидания.
+
+Значение по умолчанию: `120` секунд.
+
+## regexp_max_matches_per_row {#regexp-max-matches-per-row}
+
+Задает максимальное количество совпадений для регулярного выражения. Настройка применяется для защиты памяти от перегрузки при использовании "жадных" квантификаторов в регулярном выражении для функции [extractAllGroupsHorizontal](../../sql-reference/functions/string-search-functions.md#extractallgroups-horizontal).
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `1000`.
+
+## http_max_single_read_retries {#http-max-single-read-retries}
+
+Задает максимальное количество попыток чтения данных во время одного HTTP-запроса.
+
+Возможные значения:
+
+-   Положительное целое число.
+
+Значение по умолчанию: `1024`.
+
+## log_queries_probability {#log-queries-probability}
+
+Позволяет пользователю записывать в системные таблицы [query_log](../../operations/system-tables/query_log.md), [query_thread_log](../../operations/system-tables/query_thread_log.md) и [query_views_log](../../operations/system-tables/query_views_log.md) только часть запросов, выбранных случайным образом, с указанной вероятностью. Это помогает снизить нагрузку при большом объеме запросов в секунду.
+
+Возможные значения:
+
+-   0 — запросы не регистрируются в системных таблицах.
+-   Положительное число с плавающей точкой в диапазоне [0..1]. Например, при значении настройки, равном `0.5`, примерно половина запросов регистрируется в системных таблицах.
+-   1 — все запросы регистрируются в системных таблицах.
+
+Значение по умолчанию: `1`.
+
+## short_circuit_function_evaluation {#short-circuit-function-evaluation}
+
+Позволяет вычислять функции [if](../../sql-reference/functions/conditional-functions.md#if), [multiIf](../../sql-reference/functions/conditional-functions.md#multiif), [and](../../sql-reference/functions/logical-functions.md#logical-and-function) и [or](../../sql-reference/functions/logical-functions.md#logical-or-function) по [короткой схеме](https://ru-wikipedia-org.turbopages.org/ru.wikipedia.org/s/wiki/Вычисления_по_короткой_схеме). Это помогает оптимизировать выполнение сложных выражений в этих функциях и предотвратить возможные исключения (например, деление на ноль, когда оно не ожидается).
+
+Возможные значения:
+
+-   `enable` — по короткой схеме вычисляются функции, которые подходят для этого (могут сгенерировать исключение или требуют сложных вычислений).
+-   `force_enable` — все функции вычисляются по короткой схеме.
+-   `disable` — вычисление функций по короткой схеме отключено.
+
+Значение по умолчанию: `enable`.
+
+## max_hyperscan_regexp_length {#max-hyperscan-regexp-length}
+
+Задает максимальную длину каждого регулярного выражения в [hyperscan-функциях](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn)  поиска множественных совпадений в строке. 
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 - длина не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 3;
+```
+
+Результат:
+
+```text
+┌─multiMatchAny('abcd', ['ab', 'bcd', 'c', 'd'])─┐
+│                                              1 │
+└────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bcd','c','d']) SETTINGS max_hyperscan_regexp_length = 2;
+```
+
+Результат:
+
+```text
+Exception: Regexp length too large.
+```
+
+**См. также**
+
+-   [max_hyperscan_regexp_total_length](#max-hyperscan-regexp-total-length)
+
+## max_hyperscan_regexp_total_length {#max-hyperscan-regexp-total-length}
+
+Задает максимальную общую длину всех регулярных выражений в каждой [hyperscan-функции](../../sql-reference/functions/string-search-functions.md#multimatchanyhaystack-pattern1-pattern2-patternn)  поиска множественных совпадений в строке.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 - длина не ограничена.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['a','b','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Результат:
+
+```text
+┌─multiMatchAny('abcd', ['a', 'b', 'c', 'd'])─┐
+│                                           1 │
+└─────────────────────────────────────────────┘
+```
+
+Запрос:
+
+```sql
+SELECT multiMatchAny('abcd', ['ab','bc','c','d']) SETTINGS max_hyperscan_regexp_total_length = 5;
+```
+
+Результат:
+
+```text
+Exception: Total regexp lengths too large.
+```
+
+**См. также**
+
+-   [max_hyperscan_regexp_length](#max-hyperscan-regexp-length)
+
+## enable_positional_arguments {#enable-positional-arguments}
+
+Включает и отключает поддержку позиционных аргументов для [GROUP BY](../../sql-reference/statements/select/group-by.md), [LIMIT BY](../../sql-reference/statements/select/limit-by.md), [ORDER BY](../../sql-reference/statements/select/order-by.md). Если вы хотите использовать номера столбцов вместо названий в выражениях этих операторов, установите `enable_positional_arguments = 1`.
+
+Возможные значения:
+
+-   0 — Позиционные аргументы не поддерживаются.
+-   1 — Позиционные аргументы поддерживаются: можно использовать номера столбцов вместо названий столбцов.
+
+Значение по умолчанию: `0`.
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE TABLE positional_arguments(one Int, two Int, three Int) ENGINE=Memory();
+
+INSERT INTO positional_arguments VALUES (10, 20, 30), (20, 20, 10), (30, 10, 20);
+
+SET enable_positional_arguments = 1;
+
+SELECT * FROM positional_arguments ORDER BY 2,3;
+```
+
+Результат:
+
+```text
+┌─one─┬─two─┬─three─┐
+│  30 │  10 │   20  │
+│  20 │  20 │   10  │
+│  10 │  20 │   30  │
+└─────┴─────┴───────┘
+```
+
+## optimize_move_to_prewhere {#optimize_move_to_prewhere}
+
+Включает или отключает автоматическую оптимизацию [PREWHERE](../../sql-reference/statements/select/prewhere.md) в запросах [SELECT](../../sql-reference/statements/select/index.md).
+
+Работает только с таблицами семейства [*MergeTree](../../engines/table-engines/mergetree-family/index.md).
+
+Возможные значения:
+
+-   0 — автоматическая оптимизация `PREWHERE` отключена.
+-   1 — автоматическая оптимизация `PREWHERE` включена.
+
+Значение по умолчанию: `1`.
+
+## optimize_move_to_prewhere_if_final {#optimize_move_to_prewhere_if_final}
+
+Включает или отключает автоматическую оптимизацию [PREWHERE](../../sql-reference/statements/select/prewhere.md) в запросах [SELECT](../../sql-reference/statements/select/index.md) с модификатором [FINAL](../../sql-reference/statements/select/from.md#select-from-final).
+
+Работает только с таблицами семейства [*MergeTree](../../engines/table-engines/mergetree-family/index.md).
+
+Возможные значения:
+
+-   0 — автоматическая оптимизация `PREWHERE` в запросах `SELECT` с модификатором `FINAL` отключена.
+-   1 — автоматическая оптимизация `PREWHERE` в запросах `SELECT` с модификатором `FINAL` включена.
+
+Значение по умолчанию: `0`.
+
+**См. также**
+
+-   настройка [optimize_move_to_prewhere](#optimize_move_to_prewhere)
+
+## async_insert {#async-insert}
+
+Включает или отключает асинхронные вставки. Работает только для вставок по протоколу HTTP. Обратите внимание, что при таких вставках дедупликация не производится.
+
+Если включено, данные собираются в пачки перед вставкой в таблицу. Это позволяет производить мелкие и частые вставки в ClickHouse (до 15000 запросов в секунду) без промежуточных таблиц.
+
+Вставка данных происходит либо как только объем вставляемых данных превышает [async_insert_max_data_size](#async-insert-max-data-size), либо через [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) миллисекунд после первого запроса `INSERT`. Если в [async_insert_stale_timeout_ms](#async-insert-stale-timeout-ms) задано ненулевое значение, то данные вставляются через `async_insert_stale_timeout_ms` миллисекунд после последнего запроса.
+
+Если включен параметр [wait_for_async_insert](#wait-for-async-insert), каждый клиент ждет, пока данные будут сброшены в таблицу. Иначе запрос будет обработан почти моментально, даже если данные еще не вставлены.
+
+Возможные значения:
+
+-   0 — вставки производятся синхронно, один запрос за другим.
+-   1 — включены множественные асинхронные вставки.
+
+Значение по умолчанию: `0`.
+
+## async_insert_threads {#async-insert-threads}
+
+Максимальное число потоков для фоновой обработки и вставки данных.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — асинхронные вставки отключены.
+
+Значение по умолчанию: `16`.
+
+## wait_for_async_insert {#wait-for-async-insert}
+
+Включает или отключает ожидание обработки асинхронных вставок. Если включено, клиент выведет `OK` только после того, как данные вставлены. Иначе будет выведен `OK`, даже если вставка не произошла.
+
+Возможные значения:
+
+-   0 — сервер возвращает `OK` даже если вставка данных еще не завершена.
+-   1 — сервер возвращает `OK` только после завершения вставки данных.
+
+Значение по умолчанию: `1`.
+
+## wait_for_async_insert_timeout {#wait-for-async-insert-timeout}
+
+Время ожидания в секундах, выделяемое для обработки асинхронной вставки.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — ожидание отключено.
+
+Значение по умолчанию: [lock_acquire_timeout](#lock_acquire_timeout).
+
+## async_insert_max_data_size {#async-insert-max-data-size}
+
+Максимальный размер необработанных данных (в байтах), собранных за запрос, перед их вставкой.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — асинхронные вставки отключены.
+
+Значение по умолчанию: `1000000`.
+
+## async_insert_busy_timeout_ms {#async-insert-busy-timeout-ms}
+
+Максимальное время ожидания в миллисекундах после первого запроса `INSERT` и перед вставкой данных.
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — ожидание отключено.
+
+Значение по умолчанию: `200`.
+
+## async_insert_stale_timeout_ms {#async-insert-stale-timeout-ms}
+
+Максимальное время ожидания в миллисекундах после последнего запроса `INSERT` и перед вставкой данных. Если установлено ненулевое значение, [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) будет продлеваться с каждым запросом `INSERT`, пока не будет превышен [async_insert_max_data_size](#async-insert-max-data-size).
+
+Возможные значения:
+
+-   Положительное целое число.
+-   0 — ожидание отключено.
+
+Значение по умолчанию: `0`.
+
diff --git a/docs/ru/operations/storing-data.md b/docs/ru/operations/storing-data.md
new file mode 100644
index 00000000000..ca9b60bded8
--- /dev/null
+++ b/docs/ru/operations/storing-data.md
@@ -0,0 +1,315 @@
+---
+toc_priority: 68
+toc_title: "Хранение данных на внешних дисках"
+---
+
+# Хранение данных на внешних дисках {#external-disks}
+
+Данные, которые обрабатываются в ClickHouse, обычно хранятся в файловой системе локально, где развернут сервер ClickHouse. При этом для хранения данных требуются диски большого объема, которые могут быть довольно дорогостоящими. Решением проблемы может стать хранение данных отдельно от сервера — в распределенных файловых системах — [Amazon S3](https://aws.amazon.com/s3/) или Hadoop ([HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html)). 
+
+Для работы с данными, хранящимися в файловой системе `Amazon S3`, используйте движок [S3](../engines/table-engines/integrations/s3.md), а для работы с данными в файловой системе Hadoop — движок [HDFS](../engines/table-engines/integrations/hdfs.md). 
+
+## Репликация без копирования данных {#zero-copy}
+
+Для дисков `S3` и `HDFS` в ClickHouse поддерживается репликация без копирования данных (zero-copy): если данные хранятся на нескольких репликах, то при синхронизации пересылаются только метаданные (пути к кускам данных), а сами данные не копируются.
+
+## Использование сервиса HDFS для хранения данных {#table_engine-mergetree-hdfs}
+
+Таблицы семейств [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) и [Log](../engines/table-engines/log-family/log.md) могут хранить данные в сервисе HDFS при использовании диска типа `HDFS`.
+
+Пример конфигурации:
+``` xml
+<yandex>
+    <storage_configuration>
+        <disks>
+            <hdfs>
+                <type>hdfs</type>
+                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
+            </hdfs>
+        </disks>
+        <policies>
+            <hdfs>
+                <volumes>
+                    <main>
+                        <disk>hdfs</disk>
+                    </main>
+                </volumes>
+            </hdfs>
+        </policies>
+    </storage_configuration>
+
+    <merge_tree>
+        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
+    </merge_tree>
+</yandex>
+```
+
+Обязательные параметры:
+
+-   `endpoint` — URL точки приема запроса на стороне HDFS в формате `path`. URL точки должен содержать путь к корневой директории на сервере, где хранятся данные.
+
+Необязательные параметры:
+
+-   `min_bytes_for_seek` — минимальное количество байтов, которые используются для операций поиска вместо последовательного чтения. Значение по умолчанию: `1 МБайт`.
+
+## Использование виртуальной файловой системы для шифрования данных {#encrypted-virtual-file-system}
+
+Вы можете зашифровать данные, сохраненные на внешних дисках [S3](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-s3) или [HDFS](#table_engine-mergetree-hdfs) или на локальном диске. Чтобы включить режим шифрования, в конфигурационном файле вы должны указать диск с типом `encrypted` и тип диска, на котором будут сохранены данные. Диск типа `encrypted` шифрует данные "на лету", то есть при чтении файлов с этого диска расшифровка происходит автоматически. Таким образом, вы можете работать с диском типа `encrypted` как с обычным.
+
+Пример конфигурации:
+
+``` xml
+<disks>
+  <disk1>
+    <type>local</type>
+    <path>/path1/</path>
+  </disk1>
+  <disk2>
+    <type>encrypted</type>
+    <disk>disk1</disk>
+    <path>path2/</path>
+    <key>_16_ascii_chars_</key>
+  </disk2>
+</disks>
+```
+
+Например, когда ClickHouse записывает данные из какой-либо таблицы в файл `store/all_1_1_0/data.bin` на `disk1`, то на самом деле этот файл будет записан на физический диск по пути `/path1/store/all_1_1_0/data.bin`.
+
+При записи того же файла на диск `disk2` он будет записан на физический диск в зашифрованном виде по пути `/path1/path2/store/all_1_1_0/data.bin`.
+
+Обязательные параметры:
+
+-   `type` — `encrypted`. Иначе зашифрованный диск создан не будет.
+-   `disk` — тип диска для хранения данных.
+-   `key` — ключ для шифрования и расшифровки. Тип: [Uint64](../sql-reference/data-types/int-uint.md). Вы можете использовать параметр `key_hex` для шифрования в шестнадцатеричной форме.
+    Вы можете указать несколько ключей, используя атрибут `id` (смотрите пример выше).
+
+Необязательные параметры:
+
+-   `path` — путь к месту на диске, где будут сохранены данные. Если не указан, данные будут сохранены в корневом каталоге.
+-   `current_key_id` — ключ, используемый для шифрования. Все указанные ключи могут быть использованы для расшифровки, и вы всегда можете переключиться на другой ключ, сохраняя доступ к ранее зашифрованным данным.
+-   `algorithm` — [алгоритм](../sql-reference/statements/create/table.md#create-query-encryption-codecs) шифрования данных. Возможные значения: `AES_128_CTR`, `AES_192_CTR` или `AES_256_CTR`. Значение по умолчанию: `AES_128_CTR`. Длина ключа зависит от алгоритма: `AES_128_CTR` — 16 байт, `AES_192_CTR` — 24 байта, `AES_256_CTR` — 32 байта.
+
+Пример конфигурации:
+
+``` xml
+<yandex>
+    <storage_configuration>
+        <disks>
+            <disk_s3>
+                <type>s3</type>
+                <endpoint>...
+            </disk_s3>
+            <disk_s3_encrypted>
+                <type>encrypted</type>
+                <disk>disk_s3</disk>
+                <algorithm>AES_128_CTR</algorithm>
+                <key_hex id="0">00112233445566778899aabbccddeeff</key_hex>
+                <key_hex id="1">ffeeddccbbaa99887766554433221100</key_hex>
+                <current_key_id>1</current_key_id>
+            </disk_s3_encrypted>
+        </disks>
+    </storage_configuration>
+</yandex>
+```
+
+## Хранение данных на веб-сервере {#storing-data-on-webserver}
+
+Существует утилита `clickhouse-static-files-uploader`, которая готовит каталог данных для данной таблицы (`SELECT data_paths FROM system.tables WHERE name = 'table_name'`). Для каждой таблицы, необходимой вам, вы получаете каталог файлов. Эти файлы могут быть загружены, например, на веб-сервер в виде статических файлов. После этой подготовки вы можете загрузить эту таблицу на любой сервер ClickHouse через `DiskWeb`.
+
+Этот тип диска используется только для чтения, то есть данные на нем неизменяемы. Новая таблица загружается с помощью запроса `ATTACH TABLE` (см. пример ниже) и при каждом чтении данные будут доставаться по заданному `url` через http запрос, то есть локально данные не хранятся. Любое изменение данных приведет к исключению, т.е. не допускаются следующие типы запросов: [CREATE TABLE](../sql-reference/statements/create/table.md), [ALTER TABLE](../sql-reference/statements/alter/index.md), [RENAME TABLE](../sql-reference/statements/rename.md#misc_operations-rename_table), [DETACH TABLE](../sql-reference/statements/detach.md) и [TRUNCATE TABLE](../sql-reference/statements/truncate.md).
+
+Хранение данных на веб-сервере поддерживается только для табличных движков семейства [MergeTree](../engines/table-engines/mergetree-family/mergetree.md) и [Log](../engines/table-engines/log-family/log.md). Чтобы получить доступ к данным, хранящимся на диске `web`, при выполнении запроса используйте настройку [storage_policy](../engines/table-engines/mergetree-family/mergetree.md#terms). Например, `ATTACH TABLE table_web UUID '{}' (id Int32) ENGINE = MergeTree() ORDER BY id SETTINGS storage_policy = 'web'`.
+
+Готовый тестовый пример. Добавьте эту конфигурацию в config:
+
+``` xml
+<yandex>
+    <storage_configuration>
+        <disks>
+            <web>
+                <type>web</type>
+                <endpoint>https://clickhouse-datasets.s3.yandex.net/disk-with-static-files-tests/test-hits/</endpoint>
+            </web>
+        </disks>
+        <policies>
+            <web>
+                <volumes>
+                    <main>
+                        <disk>web</disk>
+                    </main>
+                </volumes>
+            </web>
+        </policies>
+    </storage_configuration>
+</yandex>
+```
+
+А затем выполните этот запрос:
+
+```sql
+ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218'
+(
+    WatchID UInt64,
+    JavaEnable UInt8,
+    Title String,
+    GoodEvent Int16,
+    EventTime DateTime,
+    EventDate Date,
+    CounterID UInt32,
+    ClientIP UInt32,
+    ClientIP6 FixedString(16),
+    RegionID UInt32,
+    UserID UInt64,
+    CounterClass Int8,
+    OS UInt8,
+    UserAgent UInt8,
+    URL String,
+    Referer String,
+    URLDomain String,
+    RefererDomain String,
+    Refresh UInt8,
+    IsRobot UInt8,
+    RefererCategories Array(UInt16),
+    URLCategories Array(UInt16),
+    URLRegions Array(UInt32),
+    RefererRegions Array(UInt32),
+    ResolutionWidth UInt16,
+    ResolutionHeight UInt16,
+    ResolutionDepth UInt8,
+    FlashMajor UInt8,
+    FlashMinor UInt8,
+    FlashMinor2 String,
+    NetMajor UInt8,
+    NetMinor UInt8,
+    UserAgentMajor UInt16,
+    UserAgentMinor FixedString(2),
+    CookieEnable UInt8,
+    JavascriptEnable UInt8,
+    IsMobile UInt8,
+    MobilePhone UInt8,
+    MobilePhoneModel String,
+    Params String,
+    IPNetworkID UInt32,
+    TraficSourceID Int8,
+    SearchEngineID UInt16,
+    SearchPhrase String,
+    AdvEngineID UInt8,
+    IsArtifical UInt8,
+    WindowClientWidth UInt16,
+    WindowClientHeight UInt16,
+    ClientTimeZone Int16,
+    ClientEventTime DateTime,
+    SilverlightVersion1 UInt8,
+    SilverlightVersion2 UInt8,
+    SilverlightVersion3 UInt32,
+    SilverlightVersion4 UInt16,
+    PageCharset String,
+    CodeVersion UInt32,
+    IsLink UInt8,
+    IsDownload UInt8,
+    IsNotBounce UInt8,
+    FUniqID UInt64,
+    HID UInt32,
+    IsOldCounter UInt8,
+    IsEvent UInt8,
+    IsParameter UInt8,
+    DontCountHits UInt8,
+    WithHash UInt8,
+    HitColor FixedString(1),
+    UTCEventTime DateTime,
+    Age UInt8,
+    Sex UInt8,
+    Income UInt8,
+    Interests UInt16,
+    Robotness UInt8,
+    GeneralInterests Array(UInt16),
+    RemoteIP UInt32,
+    RemoteIP6 FixedString(16),
+    WindowName Int32,
+    OpenerName Int32,
+    HistoryLength Int16,
+    BrowserLanguage FixedString(2),
+    BrowserCountry FixedString(2),
+    SocialNetwork String,
+    SocialAction String,
+    HTTPError UInt16,
+    SendTiming Int32,
+    DNSTiming Int32,
+    ConnectTiming Int32,
+    ResponseStartTiming Int32,
+    ResponseEndTiming Int32,
+    FetchTiming Int32,
+    RedirectTiming Int32,
+    DOMInteractiveTiming Int32,
+    DOMContentLoadedTiming Int32,
+    DOMCompleteTiming Int32,
+    LoadEventStartTiming Int32,
+    LoadEventEndTiming Int32,
+    NSToDOMContentLoadedTiming Int32,
+    FirstPaintTiming Int32,
+    RedirectCount Int8,
+    SocialSourceNetworkID UInt8,
+    SocialSourcePage String,
+    ParamPrice Int64,
+    ParamOrderID String,
+    ParamCurrency FixedString(3),
+    ParamCurrencyID UInt16,
+    GoalsReached Array(UInt32),
+    OpenstatServiceName String,
+    OpenstatCampaignID String,
+    OpenstatAdID String,
+    OpenstatSourceID String,
+    UTMSource String,
+    UTMMedium String,
+    UTMCampaign String,
+    UTMContent String,
+    UTMTerm String,
+    FromTag String,
+    HasGCLID UInt8,
+    RefererHash UInt64,
+    URLHash UInt64,
+    CLID UInt32,
+    YCLID UInt64,
+    ShareService String,
+    ShareURL String,
+    ShareTitle String,
+    ParsedParams Nested(
+        Key1 String,
+        Key2 String,
+        Key3 String,
+        Key4 String,
+        Key5 String,
+        ValueDouble Float64),
+    IslandID FixedString(16),
+    RequestNum UInt32,
+    RequestTry UInt8
+)
+ENGINE = MergeTree()
+PARTITION BY toYYYYMM(EventDate)
+ORDER BY (CounterID, EventDate, intHash32(UserID))
+SAMPLE BY intHash32(UserID)
+SETTINGS storage_policy='web';
+```
+
+Обязательные параметры:
+
+-   `type` — `web`. Иначе диск создан не будет.
+-   `endpoint` — URL точки приема запроса в формате `path`. URL точки должен содержать путь к корневой директории на сервере для хранения данных, куда эти данные были загружены.
+
+Необязательные параметры:
+
+-   `min_bytes_for_seek` — минимальное количество байтов, которое используются для операций поиска вместо последовательного чтения. Значение по умолчанию: `1` Mb.
+-   `remote_fs_read_backoff_threashold` — максимальное время ожидания при попытке чтения данных с удаленного диска. Значение по умолчанию: `10000` секунд.
+-   `remote_fs_read_backoff_max_tries` — максимальное количество попыток чтения данных с задержкой. Значение по умолчанию: `5`.
+
+Если после выполнения запроса генерируется исключение `DB:Exception Unreachable URL`, то могут помочь настройки: [http_connection_timeout](../operations/settings/settings.md#http_connection_timeout), [http_receive_timeout](../operations/settings/settings.md#http_receive_timeout), [keep_alive_timeout](../operations/server-configuration-parameters/settings.md#keep-alive-timeout).
+
+Чтобы получить файлы для загрузки, выполните:
+`clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>` (`--metadata-path` может быть получен в результате запроса `SELECT data_paths FROM system.tables WHERE name = 'table_name'`).
+
+Файлы должны быть загружены по пути `<endpoint>/store/`, но конфигурация должна содержать только `endpoint`.
+
+Если URL-адрес недоступен при загрузке на диск, когда сервер запускает таблицы, то все ошибки будут пойманы. Если в этом случае были ошибки, то таблицы можно перезагрузить (сделать видимыми) с помощью `DETACH TABLE table_name` -> `ATTACH TABLE table_name`. Если метаданные были успешно загружены при запуске сервера, то таблицы будут доступны сразу.
+
+Чтобы ограничить количество попыток чтения данных во время одного HTTP-запроса, используйте настройку [http_max_single_read_retries](../operations/settings/settings.md#http-max-single-read-retries).
diff --git a/docs/ru/operations/system-tables/clusters.md b/docs/ru/operations/system-tables/clusters.md
index 6bfeb8aa818..832f5090ce5 100644
--- a/docs/ru/operations/system-tables/clusters.md
+++ b/docs/ru/operations/system-tables/clusters.md
@@ -68,4 +68,4 @@ estimated_recovery_time: 0
 -   [Настройка distributed_replica_error_cap](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
 -   [Настройка distributed_replica_error_half_life](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/clusters) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/operations/system_tables/clusters) <!--hide-->
diff --git a/docs/ru/operations/system-tables/crash-log.md b/docs/ru/operations/system-tables/crash-log.md
index d2b3ae5c6f5..7aaac343585 100644
--- a/docs/ru/operations/system-tables/crash-log.md
+++ b/docs/ru/operations/system-tables/crash-log.md
@@ -45,4 +45,4 @@ build_id:
 **См. также**
 -   Системная таблица [trace_log](../../operations/system-tables/trace_log.md)
 
-[Original article](https://clickhouse.tech/docs/en/operations/system-tables/crash-log)
+[Original article](https://clickhouse.com/docs/en/operations/system-tables/crash-log)
diff --git a/docs/ru/operations/system-tables/merge_tree_settings.md b/docs/ru/operations/system-tables/merge_tree_settings.md
new file mode 120000
index 00000000000..dbff2462867
--- /dev/null
+++ b/docs/ru/operations/system-tables/merge_tree_settings.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/merge_tree_settings.md
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/opentelemetry_span_log.md b/docs/ru/operations/system-tables/opentelemetry_span_log.md
index c421a602300..5c96f22b6c2 100644
--- a/docs/ru/operations/system-tables/opentelemetry_span_log.md
+++ b/docs/ru/operations/system-tables/opentelemetry_span_log.md
@@ -4,7 +4,7 @@
 
 Столбцы:
 
--   `trace_id` ([UUID](../../sql-reference/data-types/uuid.md) — идентификатор трассировки для выполненного запроса.
+-   `trace_id` ([UUID](../../sql-reference/data-types/uuid.md)) — идентификатор трассировки для выполненного запроса.
 
 -   `span_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — идентификатор `trace span`.
 
diff --git a/docs/ru/operations/system-tables/query_log.md b/docs/ru/operations/system-tables/query_log.md
index 7e98ddedcec..f7709d6f3da 100644
--- a/docs/ru/operations/system-tables/query_log.md
+++ b/docs/ru/operations/system-tables/query_log.md
@@ -24,6 +24,8 @@ ClickHouse не удаляет данные из таблица автомати
 2.  Если во время обработки запроса возникла ошибка, создаются два события с типами `QueryStart` и `ExceptionWhileProcessing`.
 3.  Если ошибка произошла ещё до запуска запроса, создается одно событие с типом `ExceptionBeforeStart`.
 
+Чтобы уменьшить количество запросов, регистрирующихся в таблице `query_log`, вы можете использовать настройку [log_queries_probability](../../operations/settings/settings.md#log-queries-probability).
+
 Столбцы:
 
 -   `type` ([Enum8](../../sql-reference/data-types/enum.md)) — тип события, произошедшего при выполнении запроса. Значения:
@@ -181,4 +183,4 @@ used_table_functions:                  []
 
 -   [system.query_thread_log](../../operations/system-tables/query_thread_log.md#system_tables-query_thread_log) — в этой таблице содержится информация о цепочке каждого выполненного запроса.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/operations/system_tables/query_log) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/operations/system_tables/query_log) <!--hide-->
diff --git a/docs/ru/operations/system-tables/query_thread_log.md b/docs/ru/operations/system-tables/query_thread_log.md
index 6eade8fc53f..219d468e222 100644
--- a/docs/ru/operations/system-tables/query_thread_log.md
+++ b/docs/ru/operations/system-tables/query_thread_log.md
@@ -11,6 +11,8 @@
 
 ClickHouse не удаляет данные из таблицы автоматически. Подробности в разделе [Введение](#system-tables-introduction).
 
+Чтобы уменьшить количество запросов, регистрирующихся в таблице `query_thread_log`, вы можете использовать настройку [log_queries_probability](../../operations/settings/settings.md#log-queries-probability).
+
 Столбцы:
 
 -   `event_date` ([Date](../../sql-reference/data-types/date.md)) — дата завершения выполнения запроса потоком.
diff --git a/docs/ru/operations/system-tables/query_views_log.md b/docs/ru/operations/system-tables/query_views_log.md
new file mode 120000
index 00000000000..f606e4108ca
--- /dev/null
+++ b/docs/ru/operations/system-tables/query_views_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_views_log.md
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/quotas.md b/docs/ru/operations/system-tables/quotas.md
index 3715bc89596..6c8b5a3eebf 100644
--- a/docs/ru/operations/system-tables/quotas.md
+++ b/docs/ru/operations/system-tables/quotas.md
@@ -11,7 +11,7 @@
     -   `[]` — Все пользователи используют одну и ту же квоту.
     -   `['user_name']` — Соединения с одинаковым именем пользователя используют одну и ту же квоту.
     -   `['ip_address']` — Соединения с одинаковым IP-адресом используют одну и ту же квоту.
-    -   `['client_key']` — Соединения с одинаковым ключом используют одну и ту же квоту. Ключ может быть явно задан клиентом. При использовании [clickhouse-client](../../interfaces/cli.md), передайте ключевое значение в параметре `--quota-key`, или используйте параметр `quota_key` файле настроек клиента. В случае использования HTTP интерфейса, используйте заголовок `X-ClickHouse-Quota`.
+    -   `['client_key']` — Соединения с одинаковым ключом используют одну и ту же квоту. Ключ может быть явно задан клиентом. При использовании [clickhouse-client](../../interfaces/cli.md), передайте ключевое значение в параметре `--quota_key`, или используйте параметр `quota_key` файле настроек клиента. В случае использования HTTP интерфейса, используйте заголовок `X-ClickHouse-Quota`.
     -   `['user_name', 'client_key']` — Соединения с одинаковым ключом используют одну и ту же квоту. Если ключ не предоставлен клиентом, то квота отслеживается для `user_name`.
     -   `['client_key', 'ip_address']` — Соединения с одинаковым ключом используют одну и ту же квоту. Если ключ не предоставлен клиентом, то квота отслеживается для `ip_address`.
 -   `durations` ([Array](../../sql-reference/data-types/array.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Длины временных интервалов для расчета потребления ресурсов, в секундах.
diff --git a/docs/ru/operations/system-tables/replicas.md b/docs/ru/operations/system-tables/replicas.md
index 7879ee707a4..8f86f94dedd 100644
--- a/docs/ru/operations/system-tables/replicas.md
+++ b/docs/ru/operations/system-tables/replicas.md
@@ -8,43 +8,48 @@
 ``` sql
 SELECT *
 FROM system.replicas
-WHERE table = 'visits'
+WHERE table = 'test_table'
 FORMAT Vertical
 ```
 
 ``` text
+Query id: dc6dcbcb-dc28-4df9-ae27-4354f5b3b13e
+
 Row 1:
-──────
-database:                   merge
-table:                      visits
-engine:                     ReplicatedCollapsingMergeTree
-is_leader:                  1
-can_become_leader:          1
-is_readonly:                0
-is_session_expired:         0
-future_parts:               1
-parts_to_check:             0
-zookeeper_path:             /clickhouse/tables/01-06/visits
-replica_name:               example01-06-1.yandex.ru
-replica_path:               /clickhouse/tables/01-06/visits/replicas/example01-06-1.yandex.ru
-columns_version:            9
-queue_size:                 1
-inserts_in_queue:           0
-merges_in_queue:            1
-part_mutations_in_queue:    0
-queue_oldest_time:          2020-02-20 08:34:30
-inserts_oldest_time:        0000-00-00 00:00:00
-merges_oldest_time:         2020-02-20 08:34:30
-part_mutations_oldest_time: 0000-00-00 00:00:00
-oldest_part_to_get:
-oldest_part_to_merge_to:    20200220_20284_20840_7
-oldest_part_to_mutate_to:
-log_max_index:              596273
-log_pointer:                596274
-last_queue_update:          2020-02-20 08:34:32
-absolute_delay:             0
-total_replicas:             2
-active_replicas:            2
+───────
+database:                    db
+table:                       test_table
+engine:                      ReplicatedMergeTree
+is_leader:                   1
+can_become_leader:           1
+is_readonly:                 0
+is_session_expired:          0
+future_parts:                0
+parts_to_check:              0
+zookeeper_path:              /test/test_table
+replica_name:                r1
+replica_path:                /test/test_table/replicas/r1
+columns_version:             -1
+queue_size:                  27
+inserts_in_queue:            27
+merges_in_queue:             0
+part_mutations_in_queue:     0
+queue_oldest_time:           2021-10-12 14:48:48
+inserts_oldest_time:         2021-10-12 14:48:48
+merges_oldest_time:          1970-01-01 03:00:00
+part_mutations_oldest_time:  1970-01-01 03:00:00
+oldest_part_to_get:          1_17_17_0
+oldest_part_to_merge_to:     
+oldest_part_to_mutate_to:    
+log_max_index:               206
+log_pointer:                 207
+last_queue_update:           2021-10-12 14:50:08
+absolute_delay:              99
+total_replicas:              5
+active_replicas:             5
+last_queue_update_exception: 
+zookeeper_exception:         
+replica_is_active:           {'r1':1,'r2':1}
 ```
 
 Столбцы:
@@ -78,10 +83,13 @@ active_replicas:            2
 
 -   `log_max_index` (`UInt64`) - максимальный номер записи в общем логе действий.
 -   `log_pointer` (`UInt64`) - максимальный номер записи из общего лога действий, которую реплика скопировала в свою очередь для выполнения, плюс единица. Если log_pointer сильно меньше log_max_index, значит что-то не так.
--   `last_queue_update` (`DateTime`) - When the queue was updated last time.
--   `absolute_delay` (`UInt64`) - How big lag in seconds the current replica has.
+-   `last_queue_update` (`DateTime`) - время последнего обновления запроса.
+-   `absolute_delay` (`UInt64`) - задержка (в секундах) для текущей реплики.
 -   `total_replicas` (`UInt8`) - общее число известных реплик этой таблицы.
 -   `active_replicas` (`UInt8`) - число реплик этой таблицы, имеющих сессию в ZK; то есть, число работающих реплик.
+-   `last_queue_update_exception` (`String`) - если в очереди есть битые записи. Особенно важно, когда в ClickHouse нарушается обратная совместимость между версиями, а записи журнала, сделанные более новыми версиями, не могут быть проанализированы старыми версиями.
+-   `zookeeper_exception` (`String`) - последнее сообщение об исключении. Появляется, если ошибка произошла при получении информации из ZooKeeper.
+-   `replica_is_active` ([Map(String, UInt8)](../../sql-reference/data-types/map.md)) — соответствие между именем реплики и признаком активности реплики.
 
 Если запрашивать все столбцы, то таблица может работать слегка медленно, так как на каждую строчку делается несколько чтений из ZK.
 Если не запрашивать последние 4 столбца (log_max_index, log_pointer, total_replicas, active_replicas), то таблица работает быстро.
diff --git a/docs/ru/operations/system-tables/time_zones.md b/docs/ru/operations/system-tables/time_zones.md
new file mode 120000
index 00000000000..d7b0f07d326
--- /dev/null
+++ b/docs/ru/operations/system-tables/time_zones.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/time_zones.md
\ No newline at end of file
diff --git a/docs/ru/operations/system-tables/zookeeper_log.md b/docs/ru/operations/system-tables/zookeeper_log.md
new file mode 100644
index 00000000000..16f02cb0489
--- /dev/null
+++ b/docs/ru/operations/system-tables/zookeeper_log.md
@@ -0,0 +1,129 @@
+# system.zookeeper_log {#system-zookeeper_log}
+
+Эта таблица содержит информацию о параметрах запроса к серверу ZooKeeper и ответа от него.
+
+Для запросов заполняются только столбцы с параметрами запроса, а остальные столбцы заполняются значениями по умолчанию (`0` или `NULL`). Когда поступает ответ, данные добавляются в столбцы с параметрами ответа на запрос.
+
+Столбцы с параметрами запроса:
+
+-   `type` ([Enum](../../sql-reference/data-types/enum.md)) — тип события в клиенте ZooKeeper. Может иметь одно из следующих значений:
+    -   `Request` — запрос отправлен.
+    -   `Response` — ответ получен.
+    -   `Finalize` — соединение разорвано, ответ не получен.
+-   `event_date` ([Date](../../sql-reference/data-types/date.md)) — дата, когда произошло событие.
+-   `event_time` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — дата и время, когда произошло событие.
+-   `address` ([IPv6](../../sql-reference/data-types/domains/ipv6.md)) — IP адрес сервера ZooKeeper, с которого был сделан запрос.
+-   `port` ([UInt16](../../sql-reference/data-types/int-uint.md)) — порт сервера ZooKeeper, с которого был сделан запрос.
+-   `session_id` ([Int64](../../sql-reference/data-types/int-uint.md)) — идентификатор сессии, который сервер ZooKeeper создает для каждого соединения.
+-   `xid` ([Int32](../../sql-reference/data-types/int-uint.md)) — идентификатор запроса внутри сессии. Обычно это последовательный номер запроса, одинаковый у строки запроса и у парной строки `response`/`finalize`.
+-   `has_watch` ([UInt8](../../sql-reference/data-types/int-uint.md)) — установлен ли запрос [watch](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#ch_zkWatches).
+-   `op_num` ([Enum](../../sql-reference/data-types/enum.md)) — тип запроса или ответа на запрос.
+-   `path` ([String](../../sql-reference/data-types/string.md)) — путь к узлу ZooKeeper, указанный в запросе. Пустая строка, если запрос не требует указания пути.
+-   `data` ([String](../../sql-reference/data-types/string.md)) — данные, записанные на узле ZooKeeper (для запросов `SET` и `CREATE` — что запрос хотел записать, для ответа на запрос `GET` — что было прочитано), или пустая строка.
+-   `is_ephemeral` ([UInt8](../../sql-reference/data-types/int-uint.md)) — создается ли узел ZooKeeper как [ephemeral](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Ephemeral+Nodes).
+-   `is_sequential` ([UInt8](../../sql-reference/data-types/int-uint.md)) — создается ли узел ZooKeeper как [sequential](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html#Sequence+Nodes+--+Unique+Naming).
+-   `version` ([Nullable(Int32)](../../sql-reference/data-types/nullable.md)) — версия узла ZooKeeper, которую запрос ожидает увидеть при выполнении. Поддерживается для запросов `CHECK`, `SET`, `REMOVE` (`-1` — запрос не проверяет версию, `NULL` — для других запросов, которые не поддерживают проверку версии).
+-   `requests_size` ([UInt32](../../sql-reference/data-types/int-uint.md)) — количество запросов, включенных в мультизапрос (это специальный запрос, который состоит из нескольких последовательных обычных запросов, выполняющихся атомарно). Все запросы, включенные в мультизапрос, имеют одинаковый `xid`.
+-   `request_idx` ([UInt32](../../sql-reference/data-types/int-uint.md)) — номер запроса, включенного в мультизапрос (`0` — для мультизапроса, далее по порядку с `1`).
+
+Столбцы с параметрами ответа на запрос:
+
+-   `zxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — идентификатор транзакции в ZooKeeper. Последовательный номер, выданный сервером ZooKeeper в ответе на успешно выполненный запрос (`0` — запрос не был выполнен, возвращена ошибка или клиент ZooKeeper не знает, был ли выполнен запрос).
+-   `error` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — код ошибки. Может иметь много значений, здесь приведены только некоторые из них:
+    -   `ZOK` — запрос успешно выполнен.
+    -   `ZCONNECTIONLOSS` — соединение разорвано.
+    -   `ZOPERATIONTIMEOUT` — истекло время ожидания выполнения запроса.
+	-   `ZSESSIONEXPIRED` — истекло время сессии.
+    -   `NULL` — выполнен запрос.
+-   `watch_type` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — тип события `watch` (для ответов на запрос при `op_num` = `Watch`), для остальных ответов: `NULL`.
+-   `watch_state` ([Nullable(Enum)](../../sql-reference/data-types/nullable.md)) — статус события `watch` (для ответов на запрос при `op_num` = `Watch`), для остальных ответов: `NULL`.
+-   `path_created` ([String](../../sql-reference/data-types/string.md)) — путь к созданному узлу ZooKeeper (для ответов на запрос `CREATE`). Может отличаться от `path`, если узел создается как `sequential`.
+-   `stat_czxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — идентификатор транзакции, в результате которой был создан узел ZooKeeper.
+-   `stat_mzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — идентификатор транзакции, которая последней модифицировала узел ZooKeeper.
+-   `stat_pzxid` ([Int64](../../sql-reference/data-types/int-uint.md)) — идентификатор транзакции, которая последней модифицировала дочерние узлы ZooKeeper.
+-   `stat_version` ([Int32](../../sql-reference/data-types/int-uint.md)) — количество изменений в данных узла ZooKeeper.
+-   `stat_cversion` ([Int32](../../sql-reference/data-types/int-uint.md)) — количество изменений в дочерних узлах ZooKeeper.
+-   `stat_dataLength` ([Int32](../../sql-reference/data-types/int-uint.md)) — длина поля данных узла ZooKeeper.
+-   `stat_numChildren` ([Int32](../../sql-reference/data-types/int-uint.md)) — количество дочерних узлов ZooKeeper.
+-   `children` ([Array(String)](../../sql-reference/data-types/array.md)) — список дочерних узлов ZooKeeper (для ответов на запрос `LIST`).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT * FROM system.zookeeper_log WHERE (session_id = '106662742089334927') AND (xid = '10858') FORMAT Vertical;
+```
+
+Результат:
+
+``` text
+Row 1:
+──────
+type:             Request
+event_date:       2021-08-09
+event_time:       2021-08-09 21:38:30.291792
+address:          ::
+port:             2181
+session_id:       106662742089334927
+xid:              10858
+has_watch:        1
+op_num:           List
+path:             /clickhouse/task_queue/ddl
+data:             
+is_ephemeral:     0
+is_sequential:    0
+version:          ᴺᵁᴸᴸ
+requests_size:    0
+request_idx:      0
+zxid:             0
+error:            ᴺᵁᴸᴸ
+watch_type:       ᴺᵁᴸᴸ
+watch_state:      ᴺᵁᴸᴸ
+path_created:     
+stat_czxid:       0
+stat_mzxid:       0
+stat_pzxid:       0
+stat_version:     0
+stat_cversion:    0
+stat_dataLength:  0
+stat_numChildren: 0
+children:         []
+
+Row 2:
+──────
+type:             Response
+event_date:       2021-08-09
+event_time:       2021-08-09 21:38:30.292086
+address:          ::
+port:             2181
+session_id:       106662742089334927
+xid:              10858
+has_watch:        1
+op_num:           List
+path:             /clickhouse/task_queue/ddl
+data:             
+is_ephemeral:     0
+is_sequential:    0
+version:          ᴺᵁᴸᴸ
+requests_size:    0
+request_idx:      0
+zxid:             16926267
+error:            ZOK
+watch_type:       ᴺᵁᴸᴸ
+watch_state:      ᴺᵁᴸᴸ
+path_created:     
+stat_czxid:       16925469
+stat_mzxid:       16925469
+stat_pzxid:       16926179
+stat_version:     0
+stat_cversion:    7
+stat_dataLength:  0
+stat_numChildren: 7
+children:         ['query-0000000006','query-0000000005','query-0000000004','query-0000000003','query-0000000002','query-0000000001','query-0000000000']
+```
+
+**См. также**
+
+-   [ZooKeeper](../../operations/tips.md#zookeeper)
+-   [Руководство по ZooKeeper](https://zookeeper.apache.org/doc/r3.3.3/zookeeperProgrammers.html)
diff --git a/docs/ru/operations/utilities/clickhouse-copier.md b/docs/ru/operations/utilities/clickhouse-copier.md
index f1bde2be23d..7e1364f9ee1 100644
--- a/docs/ru/operations/utilities/clickhouse-copier.md
+++ b/docs/ru/operations/utilities/clickhouse-copier.md
@@ -70,7 +70,7 @@ $ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --bas
 		    <!--
                 source cluster & destination clusters accept exactly the same
                 parameters as parameters for the usual Distributed table
-                see https://clickhouse.tech/docs/ru/engines/table-engines/special/distributed/
+                see https://clickhouse.com/docs/ru/engines/table-engines/special/distributed/
             -->
             <shard>
                 <internal_replication>false</internal_replication>
diff --git a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
index b1eefc3fc16..b3bb611e28c 100644
--- a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
@@ -172,7 +172,7 @@ SELECT sequenceMatch('(?1)(?2)')(time, number = 1, number = 2, number = 4) FROM
 
 ## sequenceCount(pattern)(time, cond1, cond2, …) {#function-sequencecount}
 
-Вычисляет количество цепочек событий, соответствующих шаблону. Функция обнаруживает только непересекающиеся цепочки событий. Она начитает искать следующую цепочку только после того, как полностью совпала текущая цепочка событий.
+Вычисляет количество цепочек событий, соответствующих шаблону. Функция обнаруживает только непересекающиеся цепочки событий. Она начинает искать следующую цепочку только после того, как полностью совпала текущая цепочка событий.
 
 !!! warning "Предупреждение"
     События, произошедшие в одну и ту же секунду, располагаются в последовательности в неопределенном порядке, что может повлиять на результат работы функции.
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/argmax.md b/docs/ru/sql-reference/aggregate-functions/reference/argmax.md
index 71289423035..bdf7b1d1df6 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/argmax.md
@@ -6,20 +6,12 @@ toc_priority: 106
 
 Вычисляет значение `arg` при максимальном значении `val`. Если есть несколько разных значений `arg` для максимальных значений `val`, возвращает первое попавшееся из таких значений.
 
-Если функции передан кортеж, то будет выведен кортеж с максимальным значением `val`. Удобно использовать для работы с [SimpleAggregateFunction](../../../sql-reference/data-types/simpleaggregatefunction.md).
-
 **Синтаксис**
 
 ``` sql
 argMax(arg, val)
 ```
 
-или
-
-``` sql
-argMax(tuple(arg, val))
-```
-
 **Аргументы**
 
 -   `arg` — аргумент.
@@ -31,12 +23,6 @@ argMax(tuple(arg, val))
 
 Тип: соответствует типу `arg`.
 
-Если передан кортеж:
-
--   кортеж `(arg, val)` c максимальным значением `val` и соответствующим ему `arg`.
-
-Тип: [Tuple](../../../sql-reference/data-types/tuple.md).
-
 **Пример**
 
 Исходная таблица:
@@ -52,14 +38,14 @@ argMax(tuple(arg, val))
 Запрос:
 
 ``` sql
-SELECT argMax(user, salary), argMax(tuple(user, salary), salary), argMax(tuple(user, salary)) FROM salary;
+SELECT argMax(user, salary), argMax(tuple(user, salary), salary) FROM salary;
 ```
 
 Результат:
 
 ``` text
-┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┬─argMax(tuple(user, salary))─┐
-│ director             │ ('director',5000)                   │ ('director',5000)           │
-└──────────────────────┴─────────────────────────────────────┴─────────────────────────────┘
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┐
+│ director             │ ('director',5000)                   │
+└──────────────────────┴─────────────────────────────────────┘
 ```
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/argmin.md b/docs/ru/sql-reference/aggregate-functions/reference/argmin.md
index 4ee78a73a84..dd923061943 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/argmin.md
@@ -6,20 +6,12 @@ toc_priority: 105
 
 Вычисляет значение `arg` при минимальном значении `val`. Если есть несколько разных значений `arg` для минимальных значений `val`, возвращает первое попавшееся из таких значений.
 
-Если функции передан кортеж, то будет выведен кортеж с минимальным значением `val`. Удобно использовать для работы с [SimpleAggregateFunction](../../../sql-reference/data-types/simpleaggregatefunction.md).
-
 **Синтаксис**
 
 ``` sql
 argMin(arg, val)
 ```
 
-или
-
-``` sql
-argMin(tuple(arg, val))
-```
-
 **Аргументы**
 
 -   `arg` — аргумент.
@@ -31,12 +23,6 @@ argMin(tuple(arg, val))
 
 Тип: соответствует типу `arg`.
 
-Если передан кортеж:
-
--   Кортеж `(arg, val)` c минимальным значением `val` и соответствующим ему `arg`.
-
-Тип: [Tuple](../../../sql-reference/data-types/tuple.md).
-
 **Пример**
 
 Исходная таблица:
@@ -52,14 +38,14 @@ argMin(tuple(arg, val))
 Запрос:
 
 ``` sql
-SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary;
+SELECT argMin(user, salary) FROM salary;
 ```
 
 Результат:
 
 ``` text
-┌─argMin(user, salary)─┬─argMin(tuple(user, salary))─┐
-│ worker               │ ('worker',1000)             │
-└──────────────────────┴─────────────────────────────┘
+┌─argMin(user, salary)─┐
+│ worker               │
+└──────────────────────┘
 ```
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md b/docs/ru/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
new file mode 120000
index 00000000000..22a84e3e5d2
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/categoricalinformationvalue.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/count.md b/docs/ru/sql-reference/aggregate-functions/reference/count.md
index 7018f51763a..8411cccd084 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/count.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/count.md
@@ -29,7 +29,7 @@ ClickHouse поддерживает следующие виды синтакси
 
 ClickHouse поддерживает синтаксис `COUNT(DISTINCT ...)`. Поведение этой конструкции зависит от настройки [count_distinct_implementation](../../../operations/settings/settings.md#settings-count_distinct_implementation). Она определяет, какая из функций [uniq\*](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) используется для выполнения операции. По умолчанию — функция [uniqExact](../../../sql-reference/aggregate-functions/reference/uniqexact.md#agg_function-uniqexact).
 
-Запрос `SELECT count() FROM table` не оптимизирован, поскольку количество записей в таблице не хранится отдельно. Он выбирает небольшой столбец из таблицы и подсчитывает количество значений в нём.
+Запрос `SELECT count() FROM table` оптимизирован по умолчанию с использованием метаданных из MergeTree. Если вы хотите управлять безопасностью на уровне строк, отключите оптимизацию при помощи настройки [optimize_trivial_count_query](../../../operations/settings/settings.md#optimize-trivial-count-query).
 
 При этом запрос `SELECT count(nullable_column) FROM table` может быть оптимизирован включением настройки [optimize_functions_to_subcolumns](../../../operations/settings/settings.md#optimize-functions-to-subcolumns). При `optimize_functions_to_subcolumns = 1` функция читает только подстолбец [null](../../../sql-reference/data-types/nullable.md#finding-null) вместо чтения всех данных столбца. Запрос `SELECT count(n) FROM table` преобразуется к запросу `SELECT sum(NOT n.null) FROM table`.
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/entropy.md b/docs/ru/sql-reference/aggregate-functions/reference/entropy.md
new file mode 100644
index 00000000000..b5abe00fd96
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/entropy.md
@@ -0,0 +1,43 @@
+---
+toc_priority: 302
+---
+
+# entropy {#entropy}
+
+Вычисляет [информационную энтропию](https://ru.wikipedia.org/wiki/%D0%98%D0%BD%D1%84%D0%BE%D1%80%D0%BC%D0%B0%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D0%B0%D1%8F_%D1%8D%D0%BD%D1%82%D1%80%D0%BE%D0%BF%D0%B8%D1%8F) столбца данных.
+
+**Синтаксис**
+
+``` sql
+entropy(val)
+```
+
+**Аргументы**
+
+-   `val` — столбец значений любого типа
+
+**Возвращаемое значение**
+
+-   Информационная энтропия.
+
+Тип: [Float64](../../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE entropy (`vals` UInt32,`strings` String) ENGINE = Memory;
+
+INSERT INTO entropy VALUES (1, 'A'), (1, 'A'), (1,'A'), (1,'A'), (2,'B'), (2,'B'), (2,'C'), (2,'D');
+
+SELECT entropy(vals), entropy(strings) FROM entropy;
+```
+
+Результат:
+
+``` text
+┌─entropy(vals)─┬─entropy(strings)─┐
+│             1 │             1.75 │
+└───────────────┴──────────────────┘
+```
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapand.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapand.md
new file mode 120000
index 00000000000..861ac2c3dd3
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapand.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapand.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapor.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapor.md
new file mode 120000
index 00000000000..0fcb851d0a4
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapor.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapxor.md b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapxor.md
new file mode 120000
index 00000000000..13c79b37200
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/groupbitmapxor.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/groupbitmapxor.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/index.md b/docs/ru/sql-reference/aggregate-functions/reference/index.md
index b2172e1e70e..c372a0713ca 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/index.md
@@ -61,6 +61,8 @@ toc_hidden: true
 -   [quantileDeterministic](../../../sql-reference/aggregate-functions/reference/quantiledeterministic.md)
 -   [quantileTDigest](../../../sql-reference/aggregate-functions/reference/quantiletdigest.md)
 -   [quantileTDigestWeighted](../../../sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
+-   [quantileBFloat16](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
+-   [quantileBFloat16Weighted](../../../sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
 -   [simpleLinearRegression](../../../sql-reference/aggregate-functions/reference/simplelinearregression.md)
 -   [stochasticLinearRegression](../../../sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
 -   [stochasticLogisticRegression](../../../sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md
index f8622e3fd05..8f240a3a009 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -58,6 +58,10 @@ SELECT quantileBFloat16(0.75)(a), quantileBFloat16(0.75)(b) FROM example_table;
 ```
 Обратите внимание, что все числа с плавающей точкой в примере были округлены до 1.0 при преобразовании к `bfloat16`.
 
+# quantileBFloat16Weighted {#quantilebfloat16weighted}
+
+Версия функции `quantileBFloat16`, которая учитывает вес каждого элемента последовательности.
+
 **См. также**
 
 -   [median](../../../sql-reference/aggregate-functions/reference/median.md#median)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
index 6da0f6caacd..85524c7ede3 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -50,7 +50,7 @@ AS state FROM train_data;
 
 После сохранения состояния в таблице мы можем использовать его несколько раз для прогнозирования или смёржить с другими состояниями и создать новые, улучшенные модели.
 
-``` sql
+```sql
 WITH (SELECT state FROM your_model) AS model SELECT
 evalMLMethod(model, param1, param2) FROM test_data
 ```
@@ -65,9 +65,9 @@ evalMLMethod(model, param1, param2) FROM test_data
 
 <!-- -->
 
-    ``` sql
-    SELECT state1 + state2 FROM your_models
-    ```
+```sql
+SELECT state1 + state2 FROM your_models
+```
 
 где таблица `your_models` содержит обе модели. Запрос вернёт новый объект `AggregateFunctionState`.
 
@@ -75,9 +75,9 @@ evalMLMethod(model, param1, param2) FROM test_data
 
 <!-- -->
 
-    ``` sql
-    SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data
-    ```
+```sql
+SELECT stochasticLinearRegression(0.01)(target, param1, param2) FROM train_data
+```
 
 Подобный запрос строит модель и возвращает её веса, отвечающие параметрам моделей и смещение. Таким образом, в приведенном выше примере запрос вернет столбец с тремя значениями.
 
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md b/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
index 5a8f93209cf..ac721577a9a 100644
--- a/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
+++ b/docs/ru/sql-reference/aggregate-functions/reference/sumcount.md
@@ -43,4 +43,4 @@ SELECT sumCount(x) from s_table;
 
 **Смотрите также**
 
-- Настройка [optimize_fuse_sum_count_avg](../../../operations/settings/settings.md#optimize_fuse_sum_count_avg)
+- Настройка [optimize_syntax_fuse_functions](../../../operations/settings/settings.md#optimize_syntax_fuse_functions)
diff --git a/docs/ru/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/ru/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 120000
index 00000000000..ac61a28677f
--- /dev/null
+++ b/docs/ru/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
\ No newline at end of file
diff --git a/docs/ru/sql-reference/data-types/date.md b/docs/ru/sql-reference/data-types/date.md
index 50508de96a3..17b4ec99d9a 100644
--- a/docs/ru/sql-reference/data-types/date.md
+++ b/docs/ru/sql-reference/data-types/date.md
@@ -9,9 +9,9 @@ toc_title: Date
 
 Дата хранится без учёта часового пояса.
 
-## Примеры {#examples}
+**Пример**
 
-**1.** Создание таблицы и добавление в неё данных:
+Создание таблицы и добавление в неё данных:
 
 ``` sql
 CREATE TABLE dt
@@ -24,9 +24,6 @@ ENGINE = TinyLog;
 
 ``` sql
 INSERT INTO dt Values (1546300800, 1), ('2019-01-01', 2);
-```
-
-``` sql
 SELECT * FROM dt;
 ```
 
@@ -37,7 +34,7 @@ SELECT * FROM dt;
 └────────────┴──────────┘
 ```
 
-## Смотрите также {#see-also}
+**См. также**
 
 -   [Функции для работы с датой и временем](../../sql-reference/functions/date-time-functions.md)
 -   [Операторы для работы с датой и временем](../../sql-reference/operators/index.md#operators-datetime)
diff --git a/docs/ru/sql-reference/data-types/date32.md b/docs/ru/sql-reference/data-types/date32.md
new file mode 100644
index 00000000000..a335eba8e80
--- /dev/null
+++ b/docs/ru/sql-reference/data-types/date32.md
@@ -0,0 +1,40 @@
+---
+toc_priority: 48
+toc_title: Date32
+---
+
+# Date32 {#data_type-datetime32}
+
+Дата. Поддерживается такой же диапазон дат, как для типа [Datetime64](../../sql-reference/data-types/datetime64.md). Значение хранится в четырех байтах и соответствует числу дней с 1925-01-01 по 2283-11-11. 
+
+**Пример**
+
+Создание таблицы со столбцом типа `Date32`и добавление в нее данных:
+
+``` sql
+CREATE TABLE new
+(
+    `timestamp` Date32,
+    `event_id` UInt8
+)
+ENGINE = TinyLog;
+```
+
+``` sql
+INSERT INTO new VALUES (4102444800, 1), ('2100-01-01', 2);
+SELECT * FROM new;
+```
+
+``` text
+┌──timestamp─┬─event_id─┐
+│ 2100-01-01 │        1 │
+│ 2100-01-01 │        2 │
+└────────────┴──────────┘
+```
+
+**См. также**
+
+-   [toDate32](../../sql-reference/functions/type-conversion-functions.md#todate32)
+-   [toDate32OrZero](../../sql-reference/functions/type-conversion-functions.md#todate32-or-zero)
+-   [toDate32OrNull](../../sql-reference/functions/type-conversion-functions.md#todate32-or-null) 
+
diff --git a/docs/ru/sql-reference/data-types/datetime64.md b/docs/ru/sql-reference/data-types/datetime64.md
index 3a08da75bb7..869543dbbaf 100644
--- a/docs/ru/sql-reference/data-types/datetime64.md
+++ b/docs/ru/sql-reference/data-types/datetime64.md
@@ -7,7 +7,8 @@ toc_title: DateTime64
 
 Позволяет хранить момент времени, который может быть представлен как календарная дата и время, с заданной суб-секундной точностью.
 
-Размер тика (точность, precision): 10<sup>-precision</sup> секунд, где precision - целочисленный параметр.
+Размер тика (точность, precision): 10<sup>-precision</sup> секунд, где precision - целочисленный параметр. Возможные значения: [ 0 : 9 ].
+Обычно используются - 3 (миллисекунды), 6 (микросекунды), 9 (наносекунды).
 
 **Синтаксис:**
 
@@ -17,7 +18,7 @@ DateTime64(precision, [timezone])
 
 Данные хранятся в виде количества ‘тиков’, прошедших с момента начала эпохи (1970-01-01 00:00:00 UTC), в Int64. Размер тика определяется параметром precision. Дополнительно, тип `DateTime64` позволяет хранить часовой пояс, единый для всей колонки, который влияет на то, как будут отображаться значения типа `DateTime64` в текстовом виде и как будут парситься значения заданные в виде строк (‘2020-01-01 05:00:01.000’). Часовой пояс не хранится в строках таблицы (выборки), а хранится в метаданных колонки. Подробнее см. [DateTime](datetime.md).
 
-Поддерживаются значения от 1 января 1925 г. и до 31 декабря 2283 г.
+Поддерживаются значения от 1 января 1925 г. и до 11 ноября 2283 г.
 
 ## Примеры {#examples}
 
diff --git a/docs/ru/sql-reference/data-types/domains/ipv4.md b/docs/ru/sql-reference/data-types/domains/ipv4.md
index af5f8261fae..2cab40ab38d 100644
--- a/docs/ru/sql-reference/data-types/domains/ipv4.md
+++ b/docs/ru/sql-reference/data-types/domains/ipv4.md
@@ -31,16 +31,16 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 `IPv4` поддерживает вставку в виде строк с текстовым представлением IPv4 адреса:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬───────────from─┐
-│ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+│ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
 │ https://wikipedia.org              │ 116.253.40.133 │
-│ https://clickhouse.tech          │ 183.247.232.58 │
+│ https://clickhouse.com          │ 183.247.232.58 │
 └────────────────────────────────────┴────────────────┘
 ```
 
diff --git a/docs/ru/sql-reference/data-types/domains/ipv6.md b/docs/ru/sql-reference/data-types/domains/ipv6.md
index 5b3c17feceb..96e5e817642 100644
--- a/docs/ru/sql-reference/data-types/domains/ipv6.md
+++ b/docs/ru/sql-reference/data-types/domains/ipv6.md
@@ -31,15 +31,15 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 `IPv6` поддерживает вставку в виде строк с текстовым представлением IPv6 адреса:
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
 ``` text
 ┌─url────────────────────────────────┬─from──────────────────────────┐
-│ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-│ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+│ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+│ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
 │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
 └────────────────────────────────────┴───────────────────────────────┘
 ```
diff --git a/docs/ru/sql-reference/data-types/lowcardinality.md b/docs/ru/sql-reference/data-types/lowcardinality.md
index 49ba5db0169..850c31a0b3b 100644
--- a/docs/ru/sql-reference/data-types/lowcardinality.md
+++ b/docs/ru/sql-reference/data-types/lowcardinality.md
@@ -55,6 +55,5 @@ ORDER BY id
 
 ## Смотрите также
 
--   [A Magical Mystery Tour of the LowCardinality Data Type](https://www.altinity.com/blog/2019/3/27/low-cardinality).
 -   [Reducing Clickhouse Storage Cost with the Low Cardinality Type – Lessons from an Instana Engineer](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/).
--   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/yandex/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
+-   [String Optimization (video presentation in Russian)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [Slides in English](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
diff --git a/docs/ru/sql-reference/data-types/map.md b/docs/ru/sql-reference/data-types/map.md
index 32eb4a80b3e..8fa742a0d03 100644
--- a/docs/ru/sql-reference/data-types/map.md
+++ b/docs/ru/sql-reference/data-types/map.md
@@ -94,4 +94,4 @@ SELECT a.values FROM t_map;
 -   функция [map()](../../sql-reference/functions/tuple-map-functions.md#function-map)
 -   функция [CAST()](../../sql-reference/functions/type-conversion-functions.md#type_conversion_function-cast)
 
-[Original article](https://clickhouse.tech/docs/ru/data-types/map/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/data-types/map/) <!--hide-->
diff --git a/docs/ru/sql-reference/data-types/nested-data-structures/nested.md b/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
index 718fe77ae95..db957e57502 100644
--- a/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
+++ b/docs/ru/sql-reference/data-types/nested-data-structures/nested.md
@@ -1,4 +1,6 @@
-# Nested(Name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
+# Nested {#nested}
+
+## Nested(Name1 Type1, Name2 Type2, …) {#nestedname1-type1-name2-type2}
 
 Вложенная структура данных - это как будто вложенная таблица. Параметры вложенной структуры данных - имена и типы столбцов, указываются так же, как у запроса CREATE. Каждой строке таблицы может соответствовать произвольное количество строк вложенной структуры данных.
 
@@ -95,4 +97,3 @@ LIMIT 10
 При запросе DESCRIBE, столбцы вложенной структуры данных перечисляются так же по отдельности.
 
 Работоспособность запроса ALTER для элементов вложенных структур данных, является сильно ограниченной.
-
diff --git a/docs/ru/sql-reference/data-types/simpleaggregatefunction.md b/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
index 7b81c577762..8f47bd0902b 100644
--- a/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/ru/sql-reference/data-types/simpleaggregatefunction.md
@@ -21,8 +21,6 @@
 -   [`sumMap`](../../sql-reference/aggregate-functions/reference/summap.md#agg_functions-summap)
 -   [`minMap`](../../sql-reference/aggregate-functions/reference/minmap.md#agg_functions-minmap)
 -   [`maxMap`](../../sql-reference/aggregate-functions/reference/maxmap.md#agg_functions-maxmap)
--   [`argMin`](../../sql-reference/aggregate-functions/reference/argmin.md)
--   [`argMax`](../../sql-reference/aggregate-functions/reference/argmax.md)
 
 !!! note "Примечание"
     Значения `SimpleAggregateFunction(func, Type)` отображаются и хранятся так же, как и `Type`, поэтому комбинаторы [-Merge](../../sql-reference/aggregate-functions/combinators.md#aggregate_functions_combinators-merge) и [-State](../../sql-reference/aggregate-functions/combinators.md#agg-functions-combinator-state) не требуются.
diff --git a/docs/ru/sql-reference/data-types/uuid.md b/docs/ru/sql-reference/data-types/uuid.md
index b780190f6f4..002573a7455 100644
--- a/docs/ru/sql-reference/data-types/uuid.md
+++ b/docs/ru/sql-reference/data-types/uuid.md
@@ -75,4 +75,4 @@ SELECT * FROM t_uuid
 
 Тип данных UUID не поддерживается арифметическими операциями (например, [abs](../../sql-reference/data-types/uuid.md#arithm_func-abs)) или агрегатными функциями, такими как [sum](../../sql-reference/data-types/uuid.md#agg_function-sum) и [avg](../../sql-reference/data-types/uuid.md#agg_function-avg).
 
-[Original article](https://clickhouse.tech/docs/en/data_types/uuid/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/data_types/uuid/) <!--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 f1f4a8fae18..647e2c5f5a7 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
@@ -53,13 +53,17 @@ LAYOUT(LAYOUT_TYPE(param value)) -- layout settings
 -   [flat](#flat)
 -   [hashed](#dicts-external_dicts_dict_layout-hashed)
 -   [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed)
--   [cache](#cache)
--   [ssd_cache](#ssd-cache)
--   [ssd_complex_key_cache](#complex-key-ssd-cache)
--   [direct](#direct)
--   [range_hashed](#range-hashed)
 -   [complex_key_hashed](#complex-key-hashed)
+-   [complex_key_sparse_hashed](#complex-key-sparse-hashed)
+-   [hashed_array](#dicts-external_dicts_dict_layout-hashed-array)
+-   [complex_key_hashed_array](#complex-key-hashed-array)
+-   [range_hashed](#range-hashed)
+-   [complex_key_range_hashed](#complex-key-range-hashed)
+-   [cache](#cache)
 -   [complex_key_cache](#complex-key-cache)
+-   [ssd_cache](#ssd-cache)
+-   [complex_key_ssd_cache](#complex-key-ssd-cache)
+-   [direct](#direct)
 -   [complex_key_direct](#complex-key-direct)
 -   [ip_trie](#ip-trie)
 
@@ -139,7 +143,7 @@ LAYOUT(SPARSE_HASHED([PREALLOCATE 0]))
 
 ### complex_key_hashed {#complex-key-hashed}
 
-Тип размещения предназначен для использования с составными [ключами](external-dicts-dict-structure.md). Аналогичен `hashed`.
+Тип размещения предназначен для использования с составными [ключами](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Аналогичен `hashed`.
 
 Пример конфигурации:
 
@@ -155,6 +159,63 @@ LAYOUT(SPARSE_HASHED([PREALLOCATE 0]))
 LAYOUT(COMPLEX_KEY_HASHED())
 ```
 
+### complex_key_sparse_hashed {#complex-key-sparse-hashed}
+
+Тип размещения предназначен для использования с составными [ключами](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Аналогичен [sparse_hashed](#dicts-external_dicts_dict_layout-sparse_hashed).
+
+Пример конфигурации:
+
+``` xml
+<layout>
+  <complex_key_sparse_hashed />
+</layout>
+```
+
+или
+
+``` sql
+LAYOUT(COMPLEX_KEY_SPARSE_HASHED())
+```
+
+### hashed_array {#dicts-external_dicts_dict_layout-hashed-array}
+
+Словарь полностью хранится в оперативной памяти. Каждый атрибут хранится в массиве. Ключевой атрибут хранится в виде хеш-таблицы, где его значение является индексом в массиве атрибутов. Словарь может содержать произвольное количество элементов с произвольными идентификаторами. На практике количество ключей может достигать десятков миллионов элементов.
+
+Поддерживаются все виды источников. При обновлении данные (из файла, из таблицы) считываются целиком.
+
+Пример конфигурации:
+
+``` xml
+<layout>
+  <hashed_array>
+  </hashed_array>
+</layout>
+```
+
+или
+
+``` sql
+LAYOUT(HASHED_ARRAY())
+```
+
+### complex_key_hashed_array {#complex-key-hashed-array}
+
+Тип размещения предназначен для использования с составными [ключами](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md). Аналогичен [hashed_array](#dicts-external_dicts_dict_layout-hashed-array).
+
+Пример конфигурации:
+
+``` xml
+<layout>
+  <complex_key_hashed_array />
+</layout>
+```
+
+или
+
+``` sql
+LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
+```
+
 ### range_hashed {#range-hashed}
 
 Словарь хранится в оперативной памяти в виде хэш-таблицы с упорядоченным массивом диапазонов и соответствующих им значений.
@@ -268,15 +329,41 @@ PRIMARY KEY Abcdef
 RANGE(MIN StartTimeStamp MAX EndTimeStamp)
 ```
 
+### complex_key_range_hashed {#complex-key-range-hashed}
+
+Словарь хранится в оперативной памяти в виде хэш-таблицы с упорядоченным массивом диапазонов и соответствующих им значений (см. [range_hashed](#range-hashed)). Данный тип размещения предназначен для использования с составными [ключами](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md).
+
+Пример конфигурации:
+
+``` sql
+CREATE DICTIONARY range_dictionary
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64 DEFAULT 0.2
+)
+PRIMARY KEY CountryID, CountryKey
+SOURCE(CLICKHOUSE(TABLE 'date_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+```
+
 ### cache {#cache}
 
 Словарь хранится в кэше, состоящем из фиксированного количества ячеек. Ячейки содержат часто используемые элементы.
 
 При поиске в словаре сначала просматривается кэш. На каждый блок данных, все не найденные в кэше или устаревшие ключи запрашиваются у источника с помощью `SELECT attrs... FROM db.table WHERE id IN (k1, k2, ...)`. Затем, полученные данные записываются в кэш.
 
-Для cache-словарей может быть задано время устаревания [lifetime](external-dicts-dict-lifetime.md) данных в кэше. Если от загрузки данных в ячейке прошло больше времени, чем `lifetime`, то значение не используется, и будет запрошено заново при следующей необходимости его использовать.
+Если ключи не были найдены в словаре, то для обновления кэша создается задание и добавляется в очередь обновлений. Параметры очереди обновлений можно устанавливать настройками `max_update_queue_size`, `update_queue_push_timeout_milliseconds`, `query_wait_timeout_milliseconds`, `max_threads_for_updates`
 
-Это наименее эффективный из всех способов размещения словарей. Скорость работы кэша очень сильно зависит от правильности настройки и сценария использования. Словарь типа cache показывает высокую производительность лишь при достаточно больших hit rate-ах (рекомендуется 99% и выше). Посмотреть средний hit rate можно в таблице `system.dictionaries`.
+Для cache-словарей при помощи настройки  `allow_read_expired_keys` может быть задано время устаревания [lifetime](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md) данных в кэше. Если с момента загрузки данных в ячейку прошло больше времени, чем `lifetime`, то значение не используется, а ключ устаревает. Ключ будет запрошен заново при следующей необходимости его использовать. 
+
+Это наименее эффективный из всех способов размещения словарей. Скорость работы кэша очень сильно зависит от правильности настройки и сценария использования. Словарь типа `cache` показывает высокую производительность лишь при достаточно большой частоте успешных обращений (рекомендуется 99% и выше). Посмотреть среднюю частоту успешных обращений (`hit rate`) можно в таблице [system.dictionaries](../../../operations/system-tables/dictionaries.md).
+
+Если параметр `allow_read_expired_keys` выставлен в 1 (0 по умолчанию), то словарь поддерживает асинхронные обновления. Если клиент запрашивает ключи, которые находятся в кэше, но при этом некоторые из них устарели, то словарь вернет устаревшие ключи клиенту и запросит их асинхронно у источника.
 
 Чтобы увеличить производительность кэша, используйте подзапрос с `LIMIT`, а снаружи вызывайте функцию со словарём.
 
@@ -289,6 +376,16 @@ RANGE(MIN StartTimeStamp MAX EndTimeStamp)
     <cache>
         <!-- Размер кэша в количестве ячеек. Округляется вверх до степени двух. -->
         <size_in_cells>1000000000</size_in_cells>
+        <!-- Позволить читать устаревшие ключи. -->
+        <allow_read_expired_keys>0</allow_read_expired_keys>
+        <!-- Максимальный размер очереди обновлений. -->
+        <max_update_queue_size>100000</max_update_queue_size>
+        <!-- Максимальное время (в миллисекундах) для отправки в очередь. -->
+        <update_queue_push_timeout_milliseconds>10</update_queue_push_timeout_milliseconds>
+        <!-- Максимальное время ожидания (в миллисекундах) для выполнения обновлений. -->
+        <query_wait_timeout_milliseconds>60000</query_wait_timeout_milliseconds>
+        <!-- Максимальное число потоков для обновления кэша словаря. -->
+        <max_threads_for_updates>4</max_threads_for_updates>
     </cache>
 </layout>
 ```
@@ -315,7 +412,7 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
 
 ### ssd_cache {#ssd-cache}
 
-Похож на `cache`, но хранит данные на SSD и индекс в оперативной памяти.
+Похож на `cache`, но хранит данные на SSD, а индекс в оперативной памяти. Все параметры, относящиеся к очереди обновлений, могут также быть применены к SSD-кэш словарям.
 
 ``` xml
 <layout>
@@ -329,7 +426,7 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
         <!-- Size of RAM buffer in bytes for aggregating elements before flushing to SSD. -->
         <write_buffer_size>1048576</write_buffer_size>
         <!-- Path where cache file will be stored. -->
-        <path>/var/lib/clickhouse/clickhouse_dictionaries/test_dict</path>
+        <path>/var/lib/clickhouse/user_files/test_dict</path>
     </ssd_cache>
 </layout>
 ```
@@ -338,7 +435,7 @@ LAYOUT(CACHE(SIZE_IN_CELLS 1000000000))
 
 ``` sql
 LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 16777216 READ_BUFFER_SIZE 1048576
-    PATH ./user_files/test_dict))
+    PATH '/var/lib/clickhouse/user_files/test_dict'))
 ```
 
 ### complex_key_ssd_cache {#complex-key-ssd-cache}
diff --git a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index d616960ce36..828d69cf26b 100644
--- a/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/ru/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -251,7 +251,7 @@ ClickHouse получает от ODBC-драйвера информацию о 
 
 ### Выявленная уязвимость в функционировании ODBC словарей {#vyiavlennaia-uiazvimost-v-funktsionirovanii-odbc-slovarei}
 
-!!! attention "Attention"
+!!! attention "Внимание"
     При соединении с базой данных через ODBC можно заменить параметр соединения `Servername`. В этом случае, значения `USERNAME` и `PASSWORD` из `odbc.ini` отправляются на удаленный сервер и могут быть скомпрометированы.
 
 **Пример небезопасного использования**
@@ -764,7 +764,7 @@ Setting fields:
 -   `port` – Порт для соединения с PostgreSQL. Вы можете указать его для всех реплик или задать индивидуально для каждой релпики (внутри `<replica>`).
 -   `user` – Имя пользователя для соединения с PostgreSQL. Вы можете указать его для всех реплик или задать индивидуально для каждой релпики (внутри `<replica>`).
 -   `password` – Пароль для пользователя PostgreSQL.
--   `replica` – Section of replica configurations. There can be multiple sections.
+-   `replica` – Раздел конфигурации реплик. Может быть несколько.
     - `replica/host` – хост PostgreSQL.
     - `replica/port` – порт PostgreSQL .
     - `replica/priority` – Приоритет реплики. Во время попытки соединения, ClickHouse будет перебирать реплики в порядке приоритет. Меньшее значение означает более высокий приоритет.
diff --git a/docs/ru/sql-reference/functions/arithmetic-functions.md b/docs/ru/sql-reference/functions/arithmetic-functions.md
index f587b7b5b5d..278f3edb74a 100644
--- a/docs/ru/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ru/sql-reference/functions/arithmetic-functions.md
@@ -83,3 +83,78 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 Вычисляет наименьшее общее кратное чисел.
 При делении на ноль или при делении минимального отрицательного числа на минус единицу, кидается исключение.
 
+
+## max2 {#max2}
+
+Сравнивает два числа и возвращает максимум. Возвращаемое значение приводится к типу [Float64](../../sql-reference/data-types/float.md).
+
+**Синтаксис**
+
+```sql
+max2(value1, value2)
+```
+
+**Аргументы**
+
+-   `value1` — первое число. [Int/UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+-   `value2` — второе число. [Int/UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+
+**Возвращаемое значение**
+
+-   Максимальное значение среди двух чисел.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT max2(-1, 2);
+```
+
+Результат:
+
+```text
+┌─max2(-1, 2)─┐
+│           2 │
+└─────────────┘
+```
+
+## min2 {#min2}
+
+Сравнивает два числа и возвращает минимум. Возвращаемое значение приводится к типу [Float64](../../sql-reference/data-types/float.md).
+
+**Синтаксис**
+
+```sql
+min2(value1, value2)
+```
+
+**Аргументы**
+
+-   `value1` — первое число. [Int/UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+-   `value2` — второе число. [Int/UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+
+**Возвращаемое значение**
+
+-   Минимальное значение среди двух чисел.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT min2(-1, 2);
+```
+
+Результат:
+
+```text
+┌─min2(-1, 2)─┐
+│          -1 │
+└─────────────┘
+```
+
diff --git a/docs/ru/sql-reference/functions/array-functions.md b/docs/ru/sql-reference/functions/array-functions.md
index 67c4f6c0136..5507ca77f16 100644
--- a/docs/ru/sql-reference/functions/array-functions.md
+++ b/docs/ru/sql-reference/functions/array-functions.md
@@ -7,19 +7,89 @@ toc_title: "Массивы"
 
 ## empty {#function-empty}
 
-Возвращает 1 для пустого массива, и 0 для непустого массива.
-Тип результата - UInt8.
-Функция также работает для строк.
+Проверяет, является ли входной массив пустым.
 
-Функцию можно оптимизировать, если включить настройку [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns). При `optimize_functions_to_subcolumns = 1` функция читает только подстолбец [size0](../../sql-reference/data-types/array.md#array-size) вместо чтения и обработки всего столбца массива. Запрос `SELECT empty(arr) FROM table` преобразуется к запросу `SELECT arr.size0 = 0 FROM TABLE`.
+**Синтаксис**
+
+``` sql
+empty([x])
+```
+
+Массив считается пустым, если он не содержит ни одного элемента.
+
+!!! note "Примечание"
+    Функцию можно оптимизировать, если включить настройку [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns). При `optimize_functions_to_subcolumns = 1` функция читает только подстолбец [size0](../../sql-reference/data-types/array.md#array-size) вместо чтения и обработки всего столбца массива. Запрос `SELECT empty(arr) FROM TABLE` преобразуется к запросу `SELECT arr.size0 = 0 FROM TABLE`.
+
+Функция также поддерживает работу с типами [String](string-functions.md#empty) и [UUID](uuid-functions.md#empty).
+
+**Параметры**
+
+-   `[x]` — массив на входе функции. [Array](../data-types/array.md).
+
+**Возвращаемое значение**
+
+-   Возвращает `1` для пустого массива или `0` — для непустого массива.
+
+Тип: [UInt8](../data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT empty([]);
+```
+
+Ответ:
+
+```text
+┌─empty(array())─┐
+│              1 │
+└────────────────┘
+```
 
 ## notEmpty {#function-notempty}
 
-Возвращает 0 для пустого массива, и 1 для непустого массива.
-Тип результата - UInt8.
-Функция также работает для строк.
+Проверяет, является ли входной массив непустым.
 
-Функцию можно оптимизировать, если включить настройку [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns). При `optimize_functions_to_subcolumns = 1` функция читает только подстолбец [size0](../../sql-reference/data-types/array.md#array-size) вместо чтения и обработки всего столбца массива. Запрос `SELECT notEmpty(arr) FROM table` преобразуется к запросу `SELECT arr.size0 != 0 FROM TABLE`.
+**Синтаксис**
+
+``` sql
+notEmpty([x])
+```
+
+Массив считается непустым, если он содержит хотя бы один элемент.
+
+!!! note "Примечание"
+    Функцию можно оптимизировать, если включить настройку [optimize_functions_to_subcolumns](../../operations/settings/settings.md#optimize-functions-to-subcolumns). При `optimize_functions_to_subcolumns = 1` функция читает только подстолбец [size0](../../sql-reference/data-types/array.md#array-size) вместо чтения и обработки всего столбца массива. Запрос `SELECT notEmpty(arr) FROM table` преобразуется к запросу `SELECT arr.size0 != 0 FROM TABLE`.
+
+Функция также поддерживает работу с типами [String](string-functions.md#notempty) и [UUID](uuid-functions.md#notempty).
+
+**Параметры**
+
+-   `[x]` — массив на входе функции. [Array](../data-types/array.md).
+
+**Возвращаемое значение**
+
+-   Возвращает `1` для непустого массива или `0` — для пустого массива.
+
+Тип: [UInt8](../data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT notEmpty([1,2]);
+```
+
+Результат:
+
+```text
+┌─notEmpty([1, 2])─┐
+│                1 │
+└──────────────────┘
+```
 
 ## length {#array_functions-length}
 
@@ -62,18 +132,15 @@ range([start, ] end [, step])
 -   `end` — конец диапазона. Обязательный аргумент. Должен быть больше, чем `start`. Тип: [UInt](../data-types/int-uint.md)
 -   `step` — шаг обхода. Необязательный аргумент. По умолчанию равен `1`. Тип: [UInt](../data-types/int-uint.md)
 
-
 **Возвращаемые значения**
 
 -   массив `UInt` чисел от `start` до `end - 1` с шагом `step`
 
-
 **Особенности реализации**
 
 -   Не поддерживаются отрицательные значения аргументов: `start`, `end`, `step` имеют тип `UInt`.
 
--   Если в результате запроса создаются массивы суммарной длиной больше 100 000 000 элементов, то генерируется исключение.
-
+-   Если в результате запроса создаются массивы суммарной длиной больше, чем количество элементов, указанное настройкой [function_range_max_elements_in_block](../../operations/settings/settings.md#settings-function_range_max_elements_in_block), то генерируется исключение.
 
 **Примеры**
 
@@ -749,7 +816,7 @@ arrayDifference(array)
 
 **Аргументы**
 
--   `array` – [массив](https://clickhouse.tech/docs/ru/data_types/array/).
+-   `array` – [массив](https://clickhouse.com/docs/ru/data_types/array/).
 
 **Возвращаемое значение**
 
@@ -799,7 +866,7 @@ arrayDistinct(array)
 
 **Аргументы**
 
--   `array` – [массив](https://clickhouse.tech/docs/ru/data_types/array/).
+-   `array` – [массив](https://clickhouse.com/docs/ru/data_types/array/).
 
 **Возвращаемое значение**
 
@@ -839,7 +906,7 @@ SELECT arrayEnumerateDense([10, 20, 10, 30])
 
 ## arrayIntersect(arr) {#array-functions-arrayintersect}
 
-Принимает несколько массивов, возвращает массив с элементами, присутствующими во всех исходных массивах. Элементы на выходе следуют в порядке следования в первом массиве.
+Принимает несколько массивов, возвращает массив с элементами, присутствующими во всех исходных массивах.
 
 Пример:
 
diff --git a/docs/ru/sql-reference/functions/bitmap-functions.md b/docs/ru/sql-reference/functions/bitmap-functions.md
index 3da729664d0..011d339c847 100644
--- a/docs/ru/sql-reference/functions/bitmap-functions.md
+++ b/docs/ru/sql-reference/functions/bitmap-functions.md
@@ -66,15 +66,14 @@ bitmapSubsetLimit(bitmap, range_start, cardinality_limit)
 **Аргументы**
 
 -   `bitmap` – битмап. [Bitmap object](#bitmap_functions-bitmapbuild).
-
 -   `range_start` – начальная точка подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
--   `cardinality_limit` – Верхний предел подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
+-   `cardinality_limit` – верхний предел подмножества. [UInt32](../../sql-reference/functions/bitmap-functions.md#bitmap-functions).
 
 **Возвращаемое значение**
 
 Подмножество битмапа.
 
-Тип: `Bitmap object`.
+Тип: [Bitmap object](#bitmap_functions-bitmapbuild).
 
 **Пример**
 
@@ -92,6 +91,44 @@ SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12
 └───────────────────────────┘
 ```
 
+## subBitmap {#subbitmap}
+
+Возвращает элементы битмапа, начиная с позиции `offset`. Число возвращаемых элементов ограничивается параметром `cardinality_limit`. Аналог строковой функции [substring](string-functions.md#substring)), но для битмапа.
+
+**Синтаксис**
+
+``` sql
+subBitmap(bitmap, offset, cardinality_limit)
+```
+
+**Аргументы**
+
+-   `bitmap` – битмап. Тип: [Bitmap object](#bitmap_functions-bitmapbuild).
+-   `offset` – позиция первого элемента возвращаемого подмножества. Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `cardinality_limit` – максимальное число элементов возвращаемого подмножества. Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+Подмножество битмапа.
+
+Тип: [Bitmap object](#bitmap_functions-bitmapbuild).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT bitmapToArray(subBitmap(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(10), toUInt32(10))) AS res;
+```
+
+Результат:
+
+``` text
+┌─res─────────────────────────────┐
+│ [10,11,12,13,14,15,16,17,18,19] │
+└─────────────────────────────────┘
+```
+
 ## bitmapContains {#bitmap_functions-bitmapcontains}
 
 Проверяет вхождение элемента в битовый массив.
diff --git a/docs/ru/sql-reference/functions/conditional-functions.md b/docs/ru/sql-reference/functions/conditional-functions.md
index b191937df51..521df785df2 100644
--- a/docs/ru/sql-reference/functions/conditional-functions.md
+++ b/docs/ru/sql-reference/functions/conditional-functions.md
@@ -7,16 +7,18 @@ toc_title: "Условные функции"
 
 ## if {#if}
 
-Условное выражение. В отличии от большинства систем, ClickHouse всегда считает оба выражения `then` и `else`.
+Условное выражение. В отличие от большинства систем, ClickHouse всегда считает оба выражения `then` и `else`.
 
 **Синтаксис**
 
 ``` sql
-SELECT if(cond, then, else)
+if(cond, then, else)
 ```
 
 Если условие `cond` не равно нулю, то возвращается результат выражения `then`. Если условие `cond` равно нулю или является NULL, то результат выражения `then` пропускается и возвращается результат выражения `else`.
 
+Чтобы вычислять функцию `if` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `then` вычисляется только для строк, где условие `cond` верно, а выражение `else` – для строк, где условие `cond` неверно. Например, при выполнении запроса `SELECT if(number = 0, 0, intDiv(42, number)) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль, так как `intDiv(42, number)` будет вычислено только для чисел, которые не удовлетворяют условию `number = 0`.
+
 **Аргументы**
 
 -   `cond` – проверяемое условие. Может быть [UInt8](../../sql-reference/functions/conditional-functions.md) или `NULL`.
@@ -77,7 +79,13 @@ SELECT if(0, plus(2, 2), plus(2, 6));
 
 Позволяет более компактно записать оператор [CASE](../operators/index.md#operator_case) в запросе.
 
-    multiIf(cond_1, then_1, cond_2, then_2...else)
+**Синтаксис**
+
+``` sql
+multiIf(cond_1, then_1, cond_2, then_2, ..., else)
+```
+
+Чтобы вычислять функцию `multiIf` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `then_i` вычисляется только для строк, где условие `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}) AND cond_i)` верно, `cond_i` вычисляется только для строк, где условие `((NOT cond_1) AND (NOT cond_2) AND ... AND (NOT cond_{i-1}))` верно. Например, при выполнении запроса `SELECT multiIf(number = 2, intDiv(1, number), number = 5) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
 
 **Аргументы**
 
@@ -110,4 +118,3 @@ SELECT if(0, plus(2, 2), plus(2, 6));
 │                                       ᴺᵁᴸᴸ │
 └────────────────────────────────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index 282962b9e3f..fc5533e75b1 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -26,6 +26,7 @@ SELECT
 ## timeZone {#timezone}
 
 Возвращает часовой пояс сервера.
+Если функция вызывается в контексте распределенной таблицы, то она генерирует обычный столбец со значениями, актуальными для каждого шарда. Иначе возвращается константа.
 
 **Синтаксис**
 
@@ -334,7 +335,7 @@ SELECT toStartOfISOYear(toDate('2017-01-01')) AS ISOYear20170101;
 **Синтаксис**
 
 ``` sql
-toStartOfSecond(value[, timezone])
+toStartOfSecond(value, [timezone])
 ```
 
 **Аргументы**
diff --git a/docs/ru/sql-reference/functions/encoding-functions.md b/docs/ru/sql-reference/functions/encoding-functions.md
index 161c1304b7c..694dfef7d75 100644
--- a/docs/ru/sql-reference/functions/encoding-functions.md
+++ b/docs/ru/sql-reference/functions/encoding-functions.md
@@ -17,13 +17,13 @@ char(number_1, [number_2, ..., number_n]);
 
 **Аргументы**
 
--   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md).
+-   `number_1, number_2, ..., number_n` — числовые аргументы, которые интерпретируются как целые числа. Типы: [Int](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md).
 
 **Возвращаемое значение**
 
 -   Строка из соответствующих байт.
 
-Тип: `String`.
+Тип: [String](../../sql-reference/data-types/string.md).
 
 **Пример**
 
@@ -73,61 +73,57 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 ## hex {#hex}
 
-Returns a string containing the argument’s hexadecimal representation.
+Возвращает строку, содержащую шестнадцатеричное представление аргумента.
 
 Синоним: `HEX`.
 
-**Syntax**
+**Синтаксис**
 
 ``` sql
 hex(arg)
 ```
 
-The function is using uppercase letters `A-F` and not using any prefixes (like `0x`) or suffixes (like `h`).
+Функция использует прописные буквы `A-F` и не использует никаких префиксов (например, `0x`) или суффиксов (например, `h`).
 
-For integer arguments, it prints hex digits («nibbles») from the most significant to least significant (big endian or «human readable» order). It starts with the most significant non-zero byte (leading zero bytes are omitted) but always prints both digits of every byte even if leading digit is zero.
+Для целочисленных аргументов возвращает шестнадцатеричные цифры от наиболее до наименее значимых (`big endian`, человекочитаемый порядок).Он начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда выводит обе цифры каждого байта, даже если начальная цифра равна нулю.
 
-Example:
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
 
-**Example**
+Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md), все байты просто кодируются как два шестнадцатеричных числа. Нулевые байты не опущены.
 
-Query:
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные/конечные байты не опущены.
+
+**Аргументы**
+
+-   `arg` — значение для преобразования в шестнадцатеричное. [String](../../sql-reference/data-types/string.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+-   Строка — шестнадцатеричное представление аргумента.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
 
 ``` sql
 SELECT hex(1);
 ```
 
-Result:
+Результат:
 
 ``` text
 01
 ```
 
-Values of type `Date` and `DateTime` are formatted as corresponding integers (the number of days since Epoch for Date and the value of Unix Timestamp for DateTime).
-
-For `String` and `FixedString`, all bytes are simply encoded as two hexadecimal numbers. Zero bytes are not omitted.
-
-Values of floating point and Decimal types are encoded as their representation in memory. As we support little endian architecture, they are encoded in little endian. Zero leading/trailing bytes are not omitted.
-
-**Parameters**
-
--   `arg` — A value to convert to hexadecimal. Types: [String](../../sql-reference/functions/encoding-functions.md), [UInt](../../sql-reference/functions/encoding-functions.md), [Float](../../sql-reference/functions/encoding-functions.md), [Decimal](../../sql-reference/functions/encoding-functions.md), [Date](../../sql-reference/functions/encoding-functions.md) or [DateTime](../../sql-reference/functions/encoding-functions.md).
-
-**Returned value**
-
--   A string with the hexadecimal representation of the argument.
-
-Type: `String`.
-
-**Example**
-
-Query:
+Запрос:
 
 ``` sql
-SELECT hex(toFloat32(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat32(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
-Result:
+Результат:
 
 ``` text
 ┌─hex_presentation─┐
@@ -136,13 +132,13 @@ Result:
 └──────────────────┘
 ```
 
-Query:
+Запрос:
 
 ``` sql
-SELECT hex(toFloat64(number)) as hex_presentation FROM numbers(15, 2);
+SELECT hex(toFloat64(number)) AS hex_presentation FROM numbers(15, 2);
 ```
 
-Result:
+Результат:
 
 ``` text
 ┌─hex_presentation─┐
@@ -208,6 +204,141 @@ SELECT reinterpretAsUInt64(reverse(unhex('FFF'))) AS num;
 └──────┘
 ```
 
+## bin {#bin}
+
+Возвращает строку, содержащую бинарное представление аргумента.
+
+**Синтаксис**
+
+``` sql
+bin(arg)
+```
+
+Синоним: `BIN`.
+
+Для целочисленных аргументов возвращаются двоичные числа от наиболее значимого до наименее значимого (`big-endian`, человекочитаемый порядок). Порядок начинается с самого значимого ненулевого байта (начальные нулевые байты опущены), но всегда возвращает восемь цифр каждого байта, если начальная цифра равна нулю.
+
+Значения типа [Date](../../sql-reference/data-types/date.md) и [DateTime](../../sql-reference/data-types/datetime.md) формируются как соответствующие целые числа (количество дней с момента Unix-эпохи для `Date` и значение Unix Timestamp для `DateTime`).
+
+Для [String](../../sql-reference/data-types/string.md) и [FixedString](../../sql-reference/data-types/fixedstring.md) все байты кодируются как восемь двоичных чисел. Нулевые байты не опущены.
+
+Значения [Float](../../sql-reference/data-types/float.md) и [Decimal](../../sql-reference/data-types/decimal.md) кодируются как их представление в памяти. Поскольку ClickHouse поддерживает архитектуру `little-endian`, они кодируются от младшего к старшему байту. Нулевые начальные/конечные байты не опущены.
+
+**Аргументы**
+
+-   `arg` — значение для преобразования в двоичный код. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md), [Decimal](../../sql-reference/data-types/decimal.md), [Date](../../sql-reference/data-types/date.md) или [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB) — двоичное представление аргумента.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT bin(14);
+```
+
+Результат:
+
+``` text
+┌─bin(14)──┐
+│ 00001110 │
+└──────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT bin(toFloat32(number)) AS bin_presentation FROM numbers(15, 2);
+```
+
+Результат:
+
+``` text
+┌─bin_presentation─────────────────┐
+│ 00000000000000000111000001000001 │
+│ 00000000000000001000000001000001 │
+└──────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT bin(toFloat64(number)) AS bin_presentation FROM numbers(15, 2);
+```
+
+Результат:
+
+``` text
+┌─bin_presentation─────────────────────────────────────────────────┐
+│ 0000000000000000000000000000000000000000000000000010111001000000 │
+│ 0000000000000000000000000000000000000000000000000011000001000000 │
+└──────────────────────────────────────────────────────────────────┘
+```
+
+## unbin {#unbinstr}
+
+Интерпретирует каждую пару двоичных цифр аргумента как число и преобразует его в байт, представленный числом. Функция выполняет операцию, противоположную [bin](#bin).
+
+**Синтаксис**
+
+``` sql
+unbin(arg)
+```
+
+Синоним: `UNBIN`.
+
+Для числового аргумента `unbin()` не возвращает значение, обратное результату `bin()`. Чтобы преобразовать результат в число, используйте функции [reverse](../../sql-reference/functions/string-functions.md#reverse) и [reinterpretAs<Type>](../../sql-reference/functions/type-conversion-functions.md#reinterpretasuint8163264).
+
+!!! note "Примечание"
+    Если `unbin` вызывается из клиента `clickhouse-client`, бинарная строка возвращается в кодировке UTF-8.
+
+Поддерживает двоичные цифры `0` и `1`. Количество двоичных цифр не обязательно должно быть кратно восьми. Если строка аргумента содержит что-либо, кроме двоичных цифр, возвращается некоторый результат, определенный реализацией (ошибки не возникает). 
+
+**Аргументы**
+
+-   `arg` — строка, содержащая любое количество двоичных цифр. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Бинарная строка (BLOB).
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT UNBIN('001100000011000100110010'), UNBIN('0100110101111001010100110101000101001100');
+```
+
+Результат:
+
+``` text
+┌─unbin('001100000011000100110010')─┬─unbin('0100110101111001010100110101000101001100')─┐
+│ 012                               │ MySQL                                             │
+└───────────────────────────────────┴───────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT reinterpretAsUInt64(reverse(unbin('1110'))) AS num;
+```
+
+Результат:
+
+``` text
+┌─num─┐
+│  14 │
+└─────┘
+```
+
 ## UUIDStringToNum(str) {#uuidstringtonumstr}
 
 Принимает строку, содержащую 36 символов в формате `123e4567-e89b-12d3-a456-426655440000`, и возвращает в виде набора байт в FixedString(16).
@@ -263,7 +394,7 @@ SELECT bitPositionsToArray(toInt8(1)) AS bit_positions;
 Запрос:
 
 ``` sql
-select bitPositionsToArray(toInt8(-1)) as bit_positions;
+SELECT bitPositionsToArray(toInt8(-1)) AS bit_positions;
 ```
 
 Результат:
diff --git a/docs/ru/sql-reference/functions/encryption-functions.md b/docs/ru/sql-reference/functions/encryption-functions.md
index d9bcbaf0887..14add7e295c 100644
--- a/docs/ru/sql-reference/functions/encryption-functions.md
+++ b/docs/ru/sql-reference/functions/encryption-functions.md
@@ -358,4 +358,4 @@ SELECT aes_decrypt_mysql('aes-256-cfb128', unhex('24E9E4966469'), '1234567891012
 │ Secret    │
 └───────────┘
 ```
-[Original article](https://clickhouse.tech/docs/ru/sql-reference/functions/encryption_functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/ru/sql-reference/functions/encryption_functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/geo/h3.md b/docs/ru/sql-reference/functions/geo/h3.md
index 088814c4d7d..db96f0caa1d 100644
--- a/docs/ru/sql-reference/functions/geo/h3.md
+++ b/docs/ru/sql-reference/functions/geo/h3.md
@@ -6,7 +6,7 @@ toc_title: "Функции для работы с индексами H3"
 
 [H3](https://eng.uber.com/h3/) — это система геокодирования, которая делит поверхность Земли на равные шестигранные ячейки. Система поддерживает иерархию (вложенность) ячеек, т.е. каждый "родительский" шестигранник может быть поделен на семь одинаковых вложенных "дочерних" шестигранников, и так далее.
 
-Уровень вложенности назвается `разрешением` и может принимать значение от `0` до `15`, где `0` соответствует `базовым` ячейкам самого верхнего уровня (наиболее крупным).
+Уровень вложенности называется "разрешением" и может принимать значение от `0` до `15`, где `0` соответствует "базовым" ячейкам самого верхнего уровня (наиболее крупным).
 
 Для каждой точки, имеющей широту и долготу, можно получить 64-битный индекс H3, соответствующий номеру шестигранной ячейки, где эта точка находится.
 
@@ -38,7 +38,7 @@ h3IsValid(h3index)
 Запрос:
 
 ``` sql
-SELECT h3IsValid(630814730351855103) as h3IsValid;
+SELECT h3IsValid(630814730351855103) AS h3IsValid;
 ```
 
 Результат:
@@ -75,7 +75,7 @@ h3GetResolution(h3index)
 Запрос:
 
 ``` sql
-SELECT h3GetResolution(639821929606596015) as resolution;
+SELECT h3GetResolution(639821929606596015) AS resolution;
 ```
 
 Результат:
@@ -109,7 +109,7 @@ h3EdgeAngle(resolution)
 Запрос:
 
 ``` sql
-SELECT h3EdgeAngle(10) as edgeAngle;
+SELECT h3EdgeAngle(10) AS edgeAngle;
 ```
 
 Результат:
@@ -143,7 +143,7 @@ h3EdgeLengthM(resolution)
 Запрос:
 
 ``` sql
-SELECT h3EdgeLengthM(15) as edgeLengthM;
+SELECT h3EdgeLengthM(15) AS edgeLengthM;
 ```
 
 Результат:
@@ -182,7 +182,7 @@ geoToH3(lon, lat, resolution)
 Запрос:
 
 ``` sql
-SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index;
+SELECT geoToH3(37.79506683, 55.71290588, 15) AS h3Index;
 ```
 
 Результат:
@@ -193,6 +193,40 @@ SELECT geoToH3(37.79506683, 55.71290588, 15) as h3Index;
 └────────────────────┘
 ```
 
+## h3ToGeo {#h3togeo}
+
+Возвращает географические координаты долготы и широты, соответствующие указанному [H3](#h3index)-индексу.
+
+**Синтаксис**
+
+``` sql
+h3ToGeo(h3Index)
+```
+
+**Аргументы**
+
+-   `h3Index` — [H3](#h3index)-индекс. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   кортеж из двух значений: `tuple(lon,lat)`, где `lon` — долгота [Float64](../../../sql-reference/data-types/float.md), `lat` — широта [Float64](../../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT h3ToGeo(644325524701193974) coordinates;
+```
+
+Результат:
+
+``` text
+┌─coordinates───────────────────────────┐
+│ (37.79506616830252,55.71290243145668) │
+└───────────────────────────────────────┘
+```
+
 ## h3kRing {#h3kring}
 
 Возвращает [H3](#h3index)-индексы шестигранников в радиусе `k` от данного в произвольном порядке.
@@ -261,7 +295,7 @@ h3GetBaseCell(index)
 Запрос:
 
 ``` sql
-SELECT h3GetBaseCell(612916788725809151) as basecell;
+SELECT h3GetBaseCell(612916788725809151) AS basecell;
 ```
 
 Результат:
@@ -295,7 +329,7 @@ h3HexAreaM2(resolution)
 Запрос:
 
 ``` sql
-SELECT h3HexAreaM2(13) as area;
+SELECT h3HexAreaM2(13) AS area;
 ```
 
 Результат:
@@ -407,7 +441,7 @@ h3ToParent(index, resolution)
 Запрос:
 
 ``` sql
-SELECT h3ToParent(599405990164561919, 3) as parent;
+SELECT h3ToParent(599405990164561919, 3) AS parent;
 ```
 
 Результат:
@@ -441,7 +475,7 @@ h3ToString(index)
 Запрос:
 
 ``` sql
-SELECT h3ToString(617420388352917503) as h3_string;
+SELECT h3ToString(617420388352917503) AS h3_string;
 ```
 
 Результат:
@@ -478,7 +512,7 @@ stringToH3(index_str)
 Запрос:
 
 ``` sql
-SELECT stringToH3('89184926cc3ffff') as index;
+SELECT stringToH3('89184926cc3ffff') AS index;
 ```
 
 Результат:
@@ -514,7 +548,7 @@ h3GetResolution(index)
 Запрос:
 
 ``` sql
-SELECT h3GetResolution(617420388352917503) as res;
+SELECT h3GetResolution(617420388352917503) AS res;
 ```
 
 Результат:
@@ -525,3 +559,114 @@ SELECT h3GetResolution(617420388352917503) as res;
 └─────┘
 ```
 
+## h3IsResClassIII {#h3isresclassIII}
+
+Проверяет, имеет ли индекс [H3](#h3index) разрешение с ориентацией Class III.
+
+**Синтаксис**
+
+``` sql
+h3IsResClassIII(index)
+```
+
+**Параметр**
+
+-   `index` — порядковый номер шестигранника. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   `1` — индекс имеет разрешение с ориентацией Class III.
+-   `0` — индекс не имеет разрешения с ориентацией Class III.
+
+Тип: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT h3IsResClassIII(617420388352917503) AS res;
+```
+
+Результат:
+
+``` text
+┌─res─┐
+│   1 │
+└─────┘
+```
+
+## h3IsPentagon {#h3ispentagon}
+
+Проверяет, является ли указанный индекс [H3](#h3index) пятиугольной ячейкой.
+
+**Синтаксис**
+
+``` sql
+h3IsPentagon(index)
+```
+
+**Параметр**
+
+-   `index` — порядковый номер шестигранника. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   `1` — индекс представляет собой пятиугольную ячейку.
+-   `0` — индекс не является пятиугольной ячейкой.
+
+Тип: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT h3IsPentagon(644721767722457330) AS pentagon;
+```
+
+Результат:
+
+``` text
+┌─pentagon─┐
+│        0 │
+└──────────┘
+```
+
+## h3GetFaces {#h3getfaces}
+
+Возвращает все грани многоугольника (икосаэдра), пересекаемые заданным [H3](#h3index) индексом.
+
+**Синтаксис**
+
+``` sql
+h3GetFaces(index)
+```
+
+**Параметр**
+
+-   `index` — индекс шестиугольной ячейки. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемое значение**
+
+-   Массив, содержащий грани многоугольника (икосаэдра), пересекаемые заданным H3 индексом.
+
+Тип: [Array](../../../sql-reference/data-types/array.md)([UInt64](../../../sql-reference/data-types/int-uint.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT h3GetFaces(599686042433355775) AS faces;
+```
+
+Результат:
+
+``` text
+┌─faces─┐
+│ [7]   │
+└───────┘
+```
+
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/functions/geo/h3) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/geo/s2.md b/docs/ru/sql-reference/functions/geo/s2.md
new file mode 100644
index 00000000000..6b801e1d08f
--- /dev/null
+++ b/docs/ru/sql-reference/functions/geo/s2.md
@@ -0,0 +1,376 @@
+--- 
+toc_title: "Функции для работы с индексами S2"
+---
+
+# Функции для работы с индексами S2 {#s2index}
+
+[S2](https://s2geometry.io/) — это система геокодирования, в которой все географические данные представлены на трехмерной сфере (аналогично глобусу).
+
+В библиотеке S2 точки представлены в виде индекса S2 — определенного числа, которое внутренне кодирует точку на поверхности трехмерной единичной сферы, в отличие от традиционных пар (широта, долгота). Чтобы получить индекс S2 для точки, заданной в формате (широта, долгота), используйте функцию [geoToS2](#geotools2). Также вы можете использовать функцию [s2togeo](#s2togeo) для получения географических координат, соответствующих заданному S2 индексу точки.
+
+## geoToS2 {#geotos2}
+
+Возвращает [S2](#s2index) индекс точки, соответствующий заданным координатам в формате `(долгота, широта)`.
+
+**Синтаксис**
+
+``` sql
+geoToS2(lon, lat)
+```
+
+**Аргументы**
+
+-   `lon` — долгота. [Float64](../../../sql-reference/data-types/float.md).
+-   `lat` — широта. [Float64](../../../sql-reference/data-types/float.md).
+
+**Возвращаемое значение**
+
+-  S2 индекс точки.
+
+Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT geoToS2(37.79506683, 55.71290588) AS s2Index;
+```
+
+Результат:
+
+``` text
+┌─────────────s2Index─┐
+│ 4704772434919038107 │
+└─────────────────────┘
+```
+
+## s2ToGeo {#s2togeo}
+
+Возвращает географические координаты `(долгота, широта)`, соответствующие заданному [S2](#s2index) индексу точки.
+
+**Синтаксис**
+
+``` sql
+s2ToGeo(s2index)
+```
+
+**Аргументы**
+
+-   `s2index` — [S2](#s2index) индекс. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   Кортеж их двух значений: `tuple(lon,lat)`.
+
+Тип: `lon` — [Float64](../../../sql-reference/data-types/float.md). `lat` — [Float64](../../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2ToGeo(4704772434919038107) AS s2Coodrinates;
+```
+
+Результат:
+
+``` text
+┌─s2Coodrinates────────────────────────┐
+│ (37.79506681471008,55.7129059052841) │
+└──────────────────────────────────────┘
+```
+
+## s2GetNeighbors {#s2getneighbors}
+
+Возвращает [S2](#s2index) индексы ячеек, которые являются соседними для заданного S2 индекса. Ячейка в системе S2 представляет собой прямоугольник, ограниченный четырьмя сторонами. Соответственно, у каждой ячейки есть 4 соседние ячейки.
+
+**Синтаксис**
+
+``` sql
+s2GetNeighbors(s2index)
+```
+
+**Аргументы**
+
+-   `s2index` — [S2](#s2index) индекс. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   Массив, содержащий 4 значения — S2 индекса соседних ячеек: `array[s2index1, s2index3, s2index2, s2index4]`.
+
+Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2GetNeighbors(5074766849661468672) AS s2Neighbors;
+```
+
+Результат:
+
+``` text
+┌─s2Neighbors───────────────────────────────────────────────────────────────────────┐
+│ [5074766987100422144,5074766712222515200,5074767536856236032,5074767261978329088] │
+└───────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## s2CellsIntersect {#s2cellsintersect}
+
+Проверяет, пересекаются ли две заданные ячейки или нет.
+
+**Синтаксис**
+
+``` sql
+s2CellsIntersect(s2index1, s2index2)
+```
+
+**Аргументы**
+
+-   `siIndex1`, `s2index2` — S2 индексы первой и второй ячейки. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   1 — ячейки пересекаются.
+-   0 — ячейки не пересекаются.
+
+Тип: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2CellsIntersect(9926595209846587392, 9926594385212866560) AS intersect;
+```
+
+Результат:
+
+``` text
+┌─intersect─┐
+│         1 │
+└───────────┘
+```
+
+## s2CapContains {#s2capcontains}
+
+Определяет, содержит ли заданный купол указанную точку. Купол представляет собой часть сферы, которая была отрезана плоскостью. Купол задается точкой на сфере и радиусом в градусах.
+
+**Синтаксис**
+
+``` sql
+s2CapContains(center, degrees, point)
+```
+
+**Аргументы**
+
+-   `center` — S2 индекс точки, определяющей центр купола. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `degrees` — радиус купола в градусах. [Float64](../../../sql-reference/data-types/float.md).
+-   `point` — S2 индекс проверяемой точки. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   1 — купол содержит точку.
+-   0 — купол не содержит точку.
+
+Тип: [UInt8](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2CapContains(1157339245694594829, 1.0, 1157347770437378819) AS capContains;
+```
+
+Результат:
+
+``` text
+┌─capContains─┐
+│           1 │
+└─────────────┘
+```
+
+## s2CapUnion {#s2capunion}
+
+Определяет наименьший купол, содержащий два заданных купола. Купол представляет собой часть сферы, которая была отрезана плоскостью. Купол задается точкой на сфере и радиусом в градусах.
+
+**Синтаксис**
+
+``` sql
+s2CapUnion(center1, radius1, center2, radius2)
+```
+
+**Аргументы**
+
+-   `center1`, `center2` — S2 индексы точек, определяющие два центра куполов. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `radius1`, `radius2` — значения радиусов в градусах, определяющие два радиуса куполов. [Float64](../../../sql-reference/data-types/float.md).
+
+**Возвращаемые значения**
+
+-   `center` — S2 индекс точки, соответствующий центру наименьшего купола, содержащего заданные купола. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `radius` — радиус в градусах наименьшего купола, содержащего заданные купола. Тип: [Float64](../../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2CapUnion(3814912406305146967, 1.0, 1157347770437378819, 1.0) AS capUnion;
+```
+
+Результат:
+
+``` text
+┌─capUnion───────────────────────────────┐
+│ (4534655147792050737,60.2088283994957) │
+└────────────────────────────────────────┘
+```
+
+## s2RectAdd {#s2rectadd}
+
+Увеличивает размер ограничивающего прямоугольника, чтобы включить в себя точку, заданную S2 индексом. В системе S2 прямоугольник представлен типом S2Region, называемым `S2LatLngRect`, который задает прямоугольник в пространстве широта-долгота.
+
+**Синтаксис**
+
+``` sql
+s2RectAdd(s2pointLow, s2pointHigh, s2Point)
+```
+
+**Аргументы**
+
+-   `s2PointLow` — S2 индекс нижней точки, которая задает ограничиваюший прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2PointHigh` — S2 индекс верхний точки, которая задает ограничиваюший прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Point` — S2 индекс целевой точки, которая будет содержаться увеличенным ограничивающим прямоугольником. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   `s2PointLow` — идентификатор нижней S2 ячейки, соответствующий увеличенному прямоугольнику. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2PointHigh` — идентификатор верхней S2 ячейки, соответствующий увеличенному прямоугольнику. Тип: [UInt64](../../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2RectAdd(5178914411069187297, 5177056748191934217, 5179056748191934217) AS rectAdd;
+```
+
+Результат:
+
+``` text
+┌─rectAdd───────────────────────────────────┐
+│ (5179062030687166815,5177056748191934217) │
+└───────────────────────────────────────────┘
+```
+
+## s2RectContains {#s2rectcontains}
+
+Проверяет, содержит ли заданный прямоугольник указанную S2 точку. В системе S2 прямоугольник представлен типом S2Region, называемым `S2LatLngRect`, который задает прямоугольник в пространстве широта-долгота.
+
+**Синтаксис**
+
+``` sql
+s2RectContains(s2PointLow, s2PointHi, s2Point)
+```
+
+**Аргументы**
+
+-   `s2PointLow` — S2 индекс самой низкой точки, которая задает прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2PointHigh` — S2 индекс самой высокой точки, которая задает прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Point` — S2 индекс проверяемой точки. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   1 — прямоугольник содержит заданную точку.
+-   0 — прямоугольник не содержит заданную точку.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2RectContains(5179062030687166815, 5177056748191934217, 5177914411069187297) AS rectContains;
+```
+
+Результат:
+
+``` text
+┌─rectContains─┐
+│            0 │
+└──────────────┘
+```
+
+## s2RectUinion {#s2rectunion}
+
+Возвращает наименьший прямоугольник, содержащий объединение двух заданных прямоугольников. В системе S2 прямоугольник представлен типом S2Region, называемым `S2LatLngRect`, который задает прямоугольник в пространстве широта-долгота.
+
+**Синтаксис**
+
+``` sql
+s2RectUnion(s2Rect1PointLow, s2Rect1PointHi, s2Rect2PointLow, s2Rect2PointHi)
+```
+
+**Аргументы**
+
+-   `s2Rect1PointLow`, `s2Rect1PointHi` — значения S2 индекса для самой низкой и самой высокой точек, которые задают первый прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Rect2PointLow`, `s2Rect2PointHi` — значения S2 индекса для самой низкой и самой высокой точек, которые задают второй прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   `s2UnionRect2PointLow` — идентификатор нижней ячейки, соответствующей объединенному прямоугольнику. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2UnionRect2PointHi` — идентификатор  верхней ячейки, соответствующей объединенному прямоугольнику. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2RectUnion(5178914411069187297, 5177056748191934217, 5179062030687166815, 5177056748191934217) AS rectUnion;
+```
+
+Результат:
+
+``` text
+┌─rectUnion─────────────────────────────────┐
+│ (5179062030687166815,5177056748191934217) │
+└───────────────────────────────────────────┘
+```
+
+## s2RectIntersection {#s2rectintersection}
+
+Возвращает наименьший прямоугольник, содержащий пересечение двух заданных прямоугольников. В системе S2 прямоугольник представлен типом S2Region, называемым `S2LatLngRect`, который задает прямоугольник в пространстве широта-долгота.
+
+**Синтаксис**
+
+``` sql
+s2RectIntersection(s2Rect1PointLow, s2Rect1PointHi, s2Rect2PointLow, s2Rect2PointHi)
+```
+
+**Аргументы**
+
+-   `s2Rect1PointLow`, `s2Rect1PointHi` — значения S2 индекса для самой низкой и самой высокой точек, которые задают первый прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2Rect2PointLow`, `s2Rect2PointHi` — значения S2 индекса для самой низкой и самой высокой точек, которые задают второй прямоугольник. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   `s2UnionRect2PointLow` — идентификатор нижней ячейки, соответствующей результирующему прямоугольнику. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+-   `s2UnionRect2PointHi` — идентификатор верхней ячейки, соответствующей результирующему прямоугольнику. Тип: [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT s2RectIntersection(5178914411069187297, 5177056748191934217, 5179062030687166815, 5177056748191934217) AS rectIntersection;
+```
+
+Результат:
+
+``` text
+┌─rectIntersection──────────────────────────┐
+│ (5178914411069187297,5177056748191934217) │
+└───────────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/hash-functions.md b/docs/ru/sql-reference/functions/hash-functions.md
index 07c741e0588..c7a738acd04 100644
--- a/docs/ru/sql-reference/functions/hash-functions.md
+++ b/docs/ru/sql-reference/functions/hash-functions.md
@@ -40,6 +40,10 @@ SELECT halfMD5(array('e','x','a'), 'mple', 10, toDateTime('2019-06-15 23:00:00')
 └────────────────────┴────────┘
 ```
 
+## MD4 {#hash_functions-md4}
+
+Вычисляет MD4 от строки и возвращает полученный набор байт в виде FixedString(16).
+
 ## MD5 {#hash_functions-md5}
 
 Вычисляет MD5 от строки и возвращает полученный набор байт в виде FixedString(16).
@@ -137,16 +141,49 @@ SELECT groupBitXor(cityHash64(*)) FROM table
 Вычисляет 64-битный хэш-код от целого числа любого типа.
 Работает быстрее, чем intHash32. Качество среднее.
 
-## SHA1 {#sha1}
+## SHA1, SHA224, SHA256, SHA512 {#sha}
 
-## SHA224 {#sha224}
+Вычисляет SHA-1, SHA-224, SHA-256, SHA-512 хеш строки и возвращает полученный набор байт в виде [FixedString](../data-types/fixedstring.md).
 
-## SHA256 {#sha256}
+**Синтаксис**
 
-Вычисляет SHA-1, SHA-224, SHA-256 от строки и возвращает полученный набор байт в виде FixedString(20), FixedString(28), FixedString(32).
-Функция работает достаточно медленно (SHA-1 - примерно 5 миллионов коротких строк в секунду на одном процессорном ядре, SHA-224 и SHA-256 - примерно 2.2 миллионов).
-Рекомендуется использовать эти функции лишь в тех случаях, когда вам нужна конкретная хэш-функция и вы не можете её выбрать.
-Даже в этих случаях, рекомендуется применять функцию оффлайн - заранее вычисляя значения при вставке в таблицу, вместо того, чтобы применять её при SELECT-ах.
+``` sql
+SHA1('s')
+...
+SHA512('s')
+```
+
+Функция работает достаточно медленно (SHA-1 — примерно 5 миллионов коротких строк в секунду на одном процессорном ядре, SHA-224 и SHA-256 — примерно 2.2 миллионов).
+Рекомендуется использовать эти функции лишь в тех случаях, когда вам нужна конкретная хеш-функция и вы не можете её выбрать.
+Даже в этих случаях рекомендуется применять функцию офлайн — заранее вычисляя значения при вставке в таблицу, вместо того чтобы применять её при выполнении `SELECT`.
+
+**Параметры**
+
+-   `s` — входная строка для вычисления хеша SHA. [String](../data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Хеш SHA в виде шестнадцатеричной некодированной строки FixedString. SHA-1 хеш как FixedString(20), SHA-224 как FixedString(28), SHA-256 — FixedString(32), SHA-512 — FixedString(64).
+
+Тип: [FixedString](../data-types/fixedstring.md).
+
+**Пример**
+
+Используйте функцию [hex](../functions/encoding-functions.md#hex) для представления результата в виде строки с шестнадцатеричной кодировкой.
+
+Запрос:
+
+``` sql
+SELECT hex(SHA1('abc'));
+```
+
+Результат:
+
+``` text
+┌─hex(SHA1('abc'))─────────────────────────┐
+│ A9993E364706816ABA3E25717850C26C9CD0D89D │
+└──────────────────────────────────────────┘
+```
 
 ## URLHash(url\[, N\]) {#urlhashurl-n}
 
diff --git a/docs/ru/sql-reference/functions/index.md b/docs/ru/sql-reference/functions/index.md
index 15da9d36ef5..a63c76d8833 100644
--- a/docs/ru/sql-reference/functions/index.md
+++ b/docs/ru/sql-reference/functions/index.md
@@ -58,6 +58,69 @@ str -> str != Referer
 
 Для некоторых функций первый аргумент (лямбда-функция) может отсутствовать. В этом случае подразумевается тождественное отображение.
 
+## Пользовательские функции SQL {#user-defined-functions}
+
+Функции можно создавать из лямбда выражений с помощью [CREATE FUNCTION](../statements/create/function.md). Для удаления таких функций используется выражение [DROP FUNCTION](../statements/drop.md#drop-function).
+
+## Исполняемые пользовательские функции {#executable-user-defined-functions}
+ClickHouse может вызывать внешнюю программу или скрипт для обработки данных. Такие функции описываются в [конфигурационном файле](../../operations/configuration-files.md). Путь к нему должен быть указан в настройке `user_defined_executable_functions_config` в основной конфигурации. В пути можно использовать символ подстановки `*`, тогда будут загружены все файлы, соответствующие шаблону. Пример:
+``` xml
+<user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
+```
+Файлы с описанием функций ищутся относительно каталога, заданного в настройке `user_files_path`.
+
+Конфигурация функции содержит следующие настройки:
+
+-   `name` - имя функции.
+-   `command` - исполняемая команда или скрипт.
+-   `argument` - описание аргумента, содержащее его тип во вложенной настройке `type`. Каждый аргумент описывается отдельно.
+-   `format` - [формат](../../interfaces/formats.md) передачи аргументов.
+-   `return_type` - тип возвращаемого значения.
+-   `type` - вариант запуска команды. Если задан вариант `executable`, то запускается одна команда. При указании `executable_pool` создается пул команд.
+-   `max_command_execution_time` - максимальное время в секундах, которое отводится на обработку блока данных. Эта настройка применима только для команд с вариантом запуска `executable_pool`. Необязательная настройка. Значение по умолчанию `10`.
+-   `command_termination_timeout` - максимальное время завершения команды в секундах после закрытия конвейера. Если команда не завершается, то процессу отправляется сигнал `SIGTERM`. Эта настройка применима только для команд с вариантом запуска `executable_pool`. Необязательная настройка. Значение по умолчанию `10`.
+-   `pool_size` - размер пула команд. Необязательная настройка. Значение по умолчанию `16`.
+-   `lifetime` - интервал перезагрузки функций в секундах. Если задан `0`, то функция не перезагружается.
+-   `send_chunk_header` - управляет отправкой количества строк перед отправкой блока данных для обработки. Необязательная настройка. Значение по умолчанию `false`.
+
+Команда должна читать аргументы из `STDIN` и выводить результат в `STDOUT`. Обработка должна выполняться в цикле. То есть после обработки группы аргументов команда должна ожидать следующую группу.
+
+**Пример**
+
+XML конфигурация, описывающая функцию `test_function`:
+```
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function</name>
+        <return_type>UInt64</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>cd /; clickhouse-local --input-format TabSeparated --output-format TabSeparated --structure 'x UInt64, y UInt64' --query "SELECT x + y FROM table"</command>
+        <lifetime>0</lifetime>
+    </function>
+</functions>
+```
+
+Запрос:
+
+``` sql
+SELECT test_function(toUInt64(2), toUInt64(2));
+```
+
+Результат:
+
+``` text
+┌─test_function(toUInt64(2), toUInt64(2))─┐
+│                                       4 │
+└─────────────────────────────────────────┘
+```
+
 ## Обработка ошибок {#obrabotka-oshibok}
 
 Некоторые функции могут кидать исключения в случае ошибочных данных. В этом случае, выполнение запроса прерывается, и текст ошибки выводится клиенту. При распределённой обработке запроса, при возникновении исключения на одном из серверов, на другие серверы пытается отправиться просьба тоже прервать выполнение запроса.
diff --git a/docs/ru/sql-reference/functions/introspection.md b/docs/ru/sql-reference/functions/introspection.md
index cb2bcdb787f..1947bfce42d 100644
--- a/docs/ru/sql-reference/functions/introspection.md
+++ b/docs/ru/sql-reference/functions/introspection.md
@@ -309,7 +309,7 @@ clone
 
 ## tid {#tid}
 
-Возвращает id потока, в котором обрабатывается текущий [Block](https://clickhouse.tech/docs/ru/development/architecture/#block).
+Возвращает id потока, в котором обрабатывается текущий [Block](https://clickhouse.com/docs/ru/development/architecture/#block).
 
 **Синтаксис**
 
@@ -339,7 +339,7 @@ SELECT tid();
 
 ## logTrace {#logtrace}
 
- Выводит сообщение в лог сервера для каждого [Block](https://clickhouse.tech/docs/ru/development/architecture/#block).
+ Выводит сообщение в лог сервера для каждого [Block](https://clickhouse.com/docs/ru/development/architecture/#block).
 
 **Синтаксис**
 
@@ -371,4 +371,4 @@ SELECT logTrace('logTrace message');
 └──────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/introspection/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/functions/introspection/) <!--hide-->
diff --git a/docs/ru/sql-reference/functions/json-functions.md b/docs/ru/sql-reference/functions/json-functions.md
index d20d8cf5998..4df0f8633ce 100644
--- a/docs/ru/sql-reference/functions/json-functions.md
+++ b/docs/ru/sql-reference/functions/json-functions.md
@@ -307,6 +307,76 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": [-100, 200.0], "b":{"c": {"d": "hello"
 └───────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
 
+## JSON_EXISTS(json, path) {#json-exists}
+
+Если значение существует в документе JSON, то возвращается 1.
+
+Если значение не существует, то возвращается 0.
+
+Пример:
+
+``` sql
+SELECT JSON_EXISTS('{"hello":1}', '$.hello');
+SELECT JSON_EXISTS('{"hello":{"world":1}}', '$.hello.world');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[*]');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[0]');
+```
+
+!!! note "Примечание"
+    до версии 21.11 порядок аргументов функции был обратный, т.е. JSON_EXISTS(path, json)
+
+## JSON_QUERY(json, path) {#json-query}
+
+Парсит JSON и извлекает значение как JSON массив или JSON объект.
+
+Если значение не существует, то возвращается пустая строка.
+
+Пример:
+
+``` sql
+SELECT JSON_QUERY('{"hello":"world"}', '$.hello');
+SELECT JSON_QUERY('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
+SELECT JSON_QUERY('{"hello":2}', '$.hello');
+SELECT toTypeName(JSON_QUERY('{"hello":2}', '$.hello'));
+```
+
+Результат:
+
+``` text
+["world"]
+[0, 1, 4, 0, -1, -4]
+[2]
+String
+```
+!!! note "Примечание"
+    до версии 21.11 порядок аргументов функции был обратный, т.е. JSON_QUERY(path, json)
+
+## JSON_VALUE(json, path) {#json-value}
+
+Парсит JSON и извлекает значение как JSON скаляр.
+
+Если значение не существует, то возвращается пустая строка.
+
+Пример:
+
+``` sql
+SELECT JSON_VALUE('{"hello":"world"}', '$.hello');
+SELECT JSON_VALUE('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
+SELECT JSON_VALUE('{"hello":2}', '$.hello');
+SELECT toTypeName(JSON_VALUE('{"hello":2}', '$.hello'));
+```
+
+Результат:
+
+``` text
+"world"
+0
+2
+String
+```
+
+!!! note "Примечание"
+    до версии 21.11 порядок аргументов функции был обратный, т.е. JSON_VALUE(path, json)
 
 ## toJSONString {#tojsonstring}
 
diff --git a/docs/ru/sql-reference/functions/logical-functions.md b/docs/ru/sql-reference/functions/logical-functions.md
index 837541ec58f..6ba55dca30f 100644
--- a/docs/ru/sql-reference/functions/logical-functions.md
+++ b/docs/ru/sql-reference/functions/logical-functions.md
@@ -19,6 +19,8 @@ toc_title: "Логические функции"
 and(val1, val2...)
 ```
 
+Чтобы вычислять функцию `and` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `vali` вычисляется только для строк, где условие `(val1 AND val2 AND ... AND val{i-1})` верно. Например, при выполнении запроса `SELECT and(number = 2, intDiv(1, number)) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
+
 **Аргументы**
 
 -   `val1, val2, ...` — список из как минимум двух значений. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Nullable](../../sql-reference/data-types/nullable.md).
@@ -71,6 +73,8 @@ SELECT and(NULL, 1, 10, -2);
 and(val1, val2...)
 ```
 
+Чтобы вычислять функцию `or` по короткой схеме, используйте настройку [short_circuit_function_evaluation](../../operations/settings/settings.md#short-circuit-function-evaluation). Если настройка включена, то выражение `vali` вычисляется только для строк, где условие `((NOT val1) AND (NOT val2) AND ... AND (NOT val{i-1}))` верно. Например, при выполнении запроса `SELECT or(number = 0, intDiv(1, number) != 0) FROM numbers(10)` не будет сгенерировано исключение из-за деления на ноль.
+
 **Аргументы**
 
 -   `val1, val2, ...` — список из как минимум двух значений. [Int](../../sql-reference/data-types/int-uint.md), [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Nullable](../../sql-reference/data-types/nullable.md).
diff --git a/docs/ru/sql-reference/functions/other-functions.md b/docs/ru/sql-reference/functions/other-functions.md
index a07bd19faa1..7d2cea0af4e 100644
--- a/docs/ru/sql-reference/functions/other-functions.md
+++ b/docs/ru/sql-reference/functions/other-functions.md
@@ -8,6 +8,7 @@ toc_title: "Прочие функции"
 ## hostName() {#hostname}
 
 Возвращает строку - имя хоста, на котором эта функция была выполнена. При распределённой обработке запроса, это будет имя хоста удалённого сервера, если функция выполняется на удалённом сервере.
+Если функция вызывается в контексте распределенной таблицы, то она генерирует обычный столбец со значениями, актуальными для каждого шарда. Иначе возвращается константа.
 
 ## getMacro {#getmacro}
 
@@ -643,10 +644,17 @@ SELECT
 ## uptime() {#uptime}
 
 Возвращает аптайм сервера в секундах.
+Если функция вызывается в контексте распределенной таблицы, то она генерирует обычный столбец со значениями, актуальными для каждого шарда. Иначе возвращается константа.
 
 ## version() {#version}
 
 Возвращает версию сервера в виде строки.
+Если функция вызывается в контексте распределенной таблицы, то она генерирует обычный столбец со значениями, актуальными для каждого шарда. Иначе возвращается константа.
+
+## buildId() {#buildid}
+
+Возвращает ID сборки, сгенерированный компилятором для данного сервера ClickHouse.
+Если функция вызывается в контексте распределенной таблицы, то она генерирует обычный столбец со значениями, актуальными для каждого шарда. Иначе возвращается константа.
 
 ## rowNumberInBlock {#function-rownumberinblock}
 
@@ -1148,7 +1156,7 @@ SELECT * FROM table WHERE indexHint(<expression>)
 
 Возвращает диапазон индекса, в котором выполняется заданное условие.
 
-Тип: [Uint8](https://clickhouse.yandex/docs/ru/data_types/int_uint/#diapazony-uint).
+Тип: [Uint8](https://clickhouse.com/docs/ru/data_types/int_uint/#diapazony-uint).
 
 **Пример**
 
@@ -2088,3 +2096,318 @@ SELECT tcpPort();
 
 -   [tcp_port](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-tcp_port)
 
+## currentProfiles {#current-profiles}
+
+Возвращает список [профилей настроек](../../operations/access-rights.md#settings-profiles-management) для текущего пользователя.
+
+Для изменения текущего профиля настроек может быть использована команда SET PROFILE. Если команда `SET PROFILE` не применялась, функция возвращает профили, указанные при определении текущего пользователя (см. [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement)).
+
+**Синтаксис**
+
+``` sql
+currentProfiles()
+```
+
+**Возвращаемое значение**
+
+-   Список профилей настроек для текущего пользователя.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## enabledProfiles {#enabled-profiles}
+
+Возвращает профили настроек, назначенные пользователю как явно, так и неявно. Явно назначенные профили — это те же профили, которые возвращает функция [currentProfiles](#current-profiles). Неявно назначенные профили включают родительские профили других назначенных профилей; профили, назначенные с помощью предоставленных ролей; профили, назначенные с помощью собственных настроек; основной профиль по умолчанию (см. секцию `default_profile` в основном конфигурационном файле сервера).
+
+**Синтаксис**
+
+``` sql
+enabledProfiles()
+```
+
+**Возвращаемое значение**
+
+-   Список доступных профилей для текущего пользователя.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## defaultProfiles {#default-profiles}
+
+Возвращает все профили, указанные при объявлении текущего пользователя (см. [CREATE USER](../../sql-reference/statements/create/user.md#create-user-statement))
+
+**Синтаксис**
+
+``` sql
+defaultProfiles()
+```
+
+**Возвращаемое значение**
+
+-   Список профилей по умолчанию.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## currentRoles {#current-roles}
+
+Возвращает список текущих ролей для текущего пользователя. Список ролей пользователя можно изменить с помощью выражения [SET ROLE](../../sql-reference/statements/set-role.md#set-role-statement). Если выражение `SET ROLE` не использовалось, данная функция возвращает тот же результат, что и функция [defaultRoles](#default-roles).
+
+**Синтаксис**
+
+``` sql
+currentRoles()
+```
+
+**Возвращаемое значение**
+
+-   Список текущих ролей для текущего пользователя. 
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## enabledRoles {#enabled-roles}
+
+Возвращает имена текущих ролей, а также ролей, которые разрешено использовать текущему пользователю путем назначения привилегий.
+
+**Синтаксис**
+
+``` sql
+enabledRoles()
+```
+
+**Возвращаемое значение**
+
+-   Список доступных ролей для текущего пользователя. 
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## defaultRoles {#default-roles}
+
+Возвращает имена ролей, которые задаются по умолчанию для текущего пользователя при входе в систему. Изначально это все роли, которые разрешено использовать текущему пользователю (см. [GRANT](../../sql-reference/statements/grant/#grant-select)). Список ролей по умолчанию может быть изменен с помощью выражения [SET DEFAULT ROLE](../../sql-reference/statements/set-role.md#set-default-role-statement). 
+
+**Синтаксис**
+
+``` sql
+defaultRoles()
+```
+
+**Возвращаемое значение**
+
+-   Список ролей по умолчанию. 
+
+Тип: [Array](../../sql-reference/data-types/array.md)([String](../../sql-reference/data-types/string.md)).
+
+## getServerPort {#getserverport}
+
+Возвращает номер порта сервера. Если порт не используется сервером, генерируется исключение.
+
+**Синтаксис**
+
+``` sql
+getServerPort(port_name)
+```
+
+**Аргументы**
+
+-   `port_name` — имя порта сервера. [String](../../sql-reference/data-types/string.md#string). Возможные значения:
+
+    -   'tcp_port'
+    -   'tcp_port_secure'
+    -   'http_port'
+    -   'https_port'
+    -   'interserver_http_port'
+    -   'interserver_https_port'
+    -   'mysql_port'
+    -   'postgresql_port'
+    -   'grpc_port'
+    -   'prometheus.port'
+
+**Возвращаемое значение**
+
+-   Номер порта сервера.
+
+Тип: [UInt16](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT getServerPort('tcp_port');
+```
+
+Результат:
+
+``` text
+┌─getServerPort('tcp_port')─┐
+│ 9000                      │
+└───────────────────────────┘
+```
+
+## queryID {#query-id}
+
+Возвращает идентификатор текущего запроса. Другие параметры запроса могут быть извлечены из системной таблицы [system.query_log](../../operations/system-tables/query_log.md) через `query_id`.
+
+В отличие от [initialQueryID](#initial-query-id), функция `queryID` может возвращать различные значения для разных шардов (см. пример).
+
+**Синтаксис**
+
+``` sql
+queryID()
+```
+
+**Возвращаемое значение**
+
+-   Идентификатор текущего запроса.
+
+Тип: [String](../../sql-reference/data-types/string.md)
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE tmp (str String) ENGINE = Log;
+INSERT INTO tmp (*) VALUES ('a');
+SELECT count(DISTINCT t) FROM (SELECT queryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
+```
+
+Результат:
+
+``` text
+┌─count()─┐
+│ 3       │
+└─────────┘
+```
+
+## initialQueryID {#initial-query-id}
+
+Возвращает идентификатор родительского запроса. Другие параметры запроса могут быть извлечены из системной таблицы [system.query_log](../../operations/system-tables/query_log.md) через `initial_query_id`.
+
+В отличие от [queryID](#query-id), функция `initialQueryID` возвращает одинаковые значения для разных шардов (см. пример).
+
+**Синтаксис**
+
+``` sql
+initialQueryID()
+```
+
+**Возвращаемое значение**
+
+-   Идентификатор родительского запроса.
+
+Тип: [String](../../sql-reference/data-types/string.md)
+
+**Пример**
+
+Запрос:
+
+``` sql
+CREATE TABLE tmp (str String) ENGINE = Log;
+INSERT INTO tmp (*) VALUES ('a');
+SELECT count(DISTINCT t) FROM (SELECT initialQueryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
+```
+
+Результат:
+
+``` text
+┌─count()─┐
+│ 1       │
+└─────────┘
+```
+
+## shardNum {#shard-num}
+
+Возвращает индекс шарда, который обрабатывает часть данных распределенного запроса. Индексы начинаются с `1`.
+Если запрос не распределенный, то возвращается значение `0`.
+
+**Синтаксис**
+
+``` sql
+shardNum()
+```
+
+**Возвращаемое значение**
+
+-   индекс шарда или константа `0`.
+
+Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**Пример**
+
+В примере ниже используется конфигурация с двумя шардами. На каждом шарде выполняется запрос к таблице [system.one](../../operations/system-tables/one.md).
+
+Запрос:
+
+``` sql
+CREATE TABLE shard_num_example (dummy UInt8) 
+    ENGINE=Distributed(test_cluster_two_shards_localhost, system, one, dummy);
+SELECT dummy, shardNum(), shardCount() FROM shard_num_example;
+```
+
+Результат:
+
+``` text
+┌─dummy─┬─shardNum()─┬─shardCount()─┐
+│     0 │          2 │            2 │
+│     0 │          1 │            2 │
+└───────┴────────────┴──────────────┘
+```
+
+**См. также**
+
+-   Табличный движок [Distributed](../../engines/table-engines/special/distributed.md)
+
+## shardCount {#shard-count}
+
+Возвращает общее количество шардов для распределенного запроса.
+Если запрос не распределенный, то возвращается значение `0`.
+
+**Синтаксис**
+
+``` sql
+shardCount()
+```
+
+**Возвращаемое значение**
+
+-   Общее количество шардов или `0`.
+
+Тип: [UInt32](../../sql-reference/data-types/int-uint.md).
+
+**См. также**
+
+- Пример использования функции [shardNum()](#shard-num) также содержит вызов `shardCount()`.
+
+## getOSKernelVersion {#getoskernelversion}
+
+Возвращает строку с текущей версией ядра ОС.
+
+**Синтаксис**
+
+``` sql
+getOSKernelVersion()
+```
+
+**Аргументы**
+
+-   Нет.
+
+**Возвращаемое значение**
+
+-   Текущая версия ядра ОС.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT getOSKernelVersion();
+```
+
+Результат:
+
+``` text
+┌─getOSKernelVersion()────┐
+│ Linux 4.15.0-55-generic │
+└─────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/rounding-functions.md b/docs/ru/sql-reference/functions/rounding-functions.md
index 276f85bf6b7..1eede1ea57c 100644
--- a/docs/ru/sql-reference/functions/rounding-functions.md
+++ b/docs/ru/sql-reference/functions/rounding-functions.md
@@ -27,7 +27,7 @@ N может быть отрицательным.
 
 Округляет значение до указанного десятичного разряда.
 
-Функция возвращает ближайшее значение указанного порядка. В случае, когда заданное число равноудалено от чисел необходимого порядка, функция возвращает то из них, которое имеет ближайшую чётную цифру (банковское округление).
+Функция возвращает ближайшее значение указанного порядка. В случае, когда заданное число равноудалено от чисел необходимого порядка, для типов с плавающей точкой (Float32/64) функция возвращает то из них, которое имеет ближайшую чётную цифру (банковское округление), для типов с фиксированной точкой (Decimal) функция использует округление в бо́льшую по модулю сторону (математическое округление).
 
 ``` sql
 round(expression [, decimal_places])
@@ -47,7 +47,7 @@ round(expression [, decimal_places])
 
 ### Примеры {#primery}
 
-**Пример использования**
+**Пример использования с Float**
 
 ``` sql
 SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
@@ -61,6 +61,21 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 └─────┴──────────────────────────┘
 ```
 
+**Пример использования с Decimal**
+
+
+``` sql
+SELECT cast(number / 2 AS  Decimal(10,4)) AS x, round(x) FROM system.numbers LIMIT 3
+```
+
+``` text
+┌──────x─┬─round(CAST(divide(number, 2), 'Decimal(10, 4)'))─┐
+│ 0.0000 │                                           0.0000 │
+│ 0.5000 │                                           1.0000 │
+│ 1.0000 │                                           1.0000 │
+└────────┴──────────────────────────────────────────────────┘
+```
+
 **Примеры округления**
 
 Округление до ближайшего числа.
diff --git a/docs/ru/sql-reference/functions/splitting-merging-functions.md b/docs/ru/sql-reference/functions/splitting-merging-functions.md
index efe74dba043..99eda621e72 100644
--- a/docs/ru/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/ru/sql-reference/functions/splitting-merging-functions.md
@@ -232,3 +232,41 @@ SELECT alphaTokens('abca1abc');
 │ ['abca','abc']          │
 └─────────────────────────┘
 ```
+
+## ngrams {#ngrams}
+
+Выделяет из UTF-8 строки отрезки (n-граммы) размером `ngramsize` символов.
+
+**Синтаксис** 
+
+``` sql
+ngrams(string, ngramsize)
+```
+
+**Аргументы**
+
+-   `string` — строка. [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md).
+-   `ngramsize` — размер n-грамм. [UInt](../../sql-reference/data-types/int-uint.md).
+
+**Возвращаемые значения**
+
+-   Массив с n-граммами.
+
+Тип: [Array](../../sql-reference/data-types/array.md)([FixedString](../../sql-reference/data-types/fixedstring.md)).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT ngrams('ClickHouse', 3);
+```
+
+Результат:
+
+``` text
+┌─ngrams('ClickHouse', 3)───────────────────────────┐
+│ ['Cli','lic','ick','ckH','kHo','Hou','ous','use'] │
+└───────────────────────────────────────────────────┘
+```
+
diff --git a/docs/ru/sql-reference/functions/string-functions.md b/docs/ru/sql-reference/functions/string-functions.md
index b587a991db1..10ecc6c0a83 100644
--- a/docs/ru/sql-reference/functions/string-functions.md
+++ b/docs/ru/sql-reference/functions/string-functions.md
@@ -7,16 +7,83 @@ toc_title: "Функции для работы со строками"
 
 ## empty {#empty}
 
-Возвращает 1 для пустой строки, и 0 для непустой строки.
-Тип результата — UInt8.
-Строка считается непустой, если содержит хотя бы один байт, пусть даже это пробел или нулевой байт.
-Функция также работает для массивов.
+Проверяет, является ли входная строка пустой.
+
+**Синтаксис**
+
+``` sql
+empty(x)
+```
+
+Строка считается непустой, если содержит хотя бы один байт, пусть даже это пробел или нулевой байт. 
+
+Функция также поддерживает работу с типами [Array](array-functions.md#function-empty) и [UUID](uuid-functions.md#empty).
+
+**Параметры**
+
+-   `x` — Входная строка. [String](../data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Возвращает `1` для пустой строки и `0` — для непустой строки.
+
+Тип: [UInt8](../data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT empty('text');
+```
+
+Результат:
+
+```text
+┌─empty('text')─┐
+│             0 │
+└───────────────┘
+```
 
 ## notEmpty {#notempty}
 
-Возвращает 0 для пустой строки, и 1 для непустой строки.
-Тип результата — UInt8.
-Функция также работает для массивов.
+Проверяет, является ли входная строка непустой.
+
+**Синтаксис**
+
+``` sql
+notEmpty(x)
+```
+
+Строка считается непустой, если содержит хотя бы один байт, пусть даже это пробел или нулевой байт. 
+
+Функция также поддерживает работу с типами [Array](array-functions.md#function-notempty) и [UUID](uuid-functions.md#notempty).
+
+**Параметры**
+
+-   `x` — Входная строка. [String](../data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Возвращает `1` для непустой строки и `0` — для пустой строки.
+
+Тип: [UInt8](../data-types/int-uint.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT notEmpty('text');
+```
+
+Результат:
+
+```text
+┌─notEmpty('text')─┐
+│                1 │
+└──────────────────┘
+```
 
 ## length {#length}
 
@@ -39,6 +106,158 @@ toc_title: "Функции для работы со строками"
 Возвращает длину строки в кодовых точках Unicode (не символах), при допущении, что строка содержит набор байтов, являющийся текстом в кодировке UTF-8. Если допущение не выполнено, возвращает какой-нибудь результат (не кидает исключение).
 Тип результата — UInt64.
 
+## leftPad {#leftpad}
+
+Дополняет текущую строку слева пробелами или указанной строкой (несколько раз, если необходимо), пока результирующая строка не достигнет заданной длины. Соответствует MySQL функции `LPAD`.
+
+**Синтаксис**
+
+``` sql
+leftPad('string', 'length'[, 'pad_string'])
+```
+
+**Параметры**
+
+-   `string` — входная строка, которую необходимо дополнить. [String](../data-types/string.md).
+-   `length` — длина результирующей строки. [UInt](../data-types/int-uint.md). Если указанное значение меньше, чем длина входной строки, то входная строка возвращается как есть.
+-   `pad_string` — строка, используемая для дополнения входной строки. [String](../data-types/string.md). Необязательный параметр. Если не указано, то входная строка дополняется пробелами.
+
+**Возвращаемое значение**
+
+-   Результирующая строка заданной длины.
+
+Type: [String](../data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT leftPad('abc', 7, '*'), leftPad('def', 7);
+```
+
+Результат:
+
+``` text
+┌─leftPad('abc', 7, '*')─┬─leftPad('def', 7)─┐
+│ ****abc                │     def           │
+└────────────────────────┴───────────────────┘
+```
+
+## leftPadUTF8 {#leftpadutf8}
+
+Дополняет текущую строку слева пробелами или указанной строкой (несколько раз, если необходимо), пока результирующая строка не достигнет заданной длины. Соответствует MySQL функции `LPAD`. В отличие от функции [leftPad](#leftpad), измеряет длину строки не в байтах, а в кодовых точках Unicode.
+
+**Синтаксис**
+
+``` sql
+leftPadUTF8('string','length'[, 'pad_string'])
+```
+
+**Параметры**
+
+-   `string` — входная строка, которую необходимо дополнить. [String](../data-types/string.md).
+-   `length` — длина результирующей строки. [UInt](../data-types/int-uint.md). Если указанное значение меньше, чем длина входной строки, то входная строка возвращается как есть.
+-   `pad_string` — строка, используемая для дополнения входной строки. [String](../data-types/string.md). Необязательный параметр. Если не указано, то входная строка дополняется пробелами.
+
+**Возвращаемое значение**
+
+-   Результирующая строка заданной длины.
+
+Type: [String](../data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT leftPadUTF8('абвг', 7, '*'), leftPadUTF8('дежз', 7);
+```
+
+Результат:
+
+``` text
+┌─leftPadUTF8('абвг', 7, '*')─┬─leftPadUTF8('дежз', 7)─┐
+│ ***абвг                     │    дежз                │
+└─────────────────────────────┴────────────────────────┘
+```
+
+## rightPad {#rightpad}
+
+Дополняет текущую строку справа пробелами или указанной строкой (несколько раз, если необходимо), пока результирующая строка не достигнет заданной длины. Соответствует MySQL функции `RPAD`.
+
+**Синтаксис**
+
+``` sql
+rightPad('string', 'length'[, 'pad_string'])
+```
+
+**Параметры**
+
+-   `string` — входная строка, которую необходимо дополнить. [String](../data-types/string.md).
+-   `length` — длина результирующей строки. [UInt](../data-types/int-uint.md). Если указанное значение меньше, чем длина входной строки, то входная строка возвращается как есть.
+-   `pad_string` — строка, используемая для дополнения входной строки. [String](../data-types/string.md). Необязательный параметр. Если не указано, то входная строка дополняется пробелами.
+
+**Возвращаемое значение**
+
+-   Результирующая строка заданной длины.
+
+Type: [String](../data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT rightPad('abc', 7, '*'), rightPad('abc', 7);
+```
+
+Результат:
+
+``` text
+┌─rightPad('abc', 7, '*')─┬─rightPad('abc', 7)─┐
+│ abc****                 │ abc                │
+└─────────────────────────┴────────────────────┘
+```
+
+## rightPadUTF8 {#rightpadutf8}
+
+Дополняет текущую строку слева пробелами или указанной строкой (несколько раз, если необходимо), пока результирующая строка не достигнет заданной длины. Соответствует MySQL функции `RPAD`. В отличие от функции [rightPad](#rightpad), измеряет длину строки не в байтах, а в кодовых точках Unicode.
+
+**Синтаксис**
+
+``` sql
+rightPadUTF8('string','length'[, 'pad_string'])
+```
+
+**Параметры**
+
+-   `string` — входная строка, которую необходимо дополнить. [String](../data-types/string.md).
+-   `length` — длина результирующей строки. [UInt](../data-types/int-uint.md). Если указанное значение меньше, чем длина входной строки, то входная строка возвращается как есть.
+-   `pad_string` — строка, используемая для дополнения входной строки. [String](../data-types/string.md). Необязательный параметр. Если не указано, то входная строка дополняется пробелами.
+
+**Возвращаемое значение**
+
+-   Результирующая строка заданной длины.
+
+Type: [String](../data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT rightPadUTF8('абвг', 7, '*'), rightPadUTF8('абвг', 7);
+```
+
+Результат:
+
+``` text
+┌─rightPadUTF8('абвг', 7, '*')─┬─rightPadUTF8('абвг', 7)─┐
+│ абвг***                      │ абвг                    │
+└──────────────────────────────┴─────────────────────────┘
+```
+
 ## lower, lcase {#lower}
 
 Переводит ASCII-символы латиницы в строке в нижний регистр.
@@ -562,6 +781,150 @@ SELECT normalizedQueryHash('SELECT 1 AS `xyz`') != normalizedQueryHash('SELECT 1
 └─────┘
 ```
 
+## normalizeUTF8NFC {#normalizeutf8nfc}
+
+Преобразует строку в нормализованную форму [NFC](https://ru.wikipedia.org/wiki/Юникод#Алгоритмы_нормализации), предполагая, что строка содержит набор байтов, составляющих текст в кодировке UTF-8.
+
+**Синтаксис**
+
+``` sql
+normalizeUTF8NFC(words)
+```
+
+**Аргументы**
+
+-   `words` — входная строка, которая содержит набор байтов, составляющих текст в кодировке UTF-8. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Строка, преобразованная в нормализированную форму NFC.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFC('â') AS nfc, length(nfc) AS nfc_len;
+```
+
+Результат:
+
+``` text
+┌─length('â')─┬─nfc─┬─nfc_len─┐
+│           2 │ â   │       2 │
+└─────────────┴─────┴─────────┘
+```
+
+## normalizeUTF8NFD {#normalizeutf8nfd}
+
+Преобразует строку в нормализованную форму [NFD](https://ru.wikipedia.org/wiki/Юникод#Алгоритмы_нормализации), предполагая, что строка содержит набор байтов, составляющих текст в кодировке UTF-8.
+
+**Синтаксис**
+
+``` sql
+normalizeUTF8NFD(words)
+```
+
+**Аргументы**
+
+-   `words` — входная строка, которая содержит набор байтов, составляющих текст в кодировке UTF-8. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Строка, преобразованная в нормализированную форму NFD.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFD('â') AS nfd, length(nfd) AS nfd_len;
+```
+
+Результат:
+
+``` text
+┌─length('â')─┬─nfd─┬─nfd_len─┐
+│           2 │ â   │       3 │
+└─────────────┴─────┴─────────┘
+```
+
+## normalizeUTF8NFKC {#normalizeutf8nfkc}
+
+Преобразует строку в нормализованную форму [NFKC](https://ru.wikipedia.org/wiki/Юникод#Алгоритмы_нормализации), предполагая, что строка содержит набор байтов, составляющих текст в кодировке UTF-8.
+
+**Синтаксис**
+
+``` sql
+normalizeUTF8NFKC(words)
+```
+
+**Аргументы**
+
+-   `words` — входная строка, которая содержит набор байтов, составляющих текст в кодировке UTF-8. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Строка, преобразованная в нормализированную форму NFKC.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFKC('â') AS nfkc, length(nfkc) AS nfkc_len;
+```
+
+Результат:
+
+``` text
+┌─length('â')─┬─nfkc─┬─nfkc_len─┐
+│           2 │ â    │        2 │
+└─────────────┴──────┴──────────┘
+```
+
+## normalizeUTF8NFKD {#normalizeutf8nfkd}
+
+Преобразует строку в нормализованную форму [NFKD](https://ru.wikipedia.org/wiki/Юникод#Алгоритмы_нормализации), предполагая, что строка содержит набор байтов, составляющих текст в кодировке UTF-8.
+
+**Синтаксис**
+
+``` sql
+normalizeUTF8NFKD(words)
+```
+
+**Аргументы**
+
+-   `words` — входная строка, которая содержит набор байтов, составляющих текст в кодировке UTF-8. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Строка, преобразованная в нормализированную форму NFKD.
+
+Тип: [String](../../sql-reference/data-types/string.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT length('â'), normalizeUTF8NFKD('â') AS nfkd, length(nfkd) AS nfkd_len;
+```
+
+Результат:
+
+``` text
+┌─length('â')─┬─nfkd─┬─nfkd_len─┐
+│           2 │ â    │        3 │
+└─────────────┴──────┴──────────┘
+```
+
 ## encodeXMLComponent {#encode-xml-component}
 
 Экранирует символы для размещения строки в текстовом узле или атрибуте XML.
diff --git a/docs/ru/sql-reference/functions/string-search-functions.md b/docs/ru/sql-reference/functions/string-search-functions.md
index 5b6cbc68d2e..5bbd760bfb6 100644
--- a/docs/ru/sql-reference/functions/string-search-functions.md
+++ b/docs/ru/sql-reference/functions/string-search-functions.md
@@ -486,7 +486,7 @@ SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[
 
 ## ilike {#ilike}
 
-Нечувствительный к регистру вариант функции [like](https://clickhouse.tech/docs/ru/sql-reference/functions/string-search-functions/#function-like). Вы можете использовать оператор `ILIKE` вместо функции `ilike`.
+Нечувствительный к регистру вариант функции [like](https://clickhouse.com/docs/ru/sql-reference/functions/string-search-functions/#function-like). Вы можете использовать оператор `ILIKE` вместо функции `ilike`.
 
 **Синтаксис**
 
@@ -542,7 +542,7 @@ SELECT * FROM Months WHERE ilike(name, '%j%');
 
 **Смотрите также**
 
--   [like](https://clickhouse.tech/docs/ru/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
+-   [like](https://clickhouse.com/docs/ru/sql-reference/functions/string-search-functions/#function-like) <!--hide-->
 
 ## ngramDistance(haystack, needle) {#ngramdistancehaystack-needle}
 
diff --git a/docs/ru/sql-reference/functions/tuple-functions.md b/docs/ru/sql-reference/functions/tuple-functions.md
index 381743a450b..0870aa5793b 100644
--- a/docs/ru/sql-reference/functions/tuple-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-functions.md
@@ -163,3 +163,805 @@ SELECT tupleHammingDistance(wordShingleMinHash(string), wordShingleMinHashCaseIn
 │               2 │
 └─────────────────┘
 ```
+
+## tuplePlus {#tupleplus}
+
+Вычисляет сумму соответствующих значений двух кортежей одинакового размера.
+
+**Синтаксис**
+
+```sql
+tuplePlus(tuple1, tuple2)
+```
+
+Синоним: `vectorSum`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с суммами.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tuplePlus((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─tuplePlus((1, 2), (2, 3))─┐
+│ (3,5)                     │
+└───────────────────────────┘
+```
+
+## tupleMinus {#tupleminus}
+
+Вычисляет разность соответствующих значений двух кортежей одинакового размера.
+
+**Синтаксис**
+
+```sql
+tupleMinus(tuple1, tuple2)
+```
+
+Синоним: `vectorDifference`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с разностями.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tupleMinus((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─tupleMinus((1, 2), (2, 3))─┐
+│ (-1,-1)                    │
+└────────────────────────────┘
+```
+
+## tupleMultiply {#tuplemultiply}
+
+Вычисляет произведение соответствующих значений двух кортежей одинакового размера.
+
+**Синтаксис**
+
+```sql
+tupleMultiply(tuple1, tuple2)
+```
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с произведениями.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tupleMultiply((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─tupleMultiply((1, 2), (2, 3))─┐
+│ (2,6)                         │
+└───────────────────────────────┘
+```
+
+## tupleDivide {#tupledivide}
+
+Вычисляет частное соответствующих значений двух кортежей одинакового размера. Обратите внимание, что при делении на ноль возвращается значение `inf`.
+
+**Синтаксис**
+
+```sql
+tupleDivide(tuple1, tuple2)
+```
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с частными.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tupleDivide((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─tupleDivide((1, 2), (2, 3))─┐
+│ (0.5,0.6666666666666666)    │
+└─────────────────────────────┘
+```
+
+## tupleNegate {#tuplenegate}
+
+Применяет отрицание ко всем значениям кортежа.
+
+**Синтаксис**
+
+```sql
+tupleNegate(tuple)
+```
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с результатом отрицания.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tupleNegate((1, 2));
+```
+
+Результат:
+
+```text
+┌─tupleNegate((1, 2))─┐
+│ (-1,-2)             │
+└─────────────────────┘
+```
+
+## tupleMultiplyByNumber {#tuplemultiplybynumber}
+
+Возвращает кортеж, в котором значения всех элементов умножены на заданное число.
+
+**Синтаксис**
+
+```sql
+tupleMultiplyByNumber(tuple, number)
+```
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `number` — множитель. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с результатами умножения на число.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tupleMultiplyByNumber((1, 2), -2.1);
+```
+
+Результат:
+
+```text
+┌─tupleMultiplyByNumber((1, 2), -2.1)─┐
+│ (-2.1,-4.2)                         │
+└─────────────────────────────────────┘
+```
+
+## tupleDivideByNumber {#tupledividebynumber}
+
+Возвращает кортеж, в котором значения всех элементов поделены на заданное число. Обратите внимание, что при делении на ноль возвращается значение `inf`.
+
+**Синтаксис**
+
+```sql
+tupleDivideByNumber(tuple, number)
+```
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `number` — делитель. [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) or [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Возвращаемое значение**
+
+-   Кортеж с результатами деления на число.
+
+Тип: [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT tupleDivideByNumber((1, 2), 0.5);
+```
+
+Результат:
+
+```text
+┌─tupleDivideByNumber((1, 2), 0.5)─┐
+│ (2,4)                            │
+└──────────────────────────────────┘
+```
+
+## dotProduct {#dotproduct}
+
+Вычисляет скалярное произведение двух кортежей одинакового размера.
+
+**Синтаксис**
+
+```sql
+dotProduct(tuple1, tuple2)
+```
+
+Синоним: `scalarProduct`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+
+**Возвращаемое значение**
+
+-   Скалярное произведение.
+
+Тип: [Int/UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT dotProduct((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─dotProduct((1, 2), (2, 3))─┐
+│                          8 │
+└────────────────────────────┘
+```
+
+## L1Norm {#l1norm}
+
+Вычисляет сумму абсолютных значений кортежа.
+
+**Синтаксис**
+
+```sql
+L1Norm(tuple)
+```
+
+Синоним: `normL1`.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   L1-норма или [расстояние городских кварталов](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%B8%D1%85_%D0%BA%D0%B2%D0%B0%D1%80%D1%82%D0%B0%D0%BB%D0%BE%D0%B2).
+
+Тип: [UInt](../../sql-reference/data-types/int-uint.md), [Float](../../sql-reference/data-types/float.md) или [Decimal](../../sql-reference/data-types/decimal.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT L1Norm((1, 2));
+```
+
+Результат:
+
+```text
+┌─L1Norm((1, 2))─┐
+│              3 │
+└────────────────┘
+```
+
+## L2Norm {#l2norm}
+
+Вычисляет квадратный корень из суммы квадратов значений кортежа.
+
+**Синтаксис**
+
+```sql
+L2Norm(tuple)
+```
+
+Синоним: `normL2`.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   L2-норма или [Евклидово расстояние](https://ru.wikipedia.org/wiki/%D0%95%D0%B2%D0%BA%D0%BB%D0%B8%D0%B4%D0%BE%D0%B2%D0%B0_%D0%BC%D0%B5%D1%82%D1%80%D0%B8%D0%BA%D0%B0).
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT L2Norm((1, 2));
+```
+
+Результат:
+
+```text
+┌───L2Norm((1, 2))─┐
+│ 2.23606797749979 │
+└──────────────────┘
+```
+
+## LinfNorm {#linfnorm}
+
+Вычисляет максимум из абсолютных значений кортежа.
+
+**Синтаксис**
+
+```sql
+LinfNorm(tuple)
+```
+
+Синоним: `normLinf`.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Linf-норма или максимальное абсолютное значение.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT LinfNorm((1, -2));
+```
+
+Результат:
+
+```text
+┌─LinfNorm((1, -2))─┐
+│                 2 │
+└───────────────────┘
+```
+
+## LpNorm {#lpnorm}
+
+Возвращает корень степени `p` из суммы абсолютных значений кортежа, возведенных в степень `p`.
+
+**Синтаксис**
+
+```sql
+LpNorm(tuple, p)
+```
+
+Синоним: `normLp`.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `p` — степень. Возможные значение: любое число из промежутка [1;inf). [UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+
+**Возвращаемое значение**
+
+-   [Lp-норма](https://ru.wikipedia.org/wiki/%D0%9D%D0%BE%D1%80%D0%BC%D0%B0_(%D0%BC%D0%B0%D1%82%D0%B5%D0%BC%D0%B0%D1%82%D0%B8%D0%BA%D0%B0)#%D0%9D%D0%B5%D0%BA%D0%BE%D1%82%D0%BE%D1%80%D1%8B%D0%B5_%D0%B2%D0%B8%D0%B4%D1%8B_%D0%BC%D0%B0%D1%82%D1%80%D0%B8%D1%87%D0%BD%D1%8B%D1%85_%D0%BD%D0%BE%D1%80%D0%BC)
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT LpNorm((1, -2),2);
+```
+
+Результат:
+
+```text
+┌─LpNorm((1, -2), 2)─┐
+│   2.23606797749979 │
+└────────────────────┘
+```
+
+## L1Distance {#l1distance}
+
+Вычисляет расстояние между двумя точками (значения кортежей — координаты точек) в пространстве `L1` ([расстояние городских кварталов](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%B8%D1%85_%D0%BA%D0%B2%D0%B0%D1%80%D1%82%D0%B0%D0%BB%D0%BE%D0%B2)).
+
+**Синтаксис**
+
+```sql
+L1Distance(tuple1, tuple2)
+```
+
+Синоним: `distanceL1`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Расстояние в норме L1.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT L1Distance((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─L1Distance((1, 2), (2, 3))─┐
+│                          2 │
+└────────────────────────────┘
+```
+
+## L2Distance {#l2distance}
+
+Вычисляет расстояние между двумя точками (значения кортежей — координаты точек) в пространстве `L2` ([Евклидово расстояние](https://ru.wikipedia.org/wiki/%D0%95%D0%B2%D0%BA%D0%BB%D0%B8%D0%B4%D0%BE%D0%B2%D0%B0_%D0%BC%D0%B5%D1%82%D1%80%D0%B8%D0%BA%D0%B0)).
+
+**Синтаксис**
+
+```sql
+L2Distance(tuple1, tuple2)
+```
+
+Синоним: `distanceL2`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Расстояние в норме L2.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT L2Distance((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─L2Distance((1, 2), (2, 3))─┐
+│         1.4142135623730951 │
+└────────────────────────────┘
+```
+
+## LinfDistance {#linfdistance}
+
+Вычисляет расстояние между двумя точками (значения кортежей — координаты точек) в пространстве [`L_{inf}`](https://ru.wikipedia.org/wiki/%D0%9D%D0%BE%D1%80%D0%BC%D0%B0_(%D0%BC%D0%B0%D1%82%D0%B5%D0%BC%D0%B0%D1%82%D0%B8%D0%BA%D0%B0)#%D0%9D%D0%B5%D0%BA%D0%BE%D1%82%D0%BE%D1%80%D1%8B%D0%B5_%D0%B2%D0%B8%D0%B4%D1%8B_%D0%BC%D0%B0%D1%82%D1%80%D0%B8%D1%87%D0%BD%D1%8B%D1%85_%D0%BD%D0%BE%D1%80%D0%BC).
+
+**Синтаксис**
+
+```sql
+LinfDistance(tuple1, tuple2)
+```
+
+Синоним: `distanceLinf`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемые значения**
+
+-   Расстояние в норме Linf.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT LinfDistance((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─LinfDistance((1, 2), (2, 3))─┐
+│                            1 │
+└──────────────────────────────┘
+```
+
+## LpDistance {#lpdistance}
+
+Вычисляет расстояние между двумя точками (значения кортежей — координаты точек) в пространстве [`Lp`](https://ru.wikipedia.org/wiki/%D0%9D%D0%BE%D1%80%D0%BC%D0%B0_(%D0%BC%D0%B0%D1%82%D0%B5%D0%BC%D0%B0%D1%82%D0%B8%D0%BA%D0%B0)#%D0%9D%D0%B5%D0%BA%D0%BE%D1%82%D0%BE%D1%80%D1%8B%D0%B5_%D0%B2%D0%B8%D0%B4%D1%8B_%D0%BC%D0%B0%D1%82%D1%80%D0%B8%D1%87%D0%BD%D1%8B%D1%85_%D0%BD%D0%BE%D1%80%D0%BC).
+
+**Синтаксис**
+
+```sql
+LpDistance(tuple1, tuple2, p)
+```
+
+Синоним: `distanceLp`.
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `p` — степень. Возможные значение: любое число из промежутка [1;inf). [UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+
+**Возвращаемое значение**
+
+-   Расстояние в норме Lp.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT LpDistance((1, 2), (2, 3), 3);
+```
+
+Результат:
+
+```text
+┌─LpDistance((1, 2), (2, 3), 3)─┐
+│            1.2599210498948732 │
+└───────────────────────────────┘
+```
+
+## L1Normalize {#l1normalize}
+
+Вычисляет единичный вектор для исходного вектора (значения кортежа — координаты вектора) в пространстве `L1` ([расстояние городских кварталов](https://ru.wikipedia.org/wiki/%D0%A0%D0%B0%D1%81%D1%81%D1%82%D0%BE%D1%8F%D0%BD%D0%B8%D0%B5_%D0%B3%D0%BE%D1%80%D0%BE%D0%B4%D1%81%D0%BA%D0%B8%D1%85_%D0%BA%D0%B2%D0%B0%D1%80%D1%82%D0%B0%D0%BB%D0%BE%D0%B2)).
+
+**Синтаксис**
+
+```sql
+L1Normalize(tuple)
+```
+
+Синоним: `normalizeL1`.
+
+**Аргументы**
+
+-   `tuple` — [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Единичный вектор.
+
+Тип: кортеж [Tuple](../../sql-reference/data-types/tuple.md) значений [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT L1Normalize((1, 2));
+```
+
+Результат:
+
+```text
+┌─L1Normalize((1, 2))─────────────────────┐
+│ (0.3333333333333333,0.6666666666666666) │
+└─────────────────────────────────────────┘
+```
+
+## L2Normalize {#l2normalize}
+
+Вычисляет единичный вектор для исходного вектора (значения кортежа — координаты вектора) в пространстве `L2` ([Евклидово пространство](https://ru.wikipedia.org/wiki/%D0%95%D0%B2%D0%BA%D0%BB%D0%B8%D0%B4%D0%BE%D0%B2%D0%BE_%D0%BF%D1%80%D0%BE%D1%81%D1%82%D1%80%D0%B0%D0%BD%D1%81%D1%82%D0%B2%D0%BE).
+
+**Синтаксис**
+
+```sql
+L2Normalize(tuple)
+```
+
+Синоним: `normalizeL1`.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Единичный вектор.
+
+Тип: кортеж [Tuple](../../sql-reference/data-types/tuple.md) значений [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT L2Normalize((3, 4));
+```
+
+Результат:
+
+```text
+┌─L2Normalize((3, 4))─┐
+│ (0.6,0.8)           │
+└─────────────────────┘
+```
+
+## LinfNormalize {#linfnormalize}
+
+Вычисляет единичный вектор для исходного вектора (значения кортежа — координаты вектора) в пространстве [`L_{inf}`](https://ru.wikipedia.org/wiki/%D0%9D%D0%BE%D1%80%D0%BC%D0%B0_(%D0%BC%D0%B0%D1%82%D0%B5%D0%BC%D0%B0%D1%82%D0%B8%D0%BA%D0%B0)#%D0%9D%D0%B5%D0%BA%D0%BE%D1%82%D0%BE%D1%80%D1%8B%D0%B5_%D0%B2%D0%B8%D0%B4%D1%8B_%D0%BC%D0%B0%D1%82%D1%80%D0%B8%D1%87%D0%BD%D1%8B%D1%85_%D0%BD%D0%BE%D1%80%D0%BC).
+
+**Синтаксис**
+
+```sql
+LinfNormalize(tuple)
+```
+
+Синоним: `normalizeLinf `.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемое значение**
+
+-   Единичный вектор.
+
+Тип: кортеж [Tuple](../../sql-reference/data-types/tuple.md) значений [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT LinfNormalize((3, 4));
+```
+
+Результат:
+
+```text
+┌─LinfNormalize((3, 4))─┐
+│ (0.75,1)              │
+└───────────────────────┘
+```
+
+## LpNormalize {#lpnormalize}
+
+Вычисляет единичный вектор для исходного вектора (значения кортежа — координаты вектора) в пространстве [`Lp`](https://ru.wikipedia.org/wiki/%D0%9D%D0%BE%D1%80%D0%BC%D0%B0_(%D0%BC%D0%B0%D1%82%D0%B5%D0%BC%D0%B0%D1%82%D0%B8%D0%BA%D0%B0)#%D0%9D%D0%B5%D0%BA%D0%BE%D1%82%D0%BE%D1%80%D1%8B%D0%B5_%D0%B2%D0%B8%D0%B4%D1%8B_%D0%BC%D0%B0%D1%82%D1%80%D0%B8%D1%87%D0%BD%D1%8B%D1%85_%D0%BD%D0%BE%D1%80%D0%BC).
+
+**Синтаксис**
+
+```sql
+LpNormalize(tuple, p)
+```
+
+Синоним: `normalizeLp `.
+
+**Аргументы**
+
+-   `tuple` — кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `p` — степень. Возможные значение: любое число из промежутка [1;inf). [UInt](../../sql-reference/data-types/int-uint.md) или [Float](../../sql-reference/data-types/float.md).
+
+**Возвращаемое значение**
+
+-   Единичный вектор.
+
+Тип: кортеж [Tuple](../../sql-reference/data-types/tuple.md) значений [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT LpNormalize((3, 4),5);
+```
+
+Результат:
+
+```text
+┌─LpNormalize((3, 4), 5)──────────────────┐
+│ (0.7187302630182624,0.9583070173576831) │
+└─────────────────────────────────────────┘
+```
+
+## cosineDistance {#cosinedistance}
+
+Вычисляет косинусную разницу двух векторов (значения кортежей — координаты векторов). Чем меньше возвращаемое значение, тем больше сходство между векторами.
+
+**Синтаксис**
+
+```sql
+cosineDistance(tuple1, tuple2)
+```
+
+**Аргументы**
+
+-   `tuple1` — первый кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+-   `tuple2` — второй кортеж. [Tuple](../../sql-reference/data-types/tuple.md).
+
+**Возвращаемые значения**
+
+-   Разность между единицей и косинуса угла между векторами.
+
+Тип: [Float](../../sql-reference/data-types/float.md).
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT cosineDistance((1, 2), (2, 3));
+```
+
+Результат:
+
+```text
+┌─cosineDistance((1, 2), (2, 3))─┐
+│           0.007722123286332261 │
+└────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/tuple-map-functions.md b/docs/ru/sql-reference/functions/tuple-map-functions.md
index 4775152fb54..45a5018500f 100644
--- a/docs/ru/sql-reference/functions/tuple-map-functions.md
+++ b/docs/ru/sql-reference/functions/tuple-map-functions.md
@@ -73,22 +73,22 @@ SELECT a['key2'] FROM table_map;
 **Синтаксис**
 
 ``` sql
-mapAdd(Tuple(Array, Array), Tuple(Array, Array) [, ...])
+mapAdd(arg1, arg2 [, ...])
 ```
 
 **Аргументы**
 
-Аргументами являются [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
+Аргументами являются контейнеры [Map](../../sql-reference/data-types/map.md) или [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
 Все массивы ключей должны иметь один и тот же тип, а все массивы значений должны содержать элементы, которые можно приводить к одному типу ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) или [Float64](../../sql-reference/data-types/float.md#float32-float64)).
 Общий приведенный тип используется в качестве типа для результирующего массива.
 
 **Возвращаемое значение**
 
--   Возвращает один [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
+-   В зависимости от типа аргументов возвращает один [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
 
 **Пример**
 
-Запрос:
+Запрос с кортежем:
 
 ``` sql
 SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTypeName(res) as type;
@@ -102,6 +102,20 @@ SELECT mapAdd(([toUInt8(1), 2], [1, 1]), ([toUInt8(1), 2], [1, 1])) as res, toTy
 └───────────────┴────────────────────────────────────┘
 ```
 
+Запрос с контейнером `Map`:
+
+```sql
+SELECT mapAdd(map(1,1), map(1,1));
+```
+
+Результат:
+
+```text
+┌─mapAdd(map(1, 1), map(1, 1))─┐
+│ {1:2}                        │
+└──────────────────────────────┘
+```
+
 ## mapSubtract {#function-mapsubtract}
 
 Собирает все ключи и вычитает соответствующие значения.
@@ -114,13 +128,13 @@ mapSubtract(Tuple(Array, Array), Tuple(Array, Array) [, ...])
 
 **Аргументы**
 
-Аргументами являются [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
+Аргументами являются контейнеры [Map](../../sql-reference/data-types/map.md) или [кортежи](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array), где элементы в первом массиве представляют ключи, а второй массив содержит значения для каждого ключа.
 Все массивы ключей должны иметь один и тот же тип, а все массивы значений должны содержать элементы, которые можно приводить к одному типу ([Int64](../../sql-reference/data-types/int-uint.md#int-ranges), [UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges) или [Float64](../../sql-reference/data-types/float.md#float32-float64)).
 Общий приведенный тип используется в качестве типа для результирующего массива.
 
 **Возвращаемое значение**
 
--   Возвращает один [tuple](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй - значения.
+-   В зависимости от аргумента возвращает один [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2), в котором первый массив содержит отсортированные ключи, а второй — значения.
 
 **Пример**
 
@@ -138,6 +152,20 @@ SELECT mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt3
 └────────────────┴───────────────────────────────────┘
 ```
 
+Запрос с контейнером `Map`:
+
+```sql
+SELECT mapSubtract(map(1,1), map(1,1));
+```
+
+Результат:
+
+```text
+┌─mapSubtract(map(1, 1), map(1, 1))─┐
+│ {1:0}                             │
+└───────────────────────────────────┘
+```
+
 ## mapPopulateSeries {#function-mappopulateseries}
 
 Заполняет недостающие ключи в контейнере map (пара массивов ключей и значений), где ключи являются целыми числами. Кроме того, он поддерживает указание максимального ключа, который используется для расширения массива ключей.
@@ -146,6 +174,7 @@ SELECT mapSubtract(([toUInt8(1), 2], [toInt32(1), 1]), ([toUInt8(1), 2], [toInt3
 
 ``` sql
 mapPopulateSeries(keys, values[, max])
+mapPopulateSeries(map[, max])
 ```
 
 Генерирует контейнер map, где ключи - это серия чисел, от минимального до максимального ключа (или аргумент `max`, если он указан), взятых из массива `keys` с размером шага один, и соответствующие значения, взятые из массива `values`. Если значение не указано для ключа, то в результирующем контейнере используется значение по умолчанию.
@@ -154,19 +183,28 @@ mapPopulateSeries(keys, values[, max])
 
 **Аргументы**
 
--   `keys` — массив ключей [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
+Аргументами являются контейнер [Map](../../sql-reference/data-types/map.md) или два [массива](../../sql-reference/data-types/array.md#data-type-array), где первый массив представляет ключи, а второй массив содержит значения для каждого ключа.
+
+Сопоставленные массивы:
+
+-   `keys` — массив ключей. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
 -   `values` — массив значений. [Array](../../sql-reference/data-types/array.md#data-type-array)([Int](../../sql-reference/data-types/int-uint.md#int-ranges)).
+-   `max` — максимальное значение ключа. Необязательный параметр. [Int8, Int16, Int32, Int64, Int128, Int256](../../sql-reference/data-types/int-uint.md#int-ranges).
+
+или
+
+-   `map` — контейнер `Map` с целочисленными ключами. [Map](../../sql-reference/data-types/map.md).
 
 **Возвращаемое значение**
 
--  Возвращает [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array): ключи отсортированные по порядку и значения соответствующих ключей.
+-   В зависимости от аргумента возвращает контейнер [Map](../../sql-reference/data-types/map.md) или [кортеж](../../sql-reference/data-types/tuple.md#tuplet1-t2) из двух [массивов](../../sql-reference/data-types/array.md#data-type-array): ключи отсортированные по порядку и значения соответствующих ключей.
 
 **Пример**
 
-Запрос:
+Запрос с сопоставленными массивами:
 
 ```sql
-select mapPopulateSeries([1,2,4], [11,22,44], 5) as res, toTypeName(res) as type;
+SELECT mapPopulateSeries([1,2,4], [11,22,44], 5) AS res, toTypeName(res) AS type;
 ```
 
 Результат:
@@ -177,6 +215,20 @@ select mapPopulateSeries([1,2,4], [11,22,44], 5) as res, toTypeName(res) as type
 └──────────────────────────────┴───────────────────────────────────┘
 ```
 
+Запрос с контейнером `Map`:
+
+```sql
+SELECT mapPopulateSeries(map(1, 10, 5, 20), 6);
+```
+
+Результат:
+
+```text
+┌─mapPopulateSeries(map(1, 10, 5, 20), 6)─┐
+│ {1:10,2:0,3:0,4:0,5:20,6:0}             │
+└─────────────────────────────────────────┘
+```
+
 ## mapContains {#mapcontains}
 
 Определяет, содержит ли контейнер `map` ключ `key`.
@@ -305,4 +357,3 @@ SELECT mapValues(a) FROM test;
 │ ['twelve','6.0'] │
 └──────────────────┘
 ```
-
diff --git a/docs/ru/sql-reference/functions/type-conversion-functions.md b/docs/ru/sql-reference/functions/type-conversion-functions.md
index 757afca9588..1b4ea4ef609 100644
--- a/docs/ru/sql-reference/functions/type-conversion-functions.md
+++ b/docs/ru/sql-reference/functions/type-conversion-functions.md
@@ -90,6 +90,26 @@ SELECT toInt64OrNull('123123'), toInt8OrNull('123qwe123');
 └─────────────────────────┴───────────────────────────┘
 ```
 
+## toInt(8\|16\|32\|64\|128\|256)OrDefault {#toint8163264128256orDefault}
+
+Принимает аргумент типа String и пытается его распарсить в Int(8\|16\|32\|64\|128\|256). Если не удалось —  возвращает значение по умолчанию.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT toInt64OrDefault('123123', cast('-1' as Int64)), toInt8OrDefault('123qwe123', cast('-1' as Int8));
+```
+
+Результат:
+
+``` text
+┌─toInt64OrDefault('123123', CAST('-1', 'Int64'))─┬─toInt8OrDefault('123qwe123', CAST('-1', 'Int8'))─┐
+│                                          123123 │                                               -1 │
+└─────────────────────────────────────────────────┴──────────────────────────────────────────────────┘
+```
+
 ## toUInt(8\|16\|32\|64\|256) {#touint8163264}
 
 Преобраует входное значение к типу [UInt](../../sql-reference/functions/type-conversion-functions.md). Семейство функций включает:
@@ -132,12 +152,16 @@ SELECT toUInt64(nan), toUInt32(-32), toUInt16('16'), toUInt8(8.8);
 
 ## toUInt(8\|16\|32\|64\|256)OrNull {#touint8163264ornull}
 
+## toUInt(8\|16\|32\|64\|256)OrDefault {#touint8163264256ordefault}
+
 ## toFloat(32\|64) {#tofloat3264}
 
 ## toFloat(32\|64)OrZero {#tofloat3264orzero}
 
 ## toFloat(32\|64)OrNull {#tofloat3264ornull}
 
+## toFloat(32\|64)OrDefault {#tofloat3264ordefault}
+
 ## toDate {#todate}
 
 Cиноним: `DATE`.
@@ -146,12 +170,136 @@ Cиноним: `DATE`.
 
 ## toDateOrNull {#todateornull}
 
+## toDateOrDefault {#todateordefault}
+
 ## toDateTime {#todatetime}
 
 ## toDateTimeOrZero {#todatetimeorzero}
 
 ## toDateTimeOrNull {#todatetimeornull}
 
+## toDateTimeOrDefault {#todatetimeordefault}
+
+## toDate32 {#todate32}
+
+Конвертирует аргумент в значение типа [Date32](../../sql-reference/data-types/date32.md). Если значение выходит за границы диапазона, возвращается пограничное значение `Date32`. Если аргумент имеет тип [Date](../../sql-reference/data-types/date.md), учитываются границы типа `Date`.
+
+**Синтаксис**
+
+``` sql
+toDate32(value)
+```
+
+**Аргументы**
+
+-   `value` — Значение даты. [String](../../sql-reference/data-types/string.md), [UInt32](../../sql-reference/data-types/int-uint.md) или [Date](../../sql-reference/data-types/date.md).
+
+**Возвращаемое значение**
+
+-   Календарная дата.
+
+Тип: [Date32](../../sql-reference/data-types/date32.md).
+
+**Пример**
+
+1. Значение находится в границах диапазона:
+
+``` sql
+SELECT toDate32('1955-01-01') AS value, toTypeName(value);
+```
+
+``` text
+┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
+│ 1955-01-01 │ Date32                             │
+└────────────┴────────────────────────────────────┘
+```
+
+2. Значение выходит за границы диапазона:
+
+``` sql
+SELECT toDate32('1924-01-01') AS value, toTypeName(value);
+```
+
+``` text
+┌──────value─┬─toTypeName(toDate32('1925-01-01'))─┐
+│ 1925-01-01 │ Date32                             │
+└────────────┴────────────────────────────────────┘
+```
+
+3. С аргументом типа `Date`:
+
+``` sql
+SELECT toDate32(toDate('1924-01-01')) AS value, toTypeName(value);
+```
+
+``` text
+┌──────value─┬─toTypeName(toDate32(toDate('1924-01-01')))─┐
+│ 1970-01-01 │ Date32                                     │
+└────────────┴────────────────────────────────────────────┘
+```
+
+## toDate32OrZero {#todate32-or-zero}
+
+То же самое, что и  [toDate32](#todate32), но возвращает минимальное значение типа [Date32](../../sql-reference/data-types/date32.md), если получен недопустимый аргумент.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT toDate32OrZero('1924-01-01'), toDate32OrZero('');
+```
+
+Результат:
+
+``` text
+┌─toDate32OrZero('1924-01-01')─┬─toDate32OrZero('')─┐
+│                   1925-01-01 │         1925-01-01 │
+└──────────────────────────────┴────────────────────┘
+```
+
+## toDate32OrNull {#todate32-or-null}
+
+То же самое, что и [toDate32](#todate32), но возвращает `NULL`, если получен недопустимый аргумент.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT toDate32OrNull('1955-01-01'), toDate32OrNull('');
+```
+
+Результат:
+
+``` text
+┌─toDate32OrNull('1955-01-01')─┬─toDate32OrNull('')─┐
+│                   1955-01-01 │               ᴺᵁᴸᴸ │
+└──────────────────────────────┴────────────────────┘
+```
+
+## toDate32OrDefault {#todate32-or-default}
+
+Конвертирует аргумент в значение типа [Date32](../../sql-reference/data-types/date32.md). Если значение выходит за границы диапазона, возвращается нижнее пограничное значение `Date32`. Если аргумент имеет тип [Date](../../sql-reference/data-types/date.md), учитываются границы типа `Date`. Возвращает значение по умолчанию, если получен недопустимый аргумент.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT
+    toDate32OrDefault('1930-01-01', toDate32('2020-01-01')),
+    toDate32OrDefault('xx1930-01-01', toDate32('2020-01-01'));
+```
+
+Результат:
+
+``` text
+┌─toDate32OrDefault('1930-01-01', toDate32('2020-01-01'))─┬─toDate32OrDefault('xx1930-01-01', toDate32('2020-01-01'))─┐
+│                                              1930-01-01 │                                                2020-01-01 │
+└─────────────────────────────────────────────────────────┴───────────────────────────────────────────────────────────┘
+```
+
 ## toDecimal(32\|64\|128\|256) {#todecimal3264128}
 
 Преобразует `value` к типу данных [Decimal](../../sql-reference/functions/type-conversion-functions.md) с точностью `S`. `value` может быть числом или строкой. Параметр `S` (scale) задаёт число десятичных знаков.
@@ -214,6 +362,59 @@ SELECT toDecimal32OrNull(toString(-1.111), 2) AS val, toTypeName(val);
 └──────┴────────────────────────────────────────────────────┘
 ```
 
+## toDecimal(32\|64\|128\|256)OrDefault {#todecimal3264128256ordefault}
+
+Преобразует входную строку в значение с типом данных [Decimal(P,S)](../../sql-reference/data-types/decimal.md). Семейство функций включает в себя:
+
+-   `toDecimal32OrDefault(expr, S)` — возвращает значение типа `Decimal32(S)`.
+-   `toDecimal64OrDefault(expr, S)` — возвращает значение типа `Decimal64(S)`.
+-   `toDecimal128OrDefault(expr, S)` — возвращает значение типа `Decimal128(S)`.
+-   `toDecimal256OrDefault(expr, S)` — возвращает значение типа `Decimal256(S)`.
+
+Эти функции следует использовать вместо функций `toDecimal*()`, если при ошибке обработки входного значения вы хотите получать значение по умолчанию вместо исключения.
+
+**Аргументы**
+
+-   `expr` — [выражение](../syntax.md#syntax-expressions), возвращающее значение типа [String](../../sql-reference/functions/type-conversion-functions.md). ClickHouse ожидает текстовое представление десятичного числа. Например, `'1.111'`.
+-   `S` — количество десятичных знаков в результирующем значении.
+
+**Возвращаемое значение**
+
+Значение типа `Decimal(P,S)`. Значение содержит:
+
+-   Число с `S` десятичными знаками, если ClickHouse распознал число во входной строке.
+-   Значение по умолчанию типа `Decimal(P,S)`, если ClickHouse не смог распознать число во входной строке или входное число содержит больше чем `S` десятичных знаков.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT toDecimal32OrDefault(toString(-1.111), 5) AS val, toTypeName(val);
+```
+
+Результат:
+
+``` text
+┌────val─┬─toTypeName(toDecimal32OrDefault(toString(-1.111), 5))─┐
+│ -1.111 │ Decimal(9, 5)                                         │
+└────────┴───────────────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT toDecimal32OrDefault(toString(-1.111), 2) AS val, toTypeName(val);
+```
+
+Результат:
+
+``` text
+┌─val─┬─toTypeName(toDecimal32OrDefault(toString(-1.111), 2))─┐
+│   0 │ Decimal(9, 2)                                         │
+└─────┴───────────────────────────────────────────────────────┘
+```
+
 ## toDecimal(32\|64\|128\|256)OrZero {#todecimal3264128orzero}
 
 Преобразует тип входного значения в [Decimal (P, S)](../../sql-reference/functions/type-conversion-functions.md). Семейство функций включает в себя:
@@ -652,6 +853,63 @@ SELECT
 └───────┴──────┴──────────────┘
 ```
 
+
+## accurateCastOrDefault(x, T[, default_value]) {#type_conversion_function-accurate-cast_or_default}
+
+Преобразует входное значение `x` в указанный тип данных `T`. Если исходное значение не может быть преобразовано к целевому типу, возвращает значение по умолчанию или `default_value`, если оно указано.
+
+**Синтаксис**
+
+```sql
+accurateCastOrDefault(x, T)
+```
+
+**Аргументы**
+
+-   `x` — входное значение.
+-   `T` — имя возвращаемого типа данных.
+-   `default_value` — значение по умолчанию возвращаемого типа данных.
+
+**Возвращаемое значение**
+
+-   Значение, преобразованное в указанный тип `T`.
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT toTypeName(accurateCastOrDefault(5, 'UInt8'));
+```
+
+Результат:
+
+``` text
+┌─toTypeName(accurateCastOrDefault(5, 'UInt8'))─┐
+│ UInt8                                         │
+└───────────────────────────────────────────────┘
+```
+
+Запрос:
+
+``` sql
+SELECT
+    accurateCastOrDefault(-1, 'UInt8') as uint8,
+    accurateCastOrDefault(-1, 'UInt8', 5) as uint8_default,
+    accurateCastOrDefault(128, 'Int8') as int8,
+    accurateCastOrDefault(128, 'Int8', 5) as int8_default,
+    accurateCastOrDefault('Test', 'FixedString(2)') as fixed_string,
+    accurateCastOrDefault('Test', 'FixedString(2)', 'Te') as fixed_string_default;
+```
+
+Результат:
+
+``` text
+┌─uint8─┬─uint8_default─┬─int8─┬─int8_default─┬─fixed_string─┬─fixed_string_default─┐
+│     0 │             5 │    0 │            5 │              │ Te                   │
+└───────┴───────────────┴──────┴──────────────┴──────────────┴──────────────────────┘
+```
+
 ## toInterval(Year\|Quarter\|Month\|Week\|Day\|Hour\|Minute\|Second) {#function-tointerval}
 
 Приводит аргумент из числового типа данных к типу данных [IntervalType](../../sql-reference/data-types/special-data-types/interval.md).
@@ -1338,3 +1596,144 @@ FROM numbers(3);
 │ 2,"good"                                  │
 └───────────────────────────────────────────┘
 ```
+
+## snowflakeToDateTime {#snowflaketodatetime}
+
+Извлекает время из [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) в формате [DateTime](../data-types/datetime.md).
+
+**Синтаксис**
+
+``` sql
+snowflakeToDateTime(value [, time_zone])
+```
+
+**Аргументы**
+
+-   `value` — Snowflake ID. [Int64](../data-types/int-uint.md).
+-   `time_zone` — [временная зона сервера](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция распознает `time_string` в соответствии с часовым поясом. Необязательный. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-  Значение, преобразованное в фомат [DateTime](../data-types/datetime.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT snowflakeToDateTime(CAST('1426860702823350272', 'Int64'), 'UTC');
+```
+
+Результат:
+
+``` text
+
+┌─snowflakeToDateTime(CAST('1426860702823350272', 'Int64'), 'UTC')─┐
+│                                              2021-08-15 10:57:56 │
+└──────────────────────────────────────────────────────────────────┘
+```
+
+## snowflakeToDateTime64 {#snowflaketodatetime64}
+
+Извлекает время из [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) в формате [DateTime64](../data-types/datetime64.md).
+
+**Синтаксис**
+
+``` sql
+snowflakeToDateTime64(value [, time_zone])
+```
+
+**Аргументы**
+
+-   `value` — Snowflake ID. [Int64](../data-types/int-uint.md).
+-   `time_zone` — [временная зона сервера](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone). Функция распознает `time_string` в соответствии с часовым поясом. Необязательный. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-  Значение, преобразованное в фомат [DateTime64](../data-types/datetime64.md).
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT snowflakeToDateTime64(CAST('1426860802823350272', 'Int64'), 'UTC');
+```
+
+Результат:
+
+``` text
+
+┌─snowflakeToDateTime64(CAST('1426860802823350272', 'Int64'), 'UTC')─┐
+│                                            2021-08-15 10:58:19.841 │
+└────────────────────────────────────────────────────────────────────┘
+```
+
+## dateTimeToSnowflake {#datetimetosnowflake}
+
+Преобразует значение [DateTime](../data-types/datetime.md) в первый идентификатор [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) на текущий момент.
+
+**Syntax**
+
+``` sql
+dateTimeToSnowflake(value)
+```
+
+**Аргументы**
+
+-   `value` — дата и время. [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Возвращаемое значение**
+
+-   Значение, преобразованное в [Int64](../data-types/int-uint.md), как первый идентификатор Snowflake ID в момент выполнения.
+
+**Пример**
+
+Запрос:
+
+``` sql
+WITH toDateTime('2021-08-15 18:57:56', 'Asia/Shanghai') AS dt SELECT dateTimeToSnowflake(dt);
+```
+
+Результат:
+
+``` text
+┌─dateTimeToSnowflake(dt)─┐
+│     1426860702823350272 │
+└─────────────────────────┘
+```
+
+## dateTime64ToSnowflake {#datetime64tosnowflake}
+
+Преобразует значение [DateTime64](../data-types/datetime64.md) в первый идентификатор [Snowflake ID](https://en.wikipedia.org/wiki/Snowflake_ID) на текущий момент.
+
+**Синтаксис**
+
+``` sql
+dateTime64ToSnowflake(value)
+```
+
+**Аргументы**
+
+-   `value` — дата и время. [DateTime64](../data-types/datetime64.md).
+
+**Возвращаемое значение**
+
+-   Значение, преобразованное в [Int64](../data-types/int-uint.md), как первый идентификатор Snowflake ID в момент выполнения.
+
+
+**Пример**
+
+Запрос:
+
+``` sql
+WITH toDateTime64('2021-08-15 18:57:56.492', 3, 'Asia/Shanghai') AS dt64 SELECT dateTime64ToSnowflake(dt64);
+```
+
+Результат:
+
+``` text
+┌─dateTime64ToSnowflake(dt64)─┐
+│         1426860704886947840 │
+└─────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/functions/uuid-functions.md b/docs/ru/sql-reference/functions/uuid-functions.md
index f0017adbc8b..9374c74cad1 100644
--- a/docs/ru/sql-reference/functions/uuid-functions.md
+++ b/docs/ru/sql-reference/functions/uuid-functions.md
@@ -35,6 +35,90 @@ SELECT * FROM t_uuid
 └──────────────────────────────────────┘
 ```
 
+## empty {#empty}
+
+Проверяет, является ли входной UUID пустым.
+
+**Синтаксис**
+
+```sql
+empty(UUID)
+```
+
+UUID считается пустым, если он содержит все нули (нулевой UUID).
+
+Функция также поддерживает работу с типами [Array](array-functions.md#function-empty) и [String](string-functions.md#empty).
+
+**Параметры**
+
+-   `x` — UUID на входе функции. [UUID](../data-types/uuid.md).
+
+**Возвращаемое значение**
+
+-   Возвращает `1` для пустого UUID или `0` — для непустого UUID.
+
+Тип: [UInt8](../data-types/int-uint.md).
+
+**Пример**
+
+Для генерации UUID-значений предназначена функция [generateUUIDv4](#uuid-function-generate).
+
+Запрос:
+
+```sql
+SELECT empty(generateUUIDv4());
+```
+
+Ответ:
+
+```text
+┌─empty(generateUUIDv4())─┐
+│                       0 │
+└─────────────────────────┘
+```
+
+## notEmpty {#notempty}
+
+Проверяет, является ли входной UUID непустым.
+
+**Синтаксис**
+
+```sql
+notEmpty(UUID)
+```
+
+UUID считается пустым, если он содержит все нули (нулевой UUID).
+
+Функция также поддерживает работу с типами [Array](array-functions.md#function-notempty) и [String](string-functions.md#function-notempty).
+
+**Параметры**
+
+-   `x` — UUID на входе функции. [UUID](../data-types/uuid.md).
+
+**Возвращаемое значение**
+
+-   Возвращает `1` для непустого UUID или `0` — для пустого UUID.
+
+Тип: [UInt8](../data-types/int-uint.md).
+
+**Пример**
+
+Для генерации UUID-значений предназначена функция [generateUUIDv4](#uuid-function-generate).
+
+Запрос:
+
+```sql
+SELECT notEmpty(generateUUIDv4());
+```
+
+Результат:
+
+```text
+┌─notEmpty(generateUUIDv4())─┐
+│                          1 │
+└────────────────────────────┘
+```
+
 ## toUUID (x) {#touuid-x}
 
 Преобразует значение типа String в тип UUID.
@@ -159,9 +243,23 @@ SELECT
 └──────────────────┴──────────────────────────────────────┘
 ```
 
+## serverUUID() {#server-uuid}
+
+Возвращает случайный и уникальный UUID, который генерируется при первом запуске сервера и сохраняется навсегда. Результат записывается в файл `uuid`, расположенный в каталоге сервера ClickHouse `/var/lib/clickhouse/`.
+
+**Синтаксис**
+
+```sql
+serverUUID()
+```
+
+**Возвращаемое значение**
+
+-   UUID сервера. 
+
+Тип: [UUID](../data-types/uuid.md).
+
 ## См. также: {#sm-takzhe}
 
 -   [dictGetUUID](ext-dict-functions.md)
 -   [dictGetUUIDOrDefault](ext-dict-functions.md)
-
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/ru/sql-reference/operators/index.md b/docs/ru/sql-reference/operators/index.md
index 98f6873f712..0041be745fc 100644
--- a/docs/ru/sql-reference/operators/index.md
+++ b/docs/ru/sql-reference/operators/index.md
@@ -18,20 +18,30 @@ toc_title: "Операторы"
 
 `-a` - функция `negate(a)`.
 
+Для чисел в кортеже также может быть использована [tupleNegate](../../sql-reference/functions/tuple-functions.md#tuplenegate).
+
 ## Операторы умножения и деления {#operatory-umnozheniia-i-deleniia}
 
 `a * b` - функция `multiply(a, b)`
 
+Для умножения кортежа на число также может быть использована [tupleMultiplyByNumber](../../sql-reference/functions/tuple-functions.md#tuplemultiplybynumber), для скалярного произведения: [dotProduct](../../sql-reference/functions/tuple-functions.md#dotproduct).
+
 `a / b` - функция `divide(a, b)`
 
+Для деления кортежа на число также может быть использована [tupleDivideByNumber](../../sql-reference/functions/tuple-functions.md#tupledividebynumber).
+
 `a % b` - функция `modulo(a, b)`
 
 ## Операторы сложения и вычитания {#operatory-slozheniia-i-vychitaniia}
 
 `a + b` - функция `plus(a, b)`
 
+Для сложения кортежей также может быть использована [tuplePlus](../../sql-reference/functions/tuple-functions.md#tupleplus).
+
 `a - b` - функция `minus(a, b)`
 
+Для вычитания кортежей также может быть использована [tupleMinus](../../sql-reference/functions/tuple-functions.md#tupleminus).
+
 ## Операторы сравнения {#operatory-sravneniia}
 
 `a = b` - функция `equals(a, b)`
@@ -72,6 +82,53 @@ toc_title: "Операторы"
 
 `a GLOBAL NOT IN ...` - функция `globalNotIn(a, b)`
 
+`a = ANY (subquery)` – функция `in(a, subquery)`.  
+
+`a != ANY (subquery)` – равнозначно `a NOT IN (SELECT singleValueOrNull(*) FROM subquery)`.
+
+`a = ALL (subquery)` – равнозначно `a IN (SELECT singleValueOrNull(*) FROM subquery)`.
+
+`a != ALL (subquery)` – функция `notIn(a, subquery)`. 
+
+
+**Примеры**
+
+Запрос с ALL:
+
+``` sql
+SELECT number AS a FROM numbers(10) WHERE a > ALL (SELECT number FROM numbers(3, 3));
+```
+
+Результат:
+
+``` text
+┌─a─┐
+│ 6 │
+│ 7 │
+│ 8 │
+│ 9 │
+└───┘
+```
+
+Запрос с ANY:
+
+``` sql
+SELECT number AS a FROM numbers(10) WHERE a > ANY (SELECT number FROM numbers(3, 3));
+```
+
+Результат:
+
+``` text
+┌─a─┐
+│ 4 │
+│ 5 │
+│ 6 │
+│ 7 │
+│ 8 │
+│ 9 │
+└───┘
+```
+
 ## Оператор для работы с датами и временем {#operators-datetime}
 
 ### EXTRACT {#extract}
diff --git a/docs/ru/sql-reference/statements/alter/column.md b/docs/ru/sql-reference/statements/alter/column.md
index 9f59c79bfdd..bfd52801210 100644
--- a/docs/ru/sql-reference/statements/alter/column.md
+++ b/docs/ru/sql-reference/statements/alter/column.md
@@ -10,7 +10,7 @@ toc_title: "Манипуляции со столбцами"
 Синтаксис:
 
 ``` sql
-ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN ...
+ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|RENAME|CLEAR|COMMENT|MODIFY|MATERIALIZE COLUMN ...
 ```
 
 В запросе можно указать сразу несколько действий над одной таблицей через запятую.
@@ -20,11 +20,12 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 
 -   [ADD COLUMN](#alter_add-column) — добавляет столбец в таблицу;
 -   [DROP COLUMN](#alter_drop-column) — удаляет столбец;
--   [RENAME COLUMN](#alter_rename-column) — переименовывает существующий столбец.
+-   [RENAME COLUMN](#alter_rename-column) — переименовывает существующий столбец;
 -   [CLEAR COLUMN](#alter_clear-column) — сбрасывает все значения в столбце для заданной партиции;
 -   [COMMENT COLUMN](#alter_comment-column) — добавляет комментарий к столбцу;
--   [MODIFY COLUMN](#alter_modify-column) — изменяет тип столбца, выражение для значения по умолчанию и TTL.
--   [MODIFY COLUMN REMOVE](#modify-remove) — удаляет какое-либо из свойств столбца.
+-   [MODIFY COLUMN](#alter_modify-column) — изменяет тип столбца, выражение для значения по умолчанию и TTL;
+-   [MODIFY COLUMN REMOVE](#modify-remove) — удаляет какое-либо из свойств столбца;
+-   [MATERIALIZE COLUMN](#materialize-column) — делает столбец материализованным (`MATERIALIZED`) в кусках, в которых отсутствуют значения.
 
 Подробное описание для каждого действия приведено ниже.
 
@@ -193,6 +194,35 @@ ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 
 - [REMOVE TTL](ttl.md).
 
+## MATERIALIZE COLUMN {#materialize-column}
+
+Материализует столбец таблицы в кусках, в которых отсутствуют значения. Используется, если необходимо создать новый столбец со сложным материализованным выражением или выражением для заполнения по умолчанию (`DEFAULT`), потому как вычисление такого столбца прямо во время выполнения запроса `SELECT` оказывается ощутимо затратным. Чтобы совершить ту же операцию для существующего столбца, используйте модификатор `FINAL`.
+
+Синтаксис:
+
+```sql
+ALTER TABLE table MATERIALIZE COLUMN col [FINAL];
+```
+
+**Пример**
+
+```sql
+DROP TABLE IF EXISTS tmp;
+SET mutations_sync = 2;
+CREATE TABLE tmp (x Int64) ENGINE = MergeTree() ORDER BY tuple() PARTITION BY tuple();
+INSERT INTO tmp SELECT * FROM system.numbers LIMIT 10;
+ALTER TABLE tmp ADD COLUMN s String MATERIALIZED toString(x);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+```
+
+**Результат:**
+
+```sql
+┌─groupArray(x)─────────┬─groupArray(s)─────────────────────────────┐
+│ [0,1,2,3,4,5,6,7,8,9] │ ['0','1','2','3','4','5','6','7','8','9'] │
+└───────────────────────┴───────────────────────────────────────────┘
+```
+
 ## Ограничения запроса ALTER {#ogranicheniia-zaprosa-alter}
 
 Запрос `ALTER` позволяет создавать и удалять отдельные элементы (столбцы) вложенных структур данных, но не вложенные структуры данных целиком. Для добавления вложенной структуры данных, вы можете добавить столбцы с именем вида `name.nested_name` и типом `Array(T)` - вложенная структура данных полностью эквивалентна нескольким столбцам-массивам с именем, имеющим одинаковый префикс до точки.
diff --git a/docs/ru/sql-reference/statements/alter/index.md b/docs/ru/sql-reference/statements/alter/index.md
index 043ac3839d9..73ee201b56b 100644
--- a/docs/ru/sql-reference/statements/alter/index.md
+++ b/docs/ru/sql-reference/statements/alter/index.md
@@ -14,7 +14,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 В запросе указывается список из одного или более действий через запятую.
 Каждое действие — операция над столбцом.
 
-Большинство запросов `ALTER` изменяют настройки таблицы или данные:
+Большинство запросов `ALTER TABLE` изменяют настройки таблицы или данные:
 
 -   [COLUMN](../../../sql-reference/statements/alter/column.md)
 -   [PARTITION](../../../sql-reference/statements/alter/partition.md)
@@ -26,7 +26,12 @@ ALTER TABLE [db].name [ON CLUSTER cluster] ADD|DROP|CLEAR|COMMENT|MODIFY COLUMN
 -   [TTL](../../../sql-reference/statements/alter/ttl.md)
 
 !!! note "Note"
-    Запрос `ALTER` поддерживается только для таблиц типа `*MergeTree`, а также `Merge` и `Distributed`. Запрос имеет несколько вариантов.
+    Запрос `ALTER TABLE` поддерживается только для таблиц типа `*MergeTree`, а также `Merge` и `Distributed`. Запрос имеет несколько вариантов.
+
+Следующие запросы `ALTER` управляют представлениями:
+
+-   [ALTER TABLE ... MODIFY QUERY](../../../sql-reference/statements/alter/view.md) — изменяет структуру [Materialized view](../create/view.md#materialized).
+-   [ALTER LIVE VIEW](../../../sql-reference/statements/alter/view.md#alter-live-view) — обновляет [Live view](../create/view.md#live-view).
 
 Следующие запросы `ALTER` изменяют сущности, связанные с управлением доступом на основе ролей:
 
@@ -64,8 +69,11 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 
 Для нереплицируемых таблиц, все запросы `ALTER` выполняются синхронно. Для реплицируемых таблиц, запрос всего лишь добавляет инструкцию по соответствующим действиям в `ZooKeeper`, а сами действия осуществляются при первой возможности. Но при этом, запрос может ждать завершения выполнения этих действий на всех репликах.
 
-Для запросов `ALTER ... ATTACH|DETACH|DROP` можно настроить ожидание, с помощью настройки `replication_alter_partitions_sync`.
-Возможные значения: `0` - не ждать, `1` - ждать выполнения только у себя (по умолчанию), `2` - ждать всех.
+Для всех запросов `ALTER` можно настроить ожидание с помощью настройки [replication_alter_partitions_sync](../../../operations/settings/settings.md#replication-alter-partitions-sync).
+
+Вы можете указать время ожидания (в секундах) выполнения всех запросов `ALTER` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Для всех запросов `ALTER` при `replication_alter_partitions_sync = 2` и неактивности некоторых реплик больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, генерируется исключение `UNFINISHED`.
 
 Для запросов `ALTER TABLE ... UPDATE|DELETE` синхронность выполнения определяется настройкой [mutations_sync](../../../operations/settings/settings.md#mutations_sync).
-
diff --git a/docs/ru/sql-reference/statements/alter/index/index.md b/docs/ru/sql-reference/statements/alter/index/index.md
index 1f6bbea5c4b..c3d1e75a77d 100644
--- a/docs/ru/sql-reference/statements/alter/index/index.md
+++ b/docs/ru/sql-reference/statements/alter/index/index.md
@@ -19,7 +19,7 @@ ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name
 Команда `ADD INDEX` добавляет описание индексов в метаданные, а `DROP INDEX` удаляет индекс из метаданных и стирает файлы индекса с диска, поэтому они легковесные и работают мгновенно.
 
 Если индекс появился в метаданных, то он начнет считаться в последующих слияниях и записях в таблицу, а не сразу после выполнения операции `ALTER`.
-`MATERIALIZE INDEX` - перестраивает индекс в указанной партиции. Реализовано как мутация.
+`MATERIALIZE INDEX` - перестраивает индекс в указанной партиции. Реализовано как мутация. В случае если нужно перестроить индекс над всеми данными то писать `IN PARTITION` не нужно.
 
 Запрос на изменение индексов реплицируется, сохраняя новые метаданные в ZooKeeper и применяя изменения на всех репликах.
 
diff --git a/docs/ru/sql-reference/statements/alter/projection.md b/docs/ru/sql-reference/statements/alter/projection.md
new file mode 100644
index 00000000000..4b0d7f7865b
--- /dev/null
+++ b/docs/ru/sql-reference/statements/alter/projection.md
@@ -0,0 +1,23 @@
+---
+toc_priority: 49
+toc_title: PROJECTION
+---
+
+# Манипуляции с проекциями {#manipulations-with-projections}
+
+Доступны следующие операции с [проекциями](../../../engines/table-engines/mergetree-family/mergetree.md#projections):
+
+-   `ALTER TABLE [db].name ADD PROJECTION name AS SELECT <COLUMN LIST EXPR> [GROUP BY] [ORDER BY]` — добавляет описание проекции в метаданные.
+
+-   `ALTER TABLE [db].name DROP PROJECTION name` — удаляет описание проекции из метаданных и удаляет файлы проекции с диска.
+
+-   `ALTER TABLE [db.]table MATERIALIZE PROJECTION name IN PARTITION partition_name` — перестраивает проекцию в указанной партиции. Реализовано как [мутация](../../../sql-reference/statements/alter/index.md#mutations).
+
+-   `ALTER TABLE [db.]table CLEAR PROJECTION name IN PARTITION partition_name` — удаляет файлы проекции с диска без удаления описания.
+
+Команды `ADD`, `DROP` и `CLEAR` — легковесны, поскольку они только меняют метаданные или удаляют файлы.
+
+Также команды реплицируются, синхронизируя описания проекций в метаданных с помощью ZooKeeper.
+
+!!! note "Note"
+    Манипуляции с проекциями поддерживаются только для таблиц с движком [`*MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) (включая [replicated](../../../engines/table-engines/mergetree-family/replication.md) варианты).
diff --git a/docs/ru/sql-reference/statements/alter/view.md b/docs/ru/sql-reference/statements/alter/view.md
new file mode 100644
index 00000000000..86dd018a947
--- /dev/null
+++ b/docs/ru/sql-reference/statements/alter/view.md
@@ -0,0 +1,44 @@
+---
+toc_priority: 50
+toc_title: VIEW
+---
+
+# Выражение ALTER TABLE … MODIFY QUERY {#alter-modify-query}
+
+Вы можеие изменить запрос `SELECT`, который был задан при создании [материализованного представления](../create/view.md#materialized), с помощью запроса 'ALTER TABLE … MODIFY QUERY'. Используйте его если при создании материализованного представления не использовалась секция `TO [db.]name`. Настройка `allow_experimental_alter_materialized_view_structure` должна быть включена. 
+
+Если при создании материализованного представления использовалась конструкция `TO [db.]name`, то для изменения отсоедините представление с помощью [DETACH](../detach.md), измените таблицу с помощью [ALTER TABLE](index.md), а затем снова присоедините запрос с помощью [ATTACH](../attach.md).
+
+**Пример**
+
+```sql
+CREATE TABLE src_table (`a` UInt32) ENGINE = MergeTree ORDER BY a;
+CREATE MATERIALIZED VIEW mv (`a` UInt32) ENGINE = MergeTree ORDER BY a AS SELECT a FROM src_table; 
+INSERT INTO src_table (a) VALUES (1), (2);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+```sql
+ALTER TABLE mv MODIFY QUERY SELECT a * 2 as a FROM src_table;
+INSERT INTO src_table (a) VALUES (3), (4);
+SELECT * FROM mv;
+```
+```text
+┌─a─┐
+│ 6 │
+│ 8 │
+└───┘
+┌─a─┐
+│ 1 │
+│ 2 │
+└───┘
+```
+
+## Выражение ALTER LIVE VIEW {#alter-live-view}
+
+Выражение `ALTER LIVE VIEW ... REFRESH` обновляет [Live-представление](../create/view.md#live-view). См. раздел [Force Live View Refresh](../create/view.md#live-view-alter-refresh).
diff --git a/docs/ru/sql-reference/statements/attach.md b/docs/ru/sql-reference/statements/attach.md
index 2ffd0fe8d5b..fab469ec6c8 100644
--- a/docs/ru/sql-reference/statements/attach.md
+++ b/docs/ru/sql-reference/statements/attach.md
@@ -3,16 +3,23 @@ toc_priority: 40
 toc_title: ATTACH
 ---
 
-# ATTACH Statement {#attach}
+# ATTACH {#attach}
 
-Выполняет подключение таблицы, например, при перемещении базы данных на другой сервер.
+Выполняет подключение таблицы или словаря, например, при перемещении базы данных на другой сервер.
 
-Запрос не создаёт данные на диске, а предполагает, что данные уже лежат в соответствующих местах, и всего лишь добавляет информацию о таблице на сервер. После выполнения запроса `ATTACH` сервер будет знать о существовании таблицы.
+**Синтаксис**
+
+``` sql
+ATTACH TABLE|DICTIONARY [IF NOT EXISTS] [db.]name [ON CLUSTER cluster] ...
+```
+
+Запрос не создаёт данные на диске, а предполагает, что данные уже лежат в соответствующих местах, и всего лишь добавляет информацию о таблице или словаре на сервер. После выполнения запроса `ATTACH` сервер будет знать о существовании таблицы или словаря.
 
 Если таблица перед этим была отключена при помощи ([DETACH](../../sql-reference/statements/detach.md)), т.е. её структура известна, можно использовать сокращенную форму записи без определения структуры.
 
-## Варианты синтаксиса {#syntax-forms}
-### Присоединение существующей таблицы {#attach-existing-table}
+## Присоединение существующей таблицы {#attach-existing-table}
+
+**Синтаксис**
 
 ``` sql
 ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
@@ -22,16 +29,18 @@ ATTACH TABLE [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
 
 Если таблица была отключена перманентно, она не будет подключена обратно во время старта сервера, так что нужно явно использовать запрос `ATTACH`, чтобы подключить ее.
 
-### Создание новой таблицы и присоединение данных {#create-new-table-and-attach-data}
+## Создание новой таблицы и присоединение данных {#create-new-table-and-attach-data}
 
-**С указанием пути к табличным данным**
+### С указанием пути к табличным данным {#attach-with-specified-path}
+
+Запрос создает новую таблицу с указанной структурой и присоединяет табличные данные из соответствующего каталога в `user_files`.
+
+**Синтаксис**
 
 ```sql
 ATTACH TABLE name FROM 'path/to/data/' (col1 Type1, ...)
 ```
 
-Cоздает новую таблицу с указанной структурой и присоединяет табличные данные из соответствующего каталога в `user_files`.
-
 **Пример**
 
 Запрос:
@@ -50,10 +59,23 @@ SELECT * FROM test;
 └──────┴────┘
 ```
 
-**С указанием UUID таблицы** (Только для баз данных `Atomic`)
+### С указанием UUID таблицы {#attach-with-specified-uuid}
+
+Этот запрос создает новую таблицу с указанной структурой и присоединяет данные из таблицы с указанным UUID.
+Запрос поддерживается только движком баз данных [Atomic](../../engines/database-engines/atomic.md).
+
+**Синтаксис**
 
 ```sql
 ATTACH TABLE name UUID '<uuid>' (col1 Type1, ...)
 ```
 
-Cоздает новую таблицу с указанной структурой и присоединяет данные из таблицы с указанным UUID.
+## Присоединение существующего словаря {#attach-existing-dictionary}
+
+Присоединяет ранее отключенный словарь.
+
+**Синтаксис**
+
+``` sql
+ATTACH DICTIONARY [IF NOT EXISTS] [db.]name [ON CLUSTER cluster]
+```
diff --git a/docs/ru/sql-reference/statements/create/function.md b/docs/ru/sql-reference/statements/create/function.md
new file mode 100644
index 00000000000..90838b25744
--- /dev/null
+++ b/docs/ru/sql-reference/statements/create/function.md
@@ -0,0 +1,59 @@
+---
+toc_priority: 38
+toc_title: FUNCTION
+---
+
+# CREATE FUNCTION {#create-function}
+
+Создает пользовательскую функцию из лямбда-выражения. Выражение должно состоять из параметров функции, констант, операторов и вызовов других функций.
+
+**Синтаксис**
+
+```sql
+CREATE FUNCTION name AS (parameter0, ...) -> expression
+```
+У функции может быть произвольное число параметров.
+
+Существует несколько ограничений на создаваемые функции:
+
+-   Имя функции должно быть уникальным среди всех пользовательских и системных функций.
+-   Рекурсивные функции запрещены.
+-   Все переменные, используемые функцией, должны быть перечислены в списке ее параметров.
+
+Если какое-нибудь ограничение нарушается, то при попытке создать функцию возникает исключение.
+
+**Пример**
+
+Запрос:
+
+```sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+SELECT number, linear_equation(number, 2, 1) FROM numbers(3);
+```
+
+Результат:
+
+``` text
+┌─number─┬─plus(multiply(2, number), 1)─┐
+│      0 │                            1 │
+│      1 │                            3 │
+│      2 │                            5 │
+└────────┴──────────────────────────────┘
+```
+
+В следующем запросе пользовательская функция вызывает [условную функцию](../../../sql-reference/functions/conditional-functions.md):
+
+```sql
+CREATE FUNCTION parity_str AS (n) -> if(n % 2, 'odd', 'even');
+SELECT number, parity_str(number) FROM numbers(3);
+```
+
+Результат:
+
+``` text
+┌─number─┬─if(modulo(number, 2), 'odd', 'even')─┐
+│      0 │ even                                 │
+│      1 │ odd                                  │
+│      2 │ even                                 │
+└────────┴──────────────────────────────────────┘
+```
diff --git a/docs/ru/sql-reference/statements/create/index.md b/docs/ru/sql-reference/statements/create/index.md
index dfa5c28fff7..61d4d053fec 100644
--- a/docs/ru/sql-reference/statements/create/index.md
+++ b/docs/ru/sql-reference/statements/create/index.md
@@ -12,6 +12,7 @@ toc_title: "Обзор"
 -   [TABLE](../../../sql-reference/statements/create/table.md)
 -   [VIEW](../../../sql-reference/statements/create/view.md)
 -   [DICTIONARY](../../../sql-reference/statements/create/dictionary.md)
+-   [FUNCTION](../../../sql-reference/statements/create/function.md)
 -   [USER](../../../sql-reference/statements/create/user.md)
 -   [ROLE](../../../sql-reference/statements/create/role.md)
 -   [ROW POLICY](../../../sql-reference/statements/create/row-policy.md)
diff --git a/docs/ru/sql-reference/statements/create/table.md b/docs/ru/sql-reference/statements/create/table.md
index 5523557c18a..6601276d573 100644
--- a/docs/ru/sql-reference/statements/create/table.md
+++ b/docs/ru/sql-reference/statements/create/table.md
@@ -183,7 +183,7 @@ CREATE TABLE codec_example
     dt Date CODEC(ZSTD),
     ts DateTime CODEC(LZ4HC),
     float_value Float32 CODEC(NONE),
-    double_value Float64 CODEC(LZ4HC(9))
+    double_value Float64 CODEC(LZ4HC(9)),
     value Float32 CODEC(Delta, ZSTD)
 )
 ENGINE = <Engine>
@@ -201,8 +201,6 @@ ALTER TABLE codec_example MODIFY COLUMN float_value CODEC(Default);
 
 Кодеки можно последовательно комбинировать, например, `CODEC(Delta, Default)`.
 
-Чтобы выбрать наиболее подходящую для вашего проекта комбинацию кодеков, необходимо провести сравнительные тесты, подобные тем, что описаны в статье Altinity [New Encodings to Improve ClickHouse Efficiency](https://www.altinity.com/blog/2019/7/new-encodings-to-improve-clickhouse). Для столбцов типа `ALIAS` кодеки не применяются.
-
 !!! warning "Предупреждение"
     Нельзя распаковать базу данных ClickHouse с помощью сторонних утилит наподобие `lz4`. Необходимо использовать специальную утилиту [clickhouse-compressor](https://github.com/ClickHouse/ClickHouse/tree/master/programs/compressor).
 
@@ -247,6 +245,7 @@ CREATE TABLE codec_example
 )
 ENGINE = MergeTree()
 ```
+
 ## Временные таблицы {#temporary-tables}
 
 ClickHouse поддерживает временные таблицы со следующими характеристиками:
diff --git a/docs/ru/sql-reference/statements/create/user.md b/docs/ru/sql-reference/statements/create/user.md
index 22efaa71bfc..f6248d97ba9 100644
--- a/docs/ru/sql-reference/statements/create/user.md
+++ b/docs/ru/sql-reference/statements/create/user.md
@@ -15,6 +15,7 @@ CREATE USER [IF NOT EXISTS | OR REPLACE] name1 [ON CLUSTER cluster_name1]
     [NOT IDENTIFIED | IDENTIFIED {[WITH {no_password | plaintext_password | sha256_password | sha256_hash | double_sha1_password | double_sha1_hash}] BY {'password' | 'hash'}} | {WITH ldap SERVER 'server_name'} | {WITH kerberos [REALM 'realm']}]
     [HOST {LOCAL | NAME 'name' | REGEXP 'name_regexp' | IP 'address' | LIKE 'pattern'} [,...] | ANY | NONE]
     [DEFAULT ROLE role [,...]]
+    [DEFAULT DATABASE database | NONE]
     [GRANTEES {user | role | ANY | NONE} [,...] [EXCEPT {user | role} [,...]]]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY | WRITABLE] | PROFILE 'profile_name'] [,...]
 ```
diff --git a/docs/ru/sql-reference/statements/create/view.md b/docs/ru/sql-reference/statements/create/view.md
index 0be29b12aea..551c0265114 100644
--- a/docs/ru/sql-reference/statements/create/view.md
+++ b/docs/ru/sql-reference/statements/create/view.md
@@ -5,7 +5,7 @@ toc_title: "Представление"
 
 # CREATE VIEW {#create-view}
 
-Создаёт представление. Представления бывают двух видов - обычные и материализованные (MATERIALIZED).
+Создаёт представление. Представления бывают [обычные](#normal), [материализованные](#materialized) (MATERIALIZED) и [LIVE](#live-view).
 
 ## Обычные представления {#normal}
 
@@ -48,13 +48,16 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 Материализованное представление устроено следующим образом: при вставке данных в таблицу, указанную в SELECT-е, кусок вставляемых данных преобразуется этим запросом SELECT, и полученный результат вставляется в представление.
 
 !!! important "Важно"
+
+    Материализованные представления в ClickHouse используют **имена столбцов** вместо порядка следования столбцов при вставке в целевую таблицу. Если в результатах запроса `SELECT` некоторые имена столбцов отсутствуют, то ClickHouse использует значение по умолчанию, даже если столбец не является [Nullable](../../data-types/nullable.md). Безопасной практикой при использовании материализованных представлений считается добавление псевдонимов для каждого столбца.
+
     Материализованные представления в ClickHouse больше похожи на `after insert` триггеры. Если в запросе материализованного представления есть агрегирование, оно применяется только к вставляемому блоку записей. Любые изменения существующих данных исходной таблицы (например обновление, удаление, удаление раздела и т.д.) не изменяют материализованное представление.
 
-Если указано `POPULATE`, то при создании представления, в него будут вставлены имеющиеся данные таблицы, как если бы был сделан запрос `CREATE TABLE ... AS SELECT ...` . Иначе, представление будет содержать только данные, вставляемые в таблицу после создания представления. Не рекомендуется использовать POPULATE, так как вставляемые в таблицу данные во время создания представления, не попадут в него.
+Если указано `POPULATE`, то при создании представления в него будут добавлены данные, уже содержащиеся в исходной таблице, как если бы был сделан запрос `CREATE TABLE ... AS SELECT ...` . Если `POPULATE` не указано, представление будет содержать только данные, добавленные в таблицу после создания представления. Использовать `POPULATE` не рекомендуется, так как в представление не попадут данные, добавляемые в таблицу во время создания представления.
 
 Запрос `SELECT` может содержать `DISTINCT`, `GROUP BY`, `ORDER BY`, `LIMIT`… Следует иметь ввиду, что соответствующие преобразования будут выполняться независимо, на каждый блок вставляемых данных. Например, при наличии `GROUP BY`, данные будут агрегироваться при вставке, но только в рамках одной пачки вставляемых данных. Далее, данные не будут доагрегированы. Исключение - использование ENGINE, производящего агрегацию данных самостоятельно, например, `SummingMergeTree`.
 
-Недоработано выполнение запросов `ALTER` над материализованными представлениями, поэтому они могут быть неудобными для использования. Если материализованное представление использует конструкцию `TO [db.]name`, то можно выполнить `DETACH` представления, `ALTER` для целевой таблицы и последующий `ATTACH` ранее отсоединенного (`DETACH`) представления.
+Выполнение запросов [ALTER](../../../sql-reference/statements/alter/view.md) над материализованными представлениями имеет свои особенности, поэтому эти запросы могут быть неудобными для использования. Если материализованное представление использует конструкцию `TO [db.]name`, то можно выполнить `DETACH` представления, `ALTER` для целевой таблицы и последующий `ATTACH` ранее отсоединенного (`DETACH`) представления.
 
 Обратите внимание, что работа материализованного представления находится под влиянием настройки [optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert). Перед вставкой данных в таблицу происходит их слияние.
 
@@ -62,11 +65,11 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 
 Чтобы удалить представление, следует использовать [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Впрочем, `DROP TABLE` тоже работает для представлений.
 
-## LIVE-представления {#live-view}
+## LIVE-представления [экспериментальный функционал] {#live-view}
 
 !!! important "Важно"
-   Представления `LIVE VIEW` являются экспериментальной возможностью. Их использование может повлечь потерю совместимости в будущих версиях.
-   Чтобы использовать `LIVE VIEW` и запросы `WATCH`, включите настройку [allow_experimental_live_view](../../../operations/settings/settings.md#allow-experimental-live-view).
+    Представления `LIVE VIEW` являются экспериментальной возможностью. Их использование может повлечь потерю совместимости в будущих версиях.
+    Чтобы использовать `LIVE VIEW` и запросы `WATCH`, включите настройку [allow_experimental_live_view](../../../operations/settings/settings.md#allow-experimental-live-view).
 
 ```sql
 CREATE LIVE VIEW [IF NOT EXISTS] [db.]table_name [WITH [TIMEOUT [value_in_sec] [AND]] [REFRESH [value_in_sec]]] AS SELECT ...
@@ -86,7 +89,7 @@ LIVE-представления работают по тому же принци
 
     В случаях, когда `LIVE VIEW` не обновляется автоматически, чтобы обновлять его принудительно с заданной периодичностью, используйте [WITH REFRESH](#live-view-with-refresh).
 
-### Отслеживание изменений {#live-view-monitoring}
+### Отслеживание изменений LIVE-представлений {#live-view-monitoring}
 
 Для отслеживания изменений LIVE-представления используйте запрос [WATCH](../../../sql-reference/statements/watch.md).
 
@@ -108,12 +111,11 @@ WATCH lv;
 │      1 │        1 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
-│      2 │        2 │
+│      3 │        2 │
 └────────┴──────────┘
 ┌─sum(x)─┬─_version─┐
 │      6 │        3 │
 └────────┴──────────┘
-...
 ```
 
 ```sql
@@ -148,7 +150,7 @@ WATCH lv EVENTS;
 SELECT * FROM [db.]live_view WHERE ...
 ```
 
-### Принудительное обновление {#live-view-alter-refresh}
+### Принудительное обновление LIVE-представлений {#live-view-alter-refresh}
 
 Чтобы принудительно обновить LIVE-представление, используйте запрос `ALTER LIVE VIEW [db.]table_name REFRESH`.
 
@@ -220,13 +222,13 @@ WATCH lv;
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv doesn't exist..
 ```
 
-### Использование {#live-view-usage}
+### Использование LIVE-представлений {#live-view-usage}
 
-Наиболее частые случаи использования `LIVE-VIEW`:
+Наиболее частые случаи использования `LIVE-представлений`:
 
 - Получение push-уведомлений об изменениях данных без дополнительных периодических запросов.
 - Кеширование результатов часто используемых запросов для получения их без задержки.
 - Отслеживание изменений таблицы для запуска других запросов `SELECT`.
 - Отслеживание показателей из системных таблиц с помощью периодических обновлений.
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/create/view) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/statements/create/view) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/detach.md b/docs/ru/sql-reference/statements/detach.md
index af915d38772..71b4012104b 100644
--- a/docs/ru/sql-reference/statements/detach.md
+++ b/docs/ru/sql-reference/statements/detach.md
@@ -5,17 +5,17 @@ toc_title: DETACH
 
 # DETACH {#detach-statement}
 
-Заставляет сервер "забыть" о существовании таблицы или материализованного представления.
+Заставляет сервер "забыть" о существовании таблицы, материализованного представления или словаря.
 
-Синтаксис:
+**Синтаксис**
 
 ``` sql
-DETACH TABLE|VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
+DETACH TABLE|VIEW|DICTIONARY [IF EXISTS] [db.]name [ON CLUSTER cluster] [PERMANENTLY]
 ```
 
-Но ни данные, ни метаданные таблицы или материализованного представления не удаляются. При следующем запуске сервера, если не было использовано `PERMANENTLY`, сервер прочитает метаданные и снова узнает о таблице/представлении. Если таблица или представление были отключены перманентно, сервер не подключит их обратно автоматически.
+Такой запрос не удаляет ни данные, ни метаданные таблицы, материализованного представления или словаря. Если отключение не было перманентным (запрос без ключевого слова `PERMANENTLY`), то при следующем запуске сервер прочитает метаданные и снова узнает о таблице/представлении/словаре. Если сущность была отключена перманентно, то сервер не подключит их обратно автоматически.
 
-Независимо от того, каким способом таблица была отключена, ее можно подключить обратно с помощью запроса [ATTACH](../../sql-reference/statements/attach.md). Системные log таблицы также могут быть подключены обратно (к примеру `query_log`, `text_log` и др.) Другие системные таблицы не могут быть подключены обратно, но на следующем запуске сервер снова "вспомнит" об этих таблицах.
+Независимо от того, каким способом таблица была отключена, ее можно подключить обратно с помощью запроса [ATTACH](../../sql-reference/statements/attach.md). Системные log таблицы также могут быть подключены обратно (к примеру, `query_log`, `text_log` и др.). Другие системные таблицы не могут быть подключены обратно, но на следующем запуске сервер снова "вспомнит" об этих таблицах.
 
 `ATTACH MATERIALIZED VIEW` не может быть использован с кратким синтаксисом (без `SELECT`), но можно подключить представление с помощью запроса `ATTACH TABLE`.
 
@@ -67,3 +67,7 @@ Received exception from server (version 21.4.1):
 Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.test doesn't exist.
 ```
 
+**Смотрите также**
+
+-   [Материализованные представления](../../sql-reference/statements/create/view.md#materialized)
+-   [Словари](../../sql-reference/dictionaries/index.md)
diff --git a/docs/ru/sql-reference/statements/drop.md b/docs/ru/sql-reference/statements/drop.md
index 118f8eb923a..437c2d02a94 100644
--- a/docs/ru/sql-reference/statements/drop.md
+++ b/docs/ru/sql-reference/statements/drop.md
@@ -97,3 +97,20 @@ DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
 DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
 ```
 
+## DROP FUNCTION {#drop-function}
+
+Удаляет пользовательскую функцию, созданную с помощью [CREATE FUNCTION](./create/function.md).
+Удалить системные функции нельзя.
+
+**Синтаксис**
+
+``` sql
+DROP FUNCTION [IF EXISTS] function_name
+```
+
+**Пример**
+
+``` sql
+CREATE FUNCTION linear_equation AS (x, k, b) -> k*x + b;
+DROP FUNCTION linear_equation;
+```
diff --git a/docs/ru/sql-reference/statements/exchange.md b/docs/ru/sql-reference/statements/exchange.md
new file mode 100644
index 00000000000..81dea27ddb6
--- /dev/null
+++ b/docs/ru/sql-reference/statements/exchange.md
@@ -0,0 +1,42 @@
+---
+toc_priority: 49
+toc_title: EXCHANGE
+---
+
+# EXCHANGE {#exchange}
+
+Атомарно обменивает имена двух таблиц или словарей.
+Это действие также можно выполнить с помощью запроса [RENAME](./rename.md), используя третье временное имя, но в таком случае действие неатомарно.
+
+!!! note "Примечание"
+    Запрос `EXCHANGE` поддерживается только движком баз данных [Atomic](../../engines/database-engines/atomic.md).
+
+**Синтаксис**
+
+```sql
+EXCHANGE TABLES|DICTIONARIES [db0.]name_A AND [db1.]name_B
+```
+
+## EXCHANGE TABLES {#exchange_tables}
+
+Обменивает имена двух таблиц.
+
+**Синтаксис**
+
+```sql
+EXCHANGE TABLES [db0.]table_A AND [db1.]table_B
+```
+
+## EXCHANGE DICTIONARIES {#exchange_dictionaries}
+
+Обменивает имена двух словарей.
+
+**Синтаксис**
+
+```sql
+EXCHANGE DICTIONARIES [db0.]dict_A AND [db1.]dict_B
+```
+
+**Смотрите также**
+
+-   [Словари](../../sql-reference/dictionaries/index.md)
diff --git a/docs/ru/sql-reference/statements/explain.md b/docs/ru/sql-reference/statements/explain.md
index c11c33ae99a..8120df67139 100644
--- a/docs/ru/sql-reference/statements/explain.md
+++ b/docs/ru/sql-reference/statements/explain.md
@@ -385,4 +385,32 @@ ExpressionTransform
             NumbersMt × 2 0 → 1
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/statements/explain/) <!--hide-->
+### EXPLAIN ESTIMATE {#explain-estimate}
+
+ Отображает оценки числа строк, засечек и кусков, которые будут прочитаны при выполнении запроса. Применяется для таблиц семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md#table_engines-mergetree). 
+
+**Пример**
+
+Создадим таблицу:
+
+```sql
+CREATE TABLE ttt (i Int64) ENGINE = MergeTree() ORDER BY i SETTINGS index_granularity = 16, write_final_mark = 0;
+INSERT INTO ttt SELECT number FROM numbers(128);
+OPTIMIZE TABLE ttt;
+```
+
+Запрос:
+
+```sql
+EXPLAIN ESTIMATE SELECT * FROM ttt;
+```
+
+Результат:
+
+```text
+┌─database─┬─table─┬─parts─┬─rows─┬─marks─┐
+│ default  │ ttt   │     1 │  128 │     8 │
+└──────────┴───────┴───────┴──────┴───────┘
+```
+
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/statements/explain/) <!--hide-->
diff --git a/docs/ru/sql-reference/statements/grant.md b/docs/ru/sql-reference/statements/grant.md
index 8d6605e1571..c970d4d24f3 100644
--- a/docs/ru/sql-reference/statements/grant.md
+++ b/docs/ru/sql-reference/statements/grant.md
@@ -109,11 +109,13 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
         - `CREATE TEMPORARY TABLE`
     - `CREATE VIEW`
     - `CREATE DICTIONARY`
+    - `CREATE FUNCTION`
 - [DROP](#grant-drop)
     - `DROP DATABASE`
     - `DROP TABLE`
     - `DROP VIEW`
     - `DROP DICTIONARY`
+    - `DROP FUNCTION`
 - [TRUNCATE](#grant-truncate)
 - [OPTIMIZE](#grant-optimize)
 - [SHOW](#grant-show)
@@ -155,6 +157,8 @@ GRANT SELECT(x,y) ON db.table TO john WITH GRANT OPTION
         - `SYSTEM RELOAD CONFIG`
         - `SYSTEM RELOAD DICTIONARY`
             - `SYSTEM RELOAD EMBEDDED DICTIONARIES`
+        -   `SYSTEM RELOAD FUNCTION`
+        -   `SYSTEM RELOAD FUNCTIONS`
     - `SYSTEM MERGES`
     - `SYSTEM TTL MERGES`
     - `SYSTEM FETCHES`
diff --git a/docs/ru/sql-reference/statements/insert-into.md b/docs/ru/sql-reference/statements/insert-into.md
index da9f3a11101..baa4d83626d 100644
--- a/docs/ru/sql-reference/statements/insert-into.md
+++ b/docs/ru/sql-reference/statements/insert-into.md
@@ -121,3 +121,14 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 -   Данные поступают в режиме реального времени.
 -   Вы загружаете данные, которые как правило отсортированы по времени.
 
+Также возможно вставлять данные асинхронно во множественных маленьких вставках. Данные от таких вставок сначала собираются в пачки, а потом вставляются в таблицу. Чтобы включить асинхронный режим, используйте настройку [async_insert](../../operations/settings/settings.md#async-insert). Обратите внимание, что асинхронные вставки поддерживаются только через протокол HTTP, а дедупликация при этом не производится.
+
+**См. также**
+
+-   [async_insert](../../operations/settings/settings.md#async-insert)
+-   [async_insert_threads](../../operations/settings/settings.md#async-insert-threads)
+-   [wait_for_async_insert](../../operations/settings/settings.md#wait-for-async-insert)
+-   [wait_for_async_insert_timeout](../../operations/settings/settings.md#wait-for-async-insert-timeout)
+-   [async_insert_max_data_size](../../operations/settings/settings.md#async-insert-max-data-size)
+-   [async_insert_busy_timeout_ms](../../operations/settings/settings.md#async-insert-busy-timeout-ms)
+-   [async_insert_stale_timeout_ms](../../operations/settings/settings.md#async-insert-stale-timeout-ms)
diff --git a/docs/ru/sql-reference/statements/optimize.md b/docs/ru/sql-reference/statements/optimize.md
index 1f0c5a0ebe9..e6a71c4f611 100644
--- a/docs/ru/sql-reference/statements/optimize.md
+++ b/docs/ru/sql-reference/statements/optimize.md
@@ -18,7 +18,7 @@ OPTIMIZE TABLE [db.]name [ON CLUSTER cluster] [PARTITION partition | PARTITION I
 
 Может применяться к таблицам семейства [MergeTree](../../engines/table-engines/mergetree-family/mergetree.md), [MaterializedView](../../engines/table-engines/special/materializedview.md) и [Buffer](../../engines/table-engines/special/buffer.md). Другие движки таблиц не поддерживаются.
 
-Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех узлах (если активирована настройка `replication_alter_partitions_sync`).
+Если запрос `OPTIMIZE` применяется к таблицам семейства [ReplicatedMergeTree](../../engines/table-engines/mergetree-family/replication.md), ClickHouse создаёт задачу на слияние и ожидает её исполнения на всех репликах (если значение настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) равно `2`) или на текущей реплике (если значение настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync) равно `1`).
 
 -   По умолчанию, если запросу `OPTIMIZE` не удалось выполнить слияние, то
 ClickHouse не оповещает клиента. Чтобы включить оповещения, используйте настройку [optimize_throw_if_noop](../../operations/settings/settings.md#setting-optimize_throw_if_noop).
@@ -26,6 +26,11 @@ ClickHouse не оповещает клиента. Чтобы включить 
 -   Если указать `FINAL`, то оптимизация выполняется даже в том случае, если все данные уже лежат в одном куске данных. Кроме того, слияние является принудительным, даже если выполняются параллельные слияния.
 -   Если указать `DEDUPLICATE`, то произойдет схлопывание полностью одинаковых строк (сравниваются значения во всех столбцах), имеет смысл только для движка MergeTree.
 
+Вы можете указать время ожидания (в секундах) выполнения запросов `OPTIMIZE` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
+
 ## Выражение BY {#by-expression}
 
 Чтобы выполнить дедупликацию по произвольному набору столбцов, вы можете явно указать список столбцов или использовать любую комбинацию подстановки [`*`](../../sql-reference/statements/select/index.md#asterisk), выражений [`COLUMNS`](../../sql-reference/statements/select/index.md#columns-expression) и [`EXCEPT`](../../sql-reference/statements/select/index.md#except-modifier).
diff --git a/docs/ru/sql-reference/statements/rename.md b/docs/ru/sql-reference/statements/rename.md
index b78505ce9c4..f026be304c6 100644
--- a/docs/ru/sql-reference/statements/rename.md
+++ b/docs/ru/sql-reference/statements/rename.md
@@ -3,20 +3,58 @@ toc_priority: 48
 toc_title: RENAME
 ---
 
-# RENAME Statement {#misc_operations-rename}
+# RENAME {#misc_operations-rename}
+
+Переименовывает базы данных, таблицы или словари. Несколько сущностей могут быть переименованы в одном запросе.
+Обратите внимание, что запрос `RENAME` с несколькими сущностями это неатомарная операция. Чтобы обменять имена атомарно, используйте выражение [EXCHANGE](./exchange.md).
+
+!!! note "Примечание"
+    Запрос `RENAME` поддерживается только движком баз данных [Atomic](../../engines/database-engines/atomic.md).
+
+**Синтаксис**
+
+```sql
+RENAME DATABASE|TABLE|DICTIONARY name TO new_name [,...] [ON CLUSTER cluster]
+```
 
 ## RENAME DATABASE {#misc_operations-rename_database}
-Переименовывает базу данных, поддерживается только для движка базы данных Atomic.
 
-```
-RENAME DATABASE atomic_database1 TO atomic_database2 [ON CLUSTER cluster]
+Переименовывает базы данных.
+
+**Синтаксис**
+
+```sql
+RENAME DATABASE atomic_database1 TO atomic_database2 [,...] [ON CLUSTER cluster]
 ```
 
 ## RENAME TABLE {#misc_operations-rename_table}
+
 Переименовывает одну или несколько таблиц.
 
+Переименовывание таблиц является лёгкой операцией. Если вы указали после `TO` другую базу данных, то таблица будет перенесена в эту базу данных. При этом директории с базами данных должны быть расположены в одной файловой системе, иначе возвращается ошибка. Если переименовывается несколько таблиц в одном запросе, то такая операция неатомарная. Она может выполнится частично, и запросы в других сессиях могут получить ошибку `Table ... doesn't exist...`.
+
+**Синтаксис**
+
 ``` sql
-RENAME TABLE [db11.]name11 TO [db12.]name12, [db21.]name21 TO [db22.]name22, ... [ON CLUSTER cluster]
+RENAME TABLE [db1.]name1 TO [db2.]name2 [,...] [ON CLUSTER cluster]
 ```
 
-Переименовывание таблицы является лёгкой операцией. Если вы указали после `TO` другую базу данных, то таблица будет перенесена в эту базу данных. При этом, директории с базами данных должны быть расположены в одной файловой системе (иначе возвращается ошибка). В случае переименования нескольких таблиц в одном запросе — это неатомарная операция,  может выполнится частично, запросы в других сессиях могут получить ошибку `Table ... doesn't exist...`.
+**Пример**
+
+```sql
+RENAME TABLE table_A TO table_A_bak, table_B TO table_B_bak;
+```
+
+## RENAME DICTIONARY {#rename_dictionary}
+
+Переименовывает один или несколько словарей. Этот запрос можно использовать для перемещения словарей между базами данных.
+
+**Синтаксис**
+
+```sql
+RENAME DICTIONARY [db0.]dict_A TO [db1.]dict_B [,...] [ON CLUSTER cluster]
+```
+
+**Смотрите также**
+
+-   [Словари](../../sql-reference/dictionaries/index.md)
diff --git a/docs/ru/sql-reference/statements/select/distinct.md b/docs/ru/sql-reference/statements/select/distinct.md
index f57c2a42593..42c1df64540 100644
--- a/docs/ru/sql-reference/statements/select/distinct.md
+++ b/docs/ru/sql-reference/statements/select/distinct.md
@@ -6,19 +6,51 @@ toc_title: DISTINCT
 
 Если указан `SELECT DISTINCT`, то в результате запроса останутся только уникальные строки. Таким образом, из всех наборов полностью совпадающих строк в результате останется только одна строка.
 
-## Обработка NULL {#null-processing}
+Вы можете указать столбцы, по которым хотите отбирать уникальные значения: `SELECT DISTINCT ON (column1, column2,...)`. Если столбцы не указаны, то отбираются строки, в которых значения уникальны во всех столбцах. 
 
-`DISTINCT` работает с [NULL](../../syntax.md#null-literal) как-будто `NULL` — обычное значение и `NULL==NULL`. Другими словами, в результате `DISTINCT`, различные комбинации с `NULL` встретятся только один раз. Это отличается от обработки `NULL` в большинстве других контекстов.
+Рассмотрим таблицу:
 
-## Альтернативы {#alternatives}
+```text
+┌─a─┬─b─┬─c─┐
+│ 1 │ 1 │ 1 │
+│ 1 │ 1 │ 1 │
+│ 2 │ 2 │ 2 │
+│ 2 │ 2 │ 2 │
+│ 1 │ 1 │ 2 │
+│ 1 │ 2 │ 2 │
+└───┴───┴───┘
+```
 
-Такой же результат можно получить, применив секцию [GROUP BY](group-by.md) для того же набора значений, которые указан в секции `SELECT`, без использования каких-либо агрегатных функций. Но есть от `GROUP BY` несколько отличий:
+Использование `DISTINCT` без указания столбцов:
 
--   `DISTINCT` может применяться вместе с `GROUP BY`.
--   Когда секция [ORDER BY](order-by.md) опущена, а секция [LIMIT](limit.md) присутствует, запрос прекращает выполнение сразу после считывания необходимого количества различных строк.
--   Блоки данных выводятся по мере их обработки, не дожидаясь завершения выполнения всего запроса.
+```sql
+SELECT DISTINCT * FROM t1;
+```
 
-## Примеры {#examples}
+```text
+┌─a─┬─b─┬─c─┐
+│ 1 │ 1 │ 1 │
+│ 2 │ 2 │ 2 │
+│ 1 │ 1 │ 2 │
+│ 1 │ 2 │ 2 │
+└───┴───┴───┘
+```
+
+Использование `DISTINCT` с указанием столбцов:
+
+```sql
+SELECT DISTINCT ON (a,b) * FROM t1;
+```
+
+```text
+┌─a─┬─b─┬─c─┐
+│ 1 │ 1 │ 1 │
+│ 2 │ 2 │ 2 │
+│ 1 │ 2 │ 2 │
+└───┴───┴───┘
+```
+
+## DISTINCT и ORDER BY {#distinct-orderby}
 
 ClickHouse поддерживает использование секций `DISTINCT` и `ORDER BY` для разных столбцов в одном запросе. Секция `DISTINCT` выполняется до секции `ORDER BY`.
 
@@ -56,3 +88,16 @@ ClickHouse поддерживает использование секций `DIS
 Ряд `2, 4` был разрезан перед сортировкой.
 
 Учитывайте эту специфику при разработке запросов.
+
+## Обработка NULL {#null-processing}
+
+`DISTINCT` работает с [NULL](../../syntax.md#null-literal) как-будто `NULL` — обычное значение и `NULL==NULL`. Другими словами, в результате `DISTINCT`, различные комбинации с `NULL` встретятся только один раз. Это отличается от обработки `NULL` в большинстве других контекстов.
+
+## Альтернативы {#alternatives}
+
+Можно получить такой же результат, применив [GROUP BY](group-by.md) для того же набора значений, которые указан в секции `SELECT`, без использования каких-либо агрегатных функций. Но есть несколько отличий от `GROUP BY`:
+
+-   `DISTINCT` может применяться вместе с `GROUP BY`.
+-   Когда секция [ORDER BY](order-by.md) опущена, а секция [LIMIT](limit.md) присутствует, запрос прекращает выполнение сразу после считывания необходимого количества различных строк.
+-   Блоки данных выводятся по мере их обработки, не дожидаясь завершения выполнения всего запроса.
+
diff --git a/docs/ru/sql-reference/statements/select/except.md b/docs/ru/sql-reference/statements/select/except.md
new file mode 100644
index 00000000000..eb4986aceea
--- /dev/null
+++ b/docs/ru/sql-reference/statements/select/except.md
@@ -0,0 +1,69 @@
+---
+toc_title: EXCEPT
+---
+
+# Секция EXCEPT {#except-clause}
+
+`EXCEPT` возвращает только те строки, которые являются результатом первого запроса без результатов второго. В запросах количество, порядок следования и типы столбцов должны совпадать. Результат `EXCEPT` может содержать повторяющиеся строки.
+
+Если используется несколько `EXCEPT`, и в выражении не указаны скобки, `EXCEPT` выполняется по порядку слева направо. `EXCEPT` имеет такой же приоритет выполнения, как `UNION`, и приоритет ниже, чем у `INTERSECT`.
+
+``` sql
+SELECT column1 [, column2 ]
+FROM table1
+[WHERE condition]
+
+EXCEPT
+
+SELECT column1 [, column2 ]
+FROM table2
+[WHERE condition]
+
+```
+Условие в секции `WHERE` может быть любым в зависимости от ваших требований.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT number FROM numbers(1,10) EXCEPT SELECT number FROM numbers(3,6);
+```
+
+Результат:
+
+``` text
+┌─number─┐
+│      1 │
+│      2 │
+│      9 │
+│     10 │
+└────────┘
+```
+
+Запрос:
+
+``` sql
+CREATE TABLE t1(one String, two String, three String) ENGINE=Memory();
+CREATE TABLE t2(four String, five String, six String) ENGINE=Memory();
+
+INSERT INTO t1 VALUES ('q', 'm', 'b'), ('s', 'd', 'f'), ('l', 'p', 'o'), ('s', 'd', 'f'), ('s', 'd', 'f'), ('k', 't', 'd'), ('l', 'p', 'o');
+INSERT INTO t2 VALUES ('q', 'm', 'b'), ('b', 'd', 'k'), ('s', 'y', 't'), ('s', 'd', 'f'), ('m', 'f', 'o'), ('k', 'k', 'd');
+
+SELECT * FROM t1 EXCEPT SELECT * FROM t2;
+```
+
+Результат:
+
+``` text
+┌─one─┬─two─┬─three─┐
+│ l   │ p   │ o     │
+│ k   │ t   │ d     │
+│ l   │ p   │ o     │
+└─────┴─────┴───────┘
+```
+
+**См. также**
+
+-   [UNION](union.md#union-clause)
+-   [INTERSECT](intersect.md#intersect-clause)
\ No newline at end of file
diff --git a/docs/ru/sql-reference/statements/select/from.md b/docs/ru/sql-reference/statements/select/from.md
index b62b2fd51d4..0711d602cd1 100644
--- a/docs/ru/sql-reference/statements/select/from.md
+++ b/docs/ru/sql-reference/statements/select/from.md
@@ -20,7 +20,7 @@ toc_title: FROM
 
 Если в запросе используется модификатор `FINAL`, то ClickHouse полностью мёржит данные перед выдачей результата, таким образом выполняя все преобразования данных, которые производятся движком таблиц при мёржах.
 
-Он применим при выборе данных из таблиц, использующих [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)- семейство движков (кроме `GraphiteMergeTree`). Также поддерживается для:
+Он применим при выборе данных из таблиц, использующих [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)- семейство движков. Также поддерживается для:
 
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) варианты исполнения `MergeTree` движков.
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md), и [MaterializedView](../../../engines/table-engines/special/materializedview.md), которые работают поверх других движков, если они созданы для таблиц с движками семейства `MergeTree`.
diff --git a/docs/ru/sql-reference/statements/select/group-by.md b/docs/ru/sql-reference/statements/select/group-by.md
index 2f0cabd14fb..8bc1b765ad3 100644
--- a/docs/ru/sql-reference/statements/select/group-by.md
+++ b/docs/ru/sql-reference/statements/select/group-by.md
@@ -10,6 +10,8 @@ toc_title: GROUP BY
 -   Все выражения в секциях [SELECT](index.md), [HAVING](having.md), и [ORDER BY](order-by.md) статьи **должны** быть вычисленными на основе ключевых выражений **или** на [агрегатных функций](../../../sql-reference/aggregate-functions/index.md) над неключевыми выражениями (включая столбцы). Другими словами, каждый столбец, выбранный из таблицы, должен использоваться либо в ключевом выражении, либо внутри агрегатной функции, но не в обоих.
 -   В результате агрегирования `SELECT` запрос будет содержать столько строк, сколько было уникальных значений ключа группировки в исходной таблице. Обычно агрегация значительно уменьшает количество строк, часто на порядки, но не обязательно: количество строк остается неизменным, если все исходные значения ключа группировки ценности были различны.
 
+Если вы хотите для группировки данных в таблице указывать номера столбцов, а не названия, включите настройку [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).
+
 !!! note "Примечание"
     Есть ещё один способ запустить агрегацию по таблице. Если запрос содержит столбцы исходной таблицы только внутри агрегатных функций, то `GROUP BY` секцию можно опустить, и предполагается агрегирование по пустому набору ключей. Такие запросы всегда возвращают ровно одну строку.
 
diff --git a/docs/ru/sql-reference/statements/select/index.md b/docs/ru/sql-reference/statements/select/index.md
index a0a862cbf55..42490a6c2f7 100644
--- a/docs/ru/sql-reference/statements/select/index.md
+++ b/docs/ru/sql-reference/statements/select/index.md
@@ -11,7 +11,7 @@ toc_title: "Обзор"
 
 ``` sql
 [WITH expr_list|(subquery)]
-SELECT [DISTINCT] expr_list
+SELECT [DISTINCT [ON (column1, column2, ...)]] expr_list
 [FROM [db.]table | (subquery) | table_function] [FINAL]
 [SAMPLE sample_coeff]
 [ARRAY JOIN ...]
@@ -34,6 +34,8 @@ SELECT [DISTINCT] expr_list
 Особенности каждой необязательной секции рассматриваются в отдельных разделах, которые перечислены в том же порядке, в каком они выполняются:
 
 -   [Секция WITH](with.md)
+-   [Секция SELECT](#select-clause)
+-   [Секция DISTINCT](distinct.md)
 -   [Секция FROM](from.md)
 -   [Секция SAMPLE](sample.md)
 -   [Секция JOIN](join.md)
@@ -42,11 +44,11 @@ SELECT [DISTINCT] expr_list
 -   [Секция GROUP BY](group-by.md)
 -   [Секция LIMIT BY](limit-by.md)
 -   [Секция HAVING](having.md)
--   [Секция SELECT](#select-clause)
--   [Секция DISTINCT](distinct.md)
 -   [Секция LIMIT](limit.md)
-    [Секция OFFSET](offset.md)
+-   [Секция OFFSET](offset.md)
 -   [Секция UNION ALL](union.md)
+-   [Секция INTERSECT](intersect.md)
+-   [Секция EXCEPT](except.md)
 -   [Секция INTO OUTFILE](into-outfile.md)
 -   [Секция FORMAT](format.md)
 
@@ -140,8 +142,7 @@ Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of
 
 Вы можете использовать синонимы (алиасы `AS`) в любом месте запроса.
 
-В секциях `GROUP BY`, `ORDER BY`, в отличие от диалекта MySQL, и в соответствии со стандартным SQL, не поддерживаются позиционные аргументы.
-Например, если вы напишите `GROUP BY 1, 2` - то это будет воспринято, как группировка по константам (то есть, агрегация всех строк в одну).
+В секциях `GROUP BY`, `ORDER BY` и `LIMIT BY` можно использовать не названия столбцов, а номера. Для этого нужно включить настройку [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments). Тогда, например, в запросе с `ORDER BY 1,2` будет выполнена сортировка сначала по первому, а затем по второму столбцу.
 
 
 ## Детали реализации {#implementation-details}
diff --git a/docs/ru/sql-reference/statements/select/intersect.md b/docs/ru/sql-reference/statements/select/intersect.md
new file mode 100644
index 00000000000..2206b141472
--- /dev/null
+++ b/docs/ru/sql-reference/statements/select/intersect.md
@@ -0,0 +1,73 @@
+---
+toc_title: INTERSECT
+---
+
+# Секция INTERSECT {#intersect-clause}
+
+`INTERSECT` возвращает строки, которые есть только в результатах первого и второго запросов. В запросах должны совпадать количество столбцов, их порядок и тип. Результат `INTERSECT` может содержать повторяющиеся строки.
+
+Если используется несколько `INTERSECT` и скобки не указаны, пересечение выполняется слева направо. У `INTERSECT` более высокий приоритет выполнения, чем у `UNION` и `EXCEPT`.
+
+
+``` sql
+SELECT column1 [, column2 ]
+FROM table1
+[WHERE condition]
+
+INTERSECT
+
+SELECT column1 [, column2 ]
+FROM table2
+[WHERE condition]
+
+```
+Условие может быть любым в зависимости от ваших требований.
+
+**Примеры**
+
+Запрос:
+
+``` sql
+SELECT number FROM numbers(1,10) INTERSECT SELECT number FROM numbers(3,6);
+```
+
+Результат:
+
+``` text
+┌─number─┐
+│      3 │
+│      4 │
+│      5 │
+│      6 │
+│      7 │
+│      8 │
+└────────┘
+```
+
+Запрос:
+
+``` sql
+CREATE TABLE t1(one String, two String, three String) ENGINE=Memory();
+CREATE TABLE t2(four String, five String, six String) ENGINE=Memory();
+
+INSERT INTO t1 VALUES ('q', 'm', 'b'), ('s', 'd', 'f'), ('l', 'p', 'o'), ('s', 'd', 'f'), ('s', 'd', 'f'), ('k', 't', 'd'), ('l', 'p', 'o');
+INSERT INTO t2 VALUES ('q', 'm', 'b'), ('b', 'd', 'k'), ('s', 'y', 't'), ('s', 'd', 'f'), ('m', 'f', 'o'), ('k', 'k', 'd');
+
+SELECT * FROM t1 INTERSECT SELECT * FROM t2;
+```
+
+Результат:
+
+``` text
+┌─one─┬─two─┬─three─┐
+│ q   │ m   │ b     │
+│ s   │ d   │ f     │
+│ s   │ d   │ f     │
+│ s   │ d   │ f     │
+└─────┴─────┴───────┘
+```
+
+**См. также**
+
+-   [UNION](union.md#union-clause)
+-   [EXCEPT](except.md#except-clause)
diff --git a/docs/ru/sql-reference/statements/select/join.md b/docs/ru/sql-reference/statements/select/join.md
index 03018a953ce..9f6d38a024f 100644
--- a/docs/ru/sql-reference/statements/select/join.md
+++ b/docs/ru/sql-reference/statements/select/join.md
@@ -6,7 +6,7 @@ toc_title: JOIN
 
 `JOIN` создаёт новую таблицу путем объединения столбцов из одной или нескольких таблиц с использованием общих для каждой из них значений. Это обычная операция в базах данных с поддержкой SQL, которая соответствует join из [реляционной алгебры](https://en.wikipedia.org/wiki/Relational_algebra#Joins_and_join-like_operators). Частный случай соединения одной таблицы часто называют self-join.
 
-Синтаксис:
+**Синтаксис**
 
 ``` sql
 SELECT <expr_list>
@@ -19,7 +19,7 @@ FROM <left_table>
 
 ## Поддерживаемые типы соединения {#select-join-types}
 
-Все типы из стандартого [SQL JOIN](https://en.wikipedia.org/wiki/Join_(SQL)) поддерживаются:
+Все типы из стандартного [SQL JOIN](https://en.wikipedia.org/wiki/Join_(SQL)) поддерживаются:
 
 -   `INNER JOIN`, возвращаются только совпадающие строки.
 -   `LEFT OUTER JOIN`, не совпадающие строки из левой таблицы возвращаются в дополнение к совпадающим строкам.
@@ -33,9 +33,12 @@ FROM <left_table>
 
 -   `LEFT SEMI JOIN` и `RIGHT SEMI JOIN`, белый список по ключам соединения, не производит декартово произведение.
 -   `LEFT ANTI JOIN` и `RIGHT ANTI JOIN`, черный список по ключам соединения, не производит декартово произведение.
--   `LEFT ANY JOIN`, `RIGHT ANY JOIN` и `INNER ANY JOIN`, Частично (для противоположных сторон `LEFT` и `RIGHT`) или полностью (для `INNER` и `FULL`) отключает декартово произведение для стандартых видов `JOIN`.
+-   `LEFT ANY JOIN`, `RIGHT ANY JOIN` и `INNER ANY JOIN`, Частично (для противоположных сторон `LEFT` и `RIGHT`) или полностью (для `INNER` и `FULL`) отключает декартово произведение для стандартных видов `JOIN`.
 -   `ASOF JOIN` и `LEFT ASOF JOIN`, Для соединения последовательностей по нечеткому совпадению. Использование `ASOF JOIN` описано ниже.
 
+!!! note "Примечание"
+    Если настройка [join_algorithm](../../../operations/settings/settings.md#settings-join_algorithm) установлена в значение `partial_merge`, то для `RIGHT JOIN` и `FULL JOIN` поддерживается только уровень строгости `ALL` (`SEMI`, `ANTI`, `ANY` и `ASOF` не поддерживаются).
+
 ## Настройки {#join-settings}
 
 Значение строгости по умолчанию может быть переопределено с помощью настройки [join_default_strictness](../../../operations/settings/settings.md#settings-join_default_strictness).
@@ -52,6 +55,61 @@ FROM <left_table>
 - [join_on_disk_max_files_to_merge](../../../operations/settings/settings.md#join_on_disk_max_files_to_merge)
 - [any_join_distinct_right_table_keys](../../../operations/settings/settings.md#any_join_distinct_right_table_keys)
 
+## Условия в секции ON {on-section-conditions}
+
+Секция `ON` может содержать несколько условий, связанных оператором `AND`. Условия, задающие ключи соединения, должны содержать столбцы левой и правой таблицы и должны использовать оператор равенства. Прочие условия могут использовать другие логические операторы, но в отдельном условии могут использоваться столбцы либо только левой, либо только правой таблицы.
+Строки объединяются только тогда, когда всё составное условие выполнено. Если оно не выполнено, то строки могут попасть в результат в зависимости от типа `JOIN`. Обратите внимание, что если то же самое условие поместить в секцию `WHERE`, то строки, для которых оно не выполняется, никогда не попаду в результат.
+
+!!! note "Примечание"
+    Оператор `OR` внутри секции `ON` пока не поддерживается.
+
+!!! note "Примечание"
+    Если в условии использованы столбцы из разных таблиц, то пока поддерживается только оператор равенства (`=`).
+
+**Пример**
+
+Рассмотрим `table_1` и `table_2`:
+
+```
+┌─Id─┬─name─┐     ┌─Id─┬─text───────────┬─scores─┐
+│  1 │ A    │     │  1 │ Text A         │     10 │
+│  2 │ B    │     │  1 │ Another text A │     12 │
+│  3 │ C    │     │  2 │ Text B         │     15 │
+└────┴──────┘     └────┴────────────────┴────────┘
+```
+
+Запрос с одним условием, задающим ключ соединения, и дополнительным условием для `table_2`:
+
+``` sql
+SELECT name, text FROM table_1 LEFT OUTER JOIN table_2 
+    ON table_1.Id = table_2.Id AND startsWith(table_2.text, 'Text');
+```
+
+Обратите внимание, что результат содержит строку с именем `C` и пустым текстом. Строка включена в результат, потому что использован тип соединения `OUTER`.
+
+```
+┌─name─┬─text───┐
+│ A    │ Text A │
+│ B    │ Text B │
+│ C    │        │
+└──────┴────────┘
+```
+
+Запрос с типом соединения `INNER` и несколькими условиями:
+
+``` sql
+SELECT name, text, scores FROM table_1 INNER JOIN table_2 
+    ON table_1.Id = table_2.Id AND table_2.scores > 10 AND startsWith(table_2.text, 'Text');
+```
+
+Результат:
+
+```
+┌─name─┬─text───┬─scores─┐
+│ B    │ Text B │     15 │
+└──────┴────────┴────────┘
+```
+
 ## Использование ASOF JOIN {#asof-join-usage}
 
 `ASOF JOIN` применим в том случае, когда необходимо объединять записи, которые не имеют точного совпадения.
@@ -59,7 +117,7 @@ FROM <left_table>
 Для работы алгоритма необходим специальный столбец в таблицах. Этот столбец:
 
 - Должен содержать упорядоченную последовательность.
-- Может быть одного из следующих типов: [Int*, UInt*](../../data-types/int-uint.md), [Float*](../../data-types/float.md), [Date](../../data-types/date.md), [DateTime](../../data-types/datetime.md), [Decimal*](../../data-types/decimal.md).
+- Может быть одного из следующих типов: [Int, UInt](../../data-types/int-uint.md), [Float](../../data-types/float.md), [Date](../../data-types/date.md), [DateTime](../../data-types/datetime.md), [Decimal](../../data-types/decimal.md).
 - Не может быть единственным столбцом в секции `JOIN`.
 
 Синтаксис `ASOF JOIN ... ON`:
diff --git a/docs/ru/sql-reference/statements/select/limit-by.md b/docs/ru/sql-reference/statements/select/limit-by.md
index fba81c023b5..861d88dcafb 100644
--- a/docs/ru/sql-reference/statements/select/limit-by.md
+++ b/docs/ru/sql-reference/statements/select/limit-by.md
@@ -15,6 +15,8 @@ ClickHouse поддерживает следующий синтаксис:
 
 `LIMIT BY` не связана с секцией `LIMIT`. Их можно использовать в одном запросе.
 
+Если вы хотите использовать в секции `LIMIT BY` номера столбцов вместо названий, включите настройку [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).	
+
 ## Примеры
 
 Образец таблицы:
diff --git a/docs/ru/sql-reference/statements/select/order-by.md b/docs/ru/sql-reference/statements/select/order-by.md
index d7d2e9c7574..190a46dacc9 100644
--- a/docs/ru/sql-reference/statements/select/order-by.md
+++ b/docs/ru/sql-reference/statements/select/order-by.md
@@ -4,7 +4,9 @@ toc_title: ORDER BY
 
 # Секция ORDER BY {#select-order-by}
 
-Секция `ORDER BY` содержит список выражений, к каждому из которых также может быть приписано `DESC` или `ASC` (направление сортировки). Если ничего не приписано - это аналогично приписыванию `ASC`. `ASC` - сортировка по возрастанию, `DESC` - сортировка по убыванию. Обозначение направления сортировки действует на одно выражение, а не на весь список. Пример: `ORDER BY Visits DESC, SearchPhrase`
+Секция `ORDER BY` содержит список выражений, к каждому из которых также может быть приписано `DESC` или `ASC` (направление сортировки). Если ничего не приписано - это аналогично приписыванию `ASC`. `ASC` - сортировка по возрастанию, `DESC` - сортировка по убыванию. Обозначение направления сортировки действует на одно выражение, а не на весь список. Пример: `ORDER BY Visits DESC, SearchPhrase`.
+
+Если вы хотите для сортировки данных указывать номера столбцов, а не названия, включите настройку [enable_positional_arguments](../../../operations/settings/settings.md#enable-positional-arguments).
 
 Строки, для которых список выражений, по которым производится сортировка, принимает одинаковые значения, выводятся в произвольном порядке, который может быть также недетерминированным (каждый раз разным).
 Если секция ORDER BY отсутствует, то, аналогично, порядок, в котором идут строки, не определён, и может быть недетерминированным.
diff --git a/docs/ru/sql-reference/statements/select/prewhere.md b/docs/ru/sql-reference/statements/select/prewhere.md
index 5ba25e6fa6e..4376cbeb295 100644
--- a/docs/ru/sql-reference/statements/select/prewhere.md
+++ b/docs/ru/sql-reference/statements/select/prewhere.md
@@ -8,17 +8,19 @@ Prewhere — это оптимизация для более эффективн
 
 При оптимизации prewhere сначала читываются только те столбцы, которые необходимы для выполнения выражения prewhere. Затем читаются другие столбцы, необходимые для выполнения остальной части запроса, но только те блоки, в которых находится выражение prewhere «верно» по крайней мере для некоторых рядов. Если есть много блоков, где выражение prewhere «ложно» для всех строк и для выражения prewhere требуется меньше столбцов, чем для других частей запроса, это часто позволяет считывать гораздо меньше данных с диска для выполнения запроса.
 
-## Управление prewhere вручную {#controlling-prewhere-manually}
+## Управление PREWHERE вручную {#controlling-prewhere-manually}
 
 `PREWHERE` имеет смысл использовать, если есть условия фильтрации, которые использует меньшинство столбцов из тех, что есть в запросе, но достаточно сильно фильтрует данные. Таким образом, сокращается количество читаемых данных.
 
-В запрос может быть одновременно указано и `PREWHERE` и `WHERE`. В этом случае, `PREWHERE` предшествует `WHERE`.
+В запросе может быть одновременно указаны и `PREWHERE`, и `WHERE`. В этом случае `PREWHERE` предшествует `WHERE`.
 
-Если значение параметра `optimize_move_to_prewhere` равно 0, эвристика по автоматическому перемещнию части выражений из `WHERE` к `PREWHERE` отключается.
+Если значение параметра [optimize_move_to_prewhere](../../../operations/settings/settings.md#optimize_move_to_prewhere) равно 0, эвристика по автоматическому перемещению части выражений из `WHERE` к `PREWHERE` отключается.
+
+Если в запросе есть модификатор [FINAL](from.md#select-from-final), оптимизация `PREWHERE` не всегда корректна. Она действует только если включены обе настройки [optimize_move_to_prewhere](../../../operations/settings/settings.md#optimize_move_to_prewhere) и [optimize_move_to_prewhere_if_final](../../../operations/settings/settings.md#optimize_move_to_prewhere_if_final).
 
 !!! note "Внимание"
-    Секция `PREWHERE` выполняется до `FINAL`, поэтому результаты запросов `FROM FINAL` могут исказится при использовании `PREWHERE` с полями не входящями в `ORDER BY` таблицы.
+    Секция `PREWHERE` выполняется до `FINAL`, поэтому результаты запросов `FROM ... FINAL` могут исказиться при использовании `PREWHERE` с полями, не входящями в `ORDER BY` таблицы.
 
 ## Ограничения {#limitations}
 
-`PREWHERE` поддерживается только табличными движками из семейства `*MergeTree`.
+`PREWHERE` поддерживается только табличными движками из семейства [*MergeTree](../../../engines/table-engines/mergetree-family/index.md).
diff --git a/docs/ru/sql-reference/statements/show.md b/docs/ru/sql-reference/statements/show.md
index 7b5296e988e..f2b2c61e2bb 100644
--- a/docs/ru/sql-reference/statements/show.md
+++ b/docs/ru/sql-reference/statements/show.md
@@ -8,10 +8,10 @@ toc_title: SHOW
 ## SHOW CREATE TABLE {#show-create-table}
 
 ``` sql
-SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY] [db.]table [INTO OUTFILE filename] [FORMAT format]
+SHOW CREATE [TEMPORARY] [TABLE|DICTIONARY|VIEW] [db.]table|view [INTO OUTFILE filename] [FORMAT format]
 ```
 
-Возвращает один столбец типа `String` с именем statement, содержащий одно значение — запрос `CREATE TABLE`, с помощью которого был создан указанный объект.
+Возвращает один столбец типа `String` с именем statement, содержащий одно значение — запрос `CREATE`, с помощью которого был создан указанный объект.
 
 ## SHOW DATABASES {#show-databases}
 
@@ -91,7 +91,7 @@ SHOW DATABASES LIMIT 2
 
 ### Смотрите также {#see-also}
 
--   [CREATE DATABASE](https://clickhouse.tech/docs/ru/sql-reference/statements/create/database/#query-language-create-database)
+-   [CREATE DATABASE](https://clickhouse.com/docs/ru/sql-reference/statements/create/database/#query-language-create-database)
 
 ## SHOW PROCESSLIST {#show-processlist}
 
@@ -190,8 +190,8 @@ SHOW TABLES FROM system LIMIT 2
 
 ### Смотрите также {#see-also}
 
--   [Create Tables](https://clickhouse.tech/docs/ru/getting-started/tutorial/#create-tables)
--   [SHOW CREATE TABLE](https://clickhouse.tech/docs/ru/sql-reference/statements/show/#show-create-table)
+-   [Create Tables](https://clickhouse.com/docs/ru/getting-started/tutorial/#create-tables)
+-   [SHOW CREATE TABLE](https://clickhouse.com/docs/ru/sql-reference/statements/show/#show-create-table)
 
 ## SHOW DICTIONARIES {#show-dictionaries}
 
diff --git a/docs/ru/sql-reference/statements/system.md b/docs/ru/sql-reference/statements/system.md
index 634343d112f..93a519dd483 100644
--- a/docs/ru/sql-reference/statements/system.md
+++ b/docs/ru/sql-reference/statements/system.md
@@ -10,6 +10,8 @@ toc_title: SYSTEM
 -   [RELOAD DICTIONARY](#query_language-system-reload-dictionary)
 -   [RELOAD MODELS](#query_language-system-reload-models)
 -   [RELOAD MODEL](#query_language-system-reload-model)
+-   [RELOAD FUNCTIONS](#query_language-system-reload-functions)
+-   [RELOAD FUNCTION](#query_language-system-reload-functions)
 -   [DROP DNS CACHE](#query_language-system-drop-dns-cache)
 -   [DROP MARK CACHE](#query_language-system-drop-mark-cache)
 -   [DROP UNCOMPRESSED CACHE](#query_language-system-drop-uncompressed-cache)
@@ -36,6 +38,7 @@ toc_title: SYSTEM
 -   [START REPLICATION QUEUES](#query_language-system-start-replication-queues)
 -   [SYNC REPLICA](#query_language-system-sync-replica)
 -   [RESTART REPLICA](#query_language-system-restart-replica)
+-   [RESTORE REPLICA](#query_language-system-restore-replica)
 -   [RESTART REPLICAS](#query_language-system-restart-replicas)
 
 ## RELOAD EMBEDDED DICTIONARIES] {#query_language-system-reload-emdedded-dictionaries}
@@ -79,6 +82,17 @@ SYSTEM RELOAD MODELS
 SYSTEM RELOAD MODEL <model_name>
 ```
 
+## RELOAD FUNCTIONS {#query_language-system-reload-functions}
+
+Перезагружает все зарегистрированные [исполняемые пользовательские функции](../functions/index.md#executable-user-defined-functions) или одну из них из файла конфигурации.
+
+**Синтаксис**
+
+```sql
+RELOAD FUNCTIONS
+RELOAD FUNCTION function_name
+```
+
 ## DROP DNS CACHE {#query_language-system-drop-dns-cache}
 
 Сбрасывает внутренний DNS кеш ClickHouse. Иногда (для старых версий ClickHouse) необходимо использовать эту команду при изменении инфраструктуры (смене IP адреса у другого ClickHouse сервера или сервера, используемого словарями).
@@ -124,7 +138,7 @@ Cкомпилированные выражения используются ко
 
 ## RELOAD CONFIG {#query_language-system-reload-config}
 
-Перечитывает конфигурацию настроек ClickHouse. Используется при хранении конфигурации в zookeeeper.
+Перечитывает конфигурацию настроек ClickHouse. Используется при хранении конфигурации в zookeeper.
 
 ## SHUTDOWN {#query_language-system-shutdown}
 
@@ -287,13 +301,66 @@ SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name
 
 ### RESTART REPLICA {#query_language-system-restart-replica}
 
-Реинициализация состояния Zookeeper-сессий для таблицы семейства `ReplicatedMergeTree`. Сравнивает текущее состояние с тем, что хранится в Zookeeper, как источник правды, и добавляет задачи в очередь репликации в Zookeeper, если необходимо.
-Инициализация очереди репликации на основе данных ZooKeeper происходит так же, как при attach table. На короткое время таблица станет недоступной для любых операций.
+Реинициализирует состояние сессий Zookeeper для таблицы семейства `ReplicatedMergeTree`. Сравнивает текущее состояние с состоянием в Zookeeper (как с эталоном) и при необходимости добавляет задачи в очередь репликации в Zookeeper. 
+Инициализация очереди репликации на основе данных ZooKeeper происходит так же, как при `ATTACH TABLE`. Некоторое время таблица будет недоступна для любых операций.
 
 ``` sql
 SYSTEM RESTART REPLICA [db.]replicated_merge_tree_family_table_name
 ```
 
+### RESTORE REPLICA {#query_language-system-restore-replica}
+
+Восстанавливает реплику, если метаданные в Zookeeper потеряны, но сами данные возможно существуют.
+
+Работает только с таблицами семейства `ReplicatedMergeTree` и только если таблица находится в readonly-режиме.
+
+Запрос можно выполнить если:
+
+  - потерян корневой путь ZooKeeper `/`;
+  - потерян путь реплик `/replicas`;
+  - потерян путь конкретной реплики `/replicas/replica_name/`.
+
+К реплике прикрепляются локально найденные куски, информация о них отправляется в Zookeeper.
+Если присутствующие в реплике до потери метаданных данные не устарели, они не скачиваются повторно с других реплик. Поэтому восстановление реплики не означает повторную загрузку всех данных по сети.
+
+!!! warning "Предупреждение"
+    Потерянные данные в любых состояниях перемещаются в папку `detached/`. Куски, активные до потери данных (находившиеся в состоянии Committed), прикрепляются.
+
+**Синтаксис**
+
+```sql
+SYSTEM RESTORE REPLICA [db.]replicated_merge_tree_family_table_name [ON CLUSTER cluster_name]
+```
+
+Альтернативный синтаксис:
+
+```sql
+SYSTEM RESTORE REPLICA [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_table_name
+```
+
+**Пример**
+
+Создание таблицы на нескольких серверах. После потери корневого пути реплики таблица будет прикреплена только для чтения, так как метаданные отсутствуют. Последний запрос необходимо выполнить на каждой реплике.
+
+```sql
+CREATE TABLE test(n UInt32)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/', '{replica}')
+ORDER BY n PARTITION BY n % 10;
+
+INSERT INTO test SELECT * FROM numbers(1000);
+
+-- zookeeper_delete_path("/clickhouse/tables/test", recursive=True) <- root loss.
+
+SYSTEM RESTART REPLICA test;
+SYSTEM RESTORE REPLICA test;
+```
+
+Альтернативный способ:
+
+```sql
+SYSTEM RESTORE REPLICA test ON CLUSTER cluster;
+```
+
 ### RESTART REPLICAS {#query_language-system-restart-replicas}
 
 Реинициализация состояния ZooKeeper-сессий для всех `ReplicatedMergeTree` таблиц. Сравнивает текущее состояние реплики с тем, что хранится в ZooKeeper, как c источником правды, и добавляет задачи в очередь репликации в ZooKeeper, если необходимо.
diff --git a/docs/ru/sql-reference/statements/truncate.md b/docs/ru/sql-reference/statements/truncate.md
index 63f7fa86ea5..028959690cd 100644
--- a/docs/ru/sql-reference/statements/truncate.md
+++ b/docs/ru/sql-reference/statements/truncate.md
@@ -13,4 +13,9 @@ TRUNCATE TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 
 Запрос `TRUNCATE` не поддерживается для следующих движков: [View](../../engines/table-engines/special/view.md), [File](../../engines/table-engines/special/file.md), [URL](../../engines/table-engines/special/url.md), [Buffer](../../engines/table-engines/special/buffer.md) и [Null](../../engines/table-engines/special/null.md).
 
+Вы можете настроить ожидание выполнения действий на репликах с помощью настройки [replication_alter_partitions_sync](../../operations/settings/settings.md#replication-alter-partitions-sync).
 
+Вы можете указать время ожидания (в секундах) выполнения запросов `TRUNCATE` для неактивных реплик с помощью настройки [replication_wait_for_inactive_replica_timeout](../../operations/settings/settings.md#replication-wait-for-inactive-replica-timeout).
+
+!!! info "Примечание"
+    Если значение настройки `replication_alter_partitions_sync` равно `2` и некоторые реплики не активны больше времени, заданного настройкой `replication_wait_for_inactive_replica_timeout`, то генерируется исключение `UNFINISHED`.
diff --git a/docs/ru/sql-reference/syntax.md b/docs/ru/sql-reference/syntax.md
index 488e327dd31..6705b1068fe 100644
--- a/docs/ru/sql-reference/syntax.md
+++ b/docs/ru/sql-reference/syntax.md
@@ -3,7 +3,7 @@ toc_priority: 31
 toc_title: "Синтаксис"
 ---
 
-# Синтаксис {#sintaksis}
+# Синтаксис {#syntax}
 
 В системе есть два вида парсеров: полноценный парсер SQL (recursive descent parser) и парсер форматов данных (быстрый потоковый парсер).
 Во всех случаях кроме запроса INSERT, используется только полноценный парсер SQL.
@@ -21,11 +21,11 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 Далее пойдёт речь о полноценном парсере. О парсерах форматов, смотри раздел «Форматы».
 
-## Пробелы {#probely}
+## Пробелы {#spaces}
 
 Между синтаксическими конструкциями (в том числе, в начале и конце запроса) может быть расположено произвольное количество пробельных символов. К пробельным символам относятся пробел, таб, перевод строки, CR, form feed.
 
-## Комментарии {#kommentarii}
+## Комментарии {#comments}
 
 Поддерживаются комментарии в SQL-стиле и C-стиле.
 Комментарии в SQL-стиле: от `--` до конца строки. Пробел после `--` может не ставиться.
@@ -63,7 +63,7 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 Существуют: числовые, строковые, составные литералы и `NULL`.
 
-### Числовые {#chislovye}
+### Числовые {#numeric}
 
 Числовой литерал пытается распарситься:
 
@@ -83,7 +83,7 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 Минимальный набор символов, которых вам необходимо экранировать в строковых литералах: `'` и `\`. Одинарная кавычка может быть экранирована одинарной кавычкой, литералы `'It\'s'` и `'It''s'` эквивалентны.
 
-### Составные {#sostavnye}
+### Составные {#compound}
 
 Поддерживаются конструкции для массивов: `[1, 2, 3]` и кортежей: `(1, 'Hello, world!', 2)`.
 На самом деле, это вовсе не литералы, а выражение с оператором создания массива и оператором создания кортежа, соответственно.
@@ -102,17 +102,39 @@ INSERT INTO t VALUES (1, 'Hello, world'), (2, 'abc'), (3, 'def')
 
 В запросах можно проверить `NULL` с помощью операторов [IS NULL](operators/index.md#operator-is-null) и [IS NOT NULL](operators/index.md), а также соответствующих функций `isNull` и `isNotNull`.
 
-## Функции {#funktsii}
+### Heredoc {#heredeoc}
+
+Синтаксис [heredoc](https://ru.wikipedia.org/wiki/Heredoc-синтаксис) — это способ определения строк с сохранением исходного формата (часто с переносом строки). `Heredoc` задается как произвольный строковый литерал между двумя символами `$`, например `$heredoc$`. Значение между двумя `heredoc` обрабатывается "как есть". 
+
+Синтаксис `heredoc` часто используют для вставки кусков кода SQL, HTML, XML и т.п. 
+
+**Пример**
+
+Запрос:
+
+```sql
+SELECT $smth$SHOW CREATE VIEW my_view$smth$;
+```
+
+Результат:
+
+```text
+┌─'SHOW CREATE VIEW my_view'─┐
+│ SHOW CREATE VIEW my_view   │
+└────────────────────────────┘
+```
+
+## Функции {#functions}
 
 Функции записываются как идентификатор со списком аргументов (возможно, пустым) в скобках. В отличие от стандартного SQL, даже в случае пустого списка аргументов, скобки обязательны. Пример: `now()`.
 Бывают обычные и агрегатные функции (смотрите раздел «Агрегатные функции»). Некоторые агрегатные функции могут содержать два списка аргументов в круглых скобках. Пример: `quantile(0.9)(x)`. Такие агрегатные функции называются «параметрическими», а первый список аргументов называется «параметрами». Синтаксис агрегатных функций без параметров ничем не отличается от обычных функций.
 
-## Операторы {#operatory}
+## Операторы {#operators}
 
 Операторы преобразуются в соответствующие им функции во время парсинга запроса, с учётом их приоритета и ассоциативности.
 Например, выражение `1 + 2 * 3 + 4` преобразуется в `plus(plus(1, multiply(2, 3)), 4)`.
 
-## Типы данных и движки таблиц {#tipy-dannykh-i-dvizhki-tablits}
+## Типы данных и движки таблиц {#data_types-and-database-table-engines}
 
 Типы данных и движки таблиц в запросе `CREATE` записываются также, как идентификаторы или также как функции. То есть, могут содержать или не содержать список аргументов в круглых скобках. Подробнее смотрите разделы «Типы данных», «Движки таблиц», «CREATE».
 
diff --git a/docs/ru/sql-reference/table-functions/cluster.md b/docs/ru/sql-reference/table-functions/cluster.md
index 1a087971afe..a9cff862293 100644
--- a/docs/ru/sql-reference/table-functions/cluster.md
+++ b/docs/ru/sql-reference/table-functions/cluster.md
@@ -5,22 +5,44 @@ toc_title: cluster
 
 # cluster, clusterAllReplicas {#cluster-clusterallreplicas}
 
-Позволяет обратиться ко всем серверам существующего кластера, который присутствует в таблице `system.clusters` и сконфигурирован в секцци `remote_servers` без создания таблицы типа `Distributed`.
-`clusterAllReplicas` - работает также как `cluster` но каждая реплика в кластере будет использована как отдельный шард/отдельное соединение.
+Позволяет обратиться ко всем шардам существующего кластера, который сконфигурирован в секции `remote_servers` без создания таблицы типа [Distributed](../../engines/table-engines/special/distributed.md). В запросе используется одна реплика каждого шарда.
 
+Функция `clusterAllReplicas` работает также как `cluster`, но каждая реплика в кластере используется как отдельный шард/отдельное соединение.
 
-Сигнатуры:
+!!! note "Примечание"
+    Все доступные кластеры перечислены в таблице [system.clusters](../../operations/system-tables/clusters.md).
+
+**Синтаксис**
 
 ``` sql
-cluster('cluster_name', db.table)
-cluster('cluster_name', db, table)
-clusterAllReplicas('cluster_name', db.table)
-clusterAllReplicas('cluster_name', db, table)
+cluster('cluster_name', db.table[, sharding_key])
+cluster('cluster_name', db, table[, sharding_key])
+clusterAllReplicas('cluster_name', db.table[, sharding_key])
+clusterAllReplicas('cluster_name', db, table[, sharding_key])
+```
+**Аргументы**
+
+- `cluster_name` – имя кластера, который обозначает подмножество адресов и параметров подключения к удаленным и локальным серверам, входящим в кластер.
+- `db.table` или `db`, `table` - имя базы данных и таблицы. 
+- `sharding_key` - ключ шардирования. Необязательный аргумент. Указывается, если данные добавляются более чем в один шард кластера. 
+
+**Возвращаемое значение**
+
+Набор данных из кластеров.
+
+**Использование макросов**
+
+`cluster_name` может содержать макрос — подстановку в фигурных скобках. Эта подстановка заменяется на соответствующее значение из секции [macros](../../operations/server-configuration-parameters/settings.md#macros) конфигурационного файла .
+
+Пример:
+
+```sql
+SELECT * FROM cluster('{cluster}', default.example_table);
 ```
 
-`cluster_name` – имя кластера, который обязан присутствовать в таблице `system.clusters`  и обозначает подмножество адресов и параметров подключения к удаленным и локальным серверам, входящим в кластер.
+**Использование и рекомендации** 
 
-Использование табличных функций `cluster` и `clusterAllReplicas` менее оптимальное чем создание таблицы типа `Distributed`, поскольку в этом случае соединение с сервером переустанавливается на каждый запрос. При обработке большого количества запросов, всегда создавайте `Distributed` таблицу заранее и не используйте табличные функции `cluster` и `clusterAllReplicas`.
+Использование табличных функций `cluster` и `clusterAllReplicas` менее оптимально, чем создание таблицы типа `Distributed`, поскольку в этом случае при каждом новом запросе устанавливается новое соединение с сервером. При обработке большого количества запросов всегда создавайте `Distributed` таблицу заранее и не используйте табличные функции `cluster` и `clusterAllReplicas`.
 
 Табличные функции `cluster` and `clusterAllReplicas` могут быть полезны в следующих случаях:
 
@@ -30,7 +52,7 @@ clusterAllReplicas('cluster_name', db, table)
 
 Настройки соединения `user`, `password`, `host`, `post`, `compression`, `secure` берутся из секции `<remote_servers>` файлов конфигурации. См. подробности в разделе [Distributed](../../engines/table-engines/special/distributed.md)
 
-**See Also**
+**См. также**
 
 -   [skip_unavailable_shards](../../operations/settings/settings.md#settings-skip_unavailable_shards)
 -   [load_balancing](../../operations/settings/settings.md#settings-load_balancing)
diff --git a/docs/ru/sql-reference/table-functions/index.md b/docs/ru/sql-reference/table-functions/index.md
index fcd428df5d1..8cf90ba5bd5 100644
--- a/docs/ru/sql-reference/table-functions/index.md
+++ b/docs/ru/sql-reference/table-functions/index.md
@@ -34,4 +34,4 @@ toc_title: "Введение"
 | [hdfs](hdfs.md)       | Создаёт таблицу с движком [HDFS](../../engines/table-engines/integrations/hdfs.md).                                                       |
 | [s3](s3.md)           | Создаёт таблицу с движком [S3](../../engines/table-engines/integrations/s3.md).                                                       |
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/table-functions/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/jdbc.md b/docs/ru/sql-reference/table-functions/jdbc.md
index 3955846d8db..e0bae8b5415 100644
--- a/docs/ru/sql-reference/table-functions/jdbc.md
+++ b/docs/ru/sql-reference/table-functions/jdbc.md
@@ -35,4 +35,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/null.md b/docs/ru/sql-reference/table-functions/null.md
index 44fbc111db2..90481e9f6a9 100644
--- a/docs/ru/sql-reference/table-functions/null.md
+++ b/docs/ru/sql-reference/table-functions/null.md
@@ -40,4 +40,4 @@ DROP TABLE IF EXISTS t;
 
 -   [Движок таблиц Null](../../engines/table-engines/special/null.md)
 
-[Original article](https://clickhouse.tech/docs/en/sql-reference/table-functions/null/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/sql-reference/table-functions/null/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/postgresql.md b/docs/ru/sql-reference/table-functions/postgresql.md
index 76c2ee0fa18..f5c79e5305a 100644
--- a/docs/ru/sql-reference/table-functions/postgresql.md
+++ b/docs/ru/sql-reference/table-functions/postgresql.md
@@ -129,4 +129,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [Движок таблиц PostgreSQL](../../sql-reference/table-functions/postgresql.md)
 -   [Использование PostgreSQL как источника данных для внешнего словаря](../../sql-reference/table-functions/postgresql.md#dicts-external_dicts_dict_sources-postgresql)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/postgresql/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/ru/sql-reference/table-functions/s3.md b/docs/ru/sql-reference/table-functions/s3.md
index 597f145c096..e3cb31fac85 100644
--- a/docs/ru/sql-reference/table-functions/s3.md
+++ b/docs/ru/sql-reference/table-functions/s3.md
@@ -133,9 +133,33 @@ INSERT INTO FUNCTION s3('https://storage.yandexcloud.net/my-test-bucket-768/test
 SELECT name, value FROM existing_table;
 ```
 
+## Партиционирование при записи данных {#partitioned-write}
+
+Если при добавлении данных в таблицу S3 указать выражение `PARTITION BY`, то для каждого значения ключа партиционирования создается отдельный файл. Это повышает эффективность операций чтения.
+
+**Примеры**
+
+1. При использовании ID партиции в имени ключа создаются отдельные файлы:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket/file_{_partition_id}.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES ('x', 2, 3), ('x', 4, 5), ('y', 11, 12), ('y', 13, 14), ('z', 21, 22), ('z', 23, 24);
+```
+В результате данные будут записаны в три файла: `file_x.csv`, `file_y.csv` и `file_z.csv`.
+
+2. При использовании ID партиции в названии бакета создаются файлы в разных бакетах:
+
+```sql
+INSERT INTO TABLE FUNCTION
+    s3('http://bucket.amazonaws.com/my_bucket_{_partition_id}/file.csv', 'CSV', 'a UInt32, b UInt32, c UInt32')
+    PARTITION BY a VALUES (1, 2, 3), (1, 4, 5), (10, 11, 12), (10, 13, 14), (20, 21, 22), (20, 23, 24);
+```
+В результате будут созданы три файла в разных бакетах: `my_bucket_1/file.csv`, `my_bucket_10/file.csv` и `my_bucket_20/file.csv`.
+
 **Смотрите также**
 
 -  [Движок таблиц S3](../../engines/table-engines/integrations/s3.md)
 
-[Оригинальная статья](https://clickhouse.tech/docs/ru/sql-reference/table-functions/s3/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/ru/sql-reference/table-functions/s3/) <!--hide-->
 
diff --git a/docs/ru/sql-reference/table-functions/sqlite.md b/docs/ru/sql-reference/table-functions/sqlite.md
new file mode 100644
index 00000000000..3ff61455e62
--- /dev/null
+++ b/docs/ru/sql-reference/table-functions/sqlite.md
@@ -0,0 +1,45 @@
+---
+toc_priority: 55
+toc_title: sqlite
+---
+
+## sqlite {#sqlite}
+
+Позволяет выполнять запросы к данным, хранящимся в базе данных [SQLite](../../engines/database-engines/sqlite.md).
+
+**Синтаксис** 
+
+``` sql
+    sqlite('db_path', 'table_name')
+```
+
+**Аргументы** 
+
+-   `db_path` — путь к файлу с базой данных SQLite. [String](../../sql-reference/data-types/string.md).
+-   `table_name` — имя таблицы в базе данных SQLite. [String](../../sql-reference/data-types/string.md).
+
+**Возвращаемое значение**
+
+-   Объект таблицы с теми же столбцами, что и в исходной таблице `SQLite`. 
+
+**Пример**
+
+Запрос:
+
+``` sql
+SELECT * FROM sqlite('sqlite.db', 'table1') ORDER BY col2;
+```
+
+Результат:
+
+``` text
+┌─col1──┬─col2─┐
+│ line1 │    1 │
+│ line2 │    2 │
+│ line3 │    3 │
+└───────┴──────┘
+```
+
+**См. также** 
+
+-   [SQLite](../../engines/table-engines/integrations/sqlite.md) движок таблиц
\ No newline at end of file
diff --git a/docs/ru/sql-reference/table-functions/view.md b/docs/ru/sql-reference/table-functions/view.md
index bfd0a891179..498e76917ab 100644
--- a/docs/ru/sql-reference/table-functions/view.md
+++ b/docs/ru/sql-reference/table-functions/view.md
@@ -1,6 +1,6 @@
 ## view {#view}
 
-Преобразовывает подзапрос в таблицу. Функция реализовывает представления (смотрите [CREATE VIEW](https://clickhouse.tech/docs/ru/sql-reference/statements/create/view/#create-view)). Результирующая таблица не хранит данные, а только сохраняет указанный запрос `SELECT`. При чтении из таблицы, ClickHouse выполняет запрос и удаляет все ненужные столбцы из результата.
+Преобразовывает подзапрос в таблицу. Функция реализовывает представления (смотрите [CREATE VIEW](https://clickhouse.com/docs/ru/sql-reference/statements/create/view/#create-view)). Результирующая таблица не хранит данные, а только сохраняет указанный запрос `SELECT`. При чтении из таблицы, ClickHouse выполняет запрос и удаляет все ненужные столбцы из результата.
 
 **Синтаксис**
 
@@ -46,7 +46,7 @@ SELECT * FROM view(SELECT name FROM months);
 └──────────┘
 ```
 
-Вы можете использовать функцию `view` как параметр табличных функций [remote](https://clickhouse.tech/docs/ru/sql-reference/table-functions/remote/#remote-remotesecure) и [cluster](https://clickhouse.tech/docs/ru/sql-reference/table-functions/cluster/#cluster-clusterallreplicas):
+Вы можете использовать функцию `view` как параметр табличных функций [remote](https://clickhouse.com/docs/ru/sql-reference/table-functions/remote/#remote-remotesecure) и [cluster](https://clickhouse.com/docs/ru/sql-reference/table-functions/cluster/#cluster-clusterallreplicas):
 
 ``` sql
 SELECT * FROM remote(`127.0.0.1`, view(SELECT a, b, c FROM table_name));
@@ -58,6 +58,6 @@ SELECT * FROM cluster(`cluster_name`, view(SELECT a, b, c FROM table_name));
 
 **Смотрите также**
 
--   [view](https://clickhouse.tech/docs/ru/engines/table-engines/special/view/#table_engines-view)
+-   [view](https://clickhouse.com/docs/ru/engines/table-engines/special/view/#table_engines-view)
 
-[Оригинальная статья](https://clickhouse.tech/docs/en/sql-reference/table-functions/view/) <!--hide-->
+[Оригинальная статья](https://clickhouse.com/docs/en/sql-reference/table-functions/view/) <!--hide-->
diff --git a/docs/ru/sql-reference/window-functions/index.md b/docs/ru/sql-reference/window-functions/index.md
new file mode 120000
index 00000000000..206505bf0eb
--- /dev/null
+++ b/docs/ru/sql-reference/window-functions/index.md
@@ -0,0 +1 @@
+../../../en/sql-reference/window-functions/index.md
\ No newline at end of file
diff --git a/docs/ru/whats-new/changelog/2020.md b/docs/ru/whats-new/changelog/2020.md
new file mode 120000
index 00000000000..f0fb97311d2
--- /dev/null
+++ b/docs/ru/whats-new/changelog/2020.md
@@ -0,0 +1 @@
+../../../en/whats-new/changelog/2020.md
\ No newline at end of file
diff --git a/docs/ru/whats-new/index.md b/docs/ru/whats-new/index.md
index d8a26423813..f3d6e2839bc 100644
--- a/docs/ru/whats-new/index.md
+++ b/docs/ru/whats-new/index.md
@@ -5,4 +5,4 @@ toc_priority: 82
 
 # Что нового в ClickHouse?
 
-Планы развития вкратце изложены [здесь](extended-roadmap.md), а новости по предыдущим релизам подробно описаны в [журнале изменений](changelog/index.md).
+Планы развития вкратце изложены [здесь](https://github.com/ClickHouse/ClickHouse/issues/17623), а новости по предыдущим релизам подробно описаны в [журнале изменений](changelog/index.md).
diff --git a/docs/ru/whats-new/roadmap.md b/docs/ru/whats-new/roadmap.md
new file mode 120000
index 00000000000..2c383b2ad5d
--- /dev/null
+++ b/docs/ru/whats-new/roadmap.md
@@ -0,0 +1 @@
+../../en/whats-new/roadmap.md
\ No newline at end of file
diff --git a/docs/tools/README.md b/docs/tools/README.md
index 61a2e9a04f2..4ab44b0d945 100644
--- a/docs/tools/README.md
+++ b/docs/tools/README.md
@@ -2,7 +2,7 @@
 
 ClickHouse documentation is built using [build.py](build.py) script that uses [mkdocs](https://www.mkdocs.org) library and it’s dependencies to separately build all version of documentations (all languages in either single and multi page mode) as static HTMLs and then a PDF for each single page version. The results are then put in the correct directory structure. It is recommended to use Python 3.7 to run this script.
 
-[release.sh](release.sh) also pulls static files needed for [official ClickHouse website](https://clickhouse.tech) from [../../website](../../website) folder then pushes to specified GitHub repo to be served via [GitHub Pages](https://pages.github.com).
+[release.sh](release.sh) also pulls static files needed for [official ClickHouse website](https://clickhouse.com) from [../../website](../../website) folder then pushes to specified GitHub repo to be served via [GitHub Pages](https://pages.github.com).
 
 ## How to check if the documentation will look fine? {#how-to-check-if-the-documentation-will-look-fine}
 
@@ -59,4 +59,4 @@ is used.
 At the moment there’s no easy way to do just that, but you can consider:
 
 -   To hit the “Watch” button on top of GitHub web interface to know as early as possible, even during pull request. Alternative to this is `#github-activity` channel of [public ClickHouse Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-qfort0u8-TWqK4wIP0YSdoDE0btKa1w).
--   Some search engines allow to subscribe on specific website changes via email and you can opt-in for that for https://clickhouse.tech.
+-   Some search engines allow to subscribe on specific website changes via email and you can opt-in for that for https://clickhouse.com.
diff --git a/docs/tools/blog.py b/docs/tools/blog.py
index d0f2496f914..bfc8c0908e9 100644
--- a/docs/tools/blog.py
+++ b/docs/tools/blog.py
@@ -51,7 +51,7 @@ def build_for_lang(lang, args):
         if args.htmlproofer:
             plugins.append('htmlproofer')
 
-        website_url = 'https://clickhouse.tech'
+        website_url = 'https://clickhouse.com'
         site_name = site_names.get(lang, site_names['en'])
         blog_nav, post_meta = nav.build_blog_nav(lang, args)
         raw_config = dict(
@@ -62,7 +62,7 @@ def build_for_lang(lang, args):
             strict=True,
             theme=theme_cfg,
             nav=blog_nav,
-            copyright='©2016–2021 Yandex LLC',
+            copyright='©2016–2021 ClickHouse, Inc.',
             use_directory_urls=True,
             repo_name='ClickHouse/ClickHouse',
             repo_url='https://github.com/ClickHouse/ClickHouse/',
diff --git a/docs/tools/build.py b/docs/tools/build.py
index dae61eec87e..aa440ecb5dc 100755
--- a/docs/tools/build.py
+++ b/docs/tools/build.py
@@ -84,7 +84,7 @@ def build_for_lang(lang, args):
         if args.htmlproofer:
             plugins.append('htmlproofer')
 
-        website_url = 'https://clickhouse.tech'
+        website_url = 'https://clickhouse.com'
         site_name = site_names.get(lang, site_names['en']) % ''
         site_name = site_name.replace('  ', ' ')
 
@@ -95,7 +95,7 @@ def build_for_lang(lang, args):
             site_dir=site_dir,
             strict=True,
             theme=theme_cfg,
-            copyright='©2016–2021 Yandex LLC',
+            copyright='©2016–2021 ClickHouse, Inc.',
             use_directory_urls=True,
             repo_name='ClickHouse/ClickHouse',
             repo_url='https://github.com/ClickHouse/ClickHouse/',
@@ -203,6 +203,7 @@ if __name__ == '__main__':
     arg_parser.add_argument('--verbose', action='store_true')
 
     args = arg_parser.parse_args()
+    args.minify = False  # TODO remove
 
     logging.basicConfig(
         level=logging.DEBUG if args.verbose else logging.INFO,
diff --git a/docs/tools/cmake_in_clickhouse_generator.py b/docs/tools/cmake_in_clickhouse_generator.py
index 1414ffc4b9e..e66915d4a39 100644
--- a/docs/tools/cmake_in_clickhouse_generator.py
+++ b/docs/tools/cmake_in_clickhouse_generator.py
@@ -155,6 +155,15 @@ def generate_cmake_flags_files() -> None:
         with open(footer_file_name, "r") as footer:
             f.write(footer.read())
 
+        other_languages = ["docs/ja/development/cmake-in-clickhouse.md",
+                           "docs/zh/development/cmake-in-clickhouse.md",
+                           "docs/ru/development/cmake-in-clickhouse.md"]
+
+        for lang in other_languages:
+            other_file_name = os.path.join(root_path, lang)
+            if os.path.exists(other_file_name):
+                os.unlink(other_file_name)    
+            os.symlink(output_file_name, other_file_name)
 
 if __name__ == '__main__':
     generate_cmake_flags_files()
diff --git a/docs/tools/deploy-to-test.sh b/docs/tools/deploy-to-test.sh
index 44e7687c905..30771052535 100755
--- a/docs/tools/deploy-to-test.sh
+++ b/docs/tools/deploy-to-test.sh
@@ -7,8 +7,8 @@
 # 1) Set up building documentation according to https://github.com/ClickHouse/ClickHouse/tree/master/docs/tools#use-buildpy-use-build-py
 # 2) Create https://github.com/GIT_USER/clickhouse.github.io repo (replace GIT_USER with your GitHub login)
 # 3) Enable GitHub Pages in settings of this repo
-# 4) Add file named CNAME in root of this repo with "GIT_USER-test.clickhouse.tech" content (without quotes)
-# 5) Send email on address from https://clickhouse.tech/#contacts asking to create GIT_USER-test.clickhouse.tech domain
+# 4) Add file named CNAME in root of this repo with "GIT_USER-test.clickhouse.com" content (without quotes)
+# 5) Send email on address from https://clickhouse.com/#contacts asking to create GIT_USER-test.clickhouse.com domain
 #
 set -ex
 
@@ -16,7 +16,7 @@ BASE_DIR=$(dirname $(readlink -f $0))
 GIT_USER=${GIT_USER:-$USER}
 
 GIT_TEST_URI=git@github.com:${GIT_USER}/clickhouse.github.io.git \
- BASE_DOMAIN=${GIT_USER}-test.clickhouse.tech \
+ BASE_DOMAIN=${GIT_USER}-test.clickhouse.com \
  EXTRA_BUILD_ARGS="${@}" \
  CLOUDFLARE_TOKEN="" \
  HISTORY_SIZE=3 \
diff --git a/docs/tools/mdx_clickhouse.py b/docs/tools/mdx_clickhouse.py
index 387ade9bbdf..18ecc890b6e 100755
--- a/docs/tools/mdx_clickhouse.py
+++ b/docs/tools/mdx_clickhouse.py
@@ -53,7 +53,7 @@ class ClickHouseLinkMixin(object):
             href = el.get('href') or ''
             is_external = href.startswith('http:') or href.startswith('https:')
             if is_external:
-                if not href.startswith('https://clickhouse.tech'):
+                if not href.startswith('https://clickhouse.com'):
                     el.set('rel', 'external nofollow noreferrer')
             elif single_page:
                 if '#' in href:
@@ -73,12 +73,8 @@ class ClickHouseLinkPattern(ClickHouseLinkMixin, markdown.inlinepatterns.LinkInl
 
 class ClickHousePreprocessor(markdown.util.Processor):
     def run(self, lines):
-        if os.getenv('QLOUD_TOKEN'):
-            for line in lines:
-                if '<!--hide-->' not in line:
-                    yield line
-        else:
-            for line in lines:
+        for line in lines:
+            if '<!--hide-->' not in line:
                 yield line
 
 
diff --git a/docs/tools/package-lock.json b/docs/tools/package-lock.json
new file mode 100644
index 00000000000..98b3f74702f
--- /dev/null
+++ b/docs/tools/package-lock.json
@@ -0,0 +1,7561 @@
+{
+  "name": "build",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/code-frame": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.14.5"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",
+      "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helpers": "^7.15.4",
+        "@babel/parser": "^7.15.5",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "convert-source-map": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+          "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
+      "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
+      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz",
+      "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz",
+      "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
+      }
+    },
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
+      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",
+      "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
+      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
+      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-hoist-variables": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
+      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-member-expression-to-functions": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
+      "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-module-imports": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
+      "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz",
+      "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-simple-access": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-optimise-call-expression": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
+      "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-plugin-utils": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "dev": true
+    },
+    "@babel/helper-remap-async-to-generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
+      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-wrap-function": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-replace-supers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
+      "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
+      "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz",
+      "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
+      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helper-validator-identifier": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "dev": true
+    },
+    "@babel/helper-validator-option": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "dev": true
+    },
+    "@babel/helper-wrap-function": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
+      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      }
+    },
+    "@babel/parser": {
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz",
+      "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==",
+      "dev": true
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz",
+      "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz",
+      "integrity": "sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz",
+      "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-dynamic-import": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-json-strings": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-private-methods": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz",
+      "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      }
+    },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
+    "@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-async-to-generator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-block-scoping": {
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-classes": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz",
+      "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-destructuring": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-dotall-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-duplicate-keys": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-for-of": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz",
+      "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-function-name": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-modules-amd": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-commonjs": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz",
+      "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.15.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-systemjs": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz",
+      "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      }
+    },
+    "@babel/plugin-transform-modules-umd": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-new-target": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-object-super": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-parameters": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-regenerator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.2"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-shorthand-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-spread": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-sticky-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-template-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-typeof-symbol": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/preset-env": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz",
+      "integrity": "sha512-4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.4",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.15.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.15.3",
+        "@babel/plugin-transform-classes": "^7.15.4",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.15.4",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.15.4",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.15.4",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
+    "@babel/template": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
+      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
+      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/types": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz",
+      "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@types/json-schema": {
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz",
+      "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
+      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
+      "dev": true
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "acorn": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "dev": true
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
+    "amphtml-validator": {
+      "version": "1.0.35",
+      "resolved": "https://registry.npmjs.org/amphtml-validator/-/amphtml-validator-1.0.35.tgz",
+      "integrity": "sha512-C67JzC5EI6pE2C0sAo/zuCp8ARDl1Vtt6/s0nr+3NuXDNOdkjclZUkaNAd/ZnsEvvYodkXZ6T/uww890IQh9dQ==",
+      "requires": {
+        "colors": "1.4.0",
+        "commander": "7.2.0",
+        "promise": "8.1.0"
+      }
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dev": true,
+      "requires": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true,
+      "optional": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "autoprefixer": {
+      "version": "9.8.6",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
+      "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001109",
+        "colorette": "^1.2.1",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.32",
+        "postcss-value-parser": "^4.1.0"
+      }
+    },
+    "babel-loader": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
+      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^1.4.0",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "requires": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
+      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz",
+      "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.14.0"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
+      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
+      }
+    },
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "dev": true
+    },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
+      "dev": true
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "bootstrap": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
+      "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001254",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.830",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.75"
+      }
+    },
+    "buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
+    "caller-callsite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+      "dev": true,
+      "requires": {
+        "callsites": "^2.0.0"
+      }
+    },
+    "caller-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+      "dev": true,
+      "requires": {
+        "caller-callsite": "^2.0.0"
+      }
+    },
+    "callsites": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+    },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001255",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
+      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "change-case": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/change-case/-/change-case-3.1.0.tgz",
+      "integrity": "sha512-2AZp7uJZbYEzRPsFoa+ijKdvp9zsrnnt6+yFokfwEpeJm0xuJDVoxiRCAaTzyJND8GJkofo2IcKWaUZ/OECVzw==",
+      "dev": true,
+      "requires": {
+        "camel-case": "^3.0.0",
+        "constant-case": "^2.0.0",
+        "dot-case": "^2.1.0",
+        "header-case": "^1.0.0",
+        "is-lower-case": "^1.1.0",
+        "is-upper-case": "^1.1.0",
+        "lower-case": "^1.1.1",
+        "lower-case-first": "^1.0.0",
+        "no-case": "^2.3.2",
+        "param-case": "^2.1.0",
+        "pascal-case": "^2.0.0",
+        "path-case": "^2.1.0",
+        "sentence-case": "^2.1.0",
+        "snake-case": "^2.1.0",
+        "swap-case": "^1.1.0",
+        "title-case": "^2.1.0",
+        "upper-case": "^1.1.1",
+        "upper-case-first": "^1.1.0"
+      }
+    },
+    "chokidar": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "dev": true,
+      "requires": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "requires": {
+        "source-map": "~0.6.0"
+      }
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "clone-deep": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      }
+    },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "color-string": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
+      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
+    },
+    "commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
+    },
+    "constant-case": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz",
+      "integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=",
+      "dev": true,
+      "requires": {
+        "snake-case": "^2.1.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
+      "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-js-compat": {
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz",
+      "integrity": "sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.16.8",
+        "semver": "7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
+      "requires": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-node-extract": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-node-extract/-/css-node-extract-2.1.3.tgz",
+      "integrity": "sha512-E7CzbC0I4uAs2dI8mPCVe+K37xuja5kjIugOotpwICFL7vzhmFMAPHvS/MF9gFrmv8DDUANsxrgyT/I3OLukcw==",
+      "dev": true,
+      "requires": {
+        "change-case": "^3.0.1",
+        "postcss": "^6.0.14"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        }
+      }
+    },
+    "css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "css-selector-extract": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/css-selector-extract/-/css-selector-extract-3.3.6.tgz",
+      "integrity": "sha512-bBI8ZJKKyR9iHvxXb4t3E6WTMkis94eINopVg7y2FmmMjLXUVduD7mPEcADi4i9FX4wOypFMFpySX+0keuefxg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^6.0.14"
+      },
+      "dependencies": {
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        }
+      }
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      }
+    },
+    "css-what": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+      "dev": true
+    },
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
+      "integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.8",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-preset-default": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
+      "integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
+      "dev": true,
+      "requires": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.3",
+        "postcss-unique-selectors": "^4.0.1"
+      }
+    },
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true
+    },
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
+      "dev": true
+    },
+    "csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "requires": {
+        "css-tree": "^1.1.2"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.14",
+            "source-map": "^0.6.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.14",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+          "dev": true
+        }
+      }
+    },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "des.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz",
+      "integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "dot-prop": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+      "dev": true,
+      "requires": {
+        "is-obj": "^2.0.0"
+      }
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.832",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.832.tgz",
+      "integrity": "sha512-x7lO8tGoW0CyV53qON4Lb5Rok9ipDelNdBIAiYUZ03dqy4u9vohMM1qV047+s/hiyJiqUWX/3PNwkX3kexX5ig==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
+    "emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+      "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.5.0",
+        "tapable": "^1.0.0"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+          "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        }
+      }
+    },
+    "entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.18.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
+      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-string": "^1.0.7",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "figgy-pudding": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+      "dev": true
+    },
+    "file-loader": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
+      }
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.1"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
+    },
+    "graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true
+    },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "header-case": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz",
+      "integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.3"
+      }
+    },
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+    },
+    "hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+      "dev": true,
+      "requires": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
+    "interpret": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+      "dev": true
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true
+    },
+    "is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "requires": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
+    "is-core-module": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-lower-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
+      "integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.0"
+      }
+    },
+    "is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-obj": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
+    "is-upper-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz",
+      "integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=",
+      "dev": true,
+      "requires": {
+        "upper-case": "^1.1.0"
+      }
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "load-json-file": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+      "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lower-case-first": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz",
+      "integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.2"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "requires": {
+        "semver": "^6.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
+      "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
+      "dev": true
+    },
+    "node-sass-glob-importer": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/node-sass-glob-importer/-/node-sass-glob-importer-5.3.2.tgz",
+      "integrity": "sha512-QTX7KPsISgp55REV6pMH703nzHfWCOEYEQC0cDyTRo7XO6WDvyC0OAzekuQ4gs505IZcxv9KxZ3uPJ5s5H9D3g==",
+      "dev": true,
+      "requires": {
+        "node-sass-magic-importer": "^5.3.2"
+      }
+    },
+    "node-sass-magic-importer": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/node-sass-magic-importer/-/node-sass-magic-importer-5.3.2.tgz",
+      "integrity": "sha512-T3wTUdUoXQE3QN+EsyPpUXRI1Gj1lEsrySQ9Kzlzi15QGKi+uRa9fmvkcSy2y3BKgoj//7Mt9+s+7p0poMpg6Q==",
+      "dev": true,
+      "requires": {
+        "css-node-extract": "^2.1.3",
+        "css-selector-extract": "^3.3.6",
+        "findup-sync": "^3.0.0",
+        "glob": "^7.1.3",
+        "object-hash": "^1.3.1",
+        "postcss-scss": "^2.0.0",
+        "resolve": "^1.10.1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "normalize-url": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-hash": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
+      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "object.values": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.2"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+      "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+      "requires": {
+        "execa": "^0.7.0",
+        "lcid": "^1.0.0",
+        "mem": "^1.1.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
+    "pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "dev": true,
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "pascal-case": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz",
+      "integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=",
+      "dev": true,
+      "requires": {
+        "camel-case": "^3.0.0",
+        "upper-case-first": "^1.1.0"
+      }
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+      "dev": true
+    },
+    "path-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz",
+      "integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true,
+      "optional": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "path-type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+      "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+      "requires": {
+        "pify": "^2.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "postcss-calc": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "requires": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-scss": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
+      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.6"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      }
+    },
+    "postcss-svgo": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
+      "integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "promise": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
+      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+      "requires": {
+        "asap": "~2.0.6"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "purify-css": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/purify-css/-/purify-css-1.2.5.tgz",
+      "integrity": "sha512-Vy4jRnV2w/kUjTyxzQOKbFkqwUe6RNLuZgIWR/IRQ8nCqRwiFgwC9XiO9+8poq5KL053uWAQnCSbsfihq77zPg==",
+      "requires": {
+        "clean-css": "^4.0.12",
+        "glob": "^7.1.1",
+        "rework": "^1.0.1",
+        "uglify-js": "^3.0.6",
+        "yargs": "^8.0.1"
+      }
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "read-pkg": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+      "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+      "requires": {
+        "load-json-file": "^2.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^2.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+      "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+      "requires": {
+        "find-up": "^2.0.0",
+        "read-pkg": "^2.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "regenerate-unicode-properties": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0"
+      }
+    },
+    "regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "regenerator-transform": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true,
+      "optional": true
+    },
+    "repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+    },
+    "resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "requires": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rework": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
+      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "requires": {
+        "convert-source-map": "^0.3.3",
+        "css": "^2.0.0"
+      }
+    },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass": {
+      "version": "1.39.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz",
+      "integrity": "sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg==",
+      "dev": true,
+      "requires": {
+        "chokidar": ">=3.0.0 <4.0.0"
+      }
+    },
+    "sass-loader": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dev": true,
+      "requires": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
+    "sentence-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz",
+      "integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case-first": "^1.1.2"
+      }
+    },
+    "serialize-javascript": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^6.0.2"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "dev": true
+        }
+      }
+    },
+    "snake-case": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
+      "integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "requires": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="
+    },
+    "spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
+      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "ssri": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+      "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      }
+    },
+    "swap-case": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz",
+      "integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "terser": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
+      "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
+      "dev": true,
+      "requires": {
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^4.0.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "timers-browserify": {
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "title-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
+      "integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.0.3"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.2.tgz",
+      "integrity": "sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A=="
+    },
+    "unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
+    "unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
+    },
+    "unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "requires": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      }
+    },
+    "unicode-match-property-value-ecmascript": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "dev": true
+    },
+    "unicode-property-aliases-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true,
+      "optional": true
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "upper-case-first": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz",
+      "integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=",
+      "dev": true,
+      "requires": {
+        "upper-case": "^1.1.1"
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      }
+    },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^3.4.1",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.1"
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true,
+          "optional": true
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        }
+      }
+    },
+    "webpack": {
+      "version": "4.46.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
+      "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.5.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.3",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.3",
+        "watchpack": "^1.7.4",
+        "webpack-sources": "^1.4.1"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
+      "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.1",
+        "findup-sync": "^3.0.0",
+        "global-modules": "^2.0.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.4.0",
+        "loader-utils": "^1.4.0",
+        "supports-color": "^6.1.0",
+        "v8-compile-cache": "^2.1.1",
+        "yargs": "^13.3.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "global-modules": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+          "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+          "dev": true,
+          "requires": {
+            "global-prefix": "^3.0.0"
+          }
+        },
+        "global-prefix": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+          "dev": true,
+          "requires": {
+            "ini": "^1.3.5",
+            "kind-of": "^6.0.2",
+            "which": "^1.3.1"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      }
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true
+    },
+    "y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yargs": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+      "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+      "requires": {
+        "camelcase": "^4.1.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^2.0.0",
+        "read-pkg-up": "^2.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^7.0.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+      "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+      "requires": {
+        "camelcase": "^4.1.0"
+      }
+    }
+  }
+}
diff --git a/docs/tools/package.json b/docs/tools/package.json
new file mode 100644
index 00000000000..b366d562dc3
--- /dev/null
+++ b/docs/tools/package.json
@@ -0,0 +1,31 @@
+{
+	"name": "build",
+	"version": "1.0.0",
+	"description": "",
+	"main": "index.js",
+	"scripts": {
+		"build": "NODE_ENV=production webpack --config webpack.config.js",
+		"watch": "NODE_ENV=development webpack --config webpack.config.js"
+	},
+	"author": "",
+	"license": "ISC",
+	"devDependencies": {
+		"@babel/core": "^7.10.2",
+		"@babel/preset-env": "^7.10.2",
+		"autoprefixer": "^9.8.0",
+		"babel-loader": "^8.1.0",
+		"cssnano": "^4.1.10",
+		"file-loader": "^6.0.0",
+		"node-sass-glob-importer": "^5.3.2",
+		"postcss-loader": "^3.0.0",
+		"sass": "^1.26.8",
+		"sass-loader": "^8.0.2",
+		"webpack": "^4.43.0",
+		"webpack-cli": "^3.3.11"
+	},
+	"dependencies": {
+		"amphtml-validator": "^1.0.35",
+		"bootstrap": "^4.4.1",
+		"purify-css": "^1.2.5"
+	}
+}
diff --git a/docs/tools/release.sh b/docs/tools/release.sh
index 035581534f1..a7b51174fdb 100755
--- a/docs/tools/release.sh
+++ b/docs/tools/release.sh
@@ -4,8 +4,8 @@ set -ex
 BASE_DIR=$(dirname $(readlink -f $0))
 BUILD_DIR="${BASE_DIR}/../build"
 PUBLISH_DIR="${BASE_DIR}/../publish"
-BASE_DOMAIN="${BASE_DOMAIN:-content.clickhouse.tech}"
-GIT_TEST_URI="${GIT_TEST_URI:-git@github.com:ClickHouse/clickhouse-website-content.git}"
+BASE_DOMAIN="${BASE_DOMAIN:-content.clickhouse.com}"
+GIT_TEST_URI="${GIT_TEST_URI:-git@github.com:ClickHouse/clickhouse-com-content.git}"
 GIT_PROD_URI="git@github.com:ClickHouse/clickhouse-website-content.git"
 EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS:---minify --verbose}"
 
@@ -41,7 +41,7 @@ then
     then
         sleep 1m
         # https://api.cloudflare.com/#zone-purge-files-by-cache-tags,-host-or-prefix
-        POST_DATA='{"hosts":["content.clickhouse.tech"]}'
+        POST_DATA='{"hosts":["content.clickhouse.com"]}'
         curl -X POST "https://api.cloudflare.com/client/v4/zones/4fc6fb1d46e87851605aa7fa69ca6fe0/purge_cache" -H "Authorization: Bearer ${CLOUDFLARE_TOKEN}" -H "Content-Type:application/json" --data "${POST_DATA}"
     fi
 fi
diff --git a/docs/tools/requirements.txt b/docs/tools/requirements.txt
index 9bb4f57e9e2..4e0789b5d24 100644
--- a/docs/tools/requirements.txt
+++ b/docs/tools/requirements.txt
@@ -12,7 +12,7 @@ htmlmin==0.1.12
 idna==2.10
 Jinja2>=2.11.3
 jinja2-highlight==0.6.1
-jsmin==2.2.2
+jsmin==3.0.0
 livereload==2.6.2
 Markdown==3.3.2
 MarkupSafe==1.1.1
@@ -22,7 +22,7 @@ mkdocs-macros-plugin==0.4.20
 nltk==3.5
 nose==1.3.7
 protobuf==3.14.0
-numpy==1.19.2
+numpy==1.21.2
 pymdown-extensions==8.0
 python-slugify==4.0.1
 PyYAML==5.4.1
diff --git a/docs/tools/single_page.py b/docs/tools/single_page.py
index a1e650d3ad3..0e82a1acb87 100644
--- a/docs/tools/single_page.py
+++ b/docs/tools/single_page.py
@@ -219,10 +219,12 @@ def build_single_page_version(lang, args, nav, cfg):
                         ]
 
                         logging.info(' '.join(create_pdf_command))
-                        subprocess.check_call(' '.join(create_pdf_command), shell=True)
+                        try:
+                            subprocess.check_call(' '.join(create_pdf_command), shell=True)
+                        except:
+                            pass  # TODO: fix pdf issues
 
         logging.info(f'Finished building single page version for {lang}')
-        
+
         if os.path.exists(single_md_path):
             os.unlink(single_md_path)
-            
\ No newline at end of file
diff --git a/docs/tools/test.py b/docs/tools/test.py
index 526294dbe21..53ed9505acd 100755
--- a/docs/tools/test.py
+++ b/docs/tools/test.py
@@ -8,6 +8,9 @@ import subprocess
 
 
 def test_single_page(input_path, lang):
+    if not (lang == 'en' or lang == 'ru'):
+        return
+
     with open(input_path) as f:
         soup = bs4.BeautifulSoup(
             f,
@@ -33,11 +36,8 @@ def test_single_page(input_path, lang):
                     logging.info('Link to nowhere: %s' % href)
 
         if links_to_nowhere:
-            if lang == 'en' or lang == 'ru':
-                logging.error(f'Found {links_to_nowhere} links to nowhere in {lang}')
-                sys.exit(1)
-            else:
-                logging.warning(f'Found {links_to_nowhere} links to nowhere in {lang}')
+            logging.error(f'Found {links_to_nowhere} links to nowhere in {lang}')
+            sys.exit(1)
 
         if len(anchor_points) <= 10:
             logging.error('Html parsing is probably broken')
diff --git a/docs/tools/webpack.config.js b/docs/tools/webpack.config.js
new file mode 100644
index 00000000000..fcb3e7bf32d
--- /dev/null
+++ b/docs/tools/webpack.config.js
@@ -0,0 +1,82 @@
+const path = require('path');
+const jsPath = path.resolve(__dirname, '../../website/src/js');
+const scssPath = path.resolve(__dirname, '../../website/src/scss');
+
+console.log(path.resolve(__dirname, 'node_modules/bootstrap', require('bootstrap/package.json').sass));
+
+module.exports = {
+
+	mode: ('development' === process.env.NODE_ENV) && 'development' || 'production',
+
+	...(('development' === process.env.NODE_ENV) && {
+		watch: true,
+	}),
+
+    entry: [
+		path.resolve(scssPath, 'bootstrap.scss'),
+		path.resolve(scssPath, 'greenhouse.scss'),
+		path.resolve(scssPath, 'main.scss'),
+		path.resolve(jsPath, 'main.js'),
+	],
+
+    output: {
+        path: path.resolve(__dirname, '../../website'),
+    	filename: 'js/main.js',
+    },
+
+	resolve: {
+		alias: {
+			bootstrap: path.resolve(__dirname, 'node_modules/bootstrap', require('bootstrap/package.json').sass),
+		},
+	},
+
+	module: {
+		rules: [{
+			test: /\.js$/,
+			exclude: /(node_modules)/,
+			use: [{
+				loader: 'babel-loader',
+				options: {
+					presets: ['@babel/preset-env'],
+				},
+			}],
+		}, {
+			test: /\.scss$/,
+			use: [{
+				loader: 'file-loader',
+				options: {
+					sourceMap: true,
+					outputPath: (url, entryPath, context) => {
+						if (0 === entryPath.indexOf(scssPath)) {
+							const outputFile = entryPath.slice(entryPath.lastIndexOf('/') + 1, -5)
+							const outputPath = entryPath.slice(0, entryPath.lastIndexOf('/')).slice(scssPath.length + 1)
+							return `./css/${outputPath}/${outputFile}.css`
+						}
+						return `./css/${url}`
+					},
+				},
+			}, {
+				loader: 'postcss-loader',
+				options: {
+					options: {},
+					plugins: () => ([
+						require('autoprefixer'),
+						('production' === process.env.NODE_ENV) && require('cssnano'),
+					].filter(plugin => plugin)),
+				}
+			}, {
+				loader: 'sass-loader',
+				options: {
+					implementation: require('sass'),
+					implementation: require('sass'),
+					sourceMap: ('development' === process.env.NODE_ENV),
+					sassOptions: {
+						importer: require('node-sass-glob-importer')(),
+						precision: 10,
+					},
+				},
+			}],
+		}],
+	},
+
+};
diff --git a/docs/tools/website.py b/docs/tools/website.py
index f0346de5c94..11772fe7a73 100644
--- a/docs/tools/website.py
+++ b/docs/tools/website.py
@@ -104,7 +104,7 @@ def adjust_markdown_html(content):
         for p in div.find_all('p'):
             p_class = p.attrs.get('class')
             if is_admonition and p_class and ('admonition-title' in p_class):
-                p.attrs['class'] = p_class + ['alert-heading', 'display-6', 'mb-2']
+                p.attrs['class'] = p_class + ['alert-heading', 'display-4', 'text-reset', 'mb-2']
 
         if is_admonition:
             div.attrs['role'] = 'alert'
@@ -144,6 +144,7 @@ def build_website(args):
             'docs',
             'public',
             'node_modules',
+            'src',
             'templates',
             'locale',
             '.gitkeep'
@@ -155,6 +156,11 @@ def build_website(args):
         os.path.join(args.src_dir, 'utils', 'list-versions', 'version_date.tsv'),
         os.path.join(args.output_dir, 'data', 'version_date.tsv'))
 
+    # This file can be requested to install ClickHouse.
+    shutil.copy2(
+        os.path.join(args.src_dir, 'docs', '_includes', 'install', 'universal.sh'),
+        os.path.join(args.output_dir, 'data', 'install.sh'))
+
     for root, _, filenames in os.walk(args.output_dir):
         for filename in filenames:
             if filename == 'main.html':
@@ -181,7 +187,8 @@ def get_css_in(args):
         f"'{args.website_dir}/css/base.css'",
         f"'{args.website_dir}/css/blog.css'",
         f"'{args.website_dir}/css/docs.css'",
-        f"'{args.website_dir}/css/highlight.css'"
+        f"'{args.website_dir}/css/highlight.css'",
+        f"'{args.website_dir}/css/main.css'"
     ]
 
 
@@ -194,7 +201,8 @@ def get_js_in(args):
         f"'{args.website_dir}/js/base.js'",
         f"'{args.website_dir}/js/index.js'",
         f"'{args.website_dir}/js/docsearch.js'",
-        f"'{args.website_dir}/js/docs.js'"
+        f"'{args.website_dir}/js/docs.js'",
+        f"'{args.website_dir}/js/main.js'"
     ]
 
 
@@ -212,15 +220,23 @@ def minify_file(path, css_digest, js_digest):
         content = minify_html(content)
         content = content.replace('base.css?css_digest', f'base.css?{css_digest}')
         content = content.replace('base.js?js_digest', f'base.js?{js_digest}')
-    elif path.endswith('.css'):
-        content = cssmin.cssmin(content)
-    elif path.endswith('.js'):
-        content = jsmin.jsmin(content)
+# TODO: restore cssmin
+#     elif path.endswith('.css'):
+#         content = cssmin.cssmin(content)
+# TODO: restore jsmin
+#     elif path.endswith('.js'):
+#         content = jsmin.jsmin(content)
     with open(path, 'wb') as f:
         f.write(content.encode('utf-8'))
 
 
 def minify_website(args):
+    # Output greenhouse css separately from main bundle to be included via the greenhouse iframe
+    command = f"cat '{args.website_dir}/css/greenhouse.css' > '{args.output_dir}/css/greenhouse.css'"
+    logging.info(command)
+    output = subprocess.check_output(command, shell=True)
+    logging.debug(output)
+
     css_in = ' '.join(get_css_in(args))
     css_out = f'{args.output_dir}/css/base.css'
     if args.minify:
@@ -237,7 +253,7 @@ def minify_website(args):
 
     js_in = get_js_in(args)
     js_out = f'{args.output_dir}/js/base.js'
-    if args.minify:
+    if args.minify and False:  # TODO: return closure
         js_in = [js[1:-1] for js in js_in]
         closure_args = [
             '--js', *js_in, '--js_output_file', js_out,
diff --git a/docs/zh/changelog/index.md b/docs/zh/changelog/index.md
index 14bed16c381..d36a676134e 100644
--- a/docs/zh/changelog/index.md
+++ b/docs/zh/changelog/index.md
@@ -247,7 +247,7 @@ toc_title: "\u53D8\u66F4\u65E5\u5FD7"
 -   更新了clickhouse-test脚本中挂起查询的检查 [#8858](https://github.com/ClickHouse/ClickHouse/pull/8858) ([亚历山大\*卡扎科夫](https://github.com/Akazz))
 -   从存储库中删除了一些无用的文件。 [#8843](https://github.com/ClickHouse/ClickHouse/pull/8843) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
 -   更改类型的数学perftests从 `once` 到 `loop`. [#8783](https://github.com/ClickHouse/ClickHouse/pull/8783) ([尼古拉\*科切托夫](https://github.com/KochetovNicolai))
--   添加码头镜像，它允许为我们的代码库构建交互式代码浏览器HTML报告。 [#8781](https://github.com/ClickHouse/ClickHouse/pull/8781) ([阿利沙平](https://github.com/alesapin)）见 [Woboq代码浏览器](https://clickhouse.tech/codebrowser/html_report///ClickHouse/dbms/index.html)
+-   添加码头镜像，它允许为我们的代码库构建交互式代码浏览器HTML报告。 [#8781](https://github.com/ClickHouse/ClickHouse/pull/8781) ([阿利沙平](https://github.com/alesapin)）见 [Woboq代码浏览器](https://clickhouse.com/codebrowser/html_report///ClickHouse/dbms/index.html)
 -   抑制MSan下的一些测试失败。 [#8780](https://github.com/ClickHouse/ClickHouse/pull/8780) ([Alexander Kuzmenkov](https://github.com/akuzm))
 -   加速 “exception while insert” 测试 此测试通常在具有复盖率的调试版本中超时。 [#8711](https://github.com/ClickHouse/ClickHouse/pull/8711) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
 -   更新 `libcxx` 和 `libcxxabi` 为了主人 在准备 [#9304](https://github.com/ClickHouse/ClickHouse/issues/9304) [#9308](https://github.com/ClickHouse/ClickHouse/pull/9308) ([阿列克谢-米洛维多夫](https://github.com/alexey-milovidov))
diff --git a/docs/zh/commercial/cloud.md b/docs/zh/commercial/cloud.md
index 651a1a15ec4..61a4f638bbc 100644
--- a/docs/zh/commercial/cloud.md
+++ b/docs/zh/commercial/cloud.md
@@ -5,49 +5,7 @@ toc_title: 云
 
 # ClickHouse 云服务提供商 {#clickhouse-cloud-service-providers}
 
-!!! info "注意"
-    如果您已经推出具有托管 ClickHouse 服务的公共云，请随时[提交一个 pull request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/cloud.md) 将其添加到以下列表。
+# ClickHouse Cloud Service {#clickhouse-cloud-service}
 
-## Yandex 云 {#yandex-cloud}
-
-[Yandex的 ClickHouse 托管服务](https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&utm_medium=clickhouseofficialsite&utm_campaign=link3) 提供以下主要功能:
-
--   用于 ClickHouse 复制的完全托管的 ZooKeeper 服务 [ClickHouse复制](../engines/table-engines/mergetree-family/replication.md)
--   多种存储类型选择
--   不同可用区副本
--   加密与隔离
--   自动化维护
-
-## Altinity.Cloud {#altinity.cloud}
-
-[Altinity.Cloud](https://altinity.com/cloud-database/) 是针对 Amazon 公共云的完全托管的 ClickHouse-as-a-Service
-
--   在 Amazon 资源上快速部署 ClickHouse 集群
--   轻松进行横向扩展/纵向扩展以及节点的垂直扩展
--   具有公共端点或VPC对等的租户隔离
--   可配置存储类型以及卷配置
--   跨可用区扩展以实现性能和高可用性
--   内置监控和SQL查询编辑器
-
-## 阿里云 {#alibaba-cloud}
-
-[阿里云的 ClickHouse 托管服务](https://www.alibabacloud.com/zh/product/clickhouse) 提供以下主要功能：
-
--   基于阿里飞天分布式系统的高可靠云盘存储引擎
--   按需扩容，无需手动进行数据搬迁
--   支持单节点、单副本、多节点、多副本多种架构，支持冷热数据分层
--   支持访问白名单和一键恢复，多层网络安全防护，云盘加密
--   与云上日志系统、数据库、数据应用工具无缝集成
--   内置监控和数据库管理平台
--   专业的数据库专家技术支持和服务
-
-## 腾讯云 {#tencent-cloud}
-
-[腾讯云的 ClickHouse 托管服务](https://cloud.tencent.com/product/cdwch)提供以下主要功能：
-
--   易于部署和管理, 集成监控与警报服务
--   高可用高扩展
--   通过集群级别的 VPC 保证安全可靠
--   按需定价，无需前期成本或长期承诺
-
-{## [原始文章](https://clickhouse.tech/docs/en/commercial/cloud/) ##}
+!!! info "Info"
+    Detailed public description for ClickHouse cloud services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/zh/commercial/index.md b/docs/zh/commercial/index.md
index 047ee817d7b..5f29e5f21c9 100644
--- a/docs/zh/commercial/index.md
+++ b/docs/zh/commercial/index.md
@@ -6,12 +6,7 @@ toc_title: 简介
 
 # ClickHouse 商业服务 {#clickhouse-commercial-services}
 
-本节是专门从事 ClickHouse 的服务提供商的目录，它们是一些独立的公司，不一定与 Yandex 有关系。
-
 服务类别：
 
 -	[云](../commercial/cloud.md)
 -	[支持](../commercial/support.md)
-
-!!! note "对于服务提供商"
-如果您碰巧是其中之一，可以随时提交一个 pull request，将您的公司添加到对应的章节（如果服务不属于现有的任何目录，也可以添加新的章节）。提交关于文档的 pull request 最简单的方式是点击右上角的“铅笔”编辑按钮。如果您的服务在某些本地市场上有售，请确保在本地化的文档界面中也提及它（或至少在 pull request 请求描述中指出）。
diff --git a/docs/zh/commercial/support.md b/docs/zh/commercial/support.md
index 44b6d1eab8d..a3714c98d44 100644
--- a/docs/zh/commercial/support.md
+++ b/docs/zh/commercial/support.md
@@ -5,17 +5,5 @@ toc_title: 支持
 
 # ClickHouse 商业支持服务提供商 {#clickhouse-commercial-support-service-providers}
 
-!!! info "注意"
-    如果您已经推出 ClickHouse 商业支持服务，请随时[提交一个 pull request](https://github.com/ClickHouse/ClickHouse/edit/master/docs/en/commercial/support.md) 将其添加到以下列表。
-
-## Altinity {#altinity}
-
- Altinity 自从 2017 年开始为企业提供 ClickHouse 支持服务。Altinity 的客户范围包含百强企业到初创企业等。访问 [www.altinity.com](https://www.altinity.com/) 了解更多信息。
-
-## Mafiree {#mafiree}
-
-[服务说明](http://mafiree.com/clickhouse-analytics-services.php)
-
-## MinervaDB {#minervadb}
-
-[服务说明](https://minervadb.com/index.php/clickhouse-consulting-and-support-by-minervadb/)
+!!! info "Info"
+    Detailed public description for ClickHouse support services is not ready yet, please [contact us](https://clickhouse.com/company/#contact) to learn more.
diff --git a/docs/zh/development/adding_test_queries.md b/docs/zh/development/adding_test_queries.md
new file mode 100644
index 00000000000..a494bb5eb44
--- /dev/null
+++ b/docs/zh/development/adding_test_queries.md
@@ -0,0 +1,150 @@
+# 如何将测试查询添加到 ClickHouse CI
+
+ClickHouse有数百个（甚至数千个）功能。 每个提交都由包含数千个测试用例的一组复杂测试进行检查。
+
+核心功能经过了很多的测试，但是ClickHouse CI可以发现一些极端情况和不同的功能组合。
+
+我们看到的大多数错误/回归都发生在测试覆盖率较差的`灰色区域`中。
+
+我们非常有兴趣通过测试涵盖实现生活中使用的大多数可能的场景和功能组合。
+
+## 为什么要添加测试
+
+为什么/何时应将测试用例添加到ClickHouse代码中：
+1) 您使用了一些复杂的场景/功能组合/您有一些可能未被广泛使用的情况
+2) 您会看到更改日志中没有通知的版本之间的某些行为发生了变化
+3) 您只是想帮助提高ClickHouse的质量并确保您使用的功能在未来的版本中不会被破坏
+4) 一旦测试被添加/接受，您可以确保您检查的角落案例永远不会被意外损坏。
+5) 你将成为伟大的开源社区的一份子
+6) 您的名字将出现在`system.contributors`表中！
+7) 你会让世界变得更好。
+
+### 要做的步骤
+
+#### 先决条件
+
+我假设你运行一些Linux机器（你可以在其他操作系统上使用 docker/虚拟机）和任何现代浏览器/互联网连接，并且你有一些基本的Linux和SQL技能。
+
+不需要任何高度专业化的知识（因此您不需要了解 C++ 或了解ClickHouse CI的工作原理）。
+
+#### 准备
+
+1) [create GitHub account](https://github.com/join) (如果你还没有)
+2) [setup git](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/set-up-git)
+```bash
+# for Ubuntu
+sudo apt-get update
+sudo apt-get install git
+
+git config --global user.name "John Doe" # fill with your name
+git config --global user.email "email@example.com" # fill with your email
+
+```
+3) [fork ClickHouse project](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo) - 打开 [https://github.com/ClickHouse/ClickHouse](https://github.com/ClickHouse/ClickHouse) and press fork button in the top right corner:
+   ![fork repo](https://github-images.s3.amazonaws.com/help/bootcamp/Bootcamp-Fork.png)
+
+4) 例如，将代码fork克隆到PC上的某个文件夹, `~/workspace/ClickHouse`
+```
+mkdir ~/workspace && cd ~/workspace
+git clone https://github.com/< your GitHub username>/ClickHouse
+cd ClickHouse
+git remote add upstream https://github.com/ClickHouse/ClickHouse
+```
+
+#### 测试的新分支
+
+1) 从最新的clickhouse master创建一个新分支
+```
+cd ~/workspace/ClickHouse
+git fetch upstream
+git checkout -b name_for_a_branch_with_my_test upstream/master
+```
+
+#### 安装并运行 clickhouse
+
+1) 安装`clickhouse-server` (参考[离线文档](https://clickhouse.com/docs/en/getting-started/install/))
+2) 安装测试配置（它将使用Zookeeper模拟实现并调整一些设置）
+```
+cd ~/workspace/ClickHouse/tests/config
+sudo ./install.sh
+```
+3) 运行clickhouse-server
+```
+sudo systemctl restart clickhouse-server
+```
+
+#### 创建测试文件
+
+
+1) 找到测试的编号 - 在`tests/queries/0_stateless/`中找到编号最大的文件
+
+```sh
+$ cd ~/workspace/ClickHouse
+$ ls tests/queries/0_stateless/[0-9]*.reference | tail -n 1
+tests/queries/0_stateless/01520_client_print_query_id.reference
+```
+目前，测试的最后一个数字是`01520`，所以我的测试将有数字`01521`
+
+2) 使用您测试的功能的下一个编号和名称创建一个SQL文件
+
+```sh
+touch tests/queries/0_stateless/01521_dummy_test.sql
+```
+
+3) 使用您最喜欢的编辑器编辑SQL文件（请参阅下面的创建测试提示）
+```sh
+vim tests/queries/0_stateless/01521_dummy_test.sql
+```
+
+
+4) 运行测试，并将其结果放入参考文件中：
+```
+clickhouse-client -nmT < tests/queries/0_stateless/01521_dummy_test.sql | tee tests/queries/0_stateless/01521_dummy_test.reference
+```
+
+5) 确保一切正确，如果测试输出不正确（例如由于某些错误），请使用文本编辑器调整参考文件。
+
+#### 如何创建一个好的测试
+
+- 测试应该是
+    - 最小 - 仅创建与测试功能相关的表，删除不相关的列和部分查询
+    - 快速 - 不应超过几秒钟（更好的亚秒）
+    - 正确 - 失败则功能不起作用
+        - 确定性的
+    - 隔离/无状态
+        - 不要依赖一些环境的东西
+        - 尽可能不要依赖时间
+- 尝试覆盖极端情况(zeros / Nulls / empty sets / throwing exceptions)
+- 要测试该查询返回错误，您可以在查询后添加特殊注释：`-- { serverError 60 }`或`-- { clientError 20 }`
+- 不要切换数据库（除非必要）
+- 如果需要，您可以在同一节点上创建多个表副本
+- 您可以在需要时使用测试集群定义之一（请参阅 system.clusters）
+- 使用 `number` / `numbers_mt` / `zeros` / `zeros_mt`和类似的查询要在适用时初始化数据
+- 在测试之后和测试之前清理创建的对象（DROP IF EXISTS） - 在有一些脏状态的情况下
+- 优先选择同步操作模式 (mutations, merges)
+- 以`0_stateless`文件夹中的其他SQL文件为例
+- 确保您想要测试的特性/特性组合尚未被现有测试覆盖
+
+#### 测试命名规则
+
+正确地命名测试非常重要，因此可以在clickhouse-test调用中关闭一些测试子集。
+
+| Tester flag| 测试名称中应该包含什么 | 什么时候应该添加标志 |
+|---|---|---|---|
+| `--[no-]zookeeper`| "zookeeper"或"replica" | 测试使用来自ReplicatedMergeTree家族的表 |
+| `--[no-]shard` | "shard"或"distributed"或"global"| 使用到127.0.0.2或类似的连接进行测试 |
+| `--[no-]long` | "long"或"deadlock"或"race" | 测试运行时间超过60秒 |
+
+#### Commit / push / 创建PR.
+
+1) commit & push您的修改
+```sh
+cd ~/workspace/ClickHouse
+git add tests/queries/0_stateless/01521_dummy_test.sql
+git add tests/queries/0_stateless/01521_dummy_test.reference
+git commit # use some nice commit message when possible
+git push origin HEAD
+```
+2) 使用一个在推送过程中显示的链接，创建一个到master的PR
+3) 调整PR标题和内容，在`Changelog category (leave one)`中保留
+   `Build/Testing/Packaging Improvement`，如果需要，请填写其余字段。
diff --git a/docs/zh/development/architecture.md b/docs/zh/development/architecture.md
index 882728a6e2b..dfc66b36730 100644
--- a/docs/zh/development/architecture.md
+++ b/docs/zh/development/architecture.md
@@ -191,4 +191,4 @@ ClickHouse 中的复制是基于表实现的。你可以在同一个服务器上
 
 > ClickHouse 集群由独立的分片组成，每一个分片由多个副本组成。集群不是弹性的，因此在添加新的分片后，数据不会自动在分片之间重新平衡。相反，集群负载将变得不均衡。该实现为你提供了更多控制，对于相对较小的集群，例如只有数十个节点的集群来说是很好的。但是对于我们在生产中使用的具有数百个节点的集群来说，这种方法成为一个重大缺陷。我们应该实现一个表引擎，使得该引擎能够跨集群扩展数据，同时具有动态复制的区域，这些区域能够在集群之间自动拆分和平衡。
 
-[来源文章](https://clickhouse.tech/docs/en/development/architecture/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/architecture/) <!--hide-->
diff --git a/docs/zh/development/browse-code.md b/docs/zh/development/browse-code.md
index fd334dac55f..9cee0a37444 100644
--- a/docs/zh/development/browse-code.md
+++ b/docs/zh/development/browse-code.md
@@ -5,7 +5,7 @@ toc_title: "\u6D4F\u89C8\u6E90\u4EE3\u7801"
 
 # 浏览ClickHouse源代码 {#browse-clickhouse-source-code}
 
-您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.tech/codebrowser/html_report/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。
+您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.com/codebrowser/html_report/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。
 
 此外，您还可以像往常一样浏览源代码 [GitHub](https://github.com/ClickHouse/ClickHouse)
 
diff --git a/docs/zh/development/build-cross-arm.md b/docs/zh/development/build-cross-arm.md
index fa6c9e74b5f..5c70fa9c7dd 100644
--- a/docs/zh/development/build-cross-arm.md
+++ b/docs/zh/development/build-cross-arm.md
@@ -10,7 +10,7 @@ toc_title: "\u5982\u4F55\u5728Linux\u4E0A\u6784\u5EFAClickHouse for AARCH64\uFF0
 
 这是当你有Linux机器，并希望使用它来构建的情况下 `clickhouse` 二进制文件将运行在另一个Linux机器上与AARCH64CPU架构。 这适用于在Linux服务器上运行的持续集成检查。
 
-Aarch64的交叉构建基于 [构建说明](build.md) 先跟着他们
+Aarch64的交叉构建基于 [构建说明](../development/build.md) 先跟着他们
 
 # 安装Clang-8 {#install-clang-8}
 
diff --git a/docs/zh/development/build-cross-osx.md b/docs/zh/development/build-cross-osx.md
index ee3335553d3..d9bc7666546 100644
--- a/docs/zh/development/build-cross-osx.md
+++ b/docs/zh/development/build-cross-osx.md
@@ -1,6 +1,6 @@
 # 如何在Linux中编译Mac OS X ClickHouse {#ru-he-zai-linuxzhong-bian-yi-mac-os-x-clickhouse}
 
-Linux机器也可以编译运行在OS X系统的`clickhouse`二进制包，这可以用于在Linux上跑持续集成测试。如果要在Mac OS X上直接构建ClickHouse，请参考另外一篇指南： https://clickhouse.tech/docs/zh/development/build_osx/
+Linux机器也可以编译运行在OS X系统的`clickhouse`二进制包，这可以用于在Linux上跑持续集成测试。如果要在Mac OS X上直接构建ClickHouse，请参考另外一篇指南： https://clickhouse.com/docs/zh/development/build_osx/
 
 Mac OS X的交叉编译基于以下构建说明，请首先遵循它们。
 
diff --git a/docs/zh/development/build-osx.md b/docs/zh/development/build-osx.md
index c7c386da97e..6706e9b0e4d 100644
--- a/docs/zh/development/build-osx.md
+++ b/docs/zh/development/build-osx.md
@@ -79,4 +79,4 @@ $ sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist
 
 可以通过 `ulimit -n` 命令来检查是否生效。
 
-[来源文章](https://clickhouse.tech/docs/en/development/build_osx/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/build_osx/) <!--hide-->
diff --git a/docs/zh/development/build.md b/docs/zh/development/build.md
index 01e0740bfa4..a46081d1d4b 100644
--- a/docs/zh/development/build.md
+++ b/docs/zh/development/build.md
@@ -65,4 +65,4 @@ cd ..
 若要创建一个执行文件， 执行 `ninja clickhouse`。
 这个命令会使得 `programs/clickhouse` 文件可执行，您可以使用 `client` 或 `server` 参数运行。
 
-[来源文章](https://clickhouse.tech/docs/en/development/build/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/build/) <!--hide-->
diff --git a/docs/zh/development/continuous-integration.md b/docs/zh/development/continuous-integration.md
new file mode 100644
index 00000000000..6cff83067de
--- /dev/null
+++ b/docs/zh/development/continuous-integration.md
@@ -0,0 +1,155 @@
+# 持续集成检查 {#continuous-integration-checks}
+当你提交一个pull请求时, ClickHouse[持续集成(CI)系统](https://clickhouse.com/docs/en/development/tests/#test-automation)会对您的代码运行一些自动检查.
+
+这在存储库维护者(来自ClickHouse团队的人)筛选了您的代码并将可测试标签添加到您的pull请求之后发生.
+
+检查的结果被列在[GitHub检查文档](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)中所述的GitHub pull请求页面.
+
+如果检查失败，您可能被要求去修复它. 该界面介绍了您可能遇到的检查，以及如何修复它们.
+
+如果检查失败看起来与您的更改无关, 那么它可能是一些暂时的故障或基础设施问题. 向pull请求推一个空的commit以重新启动CI检查:
+
+```
+git reset
+git commit --allow-empty
+git push
+```
+
+如果您不确定要做什么，可以向维护人员寻求帮助.
+
+## 与Master合并 {#merge-with-master}
+验证PR是否可以合并到master. 如果没有, 它将失败并显示消息'Cannot fetch mergecommit'的.请按[GitHub文档](https://docs.github.com/en/github/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github)中描述的冲突解决, 或使用git将主分支合并到您的pull请求分支来修复这个检查.
+
+## 文档检查 {#docs-check}
+尝试构建ClickHouse文档网站. 如果您更改了文档中的某些内容, 它可能会失败. 最可能的原因是文档中的某些交叉链接是错误的. 转到检查报告并查找`ERROR`和`WARNING`消息.
+
+### 报告详情 {#report-details}
+-  [状态页示例](https://clickhouse-test-reports.s3.yandex.net/12550/eabcc293eb02214caa6826b7c15f101643f67a6b/docs_check.html)
+-  `docs_output.txt`包含构建日志信息. [成功结果案例](https://clickhouse-test-reports.s3.yandex.net/12550/eabcc293eb02214caa6826b7c15f101643f67a6b/docs_check/docs_output.txt)
+
+## 描述信息检查 {#description-check}
+检查pull请求的描述是否符合[PULL_REQUEST_TEMPLATE.md](https://github.com/ClickHouse/ClickHouse/blob/master/.github/PULL_REQUEST_TEMPLATE.md)模板.
+
+您必须为您的更改指定一个更改日志类别(例如，Bug修复), 并且为[CHANGELOG.md](../whats-new/changelog/)编写一条用户可读的消息用来描述更改.
+
+## 推送到DockerHub {#push-to-dockerhub}
+生成用于构建和测试的docker映像, 然后将它们推送到DockerHub.
+
+## 标记检查 {#marker-check}
+该检查意味着CI系统已经开始处理PR.当它处于'待处理'状态时，意味着尚未开始所有检查. 启动所有检查后，状态更改为'成功'.
+
+# 格式检查 {#style-check}
+使用`utils/check-style/check-style`二进制文件执行一些简单的基于正则表达式的代码样式检查(注意, 它可以在本地运行).
+如果失败, 按照[代码样式指南](./style.md)修复样式错误.
+
+### 报告详情 {#report-details}
+-  [状态页示例](https://clickhouse-test-reports.s3.yandex.net/12550/659c78c7abb56141723af6a81bfae39335aa8cb2/style_check.html)
+-  `docs_output.txt`记录了查结果错误(无效表格等), 空白页表示没有错误. [成功结果案例](https://clickhouse-test-reports.s3.yandex.net/12550/659c78c7abb56141723af6a81bfae39335aa8cb2/style_check/output.txt)
+
+### PVS 检查 {#pvs-check}
+使用静态分析工具[PVS-studio](https://www.viva64.com/en/pvs-studio/)检查代码. 查看报告以查看确切的错误.如果可以则修复它们, 如果不行, 可以向ClickHouse的维护人员寻求帮忙.
+
+### 报告详情 {#report-details}
+-  [状态页示例](https://clickhouse-test-reports.s3.yandex.net/12550/67d716b5cc3987801996c31a67b31bf141bc3486/pvs_check.html)
+-  `test_run.txt.out.log`包含构建和分析日志文件.它只包含解析或未找到的错误.
+-  `HTML report`包含分析结果.有关说明请访问PVS的[官方网站](https://www.viva64.com/en/m/0036/#ID14E9A2B2CD)
+
+## 快速测试 {#fast-test}
+通常情况下这是PR运行的第一个检查.它构建ClickHouse以及大多数无状态运行测试, 其中省略了一些.如果失败，在修复之前不会开始进一步的检查. 查看报告以了解哪些测试失败, 然后按照[此处](./tests.md#functional-test-locally)描述的在本地重现失败.
+
+### 报告详情 {#report-details}
+[状态页示例](https://clickhouse-test-reports.s3.yandex.net/12550/67d716b5cc3987801996c31a67b31bf141bc3486/fast_test.html)
+
+#### 状态页文件 {#status-page-files}
+- `runlog.out.log` 是包含所有其他日志的通用日志.
+- `test_log.txt`
+- `submodule_log.txt` 包含关于克隆和检查所需子模块的消息.
+- `stderr.log`
+- `stdout.log`
+- `clickhouse-server.log`
+- `clone_log.txt`
+- `install_log.txt`
+- `clickhouse-server.err.log`
+- `build_log.txt`
+- `cmake_log.txt` 包含关于C/C++和Linux标志检查的消息.
+
+#### 状态页列信息 {#status-page-columns}
+- 测试名称 -- 包含测试的名称(不带路径, 例如, 所有类型的测试将被剥离到该名称).
+- 测试状态 -- 跳过、成功或失败之一.
+- 测试时间, 秒. -- 这个测试是空的.
+
+## 建构检查 {#build-check}
+在各种配置中构建ClickHouse, 以便在后续步骤中使用. 您必须修复失败的构建.构建日志通常有足够的信息来修复错误, 但是您可能必须在本地重现故障. `cmake`选项可以在构建日志中通过grep `cmake`操作找到.使用这些选项并遵循[一般的构建过程](./build.md).
+
+### 报告详情 {#report-details}
+[状态页示例](https://clickhouse-builds.s3.yandex.net/12550/67d716b5cc3987801996c31a67b31bf141bc3486/clickhouse_build_check/report.html)
+- **Compiler**: `gcc-9` 或 `clang-10` (或其他架构的`clang-10-xx`, 比如`clang-10-freebsd`).
+- **Build type**: `Debug` or `RelWithDebInfo` (cmake).
+- **Sanitizer**: `none` (without sanitizers), `address` (ASan), `memory` (MSan), `undefined` (UBSan), or `thread` (TSan).
+- **Bundled**: `bundled` 构建使用来自 `contrib` 库, 而 `unbundled` 构建使用系统库.
+- **Splitted**: `splitted` is a [split build](https://clickhouse.com/docs/en/development/build/#split-build)
+- **Status**: `成功` 或 `失败`
+- **Build log**: 链接到构建和文件复制日志, 当构建失败时很有用.
+- **Build time**.
+- **Artifacts**: 构建结果文件 (`XXX`是服务器版本, 比如`20.8.1.4344`).
+    - `clickhouse-client_XXX_all.deb`
+    -` clickhouse-common-static-dbg_XXX[+asan, +msan, +ubsan, +tsan]_amd64.deb`
+    - `clickhouse-common-staticXXX_amd64.deb`
+    - `clickhouse-server_XXX_all.deb`
+    - `clickhouse-test_XXX_all.deb`
+    - `clickhouse_XXX_amd64.buildinfo`
+    - `clickhouse_XXX_amd64.changes`
+    - `clickhouse`: Main built binary.
+    - `clickhouse-odbc-bridge`
+    - `unit_tests_dbms`: 带有 ClickHouse 单元测试的 GoogleTest 二进制文件.
+    - `shared_build.tgz`: 使用共享库构建.
+    - `performance.tgz`: 用于性能测试的特殊包.
+
+## 特殊构建检查 {#special-buildcheck}
+使用clang-tidy执行静态分析和代码样式检查. 该报告类似于构建检查. 修复在构建日志中发现的错误.
+
+## 功能无状态测试 {#functional-stateless-tests}
+为构建在不同配置中的ClickHouse二进制文件运行[无状态功能测试](./tests.md#functional-tests)——发布、调试、使用杀毒软件等.通过报告查看哪些测试失败，然后按照[此处](./tests.md#functional-test-locally)描述的在本地重现失败.注意, 您必须使用正确的构建配置来重现——在AddressSanitizer下测试可能失败,但在Debug中可以通过.从[CI构建检查页面](./build.md#you-dont-have-to-build-clickhouse)下载二进制文件, 或者在本地构建它.
+
+## 功能有状态测试 {#functional-stateful-tests}
+运行[有状态功能测试](./tests.md#functional-tests).以无状态功能测试相同的方式对待它们.不同之处在于它们需要从[Yandex.Metrica数据集](https://clickhouse.com/docs/en/getting-started/example-datasets/metrica/)的`hits`和`visits`表来运行.
+
+## 集成测试 {#integration-tests}
+运行[集成测试](./tests.md#integration-tests).
+
+## Testflows 检查{#testflows-check}
+使用Testflows测试系统去运行一些测试, 在[此处](https://github.com/ClickHouse/ClickHouse/tree/master/tests/testflows#running-tests-locally)查看如何在本地运行它们.
+
+## 压力测试 {#stress-test}
+从多个客户端并发运行无状态功能测试, 用以检测与并发相关的错误.如果失败:
+```
+* Fix all other test failures first;
+* Look at the report to find the server logs and check them for possible causes
+  of error.
+```
+
+## 冒烟测试 {#split-build-smoke-test}
+检查[拆分构建](./build.md#split-build)配置中的服务器构建是否可以启动并运行简单查询.如果失败:
+```
+* Fix other test errors first;
+* Build the server in [split build](./build.md#split-build) configuration
+  locally and check whether it can start and run `select 1`.
+```
+
+## 兼容性检查 {#compatibility-check}
+检查`clickhouse`二进制文件是否可以在带有旧libc版本的发行版上运行.如果失败, 请向维护人员寻求帮助.
+
+## AST模糊器 {#ast-fuzzer}
+运行随机生成的查询来捕获程序错误.如果失败, 请向维护人员寻求帮助.
+
+## 性能测试 {#performance-tests}
+测量查询性能的变化. 这是最长的检查, 只需不到 6 小时即可运行.性能测试报告在[此处](https://github.com/ClickHouse/ClickHouse/tree/master/docker/test/performance-comparison#how-to-read-the-report)有详细描述.
+
+## 质量保证 {#qa}
+什么是状态页面上的任务(专用网络)项目?
+
+它是 Yandex 内部工作系统的链接. Yandex 员工可以看到检查的开始时间及其更详细的状态.
+
+运行测试的地方
+
+Yandex 内部基础设施的某个地方.
diff --git a/docs/zh/development/developer-instruction.md b/docs/zh/development/developer-instruction.md
index 04950c11521..bd7a197f926 100644
--- a/docs/zh/development/developer-instruction.md
+++ b/docs/zh/development/developer-instruction.md
@@ -29,7 +29,7 @@ ClickHose支持Linux,FreeBSD 及 Mac OS X 系统。
 
 在终端命令行输入下列指令：
 
-    git clone --recursive git@guthub.com:your_github_username/ClickHouse.git
+    git clone git@guthub.com:your_github_username/ClickHouse.git
     cd ClickHouse
 
 请注意，您需要将*your_github_username* 替换成实际使用的账户名!
@@ -71,7 +71,7 @@ ClickHose支持Linux,FreeBSD 及 Mac OS X 系统。
 
 在git中使用子模块可能会很痛苦。 接下来的命令将有助于管理它:
 
-    # ! each command accepts --recursive
+    # ! each command accepts
     # Update remote URLs for submodules. Barely rare case
     git submodule sync
     # Add new submodules
@@ -84,16 +84,16 @@ ClickHose支持Linux,FreeBSD 及 Mac OS X 系统。
 接下来的命令将帮助您将所有子模块重置为初始状态（！华林！ -里面的任何chenges将被删除):
 
     # Synchronizes submodules' remote URL with .gitmodules
-    git submodule sync --recursive
+    git submodule sync
     # Update the registered submodules with initialize not yet initialized
-    git submodule update --init --recursive
+    git submodule update --init
     # Reset all changes done after HEAD
     git submodule foreach git reset --hard
     # Clean files from .gitignore
     git submodule foreach git clean -xfd
     # Repeat last 4 commands for all submodule
-    git submodule foreach git submodule sync --recursive
-    git submodule foreach git submodule update --init --recursive
+    git submodule foreach git submodule sync
+    git submodule foreach git submodule update --init
     git submodule foreach git submodule foreach git reset --hard
     git submodule foreach git submodule foreach git clean -xfd
 
@@ -224,11 +224,11 @@ KDevelop和QTCreator是另外两款适合开发ClickHouse的替代IDE。尽管
 
 # 编写代码 {#bian-xie-dai-ma}
 
-ClickHouse的架构描述可以在此处查看：https://clickhouse.tech/docs/en/development/architecture/
+ClickHouse的架构描述可以在此处查看：https://clickhouse.com/docs/en/development/architecture/
 
-代码风格指引：https://clickhouse.tech/docs/en/development/style/
+代码风格指引：https://clickhouse.com/docs/en/development/style/
 
-编写测试用例：https://clickhouse.tech/docs/en/development/tests/
+编写测试用例：https://clickhouse.com/docs/en/development/tests/
 
 任务列表：https://github.com/ClickHouse/ClickHouse/issues?q=is%3Aopen+is%3Aissue+label%3A%22easy+task%22
 
@@ -238,8 +238,8 @@ ClickHouse的架构描述可以在此处查看：https://clickhouse.tech/docs/en
 
     sudo apt install wget xz-utils
 
-    wget https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz
-    wget https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz
+    wget https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz
 
     xz -v -d hits_v1.tsv.xz
     xz -v -d visits_v1.tsv.xz
diff --git a/docs/zh/development/index.md b/docs/zh/development/index.md
index 187ee1b3e25..d14b0fc8fc7 100644
--- a/docs/zh/development/index.md
+++ b/docs/zh/development/index.md
@@ -1,3 +1,3 @@
 # ClickHouse 开发 {#clickhouse-kai-fa}
 
-[来源文章](https://clickhouse.tech/docs/en/development/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/) <!--hide-->
diff --git a/docs/zh/development/style.md b/docs/zh/development/style.md
index dcbfbc79e33..29287f31077 100644
--- a/docs/zh/development/style.md
+++ b/docs/zh/development/style.md
@@ -823,4 +823,4 @@ function(
       size_t limit)
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/development/style/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/development/style/) <!--hide-->
diff --git a/docs/zh/development/tests.md b/docs/zh/development/tests.md
new file mode 120000
index 00000000000..c03d36c3916
--- /dev/null
+++ b/docs/zh/development/tests.md
@@ -0,0 +1 @@
+../../en/development/tests.md
\ No newline at end of file
diff --git a/docs/zh/engines/database-engines/atomic.md b/docs/zh/engines/database-engines/atomic.md
index 73e044b5e98..018cb9971ae 100644
--- a/docs/zh/engines/database-engines/atomic.md
+++ b/docs/zh/engines/database-engines/atomic.md
@@ -3,15 +3,55 @@ toc_priority: 32
 toc_title: Atomic
 ---
 
-
 # Atomic {#atomic}
 
-它支持非阻塞 DROP 和 RENAME TABLE 查询以及原子 EXCHANGE TABLES t1 AND t2 查询。默认情况下使用Atomic数据库引擎。
+它支持非阻塞的[DROP TABLE](#drop-detach-table)和[RENAME TABLE](#rename-table)查询和原子的[EXCHANGE TABLES t1 AND t2](#exchange-tables)查询。默认情况下使用`Atomic`数据库引擎。
 
 ## 创建数据库 {#creating-a-database}
 
-```sql
-CREATE DATABASE test ENGINE = Atomic;
+``` sql
+  CREATE DATABASE test[ ENGINE = Atomic];
 ```
 
-[原文](https://clickhouse.tech/docs/en/engines/database_engines/atomic/) <!--hide-->
+## 使用方式 {#specifics-and-recommendations}
+
+### Table UUID {#table-uuid}
+
+数据库`Atomic`中的所有表都有唯一的[UUID](../../sql-reference/data-types/uuid.md)，并将数据存储在目录`/clickhouse_path/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/`，其中`xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy`是该表的UUID。
+
+通常，UUID是自动生成的，但用户也可以在创建表时以相同的方式显式指定UUID(不建议这样做)。可以使用 [show_table_uuid_in_table_create_query_if_not_nil](../../operations/settings/settings.md#show_table_uuid_in_table_create_query_if_not_nil)设置。显示UUID的使用`SHOW CREATE`查询。例如:
+
+```sql
+CREATE TABLE name UUID '28f1c61c-2970-457a-bffe-454156ddcfef' (n UInt64) ENGINE = ...;
+```
+
+### RENAME TABLES {#rename-table}
+
+`RENAME`查询是在不更改UUID和移动表数据的情况下执行的。这些查询不会等待使用表的查询完成，而是会立即执行。
+
+### DROP/DETACH TABLES {#drop-detach-table}
+
+在`DROP TABLE`上，不删除任何数据，数据库`Atomic`只是通过将元数据移动到`/clickhouse_path/metadata_dropped/`将表标记为已删除，并通知后台线程。最终表数据删除前的延迟由[database_atomic_delay_before_drop_table_sec](../../operations/server-configuration-parameters/settings.md#database_atomic_delay_before_drop_table_sec)设置指定。
+
+可以使用`SYNC`修饰符指定同步模式。使用[database_atomic_wait_for_drop_and_detach_synchronously](../../operations/settings/settings.md#database_atomic_wait_for_drop_and_detach_synchronously)设置执行此操作。在本例中，`DROP`等待运行 `SELECT`, `INSERT`和其他使用表完成的查询。表在不使用时将被实际删除。
+
+### EXCHANGE TABLES {#exchange-tables}
+
+`EXCHANGE`以原子方式交换表。因此，不是这种非原子操作：
+
+```sql
+RENAME TABLE new_table TO tmp, old_table TO new_table, tmp TO old_table;
+```
+可以使用一个原子查询：
+
+``` sql
+EXCHANGE TABLES new_table AND old_table;
+```
+
+### ReplicatedMergeTree in Atomic Database {#replicatedmergetree-in-atomic-database}
+
+对于[ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication)表，建议不要在ZooKeeper和副本名称中指定engine-path的参数。在这种情况下，将使用配置的参数[default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path)和[default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name)。如果要显式指定引擎的参数，建议使用{uuid}宏。这是非常有用的，以便为ZooKeeper中的每个表自动生成唯一的路径。
+
+## 另请参考
+
+-   [system.databases](../../operations/system-tables/databases.md) 系统表
diff --git a/docs/zh/engines/database-engines/index.md b/docs/zh/engines/database-engines/index.md
index 25c9ff6c6bc..10be2e0f041 100644
--- a/docs/zh/engines/database-engines/index.md
+++ b/docs/zh/engines/database-engines/index.md
@@ -1,11 +1,29 @@
-# 数据库引擎 {#shu-ju-ku-yin-qing}
+---
+toc_folder_title: 数据库引擎
+toc_priority: 27
+toc_title: Introduction
+---
 
-您使用的所有表都是由数据库引擎所提供的
+# 数据库引擎 {#database-engines}
 
-默认情况下，ClickHouse使用自己的数据库引擎，该引擎提供可配置的[表引擎](../../engines/database-engines/index.md)和[所有支持的SQL语法](../../engines/database-engines/index.md).
+数据库引擎允许您处理数据表。
 
-除此之外，您还可以选择使用以下的数据库引擎：
+默认情况下，ClickHouse使用[Atomic](../../engines/database-engines/atomic.md)数据库引擎。它提供了可配置的[table engines](../../engines/table-engines/index.md)和[SQL dialect](../../sql-reference/syntax.md)。
 
--   [MySQL](mysql.md)
+您还可以使用以下数据库引擎：
 
-[来源文章](https://clickhouse.tech/docs/en/database_engines/) <!--hide-->
+-   [MySQL](../../engines/database-engines/mysql.md)
+
+-   [MaterializeMySQL](../../engines/database-engines/materialize-mysql.md)
+
+-   [Lazy](../../engines/database-engines/lazy.md)
+
+-   [Atomic](../../engines/database-engines/atomic.md)
+
+-   [PostgreSQL](../../engines/database-engines/postgresql.md)
+
+-   [MaterializedPostgreSQL](../../engines/database-engines/materialized-postgresql.md)
+
+-   [Replicated](../../engines/database-engines/replicated.md)
+
+[来源文章](https://clickhouse.com/docs/en/database_engines/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/lazy.md b/docs/zh/engines/database-engines/lazy.md
index bca7eaeda6c..f5aa3174a24 100644
--- a/docs/zh/engines/database-engines/lazy.md
+++ b/docs/zh/engines/database-engines/lazy.md
@@ -1,16 +1,18 @@
 ---
 toc_priority: 31
-toc_title: "延时引擎"
+toc_title: Lazy
 ---
 
-# 延时引擎Lazy {#lazy}
+# Lazy {#lazy}
 
-在距最近一次访问间隔`expiration_time_in_seconds`时间段内，将表保存在内存中，仅适用于 \*Log引擎表
+在最后一次访问之后，只在RAM中保存`expiration_time_in_seconds`秒。只能用于\*Log表。
 
-由于针对这类表的访问间隔较长，对保存大量小的 \*Log引擎表进行了优化，
+它是为存储许多小的\*Log表而优化的，对于这些表，访问之间有很长的时间间隔。
 
 ## 创建数据库 {#creating-a-database}
 
-    CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
+``` sql
+CREATE DATABASE testlazy ENGINE = Lazy(expiration_time_in_seconds);
+```
 
-[原始文章](https://clickhouse.tech/docs/en/database_engines/lazy/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/database_engines/lazy/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/materialize-mysql.md b/docs/zh/engines/database-engines/materialize-mysql.md
new file mode 100644
index 00000000000..1a6bd029295
--- /dev/null
+++ b/docs/zh/engines/database-engines/materialize-mysql.md
@@ -0,0 +1,197 @@
+---
+toc_priority: 29
+toc_title: "[experimental] MaterializedMySQL"
+---
+
+# [experimental] MaterializedMySQL {#materialized-mysql}
+
+**这是一个实验性的特性，不应该在生产中使用。**
+
+创建ClickHouse数据库，包含MySQL中所有的表，以及这些表中的所有数据。
+
+ClickHouse服务器作为MySQL副本工作。它读取binlog并执行DDL和DML查询。
+
+这个功能是实验性的。
+
+## 创建数据库 {#creating-a-database}
+
+``` sql
+CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
+ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
+```
+
+**引擎参数**
+
+-   `host:port` — MySQL服务地址
+-   `database` — MySQL数据库名称
+-   `user` — MySQL用户名
+-   `password` — MySQL用户密码
+
+**引擎配置**
+
+-   `max_rows_in_buffer` — 允许数据缓存到内存中的最大行数(对于单个表和无法查询的缓存数据)。当超过行数时，数据将被物化。默认值: `65505`。
+-   `max_bytes_in_buffer` —  允许在内存中缓存数据的最大字节数(对于单个表和无法查询的缓存数据)。当超过行数时，数据将被物化。默认值: `1048576`.
+-   `max_rows_in_buffers` — 允许数据缓存到内存中的最大行数(对于数据库和无法查询的缓存数据)。当超过行数时，数据将被物化。默认值: `65505`.
+-   `max_bytes_in_buffers` — 允许在内存中缓存数据的最大字节数(对于数据库和无法查询的缓存数据)。当超过行数时，数据将被物化。默认值: `1048576`.
+-   `max_flush_data_time` — 允许数据在内存中缓存的最大毫秒数(对于数据库和无法查询的缓存数据)。当超过这个时间时，数据将被物化。默认值: `1000`.
+-   `max_wait_time_when_mysql_unavailable` — 当MySQL不可用时重试间隔(毫秒)。负值禁止重试。默认值: `1000`.
+-   `allows_query_when_mysql_lost` — 当mysql丢失时，允许查询物化表。默认值: `0` (`false`).
+```
+CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user', '***') 
+     SETTINGS 
+        allows_query_when_mysql_lost=true,
+        max_wait_time_when_mysql_unavailable=10000;
+```
+
+**MySQL服务器端配置**
+
+为了`MaterializeMySQL`正确的工作，有一些强制性的`MySQL`侧配置设置应该设置:
+
+- `default_authentication_plugin = mysql_native_password`，因为`MaterializeMySQL`只能使用此方法授权。
+- `gtid_mode = on`，因为要提供正确的`MaterializeMySQL`复制，基于GTID的日志记录是必须的。注意，在打开这个模式`On`时，你还应该指定`enforce_gtid_consistency = on`。
+
+## 虚拟列 {#virtual-columns}
+
+当使用`MaterializeMySQL`数据库引擎时，[ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md)表与虚拟的`_sign`和`_version`列一起使用。
+
+- `_version` — 同步版本。 类型[UInt64](../../sql-reference/data-types/int-uint.md).
+- `_sign` — 删除标记。类型 [Int8](../../sql-reference/data-types/int-uint.md). Possible values:
+    - `1` — 行不会删除,
+    - `-1` — 行被删除。
+
+## 支持的数据类型 {#data_types-support}
+
+| MySQL                   | ClickHouse                                                   |
+|-------------------------|--------------------------------------------------------------|
+| TINY                    | [Int8](../../sql-reference/data-types/int-uint.md)           |
+| SHORT                   | [Int16](../../sql-reference/data-types/int-uint.md)          |
+| INT24                   | [Int32](../../sql-reference/data-types/int-uint.md)          |
+| LONG                    | [UInt32](../../sql-reference/data-types/int-uint.md)         |
+| LONGLONG                | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| FLOAT                   | [Float32](../../sql-reference/data-types/float.md)           |
+| DOUBLE                  | [Float64](../../sql-reference/data-types/float.md)           |
+| DECIMAL, NEWDECIMAL     | [Decimal](../../sql-reference/data-types/decimal.md)         |
+| DATE, NEWDATE           | [Date](../../sql-reference/data-types/date.md)               |
+| DATETIME, TIMESTAMP     | [DateTime](../../sql-reference/data-types/datetime.md)       |
+| DATETIME2, TIMESTAMP2   | [DateTime64](../../sql-reference/data-types/datetime64.md)   |
+| ENUM                    | [Enum](../../sql-reference/data-types/enum.md)               |
+| STRING                  | [String](../../sql-reference/data-types/string.md)           |
+| VARCHAR, VAR_STRING     | [String](../../sql-reference/data-types/string.md)           |
+| BLOB                    | [String](../../sql-reference/data-types/string.md)           |
+| BINARY                  | [FixedString](../../sql-reference/data-types/fixedstring.md) |
+
+不支持其他类型。如果MySQL表包含此类类型的列，ClickHouse抛出异常"Unhandled data type"并停止复制。
+
+[Nullable](../../sql-reference/data-types/nullable.md)已经支持
+
+## 使用方式 {#specifics-and-recommendations}
+
+### 兼容性限制
+
+除了数据类型的限制外，与`MySQL`数据库相比，还存在一些限制，在实现复制之前应先解决这些限制：
+
+- `MySQL`中的每个表都应该包含`PRIMARY KEY`
+
+- 对于包含`ENUM`字段值超出范围（在`ENUM`签名中指定）的行的表，复制将不起作用。
+
+### DDL查询 {#ddl-queries}
+
+MySQL DDL查询转换为相应的ClickHouse DDL查询([ALTER](../../sql-reference/statements/alter/index.md), [CREATE](../../sql-reference/statements/create/index.md), [DROP](../../sql-reference/statements/drop.md), [RENAME](../../sql-reference/statements/rename.md))。如果ClickHouse无法解析某个DDL查询，则该查询将被忽略。
+
+### Data Replication {#data-replication}
+
+`MaterializeMySQL`不支持直接`INSERT`, `DELETE`和`UPDATE`查询. 但是，它们是在数据复制方面支持的：
+
+- MySQL的`INSERT`查询转换为`INSERT`并携带`_sign=1`.
+
+- MySQL的`DELETE`查询转换为`INSERT`并携带`_sign=-1`.
+
+- MySQL的`UPDATE`查询转换为`INSERT`并携带`_sign=-1`, `INSERT`和`_sign=1`.
+
+### 查询MaterializeMySQL表 {#select}
+
+`SELECT`查询`MaterializeMySQL`表有一些细节:
+
+- 如果`_version`在`SELECT`中没有指定，则使用[FINAL](../../sql-reference/statements/select/from.md#select-from-final)修饰符。所以只有带有`MAX(_version)`的行才会被选中。
+
+- 如果`_sign`在`SELECT`中没有指定，则默认使用`WHERE _sign=1`。因此，删除的行不会包含在结果集中。
+
+- 结果包括列中的列注释，因为它们存在于SQL数据库表中。
+
+### Index Conversion {#index-conversion}
+
+MySQL的`PRIMARY KEY`和`INDEX`子句在ClickHouse表中转换为`ORDER BY`元组。
+
+ClickHouse只有一个物理顺序，由`ORDER BY`子句决定。要创建一个新的物理顺序，使用[materialized views](../../sql-reference/statements/create/view.md#materialized)。
+
+**Notes**
+
+- 带有`_sign=-1`的行不会从表中物理删除。
+- `MaterializeMySQL`引擎不支持级联`UPDATE/DELETE`查询。
+- 复制很容易被破坏。
+- 禁止对数据库和表进行手工操作。
+- `MaterializeMySQL`受[optimize_on_insert](../../operations/settings/settings.md#optimize-on-insert)设置的影响。当MySQL服务器中的表发生变化时，数据会合并到`MaterializeMySQL`数据库中相应的表中。
+
+## 使用示例 {#examples-of-use}
+
+MySQL操作:
+
+``` sql
+mysql> CREATE DATABASE db;
+mysql> CREATE TABLE db.test (a INT PRIMARY KEY, b INT);
+mysql> INSERT INTO db.test VALUES (1, 11), (2, 22);
+mysql> DELETE FROM db.test WHERE a=1;
+mysql> ALTER TABLE db.test ADD COLUMN c VARCHAR(16);
+mysql> UPDATE db.test SET c='Wow!', b=222;
+mysql> SELECT * FROM test;
+```
+
+```text
++---+------+------+ 
+| a |    b |    c |
++---+------+------+ 
+| 2 |  222 | Wow! |
++---+------+------+
+```
+
+ClickHouse中的数据库，与MySQL服务器交换数据:
+
+创建的数据库和表:
+
+``` sql
+CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user', '***');
+SHOW TABLES FROM mysql;
+```
+
+``` text
+┌─name─┐
+│ test │
+└──────┘
+```
+
+然后插入数据:
+
+``` sql
+SELECT * FROM mysql.test;
+```
+
+``` text
+┌─a─┬──b─┐ 
+│ 1 │ 11 │ 
+│ 2 │ 22 │ 
+└───┴────┘
+```
+
+删除数据后，添加列并更新:
+
+``` sql
+SELECT * FROM mysql.test;
+```
+
+``` text
+┌─a─┬───b─┬─c────┐ 
+│ 2 │ 222 │ Wow! │ 
+└───┴─────┴──────┘
+```
+
+[来源文章](https://clickhouse.com/docs/en/engines/database-engines/materialize-mysql/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/materialized-mysql.md b/docs/zh/engines/database-engines/materialized-mysql.md
new file mode 120000
index 00000000000..02118b85df4
--- /dev/null
+++ b/docs/zh/engines/database-engines/materialized-mysql.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/materialized-mysql.md
\ No newline at end of file
diff --git a/docs/zh/engines/database-engines/materialized-postgresql.md b/docs/zh/engines/database-engines/materialized-postgresql.md
new file mode 100644
index 00000000000..bce48e1eaff
--- /dev/null
+++ b/docs/zh/engines/database-engines/materialized-postgresql.md
@@ -0,0 +1,85 @@
+---
+toc_priority: 30
+toc_title: MaterializedPostgreSQL
+---
+
+# [experimental] MaterializedPostgreSQL {#materialize-postgresql}
+
+使用PostgreSQL数据库表的初始数据转储创建ClickHouse数据库，并启动复制过程，即执行后台作业，以便在远程PostgreSQL数据库中的PostgreSQL数据库表上发生新更改时应用这些更改。
+
+ClickHouse服务器作为PostgreSQL副本工作。它读取WAL并执行DML查询。DDL不是复制的，但可以处理（如下所述）。
+
+## 创建数据库 {#creating-a-database}
+
+``` sql
+CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
+ENGINE = MaterializedPostgreSQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
+```
+
+**Engine参数**
+
+-   `host:port` — PostgreSQL服务地址
+-   `database` — PostgreSQL数据库名
+-   `user` — PostgreSQL用户名
+-   `password` — 用户密码
+
+## 设置 {#settings}
+
+-   [materialized_postgresql_max_block_size](../../operations/settings/settings.md#materialized-postgresql-max-block-size)
+
+-   [materialized_postgresql_tables_list](../../operations/settings/settings.md#materialized-postgresql-tables-list)
+
+-   [materialized_postgresql_allow_automatic_update](../../operations/settings/settings.md#materialized-postgresql-allow-automatic-update)
+
+``` sql
+CREATE DATABASE database1
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password')
+SETTINGS materialized_postgresql_max_block_size = 65536,
+         materialized_postgresql_tables_list = 'table1,table2,table3';
+
+SELECT * FROM database1.table1;
+```
+
+## 必备条件 {#requirements}
+
+- 在postgresql配置文件中将[wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html)设置为`logical`，将`max_replication_slots`设置为`2`。
+
+- 每个复制表必须具有以下一个[replica identity](https://www.postgresql.org/docs/10/sql-altertable.html#SQL-CREATETABLE-REPLICA-IDENTITY):
+
+1. **default** (主键)
+
+2. **index**
+
+``` bash
+postgres# CREATE TABLE postgres_table (a Integer NOT NULL, b Integer, c Integer NOT NULL, d Integer, e Integer NOT NULL);
+postgres# CREATE unique INDEX postgres_table_index on postgres_table(a, c, e);
+postgres# ALTER TABLE postgres_table REPLICA IDENTITY USING INDEX postgres_table_index;
+```
+
+总是先检查主键。如果不存在，则检查索引(定义为副本标识索引)。
+如果使用index作为副本标识，则表中必须只有一个这样的索引。
+你可以用下面的命令来检查一个特定的表使用了什么类型:
+
+``` bash
+postgres# SELECT CASE relreplident
+          WHEN 'd' THEN 'default'
+          WHEN 'n' THEN 'nothing'
+          WHEN 'f' THEN 'full'
+          WHEN 'i' THEN 'index'
+       END AS replica_identity
+FROM pg_class
+WHERE oid = 'postgres_table'::regclass;
+```
+
+## 注意 {#warning}
+
+1. [**TOAST**](https://www.postgresql.org/docs/9.5/storage-toast.html)不支持值转换。将使用数据类型的默认值。
+
+## 使用示例 {#example-of-use}
+
+``` sql
+CREATE DATABASE postgresql_db
+ENGINE = MaterializedPostgreSQL('postgres1:5432', 'postgres_database', 'postgres_user', 'postgres_password');
+
+SELECT * FROM postgresql_db.postgres_table;
+```
diff --git a/docs/zh/engines/database-engines/mysql.md b/docs/zh/engines/database-engines/mysql.md
index fa2cb1ea8e5..fe9ab8f077d 100644
--- a/docs/zh/engines/database-engines/mysql.md
+++ b/docs/zh/engines/database-engines/mysql.md
@@ -1,6 +1,11 @@
+---
+toc_priority: 30
+toc_title: MySQL
+---
+
 # MySQL {#mysql}
 
-MySQL引擎用于将远程的MySQL服务器中的表映射到ClickHouse中，并允许您对表进行`INSERT`和`SELECT`查询，以方便您在ClickHouse与MySQL之间进行数据交换。
+MySQL引擎用于将远程的MySQL服务器中的表映射到ClickHouse中，并允许您对表进行`INSERT`和`SELECT`查询，以方便您在ClickHouse与MySQL之间进行数据交换
 
 `MySQL`数据库引擎会将对其的查询转换为MySQL语法并发送到MySQL服务器中，因此您可以执行诸如`SHOW TABLES`或`SHOW CREATE TABLE`之类的操作。
 
@@ -10,67 +15,86 @@ MySQL引擎用于将远程的MySQL服务器中的表映射到ClickHouse中，并
 -   `CREATE TABLE`
 -   `ALTER`
 
-## CREATE DATABASE {#create-database}
+## 创建数据库 {#creating-a-database}
 
 ``` sql
 CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
 ENGINE = MySQL('host:port', ['database' | database], 'user', 'password')
 ```
 
-**MySQL数据库引擎参数**
+**引擎参数**
 
--   `host:port` — 链接的MySQL地址。
--   `database` — 链接的MySQL数据库。
--   `user` — 链接的MySQL用户。
--   `password` — 链接的MySQL用户密码。
+-   `host:port` — MySQL服务地址
+-   `database` — MySQL数据库名称
+-   `user` — MySQL用户名
+-   `password` — MySQL用户密码
 
-## 支持的类型对应 {#zhi-chi-de-lei-xing-dui-ying}
+## 支持的数据类型 {#data_types-support}
 
-| MySQL                            | ClickHouse                                                  |
-|----------------------------------|-------------------------------------------------------------|
-| UNSIGNED TINYINT                 | [UInt8](../../sql-reference/data-types/int-uint.md)         |
-| TINYINT                          | [Int8](../../sql-reference/data-types/int-uint.md)          |
-| UNSIGNED SMALLINT                | [UInt16](../../sql-reference/data-types/int-uint.md)        |
-| SMALLINT                         | [Int16](../../sql-reference/data-types/int-uint.md)         |
-| UNSIGNED INT, UNSIGNED MEDIUMINT | [UInt32](../../sql-reference/data-types/int-uint.md)        |
-| INT, MEDIUMINT                   | [Int32](../../sql-reference/data-types/int-uint.md)         |
-| UNSIGNED BIGINT                  | [UInt64](../../sql-reference/data-types/int-uint.md)        |
-| BIGINT                           | [Int64](../../sql-reference/data-types/int-uint.md)         |
-| FLOAT                            | [Float32](../../sql-reference/data-types/float.md)          |
-| DOUBLE                           | [Float64](../../sql-reference/data-types/float.md)          |
-| DATE                             | [日期](../../sql-reference/data-types/date.md)              |
-| DATETIME, TIMESTAMP              | [日期时间](../../sql-reference/data-types/datetime.md)      |
-| BINARY                           | [固定字符串](../../sql-reference/data-types/fixedstring.md) |
+| MySQL                            | ClickHouse                                                   |
+|----------------------------------|--------------------------------------------------------------|
+| UNSIGNED TINYINT                 | [UInt8](../../sql-reference/data-types/int-uint.md)          |
+| TINYINT                          | [Int8](../../sql-reference/data-types/int-uint.md)           |
+| UNSIGNED SMALLINT                | [UInt16](../../sql-reference/data-types/int-uint.md)         |
+| SMALLINT                         | [Int16](../../sql-reference/data-types/int-uint.md)          |
+| UNSIGNED INT, UNSIGNED MEDIUMINT | [UInt32](../../sql-reference/data-types/int-uint.md)         |
+| INT, MEDIUMINT                   | [Int32](../../sql-reference/data-types/int-uint.md)          |
+| UNSIGNED BIGINT                  | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| BIGINT                           | [Int64](../../sql-reference/data-types/int-uint.md)          |
+| FLOAT                            | [Float32](../../sql-reference/data-types/float.md)           |
+| DOUBLE                           | [Float64](../../sql-reference/data-types/float.md)           |
+| DATE                             | [Date](../../sql-reference/data-types/date.md)               |
+| DATETIME, TIMESTAMP              | [DateTime](../../sql-reference/data-types/datetime.md)       |
+| BINARY                           | [FixedString](../../sql-reference/data-types/fixedstring.md) |
 
-其他的MySQL数据类型将全部都转换为[字符串](../../sql-reference/data-types/string.md)。
+其他的MySQL数据类型将全部都转换为[String](../../sql-reference/data-types/string.md).
 
-同时以上的所有类型都支持[可为空](../../sql-reference/data-types/nullable.md)。
+[Nullable](../../sql-reference/data-types/nullable.md)已经支持
 
-## 使用示例 {#shi-yong-shi-li}
+## 全局变量支持 {#global-variables-support}
 
-在MySQL中创建表:
+为了更好地兼容，您可以在SQL样式中设置全局变量，如`@@identifier`.
 
-    mysql> USE test;
-    Database changed
+支持这些变量：
+- `version`
+- `max_allowed_packet`
 
-    mysql> CREATE TABLE `mysql_table` (
-        ->   `int_id` INT NOT NULL AUTO_INCREMENT,
-        ->   `float` FLOAT NOT NULL,
-        ->   PRIMARY KEY (`int_id`));
-    Query OK, 0 rows affected (0,09 sec)
+!!! warning "警告"
+到目前为止，这些变量是存根，并且不对应任何内容。
 
-    mysql> insert into mysql_table (`int_id`, `float`) VALUES (1,2);
-    Query OK, 1 row affected (0,00 sec)
+示例:
 
-    mysql> select * from mysql_table;
-    +--------+-------+
-    | int_id | value |
-    +--------+-------+
-    |      1 |     2 |
-    +--------+-------+
-    1 row in set (0,00 sec)
+``` sql
+SELECT @@version;
+```
 
-在ClickHouse中创建MySQL类型的数据库，同时与MySQL服务器交换数据：
+## 使用示例 {#examples-of-use}
+
+MySQL操作:
+
+``` text
+mysql> USE test;
+Database changed
+
+mysql> CREATE TABLE `mysql_table` (
+    ->   `int_id` INT NOT NULL AUTO_INCREMENT,
+    ->   `float` FLOAT NOT NULL,
+    ->   PRIMARY KEY (`int_id`));
+Query OK, 0 rows affected (0,09 sec)
+
+mysql> insert into mysql_table (`int_id`, `float`) VALUES (1,2);
+Query OK, 1 row affected (0,00 sec)
+
+mysql> select * from mysql_table;
++------+-----+
+| int_id | value |
++------+-----+
+|      1 |     2 |
++------+-----+
+1 row in set (0,00 sec)
+```
+
+ClickHouse中的数据库，与MySQL服务器交换数据:
 
 ``` sql
 CREATE DATABASE mysql_db ENGINE = MySQL('localhost:3306', 'test', 'my_user', 'user_password')
@@ -123,4 +147,4 @@ SELECT * FROM mysql_db.mysql_table
 └────────┴───────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/database_engines/mysql/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/database_engines/mysql/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/postgresql.md b/docs/zh/engines/database-engines/postgresql.md
new file mode 100644
index 00000000000..12b8133f404
--- /dev/null
+++ b/docs/zh/engines/database-engines/postgresql.md
@@ -0,0 +1,138 @@
+---
+toc_priority: 35
+toc_title: PostgreSQL
+---
+
+# PostgreSQL {#postgresql}
+
+允许连接到远程[PostgreSQL](https://www.postgresql.org)服务。支持读写操作(`SELECT`和`INSERT`查询)，以在ClickHouse和PostgreSQL之间交换数据。
+
+在`SHOW TABLES`和`DESCRIBE TABLE`查询的帮助下，从远程PostgreSQL实时访问表列表和表结构。
+
+支持表结构修改(`ALTER TABLE ... ADD|DROP COLUMN`)。如果`use_table_cache`参数(参见下面的引擎参数)设置为`1`，则会缓存表结构，不会检查是否被修改，但可以用`DETACH`和`ATTACH`查询进行更新。
+
+## 创建数据库 {#creating-a-database}
+
+``` sql
+CREATE DATABASE test_database 
+ENGINE = PostgreSQL('host:port', 'database', 'user', 'password'[, `use_table_cache`]);
+```
+
+**引擎参数**
+
+-   `host:port` — PostgreSQL服务地址
+-   `database` — 远程数据库名次
+-   `user` — PostgreSQL用户名称
+-   `password` — PostgreSQL用户密码
+-   `use_table_cache` —  定义数据库表结构是否已缓存或不进行。可选的。默认值： `0`.
+
+## 支持的数据类型 {#data_types-support}
+
+| PostgerSQL       | ClickHouse                                                   |
+|------------------|--------------------------------------------------------------|
+| DATE             | [Date](../../sql-reference/data-types/date.md)               |
+| TIMESTAMP        | [DateTime](../../sql-reference/data-types/datetime.md)       |
+| REAL             | [Float32](../../sql-reference/data-types/float.md)           |
+| DOUBLE           | [Float64](../../sql-reference/data-types/float.md)           |
+| DECIMAL, NUMERIC | [Decimal](../../sql-reference/data-types/decimal.md)         |
+| SMALLINT         | [Int16](../../sql-reference/data-types/int-uint.md)          |
+| INTEGER          | [Int32](../../sql-reference/data-types/int-uint.md)          |
+| BIGINT           | [Int64](../../sql-reference/data-types/int-uint.md)          |
+| SERIAL           | [UInt32](../../sql-reference/data-types/int-uint.md)         |
+| BIGSERIAL        | [UInt64](../../sql-reference/data-types/int-uint.md)         |
+| TEXT, CHAR       | [String](../../sql-reference/data-types/string.md)           |
+| INTEGER          | Nullable([Int32](../../sql-reference/data-types/int-uint.md))|
+| ARRAY            | [Array](../../sql-reference/data-types/array.md)             |
+
+
+## 使用示例 {#examples-of-use}
+
+ClickHouse中的数据库，与PostgreSQL服务器交换数据:
+
+``` sql
+CREATE DATABASE test_database 
+ENGINE = PostgreSQL('postgres1:5432', 'test_database', 'postgres', 'mysecretpassword', 1);
+```
+
+``` sql
+SHOW DATABASES;
+```
+
+``` text
+┌─name──────────┐
+│ default       │
+│ test_database │
+│ system        │
+└───────────────┘
+```
+
+``` sql
+SHOW TABLES FROM test_database;
+```
+
+``` text
+┌─name───────┐
+│ test_table │
+└────────────┘
+```
+
+从PostgreSQL表中读取数据：
+
+``` sql
+SELECT * FROM test_database.test_table;
+```
+
+``` text
+┌─id─┬─value─┐
+│  1 │     2 │
+└────┴───────┘
+```
+
+将数据写入PostgreSQL表：
+
+``` sql
+INSERT INTO test_database.test_table VALUES (3,4);
+SELECT * FROM test_database.test_table;
+```
+
+``` text
+┌─int_id─┬─value─┐
+│      1 │     2 │
+│      3 │     4 │
+└────────┴───────┘
+```
+
+在PostgreSQL中修改了表结构：
+
+``` sql
+postgre> ALTER TABLE test_table ADD COLUMN data Text
+```
+
+当创建数据库时，参数`use_table_cache`被设置为`1`，ClickHouse中的表结构被缓存，因此没有被修改:
+
+``` sql
+DESCRIBE TABLE test_database.test_table;
+```
+``` text
+┌─name───┬─type──────────────┐
+│ id     │ Nullable(Integer) │
+│ value  │ Nullable(Integer) │
+└────────┴───────────────────┘
+```
+
+分离表并再次附加它之后，结构被更新了:
+
+``` sql
+DETACH TABLE test_database.test_table;
+ATTACH TABLE test_database.test_table;
+DESCRIBE TABLE test_database.test_table;
+```
+``` text
+┌─name───┬─type──────────────┐
+│ id     │ Nullable(Integer) │
+│ value  │ Nullable(Integer) │
+│ data   │ Nullable(String)  │
+└────────┴───────────────────┘
+```
+
+[来源文章](https://clickhouse.com/docs/en/database-engines/postgresql/) <!--hide-->
diff --git a/docs/zh/engines/database-engines/replicated.md b/docs/zh/engines/database-engines/replicated.md
new file mode 100644
index 00000000000..9ffebe04571
--- /dev/null
+++ b/docs/zh/engines/database-engines/replicated.md
@@ -0,0 +1,116 @@
+# [experimental] Replicated {#replicated}
+
+该引擎基于[Atomic](../../engines/database-engines/atomic.md)引擎。它支持通过将DDL日志写入ZooKeeper并在给定数据库的所有副本上执行的元数据复制。
+
+一个ClickHouse服务器可以同时运行和更新多个复制的数据库。但是同一个复制的数据库不能有多个副本。
+
+## 创建数据库 {#creating-a-database}
+
+``` sql
+CREATE DATABASE testdb ENGINE = Replicated('zoo_path', 'shard_name', 'replica_name') [SETTINGS ...]
+```
+
+**引擎参数**
+
+-   `zoo_path` — ZooKeeper地址，同一个ZooKeeper路径对应同一个数据库。
+-   `shard_name` — 分片的名字。数据库副本按`shard_name`分组到分片中。
+-   `replica_name` — 副本的名字。同一分片的所有副本的副本名称必须不同。
+
+!!! note "警告"
+对于[ReplicatedMergeTree](../table-engines/mergetree-family/replication.md#table_engines-replication)表，如果没有提供参数，则使用默认参数:`/clickhouse/tables/{uuid}/{shard}`和`{replica}`。这些可以在服务器设置[default_replica_path](../../operations/server-configuration-parameters/settings.md#default_replica_path)和[default_replica_name](../../operations/server-configuration-parameters/settings.md#default_replica_name)中更改。宏`{uuid}`被展开到表的uuid， `{shard}`和`{replica}`被展开到服务器配置的值，而不是数据库引擎参数。但是在将来，可以使用Replicated数据库的`shard_name`和`replica_name`。
+
+## 使用方式 {#specifics-and-recommendations}
+
+使用`Replicated`数据库的DDL查询的工作方式类似于[ON CLUSTER](../../sql-reference/distributed-ddl.md)查询，但有细微差异。
+
+首先，DDL请求尝试在启动器(最初从用户接收请求的主机)上执行。如果请求没有完成，那么用户立即收到一个错误，其他主机不会尝试完成它。如果在启动器上成功地完成了请求，那么所有其他主机将自动重试，直到完成请求。启动器将尝试在其他主机上等待查询完成(不超过[distributed_ddl_task_timeout](../../operations/settings/settings.md#distributed_ddl_task_timeout))，并返回一个包含每个主机上查询执行状态的表。
+
+错误情况下的行为是由[distributed_ddl_output_mode](../../operations/settings/settings.md#distributed_ddl_output_mode)设置调节的，对于`Replicated`数据库，最好将其设置为`null_status_on_timeout` - 例如，如果一些主机没有时间执行[distributed_ddl_task_timeout](../../operations/settings/settings.md#distributed_ddl_task_timeout)的请求，那么不要抛出异常，但在表中显示它们的`NULL`状态。
+
+[system.clusters](../../operations/system-tables/clusters.md)系统表包含一个名为复制数据库的集群，它包含数据库的所有副本。当创建/删除副本时，这个集群会自动更新，它可以用于[Distributed](../../engines/table-engines/special/distributed.md#distributed)表。
+
+当创建数据库的新副本时，该副本会自己创建表。如果副本已经不可用很长一段时间，并且已经滞后于复制日志-它用ZooKeeper中的当前元数据检查它的本地元数据，将带有数据的额外表移动到一个单独的非复制数据库(以免意外地删除任何多余的东西)，创建缺失的表，如果表名已经被重命名，则更新表名。数据在`ReplicatedMergeTree`级别被复制，也就是说，如果表没有被复制，数据将不会被复制(数据库只负责元数据)。
+
+## 使用示例 {#usage-example}
+
+创建三台主机的集群:
+
+``` sql
+node1 :) CREATE DATABASE r ENGINE=Replicated('some/path/r','shard1','replica1');
+node2 :) CREATE DATABASE r ENGINE=Replicated('some/path/r','shard1','other_replica');
+node3 :) CREATE DATABASE r ENGINE=Replicated('some/path/r','other_shard','{replica}');
+```
+
+运行DDL:
+
+``` sql
+CREATE TABLE r.rmt (n UInt64) ENGINE=ReplicatedMergeTree ORDER BY n;
+```
+
+``` text
+┌─────hosts────────────┬──status─┬─error─┬─num_hosts_remaining─┬─num_hosts_active─┐ 
+│ shard1|replica1      │    0    │       │          2          │        0         │ 
+│ shard1|other_replica │    0    │       │          1          │        0         │
+│ other_shard|r1       │    0    │       │          0          │        0         │
+└──────────────────────┴─────────┴───────┴─────────────────────┴──────────────────┘
+```
+
+显示系统表:
+
+``` sql
+SELECT cluster, shard_num, replica_num, host_name, host_address, port, is_local 
+FROM system.clusters WHERE cluster='r';
+```
+
+``` text
+┌─cluster─┬─shard_num─┬─replica_num─┬─host_name─┬─host_address─┬─port─┬─is_local─┐ 
+│ r       │     1     │      1      │   node3   │  127.0.0.1   │ 9002 │     0    │ 
+│ r       │     2     │      1      │   node2   │  127.0.0.1   │ 9001 │     0    │
+│ r       │     2     │      2      │   node1   │  127.0.0.1   │ 9000 │     1    │
+└─────────┴───────────┴─────────────┴───────────┴──────────────┴──────┴──────────┘
+```
+
+创建分布式表并插入数据:
+
+``` sql
+node2 :) CREATE TABLE r.d (n UInt64) ENGINE=Distributed('r','r','rmt', n % 2);
+node3 :) INSERT INTO r SELECT * FROM numbers(10);
+node1 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY host;
+```
+
+``` text
+┌─hosts─┬─groupArray(n)─┐ 
+│ node1 │  [1,3,5,7,9]  │   
+│ node2 │  [0,2,4,6,8]  │    
+└───────┴───────────────┘
+```
+
+向一台主机添加副本:
+
+``` sql
+node4 :) CREATE DATABASE r ENGINE=Replicated('some/path/r','other_shard','r2');
+```
+
+集群配置如下所示:
+
+``` text
+┌─cluster─┬─shard_num─┬─replica_num─┬─host_name─┬─host_address─┬─port─┬─is_local─┐ 
+│ r       │     1     │      1      │   node3   │  127.0.0.1   │ 9002 │     0    │ 
+│ r       │     1     │      2      │   node4   │  127.0.0.1   │ 9003 │     0    │
+│ r       │     2     │      1      │   node2   │  127.0.0.1   │ 9001 │     0    │
+│ r       │     2     │      2      │   node1   │  127.0.0.1   │ 9000 │     1    │
+└─────────┴───────────┴─────────────┴───────────┴──────────────┴──────┴──────────┘
+```
+
+分布式表也将从新主机获取数据:
+
+```sql
+node2 :) SELECT materialize(hostName()) AS host, groupArray(n) FROM r.d GROUP BY host;
+```
+
+```text
+┌─hosts─┬─groupArray(n)─┐ 
+│ node2 │  [1,3,5,7,9]  │   
+│ node4 │  [0,2,4,6,8]  │    
+└───────┴───────────────┘
+```
diff --git a/docs/zh/engines/database-engines/sqlite.md b/docs/zh/engines/database-engines/sqlite.md
new file mode 120000
index 00000000000..776734647c2
--- /dev/null
+++ b/docs/zh/engines/database-engines/sqlite.md
@@ -0,0 +1 @@
+../../../en/engines/database-engines/sqlite.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/integrations/ExternalDistributed.md b/docs/zh/engines/table-engines/integrations/ExternalDistributed.md
new file mode 120000
index 00000000000..f843983ad4d
--- /dev/null
+++ b/docs/zh/engines/table-engines/integrations/ExternalDistributed.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/ExternalDistributed.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md b/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md
index 7c04600894e..79ca8f0cd10 100644
--- a/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md
+++ b/docs/zh/engines/table-engines/integrations/embedded-rocksdb.md
@@ -39,4 +39,4 @@ ENGINE = EmbeddedRocksDB
 PRIMARY KEY key
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/embedded-rocksdb/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/hdfs.md b/docs/zh/engines/table-engines/integrations/hdfs.md
index 1a6ba0ba9e9..5948c0fa4b2 100644
--- a/docs/zh/engines/table-engines/integrations/hdfs.md
+++ b/docs/zh/engines/table-engines/integrations/hdfs.md
@@ -205,4 +205,4 @@ CREARE TABLE big_table (name String, value UInt32) ENGINE = HDFS('hdfs://hdfs1:9
 
 -   [虚拟列](../index.md#table_engines-virtual_columns)
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/hdfs/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/hdfs/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/jdbc.md b/docs/zh/engines/table-engines/integrations/jdbc.md
index 4a0ba15ed0d..170d37c64c2 100644
--- a/docs/zh/engines/table-engines/integrations/jdbc.md
+++ b/docs/zh/engines/table-engines/integrations/jdbc.md
@@ -95,4 +95,4 @@ FROM system.numbers
 
 -   [JDBC表函数](../../../sql-reference/table-functions/jdbc.md).
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/jdbc/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/jdbc/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/kafka.md b/docs/zh/engines/table-engines/integrations/kafka.md
index 0118b6795e4..6784b366e85 100644
--- a/docs/zh/engines/table-engines/integrations/kafka.md
+++ b/docs/zh/engines/table-engines/integrations/kafka.md
@@ -132,4 +132,4 @@ Kafka 特性：
 
 有关详细配置选项列表，请参阅 [librdkafka配置参考](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md)。在 ClickHouse 配置中使用下划线 (`_`) ，并不是使用点 (`.`)。例如，`check.crcs=true` 将是 `<check_crcs>true</check_crcs>`。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/kafka/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/kafka/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/materialized-postgresql.md b/docs/zh/engines/table-engines/integrations/materialized-postgresql.md
new file mode 120000
index 00000000000..c8dcba4bc19
--- /dev/null
+++ b/docs/zh/engines/table-engines/integrations/materialized-postgresql.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/materialized-postgresql.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/integrations/mongodb.md b/docs/zh/engines/table-engines/integrations/mongodb.md
index ff3fdae5b40..a91e81a26ad 100644
--- a/docs/zh/engines/table-engines/integrations/mongodb.md
+++ b/docs/zh/engines/table-engines/integrations/mongodb.md
@@ -54,4 +54,4 @@ SELECT COUNT() FROM mongo_table;
 └─────────┘
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/mongodb/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/mysql.md b/docs/zh/engines/table-engines/integrations/mysql.md
index 526e2d6f865..39a7eabda35 100644
--- a/docs/zh/engines/table-engines/integrations/mysql.md
+++ b/docs/zh/engines/table-engines/integrations/mysql.md
@@ -22,4 +22,4 @@ MySQL 引擎可以对存储在远程 MySQL 服务器上的数据执行 `SELECT`
 
 `MySQL` 引擎不支持 [可为空](../../../engines/table-engines/integrations/mysql.md) 数据类型，因此，当从MySQL表中读取数据时，`NULL` 将转换为指定列类型的默认值（通常为0或空字符串）。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/mysql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/mysql/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/odbc.md b/docs/zh/engines/table-engines/integrations/odbc.md
index 58eb2ffe94c..383bf99aed5 100644
--- a/docs/zh/engines/table-engines/integrations/odbc.md
+++ b/docs/zh/engines/table-engines/integrations/odbc.md
@@ -128,4 +128,4 @@ SELECT * FROM odbc_t
 -   [ODBC 外部字典](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC 表函数](../../../sql-reference/table-functions/odbc.md)
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/odbc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/odbc/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/postgresql.md b/docs/zh/engines/table-engines/integrations/postgresql.md
index df1e74ce763..17ca59be469 100644
--- a/docs/zh/engines/table-engines/integrations/postgresql.md
+++ b/docs/zh/engines/table-engines/integrations/postgresql.md
@@ -142,4 +142,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 <!-- -   [`postgresql` 表函数](../../../sql-reference/table-functions/postgresql.md) -->
 -   [使用 PostgreSQL 作为外部字典的来源](../../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/postgresql/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/rabbitmq.md b/docs/zh/engines/table-engines/integrations/rabbitmq.md
index a4a5be5f685..74b4e4d1f93 100644
--- a/docs/zh/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/zh/engines/table-engines/integrations/rabbitmq.md
@@ -164,4 +164,4 @@ Exchange 类型的选项:
 -   `_message_id` - 收到的消息的ID；如果在消息发布时被设置，则为非空.
 -   `_timestamp` - 收到的消息的时间戳；如果在消息发布时被设置，则为非空.
 
-[原始文章](https://clickhouse.tech/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/engines/table-engines/integrations/rabbitmq/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/integrations/sqlite.md b/docs/zh/engines/table-engines/integrations/sqlite.md
new file mode 120000
index 00000000000..56d0a490f52
--- /dev/null
+++ b/docs/zh/engines/table-engines/integrations/sqlite.md
@@ -0,0 +1 @@
+../../../../en/engines/table-engines/integrations/sqlite.md
\ No newline at end of file
diff --git a/docs/zh/engines/table-engines/log-family/index.md b/docs/zh/engines/table-engines/log-family/index.md
index c45a68b2aae..75c84409aa0 100644
--- a/docs/zh/engines/table-engines/log-family/index.md
+++ b/docs/zh/engines/table-engines/log-family/index.md
@@ -48,4 +48,4 @@ toc_priority: 29
 
 `TinyLog` 引擎是该系列中最简单的引擎并且提供了最少的功能和最低的性能。`TinyLog` 引擎不支持并行读取和并发数据访问，并将每一列存储在不同的文件中。它比其余两种支持并行读取的引擎的读取速度更慢，并且使用了和 `Log` 引擎同样多的描述符。你可以在简单的低负载的情景下使用它。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/log_family/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/log_family/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/log-family/log.md b/docs/zh/engines/table-engines/log-family/log.md
index 5d3ee38d745..c825868bcda 100644
--- a/docs/zh/engines/table-engines/log-family/log.md
+++ b/docs/zh/engines/table-engines/log-family/log.md
@@ -2,4 +2,4 @@
 
 `Log` 与 `TinyLog` 的不同之处在于，«标记» 的小文件与列文件存在一起。这些标记写在每个数据块上，并且包含偏移量，这些偏移量指示从哪里开始读取文件以便跳过指定的行数。这使得可以在多个线程中读取表数据。对于并发数据访问，可以同时执行读取操作，而写入操作则阻塞读取和其它写入。`Log`引擎不支持索引。同样，如果写入表失败，则该表将被破坏，并且从该表读取将返回错误。`Log`引擎适用于临时数据，write-once 表以及测试或演示目的。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/log/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/log/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/log-family/stripelog.md b/docs/zh/engines/table-engines/log-family/stripelog.md
index e10d9afd98d..dbb725d3a72 100644
--- a/docs/zh/engines/table-engines/log-family/stripelog.md
+++ b/docs/zh/engines/table-engines/log-family/stripelog.md
@@ -79,4 +79,4 @@ SELECT * FROM stripe_log_table ORDER BY timestamp
     │ 2019-01-18 14:34:53 │ WARNING      │ The first warning message  │
     └─────────────────────┴──────────────┴────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/stripelog/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/stripelog/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/log-family/tinylog.md b/docs/zh/engines/table-engines/log-family/tinylog.md
index bb67eaa67a5..533e5a89528 100644
--- a/docs/zh/engines/table-engines/log-family/tinylog.md
+++ b/docs/zh/engines/table-engines/log-family/tinylog.md
@@ -10,4 +10,4 @@
 
 在 Yandex.Metrica 中，TinyLog 表用于小批量处理的中间数据。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/tinylog/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/tinylog/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 03825a41f95..4fbb55c270b 100644
--- a/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -95,4 +95,4 @@ GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/aggregatingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md
index 6fb57dc19d9..09f0d2aee1d 100644
--- a/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -203,4 +203,4 @@ SELECT * FROM UAct FINAL
 
 这种查询数据的方法是非常低效的。不要在大表中使用它。
 
-[原文](https://clickhouse.tech/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
+[原文](https://clickhouse.com/docs/en/operations/table_engines/collapsingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md b/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md
index 71249e39ed2..8694fe88027 100644
--- a/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md
+++ b/docs/zh/engines/table-engines/mergetree-family/custom-partitioning-key.md
@@ -117,4 +117,4 @@ drwxr-xr-x 2 clickhouse clickhouse 4096 Feb  1 16:48 detached
 
 ClickHouse 支持对分区执行这些操作：删除分区，将分区从一个表复制到另一个表，或创建备份。了解分区的所有操作，请参阅 [分区和片段的操作](../../../sql-reference/statements/alter.md#alter_manipulations-with-partitions) 一节。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/custom_partitioning_key/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md b/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md
index fa17e0d5c5e..044ea442db3 100644
--- a/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/graphitemergetree.md
@@ -164,4 +164,4 @@ CH在处理行记录时，会检查 `pattern`节点的规则。每个 `pattern`
 </graphite_rollup>
 ```
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/graphitemergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/mergetree.md b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
index 45e080fd640..b2e240f4f19 100644
--- a/docs/zh/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/mergetree.md
@@ -58,7 +58,7 @@ ORDER BY expr
 
      如果没有使用 `PRIMARY KEY` 显式指定的主键，ClickHouse 会使用排序键作为主键。
 
-     如果不需要排序，可以使用 `ORDER BY tuple()`. 参考 [选择主键](https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#selecting-the-primary-key)
+     如果不需要排序，可以使用 `ORDER BY tuple()`. 参考 [选择主键](https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#selecting-the-primary-key)
 
 - `PARTITION BY` — [分区键](custom-partitioning-key.md) ，可选项。
 
@@ -90,7 +90,7 @@ ORDER BY expr
   - `index_granularity_bytes` — 索引粒度，以字节为单位，默认值: 10Mb。如果想要仅按数据行数限制索引粒度, 请设置为0(不建议)。
   - `min_index_granularity_bytes` - 允许的最小数据粒度，默认值：1024b。该选项用于防止误操作，添加了一个非常低索引粒度的表。参考[数据存储](#mergetree-data-storage)
   - `enable_mixed_granularity_parts` — 是否启用通过 `index_granularity_bytes` 控制索引粒度的大小。在19.11版本之前, 只有 `index_granularity` 配置能够用于限制索引粒度的大小。当从具有很大的行（几十上百兆字节）的表中查询数据时候，`index_granularity_bytes` 配置能够提升ClickHouse的性能。如果您的表里有很大的行，可以开启这项配置来提升`SELECT` 查询的性能。
-  - `use_minimalistic_part_header_in_zookeeper` — ZooKeeper中数据片段存储方式 。如果`use_minimalistic_part_header_in_zookeeper=1` ，ZooKeeper 会存储更少的数据。更多信息参考[服务配置参数]([Server Settings | ClickHouse Documentation](https://clickhouse.tech/docs/zh/operations/server-configuration-parameters/settings/))这章中的 [设置描述](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) 。
+  - `use_minimalistic_part_header_in_zookeeper` — ZooKeeper中数据片段存储方式 。如果`use_minimalistic_part_header_in_zookeeper=1` ，ZooKeeper 会存储更少的数据。更多信息参考[服务配置参数]([Server Settings | ClickHouse Documentation](https://clickhouse.com/docs/zh/operations/server-configuration-parameters/settings/))这章中的 [设置描述](../../../operations/server-configuration-parameters/settings.md#server-settings-use_minimalistic_part_header_in_zookeeper) 。
   - `min_merge_bytes_to_use_direct_io` — 使用直接 I/O 来操作磁盘的合并操作时要求的最小数据量。合并数据片段时，ClickHouse 会计算要被合并的所有数据的总存储空间。如果大小超过了 `min_merge_bytes_to_use_direct_io` 设置的字节数，则 ClickHouse 将使用直接 I/O 接口（`O_DIRECT` 选项）对磁盘读写。如果设置 `min_merge_bytes_to_use_direct_io = 0` ，则会禁用直接 I/O。默认值：`10 * 1024 * 1024 * 1024` 字节。
         <a name="mergetree_setting-merge_with_ttl_timeout"></a>
   - `merge_with_ttl_timeout` — TTL合并频率的最小间隔时间，单位：秒。默认值: 86400 (1 天)。
@@ -99,9 +99,9 @@ ORDER BY expr
   - `storage_policy` — 存储策略。 参见 [使用具有多个块的设备进行数据存储](#table_engine-mergetree-multiple-volumes).
   - `min_bytes_for_wide_part`,`min_rows_for_wide_part` 在数据片段中可以使用`Wide`格式进行存储的最小字节数/行数。您可以不设置、只设置一个，或全都设置。参考：[数据存储](#mergetree-data-storage)
   - `max_parts_in_total` - 所有分区中最大块的数量(意义不明)
-  - `max_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最大大小。您可以在全局设置中设置该值(参见[max_compress_block_size](https://clickhouse.tech/docs/zh/operations/settings/settings/#max-compress-block-size))。建表时指定该值会覆盖全局设置。
-  - `min_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最小大小。您可以在全局设置中设置该值(参见[min_compress_block_size](https://clickhouse.tech/docs/zh/operations/settings/settings/#min-compress-block-size))。建表时指定该值会覆盖全局设置。
-  - `max_partitions_to_read` - 一次查询中可访问的分区最大数。您可以在全局设置中设置该值(参见[max_partitions_to_read](https://clickhouse.tech/docs/zh/operations/settings/settings/#max_partitions_to_read))。
+  - `max_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最大大小。您可以在全局设置中设置该值(参见[max_compress_block_size](https://clickhouse.com/docs/zh/operations/settings/settings/#max-compress-block-size))。建表时指定该值会覆盖全局设置。
+  - `min_compress_block_size` - 在数据压缩写入表前，未压缩数据块的最小大小。您可以在全局设置中设置该值(参见[min_compress_block_size](https://clickhouse.com/docs/zh/operations/settings/settings/#min-compress-block-size))。建表时指定该值会覆盖全局设置。
+  - `max_partitions_to_read` - 一次查询中可访问的分区最大数。您可以在全局设置中设置该值(参见[max_partitions_to_read](https://clickhouse.com/docs/zh/operations/settings/settings/#max_partitions_to_read))。
 
 **示例配置**
 
@@ -186,7 +186,7 @@ ClickHouse 会为每个数据片段创建一个索引文件来存储这些标记
 
 ClickHouse 不要求主键唯一，所以您可以插入多条具有相同主键的行。
 
-您可以在`PRIMARY KEY`与`ORDER BY`条件中使用`可为空的`类型的表达式，但强烈建议不要这么做。为了启用这项功能，请打开[allow_nullable_key](https://clickhouse.tech/docs/zh/operations/settings/settings/#allow-nullable-key)，[NULLS_LAST](https://clickhouse.tech/docs/zh/sql-reference/statements/select/order-by/#sorting-of-special-values)规则也适用于`ORDER BY`条件中有NULL值的情况下。
+您可以在`PRIMARY KEY`与`ORDER BY`条件中使用`可为空的`类型的表达式，但强烈建议不要这么做。为了启用这项功能，请打开[allow_nullable_key](https://clickhouse.com/docs/zh/operations/settings/settings/#allow-nullable-key)，[NULLS_LAST](https://clickhouse.com/docs/zh/sql-reference/statements/select/order-by/#sorting-of-special-values)规则也适用于`ORDER BY`条件中有NULL值的情况下。
 
 ### 主键的选择 {#zhu-jian-de-xuan-ze}
 
@@ -543,7 +543,7 @@ MergeTree 系列表引擎可以将数据存储在多个块设备上。这对某
 - 卷 — 相同磁盘的顺序列表 （类似于 [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures)）
 - 存储策略 — 卷的集合及他们之间的数据移动规则
 
- 以上名称的信息在Clickhouse中系统表[system.storage_policies](https://clickhouse.tech/docs/zh/operations/system-tables/storage_policies/#system_tables-storage_policies)和[system.disks](https://clickhouse.tech/docs/zh/operations/system-tables/disks/#system_tables-disks)体现。为了应用存储策略，可以在建表时使用`storage_policy`设置。
+ 以上名称的信息在Clickhouse中系统表[system.storage_policies](https://clickhouse.com/docs/zh/operations/system-tables/storage_policies/#system_tables-storage_policies)和[system.disks](https://clickhouse.com/docs/zh/operations/system-tables/disks/#system_tables-disks)体现。为了应用存储策略，可以在建表时使用`storage_policy`设置。
 
 ### 配置 {#table_engine-mergetree-multiple-volumes_configure}
 
@@ -809,4 +809,4 @@ S3磁盘也可以设置冷热存储：
 
 指定了`cold`选项后，本地磁盘剩余空间如果小于`move_factor * disk_size`，或有TTL设置时，数据就会定时迁移至S3了。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/mergetree/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/mergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md
index 75ec4ea8b3d..b6815f62405 100644
--- a/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/replacingmergetree.md
@@ -58,4 +58,4 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 </details>
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/replacingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/replication.md b/docs/zh/engines/table-engines/mergetree-family/replication.md
index a4d03e8da36..2e6391c01dd 100644
--- a/docs/zh/engines/table-engines/mergetree-family/replication.md
+++ b/docs/zh/engines/table-engines/mergetree-family/replication.md
@@ -199,4 +199,4 @@ sudo -u clickhouse touch /var/lib/clickhouse/flags/force_restore_data
 
 如果 ZooKeeper 中的数据丢失或损坏，如上所述，你可以通过将数据转移到非复制表来保存数据。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/replication/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/replication/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md
index d05e718c59b..e59c3907811 100644
--- a/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/summingmergetree.md
@@ -121,4 +121,4 @@ ClickHouse 会按片段合并数据，以至于不同的数据片段中会包含
 
 对于嵌套数据结构，你无需在列的元组中指定列以进行汇总。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/summingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md b/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
index 8479c92f56f..b81d2206bf4 100644
--- a/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
+++ b/docs/zh/engines/table-engines/mergetree-family/versionedcollapsingmergetree.md
@@ -233,4 +233,4 @@ SELECT * FROM UAct FINAL
 
 这是一个非常低效的方式来选择数据。 不要把它用于数据量大的表。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/versionedcollapsingmergetree/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/buffer.md b/docs/zh/engines/table-engines/special/buffer.md
index 253aba2382a..5c48d54676e 100644
--- a/docs/zh/engines/table-engines/special/buffer.md
+++ b/docs/zh/engines/table-engines/special/buffer.md
@@ -50,4 +50,4 @@ PREWHERE，FINAL 和 SAMPLE 对缓冲表不起作用。这些条件将传递到
 
 请注意，一次插入一行数据是没有意义的，即使对于 Buffer 表也是如此。这将只产生每秒几千行的速度，而插入更大的数据块每秒可以产生超过一百万行（参见 «性能» 部分）。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/buffer/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/buffer/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/dictionary.md b/docs/zh/engines/table-engines/special/dictionary.md
index 4908276ef97..50aa5f917d7 100644
--- a/docs/zh/engines/table-engines/special/dictionary.md
+++ b/docs/zh/engines/table-engines/special/dictionary.md
@@ -98,4 +98,4 @@ LIMIT 1
 
     1 rows in set. Elapsed: 0.006 sec.
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/dictionary/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/dictionary/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/distributed.md b/docs/zh/engines/table-engines/special/distributed.md
index 2ee17c13fae..f24d509f151 100644
--- a/docs/zh/engines/table-engines/special/distributed.md
+++ b/docs/zh/engines/table-engines/special/distributed.md
@@ -117,4 +117,4 @@ SELECT 查询会被发送到所有分片，并且无论数据在分片中如何
 
 启用 max_parallel_replicas 选项后，会在分表的所有副本上并行查询处理。更多信息，请参阅«设置，max_parallel_replicas»部分。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/distributed/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/distributed/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/external-data.md b/docs/zh/engines/table-engines/special/external-data.md
index a07a9cda67e..ed44d7ce3b7 100644
--- a/docs/zh/engines/table-engines/special/external-data.md
+++ b/docs/zh/engines/table-engines/special/external-data.md
@@ -58,4 +58,4 @@ curl -F 'passwd=@passwd.tsv;' 'http://localhost:8123/?query=SELECT+shell,+count(
 
 对于分布式查询，将临时表发送到所有远程服务器。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/external_data/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/external_data/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/file.md b/docs/zh/engines/table-engines/special/file.md
index 4464dcf198c..ce4a43bba3f 100644
--- a/docs/zh/engines/table-engines/special/file.md
+++ b/docs/zh/engines/table-engines/special/file.md
@@ -70,4 +70,4 @@ $ echo -e "1,2\n3,4" | clickhouse-local -q "CREATE TABLE table (a Int64, b Int64
     -   索引
     -   副本
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/file/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/file/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/generate.md b/docs/zh/engines/table-engines/special/generate.md
index 885ad381d7f..bae981ac468 100644
--- a/docs/zh/engines/table-engines/special/generate.md
+++ b/docs/zh/engines/table-engines/special/generate.md
@@ -54,4 +54,4 @@ SELECT * FROM generate_engine_table LIMIT 3
     -   Indices
     -   Replication
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/generate/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/generate/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/join.md b/docs/zh/engines/table-engines/special/join.md
index 35a50c1a54d..36f5ca6134b 100644
--- a/docs/zh/engines/table-engines/special/join.md
+++ b/docs/zh/engines/table-engines/special/join.md
@@ -112,4 +112,4 @@ SELECT joinGet('id_val_join', 'val', toUInt32(1))
 如果服务器非正常重启，保存在硬盘上的数据块会丢失或被损坏。这种情况下，需要手动删除被损坏的数据文件。
 
 
-[原始文档](https://clickhouse.tech/docs/en/operations/table_engines/join/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/operations/table_engines/join/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/materializedview.md b/docs/zh/engines/table-engines/special/materializedview.md
index 21c4008a158..d4c678839b6 100644
--- a/docs/zh/engines/table-engines/special/materializedview.md
+++ b/docs/zh/engines/table-engines/special/materializedview.md
@@ -2,4 +2,4 @@
 
 物化视图的使用（更多信息请参阅 [CREATE TABLE](../../../sql-reference/statements/create.md#create-table-query) ）。它需要使用一个不同的引擎来存储数据，这个引擎要在创建物化视图时指定。当从表中读取时，它就会使用该引擎。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/materializedview/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/materializedview/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/memory.md b/docs/zh/engines/table-engines/special/memory.md
index becf0f3b04f..2e880934652 100644
--- a/docs/zh/engines/table-engines/special/memory.md
+++ b/docs/zh/engines/table-engines/special/memory.md
@@ -4,4 +4,4 @@ Memory 引擎以未压缩的形式将数据存储在 RAM 中。数据完全以
 
 Memory 引擎是由系统用于临时表进行外部数据的查询（请参阅 «外部数据用于请求处理» 部分），以及用于实现 `GLOBAL IN`（请参见 «IN 运算符» 部分）。
 
-[原始文章](https://clickhouse.tech/docs/zh/operations/table_engines/memory/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/operations/table_engines/memory/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/merge.md b/docs/zh/engines/table-engines/special/merge.md
index 839842e108f..c29a600bef6 100644
--- a/docs/zh/engines/table-engines/special/merge.md
+++ b/docs/zh/engines/table-engines/special/merge.md
@@ -60,4 +60,4 @@
 
 如果 `WHERE/PREWHERE` 子句包含了带 `_table` 的条件，并且没有依赖其他的列（如作为表达式谓词链接的一个子项或作为整个的表达式），这些条件的作用会像索引一样。这些条件会在那些可能被读数据的表的表名上执行，并且读操作只会在那些满足了该条件的表上去执行。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/merge/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/merge/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/null.md b/docs/zh/engines/table-engines/special/null.md
index c9fee734f1a..60b91109abe 100644
--- a/docs/zh/engines/table-engines/special/null.md
+++ b/docs/zh/engines/table-engines/special/null.md
@@ -4,4 +4,4 @@
 
 但是，可以在 Null 类型的表上创建物化视图。写入表的数据将转发到视图中。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/null/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/null/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/set.md b/docs/zh/engines/table-engines/special/set.md
index a4fd0d85bd1..ae522221c14 100644
--- a/docs/zh/engines/table-engines/special/set.md
+++ b/docs/zh/engines/table-engines/special/set.md
@@ -8,4 +8,4 @@
 
 对于强制服务器重启，磁盘上的数据块可能会丢失或损坏。在数据块损坏的情况下，可能需要手动删除包含损坏数据的文件。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/set/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/set/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/url.md b/docs/zh/engines/table-engines/special/url.md
index 9e0b953043e..41dd887d20a 100644
--- a/docs/zh/engines/table-engines/special/url.md
+++ b/docs/zh/engines/table-engines/special/url.md
@@ -68,4 +68,4 @@ SELECT * FROM url_engine_table
     -   索引。
     -   副本。
 
-[来源文章](https://clickhouse.tech/docs/en/operations/table_engines/url/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/operations/table_engines/url/) <!--hide-->
diff --git a/docs/zh/engines/table-engines/special/view.md b/docs/zh/engines/table-engines/special/view.md
index e2dca177e4e..fde72ce85b0 100644
--- a/docs/zh/engines/table-engines/special/view.md
+++ b/docs/zh/engines/table-engines/special/view.md
@@ -2,4 +2,4 @@
 
 用于构建视图（有关更多信息，请参阅 `CREATE VIEW 查询`）。 它不存储数据，仅存储指定的 `SELECT` 查询。 从表中读取时，它会运行此查询（并从查询中删除所有不必要的列）。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/table_engines/view/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/table_engines/view/) <!--hide-->
diff --git a/docs/zh/faq/general.md b/docs/zh/faq/general.md
index 68053330405..05dad567195 100644
--- a/docs/zh/faq/general.md
+++ b/docs/zh/faq/general.md
@@ -16,4 +16,4 @@
 
     NLS_LANG=CHINESE_CHINA.ZHS16GBK
 
-[来源文章](https://clickhouse.tech/docs/zh/faq/general/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/faq/general/) <!--hide-->
diff --git a/docs/zh/faq/general/columnar-database.md b/docs/zh/faq/general/columnar-database.md
new file mode 120000
index 00000000000..b7557b62010
--- /dev/null
+++ b/docs/zh/faq/general/columnar-database.md
@@ -0,0 +1 @@
+../../../en/faq/general/columnar-database.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/dbms-naming.md b/docs/zh/faq/general/dbms-naming.md
new file mode 120000
index 00000000000..0df856af0ca
--- /dev/null
+++ b/docs/zh/faq/general/dbms-naming.md
@@ -0,0 +1 @@
+../../../en/faq/general/dbms-naming.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/index.md b/docs/zh/faq/general/index.md
new file mode 120000
index 00000000000..5ff33ccb360
--- /dev/null
+++ b/docs/zh/faq/general/index.md
@@ -0,0 +1 @@
+../../../en/faq/general/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/mapreduce.md b/docs/zh/faq/general/mapreduce.md
new file mode 120000
index 00000000000..49b79ad4841
--- /dev/null
+++ b/docs/zh/faq/general/mapreduce.md
@@ -0,0 +1 @@
+../../../en/faq/general/mapreduce.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/ne-tormozit.md b/docs/zh/faq/general/ne-tormozit.md
new file mode 120000
index 00000000000..a8273c56b2d
--- /dev/null
+++ b/docs/zh/faq/general/ne-tormozit.md
@@ -0,0 +1 @@
+../../../en/faq/general/ne-tormozit.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/olap.md b/docs/zh/faq/general/olap.md
new file mode 120000
index 00000000000..99caa8218c8
--- /dev/null
+++ b/docs/zh/faq/general/olap.md
@@ -0,0 +1 @@
+../../../en/faq/general/olap.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/who-is-using-clickhouse.md b/docs/zh/faq/general/who-is-using-clickhouse.md
new file mode 120000
index 00000000000..b4e9782df7e
--- /dev/null
+++ b/docs/zh/faq/general/who-is-using-clickhouse.md
@@ -0,0 +1 @@
+../../../en/faq/general/who-is-using-clickhouse.md
\ No newline at end of file
diff --git a/docs/zh/faq/general/why-clickhouse-is-so-fast.md b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
new file mode 120000
index 00000000000..77b8c3fcd68
--- /dev/null
+++ b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
@@ -0,0 +1 @@
+../../../en/faq/general/why-clickhouse-is-so-fast.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/file-export.md b/docs/zh/faq/integration/file-export.md
new file mode 120000
index 00000000000..19a5c67148b
--- /dev/null
+++ b/docs/zh/faq/integration/file-export.md
@@ -0,0 +1 @@
+../../../en/faq/integration/file-export.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/index.md b/docs/zh/faq/integration/index.md
new file mode 120000
index 00000000000..8323d6218a3
--- /dev/null
+++ b/docs/zh/faq/integration/index.md
@@ -0,0 +1 @@
+../../../en/faq/integration/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/json-import.md b/docs/zh/faq/integration/json-import.md
new file mode 120000
index 00000000000..e90f4386602
--- /dev/null
+++ b/docs/zh/faq/integration/json-import.md
@@ -0,0 +1 @@
+../../../en/faq/integration/json-import.md
\ No newline at end of file
diff --git a/docs/zh/faq/integration/oracle-odbc.md b/docs/zh/faq/integration/oracle-odbc.md
new file mode 120000
index 00000000000..47fe6189ee3
--- /dev/null
+++ b/docs/zh/faq/integration/oracle-odbc.md
@@ -0,0 +1 @@
+../../../en/faq/integration/oracle-odbc.md
\ No newline at end of file
diff --git a/docs/zh/faq/operations/delete-old-data.md b/docs/zh/faq/operations/delete-old-data.md
new file mode 120000
index 00000000000..aef26953cd3
--- /dev/null
+++ b/docs/zh/faq/operations/delete-old-data.md
@@ -0,0 +1 @@
+../../../en/faq/operations/delete-old-data.md
\ No newline at end of file
diff --git a/docs/zh/faq/operations/index.md b/docs/zh/faq/operations/index.md
new file mode 120000
index 00000000000..fd141164fdc
--- /dev/null
+++ b/docs/zh/faq/operations/index.md
@@ -0,0 +1 @@
+../../../en/faq/operations/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/operations/production.md b/docs/zh/faq/operations/production.md
new file mode 120000
index 00000000000..8203988975c
--- /dev/null
+++ b/docs/zh/faq/operations/production.md
@@ -0,0 +1 @@
+../../../en/faq/operations/production.md
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/index.md b/docs/zh/faq/use-cases/index.md
new file mode 120000
index 00000000000..cc545acb000
--- /dev/null
+++ b/docs/zh/faq/use-cases/index.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/index.md
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/key-value.md b/docs/zh/faq/use-cases/key-value.md
new file mode 120000
index 00000000000..63140458d12
--- /dev/null
+++ b/docs/zh/faq/use-cases/key-value.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/key-value.md
\ No newline at end of file
diff --git a/docs/zh/faq/use-cases/time-series.md b/docs/zh/faq/use-cases/time-series.md
new file mode 120000
index 00000000000..55cbcfc243f
--- /dev/null
+++ b/docs/zh/faq/use-cases/time-series.md
@@ -0,0 +1 @@
+../../../en/faq/use-cases/time-series.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/amplab-benchmark.md b/docs/zh/getting-started/example-datasets/amplab-benchmark.md
index 22f2735968b..0feb4f7c371 100644
--- a/docs/zh/getting-started/example-datasets/amplab-benchmark.md
+++ b/docs/zh/getting-started/example-datasets/amplab-benchmark.md
@@ -124,4 +124,4 @@ ORDER BY totalRevenue DESC
 LIMIT 1
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/amplab_benchmark/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/brown-benchmark.md b/docs/zh/getting-started/example-datasets/brown-benchmark.md
new file mode 120000
index 00000000000..1f6e2be14fa
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/brown-benchmark.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/brown-benchmark.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/cell-towers.md b/docs/zh/getting-started/example-datasets/cell-towers.md
new file mode 120000
index 00000000000..899946803d1
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/cell-towers.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/cell-towers.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/criteo.md b/docs/zh/getting-started/example-datasets/criteo.md
index 40ca1b4a781..ecc643bc576 100644
--- a/docs/zh/getting-started/example-datasets/criteo.md
+++ b/docs/zh/getting-started/example-datasets/criteo.md
@@ -76,4 +76,4 @@ INSERT INTO criteo SELECT date, clicked, int1, int2, int3, int4, int5, int6, int
 DROP TABLE criteo_log;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/criteo/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/github-events.md b/docs/zh/getting-started/example-datasets/github-events.md
new file mode 120000
index 00000000000..c9649c0a61f
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/github-events.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/github-events.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/index.md b/docs/zh/getting-started/example-datasets/index.md
index acd554ca4da..e85796f6e96 100644
--- a/docs/zh/getting-started/example-datasets/index.md
+++ b/docs/zh/getting-started/example-datasets/index.md
@@ -18,4 +18,4 @@ toc_title: "\u5BFC\u8A00"
 -   [New York Taxi Data](../../getting-started/example-datasets/nyc-taxi.md)
 -   [OnTime](../../getting-started/example-datasets/ontime.md)
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/menus.md b/docs/zh/getting-started/example-datasets/menus.md
new file mode 120000
index 00000000000..d82b3198962
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/menus.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/menus.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/metrica.md b/docs/zh/getting-started/example-datasets/metrica.md
index 62ba28a92ef..d91e8ce232c 100644
--- a/docs/zh/getting-started/example-datasets/metrica.md
+++ b/docs/zh/getting-started/example-datasets/metrica.md
@@ -7,14 +7,14 @@ toc_title: Yandex.Metrica Data
 
 数据集由两个表组成，包含关于Yandex.Metrica的hits(`hits_v1`)和visit(`visits_v1`)的匿名数据。你可以阅读更多关于Yandex的信息。在[ClickHouse历史](../../introduction/history.md)的Metrica部分。
 
-数据集由两个表组成，他们中的任何一个都可以下载作为一个压缩`tsv.xz`的文件或准备的分区。除此之外,一个扩展版的`hits`表包含1亿行TSV在https://datasets.clickhouse.tech/hits/tsv/hits_100m_obfuscated_v1.tsv.xz，准备分区在https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz。
+数据集由两个表组成，他们中的任何一个都可以下载作为一个压缩`tsv.xz`的文件或准备的分区。除此之外,一个扩展版的`hits`表包含1亿行TSV在https://datasets.clickhouse.com/hits/tsv/hits_100m_obfuscated_v1.tsv.xz，准备分区在https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz。
 
 ## 从准备好的分区获取表 {#obtaining-tables-from-prepared-partitions}
 
 下载和导入`hits`表:
 
 ``` bash
-curl -O https://datasets.clickhouse.tech/hits/partitions/hits_v1.tar
+curl -O https://datasets.clickhouse.com/hits/partitions/hits_v1.tar
 tar xvf hits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 # check permissions on unpacked data, fix if required
 sudo service clickhouse-server restart
@@ -24,7 +24,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 下载和导入`visits`表:
 
 ``` bash
-curl -O https://datasets.clickhouse.tech/visits/partitions/visits_v1.tar
+curl -O https://datasets.clickhouse.com/visits/partitions/visits_v1.tar
 tar xvf visits_v1.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 # check permissions on unpacked data, fix if required
 sudo service clickhouse-server restart
@@ -36,7 +36,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.visits_v1"
 从TSV压缩文件下载并导入`hits`:
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
 # now create table
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
 clickhouse-client --query "CREATE TABLE datasets.hits_v1 ( WatchID UInt64,  JavaEnable UInt8,  Title String,  GoodEvent Int16,  EventTime DateTime,  EventDate Date,  CounterID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RegionID UInt32,  UserID UInt64,  CounterClass Int8,  OS UInt8,  UserAgent UInt8,  URL String,  Referer String,  URLDomain String,  RefererDomain String,  Refresh UInt8,  IsRobot UInt8,  RefererCategories Array(UInt16),  URLCategories Array(UInt16), URLRegions Array(UInt32),  RefererRegions Array(UInt32),  ResolutionWidth UInt16,  ResolutionHeight UInt16,  ResolutionDepth UInt8,  FlashMajor UInt8, FlashMinor UInt8,  FlashMinor2 String,  NetMajor UInt8,  NetMinor UInt8, UserAgentMajor UInt16,  UserAgentMinor FixedString(2),  CookieEnable UInt8, JavascriptEnable UInt8,  IsMobile UInt8,  MobilePhone UInt8,  MobilePhoneModel String,  Params String,  IPNetworkID UInt32,  TraficSourceID Int8, SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  IsArtifical UInt8,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  ClientTimeZone Int16,  ClientEventTime DateTime,  SilverlightVersion1 UInt8, SilverlightVersion2 UInt8,  SilverlightVersion3 UInt32,  SilverlightVersion4 UInt16,  PageCharset String,  CodeVersion UInt32,  IsLink UInt8,  IsDownload UInt8,  IsNotBounce UInt8,  FUniqID UInt64,  HID UInt32,  IsOldCounter UInt8, IsEvent UInt8,  IsParameter UInt8,  DontCountHits UInt8,  WithHash UInt8, HitColor FixedString(1),  UTCEventTime DateTime,  Age UInt8,  Sex UInt8,  Income UInt8,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16), RemoteIP UInt32,  RemoteIP6 FixedString(16),  WindowName Int32,  OpenerName Int32,  HistoryLength Int16,  BrowserLanguage FixedString(2),  BrowserCountry FixedString(2),  SocialNetwork String,  SocialAction String,  HTTPError UInt16, SendTiming Int32,  DNSTiming Int32,  ConnectTiming Int32,  ResponseStartTiming Int32,  ResponseEndTiming Int32,  FetchTiming Int32,  RedirectTiming Int32, DOMInteractiveTiming Int32,  DOMContentLoadedTiming Int32,  DOMCompleteTiming Int32,  LoadEventStartTiming Int32,  LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32,  FirstPaintTiming Int32,  RedirectCount Int8, SocialSourceNetworkID UInt8,  SocialSourcePage String,  ParamPrice Int64, ParamOrderID String,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16, GoalsReached Array(UInt32),  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String, UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String, FromTag String,  HasGCLID UInt8,  RefererHash UInt64,  URLHash UInt64,  CLID UInt32,  YCLID UInt64,  ShareService String,  ShareURL String,  ShareTitle String,  ParsedParams Nested(Key1 String,  Key2 String, Key3 String, Key4 String, Key5 String,  ValueDouble Float64),  IslandID FixedString(16),  RequestNum UInt32,  RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
@@ -50,7 +50,7 @@ clickhouse-client --query "SELECT COUNT(*) FROM datasets.hits_v1"
 从压缩tsv文件下载和导入`visits`:
 
 ``` bash
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 # now create table
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS datasets"
 clickhouse-client --query "CREATE TABLE datasets.visits_v1 ( CounterID UInt32,  StartDate Date,  Sign Int8,  IsNew UInt8,  VisitID UInt64,  UserID UInt64,  StartTime DateTime,  Duration UInt32,  UTCStartTime DateTime,  PageViews Int32,  Hits Int32,  IsBounce UInt8,  Referer String,  StartURL String,  RefererDomain String,  StartURLDomain String,  EndURL String,  LinkURL String,  IsDownload UInt8,  TraficSourceID Int8,  SearchEngineID UInt16,  SearchPhrase String,  AdvEngineID UInt8,  PlaceID Int32,  RefererCategories Array(UInt16),  URLCategories Array(UInt16),  URLRegions Array(UInt32),  RefererRegions Array(UInt32),  IsYandex UInt8,  GoalReachesDepth Int32,  GoalReachesURL Int32,  GoalReachesAny Int32,  SocialSourceNetworkID UInt8,  SocialSourcePage String,  MobilePhoneModel String,  ClientEventTime DateTime,  RegionID UInt32,  ClientIP UInt32,  ClientIP6 FixedString(16),  RemoteIP UInt32,  RemoteIP6 FixedString(16),  IPNetworkID UInt32,  SilverlightVersion3 UInt32,  CodeVersion UInt32,  ResolutionWidth UInt16,  ResolutionHeight UInt16,  UserAgentMajor UInt16,  UserAgentMinor UInt16,  WindowClientWidth UInt16,  WindowClientHeight UInt16,  SilverlightVersion2 UInt8,  SilverlightVersion4 UInt16,  FlashVersion3 UInt16,  FlashVersion4 UInt16,  ClientTimeZone Int16,  OS UInt8,  UserAgent UInt8,  ResolutionDepth UInt8,  FlashMajor UInt8,  FlashMinor UInt8,  NetMajor UInt8,  NetMinor UInt8,  MobilePhone UInt8,  SilverlightVersion1 UInt8,  Age UInt8,  Sex UInt8,  Income UInt8,  JavaEnable UInt8,  CookieEnable UInt8,  JavascriptEnable UInt8,  IsMobile UInt8,  BrowserLanguage UInt16,  BrowserCountry UInt16,  Interests UInt16,  Robotness UInt8,  GeneralInterests Array(UInt16),  Params Array(String),  Goals Nested(ID UInt32, Serial UInt32, EventTime DateTime,  Price Int64,  OrderID String, CurrencyID UInt32),  WatchIDs Array(UInt64),  ParamSumPrice Int64,  ParamCurrency FixedString(3),  ParamCurrencyID UInt16,  ClickLogID UInt64,  ClickEventID Int32,  ClickGoodEvent Int32,  ClickEventTime DateTime,  ClickPriorityID Int32,  ClickPhraseID Int32,  ClickPageID Int32,  ClickPlaceID Int32,  ClickTypeID Int32,  ClickResourceID Int32,  ClickCost UInt32,  ClickClientIP UInt32,  ClickDomainID UInt32,  ClickURL String,  ClickAttempt UInt8,  ClickOrderID UInt32,  ClickBannerID UInt32,  ClickMarketCategoryID UInt32,  ClickMarketPP UInt32,  ClickMarketCategoryName String,  ClickMarketPPName String,  ClickAWAPSCampaignName String,  ClickPageName String,  ClickTargetType UInt16,  ClickTargetPhraseID UInt64,  ClickContextType UInt8,  ClickSelectType Int8,  ClickOptions String,  ClickGroupBannerID Int32,  OpenstatServiceName String,  OpenstatCampaignID String,  OpenstatAdID String,  OpenstatSourceID String,  UTMSource String,  UTMMedium String,  UTMCampaign String,  UTMContent String,  UTMTerm String,  FromTag String,  HasGCLID UInt8,  FirstVisit DateTime,  PredLastVisit Date,  LastVisit Date,  TotalVisits UInt32,  TraficSource    Nested(ID Int8,  SearchEngineID UInt16, AdvEngineID UInt8, PlaceID UInt16, SocialSourceNetworkID UInt8, Domain String, SearchPhrase String, SocialSourcePage String),  Attendance FixedString(16),  CLID UInt32,  YCLID UInt64,  NormalizedRefererHash UInt64,  SearchPhraseHash UInt64,  RefererDomainHash UInt64,  NormalizedStartURLHash UInt64,  StartURLDomainHash UInt64,  NormalizedEndURLHash UInt64,  TopLevelDomain UInt64,  URLScheme UInt64,  OpenstatServiceNameHash UInt64,  OpenstatCampaignIDHash UInt64,  OpenstatAdIDHash UInt64,  OpenstatSourceIDHash UInt64,  UTMSourceHash UInt64,  UTMMediumHash UInt64,  UTMCampaignHash UInt64,  UTMContentHash UInt64,  UTMTermHash UInt64,  FromHash UInt64,  WebVisorEnabled UInt8,  WebVisorActivity UInt32,  ParsedParams    Nested(Key1 String,  Key2 String,  Key3 String,  Key4 String, Key5 String, ValueDouble    Float64),  Market Nested(Type UInt8, GoalID UInt32, OrderID String,  OrderPrice Int64,  PP UInt32,  DirectPlaceID UInt32,  DirectOrderID  UInt32,  DirectBannerID UInt32,  GoodID String, GoodName String, GoodQuantity Int32,  GoodPrice Int64),  IslandID FixedString(16)) ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192"
diff --git a/docs/zh/getting-started/example-datasets/nyc-taxi.md b/docs/zh/getting-started/example-datasets/nyc-taxi.md
index 0e4ff67d6e7..b10fe931c20 100644
--- a/docs/zh/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/zh/getting-started/example-datasets/nyc-taxi.md
@@ -283,7 +283,7 @@ SELECT formatReadableSize(sum(bytes)) FROM system.parts WHERE table = 'trips_mer
 ## 下载预处理好的分区数据 {#xia-zai-yu-chu-li-hao-de-fen-qu-shu-ju}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/trips_mergetree/partitions/trips_mergetree.tar
+$ curl -O https://datasets.clickhouse.com/trips_mergetree/partitions/trips_mergetree.tar
 $ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 $ # check permissions of unpacked data, fix if required
 $ sudo service clickhouse-server restart
@@ -385,4 +385,4 @@ Q4：0.072秒。
 | 3      | 0.212 | 0.438 | 0.733 | 1.241 |
 | 140    | 0.028 | 0.043 | 0.051 | 0.072 |
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/nyc_taxi/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/ontime.md b/docs/zh/getting-started/example-datasets/ontime.md
index 6d888b2196c..03a9a8c4278 100644
--- a/docs/zh/getting-started/example-datasets/ontime.md
+++ b/docs/zh/getting-started/example-datasets/ontime.md
@@ -155,7 +155,7 @@ ls -1 *.zip | xargs -I{} -P $(nproc) bash -c "echo {}; unzip -cq {} '*.csv' | se
 ## 下载预处理好的分区数据 {#xia-zai-yu-chu-li-hao-de-fen-qu-shu-ju}
 
 ``` bash
-$ curl -O https://datasets.clickhouse.tech/ontime/partitions/ontime.tar
+$ 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
@@ -408,4 +408,4 @@ LIMIT 10;
 -   https://www.percona.com/blog/2016/01/07/apache-spark-with-air-ontime-performance-data/
 -   http://nickmakos.blogspot.ru/2012/08/analyzing-air-traffic-performance-with.html
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/ontime/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/opensky.md b/docs/zh/getting-started/example-datasets/opensky.md
new file mode 120000
index 00000000000..4305c0cac3c
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/opensky.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/opensky.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/recipes.md b/docs/zh/getting-started/example-datasets/recipes.md
new file mode 120000
index 00000000000..4fdaa5de5b8
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/recipes.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/recipes.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/star-schema.md b/docs/zh/getting-started/example-datasets/star-schema.md
index fcb6e90c694..aa2c259d6ad 100644
--- a/docs/zh/getting-started/example-datasets/star-schema.md
+++ b/docs/zh/getting-started/example-datasets/star-schema.md
@@ -7,7 +7,7 @@ toc_title: Star Schema Benchmark
 
 编译 dbgen:
 
-``` bash
+```bash
 $ git clone git@github.com:vadimtk/ssb-dbgen.git
 $ cd ssb-dbgen
 $ make
@@ -16,9 +16,9 @@ $ make
 开始生成数据：
 
 !!! warning "注意"
-    使用`-s 100`dbgen将生成6亿行数据(67GB), 如果使用`-s 1000`它会生成60亿行数据(这需要很多时间))
+使用`-s 100`dbgen 将生成 6 亿行数据(67GB), 如果使用`-s 1000`它会生成 60 亿行数据(这需要很多时间))
 
-``` bash
+```bash
 $ ./dbgen -s 1000 -T c
 $ ./dbgen -s 1000 -T l
 $ ./dbgen -s 1000 -T p
@@ -26,9 +26,9 @@ $ ./dbgen -s 1000 -T s
 $ ./dbgen -s 1000 -T d
 ```
 
-在ClickHouse中创建数据表：
+在 ClickHouse 中创建数据表：
 
-``` sql
+```sql
 CREATE TABLE customer
 (
         C_CUSTKEY       UInt32,
@@ -93,7 +93,7 @@ ENGINE = MergeTree ORDER BY S_SUPPKEY;
 
 写入数据：
 
-``` bash
+```bash
 $ clickhouse-client --query "INSERT INTO customer FORMAT CSV" < customer.tbl
 $ clickhouse-client --query "INSERT INTO part FORMAT CSV" < part.tbl
 $ clickhouse-client --query "INSERT INTO supplier FORMAT CSV" < supplier.tbl
@@ -102,100 +102,267 @@ $ clickhouse-client --query "INSERT INTO lineorder FORMAT CSV" < lineorder.tbl
 
 将`star schema`转换为`flat schema`：
 
-``` sql
-SET max_memory_usage = 20000000000, allow_experimental_multiple_joins_emulation = 1;
+```sql
+SET max_memory_usage = 20000000000;
 
 CREATE TABLE lineorder_flat
 ENGINE = MergeTree
 PARTITION BY toYear(LO_ORDERDATE)
 ORDER BY (LO_ORDERDATE, LO_ORDERKEY) AS
-SELECT l.*, c.*, s.*, p.*
-FROM lineorder l
- ANY INNER JOIN customer c ON (c.C_CUSTKEY = l.LO_CUSTKEY)
- ANY INNER JOIN supplier s ON (s.S_SUPPKEY = l.LO_SUPPKEY)
- ANY INNER JOIN part p ON  (p.P_PARTKEY = l.LO_PARTKEY);
-
-ALTER TABLE lineorder_flat DROP COLUMN C_CUSTKEY, DROP COLUMN S_SUPPKEY, DROP COLUMN P_PARTKEY;
+SELECT
+    l.LO_ORDERKEY AS LO_ORDERKEY,
+    l.LO_LINENUMBER AS LO_LINENUMBER,
+    l.LO_CUSTKEY AS LO_CUSTKEY,
+    l.LO_PARTKEY AS LO_PARTKEY,
+    l.LO_SUPPKEY AS LO_SUPPKEY,
+    l.LO_ORDERDATE AS LO_ORDERDATE,
+    l.LO_ORDERPRIORITY AS LO_ORDERPRIORITY,
+    l.LO_SHIPPRIORITY AS LO_SHIPPRIORITY,
+    l.LO_QUANTITY AS LO_QUANTITY,
+    l.LO_EXTENDEDPRICE AS LO_EXTENDEDPRICE,
+    l.LO_ORDTOTALPRICE AS LO_ORDTOTALPRICE,
+    l.LO_DISCOUNT AS LO_DISCOUNT,
+    l.LO_REVENUE AS LO_REVENUE,
+    l.LO_SUPPLYCOST AS LO_SUPPLYCOST,
+    l.LO_TAX AS LO_TAX,
+    l.LO_COMMITDATE AS LO_COMMITDATE,
+    l.LO_SHIPMODE AS LO_SHIPMODE,
+    c.C_NAME AS C_NAME,
+    c.C_ADDRESS AS C_ADDRESS,
+    c.C_CITY AS C_CITY,
+    c.C_NATION AS C_NATION,
+    c.C_REGION AS C_REGION,
+    c.C_PHONE AS C_PHONE,
+    c.C_MKTSEGMENT AS C_MKTSEGMENT,
+    s.S_NAME AS S_NAME,
+    s.S_ADDRESS AS S_ADDRESS,
+    s.S_CITY AS S_CITY,
+    s.S_NATION AS S_NATION,
+    s.S_REGION AS S_REGION,
+    s.S_PHONE AS S_PHONE,
+    p.P_NAME AS P_NAME,
+    p.P_MFGR AS P_MFGR,
+    p.P_CATEGORY AS P_CATEGORY,
+    p.P_BRAND AS P_BRAND,
+    p.P_COLOR AS P_COLOR,
+    p.P_TYPE AS P_TYPE,
+    p.P_SIZE AS P_SIZE,
+    p.P_CONTAINER AS P_CONTAINER
+FROM lineorder AS l
+INNER JOIN customer AS c ON c.C_CUSTKEY = l.LO_CUSTKEY
+INNER JOIN supplier AS s ON s.S_SUPPKEY = l.LO_SUPPKEY
+INNER JOIN part AS p ON p.P_PARTKEY = l.LO_PARTKEY;
 ```
 
 运行查询:
 
 Q1.1
 
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toYear(LO_ORDERDATE) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;
+```sql
+SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
+FROM lineorder_flat
+WHERE toYear(LO_ORDERDATE) = 1993 AND LO_DISCOUNT BETWEEN 1 AND 3 AND LO_QUANTITY < 25;
 ```
 
 Q1.2
 
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toYYYYMM(LO_ORDERDATE) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35;
+```sql
+SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
+FROM lineorder_flat
+WHERE toYYYYMM(LO_ORDERDATE) = 199401 AND LO_DISCOUNT BETWEEN 4 AND 6 AND LO_QUANTITY BETWEEN 26 AND 35;
 ```
 
 Q1.3
 
-``` sql
-SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue FROM lineorder_flat WHERE toISOWeek(LO_ORDERDATE) = 6 AND toYear(LO_ORDERDATE) = 1994 AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35;
+```sql
+SELECT sum(LO_EXTENDEDPRICE * LO_DISCOUNT) AS revenue
+FROM lineorder_flat
+WHERE toISOWeek(LO_ORDERDATE) = 6 AND toYear(LO_ORDERDATE) = 1994
+  AND LO_DISCOUNT BETWEEN 5 AND 7 AND LO_QUANTITY BETWEEN 26 AND 35;
 ```
 
 Q2.1
 
-``` sql
-SELECT sum(LO_REVENUE), toYear(LO_ORDERDATE) AS year, P_BRAND FROM lineorder_flat WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA' GROUP BY year, P_BRAND ORDER BY year, P_BRAND;
+```sql
+SELECT
+    sum(LO_REVENUE),
+    toYear(LO_ORDERDATE) AS year,
+    P_BRAND
+FROM lineorder_flat
+WHERE P_CATEGORY = 'MFGR#12' AND S_REGION = 'AMERICA'
+GROUP BY
+    year,
+    P_BRAND
+ORDER BY
+    year,
+    P_BRAND;
 ```
 
 Q2.2
 
-``` sql
-SELECT sum(LO_REVENUE), toYear(LO_ORDERDATE) AS year, P_BRAND FROM lineorder_flat WHERE P_BRAND BETWEEN 'MFGR#2221' AND 'MFGR#2228' AND S_REGION = 'ASIA' GROUP BY year, P_BRAND ORDER BY year, P_BRAND;
+```sql
+SELECT
+    sum(LO_REVENUE),
+    toYear(LO_ORDERDATE) AS year,
+    P_BRAND
+FROM lineorder_flat
+WHERE P_BRAND >= 'MFGR#2221' AND P_BRAND <= 'MFGR#2228' AND S_REGION = 'ASIA'
+GROUP BY
+    year,
+    P_BRAND
+ORDER BY
+    year,
+    P_BRAND;
 ```
 
 Q2.3
 
-``` sql
-SELECT sum(LO_REVENUE), toYear(LO_ORDERDATE) AS year, P_BRAND FROM lineorder_flat WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE' GROUP BY year, P_BRAND ORDER BY year, P_BRAND;
+```sql
+SELECT
+    sum(LO_REVENUE),
+    toYear(LO_ORDERDATE) AS year,
+    P_BRAND
+FROM lineorder_flat
+WHERE P_BRAND = 'MFGR#2239' AND S_REGION = 'EUROPE'
+GROUP BY
+    year,
+    P_BRAND
+ORDER BY
+    year,
+    P_BRAND;
 ```
 
 Q3.1
 
-``` sql
-SELECT C_NATION, S_NATION, toYear(LO_ORDERDATE) AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997 GROUP BY C_NATION, S_NATION, year ORDER BY year asc, revenue desc;
+```sql
+SELECT
+    C_NATION,
+    S_NATION,
+    toYear(LO_ORDERDATE) AS year,
+    sum(LO_REVENUE) AS revenue
+FROM lineorder_flat
+WHERE C_REGION = 'ASIA' AND S_REGION = 'ASIA' AND year >= 1992 AND year <= 1997
+GROUP BY
+    C_NATION,
+    S_NATION,
+    year
+ORDER BY
+    year ASC,
+    revenue DESC;
 ```
 
 Q3.2
 
-``` sql
-SELECT C_CITY, S_CITY, toYear(LO_ORDERDATE) AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997 GROUP BY C_CITY, S_CITY, year ORDER BY year asc, revenue desc;
+```sql
+SELECT
+    C_CITY,
+    S_CITY,
+    toYear(LO_ORDERDATE) AS year,
+    sum(LO_REVENUE) AS revenue
+FROM lineorder_flat
+WHERE C_NATION = 'UNITED STATES' AND S_NATION = 'UNITED STATES' AND year >= 1992 AND year <= 1997
+GROUP BY
+    C_CITY,
+    S_CITY,
+    year
+ORDER BY
+    year ASC,
+    revenue DESC;
 ```
 
 Q3.3
 
-``` sql
-SELECT C_CITY, S_CITY, toYear(LO_ORDERDATE) AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997 GROUP BY C_CITY, S_CITY, year ORDER BY year asc, revenue desc;
+```sql
+SELECT
+    C_CITY,
+    S_CITY,
+    toYear(LO_ORDERDATE) AS year,
+    sum(LO_REVENUE) AS revenue
+FROM lineorder_flat
+WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND year >= 1992 AND year <= 1997
+GROUP BY
+    C_CITY,
+    S_CITY,
+    year
+ORDER BY
+    year ASC,
+    revenue DESC;
 ```
 
 Q3.4
 
-``` sql
-SELECT C_CITY, S_CITY, toYear(LO_ORDERDATE) AS year, sum(LO_REVENUE) AS revenue FROM lineorder_flat WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND toYYYYMM(LO_ORDERDATE) = '199712' GROUP BY C_CITY, S_CITY, year ORDER BY year asc, revenue desc;
+```sql
+SELECT
+    C_CITY,
+    S_CITY,
+    toYear(LO_ORDERDATE) AS year,
+    sum(LO_REVENUE) AS revenue
+FROM lineorder_flat
+WHERE (C_CITY = 'UNITED KI1' OR C_CITY = 'UNITED KI5') AND (S_CITY = 'UNITED KI1' OR S_CITY = 'UNITED KI5') AND toYYYYMM(LO_ORDERDATE) = 199712
+GROUP BY
+    C_CITY,
+    S_CITY,
+    year
+ORDER BY
+    year ASC,
+    revenue DESC;
 ```
 
 Q4.1
 
-``` sql
-SELECT toYear(LO_ORDERDATE) AS year, C_NATION, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year, C_NATION ORDER BY year, C_NATION;
+```sql
+SELECT
+    toYear(LO_ORDERDATE) AS year,
+    C_NATION,
+    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
+FROM lineorder_flat
+WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2')
+GROUP BY
+    year,
+    C_NATION
+ORDER BY
+    year ASC,
+    C_NATION ASC;
 ```
 
 Q4.2
 
-``` sql
-SELECT toYear(LO_ORDERDATE) AS year, S_NATION, P_CATEGORY, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2') GROUP BY year, S_NATION, P_CATEGORY ORDER BY year, S_NATION, P_CATEGORY;
+```sql
+SELECT
+    toYear(LO_ORDERDATE) AS year,
+    S_NATION,
+    P_CATEGORY,
+    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
+FROM lineorder_flat
+WHERE C_REGION = 'AMERICA' AND S_REGION = 'AMERICA' AND (year = 1997 OR year = 1998) AND (P_MFGR = 'MFGR#1' OR P_MFGR = 'MFGR#2')
+GROUP BY
+    year,
+    S_NATION,
+    P_CATEGORY
+ORDER BY
+    year ASC,
+    S_NATION ASC,
+    P_CATEGORY ASC;
 ```
 
 Q4.3
 
-``` sql
-SELECT toYear(LO_ORDERDATE) AS year, S_CITY, P_BRAND, sum(LO_REVENUE - LO_SUPPLYCOST) AS profit FROM lineorder_flat WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14' GROUP BY year, S_CITY, P_BRAND ORDER BY year, S_CITY, P_BRAND;
+```sql
+SELECT
+    toYear(LO_ORDERDATE) AS year,
+    S_CITY,
+    P_BRAND,
+    sum(LO_REVENUE - LO_SUPPLYCOST) AS profit
+FROM lineorder_flat
+WHERE S_NATION = 'UNITED STATES' AND (year = 1997 OR year = 1998) AND P_CATEGORY = 'MFGR#14'
+GROUP BY
+    year,
+    S_CITY,
+    P_BRAND
+ORDER BY
+    year ASC,
+    S_CITY ASC,
+    P_BRAND ASC;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/star_schema/) <!--hide-->
diff --git a/docs/zh/getting-started/example-datasets/uk-price-paid.md b/docs/zh/getting-started/example-datasets/uk-price-paid.md
new file mode 120000
index 00000000000..e48bcf21d7b
--- /dev/null
+++ b/docs/zh/getting-started/example-datasets/uk-price-paid.md
@@ -0,0 +1 @@
+../../../en/getting-started/example-datasets/uk-price-paid.md
\ No newline at end of file
diff --git a/docs/zh/getting-started/example-datasets/wikistat.md b/docs/zh/getting-started/example-datasets/wikistat.md
index 4320d6b4926..b91b254fcf5 100644
--- a/docs/zh/getting-started/example-datasets/wikistat.md
+++ b/docs/zh/getting-started/example-datasets/wikistat.md
@@ -30,4 +30,4 @@ $ cat links.txt | while read link; do wget http://dumps.wikimedia.org/other/page
 $ ls -1 /opt/wikistat/ | grep gz | while read i; do echo $i; gzip -cd /opt/wikistat/$i | ./wikistat-loader --time="$(echo -n $i | sed -r 's/pagecounts-([0-9]{4})([0-9]{2})([0-9]{2})-([0-9]{2})([0-9]{2})([0-9]{2})\.gz/\1-\2-\3 \4-00-00/')" | clickhouse-client --query="INSERT INTO wikistat FORMAT TabSeparated"; done
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/example_datasets/wikistat/) <!--hide-->
diff --git a/docs/zh/getting-started/index.md b/docs/zh/getting-started/index.md
index c5ec7ded932..f5ce4cbf3b7 100644
--- a/docs/zh/getting-started/index.md
+++ b/docs/zh/getting-started/index.md
@@ -15,4 +15,4 @@ toc_priority: 2
 -   [示例数据集-航班飞行数据](example-datasets/ontime.md) 示例数据，提供了常用的SQL查询场景
 
 
-[来源文章](https://clickhouse.tech/docs/zh/getting_started/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/getting_started/) <!--hide-->
diff --git a/docs/zh/getting-started/install.md b/docs/zh/getting-started/install.md
index 51d6ed198fa..1bf8ecd9826 100644
--- a/docs/zh/getting-started/install.md
+++ b/docs/zh/getting-started/install.md
@@ -29,7 +29,7 @@ $ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not
 
 如果您想使用最新的版本，请用`testing`替代`stable`(我们只推荐您用于测试环境)。
 
-你也可以从这里手动下载安装包：[下载](https://repo.clickhouse.tech/deb/stable/main/)。
+你也可以从这里手动下载安装包：[下载](https://repo.clickhouse.com/deb/stable/main/)。
 
 安装包列表：
 
@@ -46,8 +46,8 @@ $ grep -q sse4_2 /proc/cpuinfo && echo "SSE 4.2 supported" || echo "SSE 4.2 not
 
 ``` bash
 sudo yum install yum-utils
-sudo rpm --import https://repo.clickhouse.tech/CLICKHOUSE-KEY.GPG
-sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_64
+sudo rpm --import https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG
+sudo yum-config-manager --add-repo https://repo.clickhouse.com/rpm/stable/x86_64
 ```
 
 如果您想使用最新的版本，请用`testing`替代`stable`(我们只推荐您用于测试环境)。`prestable`有时也可用。
@@ -58,22 +58,22 @@ sudo yum-config-manager --add-repo https://repo.clickhouse.tech/rpm/stable/x86_6
 sudo yum install clickhouse-server clickhouse-client
 ```
 
-你也可以从这里手动下载安装包：[下载](https://repo.clickhouse.tech/rpm/stable/x86_64)。
+你也可以从这里手动下载安装包：[下载](https://repo.clickhouse.com/rpm/stable/x86_64)。
 
 ### `Tgz`安装包 {#from-tgz-archives}
 
 如果您的操作系统不支持安装`deb`或`rpm`包，建议使用官方预编译的`tgz`软件包。
 
-所需的版本可以通过`curl`或`wget`从存储库`https://repo.clickhouse.tech/tgz/`下载。
+所需的版本可以通过`curl`或`wget`从存储库`https://repo.clickhouse.com/tgz/`下载。
 
 下载后解压缩下载资源文件并使用安装脚本进行安装。以下是一个最新版本的安装示例:
 
 ``` bash
 export LATEST_VERSION=`curl https://api.github.com/repos/ClickHouse/ClickHouse/tags 2>/dev/null | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1`
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-server-$LATEST_VERSION.tgz
-curl -O https://repo.clickhouse.tech/tgz/clickhouse-client-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-common-static-dbg-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-server-$LATEST_VERSION.tgz
+curl -O https://repo.clickhouse.com/tgz/clickhouse-client-$LATEST_VERSION.tgz
 
 tar -xzvf clickhouse-common-static-$LATEST_VERSION.tgz
 sudo clickhouse-common-static-$LATEST_VERSION/install/doinst.sh
@@ -93,15 +93,15 @@ sudo clickhouse-client-$LATEST_VERSION/install/doinst.sh
 
 ### `Docker`安装包 {#from-docker-image}
 
-要在Docker中运行ClickHouse，请遵循[Docker Hub](https://hub.docker.com/r/yandex/clickhouse-server/)上的指南。它是官方的`deb`安装包。
+要在Docker中运行ClickHouse，请遵循[Docker Hub](https://hub.docker.com/r/clickhouse/clickhouse-server/)上的指南。它是官方的`deb`安装包。
 
 ### 其他环境安装包 {#from-other}
 
 对于非linux操作系统和Arch64 CPU架构，ClickHouse将会以`master`分支的最新提交的进行编译提供(它将会有几小时的延迟)。
 
--   [macOS](https://builds.clickhouse.tech/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/macos/clickhouse' && chmod a+x ./clickhouse`
--   [FreeBSD](https://builds.clickhouse.tech/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
--   [AArch64](https://builds.clickhouse.tech/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.tech/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
+-   [macOS](https://builds.clickhouse.com/master/macos/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/macos/clickhouse' && chmod a+x ./clickhouse`
+-   [FreeBSD](https://builds.clickhouse.com/master/freebsd/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/freebsd/clickhouse' && chmod a+x ./clickhouse`
+-   [AArch64](https://builds.clickhouse.com/master/aarch64/clickhouse) — `curl -O 'https://builds.clickhouse.com/master/aarch64/clickhouse' && chmod a+x ./clickhouse`
 
 下载后，您可以使用`clickhouse client`连接服务，或者使用`clickhouse local`模式处理数据，不过您必须要额外在GitHub下载[server](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/config.xml)和[users](https://github.com/ClickHouse/ClickHouse/blob/master/programs/server/users.xml)配置文件。
 
@@ -183,6 +183,6 @@ SELECT 1
 
 **恭喜，系统已经工作了!**
 
-为了继续进行实验，你可以尝试下载测试数据集或查看[教程](https://clickhouse.tech/tutorial.html)。
+为了继续进行实验，你可以尝试下载测试数据集或查看[教程](https://clickhouse.com/tutorial.html)。
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/install/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/install/) <!--hide-->
diff --git a/docs/zh/getting-started/playground.md b/docs/zh/getting-started/playground.md
index f7ab0ac0013..8fee8966a4f 100644
--- a/docs/zh/getting-started/playground.md
+++ b/docs/zh/getting-started/playground.md
@@ -5,7 +5,7 @@ toc_title: 体验平台
 
 # ClickHouse体验平台 {#clickhouse-playground}
 
-[ClickHouse体验平台](https://play.clickhouse.tech?file=welcome) 允许人们通过即时运行查询来尝试ClickHouse，而无需设置他们的服务器或集群。
+[ClickHouse体验平台](https://play.clickhouse.com?file=welcome) 允许人们通过即时运行查询来尝试ClickHouse，而无需设置他们的服务器或集群。
 
 体验平台中提供几个示例数据集以及显示ClickHouse特性的示例查询。还有一些ClickHouse LTS版本可供尝试。
 
@@ -17,15 +17,15 @@ ClickHouse体验平台提供了小型集群[Managed Service for ClickHouse](http
 
 | 参数                 | 值                                      |
 |:--------------------|:----------------------------------------|
-| HTTPS端点           | `https://play-api.clickhouse.tech:8443` |
-| TCP端点             | `play-api.clickhouse.tech:9440`         |
+| HTTPS端点           | `https://play-api.clickhouse.com:8443` |
+| TCP端点             | `play-api.clickhouse.com:9440`         |
 | 用户                | `playground`                            |
 | 密码                | `clickhouse`                            |
 
 还有一些带有特定ClickHouse版本的附加信息来试验它们之间的差异(端口和用户/密码与上面相同):
 
--   20.3 LTS: `play-api-v20-3.clickhouse.tech`
--   19.14 LTS: `play-api-v19-14.clickhouse.tech`
+-   20.3 LTS: `play-api-v20-3.clickhouse.com`
+-   19.14 LTS: `play-api-v19-14.clickhouse.com`
 
 !!! note "注意"
     所有这些端点都需要安全的TLS连接。
@@ -53,13 +53,13 @@ ClickHouse体验还有如下：
 使用`curl`连接Https服务：
 
 ``` bash
-curl "https://play-api.clickhouse.tech:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
+curl "https://play-api.clickhouse.com:8443/?query=SELECT+'Play+ClickHouse\!';&user=playground&password=clickhouse&database=datasets"
 ```
 
 TCP连接示例[CLI](../interfaces/cli.md):
 
 ``` bash
-clickhouse client --secure -h play-api.clickhouse.tech --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
+clickhouse client --secure -h play-api.clickhouse.com --port 9440 -u playground --password clickhouse -q "SELECT 'Play ClickHouse\!'"
 ```
 
 ## Implementation Details {#implementation-details}
diff --git a/docs/zh/getting-started/tutorial.md b/docs/zh/getting-started/tutorial.md
index 4b1427cad2a..7189938f205 100644
--- a/docs/zh/getting-started/tutorial.md
+++ b/docs/zh/getting-started/tutorial.md
@@ -85,8 +85,8 @@ clickhouse-client --query='INSERT INTO table FORMAT TabSeparated' < data.tsv
 ### 下载并提取表数据 {#download-and-extract-table-data}
 
 ``` bash
-curl https://datasets.clickhouse.tech/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
-curl https://datasets.clickhouse.tech/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
+curl https://datasets.clickhouse.com/hits/tsv/hits_v1.tsv.xz | unxz --threads=`nproc` > hits_v1.tsv
+curl https://datasets.clickhouse.com/visits/tsv/visits_v1.tsv.xz | unxz --threads=`nproc` > visits_v1.tsv
 ```
 
 提取的文件大小约为10GB。
@@ -520,7 +520,7 @@ WHERE (CounterID = 912887) AND (toYYYYMM(StartDate) = 201403) AND (domain(StartU
 ClickHouse集群是一个同质集群。 设置步骤:
 
 1.  在群集的所有机器上安装ClickHouse服务端
-2.  在配置文件中设置群集配置
+2.  在配置文件中设置集群配置
 3.  在每个实例上创建本地表
 4.  创建一个[分布式表](../engines/table-engines/special/distributed.md)
 
@@ -659,4 +659,4 @@ INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 
 复制在多主机模式下运行。数据可以加载到任何副本中，然后系统自动将其与其他实例同步。复制是异步的，因此在给定时刻，并非所有副本都可能包含最近插入的数据。至少应该有一个副本允许数据摄入。另一些则会在重新激活后同步数据并修复一致性。请注意，这种方法允许最近插入的数据丢失的可能性很低。
 
-[原始文章](https://clickhouse.tech/docs/en/getting_started/tutorial/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/getting_started/tutorial/) <!--hide-->
diff --git a/docs/zh/guides/apply-catboost-model.md b/docs/zh/guides/apply-catboost-model.md
index ad325dc29db..72f5fa38e84 100644
--- a/docs/zh/guides/apply-catboost-model.md
+++ b/docs/zh/guides/apply-catboost-model.md
@@ -240,4 +240,4 @@ FROM
 !!! note "注"
     查看函数说明 [avg()](../sql-reference/aggregate-functions/reference/avg.md#agg_function-avg) 和 [log()](../sql-reference/functions/math-functions.md) 。
 
-[原始文章](https://clickhouse.tech/docs/en/guides/apply_catboost_model/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/guides/apply_catboost_model/) <!--hide-->
diff --git a/docs/zh/guides/index.md b/docs/zh/guides/index.md
index 54cb4e1055c..b8b4e7e2d51 100644
--- a/docs/zh/guides/index.md
+++ b/docs/zh/guides/index.md
@@ -13,4 +13,4 @@ toc_title: "\u6982\u8FF0"
 -   [关于简单集群设置的教程](../getting-started/tutorial.md)
 -   [在ClickHouse中应用CatBoost模型](apply-catboost-model.md)
 
-[原始文章](https://clickhouse.tech/docs/en/guides/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/guides/) <!--hide-->
diff --git a/docs/zh/index.md b/docs/zh/index.md
index fb473020f22..8f545b49f13 100644
--- a/docs/zh/index.md
+++ b/docs/zh/index.md
@@ -87,4 +87,4 @@ ClickHouse是一个用于联机分析(OLAP)的列式数据库管理系统(DBMS)
 
 请注意，为了提高CPU效率，查询语言必须是声明型的(SQL或MDX)， 或者至少一个向量(J，K)。 查询应该只包含隐式循环，允许进行优化。
 
-[来源文章](https://clickhouse.tech/docs/zh/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/) <!--hide-->
diff --git a/docs/zh/interfaces/cli.md b/docs/zh/interfaces/cli.md
index 3e15e8547cc..f4ae48cd425 100644
--- a/docs/zh/interfaces/cli.md
+++ b/docs/zh/interfaces/cli.md
@@ -147,4 +147,4 @@ $ clickhouse-client --param_tuple_in_tuple="(10, ('dt', 10))" -q "SELECT * FROM
 </config>
 ```
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/cli/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/cli/) <!--hide-->
diff --git a/docs/zh/interfaces/cpp.md b/docs/zh/interfaces/cpp.md
index 5c88442c2ec..5fd2bc00b67 100644
--- a/docs/zh/interfaces/cpp.md
+++ b/docs/zh/interfaces/cpp.md
@@ -7,4 +7,4 @@ toc_title: C++客户端库
 
 请参考仓库的描述文件[clickhouse-cpp](https://github.com/ClickHouse/clickhouse-cpp)。
 
-[原始文章](https://clickhouse.tech/docs/zh/interfaces/cpp/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/zh/interfaces/cpp/) <!--hide-->
diff --git a/docs/zh/interfaces/formats.md b/docs/zh/interfaces/formats.md
index 1cd91690e57..85af2abda6b 100644
--- a/docs/zh/interfaces/formats.md
+++ b/docs/zh/interfaces/formats.md
@@ -23,20 +23,19 @@ ClickHouse可以接受和返回各种格式的数据。受支持的输入格式
 | [CustomSeparated](#format-customseparated)                                              | ✔     | ✔      |
 | [Values](#data-format-values)                                                           | ✔     | ✔      |
 | [Vertical](#vertical)                                                                   | ✗     | ✔      |
-| [VerticalRaw](#verticalraw)                                                             | ✗     | ✔      |
 | [JSON](#json)                                                                           | ✗     | ✔      |
 | [JSONAsString](#jsonasstring)                                                           | ✔     | ✗      |
-| [JSONString](#jsonstring)                                                               | ✗     | ✔      |
+| [JSONStrings](#jsonstrings)                                                               | ✗     | ✔      |
 | [JSONCompact](#jsoncompact)                                                             | ✗     | ✔      |
-| [JSONCompactString](#jsoncompactstring)                                                 | ✗     | ✔      |
+| [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗     | ✔      |
 | [JSONEachRow](#jsoneachrow)                                                             | ✔     | ✔      |
 | [JSONEachRowWithProgress](#jsoneachrowwithprogress)                                     | ✗     | ✔      |
 | [JSONStringsEachRow](#jsonstringseachrow)                                               | ✔     | ✔      |
 | [JSONStringsEachRowWithProgress](#jsonstringseachrowwithprogress)                       | ✗     | ✔      |
 | [JSONCompactEachRow](#jsoncompacteachrow)                                               | ✔     | ✔      |
 | [JSONCompactEachRowWithNamesAndTypes](#jsoncompacteachrowwithnamesandtypes)             | ✔     | ✔      |
-| [JSONCompactStringEachRow](#jsoncompactstringeachrow)                                   | ✔     | ✔      |
-| [JSONCompactStringEachRowWithNamesAndTypes](#jsoncompactstringeachrowwithnamesandtypes) | ✔     | ✔      |
+| [JSONCompactStringsEachRow](#jsoncompactstringseachrow)                                   | ✔     | ✔      |
+| [JSONCompactStringsEachRowWithNamesAndTypes](#jsoncompactstringseachrowwithnamesandtypes) | ✔     | ✔      |
 | [TSKV](#tskv)                                                                           | ✔     | ✔      |
 | [Pretty](#pretty)                                                                       | ✗     | ✔      |
 | [PrettyCompact](#prettycompact)                                                         | ✗     | ✔      |
@@ -128,9 +127,9 @@ world
 
 数组用方括号包裹、逗号分隔的形式表示(例如`[11,22,33]`)。数组中的数字项按上述规则进行格式化。`日期`和`日期时间`类型用单引号包裹。字符串用单引号包裹，遵循上述转义规则。
 
-[NULL](https://clickhouse.tech/docs/zh/sql-reference/syntax/)将输出为`\N`。
+[NULL](https://clickhouse.com/docs/zh/sql-reference/syntax/)将输出为`\N`。
 
-[Nested](https://clickhouse.tech/docs/zh/sql-reference/data-types/nested-data-structures/nested/)结构的每个元素都表示为数组。
+[Nested](https://clickhouse.com/docs/zh/sql-reference/data-types/nested-data-structures/nested/)结构的每个元素都表示为数组。
 
 示例：
 
@@ -465,7 +464,7 @@ ClickHouse支持[NULL](../sql-reference/syntax.md), 在JSON输出中显示为`nu
 -   [JSONEachRow](#jsoneachrow)格式
 -   [output_format_json_array_of_rows](../operations/settings/settings.md#output-format-json-array-of-rows)设置
 
-## JSONString {#jsonstring}
+## JSONStrings {#jsonstrings}
 
 与JSON的不同之处在于数据字段以字符串输出，而不是以类型化JSON值输出。
 
@@ -543,7 +542,7 @@ SELECT * FROM json_as_string;
 ```
 
 ## JSONCompact {#jsoncompact}
-## JSONCompactString {#jsoncompactstring}
+## JSONCompactStrings {#jsoncompactstrings}
 
 与JSON格式不同的是它以数组的方式输出结果，而不是以结构体。
 
@@ -582,7 +581,7 @@ SELECT * FROM json_as_string;
 ```
 
 ```json
-// JSONCompactString
+// JSONCompactStrings
 {
         "meta":
         [
@@ -614,9 +613,9 @@ SELECT * FROM json_as_string;
 ```
 
 ## JSONEachRow {#jsoneachrow}
-## JSONStringEachRow {#jsonstringeachrow}
+## JSONStringsEachRow {#jsonstringseachrow}
 ## JSONCompactEachRow {#jsoncompacteachrow}
-## JSONCompactStringEachRow {#jsoncompactstringeachrow}
+## JSONCompactStringsEachRow {#jsoncompactstringseachrow}
 
 使用这些格式时，ClickHouse会将行输出为用换行符分隔的JSON值，这些输出数据作为一个整体时，由于没有分隔符(,)因而不是有效的JSON文档。
 
@@ -629,9 +628,9 @@ SELECT * FROM json_as_string;
 在插入数据时，应该为每一行提供一个单独的JSON值。
 
 ## JSONEachRowWithProgress {#jsoneachrowwithprogress}
-## JSONStringEachRowWithProgress {#jsonstringeachrowwithprogress}
+## JSONStringsEachRowWithProgress {#jsonstringseachrowwithprogress}
 
-与`JSONEachRow`/`JSONStringEachRow`不同的是，ClickHouse还将生成作为JSON值的进度信息。
+与`JSONEachRow`/`JSONStringsEachRow`不同的是，ClickHouse还将生成作为JSON值的进度信息。
 
 ```json
 {"row":{"'hello'":"hello","multiply(42, number)":"0","range(5)":[0,1,2,3,4]}}
@@ -641,9 +640,9 @@ SELECT * FROM json_as_string;
 ```
 
 ## JSONCompactEachRowWithNamesAndTypes {#jsoncompacteachrowwithnamesandtypes}
-## JSONCompactStringEachRowWithNamesAndTypes {#jsoncompactstringeachrowwithnamesandtypes}
+## JSONCompactStringsEachRowWithNamesAndTypes {#jsoncompactstringseachrowwithnamesandtypes}
 
-与`JSONCompactEachRow`/`JSONCompactStringEachRow`不同的是，列名和类型被写入前两行。
+与`JSONCompactEachRow`/`JSONCompactStringsEachRow`不同的是，列名和类型被写入前两行。
 
 ```json
 ["'hello'", "multiply(42, number)", "range(5)"]
@@ -932,7 +931,7 @@ FixedString 被简单地表示为字节序列。
 
 这是 `INSERT INTO t VALUES ...` 中可以使用的格式，但您也可以将其用于查询结果。
 
-另见：[input_format_values_interpret_expressions](https://clickhouse.tech/docs/en/operations/settings/settings/#settings-input_format_values_interpret_expressions)和[input_format_values_deduce_templates_of_expressions](https://clickhouse.tech/docs/en/operations/settings/settings/#settings-input_format_values_deduce_templates_of_expressions)。
+另见：[input_format_values_interpret_expressions](https://clickhouse.com/docs/en/operations/settings/settings/#settings-input_format_values_interpret_expressions)和[input_format_values_deduce_templates_of_expressions](https://clickhouse.com/docs/en/operations/settings/settings/#settings-input_format_values_deduce_templates_of_expressions)。
 
 ## Vertical {#vertical}
 
@@ -951,31 +950,6 @@ SELECT * FROM t_null FORMAT Vertical
 
 该格式仅适用于输出查询结果，但不适用于解析输入(将数据插入到表中)。
 
-## VerticalRaw {#verticalraw}
-
-和 `Vertical` 格式不同点在于，行是不会被转义的。
-这种格式仅仅适用于输出，但不适用于解析输入(将数据插入到表中)。
-
-示例:
-
-    :) SHOW CREATE TABLE geonames FORMAT VerticalRaw;
-    Row 1:
-    ──────
-    statement: CREATE TABLE default.geonames ( geonameid UInt32, date Date DEFAULT CAST('2017-12-08' AS Date)) ENGINE = MergeTree(date, geonameid, 8192)
-
-    :) SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT VerticalRaw;
-    Row 1:
-    ──────
-    test: string with 'quotes' and   with some special
-     characters
-
-和 Vertical 格式相比：
-
-    :) SELECT 'string with \'quotes\' and \t with some special \n characters' AS test FORMAT Vertical;
-    Row 1:
-    ──────
-    test: string with \'quotes\' and \t with some special \n characters
-
 ## XML {#xml}
 
 该格式仅适用于输出查询结果，但不适用于解析输入，示例：
@@ -1351,7 +1325,7 @@ $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT ORC" > {filename.
 要与Hadoop交换数据，您可以使用 [HDFS表引擎](../engines/table-engines/integrations/hdfs.md).
 
 ## LineAsString {#lineasstring}
-这种格式下，每行输入数据都会当做一个字符串。这种格式仅适用于仅有一列[String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)类型的列的表。其余列必须设置为[DEFAULT](https://clickhouse.tech/docs/en/sql-reference/statements/create/table/#default)、[MATERIALIZED](https://clickhouse.tech/docs/en/sql-reference/statements/create/table/#materialized)或者被忽略。
+这种格式下，每行输入数据都会当做一个字符串。这种格式仅适用于仅有一列[String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)类型的列的表。其余列必须设置为[DEFAULT](https://clickhouse.com/docs/en/sql-reference/statements/create/table/#default)、[MATERIALIZED](https://clickhouse.com/docs/en/sql-reference/statements/create/table/#materialized)或者被忽略。
 
 ### 示例：
 查询如下：
@@ -1370,14 +1344,14 @@ SELECT * FROM line_as_string;
 ## Regexp {#regexp}
 每一列输入数据根据正则表达式解析。使用`Regexp`格式时，可以使用如下设置：
 
--  `format_regexp`，[String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)类型。包含[re2](https://github.com/google/re2/wiki/Syntax)格式的正则表达式。
-- `format_regexp_escaping_rule`，[String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)类型。支持如下转义规则：
-  - CSV(规则相同于[CSV](https://clickhouse.tech/docs/zh/interfaces/formats/#csv))
-  - JSON(相同于[JSONEachRow](https://clickhouse.tech/docs/zh/interfaces/formats/#jsoneachrow))
-  - Escaped(相同于[TSV](https://clickhouse.tech/docs/zh/interfaces/formats/#tabseparated))
-  - Quoted(相同于[Values](https://clickhouse.tech/docs/zh/interfaces/formats/#data-format-values))
+-  `format_regexp`，[String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)类型。包含[re2](https://github.com/google/re2/wiki/Syntax)格式的正则表达式。
+- `format_regexp_escaping_rule`，[String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)类型。支持如下转义规则：
+  - CSV(规则相同于[CSV](https://clickhouse.com/docs/zh/interfaces/formats/#csv))
+  - JSON(相同于[JSONEachRow](https://clickhouse.com/docs/zh/interfaces/formats/#jsoneachrow))
+  - Escaped(相同于[TSV](https://clickhouse.com/docs/zh/interfaces/formats/#tabseparated))
+  - Quoted(相同于[Values](https://clickhouse.com/docs/zh/interfaces/formats/#data-format-values))
   - Raw(将整个子匹配项进行提取，不转义)
-- `format_regexp_skip_unmatched`，[UInt8](https://clickhouse.tech/docs/zh/sql-reference/data-types/int-uint/)类型。当`format_regexp`表达式没有匹配到结果时是否抛出异常。可为0或1。
+- `format_regexp_skip_unmatched`，[UInt8](https://clickhouse.com/docs/zh/sql-reference/data-types/int-uint/)类型。当`format_regexp`表达式没有匹配到结果时是否抛出异常。可为0或1。
 
 ### 用法 {#usage-1}
 `format_regexp`设置会应用于每一行输入数据。正则表达式的子匹配项数必须等于输入数据期望得到的列数。
@@ -1417,7 +1391,7 @@ SELECT * FROM imp_regex_table;
 
 ## RawBLOB {#rawblob}
 这种格式下，所有输入数据视为一个值。该格式仅适用于仅有一String类型的列的表。输出时，使用二进制格式输出。当输出结果不唯一时，输出是有歧义的，并且不能通过该输出还原原数据。
-下面是`RawBLOB`与[TabSeparatedRaw](https://clickhouse.tech/docs/zh/interfaces/formats/#tabseparatedraw)的对比：
+下面是`RawBLOB`与[TabSeparatedRaw](https://clickhouse.com/docs/zh/interfaces/formats/#tabseparatedraw)的对比：
 
 `RawBloB`:
 
@@ -1431,7 +1405,7 @@ SELECT * FROM imp_regex_table;
 - 每行的值通过制表符分隔。
 - 每行最后的值得后面有换行符。
 
-下面是`RawBLOB`与[RowBinary](https://clickhouse.tech/docs/zh/interfaces/formats/#rowbinary)的对比：
+下面是`RawBLOB`与[RowBinary](https://clickhouse.com/docs/zh/interfaces/formats/#rowbinary)的对比：
 
 `RawBloB`:
 
@@ -1462,8 +1436,8 @@ f9725a22f9191e064120d718e26862a9  -
 格式架构为架构文件名和此文件中消息类型的组合，用冒号分隔,例如 `schemafile.proto:MessageType`.
 如果文件具有格式的标准扩展名(例如, `Protobuf`格式的架构文件标准扩展名为`.proto`),它可以被省略，在这种情况下，格式模式如下所示 `schemafile:MessageType`.
 
-如果您通过[Client](../interfaces/cli.md) 在 [交互模式](https://clickhouse.tech/docs/zh/interfaces/cli/#cli_usage)下输入或输出数据，格式架构中指定的文件名可以使用绝对路径或客户端当前目录的相对路径。
-如果在[批处理模式](https://clickhouse.tech/docs/zh/interfaces/cli/#cli_usage)下使用客户端，则由于安全原因，架构的路径必须使用相对路径。
+如果您通过[Client](../interfaces/cli.md) 在 [交互模式](https://clickhouse.com/docs/zh/interfaces/cli/#cli_usage)下输入或输出数据，格式架构中指定的文件名可以使用绝对路径或客户端当前目录的相对路径。
+如果在[批处理模式](https://clickhouse.com/docs/zh/interfaces/cli/#cli_usage)下使用客户端，则由于安全原因，架构的路径必须使用相对路径。
 
 如果您通过 HTTP接口](../interfaces/http.md)输入或输出数据，格式架构中指定的文件名应该位于服务器设置的[format_schema_path](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-format_schema_path)指定的目录中。
 
@@ -1479,4 +1453,4 @@ f9725a22f9191e064120d718e26862a9  -
 
 
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/formats/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/formats/) <!--hide-->
diff --git a/docs/zh/interfaces/http.md b/docs/zh/interfaces/http.md
index 8ab54293b32..cdce4f2f2e7 100644
--- a/docs/zh/interfaces/http.md
+++ b/docs/zh/interfaces/http.md
@@ -624,4 +624,4 @@ $ curl -vv -H 'XXX:xxx' 'http://localhost:8123/get_relative_path_static_handler'
 * Connection #0 to host localhost left intact
 ```
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/http_interface/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/http_interface/) <!--hide-->
diff --git a/docs/zh/interfaces/index.md b/docs/zh/interfaces/index.md
index 4bc14539896..aa884064abd 100644
--- a/docs/zh/interfaces/index.md
+++ b/docs/zh/interfaces/index.md
@@ -24,4 +24,4 @@ ClickHouse提供了两个网络接口(两个都可以选择包装在TLS中以增
 -   [第三方集成库](../interfaces/third-party/integrations.md)
 -   [可视化UI](../interfaces/third-party/gui.md)
 
-[来源文章](https://clickhouse.tech/docs/en/interfaces/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/interfaces/) <!--hide-->
diff --git a/docs/zh/interfaces/jdbc.md b/docs/zh/interfaces/jdbc.md
index 87d006fe932..ed2fad24714 100644
--- a/docs/zh/interfaces/jdbc.md
+++ b/docs/zh/interfaces/jdbc.md
@@ -10,4 +10,4 @@ toc_title: JDBC驱动
     -   [ClickHouse-Native-JDBC](https://github.com/housepower/ClickHouse-Native-JDBC)
     -   [clickhouse4j](https://github.com/blynkkk/clickhouse4j)
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/jdbc/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/jdbc/) <!--hide-->
diff --git a/docs/zh/interfaces/mysql.md b/docs/zh/interfaces/mysql.md
index fa9fc0053a6..c8f24b40f81 100644
--- a/docs/zh/interfaces/mysql.md
+++ b/docs/zh/interfaces/mysql.md
@@ -44,4 +44,4 @@ mysql>
 
 -   某些数据类型以字符串形式发送
 
-[原始文章](https://clickhouse.tech/docs/en/interfaces/mysql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/interfaces/mysql/) <!--hide-->
diff --git a/docs/zh/interfaces/odbc.md b/docs/zh/interfaces/odbc.md
index d0e38f96609..89ba1e30c6a 100644
--- a/docs/zh/interfaces/odbc.md
+++ b/docs/zh/interfaces/odbc.md
@@ -7,4 +7,4 @@ toc_title: ODBC驱动
 
 -   [官方驱动](https://github.com/ClickHouse/clickhouse-odbc)。
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/odbc/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/odbc/) <!--hide-->
diff --git a/docs/zh/interfaces/tcp.md b/docs/zh/interfaces/tcp.md
index 571fd22b758..b43af0e533e 100644
--- a/docs/zh/interfaces/tcp.md
+++ b/docs/zh/interfaces/tcp.md
@@ -7,4 +7,4 @@ toc_title: 原生接口(TCP)
 
 原生接口协议用于[命令行客户端](cli.md)，用于分布式查询处理期间的服务器间通信，以及其他C++ 程序。不幸的是，原生ClickHouse协议还没有正式的规范，但它可以从ClickHouse源代码[从这里开始](https://github.com/ClickHouse/ClickHouse/tree/master/src/Client)或通过拦截和分析TCP流量进行逆向工程。
 
-[原文](https://clickhouse.tech/docs/en/interfaces/tcp/) <!--hide-->
+[原文](https://clickhouse.com/docs/en/interfaces/tcp/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/client-libraries.md b/docs/zh/interfaces/third-party/client-libraries.md
index e2412f2b8de..3136b928e7b 100644
--- a/docs/zh/interfaces/third-party/client-libraries.md
+++ b/docs/zh/interfaces/third-party/client-libraries.md
@@ -64,4 +64,4 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
 -   Haskell
     -   [hdbc-clickhouse](https://github.com/zaneli/hdbc-clickhouse)
 
-[来源文章](https://clickhouse.tech/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/interfaces/third-party/client_libraries/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/gui.md b/docs/zh/interfaces/third-party/gui.md
index 46baf55d564..8afd5832e3b 100644
--- a/docs/zh/interfaces/third-party/gui.md
+++ b/docs/zh/interfaces/third-party/gui.md
@@ -72,6 +72,22 @@ ClickHouse Web 界面 [Tabix](https://github.com/tabixio/tabix).
 
     [clickhouse-flamegraph](https://github.com/Slach/clickhouse-flamegraph) 是一个可视化的专业工具`system.trace_log`如[flamegraph](http://www.brendangregg.com/flamegraphs.html).
 
+### DBM {#dbm}
+
+[DBM](https://dbm.incubator.edurt.io/) DBM是一款ClickHouse可视化管理工具!
+
+特征：
+
+-   支持查询历史（分页、全部清除等）
+-   支持选中的sql子句查询(多窗口等)
+-   支持终止查询
+-   支持表管理
+-   支持数据库管理
+-   支持自定义查询
+-   支持多数据源管理（连接测试、监控）
+-   支持监控（处理进程、连接、查询）
+-   支持迁移数据
+
 ## 商业 {#shang-ye}
 
 ### Holistics {#holistics-software}
@@ -99,4 +115,4 @@ ClickHouse Web 界面 [Tabix](https://github.com/tabixio/tabix).
 -   重构。
 -   搜索和导航。
 
-[来源文章](https://clickhouse.tech/docs/zh/interfaces/third-party/gui/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/zh/interfaces/third-party/gui/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/integrations.md b/docs/zh/interfaces/third-party/integrations.md
index 20dcf47cabd..075e1ca0870 100644
--- a/docs/zh/interfaces/third-party/integrations.md
+++ b/docs/zh/interfaces/third-party/integrations.md
@@ -42,7 +42,7 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
         -   [mfedotov/clickhouse](https://forge.puppet.com/mfedotov/clickhouse)
 -   Monitoring
     -   [Graphite](https://graphiteapp.org)
-        -   [graphouse](https://github.com/yandex/graphouse)
+        -   [graphouse](https://github.com/ClickHouse/graphouse)
         -   [carbon-clickhouse](https://github.com/lomik/carbon-clickhouse)
         -   [graphite-clickhouse](https://github.com/lomik/graphite-clickhouse)
         -   [graphite-ch-optimizer](https://github.com/innogames/graphite-ch-optimizer) - optimizes staled partitions in [\*GraphiteMergeTree](../../engines/table-engines/mergetree-family/graphitemergetree.md#graphitemergetree) if rules from [rollup configuration](../../engines/table-engines/mergetree-family/graphitemergetree.md#rollup-configuration) could be applied
@@ -105,4 +105,4 @@ Yandex**没有**维护下面列出的库，也没有做过任何广泛的测试
     -   [GraphQL](https://github.com/graphql)
         -   [activecube-graphql](https://github.com/bitquery/activecube-graphql)
 
-[源文章](https://clickhouse.tech/docs/en/interfaces/third-party/integrations/) <!--hide-->
+[源文章](https://clickhouse.com/docs/en/interfaces/third-party/integrations/) <!--hide-->
diff --git a/docs/zh/interfaces/third-party/proxy.md b/docs/zh/interfaces/third-party/proxy.md
index a2050863f30..034657a70d2 100644
--- a/docs/zh/interfaces/third-party/proxy.md
+++ b/docs/zh/interfaces/third-party/proxy.md
@@ -41,4 +41,4 @@ toc_title: 第三方代理
 
 使用go语言实现。
 
-[Original article](https://clickhouse.tech/docs/en/interfaces/third-party/proxy/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/interfaces/third-party/proxy/) <!--hide-->
diff --git a/docs/zh/introduction/adopters.md b/docs/zh/introduction/adopters.md
index 6b9ac7c2ceb..66341b1265d 100644
--- a/docs/zh/introduction/adopters.md
+++ b/docs/zh/introduction/adopters.md
@@ -11,11 +11,13 @@ toc_title: "ClickHouse用户"
 | 公司简介                                                        | 行业             | 用例           | 群集大小                                          | (Un)压缩数据大小<abbr title="of single replica"><sup>\*</sup></abbr> | 参考资料                                                                                                                                                                                                          |
 |-----------------------------------------------------------------|------------------|----------------|---------------------------------------------------|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [2gis](https://2gis.ru)                                         | 地图             | 监测           | —                                                 | —                                                                    | [俄文，2019年7月](https://youtu.be/58sPkXfq6nw)                                                                                                                                                                   |
-| [Aloha 浏览器](https://alohabrowser.com/)                       | 移动应用程序     | 浏览器后端     | —                                                 | —                                                                    | [俄文幻灯片，2019年5月](https://github.com/yandex/clickhouse-presentations/blob/master/meetup22/aloha.pdf)                                                                                                        |
+| [阿里云](https://cn.aliyun.com/)                                | 公有云           | 全托管服务   | —                                                  | —                                                                    | [官方网站](https://help.aliyun.com/product/144466.html) |
+| [阿里云](https://cn.aliyun.com/)                                | 公有云           | E-MapReduce   | —                                                  | —                                                                    | [官方网站](https://help.aliyun.com/document_detail/212195.html) |
+| [Aloha 浏览器](https://alohabrowser.com/)                       | 移动应用程序     | 浏览器后端     | —                                                 | —                                                                    | [俄文幻灯片，2019年5月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/aloha.pdf)                                                                                                        |
 | [阿玛迪斯](https://amadeus.com/)                                | 旅行             | 分析           | —                                                 | —                                                                    | [新闻稿,四月2018](https://www.altinity.com/blog/2018/4/5/amadeus-technologies-launches-investment-and-insights-tool-based-on-machine-learning-and-strategy-algorithms)                                            |
 | [Appsflyer](https://www.appsflyer.com)                          | 移动分析         | 主要产品       | —                                                 | —                                                                    | [俄文，2019年7月](https://www.youtube.com/watch?v=M3wbRlcpBbY)                                                                                                                                                    |
 | [ArenaData](https://arenadata.tech/)                            | 数据平台         | 主要产品       | —                                                 | —                                                                    | [俄文幻灯片，十二月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup38/indexes.pdf)                                                                                                 |
-| [Badoo](https://badoo.com)                                      | 约会             | 时间序列       | —                                                 | —                                                                    | [俄文幻灯片，十二月2019](https://presentations.clickhouse.tech/meetup38/forecast.pdf)                                                                                                                             |
+| [Badoo](https://badoo.com)                                      | 约会             | 时间序列       | —                                                 | —                                                                    | [俄文幻灯片，十二月2019](https://presentations.clickhouse.com/meetup38/forecast.pdf)                                                                                                                             |
 | [Benocs](https://www.benocs.com/)                               | 网络遥测和分析   | 主要产品       | —                                                 | —                                                                    | [英文幻灯片，2017年10月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup9/lpm.pdf)                                                                                                      |
 | [彭博社](https://www.bloomberg.com/)                            | 金融、媒体       | 监测           | 102个服务器                                       | —                                                                    | [幻灯片，2018年5月](https://www.slideshare.net/Altinity/http-analytics-for-6m-requests-per-second-using-clickhouse-by-alexander-bocharov)                                                                         |
 | [Bloxy](https://bloxy.info)                                     | 区块链           | 分析           | —                                                 | —                                                                    | [俄文幻灯片，八月2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/4_bloxy.pptx)                                                                                                  |
@@ -35,7 +37,7 @@ toc_title: "ClickHouse用户"
 | [Exness](https://www.exness.com)                                | 交易             | 指标，日志记录 | —                                                 | —                                                                    | [俄语交谈，2019年5月](https://youtu.be/_rpU-TvSfZ8?t=3215)                                                                                                                                                        |
 | [精灵](https://geniee.co.jp)                                    | 广告网络         | 主要产品       | —                                                 | —                                                                    | [日文博客，2017年7月](https://tech.geniee.co.jp/entry/2017/07/20/160100)                                                                                                                                          |
 | [虎牙](https://www.huya.com/)                                   | 视频流           | 分析           | —                                                 | —                                                                    | [中文幻灯片，2018年10月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/7.%20ClickHouse万亿数据分析实践%20李本旺(sundy-li)%20虎牙.pdf)                                               |
-| [Idealista](https://www.idealista.com)                          | 房地产           | 分析           | —                                                 | —                                                                    | [英文博客文章,四月2019](https://clickhouse.tech/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                            |
+| [Idealista](https://www.idealista.com)                          | 房地产           | 分析           | —                                                 | —                                                                    | [英文博客文章,四月2019](https://clickhouse.com/blog/en/clickhouse-meetup-in-madrid-on-april-2-2019)                                                                                                            |
 | [Infovista](https://www.infovista.com/)                         | 网络             | 分析           | —                                                 | —                                                                    | [英文幻灯片，十月2019](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup30/infovista.pdf)                                                                                                 |
 | [InnoGames](https://www.innogames.com)                          | 游戏             | 指标，日志记录 | —                                                 | —                                                                    | [俄文幻灯片，2019年9月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/graphite_and_clickHouse.pdf)                                                                                  |
 | [Integros](https://integros.com)                                | 视频服务平台     | 分析           | —                                                 | —                                                                    | [俄文幻灯片，2019年5月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                               |
@@ -65,15 +67,15 @@ toc_title: "ClickHouse用户"
 | [Spotify](https://www.spotify.com)                              | 音乐             | 实验           | —                                                 | —                                                                    | [幻灯片，七月2018](https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173)                                                                                                              |
 | [腾讯](https://www.tencent.com)                                 | 大数据           | 数据处理       | —                                                 | —                                                                    | [中文幻灯片，2018年10月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup19/5.%20ClickHouse大数据集群应用_李俊飞腾讯网媒事业部.pdf)                                                      |
 | <a href="https://www.tencentmusic.com/" class="favicon">腾讯QQ音乐(TME)</a>                                  | 大数据                       | 数据处理               | —                                                          | —                                                                            | [博客文章，2020年6月](https://cloud.tencent.com/developer/article/1637840)
-| [优步](https://www.uber.com)                                    | 出租车           | 日志记录       | —                                                 | —                                                                    | [幻灯片，二月2020](https://presentations.clickhouse.tech/meetup40/uber.pdf)                                                                                                                                       |
+| [优步](https://www.uber.com)                                    | 出租车           | 日志记录       | —                                                 | —                                                                    | [幻灯片，二月2020](https://presentations.clickhouse.com/meetup40/uber.pdf)                                                                                                                                       |
 | [VKontakte](https://vk.com)                                     | 社交网络         | 统计，日志记录 | —                                                 | —                                                                    | [俄文幻灯片，八月2018](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup17/3_vk.pdf)                                                                                                      |
 | [Wisebits](https://wisebits.com/)                               | IT解决方案       | 分析           | —                                                 | —                                                                    | [俄文幻灯片，2019年5月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup22/strategies.pdf)                                                                                               |
 | [晓信科技](https://www.xiaoheiban.cn/)                          | 教育             | 共同目的       | —                                                 | —                                                                    | [英文幻灯片，2019年11月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/sync-clickhouse-with-mysql-mongodb.pptx)                                                                     |
 | [喜马拉雅](https://www.ximalaya.com/)                           | 音频共享         | OLAP           | —                                                 | —                                                                    | [英文幻灯片，2019年11月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup33/ximalaya.pdf)                                                                                                |
 | [Yandex云](https://cloud.yandex.ru/services/managed-clickhouse) | 公有云           | 主要产品       | —                                                 | —                                                                    | [俄文，2019年12月](https://www.youtube.com/watch?v=pgnak9e_E0o)                                                                                                                                                   |
-| [Yandex DataLens](https://cloud.yandex.ru/services/datalens)    | 商业智能         | 主要产品       | —                                                 | —                                                                    | [俄文幻灯片，十二月2019](https://presentations.clickhouse.tech/meetup38/datalens.pdf)                                                                                                                             |
+| [Yandex DataLens](https://cloud.yandex.ru/services/datalens)    | 商业智能         | 主要产品       | —                                                 | —                                                                    | [俄文幻灯片，十二月2019](https://presentations.clickhouse.com/meetup38/datalens.pdf)                                                                                                                             |
 | [Yandex市场](https://market.yandex.ru/)                         | 电子商务         | 指标，日志记录 | —                                                 | —                                                                    | [俄文，2019年1月](https://youtu.be/_l1qP0DyBcA?t=478)                                                                                                                                                             |
-| [Yandex Metrica](https://metrica.yandex.com)                    | 网站分析         | 主要产品       | 一个集群中的360台服务器，一个部门中的1862台服务器 | 66.41PiB/5.68PiB                                                     | [幻灯片，二月2020](https://presentations.clickhouse.tech/meetup40/introduction/#13)                                                                                                                               |
+| [Yandex Metrica](https://metrica.yandex.com)                    | 网站分析         | 主要产品       | 一个集群中的360台服务器，一个部门中的1862台服务器 | 66.41PiB/5.68PiB                                                     | [幻灯片，二月2020](https://presentations.clickhouse.com/meetup40/introduction/#13)                                                                                                                               |
 | [ЦВТ](https://htc-cs.ru/)                                       | 软件开发         | 指标，日志记录 | —                                                 | —                                                                    | [博客文章,三月2019，俄文](https://vc.ru/dev/62715-kak-my-stroili-monitoring-na-prometheus-clickhouse-i-elk)                                                                                                       |
 | [МКБ](https://mkb.ru/)                                          | 银行             | 网络系统监控   | —                                                 | —                                                                    | [俄文幻灯片，2019年9月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup28/mkb.pdf)                                                                                                      |
 | [金数据](https://jinshuju.net)                                  | 商业智能分析     | 主要产品       | —                                                 | —                                                                    | [中文幻灯片，2019年10月](https://github.com/ClickHouse/clickhouse-presentations/blob/master/meetup24/3.%20金数据数据架构调整方案Public.pdf)                                                                       |
@@ -82,4 +84,4 @@ toc_title: "ClickHouse用户"
 | [Crazypanda](https://crazypanda.ru/en/)                         | 游戏             |                | —                                                 | —                                                                    | ClickHouse 社区会议                                                                                                                                                                                               |
 | [FunCorp](https://fun.co/rp)                                    | 游戏             |                | —                                                 | —                                                                    | [文章](https://www.altinity.com/blog/migrating-from-redshift-to-clickhouse)                                                                                                                                       |
 
-[原始文章](https://clickhouse.tech/docs/en/introduction/adopters/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/introduction/adopters/) <!--hide-->
diff --git a/docs/zh/introduction/distinctive-features.md b/docs/zh/introduction/distinctive-features.md
index f74c98a0c1d..35d46163860 100644
--- a/docs/zh/introduction/distinctive-features.md
+++ b/docs/zh/introduction/distinctive-features.md
@@ -86,4 +86,4 @@ ClickHouse使用SQL查询实现用户帐户管理，并允许[角色的访问控
 2.  缺少高频率，低延迟的修改或删除已存在数据的能力。仅能用于批量删除或修改数据，但这符合 [GDPR](https://gdpr-info.eu)。
 3.  稀疏索引使得ClickHouse不适合通过其键检索单行的点查询。
 
-[来源文章](https://clickhouse.tech/docs/en/introduction/distinctive_features/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/introduction/distinctive_features/) <!--hide-->
diff --git a/docs/zh/introduction/history.md b/docs/zh/introduction/history.md
index 265ade8785b..95d7b1ddc96 100644
--- a/docs/zh/introduction/history.md
+++ b/docs/zh/introduction/history.md
@@ -51,4 +51,4 @@ OLAPServer可以很好的工作在非聚合数据上，但是它有诸多限制
 
 为了消除OLAPServer的这些局限性，解决所有报表使用非聚合数据的问题，我们开发了ClickHouse数据库管理系统。
 
-[来源文章](https://clickhouse.tech/docs/en/introduction/ya_metrika_task/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/introduction/ya_metrika_task/) <!--hide-->
diff --git a/docs/zh/introduction/performance.md b/docs/zh/introduction/performance.md
index 0ae4b9b1e1e..67ad8768205 100644
--- a/docs/zh/introduction/performance.md
+++ b/docs/zh/introduction/performance.md
@@ -5,9 +5,9 @@ toc_title: ClickHouse性能
 
 # 性能 {#performance}
 
-根据Yandex的内部测试结果，ClickHouse表现出了比同类可比较产品更优的性能。你可以在 [这里](https://clickhouse.tech/benchmark/dbms/) 查看具体的测试结果。
+根据Yandex的内部测试结果，ClickHouse表现出了比同类可比较产品更优的性能。你可以在 [这里](https://clickhouse.com/benchmark/dbms/) 查看具体的测试结果。
 
-许多其他的测试也证实这一点。你可以使用互联网搜索到它们，或者你也可以从 [我们收集的部分相关连接](https://clickhouse.tech/#independent-benchmarks) 中查看。
+许多其他的测试也证实这一点。你可以使用互联网搜索到它们，或者你也可以从 [我们收集的部分相关连接](https://clickhouse.com/#independent-benchmarks) 中查看。
 
 ## 单个大查询的吞吐量 {#dan-ge-da-cha-xun-de-tun-tu-liang}
 
@@ -27,4 +27,4 @@ toc_title: ClickHouse性能
 
 我们建议每次写入不少于1000行的批量写入，或每秒不超过一个写入请求。当使用tab-separated格式将一份数据写入到MergeTree表中时，写入速度大约为50到200MB/s。如果您写入的数据每行为1Kb，那么写入的速度为50，000到200，000行每秒。如果您的行更小，那么写入速度将更高。为了提高写入性能，您可以使用多个INSERT进行并行写入，这将带来线性的性能提升。
 
-[来源文章](https://clickhouse.tech/docs/en/introduction/performance/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/introduction/performance/) <!--hide-->
diff --git a/docs/zh/operations/access-rights.md b/docs/zh/operations/access-rights.md
index 97841699d09..ab8b3886a9a 100644
--- a/docs/zh/operations/access-rights.md
+++ b/docs/zh/operations/access-rights.md
@@ -143,4 +143,4 @@ Management queries:
      默认情况，SQL驱动方式的访问权限和账户管理对所有用户都是关闭的。你需要在 `users.xml` 中配置至少一个用户，并且把[权限管理](settings/settings-users.md#access_management-user-setting)的值设置为1。
 
 
-[Original article](https://clickhouse.tech/docs/en/operations/access_rights/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/operations/access_rights/) <!--hide-->
diff --git a/docs/zh/operations/backup.md b/docs/zh/operations/backup.md
index 6d517e6ccb3..165ecdf2a9b 100644
--- a/docs/zh/operations/backup.md
+++ b/docs/zh/operations/backup.md
@@ -1,13 +1,11 @@
 ---
-machine_translated: true
-machine_translated_rev: 72537a2d527c63c07aa5d2361a8829f3895cf2bd
 toc_priority: 49
 toc_title: "\u6570\u636E\u5907\u4EFD"
 ---
 
 # 数据备份 {#data-backup}
 
-尽管 [副本] (../engines/table-engines/mergetree-family/replication.md) 可以提供针对硬件的错误防护, 但是它不能预防人为操作失误: 数据的意外删除, 错误表的删除或者错误集群上表的删除, 以及导致错误数据处理或者数据损坏的软件bug. 在很多案例中，这类意外可能会影响所有的副本. ClickHouse 有内置的保护措施可以预防一些错误 — 例如, 默认情况下 [不能人工删除使用带有MergeTree引擎且包含超过50Gb数据的表] (server-configuration-parameters/settings.md#max-table-size-to-drop). 但是，这些保护措施不能覆盖所有可能情况，并且这些措施可以被绕过。
+尽管 [副本](../engines/table-engines/mergetree-family/replication.md) 可以提供针对硬件的错误防护, 但是它不能预防人为操作失误: 数据的意外删除, 错误表的删除或者错误集群上表的删除, 以及导致错误数据处理或者数据损坏的软件bug. 在很多案例中，这类意外可能会影响所有的副本. ClickHouse 有内置的保护措施可以预防一些错误 — 例如, 默认情况下 [不能人工删除使用带有MergeTree引擎且包含超过50Gb数据的表](server-configuration-parameters/settings.md#max-table-size-to-drop). 但是，这些保护措施不能覆盖所有可能情况，并且这些措施可以被绕过。
 
 为了有效地减少可能的人为错误，您应该 **提前** 仔细的准备备份和数据还原的策略.
 
@@ -18,26 +16,26 @@ toc_title: "\u6570\u636E\u5907\u4EFD"
 
 ## 将源数据复制到其它地方 {#duplicating-source-data-somewhere-else}
 
-通常摄入到ClickHouse的数据是通过某种持久队列传递的，例如 [Apache Kafka] (https://kafka.apache.org). 在这种情况下，可以配置一组额外的订阅服务器，这些订阅服务器将在写入ClickHouse时读取相同的数据流，并将其存储在冷存储中。 大多数公司已经有一些默认推荐的冷存储，可能是对象存储或分布式文件系统，如 [HDFS] (https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html).
+通常摄入到ClickHouse的数据是通过某种持久队列传递的，例如 [Apache Kafka](https://kafka.apache.org). 在这种情况下，可以配置一组额外的订阅服务器，这些订阅服务器将在写入ClickHouse时读取相同的数据流，并将其存储在冷存储中。 大多数公司已经有一些默认推荐的冷存储，可能是对象存储或分布式文件系统，如 [HDFS](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html).
 
 ## 文件系统快照 {#filesystem-snapshots}
 
-某些本地文件系统提供快照功能（例如, [ZFS] (https://en.wikipedia.org/wiki/ZFS)），但它们可能不是提供实时查询的最佳选择。 一个可能的解决方案是使用这种文件系统创建额外的副本，并将它们与用于`SELECT` 查询的 [分布式] (../engines/table-engines/special/distributed.md) 表分离。 任何修改数据的查询都无法访问此类副本上的快照。 作为回报，这些副本可能具有特殊的硬件配置，每个服务器附加更多的磁盘，这将是经济高效的。
+某些本地文件系统提供快照功能（例如, [ZFS](https://en.wikipedia.org/wiki/ZFS)），但它们可能不是提供实时查询的最佳选择。 一个可能的解决方案是使用这种文件系统创建额外的副本，并将它们与用于`SELECT` 查询的 [分布式](../engines/table-engines/special/distributed.md) 表分离。 任何修改数据的查询都无法访问此类副本上的快照。 作为回报，这些副本可能具有特殊的硬件配置，每个服务器附加更多的磁盘，这将是经济高效的。
 
 ## clickhouse-copier {#clickhouse-copier}
 
-[clickhouse-copier] (utilities/clickhouse-copier.md) 是一个多功能工具，最初创建它是为了用于重新切分pb大小的表。 因为它能够在ClickHouse表和集群之间可靠地复制数据，所以它也可用于备份和还原数据。
+[clickhouse-copier](utilities/clickhouse-copier.md) 是一个多功能工具，最初创建它是为了用于重新切分pb大小的表。 因为它能够在ClickHouse表和集群之间可靠地复制数据，所以它也可用于备份和还原数据。
 
 对于较小的数据量，一个简单的 `INSERT INTO ... SELECT ...` 到远程表也可以工作。
 
 ## part操作 {#manipulations-with-parts}
 
-ClickHouse允许使用 `ALTER TABLE ... FREEZE PARTITION ...` 查询以创建表分区的本地副本。 这是利用硬链接(hardlink)到 `/var/lib/clickhouse/shadow/` 文件夹中实现的，所以它通常不会因为旧数据而占用额外的磁盘空间。 创建的文件副本不由ClickHouse服务器处理，所以你可以把它们留在那里：你将有一个简单的备份，不需要任何额外的外部系统，但它仍然容易出现硬件问题。 出于这个原因，最好将它们远程复制到另一个位置，然后删除本地副本。 分布式文件系统和对象存储仍然是一个不错的选择，但是具有足够大容量的正常附加文件服务器也可以工作（在这种情况下，传输将通过网络文件系统或者也许是 [rsync] (https://en.wikipedia.org/wiki/Rsync) 来进行).
+ClickHouse允许使用 `ALTER TABLE ... FREEZE PARTITION ...` 查询以创建表分区的本地副本。 这是利用硬链接(hardlink)到 `/var/lib/clickhouse/shadow/` 文件夹中实现的，所以它通常不会因为旧数据而占用额外的磁盘空间。 创建的文件副本不由ClickHouse服务器处理，所以你可以把它们留在那里：你将有一个简单的备份，不需要任何额外的外部系统，但它仍然容易出现硬件问题。 出于这个原因，最好将它们远程复制到另一个位置，然后删除本地副本。 分布式文件系统和对象存储仍然是一个不错的选择，但是具有足够大容量的正常附加文件服务器也可以工作（在这种情况下，传输将通过网络文件系统或者也许是 [rsync](https://en.wikipedia.org/wiki/Rsync) 来进行).
 
 数据可以使用 `ALTER TABLE ... ATTACH PARTITION ...` 从备份中恢复。
 
-有关与分区操作相关的查询的详细信息，请参阅 [更改文档] (../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
+有关与分区操作相关的查询的详细信息，请参阅 [更改文档](../sql-reference/statements/alter.md#alter_manipulations-with-partitions).
 
-第三方工具可用于自动化此方法: [clickhouse-backup] (https://github.com/AlexAkulov/clickhouse-backup).
+第三方工具可用于自动化此方法: [clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup).
 
-[原始文章] (https://clickhouse.tech/docs/en/operations/backup/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/backup/) <!--hide-->
diff --git a/docs/zh/operations/caches.md b/docs/zh/operations/caches.md
new file mode 120000
index 00000000000..ab229298e5f
--- /dev/null
+++ b/docs/zh/operations/caches.md
@@ -0,0 +1 @@
+../../en/operations/caches.md
\ No newline at end of file
diff --git a/docs/zh/operations/clickhouse-keeper.md b/docs/zh/operations/clickhouse-keeper.md
new file mode 120000
index 00000000000..528ba82fea4
--- /dev/null
+++ b/docs/zh/operations/clickhouse-keeper.md
@@ -0,0 +1 @@
+../../en/operations/clickhouse-keeper.md
\ No newline at end of file
diff --git a/docs/zh/operations/configuration-files.md b/docs/zh/operations/configuration-files.md
index ae760ee2d5d..da76a3588e3 100644
--- a/docs/zh/operations/configuration-files.md
+++ b/docs/zh/operations/configuration-files.md
@@ -13,7 +13,7 @@ ClickHouse支持多配置文件管理。主配置文件是`/etc/clickhouse-serve
 
 如果指定`remove`属性，则删除该元素。
 
-此外，配置文件还可指定"substitutions"。如果一个元素有`incl`属性，则文件中的相应替换值将被使用。默认情况下，具有替换的文件的路径为`/etc/metrika.xml`。这可以在服务配置中的[include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from)元素中被修改。替换值在这个文件的`/yandex/substitution_name`元素中被指定。如果`incl`中指定的替换值不存在，则将其记录在日志中。为防止ClickHouse记录丢失的替换，请指定`optional="true"`属性（例如，[宏](server-configuration-parameters/settings.md)设置）。
+此外，配置文件还可指定"substitutions"。如果一个元素有`incl`属性，则文件中的相应替换值将被使用。默认情况下，具有替换的文件的路径为`/etc/metrika.xml`。这可以在服务配置中的[include_from](server-configuration-parameters/settings.md#server_configuration_parameters-include_from)元素中被修改。替换值在这个文件的`/clickhouse/substitution_name`元素中被指定。如果`incl`中指定的替换值不存在，则将其记录在日志中。为防止ClickHouse记录丢失的替换，请指定`optional="true"`属性（例如，[宏](server-configuration-parameters/settings.md)设置）。
 
 替换也可以从ZooKeeper执行。为此，请指定属性`from_zk = "/path/to/node"`。元素值被替换为ZooKeeper节点`/path/to/node`的内容。您还可以将整个XML子树放在ZooKeeper节点上，并将其完全插入到源元素中。
 
@@ -44,4 +44,4 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 服务器跟踪配置文件中的更改，以及执行替换和复盖时使用的文件和ZooKeeper节点，并动态重新加载用户和集群的设置。 这意味着您可以在不重新启动服务器的情况下修改群集、用户及其设置。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/configuration_files/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/configuration_files/) <!--hide-->
diff --git a/docs/zh/operations/external-authenticators/index.md b/docs/zh/operations/external-authenticators/index.md
new file mode 120000
index 00000000000..5f656246c9d
--- /dev/null
+++ b/docs/zh/operations/external-authenticators/index.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/index.md
\ No newline at end of file
diff --git a/docs/zh/operations/external-authenticators/kerberos.md b/docs/zh/operations/external-authenticators/kerberos.md
new file mode 100644
index 00000000000..5d2122c5fea
--- /dev/null
+++ b/docs/zh/operations/external-authenticators/kerberos.md
@@ -0,0 +1,105 @@
+# Kerberos认证 {#external-authenticators-kerberos} 
+现有正确配置的 ClickHouse 用户可以通过 Kerberos 身份验证协议进行身份验证.
+
+目前, Kerberos 只能用作现有用户的外部身份验证器，这些用户在 `users.xml` 或本地访问控制路径中定义.
+这些用户只能使用 HTTP 请求, 并且必须能够使用 GSS-SPNEGO 机制进行身份验证.
+
+对于这种方法, 必须在系统中配置 Kerberos, 且必须在 ClickHouse 配置中启用.
+
+## 开启Kerberos {#enabling-kerberos-in-clickHouse}
+要启用 Kerberos, 应该在 `config.xml` 中包含 `kerberos` 部分. 此部分可能包含其他参数.
+
+#### 参数: {#parameters}
+- `principal` - 将在接受安全上下文时获取和使用的规范服务主体名称.
+- 此参数是可选的, 如果省略, 将使用默认主体.
+
+- `realm` - 一个领域, 用于将身份验证限制为仅那些发起者领域与其匹配的请求.
+
+- 此参数是可选的，如果省略，则不会应用其他领域的过滤.
+
+示例 (进入 `config.xml`):
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos />
+</yandex>
+```
+
+主体规范:
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
+    </kerberos>
+</yandex>
+```
+
+按领域过滤:
+```xml
+<yandex>
+    <!- ... -->
+    <kerberos>
+        <realm>EXAMPLE.COM</realm>
+    </kerberos>
+</yandex>
+```
+
+!!! warning "注意"
+
+您只能定义一个 `kerberos` 部分. 多个 `kerberos` 部分的存在将强制 ClickHouse 禁用 Kerberos 身份验证.
+
+!!! warning "注意"
+
+`主体`和`领域`部分不能同时指定. `主体`和`领域`的出现将迫使ClickHouse禁用Kerberos身份验证.
+
+## Kerberos作为现有用户的外部身份验证器 {#kerberos-as-an-external-authenticator-for-existing-users}
+Kerberos可以用作验证本地定义用户(在`users.xml`或本地访问控制路径中定义的用户)身份的方法。目前，**只有**通过HTTP接口的请求才能被认证(通过GSS-SPNEGO机制).
+
+Kerberos主体名称格式通常遵循以下模式:
+- *primary/instance@REALM*
+
+*/instance* 部分可能出现零次或多次. **发起者的规范主体名称的主要部分应与被认证用户名匹配, 以便身份验证成功**.
+
+### `users.xml`中启用Kerberos {#enabling-kerberos-in-users-xml}
+为了启用用户的 Kerberos 身份验证, 请在用户定义中指定 `kerberos` 部分而不是`密码`或类似部分.
+
+参数:
+- `realm` - 用于将身份验证限制为仅那些发起者的领域与其匹配的请求的领域.
+- 此参数是可选的, 如果省略, 则不会应用其他按领域的过滤.
+
+示例 (进入 `users.xml`):
+```
+<yandex>
+    <!- ... -->
+    <users>
+        <!- ... -->
+        <my_user>
+            <!- ... -->
+            <kerberos>
+                <realm>EXAMPLE.COM</realm>
+            </kerberos>
+        </my_user>
+    </users>
+</yandex>
+```
+
+!!! warning "警告"
+
+注意, Kerberos身份验证不能与任何其他身份验证机制一起使用. 任何其他部分(如`密码`和`kerberos`)的出现都会迫使ClickHouse关闭.
+
+!!! info "提醒"
+
+请注意, 现在, 一旦用户 `my_user` 使用 `kerberos`, 必须在主 `config.xml` 文件中启用 Kerberos，如前所述.
+
+### 使用 SQL 启用 Kerberos {#enabling-kerberos-using-sql}
+在 ClickHouse 中启用 [SQL 驱动的访问控制和帐户管理](https://clickhouse.com/docs/en/operations/access-rights/#access-control)后, 也可以使用 SQL 语句创建由 Kerberos 识别的用户.
+
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos REALM 'EXAMPLE.COM'
+```
+
+...或者, 不按领域过滤:
+```sql
+CREATE USER my_user IDENTIFIED WITH kerberos
+```
diff --git a/docs/zh/operations/external-authenticators/ldap.md b/docs/zh/operations/external-authenticators/ldap.md
new file mode 120000
index 00000000000..a171d0ac05a
--- /dev/null
+++ b/docs/zh/operations/external-authenticators/ldap.md
@@ -0,0 +1 @@
+../../../en/operations/external-authenticators/ldap.md
\ No newline at end of file
diff --git a/docs/zh/operations/index.md b/docs/zh/operations/index.md
index 5139f083ceb..c3f55ac2a11 100644
--- a/docs/zh/operations/index.md
+++ b/docs/zh/operations/index.md
@@ -22,4 +22,4 @@ ClickHouse操作手册由以下主要部分组成：
 -   [设置](../operations/settings/index.md)
 -   [实用工具](../operations/utilities/index.md)
 
-[原文](https://clickhouse.tech/docs/en/operations/) <!--hide-->
+[原文](https://clickhouse.com/docs/en/operations/) <!--hide-->
diff --git a/docs/zh/operations/opentelemetry.md b/docs/zh/operations/opentelemetry.md
new file mode 120000
index 00000000000..a4d96e36a4e
--- /dev/null
+++ b/docs/zh/operations/opentelemetry.md
@@ -0,0 +1 @@
+../../en/operations/opentelemetry.md
\ No newline at end of file
diff --git a/docs/zh/operations/performance-test.md b/docs/zh/operations/performance-test.md
index 7728325bb9a..9f5f4fe61f1 100644
--- a/docs/zh/operations/performance-test.md
+++ b/docs/zh/operations/performance-test.md
@@ -48,7 +48,7 @@ toc_title: "\u6D4B\u8BD5\u786C\u4EF6"
 
 <!-- -->
 
-      wget https://datasets.clickhouse.tech/hits/partitions/hits_100m_obfuscated_v1.tar.xz
+      wget https://datasets.clickhouse.com/hits/partitions/hits_100m_obfuscated_v1.tar.xz
       tar xvf hits_100m_obfuscated_v1.tar.xz -C .
       mv hits_100m_obfuscated_v1/* .
 
diff --git a/docs/zh/operations/quotas.md b/docs/zh/operations/quotas.md
index 21405ae106f..6bbaf0cb6fd 100644
--- a/docs/zh/operations/quotas.md
+++ b/docs/zh/operations/quotas.md
@@ -102,4 +102,4 @@ For distributed query processing, the accumulated amounts are stored on the requ
 
 服务器重新启动时，将重置配额。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/quotas/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/quotas/) <!--hide-->
diff --git a/docs/zh/operations/server-configuration-parameters/index.md b/docs/zh/operations/server-configuration-parameters/index.md
index 82e698055fa..38ee76ee05d 100644
--- a/docs/zh/operations/server-configuration-parameters/index.md
+++ b/docs/zh/operations/server-configuration-parameters/index.md
@@ -8,4 +8,4 @@ Other settings are described in the «[设置](../settings/index.md#settings)»
 
 在研究设置之前，请阅读 [配置文件](../configuration-files.md#configuration_files) 部分和注意使用替换（的 `incl` 和 `optional` 属性）。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/server_configuration_parameters/) <!--hide-->
diff --git a/docs/zh/operations/server-configuration-parameters/settings.md b/docs/zh/operations/server-configuration-parameters/settings.md
index 0c6a5046877..d31dd5da805 100644
--- a/docs/zh/operations/server-configuration-parameters/settings.md
+++ b/docs/zh/operations/server-configuration-parameters/settings.md
@@ -282,12 +282,12 @@ ClickHouse每x秒重新加载内置字典。 这使得编辑字典 “on the fly
 
 ## keep_alive_timeout {#keep-alive-timeout}
 
-ClickHouse在关闭连接之前等待传入请求的秒数。 默认为3秒。
+ClickHouse在关闭连接之前等待传入请求的秒数。默认为10秒。
 
 **示例**
 
 ``` xml
-<keep_alive_timeout>3</keep_alive_timeout>
+<keep_alive_timeout>10</keep_alive_timeout>
 ```
 
 ## listen_host {#server_configuration_parameters-listen_host}
@@ -867,4 +867,4 @@ ZooKeeper中数据部分头的存储方法。
 
 **默认值**: 15.
 
-[原始文章](https://clickhouse.tech/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/server_configuration_parameters/settings/) <!--hide-->
diff --git a/docs/zh/operations/settings/constraints-on-settings.md b/docs/zh/operations/settings/constraints-on-settings.md
index 3b499199fa5..8fb83505e1b 100644
--- a/docs/zh/operations/settings/constraints-on-settings.md
+++ b/docs/zh/operations/settings/constraints-on-settings.md
@@ -72,4 +72,4 @@ Code: 452, e.displayText() = DB::Exception: Setting force_index_by_date should n
 
 **注:** 该 `default` 配置文件具有特殊的处理：所有定义的约束 `default` 配置文件成为默认约束，因此它们限制所有用户，直到为这些用户显式复盖它们。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/constraints_on_settings/) <!--hide-->
diff --git a/docs/zh/operations/settings/index.md b/docs/zh/operations/settings/index.md
index 3528be0c641..38ce4c345e5 100644
--- a/docs/zh/operations/settings/index.md
+++ b/docs/zh/operations/settings/index.md
@@ -26,4 +26,4 @@ toc_folder_title: "\u8BBE\u7F6E"
 
 本节不介绍只能在服务器配置文件中进行的设置。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/) <!--hide-->
diff --git a/docs/zh/operations/settings/merge-tree-settings.md b/docs/zh/operations/settings/merge-tree-settings.md
new file mode 120000
index 00000000000..51825e80601
--- /dev/null
+++ b/docs/zh/operations/settings/merge-tree-settings.md
@@ -0,0 +1 @@
+../../../en/operations/settings/merge-tree-settings.md
\ No newline at end of file
diff --git a/docs/zh/operations/settings/permissions-for-queries.md b/docs/zh/operations/settings/permissions-for-queries.md
index aa7bc8c7937..a72500b76d5 100644
--- a/docs/zh/operations/settings/permissions-for-queries.md
+++ b/docs/zh/operations/settings/permissions-for-queries.md
@@ -58,4 +58,4 @@ ClickHouse中的查询可以分为几种类型:
 
 默认值：1
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/permissions_for_queries/) <!--hide-->
diff --git a/docs/zh/operations/settings/query-complexity.md b/docs/zh/operations/settings/query-complexity.md
index 680d5e001e0..77f4a3729e1 100644
--- a/docs/zh/operations/settings/query-complexity.md
+++ b/docs/zh/operations/settings/query-complexity.md
@@ -254,4 +254,4 @@ Possible values:
 Default value: 0.
 
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/query_complexity/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/query_complexity/) <!--hide-->
diff --git a/docs/zh/operations/settings/settings-profiles.md b/docs/zh/operations/settings/settings-profiles.md
index 8eec30d9fc5..77dff88d50b 100644
--- a/docs/zh/operations/settings/settings-profiles.md
+++ b/docs/zh/operations/settings/settings-profiles.md
@@ -78,4 +78,4 @@ SET profile = 'web'
 
 该 `web` 配置文件是一个常规的配置文件，可以使用设置 `SET` 查询或在HTTP查询中使用URL参数。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/settings_profiles/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/settings_profiles/) <!--hide-->
diff --git a/docs/zh/operations/settings/settings-users.md b/docs/zh/operations/settings/settings-users.md
index bb630a43e43..ae75dddab58 100644
--- a/docs/zh/operations/settings/settings-users.md
+++ b/docs/zh/operations/settings/settings-users.md
@@ -161,4 +161,4 @@ DNS请求的所有结果都将被缓存，直到服务器重新启动。
 
 该 `filter` 可以是导致任何表达式 [UInt8](../../sql-reference/data-types/int-uint.md)-键入值。 它通常包含比较和逻辑运算符。 从行 `database_name.table1` 其中，不会为此用户返回为0的筛选结果。 过滤是不兼容的 `PREWHERE` 操作和禁用 `WHERE→PREWHERE` 优化。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/settings_users/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/settings_users/) <!--hide-->
diff --git a/docs/zh/operations/settings/settings.md b/docs/zh/operations/settings/settings.md
index ef4f4f86d01..f8b736ea7c2 100644
--- a/docs/zh/operations/settings/settings.md
+++ b/docs/zh/operations/settings/settings.md
@@ -1252,7 +1252,7 @@ ClickHouse生成异常
 
 默认值：16。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/settings/settings/) <!-- hide -->
+[原始文章](https://clickhouse.com/docs/en/operations/settings/settings/) <!-- hide -->
 
 ## transform_null_in {#transform_null_in}
 
diff --git a/docs/zh/operations/storing-data.md b/docs/zh/operations/storing-data.md
new file mode 120000
index 00000000000..16722fb5a39
--- /dev/null
+++ b/docs/zh/operations/storing-data.md
@@ -0,0 +1 @@
+../../en/operations/storing-data.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/asynchronous_metric_log.md b/docs/zh/operations/system-tables/asynchronous_metric_log.md
index ff7593768d3..592fb99c5ef 100644
--- a/docs/zh/operations/system-tables/asynchronous_metric_log.md
+++ b/docs/zh/operations/system-tables/asynchronous_metric_log.md
@@ -5,4 +5,34 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 ## system.asynchronous_metric_log {#system-tables-async-log}
 
-包含以下内容的历史值 `system.asynchronous_log` （见 [系统。asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics))
+包含每分钟记录一次的 `system.asynchronous_metrics`历史值. 默认开启. 
+
+列：
+-   `event_date` ([Date](../../sql-reference/data-types/date.md)) — 事件日期.
+-   `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — 事件时间.
+-   `event_time_microseconds` ([DateTime64](../../sql-reference/data-types/datetime64.md)) — 事件时间(微秒).
+-   `name` ([String](../../sql-reference/data-types/string.md)) — 指标名.
+-   `value` ([Float64](../../sql-reference/data-types/float.md)) — 指标值.
+
+**示例**
+``` sql
+SELECT * FROM system.asynchronous_metric_log LIMIT 10
+```
+``` text
+┌─event_date─┬──────────event_time─┬────event_time_microseconds─┬─name─────────────────────────────────────┬─────value─┐
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ CPUFrequencyMHz_0                        │    2120.9 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.arenas.all.pmuzzy               │       743 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.arenas.all.pdirty               │     26288 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.background_thread.run_intervals │         0 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.background_thread.num_runs      │         0 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.retained                        │  60694528 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.mapped                          │ 303161344 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.resident                        │ 260931584 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.metadata                        │  12079488 │
+│ 2020-09-05 │ 2020-09-05 15:56:30 │ 2020-09-05 15:56:30.025227 │ jemalloc.allocated                       │ 133756128 │
+└────────────┴─────────────────────┴────────────────────────────┴──────────────────────────────────────────┴───────────┘
+```
+
+**另请参阅**
+-   [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) — 包含在后台定期计算的指标.
+-   [system.metric_log](../../operations/system-tables/metric_log.md#system_tables-metric_log) — 包含定期刷新到磁盘表 `system.metrics` 以及 `system.events` 中的指标值历史记录.
diff --git a/docs/zh/operations/system-tables/clusters.md b/docs/zh/operations/system-tables/clusters.md
index 386bdfd539b..e41aa2dd8fc 100644
--- a/docs/zh/operations/system-tables/clusters.md
+++ b/docs/zh/operations/system-tables/clusters.md
@@ -24,4 +24,4 @@
 -   [distributed_replica_error_cap设置](../../operations/settings/settings.md#settings-distributed_replica_error_cap)
 -   [distributed_replica_error_half_life设置](../../operations/settings/settings.md#settings-distributed_replica_error_half_life)
 
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/clusters) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/clusters) <!--hide-->
diff --git a/docs/zh/operations/system-tables/columns.md b/docs/zh/operations/system-tables/columns.md
index b21be98c0dc..9a90561a07b 100644
--- a/docs/zh/operations/system-tables/columns.md
+++ b/docs/zh/operations/system-tables/columns.md
@@ -26,4 +26,4 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 -   `is_in_primary_key` (UInt8) — Flag that indicates whether the column is in the primary key expression.
 -   `is_in_sampling_key` (UInt8) — Flag that indicates whether the column is in the sampling key expression.
 
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/columns) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/columns) <!--hide-->
diff --git a/docs/zh/operations/system-tables/crash-log.md b/docs/zh/operations/system-tables/crash-log.md
new file mode 120000
index 00000000000..d1aa67601bc
--- /dev/null
+++ b/docs/zh/operations/system-tables/crash-log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/crash-log.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/current-roles.md b/docs/zh/operations/system-tables/current-roles.md
new file mode 120000
index 00000000000..b9f1f9d6e9d
--- /dev/null
+++ b/docs/zh/operations/system-tables/current-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/current-roles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/data_skipping_indices.md b/docs/zh/operations/system-tables/data_skipping_indices.md
new file mode 120000
index 00000000000..2820987bf69
--- /dev/null
+++ b/docs/zh/operations/system-tables/data_skipping_indices.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/data_skipping_indices.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/data_type_families.md b/docs/zh/operations/system-tables/data_type_families.md
index 000abfce65d..b1d114a6df0 100644
--- a/docs/zh/operations/system-tables/data_type_families.md
+++ b/docs/zh/operations/system-tables/data_type_families.md
@@ -1,9 +1,5 @@
----
-machine_translated: true
-machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
----
 
-# 系统。data_type_families {#system_tables-data_type_families}
+# system.data_type_families {#system_tables-data_type_families}
 
 包含有关受支持的[数据类型](../../sql-reference/data-types/)的信息.
 
diff --git a/docs/zh/operations/system-tables/distributed_ddl_queue.md b/docs/zh/operations/system-tables/distributed_ddl_queue.md
new file mode 120000
index 00000000000..a9cadc74af2
--- /dev/null
+++ b/docs/zh/operations/system-tables/distributed_ddl_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distributed_ddl_queue.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/distribution_queue.md b/docs/zh/operations/system-tables/distribution_queue.md
new file mode 120000
index 00000000000..3831b85000c
--- /dev/null
+++ b/docs/zh/operations/system-tables/distribution_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/distribution_queue.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/enabled-roles.md b/docs/zh/operations/system-tables/enabled-roles.md
new file mode 120000
index 00000000000..04ffee25343
--- /dev/null
+++ b/docs/zh/operations/system-tables/enabled-roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/enabled-roles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/errors.md b/docs/zh/operations/system-tables/errors.md
new file mode 120000
index 00000000000..2bb8c1dff0d
--- /dev/null
+++ b/docs/zh/operations/system-tables/errors.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/errors.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/grants.md b/docs/zh/operations/system-tables/grants.md
new file mode 120000
index 00000000000..ec7f50b118e
--- /dev/null
+++ b/docs/zh/operations/system-tables/grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/grants.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/index.md b/docs/zh/operations/system-tables/index.md
index 0e5778e3051..21e0bccc693 100644
--- a/docs/zh/operations/system-tables/index.md
+++ b/docs/zh/operations/system-tables/index.md
@@ -73,4 +73,4 @@ toc_title: "\u7CFB\u7EDF\u8868"
 -   `OSReadBytes`
 -   `OSWriteBytes`
 
-[原始文章](https://clickhouse.tech/docs/en/operations/system-tables/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/system-tables/) <!--hide-->
diff --git a/docs/zh/operations/system-tables/licenses.md b/docs/zh/operations/system-tables/licenses.md
new file mode 120000
index 00000000000..a84b4bbf3e3
--- /dev/null
+++ b/docs/zh/operations/system-tables/licenses.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/licenses.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/opentelemetry_span_log.md b/docs/zh/operations/system-tables/opentelemetry_span_log.md
new file mode 120000
index 00000000000..59aab8cd11d
--- /dev/null
+++ b/docs/zh/operations/system-tables/opentelemetry_span_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/opentelemetry_span_log.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/parts_columns.md b/docs/zh/operations/system-tables/parts_columns.md
new file mode 120000
index 00000000000..f2c7d4dde34
--- /dev/null
+++ b/docs/zh/operations/system-tables/parts_columns.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/parts_columns.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/query_views_log.md b/docs/zh/operations/system-tables/query_views_log.md
new file mode 120000
index 00000000000..f606e4108ca
--- /dev/null
+++ b/docs/zh/operations/system-tables/query_views_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/query_views_log.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quota_limits.md b/docs/zh/operations/system-tables/quota_limits.md
new file mode 120000
index 00000000000..3fecf881c92
--- /dev/null
+++ b/docs/zh/operations/system-tables/quota_limits.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_limits.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quota_usage.md b/docs/zh/operations/system-tables/quota_usage.md
new file mode 120000
index 00000000000..c79f1a75033
--- /dev/null
+++ b/docs/zh/operations/system-tables/quota_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quota_usage.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quotas.md b/docs/zh/operations/system-tables/quotas.md
new file mode 120000
index 00000000000..b6a26bf77f3
--- /dev/null
+++ b/docs/zh/operations/system-tables/quotas.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/quotas_usage.md b/docs/zh/operations/system-tables/quotas_usage.md
new file mode 120000
index 00000000000..ba204a4d9c0
--- /dev/null
+++ b/docs/zh/operations/system-tables/quotas_usage.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/quotas_usage.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/replicated_fetches.md b/docs/zh/operations/system-tables/replicated_fetches.md
new file mode 120000
index 00000000000..bf4547ebd07
--- /dev/null
+++ b/docs/zh/operations/system-tables/replicated_fetches.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replicated_fetches.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/replication_queue.md b/docs/zh/operations/system-tables/replication_queue.md
new file mode 120000
index 00000000000..cdc452594e6
--- /dev/null
+++ b/docs/zh/operations/system-tables/replication_queue.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/replication_queue.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/role-grants.md b/docs/zh/operations/system-tables/role-grants.md
new file mode 120000
index 00000000000..6a25ffa31ce
--- /dev/null
+++ b/docs/zh/operations/system-tables/role-grants.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/role-grants.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/roles.md b/docs/zh/operations/system-tables/roles.md
new file mode 120000
index 00000000000..391bc980a48
--- /dev/null
+++ b/docs/zh/operations/system-tables/roles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/roles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/row_policies.md b/docs/zh/operations/system-tables/row_policies.md
new file mode 120000
index 00000000000..b194161cf1d
--- /dev/null
+++ b/docs/zh/operations/system-tables/row_policies.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/row_policies.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/settings_profile_elements.md b/docs/zh/operations/system-tables/settings_profile_elements.md
new file mode 120000
index 00000000000..3b0e70ead49
--- /dev/null
+++ b/docs/zh/operations/system-tables/settings_profile_elements.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profile_elements.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/settings_profiles.md b/docs/zh/operations/system-tables/settings_profiles.md
new file mode 120000
index 00000000000..1c559bf2445
--- /dev/null
+++ b/docs/zh/operations/system-tables/settings_profiles.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/settings_profiles.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/stack_trace.md b/docs/zh/operations/system-tables/stack_trace.md
new file mode 120000
index 00000000000..8dea20028f1
--- /dev/null
+++ b/docs/zh/operations/system-tables/stack_trace.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/stack_trace.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/tables.md b/docs/zh/operations/system-tables/tables.md
index d82911498ad..6a719a92ca0 100644
--- a/docs/zh/operations/system-tables/tables.md
+++ b/docs/zh/operations/system-tables/tables.md
@@ -55,4 +55,4 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 `system.tables` 表被用于 `SHOW TABLES` 的查询实现中。
 
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/tables) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/tables) <!--hide-->
diff --git a/docs/zh/operations/system-tables/time_zones.md b/docs/zh/operations/system-tables/time_zones.md
new file mode 120000
index 00000000000..d7b0f07d326
--- /dev/null
+++ b/docs/zh/operations/system-tables/time_zones.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/time_zones.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/users.md b/docs/zh/operations/system-tables/users.md
new file mode 120000
index 00000000000..540c5ac6620
--- /dev/null
+++ b/docs/zh/operations/system-tables/users.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/users.md
\ No newline at end of file
diff --git a/docs/zh/operations/system-tables/zookeeper.md b/docs/zh/operations/system-tables/zookeeper.md
index c25ce498460..70eedc7294e 100644
--- a/docs/zh/operations/system-tables/zookeeper.md
+++ b/docs/zh/operations/system-tables/zookeeper.md
@@ -77,4 +77,4 @@ numChildren:    7
 pzxid:          987021252247
 path:           /clickhouse/tables/01-08/visits/replicas
 ```
-[原文](https://clickhouse.tech/docs/zh/operations/system-tables/zookeeper) <!--hide-->
+[原文](https://clickhouse.com/docs/zh/operations/system-tables/zookeeper) <!--hide-->
diff --git a/docs/zh/operations/system-tables/zookeeper_log.md b/docs/zh/operations/system-tables/zookeeper_log.md
new file mode 120000
index 00000000000..c7db82e978a
--- /dev/null
+++ b/docs/zh/operations/system-tables/zookeeper_log.md
@@ -0,0 +1 @@
+../../../en/operations/system-tables/zookeeper_log.md
\ No newline at end of file
diff --git a/docs/zh/operations/tips.md b/docs/zh/operations/tips.md
index 6b46dbb5285..63a74abd7d8 100644
--- a/docs/zh/operations/tips.md
+++ b/docs/zh/operations/tips.md
@@ -71,7 +71,7 @@ echo 4096 | sudo tee /sys/block/md2/md/stripe_cache_size
 
 ## 文件系统 {#file-system}
 
-Ext4是最可靠的选择。 设置挂载选项 `noatime, nobarrier`.
+Ext4是最可靠的选择。 设置挂载选项 `noatime`.
 XFS也是合适的，但它还没有经过ClickHouse的全面测试。
 大多数其他文件系统也应该可以正常工作。 具有延迟分配的文件系统工作得更好。
 
@@ -254,4 +254,4 @@ JAVA_OPTS="-Xms{{ '{{' }} cluster.get('xms','128M') {{ '}}' }} \
             -Dzookeeper.root.logger=${ZOO_LOG4J_PROP} $ZOOMAIN $ZOOCFG
     end script
 
-[原始文章](https://clickhouse.tech/docs/en/operations/tips/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/tips/) <!--hide-->
diff --git a/docs/zh/operations/troubleshooting.md b/docs/zh/operations/troubleshooting.md
index 56b18aa1307..8d1defd6366 100644
--- a/docs/zh/operations/troubleshooting.md
+++ b/docs/zh/operations/troubleshooting.md
@@ -26,7 +26,7 @@ toc_title: "常见问题"
 
 ### 服务器未运行 {#server-is-not-running}
 
-**检查服务器是否运行nnig**
+**检查服务器是否正在运行**
 
 命令:
 
diff --git a/docs/zh/operations/utilities/clickhouse-compressor.md b/docs/zh/operations/utilities/clickhouse-compressor.md
new file mode 120000
index 00000000000..98b1d8c4c7c
--- /dev/null
+++ b/docs/zh/operations/utilities/clickhouse-compressor.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-compressor.md
\ No newline at end of file
diff --git a/docs/zh/operations/utilities/clickhouse-copier.md b/docs/zh/operations/utilities/clickhouse-copier.md
index 3dc29fe16fa..b68390fce04 100644
--- a/docs/zh/operations/utilities/clickhouse-copier.md
+++ b/docs/zh/operations/utilities/clickhouse-copier.md
@@ -168,4 +168,4 @@ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --base-
 
 `clickhouse-copier` 跟踪更改 `/task/path/description` 并在飞行中应用它们。 例如，如果你改变的值 `max_workers`，运行任务的进程数也会发生变化。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/utils/clickhouse-copier/) <!--hide-->
diff --git a/docs/zh/operations/utilities/clickhouse-format.md b/docs/zh/operations/utilities/clickhouse-format.md
new file mode 120000
index 00000000000..d71a78cd40b
--- /dev/null
+++ b/docs/zh/operations/utilities/clickhouse-format.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-format.md
\ No newline at end of file
diff --git a/docs/zh/operations/utilities/clickhouse-local.md b/docs/zh/operations/utilities/clickhouse-local.md
index 9b0ae841cd6..93df9b589e9 100644
--- a/docs/zh/operations/utilities/clickhouse-local.md
+++ b/docs/zh/operations/utilities/clickhouse-local.md
@@ -98,4 +98,4 @@ Read 186 rows, 4.15 KiB in 0.035 sec., 5302 rows/sec., 118.34 KiB/sec.
 ...
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/operations/utils/clickhouse-local/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/utils/clickhouse-local/) <!--hide-->
diff --git a/docs/zh/operations/utilities/clickhouse-obfuscator.md b/docs/zh/operations/utilities/clickhouse-obfuscator.md
new file mode 120000
index 00000000000..06d1df70693
--- /dev/null
+++ b/docs/zh/operations/utilities/clickhouse-obfuscator.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/clickhouse-obfuscator.md
\ No newline at end of file
diff --git a/docs/zh/operations/utilities/index.md b/docs/zh/operations/utilities/index.md
index 0d60fb8bbb9..ab65922c35c 100644
--- a/docs/zh/operations/utilities/index.md
+++ b/docs/zh/operations/utilities/index.md
@@ -4,4 +4,4 @@
 -   [跨集群复制](clickhouse-copier.md) —  在不同集群间复制数据。
 -   [性能测试](clickhouse-benchmark.md) — 连接到Clickhouse服务器，执行性能测试。
 
-[原始文章](https://clickhouse.tech/docs/en/operations/utils/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/operations/utils/) <!--hide-->
diff --git a/docs/zh/operations/utilities/odbc-bridge.md b/docs/zh/operations/utilities/odbc-bridge.md
new file mode 120000
index 00000000000..c5772389199
--- /dev/null
+++ b/docs/zh/operations/utilities/odbc-bridge.md
@@ -0,0 +1 @@
+../../../en/operations/utilities/odbc-bridge.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/combinators.md b/docs/zh/sql-reference/aggregate-functions/combinators.md
index 6d1cd9c775c..9251e446f9e 100644
--- a/docs/zh/sql-reference/aggregate-functions/combinators.md
+++ b/docs/zh/sql-reference/aggregate-functions/combinators.md
@@ -240,4 +240,4 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/combinators/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/agg_functions/combinators/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/index.md b/docs/zh/sql-reference/aggregate-functions/index.md
index 2344c3e6dc0..ee42517db80 100644
--- a/docs/zh/sql-reference/aggregate-functions/index.md
+++ b/docs/zh/sql-reference/aggregate-functions/index.md
@@ -56,4 +56,4 @@ SELECT groupArray(y) FROM t_null_big
 
 在 `groupArray` 生成的数组中不包括 `NULL`。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/agg_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
index 468e8e9c76e..25ad72e6cf3 100644
--- a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
@@ -230,22 +230,24 @@ SELECT sequenceCount('(?1).*(?2)')(time, number = 1, number = 2) FROM t
 
 -   该函数搜索触发链中的第一个条件并将事件计数器设置为1。 这是滑动窗口启动的时刻。
 
--   如果来自链的事件在窗口内顺序发生，则计数器将递增。 如果事件序列中断，则计数器不会增加。
+-   如果来自链的事件在窗口内顺序发生，则计数器将递增。 如果事件序列中断，则计数器不再增加。
 
 -   如果数据在不同的完成点具有多个事件链，则该函数将仅输出最长链的大小。
 
 **语法**
 
 ``` sql
-windowFunnel(window, [mode])(timestamp, cond1, cond2, ..., condN)
+windowFunnel(window, [mode, [mode, ... ]])(timestamp, cond1, cond2, ..., condN)
 ```
 
 **参数**
 
--   `window` — 滑动窗户的大小，单位是秒。
--   `mode` - 这是一个可选的参数。
-    -   `'strict'` - 当 `'strict'` 设置时，windowFunnel()仅对唯一值应用匹配条件。
--   `timestamp` — 包含时间的列。 数据类型支持： [日期](../../sql-reference/data-types/date.md), [日期时间](../../sql-reference/data-types/datetime.md#data_type-datetime) 和其他无符号整数类型（请注意，即使时间戳支持 `UInt64` 类型，它的值不能超过Int64最大值，即2^63-1）。
+-   `window` — 滑动窗户的大小，表示事件链中第一个事件和最后一个事件的最大间隔。 单位取决于`timestamp `。用表达式来表示则是：`timestamp of cond1 <= timestamp of cond2 <= ... <= timestamp of condN <= timestamp of cond1 + window`。
+-   `mode` - 这是一个可选的参数，可以设置一个或多个参数。
+    -   `'strict_deduplication'` - 如果事件链中出现相同的条件，则会停止进一步搜索。
+    -   `'strict_order'` - 不允许其他事件的介入。 例如：在`A->B->D->C`的情况下，它在`D`停止继续搜索`A->B->C`，最大事件数为2。
+    -   `'strict_increase'` - 事件链中的时间戳必须严格上升。
+-   `timestamp` — 包含时间戳的列。 数据类型支持： [日期](../../sql-reference/data-types/date.md), [日期时间](../../sql-reference/data-types/datetime.md#data_type-datetime) 和其他无符号整数类型（请注意，即使时间戳支持 `UInt64` 类型，它的值也不能超过Int64最大值，即2^63-1）。
 -   `cond` — 事件链的约束条件。 [UInt8](../../sql-reference/data-types/int-uint.md) 类型。
 
 **返回值**
@@ -495,4 +497,4 @@ FROM
 
 和 [sumMap](./reference/summap.md#agg_functions-summap) 基本一致， 除了一个键数组作为参数传递。这在使用高基数key时尤其有用。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/agg_functions/parametric_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/argmax.md b/docs/zh/sql-reference/aggregate-functions/reference/argmax.md
index 9d90590b2f1..ed3d2d07a58 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/argmax.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/argmax.md
@@ -6,20 +6,12 @@ toc_priority: 106
 
 计算 `val` 最大值对应的 `arg` 值。 如果 `val` 最大值存在几个不同的 `arg` 值，输出遇到的第一个值。
 
-这个函数的Tuple版本将返回 `val` 最大值对应的元组。本函数适合和 `SimpleAggregateFunction` 搭配使用。
-
 **语法**
 
 ``` sql
 argMax(arg, val)
 ```
 
-或
-
-``` sql
-argMax(tuple(arg, val))
-```
-
 **参数**
 
 -   `arg` — Argument.
@@ -31,12 +23,6 @@ argMax(tuple(arg, val))
 
 类型: 匹配 `arg` 类型。
 
-对于输入中的元组:
-
--   元组 `(arg, val)`, 其中 `val` 最大值，`arg` 是对应的值。
-
-类型: [元组](../../../sql-reference/data-types/tuple.md)。
-
 **示例**
 
 输入表:
@@ -52,13 +38,13 @@ argMax(tuple(arg, val))
 查询:
 
 ``` sql
-SELECT argMax(user, salary), argMax(tuple(user, salary), salary), argMax(tuple(user, salary)) FROM salary;
+SELECT argMax(user, salary), argMax(tuple(user, salary), salary) FROM salary;
 ```
 
 结果:
 
 ``` text
-┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┬─argMax(tuple(user, salary))─┐
-│ director             │ ('director',5000)                   │ ('director',5000)           │
-└──────────────────────┴─────────────────────────────────────┴─────────────────────────────┘
+┌─argMax(user, salary)─┬─argMax(tuple(user, salary), salary)─┐
+│ director             │ ('director',5000)                   │
+└──────────────────────┴─────────────────────────────────────┘
 ```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/argmin.md b/docs/zh/sql-reference/aggregate-functions/reference/argmin.md
index 0dd4625ac0d..8d987300ad4 100644
--- a/docs/zh/sql-reference/aggregate-functions/reference/argmin.md
+++ b/docs/zh/sql-reference/aggregate-functions/reference/argmin.md
@@ -8,8 +8,6 @@ toc_priority: 105
 
 计算 `val` 最小值对应的 `arg` 值。 如果 `val` 最小值存在几个不同的 `arg` 值，输出遇到的第一个(`arg`)值。
 
-这个函数的Tuple版本将返回 `val` 最小值对应的tuple。本函数适合和`SimpleAggregateFunction`搭配使用。
-
 **示例:**
 
 输入表:
@@ -25,13 +23,13 @@ toc_priority: 105
 查询:
 
 ``` sql
-SELECT argMin(user, salary), argMin(tuple(user, salary)) FROM salary;
+SELECT argMin(user, salary), argMin(tuple(user, salary), salary) FROM salary;
 ```
 
 结果:
 
 ``` text
-┌─argMin(user, salary)─┬─argMin(tuple(user, salary))─┐
-│ worker               │ ('worker',1000)             │
-└──────────────────────┴─────────────────────────────┘
+┌─argMin(user, salary)─┬─argMin(tuple(user, salary), salary)─┐
+│ worker               │ ('worker',1000)                     │
+└──────────────────────┴─────────────────────────────────────┘
 ```
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/deltasumtimestamp.md b/docs/zh/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
new file mode 120000
index 00000000000..3720d4f7b98
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/deltasumtimestamp.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/intervalLengthSum.md b/docs/zh/sql-reference/aggregate-functions/reference/intervalLengthSum.md
new file mode 120000
index 00000000000..b69019d0cf2
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/intervalLengthSum.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/intervalLengthSum.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/quantilebfloat16.md b/docs/zh/sql-reference/aggregate-functions/reference/quantilebfloat16.md
new file mode 120000
index 00000000000..dd4fd12eb40
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/quantilebfloat16.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/quantilebfloat16.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/sumcount.md b/docs/zh/sql-reference/aggregate-functions/reference/sumcount.md
new file mode 120000
index 00000000000..9f0299a5fe7
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/sumcount.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumcount.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/sumkahan.md b/docs/zh/sql-reference/aggregate-functions/reference/sumkahan.md
new file mode 120000
index 00000000000..650f8a34d9d
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/sumkahan.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/sumkahan.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/aggregate-functions/reference/uniqthetasketch.md b/docs/zh/sql-reference/aggregate-functions/reference/uniqthetasketch.md
new file mode 120000
index 00000000000..ac61a28677f
--- /dev/null
+++ b/docs/zh/sql-reference/aggregate-functions/reference/uniqthetasketch.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/aggregate-functions/reference/uniqthetasketch.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/aggregatefunction.md b/docs/zh/sql-reference/data-types/aggregatefunction.md
index 522ecf1b42d..e6e07b02e11 100644
--- a/docs/zh/sql-reference/data-types/aggregatefunction.md
+++ b/docs/zh/sql-reference/data-types/aggregatefunction.md
@@ -60,4 +60,4 @@ SELECT uniqMerge(state) FROM (SELECT uniqState(UserID) AS state FROM table GROUP
 
 请参阅 [AggregatingMergeTree](../../sql-reference/data-types/aggregatefunction.md) 的说明
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/nested_data_structures/aggregatefunction/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/date32.md b/docs/zh/sql-reference/data-types/date32.md
new file mode 120000
index 00000000000..2c8eca18107
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/date32.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/date32.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/domains/index.md b/docs/zh/sql-reference/data-types/domains/index.md
index 1bcf8d31998..3bfb3707f53 100644
--- a/docs/zh/sql-reference/data-types/domains/index.md
+++ b/docs/zh/sql-reference/data-types/domains/index.md
@@ -29,6 +29,6 @@ Domain类型是特定实现的类型，它总是与某个现存的基础类型
 -   当从其他列或表插入数据时，无法将string类型的值隐式地转换为Domain类型的值。
 -   无法对存储为Domain类型的值添加约束。
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/domains/overview) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/domains/overview) <!--hide-->
 
 
diff --git a/docs/zh/sql-reference/data-types/domains/ipv4.md b/docs/zh/sql-reference/data-types/domains/ipv4.md
index 9ce12025405..2e027baf9b7 100644
--- a/docs/zh/sql-reference/data-types/domains/ipv4.md
+++ b/docs/zh/sql-reference/data-types/domains/ipv4.md
@@ -24,15 +24,15 @@ CREATE TABLE hits (url String, from IPv4) ENGINE = MergeTree() ORDER BY from;
 在写入与查询时，`IPv4`类型能够识别可读性更加友好的输入输出格式：
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.tech', '183.247.232.58')('https://clickhouse.tech/docs/en/', '116.106.34.242');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '116.253.40.133')('https://clickhouse.com', '183.247.232.58')('https://clickhouse.com/docs/en/', '116.106.34.242');
 
 SELECT * FROM hits;
 ```
 
     ┌─url────────────────────────────────┬───────────from─┐
-    │ https://clickhouse.tech/docs/en/ │ 116.106.34.242 │
+    │ https://clickhouse.com/docs/en/ │ 116.106.34.242 │
     │ https://wikipedia.org              │ 116.253.40.133 │
-    │ https://clickhouse.tech          │ 183.247.232.58 │
+    │ https://clickhouse.com          │ 183.247.232.58 │
     └────────────────────────────────────┴────────────────┘
 
 同时它提供更为紧凑的二进制存储格式：
@@ -65,4 +65,4 @@ SELECT toTypeName(i), CAST(from as UInt32) as i FROM hits LIMIT 1;
     │ UInt32                           │ 3086477370 │
     └──────────────────────────────────┴────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/domains/ipv4) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/domains/ipv4) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/domains/ipv6.md b/docs/zh/sql-reference/data-types/domains/ipv6.md
index 5b1afc2cd39..6545aa61bc2 100644
--- a/docs/zh/sql-reference/data-types/domains/ipv6.md
+++ b/docs/zh/sql-reference/data-types/domains/ipv6.md
@@ -24,14 +24,14 @@ CREATE TABLE hits (url String, from IPv6) ENGINE = MergeTree() ORDER BY from;
 在写入与查询时，`IPv6`类型能够识别可读性更加友好的输入输出格式：
 
 ``` sql
-INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.tech', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.tech/docs/en/', '2a02:e980:1e::1');
+INSERT INTO hits (url, from) VALUES ('https://wikipedia.org', '2a02:aa08:e000:3100::2')('https://clickhouse.com', '2001:44c8:129:2632:33:0:252:2')('https://clickhouse.com/docs/en/', '2a02:e980:1e::1');
 
 SELECT * FROM hits;
 ```
 
     ┌─url────────────────────────────────┬─from──────────────────────────┐
-    │ https://clickhouse.tech          │ 2001:44c8:129:2632:33:0:252:2 │
-    │ https://clickhouse.tech/docs/en/ │ 2a02:e980:1e::1               │
+    │ https://clickhouse.com          │ 2001:44c8:129:2632:33:0:252:2 │
+    │ https://clickhouse.com/docs/en/ │ 2a02:e980:1e::1               │
     │ https://wikipedia.org              │ 2a02:aa08:e000:3100::2        │
     └────────────────────────────────────┴───────────────────────────────┘
 
@@ -65,4 +65,4 @@ SELECT toTypeName(i), CAST(from as FixedString(16)) as i FROM hits LIMIT 1;
     │ FixedString(16)                           │  ��� │
     └───────────────────────────────────────────┴─────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/domains/ipv6) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/domains/ipv6) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/fixedstring.md b/docs/zh/sql-reference/data-types/fixedstring.md
index f73259197c8..4e881b790b4 100644
--- a/docs/zh/sql-reference/data-types/fixedstring.md
+++ b/docs/zh/sql-reference/data-types/fixedstring.md
@@ -53,4 +53,4 @@ WHERE a = 'b\0'
 
 请注意，`FixedString(N)`的长度是个常量。仅由空字符组成的字符串，函数[length](../../sql-reference/functions/array-functions.md#array_functions-length)返回值为`N`,而函数[empty](../../sql-reference/functions/string-functions.md#empty)的返回值为`1`。
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/fixedstring/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/fixedstring/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/geo.md b/docs/zh/sql-reference/data-types/geo.md
new file mode 120000
index 00000000000..e25bc66b201
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/geo.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/geo.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/lowcardinality.md b/docs/zh/sql-reference/data-types/lowcardinality.md
index a0cd4c270c3..b8a1ac3c907 100644
--- a/docs/zh/sql-reference/data-types/lowcardinality.md
+++ b/docs/zh/sql-reference/data-types/lowcardinality.md
@@ -56,4 +56,4 @@ ORDER BY id
 
 - [高效低基数类型](https://www.altinity.com/blog/2019/3/27/low-cardinality).
 - [使用低基数类型减少ClickHouse的存储成本 – 来自Instana工程师的分享](https://www.instana.com/blog/reducing-clickhouse-storage-cost-with-the-low-cardinality-type-lessons-from-an-instana-engineer/).
-- [字符优化 (俄语视频分享)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [英语分享](https://github.com/yandex/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
\ No newline at end of file
+- [字符优化 (俄语视频分享)](https://youtu.be/rqf-ILRgBdY?list=PL0Z2YDlm0b3iwXCpEFiOOYmwXzVmjJfEt). [英语分享](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup19/string_optimization.pdf).
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/map.md b/docs/zh/sql-reference/data-types/map.md
new file mode 120000
index 00000000000..20de64e06d7
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/map.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/map.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/multiword-types.md b/docs/zh/sql-reference/data-types/multiword-types.md
new file mode 120000
index 00000000000..aeb86eadd2b
--- /dev/null
+++ b/docs/zh/sql-reference/data-types/multiword-types.md
@@ -0,0 +1 @@
+../../../en/sql-reference/data-types/multiword-types.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/data-types/nullable.md b/docs/zh/sql-reference/data-types/nullable.md
index 8e8e9d3b0af..90fb302b713 100644
--- a/docs/zh/sql-reference/data-types/nullable.md
+++ b/docs/zh/sql-reference/data-types/nullable.md
@@ -38,4 +38,4 @@ SELECT x + y FROM t_null
 └────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/data_types/nullable/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/data_types/nullable/) <!--hide-->
diff --git a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
index 38d7699c176..fc47f2c258a 100644
--- a/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/zh/sql-reference/data-types/simpleaggregatefunction.md
@@ -38,4 +38,4 @@
 CREATE TABLE simple (id UInt64, val SimpleAggregateFunction(sum, Double)) ENGINE=AggregatingMergeTree ORDER BY id;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/data_types/simpleaggregatefunction/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
index 2a890441085..0089dbc1f1c 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-hierarchical.md
@@ -67,4 +67,4 @@ ClickHouse支持 [等级](external-dicts-dict-structure.md#hierarchical-dict-att
 </dictionary>
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_hierarchical/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
index 190fd74d705..78d4c1ea236 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md
@@ -399,4 +399,4 @@ dictGetString('prefix', 'asn', tuple(IPv6StringToNum('2001:db8::1')))
 
 数据存储在一个 `trie`. 它必须完全适合RAM。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_layout/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
index af944fd9aea..a0bdab9e9ab 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-lifetime.md
@@ -88,4 +88,4 @@ SOURCE(ODBC(... invalidate_query 'SELECT update_time FROM dictionary_source wher
 ...
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_lifetime/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
new file mode 120000
index 00000000000..a8e9c37c515
--- /dev/null
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-polygon.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
index cbd88de0038..399224cb8c4 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md
@@ -627,4 +627,4 @@ SOURCE(REDIS(
 -   `storage_type` – The structure of internal Redis storage using for work with keys. `simple` 适用于简单源和散列单键源, `hash_map` 用于具有两个键的散列源。 不支持具有复杂键的范围源和缓存源。 可以省略，默认值为 `simple`.
 -   `db_index` – The specific numeric index of Redis logical database. May be omitted, default value is 0.
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_sources/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
index 91497a5767a..969e72aa0e2 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md
@@ -172,4 +172,4 @@ CREATE DICTIONARY somename (
 
 -   [使用外部字典的函数](../../../sql-reference/functions/ext-dict-functions.md).
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict_structure/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
index 843b9a5aa41..ea4f9e192b7 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts-dict.md
@@ -50,4 +50,4 @@ LIFETIME(...) -- Lifetime of dictionary in memory
 -   [结构](external-dicts-dict-structure.md) — Structure of the dictionary . A key and attributes that can be retrieved by this key.
 -   [使用寿命](external-dicts-dict-lifetime.md) — Frequency of dictionary updates.
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts_dict/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md
index 1dfea8d21be..609d1c11f56 100644
--- a/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md
+++ b/docs/zh/sql-reference/dictionaries/external-dictionaries/external-dicts.md
@@ -59,4 +59,4 @@ ClickHouse:
 -   [字典键和字段](external-dicts-dict-structure.md)
 -   [使用外部字典的函数](../../../sql-reference/functions/ext-dict-functions.md)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/external_dicts/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/external_dicts/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/index.md b/docs/zh/sql-reference/dictionaries/index.md
index 092afd5bac1..ea71a1047c3 100644
--- a/docs/zh/sql-reference/dictionaries/index.md
+++ b/docs/zh/sql-reference/dictionaries/index.md
@@ -19,4 +19,4 @@ ClickHouse支持:
 -   [内置字典](internal-dicts.md#internal_dicts) ,这些字典具有特定的 [函数集](../../sql-reference/functions/ym-dict-functions.md).
 -   [插件（外部）字典](external-dictionaries/external-dicts.md#dicts-external-dicts) ,这些字典拥有一个 [函数集](../../sql-reference/functions/ext-dict-functions.md).
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/) <!--hide-->
diff --git a/docs/zh/sql-reference/dictionaries/internal-dicts.md b/docs/zh/sql-reference/dictionaries/internal-dicts.md
index 706288e30ec..5bd09b673eb 100644
--- a/docs/zh/sql-reference/dictionaries/internal-dicts.md
+++ b/docs/zh/sql-reference/dictionaries/internal-dicts.md
@@ -52,4 +52,4 @@ Geobase从文本文件加载。
 
 还有与操作系统标识符和Yandex的工作功能。Metrica搜索引擎，但他们不应该被使用。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/dicts/internal_dicts/) <!--hide-->
diff --git a/docs/zh/sql-reference/distributed-ddl.md b/docs/zh/sql-reference/distributed-ddl.md
new file mode 100644
index 00000000000..e27b5d4d7d9
--- /dev/null
+++ b/docs/zh/sql-reference/distributed-ddl.md
@@ -0,0 +1,21 @@
+---
+toc_priority: 32
+toc_title: Distributed DDL
+---
+
+# 分布式DDL查询(ON CLUSTER条件) {#distributed-ddl-queries-on-cluster-clause}
+
+默认情况下，`CREATE`、`DROP`、`ALTER`和`RENAME`查询仅影响执行它们的当前服务器。 在集群设置中，可以使用`ON CLUSTER`子句以分布式方式运行此类查询。
+
+例如，以下查询在`cluster`中的每个主机上创建`all_hits` `Distributed`表：
+
+``` sql
+CREATE TABLE IF NOT EXISTS all_hits ON CLUSTER cluster (p Date, i Int32) ENGINE = Distributed(cluster, default, hits)
+```
+
+为了正确运行这些查询，每个主机必须具有相同的集群定义（为了简化同步配置，您可以使用ZooKeeper替换）。 他们还必须连接到ZooKeeper服务器。
+
+本地版本的查询最终会在集群中的每台主机上执行，即使某些主机当前不可用。
+
+!!! warning "警告"
+在单个主机内执行查询的顺序是有保证的。
diff --git a/docs/zh/sql-reference/functions/arithmetic-functions.md b/docs/zh/sql-reference/functions/arithmetic-functions.md
index 4cb02c99df4..36934211913 100644
--- a/docs/zh/sql-reference/functions/arithmetic-functions.md
+++ b/docs/zh/sql-reference/functions/arithmetic-functions.md
@@ -80,4 +80,4 @@ SELECT toTypeName(0), toTypeName(0 + 0), toTypeName(0 + 0 + 0), toTypeName(0 + 0
 返回数值的最小公倍数。
 除以零或将最小负数除以-1时抛出异常。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/arithmetic_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/array-functions.md b/docs/zh/sql-reference/functions/array-functions.md
index 4f6dbc0d87d..2a2b34da7e1 100644
--- a/docs/zh/sql-reference/functions/array-functions.md
+++ b/docs/zh/sql-reference/functions/array-functions.md
@@ -662,4 +662,4 @@ arrayReduce（‘agg_func’，arr1，…） - 将聚合函数`agg_func`应用
 
 返回与源数组大小相同的数组，包含反转源数组的所有元素的结果。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/array_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/array_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/array-join.md b/docs/zh/sql-reference/functions/array-join.md
index b7a4855efa5..2bf3ca17764 100644
--- a/docs/zh/sql-reference/functions/array-join.md
+++ b/docs/zh/sql-reference/functions/array-join.md
@@ -25,4 +25,4 @@ SELECT arrayJoin([1, 2, 3] AS src) AS dst, 'Hello', src
     │   3 │ Hello     │ [1,2,3] │
     └─────┴───────────┴─────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/array_join/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/array_join/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/bit-functions.md b/docs/zh/sql-reference/functions/bit-functions.md
index 08a6739c206..dd6958afec1 100644
--- a/docs/zh/sql-reference/functions/bit-functions.md
+++ b/docs/zh/sql-reference/functions/bit-functions.md
@@ -26,4 +26,4 @@
 
 ## bitTestAny(a,b) {#bittestanya-b}
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/bit_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/bit_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/bitmap-functions.md b/docs/zh/sql-reference/functions/bitmap-functions.md
index 5a9a88c5be1..2a6314e7727 100644
--- a/docs/zh/sql-reference/functions/bitmap-functions.md
+++ b/docs/zh/sql-reference/functions/bitmap-functions.md
@@ -88,6 +88,30 @@ SELECT bitmapToArray(bitmapSubsetLimit(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12
     │ [30,31,32,33,100,200,500] │
     └───────────────────────────┘
 
+## subBitmap {#subBitmap}
+
+将位图跳过`offset`个元素，限制大小为`limit`个的结果转换为另一个位图。
+
+    subBitmap(bitmap, offset, limit)
+
+**参数**
+
+-   `bitmap` – 位图对象.
+-   `offset` – 跳过多少个元素.
+-   `limit` – 子位图基数上限.
+
+**示例**
+
+``` sql
+SELECT bitmapToArray(subBitmap(bitmapBuild([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]), toUInt32(10), toUInt32(10))) AS res
+```
+
+```text
+┌─res─────────────────────────────┐
+│ [10,11,12,13,14,15,16,17,18,19] │
+└─────────────────────────────────┘
+```
+
 ## bitmapContains {#bitmapcontains}
 
 检查位图是否包含指定元素。
@@ -381,4 +405,4 @@ SELECT bitmapAndnotCardinality(bitmapBuild([1,2,3]),bitmapBuild([3,4,5])) AS res
     │   2 │
     └─────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/bitmap_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/comparison-functions.md b/docs/zh/sql-reference/functions/comparison-functions.md
index 8b5d72e64c2..77fed81f267 100644
--- a/docs/zh/sql-reference/functions/comparison-functions.md
+++ b/docs/zh/sql-reference/functions/comparison-functions.md
@@ -32,4 +32,4 @@ toc_title: 比较函数
 
 ## 大于等于, >= 运算符 {#greaterorequals-operator}
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/comparison_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/comparison_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/conditional-functions.md b/docs/zh/sql-reference/functions/conditional-functions.md
index a804f723d6f..ce421138d0e 100644
--- a/docs/zh/sql-reference/functions/conditional-functions.md
+++ b/docs/zh/sql-reference/functions/conditional-functions.md
@@ -192,4 +192,4 @@ FROM LEFT_RIGHT
 └──────┴───────┴──────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/conditional_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/conditional_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index 9f8e7f49d07..1225cf33699 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -652,7 +652,7 @@ SELECT formatDateTime(toDate('2010-01-04'), '%g')
 └────────────────────────────────────────────┘
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/functions/date_time_functions/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/functions/date_time_functions/) <!--hide-->
 
 ## FROM_UNIXTIME
 
diff --git a/docs/zh/sql-reference/functions/encoding-functions.md b/docs/zh/sql-reference/functions/encoding-functions.md
index e0daab15dd3..f1152965d2d 100644
--- a/docs/zh/sql-reference/functions/encoding-functions.md
+++ b/docs/zh/sql-reference/functions/encoding-functions.md
@@ -91,4 +91,4 @@ SELECT char(0xE4, 0xBD, 0xA0, 0xE5, 0xA5, 0xBD) AS hello;
 
 接受一个整数。返回一个UInt64类型数组，其中包含一组2的幂列表，其列表中的所有值相加等于这个整数。数组中的数字按升序排列。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/encoding_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/encoding_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/encryption-functions.md b/docs/zh/sql-reference/functions/encryption-functions.md
new file mode 120000
index 00000000000..8d33d60a5ba
--- /dev/null
+++ b/docs/zh/sql-reference/functions/encryption-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/encryption-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/ext-dict-functions.md b/docs/zh/sql-reference/functions/ext-dict-functions.md
index 22ee9641b55..12b9499cb64 100644
--- a/docs/zh/sql-reference/functions/ext-dict-functions.md
+++ b/docs/zh/sql-reference/functions/ext-dict-functions.md
@@ -43,4 +43,4 @@
 
 -   检查字典是否存在指定的`id`。如果不存在，则返回0;如果存在，则返回1。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/ext_dict_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/files.md b/docs/zh/sql-reference/functions/files.md
new file mode 120000
index 00000000000..df6eac6031e
--- /dev/null
+++ b/docs/zh/sql-reference/functions/files.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/files.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/functions-for-nulls.md b/docs/zh/sql-reference/functions/functions-for-nulls.md
index 0fc563afa4c..b228cbe6f99 100644
--- a/docs/zh/sql-reference/functions/functions-for-nulls.md
+++ b/docs/zh/sql-reference/functions/functions-for-nulls.md
@@ -249,4 +249,4 @@
     │ Nullable(UInt8)            │
     └────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/functions_for_nulls/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/geo.md b/docs/zh/sql-reference/functions/geo.md
index d3e7ba0619e..fa8fecb1284 100644
--- a/docs/zh/sql-reference/functions/geo.md
+++ b/docs/zh/sql-reference/functions/geo.md
@@ -219,4 +219,4 @@ SELECT geohashesInBox(24.48, 40.56, 24.785, 40.81, 4) AS thasos
 └─────────────────────────────────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/geo/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/geo/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/geo/coordinates.md b/docs/zh/sql-reference/functions/geo/coordinates.md
new file mode 120000
index 00000000000..f3f694c50c9
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/coordinates.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/coordinates.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/geo/geohash.md b/docs/zh/sql-reference/functions/geo/geohash.md
new file mode 120000
index 00000000000..5b17ac944bb
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/geohash.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/geohash.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/geo/h3.md b/docs/zh/sql-reference/functions/geo/h3.md
new file mode 120000
index 00000000000..eb3926f4e3e
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/h3.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/h3.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/geo/index.md b/docs/zh/sql-reference/functions/geo/index.md
new file mode 120000
index 00000000000..8eb51e63d5b
--- /dev/null
+++ b/docs/zh/sql-reference/functions/geo/index.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/functions/geo/index.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/hash-functions.md b/docs/zh/sql-reference/functions/hash-functions.md
index b64456fe644..0800631a807 100644
--- a/docs/zh/sql-reference/functions/hash-functions.md
+++ b/docs/zh/sql-reference/functions/hash-functions.md
@@ -111,4 +111,4 @@ URL的层级与URLHierarchy中的层级相同。 此函数被用于Yandex.Metric
 接受一个String类型的参数。返回UInt64或UInt32。
 有关更多信息，请参见链接：[xxHash](http://cyan4973.github.io/xxHash/)
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/hash_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/hash_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/higher-order-functions.md b/docs/zh/sql-reference/functions/higher-order-functions.md
index fcf3ab3da15..dc5c99ae298 100644
--- a/docs/zh/sql-reference/functions/higher-order-functions.md
+++ b/docs/zh/sql-reference/functions/higher-order-functions.md
@@ -135,4 +135,4 @@ SELECT arrayReverseSort([1, nan, 2, NULL, 3, nan, 4, NULL])
     │ [4,3,2,1,nan,nan,NULL,NULL]                          │
     └──────────────────────────────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/higher_order_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/in-functions.md b/docs/zh/sql-reference/functions/in-functions.md
index 1665bf5650e..bb33658cb68 100644
--- a/docs/zh/sql-reference/functions/in-functions.md
+++ b/docs/zh/sql-reference/functions/in-functions.md
@@ -21,4 +21,4 @@ toc_title: IN 运算符
 ’N’是列索引，从1开始。N必须是正整数常量，并且不大于元组的大小。
 执行该函数没有任何成本。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/functions/in_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/functions/in_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/index.md b/docs/zh/sql-reference/functions/index.md
index 52954c95cff..c5974e55582 100644
--- a/docs/zh/sql-reference/functions/index.md
+++ b/docs/zh/sql-reference/functions/index.md
@@ -69,4 +69,4 @@ ClickHouse中至少存在两种类型的函数 - 常规函数（它们称之为
 
 如果查询中的函数在请求服务器上执行，但您需要在远程服务器上执行它，则可以将其包装在«any»聚合函数中，或将其添加到«GROUP BY»中。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/ip-address-functions.md b/docs/zh/sql-reference/functions/ip-address-functions.md
index d208e0e6939..6428070e704 100644
--- a/docs/zh/sql-reference/functions/ip-address-functions.md
+++ b/docs/zh/sql-reference/functions/ip-address-functions.md
@@ -214,4 +214,4 @@ SELECT
     │ 20010438FFFF000000000000407D1BC1  │ 20010438FFFF000000000000407D1BC1 │
     └───────────────────────────────────┴──────────────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/ip_address_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/json-functions.md b/docs/zh/sql-reference/functions/json-functions.md
index 441ec29a289..8459f2ceccc 100644
--- a/docs/zh/sql-reference/functions/json-functions.md
+++ b/docs/zh/sql-reference/functions/json-functions.md
@@ -171,4 +171,4 @@
 
     select JSONExtractRaw('{"a": "hello", "b": [-100, 200.0, 300]}', 'b') = '[-100, 200.0, 300]'
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/json_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/json_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/logical-functions.md b/docs/zh/sql-reference/functions/logical-functions.md
index cc168dbb1ed..ad72161f3da 100644
--- a/docs/zh/sql-reference/functions/logical-functions.md
+++ b/docs/zh/sql-reference/functions/logical-functions.md
@@ -17,4 +17,4 @@ toc_title: 逻辑函数
 
 ## 异或，`XOR` 运算符 {#xor}
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/logical_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/logical_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/math-functions.md b/docs/zh/sql-reference/functions/math-functions.md
index 6634b095b0d..5458ac37dfd 100644
--- a/docs/zh/sql-reference/functions/math-functions.md
+++ b/docs/zh/sql-reference/functions/math-functions.md
@@ -104,4 +104,4 @@ SELECT erf(3 / sqrt(2))
 
 接受一个数值类型的参数并返回它的10的x次幂（UInt64）。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/math_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/math_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/nlp-functions.md b/docs/zh/sql-reference/functions/nlp-functions.md
new file mode 120000
index 00000000000..612039dcb2c
--- /dev/null
+++ b/docs/zh/sql-reference/functions/nlp-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/nlp-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/other-functions.md b/docs/zh/sql-reference/functions/other-functions.md
index c58c4bd1510..2588f623227 100644
--- a/docs/zh/sql-reference/functions/other-functions.md
+++ b/docs/zh/sql-reference/functions/other-functions.md
@@ -631,4 +631,4 @@ ORDER BY k ASC
 
 如果参数不为零则抛出异常。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/other_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/other_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/random-functions.md b/docs/zh/sql-reference/functions/random-functions.md
index f058b98c779..34ff2d9943a 100644
--- a/docs/zh/sql-reference/functions/random-functions.md
+++ b/docs/zh/sql-reference/functions/random-functions.md
@@ -18,4 +18,4 @@
 
 返回一个UInt32类型的随机数字，该函数不同之处在于仅为每个数据块参数一个随机数。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/random_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/random_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/rounding-functions.md b/docs/zh/sql-reference/functions/rounding-functions.md
index c1bf6641135..46f137da995 100644
--- a/docs/zh/sql-reference/functions/rounding-functions.md
+++ b/docs/zh/sql-reference/functions/rounding-functions.md
@@ -83,4 +83,4 @@ SELECT number / 2 AS x, round(x) FROM system.numbers LIMIT 3
 
 接受一个数字，将其向下舍入到指定数组中的元素。如果该值小于数组中的最低边界，则返回最低边界。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/rounding_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/rounding_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/splitting-merging-functions.md b/docs/zh/sql-reference/functions/splitting-merging-functions.md
index a29f4057d55..ade5bae21da 100644
--- a/docs/zh/sql-reference/functions/splitting-merging-functions.md
+++ b/docs/zh/sql-reference/functions/splitting-merging-functions.md
@@ -26,4 +26,4 @@
     │ ['abca','abc']          │
     └─────────────────────────┘
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/splitting_merging_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/string-functions.md b/docs/zh/sql-reference/functions/string-functions.md
index 1c27176a45e..d4f8d36273d 100644
--- a/docs/zh/sql-reference/functions/string-functions.md
+++ b/docs/zh/sql-reference/functions/string-functions.md
@@ -166,4 +166,4 @@ SELECT format('{} {}', 'Hello', 'World')
 
 返回一个字符串，用于删除任一侧的空白字符。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/string_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/string_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/string-replace-functions.md b/docs/zh/sql-reference/functions/string-replace-functions.md
index 5f89bfb828f..01bb809c78f 100644
--- a/docs/zh/sql-reference/functions/string-replace-functions.md
+++ b/docs/zh/sql-reference/functions/string-replace-functions.md
@@ -76,5 +76,5 @@ SELECT replaceRegexpAll('Hello, World!', '^', 'here: ') AS res
 这个实现与re2::RE2::QuoteMeta略有不同。它以`\0` 转义零字节，而不是`\x00`，并且只转义必需的字符。
 有关详细信息，请参阅链接：[RE2](https://github.com/google/re2/blob/master/re2/re2.cc#L473)
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/string_replace_functions/) <!--hide-->
 
diff --git a/docs/zh/sql-reference/functions/string-search-functions.md b/docs/zh/sql-reference/functions/string-search-functions.md
index 2e1e4c784bd..113c34788f7 100644
--- a/docs/zh/sql-reference/functions/string-search-functions.md
+++ b/docs/zh/sql-reference/functions/string-search-functions.md
@@ -119,4 +119,4 @@
 !!! note "注意"
     对于UTF-8，我们使用3-gram。所有这些都不是完全公平的n-gram距离。我们使用2字节哈希来散列n-gram，然后计算这些哈希表之间的（非）对称差异 - 可能会发生冲突。对于UTF-8不区分大小写的格式，我们不使用公平的`tolower`函数 - 我们将每个Unicode字符字节的第5位（从零开始）和字节的第一位归零 - 这适用于拉丁语，主要用于所有西里尔字母。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/string_search_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/string_search_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/tuple-functions.md b/docs/zh/sql-reference/functions/tuple-functions.md
new file mode 120000
index 00000000000..daaf22f11f4
--- /dev/null
+++ b/docs/zh/sql-reference/functions/tuple-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/tuple-map-functions.md b/docs/zh/sql-reference/functions/tuple-map-functions.md
new file mode 120000
index 00000000000..e77338e1118
--- /dev/null
+++ b/docs/zh/sql-reference/functions/tuple-map-functions.md
@@ -0,0 +1 @@
+../../../en/sql-reference/functions/tuple-map-functions.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/functions/type-conversion-functions.md b/docs/zh/sql-reference/functions/type-conversion-functions.md
index 4c94b2b2f9a..6c8843fe2bd 100644
--- a/docs/zh/sql-reference/functions/type-conversion-functions.md
+++ b/docs/zh/sql-reference/functions/type-conversion-functions.md
@@ -635,4 +635,4 @@ SELECT fromUnixTimestamp64Milli(i64, 'UTC')
 └──────────────────────────────────────┘
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/type_conversion_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/url-functions.md b/docs/zh/sql-reference/functions/url-functions.md
index a7b91c773c8..040bd1e6aae 100644
--- a/docs/zh/sql-reference/functions/url-functions.md
+++ b/docs/zh/sql-reference/functions/url-functions.md
@@ -115,4 +115,4 @@ SELECT decodeURLComponent('http://127.0.0.1:8123/?query=SELECT%201%3B') AS Decod
 
 删除URL中名称为’name’的参数。改函数假设参数名称以及参数值经过URL相同的编码。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/url_functions/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/url_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/uuid-functions.md b/docs/zh/sql-reference/functions/uuid-functions.md
index fb7cdcc4eff..99f5c3407ef 100644
--- a/docs/zh/sql-reference/functions/uuid-functions.md
+++ b/docs/zh/sql-reference/functions/uuid-functions.md
@@ -104,4 +104,4 @@ SELECT
 
 -   [dictgetuid](ext-dict-functions.md)
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/functions/uuid_function/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/functions/uuid_function/) <!--hide-->
diff --git a/docs/zh/sql-reference/functions/ym-dict-functions.md b/docs/zh/sql-reference/functions/ym-dict-functions.md
index 429105084dd..f8ac29e6d4c 100644
--- a/docs/zh/sql-reference/functions/ym-dict-functions.md
+++ b/docs/zh/sql-reference/functions/ym-dict-functions.md
@@ -1,8 +1,8 @@
-# 功能与Yandex的工作。梅特里卡词典 {#functions-for-working-with-yandex-metrica-dictionaries}
+# 使用 Yandex.Metrica 字典函数 {#functions-for-working-with-yandex-metrica-dictionaries}
 
-为了使下面的功能正常工作，服务器配置必须指定获取所有Yandex的路径和地址。梅特里卡字典. 字典在任何这些函数的第一次调用时加载。 如果无法加载引用列表，则会引发异常。
+为了使下面的功能正常工作，服务器配置必须指定获取所有 Yandex.Metrica 字典的路径和地址。Yandex.Metrica 字典在任何这些函数的第一次调用时加载。 如果无法加载引用列表，则会引发异常。
 
-For information about creating reference lists, see the section «Dictionaries».
+有关创建引用列表的信息，请参阅 «字典» 部分.
 
 ## 多个地理基 {#multiple-geobases}
 
@@ -17,18 +17,18 @@ ClickHouse支持同时使用多个备选地理基（区域层次结构），以
 
 所有字典都在运行时重新加载（每隔一定数量的秒重新加载一次，如builtin_dictionaries_reload_interval config参数中定义，或默认情况下每小时一次）。 但是，可用字典列表在服务器启动时定义一次。
 
-All functions for working with regions have an optional argument at the end – the dictionary key. It is referred to as the geobase.
+所有处理区域的函数都在末尾有一个可选参数—字典键。它被称为地基。
 示例:
 
-    regionToCountry(RegionID) – Uses the default dictionary: /opt/geo/regions_hierarchy.txt
-    regionToCountry(RegionID, '') – Uses the default dictionary: /opt/geo/regions_hierarchy.txt
-    regionToCountry(RegionID, 'ua') – Uses the dictionary for the 'ua' key: /opt/geo/regions_hierarchy_ua.txt
+    regionToCountry(RegionID) – 使用默认路径: /opt/geo/regions_hierarchy.txt
+    regionToCountry(RegionID, '') – 使用默认路径: /opt/geo/regions_hierarchy.txt
+    regionToCountry(RegionID, 'ua') – 使用字典中的'ua' 键: /opt/geo/regions_hierarchy_ua.txt
 
-### ﾂ环板(ｮﾂ嘉ｯﾂ偲青regionｼﾂ氾ｶﾂ鉄ﾂ工ﾂ渉\]) {#regiontocityid-geobase}
+### regionToCity(id[, geobase]) {#regiontocityid-geobase}
 
-Accepts a UInt32 number – the region ID from the Yandex geobase. If this region is a city or part of a city, it returns the region ID for the appropriate city. Otherwise, returns 0.
+从 Yandex geobase 接收一个 UInt32 数字类型的区域ID 。如果该区域是一个城市或城市的一部分，它将返回相应城市的区域ID。否则,返回0。
 
-### 虏茅驴麓卤戮碌禄路戮鲁拢\]) {#regiontoareaid-geobase}
+### regionToArea(id[, geobase]) {#regiontoareaid-geobase}
 
 将区域转换为区域（地理数据库中的类型5）。 在所有其他方式，这个功能是一样的 ‘regionToCity’.
 
@@ -84,37 +84,59 @@ LIMIT 15
     │ Federation of Bosnia and Herzegovina                     │
     └──────────────────────────────────────────────────────────┘
 
-### 虏茅驴麓卤戮碌禄路戮鲁拢(陆毛隆隆(803)888-8325\]) {#regiontocountryid-geobase}
+### regionToCountry(id[, geobase]) {#regiontocountryid-geobase}
 
 将区域转换为国家。 在所有其他方式，这个功能是一样的 ‘regionToCity’.
 示例: `regionToCountry(toUInt32(213)) = 225` 转换莫斯科（213）到俄罗斯（225）。
 
-### 掳胫((禄脢鹿脷露胫鲁隆鹿((酶-11-16""\[脪陆,ase\]) {#regiontocontinentid-geobase}
+### regionToContinent(id[, geobase]) {#regiontocontinentid-geobase}
 
 将区域转换为大陆。 在所有其他方式，这个功能是一样的 ‘regionToCity’.
 示例: `regionToContinent(toUInt32(213)) = 10001` 将莫斯科（213）转换为欧亚大陆（10001）。
 
-### ﾂ环板(ｮﾂ嘉ｯﾂ偲青regionｬﾂ静ｬﾂ青ｻﾂ催ｬﾂ渉\]) {#regiontopopulationid-geobase}
+### regionToTopContinent (#regiontotopcontinent) {#regiontotopcontinent-regiontotopcontinent}
+
+查找该区域层次结构中最高的大陆。
+
+**语法**
+
+``` sql
+regionToTopContinent(id[, geobase])
+```
+
+**参数**
+
+-   `id` — Yandex geobase 的区域 ID. [UInt32](../../sql-reference/data-types/int-uint.md).
+-   `geobase` — 字典的建. 参阅 [Multiple Geobases](#multiple-geobases). [String](../../sql-reference/data-types/string.md). 可选.
+
+**返回值**
+
+-   顶级大陆的标识符(当您在区域层次结构中攀爬时，是后者)。
+-   0，如果没有。
+
+类型: `UInt32`.
+
+### regionToPopulation(id\[, geobase\]) {#regiontopopulationid-geobase}
 
 获取区域的人口。
-The population can be recorded in files with the geobase. See the section «External dictionaries».
+人口可以记录在文件与地球基。请参阅«外部词典»部分。
 如果没有为该区域记录人口，则返回0。
 在Yandex地理数据库中，可能会为子区域记录人口，但不会为父区域记录人口。
 
 ### regionIn(lhs,rhs\[,地理数据库\]) {#regioninlhs-rhs-geobase}
 
 检查是否 ‘lhs’ 属于一个区域 ‘rhs’ 区域。 如果属于UInt8，则返回等于1的数字，如果不属于则返回0。
-The relationship is reflexive – any region also belongs to itself.
+这种关系是反射的——任何地区也属于自己。
 
-### ﾂ暗ｪﾂ氾环催ﾂ団ﾂ法ﾂ人\]) {#regionhierarchyid-geobase}
+### regionHierarchy(id\[, geobase\]) {#regionhierarchyid-geobase}
 
-Accepts a UInt32 number – the region ID from the Yandex geobase. Returns an array of region IDs consisting of the passed region and all parents along the chain.
+从 Yandex geobase 接收一个 UInt32 数字类型的区域ID。返回一个区域ID数组，由传递的区域和链上的所有父节点组成。
 示例: `regionHierarchy(toUInt32(213)) = [213,1,3,225,10001,10000]`.
 
-### 地区名称(id\[,郎\]) {#regiontonameid-lang}
+### regionToName(id\[, lang\]) {#regiontonameid-lang}
 
-Accepts a UInt32 number – the region ID from the Yandex geobase. A string with the name of the language can be passed as a second argument. Supported languages are: ru, en, ua, uk, by, kz, tr. If the second argument is omitted, the language ‘ru’ is used. If the language is not supported, an exception is thrown. Returns a string – the name of the region in the corresponding language. If the region with the specified ID doesn’t exist, an empty string is returned.
+从 Yandex geobase 接收一个 UInt32 数字类型的区域ID。带有语言名称的字符串可以作为第二个参数传递。支持的语言有:ru, en, ua, uk, by, kz, tr。如果省略第二个参数，则使用' ru '语言。如果不支持该语言，则抛出异常。返回一个字符串-对应语言的区域名称。如果指定ID的区域不存在，则返回一个空字符串。
 
 `ua` 和 `uk` 都意味着乌克兰。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/functions/ym_dict_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/index.md b/docs/zh/sql-reference/index.md
index c47c20b9cf9..5e75d670c1d 100644
--- a/docs/zh/sql-reference/index.md
+++ b/docs/zh/sql-reference/index.md
@@ -15,4 +15,4 @@ ClickHouse支持以下形式的查询:
 -   [ALTER](statements/alter.md#query_language_queries_alter)
 -   [其他类型的查询](statements/misc.md)
 
-[原始文档](https://clickhouse.tech/docs/zh/sql-reference/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/zh/sql-reference/) <!--hide-->
diff --git a/docs/zh/sql-reference/operators/in.md b/docs/zh/sql-reference/operators/in.md
index f39bd02c309..d76971b0487 100644
--- a/docs/zh/sql-reference/operators/in.md
+++ b/docs/zh/sql-reference/operators/in.md
@@ -5,7 +5,7 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
 
 # IN 操作符 {#select-in-operators}
 
-该 `IN`, `NOT IN`, `GLOBAL IN`，和 `GLOBAL NOT IN` 运算符是单独复盖的，因为它们的功能相当丰富。
+该 `IN`, `NOT IN`, `GLOBAL IN`，和 `GLOBAL NOT IN` 运算符是单独考虑的，因为它们的功能相当丰富。
 
 运算符的左侧是单列或元组。
 
diff --git a/docs/zh/sql-reference/operators/index.md b/docs/zh/sql-reference/operators/index.md
index 77aa42755af..2b5555f6c66 100644
--- a/docs/zh/sql-reference/operators/index.md
+++ b/docs/zh/sql-reference/operators/index.md
@@ -260,4 +260,4 @@ WHERE isNotNull(y)
 1 rows in set. Elapsed: 0.002 sec.
 ```
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/operators/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/operators/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/alter.md b/docs/zh/sql-reference/statements/alter.md
index 81ef9124e45..db4db707832 100644
--- a/docs/zh/sql-reference/statements/alter.md
+++ b/docs/zh/sql-reference/statements/alter.md
@@ -586,4 +586,4 @@ ALTER SETTINGS PROFILE [IF EXISTS] name [ON CLUSTER cluster_name]
     [SETTINGS variable [= value] [MIN [=] min_value] [MAX [=] max_value] [READONLY|WRITABLE] | INHERIT 'profile_name'] [,...]
 ```
 
-[Original article](https://clickhouse.tech/docs/en/query_language/alter/) <!--hide-->
+[Original article](https://clickhouse.com/docs/en/query_language/alter/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/alter/column.md b/docs/zh/sql-reference/statements/alter/column.md
new file mode 120000
index 00000000000..e1123d197fe
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/column.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/column.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/constraint.md b/docs/zh/sql-reference/statements/alter/constraint.md
new file mode 120000
index 00000000000..e3b245408d1
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/constraint.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/constraint.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/delete.md b/docs/zh/sql-reference/statements/alter/delete.md
new file mode 120000
index 00000000000..b9d6a233197
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/delete.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/delete.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/index.md b/docs/zh/sql-reference/statements/alter/index.md
new file mode 100644
index 00000000000..2f60dbb262e
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/index.md
@@ -0,0 +1,23 @@
+---
+toc_hidden_folder: true
+toc_priority: 42
+toc_title: INDEX
+---
+
+# 操作数据跳过索引 {#manipulations-with-data-skipping-indices}
+
+可以使用以下操作：
+
+-   `ALTER TABLE [db].name ADD INDEX name expression TYPE type GRANULARITY value [FIRST|AFTER name]` - 向表元数据添加索引描述。
+
+-   `ALTER TABLE [db].name DROP INDEX name` - 从表元数据中删除索引描述并从磁盘中删除索引文件。
+
+-   `ALTER TABLE [db.]table MATERIALIZE INDEX name IN PARTITION partition_name` - 查询在分区`partition_name`中重建二级索引`name`。 操作为[mutation](../../../sql-reference/statements/alter/index.md#mutations).
+
+前两个命令是轻量级的，它们只更改元数据或删除文件。
+
+Also, they are replicated, syncing indices metadata via ZooKeeper.
+此外，它们会被复制，会通过ZooKeeper同步索引元数据。
+
+!!! note "注意"
+索引操作仅支持具有以下特征的表 [`*MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md)引擎 (包括[replicated](../../../engines/table-engines/mergetree-family/replication.md)).
diff --git a/docs/zh/sql-reference/statements/alter/index/index.md b/docs/zh/sql-reference/statements/alter/index/index.md
new file mode 120000
index 00000000000..b754fa71b83
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/index/index.md
@@ -0,0 +1 @@
+../../../../../en/sql-reference/statements/alter/index/index.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/order-by.md b/docs/zh/sql-reference/statements/alter/order-by.md
new file mode 120000
index 00000000000..ef5a22dc165
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/order-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/order-by.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/partition.md b/docs/zh/sql-reference/statements/alter/partition.md
new file mode 120000
index 00000000000..09a6fa34645
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/partition.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/partition.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/projection.md b/docs/zh/sql-reference/statements/alter/projection.md
new file mode 120000
index 00000000000..b7365ec9fe4
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/projection.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/projection.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/quota.md b/docs/zh/sql-reference/statements/alter/quota.md
new file mode 120000
index 00000000000..c6c477c3b61
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/quota.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/role.md b/docs/zh/sql-reference/statements/alter/role.md
new file mode 120000
index 00000000000..ce1f0a94eb3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/role.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/row-policy.md b/docs/zh/sql-reference/statements/alter/row-policy.md
new file mode 120000
index 00000000000..09ad2d301f3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/row-policy.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/sample-by.md b/docs/zh/sql-reference/statements/alter/sample-by.md
new file mode 120000
index 00000000000..fda9d991f40
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/sample-by.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/sample-by.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/setting.md b/docs/zh/sql-reference/statements/alter/setting.md
new file mode 120000
index 00000000000..12fdba11505
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/setting.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/setting.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/settings-profile.md b/docs/zh/sql-reference/statements/alter/settings-profile.md
new file mode 120000
index 00000000000..0e71ac4e831
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/settings-profile.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/ttl.md b/docs/zh/sql-reference/statements/alter/ttl.md
new file mode 120000
index 00000000000..94a112e7a17
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/ttl.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/ttl.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/update.md b/docs/zh/sql-reference/statements/alter/update.md
new file mode 120000
index 00000000000..fa9be21c070
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/update.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/update.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/user.md b/docs/zh/sql-reference/statements/alter/user.md
new file mode 120000
index 00000000000..9379ef3aaf6
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/user.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/alter/view.md b/docs/zh/sql-reference/statements/alter/view.md
new file mode 120000
index 00000000000..89bdcee5912
--- /dev/null
+++ b/docs/zh/sql-reference/statements/alter/view.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/alter/view.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/attach.md b/docs/zh/sql-reference/statements/attach.md
new file mode 120000
index 00000000000..54672449823
--- /dev/null
+++ b/docs/zh/sql-reference/statements/attach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/attach.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/check-table.md b/docs/zh/sql-reference/statements/check-table.md
new file mode 120000
index 00000000000..1ce3a05c6ea
--- /dev/null
+++ b/docs/zh/sql-reference/statements/check-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/check-table.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create.md b/docs/zh/sql-reference/statements/create.md
index 46e82bd1733..21a3e28ebc4 100644
--- a/docs/zh/sql-reference/statements/create.md
+++ b/docs/zh/sql-reference/statements/create.md
@@ -244,7 +244,7 @@ SELECT a, b, c FROM (SELECT ...)
 
 没有单独的删除视图的语法。如果要删除视图，请使用`DROP TABLE`。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/create/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/create/) <!--hide-->
 
 ## CREATE DICTIONARY {#create-dictionary-query}
 
diff --git a/docs/zh/sql-reference/statements/create/database.md b/docs/zh/sql-reference/statements/create/database.md
new file mode 100644
index 00000000000..569f4837e6f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/database.md
@@ -0,0 +1,29 @@
+---
+toc_priority: 35
+toc_title: DATABASE
+---
+
+# CREATE DATABASE {#query-language-create-database}
+
+创建数据库.
+
+``` sql
+CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster] [ENGINE = engine(...)]
+```
+
+## 条件 {#clauses}
+
+### IF NOT EXISTS {#if-not-exists}
+
+如果`db_name`数据库已经存在，则ClickHouse不会创建新数据库并且：
+
+-   如果指定了子句，则不会引发异常。
+-   如果未指定子句，则抛出异常。
+
+### ON CLUSTER {#on-cluster}
+
+ClickHouse在指定集群的所有服务器上创建`db_name`数据库。 更多细节在 [Distributed DDL](../../../sql-reference/distributed-ddl.md) article.
+
+### ENGINE {#engine}
+
+[MySQL](../../../engines/database-engines/mysql.md) 允许您从远程MySQL服务器检索数据. 默认情况下，ClickHouse使用自己的[database engine](../../../engines/database-engines/index.md). 还有一个[lazy](../../../engines/database-engines/lazy.md)引擎.
diff --git a/docs/zh/sql-reference/statements/create/dictionary.md b/docs/zh/sql-reference/statements/create/dictionary.md
new file mode 120000
index 00000000000..e9eff6ba066
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/dictionary.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/dictionary.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/function.md b/docs/zh/sql-reference/statements/create/function.md
new file mode 120000
index 00000000000..d41429cb260
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/function.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/function.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/index.md b/docs/zh/sql-reference/statements/create/index.md
new file mode 100644
index 00000000000..d5d3e814023
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/index.md
@@ -0,0 +1,13 @@
+---
+toc_folder_title: CREATE
+toc_priority: 34
+toc_title: Overview
+---
+
+# CREATE语法 {#create-queries}
+
+CREATE语法包含以下子集:
+
+-   [DATABASE](../../../sql-reference/statements/create/database.md)
+
+[原始文章](https://clickhouse.com/docs/zh/sql-reference/statements/create/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/create/quota.md b/docs/zh/sql-reference/statements/create/quota.md
new file mode 120000
index 00000000000..f941b7bcdad
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/quota.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/quota.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/role.md b/docs/zh/sql-reference/statements/create/role.md
new file mode 120000
index 00000000000..d48b490bb1f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/role.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/role.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/row-policy.md b/docs/zh/sql-reference/statements/create/row-policy.md
new file mode 120000
index 00000000000..383ef88ed1f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/row-policy.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/row-policy.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/settings-profile.md b/docs/zh/sql-reference/statements/create/settings-profile.md
new file mode 120000
index 00000000000..093dd9adcde
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/settings-profile.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/settings-profile.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/table.md b/docs/zh/sql-reference/statements/create/table.md
new file mode 120000
index 00000000000..61a92816de6
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/table.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/table.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/user.md b/docs/zh/sql-reference/statements/create/user.md
new file mode 120000
index 00000000000..5c4882bede7
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/user.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/create/user.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/create/view.md b/docs/zh/sql-reference/statements/create/view.md
new file mode 100644
index 00000000000..da69860f068
--- /dev/null
+++ b/docs/zh/sql-reference/statements/create/view.md
@@ -0,0 +1,243 @@
+---
+toc_priority: 37
+toc_title: VIEW
+---
+
+# CREATE VIEW {#create-view}
+
+创建一个新视图。 有两种类型的视图：普通视图和物化视图。
+
+## Normal {#normal}
+
+语法:
+
+``` sql
+CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] AS SELECT ...
+```
+
+普通视图不存储任何数据。 他们只是在每次访问时从另一个表执行读取。换句话说，普通视图只不过是一个保存的查询。 从视图中读取时，此保存的查询用作[FROM](../../../sql-reference/statements/select/from.md)子句中的子查询.
+
+例如，假设您已经创建了一个视图：
+
+``` sql
+CREATE VIEW view AS SELECT ...
+```
+
+并写了一个查询：
+
+``` sql
+SELECT a, b, c FROM view
+```
+
+这个查询完全等同于使用子查询：
+
+``` sql
+SELECT a, b, c FROM (SELECT ...)
+```
+
+## Materialized {#materialized}
+
+``` sql
+CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
+```
+
+物化视图存储由相应的[SELECT](../../../sql-reference/statements/select/index.md)管理.
+
+创建不带`TO [db].[table]`的物化视图时，必须指定`ENGINE` – 用于存储数据的表引擎。
+
+使用`TO [db].[table]` 创建物化视图时，不得使用`POPULATE`。
+
+一个物化视图的实现是这样的：当向SELECT中指定的表插入数据时，插入数据的一部分被这个SELECT查询转换，结果插入到视图中。
+
+!!! important "重要"
+ClickHouse 中的物化视图更像是插入触发器。 如果视图查询中有一些聚合，则它仅应用于一批新插入的数据。 对源表现有数据的任何更改（如更新、删除、删除分区等）都不会更改物化视图。
+
+如果指定`POPULATE`，则在创建视图时将现有表数据插入到视图中，就像创建一个`CREATE TABLE ... AS SELECT ...`一样。 否则，查询仅包含创建视图后插入表中的数据。 我们**不建议**使用POPULATE，因为在创建视图期间插入表中的数据不会插入其中。
+
+`SELECT` 查询可以包含`DISTINCT`、`GROUP BY`、`ORDER BY`、`LIMIT`……请注意，相应的转换是在每个插入数据块上独立执行的。 例如，如果设置了`GROUP BY`，则在插入期间聚合数据，但仅在插入数据的单个数据包内。 数据不会被进一步聚合。 例外情况是使用独立执行数据聚合的`ENGINE`，例如`SummingMergeTree`。
+
+在物化视图上执行[ALTER](../../../sql-reference/statements/alter/index.md)查询有局限性，因此可能不方便。 如果物化视图使用构造`TO [db.]name`，你可以`DETACH`视图，为目标表运行`ALTER`，然后`ATTACH`先前分离的（`DETACH`）视图。
+
+请注意，物化视图受[optimize_on_insert](../../../operations/settings/settings.md#optimize-on-insert)设置的影响。 在插入视图之前合并数据。
+
+视图看起来与普通表相同。 例如，它们列在1SHOW TABLES1查询的结果中。
+
+删除视图,使用[DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). `DROP TABLE`也适用于视图。
+
+## Live View (实验性) {#live-view}
+
+!!! important "重要"
+这是一项实验性功能，可能会在未来版本中以向后不兼容的方式进行更改。
+使用[allow_experimental_live_view](../../../operations/settings/settings.md#allow-experimental-live-view)设置启用实时视图和`WATCH`查询的使用。 输入命令`set allow_experimental_live_view = 1`。
+
+```sql
+CREATE LIVE VIEW [IF NOT EXISTS] [db.]table_name [WITH [TIMEOUT [value_in_sec] [AND]] [REFRESH [value_in_sec]]] AS SELECT ...
+```
+
+实时视图存储相应[SELECT](../../../sql-reference/statements/select/index.md)查询的结果，并在查询结果更改时随时更新。 查询结果以及与新数据结合所需的部分结果存储在内存中，为重复查询提供更高的性能。当使用[WATCH](../../../sql-reference/statements/watch.md)查询更改查询结果时，实时视图可以提供推送通知。
+
+实时视图是通过插入到查询中指定的最里面的表来触发的。
+
+实时视图的工作方式类似于分布式表中查询的工作方式。 但不是组合来自不同服务器的部分结果，而是将当前数据的部分结果与新数据的部分结果组合在一起。当实时视图查询包含子查询时，缓存的部分结果仅存储在最里面的子查询中。
+
+!!! info "限制"
+- [Table function](../../../sql-reference/table-functions/index.md)不支持作为最里面的表.
+- 没有插入的表，例如[dictionary](../../../sql-reference/dictionaries/index.md), [system table](../../../operations/system-tables/index.md), [normal view](#normal), [materialized view](#materialized)不会触发实时视图。
+- 只有可以将旧数据的部分结果与新数据的部分结果结合起来的查询才有效。 实时视图不适用于需要完整数据集来计算最终结果或必须保留聚合状态的聚合的查询。
+- 不适用于在不同节点上执行插入的复制或分布式表。
+- 不能被多个表触发。
+
+    [WITH REFRESH](#live-view-with-refresh)强制定期更新实时视图，在某些情况下可以用作解决方法。
+
+### Monitoring Changes {#live-view-monitoring}
+
+您可以使用[WATCH](../../../sql-reference/statements/watch.md)命令监视`LIVE VIEW`查询结果的变化
+
+```sql
+WATCH [db.]live_view
+```
+
+**示例:**
+
+```sql
+CREATE TABLE mt (x Int8) Engine = MergeTree ORDER BY x;
+CREATE LIVE VIEW lv AS SELECT sum(x) FROM mt;
+```
+在对源表进行并行插入时观看实时视图。
+
+```sql
+WATCH lv;
+```
+
+```bash
+┌─sum(x)─┬─_version─┐
+│      1 │        1 │
+└────────┴──────────┘
+┌─sum(x)─┬─_version─┐
+│      2 │        2 │
+└────────┴──────────┘
+┌─sum(x)─┬─_version─┐
+│      6 │        3 │
+└────────┴──────────┘
+...
+```
+
+```sql
+INSERT INTO mt VALUES (1);
+INSERT INTO mt VALUES (2);
+INSERT INTO mt VALUES (3);
+```
+
+添加[EVENTS](../../../sql-reference/statements/watch.md#events-clause)子句只获取更改事件。
+
+```sql
+WATCH [db.]live_view EVENTS;
+```
+
+**示例:**
+
+```sql
+WATCH lv EVENTS;
+```
+
+```bash
+┌─version─┐
+│       1 │
+└─────────┘
+┌─version─┐
+│       2 │
+└─────────┘
+┌─version─┐
+│       3 │
+└─────────┘
+...
+```
+
+你可以执行[SELECT](../../../sql-reference/statements/select/index.md)与任何常规视图或表格相同的方式查询实时视图。如果查询结果被缓存，它将立即返回结果而不在基础表上运行存储的查询。
+
+```sql
+SELECT * FROM [db.]live_view WHERE ...
+```
+
+### Force Refresh {#live-view-alter-refresh}
+
+您可以使用`ALTER LIVE VIEW [db.]table_name REFRESH`语法.
+
+### WITH TIMEOUT条件 {#live-view-with-timeout}
+
+当使用`WITH TIMEOUT`子句创建实时视图时，[WATCH](../../../sql-reference/statements/watch.md)观察实时视图的查询。
+
+```sql
+CREATE LIVE VIEW [db.]table_name WITH TIMEOUT [value_in_sec] AS SELECT ...
+```
+
+如果未指定超时值，则由指定的值[temporary_live_view_timeout](../../../operations/settings/settings.md#temporary-live-view-timeout)决定.
+
+**示例:**
+
+```sql
+CREATE TABLE mt (x Int8) Engine = MergeTree ORDER BY x;
+CREATE LIVE VIEW lv WITH TIMEOUT 15 AS SELECT sum(x) FROM mt;
+```
+
+### WITH REFRESH条件 {#live-view-with-refresh}
+
+当使用`WITH REFRESH`子句创建实时视图时，它将在自上次刷新或触发后经过指定的秒数后自动刷新。
+
+```sql
+CREATE LIVE VIEW [db.]table_name WITH REFRESH [value_in_sec] AS SELECT ...
+```
+
+如果未指定刷新值，则由指定的值[periodic_live_view_refresh](../../../operations/settings/settings.md#periodic-live-view-refresh)决定.
+
+**示例:**
+
+```sql
+CREATE LIVE VIEW lv WITH REFRESH 5 AS SELECT now();
+WATCH lv
+```
+
+```bash
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 08:47:05 │        1 │
+└─────────────────────┴──────────┘
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 08:47:10 │        2 │
+└─────────────────────┴──────────┘
+┌───────────────now()─┬─_version─┐
+│ 2021-02-21 08:47:15 │        3 │
+└─────────────────────┴──────────┘
+```
+
+您可以使用`AND`子句组合`WITH TIMEOUT`和`WITH REFRESH`子句。
+
+```sql
+CREATE LIVE VIEW [db.]table_name WITH TIMEOUT [value_in_sec] AND REFRESH [value_in_sec] AS SELECT ...
+```
+
+**示例:**
+
+```sql
+CREATE LIVE VIEW lv WITH TIMEOUT 15 AND REFRESH 5 AS SELECT now();
+```
+
+15 秒后，如果没有活动的`WATCH`查询，实时视图将自动删除。
+
+```sql
+WATCH lv
+```
+
+```
+Code: 60. DB::Exception: Received from localhost:9000. DB::Exception: Table default.lv does not exist..
+```
+
+### Usage {#live-view-usage}
+
+实时视图表的最常见用途包括：
+
+- 为查询结果更改提供推送通知以避免轮询。
+- 缓存最频繁查询的结果以提供即时查询结果。
+- 监视表更改并触发后续选择查询。
+- 使用定期刷新从系统表中查看指标。
+
+[原始文章](https://clickhouse.com/docs/en/sql-reference/statements/create/view/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/describe-table.md b/docs/zh/sql-reference/statements/describe-table.md
new file mode 120000
index 00000000000..eb76534f3cd
--- /dev/null
+++ b/docs/zh/sql-reference/statements/describe-table.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/describe-table.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/detach.md b/docs/zh/sql-reference/statements/detach.md
new file mode 120000
index 00000000000..19d37ee535a
--- /dev/null
+++ b/docs/zh/sql-reference/statements/detach.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/detach.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/drop.md b/docs/zh/sql-reference/statements/drop.md
new file mode 100644
index 00000000000..c78cb450e19
--- /dev/null
+++ b/docs/zh/sql-reference/statements/drop.md
@@ -0,0 +1,100 @@
+---
+toc_priority: 44
+toc_title: DROP
+---
+
+# DROP语法 {#drop}
+
+删除现有实体。 如果指定了`IF EXISTS`子句，如果实体不存在，这些查询不会返回错误。
+
+## DROP DATABASE {#drop-database}
+
+删除`db`数据库中的所有表，然后删除`db`数据库本身。
+
+语法:
+
+``` sql
+DROP DATABASE [IF EXISTS] db [ON CLUSTER cluster]
+```
+
+## DROP TABLE {#drop-table}
+
+删除数据表
+
+语法:
+
+``` sql
+DROP [TEMPORARY] TABLE [IF EXISTS] [db.]name [ON CLUSTER cluster]
+```
+
+## DROP DICTIONARY {#drop-dictionary}
+
+删除字典。
+
+语法:
+
+``` sql
+DROP DICTIONARY [IF EXISTS] [db.]name
+```
+
+## DROP USER {#drop-user-statement}
+
+删除用户.
+
+语法:
+
+``` sql
+DROP USER [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
+```
+
+## DROP ROLE {#drop-role-statement}
+
+删除角色。删除的角色将从分配给它的所有实体中撤消。
+
+语法:
+
+``` sql
+DROP ROLE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
+```
+
+## DROP ROW POLICY {#drop-row-policy-statement}
+
+删除行策略。 删除的行策略从分配到它的所有实体中撤消。
+
+语法:
+
+``` sql
+DROP [ROW] POLICY [IF EXISTS] name [,...] ON [database.]table [,...] [ON CLUSTER cluster_name]
+```
+
+## DROP QUOTA {#drop-quota-statement}
+
+Deletes a quota. The deleted quota is revoked from all the entities where it was assigned.
+
+语法:
+
+``` sql
+DROP QUOTA [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
+```
+
+## DROP SETTINGS PROFILE {#drop-settings-profile-statement}
+
+删除配置文件。 已删除的设置配置文件将从分配给它的所有实体中撤销。
+
+语法:
+
+``` sql
+DROP [SETTINGS] PROFILE [IF EXISTS] name [,...] [ON CLUSTER cluster_name]
+```
+
+## DROP VIEW {#drop-view}
+
+删除视图。 视图也可以通过`DROP TABLE`命令删除，但`DROP VIEW`会检查`[db.]name`是否是一个视图。
+
+语法:
+
+``` sql
+DROP VIEW [IF EXISTS] [db.]name [ON CLUSTER cluster]
+```
+
+[原始文章](https://clickhouse.com/docs/zh/sql-reference/statements/drop/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/exchange.md b/docs/zh/sql-reference/statements/exchange.md
new file mode 100644
index 00000000000..b19e05e896f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/exchange.md
@@ -0,0 +1,42 @@
+---
+toc_priority: 49
+toc_title: EXCHANGE
+---
+
+# EXCHANGE语法 {#exchange}
+
+以原子方式交换两个表或字典的名称。
+此任务也可以通过使用[RENAME](./rename.md)来完成，但在这种情况下操作不是原子的。
+
+!!! note "注意"
+`EXCHANGE`仅支持[Atomic](../../engines/database-engines/atomic.md)数据库引擎.
+
+**语法**
+
+```sql
+EXCHANGE TABLES|DICTIONARIES [db0.]name_A AND [db1.]name_B
+```
+
+## EXCHANGE TABLES {#exchange_tables}
+
+交换两个表的名称。
+
+**语法**
+
+```sql
+EXCHANGE TABLES [db0.]table_A AND [db1.]table_B
+```
+
+## EXCHANGE DICTIONARIES {#exchange_dictionaries}
+
+交换两个字典的名称。
+
+**语法**
+
+```sql
+EXCHANGE DICTIONARIES [db0.]dict_A AND [db1.]dict_B
+```
+
+**参考**
+
+-   [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/zh/sql-reference/statements/exists.md b/docs/zh/sql-reference/statements/exists.md
new file mode 120000
index 00000000000..d69e8224fe6
--- /dev/null
+++ b/docs/zh/sql-reference/statements/exists.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/exists.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/explain.md b/docs/zh/sql-reference/statements/explain.md
new file mode 120000
index 00000000000..36f1f2cc9d4
--- /dev/null
+++ b/docs/zh/sql-reference/statements/explain.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/explain.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/grant.md b/docs/zh/sql-reference/statements/grant.md
index cb3952767ac..c55eff4126d 100644
--- a/docs/zh/sql-reference/statements/grant.md
+++ b/docs/zh/sql-reference/statements/grant.md
@@ -471,4 +471,4 @@ GRANT INSERT(x,y) ON db.table TO john
 
 `ADMIN OPTION` 权限允许用户将他们的角色分配给其它用户
 
-[原始文档](https://clickhouse.tech/docs/en/query_language/grant/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/query_language/grant/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/insert-into.md b/docs/zh/sql-reference/statements/insert-into.md
index 3e378c6a589..928107fa2b2 100644
--- a/docs/zh/sql-reference/statements/insert-into.md
+++ b/docs/zh/sql-reference/statements/insert-into.md
@@ -108,4 +108,4 @@ INSERT INTO [db.]table [(c1, c2, c3)] SELECT ...
 -   数据总是被实时的写入。
 -   写入的数据已经按照时间排序。
 
-[来源文章](https://clickhouse.tech/docs/en/query_language/insert_into/) <!--hide-->
+[来源文章](https://clickhouse.com/docs/en/query_language/insert_into/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/kill.md b/docs/zh/sql-reference/statements/kill.md
new file mode 120000
index 00000000000..1afbc9008f3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/kill.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/kill.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/misc.md b/docs/zh/sql-reference/statements/misc.md
index 5ec589c9e9a..8e7fc4c6bc3 100644
--- a/docs/zh/sql-reference/statements/misc.md
+++ b/docs/zh/sql-reference/statements/misc.md
@@ -376,4 +376,4 @@ USE db
 当前数据库用于搜索表，如果数据库没有在查询中明确定义与表名之前的点。
 使用HTTP协议时无法进行此查询，因为没有会话的概念。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/misc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/misc/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/optimize.md b/docs/zh/sql-reference/statements/optimize.md
new file mode 120000
index 00000000000..4f47d7273c5
--- /dev/null
+++ b/docs/zh/sql-reference/statements/optimize.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/optimize.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/rename.md b/docs/zh/sql-reference/statements/rename.md
new file mode 100644
index 00000000000..f921e4a41f3
--- /dev/null
+++ b/docs/zh/sql-reference/statements/rename.md
@@ -0,0 +1,61 @@
+---
+toc_priority: 48
+toc_title: RENAME
+---
+
+# RENAME语法 {#misc_operations-rename}
+
+重命名数据库、表或字典。 可以在单个查询中重命名多个实体。
+请注意，具有多个实体的`RENAME`查询是非原子操作。 要以原子方式交换实体名称，请使用[EXCHANGE](./exchange.md)语法.
+
+!!! note "注意"
+`RENAME`仅支持[Atomic](../../engines/database-engines/atomic.md)数据库引擎.
+
+**语法**
+
+```sql
+RENAME DATABASE|TABLE|DICTIONARY name TO new_name [,...] [ON CLUSTER cluster]
+```
+
+## RENAME DATABASE {#misc_operations-rename_database}
+
+重命名数据库.
+
+**语法**
+
+```sql
+RENAME DATABASE atomic_database1 TO atomic_database2 [,...] [ON CLUSTER cluster]
+```
+
+## RENAME TABLE {#misc_operations-rename_table}
+
+重命名一个或多个表
+
+重命名表是一个轻量级的操作。 如果在`TO`之后传递一个不同的数据库，该表将被移动到这个数据库。 但是，包含数据库的目录必须位于同一文件系统中。 否则，返回错误。
+如果在一个查询中重命名多个表，则该操作不是原子操作。 可能会部分执行，其他会话中可能会得到`Table ... does not exist ...`错误。
+
+**语法**
+
+``` sql
+RENAME TABLE [db1.]name1 TO [db2.]name2 [,...] [ON CLUSTER cluster]
+```
+
+**示例**
+
+```sql
+RENAME TABLE table_A TO table_A_bak, table_B TO table_B_bak;
+```
+
+## RENAME DICTIONARY {#rename_dictionary}
+
+重命名一个或多个词典。 此查询可用于在数据库之间移动字典。
+
+**语法**
+
+```sql
+RENAME DICTIONARY [db0.]dict_A TO [db1.]dict_B [,...] [ON CLUSTER cluster]
+```
+
+**参考**
+
+-   [Dictionaries](../../sql-reference/dictionaries/index.md)
diff --git a/docs/zh/sql-reference/statements/revoke.md b/docs/zh/sql-reference/statements/revoke.md
index f784b134a3b..16315ae96d4 100644
--- a/docs/zh/sql-reference/statements/revoke.md
+++ b/docs/zh/sql-reference/statements/revoke.md
@@ -45,4 +45,4 @@ GRANT SELECT ON accounts.staff TO mira;
 REVOKE SELECT(wage) ON accounts.staff FROM mira;
 ```
 
-{## [原始文档](https://clickhouse.tech/docs/en/operations/settings/settings/) ##}
+{## [原始文档](https://clickhouse.com/docs/en/operations/settings/settings/) ##}
diff --git a/docs/zh/sql-reference/statements/select/from.md b/docs/zh/sql-reference/statements/select/from.md
index fae25c0c3c1..c47e74e5e1f 100644
--- a/docs/zh/sql-reference/statements/select/from.md
+++ b/docs/zh/sql-reference/statements/select/from.md
@@ -20,7 +20,7 @@ toc_title: FROM
 
 当 `FINAL` 被指定，ClickHouse会在返回结果之前完全合并数据，从而执行给定表引擎合并期间发生的所有数据转换。
 
-它适用于从使用 [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)-引擎族（除了 `GraphiteMergeTree`). 还支持:
+它适用于从使用 [MergeTree](../../../engines/table-engines/mergetree-family/mergetree.md)-引擎族. 还支持:
 
 -   [Replicated](../../../engines/table-engines/mergetree-family/replication.md) 版本 `MergeTree` 引擎
 -   [View](../../../engines/table-engines/special/view.md), [Buffer](../../../engines/table-engines/special/buffer.md), [Distributed](../../../engines/table-engines/special/distributed.md)，和 [MaterializedView](../../../engines/table-engines/special/materializedview.md) 在其他引擎上运行的引擎，只要是它们底层是 `MergeTree`-引擎表即可。
diff --git a/docs/zh/sql-reference/statements/select/index.md b/docs/zh/sql-reference/statements/select/index.md
index d3de71efc6b..6c8cc361844 100644
--- a/docs/zh/sql-reference/statements/select/index.md
+++ b/docs/zh/sql-reference/statements/select/index.md
@@ -159,4 +159,4 @@ Code: 42. DB::Exception: Received from localhost:9000. DB::Exception: Number of
 
 有关详细信息，请参阅部分 “Settings”. 可以使用外部排序（将临时表保存到磁盘）和外部聚合。
 
-{## [原始文章](https://clickhouse.tech/docs/en/sql-reference/statements/select/) ##}
+{## [原始文章](https://clickhouse.com/docs/en/sql-reference/statements/select/) ##}
diff --git a/docs/zh/sql-reference/statements/select/offset.md b/docs/zh/sql-reference/statements/select/offset.md
new file mode 120000
index 00000000000..b12b5219dec
--- /dev/null
+++ b/docs/zh/sql-reference/statements/select/offset.md
@@ -0,0 +1 @@
+../../../../en/sql-reference/statements/select/offset.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/set-role.md b/docs/zh/sql-reference/statements/set-role.md
new file mode 120000
index 00000000000..a6525622a68
--- /dev/null
+++ b/docs/zh/sql-reference/statements/set-role.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set-role.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/set.md b/docs/zh/sql-reference/statements/set.md
new file mode 120000
index 00000000000..02e106afc9f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/set.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/set.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/show.md b/docs/zh/sql-reference/statements/show.md
index d9f09855916..85c5744f26b 100644
--- a/docs/zh/sql-reference/statements/show.md
+++ b/docs/zh/sql-reference/statements/show.md
@@ -165,4 +165,4 @@ SHOW CREATE QUOTA [name | CURRENT]
 SHOW CREATE [SETTINGS] PROFILE name
 ```
 
-[原始文档](https://clickhouse.tech/docs/en/query_language/show/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/query_language/show/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/system.md b/docs/zh/sql-reference/statements/system.md
index 7f2b7ae1082..9b21ba340a9 100644
--- a/docs/zh/sql-reference/statements/system.md
+++ b/docs/zh/sql-reference/statements/system.md
@@ -280,4 +280,4 @@ SYSTEM RESTART REPLICA [db.]replicated_merge_tree_family_table_name
 
 重置所有 `ReplicatedMergeTree`表的ZooKeeper会话状态。该操作会以Zookeeper为参照，对比当前状态，有需要的情况下将任务添加到ZooKeeper队列。
 
-[原始文档](https://clickhouse.tech/docs/en/query_language/system/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/query_language/system/) <!--hide-->
diff --git a/docs/zh/sql-reference/statements/truncate.md b/docs/zh/sql-reference/statements/truncate.md
new file mode 120000
index 00000000000..92fbd705e8f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/truncate.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/truncate.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/use.md b/docs/zh/sql-reference/statements/use.md
new file mode 120000
index 00000000000..7bdbf049326
--- /dev/null
+++ b/docs/zh/sql-reference/statements/use.md
@@ -0,0 +1 @@
+../../../en/sql-reference/statements/use.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/statements/watch.md b/docs/zh/sql-reference/statements/watch.md
new file mode 100644
index 00000000000..5f05eda811f
--- /dev/null
+++ b/docs/zh/sql-reference/statements/watch.md
@@ -0,0 +1,4 @@
+---
+toc_priority: 53
+toc_title: WATCH
+---
diff --git a/docs/zh/sql-reference/syntax.md b/docs/zh/sql-reference/syntax.md
index 644dc646726..7721699e699 100644
--- a/docs/zh/sql-reference/syntax.md
+++ b/docs/zh/sql-reference/syntax.md
@@ -54,7 +54,7 @@ ClickHouse支持SQL风格或C语言风格的注释：
 -   集群、数据库、表、分区、列的名称
 -   函数
 -   数据类型
--   [表达式别名](https://clickhouse.tech/docs/zh/sql-reference/syntax/#syntax-expression_aliases)
+-   [表达式别名](https://clickhouse.com/docs/zh/sql-reference/syntax/#syntax-expression_aliases)
 
 变量名可以被括起或不括起，后者是推荐做法。
 
@@ -192,4 +192,4 @@ select查询中，星号可以代替表达式使用。详情请参见“select
 表达式列表是用逗号分隔的一个或多个表达式。
 反过来，函数和运算符可以将表达式作为参数。
 
-[原始文档](https://clickhouse.tech/docs/en/sql_reference/syntax/) <!--hide-->
+[原始文档](https://clickhouse.com/docs/en/sql_reference/syntax/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/cluster.md b/docs/zh/sql-reference/table-functions/cluster.md
new file mode 120000
index 00000000000..4721debec48
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/cluster.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/dictionary.md b/docs/zh/sql-reference/table-functions/dictionary.md
new file mode 120000
index 00000000000..f9f453831a4
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/dictionary.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/dictionary.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/file.md b/docs/zh/sql-reference/table-functions/file.md
index 84fddada867..dd2b83d292a 100644
--- a/docs/zh/sql-reference/table-functions/file.md
+++ b/docs/zh/sql-reference/table-functions/file.md
@@ -127,6 +127,6 @@ FROM file('big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name String, value UInt32')
 
 **另请参阅**
 
--   [虚拟列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [虚拟列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/file/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/file/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/generate.md b/docs/zh/sql-reference/table-functions/generate.md
index b9b02793cf3..b00d1ecf1ab 100644
--- a/docs/zh/sql-reference/table-functions/generate.md
+++ b/docs/zh/sql-reference/table-functions/generate.md
@@ -39,4 +39,4 @@ SELECT * FROM generateRandom('a Array(Int8), d Decimal32(4), c Tuple(DateTime64(
 └──────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/generate/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/generate/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/hdfs.md b/docs/zh/sql-reference/table-functions/hdfs.md
index 715d9671dc8..5fc5c0b4c62 100644
--- a/docs/zh/sql-reference/table-functions/hdfs.md
+++ b/docs/zh/sql-reference/table-functions/hdfs.md
@@ -97,6 +97,6 @@ FROM hdfs('hdfs://hdfs1:9000/big_dir/file{0..9}{0..9}{0..9}', 'CSV', 'name Strin
 
 **另请参阅**
 
--   [虚拟列](https://clickhouse.tech/docs/en/operations/table_engines/#table_engines-virtual_columns)
+-   [虚拟列](https://clickhouse.com/docs/en/operations/table_engines/#table_engines-virtual_columns)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/hdfs/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/hdfs/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/index.md b/docs/zh/sql-reference/table-functions/index.md
index 20a335de0fc..a04c20c875d 100644
--- a/docs/zh/sql-reference/table-functions/index.md
+++ b/docs/zh/sql-reference/table-functions/index.md
@@ -33,4 +33,4 @@ toc_title: "\u5BFC\u8A00"
 | [odbc](../../sql-reference/table-functions/odbc.md)             | 创建一个ODBC引擎表。 |
 | [hdfs](../../sql-reference/table-functions/hdfs.md)             | 创建一个HDFS引擎表。 |
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/input.md b/docs/zh/sql-reference/table-functions/input.md
index 61bb58d73e2..bfee05eb898 100644
--- a/docs/zh/sql-reference/table-functions/input.md
+++ b/docs/zh/sql-reference/table-functions/input.md
@@ -40,4 +40,4 @@ $ cat data.csv | clickhouse-client --query="INSERT INTO test FORMAT CSV"
 $ cat data.csv | clickhouse-client --query="INSERT INTO test SELECT * FROM input('test_structure') FORMAT CSV"
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/input/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/input/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/jdbc.md b/docs/zh/sql-reference/table-functions/jdbc.md
index 4d95a5ed203..91f494932bd 100644
--- a/docs/zh/sql-reference/table-functions/jdbc.md
+++ b/docs/zh/sql-reference/table-functions/jdbc.md
@@ -35,4 +35,4 @@ FROM jdbc('mysql-dev?datasource_column', 'show databases') a
 INNER JOIN jdbc('self?datasource_column', 'show databases') b ON a.Database = b.name
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/merge.md b/docs/zh/sql-reference/table-functions/merge.md
index 410468b3d8a..e994c77f1b0 100644
--- a/docs/zh/sql-reference/table-functions/merge.md
+++ b/docs/zh/sql-reference/table-functions/merge.md
@@ -9,4 +9,4 @@ toc_title: merge
 
 表结构取自遇到的第一个与正则表达式匹配的表。
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/merge/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/merge/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/mysql.md b/docs/zh/sql-reference/table-functions/mysql.md
index 3ed0001b0a0..f406a6d051e 100644
--- a/docs/zh/sql-reference/table-functions/mysql.md
+++ b/docs/zh/sql-reference/table-functions/mysql.md
@@ -106,4 +106,4 @@ SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 -   [该 ‘MySQL’ 表引擎](../../engines/table-engines/integrations/mysql.md)
 -   [使用MySQL作为外部字典的来源](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-mysql)
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/mysql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/mysql/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/null.md b/docs/zh/sql-reference/table-functions/null.md
new file mode 120000
index 00000000000..bff05386e28
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/null.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/null.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/numbers.md b/docs/zh/sql-reference/table-functions/numbers.md
index 59a57b157e0..279d2e730ba 100644
--- a/docs/zh/sql-reference/table-functions/numbers.md
+++ b/docs/zh/sql-reference/table-functions/numbers.md
@@ -25,4 +25,4 @@ SELECT * FROM system.numbers LIMIT 10;
 select toDate('2010-01-01') + number as d FROM numbers(365);
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/numbers/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/numbers/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/odbc.md b/docs/zh/sql-reference/table-functions/odbc.md
index dd2826e892f..5a2cd8bb5f0 100644
--- a/docs/zh/sql-reference/table-functions/odbc.md
+++ b/docs/zh/sql-reference/table-functions/odbc.md
@@ -103,4 +103,4 @@ SELECT * FROM odbc('DSN=mysqlconn', 'test', 'test')
 -   [ODBC外部字典](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-odbc)
 -   [ODBC表引擎](../../engines/table-engines/integrations/odbc.md).
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/jdbc/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/jdbc/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/postgresql.md b/docs/zh/sql-reference/table-functions/postgresql.md
index df29c2c2891..ec31432b96a 100644
--- a/docs/zh/sql-reference/table-functions/postgresql.md
+++ b/docs/zh/sql-reference/table-functions/postgresql.md
@@ -117,4 +117,4 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
 -   [PostgreSQL 表引擎](../../engines/table-engines/integrations/postgresql.md)
 -   [使用 PostgreSQL 作为外部字典的来源](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources.md#dicts-external_dicts_dict_sources-postgresql)
 
-[原始文章](https://clickhouse.tech/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/sql-reference/table-functions/postgresql/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/remote.md b/docs/zh/sql-reference/table-functions/remote.md
index dfe81d0bafe..236ce1a7499 100644
--- a/docs/zh/sql-reference/table-functions/remote.md
+++ b/docs/zh/sql-reference/table-functions/remote.md
@@ -101,4 +101,4 @@ INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), 'remote_table') VALU
 SELECT * FROM remote_table;
 ```
 
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/remote/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/remote/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/s3.md b/docs/zh/sql-reference/table-functions/s3.md
index c55412f4ddd..06a6719b445 100644
--- a/docs/zh/sql-reference/table-functions/s3.md
+++ b/docs/zh/sql-reference/table-functions/s3.md
@@ -129,4 +129,4 @@ SELECT name, value FROM existing_table;
 
 -   [S3 引擎](../../engines/table-engines/integrations/s3.md)
 
-[原始文章](https://clickhouse.tech/docs/en/sql-reference/table-functions/s3/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/sql-reference/table-functions/s3/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/s3Cluster.md b/docs/zh/sql-reference/table-functions/s3Cluster.md
new file mode 120000
index 00000000000..48e5367084e
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/s3Cluster.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/s3Cluster.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/sqlite.md b/docs/zh/sql-reference/table-functions/sqlite.md
new file mode 120000
index 00000000000..7f203c4d062
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/sqlite.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/sqlite.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/table-functions/url.md b/docs/zh/sql-reference/table-functions/url.md
index d726cddd748..fe3e3ac25e9 100644
--- a/docs/zh/sql-reference/table-functions/url.md
+++ b/docs/zh/sql-reference/table-functions/url.md
@@ -40,4 +40,4 @@ CREATE TABLE test_table (column1 String, column2 UInt32) ENGINE=Memory;
 INSERT INTO FUNCTION url('http://127.0.0.1:8123/?query=INSERT+INTO+test_table+FORMAT+CSV', 'CSV', 'column1 String, column2 UInt32') VALUES ('http interface', 42);
 SELECT * FROM test_table;
 ```
-[原始文章](https://clickhouse.tech/docs/en/query_language/table_functions/url/) <!--hide-->
+[原始文章](https://clickhouse.com/docs/en/query_language/table_functions/url/) <!--hide-->
diff --git a/docs/zh/sql-reference/table-functions/view.md b/docs/zh/sql-reference/table-functions/view.md
new file mode 120000
index 00000000000..19a5bf245cd
--- /dev/null
+++ b/docs/zh/sql-reference/table-functions/view.md
@@ -0,0 +1 @@
+../../../en/sql-reference/table-functions/view.md
\ No newline at end of file
diff --git a/docs/zh/sql-reference/window-functions/index.md b/docs/zh/sql-reference/window-functions/index.md
new file mode 120000
index 00000000000..206505bf0eb
--- /dev/null
+++ b/docs/zh/sql-reference/window-functions/index.md
@@ -0,0 +1 @@
+../../../en/sql-reference/window-functions/index.md
\ No newline at end of file
diff --git a/docs/zh/whats-new/changelog/2020.md b/docs/zh/whats-new/changelog/2020.md
new file mode 120000
index 00000000000..f0fb97311d2
--- /dev/null
+++ b/docs/zh/whats-new/changelog/2020.md
@@ -0,0 +1 @@
+../../../en/whats-new/changelog/2020.md
\ No newline at end of file
diff --git a/docs/zh/whats-new/roadmap.md b/docs/zh/whats-new/roadmap.md
index df4b027f7da..3cb9dd6fa2f 100644
--- a/docs/zh/whats-new/roadmap.md
+++ b/docs/zh/whats-new/roadmap.md
@@ -7,4 +7,4 @@ toc_title: Roadmap
 
 `2021年Roadmap`已公布供公开讨论查看[这里](https://github.com/ClickHouse/ClickHouse/issues/17623).
 
-{## [源文章](https://clickhouse.tech/docs/en/roadmap/) ##}
+{## [源文章](https://clickhouse.com/docs/en/roadmap/) ##}
diff --git a/docs/zh/whats-new/security-changelog.md b/docs/zh/whats-new/security-changelog.md
index 9cf0ca0b08c..24f352c6028 100644
--- a/docs/zh/whats-new/security-changelog.md
+++ b/docs/zh/whats-new/security-changelog.md
@@ -71,4 +71,4 @@ deb包中的错误配置可能导致未经授权使用数据库。
 
 作者：英国国家网络安全中心（NCSC）
 
-{## [Original article](https://clickhouse.tech/docs/en/security_changelog/) ##}
+{## [Original article](https://clickhouse.com/docs/en/security_changelog/) ##}
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index 6929bd861ed..43d9f974648 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -11,28 +11,28 @@ option (ENABLE_CLICKHOUSE_SERVER "Server mode (main mode)" ${ENABLE_CLICKHOUSE_A
 option (ENABLE_CLICKHOUSE_CLIENT "Client mode (interactive tui/shell that connects to the server)"
     ${ENABLE_CLICKHOUSE_ALL})
 
-# https://clickhouse.tech/docs/en/operations/utilities/clickhouse-local/
+# https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/
 option (ENABLE_CLICKHOUSE_LOCAL "Local files fast processing mode" ${ENABLE_CLICKHOUSE_ALL})
 
-# https://clickhouse.tech/docs/en/operations/utilities/clickhouse-benchmark/
+# https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/
 option (ENABLE_CLICKHOUSE_BENCHMARK "Queries benchmarking mode" ${ENABLE_CLICKHOUSE_ALL})
 
 option (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG "Configs processor (extract values etc.)" ${ENABLE_CLICKHOUSE_ALL})
 
-# https://clickhouse.tech/docs/en/operations/utilities/clickhouse-compressor/
+# https://clickhouse.com/docs/en/operations/utilities/clickhouse-compressor/
 option (ENABLE_CLICKHOUSE_COMPRESSOR "Data compressor and decompressor" ${ENABLE_CLICKHOUSE_ALL})
 
-# https://clickhouse.tech/docs/en/operations/utilities/clickhouse-copier/
+# https://clickhouse.com/docs/en/operations/utilities/clickhouse-copier/
 option (ENABLE_CLICKHOUSE_COPIER "Inter-cluster data copying mode" ${ENABLE_CLICKHOUSE_ALL})
 
 option (ENABLE_CLICKHOUSE_FORMAT "Queries pretty-printer and formatter with syntax highlighting"
     ${ENABLE_CLICKHOUSE_ALL})
 
-# https://clickhouse.tech/docs/en/operations/utilities/clickhouse-obfuscator/
+# https://clickhouse.com/docs/en/operations/utilities/clickhouse-obfuscator/
 option (ENABLE_CLICKHOUSE_OBFUSCATOR "Table data obfuscator (convert real data to benchmark-ready one)"
     ${ENABLE_CLICKHOUSE_ALL})
 
-# https://clickhouse.tech/docs/en/operations/utilities/odbc-bridge/
+# https://clickhouse.com/docs/en/operations/utilities/odbc-bridge/
 # TODO Also needs NANODBC.
 if (ENABLE_ODBC)
     option (ENABLE_CLICKHOUSE_ODBC_BRIDGE "HTTP-server working like a proxy to ODBC driver"
@@ -44,10 +44,10 @@ endif ()
 option (ENABLE_CLICKHOUSE_LIBRARY_BRIDGE "HTTP-server working like a proxy to Library dictionary source"
     ${ENABLE_CLICKHOUSE_ALL})
 
-# https://presentations.clickhouse.tech/matemarketing_2020/
-option (ENABLE_CLICKHOUSE_GIT_IMPORT "A tool to analyze Git repositories"
-    ${ENABLE_CLICKHOUSE_ALL})
+# https://presentations.clickhouse.com/matemarketing_2020/
+option (ENABLE_CLICKHOUSE_GIT_IMPORT "A tool to analyze Git repositories" ${ENABLE_CLICKHOUSE_ALL})
 
+option (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER "A tool to export table data files to be later put to a static files web server" ${ENABLE_CLICKHOUSE_ALL})
 
 option (ENABLE_CLICKHOUSE_KEEPER "ClickHouse alternative to ZooKeeper" ${ENABLE_CLICKHOUSE_ALL})
 
@@ -227,6 +227,7 @@ add_subdirectory (obfuscator)
 add_subdirectory (install)
 add_subdirectory (git-import)
 add_subdirectory (bash-completion)
+add_subdirectory (static-files-disk-uploader)
 
 if (ENABLE_CLICKHOUSE_KEEPER)
     add_subdirectory (keeper)
@@ -258,7 +259,8 @@ if (CLICKHOUSE_ONE_SHARED)
     ${CLICKHOUSE_GIT_IMPORT_SOURCES}
     ${CLICKHOUSE_ODBC_BRIDGE_SOURCES}
     ${CLICKHOUSE_KEEPER_SOURCES}
-    ${CLICKHOUSE_KEEPER_CONVERTER_SOURCES})
+    ${CLICKHOUSE_KEEPER_CONVERTER_SOURCES}
+    ${CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_SOURCES})
 
     target_link_libraries(clickhouse-lib
       ${CLICKHOUSE_SERVER_LINK}
@@ -273,7 +275,8 @@ if (CLICKHOUSE_ONE_SHARED)
       ${CLICKHOUSE_GIT_IMPORT_LINK}
       ${CLICKHOUSE_ODBC_BRIDGE_LINK}
       ${CLICKHOUSE_KEEPER_LINK}
-      ${CLICKHOUSE_KEEPER_CONVERTER_LINK})
+      ${CLICKHOUSE_KEEPER_CONVERTER_LINK}
+      ${CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_LINK})
 
     target_include_directories(clickhouse-lib
       ${CLICKHOUSE_SERVER_INCLUDE}
@@ -306,6 +309,7 @@ if (CLICKHOUSE_SPLIT_BINARY)
         clickhouse-obfuscator
         clickhouse-git-import
         clickhouse-copier
+        clickhouse-static-files-disk-uploader
     )
 
     if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
@@ -371,6 +375,9 @@ else ()
     if (ENABLE_CLICKHOUSE_GIT_IMPORT)
         clickhouse_target_link_split_lib(clickhouse git-import)
     endif ()
+    if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
+        clickhouse_target_link_split_lib(clickhouse static-files-disk-uploader)
+    endif ()
     if (ENABLE_CLICKHOUSE_KEEPER)
         clickhouse_target_link_split_lib(clickhouse keeper)
     endif()
@@ -432,6 +439,11 @@ else ()
         install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-git-import" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
         list(APPEND CLICKHOUSE_BUNDLE clickhouse-git-import)
     endif ()
+    if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
+        add_custom_target (clickhouse-static-files-disk-uploader ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-static-files-disk-uploader DEPENDS clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-static-files-disk-uploader" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        list(APPEND CLICKHOUSE_BUNDLE clickhouse-static-files-disk-uploader)
+    endif ()
     if (ENABLE_CLICKHOUSE_KEEPER)
         add_custom_target (clickhouse-keeper ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-keeper DEPENDS clickhouse)
         install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-keeper" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index be57a3b92a0..1c276a83768 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -28,7 +28,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <IO/UseSSL.h>
-#include <DataStreams/RemoteBlockInputStream.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <Interpreters/Context.h>
 #include <Client/Connection.h>
 #include <Common/InterruptListener.h>
@@ -424,20 +424,19 @@ private:
         if (reconnect)
             connection.disconnect();
 
-        RemoteBlockInputStream stream(
+        RemoteQueryExecutor executor(
             connection, query, {}, global_context, nullptr, Scalars(), Tables(), query_processing_stage);
         if (!query_id.empty())
-            stream.setQueryId(query_id);
+            executor.setQueryId(query_id);
 
         Progress progress;
-        stream.setProgressCallback([&progress](const Progress & value) { progress.incrementPiecewiseAtomically(value); });
+        executor.setProgressCallback([&progress](const Progress & value) { progress.incrementPiecewiseAtomically(value); });
 
-        stream.readPrefix();
-        while (Block block = stream.read());
+        ProfileInfo info;
+        while (Block block = executor.read())
+            info.update(block);
 
-        stream.readSuffix();
-
-        const BlockStreamProfileInfo & info = stream.getProfileInfo();
+        executor.finish();
 
         double seconds = watch.elapsedSeconds();
 
diff --git a/programs/client/CMakeLists.txt b/programs/client/CMakeLists.txt
index 084e1b45911..97616e9b69f 100644
--- a/programs/client/CMakeLists.txt
+++ b/programs/client/CMakeLists.txt
@@ -1,8 +1,6 @@
 set (CLICKHOUSE_CLIENT_SOURCES
     Client.cpp
-    ConnectionParameters.cpp
-    QueryFuzzer.cpp
-    Suggest.cpp
+    TestTags.cpp
 )
 
 set (CLICKHOUSE_CLIENT_LINK
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 5b204751ba0..4951106f595 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1,16 +1,3 @@
-#include "ConnectionParameters.h"
-#include "QueryFuzzer.h"
-#include "Suggest.h"
-#include "TestHint.h"
-
-#if USE_REPLXX
-#   include <common/ReplxxLineReader.h>
-#elif defined(USE_READLINE) && USE_READLINE
-#   include <common/ReadlineLineReader.h>
-#else
-#   include <common/LineReader.h>
-#endif
-
 #include <stdlib.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -21,102 +8,654 @@
 #include <unordered_set>
 #include <algorithm>
 #include <optional>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <Poco/String.h>
-#include <Poco/Util/Application.h>
-#include <Processors/Formats/IInputFormat.h>
-#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
-#include <Processors/QueryPipeline.h>
-#include <Columns/ColumnString.h>
-#include <common/find_symbols.h>
-#include <common/LineReader.h>
-#include <Common/ClickHouseRevision.h>
+#include <filesystem>
+#include <string>
+#include "Client.h"
+#include "Core/Protocol.h"
+
+#include <base/argsToConfig.h>
+#include <base/find_symbols.h>
+
+#if !defined(ARCADIA_BUILD)
+#    include <Common/config_version.h>
+#endif
 #include <Common/Exception.h>
-#include <Common/ShellCommand.h>
-#include <Common/UnicodeBar.h>
 #include <Common/formatReadable.h>
-#include <Common/NetException.h>
-#include <Common/Throttler.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/typeid_cast.h>
-#include <Common/clearPasswordFromCommandLine.h>
-#include <Common/Config/ConfigProcessor.h>
-#include <Common/PODArray.h>
-#include <Core/Types.h>
+#include <Common/TerminalSize.h>
+#include <Common/Config/configReadClient.h>
+#include "Common/MemoryTracker.h"
+
 #include <Core/QueryProcessingStage.h>
-#include <Core/ExternalTable.h>
-#include <IO/ReadBufferFromFile.h>
-#include <IO/ReadBufferFromFileDescriptor.h>
-#include <IO/WriteBufferFromFileDescriptor.h>
-#include <IO/WriteBufferFromFile.h>
-#include <IO/ReadBufferFromMemory.h>
+#include <Client/TestHint.h>
+#include <Columns/ColumnString.h>
+#include <Poco/Util/Application.h>
+
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <IO/Operators.h>
-#include <IO/UseSSL.h>
 #include <IO/WriteBufferFromOStream.h>
-#include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <DataStreams/InternalTextLogsRowOutputStream.h>
-#include <DataStreams/NullBlockOutputStream.h>
+#include <IO/UseSSL.h>
+
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTUseQuery.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
-#include <Parsers/ASTQueryWithOutput.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/formatAST.h>
-#include <Parsers/parseQuery.h>
-#include <Parsers/ParserQuery.h>
-#include <Interpreters/Context.h>
+
 #include <Interpreters/InterpreterSetQuery.h>
-#include <Interpreters/ReplaceQueryParameterVisitor.h>
-#include <Client/Connection.h>
-#include <Common/InterruptListener.h>
+
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <Formats/registerFormats.h>
-#include <Formats/FormatFactory.h>
-#include <Common/Config/configReadClient.h>
-#include <Storages/ColumnsDescription.h>
-#include <common/argsToConfig.h>
-#include <Common/TerminalSize.h>
-#include <Common/UTF8Helpers.h>
-#include <Common/ProgressIndication.h>
-#include <filesystem>
-#include <Common/filesystemHelpers.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include "TestTags.h"
 
 #ifndef __clang__
 #pragma GCC optimize("-fno-var-tracking-assignments")
 #endif
 
+namespace CurrentMetrics
+{
+    extern const Metric Revision;
+    extern const Metric VersionInteger;
+    extern const Metric MemoryTracking;
+    extern const Metric MaxDDLEntryID;
+}
+
 namespace fs = std::filesystem;
 
+
 namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int NETWORK_ERROR;
-    extern const int NO_DATA_TO_INSERT;
     extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_PACKET_FROM_SERVER;
-    extern const int UNEXPECTED_PACKET_FROM_SERVER;
-    extern const int CLIENT_OUTPUT_FORMAT_SPECIFIED;
-    extern const int INVALID_USAGE_OF_INPUT;
-    extern const int DEADLOCK_AVOIDED;
-    extern const int UNRECOGNIZED_ARGUMENTS;
     extern const int SYNTAX_ERROR;
     extern const int TOO_DEEP_RECURSION;
+    extern const int NETWORK_ERROR;
+    extern const int AUTHENTICATION_FAILED;
+}
+
+
+void Client::processError(const String & query) const
+{
+    if (server_exception)
+    {
+        fmt::print(stderr, "Received exception from server (version {}):\n{}\n",
+                server_version,
+                getExceptionMessage(*server_exception, print_stack_trace, true));
+        if (is_interactive)
+        {
+            fmt::print(stderr, "\n");
+        }
+        else
+        {
+            fmt::print(stderr, "(query: {})\n", query);
+        }
+    }
+
+    if (client_exception)
+    {
+        fmt::print(stderr, "Error on processing query: {}\n", client_exception->message());
+
+        if (is_interactive)
+        {
+            fmt::print(stderr, "\n");
+        }
+        else
+        {
+            fmt::print(stderr, "(query: {})\n", query);
+        }
+    }
+
+    // A debug check -- at least some exception must be set, if the error
+    // flag is set, and vice versa.
+    assert(have_error == (client_exception || server_exception));
+}
+
+
+bool Client::executeMultiQuery(const String & all_queries_text)
+{
+    // It makes sense not to base any control flow on this, so that it is
+    // the same in tests and in normal usage. The only difference is that in
+    // normal mode we ignore the test hints.
+    const bool test_mode = config().has("testmode");
+    if (test_mode)
+    {
+        /// disable logs if expects errors
+        TestHint test_hint(test_mode, all_queries_text);
+        if (test_hint.clientError() || test_hint.serverError())
+            processTextAsSingleQuery("SET send_logs_level = 'fatal'");
+    }
+
+    bool echo_query = echo_queries;
+
+    /// Test tags are started with "--" so they are interpreted as comments anyway.
+    /// But if the echo is enabled we have to remove the test tags from `all_queries_text`
+    /// because we don't want test tags to be echoed.
+    size_t test_tags_length = test_mode ? getTestTagsLength(all_queries_text) : 0;
+
+    /// Several queries separated by ';'.
+    /// INSERT data is ended by the end of line, not ';'.
+    /// An exception is VALUES format where we also support semicolon in
+    /// addition to end of line.
+    const char * this_query_begin = all_queries_text.data() + test_tags_length;
+    const char * this_query_end;
+    const char * all_queries_end = all_queries_text.data() + all_queries_text.size();
+
+    String full_query; // full_query is the query + inline INSERT data + trailing comments (the latter is our best guess for now).
+    String query_to_execute;
+    ASTPtr parsed_query;
+    std::optional<Exception> current_exception;
+
+    while (true)
+    {
+        auto stage = analyzeMultiQueryText(this_query_begin, this_query_end, all_queries_end,
+                                           query_to_execute, parsed_query, all_queries_text, current_exception);
+        switch (stage)
+        {
+            case MultiQueryProcessingStage::QUERIES_END:
+            case MultiQueryProcessingStage::PARSING_FAILED:
+            {
+                return true;
+            }
+            case MultiQueryProcessingStage::CONTINUE_PARSING:
+            {
+                continue;
+            }
+            case MultiQueryProcessingStage::PARSING_EXCEPTION:
+            {
+                this_query_end = find_first_symbols<'\n'>(this_query_end, all_queries_end);
+
+                // Try to find test hint for syntax error. We don't know where
+                // the query ends because we failed to parse it, so we consume
+                // the entire line.
+                TestHint hint(test_mode, String(this_query_begin, this_query_end - this_query_begin));
+                if (hint.serverError())
+                {
+                    // Syntax errors are considered as client errors
+                    current_exception->addMessage("\nExpected server error '{}'.", hint.serverError());
+                    current_exception->rethrow();
+                }
+
+                if (hint.clientError() != current_exception->code())
+                {
+                    if (hint.clientError())
+                        current_exception->addMessage("\nExpected client error: " + std::to_string(hint.clientError()));
+                    current_exception->rethrow();
+                }
+
+                /// It's expected syntax error, skip the line
+                this_query_begin = this_query_end;
+                current_exception.reset();
+
+                continue;
+            }
+            case MultiQueryProcessingStage::EXECUTE_QUERY:
+            {
+                full_query = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
+                if (query_fuzzer_runs)
+                {
+                    if (!processWithFuzzing(full_query))
+                        return false;
+                    this_query_begin = this_query_end;
+                    continue;
+                }
+
+                // Now we know for sure where the query ends.
+                // Look for the hint in the text of query + insert data + trailing
+                // comments,
+                // e.g. insert into t format CSV 'a' -- { serverError 123 }.
+                // Use the updated query boundaries we just calculated.
+                TestHint test_hint(test_mode, full_query);
+                // Echo all queries if asked; makes for a more readable reference
+                // file.
+                echo_query = test_hint.echoQueries().value_or(echo_query);
+                try
+                {
+                    processParsedSingleQuery(full_query, query_to_execute, parsed_query, echo_query, false);
+                }
+                catch (...)
+                {
+                    // Surprisingly, this is a client error. A server error would
+                    // have been reported w/o throwing (see onReceiveSeverException()).
+                    client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(print_stack_trace), getCurrentExceptionCode());
+                    have_error = true;
+                }
+                // Check whether the error (or its absence) matches the test hints
+                // (or their absence).
+                bool error_matches_hint = true;
+                if (have_error)
+                {
+                    if (test_hint.serverError())
+                    {
+                        if (!server_exception)
+                        {
+                            error_matches_hint = false;
+                            fmt::print(stderr, "Expected server error code '{}' but got no server error (query: {}).\n",
+                                       test_hint.serverError(), full_query);
+                        }
+                        else if (server_exception->code() != test_hint.serverError())
+                        {
+                            error_matches_hint = false;
+                            fmt::print(stderr, "Expected server error code: {} but got: {} (query: {}).\n",
+                                       test_hint.serverError(), server_exception->code(), full_query);
+                        }
+                    }
+                    if (test_hint.clientError())
+                    {
+                        if (!client_exception)
+                        {
+                            error_matches_hint = false;
+                            fmt::print(stderr, "Expected client error code '{}' but got no client error (query: {}).\n",
+                                       test_hint.clientError(), full_query);
+                        }
+                        else if (client_exception->code() != test_hint.clientError())
+                        {
+                            error_matches_hint = false;
+                            fmt::print(stderr, "Expected client error code '{}' but got '{}' (query: {}).\n",
+                                       test_hint.clientError(), client_exception->code(), full_query);
+                        }
+                    }
+                    if (!test_hint.clientError() && !test_hint.serverError())
+                    {
+                        // No error was expected but it still occurred. This is the
+                        // default case w/o test hint, doesn't need additional
+                        // diagnostics.
+                        error_matches_hint = false;
+                    }
+                }
+                else
+                {
+                    if (test_hint.clientError())
+                    {
+                        fmt::print(stderr, "The query succeeded but the client error '{}' was expected (query: {}).\n",
+                                   test_hint.clientError(), full_query);
+                        error_matches_hint = false;
+                    }
+                    if (test_hint.serverError())
+                    {
+                        fmt::print(stderr, "The query succeeded but the server error '{}' was expected (query: {}).\n",
+                                   test_hint.serverError(), full_query);
+                        error_matches_hint = false;
+                    }
+                }
+                // If the error is expected, force reconnect and ignore it.
+                if (have_error && error_matches_hint)
+                {
+                    client_exception.reset();
+                    server_exception.reset();
+                    have_error = false;
+
+                    if (!connection->checkConnected())
+                        connect();
+                }
+
+                // For INSERTs with inline data: use the end of inline data as
+                // reported by the format parser (it is saved in sendData()).
+                // This allows us to handle queries like:
+                //   insert into t values (1); select 1
+                // , where the inline data is delimited by semicolon and not by a
+                // newline.
+                auto * insert_ast = parsed_query->as<ASTInsertQuery>();
+                if (insert_ast && insert_ast->data)
+                {
+                    this_query_end = insert_ast->end;
+                    adjustQueryEnd(this_query_end, all_queries_end, global_context->getSettingsRef().max_parser_depth);
+                }
+
+                // Report error.
+                if (have_error)
+                    processError(full_query);
+
+                // Stop processing queries if needed.
+                if (have_error && !ignore_error)
+                    return is_interactive;
+
+                this_query_begin = this_query_end;
+                break;
+            }
+        }
+    }
+}
+
+
+/// Make query to get all server warnings
+std::vector<String> Client::loadWarningMessages()
+{
+    std::vector<String> messages;
+    connection->sendQuery(connection_parameters.timeouts, "SELECT message FROM system.warnings", "" /* query_id */,
+                          QueryProcessingStage::Complete, nullptr, nullptr, false);
+    while (true)
+    {
+        Packet packet = connection->receivePacket();
+        switch (packet.type)
+        {
+            case Protocol::Server::Data:
+                if (packet.block)
+                {
+                    const ColumnString & column = typeid_cast<const ColumnString &>(*packet.block.getByPosition(0).column);
+
+                    size_t rows = packet.block.rows();
+                    for (size_t i = 0; i < rows; ++i)
+                        messages.emplace_back(column.getDataAt(i).toString());
+                }
+                continue;
+
+            case Protocol::Server::Progress:
+                continue;
+            case Protocol::Server::ProfileInfo:
+                continue;
+            case Protocol::Server::Totals:
+                continue;
+            case Protocol::Server::Extremes:
+                continue;
+            case Protocol::Server::Log:
+                continue;
+
+            case Protocol::Server::Exception:
+                packet.exception->rethrow();
+                return messages;
+
+            case Protocol::Server::EndOfStream:
+                return messages;
+
+            case Protocol::Server::ProfileEvents:
+                continue;
+
+            default:
+                throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from server {}",
+                    packet.type, connection->getDescription());
+        }
+    }
+}
+
+
+void Client::initialize(Poco::Util::Application & self)
+{
+    Poco::Util::Application::initialize(self);
+
+    const char * home_path_cstr = getenv("HOME");
+    if (home_path_cstr)
+        home_path = home_path_cstr;
+
+    configReadClient(config(), home_path);
+
+    // global_context->setApplicationType(Context::ApplicationType::CLIENT);
+    global_context->setQueryParameters(query_parameters);
+
+    /// settings and limits could be specified in config file, but passed settings has higher priority
+    for (const auto & setting : global_context->getSettingsRef().allUnchanged())
+    {
+        const auto & name = setting.getName();
+        if (config().has(name))
+            global_context->setSetting(name, config().getString(name));
+    }
+
+    /// Set path for format schema files
+    if (config().has("format_schema_path"))
+        global_context->setFormatSchemaPath(fs::weakly_canonical(config().getString("format_schema_path")));
+}
+
+
+int Client::main(const std::vector<std::string> & /*args*/)
+try
+{
+    UseSSL use_ssl;
+    MainThreadStatus::getInstance();
+    setupSignalHandler();
+
+    std::cout << std::fixed << std::setprecision(3);
+    std::cerr << std::fixed << std::setprecision(3);
+
+    /// Limit on total memory usage
+    size_t max_client_memory_usage = config().getInt64("max_memory_usage_in_client", 0 /*default value*/);
+
+    if (max_client_memory_usage != 0)
+    {
+        total_memory_tracker.setHardLimit(max_client_memory_usage);
+        total_memory_tracker.setDescription("(total)");
+        total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
+    }
+
+    registerFormats();
+    registerFunctions();
+    registerAggregateFunctions();
+
+    processConfig();
+
+    if (is_interactive)
+    {
+        clearTerminal();
+        showClientVersion();
+    }
+
+    connect();
+
+    if (is_interactive)
+    {
+        /// Load Warnings at the beginning of connection
+        if (!config().has("no-warnings"))
+        {
+            try
+            {
+                std::vector<String> messages = loadWarningMessages();
+                if (!messages.empty())
+                {
+                    std::cout << "Warnings:" << std::endl;
+                    for (const auto & message : messages)
+                        std::cout << " * " << message << std::endl;
+                    std::cout << std::endl;
+                }
+            }
+            catch (...)
+            {
+                /// Ignore exception
+            }
+        }
+
+        runInteractive();
+    }
+    else
+    {
+        connection->setDefaultDatabase(connection_parameters.default_database);
+
+        runNonInteractive();
+
+        // If exception code isn't zero, we should return non-zero return
+        // code anyway.
+        const auto * exception = server_exception ? server_exception.get() : client_exception.get();
+
+        if (exception)
+        {
+            return exception->code() != 0 ? exception->code() : -1;
+        }
+
+        if (have_error)
+        {
+            // Shouldn't be set without an exception, but check it just in
+            // case so that at least we don't lose an error.
+            return -1;
+        }
+    }
+
+    return 0;
+}
+catch (const Exception & e)
+{
+    bool need_print_stack_trace = config().getBool("stacktrace", false) && e.code() != ErrorCodes::NETWORK_ERROR;
+    std::cerr << getExceptionMessage(e, need_print_stack_trace, true) << std::endl << std::endl;
+    /// If exception code isn't zero, we should return non-zero return code anyway.
+    return e.code() ? e.code() : -1;
+}
+catch (...)
+{
+    std::cerr << getCurrentExceptionMessage(false) << std::endl;
+    return getCurrentExceptionCode();
+}
+
+
+void Client::connect()
+{
+    connection_parameters = ConnectionParameters(config());
+
+    if (is_interactive)
+        std::cout << "Connecting to "
+                    << (!connection_parameters.default_database.empty() ? "database " + connection_parameters.default_database + " at "
+                                                                        : "")
+                    << connection_parameters.host << ":" << connection_parameters.port
+                    << (!connection_parameters.user.empty() ? " as user " + connection_parameters.user : "") << "." << std::endl;
+
+    String server_name;
+    UInt64 server_version_major = 0;
+    UInt64 server_version_minor = 0;
+    UInt64 server_version_patch = 0;
+
+    try
+    {
+        connection = Connection::createConnection(connection_parameters, global_context);
+
+        if (max_client_network_bandwidth)
+        {
+            ThrottlerPtr throttler = std::make_shared<Throttler>(max_client_network_bandwidth, 0, "");
+            connection->setThrottler(throttler);
+        }
+
+        connection->getServerVersion(
+            connection_parameters.timeouts, server_name, server_version_major, server_version_minor, server_version_patch, server_revision);
+    }
+    catch (const Exception & e)
+    {
+        /// It is typical when users install ClickHouse, type some password and instantly forget it.
+        if ((connection_parameters.user.empty() || connection_parameters.user == "default")
+            && e.code() == DB::ErrorCodes::AUTHENTICATION_FAILED)
+        {
+            std::cerr << std::endl
+                << "If you have installed ClickHouse and forgot password you can reset it in the configuration file." << std::endl
+                << "The password for default user is typically located at /etc/clickhouse-server/users.d/default-password.xml" << std::endl
+                << "and deleting this file will reset the password." << std::endl
+                << "See also /etc/clickhouse-server/users.xml on the server where ClickHouse is installed." << std::endl
+                << std::endl;
+        }
+
+        throw;
+    }
+
+    server_version = toString(server_version_major) + "." + toString(server_version_minor) + "." + toString(server_version_patch);
+    load_suggestions = is_interactive && (server_revision >= Suggest::MIN_SERVER_REVISION && !config().getBool("disable_suggestion", false));
+
+    if (server_display_name = connection->getServerDisplayName(connection_parameters.timeouts); server_display_name.empty())
+        server_display_name = config().getString("host", "localhost");
+
+    if (is_interactive)
+    {
+        std::cout << "Connected to " << server_name << " server version " << server_version << " revision " << server_revision << "."
+                    << std::endl
+                    << std::endl;
+
+        auto client_version_tuple = std::make_tuple(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+        auto server_version_tuple = std::make_tuple(server_version_major, server_version_minor, server_version_patch);
+
+        if (client_version_tuple < server_version_tuple)
+        {
+            std::cout << "ClickHouse client version is older than ClickHouse server. "
+                        << "It may lack support for new features." << std::endl
+                        << std::endl;
+        }
+        else if (client_version_tuple > server_version_tuple)
+        {
+            std::cout << "ClickHouse server version is older than ClickHouse client. "
+                        << "It may indicate that the server is out of date and can be upgraded." << std::endl
+                        << std::endl;
+        }
+    }
+
+    if (!global_context->getSettingsRef().use_client_time_zone)
+    {
+        const auto & time_zone = connection->getServerTimezone(connection_parameters.timeouts);
+        if (!time_zone.empty())
+        {
+            try
+            {
+                DateLUT::setDefaultTimezone(time_zone);
+            }
+            catch (...)
+            {
+                std::cerr << "Warning: could not switch to server time zone: " << time_zone
+                            << ", reason: " << getCurrentExceptionMessage(/* with_stacktrace = */ false) << std::endl
+                            << "Proceeding with local time zone." << std::endl
+                            << std::endl;
+            }
+        }
+        else
+        {
+            std::cerr << "Warning: could not determine server time zone. "
+                        << "Proceeding with local time zone." << std::endl
+                        << std::endl;
+        }
+    }
+
+    prompt_by_server_display_name = config().getRawString("prompt_by_server_display_name.default", "{display_name} :) ");
+
+    Strings keys;
+    config().keys("prompt_by_server_display_name", keys);
+    for (const String & key : keys)
+    {
+        if (key != "default" && server_display_name.find(key) != std::string::npos)
+        {
+            prompt_by_server_display_name = config().getRawString("prompt_by_server_display_name." + key);
+            break;
+        }
+    }
+
+    /// Prompt may contain escape sequences including \e[ or \x1b[ sequences to set terminal color.
+    {
+        String unescaped_prompt_by_server_display_name;
+        ReadBufferFromString in(prompt_by_server_display_name);
+        readEscapedString(unescaped_prompt_by_server_display_name, in);
+        prompt_by_server_display_name = std::move(unescaped_prompt_by_server_display_name);
+    }
+
+    /// Prompt may contain the following substitutions in a form of {name}.
+    std::map<String, String> prompt_substitutions{
+        {"host", connection_parameters.host},
+        {"port", toString(connection_parameters.port)},
+        {"user", connection_parameters.user},
+        {"display_name", server_display_name},
+    };
+
+    /// Quite suboptimal.
+    for (const auto & [key, value] : prompt_substitutions)
+        boost::replace_all(prompt_by_server_display_name, "{" + key + "}", value);
+}
+
+
+// Prints changed settings to stderr. Useful for debugging fuzzing failures.
+void Client::printChangedSettings() const
+{
+    const auto & changes = global_context->getSettingsRef().changes();
+    if (!changes.empty())
+    {
+        fmt::print(stderr, "Changed settings: ");
+        for (size_t i = 0; i < changes.size(); ++i)
+        {
+            if (i)
+            {
+                fmt::print(stderr, ", ");
+            }
+            fmt::print(stderr, "{} = '{}'", changes[i].name, toString(changes[i].value));
+        }
+        fmt::print(stderr, "\n");
+    }
+    else
+    {
+        fmt::print(stderr, "No changed settings.\n");
+    }
 }
 
 
@@ -147,2629 +686,527 @@ static bool queryHasWithClause(const IAST * ast)
 }
 
 
-class Client : public Poco::Util::Application
+/// Returns false when server is not available.
+bool Client::processWithFuzzing(const String & full_query)
 {
-public:
-    Client() = default;
+    ASTPtr orig_ast;
 
-private:
-    using StringSet = std::unordered_set<String>;
-    StringSet exit_strings{"exit", "quit", "logout", "учше", "йгше", "дщпщге", "exit;", "quit;", "logout;", "учшеж",
-                           "йгшеж", "дщпщгеж", "q", "й", "\\q", "\\Q", "\\й", "\\Й", ":q", "Жй"};
-    bool is_interactive = true; /// Use either interactive line editing interface or batch mode.
-    bool echo_queries = false; /// Print queries before execution in batch mode.
-    bool ignore_error
-        = false; /// In case of errors, don't print error message, continue to next query. Only applicable for non-interactive mode.
-    bool print_time_to_stderr = false; /// Output execution time to stderr in batch mode.
-    bool stdin_is_a_tty = false; /// stdin is a terminal.
-    bool stdout_is_a_tty = false; /// stdout is a terminal.
-
-    /// If not empty, queries will be read from these files
-    std::vector<std::string> queries_files;
-    /// If not empty, run queries from these files before processing every file from 'queries_files'.
-    std::vector<std::string> interleave_queries_files;
-
-    std::unique_ptr<Connection> connection; /// Connection to DB.
-    String full_query; /// Current query as it was given to the client.
-
-    // Current query as it will be sent to the server. It may differ from the
-    // full query for INSERT queries, for which the data that follows the query
-    // is stripped and sent separately.
-    String query_to_send;
-
-    String format; /// Query results output format.
-    bool is_default_format = true; /// false, if format is set in the config or command line.
-    size_t format_max_block_size = 0; /// Max block size for console output.
-    String insert_format; /// Format of INSERT data that is read from stdin in batch mode.
-    size_t insert_format_max_block_size = 0; /// Max block size when reading INSERT data.
-    size_t max_client_network_bandwidth = 0; /// The maximum speed of data exchange over the network for the client in bytes per second.
-
-    bool has_vertical_output_suffix = false; /// Is \G present at the end of the query string?
-
-    SharedContextHolder shared_context = Context::createShared();
-    ContextMutablePtr context = Context::createGlobal(shared_context.get());
-
-    /// Buffer that reads from stdin in batch mode.
-    ReadBufferFromFileDescriptor std_in{STDIN_FILENO};
-
-    /// Console output.
-    WriteBufferFromFileDescriptor std_out{STDOUT_FILENO};
-    std::unique_ptr<ShellCommand> pager_cmd;
-
-    /// The user can specify to redirect query output to a file.
-    std::unique_ptr<WriteBuffer> out_file_buf;
-    BlockOutputStreamPtr block_out_stream;
-
-    /// The user could specify special file for server logs (stderr by default)
-    std::unique_ptr<WriteBuffer> out_logs_buf;
-    String server_logs_file;
-    BlockOutputStreamPtr logs_out_stream;
-
-    String home_path;
-
-    String current_profile;
-
-    String prompt_by_server_display_name;
-
-    /// Path to a file containing command history.
-    String history_file;
-
-    /// How many rows have been read or written.
-    size_t processed_rows = 0;
-
-    /// Parsed query. Is used to determine some settings (e.g. format, output file).
-    ASTPtr parsed_query;
-
-    /// The last exception that was received from the server. Is used for the
-    /// return code in batch mode.
-    std::unique_ptr<Exception> server_exception;
-    /// Likewise, the last exception that occurred on the client.
-    std::unique_ptr<Exception> client_exception;
-
-    /// If the last query resulted in exception. `server_exception` or
-    /// `client_exception` must be set.
-    bool have_error = false;
-
-    UInt64 server_revision = 0;
-    String server_version;
-    String server_display_name;
-
-    /// true by default - for interactive mode, might be changed when --progress option is checked for
-    /// non-interactive mode.
-    bool need_render_progress = true;
-
-    bool written_first_block = false;
-
-    ProgressIndication progress_indication;
-
-    /// External tables info.
-    std::list<ExternalTable> external_tables;
-
-    /// Dictionary with query parameters for prepared statements.
-    NameToNameMap query_parameters;
-
-    ConnectionParameters connection_parameters;
-
-    QueryFuzzer fuzzer;
-    int query_fuzzer_runs = 0;
-
-    std::optional<Suggest> suggest;
-
-    /// We will format query_id in interactive mode in various ways, the default is just to print Query id: ...
-    std::vector<std::pair<String, String>> query_id_formats;
-    QueryProcessingStage::Enum query_processing_stage;
-
-    void initialize(Poco::Util::Application & self) override
+    try
     {
-        Poco::Util::Application::initialize(self);
-
-        const char * home_path_cstr = getenv("HOME");
-        if (home_path_cstr)
-            home_path = home_path_cstr;
-
-        configReadClient(config(), home_path);
-
-        context->setApplicationType(Context::ApplicationType::CLIENT);
-        context->setQueryParameters(query_parameters);
-
-        /// settings and limits could be specified in config file, but passed settings has higher priority
-        for (const auto & setting : context->getSettingsRef().allUnchanged())
-        {
-            const auto & name = setting.getName();
-            if (config().has(name))
-                context->setSetting(name, config().getString(name));
-        }
-
-        /// Set path for format schema files
-        if (config().has("format_schema_path"))
-            context->setFormatSchemaPath(fs::weakly_canonical(config().getString("format_schema_path")));
-
-        /// Initialize query_id_formats if any
-        if (config().has("query_id_formats"))
-        {
-            Poco::Util::AbstractConfiguration::Keys keys;
-            config().keys("query_id_formats", keys);
-            for (const auto & name : keys)
-                query_id_formats.emplace_back(name + ":", config().getString("query_id_formats." + name));
-        }
-        if (query_id_formats.empty())
-            query_id_formats.emplace_back("Query id:", " {query_id}\n");
+        const char * begin = full_query.data();
+        orig_ast = parseQuery(begin, begin + full_query.size(), true);
+    }
+    catch (const Exception & e)
+    {
+        if (e.code() != ErrorCodes::SYNTAX_ERROR &&
+            e.code() != ErrorCodes::TOO_DEEP_RECURSION)
+            throw;
     }
 
-
-    int main(const std::vector<std::string> & /*args*/) override
+    // `USE db` should not be executed
+    // since this will break every query after `DROP db`
+    if (orig_ast->as<ASTUseQuery>())
     {
+        return true;
+    }
+
+    if (!orig_ast)
+    {
+        // Can't continue after a parsing error
+        return true;
+    }
+
+    // Don't repeat:
+    // - INSERT -- Because the tables may grow too big.
+    // - CREATE -- Because first we run the unmodified query, it will succeed,
+    //             and the subsequent queries will fail.
+    //             When we run out of fuzzer errors, it may be interesting to
+    //             add fuzzing of create queries that wraps columns into
+    //             LowCardinality or Nullable.
+    //             Also there are other kinds of create queries such as CREATE
+    //             DICTIONARY, we could fuzz them as well.
+    // - DROP   -- No point in this (by the same reasons).
+    // - SET    -- The time to fuzz the settings has not yet come
+    //             (see comments in Client/QueryFuzzer.cpp)
+    size_t this_query_runs = query_fuzzer_runs;
+    if (orig_ast->as<ASTInsertQuery>() ||
+        orig_ast->as<ASTCreateQuery>() ||
+        orig_ast->as<ASTDropQuery>() ||
+        orig_ast->as<ASTSetQuery>())
+    {
+        this_query_runs = 1;
+    }
+
+    String query_to_execute;
+    ASTPtr parsed_query;
+
+    ASTPtr fuzz_base = orig_ast;
+    for (size_t fuzz_step = 0; fuzz_step < this_query_runs; ++fuzz_step)
+    {
+        fmt::print(stderr, "Fuzzing step {} out of {}\n", fuzz_step, this_query_runs);
+
+        ASTPtr ast_to_process;
         try
         {
-            return mainImpl();
-        }
-        catch (const Exception & e)
-        {
-            bool print_stack_trace = config().getBool("stacktrace", false) && e.code() != ErrorCodes::NETWORK_ERROR;
+            WriteBufferFromOwnString dump_before_fuzz;
+            fuzz_base->dumpTree(dump_before_fuzz);
+            auto base_before_fuzz = fuzz_base->formatForErrorMessage();
 
-            std::cerr << getExceptionMessage(e, print_stack_trace, true) << std::endl << std::endl;
+            ast_to_process = fuzz_base->clone();
 
-            /// If exception code isn't zero, we should return non-zero return code anyway.
-            return e.code() ? e.code() : -1;
+            WriteBufferFromOwnString dump_of_cloned_ast;
+            ast_to_process->dumpTree(dump_of_cloned_ast);
+
+            // Run the original query as well.
+            if (fuzz_step > 0)
+            {
+                fuzzer.fuzzMain(ast_to_process);
+            }
+
+            auto base_after_fuzz = fuzz_base->formatForErrorMessage();
+
+            // Check that the source AST didn't change after fuzzing. This
+            // helps debug AST cloning errors, where the cloned AST doesn't
+            // clone all its children, and erroneously points to some source
+            // child elements.
+            if (base_before_fuzz != base_after_fuzz)
+            {
+                printChangedSettings();
+
+                fmt::print(
+                    stderr,
+                    "Base before fuzz: {}\n"
+                    "Base after fuzz: {}\n",
+                    base_before_fuzz,
+                    base_after_fuzz);
+                fmt::print(stderr, "Dump before fuzz:\n{}\n", dump_before_fuzz.str());
+                fmt::print(stderr, "Dump of cloned AST:\n{}\n", dump_of_cloned_ast.str());
+                fmt::print(stderr, "Dump after fuzz:\n");
+
+                WriteBufferFromOStream cerr_buf(std::cerr, 4096);
+                fuzz_base->dumpTree(cerr_buf);
+                cerr_buf.next();
+
+                fmt::print(
+                    stderr,
+                    "Found error: IAST::clone() is broken for some AST node. This is a bug. The original AST ('dump before fuzz') and its cloned copy ('dump of cloned AST') refer to the same nodes, which must never happen. This means that their parent node doesn't implement clone() correctly.");
+
+                exit(1);
+            }
+
+            auto fuzzed_text = ast_to_process->formatForErrorMessage();
+            if (fuzz_step > 0 && fuzzed_text == base_before_fuzz)
+            {
+                fmt::print(stderr, "Got boring AST\n");
+                continue;
+            }
+
+            parsed_query = ast_to_process;
+            query_to_execute = parsed_query->formatForErrorMessage();
+            processParsedSingleQuery(full_query, query_to_execute, parsed_query);
         }
         catch (...)
         {
-            std::cerr << getCurrentExceptionMessage(false) << std::endl;
-            return getCurrentExceptionCode();
-        }
-    }
-
-    /// Should we celebrate a bit?
-    static bool isNewYearMode()
-    {
-        time_t current_time = time(nullptr);
-
-        /// It's bad to be intrusive.
-        if (current_time % 3 != 0)
-            return false;
-
-        LocalDate now(current_time);
-        return (now.month() == 12 && now.day() >= 20) || (now.month() == 1 && now.day() <= 5);
-    }
-
-    static bool isChineseNewYearMode(const String & local_tz)
-    {
-        /// Days of Dec. 20 in Chinese calendar starting from year 2019 to year 2105
-        static constexpr UInt16 chineseNewYearIndicators[]
-            = {18275, 18659, 19014, 19368, 19752, 20107, 20491, 20845, 21199, 21583, 21937, 22292, 22676, 23030, 23414, 23768, 24122, 24506,
-               24860, 25215, 25599, 25954, 26308, 26692, 27046, 27430, 27784, 28138, 28522, 28877, 29232, 29616, 29970, 30354, 30708, 31062,
-               31446, 31800, 32155, 32539, 32894, 33248, 33632, 33986, 34369, 34724, 35078, 35462, 35817, 36171, 36555, 36909, 37293, 37647,
-               38002, 38386, 38740, 39095, 39479, 39833, 40187, 40571, 40925, 41309, 41664, 42018, 42402, 42757, 43111, 43495, 43849, 44233,
-               44587, 44942, 45326, 45680, 46035, 46418, 46772, 47126, 47510, 47865, 48249, 48604, 48958, 49342};
-
-        /// All time zone names are acquired from https://www.iana.org/time-zones
-        static constexpr const char * chineseNewYearTimeZoneIndicators[] = {
-            /// Time zones celebrating Chinese new year.
-            "Asia/Shanghai",
-            "Asia/Chongqing",
-            "Asia/Harbin",
-            "Asia/Urumqi",
-            "Asia/Hong_Kong",
-            "Asia/Chungking",
-            "Asia/Macao",
-            "Asia/Macau",
-            "Asia/Taipei",
-            "Asia/Singapore",
-
-            /// Time zones celebrating Chinese new year but with different festival names. Let's not print the message for now.
-            // "Asia/Brunei",
-            // "Asia/Ho_Chi_Minh",
-            // "Asia/Hovd",
-            // "Asia/Jakarta",
-            // "Asia/Jayapura",
-            // "Asia/Kashgar",
-            // "Asia/Kuala_Lumpur",
-            // "Asia/Kuching",
-            // "Asia/Makassar",
-            // "Asia/Pontianak",
-            // "Asia/Pyongyang",
-            // "Asia/Saigon",
-            // "Asia/Seoul",
-            // "Asia/Ujung_Pandang",
-            // "Asia/Ulaanbaatar",
-            // "Asia/Ulan_Bator",
-        };
-        static constexpr size_t M = sizeof(chineseNewYearTimeZoneIndicators) / sizeof(chineseNewYearTimeZoneIndicators[0]);
-
-        time_t current_time = time(nullptr);
-
-        if (chineseNewYearTimeZoneIndicators + M
-            == std::find_if(chineseNewYearTimeZoneIndicators, chineseNewYearTimeZoneIndicators + M, [&local_tz](const char * tz)
-                            {
-                                return tz == local_tz;
-                            }))
-            return false;
-
-        /// It's bad to be intrusive.
-        if (current_time % 3 != 0)
-            return false;
-
-        auto days = DateLUT::instance().toDayNum(current_time).toUnderType();
-        for (auto d : chineseNewYearIndicators)
-        {
-            /// Let's celebrate until Lantern Festival
-            if (d <= days && d + 25 >= days)
-                return true;
-            else if (d > days)
-                return false;
-        }
-        return false;
-    }
-
-#if USE_REPLXX
-    static void highlight(const String & query, std::vector<replxx::Replxx::Color> & colors)
-    {
-        using namespace replxx;
-
-        static const std::unordered_map<TokenType, Replxx::Color> token_to_color
-            = {{TokenType::Whitespace, Replxx::Color::DEFAULT},
-               {TokenType::Comment, Replxx::Color::GRAY},
-               {TokenType::BareWord, Replxx::Color::DEFAULT},
-               {TokenType::Number, Replxx::Color::GREEN},
-               {TokenType::StringLiteral, Replxx::Color::CYAN},
-               {TokenType::QuotedIdentifier, Replxx::Color::MAGENTA},
-               {TokenType::OpeningRoundBracket, Replxx::Color::BROWN},
-               {TokenType::ClosingRoundBracket, Replxx::Color::BROWN},
-               {TokenType::OpeningSquareBracket, Replxx::Color::BROWN},
-               {TokenType::ClosingSquareBracket, Replxx::Color::BROWN},
-               {TokenType::DoubleColon, Replxx::Color::BROWN},
-               {TokenType::OpeningCurlyBrace, Replxx::Color::INTENSE},
-               {TokenType::ClosingCurlyBrace, Replxx::Color::INTENSE},
-
-               {TokenType::Comma, Replxx::Color::INTENSE},
-               {TokenType::Semicolon, Replxx::Color::INTENSE},
-               {TokenType::Dot, Replxx::Color::INTENSE},
-               {TokenType::Asterisk, Replxx::Color::INTENSE},
-               {TokenType::HereDoc, Replxx::Color::CYAN},
-               {TokenType::Plus, Replxx::Color::INTENSE},
-               {TokenType::Minus, Replxx::Color::INTENSE},
-               {TokenType::Slash, Replxx::Color::INTENSE},
-               {TokenType::Percent, Replxx::Color::INTENSE},
-               {TokenType::Arrow, Replxx::Color::INTENSE},
-               {TokenType::QuestionMark, Replxx::Color::INTENSE},
-               {TokenType::Colon, Replxx::Color::INTENSE},
-               {TokenType::Equals, Replxx::Color::INTENSE},
-               {TokenType::NotEquals, Replxx::Color::INTENSE},
-               {TokenType::Less, Replxx::Color::INTENSE},
-               {TokenType::Greater, Replxx::Color::INTENSE},
-               {TokenType::LessOrEquals, Replxx::Color::INTENSE},
-               {TokenType::GreaterOrEquals, Replxx::Color::INTENSE},
-               {TokenType::Concatenation, Replxx::Color::INTENSE},
-               {TokenType::At, Replxx::Color::INTENSE},
-               {TokenType::DoubleAt, Replxx::Color::MAGENTA},
-
-               {TokenType::EndOfStream, Replxx::Color::DEFAULT},
-
-               {TokenType::Error, Replxx::Color::RED},
-               {TokenType::ErrorMultilineCommentIsNotClosed, Replxx::Color::RED},
-               {TokenType::ErrorSingleQuoteIsNotClosed, Replxx::Color::RED},
-               {TokenType::ErrorDoubleQuoteIsNotClosed, Replxx::Color::RED},
-               {TokenType::ErrorSinglePipeMark, Replxx::Color::RED},
-               {TokenType::ErrorWrongNumber, Replxx::Color::RED},
-               {TokenType::ErrorMaxQuerySizeExceeded, Replxx::Color::RED }};
-
-        const Replxx::Color unknown_token_color = Replxx::Color::RED;
-
-        Lexer lexer(query.data(), query.data() + query.size());
-        size_t pos = 0;
-
-        for (Token token = lexer.nextToken(); !token.isEnd(); token = lexer.nextToken())
-        {
-            size_t utf8_len = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(token.begin), token.size());
-            for (size_t code_point_index = 0; code_point_index < utf8_len; ++code_point_index)
-            {
-                if (token_to_color.find(token.type) != token_to_color.end())
-                    colors[pos + code_point_index] = token_to_color.at(token.type);
-                else
-                    colors[pos + code_point_index] = unknown_token_color;
-            }
-
-            pos += utf8_len;
-        }
-    }
-#endif
-
-    /// Make query to get all server warnings
-    std::vector<String> loadWarningMessages()
-    {
-        std::vector<String> messages;
-        connection->sendQuery(connection_parameters.timeouts, "SELECT message FROM system.warnings", "" /* query_id */, QueryProcessingStage::Complete);
-        while (true)
-        {
-            Packet packet = connection->receivePacket();
-            switch (packet.type)
-            {
-                case Protocol::Server::Data:
-                    if (packet.block)
-                    {
-                        const ColumnString & column = typeid_cast<const ColumnString &>(*packet.block.getByPosition(0).column);
-
-                        size_t rows = packet.block.rows();
-                        for (size_t i = 0; i < rows; ++i)
-                            messages.emplace_back(column.getDataAt(i).toString());
-                    }
-                    continue;
-
-                case Protocol::Server::Progress:
-                    continue;
-                case Protocol::Server::ProfileInfo:
-                    continue;
-                case Protocol::Server::Totals:
-                    continue;
-                case Protocol::Server::Extremes:
-                    continue;
-                case Protocol::Server::Log:
-                    continue;
-
-                case Protocol::Server::Exception:
-                    packet.exception->rethrow();
-                    return messages;
-
-                case Protocol::Server::EndOfStream:
-                    return messages;
-
-                default:
-                    throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from server {}",
-                        packet.type, connection->getDescription());
-            }
-        }
-    }
-
-    int mainImpl()
-    {
-        UseSSL use_ssl;
-
-        registerFormats();
-        registerFunctions();
-        registerAggregateFunctions();
-
-        /// Batch mode is enabled if one of the following is true:
-        /// - -e (--query) command line option is present.
-        ///   The value of the option is used as the text of query (or of multiple queries).
-        ///   If stdin is not a terminal, INSERT data for the first query is read from it.
-        /// - stdin is not a terminal. In this case queries are read from it.
-        /// - -qf (--queries-file) command line option is present.
-        ///   The value of the option is used as file with query (or of multiple queries) to execute.
-        if (!stdin_is_a_tty || config().has("query") || !queries_files.empty())
-            is_interactive = false;
-
-        if (config().has("query") && !queries_files.empty())
-        {
-            throw Exception("Specify either `query` or `queries-file` option", ErrorCodes::BAD_ARGUMENTS);
+            // Some functions (e.g. protocol parsers) don't throw, but
+            // set last_exception instead, so we'll also do it here for
+            // uniformity.
+            // Surprisingly, this is a client exception, because we get the
+            // server exception w/o throwing (see onReceiveException()).
+            client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(print_stack_trace), getCurrentExceptionCode());
+            have_error = true;
         }
 
-        std::cout << std::fixed << std::setprecision(3);
-        std::cerr << std::fixed << std::setprecision(3);
-
-        if (is_interactive)
+        const auto * exception = server_exception ? server_exception.get() : client_exception.get();
+        // Sometimes you may get TOO_DEEP_RECURSION from the server,
+        // and TOO_DEEP_RECURSION should not fail the fuzzer check.
+        if (have_error && exception->code() == ErrorCodes::TOO_DEEP_RECURSION)
         {
-            clearTerminal();
-            showClientVersion();
-        }
-
-        is_default_format = !config().has("vertical") && !config().has("format");
-        if (config().has("vertical"))
-            format = config().getString("format", "Vertical");
-        else
-            format = config().getString("format", is_interactive ? "PrettyCompact" : "TabSeparated");
-
-        format_max_block_size = config().getInt("format_max_block_size", context->getSettingsRef().max_block_size);
-
-        insert_format = "Values";
-
-        /// Setting value from cmd arg overrides one from config
-        if (context->getSettingsRef().max_insert_block_size.changed)
-            insert_format_max_block_size = context->getSettingsRef().max_insert_block_size;
-        else
-            insert_format_max_block_size = config().getInt("insert_format_max_block_size", context->getSettingsRef().max_insert_block_size);
-
-        if (!is_interactive)
-        {
-            need_render_progress = config().getBool("progress", false);
-            echo_queries = config().getBool("echo", false);
-            ignore_error = config().getBool("ignore-error", false);
-        }
-
-        ClientInfo & client_info = context->getClientInfo();
-        client_info.setInitialQuery();
-        client_info.quota_key = config().getString("quota_key", "");
-
-        connect();
-
-        /// Initialize DateLUT here to avoid counting time spent here as query execution time.
-        const auto local_tz = DateLUT::instance().getTimeZone();
-
-        if (is_interactive)
-        {
-            if (config().has("query_id"))
-                throw Exception("query_id could be specified only in non-interactive mode", ErrorCodes::BAD_ARGUMENTS);
-            if (print_time_to_stderr)
-                throw Exception("time option could be specified only in non-interactive mode", ErrorCodes::BAD_ARGUMENTS);
-
-            suggest.emplace();
-            if (server_revision >= Suggest::MIN_SERVER_REVISION && !config().getBool("disable_suggestion", false))
-            {
-                /// Load suggestion data from the server.
-                suggest->load(connection_parameters, config().getInt("suggestion_limit"));
-            }
-
-            /// Load Warnings at the beginning of connection
-            if (!config().has("no-warnings"))
-            {
-                try
-                {
-                    std::vector<String> messages = loadWarningMessages();
-                    if (!messages.empty())
-                    {
-                        std::cout << "Warnings:" << std::endl;
-                        for (const auto & message : messages)
-                            std::cout << "* " << message << std::endl;
-                        std::cout << std::endl;
-                    }
-                }
-                catch (...)
-                {
-                    /// Ignore exception
-                }
-            }
-
-            /// Load command history if present.
-            if (config().has("history_file"))
-                history_file = config().getString("history_file");
-            else
-            {
-                auto * history_file_from_env = getenv("CLICKHOUSE_HISTORY_FILE");
-                if (history_file_from_env)
-                    history_file = history_file_from_env;
-                else if (!home_path.empty())
-                    history_file = home_path + "/.clickhouse-client-history";
-            }
-
-            if (!history_file.empty() && !fs::exists(history_file))
-            {
-                /// Avoid TOCTOU issue.
-                try
-                {
-                    FS::createFile(history_file);
-                }
-                catch (const ErrnoException & e)
-                {
-                    if (e.getErrno() != EEXIST)
-                        throw;
-                }
-            }
-
-            LineReader::Patterns query_extenders = {"\\"};
-            LineReader::Patterns query_delimiters = {";", "\\G"};
-
-#if USE_REPLXX
-            replxx::Replxx::highlighter_callback_t highlight_callback{};
-            if (config().getBool("highlight"))
-                highlight_callback = highlight;
-
-            ReplxxLineReader lr(*suggest, history_file, config().has("multiline"), query_extenders, query_delimiters, highlight_callback);
-
-#elif defined(USE_READLINE) && USE_READLINE
-            ReadlineLineReader lr(*suggest, history_file, config().has("multiline"), query_extenders, query_delimiters);
-#else
-            LineReader lr(history_file, config().has("multiline"), query_extenders, query_delimiters);
-#endif
-
-            /// Enable bracketed-paste-mode only when multiquery is enabled and multiline is
-            ///  disabled, so that we are able to paste and execute multiline queries in a whole
-            ///  instead of erroring out, while be less intrusive.
-            if (config().has("multiquery") && !config().has("multiline"))
-                lr.enableBracketedPaste();
-
-            do
-            {
-                auto input = lr.readLine(prompt(), ":-] ");
-                if (input.empty())
-                    break;
-
-                has_vertical_output_suffix = false;
-                if (input.ends_with("\\G"))
-                {
-                    input.resize(input.size() - 2);
-                    has_vertical_output_suffix = true;
-                }
-
-                try
-                {
-                    if (!processQueryText(input))
-                        break;
-                }
-                catch (const Exception & e)
-                {
-                    /// We don't need to handle the test hints in the interactive mode.
-
-                    bool print_stack_trace = config().getBool("stacktrace", false);
-                    std::cerr << "Exception on client:" << std::endl << getExceptionMessage(e, print_stack_trace, true) << std::endl << std::endl;
-                    client_exception = std::make_unique<Exception>(e);
-                }
-
-                if (client_exception)
-                {
-                    /// client_exception may have been set above or elsewhere.
-                    /// Client-side exception during query execution can result in the loss of
-                    /// sync in the connection protocol.
-                    /// So we reconnect and allow to enter the next query.
-                    connect();
-                }
-            } while (true);
-
-            if (isNewYearMode())
-                std::cout << "Happy new year." << std::endl;
-            else if (isChineseNewYearMode(local_tz))
-                std::cout << "Happy Chinese new year. 春节快乐!" << std::endl;
-            else
-                std::cout << "Bye." << std::endl;
-            return 0;
-        }
-        else
-        {
-            auto query_id = config().getString("query_id", "");
-            if (!query_id.empty())
-                context->setCurrentQueryId(query_id);
-
-            nonInteractive();
-
-            // If exception code isn't zero, we should return non-zero return
-            // code anyway.
-            const auto * exception = server_exception ? server_exception.get() : client_exception.get();
-            if (exception)
-            {
-                return exception->code() != 0 ? exception->code() : -1;
-            }
-            if (have_error)
-            {
-                // Shouldn't be set without an exception, but check it just in
-                // case so that at least we don't lose an error.
-                return -1;
-            }
-
-            return 0;
-        }
-    }
-
-
-    void connect()
-    {
-        connection_parameters = ConnectionParameters(config());
-
-        if (is_interactive)
-            std::cout << "Connecting to "
-                      << (!connection_parameters.default_database.empty() ? "database " + connection_parameters.default_database + " at "
-                                                                          : "")
-                      << connection_parameters.host << ":" << connection_parameters.port
-                      << (!connection_parameters.user.empty() ? " as user " + connection_parameters.user : "") << "." << std::endl;
-
-        connection = std::make_unique<Connection>(
-            connection_parameters.host,
-            connection_parameters.port,
-            connection_parameters.default_database,
-            connection_parameters.user,
-            connection_parameters.password,
-            "", /* cluster */
-            "", /* cluster_secret */
-            "client",
-            connection_parameters.compression,
-            connection_parameters.security);
-
-        String server_name;
-        UInt64 server_version_major = 0;
-        UInt64 server_version_minor = 0;
-        UInt64 server_version_patch = 0;
-
-        if (max_client_network_bandwidth)
-        {
-            ThrottlerPtr throttler = std::make_shared<Throttler>(max_client_network_bandwidth, 0, "");
-            connection->setThrottler(throttler);
-        }
-
-        connection->getServerVersion(
-            connection_parameters.timeouts, server_name, server_version_major, server_version_minor, server_version_patch, server_revision);
-
-        server_version = toString(server_version_major) + "." + toString(server_version_minor) + "." + toString(server_version_patch);
-
-        if (server_display_name = connection->getServerDisplayName(connection_parameters.timeouts); server_display_name.empty())
-        {
-            server_display_name = config().getString("host", "localhost");
-        }
-
-        if (is_interactive)
-        {
-            std::cout << "Connected to " << server_name << " server version " << server_version << " revision " << server_revision << "."
-                      << std::endl
-                      << std::endl;
-
-            auto client_version_tuple = std::make_tuple(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
-            auto server_version_tuple = std::make_tuple(server_version_major, server_version_minor, server_version_patch);
-
-            if (client_version_tuple < server_version_tuple)
-            {
-                std::cout << "ClickHouse client version is older than ClickHouse server. "
-                          << "It may lack support for new features." << std::endl
-                          << std::endl;
-            }
-            else if (client_version_tuple > server_version_tuple)
-            {
-                std::cout << "ClickHouse server version is older than ClickHouse client. "
-                          << "It may indicate that the server is out of date and can be upgraded." << std::endl
-                          << std::endl;
-            }
-        }
-
-        if (!context->getSettingsRef().use_client_time_zone)
-        {
-            const auto & time_zone = connection->getServerTimezone(connection_parameters.timeouts);
-            if (!time_zone.empty())
-            {
-                try
-                {
-                    DateLUT::setDefaultTimezone(time_zone);
-                }
-                catch (...)
-                {
-                    std::cerr << "Warning: could not switch to server time zone: " << time_zone
-                              << ", reason: " << getCurrentExceptionMessage(/* with_stacktrace = */ false) << std::endl
-                              << "Proceeding with local time zone." << std::endl
-                              << std::endl;
-                }
-            }
-            else
-            {
-                std::cerr << "Warning: could not determine server time zone. "
-                          << "Proceeding with local time zone." << std::endl
-                          << std::endl;
-            }
-        }
-
-        Strings keys;
-
-        prompt_by_server_display_name = config().getRawString("prompt_by_server_display_name.default", "{display_name} :) ");
-
-        config().keys("prompt_by_server_display_name", keys);
-
-        for (const String & key : keys)
-        {
-            if (key != "default" && server_display_name.find(key) != std::string::npos)
-            {
-                prompt_by_server_display_name = config().getRawString("prompt_by_server_display_name." + key);
-                break;
-            }
-        }
-
-        /// Prompt may contain escape sequences including \e[ or \x1b[ sequences to set terminal color.
-        {
-            String unescaped_prompt_by_server_display_name;
-            ReadBufferFromString in(prompt_by_server_display_name);
-            readEscapedString(unescaped_prompt_by_server_display_name, in);
-            prompt_by_server_display_name = std::move(unescaped_prompt_by_server_display_name);
-        }
-
-        /// Prompt may contain the following substitutions in a form of {name}.
-        std::map<String, String> prompt_substitutions{
-            {"host", connection_parameters.host},
-            {"port", toString(connection_parameters.port)},
-            {"user", connection_parameters.user},
-            {"display_name", server_display_name},
-        };
-
-        /// Quite suboptimal.
-        for (const auto & [key, value] : prompt_substitutions)
-            boost::replace_all(prompt_by_server_display_name, "{" + key + "}", value);
-    }
-
-
-    inline String prompt() const
-    {
-        return boost::replace_all_copy(prompt_by_server_display_name, "{database}", config().getString("database", "default"));
-    }
-
-
-    void nonInteractive()
-    {
-        String text;
-
-        if (!queries_files.empty())
-        {
-            auto process_file = [&](const std::string & file)
-            {
-                connection->setDefaultDatabase(connection_parameters.default_database);
-                ReadBufferFromFile in(file);
-                readStringUntilEOF(text, in);
-                return processMultiQuery(text);
-            };
-
-            for (const auto & queries_file : queries_files)
-            {
-                for (const auto & interleave_file : interleave_queries_files)
-                    if (!process_file(interleave_file))
-                        return;
-
-                if (!process_file(queries_file))
-                    return;
-            }
-            return;
-        }
-        else if (config().has("query"))
-        {
-            text = config().getRawString("query"); /// Poco configuration should not process substitutions in form of ${...} inside query.
-        }
-        else
-        {
-            /// If 'query' parameter is not set, read a query from stdin.
-            /// The query is read entirely into memory (streaming is disabled).
-            ReadBufferFromFileDescriptor in(STDIN_FILENO);
-            readStringUntilEOF(text, in);
-        }
-
-        if (query_fuzzer_runs)
-            processWithFuzzing(text);
-        else
-            processQueryText(text);
-    }
-
-    bool processQueryText(const String & text)
-    {
-        if (exit_strings.end() != exit_strings.find(trim(text, [](char c) { return isWhitespaceASCII(c) || c == ';'; })))
-            return false;
-
-        if (!config().has("multiquery"))
-        {
-            assert(!query_fuzzer_runs);
-            processTextAsSingleQuery(text);
+            have_error = false;
+            server_exception.reset();
+            client_exception.reset();
             return true;
         }
 
-        if (query_fuzzer_runs)
-        {
-            processWithFuzzing(text);
-            return true;
-        }
-
-        return processMultiQuery(text);
-    }
-
-    // Consumes trailing semicolons and tries to consume the same-line trailing
-    // comment.
-    static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, int max_parser_depth)
-    {
-        // We have to skip the trailing semicolon that might be left
-        // after VALUES parsing or just after a normal semicolon-terminated query.
-        Tokens after_query_tokens(this_query_end, all_queries_end);
-        IParser::Pos after_query_iterator(after_query_tokens, max_parser_depth);
-        while (after_query_iterator.isValid() && after_query_iterator->type == TokenType::Semicolon)
-        {
-            this_query_end = after_query_iterator->end;
-            ++after_query_iterator;
-        }
-
-        // Now we have to do some extra work to add the trailing
-        // same-line comment to the query, but preserve the leading
-        // comments of the next query. The trailing comment is important
-        // because the test hints are usually written this way, e.g.:
-        // select nonexistent_column; -- { serverError 12345 }.
-        // The token iterator skips comments and whitespace, so we have
-        // to find the newline in the string manually. If it's earlier
-        // than the next significant token, it means that the text before
-        // newline is some trailing whitespace or comment, and we should
-        // add it to our query. There are also several special cases
-        // that are described below.
-        const auto * newline = find_first_symbols<'\n'>(this_query_end, all_queries_end);
-        const char * next_query_begin = after_query_iterator->begin;
-
-        // We include the entire line if the next query starts after
-        // it. This is a generic case of trailing in-line comment.
-        // The "equals" condition is for case of end of input (they both equal
-        // all_queries_end);
-        if (newline <= next_query_begin)
-        {
-            assert(newline >= this_query_end);
-            this_query_end = newline;
-        }
-        else
-        {
-            // Many queries on one line, can't do anything. By the way, this
-            // syntax is probably going to work as expected:
-            // select nonexistent /* { serverError 12345 } */; select 1
-        }
-    }
-
-    void reportQueryError() const
-    {
-        if (server_exception)
-        {
-            bool print_stack_trace = config().getBool("stacktrace", false);
-            std::cerr << "Received exception from server (version " << server_version << "):" << std::endl
-                << getExceptionMessage(*server_exception, print_stack_trace, true) << std::endl;
-            if (is_interactive)
-                std::cerr << std::endl;
-        }
-
-        if (client_exception)
-        {
-            fmt::print(stderr, "Error on processing query '{}':\n{}\n", full_query, client_exception->message());
-            if (is_interactive)
-            {
-                fmt::print(stderr, "\n");
-            }
-        }
-
-        // A debug check -- at least some exception must be set, if the error
-        // flag is set, and vice versa.
-        assert(have_error == (client_exception || server_exception));
-    }
-
-    bool processMultiQuery(const String & all_queries_text)
-    {
-        // It makes sense not to base any control flow on this, so that it is
-        // the same in tests and in normal usage. The only difference is that in
-        // normal mode we ignore the test hints.
-        const bool test_mode = config().has("testmode");
-
-        {
-            /// disable logs if expects errors
-            TestHint test_hint(test_mode, all_queries_text);
-            if (test_hint.clientError() || test_hint.serverError())
-                processTextAsSingleQuery("SET send_logs_level = 'fatal'");
-        }
-
-        bool echo_query = echo_queries;
-
-        /// Several queries separated by ';'.
-        /// INSERT data is ended by the end of line, not ';'.
-        /// An exception is VALUES format where we also support semicolon in
-        /// addition to end of line.
-
-        const char * this_query_begin = all_queries_text.data();
-        const char * all_queries_end = all_queries_text.data() + all_queries_text.size();
-
-        while (this_query_begin < all_queries_end)
-        {
-            // Remove leading empty newlines and other whitespace, because they
-            // are annoying to filter in query log. This is mostly relevant for
-            // the tests.
-            while (this_query_begin < all_queries_end && isWhitespaceASCII(*this_query_begin))
-            {
-                ++this_query_begin;
-            }
-            if (this_query_begin >= all_queries_end)
-            {
-                break;
-            }
-
-            // If there are only comments left until the end of file, we just
-            // stop. The parser can't handle this situation because it always
-            // expects that there is some query that it can parse.
-            // We can get into this situation because the parser also doesn't
-            // skip the trailing comments after parsing a query. This is because
-            // they may as well be the leading comments for the next query,
-            // and it makes more sense to treat them as such.
-            {
-                Tokens tokens(this_query_begin, all_queries_end);
-                IParser::Pos token_iterator(tokens, context->getSettingsRef().max_parser_depth);
-                if (!token_iterator.isValid())
-                {
-                    break;
-                }
-            }
-
-            // Try to parse the query.
-            const char * this_query_end = this_query_begin;
-            try
-            {
-                parsed_query = parseQuery(this_query_end, all_queries_end, true);
-            }
-            catch (Exception & e)
-            {
-                // Try to find test hint for syntax error. We don't know where
-                // the query ends because we failed to parse it, so we consume
-                // the entire line.
-                this_query_end = find_first_symbols<'\n'>(this_query_end, all_queries_end);
-
-                TestHint hint(test_mode, String(this_query_begin, this_query_end - this_query_begin));
-
-                if (hint.serverError())
-                {
-                    // Syntax errors are considered as client errors
-                    e.addMessage("\nExpected server error '{}'.", hint.serverError());
-                    throw;
-                }
-
-                if (hint.clientError() != e.code())
-                {
-                    if (hint.clientError())
-                        e.addMessage("\nExpected client error: " + std::to_string(hint.clientError()));
-                    throw;
-                }
-
-                /// It's expected syntax error, skip the line
-                this_query_begin = this_query_end;
-                continue;
-            }
-
-            if (!parsed_query)
-            {
-                if (ignore_error)
-                {
-                    Tokens tokens(this_query_begin, all_queries_end);
-                    IParser::Pos token_iterator(tokens, context->getSettingsRef().max_parser_depth);
-                    while (token_iterator->type != TokenType::Semicolon && token_iterator.isValid())
-                        ++token_iterator;
-                    this_query_begin = token_iterator->end;
-
-                    continue;
-                }
-
-                return true;
-            }
-
-            // INSERT queries may have the inserted data in the query text
-            // that follow the query itself, e.g. "insert into t format CSV 1;2".
-            // They need special handling. First of all, here we find where the
-            // inserted data ends. In multy-query mode, it is delimited by a
-            // newline.
-            // The VALUES format needs even more handling -- we also allow the
-            // data to be delimited by semicolon. This case is handled later by
-            // the format parser itself.
-            // We can't do multiline INSERTs with inline data, because most
-            // row input formats (e.g. TSV) can't tell when the input stops,
-            // unlike VALUES.
-            auto * insert_ast = parsed_query->as<ASTInsertQuery>();
-            if (insert_ast && insert_ast->data)
-            {
-                this_query_end = find_first_symbols<'\n'>(insert_ast->data, all_queries_end);
-                insert_ast->end = this_query_end;
-                query_to_send = all_queries_text.substr(this_query_begin - all_queries_text.data(), insert_ast->data - this_query_begin);
-            }
-            else
-            {
-                query_to_send = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
-            }
-
-            // Try to include the trailing comment with test hints. It is just
-            // a guess for now, because we don't yet know where the query ends
-            // if it is an INSERT query with inline data. We will do it again
-            // after we have processed the query. But even this guess is
-            // beneficial so that we see proper trailing comments in "echo" and
-            // server log.
-            adjustQueryEnd(this_query_end, all_queries_end, context->getSettingsRef().max_parser_depth);
-
-            // full_query is the query + inline INSERT data + trailing comments
-            // (the latter is our best guess for now).
-            full_query = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
-
-            if (query_fuzzer_runs)
-            {
-                if (!processWithFuzzing(full_query))
-                    return false;
-
-                this_query_begin = this_query_end;
-                continue;
-            }
-
-            // Now we know for sure where the query ends.
-            // Look for the hint in the text of query + insert data + trailing
-            // comments,
-            // e.g. insert into t format CSV 'a' -- { serverError 123 }.
-            // Use the updated query boundaries we just calculated.
-            TestHint test_hint(test_mode, std::string(this_query_begin, this_query_end - this_query_begin));
-
-            // Echo all queries if asked; makes for a more readable reference
-            // file.
-            echo_query = test_hint.echoQueries().value_or(echo_query);
-
-            try
-            {
-                processParsedSingleQuery(echo_query);
-            }
-            catch (...)
-            {
-                // Surprisingly, this is a client error. A server error would
-                // have been reported w/o throwing (see onReceiveSeverException()).
-                client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                have_error = true;
-            }
-
-            // For INSERTs with inline data: use the end of inline data as
-            // reported by the format parser (it is saved in sendData()).
-            // This allows us to handle queries like:
-            //   insert into t values (1); select 1
-            // , where the inline data is delimited by semicolon and not by a
-            // newline.
-            if (insert_ast && insert_ast->data)
-            {
-                this_query_end = insert_ast->end;
-                adjustQueryEnd(this_query_end, all_queries_end, context->getSettingsRef().max_parser_depth);
-            }
-
-            // Check whether the error (or its absence) matches the test hints
-            // (or their absence).
-            bool error_matches_hint = true;
-            if (have_error)
-            {
-                if (test_hint.serverError())
-                {
-                    if (!server_exception)
-                    {
-                        error_matches_hint = false;
-                        fmt::print(stderr, "Expected server error code '{}' but got no server error.\n", test_hint.serverError());
-                    }
-                    else if (server_exception->code() != test_hint.serverError())
-                    {
-                        error_matches_hint = false;
-                        std::cerr << "Expected server error code: " << test_hint.serverError() << " but got: " << server_exception->code()
-                                  << "." << std::endl;
-                    }
-                }
-
-                if (test_hint.clientError())
-                {
-                    if (!client_exception)
-                    {
-                        error_matches_hint = false;
-                        fmt::print(stderr, "Expected client error code '{}' but got no client error.\n", test_hint.clientError());
-                    }
-                    else if (client_exception->code() != test_hint.clientError())
-                    {
-                        error_matches_hint = false;
-                        fmt::print(
-                            stderr, "Expected client error code '{}' but got '{}'.\n", test_hint.clientError(), client_exception->code());
-                    }
-                }
-
-                if (!test_hint.clientError() && !test_hint.serverError())
-                {
-                    // No error was expected but it still occurred. This is the
-                    // default case w/o test hint, doesn't need additional
-                    // diagnostics.
-                    error_matches_hint = false;
-                }
-            }
-            else
-            {
-                if (test_hint.clientError())
-                {
-                    fmt::print(stderr, "The query succeeded but the client error '{}' was expected.\n", test_hint.clientError());
-                    error_matches_hint = false;
-                }
-
-                if (test_hint.serverError())
-                {
-                    fmt::print(stderr, "The query succeeded but the server error '{}' was expected.\n", test_hint.serverError());
-                    error_matches_hint = false;
-                }
-            }
-
-            // If the error is expected, force reconnect and ignore it.
-            if (have_error && error_matches_hint)
-            {
-                client_exception.reset();
-                server_exception.reset();
-                have_error = false;
-
-                if (!connection->checkConnected())
-                    connect();
-            }
-
-            // Report error.
-            if (have_error)
-            {
-                reportQueryError();
-            }
-
-            // Stop processing queries if needed.
-            if (have_error && !ignore_error)
-            {
-                if (is_interactive)
-                {
-                    break;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            this_query_begin = this_query_end;
-        }
-
-        return true;
-    }
-
-    // Prints changed settings to stderr. Useful for debugging fuzzing failures.
-    void printChangedSettings() const
-    {
-        const auto & changes = context->getSettingsRef().changes();
-        if (!changes.empty())
-        {
-            fmt::print(stderr, "Changed settings: ");
-            for (size_t i = 0; i < changes.size(); ++i)
-            {
-                if (i)
-                {
-                    fmt::print(stderr, ", ");
-                }
-                fmt::print(stderr, "{} = '{}'", changes[i].name, toString(changes[i].value));
-            }
-            fmt::print(stderr, "\n");
-        }
-        else
-        {
-            fmt::print(stderr, "No changed settings.\n");
-        }
-    }
-
-    /// Returns false when server is not available.
-    bool processWithFuzzing(const String & text)
-    {
-        ASTPtr orig_ast;
-
-        try
-        {
-            const char * begin = text.data();
-            orig_ast = parseQuery(begin, begin + text.size(), true);
-        }
-        catch (const Exception & e)
-        {
-            if (e.code() != ErrorCodes::SYNTAX_ERROR &&
-                e.code() != ErrorCodes::TOO_DEEP_RECURSION)
-                throw;
-        }
-
-        if (!orig_ast)
-        {
-            // Can't continue after a parsing error
-            return true;
-        }
-
-        // Don't repeat inserts, the tables grow too big. Also don't repeat
-        // creates because first we run the unmodified query, it will succeed,
-        // and the subsequent queries will fail. When we run out of fuzzer
-        // errors, it may be interesting to add fuzzing of create queries that
-        // wraps columns into LowCardinality or Nullable. Also there are other
-        // kinds of create queries such as CREATE DICTIONARY, we could fuzz
-        // them as well. Also there is no point fuzzing DROP queries.
-        size_t this_query_runs = query_fuzzer_runs;
-        if (orig_ast->as<ASTInsertQuery>() || orig_ast->as<ASTCreateQuery>() || orig_ast->as<ASTDropQuery>())
-        {
-            this_query_runs = 1;
-        }
-
-        ASTPtr fuzz_base = orig_ast;
-        for (size_t fuzz_step = 0; fuzz_step < this_query_runs; ++fuzz_step)
-        {
-            fmt::print(stderr, "Fuzzing step {} out of {}\n", fuzz_step, this_query_runs);
-
-            ASTPtr ast_to_process;
-            try
-            {
-                WriteBufferFromOwnString dump_before_fuzz;
-                fuzz_base->dumpTree(dump_before_fuzz);
-                auto base_before_fuzz = fuzz_base->formatForErrorMessage();
-
-                ast_to_process = fuzz_base->clone();
-
-                WriteBufferFromOwnString dump_of_cloned_ast;
-                ast_to_process->dumpTree(dump_of_cloned_ast);
-
-                // Run the original query as well.
-                if (fuzz_step > 0)
-                {
-                    fuzzer.fuzzMain(ast_to_process);
-                }
-
-                auto base_after_fuzz = fuzz_base->formatForErrorMessage();
-
-                // Check that the source AST didn't change after fuzzing. This
-                // helps debug AST cloning errors, where the cloned AST doesn't
-                // clone all its children, and erroneously points to some source
-                // child elements.
-                if (base_before_fuzz != base_after_fuzz)
-                {
-                    printChangedSettings();
-
-                    fmt::print(
-                        stderr,
-                        "Base before fuzz: {}\n"
-                        "Base after fuzz: {}\n",
-                        base_before_fuzz,
-                        base_after_fuzz);
-                    fmt::print(stderr, "Dump before fuzz:\n{}\n", dump_before_fuzz.str());
-                    fmt::print(stderr, "Dump of cloned AST:\n{}\n", dump_of_cloned_ast.str());
-                    fmt::print(stderr, "Dump after fuzz:\n");
-
-                    WriteBufferFromOStream cerr_buf(std::cerr, 4096);
-                    fuzz_base->dumpTree(cerr_buf);
-                    cerr_buf.next();
-
-                    fmt::print(
-                        stderr,
-                        "Found error: IAST::clone() is broken for some AST node. This is a bug. The original AST ('dump before fuzz') and its cloned copy ('dump of cloned AST') refer to the same nodes, which must never happen. This means that their parent node doesn't implement clone() correctly.");
-
-                    exit(1);
-                }
-
-                auto fuzzed_text = ast_to_process->formatForErrorMessage();
-                if (fuzz_step > 0 && fuzzed_text == base_before_fuzz)
-                {
-                    fmt::print(stderr, "Got boring AST\n");
-                    continue;
-                }
-
-                parsed_query = ast_to_process;
-                query_to_send = parsed_query->formatForErrorMessage();
-
-                processParsedSingleQuery();
-            }
-            catch (...)
-            {
-                // Some functions (e.g. protocol parsers) don't throw, but
-                // set last_exception instead, so we'll also do it here for
-                // uniformity.
-                // Surprisingly, this is a client exception, because we get the
-                // server exception w/o throwing (see onReceiveException()).
-                client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(true), getCurrentExceptionCode());
-                have_error = true;
-            }
-
-            const auto * exception = server_exception ? server_exception.get() : client_exception.get();
-            // Sometimes you may get TOO_DEEP_RECURSION from the server,
-            // and TOO_DEEP_RECURSION should not fail the fuzzer check.
-            if (have_error && exception->code() == ErrorCodes::TOO_DEEP_RECURSION)
-            {
-                have_error = false;
-                server_exception.reset();
-                client_exception.reset();
-                return true;
-            }
-
-            if (have_error)
-            {
-                fmt::print(stderr, "Error on processing query '{}': {}\n", ast_to_process->formatForErrorMessage(), exception->message());
-
-                // Try to reconnect after errors, for two reasons:
-                // 1. We might not have realized that the server died, e.g. if
-                //    it sent us a <Fatal> trace and closed connection properly.
-                // 2. The connection might have gotten into a wrong state and
-                //    the next query will get false positive about
-                //    "Unknown packet from server".
-                try
-                {
-                    connection->forceConnected(connection_parameters.timeouts);
-                }
-                catch (...)
-                {
-                    // Just report it, we'll terminate below.
-                    fmt::print(stderr,
-                        "Error while reconnecting to the server: {}\n",
-                        getCurrentExceptionMessage(true));
-
-                    assert(!connection->isConnected());
-                }
-            }
-
-            if (!connection->isConnected())
-            {
-                // Probably the server is dead because we found an assertion
-                // failure. Fail fast.
-                fmt::print(stderr, "Lost connection to the server.\n");
-
-                // Print the changed settings because they might be needed to
-                // reproduce the error.
-                printChangedSettings();
-
-                return false;
-            }
-
-            // Check that after the query is formatted, we can parse it back,
-            // format again and get the same result. Unfortunately, we can't
-            // compare the ASTs, which would be more sensitive to errors. This
-            // double formatting check doesn't catch all errors, e.g. we can
-            // format query incorrectly, but to a valid SQL that we can then
-            // parse and format into the same SQL.
-            // There are some complicated cases where we can generate the SQL
-            // which we can't parse:
-            // * first argument of lambda() replaced by fuzzer with
-            //   something else, leading to constructs such as
-            //   arrayMap((min(x) + 3) -> x + 1, ....)
-            // * internals of Enum replaced, leading to:
-            //   Enum(equals(someFunction(y), 3)).
-            // And there are even the cases when we can parse the query, but
-            // it's logically incorrect and its formatting is a mess, such as
-            // when `lambda()` function gets substituted into a wrong place.
-            // To avoid dealing with these cases, run the check only for the
-            // queries we were able to successfully execute.
-            // Another caveat is that sometimes WITH queries are not executed,
-            // if they are not referenced by the main SELECT, so they can still
-            // have the aforementioned problems. Disable this check for such
-            // queries, for lack of a better solution.
-            // There is also a problem that fuzzer substitutes positive Int64
-            // literals or Decimal literals, which are then parsed back as
-            // UInt64, and suddenly duplicate alias substitition starts or stops
-            // working (ASTWithAlias::formatImpl) or something like that.
-            // So we compare not even the first and second formatting of the
-            // query, but second and third.
-            // If you have to add any more workarounds to this check, just remove
-            // it altogether, it's not so useful.
-            if (!have_error && !queryHasWithClause(parsed_query.get()))
-            {
-                ASTPtr ast_2;
-                try
-                {
-                    const auto * tmp_pos = query_to_send.c_str();
-
-                    ast_2 = parseQuery(tmp_pos, tmp_pos + query_to_send.size(),
-                        false /* allow_multi_statements */);
-                }
-                catch (Exception & e)
-                {
-                    if (e.code() != ErrorCodes::SYNTAX_ERROR &&
-                        e.code() != ErrorCodes::TOO_DEEP_RECURSION)
-                        throw;
-                }
-
-                if (ast_2)
-                {
-                    const auto text_2 = ast_2->formatForErrorMessage();
-                    const auto * tmp_pos = text_2.c_str();
-                    const auto ast_3 = parseQuery(tmp_pos, tmp_pos + text_2.size(),
-                        false /* allow_multi_statements */);
-                    const auto text_3 = ast_3->formatForErrorMessage();
-                    if (text_3 != text_2)
-                    {
-                        fmt::print(stderr, "Found error: The query formatting is broken.\n");
-
-                        printChangedSettings();
-
-                        fmt::print(stderr,
-                            "Got the following (different) text after formatting the fuzzed query and parsing it back:\n'{}'\n, expected:\n'{}'\n",
-                            text_3, text_2);
-                        fmt::print(stderr, "In more detail:\n");
-                        fmt::print(stderr, "AST-1 (generated by fuzzer):\n'{}'\n", parsed_query->dumpTree());
-                        fmt::print(stderr, "Text-1 (AST-1 formatted):\n'{}'\n", query_to_send);
-                        fmt::print(stderr, "AST-2 (Text-1 parsed):\n'{}'\n", ast_2->dumpTree());
-                        fmt::print(stderr, "Text-2 (AST-2 formatted):\n'{}'\n", text_2);
-                        fmt::print(stderr, "AST-3 (Text-2 parsed):\n'{}'\n", ast_3->dumpTree());
-                        fmt::print(stderr, "Text-3 (AST-3 formatted):\n'{}'\n", text_3);
-                        fmt::print(stderr, "Text-3 must be equal to Text-2, but it is not.\n");
-
-                        exit(1);
-                    }
-                }
-            }
-
-            // The server is still alive so we're going to continue fuzzing.
-            // Determine what we're going to use as the starting AST.
-            if (have_error)
-            {
-                // Query completed with error, keep the previous starting AST.
-                // Also discard the exception that we now know to be non-fatal,
-                // so that it doesn't influence the exit code.
-                server_exception.reset();
-                client_exception.reset();
-                have_error = false;
-            }
-            else if (ast_to_process->formatForErrorMessage().size() > 500)
-            {
-                // ast too long, start from original ast
-                fmt::print(stderr, "Current AST is too long, discarding it and using the original AST as a start\n");
-                fuzz_base = orig_ast;
-            }
-            else
-            {
-                // fuzz starting from this successful query
-                fmt::print(stderr, "Query succeeded, using this AST as a start\n");
-                fuzz_base = ast_to_process;
-            }
-        }
-
-        return true;
-    }
-
-    void processTextAsSingleQuery(const String & text_)
-    {
-        full_query = text_;
-
-        /// Some parts of a query (result output and formatting) are executed
-        /// client-side. Thus we need to parse the query.
-        const char * begin = full_query.data();
-        parsed_query = parseQuery(begin, begin + full_query.size(), false);
-
-        if (!parsed_query)
-            return;
-
-        // An INSERT query may have the data that follow query text. Remove the
-        /// Send part of query without data, because data will be sent separately.
-        auto * insert = parsed_query->as<ASTInsertQuery>();
-        if (insert && insert->data)
-        {
-            query_to_send = full_query.substr(0, insert->data - full_query.data());
-        }
-        else
-        {
-            query_to_send = full_query;
-        }
-
-        processParsedSingleQuery();
-
         if (have_error)
         {
-            reportQueryError();
-        }
-    }
-
-    // Parameters are in global variables:
-    // 'parsed_query' -- the query AST,
-    // 'query_to_send' -- the query text that is sent to server,
-    // 'full_query' -- for INSERT queries, contains the query and the data that
-    // follow it. Its memory is referenced by ASTInsertQuery::begin, end.
-    void processParsedSingleQuery(std::optional<bool> echo_query = {})
-    {
-        resetOutput();
-        client_exception.reset();
-        server_exception.reset();
-        have_error = false;
-
-        if (echo_query.value_or(echo_queries))
-        {
-            writeString(full_query, std_out);
-            writeChar('\n', std_out);
-            std_out.next();
-        }
-
-        if (is_interactive)
-        {
-            // Generate a new query_id
-            context->setCurrentQueryId("");
-            for (const auto & query_id_format : query_id_formats)
-            {
-                writeString(query_id_format.first, std_out);
-                writeString(fmt::format(query_id_format.second, fmt::arg("query_id", context->getCurrentQueryId())), std_out);
-                writeChar('\n', std_out);
-                std_out.next();
-            }
-        }
-
-        processed_rows = 0;
-        written_first_block = false;
-        progress_indication.resetProgress();
-
-        {
-            /// Temporarily apply query settings to context.
-            std::optional<Settings> old_settings;
-            SCOPE_EXIT_SAFE({
-                if (old_settings)
-                    context->setSettings(*old_settings);
-            });
-            auto apply_query_settings = [&](const IAST & settings_ast)
-            {
-                if (!old_settings)
-                    old_settings.emplace(context->getSettingsRef());
-                context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
-            };
-            const auto * insert = parsed_query->as<ASTInsertQuery>();
-            if (insert && insert->settings_ast)
-                apply_query_settings(*insert->settings_ast);
-            /// FIXME: try to prettify this cast using `as<>()`
-            const auto * with_output = dynamic_cast<const ASTQueryWithOutput *>(parsed_query.get());
-            if (with_output && with_output->settings_ast)
-                apply_query_settings(*with_output->settings_ast);
-
-            if (!connection->checkConnected())
-                connect();
-
-            ASTPtr input_function;
-            if (insert && insert->select)
-                insert->tryFindInputFunction(input_function);
-
-            /// INSERT query for which data transfer is needed (not an INSERT SELECT or input()) is processed separately.
-            if (insert && (!insert->select || input_function) && !insert->watch)
-            {
-                if (input_function && insert->format.empty())
-                    throw Exception("FORMAT must be specified for function input()", ErrorCodes::INVALID_USAGE_OF_INPUT);
-                processInsertQuery();
-            }
-            else
-                processOrdinaryQuery();
-        }
-
-        /// Do not change context (current DB, settings) in case of an exception.
-        if (!have_error)
-        {
-            if (const auto * set_query = parsed_query->as<ASTSetQuery>())
-            {
-                /// Save all changes in settings to avoid losing them if the connection is lost.
-                for (const auto & change : set_query->changes)
-                {
-                    if (change.name == "profile")
-                        current_profile = change.value.safeGet<String>();
-                    else
-                        context->applySettingChange(change);
-                }
-            }
-
-            if (const auto * use_query = parsed_query->as<ASTUseQuery>())
-            {
-                const String & new_database = use_query->database;
-                /// If the client initiates the reconnection, it takes the settings from the config.
-                config().setString("database", new_database);
-                /// If the connection initiates the reconnection, it uses its variable.
-                connection->setDefaultDatabase(new_database);
-            }
-        }
-
-        if (is_interactive)
-        {
-            std::cout << std::endl << processed_rows << " rows in set. Elapsed: " << progress_indication.elapsedSeconds() << " sec. ";
-            /// Write final progress if it makes sense to do so.
-            writeFinalProgress();
-
-            std::cout << std::endl << std::endl;
-        }
-        else if (print_time_to_stderr)
-        {
-            std::cerr << progress_indication.elapsedSeconds() << "\n";
-        }
-    }
-
-
-    /// Convert external tables to ExternalTableData and send them using the connection.
-    void sendExternalTables()
-    {
-        const auto * select = parsed_query->as<ASTSelectWithUnionQuery>();
-        if (!select && !external_tables.empty())
-            throw Exception("External tables could be sent only with select query", ErrorCodes::BAD_ARGUMENTS);
-
-        std::vector<ExternalTableDataPtr> data;
-        for (auto & table : external_tables)
-            data.emplace_back(table.getData(context));
-
-        connection->sendExternalTablesData(data);
-    }
-
-
-    /// Process the query that doesn't require transferring data blocks to the server.
-    void processOrdinaryQuery()
-    {
-        /// Rewrite query only when we have query parameters.
-        /// Note that if query is rewritten, comments in query are lost.
-        /// But the user often wants to see comments in server logs, query log, processlist, etc.
-        if (!query_parameters.empty())
-        {
-            /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
-            ReplaceQueryParameterVisitor visitor(query_parameters);
-            visitor.visit(parsed_query);
-
-            /// Get new query after substitutions. Note that it cannot be done for INSERT query with embedded data.
-            query_to_send = serializeAST(*parsed_query);
-        }
-
-        int retries_left = 10;
-        for (;;)
-        {
-            assert(retries_left > 0);
+            fmt::print(stderr, "Error on processing query '{}': {}\n", ast_to_process->formatForErrorMessage(), exception->message());
 
+            // Try to reconnect after errors, for two reasons:
+            // 1. We might not have realized that the server died, e.g. if
+            //    it sent us a <Fatal> trace and closed connection properly.
+            // 2. The connection might have gotten into a wrong state and
+            //    the next query will get false positive about
+            //    "Unknown packet from server".
             try
             {
-                connection->sendQuery(
-                    connection_parameters.timeouts,
-                    query_to_send,
-                    context->getCurrentQueryId(),
-                    query_processing_stage,
-                    &context->getSettingsRef(),
-                    &context->getClientInfo(),
-                    true);
-
-                sendExternalTables();
-                receiveResult();
-
-                break;
+                connection->forceConnected(connection_parameters.timeouts);
             }
-            catch (const Exception & e)
+            catch (...)
             {
-                /// Retry when the server said "Client should retry" and no rows
-                /// has been received yet.
-                if (processed_rows == 0 && e.code() == ErrorCodes::DEADLOCK_AVOIDED && --retries_left)
-                {
-                    std::cerr << "Got a transient error from the server, will"
-                              << " retry (" << retries_left << " retries left)";
-                }
-                else
-                {
+                // Just report it, we'll terminate below.
+                fmt::print(stderr,
+                    "Error while reconnecting to the server: {}\n",
+                    getCurrentExceptionMessage(true));
+
+                // The reconnection might fail, but we'll still be connected
+                // in the sense of `connection->isConnected() = true`,
+                // in case when the requested database doesn't exist.
+                // Disconnect manually now, so that the following code doesn't
+                // have any doubts, and the connection state is predictable.
+                connection->disconnect();
+            }
+        }
+
+        if (!connection->isConnected())
+        {
+            // Probably the server is dead because we found an assertion
+            // failure. Fail fast.
+            fmt::print(stderr, "Lost connection to the server.\n");
+
+            // Print the changed settings because they might be needed to
+            // reproduce the error.
+            printChangedSettings();
+
+            return false;
+        }
+
+        // Check that after the query is formatted, we can parse it back,
+        // format again and get the same result. Unfortunately, we can't
+        // compare the ASTs, which would be more sensitive to errors. This
+        // double formatting check doesn't catch all errors, e.g. we can
+        // format query incorrectly, but to a valid SQL that we can then
+        // parse and format into the same SQL.
+        // There are some complicated cases where we can generate the SQL
+        // which we can't parse:
+        // * first argument of lambda() replaced by fuzzer with
+        //   something else, leading to constructs such as
+        //   arrayMap((min(x) + 3) -> x + 1, ....)
+        // * internals of Enum replaced, leading to:
+        //   Enum(equals(someFunction(y), 3)).
+        // And there are even the cases when we can parse the query, but
+        // it's logically incorrect and its formatting is a mess, such as
+        // when `lambda()` function gets substituted into a wrong place.
+        // To avoid dealing with these cases, run the check only for the
+        // queries we were able to successfully execute.
+        // Another caveat is that sometimes WITH queries are not executed,
+        // if they are not referenced by the main SELECT, so they can still
+        // have the aforementioned problems. Disable this check for such
+        // queries, for lack of a better solution.
+        // There is also a problem that fuzzer substitutes positive Int64
+        // literals or Decimal literals, which are then parsed back as
+        // UInt64, and suddenly duplicate alias substitition starts or stops
+        // working (ASTWithAlias::formatImpl) or something like that.
+        // So we compare not even the first and second formatting of the
+        // query, but second and third.
+        // If you have to add any more workarounds to this check, just remove
+        // it altogether, it's not so useful.
+        if (!have_error && !queryHasWithClause(parsed_query.get()))
+        {
+            ASTPtr ast_2;
+            try
+            {
+                const auto * tmp_pos = query_to_execute.c_str();
+
+                ast_2 = parseQuery(tmp_pos, tmp_pos + query_to_execute.size(), false /* allow_multi_statements */);
+            }
+            catch (Exception & e)
+            {
+                if (e.code() != ErrorCodes::SYNTAX_ERROR &&
+                    e.code() != ErrorCodes::TOO_DEEP_RECURSION)
                     throw;
+            }
+
+            if (ast_2)
+            {
+                const auto text_2 = ast_2->formatForErrorMessage();
+                const auto * tmp_pos = text_2.c_str();
+                const auto ast_3 = parseQuery(tmp_pos, tmp_pos + text_2.size(),
+                    false /* allow_multi_statements */);
+                const auto text_3 = ast_3->formatForErrorMessage();
+                if (text_3 != text_2)
+                {
+                    fmt::print(stderr, "Found error: The query formatting is broken.\n");
+
+                    printChangedSettings();
+
+                    fmt::print(stderr,
+                        "Got the following (different) text after formatting the fuzzed query and parsing it back:\n'{}'\n, expected:\n'{}'\n",
+                        text_3, text_2);
+                    fmt::print(stderr, "In more detail:\n");
+                    fmt::print(stderr, "AST-1 (generated by fuzzer):\n'{}'\n", parsed_query->dumpTree());
+                    fmt::print(stderr, "Text-1 (AST-1 formatted):\n'{}'\n", query_to_execute);
+                    fmt::print(stderr, "AST-2 (Text-1 parsed):\n'{}'\n", ast_2->dumpTree());
+                    fmt::print(stderr, "Text-2 (AST-2 formatted):\n'{}'\n", text_2);
+                    fmt::print(stderr, "AST-3 (Text-2 parsed):\n'{}'\n", ast_3->dumpTree());
+                    fmt::print(stderr, "Text-3 (AST-3 formatted):\n'{}'\n", text_3);
+                    fmt::print(stderr, "Text-3 must be equal to Text-2, but it is not.\n");
+
+                    exit(1);
                 }
             }
         }
-    }
 
-
-    /// Process the query that requires transferring data blocks to the server.
-    void processInsertQuery()
-    {
-        const auto parsed_insert_query = parsed_query->as<ASTInsertQuery &>();
-        if (!parsed_insert_query.data && (is_interactive || (!stdin_is_a_tty && std_in.eof())))
-            throw Exception("No data to insert", ErrorCodes::NO_DATA_TO_INSERT);
-
-        connection->sendQuery(
-            connection_parameters.timeouts,
-            query_to_send,
-            context->getCurrentQueryId(),
-            query_processing_stage,
-            &context->getSettingsRef(),
-            &context->getClientInfo(),
-            true);
-
-        sendExternalTables();
-
-        /// Receive description of table structure.
-        Block sample;
-        ColumnsDescription columns_description;
-        if (receiveSampleBlock(sample, columns_description))
+        // The server is still alive so we're going to continue fuzzing.
+        // Determine what we're going to use as the starting AST.
+        if (have_error)
         {
-            /// If structure was received (thus, server has not thrown an exception),
-            /// send our data with that structure.
-            sendData(sample, columns_description);
-            receiveEndOfQuery();
+            // Query completed with error, keep the previous starting AST.
+            // Also discard the exception that we now know to be non-fatal,
+            // so that it doesn't influence the exit code.
+            server_exception.reset();
+            client_exception.reset();
+            have_error = false;
         }
-    }
-
-
-    ASTPtr parseQuery(const char *& pos, const char * end, bool allow_multi_statements)
-    {
-        ParserQuery parser(end);
-        ASTPtr res;
-
-        const auto & settings = context->getSettingsRef();
-        size_t max_length = 0;
-        if (!allow_multi_statements)
-            max_length = settings.max_query_size;
-
-        if (is_interactive || ignore_error)
+        else if (ast_to_process->formatForErrorMessage().size() > 500)
         {
-            String message;
-            res = tryParseQuery(parser, pos, end, message, true, "", allow_multi_statements, max_length, settings.max_parser_depth);
-
-            if (!res)
-            {
-                std::cerr << std::endl << message << std::endl << std::endl;
-                return nullptr;
-            }
+            // ast too long, start from original ast
+            fmt::print(stderr, "Current AST is too long, discarding it and using the original AST as a start\n");
+            fuzz_base = orig_ast;
         }
         else
-            res = parseQueryAndMovePosition(parser, pos, end, "", allow_multi_statements, max_length, settings.max_parser_depth);
-
-        if (is_interactive)
         {
-            std::cout << std::endl;
-            WriteBufferFromOStream res_buf(std::cout, 4096);
-            formatAST(*res, res_buf);
-            res_buf.next();
-            std::cout << std::endl << std::endl;
-        }
-
-        return res;
-    }
-
-
-    void sendData(Block & sample, const ColumnsDescription & columns_description)
-    {
-        /// If INSERT data must be sent.
-        auto * parsed_insert_query = parsed_query->as<ASTInsertQuery>();
-        if (!parsed_insert_query)
-            return;
-
-        if (parsed_insert_query->data)
-        {
-            /// Send data contained in the query.
-            ReadBufferFromMemory data_in(parsed_insert_query->data, parsed_insert_query->end - parsed_insert_query->data);
-            try
-            {
-                sendDataFrom(data_in, sample, columns_description);
-            }
-            catch (Exception & e)
-            {
-                /// The following query will use data from input
-                //      "INSERT INTO data FORMAT TSV\n " < data.csv
-                //  And may be pretty hard to debug, so add information about data source to make it easier.
-                e.addMessage("data for INSERT was parsed from query");
-                throw;
-            }
-            // Remember where the data ended. We use this info later to determine
-            // where the next query begins.
-            parsed_insert_query->end = parsed_insert_query->data + data_in.count();
-        }
-        else if (!is_interactive)
-        {
-            /// Send data read from stdin.
-            try
-            {
-                if (need_render_progress)
-                {
-                    /// Set total_bytes_to_read for current fd.
-                    FileProgress file_progress(0, std_in.size());
-                    progress_indication.updateProgress(Progress(file_progress));
-
-                    /// Set callback to be called on file progress.
-                    progress_indication.setFileProgressCallback(context, true);
-
-                    /// Add callback to track reading from fd.
-                    std_in.setProgressCallback(context);
-                }
-
-                sendDataFrom(std_in, sample, columns_description);
-            }
-            catch (Exception & e)
-            {
-                e.addMessage("data for INSERT was parsed from stdin");
-                throw;
-            }
-        }
-        else
-            throw Exception("No data to insert", ErrorCodes::NO_DATA_TO_INSERT);
-    }
-
-
-    void sendDataFrom(ReadBuffer & buf, Block & sample, const ColumnsDescription & columns_description)
-    {
-        String current_format = insert_format;
-
-        /// Data format can be specified in the INSERT query.
-        if (const auto * insert = parsed_query->as<ASTInsertQuery>())
-        {
-            if (!insert->format.empty())
-                current_format = insert->format;
-        }
-
-        auto source = FormatFactory::instance().getInput(current_format, buf, sample, context, insert_format_max_block_size);
-        Pipe pipe(source);
-
-        if (columns_description.hasDefaults())
-        {
-            pipe.addSimpleTransform([&](const Block & header)
-            {
-                return std::make_shared<AddingDefaultsTransform>(header, columns_description, *source, context);
-            });
-        }
-
-        QueryPipeline pipeline;
-        pipeline.init(std::move(pipe));
-        PullingAsyncPipelineExecutor executor(pipeline);
-
-        Block block;
-        while (executor.pull(block))
-        {
-            /// Check if server send Log packet
-            receiveLogs();
-
-            /// Check if server send Exception packet
-            auto packet_type = connection->checkPacket();
-            if (packet_type && *packet_type == Protocol::Server::Exception)
-            {
-                /*
-                 * We're exiting with error, so it makes sense to kill the
-                 * input stream without waiting for it to complete.
-                 */
-                executor.cancel();
-                return;
-            }
-
-            if (block)
-            {
-                connection->sendData(block);
-                processed_rows += block.rows();
-            }
-        }
-
-        connection->sendData({});
-    }
-
-
-    /// Flush all buffers.
-    void resetOutput()
-    {
-        block_out_stream.reset();
-        logs_out_stream.reset();
-
-        if (pager_cmd)
-        {
-            pager_cmd->in.close();
-            pager_cmd->wait();
-        }
-        pager_cmd = nullptr;
-
-        if (out_file_buf)
-        {
-            out_file_buf->next();
-            out_file_buf.reset();
-        }
-
-        if (out_logs_buf)
-        {
-            out_logs_buf->next();
-            out_logs_buf.reset();
-        }
-
-        std_out.next();
-    }
-
-
-    /// Receives and processes packets coming from server.
-    /// Also checks if query execution should be cancelled.
-    void receiveResult()
-    {
-        InterruptListener interrupt_listener;
-        bool cancelled = false;
-
-        // TODO: get the poll_interval from commandline.
-        const auto receive_timeout = connection_parameters.timeouts.receive_timeout;
-        constexpr size_t default_poll_interval = 1000000; /// in microseconds
-        constexpr size_t min_poll_interval = 5000; /// in microseconds
-        const size_t poll_interval
-            = std::max(min_poll_interval, std::min<size_t>(receive_timeout.totalMicroseconds(), default_poll_interval));
-
-        while (true)
-        {
-            Stopwatch receive_watch(CLOCK_MONOTONIC_COARSE);
-
-            while (true)
-            {
-                /// Has the Ctrl+C been pressed and thus the query should be cancelled?
-                /// If this is the case, inform the server about it and receive the remaining packets
-                /// to avoid losing sync.
-                if (!cancelled)
-                {
-                    auto cancel_query = [&] {
-                        connection->sendCancel();
-                        cancelled = true;
-                        if (is_interactive)
-                        {
-                            progress_indication.clearProgressOutput();
-                            std::cout << "Cancelling query." << std::endl;
-                        }
-
-                        /// Pressing Ctrl+C twice results in shut down.
-                        interrupt_listener.unblock();
-                    };
-
-                    if (interrupt_listener.check())
-                    {
-                        cancel_query();
-                    }
-                    else
-                    {
-                        double elapsed = receive_watch.elapsedSeconds();
-                        if (elapsed > receive_timeout.totalSeconds())
-                        {
-                            std::cout << "Timeout exceeded while receiving data from server."
-                                      << " Waited for " << static_cast<size_t>(elapsed) << " seconds,"
-                                      << " timeout is " << receive_timeout.totalSeconds() << " seconds." << std::endl;
-
-                            cancel_query();
-                        }
-                    }
-                }
-
-                /// Poll for changes after a cancellation check, otherwise it never reached
-                /// because of progress updates from server.
-                if (connection->poll(poll_interval))
-                    break;
-            }
-
-            if (!receiveAndProcessPacket(cancelled))
-                break;
-        }
-
-        if (cancelled && is_interactive)
-            std::cout << "Query was cancelled." << std::endl;
-    }
-
-
-    /// Receive a part of the result, or progress info or an exception and process it.
-    /// Returns true if one should continue receiving packets.
-    /// Output of result is suppressed if query was cancelled.
-    bool receiveAndProcessPacket(bool cancelled)
-    {
-        Packet packet = connection->receivePacket();
-
-        switch (packet.type)
-        {
-            case Protocol::Server::PartUUIDs:
-                return true;
-
-            case Protocol::Server::Data:
-                if (!cancelled)
-                    onData(packet.block);
-                return true;
-
-            case Protocol::Server::Progress:
-                onProgress(packet.progress);
-                return true;
-
-            case Protocol::Server::ProfileInfo:
-                onProfileInfo(packet.profile_info);
-                return true;
-
-            case Protocol::Server::Totals:
-                if (!cancelled)
-                    onTotals(packet.block);
-                return true;
-
-            case Protocol::Server::Extremes:
-                if (!cancelled)
-                    onExtremes(packet.block);
-                return true;
-
-            case Protocol::Server::Exception:
-                onReceiveExceptionFromServer(std::move(packet.exception));
-                return false;
-
-            case Protocol::Server::Log:
-                onLogData(packet.block);
-                return true;
-
-            case Protocol::Server::EndOfStream:
-                onEndOfStream();
-                return false;
-
-            default:
-                throw Exception(
-                    ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from server {}", packet.type, connection->getDescription());
+            // fuzz starting from this successful query
+            fmt::print(stderr, "Query succeeded, using this AST as a start\n");
+            fuzz_base = ast_to_process;
         }
     }
 
-
-    /// Receive the block that serves as an example of the structure of table where data will be inserted.
-    bool receiveSampleBlock(Block & out, ColumnsDescription & columns_description)
-    {
-        while (true)
-        {
-            Packet packet = connection->receivePacket();
-
-            switch (packet.type)
-            {
-                case Protocol::Server::Data:
-                    out = packet.block;
-                    return true;
-
-                case Protocol::Server::Exception:
-                    onReceiveExceptionFromServer(std::move(packet.exception));
-                    return false;
-
-                case Protocol::Server::Log:
-                    onLogData(packet.block);
-                    break;
-
-                case Protocol::Server::TableColumns:
-                    columns_description = ColumnsDescription::parse(packet.multistring_message[1]);
-                    return receiveSampleBlock(out, columns_description);
-
-                default:
-                    throw NetException(
-                        "Unexpected packet from server (expected Data, Exception or Log, got "
-                            + String(Protocol::Server::toString(packet.type)) + ")",
-                        ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
-            }
-        }
-    }
-
-
-    /// Process Log packets, exit when receive Exception or EndOfStream
-    bool receiveEndOfQuery()
-    {
-        while (true)
-        {
-            Packet packet = connection->receivePacket();
-
-            switch (packet.type)
-            {
-                case Protocol::Server::EndOfStream:
-                    onEndOfStream();
-                    return true;
-
-                case Protocol::Server::Exception:
-                    onReceiveExceptionFromServer(std::move(packet.exception));
-                    return false;
-
-                case Protocol::Server::Log:
-                    onLogData(packet.block);
-                    break;
-
-                default:
-                    throw NetException(
-                        "Unexpected packet from server (expected Exception, EndOfStream or Log, got "
-                            + String(Protocol::Server::toString(packet.type)) + ")",
-                        ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
-            }
-        }
-    }
-
-    /// Process Log packets, used when inserting data by blocks
-    void receiveLogs()
-    {
-        auto packet_type = connection->checkPacket();
-
-        while (packet_type && *packet_type == Protocol::Server::Log)
-        {
-            receiveAndProcessPacket(false);
-            packet_type = connection->checkPacket();
-        }
-    }
-
-    void initBlockOutputStream(const Block & block)
-    {
-        if (!block_out_stream)
-        {
-            /// Ignore all results when fuzzing as they can be huge.
-            if (query_fuzzer_runs)
-            {
-                block_out_stream = std::make_shared<NullBlockOutputStream>(block);
-                return;
-            }
-
-            WriteBuffer * out_buf = nullptr;
-            String pager = config().getString("pager", "");
-            if (!pager.empty())
-            {
-                signal(SIGPIPE, SIG_IGN);
-                pager_cmd = ShellCommand::execute(pager, true);
-                out_buf = &pager_cmd->in;
-            }
-            else
-            {
-                out_buf = &std_out;
-            }
-
-            String current_format = format;
-
-            /// The query can specify output format or output file.
-            /// FIXME: try to prettify this cast using `as<>()`
-            if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(parsed_query.get()))
-            {
-                if (query_with_output->out_file)
-                {
-                    const auto & out_file_node = query_with_output->out_file->as<ASTLiteral &>();
-                    const auto & out_file = out_file_node.value.safeGet<std::string>();
-
-                    out_file_buf = wrapWriteBufferWithCompressionMethod(
-                        std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
-                        chooseCompressionMethod(out_file, ""),
-                        /* compression level = */ 3
-                    );
-
-                    // We are writing to file, so default format is the same as in non-interactive mode.
-                    if (is_interactive && is_default_format)
-                        current_format = "TabSeparated";
-                }
-                if (query_with_output->format != nullptr)
-                {
-                    if (has_vertical_output_suffix)
-                        throw Exception("Output format already specified", ErrorCodes::CLIENT_OUTPUT_FORMAT_SPECIFIED);
-                    const auto & id = query_with_output->format->as<ASTIdentifier &>();
-                    current_format = id.name();
-                }
-            }
-
-            if (has_vertical_output_suffix)
-                current_format = "Vertical";
-
-            /// It is not clear how to write progress with parallel formatting. It may increase code complexity significantly.
-            if (!need_render_progress)
-                block_out_stream = context->getOutputStreamParallelIfPossible(current_format, out_file_buf ? *out_file_buf : *out_buf, block);
-            else
-                block_out_stream = context->getOutputStream(current_format, out_file_buf ? *out_file_buf : *out_buf, block);
-
-            block_out_stream->writePrefix();
-        }
-    }
-
-
-    void initLogsOutputStream()
-    {
-        if (!logs_out_stream)
-        {
-            WriteBuffer * wb = out_logs_buf.get();
-
-            if (!out_logs_buf)
-            {
-                if (server_logs_file.empty())
-                {
-                    /// Use stderr by default
-                    out_logs_buf = std::make_unique<WriteBufferFromFileDescriptor>(STDERR_FILENO);
-                    wb = out_logs_buf.get();
-                }
-                else if (server_logs_file == "-")
-                {
-                    /// Use stdout if --server_logs_file=- specified
-                    wb = &std_out;
-                }
-                else
-                {
-                    out_logs_buf
-                        = std::make_unique<WriteBufferFromFile>(server_logs_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_APPEND | O_CREAT);
-                    wb = out_logs_buf.get();
-                }
-            }
-
-            logs_out_stream = std::make_shared<InternalTextLogsRowOutputStream>(*wb, stdout_is_a_tty);
-            logs_out_stream->writePrefix();
-        }
-    }
-
-
-    void onData(Block & block)
-    {
-        if (!block)
-            return;
-
-        processed_rows += block.rows();
-
-        /// Even if all blocks are empty, we still need to initialize the output stream to write empty resultset.
-        initBlockOutputStream(block);
-
-        /// The header block containing zero rows was used to initialize
-        /// block_out_stream, do not output it.
-        /// Also do not output too much data if we're fuzzing.
-        if (block.rows() == 0 || (query_fuzzer_runs != 0 && processed_rows >= 100))
-            return;
-
-        if (need_render_progress)
-            progress_indication.clearProgressOutput();
-
-        block_out_stream->write(block);
-        written_first_block = true;
-
-        /// Received data block is immediately displayed to the user.
-        block_out_stream->flush();
-
-        /// Restore progress bar after data block.
-        if (need_render_progress)
-            progress_indication.writeProgress();
-    }
-
-
-    void onLogData(Block & block)
-    {
-        initLogsOutputStream();
-        progress_indication.clearProgressOutput();
-        logs_out_stream->write(block);
-        logs_out_stream->flush();
-    }
-
-
-    void onTotals(Block & block)
-    {
-        initBlockOutputStream(block);
-        block_out_stream->setTotals(block);
-    }
-
-    void onExtremes(Block & block)
-    {
-        initBlockOutputStream(block);
-        block_out_stream->setExtremes(block);
-    }
-
-
-    void onProgress(const Progress & value)
-    {
-        if (!progress_indication.updateProgress(value))
-        {
-            // Just a keep-alive update.
-            return;
-        }
-
-        if (block_out_stream)
-            block_out_stream->onProgress(value);
-
-        if (need_render_progress)
-            progress_indication.writeProgress();
-    }
-
-
-    void writeFinalProgress()
-    {
-        progress_indication.writeFinalProgress();
-    }
-
-
-    void onReceiveExceptionFromServer(std::unique_ptr<Exception> && e)
-    {
-        have_error = true;
-        server_exception = std::move(e);
-        resetOutput();
-    }
-
-
-    void onProfileInfo(const BlockStreamProfileInfo & profile_info)
-    {
-        if (profile_info.hasAppliedLimit() && block_out_stream)
-            block_out_stream->setRowsBeforeLimit(profile_info.getRowsBeforeLimit());
-    }
-
-
-    void onEndOfStream()
-    {
-        progress_indication.clearProgressOutput();
-
-        if (block_out_stream)
-            block_out_stream->writeSuffix();
-
-        if (logs_out_stream)
-            logs_out_stream->writeSuffix();
-
-        resetOutput();
-
-        if (is_interactive && !written_first_block)
-        {
-            progress_indication.clearProgressOutput();
-            std::cout << "Ok." << std::endl;
-        }
-    }
-
-    static void showClientVersion()
-    {
-        std::cout << DBMS_NAME << " client version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
-    }
-
-    static void clearTerminal()
-    {
-        /// Clear from cursor until end of screen.
-        /// It is needed if garbage is left in terminal.
-        /// Show cursor. It can be left hidden by invocation of previous programs.
-        /// A test for this feature: perl -e 'print "x"x100000'; echo -ne '\033[0;0H\033[?25l'; clickhouse-client
-        std::cout << "\033[0J"
-                     "\033[?25h";
-    }
-
-public:
-    void init(int argc, char ** argv)
-    {
-        /// Don't parse options with Poco library. We need more sophisticated processing.
-        stopOptionsProcessing();
-
-        /** We allow different groups of arguments:
-          * - common arguments;
-          * - arguments for any number of external tables each in form "--external args...",
-          *   where possible args are file, name, format, structure, types;
-          * - param arguments for prepared statements.
-          * Split these groups before processing.
-          */
-        using Arguments = std::vector<std::string>;
-
-        Arguments common_arguments{""}; /// 0th argument is ignored.
-        std::vector<Arguments> external_tables_arguments;
-
-        bool in_external_group = false;
-        for (int arg_num = 1; arg_num < argc; ++arg_num)
-        {
-            const char * arg = argv[arg_num];
-
-            if (0 == strcmp(arg, "--external"))
-            {
-                in_external_group = true;
-                external_tables_arguments.emplace_back(Arguments{""});
-            }
-            /// Options with value after equal sign.
-            else if (
-                in_external_group
-                && (0 == strncmp(arg, "--file=", strlen("--file=")) || 0 == strncmp(arg, "--name=", strlen("--name="))
-                    || 0 == strncmp(arg, "--format=", strlen("--format=")) || 0 == strncmp(arg, "--structure=", strlen("--structure="))
-                    || 0 == strncmp(arg, "--types=", strlen("--types="))))
-            {
-                external_tables_arguments.back().emplace_back(arg);
-            }
-            /// Options with value after whitespace.
-            else if (
-                in_external_group
-                && (0 == strcmp(arg, "--file") || 0 == strcmp(arg, "--name") || 0 == strcmp(arg, "--format")
-                    || 0 == strcmp(arg, "--structure") || 0 == strcmp(arg, "--types")))
-            {
-                if (arg_num + 1 < argc)
-                {
-                    external_tables_arguments.back().emplace_back(arg);
-                    ++arg_num;
-                    arg = argv[arg_num];
-                    external_tables_arguments.back().emplace_back(arg);
-                }
-                else
-                    break;
-            }
-            else
-            {
-                in_external_group = false;
-
-                /// Parameter arg after underline.
-                if (startsWith(arg, "--param_"))
-                {
-                    const char * param_continuation = arg + strlen("--param_");
-                    const char * equal_pos = strchr(param_continuation, '=');
-
-                    if (equal_pos == param_continuation)
-                        throw Exception("Parameter name cannot be empty", ErrorCodes::BAD_ARGUMENTS);
-
-                    if (equal_pos)
-                    {
-                        /// param_name=value
-                        query_parameters.emplace(String(param_continuation, equal_pos), String(equal_pos + 1));
-                    }
-                    else
-                    {
-                        /// param_name value
-                        ++arg_num;
-                        if (arg_num >= argc)
-                            throw Exception("Parameter requires value", ErrorCodes::BAD_ARGUMENTS);
-                        arg = argv[arg_num];
-                        query_parameters.emplace(String(param_continuation), String(arg));
-                    }
-                }
-                else
-                    common_arguments.emplace_back(arg);
-            }
-        }
-
-        stdin_is_a_tty = isatty(STDIN_FILENO);
-        stdout_is_a_tty = isatty(STDOUT_FILENO);
-
-        uint64_t terminal_width = 0;
-        if (stdin_is_a_tty)
-            terminal_width = getTerminalWidth();
-
-        namespace po = boost::program_options;
-
-        /// Main commandline options related to client functionality and all parameters from Settings.
-        po::options_description main_description = createOptionsDescription("Main options", terminal_width);
-        main_description.add_options()
-            ("help", "produce help message")
-            ("config-file,C", po::value<std::string>(), "config-file path")
-            ("config,c", po::value<std::string>(), "config-file path (another shorthand)")
-            ("host,h", po::value<std::string>()->default_value("localhost"), "server host")
-            ("port", po::value<int>()->default_value(9000), "server port")
-            ("secure,s", "Use TLS connection")
-            ("user,u", po::value<std::string>()->default_value("default"), "user")
-            /** If "--password [value]" is used but the value is omitted, the bad argument exception will be thrown.
-              * implicit_value is used to avoid this exception (to allow user to type just "--password")
-              * Since currently boost provides no way to check if a value has been set implicitly for an option,
-              * the "\n" is used to distinguish this case because there is hardly a chance a user would use "\n"
-              * as the password.
-              */
-            ("password", po::value<std::string>()->implicit_value("\n", ""), "password")
-            ("ask-password", "ask-password")
-            ("quota_key", po::value<std::string>(), "A string to differentiate quotas when the user have keyed quotas configured on server")
-            ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
-            ("query_id", po::value<std::string>(), "query_id")
-            ("query,q", po::value<std::string>(), "query")
-            ("database,d", po::value<std::string>(), "database")
-            ("pager", po::value<std::string>(), "pager")
-            ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
-            ("suggestion_limit", po::value<int>()->default_value(10000),
-                "Suggestion limit for how many databases, tables and columns to fetch.")
-            ("multiline,m", "multiline")
-            ("multiquery,n", "multiquery")
-            ("queries-file", po::value<std::vector<std::string>>()->multitoken(),
-                "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
-            ("format,f", po::value<std::string>(), "default output format")
-            ("testmode,T", "enable test hints in comments")
-            ("ignore-error", "do not stop processing in multiquery mode")
-            ("vertical,E", "vertical output format, same as --format=Vertical or FORMAT Vertical or \\G at end of command")
-            ("time,t", "print query execution time to stderr in non-interactive mode (for benchmarks)")
-            ("stacktrace", "print stack traces of exceptions")
-            ("progress", "print progress even in non-interactive mode")
-            ("version,V", "print version information and exit")
-            ("version-clean", "print version in machine-readable format and exit")
-            ("echo", "in batch mode, print query before execution")
-            ("max_client_network_bandwidth", po::value<int>(), "the maximum speed of data exchange over the network for the client in bytes per second.")
-            ("compression", po::value<bool>(), "enable or disable compression")
-            ("highlight", po::value<bool>()->default_value(true), "enable or disable basic syntax highlight in interactive command line")
-            ("log-level", po::value<std::string>(), "client log level")
-            ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
-            ("query-fuzzer-runs", po::value<int>()->default_value(0), "After executing every SELECT query, do random mutations in it and run again specified number of times. This is used for testing to discover unexpected corner cases.")
-            ("interleave-queries-file", po::value<std::vector<std::string>>()->multitoken(),
-                "file path with queries to execute before every file from 'queries-file'; multiple files can be specified (--queries-file file1 file2...); this is needed to enable more aggressive fuzzing of newly added tests (see 'query-fuzzer-runs' option)")
-            ("opentelemetry-traceparent", po::value<std::string>(), "OpenTelemetry traceparent header as described by W3C Trace Context recommendation")
-            ("opentelemetry-tracestate", po::value<std::string>(), "OpenTelemetry tracestate header as described by W3C Trace Context recommendation")
-            ("history_file", po::value<std::string>(), "path to history file")
-            ("no-warnings", "disable warnings when client connects to server")
-        ;
-
-        Settings cmd_settings;
-        cmd_settings.addProgramOptions(main_description);
-
-        /// Commandline options related to external tables.
-        po::options_description external_description = createOptionsDescription("External tables options", terminal_width);
-        external_description.add_options()("file", po::value<std::string>(), "data file or - for stdin")(
-            "name",
-            po::value<std::string>()->default_value("_data"),
-            "name of the table")("format", po::value<std::string>()->default_value("TabSeparated"), "data format")("structure", po::value<std::string>(), "structure")("types", po::value<std::string>(), "types");
-
-        /// Parse main commandline options.
-        po::parsed_options parsed = po::command_line_parser(common_arguments).options(main_description).run();
-        auto unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::include_positional);
-        // unrecognized_options[0] is "", I don't understand why we need "" as the first argument which unused
-        if (unrecognized_options.size() > 1)
-        {
-            throw Exception("Unrecognized option '" + unrecognized_options[1] + "'", ErrorCodes::UNRECOGNIZED_ARGUMENTS);
-        }
-        po::variables_map options;
-        po::store(parsed, options);
-        po::notify(options);
-
-        if (options.count("version") || options.count("V"))
-        {
-            showClientVersion();
-            exit(0);
-        }
-
-        if (options.count("version-clean"))
-        {
-            std::cout << VERSION_STRING;
-            exit(0);
-        }
-
-        /// Output of help message.
-        if (options.count("help")
-            || (options.count("host") && options["host"].as<std::string>() == "elp")) /// If user writes -help instead of --help.
-        {
-            std::cout << main_description << "\n";
-            std::cout << external_description << "\n";
-            std::cout << "In addition, --param_name=value can be specified for substitution of parameters for parametrized queries.\n";
-            exit(0);
-        }
-
-        if (options.count("log-level"))
-            Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
-
-        size_t number_of_external_tables_with_stdin_source = 0;
-        for (size_t i = 0; i < external_tables_arguments.size(); ++i)
-        {
-            /// Parse commandline options related to external tables.
-            po::parsed_options parsed_tables = po::command_line_parser(external_tables_arguments[i]).options(external_description).run();
-            po::variables_map external_options;
-            po::store(parsed_tables, external_options);
-
-            try
-            {
-                external_tables.emplace_back(external_options);
-                if (external_tables.back().file == "-")
-                    ++number_of_external_tables_with_stdin_source;
-                if (number_of_external_tables_with_stdin_source > 1)
-                    throw Exception("Two or more external tables has stdin (-) set as --file field", ErrorCodes::BAD_ARGUMENTS);
-            }
-            catch (const Exception & e)
-            {
-                std::cerr << getExceptionMessage(e, false) << std::endl;
-                std::cerr << "Table №" << i << std::endl << std::endl;
-                /// Avoid the case when error exit code can possibly overflow to normal (zero).
-                auto exit_code = e.code() % 256;
-                if (exit_code == 0)
-                    exit_code = 255;
-                exit(exit_code);
-            }
-        }
-
-        context->makeGlobalContext();
-        context->setSettings(cmd_settings);
-
-        /// Copy settings-related program options to config.
-        /// TODO: Is this code necessary?
-        for (const auto & setting : context->getSettingsRef().all())
-        {
-            const auto & name = setting.getName();
-            if (options.count(name))
-                config().setString(name, options[name].as<std::string>());
-        }
-
-        if (options.count("config-file") && options.count("config"))
-            throw Exception("Two or more configuration files referenced in arguments", ErrorCodes::BAD_ARGUMENTS);
-
-        query_processing_stage = QueryProcessingStage::fromString(options["stage"].as<std::string>());
-
-        /// Save received data into the internal config.
-        if (options.count("config-file"))
-            config().setString("config-file", options["config-file"].as<std::string>());
-        if (options.count("config"))
-            config().setString("config-file", options["config"].as<std::string>());
-        if (options.count("host") && !options["host"].defaulted())
-            config().setString("host", options["host"].as<std::string>());
-        if (options.count("query_id"))
-            config().setString("query_id", options["query_id"].as<std::string>());
-        if (options.count("query"))
-            config().setString("query", options["query"].as<std::string>());
-        if (options.count("queries-file"))
-            queries_files = options["queries-file"].as<std::vector<std::string>>();
-        if (options.count("interleave-queries-file"))
-            interleave_queries_files = options["interleave-queries-file"].as<std::vector<std::string>>();
-        if (options.count("database"))
-            config().setString("database", options["database"].as<std::string>());
-        if (options.count("pager"))
-            config().setString("pager", options["pager"].as<std::string>());
-        if (options.count("port") && !options["port"].defaulted())
-            config().setInt("port", options["port"].as<int>());
-        if (options.count("secure"))
-            config().setBool("secure", true);
-        if (options.count("user") && !options["user"].defaulted())
-            config().setString("user", options["user"].as<std::string>());
-        if (options.count("password"))
-            config().setString("password", options["password"].as<std::string>());
-        if (options.count("ask-password"))
-            config().setBool("ask-password", true);
-        if (options.count("quota_key"))
-            config().setString("quota_key", options["quota_key"].as<std::string>());
-        if (options.count("multiline"))
-            config().setBool("multiline", true);
-        if (options.count("multiquery"))
-            config().setBool("multiquery", true);
-        if (options.count("testmode"))
-            config().setBool("testmode", true);
-        if (options.count("ignore-error"))
-            config().setBool("ignore-error", true);
-        if (options.count("format"))
-            config().setString("format", options["format"].as<std::string>());
-        if (options.count("vertical"))
-            config().setBool("vertical", true);
-        if (options.count("stacktrace"))
-            config().setBool("stacktrace", true);
-        if (options.count("progress"))
-            config().setBool("progress", true);
-        if (options.count("echo"))
-            config().setBool("echo", true);
-        if (options.count("time"))
-            print_time_to_stderr = true;
-        if (options.count("max_client_network_bandwidth"))
-            max_client_network_bandwidth = options["max_client_network_bandwidth"].as<int>();
-        if (options.count("compression"))
-            config().setBool("compression", options["compression"].as<bool>());
-        if (options.count("server_logs_file"))
-            server_logs_file = options["server_logs_file"].as<std::string>();
-        if (options.count("disable_suggestion"))
-            config().setBool("disable_suggestion", true);
-        if (options.count("suggestion_limit"))
-            config().setInt("suggestion_limit", options["suggestion_limit"].as<int>());
-        if (options.count("highlight"))
-            config().setBool("highlight", options["highlight"].as<bool>());
-        if (options.count("history_file"))
-            config().setString("history_file", options["history_file"].as<std::string>());
-        if (options.count("no-warnings"))
-            config().setBool("no-warnings", true);
-
-        if ((query_fuzzer_runs = options["query-fuzzer-runs"].as<int>()))
-        {
-            // Fuzzer implies multiquery.
-            config().setBool("multiquery", true);
-
-            // Ignore errors in parsing queries.
-            config().setBool("ignore-error", true);
-            ignore_error = true;
-        }
-
-        if (options.count("opentelemetry-traceparent"))
-        {
-            std::string traceparent = options["opentelemetry-traceparent"].as<std::string>();
-            std::string error;
-            if (!context->getClientInfo().client_trace_context.parseTraceparentHeader(traceparent, error))
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot parse OpenTelemetry traceparent '{}': {}", traceparent, error);
-            }
-        }
-
-        if (options.count("opentelemetry-tracestate"))
-        {
-            context->getClientInfo().client_trace_context.tracestate = options["opentelemetry-tracestate"].as<std::string>();
-        }
-
-        argsToConfig(common_arguments, config(), 100);
-
-        clearPasswordFromCommandLine(argc, argv);
-    }
-};
+    return true;
 }
 
+
+void Client::printHelpMessage(const OptionsDescription & options_description)
+{
+    std::cout << options_description.main_description.value() << "\n";
+    std::cout << options_description.external_description.value() << "\n";
+    std::cout << "In addition, --param_name=value can be specified for substitution of parameters for parametrized queries.\n";
+}
+
+
+void Client::addOptions(OptionsDescription & options_description)
+{
+    /// Main commandline options related to client functionality and all parameters from Settings.
+    options_description.main_description->add_options()
+        ("config,c", po::value<std::string>(), "config-file path (another shorthand)")
+        ("host,h", po::value<std::string>()->default_value("localhost"), "server host")
+        ("port", po::value<int>()->default_value(9000), "server port")
+        ("secure,s", "Use TLS connection")
+        ("user,u", po::value<std::string>()->default_value("default"), "user")
+        /** If "--password [value]" is used but the value is omitted, the bad argument exception will be thrown.
+            * implicit_value is used to avoid this exception (to allow user to type just "--password")
+            * Since currently boost provides no way to check if a value has been set implicitly for an option,
+            * the "\n" is used to distinguish this case because there is hardly a chance a user would use "\n"
+            * as the password.
+            */
+        ("password", po::value<std::string>()->implicit_value("\n", ""), "password")
+        ("ask-password", "ask-password")
+        ("quota_key", po::value<std::string>(), "A string to differentiate quotas when the user have keyed quotas configured on server")
+        ("pager", po::value<std::string>(), "pager")
+        ("testmode,T", "enable test hints in comments")
+
+        ("max_client_network_bandwidth", po::value<int>(), "the maximum speed of data exchange over the network for the client in bytes per second.")
+        ("compression", po::value<bool>(), "enable or disable compression")
+
+        ("log-level", po::value<std::string>(), "client log level")
+        ("server_logs_file", po::value<std::string>(), "put server logs into specified file")
+
+        ("query-fuzzer-runs", po::value<int>()->default_value(0), "After executing every SELECT query, do random mutations in it and run again specified number of times. This is used for testing to discover unexpected corner cases.")
+        ("interleave-queries-file", po::value<std::vector<std::string>>()->multitoken(),
+            "file path with queries to execute before every file from 'queries-file'; multiple files can be specified (--queries-file file1 file2...); this is needed to enable more aggressive fuzzing of newly added tests (see 'query-fuzzer-runs' option)")
+
+        ("opentelemetry-traceparent", po::value<std::string>(), "OpenTelemetry traceparent header as described by W3C Trace Context recommendation")
+        ("opentelemetry-tracestate", po::value<std::string>(), "OpenTelemetry tracestate header as described by W3C Trace Context recommendation")
+
+        ("no-warnings", "disable warnings when client connects to server")
+        ("max_memory_usage_in_client", po::value<int>(), "sets memory limit in client")
+    ;
+
+    /// Commandline options related to external tables.
+
+    options_description.external_description.emplace(createOptionsDescription("External tables options", terminal_width));
+    options_description.external_description->add_options()
+    (
+        "file", po::value<std::string>(), "data file or - for stdin"
+    )
+    (
+        "name", po::value<std::string>()->default_value("_data"), "name of the table"
+    )
+    (
+        "format", po::value<std::string>()->default_value("TabSeparated"), "data format"
+    )
+    (
+        "structure", po::value<std::string>(), "structure"
+    )
+    (
+        "types", po::value<std::string>(), "types"
+    );
+}
+
+
+void Client::processOptions(const OptionsDescription & options_description,
+                            const CommandLineOptions & options,
+                            const std::vector<Arguments> & external_tables_arguments)
+{
+    namespace po = boost::program_options;
+
+    size_t number_of_external_tables_with_stdin_source = 0;
+    for (size_t i = 0; i < external_tables_arguments.size(); ++i)
+    {
+        /// Parse commandline options related to external tables.
+        po::parsed_options parsed_tables = po::command_line_parser(external_tables_arguments[i]).options(
+            options_description.external_description.value()).run();
+        po::variables_map external_options;
+        po::store(parsed_tables, external_options);
+
+        try
+        {
+            external_tables.emplace_back(external_options);
+            if (external_tables.back().file == "-")
+                ++number_of_external_tables_with_stdin_source;
+            if (number_of_external_tables_with_stdin_source > 1)
+                throw Exception("Two or more external tables has stdin (-) set as --file field", ErrorCodes::BAD_ARGUMENTS);
+        }
+        catch (const Exception & e)
+        {
+            std::cerr << getExceptionMessage(e, false) << std::endl;
+            std::cerr << "Table №" << i << std::endl << std::endl;
+            /// Avoid the case when error exit code can possibly overflow to normal (zero).
+            auto exit_code = e.code() % 256;
+            if (exit_code == 0)
+                exit_code = 255;
+            exit(exit_code);
+        }
+    }
+    send_external_tables = true;
+
+    shared_context = Context::createShared();
+    global_context = Context::createGlobal(shared_context.get());
+
+    global_context->makeGlobalContext();
+    global_context->setApplicationType(Context::ApplicationType::CLIENT);
+
+    global_context->setSettings(cmd_settings);
+
+    /// Copy settings-related program options to config.
+    /// TODO: Is this code necessary?
+    for (const auto & setting : global_context->getSettingsRef().all())
+    {
+        const auto & name = setting.getName();
+        if (options.count(name))
+            config().setString(name, options[name].as<String>());
+    }
+
+    if (options.count("config-file") && options.count("config"))
+        throw Exception("Two or more configuration files referenced in arguments", ErrorCodes::BAD_ARGUMENTS);
+
+    if (options.count("config"))
+        config().setString("config-file", options["config"].as<std::string>());
+    if (options.count("host") && !options["host"].defaulted())
+        config().setString("host", options["host"].as<std::string>());
+    if (options.count("interleave-queries-file"))
+        interleave_queries_files = options["interleave-queries-file"].as<std::vector<std::string>>();
+    if (options.count("pager"))
+        config().setString("pager", options["pager"].as<std::string>());
+    if (options.count("port") && !options["port"].defaulted())
+        config().setInt("port", options["port"].as<int>());
+    if (options.count("secure"))
+        config().setBool("secure", true);
+    if (options.count("user") && !options["user"].defaulted())
+        config().setString("user", options["user"].as<std::string>());
+    if (options.count("password"))
+        config().setString("password", options["password"].as<std::string>());
+    if (options.count("ask-password"))
+        config().setBool("ask-password", true);
+    if (options.count("quota_key"))
+        config().setString("quota_key", options["quota_key"].as<std::string>());
+    if (options.count("testmode"))
+        config().setBool("testmode", true);
+    if (options.count("max_client_network_bandwidth"))
+        max_client_network_bandwidth = options["max_client_network_bandwidth"].as<int>();
+    if (options.count("compression"))
+        config().setBool("compression", options["compression"].as<bool>());
+    if (options.count("server_logs_file"))
+        server_logs_file = options["server_logs_file"].as<std::string>();
+    if (options.count("no-warnings"))
+        config().setBool("no-warnings", true);
+
+    if ((query_fuzzer_runs = options["query-fuzzer-runs"].as<int>()))
+    {
+        // Fuzzer implies multiquery.
+        config().setBool("multiquery", true);
+        // Ignore errors in parsing queries.
+        config().setBool("ignore-error", true);
+        ignore_error = true;
+    }
+
+    if (options.count("opentelemetry-traceparent"))
+    {
+        String traceparent = options["opentelemetry-traceparent"].as<std::string>();
+        String error;
+        if (!global_context->getClientInfo().client_trace_context.parseTraceparentHeader(traceparent, error))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot parse OpenTelemetry traceparent '{}': {}", traceparent, error);
+    }
+
+    if (options.count("opentelemetry-tracestate"))
+        global_context->getClientInfo().client_trace_context.tracestate = options["opentelemetry-tracestate"].as<std::string>();
+}
+
+
+void Client::processConfig()
+{
+    /// Batch mode is enabled if one of the following is true:
+    /// - -e (--query) command line option is present.
+    ///   The value of the option is used as the text of query (or of multiple queries).
+    ///   If stdin is not a terminal, INSERT data for the first query is read from it.
+    /// - stdin is not a terminal. In this case queries are read from it.
+    /// - -qf (--queries-file) command line option is present.
+    ///   The value of the option is used as file with query (or of multiple queries) to execute.
+    if (stdin_is_a_tty && !config().has("query") && queries_files.empty())
+    {
+        if (config().has("query") && config().has("queries-file"))
+            throw Exception("Specify either `query` or `queries-file` option", ErrorCodes::BAD_ARGUMENTS);
+
+        is_interactive = true;
+    }
+    else
+    {
+        need_render_progress = config().getBool("progress", false);
+        echo_queries = config().getBool("echo", false);
+        ignore_error = config().getBool("ignore-error", false);
+
+        auto query_id = config().getString("query_id", "");
+        if (!query_id.empty())
+            global_context->setCurrentQueryId(query_id);
+    }
+    print_stack_trace = config().getBool("stacktrace", false);
+
+    if (config().has("multiquery"))
+        is_multiquery = true;
+
+    is_default_format = !config().has("vertical") && !config().has("format");
+    if (config().has("vertical"))
+        format = config().getString("format", "Vertical");
+    else
+        format = config().getString("format", is_interactive ? "PrettyCompact" : "TabSeparated");
+
+    format_max_block_size = config().getInt("format_max_block_size", global_context->getSettingsRef().max_block_size);
+
+    insert_format = "Values";
+
+    /// Setting value from cmd arg overrides one from config
+    if (global_context->getSettingsRef().max_insert_block_size.changed)
+        insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
+    else
+        insert_format_max_block_size = config().getInt("insert_format_max_block_size", global_context->getSettingsRef().max_insert_block_size);
+
+    ClientInfo & client_info = global_context->getClientInfo();
+    client_info.setInitialQuery();
+    client_info.quota_key = config().getString("quota_key", "");
+}
+
+}
+
+
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 
@@ -2781,16 +1218,16 @@ int mainEntryClickHouseClient(int argc, char ** argv)
         client.init(argc, argv);
         return client.run();
     }
-    catch (const boost::program_options::error & e)
-    {
-        std::cerr << "Bad arguments: " << e.what() << std::endl;
-        return 1;
-    }
     catch (const DB::Exception & e)
     {
         std::cerr << DB::getExceptionMessage(e, false) << std::endl;
         return 1;
     }
+    catch (const boost::program_options::error & e)
+    {
+        std::cerr << "Bad arguments: " << e.what() << std::endl;
+        return DB::ErrorCodes::BAD_ARGUMENTS;
+    }
     catch (...)
     {
         std::cerr << DB::getCurrentExceptionMessage(true) << std::endl;
diff --git a/programs/client/Client.h b/programs/client/Client.h
new file mode 100644
index 00000000000..2def74ef3fc
--- /dev/null
+++ b/programs/client/Client.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <Client/ClientBase.h>
+
+
+namespace DB
+{
+
+class Client : public ClientBase
+{
+public:
+    Client() = default;
+
+    void initialize(Poco::Util::Application & self) override;
+
+    int main(const std::vector<String> & /*args*/) override;
+
+protected:
+    bool executeMultiQuery(const String & all_queries_text) override;
+    bool processWithFuzzing(const String & full_query) override;
+
+    void connect() override;
+    void processError(const String & query) const override;
+    String getName() const override { return "client"; }
+
+    void printHelpMessage(const OptionsDescription & options_description) override;
+    void addOptions(OptionsDescription & options_description) override;
+    void processOptions(const OptionsDescription & options_description, const CommandLineOptions & options,
+                        const std::vector<Arguments> & external_tables_arguments) override;
+    void processConfig() override;
+
+private:
+    void printChangedSettings() const;
+    std::vector<String> loadWarningMessages();
+};
+}
diff --git a/programs/client/TestHint.h b/programs/client/TestHint.h
deleted file mode 100644
index 100d47f4dd2..00000000000
--- a/programs/client/TestHint.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <sstream>
-#include <iostream>
-#include <Core/Types.h>
-#include <Common/Exception.h>
-#include <Parsers/Lexer.h>
-
-
-namespace DB
-{
-
-/// Checks expected server and client error codes in --testmode.
-///
-/// The following comment hints are supported:
-///
-/// - "-- { serverError 60 }" -- in case of you are expecting server error.
-///
-/// - "-- { clientError 20 }" -- in case of you are expecting client error.
-///
-///   Remember that the client parse the query first (not the server), so for
-///   example if you are expecting syntax error, then you should use
-///   clientError not serverError.
-///
-/// Examples:
-///
-/// - echo 'select / -- { clientError 62 }' | clickhouse-client --testmode -nm
-///
-//    Here the client parses the query but it is incorrect, so it expects
-///   SYNTAX_ERROR (62).
-///
-/// - echo 'select foo -- { serverError 47 }' | clickhouse-client --testmode -nm
-///
-///   But here the query is correct, but there is no such column "foo", so it
-///   is UNKNOWN_IDENTIFIER server error.
-///
-/// The following hints will control the query echo mode (i.e print each query):
-///
-/// - "-- { echo }"
-/// - "-- { echoOn }"
-/// - "-- { echoOff }"
-class TestHint
-{
-public:
-    TestHint(bool enabled_, const String & query_) :
-        query(query_)
-    {
-        if (!enabled_)
-            return;
-
-        // Don't parse error hints in leading comments, because it feels weird.
-        // Leading 'echo' hint is OK.
-        bool is_leading_hint = true;
-
-        Lexer lexer(query.data(), query.data() + query.size());
-
-        for (Token token = lexer.nextToken(); !token.isEnd(); token = lexer.nextToken())
-        {
-            if (token.type != TokenType::Comment
-                && token.type != TokenType::Whitespace)
-            {
-                is_leading_hint = false;
-            }
-            else if (token.type == TokenType::Comment)
-            {
-                String comment(token.begin, token.begin + token.size());
-
-                if (!comment.empty())
-                {
-                    size_t pos_start = comment.find('{', 0);
-                    if (pos_start != String::npos)
-                    {
-                        size_t pos_end = comment.find('}', pos_start);
-                        if (pos_end != String::npos)
-                        {
-                            String hint(comment.begin() + pos_start + 1, comment.begin() + pos_end);
-                            parse(hint, is_leading_hint);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    int serverError() const { return server_error; }
-    int clientError() const { return client_error; }
-    std::optional<bool> echoQueries() const { return echo; }
-
-private:
-    const String & query;
-    int server_error = 0;
-    int client_error = 0;
-    std::optional<bool> echo;
-
-    void parse(const String & hint, bool is_leading_hint)
-    {
-        std::stringstream ss;       // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-        ss << hint;
-        String item;
-
-        while (!ss.eof())
-        {
-            ss >> item;
-            if (ss.eof())
-                break;
-
-            if (!is_leading_hint)
-            {
-                if (item == "serverError")
-                    ss >> server_error;
-                else if (item == "clientError")
-                    ss >> client_error;
-            }
-
-            if (item == "echo")
-                echo.emplace(true);
-            if (item == "echoOn")
-                echo.emplace(true);
-            if (item == "echoOff")
-                echo.emplace(false);
-        }
-    }
-
-    bool allErrorsExpected(int actual_server_error, int actual_client_error) const
-    {
-        return (server_error || client_error) && (server_error == actual_server_error) && (client_error == actual_client_error);
-    }
-
-    bool lostExpectedError(int actual_server_error, int actual_client_error) const
-    {
-        return (server_error && !actual_server_error) || (client_error && !actual_client_error);
-    }
-};
-
-}
diff --git a/programs/client/TestTags.cpp b/programs/client/TestTags.cpp
new file mode 100644
index 00000000000..f3cb49cdabd
--- /dev/null
+++ b/programs/client/TestTags.cpp
@@ -0,0 +1,51 @@
+#include "TestTags.h"
+
+#include <cstring>
+
+namespace DB
+{
+
+size_t getTestTagsLength(const String & multiline_query)
+{
+    const String & text = multiline_query;
+    size_t pos = 0;
+    bool first_line = true;
+
+    while (true)
+    {
+        size_t line_start = pos;
+
+        /// Skip spaces.
+        while ((pos != text.length()) && (text[pos] == ' ' || text[pos] == '\t'))
+            ++pos;
+
+        /// Skip comment "--".
+        static constexpr const char comment[] = "--";
+        if (text.compare(pos, strlen(comment), comment) != 0)
+            return line_start;
+        pos += strlen(comment);
+
+        /// Skip the prefix "Tags:" if it's the first line.
+        if (first_line)
+        {
+            while ((pos != text.length()) && (text[pos] == ' ' || text[pos] == '\t'))
+                ++pos;
+
+            static constexpr const char tags_prefix[] = "Tags:";
+            if (text.compare(pos, strlen(tags_prefix), tags_prefix) != 0)
+                return 0;
+            pos += strlen(tags_prefix);
+            first_line = false;
+        }
+
+        /// Skip end-of-line.
+        size_t eol_pos = text.find_first_of("\r\n", pos);
+        if (eol_pos == String::npos)
+            return text.length();
+        bool two_chars_eol = (eol_pos + 1 < text.length()) && ((text[eol_pos + 1] == '\r') || (text[eol_pos + 1] == '\n')) && (text[eol_pos + 1] != text[eol_pos]);
+        size_t eol_length = two_chars_eol ? 2 : 1;
+        pos = eol_pos + eol_length;
+    }
+}
+
+}
diff --git a/programs/client/TestTags.h b/programs/client/TestTags.h
new file mode 100644
index 00000000000..e2e36698cb5
--- /dev/null
+++ b/programs/client/TestTags.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+
+/// Returns the length of a text looking like
+/// -- Tags: x, y, z
+/// -- Tag x: explanation of tag x
+/// -- Tag y: explanation of tag y
+/// -- Tag z: explanation of tag z
+///
+/// at the beginning of a multiline query.
+/// If there are no test tags in the multiline query the function returns 0.
+size_t getTestTagsLength(const String & multiline_query);
+
+}
diff --git a/programs/config_tools.h.in b/programs/config_tools.h.in
index 62fc076861c..b97eb63b535 100644
--- a/programs/config_tools.h.in
+++ b/programs/config_tools.h.in
@@ -18,3 +18,4 @@
 #cmakedefine01 ENABLE_CLICKHOUSE_LIBRARY_BRIDGE
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER_CONVERTER
+#cmakedefine01 ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
index cf0b6cc76a4..5b21a7c2aef 100644
--- a/programs/copier/ClusterCopier.cpp
+++ b/programs/copier/ClusterCopier.cpp
@@ -9,7 +9,11 @@
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <DataStreams/ExpressionBlockInputStream.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <QueryPipeline/Chain.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Sources/RemoteSource.h>
 
 namespace DB
 {
@@ -82,7 +86,7 @@ decltype(auto) ClusterCopier::retry(T && func, UInt64 max_tries)
             if (try_number < max_tries)
             {
                 tryLogCurrentException(log, "Will retry");
-                std::this_thread::sleep_for(default_sleep_time);
+                std::this_thread::sleep_for(retry_delay_ms);
             }
         }
     }
@@ -305,7 +309,7 @@ void ClusterCopier::process(const ConnectionTimeouts & timeouts)
 
         /// Retry table processing
         bool table_is_done = false;
-        for (UInt64 num_table_tries = 0; num_table_tries < max_table_tries; ++num_table_tries)
+        for (UInt64 num_table_tries = 1; num_table_tries <= max_table_tries; ++num_table_tries)
         {
             if (tryProcessTable(timeouts, task_table))
             {
@@ -336,7 +340,7 @@ zkutil::EphemeralNodeHolder::Ptr ClusterCopier::createTaskWorkerNodeAndWaitIfNee
     const String & description,
     bool unprioritized)
 {
-    std::chrono::milliseconds current_sleep_time = default_sleep_time;
+    std::chrono::milliseconds current_sleep_time = retry_delay_ms;
     static constexpr std::chrono::milliseconds max_sleep_time(30000); // 30 sec
 
     if (unprioritized)
@@ -362,7 +366,7 @@ zkutil::EphemeralNodeHolder::Ptr ClusterCopier::createTaskWorkerNodeAndWaitIfNee
             LOG_INFO(log, "Too many workers ({}, maximum {}). Postpone processing {}", stat.numChildren, task_cluster->max_workers, description);
 
             if (unprioritized)
-                current_sleep_time = std::min(max_sleep_time, current_sleep_time + default_sleep_time);
+                current_sleep_time = std::min(max_sleep_time, current_sleep_time + retry_delay_ms);
 
             std::this_thread::sleep_for(current_sleep_time);
             num_bad_version_errors = 0;
@@ -781,7 +785,7 @@ bool ClusterCopier::tryDropPartitionPiece(
         if (e.code == Coordination::Error::ZNODEEXISTS)
         {
             LOG_INFO(log, "Partition {} piece {} is cleaning now by somebody, sleep", task_partition.name, toString(current_piece_number));
-            std::this_thread::sleep_for(default_sleep_time);
+            std::this_thread::sleep_for(retry_delay_ms);
             return false;
         }
 
@@ -794,7 +798,7 @@ bool ClusterCopier::tryDropPartitionPiece(
         if (stat.numChildren != 0)
         {
             LOG_INFO(log, "Partition {} contains {} active workers while trying to drop it. Going to sleep.", task_partition.name, stat.numChildren);
-            std::this_thread::sleep_for(default_sleep_time);
+            std::this_thread::sleep_for(retry_delay_ms);
             return false;
         }
         else
@@ -1001,7 +1005,7 @@ bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTab
             task_status = TaskStatus::Error;
             bool was_error = false;
             has_shard_to_process = true;
-            for (UInt64 try_num = 0; try_num < max_shard_partition_tries; ++try_num)
+            for (UInt64 try_num = 1; try_num <= max_shard_partition_tries; ++try_num)
             {
                 task_status = tryProcessPartitionTask(timeouts, partition, is_unprioritized_task);
 
@@ -1016,7 +1020,7 @@ bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTab
                     break;
 
                 /// Repeat on errors
-                std::this_thread::sleep_for(default_sleep_time);
+                std::this_thread::sleep_for(retry_delay_ms);
             }
 
             if (task_status == TaskStatus::Error)
@@ -1064,7 +1068,7 @@ bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTab
                         break;
 
                     /// Repeat on errors.
-                    std::this_thread::sleep_for(default_sleep_time);
+                    std::this_thread::sleep_for(retry_delay_ms);
                 }
                 catch (...)
                 {
@@ -1105,7 +1109,7 @@ bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTab
 
     if (!table_is_done)
     {
-        LOG_INFO(log, "Table {} is not processed yet.Copied {} of {}, will retry", task_table.table_id, finished_partitions, required_partitions);
+        LOG_INFO(log, "Table {} is not processed yet. Copied {} of {}, will retry", task_table.table_id, finished_partitions, required_partitions);
     }
     else
     {
@@ -1208,7 +1212,7 @@ TaskStatus ClusterCopier::iterateThroughAllPiecesInPartition(const ConnectionTim
                 break;
 
             /// Repeat on errors
-            std::this_thread::sleep_for(default_sleep_time);
+            std::this_thread::sleep_for(retry_delay_ms);
         }
 
         was_active_pieces = (res == TaskStatus::Active);
@@ -1274,13 +1278,14 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
     auto get_select_query = [&] (const DatabaseAndTableName & from_table, const String & fields, bool enable_splitting, String limit = "")
     {
         String query;
+        query += "WITH " + task_partition.name + " AS partition_key ";
         query += "SELECT " + fields + " FROM " + getQuotedTable(from_table);
 
         if (enable_splitting && experimental_use_sample_offset)
             query += " SAMPLE 1/" + toString(number_of_splits) + " OFFSET " + toString(current_piece_number) + "/" + toString(number_of_splits);
 
         /// TODO: Bad, it is better to rewrite with ASTLiteral(partition_key_field)
-        query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = (" + task_partition.name + " AS partition_key))";
+        query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = partition_key)";
 
         if (enable_splitting && !experimental_use_sample_offset)
             query += " AND ( cityHash64(" + primary_key_comma_separated + ") %" + toString(number_of_splits) + " = " + toString(current_piece_number) + " )";
@@ -1445,7 +1450,7 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
             local_context->setSettings(task_cluster->settings_pull);
             local_context->setSetting("skip_unavailable_shards", true);
 
-            Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_select_ast, local_context)->execute().getInputStream());
+            Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_select_ast, local_context)->execute().pipeline);
             count = (block) ? block.safeGetByPosition(0).column->getUInt(0) : 0;
         }
 
@@ -1523,25 +1528,30 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
             context_insert->setSettings(task_cluster->settings_push);
 
             /// Custom INSERT SELECT implementation
-            BlockInputStreamPtr input;
-            BlockOutputStreamPtr output;
+            QueryPipeline input;
+            QueryPipeline output;
             {
                 BlockIO io_select = InterpreterFactory::get(query_select_ast, context_select)->execute();
                 BlockIO io_insert = InterpreterFactory::get(query_insert_ast, context_insert)->execute();
 
-                auto pure_input = io_select.getInputStream();
-                output = io_insert.out;
+                output = std::move(io_insert.pipeline);
 
                 /// Add converting actions to make it possible to copy blocks with slightly different schema
-                const auto & select_block = pure_input->getHeader();
-                const auto & insert_block = output->getHeader();
+                const auto & select_block = io_select.pipeline.getHeader();
+                const auto & insert_block = output.getHeader();
                 auto actions_dag = ActionsDAG::makeConvertingActions(
                         select_block.getColumnsWithTypeAndName(),
                         insert_block.getColumnsWithTypeAndName(),
                         ActionsDAG::MatchColumnsMode::Position);
                 auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext()));
 
-                input = std::make_shared<ExpressionBlockInputStream>(pure_input, actions);
+                QueryPipelineBuilder builder;
+                builder.init(std::move(io_select.pipeline));
+                builder.addSimpleTransform([&](const Block & header)
+                {
+                    return std::make_shared<ExpressionTransform>(header, actions);
+                });
+                input = QueryPipelineBuilder::getPipeline(std::move(builder));
             }
 
             /// Fail-fast optimization to abort copying when the current clean state expires
@@ -1587,7 +1597,26 @@ TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
             };
 
             /// Main work is here
-            copyData(*input, *output, cancel_check, update_stats);
+            PullingPipelineExecutor pulling_executor(input);
+            PushingPipelineExecutor pushing_executor(output);
+
+            Block data;
+            bool is_cancelled = false;
+            while (pulling_executor.pull(data))
+            {
+                if (cancel_check())
+                {
+                    is_cancelled = true;
+                    pushing_executor.cancel();
+                    pushing_executor.cancel();
+                    break;
+                }
+                pushing_executor.push(data);
+                update_stats(data);
+            }
+
+            if (!is_cancelled)
+                pushing_executor.finish();
 
             // Just in case
             if (future_is_dirty_checker.valid())
@@ -1710,7 +1739,8 @@ String ClusterCopier::getRemoteCreateTable(
 
     String query = "SHOW CREATE TABLE " + getQuotedTable(table);
     Block block = getBlockWithAllStreamData(
-        std::make_shared<RemoteBlockInputStream>(connection, query, InterpreterShowCreateQuery::getSampleBlock(), remote_context));
+        QueryPipeline(std::make_shared<RemoteSource>(
+            std::make_shared<RemoteQueryExecutor>(connection, query, InterpreterShowCreateQuery::getSampleBlock(), remote_context), false, false)));
 
     return typeid_cast<const ColumnString &>(*block.safeGetByPosition(0).column).getDataAt(0).toString();
 }
@@ -1823,7 +1853,7 @@ std::set<String> ClusterCopier::getShardPartitions(const ConnectionTimeouts & ti
 
     auto local_context = Context::createCopy(context);
     local_context->setSettings(task_cluster->settings_pull);
-    Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_ast, local_context)->execute().getInputStream());
+    Block block = getBlockWithAllStreamData(InterpreterFactory::get(query_ast, local_context)->execute().pipeline);
 
     if (block)
     {
@@ -1851,9 +1881,9 @@ bool ClusterCopier::checkShardHasPartition(const ConnectionTimeouts & timeouts,
     TaskTable & task_table = task_shard.task_table;
 
     WriteBufferFromOwnString ss;
+    ss << "WITH " + partition_quoted_name + " AS partition_key ";
     ss << "SELECT 1 FROM " << getQuotedTable(task_shard.table_read_shard);
-    ss << " WHERE (" << queryToString(task_table.engine_push_partition_key_ast);
-    ss << " = (" + partition_quoted_name << " AS partition_key))";
+    ss << " WHERE (" << queryToString(task_table.engine_push_partition_key_ast) << " = partition_key)";
     if (!task_table.where_condition_str.empty())
         ss << " AND (" << task_table.where_condition_str << ")";
     ss << " LIMIT 1";
@@ -1868,7 +1898,11 @@ bool ClusterCopier::checkShardHasPartition(const ConnectionTimeouts & timeouts,
 
     auto local_context = Context::createCopy(context);
     local_context->setSettings(task_cluster->settings_pull);
-    return InterpreterFactory::get(query_ast, local_context)->execute().getInputStream()->read().rows() != 0;
+    auto pipeline = InterpreterFactory::get(query_ast, local_context)->execute().pipeline;
+    PullingPipelineExecutor executor(pipeline);
+    Block block;
+    executor.pull(block);
+    return block.rows() != 0;
 }
 
 bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTimeouts & timeouts,
@@ -1882,13 +1916,15 @@ bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTi
 
     UNUSED(primary_key_comma_separated);
 
-    std::string query = "SELECT 1 FROM " + getQuotedTable(task_shard.table_read_shard);
+    std::string query;
+
+    query += "WITH " + partition_quoted_name + " AS partition_key ";
+    query += "SELECT 1 FROM " + getQuotedTable(task_shard.table_read_shard);
 
     if (experimental_use_sample_offset)
         query += " SAMPLE 1/" + toString(number_of_splits) + " OFFSET " + toString(current_piece_number) + "/" + toString(number_of_splits);
 
-    query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast)
-                        + " = (" + partition_quoted_name + " AS partition_key))";
+    query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = partition_key)";
 
     if (!experimental_use_sample_offset)
         query += " AND (cityHash64(" + primary_key_comma_separated + ") % "
@@ -1907,12 +1943,15 @@ bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTi
 
     auto local_context = Context::createCopy(context);
     local_context->setSettings(task_cluster->settings_pull);
-    auto result = InterpreterFactory::get(query_ast, local_context)->execute().getInputStream()->read().rows();
-    if (result != 0)
+    auto pipeline = InterpreterFactory::get(query_ast, local_context)->execute().pipeline;
+    PullingPipelineExecutor executor(pipeline);
+    Block result;
+    executor.pull(result);
+    if (result.rows() != 0)
         LOG_INFO(log, "Partition {} piece number {} is PRESENT on shard {}", partition_quoted_name, std::to_string(current_piece_number), task_shard.getDescription());
     else
         LOG_INFO(log, "Partition {} piece number {} is ABSENT on shard {}", partition_quoted_name, std::to_string(current_piece_number), task_shard.getDescription());
-    return result != 0;
+    return result.rows() != 0;
 }
 
 
@@ -1961,7 +2000,7 @@ UInt64 ClusterCopier::executeQueryOnCluster(
                 }
                 catch (...)
                 {
-                    LOG_WARNING(log, "Seemns like node with address {} is unreachable.", node.host_name);
+                    LOG_WARNING(log, "Node with address {} seems to be unreachable.", node.host_name);
                     continue;
                 }
 
diff --git a/programs/copier/ClusterCopier.h b/programs/copier/ClusterCopier.h
index 387b089724a..b354fc59eee 100644
--- a/programs/copier/ClusterCopier.h
+++ b/programs/copier/ClusterCopier.h
@@ -65,6 +65,23 @@ public:
         experimental_use_sample_offset = value;
     }
 
+    void setMaxTableTries(UInt64 tries)
+    {
+        max_table_tries = tries;
+    }
+    void setMaxShardPartitionTries(UInt64 tries)
+    {
+        max_shard_partition_tries = tries;
+    }
+    void setMaxShardPartitionPieceTriesForAlter(UInt64 tries)
+    {
+        max_shard_partition_piece_tries_for_alter = tries;
+    }
+    void setRetryDelayMs(std::chrono::milliseconds ms)
+    {
+        retry_delay_ms = ms;
+    }
+
 protected:
 
     String getWorkersPath() const
@@ -123,10 +140,6 @@ protected:
     bool tryDropPartitionPiece(ShardPartition & task_partition, size_t current_piece_number,
             const zkutil::ZooKeeperPtr & zookeeper, const CleanStateClock & clean_state_clock);
 
-    static constexpr UInt64 max_table_tries = 3;
-    static constexpr UInt64 max_shard_partition_tries = 3;
-    static constexpr UInt64 max_shard_partition_piece_tries_for_alter = 10;
-
     bool tryProcessTable(const ConnectionTimeouts & timeouts, TaskTable & task_table);
 
     TaskStatus tryCreateDestinationTable(const ConnectionTimeouts & timeouts, TaskTable & task_table);
@@ -218,6 +231,9 @@ private:
 
     Poco::Logger * log;
 
-    std::chrono::milliseconds default_sleep_time{1000};
+    UInt64 max_table_tries = 3;
+    UInt64 max_shard_partition_tries = 3;
+    UInt64 max_shard_partition_piece_tries_for_alter = 10;
+    std::chrono::milliseconds retry_delay_ms{1000};
 };
 }
diff --git a/programs/copier/ClusterCopierApp.cpp b/programs/copier/ClusterCopierApp.cpp
index 69f2fd3383c..8d7e4abce51 100644
--- a/programs/copier/ClusterCopierApp.cpp
+++ b/programs/copier/ClusterCopierApp.cpp
@@ -3,7 +3,7 @@
 #include <Common/TerminalSize.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Formats/registerFormats.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <unistd.h>
 #include <filesystem>
 
@@ -31,6 +31,10 @@ void ClusterCopierApp::initialize(Poco::Util::Application & self)
         move_fault_probability = std::max(std::min(config().getDouble("move-fault-probability"), 1.0), 0.0);
     base_dir = (config().has("base-dir")) ? config().getString("base-dir") : fs::current_path().string();
 
+    max_table_tries = std::max<size_t>(config().getUInt("max-table-tries", 3), 1);
+    max_shard_partition_tries = std::max<size_t>(config().getUInt("max-shard-partition-tries", 3), 1);
+    max_shard_partition_piece_tries_for_alter = std::max<size_t>(config().getUInt("max-shard-partition-piece-tries-for-alter", 10), 1);
+    retry_delay_ms = std::chrono::milliseconds(std::max<size_t>(config().getUInt("retry-delay-ms", 1000), 100));
 
     if (config().has("experimental-use-sample-offset"))
         experimental_use_sample_offset = config().getBool("experimental-use-sample-offset");
@@ -100,6 +104,15 @@ void ClusterCopierApp::defineOptions(Poco::Util::OptionSet & options)
                           .argument("experimental-use-sample-offset").binding("experimental-use-sample-offset"));
     options.addOption(Poco::Util::Option("status", "", "Get for status for current execution").binding("status"));
 
+    options.addOption(Poco::Util::Option("max-table-tries", "", "Number of tries for the copy table task")
+                          .argument("max-table-tries").binding("max-table-tries"));
+    options.addOption(Poco::Util::Option("max-shard-partition-tries", "", "Number of tries for the copy one partition task")
+                          .argument("max-shard-partition-tries").binding("max-shard-partition-tries"));
+    options.addOption(Poco::Util::Option("max-shard-partition-piece-tries-for-alter", "", "Number of tries for final ALTER ATTACH to destination table")
+                          .argument("max-shard-partition-piece-tries-for-alter").binding("max-shard-partition-piece-tries-for-alter"));
+    options.addOption(Poco::Util::Option("retry-delay-ms", "", "Delay between task retries")
+                          .argument("retry-delay-ms").binding("retry-delay-ms"));
+
     using Me = std::decay_t<decltype(*this)>;
     options.addOption(Poco::Util::Option("help", "", "produce this help message").binding("help")
                           .callback(Poco::Util::OptionCallback<Me>(this, &Me::handleHelp)));
@@ -161,7 +174,10 @@ void ClusterCopierApp::mainImpl()
     copier->setSafeMode(is_safe_mode);
     copier->setCopyFaultProbability(copy_fault_probability);
     copier->setMoveFaultProbability(move_fault_probability);
-
+    copier->setMaxTableTries(max_table_tries);
+    copier->setMaxShardPartitionTries(max_shard_partition_tries);
+    copier->setMaxShardPartitionPieceTriesForAlter(max_shard_partition_piece_tries_for_alter);
+    copier->setRetryDelayMs(retry_delay_ms);
     copier->setExperimentalUseSampleOffset(experimental_use_sample_offset);
 
     auto task_file = config().getString("task-file", "");
diff --git a/programs/copier/ClusterCopierApp.h b/programs/copier/ClusterCopierApp.h
index cce07e338c0..d447cd96149 100644
--- a/programs/copier/ClusterCopierApp.h
+++ b/programs/copier/ClusterCopierApp.h
@@ -83,6 +83,11 @@ private:
     double move_fault_probability = 0.0;
     bool is_help = false;
 
+    UInt64 max_table_tries = 3;
+    UInt64 max_shard_partition_tries = 3;
+    UInt64 max_shard_partition_piece_tries_for_alter = 10;
+    std::chrono::milliseconds retry_delay_ms{1000};
+
     bool experimental_use_sample_offset{false};
 
     std::string base_dir;
diff --git a/programs/copier/Internals.cpp b/programs/copier/Internals.cpp
index bec612a8226..6fc69361c90 100644
--- a/programs/copier/Internals.cpp
+++ b/programs/copier/Internals.cpp
@@ -1,6 +1,8 @@
 #include "Internals.h"
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/extractKeyExpressionList.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Transforms/SquashingChunksTransform.h>
 
 namespace DB
 {
@@ -55,19 +57,22 @@ std::shared_ptr<ASTStorage> createASTStorageDistributed(
 }
 
 
-BlockInputStreamPtr squashStreamIntoOneBlock(const BlockInputStreamPtr & stream)
+Block getBlockWithAllStreamData(QueryPipeline pipeline)
 {
-    return std::make_shared<SquashingBlockInputStream>(
-            stream,
-            std::numeric_limits<size_t>::max(),
-            std::numeric_limits<size_t>::max());
-}
+    QueryPipelineBuilder builder;
+    builder.init(std::move(pipeline));
+    builder.addTransform(std::make_shared<SquashingChunksTransform>(
+        builder.getHeader(),
+        std::numeric_limits<size_t>::max(),
+        std::numeric_limits<size_t>::max()));
 
-Block getBlockWithAllStreamData(const BlockInputStreamPtr & stream)
-{
-    return squashStreamIntoOneBlock(stream)->read();
-}
+    auto cur_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+    Block block;
+    PullingPipelineExecutor executor(cur_pipeline);
+    executor.pull(block);
 
+    return block;
+}
 
 bool isExtendedDefinitionStorage(const ASTPtr & storage_ast)
 {
diff --git a/programs/copier/Internals.h b/programs/copier/Internals.h
index 9e40d7ebd7b..eb2622c6b26 100644
--- a/programs/copier/Internals.h
+++ b/programs/copier/Internals.h
@@ -13,12 +13,12 @@
 #include <Poco/SplitterChannel.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <boost/algorithm/string.hpp>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ThreadPool.h>
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/typeid_cast.h>
 #include <Common/ClickHouseRevision.h>
@@ -49,11 +49,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Formats/FormatSettings.h>
-#include <DataStreams/RemoteBlockInputStream.h>
-#include <DataStreams/SquashingBlockInputStream.h>
-#include <DataStreams/AsynchronousBlockInputStream.h>
-#include <DataStreams/copyData.h>
-#include <DataStreams/NullBlockOutputStream.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
@@ -165,10 +161,7 @@ std::shared_ptr<ASTStorage> createASTStorageDistributed(
         const String & cluster_name, const String & database, const String & table,
         const ASTPtr & sharding_key_ast = nullptr);
 
-
-BlockInputStreamPtr squashStreamIntoOneBlock(const BlockInputStreamPtr & stream);
-
-Block getBlockWithAllStreamData(const BlockInputStreamPtr & stream);
+Block getBlockWithAllStreamData(QueryPipeline pipeline);
 
 bool isExtendedDefinitionStorage(const ASTPtr & storage_ast);
 
diff --git a/programs/copier/TaskTableAndShard.h b/programs/copier/TaskTableAndShard.h
index 35170c134ff..16696a1bd23 100644
--- a/programs/copier/TaskTableAndShard.h
+++ b/programs/copier/TaskTableAndShard.h
@@ -6,7 +6,7 @@
 
 #include <Core/Defines.h>
 
-#include <common/map.h>
+#include <base/map.h>
 #include <boost/algorithm/string/join.hpp>
 
 
diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index 5bf19191353..4b0e8ad1ca1 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -25,6 +25,8 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/registerStorages.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <Formats/FormatFactory.h>
+#include <Formats/registerFormats.h>
 
 
 #pragma GCC diagnostic ignored "-Wunused-function"
@@ -44,6 +46,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
 
     boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
     desc.add_options()
+        ("query", po::value<std::string>(), "query to format")
         ("help,h", "produce help message")
         ("hilite", "add syntax highlight with ANSI terminal escape sequences")
         ("oneline", "format in single line")
@@ -86,8 +89,16 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
         }
 
         String query;
-        ReadBufferFromFileDescriptor in(STDIN_FILENO);
-        readStringUntilEOF(query, in);
+
+        if (options.count("query"))
+        {
+            query = options["query"].as<std::string>();
+        }
+        else
+        {
+            ReadBufferFromFileDescriptor in(STDIN_FILENO);
+            readStringUntilEOF(query, in);
+        }
 
         if (obfuscate)
         {
@@ -101,14 +112,11 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                 hash_func.update(options["seed"].as<std::string>());
             }
 
-            SharedContextHolder shared_context = Context::createShared();
-            auto context = Context::createGlobal(shared_context.get());
-            context->makeGlobalContext();
-
             registerFunctions();
             registerAggregateFunctions();
             registerTableFunctions();
             registerStorages();
+            registerFormats();
 
             std::unordered_set<std::string> additional_names;
 
@@ -122,9 +130,11 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
             {
                 std::string what(name);
 
-                return FunctionFactory::instance().tryGet(what, context) != nullptr
+                return FunctionFactory::instance().has(what)
                     || AggregateFunctionFactory::instance().isAggregateFunctionName(what)
                     || TableFunctionFactory::instance().isTableFunctionName(what)
+                    || FormatFactory::instance().isOutputFormat(what)
+                    || FormatFactory::instance().isInputFormat(what)
                     || additional_names.count(what);
             };
 
diff --git a/programs/git-import/git-import.cpp b/programs/git-import/git-import.cpp
index 7977cfba79d..749dcbfee5f 100644
--- a/programs/git-import/git-import.cpp
+++ b/programs/git-import/git-import.cpp
@@ -18,7 +18,7 @@
 #include <Common/SipHash.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ShellCommand.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 #include <IO/copyData.h>
 #include <IO/ReadHelpers.h>
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 8013b6cf991..606af7ecd0d 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -20,8 +20,8 @@
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Common/hex.h>
-#include <common/getResource.h>
-#include <common/sleep.h>
+#include <base/getResource.h>
+#include <base/sleep.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadBufferFromFile.h>
@@ -66,6 +66,7 @@ namespace ErrorCodes
     extern const int CANNOT_OPEN_FILE;
     extern const int SYSTEM_ERROR;
     extern const int NOT_ENOUGH_SPACE;
+    extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_KILL;
 }
 
@@ -75,8 +76,18 @@ namespace ErrorCodes
 #define HILITE "\033[1m"
 #define END_HILITE "\033[0m"
 
-static constexpr auto CLICKHOUSE_BRIDGE_USER = "clickhouse-bridge";
-static constexpr auto CLICKHOUSE_BRIDGE_GROUP = "clickhouse-bridge";
+#if defined(OS_DARWIN)
+/// Until createUser() and createGroup() are implemented, only sudo-less installations are supported/default for macOS.
+static constexpr auto DEFAULT_CLICKHOUSE_SERVER_USER = "";
+static constexpr auto DEFAULT_CLICKHOUSE_SERVER_GROUP = "";
+static constexpr auto DEFAULT_CLICKHOUSE_BRIDGE_USER = "";
+static constexpr auto DEFAULT_CLICKHOUSE_BRIDGE_GROUP = "";
+#else
+static constexpr auto DEFAULT_CLICKHOUSE_SERVER_USER = "clickhouse";
+static constexpr auto DEFAULT_CLICKHOUSE_SERVER_GROUP = "clickhouse";
+static constexpr auto DEFAULT_CLICKHOUSE_BRIDGE_USER = "clickhouse-bridge";
+static constexpr auto DEFAULT_CLICKHOUSE_BRIDGE_GROUP = "clickhouse-bridge";
+#endif
 
 using namespace DB;
 namespace po = boost::program_options;
@@ -127,36 +138,83 @@ static bool filesEqual(std::string path1, std::string path2)
         && 0 == memcmp(in1.buffer().begin(), in2.buffer().begin(), in1.buffer().size());
 }
 
+static void changeOwnership(const String & file_name, const String & user_name, const String & group_name = {}, bool recursive = true)
+{
+    if (!user_name.empty() || !group_name.empty())
+    {
+        std::string command = fmt::format("chown {} {}:{} '{}'", (recursive ? "-R" : ""), user_name, group_name, file_name);
+        fmt::print(" {}\n", command);
+        executeScript(command);
+    }
+}
+
+static void createGroup(const String & group_name)
+{
+    if (!group_name.empty())
+    {
+#if defined(OS_DARWIN)
+
+        // TODO: implement.
+
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unable to create a group in macOS");
+#else
+        std::string command = fmt::format("groupadd -r {}", group_name);
+        fmt::print(" {}\n", command);
+        executeScript(command);
+#endif
+    }
+}
+
+static void createUser(const String & user_name, [[maybe_unused]] const String & group_name)
+{
+    if (!user_name.empty())
+    {
+#if defined(OS_DARWIN)
+
+        // TODO: implement.
+
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unable to create a user in macOS");
+#else
+        std::string command = group_name.empty()
+            ? fmt::format("useradd -r --shell /bin/false --home-dir /nonexistent --user-group {}", user_name)
+            : fmt::format("useradd -r --shell /bin/false --home-dir /nonexistent -g {} {}", group_name, user_name);
+        fmt::print(" {}\n", command);
+        executeScript(command);
+#endif
+    }
+}
+
 
 int mainEntryClickHouseInstall(int argc, char ** argv)
 {
-    po::options_description desc;
-    desc.add_options()
-        ("help,h", "produce help message")
-        ("prefix", po::value<std::string>()->default_value(""), "prefix for all paths")
-        ("binary-path", po::value<std::string>()->default_value("/usr/bin"), "where to install binaries")
-        ("config-path", po::value<std::string>()->default_value("/etc/clickhouse-server"), "where to install configs")
-        ("log-path", po::value<std::string>()->default_value("/var/log/clickhouse-server"), "where to create log directory")
-        ("data-path", po::value<std::string>()->default_value("/var/lib/clickhouse"), "directory for data")
-        ("pid-path", po::value<std::string>()->default_value("/var/run/clickhouse-server"), "directory for pid file")
-        ("user", po::value<std::string>()->default_value("clickhouse"), "clickhouse user to create")
-        ("group", po::value<std::string>()->default_value("clickhouse"), "clickhouse group to create")
-    ;
-
-    po::variables_map options;
-    po::store(po::parse_command_line(argc, argv, desc), options);
-
-    if (options.count("help"))
-    {
-        std::cout << "Usage: "
-            << (getuid() == 0 ? "" : "sudo ")
-            << argv[0]
-            << " install [options]\n";
-        std::cout << desc << '\n';
-    }
-
     try
     {
+        po::options_description desc;
+        desc.add_options()
+            ("help,h", "produce help message")
+            ("prefix", po::value<std::string>()->default_value("/"), "prefix for all paths")
+            ("binary-path", po::value<std::string>()->default_value("usr/bin"), "where to install binaries")
+            ("config-path", po::value<std::string>()->default_value("etc/clickhouse-server"), "where to install configs")
+            ("log-path", po::value<std::string>()->default_value("var/log/clickhouse-server"), "where to create log directory")
+            ("data-path", po::value<std::string>()->default_value("var/lib/clickhouse"), "directory for data")
+            ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
+            ("user", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_USER), "clickhouse user to create")
+            ("group", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_GROUP), "clickhouse group to create")
+        ;
+
+        po::variables_map options;
+        po::store(po::parse_command_line(argc, argv, desc), options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: "
+                << (getuid() == 0 ? "" : "sudo ")
+                << argv[0]
+                << " install [options]\n";
+            std::cout << desc << '\n';
+            return 1;
+        }
+
         /// We need to copy binary to the binary directory.
         /// The binary is currently run. We need to obtain its path from procfs (on Linux).
 
@@ -171,6 +229,9 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         if (res != 0)
             Exception(ErrorCodes::FILE_DOESNT_EXIST, "Cannot obtain path to the binary");
 
+        if (path.back() == '\0')
+            path.pop_back();
+
         fs::path binary_self_path(path);
 #else
         fs::path binary_self_path = "/proc/self/exe";
@@ -186,8 +247,8 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         /// TODO An option to link instead of copy - useful for developers.
 
-        fs::path prefix = fs::path(options["prefix"].as<std::string>());
-        fs::path bin_dir = prefix / fs::path(options["binary-path"].as<std::string>());
+        fs::path prefix = options["prefix"].as<std::string>();
+        fs::path bin_dir = prefix / options["binary-path"].as<std::string>();
 
         fs::path main_bin_path = bin_dir / "clickhouse";
         fs::path main_bin_tmp_path = bin_dir / "clickhouse.new";
@@ -225,6 +286,12 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         }
         else
         {
+            if (!fs::exists(bin_dir))
+            {
+                fmt::print("Creating binary directory {}.\n", bin_dir.string());
+                fs::create_directories(bin_dir);
+            }
+
             size_t available_space = fs::space(bin_dir).available;
             if (available_space < binary_size)
                 throw Exception(ErrorCodes::NOT_ENOUGH_SPACE, "Not enough space for clickhouse binary in {}, required {}, available {}.",
@@ -326,34 +393,18 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         std::string user = options["user"].as<std::string>();
         std::string group = options["group"].as<std::string>();
 
-        auto create_group = [](const String & group_name)
-        {
-            std::string command = fmt::format("groupadd -r {}", group_name);
-            fmt::print(" {}\n", command);
-            executeScript(command);
-        };
-
         if (!group.empty())
         {
             fmt::print("Creating clickhouse group if it does not exist.\n");
-            create_group(group);
+            createGroup(group);
         }
         else
-            fmt::print("Will not create clickhouse group");
-
-        auto create_user = [](const String & user_name, const String & group_name)
-        {
-            std::string command = group_name.empty()
-                ? fmt::format("useradd -r --shell /bin/false --home-dir /nonexistent --user-group {}", user_name)
-                : fmt::format("useradd -r --shell /bin/false --home-dir /nonexistent -g {} {}", group_name, user_name);
-            fmt::print(" {}\n", command);
-            executeScript(command);
-        };
+            fmt::print("Will not create a dedicated clickhouse group.\n");
 
         if (!user.empty())
         {
             fmt::print("Creating clickhouse user if it does not exist.\n");
-            create_user(user, group);
+            createUser(user, group);
 
             if (group.empty())
                 group = user;
@@ -361,6 +412,11 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             /// Setting ulimits.
             try
             {
+#if defined(OS_DARWIN)
+
+                /// TODO Set ulimits on macOS.
+
+#else
                 fs::path ulimits_dir = "/etc/security/limits.d";
                 fs::path ulimits_file = ulimits_dir / fmt::format("{}.conf", user);
                 fmt::print("Will set ulimits for {} user in {}.\n", user, ulimits_file.string());
@@ -374,16 +430,15 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                 out.write(ulimits_content.data(), ulimits_content.size());
                 out.sync();
                 out.finalize();
+#endif
             }
             catch (...)
             {
                 std::cerr << "Cannot set ulimits: " << getCurrentExceptionMessage(false) << "\n";
             }
-
-            /// TODO Set ulimits on Mac OS X
         }
         else
-            fmt::print("Will not create clickhouse user.\n");
+            fmt::print("Will not create a dedicated clickhouse user.\n");
 
         /// Creating configuration files and directories.
 
@@ -400,9 +455,9 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         fs::path config_d = config_dir / "config.d";
         fs::path users_d = config_dir / "users.d";
 
-        std::string log_path = prefix / options["log-path"].as<std::string>();
-        std::string data_path = prefix / options["data-path"].as<std::string>();
-        std::string pid_path = prefix / options["pid-path"].as<std::string>();
+        fs::path log_path = prefix / options["log-path"].as<std::string>();
+        fs::path data_path = prefix / options["data-path"].as<std::string>();
+        fs::path pid_path = prefix / options["pid-path"].as<std::string>();
 
         bool has_password_for_default_user = false;
 
@@ -427,10 +482,78 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             }
             else
             {
-                WriteBufferFromFile out(main_config_file.string());
-                out.write(main_config_content.data(), main_config_content.size());
-                out.sync();
-                out.finalize();
+                {
+                    WriteBufferFromFile out(main_config_file.string());
+                    out.write(main_config_content.data(), main_config_content.size());
+                    out.sync();
+                    out.finalize();
+                }
+
+                /// Override the default paths.
+
+                /// Data paths.
+                {
+                    std::string data_file = config_d / "data-paths.xml";
+                    WriteBufferFromFile out(data_file);
+                    out << "<yandex>\n"
+                    "    <path>" << data_path.string() << "</path>\n"
+                    "    <tmp_path>" << (data_path / "tmp").string() << "</tmp_path>\n"
+                    "    <user_files_path>" << (data_path / "user_files").string() << "</user_files_path>\n"
+                    "    <format_schema_path>" << (data_path / "format_schemas").string() << "</format_schema_path>\n"
+                    "</yandex>\n";
+                    out.sync();
+                    out.finalize();
+                    fmt::print("Data path configuration override is saved to file {}.\n", data_file);
+                }
+
+                /// Logger.
+                {
+                    std::string logger_file = config_d / "logger.xml";
+                    WriteBufferFromFile out(logger_file);
+                    out << "<yandex>\n"
+                    "    <logger>\n"
+                    "        <log>" << (log_path / "clickhouse-server.log").string() << "</log>\n"
+                    "        <errorlog>" << (log_path / "clickhouse-server.err.log").string() << "</errorlog>\n"
+                    "    </logger>\n"
+                    "</yandex>\n";
+                    out.sync();
+                    out.finalize();
+                    fmt::print("Log path configuration override is saved to file {}.\n", logger_file);
+                }
+
+                /// User directories.
+                {
+                    std::string user_directories_file = config_d / "user-directories.xml";
+                    WriteBufferFromFile out(user_directories_file);
+                    out << "<yandex>\n"
+                    "    <user_directories>\n"
+                    "        <local_directory>\n"
+                    "            <path>" << (data_path / "access").string() << "</path>\n"
+                    "        </local_directory>\n"
+                    "    </user_directories>\n"
+                    "</yandex>\n";
+                    out.sync();
+                    out.finalize();
+                    fmt::print("User directory path configuration override is saved to file {}.\n", user_directories_file);
+                }
+
+                /// OpenSSL.
+                {
+                    std::string openssl_file = config_d / "openssl.xml";
+                    WriteBufferFromFile out(openssl_file);
+                    out << "<yandex>\n"
+                    "    <openSSL>\n"
+                    "        <server>\n"
+                    "            <certificateFile>" << (config_dir / "server.crt").string() << "</certificateFile>\n"
+                    "            <privateKeyFile>" << (config_dir / "server.key").string() << "</privateKeyFile>\n"
+                    "            <dhParamsFile>" << (config_dir / "dhparam.pem").string() << "</dhParamsFile>\n"
+                    "        </server>\n"
+                    "    </openSSL>\n"
+                    "</yandex>\n";
+                    out.sync();
+                    out.finalize();
+                    fmt::print("OpenSSL path configuration override is saved to file {}.\n", openssl_file);
+                }
             }
         }
         else
@@ -443,13 +566,13 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             if (configuration->has("path"))
             {
                 data_path = configuration->getString("path");
-                fmt::print("{} has {} as data path.\n", main_config_file.string(), data_path);
+                fmt::print("{} has {} as data path.\n", main_config_file.string(), data_path.string());
             }
 
             if (configuration->has("logger.log"))
             {
                 log_path = fs::path(configuration->getString("logger.log")).remove_filename();
-                fmt::print("{} has {} as log path.\n", main_config_file.string(), log_path);
+                fmt::print("{} has {} as log path.\n", main_config_file.string(), log_path.string());
             }
         }
 
@@ -485,82 +608,44 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             }
         }
 
-        auto change_ownership = [](const String & file_name, const String & user_name, const String & group_name)
-        {
-            std::string command = fmt::format("chown --recursive {}:{} '{}'", user_name, group_name, file_name);
-            fmt::print(" {}\n", command);
-            executeScript(command);
-        };
-
-        /// Chmod and chown configs
-        change_ownership(config_dir.string(), user, group);
-
-        /// Symlink "preprocessed_configs" is created by the server, so "write" is needed.
-        fs::permissions(config_dir, fs::perms::owner_all, fs::perm_options::replace);
-
-        /// Subdirectories, so "execute" is needed.
-        if (fs::exists(config_d))
-            fs::permissions(config_d, fs::perms::owner_read | fs::perms::owner_exec, fs::perm_options::replace);
-        if (fs::exists(users_d))
-            fs::permissions(users_d, fs::perms::owner_read | fs::perms::owner_exec, fs::perm_options::replace);
-
-        /// Readonly.
-        if (fs::exists(main_config_file))
-            fs::permissions(main_config_file, fs::perms::owner_read, fs::perm_options::replace);
-        if (fs::exists(users_config_file))
-            fs::permissions(users_config_file, fs::perms::owner_read, fs::perm_options::replace);
-
         /// Create directories for data and log.
 
         if (fs::exists(log_path))
         {
-            fmt::print("Log directory {} already exists.\n", log_path);
+            fmt::print("Log directory {} already exists.\n", log_path.string());
         }
         else
         {
-            fmt::print("Creating log directory {}.\n", log_path);
+            fmt::print("Creating log directory {}.\n", log_path.string());
             fs::create_directories(log_path);
         }
 
         if (fs::exists(data_path))
         {
-            fmt::print("Data directory {} already exists.\n", data_path);
+            fmt::print("Data directory {} already exists.\n", data_path.string());
         }
         else
         {
-            fmt::print("Creating data directory {}.\n", data_path);
+            fmt::print("Creating data directory {}.\n", data_path.string());
             fs::create_directories(data_path);
         }
 
         if (fs::exists(pid_path))
         {
-            fmt::print("Pid directory {} already exists.\n", pid_path);
+            fmt::print("Pid directory {} already exists.\n", pid_path.string());
         }
         else
         {
-            fmt::print("Creating pid directory {}.\n", pid_path);
+            fmt::print("Creating pid directory {}.\n", pid_path.string());
             fs::create_directories(pid_path);
         }
 
         /// Chmod and chown data and log directories
-        {
-            std::string command = fmt::format("chown --recursive {}:{} '{}'", user, group, log_path);
-            fmt::print(" {}\n", command);
-            executeScript(command);
-        }
+        changeOwnership(log_path, user, group);
+        changeOwnership(pid_path, user, group);
 
-        {
-            std::string command = fmt::format("chown --recursive {}:{} '{}'", user, group, pid_path);
-            fmt::print(" {}\n", command);
-            executeScript(command);
-        }
-
-        {
-            /// Not recursive, because there can be a huge number of files and it will be slow.
-            std::string command = fmt::format("chown {}:{} '{}'", user, group, data_path);
-            fmt::print(" {}\n", command);
-            executeScript(command);
-        }
+        /// Not recursive, because there can be a huge number of files and it will be slow.
+        changeOwnership(data_path, user, group, /* recursive= */ false);
 
         /// All users are allowed to read pid file (for clickhouse status command).
         fs::permissions(pid_path, fs::perms::owner_all | fs::perms::group_read | fs::perms::others_read, fs::perm_options::replace);
@@ -576,13 +661,13 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         if (fs::exists(odbc_bridge_path) || fs::exists(library_bridge_path))
         {
-            create_group(CLICKHOUSE_BRIDGE_GROUP);
-            create_user(CLICKHOUSE_BRIDGE_USER, CLICKHOUSE_BRIDGE_GROUP);
+            createGroup(DEFAULT_CLICKHOUSE_BRIDGE_GROUP);
+            createUser(DEFAULT_CLICKHOUSE_BRIDGE_USER, DEFAULT_CLICKHOUSE_BRIDGE_GROUP);
 
             if (fs::exists(odbc_bridge_path))
-                change_ownership(odbc_bridge_path, CLICKHOUSE_BRIDGE_USER, CLICKHOUSE_BRIDGE_GROUP);
+                changeOwnership(odbc_bridge_path, DEFAULT_CLICKHOUSE_BRIDGE_USER, DEFAULT_CLICKHOUSE_BRIDGE_GROUP);
             if (fs::exists(library_bridge_path))
-                change_ownership(library_bridge_path, CLICKHOUSE_BRIDGE_USER, CLICKHOUSE_BRIDGE_GROUP);
+                changeOwnership(library_bridge_path, DEFAULT_CLICKHOUSE_BRIDGE_USER, DEFAULT_CLICKHOUSE_BRIDGE_GROUP);
         }
 
         bool stdin_is_a_tty = isatty(STDIN_FILENO);
@@ -701,6 +786,25 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             }
         }
 
+        /// Chmod and chown configs
+        changeOwnership(config_dir, user, group);
+
+        /// Symlink "preprocessed_configs" is created by the server, so "write" is needed.
+        fs::permissions(config_dir, fs::perms::owner_all, fs::perm_options::replace);
+
+        /// Subdirectories, so "execute" is needed.
+        if (fs::exists(config_d))
+            fs::permissions(config_d, fs::perms::owner_read | fs::perms::owner_exec, fs::perm_options::replace);
+        if (fs::exists(users_d))
+            fs::permissions(users_d, fs::perms::owner_read | fs::perms::owner_exec, fs::perm_options::replace);
+
+        /// Readonly.
+        if (fs::exists(main_config_file))
+            fs::permissions(main_config_file, fs::perms::owner_read, fs::perm_options::replace);
+        if (fs::exists(users_config_file))
+            fs::permissions(users_config_file, fs::perms::owner_read, fs::perm_options::replace);
+
+
         std::string maybe_password;
         if (has_password_for_default_user)
             maybe_password = " --password";
@@ -766,11 +870,7 @@ namespace
             /// All users are allowed to read pid file (for clickhouse status command).
             fs::permissions(pid_path, fs::perms::owner_all | fs::perms::group_read | fs::perms::others_read, fs::perm_options::replace);
 
-            {
-                std::string command = fmt::format("chown --recursive {} '{}'", user, pid_path.string());
-                fmt::print(" {}\n", command);
-                executeScript(command);
-            }
+            changeOwnership(pid_path, user);
         }
 
         std::string command = fmt::format("{} --config-file {} --pid-file {} --daemon",
@@ -962,7 +1062,7 @@ namespace
             if (isRunning(pid_file))
             {
                 throw Exception(ErrorCodes::CANNOT_KILL,
-                    "The server process still exists after %zu ms",
+                    "The server process still exists after {} tries (delay: {} ms)",
                     num_kill_check_tries, kill_check_delay_ms);
             }
         }
@@ -974,34 +1074,36 @@ namespace
 
 int mainEntryClickHouseStart(int argc, char ** argv)
 {
-    po::options_description desc;
-    desc.add_options()
-        ("help,h", "produce help message")
-        ("binary-path", po::value<std::string>()->default_value("/usr/bin"), "directory with binary")
-        ("config-path", po::value<std::string>()->default_value("/etc/clickhouse-server"), "directory with configs")
-        ("pid-path", po::value<std::string>()->default_value("/var/run/clickhouse-server"), "directory for pid file")
-        ("user", po::value<std::string>()->default_value("clickhouse"), "clickhouse user")
-    ;
-
-    po::variables_map options;
-    po::store(po::parse_command_line(argc, argv, desc), options);
-
-    if (options.count("help"))
-    {
-        std::cout << "Usage: "
-            << (getuid() == 0 ? "" : "sudo ")
-            << argv[0]
-            << " start\n";
-        return 1;
-    }
-
     try
     {
+        po::options_description desc;
+        desc.add_options()
+            ("help,h", "produce help message")
+            ("prefix", po::value<std::string>()->default_value("/"), "prefix for all paths")
+            ("binary-path", po::value<std::string>()->default_value("usr/bin"), "directory with binary")
+            ("config-path", po::value<std::string>()->default_value("etc/clickhouse-server"), "directory with configs")
+            ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
+            ("user", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_USER), "clickhouse user")
+        ;
+
+        po::variables_map options;
+        po::store(po::parse_command_line(argc, argv, desc), options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: "
+                << (getuid() == 0 ? "" : "sudo ")
+                << argv[0]
+                << " start\n";
+            return 1;
+        }
+
         std::string user = options["user"].as<std::string>();
 
-        fs::path executable = fs::path(options["binary-path"].as<std::string>()) / "clickhouse-server";
-        fs::path config = fs::path(options["config-path"].as<std::string>()) / "config.xml";
-        fs::path pid_file = fs::path(options["pid-path"].as<std::string>()) / "clickhouse-server.pid";
+        fs::path prefix = options["prefix"].as<std::string>();
+        fs::path executable = prefix / options["binary-path"].as<std::string>() / "clickhouse-server";
+        fs::path config = prefix / options["config-path"].as<std::string>() / "config.xml";
+        fs::path pid_file = prefix / options["pid-path"].as<std::string>() / "clickhouse-server.pid";
 
         return start(user, executable, config, pid_file);
     }
@@ -1015,28 +1117,30 @@ int mainEntryClickHouseStart(int argc, char ** argv)
 
 int mainEntryClickHouseStop(int argc, char ** argv)
 {
-    po::options_description desc;
-    desc.add_options()
-        ("help,h", "produce help message")
-        ("pid-path", po::value<std::string>()->default_value("/var/run/clickhouse-server"), "directory for pid file")
-        ("force", po::bool_switch(), "Stop with KILL signal instead of TERM")
-    ;
-
-    po::variables_map options;
-    po::store(po::parse_command_line(argc, argv, desc), options);
-
-    if (options.count("help"))
-    {
-        std::cout << "Usage: "
-            << (getuid() == 0 ? "" : "sudo ")
-            << argv[0]
-            << " stop\n";
-        return 1;
-    }
-
     try
     {
-        fs::path pid_file = fs::path(options["pid-path"].as<std::string>()) / "clickhouse-server.pid";
+        po::options_description desc;
+        desc.add_options()
+            ("help,h", "produce help message")
+            ("prefix", po::value<std::string>()->default_value("/"), "prefix for all paths")
+            ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
+            ("force", po::bool_switch(), "Stop with KILL signal instead of TERM")
+        ;
+
+        po::variables_map options;
+        po::store(po::parse_command_line(argc, argv, desc), options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: "
+                << (getuid() == 0 ? "" : "sudo ")
+                << argv[0]
+                << " stop\n";
+            return 1;
+        }
+
+        fs::path prefix = options["prefix"].as<std::string>();
+        fs::path pid_file = prefix / options["pid-path"].as<std::string>() / "clickhouse-server.pid";
 
         return stop(pid_file, options["force"].as<bool>());
     }
@@ -1050,72 +1154,79 @@ int mainEntryClickHouseStop(int argc, char ** argv)
 
 int mainEntryClickHouseStatus(int argc, char ** argv)
 {
-    po::options_description desc;
-    desc.add_options()
-        ("help,h", "produce help message")
-        ("pid-path", po::value<std::string>()->default_value("/var/run/clickhouse-server"), "directory for pid file")
-    ;
-
-    po::variables_map options;
-    po::store(po::parse_command_line(argc, argv, desc), options);
-
-    if (options.count("help"))
-    {
-        std::cout << "Usage: "
-            << (getuid() == 0 ? "" : "sudo ")
-            << argv[0]
-            << " status\n";
-        return 1;
-    }
-
     try
     {
-        fs::path pid_file = fs::path(options["pid-path"].as<std::string>()) / "clickhouse-server.pid";
+        po::options_description desc;
+        desc.add_options()
+            ("help,h", "produce help message")
+            ("prefix", po::value<std::string>()->default_value("/"), "prefix for all paths")
+            ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
+        ;
+
+        po::variables_map options;
+        po::store(po::parse_command_line(argc, argv, desc), options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: "
+                << (getuid() == 0 ? "" : "sudo ")
+                << argv[0]
+                << " status\n";
+            return 1;
+        }
+
+        fs::path prefix = options["prefix"].as<std::string>();
+        fs::path pid_file = prefix / options["pid-path"].as<std::string>() / "clickhouse-server.pid";
+
         isRunning(pid_file);
-        return 0;
     }
     catch (...)
     {
         std::cerr << getCurrentExceptionMessage(false) << '\n';
         return getCurrentExceptionCode();
     }
+
+    return 0;
 }
 
 
 int mainEntryClickHouseRestart(int argc, char ** argv)
 {
-    po::options_description desc;
-    desc.add_options()
-        ("help,h", "produce help message")
-        ("binary-path", po::value<std::string>()->default_value("/usr/bin"), "directory with binary")
-        ("config-path", po::value<std::string>()->default_value("/etc/clickhouse-server"), "directory with configs")
-        ("pid-path", po::value<std::string>()->default_value("/var/run/clickhouse-server"), "directory for pid file")
-        ("user", po::value<std::string>()->default_value("clickhouse"), "clickhouse user")
-        ("force", po::value<bool>()->default_value(false), "Stop with KILL signal instead of TERM")
-    ;
-
-    po::variables_map options;
-    po::store(po::parse_command_line(argc, argv, desc), options);
-
-    if (options.count("help"))
-    {
-        std::cout << "Usage: "
-            << (getuid() == 0 ? "" : "sudo ")
-            << argv[0]
-            << " restart\n";
-        return 1;
-    }
-
     try
     {
+        po::options_description desc;
+        desc.add_options()
+            ("help,h", "produce help message")
+            ("prefix", po::value<std::string>()->default_value("/"), "prefix for all paths")
+            ("binary-path", po::value<std::string>()->default_value("usr/bin"), "directory with binary")
+            ("config-path", po::value<std::string>()->default_value("etc/clickhouse-server"), "directory with configs")
+            ("pid-path", po::value<std::string>()->default_value("var/run/clickhouse-server"), "directory for pid file")
+            ("user", po::value<std::string>()->default_value(DEFAULT_CLICKHOUSE_SERVER_USER), "clickhouse user")
+            ("force", po::value<bool>()->default_value(false), "Stop with KILL signal instead of TERM")
+        ;
+
+        po::variables_map options;
+        po::store(po::parse_command_line(argc, argv, desc), options);
+
+        if (options.count("help"))
+        {
+            std::cout << "Usage: "
+                << (getuid() == 0 ? "" : "sudo ")
+                << argv[0]
+                << " restart\n";
+            return 1;
+        }
+
         std::string user = options["user"].as<std::string>();
 
-        fs::path executable = fs::path(options["binary-path"].as<std::string>()) / "clickhouse-server";
-        fs::path config = fs::path(options["config-path"].as<std::string>()) / "config.xml";
-        fs::path pid_file = fs::path(options["pid-path"].as<std::string>()) / "clickhouse-server.pid";
+        fs::path prefix = options["prefix"].as<std::string>();
+        fs::path executable = prefix / options["binary-path"].as<std::string>() / "clickhouse-server";
+        fs::path config = prefix / options["config-path"].as<std::string>() / "config.xml";
+        fs::path pid_file = prefix / options["pid-path"].as<std::string>() / "clickhouse-server.pid";
 
         if (int res = stop(pid_file, options["force"].as<bool>()))
             return res;
+
         return start(user, executable, config, pid_file);
     }
     catch (...)
diff --git a/programs/keeper-converter/KeeperConverter.cpp b/programs/keeper-converter/KeeperConverter.cpp
index 15dbc8bd220..fcf117a4cff 100644
--- a/programs/keeper-converter/KeeperConverter.cpp
+++ b/programs/keeper-converter/KeeperConverter.cpp
@@ -8,7 +8,7 @@
 #include <Poco/ConsoleChannel.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 int mainEntryClickHouseKeeperConverter(int argc, char ** argv)
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 60695cbfeeb..6e001c57e75 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -1,24 +1,25 @@
 #include "Keeper.h"
 
-#include <sys/stat.h>
-#include <pwd.h>
 #include <Common/ClickHouseRevision.h>
-#include <Server/ProtocolServerAdapter.h>
+#include <Common/getMultipleKeysFromConfig.h>
 #include <Common/DNSResolver.h>
 #include <Interpreters/DNSCacheUpdater.h>
+#include <Coordination/Defines.h>
+#include <Common/Config/ConfigReloader.h>
+#include <filesystem>
+#include <IO/UseSSL.h>
+#include <Core/ServerUUID.h>
+#include <base/logger_useful.h>
+#include <base/ErrorHandlers.h>
+#include <base/scope_guard.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/TCPServerParams.h>
 #include <Poco/Net/TCPServer.h>
-#include <common/defines.h>
-#include <common/logger_useful.h>
-#include <common/ErrorHandlers.h>
-#include <common/scope_guard.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Version.h>
 #include <Poco/Environment.h>
-#include <Common/getMultipleKeysFromConfig.h>
-#include <filesystem>
-#include <IO/UseSSL.h>
+#include <sys/stat.h>
+#include <pwd.h>
 
 #if !defined(ARCADIA_BUILD)
 #   include "config_core.h"
@@ -30,6 +31,7 @@
 #    include <Poco/Net/SecureServerSocket.h>
 #endif
 
+#include <Server/ProtocolServerAdapter.h>
 #include <Server/KeeperTCPHandlerFactory.h>
 
 #if defined(OS_LINUX)
@@ -299,9 +301,9 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
     if (config().has("keeper_server.storage_path"))
         path = config().getString("keeper_server.storage_path");
     else if (config().has("keeper_server.log_storage_path"))
-        path = config().getString("keeper_server.log_storage_path");
+        path = std::filesystem::path(config().getString("keeper_server.log_storage_path")).parent_path();
     else if (config().has("keeper_server.snapshot_storage_path"))
-        path = config().getString("keeper_server.snapshot_storage_path");
+        path = std::filesystem::path(config().getString("keeper_server.snapshot_storage_path")).parent_path();
     else
         path = std::filesystem::path{KEEPER_DEFAULT_PATH};
 
@@ -326,8 +328,12 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
         }
     }
 
+    DB::ServerUUID::load(path + "/uuid", log);
+
     const Settings & settings = global_context->getSettingsRef();
 
+    std::string include_from_path = config().getString("include_from", "/etc/metrika.xml");
+
     GlobalThreadPool::initialize(config().getUInt("max_thread_pool_size", 100));
 
     static ServerErrorHandler error_handler;
@@ -355,8 +361,8 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
 
     auto servers = std::make_shared<std::vector<ProtocolServerAdapter>>();
 
-    /// Initialize test keeper RAFT. Do nothing if no nu_keeper_server in config.
-    global_context->initializeKeeperStorageDispatcher();
+    /// Initialize keeper RAFT. Do nothing if no keeper_server in config.
+    global_context->initializeKeeperDispatcher(/* start_async = */false);
     for (const auto & listen_host : listen_hosts)
     {
         /// TCP Keeper
@@ -399,8 +405,27 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
     for (auto & server : *servers)
         server.start();
 
+    zkutil::EventPtr unused_event = std::make_shared<Poco::Event>();
+    zkutil::ZooKeeperNodeCache unused_cache([] { return nullptr; });
+    /// ConfigReloader have to strict parameters which are redundant in our case
+    auto main_config_reloader = std::make_unique<ConfigReloader>(
+        config_path,
+        include_from_path,
+        config().getString("path", ""),
+        std::move(unused_cache),
+        unused_event,
+        [&](ConfigurationPtr config, bool /* initial_loading */)
+        {
+            if (config->has("keeper_server"))
+                global_context->updateKeeperConfiguration(*config);
+        },
+        /* already_loaded = */ false);  /// Reload it right now (initial loading)
+
     SCOPE_EXIT({
         LOG_INFO(log, "Shutting down.");
+        /// Stop reloading of the main config. This must be done before `global_context->shutdown()` because
+        /// otherwise the reloading may pass a changed config to some destroyed parts of ContextSharedPart.
+        main_config_reloader.reset();
 
         global_context->shutdown();
 
@@ -425,7 +450,7 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
         else
             LOG_INFO(log, "Closed connections to Keeper.");
 
-        global_context->shutdownKeeperStorageDispatcher();
+        global_context->shutdownKeeperDispatcher();
 
         /// Wait server pool to avoid use-after-free of destroyed context in the handlers
         server_pool.joinAll();
@@ -447,6 +472,7 @@ int Keeper::main(const std::vector<std::string> & /*args*/)
 
 
     buildLoggers(config(), logger());
+    main_config_reloader->start();
 
     LOG_INFO(log, "Ready for connections.");
 
diff --git a/programs/keeper/keeper_config.xml b/programs/keeper/keeper_config.xml
index ef218c9f2d7..02d5be70563 100644
--- a/programs/keeper/keeper_config.xml
+++ b/programs/keeper/keeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels [1]:
 
@@ -78,4 +78,4 @@
         </server>
     </openSSL>
 
-</yandex>
+</clickhouse>
diff --git a/programs/keeper/keeper_embedded.xml b/programs/keeper/keeper_embedded.xml
index 37edaedba80..9d08a3ce910 100644
--- a/programs/keeper/keeper_embedded.xml
+++ b/programs/keeper/keeper_embedded.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -18,4 +18,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/programs/library-bridge/HandlerFactory.h b/programs/library-bridge/HandlerFactory.h
index 93f0721bf01..021ca2132cc 100644
--- a/programs/library-bridge/HandlerFactory.h
+++ b/programs/library-bridge/HandlerFactory.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/programs/library-bridge/Handlers.cpp b/programs/library-bridge/Handlers.cpp
index 2b6d0057bb2..bf9ace679ba 100644
--- a/programs/library-bridge/Handlers.cpp
+++ b/programs/library-bridge/Handlers.cpp
@@ -1,7 +1,6 @@
 #include "Handlers.h"
 #include "SharedLibraryHandlerFactory.h"
 
-#include <DataStreams/copyData.h>
 #include <Formats/FormatFactory.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/WriteHelpers.h>
@@ -10,7 +9,13 @@
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/Net/HTMLForm.h>
 #include <Poco/ThreadPool.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <QueryPipeline/Pipe.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <IO/ReadBufferFromString.h>
 
@@ -63,6 +68,17 @@ namespace
 }
 
 
+static void writeData(Block data, OutputFormatPtr format)
+{
+    auto source = std::make_shared<SourceFromSingleChunk>(std::move(data));
+    QueryPipeline pipeline(std::move(source));
+    pipeline.complete(std::move(format));
+
+    CompletedPipelineExecutor executor(pipeline);
+    executor.execute();
+}
+
+
 void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response)
 {
     LOG_TRACE(log, "Request URI: {}", request.getURI());
@@ -173,9 +189,11 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             }
 
             ReadBufferFromString read_block_buf(params.get("null_values"));
-            auto format = FormatFactory::instance().getInput(FORMAT, read_block_buf, *sample_block, getContext(), DEFAULT_BLOCK_SIZE);
-            auto reader = std::make_shared<InputStreamFromInputFormat>(format);
-            auto sample_block_with_nulls = reader->read();
+            auto format = getContext()->getInputFormat(FORMAT, read_block_buf, *sample_block, DEFAULT_BLOCK_SIZE);
+            QueryPipeline pipeline(Pipe(std::move(format)));
+            PullingPipelineExecutor executor(pipeline);
+            Block sample_block_with_nulls;
+            executor.pull(sample_block_with_nulls);
 
             LOG_DEBUG(log, "Dictionary sample block with null values: {}", sample_block_with_nulls.dumpStructure());
 
@@ -221,8 +239,8 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             auto input = library_handler->loadAll();
 
             LOG_DEBUG(log, "Started sending result data for dictionary id: {}", dictionary_id);
-            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
-            copyData(*input, *output);
+            auto output = FormatFactory::instance().getOutputFormat(FORMAT, out, sample_block, getContext());
+            writeData(std::move(input), std::move(output));
         }
         else if (method == "loadIds")
         {
@@ -239,8 +257,8 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             auto input = library_handler->loadIds(ids);
 
             LOG_DEBUG(log, "Started sending result data for dictionary id: {}", dictionary_id);
-            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
-            copyData(*input, *output);
+            auto output = FormatFactory::instance().getOutputFormat(FORMAT, out, sample_block, getContext());
+            writeData(std::move(input), std::move(output));
         }
         else if (method == "loadKeys")
         {
@@ -265,9 +283,11 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             }
 
             auto & read_buf = request.getStream();
-            auto format = FormatFactory::instance().getInput(FORMAT, read_buf, *requested_sample_block, getContext(), DEFAULT_BLOCK_SIZE);
-            auto reader = std::make_shared<InputStreamFromInputFormat>(format);
-            auto block = reader->read();
+            auto format = getContext()->getInputFormat(FORMAT, read_buf, *requested_sample_block, DEFAULT_BLOCK_SIZE);
+            QueryPipeline pipeline(std::move(format));
+            PullingPipelineExecutor executor(pipeline);
+            Block block;
+            executor.pull(block);
 
             auto library_handler = SharedLibraryHandlerFactory::instance().get(dictionary_id);
             if (!library_handler)
@@ -278,8 +298,8 @@ void LibraryRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             auto input = library_handler->loadKeys(block.getColumns());
 
             LOG_DEBUG(log, "Started sending result data for dictionary id: {}", dictionary_id);
-            BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream(FORMAT, out, sample_block, getContext());
-            copyData(*input, *output);
+            auto output = FormatFactory::instance().getOutputFormat(FORMAT, out, sample_block, getContext());
+            writeData(std::move(input), std::move(output));
         }
     }
     catch (...)
diff --git a/programs/library-bridge/Handlers.h b/programs/library-bridge/Handlers.h
index 58af24b06d1..52c6e723ac5 100644
--- a/programs/library-bridge/Handlers.h
+++ b/programs/library-bridge/Handlers.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "SharedLibraryHandler.h"
 
 
diff --git a/programs/library-bridge/LibraryInterface.cpp b/programs/library-bridge/LibraryInterface.cpp
index 3975368c17f..998b47a0537 100644
--- a/programs/library-bridge/LibraryInterface.cpp
+++ b/programs/library-bridge/LibraryInterface.cpp
@@ -1,6 +1,6 @@
 #include "LibraryInterface.h"
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace
 {
diff --git a/programs/library-bridge/LibraryUtils.h b/programs/library-bridge/LibraryUtils.h
index 859b7e2633f..b2498df0031 100644
--- a/programs/library-bridge/LibraryUtils.h
+++ b/programs/library-bridge/LibraryUtils.h
@@ -2,8 +2,8 @@
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Core/Block.h>
-#include <common/bit_cast.h>
-#include <common/range.h>
+#include <base/bit_cast.h>
+#include <base/range.h>
 
 #include "LibraryInterface.h"
 
diff --git a/programs/library-bridge/SharedLibraryHandler.cpp b/programs/library-bridge/SharedLibraryHandler.cpp
index b31dcdee097..cfdba2c9eb8 100644
--- a/programs/library-bridge/SharedLibraryHandler.cpp
+++ b/programs/library-bridge/SharedLibraryHandler.cpp
@@ -1,8 +1,8 @@
 #include "SharedLibraryHandler.h"
 
-#include <common/scope_guard.h>
-#include <common/bit_cast.h>
-#include <common/find_symbols.h>
+#include <base/scope_guard.h>
+#include <base/bit_cast.h>
+#include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 
 
@@ -92,7 +92,7 @@ bool SharedLibraryHandler::supportsSelectiveLoad()
 }
 
 
-BlockInputStreamPtr SharedLibraryHandler::loadAll()
+Block SharedLibraryHandler::loadAll()
 {
     auto columns_holder = std::make_unique<ClickHouseLibrary::CString[]>(attributes_names.size());
     ClickHouseLibrary::CStrings columns{static_cast<decltype(ClickHouseLibrary::CStrings::data)>(columns_holder.get()), attributes_names.size()};
@@ -107,13 +107,11 @@ BlockInputStreamPtr SharedLibraryHandler::loadAll()
     SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
 
     ClickHouseLibrary::RawClickHouseLibraryTable data = load_all_func(data_ptr, &settings_holder->strings, &columns);
-    auto block = dataToBlock(data);
-
-    return std::make_shared<OneBlockInputStream>(block);
+    return dataToBlock(data);
 }
 
 
-BlockInputStreamPtr SharedLibraryHandler::loadIds(const std::vector<uint64_t> & ids)
+Block SharedLibraryHandler::loadIds(const std::vector<uint64_t> & ids)
 {
     const ClickHouseLibrary::VectorUInt64 ids_data{bit_cast<decltype(ClickHouseLibrary::VectorUInt64::data)>(ids.data()), ids.size()};
 
@@ -128,13 +126,11 @@ BlockInputStreamPtr SharedLibraryHandler::loadIds(const std::vector<uint64_t> &
     SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
 
     ClickHouseLibrary::RawClickHouseLibraryTable data = load_ids_func(data_ptr, &settings_holder->strings, &columns_pass, &ids_data);
-    auto block = dataToBlock(data);
-
-    return std::make_shared<OneBlockInputStream>(block);
+    return dataToBlock(data);
 }
 
 
-BlockInputStreamPtr SharedLibraryHandler::loadKeys(const Columns & key_columns)
+Block SharedLibraryHandler::loadKeys(const Columns & key_columns)
 {
     auto holder = std::make_unique<ClickHouseLibrary::Row[]>(key_columns.size());
     std::vector<std::unique_ptr<ClickHouseLibrary::Field[]>> column_data_holders;
@@ -171,9 +167,7 @@ BlockInputStreamPtr SharedLibraryHandler::loadKeys(const Columns & key_columns)
     SCOPE_EXIT(data_delete_func(lib_data, data_ptr));
 
     ClickHouseLibrary::RawClickHouseLibraryTable data = load_keys_func(data_ptr, &settings_holder->strings, &request_cols);
-    auto block = dataToBlock(data);
-
-    return std::make_shared<OneBlockInputStream>(block);
+    return dataToBlock(data);
 }
 
 
diff --git a/programs/library-bridge/SharedLibraryHandler.h b/programs/library-bridge/SharedLibraryHandler.h
index fa476995e32..de1d098dc8d 100644
--- a/programs/library-bridge/SharedLibraryHandler.h
+++ b/programs/library-bridge/SharedLibraryHandler.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <Common/SharedLibrary.h>
-#include <common/logger_useful.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <base/logger_useful.h>
 #include "LibraryUtils.h"
 
 
@@ -27,11 +26,11 @@ public:
 
     ~SharedLibraryHandler();
 
-    BlockInputStreamPtr loadAll();
+    Block loadAll();
 
-    BlockInputStreamPtr loadIds(const std::vector<uint64_t> & ids);
+    Block loadIds(const std::vector<uint64_t> & ids);
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns);
+    Block loadKeys(const Columns & key_columns);
 
     bool isModified();
 
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index e256338a538..2a2fe4a78c8 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -1,35 +1,33 @@
 #include "LocalServer.h"
 
 #include <Poco/Util/XMLConfiguration.h>
-#include <Poco/Util/HelpFormatter.h>
-#include <Poco/Util/OptionCallback.h>
 #include <Poco/String.h>
 #include <Poco/Logger.h>
 #include <Poco/NullChannel.h>
 #include <Databases/DatabaseMemory.h>
 #include <Storages/System/attachSystemTables.h>
+#include <Storages/System/attachInformationSchemaTables.h>
 #include <Interpreters/ProcessList.h>
-#include <Interpreters/executeQuery.h>
 #include <Interpreters/loadMetadata.h>
 #include <Interpreters/DatabaseCatalog.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/scope_guard_safe.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
+#include <Interpreters/Session.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
 #include <Common/Config/ConfigProcessor.h>
-#include <Common/escapeForFileName.h>
-#include <Common/ClickHouseRevision.h>
 #include <Common/ThreadStatus.h>
-#include <Common/UnicodeBar.h>
-#include <Common/config_version.h>
+#include <Common/TLDListsHolder.h>
 #include <Common/quoteString.h>
+#include <Common/randomSeed.h>
+#include <loggers/Loggers.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/UseSSL.h>
-#include <IO/ReadHelpers.h>
-#include <Parsers/parseQuery.h>
 #include <Parsers/IAST.h>
-#include <common/ErrorHandlers.h>
-#include <Common/StatusFile.h>
+#include <base/ErrorHandlers.h>
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <TableFunctions/registerTableFunctions.h>
@@ -38,32 +36,136 @@
 #include <Disks/registerDisks.h>
 #include <Formats/registerFormats.h>
 #include <boost/program_options/options_description.hpp>
-#include <boost/program_options.hpp>
-#include <common/argsToConfig.h>
-#include <Common/TerminalSize.h>
-#include <Common/randomSeed.h>
+#include <base/argsToConfig.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
 
+
 namespace DB
 {
 
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
-    extern const int SYNTAX_ERROR;
     extern const int CANNOT_LOAD_CONFIG;
     extern const int FILE_ALREADY_EXISTS;
 }
 
 
-LocalServer::LocalServer() = default;
-
-LocalServer::~LocalServer()
+void LocalServer::processError(const String &) const
 {
-    if (global_context)
-        global_context->shutdown(); /// required for properly exception handling
+    if (ignore_error)
+        return;
+
+    if (is_interactive)
+    {
+        String message;
+        if (server_exception)
+        {
+            message = getExceptionMessage(*server_exception, print_stack_trace, true);
+        }
+        else if (client_exception)
+        {
+            message = client_exception->message();
+        }
+
+        fmt::print(stderr, "Received exception:\n{}\n", message);
+        fmt::print(stderr, "\n");
+    }
+    else
+    {
+        if (server_exception)
+            server_exception->rethrow();
+        if (client_exception)
+            client_exception->rethrow();
+    }
+}
+
+
+bool LocalServer::executeMultiQuery(const String & all_queries_text)
+{
+    bool echo_query = echo_queries;
+
+    /// Several queries separated by ';'.
+    /// INSERT data is ended by the end of line, not ';'.
+    /// An exception is VALUES format where we also support semicolon in
+    /// addition to end of line.
+    const char * this_query_begin = all_queries_text.data();
+    const char * this_query_end;
+    const char * all_queries_end = all_queries_text.data() + all_queries_text.size();
+
+    String full_query; // full_query is the query + inline INSERT data + trailing comments (the latter is our best guess for now).
+    String query_to_execute;
+    ASTPtr parsed_query;
+    std::optional<Exception> current_exception;
+
+    while (true)
+    {
+        auto stage = analyzeMultiQueryText(this_query_begin, this_query_end, all_queries_end,
+                                           query_to_execute, parsed_query, all_queries_text, current_exception);
+        switch (stage)
+        {
+            case MultiQueryProcessingStage::QUERIES_END:
+            case MultiQueryProcessingStage::PARSING_FAILED:
+            {
+                return true;
+            }
+            case MultiQueryProcessingStage::CONTINUE_PARSING:
+            {
+                continue;
+            }
+            case MultiQueryProcessingStage::PARSING_EXCEPTION:
+            {
+                if (current_exception)
+                    current_exception->rethrow();
+                return true;
+            }
+            case MultiQueryProcessingStage::EXECUTE_QUERY:
+            {
+                full_query = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
+
+                try
+                {
+                    processParsedSingleQuery(full_query, query_to_execute, parsed_query, echo_query, false);
+                }
+                catch (...)
+                {
+                    if (!is_interactive && !ignore_error)
+                        throw;
+
+                    // Surprisingly, this is a client error. A server error would
+                    // have been reported w/o throwing (see onReceiveSeverException()).
+                    client_exception = std::make_unique<Exception>(getCurrentExceptionMessage(print_stack_trace), getCurrentExceptionCode());
+                    have_error = true;
+                }
+
+                // For INSERTs with inline data: use the end of inline data as
+                // reported by the format parser (it is saved in sendData()).
+                // This allows us to handle queries like:
+                //   insert into t values (1); select 1
+                // , where the inline data is delimited by semicolon and not by a
+                // newline.
+                auto * insert_ast = parsed_query->as<ASTInsertQuery>();
+                if (insert_ast && insert_ast->data)
+                {
+                    this_query_end = insert_ast->end;
+                    adjustQueryEnd(this_query_end, all_queries_end, global_context->getSettingsRef().max_parser_depth);
+                }
+
+                // Report error.
+                if (have_error)
+                    processError(full_query);
+
+                // Stop processing queries if needed.
+                if (have_error && !ignore_error)
+                    return is_interactive;
+
+                this_query_begin = this_query_end;
+                break;
+            }
+        }
+    }
 }
 
 
@@ -78,7 +180,6 @@ void LocalServer::initialize(Poco::Util::Application & self)
         ConfigProcessor config_processor(config_path, false, true);
         config_processor.setConfigPath(fs::path(config_path).parent_path());
         auto loaded_config = config_processor.loadConfig();
-        config_processor.savePreprocessedConfig(loaded_config, loaded_config.configuration->getString("path", "."));
         config().add(loaded_config.configuration.duplicate(), PRIO_DEFAULT, false);
     }
 
@@ -100,11 +201,20 @@ void LocalServer::initialize(Poco::Util::Application & self)
     }
 }
 
-void LocalServer::applyCmdSettings(ContextMutablePtr context)
+
+static DatabasePtr createMemoryDatabaseIfNotExists(ContextPtr context, const String & database_name)
 {
-    context->applySettingsChanges(cmd_settings.changes());
+    DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(database_name);
+    if (!system_database)
+    {
+        /// TODO: add attachTableDelayed into DatabaseMemory to speedup loading
+        system_database = std::make_shared<DatabaseMemory>(database_name, context);
+        DatabaseCatalog::instance().attachDatabase(database_name, system_database);
+    }
+    return system_database;
 }
 
+
 /// If path is specified and not empty, will try to setup server environment and load existing metadata
 void LocalServer::tryInitPath()
 {
@@ -138,7 +248,7 @@ void LocalServer::tryInitPath()
             parent_folder = std::filesystem::temp_directory_path();
 
         }
-        catch (const std::filesystem::filesystem_error& e)
+        catch (const fs::filesystem_error& e)
         {
             // tmp folder don't exists? misconfiguration? chroot?
             LOG_DEBUG(log, "Can not get temporary folder: {}", e.what());
@@ -174,59 +284,153 @@ void LocalServer::tryInitPath()
     global_context->setFlagsPath(path + "flags");
 
     global_context->setUserFilesPath(""); // user's files are everywhere
+
+    /// top_level_domains_lists
+    const std::string & top_level_domains_path = config().getString("top_level_domains_path", path + "top_level_domains/");
+    if (!top_level_domains_path.empty())
+        TLDListsHolder::getInstance().parseConfig(fs::path(top_level_domains_path) / "", config());
 }
 
 
-static void attachSystemTables(ContextPtr context)
+void LocalServer::cleanup()
 {
-    DatabasePtr system_database = DatabaseCatalog::instance().tryGetDatabase(DatabaseCatalog::SYSTEM_DATABASE);
-    if (!system_database)
+    try
     {
-        /// TODO: add attachTableDelayed into DatabaseMemory to speedup loading
-        system_database = std::make_shared<DatabaseMemory>(DatabaseCatalog::SYSTEM_DATABASE, context);
-        DatabaseCatalog::instance().attachDatabase(DatabaseCatalog::SYSTEM_DATABASE, system_database);
+        connection.reset();
+
+        if (global_context)
+        {
+            global_context->shutdown();
+            global_context.reset();
+        }
+
+        status.reset();
+
+        // Delete the temporary directory if needed.
+        if (temporary_directory_to_delete)
+        {
+            const auto dir = *temporary_directory_to_delete;
+            temporary_directory_to_delete.reset();
+            LOG_DEBUG(&logger(), "Removing temporary directory: {}", dir.string());
+            remove_all(dir);
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+
+std::string LocalServer::getInitialCreateTableQuery()
+{
+    if (!config().has("table-structure"))
+        return {};
+
+    auto table_name = backQuoteIfNeed(config().getString("table-name", "table"));
+    auto table_structure = config().getString("table-structure");
+    auto data_format = backQuoteIfNeed(config().getString("table-data-format", "TSV"));
+
+    String table_file;
+    if (!config().has("table-file") || config().getString("table-file") == "-")
+    {
+        /// Use Unix tools stdin naming convention
+        table_file = "stdin";
+    }
+    else
+    {
+        /// Use regular file
+        table_file = quoteString(config().getString("table-file"));
     }
 
-    attachSystemTablesLocal(*system_database);
+    return fmt::format("CREATE TABLE {} ({}) ENGINE = File({}, {});",
+                       table_name, table_structure, data_format, table_file);
+}
+
+
+static ConfigurationPtr getConfigurationFromXMLString(const char * xml_data)
+{
+    std::stringstream ss{std::string{xml_data}};    // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+    Poco::XML::InputSource input_source{ss};
+    return {new Poco::Util::XMLConfiguration{&input_source}};
+}
+
+
+void LocalServer::setupUsers()
+{
+    static const char * minimal_default_user_xml =
+        "<yandex>"
+        "    <profiles>"
+        "        <default></default>"
+        "    </profiles>"
+        "    <users>"
+        "        <default>"
+        "            <password></password>"
+        "            <networks>"
+        "                <ip>::/0</ip>"
+        "            </networks>"
+        "            <profile>default</profile>"
+        "            <quota>default</quota>"
+        "        </default>"
+        "    </users>"
+        "    <quotas>"
+        "        <default></default>"
+        "    </quotas>"
+        "</yandex>";
+
+    ConfigurationPtr users_config;
+
+    if (config().has("users_config") || config().has("config-file") || fs::exists("config.xml"))
+    {
+        const auto users_config_path = config().getString("users_config", config().getString("config-file", "config.xml"));
+        ConfigProcessor config_processor(users_config_path);
+        const auto loaded_config = config_processor.loadConfig();
+        users_config = loaded_config.configuration;
+    }
+    else
+    {
+        users_config = getConfigurationFromXMLString(minimal_default_user_xml);
+    }
+
+    if (users_config)
+        global_context->setUsersConfig(users_config);
+    else
+        throw Exception("Can't load config for users", ErrorCodes::CANNOT_LOAD_CONFIG);
+}
+
+
+String LocalServer::getQueryTextPrefix()
+{
+    return getInitialCreateTableQuery();
+}
+
+
+void LocalServer::connect()
+{
+    connection_parameters = ConnectionParameters(config());
+    connection = LocalConnection::createConnection(connection_parameters, global_context, need_render_progress);
 }
 
 
 int LocalServer::main(const std::vector<std::string> & /*args*/)
 try
 {
-    Poco::Logger * log = &logger();
-    ThreadStatus thread_status;
     UseSSL use_ssl;
+    ThreadStatus thread_status;
+    setupSignalHandler();
 
-    if (!config().has("query") && !config().has("table-structure") && !config().has("queries-file")) /// Nothing to process
+    std::cout << std::fixed << std::setprecision(3);
+    std::cerr << std::fixed << std::setprecision(3);
+
+    is_interactive = stdin_is_a_tty && !config().has("query") && !config().has("table-structure") && queries_files.empty();
+    if (!is_interactive)
     {
-        if (config().hasOption("verbose"))
-            std::cerr << "There are no queries to process." << '\n';
-
-        return Application::EXIT_OK;
+        /// We will terminate process on error
+        static KillingErrorHandler error_handler;
+        Poco::ErrorHandler::set(&error_handler);
     }
 
-    if (config().has("query") && config().has("queries-file"))
-    {
-        throw Exception("Specify either `query` or `queries-file` option", ErrorCodes::BAD_ARGUMENTS);
-    }
-
-    shared_context = Context::createShared();
-    global_context = Context::createGlobal(shared_context.get());
-    global_context->makeGlobalContext();
-    global_context->setApplicationType(Context::ApplicationType::LOCAL);
-    tryInitPath();
-
-    std::optional<StatusFile> status;
-
-    /// Skip temp path installation
-
-    /// We will terminate process on error
-    static KillingErrorHandler error_handler;
-    Poco::ErrorHandler::set(&error_handler);
-
     /// Don't initialize DateLUT
-
     registerFunctions();
     registerAggregateFunctions();
     registerTableFunctions();
@@ -235,11 +439,86 @@ try
     registerDisks();
     registerFormats();
 
+    processConfig();
+    applyCmdSettings(global_context);
+    connect();
+
+    if (is_interactive)
+    {
+        clearTerminal();
+        showClientVersion();
+        std::cerr << std::endl;
+
+        runInteractive();
+    }
+    else
+    {
+        runNonInteractive();
+    }
+
+    cleanup();
+    return Application::EXIT_OK;
+}
+catch (const DB::Exception & e)
+{
+    cleanup();
+
+    bool need_print_stack_trace = config().getBool("stacktrace", false);
+    std::cerr << getExceptionMessage(e, need_print_stack_trace, true) << std::endl;
+    return e.code() ? e.code() : -1;
+}
+catch (...)
+{
+    cleanup();
+
+    std::cerr << getCurrentExceptionMessage(false) << std::endl;
+    return getCurrentExceptionCode();
+}
+
+
+void LocalServer::processConfig()
+{
+    if (is_interactive)
+    {
+        if (config().has("query") && config().has("queries-file"))
+            throw Exception("Specify either `query` or `queries-file` option", ErrorCodes::BAD_ARGUMENTS);
+
+        if (config().has("multiquery"))
+            is_multiquery = true;
+
+        load_suggestions = true;
+    }
+    else
+    {
+        need_render_progress = config().getBool("progress", false);
+        echo_queries = config().hasOption("echo") || config().hasOption("verbose");
+        ignore_error = config().getBool("ignore-error", false);
+        is_multiquery = true;
+    }
+    print_stack_trace = config().getBool("stacktrace", false);
+
+    shared_context = Context::createShared();
+    global_context = Context::createGlobal(shared_context.get());
+
+    global_context->makeGlobalContext();
+    global_context->setApplicationType(Context::ApplicationType::LOCAL);
+
+    tryInitPath();
+
+    Poco::Logger * log = &logger();
+
     /// Maybe useless
     if (config().has("macros"))
         global_context->setMacros(std::make_unique<Macros>(config(), "macros", log));
 
-    /// Skip networking
+    format = config().getString("output-format", config().getString("format", is_interactive ? "PrettyCompact" : "TSV"));
+    insert_format = "Values";
+
+    /// Setting value from cmd arg overrides one from config
+    if (global_context->getSettingsRef().max_insert_block_size.changed)
+        insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
+    else
+        insert_format_max_block_size = config().getInt("insert_format_max_block_size", global_context->getSettingsRef().max_insert_block_size);
 
     /// Sets external authenticators config (LDAP, Kerberos).
     global_context->setExternalAuthenticatorsConfig(config());
@@ -261,6 +540,17 @@ try
     if (mark_cache_size)
         global_context->setMarkCache(mark_cache_size);
 
+    /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
+    size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
+    if (index_uncompressed_cache_size)
+        global_context->setIndexUncompressedCache(index_uncompressed_cache_size);
+
+    /// Size of cache for index marks (index of MergeTree skip indices). It is necessary.
+    /// Specify default value for index_mark_cache_size explicitly!
+    size_t index_mark_cache_size = config().getUInt64("index_mark_cache_size", 0);
+    if (index_mark_cache_size)
+        global_context->setIndexMarkCache(index_mark_cache_size);
+
     /// A cache for mmapped files.
     size_t mmap_cache_size = config().getUInt64("mmap_cache_size", 1000);   /// The choice of default is arbitrary.
     if (mmap_cache_size)
@@ -269,6 +559,9 @@ try
     /// Load global settings from default_profile and system_profile.
     global_context->setDefaultProfiles(config());
 
+    /// We load temporary database first, because projections need it.
+    DatabaseCatalog::instance().initializeAndLoadTemporaryDatabase();
+
     /** Init dummy default DB
       * NOTE: We force using isolated default database to avoid conflicts with default database from server environment
       * Otherwise, metadata of temporary File(format, EXPLICIT_PATH) tables will pollute metadata/ directory;
@@ -279,247 +572,57 @@ try
     global_context->setCurrentDatabase(default_database);
     applyCmdOptions(global_context);
 
+    bool enable_objects_loader = false;
+
     if (config().has("path"))
     {
         String path = global_context->getPath();
 
         /// Lock path directory before read
-        status.emplace(path + "status", StatusFile::write_full_info);
+        status.emplace(fs::path(path) / "status", StatusFile::write_full_info);
+
+        fs::create_directories(fs::path(path) / "user_defined/");
+        LOG_DEBUG(log, "Loading user defined objects from {}", path);
+        Poco::File(path + "user_defined/").createDirectories();
+        UserDefinedSQLObjectsLoader::instance().loadObjects(global_context);
+        enable_objects_loader = true;
+        LOG_DEBUG(log, "Loaded user defined objects.");
 
         LOG_DEBUG(log, "Loading metadata from {}", path);
         fs::create_directories(fs::path(path) / "data/");
         fs::create_directories(fs::path(path) / "metadata/");
+
         loadMetadataSystem(global_context);
-        attachSystemTables(global_context);
+        attachSystemTablesLocal(*createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::SYSTEM_DATABASE));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE));
         loadMetadata(global_context);
+        startupSystemTables();
         DatabaseCatalog::instance().loadDatabases();
+
         LOG_DEBUG(log, "Loaded metadata.");
     }
     else if (!config().has("no-system-tables"))
     {
-        attachSystemTables(global_context);
+        attachSystemTablesLocal(*createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::SYSTEM_DATABASE));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA));
+        attachInformationSchema(global_context, *createMemoryDatabaseIfNotExists(global_context, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE));
     }
 
-    processQueries();
+    /// Persist SQL user defined objects only if user_defined folder was created
+    UserDefinedSQLObjectsLoader::instance().enable(enable_objects_loader);
 
-    global_context->shutdown();
-    global_context.reset();
+    server_display_name = config().getString("display_name", getFQDNOrHostName());
+    prompt_by_server_display_name = config().getRawString("prompt_by_server_display_name.default", "{display_name} :) ");
+    std::map<String, String> prompt_substitutions{{"display_name", server_display_name}};
+    for (const auto & [key, value] : prompt_substitutions)
+        boost::replace_all(prompt_by_server_display_name, "{" + key + "}", value);
 
-    status.reset();
-    cleanup();
-
-    return Application::EXIT_OK;
-}
-catch (const Exception & e)
-{
-    try
-    {
-        cleanup();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-
-    std::cerr << getCurrentExceptionMessage(config().hasOption("stacktrace")) << '\n';
-
-    /// If exception code isn't zero, we should return non-zero return code anyway.
-    return e.code() ? e.code() : -1;
+    ClientInfo & client_info = global_context->getClientInfo();
+    client_info.setInitialQuery();
 }
 
 
-std::string LocalServer::getInitialCreateTableQuery()
-{
-    if (!config().has("table-structure"))
-        return {};
-
-    auto table_name = backQuoteIfNeed(config().getString("table-name", "table"));
-    auto table_structure = config().getString("table-structure");
-    auto data_format = backQuoteIfNeed(config().getString("table-data-format", "TSV"));
-    String table_file;
-    if (!config().has("table-file") || config().getString("table-file") == "-") /// Use Unix tools stdin naming convention
-        table_file = "stdin";
-    else /// Use regular file
-        table_file = quoteString(config().getString("table-file"));
-
-    return
-    "CREATE TABLE " + table_name +
-        " (" + table_structure + ") " +
-    "ENGINE = "
-        "File(" + data_format + ", " + table_file + ")"
-    "; ";
-}
-
-
-void LocalServer::processQueries()
-{
-    String initial_create_query = getInitialCreateTableQuery();
-    String queries_str = initial_create_query;
-
-    if (config().has("query"))
-        queries_str += config().getRawString("query");
-    else
-    {
-        String queries_from_file;
-        ReadBufferFromFile in(config().getString("queries-file"));
-        readStringUntilEOF(queries_from_file, in);
-        queries_str += queries_from_file;
-    }
-
-    const auto & settings = global_context->getSettingsRef();
-
-    std::vector<String> queries;
-    auto parse_res = splitMultipartQuery(queries_str, queries, settings.max_query_size, settings.max_parser_depth);
-
-    if (!parse_res.second)
-        throw Exception("Cannot parse and execute the following part of query: " + String(parse_res.first), ErrorCodes::SYNTAX_ERROR);
-
-    /// we can't mutate global global_context (can lead to races, as it was already passed to some background threads)
-    /// so we can't reuse it safely as a query context and need a copy here
-    auto context = Context::createCopy(global_context);
-
-    context->makeSessionContext();
-    context->makeQueryContext();
-
-    context->setUser("default", "", Poco::Net::SocketAddress{});
-    context->setCurrentQueryId("");
-    applyCmdSettings(context);
-
-    /// Use the same query_id (and thread group) for all queries
-    CurrentThread::QueryScope query_scope_holder(context);
-
-    /// Set progress show
-    need_render_progress = config().getBool("progress", false);
-
-    std::function<void()> finalize_progress;
-    if (need_render_progress)
-    {
-        /// Set progress callback, which can be run from multiple threads.
-        context->setProgressCallback([&](const Progress & value)
-        {
-            /// Write progress only if progress was updated
-            if (progress_indication.updateProgress(value))
-                progress_indication.writeProgress();
-        });
-
-        /// Set finalizing callback for progress, which is called right before finalizing query output.
-        finalize_progress = [&]()
-        {
-            progress_indication.clearProgressOutput();
-        };
-
-        /// Set callback for file processing progress.
-        progress_indication.setFileProgressCallback(context);
-    }
-
-    bool echo_queries = config().hasOption("echo") || config().hasOption("verbose");
-
-    std::exception_ptr exception;
-
-    for (const auto & query : queries)
-    {
-        written_first_block = false;
-        progress_indication.resetProgress();
-
-        ReadBufferFromString read_buf(query);
-        WriteBufferFromFileDescriptor write_buf(STDOUT_FILENO);
-
-        if (echo_queries)
-        {
-            writeString(query, write_buf);
-            writeChar('\n', write_buf);
-            write_buf.next();
-        }
-
-        try
-        {
-            executeQuery(read_buf, write_buf, /* allow_into_outfile = */ true, context, {}, {}, finalize_progress);
-        }
-        catch (...)
-        {
-            if (!config().hasOption("ignore-error"))
-                throw;
-
-            if (!exception)
-                exception = std::current_exception();
-
-            std::cerr << getCurrentExceptionMessage(config().hasOption("stacktrace")) << '\n';
-        }
-    }
-
-    if (exception)
-        std::rethrow_exception(exception);
-}
-
-static const char * minimal_default_user_xml =
-"<yandex>"
-"    <profiles>"
-"        <default></default>"
-"    </profiles>"
-"    <users>"
-"        <default>"
-"            <password></password>"
-"            <networks>"
-"                <ip>::/0</ip>"
-"            </networks>"
-"            <profile>default</profile>"
-"            <quota>default</quota>"
-"        </default>"
-"    </users>"
-"    <quotas>"
-"        <default></default>"
-"    </quotas>"
-"</yandex>";
-
-
-static ConfigurationPtr getConfigurationFromXMLString(const char * xml_data)
-{
-    std::stringstream ss{std::string{xml_data}};    // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    Poco::XML::InputSource input_source{ss};
-    return {new Poco::Util::XMLConfiguration{&input_source}};
-}
-
-
-void LocalServer::setupUsers()
-{
-    ConfigurationPtr users_config;
-
-    if (config().has("users_config") || config().has("config-file") || fs::exists("config.xml"))
-    {
-        const auto users_config_path = config().getString("users_config", config().getString("config-file", "config.xml"));
-        ConfigProcessor config_processor(users_config_path);
-        const auto loaded_config = config_processor.loadConfig();
-        config_processor.savePreprocessedConfig(loaded_config, config().getString("path", DBMS_DEFAULT_PATH));
-        users_config = loaded_config.configuration;
-    }
-    else
-    {
-        users_config = getConfigurationFromXMLString(minimal_default_user_xml);
-    }
-
-    if (users_config)
-        global_context->setUsersConfig(users_config);
-    else
-        throw Exception("Can't load config for users", ErrorCodes::CANNOT_LOAD_CONFIG);
-}
-
-void LocalServer::cleanup()
-{
-    // Delete the temporary directory if needed.
-    if (temporary_directory_to_delete)
-    {
-        const auto dir = *temporary_directory_to_delete;
-        temporary_directory_to_delete.reset();
-        LOG_DEBUG(&logger(), "Removing temporary directory: {}", dir.string());
-        remove_all(dir);
-    }
-}
-
-static void showClientVersion()
-{
-    std::cout << DBMS_NAME << " client version " << VERSION_STRING << VERSION_OFFICIAL << "." << '\n';
-}
-
 static std::string getHelpHeader()
 {
     return
@@ -535,6 +638,7 @@ static std::string getHelpHeader()
         "Either through corresponding command line parameters --table --structure --input-format and --file.";
 }
 
+
 static std::string getHelpFooter()
 {
     return
@@ -545,119 +649,79 @@ static std::string getHelpFooter()
             " BY mem_total DESC FORMAT PrettyCompact\"";
 }
 
-void LocalServer::init(int argc, char ** argv)
+
+void LocalServer::printHelpMessage(const OptionsDescription & options_description)
 {
-    namespace po = boost::program_options;
+    std::cout << getHelpHeader() << "\n";
+    std::cout << options_description.main_description.value() << "\n";
+    std::cout << getHelpFooter() << "\n";
+}
 
-    /// Don't parse options with Poco library, we prefer neat boost::program_options
-    stopOptionsProcessing();
 
-    po::options_description description = createOptionsDescription("Main options", getTerminalWidth());
-    description.add_options()
-        ("help", "produce help message")
-        ("config-file,c", po::value<std::string>(), "config-file path")
-        ("query,q", po::value<std::string>(), "query")
-        ("queries-file, qf", po::value<std::string>(), "file path with queries to execute")
+void LocalServer::addOptions(OptionsDescription & options_description)
+{
+    options_description.main_description->add_options()
         ("database,d", po::value<std::string>(), "database")
-
         ("table,N", po::value<std::string>(), "name of the initial table")
+
         /// If structure argument is omitted then initial query is not generated
         ("structure,S", po::value<std::string>(), "structure of the initial table (list of column and type names)")
         ("file,f", po::value<std::string>(), "path to file with data of the initial table (stdin if not specified)")
+
         ("input-format", po::value<std::string>(), "input format of the initial table data")
-        ("format,f", po::value<std::string>(), "default output format (clickhouse-client compatibility)")
         ("output-format", po::value<std::string>(), "default output format")
 
-        ("stacktrace", "print stack traces of exceptions")
-        ("echo", "print query before execution")
-        ("verbose", "print query and other debugging info")
         ("logger.console", po::value<bool>()->implicit_value(true), "Log to console")
         ("logger.log", po::value<std::string>(), "Log file name")
         ("logger.level", po::value<std::string>(), "Log level")
-        ("ignore-error", "do not stop processing if a query failed")
+
         ("no-system-tables", "do not attach system tables (better startup time)")
-        ("version,V", "print version information and exit")
-        ("progress", "print progress of queries execution")
+        ("path", po::value<std::string>(), "Storage path")
+        ("top_level_domains_path", po::value<std::string>(), "Path to lists with custom TLDs")
         ;
+}
 
-    cmd_settings.addProgramOptions(description);
 
-    /// Parse main commandline options.
-    po::parsed_options parsed = po::command_line_parser(argc, argv).options(description).run();
-    po::variables_map options;
-    po::store(parsed, options);
-    po::notify(options);
+void LocalServer::applyCmdSettings(ContextMutablePtr context)
+{
+    context->applySettingsChanges(cmd_settings.changes());
+}
 
-    if (options.count("version") || options.count("V"))
-    {
-        showClientVersion();
-        exit(0);
-    }
 
-    if (options.empty() || options.count("help"))
-    {
-        std::cout << getHelpHeader() << "\n";
-        std::cout << description << "\n";
-        std::cout << getHelpFooter() << "\n";
-        exit(0);
-    }
+void LocalServer::applyCmdOptions(ContextMutablePtr context)
+{
+    context->setDefaultFormat(config().getString("output-format", config().getString("format", is_interactive ? "PrettyCompact" : "TSV")));
+    applyCmdSettings(context);
+}
 
-    /// Save received data into the internal config.
-    if (options.count("config-file"))
-        config().setString("config-file", options["config-file"].as<std::string>());
-    if (options.count("query"))
-        config().setString("query", options["query"].as<std::string>());
-    if (options.count("queries-file"))
-        config().setString("queries-file", options["queries-file"].as<std::string>());
-    if (options.count("database"))
-        config().setString("default_database", options["database"].as<std::string>());
 
+void LocalServer::processOptions(const OptionsDescription &, const CommandLineOptions & options, const std::vector<Arguments> &)
+{
     if (options.count("table"))
         config().setString("table-name", options["table"].as<std::string>());
     if (options.count("file"))
         config().setString("table-file", options["file"].as<std::string>());
     if (options.count("structure"))
         config().setString("table-structure", options["structure"].as<std::string>());
+    if (options.count("no-system-tables"))
+        config().setBool("no-system-tables", true);
+
     if (options.count("input-format"))
         config().setString("table-data-format", options["input-format"].as<std::string>());
-    if (options.count("format"))
-        config().setString("format", options["format"].as<std::string>());
     if (options.count("output-format"))
         config().setString("output-format", options["output-format"].as<std::string>());
 
-    if (options.count("stacktrace"))
-        config().setBool("stacktrace", true);
-    if (options.count("progress"))
-        config().setBool("progress", true);
-    if (options.count("echo"))
-        config().setBool("echo", true);
-    if (options.count("verbose"))
-        config().setBool("verbose", true);
     if (options.count("logger.console"))
         config().setBool("logger.console", options["logger.console"].as<bool>());
     if (options.count("logger.log"))
         config().setString("logger.log", options["logger.log"].as<std::string>());
     if (options.count("logger.level"))
         config().setString("logger.level", options["logger.level"].as<std::string>());
-    if (options.count("ignore-error"))
-        config().setBool("ignore-error", true);
-    if (options.count("no-system-tables"))
-        config().setBool("no-system-tables", true);
-
-    std::vector<std::string> arguments;
-    for (int arg_num = 1; arg_num < argc; ++arg_num)
-        arguments.emplace_back(argv[arg_num]);
-    argsToConfig(arguments, config(), 100);
-}
-
-void LocalServer::applyCmdOptions(ContextMutablePtr context)
-{
-    context->setDefaultFormat(config().getString("output-format", config().getString("format", "TSV")));
-    applyCmdSettings(context);
 }
 
 }
 
+
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wmissing-declarations"
 
@@ -669,6 +733,17 @@ int mainEntryClickHouseLocal(int argc, char ** argv)
         app.init(argc, argv);
         return app.run();
     }
+    catch (const DB::Exception & e)
+    {
+        std::cerr << DB::getExceptionMessage(e, false) << std::endl;
+        auto code = DB::getCurrentExceptionCode();
+        return code ? code : 1;
+    }
+    catch (const boost::program_options::error & e)
+    {
+        std::cerr << "Bad arguments: " << e.what() << std::endl;
+        return DB::ErrorCodes::BAD_ARGUMENTS;
+    }
     catch (...)
     {
         std::cerr << DB::getCurrentExceptionMessage(true) << '\n';
diff --git a/programs/local/LocalServer.h b/programs/local/LocalServer.h
index e82caad7542..ce0df06c86a 100644
--- a/programs/local/LocalServer.h
+++ b/programs/local/LocalServer.h
@@ -1,13 +1,19 @@
 #pragma once
 
+#include <Client/ClientBase.h>
+#include <Client/LocalConnection.h>
+
+#include <Common/ProgressIndication.h>
+#include <Common/StatusFile.h>
+#include <Common/InterruptListener.h>
+#include <loggers/Loggers.h>
+#include <Core/Settings.h>
+#include <Interpreters/Context.h>
+
 #include <filesystem>
 #include <memory>
 #include <optional>
-#include <Core/Settings.h>
-#include <Interpreters/Context.h>
-#include <loggers/Loggers.h>
-#include <Poco/Util/Application.h>
-#include <Common/ProgressIndication.h>
+
 
 namespace DB
 {
@@ -15,18 +21,29 @@ namespace DB
 /// Lightweight Application for clickhouse-local
 /// No networking, no extra configs and working directories, no pid and status files, no dictionaries, no logging.
 /// Quiet mode by default
-class LocalServer : public Poco::Util::Application, public Loggers
+class LocalServer : public ClientBase, public Loggers
 {
 public:
-    LocalServer();
+    LocalServer() = default;
 
     void initialize(Poco::Util::Application & self) override;
 
-    int main(const std::vector<std::string> & args) override;
+    int main(const std::vector<String> & /*args*/) override;
 
-    void init(int argc, char ** argv);
+protected:
+    bool executeMultiQuery(const String & all_queries_text) override;
 
-    ~LocalServer() override;
+    void connect() override;
+    void processError(const String & query) const override;
+    String getName() const override { return "local"; }
+
+    String getQueryTextPrefix() override;
+    void printHelpMessage(const OptionsDescription & options_description) override;
+
+    void addOptions(OptionsDescription & options_description) override;
+    void processOptions(const OptionsDescription & options_description, const CommandLineOptions & options,
+                        const std::vector<Arguments> &) override;
+    void processConfig() override;
 
 private:
     /** Composes CREATE subquery based on passed arguments (--structure --file --table and --input-format)
@@ -36,26 +53,13 @@ private:
     std::string getInitialCreateTableQuery();
 
     void tryInitPath();
-    void applyCmdOptions(ContextMutablePtr context);
-    void applyCmdSettings(ContextMutablePtr context);
-    void processQueries();
     void setupUsers();
     void cleanup();
 
+    void applyCmdOptions(ContextMutablePtr context);
+    void applyCmdSettings(ContextMutablePtr context);
 
-protected:
-    SharedContextHolder shared_context;
-    ContextMutablePtr global_context;
-
-    /// Settings specified via command line args
-    Settings cmd_settings;
-
-    bool need_render_progress = false;
-
-    bool written_first_block = false;
-
-    ProgressIndication progress_indication;
-
+    std::optional<StatusFile> status;
     std::optional<std::filesystem::path> temporary_directory_to_delete;
 };
 
diff --git a/programs/main.cpp b/programs/main.cpp
index 7619f945f07..8c70dcacc99 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -21,8 +21,8 @@
 #include <Common/getHashOfLoadedBinary.h>
 #include <Common/IO.h>
 
-#include <common/phdr_cache.h>
-#include <common/scope_guard.h>
+#include <base/phdr_cache.h>
+#include <base/scope_guard.h>
 
 
 /// Universal executable for various clickhouse applications
@@ -62,6 +62,9 @@ int mainEntryClickHouseKeeper(int argc, char ** argv);
 #if ENABLE_CLICKHOUSE_KEEPER
 int mainEntryClickHouseKeeperConverter(int argc, char ** argv);
 #endif
+#if ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
+int mainEntryClickHouseStaticFilesDiskUploader(int argc, char ** argv);
+#endif
 #if ENABLE_CLICKHOUSE_INSTALL
 int mainEntryClickHouseInstall(int argc, char ** argv);
 int mainEntryClickHouseStart(int argc, char ** argv);
@@ -131,6 +134,9 @@ std::pair<const char *, MainFunc> clickhouse_applications[] =
     {"stop", mainEntryClickHouseStop},
     {"status", mainEntryClickHouseStatus},
     {"restart", mainEntryClickHouseRestart},
+#endif
+#if ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
+    {"static-files-disk-uploader", mainEntryClickHouseStaticFilesDiskUploader},
 #endif
     {"hash-binary", mainEntryClickHouseHashBinary},
 };
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index b1acc34ef93..caccc726923 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -15,7 +15,7 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeUUID.h>
 #include <Interpreters/Context.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/LimitTransform.h>
 #include <Common/SipHash.h>
 #include <Common/UTF8Helpers.h>
@@ -24,14 +24,14 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Formats/registerFormats.h>
-#include <Formats/FormatFactory.h>
 #include <Processors/Formats/IInputFormat.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Core/Block.h>
-#include <common/StringRef.h>
-#include <common/DateLUT.h>
-#include <common/bit_cast.h>
+#include <base/StringRef.h>
+#include <base/DateLUT.h>
+#include <base/bit_cast.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <memory>
@@ -1160,10 +1160,9 @@ try
         if (!silent)
             std::cerr << "Training models\n";
 
-        Pipe pipe(FormatFactory::instance().getInput(input_format, file_in, header, context, max_block_size));
+        Pipe pipe(context->getInputFormat(input_format, file_in, header, max_block_size));
 
-        QueryPipeline pipeline;
-        pipeline.init(std::move(pipe));
+        QueryPipeline pipeline(std::move(pipe));
         PullingPipelineExecutor executor(pipeline);
 
         Block block;
@@ -1190,7 +1189,7 @@ try
 
         file_in.seek(0, SEEK_SET);
 
-        Pipe pipe(FormatFactory::instance().getInput(input_format, file_in, header, context, max_block_size));
+        Pipe pipe(context->getInputFormat(input_format, file_in, header, max_block_size));
 
         if (processed_rows + source_rows > limit)
         {
@@ -1200,24 +1199,25 @@ try
             });
         }
 
-        QueryPipeline pipeline;
-        pipeline.init(std::move(pipe));
+        QueryPipeline in_pipeline(std::move(pipe));
 
-        BlockOutputStreamPtr output = context->getOutputStreamParallelIfPossible(output_format, file_out, header);
+        auto output = context->getOutputFormatParallelIfPossible(output_format, file_out, header);
+        QueryPipeline out_pipeline(std::move(output));
 
-        PullingPipelineExecutor executor(pipeline);
+        PullingPipelineExecutor in_executor(in_pipeline);
+        PushingPipelineExecutor out_executor(out_pipeline);
 
-        output->writePrefix();
         Block block;
-        while (executor.pull(block))
+        out_executor.start();
+        while (in_executor.pull(block))
         {
             Columns columns = obfuscator.generate(block.getColumns());
-            output->write(header.cloneWithColumns(columns));
+            out_executor.push(header.cloneWithColumns(columns));
             processed_rows += block.rows();
             if (!silent)
                 std::cerr << "Processed " << processed_rows << " rows\n";
         }
-        output->writeSuffix();
+        out_executor.finish();
 
         obfuscator.updateSeed();
     }
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 8ea1efe843a..8ceeddcd7ab 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -12,8 +12,8 @@
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/NumberParser.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Common/quoteString.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
diff --git a/programs/odbc-bridge/HandlerFactory.cpp b/programs/odbc-bridge/HandlerFactory.cpp
index 49984453d33..6a5ef89ab8b 100644
--- a/programs/odbc-bridge/HandlerFactory.cpp
+++ b/programs/odbc-bridge/HandlerFactory.cpp
@@ -3,7 +3,7 @@
 #include "ColumnInfoHandler.h"
 #include <Poco/URI.h>
 #include <Poco/Net/HTTPServerRequest.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index 1e57ae167c9..c7cad68f19e 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -10,8 +10,8 @@
 #include <Parsers/parseQuery.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
 #include "ODBCConnectionFactory.h"
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index 2f43cbd4ff2..82d1bd61c24 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -4,7 +4,6 @@
 #include "ODBCBlockInputStream.h"
 #include "ODBCBlockOutputStream.h"
 #include "getIdentifierQuote.h"
-#include <DataStreams/copyData.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Formats/FormatFactory.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
@@ -15,8 +14,10 @@
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/Net/HTMLForm.h>
 #include <Poco/ThreadPool.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
-#include <common/logger_useful.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <base/logger_useful.h>
 #include <Server/HTTP/HTMLForm.h>
 
 #include <mutex>
@@ -133,10 +134,15 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
             quoting_style = getQuotingStyle(connection_handler);
 #endif
             auto & read_buf = request.getStream();
-            auto input_format = FormatFactory::instance().getInput(format, read_buf, *sample_block, getContext(), max_block_size);
-            auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
-            ODBCBlockOutputStream output_stream(std::move(connection_handler), db_name, table_name, *sample_block, getContext(), quoting_style);
-            copyData(*input_stream, output_stream);
+            auto input_format = getContext()->getInputFormat(format, read_buf, *sample_block, max_block_size);
+            auto sink = std::make_shared<ODBCSink>(std::move(connection_handler), db_name, table_name, *sample_block, getContext(), quoting_style);
+
+            QueryPipeline pipeline(std::move(input_format));
+            pipeline.complete(std::move(sink));
+
+            CompletedPipelineExecutor executor(pipeline);
+            executor.execute();
+
             writeStringBinary("Ok.", out);
         }
         else
@@ -144,9 +150,14 @@ void ODBCHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
             std::string query = params.get("query");
             LOG_TRACE(log, "Query: {}", query);
 
-            BlockOutputStreamPtr writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, out, *sample_block, getContext());
-            ODBCBlockInputStream inp(std::move(connection_handler), query, *sample_block, max_block_size);
-            copyData(inp, *writer);
+            auto writer = FormatFactory::instance().getOutputFormatParallelIfPossible(format, out, *sample_block, getContext());
+            auto source = std::make_shared<ODBCSource>(std::move(connection_handler), query, *sample_block, max_block_size);
+
+            QueryPipeline pipeline(std::move(source));
+            pipeline.complete(std::move(writer));
+
+            CompletedPipelineExecutor executor(pipeline);
+            executor.execute();
         }
     }
     catch (...)
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCBlockInputStream.cpp
index e1935c62725..7278b62cfcb 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockInputStream.cpp
@@ -8,7 +8,7 @@
 #include <Common/assert_cast.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -19,9 +19,10 @@ namespace ErrorCodes
 }
 
 
-ODBCBlockInputStream::ODBCBlockInputStream(
+ODBCSource::ODBCSource(
     nanodbc::ConnectionHolderPtr connection_holder, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
-    : log(&Poco::Logger::get("ODBCBlockInputStream"))
+    : ISource(sample_block)
+    , log(&Poco::Logger::get("ODBCSource"))
     , max_block_size{max_block_size_}
     , query(query_str)
 {
@@ -31,10 +32,10 @@ ODBCBlockInputStream::ODBCBlockInputStream(
 }
 
 
-Block ODBCBlockInputStream::readImpl()
+Chunk ODBCSource::generate()
 {
-    if (finished)
-        return Block();
+    if (is_finished)
+        return {};
 
     MutableColumns columns(description.sample_block.cloneEmptyColumns());
     size_t num_rows = 0;
@@ -43,7 +44,7 @@ Block ODBCBlockInputStream::readImpl()
     {
         if (!result.next())
         {
-            finished = true;
+            is_finished = true;
             break;
         }
 
@@ -75,11 +76,11 @@ Block ODBCBlockInputStream::readImpl()
             break;
     }
 
-    return description.sample_block.cloneWithColumns(std::move(columns));
+    return Chunk(std::move(columns), num_rows);
 }
 
 
-void ODBCBlockInputStream::insertValue(
+void ODBCSource::insertValue(
         IColumn & column, const DataTypePtr data_type, const ValueType type, nanodbc::result & row, size_t idx)
 {
     switch (type)
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.h b/programs/odbc-bridge/ODBCBlockInputStream.h
index 26aa766dbcc..84d270e4713 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.h
+++ b/programs/odbc-bridge/ODBCBlockInputStream.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <Core/Block.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/ISource.h>
 #include <Core/ExternalResultDescription.h>
 #include "ODBCConnectionFactory.h"
 
@@ -10,22 +10,20 @@
 namespace DB
 {
 /// Allows processing results of a query to ODBC source as a sequence of Blocks, simplifies chaining
-class ODBCBlockInputStream final : public IBlockInputStream
+class ODBCSource final : public ISource
 {
 public:
-    ODBCBlockInputStream(nanodbc::ConnectionHolderPtr connection, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_);
+    ODBCSource(nanodbc::ConnectionHolderPtr connection, const std::string & query_str, const Block & sample_block, UInt64 max_block_size_);
 
     String getName() const override { return "ODBC"; }
 
-    Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
 private:
     using QueryResult = std::shared_ptr<nanodbc::result>;
     using ValueType = ExternalResultDescription::ValueType;
 
-    Block readImpl() override;
+    Chunk generate() override;
 
-    static void insertValue(IColumn & column, const DataTypePtr data_type, const ValueType type, nanodbc::result & row, size_t idx);
+    static void insertValue(IColumn & column, DataTypePtr data_type, ValueType type, nanodbc::result & row, size_t idx);
 
     static void insertDefaultValue(IColumn & column, const IColumn & sample_column)
     {
@@ -38,7 +36,7 @@ private:
 
     nanodbc::result result;
     String query;
-    bool finished = false;
+    bool is_finished = false;
 };
 
 }
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.cpp b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
index b4b514d1473..710614130c3 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.cpp
@@ -1,52 +1,30 @@
 #include "ODBCBlockOutputStream.h"
 
 #include <Common/hex.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Core/Field.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
-#include <Parsers/ASTInsertQuery.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
 #include "getIdentifierQuote.h"
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
-#include <Formats/FormatFactory.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Parsers/getInsertQuery.h>
 
 
 namespace DB
 {
 
-namespace
-{
-    using ValueType = ExternalResultDescription::ValueType;
 
-    std::string getInsertQuery(const std::string & db_name, const std::string & table_name, const ColumnsWithTypeAndName & columns, IdentifierQuotingStyle quoting)
-    {
-        ASTInsertQuery query;
-        query.table_id.database_name = db_name;
-        query.table_id.table_name = table_name;
-        query.columns = std::make_shared<ASTExpressionList>(',');
-        query.children.push_back(query.columns);
-        for (const auto & column : columns)
-            query.columns->children.emplace_back(std::make_shared<ASTIdentifier>(column.name));
-
-        WriteBufferFromOwnString buf;
-        IAST::FormatSettings settings(buf, true);
-        settings.always_quote_identifiers = true;
-        settings.identifier_quoting_style = quoting;
-        query.IAST::format(settings);
-        return buf.str();
-    }
-}
-
-ODBCBlockOutputStream::ODBCBlockOutputStream(nanodbc::ConnectionHolderPtr connection_holder_,
-                                             const std::string & remote_database_name_,
-                                             const std::string & remote_table_name_,
-                                             const Block & sample_block_,
-                                             ContextPtr local_context_,
-                                             IdentifierQuotingStyle quoting_)
-    : log(&Poco::Logger::get("ODBCBlockOutputStream"))
+ODBCSink::ODBCSink(
+    nanodbc::ConnectionHolderPtr connection_holder_,
+    const std::string & remote_database_name_,
+    const std::string & remote_table_name_,
+    const Block & sample_block_,
+    ContextPtr local_context_,
+    IdentifierQuotingStyle quoting_)
+    : ISink(sample_block_)
+    , log(&Poco::Logger::get("ODBCSink"))
     , connection_holder(std::move(connection_holder_))
     , db_name(remote_database_name_)
     , table_name(remote_table_name_)
@@ -57,15 +35,12 @@ ODBCBlockOutputStream::ODBCBlockOutputStream(nanodbc::ConnectionHolderPtr connec
     description.init(sample_block);
 }
 
-Block ODBCBlockOutputStream::getHeader() const
-{
-    return sample_block;
-}
 
-void ODBCBlockOutputStream::write(const Block & block)
+void ODBCSink::consume(Chunk chunk)
 {
+    auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
     WriteBufferFromOwnString values_buf;
-    auto writer = FormatFactory::instance().getOutputStream("Values", values_buf, sample_block, local_context);
+    auto writer = local_context->getOutputFormat("Values", values_buf, sample_block);
     writer->write(block);
 
     std::string query = getInsertQuery(db_name, table_name, block.getColumnsWithTypeAndName(), quoting) + values_buf.str();
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.h b/programs/odbc-bridge/ODBCBlockOutputStream.h
index 1b42119e490..2c57b8ee84f 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.h
+++ b/programs/odbc-bridge/ODBCBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <DataStreams/IBlockOutputStream.h>
+#include <Processors/ISink.h>
 #include <Core/ExternalResultDescription.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Interpreters/Context_fwd.h>
@@ -11,11 +11,12 @@
 namespace DB
 {
 
-class ODBCBlockOutputStream : public IBlockOutputStream
+class ODBCSink final : public ISink
 {
+using ValueType = ExternalResultDescription::ValueType;
 
 public:
-    ODBCBlockOutputStream(
+    ODBCSink(
             nanodbc::ConnectionHolderPtr connection_,
             const std::string & remote_database_name_,
             const std::string & remote_table_name_,
@@ -23,8 +24,10 @@ public:
             ContextPtr local_context_,
             IdentifierQuotingStyle quoting);
 
-    Block getHeader() const override;
-    void write(const Block & block) override;
+    String getName() const override { return "ODBCSink"; }
+
+protected:
+    void consume(Chunk chunk) override;
 
 private:
     Poco::Logger * log;
diff --git a/programs/odbc-bridge/ODBCConnectionFactory.h b/programs/odbc-bridge/ODBCConnectionFactory.h
index e1cdf1f09bb..13396206a46 100644
--- a/programs/odbc-bridge/ODBCConnectionFactory.h
+++ b/programs/odbc-bridge/ODBCConnectionFactory.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <nanodbc/nanodbc.h>
 #include <mutex>
-#include <common/BorrowedObjectPool.h>
+#include <base/BorrowedObjectPool.h>
 #include <unordered_map>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -28,8 +29,8 @@ class ConnectionHolder
 {
 public:
     ConnectionHolder(PoolPtr pool_,
-                     ConnectionPtr connection_,
-                     const String & connection_string_)
+                    ConnectionPtr connection_,
+                    const String & connection_string_)
         : pool(pool_)
         , connection(std::move(connection_))
         , connection_string(connection_string_)
@@ -57,7 +58,7 @@ public:
 private:
     PoolPtr pool;
     ConnectionPtr connection;
-    const String & connection_string;
+    String connection_string;
 };
 
 using ConnectionHolderPtr = std::shared_ptr<ConnectionHolder>;
@@ -80,8 +81,12 @@ T execute(nanodbc::ConnectionHolderPtr connection_holder, std::function<T(nanodb
     }
     catch (const nanodbc::database_error & e)
     {
-        /// SQLState, connection related errors start with 08S0.
-        if (e.state().starts_with("08S0"))
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        /// SQLState, connection related errors start with 08 (main: 08S01), cursor invalid state is 24000.
+        /// Invalid cursor state is a retriable error.
+        /// Invalid transaction state 25000. Truncate to 2 letters on purpose.
+        /// https://docs.microsoft.com/ru-ru/sql/odbc/reference/appendixes/appendix-a-odbc-error-codes?view=sql-server-ver15
+        if (e.state().starts_with("08") || e.state().starts_with("24") || e.state().starts_with("25"))
         {
             connection_holder->updateConnection();
             return query_func(connection_holder->get());
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.cpp b/programs/odbc-bridge/SchemaAllowedHandler.cpp
index 6ef6f03a137..7b526bd8041 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.cpp
+++ b/programs/odbc-bridge/SchemaAllowedHandler.cpp
@@ -7,7 +7,7 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "validateODBCConnectionString.h"
 #include "ODBCConnectionFactory.h"
 #include <sql.h>
diff --git a/programs/odbc-bridge/getIdentifierQuote.cpp b/programs/odbc-bridge/getIdentifierQuote.cpp
index eebb14eb245..d9361537db4 100644
--- a/programs/odbc-bridge/getIdentifierQuote.cpp
+++ b/programs/odbc-bridge/getIdentifierQuote.cpp
@@ -2,7 +2,7 @@
 
 #if USE_ODBC
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <sql.h>
 #include <sqlext.h>
 
diff --git a/programs/odbc-bridge/validateODBCConnectionString.cpp b/programs/odbc-bridge/validateODBCConnectionString.cpp
index a54021431ef..a87a8f58ede 100644
--- a/programs/odbc-bridge/validateODBCConnectionString.cpp
+++ b/programs/odbc-bridge/validateODBCConnectionString.cpp
@@ -2,7 +2,7 @@
 #include <cstring>
 #include <algorithm>
 #include <Poco/String.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include "validateODBCConnectionString.h"
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index 86bb04351b1..ce7d6973f68 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -14,14 +14,14 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Environment.h>
-#include <common/scope_guard.h>
-#include <common/defines.h>
-#include <common/logger_useful.h>
-#include <common/phdr_cache.h>
-#include <common/ErrorHandlers.h>
-#include <common/getMemoryAmount.h>
-#include <common/errnoToString.h>
-#include <common/coverage.h>
+#include <base/scope_guard_safe.h>
+#include <base/defines.h>
+#include <base/logger_useful.h>
+#include <base/phdr_cache.h>
+#include <base/ErrorHandlers.h>
+#include <base/getMemoryAmount.h>
+#include <base/errnoToString.h>
+#include <base/coverage.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/DNSResolver.h>
 #include <Common/CurrentMetrics.h>
@@ -30,7 +30,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperNodeCache.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/getExecutablePath.h>
@@ -39,29 +39,30 @@
 #include <Common/getMappedArea.h>
 #include <Common/remapExecutable.h>
 #include <Common/TLDListsHolder.h>
+#include <Core/ServerUUID.h>
 #include <IO/HTTPCommon.h>
 #include <IO/ReadHelpers.h>
 #include <IO/UseSSL.h>
 #include <Interpreters/AsynchronousMetrics.h>
 #include <Interpreters/DDLWorker.h>
+#include <Interpreters/DNSCacheUpdater.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/loadMetadata.h>
-#include <Interpreters/DatabaseCatalog.h>
-#include <Interpreters/DNSCacheUpdater.h>
-#include <Interpreters/ExternalLoaderXMLConfigRepository.h>
-#include <Interpreters/InterserverCredentials.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
 #include <Access/AccessControlManager.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/System/attachSystemTables.h>
+#include <Storages/System/attachInformationSchemaTables.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <Functions/registerFunctions.h>
 #include <TableFunctions/registerTableFunctions.h>
 #include <Formats/registerFormats.h>
 #include <Storages/registerStorages.h>
-#include <DataStreams/ConnectionCollector.h>
+#include <QueryPipeline/ConnectionCollector.h>
 #include <Dictionaries/registerDictionaries.h>
 #include <Disks/registerDisks.h>
 #include <Common/Config/ConfigReloader.h>
@@ -77,9 +78,10 @@
 #include <Server/PostgreSQLHandlerFactory.h>
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/HTTP/HTTPServer.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
+#include <Compression/CompressionCodecEncrypted.h>
 #include <filesystem>
 
-
 #if !defined(ARCADIA_BUILD)
 #   include "config_core.h"
 #   include "Common/config_version.h"
@@ -97,7 +99,7 @@
 #endif
 
 #if USE_SSL
-#    if USE_INTERNAL_SSL_LIBRARY
+#    if USE_INTERNAL_SSL_LIBRARY  && !defined(ARCADIA_BUILD)
 #        include <Compression/CompressionCodecEncrypted.h>
 #    endif
 #    include <Poco/Net/Context.h>
@@ -126,6 +128,7 @@ namespace CurrentMetrics
     extern const Metric VersionInteger;
     extern const Metric MemoryTracking;
     extern const Metric MaxDDLEntryID;
+    extern const Metric MaxPushedDDLEntryID;
 }
 
 namespace fs = std::filesystem;
@@ -145,7 +148,6 @@ static bool jemallocOptionEnabled(const char *name)
 static bool jemallocOptionEnabled(const char *) { return 0; }
 #endif
 
-
 int mainEntryClickHouseServer(int argc, char ** argv)
 {
     DB::Server app;
@@ -251,7 +253,6 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
-    extern const int INCORRECT_DATA;
     extern const int INVALID_CONFIG_PARAMETER;
     extern const int SYSTEM_ERROR;
     extern const int FAILED_TO_GETPWUID;
@@ -342,7 +343,7 @@ Poco::Net::SocketAddress Server::socketBindListen(Poco::Net::ServerSocket & sock
         LOG_DEBUG(&logger(), "Requested any available port (port == 0), actual port is {:d}", address.port());
     }
 
-    socket.listen(/* backlog = */ config().getUInt("listen_backlog", 64));
+    socket.listen(/* backlog = */ config().getUInt("listen_backlog", 4096));
 
     return address;
 }
@@ -357,6 +358,7 @@ void Server::createServer(const std::string & listen_host, const char * port_nam
     try
     {
         func(port);
+        global_context->registerServerPort(port_name, port);
     }
     catch (const Poco::Exception &)
     {
@@ -455,40 +457,6 @@ void checkForUsersNotInMainConfig(
     }
 }
 
-static void loadEncryptionKey(const std::string & key_command [[maybe_unused]], Poco::Logger * log)
-{
-#if USE_BASE64 && USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
-    auto process = ShellCommand::execute(key_command);
-
-    std::string b64_key;
-    readStringUntilEOF(b64_key, process->out);
-    process->wait();
-
-    // turbob64 doesn't like whitespace characters in input. Strip
-    // them before decoding.
-    std::erase_if(b64_key, [](char c)
-    {
-        return c == ' ' || c == '\t' || c == '\r' || c == '\n';
-    });
-
-    std::vector<char> buf(b64_key.size());
-    const size_t key_size = tb64dec(reinterpret_cast<const unsigned char *>(b64_key.data()), b64_key.size(),
-                                    reinterpret_cast<unsigned char *>(buf.data()));
-    if (!key_size)
-        throw Exception("Failed to decode encryption key", ErrorCodes::INCORRECT_DATA);
-    else if (key_size < 16)
-        LOG_WARNING(log, "The encryption key should be at least 16 octets long.");
-
-    const std::string_view key = std::string_view(buf.data(), key_size);
-    CompressionCodecEncrypted::setMasterKey(key);
-
-#else
-    LOG_WARNING(log, "Server was built without Base64 or SSL support. Encryption is disabled.");
-#endif
-}
-
-
 [[noreturn]] void forceShutdown()
 {
 #if defined(THREAD_SANITIZER) && defined(OS_LINUX)
@@ -666,13 +634,14 @@ if (ThreadFuzzer::instance().isEffective())
 
     global_context->setRemoteHostFilter(config());
 
-    std::string path = getCanonicalPath(config().getString("path", DBMS_DEFAULT_PATH));
+    std::string path_str = getCanonicalPath(config().getString("path", DBMS_DEFAULT_PATH));
+    fs::path path = path_str;
     std::string default_database = config().getString("default_database", "default");
 
     /// Check that the process user id matches the owner of the data.
     const auto effective_user_id = geteuid();
     struct stat statbuf;
-    if (stat(path.c_str(), &statbuf) == 0 && effective_user_id != statbuf.st_uid)
+    if (stat(path_str.c_str(), &statbuf) == 0 && effective_user_id != statbuf.st_uid)
     {
         const auto effective_user = getUserName(effective_user_id);
         const auto data_owner = getUserName(statbuf.st_uid);
@@ -689,9 +658,11 @@ if (ThreadFuzzer::instance().isEffective())
         }
     }
 
-    global_context->setPath(path);
+    global_context->setPath(path_str);
 
-    StatusFile status{path + "status", StatusFile::write_full_info};
+    StatusFile status{path / "status", StatusFile::write_full_info};
+
+    DB::ServerUUID::load(path / "uuid", log);
 
     /// Try to increase limit on number of open files.
     {
@@ -725,19 +696,23 @@ if (ThreadFuzzer::instance().isEffective())
 
     /// Storage with temporary data for processing of heavy queries.
     {
-        std::string tmp_path = config().getString("tmp_path", path + "tmp/");
+        std::string tmp_path = config().getString("tmp_path", path / "tmp/");
         std::string tmp_policy = config().getString("tmp_policy", "");
         const VolumePtr & volume = global_context->setTemporaryStorage(tmp_path, tmp_policy);
         for (const DiskPtr & disk : volume->getDisks())
             setupTmpPath(log, disk->getPath());
     }
 
+    /// Storage keeping all the backups.
+    fs::create_directories(path / "backups");
+    global_context->setBackupsVolume(config().getString("backups_path", path / "backups"), config().getString("backups_policy", ""));
+
     /** Directory with 'flags': files indicating temporary settings for the server set by system administrator.
       * Flags may be cleared automatically after being applied by the server.
       * Examples: do repair of local data; clone all replicated tables from replica.
       */
     {
-        auto flags_path = fs::path(path) / "flags/";
+        auto flags_path = path / "flags/";
         fs::create_directories(flags_path);
         global_context->setFlagsPath(flags_path);
     }
@@ -746,29 +721,36 @@ if (ThreadFuzzer::instance().isEffective())
       */
     {
 
-        std::string user_files_path = config().getString("user_files_path", fs::path(path) / "user_files/");
+        std::string user_files_path = config().getString("user_files_path", path / "user_files/");
         global_context->setUserFilesPath(user_files_path);
         fs::create_directories(user_files_path);
     }
 
     {
-        std::string dictionaries_lib_path = config().getString("dictionaries_lib_path", fs::path(path) / "dictionaries_lib/");
+        std::string dictionaries_lib_path = config().getString("dictionaries_lib_path", path / "dictionaries_lib/");
         global_context->setDictionariesLibPath(dictionaries_lib_path);
         fs::create_directories(dictionaries_lib_path);
     }
 
+    {
+        std::string user_scripts_path = config().getString("user_scripts_path", path / "user_scripts/");
+        global_context->setUserScriptsPath(user_scripts_path);
+        fs::create_directories(user_scripts_path);
+    }
+
     /// top_level_domains_lists
     {
-        const std::string & top_level_domains_path = config().getString("top_level_domains_path", fs::path(path) / "top_level_domains/");
+        const std::string & top_level_domains_path = config().getString("top_level_domains_path", path / "top_level_domains/");
         TLDListsHolder::getInstance().parseConfig(fs::path(top_level_domains_path) / "", config());
     }
 
     {
-        fs::create_directories(fs::path(path) / "data/");
-        fs::create_directories(fs::path(path) / "metadata/");
+        fs::create_directories(path / "data/");
+        fs::create_directories(path / "metadata/");
+        fs::create_directories(path / "user_defined/");
 
         /// Directory with metadata of tables, which was marked as dropped by Atomic database
-        fs::create_directories(fs::path(path) / "metadata_dropped/");
+        fs::create_directories(path / "metadata_dropped/");
     }
 
     if (config().has("interserver_http_port") && config().has("interserver_https_port"))
@@ -862,11 +844,14 @@ if (ThreadFuzzer::instance().isEffective())
             // FIXME logging-related things need synchronization -- see the 'Logger * log' saved
             // in a lot of places. For now, disable updating log configuration without server restart.
             //setTextLog(global_context->getTextLog());
-            //buildLoggers(*config, logger());
+            updateLevels(*config, logger());
             global_context->setClustersConfig(config);
             global_context->setMacros(std::make_unique<Macros>(*config, "macros", log));
             global_context->setExternalAuthenticatorsConfig(*config);
-            global_context->setExternalModelsConfig(config);
+
+            global_context->loadOrReloadDictionaries(*config);
+            global_context->loadOrReloadModels(*config);
+            global_context->loadOrReloadUserDefinedExecutableFunctions(*config);
 
             /// Setup protection to avoid accidental DROP for big tables (that are greater than 50 GB by default)
             if (config->has("max_table_size_to_drop"))
@@ -875,6 +860,12 @@ if (ThreadFuzzer::instance().isEffective())
             if (config->has("max_partition_size_to_drop"))
                 global_context->setMaxPartitionSizeToDrop(config->getUInt64("max_partition_size_to_drop"));
 
+            if (config->has("max_concurrent_queries"))
+                global_context->getProcessList().setMaxSize(config->getInt("max_concurrent_queries", 0));
+
+            if (config->has("keeper_server"))
+                global_context->updateKeeperConfiguration(*config);
+
             if (!initial_loading)
             {
                 /// We do not load ZooKeeper configuration on the first config loading
@@ -887,6 +878,8 @@ if (ThreadFuzzer::instance().isEffective())
 
             global_context->updateStorageConfiguration(*config);
             global_context->updateInterserverCredentials(*config);
+
+            CompressionCodecEncrypted::Configuration::instance().tryLoad(*config, "encryption_codecs");
         },
         /* already_loaded = */ false);  /// Reload it right now (initial loading)
 
@@ -927,6 +920,17 @@ if (ThreadFuzzer::instance().isEffective())
     global_context->setDefaultProfiles(config());
     const Settings & settings = global_context->getSettingsRef();
 
+    /// Initialize background executors after we load default_profile config.
+    /// This is needed to load proper values of background_pool_size etc.
+    global_context->initializeBackgroundExecutorsIfNeeded();
+
+    if (settings.async_insert_threads)
+        global_context->setAsynchronousInsertQueue(std::make_shared<AsynchronousInsertQueue>(
+            global_context,
+            settings.async_insert_threads,
+            settings.async_insert_max_data_size,
+            AsynchronousInsertQueue::Timeout{.busy = settings.async_insert_busy_timeout_ms, .stale = settings.async_insert_stale_timeout_ms}));
+
     /// Size of cache for marks (index of MergeTree family of tables). It is mandatory.
     size_t mark_cache_size = config().getUInt64("mark_cache_size");
     if (!mark_cache_size)
@@ -939,19 +943,35 @@ if (ThreadFuzzer::instance().isEffective())
     }
     global_context->setMarkCache(mark_cache_size);
 
+    /// Size of cache for uncompressed blocks of MergeTree indices. Zero means disabled.
+    size_t index_uncompressed_cache_size = config().getUInt64("index_uncompressed_cache_size", 0);
+    if (index_uncompressed_cache_size)
+        global_context->setIndexUncompressedCache(index_uncompressed_cache_size);
+
+    /// Size of cache for index marks (index of MergeTree skip indices). It is necessary.
+    /// Specify default value for index_mark_cache_size explicitly!
+    size_t index_mark_cache_size = config().getUInt64("index_mark_cache_size", 0);
+    if (index_mark_cache_size)
+        global_context->setIndexMarkCache(index_mark_cache_size);
+
     /// A cache for mmapped files.
     size_t mmap_cache_size = config().getUInt64("mmap_cache_size", 1000);   /// The choice of default is arbitrary.
     if (mmap_cache_size)
         global_context->setMMappedFileCache(mmap_cache_size);
 
 #if USE_EMBEDDED_COMPILER
-    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 1024;
+    /// 128 MB
+    constexpr size_t compiled_expression_cache_size_default = 1024 * 1024 * 128;
     size_t compiled_expression_cache_size = config().getUInt64("compiled_expression_cache_size", compiled_expression_cache_size_default);
-    CompiledExpressionCacheFactory::instance().init(compiled_expression_cache_size);
+
+    constexpr size_t compiled_expression_cache_elements_size_default = 10000;
+    size_t compiled_expression_cache_elements_size = config().getUInt64("compiled_expression_cache_elements_size", compiled_expression_cache_elements_size_default);
+
+    CompiledExpressionCacheFactory::instance().init(compiled_expression_cache_size, compiled_expression_cache_elements_size);
 #endif
 
     /// Set path for format schema files
-    fs::path format_schema_path(config().getString("format_schema_path", fs::path(path) / "format_schemas/"));
+    fs::path format_schema_path(config().getString("format_schema_path", path / "format_schemas/"));
     global_context->setFormatSchemaPath(format_schema_path);
     fs::create_directories(format_schema_path);
 
@@ -959,9 +979,9 @@ if (ThreadFuzzer::instance().isEffective())
     global_context->getMergeTreeSettings().sanityCheck(settings);
     global_context->getReplicatedMergeTreeSettings().sanityCheck(settings);
 
-    /// Set up encryption.
-    if (config().has("encryption.key_command"))
-        loadEncryptionKey(config().getString("encryption.key_command"), log);
+
+    /// try set up encryption. There are some errors in config, error will be printed and server wouldn't start.
+    CompressionCodecEncrypted::Configuration::instance().load(config(), "encryption_codecs");
 
     Poco::Timespan keep_alive_timeout(config().getUInt("keep_alive_timeout", 10), 0);
 
@@ -985,8 +1005,19 @@ if (ThreadFuzzer::instance().isEffective())
     if (config().has("keeper_server"))
     {
 #if USE_NURAFT
-        /// Initialize test keeper RAFT. Do nothing if no nu_keeper_server in config.
-        global_context->initializeKeeperStorageDispatcher();
+        //// If we don't have configured connection probably someone trying to use clickhouse-server instead
+        //// of clickhouse-keeper, so start synchronously.
+        bool can_initialize_keeper_async = false;
+
+        if (has_zookeeper) /// We have configured connection to some zookeeper cluster
+        {
+            /// If we cannot connect to some other node from our cluster then we have to wait our Keeper start
+            /// synchronously.
+            can_initialize_keeper_async = global_context->tryCheckClientConnectionToMyKeeperCluster();
+        }
+        /// Initialize keeper RAFT.
+        global_context->initializeKeeperDispatcher(can_initialize_keeper_async);
+
         for (const auto & listen_host : listen_hosts)
         {
             /// TCP Keeper
@@ -1035,6 +1066,10 @@ if (ThreadFuzzer::instance().isEffective())
         server.start();
 
     SCOPE_EXIT({
+        /// Stop reloading of the main config. This must be done before `global_context->shutdown()` because
+        /// otherwise the reloading may pass a changed config to some destroyed parts of ContextSharedPart.
+        main_config_reloader.reset();
+
         /** Ask to cancel background jobs all table engines,
           *  and also query_log.
           * It is important to do early, not in destructor of Context, because
@@ -1069,7 +1104,7 @@ if (ThreadFuzzer::instance().isEffective())
             else
                 LOG_INFO(log, "Closed connections to servers for tables.");
 
-            global_context->shutdownKeeperStorageDispatcher();
+            global_context->shutdownKeeperDispatcher();
         }
 
         /// Wait server pool to avoid use-after-free of destroyed context in the handlers
@@ -1087,21 +1122,40 @@ if (ThreadFuzzer::instance().isEffective())
     /// system logs may copy global context.
     global_context->setCurrentDatabaseNameInGlobalContext(default_database);
 
-    LOG_INFO(log, "Loading metadata from {}", path);
+    LOG_INFO(log, "Loading user defined objects from {}", path_str);
+    try
+    {
+        UserDefinedSQLObjectsLoader::instance().loadObjects(global_context);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Caught exception while loading user defined objects");
+        throw;
+    }
+    LOG_DEBUG(log, "Loaded user defined objects");
+
+    LOG_INFO(log, "Loading metadata from {}", path_str);
 
     try
     {
+        auto & database_catalog = DatabaseCatalog::instance();
+        /// We load temporary database first, because projections need it.
+        database_catalog.initializeAndLoadTemporaryDatabase();
         loadMetadataSystem(global_context);
         /// After attaching system databases we can initialize system log.
         global_context->initializeSystemLogs();
         global_context->setSystemZooKeeperLogAfterInitializationIfNeeded();
-        auto & database_catalog = DatabaseCatalog::instance();
         /// After the system database is created, attach virtual system tables (in addition to query_log and part_log)
         attachSystemTablesServer(*database_catalog.getSystemDatabase(), has_zookeeper);
-        /// We load temporary database first, because projections need it.
-        database_catalog.initializeAndLoadTemporaryDatabase();
+        attachInformationSchema(global_context, *database_catalog.getDatabase(DatabaseCatalog::INFORMATION_SCHEMA));
+        attachInformationSchema(global_context, *database_catalog.getDatabase(DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE));
+        /// Firstly remove partially dropped databases, to avoid race with MaterializedMySQLSyncThread,
+        /// that may execute DROP before loadMarkedAsDroppedTables() in background,
+        /// and so loadMarkedAsDroppedTables() will find it and try to add, and UUID will overlap.
+        database_catalog.loadMarkedAsDroppedTables();
         /// Then, load remaining databases
         loadMetadata(global_context, default_database);
+        startupSystemTables();
         database_catalog.loadDatabases();
         /// After loading validate that default database exists
         database_catalog.assertDatabaseExists(default_database);
@@ -1115,18 +1169,7 @@ if (ThreadFuzzer::instance().isEffective())
 
     /// Init trace collector only after trace_log system table was created
     /// Disable it if we collect test coverage information, because it will work extremely slow.
-    ///
-    /// It also cannot work with sanitizers.
-    /// Sanitizers are using quick "frame walking" stack unwinding (this implies -fno-omit-frame-pointer)
-    /// And they do unwinding frequently (on every malloc/free, thread/mutex operations, etc).
-    /// They change %rbp during unwinding and it confuses libunwind if signal comes during sanitizer unwinding
-    ///  and query profiler decide to unwind stack with libunwind at this moment.
-    ///
-    /// Symptoms: you'll get silent Segmentation Fault - without sanitizer message and without usual ClickHouse diagnostics.
-    ///
-    /// Look at compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h
-    ///
-#if USE_UNWIND && !WITH_COVERAGE && !defined(SANITIZER) && defined(__x86_64__)
+#if USE_UNWIND && !WITH_COVERAGE && defined(__x86_64__)
     /// Profilers cannot work reliably with any other libunwind or without PHDR cache.
     if (hasPHDRCache())
     {
@@ -1136,7 +1179,6 @@ if (ThreadFuzzer::instance().isEffective())
         UInt64 total_memory_profiler_step = config().getUInt64("total_memory_profiler_step", 0);
         if (total_memory_profiler_step)
         {
-            total_memory_tracker.setOrRaiseProfilerLimit(total_memory_profiler_step);
             total_memory_tracker.setProfilerStep(total_memory_profiler_step);
         }
 
@@ -1159,7 +1201,7 @@ if (ThreadFuzzer::instance().isEffective())
 #endif
 
 #if defined(SANITIZER)
-    LOG_INFO(log, "Query Profiler and TraceCollector are disabled because they cannot work under sanitizers"
+    LOG_INFO(log, "Query Profiler disabled because they cannot work under sanitizers"
         " when two different stack unwinding methods will interfere with each other.");
 #endif
 
@@ -1427,7 +1469,6 @@ if (ThreadFuzzer::instance().isEffective())
 
         /// Must be done after initialization of `servers`, because async_metrics will access `servers` variable from its thread.
         async_metrics.start();
-        global_context->enableNamedSessions();
 
         {
             String level_str = config().getString("text_log.level", "");
@@ -1452,11 +1493,44 @@ if (ThreadFuzzer::instance().isEffective())
         /// try to load dictionaries immediately, throw on error and die
         try
         {
-            global_context->loadDictionaries(config());
+            global_context->loadOrReloadDictionaries(config());
         }
         catch (...)
         {
-            LOG_ERROR(log, "Caught exception while loading dictionaries.");
+            tryLogCurrentException(log, "Caught exception while loading dictionaries.");
+            throw;
+        }
+
+        /// try to load embedded dictionaries immediately, throw on error and die
+        try
+        {
+            global_context->tryCreateEmbeddedDictionaries(config());
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Caught exception while loading embedded dictionaries.");
+            throw;
+        }
+
+        /// try to load models immediately, throw on error and die
+        try
+        {
+            global_context->loadOrReloadModels(config());
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Caught exception while loading dictionaries.");
+            throw;
+        }
+
+        /// try to load user defined executable functions, throw on error and die
+        try
+        {
+            global_context->loadOrReloadUserDefinedExecutableFunctions(config());
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Caught exception while loading user defined executable functions.");
             throw;
         }
 
@@ -1468,14 +1542,15 @@ if (ThreadFuzzer::instance().isEffective())
             if (pool_size < 1)
                 throw Exception("distributed_ddl.pool_size should be greater then 0", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
             global_context->setDDLWorker(std::make_unique<DDLWorker>(pool_size, ddl_zookeeper_path, global_context, &config(),
-                                                                     "distributed_ddl", "DDLWorker", &CurrentMetrics::MaxDDLEntryID));
+                                                                     "distributed_ddl", "DDLWorker",
+                                                                     &CurrentMetrics::MaxDDLEntryID, &CurrentMetrics::MaxPushedDDLEntryID));
         }
 
         for (auto & server : *servers)
             server.start();
         LOG_INFO(log, "Ready for connections.");
 
-        SCOPE_EXIT({
+        SCOPE_EXIT_SAFE({
             LOG_DEBUG(log, "Received termination signal.");
             LOG_DEBUG(log, "Waiting for current connections to close.");
 
@@ -1494,7 +1569,8 @@ if (ThreadFuzzer::instance().isEffective())
                 LOG_INFO(log, "Closed all listening sockets.");
 
             /// Killing remaining queries.
-            global_context->getProcessList().killAllQueries();
+            if (!config().getBool("shutdown_wait_unfinished_queries", false))
+                global_context->getProcessList().killAllQueries();
 
             if (current_connections)
                 current_connections = waitServersToFinish(*servers, config().getInt("shutdown_wait_unfinished", 5));
@@ -1506,7 +1582,6 @@ if (ThreadFuzzer::instance().isEffective())
                 LOG_INFO(log, "Closed connections.");
 
             dns_cache_updater.reset();
-            main_config_reloader.reset();
 
             if (current_connections)
             {
diff --git a/programs/server/clickhouse-server.cpp b/programs/server/clickhouse-server.cpp
index 58fa37990de..f49dc21d9fe 100644
--- a/programs/server/clickhouse-server.cpp
+++ b/programs/server/clickhouse-server.cpp
@@ -1,6 +1,6 @@
 #include <new>
 
-#include <common/phdr_cache.h>
+#include <base/phdr_cache.h>
 
 
 int mainEntryClickHouseServer(int argc, char ** argv);
diff --git a/programs/server/config.d/access_control.xml b/programs/server/config.d/access_control.xml
index 6567c39f171..0fa795e6e49 100644
--- a/programs/server/config.d/access_control.xml
+++ b/programs/server/config.d/access_control.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
     <user_directories replace="replace">
         <users_xml>
@@ -10,4 +10,4 @@
             <path>access/</path>
         </local_directory>
     </user_directories>
-</yandex>
+</clickhouse>
diff --git a/programs/server/config.d/log_to_console.xml b/programs/server/config.d/log_to_console.xml
index 227c53647f3..70d2f014380 100644
--- a/programs/server/config.d/log_to_console.xml
+++ b/programs/server/config.d/log_to_console.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <logger>
         <console>true</console>
         <log remove="remove"/>
         <errorlog remove="remove"/>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/programs/server/config.d/more_clusters.xml b/programs/server/config.d/more_clusters.xml
index aecbf9e0ba7..ce88408876f 100644
--- a/programs/server/config.d/more_clusters.xml
+++ b/programs/server/config.d/more_clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
 
         <![CDATA[
@@ -46,4 +46,4 @@
         </two_shards_one_local_one_remote_at_port_9001>
 
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/programs/server/config.d/path.xml b/programs/server/config.d/path.xml
index 466ed0d1663..46af5bfb64b 100644
--- a/programs/server/config.d/path.xml
+++ b/programs/server/config.d/path.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <path replace="replace">./</path>
     <tmp_path replace="replace">./tmp/</tmp_path>
     <user_files_path replace="replace">./user_files/</user_files_path>
     <format_schema_path replace="replace">./format_schemas/</format_schema_path>
     <access_control_path replace="replace">./access/</access_control_path>
     <top_level_domains_path replace="replace">./top_level_domains/</top_level_domains_path>
-</yandex>
+</clickhouse>
diff --git a/programs/server/config.xml b/programs/server/config.xml
index 78182482c1c..37f36aa5215 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -5,7 +5,7 @@
   You can either move the settings to the right place inside "users.xml" file
    or add <skip_check_for_incorrect_settings>1</skip_check_for_incorrect_settings> here.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels [1]:
 
@@ -18,6 +18,7 @@
           - information
           - debug
           - trace
+          - test (not for production usage)
 
             [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
         -->
@@ -61,6 +62,27 @@
         -->
     </logger>
 
+    <!-- Add headers to response in options request. OPTIONS method is used in CORS preflight requests. -->
+    <!-- It is off by default. Next headers are obligate for CORS.-->
+    <!-- http_options_response>
+        <header>
+            <name>Access-Control-Allow-Origin</name>
+            <value>*</value>
+        </header>
+        <header>
+            <name>Access-Control-Allow-Headers</name>
+            <value>origin, x-requested-with</value>
+        </header>
+        <header>
+            <name>Access-Control-Allow-Methods</name>
+            <value>POST, GET, OPTIONS</value>
+        </header>
+        <header>
+            <name>Access-Control-Max-Age</name>
+            <value>86400</value>
+        </header>
+    </http_options_response -->
+
     <!-- It is the name that will be shown in the clickhouse-client.
          By default, anything with "production" will be highlighted in red in query prompt.
     -->
@@ -171,7 +193,7 @@
       -->
     <!-- <listen_reuse_port>0</listen_reuse_port> -->
 
-    <!-- <listen_backlog>64</listen_backlog> -->
+    <!-- <listen_backlog>4096</listen_backlog> -->
 
     <max_connections>4096</max_connections>
 
@@ -193,11 +215,11 @@
         <!-- The following file is used only if ssl_require_client_auth=1 -->
         <ssl_ca_cert_file>/path/to/ssl_ca_cert_file</ssl_ca_cert_file>
 
-        <!-- Default compression algorithm (applied if client doesn't specify another algorithm).
+        <!-- Default compression algorithm (applied if client doesn't specify another algorithm, see result_compression in QueryInfo).
              Supported algorithms: none, deflate, gzip, stream_gzip -->
         <compression>deflate</compression>
 
-        <!-- Default compression level (applied if client doesn't specify another level).
+        <!-- Default compression level (applied if client doesn't specify another level, see result_compression in QueryInfo).
              Supported levels: none, low, medium, high -->
         <compression_level>medium</compression_level>
 
@@ -320,7 +342,7 @@
          The amount of data in mapped files can be monitored
          in system.metrics, system.metric_log by the MMappedFiles, MMappedFileBytes metrics
          and in system.asynchronous_metrics, system.asynchronous_metrics_log by the MMapCacheCells metric,
-         and also in system.events, system.processes, system.query_log, system.query_thread_log by the
+         and also in system.events, system.processes, system.query_log, system.query_thread_log, system.query_views_log by the
          CreatedReadBufferMMap, CreatedReadBufferMMapFailed, MMappedFileCacheHits, MMappedFileCacheMisses events.
          Note that the amount of data in mapped files does not consume memory directly and is not accounted
          in query or server memory usage - because this memory can be discarded similar to OS page cache.
@@ -329,8 +351,11 @@
       -->
     <mmap_cache_size>1000</mmap_cache_size>
 
-    <!-- Cache size for compiled expressions.-->
-    <compiled_expression_cache_size>1073741824</compiled_expression_cache_size>
+    <!-- Cache size in bytes for compiled expressions.-->
+    <compiled_expression_cache_size>134217728</compiled_expression_cache_size>
+
+    <!-- Cache size in elements for compiled expressions.-->
+    <compiled_expression_cache_elements_size>10000</compiled_expression_cache_elements_size>
 
     <!-- Path to data directory, with trailing slash. -->
     <path>/var/lib/clickhouse/</path>
@@ -585,7 +610,7 @@
     -->
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.tech/docs/en/operations/table_engines/distributed/
+         https://clickhouse.com/docs/en/operations/table_engines/distributed/
       -->
     <remote_servers>
         <!-- Test only shard config for testing distributed storage -->
@@ -717,13 +742,13 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/
+         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
       -->
 
     <!--
@@ -746,7 +771,7 @@
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
       -->
     <!--
     <macros>
@@ -833,7 +858,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr: https://clickhouse.yandex/docs/en/table_engines/mergetree-family/custom_partitioning_key/
+            PARTITION BY expr: https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -842,7 +867,7 @@
         -->
         <partition_by>toYYYYMM(event_date)</partition_by>
         <!--
-            Table TTL specification: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
+            Table TTL specification: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
             Example:
                 event_date + INTERVAL 1 WEEK
                 event_date + INTERVAL 7 DAY DELETE
@@ -878,14 +903,23 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_thread_log>
 
+    <!-- Query views log. Has information about all dependent views associated with a query.
+         Used only for queries with setting log_query_views = 1. -->
+    <query_views_log>
+        <database>system</database>
+        <table>query_views_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_views_log>
+
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -955,8 +989,17 @@
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </crash_log>
 
+    <!-- Session log. Stores user log in (successful or not) and log out events. -->
+    <session_log>
+        <database>system</database>
+        <table>session_log</table>
+
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </session_log>
+
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -980,10 +1023,13 @@
     </top_level_domains_lists>
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
+         https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
+    <!-- Configuration of user defined executable functions -->
+    <user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
+
     <!-- Uncomment if you want data to be compressed 30-100% better.
          Don't do that if you just started using ClickHouse.
       -->
@@ -1007,10 +1053,28 @@
          defined, or encryption codecs will be disabled otherwise. The
          command is executed through /bin/sh and is expected to write
          a Base64-encoded key to the stdout. -->
-    <encryption>
-        <!-- <key_command>/usr/bin/systemd-ask-password &#45;&#45;id="clickhouse-server" &#45;&#45;timeout=0 "Enter the ClickHouse encryption passphrase:" | base64</key_command> -->
-        <!-- <key_command><![CDATA[IFS=; echo -n >/dev/tty "Enter the ClickHouse encryption passphrase: "; stty=`stty -F /dev/tty -g`; stty -F /dev/tty -echo; read k </dev/tty; stty -F /dev/tty "$stty"; echo -n $k | base64]]></key_command> -->
-    </encryption>
+    <encryption_codecs>
+        <!-- aes_128_gcm_siv -->
+            <!-- Example of getting hex key from env -->
+            <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
+            <!--key_hex from_env="..."></key_hex -->
+
+            <!-- Example of multiple hex keys. They can be imported from env or be written down in config-->
+            <!-- the code should use these keys and throw an exception if their length is not 16 bytes -->
+            <!-- key_hex id="0">...</key_hex -->
+            <!-- key_hex id="1" from_env=".."></key_hex -->
+            <!-- key_hex id="2">...</key_hex -->
+            <!-- current_key_id>2</current_key_id -->
+
+            <!-- Example of getting hex key from config -->
+            <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
+            <!-- key>...</key -->
+
+            <!-- example of adding nonce -->
+            <!-- nonce>...</nonce -->
+
+        <!-- /aes_128_gcm_siv -->
+    </encryption_codecs>
 
     <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
          Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
@@ -1189,4 +1253,4 @@
         </tables>
     </rocksdb>
     -->
-</yandex>
+</clickhouse>
diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
index bebfd74ff58..c312e6a2208 100644
--- a/programs/server/config.yaml.example
+++ b/programs/server/config.yaml.example
@@ -1,6 +1,6 @@
 # This is an example of a configuration file "config.xml" rewritten in YAML
 # You can read this documentation for detailed information about YAML configuration:
-# https://clickhouse.tech/docs/en/operations/configuration-files/
+# https://clickhouse.com/docs/en/operations/configuration-files/
 
 # NOTE: User and query level settings are set up in "users.yaml" file.
 # If you have accidentally specified user-level settings here, server won't start.
@@ -271,7 +271,7 @@ mark_cache_size: 5368709120
 # The amount of data in mapped files can be monitored
 # in system.metrics, system.metric_log by the MMappedFiles, MMappedFileBytes metrics
 # and in system.asynchronous_metrics, system.asynchronous_metrics_log by the MMapCacheCells metric,
-# and also in system.events, system.processes, system.query_log, system.query_thread_log by the
+# and also in system.events, system.processes, system.query_log, system.query_thread_log, system.query_views_log by the
 # CreatedReadBufferMMap, CreatedReadBufferMMapFailed, MMappedFileCacheHits, MMappedFileCacheMisses events.
 # Note that the amount of data in mapped files does not consume memory directly and is not accounted
 # in query or server memory usage - because this memory can be discarded similar to OS page cache.
@@ -279,8 +279,11 @@ mark_cache_size: 5368709120
 # also it can be dropped manually by the SYSTEM DROP MMAP CACHE query.
 mmap_cache_size: 1000
 
-# Cache size for compiled expressions.
-compiled_expression_cache_size: 1073741824
+# Cache size in bytes for compiled expressions.
+compiled_expression_cache_size: 134217728
+
+# Cache size in elements for compiled expressions.
+compiled_expression_cache_elements_size: 10000
 
 # Path to data directory, with trailing slash.
 path: /var/lib/clickhouse/
@@ -509,7 +512,7 @@ remap_executable: false
 #     port: 9019
 
 # Configuration of clusters that could be used in Distributed tables.
-# https://clickhouse.tech/docs/en/operations/table_engines/distributed/
+# https://clickhouse.com/docs/en/operations/table_engines/distributed/
 remote_servers:
     # Test only shard config for testing distributed storage
     test_shard_localhost:
@@ -602,11 +605,11 @@ remote_servers:
 
 # If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
 # By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-# Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+# Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
 
 # ZooKeeper is used to store metadata about replicas, when using Replicated tables.
 # Optional. If you don't use replicated tables, you could omit that.
-# See https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/
+# See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
 
 # zookeeper:
 #     - node:
@@ -621,7 +624,7 @@ remote_servers:
 
 # Substitutions for parameters of replicated tables.
 # Optional. If you don't use replicated tables, you could omit that.
-# See https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
+# See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
 # macros:
 #     shard: 01
 #     replica: example01-01-1
@@ -693,7 +696,7 @@ query_log:
     database: system
     table: query_log
 
-    # PARTITION BY expr: https://clickhouse.yandex/docs/en/table_engines/mergetree-family/custom_partitioning_key/
+    # PARTITION BY expr: https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
     # Example:
     # event_date
     # toMonday(event_date)
@@ -701,7 +704,7 @@ query_log:
     # toStartOfHour(event_time)
     partition_by: toYYYYMM(event_date)
 
-    # Table TTL specification: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
+    # Table TTL specification: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
     # Example:
     # event_date + INTERVAL 1 WEEK
     # event_date + INTERVAL 7 DAY DELETE
@@ -731,12 +734,21 @@ query_thread_log:
     partition_by: toYYYYMM(event_date)
     flush_interval_milliseconds: 7500
 
+# Query views log. Has information about all dependent views associated with a query.
+# Used only for queries with setting log_query_views = 1.
+query_views_log:
+    database: system
+    table: query_views_log
+    partition_by: toYYYYMM(event_date)
+    flush_interval_milliseconds: 7500
+
 # Uncomment if use part log.
 # Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
-# part_log:
-#     database: system
-#     table: part_log
-#     flush_interval_milliseconds: 7500
+part_log:
+    database: system
+    table: part_log
+    partition_by: toYYYYMM(event_date)
+    flush_interval_milliseconds: 7500
 
 # Uncomment to write text log into table.
 # Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -792,7 +804,7 @@ crash_log:
     flush_interval_milliseconds: 1000
 
 # Parameters for embedded dictionaries, used in Yandex.Metrica.
-# See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+# See https://clickhouse.com/docs/en/dicts/internal_dicts/
 
 # Path to file with region hierarchy.
 # path_to_regions_hierarchy_file: /opt/geo/regions_hierarchy.txt
@@ -812,7 +824,7 @@ top_level_domains_lists: ''
 # public_suffix_list: /path/to/public_suffix_list.dat
 
 # Configuration of external dictionaries. See:
-# https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
+# https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
 dictionaries_config: '*_dictionary.xml'
 
 # Uncomment if you want data to be compressed 30-100% better.
diff --git a/programs/server/embedded.xml b/programs/server/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/programs/server/embedded.xml
+++ b/programs/server/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/programs/server/play.html b/programs/server/play.html
index 503bb92d03e..f7154643504 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -33,6 +33,7 @@
         :root {
             --background-color: #DDF8FF; /* Or #FFFBEF; actually many pastel colors look great for light theme. */
             --element-background-color: #FFF;
+            --bar-color: #F8F4F0; /* Light bar in background of table cells. */
             --border-color: #EEE;
             --shadow-color: rgba(0, 0, 0, 0.1);
             --button-color: #FFAA00; /* Orange on light-cyan is especially good. */
@@ -45,11 +46,14 @@
             --table-hover-color: #FFF8EF;
             --null-color: #A88;
             --link-color: #06D;
+            --logo-color: #CEE;
+            --logo-color-active: #BDD;
         }
 
         [data-theme="dark"] {
             --background-color: #000;
             --element-background-color: #102030;
+            --bar-color: #182838;
             --border-color: #111;
             --shadow-color: rgba(255, 255, 255, 0.1);
             --text-color: #CCC;
@@ -63,12 +67,14 @@
             --table-hover-color: #003333;
             --null-color: #A88;
             --link-color: #4BDAF7;
+            --logo-color: #222;
+            --logo-color-active: #333;
         }
 
         html, body
         {
             /* Personal choice. */
-            font-family: Sans-Serif;
+            font-family: Liberation Sans, DejaVu Sans, sans-serif, Noto Color Emoji, Apple Color Emoji, Segoe UI Emoji;
             background: var(--background-color);
             color: var(--text-color);
         }
@@ -96,11 +102,16 @@
         .monospace
         {
             /* Prefer fonts that have full hinting info. This is important for non-retina displays.
-               Also I personally dislike "Ubuntu" font due to the similarity of 'r' and 'г' (it looks very ignorant).
-            */
+               Also I personally dislike "Ubuntu" font due to the similarity of 'r' and 'г' (it looks very ignorant). */
             font-family: Liberation Mono, DejaVu Sans Mono, MonoLisa, Consolas, Monospace;
         }
 
+        .monospace-table
+        {
+            /* Liberation is worse than DejaVu for block drawing characters. */
+            font-family: DejaVu Sans Mono, Liberation Mono, MonoLisa, Consolas, Monospace;
+        }
+
         .shadow
         {
             box-shadow: 0 0 1rem var(--shadow-color);
@@ -306,12 +317,28 @@
         {
             fill: var(--text-color);
         }
+
+        #logo
+        {
+            fill: var(--logo-color);
+        }
+
+        #logo:hover
+        {
+            fill: var(--logo-color-active);
+        }
+
+        #logo-container
+        {
+            text-align: center;
+            margin-top: 5em;
+        }
     </style>
 </head>
 
 <body>
     <div id="inputs">
-        <input class="monospace shadow" id="url" type="text" value="http://localhost:8123/" /><input class="monospace shadow" id="user" type="text" value="default" /><input class="monospace shadow" id="password" type="password" />
+        <input class="monospace shadow" id="url" type="text" value="http://localhost:8123/" placeholder="url" /><input class="monospace shadow" id="user" type="text" value="default" placeholder="user" /><input class="monospace shadow" id="password" type="password" placeholder="password" />
     </div>
     <div>
         <textarea autofocus spellcheck="false" class="monospace shadow" id="query"></textarea>
@@ -325,12 +352,31 @@
         <span id="toggle-dark">🌑</span><span id="toggle-light">🌞</span>
     </div>
     <div id="data_div">
-        <table class="monospace shadow" id="data-table"></table>
-        <pre class="monospace shadow" id="data-unparsed"></pre>
+        <table class="monospace-table shadow" id="data-table"></table>
+        <pre class="monospace-table shadow" id="data-unparsed"></pre>
     </div>
     <svg id="graph" fill="none"></svg>
     <p id="error" class="monospace shadow">
     </p>
+    <p id="logo-container">
+        <a href="https://clickhouse.com/">
+        <svg id="logo" width="50%" viewBox="0 0 180 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+            <title>Powered by ClickHouse</title>
+            <g transform="translate(21, 0)">
+                <path d="M9.76370444,20.9560972 C8.43447886,20.9735251 7.11430823,20.7384252 5.875478,20.2636703 C4.72047444,19.8054437 3.67723122,19.1113387 2.81453379,18.2271205 C1.90927726,17.3283139 1.2048111,16.2531042 0.746328237,15.0704684 C-0.248776079,12.2964995 -0.248776079,9.27056268 0.746328237,6.4965938 C1.67159165,4.07354026 3.61800681,2.16434552 6.08229856,1.26266086 C7.35832383,0.792264319 8.71148185,0.557532775 10.0739353,0.570233938 C11.1612577,0.548839362 12.2465336,0.672146838 13.3003359,0.936812899 C14.1575307,1.16603291 14.9890302,1.47989577 15.7821826,1.8736258 L15.0376286,4.17492705 C14.334754,3.70811103 13.5779913,3.32526638 12.7832845,3.03445917 C11.8308864,2.71897047 10.8304102,2.56740693 9.82575061,2.58641822 C7.96245266,2.56886976 6.1853824,3.35817309 4.96546756,4.74516099 C4.30442786,5.50472232 3.79877758,6.38298172 3.47635956,7.33157921 C3.08814385,8.46618422 2.89929764,9.65767851 2.91794407,10.8548103 C2.90195973,12.0219322 3.07653544,13.184001 3.43499545,14.2965795 C3.73382292,15.2302331 4.21899806,16.0957206 4.86205728,16.8422667 C5.46077204,17.5238868 6.21094713,18.0604846 7.05435517,18.41041 C7.95798877,18.7824827 8.9290709,18.969569 9.90847883,18.9602785 C10.8005951,18.9648543 11.68759,18.827308 12.5350999,18.5529685 C13.3447055,18.2769814 14.1214074,17.9150606 14.8514901,17.4735971 L15.575362,19.2046644 C14.8756447,19.7279796 14.0929921,20.1339593 13.2589718,20.4062288 C12.1346344,20.7859604 10.952228,20.9719742 9.76370444,20.9560972 L9.76370444,20.9560972 Z" id="Path"></path>
+                <polygon id="Path" points="21.2008811 0 21.2008811 20.6709803 18.7397165 20.6709803 18.7397165 0 21.2008811 0"></polygon>
+                <path d="M26.5161694,4.15456155 C26.0981094,4.18404053 25.6871808,4.03620327 25.3868859,3.74828616 C25.0865909,3.46036905 24.9255529,3.05981554 24.9443332,2.64751471 C24.9293499,2.23543398 25.0776822,1.83376364 25.3579743,1.52741233 C25.9917593,0.922143971 26.9992154,0.922143971 27.6330004,1.52741233 C27.9227354,1.82938962 28.0789406,2.23223687 28.0673236,2.64751471 C28.0795295,3.0508229 27.9224226,3.44126169 27.6330004,3.7268861 C27.3352303,4.0129939 26.9320049,4.16740365 26.5161694,4.15456155 L26.5161694,4.15456155 Z M27.7570927,6.31330432 L27.7570927,20.5691528 L25.3166102,20.5691528 L25.3166102,6.31330432 L27.7777748,6.31330432 L27.7570927,6.31330432 Z" id="Shape"></path>
+                <path d="M38.2015308,20.9561849 C37.2331788,20.9606473 36.2723959,20.7880054 35.3680892,20.4469598 C34.5040176,20.1277138 33.7207114,19.6274001 33.072381,18.9806439 C32.4086321,18.3083453 31.8882536,17.5120269 31.5419089,16.6386117 C30.789066,14.6134632 30.789066,12.3911868 31.5419089,10.3660384 C31.8953146,9.48650873 32.4305899,8.68894988 33.1137451,8.02400613 C33.8006138,7.36063917 34.6265105,6.85322326 35.5335456,6.53732479 C36.4665869,6.19626518 37.4544707,6.0237894 38.4497154,6.02818735 C39.2367736,6.02254268 40.0215928,6.11144966 40.7867877,6.29293882 C41.402916,6.43127907 41.9904819,6.67235105 42.5240804,7.00573124 L41.7381623,9.14410851 C41.2326995,8.76428196 40.6844527,8.44310218 40.1042799,8.18693012 C39.4990142,7.95244732 38.8516533,7.84158602 38.2015308,7.86108215 C37.5775701,7.85677667 36.958946,7.97445444 36.3815099,8.20729561 C35.8033669,8.44328317 35.2871426,8.80537627 34.8717198,9.2663015 C34.4220004,9.77237252 34.0776687,10.3605404 33.8582991,10.9973688 C33.5836299,11.7832018 33.4506403,12.6102801 33.4653401,13.4412285 C33.3646964,14.9221144 33.8543791,16.3832889 34.8303557,17.5143281 C35.8193073,18.4542588 37.1597853,18.9483223 38.5324437,18.8788165 C39.7296588,18.8515966 40.8932941,18.483801 41.8829366,17.8198106 L42.4413521,19.6119744 C41.8863529,20.0201826 41.2635134,20.3302813 40.6006492,20.5284218 C39.8277327,20.7904738 39.0186907,20.9346965 38.2015308,20.9561849 L38.2015308,20.9561849 Z" id="Path"></path>
+                <path d="M47.9427789,0 L47.9427789,20.6709803 L45.4402502,20.6709803 L45.4402502,0 L47.9427789,0 Z M54.3542161,20.6709803 L48.2736918,13.0135531 L54.2714879,6.33366982 L56.8360628,6.33366982 L50.9003129,12.7284361 L57.2497039,20.6709803 L54.3542161,20.6709803 L54.3542161,20.6709803 Z" id="Shape"></path>
+                <polygon id="Path" points="73.1128405 11.8730852 62.7718127 11.8730852 62.7718127 20.6506148 60.1038276 20.6506148 60.1038276 0.855350908 62.7718127 0.855350908 62.7718127 9.89763193 73.1128405 9.89763193 73.1128405 0.855350908 75.7808256 0.855350908 75.7808256 20.6709803 73.1128405 20.6709803"></polygon>
+                <path d="M86.3079919,20.9560972 C85.38699,20.956828 84.4743522,20.7840259 83.6193247,20.4469598 C82.7801539,20.1243214 82.0191689,19.6317014 81.3856627,19.0010094 C80.7288968,18.3272298 80.2155719,17.5309446 79.8758726,16.6589772 C79.1241518,14.6056391 79.1241518,12.35828 79.8758726,10.3049419 C80.2139667,9.43820628 80.7276537,8.64828849 81.3856627,7.98327514 C82.0210949,7.3549028 82.7815529,6.86262399 83.6193247,6.53732479 C84.4743522,6.20025867 85.38699,6.0274377 86.3079919,6.02818492 C87.235663,6.02783377 88.154999,6.20059422 89.0173412,6.53732479 C89.8608646,6.86326706 90.6279639,7.35528929 91.2716852,7.98327514 C91.9432058,8.64563226 92.4709473,9.43552137 92.8228394,10.3049419 C93.5941835,12.3548594 93.5941835,14.6090597 92.8228394,16.6589772 C92.5001582,17.5252355 92.0083217,18.3208853 91.3750955,19.0010094 C90.7336187,19.6317283 89.9659063,20.1241438 89.1207514,20.4469598 C88.2261198,20.7965781 87.270406,20.9695718 86.3079919,20.9560972 Z M86.3079919,19.1028369 C86.8871906,19.1004754 87.4613802,18.9970483 88.0039204,18.7973545 C88.5665616,18.5933999 89.0704796,18.2579374 89.4723464,17.8198106 C89.93364,17.3107661 90.2854168,16.714971 90.5064492,16.0683778 C90.7858877,15.2345245 90.9187812,14.3598326 90.8994082,13.4819595 C90.921252,12.6039337 90.7882958,11.7288286 90.5064492,10.8955413 C90.2829062,10.2561715 89.9312542,9.66751308 89.4723464,9.16447401 C89.0704796,8.72634722 88.5665616,8.39088465 88.0039204,8.18693012 C87.4613802,7.98723626 86.8871906,7.88380922 86.3079919,7.88144765 C85.7421967,7.88338153 85.1815027,7.98690253 84.6534274,8.18693012 C84.1067964,8.39867016 83.6180769,8.73344525 83.2263656,9.16447401 C82.771108,9.66662382 82.426093,10.2559587 82.2129449,10.8955413 C81.9432303,11.7312023 81.817401,12.6054092 81.8406679,13.4819595 C81.8197008,14.3583785 81.9454766,15.2322137 82.2129449,16.0683778 C82.4234966,16.7151843 82.7686424,17.3116787 83.2263656,17.8198106 C83.6175627,18.2514112 84.1064306,18.586288 84.6534274,18.7973545 C85.1815027,18.9973821 85.7421967,19.1009031 86.3079919,19.1028369 L86.3079919,19.1028369 Z" id="Shape"></path>
+                <path d="M104.218652,20.1211118 C103.261113,20.713834 102.142858,21.0051032 101.012933,20.9560972 C99.7999523,21.0051122 98.6193584,20.5636475 97.7451686,19.7341674 C96.8353108,18.7009502 96.3878256,17.3496664 96.5042453,15.9869158 L96.5042453,6.31330432 L98.9860919,6.31330432 L98.9860919,15.9869158 C98.9742754,16.4701161 99.0441695,16.9518863 99.1929125,17.4125006 C99.3056456,17.7606047 99.5046708,18.0755709 99.77201,18.328948 C100.016574,18.5594167 100.314849,18.7272509 100.640656,18.81772 C100.990271,18.9161408 101.352523,18.9641592 101.716123,18.9602785 C102.655549,19.0038445 103.582007,18.7308795 104.342744,18.1863895 C105.051689,17.6370184 105.630443,16.9420231 106.038673,16.1498398 L106.038673,6.31330432 L108.499837,6.31330432 L108.499837,20.5691528 L106.328222,20.5691528 L106.100719,18.0031001 L106.100719,18.0031001 C105.687922,18.8692089 105.035644,19.6032598 104.218652,20.1211118 L104.218652,20.1211118 Z" id="Path"></path>
+                <path d="M116.421065,20.9560972 C115.801233,20.9950241 115.179512,20.9950241 114.55968,20.9560972 C114.092617,20.8964402 113.62981,20.8080164 113.173982,20.6913458 C112.813228,20.605003 112.460411,20.4891975 112.119197,20.3451323 C111.834495,20.2200141 111.558175,20.0771664 111.291915,19.9174568 L112.098515,17.8809071 C112.279343,18.026767 112.473161,18.156273 112.677613,18.2678515 C112.976636,18.4329534 113.287727,18.5759069 113.608305,18.695527 C114.017173,18.8537321 114.439319,18.9763932 114.869911,19.0621059 C115.380772,19.1609067 115.900459,19.2086684 116.421065,19.2046644 C117.260254,19.2611102 118.095255,19.0466179 118.799501,18.5936995 C119.330358,18.1920161 119.630919,17.5621502 119.606101,16.9033632 C119.629117,16.3456326 119.383876,15.8098319 118.944275,15.4574128 C118.248621,14.9827695 117.47054,14.6376468 116.648567,14.4391379 L114.869911,13.8485385 C114.332933,13.6600961 113.82489,13.3996834 113.36012,13.0746496 C112.918371,12.7629353 112.551287,12.3597625 112.284654,11.8934507 C111.990937,11.3416153 111.84837,10.7239217 111.871013,10.1012869 C111.7928,8.92823263 112.331666,7.79778562 113.298074,7.10755873 C114.467654,6.39295223 115.832855,6.05154147 117.206983,6.13001484 C118.07528,6.11663174 118.942387,6.19859987 119.79224,6.37440081 C120.389496,6.49652839 120.971868,6.68085438 121.529532,6.92426925 L120.950435,8.96081903 C120.479952,8.73041885 119.996597,8.52643737 119.502691,8.3498541 C118.797193,8.1146398 118.054965,8.00432014 117.310393,8.02400613 C116.535101,7.9880419 115.762277,8.13465573 115.056049,8.45168159 C114.47936,8.75940804 114.145458,9.37689414 114.208085,10.0198249 C114.202,10.3323024 114.296078,10.6387208 114.476951,10.8955413 C114.663996,11.1520366 114.903538,11.3670997 115.180141,11.5268718 C115.506126,11.720303 115.852962,11.8774057 116.214244,11.9952782 L117.455167,12.3618572 L119.130414,12.9117256 C119.664383,13.1015363 120.166356,13.3692768 120.619522,13.70598 C121.602378,14.4140087 122.154912,15.5634667 122.087948,16.7608047 C122.121004,17.4696719 121.956505,18.1739382 121.612261,18.7973545 C121.300726,19.3338382 120.869299,19.7934828 120.350655,20.1414773 C119.804193,20.5059941 119.194247,20.7683295 118.551316,20.9153662 C117.845409,21.0123699 117.130265,21.0260437 116.421065,20.9560972 Z" id="Path"></path>
+                <path d="M136.379248,19.4286849 C135.765636,19.9144267 135.063746,20.2807344 134.311043,20.5080563 C133.397586,20.8060079 132.439751,20.9505822 131.477601,20.9357317 C129.484022,21.0457076 127.539179,20.3034303 126.141631,18.899182 C124.819952,17.3656124 124.152831,15.3875844 124.280246,13.3801321 C124.263071,12.3194805 124.438164,11.2643153 124.797297,10.2642109 C125.111353,9.39844373 125.596363,8.60246478 126.224359,7.92217864 C126.799559,7.29363386 127.504769,6.79365416 128.292565,6.4558628 C129.13245,6.11650376 130.03203,5.94349361 130.939868,5.94672536 C131.84844,5.93569173 132.749586,6.10900306 133.587171,6.4558628 C134.355957,6.77570775 135.026242,7.28828126 135.531284,7.94254414 C136.069381,8.66407624 136.423989,9.5021104 136.565387,10.3864039 C136.756685,11.5054228 136.756685,12.6480576 136.565387,13.7670765 L126.720728,13.7670765 C126.831033,17.1749031 128.464915,18.8788165 131.622376,18.8788165 C132.38185,18.8941966 133.138087,18.7769813 133.856038,18.532603 C134.495821,18.304128 135.106567,18.0034291 135.676058,17.6365211 L136.379248,19.4286849 Z M131.022596,7.73888916 C130.017668,7.7293132 129.052936,8.12697327 128.354611,8.83862604 C127.526752,9.75405949 127.031943,10.9148261 126.948231,12.1378367 L134.331725,12.1378367 C134.534684,10.9751452 134.259342,9.78072052 133.566489,8.81826055 C132.931983,8.09270485 131.993938,7.6946933 131.022596,7.73888916 Z" id="Shape"></path>
+            </g>
+        </svg>
+        </a>
+    </p>
 </body>
 
 <script type="text/javascript">
@@ -367,7 +413,7 @@
         const server_address = document.getElementById('url').value;
 
         const url = server_address +
-            (server_address.indexOf('?') >= 0 ? '&' : '?') + 
+            (server_address.indexOf('?') >= 0 ? '&' : '?') +
             /// Ask server to allow cross-domain requests.
             'add_http_cors_header=1' +
             '&user=' + encodeURIComponent(user) +
@@ -500,6 +546,28 @@
 
         document.getElementById('hourglass').style.display = 'none';
         document.getElementById('check-mark').style.display = 'none';
+
+        document.getElementById('logo-container').style.display = 'block';
+    }
+    
+    function formatReadable(number = 0, decimals = 2, units = []) {
+        const k = 1000;
+        const i = number ? Math.floor(Math.log(number) / Math.log(k)) : 0;
+        const unit = units[i];
+        const dm = unit ? decimals : 0;
+        return Number(number / Math.pow(k, i)).toFixed(dm) + unit;
+    }
+
+    function formatReadableBytes(bytes) {
+        const units = [' B', ' KB', ' MB', ' GB', ' TB', ' PB', ' EB', ' ZB', ' YB'];
+
+        return formatReadable(bytes, 2, units);
+    }
+
+    function formatReadableRows(rows) {
+        const units = ['', ' thousand', ' million', ' billion', ' trillion', ' quadrillion'];
+
+        return formatReadable(rows, 2, units);
     }
 
     function renderResult(response)
@@ -507,7 +575,12 @@
         clear();
 
         let stats = document.getElementById('stats');
-        stats.innerText = 'Elapsed: ' + response.statistics.elapsed.toFixed(3) + " sec, read " + response.statistics.rows_read + " rows.";
+        const seconds = response.statistics.elapsed.toFixed(3);
+        const rows = response.statistics.rows_read;
+        const bytes = response.statistics.bytes_read;
+        const formatted_bytes = formatReadableBytes(bytes);
+        const formatted_rows = formatReadableRows(rows);
+        stats.innerText = `Elapsed: ${seconds} sec, read ${formatted_rows} rows, ${formatted_bytes}.`;
 
         /// We can also render graphs if user performed EXPLAIN PIPELINE graph=1.
         if (response.data.length > 3 && response.data[0][0] === "digraph" && document.getElementById('query').value.match(/^\s*EXPLAIN/i)) {
@@ -522,17 +595,20 @@
         let thead = document.createElement('thead');
         for (let idx in response.meta) {
             let th = document.createElement('th');
-            let name = document.createTextNode(response.meta[idx].name);
+            const name = document.createTextNode(response.meta[idx].name);
             th.appendChild(name);
             thead.appendChild(th);
         }
 
         /// To prevent hanging the browser, limit the number of cells in a table.
         /// It's important to have the limit on number of cells, not just rows, because tables may be wide or narrow.
-        let max_rows = 10000 / response.meta.length;
+        const max_rows = 10000 / response.meta.length;
         let row_num = 0;
 
-        let column_classes = response.meta.map(elem => elem.type.match(/^(U?Int|Decimal|Float)/) ? 'right' : 'left');
+        const column_is_number = response.meta.map(elem => !!elem.type.match(/^(U?Int|Decimal|Float)/));
+        const column_maximums = column_is_number.map((elem, idx) => elem ? Math.max(...response.data.map(row => row[idx])) : 0);
+        const column_minimums = column_is_number.map((elem, idx) => elem ? Math.min(...response.data.map(row => Math.max(0, row[idx]))) : 0);
+        const column_need_render_bars = column_is_number.map((elem, idx) => column_maximums[idx] > 0 && column_maximums[idx] > column_minimums[idx]);
 
         let tbody = document.createElement('tbody');
         for (let row_idx in response.data) {
@@ -568,11 +644,27 @@
                     node = link;
                 }
 
-                td.appendChild(node);
-                td.className = column_classes[col_idx];
+                td.className = column_is_number[col_idx] ? 'right' : 'left';
                 if (is_null) {
                     td.className += ' null';
                 }
+
+                /// If it's a number, render bar in background.
+                if (column_need_render_bars[col_idx] && text > 0) {
+                    const ratio = 100 * text / column_maximums[col_idx];
+
+                    let div = document.createElement('div');
+
+                    div.style.width = '100%';
+                    div.style.background = `linear-gradient(to right,
+                        var(--bar-color) 0%, var(--bar-color) ${ratio}%,
+                        transparent ${ratio}%, transparent 100%)`;
+
+                    div.appendChild(node);
+                    node = div;
+                }
+
+                td.appendChild(node);
                 tr.appendChild(td);
             }
             tbody.appendChild(tr);
@@ -609,6 +701,7 @@
         clear();
         document.getElementById('error').innerText = response ? response : "No response.";
         document.getElementById('error').style.display = 'block';
+        document.getElementById('logo-container').style.display = 'none';
     }
 
     /// Huge JS libraries should be loaded only if needed.
diff --git a/programs/server/users.d/allow_introspection_functions.xml b/programs/server/users.d/allow_introspection_functions.xml
index b94e95bc043..cfde1b4525d 100644
--- a/programs/server/users.d/allow_introspection_functions.xml
+++ b/programs/server/users.d/allow_introspection_functions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/programs/server/users.d/allow_only_from_localhost.xml b/programs/server/users.d/allow_only_from_localhost.xml
index bce5858ad41..b1b38686133 100644
--- a/programs/server/users.d/allow_only_from_localhost.xml
+++ b/programs/server/users.d/allow_only_from_localhost.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <networks replace="replace">
@@ -8,4 +8,4 @@
             </networks>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/programs/server/users.d/session_log_test.xml b/programs/server/users.d/session_log_test.xml
new file mode 120000
index 00000000000..85377f51630
--- /dev/null
+++ b/programs/server/users.d/session_log_test.xml
@@ -0,0 +1 @@
+../../../tests/config/users.d/session_log_test.xml
\ No newline at end of file
diff --git a/programs/server/users.xml b/programs/server/users.xml
index b33dc0628d1..fd5fe414579 100644
--- a/programs/server/users.xml
+++ b/programs/server/users.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
+    <!-- See also the files in users.d directory where the settings can be overridden. -->
+
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -28,7 +30,9 @@
     <users>
         <!-- If user name was not specified, 'default' user is used. -->
         <default>
-            <!-- Password could be specified in plaintext or in SHA256 (in hex format).
+            <!-- See also the files in users.d directory where the password can be overridden.
+
+                 Password could be specified in plaintext or in SHA256 (in hex format).
 
                  If you want to specify password in plaintext (not recommended), place it in 'password' element.
                  Example: <password>qwerty</password>.
@@ -49,7 +53,7 @@
                   place 'kerberos' element instead of 'password' (and similar) elements.
                  The name part of the canonical principal name of the initiator must match the user name for authentication to succeed.
                  You can also place 'realm' element inside 'kerberos' element to further restrict authentication to only those requests
-                  whose initiator's realm matches it. 
+                  whose initiator's realm matches it.
                  Example: <kerberos />
                  Example: <kerberos><realm>EXAMPLE.COM</realm></kerberos>
 
@@ -116,4 +120,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/programs/server/ya.make b/programs/server/ya.make
deleted file mode 100644
index 1b99fb31a3f..00000000000
--- a/programs/server/ya.make
+++ /dev/null
@@ -1,22 +0,0 @@
-OWNER(g:clickhouse)
-
-PROGRAM(clickhouse-server)
-
-PEERDIR(
-    clickhouse/base/common
-    clickhouse/base/daemon
-    clickhouse/base/loggers
-    clickhouse/src
-    contrib/libs/poco/NetSSL_OpenSSL
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    clickhouse-server.cpp
-
-    MetricsTransmitter.cpp
-    Server.cpp
-)
-
-END()
diff --git a/programs/static-files-disk-uploader/CMakeLists.txt b/programs/static-files-disk-uploader/CMakeLists.txt
new file mode 100644
index 00000000000..1f76dd7e8b2
--- /dev/null
+++ b/programs/static-files-disk-uploader/CMakeLists.txt
@@ -0,0 +1,9 @@
+set (CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_SOURCES static-files-disk-uploader.cpp)
+
+set (CLICKHOUSE_STATIC_FILES_DISK_UPLOADER_LINK
+    PRIVATE
+        boost::program_options
+        dbms
+)
+
+clickhouse_program_add(static-files-disk-uploader)
diff --git a/programs/static-files-disk-uploader/clickhouse-static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/clickhouse-static-files-disk-uploader.cpp
new file mode 100644
index 00000000000..063604b10b1
--- /dev/null
+++ b/programs/static-files-disk-uploader/clickhouse-static-files-disk-uploader.cpp
@@ -0,0 +1,2 @@
+int mainEntryClickHouseStaticFilesDiskUploader(int argc, char ** argv);
+int main(int argc_, char ** argv_) { return mainEntryClickHouseStaticFilesDiskUploader(argc_, argv_); }
diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
new file mode 100644
index 00000000000..ad3a3090de6
--- /dev/null
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -0,0 +1,197 @@
+#include <Common/Exception.h>
+#include <Common/TerminalSize.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromHTTP.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/copyData.h>
+#include <IO/createReadBufferFromFileBase.h>
+
+#include <boost/program_options.hpp>
+#include <re2/re2.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+#define EXTRACT_PATH_PATTERN ".*\\/store/(.*)"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+/*
+ * A tool to collect table data files on local fs as is (into current directory or into path from --output-dir option).
+ * If test-mode option is added, files will be put by given url via PUT request.
+ */
+
+void processFile(const fs::path & file_path, const fs::path & dst_path, bool test_mode, WriteBuffer & metadata_buf)
+{
+    String remote_path;
+    RE2::FullMatch(file_path.string(), EXTRACT_PATH_PATTERN, &remote_path);
+    bool is_directory = fs::is_directory(file_path);
+
+    writeText(file_path.filename().string(), metadata_buf);
+    writeChar('\t', metadata_buf);
+    writeBoolText(is_directory, metadata_buf);
+    if (!is_directory)
+    {
+        writeChar('\t', metadata_buf);
+        writeIntText(fs::file_size(file_path), metadata_buf);
+    }
+    writeChar('\n', metadata_buf);
+
+    if (is_directory)
+        return;
+
+    auto dst_file_path = fs::path(dst_path) / remote_path;
+
+    auto src_buf = createReadBufferFromFileBase(file_path, {}, fs::file_size(file_path));
+    std::shared_ptr<WriteBuffer> dst_buf;
+
+    /// test mode for integration tests.
+    if (test_mode)
+        dst_buf = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_file_path), Poco::Net::HTTPRequest::HTTP_PUT);
+    else
+        dst_buf = std::make_shared<WriteBufferFromFile>(dst_file_path);
+
+    copyData(*src_buf, *dst_buf);
+    dst_buf->next();
+    dst_buf->finalize();
+};
+
+
+void processTableFiles(const fs::path & data_path, fs::path dst_path, bool test_mode)
+{
+    std::cerr << "Data path: " << data_path << ", destination path: " << dst_path << std::endl;
+
+    String prefix;
+    RE2::FullMatch(data_path.string(), EXTRACT_PATH_PATTERN, &prefix);
+
+    std::shared_ptr<WriteBuffer> root_meta;
+    if (test_mode)
+    {
+        dst_path /= "store";
+        auto files_root = dst_path / prefix;
+        root_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(files_root / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+    }
+    else
+    {
+        dst_path = fs::canonical(dst_path);
+        auto files_root = dst_path / prefix;
+        fs::create_directories(files_root);
+        root_meta = std::make_shared<WriteBufferFromFile>(files_root / ".index");
+    }
+
+    fs::directory_iterator dir_end;
+    for (fs::directory_iterator dir_it(data_path); dir_it != dir_end; ++dir_it)
+    {
+        if (dir_it->is_directory())
+        {
+            processFile(dir_it->path(), dst_path, test_mode, *root_meta);
+
+            String directory_prefix;
+            RE2::FullMatch(dir_it->path().string(), EXTRACT_PATH_PATTERN, &directory_prefix);
+
+            std::shared_ptr<WriteBuffer> directory_meta;
+            if (test_mode)
+            {
+                auto files_root = dst_path / prefix;
+                directory_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_path / directory_prefix / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+            }
+            else
+            {
+                dst_path = fs::canonical(dst_path);
+                auto files_root = dst_path / prefix;
+                fs::create_directories(dst_path / directory_prefix);
+                directory_meta = std::make_shared<WriteBufferFromFile>(dst_path / directory_prefix / ".index");
+            }
+
+            fs::directory_iterator files_end;
+            for (fs::directory_iterator file_it(dir_it->path()); file_it != files_end; ++file_it)
+                processFile(file_it->path(), dst_path, test_mode, *directory_meta);
+
+            directory_meta->next();
+            directory_meta->finalize();
+        }
+        else
+        {
+            processFile(dir_it->path(), dst_path, test_mode, *root_meta);
+        }
+    }
+    root_meta->next();
+    root_meta->finalize();
+}
+}
+
+int mainEntryClickHouseStaticFilesDiskUploader(int argc, char ** argv)
+try
+{
+    using namespace DB;
+    namespace po = boost::program_options;
+
+    po::options_description description("Allowed options", getTerminalWidth());
+    description.add_options()
+        ("help,h", "produce help message")
+        ("metadata-path", po::value<std::string>(), "Metadata path (select data_paths from system.tables where name='table_name'")
+        ("test-mode", "Use test mode, which will put data on given url via PUT")
+        ("url", po::value<std::string>(), "Web server url for test mode")
+        ("output-dir", po::value<std::string>(), "Directory to put files in non-test mode");
+
+    po::parsed_options parsed = po::command_line_parser(argc, argv).options(description).run();
+    po::variables_map options;
+    po::store(parsed, options);
+    po::notify(options);
+
+    if (options.empty() || options.count("help"))
+    {
+        std::cout << description << std::endl;
+        exit(0);
+    }
+
+    String metadata_path;
+
+    if (options.count("metadata-path"))
+        metadata_path = options["metadata-path"].as<std::string>();
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No metadata-path option passed");
+
+    fs::path fs_path = fs::weakly_canonical(metadata_path);
+    if (!fs::exists(fs_path))
+    {
+        std::cerr << fmt::format("Data path ({}) does not exist", fs_path.string());
+        return 1;
+    }
+
+    String root_path;
+    auto test_mode = options.contains("test-mode");
+    if (test_mode)
+    {
+        if (options.count("url"))
+            root_path = options["url"].as<std::string>();
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No url option passed for test mode");
+    }
+    else
+    {
+        if (options.count("output-dir"))
+            root_path = options["output-dir"].as<std::string>();
+        else
+            root_path = fs::current_path();
+    }
+
+    processTableFiles(fs_path, root_path, test_mode);
+
+    return 0;
+}
+catch (...)
+{
+    std::cerr << DB::getCurrentExceptionMessage(false);
+    return 1;
+}
diff --git a/programs/ya.make b/programs/ya.make
deleted file mode 100644
index 2de3052f1d2..00000000000
--- a/programs/ya.make
+++ /dev/null
@@ -1,31 +0,0 @@
-OWNER(g:clickhouse)
-
-PROGRAM(clickhouse)
-
-CFLAGS(
-    -DENABLE_CLICKHOUSE_CLIENT
-    -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
-    -DENABLE_CLICKHOUSE_SERVER
-)
-
-PEERDIR(
-    clickhouse/base/daemon
-    clickhouse/base/loggers
-    clickhouse/src
-)
-
-CFLAGS(-g0)
-
-SRCS(
-    main.cpp
-
-    client/Client.cpp
-    client/QueryFuzzer.cpp
-    client/ConnectionParameters.cpp
-    client/Suggest.cpp
-    extract-from-config/ExtractFromConfig.cpp
-    server/Server.cpp
-    server/MetricsTransmitter.cpp
-)
-
-END()
diff --git a/release b/release
index 9484d79630a..6e6970d7b00 100755
--- a/release
+++ b/release
@@ -60,9 +60,6 @@ then
     elif [[ "$SANITIZER" == "thread" ]]; then VERSION_POSTFIX+="+tsan"
     elif [[ "$SANITIZER" == "memory" ]]; then VERSION_POSTFIX+="+msan"
     elif [[ "$SANITIZER" == "undefined" ]]; then VERSION_POSTFIX+="+ubsan"
-    elif [[ "$SANITIZER" == "libfuzzer" ]]; then
-        VERSION_POSTFIX+="+libfuzzer"
-        MALLOC_OPTS="-DENABLE_TCMALLOC=0 -DENABLE_JEMALLOC=0"
     else
         echo "Unknown value of SANITIZER variable: $SANITIZER"
         exit 3
@@ -71,9 +68,6 @@ then
     export DEB_CC=${DEB_CC=clang-10}
     export DEB_CXX=${DEB_CXX=clang++-10}
     EXTRAPACKAGES="$EXTRAPACKAGES clang-10 lld-10"
-elif [[ $BUILD_TYPE == 'valgrind' ]]; then
-    MALLOC_OPTS="-DENABLE_TCMALLOC=0 -DENABLE_JEMALLOC=0"
-    VERSION_POSTFIX+="+valgrind"
 elif [[ $BUILD_TYPE == 'debug' ]]; then
     CMAKE_BUILD_TYPE=Debug
     VERSION_POSTFIX+="+debug"
diff --git a/src/Access/AccessControlManager.cpp b/src/Access/AccessControlManager.cpp
index 08f1cda2fce..ff3ebdea9f8 100644
--- a/src/Access/AccessControlManager.cpp
+++ b/src/Access/AccessControlManager.cpp
@@ -1,6 +1,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/MultipleAccessStorage.h>
 #include <Access/MemoryAccessStorage.h>
+#include <Access/ReplicatedAccessStorage.h>
 #include <Access/UsersConfigAccessStorage.h>
 #include <Access/DiskAccessStorage.h>
 #include <Access/LDAPAccessStorage.h>
@@ -12,7 +13,7 @@
 #include <Access/SettingsProfilesCache.h>
 #include <Access/ExternalAuthenticators.h>
 #include <Core/Settings.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Poco/ExpireCache.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -225,6 +226,22 @@ void AccessControlManager::startPeriodicReloadingUsersConfigs()
     }
 }
 
+void AccessControlManager::addReplicatedStorage(
+    const String & storage_name_,
+    const String & zookeeper_path_,
+    const zkutil::GetZooKeeper & get_zookeeper_function_)
+{
+    auto storages = getStoragesPtr();
+    for (const auto & storage : *storages)
+    {
+        if (auto replicated_storage = typeid_cast<std::shared_ptr<ReplicatedAccessStorage>>(storage))
+            return;
+    }
+    auto new_storage = std::make_shared<ReplicatedAccessStorage>(storage_name_, zookeeper_path_, get_zookeeper_function_);
+    addStorage(new_storage);
+    LOG_DEBUG(getLogger(), "Added {} access storage '{}'", String(new_storage->getStorageType()), new_storage->getStorageName());
+    new_storage->startup();
+}
 
 void AccessControlManager::addDiskStorage(const String & directory_, bool readonly_)
 {
@@ -322,6 +339,11 @@ void AccessControlManager::addStoragesFromUserDirectoriesConfig(
         {
             addLDAPStorage(name, config, prefix);
         }
+        else if (type == ReplicatedAccessStorage::STORAGE_TYPE)
+        {
+            String zookeeper_path = config.getString(prefix + ".zookeeper_path");
+            addReplicatedStorage(name, zookeeper_path, get_zookeeper_function);
+        }
         else
             throw Exception("Unknown storage type '" + type + "' at " + prefix + " in config", ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG);
     }
diff --git a/src/Access/AccessControlManager.h b/src/Access/AccessControlManager.h
index e41aa80a257..79f7073ef69 100644
--- a/src/Access/AccessControlManager.h
+++ b/src/Access/AccessControlManager.h
@@ -84,6 +84,10 @@ public:
     /// Adds LDAPAccessStorage which allows querying remote LDAP server for user info.
     void addLDAPStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_);
 
+    void addReplicatedStorage(const String & storage_name,
+                              const String & zookeeper_path,
+                              const zkutil::GetZooKeeper & get_zookeeper_function);
+
     /// Adds storages from <users_directories> config.
     void addStoragesFromUserDirectoriesConfig(const Poco::Util::AbstractConfiguration & config,
                                               const String & key,
@@ -139,10 +143,11 @@ public:
 
     std::vector<QuotaUsage> getAllQuotasUsage() const;
 
-    std::shared_ptr<const EnabledSettings> getEnabledSettings(const UUID & user_id,
-                                                              const SettingsProfileElements & settings_from_user,
-                                                              const boost::container::flat_set<UUID> & enabled_roles,
-                                                              const SettingsProfileElements & settings_from_enabled_roles) const;
+    std::shared_ptr<const EnabledSettings> getEnabledSettings(
+        const UUID & user_id,
+        const SettingsProfileElements & settings_from_user,
+        const boost::container::flat_set<UUID> & enabled_roles,
+        const SettingsProfileElements & settings_from_enabled_roles) const;
 
     std::shared_ptr<const SettingsProfilesInfo> getSettingsProfileInfo(const UUID & profile_id);
 
diff --git a/src/Access/AccessEntityIO.cpp b/src/Access/AccessEntityIO.cpp
new file mode 100644
index 00000000000..2160f3e9db8
--- /dev/null
+++ b/src/Access/AccessEntityIO.cpp
@@ -0,0 +1,175 @@
+#include <Access/AccessEntityIO.h>
+#include <Access/IAccessEntity.h>
+#include <Access/IAccessStorage.h>
+#include <Access/Quota.h>
+#include <Access/Role.h>
+#include <Access/RowPolicy.h>
+#include <Access/SettingsProfile.h>
+#include <Access/User.h>
+#include <Core/Defines.h>
+#include <Interpreters/InterpreterCreateQuotaQuery.h>
+#include <Interpreters/InterpreterCreateRoleQuery.h>
+#include <Interpreters/InterpreterCreateRowPolicyQuery.h>
+#include <Interpreters/InterpreterCreateSettingsProfileQuery.h>
+#include <Interpreters/InterpreterCreateUserQuery.h>
+#include <Interpreters/InterpreterGrantQuery.h>
+#include <Interpreters/InterpreterShowCreateAccessEntityQuery.h>
+#include <Interpreters/InterpreterShowGrantsQuery.h>
+#include <Parsers/ASTCreateQuotaQuery.h>
+#include <Parsers/ASTCreateRoleQuery.h>
+#include <Parsers/ASTCreateRowPolicyQuery.h>
+#include <Parsers/ASTCreateSettingsProfileQuery.h>
+#include <Parsers/ASTCreateUserQuery.h>
+#include <Parsers/ASTGrantQuery.h>
+#include <Parsers/ParserCreateQuotaQuery.h>
+#include <Parsers/ParserCreateRoleQuery.h>
+#include <Parsers/ParserCreateRowPolicyQuery.h>
+#include <Parsers/ParserCreateSettingsProfileQuery.h>
+#include <Parsers/ParserCreateUserQuery.h>
+#include <Parsers/ParserGrantQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
+#include <boost/range/algorithm/copy.hpp>
+#include <boost/range/algorithm_ext/push_back.hpp>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int INCORRECT_ACCESS_ENTITY_DEFINITION;
+}
+
+using EntityType = IAccessStorage::EntityType;
+using EntityTypeInfo = IAccessStorage::EntityTypeInfo;
+
+namespace
+{
+    /// Special parser for the 'ATTACH access entity' queries.
+    class ParserAttachAccessEntity : public IParserBase
+    {
+    protected:
+        const char * getName() const override { return "ATTACH access entity query"; }
+
+        bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
+        {
+            ParserCreateUserQuery create_user_p;
+            ParserCreateRoleQuery create_role_p;
+            ParserCreateRowPolicyQuery create_policy_p;
+            ParserCreateQuotaQuery create_quota_p;
+            ParserCreateSettingsProfileQuery create_profile_p;
+            ParserGrantQuery grant_p;
+
+            create_user_p.useAttachMode();
+            create_role_p.useAttachMode();
+            create_policy_p.useAttachMode();
+            create_quota_p.useAttachMode();
+            create_profile_p.useAttachMode();
+            grant_p.useAttachMode();
+
+            return create_user_p.parse(pos, node, expected) || create_role_p.parse(pos, node, expected)
+                || create_policy_p.parse(pos, node, expected) || create_quota_p.parse(pos, node, expected)
+                || create_profile_p.parse(pos, node, expected) || grant_p.parse(pos, node, expected);
+        }
+    };
+
+}
+
+
+String serializeAccessEntity(const IAccessEntity & entity)
+{
+    /// Build list of ATTACH queries.
+    ASTs queries;
+    queries.push_back(InterpreterShowCreateAccessEntityQuery::getAttachQuery(entity));
+    if ((entity.getType() == EntityType::USER) || (entity.getType() == EntityType::ROLE))
+        boost::range::push_back(queries, InterpreterShowGrantsQuery::getAttachGrantQueries(entity));
+
+    /// Serialize the list of ATTACH queries to a string.
+    WriteBufferFromOwnString buf;
+    for (const ASTPtr & query : queries)
+    {
+        formatAST(*query, buf, false, true);
+        buf.write(";\n", 2);
+    }
+    return buf.str();
+}
+
+AccessEntityPtr deserializeAccessEntity(const String & definition, const String & path)
+{
+    ASTs queries;
+    ParserAttachAccessEntity parser;
+    const char * begin = definition.data(); /// begin of current query
+    const char * pos = begin; /// parser moves pos from begin to the end of current query
+    const char * end = begin + definition.size();
+    while (pos < end)
+    {
+        queries.emplace_back(parseQueryAndMovePosition(parser, pos, end, "", true, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH));
+        while (isWhitespaceASCII(*pos) || *pos == ';')
+            ++pos;
+    }
+
+    /// Interpret the AST to build an access entity.
+    std::shared_ptr<User> user;
+    std::shared_ptr<Role> role;
+    std::shared_ptr<RowPolicy> policy;
+    std::shared_ptr<Quota> quota;
+    std::shared_ptr<SettingsProfile> profile;
+    AccessEntityPtr res;
+
+    for (const auto & query : queries)
+    {
+        if (auto * create_user_query = query->as<ASTCreateUserQuery>())
+        {
+            if (res)
+                throw Exception("Two access entities attached in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+            res = user = std::make_unique<User>();
+            InterpreterCreateUserQuery::updateUserFromQuery(*user, *create_user_query);
+        }
+        else if (auto * create_role_query = query->as<ASTCreateRoleQuery>())
+        {
+            if (res)
+                throw Exception("Two access entities attached in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+            res = role = std::make_unique<Role>();
+            InterpreterCreateRoleQuery::updateRoleFromQuery(*role, *create_role_query);
+        }
+        else if (auto * create_policy_query = query->as<ASTCreateRowPolicyQuery>())
+        {
+            if (res)
+                throw Exception("Two access entities attached in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+            res = policy = std::make_unique<RowPolicy>();
+            InterpreterCreateRowPolicyQuery::updateRowPolicyFromQuery(*policy, *create_policy_query);
+        }
+        else if (auto * create_quota_query = query->as<ASTCreateQuotaQuery>())
+        {
+            if (res)
+                throw Exception("Two access entities attached in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+            res = quota = std::make_unique<Quota>();
+            InterpreterCreateQuotaQuery::updateQuotaFromQuery(*quota, *create_quota_query);
+        }
+        else if (auto * create_profile_query = query->as<ASTCreateSettingsProfileQuery>())
+        {
+            if (res)
+                throw Exception("Two access entities attached in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+            res = profile = std::make_unique<SettingsProfile>();
+            InterpreterCreateSettingsProfileQuery::updateSettingsProfileFromQuery(*profile, *create_profile_query);
+        }
+        else if (auto * grant_query = query->as<ASTGrantQuery>())
+        {
+            if (!user && !role)
+                throw Exception(
+                    "A user or role should be attached before grant in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+            if (user)
+                InterpreterGrantQuery::updateUserFromQuery(*user, *grant_query);
+            else
+                InterpreterGrantQuery::updateRoleFromQuery(*role, *grant_query);
+        }
+        else
+            throw Exception("No interpreter found for query " + query->getID(), ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+    }
+
+    if (!res)
+        throw Exception("No access entities attached in " + path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
+
+    return res;
+}
+
+}
diff --git a/src/Access/AccessEntityIO.h b/src/Access/AccessEntityIO.h
new file mode 100644
index 00000000000..94dc027430e
--- /dev/null
+++ b/src/Access/AccessEntityIO.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Access/IAccessEntity.h>
+
+namespace DB
+{
+
+String serializeAccessEntity(const IAccessEntity & entity);
+
+AccessEntityPtr deserializeAccessEntity(const String & definition, const String & path);
+
+}
diff --git a/src/Access/AccessFlags.h b/src/Access/AccessFlags.h
index 7e32f423564..b107248e02b 100644
--- a/src/Access/AccessFlags.h
+++ b/src/Access/AccessFlags.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Access/AccessType.h>
-#include <common/types.h>
-#include <common/range.h>
+#include <base/types.h>
+#include <base/range.h>
 #include <Common/Exception.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
diff --git a/src/Access/AccessRights.cpp b/src/Access/AccessRights.cpp
index d4b2dc8a252..6cc1292a9f5 100644
--- a/src/Access/AccessRights.cpp
+++ b/src/Access/AccessRights.cpp
@@ -1,5 +1,5 @@
 #include <Access/AccessRights.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <boost/container/small_vector.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/sort.hpp>
diff --git a/src/Access/AccessRights.h b/src/Access/AccessRights.h
index a90616ea27f..2657b66d824 100644
--- a/src/Access/AccessRights.h
+++ b/src/Access/AccessRights.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Access/AccessRightsElement.h>
 #include <memory>
 #include <vector>
diff --git a/src/Access/AccessRightsElement.h b/src/Access/AccessRightsElement.h
index c76f019bc61..c46a4b54e6e 100644
--- a/src/Access/AccessRightsElement.h
+++ b/src/Access/AccessRightsElement.h
@@ -122,6 +122,9 @@ struct AccessRightsElement
 class AccessRightsElements : public std::vector<AccessRightsElement>
 {
 public:
+    using Base = std::vector<AccessRightsElement>;
+    using Base::Base;
+
     bool empty() const { return std::all_of(begin(), end(), [](const AccessRightsElement & e) { return e.empty(); }); }
 
     bool sameDatabaseAndTable() const
diff --git a/src/Access/AccessType.h b/src/Access/AccessType.h
index 02d7e4982f9..aa7dcbb006b 100644
--- a/src/Access/AccessType.h
+++ b/src/Access/AccessType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <array>
@@ -43,7 +43,9 @@ enum class AccessType
     M(ALTER_COMMENT_COLUMN, "COMMENT COLUMN", COLUMN, ALTER_COLUMN) \
     M(ALTER_CLEAR_COLUMN, "CLEAR COLUMN", COLUMN, ALTER_COLUMN) \
     M(ALTER_RENAME_COLUMN, "RENAME COLUMN", COLUMN, ALTER_COLUMN) \
+    M(ALTER_MATERIALIZE_COLUMN, "MATERIALIZE COLUMN", COLUMN, ALTER_COLUMN) \
     M(ALTER_COLUMN, "", GROUP, ALTER_TABLE) /* allow to execute ALTER {ADD|DROP|MODIFY...} COLUMN */\
+    M(ALTER_MODIFY_COMMENT, "MODIFY COMMENT", TABLE, ALTER_TABLE) /* modify table comment */\
     \
     M(ALTER_ORDER_BY, "ALTER MODIFY ORDER BY, MODIFY ORDER BY", TABLE, ALTER_INDEX) \
     M(ALTER_SAMPLE_BY, "ALTER MODIFY SAMPLE BY, MODIFY SAMPLE BY", TABLE, ALTER_INDEX) \
@@ -71,7 +73,10 @@ enum class AccessType
     M(ALTER_FETCH_PARTITION, "ALTER FETCH PART, FETCH PARTITION", TABLE, ALTER_TABLE) \
     M(ALTER_FREEZE_PARTITION, "FREEZE PARTITION, UNFREEZE", TABLE, ALTER_TABLE) \
     \
+    M(ALTER_DATABASE_SETTINGS, "ALTER DATABASE SETTING, ALTER MODIFY DATABASE SETTING, MODIFY DATABASE SETTING", DATABASE, ALTER_DATABASE) /* allows to execute ALTER MODIFY SETTING */\
+    \
     M(ALTER_TABLE, "", GROUP, ALTER) \
+    M(ALTER_DATABASE, "", GROUP, ALTER) \
     \
     M(ALTER_VIEW_REFRESH, "ALTER LIVE VIEW REFRESH, REFRESH VIEW", VIEW, ALTER_VIEW) \
     M(ALTER_VIEW_MODIFY_QUERY, "ALTER TABLE MODIFY QUERY", VIEW, ALTER_VIEW) \
@@ -87,6 +92,7 @@ enum class AccessType
     M(CREATE_DICTIONARY, "", DICTIONARY, CREATE) /* allows to execute {CREATE|ATTACH} DICTIONARY */\
     M(CREATE_TEMPORARY_TABLE, "", GLOBAL, CREATE) /* allows to create and manipulate temporary tables;
                                                      implicitly enabled by the grant CREATE_TABLE on any table */ \
+    M(CREATE_FUNCTION, "", DATABASE, CREATE) /* allows to execute CREATE FUNCTION */ \
     M(CREATE, "", GROUP, ALL) /* allows to execute {CREATE|ATTACH} */ \
     \
     M(DROP_DATABASE, "", DATABASE, DROP) /* allows to execute {DROP|DETACH} DATABASE */\
@@ -94,6 +100,7 @@ enum class AccessType
     M(DROP_VIEW, "", VIEW, DROP) /* allows to execute {DROP|DETACH} TABLE for views;
                                     implicitly enabled by the grant DROP_TABLE */\
     M(DROP_DICTIONARY, "", DICTIONARY, DROP) /* allows to execute {DROP|DETACH} DICTIONARY */\
+    M(DROP_FUNCTION, "", DATABASE, DROP) /* allows to execute DROP FUNCTION */\
     M(DROP, "", GROUP, ALL) /* allows to execute {DROP|DETACH} */\
     \
     M(TRUNCATE, "TRUNCATE TABLE", TABLE, ALL) \
@@ -103,7 +110,7 @@ enum class AccessType
                                       (anyone can kill his own queries) */\
     \
     M(MOVE_PARTITION_BETWEEN_SHARDS, "", GLOBAL, ALL) /* required to be able to move a part/partition to a table
-                                                         identified by it's ZooKeeper path */\
+                                                         identified by its ZooKeeper path */\
     \
     M(CREATE_USER, "", GLOBAL, ACCESS_MANAGEMENT) \
     M(ALTER_USER, "", GLOBAL, ACCESS_MANAGEMENT) \
@@ -140,6 +147,7 @@ enum class AccessType
     M(SYSTEM_RELOAD_SYMBOLS, "RELOAD SYMBOLS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_DICTIONARY, "SYSTEM RELOAD DICTIONARIES, RELOAD DICTIONARY, RELOAD DICTIONARIES", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_MODEL, "SYSTEM RELOAD MODELS, RELOAD MODEL, RELOAD MODELS", GLOBAL, SYSTEM_RELOAD) \
+    M(SYSTEM_RELOAD_FUNCTION, "SYSTEM RELOAD FUNCTIONS, RELOAD FUNCTION, RELOAD FUNCTIONS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_EMBEDDED_DICTIONARIES, "RELOAD EMBEDDED DICTIONARIES", GLOBAL, SYSTEM_RELOAD) /* implicitly enabled by the grant SYSTEM_RELOAD_DICTIONARY ON *.* */\
     M(SYSTEM_RELOAD, "", GROUP, SYSTEM) \
     M(SYSTEM_RESTART_DISK, "SYSTEM RESTART DISK", GLOBAL, SYSTEM) \
diff --git a/src/Access/AllowedClientHosts.cpp b/src/Access/AllowedClientHosts.cpp
index 5ac05bea88d..f306b1386dd 100644
--- a/src/Access/AllowedClientHosts.cpp
+++ b/src/Access/AllowedClientHosts.cpp
@@ -1,8 +1,7 @@
 #include <Access/AllowedClientHosts.h>
 #include <Common/Exception.h>
-#include <common/SimpleCache.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Functions/likePatternToRegexp.h>
 #include <Poco/Net/SocketAddress.h>
 #include <Poco/RegularExpression.h>
diff --git a/src/Access/AllowedClientHosts.h b/src/Access/AllowedClientHosts.h
index 7b21fd7e236..30c0dac076e 100644
--- a/src/Access/AllowedClientHosts.h
+++ b/src/Access/AllowedClientHosts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Net/IPAddress.h>
 #include <memory>
 #include <vector>
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 54d94d905ae..f07bdb10578 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -5,6 +5,7 @@
 #include <Access/GSSAcceptor.h>
 #include <Common/Exception.h>
 #include <Poco/SHA1Engine.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
@@ -12,41 +13,57 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
-    extern const int LOGICAL_ERROR;
 }
 
-
-Authentication::Digest Authentication::getPasswordDoubleSHA1() const
+namespace
 {
-    switch (type)
+    using Digest = Authentication::Digest;
+    using Util = Authentication::Util;
+
+    bool checkPasswordPlainText(const String & password, const Digest & password_plaintext)
     {
-        case NO_PASSWORD:
-        {
-            Poco::SHA1Engine engine;
-            return engine.digest();
-        }
-
-        case PLAINTEXT_PASSWORD:
-        {
-            Poco::SHA1Engine engine;
-            engine.update(getPassword());
-            const Digest & first_sha1 = engine.digest();
-            engine.update(first_sha1.data(), first_sha1.size());
-            return engine.digest();
-        }
-
-        case DOUBLE_SHA1_PASSWORD:
-            return password_hash;
-
-        case SHA256_PASSWORD:
-        case LDAP:
-        case KERBEROS:
-            throw Exception("Cannot get password double SHA1 hash for authentication type " + toString(type), ErrorCodes::LOGICAL_ERROR);
-
-        case MAX_TYPE:
-            break;
+        return (Util::encodePlainText(password) == password_plaintext);
+    }
+
+    bool checkPasswordDoubleSHA1(const std::string_view & password, const Digest & password_double_sha1)
+    {
+        return (Util::encodeDoubleSHA1(password) == password_double_sha1);
+    }
+
+    bool checkPasswordSHA256(const std::string_view & password, const Digest & password_sha256)
+    {
+        return Util::encodeSHA256(password) == password_sha256;
+    }
+
+    bool checkPasswordDoubleSHA1MySQL(const std::string_view & scramble, const std::string_view & scrambled_password, const Digest & password_double_sha1)
+    {
+        /// scrambled_password = SHA1(password) XOR SHA1(scramble <concat> SHA1(SHA1(password)))
+
+        constexpr size_t scramble_length = 20;
+        constexpr size_t sha1_size = Poco::SHA1Engine::DIGEST_SIZE;
+
+        if ((scramble.size() < scramble_length) || (scramble.size() > scramble_length + 1)
+            || ((scramble.size() == scramble_length + 1) && (scramble[scramble_length] != 0))
+            || (scrambled_password.size() != sha1_size) || (password_double_sha1.size() != sha1_size))
+            return false;
+
+        Poco::SHA1Engine engine;
+        engine.update(scramble.data(), scramble_length);
+        engine.update(password_double_sha1.data(), sha1_size);
+        const Poco::SHA1Engine::Digest & digest = engine.digest();
+
+        Poco::SHA1Engine::Digest calculated_password_sha1(sha1_size);
+        for (size_t i = 0; i < sha1_size; i++)
+            calculated_password_sha1[i] = scrambled_password[i] ^ digest[i];
+
+        auto calculated_password_double_sha1 = Util::encodeSHA1(calculated_password_sha1);
+        return calculated_password_double_sha1 == password_double_sha1;
+    }
+
+    bool checkPasswordPlainTextMySQL(const std::string_view & scramble, const std::string_view & scrambled_password, const Digest & password_plaintext)
+    {
+        return checkPasswordDoubleSHA1MySQL(scramble, scrambled_password, Util::encodeDoubleSHA1(password_plaintext));
     }
-    throw Exception("getPasswordDoubleSHA1(): authentication type " + toString(type) + " not supported", ErrorCodes::NOT_IMPLEMENTED);
 }
 
 
@@ -55,7 +72,7 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
     if (!credentials.isReady())
         return false;
 
-    if (const auto * gss_acceptor_context = dynamic_cast<const GSSAcceptorContext *>(&credentials))
+    if (const auto * gss_acceptor_context = typeid_cast<const GSSAcceptorContext *>(&credentials))
     {
         switch (type)
         {
@@ -74,7 +91,7 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
         }
     }
 
-    if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials))
+    if (const auto * mysql_credentials = typeid_cast<const MySQLNative41Credentials *>(&credentials))
     {
         switch (type)
         {
@@ -82,28 +99,36 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
                 return true; // N.B. even if the password is not empty!
 
             case PLAINTEXT_PASSWORD:
-            {
-                if (basic_credentials->getPassword() == std::string_view{reinterpret_cast<const char *>(password_hash.data()), password_hash.size()})
-                    return true;
-
-                // For compatibility with MySQL clients which support only native authentication plugin, SHA1 can be passed instead of password.
-                const auto password_sha1 = encodeSHA1(password_hash);
-                return basic_credentials->getPassword() == std::string_view{reinterpret_cast<const char *>(password_sha1.data()), password_sha1.size()};
-            }
-
-            case SHA256_PASSWORD:
-                return encodeSHA256(basic_credentials->getPassword()) == password_hash;
+                return checkPasswordPlainTextMySQL(mysql_credentials->getScramble(), mysql_credentials->getScrambledPassword(), password_hash);
 
             case DOUBLE_SHA1_PASSWORD:
-            {
-                const auto first_sha1 = encodeSHA1(basic_credentials->getPassword());
+                return checkPasswordDoubleSHA1MySQL(mysql_credentials->getScramble(), mysql_credentials->getScrambledPassword(), password_hash);
 
-                /// If it was MySQL compatibility server, then first_sha1 already contains double SHA1.
-                if (first_sha1 == password_hash)
-                    return true;
+            case SHA256_PASSWORD:
+            case LDAP:
+            case KERBEROS:
+                throw Require<BasicCredentials>("ClickHouse Basic Authentication");
 
-                return encodeSHA1(first_sha1) == password_hash;
-            }
+            case MAX_TYPE:
+                break;
+        }
+    }
+
+    if (const auto * basic_credentials = typeid_cast<const BasicCredentials *>(&credentials))
+    {
+        switch (type)
+        {
+            case NO_PASSWORD:
+                return true; // N.B. even if the password is not empty!
+
+            case PLAINTEXT_PASSWORD:
+                return checkPasswordPlainText(basic_credentials->getPassword(), password_hash);
+
+            case SHA256_PASSWORD:
+                return checkPasswordSHA256(basic_credentials->getPassword(), password_hash);
+
+            case DOUBLE_SHA1_PASSWORD:
+                return checkPasswordDoubleSHA1(basic_credentials->getPassword(), password_hash);
 
             case LDAP:
                 return external_authenticators.checkLDAPCredentials(ldap_server_name, *basic_credentials);
@@ -116,7 +141,7 @@ bool Authentication::areCredentialsValid(const Credentials & credentials, const
         }
     }
 
-    if ([[maybe_unused]] const auto * always_allow_credentials = dynamic_cast<const AlwaysAllowCredentials *>(&credentials))
+    if ([[maybe_unused]] const auto * always_allow_credentials = typeid_cast<const AlwaysAllowCredentials *>(&credentials))
         return true;
 
     throw Exception("areCredentialsValid(): authentication type " + toString(type) + " not supported", ErrorCodes::NOT_IMPLEMENTED);
diff --git a/src/Access/Authentication.h b/src/Access/Authentication.h
index 54542cb504a..e43d3793ee0 100644
--- a/src/Access/Authentication.h
+++ b/src/Access/Authentication.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Poco/SHA1Engine.h>
@@ -86,18 +86,12 @@ public:
 
     /// Sets the password as a string of hexadecimal digits.
     void setPasswordHashHex(const String & hash);
-
     String getPasswordHashHex() const;
 
     /// Sets the password in binary form.
     void setPasswordHashBinary(const Digest & hash);
-
     const Digest & getPasswordHashBinary() const { return password_hash; }
 
-    /// Returns SHA1(SHA1(password)) used by MySQL compatibility server for authentication.
-    /// Allowed to use for Type::NO_PASSWORD, Type::PLAINTEXT_PASSWORD, Type::DOUBLE_SHA1_PASSWORD.
-    Digest getPasswordDoubleSHA1() const;
-
     /// Sets the server name for authentication type LDAP.
     const String & getLDAPServerName() const;
     void setLDAPServerName(const String & name);
@@ -112,13 +106,17 @@ public:
     friend bool operator ==(const Authentication & lhs, const Authentication & rhs) { return (lhs.type == rhs.type) && (lhs.password_hash == rhs.password_hash); }
     friend bool operator !=(const Authentication & lhs, const Authentication & rhs) { return !(lhs == rhs); }
 
-private:
-    static Digest encodePlainText(const std::string_view & text) { return Digest(text.data(), text.data() + text.size()); }
-    static Digest encodeSHA256(const std::string_view & text);
-    static Digest encodeSHA1(const std::string_view & text);
-    static Digest encodeSHA1(const Digest & text) { return encodeSHA1(std::string_view{reinterpret_cast<const char *>(text.data()), text.size()}); }
-    static Digest encodeDoubleSHA1(const std::string_view & text) { return encodeSHA1(encodeSHA1(text)); }
+    struct Util
+    {
+        static Digest encodePlainText(const std::string_view & text) { return Digest(text.data(), text.data() + text.size()); }
+        static Digest encodeSHA256(const std::string_view & text);
+        static Digest encodeSHA1(const std::string_view & text);
+        static Digest encodeSHA1(const Digest & text) { return encodeSHA1(std::string_view{reinterpret_cast<const char *>(text.data()), text.size()}); }
+        static Digest encodeDoubleSHA1(const std::string_view & text) { return encodeSHA1(encodeSHA1(text)); }
+        static Digest encodeDoubleSHA1(const Digest & text) { return encodeSHA1(encodeSHA1(text)); }
+    };
 
+private:
     Type type = Type::NO_PASSWORD;
     Digest password_hash;
     String ldap_server_name;
@@ -192,7 +190,7 @@ inline String toString(Authentication::Type type_)
 }
 
 
-inline Authentication::Digest Authentication::encodeSHA256(const std::string_view & text [[maybe_unused]])
+inline Authentication::Digest Authentication::Util::encodeSHA256(const std::string_view & text [[maybe_unused]])
 {
 #if USE_SSL
     Digest hash;
@@ -206,7 +204,7 @@ inline Authentication::Digest Authentication::encodeSHA256(const std::string_vie
 #endif
 }
 
-inline Authentication::Digest Authentication::encodeSHA1(const std::string_view & text)
+inline Authentication::Digest Authentication::Util::encodeSHA1(const std::string_view & text)
 {
     Poco::SHA1Engine engine;
     engine.update(text.data(), text.size());
@@ -219,13 +217,13 @@ inline void Authentication::setPassword(const String & password_)
     switch (type)
     {
         case PLAINTEXT_PASSWORD:
-            return setPasswordHashBinary(encodePlainText(password_));
+            return setPasswordHashBinary(Util::encodePlainText(password_));
 
         case SHA256_PASSWORD:
-            return setPasswordHashBinary(encodeSHA256(password_));
+            return setPasswordHashBinary(Util::encodeSHA256(password_));
 
         case DOUBLE_SHA1_PASSWORD:
-            return setPasswordHashBinary(encodeDoubleSHA1(password_));
+            return setPasswordHashBinary(Util::encodeDoubleSHA1(password_));
 
         case NO_PASSWORD:
         case LDAP:
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index 39b57a40e7a..a186ffb3495 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -14,7 +14,7 @@
 #include <Core/Settings.h>
 #include <IO/WriteHelpers.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/algorithm/set_algorithm.hpp>
 #include <assert.h>
@@ -119,8 +119,10 @@ namespace
         AccessRights res = access;
         res.modifyFlags(modifier);
 
-        /// Anyone has access to the "system" database.
+        /// Anyone has access to the "system" and "information_schema" database.
         res.grant(AccessType::SELECT, DatabaseCatalog::SYSTEM_DATABASE);
+        res.grant(AccessType::SELECT, DatabaseCatalog::INFORMATION_SCHEMA);
+        res.grant(AccessType::SELECT, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE);
         return res;
     }
 
diff --git a/src/Access/ContextAccess.h b/src/Access/ContextAccess.h
index 70145b0a3ef..8f5f5a096e7 100644
--- a/src/Access/ContextAccess.h
+++ b/src/Access/ContextAccess.h
@@ -4,8 +4,8 @@
 #include <Access/RowPolicy.h>
 #include <Interpreters/ClientInfo.h>
 #include <Core/UUID.h>
-#include <common/scope_guard.h>
-#include <common/shared_ptr_helper.h>
+#include <base/scope_guard.h>
+#include <base/shared_ptr_helper.h>
 #include <boost/container/flat_set.hpp>
 #include <mutex>
 
@@ -70,6 +70,7 @@ public:
     /// Returns the current user. The function can return nullptr.
     UserPtr getUser() const;
     String getUserName() const;
+    std::optional<UUID> getUserID() const { return getParams().user_id; }
 
     /// Returns information about current and enabled roles.
     std::shared_ptr<const EnabledRolesInfo> getRolesInfo() const;
diff --git a/src/Access/Credentials.h b/src/Access/Credentials.h
index 5e9fd1589e0..4992199f64c 100644
--- a/src/Access/Credentials.h
+++ b/src/Access/Credentials.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <memory>
 
 
@@ -26,6 +26,8 @@ protected:
     String user_name;
 };
 
+/// Does not check the password/credentials and that the specified host is allowed.
+/// (Used only internally in cluster, if the secret matches)
 class AlwaysAllowCredentials
     : public Credentials
 {
@@ -52,4 +54,26 @@ private:
     String password;
 };
 
+class CredentialsWithScramble : public Credentials
+{
+public:
+    explicit CredentialsWithScramble(const String & user_name_, const String & scramble_, const String & scrambled_password_)
+        : Credentials(user_name_), scramble(scramble_), scrambled_password(scrambled_password_)
+    {
+        is_ready = true;
+    }
+
+    const String & getScramble() const { return scramble; }
+    const String & getScrambledPassword() const { return scrambled_password; }
+
+private:
+    String scramble;
+    String scrambled_password;
+};
+
+class MySQLNative41Credentials : public CredentialsWithScramble
+{
+    using CredentialsWithScramble::CredentialsWithScramble;
+};
+
 }
diff --git a/src/Access/DiskAccessStorage.cpp b/src/Access/DiskAccessStorage.cpp
index 2c074e3d0b0..e3d773f4d91 100644
--- a/src/Access/DiskAccessStorage.cpp
+++ b/src/Access/DiskAccessStorage.cpp
@@ -4,41 +4,21 @@
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromString.h>
+#include <Access/AccessEntityIO.h>
 #include <Access/User.h>
 #include <Access/Role.h>
 #include <Access/RowPolicy.h>
 #include <Access/Quota.h>
-#include <Access/SettingsProfile.h>
 #include <Parsers/ASTCreateUserQuery.h>
-#include <Parsers/ASTCreateRoleQuery.h>
-#include <Parsers/ASTCreateRowPolicyQuery.h>
-#include <Parsers/ASTCreateQuotaQuery.h>
-#include <Parsers/ASTCreateSettingsProfileQuery.h>
-#include <Parsers/ASTGrantQuery.h>
-#include <Parsers/ParserCreateUserQuery.h>
-#include <Parsers/ParserCreateRoleQuery.h>
-#include <Parsers/ParserCreateRowPolicyQuery.h>
-#include <Parsers/ParserCreateQuotaQuery.h>
-#include <Parsers/ParserCreateSettingsProfileQuery.h>
-#include <Parsers/ParserGrantQuery.h>
 #include <Parsers/formatAST.h>
-#include <Parsers/parseQuery.h>
 #include <Interpreters/InterpreterCreateUserQuery.h>
-#include <Interpreters/InterpreterCreateRoleQuery.h>
-#include <Interpreters/InterpreterCreateRowPolicyQuery.h>
-#include <Interpreters/InterpreterCreateQuotaQuery.h>
-#include <Interpreters/InterpreterCreateSettingsProfileQuery.h>
-#include <Interpreters/InterpreterGrantQuery.h>
-#include <Interpreters/InterpreterShowCreateAccessEntityQuery.h>
 #include <Interpreters/InterpreterShowGrantsQuery.h>
 #include <Common/quoteString.h>
-#include <Core/Defines.h>
+#include <base/logger_useful.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
 #include <boost/range/adaptor/map.hpp>
-#include <boost/range/algorithm/copy.hpp>
-#include <boost/range/algorithm_ext/push_back.hpp>
 #include <filesystem>
 #include <fstream>
 
@@ -49,7 +29,6 @@ namespace ErrorCodes
 {
     extern const int DIRECTORY_DOESNT_EXIST;
     extern const int FILE_DOESNT_EXIST;
-    extern const int INCORRECT_ACCESS_ENTITY_DEFINITION;
 }
 
 
@@ -58,34 +37,6 @@ namespace
     using EntityType = IAccessStorage::EntityType;
     using EntityTypeInfo = IAccessStorage::EntityTypeInfo;
 
-    /// Special parser for the 'ATTACH access entity' queries.
-    class ParserAttachAccessEntity : public IParserBase
-    {
-    protected:
-        const char * getName() const override { return "ATTACH access entity query"; }
-
-        bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
-        {
-            ParserCreateUserQuery create_user_p;
-            ParserCreateRoleQuery create_role_p;
-            ParserCreateRowPolicyQuery create_policy_p;
-            ParserCreateQuotaQuery create_quota_p;
-            ParserCreateSettingsProfileQuery create_profile_p;
-            ParserGrantQuery grant_p;
-
-            create_user_p.useAttachMode();
-            create_role_p.useAttachMode();
-            create_policy_p.useAttachMode();
-            create_quota_p.useAttachMode();
-            create_profile_p.useAttachMode();
-            grant_p.useAttachMode();
-
-            return create_user_p.parse(pos, node, expected) || create_role_p.parse(pos, node, expected)
-                || create_policy_p.parse(pos, node, expected) || create_quota_p.parse(pos, node, expected)
-                || create_profile_p.parse(pos, node, expected) || grant_p.parse(pos, node, expected);
-        }
-    };
-
 
     /// Reads a file containing ATTACH queries and then parses it to build an access entity.
     AccessEntityPtr readEntityFile(const String & file_path)
@@ -96,80 +47,7 @@ namespace
         readStringUntilEOF(file_contents, in);
 
         /// Parse the file contents.
-        ASTs queries;
-        ParserAttachAccessEntity parser;
-        const char * begin = file_contents.data(); /// begin of current query
-        const char * pos = begin; /// parser moves pos from begin to the end of current query
-        const char * end = begin + file_contents.size();
-        while (pos < end)
-        {
-            queries.emplace_back(parseQueryAndMovePosition(parser, pos, end, "", true, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH));
-            while (isWhitespaceASCII(*pos) || *pos == ';')
-                ++pos;
-        }
-
-        /// Interpret the AST to build an access entity.
-        std::shared_ptr<User> user;
-        std::shared_ptr<Role> role;
-        std::shared_ptr<RowPolicy> policy;
-        std::shared_ptr<Quota> quota;
-        std::shared_ptr<SettingsProfile> profile;
-        AccessEntityPtr res;
-
-        for (const auto & query : queries)
-        {
-            if (auto * create_user_query = query->as<ASTCreateUserQuery>())
-            {
-                if (res)
-                    throw Exception("Two access entities in one file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-                res = user = std::make_unique<User>();
-                InterpreterCreateUserQuery::updateUserFromQuery(*user, *create_user_query);
-            }
-            else if (auto * create_role_query = query->as<ASTCreateRoleQuery>())
-            {
-                if (res)
-                    throw Exception("Two access entities in one file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-                res = role = std::make_unique<Role>();
-                InterpreterCreateRoleQuery::updateRoleFromQuery(*role, *create_role_query);
-            }
-            else if (auto * create_policy_query = query->as<ASTCreateRowPolicyQuery>())
-            {
-                if (res)
-                    throw Exception("Two access entities in one file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-                res = policy = std::make_unique<RowPolicy>();
-                InterpreterCreateRowPolicyQuery::updateRowPolicyFromQuery(*policy, *create_policy_query);
-            }
-            else if (auto * create_quota_query = query->as<ASTCreateQuotaQuery>())
-            {
-                if (res)
-                    throw Exception("Two access entities are attached in the same file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-                res = quota = std::make_unique<Quota>();
-                InterpreterCreateQuotaQuery::updateQuotaFromQuery(*quota, *create_quota_query);
-            }
-            else if (auto * create_profile_query = query->as<ASTCreateSettingsProfileQuery>())
-            {
-                if (res)
-                    throw Exception("Two access entities are attached in the same file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-                res = profile = std::make_unique<SettingsProfile>();
-                InterpreterCreateSettingsProfileQuery::updateSettingsProfileFromQuery(*profile, *create_profile_query);
-            }
-            else if (auto * grant_query = query->as<ASTGrantQuery>())
-            {
-                if (!user && !role)
-                    throw Exception("A user or role should be attached before grant in file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-                if (user)
-                    InterpreterGrantQuery::updateUserFromQuery(*user, *grant_query);
-                else
-                    InterpreterGrantQuery::updateRoleFromQuery(*role, *grant_query);
-            }
-            else
-                throw Exception("No interpreter found for query " + query->getID(), ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-        }
-
-        if (!res)
-            throw Exception("No access entities attached in file " + file_path, ErrorCodes::INCORRECT_ACCESS_ENTITY_DEFINITION);
-
-        return res;
+        return deserializeAccessEntity(file_contents, file_path);
     }
 
 
@@ -186,24 +64,10 @@ namespace
         }
     }
 
-
     /// Writes ATTACH queries for building a specified access entity to a file.
     void writeEntityFile(const String & file_path, const IAccessEntity & entity)
     {
-        /// Build list of ATTACH queries.
-        ASTs queries;
-        queries.push_back(InterpreterShowCreateAccessEntityQuery::getAttachQuery(entity));
-        if ((entity.getType() == EntityType::USER) || (entity.getType() == EntityType::ROLE))
-            boost::range::push_back(queries, InterpreterShowGrantsQuery::getAttachGrantQueries(entity));
-
-        /// Serialize the list of ATTACH queries to a string.
-        WriteBufferFromOwnString buf;
-        for (const ASTPtr & query : queries)
-        {
-            formatAST(*query, buf, false, true);
-            buf.write(";\n", 2);
-        }
-        String file_contents = buf.str();
+        String file_contents = serializeAccessEntity(entity);
 
         /// First we save *.tmp file and then we rename if everything's ok.
         auto tmp_file_path = std::filesystem::path{file_path}.replace_extension(".tmp");
diff --git a/src/Access/EnabledQuota.cpp b/src/Access/EnabledQuota.cpp
index 4affa4f3ec1..d776b2b851a 100644
--- a/src/Access/EnabledQuota.cpp
+++ b/src/Access/EnabledQuota.cpp
@@ -2,8 +2,8 @@
 #include <Access/QuotaUsage.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
-#include <common/chrono_io.h>
-#include <common/range.h>
+#include <base/chrono_io.h>
+#include <base/range.h>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/range/algorithm/fill.hpp>
 
diff --git a/src/Access/EnabledRoles.h b/src/Access/EnabledRoles.h
index 5cb00eb1829..efec5833fca 100644
--- a/src/Access/EnabledRoles.h
+++ b/src/Access/EnabledRoles.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/UUID.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <boost/container/flat_set.hpp>
 #include <list>
 #include <mutex>
diff --git a/src/Access/EnabledRowPolicies.h b/src/Access/EnabledRowPolicies.h
index 5e819733963..8ed923e98e4 100644
--- a/src/Access/EnabledRowPolicies.h
+++ b/src/Access/EnabledRowPolicies.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/RowPolicy.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/UUID.h>
 #include <boost/smart_ptr/atomic_shared_ptr.hpp>
 #include <unordered_map>
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index 24f1f7b6528..8ece77cd9ef 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -3,7 +3,7 @@
 #include <Access/LDAPClient.h>
 #include <Access/Credentials.h>
 #include <Access/GSSAcceptor.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <chrono>
 #include <map>
diff --git a/src/Access/GSSAcceptor.cpp b/src/Access/GSSAcceptor.cpp
index a33e825f510..207baf955e0 100644
--- a/src/Access/GSSAcceptor.cpp
+++ b/src/Access/GSSAcceptor.cpp
@@ -1,6 +1,6 @@
 #include <Access/GSSAcceptor.h>
 #include <Common/Exception.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Poco/StringTokenizer.h>
 
diff --git a/src/Access/GSSAcceptor.h b/src/Access/GSSAcceptor.h
index 8d207c59c01..4501622cd81 100644
--- a/src/Access/GSSAcceptor.h
+++ b/src/Access/GSSAcceptor.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#   include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <Access/Credentials.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <memory>
 
 #if USE_KRB5
diff --git a/src/Access/IAccessEntity.h b/src/Access/IAccessEntity.h
index 18b450bff5c..d0fbde8da97 100644
--- a/src/Access/IAccessEntity.h
+++ b/src/Access/IAccessEntity.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/typeid_cast.h>
 #include <Common/quoteString.h>
 #include <boost/algorithm/string.hpp>
diff --git a/src/Access/IAccessStorage.cpp b/src/Access/IAccessStorage.cpp
index 348987899cb..aade1fdd6f1 100644
--- a/src/Access/IAccessStorage.cpp
+++ b/src/Access/IAccessStorage.cpp
@@ -6,6 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/UUIDGenerator.h>
 #include <Poco/Logger.h>
+#include <base/FnTraits.h>
 
 
 namespace DB
@@ -96,7 +97,7 @@ namespace
 
         bool errors() const { return exception.has_value(); }
 
-        void showErrors(const char * format, const std::function<String(size_t)> & get_name_function)
+        void showErrors(const char * format, Fn<String(size_t)> auto && get_name_function)
         {
             if (!exception)
                 return;
@@ -455,7 +456,7 @@ UUID IAccessStorage::login(
         if (!replace_exception_with_cannot_authenticate)
             throw;
 
-        tryLogCurrentException(getLogger(), credentials.getUserName() + ": Authentication failed");
+        tryLogCurrentException(getLogger(), "from: " + address.toString() + ", user: " + credentials.getUserName()  + ": Authentication failed");
         throwCannotAuthenticate(credentials.getUserName());
     }
 }
diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h
index bf45ed5b5ce..e9df2e3c1a4 100644
--- a/src/Access/IAccessStorage.h
+++ b/src/Access/IAccessStorage.h
@@ -3,7 +3,7 @@
 #include <Access/IAccessEntity.h>
 #include <Core/Types.h>
 #include <Core/UUID.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <functional>
 #include <optional>
 #include <vector>
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index 07b9d089198..8a612982c79 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -6,8 +6,8 @@
 #include <Access/Credentials.h>
 #include <Access/LDAPClient.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index 3e5b10494ed..6cfff07b436 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -3,8 +3,8 @@
 #include <Access/MemoryAccessStorage.h>
 #include <Access/LDAPClient.h>
 #include <Access/Credentials.h>
-#include <common/types.h>
-#include <common/scope_guard.h>
+#include <base/types.h>
+#include <base/scope_guard.h>
 #include <map>
 #include <mutex>
 #include <set>
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index c12b0f22ab0..c666520c069 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -1,7 +1,7 @@
 #include <Access/LDAPClient.h>
 #include <Common/Exception.h>
-#include <common/scope_guard.h>
-#include <common/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Logger.h>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/Access/LDAPClient.h b/src/Access/LDAPClient.h
index 85003da31f1..3d6ee9c8dc9 100644
--- a/src/Access/LDAPClient.h
+++ b/src/Access/LDAPClient.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#   include "config_core.h"
-#endif
+#include "config_core.h"
 
-#include <common/types.h>
+#include <base/types.h>
 
 #if USE_LDAP
 #   include <ldap.h>
diff --git a/src/Access/MemoryAccessStorage.cpp b/src/Access/MemoryAccessStorage.cpp
index e788ca11cf2..68a24146107 100644
--- a/src/Access/MemoryAccessStorage.cpp
+++ b/src/Access/MemoryAccessStorage.cpp
@@ -1,5 +1,5 @@
 #include <Access/MemoryAccessStorage.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <boost/container/flat_set.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
diff --git a/src/Access/MultipleAccessStorage.cpp b/src/Access/MultipleAccessStorage.cpp
index dbeecc8a2bc..bb2ef4a6df4 100644
--- a/src/Access/MultipleAccessStorage.cpp
+++ b/src/Access/MultipleAccessStorage.cpp
@@ -1,7 +1,7 @@
 #include <Access/MultipleAccessStorage.h>
 #include <Access/Credentials.h>
 #include <Common/Exception.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/algorithm/copy.hpp>
diff --git a/src/Access/Quota.h b/src/Access/Quota.h
index 5adc6ec95e1..5d23cf11d42 100644
--- a/src/Access/Quota.h
+++ b/src/Access/Quota.h
@@ -2,7 +2,7 @@
 
 #include <Access/IAccessEntity.h>
 #include <Access/RolesOrUsersSet.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/lexical_cast.hpp>
 #include <chrono>
diff --git a/src/Access/QuotaCache.cpp b/src/Access/QuotaCache.cpp
index c20a436e1b9..f742751d5fd 100644
--- a/src/Access/QuotaCache.cpp
+++ b/src/Access/QuotaCache.cpp
@@ -4,7 +4,7 @@
 #include <Access/AccessControlManager.h>
 #include <Common/Exception.h>
 #include <Common/thread_local_rng.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/algorithm/lower_bound.hpp>
diff --git a/src/Access/QuotaCache.h b/src/Access/QuotaCache.h
index b5918f86dd4..e991399d2e9 100644
--- a/src/Access/QuotaCache.h
+++ b/src/Access/QuotaCache.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/EnabledQuota.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <memory>
 #include <mutex>
 #include <map>
diff --git a/src/Access/ReplicatedAccessStorage.cpp b/src/Access/ReplicatedAccessStorage.cpp
new file mode 100644
index 00000000000..7b29aab3a89
--- /dev/null
+++ b/src/Access/ReplicatedAccessStorage.cpp
@@ -0,0 +1,620 @@
+#include <Access/AccessEntityIO.h>
+#include <Access/MemoryAccessStorage.h>
+#include <Access/ReplicatedAccessStorage.h>
+#include <IO/ReadHelpers.h>
+#include <boost/container/flat_set.hpp>
+#include <Common/ZooKeeper/KeeperException.h>
+#include <Common/ZooKeeper/Types.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/escapeForFileName.h>
+#include <base/range.h>
+#include <base/sleep.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int BAD_ARGUMENTS;
+extern const int NO_ZOOKEEPER;
+}
+
+static UUID parseUUID(const String & text)
+{
+    UUID uuid = UUIDHelpers::Nil;
+    auto buffer = ReadBufferFromMemory(text.data(), text.length());
+    readUUIDText(uuid, buffer);
+    return uuid;
+}
+
+ReplicatedAccessStorage::ReplicatedAccessStorage(
+    const String & storage_name_,
+    const String & zookeeper_path_,
+    zkutil::GetZooKeeper get_zookeeper_)
+    : IAccessStorage(storage_name_)
+    , zookeeper_path(zookeeper_path_)
+    , get_zookeeper(get_zookeeper_)
+    , refresh_queue(std::numeric_limits<size_t>::max())
+{
+    if (zookeeper_path.empty())
+        throw Exception("ZooKeeper path must be non-empty", ErrorCodes::BAD_ARGUMENTS);
+
+    if (zookeeper_path.back() == '/')
+        zookeeper_path.resize(zookeeper_path.size() - 1);
+
+    /// If zookeeper chroot prefix is used, path should start with '/', because chroot concatenates without it.
+    if (zookeeper_path.front() != '/')
+        zookeeper_path = "/" + zookeeper_path;
+}
+
+ReplicatedAccessStorage::~ReplicatedAccessStorage()
+{
+    ReplicatedAccessStorage::shutdown();
+}
+
+
+void ReplicatedAccessStorage::startup()
+{
+    initializeZookeeper();
+    worker_thread = ThreadFromGlobalPool(&ReplicatedAccessStorage::runWorkerThread, this);
+}
+
+void ReplicatedAccessStorage::shutdown()
+{
+    bool prev_stop_flag = stop_flag.exchange(true);
+    if (!prev_stop_flag)
+    {
+        refresh_queue.finish();
+
+        if (worker_thread.joinable())
+            worker_thread.join();
+    }
+}
+
+template <typename Func>
+static void retryOnZooKeeperUserError(size_t attempts, Func && function)
+{
+    while (attempts > 0)
+    {
+        try
+        {
+            function();
+            return;
+        }
+        catch (zkutil::KeeperException & keeper_exception)
+        {
+            if (Coordination::isUserError(keeper_exception.code) && attempts > 1)
+                attempts -= 1;
+            else
+                throw;
+        }
+    }
+}
+
+UUID ReplicatedAccessStorage::insertImpl(const AccessEntityPtr & new_entity, bool replace_if_exists)
+{
+    const UUID id = generateRandomID();
+    const EntityTypeInfo type_info = EntityTypeInfo::get(new_entity->getType());
+    const String & name = new_entity->getName();
+    LOG_DEBUG(getLogger(), "Inserting entity of type {} named {} with id {}", type_info.name, name, toString(id));
+
+    auto zookeeper = get_zookeeper();
+    retryOnZooKeeperUserError(10, [&]{ insertZooKeeper(zookeeper, id, new_entity, replace_if_exists); });
+
+    Notifications notifications;
+    SCOPE_EXIT({ notify(notifications); });
+    std::lock_guard lock{mutex};
+    refreshEntityNoLock(zookeeper, id, notifications);
+    return id;
+}
+
+
+void ReplicatedAccessStorage::insertZooKeeper(
+    const zkutil::ZooKeeperPtr & zookeeper, const UUID & id, const AccessEntityPtr & new_entity, bool replace_if_exists)
+{
+    const String & name = new_entity->getName();
+    const EntityType type = new_entity->getType();
+    const EntityTypeInfo type_info = EntityTypeInfo::get(type);
+
+    const String entity_uuid = toString(id);
+    /// The entity data will be stored here, this ensures all entities have unique ids
+    const String entity_path = zookeeper_path + "/uuid/" + entity_uuid;
+    /// Then we create a znode with the entity name, inside the znode of each entity type
+    /// This ensure all entities of the same type have a unique name
+    const String name_path = zookeeper_path + "/" + type_info.unique_char + "/" + escapeForFileName(name);
+
+    Coordination::Requests ops;
+    const String new_entity_definition = serializeAccessEntity(*new_entity);
+    ops.emplace_back(zkutil::makeCreateRequest(entity_path, new_entity_definition, zkutil::CreateMode::Persistent));
+    /// The content of the "name" znode is the uuid of the entity owning that name
+    ops.emplace_back(zkutil::makeCreateRequest(name_path, entity_uuid, zkutil::CreateMode::Persistent));
+
+    Coordination::Responses responses;
+    const Coordination::Error res = zookeeper->tryMulti(ops, responses);
+    if (res == Coordination::Error::ZNODEEXISTS)
+    {
+        if (responses[0]->error == Coordination::Error::ZNODEEXISTS)
+        {
+            /// The UUID already exists, simply fail.
+
+            /// To fail with a nice error message, we need info about what already exists.
+            /// This itself could fail if the conflicting uuid disappears in the meantime.
+            /// If that happens, then we'll just retry from the start.
+            String existing_entity_definition = zookeeper->get(entity_path);
+
+            AccessEntityPtr existing_entity = deserializeAccessEntity(existing_entity_definition, entity_path);
+            EntityType existing_type = existing_entity->getType();
+            String existing_name = existing_entity->getName();
+            throwIDCollisionCannotInsert(id, type, name, existing_type, existing_name);
+        }
+        else if (replace_if_exists)
+        {
+            /// The name already exists for this type.
+            /// If asked to, we need to replace the existing entity.
+
+            /// First get the uuid of the existing entity
+            /// This itself could fail if the conflicting name disappears in the meantime.
+            /// If that happens, then we'll just retry from the start.
+            Coordination::Stat name_stat;
+            String existing_entity_uuid = zookeeper->get(name_path, &name_stat);
+
+            const String existing_entity_path = zookeeper_path + "/uuid/" + existing_entity_uuid;
+            Coordination::Requests replace_ops;
+            replace_ops.emplace_back(zkutil::makeRemoveRequest(existing_entity_path, -1));
+            replace_ops.emplace_back(zkutil::makeCreateRequest(entity_path, new_entity_definition, zkutil::CreateMode::Persistent));
+            replace_ops.emplace_back(zkutil::makeSetRequest(name_path, entity_uuid, name_stat.version));
+
+            /// If this fails, then we'll just retry from the start.
+            zookeeper->multi(replace_ops);
+        }
+        else
+        {
+            throwNameCollisionCannotInsert(type, name);
+        }
+    }
+    else
+    {
+        zkutil::KeeperMultiException::check(res, ops, responses);
+    }
+}
+
+void ReplicatedAccessStorage::removeImpl(const UUID & id)
+{
+    LOG_DEBUG(getLogger(), "Removing entity {}", toString(id));
+
+    auto zookeeper = get_zookeeper();
+    retryOnZooKeeperUserError(10, [&] { removeZooKeeper(zookeeper, id); });
+
+    Notifications notifications;
+    SCOPE_EXIT({ notify(notifications); });
+    std::lock_guard lock{mutex};
+    removeEntityNoLock(id, notifications);
+}
+
+
+void ReplicatedAccessStorage::removeZooKeeper(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id)
+{
+    const String entity_uuid = toString(id);
+    const String entity_path = zookeeper_path + "/uuid/" + entity_uuid;
+
+    String entity_definition;
+    Coordination::Stat entity_stat;
+    const bool uuid_exists = zookeeper->tryGet(entity_path, entity_definition, &entity_stat);
+    if (!uuid_exists)
+        throwNotFound(id);
+
+    const AccessEntityPtr entity = deserializeAccessEntity(entity_definition, entity_path);
+    const EntityTypeInfo type_info = EntityTypeInfo::get(entity->getType());
+    const String & name = entity->getName();
+
+    const String entity_name_path = zookeeper_path + "/" + type_info.unique_char + "/" + escapeForFileName(name);
+
+    Coordination::Requests ops;
+    ops.emplace_back(zkutil::makeRemoveRequest(entity_path, entity_stat.version));
+    ops.emplace_back(zkutil::makeRemoveRequest(entity_name_path, -1));
+    /// If this fails, then we'll just retry from the start.
+    zookeeper->multi(ops);
+}
+
+
+void ReplicatedAccessStorage::updateImpl(const UUID & id, const UpdateFunc & update_func)
+{
+    LOG_DEBUG(getLogger(), "Updating entity {}", toString(id));
+
+    auto zookeeper = get_zookeeper();
+    retryOnZooKeeperUserError(10, [&] { updateZooKeeper(zookeeper, id, update_func); });
+
+    Notifications notifications;
+    SCOPE_EXIT({ notify(notifications); });
+    std::lock_guard lock{mutex};
+    refreshEntityNoLock(zookeeper, id, notifications);
+}
+
+
+void ReplicatedAccessStorage::updateZooKeeper(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id, const UpdateFunc & update_func)
+{
+    const String entity_uuid = toString(id);
+    const String entity_path = zookeeper_path + "/uuid/" + entity_uuid;
+
+    String old_entity_definition;
+    Coordination::Stat stat;
+    const bool uuid_exists = zookeeper->tryGet(entity_path, old_entity_definition, &stat);
+    if (!uuid_exists)
+        throwNotFound(id);
+
+    const AccessEntityPtr old_entity = deserializeAccessEntity(old_entity_definition, entity_path);
+    const AccessEntityPtr new_entity = update_func(old_entity);
+
+    if (!new_entity->isTypeOf(old_entity->getType()))
+        throwBadCast(id, new_entity->getType(), new_entity->getName(), old_entity->getType());
+
+    const EntityTypeInfo type_info = EntityTypeInfo::get(new_entity->getType());
+
+    Coordination::Requests ops;
+    const String new_entity_definition = serializeAccessEntity(*new_entity);
+    ops.emplace_back(zkutil::makeSetRequest(entity_path, new_entity_definition, stat.version));
+
+    const String & old_name = old_entity->getName();
+    const String & new_name = new_entity->getName();
+    if (new_name != old_name)
+    {
+        auto old_name_path = zookeeper_path + "/" + type_info.unique_char + "/" + escapeForFileName(old_name);
+        auto new_name_path = zookeeper_path + "/" + type_info.unique_char + "/" + escapeForFileName(new_name);
+        ops.emplace_back(zkutil::makeRemoveRequest(old_name_path, -1));
+        ops.emplace_back(zkutil::makeCreateRequest(new_name_path, entity_uuid, zkutil::CreateMode::Persistent));
+    }
+
+    Coordination::Responses responses;
+    const Coordination::Error res = zookeeper->tryMulti(ops, responses);
+    if (res == Coordination::Error::ZNODEEXISTS)
+    {
+        throwNameCollisionCannotRename(new_entity->getType(), old_name, new_name);
+    }
+    else if (res == Coordination::Error::ZNONODE)
+    {
+        throwNotFound(id);
+    }
+    else
+    {
+        zkutil::KeeperMultiException::check(res, ops, responses);
+    }
+}
+
+
+void ReplicatedAccessStorage::runWorkerThread()
+{
+    LOG_DEBUG(getLogger(), "Started worker thread");
+    while (!stop_flag)
+    {
+        try
+        {
+            if (!initialized)
+                initializeZookeeper();
+            refresh();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(getLogger(), "Unexpected error, will try to restart worker thread:");
+            resetAfterError();
+            sleepForSeconds(5);
+        }
+    }
+}
+
+void ReplicatedAccessStorage::resetAfterError()
+{
+    initialized = false;
+
+    UUID id;
+    while (refresh_queue.tryPop(id)) {}
+
+    std::lock_guard lock{mutex};
+    for (const auto type : collections::range(EntityType::MAX))
+        entries_by_name_and_type[static_cast<size_t>(type)].clear();
+    entries_by_id.clear();
+}
+
+void ReplicatedAccessStorage::initializeZookeeper()
+{
+    assert(!initialized);
+    auto zookeeper = get_zookeeper();
+
+    if (!zookeeper)
+        throw Exception("Can't have Replicated access without ZooKeeper", ErrorCodes::NO_ZOOKEEPER);
+
+    createRootNodes(zookeeper);
+
+    refreshEntities(zookeeper);
+
+    initialized = true;
+}
+
+void ReplicatedAccessStorage::createRootNodes(const zkutil::ZooKeeperPtr & zookeeper)
+{
+    zookeeper->createAncestors(zookeeper_path);
+    zookeeper->createIfNotExists(zookeeper_path, "");
+    zookeeper->createIfNotExists(zookeeper_path + "/uuid", "");
+    for (const auto type : collections::range(EntityType::MAX))
+    {
+        /// Create a znode for each type of AccessEntity
+        const auto type_info = EntityTypeInfo::get(type);
+        zookeeper->createIfNotExists(zookeeper_path + "/" + type_info.unique_char, "");
+    }
+}
+
+void ReplicatedAccessStorage::refresh()
+{
+    UUID id;
+    if (refresh_queue.tryPop(id, /* timeout_ms: */ 10000))
+    {
+        if (stop_flag)
+            return;
+
+        auto zookeeper = get_zookeeper();
+
+        if (id == UUIDHelpers::Nil)
+            refreshEntities(zookeeper);
+        else
+            refreshEntity(zookeeper, id);
+    }
+}
+
+
+void ReplicatedAccessStorage::refreshEntities(const zkutil::ZooKeeperPtr & zookeeper)
+{
+    LOG_DEBUG(getLogger(), "Refreshing entities list");
+
+    const String zookeeper_uuids_path = zookeeper_path + "/uuid";
+    auto watch_entities_list = [this](const Coordination::WatchResponse &)
+    {
+        [[maybe_unused]] bool push_result = refresh_queue.push(UUIDHelpers::Nil);
+    };
+    Coordination::Stat stat;
+    const auto entity_uuid_strs = zookeeper->getChildrenWatch(zookeeper_uuids_path, &stat, watch_entities_list);
+
+    std::unordered_set<UUID> entity_uuids;
+    entity_uuids.reserve(entity_uuid_strs.size());
+    for (const String & entity_uuid_str : entity_uuid_strs)
+        entity_uuids.insert(parseUUID(entity_uuid_str));
+
+    Notifications notifications;
+    SCOPE_EXIT({ notify(notifications); });
+    std::lock_guard lock{mutex};
+
+    std::vector<UUID> entities_to_remove;
+    /// Locally remove entities that were removed from ZooKeeper
+    for (const auto & pair : entries_by_id)
+    {
+        const UUID & entity_uuid = pair.first;
+        if (!entity_uuids.contains(entity_uuid))
+            entities_to_remove.push_back(entity_uuid);
+    }
+    for (const auto & entity_uuid : entities_to_remove)
+        removeEntityNoLock(entity_uuid, notifications);
+
+    /// Locally add entities that were added to ZooKeeper
+    for (const auto & entity_uuid : entity_uuids)
+    {
+        const auto it = entries_by_id.find(entity_uuid);
+        if (it == entries_by_id.end())
+            refreshEntityNoLock(zookeeper, entity_uuid, notifications);
+    }
+
+    LOG_DEBUG(getLogger(), "Refreshing entities list finished");
+}
+
+void ReplicatedAccessStorage::refreshEntity(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id)
+{
+    Notifications notifications;
+    SCOPE_EXIT({ notify(notifications); });
+    std::lock_guard lock{mutex};
+
+    refreshEntityNoLock(zookeeper, id, notifications);
+}
+
+void ReplicatedAccessStorage::refreshEntityNoLock(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id, Notifications & notifications)
+{
+    LOG_DEBUG(getLogger(), "Refreshing entity {}", toString(id));
+
+    const auto watch_entity = [this, id](const Coordination::WatchResponse & response)
+    {
+        if (response.type == Coordination::Event::CHANGED)
+            [[maybe_unused]] bool push_result = refresh_queue.push(id);
+    };
+    Coordination::Stat entity_stat;
+    const String entity_path = zookeeper_path + "/uuid/" + toString(id);
+    String entity_definition;
+    const bool exists = zookeeper->tryGetWatch(entity_path, entity_definition, &entity_stat, watch_entity);
+    if (exists)
+    {
+        const AccessEntityPtr entity = deserializeAccessEntity(entity_definition, entity_path);
+        setEntityNoLock(id, entity, notifications);
+    }
+    else
+    {
+        removeEntityNoLock(id, notifications);
+    }
+}
+
+
+void ReplicatedAccessStorage::setEntityNoLock(const UUID & id, const AccessEntityPtr & entity, Notifications & notifications)
+{
+    LOG_DEBUG(getLogger(), "Setting id {} to entity named {}", toString(id), entity->getName());
+    const EntityType type = entity->getType();
+    const String & name = entity->getName();
+
+    /// If the type+name already exists and is a different entity, remove old entity
+    auto & entries_by_name = entries_by_name_and_type[static_cast<size_t>(type)];
+    if (auto it = entries_by_name.find(name); it != entries_by_name.end() && it->second->id != id)
+    {
+        removeEntityNoLock(it->second->id, notifications);
+    }
+
+    /// If the entity already exists under a different type+name, remove old type+name
+    if (auto it = entries_by_id.find(id); it != entries_by_id.end())
+    {
+        const AccessEntityPtr & existing_entity = it->second.entity;
+        const EntityType existing_type = existing_entity->getType();
+        const String & existing_name = existing_entity->getName();
+        if (existing_type != type || existing_name != name)
+        {
+            auto & existing_entries_by_name = entries_by_name_and_type[static_cast<size_t>(existing_type)];
+            existing_entries_by_name.erase(existing_name);
+        }
+    }
+
+    auto & entry = entries_by_id[id];
+    entry.id = id;
+    entry.entity = entity;
+    entries_by_name[name] = &entry;
+    prepareNotifications(entry, false, notifications);
+}
+
+
+void ReplicatedAccessStorage::removeEntityNoLock(const UUID & id, Notifications & notifications)
+{
+    LOG_DEBUG(getLogger(), "Removing entity with id {}", toString(id));
+    const auto it = entries_by_id.find(id);
+    if (it == entries_by_id.end())
+    {
+        LOG_DEBUG(getLogger(), "Id {} not found, ignoring removal", toString(id));
+        return;
+    }
+
+    const Entry & entry = it->second;
+    const EntityType type = entry.entity->getType();
+    const String & name = entry.entity->getName();
+    prepareNotifications(entry, true, notifications);
+
+    auto & entries_by_name = entries_by_name_and_type[static_cast<size_t>(type)];
+    const auto name_it = entries_by_name.find(name);
+    if (name_it == entries_by_name.end())
+        LOG_WARNING(getLogger(), "Entity {} not found in names, ignoring removal of name", toString(id));
+    else if (name_it->second != &(it->second))
+        LOG_WARNING(getLogger(), "Name {} not pointing to entity {}, ignoring removal of name", name, toString(id));
+    else
+        entries_by_name.erase(name);
+
+    entries_by_id.erase(id);
+    LOG_DEBUG(getLogger(), "Removed entity with id {}", toString(id));
+}
+
+
+std::optional<UUID> ReplicatedAccessStorage::findImpl(EntityType type, const String & name) const
+{
+    std::lock_guard lock{mutex};
+    const auto & entries_by_name = entries_by_name_and_type[static_cast<size_t>(type)];
+    const auto it = entries_by_name.find(name);
+    if (it == entries_by_name.end())
+        return {};
+
+    const Entry * entry = it->second;
+    return entry->id;
+}
+
+
+std::vector<UUID> ReplicatedAccessStorage::findAllImpl(EntityType type) const
+{
+    std::lock_guard lock{mutex};
+    std::vector<UUID> result;
+    result.reserve(entries_by_id.size());
+    for (const auto & [id, entry] : entries_by_id)
+        if (entry.entity->isTypeOf(type))
+            result.emplace_back(id);
+    return result;
+}
+
+
+bool ReplicatedAccessStorage::existsImpl(const UUID & id) const
+{
+    std::lock_guard lock{mutex};
+    return entries_by_id.count(id);
+}
+
+
+AccessEntityPtr ReplicatedAccessStorage::readImpl(const UUID & id) const
+{
+    std::lock_guard lock{mutex};
+    const auto it = entries_by_id.find(id);
+    if (it == entries_by_id.end())
+        throwNotFound(id);
+    const Entry & entry = it->second;
+    return entry.entity;
+}
+
+
+String ReplicatedAccessStorage::readNameImpl(const UUID & id) const
+{
+    return readImpl(id)->getName();
+}
+
+
+void ReplicatedAccessStorage::prepareNotifications(const Entry & entry, bool remove, Notifications & notifications) const
+{
+    const AccessEntityPtr entity = remove ? nullptr : entry.entity;
+    for (const auto & handler : entry.handlers_by_id)
+        notifications.push_back({handler, entry.id, entity});
+
+    for (const auto & handler : handlers_by_type[static_cast<size_t>(entry.entity->getType())])
+        notifications.push_back({handler, entry.id, entity});
+}
+
+
+scope_guard ReplicatedAccessStorage::subscribeForChangesImpl(EntityType type, const OnChangedHandler & handler) const
+{
+    std::lock_guard lock{mutex};
+    auto & handlers = handlers_by_type[static_cast<size_t>(type)];
+    handlers.push_back(handler);
+    auto handler_it = std::prev(handlers.end());
+
+    return [this, type, handler_it]
+    {
+        std::lock_guard lock2{mutex};
+        auto & handlers2 = handlers_by_type[static_cast<size_t>(type)];
+        handlers2.erase(handler_it);
+    };
+}
+
+
+scope_guard ReplicatedAccessStorage::subscribeForChangesImpl(const UUID & id, const OnChangedHandler & handler) const
+{
+    std::lock_guard lock{mutex};
+    const auto it = entries_by_id.find(id);
+    if (it == entries_by_id.end())
+        return {};
+    const Entry & entry = it->second;
+    auto handler_it = entry.handlers_by_id.insert(entry.handlers_by_id.end(), handler);
+
+    return [this, id, handler_it]
+    {
+        std::lock_guard lock2{mutex};
+        auto it2 = entries_by_id.find(id);
+        if (it2 != entries_by_id.end())
+        {
+            const Entry & entry2 = it2->second;
+            entry2.handlers_by_id.erase(handler_it);
+        }
+    };
+}
+
+
+bool ReplicatedAccessStorage::hasSubscriptionImpl(const UUID & id) const
+{
+    std::lock_guard lock{mutex};
+    const auto & it = entries_by_id.find(id);
+    if (it != entries_by_id.end())
+    {
+        const Entry & entry = it->second;
+        return !entry.handlers_by_id.empty();
+    }
+    return false;
+}
+
+
+bool ReplicatedAccessStorage::hasSubscriptionImpl(EntityType type) const
+{
+    std::lock_guard lock{mutex};
+    const auto & handlers = handlers_by_type[static_cast<size_t>(type)];
+    return !handlers.empty();
+}
+}
diff --git a/src/Access/ReplicatedAccessStorage.h b/src/Access/ReplicatedAccessStorage.h
new file mode 100644
index 00000000000..458bc0d614b
--- /dev/null
+++ b/src/Access/ReplicatedAccessStorage.h
@@ -0,0 +1,90 @@
+#pragma once
+
+#include <atomic>
+#include <list>
+#include <memory>
+#include <mutex>
+#include <unordered_map>
+
+#include <base/scope_guard.h>
+
+#include <Common/ThreadPool.h>
+#include <Common/ZooKeeper/Common.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ConcurrentBoundedQueue.h>
+
+#include <Access/IAccessStorage.h>
+
+
+namespace DB
+{
+/// Implementation of IAccessStorage which keeps all data in zookeeper.
+class ReplicatedAccessStorage : public IAccessStorage
+{
+public:
+    static constexpr char STORAGE_TYPE[] = "replicated";
+
+    ReplicatedAccessStorage(const String & storage_name, const String & zookeeper_path, zkutil::GetZooKeeper get_zookeeper);
+    virtual ~ReplicatedAccessStorage() override;
+
+    const char * getStorageType() const override { return STORAGE_TYPE; }
+
+    virtual void startup();
+    virtual void shutdown();
+
+private:
+    String zookeeper_path;
+    zkutil::GetZooKeeper get_zookeeper;
+
+    std::atomic<bool> initialized = false;
+    std::atomic<bool> stop_flag = false;
+    ThreadFromGlobalPool worker_thread;
+    ConcurrentBoundedQueue<UUID> refresh_queue;
+
+    UUID insertImpl(const AccessEntityPtr & entity, bool replace_if_exists) override;
+    void removeImpl(const UUID & id) override;
+    void updateImpl(const UUID & id, const UpdateFunc & update_func) override;
+
+    void insertZooKeeper(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id, const AccessEntityPtr & entity, bool replace_if_exists);
+    void removeZooKeeper(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id);
+    void updateZooKeeper(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id, const UpdateFunc & update_func);
+
+    void runWorkerThread();
+    void resetAfterError();
+    void initializeZookeeper();
+    void createRootNodes(const zkutil::ZooKeeperPtr & zookeeper);
+
+    void refresh();
+    void refreshEntities(const zkutil::ZooKeeperPtr & zookeeper);
+    void refreshEntity(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id);
+    void refreshEntityNoLock(const zkutil::ZooKeeperPtr & zookeeper, const UUID & id, Notifications & notifications);
+
+    void setEntityNoLock(const UUID & id, const AccessEntityPtr & entity, Notifications & notifications);
+    void removeEntityNoLock(const UUID & id, Notifications & notifications);
+
+    struct Entry
+    {
+        UUID id;
+        AccessEntityPtr entity;
+        mutable std::list<OnChangedHandler> handlers_by_id;
+    };
+
+    std::optional<UUID> findImpl(EntityType type, const String & name) const override;
+    std::vector<UUID> findAllImpl(EntityType type) const override;
+    bool existsImpl(const UUID & id) const override;
+    AccessEntityPtr readImpl(const UUID & id) const override;
+    String readNameImpl(const UUID & id) const override;
+    bool canInsertImpl(const AccessEntityPtr &) const override { return true; }
+
+    void prepareNotifications(const Entry & entry, bool remove, Notifications & notifications) const;
+    scope_guard subscribeForChangesImpl(const UUID & id, const OnChangedHandler & handler) const override;
+    scope_guard subscribeForChangesImpl(EntityType type, const OnChangedHandler & handler) const override;
+    bool hasSubscriptionImpl(const UUID & id) const override;
+    bool hasSubscriptionImpl(EntityType type) const override;
+
+    mutable std::mutex mutex;
+    std::unordered_map<UUID, Entry> entries_by_id;
+    std::unordered_map<String, Entry *> entries_by_name_and_type[static_cast<size_t>(EntityType::MAX)];
+    mutable std::list<OnChangedHandler> handlers_by_type[static_cast<size_t>(EntityType::MAX)];
+};
+}
diff --git a/src/Access/RoleCache.cpp b/src/Access/RoleCache.cpp
index d264ec2d953..e9c88868e8c 100644
--- a/src/Access/RoleCache.cpp
+++ b/src/Access/RoleCache.cpp
@@ -3,6 +3,7 @@
 #include <Access/EnabledRolesInfo.h>
 #include <Access/AccessControlManager.h>
 #include <boost/container/flat_set.hpp>
+#include <base/FnTraits.h>
 
 
 namespace DB
@@ -11,7 +12,7 @@ namespace
 {
     void collectRoles(EnabledRolesInfo & roles_info,
                       boost::container::flat_set<UUID> & skip_ids,
-                      const std::function<RolePtr(const UUID &)> & get_role_function,
+                      Fn<RolePtr(const UUID &)> auto && get_role_function,
                       const UUID & role_id,
                       bool is_current_role,
                       bool with_admin_option)
@@ -113,7 +114,9 @@ void RoleCache::collectEnabledRoles(EnabledRoles & enabled, scope_guard & notifi
     /// Collect enabled roles. That includes the current roles, the roles granted to the current roles, and so on.
     auto new_info = std::make_shared<EnabledRolesInfo>();
     boost::container::flat_set<UUID> skip_ids;
+
     auto get_role_function = [this](const UUID & id) { return getRole(id); };
+
     for (const auto & current_role : enabled.params.current_roles)
         collectRoles(*new_info, skip_ids, get_role_function, current_role, true, false);
 
diff --git a/src/Access/RowPolicyCache.cpp b/src/Access/RowPolicyCache.cpp
index b4e3c7d16ab..c8402dbdbd4 100644
--- a/src/Access/RowPolicyCache.cpp
+++ b/src/Access/RowPolicyCache.cpp
@@ -6,7 +6,7 @@
 #include <Parsers/makeASTForLogicalFunction.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <Core/Defines.h>
 
diff --git a/src/Access/RowPolicyCache.h b/src/Access/RowPolicyCache.h
index 6f3964cdadb..959eb989d4c 100644
--- a/src/Access/RowPolicyCache.h
+++ b/src/Access/RowPolicyCache.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Access/EnabledRowPolicies.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <mutex>
 #include <map>
 #include <unordered_map>
diff --git a/src/Access/SettingsProfileElement.cpp b/src/Access/SettingsProfileElement.cpp
index edbb7509e9e..b42bcd1c279 100644
--- a/src/Access/SettingsProfileElement.cpp
+++ b/src/Access/SettingsProfileElement.cpp
@@ -7,7 +7,7 @@
 #include <Common/SettingsChanges.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/removeDuplicates.h>
+#include <base/removeDuplicates.h>
 
 
 namespace DB
diff --git a/src/Access/SettingsProfilesCache.h b/src/Access/SettingsProfilesCache.h
index 23a37212883..e5ba70b9df8 100644
--- a/src/Access/SettingsProfilesCache.h
+++ b/src/Access/SettingsProfilesCache.h
@@ -2,7 +2,7 @@
 
 #include <Access/EnabledSettings.h>
 #include <Poco/LRUCache.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <map>
 #include <unordered_map>
 
diff --git a/src/Access/SettingsProfilesInfo.cpp b/src/Access/SettingsProfilesInfo.cpp
index 46ebb6084e7..7efb16dd865 100644
--- a/src/Access/SettingsProfilesInfo.cpp
+++ b/src/Access/SettingsProfilesInfo.cpp
@@ -1,6 +1,6 @@
 #include <Access/SettingsProfilesInfo.h>
 #include <Access/SettingsConstraintsAndProfileIDs.h>
-#include <common/removeDuplicates.h>
+#include <base/removeDuplicates.h>
 
 
 namespace DB
diff --git a/src/Access/SettingsProfilesInfo.h b/src/Access/SettingsProfilesInfo.h
index d1fba0e9f5f..f554ba8d89e 100644
--- a/src/Access/SettingsProfilesInfo.h
+++ b/src/Access/SettingsProfilesInfo.h
@@ -36,6 +36,16 @@ struct SettingsProfilesInfo
     friend bool operator ==(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs);
     friend bool operator !=(const SettingsProfilesInfo & lhs, const SettingsProfilesInfo & rhs) { return !(lhs == rhs); }
 
+    Strings getProfileNames() const
+    {
+        Strings result;
+        result.reserve(profiles.size());
+        for (const auto & profile_id : profiles)
+            result.push_back(names_of_profiles.at(profile_id));
+
+        return result;
+    }
+
 private:
     const AccessControlManager & manager;
 };
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index 68333ed45da..7c5baa92b27 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -13,11 +13,12 @@
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Stringifier.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <boost/range/algorithm/copy.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <cstring>
 #include <filesystem>
+#include <base/FnTraits.h>
 
 
 namespace DB
@@ -362,7 +363,7 @@ namespace
 
     SettingsProfileElements parseSettingsConstraints(const Poco::Util::AbstractConfiguration & config,
                                                      const String & path_to_constraints,
-                                                     const std::function<void(const std::string_view &)> & check_setting_name_function)
+                                                     Fn<void(std::string_view)> auto && check_setting_name_function)
     {
         SettingsProfileElements profile_elements;
         Poco::Util::AbstractConfiguration::Keys keys;
@@ -399,7 +400,7 @@ namespace
     std::shared_ptr<SettingsProfile> parseSettingsProfile(
         const Poco::Util::AbstractConfiguration & config,
         const String & profile_name,
-        const std::function<void(const std::string_view &)> & check_setting_name_function)
+        Fn<void(std::string_view)> auto && check_setting_name_function)
     {
         auto profile = std::make_shared<SettingsProfile>();
         profile->setName(profile_name);
@@ -441,7 +442,7 @@ namespace
 
     std::vector<AccessEntityPtr> parseSettingsProfiles(
         const Poco::Util::AbstractConfiguration & config,
-        const std::function<void(const std::string_view &)> & check_setting_name_function)
+        Fn<void(std::string_view)> auto && check_setting_name_function)
     {
         std::vector<AccessEntityPtr> profiles;
         Poco::Util::AbstractConfiguration::Keys profile_names;
diff --git a/src/Access/tests/gtest_access_rights_ops.cpp b/src/Access/tests/gtest_access_rights_ops.cpp
index 3d7b396a6f2..2881825dd17 100644
--- a/src/Access/tests/gtest_access_rights_ops.cpp
+++ b/src/Access/tests/gtest_access_rights_ops.cpp
@@ -45,7 +45,7 @@ TEST(AccessRights, Union)
     lhs.grant(AccessType::INSERT);
     rhs.grant(AccessType::ALL, "db1");
     lhs.makeUnion(rhs);
-    ASSERT_EQ(lhs.toString(), "GRANT INSERT ON *.*, GRANT SHOW, SELECT, ALTER, CREATE DATABASE, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, DROP, TRUNCATE, OPTIMIZE, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON db1.*");
+    ASSERT_EQ(lhs.toString(), "GRANT INSERT ON *.*, GRANT SHOW, SELECT, ALTER, CREATE DATABASE, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, CREATE FUNCTION, DROP, TRUNCATE, OPTIMIZE, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON db1.*");
 }
 
 
diff --git a/src/Access/tests/gtest_replicated_access_storage.cpp b/src/Access/tests/gtest_replicated_access_storage.cpp
new file mode 100644
index 00000000000..f2052e91749
--- /dev/null
+++ b/src/Access/tests/gtest_replicated_access_storage.cpp
@@ -0,0 +1,46 @@
+#include <gtest/gtest.h>
+#include <Access/ReplicatedAccessStorage.h>
+
+using namespace DB;
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NO_ZOOKEEPER;
+}
+}
+
+
+TEST(ReplicatedAccessStorage, ShutdownWithoutStartup)
+{
+    auto get_zk = []()
+    {
+        return std::shared_ptr<zkutil::ZooKeeper>();
+    };
+
+    auto storage = ReplicatedAccessStorage("replicated", "/clickhouse/access", get_zk);
+    storage.shutdown();
+}
+
+
+TEST(ReplicatedAccessStorage, ShutdownWithFailedStartup)
+{
+    auto get_zk = []()
+    {
+        return std::shared_ptr<zkutil::ZooKeeper>();
+    };
+
+    auto storage = ReplicatedAccessStorage("replicated", "/clickhouse/access", get_zk);
+    try
+    {
+        storage.startup();
+    }
+    catch (Exception & e)
+    {
+        if (e.code() != ErrorCodes::NO_ZOOKEEPER)
+            throw;
+    }
+    storage.shutdown();
+}
+
diff --git a/src/Access/ya.make b/src/Access/ya.make
deleted file mode 100644
index 5f2f410cabd..00000000000
--- a/src/Access/ya.make
+++ /dev/null
@@ -1,53 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    AccessControlManager.cpp
-    AccessRights.cpp
-    AccessRightsElement.cpp
-    AllowedClientHosts.cpp
-    Authentication.cpp
-    ContextAccess.cpp
-    Credentials.cpp
-    DiskAccessStorage.cpp
-    EnabledQuota.cpp
-    EnabledRoles.cpp
-    EnabledRolesInfo.cpp
-    EnabledRowPolicies.cpp
-    EnabledSettings.cpp
-    ExternalAuthenticators.cpp
-    GSSAcceptor.cpp
-    GrantedRoles.cpp
-    IAccessEntity.cpp
-    IAccessStorage.cpp
-    LDAPAccessStorage.cpp
-    LDAPClient.cpp
-    MemoryAccessStorage.cpp
-    MultipleAccessStorage.cpp
-    Quota.cpp
-    QuotaCache.cpp
-    QuotaUsage.cpp
-    Role.cpp
-    RoleCache.cpp
-    RolesOrUsersSet.cpp
-    RowPolicy.cpp
-    RowPolicyCache.cpp
-    SettingsConstraints.cpp
-    SettingsProfile.cpp
-    SettingsProfileElement.cpp
-    SettingsProfilesCache.cpp
-    SettingsProfilesInfo.cpp
-    User.cpp
-    UsersConfigAccessStorage.cpp
-    tests/gtest_access_rights_ops.cpp
-
-)
-
-END()
diff --git a/src/Access/ya.make.in b/src/Access/ya.make.in
deleted file mode 100644
index 1f11c7d7d2a..00000000000
--- a/src/Access/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/AggregateFunctions/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
index 335ee7c8ecb..6c43c3ed061 100644
--- a/src/AggregateFunctions/AggregateFunctionArgMinMax.h
+++ b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <DataTypes/IDataType.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionMinMaxAny.h> // SingleValueDataString used in embedded compiler
diff --git a/src/AggregateFunctions/AggregateFunctionArray.cpp b/src/AggregateFunctions/AggregateFunctionArray.cpp
index 982180ab50c..3591bea5f9e 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionArray.cpp
@@ -21,6 +21,8 @@ class AggregateFunctionCombinatorArray final : public IAggregateFunctionCombinat
 public:
     String getName() const override { return "Array"; }
 
+    bool supportsNesting() const override { return true; }
+
     DataTypes transformArguments(const DataTypes & arguments) const override
     {
         if (arguments.empty())
diff --git a/src/AggregateFunctions/AggregateFunctionAvg.h b/src/AggregateFunctions/AggregateFunctionAvg.h
index ad5c67d88d4..a9c06562e72 100644
--- a/src/AggregateFunctions/AggregateFunctionAvg.h
+++ b/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -9,9 +9,7 @@
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <Core/DecimalFunctions.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
@@ -21,11 +19,9 @@
 namespace DB
 {
 struct Settings;
-template <typename T>
-using DecimalOrVectorCol = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
 
 template <typename T> constexpr bool DecimalOrExtendedInt =
-    IsDecimalNumber<T>
+    is_decimal<T>
     || std::is_same_v<T, Int128>
     || std::is_same_v<T, Int256>
     || std::is_same_v<T, UInt128>
@@ -44,7 +40,7 @@ struct AvgFraction
     /// Invoked only is either Numerator or Denominator are Decimal.
     Float64 NO_SANITIZE_UNDEFINED divideIfAnyDecimal(UInt32 num_scale, UInt32 denom_scale [[maybe_unused]]) const
     {
-        if constexpr (IsDecimalNumber<Numerator> && IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Numerator> && is_decimal<Denominator>)
         {
             // According to the docs, num(S1) / denom(S2) would have scale S1
 
@@ -60,7 +56,7 @@ struct AvgFraction
         /// Numerator is always casted to Float64 to divide correctly if the denominator is not Float64.
         Float64 num_converted;
 
-        if constexpr (IsDecimalNumber<Numerator>)
+        if constexpr (is_decimal<Numerator>)
             num_converted = DecimalUtils::convertTo<Float64>(numerator, num_scale);
         else
             num_converted = static_cast<Float64>(numerator); /// all other types, including extended integral.
@@ -68,7 +64,7 @@ struct AvgFraction
         std::conditional_t<DecimalOrExtendedInt<Denominator>,
             Float64, Denominator> denom_converted;
 
-        if constexpr (IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Denominator>)
             denom_converted = DecimalUtils::convertTo<Float64>(denominator, denom_scale);
         else if constexpr (DecimalOrExtendedInt<Denominator>)
             /// no way to divide Float64 and extended integral type without an explicit cast.
@@ -139,7 +135,7 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        if constexpr (IsDecimalNumber<Numerator> || IsDecimalNumber<Denominator>)
+        if constexpr (is_decimal<Numerator> || is_decimal<Denominator>)
             assert_cast<ColumnVector<Float64> &>(to).getData().push_back(
                 this->data(place).divideIfAnyDecimal(num_scale, denom_scale));
         else
@@ -222,7 +218,7 @@ private:
 };
 
 template <typename T>
-using AvgFieldType = std::conditional_t<IsDecimalNumber<T>,
+using AvgFieldType = std::conditional_t<is_decimal<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     NearestFieldType<T>>;
 
@@ -239,7 +235,7 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
     {
-        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        this->data(place).numerator += static_cast<const ColumnVectorOrDecimal<T> &>(*columns[0]).getData()[row_num];
         ++this->data(place).denominator;
     }
 
diff --git a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
index 68d48803718..6189ae92ce4 100644
--- a/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
+++ b/src/AggregateFunctions/AggregateFunctionAvgWeighted.h
@@ -8,7 +8,7 @@ namespace DB
 struct Settings;
 
 template <typename T>
-using AvgWeightedFieldType = std::conditional_t<IsDecimalNumber<T>,
+using AvgWeightedFieldType = std::conditional_t<is_decimal<T>,
     std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
     std::conditional_t<DecimalOrExtendedInt<T>,
         Float64, // no way to do UInt128 * UInt128, better cast to Float64
@@ -34,10 +34,10 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
-        const auto& weights = static_cast<const DecimalOrVectorCol<Weight> &>(*columns[1]);
+        const auto& weights = static_cast<const ColumnVectorOrDecimal<Weight> &>(*columns[1]);
 
         this->data(place).numerator += static_cast<Numerator>(
-            static_cast<const DecimalOrVectorCol<Value> &>(*columns[0]).getData()[row_num]) *
+            static_cast<const ColumnVectorOrDecimal<Value> &>(*columns[0]).getData()[row_num]) *
             static_cast<Numerator>(weights.getData()[row_num]);
 
         this->data(place).denominator += static_cast<Denominator>(weights.getData()[row_num]);
diff --git a/src/AggregateFunctions/AggregateFunctionBitwise.h b/src/AggregateFunctions/AggregateFunctionBitwise.h
index 90db2469828..d79192ab38a 100644
--- a/src/AggregateFunctions/AggregateFunctionBitwise.h
+++ b/src/AggregateFunctions/AggregateFunctionBitwise.h
@@ -9,9 +9,7 @@
 
 #include <AggregateFunctions/IAggregateFunction.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
diff --git a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
index c31be25e950..9375d6da3da 100644
--- a/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
+++ b/src/AggregateFunctions/AggregateFunctionCategoricalInformationValue.h
@@ -8,7 +8,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index 0b4052c987b..022789cc96c 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -10,9 +10,7 @@
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <Common/assert_cast.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
diff --git a/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp b/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
new file mode 100644
index 00000000000..8569e8f9c8c
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
@@ -0,0 +1,98 @@
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <Common/ExponentiallySmoothedCounter.h>
+#include <Common/FieldVisitorConvertToNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+
+/** See the comments in ExponentiallySmoothedCounter.h
+  */
+class AggregateFunctionExponentialMovingAverage final
+    : public IAggregateFunctionDataHelper<ExponentiallySmoothedAverage, AggregateFunctionExponentialMovingAverage>
+{
+private:
+    String name;
+    Float64 half_decay;
+
+public:
+    AggregateFunctionExponentialMovingAverage(const DataTypes & argument_types_, const Array & params)
+        : IAggregateFunctionDataHelper<ExponentiallySmoothedAverage, AggregateFunctionExponentialMovingAverage>(argument_types_, params)
+    {
+        if (params.size() != 1)
+            throw Exception{"Aggregate function " + getName() + " requires exactly one parameter: half decay time.",
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+        half_decay = applyVisitor(FieldVisitorConvertToNumber<Float64>(), params[0]);
+    }
+
+    String getName() const override
+    {
+        return "exponentialMovingAverage";
+    }
+
+    DataTypePtr getReturnType() const override
+    {
+        return std::make_shared<DataTypeNumber<Float64>>();
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
+    {
+        const auto & value = columns[0]->getFloat64(row_num);
+        const auto & time = columns[1]->getFloat64(row_num);
+        this->data(place).add(value, time, half_decay);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
+    {
+        this->data(place).merge(this->data(rhs), half_decay);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        writeBinary(this->data(place).value, buf);
+        writeBinary(this->data(place).time, buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
+    {
+        readBinary(this->data(place).value, buf);
+        readBinary(this->data(place).time, buf);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        auto & column = assert_cast<ColumnVector<Float64> &>(to);
+        column.getData().push_back(this->data(place).get(half_decay));
+    }
+};
+
+void registerAggregateFunctionExponentialMovingAverage(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("exponentialMovingAverage",
+        [](const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *) -> AggregateFunctionPtr
+        {
+            assertBinary(name, argument_types);
+            for (const auto & type : argument_types)
+                if (!isNumber(*type))
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Both arguments for aggregate function {} must have numeric type, got {}", name, type->getName());
+            return std::make_shared<AggregateFunctionExponentialMovingAverage>(argument_types, params);
+        });
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index c9dcdb54424..4c2c64ef5e1 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -29,6 +29,7 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_AGGREGATE_FUNCTION;
     extern const int LOGICAL_ERROR;
+    extern const int ILLEGAL_AGGREGATION;
 }
 
 const String & getAggregateFunctionCanonicalNameIfAny(const String & name)
@@ -154,18 +155,36 @@ AggregateFunctionPtr AggregateFunctionFactory::getImpl(
     }
 
     /// Combinators of aggregate functions.
-    /// For every aggregate function 'agg' and combiner '-Comb' there is combined aggregate function with name 'aggComb',
+    /// For every aggregate function 'agg' and combiner '-Comb' there is a combined aggregate function with the name 'aggComb',
     ///  that can have different number and/or types of arguments, different result type and different behaviour.
 
     if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
     {
+        const std::string & combinator_name = combinator->getName();
+
         if (combinator->isForInternalUsageOnly())
-            throw Exception("Aggregate function combinator '" + combinator->getName() + "' is only for internal usage", ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION);
+            throw Exception(ErrorCodes::UNKNOWN_AGGREGATE_FUNCTION,
+                "Aggregate function combinator '{}' is only for internal usage",
+                combinator_name);
 
         if (query_context && query_context->getSettingsRef().log_queries)
-            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator->getName());
+            query_context->addQueryFactoriesInfo(Context::QueryLogFactories::AggregateFunctionCombinator, combinator_name);
+
+        String nested_name = name.substr(0, name.size() - combinator_name.size());
+        /// Nested identical combinators (i.e. uniqCombinedIfIf) is not
+        /// supported (since they don't work -- silently).
+        ///
+        /// But non-identical is supported and works. For example,
+        /// uniqCombinedIfMergeIf is useful in cases when the underlying
+        /// storage stores AggregateFunction(uniqCombinedIf) and in SELECT you
+        /// need to filter aggregation result based on another column.
+        if (!combinator->supportsNesting() && nested_name.ends_with(combinator_name))
+        {
+            throw Exception(ErrorCodes::ILLEGAL_AGGREGATION,
+                "Nested identical combinator '{}' is not supported",
+                combinator_name);
+        }
 
-        String nested_name = name.substr(0, name.size() - combinator->getName().size());
         DataTypes nested_types = combinator->transformArguments(argument_types);
         Array nested_parameters = combinator->transformParameters(parameters);
 
@@ -214,7 +233,7 @@ std::optional<AggregateFunctionProperties> AggregateFunctionFactory::tryGetPrope
         return found.properties;
 
     /// Combinators of aggregate functions.
-    /// For every aggregate function 'agg' and combiner '-Comb' there is combined aggregate function with name 'aggComb',
+    /// For every aggregate function 'agg' and combiner '-Comb' there is a combined aggregate function with the name 'aggComb',
     ///  that can have different number and/or types of arguments, different result type and different behaviour.
 
     if (AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix(name))
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
index e4eff6be901..3e0f1849545 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.cpp
@@ -25,14 +25,14 @@ namespace
 template <typename T, typename LimitNumberOfElements>
 struct MovingSum
 {
-    using Data = MovingSumData<std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>>;
+    using Data = MovingSumData<std::conditional_t<is_decimal<T>, Decimal128, NearestFieldType<T>>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
 template <typename T, typename LimitNumberOfElements>
 struct MovingAvg
 {
-    using Data = MovingAvgData<std::conditional_t<IsDecimalNumber<T>, Decimal128, Float64>>;
+    using Data = MovingAvgData<std::conditional_t<is_decimal<T>, Decimal128, Float64>>;
     using Function = MovingImpl<T, LimitNumberOfElements, Data>;
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
index daaa7a69baf..a3b7dc841b6 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayMoving.h
@@ -87,18 +87,10 @@ class MovingImpl final
 public:
     using ResultT = typename Data::Accumulator;
 
-    using ColumnSource = std::conditional_t<IsDecimalNumber<T>,
-        ColumnDecimal<T>,
-        ColumnVector<T>>;
+    using ColumnSource = ColumnVectorOrDecimal<T>;
 
     /// Probably for overflow function in the future.
-    using ColumnResult = std::conditional_t<IsDecimalNumber<ResultT>,
-        ColumnDecimal<ResultT>,
-        ColumnVector<ResultT>>;
-
-    using DataTypeResult = std::conditional_t<IsDecimalNumber<ResultT>,
-        DataTypeDecimal<ResultT>,
-        DataTypeNumber<ResultT>>;
+    using ColumnResult = ColumnVectorOrDecimal<ResultT>;
 
     explicit MovingImpl(const DataTypePtr & data_type_, UInt64 window_size_ = std::numeric_limits<UInt64>::max())
         : IAggregateFunctionDataHelper<Data, MovingImpl<T, Tlimit_num_elems, Data>>({data_type_}, {})
@@ -106,14 +98,7 @@ public:
 
     String getName() const override { return Data::name; }
 
-    DataTypePtr getReturnType() const override
-    {
-        if constexpr (IsDecimalNumber<ResultT>)
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>(
-                DataTypeResult::maxPrecision(), getDecimalScale(*this->argument_types.at(0))));
-        else
-            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeResult>());
-    }
+    DataTypePtr getReturnType() const override { return std::make_shared<DataTypeArray>(getReturnTypeElement()); }
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
@@ -196,6 +181,18 @@ public:
     {
         return true;
     }
+
+private:
+    auto getReturnTypeElement() const
+    {
+        if constexpr (!is_decimal<ResultT>)
+            return std::make_shared<DataTypeNumber<ResultT>>();
+        else
+        {
+            using Res = DataTypeDecimal<ResultT>;
+            return std::make_shared<Res>(Res::maxPrecision(), getDecimalScale(*this->argument_types.at(0)));
+        }
+    }
 };
 
 #undef AGGREGATE_FUNCTION_MOVING_MAX_ARRAY_SIZE
diff --git a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
index 067daf6dc3a..878cbc3219f 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
+++ b/src/AggregateFunctions/AggregateFunctionGroupBitmapData.h
@@ -44,7 +44,7 @@ private:
 
     void toLarge()
     {
-        rb = std::make_unique<RoaringBitmap>();
+        rb = std::make_shared<RoaringBitmap>();
         for (const auto & x : small)
             rb->add(static_cast<Value>(x.getValue()));
         small.clear();
@@ -114,7 +114,7 @@ public:
             readVarUInt(size, in);
             std::unique_ptr<char[]> buf(new char[size]);
             in.readStrict(buf.get(), size);
-            rb = std::make_unique<RoaringBitmap>(RoaringBitmap::read(buf.get()));
+            rb = std::make_shared<RoaringBitmap>(RoaringBitmap::read(buf.get()));
         }
     }
 
@@ -141,7 +141,7 @@ public:
      */
     std::shared_ptr<RoaringBitmap> getNewRoaringBitmapFromSmall() const
     {
-        std::shared_ptr<RoaringBitmap> ret = std::make_unique<RoaringBitmap>();
+        std::shared_ptr<RoaringBitmap> ret = std::make_shared<RoaringBitmap>();
         for (const auto & x : small)
             ret->add(static_cast<Value>(x.getValue()));
         return ret;
@@ -579,6 +579,37 @@ public:
         }
     }
 
+    UInt64 rb_offset_limit(UInt64 offset, UInt64 limit, RoaringBitmapWithSmallSet & r1) const
+    {
+        if (limit == 0 || offset >= size())
+            return 0;
+
+        if (isSmall())
+        {
+            UInt64 count = 0;
+            UInt64 offset_count = 0;
+            auto it = small.begin();
+            for (;it != small.end() && offset_count < offset; ++it)
+                ++offset_count;
+
+            for (;it != small.end() && count < limit; ++it, ++count)
+                r1.add(it->getValue());
+            return count;
+        }
+        else
+        {
+            UInt64 count = 0;
+            UInt64 offset_count = 0;
+            auto it = rb->begin();
+            for (;it != rb->end() && offset_count < offset; ++it)
+                ++offset_count;
+
+            for (;it != rb->end() && count < limit; ++it, ++count)
+                r1.add(*it);
+            return count;
+        }
+    }
+
     UInt64 rb_min() const
     {
         if (isSmall())
diff --git a/src/AggregateFunctions/AggregateFunctionIf.cpp b/src/AggregateFunctions/AggregateFunctionIf.cpp
index d841fe8c06d..4ac6a2dce21 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIf.cpp
@@ -1,8 +1,7 @@
-#include <AggregateFunctions/AggregateFunctionIf.h>
 #include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/AggregateFunctionIf.h>
 #include "AggregateFunctionNull.h"
 
-
 namespace DB
 {
 
@@ -41,6 +40,29 @@ public:
     }
 };
 
+/** Given an array of flags, checks if it's all zeros
+ *  When the buffer is all zeros, this is slightly faster than doing a memcmp since doesn't require allocating memory
+ *  When the buffer has values, this is much faster since it avoids visiting all memory (and the allocation and function calls)
+ */
+static bool ALWAYS_INLINE inline is_all_zeros(const UInt8 * flags, size_t size)
+{
+    size_t unroll_size = size - size % 8;
+    size_t i = 0;
+    while (i < unroll_size)
+    {
+        UInt64 v = *reinterpret_cast<const UInt64 *>(&flags[i]);
+        if (v)
+            return false;
+        i += 8;
+    }
+
+    for (; i < size; i++)
+        if (flags[i])
+            return false;
+
+    return true;
+}
+
 /** There are two cases: for single argument and variadic.
   * Code for single argument is much more efficient.
   */
@@ -107,6 +129,38 @@ public:
         }
     }
 
+    void addBatchSinglePlace(size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t) const override
+    {
+        const ColumnNullable * column = assert_cast<const ColumnNullable *>(columns[0]);
+        const UInt8 * null_map = column->getNullMapData().data();
+        const IColumn * columns_param[] = {&column->getNestedColumn()};
+
+        const IColumn * filter_column = columns[num_arguments - 1];
+        if (const ColumnNullable * nullable_column = typeid_cast<const ColumnNullable *>(filter_column))
+            filter_column = nullable_column->getNestedColumnPtr().get();
+        if constexpr (result_is_nullable)
+        {
+            /// We need to check if there is work to do as otherwise setting the flag would be a mistake,
+            /// it would mean that the return value would be the default value of the nested type instead of NULL
+            if (is_all_zeros(assert_cast<const ColumnUInt8 *>(filter_column)->getData().data(), batch_size))
+                return;
+        }
+
+        /// Combine the 2 flag arrays so we can call a simplified version (one check vs 2)
+        /// Note that now the null map will contain 0 if not null and not filtered, or 1 for null or filtered (or both)
+        const auto * filter_flags = assert_cast<const ColumnUInt8 *>(filter_column)->getData().data();
+        auto final_nulls = std::make_unique<UInt8[]>(batch_size);
+        for (size_t i = 0; i < batch_size; ++i)
+            final_nulls[i] = (!!null_map[i]) | (!filter_flags[i]);
+
+        this->nested_function->addBatchSinglePlaceNotNull(
+            batch_size, this->nestedPlace(place), columns_param, final_nulls.get(), arena, -1);
+
+        if constexpr (result_is_nullable)
+            if (!memoryIsByte(null_map, batch_size, 1))
+                this->setFlag(place);
+    }
+
 #if USE_EMBEDDED_COMPILER
 
     void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const DataTypes & arguments_types, const std::vector<llvm::Value *> & argument_values) const override
diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/AggregateFunctionIf.h
index 79999437ca1..c7c5dbf441e 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.h
+++ b/src/AggregateFunctions/AggregateFunctionIf.h
@@ -5,9 +5,7 @@
 #include <Common/assert_cast.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
diff --git a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp
index eac7e6e9409..5186153b69a 100644
--- a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.h b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
index 365bc45f7b7..3f2b7276c0f 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.h
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.h
@@ -7,7 +7,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
 #include <Common/PODArray_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
index 2b7b28266c1..14e5abcfb97 100644
--- a/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
+++ b/src/AggregateFunctions/AggregateFunctionMaxIntersections.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
index cc670fdf823..ad3ccdcc48e 100644
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
@@ -6,16 +6,15 @@
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnNullable.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/assert_cast.h>
-
+#include <DataTypes/DataTypeNullable.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
@@ -43,12 +42,14 @@ struct SingleValueDataFixed
 {
 private:
     using Self = SingleValueDataFixed;
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
 
     bool has_value = false; /// We need to remember if at least one value has been passed. This is necessary for AggregateFunctionIf.
     T value;
 
 public:
+    static constexpr bool is_nullable = false;
+
     bool has() const
     {
         return has_value;
@@ -469,6 +470,8 @@ private:
     char small_data[MAX_SMALL_STRING_SIZE]; /// Including the terminating zero.
 
 public:
+    static constexpr bool is_nullable = false;
+
     bool has() const
     {
         return size >= 0;
@@ -692,6 +695,8 @@ private:
     Field value;
 
 public:
+    static constexpr bool is_nullable = false;
+
     bool has() const
     {
         return !value.isNull();
@@ -975,6 +980,68 @@ struct AggregateFunctionAnyLastData : Data
 #endif
 };
 
+template <typename Data>
+struct AggregateFunctionSingleValueOrNullData : Data
+{
+    static constexpr bool is_nullable = true;
+
+    using Self = AggregateFunctionSingleValueOrNullData;
+
+    bool first_value = true;
+    bool is_null = false;
+
+    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)
+    {
+        if (first_value)
+        {
+            first_value = false;
+            this->change(column, row_num, arena);
+            return true;
+        }
+        else if (!this->isEqualTo(column, row_num))
+        {
+            is_null = true;
+        }
+        return false;
+    }
+
+    bool changeIfBetter(const Self & to, Arena * arena)
+    {
+        if (first_value)
+        {
+            first_value = false;
+            this->change(to, arena);
+            return true;
+        }
+        else if (!this->isEqualTo(to))
+        {
+            is_null = true;
+        }
+        return false;
+    }
+
+    void insertResultInto(IColumn & to) const
+    {
+        if (is_null || first_value)
+        {
+            to.insertDefault();
+        }
+        else
+        {
+            ColumnNullable & col = typeid_cast<ColumnNullable &>(to);
+            col.getNullMapColumn().insertDefault();
+            this->Data::insertResultInto(col.getNestedColumn());
+        }
+    }
+
+    static const char * name() { return "singleValueOrNull"; }
+
+#if USE_EMBEDDED_COMPILER
+
+    static constexpr bool is_compilable = false;
+
+#endif
+};
 
 /** Implement 'heavy hitters' algorithm.
   * Selects most frequent value if its frequency is more than 50% in each thread of execution.
@@ -1074,7 +1141,10 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        return this->argument_types.at(0);
+        auto result_type = this->argument_types.at(0);
+        if constexpr (Data::is_nullable)
+            return makeNullable(result_type);
+        return result_type;
     }
 
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
diff --git a/src/AggregateFunctions/AggregateFunctionNull.h b/src/AggregateFunctions/AggregateFunctionNull.h
index 7890e96ef66..503243f98b0 100644
--- a/src/AggregateFunctions/AggregateFunctionNull.h
+++ b/src/AggregateFunctions/AggregateFunctionNull.h
@@ -10,9 +10,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.cpp b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
index 3ba20e65e32..7aee0289879 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.cpp
+++ b/src/AggregateFunctions/AggregateFunctionOrFill.cpp
@@ -23,6 +23,9 @@ private:
 public:
     explicit AggregateFunctionCombinatorOrFill(Kind kind_) : kind(kind_) {}
 
+    /// Due to aggregate_functions_null_for_empty
+    bool supportsNesting() const override { return true; }
+
     String getName() const override
     {
         return kind == Kind::OrNull ? "OrNull" : "OrDefault";
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.cpp b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
index 11b14585653..5f84eb9b271 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
@@ -56,6 +56,8 @@ template <typename Value, bool float_return> using FuncQuantilesTDigestWeighted
 template <typename Value, bool float_return> using FuncQuantileBFloat16 = AggregateFunctionQuantile<Value, QuantileBFloat16Histogram<Value>, NameQuantileBFloat16, false, std::conditional_t<float_return, Float64, void>, false>;
 template <typename Value, bool float_return> using FuncQuantilesBFloat16 = AggregateFunctionQuantile<Value, QuantileBFloat16Histogram<Value>, NameQuantilesBFloat16, false, std::conditional_t<float_return, Float64, void>, true>;
 
+template <typename Value, bool float_return> using FuncQuantileBFloat16Weighted = AggregateFunctionQuantile<Value, QuantileBFloat16Histogram<Value>, NameQuantileBFloat16Weighted, true, std::conditional_t<float_return, Float64, void>, false>;
+template <typename Value, bool float_return> using FuncQuantilesBFloat16Weighted = AggregateFunctionQuantile<Value, QuantileBFloat16Histogram<Value>, NameQuantilesBFloat16Weighted, true, std::conditional_t<float_return, Float64, void>, true>;
 
 template <template <typename, bool> class Function>
 static constexpr bool supportDecimal()
@@ -167,6 +169,9 @@ void registerAggregateFunctionsQuantile(AggregateFunctionFactory & factory)
     factory.registerFunction(NameQuantileBFloat16::name, createAggregateFunctionQuantile<FuncQuantileBFloat16>);
     factory.registerFunction(NameQuantilesBFloat16::name, { createAggregateFunctionQuantile<FuncQuantilesBFloat16>, properties });
 
+    factory.registerFunction(NameQuantileBFloat16Weighted::name, createAggregateFunctionQuantile<FuncQuantileBFloat16Weighted>);
+    factory.registerFunction(NameQuantilesBFloat16Weighted::name, createAggregateFunctionQuantile<FuncQuantilesBFloat16Weighted>);
+
     /// 'median' is an alias for 'quantile'
     factory.registerAlias("median", NameQuantile::name);
     factory.registerAlias("medianDeterministic", NameQuantileDeterministic::name);
@@ -179,6 +184,7 @@ void registerAggregateFunctionsQuantile(AggregateFunctionFactory & factory)
     factory.registerAlias("medianTDigest", NameQuantileTDigest::name);
     factory.registerAlias("medianTDigestWeighted", NameQuantileTDigestWeighted::name);
     factory.registerAlias("medianBFloat16", NameQuantileBFloat16::name);
+    factory.registerAlias("medianBFloat16Weighted", NameQuantileBFloat16Weighted::name);
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index a7a3d4042c2..5ca52f6d73a 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -67,10 +67,10 @@ class AggregateFunctionQuantile final : public IAggregateFunctionDataHelper<Data
     AggregateFunctionQuantile<Value, Data, Name, has_second_arg, FloatReturnType, returns_many>>
 {
 private:
-    using ColVecType = std::conditional_t<IsDecimalNumber<Value>, ColumnDecimal<Value>, ColumnVector<Value>>;
+    using ColVecType = ColumnVectorOrDecimal<Value>;
 
     static constexpr bool returns_float = !(std::is_same_v<FloatReturnType, void>);
-    static_assert(!IsDecimalNumber<Value> || !returns_float);
+    static_assert(!is_decimal<Value> || !returns_float);
 
     QuantileLevels<Float64> levels;
 
@@ -237,5 +237,7 @@ struct NameQuantilesTDigestWeighted { static constexpr auto name = "quantilesTDi
 
 struct NameQuantileBFloat16 { static constexpr auto name = "quantileBFloat16"; };
 struct NameQuantilesBFloat16 { static constexpr auto name = "quantilesBFloat16"; };
+struct NameQuantileBFloat16Weighted { static constexpr auto name = "quantileBFloat16Weighted"; };
+struct NameQuantilesBFloat16Weighted { static constexpr auto name = "quantilesBFloat16Weighted"; };
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
index b7da1f28fd3..9a92e02cce2 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.h
@@ -7,7 +7,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
 #include <Common/PODArray_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
diff --git a/src/AggregateFunctions/AggregateFunctionResample.h b/src/AggregateFunctions/AggregateFunctionResample.h
index 45aad8c1a56..f315960fb86 100644
--- a/src/AggregateFunctions/AggregateFunctionResample.h
+++ b/src/AggregateFunctions/AggregateFunctionResample.h
@@ -4,7 +4,7 @@
 #include <Columns/ColumnArray.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Common/assert_cast.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.h b/src/AggregateFunctions/AggregateFunctionRetention.h
index 896160bbe14..5d15a2e9583 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.h
+++ b/src/AggregateFunctions/AggregateFunctionRetention.h
@@ -9,7 +9,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Common/ArenaAllocator.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <bitset>
 
 #include <AggregateFunctions/IAggregateFunction.h>
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
index 846476a5b79..0c1b75798c8 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index d05a4ca314d..ab3df6ed38b 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <Common/PODArray.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -48,6 +48,8 @@ struct AggregateFunctionSequenceMatchData final
 
     bool sorted = true;
     PODArrayWithStackMemory<TimestampEvents, 64> events_list;
+    /// sequenceMatch conditions met at least once in events_list
+    std::bitset<max_events> conditions_met;
 
     void add(const Timestamp timestamp, const Events & events)
     {
@@ -56,6 +58,7 @@ struct AggregateFunctionSequenceMatchData final
         {
             events_list.emplace_back(timestamp, events);
             sorted = false;
+            conditions_met |= events;
         }
     }
 
@@ -64,29 +67,9 @@ struct AggregateFunctionSequenceMatchData final
         if (other.events_list.empty())
             return;
 
-        const auto size = events_list.size();
-
         events_list.insert(std::begin(other.events_list), std::end(other.events_list));
-
-        /// either sort whole container or do so partially merging ranges afterwards
-        if (!sorted && !other.sorted)
-            std::sort(std::begin(events_list), std::end(events_list), Comparator{});
-        else
-        {
-            const auto begin = std::begin(events_list);
-            const auto middle = std::next(begin, size);
-            const auto end = std::end(events_list);
-
-            if (!sorted)
-                std::sort(begin, middle, Comparator{});
-
-            if (!other.sorted)
-                std::sort(middle, end, Comparator{});
-
-            std::inplace_merge(begin, middle, end, Comparator{});
-        }
-
-        sorted = true;
+        sorted = false;
+        conditions_met |= other.conditions_met;
     }
 
     void sort()
@@ -290,6 +273,7 @@ private:
                     dfa_states.back().transition = DFATransition::SpecificEvent;
                     dfa_states.back().event = event_number - 1;
                     dfa_states.emplace_back();
+                    conditions_in_pattern.set(event_number - 1);
                 }
 
                 if (!match(")"))
@@ -518,6 +502,64 @@ protected:
         return action_it == action_end;
     }
 
+    /// Splits the pattern into deterministic parts separated by non-deterministic fragments
+    /// (time constraints and Kleene stars), and tries to match the deterministic parts in their specified order,
+    /// ignoring the non-deterministic fragments.
+    /// This function can quickly check that a full match is not possible if some deterministic fragment is missing.
+    template <typename EventEntry>
+    bool couldMatchDeterministicParts(const EventEntry events_begin, const EventEntry events_end, bool limit_iterations = true) const
+    {
+        size_t events_processed = 0;
+        auto events_it = events_begin;
+
+        const auto actions_end = std::end(actions);
+        auto actions_it = std::begin(actions);
+        auto det_part_begin = actions_it;
+
+        auto match_deterministic_part = [&events_it, events_end, &events_processed, det_part_begin, actions_it, limit_iterations]()
+        {
+            auto events_it_init = events_it;
+            auto det_part_it = det_part_begin;
+
+            while (det_part_it != actions_it && events_it != events_end)
+            {
+                /// matching any event
+                if (det_part_it->type == PatternActionType::AnyEvent)
+                    ++events_it, ++det_part_it;
+
+                /// matching specific event
+                else
+                {
+                    if (events_it->second.test(det_part_it->extra))
+                        ++events_it, ++det_part_it;
+
+                    /// abandon current matching, try to match the deterministic fragment further in the list
+                    else
+                    {
+                        events_it = ++events_it_init;
+                        det_part_it = det_part_begin;
+                    }
+                }
+
+                if (limit_iterations && ++events_processed > sequence_match_max_iterations)
+                    throw Exception{"Pattern application proves too difficult, exceeding max iterations (" + toString(sequence_match_max_iterations) + ")",
+                        ErrorCodes::TOO_SLOW};
+            }
+
+            return det_part_it == actions_it;
+        };
+
+        for (; actions_it != actions_end; ++actions_it)
+            if (actions_it->type != PatternActionType::SpecificEvent && actions_it->type != PatternActionType::AnyEvent)
+            {
+                if (!match_deterministic_part())
+                    return false;
+                det_part_begin = std::next(actions_it);
+            }
+
+        return match_deterministic_part();
+    }
+
 private:
     enum class DFATransition : char
     {
@@ -558,6 +600,8 @@ private:
 protected:
     /// `True` if the parsed pattern contains time assertions (?t...), `false` otherwise.
     bool pattern_has_time;
+    /// sequenceMatch conditions met at least once in the pattern
+    std::bitset<max_events> conditions_in_pattern;
 
 private:
     std::string pattern;
@@ -584,6 +628,12 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
+        auto & output = assert_cast<ColumnUInt8 &>(to).getData();
+        if ((this->conditions_in_pattern & this->data(place).conditions_met) != this->conditions_in_pattern)
+        {
+            output.push_back(false);
+            return;
+        }
         this->data(place).sort();
 
         const auto & data_ref = this->data(place);
@@ -592,8 +642,10 @@ public:
         const auto events_end = std::end(data_ref.events_list);
         auto events_it = events_begin;
 
-        bool match = this->pattern_has_time ? this->backtrackingMatch(events_it, events_end) : this->dfaMatch(events_it, events_end);
-        assert_cast<ColumnUInt8 &>(to).getData().push_back(match);
+        bool match = (this->pattern_has_time ?
+            (this->couldMatchDeterministicParts(events_begin, events_end) && this->backtrackingMatch(events_it, events_end)) :
+            this->dfaMatch(events_it, events_end));
+        output.push_back(match);
     }
 };
 
@@ -614,8 +666,14 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
+        auto & output = assert_cast<ColumnUInt64 &>(to).getData();
+        if ((this->conditions_in_pattern & this->data(place).conditions_met) != this->conditions_in_pattern)
+        {
+            output.push_back(0);
+            return;
+        }
         this->data(place).sort();
-        assert_cast<ColumnUInt64 &>(to).getData().push_back(count(place));
+        output.push_back(count(place));
     }
 
 private:
@@ -628,8 +686,12 @@ private:
         auto events_it = events_begin;
 
         size_t count = 0;
-        while (events_it != events_end && this->backtrackingMatch(events_it, events_end))
-            ++count;
+        // check if there is a chance of matching the sequence at least once
+        if (this->couldMatchDeterministicParts(events_begin, events_end))
+        {
+            while (events_it != events_end && this->backtrackingMatch(events_it, events_end))
+                ++count;
+        }
 
         return count;
     }
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
index d86499b90f3..9cdec775957 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.cpp
@@ -8,7 +8,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
 #include <Common/CurrentThread.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
index 697112dc443..482229233f5 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
@@ -3,9 +3,6 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/FactoryHelpers.h>
 
-#include <Core/TypeListNumber.h>
-
-
 namespace DB
 {
 struct Settings;
diff --git a/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp b/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp
new file mode 100644
index 00000000000..cd897dfcf6e
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp
@@ -0,0 +1,27 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/HelpersMinMaxAny.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include "registerAggregateFunctions.h"
+
+
+namespace DB
+{
+struct Settings;
+
+namespace
+{
+
+AggregateFunctionPtr createAggregateFunctionSingleValueOrNull(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionSingleValueOrNullData>(name, argument_types, parameters, settings));
+}
+
+}
+
+void registerAggregateFunctionSingleValueOrNull(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("singleValueOrNull", createAggregateFunctionSingleValueOrNull);
+}
+
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.cpp b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
new file mode 100644
index 00000000000..7f1196173a7
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.cpp
@@ -0,0 +1,72 @@
+#include <AggregateFunctions/AggregateFunctionSparkbar.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+
+namespace DB
+{
+
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+template <template <typename, typename> class AggregateFunctionTemplate, typename Data, typename ... TArgs>
+static IAggregateFunction * createWithUIntegerOrTimeType(const std::string & name, const IDataType & argument_type, TArgs && ... args)
+{
+    WhichDataType which(argument_type);
+    if (which.idx == TypeIndex::Date || which.idx == TypeIndex::UInt16) return new AggregateFunctionTemplate<UInt16, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime || which.idx == TypeIndex::UInt32) return new AggregateFunctionTemplate<UInt32, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt8) return new AggregateFunctionTemplate<UInt8, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt64) return new AggregateFunctionTemplate<UInt64, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt128) return new AggregateFunctionTemplate<UInt128, Data>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::UInt256) return new AggregateFunctionTemplate<UInt256, Data>(std::forward<TArgs>(args)...);
+    throw Exception("The first argument type must be UInt or Date or DateTime for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+template <typename ... TArgs>
+AggregateFunctionPtr createAggregateFunctionSparkbarImpl(const std::string & name, const IDataType & x_argument_type, const IDataType & y_argument_type, TArgs ... args)
+{
+    WhichDataType which(y_argument_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) return AggregateFunctionPtr(createWithUIntegerOrTimeType<AggregateFunctionSparkbar, TYPE>(name, x_argument_type, std::forward<TArgs>(args)...));
+    FOR_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    throw Exception("The second argument type must be numeric for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+}
+
+
+AggregateFunctionPtr createAggregateFunctionSparkbar(const std::string & name, const DataTypes & arguments, const Array & params, const Settings *)
+{
+    assertBinary(name, arguments);
+
+    if (params.size() != 1 && params.size() != 3)
+        throw Exception("The number of params does not match for aggregate function " + name, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    if (params.size() == 3)
+    {
+        if (params.at(1).getType() != arguments[0]->getDefault().getType() || params.at(2).getType() != arguments[0]->getDefault().getType())
+        {
+            throw Exception("The second and third parameters are not the same type as the first arguments for aggregate function " + name, ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        }
+    }
+    return createAggregateFunctionSparkbarImpl(name, *arguments[0], *arguments[1], arguments, params);
+}
+
+
+}
+
+void registerAggregateFunctionSparkbar(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("sparkbar", createAggregateFunctionSparkbar);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionSparkbar.h b/src/AggregateFunctions/AggregateFunctionSparkbar.h
new file mode 100644
index 00000000000..627bfbe602b
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionSparkbar.h
@@ -0,0 +1,309 @@
+#pragma once
+
+#include <DataTypes/DataTypeString.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <base/range.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Columns/ColumnString.h>
+#include <base/logger_useful.h>
+#include <IO/ReadBufferFromString.h>
+#include <Common/HashTable/HashMap.h>
+
+namespace DB
+{
+
+template<typename X, typename Y>
+struct AggregateFunctionSparkbarData
+{
+
+    using Points = HashMap<X, Y>;
+    Points points;
+
+    X min_x = std::numeric_limits<X>::max();
+    X max_x = std::numeric_limits<X>::lowest();
+
+    Y min_y = std::numeric_limits<Y>::max();
+    Y max_y = std::numeric_limits<Y>::lowest();
+
+    void insert(const X & x, const Y & y)
+    {
+        auto result = points.insert({x, y});
+        if (!result.second)
+            result.first->getMapped() += y;
+    }
+
+    void add(X x, Y y)
+    {
+        insert(x, y);
+        min_x = std::min(x, min_x);
+        max_x = std::max(x, max_x);
+        min_y = std::min(y, min_y);
+        max_y = std::max(y, max_y);
+    }
+
+    void merge(const AggregateFunctionSparkbarData & other)
+    {
+        if (other.points.empty())
+            return;
+
+        for (auto & point : other.points)
+            insert(point.getKey(), point.getMapped());
+
+        min_x = std::min(other.min_x, min_x);
+        max_x = std::max(other.max_x, max_x);
+        min_y = std::min(other.min_y, min_y);
+        max_y = std::max(other.max_y, max_y);
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        writeBinary(min_x, buf);
+        writeBinary(max_x, buf);
+        writeBinary(min_y, buf);
+        writeBinary(max_y, buf);
+        writeVarUInt(points.size(), buf);
+
+        for (const auto & elem : points)
+        {
+            writeBinary(elem.getKey(), buf);
+            writeBinary(elem.getMapped(), buf);
+        }
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        readBinary(min_x, buf);
+        readBinary(max_x, buf);
+        readBinary(min_y, buf);
+        readBinary(max_y, buf);
+        size_t size;
+        readVarUInt(size, buf);
+
+        /// TODO Protection against huge size
+        X x;
+        Y y;
+        for (size_t i = 0; i < size; ++i)
+        {
+            readBinary(x, buf);
+            readBinary(y, buf);
+            insert(x, y);
+        }
+    }
+
+};
+
+template<typename X, typename Y>
+class AggregateFunctionSparkbar final
+    : public IAggregateFunctionDataHelper<AggregateFunctionSparkbarData<X, Y>, AggregateFunctionSparkbar<X, Y>>
+{
+
+private:
+    size_t width;
+    X min_x;
+    X max_x;
+
+    String getBar(const UInt8 value) const
+    {
+        // ▁▂▃▄▅▆▇█
+        switch (value)
+        {
+            case 1: return "▁";
+            case 2: return "▂";
+            case 3: return "▃";
+            case 4: return "▄";
+            case 5: return "▅";
+            case 6: return "▆";
+            case 7: return "▇";
+            case 8: return "█";
+        }
+        return " ";
+    }
+
+    /**
+     *  The minimum value of y is rendered as the lowest height "▁",
+     *  the maximum value of y is rendered as the highest height "█", and the middle value will be rendered proportionally.
+     *  If a bucket has no y value, it will be rendered as " ".
+     *  If the actual number of buckets is greater than the specified bucket, it will be compressed by width.
+     *  For example, there are actually 11 buckets, specify 10 buckets, and divide the 11 buckets as follows (11/10):
+     *  0.0-1.1, 1.1-2.2, 2.2-3.3, 3.3-4.4, 4.4-5.5, 5.5-6.6, 6.6-7.7, 7.7-8.8, 8.8-9.9, 9.9-11.
+     *  The y value of the first bucket will be calculated as follows:
+     *  the actual y value of the first position + the actual second position y*0.1, and the remaining y*0.9 is reserved for the next bucket.
+     *  The next bucket will use the last y*0.9 + the actual third position y*0.2, and the remaining y*0.8 will be reserved for the next bucket. And so on.
+     */
+    String render(const AggregateFunctionSparkbarData<X, Y> & data) const
+    {
+        String value;
+        if (data.points.empty() || !width)
+            return value;
+        X local_min_x = data.min_x;
+        X local_max_x = data.max_x;
+        size_t diff_x = local_max_x - local_min_x;
+        if ((diff_x + 1) <= width)
+        {
+            Y min_y = data.min_y;
+            Y max_y = data.max_y;
+            Float64 diff_y = max_y - min_y;
+
+            if (diff_y)
+            {
+                for (size_t i = 0; i <= diff_x; ++i)
+                {
+                    auto it = data.points.find(local_min_x + i);
+                    bool found = it != data.points.end();
+                    value += getBar(found ? static_cast<UInt8>(std::round(((it->getMapped() - min_y) / diff_y) * 7) + 1) : 0);
+                }
+            }
+            else
+            {
+                for (size_t i = 0; i <= diff_x; ++i)
+                    value += getBar(data.points.has(local_min_x + i) ? 1 : 0);
+            }
+        }
+        else
+        {
+            // begin reshapes to width buckets
+            Float64 multiple_d = (diff_x + 1) / static_cast<Float64>(width);
+
+            std::optional<Float64> min_y;
+            std::optional<Float64> max_y;
+
+            std::optional<Float64> new_y;
+            std::vector<std::optional<Float64>> newPoints;
+            newPoints.reserve(width);
+
+            std::pair<size_t, Float64> bound{0, 0.0};
+            size_t cur_bucket_num = 0;
+            // upper bound for bucket
+            auto upperBound = [&](size_t bucket_num)
+            {
+                bound.second = (bucket_num + 1) * multiple_d;
+                bound.first = std::floor(bound.second);
+            };
+            upperBound(cur_bucket_num);
+            for (size_t i = 0; i <= (diff_x + 1); ++i)
+            {
+                if (i == bound.first) // is bound
+                {
+                    Float64 proportion = bound.second - bound.first;
+                    auto it = data.points.find(local_min_x + i);
+                    bool found = (it != data.points.end());
+                    if (found)
+                        new_y = new_y.value_or(0) + it->getMapped() * proportion;
+
+                    if (new_y)
+                    {
+                        Float64 avg_y = new_y.value() / multiple_d;
+
+                        newPoints.emplace_back(avg_y);
+                        // If min_y has no value, or if the avg_y of the current bucket is less than min_y, update it.
+                        if (!min_y || avg_y < min_y)
+                            min_y = avg_y;
+                        if (!max_y || avg_y > max_y)
+                            max_y = avg_y;
+                    }
+                    else
+                    {
+                        newPoints.emplace_back();
+                    }
+
+                    // next bucket
+                    new_y = found ? ((1 - proportion) * it->getMapped()) : std::optional<Float64>();
+                    upperBound(++cur_bucket_num);
+                }
+                else
+                {
+                    auto it = data.points.find(local_min_x + i);
+                    if (it != data.points.end())
+                        new_y = new_y.value_or(0) + it->getMapped();
+                }
+            }
+
+            if (!min_y || !max_y) // No value is set
+                return {};
+
+            Float64 diff_y = max_y.value() - min_y.value();
+
+            auto getBars = [&] (const std::optional<Float64> & point_y)
+            {
+                value += getBar(point_y ? static_cast<UInt8>(std::round(((point_y.value() - min_y.value()) / diff_y) * 7) + 1) : 0);
+            };
+            auto getBarsForConstant = [&] (const std::optional<Float64> & point_y)
+            {
+                value += getBar(point_y ? 1 : 0);
+            };
+
+            if (diff_y)
+                std::for_each(newPoints.begin(), newPoints.end(), getBars);
+            else
+                std::for_each(newPoints.begin(), newPoints.end(), getBarsForConstant);
+        }
+        return value;
+    }
+
+
+public:
+    AggregateFunctionSparkbar(const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionDataHelper<AggregateFunctionSparkbarData<X, Y>, AggregateFunctionSparkbar>(
+        arguments, params)
+    {
+        width = params.at(0).safeGet<UInt64>();
+        if (params.size() == 3)
+        {
+            min_x = params.at(1).safeGet<X>();
+            max_x = params.at(2).safeGet<X>();
+        }
+        else
+        {
+            min_x = std::numeric_limits<X>::min();
+            max_x = std::numeric_limits<X>::max();
+        }
+    }
+
+    String getName() const override
+    {
+        return "sparkbar";
+    }
+
+    DataTypePtr getReturnType() const override
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * /*arena*/) const override
+    {
+        X x = assert_cast<const ColumnVector<X> *>(columns[0])->getData()[row_num];
+        if (min_x <= x && x <= max_x)
+        {
+            Y y = assert_cast<const ColumnVector<Y> *>(columns[1])->getData()[row_num];
+            this->data(place).add(x, y);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * /*arena*/) const override
+    {
+        this->data(place).merge(this->data(rhs));
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf) const override
+    {
+        this->data(place).serialize(buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, Arena *) const override
+    {
+        this->data(place).deserialize(buf);
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * /*arena*/) const override
+    {
+        auto & to_column = assert_cast<ColumnString &>(to);
+        const auto & data = this->data(place);
+        const String & value = render(data);
+        to_column.insertData(value.data(), value.size());
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index e57781fac33..a76507fe2a2 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
@@ -49,7 +49,7 @@ struct StatFuncOneArg
     using Type1 = T;
     using Type2 = T;
     using ResultType = std::conditional_t<std::is_same_v<T, Float32>, Float32, Float64>;
-    using Data = std::conditional_t<IsDecimalNumber<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
+    using Data = std::conditional_t<is_decimal<T>, VarMomentsDecimal<Decimal128, _level>, VarMoments<ResultType, _level>>;
 
     static constexpr StatisticsFunctionKind kind = _kind;
     static constexpr UInt32 num_args = 1;
@@ -75,8 +75,8 @@ class AggregateFunctionVarianceSimple final
 public:
     using T1 = typename StatFunc::Type1;
     using T2 = typename StatFunc::Type2;
-    using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
-    using ColVecT2 = std::conditional_t<IsDecimalNumber<T2>, ColumnDecimal<T2>, ColumnVector<T2>>;
+    using ColVecT1 = ColumnVectorOrDecimal<T1>;
+    using ColVecT2 = ColumnVectorOrDecimal<T2>;
     using ResultType = typename StatFunc::ResultType;
     using ColVecResult = ColumnVector<ResultType>;
 
@@ -132,7 +132,7 @@ public:
                 static_cast<ResultType>(static_cast<const ColVecT2 &>(*columns[1]).getData()[row_num]));
         else
         {
-            if constexpr (IsDecimalNumber<T1>)
+            if constexpr (is_decimal<T1>)
             {
                 this->data(place).add(static_cast<ResultType>(
                     static_cast<const ColVecT1 &>(*columns[0]).getData()[row_num].value));
@@ -163,7 +163,7 @@ public:
         const auto & data = this->data(place);
         auto & dst = static_cast<ColVecResult &>(to).getData();
 
-        if constexpr (IsDecimalNumber<T1>)
+        if constexpr (is_decimal<T1>)
         {
             if constexpr (StatFunc::kind == StatisticsFunctionKind::varPop)
                 dst.push_back(data.getPopulation(src_scale * 2));
diff --git a/src/AggregateFunctions/AggregateFunctionSum.cpp b/src/AggregateFunctions/AggregateFunctionSum.cpp
index ad4297438bd..6ebd006890b 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSum.cpp
@@ -20,10 +20,9 @@ template <typename T>
 struct SumSimple
 {
     /// @note It uses slow Decimal128 (cause we need such a variant). sumWithOverflow is faster for Decimal32/64
-    using ResultType = std::conditional_t<IsDecimalNumber<T>,
+    using ResultType = std::conditional_t<is_decimal<T>,
                                         std::conditional_t<std::is_same_v<T, Decimal256>, Decimal256, Decimal128>,
                                         NearestFieldType<T>>;
-    // using ResultType = std::conditional_t<IsDecimalNumber<T>, Decimal128, NearestFieldType<T>>;
     using AggregateDataType = AggregateFunctionSumData<ResultType>;
     using Function = AggregateFunctionSum<T, ResultType, AggregateDataType, AggregateFunctionTypeSum>;
 };
@@ -47,7 +46,7 @@ struct SumKahan
 template <typename T> using AggregateFunctionSumSimple = typename SumSimple<T>::Function;
 template <typename T> using AggregateFunctionSumWithOverflow = typename SumSameType<T>::Function;
 template <typename T> using AggregateFunctionSumKahan =
-    std::conditional_t<IsDecimalNumber<T>, typename SumSimple<T>::Function, typename SumKahan<T>::Function>;
+    std::conditional_t<is_decimal<T>, typename SumSimple<T>::Function, typename SumKahan<T>::Function>;
 
 
 template <template <typename> class Function>
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 3355cb0d6fc..f6a9bdda7fd 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstring>
+#include <memory>
 #include <experimental/type_traits>
 #include <type_traits>
 
@@ -12,9 +14,7 @@
 
 #include <AggregateFunctions/IAggregateFunction.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
@@ -96,24 +96,25 @@ struct AggregateFunctionSumData
         Impl::add(sum, local_sum);
     }
 
-    template <typename Value>
-    void NO_SANITIZE_UNDEFINED NO_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
+    template <typename Value, bool add_if_zero>
+    void NO_SANITIZE_UNDEFINED NO_INLINE
+    addManyConditional_internal(const Value * __restrict ptr, const UInt8 * __restrict condition_map, size_t count)
     {
         const auto * end = ptr + count;
 
         if constexpr (
-            (is_integer_v<T> && !is_big_int_v<T>)
-            || (IsDecimalNumber<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
+            (is_integer<T> && !is_big_int_v<T>)
+            || (is_decimal<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
         {
             /// For integers we can vectorize the operation if we replace the null check using a multiplication (by 0 for null, 1 for not null)
             /// https://quick-bench.com/q/MLTnfTvwC2qZFVeWHfOBR3U7a8I
             T local_sum{};
             while (ptr < end)
             {
-                T multiplier = !*null_map;
+                T multiplier = !*condition_map == add_if_zero;
                 Impl::add(local_sum, *ptr * multiplier);
                 ++ptr;
-                ++null_map;
+                ++condition_map;
             }
             Impl::add(sum, local_sum);
             return;
@@ -121,6 +122,10 @@ struct AggregateFunctionSumData
 
         if constexpr (std::is_floating_point_v<T>)
         {
+            /// For floating point we use a similar trick as above, except that now we  reinterpret the floating point number as an unsigned
+            /// integer of the same size and use a mask instead (0 to discard, 0xFF..FF to keep)
+            static_assert(sizeof(Value) == 4 || sizeof(Value) == 8);
+            typedef typename std::conditional<sizeof(Value) == 4, UInt32, UInt64>::type equivalent_integer;
             constexpr size_t unroll_count = 128 / sizeof(T);
             T partial_sums[unroll_count]{};
 
@@ -130,13 +135,15 @@ struct AggregateFunctionSumData
             {
                 for (size_t i = 0; i < unroll_count; ++i)
                 {
-                    if (!null_map[i])
-                    {
-                        Impl::add(partial_sums[i], ptr[i]);
-                    }
+                    equivalent_integer value;
+                    std::memcpy(&value, &ptr[i], sizeof(Value));
+                    value &= (!condition_map[i] != add_if_zero) - 1;
+                    Value d;
+                    std::memcpy(&d, &value, sizeof(Value));
+                    Impl::add(partial_sums[i], d);
                 }
                 ptr += unroll_count;
-                null_map += unroll_count;
+                condition_map += unroll_count;
             }
 
             for (size_t i = 0; i < unroll_count; ++i)
@@ -146,14 +153,26 @@ struct AggregateFunctionSumData
         T local_sum{};
         while (ptr < end)
         {
-            if (!*null_map)
+            if (!*condition_map == add_if_zero)
                 Impl::add(local_sum, *ptr);
             ++ptr;
-            ++null_map;
+            ++condition_map;
         }
         Impl::add(sum, local_sum);
     }
 
+    template <typename Value>
+    void ALWAYS_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
+    {
+        return addManyConditional_internal<Value, true>(ptr, null_map, count);
+    }
+
+    template <typename Value>
+    void ALWAYS_INLINE addManyConditional(const Value * __restrict ptr, const UInt8 * __restrict cond_map, size_t count)
+    {
+        return addManyConditional_internal<Value, false>(ptr, cond_map, count);
+    }
+
     void NO_SANITIZE_UNDEFINED merge(const AggregateFunctionSumData & rhs)
     {
         Impl::add(sum, rhs.sum);
@@ -229,8 +248,8 @@ struct AggregateFunctionSumKahanData
         }
     }
 
-    template <typename Value>
-    void NO_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
+    template <typename Value, bool add_if_zero>
+    void NO_INLINE addManyConditional_internal(const Value * __restrict ptr, const UInt8 * __restrict condition_map, size_t count)
     {
         constexpr size_t unroll_count = 4;
         T partial_sums[unroll_count]{};
@@ -242,10 +261,10 @@ struct AggregateFunctionSumKahanData
         while (ptr < unrolled_end)
         {
             for (size_t i = 0; i < unroll_count; ++i)
-                if (!null_map[i])
+                if ((!condition_map[i]) == add_if_zero)
                     addImpl(ptr[i], partial_sums[i], partial_compensations[i]);
             ptr += unroll_count;
-            null_map += unroll_count;
+            condition_map += unroll_count;
         }
 
         for (size_t i = 0; i < unroll_count; ++i)
@@ -253,13 +272,25 @@ struct AggregateFunctionSumKahanData
 
         while (ptr < end)
         {
-            if (!*null_map)
+            if ((!*condition_map) == add_if_zero)
                 addImpl(*ptr, sum, compensation);
             ++ptr;
-            ++null_map;
+            ++condition_map;
         }
     }
 
+    template <typename Value>
+    void ALWAYS_INLINE addManyNotNull(const Value * __restrict ptr, const UInt8 * __restrict null_map, size_t count)
+    {
+        return addManyConditional_internal<Value, true>(ptr, null_map, count);
+    }
+
+    template <typename Value>
+    void ALWAYS_INLINE addManyConditional(const Value * __restrict ptr, const UInt8 * __restrict cond_map, size_t count)
+    {
+        return addManyConditional_internal<Value, false>(ptr, cond_map, count);
+    }
+
     void ALWAYS_INLINE mergeImpl(T & to_sum, T & to_compensation, T from_sum, T from_compensation)
     {
         auto raw_sum = to_sum + from_sum;
@@ -308,9 +339,7 @@ class AggregateFunctionSum final : public IAggregateFunctionDataHelper<Data, Agg
 public:
     static constexpr bool DateTime64Supported = false;
 
-    using ResultDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<TResult>, DataTypeNumber<TResult>>;
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
-    using ColVecResult = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<TResult>, ColumnVector<TResult>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
 
     String getName() const override
     {
@@ -335,10 +364,13 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        if constexpr (IsDecimalNumber<T>)
-            return std::make_shared<ResultDataType>(ResultDataType::maxPrecision(), scale);
+        if constexpr (!is_decimal<T>)
+            return std::make_shared<DataTypeNumber<TResult>>();
         else
-            return std::make_shared<ResultDataType>();
+        {
+            using DataType = DataTypeDecimal<TResult>;
+            return std::make_shared<DataType>(DataType::maxPrecision(), scale);
+        }
     }
 
     bool allocatesMemoryInArena() const override { return false; }
@@ -352,40 +384,38 @@ public:
             this->data(place).add(column.getData()[row_num]);
     }
 
-    /// Vectorized version when there is no GROUP BY keys.
     void addBatchSinglePlace(
-        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos) const override
+        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena *, ssize_t if_argument_pos) const override
     {
+        const auto & column = assert_cast<const ColVecType &>(*columns[0]);
         if (if_argument_pos >= 0)
         {
             const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-            for (size_t i = 0; i < batch_size; ++i)
-            {
-                if (flags[i])
-                    add(place, columns, i, arena);
-            }
+            this->data(place).addManyConditional(column.getData().data(), flags.data(), batch_size);
         }
         else
         {
-            const auto & column = assert_cast<const ColVecType &>(*columns[0]);
             this->data(place).addMany(column.getData().data(), batch_size);
         }
     }
 
     void addBatchSinglePlaceNotNull(
-        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, const UInt8 * null_map, Arena * arena, ssize_t if_argument_pos)
+        size_t batch_size, AggregateDataPtr place, const IColumn ** columns, const UInt8 * null_map, Arena *, ssize_t if_argument_pos)
         const override
     {
+        const auto & column = assert_cast<const ColVecType &>(*columns[0]);
         if (if_argument_pos >= 0)
         {
-            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            /// Merge the 2 sets of flags (null and if) into a single one. This allows us to use parallelizable sums when available
+            const auto * if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData().data();
+            auto final_flags = std::make_unique<UInt8[]>(batch_size);
             for (size_t i = 0; i < batch_size; ++i)
-                if (!null_map[i] && flags[i])
-                    add(place, columns, i, arena);
+                final_flags[i] = (!null_map[i]) & if_flags[i];
+
+            this->data(place).addManyConditional(column.getData().data(), final_flags.get(), batch_size);
         }
         else
         {
-            const auto & column = assert_cast<const ColVecType &>(*columns[0]);
             this->data(place).addManyNotNull(column.getData().data(), null_map, batch_size);
         }
     }
@@ -407,8 +437,7 @@ public:
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        auto & column = assert_cast<ColVecResult &>(to);
-        column.getData().push_back(this->data(place).get());
+        castColumnToResult(to).getData().push_back(this->data(place).get());
     }
 
 #if USE_EMBEDDED_COMPILER
@@ -487,6 +516,14 @@ public:
 
 private:
     UInt32 scale;
+
+    static constexpr auto & castColumnToResult(IColumn & to)
+    {
+        if constexpr (is_decimal<T>)
+            return assert_cast<ColumnDecimal<TResult> &>(to);
+        else
+            return assert_cast<ColumnVector<TResult> &>(to);
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionSumCount.h b/src/AggregateFunctions/AggregateFunctionSumCount.h
index 4a913113ce2..9892c230e1d 100644
--- a/src/AggregateFunctions/AggregateFunctionSumCount.h
+++ b/src/AggregateFunctions/AggregateFunctionSumCount.h
@@ -8,8 +8,6 @@
 namespace DB
 {
 template <typename T>
-using DecimalOrNumberDataType = std::conditional_t<IsDecimalNumber<T>, DataTypeDecimal<AvgFieldType<T>>, DataTypeNumber<AvgFieldType<T>>>;
-template <typename T>
 class AggregateFunctionSumCount final : public AggregateFunctionAvgBase<AvgFieldType<T>, UInt64, AggregateFunctionSumCount<T>>
 {
 public:
@@ -20,20 +18,13 @@ public:
 
     DataTypePtr getReturnType() const override
     {
-        DataTypes types;
-        if constexpr (IsDecimalNumber<T>)
-            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>(DecimalOrNumberDataType<T>::maxPrecision(), scale));
-        else
-            types.emplace_back(std::make_shared<DecimalOrNumberDataType<T>>());
-
-        types.emplace_back(std::make_shared<DataTypeUInt64>());
-
-        return std::make_shared<DataTypeTuple>(types);
+        auto second_elem = std::make_shared<DataTypeUInt64>();
+        return std::make_shared<DataTypeTuple>(DataTypes{getReturnTypeFirstElement(), std::move(second_elem)});
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const final
     {
-        assert_cast<DecimalOrVectorCol<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
+        assert_cast<ColumnVectorOrDecimal<AvgFieldType<T>> &>((assert_cast<ColumnTuple &>(to)).getColumn(0)).getData().push_back(
             this->data(place).numerator);
 
         assert_cast<ColumnUInt64 &>((assert_cast<ColumnTuple &>(to)).getColumn(1)).getData().push_back(
@@ -42,7 +33,7 @@ public:
 
     void NO_SANITIZE_UNDEFINED add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const final
     {
-        this->data(place).numerator += static_cast<const DecimalOrVectorCol<T> &>(*columns[0]).getData()[row_num];
+        this->data(place).numerator += static_cast<const ColumnVectorOrDecimal<T> &>(*columns[0]).getData()[row_num];
         ++this->data(place).denominator;
     }
 
@@ -59,6 +50,19 @@ public:
 
 private:
     UInt32 scale;
+
+    auto getReturnTypeFirstElement() const
+    {
+        using FieldType = AvgFieldType<T>;
+
+        if constexpr (!is_decimal<T>)
+            return std::make_shared<DataTypeNumber<FieldType>>();
+        else
+        {
+            using DataType = DataTypeDecimal<FieldType>;
+            return std::make_shared<DataType>(DataType::maxPrecision(), scale);
+        }
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionSumMap.h b/src/AggregateFunctions/AggregateFunctionSumMap.h
index 2c97ad387b8..4fad93facbc 100644
--- a/src/AggregateFunctions/AggregateFunctionSumMap.h
+++ b/src/AggregateFunctions/AggregateFunctionSumMap.h
@@ -190,7 +190,7 @@ public:
                     continue;
 
                 decltype(merged_maps.begin()) it;
-                if constexpr (IsDecimalNumber<T>)
+                if constexpr (is_decimal<T>)
                 {
                     // FIXME why is storing NearestFieldType not enough, and we
                     // have to check for decimals again here?
@@ -217,7 +217,7 @@ public:
                     new_values.resize(size);
                     new_values[col] = value;
 
-                    if constexpr (IsDecimalNumber<T>)
+                    if constexpr (is_decimal<T>)
                     {
                         UInt32 scale = static_cast<const ColumnDecimal<T> &>(key_column).getData().getScale();
                         merged_maps.emplace(DecimalField<T>(key, scale), std::move(new_values));
@@ -280,7 +280,7 @@ public:
             for (size_t col = 0; col < values_types.size(); ++col)
                 values_serializations[col]->deserializeBinary(values[col], buf);
 
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 merged_maps[key.get<DecimalField<T>>()] = values;
             else
                 merged_maps[key.get<T>()] = values;
@@ -405,9 +405,7 @@ private:
     using Self = AggregateFunctionSumMapFiltered<T, overflow, tuple_argument>;
     using Base = AggregateFunctionMapBase<T, Self, FieldVisitorSum, overflow, tuple_argument, true>;
 
-    /// ARCADIA_BUILD disallow unordered_set for big ints for some reason
-    static constexpr const bool allow_hash = !OverBigInt<T>;
-    using ContainerT = std::conditional_t<allow_hash, std::unordered_set<T>, std::set<T>>;
+    using ContainerT = std::unordered_set<T>;
 
     ContainerT keys_to_keep;
 
@@ -428,13 +426,10 @@ public:
                 "Aggregate function {} requires an Array as a parameter",
                 getName());
 
-        if constexpr (allow_hash)
-            keys_to_keep.reserve(keys_to_keep_.size());
+        keys_to_keep.reserve(keys_to_keep_.size());
 
         for (const Field & f : keys_to_keep_)
-        {
             keys_to_keep.emplace(f.safeGet<T>());
-        }
     }
 
     String getName() const override
@@ -469,8 +464,6 @@ public:
     explicit FieldVisitorMax(const Field & rhs_) : rhs(rhs_) {}
 
     bool operator() (Null &) const { throw Exception("Cannot compare Nulls", ErrorCodes::LOGICAL_ERROR); }
-    bool operator() (NegativeInfinity &) const { throw Exception("Cannot compare -Inf", ErrorCodes::LOGICAL_ERROR); }
-    bool operator() (PositiveInfinity &) const { throw Exception("Cannot compare +Inf", ErrorCodes::LOGICAL_ERROR); }
     bool operator() (AggregateFunctionStateData &) const { throw Exception("Cannot compare AggregateFunctionStates", ErrorCodes::LOGICAL_ERROR); }
 
     bool operator() (Array & x) const { return compareImpl<Array>(x); }
@@ -506,8 +499,6 @@ public:
     explicit FieldVisitorMin(const Field & rhs_) : rhs(rhs_) {}
 
     bool operator() (Null &) const { throw Exception("Cannot compare Nulls", ErrorCodes::LOGICAL_ERROR); }
-    bool operator() (NegativeInfinity &) const { throw Exception("Cannot compare -Inf", ErrorCodes::LOGICAL_ERROR); }
-    bool operator() (PositiveInfinity &) const { throw Exception("Cannot compare +Inf", ErrorCodes::LOGICAL_ERROR); }
     bool operator() (AggregateFunctionStateData &) const { throw Exception("Cannot sum AggregateFunctionStates", ErrorCodes::LOGICAL_ERROR); }
 
     bool operator() (Array & x) const { return compareImpl<Array>(x); }
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index 19c784553f2..3f8412cba5c 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -3,7 +3,7 @@
 #include <city.h>
 #include <type_traits>
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp b/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
index e137937343b..2b7e0d97372 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.cpp
@@ -102,7 +102,7 @@ namespace
             // This range is hardcoded below
             if (precision_param > 20 || precision_param < 12)
                 throw Exception(
-                    "Parameter for aggregate function " + name + " is out or range: [12, 20].", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+                    "Parameter for aggregate function " + name + " is out of range: [12, 20].", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
             precision = precision_param;
         }
 
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
index 7d74041d3d7..a5bcad2764a 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 #include <Common/CombinedCardinalityEstimator.h>
 #include <Common/SipHash.h>
diff --git a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
index a1599a0935b..72bfc230864 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
index 961a8ff9081..d75a12f7a0d 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.cpp
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
index 591596461f8..982cd1b4e32 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
@@ -137,8 +137,8 @@ class AggregateFunctionWindowFunnel final
 private:
     UInt64 window;
     UInt8 events_size;
-    /// When the 'strict' is set, it applies conditions only for the not repeating values.
-    bool strict;
+    /// When the 'strict_deduplication' is set, it applies conditions only for the not repeating values.
+    bool strict_deduplication;
 
     /// When the 'strict_order' is set, it doesn't allow interventions of other events.
     /// In the case of 'A->B->D->C', it stops finding 'A->B->C' at the 'D' and the max event level is 2.
@@ -150,7 +150,7 @@ private:
     /// Loop through the entire events_list, update the event timestamp value
     /// The level path must be 1---2---3---...---check_events_size, find the max event level that satisfied the path in the sliding window.
     /// If found, returns the max event level, else return 0.
-    /// The Algorithm complexity is O(n).
+    /// The algorithm works in O(n) time, but the overall function works in O(n * log(n)) due to sorting.
     UInt8 getEventLevel(Data & data) const
     {
         if (data.size() == 0)
@@ -163,10 +163,10 @@ private:
         /// events_timestamp stores the timestamp of the first and previous i-th level event happen within time window
         std::vector<std::optional<std::pair<UInt64, UInt64>>> events_timestamp(events_size);
         bool first_event = false;
-        for (const auto & pair : data.events_list)
+        for (size_t i = 0; i < data.events_list.size(); ++i)
         {
-            const T & timestamp = pair.first;
-            const auto & event_idx = pair.second - 1;
+            const T & timestamp = data.events_list[i].first;
+            const auto & event_idx = data.events_list[i].second - 1;
             if (strict_order && event_idx == -1)
             {
                 if (first_event)
@@ -179,9 +179,9 @@ private:
                 events_timestamp[0] = std::make_pair(timestamp, timestamp);
                 first_event = true;
             }
-            else if (strict && events_timestamp[event_idx].has_value())
+            else if (strict_deduplication && events_timestamp[event_idx].has_value())
             {
-                return event_idx + 1;
+                return data.events_list[i - 1].second;
             }
             else if (strict_order && first_event && !events_timestamp[event_idx - 1].has_value())
             {
@@ -226,18 +226,20 @@ public:
         events_size = arguments.size() - 1;
         window = params.at(0).safeGet<UInt64>();
 
-        strict = false;
+        strict_deduplication = false;
         strict_order = false;
         strict_increase = false;
         for (size_t i = 1; i < params.size(); ++i)
         {
             String option = params.at(i).safeGet<String>();
-            if (option == "strict")
-                strict = true;
+            if (option == "strict_deduplication")
+                strict_deduplication = true;
             else if (option == "strict_order")
                 strict_order = true;
             else if (option == "strict_increase")
                 strict_increase = true;
+            else if (option == "strict")
+                throw Exception{"strict is replaced with strict_deduplication in Aggregate function " + getName(), ErrorCodes::BAD_ARGUMENTS};
             else
                 throw Exception{"Aggregate function " + getName() + " doesn't support a parameter: " + option, ErrorCodes::BAD_ARGUMENTS};
         }
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index a06f1d12c0d..e86fc13ccc4 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -7,11 +7,9 @@
 #include <Core/Field.h>
 #include <Interpreters/Context_fwd.h>
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <cstddef>
 #include <memory>
@@ -190,6 +188,7 @@ public:
         size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos = -1) const = 0;
 
     /** The same for single place when need to aggregate only filtered data.
+      * Instead of using an if-column, the condition is combined inside the null_map
       */
     virtual void addBatchSinglePlaceNotNull(
         size_t batch_size,
diff --git a/src/AggregateFunctions/IAggregateFunctionCombinator.h b/src/AggregateFunctions/IAggregateFunctionCombinator.h
index f9953c83a95..37fcfe42c10 100644
--- a/src/AggregateFunctions/IAggregateFunctionCombinator.h
+++ b/src/AggregateFunctions/IAggregateFunctionCombinator.h
@@ -35,6 +35,10 @@ public:
 
     virtual bool isForInternalUsageOnly() const { return false; }
 
+    /** Does combinator supports nesting (of itself, i.e. ArrayArray or IfIf)
+     */
+    virtual bool supportsNesting() const { return false; }
+
     /** From the arguments for combined function (ex: UInt64, UInt8 for sumIf),
       *  get the arguments for nested function (ex: UInt64 for sum).
       * If arguments are not suitable for combined function, throw an exception.
diff --git a/src/AggregateFunctions/QuantileBFloat16Histogram.h b/src/AggregateFunctions/QuantileBFloat16Histogram.h
index 501cd8dcf2d..2a71522c1fc 100644
--- a/src/AggregateFunctions/QuantileBFloat16Histogram.h
+++ b/src/AggregateFunctions/QuantileBFloat16Histogram.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/bit_cast.h>
+#include <base/types.h>
+#include <base/bit_cast.h>
 #include <Common/HashTable/HashMap.h>
 
 #include <IO/ReadBuffer.h>
diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
index 1536f0fac6e..4dcac2472b9 100644
--- a/src/AggregateFunctions/QuantileExact.h
+++ b/src/AggregateFunctions/QuantileExact.h
@@ -5,8 +5,8 @@
 #include <IO/WriteBuffer.h>
 #include <Common/NaNUtils.h>
 #include <Common/PODArray.h>
-#include <common/sort.h>
-#include <common/types.h>
+#include <base/sort.h>
+#include <base/types.h>
 
 
 namespace DB
@@ -237,7 +237,7 @@ struct QuantileExactInclusive : public QuantileExact<Value>
                     nth_element(array.begin() + prev_n, array.begin() + n - 1, array.end());
                     auto nth_elem = std::min_element(array.begin() + n, array.end());
 
-                    result[indices[i]] = static_cast<Float64>(array[n - 1]) + (h - n) * static_cast<Float64>(*nth_elem - array[n - 1]);
+                    result[indices[i]] = static_cast<Float64>(array[n - 1]) + (h - n) * (static_cast<Float64>(*nth_elem) - array[n - 1]);
                     prev_n = n - 1;
                 }
             }
diff --git a/src/AggregateFunctions/QuantileExactWeighted.h b/src/AggregateFunctions/QuantileExactWeighted.h
index 8170c06d0cd..97ad15f7e75 100644
--- a/src/AggregateFunctions/QuantileExactWeighted.h
+++ b/src/AggregateFunctions/QuantileExactWeighted.h
@@ -30,7 +30,7 @@ struct QuantileExactWeighted
     };
 
     using Weight = UInt64;
-    using UnderlyingType = typename NativeType<Value>::Type;
+    using UnderlyingType = NativeType<Value>;
     using Hasher = std::conditional_t<std::is_same_v<Value, Decimal128>, Int128Hash, HashCRC32<UnderlyingType>>;
 
     /// When creating, the hash table must be small.
diff --git a/src/AggregateFunctions/QuantileTDigest.h b/src/AggregateFunctions/QuantileTDigest.h
index b12673bc507..adb02171f72 100644
--- a/src/AggregateFunctions/QuantileTDigest.h
+++ b/src/AggregateFunctions/QuantileTDigest.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <cmath>
+#include <Common/Exception.h>
 #include <Common/RadixSort.h>
 #include <Common/PODArray.h>
+#include <Core/AccurateComparison.h>
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBuffer.h>
 #include <IO/VarInt.h>
@@ -14,8 +16,9 @@ struct Settings;
 
 namespace ErrorCodes
 {
-    extern const int TOO_LARGE_ARRAY_SIZE;
     extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
+    extern const int DECIMAL_OVERFLOW;
+    extern const int TOO_LARGE_ARRAY_SIZE;
 }
 
 
@@ -314,7 +317,7 @@ public:
         compress();
 
         if (centroids.size() == 1)
-            return centroids.front().mean;
+            return checkOverflow<ResultType>(centroids.front().mean);
 
         Float64 x = level * count;
         Float64 prev_x = 0;
@@ -333,11 +336,11 @@ public:
                 Float64 right = current_x - 0.5 * (c.count == 1);
 
                 if (x <= left)
-                    return prev_mean;
+                    return checkOverflow<ResultType>(prev_mean);
                 else if (x >= right)
-                    return c.mean;
+                    return checkOverflow<ResultType>(c.mean);
                 else
-                    return interpolate(x, left, prev_mean, right, c.mean);
+                    return checkOverflow<ResultType>(interpolate(x, left, prev_mean, right, c.mean));
             }
 
             sum += c.count;
@@ -346,7 +349,7 @@ public:
             prev_x = current_x;
         }
 
-        return centroids.back().mean;
+        return checkOverflow<ResultType>(centroids.back().mean);
     }
 
     /** Get multiple quantiles (`size` parts).
@@ -438,6 +441,16 @@ public:
     {
         getManyImpl(levels, indices, size, result);
     }
+
+private:
+    template <typename ResultType>
+    static ResultType checkOverflow(Value val)
+    {
+        ResultType result;
+        if (accurate::convertNumeric(val, result))
+            return result;
+        throw DB::Exception("Numeric overflow", ErrorCodes::DECIMAL_OVERFLOW);
+    }
 };
 
 }
diff --git a/src/AggregateFunctions/QuantileTiming.h b/src/AggregateFunctions/QuantileTiming.h
index 7a88e320b89..36f1da3ee60 100644
--- a/src/AggregateFunctions/QuantileTiming.h
+++ b/src/AggregateFunctions/QuantileTiming.h
@@ -6,7 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/PODArray.h>
-#include <common/sort.h>
+#include <base/sort.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index 6c131928cb7..d113d659520 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -3,7 +3,7 @@
 #include <limits>
 #include <algorithm>
 #include <climits>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -121,7 +121,7 @@ public:
     {
         if (samples.empty())
         {
-            if (DB::IsDecimalNumber<T>)
+            if (DB::is_decimal<T>)
                 return 0;
             return onEmpty<double>();
         }
@@ -134,7 +134,7 @@ public:
         size_t right_index = left_index + 1;
         if (right_index == samples.size())
         {
-            if constexpr (DB::IsDecimalNumber<T>)
+            if constexpr (DB::is_decimal<T>)
                 return static_cast<double>(samples[left_index].value);
             else
                 return static_cast<double>(samples[left_index]);
@@ -143,7 +143,7 @@ public:
         double left_coef = right_index - index;
         double right_coef = index - left_index;
 
-        if constexpr (DB::IsDecimalNumber<T>)
+        if constexpr (DB::is_decimal<T>)
             return static_cast<double>(samples[left_index].value) * left_coef + static_cast<double>(samples[right_index].value) * right_coef;
         else
             return static_cast<double>(samples[left_index]) * left_coef + static_cast<double>(samples[right_index]) * right_coef;
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index 2687e0b4a67..ca716b24ce2 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <climits>
 #include <AggregateFunctions/ReservoirSampler.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/HashTable/Hash.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/AggregateFunctions/ThetaSketchData.h b/src/AggregateFunctions/ThetaSketchData.h
index b2e32db6c75..bc583250002 100644
--- a/src/AggregateFunctions/ThetaSketchData.h
+++ b/src/AggregateFunctions/ThetaSketchData.h
@@ -1,15 +1,13 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_DATASKETCHES
 
 #include <boost/noncopyable.hpp>
 #include <memory>
-#include <theta_sketch.hpp> // Y_IGNORE
-#include <theta_union.hpp> // Y_IGNORE
+#include <theta_sketch.hpp>
+#include <theta_union.hpp>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/UniqVariadicHash.h b/src/AggregateFunctions/UniqVariadicHash.h
index b3607a63285..94f54a7a059 100644
--- a/src/AggregateFunctions/UniqVariadicHash.h
+++ b/src/AggregateFunctions/UniqVariadicHash.h
@@ -5,6 +5,7 @@
 #include <Common/SipHash.h>
 #include <Common/assert_cast.h>
 #include <Columns/ColumnTuple.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/src/AggregateFunctions/UniquesHashSet.h b/src/AggregateFunctions/UniquesHashSet.h
index 13c59cd5225..b51bb6b988d 100644
--- a/src/AggregateFunctions/UniquesHashSet.h
+++ b/src/AggregateFunctions/UniquesHashSet.h
@@ -2,7 +2,7 @@
 
 #include <math.h>
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 35efb41cf21..79a418ac69f 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -48,7 +48,11 @@ void registerAggregateFunctionRankCorrelation(AggregateFunctionFactory &);
 void registerAggregateFunctionMannWhitney(AggregateFunctionFactory &);
 void registerAggregateFunctionWelchTTest(AggregateFunctionFactory &);
 void registerAggregateFunctionStudentTTest(AggregateFunctionFactory &);
+void registerAggregateFunctionSingleValueOrNull(AggregateFunctionFactory &);
 void registerAggregateFunctionSequenceNextNode(AggregateFunctionFactory &);
+void registerAggregateFunctionExponentialMovingAverage(AggregateFunctionFactory &);
+void registerAggregateFunctionSparkbar(AggregateFunctionFactory &);
+void registerAggregateFunctionIntervalLengthSum(AggregateFunctionFactory &);
 
 class AggregateFunctionCombinatorFactory;
 void registerAggregateFunctionCombinatorIf(AggregateFunctionCombinatorFactory &);
@@ -65,8 +69,6 @@ void registerAggregateFunctionCombinatorMap(AggregateFunctionCombinatorFactory &
 
 void registerWindowFunctions(AggregateFunctionFactory & factory);
 
-void registerAggregateFunctionIntervalLengthSum(AggregateFunctionFactory &);
-
 void registerAggregateFunctions()
 {
     {
@@ -97,9 +99,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionUniqUpTo(factory);
         registerAggregateFunctionTopK(factory);
         registerAggregateFunctionsBitwise(factory);
-#if !defined(ARCADIA_BUILD)
         registerAggregateFunctionsBitmap(factory);
-#endif
         registerAggregateFunctionsMaxIntersections(factory);
         registerAggregateFunctionHistogram(factory);
         registerAggregateFunctionRetention(factory);
@@ -114,10 +114,12 @@ void registerAggregateFunctions()
         registerAggregateFunctionSequenceNextNode(factory);
         registerAggregateFunctionWelchTTest(factory);
         registerAggregateFunctionStudentTTest(factory);
+        registerAggregateFunctionSingleValueOrNull(factory);
+        registerAggregateFunctionIntervalLengthSum(factory);
+        registerAggregateFunctionExponentialMovingAverage(factory);
+        registerAggregateFunctionSparkbar(factory);
 
         registerWindowFunctions(factory);
-
-        registerAggregateFunctionIntervalLengthSum(factory);
     }
 
     {
diff --git a/src/AggregateFunctions/ya.make b/src/AggregateFunctions/ya.make
deleted file mode 100644
index d41c0444467..00000000000
--- a/src/AggregateFunctions/ya.make
+++ /dev/null
@@ -1,72 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    AggregateFunctionAggThrow.cpp
-    AggregateFunctionAny.cpp
-    AggregateFunctionArray.cpp
-    AggregateFunctionAvg.cpp
-    AggregateFunctionAvgWeighted.cpp
-    AggregateFunctionBitwise.cpp
-    AggregateFunctionBoundingRatio.cpp
-    AggregateFunctionCategoricalInformationValue.cpp
-    AggregateFunctionCombinatorFactory.cpp
-    AggregateFunctionCount.cpp
-    AggregateFunctionDeltaSum.cpp
-    AggregateFunctionDeltaSumTimestamp.cpp
-    AggregateFunctionDistinct.cpp
-    AggregateFunctionEntropy.cpp
-    AggregateFunctionFactory.cpp
-    AggregateFunctionForEach.cpp
-    AggregateFunctionGroupArray.cpp
-    AggregateFunctionGroupArrayInsertAt.cpp
-    AggregateFunctionGroupArrayMoving.cpp
-    AggregateFunctionGroupUniqArray.cpp
-    AggregateFunctionHistogram.cpp
-    AggregateFunctionIf.cpp
-    AggregateFunctionIntervalLengthSum.cpp
-    AggregateFunctionMLMethod.cpp
-    AggregateFunctionMannWhitney.cpp
-    AggregateFunctionMax.cpp
-    AggregateFunctionMaxIntersections.cpp
-    AggregateFunctionMerge.cpp
-    AggregateFunctionMin.cpp
-    AggregateFunctionNull.cpp
-    AggregateFunctionOrFill.cpp
-    AggregateFunctionQuantile.cpp
-    AggregateFunctionRankCorrelation.cpp
-    AggregateFunctionResample.cpp
-    AggregateFunctionRetention.cpp
-    AggregateFunctionSequenceMatch.cpp
-    AggregateFunctionSequenceNextNode.cpp
-    AggregateFunctionSimpleLinearRegression.cpp
-    AggregateFunctionSimpleState.cpp
-    AggregateFunctionState.cpp
-    AggregateFunctionStatistics.cpp
-    AggregateFunctionStatisticsSimple.cpp
-    AggregateFunctionStudentTTest.cpp
-    AggregateFunctionSum.cpp
-    AggregateFunctionSumCount.cpp
-    AggregateFunctionSumMap.cpp
-    AggregateFunctionTopK.cpp
-    AggregateFunctionUniq.cpp
-    AggregateFunctionUniqCombined.cpp
-    AggregateFunctionUniqUpTo.cpp
-    AggregateFunctionWelchTTest.cpp
-    AggregateFunctionWindowFunnel.cpp
-    IAggregateFunction.cpp
-    UniqCombinedBiasData.cpp
-    UniqVariadicHash.cpp
-    parseAggregateFunctionParameters.cpp
-    registerAggregateFunctions.cpp
-
-)
-
-END()
diff --git a/src/AggregateFunctions/ya.make.in b/src/AggregateFunctions/ya.make.in
deleted file mode 100644
index bc7823509af..00000000000
--- a/src/AggregateFunctions/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -F GroupBitmap | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Backups/BackupEntryConcat.cpp b/src/Backups/BackupEntryConcat.cpp
new file mode 100644
index 00000000000..1075b8be2ec
--- /dev/null
+++ b/src/Backups/BackupEntryConcat.cpp
@@ -0,0 +1,28 @@
+#include <Backups/BackupEntryConcat.h>
+#include <IO/ConcatReadBuffer.h>
+
+
+namespace DB
+{
+BackupEntryConcat::BackupEntryConcat(
+    BackupEntryPtr first_source_,
+    BackupEntryPtr second_source_,
+    const std::optional<UInt128> & checksum_)
+    : first_source(std::move(first_source_))
+    , second_source(std::move(second_source_))
+    , checksum(checksum_)
+{
+}
+
+UInt64 BackupEntryConcat::getSize() const
+{
+    if (!size)
+        size = first_source->getSize() + second_source->getSize();
+    return *size;
+}
+
+std::unique_ptr<ReadBuffer> BackupEntryConcat::getReadBuffer() const
+{
+    return std::make_unique<ConcatReadBuffer>(*first_source->getReadBuffer(), *second_source->getReadBuffer());
+}
+}
diff --git a/src/Backups/BackupEntryConcat.h b/src/Backups/BackupEntryConcat.h
new file mode 100644
index 00000000000..cb38fb9b163
--- /dev/null
+++ b/src/Backups/BackupEntryConcat.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <Backups/IBackupEntry.h>
+
+
+namespace DB
+{
+
+/// Concatenates data of two backup entries.
+class BackupEntryConcat : public IBackupEntry
+{
+public:
+    /// The constructor is allowed to not set `checksum_`, in that case it will be calculated from the data.
+    BackupEntryConcat(
+        BackupEntryPtr first_source_,
+        BackupEntryPtr second_source_,
+        const std::optional<UInt128> & checksum_ = {});
+
+    UInt64 getSize() const override;
+    std::optional<UInt128> getChecksum() const override { return checksum; }
+    std::unique_ptr<ReadBuffer> getReadBuffer() const override;
+
+private:
+    BackupEntryPtr first_source;
+    BackupEntryPtr second_source;
+    mutable std::optional<UInt64> size;
+    std::optional<UInt128> checksum;
+};
+
+}
diff --git a/src/Backups/BackupEntryFromAppendOnlyFile.cpp b/src/Backups/BackupEntryFromAppendOnlyFile.cpp
new file mode 100644
index 00000000000..32d5713952f
--- /dev/null
+++ b/src/Backups/BackupEntryFromAppendOnlyFile.cpp
@@ -0,0 +1,35 @@
+#include <Backups/BackupEntryFromAppendOnlyFile.h>
+#include <IO/LimitReadBuffer.h>
+
+
+namespace DB
+{
+
+BackupEntryFromAppendOnlyFile::BackupEntryFromAppendOnlyFile(
+    const String & file_path_,
+    const std::optional<UInt64> & file_size_,
+    const std::optional<UInt128> & checksum_,
+    const std::shared_ptr<Poco::TemporaryFile> & temporary_file_)
+    : BackupEntryFromImmutableFile(file_path_, file_size_, checksum_, temporary_file_)
+    , limit(BackupEntryFromImmutableFile::getSize())
+{
+}
+
+BackupEntryFromAppendOnlyFile::BackupEntryFromAppendOnlyFile(
+    const DiskPtr & disk_,
+    const String & file_path_,
+    const std::optional<UInt64> & file_size_,
+    const std::optional<UInt128> & checksum_,
+    const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_)
+    : BackupEntryFromImmutableFile(disk_, file_path_, file_size_, checksum_, temporary_file_)
+    , limit(BackupEntryFromImmutableFile::getSize())
+{
+}
+
+std::unique_ptr<ReadBuffer> BackupEntryFromAppendOnlyFile::getReadBuffer() const
+{
+    auto buf = BackupEntryFromImmutableFile::getReadBuffer();
+    return std::make_unique<LimitReadBuffer>(std::move(buf), limit, true);
+}
+
+}
diff --git a/src/Backups/BackupEntryFromAppendOnlyFile.h b/src/Backups/BackupEntryFromAppendOnlyFile.h
new file mode 100644
index 00000000000..2bc0c6a68a0
--- /dev/null
+++ b/src/Backups/BackupEntryFromAppendOnlyFile.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <Backups/BackupEntryFromImmutableFile.h>
+
+
+namespace DB
+{
+
+/// Represents a file prepared to be included in a backup, assuming that until this backup entry is destroyed
+/// the file can be appended with new data, but the bytes which are already in the file won't be changed.
+class BackupEntryFromAppendOnlyFile : public BackupEntryFromImmutableFile
+{
+public:
+    /// The constructor is allowed to not set `file_size_` or `checksum_`, in that case it will be calculated from the data.
+    BackupEntryFromAppendOnlyFile(
+        const String & file_path_,
+        const std::optional<UInt64> & file_size_ = {},
+        const std::optional<UInt128> & checksum_ = {},
+        const std::shared_ptr<Poco::TemporaryFile> & temporary_file_ = {});
+
+    BackupEntryFromAppendOnlyFile(
+        const DiskPtr & disk_,
+        const String & file_path_,
+        const std::optional<UInt64> & file_size_ = {},
+        const std::optional<UInt128> & checksum_ = {},
+        const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_ = {});
+
+    UInt64 getSize() const override { return limit; }
+    std::unique_ptr<ReadBuffer> getReadBuffer() const override;
+
+private:
+    const UInt64 limit;
+};
+
+}
diff --git a/src/Backups/BackupEntryFromImmutableFile.cpp b/src/Backups/BackupEntryFromImmutableFile.cpp
new file mode 100644
index 00000000000..4d1574056ef
--- /dev/null
+++ b/src/Backups/BackupEntryFromImmutableFile.cpp
@@ -0,0 +1,47 @@
+#include <Backups/BackupEntryFromImmutableFile.h>
+#include <Disks/IDisk.h>
+#include <IO/createReadBufferFromFileBase.h>
+#include <Poco/File.h>
+
+
+namespace DB
+{
+
+BackupEntryFromImmutableFile::BackupEntryFromImmutableFile(
+    const String & file_path_,
+    const std::optional<UInt64> & file_size_,
+    const std::optional<UInt128> & checksum_,
+    const std::shared_ptr<Poco::TemporaryFile> & temporary_file_)
+    : file_path(file_path_), file_size(file_size_), checksum(checksum_), temporary_file(temporary_file_)
+{
+}
+
+BackupEntryFromImmutableFile::BackupEntryFromImmutableFile(
+    const DiskPtr & disk_,
+    const String & file_path_,
+    const std::optional<UInt64> & file_size_,
+    const std::optional<UInt128> & checksum_,
+    const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_)
+    : disk(disk_), file_path(file_path_), file_size(file_size_), checksum(checksum_), temporary_file_on_disk(temporary_file_)
+{
+}
+
+BackupEntryFromImmutableFile::~BackupEntryFromImmutableFile() = default;
+
+UInt64 BackupEntryFromImmutableFile::getSize() const
+{
+    std::lock_guard lock{get_file_size_mutex};
+    if (!file_size)
+        file_size = disk ? disk->getFileSize(file_path) : Poco::File(file_path).getSize();
+    return *file_size;
+}
+
+std::unique_ptr<ReadBuffer> BackupEntryFromImmutableFile::getReadBuffer() const
+{
+    if (disk)
+        return disk->readFile(file_path);
+    else
+        return createReadBufferFromFileBase(file_path, /* settings= */ {});
+}
+
+}
diff --git a/src/Backups/BackupEntryFromImmutableFile.h b/src/Backups/BackupEntryFromImmutableFile.h
new file mode 100644
index 00000000000..3be261c49ce
--- /dev/null
+++ b/src/Backups/BackupEntryFromImmutableFile.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Backups/IBackupEntry.h>
+#include <mutex>
+
+namespace Poco { class TemporaryFile; }
+
+namespace DB
+{
+class TemporaryFileOnDisk;
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
+/// Represents a file prepared to be included in a backup, assuming that until this backup entry is destroyed the file won't be changed.
+class BackupEntryFromImmutableFile : public IBackupEntry
+{
+public:
+    /// The constructor is allowed to not set `file_size_` or `checksum_`, in that case it will be calculated from the data.
+    BackupEntryFromImmutableFile(
+        const String & file_path_,
+        const std::optional<UInt64> & file_size_ = {},
+        const std::optional<UInt128> & checksum_ = {},
+        const std::shared_ptr<Poco::TemporaryFile> & temporary_file_ = {});
+
+    BackupEntryFromImmutableFile(
+        const DiskPtr & disk_,
+        const String & file_path_,
+        const std::optional<UInt64> & file_size_ = {},
+        const std::optional<UInt128> & checksum_ = {},
+        const std::shared_ptr<TemporaryFileOnDisk> & temporary_file_ = {});
+
+    ~BackupEntryFromImmutableFile() override;
+
+    UInt64 getSize() const override;
+    std::optional<UInt128> getChecksum() const override { return checksum; }
+    std::unique_ptr<ReadBuffer> getReadBuffer() const override;
+
+    String getFilePath() const { return file_path; }
+    DiskPtr getDisk() const { return disk; }
+
+private:
+    const DiskPtr disk;
+    const String file_path;
+    mutable std::optional<UInt64> file_size;
+    mutable std::mutex get_file_size_mutex;
+    const std::optional<UInt128> checksum;
+    const std::shared_ptr<Poco::TemporaryFile> temporary_file;
+    const std::shared_ptr<TemporaryFileOnDisk> temporary_file_on_disk;
+};
+
+}
diff --git a/src/Backups/BackupEntryFromMemory.cpp b/src/Backups/BackupEntryFromMemory.cpp
new file mode 100644
index 00000000000..96493e7962e
--- /dev/null
+++ b/src/Backups/BackupEntryFromMemory.cpp
@@ -0,0 +1,23 @@
+#include <Backups/BackupEntryFromMemory.h>
+#include <IO/ReadBufferFromString.h>
+
+
+namespace DB
+{
+
+BackupEntryFromMemory::BackupEntryFromMemory(const void * data_, size_t size_, const std::optional<UInt128> & checksum_)
+    : BackupEntryFromMemory(String{reinterpret_cast<const char *>(data_), size_}, checksum_)
+{
+}
+
+BackupEntryFromMemory::BackupEntryFromMemory(String data_, const std::optional<UInt128> & checksum_)
+    : data(std::move(data_)), checksum(checksum_)
+{
+}
+
+std::unique_ptr<ReadBuffer> BackupEntryFromMemory::getReadBuffer() const
+{
+    return std::make_unique<ReadBufferFromString>(data);
+}
+
+}
diff --git a/src/Backups/BackupEntryFromMemory.h b/src/Backups/BackupEntryFromMemory.h
new file mode 100644
index 00000000000..3756c2ebfea
--- /dev/null
+++ b/src/Backups/BackupEntryFromMemory.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <Backups/IBackupEntry.h>
+#include <IO/ReadBufferFromString.h>
+
+
+namespace DB
+{
+
+/// Represents small preloaded data to be included in a backup.
+class BackupEntryFromMemory : public IBackupEntry
+{
+public:
+    /// The constructor is allowed to not set `checksum_`, in that case it will be calculated from the data.
+    BackupEntryFromMemory(const void * data_, size_t size_, const std::optional<UInt128> & checksum_ = {});
+    BackupEntryFromMemory(String data_, const std::optional<UInt128> & checksum_ = {});
+
+    UInt64 getSize() const override { return data.size(); }
+    std::optional<UInt128> getChecksum() const override { return checksum; }
+    std::unique_ptr<ReadBuffer> getReadBuffer() const override;
+
+private:
+    const String data;
+    const std::optional<UInt128> checksum;
+};
+
+}
diff --git a/src/Backups/BackupEntryFromSmallFile.cpp b/src/Backups/BackupEntryFromSmallFile.cpp
new file mode 100644
index 00000000000..c91afde7c2b
--- /dev/null
+++ b/src/Backups/BackupEntryFromSmallFile.cpp
@@ -0,0 +1,39 @@
+#include <Backups/BackupEntryFromSmallFile.h>
+#include <Disks/IDisk.h>
+#include <IO/createReadBufferFromFileBase.h>
+#include <IO/ReadHelpers.h>
+
+
+namespace DB
+{
+namespace
+{
+    String readFile(const String & file_path)
+    {
+        auto buf = createReadBufferFromFileBase(file_path, /* settings= */ {});
+        String s;
+        readStringUntilEOF(s, *buf);
+        return s;
+    }
+
+    String readFile(const DiskPtr & disk, const String & file_path)
+    {
+        auto buf = disk->readFile(file_path);
+        String s;
+        readStringUntilEOF(s, *buf);
+        return s;
+    }
+}
+
+
+BackupEntryFromSmallFile::BackupEntryFromSmallFile(const String & file_path_, const std::optional<UInt128> & checksum_)
+    : BackupEntryFromMemory(readFile(file_path_), checksum_), file_path(file_path_)
+{
+}
+
+BackupEntryFromSmallFile::BackupEntryFromSmallFile(
+    const DiskPtr & disk_, const String & file_path_, const std::optional<UInt128> & checksum_)
+    : BackupEntryFromMemory(readFile(disk_, file_path_), checksum_), disk(disk_), file_path(file_path_)
+{
+}
+}
diff --git a/src/Backups/BackupEntryFromSmallFile.h b/src/Backups/BackupEntryFromSmallFile.h
new file mode 100644
index 00000000000..ab2ba2ea042
--- /dev/null
+++ b/src/Backups/BackupEntryFromSmallFile.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <Backups/BackupEntryFromMemory.h>
+
+
+namespace DB
+{
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
+/// Represents a file prepared to be included in a backup,
+/// assuming that the file is small and can be easily loaded into memory.
+class BackupEntryFromSmallFile : public BackupEntryFromMemory
+{
+public:
+    /// The constructor is allowed to not set `checksum_`, in that case it will be calculated from the data.
+    BackupEntryFromSmallFile(
+        const String & file_path_,
+        const std::optional<UInt128> & checksum_ = {});
+
+    BackupEntryFromSmallFile(
+        const DiskPtr & disk_,
+        const String & file_path_,
+        const std::optional<UInt128> & checksum_ = {});
+
+    String getFilePath() const { return file_path; }
+    DiskPtr getDisk() const { return disk; }
+
+private:
+    const DiskPtr disk;
+    const String file_path;
+};
+
+}
diff --git a/src/Backups/BackupFactory.cpp b/src/Backups/BackupFactory.cpp
new file mode 100644
index 00000000000..41377300375
--- /dev/null
+++ b/src/Backups/BackupFactory.cpp
@@ -0,0 +1,65 @@
+#include <Backups/BackupFactory.h>
+#include <Backups/BackupInDirectory.h>
+#include <Interpreters/Context.h>
+#include <Disks/IVolume.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int BACKUP_NOT_FOUND;
+    extern const int BACKUP_ALREADY_EXISTS;
+    extern const int NOT_ENOUGH_SPACE;
+    extern const int LOGICAL_ERROR;
+}
+
+
+BackupFactory & BackupFactory::instance()
+{
+    static BackupFactory the_instance;
+    return the_instance;
+}
+
+void BackupFactory::setBackupsVolume(VolumePtr backups_volume_)
+{
+    backups_volume = backups_volume_;
+}
+
+BackupMutablePtr BackupFactory::createBackup(const String & backup_name, UInt64 estimated_backup_size, const BackupPtr & base_backup) const
+{
+    if (!backups_volume)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No backups volume");
+
+    for (const auto & disk : backups_volume->getDisks())
+    {
+        if (disk->exists(backup_name))
+            throw Exception(ErrorCodes::BACKUP_ALREADY_EXISTS, "Backup {} already exists", quoteString(backup_name));
+    }
+
+    auto reservation = backups_volume->reserve(estimated_backup_size);
+    if (!reservation)
+        throw Exception(
+            ErrorCodes::NOT_ENOUGH_SPACE,
+            "Couldn't reserve {} bytes of free space for new backup {}",
+            estimated_backup_size,
+            quoteString(backup_name));
+
+    return std::make_shared<BackupInDirectory>(IBackup::OpenMode::WRITE, reservation->getDisk(), backup_name, base_backup);
+}
+
+BackupPtr BackupFactory::openBackup(const String & backup_name, const BackupPtr & base_backup) const
+{
+    if (!backups_volume)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No backups volume");
+
+    for (const auto & disk : backups_volume->getDisks())
+    {
+        if (disk->exists(backup_name))
+            return std::make_shared<BackupInDirectory>(IBackup::OpenMode::READ, disk, backup_name, base_backup);
+    }
+
+    throw Exception(ErrorCodes::BACKUP_NOT_FOUND, "Backup {} not found", quoteString(backup_name));
+}
+
+}
diff --git a/src/Backups/BackupFactory.h b/src/Backups/BackupFactory.h
new file mode 100644
index 00000000000..8360d66728f
--- /dev/null
+++ b/src/Backups/BackupFactory.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <boost/noncopyable.hpp>
+#include <memory>
+
+
+namespace DB
+{
+class IBackup;
+using BackupPtr = std::shared_ptr<const IBackup>;
+using BackupMutablePtr = std::shared_ptr<IBackup>;
+class Context;
+using ContextMutablePtr = std::shared_ptr<Context>;
+class IVolume;
+using VolumePtr = std::shared_ptr<IVolume>;
+
+
+/// Factory for implementations of the IBackup interface.
+class BackupFactory : boost::noncopyable
+{
+public:
+    static BackupFactory & instance();
+
+    /// Must be called to initialize the backup factory.
+    void setBackupsVolume(VolumePtr backups_volume_);
+
+    /// Creates a new backup and open it for writing.
+    BackupMutablePtr createBackup(const String & backup_name, UInt64 estimated_backup_size, const BackupPtr & base_backup = {}) const;
+
+    /// Opens an existing backup for reading.
+    BackupPtr openBackup(const String & backup_name, const BackupPtr & base_backup = {}) const;
+
+private:
+    VolumePtr backups_volume;
+};
+
+}
diff --git a/src/Backups/BackupInDirectory.cpp b/src/Backups/BackupInDirectory.cpp
new file mode 100644
index 00000000000..2a59e9e06dc
--- /dev/null
+++ b/src/Backups/BackupInDirectory.cpp
@@ -0,0 +1,454 @@
+#include <Backups/BackupInDirectory.h>
+#include <Backups/BackupFactory.h>
+#include <Backups/BackupEntryConcat.h>
+#include <Backups/BackupEntryFromImmutableFile.h>
+#include <Backups/BackupEntryFromMemory.h>
+#include <Backups/IBackupEntry.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/typeid_cast.h>
+#include <Common/quoteString.h>
+#include <Disks/DiskSelector.h>
+#include <Disks/IDisk.h>
+#include <IO/HashingReadBuffer.h>
+#include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadHelpers.h>
+#include <IO/SeekableReadBuffer.h>
+#include <IO/WriteBufferFromFileBase.h>
+#include <IO/WriteHelpers.h>
+#include <IO/copyData.h>
+#include <boost/range/adaptor/map.hpp>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int BACKUP_NOT_FOUND;
+    extern const int BACKUP_ALREADY_EXISTS;
+    extern const int BACKUP_VERSION_NOT_SUPPORTED;
+    extern const int BACKUP_DAMAGED;
+    extern const int NO_BASE_BACKUP;
+    extern const int WRONG_BASE_BACKUP;
+    extern const int BACKUP_ENTRY_ALREADY_EXISTS;
+    extern const int BACKUP_ENTRY_NOT_FOUND;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    const UInt64 BACKUP_VERSION = 1;
+}
+
+BackupInDirectory::BackupInDirectory(OpenMode open_mode_, const DiskPtr & disk_, const String & path_, const std::shared_ptr<const IBackup> & base_backup_)
+    : open_mode(open_mode_), disk(disk_), path(path_), path_with_sep(path_), base_backup(base_backup_)
+{
+    if (!path_with_sep.ends_with('/'))
+        path_with_sep += '/';
+    trimRight(path, '/');
+    open();
+}
+
+BackupInDirectory::~BackupInDirectory()
+{
+    close();
+}
+
+void BackupInDirectory::open()
+{
+    if (open_mode == OpenMode::WRITE)
+    {
+        if (disk->exists(path))
+            throw Exception(ErrorCodes::BACKUP_ALREADY_EXISTS, "Backup {} already exists", quoteString(path));
+        disk->createDirectories(path);
+        directory_was_created = true;
+        writePathToBaseBackup();
+    }
+
+    if (open_mode == OpenMode::READ)
+    {
+        if (!disk->isDirectory(path))
+            throw Exception(ErrorCodes::BACKUP_NOT_FOUND, "Backup {} not found", quoteString(path));
+        readContents();
+        readPathToBaseBackup();
+    }
+}
+
+void BackupInDirectory::close()
+{
+    if (open_mode == OpenMode::WRITE)
+    {
+        if (!finalized && directory_was_created)
+        {
+            /// Creating of the backup wasn't finished correctly,
+            /// so the backup cannot be used and it's better to remove its files.
+            disk->removeRecursive(path);
+        }
+    }
+}
+
+void BackupInDirectory::writePathToBaseBackup()
+{
+    String file_path = path_with_sep + ".base_backup";
+    if (!base_backup)
+    {
+        disk->removeFileIfExists(file_path);
+        return;
+    }
+    auto out = disk->writeFile(file_path);
+    writeString(base_backup->getPath(), *out);
+}
+
+void BackupInDirectory::readPathToBaseBackup()
+{
+    if (base_backup)
+        return;
+    String file_path = path_with_sep + ".base_backup";
+    if (!disk->exists(file_path))
+        return;
+    auto in = disk->readFile(file_path);
+    String base_backup_path;
+    readStringUntilEOF(base_backup_path, *in);
+    if (base_backup_path.empty())
+        return;
+    base_backup = BackupFactory::instance().openBackup(base_backup_path);
+}
+
+void BackupInDirectory::writeContents()
+{
+    auto out = disk->writeFile(path_with_sep + ".contents");
+    writeVarUInt(BACKUP_VERSION, *out);
+
+    writeVarUInt(infos.size(), *out);
+    for (const auto & [path_in_backup, info] : infos)
+    {
+        writeBinary(path_in_backup, *out);
+        writeVarUInt(info.size, *out);
+        if (info.size)
+        {
+            writeBinary(info.checksum, *out);
+            writeVarUInt(info.base_size, *out);
+            if (info.base_size && (info.base_size != info.size))
+                writeBinary(info.base_checksum, *out);
+        }
+    }
+}
+
+void BackupInDirectory::readContents()
+{
+    auto in = disk->readFile(path_with_sep + ".contents");
+    UInt64 version;
+    readVarUInt(version, *in);
+    if (version != BACKUP_VERSION)
+        throw Exception(ErrorCodes::BACKUP_VERSION_NOT_SUPPORTED, "Backup {}: Version {} is not supported", quoteString(path), version);
+
+    size_t num_infos;
+    readVarUInt(num_infos, *in);
+    infos.clear();
+    for (size_t i = 0; i != num_infos; ++i)
+    {
+        String path_in_backup;
+        readBinary(path_in_backup, *in);
+        EntryInfo info;
+        readVarUInt(info.size, *in);
+        if (info.size)
+        {
+            readBinary(info.checksum, *in);
+            readVarUInt(info.base_size, *in);
+            if (info.base_size && (info.base_size != info.size))
+                readBinary(info.base_checksum, *in);
+            else if (info.base_size)
+                info.base_checksum = info.checksum;
+        }
+        infos.emplace(path_in_backup, info);
+    }
+}
+
+IBackup::OpenMode BackupInDirectory::getOpenMode() const
+{
+    return open_mode;
+}
+
+String BackupInDirectory::getPath() const
+{
+    return path;
+}
+
+Strings BackupInDirectory::list(const String & prefix, const String & terminator) const
+{
+    if (!prefix.ends_with('/') && !prefix.empty())
+        throw Exception("prefix should end with '/'", ErrorCodes::BAD_ARGUMENTS);
+    std::lock_guard lock{mutex};
+    Strings elements;
+    for (auto it = infos.lower_bound(prefix); it != infos.end(); ++it)
+    {
+        const String & name = it->first;
+        if (!name.starts_with(prefix))
+            break;
+        size_t start_pos = prefix.length();
+        size_t end_pos = String::npos;
+        if (!terminator.empty())
+            end_pos = name.find(terminator, start_pos);
+        std::string_view new_element = std::string_view{name}.substr(start_pos, end_pos - start_pos);
+        if (!elements.empty() && (elements.back() == new_element))
+            continue;
+        elements.push_back(String{new_element});
+    }
+    return elements;
+}
+
+bool BackupInDirectory::exists(const String & name) const
+{
+    std::lock_guard lock{mutex};
+    return infos.count(name) != 0;
+}
+
+size_t BackupInDirectory::getSize(const String & name) const
+{
+    std::lock_guard lock{mutex};
+    auto it = infos.find(name);
+    if (it == infos.end())
+        throw Exception(
+            ErrorCodes::BACKUP_ENTRY_NOT_FOUND, "Backup {}: Entry {} not found in the backup", quoteString(path), quoteString(name));
+    return it->second.size;
+}
+
+UInt128 BackupInDirectory::getChecksum(const String & name) const
+{
+    std::lock_guard lock{mutex};
+    auto it = infos.find(name);
+    if (it == infos.end())
+        throw Exception(
+            ErrorCodes::BACKUP_ENTRY_NOT_FOUND, "Backup {}: Entry {} not found in the backup", quoteString(path), quoteString(name));
+    return it->second.checksum;
+}
+
+
+BackupEntryPtr BackupInDirectory::read(const String & name) const
+{
+    std::lock_guard lock{mutex};
+    auto it = infos.find(name);
+    if (it == infos.end())
+        throw Exception(
+            ErrorCodes::BACKUP_ENTRY_NOT_FOUND, "Backup {}: Entry {} not found in the backup", quoteString(path), quoteString(name));
+
+    const auto & info = it->second;
+    if (!info.size)
+    {
+        /// Entry's data is empty.
+        return std::make_unique<BackupEntryFromMemory>(nullptr, 0, UInt128{0, 0});
+    }
+
+    if (!info.base_size)
+    {
+        /// Data goes completely from this backup, the base backup isn't used.
+        return std::make_unique<BackupEntryFromImmutableFile>(disk, path_with_sep + name, info.size, info.checksum);
+    }
+
+    if (info.size < info.base_size)
+    {
+        throw Exception(
+            ErrorCodes::BACKUP_DAMAGED,
+            "Backup {}: Entry {} has its data size less than in the base backup {}: {} < {}",
+            quoteString(path), quoteString(name), quoteString(base_backup->getPath()), info.size, info.base_size);
+    }
+
+    if (!base_backup)
+    {
+        throw Exception(
+            ErrorCodes::NO_BASE_BACKUP,
+            "Backup {}: Entry {} is marked to be read from a base backup, but there is no base backup specified",
+            quoteString(path), quoteString(name));
+    }
+
+    if (!base_backup->exists(name))
+    {
+        throw Exception(
+            ErrorCodes::WRONG_BASE_BACKUP,
+            "Backup {}: Entry {} is marked to be read from a base backup, but doesn't exist there",
+            quoteString(path), quoteString(name));
+    }
+
+    auto base_entry = base_backup->read(name);
+    auto base_size = base_entry->getSize();
+    if (base_size != info.base_size)
+    {
+        throw Exception(
+            ErrorCodes::WRONG_BASE_BACKUP,
+            "Backup {}: Entry {} has unexpected size in the base backup {}: {} (expected size: {})",
+            quoteString(path), quoteString(name), quoteString(base_backup->getPath()), base_size, info.base_size);
+    }
+
+    auto base_checksum = base_entry->getChecksum();
+    if (base_checksum && (*base_checksum != info.base_checksum))
+    {
+        throw Exception(
+            ErrorCodes::WRONG_BASE_BACKUP,
+            "Backup {}: Entry {} has unexpected checksum in the base backup {}",
+            quoteString(path), quoteString(name), quoteString(base_backup->getPath()));
+    }
+
+    if (info.size == info.base_size)
+    {
+        /// Data goes completely from the base backup (nothing goes from this backup).
+        return base_entry;
+    }
+
+    /// The beginning of the data goes from the base backup,
+    /// and the ending goes from this backup.
+    return std::make_unique<BackupEntryConcat>(
+        std::move(base_entry),
+        std::make_unique<BackupEntryFromImmutableFile>(disk, path_with_sep + name, info.size - info.base_size),
+        info.checksum);
+}
+
+
+void BackupInDirectory::write(const String & name, BackupEntryPtr entry)
+{
+    std::lock_guard lock{mutex};
+    if (open_mode != OpenMode::WRITE)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Illegal operation: Cannot write to a backup opened for reading");
+
+    if (infos.contains(name))
+        throw Exception(
+            ErrorCodes::BACKUP_ENTRY_ALREADY_EXISTS, "Backup {}: Entry {} already exists", quoteString(path), quoteString(name));
+
+    UInt64 size = entry->getSize();
+    std::optional<UInt128> checksum = entry->getChecksum();
+
+    /// Check if the entry's data is empty.
+    if (!size)
+    {
+        infos.emplace(name, EntryInfo{});
+        return;
+    }
+
+    /// Check if a entry with such name exists in the base backup.
+    bool base_exists = (base_backup && base_backup->exists(name));
+    UInt64 base_size = 0;
+    UInt128 base_checksum{0, 0};
+    if (base_exists)
+    {
+        base_size = base_backup->getSize(name);
+        base_checksum = base_backup->getChecksum(name);
+    }
+
+    std::unique_ptr<ReadBuffer> read_buffer; /// We'll set that later.
+    UInt64 read_pos = 0; /// Current position in read_buffer.
+
+    /// Determine whether it's possible to receive this entry's data from the base backup completely or partly.
+    bool use_base = false;
+    if (base_exists && base_size)
+    {
+        if (size == base_size)
+        {
+            /// The size is the same, we need to compare checksums to find out
+            /// if the entry's data has not been changed since the base backup.
+            if (!checksum)
+            {
+                read_buffer = entry->getReadBuffer();
+                HashingReadBuffer hashing_read_buffer{*read_buffer};
+                hashing_read_buffer.ignore(size);
+                read_pos = size;
+                checksum = hashing_read_buffer.getHash();
+            }
+            if (checksum == base_checksum)
+                use_base = true; /// The data has not been changed.
+        }
+        else if (size > base_size)
+        {
+            /// The size has been increased, we need to calculate a partial checksum to find out
+            /// if the entry's data has been only appended since the base backup.
+            read_buffer = entry->getReadBuffer();
+            HashingReadBuffer hashing_read_buffer{*read_buffer};
+            hashing_read_buffer.ignore(base_size);
+            UInt128 partial_checksum = hashing_read_buffer.getHash();
+            read_pos = base_size;
+            if (!checksum)
+            {
+                hashing_read_buffer.ignore(size - base_size);
+                checksum = hashing_read_buffer.getHash();
+                read_pos = size;
+            }
+            if (partial_checksum == base_checksum)
+                use_base = true; /// The data has been appended.
+        }
+    }
+
+    if (use_base && (size == base_size))
+    {
+        /// The entry's data has not been changed since the base backup.
+        EntryInfo info;
+        info.size = base_size;
+        info.checksum = base_checksum;
+        info.base_size = base_size;
+        info.base_checksum = base_checksum;
+        infos.emplace(name, info);
+        return;
+    }
+
+    {
+        /// Either the entry wasn't exist in the base backup
+        /// or the entry has data appended to the end of the data from the base backup.
+        /// In both those cases we have to copy data to this backup.
+
+        /// Find out where the start position to copy data is.
+        auto copy_pos = use_base ? base_size : 0;
+
+        /// Move the current read position to the start position to copy data.
+        /// If `read_buffer` is seekable it's easier, otherwise we can use ignore().
+        if ((read_pos > copy_pos) && !typeid_cast<SeekableReadBuffer *>(read_buffer.get()))
+        {
+            read_buffer.reset();
+            read_pos = 0;
+        }
+
+        if (!read_buffer)
+            read_buffer = entry->getReadBuffer();
+
+        if (read_pos != copy_pos)
+        {
+            if (auto * seekable_buffer = typeid_cast<SeekableReadBuffer *>(read_buffer.get()))
+                seekable_buffer->seek(copy_pos, SEEK_SET);
+            else if (copy_pos)
+                read_buffer->ignore(copy_pos - read_pos);
+        }
+
+        /// If we haven't received or calculated a checksum yet, calculate it now.
+        ReadBuffer * maybe_hashing_read_buffer = read_buffer.get();
+        std::optional<HashingReadBuffer> hashing_read_buffer;
+        if (!checksum)
+            maybe_hashing_read_buffer = &hashing_read_buffer.emplace(*read_buffer);
+
+        /// Copy the entry's data after `copy_pos`.
+        String out_file_path = path_with_sep + name;
+        disk->createDirectories(directoryPath(out_file_path));
+        auto out = disk->writeFile(out_file_path);
+
+        copyData(*maybe_hashing_read_buffer, *out, size - copy_pos);
+
+        if (hashing_read_buffer)
+            checksum = hashing_read_buffer->getHash();
+
+        /// Done!
+        EntryInfo info;
+        info.size = size;
+        info.checksum = *checksum;
+        if (use_base)
+        {
+            info.base_size = base_size;
+            info.base_checksum = base_checksum;
+        }
+        infos.emplace(name, info);
+    }
+}
+
+void BackupInDirectory::finalizeWriting()
+{
+    if (open_mode != OpenMode::WRITE)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Illegal operation: Cannot write to a backup opened for reading");
+    writeContents();
+    finalized = true;
+}
+
+}
diff --git a/src/Backups/BackupInDirectory.h b/src/Backups/BackupInDirectory.h
new file mode 100644
index 00000000000..ceaf4e34ccb
--- /dev/null
+++ b/src/Backups/BackupInDirectory.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <Backups/IBackup.h>
+#include <map>
+#include <mutex>
+
+
+namespace DB
+{
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
+/// Represents a backup stored on a disk.
+/// A backup is stored as a directory, each entry is stored as a file in that directory.
+/// Also three system files are stored:
+/// 1) ".base" is an XML file with information about the base backup.
+/// 2) ".contents" is a binary file containing a list of all entries along with their sizes
+/// and checksums and information whether the base backup should be used for each entry
+/// 3) ".write_lock" is a temporary empty file which is created before writing of a backup
+/// and deleted after finishing that writing.
+class BackupInDirectory : public IBackup
+{
+public:
+    BackupInDirectory(OpenMode open_mode_, const DiskPtr & disk_, const String & path_, const std::shared_ptr<const IBackup> & base_backup_ = {});
+    ~BackupInDirectory() override;
+
+    OpenMode getOpenMode() const override;
+    String getPath() const override;
+    Strings list(const String & prefix, const String & terminator) const override;
+    bool exists(const String & name) const override;
+    size_t getSize(const String & name) const override;
+    UInt128 getChecksum(const String & name) const override;
+    BackupEntryPtr read(const String & name) const override;
+    void write(const String & name, BackupEntryPtr entry) override;
+    void finalizeWriting() override;
+
+private:
+    void open();
+    void close();
+    void writePathToBaseBackup();
+    void readPathToBaseBackup();
+    void writeContents();
+    void readContents();
+
+    struct EntryInfo
+    {
+        UInt64 size = 0;
+        UInt128 checksum{0, 0};
+
+        /// for incremental backups
+        UInt64 base_size = 0;
+        UInt128 base_checksum{0, 0};
+    };
+
+    const OpenMode open_mode;
+    const DiskPtr disk;
+    String path;
+    String path_with_sep;
+    std::shared_ptr<const IBackup> base_backup;
+    std::map<String, EntryInfo> infos;
+    bool directory_was_created = false;
+    bool finalized = false;
+    mutable std::mutex mutex;
+};
+
+}
diff --git a/src/Backups/BackupRenamingConfig.cpp b/src/Backups/BackupRenamingConfig.cpp
new file mode 100644
index 00000000000..ff510d82a32
--- /dev/null
+++ b/src/Backups/BackupRenamingConfig.cpp
@@ -0,0 +1,89 @@
+#include <Backups/BackupRenamingConfig.h>
+#include <Parsers/ASTBackupQuery.h>
+
+
+namespace DB
+{
+using Kind = ASTBackupQuery::Kind;
+using ElementType = ASTBackupQuery::ElementType;
+
+void BackupRenamingConfig::setNewTableName(const DatabaseAndTableName & old_table_name, const DatabaseAndTableName & new_table_name)
+{
+    old_to_new_table_names[old_table_name] = new_table_name;
+}
+
+void BackupRenamingConfig::setNewDatabaseName(const String & old_database_name, const String & new_database_name)
+{
+    old_to_new_database_names[old_database_name] = new_database_name;
+}
+
+void BackupRenamingConfig::setNewTemporaryTableName(const String & old_temporary_table_name, const String & new_temporary_table_name)
+{
+    old_to_new_temporary_table_names[old_temporary_table_name] = new_temporary_table_name;
+}
+
+void BackupRenamingConfig::setFromBackupQuery(const ASTBackupQuery & backup_query)
+{
+    setFromBackupQueryElements(backup_query.elements);
+}
+
+void BackupRenamingConfig::setFromBackupQueryElements(const ASTBackupQuery::Elements & backup_query_elements)
+{
+    for (const auto & element : backup_query_elements)
+    {
+        switch (element.type)
+        {
+            case ElementType::TABLE: [[fallthrough]];
+            case ElementType::DICTIONARY:
+            {
+                const auto & new_name = element.new_name.second.empty() ? element.name : element.new_name;
+                setNewTableName(element.name, new_name);
+                break;
+            }
+
+            case ASTBackupQuery::DATABASE:
+            {
+                const auto & new_name = element.new_name.first.empty() ? element.name.first : element.new_name.first;
+                setNewDatabaseName(element.name.first, new_name);
+                break;
+            }
+
+            case ASTBackupQuery::TEMPORARY_TABLE:
+            {
+                const auto & new_name = element.new_name.second.empty() ? element.name.second : element.new_name.second;
+                setNewTemporaryTableName(element.name.second, new_name);
+                break;
+            }
+
+            case ASTBackupQuery::ALL_DATABASES: break;
+            case ASTBackupQuery::ALL_TEMPORARY_TABLES: break;
+            case ASTBackupQuery::EVERYTHING: break;
+        }
+    }
+}
+
+DatabaseAndTableName BackupRenamingConfig::getNewTableName(const DatabaseAndTableName & old_table_name) const
+{
+    auto it = old_to_new_table_names.find(old_table_name);
+    if (it != old_to_new_table_names.end())
+        return it->second;
+    return {getNewDatabaseName(old_table_name.first), old_table_name.second};
+}
+
+const String & BackupRenamingConfig::getNewDatabaseName(const String & old_database_name) const
+{
+    auto it = old_to_new_database_names.find(old_database_name);
+    if (it != old_to_new_database_names.end())
+        return it->second;
+    return old_database_name;
+}
+
+const String & BackupRenamingConfig::getNewTemporaryTableName(const String & old_temporary_table_name) const
+{
+    auto it = old_to_new_temporary_table_names.find(old_temporary_table_name);
+    if (it != old_to_new_temporary_table_names.end())
+        return it->second;
+    return old_temporary_table_name;
+}
+
+}
diff --git a/src/Backups/BackupRenamingConfig.h b/src/Backups/BackupRenamingConfig.h
new file mode 100644
index 00000000000..740781c9c9f
--- /dev/null
+++ b/src/Backups/BackupRenamingConfig.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Parsers/ASTBackupQuery.h>
+#include <Core/Types.h>
+#include <map>
+#include <unordered_map>
+
+
+namespace DB
+{
+using DatabaseAndTableName = std::pair<String, String>;
+
+/// Keeps information about renamings of databases or tables being processed
+/// while we're making a backup or while we're restoring from a backup.
+class BackupRenamingConfig
+{
+public:
+    BackupRenamingConfig() = default;
+
+    void setNewTableName(const DatabaseAndTableName & old_table_name, const DatabaseAndTableName & new_table_name);
+    void setNewDatabaseName(const String & old_database_name, const String & new_database_name);
+    void setNewTemporaryTableName(const String & old_temporary_table_name, const String & new_temporary_table_name);
+    void setFromBackupQuery(const ASTBackupQuery & backup_query);
+    void setFromBackupQueryElements(const ASTBackupQuery::Elements & backup_query_elements);
+
+    /// Changes names according to the renaming.
+    DatabaseAndTableName getNewTableName(const DatabaseAndTableName & old_table_name) const;
+    const String & getNewDatabaseName(const String & old_database_name) const;
+    const String & getNewTemporaryTableName(const String & old_temporary_table_name) const;
+
+private:
+    std::map<DatabaseAndTableName, DatabaseAndTableName> old_to_new_table_names;
+    std::unordered_map<String, String> old_to_new_database_names;
+    std::unordered_map<String, String> old_to_new_temporary_table_names;
+};
+
+using BackupRenamingConfigPtr = std::shared_ptr<const BackupRenamingConfig>;
+
+}
diff --git a/src/Backups/BackupSettings.cpp b/src/Backups/BackupSettings.cpp
new file mode 100644
index 00000000000..f383330f246
--- /dev/null
+++ b/src/Backups/BackupSettings.cpp
@@ -0,0 +1,6 @@
+#include <Backups/BackupSettings.h>
+
+namespace DB
+{
+IMPLEMENT_SETTINGS_TRAITS(BackupSettingsTraits, LIST_OF_BACKUP_SETTINGS)
+}
diff --git a/src/Backups/BackupSettings.h b/src/Backups/BackupSettings.h
new file mode 100644
index 00000000000..dc8a679415c
--- /dev/null
+++ b/src/Backups/BackupSettings.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <Core/BaseSettings.h>
+
+
+namespace DB
+{
+
+#define LIST_OF_BACKUP_SETTINGS(M) \
+    M(String, base_backup, "", "Name of the base backup. Only differences made after the base backup will be included in a newly created backup, so this option allows to make an incremental backup.", 0) \
+
+DECLARE_SETTINGS_TRAITS_ALLOW_CUSTOM_SETTINGS(BackupSettingsTraits, LIST_OF_BACKUP_SETTINGS)
+
+struct BackupSettings : public BaseSettings<BackupSettingsTraits> {};
+
+}
diff --git a/src/Backups/BackupUtils.cpp b/src/Backups/BackupUtils.cpp
new file mode 100644
index 00000000000..7a935d721a6
--- /dev/null
+++ b/src/Backups/BackupUtils.cpp
@@ -0,0 +1,829 @@
+#include <Backups/BackupUtils.h>
+#include <Backups/BackupEntryFromMemory.h>
+#include <Backups/BackupRenamingConfig.h>
+#include <Backups/IBackup.h>
+#include <Backups/hasCompatibleDataToRestoreTable.h>
+#include <Backups/renameInCreateQuery.h>
+#include <Common/escapeForFileName.h>
+#include <Databases/IDatabase.h>
+#include <IO/ReadHelpers.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
+#include <Storages/IStorage.h>
+#include <base/insertAtEnd.h>
+#include <boost/range/adaptor/reversed.hpp>
+#include <filesystem>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int BACKUP_ELEMENT_DUPLICATE;
+    extern const int BACKUP_IS_EMPTY;
+    extern const int LOGICAL_ERROR;
+    extern const int TABLE_ALREADY_EXISTS;
+    extern const int CANNOT_RESTORE_TABLE;
+}
+
+namespace
+{
+    using Kind = ASTBackupQuery::Kind;
+    using Element = ASTBackupQuery::Element;
+    using Elements = ASTBackupQuery::Elements;
+    using ElementType = ASTBackupQuery::ElementType;
+
+    /// Replace elements of types DICTIONARY or EVERYTHING with elements of other types.
+    void replaceElementTypesWithBaseElementTypes(Elements & elements)
+    {
+        for (size_t i = 0; i != elements.size(); ++i)
+        {
+            auto & element = elements[i];
+            switch (element.type)
+            {
+                case ElementType::DICTIONARY:
+                {
+                    element.type = ElementType::TABLE;
+                    break;
+                }
+
+                case ElementType::EVERYTHING:
+                {
+                    element.type = ElementType::ALL_DATABASES;
+                    auto & new_element = elements.emplace_back();
+                    new_element.type = ElementType::ALL_TEMPORARY_TABLES;
+                    break;
+                }
+
+                default:
+                    break;
+            }
+        }
+    }
+
+    /// Replaces an empty database with the current database.
+    void replaceEmptyDatabaseWithCurrentDatabase(Elements & elements, const String & current_database)
+    {
+        for (auto & element : elements)
+        {
+            if (element.type == ElementType::TABLE)
+            {
+                if (element.name.first.empty() && !element.name.second.empty())
+                    element.name.first = current_database;
+                if (element.new_name.first.empty() && !element.new_name.second.empty())
+                    element.new_name.first = current_database;
+            }
+        }
+    }
+
+    /// Replaces elements of types TEMPORARY_TABLE or ALL_TEMPORARY_TABLES with elements of type TABLE or DATABASE.
+    void replaceTemporaryTablesWithTemporaryDatabase(Elements & elements)
+    {
+        for (auto & element : elements)
+        {
+            switch (element.type)
+            {
+                case ElementType::TEMPORARY_TABLE:
+                {
+                    element.type = ElementType::TABLE;
+                    element.name.first = DatabaseCatalog::TEMPORARY_DATABASE;
+                    if (element.new_name.first.empty() && !element.new_name.second.empty())
+                        element.new_name.first = DatabaseCatalog::TEMPORARY_DATABASE;
+                    break;
+                }
+
+                case ElementType::ALL_TEMPORARY_TABLES:
+                {
+                    element.type = ElementType::DATABASE;
+                    element.name.first = DatabaseCatalog::TEMPORARY_DATABASE;
+                    break;
+                }
+
+                default:
+                    break;
+            }
+        }
+    }
+
+    /// Set new names if they are not specified.
+    void setNewNamesIfNotSet(Elements & elements)
+    {
+        for (auto & element : elements)
+        {
+            switch (element.type)
+            {
+                case ElementType::TABLE:
+                {
+                    if (element.new_name.second.empty())
+                        element.new_name = element.name;
+                    break;
+                }
+
+                case ElementType::DATABASE:
+                {
+                    if (element.new_name.first.empty())
+                        element.new_name = element.name;
+                    break;
+                }
+
+                default:
+                    break;
+            }
+        }
+    }
+
+    /// Removes duplications in the elements of a backup query by removing some excessive elements and by updating except_lists.
+    /// This function helps deduplicate elements in queries like "BACKUP ALL DATABASES, DATABASE xxx USING NAME yyy"
+    /// (we need a deduplication for that query because `ALL DATABASES` includes `xxx` however we don't want
+    /// to backup/restore the same database twice while executing the same query).
+    /// Also this function slightly reorders elements: it puts databases before tables and dictionaries they contain.
+    void deduplicateAndReorderElements(Elements & elements)
+    {
+        std::set<size_t> skip_indices; /// Indices of elements which should be removed in the end of this function.
+        size_t index_all_databases = static_cast<size_t>(-1); /// Index of the first element of type ALL_DATABASES or -1 if not found.
+
+        struct DatabaseInfo
+        {
+            size_t index = static_cast<size_t>(-1);
+            std::unordered_map<std::string_view, size_t> tables;
+        };
+        std::unordered_map<std::string_view, DatabaseInfo> databases; /// Found databases and tables.
+
+        for (size_t i = 0; i != elements.size(); ++i)
+        {
+            auto & element = elements[i];
+            switch (element.type)
+            {
+                case ElementType::TABLE:
+                {
+                    auto & tables = databases.emplace(element.name.first, DatabaseInfo{}).first->second.tables;
+                    auto it = tables.find(element.name.second);
+                    if (it == tables.end())
+                    {
+                        tables.emplace(element.name.second, i);
+                    }
+                    else
+                    {
+                        size_t prev_index = it->second;
+                        if ((elements[i].new_name == elements[prev_index].new_name)
+                            && (elements[i].partitions.empty() == elements[prev_index].partitions.empty()))
+                        {
+                            insertAtEnd(elements[prev_index].partitions, elements[i].partitions);
+                            skip_indices.emplace(i);
+                        }
+                        else
+                        {
+                            throw Exception(
+                                "Table " + backQuote(element.name.first) + "." + backQuote(element.name.second) + " was specified twice",
+                                ErrorCodes::BACKUP_ELEMENT_DUPLICATE);
+                        }
+                    }
+                    break;
+                }
+
+                case ElementType::DATABASE:
+                {
+                    auto it = databases.find(element.name.first);
+                    if (it == databases.end())
+                    {
+                        DatabaseInfo new_db_info;
+                        new_db_info.index = i;
+                        databases.emplace(element.name.first, new_db_info);
+                    }
+                    else if (it->second.index == static_cast<size_t>(-1))
+                    {
+                        it->second.index = i;
+                    }
+                    else
+                    {
+                        size_t prev_index = it->second.index;
+                        if ((elements[i].new_name == elements[prev_index].new_name)
+                            && (elements[i].except_list == elements[prev_index].except_list))
+                        {
+                            skip_indices.emplace(i);
+                        }
+                        else
+                        {
+                            throw Exception("Database " + backQuote(element.name.first) + " was specified twice", ErrorCodes::BACKUP_ELEMENT_DUPLICATE);
+                        }
+
+                    }
+                    break;
+                }
+
+                case ElementType::ALL_DATABASES:
+                {
+                    if (index_all_databases == static_cast<size_t>(-1))
+                    {
+                        index_all_databases = i;
+                    }
+                    else
+                    {
+                        size_t prev_index = index_all_databases;
+                        if (elements[i].except_list == elements[prev_index].except_list)
+                            skip_indices.emplace(i);
+                        else
+                            throw Exception("The tag ALL DATABASES was specified twice", ErrorCodes::BACKUP_ELEMENT_DUPLICATE);
+                    }
+                    break;
+                }
+
+                default:
+                    /// replaceElementTypesWithBaseElementTypes() and replaceTemporaryTablesWithTemporaryDatabase() should have removed all other element types.
+                    throw Exception("Unexpected element type: " + std::to_string(static_cast<int>(element.type)), ErrorCodes::LOGICAL_ERROR);
+            }
+        }
+
+        if (index_all_databases != static_cast<size_t>(-1))
+        {
+            for (auto & [database_name, database] : databases)
+            {
+                elements[index_all_databases].except_list.emplace(database_name);
+                if (database.index == static_cast<size_t>(-1))
+                {
+                    auto & new_element = elements.emplace_back();
+                    new_element.type = ElementType::DATABASE;
+                    new_element.name.first = database_name;
+                    new_element.new_name = new_element.name;
+                    database.index = elements.size() - 1;
+                }
+            }
+        }
+
+        for (auto & [database_name, database] : databases)
+        {
+            if (database.index == static_cast<size_t>(-1))
+                continue;
+            for (const auto & [table_name, table_index] : database.tables)
+                elements[database.index].except_list.emplace(table_name);
+        }
+
+        /// Reorder the elements: databases should be before tables and dictionaries they contain.
+        for (auto & [database_name, database] : databases)
+        {
+            if (database.index == static_cast<size_t>(-1))
+                continue;
+            size_t min_index = std::numeric_limits<size_t>::max();
+            auto min_index_it = database.tables.end();
+            for (auto it = database.tables.begin(); it != database.tables.end(); ++it)
+            {
+                if (min_index > it->second)
+                {
+                    min_index = it->second;
+                    min_index_it = it;
+                }
+            }
+            if (database.index > min_index)
+            {
+                std::swap(elements[database.index], elements[min_index]);
+                std::swap(database.index, min_index_it->second);
+            }
+        }
+
+        for (auto skip_index : skip_indices | boost::adaptors::reversed)
+            elements.erase(elements.begin() + skip_index);
+    }
+
+    Elements adjustElements(const Elements & elements, const String & current_database)
+    {
+        auto res = elements;
+        replaceElementTypesWithBaseElementTypes(res);
+        replaceEmptyDatabaseWithCurrentDatabase(res, current_database);
+        replaceTemporaryTablesWithTemporaryDatabase(res);
+        setNewNamesIfNotSet(res);
+        deduplicateAndReorderElements(res);
+        return res;
+    }
+
+    String getDataPathInBackup(const DatabaseAndTableName & table_name)
+    {
+        if (table_name.first.empty() || table_name.second.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Database name and table name must not be empty");
+        assert(!table_name.first.empty() && !table_name.second.empty());
+        return String{"data/"} + escapeForFileName(table_name.first) + "/" + escapeForFileName(table_name.second) + "/";
+    }
+
+    String getDataPathInBackup(const IAST & create_query)
+    {
+        const auto & create = create_query.as<const ASTCreateQuery &>();
+        if (create.table.empty())
+            return {};
+        if (create.temporary)
+            return getDataPathInBackup({DatabaseCatalog::TEMPORARY_DATABASE, create.table});
+        return getDataPathInBackup({create.database, create.table});
+    }
+
+    String getMetadataPathInBackup(const DatabaseAndTableName & table_name)
+    {
+        if (table_name.first.empty() || table_name.second.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Database name and table name must not be empty");
+        return String{"metadata/"} + escapeForFileName(table_name.first) + "/" + escapeForFileName(table_name.second) + ".sql";
+    }
+
+    String getMetadataPathInBackup(const String & database_name)
+    {
+        if (database_name.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Database name must not be empty");
+        return String{"metadata/"} + escapeForFileName(database_name) + ".sql";
+    }
+
+    String getMetadataPathInBackup(const IAST & create_query)
+    {
+        const auto & create = create_query.as<const ASTCreateQuery &>();
+        if (create.table.empty())
+            return getMetadataPathInBackup(create.database);
+        if (create.temporary)
+            return getMetadataPathInBackup({DatabaseCatalog::TEMPORARY_DATABASE, create.table});
+        return getMetadataPathInBackup({create.database, create.table});
+    }
+
+    void backupCreateQuery(const IAST & create_query, BackupEntries & backup_entries)
+    {
+        auto metadata_entry = std::make_unique<BackupEntryFromMemory>(serializeAST(create_query));
+        String metadata_path = getMetadataPathInBackup(create_query);
+        backup_entries.emplace_back(metadata_path, std::move(metadata_entry));
+    }
+
+    void backupTable(
+        const DatabaseAndTable & database_and_table,
+        const String & table_name,
+        const ASTs & partitions,
+        const ContextPtr & context,
+        const BackupRenamingConfigPtr & renaming_config,
+        BackupEntries & backup_entries)
+    {
+        const auto & database = database_and_table.first;
+        const auto & storage = database_and_table.second;
+        context->checkAccess(AccessType::SELECT, database->getDatabaseName(), table_name);
+
+        auto create_query = database->getCreateTableQuery(table_name, context);
+        ASTPtr new_create_query = renameInCreateQuery(create_query, renaming_config, context);
+        backupCreateQuery(*new_create_query, backup_entries);
+
+        auto data_backup = storage->backup(partitions, context);
+        if (!data_backup.empty())
+        {
+            String data_path = getDataPathInBackup(*new_create_query);
+            for (auto & [path_in_backup, backup_entry] : data_backup)
+                backup_entries.emplace_back(data_path + path_in_backup, std::move(backup_entry));
+        }
+    }
+
+    void backupDatabase(
+        const DatabasePtr & database,
+        const std::set<String> & except_list,
+        const ContextPtr & context,
+        const BackupRenamingConfigPtr & renaming_config,
+        BackupEntries & backup_entries)
+    {
+        context->checkAccess(AccessType::SHOW_TABLES, database->getDatabaseName());
+
+        auto create_query = database->getCreateDatabaseQuery();
+        ASTPtr new_create_query = renameInCreateQuery(create_query, renaming_config, context);
+        backupCreateQuery(*new_create_query, backup_entries);
+
+        for (auto it = database->getTablesIteratorForBackup(context); it->isValid(); it->next())
+        {
+            if (except_list.contains(it->name()))
+                continue;
+            backupTable({database, it->table()}, it->name(), {}, context, renaming_config, backup_entries);
+        }
+    }
+
+    void backupAllDatabases(
+        const std::set<String> & except_list,
+        const ContextPtr & context,
+        const BackupRenamingConfigPtr & renaming_config,
+        BackupEntries & backup_entries)
+    {
+        for (const auto & [database_name, database] : DatabaseCatalog::instance().getDatabases())
+        {
+            if (except_list.contains(database_name))
+                continue;
+            if (database_name == DatabaseCatalog::SYSTEM_DATABASE || database_name == DatabaseCatalog::TEMPORARY_DATABASE)
+                continue;
+            backupDatabase(database, {}, context, renaming_config, backup_entries);
+        }
+    }
+
+    void makeDatabaseIfNotExists(const String & database_name, ContextMutablePtr context)
+    {
+        if (DatabaseCatalog::instance().isDatabaseExist(database_name))
+            return;
+
+        /// We create and execute `create` query for the database name.
+        auto create_query = std::make_shared<ASTCreateQuery>();
+        create_query->database = database_name;
+        create_query->if_not_exists = true;
+        InterpreterCreateQuery create_interpreter{create_query, context};
+        create_interpreter.execute();
+    }
+
+    ASTPtr readCreateQueryFromBackup(const DatabaseAndTableName & table_name, const BackupPtr & backup)
+    {
+        String create_query_path = getMetadataPathInBackup(table_name);
+        auto read_buffer = backup->read(create_query_path)->getReadBuffer();
+        String create_query_str;
+        readStringUntilEOF(create_query_str, *read_buffer);
+        read_buffer.reset();
+        ParserCreateQuery create_parser;
+        return parseQuery(create_parser, create_query_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    }
+
+    ASTPtr readCreateQueryFromBackup(const String & database_name, const BackupPtr & backup)
+    {
+        String create_query_path = getMetadataPathInBackup(database_name);
+        auto read_buffer = backup->read(create_query_path)->getReadBuffer();
+        String create_query_str;
+        readStringUntilEOF(create_query_str, *read_buffer);
+        read_buffer.reset();
+        ParserCreateQuery create_parser;
+        return parseQuery(create_parser, create_query_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    }
+
+    void restoreTable(
+        const DatabaseAndTableName & table_name,
+        const ASTs & partitions,
+        ContextMutablePtr context,
+        const BackupPtr & backup,
+        const BackupRenamingConfigPtr & renaming_config,
+        RestoreObjectsTasks & restore_tasks)
+    {
+        ASTPtr create_query = readCreateQueryFromBackup(table_name, backup);
+        auto new_create_query = typeid_cast<std::shared_ptr<ASTCreateQuery>>(renameInCreateQuery(create_query, renaming_config, context));
+
+        restore_tasks.emplace_back([table_name, new_create_query, partitions, context, backup]() -> RestoreDataTasks
+        {
+            DatabaseAndTableName new_table_name{new_create_query->database, new_create_query->table};
+            if (new_create_query->temporary)
+                new_table_name.first = DatabaseCatalog::TEMPORARY_DATABASE;
+
+            context->checkAccess(AccessType::INSERT, new_table_name.first, new_table_name.second);
+
+            StoragePtr storage;
+            for (size_t try_index = 0; try_index != 10; ++try_index)
+            {
+                if (DatabaseCatalog::instance().isTableExist({new_table_name.first, new_table_name.second}, context))
+                {
+                    DatabasePtr existing_database;
+                    StoragePtr existing_storage;
+                    std::tie(existing_database, existing_storage) = DatabaseCatalog::instance().tryGetDatabaseAndTable({new_table_name.first, new_table_name.second}, context);
+                    if (existing_storage)
+                    {
+                        if (auto existing_table_create_query = existing_database->tryGetCreateTableQuery(new_table_name.second, context))
+                        {
+                            if (hasCompatibleDataToRestoreTable(*new_create_query, existing_table_create_query->as<ASTCreateQuery &>()))
+                            {
+                                storage = existing_storage;
+                                break;
+                            }
+                            else
+                            {
+                                String error_message = (new_table_name.first == DatabaseCatalog::TEMPORARY_DATABASE)
+                                    ? ("Temporary table " + backQuoteIfNeed(new_table_name.second) + " already exists")
+                                    : ("Table " + backQuoteIfNeed(new_table_name.first) + "." + backQuoteIfNeed(new_table_name.second)
+                                       + " already exists");
+                                throw Exception(error_message, ErrorCodes::CANNOT_RESTORE_TABLE);
+                            }
+                        }
+                    }
+                }
+
+                makeDatabaseIfNotExists(new_table_name.first, context);
+
+                try
+                {
+                    InterpreterCreateQuery create_interpreter{new_create_query, context};
+                    create_interpreter.execute();
+                }
+                catch (Exception & e)
+                {
+                    if (e.code() != ErrorCodes::TABLE_ALREADY_EXISTS)
+                        throw;
+                }
+            }
+
+            if (!storage)
+            {
+                String error_message = (new_table_name.first == DatabaseCatalog::TEMPORARY_DATABASE)
+                    ? ("Could not create temporary table " + backQuoteIfNeed(new_table_name.second) + " for restoring")
+                    : ("Could not create table " + backQuoteIfNeed(new_table_name.first) + "." + backQuoteIfNeed(new_table_name.second)
+                       + " for restoring");
+                throw Exception(error_message, ErrorCodes::CANNOT_RESTORE_TABLE);
+            }
+
+            String data_path_in_backup = getDataPathInBackup(table_name);
+            RestoreDataTasks restore_data_tasks = storage->restoreFromBackup(backup, data_path_in_backup, partitions, context);
+
+            /// Keep `storage` alive while we're executing `restore_data_tasks`.
+            for (auto & restore_data_task : restore_data_tasks)
+                restore_data_task = [restore_data_task, storage]() { restore_data_task(); };
+
+            return restore_data_tasks;
+        });
+    }
+
+    void restoreDatabase(const String & database_name, const std::set<String> & except_list, ContextMutablePtr context, const BackupPtr & backup, const BackupRenamingConfigPtr & renaming_config, RestoreObjectsTasks & restore_tasks)
+    {
+        ASTPtr create_query = readCreateQueryFromBackup(database_name, backup);
+        auto new_create_query = typeid_cast<std::shared_ptr<ASTCreateQuery>>(renameInCreateQuery(create_query, renaming_config, context));
+
+        restore_tasks.emplace_back([database_name, new_create_query, except_list, context, backup, renaming_config]() -> RestoreDataTasks
+        {
+            const String & new_database_name = new_create_query->database;
+            context->checkAccess(AccessType::SHOW_TABLES, new_database_name);
+
+            if (!DatabaseCatalog::instance().isDatabaseExist(new_database_name))
+            {
+                /// We create and execute `create` query for the database name.
+                new_create_query->if_not_exists = true;
+                InterpreterCreateQuery create_interpreter{new_create_query, context};
+                create_interpreter.execute();
+            }
+
+            RestoreObjectsTasks restore_objects_tasks;
+            Strings table_names = backup->list("metadata/" + escapeForFileName(database_name) + "/", "/");
+            for (const String & table_name : table_names)
+            {
+                if (except_list.contains(table_name))
+                    continue;
+                restoreTable({database_name, table_name}, {}, context, backup, renaming_config, restore_objects_tasks);
+            }
+
+            RestoreDataTasks restore_data_tasks;
+            for (auto & restore_object_task : restore_objects_tasks)
+                insertAtEnd(restore_data_tasks, std::move(restore_object_task)());
+            return restore_data_tasks;
+        });
+    }
+
+    void restoreAllDatabases(const std::set<String> & except_list, ContextMutablePtr context, const BackupPtr & backup, const BackupRenamingConfigPtr & renaming_config, RestoreObjectsTasks & restore_tasks)
+    {
+        restore_tasks.emplace_back([except_list, context, backup, renaming_config]() -> RestoreDataTasks
+        {
+            Strings database_names = backup->list("metadata/", "/");
+            RestoreObjectsTasks restore_objects_tasks;
+            for (const String & database_name : database_names)
+            {
+                if (except_list.contains(database_name))
+                    continue;
+                restoreDatabase(database_name, {}, context, backup, renaming_config, restore_objects_tasks);
+            }
+
+            RestoreDataTasks restore_data_tasks;
+            for (auto & restore_object_task : restore_objects_tasks)
+                insertAtEnd(restore_data_tasks, std::move(restore_object_task)());
+            return restore_data_tasks;
+        });
+    }
+}
+
+
+BackupEntries makeBackupEntries(const Elements & elements, const ContextPtr & context)
+{
+    BackupEntries backup_entries;
+
+    auto elements2 = adjustElements(elements, context->getCurrentDatabase());
+    auto renaming_config = std::make_shared<BackupRenamingConfig>();
+    renaming_config->setFromBackupQueryElements(elements2);
+
+    for (const auto & element : elements2)
+    {
+        switch (element.type)
+        {
+            case ElementType::TABLE:
+            {
+                const String & database_name = element.name.first;
+                const String & table_name = element.name.second;
+                auto [database, storage] = DatabaseCatalog::instance().getDatabaseAndTable({database_name, table_name}, context);
+                backupTable({database, storage}, table_name, element.partitions, context, renaming_config, backup_entries);
+                break;
+            }
+
+            case ElementType::DATABASE:
+            {
+                const String & database_name = element.name.first;
+                auto database = DatabaseCatalog::instance().getDatabase(database_name, context);
+                backupDatabase(database, element.except_list, context, renaming_config, backup_entries);
+                break;
+            }
+
+            case ElementType::ALL_DATABASES:
+            {
+                backupAllDatabases(element.except_list, context, renaming_config, backup_entries);
+                break;
+            }
+
+            default:
+                throw Exception("Unexpected element type", ErrorCodes::LOGICAL_ERROR); /// other element types have been removed in deduplicateElements()
+        }
+    }
+
+    /// A backup cannot be empty.
+    if (backup_entries.empty())
+        throw Exception("Backup must not be empty", ErrorCodes::BACKUP_IS_EMPTY);
+
+    /// Check that all backup entries are unique.
+    std::sort(
+        backup_entries.begin(),
+        backup_entries.end(),
+        [](const std::pair<String, std::unique_ptr<IBackupEntry>> & lhs, const std::pair<String, std::unique_ptr<IBackupEntry>> & rhs)
+        {
+            return lhs.first < rhs.first;
+        });
+    auto adjacent = std::adjacent_find(backup_entries.begin(), backup_entries.end());
+    if (adjacent != backup_entries.end())
+        throw Exception("Cannot write multiple entries with the same name " + quoteString(adjacent->first), ErrorCodes::BACKUP_ELEMENT_DUPLICATE);
+
+    return backup_entries;
+}
+
+UInt64 estimateBackupSize(const BackupEntries & backup_entries, const BackupPtr & base_backup)
+{
+    UInt64 total_size = 0;
+    for (const auto & [name, entry] : backup_entries)
+    {
+        UInt64 data_size = entry->getSize();
+        if (base_backup)
+        {
+            if (base_backup->exists(name) && (data_size == base_backup->getSize(name)))
+            {
+                auto checksum = entry->getChecksum();
+                if (checksum && (*checksum == base_backup->getChecksum(name)))
+                    continue;
+            }
+        }
+        total_size += data_size;
+    }
+    return total_size;
+}
+
+void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, size_t num_threads)
+{
+    if (!num_threads)
+        num_threads = 1;
+    std::vector<ThreadFromGlobalPool> threads;
+    size_t num_active_threads = 0;
+    std::mutex mutex;
+    std::condition_variable cond;
+    std::exception_ptr exception;
+
+    for (auto & name_and_entry : backup_entries)
+    {
+        auto & name = name_and_entry.first;
+        auto & entry = name_and_entry.second;
+
+        {
+            std::unique_lock lock{mutex};
+            if (exception)
+                break;
+            cond.wait(lock, [&] { return num_active_threads < num_threads; });
+            if (exception)
+                break;
+            ++num_active_threads;
+        }
+
+        threads.emplace_back([backup, &name, &entry, &mutex, &cond, &num_active_threads, &exception]()
+        {
+            try
+            {
+                backup->write(name, std::move(entry));
+            }
+            catch (...)
+            {
+                std::lock_guard lock{mutex};
+                if (!exception)
+                    exception = std::current_exception();
+            }
+
+            {
+                std::lock_guard lock{mutex};
+                --num_active_threads;
+                cond.notify_all();
+            }
+        });
+    }
+
+    for (auto & thread : threads)
+        thread.join();
+
+    backup_entries.clear();
+
+    if (exception)
+    {
+        /// We don't call finalizeWriting() if an error occurs.
+        /// And IBackup's implementation should remove the backup in its destructor if finalizeWriting() hasn't called before.
+        std::rethrow_exception(exception);
+    }
+
+    backup->finalizeWriting();
+}
+
+
+RestoreObjectsTasks makeRestoreTasks(const Elements & elements, ContextMutablePtr context, const BackupPtr & backup)
+{
+    RestoreObjectsTasks restore_tasks;
+
+    auto elements2 = adjustElements(elements, context->getCurrentDatabase());
+    auto renaming_config = std::make_shared<BackupRenamingConfig>();
+    renaming_config->setFromBackupQueryElements(elements2);
+
+    for (const auto & element : elements2)
+    {
+        switch (element.type)
+        {
+            case ElementType::TABLE:
+            {
+                const String & database_name = element.name.first;
+                const String & table_name = element.name.second;
+                restoreTable({database_name, table_name}, element.partitions, context, backup, renaming_config, restore_tasks);
+                break;
+            }
+
+            case ElementType::DATABASE:
+            {
+                const String & database_name = element.name.first;
+                auto database = DatabaseCatalog::instance().getDatabase(database_name, context);
+                restoreDatabase(database_name, element.except_list, context, backup, renaming_config, restore_tasks);
+                break;
+            }
+
+            case ElementType::ALL_DATABASES:
+            {
+                restoreAllDatabases(element.except_list, context, backup, renaming_config, restore_tasks);
+                break;
+            }
+
+            default:
+                throw Exception("Unexpected element type", ErrorCodes::LOGICAL_ERROR); /// other element types have been removed in deduplicateElements()
+        }
+    }
+
+    return restore_tasks;
+}
+
+
+void executeRestoreTasks(RestoreObjectsTasks && restore_tasks, size_t num_threads)
+{
+    if (!num_threads)
+        num_threads = 1;
+
+    RestoreDataTasks restore_data_tasks;
+    for (auto & restore_object_task : restore_tasks)
+        insertAtEnd(restore_data_tasks, std::move(restore_object_task)());
+    restore_tasks.clear();
+
+    std::vector<ThreadFromGlobalPool> threads;
+    size_t num_active_threads = 0;
+    std::mutex mutex;
+    std::condition_variable cond;
+    std::exception_ptr exception;
+
+    for (auto & restore_data_task : restore_data_tasks)
+    {
+        {
+            std::unique_lock lock{mutex};
+            if (exception)
+                break;
+            cond.wait(lock, [&] { return num_active_threads < num_threads; });
+            if (exception)
+                break;
+            ++num_active_threads;
+        }
+
+        threads.emplace_back([&restore_data_task, &mutex, &cond, &num_active_threads, &exception]() mutable
+        {
+            try
+            {
+                restore_data_task();
+                restore_data_task = {};
+            }
+            catch (...)
+            {
+                std::lock_guard lock{mutex};
+                if (!exception)
+                    exception = std::current_exception();
+            }
+
+            {
+                std::lock_guard lock{mutex};
+                --num_active_threads;
+                cond.notify_all();
+            }
+        });
+    }
+
+    for (auto & thread : threads)
+        thread.join();
+
+    restore_data_tasks.clear();
+
+    if (exception)
+        std::rethrow_exception(exception);
+}
+
+}
diff --git a/src/Backups/BackupUtils.h b/src/Backups/BackupUtils.h
new file mode 100644
index 00000000000..70f080cf6e9
--- /dev/null
+++ b/src/Backups/BackupUtils.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Parsers/ASTBackupQuery.h>
+
+
+namespace DB
+{
+
+class IBackup;
+using BackupPtr = std::shared_ptr<const IBackup>;
+using BackupMutablePtr = std::shared_ptr<IBackup>;
+class IBackupEntry;
+using BackupEntryPtr = std::unique_ptr<IBackupEntry>;
+using BackupEntries = std::vector<std::pair<String, BackupEntryPtr>>;
+using RestoreDataTask = std::function<void()>;
+using RestoreDataTasks = std::vector<RestoreDataTask>;
+using RestoreObjectTask = std::function<RestoreDataTasks()>;
+using RestoreObjectsTasks = std::vector<RestoreObjectTask>;
+class Context;
+using ContextPtr = std::shared_ptr<const Context>;
+using ContextMutablePtr = std::shared_ptr<Context>;
+
+
+/// Prepares backup entries.
+BackupEntries makeBackupEntries(const ASTBackupQuery::Elements & elements, const ContextPtr & context);
+
+/// Estimate total size of the backup which would be written from the specified entries.
+UInt64 estimateBackupSize(const BackupEntries & backup_entries, const BackupPtr & base_backup);
+
+/// Write backup entries to an opened backup.
+void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, size_t num_threads);
+
+/// Prepare restore tasks.
+RestoreObjectsTasks makeRestoreTasks(const ASTBackupQuery::Elements & elements, ContextMutablePtr context, const BackupPtr & backup);
+
+/// Execute restore tasks.
+void executeRestoreTasks(RestoreObjectsTasks && restore_tasks, size_t num_threads);
+
+}
diff --git a/src/DataStreams/examples/CMakeLists.txt b/src/Backups/CMakeLists.txt
similarity index 100%
rename from src/DataStreams/examples/CMakeLists.txt
rename to src/Backups/CMakeLists.txt
diff --git a/src/Backups/IBackup.h b/src/Backups/IBackup.h
new file mode 100644
index 00000000000..f568f209f4b
--- /dev/null
+++ b/src/Backups/IBackup.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <memory>
+
+
+namespace DB
+{
+class IBackupEntry;
+using BackupEntryPtr = std::unique_ptr<IBackupEntry>;
+
+/// Represents a backup, i.e. a storage of BackupEntries which can be accessed by their names.
+/// A backup can be either incremental or non-incremental. An incremental backup doesn't store
+/// the data of the entries which are not changed compared to its base backup.
+class IBackup
+{
+public:
+    virtual ~IBackup() = default;
+
+    enum class OpenMode
+    {
+        READ,
+        WRITE,
+    };
+
+    /// A backup can be open either in READ or WRITE mode.
+    virtual OpenMode getOpenMode() const = 0;
+
+    /// Returns the path to the backup.
+    virtual String getPath() const = 0;
+
+    /// Returns names of entries stored in the backup.
+    /// If `prefix` isn't empty the function will return only the names starting with
+    /// the prefix (but without the prefix itself).
+    /// If the `terminator` isn't empty the function will returns only parts of the names
+    /// before the terminator. For example, list("", "") returns names of all the entries
+    /// in the backup; and list("data/", "/") return kind of a list of folders and
+    /// files stored in the "data/" directory inside the backup.
+    virtual Strings list(const String & prefix = "", const String & terminator = "/") const = 0;
+
+    /// Checks if an entry with a specified name exists.
+    virtual bool exists(const String & name) const = 0;
+
+    /// Returns the size of the entry's data.
+    /// This function does the same as `read(name)->getSize()` but faster.
+    virtual size_t getSize(const String & name) const = 0;
+
+    /// Returns the checksum of the entry's data.
+    /// This function does the same as `read(name)->getCheckum()` but faster.
+    virtual UInt128 getChecksum(const String & name) const = 0;
+
+    /// Reads an entry from the backup.
+    virtual BackupEntryPtr read(const String & name) const = 0;
+
+    /// Puts a new entry to the backup.
+    virtual void write(const String & name, BackupEntryPtr entry) = 0;
+
+    /// Finalizes writing the backup, should be called after all entries have been successfully written.
+    virtual void finalizeWriting() = 0;
+};
+
+using BackupPtr = std::shared_ptr<const IBackup>;
+using BackupMutablePtr = std::shared_ptr<IBackup>;
+
+}
diff --git a/src/Backups/IBackupEntry.h b/src/Backups/IBackupEntry.h
new file mode 100644
index 00000000000..719e03ae6f5
--- /dev/null
+++ b/src/Backups/IBackupEntry.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <memory>
+#include <optional>
+#include <vector>
+
+namespace DB
+{
+class ReadBuffer;
+
+/// A backup entry represents some data which should be written to the backup or has been read from the backup.
+class IBackupEntry
+{
+public:
+    virtual ~IBackupEntry() = default;
+
+    /// Returns the size of the data.
+    virtual UInt64 getSize() const = 0;
+
+    /// Returns the checksum of the data if it's precalculated.
+    /// Can return nullopt which means the checksum should be calculated from the read buffer.
+    virtual std::optional<UInt128> getChecksum() const { return {}; }
+
+    /// Returns a read buffer for reading the data.
+    virtual std::unique_ptr<ReadBuffer> getReadBuffer() const = 0;
+};
+
+using BackupEntryPtr = std::unique_ptr<IBackupEntry>;
+using BackupEntries = std::vector<std::pair<String, BackupEntryPtr>>;
+
+}
diff --git a/src/Backups/hasCompatibleDataToRestoreTable.cpp b/src/Backups/hasCompatibleDataToRestoreTable.cpp
new file mode 100644
index 00000000000..9c11d371bb0
--- /dev/null
+++ b/src/Backups/hasCompatibleDataToRestoreTable.cpp
@@ -0,0 +1,22 @@
+#include <Backups/hasCompatibleDataToRestoreTable.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/formatAST.h>
+
+
+namespace DB
+{
+
+bool hasCompatibleDataToRestoreTable(const ASTCreateQuery & query1, const ASTCreateQuery & query2)
+{
+    /// TODO: Write more subtle condition here.
+    auto q1 = typeid_cast<std::shared_ptr<ASTCreateQuery>>(query1.clone());
+    auto q2 = typeid_cast<std::shared_ptr<ASTCreateQuery>>(query2.clone());
+
+    /// Remove UUIDs.
+    q1->uuid = UUIDHelpers::Nil;
+    q2->uuid = UUIDHelpers::Nil;
+
+    return serializeAST(*q1) == serializeAST(*q2);
+}
+
+}
diff --git a/src/Backups/hasCompatibleDataToRestoreTable.h b/src/Backups/hasCompatibleDataToRestoreTable.h
new file mode 100644
index 00000000000..92aab8b4579
--- /dev/null
+++ b/src/Backups/hasCompatibleDataToRestoreTable.h
@@ -0,0 +1,11 @@
+#pragma once
+
+
+namespace DB
+{
+class ASTCreateQuery;
+
+/// Whether the data of the first table can be inserted to the second table.
+bool hasCompatibleDataToRestoreTable(const ASTCreateQuery & query1, const ASTCreateQuery & query2);
+
+}
diff --git a/src/Backups/renameInCreateQuery.cpp b/src/Backups/renameInCreateQuery.cpp
new file mode 100644
index 00000000000..4c78844d266
--- /dev/null
+++ b/src/Backups/renameInCreateQuery.cpp
@@ -0,0 +1,279 @@
+#include <Backups/renameInCreateQuery.h>
+#include <Backups/BackupRenamingConfig.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/evaluateConstantExpression.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    class RenameInCreateQueryTransformMatcher
+    {
+    public:
+        struct Data
+        {
+            BackupRenamingConfigPtr renaming_config;
+            ContextPtr context;
+        };
+
+        static bool needChildVisit(ASTPtr &, const ASTPtr &) { return true; }
+
+        static void visit(ASTPtr & ast, const Data & data)
+        {
+            if (auto * create = ast->as<ASTCreateQuery>())
+                visitCreateQuery(*create, data);
+            else if (auto * expr = ast->as<ASTTableExpression>())
+                visitTableExpression(*expr, data);
+            else if (auto * function = ast->as<ASTFunction>())
+                visitFunction(*function, data);
+            else if (auto * dictionary = ast->as<ASTDictionary>())
+                visitDictionary(*dictionary, data);
+        }
+
+    private:
+        /// Replaces names of tables and databases used in a CREATE query, which can be either CREATE TABLE or
+        /// CREATE DICTIONARY or CREATE VIEW or CREATE TEMPORARY TABLE or CREATE DATABASE query.
+        static void visitCreateQuery(ASTCreateQuery & create, const Data & data)
+        {
+            if (create.temporary)
+            {
+                if (create.table.empty())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Table name specified in the CREATE TEMPORARY TABLE query must not be empty");
+                create.table = data.renaming_config->getNewTemporaryTableName(create.table);
+            }
+            else if (create.table.empty())
+            {
+                if (create.database.empty())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Database name specified in the CREATE DATABASE query must not be empty");
+                create.database = data.renaming_config->getNewDatabaseName(create.database);
+            }
+            else
+            {
+                if (create.database.empty())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Database name specified in the CREATE TABLE query must not be empty");
+                std::tie(create.database, create.table) = data.renaming_config->getNewTableName({create.database, create.table});
+            }
+
+            create.uuid = UUIDHelpers::Nil;
+
+            if (!create.as_table.empty() && !create.as_database.empty())
+                std::tie(create.as_database, create.as_table) = data.renaming_config->getNewTableName({create.as_database, create.as_table});
+
+            if (!create.to_table_id.table_name.empty() && !create.to_table_id.database_name.empty())
+            {
+                auto to_table = data.renaming_config->getNewTableName({create.to_table_id.database_name, create.to_table_id.table_name});
+                create.to_table_id = StorageID{to_table.first, to_table.second};
+            }
+        }
+
+        /// Replaces names of a database and a table in a expression like `db`.`table`
+        static void visitTableExpression(ASTTableExpression & expr, const Data & data)
+        {
+            if (!expr.database_and_table_name)
+                return;
+
+            ASTIdentifier * id = expr.database_and_table_name->as<ASTIdentifier>();
+            if (!id)
+                return;
+
+            auto table_id = id->createTable();
+            if (!table_id)
+                return;
+
+            const String & db_name = table_id->getDatabaseName();
+            const String & table_name = table_id->shortName();
+            if (db_name.empty() || table_name.empty())
+                return;
+
+            String new_db_name, new_table_name;
+            std::tie(new_db_name, new_table_name) = data.renaming_config->getNewTableName({db_name, table_name});
+            if ((new_db_name == db_name) && (new_table_name == table_name))
+                return;
+
+            expr.database_and_table_name = std::make_shared<ASTIdentifier>(Strings{new_db_name, new_table_name});
+            expr.children.push_back(expr.database_and_table_name);
+        }
+
+        /// Replaces names of tables and databases used in arguments of a table function or a table engine.
+        static void visitFunction(ASTFunction & function, const Data & data)
+        {
+            if ((function.name == "merge") || (function.name == "Merge"))
+            {
+                visitFunctionMerge(function, data);
+            }
+            else if ((function.name == "remote") || (function.name == "remoteSecure") || (function.name == "cluster") ||
+                     (function.name == "clusterAllReplicas") || (function.name == "Distributed"))
+            {
+                visitFunctionRemote(function, data);
+            }
+        }
+
+        /// Replaces a database's name passed via an argument of the function merge() or the table engine Merge.
+        static void visitFunctionMerge(ASTFunction & function, const Data & data)
+        {
+            if (!function.arguments)
+                return;
+
+            /// The first argument is a database's name and we can rename it.
+            /// The second argument is a regular expression and we can do nothing about it.
+            auto & args = function.arguments->as<ASTExpressionList &>().children;
+            size_t db_name_arg_index = 0;
+            if (args.size() <= db_name_arg_index)
+                return;
+
+            String db_name = evaluateConstantExpressionForDatabaseName(args[db_name_arg_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
+            if (db_name.empty())
+                return;
+
+            String new_db_name = data.renaming_config->getNewDatabaseName(db_name);
+            if (new_db_name == db_name)
+                return;
+            args[db_name_arg_index] = std::make_shared<ASTLiteral>(new_db_name);
+        }
+
+        /// Replaces names of a table and a database passed via arguments of the function remote() or cluster() or the table engine Distributed.
+        static void visitFunctionRemote(ASTFunction & function, const Data & data)
+        {
+            if (!function.arguments)
+                return;
+
+            /// The first argument is an address or cluster's name, so we skip it.
+            /// The second argument can be either 'db.name' or just 'db' followed by the third argument 'table'.
+            auto & args = function.arguments->as<ASTExpressionList &>().children;
+
+            const auto * second_arg_as_function = args[1]->as<ASTFunction>();
+            if (second_arg_as_function && TableFunctionFactory::instance().isTableFunctionName(second_arg_as_function->name))
+                return;
+
+            size_t db_name_index = 1;
+            if (args.size() <= db_name_index)
+                return;
+
+            String name = evaluateConstantExpressionForDatabaseName(args[db_name_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
+
+            size_t table_name_index = static_cast<size_t>(-1);
+
+            QualifiedTableName qualified_name;
+
+            if (function.name == "Distributed")
+                qualified_name.table = name;
+            else
+                qualified_name = QualifiedTableName::parseFromString(name);
+
+            if (qualified_name.database.empty())
+            {
+                std::swap(qualified_name.database, qualified_name.table);
+                table_name_index = 2;
+                if (args.size() <= table_name_index)
+                    return;
+                qualified_name.table = evaluateConstantExpressionForDatabaseName(args[table_name_index], data.context)->as<ASTLiteral &>().value.safeGet<String>();
+            }
+
+            const String & db_name = qualified_name.database;
+            const String & table_name = qualified_name.table;
+
+            if (db_name.empty() || table_name.empty())
+                return;
+
+            String new_db_name, new_table_name;
+            std::tie(new_db_name, new_table_name) = data.renaming_config->getNewTableName({db_name, table_name});
+            if ((new_db_name == db_name) && (new_table_name == table_name))
+                return;
+
+            if (table_name_index != static_cast<size_t>(-1))
+            {
+                if (new_db_name != db_name)
+                    args[db_name_index] = std::make_shared<ASTLiteral>(new_db_name);
+                if (new_table_name != table_name)
+                    args[table_name_index] = std::make_shared<ASTLiteral>(new_table_name);
+            }
+            else
+            {
+                args[db_name_index] = std::make_shared<ASTLiteral>(new_db_name);
+                args.insert(args.begin() + db_name_index + 1, std::make_shared<ASTLiteral>(new_table_name));
+            }
+        }
+
+        /// Replaces names of a table and a database used in source parameters of a dictionary.
+        static void visitDictionary(ASTDictionary & dictionary, const Data & data)
+        {
+            if (!dictionary.source || dictionary.source->name != "clickhouse" || !dictionary.source->elements)
+                return;
+
+            auto & elements = dictionary.source->elements->as<ASTExpressionList &>().children;
+            String db_name, table_name;
+            size_t db_name_index = static_cast<size_t>(-1);
+            size_t table_name_index = static_cast<size_t>(-1);
+
+            for (size_t i = 0; i != elements.size(); ++i)
+            {
+                auto & pair = elements[i]->as<ASTPair &>();
+                if (pair.first == "db")
+                {
+                    if (db_name_index != static_cast<size_t>(-1))
+                        return;
+                    db_name = pair.second->as<ASTLiteral &>().value.safeGet<String>();
+                    db_name_index = i;
+                }
+                else if (pair.first == "table")
+                {
+                    if (table_name_index != static_cast<size_t>(-1))
+                        return;
+                    table_name = pair.second->as<ASTLiteral &>().value.safeGet<String>();
+                    table_name_index = i;
+                }
+            }
+
+            if (db_name.empty() || table_name.empty())
+                return;
+
+            String new_db_name, new_table_name;
+            std::tie(new_db_name, new_table_name) = data.renaming_config->getNewTableName({db_name, table_name});
+            if ((new_db_name == db_name) && (new_table_name == table_name))
+                return;
+
+            if (new_db_name != db_name)
+            {
+                auto & pair = elements[db_name_index]->as<ASTPair &>();
+                pair.replace(pair.second, std::make_shared<ASTLiteral>(new_db_name));
+            }
+            if (new_table_name != table_name)
+            {
+                auto & pair = elements[table_name_index]->as<ASTPair &>();
+                pair.replace(pair.second, std::make_shared<ASTLiteral>(new_table_name));
+            }
+        }
+    };
+
+    using RenameInCreateQueryTransformVisitor = InDepthNodeVisitor<RenameInCreateQueryTransformMatcher, false>;
+}
+
+
+ASTPtr renameInCreateQuery(const ASTPtr & ast, const BackupRenamingConfigPtr & renaming_config, const ContextPtr & context)
+{
+    auto new_ast = ast->clone();
+    try
+    {
+        RenameInCreateQueryTransformVisitor::Data data{renaming_config, context};
+        RenameInCreateQueryTransformVisitor{data}.visit(new_ast);
+        return new_ast;
+    }
+    catch (...)
+    {
+        tryLogCurrentException("Backup", "Error while renaming in AST");
+        return ast;
+    }
+}
+
+}
diff --git a/src/Backups/renameInCreateQuery.h b/src/Backups/renameInCreateQuery.h
new file mode 100644
index 00000000000..9c62d07e5c6
--- /dev/null
+++ b/src/Backups/renameInCreateQuery.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <memory>
+
+namespace DB
+{
+class IAST;
+using ASTPtr = std::shared_ptr<IAST>;
+class Context;
+using ContextPtr = std::shared_ptr<const Context>;
+class BackupRenamingConfig;
+using BackupRenamingConfigPtr = std::shared_ptr<const BackupRenamingConfig>;
+
+/// Changes names in AST according to the renaming settings.
+ASTPtr renameInCreateQuery(const ASTPtr & ast, const BackupRenamingConfigPtr & renaming_config, const ContextPtr & context);
+}
diff --git a/src/Bridge/IBridgeHelper.cpp b/src/Bridge/IBridgeHelper.cpp
index 5c884a2ca3d..01ea1636a12 100644
--- a/src/Bridge/IBridgeHelper.cpp
+++ b/src/Bridge/IBridgeHelper.cpp
@@ -5,6 +5,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
 #include <filesystem>
+#include <thread>
 
 namespace fs = std::filesystem;
 
@@ -112,7 +113,11 @@ std::unique_ptr<ShellCommand> IBridgeHelper::startBridgeCommand()
 
     LOG_TRACE(getLog(), "Starting {}", serviceAlias());
 
-    return ShellCommand::executeDirect(path.string(), cmd_args, ShellCommandDestructorStrategy(true));
+    ShellCommand::Config command_config(path.string());
+    command_config.arguments = cmd_args;
+    command_config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy(true);
+
+    return ShellCommand::executeDirect(command_config);
 }
 
 }
diff --git a/src/Bridge/IBridgeHelper.h b/src/Bridge/IBridgeHelper.h
index 0537658663d..51b201442f1 100644
--- a/src/Bridge/IBridgeHelper.h
+++ b/src/Bridge/IBridgeHelper.h
@@ -6,7 +6,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Common/ShellCommand.h>
 #include <IO/ConnectionTimeoutsContext.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Bridge/LibraryBridgeHelper.cpp b/src/Bridge/LibraryBridgeHelper.cpp
index 95a96074be0..bd0604ec8e0 100644
--- a/src/Bridge/LibraryBridgeHelper.cpp
+++ b/src/Bridge/LibraryBridgeHelper.cpp
@@ -1,10 +1,9 @@
 #include "LibraryBridgeHelper.h"
 
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/OwningBlockInputStream.h>
-#include <DataStreams/formatBlock.h>
+#include <Formats/formatBlock.h>
 #include <Dictionaries/DictionarySourceHelpers.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Formats/IInputFormat.h>
 #include <IO/WriteBufferFromOStream.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -12,8 +11,8 @@
 #include <Formats/FormatFactory.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/ShellCommand.h>
-#include <common/logger_useful.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
 #include <Core/Field.h>
 #include <Common/escapeForFileName.h>
 
@@ -81,6 +80,7 @@ bool LibraryBridgeHelper::bridgeHandShake()
     }
     catch (...)
     {
+        tryLogCurrentException(log);
         return false;
     }
 
@@ -135,8 +135,8 @@ ReadWriteBufferFromHTTP::OutStreamCallback LibraryBridgeHelper::getInitLibraryCa
 {
     /// Sample block must contain null values
     WriteBufferFromOwnString out;
-    auto output_stream = getContext()->getOutputStream(LibraryBridgeHelper::DEFAULT_FORMAT, out, sample_block);
-    formatBlock(output_stream, sample_block);
+    auto output_format = getContext()->getOutputFormat(LibraryBridgeHelper::DEFAULT_FORMAT, out, sample_block);
+    formatBlock(output_format, sample_block);
     auto block_string = out.str();
 
     return [block_string, this](std::ostream & os)
@@ -200,7 +200,7 @@ bool LibraryBridgeHelper::supportsSelectiveLoad()
 }
 
 
-BlockInputStreamPtr LibraryBridgeHelper::loadAll()
+Pipe LibraryBridgeHelper::loadAll()
 {
     startBridgeSync();
     auto uri = createRequestURI(LOAD_ALL_METHOD);
@@ -208,7 +208,7 @@ BlockInputStreamPtr LibraryBridgeHelper::loadAll()
 }
 
 
-BlockInputStreamPtr LibraryBridgeHelper::loadIds(const std::vector<uint64_t> & ids)
+Pipe LibraryBridgeHelper::loadIds(const std::vector<uint64_t> & ids)
 {
     startBridgeSync();
     auto uri = createRequestURI(LOAD_IDS_METHOD);
@@ -218,7 +218,7 @@ BlockInputStreamPtr LibraryBridgeHelper::loadIds(const std::vector<uint64_t> & i
 }
 
 
-BlockInputStreamPtr LibraryBridgeHelper::loadKeys(const Block & requested_block)
+Pipe LibraryBridgeHelper::loadKeys(const Block & requested_block)
 {
     startBridgeSync();
     auto uri = createRequestURI(LOAD_KEYS_METHOD);
@@ -227,8 +227,8 @@ BlockInputStreamPtr LibraryBridgeHelper::loadKeys(const Block & requested_block)
     ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [requested_block, this](std::ostream & os)
     {
         WriteBufferFromOStream out_buffer(os);
-        auto output_stream = getContext()->getOutputStream(LibraryBridgeHelper::DEFAULT_FORMAT, out_buffer, sample_block);
-        formatBlock(output_stream, requested_block);
+        auto output_format = getContext()->getOutputFormat(LibraryBridgeHelper::DEFAULT_FORMAT, out_buffer, requested_block.cloneEmpty());
+        formatBlock(output_format, requested_block);
     };
     return loadBase(uri, out_stream_callback);
 }
@@ -248,7 +248,7 @@ bool LibraryBridgeHelper::executeRequest(const Poco::URI & uri, ReadWriteBufferF
 }
 
 
-BlockInputStreamPtr LibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
+Pipe LibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
 {
     auto read_buf_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
         uri,
@@ -258,10 +258,12 @@ BlockInputStreamPtr LibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWri
         0,
         Poco::Net::HTTPBasicCredentials{},
         DBMS_DEFAULT_BUFFER_SIZE,
+        getContext()->getReadSettings(),
         ReadWriteBufferFromHTTP::HTTPHeaderEntries{});
 
-    auto input_stream = getContext()->getInputFormat(LibraryBridgeHelper::DEFAULT_FORMAT, *read_buf_ptr, sample_block, DEFAULT_BLOCK_SIZE);
-    return std::make_shared<OwningBlockInputStream<ReadWriteBufferFromHTTP>>(input_stream, std::move(read_buf_ptr));
+    auto source = FormatFactory::instance().getInput(LibraryBridgeHelper::DEFAULT_FORMAT, *read_buf_ptr, sample_block, getContext(), DEFAULT_BLOCK_SIZE);
+    source->addBuffer(std::move(read_buf_ptr));
+    return Pipe(std::move(source));
 }
 
 
diff --git a/src/Bridge/LibraryBridgeHelper.h b/src/Bridge/LibraryBridgeHelper.h
index fec644240da..a209fff6ca0 100644
--- a/src/Bridge/LibraryBridgeHelper.h
+++ b/src/Bridge/LibraryBridgeHelper.h
@@ -11,6 +11,8 @@
 namespace DB
 {
 
+class Pipe;
+
 class LibraryBridgeHelper : public IBridgeHelper
 {
 
@@ -36,13 +38,13 @@ public:
 
     bool supportsSelectiveLoad();
 
-    BlockInputStreamPtr loadAll();
+    Pipe loadAll();
 
-    BlockInputStreamPtr loadIds(const std::vector<uint64_t> & ids);
+    Pipe loadIds(const std::vector<uint64_t> & ids);
 
-    BlockInputStreamPtr loadKeys(const Block & requested_block);
+    Pipe loadKeys(const Block & requested_block);
 
-    BlockInputStreamPtr loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
+    Pipe loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {});
 
     bool executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = {}) const;
 
diff --git a/src/Bridge/XDBCBridgeHelper.h b/src/Bridge/XDBCBridgeHelper.h
index b3613c381d0..80d9610f837 100644
--- a/src/Bridge/XDBCBridgeHelper.h
+++ b/src/Bridge/XDBCBridgeHelper.h
@@ -11,13 +11,11 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/ShellCommand.h>
 #include <IO/ConnectionTimeoutsContext.h>
-#include <common/logger_useful.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
 #include <Bridge/IBridgeHelper.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 
 namespace DB
diff --git a/src/Bridge/ya.make b/src/Bridge/ya.make
deleted file mode 100644
index e900bab036e..00000000000
--- a/src/Bridge/ya.make
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    IBridgeHelper.cpp
-    LibraryBridgeHelper.cpp
-
-)
-
-END()
diff --git a/src/Bridge/ya.make.in b/src/Bridge/ya.make.in
deleted file mode 100644
index 5fa69cec4bb..00000000000
--- a/src/Bridge/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a99201e4aaa..87e6cc86d94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,10 +45,11 @@ if (COMPILER_GCC)
 endif ()
 
 add_subdirectory (Access)
+add_subdirectory (Backups)
 add_subdirectory (Columns)
 add_subdirectory (Common)
 add_subdirectory (Core)
-add_subdirectory (DataStreams)
+add_subdirectory (QueryPipeline)
 add_subdirectory (DataTypes)
 add_subdirectory (Dictionaries)
 add_subdirectory (Disks)
@@ -76,6 +77,7 @@ add_headers_and_sources(clickhouse_common_io IO)
 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)
 if (USE_SQLITE)
     add_headers_and_sources(dbms Databases/SQLite)
 endif()
@@ -108,6 +110,10 @@ if (USE_HDFS)
     add_headers_and_sources(dbms Disks/HDFS)
 endif()
 
+if(USE_FILELOG)
+    add_headers_and_sources(dbms Storages/FileLog)
+endif()
+
 list (APPEND clickhouse_common_io_sources ${CONFIG_BUILD})
 list (APPEND clickhouse_common_io_headers ${CONFIG_VERSION} ${CONFIG_COMMON})
 
@@ -158,6 +164,8 @@ else()
     target_link_libraries (clickhouse_new_delete PRIVATE clickhouse_common_io jemalloc)
 endif()
 
+target_link_libraries (clickhouse_common_io PRIVATE jemalloc)
+
 add_subdirectory(Common/ZooKeeper)
 add_subdirectory(Common/Config)
 
@@ -178,10 +186,11 @@ macro(add_object_library name common_path)
 endmacro()
 
 add_object_library(clickhouse_access Access)
+add_object_library(clickhouse_backups Backups)
 add_object_library(clickhouse_core Core)
 add_object_library(clickhouse_core_mysql Core/MySQL)
 add_object_library(clickhouse_compression Compression)
-add_object_library(clickhouse_datastreams DataStreams)
+add_object_library(clickhouse_querypipeline QueryPipeline)
 add_object_library(clickhouse_datatypes DataTypes)
 add_object_library(clickhouse_datatypes_serializations DataTypes/Serializations)
 add_object_library(clickhouse_databases Databases)
@@ -208,7 +217,9 @@ add_object_library(clickhouse_processors_formats Processors/Formats)
 add_object_library(clickhouse_processors_formats_impl Processors/Formats/Impl)
 add_object_library(clickhouse_processors_transforms Processors/Transforms)
 add_object_library(clickhouse_processors_sources Processors/Sources)
+add_object_library(clickhouse_processors_sinks Processors/Sinks)
 add_object_library(clickhouse_processors_merges Processors/Merges)
+add_object_library(clickhouse_processors_ttl Processors/TTL)
 add_object_library(clickhouse_processors_merges_algorithms Processors/Merges/Algorithms)
 add_object_library(clickhouse_processors_queryplan Processors/QueryPlan)
 add_object_library(clickhouse_processors_queryplan_optimizations Processors/QueryPlan/Optimizations)
@@ -257,7 +268,7 @@ dbms_target_include_directories (PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickH
 target_include_directories (clickhouse_common_io PUBLIC "${ClickHouse_SOURCE_DIR}/src" "${ClickHouse_BINARY_DIR}/src")
 
 if (USE_EMBEDDED_COMPILER)
-    dbms_target_link_libraries (PRIVATE ${REQUIRED_LLVM_LIBRARIES})
+    dbms_target_link_libraries (PUBLIC ${REQUIRED_LLVM_LIBRARIES})
     dbms_target_include_directories (SYSTEM BEFORE PUBLIC ${LLVM_INCLUDE_DIRS})
 endif ()
 
@@ -279,6 +290,14 @@ target_link_libraries (clickhouse_common_io
             dragonbox_to_chars
 )
 
+# Use X86 AVX2/AVX512 instructions to accelerate filter operations
+set_source_files_properties(
+        Columns/ColumnFixedString.cpp
+        Columns/ColumnsCommon.cpp
+        Columns/ColumnVector.cpp
+        Columns/ColumnDecimal.cpp
+        PROPERTIES COMPILE_FLAGS "${X86_INTRINSICS_FLAGS}")
+
 if(RE2_LIBRARY)
     target_link_libraries(clickhouse_common_io PUBLIC ${RE2_LIBRARY})
 endif()
@@ -297,10 +316,11 @@ target_link_libraries(clickhouse_common_io
             ${ZLIB_LIBRARIES}
             pcg_random
             Poco::Foundation
-            roaring
 )
 
-
+# Make dbms depend on roaring instead of clickhouse_common_io so that roaring itself can depend on clickhouse_common_io
+# That way we we can redirect malloc/free functions avoiding circular dependencies
+dbms_target_link_libraries(PUBLIC roaring)
 
 if (USE_RDKAFKA)
     dbms_target_link_libraries(PRIVATE ${CPPKAFKA_LIBRARY} ${RDKAFKA_LIBRARY})
@@ -344,10 +364,20 @@ dbms_target_link_libraries (
         clickhouse_common_io
 )
 
+if (NOT_UNBUNDLED)
+    dbms_target_link_libraries (
+        PUBLIC
+            boost::circular_buffer
+            boost::heap
+    )
+endif()
+
 target_include_directories(clickhouse_common_io PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include") # uses some includes from core
 dbms_target_include_directories(PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/Core/include")
 
+target_include_directories(clickhouse_common_io BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR})
 dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR})
+target_include_directories(clickhouse_common_io BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR})
 dbms_target_include_directories(SYSTEM BEFORE PUBLIC ${MINISELECT_INCLUDE_DIR})
 
 if (ZSTD_LIBRARY)
@@ -471,6 +501,8 @@ if (USE_DATASKETCHES)
     target_include_directories (clickhouse_aggregate_functions SYSTEM BEFORE PRIVATE ${DATASKETCHES_INCLUDE_DIR})
 endif ()
 
+target_link_libraries (clickhouse_common_io PRIVATE lz4)
+
 dbms_target_link_libraries(PRIVATE _boost_context)
 
 if (USE_NLP)
@@ -479,6 +511,11 @@ if (USE_NLP)
     dbms_target_link_libraries (PUBLIC lemmagen)
 endif()
 
+if (USE_BZIP2)
+    target_link_libraries (clickhouse_common_io PRIVATE ${BZIP2_LIBRARY})
+    target_include_directories (clickhouse_common_io SYSTEM BEFORE PRIVATE ${BZIP2_INCLUDE_DIR})
+endif()
+
 include ("${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake")
 
 if (ENABLE_TESTS AND USE_GTEST)
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
new file mode 100644
index 00000000000..ed90c777e20
--- /dev/null
+++ b/src/Client/ClientBase.cpp
@@ -0,0 +1,1698 @@
+#include <Client/ClientBase.h>
+
+#include <iostream>
+#include <iomanip>
+#include <filesystem>
+
+#include <base/argsToConfig.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <base/LineReader.h>
+#include <base/scope_guard_safe.h>
+#include "Columns/ColumnString.h"
+#include "Columns/ColumnsNumber.h"
+#include "Core/Block.h"
+#include "Core/Protocol.h"
+
+#include <Common/config_version.h>
+#include <Common/UTF8Helpers.h>
+#include <Common/TerminalSize.h>
+#include <Common/clearPasswordFromCommandLine.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/Config/configReadClient.h>
+#include <Common/NetException.h>
+#include <Storages/ColumnsDescription.h>
+
+#include <Client/ClientBaseHelpers.h>
+
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTUseQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+
+#include <Processors/Formats/Impl/NullFormat.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+#include <Interpreters/ReplaceQueryParameterVisitor.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/CompressionMethod.h>
+#include <Client/InternalTextLogs.h>
+
+namespace fs = std::filesystem;
+
+
+namespace DB
+{
+
+static const NameSet exit_strings{"exit", "quit", "logout", "учше", "йгше", "дщпщге", "exit;", "quit;", "logout;", "учшеж", "йгшеж", "дщпщгеж", "q", "й", "\\q", "\\Q", "\\й", "\\Й", ":q", "Жй"};
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int DEADLOCK_AVOIDED;
+    extern const int CLIENT_OUTPUT_FORMAT_SPECIFIED;
+    extern const int UNKNOWN_PACKET_FROM_SERVER;
+    extern const int NO_DATA_TO_INSERT;
+    extern const int UNEXPECTED_PACKET_FROM_SERVER;
+    extern const int INVALID_USAGE_OF_INPUT;
+    extern const int CANNOT_SET_SIGNAL_HANDLER;
+    extern const int UNRECOGNIZED_ARGUMENTS;
+}
+
+}
+
+namespace ProfileEvents
+{
+    extern const Event UserTimeMicroseconds;
+    extern const Event SystemTimeMicroseconds;
+}
+
+namespace DB
+{
+
+
+std::atomic_flag exit_on_signal = ATOMIC_FLAG_INIT;
+
+class QueryInterruptHandler : private boost::noncopyable
+{
+public:
+    QueryInterruptHandler() { exit_on_signal.clear(); }
+
+    ~QueryInterruptHandler() { exit_on_signal.test_and_set(); }
+
+    static bool cancelled() { return exit_on_signal.test(); }
+};
+
+/// This signal handler is set only for sigint.
+void interruptSignalHandler(int signum)
+{
+    if (exit_on_signal.test_and_set())
+        _exit(signum);
+}
+
+ClientBase::~ClientBase() = default;
+ClientBase::ClientBase() = default;
+
+void ClientBase::setupSignalHandler()
+{
+     exit_on_signal.test_and_set();
+
+     struct sigaction new_act;
+     memset(&new_act, 0, sizeof(new_act));
+
+     new_act.sa_handler = interruptSignalHandler;
+     new_act.sa_flags = 0;
+
+#if defined(OS_DARWIN)
+    sigemptyset(&new_act.sa_mask);
+#else
+     if (sigemptyset(&new_act.sa_mask))
+        throw Exception(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler.");
+#endif
+
+     if (sigaction(SIGINT, &new_act, nullptr))
+        throw Exception(ErrorCodes::CANNOT_SET_SIGNAL_HANDLER, "Cannot set signal handler.");
+}
+
+
+ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, bool allow_multi_statements) const
+{
+    ParserQuery parser(end);
+    ASTPtr res;
+
+    const auto & settings = global_context->getSettingsRef();
+    size_t max_length = 0;
+
+    if (!allow_multi_statements)
+        max_length = settings.max_query_size;
+
+    if (is_interactive || ignore_error)
+    {
+        String message;
+        res = tryParseQuery(parser, pos, end, message, true, "", allow_multi_statements, max_length, settings.max_parser_depth);
+
+        if (!res)
+        {
+            std::cerr << std::endl << message << std::endl << std::endl;
+            return nullptr;
+        }
+    }
+    else
+    {
+        res = parseQueryAndMovePosition(parser, pos, end, "", allow_multi_statements, max_length, settings.max_parser_depth);
+    }
+
+    if (is_interactive)
+    {
+        std::cout << std::endl;
+        WriteBufferFromOStream res_buf(std::cout, 4096);
+        formatAST(*res, res_buf);
+        res_buf.next();
+        std::cout << std::endl << std::endl;
+    }
+
+    return res;
+}
+
+
+// Consumes trailing semicolons and tries to consume the same-line trailing
+// comment.
+void ClientBase::adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, int max_parser_depth)
+{
+    // We have to skip the trailing semicolon that might be left
+    // after VALUES parsing or just after a normal semicolon-terminated query.
+    Tokens after_query_tokens(this_query_end, all_queries_end);
+    IParser::Pos after_query_iterator(after_query_tokens, max_parser_depth);
+    while (after_query_iterator.isValid() && after_query_iterator->type == TokenType::Semicolon)
+    {
+        this_query_end = after_query_iterator->end;
+        ++after_query_iterator;
+    }
+
+    // Now we have to do some extra work to add the trailing
+    // same-line comment to the query, but preserve the leading
+    // comments of the next query. The trailing comment is important
+    // because the test hints are usually written this way, e.g.:
+    // select nonexistent_column; -- { serverError 12345 }.
+    // The token iterator skips comments and whitespace, so we have
+    // to find the newline in the string manually. If it's earlier
+    // than the next significant token, it means that the text before
+    // newline is some trailing whitespace or comment, and we should
+    // add it to our query. There are also several special cases
+    // that are described below.
+    const auto * newline = find_first_symbols<'\n'>(this_query_end, all_queries_end);
+    const char * next_query_begin = after_query_iterator->begin;
+
+    // We include the entire line if the next query starts after
+    // it. This is a generic case of trailing in-line comment.
+    // The "equals" condition is for case of end of input (they both equal
+    // all_queries_end);
+    if (newline <= next_query_begin)
+    {
+        assert(newline >= this_query_end);
+        this_query_end = newline;
+    }
+    else
+    {
+        // Many queries on one line, can't do anything. By the way, this
+        // syntax is probably going to work as expected:
+        // select nonexistent /* { serverError 12345 } */; select 1
+    }
+}
+
+
+/// Convert external tables to ExternalTableData and send them using the connection.
+void ClientBase::sendExternalTables(ASTPtr parsed_query)
+{
+    const auto * select = parsed_query->as<ASTSelectWithUnionQuery>();
+    if (!select && !external_tables.empty())
+        throw Exception("External tables could be sent only with select query", ErrorCodes::BAD_ARGUMENTS);
+
+    std::vector<ExternalTableDataPtr> data;
+    for (auto & table : external_tables)
+        data.emplace_back(table.getData(global_context));
+
+    if (send_external_tables)
+        connection->sendExternalTablesData(data);
+}
+
+
+void ClientBase::onData(Block & block, ASTPtr parsed_query)
+{
+    if (!block)
+        return;
+
+    processed_rows += block.rows();
+
+    /// Even if all blocks are empty, we still need to initialize the output stream to write empty resultset.
+    initBlockOutputStream(block, parsed_query);
+
+    /// The header block containing zero rows was used to initialize
+    /// output_format, do not output it.
+    /// Also do not output too much data if we're fuzzing.
+    if (block.rows() == 0 || (query_fuzzer_runs != 0 && processed_rows >= 100))
+        return;
+
+    if (need_render_progress && (stdout_is_a_tty || is_interactive))
+        progress_indication.clearProgressOutput();
+
+    output_format->write(materializeBlock(block));
+    written_first_block = true;
+
+    /// Received data block is immediately displayed to the user.
+    output_format->flush();
+
+    /// Restore progress bar after data block.
+    if (need_render_progress && (stdout_is_a_tty || is_interactive))
+        progress_indication.writeProgress();
+}
+
+
+void ClientBase::onLogData(Block & block)
+{
+    initLogsOutputStream();
+    progress_indication.clearProgressOutput();
+    logs_out_stream->writeLogs(block);
+    logs_out_stream->flush();
+}
+
+
+void ClientBase::onTotals(Block & block, ASTPtr parsed_query)
+{
+    initBlockOutputStream(block, parsed_query);
+    output_format->setTotals(block);
+}
+
+
+void ClientBase::onExtremes(Block & block, ASTPtr parsed_query)
+{
+    initBlockOutputStream(block, parsed_query);
+    output_format->setExtremes(block);
+}
+
+
+void ClientBase::onReceiveExceptionFromServer(std::unique_ptr<Exception> && e)
+{
+    have_error = true;
+    server_exception = std::move(e);
+    resetOutput();
+}
+
+
+void ClientBase::onProfileInfo(const ProfileInfo & profile_info)
+{
+    if (profile_info.hasAppliedLimit() && output_format)
+        output_format->setRowsBeforeLimit(profile_info.getRowsBeforeLimit());
+}
+
+
+void ClientBase::initBlockOutputStream(const Block & block, ASTPtr parsed_query)
+{
+    if (!output_format)
+    {
+        /// Ignore all results when fuzzing as they can be huge.
+        if (query_fuzzer_runs)
+        {
+            output_format = std::make_shared<NullOutputFormat>(block);
+            return;
+        }
+
+        WriteBuffer * out_buf = nullptr;
+        String pager = config().getString("pager", "");
+        if (!pager.empty())
+        {
+            signal(SIGPIPE, SIG_IGN);
+
+            ShellCommand::Config config(pager);
+            config.pipe_stdin_only = true;
+            pager_cmd = ShellCommand::execute(config);
+            out_buf = &pager_cmd->in;
+        }
+        else
+        {
+            out_buf = &std_out;
+        }
+
+        String current_format = format;
+
+        /// The query can specify output format or output file.
+        /// FIXME: try to prettify this cast using `as<>()`
+        if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(parsed_query.get()))
+        {
+            if (query_with_output->out_file)
+            {
+                const auto & out_file_node = query_with_output->out_file->as<ASTLiteral &>();
+                const auto & out_file = out_file_node.value.safeGet<std::string>();
+
+                std::string compression_method;
+                if (query_with_output->compression)
+                {
+                    const auto & compression_method_node = query_with_output->compression->as<ASTLiteral &>();
+                    compression_method = compression_method_node.value.safeGet<std::string>();
+                }
+
+                out_file_buf = wrapWriteBufferWithCompressionMethod(
+                    std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
+                    chooseCompressionMethod(out_file, compression_method),
+                    /* compression level = */ 3
+                );
+
+                // We are writing to file, so default format is the same as in non-interactive mode.
+                if (is_interactive && is_default_format)
+                    current_format = "TabSeparated";
+            }
+            if (query_with_output->format != nullptr)
+            {
+                if (has_vertical_output_suffix)
+                    throw Exception("Output format already specified", ErrorCodes::CLIENT_OUTPUT_FORMAT_SPECIFIED);
+                const auto & id = query_with_output->format->as<ASTIdentifier &>();
+                current_format = id.name();
+            }
+        }
+
+        if (has_vertical_output_suffix)
+            current_format = "Vertical";
+
+        /// It is not clear how to write progress with parallel formatting. It may increase code complexity significantly.
+        if (!need_render_progress)
+            output_format = global_context->getOutputFormatParallelIfPossible(current_format, out_file_buf ? *out_file_buf : *out_buf, block);
+        else
+            output_format = global_context->getOutputFormat(current_format, out_file_buf ? *out_file_buf : *out_buf, block);
+
+        output_format->doWritePrefix();
+    }
+}
+
+
+void ClientBase::initLogsOutputStream()
+{
+    if (!logs_out_stream)
+    {
+        WriteBuffer * wb = out_logs_buf.get();
+
+        if (!out_logs_buf)
+        {
+            if (server_logs_file.empty())
+            {
+                /// Use stderr by default
+                out_logs_buf = std::make_unique<WriteBufferFromFileDescriptor>(STDERR_FILENO);
+                wb = out_logs_buf.get();
+            }
+            else if (server_logs_file == "-")
+            {
+                /// Use stdout if --server_logs_file=- specified
+                wb = &std_out;
+            }
+            else
+            {
+                out_logs_buf
+                    = std::make_unique<WriteBufferFromFile>(server_logs_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_APPEND | O_CREAT);
+                wb = out_logs_buf.get();
+            }
+        }
+
+        logs_out_stream = std::make_unique<InternalTextLogs>(*wb, stdout_is_a_tty);
+    }
+}
+
+
+void ClientBase::processTextAsSingleQuery(const String & full_query)
+{
+    /// Some parts of a query (result output and formatting) are executed
+    /// client-side. Thus we need to parse the query.
+    const char * begin = full_query.data();
+    auto parsed_query = parseQuery(begin, begin + full_query.size(), false);
+
+    if (!parsed_query)
+        return;
+
+    String query_to_execute;
+
+    // An INSERT query may have the data that follow query text. Remove the
+    /// Send part of query without data, because data will be sent separately.
+    auto * insert = parsed_query->as<ASTInsertQuery>();
+    if (insert && insert->data)
+        query_to_execute = full_query.substr(0, insert->data - full_query.data());
+    else
+        query_to_execute = full_query;
+
+    try
+    {
+        processParsedSingleQuery(full_query, query_to_execute, parsed_query);
+    }
+    catch (Exception & e)
+    {
+        if (!is_interactive)
+            e.addMessage("(in query: {})", full_query);
+        throw;
+    }
+
+    if (have_error)
+        processError(full_query);
+}
+
+
+void ClientBase::processOrdinaryQuery(const String & query_to_execute, ASTPtr parsed_query)
+{
+    /// Rewrite query only when we have query parameters.
+    /// Note that if query is rewritten, comments in query are lost.
+    /// But the user often wants to see comments in server logs, query log, processlist, etc.
+    auto query = query_to_execute;
+    if (!query_parameters.empty())
+    {
+        /// Replace ASTQueryParameter with ASTLiteral for prepared statements.
+        ReplaceQueryParameterVisitor visitor(query_parameters);
+        visitor.visit(parsed_query);
+
+        /// Get new query after substitutions. Note that it cannot be done for INSERT query with embedded data.
+        query = serializeAST(*parsed_query);
+    }
+
+    int retries_left = 10;
+    while (retries_left)
+    {
+        try
+        {
+            connection->sendQuery(
+                connection_parameters.timeouts,
+                query,
+                global_context->getCurrentQueryId(),
+                query_processing_stage,
+                &global_context->getSettingsRef(),
+                &global_context->getClientInfo(),
+                true);
+
+            if (send_external_tables)
+                sendExternalTables(parsed_query);
+
+            receiveResult(parsed_query);
+
+            break;
+        }
+        catch (const Exception & e)
+        {
+            /// Retry when the server said "Client should retry" and no rows
+            /// has been received yet.
+            if (processed_rows == 0 && e.code() == ErrorCodes::DEADLOCK_AVOIDED && --retries_left)
+            {
+                std::cerr << "Got a transient error from the server, will"
+                        << " retry (" << retries_left << " retries left)";
+            }
+            else
+            {
+                throw;
+            }
+        }
+    }
+    assert(retries_left > 0);
+}
+
+
+/// Receives and processes packets coming from server.
+/// Also checks if query execution should be cancelled.
+void ClientBase::receiveResult(ASTPtr parsed_query)
+{
+    bool cancelled = false;
+    QueryInterruptHandler query_interrupt_handler;
+
+    // TODO: get the poll_interval from commandline.
+    const auto receive_timeout = connection_parameters.timeouts.receive_timeout;
+    constexpr size_t default_poll_interval = 1000000; /// in microseconds
+    constexpr size_t min_poll_interval = 5000; /// in microseconds
+    const size_t poll_interval
+        = std::max(min_poll_interval, std::min<size_t>(receive_timeout.totalMicroseconds(), default_poll_interval));
+
+    bool break_on_timeout = connection->getConnectionType() != IServerConnection::Type::LOCAL;
+    while (true)
+    {
+        Stopwatch receive_watch(CLOCK_MONOTONIC_COARSE);
+
+        while (true)
+        {
+            /// Has the Ctrl+C been pressed and thus the query should be cancelled?
+            /// If this is the case, inform the server about it and receive the remaining packets
+            /// to avoid losing sync.
+            if (!cancelled)
+            {
+                auto cancel_query = [&] {
+                    connection->sendCancel();
+                    if (is_interactive)
+                    {
+                        progress_indication.clearProgressOutput();
+                        std::cout << "Cancelling query." << std::endl;
+
+                    }
+                    cancelled = true;
+                };
+
+                /// handler received sigint
+                if (query_interrupt_handler.cancelled())
+                {
+                    cancel_query();
+                }
+                else
+                {
+                    double elapsed = receive_watch.elapsedSeconds();
+                    if (break_on_timeout && elapsed > receive_timeout.totalSeconds())
+                    {
+                        std::cout << "Timeout exceeded while receiving data from server."
+                                    << " Waited for " << static_cast<size_t>(elapsed) << " seconds,"
+                                    << " timeout is " << receive_timeout.totalSeconds() << " seconds." << std::endl;
+
+                        cancel_query();
+                    }
+                }
+            }
+
+            /// Poll for changes after a cancellation check, otherwise it never reached
+            /// because of progress updates from server.
+
+            if (connection->poll(poll_interval))
+                break;
+        }
+
+        if (!receiveAndProcessPacket(parsed_query, cancelled))
+            break;
+    }
+
+    if (cancelled && is_interactive)
+        std::cout << "Query was cancelled." << std::endl;
+}
+
+
+/// Receive a part of the result, or progress info or an exception and process it.
+/// Returns true if one should continue receiving packets.
+/// Output of result is suppressed if query was cancelled.
+bool ClientBase::receiveAndProcessPacket(ASTPtr parsed_query, bool cancelled)
+{
+    Packet packet = connection->receivePacket();
+
+    switch (packet.type)
+    {
+        case Protocol::Server::PartUUIDs:
+            return true;
+
+        case Protocol::Server::Data:
+            if (!cancelled)
+                onData(packet.block, parsed_query);
+            return true;
+
+        case Protocol::Server::Progress:
+            onProgress(packet.progress);
+            return true;
+
+        case Protocol::Server::ProfileInfo:
+            onProfileInfo(packet.profile_info);
+            return true;
+
+        case Protocol::Server::Totals:
+            if (!cancelled)
+                onTotals(packet.block, parsed_query);
+            return true;
+
+        case Protocol::Server::Extremes:
+            if (!cancelled)
+                onExtremes(packet.block, parsed_query);
+            return true;
+
+        case Protocol::Server::Exception:
+            onReceiveExceptionFromServer(std::move(packet.exception));
+            return false;
+
+        case Protocol::Server::Log:
+            onLogData(packet.block);
+            return true;
+
+        case Protocol::Server::EndOfStream:
+            onEndOfStream();
+            return false;
+
+        case Protocol::Server::ProfileEvents:
+            onProfileEvents(packet.block);
+            return true;
+
+        default:
+            throw Exception(
+                ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from server {}", packet.type, connection->getDescription());
+    }
+}
+
+
+void ClientBase::onProgress(const Progress & value)
+{
+    if (!progress_indication.updateProgress(value))
+    {
+        // Just a keep-alive update.
+        return;
+    }
+
+    if (output_format)
+        output_format->onProgress(value);
+
+    if (need_render_progress)
+        progress_indication.writeProgress();
+}
+
+
+void ClientBase::onEndOfStream()
+{
+    progress_indication.clearProgressOutput();
+
+    if (output_format)
+        output_format->doWriteSuffix();
+
+    resetOutput();
+
+    if (is_interactive && !written_first_block)
+    {
+        progress_indication.clearProgressOutput();
+        std::cout << "Ok." << std::endl;
+    }
+}
+
+
+void ClientBase::onProfileEvents(Block & block)
+{
+    const auto rows = block.rows();
+    if (rows == 0)
+        return;
+
+    if (progress_indication.print_hardware_utilization)
+    {
+        const auto & array_thread_id = typeid_cast<const ColumnUInt64 &>(*block.getByName("thread_id").column).getData();
+        const auto & names = typeid_cast<const ColumnString &>(*block.getByName("name").column);
+        const auto & host_names = typeid_cast<const ColumnString &>(*block.getByName("host_name").column);
+        const auto & array_values = typeid_cast<const ColumnUInt64 &>(*block.getByName("value").column).getData();
+
+        const auto * user_time_name = ProfileEvents::getName(ProfileEvents::UserTimeMicroseconds);
+        const auto * system_time_name = ProfileEvents::getName(ProfileEvents::SystemTimeMicroseconds);
+
+        HostToThreadTimesMap thread_times;
+        for (size_t i = 0; i < rows; ++i)
+        {
+            auto thread_id = array_thread_id[i];
+            auto host_name = host_names.getDataAt(i).toString();
+            if (thread_id != 0)
+                progress_indication.addThreadIdToList(host_name, thread_id);
+            auto event_name = names.getDataAt(i);
+            auto value = array_values[i];
+            if (event_name == user_time_name)
+            {
+                thread_times[host_name][thread_id].user_ms = value;
+            }
+            else if (event_name == system_time_name)
+            {
+                thread_times[host_name][thread_id].system_ms = value;
+            }
+            else if (event_name == MemoryTracker::USAGE_EVENT_NAME)
+            {
+                thread_times[host_name][thread_id].memory_usage = value;
+            }
+        }
+        progress_indication.updateThreadEventData(thread_times);
+    }
+
+    if (profile_events.print)
+    {
+        if (profile_events.watch.elapsedMilliseconds() >= profile_events.delay_ms)
+        {
+            initLogsOutputStream();
+            progress_indication.clearProgressOutput();
+            logs_out_stream->writeProfileEvents(block);
+            logs_out_stream->flush();
+
+            profile_events.watch.restart();
+            profile_events.last_block = {};
+        }
+        else
+        {
+            profile_events.last_block = block;
+        }
+    }
+}
+
+
+/// Flush all buffers.
+void ClientBase::resetOutput()
+{
+    output_format.reset();
+    logs_out_stream.reset();
+
+    if (pager_cmd)
+    {
+        pager_cmd->in.close();
+        pager_cmd->wait();
+    }
+    pager_cmd = nullptr;
+
+    if (out_file_buf)
+    {
+        out_file_buf->next();
+        out_file_buf.reset();
+    }
+
+    if (out_logs_buf)
+    {
+        out_logs_buf->next();
+        out_logs_buf.reset();
+    }
+
+    std_out.next();
+}
+
+
+/// Receive the block that serves as an example of the structure of table where data will be inserted.
+bool ClientBase::receiveSampleBlock(Block & out, ColumnsDescription & columns_description, ASTPtr parsed_query)
+{
+    while (true)
+    {
+        Packet packet = connection->receivePacket();
+
+        switch (packet.type)
+        {
+            case Protocol::Server::Data:
+                out = packet.block;
+                return true;
+
+            case Protocol::Server::Exception:
+                onReceiveExceptionFromServer(std::move(packet.exception));
+                return false;
+
+            case Protocol::Server::Log:
+                onLogData(packet.block);
+                break;
+
+            case Protocol::Server::TableColumns:
+                columns_description = ColumnsDescription::parse(packet.multistring_message[1]);
+                return receiveSampleBlock(out, columns_description, parsed_query);
+
+            default:
+                throw NetException(
+                    "Unexpected packet from server (expected Data, Exception or Log, got "
+                        + String(Protocol::Server::toString(packet.type)) + ")",
+                    ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
+        }
+    }
+}
+
+
+void ClientBase::processInsertQuery(const String & query_to_execute, ASTPtr parsed_query)
+{
+    /// Process the query that requires transferring data blocks to the server.
+    const auto parsed_insert_query = parsed_query->as<ASTInsertQuery &>();
+    if ((!parsed_insert_query.data && !parsed_insert_query.infile) && (is_interactive || (!stdin_is_a_tty && std_in.eof())))
+        throw Exception("No data to insert", ErrorCodes::NO_DATA_TO_INSERT);
+
+    connection->sendQuery(
+        connection_parameters.timeouts,
+        query_to_execute,
+        global_context->getCurrentQueryId(),
+        query_processing_stage,
+        &global_context->getSettingsRef(),
+        &global_context->getClientInfo(),
+        true);
+
+    if (send_external_tables)
+        sendExternalTables(parsed_query);
+
+    /// Receive description of table structure.
+    Block sample;
+    ColumnsDescription columns_description;
+    if (receiveSampleBlock(sample, columns_description, parsed_query))
+    {
+        /// If structure was received (thus, server has not thrown an exception),
+        /// send our data with that structure.
+        sendData(sample, columns_description, parsed_query);
+        receiveEndOfQuery();
+    }
+}
+
+
+void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_description, ASTPtr parsed_query)
+{
+    /// If INSERT data must be sent.
+    auto * parsed_insert_query = parsed_query->as<ASTInsertQuery>();
+    if (!parsed_insert_query)
+        return;
+
+    if (need_render_progress)
+    {
+        /// Set total_bytes_to_read for current fd.
+        FileProgress file_progress(0, std_in.size());
+        progress_indication.updateProgress(Progress(file_progress));
+
+        /// Set callback to be called on file progress.
+        progress_indication.setFileProgressCallback(global_context, true);
+    }
+
+    /// If data fetched from file (maybe compressed file)
+    if (parsed_insert_query->infile)
+    {
+        /// Get name of this file (path to file)
+        const auto & in_file_node = parsed_insert_query->infile->as<ASTLiteral &>();
+        const auto in_file = in_file_node.value.safeGet<std::string>();
+
+        std::string compression_method;
+        /// Compression method can be specified in query
+        if (parsed_insert_query->compression)
+        {
+            const auto & compression_method_node = parsed_insert_query->compression->as<ASTLiteral &>();
+            compression_method = compression_method_node.value.safeGet<std::string>();
+        }
+
+        /// Otherwise, it will be detected from file name automatically (by chooseCompressionMethod)
+        /// Buffer for reading from file is created and wrapped with appropriate compression method
+        auto in_buffer = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromFile>(in_file), chooseCompressionMethod(in_file, compression_method));
+
+        try
+        {
+            sendDataFrom(*in_buffer, sample, columns_description, parsed_query);
+        }
+        catch (Exception & e)
+        {
+            e.addMessage("data for INSERT was parsed from file");
+            throw;
+        }
+    }
+    else if (parsed_insert_query->data)
+    {
+        /// Send data contained in the query.
+        ReadBufferFromMemory data_in(parsed_insert_query->data, parsed_insert_query->end - parsed_insert_query->data);
+        try
+        {
+            sendDataFrom(data_in, sample, columns_description, parsed_query);
+        }
+        catch (Exception & e)
+        {
+            /// The following query will use data from input
+            //      "INSERT INTO data FORMAT TSV\n " < data.csv
+            //  And may be pretty hard to debug, so add information about data source to make it easier.
+            e.addMessage("data for INSERT was parsed from query");
+            throw;
+        }
+        // Remember where the data ended. We use this info later to determine
+        // where the next query begins.
+        parsed_insert_query->end = parsed_insert_query->data + data_in.count();
+    }
+    else if (!is_interactive)
+    {
+        if (need_render_progress)
+        {
+            /// Add callback to track reading from fd.
+            std_in.setProgressCallback(global_context);
+        }
+
+        /// Send data read from stdin.
+        try
+        {
+            sendDataFrom(std_in, sample, columns_description, parsed_query);
+        }
+        catch (Exception & e)
+        {
+            e.addMessage("data for INSERT was parsed from stdin");
+            throw;
+        }
+    }
+    else
+        throw Exception("No data to insert", ErrorCodes::NO_DATA_TO_INSERT);
+}
+
+
+void ClientBase::sendDataFrom(ReadBuffer & buf, Block & sample, const ColumnsDescription & columns_description, ASTPtr parsed_query)
+{
+    String current_format = insert_format;
+
+    /// Data format can be specified in the INSERT query.
+    if (const auto * insert = parsed_query->as<ASTInsertQuery>())
+    {
+        if (!insert->format.empty())
+            current_format = insert->format;
+    }
+
+    auto source = global_context->getInputFormat(current_format, buf, sample, insert_format_max_block_size);
+    Pipe pipe(source);
+
+    if (columns_description.hasDefaults())
+    {
+        pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<AddingDefaultsTransform>(header, columns_description, *source, global_context);
+        });
+    }
+
+    QueryPipeline pipeline(std::move(pipe));
+    PullingAsyncPipelineExecutor executor(pipeline);
+
+    Block block;
+    while (executor.pull(block))
+    {
+        /// Check if server send Log packet
+        receiveLogs(parsed_query);
+
+        /// Check if server send Exception packet
+        auto packet_type = connection->checkPacket(0);
+        if (packet_type && *packet_type == Protocol::Server::Exception)
+        {
+            /**
+             * We're exiting with error, so it makes sense to kill the
+             * input stream without waiting for it to complete.
+             */
+            executor.cancel();
+            return;
+        }
+
+        if (block)
+        {
+            connection->sendData(block, /* name */"", /* scalar */false);
+            processed_rows += block.rows();
+        }
+    }
+
+    connection->sendData({}, "", false);
+}
+
+
+/// Process Log packets, used when inserting data by blocks
+void ClientBase::receiveLogs(ASTPtr parsed_query)
+{
+    auto packet_type = connection->checkPacket(0);
+
+    while (packet_type && *packet_type == Protocol::Server::Log)
+    {
+        receiveAndProcessPacket(parsed_query, false);
+        packet_type = connection->checkPacket(0);
+    }
+}
+
+
+/// Process Log packets, exit when receive Exception or EndOfStream
+bool ClientBase::receiveEndOfQuery()
+{
+    while (true)
+    {
+        Packet packet = connection->receivePacket();
+
+        switch (packet.type)
+        {
+            case Protocol::Server::EndOfStream:
+                onEndOfStream();
+                return true;
+
+            case Protocol::Server::Exception:
+                onReceiveExceptionFromServer(std::move(packet.exception));
+                return false;
+
+            case Protocol::Server::Log:
+                onLogData(packet.block);
+                break;
+
+            case Protocol::Server::Progress:
+                onProgress(packet.progress);
+                return true;
+
+            default:
+                throw NetException(
+                    "Unexpected packet from server (expected Exception, EndOfStream or Log, got "
+                        + String(Protocol::Server::toString(packet.type)) + ")",
+                    ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
+        }
+    }
+}
+
+
+void ClientBase::processParsedSingleQuery(const String & full_query, const String & query_to_execute,
+        ASTPtr parsed_query, std::optional<bool> echo_query_, bool report_error)
+{
+    resetOutput();
+    have_error = false;
+    client_exception.reset();
+    server_exception.reset();
+
+    if (echo_query_ && *echo_query_)
+    {
+        writeString(full_query, std_out);
+        writeChar('\n', std_out);
+        std_out.next();
+    }
+
+    if (is_interactive)
+    {
+        global_context->setCurrentQueryId("");
+        // Generate a new query_id
+        for (const auto & query_id_format : query_id_formats)
+        {
+            writeString(query_id_format.first, std_out);
+            writeString(fmt::format(query_id_format.second, fmt::arg("query_id", global_context->getCurrentQueryId())), std_out);
+            writeChar('\n', std_out);
+            std_out.next();
+        }
+    }
+
+    processed_rows = 0;
+    written_first_block = false;
+    progress_indication.resetProgress();
+    profile_events.watch.restart();
+
+    {
+        /// Temporarily apply query settings to context.
+        std::optional<Settings> old_settings;
+        SCOPE_EXIT_SAFE({
+            if (old_settings)
+                global_context->setSettings(*old_settings);
+        });
+
+        auto apply_query_settings = [&](const IAST & settings_ast)
+        {
+            if (!old_settings)
+                old_settings.emplace(global_context->getSettingsRef());
+            global_context->applySettingsChanges(settings_ast.as<ASTSetQuery>()->changes);
+        };
+
+        const auto * insert = parsed_query->as<ASTInsertQuery>();
+        if (insert && insert->settings_ast)
+            apply_query_settings(*insert->settings_ast);
+
+        /// FIXME: try to prettify this cast using `as<>()`
+        const auto * with_output = dynamic_cast<const ASTQueryWithOutput *>(parsed_query.get());
+        if (with_output && with_output->settings_ast)
+            apply_query_settings(*with_output->settings_ast);
+
+        if (!connection->checkConnected())
+            connect();
+
+        ASTPtr input_function;
+        if (insert && insert->select)
+            insert->tryFindInputFunction(input_function);
+
+        /// INSERT query for which data transfer is needed (not an INSERT SELECT or input()) is processed separately.
+        if (insert && (!insert->select || input_function) && !insert->watch)
+        {
+            if (input_function && insert->format.empty())
+                throw Exception("FORMAT must be specified for function input()", ErrorCodes::INVALID_USAGE_OF_INPUT);
+
+            processInsertQuery(query_to_execute, parsed_query);
+        }
+        else
+            processOrdinaryQuery(query_to_execute, parsed_query);
+    }
+
+    /// Do not change context (current DB, settings) in case of an exception.
+    if (!have_error)
+    {
+        if (const auto * set_query = parsed_query->as<ASTSetQuery>())
+        {
+            /// Save all changes in settings to avoid losing them if the connection is lost.
+            for (const auto & change : set_query->changes)
+            {
+                if (change.name == "profile")
+                    current_profile = change.value.safeGet<String>();
+                else
+                    global_context->applySettingChange(change);
+            }
+        }
+        if (const auto * use_query = parsed_query->as<ASTUseQuery>())
+        {
+            const String & new_database = use_query->database;
+            /// If the client initiates the reconnection, it takes the settings from the config.
+            config().setString("database", new_database);
+            /// If the connection initiates the reconnection, it uses its variable.
+            connection->setDefaultDatabase(new_database);
+        }
+    }
+
+    /// Always print last block (if it was not printed already)
+    if (profile_events.last_block)
+    {
+        initLogsOutputStream();
+        progress_indication.clearProgressOutput();
+        logs_out_stream->writeProfileEvents(profile_events.last_block);
+        logs_out_stream->flush();
+    }
+
+    if (is_interactive)
+    {
+        std::cout << std::endl << processed_rows << " rows in set. Elapsed: " << progress_indication.elapsedSeconds() << " sec. ";
+        progress_indication.writeFinalProgress();
+        std::cout << std::endl << std::endl;
+    }
+    else if (print_time_to_stderr)
+    {
+        std::cerr << progress_indication.elapsedSeconds() << "\n";
+    }
+
+    if (have_error && report_error)
+        processError(full_query);
+}
+
+
+MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
+    const char *& this_query_begin, const char *& this_query_end, const char * all_queries_end,
+    String & query_to_execute, ASTPtr & parsed_query, const String & all_queries_text,
+    std::optional<Exception> & current_exception)
+{
+    if (this_query_begin >= all_queries_end)
+        return MultiQueryProcessingStage::QUERIES_END;
+
+    // Remove leading empty newlines and other whitespace, because they
+    // are annoying to filter in query log. This is mostly relevant for
+    // the tests.
+    while (this_query_begin < all_queries_end && isWhitespaceASCII(*this_query_begin))
+        ++this_query_begin;
+
+    if (this_query_begin >= all_queries_end)
+        return MultiQueryProcessingStage::QUERIES_END;
+
+    // If there are only comments left until the end of file, we just
+    // stop. The parser can't handle this situation because it always
+    // expects that there is some query that it can parse.
+    // We can get into this situation because the parser also doesn't
+    // skip the trailing comments after parsing a query. This is because
+    // they may as well be the leading comments for the next query,
+    // and it makes more sense to treat them as such.
+    {
+        Tokens tokens(this_query_begin, all_queries_end);
+        IParser::Pos token_iterator(tokens, global_context->getSettingsRef().max_parser_depth);
+        if (!token_iterator.isValid())
+            return MultiQueryProcessingStage::QUERIES_END;
+    }
+
+    this_query_end = this_query_begin;
+    try
+    {
+        parsed_query = parseQuery(this_query_end, all_queries_end, true);
+    }
+    catch (Exception & e)
+    {
+        current_exception.emplace(e);
+        return MultiQueryProcessingStage::PARSING_EXCEPTION;
+    }
+
+    if (!parsed_query)
+    {
+        if (ignore_error)
+        {
+            Tokens tokens(this_query_begin, all_queries_end);
+            IParser::Pos token_iterator(tokens, global_context->getSettingsRef().max_parser_depth);
+            while (token_iterator->type != TokenType::Semicolon && token_iterator.isValid())
+                ++token_iterator;
+            this_query_begin = token_iterator->end;
+
+            return MultiQueryProcessingStage::CONTINUE_PARSING;
+        }
+
+        return MultiQueryProcessingStage::PARSING_FAILED;
+    }
+
+    // INSERT queries may have the inserted data in the query text
+    // that follow the query itself, e.g. "insert into t format CSV 1;2".
+    // They need special handling. First of all, here we find where the
+    // inserted data ends. In multy-query mode, it is delimited by a
+    // newline.
+    // The VALUES format needs even more handling -- we also allow the
+    // data to be delimited by semicolon. This case is handled later by
+    // the format parser itself.
+    // We can't do multiline INSERTs with inline data, because most
+    // row input formats (e.g. TSV) can't tell when the input stops,
+    // unlike VALUES.
+    auto * insert_ast = parsed_query->as<ASTInsertQuery>();
+    if (insert_ast && insert_ast->data)
+    {
+        this_query_end = find_first_symbols<'\n'>(insert_ast->data, all_queries_end);
+        insert_ast->end = this_query_end;
+        query_to_execute = all_queries_text.substr(this_query_begin - all_queries_text.data(), insert_ast->data - this_query_begin);
+    }
+    else
+    {
+        query_to_execute = all_queries_text.substr(this_query_begin - all_queries_text.data(), this_query_end - this_query_begin);
+    }
+
+    // Try to include the trailing comment with test hints. It is just
+    // a guess for now, because we don't yet know where the query ends
+    // if it is an INSERT query with inline data. We will do it again
+    // after we have processed the query. But even this guess is
+    // beneficial so that we see proper trailing comments in "echo" and
+    // server log.
+    adjustQueryEnd(this_query_end, all_queries_end, global_context->getSettingsRef().max_parser_depth);
+    return MultiQueryProcessingStage::EXECUTE_QUERY;
+}
+
+
+bool ClientBase::processQueryText(const String & text)
+{
+    if (exit_strings.end() != exit_strings.find(trim(text, [](char c) { return isWhitespaceASCII(c) || c == ';'; })))
+        return false;
+
+    if (!is_multiquery)
+    {
+        assert(!query_fuzzer_runs);
+        processTextAsSingleQuery(text);
+
+        return true;
+    }
+
+    if (query_fuzzer_runs)
+    {
+        processWithFuzzing(text);
+        return true;
+    }
+
+    return executeMultiQuery(text);
+}
+
+
+void ClientBase::runInteractive()
+{
+    if (config().has("query_id"))
+        throw Exception("query_id could be specified only in non-interactive mode", ErrorCodes::BAD_ARGUMENTS);
+    if (print_time_to_stderr)
+        throw Exception("time option could be specified only in non-interactive mode", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Initialize DateLUT here to avoid counting time spent here as query execution time.
+    const auto local_tz = DateLUT::instance().getTimeZone();
+
+    std::optional<Suggest> suggest;
+    suggest.emplace();
+    if (load_suggestions)
+    {
+        /// Load suggestion data from the server.
+        if (global_context->getApplicationType() == Context::ApplicationType::CLIENT)
+            suggest->load<Connection>(global_context, connection_parameters, config().getInt("suggestion_limit"));
+        else if (global_context->getApplicationType() == Context::ApplicationType::LOCAL)
+            suggest->load<LocalConnection>(global_context, connection_parameters, config().getInt("suggestion_limit"));
+    }
+
+    if (home_path.empty())
+    {
+        const char * home_path_cstr = getenv("HOME");
+        if (home_path_cstr)
+            home_path = home_path_cstr;
+    }
+
+    /// Initialize query_id_formats if any
+    if (config().has("query_id_formats"))
+    {
+        Poco::Util::AbstractConfiguration::Keys keys;
+        config().keys("query_id_formats", keys);
+        for (const auto & name : keys)
+            query_id_formats.emplace_back(name + ":", config().getString("query_id_formats." + name));
+    }
+
+    if (query_id_formats.empty())
+        query_id_formats.emplace_back("Query id:", " {query_id}\n");
+
+    /// Load command history if present.
+    if (config().has("history_file"))
+        history_file = config().getString("history_file");
+    else
+    {
+        auto * history_file_from_env = getenv("CLICKHOUSE_HISTORY_FILE");
+        if (history_file_from_env)
+            history_file = history_file_from_env;
+        else if (!home_path.empty())
+            history_file = home_path + "/.clickhouse-client-history";
+    }
+
+    if (!history_file.empty() && !fs::exists(history_file))
+    {
+        /// Avoid TOCTOU issue.
+        try
+        {
+            FS::createFile(history_file);
+        }
+        catch (const ErrnoException & e)
+        {
+            if (e.getErrno() != EEXIST)
+                throw;
+        }
+    }
+
+    LineReader::Patterns query_extenders = {"\\"};
+    LineReader::Patterns query_delimiters = {";", "\\G"};
+
+#if USE_REPLXX
+    replxx::Replxx::highlighter_callback_t highlight_callback{};
+    if (config().getBool("highlight", true))
+        highlight_callback = highlight;
+
+    ReplxxLineReader lr(*suggest, history_file, config().has("multiline"), query_extenders, query_delimiters, highlight_callback);
+
+#elif defined(USE_READLINE) && USE_READLINE
+    ReadlineLineReader lr(*suggest, history_file, config().has("multiline"), query_extenders, query_delimiters);
+#else
+    LineReader lr(history_file, config().has("multiline"), query_extenders, query_delimiters);
+#endif
+
+    /// Enable bracketed-paste-mode only when multiquery is enabled and multiline is
+    ///  disabled, so that we are able to paste and execute multiline queries in a whole
+    ///  instead of erroring out, while be less intrusive.
+    if (config().has("multiquery") && !config().has("multiline"))
+        lr.enableBracketedPaste();
+
+    do
+    {
+        auto input = lr.readLine(prompt(), ":-] ");
+        if (input.empty())
+            break;
+
+        has_vertical_output_suffix = false;
+        if (input.ends_with("\\G"))
+        {
+            input.resize(input.size() - 2);
+            has_vertical_output_suffix = true;
+        }
+
+        try
+        {
+            if (!processQueryText(input))
+                break;
+        }
+        catch (const Exception & e)
+        {
+            /// We don't need to handle the test hints in the interactive mode.
+            std::cerr << "Exception on client:" << std::endl << getExceptionMessage(e, print_stack_trace, true) << std::endl << std::endl;
+            client_exception = std::make_unique<Exception>(e);
+        }
+
+        if (client_exception)
+        {
+            /// client_exception may have been set above or elsewhere.
+            /// Client-side exception during query execution can result in the loss of
+            /// sync in the connection protocol.
+            /// So we reconnect and allow to enter the next query.
+            if (!connection->checkConnected())
+                connect();
+        }
+    }
+    while (true);
+
+    if (isNewYearMode())
+        std::cout << "Happy new year." << std::endl;
+    else if (isChineseNewYearMode(local_tz))
+        std::cout << "Happy Chinese new year. 春节快乐!" << std::endl;
+    else
+        std::cout << "Bye." << std::endl;
+}
+
+
+void ClientBase::runNonInteractive()
+{
+    if (!queries_files.empty())
+    {
+        auto process_multi_query_from_file = [&](const String & file)
+        {
+            auto text = getQueryTextPrefix();
+            String queries_from_file;
+
+            ReadBufferFromFile in(file);
+            readStringUntilEOF(queries_from_file, in);
+
+            text += queries_from_file;
+            return executeMultiQuery(text);
+        };
+
+        /// Read all queries into `text`.
+        for (const auto & queries_file : queries_files)
+        {
+            for (const auto & interleave_file : interleave_queries_files)
+                if (!process_multi_query_from_file(interleave_file))
+                    return;
+
+            if (!process_multi_query_from_file(queries_file))
+                return;
+        }
+
+        return;
+    }
+
+    String text;
+    if (is_multiquery)
+        text = getQueryTextPrefix();
+
+    if (config().has("query"))
+    {
+        text += config().getRawString("query"); /// Poco configuration should not process substitutions in form of ${...} inside query.
+    }
+    else
+    {
+        /// If 'query' parameter is not set, read a query from stdin.
+        /// The query is read entirely into memory (streaming is disabled).
+        ReadBufferFromFileDescriptor in(STDIN_FILENO);
+        readStringUntilEOF(text, in);
+    }
+
+    if (query_fuzzer_runs)
+        processWithFuzzing(text);
+    else
+        processQueryText(text);
+}
+
+
+void ClientBase::clearTerminal()
+{
+    /// Clear from cursor until end of screen.
+    /// It is needed if garbage is left in terminal.
+    /// Show cursor. It can be left hidden by invocation of previous programs.
+    /// A test for this feature: perl -e 'print "x"x100000'; echo -ne '\033[0;0H\033[?25l'; clickhouse-client
+    std::cout << "\033[0J"
+                    "\033[?25h";
+}
+
+
+void ClientBase::showClientVersion()
+{
+    std::cout << DBMS_NAME << " " + getName() + " version " << VERSION_STRING << VERSION_OFFICIAL << "." << std::endl;
+}
+
+
+void ClientBase::readArguments(int argc, char ** argv, Arguments & common_arguments, std::vector<Arguments> & external_tables_arguments)
+{
+    /** We allow different groups of arguments:
+        * - common arguments;
+        * - arguments for any number of external tables each in form "--external args...",
+        *   where possible args are file, name, format, structure, types;
+        * - param arguments for prepared statements.
+        * Split these groups before processing.
+        */
+
+    bool in_external_group = false;
+    for (int arg_num = 1; arg_num < argc; ++arg_num)
+    {
+        const char * arg = argv[arg_num];
+
+        if (0 == strcmp(arg, "--external"))
+        {
+            in_external_group = true;
+            external_tables_arguments.emplace_back(Arguments{""});
+        }
+        /// Options with value after equal sign.
+        else if (in_external_group
+            && (0 == strncmp(arg, "--file=", strlen("--file=")) || 0 == strncmp(arg, "--name=", strlen("--name="))
+                || 0 == strncmp(arg, "--format=", strlen("--format=")) || 0 == strncmp(arg, "--structure=", strlen("--structure="))
+                || 0 == strncmp(arg, "--types=", strlen("--types="))))
+        {
+            external_tables_arguments.back().emplace_back(arg);
+        }
+        /// Options with value after whitespace.
+        else if (in_external_group
+            && (0 == strcmp(arg, "--file") || 0 == strcmp(arg, "--name") || 0 == strcmp(arg, "--format")
+                || 0 == strcmp(arg, "--structure") || 0 == strcmp(arg, "--types")))
+        {
+            if (arg_num + 1 < argc)
+            {
+                external_tables_arguments.back().emplace_back(arg);
+                ++arg_num;
+                arg = argv[arg_num];
+                external_tables_arguments.back().emplace_back(arg);
+            }
+            else
+                break;
+        }
+        else
+        {
+            in_external_group = false;
+
+            /// Parameter arg after underline.
+            if (startsWith(arg, "--param_"))
+            {
+                const char * param_continuation = arg + strlen("--param_");
+                const char * equal_pos = strchr(param_continuation, '=');
+
+                if (equal_pos == param_continuation)
+                    throw Exception("Parameter name cannot be empty", ErrorCodes::BAD_ARGUMENTS);
+
+                if (equal_pos)
+                {
+                    /// param_name=value
+                    query_parameters.emplace(String(param_continuation, equal_pos), String(equal_pos + 1));
+                }
+                else
+                {
+                    /// param_name value
+                    ++arg_num;
+                    if (arg_num >= argc)
+                        throw Exception("Parameter requires value", ErrorCodes::BAD_ARGUMENTS);
+                    arg = argv[arg_num];
+                    query_parameters.emplace(String(param_continuation), String(arg));
+                }
+            }
+            else
+                common_arguments.emplace_back(arg);
+        }
+    }
+}
+
+void ClientBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
+{
+    cmd_settings.addProgramOptions(options_description.main_description.value());
+    /// Parse main commandline options.
+    auto parser = po::command_line_parser(arguments).options(options_description.main_description.value()).allow_unregistered();
+    po::parsed_options parsed = parser.run();
+
+    /// Check unrecognized options without positional options.
+    auto unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::exclude_positional);
+    if (!unrecognized_options.empty())
+        throw Exception(ErrorCodes::UNRECOGNIZED_ARGUMENTS, "Unrecognized option '{}'", unrecognized_options[0]);
+
+    /// Check positional options (options after ' -- ', ex: clickhouse-client -- <options>).
+    unrecognized_options = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::include_positional);
+    if (unrecognized_options.size() > 1)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional options are not supported.");
+
+    po::store(parsed, options);
+}
+
+
+void ClientBase::init(int argc, char ** argv)
+{
+    namespace po = boost::program_options;
+
+    /// Don't parse options with Poco library, we prefer neat boost::program_options.
+    stopOptionsProcessing();
+
+    stdin_is_a_tty = isatty(STDIN_FILENO);
+    stdout_is_a_tty = isatty(STDOUT_FILENO);
+    terminal_width = getTerminalWidth();
+
+    Arguments common_arguments{""}; /// 0th argument is ignored.
+    std::vector<Arguments> external_tables_arguments;
+
+    readArguments(argc, argv, common_arguments, external_tables_arguments);
+
+    po::variables_map options;
+    OptionsDescription options_description;
+    options_description.main_description.emplace(createOptionsDescription("Main options", terminal_width));
+
+    /// Common options for clickhouse-client and clickhouse-local.
+    options_description.main_description->add_options()
+        ("help", "produce help message")
+        ("version,V", "print version information and exit")
+        ("version-clean", "print version in machine-readable format and exit")
+
+        ("config-file,C", po::value<std::string>(), "config-file path")
+        ("queries-file", po::value<std::vector<std::string>>()->multitoken(),
+            "file path with queries to execute; multiple files can be specified (--queries-file file1 file2...)")
+        ("database,d", po::value<std::string>(), "database")
+        ("history_file", po::value<std::string>(), "path to history file")
+
+        ("query,q", po::value<std::string>(), "query")
+        ("stage", po::value<std::string>()->default_value("complete"), "Request query processing up to specified stage: complete,fetch_columns,with_mergeable_state,with_mergeable_state_after_aggregation,with_mergeable_state_after_aggregation_and_limit")
+        ("query_id", po::value<std::string>(), "query_id")
+        ("progress", "print progress of queries execution")
+
+        ("disable_suggestion,A", "Disable loading suggestion data. Note that suggestion data is loaded asynchronously through a second connection to ClickHouse server. Also it is reasonable to disable suggestion if you want to paste a query with TAB characters. Shorthand option -A is for those who get used to mysql client.")
+        ("time,t", "print query execution time to stderr in non-interactive mode (for benchmarks)")
+        ("echo", "in batch mode, print query before execution")
+        ("verbose", "print query and other debugging info")
+
+        ("multiline,m", "multiline")
+        ("multiquery,n", "multiquery")
+
+        ("suggestion_limit", po::value<int>()->default_value(10000),
+            "Suggestion limit for how many databases, tables and columns to fetch.")
+
+        ("format,f", po::value<std::string>(), "default output format")
+        ("vertical,E", "vertical output format, same as --format=Vertical or FORMAT Vertical or \\G at end of command")
+        ("highlight", po::value<bool>()->default_value(true), "enable or disable basic syntax highlight in interactive command line")
+
+        ("ignore-error", "do not stop processing in multiquery mode")
+        ("stacktrace", "print stack traces of exceptions")
+        ("hardware-utilization", "print hardware utilization information in progress bar")
+        ("print-profile-events", po::value(&profile_events.print)->zero_tokens(), "Printing ProfileEvents packets")
+        ("profile-events-delay-ms", po::value<UInt64>()->default_value(profile_events.delay_ms), "Delay between printing `ProfileEvents` packets (-1 - print only totals, 0 - print every single packet)")
+    ;
+
+    addOptions(options_description);
+    parseAndCheckOptions(options_description, options, common_arguments);
+    po::notify(options);
+
+    if (options.count("version") || options.count("V"))
+    {
+        showClientVersion();
+        exit(0);
+    }
+
+    if (options.count("version-clean"))
+    {
+        std::cout << VERSION_STRING;
+        exit(0);
+    }
+
+    /// Output of help message.
+    if (options.count("help")
+        || (options.count("host") && options["host"].as<std::string>() == "elp")) /// If user writes -help instead of --help.
+    {
+        printHelpMessage(options_description);
+        exit(0);
+    }
+
+    /// Common options for clickhouse-client and clickhouse-local.
+    if (options.count("time"))
+        print_time_to_stderr = true;
+    if (options.count("query"))
+        config().setString("query", options["query"].as<std::string>());
+    if (options.count("query_id"))
+        config().setString("query_id", options["query_id"].as<std::string>());
+    if (options.count("database"))
+        config().setString("database", options["database"].as<std::string>());
+    if (options.count("config-file"))
+        config().setString("config-file", options["config-file"].as<std::string>());
+    if (options.count("queries-file"))
+        queries_files = options["queries-file"].as<std::vector<std::string>>();
+    if (options.count("multiline"))
+        config().setBool("multiline", true);
+    if (options.count("multiquery"))
+        config().setBool("multiquery", true);
+    if (options.count("ignore-error"))
+        config().setBool("ignore-error", true);
+    if (options.count("format"))
+        config().setString("format", options["format"].as<std::string>());
+    if (options.count("vertical"))
+        config().setBool("vertical", true);
+    if (options.count("stacktrace"))
+        config().setBool("stacktrace", true);
+    if (options.count("print-profile-events"))
+        config().setBool("print-profile-events", true);
+    if (options.count("profile-events-delay-ms"))
+        config().setInt("profile-events-delay-ms", options["profile-events-delay-ms"].as<UInt64>());
+    if (options.count("progress"))
+        config().setBool("progress", true);
+    if (options.count("echo"))
+        config().setBool("echo", true);
+    if (options.count("disable_suggestion"))
+        config().setBool("disable_suggestion", true);
+    if (options.count("suggestion_limit"))
+        config().setInt("suggestion_limit", options["suggestion_limit"].as<int>());
+    if (options.count("highlight"))
+        config().setBool("highlight", options["highlight"].as<bool>());
+    if (options.count("history_file"))
+        config().setString("history_file", options["history_file"].as<std::string>());
+    if (options.count("verbose"))
+        config().setBool("verbose", true);
+    if (options.count("log-level"))
+        Poco::Logger::root().setLevel(options["log-level"].as<std::string>());
+    if (options.count("hardware-utilization"))
+        progress_indication.print_hardware_utilization = true;
+
+    query_processing_stage = QueryProcessingStage::fromString(options["stage"].as<std::string>());
+    profile_events.print = options.count("print-profile-events");
+    profile_events.delay_ms = options["profile-events-delay-ms"].as<UInt64>();
+
+    processOptions(options_description, options, external_tables_arguments);
+    argsToConfig(common_arguments, config(), 100);
+    clearPasswordFromCommandLine(argc, argv);
+}
+
+}
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
new file mode 100644
index 00000000000..f7b418ad13a
--- /dev/null
+++ b/src/Client/ClientBase.h
@@ -0,0 +1,236 @@
+#pragma once
+
+#include <Common/ProgressIndication.h>
+#include <Common/InterruptListener.h>
+#include <Common/ShellCommand.h>
+#include <Common/Stopwatch.h>
+#include <Core/ExternalTable.h>
+#include <Poco/Util/Application.h>
+#include <Interpreters/Context.h>
+#include <Client/Suggest.h>
+#include <Client/QueryFuzzer.h>
+#include <boost/program_options.hpp>
+
+namespace po = boost::program_options;
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+enum MultiQueryProcessingStage
+{
+    QUERIES_END,
+    PARSING_EXCEPTION,
+    CONTINUE_PARSING,
+    EXECUTE_QUERY,
+    PARSING_FAILED,
+};
+
+void interruptSignalHandler(int signum);
+
+class InternalTextLogs;
+
+class ClientBase : public Poco::Util::Application
+{
+
+public:
+    using Arguments = std::vector<String>;
+
+    ClientBase();
+    ~ClientBase() override;
+
+    void init(int argc, char ** argv);
+
+protected:
+    void runInteractive();
+    void runNonInteractive();
+
+    virtual bool processWithFuzzing(const String &)
+    {
+        throw Exception("Query processing with fuzzing is not implemented", ErrorCodes::NOT_IMPLEMENTED);
+    }
+
+    virtual bool executeMultiQuery(const String & all_queries_text) = 0;
+    virtual void connect() = 0;
+    virtual void processError(const String & query) const = 0;
+    virtual String getName() const = 0;
+
+    void processOrdinaryQuery(const String & query_to_execute, ASTPtr parsed_query);
+    void processInsertQuery(const String & query_to_execute, ASTPtr parsed_query);
+
+    void processTextAsSingleQuery(const String & full_query);
+    void processParsedSingleQuery(const String & full_query, const String & query_to_execute,
+        ASTPtr parsed_query, std::optional<bool> echo_query_ = {}, bool report_error = false);
+
+    static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, int max_parser_depth);
+    ASTPtr parseQuery(const char *& pos, const char * end, bool allow_multi_statements) const;
+    static void setupSignalHandler();
+
+    MultiQueryProcessingStage analyzeMultiQueryText(
+        const char *& this_query_begin, const char *& this_query_end, const char * all_queries_end,
+        String & query_to_execute, ASTPtr & parsed_query, const String & all_queries_text,
+        std::optional<Exception> & current_exception);
+
+    /// For non-interactive multi-query mode get queries text prefix.
+    virtual String getQueryTextPrefix() { return ""; }
+
+    static void clearTerminal();
+    void showClientVersion();
+
+    using ProgramOptionsDescription = boost::program_options::options_description;
+    using CommandLineOptions = boost::program_options::variables_map;
+
+    struct OptionsDescription
+    {
+        std::optional<ProgramOptionsDescription> main_description;
+        std::optional<ProgramOptionsDescription> external_description;
+    };
+
+    virtual void printHelpMessage(const OptionsDescription & options_description) = 0;
+    virtual void addOptions(OptionsDescription & options_description) = 0;
+    virtual void processOptions(const OptionsDescription & options_description,
+                                const CommandLineOptions & options,
+                                const std::vector<Arguments> & external_tables_arguments) = 0;
+    virtual void processConfig() = 0;
+
+private:
+    bool processQueryText(const String & text);
+
+    void receiveResult(ASTPtr parsed_query);
+    bool receiveAndProcessPacket(ASTPtr parsed_query, bool cancelled);
+    void receiveLogs(ASTPtr parsed_query);
+    bool receiveSampleBlock(Block & out, ColumnsDescription & columns_description, ASTPtr parsed_query);
+    bool receiveEndOfQuery();
+
+    void onProgress(const Progress & value);
+    void onData(Block & block, ASTPtr parsed_query);
+    void onLogData(Block & block);
+    void onTotals(Block & block, ASTPtr parsed_query);
+    void onExtremes(Block & block, ASTPtr parsed_query);
+    void onReceiveExceptionFromServer(std::unique_ptr<Exception> && e);
+    void onProfileInfo(const ProfileInfo & profile_info);
+    void onEndOfStream();
+    void onProfileEvents(Block & block);
+
+    void sendData(Block & sample, const ColumnsDescription & columns_description, ASTPtr parsed_query);
+    void sendDataFrom(ReadBuffer & buf, Block & sample,
+                      const ColumnsDescription & columns_description, ASTPtr parsed_query);
+    void sendExternalTables(ASTPtr parsed_query);
+
+    void initBlockOutputStream(const Block & block, ASTPtr parsed_query);
+    void initLogsOutputStream();
+
+    inline String prompt() const
+    {
+        return boost::replace_all_copy(prompt_by_server_display_name, "{database}", config().getString("database", "default"));
+    }
+
+    void resetOutput();
+    void outputQueryInfo(bool echo_query_);
+    void readArguments(int argc, char ** argv, Arguments & common_arguments, std::vector<Arguments> & external_tables_arguments);
+    void parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments);
+
+protected:
+    bool is_interactive = false; /// Use either interactive line editing interface or batch mode.
+    bool is_multiquery = false;
+
+    bool echo_queries = false; /// Print queries before execution in batch mode.
+    bool ignore_error = false; /// In case of errors, don't print error message, continue to next query. Only applicable for non-interactive mode.
+    bool print_time_to_stderr = false; /// Output execution time to stderr in batch mode.
+    bool load_suggestions = false;
+
+    std::vector<String> queries_files; /// If not empty, queries will be read from these files
+    std::vector<String> interleave_queries_files; /// If not empty, run queries from these files before processing every file from 'queries_files'.
+
+    bool stdin_is_a_tty = false; /// stdin is a terminal.
+    bool stdout_is_a_tty = false; /// stdout is a terminal.
+    uint64_t terminal_width = 0;
+
+    ServerConnectionPtr connection;
+    ConnectionParameters connection_parameters;
+
+    String format; /// Query results output format.
+    bool is_default_format = true; /// false, if format is set in the config or command line.
+    size_t format_max_block_size = 0; /// Max block size for console output.
+    String insert_format; /// Format of INSERT data that is read from stdin in batch mode.
+    size_t insert_format_max_block_size = 0; /// Max block size when reading INSERT data.
+    size_t max_client_network_bandwidth = 0; /// The maximum speed of data exchange over the network for the client in bytes per second.
+
+    bool has_vertical_output_suffix = false; /// Is \G present at the end of the query string?
+
+    /// We will format query_id in interactive mode in various ways, the default is just to print Query id: ...
+    std::vector<std::pair<String, String>> query_id_formats;
+
+    /// Settings specified via command line args
+    Settings cmd_settings;
+
+    SharedContextHolder shared_context;
+    ContextMutablePtr global_context;
+
+    /// Buffer that reads from stdin in batch mode.
+    ReadBufferFromFileDescriptor std_in{STDIN_FILENO};
+    /// Console output.
+    WriteBufferFromFileDescriptor std_out{STDOUT_FILENO};
+    std::unique_ptr<ShellCommand> pager_cmd;
+
+    /// The user can specify to redirect query output to a file.
+    std::unique_ptr<WriteBuffer> out_file_buf;
+    std::shared_ptr<IOutputFormat> output_format;
+
+    /// The user could specify special file for server logs (stderr by default)
+    std::unique_ptr<WriteBuffer> out_logs_buf;
+    String server_logs_file;
+    std::unique_ptr<InternalTextLogs> logs_out_stream;
+
+    String home_path;
+    String history_file; /// Path to a file containing command history.
+
+    String current_profile;
+
+    UInt64 server_revision = 0;
+    String server_version;
+    String prompt_by_server_display_name;
+    String server_display_name;
+
+    ProgressIndication progress_indication;
+    bool need_render_progress = true;
+    bool written_first_block = false;
+    size_t processed_rows = 0; /// How many rows have been read or written.
+
+    bool print_stack_trace = false;
+    /// The last exception that was received from the server. Is used for the
+    /// return code in batch mode.
+    std::unique_ptr<Exception> server_exception;
+    /// Likewise, the last exception that occurred on the client.
+    std::unique_ptr<Exception> client_exception;
+
+    /// If the last query resulted in exception. `server_exception` or
+    /// `client_exception` must be set.
+    bool have_error = false;
+
+    std::list<ExternalTable> external_tables; /// External tables info.
+    bool send_external_tables = false;
+    NameToNameMap query_parameters; /// Dictionary with query parameters for prepared statements.
+
+    QueryFuzzer fuzzer;
+    int query_fuzzer_runs = 0;
+
+    struct
+    {
+        bool print = false;
+        /// UINT64_MAX -- print only last
+        UInt64 delay_ms = 0;
+        Stopwatch watch;
+        /// For printing only last (delay_ms == 0).
+        Block last_block;
+    } profile_events;
+
+    QueryProcessingStage::Enum query_processing_stage;
+};
+
+}
diff --git a/src/Client/ClientBaseHelpers.cpp b/src/Client/ClientBaseHelpers.cpp
new file mode 100644
index 00000000000..e1c1481c5b4
--- /dev/null
+++ b/src/Client/ClientBaseHelpers.cpp
@@ -0,0 +1,168 @@
+#include "ClientBaseHelpers.h"
+
+
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <Parsers/Lexer.h>
+#include <Common/UTF8Helpers.h>
+
+
+namespace DB
+{
+
+/// Should we celebrate a bit?
+bool isNewYearMode()
+{
+    time_t current_time = time(nullptr);
+
+    /// It's bad to be intrusive.
+    if (current_time % 3 != 0)
+        return false;
+
+    LocalDate now(current_time);
+    return (now.month() == 12 && now.day() >= 20) || (now.month() == 1 && now.day() <= 5);
+}
+
+bool isChineseNewYearMode(const String & local_tz)
+{
+    /// Days of Dec. 20 in Chinese calendar starting from year 2019 to year 2105
+    static constexpr UInt16 chineseNewYearIndicators[]
+        = {18275, 18659, 19014, 19368, 19752, 20107, 20491, 20845, 21199, 21583, 21937, 22292, 22676, 23030, 23414, 23768, 24122, 24506,
+            24860, 25215, 25599, 25954, 26308, 26692, 27046, 27430, 27784, 28138, 28522, 28877, 29232, 29616, 29970, 30354, 30708, 31062,
+            31446, 31800, 32155, 32539, 32894, 33248, 33632, 33986, 34369, 34724, 35078, 35462, 35817, 36171, 36555, 36909, 37293, 37647,
+            38002, 38386, 38740, 39095, 39479, 39833, 40187, 40571, 40925, 41309, 41664, 42018, 42402, 42757, 43111, 43495, 43849, 44233,
+            44587, 44942, 45326, 45680, 46035, 46418, 46772, 47126, 47510, 47865, 48249, 48604, 48958, 49342};
+
+    /// All time zone names are acquired from https://www.iana.org/time-zones
+    static constexpr const char * chineseNewYearTimeZoneIndicators[] = {
+        /// Time zones celebrating Chinese new year.
+        "Asia/Shanghai",
+        "Asia/Chongqing",
+        "Asia/Harbin",
+        "Asia/Urumqi",
+        "Asia/Hong_Kong",
+        "Asia/Chungking",
+        "Asia/Macao",
+        "Asia/Macau",
+        "Asia/Taipei",
+        "Asia/Singapore",
+
+        /// Time zones celebrating Chinese new year but with different festival names. Let's not print the message for now.
+        // "Asia/Brunei",
+        // "Asia/Ho_Chi_Minh",
+        // "Asia/Hovd",
+        // "Asia/Jakarta",
+        // "Asia/Jayapura",
+        // "Asia/Kashgar",
+        // "Asia/Kuala_Lumpur",
+        // "Asia/Kuching",
+        // "Asia/Makassar",
+        // "Asia/Pontianak",
+        // "Asia/Pyongyang",
+        // "Asia/Saigon",
+        // "Asia/Seoul",
+        // "Asia/Ujung_Pandang",
+        // "Asia/Ulaanbaatar",
+        // "Asia/Ulan_Bator",
+    };
+    static constexpr size_t M = sizeof(chineseNewYearTimeZoneIndicators) / sizeof(chineseNewYearTimeZoneIndicators[0]);
+
+    time_t current_time = time(nullptr);
+
+    if (chineseNewYearTimeZoneIndicators + M
+        == std::find_if(chineseNewYearTimeZoneIndicators, chineseNewYearTimeZoneIndicators + M, [&local_tz](const char * tz)
+                        {
+                            return tz == local_tz;
+                        }))
+        return false;
+
+    /// It's bad to be intrusive.
+    if (current_time % 3 != 0)
+        return false;
+
+    auto days = DateLUT::instance().toDayNum(current_time).toUnderType();
+    for (auto d : chineseNewYearIndicators)
+    {
+        /// Let's celebrate until Lantern Festival
+        if (d <= days && d + 25 >= days)
+            return true;
+        else if (d > days)
+            return false;
+    }
+    return false;
+}
+
+#if USE_REPLXX
+void highlight(const String & query, std::vector<replxx::Replxx::Color> & colors)
+{
+    using namespace replxx;
+
+    static const std::unordered_map<TokenType, Replxx::Color> token_to_color
+        = {{TokenType::Whitespace, Replxx::Color::DEFAULT},
+            {TokenType::Comment, Replxx::Color::GRAY},
+            {TokenType::BareWord, Replxx::Color::DEFAULT},
+            {TokenType::Number, Replxx::Color::GREEN},
+            {TokenType::StringLiteral, Replxx::Color::CYAN},
+            {TokenType::QuotedIdentifier, Replxx::Color::MAGENTA},
+            {TokenType::OpeningRoundBracket, Replxx::Color::BROWN},
+            {TokenType::ClosingRoundBracket, Replxx::Color::BROWN},
+            {TokenType::OpeningSquareBracket, Replxx::Color::BROWN},
+            {TokenType::ClosingSquareBracket, Replxx::Color::BROWN},
+            {TokenType::DoubleColon, Replxx::Color::BROWN},
+            {TokenType::OpeningCurlyBrace, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::ClosingCurlyBrace, replxx::color::bold(Replxx::Color::DEFAULT)},
+
+            {TokenType::Comma, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Semicolon, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Dot, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Asterisk, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::HereDoc, Replxx::Color::CYAN},
+            {TokenType::Plus, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Minus, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Slash, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Percent, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Arrow, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::QuestionMark, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Colon, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Equals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::NotEquals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Less, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Greater, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::LessOrEquals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::GreaterOrEquals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Concatenation, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::At, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::DoubleAt, Replxx::Color::MAGENTA},
+
+            {TokenType::EndOfStream, Replxx::Color::DEFAULT},
+
+            {TokenType::Error, Replxx::Color::RED},
+            {TokenType::ErrorMultilineCommentIsNotClosed, Replxx::Color::RED},
+            {TokenType::ErrorSingleQuoteIsNotClosed, Replxx::Color::RED},
+            {TokenType::ErrorDoubleQuoteIsNotClosed, Replxx::Color::RED},
+            {TokenType::ErrorSinglePipeMark, Replxx::Color::RED},
+            {TokenType::ErrorWrongNumber, Replxx::Color::RED},
+            {TokenType::ErrorMaxQuerySizeExceeded, Replxx::Color::RED}};
+
+    const Replxx::Color unknown_token_color = Replxx::Color::RED;
+
+    Lexer lexer(query.data(), query.data() + query.size());
+    size_t pos = 0;
+
+    for (Token token = lexer.nextToken(); !token.isEnd(); token = lexer.nextToken())
+    {
+        size_t utf8_len = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(token.begin), token.size());
+        for (size_t code_point_index = 0; code_point_index < utf8_len; ++code_point_index)
+        {
+            if (token_to_color.find(token.type) != token_to_color.end())
+                colors[pos + code_point_index] = token_to_color.at(token.type);
+            else
+                colors[pos + code_point_index] = unknown_token_color;
+        }
+
+        pos += utf8_len;
+    }
+}
+#endif
+
+}
diff --git a/src/Client/ClientBaseHelpers.h b/src/Client/ClientBaseHelpers.h
new file mode 100644
index 00000000000..048a4c17f10
--- /dev/null
+++ b/src/Client/ClientBaseHelpers.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Core/Types.h>
+
+#if USE_REPLXX
+#   include <base/ReplxxLineReader.h>
+#endif
+
+
+namespace DB
+{
+
+/// Should we celebrate a bit?
+bool isNewYearMode();
+
+bool isChineseNewYearMode(const String & local_tz);
+
+#if USE_REPLXX
+void highlight(const String & query, std::vector<replxx::Replxx::Color> & colors);
+#endif
+
+}
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 366e61bc8e2..d7d80606804 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <Poco/Net/NetException.h>
 #include <Core/Defines.h>
 #include <Core/Settings.h>
@@ -9,9 +10,10 @@
 #include <IO/WriteHelpers.h>
 #include <IO/copyData.h>
 #include <IO/TimeoutSetter.h>
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 #include <Client/Connection.h>
+#include <Client/ConnectionParameters.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
@@ -20,18 +22,17 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/OpenSSLHelpers.h>
 #include <Common/randomSeed.h>
+#include "Core/Block.h"
 #include <Interpreters/ClientInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <Processors/Pipe.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/ISink.h>
 #include <Processors/Executors/PipelineExecutor.h>
 #include <pcg_random.hpp>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#    include <Common/config.h>
-#endif
+#include <Common/config_version.h>
+#include <Common/config.h>
 
 #if USE_SSL
 #    include <Poco/Net/SecureStreamSocket.h>
@@ -57,6 +58,35 @@ namespace ErrorCodes
     extern const int EMPTY_DATA_PASSED;
 }
 
+Connection::~Connection() = default;
+
+Connection::Connection(const String & host_, UInt16 port_,
+    const String & default_database_,
+    const String & user_, const String & password_,
+    const String & cluster_,
+    const String & cluster_secret_,
+    const String & client_name_,
+    Protocol::Compression compression_,
+    Protocol::Secure secure_,
+    Poco::Timespan sync_request_timeout_)
+    : host(host_), port(port_), default_database(default_database_)
+    , user(user_), password(password_)
+    , cluster(cluster_)
+    , cluster_secret(cluster_secret_)
+    , client_name(client_name_)
+    , compression(compression_)
+    , secure(secure_)
+    , sync_request_timeout(sync_request_timeout_)
+    , log_wrapper(*this)
+{
+    /// Don't connect immediately, only on first need.
+
+    if (user.empty())
+        user = "default";
+
+    setDescription();
+}
+
 
 void Connection::connect(const ConnectionTimeouts & timeouts)
 {
@@ -130,10 +160,16 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
     }
     catch (Poco::TimeoutException & e)
     {
+        /// disconnect() will reset the socket, get timeouts before.
+        const std::string & message = fmt::format("{} ({}, receive timeout {} ms, send timeout {} ms)",
+            e.displayText(), getDescription(),
+            socket->getReceiveTimeout().totalMilliseconds(),
+            socket->getSendTimeout().totalMilliseconds());
+
         disconnect();
 
         /// Add server address to exception. Also Exception will remember stack trace. It's a pity that more precise exception type is lost.
-        throw NetException(e.displayText() + " (" + getDescription() + ")", ErrorCodes::SOCKET_TIMEOUT);
+        throw NetException(message, ErrorCodes::SOCKET_TIMEOUT);
     }
 }
 
@@ -413,7 +449,12 @@ void Connection::sendQuery(
     if (!connected)
         connect(timeouts);
 
-    TimeoutSetter timeout_setter(*socket, timeouts.send_timeout, timeouts.receive_timeout, true);
+    /// Query is not executed within sendQuery() function.
+    ///
+    /// And what this means that temporary timeout (via TimeoutSetter) is not
+    /// enough, since next query can use timeout from the previous query in this case.
+    socket->setReceiveTimeout(timeouts.receive_timeout);
+    socket->setSendTimeout(timeouts.send_timeout);
 
     if (settings)
     {
@@ -494,12 +535,13 @@ void Connection::sendQuery(
     maybe_compressed_out.reset();
     block_in.reset();
     block_logs_in.reset();
+    block_profile_events_in.reset();
     block_out.reset();
 
     /// Send empty block which means end of data.
     if (!with_pending_data)
     {
-        sendData(Block());
+        sendData(Block(), "", false);
         out->next();
     }
 }
@@ -521,11 +563,11 @@ void Connection::sendData(const Block & block, const String & name, bool scalar)
     if (!block_out)
     {
         if (compression == Protocol::Compression::Enable)
-            maybe_compressed_out = std::make_shared<CompressedWriteBuffer>(*out, compression_codec);
+            maybe_compressed_out = std::make_unique<CompressedWriteBuffer>(*out, compression_codec);
         else
             maybe_compressed_out = out;
 
-        block_out = std::make_shared<NativeBlockOutputStream>(*maybe_compressed_out, server_revision, block.cloneEmpty());
+        block_out = std::make_unique<NativeWriter>(*maybe_compressed_out, server_revision, block.cloneEmpty());
     }
 
     if (scalar)
@@ -654,7 +696,7 @@ protected:
         num_rows += chunk.getNumRows();
 
         auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
-        connection.sendData(block, table_data.table_name);
+        connection.sendData(block, table_data.table_name, false);
     }
 
 private:
@@ -670,7 +712,7 @@ void Connection::sendExternalTablesData(ExternalTablesData & data)
     if (data.empty())
     {
         /// Send empty block, which means end of data transfer.
-        sendData(Block());
+        sendData(Block(), "", false);
         return;
     }
 
@@ -689,14 +731,14 @@ void Connection::sendExternalTablesData(ExternalTablesData & data)
         if (!elem->pipe)
             elem->pipe = elem->creating_pipe_callback();
 
-        QueryPipeline pipeline;
+        QueryPipelineBuilder pipeline;
         pipeline.init(std::move(*elem->pipe));
         elem->pipe.reset();
         pipeline.resize(1);
         auto sink = std::make_shared<ExternalTableDataSink>(pipeline.getHeader(), *this, *elem, std::move(on_cancel));
-        pipeline.setSinks([&](const Block &, QueryPipeline::StreamType type) -> ProcessorPtr
+        pipeline.setSinks([&](const Block &, QueryPipelineBuilder::StreamType type) -> ProcessorPtr
         {
-            if (type != QueryPipeline::StreamType::Main)
+            if (type != QueryPipelineBuilder::StreamType::Main)
                 return nullptr;
             return sink;
         });
@@ -708,11 +750,11 @@ void Connection::sendExternalTablesData(ExternalTablesData & data)
 
         /// If table is empty, send empty block with name.
         if (read_rows == 0)
-            sendData(sink->getPort().getHeader(), elem->table_name);
+            sendData(sink->getPort().getHeader(), elem->table_name, false);
     }
 
     /// Send empty block, which means end of data transfer.
-    sendData(Block());
+    sendData(Block(), "", false);
 
     out_bytes = out->count() - out_bytes;
     maybe_compressed_out_bytes = maybe_compressed_out->count() - maybe_compressed_out_bytes;
@@ -829,6 +871,10 @@ Packet Connection::receivePacket()
             case Protocol::Server::ReadTaskRequest:
                 return res;
 
+            case Protocol::Server::ProfileEvents:
+                res.block = receiveProfileEvents();
+                return res;
+
             default:
                 /// In unknown state, disconnect - to not leave unsynchronised connection.
                 disconnect();
@@ -854,18 +900,18 @@ Packet Connection::receivePacket()
 Block Connection::receiveData()
 {
     initBlockInput();
-    return receiveDataImpl(block_in);
+    return receiveDataImpl(*block_in);
 }
 
 
 Block Connection::receiveLogData()
 {
     initBlockLogsInput();
-    return receiveDataImpl(block_logs_in);
+    return receiveDataImpl(*block_logs_in);
 }
 
 
-Block Connection::receiveDataImpl(BlockInputStreamPtr & stream)
+Block Connection::receiveDataImpl(NativeReader & reader)
 {
     String external_table_name;
     readStringBinary(external_table_name, *in);
@@ -873,7 +919,7 @@ Block Connection::receiveDataImpl(BlockInputStreamPtr & stream)
     size_t prev_bytes = in->count();
 
     /// Read one block from network.
-    Block res = stream->read();
+    Block res = reader.read();
 
     if (throttler)
         throttler->add(in->count() - prev_bytes);
@@ -882,6 +928,13 @@ Block Connection::receiveDataImpl(BlockInputStreamPtr & stream)
 }
 
 
+Block Connection::receiveProfileEvents()
+{
+    initBlockProfileEventsInput();
+    return receiveDataImpl(*block_profile_events_in);
+}
+
+
 void Connection::initInputBuffers()
 {
 
@@ -900,7 +953,7 @@ void Connection::initBlockInput()
                 maybe_compressed_in = in;
         }
 
-        block_in = std::make_shared<NativeBlockInputStream>(*maybe_compressed_in, server_revision);
+        block_in = std::make_unique<NativeReader>(*maybe_compressed_in, server_revision);
     }
 }
 
@@ -910,7 +963,16 @@ void Connection::initBlockLogsInput()
     if (!block_logs_in)
     {
         /// Have to return superset of SystemLogsQueue::getSampleBlock() columns
-        block_logs_in = std::make_shared<NativeBlockInputStream>(*in, server_revision);
+        block_logs_in = std::make_unique<NativeReader>(*in, server_revision);
+    }
+}
+
+
+void Connection::initBlockProfileEventsInput()
+{
+    if (!block_profile_events_in)
+    {
+        block_profile_events_in = std::make_unique<NativeReader>(*in, server_revision);
     }
 }
 
@@ -953,9 +1015,9 @@ Progress Connection::receiveProgress() const
 }
 
 
-BlockStreamProfileInfo Connection::receiveProfileInfo() const
+ProfileInfo Connection::receiveProfileInfo() const
 {
-    BlockStreamProfileInfo profile_info;
+    ProfileInfo profile_info;
     profile_info.read(*in);
     return profile_info;
 }
@@ -969,4 +1031,19 @@ void Connection::throwUnexpectedPacket(UInt64 packet_type, const char * expected
             ErrorCodes::UNEXPECTED_PACKET_FROM_SERVER);
 }
 
+ServerConnectionPtr Connection::createConnection(const ConnectionParameters & parameters, ContextPtr)
+{
+    return std::make_unique<Connection>(
+        parameters.host,
+        parameters.port,
+        parameters.default_database,
+        parameters.user,
+        parameters.password,
+        "", /* cluster */
+        "", /* cluster_secret */
+        "client",
+        parameters.compression,
+        parameters.security);
+}
+
 }
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index 2ea5a236a13..3b49760ba10 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -1,23 +1,14 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Net/StreamSocket.h>
 
-#include <Common/Throttler.h>
-#if !defined(ARCADIA_BUILD)
-#   include <Common/config.h>
-#endif
-#include <Core/Block.h>
+#include <Common/config.h>
+#include <Client/IServerConnection.h>
 #include <Core/Defines.h>
-#include <IO/Progress.h>
-#include <Core/Protocol.h>
-#include <Core/QueryProcessingStage.h>
 
-#include <DataStreams/IBlockStream_fwd.h>
-#include <DataStreams/BlockStreamProfileInfo.h>
 
-#include <IO/ConnectionTimeouts.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 
 #include <Interpreters/TablesStatus.h>
@@ -31,44 +22,16 @@
 namespace DB
 {
 
-class ClientInfo;
-class Pipe;
 struct Settings;
 
-/// Struct which represents data we are going to send for external table.
-struct ExternalTableData
-{
-    /// Pipe of data form table;
-    std::unique_ptr<Pipe> pipe;
-    std::string table_name;
-    std::function<std::unique_ptr<Pipe>()> creating_pipe_callback;
-    /// Flag if need to stop reading.
-    std::atomic_bool is_cancelled = false;
-};
-
-using ExternalTableDataPtr = std::unique_ptr<ExternalTableData>;
-using ExternalTablesData = std::vector<ExternalTableDataPtr>;
-
 class Connection;
+struct ConnectionParameters;
 
 using ConnectionPtr = std::shared_ptr<Connection>;
 using Connections = std::vector<ConnectionPtr>;
 
-
-/// Packet that could be received from server.
-struct Packet
-{
-    UInt64 type;
-
-    Block block;
-    std::unique_ptr<Exception> exception;
-    std::vector<String> multistring_message;
-    Progress progress;
-    BlockStreamProfileInfo profile_info;
-    std::vector<UUID> part_uuids;
-
-    Packet() : type(Protocol::Server::Hello) {}
-};
+class NativeReader;
+class NativeWriter;
 
 
 /** Connection with database server, to use by client.
@@ -78,7 +41,7 @@ struct Packet
   * As 'default_database' empty string could be passed
   *  - in that case, server will use it's own default database.
   */
-class Connection : private boost::noncopyable
+class Connection : public IServerConnection
 {
     friend class MultiplexedConnections;
 
@@ -91,112 +54,88 @@ public:
         const String & client_name_,
         Protocol::Compression compression_,
         Protocol::Secure secure_,
-        Poco::Timespan sync_request_timeout_ = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0))
-        :
-        host(host_), port(port_), default_database(default_database_),
-        user(user_), password(password_),
-        cluster(cluster_),
-        cluster_secret(cluster_secret_),
-        client_name(client_name_),
-        compression(compression_),
-        secure(secure_),
-        sync_request_timeout(sync_request_timeout_),
-        log_wrapper(*this)
-    {
-        /// Don't connect immediately, only on first need.
+        Poco::Timespan sync_request_timeout_ = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0));
 
-        if (user.empty())
-            user = "default";
+    ~Connection() override;
 
-        setDescription();
-    }
+    IServerConnection::Type getConnectionType() const override { return IServerConnection::Type::SERVER; }
 
-    virtual ~Connection() = default;
+    static ServerConnectionPtr createConnection(const ConnectionParameters & parameters, ContextPtr context);
 
     /// Set throttler of network traffic. One throttler could be used for multiple connections to limit total traffic.
-    void setThrottler(const ThrottlerPtr & throttler_)
+    void setThrottler(const ThrottlerPtr & throttler_) override
     {
         throttler = throttler_;
     }
 
-
     /// Change default database. Changes will take effect on next reconnect.
-    void setDefaultDatabase(const String & database);
+    void setDefaultDatabase(const String & database) override;
 
     void getServerVersion(const ConnectionTimeouts & timeouts,
                           String & name,
                           UInt64 & version_major,
                           UInt64 & version_minor,
                           UInt64 & version_patch,
-                          UInt64 & revision);
-    UInt64 getServerRevision(const ConnectionTimeouts & timeouts);
+                          UInt64 & revision) override;
 
-    const String & getServerTimezone(const ConnectionTimeouts & timeouts);
-    const String & getServerDisplayName(const ConnectionTimeouts & timeouts);
+    UInt64 getServerRevision(const ConnectionTimeouts & timeouts) override;
+
+    const String & getServerTimezone(const ConnectionTimeouts & timeouts) override;
+    const String & getServerDisplayName(const ConnectionTimeouts & timeouts) override;
 
     /// For log and exception messages.
-    const String & getDescription() const;
+    const String & getDescription() const override;
     const String & getHost() const;
     UInt16 getPort() const;
     const String & getDefaultDatabase() const;
 
     Protocol::Compression getCompression() const { return compression; }
 
-    /// If last flag is true, you need to call sendExternalTablesData after.
     void sendQuery(
         const ConnectionTimeouts & timeouts,
         const String & query,
-        const String & query_id_ = "",
-        UInt64 stage = QueryProcessingStage::Complete,
-        const Settings * settings = nullptr,
-        const ClientInfo * client_info = nullptr,
-        bool with_pending_data = false);
+        const String & query_id_/* = "" */,
+        UInt64 stage/* = QueryProcessingStage::Complete */,
+        const Settings * settings/* = nullptr */,
+        const ClientInfo * client_info/* = nullptr */,
+        bool with_pending_data/* = false */) override;
 
-    void sendCancel();
-    /// Send block of data; if name is specified, server will write it to external (temporary) table of that name.
-    void sendData(const Block & block, const String & name = "", bool scalar = false);
-    /// Send all scalars.
-    void sendScalarsData(Scalars & data);
-    /// Send all contents of external (temporary) tables.
-    void sendExternalTablesData(ExternalTablesData & data);
-    /// Send parts' uuids to excluded them from query processing
-    void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids);
+    void sendCancel() override;
+
+    void sendData(const Block & block, const String & name/* = "" */, bool scalar/* = false */) override;
+
+    void sendExternalTablesData(ExternalTablesData & data) override;
+
+    bool poll(size_t timeout_microseconds/* = 0 */) override;
+
+    bool hasReadPendingData() const override;
+
+    std::optional<UInt64> checkPacket(size_t timeout_microseconds/* = 0*/) override;
+
+    Packet receivePacket() override;
+
+    void forceConnected(const ConnectionTimeouts & timeouts) override;
+
+    bool isConnected() const override { return connected; }
+
+    bool checkConnected() override { return connected && ping(); }
+
+    void disconnect() override;
 
-    void sendReadTaskResponse(const String &);
 
     /// Send prepared block of data (serialized and, if need, compressed), that will be read from 'input'.
     /// You could pass size of serialized/compressed block.
     void sendPreparedData(ReadBuffer & input, size_t size, const String & name = "");
 
-    /// Check, if has data to read.
-    bool poll(size_t timeout_microseconds = 0);
-
-    /// Check, if has data in read buffer.
-    bool hasReadPendingData() const;
-
-    /// Checks if there is input data in connection and reads packet ID.
-    std::optional<UInt64> checkPacket(size_t timeout_microseconds = 0);
-
-    /// Receive packet from server.
-    Packet receivePacket();
-
-    /// If not connected yet, or if connection is broken - then connect. If cannot connect - throw an exception.
-    void forceConnected(const ConnectionTimeouts & timeouts);
-
-    bool isConnected() const { return connected; }
-
-    /// Check if connection is still active with ping request.
-    bool checkConnected() { return connected && ping(); }
+    void sendReadTaskResponse(const String &);
+    /// Send all scalars.
+    void sendScalarsData(Scalars & data);
+    /// Send parts' uuids to excluded them from query processing
+    void sendIgnoredPartUUIDs(const std::vector<UUID> & uuids);
 
     TablesStatusResponse getTablesStatus(const ConnectionTimeouts & timeouts,
                                          const TablesStatusRequest & request);
 
-    /** Disconnect.
-      * This may be used, if connection is left in unsynchronised state
-      *  (when someone continues to wait for something) after an exception.
-      */
-    void disconnect();
-
     size_t outBytesCount() const { return out ? out->count() : 0; }
     size_t inBytesCount() const { return in ? in->count() : 0; }
 
@@ -209,7 +148,6 @@ public:
         if (in)
             in->setAsyncCallback(std::move(async_callback));
     }
-
 private:
     String host;
     UInt16 port;
@@ -266,12 +204,13 @@ private:
 
     /// From where to read query execution result.
     std::shared_ptr<ReadBuffer> maybe_compressed_in;
-    BlockInputStreamPtr block_in;
-    BlockInputStreamPtr block_logs_in;
+    std::unique_ptr<NativeReader> block_in;
+    std::unique_ptr<NativeReader> block_logs_in;
+    std::unique_ptr<NativeReader> block_profile_events_in;
 
     /// Where to write data for INSERT.
     std::shared_ptr<WriteBuffer> maybe_compressed_out;
-    BlockOutputStreamPtr block_out;
+    std::unique_ptr<NativeWriter> block_out;
 
     /// Logger is created lazily, for avoid to run DNS request in constructor.
     class LoggerWrapper
@@ -310,16 +249,18 @@ private:
 
     Block receiveData();
     Block receiveLogData();
-    Block receiveDataImpl(BlockInputStreamPtr & stream);
+    Block receiveDataImpl(NativeReader & reader);
+    Block receiveProfileEvents();
 
     std::vector<String> receiveMultistringMessage(UInt64 msg_type) const;
     std::unique_ptr<Exception> receiveException() const;
     Progress receiveProgress() const;
-    BlockStreamProfileInfo receiveProfileInfo() const;
+    ProfileInfo receiveProfileInfo() const;
 
     void initInputBuffers();
     void initBlockInput();
     void initBlockLogsInput();
+    void initBlockProfileEventsInput();
 
     [[noreturn]] void throwUnexpectedPacket(UInt64 packet_type, const char * expected) const;
 };
diff --git a/programs/client/ConnectionParameters.cpp b/src/Client/ConnectionParameters.cpp
similarity index 93%
rename from programs/client/ConnectionParameters.cpp
rename to src/Client/ConnectionParameters.cpp
index fd0b250e66b..dbd463583f5 100644
--- a/programs/client/ConnectionParameters.cpp
+++ b/src/Client/ConnectionParameters.cpp
@@ -9,12 +9,11 @@
 #include <Common/Exception.h>
 #include <Common/isLocalAddress.h>
 #include <Common/DNSResolver.h>
-#include <common/setTerminalEcho.h>
-#include <common/scope_guard.h>
+#include <base/setTerminalEcho.h>
+#include <base/scope_guard.h>
+
+#include <readpassphrase/readpassphrase.h>
 
-#if !defined(ARCADIA_BUILD)
-#include <readpassphrase.h> // Y_IGNORE
-#endif
 
 namespace DB
 {
@@ -54,12 +53,10 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
     }
     if (password_prompt)
     {
-#if !defined(ARCADIA_BUILD)
         std::string prompt{"Password for user (" + user + "): "};
         char buf[1000] = {};
         if (auto * result = readpassphrase(prompt.c_str(), buf, sizeof(buf), 0))
             password = result;
-#endif
     }
 
     /// By default compression is disabled if address looks like localhost.
diff --git a/programs/client/ConnectionParameters.h b/src/Client/ConnectionParameters.h
similarity index 100%
rename from programs/client/ConnectionParameters.h
rename to src/Client/ConnectionParameters.h
diff --git a/src/Client/ConnectionPoolWithFailover.cpp b/src/Client/ConnectionPoolWithFailover.cpp
index eff589edaa8..aaffe85ae2e 100644
--- a/src/Client/ConnectionPoolWithFailover.cpp
+++ b/src/Client/ConnectionPoolWithFailover.cpp
@@ -6,7 +6,7 @@
 
 #include <Common/BitHelpers.h>
 #include <Common/quoteString.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/isLocalAddress.h>
 #include <Common/ProfileEvents.h>
 #include <Core/Settings.h>
@@ -73,8 +73,8 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
         ++last_used;
         /* Consider nested_pools.size() equals to 5
          * last_used = 1 -> get_priority: 0 1 2 3 4
-         * last_used = 2 -> get_priority: 5 0 1 2 3
-         * last_used = 3 -> get_priority: 5 4 0 1 2
+         * last_used = 2 -> get_priority: 4 0 1 2 3
+         * last_used = 3 -> get_priority: 4 3 0 1 2
          * ...
          * */
         get_priority = [&](size_t i) { ++i; return i < last_used ? nested_pools.size() - i : i - last_used; };
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index b833241b2bc..c73bea53d10 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -1,3 +1,4 @@
+#include "Core/Protocol.h"
 #if defined(OS_LINUX)
 
 #include <Client/HedgedConnections.h>
@@ -235,12 +236,12 @@ void HedgedConnections::sendCancel()
     if (!sent_query || cancelled)
         throw Exception("Cannot cancel. Either no query sent or already cancelled.", ErrorCodes::LOGICAL_ERROR);
 
+    cancelled = true;
+
     for (auto & offset_status : offset_states)
         for (auto & replica : offset_status.replicas)
             if (replica.connection)
                 replica.connection->sendCancel();
-
-    cancelled = true;
 }
 
 Packet HedgedConnections::drain()
@@ -412,6 +413,7 @@ Packet HedgedConnections::receivePacketFromReplica(const ReplicaLocation & repli
         case Protocol::Server::Totals:
         case Protocol::Server::Extremes:
         case Protocol::Server::Log:
+        case Protocol::Server::ProfileEvents:
             replica_with_last_received_packet = replica_location;
             break;
 
diff --git a/src/Client/HedgedConnections.h b/src/Client/HedgedConnections.h
index b0bff8e7c5d..e39d9582cde 100644
--- a/src/Client/HedgedConnections.h
+++ b/src/Client/HedgedConnections.h
@@ -8,8 +8,7 @@
 #include <Client/HedgedConnectionsFactory.h>
 #include <Client/IConnections.h>
 #include <Client/PacketReceiver.h>
-#include <Common/FiberStack.h>
-#include <Common/Fiber.h>
+
 
 namespace DB
 {
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index b0c5a3d22f5..5a42cc0d5c4 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -27,8 +27,8 @@ HedgedConnectionsFactory::HedgedConnectionsFactory(
     : pool(pool_), settings(settings_), timeouts(timeouts_), table_to_check(table_to_check_), log(&Poco::Logger::get("HedgedConnectionsFactory"))
 {
     shuffled_pools = pool->getShuffledPools(settings);
-    for (size_t i = 0; i != shuffled_pools.size(); ++i)
-        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pools[i].pool, &timeouts, settings, log, table_to_check.get()));
+    for (auto shuffled_pool : shuffled_pools)
+        replicas.emplace_back(ConnectionEstablisherAsync(shuffled_pool.pool, &timeouts, settings, log, table_to_check.get()));
 
     max_tries
         = (settings ? size_t{settings->connections_with_failover_max_tries} : size_t{DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES});
diff --git a/src/Client/IServerConnection.h b/src/Client/IServerConnection.h
new file mode 100644
index 00000000000..9d6b54ef32f
--- /dev/null
+++ b/src/Client/IServerConnection.h
@@ -0,0 +1,131 @@
+#pragma once
+
+#include <Common/Throttler.h>
+#include <Core/Types.h>
+#include <Core/QueryProcessingStage.h>
+#include <Core/Block.h>
+#include <Core/Protocol.h>
+
+#include <QueryPipeline/ProfileInfo.h>
+
+#include <QueryPipeline/Pipe.h>
+#include <IO/ConnectionTimeouts.h>
+#include <IO/Progress.h>
+
+
+#include <boost/noncopyable.hpp>
+
+
+namespace DB
+{
+
+class ClientInfo;
+
+/// Packet that could be received from server.
+struct Packet
+{
+    UInt64 type;
+
+    Block block;
+    std::unique_ptr<Exception> exception;
+    std::vector<String> multistring_message;
+    Progress progress;
+    ProfileInfo profile_info;
+    std::vector<UUID> part_uuids;
+
+    Packet() : type(Protocol::Server::Hello) {}
+};
+
+/// Struct which represents data we are going to send for external table.
+struct ExternalTableData
+{
+    /// Pipe of data form table;
+    std::unique_ptr<Pipe> pipe;
+    std::string table_name;
+    std::function<std::unique_ptr<Pipe>()> creating_pipe_callback;
+    /// Flag if need to stop reading.
+    std::atomic_bool is_cancelled = false;
+};
+
+using ExternalTableDataPtr = std::unique_ptr<ExternalTableData>;
+using ExternalTablesData = std::vector<ExternalTableDataPtr>;
+
+
+class IServerConnection : boost::noncopyable
+{
+public:
+    virtual ~IServerConnection() = default;
+
+    enum class Type
+    {
+        SERVER,
+        LOCAL
+    };
+
+    virtual Type getConnectionType() const = 0;
+
+    virtual void setDefaultDatabase(const String & database) = 0;
+
+    virtual void getServerVersion(
+            const ConnectionTimeouts & timeouts, String & name,
+            UInt64 & version_major, UInt64 & version_minor,
+            UInt64 & version_patch, UInt64 & revision) = 0;
+
+    virtual UInt64 getServerRevision(const ConnectionTimeouts & timeouts) = 0;
+
+    virtual const String & getServerTimezone(const ConnectionTimeouts & timeouts) = 0;
+    virtual const String & getServerDisplayName(const ConnectionTimeouts & timeouts) = 0;
+
+    virtual const String & getDescription() const = 0;
+
+    /// If last flag is true, you need to call sendExternalTablesData after.
+    virtual void sendQuery(
+        const ConnectionTimeouts & timeouts,
+        const String & query,
+        const String & query_id_,
+        UInt64 stage,
+        const Settings * settings,
+        const ClientInfo * client_info,
+        bool with_pending_data) = 0;
+
+    virtual void sendCancel() = 0;
+
+    /// Send block of data; if name is specified, server will write it to external (temporary) table of that name.
+    virtual void sendData(const Block & block, const String & name, bool scalar) = 0;
+
+    /// Send all contents of external (temporary) tables.
+    virtual void sendExternalTablesData(ExternalTablesData & data) = 0;
+
+    /// Check, if has data to read.
+    virtual bool poll(size_t timeout_microseconds) = 0;
+
+    /// Check, if has data in read buffer.
+    virtual bool hasReadPendingData() const = 0;
+
+    /// Checks if there is input data in connection and reads packet ID.
+    virtual std::optional<UInt64> checkPacket(size_t timeout_microseconds) = 0;
+
+    /// Receive packet from server.
+    virtual Packet receivePacket() = 0;
+
+    /// If not connected yet, or if connection is broken - then connect. If cannot connect - throw an exception.
+    virtual void forceConnected(const ConnectionTimeouts & timeouts) = 0;
+
+    virtual bool isConnected() const = 0;
+
+    /// Check if connection is still active with ping request.
+    virtual bool checkConnected() = 0;
+
+    /** Disconnect.
+      * This may be used, if connection is left in unsynchronised state
+      *  (when someone continues to wait for something) after an exception.
+      */
+    virtual void disconnect() = 0;
+
+    /// Set throttler of network traffic. One throttler could be used for multiple connections to limit total traffic.
+    virtual void setThrottler(const ThrottlerPtr & throttler_) = 0;
+};
+
+using ServerConnectionPtr = std::unique_ptr<IServerConnection>;
+
+}
diff --git a/src/DataStreams/InternalTextLogsRowOutputStream.cpp b/src/Client/InternalTextLogs.cpp
similarity index 58%
rename from src/DataStreams/InternalTextLogsRowOutputStream.cpp
rename to src/Client/InternalTextLogs.cpp
index 96b36157cba..430ba6daf0a 100644
--- a/src/DataStreams/InternalTextLogsRowOutputStream.cpp
+++ b/src/Client/InternalTextLogs.cpp
@@ -1,24 +1,20 @@
-#include "InternalTextLogsRowOutputStream.h"
+#include <Client/InternalTextLogs.h>
 #include <Core/Block.h>
 #include <Interpreters/InternalTextLogsQueue.h>
+#include <Interpreters/ProfileEventsExt.h>
 #include <Common/typeid_cast.h>
 #include <Common/HashTable/Hash.h>
 #include <DataTypes/IDataType.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <IO/WriteHelpers.h>
-#include <common/terminalColors.h>
+#include <base/terminalColors.h>
 
 
 namespace DB
 {
 
-Block InternalTextLogsRowOutputStream::getHeader() const
-{
-    return InternalTextLogsQueue::getSampleBlock();
-}
-
-void InternalTextLogsRowOutputStream::write(const Block & block)
+void InternalTextLogs::writeLogs(const Block & block)
 {
     const auto & array_event_time = typeid_cast<const ColumnUInt32 &>(*block.getByName("event_time").column).getData();
     const auto & array_microseconds = typeid_cast<const ColumnUInt32 &>(*block.getByName("event_time_microseconds").column).getData();
@@ -102,4 +98,69 @@ void InternalTextLogsRowOutputStream::write(const Block & block)
     }
 }
 
+void InternalTextLogs::writeProfileEvents(const Block & block)
+{
+    const auto & column_host_name = typeid_cast<const ColumnString &>(*block.getByName("host_name").column);
+    const auto & array_current_time = typeid_cast<const ColumnUInt32 &>(*block.getByName("current_time").column).getData();
+    const auto & array_thread_id = typeid_cast<const ColumnUInt64 &>(*block.getByName("thread_id").column).getData();
+    const auto & array_type = typeid_cast<const ColumnInt8 &>(*block.getByName("type").column).getData();
+    const auto & column_name = typeid_cast<const ColumnString &>(*block.getByName("name").column);
+    const auto & array_value = typeid_cast<const ColumnUInt64 &>(*block.getByName("value").column).getData();
+
+    for (size_t row_num = 0; row_num < block.rows(); ++row_num)
+    {
+        /// host_name
+        auto host_name = column_host_name.getDataAt(row_num);
+        if (host_name.size)
+        {
+            writeCString("[", wb);
+            if (color)
+                writeString(setColor(StringRefHash()(host_name)), wb);
+            writeString(host_name, wb);
+            if (color)
+                writeCString(resetColor(), wb);
+            writeCString("] ", wb);
+        }
+
+        /// current_time
+        auto current_time = array_current_time[row_num];
+        writeDateTimeText<'.', ':'>(current_time, wb);
+
+        /// thread_id
+        UInt64 thread_id = array_thread_id[row_num];
+        writeCString(" [ ", wb);
+        if (color)
+            writeString(setColor(intHash64(thread_id)), wb);
+        writeIntText(thread_id, wb);
+        if (color)
+            writeCString(resetColor(), wb);
+        writeCString(" ] ", wb);
+
+        /// name
+        auto name = column_name.getDataAt(row_num);
+        if (color)
+            writeString(setColor(StringRefHash()(name)), wb);
+        DB::writeString(name, wb);
+        if (color)
+            writeCString(resetColor(), wb);
+        writeCString(": ", wb);
+
+        /// value
+        UInt64 value = array_value[row_num];
+        writeIntText(value, wb);
+
+        //// type
+        Int8 type = array_type[row_num];
+        writeCString(" (", wb);
+        if (color)
+            writeString(setColor(intHash64(type)), wb);
+        writeString(toString(ProfileEvents::TypeEnum->castToName(type)), wb);
+        if (color)
+            writeCString(resetColor(), wb);
+        writeCString(")", wb);
+
+        writeChar('\n', wb);
+    }
+}
+
 }
diff --git a/src/Client/InternalTextLogs.h b/src/Client/InternalTextLogs.h
new file mode 100644
index 00000000000..0690211fd24
--- /dev/null
+++ b/src/Client/InternalTextLogs.h
@@ -0,0 +1,51 @@
+#pragma once
+#include <IO/WriteBuffer.h>
+#include <Core/Block.h>
+
+
+namespace DB
+{
+
+/// Prints internal server logs or profile events with colored output (if requested).
+/// NOTE: IRowOutputFormat does not suite well for this case
+class InternalTextLogs
+{
+public:
+    InternalTextLogs(WriteBuffer & buf_out, bool color_) : wb(buf_out), color(color_) {}
+
+    /// Print internal server logs
+    ///
+    /// Input blocks have to have the same structure as SystemLogsQueue::getSampleBlock():
+    /// - event_time
+    /// - event_time_microseconds
+    /// - host_name
+    /// - query_id
+    /// - thread_id
+    /// - priority
+    /// - source
+    /// - text
+    void writeLogs(const Block & block);
+    /// Print profile events.
+    ///
+    /// Block:
+    /// - host_name
+    /// - current_time
+    /// - thread_id
+    /// - type
+    /// - name
+    /// - value
+    ///
+    /// See also TCPHandler::sendProfileEvents() for block columns.
+    void writeProfileEvents(const Block & block);
+
+    void flush()
+    {
+        wb.next();
+    }
+
+private:
+    WriteBuffer & wb;
+    bool color;
+};
+
+}
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
new file mode 100644
index 00000000000..55d3a2d6a5f
--- /dev/null
+++ b/src/Client/LocalConnection.cpp
@@ -0,0 +1,430 @@
+#include "LocalConnection.h"
+#include <Interpreters/executeQuery.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Executors/PushingAsyncPipelineExecutor.h>
+#include <Storages/IStorage.h>
+#include <Core/Protocol.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_PACKET_FROM_SERVER;
+    extern const int UNKNOWN_EXCEPTION;
+    extern const int NOT_IMPLEMENTED;
+}
+
+LocalConnection::LocalConnection(ContextPtr context_, bool send_progress_)
+    : WithContext(context_)
+    , session(getContext(), ClientInfo::Interface::LOCAL)
+    , send_progress(send_progress_)
+{
+    /// Authenticate and create a context to execute queries.
+    session.authenticate("default", "", Poco::Net::SocketAddress{});
+    session.makeSessionContext();
+
+    if (!CurrentThread::isInitialized())
+        thread_status.emplace();
+}
+
+LocalConnection::~LocalConnection()
+{
+    try
+    {
+        state.reset();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+bool LocalConnection::hasReadPendingData() const
+{
+    return !state->is_finished;
+}
+
+std::optional<UInt64> LocalConnection::checkPacket(size_t)
+{
+    return next_packet_type;
+}
+
+void LocalConnection::updateProgress(const Progress & value)
+{
+    state->progress.incrementPiecewiseAtomically(value);
+}
+
+void LocalConnection::sendQuery(
+    const ConnectionTimeouts &,
+    const String & query,
+    const String & query_id,
+    UInt64 stage,
+    const Settings *,
+    const ClientInfo *,
+    bool)
+{
+    query_context = session.makeQueryContext();
+    query_context->setCurrentQueryId(query_id);
+    if (send_progress)
+        query_context->setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
+
+    CurrentThread::QueryScope query_scope_holder(query_context);
+
+    state.reset();
+    state.emplace();
+
+    state->query_id = query_id;
+    state->query = query;
+    state->stage = QueryProcessingStage::Enum(stage);
+
+    if (send_progress)
+        state->after_send_progress.restart();
+
+    next_packet_type.reset();
+
+    try
+    {
+        state->io = executeQuery(state->query, query_context, false, state->stage);
+
+        if (state->io.pipeline.pushing())
+        {
+            size_t num_threads = state->io.pipeline.getNumThreads();
+            if (num_threads > 1)
+            {
+                state->pushing_async_executor = std::make_unique<PushingAsyncPipelineExecutor>(state->io.pipeline);
+                state->pushing_async_executor->start();
+                state->block = state->pushing_async_executor->getHeader();
+            }
+            else
+            {
+                state->pushing_executor = std::make_unique<PushingPipelineExecutor>(state->io.pipeline);
+                state->pushing_executor->start();
+                state->block = state->pushing_executor->getHeader();
+            }
+
+            const auto & table_id = query_context->getInsertionTable();
+            if (query_context->getSettingsRef().input_format_defaults_for_omitted_fields)
+            {
+                if (!table_id.empty())
+                {
+                    auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, query_context);
+                    state->columns_description = storage_ptr->getInMemoryMetadataPtr()->getColumns();
+                }
+            }
+        }
+        else if (state->io.pipeline.pulling())
+        {
+            state->block = state->io.pipeline.getHeader();
+            state->executor = std::make_unique<PullingAsyncPipelineExecutor>(state->io.pipeline);
+        }
+        else if (state->io.pipeline.completed())
+        {
+            CompletedPipelineExecutor executor(state->io.pipeline);
+            executor.execute();
+        }
+
+        if (state->columns_description)
+            next_packet_type = Protocol::Server::TableColumns;
+        else if (state->block)
+            next_packet_type = Protocol::Server::Data;
+    }
+    catch (const Exception & e)
+    {
+        state->io.onException();
+        state->exception.emplace(e);
+    }
+    catch (const std::exception & e)
+    {
+        state->io.onException();
+        state->exception.emplace(Exception::CreateFromSTDTag{}, e);
+    }
+    catch (...)
+    {
+        state->io.onException();
+        state->exception.emplace("Unknown exception", ErrorCodes::UNKNOWN_EXCEPTION);
+    }
+}
+
+void LocalConnection::sendData(const Block & block, const String &, bool)
+{
+    if (!block)
+        return;
+
+    if (state->pushing_async_executor)
+    {
+        state->pushing_async_executor->push(std::move(block));
+    }
+    else if (state->pushing_executor)
+    {
+        state->pushing_executor->push(std::move(block));
+    }
+}
+
+void LocalConnection::sendCancel()
+{
+    if (state->executor)
+        state->executor->cancel();
+}
+
+bool LocalConnection::pullBlock(Block & block)
+{
+    if (state->executor)
+        return state->executor->pull(block, query_context->getSettingsRef().interactive_delay / 1000);
+
+    return false;
+}
+
+void LocalConnection::finishQuery()
+{
+    next_packet_type = Protocol::Server::EndOfStream;
+
+    if (!state)
+        return;
+
+    if (state->executor)
+    {
+        state->executor.reset();
+    }
+    else if (state->pushing_async_executor)
+    {
+        state->pushing_async_executor->finish();
+    }
+    else if (state->pushing_executor)
+    {
+        state->pushing_executor->finish();
+    }
+
+    state->io.onFinish();
+    state.reset();
+}
+
+bool LocalConnection::poll(size_t)
+{
+    if (!state)
+        return false;
+
+    /// Wait for next poll to collect current packet.
+    if (next_packet_type)
+        return true;
+
+    if (send_progress && (state->after_send_progress.elapsedMicroseconds() >= query_context->getSettingsRef().interactive_delay))
+    {
+        state->after_send_progress.restart();
+        next_packet_type = Protocol::Server::Progress;
+        return true;
+    }
+
+    if (!state->is_finished)
+    {
+        try
+        {
+            pollImpl();
+        }
+        catch (const Exception & e)
+        {
+            state->io.onException();
+            state->exception.emplace(e);
+        }
+        catch (const std::exception & e)
+        {
+            state->io.onException();
+            state->exception.emplace(Exception::CreateFromSTDTag{}, e);
+        }
+        catch (...)
+        {
+            state->io.onException();
+            state->exception.emplace("Unknown exception", ErrorCodes::UNKNOWN_EXCEPTION);
+        }
+    }
+
+    if (state->exception)
+    {
+        next_packet_type = Protocol::Server::Exception;
+        return true;
+    }
+
+    if (state->is_finished && !state->sent_totals)
+    {
+        state->sent_totals = true;
+        Block totals;
+
+        if (state->executor)
+            totals = state->executor->getTotalsBlock();
+
+        if (totals)
+        {
+            next_packet_type = Protocol::Server::Totals;
+            state->block.emplace(totals);
+            return true;
+        }
+    }
+
+    if (state->is_finished && !state->sent_extremes)
+    {
+        state->sent_extremes = true;
+        Block extremes;
+
+        if (state->executor)
+            extremes = state->executor->getExtremesBlock();
+
+        if (extremes)
+        {
+            next_packet_type = Protocol::Server::Extremes;
+            state->block.emplace(extremes);
+            return true;
+        }
+    }
+
+    if (state->is_finished)
+    {
+        finishQuery();
+        return true;
+    }
+
+    if (state->block && state->block.value())
+    {
+        next_packet_type = Protocol::Server::Data;
+        return true;
+    }
+
+    return false;
+}
+
+bool LocalConnection::pollImpl()
+{
+    Block block;
+    auto next_read = pullBlock(block);
+
+    if (block && !state->io.null_format)
+    {
+        state->block.emplace(block);
+    }
+    else if (!next_read)
+    {
+        state->is_finished = true;
+    }
+
+    return true;
+}
+
+Packet LocalConnection::receivePacket()
+{
+    Packet packet;
+    if (!state)
+    {
+        packet.type = Protocol::Server::EndOfStream;
+        return packet;
+    }
+
+    if (!next_packet_type)
+        poll(0);
+
+    if (!next_packet_type)
+    {
+        packet.type = Protocol::Server::EndOfStream;
+        return packet;
+    }
+
+    packet.type = next_packet_type.value();
+    switch (next_packet_type.value())
+    {
+        case Protocol::Server::Totals: [[fallthrough]];
+        case Protocol::Server::Extremes: [[fallthrough]];
+        case Protocol::Server::Log: [[fallthrough]];
+        case Protocol::Server::Data:
+        case Protocol::Server::ProfileEvents:
+        {
+            if (state->block && state->block.value())
+            {
+                packet.block = std::move(state->block.value());
+                state->block.reset();
+            }
+            next_packet_type.reset();
+            break;
+        }
+        case Protocol::Server::TableColumns:
+        {
+            if (state->columns_description)
+            {
+                /// Send external table name (empty name is the main table)
+                /// (see TCPHandler::sendTableColumns)
+                packet.multistring_message = {"", state->columns_description->toString()};
+            }
+
+            if (state->block)
+            {
+                next_packet_type = Protocol::Server::Data;
+            }
+
+            break;
+        }
+        case Protocol::Server::Exception:
+        {
+            packet.exception = std::make_unique<Exception>(*state->exception);
+            next_packet_type.reset();
+            break;
+        }
+        case Protocol::Server::Progress:
+        {
+            packet.progress = std::move(state->progress);
+            state->progress.reset();
+            next_packet_type.reset();
+            break;
+        }
+        case Protocol::Server::EndOfStream:
+        {
+            next_packet_type.reset();
+            break;
+        }
+        default:
+            throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER,
+                            "Unknown packet {} for {}", toString(packet.type), getDescription());
+    }
+
+    return packet;
+}
+
+void LocalConnection::getServerVersion(
+    const ConnectionTimeouts & /* timeouts */, String & /* name */,
+    UInt64 & /* version_major */, UInt64 & /* version_minor */,
+    UInt64 & /* version_patch */, UInt64 & /* revision */)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+}
+
+void LocalConnection::setDefaultDatabase(const String &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+}
+
+UInt64 LocalConnection::getServerRevision(const ConnectionTimeouts &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+}
+
+const String & LocalConnection::getServerTimezone(const ConnectionTimeouts &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+}
+
+const String & LocalConnection::getServerDisplayName(const ConnectionTimeouts &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+}
+
+void LocalConnection::sendExternalTablesData(ExternalTablesData &)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Not implemented");
+}
+
+ServerConnectionPtr LocalConnection::createConnection(const ConnectionParameters &, ContextPtr current_context, bool send_progress)
+{
+    return std::make_unique<LocalConnection>(current_context, send_progress);
+}
+
+
+}
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
new file mode 100644
index 00000000000..1cc23defa6e
--- /dev/null
+++ b/src/Client/LocalConnection.h
@@ -0,0 +1,142 @@
+#pragma once
+
+#include "Connection.h"
+#include <Interpreters/Context.h>
+#include <QueryPipeline/BlockIO.h>
+#include <IO/TimeoutSetter.h>
+#include <Interpreters/Session.h>
+#include <Storages/ColumnsDescription.h>
+
+
+namespace DB
+{
+class PullingAsyncPipelineExecutor;
+class PushingAsyncPipelineExecutor;
+class PushingPipelineExecutor;
+
+/// State of query processing.
+struct LocalQueryState
+{
+    /// Identifier of the query.
+    String query_id;
+    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete;
+
+    /// Query text.
+    String query;
+    /// Streams of blocks, that are processing the query.
+    BlockIO io;
+    /// Current stream to pull blocks from.
+    std::unique_ptr<PullingAsyncPipelineExecutor> executor;
+    std::unique_ptr<PushingPipelineExecutor> pushing_executor;
+    std::unique_ptr<PushingAsyncPipelineExecutor> pushing_async_executor;
+
+    std::optional<Exception> exception;
+
+    /// Current block to be sent next.
+    std::optional<Block> block;
+    std::optional<ColumnsDescription> columns_description;
+
+    /// Is request cancelled
+    bool is_cancelled = false;
+    bool is_finished = false;
+
+    bool sent_totals = false;
+    bool sent_extremes = false;
+    bool sent_progress = false;
+
+    /// To output progress, the difference after the previous sending of progress.
+    Progress progress;
+    /// Time after the last check to stop the request and send the progress.
+    Stopwatch after_send_progress;
+};
+
+
+class LocalConnection : public IServerConnection, WithContext
+{
+public:
+    explicit LocalConnection(ContextPtr context_, bool send_progress_ = false);
+
+    ~LocalConnection() override;
+
+    IServerConnection::Type getConnectionType() const override { return IServerConnection::Type::LOCAL; }
+
+    static ServerConnectionPtr createConnection(const ConnectionParameters & connection_parameters, ContextPtr current_context, bool send_progress = false);
+
+    void setDefaultDatabase(const String & database) override;
+
+    void getServerVersion(const ConnectionTimeouts & timeouts,
+                          String & name,
+                          UInt64 & version_major,
+                          UInt64 & version_minor,
+                          UInt64 & version_patch,
+                          UInt64 & revision) override;
+
+    UInt64 getServerRevision(const ConnectionTimeouts & timeouts) override;
+    const String & getServerTimezone(const ConnectionTimeouts & timeouts) override;
+    const String & getServerDisplayName(const ConnectionTimeouts & timeouts) override;
+
+    const String & getDescription() const override { return description; }
+
+    void sendQuery(
+        const ConnectionTimeouts & timeouts,
+        const String & query,
+        const String & query_id/* = "" */,
+        UInt64 stage/* = QueryProcessingStage::Complete */,
+        const Settings * settings/* = nullptr */,
+        const ClientInfo * client_info/* = nullptr */,
+        bool with_pending_data/* = false */) override;
+
+    void sendCancel() override;
+
+    void sendData(const Block & block, const String & name/* = "" */, bool scalar/* = false */) override;
+
+    void sendExternalTablesData(ExternalTablesData &) override;
+
+    bool poll(size_t timeout_microseconds/* = 0 */) override;
+
+    bool hasReadPendingData() const override;
+
+    std::optional<UInt64> checkPacket(size_t timeout_microseconds/* = 0*/) override;
+
+    Packet receivePacket() override;
+
+    void forceConnected(const ConnectionTimeouts &) override {}
+
+    bool isConnected() const override { return true; }
+
+    bool checkConnected() override { return true; }
+
+    void disconnect() override {}
+
+    void setThrottler(const ThrottlerPtr &) override {}
+
+private:
+    void initBlockInput();
+
+    void processOrdinaryQuery();
+
+    void processOrdinaryQueryWithProcessors();
+
+    void updateState();
+
+    bool pullBlock(Block & block);
+
+    void finishQuery();
+
+    void updateProgress(const Progress & value);
+
+    bool pollImpl();
+
+    ContextMutablePtr query_context;
+    Session session;
+
+    bool send_progress;
+    String description = "clickhouse-local";
+
+    std::optional<LocalQueryState> state;
+    std::optional<ThreadStatus> thread_status;
+
+    /// Last "server" packet.
+    std::optional<UInt64> next_packet_type;
+};
+}
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index fe3879fdd30..a27f7709555 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -2,6 +2,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <IO/Operators.h>
 #include <Common/thread_local_rng.h>
+#include "Core/Protocol.h"
 
 
 namespace DB
@@ -320,6 +321,7 @@ Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callbac
         case Protocol::Server::Totals:
         case Protocol::Server::Extremes:
         case Protocol::Server::Log:
+        case Protocol::Server::ProfileEvents:
             break;
 
         case Protocol::Server::EndOfStream:
@@ -373,7 +375,9 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
             except_list,
             is_draining ? drain_timeout : receive_timeout);
 
-        if (n == 0)
+        /// We treat any error as timeout for simplicity.
+        /// And we also check if read_list is still empty just in case.
+        if (n <= 0 || read_list.empty())
         {
             auto err_msg = fmt::format("Timeout exceeded while reading from {}", dumpAddressesUnlocked());
             for (ReplicaState & state : replica_states)
@@ -389,9 +393,7 @@ MultiplexedConnections::ReplicaState & MultiplexedConnections::getReplicaForRead
         }
     }
 
-    /// TODO Absolutely wrong code: read_list could be empty; motivation of rand is unclear.
-    /// This code path is disabled by default.
-
+    /// TODO Motivation of rand is unclear.
     auto & socket = read_list[thread_local_rng() % read_list.size()];
     if (fd_to_replica_state_idx.empty())
     {
diff --git a/programs/client/QueryFuzzer.cpp b/src/Client/QueryFuzzer.cpp
similarity index 98%
rename from programs/client/QueryFuzzer.cpp
rename to src/Client/QueryFuzzer.cpp
index aa9f89e47b5..ec267e44a99 100644
--- a/programs/client/QueryFuzzer.cpp
+++ b/src/Client/QueryFuzzer.cpp
@@ -144,7 +144,7 @@ Field QueryFuzzer::fuzzField(Field field)
         {
             size_t pos = fuzz_rand() % arr.size();
             arr.erase(arr.begin() + pos);
-            fprintf(stderr, "erased\n");
+            std::cerr << "erased\n";
         }
 
         if (fuzz_rand() % 5 == 0)
@@ -153,12 +153,12 @@ Field QueryFuzzer::fuzzField(Field field)
             {
                 size_t pos = fuzz_rand() % arr.size();
                 arr.insert(arr.begin() + pos, fuzzField(arr[pos]));
-                fprintf(stderr, "inserted (pos %zd)\n", pos);
+                std::cerr << fmt::format("inserted (pos {})\n", pos);
             }
             else
             {
                 arr.insert(arr.begin(), getRandomField(0));
-                fprintf(stderr, "inserted (0)\n");
+                std::cerr << "inserted (0)\n";
             }
 
         }
@@ -278,7 +278,7 @@ void QueryFuzzer::fuzzOrderByList(IAST * ast)
         }
         else
         {
-            fprintf(stderr, "no random col!\n");
+            std::cerr << "No random column.\n";
         }
     }
 
@@ -312,13 +312,9 @@ void QueryFuzzer::fuzzColumnLikeExpressionList(IAST * ast)
                 : impl->children.begin() + fuzz_rand() % impl->children.size();
         auto col = getRandomColumnLike();
         if (col)
-        {
             impl->children.insert(pos, col);
-        }
         else
-        {
-            fprintf(stderr, "no random col!\n");
-        }
+            std::cerr << "No random column.\n";
     }
 
     // We don't have to recurse here to fuzz the children, this is handled by
diff --git a/programs/client/QueryFuzzer.h b/src/Client/QueryFuzzer.h
similarity index 98%
rename from programs/client/QueryFuzzer.h
rename to src/Client/QueryFuzzer.h
index 19f089c6c4e..09d57f4161f 100644
--- a/programs/client/QueryFuzzer.h
+++ b/src/Client/QueryFuzzer.h
@@ -7,7 +7,6 @@
 #include <pcg-random/pcg_random.hpp>
 
 #include <Common/randomSeed.h>
-#include <Common/Stopwatch.h>
 #include <Core/Field.h>
 #include <Parsers/IAST.h>
 
diff --git a/programs/client/Suggest.cpp b/src/Client/Suggest.cpp
similarity index 69%
rename from programs/client/Suggest.cpp
rename to src/Client/Suggest.cpp
index d4db49a1598..b14af7ba8e9 100644
--- a/programs/client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -1,10 +1,20 @@
 #include "Suggest.h"
 
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
 #include <Core/Settings.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
-#include <IO/WriteBufferFromString.h>
+#include <Common/Macros.h>
+#include "Core/Protocol.h"
 #include <IO/Operators.h>
+#include <Functions/FunctionFactory.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Storages/StorageFactory.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Interpreters/Context.h>
+#include <Client/Connection.h>
+#include <Client/LocalConnection.h>
 
 
 namespace DB
@@ -16,31 +26,90 @@ namespace ErrorCodes
     extern const int DEADLOCK_AVOIDED;
 }
 
-void Suggest::load(const ConnectionParameters & connection_parameters, size_t suggestion_limit)
+Suggest::Suggest()
 {
-    loading_thread = std::thread([connection_parameters, suggestion_limit, this]
+    /// Keywords may be not up to date with ClickHouse parser.
+    words = {"CREATE",       "DATABASE", "IF",     "NOT",       "EXISTS",   "TEMPORARY",   "TABLE",    "ON",          "CLUSTER", "DEFAULT",
+             "MATERIALIZED", "ALIAS",    "ENGINE", "AS",        "VIEW",     "POPULATE",    "SETTINGS", "ATTACH",      "DETACH",  "DROP",
+             "RENAME",       "TO",       "ALTER",  "ADD",       "MODIFY",   "CLEAR",       "COLUMN",   "AFTER",       "COPY",    "PROJECT",
+             "PRIMARY",      "KEY",      "CHECK",  "PARTITION", "PART",     "FREEZE",      "FETCH",    "FROM",        "SHOW",    "INTO",
+             "OUTFILE",      "FORMAT",   "TABLES", "DATABASES", "LIKE",     "PROCESSLIST", "CASE",     "WHEN",        "THEN",    "ELSE",
+             "END",          "DESCRIBE", "DESC",   "USE",       "SET",      "OPTIMIZE",    "FINAL",    "DEDUPLICATE", "INSERT",  "VALUES",
+             "SELECT",       "DISTINCT", "SAMPLE", "ARRAY",     "JOIN",     "GLOBAL",      "LOCAL",    "ANY",         "ALL",     "INNER",
+             "LEFT",         "RIGHT",    "FULL",   "OUTER",     "CROSS",    "USING",       "PREWHERE", "WHERE",       "GROUP",   "BY",
+             "WITH",         "TOTALS",   "HAVING", "ORDER",     "COLLATE",  "LIMIT",       "UNION",    "AND",         "OR",      "ASC",
+             "IN",           "KILL",     "QUERY",  "SYNC",      "ASYNC",    "TEST",        "BETWEEN",  "TRUNCATE",    "USER",    "ROLE",
+             "PROFILE",      "QUOTA",    "POLICY", "ROW",       "GRANT",    "REVOKE",      "OPTION",   "ADMIN",       "EXCEPT",  "REPLACE",
+             "IDENTIFIED",   "HOST",     "NAME",   "READONLY",  "WRITABLE", "PERMISSIVE",  "FOR",      "RESTRICTIVE", "RANDOMIZED",
+             "INTERVAL",     "LIMITS",   "ONLY",   "TRACKING",  "IP",       "REGEXP",      "ILIKE"};
+}
+
+static String getLoadSuggestionQuery(Int32 suggestion_limit, bool basic_suggestion)
+{
+    /// NOTE: Once you will update the completion list,
+    /// do not forget to update 01676_clickhouse_client_autocomplete.sh
+    WriteBufferFromOwnString query;
+    query << "SELECT DISTINCT arrayJoin(extractAll(name, '[\\\\w_]{2,}')) AS res FROM ("
+        "SELECT name FROM system.functions"
+        " UNION ALL "
+        "SELECT name FROM system.table_engines"
+        " UNION ALL "
+        "SELECT name FROM system.formats"
+        " UNION ALL "
+        "SELECT name FROM system.table_functions"
+        " UNION ALL "
+        "SELECT name FROM system.data_type_families"
+        " UNION ALL "
+        "SELECT name FROM system.merge_tree_settings"
+        " UNION ALL "
+        "SELECT name FROM system.settings"
+        " UNION ALL ";
+    if (!basic_suggestion)
+    {
+        query << "SELECT cluster FROM system.clusters"
+                 " UNION ALL "
+                 "SELECT macro FROM system.macros"
+                 " UNION ALL "
+                 "SELECT policy_name FROM system.storage_policies"
+                 " UNION ALL ";
+    }
+    query << "SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE is_aggregate";
+    /// The user may disable loading of databases, tables, columns by setting suggestion_limit to zero.
+    if (suggestion_limit > 0)
+    {
+        String limit_str = toString(suggestion_limit);
+        query << " UNION ALL "
+                 "SELECT name FROM system.databases LIMIT " << limit_str
+              << " UNION ALL "
+                 "SELECT DISTINCT name FROM system.tables LIMIT " << limit_str
+              << " UNION ALL ";
+
+        if (!basic_suggestion)
+        {
+            query << "SELECT DISTINCT name FROM system.dictionaries LIMIT " << limit_str
+                  << " UNION ALL ";
+        }
+        query << "SELECT DISTINCT name FROM system.columns LIMIT " << limit_str;
+    }
+    query << ") WHERE notEmpty(res)";
+
+    return query.str();
+}
+
+template <typename ConnectionType>
+void Suggest::load(ContextPtr context, const ConnectionParameters & connection_parameters, Int32 suggestion_limit)
+{
+    loading_thread = std::thread([context=Context::createCopy(context), connection_parameters, suggestion_limit, this]
     {
         for (size_t retry = 0; retry < 10; ++retry)
         {
             try
             {
-                Connection connection(
-                    connection_parameters.host,
-                    connection_parameters.port,
-                    connection_parameters.default_database,
-                    connection_parameters.user,
-                    connection_parameters.password,
-                    "" /* cluster */,
-                    "" /* cluster_secret */,
-                    "client",
-                    connection_parameters.compression,
-                    connection_parameters.security);
-
-                loadImpl(connection, connection_parameters.timeouts, suggestion_limit);
+                auto connection = ConnectionType::createConnection(connection_parameters, context);
+                fetch(*connection, connection_parameters.timeouts, getLoadSuggestionQuery(suggestion_limit, std::is_same_v<ConnectionType, LocalConnection>));
             }
             catch (const Exception & e)
             {
-                /// Retry when the server said "Client should retry".
                 if (e.code() == ErrorCodes::DEADLOCK_AVOIDED)
                     continue;
 
@@ -70,76 +139,9 @@ void Suggest::load(const ConnectionParameters & connection_parameters, size_t su
     });
 }
 
-Suggest::Suggest()
+void Suggest::fetch(IServerConnection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
 {
-    /// Keywords may be not up to date with ClickHouse parser.
-    words = {"CREATE",       "DATABASE", "IF",     "NOT",       "EXISTS",   "TEMPORARY",   "TABLE",    "ON",          "CLUSTER", "DEFAULT",
-             "MATERIALIZED", "ALIAS",    "ENGINE", "AS",        "VIEW",     "POPULATE",    "SETTINGS", "ATTACH",      "DETACH",  "DROP",
-             "RENAME",       "TO",       "ALTER",  "ADD",       "MODIFY",   "CLEAR",       "COLUMN",   "AFTER",       "COPY",    "PROJECT",
-             "PRIMARY",      "KEY",      "CHECK",  "PARTITION", "PART",     "FREEZE",      "FETCH",    "FROM",        "SHOW",    "INTO",
-             "OUTFILE",      "FORMAT",   "TABLES", "DATABASES", "LIKE",     "PROCESSLIST", "CASE",     "WHEN",        "THEN",    "ELSE",
-             "END",          "DESCRIBE", "DESC",   "USE",       "SET",      "OPTIMIZE",    "FINAL",    "DEDUPLICATE", "INSERT",  "VALUES",
-             "SELECT",       "DISTINCT", "SAMPLE", "ARRAY",     "JOIN",     "GLOBAL",      "LOCAL",    "ANY",         "ALL",     "INNER",
-             "LEFT",         "RIGHT",    "FULL",   "OUTER",     "CROSS",    "USING",       "PREWHERE", "WHERE",       "GROUP",   "BY",
-             "WITH",         "TOTALS",   "HAVING", "ORDER",     "COLLATE",  "LIMIT",       "UNION",    "AND",         "OR",      "ASC",
-             "IN",           "KILL",     "QUERY",  "SYNC",      "ASYNC",    "TEST",        "BETWEEN",  "TRUNCATE",    "USER",    "ROLE",
-             "PROFILE",      "QUOTA",    "POLICY", "ROW",       "GRANT",    "REVOKE",      "OPTION",   "ADMIN",       "EXCEPT",  "REPLACE",
-             "IDENTIFIED",   "HOST",     "NAME",   "READONLY",  "WRITABLE", "PERMISSIVE",  "FOR",      "RESTRICTIVE", "RANDOMIZED",
-             "INTERVAL",     "LIMITS",   "ONLY",   "TRACKING",  "IP",       "REGEXP",      "ILIKE"};
-}
-
-void Suggest::loadImpl(Connection & connection, const ConnectionTimeouts & timeouts, size_t suggestion_limit)
-{
-    /// NOTE: Once you will update the completion list,
-    /// do not forget to update 01676_clickhouse_client_autocomplete.sh
-
-    WriteBufferFromOwnString query;
-    query << "SELECT DISTINCT arrayJoin(extractAll(name, '[\\\\w_]{2,}')) AS res FROM ("
-        "SELECT name FROM system.functions"
-        " UNION ALL "
-        "SELECT name FROM system.table_engines"
-        " UNION ALL "
-        "SELECT name FROM system.formats"
-        " UNION ALL "
-        "SELECT name FROM system.table_functions"
-        " UNION ALL "
-        "SELECT name FROM system.data_type_families"
-        " UNION ALL "
-        "SELECT name FROM system.merge_tree_settings"
-        " UNION ALL "
-        "SELECT name FROM system.settings"
-        " UNION ALL "
-        "SELECT cluster FROM system.clusters"
-        " UNION ALL "
-        "SELECT macro FROM system.macros"
-        " UNION ALL "
-        "SELECT policy_name FROM system.storage_policies"
-        " UNION ALL "
-        "SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE is_aggregate";
-
-    /// The user may disable loading of databases, tables, columns by setting suggestion_limit to zero.
-    if (suggestion_limit > 0)
-    {
-        String limit_str = toString(suggestion_limit);
-        query <<
-            " UNION ALL "
-            "SELECT name FROM system.databases LIMIT " << limit_str
-            << " UNION ALL "
-            "SELECT DISTINCT name FROM system.tables LIMIT " << limit_str
-            << " UNION ALL "
-            "SELECT DISTINCT name FROM system.dictionaries LIMIT " << limit_str
-            << " UNION ALL "
-            "SELECT DISTINCT name FROM system.columns LIMIT " << limit_str;
-    }
-
-    query << ") WHERE notEmpty(res)";
-
-    fetch(connection, timeouts, query.str());
-}
-
-void Suggest::fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query)
-{
-    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete);
+    connection.sendQuery(timeouts, query, "" /* query_id */, QueryProcessingStage::Complete, nullptr, nullptr, false);
 
     while (true)
     {
@@ -160,6 +162,8 @@ void Suggest::fetch(Connection & connection, const ConnectionTimeouts & timeouts
                 continue;
             case Protocol::Server::Log:
                 continue;
+            case Protocol::Server::ProfileEvents:
+                continue;
 
             case Protocol::Server::Exception:
                 packet.exception->rethrow();
@@ -190,4 +194,9 @@ void Suggest::fillWordsFromBlock(const Block & block)
         words.emplace_back(column.getDataAt(i).toString());
 }
 
+template
+void Suggest::load<Connection>(ContextPtr context, const ConnectionParameters & connection_parameters, Int32 suggestion_limit);
+
+template
+void Suggest::load<LocalConnection>(ContextPtr context, const ConnectionParameters & connection_parameters, Int32 suggestion_limit);
 }
diff --git a/programs/client/Suggest.h b/src/Client/Suggest.h
similarity index 59%
rename from programs/client/Suggest.h
rename to src/Client/Suggest.h
index 03332088cbe..65b60ceffc4 100644
--- a/programs/client/Suggest.h
+++ b/src/Client/Suggest.h
@@ -3,37 +3,37 @@
 #include "ConnectionParameters.h"
 
 #include <Client/Connection.h>
+#include <Client/IServerConnection.h>
+#include <Client/LocalConnection.h>
 #include <IO/ConnectionTimeouts.h>
-#include <common/LineReader.h>
+#include <base/LineReader.h>
 #include <thread>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-}
-
 class Suggest : public LineReader::Suggest, boost::noncopyable
 {
 public:
     Suggest();
+
     ~Suggest()
     {
         if (loading_thread.joinable())
             loading_thread.join();
     }
 
-    void load(const ConnectionParameters & connection_parameters, size_t suggestion_limit);
+    /// Load suggestions for clickhouse-client.
+    template <typename ConnectionType>
+    void load(ContextPtr context, const ConnectionParameters & connection_parameters, Int32 suggestion_limit);
 
     /// Older server versions cannot execute the query above.
     static constexpr int MIN_SERVER_REVISION = 54406;
 
 private:
+    void fetch(IServerConnection & connection, const ConnectionTimeouts & timeouts, const std::string & query);
 
-    void loadImpl(Connection & connection, const ConnectionTimeouts & timeouts, size_t suggestion_limit);
-    void fetch(Connection & connection, const ConnectionTimeouts & timeouts, const std::string & query);
     void fillWordsFromBlock(const Block & block);
 
     /// Words are fetched asynchronously.
diff --git a/src/Client/TestHint.cpp b/src/Client/TestHint.cpp
new file mode 100644
index 00000000000..2f3be2a5350
--- /dev/null
+++ b/src/Client/TestHint.cpp
@@ -0,0 +1,105 @@
+#include "TestHint.h"
+
+#include <Common/Exception.h>
+#include <Common/ErrorCodes.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <Parsers/Lexer.h>
+
+namespace
+{
+
+/// Parse error as number or as a string (name of the error code const)
+int parseErrorCode(DB::ReadBufferFromString & in)
+{
+    int code = -1;
+    String code_name;
+
+    auto * pos = in.position();
+    tryReadText(code, in);
+    if (pos != in.position())
+    {
+        return code;
+    }
+
+    /// Try parse as string
+    readStringUntilWhitespace(code_name, in);
+    return DB::ErrorCodes::getErrorCodeByName(code_name);
+}
+
+}
+
+namespace DB
+{
+
+TestHint::TestHint(bool enabled_, const String & query_)
+    : query(query_)
+{
+    if (!enabled_)
+        return;
+
+    // Don't parse error hints in leading comments, because it feels weird.
+    // Leading 'echo' hint is OK.
+    bool is_leading_hint = true;
+
+    Lexer lexer(query.data(), query.data() + query.size());
+
+    for (Token token = lexer.nextToken(); !token.isEnd(); token = lexer.nextToken())
+    {
+        if (token.type != TokenType::Comment
+            && token.type != TokenType::Whitespace)
+        {
+            is_leading_hint = false;
+        }
+        else if (token.type == TokenType::Comment)
+        {
+            String comment(token.begin, token.begin + token.size());
+
+            if (!comment.empty())
+            {
+                size_t pos_start = comment.find('{', 0);
+                if (pos_start != String::npos)
+                {
+                    size_t pos_end = comment.find('}', pos_start);
+                    if (pos_end != String::npos)
+                    {
+                        String hint(comment.begin() + pos_start + 1, comment.begin() + pos_end);
+                        parse(hint, is_leading_hint);
+                    }
+                }
+            }
+        }
+    }
+}
+
+void TestHint::parse(const String & hint, bool is_leading_hint)
+{
+    ReadBufferFromString in(hint);
+    String item;
+
+    while (!in.eof())
+    {
+        readStringUntilWhitespace(item, in);
+        if (in.eof())
+            break;
+
+        skipWhitespaceIfAny(in);
+
+        if (!is_leading_hint)
+        {
+            if (item == "serverError")
+                server_error = parseErrorCode(in);
+            else if (item == "clientError")
+                client_error = parseErrorCode(in);
+        }
+
+        if (item == "echo")
+            echo.emplace(true);
+        if (item == "echoOn")
+            echo.emplace(true);
+        if (item == "echoOff")
+            echo.emplace(false);
+    }
+}
+
+}
diff --git a/src/Client/TestHint.h b/src/Client/TestHint.h
new file mode 100644
index 00000000000..377637d0db8
--- /dev/null
+++ b/src/Client/TestHint.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <optional>
+#include <Core/Types.h>
+
+
+namespace DB
+{
+
+/// Checks expected server and client error codes in --testmode.
+///
+/// The following comment hints are supported:
+///
+/// - "-- { serverError 60 }" -- in case of you are expecting server error.
+///
+/// - "-- { clientError 20 }" -- in case of you are expecting client error.
+///
+/// - "-- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }" -- by error name.
+///
+/// - "-- { clientError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }" -- by error name.
+///
+///   Remember that the client parse the query first (not the server), so for
+///   example if you are expecting syntax error, then you should use
+///   clientError not serverError.
+///
+/// Examples:
+///
+/// - echo 'select / -- { clientError 62 }' | clickhouse-client --testmode -nm
+///
+//    Here the client parses the query but it is incorrect, so it expects
+///   SYNTAX_ERROR (62).
+///
+/// - echo 'select foo -- { serverError 47 }' | clickhouse-client --testmode -nm
+///
+///   But here the query is correct, but there is no such column "foo", so it
+///   is UNKNOWN_IDENTIFIER server error.
+///
+/// The following hints will control the query echo mode (i.e print each query):
+///
+/// - "-- { echo }"
+/// - "-- { echoOn }"
+/// - "-- { echoOff }"
+class TestHint
+{
+public:
+    TestHint(bool enabled_, const String & query_);
+
+    int serverError() const { return server_error; }
+    int clientError() const { return client_error; }
+    std::optional<bool> echoQueries() const { return echo; }
+
+private:
+    const String & query;
+    int server_error = 0;
+    int client_error = 0;
+    std::optional<bool> echo;
+
+    void parse(const String & hint, bool is_leading_hint);
+
+    bool allErrorsExpected(int actual_server_error, int actual_client_error) const
+    {
+        return (server_error || client_error) && (server_error == actual_server_error) && (client_error == actual_client_error);
+    }
+
+    bool lostExpectedError(int actual_server_error, int actual_client_error) const
+    {
+        return (server_error && !actual_server_error) || (client_error && !actual_client_error);
+    }
+};
+
+}
diff --git a/src/Client/ya.make b/src/Client/ya.make
deleted file mode 100644
index 88fa14ad377..00000000000
--- a/src/Client/ya.make
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/NetSSL_OpenSSL
-)
-
-
-SRCS(
-    Connection.cpp
-    ConnectionEstablisher.cpp
-    ConnectionPool.cpp
-    ConnectionPoolWithFailover.cpp
-    HedgedConnections.cpp
-    HedgedConnectionsFactory.cpp
-    IConnections.cpp
-    MultiplexedConnections.cpp
-
-)
-
-END()
diff --git a/src/Client/ya.make.in b/src/Client/ya.make.in
deleted file mode 100644
index 0ea90f75a6c..00000000000
--- a/src/Client/ya.make.in
+++ /dev/null
@@ -1,15 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/NetSSL_OpenSSL
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Columns/Collator.cpp b/src/Columns/Collator.cpp
index d33f65e3836..312216054f5 100644
--- a/src/Columns/Collator.cpp
+++ b/src/Columns/Collator.cpp
@@ -1,8 +1,6 @@
 #include <Columns/Collator.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_ICU
 #    include <unicode/locid.h>
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index 58e9bb05c1b..cd1185d99db 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -1,7 +1,8 @@
 #include <Columns/ColumnAggregateFunction.h>
 #include <Columns/ColumnsCommon.h>
+#include <Columns/MaskOperations.h>
 #include <Common/assert_cast.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBufferFromArena.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
@@ -308,26 +309,14 @@ ColumnPtr ColumnAggregateFunction::filter(const Filter & filter, ssize_t result_
     return res;
 }
 
+void ColumnAggregateFunction::expand(const Filter & mask, bool inverted)
+{
+    expandDataByMask<char *>(data, mask, inverted);
+}
 
 ColumnPtr ColumnAggregateFunction::permute(const Permutation & perm, size_t limit) const
 {
-    size_t size = data.size();
-
-    if (limit == 0)
-        limit = size;
-    else
-        limit = std::min(size, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-    auto res = createView();
-
-    res->data.resize(limit);
-    for (size_t i = 0; i < limit; ++i)
-        res->data[i] = data[perm[i]];
-
-    return res;
+    return permuteImpl(*this, perm, limit);
 }
 
 ColumnPtr ColumnAggregateFunction::index(const IColumn & indexes, size_t limit) const
@@ -338,6 +327,7 @@ ColumnPtr ColumnAggregateFunction::index(const IColumn & indexes, size_t limit)
 template <typename Type>
 ColumnPtr ColumnAggregateFunction::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
+    assert(limit <= indexes.size());
     auto res = createView();
 
     res->data.resize(limit);
@@ -501,8 +491,9 @@ static void pushBackAndCreateState(ColumnAggregateFunction::Container & data, Ar
 void ColumnAggregateFunction::insert(const Field & x)
 {
     if (x.getType() != Field::Types::AggregateFunctionState)
-        throw Exception(String("Inserting field of type ") + x.getTypeName() + " into ColumnAggregateFunction. "
-                        "Expected " + Field::Types::toString(Field::Types::AggregateFunctionState), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Inserting field of type {} into ColumnAggregateFunction. Expected {}",
+            x.getTypeName(), Field::Types::AggregateFunctionState);
 
     const auto & field_name = x.get<const AggregateFunctionStateData &>().name;
     if (type_string != field_name)
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index 8eb1a04b174..36f3b5ba793 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -177,6 +177,8 @@ public:
 
     ColumnPtr filter(const Filter & filter, ssize_t result_size_hint) const override;
 
+    void expand(const Filter & mask, bool inverted) override;
+
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
 
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 1b0c9f5162f..5e40b89cc7e 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -8,11 +8,12 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
+#include <Columns/MaskOperations.h>
 
-#include <common/unaligned.h>
-#include <common/sort.h>
+#include <base/unaligned.h>
+#include <base/sort.h>
 
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 #include <Common/Exception.h>
 #include <Common/Arena.h>
@@ -385,11 +386,8 @@ bool ColumnArray::hasEqualValues() const
     return hasEqualValuesImpl<ColumnArray>();
 }
 
-namespace
-{
-
 template <bool positive>
-struct Cmp
+struct ColumnArray::Cmp
 {
     const ColumnArray & parent;
     int nan_direction_hint;
@@ -405,13 +403,14 @@ struct Cmp
             res = parent.compareAtWithCollation(lhs, rhs, parent, nan_direction_hint, *collator);
         else
             res = parent.compareAt(lhs, rhs, parent, nan_direction_hint);
-        return positive ? res : -res;
+
+        if constexpr (positive)
+            return res;
+        else
+            return -res;
     }
 };
 
-}
-
-
 void ColumnArray::reserve(size_t n)
 {
     getOffsets().reserve(n);
@@ -551,6 +550,34 @@ ColumnPtr ColumnArray::filter(const Filter & filt, ssize_t result_size_hint) con
     return filterGeneric(filt, result_size_hint);
 }
 
+void ColumnArray::expand(const IColumn::Filter & mask, bool inverted)
+{
+    auto & offsets_data = getOffsets();
+    if (mask.size() < offsets_data.size())
+        throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
+
+    int index = mask.size() - 1;
+    int from = offsets_data.size() - 1;
+    offsets_data.resize(mask.size());
+    UInt64 last_offset = offsets_data[from];
+    while (index >= 0)
+    {
+        offsets_data[index] = last_offset;
+        if (!!mask[index] ^ inverted)
+        {
+            if (from < 0)
+                throw Exception("Too many bytes in mask", ErrorCodes::LOGICAL_ERROR);
+
+            --from;
+            last_offset = offsets_data[from];
+        }
+
+        --index;
+    }
+
+    if (from != -1)
+        throw Exception("Not enough bytes in mask", ErrorCodes::LOGICAL_ERROR);}
+
 template <typename T>
 ColumnPtr ColumnArray::filterNumber(const Filter & filt, ssize_t result_size_hint) const
 {
@@ -733,39 +760,7 @@ ColumnPtr ColumnArray::filterTuple(const Filter & filt, ssize_t result_size_hint
 
 ColumnPtr ColumnArray::permute(const Permutation & perm, size_t limit) const
 {
-    size_t size = getOffsets().size();
-
-    if (limit == 0)
-        limit = size;
-    else
-        limit = std::min(size, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-    if (limit == 0)
-        return ColumnArray::create(data);
-
-    Permutation nested_perm(getOffsets().back());
-
-    auto res = ColumnArray::create(data->cloneEmpty());
-
-    Offsets & res_offsets = res->getOffsets();
-    res_offsets.resize(limit);
-    size_t current_offset = 0;
-
-    for (size_t i = 0; i < limit; ++i)
-    {
-        for (size_t j = 0; j < sizeAt(perm[i]); ++j)
-            nested_perm[current_offset + j] = offsetAt(perm[i]) + j;
-        current_offset += sizeAt(perm[i]);
-        res_offsets[i] = current_offset;
-    }
-
-    if (current_offset != 0)
-        res->data = data->permute(nested_perm, current_offset);
-
-    return res;
+    return permuteImpl(*this, perm, limit);
 }
 
 ColumnPtr ColumnArray::index(const IColumn & indexes, size_t limit) const
@@ -776,8 +771,9 @@ ColumnPtr ColumnArray::index(const IColumn & indexes, size_t limit) const
 template <typename T>
 ColumnPtr ColumnArray::indexImpl(const PaddedPODArray<T> & indexes, size_t limit) const
 {
+    assert(limit <= indexes.size());
     if (limit == 0)
-        return ColumnArray::create(data);
+        return ColumnArray::create(data->cloneEmpty());
 
     /// Convert indexes to UInt64 in case of overflow.
     auto nested_indexes_column = ColumnUInt64::create();
@@ -825,82 +821,6 @@ void ColumnArray::getPermutationImpl(size_t limit, Permutation & res, Comparator
         std::sort(res.begin(), res.end(), less);
 }
 
-template <typename Comparator>
-void ColumnArray::updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_range, Comparator cmp) const
-{
-    if (equal_range.empty())
-        return;
-
-    if (limit >= size() || limit >= equal_range.back().second)
-        limit = 0;
-
-    size_t number_of_ranges = equal_range.size();
-
-    if (limit)
-        --number_of_ranges;
-
-    auto less = [&cmp](size_t lhs, size_t rhs){ return cmp(lhs, rhs) < 0; };
-
-    EqualRanges new_ranges;
-    for (size_t i = 0; i < number_of_ranges; ++i)
-    {
-        const auto & [first, last] = equal_range[i];
-
-        std::sort(res.begin() + first, res.begin() + last, less);
-        auto new_first = first;
-
-        for (auto j = first + 1; j < last; ++j)
-        {
-            if (cmp(res[new_first], res[j]) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-
-        if (last - new_first > 1)
-            new_ranges.emplace_back(new_first, last);
-    }
-
-    if (limit)
-    {
-        const auto & [first, last] = equal_range.back();
-
-        if (limit < first || limit > last)
-            return;
-
-        /// Since then we are working inside the interval.
-        partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less);
-        auto new_first = first;
-        for (auto j = first + 1; j < limit; ++j)
-        {
-            if (cmp(res[new_first], res[j]) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        auto new_last = limit;
-        for (auto j = limit; j < last; ++j)
-        {
-            if (cmp(res[new_first], res[j]) == 0)
-            {
-                std::swap(res[new_last], res[j]);
-                ++new_last;
-            }
-        }
-        if (new_last - new_first > 1)
-        {
-            new_ranges.emplace_back(new_first, new_last);
-        }
-    }
-    equal_range = std::move(new_ranges);
-}
-
 void ColumnArray::getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const
 {
     if (reverse)
diff --git a/src/Columns/ColumnArray.h b/src/Columns/ColumnArray.h
index 75bd4a6dba4..48c54eca319 100644
--- a/src/Columns/ColumnArray.h
+++ b/src/Columns/ColumnArray.h
@@ -28,6 +28,8 @@ private:
 
     ColumnArray(const ColumnArray &) = default;
 
+    template <bool positive> struct Cmp;
+
 public:
     /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
@@ -71,6 +73,7 @@ public:
     void insertDefault() override;
     void popBack(size_t n) override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     template <typename Type> ColumnPtr indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const;
@@ -184,9 +187,6 @@ private:
 
     template <typename Comparator>
     void getPermutationImpl(size_t limit, Permutation & res, Comparator cmp) const;
-
-    template <typename Comparator>
-    void updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_range, Comparator cmp) const;
 };
 
 
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index 3cc2c014732..92bdca7cd72 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -57,9 +57,13 @@ public:
       */
     static ColumnPtr wrap(ColumnPtr column)
     {
+        /// The order of evaluation of function arguments is unspecified
+        /// and could cause interacting with object in moved-from state
+        const auto size = column->size();
+        const auto bytes = column->allocatedBytes();
         return ColumnCompressed::create(
-            column->size(),
-            column->allocatedBytes(),
+            size,
+            bytes,
             [column = std::move(column)]{ return column; });
     }
 
@@ -90,6 +94,7 @@ public:
     void updateWeakHash32(WeakHash32 &) const override { throwMustBeDecompressed(); }
     void updateHashFast(SipHash &) const override { throwMustBeDecompressed(); }
     ColumnPtr filter(const Filter &, ssize_t) const override { throwMustBeDecompressed(); }
+    void expand(const Filter &, bool) override { throwMustBeDecompressed(); }
     ColumnPtr permute(const Permutation &, size_t) const override { throwMustBeDecompressed(); }
     ColumnPtr index(const IColumn &, size_t) const override { throwMustBeDecompressed(); }
     int compareAt(size_t, size_t, const IColumn &, int) const override { throwMustBeDecompressed(); }
@@ -123,4 +128,3 @@ private:
 };
 
 }
-
diff --git a/src/Columns/ColumnConst.cpp b/src/Columns/ColumnConst.cpp
index 72988567a04..ee47889f37f 100644
--- a/src/Columns/ColumnConst.cpp
+++ b/src/Columns/ColumnConst.cpp
@@ -6,7 +6,7 @@
 #include <Common/WeakHash.h>
 #include <Common/HashTable/Hash.h>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #if defined(MEMORY_SANITIZER)
     #include <sanitizer/msan_interface.h>
@@ -59,9 +59,28 @@ ColumnPtr ColumnConst::filter(const Filter & filt, ssize_t /*result_size_hint*/)
         throw Exception("Size of filter (" + toString(filt.size()) + ") doesn't match size of column (" + toString(s) + ")",
             ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
 
-    return ColumnConst::create(data, countBytesInFilter(filt));
+    size_t new_size = countBytesInFilter(filt);
+    return ColumnConst::create(data, new_size);
 }
 
+void ColumnConst::expand(const Filter & mask, bool inverted)
+{
+    if (mask.size() < s)
+        throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
+
+    size_t bytes_count = countBytesInFilter(mask);
+    if (inverted)
+        bytes_count = mask.size() - bytes_count;
+
+    if (bytes_count < s)
+        throw Exception("Not enough bytes in mask", ErrorCodes::LOGICAL_ERROR);
+    else if (bytes_count > s)
+        throw Exception("Too many bytes in mask", ErrorCodes::LOGICAL_ERROR);
+
+    s = mask.size();
+}
+
+
 ColumnPtr ColumnConst::replicate(const Offsets & offsets) const
 {
     if (s != offsets.size())
@@ -74,15 +93,7 @@ ColumnPtr ColumnConst::replicate(const Offsets & offsets) const
 
 ColumnPtr ColumnConst::permute(const Permutation & perm, size_t limit) const
 {
-    if (limit == 0)
-        limit = s;
-    else
-        limit = std::min(s, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation (" + toString(perm.size()) + ") is less than required (" + toString(limit) + ")",
-            ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
+    limit = getLimitForPermutation(size(), perm.size(), limit);
     return ColumnConst::create(data, limit);
 }
 
diff --git a/src/Columns/ColumnConst.h b/src/Columns/ColumnConst.h
index 01d5b235a2b..1faf2a999b2 100644
--- a/src/Columns/ColumnConst.h
+++ b/src/Columns/ColumnConst.h
@@ -181,6 +181,8 @@ public:
     }
 
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
+
     ColumnPtr replicate(const Offsets & offsets) const override;
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index da49d0bd412..48f890edaaf 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -5,9 +5,9 @@
 #include <Common/WeakHash.h>
 #include <Common/HashTable/Hash.h>
 
-#include <common/unaligned.h>
-#include <common/sort.h>
-#include <common/scope_guard.h>
+#include <base/unaligned.h>
+#include <base/sort.h>
+#include <base/scope_guard.h>
 
 
 #include <IO/WriteHelpers.h>
@@ -15,7 +15,8 @@
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnCompressed.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Columns/MaskOperations.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 
 template <typename T> bool decimalLess(T x, T y, UInt32 x_scale, UInt32 y_scale);
@@ -37,7 +38,7 @@ template class DecimalPaddedPODArray<Decimal128>;
 template class DecimalPaddedPODArray<Decimal256>;
 template class DecimalPaddedPODArray<DateTime64>;
 
-template <typename T>
+template <is_decimal T>
 int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) const
 {
     auto & other = static_cast<const Self &>(rhs_);
@@ -49,7 +50,7 @@ int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) c
     return decimalLess<T>(b, a, other.scale, scale) ? 1 : (decimalLess<T>(a, b, scale, other.scale) ? -1 : 0);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                      PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
                                      int direction, int nan_direction_hint) const
@@ -58,13 +59,13 @@ void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
                                                          compare_results, direction, nan_direction_hint);
 }
 
-template <typename T>
+template <is_decimal T>
 bool ColumnDecimal<T>::hasEqualValues() const
 {
     return this->template hasEqualValuesImpl<ColumnDecimal<T>>();
 }
 
-template <typename T>
+template <is_decimal T>
 StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     auto * pos = arena.allocContinue(sizeof(T), begin);
@@ -72,20 +73,20 @@ StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, cha
     return StringRef(pos, sizeof(T));
 }
 
-template <typename T>
+template <is_decimal T>
 const char * ColumnDecimal<T>::deserializeAndInsertFromArena(const char * pos)
 {
     data.push_back(unalignedLoad<T>(pos));
     return pos + sizeof(T);
 }
 
-template <typename T>
+template <is_decimal T>
 const char * ColumnDecimal<T>::skipSerializedInArena(const char * pos) const
 {
     return pos + sizeof(T);
 }
 
-template <typename T>
+template <is_decimal T>
 UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
 {
     if constexpr (sizeof(T) > sizeof(UInt64))
@@ -94,13 +95,13 @@ UInt64 ColumnDecimal<T>::get64([[maybe_unused]] size_t n) const
         return static_cast<NativeT>(data[n]);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateHashWithValue(size_t n, SipHash & hash) const
 {
     hash.update(data[n].value);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
 {
     auto s = data.size();
@@ -121,13 +122,13 @@ void ColumnDecimal<T>::updateWeakHash32(WeakHash32 & hash) const
     }
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updateHashFast(SipHash & hash) const
 {
     hash.update(reinterpret_cast<const char *>(data.data()), size() * sizeof(data[0]));
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::getPermutation(bool reverse, size_t limit, int , IColumn::Permutation & res) const
 {
 #if 1 /// TODO: perf test
@@ -146,104 +147,32 @@ void ColumnDecimal<T>::getPermutation(bool reverse, size_t limit, int , IColumn:
     permutation(reverse, limit, res);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::updatePermutation(bool reverse, size_t limit, int, IColumn::Permutation & res, EqualRanges & equal_ranges) const
 {
-    if (equal_ranges.empty())
-        return;
+    auto equals = [this](size_t lhs, size_t rhs) { return data[lhs] == data[rhs]; };
+    auto sort = [](auto begin, auto end, auto pred) { std::sort(begin, end, pred); };
+    auto partial_sort = [](auto begin, auto mid, auto end, auto pred) { ::partial_sort(begin, mid, end, pred); };
 
-    if (limit >= data.size() || limit >= equal_ranges.back().second)
-        limit = 0;
-
-    size_t number_of_ranges = equal_ranges.size();
-    if (limit)
-        --number_of_ranges;
-
-    EqualRanges new_ranges;
-    SCOPE_EXIT({equal_ranges = std::move(new_ranges);});
-
-    for (size_t i = 0; i < number_of_ranges; ++i)
-    {
-        const auto& [first, last] = equal_ranges[i];
-        if (reverse)
-            std::sort(res.begin() + first, res.begin() + last,
-                [this](size_t a, size_t b) { return data[a] > data[b]; });
-        else
-            std::sort(res.begin() + first, res.begin() + last,
-                [this](size_t a, size_t b) { return data[a] < data[b]; });
-
-        auto new_first = first;
-        for (auto j = first + 1; j < last; ++j)
-        {
-            if (data[res[new_first]] != data[res[j]])
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        if (last - new_first > 1)
-            new_ranges.emplace_back(new_first, last);
-    }
-
-    if (limit)
-    {
-        const auto & [first, last] = equal_ranges.back();
-
-        if (limit < first || limit > last)
-            return;
-
-        /// Since then we are working inside the interval.
-
-        if (reverse)
-            partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last,
-                [this](size_t a, size_t b) { return data[a] > data[b]; });
-        else
-            partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last,
-                [this](size_t a, size_t b) { return data[a] < data[b]; });
-        auto new_first = first;
-        for (auto j = first + 1; j < limit; ++j)
-        {
-            if (data[res[new_first]] != data[res[j]])
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        auto new_last = limit;
-        for (auto j = limit; j < last; ++j)
-        {
-            if (data[res[new_first]] == data[res[j]])
-            {
-                std::swap(res[new_last], res[j]);
-                ++new_last;
-            }
-        }
-        if (new_last - new_first > 1)
-            new_ranges.emplace_back(new_first, new_last);
-    }
+    if (reverse)
+        this->updatePermutationImpl(
+            limit, res, equal_ranges,
+            [this](size_t lhs, size_t rhs) { return data[lhs] > data[rhs]; },
+            equals, sort, partial_sort);
+    else
+        this->updatePermutationImpl(
+            limit, res, equal_ranges,
+            [this](size_t lhs, size_t rhs) { return data[lhs] < data[rhs]; },
+            equals, sort, partial_sort);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::permute(const IColumn::Permutation & perm, size_t limit) const
 {
-    size_t size = limit ? std::min(data.size(), limit) : data.size();
-    if (perm.size() < size)
-        throw Exception("Size of permutation is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-    auto res = this->create(size, scale);
-    typename Self::Container & res_data = res->getData();
-
-    for (size_t i = 0; i < size; ++i)
-        res_data[i] = data[perm[i]];
-
-    return res;
+    return permuteImpl(*this, perm, limit);
 }
 
-template <typename T>
+template <is_decimal T>
 MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
 {
     auto res = this->create(0, scale);
@@ -267,7 +196,7 @@ MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
 {
     T tmp;
@@ -275,7 +204,7 @@ void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
     data.emplace_back(tmp);
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
     const ColumnDecimal & src_vec = assert_cast<const ColumnDecimal &>(src);
@@ -291,7 +220,7 @@ void ColumnDecimal<T>::insertRangeFrom(const IColumn & src, size_t start, size_t
     memcpy(data.data() + old_size, &src_vec.data[start], length * sizeof(data[0]));
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_size_hint) const
 {
     size_t size = data.size();
@@ -308,6 +237,40 @@ ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_
     const UInt8 * filt_end = filt_pos + size;
     const T * data_pos = data.data();
 
+    /** A slightly more optimized version.
+    * Based on the assumption that often pieces of consecutive values
+    *  completely pass or do not pass the filter.
+    * Therefore, we will optimistically check the parts of `SIMD_BYTES` values.
+    */
+    static constexpr size_t SIMD_BYTES = 64;
+    const UInt8 * filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
+
+    while (filt_pos < filt_end_aligned)
+    {
+        UInt64 mask = Bytes64MaskToBits64Mask(filt_pos);
+
+        if (0xffffffffffffffff == mask)
+        {
+            res_data.insert(data_pos, data_pos + SIMD_BYTES);
+        }
+        else
+        {
+            while (mask)
+            {
+                size_t index = __builtin_ctzll(mask);
+                res_data.push_back(data_pos[index]);
+            #ifdef __BMI__
+                mask = _blsr_u64(mask);
+            #else
+                mask = mask & (mask-1);
+            #endif
+            }
+        }
+
+        filt_pos += SIMD_BYTES;
+        data_pos += SIMD_BYTES;
+    }
+
     while (filt_pos < filt_end)
     {
         if (*filt_pos)
@@ -320,13 +283,19 @@ ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
+void ColumnDecimal<T>::expand(const IColumn::Filter & mask, bool inverted)
+{
+    expandDataByMask<T>(data, mask, inverted);
+}
+
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::index(const IColumn & indexes, size_t limit) const
 {
     return selectIndexImpl(*this, indexes, limit);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
 {
     size_t size = data.size();
@@ -353,13 +322,13 @@ ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
     return res;
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::gather(ColumnGathererStream & gatherer)
 {
     gatherer.gather(*this);
 }
 
-template <typename T>
+template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::compress() const
 {
     size_t source_size = data.size() * sizeof(T);
@@ -383,7 +352,7 @@ ColumnPtr ColumnDecimal<T>::compress() const
         });
 }
 
-template <typename T>
+template <is_decimal T>
 void ColumnDecimal<T>::getExtremes(Field & min, Field & max) const
 {
     if (data.empty())
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index 8621a793f49..ee13c7e7b2b 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -6,13 +6,16 @@
 #include <Core/Field.h>
 #include <Core/DecimalFunctions.h>
 #include <Common/typeid_cast.h>
-#include <common/sort.h>
+#include <base/sort.h>
+#include <Core/TypeId.h>
+#include <base/TypeName.h>
 
 #include <cmath>
 
 
 namespace DB
 {
+
 /// PaddedPODArray extended by Decimal scale
 template <typename T>
 class DecimalPaddedPODArray : public PaddedPODArray<T>
@@ -59,11 +62,9 @@ extern template class DecimalPaddedPODArray<Decimal256>;
 extern template class DecimalPaddedPODArray<DateTime64>;
 
 /// A ColumnVector for Decimals
-template <typename T>
+template <is_decimal T>
 class ColumnDecimal final : public COWHelper<ColumnVectorHelper, ColumnDecimal<T>>
 {
-    static_assert(IsDecimalNumber<T>);
-
 private:
     using Self = ColumnDecimal;
     friend class COWHelper<ColumnVectorHelper, Self>;
@@ -85,7 +86,7 @@ private:
     {}
 
 public:
-    const char * getFamilyName() const override { return TypeName<T>; }
+    const char * getFamilyName() const override { return TypeName<T>.data(); }
     TypeIndex getDataType() const override { return TypeId<T>; }
 
     bool isNumeric() const override { return false; }
@@ -151,6 +152,8 @@ public:
     bool isDefaultAt(size_t n) const override { return data[n].value == 0; }
 
     ColumnPtr filter(const IColumn::Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const IColumn::Filter & mask, bool inverted) override;
+
     ColumnPtr permute(const IColumn::Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
 
@@ -208,16 +211,16 @@ protected:
     }
 };
 
-template <typename T>
+template <class> class ColumnVector;
+template <class T> struct ColumnVectorOrDecimalT { using Col = ColumnVector<T>; };
+template <is_decimal T> struct ColumnVectorOrDecimalT<T> { using Col = ColumnDecimal<T>; };
+template <class T> using ColumnVectorOrDecimal = typename ColumnVectorOrDecimalT<T>::Col;
+
+template <is_decimal T>
 template <typename Type>
 ColumnPtr ColumnDecimal<T>::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
-    size_t size = indexes.size();
-
-    if (limit == 0)
-        limit = size;
-    else
-        limit = std::min(size, limit);
+    assert(limit <= indexes.size());
 
     auto res = this->create(limit, scale);
     typename Self::Container & res_data = res->getData();
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index 830f8531afc..cc4e7b12a04 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -2,7 +2,7 @@
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
 
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteHelpers.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/Hash.h>
@@ -11,8 +11,8 @@
 #include <Common/assert_cast.h>
 #include <Common/memcmpSmall.h>
 #include <Common/memcpySmall.h>
-#include <common/sort.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/scope_guard.h>
 
 #if defined(__SSE2__)
 #    include <emmintrin.h>
@@ -137,17 +137,35 @@ void ColumnFixedString::updateHashFast(SipHash & hash) const
 }
 
 template <bool positive>
-struct ColumnFixedString::less
+struct ColumnFixedString::Cmp
 {
     const ColumnFixedString & parent;
-    explicit less(const ColumnFixedString & parent_) : parent(parent_) {}
-    bool operator()(size_t lhs, size_t rhs) const
+    explicit Cmp(const ColumnFixedString & parent_) : parent(parent_) {}
+    int operator()(size_t lhs, size_t rhs) const
     {
         int res = memcmpSmallAllowOverflow15(parent.chars.data() + lhs * parent.n, parent.chars.data() + rhs * parent.n, parent.n);
-        return positive ? (res < 0) : (res > 0);
+
+        if constexpr (positive)
+            return res;
+        else
+            return -res;
     }
 };
 
+struct ColumnFixedString::less
+{
+    Cmp<true> cmp;
+    explicit less(const ColumnFixedString & parent_) : cmp(parent_) {}
+    int operator()(size_t lhs, size_t rhs) const { return cmp(lhs, rhs) < 0; }
+};
+
+struct ColumnFixedString::greater
+{
+    Cmp<true> cmp;
+    explicit greater(const ColumnFixedString & parent_) : cmp(parent_) {}
+    int operator()(size_t lhs, size_t rhs) const { return cmp(lhs, rhs) > 0; }
+};
+
 void ColumnFixedString::getPermutation(bool reverse, size_t limit, int /*nan_direction_hint*/, Permutation & res) const
 {
     size_t s = size();
@@ -161,93 +179,25 @@ void ColumnFixedString::getPermutation(bool reverse, size_t limit, int /*nan_dir
     if (limit)
     {
         if (reverse)
-            partial_sort(res.begin(), res.begin() + limit, res.end(), less<false>(*this));
+            ::partial_sort(res.begin(), res.begin() + limit, res.end(), greater(*this));
         else
-            partial_sort(res.begin(), res.begin() + limit, res.end(), less<true>(*this));
+            ::partial_sort(res.begin(), res.begin() + limit, res.end(), less(*this));
     }
     else
     {
         if (reverse)
-            std::sort(res.begin(), res.end(), less<false>(*this));
+            std::sort(res.begin(), res.end(), greater(*this));
         else
-            std::sort(res.begin(), res.end(), less<true>(*this));
+            std::sort(res.begin(), res.end(), less(*this));
     }
 }
 
 void ColumnFixedString::updatePermutation(bool reverse, size_t limit, int, Permutation & res, EqualRanges & equal_ranges) const
 {
-    if (equal_ranges.empty())
-        return;
-
-    if (limit >= size() || limit >= equal_ranges.back().second)
-        limit = 0;
-
-    size_t number_of_ranges = equal_ranges.size();
-    if (limit)
-        --number_of_ranges;
-
-    EqualRanges new_ranges;
-    SCOPE_EXIT({equal_ranges = std::move(new_ranges);});
-
-    for (size_t i = 0; i < number_of_ranges; ++i)
-    {
-        const auto& [first, last] = equal_ranges[i];
-        if (reverse)
-            std::sort(res.begin() + first, res.begin() + last, less<false>(*this));
-        else
-            std::sort(res.begin() + first, res.begin() + last, less<true>(*this));
-
-        auto new_first = first;
-        for (auto j = first + 1; j < last; ++j)
-        {
-            if (memcmpSmallAllowOverflow15(chars.data() + res[j] * n, chars.data() + res[new_first] * n, n) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        if (last - new_first > 1)
-            new_ranges.emplace_back(new_first, last);
-    }
-    if (limit)
-    {
-        const auto & [first, last] = equal_ranges.back();
-
-        if (limit < first || limit > last)
-            return;
-
-        /// Since then we are working inside the interval.
-
-        if (reverse)
-            partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less<false>(*this));
-        else
-            partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less<true>(*this));
-
-        auto new_first = first;
-        for (auto j = first + 1; j < limit; ++j)
-        {
-            if (memcmpSmallAllowOverflow15(chars.data() + res[j] * n, chars.data() + res[new_first] * n, n)  != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        auto new_last = limit;
-        for (auto j = limit; j < last; ++j)
-        {
-            if (memcmpSmallAllowOverflow15(chars.data() + res[j] * n, chars.data() + res[new_first] * n, n)  == 0)
-            {
-                std::swap(res[new_last], res[j]);
-                ++new_last;
-            }
-        }
-        if (new_last - new_first > 1)
-            new_ranges.emplace_back(new_first, new_last);
-    }
+    if (reverse)
+        updatePermutationImpl(limit, res, equal_ranges, Cmp<false>(*this));
+    else
+        updatePermutationImpl(limit, res, equal_ranges, Cmp<true>(*this));
 }
 
 void ColumnFixedString::insertRangeFrom(const IColumn & src, size_t start, size_t length)
@@ -281,51 +231,42 @@ ColumnPtr ColumnFixedString::filter(const IColumn::Filter & filt, ssize_t result
     const UInt8 * filt_end = filt_pos + col_size;
     const UInt8 * data_pos = chars.data();
 
-#ifdef __SSE2__
     /** A slightly more optimized version.
         * Based on the assumption that often pieces of consecutive values
         *  completely pass or do not pass the filter.
         * Therefore, we will optimistically check the parts of `SIMD_BYTES` values.
         */
-
-    static constexpr size_t SIMD_BYTES = 16;
-    const __m128i zero16 = _mm_setzero_si128();
-    const UInt8 * filt_end_sse = filt_pos + col_size / SIMD_BYTES * SIMD_BYTES;
+    static constexpr size_t SIMD_BYTES = 64;
+    const UInt8 * filt_end_aligned = filt_pos + col_size / SIMD_BYTES * SIMD_BYTES;
     const size_t chars_per_simd_elements = SIMD_BYTES * n;
 
-    while (filt_pos < filt_end_sse)
+    while (filt_pos < filt_end_aligned)
     {
-        UInt16 mask = _mm_movemask_epi8(_mm_cmpeq_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i *>(filt_pos)), zero16));
-        mask = ~mask;
+        uint64_t mask = Bytes64MaskToBits64Mask(filt_pos);
 
-        if (0 == mask)
-        {
-            /// Nothing is inserted.
-            data_pos += chars_per_simd_elements;
-        }
-        else if (0xFFFF == mask)
+        if (0xffffffffffffffff == mask)
         {
             res->chars.insert(data_pos, data_pos + chars_per_simd_elements);
-            data_pos += chars_per_simd_elements;
         }
         else
         {
             size_t res_chars_size = res->chars.size();
-            for (size_t i = 0; i < SIMD_BYTES; ++i)
+            while (mask)
             {
-                if (filt_pos[i])
-                {
-                    res->chars.resize(res_chars_size + n);
-                    memcpySmallAllowReadWriteOverflow15(&res->chars[res_chars_size], data_pos, n);
-                    res_chars_size += n;
-                }
-                data_pos += n;
+                size_t index = __builtin_ctzll(mask);
+                res->chars.resize(res_chars_size + n);
+                memcpySmallAllowReadWriteOverflow15(&res->chars[res_chars_size], data_pos + index * n, n);
+                res_chars_size += n;
+            #ifdef __BMI__
+                mask = _blsr_u64(mask);
+            #else
+                mask = mask & (mask-1);
+            #endif
             }
         }
-
+        data_pos += chars_per_simd_elements;
         filt_pos += SIMD_BYTES;
     }
-#endif
 
     size_t res_chars_size = res->chars.size();
     while (filt_pos < filt_end)
@@ -344,32 +285,35 @@ ColumnPtr ColumnFixedString::filter(const IColumn::Filter & filt, ssize_t result
     return res;
 }
 
+void ColumnFixedString::expand(const IColumn::Filter & mask, bool inverted)
+{
+    if (mask.size() < size())
+        throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
+
+    int index = mask.size() - 1;
+    int from = size() - 1;
+    chars.resize_fill(mask.size() * n, 0);
+    while (index >= 0)
+    {
+        if (!!mask[index] ^ inverted)
+        {
+            if (from < 0)
+                throw Exception("Too many bytes in mask", ErrorCodes::LOGICAL_ERROR);
+
+            memcpy(&chars[index * n], &chars[from * n], n);
+            --from;
+        }
+
+        --index;
+    }
+
+    if (from != -1)
+        throw Exception("Not enough bytes in mask", ErrorCodes::LOGICAL_ERROR);
+}
+
 ColumnPtr ColumnFixedString::permute(const Permutation & perm, size_t limit) const
 {
-    size_t col_size = size();
-
-    if (limit == 0)
-        limit = col_size;
-    else
-        limit = std::min(col_size, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-    if (limit == 0)
-        return ColumnFixedString::create(n);
-
-    auto res = ColumnFixedString::create(n);
-
-    Chars & res_chars = res->chars;
-
-    res_chars.resize(n * limit);
-
-    size_t offset = 0;
-    for (size_t i = 0; i < limit; ++i, offset += n)
-        memcpySmallAllowReadWriteOverflow15(&res_chars[offset], &chars[perm[i] * n], n);
-
-    return res;
+    return permuteImpl(*this, perm, limit);
 }
 
 
@@ -382,6 +326,7 @@ ColumnPtr ColumnFixedString::index(const IColumn & indexes, size_t limit) const
 template <typename Type>
 ColumnPtr ColumnFixedString::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
+    assert(limit <= indexes.size());
     if (limit == 0)
         return ColumnFixedString::create(n);
 
@@ -438,13 +383,12 @@ void ColumnFixedString::getExtremes(Field & min, Field & max) const
     size_t min_idx = 0;
     size_t max_idx = 0;
 
-    less<true> less_op(*this);
-
+    auto cmp_less = less(*this);
     for (size_t i = 1; i < col_size; ++i)
     {
-        if (less_op(i, min_idx))
+        if (cmp_less(i, min_idx))
             min_idx = i;
-        else if (less_op(max_idx, i))
+        else if (cmp_less(max_idx, i))
             max_idx = i;
     }
 
diff --git a/src/Columns/ColumnFixedString.h b/src/Columns/ColumnFixedString.h
index 5fd482aef6e..4a66a429d96 100644
--- a/src/Columns/ColumnFixedString.h
+++ b/src/Columns/ColumnFixedString.h
@@ -32,8 +32,9 @@ private:
     /// The size of the rows.
     const size_t n;
 
-    template <bool positive>
+    template <bool positive> struct Cmp;
     struct less;
+    struct greater;
 
     /** Create an empty column of strings of fixed-length `n` */
     ColumnFixedString(size_t n_) : n(n_) {}
@@ -147,6 +148,8 @@ public:
 
     ColumnPtr filter(const IColumn::Filter & filt, ssize_t result_size_hint) const override;
 
+    void expand(const IColumn::Filter & mask, bool inverted) override;
+
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
 
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
diff --git a/src/Columns/ColumnFunction.cpp b/src/Columns/ColumnFunction.cpp
index 83f668ded75..09a3dbad242 100644
--- a/src/Columns/ColumnFunction.cpp
+++ b/src/Columns/ColumnFunction.cpp
@@ -2,9 +2,15 @@
 #include <Columns/ColumnFunction.h>
 #include <Columns/ColumnsCommon.h>
 #include <Common/PODArray.h>
+#include <Common/ProfileEvents.h>
 #include <IO/WriteHelpers.h>
 #include <Functions/IFunction.h>
 
+namespace ProfileEvents
+{
+    extern const Event FunctionExecute;
+    extern const Event CompiledFunctionExecute;
+}
 
 namespace DB
 {
@@ -15,8 +21,8 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-ColumnFunction::ColumnFunction(size_t size, FunctionBasePtr function_, const ColumnsWithTypeAndName & columns_to_capture)
-        : size_(size), function(function_)
+ColumnFunction::ColumnFunction(size_t size, FunctionBasePtr function_, const ColumnsWithTypeAndName & columns_to_capture, bool is_short_circuit_argument_, bool is_function_compiled_)
+        : size_(size), function(function_), is_short_circuit_argument(is_short_circuit_argument_), is_function_compiled(is_function_compiled_)
 {
     appendArguments(columns_to_capture);
 }
@@ -27,7 +33,7 @@ MutableColumnPtr ColumnFunction::cloneResized(size_t size) const
     for (auto & column : capture)
         column.column = column.column->cloneResized(size);
 
-    return ColumnFunction::create(size, function, capture);
+    return ColumnFunction::create(size, function, capture, is_short_circuit_argument, is_function_compiled);
 }
 
 ColumnPtr ColumnFunction::replicate(const Offsets & offsets) const
@@ -41,7 +47,7 @@ ColumnPtr ColumnFunction::replicate(const Offsets & offsets) const
         column.column = column.column->replicate(offsets);
 
     size_t replicated_size = 0 == size_ ? 0 : offsets.back();
-    return ColumnFunction::create(replicated_size, function, capture);
+    return ColumnFunction::create(replicated_size, function, capture, is_short_circuit_argument, is_function_compiled);
 }
 
 ColumnPtr ColumnFunction::cut(size_t start, size_t length) const
@@ -50,7 +56,7 @@ ColumnPtr ColumnFunction::cut(size_t start, size_t length) const
     for (auto & column : capture)
         column.column = column.column->cut(start, length);
 
-    return ColumnFunction::create(length, function, capture);
+    return ColumnFunction::create(length, function, capture, is_short_circuit_argument, is_function_compiled);
 }
 
 ColumnPtr ColumnFunction::filter(const Filter & filt, ssize_t result_size_hint) const
@@ -65,29 +71,35 @@ ColumnPtr ColumnFunction::filter(const Filter & filt, ssize_t result_size_hint)
 
     size_t filtered_size = 0;
     if (capture.empty())
+    {
         filtered_size = countBytesInFilter(filt);
+    }
     else
         filtered_size = capture.front().column->size();
 
-    return ColumnFunction::create(filtered_size, function, capture);
+    return ColumnFunction::create(filtered_size, function, capture, is_short_circuit_argument, is_function_compiled);
+}
+
+void ColumnFunction::expand(const Filter & mask, bool inverted)
+{
+    for (auto & column : captured_columns)
+    {
+        column.column = column.column->cloneResized(column.column->size());
+        column.column->assumeMutable()->expand(mask, inverted);
+    }
+
+    size_ = mask.size();
 }
 
 ColumnPtr ColumnFunction::permute(const Permutation & perm, size_t limit) const
 {
-    if (limit == 0)
-        limit = size_;
-    else
-        limit = std::min(size_, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation (" + toString(perm.size()) + ") is less than required ("
-                        + toString(limit) + ")", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
+    limit = getLimitForPermutation(size(), perm.size(), limit);
 
     ColumnsWithTypeAndName capture = captured_columns;
     for (auto & column : capture)
         column.column = column.column->permute(perm, limit);
 
-    return ColumnFunction::create(limit, function, capture);
+    return ColumnFunction::create(limit, function, capture, is_short_circuit_argument, is_function_compiled);
 }
 
 ColumnPtr ColumnFunction::index(const IColumn & indexes, size_t limit) const
@@ -96,7 +108,7 @@ ColumnPtr ColumnFunction::index(const IColumn & indexes, size_t limit) const
     for (auto & column : capture)
         column.column = column.column->index(indexes, limit);
 
-    return ColumnFunction::create(limit, function, capture);
+    return ColumnFunction::create(limit, function, capture, is_short_circuit_argument, is_function_compiled);
 }
 
 std::vector<MutableColumnPtr> ColumnFunction::scatter(IColumn::ColumnIndex num_columns,
@@ -125,7 +137,7 @@ std::vector<MutableColumnPtr> ColumnFunction::scatter(IColumn::ColumnIndex num_c
     {
         auto & capture = captures[part];
         size_t capture_size = capture.empty() ? counts[part] : capture.front().column->size();
-        columns.emplace_back(ColumnFunction::create(capture_size, function, std::move(capture)));
+        columns.emplace_back(ColumnFunction::create(capture_size, function, std::move(capture), is_short_circuit_argument));
     }
 
     return columns;
@@ -179,7 +191,7 @@ void ColumnFunction::appendArgument(const ColumnWithTypeAndName & column)
     const auto & argumnet_types = function->getArgumentTypes();
 
     auto index = captured_columns.size();
-    if (!column.type->equals(*argumnet_types[index]))
+    if (!is_short_circuit_argument && !column.type->equals(*argumnet_types[index]))
         throw Exception("Cannot capture column " + std::to_string(argumnet_types.size()) +
                         " because it has incompatible type: got " + column.type->getName() +
                         ", but " + argumnet_types[index]->getName() + " is expected.", ErrorCodes::LOGICAL_ERROR);
@@ -187,6 +199,11 @@ void ColumnFunction::appendArgument(const ColumnWithTypeAndName & column)
     captured_columns.push_back(column);
 }
 
+DataTypePtr ColumnFunction::getResultType() const
+{
+    return function->getResultType();
+}
+
 ColumnWithTypeAndName ColumnFunction::reduce() const
 {
     auto args = function->getArgumentTypes().size();
@@ -196,11 +213,33 @@ ColumnWithTypeAndName ColumnFunction::reduce() const
         throw Exception("Cannot call function " + function->getName() + " because is has " + toString(args) +
                         "arguments but " + toString(captured) + " columns were captured.", ErrorCodes::LOGICAL_ERROR);
 
-    auto columns = captured_columns;
+    ColumnsWithTypeAndName columns = captured_columns;
+    if (is_short_circuit_argument)
+    {
+        /// Arguments of lazy executed function can also be lazy executed.
+        for (auto & col : columns)
+        {
+            if (const ColumnFunction * arg = checkAndGetShortCircuitArgument(col.column))
+                col = arg->reduce();
+        }
+    }
+
     ColumnWithTypeAndName res{nullptr, function->getResultType(), ""};
 
+    ProfileEvents::increment(ProfileEvents::FunctionExecute);
+    if (is_function_compiled)
+        ProfileEvents::increment(ProfileEvents::CompiledFunctionExecute);
+
     res.column = function->execute(columns, res.type, size_);
     return res;
 }
 
+const ColumnFunction * checkAndGetShortCircuitArgument(const ColumnPtr & column)
+{
+    const ColumnFunction * column_function;
+    if ((column_function = typeid_cast<const ColumnFunction *>(column.get())) && column_function->isShortCircuitArgument())
+        return column_function;
+    return nullptr;
+}
+
 }
diff --git a/src/Columns/ColumnFunction.h b/src/Columns/ColumnFunction.h
index fa605e741aa..2354a4f0cb3 100644
--- a/src/Columns/ColumnFunction.h
+++ b/src/Columns/ColumnFunction.h
@@ -5,9 +5,6 @@
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Columns/IColumn.h>
 
-class IFunctionBase;
-using FunctionBasePtr = std::shared_ptr<IFunctionBase>;
-
 
 namespace DB
 {
@@ -16,6 +13,8 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
+class IFunctionBase;
+using FunctionBasePtr = std::shared_ptr<IFunctionBase>;
 
 /** A column containing a lambda expression.
   * Behaves like a constant-column. Contains an expression, but not input or output data.
@@ -25,7 +24,7 @@ class ColumnFunction final : public COWHelper<IColumn, ColumnFunction>
 private:
     friend class COWHelper<IColumn, ColumnFunction>;
 
-    ColumnFunction(size_t size, FunctionBasePtr function_, const ColumnsWithTypeAndName & columns_to_capture);
+    ColumnFunction(size_t size, FunctionBasePtr function_, const ColumnsWithTypeAndName & columns_to_capture, bool is_short_circuit_argument_ = false, bool is_function_compiled_ = false);
 
 public:
     const char * getFamilyName() const override { return "Function"; }
@@ -38,6 +37,7 @@ public:
     ColumnPtr cut(size_t start, size_t length) const override;
     ColumnPtr replicate(const Offsets & offsets) const override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
 
@@ -153,12 +153,29 @@ public:
         throw Exception("Method gather is not supported for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    bool isShortCircuitArgument() const { return is_short_circuit_argument; }
+
+    DataTypePtr getResultType() const;
+
 private:
     size_t size_;
     FunctionBasePtr function;
     ColumnsWithTypeAndName captured_columns;
 
+    /// Determine if it's used as a lazy executed argument for short-circuit function.
+    /// It's needed to distinguish between lazy executed argument and
+    /// argument with ColumnFunction column (some functions can return it)
+    /// See ExpressionActions.cpp for details.
+    bool is_short_circuit_argument;
+
+    /// Determine if passed function is compiled. Used for profiling.
+    bool is_function_compiled;
+
     void appendArgument(const ColumnWithTypeAndName & column);
+
+    void addOffsetsForReplication(const IColumn::Offsets & offsets);
 };
 
+const ColumnFunction * checkAndGetShortCircuitArgument(const ColumnPtr & column);
+
 }
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index 5b16c7757e8..5b33baab345 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -2,13 +2,13 @@
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <DataTypes/NumberTraits.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
-#include <common/sort.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
@@ -18,6 +18,7 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
     extern const int LOGICAL_ERROR;
+    extern const int INCORRECT_DATA;
 }
 
 namespace
@@ -131,14 +132,14 @@ namespace
 ColumnLowCardinality::ColumnLowCardinality(MutableColumnPtr && column_unique_, MutableColumnPtr && indexes_, bool is_shared)
     : dictionary(std::move(column_unique_), is_shared), idx(std::move(indexes_))
 {
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 void ColumnLowCardinality::insert(const Field & x)
 {
     compactIfSharedDictionary();
     idx.insertPosition(dictionary.getColumnUnique().uniqueInsert(x));
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 void ColumnLowCardinality::insertDefault()
@@ -167,14 +168,14 @@ void ColumnLowCardinality::insertFrom(const IColumn & src, size_t n)
         idx.insertPosition(dictionary.getColumnUnique().uniqueInsertFrom(nested, position));
     }
 
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 void ColumnLowCardinality::insertFromFullColumn(const IColumn & src, size_t n)
 {
     compactIfSharedDictionary();
     idx.insertPosition(dictionary.getColumnUnique().uniqueInsertFrom(src, n));
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 void ColumnLowCardinality::insertRangeFrom(const IColumn & src, size_t start, size_t length)
@@ -204,7 +205,7 @@ void ColumnLowCardinality::insertRangeFrom(const IColumn & src, size_t start, si
         auto inserted_indexes = dictionary.getColumnUnique().uniqueInsertRangeFrom(*used_keys, 0, used_keys->size());
         idx.insertPositionsRange(*inserted_indexes->index(*sub_idx, 0), 0, length);
     }
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 void ColumnLowCardinality::insertRangeFromFullColumn(const IColumn & src, size_t start, size_t length)
@@ -212,23 +213,55 @@ void ColumnLowCardinality::insertRangeFromFullColumn(const IColumn & src, size_t
     compactIfSharedDictionary();
     auto inserted_indexes = dictionary.getColumnUnique().uniqueInsertRangeFrom(src, start, length);
     idx.insertPositionsRange(*inserted_indexes, 0, length);
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
+}
+
+static void checkPositionsAreLimited(const IColumn & positions, UInt64 limit)
+{
+    auto check_for_type = [&](auto type)
+    {
+        using ColumnType = decltype(type);
+        const auto * column_ptr = typeid_cast<const ColumnVector<ColumnType> *>(&positions);
+
+        if (!column_ptr)
+            return false;
+
+        const auto & data = column_ptr->getData();
+        size_t num_rows = data.size();
+        UInt64 max_position = 0;
+        for (size_t i = 0; i < num_rows; ++i)
+            max_position = std::max<UInt64>(max_position, data[i]);
+
+        if (max_position >= limit)
+            throw Exception(ErrorCodes::INCORRECT_DATA,
+                            "Index for LowCardinality is out of range. Dictionary size is {}, "
+                            "but found index with value {}", limit, max_position);
+
+        return true;
+    };
+
+    if (!check_for_type(UInt8()) &&
+        !check_for_type(UInt16()) &&
+        !check_for_type(UInt32()) &&
+        !check_for_type(UInt64()))
+        throw Exception("Invalid column for ColumnLowCardinality index. Expected UInt, got " + positions.getName(),
+                        ErrorCodes::ILLEGAL_COLUMN);
 }
 
 void ColumnLowCardinality::insertRangeFromDictionaryEncodedColumn(const IColumn & keys, const IColumn & positions)
 {
-    Index(positions.getPtr()).check(keys.size());
+    checkPositionsAreLimited(positions, keys.size());
     compactIfSharedDictionary();
     auto inserted_indexes = dictionary.getColumnUnique().uniqueInsertRangeFrom(keys, 0, keys.size());
     idx.insertPositionsRange(*inserted_indexes->index(positions, 0), 0, positions.size());
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 void ColumnLowCardinality::insertData(const char * pos, size_t length)
 {
     compactIfSharedDictionary();
     idx.insertPosition(dictionary.getColumnUnique().uniqueInsertData(pos, length));
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
 }
 
 StringRef ColumnLowCardinality::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
@@ -243,7 +276,7 @@ const char * ColumnLowCardinality::deserializeAndInsertFromArena(const char * po
     const char * new_pos;
     idx.insertPosition(dictionary.getColumnUnique().uniqueDeserializeAndInsertFromArena(pos, new_pos));
 
-    idx.check(getDictionary().size());
+    // idx.check(getDictionary().size());
     return new_pos;
 }
 
@@ -361,81 +394,6 @@ void ColumnLowCardinality::getPermutationImpl(bool reverse, size_t limit, int na
     }
 }
 
-template <typename Cmp>
-void ColumnLowCardinality::updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_ranges, Cmp comparator) const
-{
-    if (equal_ranges.empty())
-        return;
-
-    if (limit >= size() || limit >= equal_ranges.back().second)
-        limit = 0;
-
-    size_t number_of_ranges = equal_ranges.size();
-    if (limit)
-        --number_of_ranges;
-
-    EqualRanges new_ranges;
-    SCOPE_EXIT({equal_ranges = std::move(new_ranges);});
-
-    auto less = [&comparator](size_t lhs, size_t rhs){ return comparator(lhs, rhs) < 0; };
-
-    for (size_t i = 0; i < number_of_ranges; ++i)
-    {
-        const auto& [first, last] = equal_ranges[i];
-        std::sort(res.begin() + first, res.begin() + last, less);
-
-        auto new_first = first;
-        for (auto j = first + 1; j < last; ++j)
-        {
-            if (comparator(res[new_first], res[j]) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        if (last - new_first > 1)
-            new_ranges.emplace_back(new_first, last);
-    }
-
-    if (limit)
-    {
-        const auto & [first, last] = equal_ranges.back();
-
-        if (limit < first || limit > last)
-            return;
-
-        /// Since then we are working inside the interval.
-
-        partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less);
-        auto new_first = first;
-
-        for (auto j = first + 1; j < limit; ++j)
-        {
-            if (comparator(res[new_first],res[j]) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-
-        auto new_last = limit;
-        for (auto j = limit; j < last; ++j)
-        {
-            if (comparator(res[new_first], res[j]) == 0)
-            {
-                std::swap(res[new_last], res[j]);
-                ++new_last;
-            }
-        }
-        if (new_last - new_first > 1)
-            new_ranges.emplace_back(new_first, new_last);
-    }
-}
-
 void ColumnLowCardinality::getPermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const
 {
     getPermutationImpl(reverse, limit, nan_direction_hint, res);
@@ -750,30 +708,6 @@ void ColumnLowCardinality::Index::insertPositionsRange(const IColumn & column, U
     checkSizeOfType();
 }
 
-void ColumnLowCardinality::Index::check(size_t /*max_dictionary_size*/)
-{
-    /// TODO: remove
-    /*
-    auto check = [&](auto cur_type)
-    {
-        using CurIndexType = decltype(cur_type);
-        auto & positions_data = getPositionsData<CurIndexType>();
-
-        for (size_t i = 0; i < positions_data.size(); ++i)
-        {
-            if (positions_data[i] >= max_dictionary_size)
-            {
-                throw Exception("Found index " + toString(positions_data[i]) + " at position " + toString(i)
-                                + " which is grated or equal than dictionary size " + toString(max_dictionary_size),
-                                ErrorCodes::LOGICAL_ERROR);
-            }
-        }
-    };
-
-    callForType(std::move(check), size_of_type);
-     */
-}
-
 void ColumnLowCardinality::Index::checkSizeOfType()
 {
     if (size_of_type != getSizeOfIndexType(*positions, size_of_type))
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index 698f65b1281..13957357637 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -110,6 +110,11 @@ public:
         return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().filter(filt, result_size_hint));
     }
 
+    void expand(const Filter & mask, bool inverted) override
+    {
+        idx.getPositionsPtr()->expand(mask, inverted);
+    }
+
     ColumnPtr permute(const Permutation & perm, size_t limit) const override
     {
         return ColumnLowCardinality::create(dictionary.getColumnUniquePtr(), getIndexes().permute(perm, limit));
@@ -187,12 +192,14 @@ public:
      * So LC(Nullable(T)) would return true, LC(U) -- false.
      */
     bool nestedIsNullable() const { return isColumnNullable(*dictionary.getColumnUnique().getNestedColumn()); }
+    bool nestedCanBeInsideNullable() const { return dictionary.getColumnUnique().getNestedColumn()->canBeInsideNullable(); }
     void nestedToNullable() { dictionary.getColumnUnique().nestedToNullable(); }
     void nestedRemoveNullable() { dictionary.getColumnUnique().nestedRemoveNullable(); }
 
     const IColumnUnique & getDictionary() const { return dictionary.getColumnUnique(); }
     IColumnUnique & getDictionary() { return dictionary.getColumnUnique(); }
     const ColumnPtr & getDictionaryPtr() const { return dictionary.getColumnUniquePtr(); }
+    ColumnPtr & getDictionaryPtr() { return dictionary.getColumnUniquePtr(); }
     /// IColumnUnique & getUnique() { return static_cast<IColumnUnique &>(*column_unique); }
     /// ColumnPtr getUniquePtr() const { return column_unique; }
 
@@ -259,7 +266,6 @@ public:
         static size_t getSizeOfIndexType(const IColumn & column, size_t hint);
         size_t getSizeOfIndexType() const { return size_of_type; }
 
-        void check(size_t max_dictionary_size);
         void checkSizeOfType();
 
         ColumnPtr detachPositions() { return std::move(positions); }
@@ -327,9 +333,6 @@ private:
     int compareAtImpl(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint, const Collator * collator=nullptr) const;
 
     void getPermutationImpl(bool reverse, size_t limit, int nan_direction_hint, Permutation & res, const Collator * collator = nullptr) const;
-
-    template <typename Cmp>
-    void updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_ranges, Cmp comparator) const;
 };
 
 
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index 87c28c44cdb..4374ca30c99 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -1,11 +1,11 @@
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnCompressed.h>
 #include <Columns/IColumnImpl.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/WeakHash.h>
@@ -149,6 +149,11 @@ ColumnPtr ColumnMap::filter(const Filter & filt, ssize_t result_size_hint) const
     return ColumnMap::create(filtered);
 }
 
+void ColumnMap::expand(const IColumn::Filter & mask, bool inverted)
+{
+    nested->expand(mask, inverted);
+}
+
 ColumnPtr ColumnMap::permute(const Permutation & perm, size_t limit) const
 {
     auto permuted = nested->permute(perm, limit);
@@ -271,7 +276,10 @@ bool ColumnMap::structureEquals(const IColumn & rhs) const
 ColumnPtr ColumnMap::compress() const
 {
     auto compressed = nested->compress();
-    return ColumnCompressed::create(size(), compressed->byteSize(), [compressed = std::move(compressed)]
+    const auto byte_size = compressed->byteSize();
+    /// The order of evaluation of function arguments is unspecified
+    /// and could cause interacting with object in moved-from state
+    return ColumnCompressed::create(size(), byte_size, [compressed = std::move(compressed)]
     {
         return ColumnMap::create(compressed->decompress());
     });
diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h
index 17f0ccc422c..aa13bfd3d68 100644
--- a/src/Columns/ColumnMap.h
+++ b/src/Columns/ColumnMap.h
@@ -64,6 +64,7 @@ public:
     void updateHashFast(SipHash & hash) const override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     ColumnPtr replicate(const Offsets & offsets) const override;
diff --git a/src/Columns/ColumnNullable.cpp b/src/Columns/ColumnNullable.cpp
index dec93fc7a30..4b3340a6b50 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -8,7 +8,7 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnCompressed.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 
 namespace DB
@@ -221,6 +221,12 @@ ColumnPtr ColumnNullable::filter(const Filter & filt, ssize_t result_size_hint)
     return ColumnNullable::create(filtered_data, filtered_null_map);
 }
 
+void ColumnNullable::expand(const IColumn::Filter & mask, bool inverted)
+{
+    nested_column->expand(mask, inverted);
+    null_map->expand(mask, inverted);
+}
+
 ColumnPtr ColumnNullable::permute(const Permutation & perm, size_t limit) const
 {
     ColumnPtr permuted_data = getNestedColumn().permute(perm, limit);
@@ -571,15 +577,15 @@ void getExtremesWithNulls(const IColumn & nested_column, const NullMap & null_ar
     }
     else if (number_of_nulls == n)
     {
-        min = PositiveInfinity();
-        max = PositiveInfinity();
+        min = POSITIVE_INFINITY;
+        max = POSITIVE_INFINITY;
     }
     else
     {
         auto filtered_column = nested_column.filter(not_null_array, -1);
         filtered_column->getExtremes(min, max);
         if (null_last)
-            max = PositiveInfinity();
+            max = POSITIVE_INFINITY;
     }
 }
 }
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index 7b339893ff4..9da7b0dac1c 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -88,6 +88,7 @@ public:
 
     void popBack(size_t n) override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     int compareAt(size_t n, size_t m, const IColumn & rhs_, int null_direction_hint) const override;
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index d188bbb1132..2beb9add318 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -3,15 +3,16 @@
 #include <Columns/Collator.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Columns/MaskOperations.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
 #include <Common/memcmpSmall.h>
-#include <common/sort.h>
-#include <common/unaligned.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/unaligned.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
@@ -157,54 +158,57 @@ ColumnPtr ColumnString::filter(const Filter & filt, ssize_t result_size_hint) co
     return res;
 }
 
+void ColumnString::expand(const IColumn::Filter & mask, bool inverted)
+{
+    auto & offsets_data = getOffsets();
+    auto & chars_data = getChars();
+    if (mask.size() < offsets_data.size())
+        throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
+
+    /// We cannot change only offsets, because each string should end with terminating zero byte.
+    /// So, we will insert one zero byte when mask value is zero.
+
+    int index = mask.size() - 1;
+    int from = offsets_data.size() - 1;
+    /// mask.size() - offsets_data.size() should be equal to the number of zeros in mask
+    /// (if not, one of exceptions below will throw) and we can calculate the resulting chars size.
+    UInt64 last_offset = offsets_data[from] + (mask.size() - offsets_data.size());
+    offsets_data.resize(mask.size());
+    chars_data.resize_fill(last_offset, 0);
+    while (index >= 0)
+    {
+        offsets_data[index] = last_offset;
+        if (!!mask[index] ^ inverted)
+        {
+            if (from < 0)
+                throw Exception("Too many bytes in mask", ErrorCodes::LOGICAL_ERROR);
+
+            size_t len = offsets_data[from] - offsets_data[from - 1];
+
+            /// Copy only if it makes sense. It's important to copy backward, because
+            /// ranges can overlap, but destination is always is more to the right then source
+            if (last_offset - len != offsets_data[from - 1])
+                std::copy_backward(&chars_data[offsets_data[from - 1]], &chars_data[offsets_data[from]], &chars_data[last_offset]);
+            last_offset -= len;
+            --from;
+        }
+        else
+        {
+            chars_data[last_offset - 1] = 0;
+            --last_offset;
+        }
+
+        --index;
+    }
+
+    if (from != -1)
+        throw Exception("Not enough bytes in mask", ErrorCodes::LOGICAL_ERROR);
+}
+
 
 ColumnPtr ColumnString::permute(const Permutation & perm, size_t limit) const
 {
-    size_t size = offsets.size();
-
-    if (limit == 0)
-        limit = size;
-    else
-        limit = std::min(size, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-    if (limit == 0)
-        return ColumnString::create();
-
-    auto res = ColumnString::create();
-
-    Chars & res_chars = res->chars;
-    Offsets & res_offsets = res->offsets;
-
-    if (limit == size)
-        res_chars.resize(chars.size());
-    else
-    {
-        size_t new_chars_size = 0;
-        for (size_t i = 0; i < limit; ++i)
-            new_chars_size += sizeAt(perm[i]);
-        res_chars.resize(new_chars_size);
-    }
-
-    res_offsets.resize(limit);
-
-    Offset current_new_offset = 0;
-
-    for (size_t i = 0; i < limit; ++i)
-    {
-        size_t j = perm[i];
-        size_t string_offset = offsets[j - 1];
-        size_t string_size = offsets[j] - string_offset;
-
-        memcpySmallAllowReadWriteOverflow15(&res_chars[current_new_offset], &chars[string_offset], string_size);
-
-        current_new_offset += string_size;
-        res_offsets[i] = current_new_offset;
-    }
-
-    return res;
+    return permuteImpl(*this, perm, limit);
 }
 
 
@@ -252,6 +256,7 @@ ColumnPtr ColumnString::index(const IColumn & indexes, size_t limit) const
 template <typename Type>
 ColumnPtr ColumnString::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
+    assert(limit <= indexes.size());
     if (limit == 0)
         return ColumnString::create();
 
@@ -309,7 +314,10 @@ struct ColumnString::Cmp
             parent.chars.data() + parent.offsetAt(lhs), parent.sizeAt(lhs) - 1,
             parent.chars.data() + parent.offsetAt(rhs), parent.sizeAt(rhs) - 1);
 
-        return positive ? res : -res;
+        if constexpr (positive)
+            return res;
+        else
+            return -res;
     }
 };
 
@@ -332,78 +340,6 @@ void ColumnString::getPermutationImpl(size_t limit, Permutation & res, Comparato
         std::sort(res.begin(), res.end(), less);
 }
 
-template <typename Comparator>
-void ColumnString::updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_ranges, Comparator cmp) const
-{
-    if (equal_ranges.empty())
-        return;
-
-    if (limit >= size() || limit > equal_ranges.back().second)
-        limit = 0;
-
-    EqualRanges new_ranges;
-    SCOPE_EXIT({equal_ranges = std::move(new_ranges);});
-
-    size_t number_of_ranges = equal_ranges.size();
-    if (limit)
-        --number_of_ranges;
-
-    auto less = [&cmp](size_t lhs, size_t rhs){ return cmp(lhs, rhs) < 0; };
-
-    for (size_t i = 0; i < number_of_ranges; ++i)
-    {
-        const auto & [first, last] = equal_ranges[i];
-        std::sort(res.begin() + first, res.begin() + last, less);
-
-        size_t new_first = first;
-        for (size_t j = first + 1; j < last; ++j)
-        {
-            if (cmp(res[j], res[new_first]) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-
-                new_first = j;
-            }
-        }
-        if (last - new_first > 1)
-            new_ranges.emplace_back(new_first, last);
-    }
-
-    if (limit)
-    {
-        const auto & [first, last] = equal_ranges.back();
-
-        if (limit < first || limit > last)
-            return;
-
-        /// Since then we are working inside the interval.
-        partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less);
-
-        size_t new_first = first;
-        for (size_t j = first + 1; j < limit; ++j)
-        {
-            if (cmp(res[j], res[new_first]) != 0)
-            {
-                if (j - new_first > 1)
-                    new_ranges.emplace_back(new_first, j);
-                new_first = j;
-            }
-        }
-        size_t new_last = limit;
-        for (size_t j = limit; j < last; ++j)
-        {
-            if (cmp(res[j], res[new_first]) == 0)
-            {
-                std::swap(res[j], res[new_last]);
-                ++new_last;
-            }
-        }
-        if (new_last - new_first > 1)
-            new_ranges.emplace_back(new_first, new_last);
-    }
-}
-
 void ColumnString::getPermutation(bool reverse, size_t limit, int /*nan_direction_hint*/, Permutation & res) const
 {
     if (reverse)
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index 0814ebaa826..0ab4ed8e49d 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -54,9 +54,6 @@ private:
     template <typename Comparator>
     void getPermutationImpl(size_t limit, Permutation & res, Comparator cmp) const;
 
-    template <typename Comparator>
-    void updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_ranges, Comparator cmp) const;
-
 public:
     const char * getFamilyName() const override { return "String"; }
     TypeIndex getDataType() const override { return TypeIndex::String; }
@@ -212,6 +209,8 @@ public:
 
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
 
+    void expand(const Filter & mask, bool inverted) override;
+
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
 
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index f9b6cf697fd..d157f18bf32 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -3,15 +3,15 @@
 #include <Columns/IColumnImpl.h>
 #include <Columns/ColumnCompressed.h>
 #include <Core/Field.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
-#include <common/sort.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/sort.h>
+#include <base/map.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -232,6 +232,12 @@ ColumnPtr ColumnTuple::filter(const Filter & filt, ssize_t result_size_hint) con
     return ColumnTuple::create(new_columns);
 }
 
+void ColumnTuple::expand(const Filter & mask, bool inverted)
+{
+    for (auto & column : columns)
+        column->expand(mask, inverted);
+}
+
 ColumnPtr ColumnTuple::permute(const Permutation & perm, size_t limit) const
 {
     const size_t tuple_size = columns.size();
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index 3f5422c7719..54723239a06 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Core/Block.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
@@ -67,6 +67,7 @@ public:
     void updateHashFast(SipHash & hash) const override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
     ColumnPtr permute(const Permutation & perm, size_t limit) const override;
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     ColumnPtr replicate(const Offsets & offsets) const override;
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index 8ca4baff7c7..66bb56983fc 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -13,9 +13,9 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include "Columns/ColumnConst.h"
 
 
@@ -301,10 +301,10 @@ size_t ColumnUnique<ColumnType>::getNullValueIndex() const
 template <typename ColumnType>
 size_t ColumnUnique<ColumnType>::uniqueInsert(const Field & x)
 {
-    if (x.getType() == Field::Types::Null)
+    if (x.isNull())
         return getNullValueIndex();
 
-    if (isNumeric())
+    if (valuesHaveFixedSize())
         return uniqueInsertData(&x.reinterpret<char>(), size_of_value_if_fixed);
 
     auto & val = x.get<String>();
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index 9dc36b9b018..b9079857aa4 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -3,7 +3,8 @@
 #include <pdqsort.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Columns/MaskOperations.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteHelpers.h>
 #include <Common/Arena.h>
 #include <Common/Exception.h>
@@ -13,10 +14,10 @@
 #include <Common/SipHash.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
-#include <common/sort.h>
-#include <common/unaligned.h>
-#include <common/bit_cast.h>
-#include <common/scope_guard.h>
+#include <base/sort.h>
+#include <base/unaligned.h>
+#include <base/bit_cast.h>
+#include <base/scope_guard.h>
 
 #include <cmath>
 #include <cstring>
@@ -108,6 +109,15 @@ struct ColumnVector<T>::greater
     bool operator()(size_t lhs, size_t rhs) const { return CompareHelper<T>::greater(parent.data[lhs], parent.data[rhs], nan_direction_hint); }
 };
 
+template <typename T>
+struct ColumnVector<T>::equals
+{
+    const Self & parent;
+    int nan_direction_hint;
+    equals(const Self & parent_, int nan_direction_hint_) : parent(parent_), nan_direction_hint(nan_direction_hint_) {}
+    bool operator()(size_t lhs, size_t rhs) const { return CompareHelper<T>::equals(parent.data[lhs], parent.data[rhs], nan_direction_hint); }
+};
+
 
 namespace
 {
@@ -203,80 +213,21 @@ void ColumnVector<T>::getPermutation(bool reverse, size_t limit, int nan_directi
 template <typename T>
 void ColumnVector<T>::updatePermutation(bool reverse, size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_range) const
 {
-    if (equal_range.empty())
-        return;
+    auto sort = [](auto begin, auto end, auto pred) { pdqsort(begin, end, pred); };
+    auto partial_sort = [](auto begin, auto mid, auto end, auto pred) { ::partial_sort(begin, mid, end, pred); };
 
-    if (limit >= data.size() || limit >= equal_range.back().second)
-        limit = 0;
-
-    EqualRanges new_ranges;
-    SCOPE_EXIT({equal_range = std::move(new_ranges);});
-
-    for (size_t i = 0; i < equal_range.size() - bool(limit); ++i)
-    {
-        const auto & [first, last] = equal_range[i];
-        if (reverse)
-            pdqsort(res.begin() + first, res.begin() + last, greater(*this, nan_direction_hint));
-        else
-            pdqsort(res.begin() + first, res.begin() + last, less(*this, nan_direction_hint));
-        size_t new_first = first;
-        for (size_t j = first + 1; j < last; ++j)
-        {
-            if (less(*this, nan_direction_hint)(res[j], res[new_first]) || greater(*this, nan_direction_hint)(res[j], res[new_first]))
-            {
-                if (j - new_first > 1)
-                {
-                    new_ranges.emplace_back(new_first, j);
-                }
-                new_first = j;
-            }
-        }
-        if (last - new_first > 1)
-        {
-            new_ranges.emplace_back(new_first, last);
-        }
-    }
-    if (limit)
-    {
-        const auto & [first, last] = equal_range.back();
-
-        if (limit < first || limit > last)
-            return;
-
-        /// Since then, we are working inside the interval.
-
-        if (reverse)
-            partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, greater(*this, nan_direction_hint));
-        else
-            partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less(*this, nan_direction_hint));
-
-        size_t new_first = first;
-        for (size_t j = first + 1; j < limit; ++j)
-        {
-            if (less(*this, nan_direction_hint)(res[j], res[new_first]) || greater(*this, nan_direction_hint)(res[j], res[new_first]))
-            {
-                if (j - new_first > 1)
-                {
-                    new_ranges.emplace_back(new_first, j);
-                }
-                new_first = j;
-            }
-        }
-
-        size_t new_last = limit;
-        for (size_t j = limit; j < last; ++j)
-        {
-            if (!less(*this, nan_direction_hint)(res[j], res[new_first]) && !greater(*this, nan_direction_hint)(res[j], res[new_first]))
-            {
-                std::swap(res[j], res[new_last]);
-                ++new_last;
-            }
-        }
-        if (new_last - new_first > 1)
-        {
-            new_ranges.emplace_back(new_first, new_last);
-        }
-    }
+    if (reverse)
+        this->updatePermutationImpl(
+            limit, res, equal_range,
+            greater(*this, nan_direction_hint),
+            equals(*this, nan_direction_hint),
+            sort, partial_sort);
+    else
+        this->updatePermutationImpl(
+            limit, res, equal_range,
+            less(*this, nan_direction_hint),
+            equals(*this, nan_direction_hint),
+            sort, partial_sort);
 }
 
 template <typename T>
@@ -360,41 +311,39 @@ ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_s
     const UInt8 * filt_end = filt_pos + size;
     const T * data_pos = data.data();
 
-#ifdef __SSE2__
     /** A slightly more optimized version.
     * Based on the assumption that often pieces of consecutive values
     *  completely pass or do not pass the filter.
     * Therefore, we will optimistically check the parts of `SIMD_BYTES` values.
     */
+    static constexpr size_t SIMD_BYTES = 64;
+    const UInt8 * filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
-    static constexpr size_t SIMD_BYTES = 16;
-    const __m128i zero16 = _mm_setzero_si128();
-    const UInt8 * filt_end_sse = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
-
-    while (filt_pos < filt_end_sse)
+    while (filt_pos < filt_end_aligned)
     {
-        UInt16 mask = _mm_movemask_epi8(_mm_cmpeq_epi8(_mm_loadu_si128(reinterpret_cast<const __m128i *>(filt_pos)), zero16));
-        mask = ~mask;
+        UInt64 mask = Bytes64MaskToBits64Mask(filt_pos);
 
-        if (0 == mask)
-        {
-            /// Nothing is inserted.
-        }
-        else if (0xFFFF == mask)
+        if (0xffffffffffffffff == mask)
         {
             res_data.insert(data_pos, data_pos + SIMD_BYTES);
         }
         else
         {
-            for (size_t i = 0; i < SIMD_BYTES; ++i)
-                if (filt_pos[i])
-                    res_data.push_back(data_pos[i]);
+            while (mask)
+            {
+                size_t index = __builtin_ctzll(mask);
+                res_data.push_back(data_pos[index]);
+            #ifdef __BMI__
+                mask = _blsr_u64(mask);
+            #else
+                mask = mask & (mask-1);
+            #endif
+            }
         }
 
         filt_pos += SIMD_BYTES;
         data_pos += SIMD_BYTES;
     }
-#endif
 
     while (filt_pos < filt_end)
     {
@@ -408,6 +357,12 @@ ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_s
     return res;
 }
 
+template <typename T>
+void ColumnVector<T>::expand(const IColumn::Filter & mask, bool inverted)
+{
+    expandDataByMask<T>(data, mask, inverted);
+}
+
 template <typename T>
 void ColumnVector<T>::applyZeroMap(const IColumn::Filter & filt, bool inverted)
 {
@@ -436,22 +391,7 @@ void ColumnVector<T>::applyZeroMap(const IColumn::Filter & filt, bool inverted)
 template <typename T>
 ColumnPtr ColumnVector<T>::permute(const IColumn::Permutation & perm, size_t limit) const
 {
-    size_t size = data.size();
-
-    if (limit == 0)
-        limit = size;
-    else
-        limit = std::min(size, limit);
-
-    if (perm.size() < limit)
-        throw Exception("Size of permutation is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
-
-    auto res = this->create(limit);
-    typename Self::Container & res_data = res->getData();
-    for (size_t i = 0; i < limit; ++i)
-        res_data[i] = data[perm[i]];
-
-    return res;
+    return permuteImpl(*this, perm, limit);
 }
 
 template <typename T>
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index e75fd11d190..d3e5e8d2bdd 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -4,9 +4,11 @@
 #include <Columns/IColumn.h>
 #include <Columns/IColumnImpl.h>
 #include <Columns/ColumnVectorHelper.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Core/Field.h>
 #include <Common/assert_cast.h>
+#include <Core/TypeId.h>
+#include <base/TypeName.h>
 
 
 namespace DB
@@ -28,6 +30,7 @@ struct CompareHelper
 {
     static constexpr bool less(T a, U b, int /*nan_direction_hint*/) { return a < b; }
     static constexpr bool greater(T a, U b, int /*nan_direction_hint*/) { return a > b; }
+    static constexpr bool equals(T a, U b, int /*nan_direction_hint*/) { return a == b; }
 
     /** Compares two numbers. Returns a number less than zero, equal to zero, or greater than zero if a < b, a == b, a > b, respectively.
       * If one of the values is NaN, then
@@ -74,6 +77,11 @@ struct FloatCompareHelper
         return a > b;
     }
 
+    static constexpr bool equals(T a, T b, int nan_direction_hint)
+    {
+        return compare(a, b, nan_direction_hint) == 0;
+    }
+
     static constexpr int compare(T a, T b, int nan_direction_hint)
     {
         const bool isnan_a = std::isnan(a);
@@ -102,7 +110,7 @@ template <class U> struct CompareHelper<Float64, U> : public FloatCompareHelper<
 template <typename T>
 class ColumnVector final : public COWHelper<ColumnVectorHelper, ColumnVector<T>>
 {
-    static_assert(!IsDecimalNumber<T>);
+    static_assert(!is_decimal<T>);
 
 private:
     using Self = ColumnVector;
@@ -110,6 +118,7 @@ private:
 
     struct less;
     struct greater;
+    struct equals;
 
 public:
     using ValueType = T;
@@ -228,7 +237,7 @@ public:
         data.reserve(n);
     }
 
-    const char * getFamilyName() const override { return TypeName<T>; }
+    const char * getFamilyName() const override { return TypeName<T>.data(); }
     TypeIndex getDataType() const override { return TypeId<T>; }
 
     MutableColumnPtr cloneResized(size_t size) const override;
@@ -239,6 +248,7 @@ public:
         return data[n];
     }
 
+
     void get(size_t n, Field & res) const override
     {
         res = (*this)[n];
@@ -284,6 +294,8 @@ public:
 
     ColumnPtr filter(const IColumn::Filter & filt, ssize_t result_size_hint) const override;
 
+    void expand(const IColumn::Filter & mask, bool inverted) override;
+
     ColumnPtr permute(const IColumn::Permutation & perm, size_t limit) const override;
 
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
@@ -355,12 +367,7 @@ template <typename T>
 template <typename Type>
 ColumnPtr ColumnVector<T>::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
 {
-    size_t size = indexes.size();
-
-    if (limit == 0)
-        limit = size;
-    else
-        limit = std::min(size, limit);
+    assert(limit <= indexes.size());
 
     auto res = this->create(limit);
     typename Self::Container & res_data = res->getData();
diff --git a/src/Columns/ColumnsCommon.cpp b/src/Columns/ColumnsCommon.cpp
index 3c356afa4da..6d16790e2f8 100644
--- a/src/Columns/ColumnsCommon.cpp
+++ b/src/Columns/ColumnsCommon.cpp
@@ -1,7 +1,3 @@
-#ifdef __SSE2__
-    #include <emmintrin.h>
-#endif
-
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
 #include <Common/typeid_cast.h>
@@ -85,7 +81,7 @@ size_t countBytesInFilterWithNull(const IColumn::Filter & filt, const UInt8 * nu
         /// TODO Add duff device for tail?
 #endif
 
-    for (; pos < end; ++pos)
+    for (; pos < end; ++pos, ++pos2)
         count += (*pos & ~*pos2) != 0;
 
     return count;
@@ -229,23 +225,19 @@ namespace
             memcpy(&res_elems[elems_size_old], &src_elems[arr_offset], arr_size * sizeof(T));
         };
 
-    #ifdef __SSE2__
-        const __m128i zero_vec = _mm_setzero_si128();
-        static constexpr size_t SIMD_BYTES = 16;
+        /** A slightly more optimized version.
+        * Based on the assumption that often pieces of consecutive values
+        *  completely pass or do not pass the filter.
+        * Therefore, we will optimistically check the parts of `SIMD_BYTES` values.
+        */
+        static constexpr size_t SIMD_BYTES = 64;
         const auto * filt_end_aligned = filt_pos + size / SIMD_BYTES * SIMD_BYTES;
 
         while (filt_pos < filt_end_aligned)
         {
-            UInt16 mask = _mm_movemask_epi8(_mm_cmpeq_epi8(
-                _mm_loadu_si128(reinterpret_cast<const __m128i *>(filt_pos)),
-                zero_vec));
-            mask = ~mask;
+            uint64_t mask = Bytes64MaskToBits64Mask(filt_pos);
 
-            if (mask == 0)
-            {
-                /// SIMD_BYTES consecutive rows do not pass the filter
-            }
-            else if (mask == 0xffff)
+            if (0xffffffffffffffff == mask)
             {
                 /// SIMD_BYTES consecutive rows pass the filter
                 const auto first = offsets_pos == offsets_begin;
@@ -262,15 +254,21 @@ namespace
             }
             else
             {
-                for (size_t i = 0; i < SIMD_BYTES; ++i)
-                    if (filt_pos[i])
-                        copy_array(offsets_pos + i);
+                while (mask)
+                {
+                    size_t index = __builtin_ctzll(mask);
+                    copy_array(offsets_pos + index);
+                #ifdef __BMI__
+                    mask = _blsr_u64(mask);
+                #else
+                    mask = mask & (mask-1);
+                #endif
+                }
             }
 
             filt_pos += SIMD_BYTES;
             offsets_pos += SIMD_BYTES;
         }
-    #endif
 
         while (filt_pos < filt_end)
         {
@@ -345,4 +343,19 @@ namespace detail
     template const PaddedPODArray<UInt64> * getIndexesData<UInt64>(const IColumn & indexes);
 }
 
+size_t getLimitForPermutation(size_t column_size, size_t perm_size, size_t limit)
+{
+    if (limit == 0)
+        limit = column_size;
+    else
+        limit = std::min(column_size, limit);
+
+    if (perm_size < limit)
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
+            "Size of permutation ({}) is less than required ({})", perm_size, limit);
+
+    return limit;
+}
+
+
 }
diff --git a/src/Columns/ColumnsCommon.h b/src/Columns/ColumnsCommon.h
index 71f2884bf86..b84b1de7d67 100644
--- a/src/Columns/ColumnsCommon.h
+++ b/src/Columns/ColumnsCommon.h
@@ -1,7 +1,13 @@
 #pragma once
 
 #include <Columns/IColumn.h>
-
+#include <Common/PODArray.h>
+#ifdef __SSE2__
+#include <emmintrin.h>
+#endif
+#if defined(__AVX512F__) || defined(__AVX512BW__) || defined(__AVX__) || defined(__AVX2__)
+#include <immintrin.h>
+#endif
 
 /// Common helper methods for implementation of different columns.
 
@@ -14,6 +20,40 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+/// Transform 64-byte mask to 64-bit mask
+inline UInt64 Bytes64MaskToBits64Mask(const UInt8 * bytes64)
+{
+#if defined(__AVX512F__) && defined(__AVX512BW__)
+    static const __m512i zero64 = _mm512_setzero_epi32();
+    UInt64 res = _mm512_cmp_epi8_mask(_mm512_loadu_si512(reinterpret_cast<const __m512i *>(bytes64)), zero64, _MM_CMPINT_EQ);
+#elif defined(__AVX__) && defined(__AVX2__)
+    static const __m256i zero32 = _mm256_setzero_si256();
+    UInt64 res =
+        (static_cast<UInt64>(_mm256_movemask_epi8(_mm256_cmpeq_epi8(
+        _mm256_loadu_si256(reinterpret_cast<const __m256i *>(bytes64)), zero32))) & 0xffffffff)
+        | (static_cast<UInt64>(_mm256_movemask_epi8(_mm256_cmpeq_epi8(
+        _mm256_loadu_si256(reinterpret_cast<const __m256i *>(bytes64+32)), zero32))) << 32);
+#elif defined(__SSE2__) && defined(__POPCNT__)
+    static const __m128i zero16 = _mm_setzero_si128();
+    UInt64 res =
+        (static_cast<UInt64>(_mm_movemask_epi8(_mm_cmpeq_epi8(
+        _mm_loadu_si128(reinterpret_cast<const __m128i *>(bytes64)), zero16))) & 0xffff)
+        | ((static_cast<UInt64>(_mm_movemask_epi8(_mm_cmpeq_epi8(
+        _mm_loadu_si128(reinterpret_cast<const __m128i *>(bytes64 + 16)), zero16))) << 16) & 0xffff0000)
+        | ((static_cast<UInt64>(_mm_movemask_epi8(_mm_cmpeq_epi8(
+        _mm_loadu_si128(reinterpret_cast<const __m128i *>(bytes64 + 32)), zero16))) << 32) & 0xffff00000000)
+        | ((static_cast<UInt64>(_mm_movemask_epi8(_mm_cmpeq_epi8(
+        _mm_loadu_si128(reinterpret_cast<const __m128i *>(bytes64 + 48)), zero16))) << 48) & 0xffff000000000000);
+#else
+    UInt64 res = 0;
+    const UInt8 * pos = bytes64;
+    const UInt8 * end = pos + 64;
+    for (; pos < end; ++pos)
+        res |= ((*pos == 0)<<(pos-bytes64));
+#endif
+    return ~res;
+}
+
 /// Counts how many bytes of `filt` are greater than zero.
 size_t countBytesInFilter(const UInt8 * filt, size_t sz);
 size_t countBytesInFilter(const IColumn::Filter & filt);
@@ -55,7 +95,8 @@ ColumnPtr selectIndexImpl(const Column & column, const IColumn & indexes, size_t
         limit = indexes.size();
 
     if (indexes.size() < limit)
-        throw Exception("Size of indexes is less than required.", ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH);
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
+            "Size of indexes ({}) is less than required ({})", indexes.size(), limit);
 
     if (auto * data_uint8 = detail::getIndexesData<UInt8>(indexes))
         return column.template indexImpl<UInt8>(*data_uint8, limit);
@@ -70,6 +111,15 @@ ColumnPtr selectIndexImpl(const Column & column, const IColumn & indexes, size_t
                         ErrorCodes::LOGICAL_ERROR);
 }
 
+size_t getLimitForPermutation(size_t column_size, size_t perm_size, size_t limit);
+
+template <typename Column>
+ColumnPtr permuteImpl(const Column & column, const IColumn::Permutation & perm, size_t limit)
+{
+    limit = getLimitForPermutation(column.size(), perm.size(), limit);
+    return column.indexImpl(perm, limit);
+}
+
 #define INSTANTIATE_INDEX_IMPL(Column) \
     template ColumnPtr Column::indexImpl<UInt8>(const PaddedPODArray<UInt8> & indexes, size_t limit) const; \
     template ColumnPtr Column::indexImpl<UInt16>(const PaddedPODArray<UInt16> & indexes, size_t limit) const; \
diff --git a/src/Columns/ColumnsNumber.h b/src/Columns/ColumnsNumber.h
index 48721c32fa0..654d0c73254 100644
--- a/src/Columns/ColumnsNumber.h
+++ b/src/Columns/ColumnsNumber.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/ColumnVector.h>
 
 
diff --git a/src/Columns/IColumn.cpp b/src/Columns/IColumn.cpp
index 2fe19d5d9fd..a3ed0885651 100644
--- a/src/Columns/IColumn.cpp
+++ b/src/Columns/IColumn.cpp
@@ -3,7 +3,6 @@
 #include <Columns/IColumn.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnConst.h>
-#include <Columns/ColumnArray.h>
 #include <Core/Field.h>
 
 
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index 23acc81e63d..e4f99cc0a1d 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -4,7 +4,7 @@
 #include <Common/PODArray_fwd.h>
 #include <Common/Exception.h>
 #include <Common/typeid_cast.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Core/Types.h>
 
 
@@ -230,12 +230,20 @@ public:
     /** Removes elements that don't match the filter.
       * Is used in WHERE and HAVING operations.
       * If result_size_hint > 0, then makes advance reserve(result_size_hint) for the result column;
-      *  if 0, then don't makes reserve(),
-      *  otherwise (i.e. < 0), makes reserve() using size of source column.
+      * if 0, then don't makes reserve(),
+      * otherwise (i.e. < 0), makes reserve() using size of source column.
       */
     using Filter = PaddedPODArray<UInt8>;
     virtual Ptr filter(const Filter & filt, ssize_t result_size_hint) const = 0;
 
+    /** Expand column by mask inplace. After expanding column will
+      * satisfy the following: if we filter it by given mask, we will
+      * get initial column. Values with indexes i: mask[i] = 0
+      * shouldn't be used after expanding.
+      * If inverted is true, inverted mask will be used.
+      */
+    virtual void expand(const Filter & /*mask*/, bool /*inverted*/) = 0;
+
     /// Permutes elements using specified permutation. Is used in sorting.
     /// limit - if it isn't 0, puts only first limit elements in the result.
     using Permutation = PaddedPODArray<size_t>;
@@ -480,6 +488,28 @@ protected:
 
     template <typename Derived>
     bool hasEqualValuesImpl() const;
+
+    /// Uses std::sort and partial_sort as default algorithms.
+    /// Implements 'less' and 'equals' via comparator.
+    /// If 'less' and 'equals' can be implemented more optimal
+    /// (e.g. with less number of comparisons), you can use
+    /// directly the second overload of this method.
+    template <typename Comparator>
+    void updatePermutationImpl(
+        size_t limit,
+        Permutation & res,
+        EqualRanges & equal_ranges,
+        Comparator cmp) const;
+
+    template <typename Less, typename Equals, typename Sort, typename PartialSort>
+    void updatePermutationImpl(
+        size_t limit,
+        Permutation & res,
+        EqualRanges & equal_ranges,
+        Less less,
+        Equals equals,
+        Sort full_sort,
+        PartialSort partial_sort) const;
 };
 
 using ColumnPtr = IColumn::Ptr;
diff --git a/src/Columns/IColumnDummy.h b/src/Columns/IColumnDummy.h
index 7e1958f077e..ff45cf28737 100644
--- a/src/Columns/IColumnDummy.h
+++ b/src/Columns/IColumnDummy.h
@@ -100,7 +100,16 @@ public:
 
     ColumnPtr filter(const Filter & filt, ssize_t /*result_size_hint*/) const override
     {
-        return cloneDummy(countBytesInFilter(filt));
+        size_t bytes = countBytesInFilter(filt);
+        return cloneDummy(bytes);
+    }
+
+    void expand(const IColumn::Filter & mask, bool inverted) override
+    {
+        size_t bytes = countBytesInFilter(mask);
+        if (inverted)
+            bytes = mask.size() - bytes;
+        s = bytes;
     }
 
     ColumnPtr permute(const Permutation & perm, size_t limit) const override
diff --git a/src/Columns/IColumnImpl.h b/src/Columns/IColumnImpl.h
index a1ee6a17982..d45867e289d 100644
--- a/src/Columns/IColumnImpl.h
+++ b/src/Columns/IColumnImpl.h
@@ -8,6 +8,8 @@
 
 #include <Columns/IColumn.h>
 #include <Common/PODArray.h>
+#include <base/sort.h>
+#include <algorithm>
 
 namespace DB
 {
@@ -139,4 +141,103 @@ bool IColumn::hasEqualValuesImpl() const
     return true;
 }
 
+template <typename Comparator>
+void IColumn::updatePermutationImpl(
+    size_t limit,
+    Permutation & res,
+    EqualRanges & equal_ranges,
+    Comparator cmp) const
+{
+    updatePermutationImpl(
+        limit, res, equal_ranges,
+        [&cmp](size_t lhs, size_t rhs) { return cmp(lhs, rhs) < 0; },
+        [&cmp](size_t lhs, size_t rhs) { return cmp(lhs, rhs) == 0; },
+        [](auto begin, auto end, auto pred) { std::sort(begin, end, pred); },
+        [](auto begin, auto mid, auto end, auto pred) { ::partial_sort(begin, mid, end, pred); });
+}
+
+template <typename Less, typename Equals, typename Sort, typename PartialSort>
+void IColumn::updatePermutationImpl(
+    size_t limit,
+    Permutation & res,
+    EqualRanges & equal_ranges,
+    Less less,
+    Equals equals,
+    Sort full_sort,
+    PartialSort partial_sort) const
+{
+    if (equal_ranges.empty())
+        return;
+
+    if (limit >= size() || limit > equal_ranges.back().second)
+        limit = 0;
+
+    EqualRanges new_ranges;
+
+    size_t number_of_ranges = equal_ranges.size();
+    if (limit)
+        --number_of_ranges;
+
+    for (size_t i = 0; i < number_of_ranges; ++i)
+    {
+        const auto & [first, last] = equal_ranges[i];
+        full_sort(res.begin() + first, res.begin() + last, less);
+
+        size_t new_first = first;
+        for (size_t j = first + 1; j < last; ++j)
+        {
+            if (!equals(res[j], res[new_first]))
+            {
+                if (j - new_first > 1)
+                    new_ranges.emplace_back(new_first, j);
+
+                new_first = j;
+            }
+        }
+
+        if (last - new_first > 1)
+            new_ranges.emplace_back(new_first, last);
+    }
+
+    if (limit)
+    {
+        const auto & [first, last] = equal_ranges.back();
+
+        if (limit < first || limit > last)
+        {
+            equal_ranges = std::move(new_ranges);
+            return;
+        }
+
+        /// Since then we are working inside the interval.
+        partial_sort(res.begin() + first, res.begin() + limit, res.begin() + last, less);
+
+        size_t new_first = first;
+        for (size_t j = first + 1; j < limit; ++j)
+        {
+            if (!equals(res[j], res[new_first]))
+            {
+                if (j - new_first > 1)
+                    new_ranges.emplace_back(new_first, j);
+                new_first = j;
+            }
+        }
+
+        size_t new_last = limit;
+        for (size_t j = limit; j < last; ++j)
+        {
+            if (equals(res[j], res[new_first]))
+            {
+                std::swap(res[j], res[new_last]);
+                ++new_last;
+            }
+        }
+
+        if (new_last - new_first > 1)
+            new_ranges.emplace_back(new_first, new_last);
+    }
+
+    equal_ranges = std::move(new_ranges);
+}
+
 }
diff --git a/src/Columns/IColumnUnique.h b/src/Columns/IColumnUnique.h
index 5e6473219d1..d2bfc899091 100644
--- a/src/Columns/IColumnUnique.h
+++ b/src/Columns/IColumnUnique.h
@@ -82,7 +82,7 @@ public:
      * @see DB::ReverseIndex
      * @see DB::ColumnUnique
      *
-     * The most common example uses https://clickhouse.tech/docs/en/sql-reference/data-types/lowcardinality/ columns.
+     * The most common example uses https://clickhouse.com/docs/en/sql-reference/data-types/lowcardinality/ columns.
      * Consider data type @e LC(String). The inner type here is @e String which is more or less a contiguous memory
      * region, so it can be easily represented as a @e StringRef. So we pass that ref to this function and get its
      * index in the dictionary, which can be used to operate with the indices column.
@@ -139,6 +139,11 @@ public:
         throw Exception("Method filter is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    void expand(const IColumn::Filter &, bool) override
+    {
+        throw Exception("Method expand is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     ColumnPtr permute(const IColumn::Permutation &, size_t) const override
     {
         throw Exception("Method permute is not supported for ColumnUnique.", ErrorCodes::NOT_IMPLEMENTED);
diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
new file mode 100644
index 00000000000..9499185da30
--- /dev/null
+++ b/src/Columns/MaskOperations.cpp
@@ -0,0 +1,320 @@
+#include <Columns/MaskOperations.h>
+#include <Columns/ColumnFunction.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnNothing.h>
+#include <Columns/ColumnsCommon.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <algorithm>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int ILLEGAL_COLUMN;
+}
+
+template <typename T>
+void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & mask, bool inverted)
+{
+    if (mask.size() < data.size())
+        throw Exception("Mask size should be no less than data size.", ErrorCodes::LOGICAL_ERROR);
+
+    int from = data.size() - 1;
+    int index = mask.size() - 1;
+    data.resize(mask.size());
+    while (index >= 0)
+    {
+        if (!!mask[index] ^ inverted)
+        {
+            if (from < 0)
+                throw Exception("Too many bytes in mask", ErrorCodes::LOGICAL_ERROR);
+
+            /// Copy only if it makes sense.
+            if (index != from)
+                data[index] = data[from];
+            --from;
+        }
+        else
+            data[index] = T();
+
+        --index;
+    }
+
+    if (from != -1)
+        throw Exception("Not enough bytes in mask", ErrorCodes::LOGICAL_ERROR);
+}
+
+/// Explicit instantiations - not to place the implementation of the function above in the header file.
+#define INSTANTIATE(TYPE) \
+template void expandDataByMask<TYPE>(PaddedPODArray<TYPE> &, const PaddedPODArray<UInt8> &, bool);
+
+INSTANTIATE(UInt8)
+INSTANTIATE(UInt16)
+INSTANTIATE(UInt32)
+INSTANTIATE(UInt64)
+INSTANTIATE(UInt128)
+INSTANTIATE(UInt256)
+INSTANTIATE(Int8)
+INSTANTIATE(Int16)
+INSTANTIATE(Int32)
+INSTANTIATE(Int64)
+INSTANTIATE(Int128)
+INSTANTIATE(Int256)
+INSTANTIATE(Float32)
+INSTANTIATE(Float64)
+INSTANTIATE(Decimal32)
+INSTANTIATE(Decimal64)
+INSTANTIATE(Decimal128)
+INSTANTIATE(Decimal256)
+INSTANTIATE(DateTime64)
+INSTANTIATE(char *)
+INSTANTIATE(UUID)
+
+#undef INSTANTIATE
+
+template <bool inverted, bool column_is_short, typename Container>
+size_t extractMaskNumericImpl(
+    PaddedPODArray<UInt8> & mask,
+    const Container & data,
+    UInt8 null_value,
+    const PaddedPODArray<UInt8> * null_bytemap,
+    PaddedPODArray<UInt8> * nulls)
+{
+    size_t ones_count = 0;
+    size_t data_index = 0;
+    for (size_t i = 0; i != mask.size(); ++i)
+    {
+        // Change mask only where value is 1.
+        if (!mask[i])
+            continue;
+
+        UInt8 value;
+        size_t index;
+        if constexpr (column_is_short)
+        {
+            index = data_index;
+            ++data_index;
+        }
+        else
+            index = i;
+
+        if (null_bytemap && (*null_bytemap)[index])
+        {
+            value = null_value;
+            if (nulls)
+                (*nulls)[i] = 1;
+        }
+        else
+            value = !!data[index];
+
+        if constexpr (inverted)
+            value = !value;
+
+        if (value)
+            ++ones_count;
+
+        mask[i] = value;
+    }
+    return ones_count;
+}
+
+template <bool inverted, typename NumericType>
+bool extractMaskNumeric(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    UInt8 null_value,
+    const PaddedPODArray<UInt8> * null_bytemap,
+    PaddedPODArray<UInt8> * nulls,
+    MaskInfo & mask_info)
+{
+    const auto * numeric_column = checkAndGetColumn<ColumnVector<NumericType>>(column.get());
+    if (!numeric_column)
+        return false;
+
+    const auto & data = numeric_column->getData();
+    size_t ones_count;
+    if (column->size() < mask.size())
+        ones_count = extractMaskNumericImpl<inverted, true>(mask, data, null_value, null_bytemap, nulls);
+    else
+        ones_count = extractMaskNumericImpl<inverted, false>(mask, data, null_value, null_bytemap, nulls);
+
+    mask_info.has_ones = ones_count > 0;
+    mask_info.has_zeros = ones_count != mask.size();
+    return true;
+}
+
+template <bool inverted>
+MaskInfo extractMaskFromConstOrNull(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    UInt8 null_value,
+    PaddedPODArray<UInt8> * nulls = nullptr)
+{
+    UInt8 value;
+    if (column->onlyNull())
+    {
+        value = null_value;
+        if (nulls)
+            std::fill(nulls->begin(), nulls->end(), 1);
+    }
+    else
+        value = column->getBool(0);
+
+    if constexpr (inverted)
+        value = !value;
+
+    size_t ones_count = 0;
+    if (value)
+        ones_count = countBytesInFilter(mask);
+    else
+        std::fill(mask.begin(), mask.end(), 0);
+
+    return {.has_ones = ones_count > 0, .has_zeros = ones_count != mask.size()};
+}
+
+template <bool inverted>
+MaskInfo extractMaskImpl(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & col,
+    UInt8 null_value,
+    const PaddedPODArray<UInt8> * null_bytemap,
+    PaddedPODArray<UInt8> * nulls = nullptr)
+{
+    auto column = col->convertToFullColumnIfLowCardinality();
+
+    /// Special implementation for Null and Const columns.
+    if (column->onlyNull() || checkAndGetColumn<ColumnConst>(*column))
+        return extractMaskFromConstOrNull<inverted>(mask, column, null_value, nulls);
+
+    if (const auto * nullable_column = checkAndGetColumn<ColumnNullable>(*column))
+    {
+        const PaddedPODArray<UInt8> & null_map = nullable_column->getNullMapData();
+        return extractMaskImpl<inverted>(mask, nullable_column->getNestedColumnPtr(), null_value, &null_map, nulls);
+    }
+
+    MaskInfo mask_info;
+
+    if (!(extractMaskNumeric<inverted, UInt8>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, UInt16>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, UInt32>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, UInt64>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, Int8>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, Int16>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, Int32>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, Int64>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, Float32>(mask, column, null_value, null_bytemap, nulls, mask_info)
+          || extractMaskNumeric<inverted, Float64>(mask, column, null_value, null_bytemap, nulls, mask_info)))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot convert column {} to mask.", column->getName());
+
+    return mask_info;
+}
+
+MaskInfo extractMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    UInt8 null_value)
+{
+    return extractMaskImpl<false>(mask, column, null_value, nullptr);
+}
+
+MaskInfo extractInvertedMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    UInt8 null_value)
+{
+    return extractMaskImpl<true>(mask, column, null_value, nullptr);
+}
+
+MaskInfo extractMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    PaddedPODArray<UInt8> * nulls,
+    UInt8 null_value)
+{
+    return extractMaskImpl<false>(mask, column, null_value, nullptr, nulls);
+}
+
+MaskInfo extractInvertedMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    PaddedPODArray<UInt8> * nulls,
+    UInt8 null_value)
+{
+    return extractMaskImpl<true>(mask, column, null_value, nullptr, nulls);
+}
+
+
+void inverseMask(PaddedPODArray<UInt8> & mask, MaskInfo & mask_info)
+{
+    for (auto & byte : mask)
+        byte = !byte;
+    std::swap(mask_info.has_ones, mask_info.has_zeros);
+}
+
+void maskedExecute(ColumnWithTypeAndName & column, const PaddedPODArray<UInt8> & mask, const MaskInfo & mask_info)
+{
+    const auto * column_function = checkAndGetShortCircuitArgument(column.column);
+    if (!column_function)
+        return;
+
+    ColumnWithTypeAndName result;
+    /// If mask contains only zeros, we can just create
+    /// an empty column with the execution result type.
+    if (!mask_info.has_ones)
+    {
+        auto result_type = column_function->getResultType();
+        auto empty_column = result_type->createColumn();
+        result = {std::move(empty_column), result_type, ""};
+    }
+    /// Filter column only if mask contains zeros.
+    else if (mask_info.has_zeros)
+    {
+        auto filtered = column_function->filter(mask, -1);
+        result = typeid_cast<const ColumnFunction *>(filtered.get())->reduce();
+    }
+    else
+        result = column_function->reduce();
+
+    column = std::move(result);
+}
+
+void executeColumnIfNeeded(ColumnWithTypeAndName & column, bool empty)
+{
+    const auto * column_function = checkAndGetShortCircuitArgument(column.column);
+    if (!column_function)
+        return;
+
+    if (!empty)
+        column = column_function->reduce();
+    else
+        column.column = column_function->getResultType()->createColumn();
+}
+
+int checkShirtCircuitArguments(const ColumnsWithTypeAndName & arguments)
+{
+    int last_short_circuit_argument_index = -1;
+    for (size_t i = 0; i != arguments.size(); ++i)
+    {
+        if (checkAndGetShortCircuitArgument(arguments[i].column))
+            last_short_circuit_argument_index = i;
+    }
+
+    return last_short_circuit_argument_index;
+}
+
+void copyMask(const PaddedPODArray<UInt8> & from, PaddedPODArray<UInt8> & to)
+{
+    if (from.size() != to.size())
+        throw Exception("Cannot copy mask, because source and destination have different size", ErrorCodes::LOGICAL_ERROR);
+
+    if (from.empty())
+        return;
+
+    memcpy(to.data(), from.data(), from.size() * sizeof(*from.data()));
+}
+
+}
+
diff --git a/src/Columns/MaskOperations.h b/src/Columns/MaskOperations.h
new file mode 100644
index 00000000000..bd6c5e8fe2c
--- /dev/null
+++ b/src/Columns/MaskOperations.h
@@ -0,0 +1,73 @@
+#pragma once
+
+#include <Core/ColumnWithTypeAndName.h>
+#include <Core/ColumnsWithTypeAndName.h>
+#include <Core/Field.h>
+#include <Common/PODArray.h>
+
+namespace DB
+{
+
+/// Expand data by mask. After expanding data will satisfy the following: if we filter data
+/// by given mask, we get initial data. In places where mask[i] = 0 we insert default value.
+/// If inverted is true, we will work with inverted mask. This function is used in implementations of
+/// expand() method in IColumn interface.
+template <typename T>
+void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & mask, bool inverted);
+
+struct MaskInfo
+{
+    bool has_ones;
+    bool has_zeros;
+};
+
+/// The next functions are used to extract UInt8 mask from a column,
+/// filtered by some condition (mask). We will use value from a column
+/// only when value in condition is 1. Column should satisfy the
+/// condition: sum(mask) = column.size() or mask.size() = column.size().
+/// You can set flag 'inverted' to use inverted values
+/// from a column. You can also determine value that will be used when
+/// column value is Null (argument null_value).
+
+MaskInfo extractMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    UInt8 null_value = 0);
+
+MaskInfo extractInvertedMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    UInt8 null_value = 0);
+
+/// The same as extractMask, but fills
+/// nulls so that nulls[i] = 1 when column[i] = Null.
+MaskInfo extractMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    PaddedPODArray<UInt8> * nulls,
+    UInt8 null_value = 0);
+
+MaskInfo extractInvertedMask(
+    PaddedPODArray<UInt8> & mask,
+    const ColumnPtr & column,
+    PaddedPODArray<UInt8> * nulls,
+    UInt8 null_value = 0);
+
+/// Inplace inversion.
+void inverseMask(PaddedPODArray<UInt8> & mask, MaskInfo & mask_info);
+
+/// If given column is lazy executed argument (ColumnFunction with isShortCircuitArgument() = true),
+/// filter it by mask and then reduce. If inverted is true, we will work with inverted mask.
+void maskedExecute(ColumnWithTypeAndName & column, const PaddedPODArray<UInt8> & mask, const MaskInfo & mask_info);
+
+/// If given column is lazy executed argument, reduce it. If empty is true,
+/// create an empty column with the execution result type.
+void executeColumnIfNeeded(ColumnWithTypeAndName & column, bool empty = false);
+
+/// Check if arguments contain lazy executed argument. If contain, return index of the last one,
+/// otherwise return -1.
+int checkShirtCircuitArguments(const ColumnsWithTypeAndName & arguments);
+
+void copyMask(const PaddedPODArray<UInt8> & from, PaddedPODArray<UInt8> & to);
+
+}
diff --git a/src/Columns/ReverseIndex.h b/src/Columns/ReverseIndex.h
index 1db42fcd6a1..1f49e2cb225 100644
--- a/src/Columns/ReverseIndex.h
+++ b/src/Columns/ReverseIndex.h
@@ -6,8 +6,8 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
-#include <common/unaligned.h>
+#include <base/range.h>
+#include <base/unaligned.h>
 
 
 namespace DB
@@ -317,7 +317,7 @@ class ReverseIndex
 {
 public:
     ReverseIndex(UInt64 num_prefix_rows_to_skip_, UInt64 base_index_)
-        : num_prefix_rows_to_skip(num_prefix_rows_to_skip_), base_index(base_index_), saved_hash_ptr(nullptr) {}
+        : num_prefix_rows_to_skip(num_prefix_rows_to_skip_), base_index(base_index_), external_saved_hash_ptr(nullptr) {}
 
     void setColumn(ColumnType * column_);
 
@@ -352,14 +352,14 @@ public:
         if (!use_saved_hash)
             return nullptr;
 
-        UInt64 * ptr = saved_hash_ptr.load();
+        UInt64 * ptr = external_saved_hash_ptr.load();
         if (!ptr)
         {
             auto hash = calcHashes();
             ptr = &hash->getData()[0];
             UInt64 * expected = nullptr;
-            if (saved_hash_ptr.compare_exchange_strong(expected, ptr))
-                saved_hash = std::move(hash);
+            if (external_saved_hash_ptr.compare_exchange_strong(expected, ptr))
+                external_saved_hash = std::move(hash);
             else
                 ptr = expected;
         }
@@ -379,7 +379,9 @@ private:
     /// Lazy initialized.
     std::unique_ptr<IndexMapType> index;
     mutable ColumnUInt64::MutablePtr saved_hash;
-    mutable std::atomic<UInt64 *> saved_hash_ptr;
+    /// For usage during GROUP BY
+    mutable ColumnUInt64::MutablePtr external_saved_hash;
+    mutable std::atomic<UInt64 *> external_saved_hash_ptr;
 
     void buildIndex();
 
diff --git a/src/Columns/ya.make b/src/Columns/ya.make
deleted file mode 100644
index 54dd02609ff..00000000000
--- a/src/Columns/ya.make
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/icu/common
-    contrib/libs/icu/i18n
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/icu
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-SRCS(
-    Collator.cpp
-    ColumnAggregateFunction.cpp
-    ColumnArray.cpp
-    ColumnCompressed.cpp
-    ColumnConst.cpp
-    ColumnDecimal.cpp
-    ColumnFixedString.cpp
-    ColumnFunction.cpp
-    ColumnLowCardinality.cpp
-    ColumnMap.cpp
-    ColumnNullable.cpp
-    ColumnString.cpp
-    ColumnTuple.cpp
-    ColumnVector.cpp
-    ColumnsCommon.cpp
-    FilterDescription.cpp
-    IColumn.cpp
-    getLeastSuperColumn.cpp
-
-)
-
-END()
diff --git a/src/Columns/ya.make.in b/src/Columns/ya.make.in
deleted file mode 100644
index 3c0df961a79..00000000000
--- a/src/Columns/ya.make.in
+++ /dev/null
@@ -1,23 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/icu/common
-    contrib/libs/icu/i18n
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/icu
-    contrib/libs/pdqsort
-    contrib/libs/lz4
-)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Common/Allocator.h b/src/Common/Allocator.h
index f20f11889ce..c2c9ecd689d 100644
--- a/src/Common/Allocator.h
+++ b/src/Common/Allocator.h
@@ -25,8 +25,8 @@
     /// mremap will lead to false positives.
     #define DISABLE_MREMAP 1
 #endif
-#include <common/mremap.h>
-#include <common/getPageSize.h>
+#include <base/mremap.h>
+#include <base/getPageSize.h>
 
 #include <Common/CurrentMemoryTracker.h>
 #include <Common/Exception.h>
diff --git a/src/Common/ArrayCache.h b/src/Common/ArrayCache.h
index b305cc8199d..19f775db31f 100644
--- a/src/Common/ArrayCache.h
+++ b/src/Common/ArrayCache.h
@@ -11,9 +11,9 @@
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/noncopyable.hpp>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
diff --git a/src/Common/BitHelpers.h b/src/Common/BitHelpers.h
index e79daeba14e..9c6071822f3 100644
--- a/src/Common/BitHelpers.h
+++ b/src/Common/BitHelpers.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <cassert>
 #include <type_traits>
-#include <common/defines.h>
+#include <base/defines.h>
 
 
 /** For zero argument, result is zero.
diff --git a/src/Common/ClickHouseRevision.cpp b/src/Common/ClickHouseRevision.cpp
index 2c52ebb064a..c7c27436466 100644
--- a/src/Common/ClickHouseRevision.cpp
+++ b/src/Common/ClickHouseRevision.cpp
@@ -1,8 +1,5 @@
 #include <Common/ClickHouseRevision.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 namespace ClickHouseRevision
 {
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index 3ffa9bb71de..f32707798f7 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -6,7 +6,7 @@
 #include <Common/Arena.h>
 #include <Common/LRUCache.h>
 #include <Common/assert_cast.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Common/CompactArray.h b/src/Common/CompactArray.h
index 7291fe3f18d..89e2b43a943 100644
--- a/src/Common/CompactArray.h
+++ b/src/Common/CompactArray.h
@@ -55,28 +55,6 @@ public:
         return locus;
     }
 
-    /// Used only in arcadia/metrika
-    void readText(ReadBuffer & in)
-    {
-        for (size_t i = 0; i < BITSET_SIZE; ++i)
-        {
-            if (i != 0)
-                assertChar(',', in);
-            readIntText(bitset[i], in);
-        }
-    }
-
-    /// Used only in arcadia/metrika
-    void writeText(WriteBuffer & out) const
-    {
-        for (size_t i = 0; i < BITSET_SIZE; ++i)
-        {
-            if (i != 0)
-                writeCString(",", out);
-            writeIntText(bitset[i], out);
-        }
-    }
-
 private:
     /// number of bytes in bitset
     static constexpr size_t BITSET_SIZE = (static_cast<size_t>(bucket_count) * content_width + 7) / 8;
diff --git a/src/Common/ConcurrentBoundedQueue.h b/src/Common/ConcurrentBoundedQueue.h
index cb29efc3349..4e422f7482e 100644
--- a/src/Common/ConcurrentBoundedQueue.h
+++ b/src/Common/ConcurrentBoundedQueue.h
@@ -2,128 +2,218 @@
 
 #include <queue>
 #include <type_traits>
+#include <atomic>
+#include <condition_variable>
+#include <mutex>
+#include <optional>
 
-#include <Poco/Mutex.h>
-#include <Poco/Semaphore.h>
+#include <base/MoveOrCopyIfThrow.h>
 
-#include <common/MoveOrCopyIfThrow.h>
 
 /** A very simple thread-safe queue of limited size.
-  * If you try to pop an item from an empty queue, the thread is blocked until the queue becomes nonempty.
-  * If you try to push an element into an overflowed queue, the thread is blocked until space appears in the queue.
+  * If you try to pop an item from an empty queue, the thread is blocked until the queue becomes nonempty or queue is finished.
+  * If you try to push an element into an overflowed queue, the thread is blocked until space appears in the queue or queue is finished.
   */
 template <typename T>
 class ConcurrentBoundedQueue
 {
 private:
     std::queue<T> queue;
-    Poco::FastMutex mutex;
-    Poco::Semaphore fill_count;
-    Poco::Semaphore empty_count;
 
-public:
-    explicit ConcurrentBoundedQueue(size_t max_fill)
-        : fill_count(0, max_fill)
-        , empty_count(max_fill, max_fill)
-    {}
+    mutable std::mutex queue_mutex;
+    std::condition_variable push_condition;
+    std::condition_variable pop_condition;
 
-    void push(const T & x)
+    bool is_finished = false;
+
+    size_t max_fill = 0;
+
+    template <typename ... Args>
+    bool emplaceImpl(std::optional<UInt64> timeout_milliseconds, Args &&...args)
     {
-        empty_count.wait();
         {
-            Poco::ScopedLock<Poco::FastMutex> lock(mutex);
-            queue.push(x);
-        }
-        fill_count.set();
-    }
+            std::unique_lock<std::mutex> queue_lock(queue_mutex);
+
+            auto predicate = [&]() { return is_finished || queue.size() < max_fill; };
+
+            if (timeout_milliseconds.has_value())
+            {
+                bool wait_result = push_condition.wait_for(queue_lock, std::chrono::milliseconds(timeout_milliseconds.value()), predicate);
+
+                if (!wait_result)
+                    return false;
+            }
+            else
+            {
+                push_condition.wait(queue_lock, predicate);
+            }
+
+            if (is_finished)
+                return false;
 
-    template <typename... Args>
-    void emplace(Args &&... args)
-    {
-        empty_count.wait();
-        {
-            Poco::ScopedLock<Poco::FastMutex> lock(mutex);
             queue.emplace(std::forward<Args>(args)...);
         }
-        fill_count.set();
+
+        pop_condition.notify_one();
+        return true;
     }
 
-    void pop(T & x)
+    bool popImpl(T & x, std::optional<UInt64> timeout_milliseconds)
     {
-        fill_count.wait();
         {
-            Poco::ScopedLock<Poco::FastMutex> lock(mutex);
+            std::unique_lock<std::mutex> queue_lock(queue_mutex);
+
+            auto predicate = [&]() { return is_finished || !queue.empty(); };
+
+            if (timeout_milliseconds.has_value())
+            {
+                bool wait_result = pop_condition.wait_for(queue_lock, std::chrono::milliseconds(timeout_milliseconds.value()), predicate);
+
+                if (!wait_result)
+                    return false;
+            }
+            else
+            {
+                pop_condition.wait(queue_lock, predicate);
+            }
+
+            if (is_finished && queue.empty())
+                return false;
+
             detail::moveOrCopyIfThrow(std::move(queue.front()), x);
             queue.pop();
         }
-        empty_count.set();
+
+        push_condition.notify_one();
+        return true;
     }
 
-    bool tryPush(const T & x, UInt64 milliseconds = 0)
+public:
+
+    explicit ConcurrentBoundedQueue(size_t max_fill_)
+        : max_fill(max_fill_)
+    {}
+
+    /// Returns false if queue is finished
+    [[nodiscard]] bool push(const T & x)
     {
-        if (empty_count.tryWait(milliseconds))
-        {
-            {
-                Poco::ScopedLock<Poco::FastMutex> lock(mutex);
-                queue.push(x);
-            }
-            fill_count.set();
-            return true;
-        }
-        return false;
+        return emplace(x);
     }
 
+    /// Returns false if queue is finished
     template <typename... Args>
-    bool tryEmplace(UInt64 milliseconds, Args &&... args)
+    [[nodiscard]] bool emplace(Args &&... args)
     {
-        if (empty_count.tryWait(milliseconds))
-        {
-            {
-                Poco::ScopedLock<Poco::FastMutex> lock(mutex);
-                queue.emplace(std::forward<Args>(args)...);
-            }
-            fill_count.set();
-            return true;
-        }
-        return false;
+        emplaceImpl(std::nullopt /* timeout in milliseconds */, std::forward<Args...>(args...));
+        return true;
     }
 
-    bool tryPop(T & x, UInt64 milliseconds = 0)
+    /// Returns false if queue is finished and empty
+    [[nodiscard]] bool pop(T & x)
     {
-        if (fill_count.tryWait(milliseconds))
-        {
-            {
-                Poco::ScopedLock<Poco::FastMutex> lock(mutex);
-                detail::moveOrCopyIfThrow(std::move(queue.front()), x);
-                queue.pop();
-            }
-            empty_count.set();
-            return true;
-        }
-        return false;
+        return popImpl(x, std::nullopt /*timeout in milliseconds*/);
     }
 
-    size_t size()
+    /// Returns false if queue is finished or object was not pushed during timeout
+    [[nodiscard]] bool tryPush(const T & x, UInt64 milliseconds = 0)
     {
-        Poco::ScopedLock<Poco::FastMutex> lock(mutex);
+        return emplaceImpl(milliseconds, x);
+    }
+
+    /// Returns false if queue is finished or object was not emplaced during timeout
+    template <typename... Args>
+    [[nodiscard]] bool tryEmplace(UInt64 milliseconds, Args &&... args)
+    {
+        return emplaceImpl(milliseconds, std::forward<Args...>(args...));
+    }
+
+    /// Returns false if queue is (finished and empty) or (object was not popped during timeout)
+    [[nodiscard]] bool tryPop(T & x, UInt64 milliseconds = 0)
+    {
+        return popImpl(x, milliseconds);
+    }
+
+    /// Returns size of queue
+    size_t size() const
+    {
+        std::lock_guard<std::mutex> lock(queue_mutex);
         return queue.size();
     }
 
-    size_t empty()
+    /// Returns if queue is empty
+    bool empty() const
     {
-        Poco::ScopedLock<Poco::FastMutex> lock(mutex);
+        std::lock_guard<std::mutex> lock(queue_mutex);
         return queue.empty();
     }
 
+    /** Clear and finish queue
+      * After that push operation will return false
+      * pop operations will return values until queue become empty
+      * Returns true if queue was already finished
+      */
+    bool finish()
+    {
+        bool was_finished_before = false;
+
+        {
+            std::lock_guard<std::mutex> lock(queue_mutex);
+
+            if (is_finished)
+                return true;
+
+            was_finished_before = is_finished;
+            is_finished = true;
+        }
+
+        pop_condition.notify_all();
+        push_condition.notify_all();
+
+        return was_finished_before;
+    }
+
+    /// Returns if queue is finished
+    bool isFinished() const
+    {
+        std::lock_guard<std::mutex> lock(queue_mutex);
+        return is_finished;
+    }
+
+    /// Returns if queue is finished and empty
+    bool isFinishedAndEmpty() const
+    {
+        std::lock_guard<std::mutex> lock(queue_mutex);
+        return is_finished && queue.empty();
+    }
+
+    /// Clear queue
     void clear()
     {
-        while (fill_count.tryWait(0))
         {
-            {
-                Poco::ScopedLock<Poco::FastMutex> lock(mutex);
-                queue.pop();
-            }
-            empty_count.set();
+            std::lock_guard<std::mutex> lock(queue_mutex);
+
+            if (is_finished)
+                return;
+
+            std::queue<T> empty_queue;
+            queue.swap(empty_queue);
         }
+
+        push_condition.notify_all();
+    }
+
+    /// Clear and finish queue
+    void clearAndFinish()
+    {
+        {
+            std::lock_guard<std::mutex> lock(queue_mutex);
+
+            std::queue<T> empty_queue;
+            queue.swap(empty_queue);
+            is_finished = true;
+        }
+
+        pop_condition.notify_all();
+        push_condition.notify_all();
     }
 };
diff --git a/src/Common/Config/AbstractConfigurationComparison.cpp b/src/Common/Config/AbstractConfigurationComparison.cpp
index eb677debb02..f304460f914 100644
--- a/src/Common/Config/AbstractConfigurationComparison.cpp
+++ b/src/Common/Config/AbstractConfigurationComparison.cpp
@@ -2,7 +2,7 @@
 #include <Common/getMultipleKeysFromConfig.h>
 
 #include <unordered_set>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
 
diff --git a/src/Common/Config/AbstractConfigurationComparison.h b/src/Common/Config/AbstractConfigurationComparison.h
index 6e1d8a890bb..75e0b77b1ca 100644
--- a/src/Common/Config/AbstractConfigurationComparison.h
+++ b/src/Common/Config/AbstractConfigurationComparison.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace Poco::Util
 {
diff --git a/src/Common/Config/ConfigProcessor.cpp b/src/Common/Config/ConfigProcessor.cpp
index 03ee76240cb..da7405b993f 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-    #include <Common/config.h>
-#endif
+#include <Common/config.h>
 #include "ConfigProcessor.h"
 #include "YAMLParser.h"
 
@@ -20,8 +18,8 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Exception.h>
-#include <common/getResource.h>
-#include <common/errnoToString.h>
+#include <base/getResource.h>
+#include <base/errnoToString.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
@@ -230,8 +228,19 @@ void ConfigProcessor::merge(XMLDocumentPtr config, XMLDocumentPtr with)
     Node * config_root = getRootNode(config.get());
     Node * with_root = getRootNode(with.get());
 
-    if (config_root->nodeName() != with_root->nodeName())
-        throw Poco::Exception("Root element doesn't have the corresponding root element as the config file. It must be <" + config_root->nodeName() + ">");
+    std::string config_root_node_name = config_root->nodeName();
+    std::string merged_root_node_name = with_root->nodeName();
+
+    /// For compatibility, we treat 'yandex' and 'clickhouse' equivalent.
+    /// See https://clickhouse.com/blog/en/2021/clickhouse-inc/
+
+    if (config_root_node_name != merged_root_node_name
+        && !((config_root_node_name == "yandex" || config_root_node_name == "clickhouse")
+            && (merged_root_node_name == "yandex" || merged_root_node_name == "clickhouse")))
+    {
+        throw Poco::Exception("Root element doesn't have the corresponding root element as the config file."
+            " It must be <" + config_root->nodeName() + ">");
+    }
 
     mergeRecursive(config, config_root, with_root);
 }
@@ -386,7 +395,7 @@ void ConfigProcessor::doIncludesRecursive(
     {
         auto get_incl_node = [&](const std::string & name)
         {
-            return include_from ? include_from->getNodeByPath("yandex/" + name) : nullptr;
+            return include_from ? getRootNode(include_from.get())->getNodeByPath(name) : nullptr;
         };
 
         process_include(attr_nodes["incl"], get_incl_node, "Include not found: ");
@@ -577,7 +586,8 @@ XMLDocumentPtr ConfigProcessor::processConfig(
     std::unordered_set<std::string> contributing_zk_paths;
     try
     {
-        Node * node = config->getNodeByPath("yandex/include_from");
+        Node * node = getRootNode(config.get())->getNodeByPath("include_from");
+
         XMLDocumentPtr include_from;
         std::string include_from_path;
         if (node)
diff --git a/src/Common/Config/ConfigProcessor.h b/src/Common/Config/ConfigProcessor.h
index e13e66547a3..2a92a709934 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-    #include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #include <string>
 #include <unordered_set>
@@ -18,7 +16,7 @@
 #include <Poco/DirectoryIterator.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace zkutil
diff --git a/src/Common/Config/ConfigReloader.cpp b/src/Common/Config/ConfigReloader.cpp
index 01bb4f556d6..25e0ff7221c 100644
--- a/src/Common/Config/ConfigReloader.cpp
+++ b/src/Common/Config/ConfigReloader.cpp
@@ -1,7 +1,7 @@
 #include "ConfigReloader.h"
 
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/setThreadName.h>
 #include "ConfigProcessor.h"
 #include <filesystem>
diff --git a/src/Common/Config/YAMLParser.cpp b/src/Common/Config/YAMLParser.cpp
index 8d758eefdc0..1d6d7166669 100644
--- a/src/Common/Config/YAMLParser.cpp
+++ b/src/Common/Config/YAMLParser.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-    #include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_YAML_CPP
 #include "YAMLParser.h"
@@ -19,9 +17,9 @@
 #include <Poco/DOM/Text.h>
 #include <Common/Exception.h>
 
-#include <yaml-cpp/yaml.h> // Y_IGNORE
+#include <yaml-cpp/yaml.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 using namespace Poco::XML;
 
@@ -156,7 +154,7 @@ Poco::AutoPtr<Poco::XML::Document> YAMLParser::parse(const String& path)
         throw Exception(ErrorCodes::CANNOT_OPEN_FILE, "Unable to open YAML configuration file {}", path);
     }
     Poco::AutoPtr<Poco::XML::Document> xml = new Document;
-    Poco::AutoPtr<Poco::XML::Element> root_node = xml->createElement("yandex");
+    Poco::AutoPtr<Poco::XML::Element> root_node = xml->createElement("clickhouse");
     xml->appendChild(root_node);
     try
     {
diff --git a/src/Common/Config/YAMLParser.h b/src/Common/Config/YAMLParser.h
index a716f3de9b1..b181669f45f 100644
--- a/src/Common/Config/YAMLParser.h
+++ b/src/Common/Config/YAMLParser.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-    #include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #include <string>
 
 #include <Poco/DOM/Document.h>
 #include "Poco/DOM/AutoPtr.h"
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #if USE_YAML_CPP
 
diff --git a/src/Common/CounterInFile.h b/src/Common/CounterInFile.h
index 6326261234d..343ef95dd26 100644
--- a/src/Common/CounterInFile.h
+++ b/src/Common/CounterInFile.h
@@ -15,7 +15,7 @@
 #include <IO/WriteHelpers.h>
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/CpuId.h b/src/Common/CpuId.h
index 2db247173a6..e814442ef80 100644
--- a/src/Common/CpuId.h
+++ b/src/Common/CpuId.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #if defined(__x86_64__) || defined(__i386__)
 #include <cpuid.h>
diff --git a/src/Common/CurrentMemoryTracker.cpp b/src/Common/CurrentMemoryTracker.cpp
index d38a5a9c70c..bf0745e667e 100644
--- a/src/Common/CurrentMemoryTracker.cpp
+++ b/src/Common/CurrentMemoryTracker.cpp
@@ -3,6 +3,7 @@
 
 #include <Common/CurrentMemoryTracker.h>
 
+
 namespace
 {
 
@@ -36,6 +37,7 @@ namespace
             if (current_thread)
             {
                 current_thread->untracked_memory += size;
+
                 if (current_thread->untracked_memory > current_thread->untracked_memory_limit)
                 {
                     /// Zero untracked before track. If tracker throws out-of-limit we would be able to alloc up to untracked_memory_limit bytes
@@ -54,6 +56,12 @@ namespace
     }
 }
 
+void check()
+{
+    if (auto * memory_tracker = getMemoryTracker())
+        memory_tracker->allocImpl(0, true);
+}
+
 void alloc(Int64 size)
 {
     bool throw_if_memory_exceeded = true;
diff --git a/src/Common/CurrentMemoryTracker.h b/src/Common/CurrentMemoryTracker.h
index 5090b7c3687..5f735b10be9 100644
--- a/src/Common/CurrentMemoryTracker.h
+++ b/src/Common/CurrentMemoryTracker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 /// Convenience methods, that use current thread's memory_tracker if it is available.
 namespace CurrentMemoryTracker
@@ -9,4 +9,5 @@ namespace CurrentMemoryTracker
     void allocNoThrow(Int64 size);
     void realloc(Int64 old_size, Int64 new_size);
     void free(Int64 size);
+    void check();
 }
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index f94c3421107..5c9ba177b78 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -9,8 +9,9 @@
     M(ReplicatedFetch, "Number of data parts being fetched from replica") \
     M(ReplicatedSend, "Number of data parts being sent to replicas") \
     M(ReplicatedChecks, "Number of data parts checking for consistency") \
-    M(BackgroundPoolTask, "Number of active tasks in BackgroundProcessingPool (merges, mutations, or replication queue bookkeeping)") \
-    M(BackgroundFetchesPoolTask, "Number of active tasks in BackgroundFetchesPool") \
+    M(BackgroundMergesAndMutationsPoolTask, "Number of active merges and mutations in an associated background pool") \
+    M(BackgroundFetchesPoolTask, "Number of active fetches in an associated background pool") \
+    M(BackgroundCommonPoolTask, "Number of active tasks in an associated background pool") \
     M(BackgroundMovePoolTask, "Number of active tasks in BackgroundProcessingPool for moves") \
     M(BackgroundSchedulePoolTask, "Number of active tasks in BackgroundSchedulePool. This pool is used for periodic ReplicatedMergeTree tasks, like cleaning old data parts, altering data parts, replica re-initialization, etc.") \
     M(BackgroundBufferFlushSchedulePoolTask, "Number of active tasks in BackgroundBufferFlushSchedulePool. This pool is used for periodic Buffer flushes") \
@@ -60,6 +61,7 @@
     M(BrokenDistributedFilesToInsert, "Number of files for asynchronous insertion into Distributed tables that has been marked as broken. This metric will starts from 0 on start. Number of files for every shard is summed.") \
     M(TablesToDropQueueSize, "Number of dropped tables, that are waiting for background data removal.") \
     M(MaxDDLEntryID, "Max processed DDL entry of DDLWorker.") \
+    M(MaxPushedDDLEntryID, "Max DDL entry of DDLWorker that pushed to zookeeper.") \
     M(PartsTemporary, "The part is generating now, it is not in data_parts list.") \
     M(PartsPreCommitted, "The part is in data_parts, but not used for SELECTs.") \
     M(PartsCommitted, "Active data part, used by current and upcoming SELECTs.") \
@@ -75,6 +77,7 @@
     M(ActiveAsyncDrainedConnections, "Number of active connections drained asynchronously.") \
     M(SyncDrainedConnections, "Number of connections drained synchronously.") \
     M(ActiveSyncDrainedConnections, "Number of active connections drained synchronously.") \
+    M(AsynchronousReadWait, "Number of threads waiting for asynchronous read.") \
 
 namespace CurrentMetrics
 {
diff --git a/src/Common/CurrentMetrics.h b/src/Common/CurrentMetrics.h
index 7d63b25f0f0..21c3f704872 100644
--- a/src/Common/CurrentMetrics.h
+++ b/src/Common/CurrentMetrics.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <utility>
 #include <atomic>
-#include <common/types.h>
+#include <base/types.h>
 
 /** Allows to count number of simultaneously happening processes or current value of some metric.
   *  - for high-level profiling.
@@ -41,6 +41,12 @@ namespace CurrentMetrics
         values[metric].store(value, std::memory_order_relaxed);
     }
 
+    /// Get value of specified metric.
+    inline Value get(Metric metric)
+    {
+        return values[metric].load(std::memory_order_relaxed);
+    }
+
     /// Add value for specified metric. You must subtract value later; or see class Increment below.
     inline void add(Metric metric, Value value = 1)
     {
diff --git a/src/Common/CurrentThread.cpp b/src/Common/CurrentThread.cpp
index c93b22c443a..10d9f4d07df 100644
--- a/src/Common/CurrentThread.cpp
+++ b/src/Common/CurrentThread.cpp
@@ -1,12 +1,12 @@
 #include <memory>
 
 #include "CurrentThread.h"
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ThreadStatus.h>
 #include <Common/TaskStatsInfoGetter.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/Context.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 #include <Poco/Logger.h>
 
 
@@ -91,6 +91,24 @@ std::shared_ptr<InternalTextLogsQueue> CurrentThread::getInternalTextLogsQueue()
     return current_thread->getInternalTextLogsQueue();
 }
 
+void CurrentThread::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & queue)
+{
+    if (unlikely(!current_thread))
+        return;
+    current_thread->attachInternalProfileEventsQueue(queue);
+}
+
+InternalProfileEventsQueuePtr CurrentThread::getInternalProfileEventsQueue()
+{
+    if (unlikely(!current_thread))
+        return nullptr;
+
+    if (current_thread->getCurrentState() == ThreadStatus::ThreadState::Died)
+        return nullptr;
+
+    return current_thread->getInternalProfileEventsQueue();
+}
+
 ThreadGroupStatusPtr CurrentThread::getGroup()
 {
     if (unlikely(!current_thread))
diff --git a/src/Common/CurrentThread.h b/src/Common/CurrentThread.h
index c6ac7e9933a..9dbe8d355d6 100644
--- a/src/Common/CurrentThread.h
+++ b/src/Common/CurrentThread.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Common/ThreadStatus.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <memory>
 #include <string>
@@ -46,6 +46,9 @@ public:
                                             LogsLevel client_logs_level);
     static std::shared_ptr<InternalTextLogsQueue> getInternalTextLogsQueue();
 
+    static void attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & queue);
+    static InternalProfileEventsQueuePtr getInternalProfileEventsQueue();
+
     static void setFatalErrorCallback(std::function<void()> callback);
 
     /// Makes system calls to update ProfileEvents that contain info from rusage and taskstats
diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp
index 4fe0f0bb8c8..79ab7f82fe0 100644
--- a/src/Common/DNSResolver.cpp
+++ b/src/Common/DNSResolver.cpp
@@ -1,9 +1,9 @@
 #include "DNSResolver.h"
-#include <common/SimpleCache.h>
+#include <base/CachedFn.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/DNS.h>
 #include <Poco/Net/NetException.h>
@@ -114,11 +114,7 @@ static DNSResolver::IPAddresses resolveIPAddressImpl(const std::string & host)
 
     try
     {
-#if defined(ARCADIA_BUILD)
-        addresses = Poco::Net::DNS::hostByName(host, &Poco::Net::DNS::DEFAULT_DNS_TIMEOUT, flags).addresses();
-#else
         addresses = Poco::Net::DNS::hostByName(host, flags).addresses();
-#endif
     }
     catch (const Poco::Net::DNSException & e)
     {
@@ -146,8 +142,8 @@ static String reverseResolveImpl(const Poco::Net::IPAddress & address)
 
 struct DNSResolver::Impl
 {
-    SimpleCache<decltype(resolveIPAddressImpl), &resolveIPAddressImpl> cache_host;
-    SimpleCache<decltype(reverseResolveImpl), &reverseResolveImpl> cache_address;
+    CachedFn<&resolveIPAddressImpl> cache_host;
+    CachedFn<&reverseResolveImpl> cache_address;
 
     std::mutex drop_mutex;
     std::mutex update_mutex;
diff --git a/src/Common/DNSResolver.h b/src/Common/DNSResolver.h
index 57c28188f58..3cefa37fd70 100644
--- a/src/Common/DNSResolver.h
+++ b/src/Common/DNSResolver.h
@@ -2,10 +2,10 @@
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
 #include <memory>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Names.h>
 #include <boost/noncopyable.hpp>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/Elf.cpp b/src/Common/Elf.cpp
index 9e312dc79f2..ebf4e38ba13 100644
--- a/src/Common/Elf.cpp
+++ b/src/Common/Elf.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/Elf.h>
 #include <Common/Exception.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <string.h>
 
diff --git a/src/Common/Epoll.cpp b/src/Common/Epoll.cpp
index 454c1a115f7..c86af5e49e3 100644
--- a/src/Common/Epoll.cpp
+++ b/src/Common/Epoll.cpp
@@ -3,7 +3,7 @@
 #include "Epoll.h"
 #include <Common/Exception.h>
 #include <unistd.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index 7904d0ac61d..3cd914a89bb 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -1,4 +1,5 @@
 #include <Common/ErrorCodes.h>
+#include <Common/Exception.h>
 #include <chrono>
 
 /** Previously, these constants were located in one enum.
@@ -493,7 +494,6 @@
     M(523, UNKNOWN_ROW_POLICY) \
     M(524, ALTER_OF_COLUMN_IS_FORBIDDEN) \
     M(525, INCORRECT_DISK_INDEX) \
-    M(526, UNKNOWN_VOLUME_TYPE) \
     M(527, NO_SUITABLE_FUNCTION_IMPLEMENTATION) \
     M(528, CASSANDRA_INTERNAL_ERROR) \
     M(529, NOT_A_LEADER) \
@@ -561,8 +561,39 @@
     M(591, SQLITE_ENGINE_ERROR) \
     M(592, DATA_ENCRYPTION_ERROR) \
     M(593, ZERO_COPY_REPLICATION_ERROR) \
+    M(594, BZIP2_STREAM_DECODER_FAILED) \
+    M(595, BZIP2_STREAM_ENCODER_FAILED) \
+    M(596, INTERSECT_OR_EXCEPT_RESULT_STRUCTURES_MISMATCH) \
+    M(597, NO_SUCH_ERROR_CODE) \
+    M(598, BACKUP_ALREADY_EXISTS) \
+    M(599, BACKUP_NOT_FOUND) \
+    M(600, BACKUP_VERSION_NOT_SUPPORTED) \
+    M(601, BACKUP_DAMAGED) \
+    M(602, NO_BASE_BACKUP) \
+    M(603, WRONG_BASE_BACKUP) \
+    M(604, BACKUP_ENTRY_ALREADY_EXISTS) \
+    M(605, BACKUP_ENTRY_NOT_FOUND) \
+    M(606, BACKUP_IS_EMPTY) \
+    M(607, BACKUP_ELEMENT_DUPLICATE) \
+    M(608, CANNOT_RESTORE_TABLE) \
+    M(609, FUNCTION_ALREADY_EXISTS) \
+    M(610, CANNOT_DROP_FUNCTION) \
+    M(611, CANNOT_CREATE_RECURSIVE_FUNCTION) \
+    M(612, OBJECT_ALREADY_STORED_ON_DISK) \
+    M(613, OBJECT_WAS_NOT_STORED_ON_DISK) \
+    M(614, POSTGRESQL_CONNECTION_FAILURE) \
+    M(615, CANNOT_ADVISE) \
+    M(616, UNKNOWN_READ_METHOD) \
+    M(617, LZ4_ENCODER_FAILED) \
+    M(618, LZ4_DECODER_FAILED) \
+    M(619, POSTGRESQL_REPLICATION_INTERNAL_ERROR) \
+    M(620, QUERY_NOT_ALLOWED) \
+    M(621, CANNOT_NORMALIZE_STRING) \
+    M(622, CANNOT_PARSE_CAPN_PROTO_SCHEMA) \
+    M(623, CAPN_PROTO_BAD_CAST) \
+    M(624, BAD_FILE_TYPE) \
+    M(625, IO_SETUP_ERROR) \
     \
-    M(998, POSTGRESQL_CONNECTION_FAILURE) \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
     M(1001, STD_EXCEPTION) \
@@ -599,6 +630,21 @@ namespace ErrorCodes
         return error_codes_names.names[error_code];
     }
 
+    ErrorCode getErrorCodeByName(std::string_view error_name)
+    {
+        for (size_t i = 0, end = ErrorCodes::end(); i < end; ++i)
+        {
+            std::string_view name = ErrorCodes::getName(i);
+
+            if (name.empty())
+                continue;
+
+            if (name == error_name)
+                return i;
+        }
+        throw Exception(NO_SUCH_ERROR_CODE, "No error code with name: '{}'", error_name);
+    }
+
     ErrorCode end() { return END + 1; }
 
     void increment(ErrorCode error_code, bool remote, const std::string & message, const FramePointers & trace)
diff --git a/src/Common/ErrorCodes.h b/src/Common/ErrorCodes.h
index cefd77df868..4d5fa632e45 100644
--- a/src/Common/ErrorCodes.h
+++ b/src/Common/ErrorCodes.h
@@ -6,7 +6,7 @@
 #include <mutex>
 #include <string_view>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 /** Allows to count number of simultaneously happening error codes.
   * See also Exception.cpp for incrementing part.
@@ -25,6 +25,12 @@ namespace ErrorCodes
     /// Get name of error_code by identifier.
     /// Returns statically allocated string.
     std::string_view getName(ErrorCode error_code);
+    /// Get error code value by name.
+    ///
+    /// It has O(N) complexity, but this is not major, since it is used only
+    /// for test hints, and it does not worth to keep another structure for
+    /// this.
+    ErrorCode getErrorCodeByName(std::string_view error_name);
 
     struct Error
     {
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index 641f8bbe0f0..fc6a18fd3b9 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -4,22 +4,20 @@
 #include <cxxabi.h>
 #include <cstdlib>
 #include <Poco/String.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadBufferFromFile.h>
-#include <common/demangle.h>
-#include <common/errnoToString.h>
+#include <base/demangle.h>
+#include <base/errnoToString.h>
 #include <Common/formatReadable.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/ErrorCodes.h>
 #include <filesystem>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 namespace fs = std::filesystem;
 
@@ -94,6 +92,22 @@ std::string getExceptionStackTraceString(const std::exception & e)
 #endif
 }
 
+std::string getExceptionStackTraceString(std::exception_ptr e)
+{
+    try
+    {
+        std::rethrow_exception(e);
+    }
+    catch (const std::exception & exception)
+    {
+        return getExceptionStackTraceString(exception);
+    }
+    catch (...)
+    {
+        return {};
+    }
+}
+
 
 std::string Exception::getStackTraceString() const
 {
@@ -380,6 +394,30 @@ int getCurrentExceptionCode()
     }
 }
 
+int getExceptionErrorCode(std::exception_ptr e)
+{
+    try
+    {
+        std::rethrow_exception(e);
+    }
+    catch (const Exception & exception)
+    {
+        return exception.code();
+    }
+    catch (const Poco::Exception &)
+    {
+        return ErrorCodes::POCO_EXCEPTION;
+    }
+    catch (const std::exception &)
+    {
+        return ErrorCodes::STD_EXCEPTION;
+    }
+    catch (...)
+    {
+        return ErrorCodes::UNKNOWN_EXCEPTION;
+    }
+}
+
 
 void rethrowFirstException(const Exceptions & exceptions)
 {
@@ -494,6 +532,13 @@ ExecutionStatus ExecutionStatus::fromCurrentException(const std::string & start_
     return ExecutionStatus(getCurrentExceptionCode(), msg);
 }
 
+ExecutionStatus ExecutionStatus::fromText(const std::string & data)
+{
+    ExecutionStatus status;
+    status.deserializeText(data);
+    return status;
+}
+
 ParsingException::ParsingException() = default;
 ParsingException::ParsingException(const std::string & msg, int code)
     : Exception(msg, code)
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index 79b4394948a..3aa06f8c988 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -82,6 +82,7 @@ private:
 
 
 std::string getExceptionStackTraceString(const std::exception & e);
+std::string getExceptionStackTraceString(std::exception_ptr e);
 
 
 /// Contains an additional member `saved_errno`. See the throwFromErrno function.
@@ -167,6 +168,7 @@ std::string getCurrentExceptionMessage(bool with_stacktrace, bool check_embedded
 
 /// Returns error code from ErrorCodes
 int getCurrentExceptionCode();
+int getExceptionErrorCode(std::exception_ptr e);
 
 
 /// An execution status of any piece of code, contains return code and optional error
@@ -182,6 +184,8 @@ struct ExecutionStatus
 
     static ExecutionStatus fromCurrentException(const std::string & start_of_message = "");
 
+    static ExecutionStatus fromText(const std::string & data);
+
     std::string serializeText() const;
 
     void deserializeText(const std::string & data);
diff --git a/src/Common/ExponentiallySmoothedCounter.h b/src/Common/ExponentiallySmoothedCounter.h
new file mode 100644
index 00000000000..28d4e5e25c1
--- /dev/null
+++ b/src/Common/ExponentiallySmoothedCounter.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include <cmath>
+#include <limits>
+
+
+namespace DB
+{
+
+/** https://en.wikipedia.org/wiki/Exponential_smoothing
+  *
+  * Exponentially smoothed average over time is weighted average with weight proportional to negative exponent of the time passed.
+  * For example, the last value is taken with weight 1/2, the value one second ago with weight 1/4, two seconds ago - 1/8, etc.
+  * It can be understood as an average over sliding window, but with different kernel.
+  *
+  * As an advantage, it is easy to update. Instead of collecting values and calculating a series of x1 / 2 + x2 / 4 + x3 / 8...
+  * just calculate x_old / 2 + x_new / 2.
+  *
+  * It is often used for resource usage metrics. For example, "load average" in Linux is exponentially smoothed moving average.
+  * We can use exponentially smoothed counters in query scheduler.
+  */
+struct ExponentiallySmoothedAverage
+{
+    /// The sum. It contains the last value and all previous values scaled accordingly to the difference of their time to the reference time.
+    /// Older values are summed with exponentially smaller coefficients.
+    /// To obtain the average, you have to divide this value to the sum of all coefficients (see 'sumWeights').
+
+    double value = 0;
+
+    /// The point of reference. You can translate the value to a different point of reference (see 'remap').
+    /// You can imagine that the value exponentially decays over time.
+    /// But it is also meaningful to treat the whole counters as constants over time but in another non-linear coordinate system,
+    /// that inflates over time, while the counter itself does not change
+    /// (it continues to be the same physical quantity, but only changes its representation in the "usual" coordinate system).
+
+    /// Recap: the whole counter is one dimensional and it can be represented as a curve formed by two dependent coordinates in 2d plane,
+    /// the space can be represented by (value, time) coordinates, and the curves will be exponentially decaying over time,
+    /// alternatively the space can be represented by (exponentially_adjusted_value, time) and then the curves will be constant over time.
+
+    /// Also useful analogy is the exponential representation of a number: x = a * exp(b) = a * e (where e = exp(b))
+    /// a number x is represented by a curve in 2d plane that can be parametrized by coordinates (a, b) or (a, e).
+
+    double time = 0;
+
+
+    ExponentiallySmoothedAverage()
+    {
+    }
+
+    ExponentiallySmoothedAverage(double current_value, double current_time)
+        : value(current_value), time(current_time)
+    {
+    }
+
+    /// How much value decays after time_passed.
+    static double scale(double time_passed, double half_decay_time)
+    {
+        return exp2(-time_passed / half_decay_time);
+    }
+
+    /// Sum of weights of all values. Divide by it to get the average.
+    static double sumWeights(double half_decay_time)
+    {
+        double k = scale(1.0, half_decay_time);
+        return 1 / (1 - k);
+    }
+
+    /// Obtain the same counter in another point of reference.
+    ExponentiallySmoothedAverage remap(double current_time, double half_decay_time) const
+    {
+        return ExponentiallySmoothedAverage(value * scale(current_time - time, half_decay_time), current_time);
+    }
+
+    /// Merge two counters. It is done by moving to the same point of reference and summing the values.
+    static ExponentiallySmoothedAverage merge(const ExponentiallySmoothedAverage & a, const ExponentiallySmoothedAverage & b, double half_decay_time)
+    {
+        if (a.time > b.time)
+            return ExponentiallySmoothedAverage(a.value + b.remap(a.time, half_decay_time).value, a.time);
+        if (a.time < b.time)
+            return ExponentiallySmoothedAverage(b.value + a.remap(b.time, half_decay_time).value, b.time);
+
+        return ExponentiallySmoothedAverage(a.value + b.value, a.time);
+    }
+
+    void merge(const ExponentiallySmoothedAverage & other, double half_decay_time)
+    {
+        *this = merge(*this, other, half_decay_time);
+    }
+
+    void add(double new_value, double current_time, double half_decay_time)
+    {
+        merge(ExponentiallySmoothedAverage(new_value, current_time), half_decay_time);
+    }
+
+    /// Calculate the average from the sum.
+    double get(double half_decay_time) const
+    {
+        return value / sumWeights(half_decay_time);
+    }
+
+    double get(double current_time, double half_decay_time) const
+    {
+        return remap(current_time, half_decay_time).get(half_decay_time);
+    }
+
+    /// Compare two counters (by moving to the same point of reference and comparing sums).
+    /// You can store the counters in container and sort it without changing the stored values over time.
+    bool less(const ExponentiallySmoothedAverage & other, double half_decay_time) const
+    {
+        return remap(other.time, half_decay_time).value < other.value;
+    }
+};
+
+}
diff --git a/src/Common/ExternalLoaderStatus.cpp b/src/Common/ExternalLoaderStatus.cpp
deleted file mode 100644
index a31b13eb574..00000000000
--- a/src/Common/ExternalLoaderStatus.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Common/ExternalLoaderStatus.h>
-
-namespace DB
-{
-    String toString(ExternalLoaderStatus status)
-    {
-        using Status = ExternalLoaderStatus;
-        switch (status)
-        {
-            case Status::NOT_LOADED: return "NOT_LOADED";
-            case Status::LOADED: return "LOADED";
-            case Status::FAILED: return "FAILED";
-            case Status::LOADING: return "LOADING";
-            case Status::FAILED_AND_RELOADING: return "FAILED_AND_RELOADING";
-            case Status::LOADED_AND_RELOADING: return "LOADED_AND_RELOADING";
-            case Status::NOT_EXIST: return "NOT_EXIST";
-        }
-    __builtin_unreachable();
-    }
-
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
-    {
-        using Status = ExternalLoaderStatus;
-        return std::vector<std::pair<String, Int8>>{
-            {toString(Status::NOT_LOADED), static_cast<Int8>(Status::NOT_LOADED)},
-            {toString(Status::LOADED), static_cast<Int8>(Status::LOADED)},
-            {toString(Status::FAILED), static_cast<Int8>(Status::FAILED)},
-            {toString(Status::LOADING), static_cast<Int8>(Status::LOADING)},
-            {toString(Status::LOADED_AND_RELOADING), static_cast<Int8>(Status::LOADED_AND_RELOADING)},
-            {toString(Status::FAILED_AND_RELOADING), static_cast<Int8>(Status::FAILED_AND_RELOADING)},
-            {toString(Status::NOT_EXIST), static_cast<Int8>(Status::NOT_EXIST)},
-        };
-    }
-
-    std::ostream & operator<<(std::ostream & out, ExternalLoaderStatus status)
-    {
-        return out << toString(status);
-    }
-}
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index d8852eb6152..ff0758fd3b2 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -1,13 +1,12 @@
 #pragma once
 
 #include <vector>
-#include <utility>
-#include <ostream>
-#include <common/types.h>
+#include <base/EnumReflection.h>
+#include <base/types.h>
 
 namespace DB
 {
-    enum class ExternalLoaderStatus
+    enum class ExternalLoaderStatus : Int8
     {
         NOT_LOADED, /// Object hasn't been tried to load. This is an initial state.
         LOADED, /// Object has been loaded successfully.
@@ -18,7 +17,14 @@ namespace DB
         NOT_EXIST, /// Object with this name wasn't found in the configuration.
     };
 
-    String toString(ExternalLoaderStatus status);
-    std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues();
-    std::ostream & operator<<(std::ostream & out, ExternalLoaderStatus status);
+    inline std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
+    {
+        std::vector<std::pair<String, Int8>> out;
+        out.reserve(magic_enum::enum_count<ExternalLoaderStatus>());
+
+        for (const auto & [value, str] : magic_enum::enum_entries<ExternalLoaderStatus>())
+            out.emplace_back(std::string{str}, static_cast<Int8>(value));
+
+        return out;
+    }
 }
diff --git a/src/Common/Fiber.h b/src/Common/Fiber.h
index e4efc0bdb6a..11549c6cd93 100644
--- a/src/Common/Fiber.h
+++ b/src/Common/Fiber.h
@@ -1,5 +1,7 @@
 #pragma once
-#include <common/defines.h>
+/// defines.h should be included before fiber.hpp
+/// BOOST_USE_ASAN, BOOST_USE_TSAN and BOOST_USE_UCONTEXT should be correctly defined for sanitizers.
+#include <base/defines.h>
 #include <boost/context/fiber.hpp>
 
 using Fiber = boost::context::fiber;
diff --git a/src/Common/FiberStack.h b/src/Common/FiberStack.h
index c509540cc9e..94d4cee197c 100644
--- a/src/Common/FiberStack.h
+++ b/src/Common/FiberStack.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/defines.h>
+#include <base/defines.h>
 #include <boost/context/stack_context.hpp>
 #include <Common/formatReadable.h>
 #include <Common/CurrentMemoryTracker.h>
@@ -27,7 +27,12 @@ private:
     size_t stack_size;
     size_t page_size = 0;
 public:
-    static constexpr size_t default_stack_size = 128 * 1024; /// 64KB was not enough for tests
+    /// NOTE: If you see random segfaults in CI and stack starts from boost::context::...fiber...
+    /// probably it worth to try to increase stack size for coroutines.
+    ///
+    /// Current value is just enough for all tests in our CI. It's not selected in some special
+    /// way. We will have 40 pages with 4KB page size.
+    static constexpr size_t default_stack_size = 192 * 1024; /// 64KB was not enough for tests
 
     explicit FiberStack(size_t stack_size_ = default_stack_size) : stack_size(stack_size_)
     {
@@ -43,6 +48,8 @@ public:
         if (MAP_FAILED == vp)
             DB::throwFromErrno(fmt::format("FiberStack: Cannot mmap {}.", ReadableSize(num_bytes)), DB::ErrorCodes::CANNOT_ALLOCATE_MEMORY);
 
+        /// TODO: make reports on illegal guard page access more clear.
+        /// Currently we will see segfault and almost random stacktrace.
         if (-1 == ::mprotect(vp, page_size, PROT_NONE))
         {
             ::munmap(vp, num_bytes);
diff --git a/src/Common/FieldVisitorConvertToNumber.h b/src/Common/FieldVisitorConvertToNumber.h
index 82a804691d7..6db65fe63ea 100644
--- a/src/Common/FieldVisitorConvertToNumber.h
+++ b/src/Common/FieldVisitorConvertToNumber.h
@@ -2,7 +2,7 @@
 
 #include <Common/FieldVisitors.h>
 #include <Common/NaNUtils.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <type_traits>
 
 
@@ -26,16 +26,6 @@ public:
         throw Exception("Cannot convert NULL to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
     }
 
-    T operator() (const NegativeInfinity &) const
-    {
-        throw Exception("Cannot convert -Inf to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
-    }
-
-    T operator() (const PositiveInfinity &) const
-    {
-        throw Exception("Cannot convert +Inf to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
-    }
-
     T operator() (const String &) const
     {
         throw Exception("Cannot convert String to " + demangle(typeid(T).name()), ErrorCodes::CANNOT_CONVERT_TYPE);
@@ -126,7 +116,7 @@ public:
     template <typename U, typename = std::enable_if_t<is_big_int_v<U>> >
     T operator() (const U & x) const
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             return static_cast<T>(static_cast<typename T::NativeType>(x));
         else if constexpr (std::is_same_v<T, UInt128>)
             throw Exception("No conversion to old UInt128 from " + demangle(typeid(U).name()), ErrorCodes::NOT_IMPLEMENTED);
diff --git a/src/Common/FieldVisitorDump.cpp b/src/Common/FieldVisitorDump.cpp
index 5e767cf30c1..d0203407900 100644
--- a/src/Common/FieldVisitorDump.cpp
+++ b/src/Common/FieldVisitorDump.cpp
@@ -20,13 +20,11 @@ template <typename T>
 static inline void writeQuoted(const DecimalField<T> & x, WriteBuffer & buf)
 {
     writeChar('\'', buf);
-    writeText(x.getValue(), x.getScale(), buf);
+    writeText(x.getValue(), x.getScale(), buf, {});
     writeChar('\'', buf);
 }
 
-String FieldVisitorDump::operator() (const Null &) const { return "NULL"; }
-String FieldVisitorDump::operator() (const NegativeInfinity &) const { return "-Inf"; }
-String FieldVisitorDump::operator() (const PositiveInfinity &) const { return "+Inf"; }
+String FieldVisitorDump::operator() (const Null & x) const { return x.isNegativeInfinity() ? "-Inf" : (x.isPositiveInfinity() ? "+Inf" : "NULL"); }
 String FieldVisitorDump::operator() (const UInt64 & x) const { return formatQuotedWithPrefix(x, "UInt64_"); }
 String FieldVisitorDump::operator() (const Int64 & x) const { return formatQuotedWithPrefix(x, "Int64_"); }
 String FieldVisitorDump::operator() (const Float64 & x) const { return formatQuotedWithPrefix(x, "Float64_"); }
diff --git a/src/Common/FieldVisitorDump.h b/src/Common/FieldVisitorDump.h
index bc82d35f0f1..22e34d66ff7 100644
--- a/src/Common/FieldVisitorDump.h
+++ b/src/Common/FieldVisitorDump.h
@@ -10,8 +10,6 @@ class FieldVisitorDump : public StaticVisitor<String>
 {
 public:
     String operator() (const Null & x) const;
-    String operator() (const NegativeInfinity & x) const;
-    String operator() (const PositiveInfinity & x) const;
     String operator() (const UInt64 & x) const;
     String operator() (const UInt128 & x) const;
     String operator() (const UInt256 & x) const;
diff --git a/src/Common/FieldVisitorHash.cpp b/src/Common/FieldVisitorHash.cpp
index 259dd871d20..80d5f2daf65 100644
--- a/src/Common/FieldVisitorHash.cpp
+++ b/src/Common/FieldVisitorHash.cpp
@@ -14,18 +14,6 @@ void FieldVisitorHash::operator() (const Null &) const
     hash.update(type);
 }
 
-void FieldVisitorHash::operator() (const NegativeInfinity &) const
-{
-    UInt8 type = Field::Types::NegativeInfinity;
-    hash.update(type);
-}
-
-void FieldVisitorHash::operator() (const PositiveInfinity &) const
-{
-    UInt8 type = Field::Types::PositiveInfinity;
-    hash.update(type);
-}
-
 void FieldVisitorHash::operator() (const UInt64 & x) const
 {
     UInt8 type = Field::Types::UInt64;
diff --git a/src/Common/FieldVisitorHash.h b/src/Common/FieldVisitorHash.h
index bf7c3d5004f..6c786fda4ad 100644
--- a/src/Common/FieldVisitorHash.h
+++ b/src/Common/FieldVisitorHash.h
@@ -16,8 +16,6 @@ public:
     FieldVisitorHash(SipHash & hash_);
 
     void operator() (const Null & x) const;
-    void operator() (const NegativeInfinity & x) const;
-    void operator() (const PositiveInfinity & x) const;
     void operator() (const UInt64 & x) const;
     void operator() (const UInt128 & x) const;
     void operator() (const UInt256 & x) const;
diff --git a/src/Common/FieldVisitorSum.cpp b/src/Common/FieldVisitorSum.cpp
index e0ffca28341..0064830c08a 100644
--- a/src/Common/FieldVisitorSum.cpp
+++ b/src/Common/FieldVisitorSum.cpp
@@ -22,8 +22,6 @@ bool FieldVisitorSum::operator() (UInt64 & x) const
 bool FieldVisitorSum::operator() (Float64 & x) const { x += get<Float64>(rhs); return x != 0; }
 
 bool FieldVisitorSum::operator() (Null &) const { throw Exception("Cannot sum Nulls", ErrorCodes::LOGICAL_ERROR); }
-bool FieldVisitorSum::operator() (NegativeInfinity &) const { throw Exception("Cannot sum -Inf", ErrorCodes::LOGICAL_ERROR); }
-bool FieldVisitorSum::operator() (PositiveInfinity &) const { throw Exception("Cannot sum +Inf", ErrorCodes::LOGICAL_ERROR); }
 bool FieldVisitorSum::operator() (String &) const { throw Exception("Cannot sum Strings", ErrorCodes::LOGICAL_ERROR); }
 bool FieldVisitorSum::operator() (Array &) const { throw Exception("Cannot sum Arrays", ErrorCodes::LOGICAL_ERROR); }
 bool FieldVisitorSum::operator() (Tuple &) const { throw Exception("Cannot sum Tuples", ErrorCodes::LOGICAL_ERROR); }
diff --git a/src/Common/FieldVisitorSum.h b/src/Common/FieldVisitorSum.h
index 4c34fa86455..e208933043b 100644
--- a/src/Common/FieldVisitorSum.h
+++ b/src/Common/FieldVisitorSum.h
@@ -21,8 +21,6 @@ public:
     bool operator() (UInt64 & x) const;
     bool operator() (Float64 & x) const;
     bool operator() (Null &) const;
-    bool operator() (NegativeInfinity & x) const;
-    bool operator() (PositiveInfinity & x) const;
     bool operator() (String &) const;
     bool operator() (Array &) const;
     bool operator() (Tuple &) const;
diff --git a/src/Common/FieldVisitorToString.cpp b/src/Common/FieldVisitorToString.cpp
index 74dfc55e1db..01b2db54735 100644
--- a/src/Common/FieldVisitorToString.cpp
+++ b/src/Common/FieldVisitorToString.cpp
@@ -26,7 +26,7 @@ template <typename T>
 static inline void writeQuoted(const DecimalField<T> & x, WriteBuffer & buf)
 {
     writeChar('\'', buf);
-    writeText(x.getValue(), x.getScale(), buf);
+    writeText(x.getValue(), x.getScale(), buf, {});
     writeChar('\'', buf);
 }
 
@@ -52,9 +52,7 @@ static String formatFloat(const Float64 x)
 }
 
 
-String FieldVisitorToString::operator() (const Null &) const { return "NULL"; }
-String FieldVisitorToString::operator() (const NegativeInfinity &) const { return "-Inf"; }
-String FieldVisitorToString::operator() (const PositiveInfinity &) const { return "+Inf"; }
+String FieldVisitorToString::operator() (const Null & x) const { return x.isNegativeInfinity() ? "-Inf" : (x.isPositiveInfinity() ? "+Inf" : "NULL"); }
 String FieldVisitorToString::operator() (const UInt64 & x) const { return formatQuoted(x); }
 String FieldVisitorToString::operator() (const Int64 & x) const { return formatQuoted(x); }
 String FieldVisitorToString::operator() (const Float64 & x) const { return formatFloat(x); }
diff --git a/src/Common/FieldVisitorToString.h b/src/Common/FieldVisitorToString.h
index 139f011927f..39709f1c272 100644
--- a/src/Common/FieldVisitorToString.h
+++ b/src/Common/FieldVisitorToString.h
@@ -10,8 +10,6 @@ class FieldVisitorToString : public StaticVisitor<String>
 {
 public:
     String operator() (const Null & x) const;
-    String operator() (const NegativeInfinity & x) const;
-    String operator() (const PositiveInfinity & x) const;
     String operator() (const UInt64 & x) const;
     String operator() (const UInt128 & x) const;
     String operator() (const UInt256 & x) const;
diff --git a/src/Common/FieldVisitorWriteBinary.cpp b/src/Common/FieldVisitorWriteBinary.cpp
index 56df9f1e43a..d01188bef40 100644
--- a/src/Common/FieldVisitorWriteBinary.cpp
+++ b/src/Common/FieldVisitorWriteBinary.cpp
@@ -6,9 +6,7 @@
 namespace DB
 {
 
-void FieldVisitorWriteBinary::operator() (const Null &, WriteBuffer &) const { }
-void FieldVisitorWriteBinary::operator() (const NegativeInfinity &, WriteBuffer &) const { }
-void FieldVisitorWriteBinary::operator() (const PositiveInfinity &, WriteBuffer &) const { }
+void FieldVisitorWriteBinary::operator() (const Null &, WriteBuffer &) const {}
 void FieldVisitorWriteBinary::operator() (const UInt64 & x, WriteBuffer & buf) const { writeVarUInt(x, buf); }
 void FieldVisitorWriteBinary::operator() (const Int64 & x, WriteBuffer & buf) const { writeVarInt(x, buf); }
 void FieldVisitorWriteBinary::operator() (const Float64 & x, WriteBuffer & buf) const { writeFloatBinary(x, buf); }
diff --git a/src/Common/FieldVisitorWriteBinary.h b/src/Common/FieldVisitorWriteBinary.h
index 5f7bf578e32..ae864ca74f3 100644
--- a/src/Common/FieldVisitorWriteBinary.h
+++ b/src/Common/FieldVisitorWriteBinary.h
@@ -9,8 +9,6 @@ class FieldVisitorWriteBinary
 {
 public:
     void operator() (const Null & x, WriteBuffer & buf) const;
-    void operator() (const NegativeInfinity & x, WriteBuffer & buf) const;
-    void operator() (const PositiveInfinity & x, WriteBuffer & buf) const;
     void operator() (const UInt64 & x, WriteBuffer & buf) const;
     void operator() (const UInt128 & x, WriteBuffer & buf) const;
     void operator() (const UInt256 & x, WriteBuffer & buf) const;
diff --git a/src/Common/FieldVisitorsAccurateComparison.h b/src/Common/FieldVisitorsAccurateComparison.h
index 9e6a93cee3f..795620da0cb 100644
--- a/src/Common/FieldVisitorsAccurateComparison.h
+++ b/src/Common/FieldVisitorsAccurateComparison.h
@@ -2,7 +2,7 @@
 
 #include <Core/Field.h>
 #include <Core/AccurateComparison.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <Common/FieldVisitors.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -26,11 +26,11 @@ public:
     template <typename T, typename U>
     bool operator() (const T & l, const U & r) const
     {
-        if constexpr (std::is_same_v<T, Null> || std::is_same_v<U, Null>
-            || std::is_same_v<T, NegativeInfinity> || std::is_same_v<T, PositiveInfinity>
-            || std::is_same_v<U, NegativeInfinity> || std::is_same_v<U, PositiveInfinity>)
+        if constexpr (std::is_same_v<T, Null> || std::is_same_v<U, Null>)
         {
-            return std::is_same_v<T, U>;
+            if constexpr (std::is_same_v<T, Null> && std::is_same_v<U, Null>)
+                return l == r;
+            return false;
         }
         else
         {
@@ -79,12 +79,18 @@ public:
     template <typename T, typename U>
     bool operator() (const T & l, const U & r) const
     {
-        if constexpr (std::is_same_v<T, Null> || std::is_same_v<U, Null>)
-            return false;
-        else if constexpr (std::is_same_v<T, NegativeInfinity> || std::is_same_v<U, PositiveInfinity>)
-            return !std::is_same_v<T, U>;
-        else if constexpr (std::is_same_v<U, NegativeInfinity> || std::is_same_v<T, PositiveInfinity>)
-            return false;
+        if constexpr (std::is_same_v<T, Null> && std::is_same_v<U, Null>)
+        {
+            return l.isNegativeInfinity() && r.isPositiveInfinity();
+        }
+        else if constexpr (std::is_same_v<T, Null>)
+        {
+            return l.isNegativeInfinity();
+        }
+        else if constexpr (std::is_same_v<U, Null>)
+        {
+            return r.isPositiveInfinity();
+        }
         else
         {
             if constexpr (std::is_same_v<T, U>)
diff --git a/src/Common/FileChecker.cpp b/src/Common/FileChecker.cpp
index 173c4bd8a3a..14705a9b0b0 100644
--- a/src/Common/FileChecker.cpp
+++ b/src/Common/FileChecker.cpp
@@ -1,4 +1,4 @@
-#include <common/JSON.h>
+#include <base/JSON.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromString.h>
@@ -111,7 +111,7 @@ void FileChecker::save() const
         std::unique_ptr<WriteBuffer> out = disk->writeFile(tmp_files_info_path);
 
         /// So complex JSON structure - for compatibility with the old format.
-        writeCString("{\"yandex\":{", *out);
+        writeCString("{\"clickhouse\":{", *out);
 
         auto settings = FormatSettings();
         for (auto it = map.begin(); it != map.end(); ++it)
@@ -153,7 +153,7 @@ void FileChecker::load()
     }
     JSON json(out.str());
 
-    JSON files = json["yandex"];
+    JSON files = json.has("clickhouse") ? json["clickhouse"] : json["yandex"];
     for (const JSON file : files) // NOLINT
         map[unescapeForFileName(file.getName())] = file.getValue()["size"].toUInt();
 }
diff --git a/src/Common/FileChecker.h b/src/Common/FileChecker.h
index 73e4470f231..688c2b78486 100644
--- a/src/Common/FileChecker.h
+++ b/src/Common/FileChecker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/CheckResults.h>
 #include <Disks/IDisk.h>
 
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 84e514c1375..695ac30524d 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -2,9 +2,9 @@
 
 #include <city.h>
 #include <Core/Types.h>
-#include <common/types.h>
-#include <common/unaligned.h>
-#include <common/StringRef.h>
+#include <base/types.h>
+#include <base/unaligned.h>
+#include <base/StringRef.h>
 
 #include <type_traits>
 
@@ -77,7 +77,7 @@ template <typename T>
 inline typename std::enable_if<(sizeof(T) > sizeof(DB::UInt64)), DB::UInt64>::type
 intHashCRC32(const T & x, DB::UInt64 updated_value)
 {
-    auto * begin = reinterpret_cast<const char *>(&x);
+    const auto * begin = reinterpret_cast<const char *>(&x);
     for (size_t i = 0; i < sizeof(T); i += sizeof(UInt64))
     {
         updated_value = intHashCRC32(unalignedLoad<DB::UInt64>(begin), updated_value);
@@ -197,12 +197,8 @@ inline size_t DefaultHash64(std::enable_if_t<(sizeof(T) > sizeof(UInt64)), T> ke
     __builtin_unreachable();
 }
 
-
-template <typename T, typename Enable = void>
-struct DefaultHash;
-
 template <typename T>
-struct DefaultHash<T, std::enable_if_t<!DB::IsDecimalNumber<T>>>
+struct DefaultHash
 {
     size_t operator() (T key) const
     {
@@ -210,8 +206,8 @@ struct DefaultHash<T, std::enable_if_t<!DB::IsDecimalNumber<T>>>
     }
 };
 
-template <typename T>
-struct DefaultHash<T, std::enable_if_t<DB::IsDecimalNumber<T>>>
+template <DB::is_decimal T>
+struct DefaultHash<T>
 {
     size_t operator() (T key) const
     {
diff --git a/src/Common/HashTable/HashTable.h b/src/Common/HashTable/HashTable.h
index e25b3191652..b0f16dfdb8b 100644
--- a/src/Common/HashTable/HashTable.h
+++ b/src/Common/HashTable/HashTable.h
@@ -10,7 +10,7 @@
 #include <boost/noncopyable.hpp>
 
 #include <Core/Defines.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/MemorySanitizer.h>
 
diff --git a/src/Common/HashTable/LRUHashMap.h b/src/Common/HashTable/LRUHashMap.h
index bdefee351b1..2f0c4cfc744 100644
--- a/src/Common/HashTable/LRUHashMap.h
+++ b/src/Common/HashTable/LRUHashMap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <boost/intrusive/trivial_value_traits.hpp>
 #include <boost/intrusive/list.hpp>
diff --git a/src/Common/HyperLogLogCounter.h b/src/Common/HyperLogLogCounter.h
index 1cb014a050a..c840151bce9 100644
--- a/src/Common/HyperLogLogCounter.h
+++ b/src/Common/HyperLogLogCounter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/HyperLogLogBiasEstimator.h>
 #include <Common/CompactArray.h>
 #include <Common/HashTable/Hash.h>
diff --git a/src/Common/IFactoryWithAliases.h b/src/Common/IFactoryWithAliases.h
index 5ef795c92d0..f7da302a942 100644
--- a/src/Common/IFactoryWithAliases.h
+++ b/src/Common/IFactoryWithAliases.h
@@ -2,7 +2,7 @@
 
 #include <Common/Exception.h>
 #include <Common/NamePrompter.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/String.h>
 
 #include <unordered_map>
diff --git a/src/Common/IPv6ToBinary.h b/src/Common/IPv6ToBinary.h
index d766d408359..584ed44f2e6 100644
--- a/src/Common/IPv6ToBinary.h
+++ b/src/Common/IPv6ToBinary.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <array>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace Poco { namespace Net { class IPAddress; }}
 
diff --git a/src/Common/IntervalKind.cpp b/src/Common/IntervalKind.cpp
index b4acbe23ddd..ee4b67469ce 100644
--- a/src/Common/IntervalKind.cpp
+++ b/src/Common/IntervalKind.cpp
@@ -9,23 +9,6 @@ namespace ErrorCodes
     extern const int SYNTAX_ERROR;
 }
 
-const char * IntervalKind::toString() const
-{
-    switch (kind)
-    {
-        case IntervalKind::Second: return "Second";
-        case IntervalKind::Minute: return "Minute";
-        case IntervalKind::Hour: return "Hour";
-        case IntervalKind::Day: return "Day";
-        case IntervalKind::Week: return "Week";
-        case IntervalKind::Month: return "Month";
-        case IntervalKind::Quarter: return "Quarter";
-        case IntervalKind::Year: return "Year";
-    }
-    __builtin_unreachable();
-}
-
-
 Int32 IntervalKind::toAvgSeconds() const
 {
     switch (kind)
diff --git a/src/Common/IntervalKind.h b/src/Common/IntervalKind.h
index a086d0d2b0c..85372ffa9ab 100644
--- a/src/Common/IntervalKind.h
+++ b/src/Common/IntervalKind.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-
+#include <base/types.h>
+#include <base/EnumReflection.h>
 
 namespace DB
 {
@@ -24,7 +24,7 @@ struct IntervalKind
     IntervalKind(Kind kind_ = Second) : kind(kind_) {}
     operator Kind() const { return kind; }
 
-    const char * toString() const;
+    constexpr std::string_view toString() const { return magic_enum::enum_name(kind); }
 
     /// Returns number of seconds in one interval.
     /// For `Month`, `Quarter` and `Year` the function returns an average number of seconds.
diff --git a/src/Common/JSONBuilder.h b/src/Common/JSONBuilder.h
index be95323de7d..b1a1ec4ae6a 100644
--- a/src/Common/JSONBuilder.h
+++ b/src/Common/JSONBuilder.h
@@ -33,7 +33,7 @@ using ItemPtr = std::unique_ptr<IItem>;
 class JSONString : public IItem
 {
 public:
-    explicit JSONString(std::string value_) : value(std::move(value_)) {}
+    JSONString(std::string_view value_) : value(value_) {}
     void format(const FormatSettings & settings, FormatContext & context) override;
 
 private:
@@ -94,9 +94,10 @@ class JSONMap : public IItem
     };
 
 public:
-    void add(std::string key, ItemPtr value) { values.emplace_back(Pair{.key = std::move(key), .value = std::move(value)}); }
+    void add(std::string key, ItemPtr value) { values.emplace_back(Pair{.key = std::move(key), .value = std::move(value)}); } //-V1030
     void add(std::string key, std::string value) { add(std::move(key), std::make_unique<JSONString>(std::move(value))); }
     void add(std::string key, const char * value) { add(std::move(key), std::make_unique<JSONString>(value)); }
+    void add(std::string key, std::string_view value) { add(std::move(key), std::make_unique<JSONString>(value)); }
     void add(std::string key, bool value) { add(std::move(key), std::make_unique<JSONBool>(std::move(value))); }
 
     template <typename T, std::enable_if_t<std::is_arithmetic<T>::value, bool> = true>
diff --git a/src/Common/LRUCache.h b/src/Common/LRUCache.h
index 10533a154d1..bbc09fd3aff 100644
--- a/src/Common/LRUCache.h
+++ b/src/Common/LRUCache.h
@@ -7,7 +7,7 @@
 #include <mutex>
 #include <atomic>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -36,12 +36,13 @@ public:
     using Mapped = TMapped;
     using MappedPtr = std::shared_ptr<Mapped>;
 
-private:
-    using Clock = std::chrono::steady_clock;
-
-public:
-    LRUCache(size_t max_size_)
-        : max_size(std::max(static_cast<size_t>(1), max_size_)) {}
+    /** Initialize LRUCache with max_size and max_elements_size.
+      * max_elements_size == 0 means no elements size restrictions.
+      */
+    LRUCache(size_t max_size_, size_t max_elements_size_ = 0)
+        : max_size(std::max(static_cast<size_t>(1), max_size_))
+        , max_elements_size(max_elements_size_)
+        {}
 
     MappedPtr get(const Key & key)
     {
@@ -252,6 +253,7 @@ private:
     /// Total weight of values.
     size_t current_size = 0;
     const size_t max_size;
+    const size_t max_elements_size;
 
     std::atomic<size_t> hits {0};
     std::atomic<size_t> misses {0};
@@ -311,7 +313,8 @@ private:
     {
         size_t current_weight_lost = 0;
         size_t queue_size = cells.size();
-        while ((current_size > max_size) && (queue_size > 1))
+
+        while ((current_size > max_size || (max_elements_size != 0 && queue_size > max_elements_size)) && (queue_size > 1))
         {
             const Key & key = queue.front();
 
diff --git a/src/Common/Macros.cpp b/src/Common/Macros.cpp
index 7882449b595..339f3f43fc4 100644
--- a/src/Common/Macros.cpp
+++ b/src/Common/Macros.cpp
@@ -2,7 +2,7 @@
 #include <Common/Macros.h>
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/Macros.h b/src/Common/Macros.h
index 9298dbfc2d5..3e6fbff1519 100644
--- a/src/Common/Macros.h
+++ b/src/Common/Macros.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Names.h>
 #include <Interpreters/StorageID.h>
 
diff --git a/src/Common/MemorySanitizer.h b/src/Common/MemorySanitizer.h
index b52f1d74a2b..a230fe22bb8 100644
--- a/src/Common/MemorySanitizer.h
+++ b/src/Common/MemorySanitizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #ifdef __clang__
 #pragma clang diagnostic push
diff --git a/src/Common/MemoryStatisticsOS.cpp b/src/Common/MemoryStatisticsOS.cpp
index f1022d887c1..220d7a2013b 100644
--- a/src/Common/MemoryStatisticsOS.cpp
+++ b/src/Common/MemoryStatisticsOS.cpp
@@ -8,8 +8,8 @@
 
 #include "MemoryStatisticsOS.h"
 
-#include <common/logger_useful.h>
-#include <common/getPageSize.h>
+#include <base/logger_useful.h>
+#include <base/getPageSize.h>
 #include <Common/Exception.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index a05fa3b5ad5..013005442be 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -4,7 +4,7 @@
 #include "Common/TraceCollector.h"
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/thread_local_rng.h>
 
@@ -15,7 +15,7 @@
 
 
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-thread_local bool _memory_tracker_always_throw_logical_error_on_allocation = false;
+thread_local bool memory_tracker_always_throw_logical_error_on_allocation = false;
 #endif
 
 namespace
@@ -173,9 +173,9 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     }
 
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-    if (unlikely(_memory_tracker_always_throw_logical_error_on_allocation))
+    if (unlikely(memory_tracker_always_throw_logical_error_on_allocation))
     {
-        _memory_tracker_always_throw_logical_error_on_allocation = false;
+        memory_tracker_always_throw_logical_error_on_allocation = false;
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Memory tracker: allocations not allowed.");
     }
 #endif
@@ -183,9 +183,6 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     std::bernoulli_distribution fault(fault_probability);
     if (unlikely(fault_probability && fault(thread_local_rng)) && memoryTrackerCanThrow(level, true) && throw_if_memory_exceeded)
     {
-        ProfileEvents::increment(ProfileEvents::QueryMemoryLimitExceeded);
-        amount.fetch_sub(size, std::memory_order_relaxed);
-
         /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
         BlockerInThread untrack_lock(VariableContext::Global);
 
@@ -203,11 +200,13 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     }
 
 
+    bool allocation_traced = false;
     if (unlikely(current_profiler_limit && will_be > current_profiler_limit))
     {
         BlockerInThread untrack_lock(VariableContext::Global);
         DB::TraceCollector::collect(DB::TraceType::Memory, StackTrace(), size);
         setOrRaiseProfilerLimit((will_be + profiler_step - 1) / profiler_step * profiler_step);
+        allocation_traced = true;
     }
 
     std::bernoulli_distribution sample(sample_probability);
@@ -215,6 +214,7 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
     {
         BlockerInThread untrack_lock(VariableContext::Global);
         DB::TraceCollector::collect(DB::TraceType::MemorySample, StackTrace(), size);
+        allocation_traced = true;
     }
 
     if (unlikely(current_hard_limit && will_be > current_hard_limit) && memoryTrackerCanThrow(level, false) && throw_if_memory_exceeded)
@@ -233,17 +233,24 @@ void MemoryTracker::allocImpl(Int64 size, bool throw_if_memory_exceeded)
             formatReadableSizeWithBinarySuffix(current_hard_limit));
     }
 
+    bool peak_updated;
     if (throw_if_memory_exceeded)
     {
         /// Prevent recursion. Exception::ctor -> std::string -> new[] -> MemoryTracker::alloc
         BlockerInThread untrack_lock(VariableContext::Global);
         bool log_memory_usage = true;
-        updatePeak(will_be, log_memory_usage);
+        peak_updated = updatePeak(will_be, log_memory_usage);
     }
     else
     {
         bool log_memory_usage = false;
-        updatePeak(will_be, log_memory_usage);
+        peak_updated = updatePeak(will_be, log_memory_usage);
+    }
+
+    if (peak_updated && allocation_traced)
+    {
+        BlockerInThread untrack_lock(VariableContext::Global);
+        DB::TraceCollector::collect(DB::TraceType::MemoryPeak, StackTrace(), will_be);
     }
 
     if (auto * loaded_next = parent.load(std::memory_order_relaxed))
@@ -262,7 +269,7 @@ void MemoryTracker::allocNoThrow(Int64 size)
     allocImpl(size, throw_if_memory_exceeded);
 }
 
-void MemoryTracker::updatePeak(Int64 will_be, bool log_memory_usage)
+bool MemoryTracker::updatePeak(Int64 will_be, bool log_memory_usage)
 {
     auto peak_old = peak.load(std::memory_order_relaxed);
     if (will_be > peak_old)        /// Races doesn't matter. Could rewrite with CAS, but not worth.
@@ -272,7 +279,10 @@ void MemoryTracker::updatePeak(Int64 will_be, bool log_memory_usage)
         if (log_memory_usage && (level == VariableContext::Process || level == VariableContext::Global)
             && will_be / log_peak_memory_usage_every > peak_old / log_peak_memory_usage_every)
             logMemoryUsage(will_be);
+
+        return true;
     }
+    return false;
 }
 
 
@@ -363,7 +373,7 @@ void MemoryTracker::setOrRaiseHardLimit(Int64 value)
 {
     /// This is just atomic set to maximum.
     Int64 old_value = hard_limit.load(std::memory_order_relaxed);
-    while (old_value < value && !hard_limit.compare_exchange_weak(old_value, value))
+    while ((value == 0 || old_value < value) && !hard_limit.compare_exchange_weak(old_value, value))
         ;
 }
 
@@ -371,6 +381,6 @@ void MemoryTracker::setOrRaiseHardLimit(Int64 value)
 void MemoryTracker::setOrRaiseProfilerLimit(Int64 value)
 {
     Int64 old_value = profiler_limit.load(std::memory_order_relaxed);
-    while (old_value < value && !profiler_limit.compare_exchange_weak(old_value, value))
+    while ((value == 0 || old_value < value) && !profiler_limit.compare_exchange_weak(old_value, value))
         ;
 }
diff --git a/src/Common/MemoryTracker.h b/src/Common/MemoryTracker.h
index d4de7a2cafa..ce0eef52e17 100644
--- a/src/Common/MemoryTracker.h
+++ b/src/Common/MemoryTracker.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <atomic>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/VariableContext.h>
 
@@ -14,12 +14,12 @@
 /// outside of try/catch block of thread functions. ALLOW_ALLOCATIONS_IN_SCOPE cancels effect of
 /// DENY_ALLOCATIONS_IN_SCOPE in the inner scope. In Release builds these macros do nothing.
 #ifdef MEMORY_TRACKER_DEBUG_CHECKS
-#include <common/scope_guard.h>
-extern thread_local bool _memory_tracker_always_throw_logical_error_on_allocation;
+#include <base/scope_guard.h>
+extern thread_local bool memory_tracker_always_throw_logical_error_on_allocation;
 #define ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val) \
-        bool _allocations_flag_prev_val##n = _memory_tracker_always_throw_logical_error_on_allocation; \
-        _memory_tracker_always_throw_logical_error_on_allocation = val; \
-        SCOPE_EXIT({ _memory_tracker_always_throw_logical_error_on_allocation = _allocations_flag_prev_val##n; })
+        bool _allocations_flag_prev_val##n = memory_tracker_always_throw_logical_error_on_allocation; \
+        memory_tracker_always_throw_logical_error_on_allocation = val; \
+        SCOPE_EXIT({ memory_tracker_always_throw_logical_error_on_allocation = _allocations_flag_prev_val##n; })
 #define ALLOCATIONS_IN_SCOPE_IMPL(n, val) ALLOCATIONS_IN_SCOPE_IMPL_CONCAT(n, val)
 #define DENY_ALLOCATIONS_IN_SCOPE ALLOCATIONS_IN_SCOPE_IMPL(__LINE__, true)
 #define ALLOW_ALLOCATIONS_IN_SCOPE ALLOCATIONS_IN_SCOPE_IMPL(__LINE__, false)
@@ -58,12 +58,17 @@ private:
     /// This description will be used as prefix into log messages (if isn't nullptr)
     std::atomic<const char *> description_ptr = nullptr;
 
-    void updatePeak(Int64 will_be, bool log_memory_usage);
+    bool updatePeak(Int64 will_be, bool log_memory_usage);
     void logMemoryUsage(Int64 current) const;
 
+    void setOrRaiseProfilerLimit(Int64 value);
+
 public:
-    MemoryTracker(VariableContext level_ = VariableContext::Thread);
-    MemoryTracker(MemoryTracker * parent_, VariableContext level_ = VariableContext::Thread);
+
+    static constexpr auto USAGE_EVENT_NAME = "MemoryTrackerUsage";
+
+    explicit MemoryTracker(VariableContext level_ = VariableContext::Thread);
+    explicit MemoryTracker(MemoryTracker * parent_, VariableContext level_ = VariableContext::Thread);
 
     ~MemoryTracker();
 
@@ -106,7 +111,6 @@ public:
       * Otherwise, set limit to new value, if new value is greater than previous limit.
       */
     void setOrRaiseHardLimit(Int64 value);
-    void setOrRaiseProfilerLimit(Int64 value);
 
     void setFaultProbability(double value)
     {
@@ -121,6 +125,7 @@ public:
     void setProfilerStep(Int64 value)
     {
         profiler_step = value;
+        setOrRaiseProfilerLimit(value);
     }
 
     /// next should be changed only once: from nullptr to some value.
@@ -141,6 +146,11 @@ public:
         metric.store(metric_, std::memory_order_relaxed);
     }
 
+    CurrentMetrics::Metric getMetric()
+    {
+        return metric.load(std::memory_order_relaxed);
+    }
+
     void setDescription(const char * description)
     {
         description_ptr.store(description, std::memory_order_relaxed);
@@ -162,18 +172,18 @@ public:
     struct BlockerInThread
     {
     private:
-        BlockerInThread(const BlockerInThread &) = delete;
-        BlockerInThread & operator=(const BlockerInThread &) = delete;
-
         static thread_local uint64_t counter;
         static thread_local VariableContext level;
 
         VariableContext previous_level;
     public:
         /// level_ - block in level and above
-        BlockerInThread(VariableContext level_ = VariableContext::User);
+        explicit BlockerInThread(VariableContext level_ = VariableContext::User);
         ~BlockerInThread();
 
+        BlockerInThread(const BlockerInThread &) = delete;
+        BlockerInThread & operator=(const BlockerInThread &) = delete;
+
         static bool isBlocked(VariableContext current_level)
         {
             return counter > 0 && current_level >= level;
@@ -195,9 +205,6 @@ public:
     struct LockExceptionInThread
     {
     private:
-        LockExceptionInThread(const LockExceptionInThread &) = delete;
-        LockExceptionInThread & operator=(const LockExceptionInThread &) = delete;
-
         static thread_local uint64_t counter;
         static thread_local VariableContext level;
         static thread_local bool block_fault_injections;
@@ -207,9 +214,12 @@ public:
     public:
         /// level_ - block in level and above
         /// block_fault_injections_ - block in fault injection too
-        LockExceptionInThread(VariableContext level_ = VariableContext::User, bool block_fault_injections_ = true);
+        explicit LockExceptionInThread(VariableContext level_ = VariableContext::User, bool block_fault_injections_ = true);
         ~LockExceptionInThread();
 
+        LockExceptionInThread(const LockExceptionInThread &) = delete;
+        LockExceptionInThread & operator=(const LockExceptionInThread &) = delete;
+
         static bool isBlocked(VariableContext current_level, bool fault_injection)
         {
             return counter > 0 && current_level >= level && (!fault_injection || block_fault_injections);
diff --git a/src/Common/NamePrompter.h b/src/Common/NamePrompter.h
index bb17f860f29..4a44a3adeaa 100644
--- a/src/Common/NamePrompter.h
+++ b/src/Common/NamePrompter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 
 #include <algorithm>
diff --git a/src/Common/OpenSSLHelpers.cpp b/src/Common/OpenSSLHelpers.cpp
index d8e862b3700..d73e08e79a9 100644
--- a/src/Common/OpenSSLHelpers.cpp
+++ b/src/Common/OpenSSLHelpers.cpp
@@ -1,10 +1,8 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #include "OpenSSLHelpers.h"
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <openssl/err.h>
 #include <openssl/sha.h>
 
diff --git a/src/Common/OpenSSLHelpers.h b/src/Common/OpenSSLHelpers.h
index 1058a611ac6..f0dbbc10b4c 100644
--- a/src/Common/OpenSSLHelpers.h
+++ b/src/Common/OpenSSLHelpers.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
-#    include <common/types.h>
+#    include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/OptimizedRegularExpression.h b/src/Common/OptimizedRegularExpression.h
index fddefe596c4..f7223c2efa9 100644
--- a/src/Common/OptimizedRegularExpression.h
+++ b/src/Common/OptimizedRegularExpression.h
@@ -7,9 +7,7 @@
 #include <Common/StringSearcher.h>
 #include <re2/re2.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_RE2_ST
 #    include <re2_st/re2.h>
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index d90ac0469c5..8a621b8db1c 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -8,7 +8,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <common/strong_typedef.h>
+#include <base/strong_typedef.h>
 
 #include <Common/Allocator.h>
 #include <Common/Exception.h>
diff --git a/src/Common/PODArray_fwd.h b/src/Common/PODArray_fwd.h
index 22f9230c01c..ec7b3bf4331 100644
--- a/src/Common/PODArray_fwd.h
+++ b/src/Common/PODArray_fwd.h
@@ -4,7 +4,7 @@
   * PODArray.
   */
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Allocator_fwd.h>
 
 namespace DB
diff --git a/src/Common/PipeFDs.cpp b/src/Common/PipeFDs.cpp
index a5c21e3d872..9064007fc6e 100644
--- a/src/Common/PipeFDs.cpp
+++ b/src/Common/PipeFDs.cpp
@@ -2,8 +2,8 @@
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
 
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/errnoToString.h>
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/Common/PoolBase.h b/src/Common/PoolBase.h
index 6fc5aee26dd..3f7f340c5d1 100644
--- a/src/Common/PoolBase.h
+++ b/src/Common/PoolBase.h
@@ -5,7 +5,7 @@
 #include <Poco/Timespan.h>
 #include <boost/noncopyable.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 
 
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index e84e249d179..b8fa00d2703 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -5,8 +5,8 @@
 #include <climits>
 #include <random>
 #include <functional>
-#include <common/types.h>
-#include <common/scope_guard.h>
+#include <base/types.h>
+#include <base/scope_guard.h>
 #include <Common/PoolBase.h>
 #include <Common/ProfileEvents.h>
 #include <Common/NetException.h>
diff --git a/src/Common/ProcfsMetricsProvider.cpp b/src/Common/ProcfsMetricsProvider.cpp
index fcc4124aa85..ee8fb37c4c5 100644
--- a/src/Common/ProcfsMetricsProvider.cpp
+++ b/src/Common/ProcfsMetricsProvider.cpp
@@ -6,8 +6,8 @@
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
 
-#include <common/find_symbols.h>
-#include <common/logger_useful.h>
+#include <base/find_symbols.h>
+#include <base/logger_useful.h>
 
 #include <cassert>
 #include <sys/types.h>
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index f4f47148d56..ee44b9eb927 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -227,7 +227,8 @@
     M(CreatedHTTPConnections, "Total amount of created HTTP connections (counter increase every time connection is created).") \
     \
     M(CannotWriteToWriteBufferDiscard, "Number of stack traces dropped by query profiler or signal handler because pipe is full or cannot write to pipe.") \
-    M(QueryProfilerSignalOverruns, "Number of times we drop processing of a signal due to overrun plus the number of signals that OS has not delivered due to overrun.") \
+    M(QueryProfilerSignalOverruns, "Number of times we drop processing of a query profiler signal due to overrun plus the number of signals that OS has not delivered due to overrun.") \
+    M(QueryProfilerRuns, "Number of times QueryProfiler had been run.") \
     \
     M(CreatedLogEntryForMerge, "Successfully created log entry to merge parts in ReplicatedMergeTree.") \
     M(NotCreatedLogEntryForMerge, "Log entry to merge parts in ReplicatedMergeTree is not created due to concurrent log update by another replica.") \
@@ -249,8 +250,28 @@
     M(S3WriteRequestsRedirects, "Number of redirects in POST, DELETE, PUT and PATCH requests to S3 storage.") \
     M(QueryMemoryLimitExceeded, "Number of times when memory limit exceeded for query.") \
     \
+    M(RemoteFSReadMicroseconds, "Time of reading from remote filesystem.") \
+    M(RemoteFSReadBytes, "Read bytes from remote filesystem.") \
+    \
+    M(RemoteFSSeeks, "Total number of seeks for async buffer") \
+    M(RemoteFSPrefetches, "Number of prefetches made with asynchronous reading from remote filesystem") \
+    M(RemoteFSCancelledPrefetches, "Number of cancelled prefecthes (because of seek)") \
+    M(RemoteFSUnusedPrefetches, "Number of prefetches pending at buffer destruction") \
+    M(RemoteFSPrefetchedReads, "Number of reads from prefecthed buffer") \
+    M(RemoteFSUnprefetchedReads, "Number of reads from unprefetched buffer") \
+    M(RemoteFSBuffers, "Number of buffers created for asynchronous reading from remote filesystem") \
+    \
     M(SleepFunctionCalls, "Number of times a sleep function (sleep, sleepEachRow) has been called.") \
     M(SleepFunctionMicroseconds, "Time spent sleeping due to a sleep function call.") \
+    \
+    M(ThreadPoolReaderPageCacheHit, "Number of times the read inside ThreadPoolReader was done from page cache.") \
+    M(ThreadPoolReaderPageCacheHitBytes, "Number of bytes read inside ThreadPoolReader when it was done from page cache.") \
+    M(ThreadPoolReaderPageCacheHitElapsedMicroseconds, "Time spent reading data from page cache in ThreadPoolReader.") \
+    M(ThreadPoolReaderPageCacheMiss, "Number of times the read inside ThreadPoolReader was not done from page cache and was hand off to thread pool.") \
+    M(ThreadPoolReaderPageCacheMissBytes, "Number of bytes read inside ThreadPoolReader when read was not done from page cache and was hand off to thread pool.") \
+    M(ThreadPoolReaderPageCacheMissElapsedMicroseconds, "Time spent reading data inside the asynchronous job in ThreadPoolReader - when read was not done from page cache.") \
+    \
+    M(AsynchronousReadWaitMicroseconds, "Time spent in waiting for asynchronous reads.") \
 
 
 namespace ProfileEvents
@@ -292,11 +313,15 @@ void Counters::reset()
     resetCounters();
 }
 
-Counters Counters::getPartiallyAtomicSnapshot() const
+Counters::Snapshot::Snapshot()
+    : counters_holder(new Count[num_counters] {})
+{}
+
+Counters::Snapshot Counters::getPartiallyAtomicSnapshot() const
 {
-    Counters res(VariableContext::Snapshot, nullptr);
+    Snapshot res;
     for (Event i = 0; i < num_counters; ++i)
-        res.counters[i].store(counters[i].load(std::memory_order_relaxed), std::memory_order_relaxed);
+        res.counters_holder[i] = counters[i].load(std::memory_order_relaxed);
     return res;
 }
 
diff --git a/src/Common/ProfileEvents.h b/src/Common/ProfileEvents.h
index e1b68e43e52..c416b49dd5c 100644
--- a/src/Common/ProfileEvents.h
+++ b/src/Common/ProfileEvents.h
@@ -59,8 +59,23 @@ namespace ProfileEvents
             } while (current != nullptr);
         }
 
+        struct Snapshot
+        {
+            Snapshot();
+
+            const Count & operator[] (Event event) const
+            {
+                return counters_holder[event];
+            }
+
+        private:
+            std::unique_ptr<Count[]> counters_holder;
+
+            friend class Counters;
+        };
+
         /// Every single value is fetched atomically, but not all values as a whole.
-        Counters getPartiallyAtomicSnapshot() const;
+        Snapshot getPartiallyAtomicSnapshot() const;
 
         /// Reset all counters to zero and reset parent.
         void reset();
diff --git a/src/Common/ProgressIndication.cpp b/src/Common/ProgressIndication.cpp
index 0d65eaece86..26dae8d5b73 100644
--- a/src/Common/ProgressIndication.cpp
+++ b/src/Common/ProgressIndication.cpp
@@ -1,10 +1,46 @@
 #include "ProgressIndication.h"
+#include <algorithm>
+#include <cstddef>
+#include <numeric>
+#include <cmath>
 #include <IO/WriteBufferFromFileDescriptor.h>
+#include <base/types.h>
+#include "Common/formatReadable.h"
 #include <Common/TerminalSize.h>
 #include <Common/UnicodeBar.h>
+#include "IO/WriteBufferFromString.h"
 #include <Databases/DatabaseMemory.h>
 
 
+namespace
+{
+    constexpr UInt64 ALL_THREADS = 0;
+
+    UInt64 calculateNewCoresNumber(DB::ThreadIdToTimeMap const & prev, DB::ThreadIdToTimeMap const& next)
+    {
+        if (next.find(ALL_THREADS) == next.end())
+            return 0;
+
+        auto accumulated = std::accumulate(next.cbegin(), next.cend(), 0,
+            [&prev](UInt64 acc, const auto & elem)
+            {
+                if (elem.first == ALL_THREADS)
+                    return acc;
+
+                auto thread_time = elem.second.time();
+                auto it = prev.find(elem.first);
+                if (it != prev.end())
+                    thread_time -= it->second.time();
+                return acc + thread_time;
+            });
+
+        auto elapsed = next.at(ALL_THREADS).time() - (prev.contains(ALL_THREADS) ? prev.at(ALL_THREADS).time() : 0);
+        if (elapsed == 0)
+            return 0;
+        return (accumulated + elapsed - 1) / elapsed;
+    }
+}
+
 namespace DB
 {
 
@@ -29,6 +65,8 @@ void ProgressIndication::resetProgress()
     show_progress_bar = false;
     written_progress_chars = 0;
     write_progress_on_update = false;
+    host_active_cores.clear();
+    thread_data.clear();
 }
 
 void ProgressIndication::setFileProgressCallback(ContextMutablePtr context, bool write_progress_on_update_)
@@ -43,6 +81,58 @@ void ProgressIndication::setFileProgressCallback(ContextMutablePtr context, bool
     });
 }
 
+void ProgressIndication::addThreadIdToList(String const & host, UInt64 thread_id)
+{
+    auto & thread_to_times = thread_data[host];
+    if (thread_to_times.contains(thread_id))
+        return;
+    thread_to_times[thread_id] = {};
+}
+
+void ProgressIndication::updateThreadEventData(HostToThreadTimesMap & new_thread_data)
+{
+    for (auto & new_host_map : new_thread_data)
+    {
+        auto & host_map = thread_data[new_host_map.first];
+        auto new_cores = calculateNewCoresNumber(host_map, new_host_map.second);
+        host_active_cores[new_host_map.first] = new_cores;
+        host_map = std::move(new_host_map.second);
+    }
+}
+
+size_t ProgressIndication::getUsedThreadsCount() const
+{
+    return std::accumulate(thread_data.cbegin(), thread_data.cend(), 0,
+        [] (size_t acc, auto const & threads)
+        {
+            return acc + threads.second.size();
+        });
+}
+
+UInt64 ProgressIndication::getApproximateCoresNumber() const
+{
+    return std::accumulate(host_active_cores.cbegin(), host_active_cores.cend(), 0,
+        [](UInt64 acc, auto const & elem)
+        {
+            return acc + elem.second;
+        });
+}
+
+ProgressIndication::MemoryUsage ProgressIndication::getMemoryUsage() const
+{
+    return std::accumulate(thread_data.cbegin(), thread_data.cend(), MemoryUsage{},
+        [](MemoryUsage const & acc, auto const & host_data)
+        {
+            UInt64 host_usage = 0;
+            // In ProfileEvents packets thread id 0 specifies common profiling information
+            // for all threads executing current query on specific host. So instead of summing per thread
+            // memory consumption it's enough to look for data with thread id 0.
+            if (auto it = host_data.second.find(ALL_THREADS); it != host_data.second.end())
+                host_usage = it->second.memory_usage;
+            return MemoryUsage{.total = acc.total + host_usage, .max = std::max(acc.max, host_usage)};
+        });
+}
+
 void ProgressIndication::writeFinalProgress()
 {
     if (progress.read_rows < 1000)
@@ -106,6 +196,27 @@ void ProgressIndication::writeProgress()
 
     written_progress_chars = message.count() - prefix_size - (strlen(indicator) - 2); /// Don't count invisible output (escape sequences).
 
+    // If approximate cores number is known, display it.
+    auto cores_number = getApproximateCoresNumber();
+    std::string profiling_msg;
+    if (cores_number != 0 && print_hardware_utilization)
+    {
+        WriteBufferFromOwnString profiling_msg_builder;
+        // Calculated cores number may be not accurate
+        // so it's better to print min(threads, cores).
+        UInt64 threads_number = getUsedThreadsCount();
+        profiling_msg_builder << " Running " << threads_number << " threads on "
+            << std::min(cores_number, threads_number) << " cores";
+
+        auto [memory_usage, max_host_usage] = getMemoryUsage();
+        if (memory_usage != 0)
+            profiling_msg_builder << " with " << formatReadableSizeWithDecimalSuffix(memory_usage) << " RAM used";
+        if (thread_data.size() > 1 && max_host_usage)
+            profiling_msg_builder << " total (per host max: " << formatReadableSizeWithDecimalSuffix(max_host_usage) << ")";
+        profiling_msg_builder << ".";
+        profiling_msg = profiling_msg_builder.str();
+    }
+
     /// If the approximate number of rows to process is known, we can display a progress bar and percentage.
     if (progress.total_rows_to_read || progress.total_raw_bytes_to_read)
     {
@@ -132,7 +243,7 @@ void ProgressIndication::writeProgress()
 
             if (show_progress_bar)
             {
-                ssize_t width_of_progress_bar = static_cast<ssize_t>(terminal_width) - written_progress_chars - strlen(" 99%");
+                ssize_t width_of_progress_bar = static_cast<ssize_t>(terminal_width) - written_progress_chars - strlen(" 99%") - profiling_msg.length();
                 if (width_of_progress_bar > 0)
                 {
                     std::string bar
@@ -148,6 +259,7 @@ void ProgressIndication::writeProgress()
         message << ' ' << (99 * current_count / max_count) << '%';
     }
 
+    message << profiling_msg;
     message << CLEAR_TO_END_OF_LINE;
     ++increment;
 
diff --git a/src/Common/ProgressIndication.h b/src/Common/ProgressIndication.h
index 044d8cb1a89..d31ed8df0ba 100644
--- a/src/Common/ProgressIndication.h
+++ b/src/Common/ProgressIndication.h
@@ -1,7 +1,10 @@
 #pragma once
 
+#include <unordered_map>
+#include <unordered_set>
 #include <IO/Progress.h>
 #include <Interpreters/Context.h>
+#include <base/types.h>
 #include <Common/Stopwatch.h>
 
 
@@ -11,6 +14,18 @@
 namespace DB
 {
 
+struct ThreadEventData
+{
+    UInt64 time() const noexcept { return user_ms + system_ms; }
+
+    UInt64 user_ms      = 0;
+    UInt64 system_ms    = 0;
+    UInt64 memory_usage = 0;
+};
+
+using ThreadIdToTimeMap = std::unordered_map<UInt64, ThreadEventData>;
+using HostToThreadTimesMap = std::unordered_map<String, ThreadIdToTimeMap>;
+
 class ProgressIndication
 {
 public:
@@ -41,7 +56,26 @@ public:
     /// How much seconds passed since query execution start.
     double elapsedSeconds() const { return watch.elapsedSeconds(); }
 
+    void addThreadIdToList(String const & host, UInt64 thread_id);
+
+    void updateThreadEventData(HostToThreadTimesMap & new_thread_data);
+
+    bool print_hardware_utilization = false;
+
 private:
+
+    size_t getUsedThreadsCount() const;
+
+    UInt64 getApproximateCoresNumber() const;
+
+    struct MemoryUsage
+    {
+        UInt64 total = 0;
+        UInt64 max   = 0;
+    };
+
+    MemoryUsage getMemoryUsage() const;
+
     /// This flag controls whether to show the progress bar. We start showing it after
     /// the query has been executing for 0.5 seconds, and is still less than half complete.
     bool show_progress_bar = false;
@@ -58,6 +92,9 @@ private:
     Stopwatch watch;
 
     bool write_progress_on_update = false;
+
+    std::unordered_map<String, UInt64> host_active_cores;
+    HostToThreadTimesMap thread_data;
 };
 
 }
diff --git a/src/Common/QueryProfiler.cpp b/src/Common/QueryProfiler.cpp
index bd1cab42be3..77b8d0dda5e 100644
--- a/src/Common/QueryProfiler.cpp
+++ b/src/Common/QueryProfiler.cpp
@@ -5,9 +5,9 @@
 #include <Common/StackTrace.h>
 #include <Common/TraceCollector.h>
 #include <Common/thread_local_rng.h>
-#include <common/logger_useful.h>
-#include <common/phdr_cache.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/phdr_cache.h>
+#include <base/errnoToString.h>
 
 #include <random>
 
@@ -15,6 +15,7 @@
 namespace ProfileEvents
 {
     extern const Event QueryProfilerSignalOverruns;
+    extern const Event QueryProfilerRuns;
 }
 
 namespace DB
@@ -60,6 +61,7 @@ namespace
         const StackTrace stack_trace(signal_context);
 
         TraceCollector::collect(trace_type, stack_trace, 0);
+        ProfileEvents::increment(ProfileEvents::QueryProfilerRuns);
 
         errno = saved_errno;
     }
@@ -82,7 +84,21 @@ QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(const UInt64 thread_id, const
     : log(&Poco::Logger::get("QueryProfiler"))
     , pause_signal(pause_signal_)
 {
-#if USE_UNWIND
+#if defined(SANITIZER)
+    UNUSED(thread_id);
+    UNUSED(clock_type);
+    UNUSED(period);
+    UNUSED(pause_signal);
+
+    throw Exception("QueryProfiler disabled because they cannot work under sanitizers", ErrorCodes::NOT_IMPLEMENTED);
+#elif !USE_UNWIND
+    UNUSED(thread_id);
+    UNUSED(clock_type);
+    UNUSED(period);
+    UNUSED(pause_signal);
+
+    throw Exception("QueryProfiler cannot work with stock libunwind", ErrorCodes::NOT_IMPLEMENTED);
+#else
     /// Sanity check.
     if (!hasPHDRCache())
         throw Exception("QueryProfiler cannot be used without PHDR cache, that is not available for TSan build", ErrorCodes::NOT_IMPLEMENTED);
@@ -110,11 +126,13 @@ QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(const UInt64 thread_id, const
         sev.sigev_notify = SIGEV_THREAD_ID;
         sev.sigev_signo = pause_signal;
 
-#   if defined(OS_FREEBSD)
+#if defined(OS_FREEBSD)
         sev._sigev_un._threadid = thread_id;
-#   else
+#elif defined(USE_MUSL)
+        sev.sigev_notify_thread_id = thread_id;
+#else
         sev._sigev_un._tid = thread_id;
-#   endif
+#endif
         if (timer_create(clock_type, &sev, &timer_id))
         {
             /// In Google Cloud Run, the function "timer_create" is implemented incorrectly as of 2020-01-25.
@@ -144,13 +162,6 @@ QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(const UInt64 thread_id, const
         tryCleanup();
         throw;
     }
-#else
-    UNUSED(thread_id);
-    UNUSED(clock_type);
-    UNUSED(period);
-    UNUSED(pause_signal);
-
-    throw Exception("QueryProfiler cannot work with stock libunwind", ErrorCodes::NOT_IMPLEMENTED);
 #endif
 }
 
@@ -173,7 +184,7 @@ void QueryProfilerBase<ProfilerImpl>::tryCleanup()
 }
 
 template class QueryProfilerBase<QueryProfilerReal>;
-template class QueryProfilerBase<QueryProfilerCpu>;
+template class QueryProfilerBase<QueryProfilerCPU>;
 
 QueryProfilerReal::QueryProfilerReal(const UInt64 thread_id, const UInt32 period)
     : QueryProfilerBase(thread_id, CLOCK_MONOTONIC, period, SIGUSR1)
@@ -185,11 +196,11 @@ void QueryProfilerReal::signalHandler(int sig, siginfo_t * info, void * context)
     writeTraceInfo(TraceType::Real, sig, info, context);
 }
 
-QueryProfilerCpu::QueryProfilerCpu(const UInt64 thread_id, const UInt32 period)
+QueryProfilerCPU::QueryProfilerCPU(const UInt64 thread_id, const UInt32 period)
     : QueryProfilerBase(thread_id, CLOCK_THREAD_CPUTIME_ID, period, SIGUSR2)
 {}
 
-void QueryProfilerCpu::signalHandler(int sig, siginfo_t * info, void * context)
+void QueryProfilerCPU::signalHandler(int sig, siginfo_t * info, void * context)
 {
     DENY_ALLOCATIONS_IN_SCOPE;
     writeTraceInfo(TraceType::CPU, sig, info, context);
diff --git a/src/Common/QueryProfiler.h b/src/Common/QueryProfiler.h
index 8e2d09e0be2..4014a93996f 100644
--- a/src/Common/QueryProfiler.h
+++ b/src/Common/QueryProfiler.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <signal.h>
 #include <time.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 
 namespace Poco
@@ -26,7 +24,7 @@ namespace DB
   *  3. write collected stack trace to trace_pipe for TraceCollector
   *
   * Destructor tries to unset timer and restore previous signal handler.
-  * Note that signal handler implementation is defined by template parameter. See QueryProfilerReal and QueryProfilerCpu.
+  * Note that signal handler implementation is defined by template parameter. See QueryProfilerReal and QueryProfilerCPU.
   */
 template <typename ProfilerImpl>
 class QueryProfilerBase
@@ -62,10 +60,10 @@ public:
 };
 
 /// Query profiler with timer based on CPU clock
-class QueryProfilerCpu : public QueryProfilerBase<QueryProfilerCpu>
+class QueryProfilerCPU : public QueryProfilerBase<QueryProfilerCPU>
 {
 public:
-    QueryProfilerCpu(const UInt64 thread_id, const UInt32 period);
+    QueryProfilerCPU(const UInt64 thread_id, const UInt32 period);
 
     static void signalHandler(int sig, siginfo_t * info, void * context);
 };
diff --git a/src/Common/RWLock.h b/src/Common/RWLock.h
index 952c8049a0f..e54fcaea433 100644
--- a/src/Common/RWLock.h
+++ b/src/Common/RWLock.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <chrono>
 #include <list>
@@ -34,6 +34,10 @@ using RWLock = std::shared_ptr<RWLockImpl>;
 /// - SELECT thread 1 locks in the Read mode
 /// - ALTER tries to lock in the Write mode (waits for SELECT thread 1)
 /// - SELECT thread 2 tries to lock in the Read mode (waits for ALTER)
+///
+/// NOTE: it is dangerous to acquire lock with NO_QUERY, because FastPath doesn't
+/// exist for this case and deadlock, described in previous note,
+/// may accur in case of recursive locking.
 class RWLockImpl : public std::enable_shared_from_this<RWLockImpl>
 {
 public:
@@ -74,7 +78,6 @@ private:
     using GroupsContainer = std::list<Group>;
     using OwnerQueryIds = std::unordered_map<String, size_t>;
 
-private:
     mutable std::mutex internal_state_mtx;
 
     GroupsContainer readers_queue;
@@ -85,7 +88,6 @@ private:
                                                                   /// or writers_queue.end() otherwise
     OwnerQueryIds owner_queries;
 
-private:
     RWLockImpl() = default;
     void unlock(GroupsContainer::iterator group_it, const String & query_id) noexcept;
     void dropOwnerGroupAndPassOwnership(GroupsContainer::iterator group_it) noexcept;
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index b14e71a6720..b1e4d7d02f1 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -13,8 +13,8 @@
 #include <type_traits>
 #include <memory>
 
-#include <common/bit_cast.h>
-#include <common/extended_types.h>
+#include <base/bit_cast.h>
+#include <base/extended_types.h>
 #include <Core/Defines.h>
 
 
@@ -187,7 +187,7 @@ struct RadixSortIntTraits
 
 template <typename T>
 using RadixSortNumTraits = std::conditional_t<
-    is_integer_v<T>,
+    is_integer<T>,
     std::conditional_t<is_unsigned_v<T>, RadixSortUIntTraits<T>, RadixSortIntTraits<T>>,
     RadixSortFloatTraits<T>>;
 
diff --git a/src/Common/RemoteHostFilter.cpp b/src/Common/RemoteHostFilter.cpp
index 6ea366314e1..73c84364f3c 100644
--- a/src/Common/RemoteHostFilter.cpp
+++ b/src/Common/RemoteHostFilter.cpp
@@ -1,7 +1,6 @@
 #include <re2/re2.h>
 #include <Poco/URI.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Formats/FormatFactory.h>
 #include <Common/RemoteHostFilter.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Exception.h>
diff --git a/src/Common/SensitiveDataMasker.cpp b/src/Common/SensitiveDataMasker.cpp
index d3d9991bc90..145a63d1ceb 100644
--- a/src/Common/SensitiveDataMasker.cpp
+++ b/src/Common/SensitiveDataMasker.cpp
@@ -9,7 +9,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
diff --git a/src/Common/SettingsChanges.cpp b/src/Common/SettingsChanges.cpp
index e7c769ad55a..370b465eba3 100644
--- a/src/Common/SettingsChanges.cpp
+++ b/src/Common/SettingsChanges.cpp
@@ -1,6 +1,5 @@
 #include <Common/SettingsChanges.h>
 
-
 namespace DB
 {
 namespace
diff --git a/src/Common/SettingsChanges.h b/src/Common/SettingsChanges.h
index 734d8ecb227..073af21c6cc 100644
--- a/src/Common/SettingsChanges.h
+++ b/src/Common/SettingsChanges.h
@@ -5,6 +5,9 @@
 
 namespace DB
 {
+
+class IColumn;
+
 struct SettingChange
 {
     String name;
diff --git a/src/Common/SharedLibrary.cpp b/src/Common/SharedLibrary.cpp
index 37da308d5af..89c3467fcc8 100644
--- a/src/Common/SharedLibrary.cpp
+++ b/src/Common/SharedLibrary.cpp
@@ -1,7 +1,7 @@
 #include "SharedLibrary.h"
 #include <string>
 #include <boost/core/noncopyable.hpp>
-#include <common/phdr_cache.h>
+#include <base/phdr_cache.h>
 #include "Exception.h"
 
 
diff --git a/src/Common/ShellCommand.cpp b/src/Common/ShellCommand.cpp
index 6a18cb77346..f238e976f8a 100644
--- a/src/Common/ShellCommand.cpp
+++ b/src/Common/ShellCommand.cpp
@@ -6,8 +6,8 @@
 #include <time.h>
 #include <csignal>
 
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/errnoToString.h>
 #include <Common/Exception.h>
 #include <Common/ShellCommand.h>
 #include <Common/PipeFDs.h>
@@ -20,10 +20,12 @@ namespace
     /// By these return codes from the child process, we learn (for sure) about errors when creating it.
     enum class ReturnCodes : int
     {
-        CANNOT_DUP_STDIN    = 0x55555555,   /// The value is not important, but it is chosen so that it's rare to conflict with the program return code.
-        CANNOT_DUP_STDOUT   = 0x55555556,
-        CANNOT_DUP_STDERR   = 0x55555557,
-        CANNOT_EXEC         = 0x55555558,
+        CANNOT_DUP_STDIN            = 0x55555555,   /// The value is not important, but it is chosen so that it's rare to conflict with the program return code.
+        CANNOT_DUP_STDOUT           = 0x55555556,
+        CANNOT_DUP_STDERR           = 0x55555557,
+        CANNOT_EXEC                 = 0x55555558,
+        CANNOT_DUP_READ_DESCRIPTOR  = 0x55555559,
+        CANNOT_DUP_WRITE_DESCRIPTOR = 0x55555560,
     };
 }
 
@@ -39,12 +41,12 @@ namespace ErrorCodes
     extern const int CANNOT_CREATE_CHILD_PROCESS;
 }
 
-ShellCommand::ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, ShellCommandDestructorStrategy destructor_strategy_)
-    : pid(pid_)
-    , destructor_strategy(destructor_strategy_)
-    , in(in_fd_)
+ShellCommand::ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, const ShellCommand::Config & config_)
+    : in(in_fd_)
     , out(out_fd_)
     , err(err_fd_)
+    , pid(pid_)
+    , config(config_)
 {
 }
 
@@ -58,9 +60,9 @@ ShellCommand::~ShellCommand()
     if (wait_called)
         return;
 
-    if (destructor_strategy.terminate_in_destructor)
+    if (config.terminate_in_destructor_strategy.terminate_in_destructor)
     {
-        size_t try_wait_timeout = destructor_strategy.wait_for_normal_exit_before_termination_seconds;
+        size_t try_wait_timeout = config.terminate_in_destructor_strategy.wait_for_normal_exit_before_termination_seconds;
         bool process_terminated_normally = tryWaitProcessWithTimeout(try_wait_timeout);
 
         if (!process_terminated_normally)
@@ -149,8 +151,7 @@ void ShellCommand::logCommand(const char * filename, char * const argv[])
 std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
     const char * filename,
     char * const argv[],
-    bool pipe_stdin_only,
-    ShellCommandDestructorStrategy terminate_in_destructor_strategy)
+    const Config & config)
 {
     logCommand(filename, argv);
 
@@ -168,9 +169,18 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
     PipeFDs pipe_stdout;
     PipeFDs pipe_stderr;
 
+    std::vector<std::unique_ptr<PipeFDs>> read_pipe_fds;
+    std::vector<std::unique_ptr<PipeFDs>> write_pipe_fds;
+
+    for (size_t i = 0; i < config.read_fds.size(); ++i)
+        read_pipe_fds.emplace_back(std::make_unique<PipeFDs>());
+
+    for (size_t i = 0; i < config.write_fds.size(); ++i)
+        write_pipe_fds.emplace_back(std::make_unique<PipeFDs>());
+
     pid_t pid = reinterpret_cast<pid_t(*)()>(real_vfork)();
 
-    if (-1 == pid)
+    if (pid == -1)
         throwFromErrno("Cannot vfork", ErrorCodes::CANNOT_FORK);
 
     if (0 == pid)
@@ -184,7 +194,7 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
         if (STDIN_FILENO != dup2(pipe_stdin.fds_rw[0], STDIN_FILENO))
             _exit(int(ReturnCodes::CANNOT_DUP_STDIN));
 
-        if (!pipe_stdin_only)
+        if (!config.pipe_stdin_only)
         {
             if (STDOUT_FILENO != dup2(pipe_stdout.fds_rw[1], STDOUT_FILENO))
                 _exit(int(ReturnCodes::CANNOT_DUP_STDOUT));
@@ -193,6 +203,24 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
                 _exit(int(ReturnCodes::CANNOT_DUP_STDERR));
         }
 
+        for (size_t i = 0; i < config.read_fds.size(); ++i)
+        {
+            auto & fds = *read_pipe_fds[i];
+            auto fd = config.read_fds[i];
+
+            if (fd != dup2(fds.fds_rw[1], fd))
+                _exit(int(ReturnCodes::CANNOT_DUP_READ_DESCRIPTOR));
+        }
+
+        for (size_t i = 0; i < config.write_fds.size(); ++i)
+        {
+            auto & fds = *write_pipe_fds[i];
+            auto fd = config.write_fds[i];
+
+            if (fd != dup2(fds.fds_rw[0], fd))
+                _exit(int(ReturnCodes::CANNOT_DUP_WRITE_DESCRIPTOR));
+        }
+
         // Reset the signal mask: it may be non-empty and will be inherited
         // by the child process, which might not expect this.
         sigset_t mask;
@@ -207,35 +235,49 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
     }
 
     std::unique_ptr<ShellCommand> res(new ShellCommand(
-        pid, pipe_stdin.fds_rw[1], pipe_stdout.fds_rw[0], pipe_stderr.fds_rw[0], terminate_in_destructor_strategy));
+        pid,
+        pipe_stdin.fds_rw[1],
+        pipe_stdout.fds_rw[0],
+        pipe_stderr.fds_rw[0],
+        config));
+
+    for (size_t i = 0; i < config.read_fds.size(); ++i)
+    {
+        auto & fds = *read_pipe_fds[i];
+        auto fd = config.read_fds[i];
+        res->read_fds.emplace(fd, fds.fds_rw[0]);
+    }
+
+    for (size_t i = 0; i < config.write_fds.size(); ++i)
+    {
+        auto & fds = *write_pipe_fds[i];
+        auto fd = config.write_fds[i];
+        res->write_fds.emplace(fd, fds.fds_rw[1]);
+    }
 
     LOG_TRACE(getLogger(), "Started shell command '{}' with pid {}", filename, pid);
     return res;
 }
 
 
-std::unique_ptr<ShellCommand> ShellCommand::execute(
-    const std::string & command,
-    bool pipe_stdin_only,
-    ShellCommandDestructorStrategy terminate_in_destructor_strategy)
+std::unique_ptr<ShellCommand> ShellCommand::execute(const ShellCommand::Config & config)
 {
-    /// Arguments in non-constant chunks of memory (as required for `execv`).
-    /// Moreover, their copying must be done before calling `vfork`, so after `vfork` do a minimum of things.
-    std::vector<char> argv0("sh", &("sh"[3]));
-    std::vector<char> argv1("-c", &("-c"[3]));
-    std::vector<char> argv2(command.data(), command.data() + command.size() + 1);
+    auto config_copy = config;
+    config_copy.command = "/bin/sh";
+    config_copy.arguments = {"-c", config.command};
 
-    char * const argv[] = { argv0.data(), argv1.data(), argv2.data(), nullptr };
+    for (const auto & argument : config.arguments)
+        config_copy.arguments.emplace_back(argument);
 
-    return executeImpl("/bin/sh", argv, pipe_stdin_only, terminate_in_destructor_strategy);
+    return executeDirect(config_copy);
 }
 
 
-std::unique_ptr<ShellCommand> ShellCommand::executeDirect(
-    const std::string & path,
-    const std::vector<std::string> & arguments,
-    ShellCommandDestructorStrategy terminate_in_destructor_strategy)
+std::unique_ptr<ShellCommand> ShellCommand::executeDirect(const ShellCommand::Config & config)
 {
+    const auto & path = config.command;
+    const auto & arguments = config.arguments;
+
     size_t argv_sum_size = path.size() + 1;
     for (const auto & arg : arguments)
         argv_sum_size += arg.size() + 1;
@@ -255,7 +297,7 @@ std::unique_ptr<ShellCommand> ShellCommand::executeDirect(
 
     argv[arguments.size() + 1] = nullptr;
 
-    return executeImpl(path.data(), argv.data(), false, terminate_in_destructor_strategy);
+    return executeImpl(path.data(), argv.data(), config);
 }
 
 
@@ -307,6 +349,10 @@ void ShellCommand::wait()
                 throw Exception("Cannot dup2 stderr of child process", ErrorCodes::CANNOT_CREATE_CHILD_PROCESS);
             case int(ReturnCodes::CANNOT_EXEC):
                 throw Exception("Cannot execv in child process", ErrorCodes::CANNOT_CREATE_CHILD_PROCESS);
+            case int(ReturnCodes::CANNOT_DUP_READ_DESCRIPTOR):
+                throw Exception("Cannot dup2 read descriptor of child process", ErrorCodes::CANNOT_CREATE_CHILD_PROCESS);
+            case int(ReturnCodes::CANNOT_DUP_WRITE_DESCRIPTOR):
+                throw Exception("Cannot dup2 write descriptor of child process", ErrorCodes::CANNOT_CREATE_CHILD_PROCESS);
             default:
                 throw Exception("Child process was exited with return code " + toString(retcode), ErrorCodes::CHILD_WAS_NOT_EXITED_NORMALLY);
         }
diff --git a/src/Common/ShellCommand.h b/src/Common/ShellCommand.h
index f1d808128ff..2d5af1f9a02 100644
--- a/src/Common/ShellCommand.h
+++ b/src/Common/ShellCommand.h
@@ -23,29 +23,76 @@ namespace DB
   * The second difference - allows to work simultaneously with stdin, and with stdout, and with stderr of running process,
   *  and also to obtain the return code and completion status.
   */
-
-struct ShellCommandDestructorStrategy final
-{
-    explicit ShellCommandDestructorStrategy(bool terminate_in_destructor_, size_t wait_for_normal_exit_before_termination_seconds_ = 0)
-        : terminate_in_destructor(terminate_in_destructor_)
-        , wait_for_normal_exit_before_termination_seconds(wait_for_normal_exit_before_termination_seconds_)
-    {
-    }
-
-    bool terminate_in_destructor;
-
-    /// If terminate in destructor is true, command will wait until send SIGTERM signal to created process
-    size_t wait_for_normal_exit_before_termination_seconds = 0;
-};
-
 class ShellCommand final
 {
-private:
-    pid_t pid;
-    bool wait_called = false;
-    ShellCommandDestructorStrategy destructor_strategy;
+public:
 
-    ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, ShellCommandDestructorStrategy destructor_strategy_);
+    ~ShellCommand();
+
+    struct DestructorStrategy final
+    {
+        explicit DestructorStrategy(bool terminate_in_destructor_, size_t wait_for_normal_exit_before_termination_seconds_ = 0)
+            : terminate_in_destructor(terminate_in_destructor_)
+            , wait_for_normal_exit_before_termination_seconds(wait_for_normal_exit_before_termination_seconds_)
+        {
+        }
+
+        bool terminate_in_destructor;
+
+        /// If terminate in destructor is true, command will wait until send SIGTERM signal to created process
+        size_t wait_for_normal_exit_before_termination_seconds = 0;
+    };
+
+    struct Config
+    {
+        Config(const std::string & command_)
+            : command(command_)
+        {}
+
+        Config(const char * command_)
+            : command(command_)
+        {}
+
+        std::string command;
+
+        std::vector<std::string> arguments;
+
+        std::vector<int> read_fds;
+
+        std::vector<int> write_fds;
+
+        bool pipe_stdin_only = false;
+
+        DestructorStrategy terminate_in_destructor_strategy = DestructorStrategy(false);
+    };
+
+    /// Run the command using /bin/sh -c.
+    /// If terminate_in_destructor is true, send terminate signal in destructor and don't wait process.
+    static std::unique_ptr<ShellCommand> execute(const Config & config);
+
+    /// Run the executable with the specified arguments. `arguments` - without argv[0].
+    /// If terminate_in_destructor is true, send terminate signal in destructor and don't wait process.
+    static std::unique_ptr<ShellCommand> executeDirect(const Config & config);
+
+    /// Wait for the process to end, throw an exception if the code is not 0 or if the process was not completed by itself.
+    void wait();
+
+    /// Wait for the process to finish, see the return code. To throw an exception if the process was not completed independently.
+    int tryWait();
+
+    WriteBufferFromFile in;        /// If the command reads from stdin, do not forget to call in.close() after writing all the data there.
+    ReadBufferFromFile out;
+    ReadBufferFromFile err;
+
+    std::unordered_map<int, ReadBufferFromFile> read_fds;
+    std::unordered_map<int, WriteBufferFromFile> write_fds;
+private:
+
+    pid_t pid;
+    Config config;
+    bool wait_called = false;
+
+    ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd_, const Config & config);
 
     bool tryWaitProcessWithTimeout(size_t timeout_in_seconds);
 
@@ -54,28 +101,7 @@ private:
     /// Print command name and the list of arguments to log. NOTE: No escaping of arguments is performed.
     static void logCommand(const char * filename, char * const argv[]);
 
-    static std::unique_ptr<ShellCommand> executeImpl(const char * filename, char * const argv[], bool pipe_stdin_only, ShellCommandDestructorStrategy terminate_in_destructor_strategy);
-
-public:
-    WriteBufferFromFile in;        /// If the command reads from stdin, do not forget to call in.close() after writing all the data there.
-    ReadBufferFromFile out;
-    ReadBufferFromFile err;
-
-    ~ShellCommand();
-
-    /// Run the command using /bin/sh -c.
-    /// If terminate_in_destructor is true, send terminate signal in destructor and don't wait process.
-    static std::unique_ptr<ShellCommand> execute(const std::string & command, bool pipe_stdin_only = false, ShellCommandDestructorStrategy terminate_in_destructor_strategy = ShellCommandDestructorStrategy(false));
-
-    /// Run the executable with the specified arguments. `arguments` - without argv[0].
-    /// If terminate_in_destructor is true, send terminate signal in destructor and don't wait process.
-    static std::unique_ptr<ShellCommand> executeDirect(const std::string & path, const std::vector<std::string> & arguments, ShellCommandDestructorStrategy terminate_in_destructor_strategy = ShellCommandDestructorStrategy(false));
-
-    /// Wait for the process to end, throw an exception if the code is not 0 or if the process was not completed by itself.
-    void wait();
-
-    /// Wait for the process to finish, see the return code. To throw an exception if the process was not completed independently.
-    int tryWait();
+    static std::unique_ptr<ShellCommand> executeImpl(const char * filename, char * const argv[], const Config & config);
 };
 
 
diff --git a/src/Common/SimpleIncrement.h b/src/Common/SimpleIncrement.h
index 4896d2192f4..f88660f64f1 100644
--- a/src/Common/SimpleIncrement.h
+++ b/src/Common/SimpleIncrement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <atomic>
 
 
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index 92d635eb63c..559744abe72 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -13,8 +13,8 @@
   * (~ 700 MB/sec, 15 million strings per second)
   */
 
-#include <common/types.h>
-#include <common/unaligned.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 #include <string>
 #include <type_traits>
 #include <Core/Defines.h>
diff --git a/src/Common/SmallObjectPool.h b/src/Common/SmallObjectPool.h
index 0eda8931946..947942e3aaf 100644
--- a/src/Common/SmallObjectPool.h
+++ b/src/Common/SmallObjectPool.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Arena.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 
 namespace DB
diff --git a/src/Common/SparseHashMap.h b/src/Common/SparseHashMap.h
new file mode 100644
index 00000000000..3f38d52a2b8
--- /dev/null
+++ b/src/Common/SparseHashMap.h
@@ -0,0 +1,10 @@
+#pragma once
+
+/// SparseHashMap is a wrapper for google::sparse_hash_map.
+
+#include <sparsehash/sparse_hash_map>
+
+template <class Key, class T, class HashFcn = std::hash<Key>,
+    class EqualKey = std::equal_to<Key>,
+    class Alloc = google::libc_allocator_with_realloc<std::pair<const Key, T>>>
+using SparseHashMap = google::sparse_hash_map<Key, T, HashFcn, EqualKey, Alloc>;
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index 812f888b284..6c52d31c9a1 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -5,23 +5,21 @@
 #include <Common/Elf.h>
 #include <Common/SymbolIndex.h>
 #include <Common/MemorySanitizer.h>
-#include <common/SimpleCache.h>
-#include <common/demangle.h>
+#include <base/CachedFn.h>
+#include <base/demangle.h>
 
 #include <cstring>
 #include <filesystem>
 #include <sstream>
 #include <unordered_map>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_UNWIND
 #    include <libunwind.h>
 #endif
 
-std::string signalToErrorMessage(int sig, const siginfo_t & info, const ucontext_t & context)
+std::string signalToErrorMessage(int sig, const siginfo_t & info, [[maybe_unused]] const ucontext_t & context)
 {
     std::stringstream error;        // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     error.exceptions(std::ios::failbit);
@@ -41,8 +39,6 @@ std::string signalToErrorMessage(int sig, const siginfo_t & info, const ucontext
                 error << " Access: write.";
             else
                 error << " Access: read.";
-#else
-            UNUSED(context);
 #endif
 
             switch (info.si_code)
@@ -188,6 +184,8 @@ static void * getCallerAddress(const ucontext_t & context)
 #elif defined(__APPLE__) && defined(__aarch64__)
     return reinterpret_cast<void *>(context.uc_mcontext->__ss.__pc);
 
+#elif defined(__FreeBSD__) && defined(__aarch64__)
+    return reinterpret_cast<void *>(context.uc_mcontext.mc_gpregs.gp_elr);
 #elif defined(__aarch64__)
     return reinterpret_cast<void *>(context.uc_mcontext.pc);
 #elif defined(__powerpc64__)
@@ -197,9 +195,11 @@ static void * getCallerAddress(const ucontext_t & context)
 #endif
 }
 
-void StackTrace::symbolize(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size, StackTrace::Frames & frames)
+void StackTrace::symbolize(
+    const StackTrace::FramePointers & frame_pointers, [[maybe_unused]] size_t offset,
+    size_t size, StackTrace::Frames & frames)
 {
-#if defined(__ELF__) && !defined(__FreeBSD__) && !defined(ARCADIA_BUILD)
+#if defined(__ELF__) && !defined(__FreeBSD__)
 
     auto symbol_index_ptr = DB::SymbolIndex::instance();
     const DB::SymbolIndex & symbol_index = *symbol_index_ptr;
@@ -256,7 +256,6 @@ void StackTrace::symbolize(const StackTrace::FramePointers & frame_pointers, siz
     {
         frames[i].virtual_addr = frame_pointers[i];
     }
-    UNUSED(offset);
 #endif
 }
 
@@ -322,7 +321,7 @@ const StackTrace::FramePointers & StackTrace::getFramePointers() const
 }
 
 static void toStringEveryLineImpl(
-    bool fatal,
+    [[maybe_unused]] bool fatal,
     const StackTrace::FramePointers & frame_pointers,
     size_t offset,
     size_t size,
@@ -386,7 +385,6 @@ static void toStringEveryLineImpl(
         out.str({});
     }
 #else
-    UNUSED(fatal);
     std::stringstream out;  // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     out.exceptions(std::ios::failbit);
 
@@ -417,11 +415,7 @@ void StackTrace::toStringEveryLine(std::function<void(const std::string &)> call
 
 std::string StackTrace::toString() const
 {
-    /// Calculation of stack trace text is extremely slow.
-    /// We use simple cache because otherwise the server could be overloaded by trash queries.
-
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    return func_cached(frame_pointers, offset, size);
+    return toStringStatic(frame_pointers, offset, size);
 }
 
 std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t size)
@@ -432,6 +426,23 @@ std::string StackTrace::toString(void ** frame_pointers_, size_t offset, size_t
     for (size_t i = 0; i < size; ++i)
         frame_pointers_copy[i] = frame_pointers_[i];
 
-    static SimpleCache<decltype(toStringImpl), &toStringImpl> func_cached;
-    return func_cached(frame_pointers_copy, offset, size);
+    return toStringStatic(frame_pointers_copy, offset, size);
+}
+
+static CachedFn<&toStringImpl> & cacheInstance()
+{
+    static CachedFn<&toStringImpl> cache;
+    return cache;
+}
+
+std::string StackTrace::toStringStatic(const StackTrace::FramePointers & frame_pointers, size_t offset, size_t size)
+{
+    /// Calculation of stack trace text is extremely slow.
+    /// We use simple cache because otherwise the server could be overloaded by trash queries.
+    return cacheInstance()(frame_pointers, offset, size);
+}
+
+void StackTrace::dropCache()
+{
+    cacheInstance().drop();
 }
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 8f8c88c29fe..06a17e73091 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <string>
 #include <vector>
@@ -61,6 +61,8 @@ public:
     std::string toString() const;
 
     static std::string toString(void ** frame_pointers, size_t offset, size_t size);
+    static std::string toStringStatic(const FramePointers & frame_pointers, size_t offset, size_t size);
+    static void dropCache();
     static void symbolize(const FramePointers & frame_pointers, size_t offset, size_t size, StackTrace::Frames & frames);
 
     void toStringEveryLine(std::function<void(const std::string &)> callback) const;
diff --git a/src/Common/StatusFile.cpp b/src/Common/StatusFile.cpp
index ceedf518608..5e4c31b149e 100644
--- a/src/Common/StatusFile.cpp
+++ b/src/Common/StatusFile.cpp
@@ -4,10 +4,10 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <common/logger_useful.h>
-#include <common/errnoToString.h>
+#include <base/logger_useful.h>
+#include <base/errnoToString.h>
 #include <Common/ClickHouseRevision.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/LimitReadBuffer.h>
diff --git a/src/Common/StatusInfo.h b/src/Common/StatusInfo.h
index de92bb838ba..99d6a6f23f5 100644
--- a/src/Common/StatusInfo.h
+++ b/src/Common/StatusInfo.h
@@ -5,7 +5,7 @@
 #include <utility>
 #include <atomic>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 #include <mutex>
 #include <unordered_map>
 
diff --git a/src/Common/Stopwatch.cpp b/src/Common/Stopwatch.cpp
deleted file mode 100644
index b17e343f1af..00000000000
--- a/src/Common/Stopwatch.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <sys/resource.h>
-#include "Stopwatch.h"
-
-StopwatchRUsage::Timestamp StopwatchRUsage::Timestamp::current()
-{
-    StopwatchRUsage::Timestamp res;
-
-    ::rusage rusage {};
-#if !defined(__APPLE__)
-#if defined(OS_SUNOS)
-    ::getrusage(RUSAGE_LWP, &rusage);
-#else
-    ::getrusage(RUSAGE_THREAD, &rusage);
-#endif // OS_SUNOS
-#endif // __APPLE__
-    res.user_ns = rusage.ru_utime.tv_sec * 1000000000UL + rusage.ru_utime.tv_usec * 1000UL;
-    res.sys_ns = rusage.ru_stime.tv_sec * 1000000000UL + rusage.ru_stime.tv_usec * 1000UL;
-    return res;
-}
diff --git a/src/Common/Stopwatch.h b/src/Common/Stopwatch.h
index a7f5e76d5be..2b60bbde196 100644
--- a/src/Common/Stopwatch.h
+++ b/src/Common/Stopwatch.h
@@ -1,9 +1,12 @@
 #pragma once
 
-#include <common/time.h>
-#include <common/types.h>
+#include <base/time.h>
+#include <base/types.h>
+#include <base/defines.h>
 
+#include <cassert>
 #include <atomic>
+#include <memory>
 
 
 inline UInt64 clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
@@ -13,6 +16,20 @@ inline UInt64 clock_gettime_ns(clockid_t clock_type = CLOCK_MONOTONIC)
     return UInt64(ts.tv_sec * 1000000000LL + ts.tv_nsec);
 }
 
+/// Sometimes monotonic clock may not be monotonic (due to bug in kernel?).
+/// It may cause some operations to fail with "Timeout exceeded: elapsed 18446744073.709553 seconds".
+/// Takes previously returned value and returns it again if time stepped back for some reason.
+inline UInt64 clock_gettime_ns_adjusted(UInt64 prev_time, clockid_t clock_type = CLOCK_MONOTONIC)
+{
+    UInt64 current_time = clock_gettime_ns(clock_type);
+    if (likely(prev_time <= current_time))
+        return current_time;
+
+    /// Something probably went completely wrong if time stepped back for more than 1 second.
+    assert(prev_time - current_time <= 1000000000ULL);
+    return prev_time;
+}
+
 /** Differs from Poco::Stopwatch only by using 'clock_gettime' instead of 'gettimeofday',
   *  returns nanoseconds instead of microseconds, and also by other minor differencies.
   */
@@ -22,7 +39,7 @@ public:
     /** CLOCK_MONOTONIC works relatively efficient (~15 million calls/sec) and doesn't lead to syscall.
       * Pass CLOCK_MONOTONIC_COARSE, if you need better performance with acceptable cost of several milliseconds of inaccuracy.
       */
-    Stopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { start(); }
+    explicit Stopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { start(); }
 
     void start()                       { start_ns = nanoseconds(); is_running = true; }
     void stop()                        { stop_ns = nanoseconds(); is_running = false; }
@@ -40,17 +57,23 @@ private:
     clockid_t clock_type;
     bool is_running = false;
 
-    UInt64 nanoseconds() const { return clock_gettime_ns(clock_type); }
+    UInt64 nanoseconds() const { return clock_gettime_ns_adjusted(start_ns, clock_type); }
 };
 
+using StopwatchUniquePtr = std::unique_ptr<Stopwatch>;
+
 
 class AtomicStopwatch
 {
 public:
-    AtomicStopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { restart(); }
+    explicit AtomicStopwatch(clockid_t clock_type_ = CLOCK_MONOTONIC) : clock_type(clock_type_) { restart(); }
 
-    void restart()                     { start_ns = nanoseconds(); }
-    UInt64 elapsed() const             { return nanoseconds() - start_ns; }
+    void restart()                     { start_ns = nanoseconds(0); }
+    UInt64 elapsed() const
+    {
+        UInt64 current_start_ns = start_ns;
+        return nanoseconds(current_start_ns) - current_start_ns;
+    }
     UInt64 elapsedMilliseconds() const { return elapsed() / 1000000UL; }
     double elapsedSeconds() const      { return static_cast<double>(elapsed()) / 1000000000ULL; }
 
@@ -61,8 +84,8 @@ public:
     bool compareAndRestart(double seconds)
     {
         UInt64 threshold = static_cast<UInt64>(seconds * 1000000000.0);
-        UInt64 current_ns = nanoseconds();
         UInt64 current_start_ns = start_ns;
+        UInt64 current_ns = nanoseconds(current_start_ns);
 
         while (true)
         {
@@ -78,11 +101,11 @@ public:
     {
         AtomicStopwatch * parent = nullptr;
 
-        Lock() {}
+        Lock() = default;
 
-        operator bool() const { return parent != nullptr; }
+        explicit operator bool() const { return parent != nullptr; }
 
-        Lock(AtomicStopwatch * parent_) : parent(parent_) {}
+        explicit Lock(AtomicStopwatch * parent_) : parent(parent_) {}
 
         Lock(Lock &&) = default;
 
@@ -105,8 +128,8 @@ public:
     Lock compareAndRestartDeferred(double seconds)
     {
         UInt64 threshold = UInt64(seconds * 1000000000.0);
-        UInt64 current_ns = nanoseconds();
         UInt64 current_start_ns = start_ns;
+        UInt64 current_ns = nanoseconds(current_start_ns);
 
         while (true)
         {
@@ -127,74 +150,6 @@ private:
     clockid_t clock_type;
 
     /// Most significant bit is a lock. When it is set, compareAndRestartDeferred method will return false.
-    UInt64 nanoseconds() const { return clock_gettime_ns(clock_type) & 0x7FFFFFFFFFFFFFFFULL; }
+    UInt64 nanoseconds(UInt64 prev_time) const { return clock_gettime_ns_adjusted(prev_time, clock_type) & 0x7FFFFFFFFFFFFFFFULL; }
 };
 
-
-/// Like ordinary StopWatch, but uses getrusage() system call
-struct StopwatchRUsage
-{
-    StopwatchRUsage() = default;
-
-    void start()   { start_ts = Timestamp::current(); is_running = true; }
-    void stop()    { stop_ts = Timestamp::current(); is_running = false; }
-    void reset()   { start_ts = Timestamp(); stop_ts = Timestamp(); is_running = false; }
-    void restart() { start(); }
-
-    UInt64 elapsed(bool count_user = true, bool count_sys = true) const
-    {
-        return elapsedNanoseconds(count_user, count_sys);
-    }
-
-    UInt64 elapsedNanoseconds(bool count_user = true, bool count_sys = true) const
-    {
-        return (is_running ? Timestamp::current() : stop_ts).nanoseconds(count_user, count_sys) - start_ts.nanoseconds(count_user, count_sys);
-    }
-
-    UInt64 elapsedMicroseconds(bool count_user = true, bool count_sys = true) const
-    {
-        return elapsedNanoseconds(count_user, count_sys) / 1000UL;
-    }
-
-    UInt64 elapsedMilliseconds(bool count_user = true, bool count_sys = true) const
-    {
-        return elapsedNanoseconds(count_user, count_sys) / 1000000UL;
-    }
-
-    double elapsedSeconds(bool count_user = true, bool count_sys = true) const
-    {
-        return static_cast<double>(elapsedNanoseconds(count_user, count_sys)) / 1000000000.0;
-    }
-
-private:
-
-    struct Timestamp
-    {
-        UInt64 user_ns = 0;
-        UInt64 sys_ns = 0;
-
-        static Timestamp current();
-
-        UInt64 nanoseconds(bool count_user = true, bool count_sys = true) const
-        {
-            return (count_user ? user_ns : 0) + (count_sys ? sys_ns : 0);
-        }
-    };
-
-    Timestamp start_ts;
-    Timestamp stop_ts;
-    bool is_running = false;
-};
-
-
-template <typename TStopwatch>
-class StopwatchGuard : public TStopwatch
-{
-public:
-    explicit StopwatchGuard(UInt64 & elapsed_ns_) : elapsed_ns(elapsed_ns_) {}
-
-    ~StopwatchGuard() { elapsed_ns += TStopwatch::elapsedNanoseconds(); }
-
-private:
-    UInt64 & elapsed_ns;
-};
diff --git a/src/Common/StringSearcher.h b/src/Common/StringSearcher.h
index 09011d910ea..f34bc6f7322 100644
--- a/src/Common/StringSearcher.h
+++ b/src/Common/StringSearcher.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
 #include <Core/Defines.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <Poco/Unicode.h>
 #include <stdint.h>
 #include <string.h>
@@ -116,9 +116,9 @@ public:
 
                 /// lower and uppercase variants of the first octet of the first character in `needle`
                 size_t length_l = UTF8::convertCodePointToUTF8(first_l_u32, l_seq, sizeof(l_seq));
-                size_t length_r = UTF8::convertCodePointToUTF8(first_u_u32, u_seq, sizeof(u_seq));
+                size_t length_u = UTF8::convertCodePointToUTF8(first_u_u32, u_seq, sizeof(u_seq));
 
-                if (length_l != length_r)
+                if (length_l != length_u)
                     throw Exception{"UTF8 sequences with different lowercase and uppercase lengths are not supported", ErrorCodes::UNSUPPORTED_PARAMETER};
             }
 
@@ -183,6 +183,31 @@ public:
 #endif
     }
 
+    template <typename CharT, typename = std::enable_if_t<sizeof(CharT) == 1>>
+    ALWAYS_INLINE bool compareTrivial(const CharT * haystack_pos, const CharT * const haystack_end, const uint8_t * needle_pos) const
+    {
+        while (haystack_pos < haystack_end && needle_pos < needle_end)
+        {
+            auto haystack_code_point = UTF8::convertUTF8ToCodePoint(haystack_pos, haystack_end - haystack_pos);
+            auto needle_code_point = UTF8::convertUTF8ToCodePoint(needle_pos, needle_end - needle_pos);
+
+            /// Invalid UTF-8, should not compare equals
+            if (!haystack_code_point || !needle_code_point)
+                break;
+
+            /// Not equals case insensitive.
+            if (Poco::Unicode::toLower(*haystack_code_point) != Poco::Unicode::toLower(*needle_code_point))
+                break;
+
+            /// @note assuming sequences for lowercase and uppercase have exact same length (that is not always true)
+            const auto len = UTF8::seqLength(*haystack_pos);
+            haystack_pos += len;
+            needle_pos += len;
+        }
+
+        return needle_pos == needle_end;
+    }
+
     template <typename CharT, typename = std::enable_if_t<sizeof(CharT) == 1>>
     ALWAYS_INLINE bool compare(const CharT * /*haystack*/, const CharT * haystack_end, const CharT * pos) const
     {
@@ -200,34 +225,15 @@ public:
             {
                 if (mask == cachemask)
                 {
-                    pos += cache_valid_len;
-                    auto needle_pos = needle + cache_valid_len;
-
-                    while (needle_pos < needle_end)
-                    {
-                        auto haystack_code_point = UTF8::convertUTF8ToCodePoint(pos, haystack_end - pos);
-                        auto needle_code_point = UTF8::convertUTF8ToCodePoint(needle_pos, needle_end - needle_pos);
-
-                        /// Invalid UTF-8, should not compare equals
-                        if (!haystack_code_point || !needle_code_point)
-                            break;
-
-                        /// Not equals case insensitive.
-                        if (Poco::Unicode::toLower(*haystack_code_point) != Poco::Unicode::toLower(*needle_code_point))
-                            break;
-
-                        /// @note assuming sequences for lowercase and uppercase have exact same length (that is not always true)
-                        const auto len = UTF8::seqLength(*pos);
-                        pos += len;
-                        needle_pos += len;
-                    }
-
-                    if (needle_pos == needle_end)
+                    if (compareTrivial(pos, haystack_end, needle))
                         return true;
                 }
             }
             else if ((mask & cachemask) == cachemask)
-                return true;
+            {
+                if (compareTrivial(pos, haystack_end, needle))
+                    return true;
+            }
 
             return false;
         }
@@ -238,25 +244,7 @@ public:
             pos += first_needle_symbol_is_ascii;
             auto needle_pos = needle + first_needle_symbol_is_ascii;
 
-            while (needle_pos < needle_end)
-            {
-                auto haystack_code_point = UTF8::convertUTF8ToCodePoint(pos, haystack_end - pos);
-                auto needle_code_point = UTF8::convertUTF8ToCodePoint(needle_pos, needle_end - needle_pos);
-
-                /// Invalid UTF-8, should not compare equals
-                if (!haystack_code_point || !needle_code_point)
-                    break;
-
-                /// Not equals case insensitive.
-                if (Poco::Unicode::toLower(*haystack_code_point) != Poco::Unicode::toLower(*needle_code_point))
-                    break;
-
-                const auto len = UTF8::seqLength(*pos);
-                pos += len;
-                needle_pos += len;
-            }
-
-            if (needle_pos == needle_end)
+            if (compareTrivial(pos, haystack_end, needle_pos))
                 return true;
         }
 
@@ -299,40 +287,21 @@ public:
                     const auto v_against_l_offset = _mm_cmpeq_epi8(v_haystack_offset, cachel);
                     const auto v_against_u_offset = _mm_cmpeq_epi8(v_haystack_offset, cacheu);
                     const auto v_against_l_or_u_offset = _mm_or_si128(v_against_l_offset, v_against_u_offset);
-                    const auto mask_offset = _mm_movemask_epi8(v_against_l_or_u_offset);
+                    const auto mask_offset_both = _mm_movemask_epi8(v_against_l_or_u_offset);
 
                     if (0xffff == cachemask)
                     {
-                        if (mask_offset == cachemask)
+                        if (mask_offset_both == cachemask)
                         {
-                            auto haystack_pos = haystack + cache_valid_len;
-                            auto needle_pos = needle + cache_valid_len;
-
-                            while (haystack_pos < haystack_end && needle_pos < needle_end)
-                            {
-                                auto haystack_code_point = UTF8::convertUTF8ToCodePoint(haystack_pos, haystack_end - haystack_pos);
-                                auto needle_code_point = UTF8::convertUTF8ToCodePoint(needle_pos, needle_end - needle_pos);
-
-                                /// Invalid UTF-8, should not compare equals
-                                if (!haystack_code_point || !needle_code_point)
-                                    break;
-
-                                /// Not equals case insensitive.
-                                if (Poco::Unicode::toLower(*haystack_code_point) != Poco::Unicode::toLower(*needle_code_point))
-                                    break;
-
-                                /// @note assuming sequences for lowercase and uppercase have exact same length (that is not always true)
-                                const auto len = UTF8::seqLength(*haystack_pos);
-                                haystack_pos += len;
-                                needle_pos += len;
-                            }
-
-                            if (needle_pos == needle_end)
+                            if (compareTrivial(haystack, haystack_end, needle))
                                 return haystack;
                         }
                     }
-                    else if ((mask_offset & cachemask) == cachemask)
-                        return haystack;
+                    else if ((mask_offset_both & cachemask) == cachemask)
+                    {
+                        if (compareTrivial(haystack, haystack_end, needle))
+                            return haystack;
+                    }
 
                     /// first octet was ok, but not the first 16, move to start of next sequence and reapply
                     haystack += UTF8::seqLength(*haystack);
@@ -349,25 +318,7 @@ public:
                 auto haystack_pos = haystack + first_needle_symbol_is_ascii;
                 auto needle_pos = needle + first_needle_symbol_is_ascii;
 
-                while (haystack_pos < haystack_end && needle_pos < needle_end)
-                {
-                    auto haystack_code_point = UTF8::convertUTF8ToCodePoint(haystack_pos, haystack_end - haystack_pos);
-                    auto needle_code_point = UTF8::convertUTF8ToCodePoint(needle_pos, needle_end - needle_pos);
-
-                    /// Invalid UTF-8, should not compare equals
-                    if (!haystack_code_point || !needle_code_point)
-                        break;
-
-                    /// Not equals case insensitive.
-                    if (Poco::Unicode::toLower(*haystack_code_point) != Poco::Unicode::toLower(*needle_code_point))
-                        break;
-
-                    const auto len = UTF8::seqLength(*haystack_pos);
-                    haystack_pos += len;
-                    needle_pos += len;
-                }
-
-                if (needle_pos == needle_end)
+                if (compareTrivial(haystack_pos, haystack_end, needle_pos))
                     return haystack;
             }
 
diff --git a/src/Common/StringUtils/StringUtils.h b/src/Common/StringUtils/StringUtils.h
index f6ad61f8fd9..21df0f5ae8b 100644
--- a/src/Common/StringUtils/StringUtils.h
+++ b/src/Common/StringUtils/StringUtils.h
@@ -276,14 +276,30 @@ inline void trimLeft(std::string_view & str, char c = ' ')
         str.remove_prefix(1);
 }
 
+inline void trimLeft(std::string & str, char c = ' ')
+{
+    str.erase(0, str.find_first_not_of(c));
+}
+
 inline void trimRight(std::string_view & str, char c = ' ')
 {
     while (str.ends_with(c))
         str.remove_suffix(1);
 }
 
+inline void trimRight(std::string & str, char c = ' ')
+{
+    str.erase(str.find_last_not_of(c) + 1);
+}
+
 inline void trim(std::string_view & str, char c = ' ')
 {
     trimLeft(str, c);
     trimRight(str, c);
 }
+
+inline void trim(std::string & str, char c = ' ')
+{
+    trimRight(str, c);
+    trimLeft(str, c);
+}
diff --git a/src/Common/StudentTTest.cpp b/src/Common/StudentTTest.cpp
index da4913126b3..63f48f319d2 100644
--- a/src/Common/StudentTTest.cpp
+++ b/src/Common/StudentTTest.cpp
@@ -158,7 +158,7 @@ std::pair<bool, std::string> StudentTTest::compareAndReport(size_t confidence_le
 
     if (mean_difference > mean_confidence_interval && (mean_difference - mean_confidence_interval > 0.0001)) /// difference must be more than 0.0001, to take into account connection latency.
     {
-        ss << "Difference at " << confidence_level[confidence_level_index] <<  "% confidence : ";
+        ss << "Difference at " << confidence_level[confidence_level_index] <<  "% confidence: ";
         ss << std::fixed << std::setprecision(8) << "mean difference is " << mean_difference << ", but confidence interval is " << mean_confidence_interval;
         return {false, ss.str()};
     }
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index a23184c9c0a..2d875b7042d 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -462,12 +462,22 @@ String SymbolIndex::getBuildIDHex() const
     return build_id_hex;
 }
 
-MultiVersion<SymbolIndex>::Version SymbolIndex::instance(bool reload)
+MultiVersion<SymbolIndex> & SymbolIndex::instanceImpl()
 {
     static MultiVersion<SymbolIndex> instance(std::unique_ptr<SymbolIndex>(new SymbolIndex));
-    if (reload)
-        instance.set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
-    return instance.get();
+    return instance;
+}
+
+MultiVersion<SymbolIndex>::Version SymbolIndex::instance()
+{
+    return instanceImpl().get();
+}
+
+void SymbolIndex::reload()
+{
+    instanceImpl().set(std::unique_ptr<SymbolIndex>(new SymbolIndex));
+    /// Also drop stacktrace cache.
+    StackTrace::dropCache();
 }
 
 }
diff --git a/src/Common/SymbolIndex.h b/src/Common/SymbolIndex.h
index 65e446a7fc4..37862987bd2 100644
--- a/src/Common/SymbolIndex.h
+++ b/src/Common/SymbolIndex.h
@@ -22,7 +22,8 @@ protected:
     SymbolIndex() { update(); }
 
 public:
-    static MultiVersion<SymbolIndex>::Version instance(bool reload = false);
+    static MultiVersion<SymbolIndex>::Version instance();
+    static void reload();
 
     struct Symbol
     {
@@ -60,6 +61,7 @@ private:
     Data data;
 
     void update();
+    static MultiVersion<SymbolIndex> & instanceImpl();
 };
 
 }
diff --git a/src/Common/TLDListsHolder.cpp b/src/Common/TLDListsHolder.cpp
index 34bef8248b5..3f3c0814538 100644
--- a/src/Common/TLDListsHolder.cpp
+++ b/src/Common/TLDListsHolder.cpp
@@ -1,6 +1,6 @@
 #include <Common/TLDListsHolder.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <string_view>
@@ -64,7 +64,8 @@ size_t TLDListsHolder::parseAndAddTldList(const std::string & name, const std::s
     while (!in.eof())
     {
         readEscapedStringUntilEOL(line, in);
-        ++in.position();
+        if (!in.eof())
+            ++in.position();
         /// Skip comments
         if (line.size() > 2 && line[0] == '/' && line[1] == '/')
             continue;
diff --git a/src/Common/TLDListsHolder.h b/src/Common/TLDListsHolder.h
index 3900f9c30d2..025954727c5 100644
--- a/src/Common/TLDListsHolder.h
+++ b/src/Common/TLDListsHolder.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/defines.h>
-#include <common/StringRef.h>
+#include <base/defines.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/StringHashSet.h>
 #include <Common/Arena.h>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/src/Common/TaskStatsInfoGetter.cpp b/src/Common/TaskStatsInfoGetter.cpp
index 92978a0ad8c..f2ef0f6d2aa 100644
--- a/src/Common/TaskStatsInfoGetter.cpp
+++ b/src/Common/TaskStatsInfoGetter.cpp
@@ -1,13 +1,13 @@
 #include "TaskStatsInfoGetter.h"
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <unistd.h>
 
 #if defined(OS_LINUX)
 
 #include "hasLinuxCapability.h"
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/Common/TaskStatsInfoGetter.h b/src/Common/TaskStatsInfoGetter.h
index 00ecf91c475..08e35757212 100644
--- a/src/Common/TaskStatsInfoGetter.h
+++ b/src/Common/TaskStatsInfoGetter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <sys/types.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <boost/noncopyable.hpp>
 
 struct taskstats;
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index a538ba7a49a..f0f41e56eaf 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -7,10 +7,10 @@
 
 #include <random>
 
-#include <common/sleep.h>
+#include <base/sleep.h>
 
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/Exception.h>
 #include <Common/thread_local_rng.h>
@@ -31,6 +31,10 @@
         M(int, pthread_mutex_unlock, pthread_mutex_t * arg)
 #endif
 
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace DB
 {
 
@@ -124,6 +128,9 @@ void ThreadFuzzer::initConfiguration()
 
 bool ThreadFuzzer::isEffective() const
 {
+    if (!isStarted())
+        return false;
+
 #if THREAD_FUZZER_WRAP_PTHREAD
 #    define CHECK_WRAPPER_PARAMS(RET, NAME, ...) \
         if (NAME##_before_yield_probability.load(std::memory_order_relaxed)) \
@@ -155,6 +162,20 @@ bool ThreadFuzzer::isEffective() const
             || (sleep_probability > 0 && sleep_time_us > 0));
 }
 
+void ThreadFuzzer::stop()
+{
+    started.store(false, std::memory_order_relaxed);
+}
+
+void ThreadFuzzer::start()
+{
+    started.store(true, std::memory_order_relaxed);
+}
+
+bool ThreadFuzzer::isStarted()
+{
+    return started.load(std::memory_order_relaxed);
+}
 
 static void injection(
     double yield_probability,
@@ -162,6 +183,10 @@ static void injection(
     double sleep_probability,
     double sleep_time_us [[maybe_unused]])
 {
+    DENY_ALLOCATIONS_IN_SCOPE;
+    if (!ThreadFuzzer::isStarted())
+        return;
+
     if (yield_probability > 0
         && std::bernoulli_distribution(yield_probability)(thread_local_rng))
     {
diff --git a/src/Common/ThreadFuzzer.h b/src/Common/ThreadFuzzer.h
index 1a9e98ca674..743b8c75dc0 100644
--- a/src/Common/ThreadFuzzer.h
+++ b/src/Common/ThreadFuzzer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <cstdint>
-
+#include <atomic>
 
 namespace DB
 {
@@ -54,6 +54,10 @@ public:
 
     bool isEffective() const;
 
+    static void stop();
+    static void start();
+    static bool isStarted();
+
 private:
     uint64_t cpu_time_period_us = 0;
     double yield_probability = 0;
@@ -61,6 +65,8 @@ private:
     double sleep_probability = 0;
     double sleep_time_us = 0;
 
+    inline static std::atomic<bool> started{true};
+
     ThreadFuzzer();
 
     void initConfiguration();
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index e6ccf405e9f..8ad70d85643 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -3,6 +3,7 @@
 #include <Common/getNumberOfPhysicalCPUCores.h>
 
 #include <cassert>
+#include <iostream>
 #include <type_traits>
 
 #include <Poco/Util/Application.h>
@@ -74,6 +75,8 @@ void ThreadPoolImpl<Thread>::setQueueSize(size_t value)
 {
     std::lock_guard lock(mutex);
     queue_size = value;
+    /// Reserve memory to get rid of allocations
+    jobs.reserve(queue_size);
 }
 
 
@@ -191,6 +194,10 @@ void ThreadPoolImpl<Thread>::wait()
 template <typename Thread>
 ThreadPoolImpl<Thread>::~ThreadPoolImpl()
 {
+    /// Note: should not use logger from here,
+    /// because it can be an instance of GlobalThreadPool that is a global variable
+    /// and the destruction order of global variables is unspecified.
+
     finalize();
 }
 
@@ -243,7 +250,7 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
 
             if (!jobs.empty())
             {
-                /// std::priority_queue does not provide interface for getting non-const reference to an element
+                /// boost::priority_queue does not provide interface for getting non-const reference to an element
                 /// to prevent us from modifying its priority. We have to use const_cast to force move semantics on JobWithPriority::job.
                 job = std::move(const_cast<Job &>(jobs.top().job));
                 jobs.pop();
@@ -253,6 +260,7 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
                 /// shutdown is true, simply finish the thread.
                 return;
             }
+
         }
 
         if (!need_shutdown)
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 1da5d25eef0..6e803d77601 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -8,10 +8,13 @@
 #include <queue>
 #include <list>
 #include <optional>
+#include <atomic>
+
+#include <boost/heap/priority_queue.hpp>
 
 #include <Poco/Event.h>
 #include <Common/ThreadStatus.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 /** Very simple thread pool similar to boost::threadpool.
   * Advantages:
@@ -103,11 +106,10 @@ private:
         }
     };
 
-    std::priority_queue<JobWithPriority> jobs;
+    boost::heap::priority_queue<JobWithPriority> jobs;
     std::list<Thread> threads;
     std::exception_ptr first_exception;
 
-
     template <typename ReturnType>
     ReturnType scheduleImpl(Job job, int priority, std::optional<uint64_t> wait_microseconds);
 
@@ -156,14 +158,16 @@ public:
 class ThreadFromGlobalPool
 {
 public:
-    ThreadFromGlobalPool() {}
+    ThreadFromGlobalPool() = default;
 
     template <typename Function, typename... Args>
     explicit ThreadFromGlobalPool(Function && func, Args &&... args)
         : state(std::make_shared<Poco::Event>())
+        , thread_id(std::make_shared<std::thread::id>())
     {
         /// NOTE: If this will throw an exception, the destructor won't be called.
         GlobalThreadPool::instance().scheduleOrThrow([
+            thread_id = thread_id,
             state = state,
             func = std::forward<Function>(func),
             args = std::make_tuple(std::forward<Args>(args)...)]() mutable /// mutable is needed to destroy capture
@@ -171,6 +175,8 @@ public:
             auto event = std::move(state);
             SCOPE_EXIT(event->set());
 
+            thread_id = std::make_shared<std::thread::id>(std::this_thread::get_id());
+
             /// This moves are needed to destroy function and arguments before exit.
             /// It will guarantee that after ThreadFromGlobalPool::join all captured params are destroyed.
             auto function = std::move(func);
@@ -193,6 +199,7 @@ public:
         if (joinable())
             abort();
         state = std::move(rhs.state);
+        thread_id = std::move(rhs.thread_id);
         return *this;
     }
 
@@ -220,12 +227,18 @@ public:
 
     bool joinable() const
     {
-        return state != nullptr;
+        if (!state)
+            return false;
+        /// Thread cannot join itself.
+        if (*thread_id == std::this_thread::get_id())
+            return false;
+        return true;
     }
 
 private:
     /// The state used in this object and inside the thread job.
     std::shared_ptr<Poco::Event> state;
+    std::shared_ptr<std::thread::id> thread_id;
 };
 
 
diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index 7b69bf766db..3e2bb2bdf6e 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 
 
 namespace DB
diff --git a/src/Common/ThreadProfileEvents.h b/src/Common/ThreadProfileEvents.h
index cf5196f3636..5d8f879eca7 100644
--- a/src/Common/ThreadProfileEvents.h
+++ b/src/Common/ThreadProfileEvents.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ProfileEvents.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <pthread.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 #if defined(__linux__)
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index 0e12830e49d..c976e4ca16a 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -2,14 +2,15 @@
 #include <Common/ThreadProfileEvents.h>
 #include <Common/QueryProfiler.h>
 #include <Common/ThreadStatus.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
 
 #include <Poco/Logger.h>
-#include <common/getThreadId.h>
-#include <common/getPageSize.h>
+#include <base/getThreadId.h>
+#include <base/getPageSize.h>
 
 #include <csignal>
+#include <mutex>
 
 
 namespace DB
@@ -25,7 +26,7 @@ namespace ErrorCodes
 thread_local ThreadStatus * current_thread = nullptr;
 thread_local ThreadStatus * main_thread = nullptr;
 
-#if !defined(SANITIZER) && !defined(ARCADIA_BUILD)
+#if !defined(SANITIZER)
 namespace
 {
 
@@ -44,7 +45,7 @@ namespace
 struct ThreadStack
 {
     ThreadStack()
-        : data(aligned_alloc(getPageSize(), size))
+        : data(aligned_alloc(getPageSize(), getSize()))
     {
         /// Add a guard page
         /// (and since the stack grows downward, we need to protect the first page).
@@ -56,12 +57,11 @@ struct ThreadStack
         free(data);
     }
 
-    static size_t getSize() { return size; }
+    static size_t getSize() { return std::max<size_t>(16 << 10, MINSIGSTKSZ); }
     void * getData() const { return data; }
 
 private:
     /// 16 KiB - not too big but enough to handle error.
-    static constexpr size_t size = std::max<size_t>(16 << 10, MINSIGSTKSZ);
     void * data;
 };
 
@@ -88,7 +88,7 @@ ThreadStatus::ThreadStatus()
     /// Will set alternative signal stack to provide diagnostics for stack overflow errors.
     /// If not already installed for current thread.
     /// Sanitizer makes larger stack usage and also it's incompatible with alternative stack by default (it sets up and relies on its own).
-#if !defined(SANITIZER) && !defined(ARCADIA_BUILD)
+#if !defined(SANITIZER)
     if (!has_alt_stack)
     {
         /// Don't repeat tries even if not installed successfully.
@@ -141,15 +141,23 @@ ThreadStatus::~ThreadStatus()
         /// We've already allocated a little bit more than the limit and cannot track it in the thread memory tracker or its parent.
     }
 
-#if !defined(ARCADIA_BUILD)
+    if (thread_group)
+    {
+        std::lock_guard guard(thread_group->mutex);
+        thread_group->threads.erase(this);
+    }
+
     /// It may cause segfault if query_context was destroyed, but was not detached
     auto query_context_ptr = query_context.lock();
     assert((!query_context_ptr && query_id.empty()) || (query_context_ptr && query_id == query_context_ptr->getCurrentQueryId()));
-#endif
 
     if (deleter)
         deleter();
-    current_thread = nullptr;
+
+    /// Only change current_thread if it's currently being used by this ThreadStatus
+    /// For example, PushingToViewsBlockOutputStream creates and deletes ThreadStatus instances while running in the main query thread
+    if (current_thread == this)
+        current_thread = nullptr;
 }
 
 void ThreadStatus::updatePerformanceCounters()
@@ -193,6 +201,17 @@ void ThreadStatus::attachInternalTextLogsQueue(const InternalTextLogsQueuePtr &
     thread_group->client_logs_level = client_logs_level;
 }
 
+void ThreadStatus::attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue)
+{
+    profile_queue_ptr = profile_queue;
+
+    if (!thread_group)
+        return;
+
+    std::lock_guard lock(thread_group->mutex);
+    thread_group->profile_queue_ptr = profile_queue;
+}
+
 void ThreadStatus::setFatalErrorCallback(std::function<void()> callback)
 {
     fatal_error_callback = std::move(callback);
@@ -217,7 +236,6 @@ MainThreadStatus & MainThreadStatus::getInstance()
     return thread_status;
 }
 MainThreadStatus::MainThreadStatus()
-    : ThreadStatus()
 {
     main_thread = current_thread;
 }
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index 6fc43114621..d22f6e1574b 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -6,7 +6,8 @@
 #include <Common/MemoryTracker.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/ProfileEvents.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
+#include <Common/ConcurrentBoundedQueue.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -15,6 +16,7 @@
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
+#include <unordered_set>
 
 
 namespace Poco
@@ -29,7 +31,7 @@ namespace DB
 class QueryStatus;
 class ThreadStatus;
 class QueryProfilerReal;
-class QueryProfilerCpu;
+class QueryProfilerCPU;
 class QueryThreadLog;
 struct OpenTelemetrySpanHolder;
 class TasksStatsCounters;
@@ -37,9 +39,16 @@ struct RUsageCounters;
 struct PerfEventsCounters;
 class TaskStatsInfoGetter;
 class InternalTextLogsQueue;
+struct ViewRuntimeData;
+class QueryViewsLog;
+class MemoryTrackerThreadSwitcher;
 using InternalTextLogsQueuePtr = std::shared_ptr<InternalTextLogsQueue>;
 using InternalTextLogsQueueWeakPtr = std::weak_ptr<InternalTextLogsQueue>;
 
+using InternalProfileEventsQueue = ConcurrentBoundedQueue<Block>;
+using InternalProfileEventsQueuePtr = std::shared_ptr<InternalProfileEventsQueue>;
+using InternalProfileEventsQueueWeakPtr = std::weak_ptr<InternalProfileEventsQueue>;
+using ThreadStatusPtr = ThreadStatus *;
 
 /** Thread group is a collection of threads dedicated to single task
   * (query or other process like background merge).
@@ -61,9 +70,11 @@ public:
     ContextWeakPtr global_context;
 
     InternalTextLogsQueueWeakPtr logs_queue_ptr;
+    InternalProfileEventsQueueWeakPtr profile_queue_ptr;
     std::function<void()> fatal_error_callback;
 
     std::vector<UInt64> thread_ids;
+    std::unordered_set<ThreadStatusPtr> threads;
 
     /// The first thread created this thread group
     UInt64 master_thread_id = 0;
@@ -130,6 +141,8 @@ protected:
     /// A logs queue used by TCPHandler to pass logs to a client
     InternalTextLogsQueueWeakPtr logs_queue_ptr;
 
+    InternalProfileEventsQueueWeakPtr profile_queue_ptr;
+
     bool performance_counters_finalized = false;
     UInt64 query_start_time_nanoseconds = 0;
     UInt64 query_start_time_microseconds = 0;
@@ -138,7 +151,7 @@ protected:
 
     // CPU and Real time query profilers
     std::unique_ptr<QueryProfilerReal> query_profiler_real;
-    std::unique_ptr<QueryProfilerCpu> query_profiler_cpu;
+    std::unique_ptr<QueryProfilerCPU> query_profiler_cpu;
 
     Poco::Logger * log = nullptr;
 
@@ -151,6 +164,16 @@ protected:
     /// Is used to send logs from logs_queue to client in case of fatal errors.
     std::function<void()> fatal_error_callback;
 
+    /// It is used to avoid enabling the query profiler when you have multiple ThreadStatus in the same thread
+    bool query_profiled_enabled = true;
+
+    /// Requires access to query_id.
+    friend class MemoryTrackerThreadSwitcher;
+    void setQueryId(const String & query_id_)
+    {
+        query_id = query_id_;
+    }
+
 public:
     ThreadStatus();
     ~ThreadStatus();
@@ -182,6 +205,11 @@ public:
         return query_context.lock();
     }
 
+    void disableProfiling()
+    {
+        query_profiled_enabled = false;
+    }
+
     /// Starts new query and create new thread group for it, current thread becomes master thread of the query
     void initializeQuery();
 
@@ -196,6 +224,13 @@ public:
     void attachInternalTextLogsQueue(const InternalTextLogsQueuePtr & logs_queue,
                                      LogsLevel client_logs_level);
 
+    InternalProfileEventsQueuePtr getInternalProfileEventsQueue() const
+    {
+        return thread_state == Died ? nullptr : profile_queue_ptr.lock();
+    }
+
+    void attachInternalProfileEventsQueue(const InternalProfileEventsQueuePtr & profile_queue);
+
     /// Callback that is used to trigger sending fatal error messages to client.
     void setFatalErrorCallback(std::function<void()> callback);
     void onFatalError();
@@ -210,9 +245,14 @@ public:
     /// Update ProfileEvents and dumps info to system.query_thread_log
     void finalizePerformanceCounters();
 
+    /// Set the counters last usage to now
+    void resetPerformanceCountersLastUsage();
+
     /// Detaches thread from the thread group and the query, dumps performance counters if they have not been dumped
     void detachQuery(bool exit_if_already_detached = false, bool thread_exits = false);
 
+    void logToQueryViewsLog(const ViewRuntimeData & vinfo);
+
 protected:
     void applyQuerySettings();
 
@@ -224,6 +264,7 @@ protected:
 
     void logToQueryThreadLog(QueryThreadLog & thread_log, const String & current_database, std::chrono::time_point<std::chrono::system_clock> now);
 
+
     void assertState(const std::initializer_list<int> & permitted_states, const char * description = nullptr) const;
 
 
diff --git a/src/Common/Throttler.cpp b/src/Common/Throttler.cpp
index 3462abfeb54..f02001e338a 100644
--- a/src/Common/Throttler.cpp
+++ b/src/Common/Throttler.cpp
@@ -23,7 +23,7 @@ static constexpr auto NS = 1000000000UL;
 
 /// Tracking window. Actually the size is not really important. We just want to avoid
 /// throttles when there are no actions for a long period time.
-static const double window_ns = 7UL * NS;
+static const double window_ns = 1UL * NS;
 
 void Throttler::add(size_t amount)
 {
@@ -35,7 +35,7 @@ void Throttler::add(size_t amount)
     {
         std::lock_guard lock(mutex);
 
-        auto now = clock_gettime_ns();
+        auto now = clock_gettime_ns_adjusted(prev_ns);
         /// If prev_ns is equal to zero (first `add` call) we known nothing about speed
         /// and don't track anything.
         if (max_speed && prev_ns != 0)
diff --git a/src/Common/Throttler.h b/src/Common/Throttler.h
index a30df74d510..b2c704e5308 100644
--- a/src/Common/Throttler.h
+++ b/src/Common/Throttler.h
@@ -2,7 +2,7 @@
 
 #include <mutex>
 #include <memory>
-#include <common/sleep.h>
+#include <base/sleep.h>
 #include <atomic>
 
 namespace DB
diff --git a/src/Common/TimerDescriptor.cpp b/src/Common/TimerDescriptor.cpp
index 793f7ed1352..086d462eeb2 100644
--- a/src/Common/TimerDescriptor.cpp
+++ b/src/Common/TimerDescriptor.cpp
@@ -74,17 +74,24 @@ void TimerDescriptor::drain() const
     }
 }
 
-void TimerDescriptor::setRelative(Poco::Timespan timespan) const
+void TimerDescriptor::setRelative(uint64_t usec) const
 {
+    static constexpr uint32_t TIMER_PRECISION = 1e6;
+
     itimerspec spec;
     spec.it_interval.tv_nsec = 0;
     spec.it_interval.tv_sec = 0;
-    spec.it_value.tv_sec = timespan.totalSeconds();
-    spec.it_value.tv_nsec = timespan.useconds() * 1000;
+    spec.it_value.tv_sec = usec / TIMER_PRECISION;
+    spec.it_value.tv_nsec = (usec % TIMER_PRECISION) * 1'000;
 
     if (-1 == timerfd_settime(timer_fd, 0 /*relative timer */, &spec, nullptr))
         throwFromErrno("Cannot set time for timer_fd", ErrorCodes::CANNOT_SET_TIMER_PERIOD);
 }
 
+void TimerDescriptor::setRelative(Poco::Timespan timespan) const
+{
+    setRelative(timespan.totalMicroseconds());
+}
+
 }
 #endif
diff --git a/src/Common/TimerDescriptor.h b/src/Common/TimerDescriptor.h
index 30a610f37f0..8ca69344b53 100644
--- a/src/Common/TimerDescriptor.h
+++ b/src/Common/TimerDescriptor.h
@@ -24,6 +24,7 @@ public:
 
     void reset() const;
     void drain() const;
+    void setRelative(uint64_t usec) const;
     void setRelative(Poco::Timespan timespan) const;
 };
 
diff --git a/src/Common/TraceCollector.cpp b/src/Common/TraceCollector.cpp
index 1c6074c5cf9..d84202449d1 100644
--- a/src/Common/TraceCollector.cpp
+++ b/src/Common/TraceCollector.cpp
@@ -12,7 +12,7 @@
 #include <Common/PipeFDs.h>
 #include <Common/StackTrace.h>
 #include <Common/setThreadName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/TraceCollector.h b/src/Common/TraceCollector.h
index 86e9d659d0a..d3bbc74726e 100644
--- a/src/Common/TraceCollector.h
+++ b/src/Common/TraceCollector.h
@@ -20,7 +20,8 @@ enum class TraceType : uint8_t
     Real,
     CPU,
     Memory,
-    MemorySample
+    MemorySample,
+    MemoryPeak,
 };
 
 class TraceCollector
diff --git a/src/Common/TypeList.h b/src/Common/TypeList.h
deleted file mode 100644
index c011f226f87..00000000000
--- a/src/Common/TypeList.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <utility>
-#include <Core/Defines.h>
-
-namespace DB
-{
-
-template <typename... TTail>
-struct TypeList
-{
-    static constexpr size_t size = 0;
-
-    template <size_t I>
-    using At = std::nullptr_t;
-
-    template <typename Func, size_t index = 0>
-    static void forEach(Func && /*func*/)
-    {
-    }
-};
-
-
-template <typename THead, typename... TTail>
-struct TypeList<THead, TTail...>
-{
-    using Head = THead;
-    using Tail = TypeList<TTail...>;
-
-    static constexpr size_t size = 1 + sizeof...(TTail);
-
-    template <size_t I>
-    using At = typename std::template conditional_t<I == 0, Head, typename Tail::template At<I - 1>>;
-
-    template <typename Func, size_t index = 0>
-    static void ALWAYS_INLINE forEach(Func && func)
-    {
-        func.template operator()<Head, index>();
-        Tail::template forEach<Func, index + 1>(std::forward<Func>(func));
-    }
-};
-
-/// Prepend Type to TypeList
-/// Usage:
-///     using TypeListWithType = typename AppendToTypeList<Type, ConcreteTypeList>::Type;
-template <typename TypeToPrepend, typename List, typename ... Types>
-struct PrependToTypeList
-{
-    using Type = typename PrependToTypeList<TypeToPrepend, typename List::Tail, Types ..., typename List::Head>::Type;
-};
-
-template <typename TypeToPrepend, typename ... Types>
-struct PrependToTypeList<TypeToPrepend, TypeList<>, Types ...>
-{
-    using Type = TypeList<TypeToPrepend, Types ...>;
-};
-
-/// Append Type to TypeList
-/// Usage:
-///     using TypeListWithType = typename AppendToTypeList<Type, ConcreteTypeList>::Type;
-template <typename TypeToAppend, typename List, typename ... Types>
-struct AppendToTypeList
-{
-    using Type = typename AppendToTypeList<TypeToAppend, typename List::Tail, Types ..., typename List::Head>::Type;
-};
-
-template <typename TypeToAppend, typename ... Types>
-struct AppendToTypeList<TypeToAppend, TypeList<>, Types ...>
-{
-    using Type = TypeList<Types ..., TypeToAppend>;
-};
-
-/// Apply TypeList as variadic template argument of Class.
-/// Usage:
-///     using ClassWithAppliedTypeList = typename ApplyTypeListForClass<Class, ConcreteTypeList>::Type;
-template <template <typename ...> typename Class, typename List, typename ... Types>
-struct ApplyTypeListForClass
-{
-    using Type = typename ApplyTypeListForClass<Class, typename List::Tail, Types ..., typename List::Head>::Type;
-};
-
-template <template <typename ...> typename Class, typename ... Types>
-struct ApplyTypeListForClass<Class, TypeList<>, Types ...>
-{
-    using Type = Class<Types ...>;
-};
-
-/// TypeList concatenation.
-/// Usage:
-///     using ResultTypeList = typename TypeListConcat<LeftList, RightList>::Type;
-template <typename TypeListLeft, typename TypeListRight>
-struct TypeListConcat
-{
-    using Type = typename TypeListConcat<
-            typename AppendToTypeList<typename TypeListRight::Head, TypeListLeft>::Type,
-            typename TypeListRight::Tail>::Type;
-};
-
-template <typename TypeListLeft>
-struct TypeListConcat<TypeListLeft, TypeList<>>
-{
-    using Type = TypeListLeft;
-};
-
-/// TypeList Map function.
-/// Usage:
-///     using ResultTypeList = typename TypeListMap<Function, TypeListArgs>::Type;
-template <template <typename> typename Function, typename TypeListArgs>
-struct TypeListMap
-{
-    using Type = typename PrependToTypeList<
-            Function<typename TypeListArgs::Head>,
-            typename TypeListMap<Function, typename TypeListArgs::Tail>::Type>::Type;
-};
-
-template <template <typename> typename Function>
-struct TypeListMap<Function, TypeList<>>
-{
-    using Type = TypeList<>;
-};
-
-}
diff --git a/src/Common/UTF8Helpers.h b/src/Common/UTF8Helpers.h
index f25ed55a6af..e33a3f1427c 100644
--- a/src/Common/UTF8Helpers.h
+++ b/src/Common/UTF8Helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/BitHelpers.h>
 #include <Poco/UTF8Encoding.h>
 
diff --git a/src/Common/UnicodeBar.cpp b/src/Common/UnicodeBar.cpp
index 0e1f792c9fe..9cb3069aebb 100644
--- a/src/Common/UnicodeBar.cpp
+++ b/src/Common/UnicodeBar.cpp
@@ -1,8 +1,8 @@
 #include <cstring>
 #include <cmath>
 #include <string>
-#include <common/types.h>
-#include <common/arithmeticOverflow.h>
+#include <base/types.h>
+#include <base/arithmeticOverflow.h>
 #include <Common/Exception.h>
 #include <Common/UnicodeBar.h>
 #include <Common/NaNUtils.h>
diff --git a/src/Common/UnicodeBar.h b/src/Common/UnicodeBar.h
index e6f49dde856..64705aa5022 100644
--- a/src/Common/UnicodeBar.h
+++ b/src/Common/UnicodeBar.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <common/types.h>
+#include <base/types.h>
 
 #define UNICODE_BAR_CHAR_SIZE (strlen("█"))
 
diff --git a/src/Common/VariableContext.h b/src/Common/VariableContext.h
index 2fe4ffb565a..fb9acd40aea 100644
--- a/src/Common/VariableContext.h
+++ b/src/Common/VariableContext.h
@@ -8,5 +8,4 @@ enum class VariableContext
     User,           /// Group of processes
     Process,        /// For example, a query or a merge
     Thread,         /// A thread of a process
-    Snapshot        /// Does not belong to anybody
 };
diff --git a/src/Common/VersionNumber.h b/src/Common/VersionNumber.h
index fb5de7fdfb6..389644266c4 100644
--- a/src/Common/VersionNumber.h
+++ b/src/Common/VersionNumber.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Common/Visitor.h b/src/Common/Visitor.h
index 48e9abe1341..53603130b2a 100644
--- a/src/Common/Visitor.h
+++ b/src/Common/Visitor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/demangle.h>
-#include <Common/TypeList.h>
+#include <base/demangle.h>
+#include <base/Typelist.h>
 #include <Common/Exception.h>
 
 /* Generic utils which are intended for visitor pattern implementation.
@@ -64,7 +64,7 @@ template <>
 class Visitor<>
 {
 public:
-    using List = TypeList<>;
+    using List = Typelist<>;
 
 protected:
     ~Visitor() = default;
@@ -74,7 +74,7 @@ template <typename Type>
 class Visitor<Type> : public Visitor<>
 {
 public:
-    using List = TypeList<Type>;
+    using List = Typelist<Type>;
 
     virtual void visit(Type &) = 0;
 
@@ -86,7 +86,7 @@ template <typename Type, typename ... Types>
 class Visitor<Type, Types ...> : public Visitor<Types ...>
 {
 public:
-    using List = TypeList<Type, Types ...>;
+    using List = Typelist<Type, Types ...>;
     using Visitor<Types ...>::visit;
 
     virtual void visit(Type &) = 0;
@@ -145,13 +145,13 @@ protected:
 
 template <typename Derived, typename VisitorBase>
 class VisitorImpl : public
-        ApplyTypeListForClass<
-                VisitorImplHelper,
-                typename TypeListConcat<
-                        TypeList<Derived, VisitorBase>,
-                        typename VisitorBase::List
-                >::Type
-        >::Type
+    TLChangeRoot<
+        VisitorImplHelper,
+        TLConcat<
+            Typelist<Derived, VisitorBase>,
+            typename VisitorBase::List
+        >
+    >
 {
 protected:
     ~VisitorImpl() = default;
diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h
index 13cef28ddcf..f08172c8a77 100644
--- a/src/Common/Volnitsky.h
+++ b/src/Common/Volnitsky.h
@@ -4,13 +4,13 @@
 #include <vector>
 #include <stdint.h>
 #include <string.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Unicode.h>
 #include <Common/StringSearcher.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
-#include <common/StringRef.h>
-#include <common/unaligned.h>
+#include <base/StringRef.h>
+#include <base/unaligned.h>
 
 /** Search for a substring in a string by Volnitsky's algorithm
   * http://volnitsky.com/project/str_search/
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 30d816aad15..65ebd8ee615 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 #include <vector>
@@ -481,7 +481,7 @@ public:
         MultiCallback callback) = 0;
 
     /// Expire session and finish all pending requests
-    virtual void finalize() = 0;
+    virtual void finalize(const String & reason) = 0;
 };
 
 }
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index 49eb7ad764d..065b1cf65ba 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -1,7 +1,7 @@
 #include <Common/ZooKeeper/TestKeeper.h>
 #include <Common/setThreadName.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <sstream>
 #include <iomanip>
@@ -493,7 +493,7 @@ TestKeeper::~TestKeeper()
 {
     try
     {
-        finalize();
+        finalize(__PRETTY_FUNCTION__);
         if (processing_thread.joinable())
             processing_thread.join();
     }
@@ -556,12 +556,12 @@ void TestKeeper::processingThread()
     catch (...)
     {
         tryLogCurrentException(__PRETTY_FUNCTION__);
-        finalize();
+        finalize(__PRETTY_FUNCTION__);
     }
 }
 
 
-void TestKeeper::finalize()
+void TestKeeper::finalize(const String &)
 {
     {
         std::lock_guard lock(push_request_mutex);
@@ -661,7 +661,7 @@ void TestKeeper::pushRequest(RequestInfo && request)
     }
     catch (...)
     {
-        finalize();
+        finalize(__PRETTY_FUNCTION__);
         throw;
     }
 }
diff --git a/src/Common/ZooKeeper/TestKeeper.h b/src/Common/ZooKeeper/TestKeeper.h
index b46f98c0074..e57471341e8 100644
--- a/src/Common/ZooKeeper/TestKeeper.h
+++ b/src/Common/ZooKeeper/TestKeeper.h
@@ -83,7 +83,7 @@ public:
             const Requests & requests,
             MultiCallback callback) override;
 
-    void finalize() override;
+    void finalize(const String & reason) override;
 
     struct Node
     {
diff --git a/src/Common/ZooKeeper/Types.h b/src/Common/ZooKeeper/Types.h
index 33be2853068..35d4188d3e2 100644
--- a/src/Common/ZooKeeper/Types.h
+++ b/src/Common/ZooKeeper/Types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <future>
 #include <memory>
 #include <vector>
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index 9b3c3191b5d..f05a10b8815 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -7,8 +7,8 @@
 #include <filesystem>
 #include <pcg-random/pcg_random.hpp>
 
-#include <common/logger_useful.h>
-#include <common/find_symbols.h>
+#include <base/logger_useful.h>
+#include <base/find_symbols.h>
 #include <Common/randomSeed.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Exception.h>
@@ -130,8 +130,27 @@ void ZooKeeper::init(const std::string & implementation_, const Strings & hosts_
         throw DB::Exception("Unknown implementation of coordination service: " + implementation, DB::ErrorCodes::NOT_IMPLEMENTED);
     }
 
-    if (!chroot.empty() && !exists("/"))
-        throw KeeperException("Zookeeper root doesn't exist. You should create root node " + chroot + " before start.", Coordination::Error::ZNONODE);
+    if (!chroot.empty())
+    {
+        /// Here we check that zk root exists.
+        /// This check is clumsy. The reason is we do this request under common mutex, and never want to hung here.
+        /// Otherwise, all threads which need zk will wait for this mutex eternally.
+        ///
+        /// Usually, this was possible in case of memory limit exception happened inside zk implementation.
+        /// This should not happen now, when memory tracker is disabled.
+        /// But let's keep it just in case (it is also easy to backport).
+        auto future = asyncExists("/");
+        auto res = future.wait_for(std::chrono::milliseconds(operation_timeout_ms));
+        if (res != std::future_status::ready)
+            throw KeeperException("Cannot check if zookeeper root exists.", Coordination::Error::ZOPERATIONTIMEOUT);
+
+        auto code = future.get().error;
+        if (!(code == Coordination::Error::ZOK || code == Coordination::Error::ZNONODE))
+            throw KeeperException(code, "/");
+
+        if (code == Coordination::Error::ZNONODE)
+            throw KeeperException("ZooKeeper root doesn't exist. You should create root node " + chroot + " before start.", Coordination::Error::ZNONODE);
+    }
 }
 
 ZooKeeper::ZooKeeper(const std::string & hosts_string, const std::string & identity_, int32_t session_timeout_ms_,
@@ -250,7 +269,7 @@ Coordination::Error ZooKeeper::getChildrenImpl(const std::string & path, Strings
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::List), path));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -311,7 +330,7 @@ Coordination::Error ZooKeeper::createImpl(const std::string & path, const std::s
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::Create), path));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -381,7 +400,7 @@ Coordination::Error ZooKeeper::removeImpl(const std::string & path, int32_t vers
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::Remove), path));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -413,7 +432,7 @@ Coordination::Error ZooKeeper::existsImpl(const std::string & path, Coordination
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::Exists), path));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -447,7 +466,7 @@ Coordination::Error ZooKeeper::getImpl(const std::string & path, std::string & r
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::Get), path));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -520,7 +539,7 @@ Coordination::Error ZooKeeper::setImpl(const std::string & path, const std::stri
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::Set), path));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -572,7 +591,7 @@ Coordination::Error ZooKeeper::multiImpl(const Coordination::Requests & requests
 
     if (future_result.wait_for(std::chrono::milliseconds(operation_timeout_ms)) != std::future_status::ready)
     {
-        impl->finalize();
+        impl->finalize(fmt::format("Operation timeout on {} {}", toString(Coordination::OpNum::Multi), requests[0]->getPath()));
         return Coordination::Error::ZOPERATIONTIMEOUT;
     }
     else
@@ -711,7 +730,10 @@ bool ZooKeeper::waitForDisappear(const std::string & path, const WaitCondition &
         }
     };
 
-    while (!condition || !condition())
+    /// do-while control structure to allow using this function in non-blocking
+    /// fashion with a wait condition which returns false by the time this
+    /// method is called.
+    do
     {
         /// Use getData insteand of exists to avoid watch leak.
         impl->get(path, callback, watch);
@@ -727,7 +749,8 @@ bool ZooKeeper::waitForDisappear(const std::string & path, const WaitCondition &
 
         if (state->event_type == Coordination::DELETED)
             return true;
-    }
+    } while (!condition || !condition());
+
     return false;
 }
 
@@ -1019,9 +1042,9 @@ Coordination::Error ZooKeeper::tryMultiNoThrow(const Coordination::Requests & re
     }
 }
 
-void ZooKeeper::finalize()
+void ZooKeeper::finalize(const String & reason)
 {
-    impl->finalize();
+    impl->finalize(reason);
 }
 
 void ZooKeeper::setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_)
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index bfbfea03aae..8e015b1f331 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -7,9 +7,10 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/Stopwatch.h>
 #include <Common/ZooKeeper/IKeeper.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
 #include <unistd.h>
@@ -273,10 +274,12 @@ public:
     /// * The node doesn't exist
     FutureGet asyncTryGet(const std::string & path);
 
-    void finalize();
+    void finalize(const String & reason);
 
     void setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_);
 
+    UInt32 getSessionUptime() const { return session_uptime.elapsedSeconds(); }
+
 private:
     friend class EphemeralNodeHolder;
 
@@ -307,6 +310,8 @@ private:
 
     Poco::Logger * log = nullptr;
     std::shared_ptr<DB::ZooKeeperLog> zk_log;
+
+    AtomicStopwatch session_uptime;
 };
 
 
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index f96d29d3290..bc8fe0fe365 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <array>
 
 
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 16190aa25d3..a51ca9a487e 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -30,6 +30,8 @@ struct ZooKeeperResponse : virtual Response
     XID xid = 0;
     int64_t zxid = 0;
 
+    ZooKeeperResponse() = default;
+    ZooKeeperResponse(const ZooKeeperResponse &) = default;
     virtual ~ZooKeeperResponse() override = default;
     virtual void readImpl(ReadBuffer &) = 0;
     virtual void writeImpl(WriteBuffer &) const = 0;
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index 5f15a3b8b75..09b2548f2f4 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -7,11 +7,9 @@
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #    include <Poco/Net/SecureStreamSocket.h>
@@ -289,7 +287,7 @@ ZooKeeper::~ZooKeeper()
 {
     try
     {
-        finalize(false, false);
+        finalize(false, false, "Destructor called");
 
         if (send_thread.joinable())
             send_thread.join();
@@ -299,7 +297,7 @@ ZooKeeper::~ZooKeeper()
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        tryLogCurrentException(log);
     }
 }
 
@@ -317,6 +315,7 @@ ZooKeeper::ZooKeeper(
     session_timeout(session_timeout_),
     operation_timeout(std::min(operation_timeout_, session_timeout_))
 {
+    log = &Poco::Logger::get("ZooKeeperClient");
     std::atomic_store(&zk_log, std::move(zk_log_));
 
     if (!root_path.empty())
@@ -387,6 +386,7 @@ void ZooKeeper::connect(
                 }
 
                 socket.connect(node.address, connection_timeout);
+                socket_address = socket.peerAddress();
 
                 socket.setReceiveTimeout(operation_timeout);
                 socket.setSendTimeout(operation_timeout);
@@ -449,6 +449,10 @@ void ZooKeeper::connect(
         message << fail_reasons.str() << "\n";
         throw Exception(message.str(), Error::ZCONNECTIONLOSS);
     }
+    else
+    {
+        LOG_TEST(log, "Connected to ZooKeeper at {} with session_id {}", socket.peerAddress().toString(), session_id);
+    }
 }
 
 
@@ -539,7 +543,7 @@ void ZooKeeper::sendThread()
 
     try
     {
-        while (!expired)
+        while (!requests_queue.isFinished())
         {
             auto prev_bytes_sent = out->count();
 
@@ -571,7 +575,7 @@ void ZooKeeper::sendThread()
                         info.request->has_watch = true;
                     }
 
-                    if (expired)
+                    if (requests_queue.isFinished())
                     {
                         break;
                     }
@@ -603,8 +607,8 @@ void ZooKeeper::sendThread()
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        finalize(true, false);
+        tryLogCurrentException(log);
+        finalize(true, false, "Exception in sendThread");
     }
 }
 
@@ -616,7 +620,7 @@ void ZooKeeper::receiveThread()
     try
     {
         Int64 waited = 0;
-        while (!expired)
+        while (!requests_queue.isFinished())
         {
             auto prev_bytes_received = in->count();
 
@@ -639,7 +643,7 @@ void ZooKeeper::receiveThread()
 
             if (in->poll(max_wait))
             {
-                if (expired)
+                if (requests_queue.isFinished())
                     break;
 
                 receiveEvent();
@@ -662,8 +666,8 @@ void ZooKeeper::receiveThread()
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-        finalize(false, true);
+        tryLogCurrentException(log);
+        finalize(false, true, "Exception in receiveThread");
     }
 }
 
@@ -798,7 +802,7 @@ void ZooKeeper::receiveEvent()
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        tryLogCurrentException(log);
 
         /// Unrecoverable. Don't leave incorrect state in memory.
         if (!response)
@@ -818,7 +822,7 @@ void ZooKeeper::receiveEvent()
         catch (...)
         {
             /// Throw initial exception, not exception from callback.
-            tryLogCurrentException(__PRETTY_FUNCTION__);
+            tryLogCurrentException(log);
         }
 
         throw;
@@ -831,20 +835,23 @@ void ZooKeeper::receiveEvent()
 }
 
 
-void ZooKeeper::finalize(bool error_send, bool error_receive)
+void ZooKeeper::finalize(bool error_send, bool error_receive, const String & reason)
 {
     /// If some thread (send/receive) already finalizing session don't try to do it
-    if (finalization_started.exchange(true))
+    bool already_started = finalization_started.exchange(true);
+
+    LOG_TEST(log, "Finalizing session {}: finalization_started={}, queue_finished={}, reason={}",
+             session_id, already_started, requests_queue.isFinished(), reason);
+
+    if (already_started)
         return;
 
     auto expire_session_if_not_expired = [&]
     {
-        std::lock_guard lock(push_request_mutex);
-        if (!expired)
-        {
-            expired = true;
+        /// No new requests will appear in queue after finish()
+        bool was_already_finished = requests_queue.finish();
+        if (!was_already_finished)
             active_session_metric_increment.destroy();
-        }
     };
 
     try
@@ -861,7 +868,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
                 /// This happens for example, when "Cannot push request to queue within operation timeout".
                 /// Just mark session expired in case of error on close request, otherwise sendThread may not stop.
                 expire_session_if_not_expired();
-                tryLogCurrentException(__PRETTY_FUNCTION__);
+                tryLogCurrentException(log);
             }
 
             /// Send thread will exit after sending close request or on expired flag
@@ -880,7 +887,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
         catch (...)
         {
             /// We must continue to execute all callbacks, because the user is waiting for them.
-            tryLogCurrentException(__PRETTY_FUNCTION__);
+            tryLogCurrentException(log);
         }
 
         if (!error_receive && receive_thread.joinable())
@@ -909,7 +916,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
                     catch (...)
                     {
                         /// We must continue to all other callbacks, because the user is waiting for them.
-                        tryLogCurrentException(__PRETTY_FUNCTION__);
+                        tryLogCurrentException(log);
                     }
                 }
             }
@@ -940,7 +947,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
                         }
                         catch (...)
                         {
-                            tryLogCurrentException(__PRETTY_FUNCTION__);
+                            tryLogCurrentException(log);
                         }
                     }
                 }
@@ -968,7 +975,7 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
                     }
                     catch (...)
                     {
-                        tryLogCurrentException(__PRETTY_FUNCTION__);
+                        tryLogCurrentException(log);
                     }
                 }
             }
@@ -984,14 +991,14 @@ void ZooKeeper::finalize(bool error_send, bool error_receive)
                 }
                 catch (...)
                 {
-                    tryLogCurrentException(__PRETTY_FUNCTION__);
+                    tryLogCurrentException(log);
                 }
             }
         }
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
+        tryLogCurrentException(log);
     }
 }
 
@@ -1017,21 +1024,17 @@ void ZooKeeper::pushRequest(RequestInfo && info)
             }
         }
 
-        /// We must serialize 'pushRequest' and 'finalize' (from sendThread, receiveThread) calls
-        ///  to avoid forgotten operations in the queue when session is expired.
-        /// Invariant: when expired, no new operations will be pushed to the queue in 'pushRequest'
-        ///  and the queue will be drained in 'finalize'.
-        std::lock_guard lock(push_request_mutex);
-
-        if (expired)
-            throw Exception("Session expired", Error::ZSESSIONEXPIRED);
-
         if (!requests_queue.tryPush(std::move(info), operation_timeout.totalMilliseconds()))
+        {
+            if (requests_queue.isFinished())
+                throw Exception("Session expired", Error::ZSESSIONEXPIRED);
+
             throw Exception("Cannot push request to queue within operation timeout", Error::ZOPERATIONTIMEOUT);
+        }
     }
     catch (...)
     {
-        finalize(false, false);
+        finalize(false, false, getCurrentExceptionMessage(false, false, false));
         throw;
     }
 
@@ -1255,7 +1258,7 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const
     {
         elem.type = log_type;
         elem.event_time = event_time;
-        elem.address = socket.peerAddress();
+        elem.address = socket_address;
         elem.session_id = session_id;
         maybe_zk_log->add(elem);
     }
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index 8f0f64ceafa..b87469bd339 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ThreadPool.h>
@@ -121,7 +121,7 @@ public:
 
 
     /// If expired, you can only destroy the object. All other methods will throw exception.
-    bool isExpired() const override { return expired; }
+    bool isExpired() const override { return requests_queue.isFinished(); }
 
     /// Useful to check owner of ephemeral node.
     int64_t getSessionID() const override { return session_id; }
@@ -187,7 +187,7 @@ public:
     /// it will do read in another session, that read may not see the
     /// already performed write.
 
-    void finalize()  override { finalize(false, false); }
+    void finalize(const String & reason)  override { finalize(false, false, reason); }
 
     void setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_);
 
@@ -199,17 +199,17 @@ private:
     Poco::Timespan operation_timeout;
 
     Poco::Net::StreamSocket socket;
+    /// To avoid excessive getpeername(2) calls.
+    Poco::Net::SocketAddress socket_address;
     std::optional<ReadBufferFromPocoSocket> in;
     std::optional<WriteBufferFromPocoSocket> out;
 
     int64_t session_id = 0;
 
     std::atomic<XID> next_xid {1};
-    std::atomic<bool> expired {false};
     /// Mark session finalization start. Used to avoid simultaneous
     /// finalization from different threads. One-shot flag.
     std::atomic<bool> finalization_started {false};
-    std::mutex push_request_mutex;
 
     using clock = std::chrono::steady_clock;
 
@@ -223,7 +223,7 @@ private:
 
     using RequestsQueue = ConcurrentBoundedQueue<RequestInfo>;
 
-    RequestsQueue requests_queue{1};
+    RequestsQueue requests_queue{1024};
     void pushRequest(RequestInfo && info);
 
     using Operations = std::map<XID, RequestInfo>;
@@ -240,6 +240,8 @@ private:
     ThreadFromGlobalPool send_thread;
     ThreadFromGlobalPool receive_thread;
 
+    Poco::Logger * log;
+
     void connect(
         const Nodes & node,
         Poco::Timespan connection_timeout);
@@ -257,7 +259,7 @@ private:
     void close();
 
     /// Call all remaining callbacks and watches, passing errors to them.
-    void finalize(bool error_send, bool error_receive);
+    void finalize(bool error_send, bool error_receive, const String & reason);
 
     template <typename T>
     void write(const T &);
diff --git a/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp b/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
index 5f1487da9a2..cd0f9f024fd 100644
--- a/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
+++ b/src/Common/ZooKeeper/examples/zkutil_test_commands_new_lib.cpp
@@ -5,7 +5,7 @@
 #include <Common/ZooKeeper/ZooKeeperImpl.h>
 #include <Common/typeid_cast.h>
 #include <iostream>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 using namespace Coordination;
diff --git a/src/Common/assert_cast.h b/src/Common/assert_cast.h
index b70068b8e81..c7a3db478df 100644
--- a/src/Common/assert_cast.h
+++ b/src/Common/assert_cast.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include <Common/Exception.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 
 namespace DB
diff --git a/src/Common/checkStackSize.cpp b/src/Common/checkStackSize.cpp
index f8b13cd8ca2..f1b56ac83a3 100644
--- a/src/Common/checkStackSize.cpp
+++ b/src/Common/checkStackSize.cpp
@@ -1,6 +1,7 @@
 #include <Common/checkStackSize.h>
 #include <Common/Exception.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
+#include <base/defines.h> /// THREAD_SANITIZER
 #include <pthread.h>
 #include <cstdint>
 
@@ -86,15 +87,24 @@ __attribute__((__weak__)) void checkStackSize()
     uintptr_t int_frame_address = reinterpret_cast<uintptr_t>(frame_address);
     uintptr_t int_stack_address = reinterpret_cast<uintptr_t>(stack_address);
 
+#if !defined(THREAD_SANITIZER)
+    /// It's overkill to use more then half of stack.
+    static constexpr double STACK_SIZE_FREE_RATIO = 0.5;
+#else
+    /// Under TSan recursion eats too much RAM, so half of stack is too much.
+    /// So under TSan only 5% of a stack is allowed (this is ~400K)
+    static constexpr double STACK_SIZE_FREE_RATIO = 0.05;
+#endif
+
     /// We assume that stack grows towards lower addresses. And that it starts to grow from the end of a chunk of memory of max_stack_size.
     if (int_frame_address > int_stack_address + max_stack_size)
         throw Exception("Logical error: frame address is greater than stack begin address", ErrorCodes::LOGICAL_ERROR);
 
     size_t stack_size = int_stack_address + max_stack_size - int_frame_address;
+    size_t max_stack_size_allowed = max_stack_size * STACK_SIZE_FREE_RATIO;
 
-    /// Just check if we have already eat more than a half of stack size. It's a bit overkill (a half of stack size is wasted).
-    /// It's safe to assume that overflow in multiplying by two cannot occur.
-    if (stack_size * 2 > max_stack_size)
+    /// Just check if we have eat more than a STACK_SIZE_FREE_RATIO of stack size already.
+    if (stack_size > max_stack_size_allowed)
     {
         throw Exception(ErrorCodes::TOO_DEEP_RECURSION,
                         "Stack size too large. Stack address: {}, frame address: {}, stack size: {}, maximum stack size: {}",
diff --git a/src/Common/clickhouse_malloc.cpp b/src/Common/clickhouse_malloc.cpp
new file mode 100644
index 00000000000..3f69ebdf58d
--- /dev/null
+++ b/src/Common/clickhouse_malloc.cpp
@@ -0,0 +1,55 @@
+#include <Common/memory.h>
+#include <cstdlib>
+
+
+/** These functions can be substituted instead of regular ones when memory tracking is needed.
+  */
+
+extern "C" void * clickhouse_malloc(size_t size)
+{
+    void * res = malloc(size);
+    if (res)
+        Memory::trackMemory(size);
+    return res;
+}
+
+extern "C" void * clickhouse_calloc(size_t number_of_members, size_t size)
+{
+    void * res = calloc(number_of_members, size);
+    if (res)
+        Memory::trackMemory(number_of_members * size);
+    return res;
+}
+
+extern "C" void * clickhouse_realloc(void * ptr, size_t size)
+{
+    if (ptr)
+        Memory::untrackMemory(ptr);
+    void * res = realloc(ptr, size);
+    if (res)
+        Memory::trackMemory(size);
+    return res;
+}
+
+extern "C" void * clickhouse_reallocarray(void * ptr, size_t number_of_members, size_t size)
+{
+    size_t real_size = 0;
+    if (__builtin_mul_overflow(number_of_members, size, &real_size))
+        return nullptr;
+
+    return clickhouse_realloc(ptr, real_size);
+}
+
+extern "C" void clickhouse_free(void * ptr)
+{
+    Memory::untrackMemory(ptr);
+    free(ptr);
+}
+
+extern "C" int clickhouse_posix_memalign(void ** memptr, size_t alignment, size_t size)
+{
+    int res = posix_memalign(memptr, alignment, size);
+    if (res == 0)
+        Memory::trackMemory(size);
+    return res;
+}
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index 0665b1717ed..bf118e2507f 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -19,3 +19,4 @@
 #cmakedefine01 USE_DATASKETCHES
 #cmakedefine01 USE_YAML_CPP
 #cmakedefine01 CLICKHOUSE_SPLIT_BINARY
+#cmakedefine01 USE_BZIP2
diff --git a/src/Common/createHardLink.h b/src/Common/createHardLink.h
index c2b01cf817b..46ddeaf2830 100644
--- a/src/Common/createHardLink.h
+++ b/src/Common/createHardLink.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Common/examples/CMakeLists.txt b/src/Common/examples/CMakeLists.txt
index b154d5965ca..020f3cc4446 100644
--- a/src/Common/examples/CMakeLists.txt
+++ b/src/Common/examples/CMakeLists.txt
@@ -19,9 +19,6 @@ target_link_libraries (parallel_aggregation2 PRIVATE dbms)
 add_executable (int_hashes_perf int_hashes_perf.cpp)
 target_link_libraries (int_hashes_perf PRIVATE clickhouse_common_io)
 
-add_executable (simple_cache simple_cache.cpp)
-target_link_libraries (simple_cache PRIVATE common)
-
 add_executable (compact_array compact_array.cpp)
 target_link_libraries (compact_array PRIVATE clickhouse_common_io)
 
@@ -81,7 +78,5 @@ target_link_libraries (average PRIVATE clickhouse_common_io)
 add_executable (shell_command_inout shell_command_inout.cpp)
 target_link_libraries (shell_command_inout PRIVATE clickhouse_common_io)
 
-if (ENABLE_FUZZING)
-    add_executable(YAML_fuzzer YAML_fuzzer.cpp ${SRCS})
-    target_link_libraries(YAML_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
-endif ()
+add_executable (executable_udf executable_udf.cpp)
+target_link_libraries (executable_udf PRIVATE dbms)
diff --git a/src/Common/examples/YAML_fuzzer.cpp b/src/Common/examples/YAML_fuzzer.cpp
deleted file mode 100644
index f4b570e0e0a..00000000000
--- a/src/Common/examples/YAML_fuzzer.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <cstdio>
-#include <time.h>
-#include <filesystem>
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
-{
-    /// How to test:
-    /// build ClickHouse with YAML_fuzzer.cpp
-    /// ./YAML_fuzzer YAML_CORPUS
-    /// where YAML_CORPUS is a directory with different YAML configs for libfuzzer
-    char file_name[L_tmpnam];
-    if (!std::tmpnam(file_name))
-    {
-        std::cerr << "Cannot create temp file!\n";
-        return 1;
-    }
-    std::string input = std::string(reinterpret_cast<const char*>(data), size);
-    DB::YAMLParser parser;
-
-    {
-        std::ofstream temp_file(file_name);
-        temp_file << input;
-    }
-
-    try
-    {
-        DB::YAMLParser::parse(std::string(file_name));
-    }
-    catch (...)
-    {
-        std::cerr << "YAML_fuzzer failed: " << getCurrentExceptionMessage() << std::endl;
-        return 1;
-    }
-    return 0;
-}
-
diff --git a/src/Common/examples/arena_with_free_lists.cpp b/src/Common/examples/arena_with_free_lists.cpp
index dc830fdb89c..5997a9ff4b0 100644
--- a/src/Common/examples/arena_with_free_lists.cpp
+++ b/src/Common/examples/arena_with_free_lists.cpp
@@ -12,10 +12,10 @@
 #include <memory>
 #include <array>
 #include <sys/resource.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
-#include <common/StringRef.h>
-#include <common/arraySize.h>
+#include <base/StringRef.h>
+#include <base/arraySize.h>
 #include <Common/Arena.h>
 #include <Core/Field.h>
 #include <Common/Stopwatch.h>
diff --git a/src/Common/examples/average.cpp b/src/Common/examples/average.cpp
index efe78212f06..5a42d8c5020 100644
--- a/src/Common/examples/average.cpp
+++ b/src/Common/examples/average.cpp
@@ -3,7 +3,7 @@
 
 #include <fmt/format.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/Arena.h>
diff --git a/src/Common/examples/chaos_sanitizer.cpp b/src/Common/examples/chaos_sanitizer.cpp
index 05bf16e3638..0b7d21aa33e 100644
--- a/src/Common/examples/chaos_sanitizer.cpp
+++ b/src/Common/examples/chaos_sanitizer.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <atomic>
 
-#include <common/sleep.h>
+#include <base/sleep.h>
 
 #include <IO/ReadHelpers.h>
 
diff --git a/src/Common/examples/executable_udf.cpp b/src/Common/examples/executable_udf.cpp
new file mode 100644
index 00000000000..8d2d9f7314e
--- /dev/null
+++ b/src/Common/examples/executable_udf.cpp
@@ -0,0 +1,46 @@
+#include <vector>
+#include <string>
+#include <iomanip>
+
+#include <Common/SipHash.h>
+
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/Stopwatch.h>
+
+using namespace DB;
+
+int main(int argc, char **argv)
+{
+    (void)(argc);
+    (void)(argv);
+
+    std::string buffer;
+
+    ReadBufferFromFileDescriptor read_buffer(0);
+    WriteBufferFromFileDescriptor write_buffer(1);
+    size_t rows = 0;
+    char dummy;
+
+    while (!read_buffer.eof())
+    {
+        readIntText(rows, read_buffer);
+        readChar(dummy, read_buffer);
+
+        for (size_t i = 0; i < rows; ++i)
+        {
+            readString(buffer, read_buffer);
+            readChar(dummy, read_buffer);
+
+            writeString("Key ", write_buffer);
+            writeString(buffer, write_buffer);
+            writeChar('\n', write_buffer);
+        }
+
+        write_buffer.next();
+    }
+
+    return 0;
+}
diff --git a/src/Common/examples/int_hashes_perf.cpp b/src/Common/examples/int_hashes_perf.cpp
index 8a32f8f536e..0fe0141ba1a 100644
--- a/src/Common/examples/int_hashes_perf.cpp
+++ b/src/Common/examples/int_hashes_perf.cpp
@@ -1,3 +1,7 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #if defined (OS_LINUX)
 #   include <sched.h>
 #endif
diff --git a/src/Common/examples/integer_hash_tables_and_hashes.cpp b/src/Common/examples/integer_hash_tables_and_hashes.cpp
index 12f4ed450bf..0e9390ab3ac 100644
--- a/src/Common/examples/integer_hash_tables_and_hashes.cpp
+++ b/src/Common/examples/integer_hash_tables_and_hashes.cpp
@@ -13,7 +13,7 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 //#define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Common/examples/integer_hash_tables_benchmark.cpp b/src/Common/examples/integer_hash_tables_benchmark.cpp
index f81add6d6cb..8fbf8797c4e 100644
--- a/src/Common/examples/integer_hash_tables_benchmark.cpp
+++ b/src/Common/examples/integer_hash_tables_benchmark.cpp
@@ -10,7 +10,7 @@
 
 #include <Common/Stopwatch.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Common/examples/radix_sort.cpp b/src/Common/examples/radix_sort.cpp
index 0fb3c904466..ababfe5422a 100644
--- a/src/Common/examples/radix_sort.cpp
+++ b/src/Common/examples/radix_sort.cpp
@@ -1,6 +1,6 @@
 #include <iomanip>
 #include <pcg_random.hpp>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 //#if defined(NDEBUG)
 //#undef NDEBUG
diff --git a/src/Common/examples/simple_cache.cpp b/src/Common/examples/simple_cache.cpp
deleted file mode 100644
index 8fe18c5594c..00000000000
--- a/src/Common/examples/simple_cache.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <iostream>
-#include <common/SimpleCache.h>
-
-
-static int func(int x, int y)
-{
-    std::cerr << x << " + " << y << "\n";
-    return x + y;
-}
-
-
-int main(int, char **)
-{
-    SimpleCache<decltype(func), &func> func_cached;
-
-    std::cerr << func_cached(1, 2) << "\n";
-    std::cerr << func_cached(1, 2) << "\n";
-    std::cerr << func_cached(1, 2) << "\n";
-    std::cerr << func_cached(3, 4) << "\n";
-    std::cerr << func_cached(3, 4) << "\n";
-    std::cerr << func_cached(3, 4) << "\n";
-}
diff --git a/src/Common/examples/space_saving.cpp b/src/Common/examples/space_saving.cpp
index df336c8b773..e765d1c98b4 100644
--- a/src/Common/examples/space_saving.cpp
+++ b/src/Common/examples/space_saving.cpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include <Common/SpaceSaving.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 int main(int, char **)
 {
diff --git a/src/Common/examples/symbol_index.cpp b/src/Common/examples/symbol_index.cpp
index 496fa7dc3fe..5c0896be2a8 100644
--- a/src/Common/examples/symbol_index.cpp
+++ b/src/Common/examples/symbol_index.cpp
@@ -2,7 +2,7 @@
 #include <Common/Elf.h>
 #include <Common/Dwarf.h>
 #include <Core/Defines.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <iostream>
 #include <dlfcn.h>
 
diff --git a/src/Common/filesystemHelpers.cpp b/src/Common/filesystemHelpers.cpp
index 4855500b776..f9fe8c97a14 100644
--- a/src/Common/filesystemHelpers.cpp
+++ b/src/Common/filesystemHelpers.cpp
@@ -113,13 +113,23 @@ String getFilesystemName([[maybe_unused]] const String & mount_point)
 
 bool pathStartsWith(const std::filesystem::path & path, const std::filesystem::path & prefix_path)
 {
-    auto absolute_path = std::filesystem::weakly_canonical(path);
-    auto absolute_prefix_path = std::filesystem::weakly_canonical(prefix_path);
+    String absolute_path = std::filesystem::weakly_canonical(path);
+    String absolute_prefix_path = std::filesystem::weakly_canonical(prefix_path);
+    return absolute_path.starts_with(absolute_prefix_path);
+}
 
-    auto [_, prefix_path_mismatch_it] = std::mismatch(absolute_path.begin(), absolute_path.end(), absolute_prefix_path.begin(), absolute_prefix_path.end());
+bool fileOrSymlinkPathStartsWith(const std::filesystem::path & path, const std::filesystem::path & prefix_path)
+{
+    /// Differs from pathStartsWith in how `path` is normalized before comparison.
+    /// Make `path` absolute if it was relative and put it into normalized form: remove
+    /// `.` and `..` and extra `/`. Path is not canonized because otherwise path will
+    /// not be a path of a symlink itself.
 
-    bool path_starts_with_prefix_path = (prefix_path_mismatch_it == absolute_prefix_path.end());
-    return path_starts_with_prefix_path;
+    String absolute_path = std::filesystem::absolute(path);
+    absolute_path = fs::path(absolute_path).lexically_normal(); /// Normalize path.
+    String absolute_prefix_path = std::filesystem::absolute(prefix_path);
+    absolute_prefix_path = fs::path(absolute_prefix_path).lexically_normal(); /// Normalize path.
+    return absolute_path.starts_with(absolute_prefix_path);
 }
 
 bool pathStartsWith(const String & path, const String & prefix_path)
@@ -130,6 +140,14 @@ bool pathStartsWith(const String & path, const String & prefix_path)
     return pathStartsWith(filesystem_path, filesystem_prefix_path);
 }
 
+bool fileOrSymlinkPathStartsWith(const String & path, const String & prefix_path)
+{
+    auto filesystem_path = std::filesystem::path(path);
+    auto filesystem_prefix_path = std::filesystem::path(prefix_path);
+
+    return fileOrSymlinkPathStartsWith(filesystem_path, filesystem_prefix_path);
+}
+
 }
 
 
diff --git a/src/Common/filesystemHelpers.h b/src/Common/filesystemHelpers.h
index b7525a64fae..fc3a4f15573 100644
--- a/src/Common/filesystemHelpers.h
+++ b/src/Common/filesystemHelpers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 #include <filesystem>
@@ -35,6 +35,10 @@ bool pathStartsWith(const std::filesystem::path & path, const std::filesystem::p
 /// Returns true if path starts with prefix path
 bool pathStartsWith(const String & path, const String & prefix_path);
 
+/// Same as pathStartsWith, but without canonization, i.e. allowed to check symlinks.
+/// (Path is made absolute and normalized.)
+bool fileOrSymlinkPathStartsWith(const String & path, const String & prefix_path);
+
 }
 
 namespace FS
diff --git a/src/Common/formatIPv6.cpp b/src/Common/formatIPv6.cpp
index cffdc425237..f23e3f1ba99 100644
--- a/src/Common/formatIPv6.cpp
+++ b/src/Common/formatIPv6.cpp
@@ -2,7 +2,7 @@
 #include <Common/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 
-#include <common/range.h>
+#include <base/range.h>
 #include <array>
 #include <algorithm>
 
diff --git a/src/Common/formatIPv6.h b/src/Common/formatIPv6.h
index bb8acd6d17a..1a65adae55b 100644
--- a/src/Common/formatIPv6.h
+++ b/src/Common/formatIPv6.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <string.h>
 #include <algorithm>
 #include <utility>
-#include <common/range.h>
+#include <base/range.h>
 #include <Common/hex.h>
 #include <Common/StringUtils/StringUtils.h>
 
diff --git a/src/Common/hex.h b/src/Common/hex.h
index 82eff776244..aae53bef766 100644
--- a/src/Common/hex.h
+++ b/src/Common/hex.h
@@ -21,7 +21,7 @@ inline char hexDigitLowercase(unsigned char c)
 #include <cstring>
 #include <cstddef>
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 /// Maps 0..255 to 00..FF or 00..ff correspondingly
diff --git a/src/Common/intExp.h b/src/Common/intExp.h
index b2d704e58b2..3529990ef3b 100644
--- a/src/Common/intExp.h
+++ b/src/Common/intExp.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <limits>
 
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 
 // Also defined in Core/Defines.h
 #if !defined(NO_SANITIZE_UNDEFINED)
diff --git a/src/Common/isLocalAddress.cpp b/src/Common/isLocalAddress.cpp
index 9e22c58f94c..d79e4cebd15 100644
--- a/src/Common/isLocalAddress.cpp
+++ b/src/Common/isLocalAddress.cpp
@@ -3,7 +3,7 @@
 #include <ifaddrs.h>
 #include <cstring>
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
diff --git a/src/Common/isLocalAddress.h b/src/Common/isLocalAddress.h
index 3d0db2d9550..42977775b09 100644
--- a/src/Common/isLocalAddress.h
+++ b/src/Common/isLocalAddress.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Net/IPAddress.h>
 
 
diff --git a/src/Common/isValidUTF8.cpp b/src/Common/isValidUTF8.cpp
new file mode 100644
index 00000000000..f9589e3730b
--- /dev/null
+++ b/src/Common/isValidUTF8.cpp
@@ -0,0 +1,131 @@
+#include <Common/isValidUTF8.h>
+#include <cstring>
+
+/// inspired by https://github.com/cyb70289/utf8/
+
+/*
+MIT License
+
+Copyright (c) 2019 Yibo Cai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/*
+* http://www.unicode.org/versions/Unicode6.0.0/ch03.pdf - page 94
+*
+* Table 3-7. Well-Formed UTF-8 Byte Sequences
+*
+* +--------------------+------------+-------------+------------+-------------+
+* | Code Points        | First Byte | Second Byte | Third Byte | Fourth Byte |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+0000..U+007F     | 00..7F     |             |            |             |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+0080..U+07FF     | C2..DF     | 80..BF      |            |             |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+0800..U+0FFF     | E0         | A0..BF      | 80..BF     |             |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+1000..U+CFFF     | E1..EC     | 80..BF      | 80..BF     |             |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+D000..U+D7FF     | ED         | 80..9F      | 80..BF     |             |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+E000..U+FFFF     | EE..EF     | 80..BF      | 80..BF     |             |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+10000..U+3FFFF   | F0         | 90..BF      | 80..BF     | 80..BF      |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+40000..U+FFFFF   | F1..F3     | 80..BF      | 80..BF     | 80..BF      |
+* +--------------------+------------+-------------+------------+-------------+
+* | U+100000..U+10FFFF | F4         | 80..8F      | 80..BF     | 80..BF      |
+* +--------------------+------------+-------------+------------+-------------+
+*/
+namespace DB
+{
+
+namespace UTF8
+{
+
+UInt8 isValidUTF8(const UInt8 * data, UInt64 len)
+{
+    while (len)
+    {
+        int bytes;
+        const UInt8 byte1 = data[0];
+        /* 00..7F */
+        if (byte1 <= 0x7F)
+        {
+            bytes = 1;
+        }
+        /* C2..DF, 80..BF */
+        else if (len >= 2 && byte1 >= 0xC2 && byte1 <= 0xDF && static_cast<Int8>(data[1]) <= static_cast<Int8>(0xBF))
+        {
+            bytes = 2;
+        }
+        else if (len >= 3)
+        {
+            const UInt8 byte2 = data[1];
+            bool byte2_ok = static_cast<Int8>(byte2) <= static_cast<Int8>(0xBF);
+            bool byte3_ok = static_cast<Int8>(data[2]) <= static_cast<Int8>(0xBF);
+
+            if (byte2_ok && byte3_ok &&
+                /* E0, A0..BF, 80..BF */
+                ((byte1 == 0xE0 && byte2 >= 0xA0) ||
+                 /* E1..EC, 80..BF, 80..BF */
+                 (byte1 >= 0xE1 && byte1 <= 0xEC) ||
+                 /* ED, 80..9F, 80..BF */
+                 (byte1 == 0xED && byte2 <= 0x9F) ||
+                 /* EE..EF, 80..BF, 80..BF */
+                 (byte1 >= 0xEE && byte1 <= 0xEF)))
+            {
+                bytes = 3;
+            }
+            else if (len >= 4)
+            {
+                bool byte4_ok = static_cast<Int8>(data[3]) <= static_cast<Int8>(0xBF);
+                if (byte2_ok && byte3_ok && byte4_ok &&
+                    /* F0, 90..BF, 80..BF, 80..BF */
+                    ((byte1 == 0xF0 && byte2 >= 0x90) ||
+                     /* F1..F3, 80..BF, 80..BF, 80..BF */
+                     (byte1 >= 0xF1 && byte1 <= 0xF3) ||
+                     /* F4, 80..8F, 80..BF, 80..BF */
+                     (byte1 == 0xF4 && byte2 <= 0x8F)))
+                {
+                    bytes = 4;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            return false;
+        }
+        len -= bytes;
+        data += bytes;
+    }
+    return true;
+}
+
+}
+}
diff --git a/src/Common/isValidUTF8.h b/src/Common/isValidUTF8.h
new file mode 100644
index 00000000000..595c2eda0fa
--- /dev/null
+++ b/src/Common/isValidUTF8.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <base/types.h>
+
+namespace DB::UTF8
+{
+
+UInt8 isValidUTF8(const UInt8 * data, UInt64 len);
+
+}
diff --git a/src/Common/malloc.cpp b/src/Common/malloc.cpp
index ec472d5d1d6..88281d9c80e 100644
--- a/src/Common/malloc.cpp
+++ b/src/Common/malloc.cpp
@@ -17,7 +17,9 @@ extern "C"
     void *aligned_alloc(size_t alignment, size_t size);
     void *valloc(size_t size);
     void *memalign(size_t alignment, size_t size);
+#if !defined(USE_MUSL)
     void *pvalloc(size_t size);
+#endif
 }
 #pragma GCC diagnostic pop
 
@@ -39,6 +41,8 @@ static void dummyFunctionForInterposing()
     ignore(aligned_alloc(0, 0)); // -V575 NOLINT
     ignore(valloc(0)); // -V575 NOLINT
     ignore(memalign(0, 0)); // -V575 NOLINT
+#if !defined(USE_MUSL)
     ignore(pvalloc(0)); // -V575 NOLINT
+#endif
 }
 #endif
diff --git a/src/Common/memory.h b/src/Common/memory.h
new file mode 100644
index 00000000000..0dc163a54a1
--- /dev/null
+++ b/src/Common/memory.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <new>
+#include <base/defines.h>
+
+#include <Common/CurrentMemoryTracker.h>
+
+#if USE_JEMALLOC
+#    include <jemalloc/jemalloc.h>
+#endif
+
+#if !USE_JEMALLOC || JEMALLOC_VERSION_MAJOR < 4
+#    include <cstdlib>
+#endif
+
+
+namespace Memory
+{
+
+inline ALWAYS_INLINE void * newImpl(std::size_t size)
+{
+    auto * ptr = malloc(size);
+    if (likely(ptr != nullptr))
+        return ptr;
+
+    /// @note no std::get_new_handler logic implemented
+    throw std::bad_alloc{};
+}
+
+inline ALWAYS_INLINE void * newNoExept(std::size_t size) noexcept
+{
+    return malloc(size);
+}
+
+inline ALWAYS_INLINE void deleteImpl(void * ptr) noexcept
+{
+    free(ptr);
+}
+
+#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 4
+
+inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size) noexcept
+{
+    if (unlikely(ptr == nullptr))
+        return;
+
+    sdallocx(ptr, size, 0);
+}
+
+#else
+
+inline ALWAYS_INLINE void deleteSized(void * ptr, std::size_t size [[maybe_unused]]) noexcept
+{
+    free(ptr);
+}
+
+#endif
+
+#if defined(OS_LINUX)
+#   include <malloc.h>
+#elif defined(OS_DARWIN)
+#   include <malloc/malloc.h>
+#endif
+
+
+inline ALWAYS_INLINE size_t getActualAllocationSize(size_t size)
+{
+    size_t actual_size = size;
+
+#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 5
+    /// The nallocx() function allocates no memory, but it performs the same size computation as the mallocx() function
+    /// @note je_mallocx() != je_malloc(). It's expected they don't differ much in allocation logic.
+    if (likely(size != 0))
+        actual_size = nallocx(size, 0);
+#endif
+
+    return actual_size;
+}
+
+inline ALWAYS_INLINE void trackMemory(std::size_t size)
+{
+    std::size_t actual_size = getActualAllocationSize(size);
+    CurrentMemoryTracker::allocNoThrow(actual_size);
+}
+
+inline ALWAYS_INLINE void untrackMemory(void * ptr [[maybe_unused]], std::size_t size [[maybe_unused]] = 0) noexcept
+{
+    try
+    {
+#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 5
+        /// @note It's also possible to use je_malloc_usable_size() here.
+        if (likely(ptr != nullptr))
+            CurrentMemoryTracker::free(sallocx(ptr, 0));
+#else
+        if (size)
+            CurrentMemoryTracker::free(size);
+#    if defined(_GNU_SOURCE)
+        /// It's innaccurate resource free for sanitizers. malloc_usable_size() result is greater or equal to allocated size.
+        else
+            CurrentMemoryTracker::free(malloc_usable_size(ptr));
+#    endif
+#endif
+    }
+    catch (...)
+    {}
+}
+
+}
diff --git a/src/Common/new_delete.cpp b/src/Common/new_delete.cpp
index 56173fb108a..fa32d56b350 100644
--- a/src/Common/new_delete.cpp
+++ b/src/Common/new_delete.cpp
@@ -1,117 +1,34 @@
-#include <common/memory.h>
-#include <Common/CurrentMemoryTracker.h>
-
-#include <iostream>
+#include <Common/memory.h>
 #include <new>
 
-#if defined(OS_LINUX)
-#   include <malloc.h>
-#elif defined(OS_DARWIN)
-#   include <malloc/malloc.h>
-#endif
-
-#if defined(OS_DARWIN) && defined(BUNDLED_STATIC_JEMALLOC)
-extern "C"
-{
-extern void zone_register();
-}
-
-struct InitializeJemallocZoneAllocatorForOSX
-{
-    InitializeJemallocZoneAllocatorForOSX()
-    {
-        /// In case of OSX jemalloc register itself as a default zone allocator.
-        ///
-        /// But when you link statically then zone_register() will not be called,
-        /// and even will be optimized out:
-        ///
-        /// It is ok to call it twice (i.e. in case of shared libraries)
-        /// Since zone_register() is a no-op if the default zone is already replaced with something.
-        ///
-        /// https://github.com/jemalloc/jemalloc/issues/708
-        zone_register();
-    }
-} initializeJemallocZoneAllocatorForOSX;
-#endif
 
 /// Replace default new/delete with memory tracking versions.
 /// @sa https://en.cppreference.com/w/cpp/memory/new/operator_new
 ///     https://en.cppreference.com/w/cpp/memory/new/operator_delete
 
-namespace Memory
-{
-
-inline ALWAYS_INLINE size_t getActualAllocationSize(size_t size)
-{
-    size_t actual_size = size;
-
-#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 5
-    /// The nallocx() function allocates no memory, but it performs the same size computation as the mallocx() function
-    /// @note je_mallocx() != je_malloc(). It's expected they don't differ much in allocation logic.
-    if (likely(size != 0))
-        actual_size = nallocx(size, 0);
-#endif
-
-    return actual_size;
-}
-
-inline ALWAYS_INLINE void trackMemory(std::size_t size)
-{
-    std::size_t actual_size = getActualAllocationSize(size);
-    CurrentMemoryTracker::allocNoThrow(actual_size);
-}
-
-inline ALWAYS_INLINE void untrackMemory(void * ptr [[maybe_unused]], std::size_t size [[maybe_unused]] = 0) noexcept
-{
-    try
-    {
-#if USE_JEMALLOC && JEMALLOC_VERSION_MAJOR >= 5
-        /// @note It's also possible to use je_malloc_usable_size() here.
-        if (likely(ptr != nullptr))
-            CurrentMemoryTracker::free(sallocx(ptr, 0));
-#else
-        if (size)
-            CurrentMemoryTracker::free(size);
-#    if defined(_GNU_SOURCE)
-        /// It's innaccurate resource free for sanitizers. malloc_usable_size() result is greater or equal to allocated size.
-        else
-            CurrentMemoryTracker::free(malloc_usable_size(ptr));
-#    endif
-#endif
-    }
-    catch (...)
-    {}
-}
-
-}
-
 /// new
 
 void * operator new(std::size_t size)
 {
     Memory::trackMemory(size);
-
     return Memory::newImpl(size);
 }
 
 void * operator new[](std::size_t size)
 {
     Memory::trackMemory(size);
-
     return Memory::newImpl(size);
 }
 
 void * operator new(std::size_t size, const std::nothrow_t &) noexcept
 {
     Memory::trackMemory(size);
-
     return Memory::newNoExept(size);
 }
 
 void * operator new[](std::size_t size, const std::nothrow_t &) noexcept
 {
     Memory::trackMemory(size);
-
     return Memory::newNoExept(size);
 }
 
diff --git a/src/Common/parseAddress.cpp b/src/Common/parseAddress.cpp
index c99c08896ab..04e3bd27e14 100644
--- a/src/Common/parseAddress.cpp
+++ b/src/Common/parseAddress.cpp
@@ -1,7 +1,7 @@
 #include <Common/parseAddress.h>
 #include <Common/Exception.h>
 #include <IO/ReadHelpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
@@ -43,7 +43,7 @@ std::pair<std::string, UInt16> parseAddress(const std::string & str, UInt16 defa
 
         UInt16 port_number;
         ReadBufferFromMemory port_buf(port, end - port);
-        if (!tryReadText<UInt16>(port_number, port_buf) || !port_buf.eof())
+        if (!tryReadText(port_number, port_buf) || !port_buf.eof())
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Illegal port passed to function parseAddress: {}", port);
diff --git a/src/Common/parseAddress.h b/src/Common/parseAddress.h
index 602a9adc0b2..86340982c67 100644
--- a/src/Common/parseAddress.h
+++ b/src/Common/parseAddress.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <map>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index 477f5e0f250..7c8053037ea 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -2,7 +2,7 @@
 #include <Common/Exception.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Common/parseRemoteDescription.h b/src/Common/parseRemoteDescription.h
index f691a57dc73..eef8fbfefe4 100644
--- a/src/Common/parseRemoteDescription.h
+++ b/src/Common/parseRemoteDescription.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <vector>
 namespace DB
 {
diff --git a/src/Common/quoteString.cpp b/src/Common/quoteString.cpp
index 6fc928ff022..15901643f47 100644
--- a/src/Common/quoteString.cpp
+++ b/src/Common/quoteString.cpp
@@ -5,9 +5,9 @@
 
 namespace DB
 {
-String quoteString(const StringRef & x)
+String quoteString(std::string_view x)
 {
-    String res(x.size, '\0');
+    String res(x.size(), '\0');
     WriteBufferFromString wb(res);
     writeQuotedString(x, wb);
     return res;
diff --git a/src/Common/quoteString.h b/src/Common/quoteString.h
index 3d395a35b03..0364efbdf14 100644
--- a/src/Common/quoteString.h
+++ b/src/Common/quoteString.h
@@ -1,13 +1,19 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/StringRef.h>
+#include <base/types.h>
+#include <base/StringRef.h>
+#include <concepts>
 
 
 namespace DB
 {
-/// Quote the string.
-String quoteString(const StringRef & x);
+[[nodiscard]] String quoteString(std::string_view x);
+
+// Prefer string_view over StringRef for implicit conversions
+[[nodiscard]] inline String quoteString(std::same_as<StringRef> auto x)
+{
+    return quoteString(std::string_view{x.data, x.size});
+}
 
 /// Double quote the string.
 String doubleQuoteString(const StringRef & x);
diff --git a/src/Common/randomSeed.cpp b/src/Common/randomSeed.cpp
index ded224e56c3..74088d0a4f3 100644
--- a/src/Common/randomSeed.cpp
+++ b/src/Common/randomSeed.cpp
@@ -4,8 +4,8 @@
 #include <Common/Exception.h>
 #include <Common/randomSeed.h>
 #include <Common/SipHash.h>
-#include <common/getThreadId.h>
-#include <common/types.h>
+#include <base/getThreadId.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Common/randomSeed.h b/src/Common/randomSeed.h
index 4f04e4b974a..99b8a88f982 100644
--- a/src/Common/randomSeed.h
+++ b/src/Common/randomSeed.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <common/types.h>
+#include <base/types.h>
 
 /** Returns a number suitable as seed for PRNG. Use clock_gettime, pid and so on. */
 DB::UInt64 randomSeed();
diff --git a/src/Common/setThreadName.cpp b/src/Common/setThreadName.cpp
index 9e45c62a9c9..958404b9ad1 100644
--- a/src/Common/setThreadName.cpp
+++ b/src/Common/setThreadName.cpp
@@ -22,6 +22,10 @@ namespace ErrorCodes
 }
 
 
+/// Cache thread_name to avoid prctl(PR_GET_NAME) for query_log/text_log
+static thread_local std::string thread_name;
+
+
 void setThreadName(const char * name)
 {
 #ifndef NDEBUG
@@ -40,24 +44,29 @@ void setThreadName(const char * name)
     if (0 != prctl(PR_SET_NAME, name, 0, 0, 0))
 #endif
         DB::throwFromErrno("Cannot set thread name with prctl(PR_SET_NAME, ...)", DB::ErrorCodes::PTHREAD_ERROR);
+
+    thread_name = name;
 }
 
-std::string getThreadName()
+const std::string & getThreadName()
 {
-    std::string name(16, '\0');
+    if (!thread_name.empty())
+        return thread_name;
+
+    thread_name.resize(16);
 
 #if defined(__APPLE__) || defined(OS_SUNOS)
-    if (pthread_getname_np(pthread_self(), name.data(), name.size()))
+    if (pthread_getname_np(pthread_self(), thread_name.data(), thread_name.size()))
         throw DB::Exception("Cannot get thread name with pthread_getname_np()", DB::ErrorCodes::PTHREAD_ERROR);
 #elif defined(__FreeBSD__)
 // TODO: make test. freebsd will have this function soon https://freshbsd.org/commit/freebsd/r337983
-//    if (pthread_get_name_np(pthread_self(), name.data(), name.size()))
+//    if (pthread_get_name_np(pthread_self(), thread_name.data(), thread_name.size()))
 //        throw DB::Exception("Cannot get thread name with pthread_get_name_np()", DB::ErrorCodes::PTHREAD_ERROR);
 #else
-    if (0 != prctl(PR_GET_NAME, name.data(), 0, 0, 0))
+    if (0 != prctl(PR_GET_NAME, thread_name.data(), 0, 0, 0))
         DB::throwFromErrno("Cannot get thread name with prctl(PR_GET_NAME)", DB::ErrorCodes::PTHREAD_ERROR);
 #endif
 
-    name.resize(std::strlen(name.data()));
-    return name;
+    thread_name.resize(std::strlen(thread_name.data()));
+    return thread_name;
 }
diff --git a/src/Common/setThreadName.h b/src/Common/setThreadName.h
index cdcb6b46914..ea988885db2 100644
--- a/src/Common/setThreadName.h
+++ b/src/Common/setThreadName.h
@@ -7,4 +7,4 @@
   */
 void setThreadName(const char * name);
 
-std::string getThreadName();
+const std::string & getThreadName();
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
index 74fd7cb6149..a621f05c517 100644
--- a/src/Common/tests/gtest_DateLUTImpl.cpp
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -1,5 +1,5 @@
-#include <common/DateLUT.h>
-#include <common/DateLUTImpl.h>
+#include <base/DateLUT.h>
+#include <base/DateLUTImpl.h>
 
 #include <gtest/gtest.h>
 
diff --git a/src/Common/tests/gtest_cached_fn.cpp b/src/Common/tests/gtest_cached_fn.cpp
new file mode 100644
index 00000000000..ab15a1ee5e1
--- /dev/null
+++ b/src/Common/tests/gtest_cached_fn.cpp
@@ -0,0 +1,54 @@
+#include <gtest/gtest.h>
+#include <thread>
+#include <chrono>
+#include <base/CachedFn.h>
+
+using namespace std::chrono_literals;
+
+constexpr int add(int x, int y)
+{
+    return x + y;
+}
+
+int longFunction(int x, int y)
+{
+    std::this_thread::sleep_for(1s);
+    return x + y;
+}
+
+auto f = [](int x, int y) { return x - y; };
+
+TEST(CachedFn, Basic)
+{
+    CachedFn<&add> fn;
+
+    const int res = fn(1, 2);
+    EXPECT_EQ(fn(1, 2), res);
+
+    /// In GCC, lambda can't be placed in TEST, producing "<labmda> has no linkage".
+    /// Assuming http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4268.html,
+    /// this is a GCC bug.
+    CachedFn<+f> fn2;
+
+    const int res2 = fn2(1, 2);
+    EXPECT_EQ(fn2(1, 2), res2);
+}
+
+TEST(CachedFn, CachingResults)
+{
+    CachedFn<&longFunction> fn;
+
+    for (int x = 0; x < 2; ++x)
+    {
+        for (int y = 0; y < 2; ++y)
+        {
+            const int res = fn(x, y);
+            const time_t start = time(nullptr);
+
+            for (int count = 0; count < 1000; ++count)
+                EXPECT_EQ(fn(x, y), res);
+
+            EXPECT_LT(time(nullptr) - start, 10);
+        }
+    }
+}
diff --git a/src/Common/tests/gtest_find_symbols.cpp b/src/Common/tests/gtest_find_symbols.cpp
index 79a7ed032df..1daab982d01 100644
--- a/src/Common/tests/gtest_find_symbols.cpp
+++ b/src/Common/tests/gtest_find_symbols.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include <vector>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <gtest/gtest.h>
 
 
diff --git a/src/Common/tests/gtest_json_test.cpp b/src/Common/tests/gtest_json_test.cpp
index 726fb836030..fb2a7243965 100644
--- a/src/Common/tests/gtest_json_test.cpp
+++ b/src/Common/tests/gtest_json_test.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <exception>
 #include <string_view>
-#include <common/JSON.h>
+#include <base/JSON.h>
 
 #include <boost/range/irange.hpp>
 #include <gtest/gtest.h>
diff --git a/src/Common/tests/gtest_local_address.cpp b/src/Common/tests/gtest_local_address.cpp
index 7f1d2dfc1a7..a7191ef30ea 100644
--- a/src/Common/tests/gtest_local_address.cpp
+++ b/src/Common/tests/gtest_local_address.cpp
@@ -7,7 +7,9 @@
 
 TEST(LocalAddress, SmokeTest)
 {
-    auto cmd = DB::ShellCommand::executeDirect("/bin/hostname", {"-i"});
+    DB::ShellCommand::Config config("/bin/hostname");
+    config.arguments = {"-i"};
+    auto cmd = DB::ShellCommand::executeDirect(config);
     std::string address_str;
     DB::readString(address_str, cmd->out);
     cmd->wait();
diff --git a/src/Common/tests/gtest_local_date_time_comparison.cpp b/src/Common/tests/gtest_local_date_time_comparison.cpp
index f75c2647100..9f66da51c94 100644
--- a/src/Common/tests/gtest_local_date_time_comparison.cpp
+++ b/src/Common/tests/gtest_local_date_time_comparison.cpp
@@ -2,7 +2,7 @@
 #include <stdexcept>
 #include <gtest/gtest.h>
 
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 
 
 void fillStackWithGarbage()
diff --git a/src/Common/tests/gtest_log.cpp b/src/Common/tests/gtest_log.cpp
index 9f4ef41f642..5addb5acf5d 100644
--- a/src/Common/tests/gtest_log.cpp
+++ b/src/Common/tests/gtest_log.cpp
@@ -1,11 +1,13 @@
 #include <string>
 #include <vector>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <gtest/gtest.h>
 
 #include <Poco/Logger.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/NullChannel.h>
+#include <Poco/StreamChannel.h>
+#include <sstream>
 
 
 TEST(Logger, Log)
@@ -17,3 +19,34 @@ TEST(Logger, Log)
     /// This test checks that we don't pass this string to fmtlib, because it is the only argument.
     EXPECT_NO_THROW(LOG_INFO(log, "Hello {} World"));
 }
+
+TEST(Logger, TestLog)
+{
+    {   /// Test logs visible for test level
+
+        std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        auto my_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(oss));
+        auto * log = &Poco::Logger::create("TestLogger", my_channel.get());
+        log->setLevel("test");
+        LOG_TEST(log, "Hello World");
+
+        EXPECT_EQ(oss.str(), "Hello World\n");
+        Poco::Logger::destroy("TestLogger");
+    }
+
+    {   /// Test logs invisible for other levels
+        for (const auto & level : {"trace", "debug", "information", "warning", "error", "fatal"})
+        {
+            std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+            auto my_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(oss));
+            auto * log = &Poco::Logger::create(std::string{level} + "_Logger", my_channel.get());
+            log->setLevel(level);
+            LOG_TEST(log, "Hello World");
+
+            EXPECT_EQ(oss.str(), "");
+
+            Poco::Logger::destroy(std::string{level} + "_Logger");
+        }
+    }
+
+}
diff --git a/src/Common/tests/gtest_rw_lock.cpp b/src/Common/tests/gtest_rw_lock.cpp
index c77e405e18b..6ba67a40445 100644
--- a/src/Common/tests/gtest_rw_lock.cpp
+++ b/src/Common/tests/gtest_rw_lock.cpp
@@ -3,9 +3,9 @@
 #include <Common/Exception.h>
 #include <Common/RWLock.h>
 #include <Common/Stopwatch.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ThreadPool.h>
-#include <common/phdr_cache.h>
+#include <base/phdr_cache.h>
 #include <random>
 #include <pcg_random.hpp>
 #include <thread>
diff --git a/src/Common/tests/gtest_shell_command.cpp b/src/Common/tests/gtest_shell_command.cpp
index 4d578422962..d6d0a544e9b 100644
--- a/src/Common/tests/gtest_shell_command.cpp
+++ b/src/Common/tests/gtest_shell_command.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ShellCommand.h>
 #include <IO/copyData.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
@@ -28,7 +28,9 @@ TEST(ShellCommand, Execute)
 
 TEST(ShellCommand, ExecuteDirect)
 {
-    auto command = ShellCommand::executeDirect("/bin/echo", {"Hello, world!"});
+    ShellCommand::Config config("/bin/echo");
+    config.arguments = {"Hello, world!"};
+    auto command = ShellCommand::executeDirect(config);
 
     std::string res;
     readStringUntilEOF(res, command->out);
diff --git a/src/Common/tests/gtest_strong_typedef.cpp b/src/Common/tests/gtest_strong_typedef.cpp
index cb358459e68..98e8df86154 100644
--- a/src/Common/tests/gtest_strong_typedef.cpp
+++ b/src/Common/tests/gtest_strong_typedef.cpp
@@ -1,4 +1,4 @@
-#include <common/strong_typedef.h>
+#include <base/strong_typedef.h>
 #include <set>
 #include <unordered_set>
 #include <memory>
diff --git a/src/Common/tests/gtest_wide_integer.cpp b/src/Common/tests/gtest_wide_integer.cpp
index 982bbee804e..4021ae0ea91 100644
--- a/src/Common/tests/gtest_wide_integer.cpp
+++ b/src/Common/tests/gtest_wide_integer.cpp
@@ -8,27 +8,27 @@
 #include <Core/Types.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 
 static_assert(is_signed_v<Int128>);
 static_assert(!is_unsigned_v<Int128>);
-static_assert(is_integer_v<Int128>);
+static_assert(is_integer<Int128>);
 static_assert(sizeof(Int128) == 16);
 
 static_assert(is_signed_v<Int256>);
 static_assert(!is_unsigned_v<Int256>);
-static_assert(is_integer_v<Int256>);
+static_assert(is_integer<Int256>);
 static_assert(sizeof(Int256) == 32);
 
 static_assert(!is_signed_v<UInt128>);
 static_assert(is_unsigned_v<UInt128>);
-static_assert(is_integer_v<UInt128>);
+static_assert(is_integer<UInt128>);
 static_assert(sizeof(UInt128) == 16);
 
 static_assert(!is_signed_v<UInt256>);
 static_assert(is_unsigned_v<UInt256>);
-static_assert(is_integer_v<UInt256>);
+static_assert(is_integer<UInt256>);
 static_assert(sizeof(UInt256) == 32);
 
 
@@ -277,5 +277,4 @@ GTEST_TEST(WideInteger, DecimalFormatting)
     Int128 fractional = DecimalUtils::getFractionalPart(x, 2);
 
     EXPECT_EQ(fractional, 40);
-    EXPECT_EQ(decimalFractional(fractional, 2), "40");
 }
diff --git a/src/Common/typeid_cast.h b/src/Common/typeid_cast.h
index 85534a971f5..b656c6548ea 100644
--- a/src/Common/typeid_cast.h
+++ b/src/Common/typeid_cast.h
@@ -6,9 +6,9 @@
 #include <memory>
 #include <string>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Common/Exception.h>
-#include <common/demangle.h>
+#include <base/demangle.h>
 
 
 namespace DB
diff --git a/src/Common/ya.make b/src/Common/ya.make
deleted file mode 100644
index 60dfd5f6bee..00000000000
--- a/src/Common/ya.make
+++ /dev/null
@@ -1,132 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL (
-    GLOBAL clickhouse/src
-    contrib/libs/libcpuid
-    contrib/libs/libunwind/include
-    GLOBAL contrib/restricted/dragonbox
-)
-
-PEERDIR(
-    clickhouse/base/common
-    clickhouse/base/pcg-random
-    clickhouse/base/widechar_width
-    contrib/libs/libcpuid
-    contrib/libs/openssl
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/re2
-    contrib/restricted/dragonbox
-)
-
-INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/yandex/ya.make.versions.inc)
-
-
-SRCS(
-    ActionLock.cpp
-    AlignedBuffer.cpp
-    Allocator.cpp
-    ClickHouseRevision.cpp
-    Config/AbstractConfigurationComparison.cpp
-    Config/ConfigProcessor.cpp
-    Config/ConfigReloader.cpp
-    Config/YAMLParser.cpp
-    Config/configReadClient.cpp
-    CurrentMemoryTracker.cpp
-    CurrentMetrics.cpp
-    CurrentThread.cpp
-    DNSResolver.cpp
-    Dwarf.cpp
-    Elf.cpp
-    Epoll.cpp
-    ErrorCodes.cpp
-    Exception.cpp
-    ExternalLoaderStatus.cpp
-    FieldVisitorDump.cpp
-    FieldVisitorHash.cpp
-    FieldVisitorSum.cpp
-    FieldVisitorToString.cpp
-    FieldVisitorWriteBinary.cpp
-    FileChecker.cpp
-    IO.cpp
-    IPv6ToBinary.cpp
-    IntervalKind.cpp
-    JSONBuilder.cpp
-    Macros.cpp
-    MemoryStatisticsOS.cpp
-    MemoryTracker.cpp
-    OpenSSLHelpers.cpp
-    OptimizedRegularExpression.cpp
-    PODArray.cpp
-    PipeFDs.cpp
-    ProcfsMetricsProvider.cpp
-    ProfileEvents.cpp
-    ProgressIndication.cpp
-    QueryProfiler.cpp
-    RWLock.cpp
-    RemoteHostFilter.cpp
-    SensitiveDataMasker.cpp
-    SettingsChanges.cpp
-    SharedLibrary.cpp
-    ShellCommand.cpp
-    StackTrace.cpp
-    StatusFile.cpp
-    StatusInfo.cpp
-    Stopwatch.cpp
-    StringUtils/StringUtils.cpp
-    StudentTTest.cpp
-    SymbolIndex.cpp
-    TLDListsHolder.cpp
-    TaskStatsInfoGetter.cpp
-    TerminalSize.cpp
-    ThreadFuzzer.cpp
-    ThreadPool.cpp
-    ThreadProfileEvents.cpp
-    ThreadStatus.cpp
-    Throttler.cpp
-    TimerDescriptor.cpp
-    TraceCollector.cpp
-    UTF8Helpers.cpp
-    UnicodeBar.cpp
-    VersionNumber.cpp
-    WeakHash.cpp
-    ZooKeeper/IKeeper.cpp
-    ZooKeeper/TestKeeper.cpp
-    ZooKeeper/ZooKeeper.cpp
-    ZooKeeper/ZooKeeperCommon.cpp
-    ZooKeeper/ZooKeeperConstants.cpp
-    ZooKeeper/ZooKeeperIO.cpp
-    ZooKeeper/ZooKeeperImpl.cpp
-    ZooKeeper/ZooKeeperNodeCache.cpp
-    checkStackSize.cpp
-    clearPasswordFromCommandLine.cpp
-    createHardLink.cpp
-    escapeForFileName.cpp
-    filesystemHelpers.cpp
-    formatIPv6.cpp
-    formatReadable.cpp
-    getExecutablePath.cpp
-    getHashOfLoadedBinary.cpp
-    getMappedArea.cpp
-    getMultipleKeysFromConfig.cpp
-    getNumberOfPhysicalCPUCores.cpp
-    hasLinuxCapability.cpp
-    hex.cpp
-    isLocalAddress.cpp
-    malloc.cpp
-    new_delete.cpp
-    parseAddress.cpp
-    parseGlobs.cpp
-    parseRemoteDescription.cpp
-    quoteString.cpp
-    randomSeed.cpp
-    remapExecutable.cpp
-    renameat2.cpp
-    setThreadName.cpp
-    thread_local_rng.cpp
-
-)
-
-END()
diff --git a/src/Common/ya.make.in b/src/Common/ya.make.in
deleted file mode 100644
index fd6a805891e..00000000000
--- a/src/Common/ya.make.in
+++ /dev/null
@@ -1,30 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL (
-    GLOBAL clickhouse/src
-    contrib/libs/libcpuid
-    contrib/libs/libunwind/include
-    GLOBAL contrib/restricted/dragonbox
-)
-
-PEERDIR(
-    clickhouse/base/common
-    clickhouse/base/pcg-random
-    clickhouse/base/widechar_width
-    contrib/libs/libcpuid
-    contrib/libs/openssl
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/re2
-    contrib/restricted/dragonbox
-)
-
-INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/yandex/ya.make.versions.inc)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Compression/CMakeLists.txt b/src/Compression/CMakeLists.txt
index 390835f17ae..34369d8dbc8 100644
--- a/src/Compression/CMakeLists.txt
+++ b/src/Compression/CMakeLists.txt
@@ -1,3 +1,18 @@
-if(ENABLE_EXAMPLES)
+if (ENABLE_FUZZING)
+    include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
+    add_headers_and_sources(fuzz_compression .)
+
+    # Remove this file, because it has dependencies on DataTypes
+    list(REMOVE_ITEM ${fuzz_compression_sources} CompressionFactoryAdditions.cpp)
+
+    add_library(fuzz_compression ${fuzz_compression_headers} ${fuzz_compression_sources})
+    target_link_libraries(fuzz_compression PUBLIC clickhouse_parsers clickhouse_common_io common lz4)
+endif()
+
+if (ENABLE_EXAMPLES)
     add_subdirectory(examples)
 endif()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/Compression/CachedCompressedReadBuffer.cpp b/src/Compression/CachedCompressedReadBuffer.cpp
index d511266d139..c19e854dd45 100644
--- a/src/Compression/CachedCompressedReadBuffer.cpp
+++ b/src/Compression/CachedCompressedReadBuffer.cpp
@@ -28,9 +28,14 @@ void CachedCompressedReadBuffer::initInput()
 }
 
 
+void CachedCompressedReadBuffer::prefetch()
+{
+    file_in->prefetch();
+}
+
+
 bool CachedCompressedReadBuffer::nextImpl()
 {
-
     /// Let's check for the presence of a decompressed block in the cache, grab the ownership of this block, if it exists.
     UInt128 key = cache->hash(path, file_pos);
 
@@ -60,6 +65,13 @@ bool CachedCompressedReadBuffer::nextImpl()
 
     working_buffer = Buffer(owned_cell->data.data(), owned_cell->data.data() + owned_cell->data.size() - owned_cell->additional_bytes);
 
+    /// nextimpl_working_buffer_offset is set in the seek function (lazy seek). So we have to
+    /// check that we are not seeking beyond working buffer.
+    if (nextimpl_working_buffer_offset > working_buffer.size())
+        throw Exception("Seek position is beyond the decompressed block"
+        " (pos: " + toString(nextimpl_working_buffer_offset) + ", block size: " + toString(working_buffer.size()) + ")",
+        ErrorCodes::SEEK_POSITION_OUT_OF_BOUND);
+
     file_pos += owned_cell->compressed_size;
 
     return true;
@@ -74,28 +86,29 @@ CachedCompressedReadBuffer::CachedCompressedReadBuffer(
 
 void CachedCompressedReadBuffer::seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block)
 {
+    /// Nothing to do if we already at required position
+    if (file_pos == offset_in_compressed_file
+        && (offset() == offset_in_decompressed_block ||
+            nextimpl_working_buffer_offset == offset_in_decompressed_block))
+        return;
+
     if (owned_cell &&
         offset_in_compressed_file == file_pos - owned_cell->compressed_size &&
         offset_in_decompressed_block <= working_buffer.size())
     {
-        bytes += offset();
         pos = working_buffer.begin() + offset_in_decompressed_block;
-        bytes -= offset();
     }
     else
     {
+        /// Remember position in compressed file (will be moved in nextImpl)
         file_pos = offset_in_compressed_file;
-
+        /// We will discard our working_buffer, but have to account rest bytes
         bytes += offset();
-        nextImpl();
-
-        if (offset_in_decompressed_block > working_buffer.size())
-            throw Exception("Seek position is beyond the decompressed block"
-                " (pos: " + toString(offset_in_decompressed_block) + ", block size: " + toString(working_buffer.size()) + ")",
-                ErrorCodes::SEEK_POSITION_OUT_OF_BOUND);
-
-        pos = working_buffer.begin() + offset_in_decompressed_block;
-        bytes -= offset();
+        /// No data, everything discarded
+        pos = working_buffer.end();
+        /// Remember required offset in decompressed block which will be set in
+        /// the next ReadBuffer::next() call
+        nextimpl_working_buffer_offset = offset_in_decompressed_block;
     }
 }
 
diff --git a/src/Compression/CachedCompressedReadBuffer.h b/src/Compression/CachedCompressedReadBuffer.h
index c2338f6f841..16770e343cc 100644
--- a/src/Compression/CachedCompressedReadBuffer.h
+++ b/src/Compression/CachedCompressedReadBuffer.h
@@ -15,7 +15,7 @@ namespace DB
   * The external cache is passed as an argument to the constructor.
   * Allows you to increase performance in cases where the same blocks are often read.
   * Disadvantages:
-  * - in case you need to read a lot of data in a row, but of them only a part is cached, you have to do seek-and.
+  * - in case you need to read a lot of data in a row, but some of them only a part is cached, you have to do seek-and.
   */
 class CachedCompressedReadBuffer : public CompressedReadBufferBase, public ReadBuffer
 {
@@ -25,21 +25,32 @@ private:
     std::unique_ptr<ReadBufferFromFileBase> file_in;
 
     const std::string path;
+
+    /// Current position in file_in
     size_t file_pos;
 
     /// A piece of data from the cache, or a piece of read data that we put into the cache.
     UncompressedCache::MappedPtr owned_cell;
 
     void initInput();
+
     bool nextImpl() override;
 
+    void prefetch() override;
+
     /// Passed into file_in.
     ReadBufferFromFileBase::ProfileCallback profile_callback;
     clockid_t clock_type {};
 
+
+    /// Check comment in CompressedReadBuffer
+    /* size_t nextimpl_working_buffer_offset; */
+
 public:
     CachedCompressedReadBuffer(const std::string & path, std::function<std::unique_ptr<ReadBufferFromFileBase>()> file_in_creator, UncompressedCache * cache_, bool allow_different_codecs_ = false);
 
+    /// Seek is lazy. It doesn't move the position anywhere, just remember them and perform actual
+    /// seek inside nextImpl.
     void seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block);
 
     void setProfileCallback(const ReadBufferFromFileBase::ProfileCallback & profile_callback_, clockid_t clock_type_ = CLOCK_MONOTONIC_COARSE)
@@ -47,6 +58,18 @@ public:
         profile_callback = profile_callback_;
         clock_type = clock_type_;
     }
+
+    void setReadUntilPosition(size_t position) override
+    {
+        if (file_in)
+            file_in->setReadUntilPosition(position);
+    }
+
+    void setReadUntilEnd() override
+    {
+        if (file_in)
+            file_in->setReadUntilEnd();
+    }
 };
 
 }
diff --git a/src/Compression/CompressedReadBufferBase.cpp b/src/Compression/CompressedReadBufferBase.cpp
index 749f174677c..81e49e445a7 100644
--- a/src/Compression/CompressedReadBufferBase.cpp
+++ b/src/Compression/CompressedReadBufferBase.cpp
@@ -71,12 +71,16 @@ static void validateChecksum(char * data, size_t size, const Checksum expected_c
     /// And anyway this is pretty heavy, so avoid burning too much CPU here.
     if (size < (1ULL << 20))
     {
+        /// We need to copy data from ReadBuffer to flip bits as ReadBuffer should be immutable
+        PODArray<char> tmp_buffer(data, data + size);
+        char * tmp_data = tmp_buffer.data();
+
         /// Check if the difference caused by single bit flip in data.
         for (size_t bit_pos = 0; bit_pos < size * 8; ++bit_pos)
         {
-            flip_bit(data, bit_pos);
+            flip_bit(tmp_data, bit_pos);
 
-            auto checksum_of_data_with_flipped_bit = CityHash_v1_0_2::CityHash128(data, size);
+            auto checksum_of_data_with_flipped_bit = CityHash_v1_0_2::CityHash128(tmp_data, size);
             if (expected_checksum == checksum_of_data_with_flipped_bit)
             {
                 message << ". The mismatch is caused by single bit flip in data block at byte " << (bit_pos / 8) << ", bit " << (bit_pos % 8) << ". "
@@ -84,7 +88,7 @@ static void validateChecksum(char * data, size_t size, const Checksum expected_c
                 throw Exception(message.str(), ErrorCodes::CHECKSUM_DOESNT_MATCH);
             }
 
-            flip_bit(data, bit_pos);    /// Restore
+            flip_bit(tmp_data, bit_pos);    /// Restore
         }
     }
 
@@ -253,4 +257,3 @@ CompressedReadBufferBase::~CompressedReadBufferBase() = default;    /// Proper d
 
 
 }
-
diff --git a/src/Compression/CompressedReadBufferBase.h b/src/Compression/CompressedReadBufferBase.h
index c1e928039ef..c32a169aecc 100644
--- a/src/Compression/CompressedReadBufferBase.h
+++ b/src/Compression/CompressedReadBufferBase.h
@@ -32,7 +32,8 @@ protected:
 
     /// Read compressed data into compressed_buffer. Get size of decompressed data from block header. Checksum if need.
     ///
-    /// If always_copy is true then even if the compressed block is already stored in compressed_in.buffer() it will be copied into own_compressed_buffer.
+    /// If always_copy is true then even if the compressed block is already stored in compressed_in.buffer()
+    /// it will be copied into own_compressed_buffer.
     /// This is required for CheckingCompressedReadBuffer, since this is just a proxy.
     ///
     /// Returns number of compressed bytes read.
diff --git a/src/Compression/CompressedReadBufferFromFile.cpp b/src/Compression/CompressedReadBufferFromFile.cpp
index 22ffb74f61a..1a70b27e9f4 100644
--- a/src/Compression/CompressedReadBufferFromFile.cpp
+++ b/src/Compression/CompressedReadBufferFromFile.cpp
@@ -33,9 +33,17 @@ bool CompressedReadBufferFromFile::nextImpl()
 
     decompress(working_buffer, size_decompressed, size_compressed_without_checksum);
 
+    /// nextimpl_working_buffer_offset is set in the seek function (lazy seek). So we have to
+    /// check that we are not seeking beyond working buffer.
+    if (nextimpl_working_buffer_offset > working_buffer.size())
+        throw Exception("Required to move position beyond the decompressed block"
+        " (pos: " + toString(nextimpl_working_buffer_offset) + ", block size: " + toString(working_buffer.size()) + ")",
+        ErrorCodes::SEEK_POSITION_OUT_OF_BOUND);
+
     return true;
 }
 
+
 CompressedReadBufferFromFile::CompressedReadBufferFromFile(std::unique_ptr<ReadBufferFromFileBase> buf, bool allow_different_codecs_)
     : BufferWithOwnMemory<ReadBuffer>(0), p_file_in(std::move(buf)), file_in(*p_file_in)
 {
@@ -44,52 +52,42 @@ CompressedReadBufferFromFile::CompressedReadBufferFromFile(std::unique_ptr<ReadB
 }
 
 
-CompressedReadBufferFromFile::CompressedReadBufferFromFile(
-    const std::string & path,
-    size_t estimated_size,
-    size_t direct_io_threshold,
-    size_t mmap_threshold,
-    MMappedFileCache * mmap_cache,
-    size_t buf_size,
-    bool allow_different_codecs_)
-    : BufferWithOwnMemory<ReadBuffer>(0)
-    , p_file_in(createReadBufferFromFileBase(path, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache, buf_size))
-    , file_in(*p_file_in)
+void CompressedReadBufferFromFile::prefetch()
 {
-    compressed_in = &file_in;
-    allow_different_codecs = allow_different_codecs_;
+    file_in.prefetch();
 }
 
 
 void CompressedReadBufferFromFile::seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block)
 {
+    /// Nothing to do if we already at required position
+    if (!size_compressed && static_cast<size_t>(file_in.getPosition()) == offset_in_compressed_file && /// correct position in compressed file
+        (offset() == offset_in_decompressed_block /// correct position in buffer or
+         || nextimpl_working_buffer_offset == offset_in_decompressed_block)) /// we will move our position to correct one
+        return;
+
+    /// Our seek is within working_buffer, so just move the position
     if (size_compressed &&
         offset_in_compressed_file == file_in.getPosition() - size_compressed &&
         offset_in_decompressed_block <= working_buffer.size())
     {
-        bytes += offset();
         pos = working_buffer.begin() + offset_in_decompressed_block;
-        /// `bytes` can overflow and get negative, but in `count()` everything will overflow back and get right.
-        bytes -= offset();
     }
-    else
+    else /// Our seek outside working buffer, so perform "lazy seek"
     {
+        /// Actually seek compressed file
         file_in.seek(offset_in_compressed_file, SEEK_SET);
-
+        /// We will discard our working_buffer, but have to account rest bytes
         bytes += offset();
-        nextImpl();
-
-        if (offset_in_decompressed_block > working_buffer.size())
-            throw Exception("Seek position is beyond the decompressed block"
-            " (pos: " + toString(offset_in_decompressed_block) + ", block size: " + toString(working_buffer.size()) + ")",
-            ErrorCodes::SEEK_POSITION_OUT_OF_BOUND);
-
-        pos = working_buffer.begin() + offset_in_decompressed_block;
-        bytes -= offset();
+        /// No data, everything discarded
+        pos = working_buffer.end();
+        size_compressed = 0;
+        /// Remember required offset in decompressed block which will be set in
+        /// the next ReadBuffer::next() call
+        nextimpl_working_buffer_offset = offset_in_decompressed_block;
     }
 }
 
-
 size_t CompressedReadBufferFromFile::readBig(char * to, size_t n)
 {
     size_t bytes_read = 0;
@@ -111,9 +109,11 @@ size_t CompressedReadBufferFromFile::readBig(char * to, size_t n)
 
         auto additional_size_at_the_end_of_buffer = codec->getAdditionalSizeAtTheEndOfBuffer();
 
-        /// If the decompressed block fits entirely where it needs to be copied.
-        if (size_decompressed + additional_size_at_the_end_of_buffer <= n - bytes_read)
+        /// If the decompressed block fits entirely where it needs to be copied and we don't
+        /// need to skip some bytes in decompressed data (seek happened before readBig call).
+        if (nextimpl_working_buffer_offset == 0 && size_decompressed + additional_size_at_the_end_of_buffer <= n - bytes_read)
         {
+
             decompressTo(to + bytes_read, size_decompressed, size_compressed_without_checksum);
             bytes_read += size_decompressed;
             bytes += size_decompressed;
@@ -130,7 +130,11 @@ size_t CompressedReadBufferFromFile::readBig(char * to, size_t n)
             working_buffer = Buffer(memory.data(), &memory[size_decompressed]);
 
             decompress(working_buffer, size_decompressed, size_compressed_without_checksum);
-            pos = working_buffer.begin();
+
+            /// Manually take nextimpl_working_buffer_offset into account, because we don't use
+            /// nextImpl in this method.
+            pos = working_buffer.begin() + nextimpl_working_buffer_offset;
+            nextimpl_working_buffer_offset = 0;
 
             bytes_read += read(to + bytes_read, n - bytes_read);
             break;
diff --git a/src/Compression/CompressedReadBufferFromFile.h b/src/Compression/CompressedReadBufferFromFile.h
index fe9add6f015..2be8ce372c2 100644
--- a/src/Compression/CompressedReadBufferFromFile.h
+++ b/src/Compression/CompressedReadBufferFromFile.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "CompressedReadBufferBase.h"
+#include <Compression/CompressedReadBufferBase.h>
 #include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadSettings.h>
 #include <time.h>
 #include <memory>
 
@@ -27,15 +28,29 @@ private:
     ReadBufferFromFileBase & file_in;
     size_t size_compressed = 0;
 
+    /// This field inherited from ReadBuffer. It's used to perform "lazy" seek, so in seek() call we:
+    /// 1) actually seek only underlying compressed file_in to offset_in_compressed_file;
+    /// 2) reset current working_buffer;
+    /// 3) remember the position in decompressed block in nextimpl_working_buffer_offset.
+    /// After following ReadBuffer::next() -> nextImpl call we will read new data into working_buffer and
+    /// ReadBuffer::next() will move our position in the fresh working_buffer to nextimpl_working_buffer_offset and
+    /// reset it to zero.
+    ///
+    /// NOTE: We have independent readBig implementation, so we have to take
+    /// nextimpl_working_buffer_offset into account there as well.
+    ///
+    /* size_t nextimpl_working_buffer_offset; */
+
     bool nextImpl() override;
 
+    void prefetch() override;
+
 public:
-    CompressedReadBufferFromFile(std::unique_ptr<ReadBufferFromFileBase> buf, bool allow_different_codecs_ = false);
-
-    CompressedReadBufferFromFile(
-        const std::string & path, size_t estimated_size, size_t direct_io_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache,
-        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, bool allow_different_codecs_ = false);
+    explicit CompressedReadBufferFromFile(std::unique_ptr<ReadBufferFromFileBase> buf, bool allow_different_codecs_ = false);
 
+    /// Seek is lazy in some sense. We move position in compressed file_in to offset_in_compressed_file, but don't
+    /// read data into working_buffer and don't shit our position to offset_in_decompressed_block. Instead
+    /// we store this offset inside nextimpl_working_buffer_offset.
     void seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block);
 
     size_t readBig(char * to, size_t n) override;
@@ -44,6 +59,10 @@ public:
     {
         file_in.setProfileCallback(profile_callback_, clock_type_);
     }
+
+    void setReadUntilPosition(size_t position) override { file_in.setReadUntilPosition(position); }
+
+    void setReadUntilEnd() override { file_in.setReadUntilEnd(); }
 };
 
 }
diff --git a/src/Compression/CompressedWriteBuffer.cpp b/src/Compression/CompressedWriteBuffer.cpp
index 8d146e8de23..bcf3bdd9c97 100644
--- a/src/Compression/CompressedWriteBuffer.cpp
+++ b/src/Compression/CompressedWriteBuffer.cpp
@@ -1,8 +1,8 @@
 #include <city.h>
 #include <string.h>
 
-#include <common/unaligned.h>
-#include <common/types.h>
+#include <base/unaligned.h>
+#include <base/types.h>
 
 #include "CompressedWriteBuffer.h"
 #include <Compression/CompressionFactory.h>
@@ -30,16 +30,18 @@ void CompressedWriteBuffer::nextImpl()
     compressed_buffer.resize(compressed_reserve_size);
     UInt32 compressed_size = codec->compress(working_buffer.begin(), decompressed_size, compressed_buffer.data());
 
-    // FIXME remove this after fixing msan report in lz4.
-    // Almost always reproduces on stateless tests, the exact test unknown.
-    __msan_unpoison(compressed_buffer.data(), compressed_size);
-
     CityHash_v1_0_2::uint128 checksum = CityHash_v1_0_2::CityHash128(compressed_buffer.data(), compressed_size);
     out.write(reinterpret_cast<const char *>(&checksum), CHECKSUM_SIZE);
     out.write(compressed_buffer.data(), compressed_size);
 }
 
 
+void CompressedWriteBuffer::finalize()
+{
+    next();
+}
+
+
 CompressedWriteBuffer::CompressedWriteBuffer(
     WriteBuffer & out_,
     CompressionCodecPtr codec_,
@@ -48,6 +50,7 @@ CompressedWriteBuffer::CompressedWriteBuffer(
 {
 }
 
+
 CompressedWriteBuffer::~CompressedWriteBuffer()
 {
     /// FIXME move final flush into the caller
diff --git a/src/Compression/CompressedWriteBuffer.h b/src/Compression/CompressedWriteBuffer.h
index a9612b463a5..57ba679855e 100644
--- a/src/Compression/CompressedWriteBuffer.h
+++ b/src/Compression/CompressedWriteBuffer.h
@@ -29,6 +29,8 @@ public:
         CompressionCodecPtr codec_ = CompressionCodecFactory::instance().getDefaultCodec(),
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE);
 
+    void finalize() override;
+
     /// The amount of compressed data
     size_t getCompressedBytes()
     {
diff --git a/src/Compression/CompressionCodecDelta.cpp b/src/Compression/CompressionCodecDelta.cpp
index 447abe9e840..07dd8219fae 100644
--- a/src/Compression/CompressionCodecDelta.cpp
+++ b/src/Compression/CompressionCodecDelta.cpp
@@ -1,7 +1,7 @@
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
@@ -82,8 +82,10 @@ void compressDataForType(const char * source, UInt32 source_size, char * dest)
 }
 
 template <typename T>
-void decompressDataForType(const char * source, UInt32 source_size, char * dest)
+void decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
 {
+    const char * output_end = dest + output_size;
+
     if (source_size % sizeof(T) != 0)
         throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot delta decompress, data size {}  is not aligned to {}", source_size, sizeof(T));
 
@@ -92,6 +94,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
     while (source < source_end)
     {
         accumulator += unalignedLoad<T>(source);
+        if (dest + sizeof(accumulator) > output_end)
+            throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
         unalignedStore<T>(dest, accumulator);
 
         source += sizeof(T);
@@ -132,7 +136,12 @@ void CompressionCodecDelta::doDecompressData(const char * source, UInt32 source_
         throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
 
     UInt8 bytes_size = source[0];
+
+    if (bytes_size == 0)
+        throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
+
     UInt8 bytes_to_skip = uncompressed_size % bytes_size;
+    UInt32 output_size = uncompressed_size - bytes_to_skip;
 
     if (UInt32(2 + bytes_to_skip) > source_size)
         throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
@@ -142,16 +151,16 @@ void CompressionCodecDelta::doDecompressData(const char * source, UInt32 source_
     switch (bytes_size)
     {
     case 1:
-        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     case 2:
-        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     case 4:
-        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     case 8:
-        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     }
 }
@@ -205,4 +214,10 @@ void registerCodecDelta(CompressionCodecFactory & factory)
         return std::make_shared<CompressionCodecDelta>(delta_bytes_size);
     });
 }
+
+CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size)
+{
+    return std::make_shared<CompressionCodecDelta>(delta_bytes_size);
+}
+
 }
diff --git a/src/Compression/CompressionCodecDoubleDelta.cpp b/src/Compression/CompressionCodecDoubleDelta.cpp
index 79ced55594a..c4561b1fbc8 100644
--- a/src/Compression/CompressionCodecDoubleDelta.cpp
+++ b/src/Compression/CompressionCodecDoubleDelta.cpp
@@ -1,7 +1,11 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTIdentifier.h>
 
@@ -353,12 +357,13 @@ UInt32 compressDataForType(const char * source, UInt32 source_size, char * dest)
 }
 
 template <typename ValueType>
-void decompressDataForType(const char * source, UInt32 source_size, char * dest)
+void decompressDataForType(const char * source, UInt32 source_size, char * dest, UInt32 output_size)
 {
     static_assert(is_unsigned_v<ValueType>, "ValueType must be unsigned.");
     using UnsignedDeltaType = ValueType;
 
     const char * source_end = source + source_size;
+    const char * output_end = dest + output_size;
 
     if (source + sizeof(UInt32) > source_end)
         return;
@@ -374,6 +379,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
         return;
 
     prev_value = unalignedLoad<ValueType>(source);
+    if (dest + sizeof(prev_value) > output_end)
+        throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
     unalignedStore<ValueType>(dest, prev_value);
 
     source += sizeof(prev_value);
@@ -385,6 +392,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
 
     prev_delta = unalignedLoad<UnsignedDeltaType>(source);
     prev_value = prev_value + static_cast<ValueType>(prev_delta);
+    if (dest + sizeof(prev_value) > output_end)
+        throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
     unalignedStore<ValueType>(dest, prev_value);
 
     source += sizeof(prev_delta);
@@ -416,6 +425,8 @@ void decompressDataForType(const char * source, UInt32 source_size, char * dest)
 
         const UnsignedDeltaType delta = double_delta + prev_delta;
         const ValueType curr_value = prev_value + delta;
+        if (dest + sizeof(curr_value) > output_end)
+            throw Exception(ErrorCodes::CANNOT_DECOMPRESS, "Cannot decompress the data");
         unalignedStore<ValueType>(dest, curr_value);
         dest += sizeof(curr_value);
 
@@ -502,7 +513,12 @@ void CompressionCodecDoubleDelta::doDecompressData(const char * source, UInt32 s
         throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
 
     UInt8 bytes_size = source[0];
+
+    if (bytes_size == 0)
+        throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
+
     UInt8 bytes_to_skip = uncompressed_size % bytes_size;
+    UInt32 output_size = uncompressed_size - bytes_to_skip;
 
     if (UInt32(2 + bytes_to_skip) > source_size)
         throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
@@ -512,16 +528,16 @@ void CompressionCodecDoubleDelta::doDecompressData(const char * source, UInt32 s
     switch (bytes_size)
     {
     case 1:
-        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt8>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     case 2:
-        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt16>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     case 4:
-        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt32>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     case 8:
-        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip]);
+        decompressDataForType<UInt64>(&source[2 + bytes_to_skip], source_size_no_header, &dest[bytes_to_skip], output_size);
         break;
     }
 }
@@ -539,4 +555,10 @@ void registerCodecDoubleDelta(CompressionCodecFactory & factory)
         return std::make_shared<CompressionCodecDoubleDelta>(data_bytes_size);
     });
 }
+
+CompressionCodecPtr getCompressionCodecDoubleDelta(UInt8 data_bytes_size)
+{
+    return std::make_shared<CompressionCodecDoubleDelta>(data_bytes_size);
+}
+
 }
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index d0904b4bf24..c3f14fe1449 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -1,212 +1,566 @@
+#include <string_view>
 #include <Common/config.h>
+#include <Common/Exception.h>
+#include <base/types.h>
+#include <IO/VarInt.h>
 #include <Compression/CompressionFactory.h>
-#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
 #include <Compression/CompressionCodecEncrypted.h>
+#include <Poco/Logger.h>
+#include <base/logger_useful.h>
+#include <Common/ErrorCodes.h>
+
+// This depends on BoringSSL-specific API, notably <openssl/aead.h>.
+#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
 #include <Parsers/ASTLiteral.h>
-#include <cassert>
 #include <openssl/digest.h>
 #include <openssl/err.h>
-#include <openssl/hkdf.h>
-#include <string_view>
+#include <boost/algorithm/hex.hpp>
+#include <openssl/aead.h>
+#endif
 
+// Common part for both parts (with SSL and without)
 namespace DB
 {
-    namespace ErrorCodes
+
+namespace ErrorCodes
+{
+    extern const int OPENSSL_ERROR;
+}
+
+namespace
+{
+
+/// Get string name for method. Return empty string for undefined Method
+String getMethodName(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        extern const int ILLEGAL_CODEC_PARAMETER;
-        extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
-        extern const int NO_ELEMENTS_IN_CONFIG;
-        extern const int OPENSSL_ERROR;
+        return "AES_128_GCM_SIV";
     }
-
-    void CompressionCodecEncrypted::setMasterKey(const std::string_view & master_key)
+    else if (Method == AES_256_GCM_SIV)
     {
-        keys.emplace(master_key);
+        return "AES_256_GCM_SIV";
     }
-
-    CompressionCodecEncrypted::KeyHolder::KeyHolder(const std::string_view & master_key)
+    else
     {
-        // Derive a key from it.
-        keygen_key = deriveKey(master_key);
-
-        // EVP_AEAD_CTX is not stateful so we can create an
-        // instance now.
-        EVP_AEAD_CTX_zero(&ctx);
-        const int ok = EVP_AEAD_CTX_init(&ctx, EVP_aead_aes_128_gcm(),
-                                         reinterpret_cast<const uint8_t*>(keygen_key.data()), keygen_key.size(),
-                                         16 /* tag size */, nullptr);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+        return "";
     }
+}
 
-    CompressionCodecEncrypted::KeyHolder::~KeyHolder()
+/// Get method code (used for codec, to understand which one we are using)
+uint8_t getMethodCode(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        EVP_AEAD_CTX_cleanup(&ctx);
+        return uint8_t(CompressionMethodByte::AES_128_GCM_SIV);
     }
-
-    const CompressionCodecEncrypted::KeyHolder & CompressionCodecEncrypted::getKeys()
+    else if (Method == AES_256_GCM_SIV)
     {
-        if (keys)
-            return *keys;
-        else
-            throw Exception("There is no configuration for encryption in the server config",
-                            ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+        return uint8_t(CompressionMethodByte::AES_256_GCM_SIV);
     }
-
-    CompressionCodecEncrypted::CompressionCodecEncrypted(const std::string_view & cipher)
+    else
     {
-        setCodecDescription("Encrypted", {std::make_shared<ASTLiteral>(cipher)});
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    uint8_t CompressionCodecEncrypted::getMethodByte() const
+} // end of namespace
+
+} // end of namespace DB
+
+#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
+    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
+    extern const int INCORRECT_DATA;
+}
+
+namespace
+{
+constexpr size_t tag_size          = 16;   /// AES-GCM-SIV always uses a tag of 16 bytes length
+constexpr size_t key_id_max_size   = 8;    /// Max size of varint.
+constexpr size_t nonce_max_size    = 13;   /// Nonce size and one byte to show if nonce in in text
+constexpr size_t actual_nonce_size = 12;   /// Nonce actual size
+const String empty_nonce = {"\0\0\0\0\0\0\0\0\0\0\0\0", actual_nonce_size};
+
+/// Get encryption/decryption algorithms.
+auto getMethod(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        return static_cast<uint8_t>(CompressionMethodByte::Encrypted);
+        return EVP_aead_aes_128_gcm_siv;
     }
-
-    void CompressionCodecEncrypted::updateHash(SipHash & hash) const
+    else if (Method == AES_256_GCM_SIV)
     {
-        getCodecDesc()->updateTreeHash(hash);
+        return EVP_aead_aes_256_gcm_siv;
     }
-
-    UInt32 CompressionCodecEncrypted::getMaxCompressedDataSize(UInt32 uncompressed_size) const
+    else
     {
-        // The GCM mode is a stream cipher. No paddings are
-        // involved. There will be a tag at the end of ciphertext (16
-        // octets).
-        return uncompressed_size + 16;
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 source_size, char * dest) const
+/// Find out key size for each algorithm
+UInt64 methodKeySize(EncryptionMethod Method)
+{
+    if (Method == AES_128_GCM_SIV)
     {
-        // Generate an IV out of the data block and the key-generation
-        // key. It is completely deterministic, but does not leak any
-        // information about the data block except for equivalence of
-        // identical blocks (under the same master key). The IV will
-        // be used as an authentication tag. The ciphertext and the
-        // tag will be written directly in the dest buffer.
-        const std::string_view plaintext = std::string_view(source, source_size);
-
-        encrypt(plaintext, dest);
-        return source_size + 16;
+        return 16;
     }
-
-    void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size [[maybe_unused]]) const
+    else if (Method == AES_256_GCM_SIV)
     {
-        // Extract the IV from the encrypted data block. Decrypt the
-        // block with the extracted IV, and compare the tag. Throw an
-        // exception if tags don't match.
-        const std::string_view ciphertext_and_tag = std::string_view(source, source_size);
-        assert(ciphertext_and_tag.size() == uncompressed_size + 16);
-
-        decrypt(ciphertext_and_tag, dest);
+        return 32;
     }
-
-    std::string CompressionCodecEncrypted::lastErrorString()
+    else
     {
-        std::array<char, 1024> buffer;
-        ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
-        return std::string(buffer.data());
+        throw Exception("Wrong encryption Method. Got " + getMethodName(Method), ErrorCodes::BAD_ARGUMENTS);
     }
+}
 
-    std::string CompressionCodecEncrypted::deriveKey(const std::string_view & master_key)
+std::string lastErrorString()
+{
+    std::array<char, 1024> buffer = {};
+    ERR_error_string_n(ERR_get_error(), buffer.data(), buffer.size());
+    return std::string(buffer.data());
+}
+
+/// Encrypt plaintext with particular algorithm and put result into ciphertext_and_tag.
+/// This function get key and nonce and encrypt text with their help.
+/// If something went wrong (can't init context or can't encrypt data) it throws exception.
+/// It returns length of encrypted text.
+size_t encrypt(const std::string_view & plaintext, char * ciphertext_and_tag, EncryptionMethod method, const String & key, const String & nonce)
+{
+    /// Init context for encryption, using key.
+    EVP_AEAD_CTX encrypt_ctx;
+    EVP_AEAD_CTX_zero(&encrypt_ctx);
+    const int ok_init = EVP_AEAD_CTX_init(&encrypt_ctx, getMethod(method)(),
+                                            reinterpret_cast<const uint8_t*>(key.data()), key.size(),
+                                            tag_size, nullptr);
+    if (!ok_init)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    /// encrypt data using context and given nonce.
+    size_t out_len;
+    const int ok_open = EVP_AEAD_CTX_seal(&encrypt_ctx,
+                                            reinterpret_cast<uint8_t *>(ciphertext_and_tag),
+                                            &out_len, plaintext.size() + tag_size,
+                                            reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
+                                            reinterpret_cast<const uint8_t *>(plaintext.data()), plaintext.size(),
+                                            nullptr, 0);
+    if (!ok_open)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    return out_len;
+}
+
+/// Encrypt plaintext with particular algorithm and put result into ciphertext_and_tag.
+/// This function get key and nonce and encrypt text with their help.
+/// If something went wrong (can't init context or can't encrypt data) it throws exception.
+/// It returns length of encrypted text.
+size_t decrypt(const std::string_view & ciphertext, char * plaintext, EncryptionMethod method, const String & key, const String & nonce)
+{
+    /// Init context for decryption with given key.
+    EVP_AEAD_CTX decrypt_ctx;
+    EVP_AEAD_CTX_zero(&decrypt_ctx);
+
+    const int ok_init = EVP_AEAD_CTX_init(&decrypt_ctx, getMethod(method)(),
+                                          reinterpret_cast<const uint8_t*>(key.data()), key.size(),
+                                          tag_size, nullptr);
+    if (!ok_init)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    /// decrypt data using given nonce
+    size_t out_len;
+    const int ok_open = EVP_AEAD_CTX_open(&decrypt_ctx,
+                                          reinterpret_cast<uint8_t *>(plaintext),
+                                          &out_len, ciphertext.size(),
+                                          reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
+                                          reinterpret_cast<const uint8_t *>(ciphertext.data()), ciphertext.size(),
+                                          nullptr, 0);
+    if (!ok_open)
+        throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
+
+    return out_len;
+}
+
+/// Register codec in factory
+void registerEncryptionCodec(CompressionCodecFactory & factory, EncryptionMethod Method)
+{
+    const auto method_code = getMethodCode(Method); /// Codec need to know its code
+    factory.registerCompressionCodec(getMethodName(Method), method_code, [&, Method](const ASTPtr & arguments) -> CompressionCodecPtr
     {
-        std::string_view salt(""); // No salt: derive keys in a deterministic manner.
-        std::string_view info("Codec Encrypted('AES-128-GCM-SIV') key generation key");
-        std::array<char, 32> result;
-
-        const int ok = HKDF(reinterpret_cast<uint8_t *>(result.data()), result.size(),
-                            EVP_sha256(),
-                            reinterpret_cast<const uint8_t *>(master_key.data()), master_key.size(),
-                            reinterpret_cast<const uint8_t *>(salt.data()), salt.size(),
-                            reinterpret_cast<const uint8_t *>(info.data()), info.size());
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        return std::string(result.data(), 16);
-    }
-
-    void CompressionCodecEncrypted::encrypt(const std::string_view & plaintext, char * ciphertext_and_tag)
-    {
-        // Fixed nonce. Yes this is unrecommended, but we have to live
-        // with it.
-        std::string_view nonce("\0\0\0\0\0\0\0\0\0\0\0\0", 12);
-
-        size_t out_len;
-        const int ok = EVP_AEAD_CTX_seal(&getKeys().ctx,
-                                         reinterpret_cast<uint8_t *>(ciphertext_and_tag),
-                                         &out_len, plaintext.size() + 16,
-                                         reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
-                                         reinterpret_cast<const uint8_t *>(plaintext.data()), plaintext.size(),
-                                         nullptr, 0);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        assert(out_len == plaintext.size() + 16);
-    }
-
-    void CompressionCodecEncrypted::decrypt(const std::string_view & ciphertext, char * plaintext)
-    {
-        std::string_view nonce("\0\0\0\0\0\0\0\0\0\0\0\0", 12);
-
-        size_t out_len;
-        const int ok = EVP_AEAD_CTX_open(&getKeys().ctx,
-                                         reinterpret_cast<uint8_t *>(plaintext),
-                                         &out_len, ciphertext.size(),
-                                         reinterpret_cast<const uint8_t *>(nonce.data()), nonce.size(),
-                                         reinterpret_cast<const uint8_t *>(ciphertext.data()), ciphertext.size(),
-                                         nullptr, 0);
-        if (!ok)
-            throw Exception(lastErrorString(), ErrorCodes::OPENSSL_ERROR);
-
-        assert(out_len == ciphertext.size() - 16);
-    }
-
-    void registerCodecEncrypted(CompressionCodecFactory & factory)
-    {
-        const auto method_code = uint8_t(CompressionMethodByte::Encrypted);
-        factory.registerCompressionCodec("Encrypted", method_code, [&](const ASTPtr & arguments) -> CompressionCodecPtr
+        if (arguments)
         {
-            if (arguments)
-            {
-                if (arguments->children.size() != 1)
-                    throw Exception("Codec Encrypted() must have 1 parameter, given " +
-                                    std::to_string(arguments->children.size()),
-                                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
+            if (!arguments->children.empty())
+                throw Exception("Codec " + getMethodName(Method) + " must not have parameters, given " +
+                                std::to_string(arguments->children.size()),
+                                ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
+        }
+        return std::make_shared<CompressionCodecEncrypted>(Method);
+    });
+}
 
-                const auto children = arguments->children;
-                const auto * literal = children[0]->as<ASTLiteral>();
-                if (!literal)
-                    throw Exception("Wrong argument for codec Encrypted(). Expected a string literal",
-                                    ErrorCodes::ILLEGAL_SYNTAX_FOR_CODEC_TYPE);
-
-                const String cipher = literal->value.safeGet<String>();
-                if (cipher == "AES-128-GCM-SIV")
-                    return std::make_shared<CompressionCodecEncrypted>(cipher);
-                else
-                    throw Exception("Cipher '" + cipher + "' is not supported",
-                                    ErrorCodes::ILLEGAL_CODEC_PARAMETER);
-            }
-            else
-            {
-                /* The factory is asking us to construct the codec
-                 * only from the method code. How can that be
-                 * possible? For now we only support a single cipher
-                 * so it's not really a problem, but if we were to
-                 * support more ciphers it would be catastrophic. */
-                return std::make_shared<CompressionCodecEncrypted>("AES-128-GCM-SIV");
-            }
-        });
+String unhexKey(const String & hex)
+{
+    try
+    {
+        return boost::algorithm::unhex(hex);
     }
+    catch (const std::exception &)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot read key_hex, check for valid characters [0-9a-fA-F] and length");
+    }
+}
+
+/// Firstly, write a byte, which shows if the nonce will be put in text (if it was defined in config)
+/// Secondly, write nonce in text (this step depends from first step)
+/// return new position to write
+inline char* writeNonce(const String& nonce, char* dest)
+{
+    /// If nonce consists of nul bytes, it shouldn't be in dest. Zero byte is the only byte that should be written.
+    /// Otherwise, 1 is written and data from nonce is copied
+    if (nonce != empty_nonce)
+    {
+        *dest = 1;
+        ++dest;
+        size_t copied_symbols = nonce.copy(dest, nonce.size());
+        if (copied_symbols != nonce.size())
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Can't copy nonce into destination. Count of copied symbols {}, need to copy {}", copied_symbols, nonce.size());
+        dest += copied_symbols;
+        return dest;
+    }
+    else
+    {
+        *dest = 0;
+        return ++dest;
+    }
+}
+
+/// Firstly, read a byte, which shows if the nonce will be put in text (if it was defined in config)
+/// Secondly, read nonce in text (this step depends from first step)
+/// return new position to read
+inline const char* readNonce(String& nonce, const char* source)
+{
+    /// If first is zero byte: move source and set zero-bytes nonce
+    if (!*source)
+    {
+        nonce = empty_nonce;
+        return ++source;
+    }
+    /// Move to next byte. Nonce will begin from there
+    ++source;
+
+    /// Otherwise, use data from source in nonce
+    nonce = {source, actual_nonce_size};
+    source += actual_nonce_size;
+    return source;
+}
+
+}
+
+CompressionCodecEncrypted::Configuration & CompressionCodecEncrypted::Configuration::instance()
+{
+    static CompressionCodecEncrypted::Configuration ret;
+    return ret;
+}
+
+void CompressionCodecEncrypted::Configuration::loadImpl(
+    const Poco::Util::AbstractConfiguration & config, const String & config_prefix, EncryptionMethod method, std::unique_ptr<Params> & new_params)
+{
+    // if method is not smaller than MAX_ENCRYPTION_METHOD it is incorrect
+    if (method >= MAX_ENCRYPTION_METHOD)
+        throw Exception("Wrong argument for loading configurations.", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Scan all keys in config and add them into storage. If key is in hex, transform it.
+    /// Remember key ID for each key, because it will be used in encryption/decryption
+    Strings config_keys;
+    config.keys(config_prefix, config_keys);
+    for (const std::string & config_key : config_keys)
+    {
+        String key;
+        UInt64 key_id;
+
+        if ((config_key == "key") || config_key.starts_with("key["))
+        {
+            key = config.getString(config_prefix + "." + config_key, "");
+            key_id = config.getUInt64(config_prefix + "." + config_key + "[@id]", 0);
+        }
+        else if ((config_key == "key_hex") || config_key.starts_with("key_hex["))
+        {
+            key = unhexKey(config.getString(config_prefix + "." + config_key, ""));
+            key_id = config.getUInt64(config_prefix + "." + config_key + "[@id]", 0);
+        }
+        else
+            continue;
+
+        /// For each key its id should be unique.
+        if (new_params->keys_storage[method].contains(key_id))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Multiple keys have the same ID {}", key_id);
+
+        /// Check size of key. Its length depends on encryption algorithm.
+        if (key.size() != methodKeySize(method))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Got an encryption key with unexpected size {}, the size should be {}",
+                key.size(), methodKeySize(method));
+
+        new_params->keys_storage[method][key_id] = key;
+    }
+
+    /// Check that we have at least one key for this method (otherwise it is incorrect to use it).
+    if (new_params->keys_storage[method].empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No keys, an encryption needs keys to work");
+
+    if (!config.has(config_prefix + ".current_key_id"))
+    {
+        /// In case of multiple keys, current_key_id is mandatory
+        if (new_params->keys_storage[method].size() > 1)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There are multiple keys in config. current_key_id is required");
+
+        /// If there is only one key with non zero ID, curren_key_id should be defined.
+        if (new_params->keys_storage[method].size() == 1 && !new_params->keys_storage[method].contains(0))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Config has one key with non zero id. сurrent_key_id is required");
+    }
+
+    /// Try to find which key will be used for encryption. If there is no current_key and only one key without id
+    /// or with zero id, first key will be used for encryption (its index equals to zero).
+    new_params->current_key_id[method] = config.getUInt64(config_prefix + ".current_key_id", 0);
+
+    /// Check that we have current key. Otherwise config is incorrect.
+    if (!new_params->keys_storage[method].contains(new_params->current_key_id[method]))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not found a key with the current ID {}", new_params->current_key_id[method]);
+
+    /// Read nonce (in hex or in string). Its length should be 12 bytes (actual_nonce_size).
+    if (config.has(config_prefix + ".nonce_hex"))
+        new_params->nonce[method] = unhexKey(config.getString(config_prefix + ".nonce_hex"));
+    else
+        new_params->nonce[method] = config.getString(config_prefix + ".nonce", "");
+
+    if (new_params->nonce[method].size() != actual_nonce_size && !new_params->nonce[method].empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Got nonce with unexpected size {}, the size should be {}", new_params->nonce[method].size(), actual_nonce_size);
+}
+
+bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    /// Try to create new parameters and fill them from config.
+    /// If there will be some errors, print their message to notify user that
+    /// something went wrong and new parameters are not available
+    try
+    {
+        load(config, config_prefix);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        return false;
+    }
+    return true;
+}
+
+void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+{
+    /// Try to create new parameters and fill them from config.
+    /// If there will be some errors, throw error
+    std::unique_ptr<Params> new_params(new Params);
+    if (config.has(config_prefix + ".aes_128_gcm_siv"))
+    {
+        loadImpl(config, config_prefix + ".aes_128_gcm_siv", AES_128_GCM_SIV, new_params);
+    }
+    if (config.has(config_prefix + ".aes_256_gcm_siv"))
+    {
+        loadImpl(config, config_prefix + ".aes_256_gcm_siv", AES_256_GCM_SIV, new_params);
+    }
+
+    params.set(std::move(new_params));
+}
+
+void CompressionCodecEncrypted::Configuration::getCurrentKeyAndNonce(EncryptionMethod method, UInt64 & current_key_id, String &current_key, String & nonce) const
+{
+    /// It parameters were not set, throw exception
+    if (!params.get())
+        throw Exception("Empty params in CompressionCodecEncrypted configuration", ErrorCodes::BAD_ARGUMENTS);
+
+    /// Save parameters in variable, because they can always change.
+    /// As this function not atomic, we should be certain that we get information from one particular version for correct work.
+    const auto current_params = params.get();
+    current_key_id = current_params->current_key_id[method];
+
+    /// As parameters can be created empty, we need to check that this key is available.
+    if (current_params->keys_storage[method].contains(current_key_id))
+        current_key = current_params->keys_storage[method].at(current_key_id);
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no current_key {} in config. Please, put it in config and reload.", current_key_id);
+
+    /// If there is no nonce in config, we need to generate particular one,
+    /// because all encryptions should have nonce and random nonce generation will lead to cases
+    /// when nonce after config reload (nonce is not defined in config) will differ from previously generated one.
+    /// This will lead to data loss.
+    nonce = current_params->nonce[method];
+    if (nonce.empty())
+        nonce = empty_nonce;
+}
+
+String CompressionCodecEncrypted::Configuration::getKey(EncryptionMethod method, const UInt64 & key_id) const
+{
+    String key;
+    /// See description of previous finction, logic is the same.
+    if (!params.get())
+        throw Exception("Empty params in CompressionCodecEncrypted configuration", ErrorCodes::BAD_ARGUMENTS);
+
+    const auto current_params = params.get();
+
+    /// check if there is current key in storage
+    if (current_params->keys_storage[method].contains(key_id))
+        key = current_params->keys_storage[method].at(key_id);
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no key {} in config", key_id);
+
+    return key;
+}
+
+
+CompressionCodecEncrypted::CompressionCodecEncrypted(EncryptionMethod Method): encryption_method(Method)
+{
+    setCodecDescription(getMethodName(encryption_method));
+}
+
+uint8_t CompressionCodecEncrypted::getMethodByte() const
+{
+    return getMethodCode(encryption_method);
+}
+
+void CompressionCodecEncrypted::updateHash(SipHash & hash) const
+{
+    getCodecDesc()->updateTreeHash(hash);
+}
+
+UInt32 CompressionCodecEncrypted::getMaxCompressedDataSize(UInt32 uncompressed_size) const
+{
+    // The GCM mode is a stream cipher. No paddings are
+    // involved. There will be a tag at the end of ciphertext (16
+    // octets). Also it has not more than 8 bytes for key_id in the beginning
+    // KeyID is followed by byte, that shows if nonce was set in config (and also will be put into data)
+    // and 12 bytes nonce or this byte will be equal to zero and no nonce will follow it.
+    return uncompressed_size + tag_size + key_id_max_size + nonce_max_size;
+}
+
+UInt32 CompressionCodecEncrypted::doCompressData(const char * source, UInt32 source_size, char * dest) const
+{
+    // Nonce, key and plaintext will be used to generate authentication tag
+    // and message encryption key. AES-GCM-SIV authenticates the encoded additional data and plaintext.
+    // For this purpose message_authentication_key is used.
+    // Algorithm is completely deterministic, but does not leak any
+    // information about the data block except for equivalence of
+    // identical blocks (under the same key).
+
+    const std::string_view plaintext = std::string_view(source, source_size);
+
+    /// Get key and nonce for encryption
+    UInt64 current_key_id;
+    String current_key, nonce;
+    Configuration::instance().getCurrentKeyAndNonce(encryption_method, current_key_id, current_key, nonce);
+
+    /// Write current key id to support multiple keys.
+    /// (key id in the beginning will help to decrypt data after changing current key)
+    char* ciphertext_with_nonce = writeVarUInt(current_key_id, dest);
+    size_t keyid_size = ciphertext_with_nonce - dest;
+
+    /// write nonce in data. This will help to read data even after changing nonce in config
+    /// If there were no nonce in data, one zero byte will be written
+    char* ciphertext = writeNonce(nonce, ciphertext_with_nonce);
+    UInt64 nonce_size = ciphertext - ciphertext_with_nonce;
+
+    // The ciphertext and the authentication tag will be written directly in the dest buffer.
+    size_t out_len = encrypt(plaintext, ciphertext, encryption_method, current_key, nonce);
+
+    /// Length of encrypted text should be equal to text length plus tag_size (which was added by algorithm).
+    if (out_len != source_size + tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't encrypt data, length after encryption {} is wrong, expected {}", out_len, source_size + tag_size);
+
+    return out_len + keyid_size + nonce_size;
+}
+
+void CompressionCodecEncrypted::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
+{
+    /// The key is needed for decrypting. That's why it is read at the beginning of process.
+    UInt64 key_id;
+    const char * ciphertext_with_nonce = readVarUInt(key_id, source, source_size);
+
+    /// Size of text should be decreased by key_size, because key_size bytes were not participating in encryption process.
+    size_t keyid_size = ciphertext_with_nonce - source;
+    String nonce;
+    String key = Configuration::instance().getKey(encryption_method, key_id);
+
+    /// try to read nonce from file (if it was set while encrypting)
+    const char * ciphertext = readNonce(nonce, ciphertext_with_nonce);
+
+    /// Size of text should be decreased by nonce_size, because nonce_size bytes were not participating in encryption process.
+    UInt64 nonce_size = ciphertext - ciphertext_with_nonce;
+
+    /// Count text size (nonce and key_id was read from source)
+    size_t ciphertext_size = source_size - keyid_size - nonce_size;
+    if (ciphertext_size != uncompressed_size + tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't decrypt data, uncompressed_size {} is wrong, expected {}", uncompressed_size, ciphertext_size - tag_size);
+
+
+    size_t out_len = decrypt({ciphertext, ciphertext_size}, dest, encryption_method, key, nonce);
+    if (out_len != ciphertext_size - tag_size)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't decrypt data, out length after decryption {} is wrong, expected {}", out_len, ciphertext_size - tag_size);
+}
+
 }
 
 #else /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
 
 namespace DB
 {
-    void registerCodecEncrypted(CompressionCodecFactory &)
-    {
-    }
+
+namespace
+{
+
+/// Register codec in factory
+void registerEncryptionCodec(CompressionCodecFactory & factory, EncryptionMethod Method)
+{
+    auto throw_no_ssl = [](const ASTPtr &) -> CompressionCodecPtr { throw Exception(ErrorCodes::OPENSSL_ERROR, "Server was built without SSL support. Encryption is disabled."); };
+    const auto method_code = getMethodCode(Method); /// Codec need to know its code
+    factory.registerCompressionCodec(getMethodName(Method), method_code, throw_no_ssl);
+}
+
+}
+
+CompressionCodecEncrypted::Configuration & CompressionCodecEncrypted::Configuration::instance()
+{
+    static CompressionCodecEncrypted::Configuration ret;
+    return ret;
+}
+
+/// if encryption is disabled.
+bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
+{
+    return false;
+}
+
+/// if encryption is disabled, print warning about this.
+void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
+{
+    LOG_WARNING(&Poco::Logger::get("CompressionCodecEncrypted"), "Server was built without SSL support. Encryption is disabled.");
+}
+
 }
 
 #endif /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
+
+namespace DB
+{
+/// Register codecs for all algorithms
+void registerCodecEncrypted(CompressionCodecFactory & factory)
+{
+    registerEncryptionCodec(factory, AES_128_GCM_SIV);
+    registerEncryptionCodec(factory, AES_256_GCM_SIV);
+}
+}
diff --git a/src/Compression/CompressionCodecEncrypted.h b/src/Compression/CompressionCodecEncrypted.h
index e58fd4ab173..763e4da5d56 100644
--- a/src/Compression/CompressionCodecEncrypted.h
+++ b/src/Compression/CompressionCodecEncrypted.h
@@ -1,104 +1,135 @@
 #pragma once
 
-// This depends on BoringSSL-specific API, notably <openssl/aead.h>.
-#include <Common/config.h>
-#if USE_SSL && USE_INTERNAL_SSL_LIBRARY
-
+#include <string_view>
+#include <unordered_map>
+#include <base/types.h>
 #include <Compression/ICompressionCodec.h>
-#include <boost/noncopyable.hpp>
-#include <openssl/aead.h>
-#include <optional>
+#include <Poco/Util/LayeredConfiguration.h>
+#include <Common/MultiVersion.h>
 
 namespace DB
 {
-    /** This codec encrypts and decrypts blocks with AES-128 in
-      * GCM-SIV mode (RFC-8452), which is the only cipher currently
-      * supported. Although it is implemented as a compression codec
-      * it doesn't actually compress data. In fact encrypted data will
-      * no longer be compressible in any meaningful way. This means if
-      * you want to apply both compression and encryption to your
-      * columns, you need to put this codec at the end of the chain
-      * like "column Int32 Codec(Delta, LZ4,
-      * Encrypted('AES-128-GCM-SIV'))".
-      *
-      * The key is obtained by executing a command specified in the
-      * configuration file at startup, and if it doesn't specify a
-      * command the codec refuses to process any data. The command is
-      * expected to write a Base64-encoded key of any length, and we
-      * apply HKDF-SHA-256 to derive a 128-bit key-generation key
-      * (only the first half of the result is used). We then encrypt
-      * blocks in AES-128-GCM-SIV with a universally fixed nonce (12
-      * repeated NUL characters).
-      *
-      * This construct has a weakness due to the nonce being fixed at
-      * all times: when the same data block is encrypted twice, the
-      * resulting ciphertext will be exactly the same. We have to live
-      * with this weakness because ciphertext must be deterministic,
-      * as otherwise our engines like ReplicatedMergeTree cannot
-      * deduplicate data blocks.
-      */
-    class CompressionCodecEncrypted : public ICompressionCodec
+
+/// Now we have two algorithms.
+enum EncryptionMethod
+{
+    AES_128_GCM_SIV,
+    AES_256_GCM_SIV,
+    MAX_ENCRYPTION_METHOD
+};
+
+/** This codec encrypts and decrypts blocks with AES-128 in
+    * GCM-SIV mode (RFC-8452), which is the only cipher currently
+    * supported. Although it is implemented as a compression codec
+    * it doesn't actually compress data. In fact encrypted data will
+    * no longer be compressible in any meaningful way. This means if
+    * you want to apply both compression and encryption to your
+    * columns, you need to put this codec at the end of the chain
+    * like "column Int32 Codec(Delta, LZ4,
+    * AES_128_GCM_SIV)".
+    *
+    * The key is obtained by executing a command specified in the
+    * configuration file at startup, and if it doesn't specify a
+    * command the codec refuses to process any data. The command is
+    * expected to write a Base64-encoded key of any length, and we
+    * apply HKDF-SHA-256 to derive a 128-bit key-generation key
+    * (only the first half of the result is used). We then encrypt
+    * blocks in AES-128-GCM-SIV with a universally fixed nonce (12
+    * repeated NUL characters).
+    *
+    * This construct has a weakness due to the nonce being fixed at
+    * all times: when the same data block is encrypted twice, the
+    * resulting ciphertext will be exactly the same. We have to live
+    * with this weakness because ciphertext must be deterministic,
+    * as otherwise our engines like ReplicatedMergeTree cannot
+    * deduplicate data blocks.
+    */
+class CompressionCodecEncrypted : public ICompressionCodec
+{
+public:
+    /** If a key is available, the server is supposed to
+        * invoke this static method at the startup. The codec will
+        * refuse to compress or decompress any data until that. The
+        * key can be an arbitrary octet string, but it is
+        * recommended that the key is at least 16 octets long.
+        *
+        * Note that the key is currently not guarded by a
+        * mutex. This method should be invoked no more than once.
+        */
+    explicit CompressionCodecEncrypted(EncryptionMethod Method);
+
+    /**
+        * This is utility class. It holds information about encryption configuration.
+        */
+    class Configuration
     {
     public:
-        /** If a master key is available, the server is supposed to
-          * invoke this static method at the startup. The codec will
-          * refuse to compress or decompress any data until that. The
-          * key can be an arbitrary octet string, but it is
-          * recommended that the key is at least 16 octets long.
-          *
-          * Note that the master key is currently not guarded by a
-          * mutex. This method should be invoked no more than once.
-          */
-        static void setMasterKey(const std::string_view & master_key);
+        /// Configuration should be singleton. Instance method
+        static Configuration & instance();
 
-        CompressionCodecEncrypted(const std::string_view & cipher);
+        /// Try to load data from config.
+        bool tryLoad(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-        uint8_t getMethodByte() const override;
-        void updateHash(SipHash & hash) const override;
+        /// Load data and throw exception if something went wrong.
+        void load(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
-        bool isCompression() const override
-        {
-            return false;
-        }
-
-        bool isGenericCompression() const override
-        {
-            return false;
-        }
-
-        bool isPostProcessing() const override
-        {
-            return true;
-        }
-
-    protected:
-        UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
-
-        UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-        void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+        /// Get current key and nonce (they will be set in variables, which are pass in this function).
+        /// All data sets at the same time to prevent situations,
+        /// when config changes and key and nonce are read from different versions
+        /// If nonce is empty, it will return 12 null bytes.
+        void getCurrentKeyAndNonce(EncryptionMethod method, UInt64 & current_key_id, String & current_key, String & nonce) const;
 
+        /// Same as getCurrentKeyAndNonce. It is used to get key. (need for correct decryption, that is why nonce is not necessary)
+        String getKey(EncryptionMethod method, const UInt64 & key_id) const;
     private:
-        static std::string lastErrorString();
-        static std::string deriveKey(const std::string_view & master_key);
-        static void encrypt(const std::string_view & plaintext, char * ciphertext_and_tag);
-        static void decrypt(const std::string_view & ciphertext_and_tag, char * plaintext);
-
-        /** A private class that holds keys derived from the master
-          * key.
-          */
-        struct KeyHolder : private boost::noncopyable
+        /// struct Params consists of:
+        /// 1) hash-table of keys and their ids
+        /// 2) current key for encryption
+        /// 3) nonce for encryption
+        /// All this parameters have MAX_ENCRYPTION_METHOD count of versions,
+        /// because all algorithms can be described in config and used for different tables.
+        struct Params
         {
-            KeyHolder(const std::string_view & master_key);
-            ~KeyHolder();
-
-            std::string keygen_key;
-            EVP_AEAD_CTX ctx;
+            std::unordered_map<UInt64, String> keys_storage[MAX_ENCRYPTION_METHOD];
+            UInt64 current_key_id[MAX_ENCRYPTION_METHOD] = {0, 0};
+            String nonce[MAX_ENCRYPTION_METHOD];
         };
 
-        static const KeyHolder & getKeys();
+        // used to read data from config and create Params
+        static void loadImpl(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, EncryptionMethod method, std::unique_ptr<Params>& new_params);
 
-        static inline std::optional<KeyHolder> keys;
+        MultiVersion<Params> params;
     };
-}
 
-#endif /* USE_SSL && USE_INTERNAL_SSL_LIBRARY */
+    uint8_t getMethodByte() const override;
+    void updateHash(SipHash & hash) const override;
+
+    bool isCompression() const override
+    {
+        return false;
+    }
+
+    bool isGenericCompression() const override
+    {
+        return false;
+    }
+
+    bool isEncryption() const override
+    {
+        return true;
+    }
+protected:
+    UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const override;
+
+    /// Encrypt data with chosen method.
+    /// Throws exception if encryption is impossible or size of encrypted text is incorrect
+    UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
+
+    /// Decrypt data with chosen method
+    /// Throws exception if decryption is impossible or size of decrypted text is incorrect
+    void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
+private:
+    EncryptionMethod encryption_method;
+};
+
+}
diff --git a/src/Compression/CompressionCodecGorilla.cpp b/src/Compression/CompressionCodecGorilla.cpp
index 7fcb2183503..8ddb2086ebf 100644
--- a/src/Compression/CompressionCodecGorilla.cpp
+++ b/src/Compression/CompressionCodecGorilla.cpp
@@ -1,7 +1,11 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionInfo.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTIdentifier.h>
 #include <IO/WriteHelpers.h>
@@ -410,6 +414,10 @@ void CompressionCodecGorilla::doDecompressData(const char * source, UInt32 sourc
         throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
 
     UInt8 bytes_size = source[0];
+
+    if (bytes_size == 0)
+        throw Exception("Cannot decompress. File has wrong header", ErrorCodes::CANNOT_DECOMPRESS);
+
     UInt8 bytes_to_skip = uncompressed_size % bytes_size;
 
     if (UInt32(2 + bytes_to_skip) > source_size)
diff --git a/src/Compression/CompressionCodecLZ4.cpp b/src/Compression/CompressionCodecLZ4.cpp
index 8cb81e460b1..12f138dc95a 100644
--- a/src/Compression/CompressionCodecLZ4.cpp
+++ b/src/Compression/CompressionCodecLZ4.cpp
@@ -62,6 +62,7 @@ private:
 namespace ErrorCodes
 {
     extern const int CANNOT_COMPRESS;
+    extern const int CANNOT_DECOMPRESS;
     extern const int ILLEGAL_SYNTAX_FOR_CODEC_TYPE;
     extern const int ILLEGAL_CODEC_PARAMETER;
 }
@@ -93,7 +94,10 @@ UInt32 CompressionCodecLZ4::doCompressData(const char * source, UInt32 source_si
 
 void CompressionCodecLZ4::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
-    LZ4::decompress(source, dest, source_size, uncompressed_size, lz4_stat);
+    bool success = LZ4::decompress(source, dest, source_size, uncompressed_size, lz4_stat);
+
+    if (!success)
+        throw Exception("Cannot decompress", ErrorCodes::CANNOT_DECOMPRESS);
 }
 
 void registerCodecLZ4(CompressionCodecFactory & factory)
@@ -143,4 +147,10 @@ CompressionCodecLZ4HC::CompressionCodecLZ4HC(int level_)
     setCodecDescription("LZ4HC", {std::make_shared<ASTLiteral>(static_cast<UInt64>(level))});
 }
 
+
+CompressionCodecPtr getCompressionCodecLZ4(int level)
+{
+    return std::make_shared<CompressionCodecLZ4HC>(level);
+}
+
 }
diff --git a/src/Compression/CompressionCodecMultiple.cpp b/src/Compression/CompressionCodecMultiple.cpp
index a0336d66a05..8ad054673e1 100644
--- a/src/Compression/CompressionCodecMultiple.cpp
+++ b/src/Compression/CompressionCodecMultiple.cpp
@@ -1,7 +1,7 @@
 #include <Compression/CompressionCodecMultiple.h>
 #include <Compression/CompressionInfo.h>
 #include <Common/PODArray.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Compression/CompressionFactory.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/Compression/CompressionCodecMultiple.h b/src/Compression/CompressionCodecMultiple.h
index 1eb61842048..1d63fe1da55 100644
--- a/src/Compression/CompressionCodecMultiple.h
+++ b/src/Compression/CompressionCodecMultiple.h
@@ -9,7 +9,7 @@ class CompressionCodecMultiple final : public ICompressionCodec
 {
 public:
     CompressionCodecMultiple() = default;   /// Need for CompressionFactory to register codec by method byte.
-    CompressionCodecMultiple(Codecs codecs_);
+    explicit CompressionCodecMultiple(Codecs codecs_);
 
     uint8_t getMethodByte() const override;
 
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index 377db915bce..66e9082dc4a 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -2,7 +2,7 @@
 
 #include <Compression/ICompressionCodec.h>
 #include <Compression/CompressionFactory.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTIdentifier.h>
diff --git a/src/Compression/CompressionCodecZSTD.cpp b/src/Compression/CompressionCodecZSTD.cpp
index a950f1fee74..def2188d90a 100644
--- a/src/Compression/CompressionCodecZSTD.cpp
+++ b/src/Compression/CompressionCodecZSTD.cpp
@@ -156,4 +156,9 @@ void registerCodecZSTD(CompressionCodecFactory & factory)
     });
 }
 
+CompressionCodecPtr getCompressionCodecZSTD(int level)
+{
+    return std::make_shared<CompressionCodecZSTD>(level);
+}
+
 }
diff --git a/src/Compression/CompressionFactory.cpp b/src/Compression/CompressionFactory.cpp
index bb2b00a56ef..b665e898aa6 100644
--- a/src/Compression/CompressionFactory.cpp
+++ b/src/Compression/CompressionFactory.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#   include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <Compression/CompressionFactory.h>
 #include <Parsers/ASTFunction.h>
@@ -22,13 +20,10 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_CODEC;
-    extern const int BAD_ARGUMENTS;
     extern const int UNEXPECTED_AST_STRUCTURE;
     extern const int DATA_TYPE_CANNOT_HAVE_ARGUMENTS;
 }
 
-static constexpr auto DEFAULT_CODEC_NAME = "Default";
-
 CompressionCodecPtr CompressionCodecFactory::getDefaultCodec() const
 {
     return default_codec;
@@ -49,184 +44,6 @@ CompressionCodecPtr CompressionCodecFactory::get(const String & family_name, std
     }
 }
 
-void CompressionCodecFactory::validateCodec(
-    const String & family_name, std::optional<int> level, bool sanity_check, bool allow_experimental_codecs) const
-{
-    if (family_name.empty())
-        throw Exception("Compression codec name cannot be empty", ErrorCodes::BAD_ARGUMENTS);
-
-    if (level)
-    {
-        auto literal = std::make_shared<ASTLiteral>(static_cast<UInt64>(*level));
-        validateCodecAndGetPreprocessedAST(makeASTFunction("CODEC", makeASTFunction(Poco::toUpper(family_name), literal)),
-            {}, sanity_check, allow_experimental_codecs);
-    }
-    else
-    {
-        auto identifier = std::make_shared<ASTIdentifier>(Poco::toUpper(family_name));
-        validateCodecAndGetPreprocessedAST(makeASTFunction("CODEC", identifier),
-            {}, sanity_check, allow_experimental_codecs);
-    }
-}
-
-ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
-    const ASTPtr & ast, const IDataType * column_type, bool sanity_check, bool allow_experimental_codecs) const
-{
-    if (const auto * func = ast->as<ASTFunction>())
-    {
-        ASTPtr codecs_descriptions = std::make_shared<ASTExpressionList>();
-
-        bool is_compression = false;
-        bool has_none = false;
-        std::optional<size_t> generic_compression_codec_pos;
-        std::set<size_t> post_processing_codecs;
-
-        bool can_substitute_codec_arguments = true;
-        for (size_t i = 0, size = func->arguments->children.size(); i < size; ++i)
-        {
-            const auto & inner_codec_ast = func->arguments->children[i];
-            String codec_family_name;
-            ASTPtr codec_arguments;
-            if (const auto * family_name = inner_codec_ast->as<ASTIdentifier>())
-            {
-                codec_family_name = family_name->name();
-                codec_arguments = {};
-            }
-            else if (const auto * ast_func = inner_codec_ast->as<ASTFunction>())
-            {
-                codec_family_name = ast_func->name;
-                codec_arguments = ast_func->arguments;
-            }
-            else
-                throw Exception("Unexpected AST element for compression codec", ErrorCodes::UNEXPECTED_AST_STRUCTURE);
-
-            /// Default codec replaced with current default codec which may depend on different
-            /// settings (and properties of data) in runtime.
-            CompressionCodecPtr result_codec;
-            if (codec_family_name == DEFAULT_CODEC_NAME)
-            {
-                if (codec_arguments != nullptr)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "{} codec cannot have any arguments, it's just an alias for codec specified in config.xml", DEFAULT_CODEC_NAME);
-
-                result_codec = default_codec;
-                codecs_descriptions->children.emplace_back(std::make_shared<ASTIdentifier>(DEFAULT_CODEC_NAME));
-            }
-            else
-            {
-                if (column_type)
-                {
-                    CompressionCodecPtr prev_codec;
-                    IDataType::StreamCallbackWithType callback = [&](
-                        const ISerialization::SubstreamPath & substream_path, const IDataType & substream_type)
-                    {
-                        if (ISerialization::isSpecialCompressionAllowed(substream_path))
-                        {
-                            result_codec = getImpl(codec_family_name, codec_arguments, &substream_type);
-
-                            /// Case for column Tuple, which compressed with codec which depends on data type, like Delta.
-                            /// We cannot substitute parameters for such codecs.
-                            if (prev_codec && prev_codec->getHash() != result_codec->getHash())
-                                can_substitute_codec_arguments = false;
-                            prev_codec = result_codec;
-                        }
-                    };
-
-                    ISerialization::SubstreamPath stream_path;
-                    column_type->enumerateStreams(column_type->getDefaultSerialization(), callback, stream_path);
-
-                    if (!result_codec)
-                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find any substream with data type for type {}. It's a bug", column_type->getName());
-                }
-                else
-                {
-                    result_codec = getImpl(codec_family_name, codec_arguments, nullptr);
-                }
-
-                if (!allow_experimental_codecs && result_codec->isExperimental())
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Codec {} is experimental and not meant to be used in production."
-                        " You can enable it with the 'allow_experimental_codecs' setting.",
-                        codec_family_name);
-
-                codecs_descriptions->children.emplace_back(result_codec->getCodecDesc());
-            }
-
-            is_compression |= result_codec->isCompression();
-            has_none |= result_codec->isNone();
-
-            if (!generic_compression_codec_pos && result_codec->isGenericCompression())
-                generic_compression_codec_pos = i;
-
-            if (result_codec->isPostProcessing())
-                post_processing_codecs.insert(i);
-        }
-
-        String codec_description = queryToString(codecs_descriptions);
-
-        if (sanity_check)
-        {
-            if (codecs_descriptions->children.size() > 1 && has_none)
-                throw Exception(
-                    "It does not make sense to have codec NONE along with other compression codecs: " + codec_description
-                        + ". (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).",
-                    ErrorCodes::BAD_ARGUMENTS);
-
-            /// Allow to explicitly specify single NONE codec if user don't want any compression.
-            /// But applying other transformations solely without compression (e.g. Delta) does not make sense.
-            /// It's okay to apply post-processing codecs solely without anything else.
-            if (!is_compression && !has_none && post_processing_codecs.size() != codecs_descriptions->children.size())
-                throw Exception(
-                    "Compression codec " + codec_description
-                        + " does not compress anything."
-                          " You may want to add generic compression algorithm after other transformations, like: "
-                        + codec_description
-                        + ", LZ4."
-                          " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).",
-                    ErrorCodes::BAD_ARGUMENTS);
-
-            /// It does not make sense to apply any non-post-processing codecs
-            /// after post-processing one.
-            if (!post_processing_codecs.empty() &&
-                *post_processing_codecs.begin() != codecs_descriptions->children.size() - post_processing_codecs.size())
-                throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
-                                " because it does not make sense to apply any non-post-processing codecs after"
-                                " post-processing ones. (Note: you can enable setting 'allow_suspicious_codecs'"
-                                " to skip this check).", ErrorCodes::BAD_ARGUMENTS);
-
-            /// It does not make sense to apply any transformations after generic compression algorithm
-            /// So, generic compression can be only one and only at the end.
-            if (generic_compression_codec_pos &&
-                *generic_compression_codec_pos != codecs_descriptions->children.size() - 1 - post_processing_codecs.size())
-                throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
-                    " because it does not make sense to apply any transformations after generic compression algorithm."
-                    " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).", ErrorCodes::BAD_ARGUMENTS);
-
-        }
-
-        /// For columns with nested types like Tuple(UInt32, UInt64) we
-        /// obviously cannot substitute parameters for codecs which depend on
-        /// data type, because for the first column Delta(4) is suitable and
-        /// Delta(8) for the second. So we should leave codec description as is
-        /// and deduce them in get method for each subtype separately. For all
-        /// other types it's better to substitute parameters, for better
-        /// readability and backward compatibility.
-        if (can_substitute_codec_arguments)
-        {
-            std::shared_ptr<ASTFunction> result = std::make_shared<ASTFunction>();
-            result->name = "CODEC";
-            result->arguments = codecs_descriptions;
-            return result;
-        }
-        else
-        {
-            return ast;
-        }
-    }
-
-    throw Exception("Unknown codec family: " + queryToString(ast), ErrorCodes::UNKNOWN_CODEC);
-}
-
 
 CompressionCodecPtr CompressionCodecFactory::get(
     const ASTPtr & ast, const IDataType * column_type, CompressionCodecPtr current_default, bool only_generic) const
diff --git a/src/Compression/CompressionFactory.h b/src/Compression/CompressionFactory.h
index cdbb663935a..2101dc28c65 100644
--- a/src/Compression/CompressionFactory.h
+++ b/src/Compression/CompressionFactory.h
@@ -14,6 +14,8 @@
 namespace DB
 {
 
+static constexpr auto DEFAULT_CODEC_NAME = "Default";
+
 class ICompressionCodec;
 
 using CompressionCodecPtr = std::shared_ptr<ICompressionCodec>;
@@ -38,13 +40,7 @@ public:
     CompressionCodecPtr getDefaultCodec() const;
 
     /// Validate codecs AST specified by user and parses codecs description (substitute default parameters)
-    ASTPtr validateCodecAndGetPreprocessedAST(const ASTPtr & ast, const IDataType * column_type, bool sanity_check, bool allow_experimental_codecs) const;
-
-    /// Just wrapper for previous method.
-    ASTPtr validateCodecAndGetPreprocessedAST(const ASTPtr & ast, const DataTypePtr & column_type, bool sanity_check, bool allow_experimental_codecs) const
-    {
-        return validateCodecAndGetPreprocessedAST(ast, column_type.get(), sanity_check, allow_experimental_codecs);
-    }
+    ASTPtr validateCodecAndGetPreprocessedAST(const ASTPtr & ast, const DataTypePtr & column_type, bool sanity_check, bool allow_experimental_codecs) const;
 
     /// Validate codecs AST specified by user
     void validateCodec(const String & family_name, std::optional<int> level, bool sanity_check, bool allow_experimental_codecs) const;
diff --git a/src/Compression/CompressionFactoryAdditions.cpp b/src/Compression/CompressionFactoryAdditions.cpp
new file mode 100644
index 00000000000..b5f00c60827
--- /dev/null
+++ b/src/Compression/CompressionFactoryAdditions.cpp
@@ -0,0 +1,215 @@
+/**
+ * This file contains a part of CompressionCodecFactory methods definitions and
+ * is needed only because they have dependencies on DataTypes.
+ * They are not useful for fuzzers, so we leave them in other translation unit.
+ */
+
+#include <Compression/CompressionFactory.h>
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/NestedUtils.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNested.h>
+#include <Common/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNEXPECTED_AST_STRUCTURE;
+    extern const int UNKNOWN_CODEC;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+
+void CompressionCodecFactory::validateCodec(
+    const String & family_name, std::optional<int> level, bool sanity_check, bool allow_experimental_codecs) const
+{
+    if (family_name.empty())
+        throw Exception("Compression codec name cannot be empty", ErrorCodes::BAD_ARGUMENTS);
+
+    if (level)
+    {
+        auto literal = std::make_shared<ASTLiteral>(static_cast<UInt64>(*level));
+        validateCodecAndGetPreprocessedAST(makeASTFunction("CODEC", makeASTFunction(Poco::toUpper(family_name), literal)),
+            {}, sanity_check, allow_experimental_codecs);
+    }
+    else
+    {
+        auto identifier = std::make_shared<ASTIdentifier>(Poco::toUpper(family_name));
+        validateCodecAndGetPreprocessedAST(makeASTFunction("CODEC", identifier),
+            {}, sanity_check, allow_experimental_codecs);
+    }
+}
+
+
+ASTPtr CompressionCodecFactory::validateCodecAndGetPreprocessedAST(
+    const ASTPtr & ast, const DataTypePtr & column_type, bool sanity_check, bool allow_experimental_codecs) const
+{
+    if (const auto * func = ast->as<ASTFunction>())
+    {
+        ASTPtr codecs_descriptions = std::make_shared<ASTExpressionList>();
+
+        bool is_compression = false;
+        bool has_none = false;
+        std::optional<size_t> generic_compression_codec_pos;
+        std::set<size_t> encryption_codecs;
+
+        bool can_substitute_codec_arguments = true;
+        for (size_t i = 0, size = func->arguments->children.size(); i < size; ++i)
+        {
+            const auto & inner_codec_ast = func->arguments->children[i];
+            String codec_family_name;
+            ASTPtr codec_arguments;
+            if (const auto * family_name = inner_codec_ast->as<ASTIdentifier>())
+            {
+                codec_family_name = family_name->name();
+                codec_arguments = {};
+            }
+            else if (const auto * ast_func = inner_codec_ast->as<ASTFunction>())
+            {
+                codec_family_name = ast_func->name;
+                codec_arguments = ast_func->arguments;
+            }
+            else
+                throw Exception("Unexpected AST element for compression codec", ErrorCodes::UNEXPECTED_AST_STRUCTURE);
+
+            /// Default codec replaced with current default codec which may depend on different
+            /// settings (and properties of data) in runtime.
+            CompressionCodecPtr result_codec;
+            if (codec_family_name == DEFAULT_CODEC_NAME)
+            {
+                if (codec_arguments != nullptr)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "{} codec cannot have any arguments, it's just an alias for codec specified in config.xml", DEFAULT_CODEC_NAME);
+
+                result_codec = default_codec;
+                codecs_descriptions->children.emplace_back(std::make_shared<ASTIdentifier>(DEFAULT_CODEC_NAME));
+            }
+            else
+            {
+                if (column_type)
+                {
+                    CompressionCodecPtr prev_codec;
+                    ISerialization::StreamCallback callback = [&](const auto & substream_path)
+                    {
+                        assert(!substream_path.empty());
+                        if (ISerialization::isSpecialCompressionAllowed(substream_path))
+                        {
+                            const auto & last_type = substream_path.back().data.type;
+                            result_codec = getImpl(codec_family_name, codec_arguments, last_type.get());
+
+                            /// Case for column Tuple, which compressed with codec which depends on data type, like Delta.
+                            /// We cannot substitute parameters for such codecs.
+                            if (prev_codec && prev_codec->getHash() != result_codec->getHash())
+                                can_substitute_codec_arguments = false;
+                            prev_codec = result_codec;
+                        }
+                    };
+
+                    ISerialization::SubstreamPath path;
+                    column_type->getDefaultSerialization()->enumerateStreams(path, callback, column_type, nullptr);
+
+                    if (!result_codec)
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find any substream with data type for type {}. It's a bug", column_type->getName());
+                }
+                else
+                {
+                    result_codec = getImpl(codec_family_name, codec_arguments, nullptr);
+                }
+
+                if (!allow_experimental_codecs && result_codec->isExperimental())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Codec {} is experimental and not meant to be used in production."
+                        " You can enable it with the 'allow_experimental_codecs' setting.",
+                        codec_family_name);
+
+                codecs_descriptions->children.emplace_back(result_codec->getCodecDesc());
+            }
+
+            is_compression |= result_codec->isCompression();
+            has_none |= result_codec->isNone();
+
+            if (!generic_compression_codec_pos && result_codec->isGenericCompression())
+                generic_compression_codec_pos = i;
+
+            if (result_codec->isEncryption())
+                encryption_codecs.insert(i);
+        }
+
+        String codec_description = queryToString(codecs_descriptions);
+
+        if (sanity_check)
+        {
+            if (codecs_descriptions->children.size() > 1 && has_none)
+                throw Exception(
+                    "It does not make sense to have codec NONE along with other compression codecs: " + codec_description
+                        + ". (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).",
+                    ErrorCodes::BAD_ARGUMENTS);
+
+            /// Allow to explicitly specify single NONE codec if user don't want any compression.
+            /// But applying other transformations solely without compression (e.g. Delta) does not make sense.
+            /// It's okay to apply encryption codecs solely without anything else.
+            if (!is_compression && !has_none && encryption_codecs.size() != codecs_descriptions->children.size())
+                throw Exception(
+                    "Compression codec " + codec_description
+                        + " does not compress anything."
+                          " You may want to add generic compression algorithm after other transformations, like: "
+                        + codec_description
+                        + ", LZ4."
+                          " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).",
+                    ErrorCodes::BAD_ARGUMENTS);
+
+            /// It does not make sense to apply any non-encryption codecs
+            /// after encryption one.
+            if (!encryption_codecs.empty() &&
+                *encryption_codecs.begin() != codecs_descriptions->children.size() - encryption_codecs.size())
+                throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
+                                " because it does not make sense to apply any non-post-processing codecs after"
+                                " post-processing ones. (Note: you can enable setting 'allow_suspicious_codecs'"
+                                " to skip this check).", ErrorCodes::BAD_ARGUMENTS);
+
+            /// It does not make sense to apply any transformations after generic compression algorithm
+            /// So, generic compression can be only one and only at the end.
+            if (generic_compression_codec_pos &&
+                *generic_compression_codec_pos != codecs_descriptions->children.size() - 1 - encryption_codecs.size())
+                throw Exception("The combination of compression codecs " + codec_description + " is meaningless,"
+                    " because it does not make sense to apply any transformations after generic compression algorithm."
+                    " (Note: you can enable setting 'allow_suspicious_codecs' to skip this check).", ErrorCodes::BAD_ARGUMENTS);
+
+        }
+
+        /// For columns with nested types like Tuple(UInt32, UInt64) we
+        /// obviously cannot substitute parameters for codecs which depend on
+        /// data type, because for the first column Delta(4) is suitable and
+        /// Delta(8) for the second. So we should leave codec description as is
+        /// and deduce them in get method for each subtype separately. For all
+        /// other types it's better to substitute parameters, for better
+        /// readability and backward compatibility.
+        if (can_substitute_codec_arguments)
+        {
+            std::shared_ptr<ASTFunction> result = std::make_shared<ASTFunction>();
+            result->name = "CODEC";
+            result->arguments = codecs_descriptions;
+            return result;
+        }
+        else
+        {
+            return ast;
+        }
+    }
+
+    throw Exception("Unknown codec family: " + queryToString(ast), ErrorCodes::UNKNOWN_CODEC);
+}
+
+
+}
diff --git a/src/Compression/CompressionInfo.h b/src/Compression/CompressionInfo.h
index 869c7110d62..bbe8315f3ea 100644
--- a/src/Compression/CompressionInfo.h
+++ b/src/Compression/CompressionInfo.h
@@ -35,15 +35,16 @@ namespace DB
 
 enum class CompressionMethodByte : uint8_t
 {
-    NONE     = 0x02,
-    LZ4      = 0x82,
-    ZSTD     = 0x90,
-    Multiple = 0x91,
-    Delta    = 0x92,
-    T64      = 0x93,
-    DoubleDelta = 0x94,
-    Gorilla     = 0x95,
-    Encrypted   = 0x96,
+    NONE            = 0x02,
+    LZ4             = 0x82,
+    ZSTD            = 0x90,
+    Multiple        = 0x91,
+    Delta           = 0x92,
+    T64             = 0x93,
+    DoubleDelta     = 0x94,
+    Gorilla         = 0x95,
+    AES_128_GCM_SIV = 0x96,
+    AES_256_GCM_SIV = 0x97
 };
 
 }
diff --git a/src/Compression/ICompressionCodec.cpp b/src/Compression/ICompressionCodec.cpp
index 46a12e50828..ba52aee69f8 100644
--- a/src/Compression/ICompressionCodec.cpp
+++ b/src/Compression/ICompressionCodec.cpp
@@ -3,7 +3,7 @@
 #include <cassert>
 
 #include <Parsers/ASTFunction.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #include <Common/Exception.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTIdentifier.h>
@@ -113,13 +113,19 @@ UInt32 ICompressionCodec::decompress(const char * source, UInt32 source_size, ch
 
 UInt32 ICompressionCodec::readCompressedBlockSize(const char * source)
 {
-    return unalignedLoad<UInt32>(&source[1]);
+    UInt32 compressed_block_size = unalignedLoad<UInt32>(&source[1]);
+    if (compressed_block_size == 0)
+        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with compressed block size 0");
+    return compressed_block_size;
 }
 
 
 UInt32 ICompressionCodec::readDecompressedBlockSize(const char * source)
 {
-    return unalignedLoad<UInt32>(&source[5]);
+    UInt32 decompressed_block_size = unalignedLoad<UInt32>(&source[5]);
+    if (decompressed_block_size == 0)
+        throw Exception(ErrorCodes::CORRUPTED_DATA, "Can't decompress data: header is corrupt with decompressed block size 0");
+    return decompressed_block_size;
 }
 
 
diff --git a/src/Compression/ICompressionCodec.h b/src/Compression/ICompressionCodec.h
index c49c16d8bad..a741e65dfdd 100644
--- a/src/Compression/ICompressionCodec.h
+++ b/src/Compression/ICompressionCodec.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <Compression/CompressionInfo.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST.h>
 #include <Common/SipHash.h>
 
@@ -18,6 +18,8 @@ using Codecs = std::vector<CompressionCodecPtr>;
 
 class IDataType;
 
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size);
+
 /**
 * Represents interface for compression codecs like LZ4, ZSTD, etc.
 */
@@ -74,7 +76,7 @@ public:
     virtual bool isGenericCompression() const = 0;
 
     /// If it is a post-processing codec such as encryption. Usually it does not make sense to apply non-post-processing codecs after this.
-    virtual bool isPostProcessing() const { return false; }
+    virtual bool isEncryption() const { return false; }
 
     /// It is a codec available only for evaluation purposes and not meant to be used in production.
     /// It will not be allowed to use unless the user will turn off the safety switch.
@@ -84,6 +86,8 @@ public:
     virtual bool isNone() const { return false; }
 
 protected:
+    /// This is used for fuzz testing
+    friend int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size);
 
     /// Return size of compressed data without header
     virtual UInt32 getMaxCompressedDataSize(UInt32 uncompressed_size) const { return uncompressed_size; }
diff --git a/src/Compression/LZ4_decompress_faster.cpp b/src/Compression/LZ4_decompress_faster.cpp
index dc293941310..85cd9fa3ab0 100644
--- a/src/Compression/LZ4_decompress_faster.cpp
+++ b/src/Compression/LZ4_decompress_faster.cpp
@@ -4,8 +4,8 @@
 #include <iostream>
 #include <Core/Defines.h>
 #include <Common/Stopwatch.h>
-#include <common/types.h>
-#include <common/unaligned.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 
 #ifdef __SSE2__
 #include <emmintrin.h>
@@ -412,13 +412,16 @@ template <> void inline copyOverlap<32, false>(UInt8 * op, const UInt8 *& match,
 /// See also https://stackoverflow.com/a/30669632
 
 template <size_t copy_amount, bool use_shuffle>
-void NO_INLINE decompressImpl(
+bool NO_INLINE decompressImpl(
      const char * const source,
      char * const dest,
+     size_t source_size,
      size_t dest_size)
 {
     const UInt8 * ip = reinterpret_cast<const UInt8 *>(source);
     UInt8 * op = reinterpret_cast<UInt8 *>(dest);
+    const UInt8 * const input_end = ip + source_size;
+    UInt8 * const output_begin = op;
     UInt8 * const output_end = op + dest_size;
 
     /// Unrolling with clang is doing >10% performance degrade.
@@ -436,15 +439,22 @@ void NO_INLINE decompressImpl(
             {
                 s = *ip++;
                 length += s;
-            } while (unlikely(s == 255));
+            } while (unlikely(s == 255 && ip < input_end));
         };
 
         /// Get literal length.
 
+        if (unlikely(ip >= input_end))
+            return false;
+
         const unsigned token = *ip++;
         length = token >> 4;
         if (length == 0x0F)
+        {
+            if (unlikely(ip + 1 >= input_end))
+                return false;
             continue_read_length();
+        }
 
         /// Copy literals.
 
@@ -461,13 +471,33 @@ void NO_INLINE decompressImpl(
         /// output: xyzHello, w
         ///                  ^-op (we will overwrite excessive bytes on next iteration)
 
+        if (unlikely(copy_end > output_end))
+            return false;
+
+        // Due to implementation specifics the copy length is always a multiple of copy_amount
+        size_t real_length = 0;
+
+        static_assert(copy_amount == 8 || copy_amount == 16 || copy_amount == 32);
+        if constexpr (copy_amount == 8)
+            real_length = (((length >> 3) + 1) * 8);
+        else if constexpr (copy_amount == 16)
+            real_length = (((length >> 4) + 1) * 16);
+        else if constexpr (copy_amount == 32)
+            real_length = (((length >> 5) + 1) * 32);
+
+        if (unlikely(ip + real_length >= input_end + ADDITIONAL_BYTES_AT_END_OF_BUFFER))
+             return false;
+
         wildCopy<copy_amount>(op, ip, copy_end);    /// Here we can write up to copy_amount - 1 bytes after buffer.
 
+        if (copy_end == output_end)
+            return true;
+
         ip += length;
         op = copy_end;
 
-        if (copy_end >= output_end)
-            return;
+        if (unlikely(ip + 1 >= input_end))
+            return false;
 
         /// Get match offset.
 
@@ -475,11 +505,18 @@ void NO_INLINE decompressImpl(
         ip += 2;
         const UInt8 * match = op - offset;
 
+        if (unlikely(match < output_begin))
+            return false;
+
         /// Get match length.
 
         length = token & 0x0F;
         if (length == 0x0F)
+        {
+            if (unlikely(ip + 1 >= input_end))
+                return false;
             continue_read_length();
+        }
         length += 4;
 
         /// Copy match within block, that produce overlapping pattern. Match may replicate itself.
@@ -515,7 +552,11 @@ void NO_INLINE decompressImpl(
 
         copy<copy_amount>(op, match);   /// copy_amount + copy_amount - 1 - 4 * 2 bytes after buffer.
         if (length > copy_amount * 2)
+        {
+            if (unlikely(copy_end > output_end))
+                return false;
             wildCopy<copy_amount>(op + copy_amount, match + copy_amount, copy_end);
+        }
 
         op = copy_end;
     }
@@ -524,7 +565,7 @@ void NO_INLINE decompressImpl(
 }
 
 
-void decompress(
+bool decompress(
     const char * const source,
     char * const dest,
     size_t source_size,
@@ -532,7 +573,7 @@ void decompress(
     PerformanceStatistics & statistics [[maybe_unused]])
 {
     if (source_size == 0 || dest_size == 0)
-        return;
+        return true;
 
     /// Don't run timer if the block is too small.
     if (dest_size >= 32768)
@@ -542,24 +583,27 @@ void decompress(
         /// Run the selected method and measure time.
 
         Stopwatch watch;
+        bool success = true;
         if (best_variant == 0)
-            decompressImpl<16, true>(source, dest, dest_size);
+            success = decompressImpl<16, true>(source, dest, source_size, dest_size);
         if (best_variant == 1)
-            decompressImpl<16, false>(source, dest, dest_size);
+            success = decompressImpl<16, false>(source, dest, source_size, dest_size);
         if (best_variant == 2)
-            decompressImpl<8, true>(source, dest, dest_size);
+            success = decompressImpl<8, true>(source, dest, source_size, dest_size);
         if (best_variant == 3)
-            decompressImpl<32, false>(source, dest, dest_size);
+            success = decompressImpl<32, false>(source, dest, source_size, dest_size);
 
         watch.stop();
 
         /// Update performance statistics.
 
         statistics.data[best_variant].update(watch.elapsedSeconds(), dest_size);
+
+        return success;
     }
     else
     {
-        decompressImpl<8, false>(source, dest, dest_size);
+        return decompressImpl<8, false>(source, dest, source_size, dest_size);
     }
 }
 
diff --git a/src/Compression/LZ4_decompress_faster.h b/src/Compression/LZ4_decompress_faster.h
index 30a0d7acb22..c1b54cf20c9 100644
--- a/src/Compression/LZ4_decompress_faster.h
+++ b/src/Compression/LZ4_decompress_faster.h
@@ -122,14 +122,14 @@ struct PerformanceStatistics
             return choose_method;
     }
 
-    PerformanceStatistics() {}
-    PerformanceStatistics(ssize_t choose_method_) : choose_method(choose_method_) {}
+    PerformanceStatistics() = default;
+    explicit PerformanceStatistics(ssize_t choose_method_) : choose_method(choose_method_) {}
 };
 
 
 /** This method dispatch to one of different implementations depending on performance statistics.
   */
-void decompress(
+bool decompress(
     const char * const source,
     char * const dest,
     size_t source_size,
diff --git a/src/Compression/examples/CMakeLists.txt b/src/Compression/examples/CMakeLists.txt
index f47c4404cf6..3cfc0ccb7dc 100644
--- a/src/Compression/examples/CMakeLists.txt
+++ b/src/Compression/examples/CMakeLists.txt
@@ -3,8 +3,3 @@ target_link_libraries (compressed_buffer PRIVATE dbms)
 
 add_executable (cached_compressed_read_buffer cached_compressed_read_buffer.cpp)
 target_link_libraries (cached_compressed_read_buffer PRIVATE dbms)
-
-if (ENABLE_FUZZING)
-    add_executable (compressed_buffer_fuzzer compressed_buffer_fuzzer.cpp)
-    target_link_libraries (compressed_buffer_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
-endif ()
diff --git a/src/Compression/examples/cached_compressed_read_buffer.cpp b/src/Compression/examples/cached_compressed_read_buffer.cpp
index 94e8b356bd5..546c9835af8 100644
--- a/src/Compression/examples/cached_compressed_read_buffer.cpp
+++ b/src/Compression/examples/cached_compressed_read_buffer.cpp
@@ -37,7 +37,7 @@ int main(int argc, char ** argv)
                 path,
                 [&]()
                 {
-                    return createReadBufferFromFileBase(path, 0, 0, 0, nullptr);
+                    return createReadBufferFromFileBase(path, {});
                 },
                 &cache
             );
@@ -56,7 +56,7 @@ int main(int argc, char ** argv)
                 path,
                 [&]()
                 {
-                    return createReadBufferFromFileBase(path, 0, 0, 0, nullptr);
+                    return createReadBufferFromFileBase(path, {});
                 },
                 &cache
             );
diff --git a/src/Compression/fuzzers/CMakeLists.txt b/src/Compression/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..189aea66a92
--- /dev/null
+++ b/src/Compression/fuzzers/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Our code has strong cohesion and target associated with `Compression` also depends on `DataTypes`.
+# But we can exclude some files which have dependencies in case of
+# fuzzer related build (we are interested in fuzzing only particular part of our code).
+# So, some symbols will be declared, but not defined. Unfortunately, this trick doesn't work with UBSan.
+# If you want really small size of the resulted binary, just link with fuzz_compression and clickhouse_common_io
+
+add_executable (compressed_buffer_fuzzer compressed_buffer_fuzzer.cpp)
+target_link_libraries (compressed_buffer_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
+
+add_executable (lz4_decompress_fuzzer lz4_decompress_fuzzer.cpp)
+target_link_libraries (lz4_decompress_fuzzer PUBLIC dbms lz4 ${LIB_FUZZING_ENGINE})
+
+add_executable (delta_decompress_fuzzer delta_decompress_fuzzer.cpp)
+target_link_libraries (delta_decompress_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
+
+add_executable (double_delta_decompress_fuzzer double_delta_decompress_fuzzer.cpp)
+target_link_libraries (double_delta_decompress_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
+
+add_executable (encrypted_decompress_fuzzer encrypted_decompress_fuzzer.cpp)
+target_link_libraries (encrypted_decompress_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
diff --git a/src/Compression/examples/compressed_buffer_fuzzer.cpp b/src/Compression/fuzzers/compressed_buffer_fuzzer.cpp
similarity index 85%
rename from src/Compression/examples/compressed_buffer_fuzzer.cpp
rename to src/Compression/fuzzers/compressed_buffer_fuzzer.cpp
index a87046eff5c..1f669696fb9 100644
--- a/src/Compression/examples/compressed_buffer_fuzzer.cpp
+++ b/src/Compression/fuzzers/compressed_buffer_fuzzer.cpp
@@ -17,6 +17,5 @@ try
 }
 catch (...)
 {
-    std::cerr << DB::getCurrentExceptionMessage(true) << std::endl;
     return 1;
 }
diff --git a/src/Compression/fuzzers/delta_decompress_fuzzer.cpp b/src/Compression/fuzzers/delta_decompress_fuzzer.cpp
new file mode 100644
index 00000000000..b039777da15
--- /dev/null
+++ b/src/Compression/fuzzers/delta_decompress_fuzzer.cpp
@@ -0,0 +1,44 @@
+#include <iostream>
+#include <string>
+
+#include <Compression/ICompressionCodec.h>
+#include <IO/BufferWithOwnMemory.h>
+
+namespace DB
+{
+    CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size);
+}
+
+struct AuxiliaryRandomData
+{
+    UInt8 delta_size_bytes;
+    size_t decompressed_size;
+};
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    if (size < sizeof(AuxiliaryRandomData))
+        return 0;
+
+    const auto * p = reinterpret_cast<const AuxiliaryRandomData *>(data);
+    auto codec = DB::getCompressionCodecDelta(p->delta_size_bytes);
+
+    size_t output_buffer_size = p->decompressed_size % 65536;
+    size -= sizeof(AuxiliaryRandomData);
+    data += sizeof(AuxiliaryRandomData) / sizeof(uint8_t);
+
+    // std::string input = std::string(reinterpret_cast<const char*>(data), size);
+    // fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, size, output_buffer_size);
+
+    DB::Memory<> memory;
+    memory.resize(output_buffer_size + codec->getAdditionalSizeAtTheEndOfBuffer());
+
+    codec->doDecompressData(reinterpret_cast<const char *>(data), size, memory.data(), output_buffer_size);
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/Compression/fuzzers/double_delta_decompress_fuzzer.cpp b/src/Compression/fuzzers/double_delta_decompress_fuzzer.cpp
new file mode 100644
index 00000000000..f9822daa3bd
--- /dev/null
+++ b/src/Compression/fuzzers/double_delta_decompress_fuzzer.cpp
@@ -0,0 +1,44 @@
+#include <iostream>
+#include <string>
+
+#include <Compression/ICompressionCodec.h>
+#include <IO/BufferWithOwnMemory.h>
+
+namespace DB
+{
+    CompressionCodecPtr getCompressionCodecDoubleDelta(UInt8 data_bytes_size);
+}
+
+struct AuxiliaryRandomData
+{
+    UInt8 data_bytes_size;
+    size_t decompressed_size;
+};
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    if (size < sizeof(AuxiliaryRandomData))
+        return 0;
+
+    const auto * p = reinterpret_cast<const AuxiliaryRandomData *>(data);
+    auto codec = DB::getCompressionCodecDoubleDelta(p->data_bytes_size);
+
+    size_t output_buffer_size = p->decompressed_size % 65536;
+    size -= sizeof(AuxiliaryRandomData);
+    data += sizeof(AuxiliaryRandomData) / sizeof(uint8_t);
+
+    // std::string input = std::string(reinterpret_cast<const char*>(data), size);
+    // fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, size, output_buffer_size);
+
+    DB::Memory<> memory;
+    memory.resize(output_buffer_size + codec->getAdditionalSizeAtTheEndOfBuffer());
+
+    codec->doDecompressData(reinterpret_cast<const char *>(data), size, memory.data(), output_buffer_size);
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
new file mode 100644
index 00000000000..9e4d4a3241f
--- /dev/null
+++ b/src/Compression/fuzzers/encrypted_decompress_fuzzer.cpp
@@ -0,0 +1,304 @@
+#include <cstddef>
+#include <cstdint>
+#include <iostream>
+#include <memory>
+#include <string>
+
+#include <Compression/ICompressionCodec.h>
+#include <Compression/CompressionCodecEncrypted.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <Poco/DOM/AutoPtr.h>
+#include <Poco/DOM/Document.h>
+#include <Poco/DOM/Element.h>
+#include <Poco/DOM/Text.h>
+#include <Poco/NumericString.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Util/XMLConfiguration.h>
+#include "Common/Exception.h"
+
+inline DB::CompressionCodecPtr getCompressionCodecEncrypted(DB::EncryptionMethod Method)
+{
+    return std::make_shared<DB::CompressionCodecEncrypted>(Method);
+}
+
+namespace
+{
+
+using namespace Poco;
+using namespace Poco::XML;
+
+/*
+Fuzzing data consists of:
+    first byte:
+        1) length of nonce is in data (for correct work with wrong data from user)
+        2) length of key is in data (for correct work with wrong data from user)
+        3) is 128 turn on
+        4) multiple keys for 128
+        5) is 256 turn on
+        6) multiple keys for 256
+        7) nonce is set
+        8) current_key is set
+
+    read_key() will cosist of following steps:
+        if (2):
+            read 4 byte to know size
+            if multiple_keys:
+                read id
+        else:
+            size is chosen correctly according to algorithm
+
+        read size_bytes as a key
+
+    next bytes will have information in this order:
+        if (3):
+            if (4):
+                read count
+                for i in range(count):
+                    read_key()
+            else:
+                read_key()
+            if (7):
+                read_nonce (simillar to read_key)
+            if (8):
+                set current_key
+
+        same for AES_256_GCM_SIV with (5) and (6) instead of (3) and (4)
+
+    This class read data and generate xml documentation.
+*/
+class XMLGenerator
+{
+public:
+    XMLGenerator(const uint8_t * data, size_t& size);
+
+    /// Try to generate config from input data using algorithm, which is described before class declaration
+    void generate();
+
+    /// Size of part, which was used on generating config
+    size_t keySize() const;
+
+    /// Get config
+    const Poco::AutoPtr<Poco::Util::XMLConfiguration>& getResult() const;
+
+    /// If something happened in generator, it will be true
+    bool hasError() const;
+private:
+    /// generate algorithm section with key and nonce
+    bool generateAlgorithmKeys(AutoPtr<Poco::XML::Element>& document_root, std::string name,
+                               uint8_t mask_for_algo, uint8_t mask_for_multiple_keys);
+
+    /// move on count bytes stream and increase counter
+    /// returns false if some errors occuried
+    bool next(ssize_t count=1);
+
+    /// Create a key from data
+    ssize_t generateKey(std::string name, bool multiple=false);
+
+    const uint8_t * data;
+
+    size_t start_size;
+    size_t keys_size;
+
+    AutoPtr<Poco::XML::Document> xml_document;
+    AutoPtr<Poco::XML::Element> algo;
+    AutoPtr<Poco::Util::XMLConfiguration> conf;
+
+    uint8_t first_byte;
+
+    bool error;
+};
+
+XMLGenerator::XMLGenerator(const uint8_t * Data, size_t& Size): data(Data), start_size(Size),
+                          conf(new Poco::Util::XMLConfiguration()), error(false) {}
+
+size_t XMLGenerator::keySize() const { return keys_size; }
+
+const Poco::AutoPtr<Poco::Util::XMLConfiguration>& XMLGenerator::getResult() const { return conf; }
+
+bool XMLGenerator::hasError() const { return error; }
+
+bool XMLGenerator::next(ssize_t count)
+{
+    /// If negative step - something went wrong
+    if (count == -1)
+    {
+        error = true;
+        return false;
+    }
+
+    /// move data and increase counter
+    keys_size += count;
+
+    /// If get after eof
+    if (keys_size >= start_size)
+    {
+        error = true;
+        return false;
+    }
+    data += count;
+
+    return true;
+}
+
+/*
+<Key>key</key>
+or
+<key id=..>key</key>
+*/
+ssize_t XMLGenerator::generateKey(std::string name, bool multiple)
+{
+    /// set traditional key size for algorithms
+    uint64_t size = 0;
+    if (name == "aes_128_gcm_siv")
+        size = 16;
+    if (name == "aes_256_gcm_siv")
+        size = 32;
+
+    /// try to read size from data
+    if (first_byte & 0x40)
+    {
+        size = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return -1;
+    }
+    /// if it is not defined, leave
+    if (!size)
+        return -1;
+
+    AutoPtr<Poco::XML::Element> key_holder;
+    if (multiple)
+    {
+        /// multiple keys have ids.
+        uint64_t id = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return -1;
+
+        key_holder = xml_document->createElement("key[id=" + std::to_string(id) + "]");
+
+    }
+    else
+    {
+        key_holder = xml_document->createElement("key");
+    }
+    AutoPtr<Text> key(xml_document->createTextNode(std::string(data, data + size)));
+    key_holder->appendChild(key);
+    algo->appendChild(key_holder);
+
+    if (!next(size))
+        return -1;
+    return size;
+}
+
+bool XMLGenerator::generateAlgorithmKeys(
+    AutoPtr<Poco::XML::Element>& document_root, std::string name, uint8_t mask_for_algo, uint8_t mask_for_multiple_keys)
+{
+    /// check if algorithm is enabled, then add multiple keys or single key
+    if (first_byte & mask_for_algo)
+    {
+        algo = xml_document->createElement(name);
+        document_root->appendChild(algo);
+
+        if (first_byte & mask_for_multiple_keys)
+        {
+            uint64_t count = *(reinterpret_cast<const uint64_t*>(data));
+            if (!next(8))
+                return false;
+
+            for (size_t i = 0; i < count; ++i)
+            {
+                if (!next(generateKey(name)))
+                    return false;
+            }
+        }
+        else
+        {
+            if (!next(generateKey(name)))
+                return false;
+        }
+    }
+
+    /// add nonce
+    if (first_byte & 0x02)
+    {
+        uint64_t nonce_size = 12;
+        if (first_byte & 0x80)
+        {
+            nonce_size = *(reinterpret_cast<const uint64_t*>(data));
+            if (!next(8))
+                return false;
+        }
+
+        AutoPtr<Poco::XML::Element> nonce_holder(xml_document->createElement("nonce"));
+        AutoPtr<Text> nonce(xml_document->createTextNode(std::string(data, data + nonce_size)));
+        nonce_holder->appendChild(nonce);
+        algo->appendChild(nonce_holder);
+    }
+
+    /// add current key id
+    if (first_byte & 0x01)
+    {
+        uint64_t current_key = *(reinterpret_cast<const uint64_t*>(data));
+        if (!next(8))
+            return false;
+
+        AutoPtr<Poco::XML::Element> cur_key_holder(xml_document->createElement("nonce"));
+        AutoPtr<Text> cur_key(xml_document->createTextNode(std::to_string(current_key)));
+        cur_key_holder->appendChild(cur_key);
+        algo->appendChild(cur_key_holder);
+    }
+
+    return true;
+}
+
+void XMLGenerator::generate()
+{
+    AutoPtr<Poco::XML::Element> document_root(xml_document->createElement("encryption_codecs"));
+    xml_document->appendChild(document_root);
+
+    /// read first byte for parsing
+    first_byte = *data;
+    if (!next())
+        return;
+
+    if (!generateAlgorithmKeys(document_root, "aes_128_gmc_siv", 0x20, 0x10))
+        return;
+    if (!generateAlgorithmKeys(document_root, "aes_256_gmc_siv", 0x08, 0x04))
+        return;
+
+    conf->load(xml_document);
+}
+
+}
+
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    XMLGenerator generator(data, size);
+
+    generator.generate();
+    if (generator.hasError())
+        return 0;
+
+    auto config = generator.getResult();
+    auto codec_128 = getCompressionCodecEncrypted(DB::AES_128_GCM_SIV);
+    auto codec_256 = getCompressionCodecEncrypted(DB::AES_256_GCM_SIV);
+    DB::CompressionCodecEncrypted::Configuration::instance().tryLoad(*config, "");
+
+    size_t data_size = size - generator.keySize();
+
+    std::string input = std::string(reinterpret_cast<const char*>(data), data_size);
+    fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, data_size, input.size() - 31);
+
+    DB::Memory<> memory;
+    memory.resize(input.size() + codec_128->getAdditionalSizeAtTheEndOfBuffer());
+    codec_128->doDecompressData(input.data(), input.size(), memory.data(), input.size() - 31);
+
+    memory.resize(input.size() + codec_128->getAdditionalSizeAtTheEndOfBuffer());
+    codec_256->doDecompressData(input.data(), input.size(), memory.data(), input.size() - 31);
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/Compression/fuzzers/lz4_decompress_fuzzer.cpp b/src/Compression/fuzzers/lz4_decompress_fuzzer.cpp
new file mode 100644
index 00000000000..85c4c9bd329
--- /dev/null
+++ b/src/Compression/fuzzers/lz4_decompress_fuzzer.cpp
@@ -0,0 +1,47 @@
+#include <iostream>
+#include <string>
+
+#include <Compression/ICompressionCodec.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <Compression/LZ4_decompress_faster.h>
+
+namespace DB
+{
+    CompressionCodecPtr getCompressionCodecLZ4(int level);
+}
+
+struct AuxiliaryRandomData
+{
+    size_t level;
+    size_t decompressed_size;
+};
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+
+    if (size < sizeof(AuxiliaryRandomData) + LZ4::ADDITIONAL_BYTES_AT_END_OF_BUFFER)
+        return 0;
+
+    const auto * p = reinterpret_cast<const AuxiliaryRandomData *>(data);
+    auto codec = DB::getCompressionCodecLZ4(p->level);
+
+    size_t output_buffer_size = p->decompressed_size % 65536;
+    size -= sizeof(AuxiliaryRandomData);
+    size -= LZ4::ADDITIONAL_BYTES_AT_END_OF_BUFFER;
+    data += sizeof(AuxiliaryRandomData) / sizeof(uint8_t);
+
+    // std::string input = std::string(reinterpret_cast<const char*>(data), size);
+    // fmt::print(stderr, "Using input {} of size {}, output size is {}. \n", input, size, output_buffer_size);
+
+    DB::Memory<> memory;
+    memory.resize(output_buffer_size + LZ4::ADDITIONAL_BYTES_AT_END_OF_BUFFER);
+
+    codec->doDecompressData(reinterpret_cast<const char *>(data), size, memory.data(), output_buffer_size);
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/Compression/getCompressionCodecForFile.cpp b/src/Compression/getCompressionCodecForFile.cpp
index 1557985ff66..a3ad2c93cc0 100644
--- a/src/Compression/getCompressionCodecForFile.cpp
+++ b/src/Compression/getCompressionCodecForFile.cpp
@@ -4,7 +4,7 @@
 #include <IO/ReadBufferFromFileBase.h>
 #include <Compression/CompressionCodecMultiple.h>
 #include <Common/PODArray.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 6ba2d3457ea..f0d234e5cc5 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/PODArray.h>
 #include <Common/Stopwatch.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/IDataType.h>
 #include <IO/ReadBufferFromMemory.h>
@@ -685,7 +685,7 @@ auto SequentialGenerator = [](auto stride = 1)
 template <typename T>
 using uniform_distribution =
 typename std::conditional_t<std::is_floating_point_v<T>, std::uniform_real_distribution<T>,
-        typename std::conditional_t<is_integer_v<T>, std::uniform_int_distribution<T>, void>>;
+        typename std::conditional_t<is_integer<T>, std::uniform_int_distribution<T>, void>>;
 
 
 template <typename T = Int32>
diff --git a/src/Compression/ya.make b/src/Compression/ya.make
deleted file mode 100644
index 2dafbda262a..00000000000
--- a/src/Compression/ya.make
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/lz4
-    contrib/libs/zstd/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/lz4
-    contrib/libs/zstd
-)
-
-
-SRCS(
-    CachedCompressedReadBuffer.cpp
-    CheckingCompressedReadBuffer.cpp
-    CompressedReadBuffer.cpp
-    CompressedReadBufferBase.cpp
-    CompressedReadBufferFromFile.cpp
-    CompressedWriteBuffer.cpp
-    CompressionCodecDelta.cpp
-    CompressionCodecDoubleDelta.cpp
-    CompressionCodecEncrypted.cpp
-    CompressionCodecGorilla.cpp
-    CompressionCodecLZ4.cpp
-    CompressionCodecMultiple.cpp
-    CompressionCodecNone.cpp
-    CompressionCodecT64.cpp
-    CompressionCodecZSTD.cpp
-    CompressionFactory.cpp
-    ICompressionCodec.cpp
-    LZ4_decompress_faster.cpp
-    getCompressionCodecForFile.cpp
-
-)
-
-END()
diff --git a/src/Compression/ya.make.in b/src/Compression/ya.make.in
deleted file mode 100644
index 65fe0637600..00000000000
--- a/src/Compression/ya.make.in
+++ /dev/null
@@ -1,21 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/lz4
-    contrib/libs/zstd/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/lz4
-    contrib/libs/zstd
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 6ec9b17d0a7..eabb1f2c5a6 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -2,13 +2,15 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromFile.h>
+#include <IO/ZstdDeflatingAppendableWriteBuffer.h>
 #include <filesystem>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <Common/Exception.h>
 #include <Common/SipHash.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
+
 
 namespace DB
 {
@@ -17,6 +19,7 @@ namespace ErrorCodes
 {
     extern const int CHECKSUM_DOESNT_MATCH;
     extern const int CORRUPTED_DATA;
+    extern const int UNSUPPORTED_METHOD;
     extern const int UNKNOWN_FORMAT_VERSION;
     extern const int LOGICAL_ERROR;
 }
@@ -29,7 +32,7 @@ constexpr auto DEFAULT_PREFIX = "changelog";
 std::string formatChangelogPath(const std::string & prefix, const ChangelogFileDescription & name)
 {
     std::filesystem::path path(prefix);
-    path /= std::filesystem::path(name.prefix + "_" + std::to_string(name.from_log_index) + "_" + std::to_string(name.to_log_index) + ".bin");
+    path /= std::filesystem::path(name.prefix + "_" + std::to_string(name.from_log_index) + "_" + std::to_string(name.to_log_index) + "." + name.extension);
     return path;
 }
 
@@ -46,6 +49,7 @@ ChangelogFileDescription getChangelogFileDescription(const std::string & path_st
     result.prefix = filename_parts[0];
     result.from_log_index = parse<uint64_t>(filename_parts[1]);
     result.to_log_index = parse<uint64_t>(filename_parts[2]);
+    result.extension = path.extension();
     result.path = path_str;
     return result;
 }
@@ -75,52 +79,53 @@ class ChangelogWriter
 public:
     ChangelogWriter(const std::string & filepath_, WriteMode mode, uint64_t start_index_)
         : filepath(filepath_)
-        , plain_buf(filepath, DBMS_DEFAULT_BUFFER_SIZE, mode == WriteMode::Rewrite ? -1 : (O_APPEND | O_CREAT | O_WRONLY))
+        , file_buf(filepath, DBMS_DEFAULT_BUFFER_SIZE, mode == WriteMode::Rewrite ? -1 : (O_APPEND | O_CREAT | O_WRONLY))
         , start_index(start_index_)
-    {}
-
-
-    off_t appendRecord(ChangelogRecord && record)
     {
-        off_t result = plain_buf.count();
-        writeIntBinary(computeRecordChecksum(record), plain_buf);
-
-        writeIntBinary(record.header.version, plain_buf);
-        writeIntBinary(record.header.index, plain_buf);
-        writeIntBinary(record.header.term, plain_buf);
-        writeIntBinary(record.header.value_type, plain_buf);
-        writeIntBinary(record.header.blob_size, plain_buf);
-
-        if (record.header.blob_size != 0)
-            plain_buf.write(reinterpret_cast<char *>(record.blob->data_begin()), record.blob->size());
-
-        entries_written++;
-
-        return result;
+        auto compression_method = chooseCompressionMethod(filepath_, "");
+        if (compression_method != CompressionMethod::Zstd && compression_method != CompressionMethod::None)
+        {
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Unsupported coordination log serialization format {}", toContentEncodingName(compression_method));
+        }
+        else if (compression_method == CompressionMethod::Zstd)
+        {
+            compressed_buffer = std::make_unique<ZstdDeflatingAppendableWriteBuffer>(file_buf, /* compression level = */ 3, /* append_to_existing_stream = */ mode == WriteMode::Append);
+        }
+        else
+        {
+            /// no compression, only file buffer
+        }
     }
 
-    void truncateToLength(off_t new_length)
+
+    void appendRecord(ChangelogRecord && record)
     {
-        plain_buf.next();
-        plain_buf.truncate(new_length);
-        plain_buf.seek(new_length, SEEK_SET);
+        writeIntBinary(computeRecordChecksum(record), getBuffer());
+
+        writeIntBinary(record.header.version, getBuffer());
+        writeIntBinary(record.header.index, getBuffer());
+        writeIntBinary(record.header.term, getBuffer());
+        writeIntBinary(record.header.value_type, getBuffer());
+        writeIntBinary(record.header.blob_size, getBuffer());
+
+        if (record.header.blob_size != 0)
+            getBuffer().write(reinterpret_cast<char *>(record.blob->data_begin()), record.blob->size());
     }
 
     void flush(bool force_fsync)
     {
-        plain_buf.next();
+        if (compressed_buffer)
+        {
+            /// Flush compressed data to WriteBufferFromFile working_buffer
+            compressed_buffer->next();
+        }
+
+        /// Flush working buffer to file system
+        file_buf.next();
+
+        /// Fsync file system if needed
         if (force_fsync)
-            plain_buf.sync();
-    }
-
-    uint64_t getEntriesWritten() const
-    {
-        return entries_written;
-    }
-
-    void setEntriesWritten(uint64_t entries_written_)
-    {
-        entries_written = entries_written_;
+            file_buf.sync();
     }
 
     uint64_t getStartIndex() const
@@ -128,22 +133,38 @@ public:
         return start_index;
     }
 
-    void setStartIndex(uint64_t start_index_)
+private:
+    WriteBuffer & getBuffer()
     {
-        start_index = start_index_;
+        if (compressed_buffer)
+            return *compressed_buffer;
+        return file_buf;
     }
 
-private:
     std::string filepath;
-    WriteBufferFromFile plain_buf;
-    uint64_t entries_written = 0;
+    WriteBufferFromFile file_buf;
+    std::unique_ptr<WriteBuffer> compressed_buffer;
     uint64_t start_index;
 };
 
 struct ChangelogReadResult
 {
-    uint64_t entries_read;
+    /// Total entries read from log including skipped.
+    /// Useful when we decide to continue to write in the same log and want to know
+    /// how many entries was already written in it.
+    uint64_t total_entries_read_from_log;
+
+    /// First index in log
+    uint64_t log_start_index;
+
+    /// First entry actually read log (not including skipped)
     uint64_t first_read_index;
+    /// Last entry read from log (last entry in log)
+    /// When we don't skip anything last_read_index - first_read_index = total_entries_read_from_log.
+    /// But when some entries from the start of log can be skipped because they are not required.
+    uint64_t last_read_index;
+
+    /// last offset we were able to read from log
     off_t last_position;
     bool error;
 };
@@ -153,47 +174,48 @@ class ChangelogReader
 public:
     explicit ChangelogReader(const std::string & filepath_)
         : filepath(filepath_)
-        , read_buf(filepath)
-    {}
-
-    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, IndexToOffset & index_to_offset, Poco::Logger * log)
     {
-        uint64_t previous_index = 0;
+        auto compression_method = chooseCompressionMethod(filepath, "");
+        auto read_buffer_from_file = std::make_unique<ReadBufferFromFile>(filepath);
+        read_buf = wrapReadBufferWithCompressionMethod(std::move(read_buffer_from_file), compression_method);
+    }
+
+    /// start_log_index -- all entries with index < start_log_index will be skipped, but accounted into total_entries_read_from_log
+    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, Poco::Logger * log)
+    {
         ChangelogReadResult result{};
         try
         {
-            while (!read_buf.eof())
+            while (!read_buf->eof())
             {
-                result.last_position = read_buf.count();
+                result.last_position = read_buf->count();
+                /// Read checksum
                 Checksum record_checksum;
-                readIntBinary(record_checksum, read_buf);
+                readIntBinary(record_checksum, *read_buf);
 
-                /// Initialization is required, otherwise checksums may fail
+                /// Read header
                 ChangelogRecord record;
-                readIntBinary(record.header.version, read_buf);
-                readIntBinary(record.header.index, read_buf);
-                readIntBinary(record.header.term, read_buf);
-                readIntBinary(record.header.value_type, read_buf);
-                readIntBinary(record.header.blob_size, read_buf);
+                readIntBinary(record.header.version, *read_buf);
+                readIntBinary(record.header.index, *read_buf);
+                readIntBinary(record.header.term, *read_buf);
+                readIntBinary(record.header.value_type, *read_buf);
+                readIntBinary(record.header.blob_size, *read_buf);
 
                 if (record.header.version > CURRENT_CHANGELOG_VERSION)
                     throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported changelog version {} on path {}", record.header.version, filepath);
 
+                /// Read data
                 if (record.header.blob_size != 0)
                 {
                     auto buffer = nuraft::buffer::alloc(record.header.blob_size);
                     auto * buffer_begin = reinterpret_cast<char *>(buffer->data_begin());
-                    read_buf.readStrict(buffer_begin, record.header.blob_size);
+                    read_buf->readStrict(buffer_begin, record.header.blob_size);
                     record.blob = buffer;
                 }
                 else
                     record.blob = nullptr;
 
-                if (previous_index != 0 && previous_index + 1 != record.header.index)
-                    throw Exception(ErrorCodes::CORRUPTED_DATA, "Previous log entry {}, next log entry {}, seems like some entries skipped", previous_index, record.header.index);
-
-                previous_index = record.header.index;
-
+                /// Compare checksums
                 Checksum checksum = computeRecordChecksum(record);
                 if (checksum != record_checksum)
                 {
@@ -202,24 +224,27 @@ public:
                                     filepath, record.header.version, record.header.index, record.header.blob_size);
                 }
 
+                /// Check for duplicated changelog ids
                 if (logs.count(record.header.index) != 0)
-                    throw Exception(ErrorCodes::CORRUPTED_DATA, "Duplicated index id {} in log {}", record.header.index, filepath);
+                    std::erase_if(logs, [record] (const auto & item) { return item.first >= record.header.index; });
 
-                result.entries_read += 1;
+                result.total_entries_read_from_log += 1;
 
+                /// Read but skip this entry because our state is already more fresh
                 if (record.header.index < start_log_index)
-                {
                     continue;
-                }
 
+                /// Create log entry for read data
                 auto log_entry = nuraft::cs_new<nuraft::log_entry>(record.header.term, record.blob, record.header.value_type);
                 if (result.first_read_index == 0)
                     result.first_read_index = record.header.index;
 
+                /// Put it into in memory structure
                 logs.emplace(record.header.index, log_entry);
-                index_to_offset[record.header.index] = result.last_position;
-                if (result.entries_read % 50000 == 0)
-                    LOG_TRACE(log, "Reading changelog from path {}, entries {}", filepath, result.entries_read);
+                result.last_read_index = record.header.index;
+
+                if (result.total_entries_read_from_log % 50000 == 0)
+                    LOG_TRACE(log, "Reading changelog from path {}, entries {}", filepath, result.total_entries_read_from_log);
             }
         }
         catch (const Exception & ex)
@@ -235,26 +260,30 @@ public:
             result.error = true;
             tryLogCurrentException(log);
         }
-        LOG_TRACE(log, "Totally read from changelog {} {} entries", filepath, result.entries_read);
+
+        LOG_TRACE(log, "Totally read from changelog {} {} entries", filepath, result.total_entries_read_from_log);
 
         return result;
     }
 
 private:
     std::string filepath;
-    ReadBufferFromFile read_buf;
+    std::unique_ptr<ReadBuffer> read_buf;
 };
 
 Changelog::Changelog(
     const std::string & changelogs_dir_,
     uint64_t rotate_interval_,
     bool force_sync_,
-    Poco::Logger * log_)
+    Poco::Logger * log_,
+    bool compress_logs_)
     : changelogs_dir(changelogs_dir_)
     , rotate_interval(rotate_interval_)
     , force_sync(force_sync_)
     , log(log_)
+    , compress_logs(compress_logs_)
 {
+    /// Load all files in changelog directory
     namespace fs = std::filesystem;
     if (!fs::exists(changelogs_dir))
         fs::create_directories(changelogs_dir);
@@ -264,98 +293,165 @@ Changelog::Changelog(
         auto file_description = getChangelogFileDescription(p.path());
         existing_changelogs[file_description.from_log_index] = file_description;
     }
+
+    if (existing_changelogs.empty())
+        LOG_WARNING(log, "No logs exists in {}. It's Ok if it's the first run of clickhouse-keeper.", changelogs_dir);
 }
 
 void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uint64_t logs_to_keep)
 {
-    uint64_t total_read = 0;
-    uint64_t entries_in_last = 0;
-    uint64_t incomplete_log_index = 0;
-    ChangelogReadResult result{};
-    uint64_t first_read_index = 0;
+    std::optional<ChangelogReadResult> last_log_read_result;
 
+    /// Last log has some free space to write
+    bool last_log_is_not_complete = false;
+
+    /// We must start to read from this log index
     uint64_t start_to_read_from = last_commited_log_index;
+
+    /// If we need to have some reserved log read additional `logs_to_keep` logs
     if (start_to_read_from > logs_to_keep)
         start_to_read_from -= logs_to_keep;
     else
         start_to_read_from = 1;
 
-    bool started = false;
+    /// Got through changelog files in order of start_index
     for (const auto & [changelog_start_index, changelog_description] : existing_changelogs)
     {
-        entries_in_last = changelog_description.to_log_index - changelog_description.from_log_index + 1;
 
+        /// [from_log_index.>=.......start_to_read_from.....<=.to_log_index]
         if (changelog_description.to_log_index >= start_to_read_from)
         {
-            if (!started)
+            if (!last_log_read_result) /// still nothing was read
             {
+                /// Our first log starts from the more fresh log_id than we required to read and this changelog is not empty log.
+                /// So we are missing something in our logs, but it's not dataloss, we will receive snapshot and required
+                /// entries from leader.
                 if (changelog_description.from_log_index > last_commited_log_index && (changelog_description.from_log_index - last_commited_log_index) > 1)
                 {
                     LOG_ERROR(log, "Some records was lost, last committed log index {}, smallest available log index on disk {}. Hopefully will receive missing records from leader.", last_commited_log_index, changelog_description.from_log_index);
-                    incomplete_log_index = changelog_start_index;
-                    break;
+                    /// Nothing to do with our more fresh log, leader will overwrite them, so remove everything and just start from last_commited_index
+                    removeAllLogs();
+                    min_log_id = last_commited_log_index;
+                    max_log_id = last_commited_log_index == 0 ? 0 : last_commited_log_index - 1;
+                    rotate(max_log_id + 1);
+                    return;
                 }
                 else if (changelog_description.from_log_index > start_to_read_from)
+                {
+                    /// We don't have required amount of reserved logs, but nothing was lost.
                     LOG_WARNING(log, "Don't have required amount of reserved log records. Need to read from {}, smallest available log index on disk {}.", start_to_read_from, changelog_description.from_log_index);
+                }
             }
 
-            started = true;
-
             ChangelogReader reader(changelog_description.path);
-            result = reader.readChangelog(logs, start_to_read_from, index_to_start_pos, log);
-            if (first_read_index == 0)
-                first_read_index = result.first_read_index;
+            last_log_read_result = reader.readChangelog(logs, start_to_read_from, log);
+            last_log_read_result->log_start_index = changelog_description.from_log_index;
 
-            total_read += result.entries_read;
-
-            /// May happen after truncate, crash or simply unfinished log
-            if (result.entries_read < entries_in_last)
+            if (last_log_read_result->error)
             {
-                incomplete_log_index = changelog_start_index;
+                last_log_is_not_complete = true;
+                break;
+            }
+            /// Otherwise we have already initialized it
+            if (min_log_id == 0)
+                min_log_id = last_log_read_result->first_read_index;
+
+            if (last_log_read_result->last_read_index != 0)
+                max_log_id = last_log_read_result->last_read_index;
+
+            /// How many entries we have in the last changelog
+            uint64_t expected_entries_in_log = changelog_description.expectedEntriesCountInLog();
+
+            /// Unfinished log
+            if (last_log_read_result->error || last_log_read_result->total_entries_read_from_log < expected_entries_in_log)
+            {
+                last_log_is_not_complete = true;
                 break;
             }
         }
     }
 
-    if (first_read_index != 0)
-        start_index = first_read_index;
-    else
-        start_index = last_commited_log_index;
-
-    if (incomplete_log_index != 0)
+    /// we can have empty log (with zero entries) and last_log_read_result will be initialized
+    if (!last_log_read_result || min_log_id == 0) /// We just may have no logs (only snapshot or nothing)
     {
-        auto start_remove_from = existing_changelogs.begin();
-        if (started)
-            start_remove_from = existing_changelogs.upper_bound(incomplete_log_index);
+        /// Just to be sure they don't exist
+        removeAllLogs();
 
-        /// All subsequent logs shouldn't exist. But they may exist if we crashed after writeAt started. Remove them.
-        for (auto itr = start_remove_from; itr != existing_changelogs.end();)
+        min_log_id = last_commited_log_index;
+        max_log_id = last_commited_log_index == 0 ? 0 : last_commited_log_index - 1;
+    }
+    else if (last_log_is_not_complete) /// if it's complete just start new one
+    {
+        assert(last_log_read_result != std::nullopt);
+        assert(!existing_changelogs.empty());
+
+        /// Actually they shouldn't exist, but to be sure we remove them
+        removeAllLogsAfter(last_log_read_result->log_start_index);
+
+        /// This log, even if it finished with error shouldn't be removed
+        assert(existing_changelogs.find(last_log_read_result->log_start_index) != existing_changelogs.end());
+        assert(existing_changelogs.find(last_log_read_result->log_start_index)->first == existing_changelogs.rbegin()->first);
+
+        /// Continue to write into incomplete existing log if it doesn't finished with error
+        auto description = existing_changelogs[last_log_read_result->log_start_index];
+
+        if (last_log_read_result->last_read_index == 0 || last_log_read_result->error) /// If it's broken log then remove it
         {
-            LOG_WARNING(log, "Removing changelog {}, because it's goes after broken changelog entry", itr->second.path);
-            std::filesystem::remove(itr->second.path);
-            itr = existing_changelogs.erase(itr);
+            LOG_INFO(log, "Removing log {} because it's empty or read finished with error", description.path);
+            std::filesystem::remove(description.path);
+            existing_changelogs.erase(last_log_read_result->log_start_index);
+            std::erase_if(logs, [last_log_read_result] (const auto & item) { return item.first >= last_log_read_result->log_start_index; });
         }
-
-        /// Continue to write into existing log
-        if (!existing_changelogs.empty())
+        else
         {
-            auto description = existing_changelogs.rbegin()->second;
-            LOG_TRACE(log, "Continue to write into {}", description.path);
-            current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, description.from_log_index);
-            current_writer->setEntriesWritten(result.entries_read);
-
-            /// Truncate all broken entries from log
-            if (result.error)
-            {
-                LOG_WARNING(log, "Read finished with error, truncating all broken log entries");
-                current_writer->truncateToLength(result.last_position);
-            }
+            initWriter(description);
         }
     }
 
-    /// Start new log if we don't initialize writer from previous log
+    /// Start new log if we don't initialize writer from previous log. All logs can be "complete".
     if (!current_writer)
-        rotate(start_index + total_read);
+        rotate(max_log_id + 1);
+}
+
+
+void Changelog::initWriter(const ChangelogFileDescription & description)
+{
+    if (description.expectedEntriesCountInLog() != rotate_interval)
+        LOG_TRACE(log, "Looks like rotate_logs_interval was changed, current {}, expected entries in last log {}", rotate_interval, description.expectedEntriesCountInLog());
+
+    LOG_TRACE(log, "Continue to write into {}", description.path);
+    current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, description.from_log_index);
+}
+
+void Changelog::removeAllLogsAfter(uint64_t remove_after_log_start_index)
+{
+    auto start_to_remove_from_itr = existing_changelogs.upper_bound(remove_after_log_start_index);
+    if (start_to_remove_from_itr == existing_changelogs.end())
+        return;
+
+    size_t start_to_remove_from_log_id = start_to_remove_from_itr->first;
+
+    /// All subsequent logs shouldn't exist. But they may exist if we crashed after writeAt started. Remove them.
+    for (auto itr = start_to_remove_from_itr; itr != existing_changelogs.end();)
+    {
+        LOG_WARNING(log, "Removing changelog {}, because it's goes after broken changelog entry", itr->second.path);
+        std::filesystem::remove(itr->second.path);
+        itr = existing_changelogs.erase(itr);
+    }
+
+    std::erase_if(logs, [start_to_remove_from_log_id] (const auto & item) { return item.first >= start_to_remove_from_log_id; });
+}
+
+void Changelog::removeAllLogs()
+{
+    LOG_WARNING(log, "Removing all changelogs");
+    for (auto itr = existing_changelogs.begin(); itr != existing_changelogs.end();)
+    {
+        LOG_WARNING(log, "Removing changelog {}, because it's goes after broken changelog entry", itr->second.path);
+        std::filesystem::remove(itr->second.path);
+        itr = existing_changelogs.erase(itr);
+    }
+    logs.clear();
 }
 
 void Changelog::rotate(uint64_t new_start_log_index)
@@ -363,10 +459,15 @@ void Changelog::rotate(uint64_t new_start_log_index)
     /// Flush previous log
     flush();
 
+    /// Start new one
     ChangelogFileDescription new_description;
     new_description.prefix = DEFAULT_PREFIX;
     new_description.from_log_index = new_start_log_index;
     new_description.to_log_index = new_start_log_index + rotate_interval - 1;
+    new_description.extension = "bin";
+
+    if (compress_logs)
+        new_description.extension += "." + toContentEncodingName(CompressionMethod::Zstd);
 
     new_description.path = formatChangelogPath(changelogs_dir, new_description);
 
@@ -378,7 +479,7 @@ void Changelog::rotate(uint64_t new_start_log_index)
 ChangelogRecord Changelog::buildRecord(uint64_t index, const LogEntryPtr & log_entry)
 {
     ChangelogRecord record;
-    record.header.version = ChangelogVersion::V0;
+    record.header.version = ChangelogVersion::V1;
     record.header.index = index;
     record.header.term = log_entry->get_term();
     record.header.value_type = log_entry->get_val_type();
@@ -399,43 +500,39 @@ void Changelog::appendEntry(uint64_t index, const LogEntryPtr & log_entry)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Changelog must be initialized before appending records");
 
     if (logs.empty())
-        start_index = index;
+        min_log_id = index;
 
-    if (current_writer->getEntriesWritten() == rotate_interval)
+    const auto & current_changelog_description = existing_changelogs[current_writer->getStartIndex()];
+    const bool log_is_complete = index - current_writer->getStartIndex() == current_changelog_description.expectedEntriesCountInLog();
+
+    if (log_is_complete)
         rotate(index);
 
-    auto offset = current_writer->appendRecord(buildRecord(index, log_entry));
-    if (!index_to_start_pos.try_emplace(index, offset).second)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Record with index {} already exists", index);
-
+    current_writer->appendRecord(buildRecord(index, log_entry));
     logs[index] = makeClone(log_entry);
+    max_log_id = index;
 }
 
 void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
 {
-    if (index_to_start_pos.count(index) == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot write at index {} because changelog doesn't contain it", index);
+    /// This write_at require to overwrite everything in this file and also in previous file(s)
+    const bool go_to_previous_file = index < current_writer->getStartIndex();
 
-    bool go_to_previous_file = index < current_writer->getStartIndex();
     if (go_to_previous_file)
     {
         auto index_changelog = existing_changelogs.lower_bound(index);
+
         ChangelogFileDescription description;
-        if (index_changelog->first == index)
+
+        if (index_changelog->first == index) /// exactly this file starts from index
             description = index_changelog->second;
         else
             description = std::prev(index_changelog)->second;
 
+        /// Initialize writer from this log file
         current_writer = std::make_unique<ChangelogWriter>(description.path, WriteMode::Append, index_changelog->first);
-        current_writer->setEntriesWritten(description.to_log_index - description.from_log_index + 1);
-    }
 
-    auto entries_written = current_writer->getEntriesWritten();
-    current_writer->truncateToLength(index_to_start_pos[index]);
-
-    if (go_to_previous_file)
-    {
-        /// Remove all subsequent files
+        /// Remove all subsequent files if overwritten something in previous one
         auto to_remove_itr = existing_changelogs.upper_bound(index);
         for (auto itr = to_remove_itr; itr != existing_changelogs.end();)
         {
@@ -445,49 +542,66 @@ void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
     }
 
     /// Remove redundant logs from memory
-    for (uint64_t i = index; ; ++i)
-    {
-        auto log_itr = logs.find(i);
-        if (log_itr == logs.end())
-            break;
-        logs.erase(log_itr);
-        index_to_start_pos.erase(i);
-        entries_written--;
-    }
-
-    current_writer->setEntriesWritten(entries_written);
+    /// Everything >= index must be removed
+    std::erase_if(logs, [index] (const auto & item) { return item.first >= index; });
 
+    /// Now we can actually override entry at index
     appendEntry(index, log_entry);
 }
 
 void Changelog::compact(uint64_t up_to_log_index)
 {
+    LOG_INFO(log, "Compact logs up to log index {}, our max log id is {}", up_to_log_index, max_log_id);
+
+    bool remove_all_logs = false;
+    if (up_to_log_index > max_log_id)
+    {
+        LOG_INFO(log, "Seems like this node recovers from leaders snapshot, removing all logs");
+        /// If we received snapshot from leader we may compact up to more fresh log
+        max_log_id = up_to_log_index;
+        remove_all_logs = true;
+    }
+
+    bool need_rotate = false;
     for (auto itr = existing_changelogs.begin(); itr != existing_changelogs.end();)
     {
         /// Remove all completely outdated changelog files
-        if (itr->second.to_log_index <= up_to_log_index)
+        if (remove_all_logs || itr->second.to_log_index <= up_to_log_index)
         {
+            if (current_writer && itr->second.from_log_index == current_writer->getStartIndex())
+            {
+                LOG_INFO(log, "Trying to remove log {} which is current active log for write. Possibly this node recovers from snapshot", itr->second.path);
+                need_rotate = true;
+                current_writer.reset();
+            }
 
             LOG_INFO(log, "Removing changelog {} because of compaction", itr->second.path);
-            std::erase_if(index_to_start_pos, [right_index = itr->second.to_log_index] (const auto & item) { return item.first <= right_index; });
             std::filesystem::remove(itr->second.path);
             itr = existing_changelogs.erase(itr);
         }
         else /// Files are ordered, so all subsequent should exist
             break;
     }
-    start_index = up_to_log_index + 1;
+    /// Compaction from the past is possible, so don't make our min_log_id smaller.
+    min_log_id = std::max(min_log_id, up_to_log_index + 1);
     std::erase_if(logs, [up_to_log_index] (const auto & item) { return item.first <= up_to_log_index; });
+
+    if (need_rotate)
+        rotate(up_to_log_index + 1);
+
+    LOG_INFO(log, "Compaction up to {} finished new min index {}, new max index {}", up_to_log_index, min_log_id, max_log_id);
 }
 
 LogEntryPtr Changelog::getLastEntry() const
 {
+    /// This entry treaded in special way by NuRaft
     static LogEntryPtr fake_entry = nuraft::cs_new<nuraft::log_entry>(0, nuraft::buffer::alloc(sizeof(uint64_t)));
 
-    uint64_t next_index = getNextEntryIndex() - 1;
-    auto entry = logs.find(next_index);
+    auto entry = logs.find(max_log_id);
     if (entry == logs.end())
+    {
         return fake_entry;
+    }
 
     return entry->second;
 }
@@ -517,6 +631,14 @@ LogEntryPtr Changelog::entryAt(uint64_t index)
     return src;
 }
 
+LogEntryPtr Changelog::getLatestConfigChange() const
+{
+    for (const auto & [_, entry] : logs)
+        if (entry->get_val_type() == nuraft::conf)
+            return entry;
+    return nullptr;
+}
+
 nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(uint64_t index, int32_t count)
 {
     std::vector<nuraft::ptr<nuraft::buffer>> returned_logs;
diff --git a/src/Coordination/Changelog.h b/src/Coordination/Changelog.h
index 893fe16abdf..edca61a883c 100644
--- a/src/Coordination/Changelog.h
+++ b/src/Coordination/Changelog.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 #include <city.h>
+#include <optional>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/HashingWriteBuffer.h>
-#include <Compression/CompressedWriteBuffer.h>
+#include <IO/CompressionMethod.h>
 #include <Disks/IDisk.h>
 
 namespace DB
@@ -24,9 +25,10 @@ enum class ChangelogVersion : uint8_t
 {
     V0 = 0,
     V1 = 1, /// with 64 bit buffer header
+    V2 = 2, /// with compression and duplicate records
 };
 
-static constexpr auto CURRENT_CHANGELOG_VERSION = ChangelogVersion::V1;
+static constexpr auto CURRENT_CHANGELOG_VERSION = ChangelogVersion::V2;
 
 struct ChangelogRecordHeader
 {
@@ -51,20 +53,28 @@ struct ChangelogFileDescription
     std::string prefix;
     uint64_t from_log_index;
     uint64_t to_log_index;
+    std::string extension;
 
     std::string path;
+
+    /// How many entries should be stored in this log
+    uint64_t expectedEntriesCountInLog() const
+    {
+        return to_log_index - from_log_index + 1;
+    }
 };
 
 class ChangelogWriter;
 
 /// Simplest changelog with files rotation.
-/// No compression, no metadata, just entries with headers one by one
-/// Able to read broken files/entries and discard them.
+/// No compression, no metadata, just entries with headers one by one.
+/// Able to read broken files/entries and discard them. Not thread safe.
 class Changelog
 {
 
 public:
-    Changelog(const std::string & changelogs_dir_, uint64_t rotate_interval_, bool force_sync_, Poco::Logger * log_);
+    Changelog(const std::string & changelogs_dir_, uint64_t rotate_interval_,
+            bool force_sync_, Poco::Logger * log_, bool compress_logs_ = true);
 
     /// Read changelog from files on changelogs_dir_ skipping all entries before from_log_index
     /// Truncate broken entries, remove files after broken entries.
@@ -81,17 +91,20 @@ public:
 
     uint64_t getNextEntryIndex() const
     {
-        return start_index + logs.size();
+        return max_log_id + 1;
     }
 
     uint64_t getStartIndex() const
     {
-        return start_index;
+        return min_log_id;
     }
 
     /// Last entry in log, or fake entry with term 0 if log is empty
     LogEntryPtr getLastEntry() const;
 
+    /// Get entry with latest config in logstore
+    LogEntryPtr getLatestConfigChange() const;
+
     /// Return log entries between [start, end)
     LogEntriesPtr getLogEntriesBetween(uint64_t start_index, uint64_t end_index);
 
@@ -122,17 +135,31 @@ private:
     /// Starts new file [new_start_log_index, new_start_log_index + rotate_interval]
     void rotate(uint64_t new_start_log_index);
 
+    /// Remove all changelogs from disk with start_index bigger than start_to_remove_from_id
+    void removeAllLogsAfter(uint64_t remove_after_log_start_index);
+    /// Remove all logs from disk
+    void removeAllLogs();
+    /// Init writer for existing log with some entries already written
+    void initWriter(const ChangelogFileDescription & description);
+
 private:
     const std::string changelogs_dir;
     const uint64_t rotate_interval;
     const bool force_sync;
     Poco::Logger * log;
+    bool compress_logs;
 
+    /// Currently existing changelogs
     std::map<uint64_t, ChangelogFileDescription> existing_changelogs;
+
+    /// Current writer for changelog file
     std::unique_ptr<ChangelogWriter> current_writer;
-    IndexToOffset index_to_start_pos;
+    /// Mapping log_id -> log_entry
     IndexToLogEntry logs;
-    uint64_t start_index = 0;
+    /// Start log_id which exists in all "active" logs
+    /// min_log_id + 1 == max_log_id means empty log storage for NuRaft
+    uint64_t min_log_id = 0;
+    uint64_t max_log_id = 0;
 };
 
 }
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index cd46817e82f..6201834d17d 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -1,6 +1,6 @@
 #include <Coordination/CoordinationSettings.h>
 #include <Core/Settings.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/CoordinationSettings.h b/src/Coordination/CoordinationSettings.h
index 2d8da8806cd..bec5e7f1f7a 100644
--- a/src/Coordination/CoordinationSettings.h
+++ b/src/Coordination/CoordinationSettings.h
@@ -11,10 +11,12 @@ namespace DB
 
 struct Settings;
 
+
 /** These settings represent fine tunes for internal details of Coordination storages
   * and should not be changed by the user without a reason.
   */
 
+
 #define LIST_OF_COORDINATION_SETTINGS(M) \
     M(Milliseconds, session_timeout_ms, Coordination::DEFAULT_SESSION_TIMEOUT_MS, "Default client session timeout", 0) \
     M(Milliseconds, operation_timeout_ms, Coordination::DEFAULT_OPERATION_TIMEOUT_MS, "Default client operation timeout", 0) \
@@ -26,7 +28,7 @@ struct Settings;
     M(UInt64, snapshot_distance, 100000, "How many log items we have to collect to write new snapshot", 0) \
     M(Bool, auto_forwarding, true, "Allow to forward write requests from followers to leader", 0) \
     M(Milliseconds, shutdown_timeout, 5000, "How many time we will until RAFT shutdown", 0) \
-    M(Milliseconds, startup_timeout, 30000, "How many time we will until RAFT to start", 0) \
+    M(Milliseconds, startup_timeout, 180000, "How many time we will until RAFT to start", 0) \
     M(LogsLevel, raft_logs_level, LogsLevel::information, "Log internal RAFT logs into main server log level. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
     M(UInt64, rotate_log_storage_interval, 100000, "How many records will be stored in one log storage file", 0) \
     M(UInt64, snapshots_to_keep, 3, "How many compressed snapshots to keep on disk", 0) \
@@ -34,7 +36,10 @@ struct Settings;
     M(UInt64, fresh_log_gap, 200, "When node became fresh", 0) \
     M(UInt64, max_requests_batch_size, 100, "Max size of batch in requests count before it will be sent to RAFT", 0) \
     M(Bool, quorum_reads, false, "Execute read requests as writes through whole RAFT consesus with similar speed", 0) \
-    M(Bool, force_sync, true, "Call fsync on each change in RAFT changelog", 0)
+    M(Bool, force_sync, true, "Call fsync on each change in RAFT changelog", 0) \
+    M(Bool, compress_logs, true, "Write compressed coordination logs in ZSTD format", 0) \
+    M(Bool, compress_snapshots_with_zstd_format, true, "Write compressed snapshots in ZSTD format (instead of custom LZ4)", 0) \
+    M(UInt64, configuration_change_tries_count, 20, "How many times we will try to apply configuration change (add/remove server) to the cluster", 0)
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 
diff --git a/src/Coordination/Defines.h b/src/Coordination/Defines.h
new file mode 100644
index 00000000000..712fb57f23d
--- /dev/null
+++ b/src/Coordination/Defines.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define KEEPER_DEFAULT_PATH "/var/lib/clickhouse-keeper/"
diff --git a/src/Coordination/InMemoryLogStore.h b/src/Coordination/InMemoryLogStore.h
index caa5e31698d..ad4466b363f 100644
--- a/src/Coordination/InMemoryLogStore.h
+++ b/src/Coordination/InMemoryLogStore.h
@@ -4,7 +4,7 @@
 #include <map>
 #include <mutex>
 #include <Core/Types.h>
-#include <libnuraft/log_store.hxx> // Y_IGNORE
+#include <libnuraft/log_store.hxx>
 
 namespace DB
 {
diff --git a/src/Coordination/KeeperStorageDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
similarity index 69%
rename from src/Coordination/KeeperStorageDispatcher.cpp
rename to src/Coordination/KeeperDispatcher.cpp
index e95a6940baa..c29ea4fac45 100644
--- a/src/Coordination/KeeperStorageDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -1,6 +1,5 @@
-#include <Coordination/KeeperStorageDispatcher.h>
+#include <Coordination/KeeperDispatcher.h>
 #include <Common/setThreadName.h>
-#include <Common/Stopwatch.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <future>
 #include <chrono>
@@ -10,19 +9,20 @@ namespace DB
 
 namespace ErrorCodes
 {
-
     extern const int LOGICAL_ERROR;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int SYSTEM_ERROR;
 }
 
-KeeperStorageDispatcher::KeeperStorageDispatcher()
+KeeperDispatcher::KeeperDispatcher()
     : coordination_settings(std::make_shared<CoordinationSettings>())
+    , responses_queue(std::numeric_limits<size_t>::max())
     , log(&Poco::Logger::get("KeeperDispatcher"))
 {
 }
 
 
-void KeeperStorageDispatcher::requestThread()
+void KeeperDispatcher::requestThread()
 {
     setThreadName("KeeperReqT");
 
@@ -134,7 +134,7 @@ void KeeperStorageDispatcher::requestThread()
     }
 }
 
-void KeeperStorageDispatcher::responseThread()
+void KeeperDispatcher::responseThread()
 {
     setThreadName("KeeperRspT");
     while (!shutdown_called)
@@ -160,13 +160,14 @@ void KeeperStorageDispatcher::responseThread()
     }
 }
 
-void KeeperStorageDispatcher::snapshotThread()
+void KeeperDispatcher::snapshotThread()
 {
     setThreadName("KeeperSnpT");
     while (!shutdown_called)
     {
         CreateSnapshotTask task;
-        snapshots_queue.pop(task);
+        if (!snapshots_queue.pop(task))
+            break;
 
         if (shutdown_called)
             break;
@@ -182,9 +183,11 @@ void KeeperStorageDispatcher::snapshotThread()
     }
 }
 
-void KeeperStorageDispatcher::setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response)
+void KeeperDispatcher::setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response)
 {
     std::lock_guard lock(session_to_response_callback_mutex);
+
+    /// Special new session response.
     if (response->xid != Coordination::WATCH_XID && response->getOpNum() == Coordination::OpNum::SessionID)
     {
         const Coordination::ZooKeeperSessionIDResponse & session_id_resp = dynamic_cast<const Coordination::ZooKeeperSessionIDResponse &>(*response);
@@ -197,25 +200,28 @@ void KeeperStorageDispatcher::setResponse(int64_t session_id, const Coordination
         callback(response);
         new_session_id_response_callback.erase(session_id_resp.internal_id);
     }
-    else
+    else /// Normal response, just write to client
     {
-        auto session_writer = session_to_response_callback.find(session_id);
-        if (session_writer == session_to_response_callback.end())
+        auto session_response_callback = session_to_response_callback.find(session_id);
+
+        /// Session was disconnected, just skip this response
+        if (session_response_callback == session_to_response_callback.end())
             return;
 
-        session_writer->second(response);
+        session_response_callback->second(response);
 
         /// Session closed, no more writes
         if (response->xid != Coordination::WATCH_XID && response->getOpNum() == Coordination::OpNum::Close)
         {
-            session_to_response_callback.erase(session_writer);
+            session_to_response_callback.erase(session_response_callback);
         }
     }
 }
 
-bool KeeperStorageDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id)
+bool KeeperDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id)
 {
     {
+        /// If session was already disconnected than we will ignore requests
         std::lock_guard lock(session_to_response_callback_mutex);
         if (session_to_response_callback.count(session_id) == 0)
             return false;
@@ -232,13 +238,19 @@ bool KeeperStorageDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr
 
     /// Put close requests without timeouts
     if (request->getOpNum() == Coordination::OpNum::Close)
-        requests_queue->push(std::move(request_info));
+    {
+        if (!requests_queue->push(std::move(request_info)))
+            throw Exception("Cannot push request to queue", ErrorCodes::SYSTEM_ERROR);
+    }
     else if (!requests_queue->tryPush(std::move(request_info), coordination_settings->operation_timeout_ms.totalMilliseconds()))
+    {
         throw Exception("Cannot push request to queue within operation timeout", ErrorCodes::TIMEOUT_EXCEEDED);
+    }
+
     return true;
 }
 
-void KeeperStorageDispatcher::initialize(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper)
+void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper, bool start_async)
 {
     LOG_DEBUG(log, "Initializing storage dispatcher");
     int myid = config.getInt("keeper_server.server_id");
@@ -252,14 +264,22 @@ void KeeperStorageDispatcher::initialize(const Poco::Util::AbstractConfiguration
 
     server = std::make_unique<KeeperServer>(
         myid, coordination_settings, config, responses_queue, snapshots_queue, standalone_keeper);
+
     try
     {
         LOG_DEBUG(log, "Waiting server to initialize");
         server->startup();
         LOG_DEBUG(log, "Server initialized, waiting for quorum");
 
-        server->waitInit();
-        LOG_DEBUG(log, "Quorum initialized");
+        if (!start_async)
+        {
+            server->waitInit();
+            LOG_DEBUG(log, "Quorum initialized");
+        }
+        else
+        {
+            LOG_INFO(log, "Starting Keeper asynchronously, server will accept connections to Keeper when it will be ready");
+        }
     }
     catch (...)
     {
@@ -267,13 +287,15 @@ void KeeperStorageDispatcher::initialize(const Poco::Util::AbstractConfiguration
         throw;
     }
 
-
+    /// Start it after keeper server start
     session_cleaner_thread = ThreadFromGlobalPool([this] { sessionCleanerTask(); });
+    update_configuration_thread = ThreadFromGlobalPool([this] { updateConfigurationThread(); });
+    updateConfiguration(config);
 
     LOG_DEBUG(log, "Dispatcher initialized");
 }
 
-void KeeperStorageDispatcher::shutdown()
+void KeeperDispatcher::shutdown()
 {
     try
     {
@@ -289,38 +311,41 @@ void KeeperStorageDispatcher::shutdown()
             if (session_cleaner_thread.joinable())
                 session_cleaner_thread.join();
 
-            /// FIXME not the best way to notify
-            requests_queue->push({});
-            if (request_thread.joinable())
-                request_thread.join();
+            if (requests_queue)
+            {
+                requests_queue->finish();
 
-            responses_queue.push({});
+                if (request_thread.joinable())
+                    request_thread.join();
+            }
+
+            responses_queue.finish();
             if (responses_thread.joinable())
                 responses_thread.join();
 
-            snapshots_queue.push({});
+            snapshots_queue.finish();
             if (snapshot_thread.joinable())
                 snapshot_thread.join();
+
+            update_configuration_queue.finish();
+            if (update_configuration_thread.joinable())
+                update_configuration_thread.join();
         }
 
         if (server)
             server->shutdown();
 
         KeeperStorage::RequestForSession request_for_session;
-        while (requests_queue->tryPop(request_for_session))
+
+        /// Set session expired for all pending requests
+        while (requests_queue && requests_queue->tryPop(request_for_session))
         {
-            if (request_for_session.request)
-            {
-                auto response = request_for_session.request->makeResponse();
-                response->error = Coordination::Error::ZSESSIONEXPIRED;
-                setResponse(request_for_session.session_id, response);
-            }
-            else
-            {
-                break;
-            }
+            auto response = request_for_session.request->makeResponse();
+            response->error = Coordination::Error::ZSESSIONEXPIRED;
+            setResponse(request_for_session.session_id, response);
         }
 
+        /// Clear all registered sessions
         std::lock_guard lock(session_to_response_callback_mutex);
         session_to_response_callback.clear();
     }
@@ -332,19 +357,19 @@ void KeeperStorageDispatcher::shutdown()
     LOG_DEBUG(log, "Dispatcher shut down");
 }
 
-KeeperStorageDispatcher::~KeeperStorageDispatcher()
+KeeperDispatcher::~KeeperDispatcher()
 {
     shutdown();
 }
 
-void KeeperStorageDispatcher::registerSession(int64_t session_id, ZooKeeperResponseCallback callback)
+void KeeperDispatcher::registerSession(int64_t session_id, ZooKeeperResponseCallback callback)
 {
     std::lock_guard lock(session_to_response_callback_mutex);
     if (!session_to_response_callback.try_emplace(session_id, callback).second)
         throw Exception(DB::ErrorCodes::LOGICAL_ERROR, "Session with id {} already registered in dispatcher", session_id);
 }
 
-void KeeperStorageDispatcher::sessionCleanerTask()
+void KeeperDispatcher::sessionCleanerTask()
 {
     while (true)
     {
@@ -353,12 +378,16 @@ void KeeperStorageDispatcher::sessionCleanerTask()
 
         try
         {
-            if (isLeader())
+            /// Only leader node must check dead sessions
+            if (server->checkInit() && isLeader())
             {
                 auto dead_sessions = server->getDeadSessions();
+
                 for (int64_t dead_session : dead_sessions)
                 {
                     LOG_INFO(log, "Found dead session {}, will try to close it", dead_session);
+
+                    /// Close session == send close request to raft server
                     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Close);
                     request->xid = Coordination::CLOSE_XID;
                     KeeperStorage::RequestForSession request_info;
@@ -366,8 +395,11 @@ void KeeperStorageDispatcher::sessionCleanerTask()
                     request_info.session_id = dead_session;
                     {
                         std::lock_guard lock(push_request_mutex);
-                        requests_queue->push(std::move(request_info));
+                        if (!requests_queue->push(std::move(request_info)))
+                            LOG_INFO(log, "Cannot push close request to queue while cleaning outdated sessions");
                     }
+
+                    /// Remove session from registered sessions
                     finishSession(dead_session);
                     LOG_INFO(log, "Dead session close request pushed");
                 }
@@ -382,7 +414,7 @@ void KeeperStorageDispatcher::sessionCleanerTask()
     }
 }
 
-void KeeperStorageDispatcher::finishSession(int64_t session_id)
+void KeeperDispatcher::finishSession(int64_t session_id)
 {
     std::lock_guard lock(session_to_response_callback_mutex);
     auto session_it = session_to_response_callback.find(session_id);
@@ -390,7 +422,7 @@ void KeeperStorageDispatcher::finishSession(int64_t session_id)
         session_to_response_callback.erase(session_it);
 }
 
-void KeeperStorageDispatcher::addErrorResponses(const KeeperStorage::RequestsForSessions & requests_for_sessions, Coordination::Error error)
+void KeeperDispatcher::addErrorResponses(const KeeperStorage::RequestsForSessions & requests_for_sessions, Coordination::Error error)
 {
     for (const auto & [session_id, request] : requests_for_sessions)
     {
@@ -399,11 +431,16 @@ void KeeperStorageDispatcher::addErrorResponses(const KeeperStorage::RequestsFor
         response->xid = request->xid;
         response->zxid = 0;
         response->error = error;
-        responses_queue.push(DB::KeeperStorage::ResponseForSession{session_id, response});
+        if (!responses_queue.push(DB::KeeperStorage::ResponseForSession{session_id, response}))
+            throw Exception(ErrorCodes::SYSTEM_ERROR,
+                "Could not push error response xid {} zxid {} error message {} to responses queue",
+                response->xid,
+                response->zxid,
+                errorMessage(error));
     }
 }
 
-void KeeperStorageDispatcher::forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions)
+void KeeperDispatcher::forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions)
 {
     if (!result->has_result())
         result->get();
@@ -418,10 +455,14 @@ void KeeperStorageDispatcher::forceWaitAndProcessResult(RaftAppendResult & resul
     requests_for_sessions.clear();
 }
 
-int64_t KeeperStorageDispatcher::getSessionID(int64_t session_timeout_ms)
+int64_t KeeperDispatcher::getSessionID(int64_t session_timeout_ms)
 {
+    /// New session id allocation is a special request, because we cannot process it in normal
+    /// way: get request -> put to raft -> set response for registered callback.
     KeeperStorage::RequestForSession request_info;
     std::shared_ptr<Coordination::ZooKeeperSessionIDRequest> request = std::make_shared<Coordination::ZooKeeperSessionIDRequest>();
+    /// Internal session id. It's a temporary number which is unique for each client on this server
+    /// but can be same on different servers.
     request->internal_id = internal_session_id_counter.fetch_add(1);
     request->session_timeout_ms = session_timeout_ms;
     request->server_id = server->getServerID();
@@ -431,6 +472,7 @@ int64_t KeeperStorageDispatcher::getSessionID(int64_t session_timeout_ms)
 
     auto promise = std::make_shared<std::promise<int64_t>>();
     auto future = promise->get_future();
+
     {
         std::lock_guard lock(session_to_response_callback_mutex);
         new_session_id_response_callback[request->internal_id] = [promise, internal_id = request->internal_id] (const Coordination::ZooKeeperResponsePtr & response)
@@ -453,6 +495,7 @@ int64_t KeeperStorageDispatcher::getSessionID(int64_t session_timeout_ms)
         };
     }
 
+    /// Push new session request to queue
     {
         std::lock_guard lock(push_request_mutex);
         if (!requests_queue->tryPush(std::move(request_info), session_timeout_ms))
@@ -462,7 +505,76 @@ int64_t KeeperStorageDispatcher::getSessionID(int64_t session_timeout_ms)
     if (future.wait_for(std::chrono::milliseconds(session_timeout_ms)) != std::future_status::ready)
         throw Exception("Cannot receive session id within session timeout", ErrorCodes::TIMEOUT_EXCEEDED);
 
+    /// Forcefully wait for request execution because we cannot process any other
+    /// requests for this client until it get new session id.
     return future.get();
 }
 
+
+void KeeperDispatcher::updateConfigurationThread()
+{
+    while (true)
+    {
+        if (shutdown_called)
+            return;
+
+        try
+        {
+            if (!server->checkInit())
+            {
+                LOG_INFO(log, "Server still not initialized, will not apply configuration until initialization finished");
+                std::this_thread::sleep_for(std::chrono::milliseconds(5000));
+                continue;
+            }
+
+            ConfigUpdateAction action;
+            if (!update_configuration_queue.pop(action))
+                break;
+
+
+            /// We must wait this update from leader or apply it ourself (if we are leader)
+            bool done = false;
+            while (!done)
+            {
+                if (shutdown_called)
+                    return;
+
+                if (isLeader())
+                {
+                    server->applyConfigurationUpdate(action);
+                    done = true;
+                }
+                else
+                {
+                    done = server->waitConfigurationUpdate(action);
+                    if (!done)
+                        LOG_INFO(log, "Cannot wait for configuration update, maybe we become leader, or maybe update is invalid, will try to wait one more time");
+                }
+            }
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+void KeeperDispatcher::updateConfiguration(const Poco::Util::AbstractConfiguration & config)
+{
+    auto diff = server->getConfigurationDiff(config);
+    if (diff.empty())
+        LOG_TRACE(log, "Configuration update triggered, but nothing changed for RAFT");
+    else if (diff.size() > 1)
+        LOG_WARNING(log, "Configuration changed for more than one server ({}) from cluster, it's strictly not recommended", diff.size());
+    else
+        LOG_DEBUG(log, "Configuration change size ({})", diff.size());
+
+    for (auto & change : diff)
+    {
+        bool push_result = update_configuration_queue.push(change);
+        if (!push_result)
+            throw Exception(ErrorCodes::SYSTEM_ERROR, "Cannot push configuration update to queue");
+    }
+}
+
 }
diff --git a/src/Coordination/KeeperStorageDispatcher.h b/src/Coordination/KeeperDispatcher.h
similarity index 66%
rename from src/Coordination/KeeperStorageDispatcher.h
rename to src/Coordination/KeeperDispatcher.h
index cc95de04ce9..60f69cfae9f 100644
--- a/src/Coordination/KeeperStorageDispatcher.h
+++ b/src/Coordination/KeeperDispatcher.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#    include "config_core.h"
-#endif
+#include <Common/config.h>
+#include "config_core.h"
 
 #if USE_NURAFT
 
@@ -11,7 +9,7 @@
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <functional>
 #include <Coordination/KeeperServer.h>
 #include <Coordination/CoordinationSettings.h>
@@ -22,7 +20,9 @@ namespace DB
 
 using ZooKeeperResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr & response)>;
 
-class KeeperStorageDispatcher
+/// Highlevel wrapper for ClickHouse Keeper.
+/// Process user requests via consensus and return responses.
+class KeeperDispatcher
 {
 
 private:
@@ -31,12 +31,16 @@ private:
     CoordinationSettingsPtr coordination_settings;
     using RequestsQueue = ConcurrentBoundedQueue<KeeperStorage::RequestForSession>;
     using SessionToResponseCallback = std::unordered_map<int64_t, ZooKeeperResponseCallback>;
+    using UpdateConfigurationQueue = ConcurrentBoundedQueue<ConfigUpdateAction>;
 
     /// Size depends on coordination settings
     std::unique_ptr<RequestsQueue> requests_queue;
     ResponsesQueue responses_queue;
     SnapshotsQueue snapshots_queue{1};
 
+    /// More than 1k updates is definitely misconfiguration.
+    UpdateConfigurationQueue update_configuration_queue{1000};
+
     std::atomic<bool> shutdown_called{false};
 
     std::mutex session_to_response_callback_mutex;
@@ -45,6 +49,7 @@ private:
     /// (get, set, list, etc.). Dispatcher determines callback for each response
     /// using session id from this map.
     SessionToResponseCallback session_to_response_callback;
+
     /// But when client connects to the server for the first time it doesn't
     /// have session_id. It request it from server. We give temporary
     /// internal id for such requests just to much client with its response.
@@ -59,8 +64,10 @@ private:
     ThreadFromGlobalPool session_cleaner_thread;
     /// Dumping new snapshots to disk
     ThreadFromGlobalPool snapshot_thread;
+    /// Apply or wait for configuration changes
+    ThreadFromGlobalPool update_configuration_thread;
 
-    /// RAFT wrapper. Most important class.
+    /// RAFT wrapper.
     std::unique_ptr<KeeperServer> server;
 
     Poco::Logger * log;
@@ -69,10 +76,17 @@ private:
     std::atomic<int64_t> internal_session_id_counter{0};
 
 private:
+    /// Thread put requests to raft
     void requestThread();
+    /// Thread put responses for subscribed sessions
     void responseThread();
+    /// Thread clean disconnected sessions from memory
     void sessionCleanerTask();
+    /// Thread create snapshots in the background
     void snapshotThread();
+    /// Thread apply or wait configuration changes from leader
+    void updateConfigurationThread();
+
     void setResponse(int64_t session_id, const Coordination::ZooKeeperResponsePtr & response);
 
     /// Add error responses for requests to responses queue.
@@ -84,16 +98,32 @@ private:
     void forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions);
 
 public:
-    KeeperStorageDispatcher();
+    /// Just allocate some objects, real initialization is done by `intialize method`
+    KeeperDispatcher();
 
-    void initialize(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper);
+    /// Call shutdown
+    ~KeeperDispatcher();
 
+    /// Initialization from config.
+    /// standalone_keeper -- we are standalone keeper application (not inside clickhouse server)
+    void initialize(const Poco::Util::AbstractConfiguration & config, bool standalone_keeper, bool start_async);
+
+    bool checkInit() const
+    {
+        return server && server->checkInit();
+    }
+
+    /// Registered in ConfigReloader callback. Add new configuration changes to
+    /// update_configuration_queue. Keeper Dispatcher apply them asynchronously.
+    void updateConfiguration(const Poco::Util::AbstractConfiguration & config);
+
+    /// Shutdown internal keeper parts (server, state machine, log storage, etc)
     void shutdown();
 
-    ~KeeperStorageDispatcher();
-
+    /// Put request to ClickHouse Keeper
     bool putRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id);
 
+    /// Are we leader
     bool isLeader() const
     {
         return server->isLeader();
@@ -104,9 +134,12 @@ public:
         return server->isLeaderAlive();
     }
 
+    /// Get new session ID
     int64_t getSessionID(int64_t session_timeout_ms);
 
+    /// Register session and subscribe for responses with callback
     void registerSession(int64_t session_id, ZooKeeperResponseCallback callback);
+
     /// Call if we don't need any responses for this session no more (session was expired)
     void finishSession(int64_t session_id);
 };
diff --git a/src/Coordination/KeeperLogStore.cpp b/src/Coordination/KeeperLogStore.cpp
index 3896cf9b6fd..2736deaf2af 100644
--- a/src/Coordination/KeeperLogStore.cpp
+++ b/src/Coordination/KeeperLogStore.cpp
@@ -1,11 +1,12 @@
 #include <Coordination/KeeperLogStore.h>
+#include <IO/CompressionMethod.h>
 
 namespace DB
 {
 
-KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_)
+KeeperLogStore::KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_, bool compress_logs_)
     : log(&Poco::Logger::get("KeeperLogStore"))
-    , changelog(changelogs_path, rotate_interval_, force_sync_, log)
+    , changelog(changelogs_path, rotate_interval_, force_sync_, log, compress_logs_)
 {
     if (force_sync_)
         LOG_INFO(log, "force_sync enabled");
@@ -111,4 +112,10 @@ void KeeperLogStore::end_of_append_batch(uint64_t /*start_index*/, uint64_t /*co
     changelog.flush();
 }
 
+nuraft::ptr<nuraft::log_entry> KeeperLogStore::getLatestConfigChange() const
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.getLatestConfigChange();
+}
+
 }
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
index 01315e6e879..be529cdcb75 100644
--- a/src/Coordination/KeeperLogStore.h
+++ b/src/Coordination/KeeperLogStore.h
@@ -1,49 +1,66 @@
 #pragma once
-#include <libnuraft/log_store.hxx> // Y_IGNORE
+#include <libnuraft/log_store.hxx>
 #include <map>
 #include <mutex>
 #include <Core/Types.h>
 #include <Coordination/Changelog.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
 
+/// Wrapper around Changelog class. Implements RAFT log storage.
 class KeeperLogStore : public nuraft::log_store
 {
 public:
-    KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_);
+    KeeperLogStore(const std::string & changelogs_path, uint64_t rotate_interval_, bool force_sync_, bool compress_logs_);
 
+    /// Read log storage from filesystem starting from last_commited_log_index
     void init(uint64_t last_commited_log_index, uint64_t logs_to_keep);
 
     uint64_t start_index() const override;
 
     uint64_t next_slot() const override;
 
+    /// return last entry from log
     nuraft::ptr<nuraft::log_entry> last_entry() const override;
 
+    /// Append new entry to log
     uint64_t append(nuraft::ptr<nuraft::log_entry> & entry) override;
 
+    /// Remove all entries starting from index and write entry into index position
     void write_at(uint64_t index, nuraft::ptr<nuraft::log_entry> & entry) override;
 
+    /// Return entries between [start, end)
     nuraft::ptr<std::vector<nuraft::ptr<nuraft::log_entry>>> log_entries(uint64_t start, uint64_t end) override;
 
+    /// Return entry at index
     nuraft::ptr<nuraft::log_entry> entry_at(uint64_t index) override;
 
+    /// Term if the index
     uint64_t term_at(uint64_t index) override;
 
+    /// Serialize entries in interval [index, index + cnt)
     nuraft::ptr<nuraft::buffer> pack(uint64_t index, int32_t cnt) override;
 
+    /// Apply serialized entries starting from index
     void apply_pack(uint64_t index, nuraft::buffer & pack) override;
 
+    /// Entries from last_log_index can be removed from memory and from disk
     bool compact(uint64_t last_log_index) override;
 
+    /// Call fsync to the stored data
     bool flush() override;
 
+    /// Current log storage size
     uint64_t size() const;
 
+    /// Flush batch of appended entries
     void end_of_append_batch(uint64_t start_index, uint64_t count) override;
 
+    /// Get entry with latest config in logstore
+    nuraft::ptr<nuraft::log_entry> getLatestConfigChange() const;
+
 private:
     mutable std::mutex changelog_lock;
     Poco::Logger * log;
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index b6b0ab8cb72..f4787a66d7d 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -1,8 +1,7 @@
 #include <Coordination/KeeperServer.h>
+#include <Coordination/Defines.h>
 
-#if !defined(ARCADIA_BUILD)
-#   include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <Coordination/LoggerWrapper.h>
 #include <Coordination/KeeperStateMachine.h>
@@ -120,23 +119,42 @@ void KeeperServer::startup()
 
     state_manager->loadLogStore(state_machine->last_commit_index() + 1, coordination_settings->reserved_log_items);
 
-    bool single_server = state_manager->getTotalServers() == 1;
+    auto latest_snapshot_config = state_machine->getClusterConfig();
+    auto latest_log_store_config = state_manager->getLatestConfigFromLogStore();
 
-    nuraft::raft_params params;
-    if (single_server)
+    if (latest_snapshot_config && latest_log_store_config)
     {
-        /// Don't make sense in single server mode
-        params.heart_beat_interval_ = 0;
-        params.election_timeout_lower_bound_ = 0;
-        params.election_timeout_upper_bound_ = 0;
+        if (latest_snapshot_config->get_log_idx() > latest_log_store_config->get_log_idx())
+        {
+            LOG_INFO(log, "Will use config from snapshot with log index {}", latest_snapshot_config->get_log_idx());
+            state_manager->save_config(*latest_snapshot_config);
+        }
+        else
+        {
+            LOG_INFO(log, "Will use config from log store with log index {}", latest_snapshot_config->get_log_idx());
+            state_manager->save_config(*latest_log_store_config);
+        }
+    }
+    else if (latest_snapshot_config)
+    {
+        LOG_INFO(log, "No config in log store, will use config from snapshot with log index {}", latest_snapshot_config->get_log_idx());
+        state_manager->save_config(*latest_snapshot_config);
+    }
+    else if (latest_log_store_config)
+    {
+        LOG_INFO(log, "No config in snapshot, will use config from log store with log index {}", latest_log_store_config->get_log_idx());
+        state_manager->save_config(*latest_log_store_config);
     }
     else
     {
-        params.heart_beat_interval_ = coordination_settings->heart_beat_interval_ms.totalMilliseconds();
-        params.election_timeout_lower_bound_ = coordination_settings->election_timeout_lower_bound_ms.totalMilliseconds();
-        params.election_timeout_upper_bound_ = coordination_settings->election_timeout_upper_bound_ms.totalMilliseconds();
+        LOG_INFO(log, "No config in log store and snapshot, probably it's initial run. Will use config from .xml on disk");
     }
 
+    nuraft::raft_params params;
+    params.heart_beat_interval_ = coordination_settings->heart_beat_interval_ms.totalMilliseconds();
+    params.election_timeout_lower_bound_ = coordination_settings->election_timeout_lower_bound_ms.totalMilliseconds();
+    params.election_timeout_upper_bound_ = coordination_settings->election_timeout_upper_bound_ms.totalMilliseconds();
+
     params.reserved_log_items_ = coordination_settings->reserved_log_items;
     params.snapshot_distance_ = coordination_settings->snapshot_distance;
     params.stale_log_gap_ = coordination_settings->stale_log_gap;
@@ -352,14 +370,150 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
 void KeeperServer::waitInit()
 {
     std::unique_lock lock(initialized_mutex);
+
     int64_t timeout = coordination_settings->startup_timeout.totalMilliseconds();
     if (!initialized_cv.wait_for(lock, std::chrono::milliseconds(timeout), [&] { return initialized_flag.load(); }))
         throw Exception(ErrorCodes::RAFT_ERROR, "Failed to wait RAFT initialization");
 }
 
-std::unordered_set<int64_t> KeeperServer::getDeadSessions()
+std::vector<int64_t> KeeperServer::getDeadSessions()
 {
     return state_machine->getDeadSessions();
 }
 
+ConfigUpdateActions KeeperServer::getConfigurationDiff(const Poco::Util::AbstractConfiguration & config)
+{
+    return state_manager->getConfigurationDiff(config);
+}
+
+void KeeperServer::applyConfigurationUpdate(const ConfigUpdateAction & task)
+{
+    size_t sleep_ms = 500;
+    if (task.action_type == ConfigUpdateActionType::AddServer)
+    {
+        LOG_INFO(log, "Will try to add server with id {}", task.server->get_id());
+        bool added = false;
+        for (size_t i = 0; i < coordination_settings->configuration_change_tries_count; ++i)
+        {
+            if (raft_instance->get_srv_config(task.server->get_id()) != nullptr)
+            {
+                LOG_INFO(log, "Server with id {} was successfully added", task.server->get_id());
+                added = true;
+                break;
+            }
+
+            if (!isLeader())
+            {
+                LOG_INFO(log, "We are not leader anymore, will not try to add server {}", task.server->get_id());
+                break;
+            }
+
+            auto result = raft_instance->add_srv(*task.server);
+            if (!result->get_accepted())
+                LOG_INFO(log, "Command to add server {} was not accepted for the {} time, will sleep for {} ms and retry", task.server->get_id(), i + 1, sleep_ms * (i + 1));
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_ms * (i + 1)));
+        }
+        if (!added)
+            throw Exception(ErrorCodes::RAFT_ERROR, "Configuration change to add server (id {}) was not accepted by RAFT after all {} retries", task.server->get_id(), coordination_settings->configuration_change_tries_count);
+    }
+    else if (task.action_type == ConfigUpdateActionType::RemoveServer)
+    {
+        LOG_INFO(log, "Will try to remove server with id {}", task.server->get_id());
+
+        bool removed = false;
+        if (task.server->get_id() == state_manager->server_id())
+        {
+            LOG_INFO(log, "Trying to remove leader node (ourself), so will yield leadership and some other node (new leader) will try remove us. "
+                        "Probably you will have to run SYSTEM RELOAD CONFIG on the new leader node");
+
+            raft_instance->yield_leadership();
+            return;
+        }
+
+        for (size_t i = 0; i < coordination_settings->configuration_change_tries_count; ++i)
+        {
+            if (raft_instance->get_srv_config(task.server->get_id()) == nullptr)
+            {
+                LOG_INFO(log, "Server with id {} was successfully removed", task.server->get_id());
+                removed = true;
+                break;
+            }
+
+            if (!isLeader())
+            {
+                LOG_INFO(log, "We are not leader anymore, will not try to remove server {}", task.server->get_id());
+                break;
+            }
+
+            auto result = raft_instance->remove_srv(task.server->get_id());
+            if (!result->get_accepted())
+                LOG_INFO(log, "Command to remove server {} was not accepted for the {} time, will sleep for {} ms and retry", task.server->get_id(), i + 1, sleep_ms * (i + 1));
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_ms * (i + 1)));
+        }
+        if (!removed)
+            throw Exception(ErrorCodes::RAFT_ERROR, "Configuration change to remove server (id {}) was not accepted by RAFT after all {} retries", task.server->get_id(), coordination_settings->configuration_change_tries_count);
+    }
+    else if (task.action_type == ConfigUpdateActionType::UpdatePriority)
+        raft_instance->set_priority(task.server->get_id(), task.server->get_priority());
+    else
+        LOG_WARNING(log, "Unknown configuration update type {}", static_cast<uint64_t>(task.action_type));
+}
+
+
+bool KeeperServer::waitConfigurationUpdate(const ConfigUpdateAction & task)
+{
+
+    size_t sleep_ms = 500;
+    if (task.action_type == ConfigUpdateActionType::AddServer)
+    {
+        LOG_INFO(log, "Will try to wait server with id {} to be added", task.server->get_id());
+        for (size_t i = 0; i < coordination_settings->configuration_change_tries_count; ++i)
+        {
+            if (raft_instance->get_srv_config(task.server->get_id()) != nullptr)
+            {
+                LOG_INFO(log, "Server with id {} was successfully added by leader", task.server->get_id());
+                return true;
+            }
+
+            if (isLeader())
+            {
+                LOG_INFO(log, "We are leader now, probably we will have to add server {}", task.server->get_id());
+                return false;
+            }
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_ms * (i + 1)));
+        }
+        return false;
+    }
+    else if (task.action_type == ConfigUpdateActionType::RemoveServer)
+    {
+        LOG_INFO(log, "Will try to wait remove of server with id {}", task.server->get_id());
+
+        for (size_t i = 0; i < coordination_settings->configuration_change_tries_count; ++i)
+        {
+            if (raft_instance->get_srv_config(task.server->get_id()) == nullptr)
+            {
+                LOG_INFO(log, "Server with id {} was successfully removed by leader", task.server->get_id());
+                return true;
+            }
+
+            if (isLeader())
+            {
+                LOG_INFO(log, "We are leader now, probably we will have to remove server {}", task.server->get_id());
+                return false;
+            }
+
+            std::this_thread::sleep_for(std::chrono::milliseconds(sleep_ms * (i + 1)));
+        }
+        return false;
+    }
+    else if (task.action_type == ConfigUpdateActionType::UpdatePriority)
+        return true;
+    else
+        LOG_WARNING(log, "Unknown configuration update type {}", static_cast<uint64_t>(task.action_type));
+    return true;
+}
+
 }
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index 282a7b48dfb..1dc5282b285 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 #include <Coordination/InMemoryLogStore.h>
 #include <Coordination/KeeperStateManager.h>
 #include <Coordination/KeeperStateMachine.h>
 #include <Coordination/KeeperStorage.h>
 #include <Coordination/CoordinationSettings.h>
 #include <unordered_map>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
@@ -38,6 +38,8 @@ private:
 
     Poco::Logger * log;
 
+    /// Callback func which is called by NuRaft on all internal events.
+    /// Used to determine the moment when raft is ready to server new requests
     nuraft::cb_func::ReturnCode callbackFunc(nuraft::cb_func::Type type, nuraft::cb_func::Param * param);
 
     /// Almost copy-paste from nuraft::launcher, but with separated server init and start
@@ -57,23 +59,48 @@ public:
         SnapshotsQueue & snapshots_queue_,
         bool standalone_keeper);
 
+    /// Load state machine from the latest snapshot and load log storage. Start NuRaft with required settings.
     void startup();
 
+    /// Put local read request and execute in state machine directly and response into
+    /// responses queue
     void putLocalReadRequest(const KeeperStorage::RequestForSession & request);
 
+    /// Put batch of requests into Raft and get result of put. Responses will be set separately into
+    /// responses_queue.
     RaftAppendResult putRequestBatch(const KeeperStorage::RequestsForSessions & requests);
 
-    std::unordered_set<int64_t> getDeadSessions();
+    /// Return set of the non-active sessions
+    std::vector<int64_t> getDeadSessions();
 
     bool isLeader() const;
 
     bool isLeaderAlive() const;
 
+    /// Wait server initialization (see callbackFunc)
     void waitInit();
 
+    /// Return true if KeeperServer initialized
+    bool checkInit() const
+    {
+        return initialized_flag;
+    }
+
     void shutdown();
 
     int getServerID() const { return server_id; }
+
+    /// Get configuration diff between current configuration in RAFT and in XML file
+    ConfigUpdateActions getConfigurationDiff(const Poco::Util::AbstractConfiguration & config);
+
+    /// Apply action for configuration update. Actually call raft_instance->remove_srv or raft_instance->add_srv.
+    /// Synchronously check for update results with retries.
+    void applyConfigurationUpdate(const ConfigUpdateAction & task);
+
+
+    /// Wait configuration update for action. Used by followers.
+    /// Return true if update was successfully received.
+    bool waitConfigurationUpdate(const ConfigUpdateAction & task);
 };
 
 }
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index 40c898efdb5..be6d4db4219 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -10,6 +10,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <IO/copyData.h>
 #include <filesystem>
+#include <memory>
 
 namespace DB
 {
@@ -32,9 +33,12 @@ namespace
         return parse<uint64_t>(name_parts[1]);
     }
 
-    std::string getSnapshotFileName(uint64_t up_to_log_idx)
+    std::string getSnapshotFileName(uint64_t up_to_log_idx, bool compress_zstd)
     {
-        return std::string{"snapshot_"} + std::to_string(up_to_log_idx) + ".bin";
+        auto base = std::string{"snapshot_"} + std::to_string(up_to_log_idx) + ".bin";
+        if (compress_zstd)
+            base += ".zstd";
+        return base;
     }
 
     std::string getBaseName(const String & path)
@@ -201,9 +205,17 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
             writeBinary(id, out);
         }
     }
+
+    /// Serialize cluster config
+    if (snapshot.cluster_config)
+    {
+        auto buffer = snapshot.cluster_config->serialize();
+        writeVarUInt(buffer->size(), out);
+        out.write(reinterpret_cast<const char *>(buffer->data_begin()), buffer->size());
+    }
 }
 
-SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage, ReadBuffer & in)
+void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserialization_result, ReadBuffer & in)
 {
     uint8_t version;
     readBinary(version, in);
@@ -211,13 +223,16 @@ SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage,
     if (current_version > CURRENT_SNAPSHOT_VERSION)
         throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported snapshot version {}", version);
 
-    SnapshotMetadataPtr result = deserializeSnapshotMetadata(in);
+    deserialization_result.snapshot_meta = deserializeSnapshotMetadata(in);
+    KeeperStorage & storage = *deserialization_result.storage;
+
     int64_t session_id;
     readBinary(session_id, in);
 
-    storage.zxid = result->get_last_log_idx();
+    storage.zxid = deserialization_result.snapshot_meta->get_last_log_idx();
     storage.session_id_counter = session_id;
 
+    /// Before V1 we serialized ACL without acl_map
     if (current_version >= SnapshotVersion::V1)
     {
         size_t acls_map_size;
@@ -304,13 +319,24 @@ SnapshotMetadataPtr KeeperStorageSnapshot::deserialize(KeeperStorage & storage,
         current_session_size++;
     }
 
-    return result;
+    /// Optional cluster config
+    ClusterConfigPtr cluster_config = nullptr;
+    if (!in.eof())
+    {
+        size_t data_size;
+        readVarUInt(data_size, in);
+        auto buffer = nuraft::buffer::alloc(data_size);
+        in.readStrict(reinterpret_cast<char *>(buffer->data_begin()), data_size);
+        buffer->pos(0);
+        deserialization_result.cluster_config = ClusterConfig::deserialize(*buffer);
+    }
 }
 
-KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_)
+KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_, const ClusterConfigPtr & cluster_config_)
     : storage(storage_)
     , snapshot_meta(std::make_shared<SnapshotMetadata>(up_to_log_idx_, 0, std::make_shared<nuraft::cluster_config>()))
     , session_id(storage->session_id_counter)
+    , cluster_config(cluster_config_)
 {
     storage->enableSnapshotMode();
     snapshot_container_size = storage->container.snapshotSize();
@@ -320,10 +346,11 @@ KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t
     session_and_auth = storage->session_and_auth;
 }
 
-KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_)
+KeeperStorageSnapshot::KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_, const ClusterConfigPtr & cluster_config_)
     : storage(storage_)
     , snapshot_meta(snapshot_meta_)
     , session_id(storage->session_id_counter)
+    , cluster_config(cluster_config_)
 {
     storage->enableSnapshotMode();
     snapshot_container_size = storage->container.snapshotSize();
@@ -338,9 +365,13 @@ KeeperStorageSnapshot::~KeeperStorageSnapshot()
     storage->disableSnapshotMode();
 }
 
-KeeperSnapshotManager::KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, const std::string & superdigest_, size_t storage_tick_time_)
+KeeperSnapshotManager::KeeperSnapshotManager(
+    const std::string & snapshots_path_, size_t snapshots_to_keep_,
+    bool compress_snapshots_zstd_,
+    const std::string & superdigest_, size_t storage_tick_time_)
     : snapshots_path(snapshots_path_)
     , snapshots_to_keep(snapshots_to_keep_)
+    , compress_snapshots_zstd(compress_snapshots_zstd_)
     , superdigest(superdigest_)
     , storage_tick_time(storage_tick_time_)
 {
@@ -380,7 +411,7 @@ std::string KeeperSnapshotManager::serializeSnapshotBufferToDisk(nuraft::buffer
 {
     ReadBufferFromNuraftBuffer reader(buffer);
 
-    auto snapshot_file_name = getSnapshotFileName(up_to_log_idx);
+    auto snapshot_file_name = getSnapshotFileName(up_to_log_idx, compress_snapshots_zstd);
     auto tmp_snapshot_file_name = "tmp_" + snapshot_file_name;
     std::string tmp_snapshot_path = std::filesystem::path{snapshots_path} / tmp_snapshot_file_name;
     std::string new_snapshot_path = std::filesystem::path{snapshots_path} / snapshot_file_name;
@@ -426,26 +457,51 @@ nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::deserializeSnapshotBufferFrom
     return writer.getBuffer();
 }
 
-nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot)
+nuraft::ptr<nuraft::buffer> KeeperSnapshotManager::serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot) const
 {
-    WriteBufferFromNuraftBuffer writer;
-    CompressedWriteBuffer compressed_writer(writer);
+    std::unique_ptr<WriteBufferFromNuraftBuffer> writer = std::make_unique<WriteBufferFromNuraftBuffer>();
+    auto * buffer_raw_ptr = writer.get();
+    std::unique_ptr<WriteBuffer> compressed_writer;
+    if (compress_snapshots_zstd)
+        compressed_writer = wrapWriteBufferWithCompressionMethod(std::move(writer), CompressionMethod::Zstd, 3);
+    else
+        compressed_writer = std::make_unique<CompressedWriteBuffer>(*writer);
 
-    KeeperStorageSnapshot::serialize(snapshot, compressed_writer);
-    compressed_writer.finalize();
-    return writer.getBuffer();
+    KeeperStorageSnapshot::serialize(snapshot, *compressed_writer);
+    compressed_writer->finalize();
+    return buffer_raw_ptr->getBuffer();
 }
 
-SnapshotMetaAndStorage KeeperSnapshotManager::deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const
+
+bool KeeperSnapshotManager::isZstdCompressed(nuraft::ptr<nuraft::buffer> buffer)
 {
+    static constexpr uint32_t ZSTD_COMPRESSED_MAGIC = 0xFD2FB528;
     ReadBufferFromNuraftBuffer reader(buffer);
-    CompressedReadBuffer compressed_reader(reader);
-    auto storage = std::make_unique<KeeperStorage>(storage_tick_time, superdigest);
-    auto snapshot_metadata = KeeperStorageSnapshot::deserialize(*storage, compressed_reader);
-    return std::make_pair(snapshot_metadata, std::move(storage));
+    uint32_t magic_from_buffer;
+    reader.readStrict(reinterpret_cast<char *>(&magic_from_buffer), sizeof(magic_from_buffer));
+    buffer->pos(0);
+    return magic_from_buffer == ZSTD_COMPRESSED_MAGIC;
 }
 
-SnapshotMetaAndStorage KeeperSnapshotManager::restoreFromLatestSnapshot()
+SnapshotDeserializationResult KeeperSnapshotManager::deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const
+{
+    bool is_zstd_compressed = isZstdCompressed(buffer);
+
+    std::unique_ptr<ReadBufferFromNuraftBuffer> reader = std::make_unique<ReadBufferFromNuraftBuffer>(buffer);
+    std::unique_ptr<ReadBuffer> compressed_reader;
+
+    if (is_zstd_compressed)
+        compressed_reader = wrapReadBufferWithCompressionMethod(std::move(reader), CompressionMethod::Zstd);
+    else
+        compressed_reader = std::make_unique<CompressedReadBuffer>(*reader);
+
+    SnapshotDeserializationResult result;
+    result.storage = std::make_unique<KeeperStorage>(storage_tick_time, superdigest);
+    KeeperStorageSnapshot::deserialize(result, *compressed_reader);
+    return result;
+}
+
+SnapshotDeserializationResult KeeperSnapshotManager::restoreFromLatestSnapshot()
 {
     if (existing_snapshots.empty())
         return {};
@@ -469,7 +525,6 @@ void KeeperSnapshotManager::removeSnapshot(uint64_t log_idx)
         throw Exception(ErrorCodes::UNKNOWN_SNAPSHOT, "Unknown snapshot with log index {}", log_idx);
     std::filesystem::remove(itr->second);
     existing_snapshots.erase(itr);
-
 }
 
 
diff --git a/src/Coordination/KeeperSnapshotManager.h b/src/Coordination/KeeperSnapshotManager.h
index 57347c37b9f..2889ec493df 100644
--- a/src/Coordination/KeeperSnapshotManager.h
+++ b/src/Coordination/KeeperSnapshotManager.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 #include <Coordination/KeeperStorage.h>
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBuffer.h>
@@ -9,38 +9,71 @@ namespace DB
 
 using SnapshotMetadata = nuraft::snapshot;
 using SnapshotMetadataPtr = std::shared_ptr<SnapshotMetadata>;
+using ClusterConfig = nuraft::cluster_config;
+using ClusterConfigPtr = nuraft::ptr<ClusterConfig>;
 
 enum SnapshotVersion : uint8_t
 {
     V0 = 0,
     V1 = 1, /// with ACL map
     V2 = 2, /// with 64 bit buffer header
+    V3 = 3, /// compress snapshots with ZSTD codec
 };
 
-static constexpr auto CURRENT_SNAPSHOT_VERSION = SnapshotVersion::V2;
+static constexpr auto CURRENT_SNAPSHOT_VERSION = SnapshotVersion::V3;
 
+/// What is stored in binary shapsnot
+struct SnapshotDeserializationResult
+{
+    /// Storage
+    KeeperStoragePtr storage;
+    /// Snapshot metadata (up_to_log_idx and so on)
+    SnapshotMetadataPtr snapshot_meta;
+    /// Cluster config
+    ClusterConfigPtr cluster_config;
+};
+
+/// In memory keeper snapshot. Keeper Storage based on a hash map which can be
+/// turned into snapshot mode. This operation is fast and KeeperStorageSnapshot
+/// class do it in constructor. It also copies iterators from storage hash table
+/// up to some log index with lock. In destructor this class turn off snapshot
+/// mode for KeeperStorage.
+///
+/// This representation of snapshot have to be serialized into NuRaft
+/// buffer and send over network or saved to file.
 struct KeeperStorageSnapshot
 {
 public:
-    KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_);
+    KeeperStorageSnapshot(KeeperStorage * storage_, uint64_t up_to_log_idx_, const ClusterConfigPtr & cluster_config_ = nullptr);
+
+    KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_, const ClusterConfigPtr & cluster_config_ = nullptr);
 
-    KeeperStorageSnapshot(KeeperStorage * storage_, const SnapshotMetadataPtr & snapshot_meta_);
     ~KeeperStorageSnapshot();
 
     static void serialize(const KeeperStorageSnapshot & snapshot, WriteBuffer & out);
 
-    static SnapshotMetadataPtr deserialize(KeeperStorage & storage, ReadBuffer & in);
+    static void deserialize(SnapshotDeserializationResult & deserialization_result, ReadBuffer & in);
 
     KeeperStorage * storage;
 
     SnapshotVersion version = CURRENT_SNAPSHOT_VERSION;
+    /// Snapshot metadata
     SnapshotMetadataPtr snapshot_meta;
+    /// Max session id
     int64_t session_id;
+    /// Size of snapshot container in amount of nodes after begin iterator
+    /// so we have for loop for (i = 0; i < snapshot_container_size; ++i) { doSmth(begin + i); }
     size_t snapshot_container_size;
+    /// Iterator to the start of the storage
     KeeperStorage::Container::const_iterator begin;
+    /// Active sessions and their timeouts
     SessionAndTimeout session_and_timeout;
+    /// Sessions credentials
     KeeperStorage::SessionAndAuth session_and_auth;
+    /// ACLs cache for better performance. Without we cannot deserialize storage.
     std::unordered_map<uint64_t, Coordination::ACLs> acl_map;
+    /// Cluster config from snapshot, can be empty
+    ClusterConfigPtr cluster_config;
 };
 
 using KeeperStorageSnapshotPtr = std::shared_ptr<KeeperStorageSnapshot>;
@@ -49,28 +82,42 @@ using CreateSnapshotCallback = std::function<void(KeeperStorageSnapshotPtr &&)>;
 
 using SnapshotMetaAndStorage = std::pair<SnapshotMetadataPtr, KeeperStoragePtr>;
 
+/// Class responsible for snapshots serialization and deserialization. Each snapshot
+/// has it's path on disk and log index.
 class KeeperSnapshotManager
 {
 public:
-    KeeperSnapshotManager(const std::string & snapshots_path_, size_t snapshots_to_keep_, const std::string & superdigest_ = "", size_t storage_tick_time_ = 500);
+    KeeperSnapshotManager(
+        const std::string & snapshots_path_, size_t snapshots_to_keep_,
+        bool compress_snapshots_zstd_ = true, const std::string & superdigest_ = "", size_t storage_tick_time_ = 500);
 
-    SnapshotMetaAndStorage restoreFromLatestSnapshot();
+    /// Restore storage from latest available snapshot
+    SnapshotDeserializationResult restoreFromLatestSnapshot();
 
-    static nuraft::ptr<nuraft::buffer> serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot);
+    /// Compress snapshot and serialize it to buffer
+    nuraft::ptr<nuraft::buffer> serializeSnapshotToBuffer(const KeeperStorageSnapshot & snapshot) const;
+
+    /// Serialize already compressed snapshot to disk (return path)
     std::string serializeSnapshotBufferToDisk(nuraft::buffer & buffer, uint64_t up_to_log_idx);
 
-    SnapshotMetaAndStorage deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const;
+    SnapshotDeserializationResult deserializeSnapshotFromBuffer(nuraft::ptr<nuraft::buffer> buffer) const;
 
+    /// Deserialize snapshot with log index up_to_log_idx from disk into compressed nuraft buffer.
     nuraft::ptr<nuraft::buffer> deserializeSnapshotBufferFromDisk(uint64_t up_to_log_idx) const;
+
+    /// Deserialize latest snapshot from disk into compressed nuraft buffer.
     nuraft::ptr<nuraft::buffer> deserializeLatestSnapshotBufferFromDisk();
 
+    /// Remove snapshot  with this log_index
     void removeSnapshot(uint64_t log_idx);
 
+    /// Total amount of snapshots
     size_t totalSnapshots() const
     {
         return existing_snapshots.size();
     }
 
+    /// The most fresh snapshot log index we have
     size_t getLatestSnapshotIndex() const
     {
         if (!existing_snapshots.empty())
@@ -80,13 +127,28 @@ public:
 
 private:
     void removeOutdatedSnapshotsIfNeeded();
+
+    /// Checks first 4 buffer bytes to became sure that snapshot compressed with
+    /// ZSTD codec.
+    static bool isZstdCompressed(nuraft::ptr<nuraft::buffer> buffer);
+
     const std::string snapshots_path;
+    /// How many snapshots to keep before remove
     const size_t snapshots_to_keep;
+    /// All existing snapshots in our path (log_index -> path)
     std::map<uint64_t, std::string> existing_snapshots;
+    /// Compress snapshots in common ZSTD format instead of custom ClickHouse block LZ4 format
+    const bool compress_snapshots_zstd;
+    /// Superdigest for deserialization of storage
     const std::string superdigest;
+    /// Storage sessions timeout check interval (also for deserializatopn)
     size_t storage_tick_time;
 };
 
+/// Keeper create snapshots in background thread. KeeperStateMachine just create
+/// in-memory snapshot from storage and push task for it serialization into
+/// special tasks queue. Background thread check this queue and after snapshot
+/// successfully serialized notify state machine.
 struct CreateSnapshotTask
 {
     KeeperStorageSnapshotPtr snapshot;
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index a76b86a8171..62820b41731 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -12,38 +12,45 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int SYSTEM_ERROR;
 }
 
-KeeperStorage::RequestForSession parseRequest(nuraft::buffer & data)
+namespace
 {
-    ReadBufferFromNuraftBuffer buffer(data);
-    KeeperStorage::RequestForSession request_for_session;
-    readIntBinary(request_for_session.session_id, buffer);
+    KeeperStorage::RequestForSession parseRequest(nuraft::buffer & data)
+    {
+        ReadBufferFromNuraftBuffer buffer(data);
+        KeeperStorage::RequestForSession request_for_session;
+        readIntBinary(request_for_session.session_id, buffer);
 
-    int32_t length;
-    Coordination::read(length, buffer);
+        int32_t length;
+        Coordination::read(length, buffer);
 
-    int32_t xid;
-    Coordination::read(xid, buffer);
+        int32_t xid;
+        Coordination::read(xid, buffer);
 
-    Coordination::OpNum opnum;
+        Coordination::OpNum opnum;
 
-    Coordination::read(opnum, buffer);
+        Coordination::read(opnum, buffer);
 
-    request_for_session.request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
-    request_for_session.request->xid = xid;
-    request_for_session.request->readImpl(buffer);
-    return request_for_session;
+        request_for_session.request = Coordination::ZooKeeperRequestFactory::instance().get(opnum);
+        request_for_session.request->xid = xid;
+        request_for_session.request->readImpl(buffer);
+        return request_for_session;
+    }
 }
 
-    KeeperStateMachine::KeeperStateMachine(
+KeeperStateMachine::KeeperStateMachine(
         ResponsesQueue & responses_queue_,
         SnapshotsQueue & snapshots_queue_,
         const std::string & snapshots_path_,
         const CoordinationSettingsPtr & coordination_settings_,
         const std::string & superdigest_)
     : coordination_settings(coordination_settings_)
-    , snapshot_manager(snapshots_path_, coordination_settings->snapshots_to_keep, superdigest_, coordination_settings->dead_session_check_period_ms.totalMicroseconds())
+    , snapshot_manager(
+        snapshots_path_, coordination_settings->snapshots_to_keep,
+        coordination_settings->compress_snapshots_with_zstd_format, superdigest_,
+        coordination_settings->dead_session_check_period_ms.totalMicroseconds())
     , responses_queue(responses_queue_)
     , snapshots_queue(snapshots_queue_)
     , last_committed_idx(0)
@@ -58,6 +65,7 @@ void KeeperStateMachine::init()
     LOG_DEBUG(log, "Totally have {} snapshots", snapshot_manager.totalSnapshots());
     bool loaded = false;
     bool has_snapshots = snapshot_manager.totalSnapshots() != 0;
+    /// Deserialize latest snapshot from disk
     while (snapshot_manager.totalSnapshots() != 0)
     {
         uint64_t latest_log_index = snapshot_manager.getLatestSnapshotIndex();
@@ -66,7 +74,10 @@ void KeeperStateMachine::init()
         try
         {
             latest_snapshot_buf = snapshot_manager.deserializeSnapshotBufferFromDisk(latest_log_index);
-            std::tie(latest_snapshot_meta, storage) = snapshot_manager.deserializeSnapshotFromBuffer(latest_snapshot_buf);
+            auto snapshot_deserialization_result = snapshot_manager.deserializeSnapshotFromBuffer(latest_snapshot_buf);
+            storage = std::move(snapshot_deserialization_result.storage);
+            latest_snapshot_meta = snapshot_deserialization_result.snapshot_meta;
+            cluster_config = snapshot_deserialization_result.cluster_config;
             last_committed_idx = latest_snapshot_meta->get_last_log_idx();
             loaded = true;
             break;
@@ -97,35 +108,33 @@ void KeeperStateMachine::init()
 nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, nuraft::buffer & data)
 {
     auto request_for_session = parseRequest(data);
+    /// Special processing of session_id request
     if (request_for_session.request->getOpNum() == Coordination::OpNum::SessionID)
     {
         const Coordination::ZooKeeperSessionIDRequest & session_id_request = dynamic_cast<const Coordination::ZooKeeperSessionIDRequest &>(*request_for_session.request);
         int64_t session_id;
-        {
-            std::lock_guard lock(storage_lock);
-            session_id = storage->getSessionID(session_id_request.session_timeout_ms);
-        }
-        LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_id_request.session_timeout_ms);
-
         std::shared_ptr<Coordination::ZooKeeperSessionIDResponse> response = std::make_shared<Coordination::ZooKeeperSessionIDResponse>();
         response->internal_id = session_id_request.internal_id;
-        response->session_id = session_id;
         response->server_id = session_id_request.server_id;
-
         KeeperStorage::ResponseForSession response_for_session;
         response_for_session.session_id = -1;
         response_for_session.response = response;
-        responses_queue.push(response_for_session);
+        {
+            std::lock_guard lock(storage_and_responses_lock);
+            session_id = storage->getSessionID(session_id_request.session_timeout_ms);
+            LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_id_request.session_timeout_ms);
+            response->session_id = session_id;
+            if (!responses_queue.push(response_for_session))
+                throw Exception(ErrorCodes::SYSTEM_ERROR, "Could not push response with session id {} into responses queue", session_id);
+        }
     }
     else
     {
-        KeeperStorage::ResponsesForSessions responses_for_sessions;
-        {
-            std::lock_guard lock(storage_lock);
-            responses_for_sessions = storage->processRequest(request_for_session.request, request_for_session.session_id, log_idx);
-            for (auto & response_for_session : responses_for_sessions)
-                responses_queue.push(response_for_session);
-        }
+        std::lock_guard lock(storage_and_responses_lock);
+        KeeperStorage::ResponsesForSessions responses_for_sessions = storage->processRequest(request_for_session.request, request_for_session.session_id, log_idx);
+        for (auto & response_for_session : responses_for_sessions)
+            if (!responses_queue.push(response_for_session))
+                throw Exception(ErrorCodes::SYSTEM_ERROR, "Could not push response with session id {} into responses queue", response_for_session.session_id);
     }
 
     last_committed_idx = log_idx;
@@ -136,7 +145,7 @@ bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
 {
     LOG_DEBUG(log, "Applying snapshot {}", s.get_last_log_idx());
     nuraft::ptr<nuraft::buffer> latest_snapshot_ptr;
-    {
+    { /// save snapshot into memory
         std::lock_guard lock(snapshots_lock);
         if (s.get_last_log_idx() != latest_snapshot_meta->get_last_log_idx())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Required to apply snapshot with last log index {}, but our last log index is {}",
@@ -144,14 +153,26 @@ bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
         latest_snapshot_ptr = latest_snapshot_buf;
     }
 
-    {
-        std::lock_guard lock(storage_lock);
-        std::tie(latest_snapshot_meta, storage) = snapshot_manager.deserializeSnapshotFromBuffer(latest_snapshot_ptr);
+    { /// deserialize and apply snapshot to storage
+        std::lock_guard lock(storage_and_responses_lock);
+        auto snapshot_deserialization_result = snapshot_manager.deserializeSnapshotFromBuffer(latest_snapshot_buf);
+        storage = std::move(snapshot_deserialization_result.storage);
+        latest_snapshot_meta = snapshot_deserialization_result.snapshot_meta;
+        cluster_config = snapshot_deserialization_result.cluster_config;
     }
+
     last_committed_idx = s.get_last_log_idx();
     return true;
 }
 
+
+void KeeperStateMachine::commit_config(const uint64_t /*log_idx*/, nuraft::ptr<nuraft::cluster_config> & new_conf)
+{
+    std::lock_guard lock(cluster_config_lock);
+    auto tmp = new_conf->serialize();
+    cluster_config = ClusterConfig::deserialize(*tmp);
+}
+
 nuraft::ptr<nuraft::snapshot> KeeperStateMachine::last_snapshot()
 {
     /// Just return the latest snapshot.
@@ -168,18 +189,19 @@ void KeeperStateMachine::create_snapshot(
     nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
     auto snapshot_meta_copy = nuraft::snapshot::deserialize(*snp_buf);
     CreateSnapshotTask snapshot_task;
-    {
-        std::lock_guard lock(storage_lock);
-        snapshot_task.snapshot = std::make_shared<KeeperStorageSnapshot>(storage.get(), snapshot_meta_copy);
+    { /// lock storage for a short period time to turn on "snapshot mode". After that we can read consistent storage state without locking.
+        std::lock_guard lock(storage_and_responses_lock);
+        snapshot_task.snapshot = std::make_shared<KeeperStorageSnapshot>(storage.get(), snapshot_meta_copy, getClusterConfig());
     }
 
+    /// create snapshot task for background execution (in snapshot thread)
     snapshot_task.create_snapshot = [this, when_done] (KeeperStorageSnapshotPtr && snapshot)
     {
         nuraft::ptr<std::exception> exception(nullptr);
         bool ret = true;
         try
         {
-            {
+            {   /// Read storage data without locks and create snapshot
                 std::lock_guard lock(snapshots_lock);
                 auto snapshot_buf = snapshot_manager.serializeSnapshotToBuffer(*snapshot);
                 auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*snapshot_buf, snapshot->snapshot_meta->get_last_log_idx());
@@ -191,7 +213,8 @@ void KeeperStateMachine::create_snapshot(
 
             {
                 /// Must do it with lock (clearing elements from list)
-                std::lock_guard lock(storage_lock);
+                std::lock_guard lock(storage_and_responses_lock);
+                /// Turn off "snapshot mode" and clear outdate part of storage state
                 storage->clearGarbageAfterSnapshot();
                 /// Destroy snapshot with lock
                 snapshot.reset();
@@ -209,8 +232,11 @@ void KeeperStateMachine::create_snapshot(
         when_done(ret, exception);
     };
 
+
     LOG_DEBUG(log, "In memory snapshot {} created, queueing task to flash to disk", s.get_last_log_idx());
-    snapshots_queue.push(std::move(snapshot_task));
+    /// Flush snapshot to disk in a separate thread.
+    if (!snapshots_queue.push(std::move(snapshot_task)))
+        LOG_WARNING(log, "Cannot push snapshot task into queue");
 }
 
 void KeeperStateMachine::save_logical_snp_obj(
@@ -224,23 +250,26 @@ void KeeperStateMachine::save_logical_snp_obj(
 
     nuraft::ptr<nuraft::buffer> cloned_buffer;
     nuraft::ptr<nuraft::snapshot> cloned_meta;
-    if (obj_id == 0)
+    if (obj_id == 0) /// Fake snapshot required by NuRaft at startup
     {
-        std::lock_guard lock(storage_lock);
-        KeeperStorageSnapshot snapshot(storage.get(), s.get_last_log_idx());
+        std::lock_guard lock(storage_and_responses_lock);
+        KeeperStorageSnapshot snapshot(storage.get(), s.get_last_log_idx(), getClusterConfig());
         cloned_buffer = snapshot_manager.serializeSnapshotToBuffer(snapshot);
     }
     else
     {
+        /// copy snapshot into memory
         cloned_buffer = nuraft::buffer::clone(data);
     }
 
+    /// copy snapshot meta into memory
     nuraft::ptr<nuraft::buffer> snp_buf = s.serialize();
     cloned_meta = nuraft::snapshot::deserialize(*snp_buf);
 
     try
     {
         std::lock_guard lock(snapshots_lock);
+        /// Serialize snapshot to disk and switch in memory pointers.
         auto result_path = snapshot_manager.serializeSnapshotBufferToDisk(*cloned_buffer, s.get_last_log_idx());
         latest_snapshot_buf = cloned_buffer;
         latest_snapshot_meta = cloned_meta;
@@ -262,7 +291,7 @@ int KeeperStateMachine::read_logical_snp_obj(
 {
 
     LOG_DEBUG(log, "Reading snapshot {} obj_id {}", s.get_last_log_idx(), obj_id);
-    if (obj_id == 0)
+    if (obj_id == 0) /// Fake snapshot required by NuRaft at startup
     {
         data_out = nuraft::buffer::alloc(sizeof(int32_t));
         nuraft::buffer_serializer bs(data_out);
@@ -272,6 +301,8 @@ int KeeperStateMachine::read_logical_snp_obj(
     else
     {
         std::lock_guard lock(snapshots_lock);
+        /// Our snapshot is not equal to required. Maybe we still creating it in the background.
+        /// Let's wait and NuRaft will retry this call.
         if (s.get_last_log_idx() != latest_snapshot_meta->get_last_log_idx())
         {
             LOG_WARNING(log, "Required to apply snapshot with last log index {}, but our last log index is {}. Will ignore this one and retry",
@@ -281,30 +312,42 @@ int KeeperStateMachine::read_logical_snp_obj(
         data_out = nuraft::buffer::clone(*latest_snapshot_buf);
         is_last_obj = true;
     }
+
     return 1;
 }
 
 void KeeperStateMachine::processReadRequest(const KeeperStorage::RequestForSession & request_for_session)
 {
-    KeeperStorage::ResponsesForSessions responses;
-    {
-        std::lock_guard lock(storage_lock);
-        responses = storage->processRequest(request_for_session.request, request_for_session.session_id, std::nullopt);
-    }
+    /// Pure local request, just process it with storage
+    std::lock_guard lock(storage_and_responses_lock);
+    auto responses = storage->processRequest(request_for_session.request, request_for_session.session_id, std::nullopt);
     for (const auto & response : responses)
-        responses_queue.push(response);
+        if (!responses_queue.push(response))
+            throw Exception(ErrorCodes::SYSTEM_ERROR, "Could not push response with session id {} into responses queue", response.session_id);
 }
 
-std::unordered_set<int64_t> KeeperStateMachine::getDeadSessions()
+std::vector<int64_t> KeeperStateMachine::getDeadSessions()
 {
-    std::lock_guard lock(storage_lock);
+    std::lock_guard lock(storage_and_responses_lock);
     return storage->getDeadSessions();
 }
 
 void KeeperStateMachine::shutdownStorage()
 {
-    std::lock_guard lock(storage_lock);
+    std::lock_guard lock(storage_and_responses_lock);
     storage->finalize();
 }
 
+ClusterConfigPtr KeeperStateMachine::getClusterConfig() const
+{
+    std::lock_guard lock(cluster_config_lock);
+    if (cluster_config)
+    {
+        /// dumb way to return copy...
+        auto tmp = cluster_config->serialize();
+        return ClusterConfig::deserialize(*tmp);
+    }
+    return nullptr;
+}
+
 }
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index fb46f507baf..5af3dff73b5 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -1,18 +1,21 @@
 #pragma once
 
+#include <Common/ConcurrentBoundedQueue.h>
 #include <Coordination/KeeperStorage.h>
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
-#include <common/logger_useful.h>
-#include <Coordination/ThreadSafeQueue.h>
+#include <libnuraft/nuraft.hxx>
+#include <base/logger_useful.h>
 #include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperSnapshotManager.h>
 
+
 namespace DB
 {
 
-using ResponsesQueue = ThreadSafeQueue<KeeperStorage::ResponseForSession>;
+using ResponsesQueue = ConcurrentBoundedQueue<KeeperStorage::ResponseForSession>;
 using SnapshotsQueue = ConcurrentBoundedQueue<CreateSnapshotTask>;
 
+/// ClickHouse Keeper state machine. Wrapper for KeeperStorage.
+/// Responsible for entries commit, snapshots creation and so on.
 class KeeperStateMachine : public nuraft::state_machine
 {
 public:
@@ -21,24 +24,33 @@ public:
         const std::string & snapshots_path_, const CoordinationSettingsPtr & coordination_settings_,
         const std::string & superdigest_ = "");
 
+    /// Read state from the latest snapshot
     void init();
 
+    /// Currently not supported
     nuraft::ptr<nuraft::buffer> pre_commit(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override { return nullptr; }
 
     nuraft::ptr<nuraft::buffer> commit(const uint64_t log_idx, nuraft::buffer & data) override;
 
+    /// Save new cluster config to our snapshot (copy of the config stored in StateManager)
+    void commit_config(const uint64_t log_idx, nuraft::ptr<nuraft::cluster_config> & new_conf) override;
+
+    /// Currently not supported
     void rollback(const uint64_t /*log_idx*/, nuraft::buffer & /*data*/) override {}
 
     uint64_t last_commit_index() override { return last_committed_idx; }
 
+    /// Apply preliminarily saved (save_logical_snp_obj) snapshot to our state.
     bool apply_snapshot(nuraft::snapshot & s) override;
 
     nuraft::ptr<nuraft::snapshot> last_snapshot() override;
 
+    /// Create new snapshot from current state.
     void create_snapshot(
         nuraft::snapshot & s,
         nuraft::async_result<bool>::handler_type & when_done) override;
 
+    /// Save snapshot which was send by leader to us. After that we will apply it in apply_snapshot.
     void save_logical_snp_obj(
         nuraft::snapshot & s,
         uint64_t & obj_id,
@@ -46,6 +58,8 @@ public:
         bool is_first_obj,
         bool is_last_obj) override;
 
+    /// Better name is `serialize snapshot` -- save existing snapshot (created by create_snapshot) into
+    /// in-memory buffer data_out.
     int read_logical_snp_obj(
         nuraft::snapshot & s,
         void* & user_snp_ctx,
@@ -58,36 +72,58 @@ public:
         return *storage;
     }
 
+    /// Process local read request
     void processReadRequest(const KeeperStorage::RequestForSession & request_for_session);
 
-    std::unordered_set<int64_t> getDeadSessions();
+    std::vector<int64_t> getDeadSessions();
 
     void shutdownStorage();
 
+    ClusterConfigPtr getClusterConfig() const;
+
 private:
 
+    /// In our state machine we always have a single snapshot which is stored
+    /// in memory in compressed (serialized) format.
     SnapshotMetadataPtr latest_snapshot_meta = nullptr;
     nuraft::ptr<nuraft::buffer> latest_snapshot_buf = nullptr;
 
     CoordinationSettingsPtr coordination_settings;
 
+    /// Main state machine logic
     KeeperStoragePtr storage;
 
+    /// Save/Load and Serialize/Deserialize logic for snapshots.
     KeeperSnapshotManager snapshot_manager;
 
+    /// Put processed responses into this queue
     ResponsesQueue & responses_queue;
 
+    /// Snapshots to create by snapshot thread
     SnapshotsQueue & snapshots_queue;
+
     /// Mutex for snapshots
     std::mutex snapshots_lock;
 
-    /// Lock for storage
-    std::mutex storage_lock;
+    /// Lock for storage and responses_queue. It's important to process requests
+    /// and push them to the responses queue while holding this lock. Otherwise
+    /// we can get strange cases when, for example client send read request with
+    /// watch and after that receive watch response and only receive response
+    /// for request.
+    std::mutex storage_and_responses_lock;
 
     /// Last committed Raft log number.
     std::atomic<uint64_t> last_committed_idx;
+
     Poco::Logger * log;
 
+    /// Cluster config for our quorum.
+    /// It's a copy of config stored in StateManager, but here
+    /// we also write it to disk during snapshot. Must be used with lock.
+    mutable std::mutex cluster_config_lock;
+    ClusterConfigPtr cluster_config;
+
+    /// Special part of ACL system -- superdigest specified in server config.
     const std::string superdigest;
 };
 
diff --git a/src/Coordination/KeeperStateManager.cpp b/src/Coordination/KeeperStateManager.cpp
index d54752ec168..31b3a5f8b87 100644
--- a/src/Coordination/KeeperStateManager.cpp
+++ b/src/Coordination/KeeperStateManager.cpp
@@ -1,4 +1,5 @@
 #include <Coordination/KeeperStateManager.h>
+#include <Coordination/Defines.h>
 #include <Common/Exception.h>
 #include <filesystem>
 
@@ -30,42 +31,22 @@ namespace
 
 }
 
-KeeperStateManager::KeeperStateManager(int server_id_, const std::string & host, int port, const std::string & logs_path)
-    : my_server_id(server_id_)
-    , my_port(port)
-    , secure(false)
-    , log_store(nuraft::cs_new<KeeperLogStore>(logs_path, 5000, false))
-    , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
-{
-    auto peer_config = nuraft::cs_new<nuraft::srv_config>(my_server_id, host + ":" + std::to_string(port));
-    cluster_config->get_servers().push_back(peer_config);
-}
 
-KeeperStateManager::KeeperStateManager(
-    int my_server_id_,
-    const std::string & config_prefix,
-    const Poco::Util::AbstractConfiguration & config,
-    const CoordinationSettingsPtr & coordination_settings,
-    bool standalone_keeper)
-    : my_server_id(my_server_id_)
-    , secure(config.getBool(config_prefix + ".raft_configuration.secure", false))
-    , log_store(nuraft::cs_new<KeeperLogStore>(
-                    getLogsPathFromConfig(config_prefix, config, standalone_keeper),
-                    coordination_settings->rotate_log_storage_interval, coordination_settings->force_sync))
-    , cluster_config(nuraft::cs_new<nuraft::cluster_config>())
+KeeperConfigurationWrapper KeeperStateManager::parseServersConfiguration(const Poco::Util::AbstractConfiguration & config, bool allow_without_us) const
 {
-
+    KeeperConfigurationWrapper result;
+    result.cluster_config = std::make_shared<nuraft::cluster_config>();
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix + ".raft_configuration", keys);
-    total_servers = keys.size();
 
+    size_t total_servers = 0;
     for (const auto & server_key : keys)
     {
         if (!startsWith(server_key, "server"))
             continue;
 
         std::string full_prefix = config_prefix + ".raft_configuration." + server_key;
-        int server_id = config.getInt(full_prefix + ".id");
+        int new_server_id = config.getInt(full_prefix + ".id");
         std::string hostname = config.getString(full_prefix + ".hostname");
         int port = config.getInt(full_prefix + ".port");
         bool can_become_leader = config.getBool(full_prefix + ".can_become_leader", true);
@@ -73,24 +54,55 @@ KeeperStateManager::KeeperStateManager(
         bool start_as_follower = config.getBool(full_prefix + ".start_as_follower", false);
 
         if (start_as_follower)
-            start_as_follower_servers.insert(server_id);
+            result.servers_start_as_followers.insert(new_server_id);
 
         auto endpoint = hostname + ":" + std::to_string(port);
-        auto peer_config = nuraft::cs_new<nuraft::srv_config>(server_id, 0, endpoint, "", !can_become_leader, priority);
-        if (server_id == my_server_id)
+        auto peer_config = nuraft::cs_new<nuraft::srv_config>(new_server_id, 0, endpoint, "", !can_become_leader, priority);
+        if (my_server_id == new_server_id)
         {
-            my_server_config = peer_config;
-            my_port = port;
+            result.config = peer_config;
+            result.port = port;
         }
 
-        cluster_config->get_servers().push_back(peer_config);
+        result.cluster_config->get_servers().push_back(peer_config);
+        total_servers++;
     }
 
-    if (!my_server_config)
+    if (!result.config && !allow_without_us)
         throw Exception(ErrorCodes::RAFT_ERROR, "Our server id {} not found in raft_configuration section", my_server_id);
 
-    if (start_as_follower_servers.size() == cluster_config->get_servers().size())
+    if (result.servers_start_as_followers.size() == total_servers)
         throw Exception(ErrorCodes::RAFT_ERROR, "At least one of servers should be able to start as leader (without <start_as_follower>)");
+
+    return result;
+}
+
+KeeperStateManager::KeeperStateManager(int server_id_, const std::string & host, int port, const std::string & logs_path)
+    : my_server_id(server_id_)
+    , secure(false)
+    , log_store(nuraft::cs_new<KeeperLogStore>(logs_path, 5000, false, false))
+{
+    auto peer_config = nuraft::cs_new<nuraft::srv_config>(my_server_id, host + ":" + std::to_string(port));
+    configuration_wrapper.cluster_config = nuraft::cs_new<nuraft::cluster_config>();
+    configuration_wrapper.port = port;
+    configuration_wrapper.config = peer_config;
+    configuration_wrapper.cluster_config->get_servers().push_back(peer_config);
+}
+
+KeeperStateManager::KeeperStateManager(
+    int server_id_,
+    const std::string & config_prefix_,
+    const Poco::Util::AbstractConfiguration & config,
+    const CoordinationSettingsPtr & coordination_settings,
+    bool standalone_keeper)
+    : my_server_id(server_id_)
+    , secure(config.getBool(config_prefix_ + ".raft_configuration.secure", false))
+    , config_prefix(config_prefix_)
+    , configuration_wrapper(parseServersConfiguration(config, false))
+    , log_store(nuraft::cs_new<KeeperLogStore>(
+                    getLogsPathFromConfig(config_prefix_, config, standalone_keeper),
+                    coordination_settings->rotate_log_storage_interval, coordination_settings->force_sync, coordination_settings->compress_logs))
+{
 }
 
 void KeeperStateManager::loadLogStore(uint64_t last_commited_index, uint64_t logs_to_keep)
@@ -98,6 +110,14 @@ void KeeperStateManager::loadLogStore(uint64_t last_commited_index, uint64_t log
     log_store->init(last_commited_index, logs_to_keep);
 }
 
+ClusterConfigPtr KeeperStateManager::getLatestConfigFromLogStore() const
+{
+    auto entry_with_change = log_store->getLatestConfigChange();
+    if (entry_with_change)
+        return ClusterConfig::deserialize(entry_with_change->get_buf());
+    return nullptr;
+}
+
 void KeeperStateManager::flushLogStore()
 {
     log_store->flush();
@@ -105,18 +125,67 @@ void KeeperStateManager::flushLogStore()
 
 void KeeperStateManager::save_config(const nuraft::cluster_config & config)
 {
-    // Just keep in memory in this example.
-    // Need to write to disk here, if want to make it durable.
+    std::lock_guard lock(configuration_wrapper_mutex);
     nuraft::ptr<nuraft::buffer> buf = config.serialize();
-    cluster_config = nuraft::cluster_config::deserialize(*buf);
+    configuration_wrapper.cluster_config = nuraft::cluster_config::deserialize(*buf);
 }
 
 void KeeperStateManager::save_state(const nuraft::srv_state & state)
 {
-     // Just keep in memory in this example.
-     // Need to write to disk here, if want to make it durable.
-     nuraft::ptr<nuraft::buffer> buf = state.serialize();
-     server_state = nuraft::srv_state::deserialize(*buf);
- }
+    nuraft::ptr<nuraft::buffer> buf = state.serialize();
+    server_state = nuraft::srv_state::deserialize(*buf);
+}
+
+ConfigUpdateActions KeeperStateManager::getConfigurationDiff(const Poco::Util::AbstractConfiguration & config) const
+{
+    auto new_configuration_wrapper = parseServersConfiguration(config, true);
+
+    std::unordered_map<int, KeeperServerConfigPtr> new_ids, old_ids;
+    for (const auto & new_server : new_configuration_wrapper.cluster_config->get_servers())
+        new_ids[new_server->get_id()] = new_server;
+
+    {
+        std::lock_guard lock(configuration_wrapper_mutex);
+        for (const auto & old_server : configuration_wrapper.cluster_config->get_servers())
+            old_ids[old_server->get_id()] = old_server;
+    }
+
+    ConfigUpdateActions result;
+
+    /// First of all add new servers
+    for (auto [new_id, server_config] : new_ids)
+    {
+        if (!old_ids.count(new_id))
+            result.emplace_back(ConfigUpdateAction{ConfigUpdateActionType::AddServer, server_config});
+    }
+
+    /// After that remove old ones
+    for (auto [old_id, server_config] : old_ids)
+    {
+        if (!new_ids.count(old_id))
+            result.emplace_back(ConfigUpdateAction{ConfigUpdateActionType::RemoveServer, server_config});
+    }
+
+    {
+        std::lock_guard lock(configuration_wrapper_mutex);
+        /// And update priority if required
+        for (const auto & old_server : configuration_wrapper.cluster_config->get_servers())
+        {
+            for (const auto & new_server : new_configuration_wrapper.cluster_config->get_servers())
+            {
+                if (old_server->get_id() == new_server->get_id())
+                {
+                    if (old_server->get_priority() != new_server->get_priority())
+                    {
+                        result.emplace_back(ConfigUpdateAction{ConfigUpdateActionType::UpdatePriority, new_server});
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    return result;
+}
 
 }
diff --git a/src/Coordination/KeeperStateManager.h b/src/Coordination/KeeperStateManager.h
index 2a93a1dc62b..96f0484c05a 100644
--- a/src/Coordination/KeeperStateManager.h
+++ b/src/Coordination/KeeperStateManager.h
@@ -4,22 +4,59 @@
 #include <string>
 #include <Coordination/KeeperLogStore.h>
 #include <Coordination/CoordinationSettings.h>
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Coordination/KeeperSnapshotManager.h>
 
 namespace DB
 {
 
+using KeeperServerConfigPtr = nuraft::ptr<nuraft::srv_config>;
+
+/// Wrapper struct for Keeper cluster config. We parse this
+/// info from XML files.
+struct KeeperConfigurationWrapper
+{
+    /// Our port
+    int port;
+    /// Our config
+    KeeperServerConfigPtr config;
+    /// Servers id's to start as followers
+    std::unordered_set<int> servers_start_as_followers;
+    /// Cluster config
+    ClusterConfigPtr cluster_config;
+};
+
+/// When our configuration changes the following action types
+/// can happen
+enum class ConfigUpdateActionType
+{
+    RemoveServer,
+    AddServer,
+    UpdatePriority,
+};
+
+/// Action to update configuration
+struct ConfigUpdateAction
+{
+    ConfigUpdateActionType action_type;
+    KeeperServerConfigPtr server;
+};
+
+using ConfigUpdateActions = std::vector<ConfigUpdateAction>;
+
+/// Responsible for managing our and cluster configuration
 class KeeperStateManager : public nuraft::state_mgr
 {
 public:
     KeeperStateManager(
         int server_id_,
-        const std::string & config_prefix,
+        const std::string & config_prefix_,
         const Poco::Util::AbstractConfiguration & config,
         const CoordinationSettingsPtr & coordination_settings,
         bool standalone_keeper);
 
+    /// Constructor for tests
     KeeperStateManager(
         int server_id_,
         const std::string & host,
@@ -30,8 +67,14 @@ public:
 
     void flushLogStore();
 
-    nuraft::ptr<nuraft::cluster_config> load_config() override { return cluster_config; }
+    /// Called on server start, in our case we don't use any separate logic for load
+    nuraft::ptr<nuraft::cluster_config> load_config() override
+    {
+        std::lock_guard lock(configuration_wrapper_mutex);
+        return configuration_wrapper.cluster_config;
+    }
 
+    /// Save cluster config (i.e. nodes, their priorities and so on)
     void save_config(const nuraft::cluster_config & config) override;
 
     void save_state(const nuraft::srv_state & state) override;
@@ -40,17 +83,22 @@ public:
 
     nuraft::ptr<nuraft::log_store> load_log_store() override { return log_store; }
 
-    Int32 server_id() override { return my_server_id; }
+    int32_t server_id() override { return my_server_id; }
 
-    nuraft::ptr<nuraft::srv_config> get_srv_config() const { return my_server_config; }
+    nuraft::ptr<nuraft::srv_config> get_srv_config() const { return configuration_wrapper.config; }
 
     void system_exit(const int /* exit_code */) override {}
 
-    int getPort() const { return my_port; }
+    int getPort() const
+    {
+        std::lock_guard lock(configuration_wrapper_mutex);
+        return configuration_wrapper.port;
+    }
 
     bool shouldStartAsFollower() const
     {
-        return start_as_follower_servers.count(my_server_id);
+        std::lock_guard lock(configuration_wrapper_mutex);
+        return configuration_wrapper.servers_start_as_followers.count(my_server_id);
     }
 
     bool isSecure() const
@@ -60,18 +108,31 @@ public:
 
     nuraft::ptr<KeeperLogStore> getLogStore() const { return log_store; }
 
-    uint64_t getTotalServers() const { return total_servers; }
+    uint64_t getTotalServers() const
+    {
+        std::lock_guard lock(configuration_wrapper_mutex);
+        return configuration_wrapper.cluster_config->get_servers().size();
+    }
+
+    /// Read all log entries in log store from the begging and return latest config (with largest log_index)
+    ClusterConfigPtr getLatestConfigFromLogStore() const;
+
+    /// Get configuration diff between proposed XML and current state in RAFT
+    ConfigUpdateActions getConfigurationDiff(const Poco::Util::AbstractConfiguration & config) const;
 
 private:
     int my_server_id;
-    int my_port;
     bool secure;
-    uint64_t total_servers{0};
-    std::unordered_set<int> start_as_follower_servers;
+    std::string config_prefix;
+
+    mutable std::mutex configuration_wrapper_mutex;
+    KeeperConfigurationWrapper configuration_wrapper;
+
     nuraft::ptr<KeeperLogStore> log_store;
-    nuraft::ptr<nuraft::srv_config> my_server_config;
-    nuraft::ptr<nuraft::cluster_config> cluster_config;
     nuraft::ptr<nuraft::srv_state> server_state;
+
+    /// Parse configuration from xml config.
+    KeeperConfigurationWrapper parseServersConfiguration(const Poco::Util::AbstractConfiguration & config, bool allow_without_us) const;
 };
 
 }
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 4c3f649a6b6..b6938da958b 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -3,7 +3,7 @@
 #include <Common/setThreadName.h>
 #include <mutex>
 #include <functional>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <sstream>
 #include <iomanip>
@@ -151,19 +151,39 @@ static KeeperStorage::ResponsesForSessions processWatchesImpl(const String & pat
     }
 
     auto parent_path = parentPath(path);
-    it = list_watches.find(parent_path);
-    if (it != list_watches.end())
-    {
-        std::shared_ptr<Coordination::ZooKeeperWatchResponse> watch_list_response = std::make_shared<Coordination::ZooKeeperWatchResponse>();
-        watch_list_response->path = parent_path;
-        watch_list_response->xid = Coordination::WATCH_XID;
-        watch_list_response->zxid = -1;
-        watch_list_response->type = Coordination::Event::CHILD;
-        watch_list_response->state = Coordination::State::CONNECTED;
-        for (auto watcher_session : it->second)
-            result.push_back(KeeperStorage::ResponseForSession{watcher_session, watch_list_response});
 
-        list_watches.erase(it);
+    Strings paths_to_check_for_list_watches;
+    if (event_type == Coordination::Event::CREATED)
+    {
+        paths_to_check_for_list_watches.push_back(parent_path); /// Trigger list watches for parent
+    }
+    else if (event_type == Coordination::Event::DELETED)
+    {
+        paths_to_check_for_list_watches.push_back(path); /// Trigger both list watches for this path
+        paths_to_check_for_list_watches.push_back(parent_path); /// And for parent path
+    }
+    /// CHANGED event never trigger list wathes
+
+    for (const auto & path_to_check : paths_to_check_for_list_watches)
+    {
+        it = list_watches.find(path_to_check);
+        if (it != list_watches.end())
+        {
+            std::shared_ptr<Coordination::ZooKeeperWatchResponse> watch_list_response = std::make_shared<Coordination::ZooKeeperWatchResponse>();
+            watch_list_response->path = path_to_check;
+            watch_list_response->xid = Coordination::WATCH_XID;
+            watch_list_response->zxid = -1;
+            if (path_to_check == parent_path)
+                watch_list_response->type = Coordination::Event::CHILD;
+            else
+                watch_list_response->type = Coordination::Event::DELETED;
+
+            watch_list_response->state = Coordination::State::CONNECTED;
+            for (auto watcher_session : it->second)
+                result.push_back(KeeperStorage::ResponseForSession{watcher_session, watch_list_response});
+
+            list_watches.erase(it);
+        }
     }
     return result;
 }
@@ -177,32 +197,32 @@ KeeperStorage::KeeperStorage(int64_t tick_time_ms, const String & superdigest_)
 
 using Undo = std::function<void()>;
 
-struct KeeperStorageRequest
+struct KeeperStorageRequestProcessor
 {
     Coordination::ZooKeeperRequestPtr zk_request;
 
-    explicit KeeperStorageRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
+    explicit KeeperStorageRequestProcessor(const Coordination::ZooKeeperRequestPtr & zk_request_)
         : zk_request(zk_request_)
     {}
     virtual std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t zxid, int64_t session_id) const = 0;
     virtual KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & /*watches*/, KeeperStorage::Watches & /*list_watches*/) const { return {}; }
     virtual bool checkAuth(KeeperStorage & /*storage*/, int64_t /*session_id*/) const { return true; }
 
-    virtual ~KeeperStorageRequest() = default;
+    virtual ~KeeperStorageRequestProcessor() = default;
 };
 
-struct KeeperStorageHeartbeatRequest final : public KeeperStorageRequest
+struct KeeperStorageHeartbeatRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & /* storage */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         return {zk_request->makeResponse(), {}};
     }
 };
 
-struct KeeperStorageSyncRequest final : public KeeperStorageRequest
+struct KeeperStorageSyncRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & /* storage */, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         auto response = zk_request->makeResponse();
@@ -212,9 +232,9 @@ struct KeeperStorageSyncRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageCreateRequest final : public KeeperStorageRequest
+struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     KeeperStorage::ResponsesForSessions processWatches(KeeperStorage::Watches & watches, KeeperStorage::Watches & list_watches) const override
     {
@@ -248,122 +268,122 @@ struct KeeperStorageCreateRequest final : public KeeperStorageRequest
         Coordination::ZooKeeperCreateResponse & response = dynamic_cast<Coordination::ZooKeeperCreateResponse &>(*response_ptr);
         Coordination::ZooKeeperCreateRequest & request = dynamic_cast<Coordination::ZooKeeperCreateRequest &>(*zk_request);
 
-        if (container.contains(request.path))
+        auto parent_path = parentPath(request.path);
+        auto it = container.find(parent_path);
+
+        if (it == container.end())
+        {
+            response.error = Coordination::Error::ZNONODE;
+            return { response_ptr, undo };
+        }
+        else if (it->value.stat.ephemeralOwner != 0)
+        {
+            response.error = Coordination::Error::ZNOCHILDRENFOREPHEMERALS;
+            return { response_ptr, undo };
+        }
+        std::string path_created = request.path;
+        if (request.is_sequential)
+        {
+            auto seq_num = it->value.seq_num;
+
+            std::stringstream seq_num_str;      // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+            seq_num_str.exceptions(std::ios::failbit);
+            seq_num_str << std::setw(10) << std::setfill('0') << seq_num;
+
+            path_created += seq_num_str.str();
+        }
+        if (container.contains(path_created))
         {
             response.error = Coordination::Error::ZNODEEXISTS;
+            return { response_ptr, undo };
         }
-        else
+        auto child_path = getBaseName(path_created);
+        if (child_path.empty())
         {
-            auto parent_path = parentPath(request.path);
-            auto it = container.find(parent_path);
-
-            if (it == container.end())
-            {
-                response.error = Coordination::Error::ZNONODE;
-            }
-            else if (it->value.stat.ephemeralOwner != 0)
-            {
-                response.error = Coordination::Error::ZNOCHILDRENFOREPHEMERALS;
-            }
-            else
-            {
-                auto & session_auth_ids = storage.session_and_auth[session_id];
-
-                KeeperStorage::Node created_node;
-
-                Coordination::ACLs node_acls;
-                if (!fixupACL(request.acls, session_auth_ids, node_acls, !request.restored_from_zookeeper_log))
-                {
-                    response.error = Coordination::Error::ZINVALIDACL;
-                    return {response_ptr, {}};
-                }
-
-                uint64_t acl_id = storage.acl_map.convertACLs(node_acls);
-                storage.acl_map.addUsage(acl_id);
-
-                created_node.acl_id = acl_id;
-                created_node.stat.czxid = zxid;
-                created_node.stat.mzxid = zxid;
-                created_node.stat.pzxid = zxid;
-                created_node.stat.ctime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
-                created_node.stat.mtime = created_node.stat.ctime;
-                created_node.stat.numChildren = 0;
-                created_node.stat.dataLength = request.data.length();
-                created_node.stat.ephemeralOwner = request.is_ephemeral ? session_id : 0;
-                created_node.data = request.data;
-                created_node.is_sequental = request.is_sequential;
-
-                std::string path_created = request.path;
-
-                if (request.is_sequential)
-                {
-                    auto seq_num = it->value.seq_num;
-
-                    std::stringstream seq_num_str;      // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-                    seq_num_str.exceptions(std::ios::failbit);
-                    seq_num_str << std::setw(10) << std::setfill('0') << seq_num;
-
-                    path_created += seq_num_str.str();
-                }
-
-                int32_t parent_cversion = request.parent_cversion;
-                auto child_path = getBaseName(path_created);
-                int64_t prev_parent_zxid;
-                int32_t prev_parent_cversion;
-                container.updateValue(parent_path, [child_path, zxid, &prev_parent_zxid,
-                                                    parent_cversion, &prev_parent_cversion] (KeeperStorage::Node & parent)
-                {
-
-                    parent.children.insert(child_path);
-                    prev_parent_cversion = parent.stat.cversion;
-                    prev_parent_zxid = parent.stat.pzxid;
-
-                    /// Increment sequential number even if node is not sequential
-                    ++parent.seq_num;
-
-                    if (parent_cversion == -1)
-                        ++parent.stat.cversion;
-                    else if (parent_cversion > parent.stat.cversion)
-                        parent.stat.cversion = parent_cversion;
-
-                    if (zxid > parent.stat.pzxid)
-                        parent.stat.pzxid = zxid;
-                    ++parent.stat.numChildren;
-                });
-
-                response.path_created = path_created;
-                container.insert(path_created, std::move(created_node));
-
-                if (request.is_ephemeral)
-                    ephemerals[session_id].emplace(path_created);
-
-                undo = [&storage, prev_parent_zxid, prev_parent_cversion, session_id, path_created, is_ephemeral = request.is_ephemeral, parent_path, child_path, acl_id]
-                {
-                    storage.container.erase(path_created);
-                    storage.acl_map.removeUsage(acl_id);
-
-                    if (is_ephemeral)
-                        storage.ephemerals[session_id].erase(path_created);
-
-                    storage.container.updateValue(parent_path, [child_path, prev_parent_zxid, prev_parent_cversion] (KeeperStorage::Node & undo_parent)
-                    {
-                        --undo_parent.stat.numChildren;
-                        --undo_parent.seq_num;
-                        undo_parent.stat.cversion = prev_parent_cversion;
-                        undo_parent.stat.pzxid = prev_parent_zxid;
-                        undo_parent.children.erase(child_path);
-                    });
-                };
-
-                response.error = Coordination::Error::ZOK;
-            }
+            response.error = Coordination::Error::ZBADARGUMENTS;
+            return { response_ptr, undo };
         }
 
+        auto & session_auth_ids = storage.session_and_auth[session_id];
+
+        KeeperStorage::Node created_node;
+
+        Coordination::ACLs node_acls;
+        if (!fixupACL(request.acls, session_auth_ids, node_acls, !request.restored_from_zookeeper_log))
+        {
+            response.error = Coordination::Error::ZINVALIDACL;
+            return {response_ptr, {}};
+        }
+
+        uint64_t acl_id = storage.acl_map.convertACLs(node_acls);
+        storage.acl_map.addUsage(acl_id);
+
+        created_node.acl_id = acl_id;
+        created_node.stat.czxid = zxid;
+        created_node.stat.mzxid = zxid;
+        created_node.stat.pzxid = zxid;
+        created_node.stat.ctime = std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1);
+        created_node.stat.mtime = created_node.stat.ctime;
+        created_node.stat.numChildren = 0;
+        created_node.stat.dataLength = request.data.length();
+        created_node.stat.ephemeralOwner = request.is_ephemeral ? session_id : 0;
+        created_node.data = request.data;
+        created_node.is_sequental = request.is_sequential;
+
+        int32_t parent_cversion = request.parent_cversion;
+        int64_t prev_parent_zxid;
+        int32_t prev_parent_cversion;
+        container.updateValue(parent_path, [child_path, zxid, &prev_parent_zxid,
+                                            parent_cversion, &prev_parent_cversion] (KeeperStorage::Node & parent)
+        {
+
+            parent.children.insert(child_path);
+            prev_parent_cversion = parent.stat.cversion;
+            prev_parent_zxid = parent.stat.pzxid;
+
+            /// Increment sequential number even if node is not sequential
+            ++parent.seq_num;
+
+            if (parent_cversion == -1)
+                ++parent.stat.cversion;
+            else if (parent_cversion > parent.stat.cversion)
+                parent.stat.cversion = parent_cversion;
+
+            if (zxid > parent.stat.pzxid)
+                parent.stat.pzxid = zxid;
+            ++parent.stat.numChildren;
+        });
+
+        response.path_created = path_created;
+        container.insert(path_created, std::move(created_node));
+
+        if (request.is_ephemeral)
+            ephemerals[session_id].emplace(path_created);
+
+        undo = [&storage, prev_parent_zxid, prev_parent_cversion, session_id, path_created, is_ephemeral = request.is_ephemeral, parent_path, child_path, acl_id]
+        {
+            storage.container.erase(path_created);
+            storage.acl_map.removeUsage(acl_id);
+
+            if (is_ephemeral)
+                storage.ephemerals[session_id].erase(path_created);
+
+            storage.container.updateValue(parent_path, [child_path, prev_parent_zxid, prev_parent_cversion] (KeeperStorage::Node & undo_parent)
+            {
+                --undo_parent.stat.numChildren;
+                --undo_parent.seq_num;
+                undo_parent.stat.cversion = prev_parent_cversion;
+                undo_parent.stat.pzxid = prev_parent_zxid;
+                undo_parent.children.erase(child_path);
+            });
+        };
+
+        response.error = Coordination::Error::ZOK;
         return { response_ptr, undo };
     }
 };
 
-struct KeeperStorageGetRequest final : public KeeperStorageRequest
+struct KeeperStorageGetRequestProcessor final : public KeeperStorageRequestProcessor
 {
 
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
@@ -381,7 +401,7 @@ struct KeeperStorageGetRequest final : public KeeperStorageRequest
         return checkACL(Coordination::ACL::Read, node_acls, session_auths);
     }
 
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /* zxid */, int64_t /* session_id */) const override
     {
         auto & container = storage.container;
@@ -423,7 +443,7 @@ namespace
     }
 }
 
-struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
+struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -440,7 +460,7 @@ struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
         return checkACL(Coordination::ACL::Delete, node_acls, session_auths);
     }
 
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t zxid, int64_t /*session_id*/) const override
     {
         auto & container = storage.container;
@@ -520,9 +540,9 @@ struct KeeperStorageRemoveRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageExistsRequest final : public KeeperStorageRequest
+struct KeeperStorageExistsRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /* session_id */) const override
     {
         auto & container = storage.container;
@@ -546,7 +566,7 @@ struct KeeperStorageExistsRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageSetRequest final : public KeeperStorageRequest
+struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -563,7 +583,7 @@ struct KeeperStorageSetRequest final : public KeeperStorageRequest
         return checkACL(Coordination::ACL::Write, node_acls, session_auths);
     }
 
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t zxid, int64_t /* session_id */) const override
     {
         auto & container = storage.container;
@@ -624,7 +644,7 @@ struct KeeperStorageSetRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageListRequest final : public KeeperStorageRequest
+struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -641,7 +661,7 @@ struct KeeperStorageListRequest final : public KeeperStorageRequest
         return checkACL(Coordination::ACL::Read, node_acls, session_auths);
     }
 
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /*session_id*/) const override
     {
         auto & container = storage.container;
@@ -669,7 +689,7 @@ struct KeeperStorageListRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageCheckRequest final : public KeeperStorageRequest
+struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -686,7 +706,7 @@ struct KeeperStorageCheckRequest final : public KeeperStorageRequest
         return checkACL(Coordination::ACL::Read, node_acls, session_auths);
     }
 
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /*session_id*/) const override
     {
         auto & container = storage.container;
@@ -713,7 +733,7 @@ struct KeeperStorageCheckRequest final : public KeeperStorageRequest
 };
 
 
-struct KeeperStorageSetACLRequest final : public KeeperStorageRequest
+struct KeeperStorageSetACLRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -730,7 +750,7 @@ struct KeeperStorageSetACLRequest final : public KeeperStorageRequest
         return checkACL(Coordination::ACL::Admin, node_acls, session_auths);
     }
 
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t session_id) const override
     {
@@ -777,7 +797,7 @@ struct KeeperStorageSetACLRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageGetACLRequest final : public KeeperStorageRequest
+struct KeeperStorageGetACLRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -794,7 +814,7 @@ struct KeeperStorageGetACLRequest final : public KeeperStorageRequest
         /// LOL, GetACL require more permissions, then SetACL...
         return checkACL(Coordination::ACL::Admin | Coordination::ACL::Read, node_acls, session_auths);
     }
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
 
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t /*session_id*/) const override
     {
@@ -817,7 +837,7 @@ struct KeeperStorageGetACLRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageMultiRequest final : public KeeperStorageRequest
+struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestProcessor
 {
     bool checkAuth(KeeperStorage & storage, int64_t session_id) const override
     {
@@ -827,9 +847,9 @@ struct KeeperStorageMultiRequest final : public KeeperStorageRequest
         return true;
     }
 
-    std::vector<KeeperStorageRequestPtr> concrete_requests;
-    explicit KeeperStorageMultiRequest(const Coordination::ZooKeeperRequestPtr & zk_request_)
-        : KeeperStorageRequest(zk_request_)
+    std::vector<KeeperStorageRequestProcessorPtr> concrete_requests;
+    explicit KeeperStorageMultiRequestProcessor(const Coordination::ZooKeeperRequestPtr & zk_request_)
+        : KeeperStorageRequestProcessor(zk_request_)
     {
         Coordination::ZooKeeperMultiRequest & request = dynamic_cast<Coordination::ZooKeeperMultiRequest &>(*zk_request);
         concrete_requests.reserve(request.requests.size());
@@ -839,19 +859,19 @@ struct KeeperStorageMultiRequest final : public KeeperStorageRequest
             auto sub_zk_request = std::dynamic_pointer_cast<Coordination::ZooKeeperRequest>(sub_request);
             if (sub_zk_request->getOpNum() == Coordination::OpNum::Create)
             {
-                concrete_requests.push_back(std::make_shared<KeeperStorageCreateRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageCreateRequestProcessor>(sub_zk_request));
             }
             else if (sub_zk_request->getOpNum() == Coordination::OpNum::Remove)
             {
-                concrete_requests.push_back(std::make_shared<KeeperStorageRemoveRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageRemoveRequestProcessor>(sub_zk_request));
             }
             else if (sub_zk_request->getOpNum() == Coordination::OpNum::Set)
             {
-                concrete_requests.push_back(std::make_shared<KeeperStorageSetRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageSetRequestProcessor>(sub_zk_request));
             }
             else if (sub_zk_request->getOpNum() == Coordination::OpNum::Check)
             {
-                concrete_requests.push_back(std::make_shared<KeeperStorageCheckRequest>(sub_zk_request));
+                concrete_requests.push_back(std::make_shared<KeeperStorageCheckRequestProcessor>(sub_zk_request));
             }
             else
                 throw DB::Exception(ErrorCodes::BAD_ARGUMENTS, "Illegal command as part of multi ZooKeeper request {}", sub_zk_request->getOpNum());
@@ -923,18 +943,18 @@ struct KeeperStorageMultiRequest final : public KeeperStorageRequest
     }
 };
 
-struct KeeperStorageCloseRequest final : public KeeperStorageRequest
+struct KeeperStorageCloseRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage &, int64_t, int64_t) const override
     {
         throw DB::Exception("Called process on close request", ErrorCodes::LOGICAL_ERROR);
     }
 };
 
-struct KeeperStorageAuthRequest final : public KeeperStorageRequest
+struct KeeperStorageAuthRequestProcessor final : public KeeperStorageRequestProcessor
 {
-    using KeeperStorageRequest::KeeperStorageRequest;
+    using KeeperStorageRequestProcessor::KeeperStorageRequestProcessor;
     std::pair<Coordination::ZooKeeperResponsePtr, Undo> process(KeeperStorage & storage, int64_t /*zxid*/, int64_t session_id) const override
     {
         Coordination::ZooKeeperAuthRequest & auth_request = dynamic_cast<Coordination::ZooKeeperAuthRequest &>(*zk_request);
@@ -988,20 +1008,20 @@ void KeeperStorage::finalize()
 }
 
 
-class KeeperWrapperFactory final : private boost::noncopyable
+class KeeperStorageRequestProcessorsFactory final : private boost::noncopyable
 {
 
 public:
-    using Creator = std::function<KeeperStorageRequestPtr(const Coordination::ZooKeeperRequestPtr &)>;
+    using Creator = std::function<KeeperStorageRequestProcessorPtr(const Coordination::ZooKeeperRequestPtr &)>;
     using OpNumToRequest = std::unordered_map<Coordination::OpNum, Creator>;
 
-    static KeeperWrapperFactory & instance()
+    static KeeperStorageRequestProcessorsFactory & instance()
     {
-        static KeeperWrapperFactory factory;
+        static KeeperStorageRequestProcessorsFactory factory;
         return factory;
     }
 
-    KeeperStorageRequestPtr get(const Coordination::ZooKeeperRequestPtr & zk_request) const
+    KeeperStorageRequestProcessorPtr get(const Coordination::ZooKeeperRequestPtr & zk_request) const
     {
         auto it = op_num_to_request.find(zk_request->getOpNum());
         if (it == op_num_to_request.end())
@@ -1018,33 +1038,33 @@ public:
 
 private:
     OpNumToRequest op_num_to_request;
-    KeeperWrapperFactory();
+    KeeperStorageRequestProcessorsFactory();
 };
 
 template<Coordination::OpNum num, typename RequestT>
-void registerKeeperRequestWrapper(KeeperWrapperFactory & factory)
+void registerKeeperRequestProcessor(KeeperStorageRequestProcessorsFactory & factory)
 {
     factory.registerRequest(num, [] (const Coordination::ZooKeeperRequestPtr & zk_request) { return std::make_shared<RequestT>(zk_request); });
 }
 
 
-KeeperWrapperFactory::KeeperWrapperFactory()
+KeeperStorageRequestProcessorsFactory::KeeperStorageRequestProcessorsFactory()
 {
-    registerKeeperRequestWrapper<Coordination::OpNum::Heartbeat, KeeperStorageHeartbeatRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Sync, KeeperStorageSyncRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Auth, KeeperStorageAuthRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Close, KeeperStorageCloseRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Create, KeeperStorageCreateRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Remove, KeeperStorageRemoveRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Exists, KeeperStorageExistsRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Get, KeeperStorageGetRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Set, KeeperStorageSetRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::List, KeeperStorageListRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::SimpleList, KeeperStorageListRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Check, KeeperStorageCheckRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::Multi, KeeperStorageMultiRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::SetACL, KeeperStorageSetACLRequest>(*this);
-    registerKeeperRequestWrapper<Coordination::OpNum::GetACL, KeeperStorageGetACLRequest>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Heartbeat, KeeperStorageHeartbeatRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Sync, KeeperStorageSyncRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Auth, KeeperStorageAuthRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Close, KeeperStorageCloseRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Create, KeeperStorageCreateRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Remove, KeeperStorageRemoveRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Exists, KeeperStorageExistsRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Get, KeeperStorageGetRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Set, KeeperStorageSetRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::List, KeeperStorageListRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::SimpleList, KeeperStorageListRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Check, KeeperStorageCheckRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::Multi, KeeperStorageMultiRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::SetACL, KeeperStorageSetACLRequestProcessor>(*this);
+    registerKeeperRequestProcessor<Coordination::OpNum::GetACL, KeeperStorageGetACLRequestProcessor>(*this);
 }
 
 
@@ -1058,8 +1078,10 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
         zxid = *new_last_zxid;
     }
 
-    session_expiry_queue.update(session_id, session_and_timeout[session_id]);
-    if (zk_request->getOpNum() == Coordination::OpNum::Close)
+    /// ZooKeeper update sessions expirity for each request, not only for heartbeats
+    session_expiry_queue.addNewSessionOrUpdate(session_id, session_and_timeout[session_id]);
+
+    if (zk_request->getOpNum() == Coordination::OpNum::Close) /// Close request is special
     {
         auto it = ephemerals.find(session_id);
         if (it != ephemerals.end())
@@ -1092,21 +1114,21 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
         session_and_timeout.erase(session_id);
         results.push_back(ResponseForSession{session_id, response});
     }
-    else if (zk_request->getOpNum() == Coordination::OpNum::Heartbeat)
+    else if (zk_request->getOpNum() == Coordination::OpNum::Heartbeat) /// Heartbeat request is also special
     {
-        KeeperStorageRequestPtr storage_request = KeeperWrapperFactory::instance().get(zk_request);
+        KeeperStorageRequestProcessorPtr storage_request = KeeperStorageRequestProcessorsFactory::instance().get(zk_request);
         auto [response, _] = storage_request->process(*this, zxid, session_id);
         response->xid = zk_request->xid;
         response->zxid = getZXID();
 
         results.push_back(ResponseForSession{session_id, response});
     }
-    else
+    else /// normal requests proccession
     {
-        KeeperStorageRequestPtr storage_request = KeeperWrapperFactory::instance().get(zk_request);
+        KeeperStorageRequestProcessorPtr request_processor = KeeperStorageRequestProcessorsFactory::instance().get(zk_request);
         Coordination::ZooKeeperResponsePtr response;
 
-        if (check_acl && !storage_request->checkAuth(*this, session_id))
+        if (check_acl && !request_processor->checkAuth(*this, session_id))
         {
             response = zk_request->makeResponse();
             /// Original ZooKeeper always throws no auth, even when user provided some credentials
@@ -1114,9 +1136,10 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
         }
         else
         {
-            std::tie(response, std::ignore) = storage_request->process(*this, zxid, session_id);
+            std::tie(response, std::ignore) = request_processor->process(*this, zxid, session_id);
         }
 
+        /// Watches for this requests are added to the watches lists
         if (zk_request->has_watch)
         {
             if (response->error == Coordination::Error::ZOK)
@@ -1135,9 +1158,10 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
             }
         }
 
+        /// If this requests processed successfully we need to check watches
         if (response->error == Coordination::Error::ZOK)
         {
-            auto watch_responses = storage_request->processWatches(watches, list_watches);
+            auto watch_responses = request_processor->processWatches(watches, list_watches);
             results.insert(results.end(), watch_responses.begin(), watch_responses.end());
         }
 
@@ -1153,11 +1177,13 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(const Coordina
 
 void KeeperStorage::clearDeadWatches(int64_t session_id)
 {
+    /// Clear all watches for this session
     auto watches_it = sessions_and_watchers.find(session_id);
     if (watches_it != sessions_and_watchers.end())
     {
         for (const auto & watch_path : watches_it->second)
         {
+            /// Maybe it's a normal watch
             auto watch = watches.find(watch_path);
             if (watch != watches.end())
             {
@@ -1173,6 +1199,7 @@ void KeeperStorage::clearDeadWatches(int64_t session_id)
                     watches.erase(watch);
             }
 
+            /// Maybe it's a list watch
             auto list_watch = list_watches.find(watch_path);
             if (list_watch != list_watches.end())
             {
@@ -1188,6 +1215,7 @@ void KeeperStorage::clearDeadWatches(int64_t session_id)
                     list_watches.erase(list_watch);
             }
         }
+
         sessions_and_watchers.erase(watches_it);
     }
 }
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index e3cb0f59fdc..bc9a81bc484 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -15,14 +15,17 @@ namespace DB
 {
 
 using namespace DB;
-struct KeeperStorageRequest;
-using KeeperStorageRequestPtr = std::shared_ptr<KeeperStorageRequest>;
+struct KeeperStorageRequestProcessor;
+using KeeperStorageRequestProcessorPtr = std::shared_ptr<KeeperStorageRequestProcessor>;
 using ResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr &)>;
 using ChildrenSet = std::unordered_set<std::string>;
 using SessionAndTimeout = std::unordered_map<int64_t, int64_t>;
 
 struct KeeperStorageSnapshot;
 
+/// Keeper state machine almost equal to the ZooKeeper's state machine.
+/// Implements all logic of operations, data changes, sessions allocation.
+/// In-memory and not thread safe.
 class KeeperStorage
 {
 public:
@@ -77,21 +80,34 @@ public:
 
     using Watches = std::map<String /* path, relative of root_path */, SessionIDs>;
 
+    /// Main hashtable with nodes. Contain all information about data.
+    /// All other structures expect session_and_timeout can be restored from
+    /// container.
     Container container;
+
+    /// Mapping session_id -> set of ephemeral nodes paths
     Ephemerals ephemerals;
+    /// Mapping sessuib_id -> set of watched nodes paths
     SessionAndWatcher sessions_and_watchers;
+    /// Expiration queue for session, allows to get dead sessions at some point of time
     SessionExpiryQueue session_expiry_queue;
+    /// All active sessions with timeout
     SessionAndTimeout session_and_timeout;
+
+    /// ACLMap for more compact ACLs storage inside nodes.
     ACLMap acl_map;
 
+    /// Global id of all requests applied to storage
     int64_t zxid{0};
     bool finalized{false};
 
+    /// Currently active watches (node_path -> subscribed sessions)
     Watches watches;
     Watches list_watches;   /// Watches for 'list' request (watches on children).
 
     void clearDeadWatches(int64_t session_id);
 
+    /// Get current zxid
     int64_t getZXID() const
     {
         return zxid;
@@ -102,29 +118,37 @@ public:
 public:
     KeeperStorage(int64_t tick_time_ms, const String & superdigest_);
 
+    /// Allocate new session id with the specified timeouts
     int64_t getSessionID(int64_t session_timeout_ms)
     {
         auto result = session_id_counter++;
         session_and_timeout.emplace(result, session_timeout_ms);
-        session_expiry_queue.update(result, session_timeout_ms);
+        session_expiry_queue.addNewSessionOrUpdate(result, session_timeout_ms);
         return result;
     }
 
+    /// Add session id. Used when restoring KeeperStorage from snapshot.
     void addSessionID(int64_t session_id, int64_t session_timeout_ms)
     {
         session_and_timeout.emplace(session_id, session_timeout_ms);
-        session_expiry_queue.update(session_id, session_timeout_ms);
+        session_expiry_queue.addNewSessionOrUpdate(session_id, session_timeout_ms);
     }
 
+    /// Process user request and return response.
+    /// check_acl = false only when converting data from ZooKeeper.
     ResponsesForSessions processRequest(const Coordination::ZooKeeperRequestPtr & request, int64_t session_id, std::optional<int64_t> new_last_zxid, bool check_acl = true);
 
     void finalize();
 
+    /// Set of methods for creating snapshots
+
+    /// Turn on snapshot mode, so data inside Container is not deleted, but replaced with new version.
     void enableSnapshotMode()
     {
         container.enableSnapshotMode();
     }
 
+    /// Turn off snapshot mode.
     void disableSnapshotMode()
     {
         container.disableSnapshotMode();
@@ -135,17 +159,20 @@ public:
         return container.begin();
     }
 
+    /// Clear outdated data from internal container.
     void clearGarbageAfterSnapshot()
     {
         container.clearOutdatedNodes();
     }
 
+    /// Get all active sessions
     const SessionAndTimeout & getActiveSessions() const
     {
         return session_and_timeout;
     }
 
-    std::unordered_set<int64_t> getDeadSessions()
+    /// Get all dead sessions
+    std::vector<int64_t> getDeadSessions()
     {
         return session_expiry_queue.getExpiredSessions();
     }
diff --git a/src/Coordination/LoggerWrapper.h b/src/Coordination/LoggerWrapper.h
index 25a1969d2e9..002fa870241 100644
--- a/src/Coordination/LoggerWrapper.h
+++ b/src/Coordination/LoggerWrapper.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
-#include <common/logger_useful.h>
+#include <libnuraft/nuraft.hxx>
+#include <base/logger_useful.h>
 #include <Core/SettingsEnums.h>
 
 namespace DB
diff --git a/src/Coordination/ReadBufferFromNuraftBuffer.h b/src/Coordination/ReadBufferFromNuraftBuffer.h
index 3817e217881..cc01d3c8f39 100644
--- a/src/Coordination/ReadBufferFromNuraftBuffer.h
+++ b/src/Coordination/ReadBufferFromNuraftBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <IO/ReadBufferFromMemory.h>
 
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 
 namespace DB
 {
diff --git a/src/Coordination/SessionExpiryQueue.cpp b/src/Coordination/SessionExpiryQueue.cpp
index 51837087af5..d56851e3bdd 100644
--- a/src/Coordination/SessionExpiryQueue.cpp
+++ b/src/Coordination/SessionExpiryQueue.cpp
@@ -1,82 +1,96 @@
 #include <Coordination/SessionExpiryQueue.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
+
 namespace DB
 {
 
 bool SessionExpiryQueue::remove(int64_t session_id)
 {
-    auto session_it = session_to_timeout.find(session_id);
-    if (session_it != session_to_timeout.end())
+    auto session_it = session_to_expiration_time.find(session_id);
+    if (session_it != session_to_expiration_time.end())
     {
         auto set_it = expiry_to_sessions.find(session_it->second);
         if (set_it != expiry_to_sessions.end())
             set_it->second.erase(session_id);
 
+        /// No more sessions in this bucket
+        if (set_it->second.empty())
+            expiry_to_sessions.erase(set_it);
+
+        session_to_expiration_time.erase(session_it);
+
         return true;
     }
 
     return false;
 }
 
-bool SessionExpiryQueue::update(int64_t session_id, int64_t timeout_ms)
+void SessionExpiryQueue::addNewSessionOrUpdate(int64_t session_id, int64_t timeout_ms)
 {
-    auto session_it = session_to_timeout.find(session_id);
     int64_t now = getNowMilliseconds();
+    /// round up to next interval
     int64_t new_expiry_time = roundToNextInterval(now + timeout_ms);
 
-    if (session_it != session_to_timeout.end())
+    auto session_it = session_to_expiration_time.find(session_id);
+    /// We already registered this session
+    if (session_it != session_to_expiration_time.end())
     {
-        if (new_expiry_time == session_it->second)
-            return false;
+        int64_t prev_expiry_time = session_it->second;
+        session_it->second = new_expiry_time;
+        /// Nothing changed, session stay in the some bucket
+        if (new_expiry_time == prev_expiry_time)
+            return;
 
+        /// This bucket doesn't exist, let's create it
         auto set_it = expiry_to_sessions.find(new_expiry_time);
         if (set_it == expiry_to_sessions.end())
             std::tie(set_it, std::ignore) = expiry_to_sessions.emplace(new_expiry_time, std::unordered_set<int64_t>());
 
+        /// Add session to the next bucket
         set_it->second.insert(session_id);
-        int64_t prev_expiry_time = session_it->second;
 
-        if (prev_expiry_time != new_expiry_time)
-        {
-            auto prev_set_it = expiry_to_sessions.find(prev_expiry_time);
-            if (prev_set_it != expiry_to_sessions.end())
-                prev_set_it->second.erase(session_id);
-        }
-        session_it->second = new_expiry_time;
-        return true;
+        auto prev_set_it = expiry_to_sessions.find(prev_expiry_time);
+        /// Remove session from previous bucket
+        if (prev_set_it != expiry_to_sessions.end())
+            prev_set_it->second.erase(session_id);
+
+        /// No more sessions in this bucket
+        if (prev_set_it->second.empty())
+            expiry_to_sessions.erase(prev_set_it);
     }
     else
     {
-        session_to_timeout[session_id] = new_expiry_time;
+        /// Just add sessions to the new bucket
+        session_to_expiration_time[session_id] = new_expiry_time;
+
         auto set_it = expiry_to_sessions.find(new_expiry_time);
         if (set_it == expiry_to_sessions.end())
             std::tie(set_it, std::ignore) = expiry_to_sessions.emplace(new_expiry_time, std::unordered_set<int64_t>());
+
         set_it->second.insert(session_id);
-        return false;
     }
 }
 
-std::unordered_set<int64_t> SessionExpiryQueue::getExpiredSessions()
+std::vector<int64_t> SessionExpiryQueue::getExpiredSessions() const
 {
     int64_t now = getNowMilliseconds();
-    if (now < next_expiration_time)
-        return {};
+    std::vector<int64_t> result;
 
-    auto set_it = expiry_to_sessions.find(next_expiration_time);
-    int64_t new_expiration_time = next_expiration_time + expiration_interval;
-    next_expiration_time = new_expiration_time;
-    if (set_it != expiry_to_sessions.end())
+    /// Check all buckets
+    for (const auto & [expire_time, expired_sessions] : expiry_to_sessions)
     {
-        auto result = set_it->second;
-        expiry_to_sessions.erase(set_it);
-        return result;
+        if (expire_time <= now)
+            result.insert(result.end(), expired_sessions.begin(), expired_sessions.end());
+        else
+            break;
     }
-    return {};
+
+    return result;
 }
 
 void SessionExpiryQueue::clear()
 {
-    session_to_timeout.clear();
+    session_to_expiration_time.clear();
     expiry_to_sessions.clear();
 }
 
diff --git a/src/Coordination/SessionExpiryQueue.h b/src/Coordination/SessionExpiryQueue.h
index dff629a2432..8581800834d 100644
--- a/src/Coordination/SessionExpiryQueue.h
+++ b/src/Coordination/SessionExpiryQueue.h
@@ -1,19 +1,32 @@
 #pragma once
+#include <map>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 #include <chrono>
 
 namespace DB
 {
 
+/// Simple class for checking expired sessions. Main idea -- to round sessions
+/// timeouts and place all sessions into buckets rounded by their expired time.
+/// So we will have not too many different buckets and can check expired
+/// sessions quite fast.
+/// So buckets looks like this:
+/// [1630580418000] -> {1, 5, 6}
+/// [1630580418500] -> {2, 3}
+/// ...
+/// When new session appear it's added to the existing bucket or create new bucket.
 class SessionExpiryQueue
 {
 private:
-    std::unordered_map<int64_t, int64_t> session_to_timeout;
-    std::unordered_map<int64_t, std::unordered_set<int64_t>> expiry_to_sessions;
+    /// Session -> timeout ms
+    std::unordered_map<int64_t, int64_t> session_to_expiration_time;
+
+    /// Expire time -> session expire near this time
+    std::map<int64_t, std::unordered_set<int64_t>> expiry_to_sessions;
 
     int64_t expiration_interval;
-    int64_t next_expiration_time;
 
     static int64_t getNowMilliseconds()
     {
@@ -21,23 +34,30 @@ private:
         return duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
     }
 
+    /// Round time to the next expiration interval. The result used as a key for
+    /// expiry_to_sessions map.
     int64_t roundToNextInterval(int64_t time) const
     {
         return (time / expiration_interval + 1) * expiration_interval;
     }
 
 public:
+    /// expiration_interval -- how often we will check new sessions and how small
+    /// buckets we will have. In ZooKeeper normal session timeout is around 30 seconds
+    /// and expiration_interval is about 500ms.
     explicit SessionExpiryQueue(int64_t expiration_interval_)
         : expiration_interval(expiration_interval_)
-        , next_expiration_time(roundToNextInterval(getNowMilliseconds()))
     {
     }
 
+    /// Session was actually removed
     bool remove(int64_t session_id);
 
-    bool update(int64_t session_id, int64_t timeout_ms);
+    /// Update session expiry time (must be called on hearbeats)
+    void addNewSessionOrUpdate(int64_t session_id, int64_t timeout_ms);
 
-    std::unordered_set<int64_t> getExpiredSessions();
+    /// Get all expired sessions
+    std::vector<int64_t> getExpiredSessions() const;
 
     void clear();
 };
diff --git a/src/Coordination/SnapshotableHashTable.h b/src/Coordination/SnapshotableHashTable.h
index 9987081ba87..454d1110196 100644
--- a/src/Coordination/SnapshotableHashTable.h
+++ b/src/Coordination/SnapshotableHashTable.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <unordered_map>
 #include <list>
 #include <atomic>
diff --git a/src/Coordination/SummingStateMachine.h b/src/Coordination/SummingStateMachine.h
index 03572840739..bbb12834608 100644
--- a/src/Coordination/SummingStateMachine.h
+++ b/src/Coordination/SummingStateMachine.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 #include <Core/Types.h>
 #include <atomic>
 #include <map>
diff --git a/src/Coordination/ThreadSafeQueue.h b/src/Coordination/ThreadSafeQueue.h
deleted file mode 100644
index d36e25244bb..00000000000
--- a/src/Coordination/ThreadSafeQueue.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-#include <queue>
-#include <mutex>
-
-namespace DB
-{
-
-/// Queue with mutex and condvar. As simple as possible.
-template <typename T>
-class ThreadSafeQueue
-{
-private:
-    mutable std::mutex queue_mutex;
-    std::condition_variable cv;
-    std::queue<T> queue;
-public:
-
-    void push(const T & response)
-    {
-        std::lock_guard lock(queue_mutex);
-        queue.push(response);
-        cv.notify_one();
-    }
-
-    bool tryPop(T & response, int64_t timeout_ms = 0)
-    {
-        std::unique_lock lock(queue_mutex);
-        if (!cv.wait_for(lock,
-                std::chrono::milliseconds(timeout_ms), [this] { return !queue.empty(); }))
-            return false;
-
-        response = queue.front();
-        queue.pop();
-        return true;
-    }
-
-    size_t size() const
-    {
-        std::lock_guard lock(queue_mutex);
-        return queue.size();
-    }
-};
-
-}
diff --git a/src/Coordination/WriteBufferFromNuraftBuffer.cpp b/src/Coordination/WriteBufferFromNuraftBuffer.cpp
index 1a16b7cef24..debf8fff70f 100644
--- a/src/Coordination/WriteBufferFromNuraftBuffer.cpp
+++ b/src/Coordination/WriteBufferFromNuraftBuffer.cpp
@@ -1,5 +1,5 @@
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/WriteBufferFromNuraftBuffer.h b/src/Coordination/WriteBufferFromNuraftBuffer.h
index d037a0e6a27..47a01fbc2a4 100644
--- a/src/Coordination/WriteBufferFromNuraftBuffer.h
+++ b/src/Coordination/WriteBufferFromNuraftBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <IO/WriteBuffer.h>
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <libnuraft/nuraft.hxx>
 
 namespace DB
 {
diff --git a/src/Coordination/ZooKeeperDataReader.cpp b/src/Coordination/ZooKeeperDataReader.cpp
index cf644110786..4f71274291b 100644
--- a/src/Coordination/ZooKeeperDataReader.cpp
+++ b/src/Coordination/ZooKeeperDataReader.cpp
@@ -339,6 +339,9 @@ Coordination::ZooKeeperRequestPtr deserializeCheckVersionTxn(ReadBuffer & in)
     Coordination::read(result->path, in);
     Coordination::read(result->version, in);
     result->restored_from_zookeeper_log = true;
+    /// It stores version + 1 (which should be, not for request)
+    result->version -= 1;
+
     return result;
 }
 
@@ -572,12 +575,24 @@ void deserializeLogsAndApplyToStorage(KeeperStorage & storage, const std::string
 
     LOG_INFO(log, "Totally have {} logs", existing_logs.size());
 
-    for (auto [zxid, log_path] : existing_logs)
+    std::vector<std::string> stored_files;
+    for (auto it = existing_logs.rbegin(); it != existing_logs.rend(); ++it)
     {
-        if (zxid > storage.zxid)
-            deserializeLogAndApplyToStorage(storage, log_path, log);
-        else
-            LOG_INFO(log, "Skipping log {}, it's ZXID {} is smaller than storages ZXID {}", log_path, zxid, storage.zxid);
+        if (it->first >= storage.zxid)
+        {
+            stored_files.emplace_back(it->second);
+        }
+        else if (it->first < storage.zxid)
+        {
+            /// add the last logfile that is less than the zxid
+            stored_files.emplace_back(it->second);
+            break;
+        }
+    }
+
+    for (auto it = stored_files.rbegin(); it != stored_files.rend(); ++it)
+    {
+        deserializeLogAndApplyToStorage(storage, *it, log);
     }
 }
 
diff --git a/src/Coordination/ZooKeeperDataReader.h b/src/Coordination/ZooKeeperDataReader.h
index 5f26457c113..1ff2ea740c9 100644
--- a/src/Coordination/ZooKeeperDataReader.h
+++ b/src/Coordination/ZooKeeperDataReader.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <Coordination/KeeperStorage.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Coordination/tests/gtest_for_build.cpp b/src/Coordination/tests/gtest_coordination.cpp
similarity index 59%
rename from src/Coordination/tests/gtest_for_build.cpp
rename to src/Coordination/tests/gtest_coordination.cpp
index 9a744d2bbed..b04af1422dc 100644
--- a/src/Coordination/tests/gtest_for_build.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -1,9 +1,7 @@
 #include <gtest/gtest.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#    include "config_core.h"
-#endif
+#include <Common/config.h>
+#include "config_core.h"
 
 #if USE_NURAFT
 #include <Poco/ConsoleChannel.h>
@@ -21,8 +19,8 @@
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
-#include <libnuraft/nuraft.hxx> // Y_IGNORE
+#include <base/logger_useful.h>
+#include <libnuraft/nuraft.hxx>
 #include <thread>
 #include <Coordination/KeeperLogStore.h>
 #include <Coordination/Changelog.h>
@@ -53,14 +51,23 @@ struct ChangelogDirTest
     }
 };
 
-TEST(CoordinationTest, BuildTest)
+struct CompressionParam
+{
+    bool enable_compression;
+    std::string extension;
+};
+
+class CoordinationTest : public ::testing::TestWithParam<CompressionParam>
+{};
+
+TEST_P(CoordinationTest, BuildTest)
 {
     DB::InMemoryLogStore store;
     DB::SummingStateMachine machine;
     EXPECT_EQ(1, 1);
 }
 
-TEST(CoordinationTest, BufferSerde)
+TEST_P(CoordinationTest, BufferSerde)
 {
     Coordination::ZooKeeperRequestPtr request = Coordination::ZooKeeperRequestFactory::instance().get(Coordination::OpNum::Get);
     request->xid = 3;
@@ -173,7 +180,7 @@ nuraft::ptr<nuraft::buffer> getBuffer(int64_t number)
 }
 
 
-TEST(CoordinationTest, TestSummingRaft1)
+TEST_P(CoordinationTest, TestSummingRaft1)
 {
     ChangelogDirTest test("./logs");
     SummingRaftServer s1(1, "localhost", 44444, "./logs");
@@ -204,10 +211,11 @@ DB::LogEntryPtr getLogEntry(const std::string & s, size_t term)
     return nuraft::cs_new<nuraft::log_entry>(term, bufwriter.getBuffer());
 }
 
-TEST(CoordinationTest, ChangelogTestSimple)
+TEST_P(CoordinationTest, ChangelogTestSimple)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
     auto entry = getLogEntry("hello world", 77);
     changelog.append(entry);
@@ -220,17 +228,19 @@ TEST(CoordinationTest, ChangelogTestSimple)
     EXPECT_EQ(changelog.log_entries(1, 2)->size(), 1);
 }
 
-TEST(CoordinationTest, ChangelogTestFile)
+
+TEST_P(CoordinationTest, ChangelogTestFile)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
     auto entry = getLogEntry("hello world", 77);
     changelog.append(entry);
     changelog.end_of_append_batch(0, 0);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
     for (const auto & p : fs::directory_iterator("./logs"))
-        EXPECT_EQ(p.path(), "./logs/changelog_1_5.bin");
+        EXPECT_EQ(p.path(), "./logs/changelog_1_5.bin" + params.extension);
 
     changelog.append(entry);
     changelog.append(entry);
@@ -239,14 +249,15 @@ TEST(CoordinationTest, ChangelogTestFile)
     changelog.append(entry);
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 }
 
-TEST(CoordinationTest, ChangelogReadWrite)
+TEST_P(CoordinationTest, ChangelogReadWrite)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 1000, true);
+    DB::KeeperLogStore changelog("./logs", 1000, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -256,7 +267,8 @@ TEST(CoordinationTest, ChangelogReadWrite)
     changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 10);
-    DB::KeeperLogStore changelog_reader("./logs", 1000, true);
+
+    DB::KeeperLogStore changelog_reader("./logs", 1000, true, params.enable_compression);
     changelog_reader.init(1, 0);
     EXPECT_EQ(changelog_reader.size(), 10);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), changelog.last_entry()->get_term());
@@ -272,10 +284,11 @@ TEST(CoordinationTest, ChangelogReadWrite)
     EXPECT_EQ(10, entries_from_range->size());
 }
 
-TEST(CoordinationTest, ChangelogWriteAt)
+TEST_P(CoordinationTest, ChangelogWriteAt)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 1000, true);
+    DB::KeeperLogStore changelog("./logs", 1000, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -295,7 +308,7 @@ TEST(CoordinationTest, ChangelogWriteAt)
     EXPECT_EQ(changelog.entry_at(7)->get_term(), 77);
     EXPECT_EQ(changelog.next_slot(), 8);
 
-    DB::KeeperLogStore changelog_reader("./logs", 1000, true);
+    DB::KeeperLogStore changelog_reader("./logs", 1000, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
     EXPECT_EQ(changelog_reader.size(), changelog.size());
@@ -305,10 +318,11 @@ TEST(CoordinationTest, ChangelogWriteAt)
 }
 
 
-TEST(CoordinationTest, ChangelogTestAppendAfterRead)
+TEST_P(CoordinationTest, ChangelogTestAppendAfterRead)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 7; ++i)
     {
@@ -318,10 +332,10 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     changelog.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog.size(), 7);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
     EXPECT_EQ(changelog_reader.size(), 7);
@@ -332,8 +346,8 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     }
     changelog_reader.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog_reader.size(), 10);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
     size_t logs_count = 0;
     for (const auto & _ [[maybe_unused]]: fs::directory_iterator("./logs"))
@@ -345,9 +359,9 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     changelog_reader.append(entry);
     changelog_reader.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog_reader.size(), 11);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
     logs_count = 0;
     for (const auto & _ [[maybe_unused]]: fs::directory_iterator("./logs"))
@@ -356,10 +370,11 @@ TEST(CoordinationTest, ChangelogTestAppendAfterRead)
     EXPECT_EQ(logs_count, 3);
 }
 
-TEST(CoordinationTest, ChangelogTestCompaction)
+TEST_P(CoordinationTest, ChangelogTestCompaction)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 3; ++i)
@@ -377,7 +392,7 @@ TEST(CoordinationTest, ChangelogTestCompaction)
     EXPECT_EQ(changelog.start_index(), 3);
     EXPECT_EQ(changelog.next_slot(), 4);
     EXPECT_EQ(changelog.last_entry()->get_term(), 20);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
 
     auto e1 = getLogEntry("hello world", 30);
     changelog.append(e1);
@@ -389,31 +404,33 @@ TEST(CoordinationTest, ChangelogTestCompaction)
     changelog.append(e4);
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
     changelog.compact(6);
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 1);
     EXPECT_EQ(changelog.start_index(), 7);
     EXPECT_EQ(changelog.next_slot(), 8);
     EXPECT_EQ(changelog.last_entry()->get_term(), 60);
     /// And we able to read it
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(7, 0);
+
     EXPECT_EQ(changelog_reader.size(), 1);
     EXPECT_EQ(changelog_reader.start_index(), 7);
     EXPECT_EQ(changelog_reader.next_slot(), 8);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 60);
 }
 
-TEST(CoordinationTest, ChangelogTestBatchOperations)
+TEST_P(CoordinationTest, ChangelogTestBatchOperations)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 100, true);
+    DB::KeeperLogStore changelog("./logs", 100, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -426,7 +443,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperations)
 
     auto entries = changelog.pack(1, 5);
 
-    DB::KeeperLogStore apply_changelog("./logs", 100, true);
+    DB::KeeperLogStore apply_changelog("./logs", 100, true, params.enable_compression);
     apply_changelog.init(1, 0);
 
     for (size_t i = 0; i < 10; ++i)
@@ -454,10 +471,11 @@ TEST(CoordinationTest, ChangelogTestBatchOperations)
     EXPECT_EQ(apply_changelog.entry_at(12)->get_term(), 40);
 }
 
-TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
+TEST_P(CoordinationTest, ChangelogTestBatchOperationsEmpty)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 100, true);
+    DB::KeeperLogStore changelog("./logs", 100, true, params.enable_compression);
     changelog.init(1, 0);
     for (size_t i = 0; i < 10; ++i)
     {
@@ -471,7 +489,7 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
     auto entries = changelog.pack(5, 5);
 
     ChangelogDirTest test1("./logs1");
-    DB::KeeperLogStore changelog_new("./logs1", 100, true);
+    DB::KeeperLogStore changelog_new("./logs1", 100, true, params.enable_compression);
     changelog_new.init(1, 0);
     EXPECT_EQ(changelog_new.size(), 0);
 
@@ -493,15 +511,16 @@ TEST(CoordinationTest, ChangelogTestBatchOperationsEmpty)
     EXPECT_EQ(changelog_new.start_index(), 5);
     EXPECT_EQ(changelog_new.next_slot(), 11);
 
-    DB::KeeperLogStore changelog_reader("./logs1", 100, true);
+    DB::KeeperLogStore changelog_reader("./logs1", 100, true, params.enable_compression);
     changelog_reader.init(5, 0);
 }
 
 
-TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
+TEST_P(CoordinationTest, ChangelogTestWriteAtPreviousFile)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 33; ++i)
@@ -511,13 +530,13 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 33);
 
@@ -529,16 +548,16 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
     EXPECT_EQ(changelog.next_slot(), 8);
     EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_read("./logs", 5, true);
+    DB::KeeperLogStore changelog_read("./logs", 5, true, params.enable_compression);
     changelog_read.init(1, 0);
     EXPECT_EQ(changelog_read.size(), 7);
     EXPECT_EQ(changelog_read.start_index(), 1);
@@ -546,10 +565,11 @@ TEST(CoordinationTest, ChangelogTestWriteAtPreviousFile)
     EXPECT_EQ(changelog_read.last_entry()->get_term(), 5555);
 }
 
-TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
+TEST_P(CoordinationTest, ChangelogTestWriteAtFileBorder)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 33; ++i)
@@ -559,13 +579,13 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 33);
 
@@ -577,16 +597,16 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
     EXPECT_EQ(changelog.next_slot(), 12);
     EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_read("./logs", 5, true);
+    DB::KeeperLogStore changelog_read("./logs", 5, true, params.enable_compression);
     changelog_read.init(1, 0);
     EXPECT_EQ(changelog_read.size(), 11);
     EXPECT_EQ(changelog_read.start_index(), 1);
@@ -594,10 +614,11 @@ TEST(CoordinationTest, ChangelogTestWriteAtFileBorder)
     EXPECT_EQ(changelog_read.last_entry()->get_term(), 5555);
 }
 
-TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
+TEST_P(CoordinationTest, ChangelogTestWriteAtAllFiles)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 33; ++i)
@@ -607,13 +628,13 @@ TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     EXPECT_EQ(changelog.size(), 33);
 
@@ -625,20 +646,21 @@ TEST(CoordinationTest, ChangelogTestWriteAtAllFiles)
     EXPECT_EQ(changelog.next_slot(), 2);
     EXPECT_EQ(changelog.last_entry()->get_term(), 5555);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 }
 
-TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
+TEST_P(CoordinationTest, ChangelogTestStartNewLogAfterRead)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -648,17 +670,17 @@ TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
     }
     changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 35);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_36_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_36_40.bin" + params.extension));
 
 
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
     auto entry = getLogEntry("36_hello_world", 360);
@@ -666,22 +688,23 @@ TEST(CoordinationTest, ChangelogTestStartNewLogAfterRead)
     changelog_reader.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog_reader.size(), 36);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_36_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_36_40.bin" + params.extension));
 }
 
 
-TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
+TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
 
-    DB::KeeperLogStore changelog("./logs", 5, true);
+    DB::KeeperLogStore changelog("./logs", 5, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -691,32 +714,32 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
     }
     changelog.end_of_append_batch(0, 0);
     EXPECT_EQ(changelog.size(), 35);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::WriteBufferFromFile plain_buf("./logs/changelog_11_15.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    DB::WriteBufferFromFile plain_buf("./logs/changelog_11_15.bin" + params.extension, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
     plain_buf.truncate(0);
 
-    DB::KeeperLogStore changelog_reader("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader("./logs", 5, true, params.enable_compression);
     changelog_reader.init(1, 0);
     changelog_reader.end_of_append_batch(0, 0);
 
     EXPECT_EQ(changelog_reader.size(), 10);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 90);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
     auto entry = getLogEntry("h", 7777);
     changelog_reader.append(entry);
@@ -724,26 +747,27 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
     EXPECT_EQ(changelog_reader.size(), 11);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_16_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_25.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_26_30.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_31_35.bin" + params.extension));
 
-    DB::KeeperLogStore changelog_reader2("./logs", 5, true);
+    DB::KeeperLogStore changelog_reader2("./logs", 5, true, params.enable_compression);
     changelog_reader2.init(1, 0);
     EXPECT_EQ(changelog_reader2.size(), 11);
     EXPECT_EQ(changelog_reader2.last_entry()->get_term(), 7777);
 }
 
-TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
+TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
 
-    DB::KeeperLogStore changelog("./logs", 20, true);
+    DB::KeeperLogStore changelog("./logs", 20, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -753,37 +777,37 @@ TEST(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
 
-    DB::WriteBufferFromFile plain_buf("./logs/changelog_1_20.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    DB::WriteBufferFromFile plain_buf("./logs/changelog_1_20.bin" + params.extension, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
     plain_buf.truncate(140);
 
-    DB::KeeperLogStore changelog_reader("./logs", 20, true);
+    DB::KeeperLogStore changelog_reader("./logs", 20, true, params.enable_compression);
     changelog_reader.init(1, 0);
 
-    EXPECT_EQ(changelog_reader.size(), 2);
-    EXPECT_EQ(changelog_reader.last_entry()->get_term(), 450);
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_EQ(changelog_reader.size(), 0);
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
     auto entry = getLogEntry("hello_world", 7777);
     changelog_reader.append(entry);
     changelog_reader.end_of_append_batch(0, 0);
-    EXPECT_EQ(changelog_reader.size(), 3);
+    EXPECT_EQ(changelog_reader.size(), 1);
     EXPECT_EQ(changelog_reader.last_entry()->get_term(), 7777);
 
 
-    DB::KeeperLogStore changelog_reader2("./logs", 20, true);
+    DB::KeeperLogStore changelog_reader2("./logs", 1, true, params.enable_compression);
     changelog_reader2.init(1, 0);
-    EXPECT_EQ(changelog_reader2.size(), 3);
+    EXPECT_EQ(changelog_reader2.size(), 1);
     EXPECT_EQ(changelog_reader2.last_entry()->get_term(), 7777);
 }
 
-TEST(CoordinationTest, ChangelogTestLostFiles)
+TEST_P(CoordinationTest, ChangelogTestLostFiles)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./logs");
 
-    DB::KeeperLogStore changelog("./logs", 20, true);
+    DB::KeeperLogStore changelog("./logs", 20, true, params.enable_compression);
     changelog.init(1, 0);
 
     for (size_t i = 0; i < 35; ++i)
@@ -793,19 +817,19 @@ TEST(CoordinationTest, ChangelogTestLostFiles)
     }
     changelog.end_of_append_batch(0, 0);
 
-    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
 
-    fs::remove("./logs/changelog_1_20.bin");
+    fs::remove("./logs/changelog_1_20.bin" + params.extension);
 
-    DB::KeeperLogStore changelog_reader("./logs", 20, true);
+    DB::KeeperLogStore changelog_reader("./logs", 20, true, params.enable_compression);
     /// It should print error message, but still able to start
     changelog_reader.init(5, 0);
-    EXPECT_FALSE(fs::exists("./logs/changelog_1_20.bin"));
-    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin"));
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_21_40.bin" + params.extension));
 }
 
-TEST(CoordinationTest, SnapshotableHashMapSimple)
+TEST_P(CoordinationTest, SnapshotableHashMapSimple)
 {
     DB::SnapshotableHashTable<int> hello;
     EXPECT_TRUE(hello.insert("hello", 5));
@@ -820,7 +844,7 @@ TEST(CoordinationTest, SnapshotableHashMapSimple)
     EXPECT_EQ(hello.size(), 0);
 }
 
-TEST(CoordinationTest, SnapshotableHashMapTrySnapshot)
+TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
 {
     DB::SnapshotableHashTable<int> map_snp;
     EXPECT_TRUE(map_snp.insert("/hello", 7));
@@ -906,10 +930,11 @@ void addNode(DB::KeeperStorage & storage, const std::string & path, const std::s
     storage.container.insertOrReplace(path, node);
 }
 
-TEST(CoordinationTest, TestStorageSnapshotSimple)
+TEST_P(CoordinationTest, TestStorageSnapshotSimple)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
 
     DB::KeeperStorage storage(500, "");
     addNode(storage, "/hello", "world", 1);
@@ -930,12 +955,12 @@ TEST(CoordinationTest, TestStorageSnapshotSimple)
 
     auto buf = manager.serializeSnapshotToBuffer(snapshot);
     manager.serializeSnapshotBufferToDisk(*buf, 2);
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_2.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_2.bin" + params.extension));
 
 
     auto debuf = manager.deserializeSnapshotBufferFromDisk(2);
 
-    auto [snapshot_meta, restored_storage] = manager.deserializeSnapshotFromBuffer(debuf);
+    auto [restored_storage, snapshot_meta, _] = manager.deserializeSnapshotFromBuffer(debuf);
 
     EXPECT_EQ(restored_storage->container.size(), 3);
     EXPECT_EQ(restored_storage->container.getValue("/").children.size(), 1);
@@ -953,10 +978,11 @@ TEST(CoordinationTest, TestStorageSnapshotSimple)
     EXPECT_EQ(restored_storage->session_and_timeout.size(), 2);
 }
 
-TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
+TEST_P(CoordinationTest, TestStorageSnapshotMoreWrites)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
 
     DB::KeeperStorage storage(500, "");
     storage.getSessionID(130);
@@ -979,11 +1005,11 @@ TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
 
     auto buf = manager.serializeSnapshotToBuffer(snapshot);
     manager.serializeSnapshotBufferToDisk(*buf, 50);
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin" + params.extension));
 
 
     auto debuf = manager.deserializeSnapshotBufferFromDisk(50);
-    auto [meta, restored_storage] = manager.deserializeSnapshotFromBuffer(debuf);
+    auto [restored_storage, meta, _] = manager.deserializeSnapshotFromBuffer(debuf);
 
     EXPECT_EQ(restored_storage->container.size(), 51);
     for (size_t i = 0; i < 50; ++i)
@@ -993,10 +1019,11 @@ TEST(CoordinationTest, TestStorageSnapshotMoreWrites)
 }
 
 
-TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
+TEST_P(CoordinationTest, TestStorageSnapshotManySnapshots)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
 
     DB::KeeperStorage storage(500, "");
     storage.getSessionID(130);
@@ -1011,17 +1038,17 @@ TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
         DB::KeeperStorageSnapshot snapshot(&storage, j * 50);
         auto buf = manager.serializeSnapshotToBuffer(snapshot);
         manager.serializeSnapshotBufferToDisk(*buf, j * 50);
-        EXPECT_TRUE(fs::exists(std::string{"./snapshots/snapshot_"} + std::to_string(j * 50) + ".bin"));
+        EXPECT_TRUE(fs::exists(std::string{"./snapshots/snapshot_"} + std::to_string(j * 50) + ".bin" + params.extension));
     }
 
-    EXPECT_FALSE(fs::exists("./snapshots/snapshot_50.bin"));
-    EXPECT_FALSE(fs::exists("./snapshots/snapshot_100.bin"));
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_150.bin"));
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_200.bin"));
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_250.bin"));
+    EXPECT_FALSE(fs::exists("./snapshots/snapshot_50.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./snapshots/snapshot_100.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_150.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_200.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_250.bin" + params.extension));
 
 
-    auto [meta, restored_storage] = manager.restoreFromLatestSnapshot();
+    auto [restored_storage, meta, _] = manager.restoreFromLatestSnapshot();
 
     EXPECT_EQ(restored_storage->container.size(), 251);
 
@@ -1031,10 +1058,11 @@ TEST(CoordinationTest, TestStorageSnapshotManySnapshots)
     }
 }
 
-TEST(CoordinationTest, TestStorageSnapshotMode)
+TEST_P(CoordinationTest, TestStorageSnapshotMode)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
     DB::KeeperStorage storage(500, "");
     for (size_t i = 0; i < 50; ++i)
     {
@@ -1061,7 +1089,7 @@ TEST(CoordinationTest, TestStorageSnapshotMode)
         auto buf = manager.serializeSnapshotToBuffer(snapshot);
         manager.serializeSnapshotBufferToDisk(*buf, 50);
     }
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin" + params.extension));
     EXPECT_EQ(storage.container.size(), 26);
     storage.clearGarbageAfterSnapshot();
     EXPECT_EQ(storage.container.snapshotSize(), 26);
@@ -1073,7 +1101,7 @@ TEST(CoordinationTest, TestStorageSnapshotMode)
             EXPECT_FALSE(storage.container.contains("/hello_" + std::to_string(i)));
     }
 
-    auto [meta, restored_storage] = manager.restoreFromLatestSnapshot();
+    auto [restored_storage, meta, _] = manager.restoreFromLatestSnapshot();
 
     for (size_t i = 0; i < 50; ++i)
     {
@@ -1082,10 +1110,11 @@ TEST(CoordinationTest, TestStorageSnapshotMode)
 
 }
 
-TEST(CoordinationTest, TestStorageSnapshotBroken)
+TEST_P(CoordinationTest, TestStorageSnapshotBroken)
 {
+    auto params = GetParam();
     ChangelogDirTest test("./snapshots");
-    DB::KeeperSnapshotManager manager("./snapshots", 3);
+    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
     DB::KeeperStorage storage(500, "");
     for (size_t i = 0; i < 50; ++i)
     {
@@ -1096,10 +1125,10 @@ TEST(CoordinationTest, TestStorageSnapshotBroken)
         auto buf = manager.serializeSnapshotToBuffer(snapshot);
         manager.serializeSnapshotBufferToDisk(*buf, 50);
     }
-    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin"));
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_50.bin" + params.extension));
 
     /// Let's corrupt file
-    DB::WriteBufferFromFile plain_buf("./snapshots/snapshot_50.bin", DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
+    DB::WriteBufferFromFile plain_buf("./snapshots/snapshot_50.bin" + params.extension, DBMS_DEFAULT_BUFFER_SIZE, O_APPEND | O_CREAT | O_WRONLY);
     plain_buf.truncate(34);
     plain_buf.sync();
 
@@ -1120,7 +1149,7 @@ nuraft::ptr<nuraft::log_entry> getLogEntryFromZKRequest(size_t term, int64_t ses
     return nuraft::cs_new<nuraft::log_entry>(term, buffer);
 }
 
-void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs)
+void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint64_t total_logs, bool enable_compression)
 {
     using namespace Coordination;
     using namespace DB;
@@ -1128,11 +1157,11 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     ChangelogDirTest snapshots("./snapshots");
     ChangelogDirTest logs("./logs");
 
-    ResponsesQueue queue;
+    ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
     auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
     state_machine->init();
-    DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true);
+    DB::KeeperLogStore changelog("./logs", settings->rotate_log_storage_interval, true, enable_compression);
     changelog.init(state_machine->last_commit_index() + 1, settings->reserved_log_items);
     for (size_t i = 1; i < total_logs + 1; ++i)
     {
@@ -1155,7 +1184,9 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
 
             state_machine->create_snapshot(s, when_done);
             CreateSnapshotTask snapshot_task;
-            snapshots_queue.pop(snapshot_task);
+            bool pop_result = snapshots_queue.pop(snapshot_task);
+            EXPECT_TRUE(pop_result);
+
             snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
         }
         if (snapshot_created)
@@ -1172,7 +1203,7 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     restore_machine->init();
     EXPECT_EQ(restore_machine->last_commit_index(), total_logs - total_logs % settings->snapshot_distance);
 
-    DB::KeeperLogStore restore_changelog("./logs", settings->rotate_log_storage_interval, true);
+    DB::KeeperLogStore restore_changelog("./logs", settings->rotate_log_storage_interval, true, enable_compression);
     restore_changelog.init(restore_machine->last_commit_index() + 1, settings->reserved_log_items);
 
     EXPECT_EQ(restore_changelog.size(), std::min(settings->reserved_log_items + total_logs % settings->snapshot_distance, total_logs));
@@ -1198,77 +1229,78 @@ void testLogAndStateMachine(Coordination::CoordinationSettingsPtr settings, uint
     }
 }
 
-TEST(CoordinationTest, TestStateMachineAndLogStore)
+TEST_P(CoordinationTest, TestStateMachineAndLogStore)
 {
     using namespace Coordination;
     using namespace DB;
+    auto params = GetParam();
 
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 37);
+        testLogAndStateMachine(settings, 37, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 11);
+        testLogAndStateMachine(settings, 11, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 20;
         settings->rotate_log_storage_interval = 30;
-        testLogAndStateMachine(settings, 40);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 0;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 1;
         settings->reserved_log_items = 1;
         settings->rotate_log_storage_interval = 32;
-        testLogAndStateMachine(settings, 32);
+        testLogAndStateMachine(settings, 32, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 7;
         settings->rotate_log_storage_interval = 1;
-        testLogAndStateMachine(settings, 33);
+        testLogAndStateMachine(settings, 33, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 33);
+        testLogAndStateMachine(settings, 33, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 45);
+        testLogAndStateMachine(settings, 45, params.enable_compression);
     }
 }
 
-TEST(CoordinationTest, TestEphemeralNodeRemove)
+TEST_P(CoordinationTest, TestEphemeralNodeRemove)
 {
     using namespace Coordination;
     using namespace DB;
@@ -1276,7 +1308,7 @@ TEST(CoordinationTest, TestEphemeralNodeRemove)
     ChangelogDirTest snapshots("./snapshots");
     CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
 
-    ResponsesQueue queue;
+    ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
     auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, "./snapshots", settings);
     state_machine->init();
@@ -1299,6 +1331,198 @@ TEST(CoordinationTest, TestEphemeralNodeRemove)
 }
 
 
+TEST_P(CoordinationTest, TestRotateIntervalChanges)
+{
+    using namespace Coordination;
+    auto params = GetParam();
+    ChangelogDirTest snapshots("./logs");
+    {
+        DB::KeeperLogStore changelog("./logs", 100, true, params.enable_compression);
+
+        changelog.init(0, 3);
+        for (size_t i = 1; i < 55; ++i)
+        {
+            std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+            request->path = "/hello_" + std::to_string(i);
+            auto entry = getLogEntryFromZKRequest(0, 1, request);
+            changelog.append(entry);
+            changelog.end_of_append_batch(0, 0);
+        }
+    }
+
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_100.bin" + params.extension));
+
+    DB::KeeperLogStore changelog_1("./logs", 10, true, params.enable_compression);
+    changelog_1.init(0, 50);
+    for (size_t i = 0; i < 55; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(100 + i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog_1.append(entry);
+        changelog_1.end_of_append_batch(0, 0);
+    }
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_1_100.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_101_110.bin" + params.extension));
+
+    DB::KeeperLogStore changelog_2("./logs", 7, true, params.enable_compression);
+    changelog_2.init(98, 55);
+
+    for (size_t i = 0; i < 17; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(200 + i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog_2.append(entry);
+        changelog_2.end_of_append_batch(0, 0);
+    }
+
+    changelog_2.compact(105);
+
+    EXPECT_FALSE(fs::exists("./logs/changelog_1_100.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_101_110.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_111_117.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_118_124.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_125_131.bin" + params.extension));
+
+    DB::KeeperLogStore changelog_3("./logs", 5, true, params.enable_compression);
+    changelog_3.init(116, 3);
+    for (size_t i = 0; i < 17; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(300 + i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog_3.append(entry);
+        changelog_3.end_of_append_batch(0, 0);
+    }
+
+    changelog_3.compact(125);
+    EXPECT_FALSE(fs::exists("./logs/changelog_101_110.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_111_117.bin" + params.extension));
+    EXPECT_FALSE(fs::exists("./logs/changelog_118_124.bin" + params.extension));
+
+    EXPECT_TRUE(fs::exists("./logs/changelog_125_131.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_132_136.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_137_141.bin" + params.extension));
+    EXPECT_TRUE(fs::exists("./logs/changelog_142_146.bin" + params.extension));
+}
+
+TEST_P(CoordinationTest, TestSessionExpiryQueue)
+{
+    using namespace Coordination;
+    SessionExpiryQueue queue(500);
+
+    queue.addNewSessionOrUpdate(1, 1000);
+
+    for (size_t i = 0; i < 2; ++i)
+    {
+        EXPECT_EQ(queue.getExpiredSessions(), std::vector<int64_t>({}));
+        std::this_thread::sleep_for(std::chrono::milliseconds(400));
+    }
+
+    std::this_thread::sleep_for(std::chrono::milliseconds(700));
+    EXPECT_EQ(queue.getExpiredSessions(), std::vector<int64_t>({1}));
+}
+
+
+TEST_P(CoordinationTest, TestCompressedLogsMultipleRewrite)
+{
+    using namespace Coordination;
+    auto test_params = GetParam();
+    ChangelogDirTest snapshots("./logs");
+    DB::KeeperLogStore changelog("./logs", 100, true, test_params.enable_compression);
+
+    changelog.init(0, 3);
+    for (size_t i = 1; i < 55; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog.append(entry);
+        changelog.end_of_append_batch(0, 0);
+    }
+
+
+    DB::KeeperLogStore changelog1("./logs", 100, true, test_params.enable_compression);
+    changelog1.init(0, 3);
+    for (size_t i = 55; i < 70; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog1.append(entry);
+        changelog1.end_of_append_batch(0, 0);
+    }
+
+    DB::KeeperLogStore changelog2("./logs", 100, true, test_params.enable_compression);
+    changelog2.init(0, 3);
+    for (size_t i = 70; i < 80; ++i)
+    {
+        std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
+        request->path = "/hello_" + std::to_string(i);
+        auto entry = getLogEntryFromZKRequest(0, 1, request);
+        changelog2.append(entry);
+        changelog2.end_of_append_batch(0, 0);
+    }
+
+}
+
+TEST_P(CoordinationTest, TestStorageSnapshotDifferentCompressions)
+{
+    auto params = GetParam();
+
+    ChangelogDirTest test("./snapshots");
+    DB::KeeperSnapshotManager manager("./snapshots", 3, params.enable_compression);
+
+    DB::KeeperStorage storage(500, "");
+    addNode(storage, "/hello", "world", 1);
+    addNode(storage, "/hello/somepath", "somedata", 3);
+    storage.session_id_counter = 5;
+    storage.zxid = 2;
+    storage.ephemerals[3] = {"/hello"};
+    storage.ephemerals[1] = {"/hello/somepath"};
+    storage.getSessionID(130);
+    storage.getSessionID(130);
+
+    DB::KeeperStorageSnapshot snapshot(&storage, 2);
+
+    auto buf = manager.serializeSnapshotToBuffer(snapshot);
+    manager.serializeSnapshotBufferToDisk(*buf, 2);
+    EXPECT_TRUE(fs::exists("./snapshots/snapshot_2.bin" + params.extension));
+
+    DB::KeeperSnapshotManager new_manager("./snapshots", 3, !params.enable_compression);
+
+    auto debuf = new_manager.deserializeSnapshotBufferFromDisk(2);
+
+    auto [restored_storage, snapshot_meta, _] = new_manager.deserializeSnapshotFromBuffer(debuf);
+
+    EXPECT_EQ(restored_storage->container.size(), 3);
+    EXPECT_EQ(restored_storage->container.getValue("/").children.size(), 1);
+    EXPECT_EQ(restored_storage->container.getValue("/hello").children.size(), 1);
+    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").children.size(), 0);
+
+    EXPECT_EQ(restored_storage->container.getValue("/").data, "");
+    EXPECT_EQ(restored_storage->container.getValue("/hello").data, "world");
+    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").data, "somedata");
+    EXPECT_EQ(restored_storage->session_id_counter, 7);
+    EXPECT_EQ(restored_storage->zxid, 2);
+    EXPECT_EQ(restored_storage->ephemerals.size(), 2);
+    EXPECT_EQ(restored_storage->ephemerals[3].size(), 1);
+    EXPECT_EQ(restored_storage->ephemerals[1].size(), 1);
+    EXPECT_EQ(restored_storage->session_and_timeout.size(), 2);
+}
+
+
+INSTANTIATE_TEST_SUITE_P(CoordinationTestSuite,
+    CoordinationTest,
+    ::testing::ValuesIn(std::initializer_list<CompressionParam>{
+            CompressionParam{true, ".zstd"},
+            CompressionParam{false, ""}
+    })
+);
+
 int main(int argc, char ** argv)
 {
     Poco::AutoPtr<Poco::ConsoleChannel> channel(new Poco::ConsoleChannel(std::cerr));
diff --git a/src/Coordination/ya.make b/src/Coordination/ya.make
deleted file mode 100644
index f3eae68806c..00000000000
--- a/src/Coordination/ya.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-)
-
-END()
diff --git a/src/Coordination/ya.make.in b/src/Coordination/ya.make.in
deleted file mode 100644
index ba5f8bcbea4..00000000000
--- a/src/Coordination/ya.make.in
+++ /dev/null
@@ -1,12 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-)
-
-END()
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index 29088cbf1b5..ab82a966a76 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -2,10 +2,10 @@
 
 #include <cmath>
 #include <limits>
-#include <common/DecomposedFloat.h>
+#include <base/DecomposedFloat.h>
 #include <Core/Defines.h>
 #include <Core/Types.h>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 #include <Common/NaNUtils.h>
 
 /** Preceptually-correct number comparisons.
@@ -33,7 +33,7 @@ bool lessOp(A a, B b)
         return false;
 
     /// int vs int
-    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    if constexpr (is_integer<A> && is_integer<B>)
     {
         /// same signedness
         if constexpr (is_signed_v<A> == is_signed_v<B>)
@@ -49,7 +49,7 @@ bool lessOp(A a, B b)
     }
 
     /// int vs float
-    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    if constexpr (is_integer<A> && std::is_floating_point_v<B>)
     {
         if constexpr (sizeof(A) <= 4)
             return static_cast<double>(a) < static_cast<double>(b);
@@ -57,7 +57,7 @@ bool lessOp(A a, B b)
         return DecomposedFloat<B>(b).greater(a);
     }
 
-    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    if constexpr (std::is_floating_point_v<A> && is_integer<B>)
     {
         if constexpr (sizeof(B) <= 4)
             return static_cast<double>(a) < static_cast<double>(b);
@@ -65,8 +65,8 @@ bool lessOp(A a, B b)
         return DecomposedFloat<A>(a).less(b);
     }
 
-    static_assert(is_integer_v<A> || std::is_floating_point_v<A>);
-    static_assert(is_integer_v<B> || std::is_floating_point_v<B>);
+    static_assert(is_integer<A> || std::is_floating_point_v<A>);
+    static_assert(is_integer<B> || std::is_floating_point_v<B>);
     __builtin_unreachable();
 }
 
@@ -109,7 +109,7 @@ bool equalsOp(A a, B b)
         return false;
 
     /// int vs int
-    if constexpr (is_integer_v<A> && is_integer_v<B>)
+    if constexpr (is_integer<A> && is_integer<B>)
     {
         /// same signedness
         if constexpr (is_signed_v<A> == is_signed_v<B>)
@@ -125,7 +125,7 @@ bool equalsOp(A a, B b)
     }
 
     /// int vs float
-    if constexpr (is_integer_v<A> && std::is_floating_point_v<B>)
+    if constexpr (is_integer<A> && std::is_floating_point_v<B>)
     {
         if constexpr (sizeof(A) <= 4)
             return static_cast<double>(a) == static_cast<double>(b);
@@ -133,7 +133,7 @@ bool equalsOp(A a, B b)
         return DecomposedFloat<B>(b).equals(a);
     }
 
-    if constexpr (std::is_floating_point_v<A> && is_integer_v<B>)
+    if constexpr (std::is_floating_point_v<A> && is_integer<B>)
     {
         if constexpr (sizeof(B) <= 4)
             return static_cast<double>(a) == static_cast<double>(b);
diff --git a/src/Core/BackgroundSchedulePool.cpp b/src/Core/BackgroundSchedulePool.cpp
index f241eb29dbd..9a42f752db2 100644
--- a/src/Core/BackgroundSchedulePool.cpp
+++ b/src/Core/BackgroundSchedulePool.cpp
@@ -3,9 +3,9 @@
 #include <Common/setThreadName.h>
 #include <Common/Stopwatch.h>
 #include <Common/CurrentThread.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <chrono>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 
 namespace DB
diff --git a/src/Core/BaseSettings.cpp b/src/Core/BaseSettings.cpp
index ff2ddf81cff..f23682f1888 100644
--- a/src/Core/BaseSettings.cpp
+++ b/src/Core/BaseSettings.cpp
@@ -1,7 +1,7 @@
 #include <Core/BaseSettings.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Core/BaseSettings.h b/src/Core/BaseSettings.h
index eb12249fe07..7dca93212a2 100644
--- a/src/Core/BaseSettings.h
+++ b/src/Core/BaseSettings.h
@@ -2,7 +2,7 @@
 
 #include <Core/SettingsFields.h>
 #include <Common/SettingsChanges.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/blank.hpp>
 #include <unordered_map>
 
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index efd8de43a3c..4aaa735e52d 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -22,6 +22,85 @@ namespace ErrorCodes
     extern const int POSITION_OUT_OF_BOUND;
     extern const int NOT_FOUND_COLUMN_IN_BLOCK;
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+    extern const int AMBIGUOUS_COLUMN_NAME;
+}
+
+template <typename ReturnType>
+static ReturnType onError(const std::string & message [[maybe_unused]], int code [[maybe_unused]])
+{
+    if constexpr (std::is_same_v<ReturnType, void>)
+        throw Exception(message, code);
+    else
+        return false;
+};
+
+
+template <typename ReturnType>
+static ReturnType checkColumnStructure(const ColumnWithTypeAndName & actual, const ColumnWithTypeAndName & expected,
+    const std::string & context_description, bool allow_remove_constants, int code)
+{
+    if (actual.name != expected.name)
+        return onError<ReturnType>("Block structure mismatch in " + context_description + " stream: different names of columns:\n"
+            + actual.dumpStructure() + "\n" + expected.dumpStructure(), code);
+
+    if (!actual.type->equals(*expected.type))
+        return onError<ReturnType>("Block structure mismatch in " + context_description + " stream: different types:\n"
+            + actual.dumpStructure() + "\n" + expected.dumpStructure(), code);
+
+    if (!actual.column || !expected.column)
+        return ReturnType(true);
+
+    const IColumn * actual_column = actual.column.get();
+
+    /// If we allow to remove constants, and expected column is not const, then unwrap actual constant column.
+    if (allow_remove_constants && !isColumnConst(*expected.column))
+    {
+        if (const auto * column_const = typeid_cast<const ColumnConst *>(actual_column))
+            actual_column = &column_const->getDataColumn();
+    }
+
+    if (actual_column->getName() != expected.column->getName())
+        return onError<ReturnType>("Block structure mismatch in " + context_description + " stream: different columns:\n"
+            + actual.dumpStructure() + "\n" + expected.dumpStructure(), code);
+
+    if (isColumnConst(*actual.column) && isColumnConst(*expected.column))
+    {
+        Field actual_value = assert_cast<const ColumnConst &>(*actual.column).getField();
+        Field expected_value = assert_cast<const ColumnConst &>(*expected.column).getField();
+
+        if (actual_value != expected_value)
+            return onError<ReturnType>("Block structure mismatch in " + context_description + " stream: different values of constants, actual: "
+                + applyVisitor(FieldVisitorToString(), actual_value) + ", expected: " + applyVisitor(FieldVisitorToString(), expected_value),
+                code);
+    }
+
+    return ReturnType(true);
+}
+
+
+template <typename ReturnType>
+static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, const std::string & context_description, bool allow_remove_constants)
+{
+    size_t columns = rhs.columns();
+    if (lhs.columns() != columns)
+        return onError<ReturnType>("Block structure mismatch in " + context_description + " stream: different number of columns:\n"
+            + lhs.dumpStructure() + "\n" + rhs.dumpStructure(), ErrorCodes::LOGICAL_ERROR);
+
+    for (size_t i = 0; i < columns; ++i)
+    {
+        const auto & actual = lhs.getByPosition(i);
+        const auto & expected = rhs.getByPosition(i);
+
+        if constexpr (std::is_same_v<ReturnType, bool>)
+        {
+            if (!checkColumnStructure<ReturnType>(actual, expected, context_description, allow_remove_constants, ErrorCodes::LOGICAL_ERROR))
+                return false;
+        }
+        else
+            checkColumnStructure<ReturnType>(actual, expected, context_description, allow_remove_constants, ErrorCodes::LOGICAL_ERROR);
+    }
+
+    return ReturnType(true);
 }
 
 
@@ -44,30 +123,54 @@ void Block::initializeIndexByName()
 }
 
 
+void Block::reserve(size_t count)
+{
+    index_by_name.reserve(count);
+    data.reserve(count);
+}
+
+
 void Block::insert(size_t position, ColumnWithTypeAndName elem)
 {
     if (position > data.size())
         throw Exception("Position out of bound in Block::insert(), max position = "
         + toString(data.size()), ErrorCodes::POSITION_OUT_OF_BOUND);
 
+    if (elem.name.empty())
+        throw Exception("Column name in Block cannot be empty", ErrorCodes::AMBIGUOUS_COLUMN_NAME);
+
     for (auto & name_pos : index_by_name)
         if (name_pos.second >= position)
             ++name_pos.second;
 
-    index_by_name.emplace(elem.name, position);
+    auto [it, inserted] = index_by_name.emplace(elem.name, position);
+    if (!inserted)
+        checkColumnStructure<void>(data[it->second], elem,
+            "(columns with identical name must have identical structure)", true, ErrorCodes::AMBIGUOUS_COLUMN_NAME);
+
     data.emplace(data.begin() + position, std::move(elem));
 }
 
 
 void Block::insert(ColumnWithTypeAndName elem)
 {
-    index_by_name.emplace(elem.name, data.size());
+    if (elem.name.empty())
+        throw Exception("Column name in Block cannot be empty", ErrorCodes::AMBIGUOUS_COLUMN_NAME);
+
+    auto [it, inserted] = index_by_name.emplace(elem.name, data.size());
+    if (!inserted)
+        checkColumnStructure<void>(data[it->second], elem,
+            "(columns with identical name must have identical structure)", true, ErrorCodes::AMBIGUOUS_COLUMN_NAME);
+
     data.emplace_back(std::move(elem));
 }
 
 
 void Block::insertUnique(ColumnWithTypeAndName elem)
 {
+    if (elem.name.empty())
+        throw Exception("Column name in Block cannot be empty", ErrorCodes::AMBIGUOUS_COLUMN_NAME);
+
     if (index_by_name.end() == index_by_name.find(elem.name))
         insert(std::move(elem));
 }
@@ -287,6 +390,7 @@ std::string Block::dumpIndex() const
 Block Block::cloneEmpty() const
 {
     Block res;
+    res.reserve(data.size());
 
     for (const auto & elem : data)
         res.insert(elem.cloneEmpty());
@@ -364,6 +468,8 @@ Block Block::cloneWithColumns(MutableColumns && columns) const
     Block res;
 
     size_t num_columns = data.size();
+    res.reserve(num_columns);
+
     for (size_t i = 0; i < num_columns; ++i)
         res.insert({ std::move(columns[i]), data[i].type, data[i].name });
 
@@ -381,6 +487,8 @@ Block Block::cloneWithColumns(const Columns & columns) const
         throw Exception("Cannot clone block with columns because block has " + toString(num_columns) + " columns, "
                         "but " + toString(columns.size()) + " columns given.", ErrorCodes::LOGICAL_ERROR);
 
+    res.reserve(num_columns);
+
     for (size_t i = 0; i < num_columns; ++i)
         res.insert({ columns[i], data[i].type, data[i].name });
 
@@ -393,6 +501,8 @@ Block Block::cloneWithoutColumns() const
     Block res;
 
     size_t num_columns = data.size();
+    res.reserve(num_columns);
+
     for (size_t i = 0; i < num_columns; ++i)
         res.insert({ nullptr, data[i].type, data[i].name });
 
@@ -473,67 +583,6 @@ DataTypes Block::getDataTypes() const
 }
 
 
-template <typename ReturnType>
-static ReturnType checkBlockStructure(const Block & lhs, const Block & rhs, const std::string & context_description, bool allow_remove_constants)
-{
-    auto on_error = [](const std::string & message [[maybe_unused]], int code [[maybe_unused]])
-    {
-        if constexpr (std::is_same_v<ReturnType, void>)
-            throw Exception(message, code);
-        else
-            return false;
-    };
-
-    size_t columns = rhs.columns();
-    if (lhs.columns() != columns)
-        return on_error("Block structure mismatch in " + context_description + " stream: different number of columns:\n"
-            + lhs.dumpStructure() + "\n" + rhs.dumpStructure(), ErrorCodes::LOGICAL_ERROR);
-
-    for (size_t i = 0; i < columns; ++i)
-    {
-        const auto & expected = rhs.getByPosition(i);
-        const auto & actual = lhs.getByPosition(i);
-
-        if (actual.name != expected.name)
-            return on_error("Block structure mismatch in " + context_description + " stream: different names of columns:\n"
-                + lhs.dumpStructure() + "\n" + rhs.dumpStructure(), ErrorCodes::LOGICAL_ERROR);
-
-        if (!actual.type->equals(*expected.type))
-            return on_error("Block structure mismatch in " + context_description + " stream: different types:\n"
-                + lhs.dumpStructure() + "\n" + rhs.dumpStructure(), ErrorCodes::LOGICAL_ERROR);
-
-        if (!actual.column || !expected.column)
-            continue;
-
-        const IColumn * actual_column = actual.column.get();
-
-        /// If we allow to remove constants, and expected column is not const, then unwrap actual constant column.
-        if (allow_remove_constants && !isColumnConst(*expected.column))
-        {
-            if (const auto * column_const = typeid_cast<const ColumnConst *>(actual_column))
-                actual_column = &column_const->getDataColumn();
-        }
-
-        if (actual_column->getName() != expected.column->getName())
-            return on_error("Block structure mismatch in " + context_description + " stream: different columns:\n"
-                + lhs.dumpStructure() + "\n" + rhs.dumpStructure(), ErrorCodes::LOGICAL_ERROR);
-
-        if (isColumnConst(*actual.column) && isColumnConst(*expected.column))
-        {
-            Field actual_value = assert_cast<const ColumnConst &>(*actual.column).getField();
-            Field expected_value = assert_cast<const ColumnConst &>(*expected.column).getField();
-
-            if (actual_value != expected_value)
-                return on_error("Block structure mismatch in " + context_description + " stream: different values of constants, actual: "
-                    + applyVisitor(FieldVisitorToString(), actual_value) + ", expected: " + applyVisitor(FieldVisitorToString(), expected_value),
-                    ErrorCodes::LOGICAL_ERROR);
-        }
-    }
-
-    return ReturnType(true);
-}
-
-
 bool blocksHaveEqualStructure(const Block & lhs, const Block & rhs)
 {
     return checkBlockStructure<bool>(lhs, rhs, {}, false);
@@ -646,4 +695,39 @@ void Block::updateHash(SipHash & hash) const
             col.column->updateHashWithValue(row_no, hash);
 }
 
+
+ColumnPtr getColumnFromBlock(const Block & block, const NameAndTypePair & column)
+{
+    auto current_column = block.getByName(column.getNameInStorage()).column;
+    current_column = current_column->decompress();
+
+    if (column.isSubcolumn())
+        return column.getTypeInStorage()->getSubcolumn(column.getSubcolumnName(), current_column);
+
+    return current_column;
+}
+
+
+Block materializeBlock(const Block & block)
+{
+    if (!block)
+        return block;
+
+    Block res = block;
+    size_t columns = res.columns();
+    for (size_t i = 0; i < columns; ++i)
+    {
+        auto & element = res.getByPosition(i);
+        element.column = element.column->convertToFullColumnIfConst();
+    }
+
+    return res;
+}
+
+void materializeBlockInplace(Block & block)
+{
+    for (size_t i = 0; i < block.columns(); ++i)
+        block.getByPosition(i).column = block.getByPosition(i).column->convertToFullColumnIfConst();
+}
+
 }
diff --git a/src/Core/Block.h b/src/Core/Block.h
index a2d91190795..e0a032094f6 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -152,6 +152,7 @@ public:
 private:
     void eraseImpl(size_t position);
     void initializeIndexByName();
+    void reserve(size_t count);
 
     /// This is needed to allow function execution over data.
     /// It is safe because functions does not change column names, so index is unaffected.
@@ -191,4 +192,12 @@ void assertCompatibleHeader(const Block & actual, const Block & desired, const s
 /// Calculate difference in structure of blocks and write description into output strings. NOTE It doesn't compare values of constant columns.
 void getBlocksDifference(const Block & lhs, const Block & rhs, std::string & out_lhs_diff, std::string & out_rhs_diff);
 
+/// Helps in-memory storages to extract columns from block.
+/// Properly handles cases, when column is a subcolumn and when it is compressed.
+ColumnPtr getColumnFromBlock(const Block & block, const NameAndTypePair & column);
+
+/// Converts columns-constants to full columns ("materializes" them).
+Block materializeBlock(const Block & block);
+void materializeBlockInplace(Block & block);
+
 }
diff --git a/src/Core/BlockInfo.cpp b/src/Core/BlockInfo.cpp
index 9f88513cd3c..e9aee871be1 100644
--- a/src/Core/BlockInfo.cpp
+++ b/src/Core/BlockInfo.cpp
@@ -1,4 +1,4 @@
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
diff --git a/src/Core/BlockInfo.h b/src/Core/BlockInfo.h
index 125c90b1b23..4e06edc65be 100644
--- a/src/Core/BlockInfo.h
+++ b/src/Core/BlockInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <unordered_map>
 #include <vector>
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
index a6176efc7f3..85e2008753d 100644
--- a/src/Core/CMakeLists.txt
+++ b/src/Core/CMakeLists.txt
@@ -1,3 +1,7 @@
 if (ENABLE_EXAMPLES)
     add_subdirectory(examples)
 endif ()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/Core/DecimalComparison.h b/src/Core/DecimalComparison.h
index 5b017cd4634..0398ec5cbac 100644
--- a/src/Core/DecimalComparison.h
+++ b/src/Core/DecimalComparison.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include <Core/Block.h>
 #include <Core/AccurateComparison.h>
 #include <Core/callOnTypeIndex.h>
@@ -47,21 +47,21 @@ template <> struct ConstructDecInt<32> { using Type = Int256; };
 template <typename T, typename U>
 struct DecCompareInt
 {
-    using Type = typename ConstructDecInt<(!IsDecimalNumber<U> || sizeof(T) > sizeof(U)) ? sizeof(T) : sizeof(U)>::Type;
+    using Type = typename ConstructDecInt<(!is_decimal<U> || sizeof(T) > sizeof(U)) ? sizeof(T) : sizeof(U)>::Type;
     using TypeA = Type;
     using TypeB = Type;
 };
 
 ///
 template <typename A, typename B, template <typename, typename> typename Operation, bool _check_overflow = true,
-    bool _actual = IsDecimalNumber<A> || IsDecimalNumber<B>>
+    bool _actual = is_decimal<A> || is_decimal<B>>
 class DecimalComparison
 {
 public:
     using CompareInt = typename DecCompareInt<A, B>::Type;
     using Op = Operation<CompareInt, CompareInt>;
-    using ColVecA = std::conditional_t<IsDecimalNumber<A>, ColumnDecimal<A>, ColumnVector<A>>;
-    using ColVecB = std::conditional_t<IsDecimalNumber<B>, ColumnDecimal<B>, ColumnVector<B>>;
+    using ColVecA = ColumnVectorOrDecimal<A>;
+    using ColVecB = ColumnVectorOrDecimal<B>;
 
     using ArrayA = typename ColVecA::Container;
     using ArrayB = typename ColVecB::Container;
@@ -116,7 +116,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<IsDecimalNumber<T> && IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<is_decimal<T> && is_decimal<U>, Shift>
     getScales(const DataTypePtr & left_type, const DataTypePtr & right_type)
     {
         const DataTypeDecimalBase<T> * decimal0 = checkDecimalBase<T>(*left_type);
@@ -138,7 +138,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<IsDecimalNumber<T> && !IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<is_decimal<T> && !is_decimal<U>, Shift>
     getScales(const DataTypePtr & left_type, const DataTypePtr &)
     {
         Shift shift;
@@ -149,7 +149,7 @@ private:
     }
 
     template <typename T, typename U>
-    static std::enable_if_t<!IsDecimalNumber<T> && IsDecimalNumber<U>, Shift>
+    static std::enable_if_t<!is_decimal<T> && is_decimal<U>, Shift>
     getScales(const DataTypePtr &, const DataTypePtr & right_type)
     {
         Shift shift;
@@ -222,13 +222,13 @@ private:
     static NO_INLINE UInt8 apply(A a, B b, CompareInt scale [[maybe_unused]])
     {
         CompareInt x;
-        if constexpr (IsDecimalNumber<A>)
+        if constexpr (is_decimal<A>)
             x = a.value;
         else
             x = a;
 
         CompareInt y;
-        if constexpr (IsDecimalNumber<B>)
+        if constexpr (is_decimal<B>)
             y = b.value;
         else
             y = b;
diff --git a/src/Core/DecimalFunctions.h b/src/Core/DecimalFunctions.h
index 0e399210088..59d88785f1b 100644
--- a/src/Core/DecimalFunctions.h
+++ b/src/Core/DecimalFunctions.h
@@ -3,7 +3,7 @@
 #include <Core/Types.h>
 #include <Common/Exception.h>
 #include <Common/intExp.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 #include <limits>
 #include <type_traits>
@@ -223,16 +223,16 @@ inline typename DecimalType::NativeType getFractionalPart(const DecimalType & de
 template <typename To, typename DecimalType, typename ReturnType>
 ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 {
-    using NativeT = typename DecimalType::NativeType;
-    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+    using DecimalNativeType = typename DecimalType::NativeType;
+    static constexpr bool throw_exception = std::is_void_v<ReturnType>;
 
     if constexpr (std::is_floating_point_v<To>)
     {
-        result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<NativeT>(scale));
+        result = static_cast<To>(decimal.value) / static_cast<To>(scaleMultiplier<DecimalNativeType>(scale));
     }
-    else if constexpr (is_integer_v<To> && (sizeof(To) >= sizeof(NativeT)))
+    else if constexpr (is_integer<To> && (sizeof(To) >= sizeof(DecimalNativeType)))
     {
-        NativeT whole = getWholePart(decimal, scale);
+        DecimalNativeType whole = getWholePart(decimal, scale);
 
         if constexpr (is_unsigned_v<To>)
         {
@@ -247,15 +247,14 @@ ReturnType convertToImpl(const DecimalType & decimal, size_t scale, To & result)
 
         result = static_cast<To>(whole);
     }
-    else if constexpr (is_integer_v<To>)
+    else if constexpr (is_integer<To>)
     {
-        using ToNativeT = typename NativeType<To>::Type;
-        using CastTo = std::conditional_t<(is_big_int_v<NativeT> && std::is_same_v<ToNativeT, UInt8>), uint8_t, ToNativeT>;
+        using CastTo = std::conditional_t<(is_big_int_v<DecimalNativeType> && std::is_same_v<To, UInt8>), uint8_t, To>;
 
-        const NativeT whole = getWholePart(decimal, scale);
+        const DecimalNativeType whole = getWholePart(decimal, scale);
 
-        static const constexpr CastTo min_to = std::numeric_limits<ToNativeT>::min();
-        static const constexpr CastTo max_to = std::numeric_limits<ToNativeT>::max();
+        static const constexpr CastTo min_to = std::numeric_limits<To>::min();
+        static const constexpr CastTo max_to = std::numeric_limits<To>::max();
 
         if (whole < min_to || whole > max_to)
         {
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index 8244a0fc815..215bf6780d9 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -1,20 +1,12 @@
 #pragma once
 
-#include <common/defines.h>
+#include <base/defines.h>
 
-#define DBMS_DEFAULT_HOST "localhost"
 #define DBMS_DEFAULT_PORT 9000
 #define DBMS_DEFAULT_SECURE_PORT 9440
-#define DBMS_DEFAULT_HTTP_PORT 8123
 #define DBMS_DEFAULT_CONNECT_TIMEOUT_SEC 10
-#define DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_MS 50
-#define DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_SECURE_MS 100
 #define DBMS_DEFAULT_SEND_TIMEOUT_SEC 300
 #define DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC 300
-#define DBMS_DEFAULT_DRAIN_TIMEOUT_SEC 3
-/// Timeouts for hedged requests.
-#define DBMS_DEFAULT_HEDGED_CONNECTION_TIMEOUT_MS 100
-#define DBMS_DEFAULT_RECEIVE_DATA_TIMEOUT_MS 2000
 /// Timeout for synchronous request-result protocol call (like Ping or TablesStatus).
 #define DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC 5
 #define DBMS_DEFAULT_POLL_INTERVAL 10
@@ -42,8 +34,6 @@
 #define DEFAULT_TEMPORARY_LIVE_VIEW_TIMEOUT_SEC 5
 #define DEFAULT_PERIODIC_LIVE_VIEW_REFRESH_SEC 60
 #define SHOW_CHARS_ON_SYNTAX_ERROR ptrdiff_t(160)
-#define DEFAULT_LIVE_VIEW_HEARTBEAT_INTERVAL_SEC 15
-#define DBMS_DEFAULT_DISTRIBUTED_CONNECTIONS_POOL_SIZE 1024
 #define DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES 3
 /// each period reduces the error counter by 2 times
 /// too short a period can cause errors to disappear immediately after creation.
@@ -51,76 +41,17 @@
 /// replica error max cap, this is to prevent replica from accumulating too many errors and taking to long to recover.
 #define DBMS_CONNECTION_POOL_WITH_FAILOVER_MAX_ERROR_COUNT 1000
 
-#define DBMS_MIN_REVISION_WITH_CLIENT_INFO 54032
-#define DBMS_MIN_REVISION_WITH_SERVER_TIMEZONE 54058
-#define DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO 54060
-#define DBMS_MIN_REVISION_WITH_TABLES_STATUS 54226
-#define DBMS_MIN_REVISION_WITH_TIME_ZONE_PARAMETER_IN_DATETIME_DATA_TYPE 54337
-#define DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME 54372
-#define DBMS_MIN_REVISION_WITH_VERSION_PATCH 54401
-#define DBMS_MIN_REVISION_WITH_SERVER_LOGS 54406
-#define DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA 54415
-/// Minimum revision with exactly the same set of aggregation methods and rules to select them.
-/// Two-level (bucketed) aggregation is incompatible if servers are inconsistent in these rules
-/// (keys will be placed in different buckets and result will not be fully aggregated).
-#define DBMS_MIN_REVISION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD 54431
-#define DBMS_MIN_REVISION_WITH_COLUMN_DEFAULTS_METADATA 54410
-
-#define DBMS_MIN_REVISION_WITH_LOW_CARDINALITY_TYPE 54405
-#define DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO 54420
-
-/// Minimum revision supporting SettingsBinaryFormat::STRINGS.
-#define DBMS_MIN_REVISION_WITH_SETTINGS_SERIALIZED_AS_STRINGS 54429
-#define DBMS_MIN_REVISION_WITH_SCALARS 54429
-
-/// Minimum revision supporting OpenTelemetry
-#define DBMS_MIN_REVISION_WITH_OPENTELEMETRY 54442
-
-
-#define DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION 1
-
-/// Minimum revision supporting interserver secret.
-#define DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET 54441
-
-#define DBMS_MIN_REVISION_WITH_X_FORWARDED_FOR_IN_CLIENT_INFO 54443
-#define DBMS_MIN_REVISION_WITH_REFERER_IN_CLIENT_INFO 54447
-
-#define DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH 54448
-
-/// Version of ClickHouse TCP protocol.
-///
-/// Should be incremented manually on protocol changes.
-///
-/// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
-/// later is just a number for server version (one number instead of commit SHA)
-/// for simplicity (sometimes it may be more convenient in some use cases).
-#define DBMS_TCP_PROTOCOL_VERSION 54449
-
-#define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
 /// The boundary on which the blocks for asynchronous file operations should be aligned.
 #define DEFAULT_AIO_FILE_BLOCK_SIZE 4096
 
 #define DEFAULT_HTTP_READ_BUFFER_TIMEOUT 1800
 #define DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT 1
-/// Maximum namber of http-connections between two endpoints
+/// Maximum number of http-connections between two endpoints
 /// the number is unmotivated
 #define DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT 15
 
 #define DBMS_DEFAULT_PATH "/var/lib/clickhouse/"
 
-#define KEEPER_DEFAULT_PATH "/var/lib/clickhouse-keeper/"
-
-// more aliases: https://mailman.videolan.org/pipermail/x264-devel/2014-May/010660.html
-
-/// Marks that extra information is sent to a shard. It could be any magic numbers.
-#define DBMS_DISTRIBUTED_SIGNATURE_HEADER 0xCAFEDACEull
-#define DBMS_DISTRIBUTED_SIGNATURE_HEADER_OLD_FORMAT 0xCAFECABEull
-
-#if !__has_include(<sanitizer/asan_interface.h>) || !defined(ADDRESS_SANITIZER)
-#   define ASAN_UNPOISON_MEMORY_REGION(a, b)
-#   define ASAN_POISON_MEMORY_REGION(a, b)
-#endif
-
 /// Actually, there may be multiple acquisitions of different locks for a given table within one query.
 /// Check with IStorage class for the list of possible locks
 #define DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC 120
@@ -128,5 +59,23 @@
 /// Default limit on recursion depth of recursive descend parser.
 #define DBMS_DEFAULT_MAX_PARSER_DEPTH 1000
 
+/// Default limit on query size.
+#define DBMS_DEFAULT_MAX_QUERY_SIZE 262144
+
 /// Max depth of hierarchical dictionary
 #define DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH 1000
+
+/// Query profiler cannot work with sanitizers.
+/// Sanitizers are using quick "frame walking" stack unwinding (this implies -fno-omit-frame-pointer)
+/// And they do unwinding frequently (on every malloc/free, thread/mutex operations, etc).
+/// They change %rbp during unwinding and it confuses libunwind if signal comes during sanitizer unwinding
+///  and query profiler decide to unwind stack with libunwind at this moment.
+///
+/// Symptoms: you'll get silent Segmentation Fault - without sanitizer message and without usual ClickHouse diagnostics.
+///
+/// Look at compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.h
+#if !defined(SANITIZER)
+#define QUERY_PROFILER_DEFAULT_SAMPLE_RATE_NS 1000000000
+#else
+#define QUERY_PROFILER_DEFAULT_SAMPLE_RATE_NS 0
+#endif
diff --git a/src/Core/ExternalResultDescription.h b/src/Core/ExternalResultDescription.h
index 78c054e805f..a9ffe8b2ed2 100644
--- a/src/Core/ExternalResultDescription.h
+++ b/src/Core/ExternalResultDescription.h
@@ -6,7 +6,7 @@
 
 namespace DB
 {
-/** Common part for implementation of MySQLBlockInputStream, MongoDBBlockInputStream and others.
+/** Common part for implementation of MySQLSource, MongoDBSource and others.
   */
 struct ExternalResultDescription
 {
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index 9b53cd79a84..b4adbcc0662 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -1,6 +1,4 @@
 #include <boost/program_options.hpp>
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/AsynchronousBlockInputStream.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Storages/IStorage.h>
 #include <Storages/ColumnsDescription.h>
@@ -11,16 +9,15 @@
 #include <IO/ReadBufferFromFile.h>
 #include <IO/LimitReadBuffer.h>
 
-#include <Processors/Pipe.h>
-#include <Processors/Sources/SinkToOutputStream.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Executors/PipelineExecutor.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/Sinks/EmptySink.h>
+#include <Processors/Formats/IInputFormat.h>
 
 #include <Core/ExternalTable.h>
 #include <Poco/Net/MessageHeader.h>
-#include <Formats/FormatFactory.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
@@ -37,11 +34,10 @@ ExternalTableDataPtr BaseExternalTable::getData(ContextPtr context)
     initReadBuffer();
     initSampleBlock();
     auto input = context->getInputFormat(format, *read_buffer, sample_block, DEFAULT_BLOCK_SIZE);
-    auto stream = std::make_shared<AsynchronousBlockInputStream>(input);
 
     auto data = std::make_unique<ExternalTableData>();
+    data->pipe = std::make_unique<Pipe>(std::move(input));
     data->table_name = name;
-    data->pipe = std::make_unique<Pipe>(std::make_shared<SourceFromInputStream>(std::move(stream)));
 
     return data;
 }
@@ -161,14 +157,17 @@ void ExternalTablesHandler::handlePart(const Poco::Net::MessageHeader & header,
     auto storage = temporary_table.getTable();
     getContext()->addExternalTable(data->table_name, std::move(temporary_table));
     auto sink = storage->write(ASTPtr(), storage->getInMemoryMetadataPtr(), getContext());
+    auto exception_handling = std::make_shared<EmptySink>(sink->getOutputPort().getHeader());
 
     /// Write data
     data->pipe->resize(1);
 
-    connect(*data->pipe->getOutputPort(0), sink->getPort());
+    connect(*data->pipe->getOutputPort(0), sink->getInputPort());
+    connect(sink->getOutputPort(), exception_handling->getPort());
 
     auto processors = Pipe::detachProcessors(std::move(*data->pipe));
     processors.push_back(std::move(sink));
+    processors.push_back(std::move(exception_handling));
 
     auto executor = std::make_shared<PipelineExecutor>(processors);
     executor->execute(/*num_threads = */ 1);
diff --git a/src/Core/Field.cpp b/src/Core/Field.cpp
index b7b03951ac9..a85b7cff46e 100644
--- a/src/Core/Field.cpp
+++ b/src/Core/Field.cpp
@@ -23,65 +23,99 @@ inline Field getBinaryValue(UInt8 type, ReadBuffer & buf)
 {
     switch (type)
     {
-        case Field::Types::Null: {
-            return DB::Field();
+        case Field::Types::Null:
+        {
+            return Field();
         }
-        case Field::Types::UInt64: {
+        case Field::Types::UInt64:
+        {
             UInt64 value;
-            DB::readVarUInt(value, buf);
+            readVarUInt(value, buf);
             return value;
         }
-        case Field::Types::UInt128: {
+        case Field::Types::UInt128:
+        {
             UInt128 value;
-            DB::readBinary(value, buf);
+            readBinary(value, buf);
             return value;
         }
-        case Field::Types::Int64: {
+        case Field::Types::UInt256:
+        {
+            UInt256 value;
+            readBinary(value, buf);
+            return value;
+        }
+        case Field::Types::UUID:
+        {
+            UUID value;
+            readBinary(value, buf);
+            return value;
+        }
+        case Field::Types::Int64:
+        {
             Int64 value;
-            DB::readVarInt(value, buf);
+            readVarInt(value, buf);
             return value;
         }
-        case Field::Types::Float64: {
+        case Field::Types::Int128:
+        {
+            Int128 value;
+            readBinary(value, buf);
+            return value;
+        }
+        case Field::Types::Int256:
+        {
+            Int256 value;
+            readBinary(value, buf);
+            return value;
+        }
+        case Field::Types::Float64:
+        {
             Float64 value;
-            DB::readFloatBinary(value, buf);
+            readFloatBinary(value, buf);
             return value;
         }
-        case Field::Types::String: {
+        case Field::Types::String:
+        {
             std::string value;
-            DB::readStringBinary(value, buf);
+            readStringBinary(value, buf);
             return value;
         }
-        case Field::Types::Array: {
+        case Field::Types::Array:
+        {
             Array value;
-            DB::readBinary(value, buf);
+            readBinary(value, buf);
             return value;
         }
-        case Field::Types::Tuple: {
+        case Field::Types::Tuple:
+        {
             Tuple value;
-            DB::readBinary(value, buf);
+            readBinary(value, buf);
             return value;
         }
-        case Field::Types::Map: {
+        case Field::Types::Map:
+        {
             Map value;
-            DB::readBinary(value, buf);
+            readBinary(value, buf);
             return value;
         }
-        case Field::Types::AggregateFunctionState: {
+        case Field::Types::AggregateFunctionState:
+        {
             AggregateFunctionStateData value;
-            DB::readStringBinary(value.name, buf);
-            DB::readStringBinary(value.data, buf);
+            readStringBinary(value.name, buf);
+            readStringBinary(value.data, buf);
             return value;
         }
     }
-    return DB::Field();
+    return Field();
 }
 
 void readBinary(Array & x, ReadBuffer & buf)
 {
     size_t size;
     UInt8 type;
-    DB::readBinary(type, buf);
-    DB::readBinary(size, buf);
+    readBinary(type, buf);
+    readBinary(size, buf);
 
     for (size_t index = 0; index < size; ++index)
         x.push_back(getBinaryValue(type, buf));
@@ -93,8 +127,8 @@ void writeBinary(const Array & x, WriteBuffer & buf)
     size_t size = x.size();
     if (size)
         type = x.front().getType();
-    DB::writeBinary(type, buf);
-    DB::writeBinary(size, buf);
+    writeBinary(type, buf);
+    writeBinary(size, buf);
 
     for (const auto & elem : x)
         Field::dispatch([&buf] (const auto & value) { FieldVisitorWriteBinary()(value, buf); }, elem);
@@ -102,19 +136,19 @@ void writeBinary(const Array & x, WriteBuffer & buf)
 
 void writeText(const Array & x, WriteBuffer & buf)
 {
-    DB::String res = applyVisitor(FieldVisitorToString(), DB::Field(x));
+    String res = applyVisitor(FieldVisitorToString(), Field(x));
     buf.write(res.data(), res.size());
 }
 
 void readBinary(Tuple & x, ReadBuffer & buf)
 {
     size_t size;
-    DB::readBinary(size, buf);
+    readBinary(size, buf);
 
     for (size_t index = 0; index < size; ++index)
     {
         UInt8 type;
-        DB::readBinary(type, buf);
+        readBinary(type, buf);
         x.push_back(getBinaryValue(type, buf));
     }
 }
@@ -122,30 +156,30 @@ void readBinary(Tuple & x, ReadBuffer & buf)
 void writeBinary(const Tuple & x, WriteBuffer & buf)
 {
     const size_t size = x.size();
-    DB::writeBinary(size, buf);
+    writeBinary(size, buf);
 
     for (const auto & elem : x)
     {
         const UInt8 type = elem.getType();
-        DB::writeBinary(type, buf);
+        writeBinary(type, buf);
         Field::dispatch([&buf] (const auto & value) { FieldVisitorWriteBinary()(value, buf); }, elem);
     }
 }
 
 void writeText(const Tuple & x, WriteBuffer & buf)
 {
-    writeFieldText(DB::Field(x), buf);
+    writeFieldText(Field(x), buf);
 }
 
 void readBinary(Map & x, ReadBuffer & buf)
 {
     size_t size;
-    DB::readBinary(size, buf);
+    readBinary(size, buf);
 
     for (size_t index = 0; index < size; ++index)
     {
         UInt8 type;
-        DB::readBinary(type, buf);
+        readBinary(type, buf);
         x.push_back(getBinaryValue(type, buf));
     }
 }
@@ -153,19 +187,19 @@ void readBinary(Map & x, ReadBuffer & buf)
 void writeBinary(const Map & x, WriteBuffer & buf)
 {
     const size_t size = x.size();
-    DB::writeBinary(size, buf);
+    writeBinary(size, buf);
 
     for (const auto & elem : x)
     {
         const UInt8 type = elem.getType();
-        DB::writeBinary(type, buf);
+        writeBinary(type, buf);
         Field::dispatch([&buf] (const auto & value) { FieldVisitorWriteBinary()(value, buf); }, elem);
     }
 }
 
 void writeText(const Map & x, WriteBuffer & buf)
 {
-    writeFieldText(DB::Field(x), buf);
+    writeFieldText(Field(x), buf);
 }
 
 template <typename T>
@@ -450,19 +484,14 @@ template bool decimalLessOrEqual<Decimal256>(Decimal256 x, Decimal256 y, UInt32
 template bool decimalLessOrEqual<DateTime64>(DateTime64 x, DateTime64 y, UInt32 x_scale, UInt32 y_scale);
 
 
-inline void writeText(const Null &, WriteBuffer & buf)
+inline void writeText(const Null & x, WriteBuffer & buf)
 {
-    writeText(std::string("NULL"), buf);
-}
-
-inline void writeText(const NegativeInfinity &, WriteBuffer & buf)
-{
-    writeText(std::string("-Inf"), buf);
-}
-
-inline void writeText(const PositiveInfinity &, WriteBuffer & buf)
-{
-    writeText(std::string("+Inf"), buf);
+    if (x.isNegativeInfinity())
+        writeText("-Inf", buf);
+    if (x.isPositiveInfinity())
+        writeText("+Inf", buf);
+    else
+        writeText("NULL", buf);
 }
 
 String toString(const Field & x)
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 744675d6e86..a9fb73393cf 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -12,9 +12,9 @@
 #include <Core/Defines.h>
 #include <Core/DecimalFunctions.h>
 #include <Core/UUID.h>
-#include <common/DayNum.h>
-#include <common/strong_typedef.h>
-
+#include <base/DayNum.h>
+#include <base/strong_typedef.h>
+#include <base/EnumReflection.h>
 
 namespace DB
 {
@@ -28,11 +28,8 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-template <typename T, typename SFINAE = void>
-struct NearestFieldTypeImpl;
-
-template <typename T>
-using NearestFieldType = typename NearestFieldTypeImpl<T>::Type;
+constexpr Null NEGATIVE_INFINITY{Null::Value::NegativeInfinity};
+constexpr Null POSITIVE_INFINITY{Null::Value::PositiveInfinity};
 
 class Field;
 using FieldVector = std::vector<Field, AllocatorWithMemoryTracking<Field>>;
@@ -168,6 +165,12 @@ template <> constexpr inline bool is_decimal_field<DecimalField<Decimal64>> = tr
 template <> constexpr inline bool is_decimal_field<DecimalField<Decimal128>> = true;
 template <> constexpr inline bool is_decimal_field<DecimalField<Decimal256>> = true;
 
+template <typename T, typename SFINAE = void>
+struct NearestFieldTypeImpl;
+
+template <typename T>
+using NearestFieldType = typename NearestFieldTypeImpl<T>::Type;
+
 /// char may be signed or unsigned, and behave identically to signed char or unsigned char,
 ///  but they are always three different types.
 /// signedness of char is different in Linux on x86 and Linux on ARM.
@@ -218,8 +221,6 @@ template <> struct NearestFieldTypeImpl<Tuple> { using Type = Tuple; };
 template <> struct NearestFieldTypeImpl<Map> { using Type = Map; };
 template <> struct NearestFieldTypeImpl<bool> { using Type = UInt64; };
 template <> struct NearestFieldTypeImpl<Null> { using Type = Null; };
-template <> struct NearestFieldTypeImpl<NegativeInfinity> { using Type = NegativeInfinity; };
-template <> struct NearestFieldTypeImpl<PositiveInfinity> { using Type = PositiveInfinity; };
 
 template <> struct NearestFieldTypeImpl<AggregateFunctionStateData> { using Type = AggregateFunctionStateData; };
 
@@ -230,6 +231,16 @@ struct NearestFieldTypeImpl<T, std::enable_if_t<std::is_enum_v<T>>>
     using Type = NearestFieldType<std::underlying_type_t<T>>;
 };
 
+template <typename T>
+decltype(auto) castToNearestFieldType(T && x)
+{
+    using U = NearestFieldType<std::decay_t<T>>;
+    if constexpr (std::is_same_v<std::decay_t<T>, U>)
+        return std::forward<T>(x);
+    else
+        return U(x);
+}
+
 /** 32 is enough. Round number is used for alignment and for better arithmetic inside std::vector.
   * NOTE: Actually, sizeof(std::string) is 32 when using libc++, so Field is 40 bytes.
   */
@@ -271,40 +282,7 @@ public:
             Int256  = 25,
             Map = 26,
             UUID = 27,
-
-            // Special types for index analysis
-            NegativeInfinity = 254,
-            PositiveInfinity = 255,
         };
-
-        static const char * toString(Which which)
-        {
-            switch (which)
-            {
-                case Null:    return "Null";
-                case NegativeInfinity: return "-Inf";
-                case PositiveInfinity: return "+Inf";
-                case UInt64:  return "UInt64";
-                case UInt128: return "UInt128";
-                case UInt256: return "UInt256";
-                case Int64:   return "Int64";
-                case Int128:  return "Int128";
-                case Int256:  return "Int256";
-                case UUID:    return "UUID";
-                case Float64: return "Float64";
-                case String:  return "String";
-                case Array:   return "Array";
-                case Tuple:   return "Tuple";
-                case Map:     return "Map";
-                case Decimal32:  return "Decimal32";
-                case Decimal64:  return "Decimal64";
-                case Decimal128: return "Decimal128";
-                case Decimal256: return "Decimal256";
-                case AggregateFunctionState: return "AggregateFunctionState";
-            }
-
-            throw Exception("Bad type of Field", ErrorCodes::BAD_TYPE_OF_FIELD);
-        }
     };
 
 
@@ -322,14 +300,12 @@ public:
 
     /// Templates to avoid ambiguity.
     template <typename T, typename Z = void *>
-    using enable_if_not_field_or_stringlike_t = std::enable_if_t<
-        !std::is_same_v<std::decay_t<T>, Field>
-        && !std::is_same_v<NearestFieldType<std::decay_t<T>>, String>, Z>;
+    using enable_if_not_field_or_bool_or_stringlike_t = std::enable_if_t<
+        !std::is_same_v<std::decay_t<T>, Field> &&
+        !std::is_same_v<std::decay_t<T>, bool> &&
+        !std::is_same_v<NearestFieldType<std::decay_t<T>>, String>, Z>;
 
-    Field() //-V730
-        : which(Types::Null)
-    {
-    }
+    Field() : Field(Null{}) {}
 
     /** Despite the presence of a template constructor, this constructor is still needed,
       *  since, in its absence, the compiler will still generate the default constructor.
@@ -345,7 +321,9 @@ public:
     }
 
     template <typename T>
-    Field(T && rhs, enable_if_not_field_or_stringlike_t<T> = nullptr);
+    Field(T && rhs, enable_if_not_field_or_bool_or_stringlike_t<T> = nullptr);
+
+    Field(bool rhs) : Field(castToNearestFieldType(rhs)) {}
 
     /// Create a string inplace.
     Field(const std::string_view & str) { create(str.data(), str.size()); }
@@ -395,9 +373,11 @@ public:
     /// 1. float <--> int needs explicit cast
     /// 2. customized types needs explicit cast
     template <typename T>
-    enable_if_not_field_or_stringlike_t<T, Field> &
+    enable_if_not_field_or_bool_or_stringlike_t<T, Field> &
     operator=(T && rhs);
 
+    Field & operator= (bool rhs) { return *this = castToNearestFieldType(rhs); }
+
     Field & operator= (const std::string_view & str);
     Field & operator= (const String & str) { return *this = std::string_view{str}; }
     Field & operator= (String && str);
@@ -410,14 +390,10 @@ public:
 
 
     Types::Which getType() const { return which; }
-    const char * getTypeName() const { return Types::toString(which); }
-
-    // Non-valued field are all denoted as Null
-    bool isNull() const { return which == Types::Null || which == Types::NegativeInfinity || which == Types::PositiveInfinity; }
-    bool isNegativeInfinity() const { return which == Types::NegativeInfinity; }
-    bool isPositiveInfinity() const { return which == Types::PositiveInfinity; }
 
+    constexpr std::string_view getTypeName() const { return magic_enum::enum_name(which); }
 
+    bool isNull() const { return which == Types::Null; }
     template <typename T>
     NearestFieldType<std::decay_t<T>> & get();
 
@@ -428,6 +404,9 @@ public:
         return mutable_this->get<T>();
     }
 
+    bool isNegativeInfinity() const { return which == Types::Null && get<Null>().isNegativeInfinity(); }
+    bool isPositiveInfinity() const { return which == Types::Null && get<Null>().isPositiveInfinity(); }
+
     template <typename T>
     T & reinterpret();
 
@@ -470,10 +449,7 @@ public:
 
         switch (which)
         {
-            case Types::Null:
-            case Types::NegativeInfinity:
-            case Types::PositiveInfinity:
-                return false;
+            case Types::Null:    return false;
             case Types::UInt64:  return get<UInt64>()  < rhs.get<UInt64>();
             case Types::UInt128: return get<UInt128>() < rhs.get<UInt128>();
             case Types::UInt256: return get<UInt256>() < rhs.get<UInt256>();
@@ -510,10 +486,7 @@ public:
 
         switch (which)
         {
-            case Types::Null:
-            case Types::NegativeInfinity:
-            case Types::PositiveInfinity:
-                return true;
+            case Types::Null:    return true;
             case Types::UInt64:  return get<UInt64>()  <= rhs.get<UInt64>();
             case Types::UInt128: return get<UInt128>() <= rhs.get<UInt128>();
             case Types::UInt256: return get<UInt256>() <= rhs.get<UInt256>();
@@ -550,10 +523,7 @@ public:
 
         switch (which)
         {
-            case Types::Null:
-            case Types::NegativeInfinity:
-            case Types::PositiveInfinity:
-                return true;
+            case Types::Null: return true;
             case Types::UInt64: return get<UInt64>() == rhs.get<UInt64>();
             case Types::Int64:   return get<Int64>() == rhs.get<Int64>();
             case Types::Float64:
@@ -593,8 +563,6 @@ public:
         switch (field.which)
         {
             case Types::Null:    return f(field.template get<Null>());
-            case Types::NegativeInfinity:    return f(field.template get<NegativeInfinity>());
-            case Types::PositiveInfinity:    return f(field.template get<PositiveInfinity>());
 // gcc 8.2.1
 #if !defined(__clang__)
 #pragma GCC diagnostic push
@@ -752,9 +720,7 @@ private:
 using Row = std::vector<Field>;
 
 
-template <> struct Field::TypeToEnum<Null>    { static const Types::Which value = Types::Null; };
-template <> struct Field::TypeToEnum<NegativeInfinity>    { static const Types::Which value = Types::NegativeInfinity; };
-template <> struct Field::TypeToEnum<PositiveInfinity>    { static const Types::Which value = Types::PositiveInfinity; };
+template <> struct Field::TypeToEnum<Null> { static const Types::Which value = Types::Null; };
 template <> struct Field::TypeToEnum<UInt64>  { static const Types::Which value = Types::UInt64; };
 template <> struct Field::TypeToEnum<UInt128> { static const Types::Which value = Types::UInt128; };
 template <> struct Field::TypeToEnum<UInt256> { static const Types::Which value = Types::UInt256; };
@@ -775,8 +741,6 @@ template <> struct Field::TypeToEnum<DecimalField<DateTime64>>{ static const Typ
 template <> struct Field::TypeToEnum<AggregateFunctionStateData>{ static const Types::Which value = Types::AggregateFunctionState; };
 
 template <> struct Field::EnumToType<Field::Types::Null>    { using Type = Null; };
-template <> struct Field::EnumToType<Field::Types::NegativeInfinity>    { using Type = NegativeInfinity; };
-template <> struct Field::EnumToType<Field::Types::PositiveInfinity>    { using Type = PositiveInfinity; };
 template <> struct Field::EnumToType<Field::Types::UInt64>  { using Type = UInt64; };
 template <> struct Field::EnumToType<Field::Types::UInt128> { using Type = UInt128; };
 template <> struct Field::EnumToType<Field::Types::UInt256> { using Type = UInt256; };
@@ -818,7 +782,8 @@ NearestFieldType<std::decay_t<T>> & Field::get()
     constexpr Field::Types::Which target = TypeToEnum<StoredType>::value;
     if (target != which
            && (!isInt64OrUInt64FieldType(target) || !isInt64OrUInt64FieldType(which)))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid Field get from type {} to type {}", Types::toString(which), Types::toString(target));
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Invalid Field get from type {} to type {}", which, target);
 #endif
 
     StoredType * MAY_ALIAS ptr = reinterpret_cast<StoredType *>(&storage);
@@ -831,8 +796,11 @@ template <typename T>
 auto & Field::safeGet()
 {
     const Types::Which requested = TypeToEnum<NearestFieldType<std::decay_t<T>>>::value;
+
     if (which != requested)
-        throw Exception("Bad get: has " + std::string(getTypeName()) + ", requested " + std::string(Types::toString(requested)), ErrorCodes::BAD_GET);
+        throw Exception(ErrorCodes::BAD_GET,
+            "Bad get: has {}, requested {}", getTypeName(), requested);
+
     return get<T>();
 }
 
@@ -869,31 +837,15 @@ T safeGet(Field & field)
     return field.template safeGet<T>();
 }
 
-template <> inline constexpr const char * TypeName<Array> = "Array";
-template <> inline constexpr const char * TypeName<Tuple> = "Tuple";
-template <> inline constexpr const char * TypeName<Map> = "Map";
-template <> inline constexpr const char * TypeName<AggregateFunctionStateData> = "AggregateFunctionState";
-
-
 template <typename T>
-decltype(auto) castToNearestFieldType(T && x)
-{
-    using U = NearestFieldType<std::decay_t<T>>;
-    if constexpr (std::is_same_v<std::decay_t<T>, U>)
-        return std::forward<T>(x);
-    else
-        return U(x);
-}
-
-template <typename T>
-Field::Field(T && rhs, enable_if_not_field_or_stringlike_t<T>) //-V730
+Field::Field(T && rhs, enable_if_not_field_or_bool_or_stringlike_t<T>) //-V730
 {
     auto && val = castToNearestFieldType(std::forward<T>(rhs));
     createConcrete(std::forward<decltype(val)>(val));
 }
 
 template <typename T>
-Field::enable_if_not_field_or_stringlike_t<T, Field> &
+Field::enable_if_not_field_or_bool_or_stringlike_t<T, Field> &
 Field::operator=(T && rhs)
 {
     auto && val = castToNearestFieldType(std::forward<T>(rhs));
@@ -908,7 +860,6 @@ Field::operator=(T && rhs)
     return *this;
 }
 
-
 inline Field & Field::operator=(const std::string_view & str)
 {
     if (which != Types::String)
@@ -974,9 +925,9 @@ __attribute__ ((noreturn)) inline void writeText(const AggregateFunctionStateDat
 }
 
 template <typename T>
-inline void writeText(const DecimalField<T> & value, WriteBuffer & buf)
+inline void writeText(const DecimalField<T> & value, WriteBuffer & buf, bool trailing_zeros = false)
 {
-    writeText(value.getValue(), value.getScale(), buf);
+    writeText(value.getValue(), value.getScale(), buf, trailing_zeros);
 }
 
 template <typename T>
diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp
index 658c86795b1..4dd20ff585e 100644
--- a/src/Core/MySQL/Authentication.cpp
+++ b/src/Core/MySQL/Authentication.cpp
@@ -2,13 +2,13 @@
 #include <Core/MySQL/PacketsConnection.h>
 #include <Poco/RandomStream.h>
 #include <Poco/SHA1Engine.h>
-#include <Access/User.h>
-#include <Access/AccessControlManager.h>
+#include <Interpreters/Session.h>
+#include <Access/Credentials.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/OpenSSLHelpers.h>
 
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 namespace DB
 {
@@ -30,15 +30,16 @@ namespace Authentication
 
 static const size_t SCRAMBLE_LENGTH = 20;
 
-Native41::Native41()
+/** Generate a random string using ASCII characters but avoid separator character,
+  * produce pseudo random numbers between with about 7 bit worth of entropty between 1-127.
+  * https://github.com/mysql/mysql-server/blob/8.0/mysys/crypt_genhash_impl.cc#L427
+  */
+static String generateScramble()
 {
+    String scramble;
     scramble.resize(SCRAMBLE_LENGTH + 1, 0);
     Poco::RandomInputStream generator;
 
-    /** Generate a random string using ASCII characters but avoid separator character,
-      * produce pseudo random numbers between with about 7 bit worth of entropty between 1-127.
-      * https://github.com/mysql/mysql-server/blob/8.0/mysys/crypt_genhash_impl.cc#L427
-      */
     for (size_t i = 0; i < SCRAMBLE_LENGTH; ++i)
     {
         generator >> scramble[i];
@@ -46,14 +47,18 @@ Native41::Native41()
         if (scramble[i] == '\0' || scramble[i] == '$')
             scramble[i] = scramble[i] + 1;
     }
+
+    return scramble;
 }
 
-Native41::Native41(const String & password, const String & auth_plugin_data)
+Native41::Native41() : scramble(generateScramble()) { }
+
+Native41::Native41(const String & password_, const String & scramble_)
 {
     /// https://dev.mysql.com/doc/internals/en/secure-password-authentication.html
     /// SHA1( password ) XOR SHA1( "20-bytes random data from server" <concat> SHA1( SHA1( password ) ) )
     Poco::SHA1Engine engine1;
-    engine1.update(password);
+    engine1.update(password_);
     const Poco::SHA1Engine::Digest & password_sha1 = engine1.digest();
 
     Poco::SHA1Engine engine2;
@@ -61,19 +66,17 @@ Native41::Native41(const String & password, const String & auth_plugin_data)
     const Poco::SHA1Engine::Digest & password_double_sha1 = engine2.digest();
 
     Poco::SHA1Engine engine3;
-    engine3.update(auth_plugin_data.data(), auth_plugin_data.size());
+    engine3.update(scramble_.data(), scramble_.size());
     engine3.update(password_double_sha1.data(), password_double_sha1.size());
     const Poco::SHA1Engine::Digest & digest = engine3.digest();
 
     scramble.resize(SCRAMBLE_LENGTH);
     for (size_t i = 0; i < SCRAMBLE_LENGTH; i++)
-    {
         scramble[i] = static_cast<unsigned char>(password_sha1[i] ^ digest[i]);
-    }
 }
 
 void Native41::authenticate(
-    const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
+    const String & user_name, Session & session, std::optional<String> auth_response,
     std::shared_ptr<PacketEndpoint> packet_endpoint, bool, const Poco::Net::SocketAddress & address)
 {
     if (!auth_response)
@@ -86,7 +89,7 @@ void Native41::authenticate(
 
     if (auth_response->empty())
     {
-        context->setUser(user_name, "", address);
+        session.authenticate(user_name, "", address);
         return;
     }
 
@@ -96,22 +99,7 @@ void Native41::authenticate(
                 + " bytes, received: " + std::to_string(auth_response->size()) + " bytes.",
             ErrorCodes::UNKNOWN_EXCEPTION);
 
-    auto user = context->getAccessControlManager().read<User>(user_name);
-
-    Poco::SHA1Engine::Digest double_sha1_value = user->authentication.getPasswordDoubleSHA1();
-    assert(double_sha1_value.size() == Poco::SHA1Engine::DIGEST_SIZE);
-
-    Poco::SHA1Engine engine;
-    engine.update(scramble.data(), SCRAMBLE_LENGTH);
-    engine.update(double_sha1_value.data(), double_sha1_value.size());
-
-    String password_sha1(Poco::SHA1Engine::DIGEST_SIZE, 0x0);
-    const Poco::SHA1Engine::Digest & digest = engine.digest();
-    for (size_t i = 0; i < password_sha1.size(); i++)
-    {
-        password_sha1[i] = digest[i] ^ static_cast<unsigned char>((*auth_response)[i]);
-    }
-    context->setUser(user_name, password_sha1, address);
+    session.authenticate(MySQLNative41Credentials{user_name, scramble, *auth_response}, address);
 }
 
 #if USE_SSL
@@ -123,20 +111,11 @@ Sha256Password::Sha256Password(RSA & public_key_, RSA & private_key_, Poco::Logg
      *  This plugin must do the same to stay consistent with historical behavior if it is set to operate as a default plugin. [1]
      *  https://github.com/mysql/mysql-server/blob/8.0/sql/auth/sql_authentication.cc#L3994
      */
-    scramble.resize(SCRAMBLE_LENGTH + 1, 0);
-    Poco::RandomInputStream generator;
-
-    for (size_t i = 0; i < SCRAMBLE_LENGTH; ++i)
-    {
-        generator >> scramble[i];
-        scramble[i] &= 0x7f;
-        if (scramble[i] == '\0' || scramble[i] == '$')
-            scramble[i] = scramble[i] + 1;
-    }
+    scramble = generateScramble();
 }
 
 void Sha256Password::authenticate(
-    const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
+    const String & user_name, Session & session, std::optional<String> auth_response,
     std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address)
 {
     if (!auth_response)
@@ -214,7 +193,7 @@ void Sha256Password::authenticate(
         password.resize(plaintext_size);
         for (int i = 0; i < plaintext_size; i++)
         {
-            password[i] = plaintext[i] ^ static_cast<unsigned char>(scramble[i % scramble.size()]);
+            password[i] = plaintext[i] ^ static_cast<unsigned char>(scramble[i % SCRAMBLE_LENGTH]);
         }
     }
     else if (is_secure_connection)
@@ -231,7 +210,7 @@ void Sha256Password::authenticate(
         password.pop_back();
     }
 
-    context->setUser(user_name, password, address);
+    session.authenticate(user_name, password, address);
 }
 
 #endif
diff --git a/src/Core/MySQL/Authentication.h b/src/Core/MySQL/Authentication.h
index acbda2bdb58..26194236aa2 100644
--- a/src/Core/MySQL/Authentication.h
+++ b/src/Core/MySQL/Authentication.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/Context.h>
 #include <Core/MySQL/PacketEndpoint.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_SSL
 #    include <openssl/pem.h>
@@ -15,6 +13,7 @@
 
 namespace DB
 {
+class Session;
 
 namespace MySQLProtocol
 {
@@ -32,7 +31,7 @@ public:
     virtual String getAuthPluginData() = 0;
 
     virtual void authenticate(
-        const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
+        const String & user_name, Session & session, std::optional<String> auth_response,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address) = 0;
 };
 
@@ -42,14 +41,14 @@ class Native41 : public IPlugin
 public:
     Native41();
 
-    Native41(const String & password, const String & auth_plugin_data);
+    Native41(const String & password_, const String & scramble_);
 
     String getName() override { return "mysql_native_password"; }
 
     String getAuthPluginData() override { return scramble; }
 
     void authenticate(
-        const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
+        const String & user_name, Session & session, std::optional<String> auth_response,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool /* is_secure_connection */, const Poco::Net::SocketAddress & address) override;
 
 private:
@@ -69,7 +68,7 @@ public:
     String getAuthPluginData() override { return scramble; }
 
     void authenticate(
-        const String & user_name, std::optional<String> auth_response, ContextMutablePtr context,
+        const String & user_name, Session & session, std::optional<String> auth_response,
         std::shared_ptr<PacketEndpoint> packet_endpoint, bool is_secure_connection, const Poco::Net::SocketAddress & address) override;
 
 private:
diff --git a/src/Core/MySQL/MySQLClient.h b/src/Core/MySQL/MySQLClient.h
index 2c93fc888a3..5b33a8f852b 100644
--- a/src/Core/MySQL/MySQLClient.h
+++ b/src/Core/MySQL/MySQLClient.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MySQL/MySQLReplication.h>
 #include <IO/ReadBufferFromPocoSocket.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Core/MySQL/MySQLReplication.cpp b/src/Core/MySQL/MySQLReplication.cpp
index 81015507d8d..b5adab67e3a 100644
--- a/src/Core/MySQL/MySQLReplication.cpp
+++ b/src/Core/MySQL/MySQLReplication.cpp
@@ -5,7 +5,7 @@
 #include <IO/MySQLBinlogEventReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <Common/FieldVisitorToString.h>
 #include <Core/MySQL/PacketsGeneric.h>
 #include <Core/MySQL/PacketsProtocolText.h>
@@ -105,12 +105,16 @@ namespace MySQLReplication
         if (query.starts_with("BEGIN") || query.starts_with("COMMIT"))
         {
             typ = QUERY_EVENT_MULTI_TXN_FLAG;
+            if (!query.starts_with("COMMIT"))
+                transaction_complete = false;
         }
         else if (query.starts_with("XA"))
         {
             if (query.starts_with("XA ROLLBACK"))
                 throw ReplicationError("ParseQueryEvent: Unsupported query event:" + query, ErrorCodes::LOGICAL_ERROR);
             typ = QUERY_EVENT_XA;
+            if (!query.starts_with("XA COMMIT"))
+                transaction_complete = false;
         }
         else if (query.starts_with("SAVEPOINT"))
         {
@@ -711,9 +715,26 @@ namespace MySQLReplication
     {
         switch (event->header.type)
         {
-            case FORMAT_DESCRIPTION_EVENT:
-            case QUERY_EVENT:
+            case FORMAT_DESCRIPTION_EVENT: {
+                binlog_pos = event->header.log_pos;
+                break;
+            }
+            case QUERY_EVENT: {
+                auto query = std::static_pointer_cast<QueryEvent>(event);
+                if (query->transaction_complete && pending_gtid)
+                {
+                    gtid_sets.update(*pending_gtid);
+                    pending_gtid.reset();
+                }
+                binlog_pos = event->header.log_pos;
+                break;
+            }
             case XID_EVENT: {
+                if (pending_gtid)
+                {
+                    gtid_sets.update(*pending_gtid);
+                    pending_gtid.reset();
+                }
                 binlog_pos = event->header.log_pos;
                 break;
             }
@@ -724,9 +745,11 @@ namespace MySQLReplication
                 break;
             }
             case GTID_EVENT: {
+                if (pending_gtid)
+                    gtid_sets.update(*pending_gtid);
                 auto gtid_event = std::static_pointer_cast<GTIDEvent>(event);
                 binlog_pos = event->header.log_pos;
-                gtid_sets.update(gtid_event->gtid);
+                pending_gtid = gtid_event->gtid;
                 break;
             }
             default:
@@ -792,6 +815,7 @@ namespace MySQLReplication
             {
                 event = std::make_shared<QueryEvent>(std::move(event_header));
                 event->parseEvent(event_payload);
+                position.update(event);
 
                 auto query = std::static_pointer_cast<QueryEvent>(event);
                 switch (query->typ)
@@ -803,7 +827,7 @@ namespace MySQLReplication
                         break;
                     }
                     default:
-                        position.update(event);
+                        break;
                 }
                 break;
             }
diff --git a/src/Core/MySQL/MySQLReplication.h b/src/Core/MySQL/MySQLReplication.h
index cd24979caaa..cb67ce73de9 100644
--- a/src/Core/MySQL/MySQLReplication.h
+++ b/src/Core/MySQL/MySQLReplication.h
@@ -2,7 +2,7 @@
 #include <Core/Field.h>
 #include <Core/MySQL/PacketsReplication.h>
 #include <Core/MySQL/MySQLGtid.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
@@ -383,6 +383,7 @@ namespace MySQLReplication
         String schema;
         String query;
         QueryType typ = QUERY_EVENT_DDL;
+        bool transaction_complete = true;
 
         QueryEvent(EventHeader && header_)
             : EventBase(std::move(header_)), thread_id(0), exec_time(0), schema_len(0), error_code(0), status_len(0)
@@ -536,6 +537,9 @@ namespace MySQLReplication
         void update(BinlogEventPtr event);
         void update(UInt64 binlog_pos_, const String & binlog_name_, const String & gtid_sets_);
         void dump(WriteBuffer & out) const;
+
+    private:
+        std::optional<GTID> pending_gtid;
     };
 
     class IFlavor : public MySQLProtocol::IMySQLReadPacket
diff --git a/src/Core/MySQL/PacketEndpoint.h b/src/Core/MySQL/PacketEndpoint.h
index df81f49fefb..b1897958ced 100644
--- a/src/Core/MySQL/PacketEndpoint.h
+++ b/src/Core/MySQL/PacketEndpoint.h
@@ -5,7 +5,7 @@
 #include "IMySQLReadPacket.h"
 #include "IMySQLWritePacket.h"
 #include "IO/MySQLPacketPayloadReadBuffer.h"
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Core/NamesAndTypes.cpp b/src/Core/NamesAndTypes.cpp
index 91191c73fd0..b47f5a6823b 100644
--- a/src/Core/NamesAndTypes.cpp
+++ b/src/Core/NamesAndTypes.cpp
@@ -1,4 +1,5 @@
 #include <Core/NamesAndTypes.h>
+#include <Common/HashTable/HashMap.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
@@ -6,7 +7,6 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
-#include <sparsehash/dense_hash_map>
 
 
 namespace DB
@@ -163,12 +163,7 @@ NamesAndTypesList NamesAndTypesList::filter(const Names & names) const
 NamesAndTypesList NamesAndTypesList::addTypes(const Names & names) const
 {
     /// NOTE: It's better to make a map in `IStorage` than to create it here every time again.
-#if !defined(ARCADIA_BUILD)
-    google::dense_hash_map<StringRef, const DataTypePtr *, StringRefHash> types;
-#else
-    google::sparsehash::dense_hash_map<StringRef, const DataTypePtr *, StringRefHash> types;
-#endif
-    types.set_empty_key(StringRef());
+    HashMapWithSavedHash<StringRef, const DataTypePtr *, StringRefHash> types;
 
     for (const auto & column : *this)
         types[column.name] = &column.type;
@@ -176,10 +171,11 @@ NamesAndTypesList NamesAndTypesList::addTypes(const Names & names) const
     NamesAndTypesList res;
     for (const String & name : names)
     {
-        auto it = types.find(name);
+        const auto * it = types.find(name);
         if (it == types.end())
-            throw Exception("No column " + name, ErrorCodes::THERE_IS_NO_COLUMN);
-        res.emplace_back(name, *it->second);
+            throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "No column {}", name);
+
+        res.emplace_back(name, *it->getMapped());
     }
 
     return res;
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index 0c871f08d8b..58b5189db63 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -28,7 +28,7 @@ public:
     String getSubcolumnName() const;
 
     bool isSubcolumn() const { return subcolumn_delimiter_position != std::nullopt; }
-    DataTypePtr getTypeInStorage() const { return type_in_storage; }
+    const DataTypePtr & getTypeInStorage() const { return type_in_storage; }
 
     bool operator<(const NameAndTypePair & rhs) const
     {
diff --git a/src/Core/PostgreSQL/Connection.cpp b/src/Core/PostgreSQL/Connection.cpp
index e5c61c19963..75786a51d92 100644
--- a/src/Core/PostgreSQL/Connection.cpp
+++ b/src/Core/PostgreSQL/Connection.cpp
@@ -1,8 +1,8 @@
 #include "Connection.h"
 
 #if USE_LIBPQXX
+#include <base/logger_useful.h>
 
-#include <common/logger_useful.h>
 
 namespace postgres
 {
@@ -42,7 +42,6 @@ void Connection::execWithRetry(const std::function<void(pqxx::nontransaction &)>
 pqxx::connection & Connection::getRef()
 {
     connect();
-    assert(connection != nullptr);
     return *connection;
 }
 
diff --git a/src/Core/PostgreSQL/Connection.h b/src/Core/PostgreSQL/Connection.h
index 681681a38bf..d65c38643c1 100644
--- a/src/Core/PostgreSQL/Connection.h
+++ b/src/Core/PostgreSQL/Connection.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
-#include <pqxx/pqxx> // Y_IGNORE
+#include <pqxx/pqxx>
 #include <Core/Types.h>
 #include <boost/noncopyable.hpp>
 
diff --git a/src/Core/PostgreSQL/ConnectionHolder.h b/src/Core/PostgreSQL/ConnectionHolder.h
index cbdde7062b5..d0d64935e91 100644
--- a/src/Core/PostgreSQL/ConnectionHolder.h
+++ b/src/Core/PostgreSQL/ConnectionHolder.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
-#include <pqxx/pqxx> // Y_IGNORE
+#include <pqxx/pqxx>
 #include <Core/Types.h>
-#include <common/BorrowedObjectPool.h>
+#include <base/BorrowedObjectPool.h>
 
 
 namespace postgres
diff --git a/src/Core/PostgreSQL/PoolWithFailover.cpp b/src/Core/PostgreSQL/PoolWithFailover.cpp
index b8b8e78396c..3addb511c3b 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.cpp
+++ b/src/Core/PostgreSQL/PoolWithFailover.cpp
@@ -5,6 +5,8 @@
 #include "Utils.h"
 #include <Common/parseRemoteDescription.h>
 #include <Common/Exception.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 
 namespace DB
 {
@@ -18,7 +20,7 @@ namespace postgres
 {
 
 PoolWithFailover::PoolWithFailover(
-        const Poco::Util::AbstractConfiguration & config, const String & config_prefix,
+        const DB::ExternalDataSourcesConfigurationByPriority & configurations_by_priority,
         size_t pool_size, size_t pool_wait_timeout_, size_t max_tries_)
         : pool_wait_timeout(pool_wait_timeout_)
         , max_tries(max_tries_)
@@ -26,45 +28,19 @@ PoolWithFailover::PoolWithFailover(
     LOG_TRACE(&Poco::Logger::get("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
               pool_size, pool_wait_timeout, max_tries_);
 
-    auto db = config.getString(config_prefix + ".db", "");
-    auto host = config.getString(config_prefix + ".host", "");
-    auto port = config.getUInt(config_prefix + ".port", 0);
-    auto user = config.getString(config_prefix + ".user", "");
-    auto password = config.getString(config_prefix + ".password", "");
-
-    if (config.has(config_prefix + ".replica"))
+    for (const auto & [priority, configurations] : configurations_by_priority)
     {
-        Poco::Util::AbstractConfiguration::Keys config_keys;
-        config.keys(config_prefix, config_keys);
-
-        for (const auto & config_key : config_keys)
+        for (const auto & replica_configuration : configurations)
         {
-            if (config_key.starts_with("replica"))
-            {
-                std::string replica_name = config_prefix + "." + config_key;
-                size_t priority = config.getInt(replica_name + ".priority", 0);
-
-                auto replica_host = config.getString(replica_name + ".host", host);
-                auto replica_port = config.getUInt(replica_name + ".port", port);
-                auto replica_user = config.getString(replica_name + ".user", user);
-                auto replica_password = config.getString(replica_name + ".password", password);
-
-                auto connection_string = formatConnectionString(db, replica_host, replica_port, replica_user, replica_password).first;
-                replicas_with_priority[priority].emplace_back(connection_string, pool_size);
-            }
+            auto connection_string = formatConnectionString(replica_configuration.database,
+                replica_configuration.host, replica_configuration.port, replica_configuration.username, replica_configuration.password).first;
+            replicas_with_priority[priority].emplace_back(connection_string, pool_size, getConnectionForLog(replica_configuration.host, replica_configuration.port));
         }
     }
-    else
-    {
-        auto connection_string = formatConnectionString(db, host, port, user, password).first;
-        replicas_with_priority[0].emplace_back(connection_string, pool_size);
-    }
 }
 
 PoolWithFailover::PoolWithFailover(
-        const std::string & database,
-        const RemoteDescription & addresses,
-        const std::string & user, const std::string & password,
+        const DB::StoragePostgreSQLConfiguration & configuration,
         size_t pool_size, size_t pool_wait_timeout_, size_t max_tries_)
     : pool_wait_timeout(pool_wait_timeout_)
     , max_tries(max_tries_)
@@ -73,11 +49,11 @@ PoolWithFailover::PoolWithFailover(
               pool_size, pool_wait_timeout, max_tries_);
 
     /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
-    for (const auto & [host, port] : addresses)
+    for (const auto & [host, port] : configuration.addresses)
     {
         LOG_DEBUG(&Poco::Logger::get("PostgreSQLPoolWithFailover"), "Adding address host: {}, port: {} to connection pool", host, port);
-        auto connection_string = formatConnectionString(database, host, port, user, password).first;
-        replicas_with_priority[0].emplace_back(connection_string, pool_size);
+        auto connection_string = formatConnectionString(configuration.database, host, port, configuration.username, configuration.password).first;
+        replicas_with_priority[0].emplace_back(connection_string, pool_size, getConnectionForLog(host, port));
     }
 }
 
@@ -85,6 +61,7 @@ ConnectionHolderPtr PoolWithFailover::get()
 {
     std::lock_guard lock(mutex);
 
+    DB::WriteBufferFromOwnString error_message;
     for (size_t try_idx = 0; try_idx < max_tries; ++try_idx)
     {
         for (auto & priority : replicas_with_priority)
@@ -115,6 +92,7 @@ ConnectionHolderPtr PoolWithFailover::get()
                 catch (const pqxx::broken_connection & pqxx_error)
                 {
                     LOG_ERROR(log, "Connection error: {}", pqxx_error.what());
+                    error_message << "Try " << try_idx + 1 << ". Connection to `" << replica.name_for_log << "` failed: " << pqxx_error.what() << "\n";
 
                     replica.pool->returnObject(std::move(connection));
                     continue;
@@ -136,7 +114,7 @@ ConnectionHolderPtr PoolWithFailover::get()
         }
     }
 
-    throw DB::Exception(DB::ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, "Unable to connect to any of the replicas");
+    throw DB::Exception(DB::ErrorCodes::POSTGRESQL_CONNECTION_FAILURE, error_message.str());
 }
 }
 
diff --git a/src/Core/PostgreSQL/PoolWithFailover.h b/src/Core/PostgreSQL/PoolWithFailover.h
index 9150262e242..c59010a5d43 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.h
+++ b/src/Core/PostgreSQL/PoolWithFailover.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
@@ -10,7 +8,8 @@
 #include "ConnectionHolder.h"
 #include <mutex>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace postgres
@@ -27,17 +26,13 @@ public:
     static constexpr inline auto POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES = 5;
 
     PoolWithFailover(
-        const Poco::Util::AbstractConfiguration & config,
-        const std::string & config_prefix,
+        const DB::ExternalDataSourcesConfigurationByPriority & configurations_by_priority,
         size_t pool_size = POSTGRESQL_POOL_DEFAULT_SIZE,
         size_t pool_wait_timeout = POSTGRESQL_POOL_WAIT_TIMEOUT,
         size_t max_tries_ = POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
 
     PoolWithFailover(
-        const std::string & database,
-        const RemoteDescription & addresses,
-        const std::string & user,
-        const std::string & password,
+        const DB::StoragePostgreSQLConfiguration & configuration,
         size_t pool_size = POSTGRESQL_POOL_DEFAULT_SIZE,
         size_t pool_wait_timeout = POSTGRESQL_POOL_WAIT_TIMEOUT,
         size_t max_tries_ = POSTGRESQL_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES);
@@ -51,9 +46,10 @@ private:
     {
         String connection_string;
         PoolPtr pool;
+        String name_for_log;
 
-        PoolHolder(const String & connection_string_, size_t pool_size)
-            : connection_string(connection_string_), pool(std::make_shared<Pool>(pool_size)) {}
+        PoolHolder(const String & connection_string_, size_t pool_size, const String & name_for_log_)
+            : connection_string(connection_string_), pool(std::make_shared<Pool>(pool_size)), name_for_log(name_for_log_) {}
     };
 
     /// Highest priority is 0, the bigger the number in map, the less the priority
diff --git a/src/Core/PostgreSQL/Utils.cpp b/src/Core/PostgreSQL/Utils.cpp
index ebfdacd0fea..60b13218202 100644
--- a/src/Core/PostgreSQL/Utils.cpp
+++ b/src/Core/PostgreSQL/Utils.cpp
@@ -3,6 +3,7 @@
 #if USE_LIBPQXX
 
 #include <IO/Operators.h>
+#include <IO/WriteHelpers.h>
 
 namespace postgres
 {
@@ -19,6 +20,21 @@ ConnectionInfo formatConnectionString(String dbname, String host, UInt16 port, S
     return std::make_pair(out.str(), host + ':' + DB::toString(port));
 }
 
+String getConnectionForLog(const String & host, UInt16 port)
+{
+    return host + ":" + DB::toString(port);
+}
+
+String formatNameForLogs(const String & postgres_database_name, const String & postgres_table_name)
+{
+    /// Logger for StorageMaterializedPostgreSQL - both db and table names.
+    /// Logger for PostgreSQLReplicationHandler and Consumer - either both db and table names or only db name.
+    assert(!postgres_database_name.empty());
+    if (postgres_table_name.empty())
+        return postgres_database_name;
+    return postgres_database_name + '.' + postgres_table_name;
+}
+
 }
 
 #endif
diff --git a/src/Core/PostgreSQL/Utils.h b/src/Core/PostgreSQL/Utils.h
index 4a58fcffb9a..1aa173d7137 100644
--- a/src/Core/PostgreSQL/Utils.h
+++ b/src/Core/PostgreSQL/Utils.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
-#include <pqxx/pqxx> // Y_IGNORE
+#include <pqxx/pqxx>
 #include <Core/Types.h>
 #include "Connection.h"
 #include <Common/Exception.h>
@@ -19,7 +17,13 @@ namespace pqxx
 
 namespace postgres
 {
+
 ConnectionInfo formatConnectionString(String dbname, String host, UInt16 port, String user, String password);
+
+String getConnectionForLog(const String & host, UInt16 port);
+
+String formatNameForLogs(const String & postgres_database_name, const String & postgres_table_name);
+
 }
 
 #endif
diff --git a/src/Core/PostgreSQL/insertPostgreSQLValue.cpp b/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
index 19560cec9ea..1c3230ec826 100644
--- a/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
+++ b/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
@@ -15,7 +15,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <Common/assert_cast.h>
-#include <pqxx/pqxx> // Y_IGNORE
+#include <pqxx/pqxx>
 
 
 namespace DB
@@ -110,7 +110,7 @@ void insertPostgreSQLValue(
             readDateTime64Text(time, 6, in, assert_cast<const DataTypeDateTime64 *>(data_type.get())->getTimeZone());
             if (time < 0)
                 time = 0;
-            assert_cast<ColumnDecimal<Decimal64> &>(column).insertValue(time);
+            assert_cast<DataTypeDateTime64::ColumnType &>(column).insertValue(time);
             break;
         }
         case ExternalResultDescription::ValueType::vtDecimal32: [[fallthrough]];
diff --git a/src/Core/PostgreSQL/insertPostgreSQLValue.h b/src/Core/PostgreSQL/insertPostgreSQLValue.h
index 4ed3eb95aac..dcdd9a4f9b8 100644
--- a/src/Core/PostgreSQL/insertPostgreSQLValue.h
+++ b/src/Core/PostgreSQL/insertPostgreSQLValue.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index 114abc0101f..7d34e23eed2 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <Access/AccessControlManager.h>
-#include <Access/User.h>
 #include <functional>
-#include <Interpreters/Context.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
-#include <common/logger_useful.h>
+#include <Interpreters/Session.h>
+#include <base/logger_useful.h>
 #include <Poco/Format.h>
 #include <Poco/RegularExpression.h>
 #include <Poco/Net/StreamSocket.h>
@@ -803,12 +801,13 @@ protected:
     static void setPassword(
         const String & user_name,
         const String & password,
-        ContextMutablePtr context,
+        Session & session,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
-        try {
-            context->setUser(user_name, password, address);
+        try
+        {
+            session.authenticate(user_name, password, address);
         }
         catch (const Exception &)
         {
@@ -822,7 +821,7 @@ protected:
 public:
     virtual void authenticate(
         const String & user_name,
-        ContextMutablePtr context,
+        Session & session,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) = 0;
 
@@ -836,11 +835,11 @@ class NoPasswordAuth : public AuthenticationMethod
 public:
     void authenticate(
         const String & user_name,
-        ContextMutablePtr context,
+        Session & session,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) override
     {
-        setPassword(user_name, "", context, mt, address);
+        return setPassword(user_name, "", session, mt, address);
     }
 
     Authentication::Type getType() const override
@@ -854,7 +853,7 @@ class CleartextPasswordAuth : public AuthenticationMethod
 public:
     void authenticate(
         const String & user_name,
-        ContextMutablePtr context,
+        Session & session,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address) override
     {
@@ -864,7 +863,7 @@ public:
         if (type == Messaging::FrontMessageType::PASSWORD_MESSAGE)
         {
             std::unique_ptr<Messaging::PasswordMessage> password = mt.receive<Messaging::PasswordMessage>();
-            setPassword(user_name, password->password, context, mt, address);
+            return setPassword(user_name, password->password, session, mt, address);
         }
         else
             throw Exception(
@@ -897,16 +896,14 @@ public:
 
     void authenticate(
         const String & user_name,
-        ContextMutablePtr context,
+        Session & session,
         Messaging::MessageTransport & mt,
         const Poco::Net::SocketAddress & address)
     {
-        auto user = context->getAccessControlManager().read<User>(user_name);
-        Authentication::Type user_auth_type = user->authentication.getType();
-
+        const Authentication::Type user_auth_type = session.getAuthenticationTypeOrLogInFailure(user_name);
         if (type_to_method.find(user_auth_type) != type_to_method.end())
         {
-            type_to_method[user_auth_type]->authenticate(user_name, context, mt, address);
+            type_to_method[user_auth_type]->authenticate(user_name, session, mt, address);
             mt.send(Messaging::AuthenticationOk(), true);
             LOG_DEBUG(log, "Authentication for user {} was successful.", user_name);
             return;
diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h
index 92e780104b5..fb18e1135a5 100644
--- a/src/Core/Protocol.h
+++ b/src/Core/Protocol.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
+#include <Core/ProtocolDefines.h>
 
 
 namespace DB
@@ -79,7 +80,8 @@ namespace Protocol
             ReadTaskRequest = 13,     /// String (UUID) describes a request for which next task is needed
                                       /// This is such an inverted logic, where server sends requests
                                       /// And client returns back response
-            MAX = ReadTaskRequest,
+            ProfileEvents = 14,       /// Packet with profile events from server.
+            MAX = ProfileEvents,
         };
 
         /// NOTE: If the type of packet argument would be Enum, the comparison packet >= 0 && packet < 10
@@ -102,7 +104,8 @@ namespace Protocol
                 "Log",
                 "TableColumns",
                 "PartUUIDs",
-                "ReadTaskRequest"
+                "ReadTaskRequest",
+                "ProfileEvents",
             };
             return packet <= MAX
                 ? data[packet]
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
new file mode 100644
index 00000000000..289917f4bdb
--- /dev/null
+++ b/src/Core/ProtocolDefines.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#define DBMS_MIN_REVISION_WITH_CLIENT_INFO 54032
+#define DBMS_MIN_REVISION_WITH_SERVER_TIMEZONE 54058
+#define DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO 54060
+#define DBMS_MIN_REVISION_WITH_TABLES_STATUS 54226
+#define DBMS_MIN_REVISION_WITH_TIME_ZONE_PARAMETER_IN_DATETIME_DATA_TYPE 54337
+#define DBMS_MIN_REVISION_WITH_SERVER_DISPLAY_NAME 54372
+#define DBMS_MIN_REVISION_WITH_VERSION_PATCH 54401
+#define DBMS_MIN_REVISION_WITH_SERVER_LOGS 54406
+#define DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA 54415
+/// Minimum revision with exactly the same set of aggregation methods and rules to select them.
+/// Two-level (bucketed) aggregation is incompatible if servers are inconsistent in these rules
+/// (keys will be placed in different buckets and result will not be fully aggregated).
+#define DBMS_MIN_REVISION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD 54456
+#define DBMS_MIN_MAJOR_VERSION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD 21
+#define DBMS_MIN_MINOR_VERSION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD 4
+#define DBMS_MIN_REVISION_WITH_COLUMN_DEFAULTS_METADATA 54410
+
+#define DBMS_MIN_REVISION_WITH_LOW_CARDINALITY_TYPE 54405
+#define DBMS_MIN_REVISION_WITH_CLIENT_WRITE_INFO 54420
+
+/// Minimum revision supporting SettingsBinaryFormat::STRINGS.
+#define DBMS_MIN_REVISION_WITH_SETTINGS_SERIALIZED_AS_STRINGS 54429
+#define DBMS_MIN_REVISION_WITH_SCALARS 54429
+
+/// Minimum revision supporting OpenTelemetry
+#define DBMS_MIN_REVISION_WITH_OPENTELEMETRY 54442
+
+
+#define DBMS_CLUSTER_PROCESSING_PROTOCOL_VERSION 1
+
+/// Minimum revision supporting interserver secret.
+#define DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET 54441
+
+#define DBMS_MIN_REVISION_WITH_X_FORWARDED_FOR_IN_CLIENT_INFO 54443
+#define DBMS_MIN_REVISION_WITH_REFERER_IN_CLIENT_INFO 54447
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_DISTRIBUTED_DEPTH 54448
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS 54450
+
+/// Version of ClickHouse TCP protocol.
+///
+/// Should be incremented manually on protocol changes.
+///
+/// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
+/// later is just a number for server version (one number instead of commit SHA)
+/// for simplicity (sometimes it may be more convenient in some use cases).
+#define DBMS_TCP_PROTOCOL_VERSION 54450
+
+#define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
diff --git a/src/Core/QualifiedTableName.h b/src/Core/QualifiedTableName.h
index 453d55d85c7..4642465f461 100644
--- a/src/Core/QualifiedTableName.h
+++ b/src/Core/QualifiedTableName.h
@@ -2,11 +2,20 @@
 
 #include <string>
 #include <tuple>
+#include <optional>
+#include <Common/Exception.h>
 #include <Common/SipHash.h>
+#include <Common/quoteString.h>
+#include <fmt/format.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int SYNTAX_ERROR;
+}
+
 //TODO replace with StorageID
 struct QualifiedTableName
 {
@@ -30,6 +39,62 @@ struct QualifiedTableName
         hash_state.update(table.data(), table.size());
         return hash_state.get64();
     }
+
+    std::vector<std::string> getParts() const
+    {
+        if (database.empty())
+            return {table};
+        else
+            return {database, table};
+    }
+
+    std::string getFullName() const
+    {
+        if (database.empty())
+            return table;
+        else
+            return database + '.' + table;
+    }
+
+    /// NOTE: It's different from compound identifier parsing and does not support escaping and dots in name.
+    /// Usually it's better to use ParserIdentifier instead,
+    /// but we parse DDL dictionary name (and similar things) this way for historical reasons.
+    static std::optional<QualifiedTableName> tryParseFromString(const String & maybe_qualified_name)
+    {
+        if (maybe_qualified_name.empty())
+            return {};
+
+        /// Do not allow dot at the beginning and at the end
+        auto pos = maybe_qualified_name.find('.');
+        if (pos == 0 || pos == (maybe_qualified_name.size() - 1))
+            return {};
+
+        QualifiedTableName name;
+        if (pos == std::string::npos)
+        {
+            name.table = std::move(maybe_qualified_name);
+        }
+        else if (maybe_qualified_name.find('.', pos + 1) != std::string::npos)
+        {
+            /// Do not allow multiple dots
+            return {};
+        }
+        else
+        {
+            name.database = maybe_qualified_name.substr(0, pos);
+            name.table = maybe_qualified_name.substr(pos + 1);
+        }
+
+        return name;
+    }
+
+    static QualifiedTableName parseFromString(const String & maybe_qualified_name)
+    {
+        auto name = tryParseFromString(maybe_qualified_name);
+        if (!name)
+            throw Exception(ErrorCodes::SYNTAX_ERROR, "Invalid qualified name: {}", maybe_qualified_name);
+        return *name;
+    }
 };
 
 }
@@ -47,5 +112,23 @@ template <> struct hash<DB::QualifiedTableName>
         return qualified_table.hash();
     }
 };
-
 }
+
+namespace fmt
+{
+    template <>
+    struct formatter<DB::QualifiedTableName>
+    {
+        constexpr auto parse(format_parse_context & ctx)
+        {
+            return ctx.begin();
+        }
+
+        template <typename FormatContext>
+        auto format(const DB::QualifiedTableName & name, FormatContext & ctx)
+        {
+            return format_to(ctx.out(), "{}.{}", DB::backQuoteIfNeed(name.database), DB::backQuoteIfNeed(name.table));
+        }
+    };
+}
+
diff --git a/src/Core/QueryProcessingStage.h b/src/Core/QueryProcessingStage.h
index 7ccaa17eaed..ce6949c0dea 100644
--- a/src/Core/QueryProcessingStage.h
+++ b/src/Core/QueryProcessingStage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Core/ServerUUID.cpp b/src/Core/ServerUUID.cpp
new file mode 100644
index 00000000000..ffb69707f72
--- /dev/null
+++ b/src/Core/ServerUUID.cpp
@@ -0,0 +1,56 @@
+#include <Core/ServerUUID.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <base/logger_useful.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_CREATE_FILE;
+}
+
+void ServerUUID::load(const fs::path & server_uuid_file, Poco::Logger * log)
+{
+    /// Write a uuid file containing a unique uuid if the file doesn't already exist during server start.
+
+    if (fs::exists(server_uuid_file))
+    {
+        try
+        {
+            UUID uuid;
+            ReadBufferFromFile in(server_uuid_file);
+            readUUIDText(uuid, in);
+            assertEOF(in);
+            server_uuid = uuid;
+            return;
+        }
+        catch (...)
+        {
+            /// As for now it's ok to just overwrite it, because persistency in not essential.
+            LOG_ERROR(log, "Cannot read server UUID from file {}: {}. Will overwrite it",
+                      server_uuid_file.string(), getCurrentExceptionMessage(true));
+        }
+    }
+
+    try
+    {
+        UUID new_uuid = UUIDHelpers::generateV4();
+        auto uuid_str = toString(new_uuid);
+        WriteBufferFromFile out(server_uuid_file);
+        out.write(uuid_str.data(), uuid_str.size());
+        out.sync();
+        out.finalize();
+        server_uuid = new_uuid;
+    }
+    catch (...)
+    {
+        throw Exception(ErrorCodes::CANNOT_CREATE_FILE, "Caught Exception {} while writing the Server UUID file {}",
+                        getCurrentExceptionMessage(false), server_uuid_file.string());
+    }
+}
+
+}
diff --git a/src/Core/ServerUUID.h b/src/Core/ServerUUID.h
new file mode 100644
index 00000000000..36bbf0e6315
--- /dev/null
+++ b/src/Core/ServerUUID.h
@@ -0,0 +1,26 @@
+#pragma once
+#include <Core/UUID.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
+namespace Poco
+{
+    class Logger;
+}
+
+namespace DB
+{
+
+class ServerUUID
+{
+    inline static UUID server_uuid = UUIDHelpers::Nil;
+
+public:
+    /// Returns persistent UUID of current clickhouse-server or clickhouse-keeper instance.
+    static UUID get() { return server_uuid; }
+
+    /// Loads server UUID from file or creates new one. Should be called on daemon startup.
+    static void load(const fs::path & server_uuid_file, Poco::Logger * log);
+};
+
+}
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 20404089210..e6f685a0650 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -3,6 +3,7 @@
 #include <Core/BaseSettings.h>
 #include <Core/SettingsEnums.h>
 #include <Core/Defines.h>
+#include <IO/ReadSettings.h>
 
 
 namespace Poco::Util
@@ -47,17 +48,17 @@ class IColumn;
     M(MaxThreads, max_alter_threads, 0, "The maximum number of threads to execute the ALTER requests. By default, it is determined automatically.", 0) \
     M(UInt64, max_read_buffer_size, DBMS_DEFAULT_BUFFER_SIZE, "The maximum size of the buffer to read from the filesystem.", 0) \
     M(UInt64, max_distributed_connections, 1024, "The maximum number of connections for distributed processing of one query (should be greater than max_threads).", 0) \
-    M(UInt64, max_query_size, 262144, "Which part of the query can be read into RAM for parsing (the remaining data for INSERT, if any, is read later)", 0) \
+    M(UInt64, max_query_size, DBMS_DEFAULT_MAX_QUERY_SIZE, "Which part of the query can be read into RAM for parsing (the remaining data for INSERT, if any, is read later)", 0) \
     M(UInt64, interactive_delay, 100000, "The interval in microseconds to check if the request is cancelled, and to send progress info.", 0) \
     M(Seconds, connect_timeout, DBMS_DEFAULT_CONNECT_TIMEOUT_SEC, "Connection timeout if there are no replicas.", 0) \
-    M(Milliseconds, connect_timeout_with_failover_ms, DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_MS, "Connection timeout for selecting first healthy replica.", 0) \
-    M(Milliseconds, connect_timeout_with_failover_secure_ms, DBMS_DEFAULT_CONNECT_TIMEOUT_WITH_FAILOVER_SECURE_MS, "Connection timeout for selecting first healthy replica (for secure connections).", 0) \
+    M(Milliseconds, connect_timeout_with_failover_ms, 50, "Connection timeout for selecting first healthy replica.", 0) \
+    M(Milliseconds, connect_timeout_with_failover_secure_ms, 100, "Connection timeout for selecting first healthy replica (for secure connections).", 0) \
     M(Seconds, receive_timeout, DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, "", 0) \
     M(Seconds, send_timeout, DBMS_DEFAULT_SEND_TIMEOUT_SEC, "", 0) \
-    M(Seconds, drain_timeout, DBMS_DEFAULT_DRAIN_TIMEOUT_SEC, "", 0) \
-    M(Seconds, tcp_keep_alive_timeout, 0, "The time in seconds the connection needs to remain idle before TCP starts sending keepalive probes", 0) \
-    M(Milliseconds, hedged_connection_timeout_ms, DBMS_DEFAULT_HEDGED_CONNECTION_TIMEOUT_MS, "Connection timeout for establishing connection with replica for Hedged requests", 0) \
-    M(Milliseconds, receive_data_timeout_ms, DBMS_DEFAULT_RECEIVE_DATA_TIMEOUT_MS, "Connection timeout for receiving first packet of data or packet with positive progress from replica", 0) \
+    M(Seconds, drain_timeout, 3, "", 0) \
+    M(Seconds, tcp_keep_alive_timeout, 290 /* less than DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC */, "The time in seconds the connection needs to remain idle before TCP starts sending keepalive probes", 0) \
+    M(Milliseconds, hedged_connection_timeout_ms, 100, "Connection timeout for establishing connection with replica for Hedged requests", 0) \
+    M(Milliseconds, receive_data_timeout_ms, 2000, "Connection timeout for receiving first packet of data or packet with positive progress from replica", 0) \
     M(Bool, use_hedged_requests, true, "Use hedged requests for distributed queries", 0) \
     M(Bool, allow_changing_replica_until_first_data_packet, false, "Allow HedgedConnections to change replica until receiving first data packet", 0) \
     M(Milliseconds, queue_max_wait_ms, 0, "The wait time in the request queue, if the number of concurrent requests exceeds the maximum.", 0) \
@@ -67,20 +68,23 @@ class IColumn;
     M(Milliseconds, rabbitmq_max_wait_ms, 5000, "The wait time for reading from RabbitMQ before retry.", 0) \
     M(UInt64, poll_interval, DBMS_DEFAULT_POLL_INTERVAL, "Block at the query wait loop on the server for the specified number of seconds.", 0) \
     M(UInt64, idle_connection_timeout, 3600, "Close idle TCP connections after specified number of seconds.", 0) \
-    M(UInt64, distributed_connections_pool_size, DBMS_DEFAULT_DISTRIBUTED_CONNECTIONS_POOL_SIZE, "Maximum number of connections with one remote server in the pool.", 0) \
+    M(UInt64, distributed_connections_pool_size, 1024, "Maximum number of connections with one remote server in the pool.", 0) \
     M(UInt64, connections_with_failover_max_tries, DBMS_CONNECTION_POOL_WITH_FAILOVER_DEFAULT_MAX_TRIES, "The maximum number of attempts to connect to replicas.", 0) \
-    M(UInt64, s3_min_upload_part_size, 512*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
-    M(UInt64, s3_max_single_part_upload_size, 64*1024*1024, "The maximum size of object to upload using singlepart upload to S3.", 0) \
+    M(UInt64, s3_min_upload_part_size, 32*1024*1024, "The minimum size of part to upload during multipart upload to S3.", 0) \
+    M(UInt64, s3_max_single_part_upload_size, 32*1024*1024, "The maximum size of object to upload using singlepart upload to S3.", 0) \
     M(UInt64, s3_max_single_read_retries, 4, "The maximum number of retries during single S3 read.", 0) \
     M(UInt64, s3_max_redirects, 10, "Max number of S3 redirects hops allowed.", 0) \
     M(UInt64, s3_max_connections, 1024, "The maximum number of connections per server.", 0) \
+    M(UInt64, hsts_max_age, 0, "Expired time for hsts. 0 means disable HSTS.", 0) \
     M(Bool, extremes, false, "Calculate minimums and maximums of the result columns. They can be output in JSON-formats.", IMPORTANT) \
     M(Bool, use_uncompressed_cache, false, "Whether to use the cache of uncompressed blocks.", 0) \
     M(Bool, replace_running_query, false, "Whether the running request should be canceled with the same id as the new one.", 0) \
     M(UInt64, background_buffer_flush_schedule_pool_size, 16, "Number of threads performing background flush for tables with Buffer engine. Only has meaning at server startup.", 0) \
-    M(UInt64, background_pool_size, 16, "Number of threads performing background work for tables (for example, merging in merge tree). Only has meaning at server startup.", 0) \
+    M(UInt64, background_pool_size, 16, "Number of threads to perform merges and mutations in background. Only has meaning at server startup.", 0) \
+    M(Float, background_merges_mutations_concurrency_ratio, 2, "Ratio between a number of how many operations could be processed and a number threads to process them. Only has meaning at server startup.", 0) \
     M(UInt64, background_move_pool_size, 8, "Number of threads performing background moves for tables. Only has meaning at server startup.", 0) \
     M(UInt64, background_fetches_pool_size, 8, "Number of threads performing background fetches for replicated tables. Only has meaning at server startup.", 0) \
+    M(UInt64, background_common_pool_size, 8, "Number of threads for some lightweight tasks for replicated tables (like cleaning old parts etc.). Only has meaning at server startup.", 0) \
     M(UInt64, background_schedule_pool_size, 128, "Number of threads performing background tasks for replicated tables, dns cache updates. Only has meaning at server startup.", 0) \
     M(UInt64, background_message_broker_schedule_pool_size, 16, "Number of threads performing background tasks for message streaming. Only has meaning at server startup.", 0) \
     M(UInt64, background_distributed_schedule_pool_size, 16, "Number of threads performing background tasks for distributed sends. Only has meaning at server startup.", 0) \
@@ -97,7 +101,7 @@ class IColumn;
     M(Bool, optimize_move_to_prewhere_if_final, false, "If query has `FINAL`, the optimization `move_to_prewhere` is not always correct and it is enabled only if both settings `optimize_move_to_prewhere` and `optimize_move_to_prewhere_if_final` are turned on", 0) \
     \
     M(UInt64, replication_alter_partitions_sync, 1, "Wait for actions to manipulate the partitions. 0 - do not wait, 1 - wait for execution only of itself, 2 - wait for everyone.", 0) \
-    M(UInt64, replication_alter_columns_timeout, 60, "Wait for actions to change the table structure within the specified number of seconds. 0 - wait unlimited time.", 0) \
+    M(Int64, replication_wait_for_inactive_replica_timeout, 120, "Wait for inactive replica to execute ALTER/OPTIMIZE. Time in seconds, 0 - do not wait, negative - wait for unlimited time.", 0) \
     \
     M(LoadBalancing, load_balancing, LoadBalancing::RANDOM, "Which replicas (among healthy replicas) to preferably send a query to (on the first attempt) for distributed processing.", 0) \
     M(UInt64, load_balancing_first_offset, 0, "Which replica to preferably send a query when FIRST_OR_RANDOM load balancing strategy is used.", 0) \
@@ -114,17 +118,18 @@ class IColumn;
     M(UInt64, group_by_two_level_threshold_bytes, 50000000, "From what size of the aggregation state in bytes, a two-level aggregation begins to be used. 0 - the threshold is not set. Two-level aggregation is used when at least one of the thresholds is triggered.", 0) \
     M(Bool, distributed_aggregation_memory_efficient, true, "Is the memory-saving mode of distributed aggregation enabled.", 0) \
     M(UInt64, aggregation_memory_efficient_merge_threads, 0, "Number of threads to use for merge intermediate aggregation results in memory efficient mode. When bigger, then more memory is consumed. 0 means - same as 'max_threads'.", 0) \
+    M(Bool, enable_positional_arguments, false, "Enable positional arguments in ORDER BY, GROUP BY and LIMIT BY", 0) \
     \
     M(UInt64, max_parallel_replicas, 1, "The maximum number of replicas of each shard used when the query is executed. For consistency (to get different parts of the same partition), this option only works for the specified sampling key. The lag of the replicas is not controlled.", 0) \
     M(UInt64, parallel_replicas_count, 0, "", 0) \
     M(UInt64, parallel_replica_offset, 0, "", 0) \
     \
-    M(Bool, skip_unavailable_shards, false, "If 1, ClickHouse silently skips unavailable shards and nodes unresolvable through DNS. Shard is marked as unavailable when none of the replicas can be reached.", 0) \
+    M(Bool, skip_unavailable_shards, false, "If true, ClickHouse silently skips unavailable shards and nodes unresolvable through DNS. Shard is marked as unavailable when none of the replicas can be reached.", 0) \
     \
     M(UInt64, parallel_distributed_insert_select, 0, "Process distributed INSERT SELECT query in the same cluster on local tables on every shard, if 1 SELECT is executed on each shard, if 2 SELECT and INSERT is executed on each shard", 0) \
     M(UInt64, distributed_group_by_no_merge, 0, "If 1, Do not merge aggregation states from different servers for distributed queries (shards will process query up to the Complete stage, initiator just proxies the data from the shards). If 2 the initiator will apply ORDER BY and LIMIT stages (it is not in case when shard process query up to the Complete stage)", 0) \
-    M(UInt64, distributed_push_down_limit, 0, "If 1, LIMIT will be applied on each shard separatelly. Usually you don't need to use it, since this will be done automatically if it is possible, i.e. for simple query SELECT FROM LIMIT.", 0) \
-    M(Bool, optimize_distributed_group_by_sharding_key, false, "Optimize GROUP BY sharding_key queries (by avoiding costly aggregation on the initiator server).", 0) \
+    M(UInt64, distributed_push_down_limit, 1, "If 1, LIMIT will be applied on each shard separatelly. Usually you don't need to use it, since this will be done automatically if it is possible, i.e. for simple query SELECT FROM LIMIT.", 0) \
+    M(Bool, optimize_distributed_group_by_sharding_key, true, "Optimize GROUP BY sharding_key queries (by avoiding costly aggregation on the initiator server).", 0) \
     M(UInt64, optimize_skip_unused_shards_limit, 1000, "Limit for number of sharding key values, turns off optimize_skip_unused_shards if the limit is reached", 0) \
     M(Bool, optimize_skip_unused_shards, false, "Assumes that data is distributed by sharding_key. Optimization to skip unused shards if SELECT query filters by sharding_key.", 0) \
     M(Bool, optimize_skip_unused_shards_rewrite_in, true, "Rewrite IN in query for remote shards to exclude values that does not belong to the shard (requires optimize_skip_unused_shards)", 0) \
@@ -144,6 +149,8 @@ class IColumn;
     M(UInt64, merge_tree_coarse_index_granularity, 8, "If the index segment can contain the required keys, divide it into as many parts and recursively check them.", 0) \
     M(UInt64, merge_tree_max_rows_to_use_cache, (128 * 8192), "The maximum number of rows per request, to use the cache of uncompressed data. If the request is large, the cache is not used. (For large queries not to flush out the cache.)", 0) \
     M(UInt64, merge_tree_max_bytes_to_use_cache, (192 * 10 * 1024 * 1024), "The maximum number of bytes per request, to use the cache of uncompressed data. If the request is large, the cache is not used. (For large queries not to flush out the cache.)", 0) \
+    M(UInt64, merge_tree_clear_old_temporary_directories_interval_seconds, 60, "The period of executing the clear old temporary directories operation in background.", 0) \
+    M(UInt64, merge_tree_clear_old_parts_interval_seconds, 1, "The period of executing the clear old parts operation in background.", 0) \
     M(Bool, do_not_merge_across_partitions_select_final, false, "Merge parts only in one partition in select final", 0) \
     \
     M(UInt64, mysql_max_rows_to_insert, 65536, "The maximum number of rows in MySQL batch insertion of the MySQL storage engine", 0) \
@@ -154,8 +161,9 @@ class IColumn;
     M(UInt64, min_bytes_to_use_mmap_io, 0, "The minimum number of bytes for reading the data with mmap option during SELECT queries execution. 0 - disabled.", 0) \
     M(Bool, checksum_on_read, true, "Validate checksums on reading. It is enabled by default and should be always enabled in production. Please do not expect any benefits in disabling this setting. It may only be used for experiments and benchmarks. The setting only applicable for tables of MergeTree family. Checksums are always validated for other table engines and when receiving data over network.", 0) \
     \
-    M(Bool, force_index_by_date, 0, "Throw an exception if there is a partition key in a table, and it is not used.", 0) \
-    M(Bool, force_primary_key, 0, "Throw an exception if there is primary key in a table, and it is not used.", 0) \
+    M(Bool, force_index_by_date, false, "Throw an exception if there is a partition key in a table, and it is not used.", 0) \
+    M(Bool, force_primary_key, false, "Throw an exception if there is primary key in a table, and it is not used.", 0) \
+    M(Bool, use_skip_indexes, true, "Use data skipping indexes during query execution.", 0) \
     M(String, force_data_skipping_indices, "", "Comma separated list of strings or literals with the name of the data skipping indices that should be used during query execution, otherwise an exception will be thrown.", 0) \
     \
     M(Float, max_streams_to_max_threads_ratio, 1, "Allows you to use more sources than the number of threads - to more evenly distribute work across threads. It is assumed that this is a temporary solution, since it will be possible in the future to make the number of sources equal to the number of threads, but for each source to dynamically select available work for itself.", 0) \
@@ -168,10 +176,12 @@ class IColumn;
     M(UInt64, priority, 0, "Priority of the query. 1 - the highest, higher value - lower priority; 0 - do not use priorities.", 0) \
     M(Int64, os_thread_priority, 0, "If non zero - set corresponding 'nice' value for query processing threads. Can be used to adjust query priority for OS scheduler.", 0) \
     \
-    M(Bool, log_queries, 1, "Log requests and write the log to the system table.", 0) \
+    M(Bool, log_queries, true, "Log requests and write the log to the system table.", 0) \
+    M(Bool, log_formatted_queries, false, "Log formatted queries and write the log to the system table.", 0) \
     M(LogQueriesType, log_queries_min_type, QueryLogElementType::QUERY_START, "Minimal type in query_log to log, possible values (from low to high): QUERY_START, QUERY_FINISH, EXCEPTION_BEFORE_START, EXCEPTION_WHILE_PROCESSING.", 0) \
-    M(Milliseconds, log_queries_min_query_duration_ms, 0, "Minimal time for the query to run, to get to the query_log/query_thread_log.", 0) \
+    M(Milliseconds, log_queries_min_query_duration_ms, 0, "Minimal time for the query to run, to get to the query_log/query_thread_log/query_views_log.", 0) \
     M(UInt64, log_queries_cut_to_length, 100000, "If query length is greater than specified threshold (in bytes), then cut query when writing to query log. Also limit length of printed query in ordinary text log.", 0) \
+    M(Float, log_queries_probability, 1., "Log queries with the specified probabality.", 0) \
     \
     M(DistributedProductMode, distributed_product_mode, DistributedProductMode::DENY, "How are distributed subqueries performed inside IN or JOIN sections?", IMPORTANT) \
     \
@@ -194,10 +204,10 @@ class IColumn;
     \
     M(Float, memory_tracker_fault_probability, 0., "For testing of `exception safety` - throw an exception every time you allocate memory with the specified probability.", 0) \
     \
-    M(Bool, enable_http_compression, 0, "Compress the result if the client over HTTP said that it understands data compressed by gzip or deflate.", 0) \
+    M(Bool, enable_http_compression, false, "Compress the result if the client over HTTP said that it understands data compressed by gzip or deflate.", 0) \
     M(Int64, http_zlib_compression_level, 3, "Compression level - used if the client on HTTP said that it understands data compressed by gzip or deflate.", 0) \
     \
-    M(Bool, http_native_compression_disable_checksumming_on_decompress, 0, "If you uncompress the POST data from the client compressed by the native format, do not check the checksum.", 0) \
+    M(Bool, http_native_compression_disable_checksumming_on_decompress, false, "If you uncompress the POST data from the client compressed by the native format, do not check the checksum.", 0) \
     \
     M(String, count_distinct_implementation, "uniqExact", "What aggregate function to use for implementation of count(DISTINCT ...)", 0) \
     \
@@ -211,9 +221,9 @@ class IColumn;
     \
     M(UInt64, http_headers_progress_interval_ms, 100, "Do not send HTTP headers X-ClickHouse-Progress more frequently than at each specified interval.", 0) \
     \
-    M(Bool, fsync_metadata, 1, "Do fsync after changing metadata for tables and databases (.sql files). Could be disabled in case of poor latency on server with high load of DDL queries and high load of disk subsystem.", 0) \
+    M(Bool, fsync_metadata, true, "Do fsync after changing metadata for tables and databases (.sql files). Could be disabled in case of poor latency on server with high load of DDL queries and high load of disk subsystem.", 0) \
     \
-    M(Bool, join_use_nulls, 0, "Use NULLs for non-joined rows of outer JOINs for types that can be inside Nullable. If false, use default value of corresponding columns data type.", IMPORTANT) \
+    M(Bool, join_use_nulls, false, "Use NULLs for non-joined rows of outer JOINs for types that can be inside Nullable. If false, use default value of corresponding columns data type.", IMPORTANT) \
     \
     M(JoinStrictness, join_default_strictness, JoinStrictness::ALL, "Set default strictness in JOIN query. Possible values: empty string, 'ANY', 'ALL'. If empty, query without strictness will throw exception.", 0) \
     M(Bool, any_join_distinct_right_table_keys, false, "Enable old ANY JOIN logic with many-to-one left-to-right table keys mapping for all ANY JOINs. It leads to confusing not equal results for 't1 ANY LEFT JOIN t2' and 't2 ANY RIGHT JOIN t1'. ANY RIGHT JOIN needs one-to-many keys mapping to be consistent with LEFT one.", IMPORTANT) \
@@ -221,7 +231,7 @@ class IColumn;
     M(UInt64, preferred_block_size_bytes, 1000000, "", 0) \
     \
     M(UInt64, max_replica_delay_for_distributed_queries, 300, "If set, distributed queries of Replicated tables will choose servers with replication delay in seconds less than the specified value (not inclusive). Zero means do not take delay into account.", 0) \
-    M(Bool, fallback_to_stale_replicas_for_distributed_queries, 1, "Suppose max_replica_delay_for_distributed_queries is set and all replicas for the queried table are stale. If this setting is enabled, the query will be performed anyway, otherwise the error will be reported.", 0) \
+    M(Bool, fallback_to_stale_replicas_for_distributed_queries, true, "Suppose max_replica_delay_for_distributed_queries is set and all replicas for the queried table are stale. If this setting is enabled, the query will be performed anyway, otherwise the error will be reported.", 0) \
     M(UInt64, preferred_max_column_in_block_size_bytes, 0, "Limit on max column size in block while reading. Helps to decrease cache misses count. Should be close to L2 cache size.", 0) \
     \
     M(Bool, insert_distributed_sync, false, "If setting is enabled, insert query into distributed waits until data will be sent to all nodes in cluster.", 0) \
@@ -237,7 +247,7 @@ class IColumn;
     /** Settings for testing connection collector */ \
     M(Milliseconds, sleep_in_receive_cancel_ms, 0, "Time to sleep in receiving cancel in TCPHandler", 0) \
     \
-    M(Bool, insert_allow_materialized_columns, 0, "If setting is enabled, Allow materialized columns in INSERT.", 0) \
+    M(Bool, insert_allow_materialized_columns, false, "If setting is enabled, Allow materialized columns in INSERT.", 0) \
     M(Seconds, http_connection_timeout, DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT, "HTTP connection timeout.", 0) \
     M(Seconds, http_send_timeout, DEFAULT_HTTP_READ_BUFFER_TIMEOUT, "HTTP send timeout", 0) \
     M(Seconds, http_receive_timeout, DEFAULT_HTTP_READ_BUFFER_TIMEOUT, "HTTP receive timeout", 0) \
@@ -249,12 +259,12 @@ class IColumn;
     M(Bool, use_index_for_in_with_subqueries, true, "Try using an index if there is a subquery or a table expression on the right side of the IN operator.", 0) \
     M(Bool, joined_subquery_requires_alias, true, "Force joined subqueries and table functions to have aliases for correct name qualification.", 0) \
     M(Bool, empty_result_for_aggregation_by_empty_set, false, "Return empty result when aggregating without keys on empty set.", 0) \
+    M(Bool, empty_result_for_aggregation_by_constant_keys_on_empty_set, true, "Return empty result when aggregating by constant keys on empty set.", 0) \
     M(Bool, allow_distributed_ddl, true, "If it is set to true, then a user is allowed to executed distributed DDL queries.", 0) \
     M(Bool, allow_suspicious_codecs, false, "If it is set to true, allow to specify meaningless compression codecs.", 0) \
     M(Bool, allow_experimental_codecs, false, "If it is set to true, allow to specify experimental compression codecs (but we don't have those yet and this option does nothing).", 0) \
-    M(UInt64, odbc_max_field_size, 1024, "Max size of filed can be read from ODBC dictionary. Long strings are truncated.", 0) \
-    M(UInt64, query_profiler_real_time_period_ns, 1000000000, "Period for real clock timer of query profiler (in nanoseconds). Set 0 value to turn off the real clock query profiler. Recommended value is at least 10000000 (100 times a second) for single queries or 1000000000 (once a second) for cluster-wide profiling.", 0) \
-    M(UInt64, query_profiler_cpu_time_period_ns, 1000000000, "Period for CPU clock timer of query profiler (in nanoseconds). Set 0 value to turn off the CPU clock query profiler. Recommended value is at least 10000000 (100 times a second) for single queries or 1000000000 (once a second) for cluster-wide profiling.", 0) \
+    M(UInt64, query_profiler_real_time_period_ns, QUERY_PROFILER_DEFAULT_SAMPLE_RATE_NS, "Period for real clock timer of query profiler (in nanoseconds). Set 0 value to turn off the real clock query profiler. Recommended value is at least 10000000 (100 times a second) for single queries or 1000000000 (once a second) for cluster-wide profiling.", 0) \
+    M(UInt64, query_profiler_cpu_time_period_ns, QUERY_PROFILER_DEFAULT_SAMPLE_RATE_NS, "Period for CPU clock timer of query profiler (in nanoseconds). Set 0 value to turn off the CPU clock query profiler. Recommended value is at least 10000000 (100 times a second) for single queries or 1000000000 (once a second) for cluster-wide profiling.", 0) \
     M(Bool, metrics_perf_events_enabled, false, "If enabled, some of the perf events will be measured throughout queries' execution.", 0) \
     M(String, metrics_perf_events_list, "", "Comma separated list of perf metrics that will be measured throughout queries' execution. Empty means all events. See PerfEventInfo in sources for the available events.", 0) \
     M(Float, opentelemetry_start_trace_probability, 0., "Probability to start an OpenTelemetry trace for an incoming query.", 0) \
@@ -341,7 +351,7 @@ class IColumn;
     M(UInt64, max_memory_usage, 0, "Maximum memory usage for processing of single query. Zero means unlimited.", 0) \
     M(UInt64, max_memory_usage_for_user, 0, "Maximum memory usage for processing all concurrently running queries for the user. Zero means unlimited.", 0) \
     M(UInt64, max_untracked_memory, (4 * 1024 * 1024), "Small allocations and deallocations are grouped in thread local variable and tracked or profiled only when amount (in absolute value) becomes larger than specified value. If the value is higher than 'memory_profiler_step' it will be effectively lowered to 'memory_profiler_step'.", 0) \
-    M(UInt64, memory_profiler_step, 0, "Whenever query memory usage becomes larger than every next step in number of bytes the memory profiler will collect the allocating stack trace. Zero means disabled memory profiler. Values lower than a few megabytes will slow down query processing.", 0) \
+    M(UInt64, memory_profiler_step, (4 * 1024 * 1024), "Whenever query memory usage becomes larger than every next step in number of bytes the memory profiler will collect the allocating stack trace. Zero means disabled memory profiler. Values lower than a few megabytes will slow down query processing.", 0) \
     M(Float, memory_profiler_sample_probability, 0., "Collect random allocations and deallocations and write them into system.trace_log with 'MemorySample' trace_type. The probability is for every alloc/free regardless to the size of the allocation. Note that sampling happens only when the amount of untracked memory exceeds 'max_untracked_memory'. You may want to set 'max_untracked_memory' to 0 for extra fine grained sampling.", 0) \
     \
     M(UInt64, max_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for a query. Zero means unlimited.", 0) \
@@ -349,34 +359,41 @@ class IColumn;
     M(UInt64, max_network_bandwidth_for_user, 0, "The maximum speed of data exchange over the network in bytes per second for all concurrently running user queries. Zero means unlimited.", 0)\
     M(UInt64, max_network_bandwidth_for_all_users, 0, "The maximum speed of data exchange over the network in bytes per second for all concurrently running queries. Zero means unlimited.", 0) \
     \
-    M(Bool, log_profile_events, true, "Log query performance statistics into the query_log and query_thread_log.", 0) \
+    M(UInt64, max_backup_threads, 0, "The maximum number of threads to execute a BACKUP or RESTORE request. By default, it is determined automatically.", 0) \
+    \
+    M(Bool, log_profile_events, true, "Log query performance statistics into the query_log, query_thread_log and query_views_log.", 0) \
     M(Bool, log_query_settings, true, "Log query settings into the query_log.", 0) \
     M(Bool, log_query_threads, true, "Log query threads into system.query_thread_log table. This setting have effect only when 'log_queries' is true.", 0) \
+    M(Bool, log_query_views, true, "Log query dependent views into system.query_views_log table. This setting have effect only when 'log_queries' is true.", 0) \
     M(String, log_comment, "", "Log comment into system.query_log table and server log. It can be set to arbitrary string no longer than max_query_size.", 0) \
     M(LogsLevel, send_logs_level, LogsLevel::fatal, "Send server text logs with specified minimum level to client. Valid values: 'trace', 'debug', 'information', 'warning', 'error', 'fatal', 'none'", 0) \
-    M(Bool, enable_optimize_predicate_expression, 1, "If it is set to true, optimize predicates to subqueries.", 0) \
-    M(Bool, enable_optimize_predicate_expression_to_final_subquery, 1, "Allow push predicate to final subquery.", 0) \
-    M(Bool, allow_push_predicate_when_subquery_contains_with, 1, "Allows push predicate when subquery contains WITH clause", 0) \
+    M(Bool, enable_optimize_predicate_expression, true, "If it is set to true, optimize predicates to subqueries.", 0) \
+    M(Bool, enable_optimize_predicate_expression_to_final_subquery, true, "Allow push predicate to final subquery.", 0) \
+    M(Bool, allow_push_predicate_when_subquery_contains_with, true, "Allows push predicate when subquery contains WITH clause", 0) \
     \
     M(UInt64, low_cardinality_max_dictionary_size, 8192, "Maximum size (in rows) of shared global dictionary for LowCardinality type.", 0) \
     M(Bool, low_cardinality_use_single_dictionary_for_part, false, "LowCardinality type serialization setting. If is true, than will use additional keys when global dictionary overflows. Otherwise, will create several shared dictionaries.", 0) \
     M(Bool, decimal_check_overflow, true, "Check overflow of decimal arithmetic/comparison operations", 0) \
     \
-    M(Bool, prefer_localhost_replica, 1, "1 - always send query to local replica, if it exists. 0 - choose replica to send query between local and remote ones according to load_balancing", 0) \
+    M(Bool, prefer_localhost_replica, true, "If it's true then queries will be always sent to local replica (if it exists). If it's false then replica to send a query will be chosen between local and remote ones according to load_balancing", 0) \
     M(UInt64, max_fetch_partition_retries_count, 5, "Amount of retries while fetching partition from another host.", 0) \
     M(UInt64, http_max_multipart_form_data_size, 1024 * 1024 * 1024, "Limit on size of multipart/form-data content. This setting cannot be parsed from URL parameters and should be set in user profile. Note that content is parsed and external tables are created in memory before start of query execution. And this is the only limit that has effect on that stage (limits on max memory usage and max execution time have no effect while reading HTTP form data).", 0) \
-    M(Bool, calculate_text_stack_trace, 1, "Calculate text stack trace in case of exceptions during query execution. This is the default. It requires symbol lookups that may slow down fuzzing tests when huge amount of wrong queries are executed. In normal cases you should not disable this option.", 0) \
+    M(Bool, calculate_text_stack_trace, true, "Calculate text stack trace in case of exceptions during query execution. This is the default. It requires symbol lookups that may slow down fuzzing tests when huge amount of wrong queries are executed. In normal cases you should not disable this option.", 0) \
     M(Bool, allow_ddl, true, "If it is set to true, then a user is allowed to executed DDL queries.", 0) \
     M(Bool, parallel_view_processing, false, "Enables pushing to attached views concurrently instead of sequentially.", 0) \
     M(Bool, enable_unaligned_array_join, false, "Allow ARRAY JOIN with multiple arrays that have different sizes. When this settings is enabled, arrays will be resized to the longest one.", 0) \
     M(Bool, optimize_read_in_order, true, "Enable ORDER BY optimization for reading data in corresponding order in MergeTree tables.", 0) \
     M(Bool, optimize_aggregation_in_order, false, "Enable GROUP BY optimization for aggregating data in corresponding order in MergeTree tables.", 0) \
+    M(UInt64, aggregation_in_order_max_block_bytes, 50000000, "Maximal size of block in bytes accumulated during aggregation in order of primary key. Lower block size allows to parallelize more final merge stage of aggregation.", 0) \
     M(UInt64, read_in_order_two_level_merge_threshold, 100, "Minimal number of parts to read to run preliminary merge step during multithread reading in order of primary key.", 0) \
     M(Bool, low_cardinality_allow_in_native_format, true, "Use LowCardinality type in Native format. Otherwise, convert LowCardinality columns to ordinary for select query, and convert ordinary columns to required LowCardinality for insert query.", 0) \
     M(Bool, cancel_http_readonly_queries_on_client_close, false, "Cancel HTTP readonly queries when a client closes the connection without waiting for response.", 0) \
     M(Bool, external_table_functions_use_nulls, true, "If it is set to true, external table functions will implicitly use Nullable type if needed. Otherwise NULLs will be substituted with default values. Currently supported only by 'mysql', 'postgresql' and 'odbc' table functions.", 0) \
+    M(Bool, external_table_strict_query, false, "If it is set to true, transforming expression to local filter is forbidden for queries to external tables.", 0) \
     \
     M(Bool, allow_hyperscan, true, "Allow functions that use Hyperscan library. Disable to avoid potentially long compilation times and excessive resource usage.", 0) \
+    M(UInt64, max_hyperscan_regexp_length, 0, "Max length of regexp than can be used in hyperscan multi-match functions. Zero means unlimited.", 0) \
+    M(UInt64, max_hyperscan_regexp_total_length, 0, "Max total length of all regexps than can be used in hyperscan multi-match functions (per every function). Zero means unlimited.", 0) \
     M(Bool, allow_simdjson, true, "Allow using simdjson library in 'JSON*' functions if AVX2 instructions are available. If disabled rapidjson will be used.", 0) \
     M(Bool, allow_introspection_functions, false, "Allow functions for introspection of ELF and DWARF for query profiling. These functions are slow and may impose security considerations.", 0) \
     \
@@ -395,7 +412,7 @@ class IColumn;
     M(UInt64, distributed_replica_max_ignored_errors, 0, "Number of errors that will be ignored while choosing replicas", 0) \
     \
     M(Bool, allow_experimental_live_view, false, "Enable LIVE VIEW. Not mature enough.", 0) \
-    M(Seconds, live_view_heartbeat_interval, DEFAULT_LIVE_VIEW_HEARTBEAT_INTERVAL_SEC, "The heartbeat interval in seconds to indicate live query is alive.", 0) \
+    M(Seconds, live_view_heartbeat_interval, 15, "The heartbeat interval in seconds to indicate live query is alive.", 0) \
     M(UInt64, max_live_view_insert_blocks_before_refresh, 64, "Limit maximum number of inserted blocks after which mergeable blocks are dropped and query is re-executed.", 0) \
     M(UInt64, min_free_disk_space_for_temporary_data, 0, "The minimum disk space to keep while writing temporary data used in external sorting and aggregation.", 0) \
     \
@@ -442,7 +459,7 @@ class IColumn;
     M(Bool, allow_non_metadata_alters, true, "Allow to execute alters which affects not only tables metadata, but also data on disk", 0) \
     M(Bool, enable_global_with_statement, true, "Propagate WITH statements to UNION queries and all subqueries", 0) \
     M(Bool, aggregate_functions_null_for_empty, false, "Rewrite all aggregate functions in a query, adding -OrNull suffix to them", 0) \
-    M(Bool, optimize_fuse_sum_count_avg, false, "Fuse aggregate functions sum(), avg(), count() with identical arguments into one sumCount() call, if the query has at least two different functions", 0) \
+    M(Bool, optimize_syntax_fuse_functions, false, "Fuse aggregate functions (`sum, avg, count` with identical arguments into one `sumCount`, quantile-family functions with the same argument into `quantiles*(...)[...]`)", 0) \
     M(Bool, flatten_nested, true, "If true, columns of type Nested will be flatten to separate array columns instead of one array of tuples", 0) \
     M(Bool, asterisk_include_materialized_columns, false, "Include MATERIALIZED columns for wildcard query", 0) \
     M(Bool, asterisk_include_alias_columns, false, "Include ALIAS columns for wildcard query", 0) \
@@ -453,6 +470,7 @@ class IColumn;
     M(Bool, force_optimize_projection, false, "If projection optimization is enabled, SELECT queries need to use projection", 0) \
     M(Bool, async_socket_for_remote, true, "Asynchronously read from socket executing remote query", 0) \
     M(Bool, insert_null_as_default, true, "Insert DEFAULT values instead of NULL in INSERT SELECT (UNION ALL)", 0) \
+    M(Bool, describe_include_subcolumns, false, "If true, subcolumns of all table columns will be included into result of DESCRIBE query", 0) \
     \
     M(Bool, optimize_rewrite_sum_if_to_count_if, true, "Rewrite sumIf() and sum(if()) function countIf() function when logically equivalent", 0) \
     M(UInt64, insert_shard_id, 0, "If non zero, when insert into a distributed table, the data will be inserted into the shard `insert_shard_id` synchronously. Possible values range from 1 to `shards_number` of corresponding distributed table", 0) \
@@ -486,6 +504,26 @@ class IColumn;
     M(UInt64, offset, 0, "Offset on read rows from the most 'end' result for select query", 0) \
     \
     M(UInt64, function_range_max_elements_in_block, 500000000, "Maximum number of values generated by function 'range' per block of data (sum of array sizes for every row in a block, see also 'max_block_size' and 'min_insert_block_size_rows'). It is a safety threshold.", 0) \
+    M(ShortCircuitFunctionEvaluation, short_circuit_function_evaluation, ShortCircuitFunctionEvaluation::ENABLE, "Setting for short-circuit function evaluation configuration. Possible values: 'enable' - use short-circuit function evaluation for functions that are suitable for it, 'disable' - disable short-circuit function evaluation, 'force_enable' - use short-circuit function evaluation for all functions.", 0) \
+    \
+    M(String, local_filesystem_read_method, "pread", "Method of reading data from local filesystem, one of: read, pread, mmap, pread_threadpool.", 0) \
+    M(String, remote_filesystem_read_method, "read", "Method of reading data from remote filesystem, one of: read, read_threadpool.", 0) \
+    M(Bool, local_filesystem_read_prefetch, false, "Should use prefetching when reading data from local filesystem.", 0) \
+    M(Bool, remote_filesystem_read_prefetch, true, "Should use prefetching when reading data from remote filesystem.", 0) \
+    M(Int64, read_priority, 0, "Priority to read data from local filesystem. Only supported for 'pread_threadpool' method.", 0) \
+    \
+    M(UInt64, async_insert_threads, 16, "Maximum number of threads to actually parse and insert data in background. Zero means asynchronous mode is disabled", 0) \
+    M(Bool, async_insert, false, "If true, data from INSERT query is stored in queue and later flushed to table in background. Makes sense only for inserts via HTTP protocol. If wait_for_async_insert is false, INSERT query is processed almost instantly, otherwise client will wait until data will be flushed to table", 0) \
+    M(Bool, wait_for_async_insert, true, "If true wait for processing of asynchronous insertion", 0) \
+    M(Seconds, wait_for_async_insert_timeout, DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC, "Timeout for waiting for processing asynchronous insertion", 0) \
+    M(UInt64, async_insert_max_data_size, 100000, "Maximum size in bytes of unparsed data collected per query before being inserted", 0) \
+    M(Milliseconds, async_insert_busy_timeout_ms, 200, "Maximum time to wait before dumping collected data per query since the first data appeared", 0) \
+    M(Milliseconds, async_insert_stale_timeout_ms, 0, "Maximum time to wait before dumping collected data per query since the last data appeared. Zero means no timeout at all", 0) \
+    \
+    M(Int64, remote_fs_read_max_backoff_ms, 10000, "Max wait time when trying to read data for remote disk", 0) \
+    M(Int64, remote_fs_read_backoff_max_tries, 5, "Max attempts to read with backoff", 0) \
+    \
+    M(Bool, force_remove_data_recursively_on_drop, false, "Recursively remove data on DROP query. Avoids 'Directory not empty' error, but may silently remove detached data", 0) \
     \
     /** Experimental functions */ \
     M(Bool, allow_experimental_funnel_functions, false, "Enable experimental functions for funnel analysis.", 0) \
@@ -498,8 +536,12 @@ class IColumn;
     M(Bool, enable_debug_queries, false, "Obsolete setting, does nothing.", 0) \
     M(Bool, allow_experimental_database_atomic, true, "Obsolete setting, does nothing.", 0) \
     M(Bool, allow_experimental_bigint_types, true, "Obsolete setting, does nothing.", 0) \
+    M(Bool, allow_experimental_window_functions, true, "Obsolete setting, does nothing.", 0) \
     M(HandleKafkaErrorMode, handle_kafka_error_mode, HandleKafkaErrorMode::DEFAULT, "Obsolete setting, does nothing.", 0) \
     M(Bool, database_replicated_ddl_output, true, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, replication_alter_columns_timeout, 60, "Obsolete setting, does nothing.", 0) \
+    M(Bool, optimize_fuse_sum_count_avg, false, "Obsolete, use optimize_syntax_fuse_functions", 0) \
+    M(UInt64, odbc_max_field_size, 0, "Obsolete setting, does nothing.", 0) \
     /** The section above is for obsolete settings. Do not add anything there. */
 
 
@@ -508,8 +550,8 @@ class IColumn;
 
 #define FORMAT_FACTORY_SETTINGS(M) \
     M(Char, format_csv_delimiter, ',', "The character to be considered as a delimiter in CSV data. If setting with a string, a string has to have a length of 1.", 0) \
-    M(Bool, format_csv_allow_single_quotes, 1, "If it is set to true, allow strings in single quotes.", 0) \
-    M(Bool, format_csv_allow_double_quotes, 1, "If it is set to true, allow strings in double quotes.", 0) \
+    M(Bool, format_csv_allow_single_quotes, true, "If it is set to true, allow strings in single quotes.", 0) \
+    M(Bool, format_csv_allow_double_quotes, true, "If it is set to true, allow strings in double quotes.", 0) \
     M(Bool, output_format_csv_crlf_end_of_line, false, "If it is set true, end of line in CSV format will be \\r\\n instead of \\n.", 0) \
     M(Bool, input_format_csv_unquoted_null_literal_as_null, false, "Consider unquoted NULL literal as \\N", 0) \
     M(Bool, input_format_csv_enum_as_number, false, "Treat inserted enum values in CSV formats as enum indices \\N", 0) \
@@ -521,6 +563,9 @@ class IColumn;
     M(Bool, input_format_tsv_empty_as_default, false, "Treat empty fields in TSV input as default values.", 0) \
     M(Bool, input_format_tsv_enum_as_number, false, "Treat inserted enum values in TSV formats as enum indices \\N", 0) \
     M(Bool, input_format_null_as_default, true, "For text input formats initialize null fields with default values if data type of this field is not nullable", 0) \
+    M(Bool, input_format_arrow_import_nested, false, "Allow to insert array of structs into Nested table in Arrow input format.", 0) \
+    M(Bool, input_format_orc_import_nested, false, "Allow to insert array of structs into Nested table in ORC input format.", 0) \
+    M(Bool, input_format_parquet_import_nested, false, "Allow to insert array of structs into Nested table in Parquet input format.", 0) \
     \
     M(DateTimeInputFormat, date_time_input_format, FormatSettings::DateTimeInputFormat::Basic, "Method to read DateTime from text input formats. Possible values: 'basic' and 'best_effort'.", 0) \
     M(DateTimeOutputFormat, date_time_output_format, FormatSettings::DateTimeOutputFormat::Simple, "Method to write DateTime to text output. Possible values: 'simple', 'iso', 'unix_timestamp'.", 0) \
@@ -549,7 +594,9 @@ class IColumn;
     M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy'.", 0) \
     M(UInt64, output_format_avro_sync_interval, 16 * 1024, "Sync interval in bytes.", 0) \
     M(Bool, output_format_tsv_crlf_end_of_line, false, "If it is set true, end of line in TSV format will be \\r\\n instead of \\n.", 0) \
+    M(String, output_format_csv_null_representation, "\\N", "Custom NULL representation in CSV format", 0) \
     M(String, output_format_tsv_null_representation, "\\N", "Custom NULL representation in TSV format", 0) \
+    M(Bool, output_format_decimal_trailing_zeros, false, "Output trailing zeros when printing Decimal values. E.g. 1.230000 instead of 1.23.", 0) \
     \
     M(UInt64, input_format_allow_errors_num, 0, "Maximum absolute amount of errors while reading text formats (like CSV, TSV). In case of error, if at least absolute or relative amount of errors is lower than corresponding value, will skip until next line and continue.", 0) \
     M(Float, input_format_allow_errors_ratio, 0, "Maximum relative amount of errors while reading text formats (like CSV, TSV). In case of error, if at least absolute or relative amount of errors is lower than corresponding value, will skip until next line and continue.", 0) \
@@ -575,10 +622,12 @@ class IColumn;
     M(Bool, output_format_write_statistics, true, "Write statistics about read rows, bytes, time elapsed in suitable output formats.", 0) \
     M(Bool, output_format_pretty_row_numbers, false, "Add row numbers before each row for pretty output format", 0) \
     M(Bool, insert_distributed_one_random_shard, false, "If setting is enabled, inserting into distributed table will choose a random shard to write when there is no sharding key", 0) \
+    \
     M(Bool, cross_to_inner_join_rewrite, true, "Use inner join instead of comma/cross join if possible", 0) \
     \
     M(Bool, output_format_arrow_low_cardinality_as_dictionary, false, "Enable output LowCardinality type as Dictionary Arrow type", 0) \
-
+    \
+    M(EnumComparingMode, format_capn_proto_enum_comparising_mode, FormatSettings::EnumComparingMode::BY_VALUES, "How to map ClickHouse Enum and CapnProto Enum", 0)\
 // End of FORMAT_FACTORY_SETTINGS
 // Please add settings non-related to formats into the COMMON_SETTINGS above.
 
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index 26c2bd9b6af..f5497588891 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -79,8 +79,8 @@ IMPLEMENT_SETTING_ENUM(LogsLevel, ErrorCodes::BAD_ARGUMENTS,
      {"warning",     LogsLevel::warning},
      {"information", LogsLevel::information},
      {"debug",       LogsLevel::debug},
-     {"trace",       LogsLevel::trace}})
-
+     {"trace",       LogsLevel::trace},
+     {"test",        LogsLevel::test}})
 
 IMPLEMENT_SETTING_ENUM_WITH_RENAME(LogQueriesType, ErrorCodes::BAD_ARGUMENTS,
     {{"QUERY_START",                QUERY_START},
@@ -111,4 +111,14 @@ IMPLEMENT_SETTING_ENUM(DistributedDDLOutputMode, ErrorCodes::BAD_ARGUMENTS,
 IMPLEMENT_SETTING_ENUM(HandleKafkaErrorMode, ErrorCodes::BAD_ARGUMENTS,
     {{"default",      HandleKafkaErrorMode::DEFAULT},
      {"stream",       HandleKafkaErrorMode::STREAM}})
+
+IMPLEMENT_SETTING_ENUM(ShortCircuitFunctionEvaluation, ErrorCodes::BAD_ARGUMENTS,
+    {{"enable",          ShortCircuitFunctionEvaluation::ENABLE},
+     {"force_enable",    ShortCircuitFunctionEvaluation::FORCE_ENABLE},
+     {"disable",         ShortCircuitFunctionEvaluation::DISABLE}})
+
+IMPLEMENT_SETTING_ENUM(EnumComparingMode, ErrorCodes::BAD_ARGUMENTS,
+    {{"by_names",   FormatSettings::EnumComparingMode::BY_NAMES},
+     {"by_values",  FormatSettings::EnumComparingMode::BY_VALUES},
+     {"by_names_case_insensitive", FormatSettings::EnumComparingMode::BY_NAMES_CASE_INSENSITIVE}})
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index f0dd10aacfb..4bdb3c83ea5 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/SettingsFields.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Formats/FormatSettings.h>
 
 
@@ -94,6 +94,7 @@ enum class LogsLevel
     information,
     debug,
     trace,
+    test,
 };
 
 DECLARE_SETTING_ENUM(LogsLevel)
@@ -157,4 +158,16 @@ enum class HandleKafkaErrorMode
 };
 
 DECLARE_SETTING_ENUM(HandleKafkaErrorMode)
+
+enum class ShortCircuitFunctionEvaluation
+{
+    ENABLE, // Use short-circuit function evaluation for functions that are suitable for it.
+    FORCE_ENABLE, // Use short-circuit function evaluation for all functions.
+    DISABLE, // Disable short-circuit function evaluation.
+};
+
+DECLARE_SETTING_ENUM(ShortCircuitFunctionEvaluation)
+
+DECLARE_SETTING_ENUM_WITH_RENAME(EnumComparingMode, FormatSettings::EnumComparingMode)
+
 }
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index 379c65a913f..488e2f7d331 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -3,7 +3,7 @@
 #include <Core/Field.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/FieldVisitorConvertToNumber.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 3b84db04b1a..b27763ad0d6 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Timespan.h>
 #include <Poco/URI.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Field.h>
 #include <Core/MultiEnum.h>
 #include <boost/range/adaptor/map.hpp>
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
index f969c42680c..9b5644b75e1 100644
--- a/src/Core/SettingsQuirks.cpp
+++ b/src/Core/SettingsQuirks.cpp
@@ -3,9 +3,12 @@
 #include <Poco/Environment.h>
 #include <Poco/Platform.h>
 #include <Common/VersionNumber.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <cstdlib>
 
+namespace
+{
+
 /// Detect does epoll_wait with nested epoll fds works correctly.
 /// Polling nested epoll fds from epoll_wait is required for async_socket_for_remote and use_hedged_requests.
 ///
@@ -31,6 +34,15 @@ bool nestedEpollWorks(Poco::Logger * log)
     return true;
 }
 
+/// See also QUERY_PROFILER_DEFAULT_SAMPLE_RATE_NS in Core/Defines.h
+#if !defined(SANITIZER)
+bool queryProfilerWorks() { return true; }
+#else
+bool queryProfilerWorks() { return false; }
+#endif
+
+}
+
 namespace DB
 {
 
@@ -52,6 +64,22 @@ void applySettingsQuirks(Settings & settings, Poco::Logger * log)
                 LOG_WARNING(log, "use_hedged_requests has been disabled (you can explicitly enable it still)");
         }
     }
+
+    if (!queryProfilerWorks())
+    {
+        if (settings.query_profiler_real_time_period_ns)
+        {
+            settings.query_profiler_real_time_period_ns = 0;
+            if (log)
+                LOG_WARNING(log, "query_profiler_real_time_period_ns has been disabled (due to server had been compiled with sanitizers)");
+        }
+        if (settings.query_profiler_cpu_time_period_ns)
+        {
+            settings.query_profiler_cpu_time_period_ns = 0;
+            if (log)
+                LOG_WARNING(log, "query_profiler_cpu_time_period_ns has been disabled (due to server had been compiled with sanitizers)");
+        }
+    }
 }
 
 }
diff --git a/src/Core/TypeId.h b/src/Core/TypeId.h
new file mode 100644
index 00000000000..3218db10778
--- /dev/null
+++ b/src/Core/TypeId.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include <Core/Types.h>
+
+namespace DB
+{
+/**
+ * Obtain TypeIndex value from real type if possible.
+ *
+ * Returns TypeIndex::Nothing if type was not present in TypeIndex;
+ * Returns TypeIndex element otherwise.
+ *
+ * @example TypeId<UInt8> == TypeIndex::UInt8
+ * @example TypeId<MySuperType> == TypeIndex::Nothing
+ */
+template <class T> inline constexpr TypeIndex TypeId = TypeIndex::Nothing;
+
+template <TypeIndex index> struct ReverseTypeIdT : std::false_type {};
+
+/**
+ * Obtain real type from TypeIndex if possible.
+ *
+ * Returns a type alias if is corresponds to TypeIndex value.
+ * Yields a compiler error otherwise.
+ *
+ * @example ReverseTypeId<TypeIndex::UInt8> == UInt8
+ */
+template <TypeIndex index> using ReverseTypeId = typename ReverseTypeIdT<index>::T;
+template <TypeIndex index> constexpr bool HasReverseTypeId = ReverseTypeIdT<index>::value;
+
+#define TYPEID_MAP(_A) \
+    template <> inline constexpr TypeIndex TypeId<_A> = TypeIndex::_A; \
+    template <> struct ReverseTypeIdT<TypeIndex::_A> : std::true_type { using T = _A; };
+
+TYPEID_MAP(UInt8)
+TYPEID_MAP(UInt16)
+TYPEID_MAP(UInt32)
+TYPEID_MAP(UInt64)
+TYPEID_MAP(UInt128)
+TYPEID_MAP(UInt256)
+TYPEID_MAP(Int8)
+TYPEID_MAP(Int16)
+TYPEID_MAP(Int32)
+TYPEID_MAP(Int64)
+TYPEID_MAP(Int128)
+TYPEID_MAP(Int256)
+TYPEID_MAP(Float32)
+TYPEID_MAP(Float64)
+TYPEID_MAP(UUID)
+
+TYPEID_MAP(Decimal32)
+TYPEID_MAP(Decimal64)
+TYPEID_MAP(Decimal128)
+TYPEID_MAP(Decimal256)
+TYPEID_MAP(DateTime64)
+
+TYPEID_MAP(String)
+
+struct Array;
+TYPEID_MAP(Array)
+}
diff --git a/src/Core/TypeListNumber.h b/src/Core/TypeListNumber.h
deleted file mode 100644
index b65bdef4e46..00000000000
--- a/src/Core/TypeListNumber.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include <Core/Types.h>
-#include <Common/TypeList.h>
-
-namespace DB
-{
-
-using TypeListNativeNumbers = TypeList<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64>;
-using TypeListExtendedNumbers = TypeList<UInt128, Int128, UInt256, Int256>;
-using TypeListDecimalNumbers = TypeList<Decimal32, Decimal64, Decimal128, Decimal256>;
-
-using TypeListGeneralNumbers = typename TypeListConcat<TypeListNativeNumbers, TypeListExtendedNumbers>::Type;
-using TypeListNumbers = typename TypeListConcat<TypeListGeneralNumbers, TypeListDecimalNumbers>::Type;
-
-using TypeListNumbersAndUUID = typename TypeListConcat<TypeListNumbers, TypeList<UUID>>::Type;
-
-}
diff --git a/src/Core/Types.h b/src/Core/Types.h
index b5f3c1bff9f..9d3ff15d29c 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -3,9 +3,10 @@
 #include <cstdint>
 #include <string>
 #include <vector>
-#include <common/strong_typedef.h>
-#include <common/extended_types.h>
-#include <common/defines.h>
+#include <base/strong_typedef.h>
+#include <base/Decimal.h>
+#include <base/defines.h>
+#include <base/UUID.h>
 
 
 namespace DB
@@ -13,9 +14,33 @@ namespace DB
 
 /// Data types for representing elementary values from a database in RAM.
 
-struct Null {};
-struct NegativeInfinity {};
-struct PositiveInfinity {};
+/// Hold a null value for untyped calculation. It can also store infinities to handle nullable
+/// comparison which is used for nullable KeyCondition.
+struct Null
+{
+    enum class Value
+    {
+        Null,
+        PositiveInfinity,
+        NegativeInfinity,
+    };
+
+    Value value{Value::Null};
+
+    bool isNull() const { return value == Value::Null; }
+    bool isPositiveInfinity() const { return value == Value::PositiveInfinity; }
+    bool isNegativeInfinity() const { return value == Value::NegativeInfinity; }
+
+    bool operator==(const Null & other) const
+    {
+        return value == other.value;
+    }
+
+    bool operator!=(const Null & other) const
+    {
+        return !(*this == other);
+    }
+};
 
 /// Ignore strange gcc warning https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55776
 #if !defined(__clang__)
@@ -73,256 +98,6 @@ using UInt256 = ::UInt256;
 using Int128 = ::Int128;
 using Int256 = ::Int256;
 
-STRONG_TYPEDEF(UInt128, UUID)
-
-
-template <typename T> constexpr const char * TypeName = "";
-
-template <> inline constexpr const char * TypeName<UInt8> = "UInt8";
-template <> inline constexpr const char * TypeName<UInt16> = "UInt16";
-template <> inline constexpr const char * TypeName<UInt32> = "UInt32";
-template <> inline constexpr const char * TypeName<UInt64> = "UInt64";
-template <> inline constexpr const char * TypeName<UInt128> = "UInt128";
-template <> inline constexpr const char * TypeName<UInt256> = "UInt256";
-template <> inline constexpr const char * TypeName<Int8> = "Int8";
-template <> inline constexpr const char * TypeName<Int16> = "Int16";
-template <> inline constexpr const char * TypeName<Int32> = "Int32";
-template <> inline constexpr const char * TypeName<Int64> = "Int64";
-template <> inline constexpr const char * TypeName<Int128> = "Int128";
-template <> inline constexpr const char * TypeName<Int256> = "Int256";
-template <> inline constexpr const char * TypeName<Float32> = "Float32";
-template <> inline constexpr const char * TypeName<Float64> = "Float64";
-template <> inline constexpr const char * TypeName<String> = "String";
-template <> inline constexpr const char * TypeName<UUID> = "UUID";
-
-/// TODO Try to remove it.
-template <typename T> constexpr TypeIndex TypeId = TypeIndex::Nothing;
-template <> inline constexpr TypeIndex TypeId<UInt8> = TypeIndex::UInt8;
-template <> inline constexpr TypeIndex TypeId<UInt16> = TypeIndex::UInt16;
-template <> inline constexpr TypeIndex TypeId<UInt32> = TypeIndex::UInt32;
-template <> inline constexpr TypeIndex TypeId<UInt64> = TypeIndex::UInt64;
-template <> inline constexpr TypeIndex TypeId<UInt128> = TypeIndex::UInt128;
-template <> inline constexpr TypeIndex TypeId<UInt256> = TypeIndex::UInt256;
-template <> inline constexpr TypeIndex TypeId<Int8> = TypeIndex::Int8;
-template <> inline constexpr TypeIndex TypeId<Int16> = TypeIndex::Int16;
-template <> inline constexpr TypeIndex TypeId<Int32> = TypeIndex::Int32;
-template <> inline constexpr TypeIndex TypeId<Int64> = TypeIndex::Int64;
-template <> inline constexpr TypeIndex TypeId<Int128> = TypeIndex::Int128;
-template <> inline constexpr TypeIndex TypeId<Int256> = TypeIndex::Int256;
-template <> inline constexpr TypeIndex TypeId<Float32> = TypeIndex::Float32;
-template <> inline constexpr TypeIndex TypeId<Float64> = TypeIndex::Float64;
-template <> inline constexpr TypeIndex TypeId<UUID> = TypeIndex::UUID;
-
-
 /// Not a data type in database, defined just for convenience.
 using Strings = std::vector<String>;
-
-/// Own FieldType for Decimal.
-/// It is only a "storage" for decimal. To perform operations, you also have to provide a scale (number of digits after point).
-template <typename T>
-struct Decimal
-{
-    using NativeType = T;
-
-    Decimal() = default;
-    Decimal(Decimal<T> &&) = default;
-    Decimal(const Decimal<T> &) = default;
-
-    Decimal(const T & value_)
-    :   value(value_)
-    {}
-
-    template <typename U>
-    Decimal(const Decimal<U> & x)
-    :   value(x.value)
-    {}
-
-    constexpr Decimal<T> & operator = (Decimal<T> &&) = default;
-    constexpr Decimal<T> & operator = (const Decimal<T> &) = default;
-
-    operator T () const { return value; }
-
-    template <typename U>
-    U convertTo() const
-    {
-        /// no IsDecimalNumber defined yet
-        if constexpr (std::is_same_v<U, Decimal<Int32>> ||
-                      std::is_same_v<U, Decimal<Int64>> ||
-                      std::is_same_v<U, Decimal<Int128>> ||
-                      std::is_same_v<U, Decimal<Int256>>)
-        {
-            return convertTo<typename U::NativeType>();
-        }
-        else
-            return static_cast<U>(value);
-    }
-
-    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
-    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
-    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
-    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
-    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
-
-    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
-    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
-
-    /// This is to avoid UB for sumWithOverflow()
-    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
-
-    T value;
-};
-
-template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
-template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
-template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
-template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
-template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
-template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
-
-template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
-template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
-template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
-
-using Decimal32 = Decimal<Int32>;
-using Decimal64 = Decimal<Int64>;
-using Decimal128 = Decimal<Int128>;
-using Decimal256 = Decimal<Int256>;
-
-// Distinguishable type to allow function resolution/deduction based on value type,
-// but also relatively easy to convert to/from Decimal64.
-class DateTime64 : public Decimal64
-{
-public:
-    using Base = Decimal64;
-    using Base::Base;
-
-    DateTime64(const Base & v)
-        : Base(v)
-    {}
-};
-
-template <> inline constexpr const char * TypeName<Decimal32> = "Decimal32";
-template <> inline constexpr const char * TypeName<Decimal64> = "Decimal64";
-template <> inline constexpr const char * TypeName<Decimal128> = "Decimal128";
-template <> inline constexpr const char * TypeName<Decimal256> = "Decimal256";
-template <> inline constexpr const char * TypeName<DateTime64> = "DateTime64";
-
-template <> inline constexpr TypeIndex TypeId<Decimal32> = TypeIndex::Decimal32;
-template <> inline constexpr TypeIndex TypeId<Decimal64> = TypeIndex::Decimal64;
-template <> inline constexpr TypeIndex TypeId<Decimal128> = TypeIndex::Decimal128;
-template <> inline constexpr TypeIndex TypeId<Decimal256> = TypeIndex::Decimal256;
-template <> inline constexpr TypeIndex TypeId<DateTime64> = TypeIndex::DateTime64;
-
-template <typename T> constexpr bool IsDecimalNumber = false;
-template <> inline constexpr bool IsDecimalNumber<Decimal32> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal64> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal128> = true;
-template <> inline constexpr bool IsDecimalNumber<Decimal256> = true;
-template <> inline constexpr bool IsDecimalNumber<DateTime64> = true;
-
-template <typename T> struct NativeType { using Type = T; };
-template <> struct NativeType<Decimal32> { using Type = Int32; };
-template <> struct NativeType<Decimal64> { using Type = Int64; };
-template <> struct NativeType<Decimal128> { using Type = Int128; };
-template <> struct NativeType<Decimal256> { using Type = Int256; };
-template <> struct NativeType<DateTime64> { using Type = Int64; };
-
-template <typename T> constexpr bool OverBigInt = false;
-template <> inline constexpr bool OverBigInt<Int128> = true;
-template <> inline constexpr bool OverBigInt<UInt128> = true;
-template <> inline constexpr bool OverBigInt<Int256> = true;
-template <> inline constexpr bool OverBigInt<UInt256> = true;
-template <> inline constexpr bool OverBigInt<Decimal128> = true;
-template <> inline constexpr bool OverBigInt<Decimal256> = true;
-
-inline constexpr const char * getTypeName(TypeIndex idx)
-{
-    switch (idx)
-    {
-        case TypeIndex::Nothing:    return "Nothing";
-        case TypeIndex::UInt8:      return "UInt8";
-        case TypeIndex::UInt16:     return "UInt16";
-        case TypeIndex::UInt32:     return "UInt32";
-        case TypeIndex::UInt64:     return "UInt64";
-        case TypeIndex::UInt128:    return "UInt128";
-        case TypeIndex::UInt256:    return "UInt256";
-        case TypeIndex::Int8:       return "Int8";
-        case TypeIndex::Int16:      return "Int16";
-        case TypeIndex::Int32:      return "Int32";
-        case TypeIndex::Int64:      return "Int64";
-        case TypeIndex::Int128:     return "Int128";
-        case TypeIndex::Int256:     return "Int256";
-        case TypeIndex::Float32:    return "Float32";
-        case TypeIndex::Float64:    return "Float64";
-        case TypeIndex::Date:       return "Date";
-        case TypeIndex::Date32:     return "Date32";
-        case TypeIndex::DateTime:   return "DateTime";
-        case TypeIndex::DateTime64: return "DateTime64";
-        case TypeIndex::String:     return "String";
-        case TypeIndex::FixedString: return "FixedString";
-        case TypeIndex::Enum8:      return "Enum8";
-        case TypeIndex::Enum16:     return "Enum16";
-        case TypeIndex::Decimal32:  return "Decimal32";
-        case TypeIndex::Decimal64:  return "Decimal64";
-        case TypeIndex::Decimal128: return "Decimal128";
-        case TypeIndex::Decimal256: return "Decimal256";
-        case TypeIndex::UUID:       return "UUID";
-        case TypeIndex::Array:      return "Array";
-        case TypeIndex::Tuple:      return "Tuple";
-        case TypeIndex::Set:        return "Set";
-        case TypeIndex::Interval:   return "Interval";
-        case TypeIndex::Nullable:   return "Nullable";
-        case TypeIndex::Function:   return "Function";
-        case TypeIndex::AggregateFunction: return "AggregateFunction";
-        case TypeIndex::LowCardinality: return "LowCardinality";
-        case TypeIndex::Map:        return "Map";
-    }
-
-    __builtin_unreachable();
-}
-
-}
-
-/// Specialization of `std::hash` for the Decimal<T> types.
-namespace std
-{
-    template <typename T>
-    struct hash<DB::Decimal<T>> { size_t operator()(const DB::Decimal<T> & x) const { return hash<T>()(x.value); } };
-
-    template <>
-    struct hash<DB::Decimal128>
-    {
-        size_t operator()(const DB::Decimal128 & x) const
-        {
-            return std::hash<DB::Int64>()(x.value >> 64)
-                ^ std::hash<DB::Int64>()(x.value & std::numeric_limits<DB::UInt64>::max());
-        }
-    };
-
-    template <>
-    struct hash<DB::DateTime64>
-    {
-        size_t operator()(const DB::DateTime64 & x) const
-        {
-            return std::hash<std::decay_t<decltype(x)>::NativeType>()(x);
-        }
-    };
-
-
-    template <>
-    struct hash<DB::Decimal256>
-    {
-        size_t operator()(const DB::Decimal256 & x) const
-        {
-            // temp solution
-            static constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
-            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
-                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
-        }
-    };
 }
diff --git a/src/Core/callOnTypeIndex.h b/src/Core/callOnTypeIndex.h
index d3348466369..2634578f325 100644
--- a/src/Core/callOnTypeIndex.h
+++ b/src/Core/callOnTypeIndex.h
@@ -164,7 +164,7 @@ class DataTypeDateTime;
 class DataTypeDateTime64;
 template <typename T> class DataTypeEnum;
 template <typename T> class DataTypeNumber;
-template <typename T> class DataTypeDecimal;
+template <is_decimal T> class DataTypeDecimal;
 
 
 template <typename T, typename F, typename... ExtraArgs>
diff --git a/src/Core/config_core.h.in b/src/Core/config_core.h.in
index cc9c993b205..11dd9bf96f1 100644
--- a/src/Core/config_core.h.in
+++ b/src/Core/config_core.h.in
@@ -17,3 +17,4 @@
 #cmakedefine01 USE_NURAFT
 #cmakedefine01 USE_NLP
 #cmakedefine01 USE_KRB5
+#cmakedefine01 USE_FILELOG
diff --git a/src/Core/examples/CMakeLists.txt b/src/Core/examples/CMakeLists.txt
index cd6450633ff..c8846eb1743 100644
--- a/src/Core/examples/CMakeLists.txt
+++ b/src/Core/examples/CMakeLists.txt
@@ -8,13 +8,11 @@ target_link_libraries (field PRIVATE dbms)
 add_executable (string_ref_hash string_ref_hash.cpp)
 target_link_libraries (string_ref_hash PRIVATE clickhouse_common_io)
 
-if (ENABLE_FUZZING)
-    add_executable (names_and_types_fuzzer names_and_types_fuzzer.cpp)
-    target_link_libraries (names_and_types_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
-endif ()
-
 add_executable (mysql_protocol mysql_protocol.cpp)
 target_link_libraries (mysql_protocol PRIVATE dbms)
 if(USE_SSL)
     target_include_directories (mysql_protocol SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
 endif()
+
+add_executable (coro coro.cpp)
+target_link_libraries (coro PRIVATE clickhouse_common_io)
diff --git a/src/Core/examples/coro.cpp b/src/Core/examples/coro.cpp
new file mode 100644
index 00000000000..0f152d8090a
--- /dev/null
+++ b/src/Core/examples/coro.cpp
@@ -0,0 +1,189 @@
+#include <cassert>
+#include <iostream>
+#include <string>
+#include <optional>
+
+#include <Common/Exception.h>
+#include <base/logger_useful.h>
+#include <Poco/ConsoleChannel.h>
+#include <Poco/Logger.h>
+#include <Poco/AutoPtr.h>
+
+#if defined(__clang__)
+#include <experimental/coroutine>
+
+namespace std
+{
+    using namespace experimental::coroutines_v1;
+}
+
+#else
+#include <coroutine>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+
+
+template <typename T>
+struct suspend_value // NOLINT(readability-identifier-naming)
+{
+    constexpr bool await_ready() const noexcept { return true; } // NOLINT(readability-identifier-naming)
+    constexpr void await_suspend(std::coroutine_handle<>) const noexcept {} // NOLINT(readability-identifier-naming)
+    constexpr T await_resume() const noexcept // NOLINT(readability-identifier-naming)
+    {
+        std::cout << "  ret " << val << std::endl;
+        return val;
+    }
+
+    T val;
+};
+
+template <typename T>
+struct Task
+{
+    struct promise_type // NOLINT(readability-identifier-naming)
+    {
+        using coro_handle = std::coroutine_handle<promise_type>;
+        auto get_return_object() { return coro_handle::from_promise(*this); } // NOLINT(readability-identifier-naming)
+        auto initial_suspend() { return std::suspend_never(); } // NOLINT(readability-identifier-naming)
+        auto final_suspend() noexcept { return suspend_value<T>{*r->value}; } // NOLINT(readability-identifier-naming)
+        //void return_void() {}
+        void return_value(T value_) { r->value = value_; } // NOLINT(readability-identifier-naming)
+        void unhandled_exception() // NOLINT(readability-identifier-naming)
+        {
+            DB::tryLogCurrentException("Logger");
+            r->exception = std::current_exception(); // NOLINT(bugprone-throw-keyword-missing)
+        }
+
+        explicit promise_type(std::string tag_) : tag(tag_) {}
+        ~promise_type() { std::cout << "~promise_type " << tag << std::endl; }
+        std::string tag;
+        coro_handle next;
+        Task * r = nullptr;
+    };
+
+    using coro_handle = std::coroutine_handle<promise_type>;
+
+    bool await_ready() const noexcept { return false; } // NOLINT(readability-identifier-naming)
+    void await_suspend(coro_handle g) noexcept // NOLINT(readability-identifier-naming)
+    {
+        std::cout << "  await_suspend " << my.promise().tag << std::endl;
+        std::cout << "  g tag " << g.promise().tag << std::endl;
+        g.promise().next = my;
+    }
+    T await_resume() noexcept // NOLINT(readability-identifier-naming)
+    {
+        std::cout << "  await_res " << my.promise().tag << std::endl;
+        return *value;
+    }
+
+    Task(coro_handle handle) : my(handle), tag(handle.promise().tag) // NOLINT(google-explicit-constructor)
+    {
+        assert(handle);
+        my.promise().r = this;
+        std::cout << "    Task " << tag << std::endl;
+    }
+    Task(Task &) = delete;
+    Task(Task &&rhs) : my(rhs.my), tag(rhs.tag)
+    {
+        rhs.my = {};
+        std::cout << "    Task&& " << tag << std::endl;
+    }
+    static bool resumeImpl(Task *r)
+    {
+        if (r->value)
+        return false;
+
+        auto & next = r->my.promise().next;
+
+        if (next)
+        {
+            if (resumeImpl(next.promise().r))
+            return true;
+            next = {};
+        }
+
+        if (!r->value)
+        {
+            r->my.resume();
+            if (r->exception)
+                std::rethrow_exception(r->exception);
+        }
+        return !r->value;
+    }
+
+    bool resume()
+    {
+        return resumeImpl(this);
+    }
+
+    T res()
+    {
+        return *value;
+    }
+
+    ~Task()
+    {
+        std::cout << "    ~Task " << tag << std::endl;
+    }
+
+private:
+    coro_handle my;
+    std::string tag;
+    std::optional<T> value;
+    std::exception_ptr exception;
+};
+
+Task<int> boo([[maybe_unused]] std::string tag)
+{
+    std::cout << "x" << std::endl;
+    co_await std::suspend_always();
+    std::cout << StackTrace().toString();
+    std::cout << "y" << std::endl;
+    co_return 1;
+}
+
+Task<int> bar([[maybe_unused]] std::string tag)
+{
+    std::cout << "a" << std::endl;
+    int res1 = co_await boo("boo1");
+    std::cout << "b " << res1 << std::endl;
+    int res2 = co_await boo("boo2");
+    if (res2 == 1)
+        throw DB::Exception(1, "hello");
+    std::cout << "c " << res2 << std::endl;
+    co_return res1 + res2;  // 1 + 1 = 2
+}
+
+Task<int> foo([[maybe_unused]] std::string tag)
+{
+    std::cout << "Hello" << std::endl;
+    auto res1 = co_await bar("bar1");
+    std::cout << "Coro " << res1 << std::endl;
+    auto res2 = co_await bar("bar2");
+    std::cout << "World " << res2 << std::endl;
+    co_return res1 * res2; // 2 * 2 = 4
+}
+
+int main()
+{
+    Poco::AutoPtr<Poco::ConsoleChannel> app_channel(new Poco::ConsoleChannel(std::cerr));
+    Poco::Logger::root().setChannel(app_channel);
+    Poco::Logger::root().setLevel("trace");
+
+    LOG_INFO(&Poco::Logger::get(""), "Starting");
+
+    try
+    {
+        auto t = foo("foo");
+        std::cout << ".. started" << std::endl;
+        while (t.resume())
+        std::cout << ".. yielded" << std::endl;
+        std::cout << ".. done: " << t.res() << std::endl;
+    }
+    catch (DB::Exception & e)
+    {
+        std::cout << "Got exception " << e.what() << std::endl;
+        std::cout << e.getStackTraceString() << std::endl;
+    }
+}
diff --git a/src/Core/examples/string_pool.cpp b/src/Core/examples/string_pool.cpp
index 358381c4c0c..2296514134b 100644
--- a/src/Core/examples/string_pool.cpp
+++ b/src/Core/examples/string_pool.cpp
@@ -6,7 +6,7 @@
 
 #include <Common/Stopwatch.h>
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/Arena.h>
 
 #include <IO/ReadBufferFromFileDescriptor.h>
diff --git a/src/Core/examples/string_ref_hash.cpp b/src/Core/examples/string_ref_hash.cpp
index 9aea1e42bc8..07ba7def328 100644
--- a/src/Core/examples/string_ref_hash.cpp
+++ b/src/Core/examples/string_ref_hash.cpp
@@ -1,7 +1,7 @@
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/Operators.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 /** Calculates StringRefHash from stdin. For debugging.
diff --git a/src/Core/fuzzers/CMakeLists.txt b/src/Core/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..a5416035010
--- /dev/null
+++ b/src/Core/fuzzers/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable (names_and_types_fuzzer names_and_types_fuzzer.cpp)
+target_link_libraries (names_and_types_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
diff --git a/src/Core/examples/names_and_types_fuzzer.cpp b/src/Core/fuzzers/names_and_types_fuzzer.cpp
similarity index 100%
rename from src/Core/examples/names_and_types_fuzzer.cpp
rename to src/Core/fuzzers/names_and_types_fuzzer.cpp
diff --git a/src/Core/iostream_debug_helpers.h b/src/Core/iostream_debug_helpers.h
index f57788b63d8..8aafe0b6c9c 100644
--- a/src/Core/iostream_debug_helpers.h
+++ b/src/Core/iostream_debug_helpers.h
@@ -45,4 +45,4 @@ std::ostream & operator<<(std::ostream & stream, const TreeRewriterResult & what
 }
 
 /// some operator<< should be declared before operator<<(... std::shared_ptr<>)
-#include <common/iostream_debug_helpers.h>
+#include <base/iostream_debug_helpers.h>
diff --git a/src/Core/tests/gtest_move_field.cpp b/src/Core/tests/gtest_field.cpp
similarity index 50%
rename from src/Core/tests/gtest_move_field.cpp
rename to src/Core/tests/gtest_field.cpp
index 9c807039c6a..5230f13bf8a 100644
--- a/src/Core/tests/gtest_move_field.cpp
+++ b/src/Core/tests/gtest_field.cpp
@@ -3,6 +3,40 @@
 
 using namespace DB;
 
+GTEST_TEST(Field, FromBool)
+{
+    {
+        Field f{false};
+        ASSERT_EQ(f.getType(), Field::Types::UInt64);
+        ASSERT_EQ(f.get<UInt64>(), 0);
+        ASSERT_EQ(f.get<bool>(), false);
+    }
+
+    {
+        Field f{true};
+        ASSERT_EQ(f.getType(), Field::Types::UInt64);
+        ASSERT_EQ(f.get<UInt64>(), 1);
+        ASSERT_EQ(f.get<bool>(), true);
+    }
+
+    {
+        Field f;
+        f = false;
+        ASSERT_EQ(f.getType(), Field::Types::UInt64);
+        ASSERT_EQ(f.get<UInt64>(), 0);
+        ASSERT_EQ(f.get<bool>(), false);
+    }
+
+    {
+        Field f;
+        f = true;
+        ASSERT_EQ(f.getType(), Field::Types::UInt64);
+        ASSERT_EQ(f.get<UInt64>(), 1);
+        ASSERT_EQ(f.get<bool>(), true);
+    }
+}
+
+
 GTEST_TEST(Field, Move)
 {
     Field f;
diff --git a/src/Core/tests/gtest_multienum.cpp b/src/Core/tests/gtest_multienum.cpp
index 91cee6b316a..e935208f661 100644
--- a/src/Core/tests/gtest_multienum.cpp
+++ b/src/Core/tests/gtest_multienum.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <type_traits>
 #include <Core/MultiEnum.h>
 
diff --git a/src/Core/ya.make b/src/Core/ya.make
deleted file mode 100644
index d1e352ee846..00000000000
--- a/src/Core/ya.make
+++ /dev/null
@@ -1,46 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/restricted/boost/libs
-)
-
-
-SRCS(
-    BackgroundSchedulePool.cpp
-    BaseSettings.cpp
-    Block.cpp
-    BlockInfo.cpp
-    ColumnWithTypeAndName.cpp
-    ExternalResultDescription.cpp
-    ExternalTable.cpp
-    Field.cpp
-    MySQL/Authentication.cpp
-    MySQL/IMySQLReadPacket.cpp
-    MySQL/IMySQLWritePacket.cpp
-    MySQL/MySQLClient.cpp
-    MySQL/MySQLGtid.cpp
-    MySQL/MySQLReplication.cpp
-    MySQL/PacketEndpoint.cpp
-    MySQL/PacketsConnection.cpp
-    MySQL/PacketsGeneric.cpp
-    MySQL/PacketsProtocolText.cpp
-    MySQL/PacketsReplication.cpp
-    NamesAndTypes.cpp
-    PostgreSQLProtocol.cpp
-    QueryProcessingStage.cpp
-    Settings.cpp
-    SettingsEnums.cpp
-    SettingsFields.cpp
-    SettingsQuirks.cpp
-    SortDescription.cpp
-    UUID.cpp
-    iostream_debug_helpers.cpp
-
-)
-
-END()
diff --git a/src/Core/ya.make.in b/src/Core/ya.make.in
deleted file mode 100644
index 6b89dc18482..00000000000
--- a/src/Core/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/restricted/boost/libs
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/DataStreams/AddingDefaultBlockOutputStream.cpp b/src/DataStreams/AddingDefaultBlockOutputStream.cpp
deleted file mode 100644
index 6f7975d492d..00000000000
--- a/src/DataStreams/AddingDefaultBlockOutputStream.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <DataStreams/AddingDefaultBlockOutputStream.h>
-#include <Interpreters/addMissingDefaults.h>
-#include <Interpreters/ExpressionActions.h>
-
-
-namespace DB
-{
-
-AddingDefaultBlockOutputStream::AddingDefaultBlockOutputStream(
-    const BlockOutputStreamPtr & output_,
-    const Block & header_,
-    const ColumnsDescription & columns_,
-    ContextPtr context_,
-    bool null_as_default_)
-    : output(output_), header(header_)
-{
-    auto dag = addMissingDefaults(header_, output->getHeader().getNamesAndTypesList(), columns_, context_, null_as_default_);
-    adding_defaults_actions = std::make_shared<ExpressionActions>(std::move(dag), ExpressionActionsSettings::fromContext(context_, CompileExpressions::yes));
-}
-
-void AddingDefaultBlockOutputStream::write(const Block & block)
-{
-    auto copy = block;
-    adding_defaults_actions->execute(copy);
-    output->write(copy);
-}
-
-void AddingDefaultBlockOutputStream::flush()
-{
-    output->flush();
-}
-
-void AddingDefaultBlockOutputStream::writePrefix()
-{
-    output->writePrefix();
-}
-
-void AddingDefaultBlockOutputStream::writeSuffix()
-{
-    output->writeSuffix();
-}
-
-}
diff --git a/src/DataStreams/AddingDefaultBlockOutputStream.h b/src/DataStreams/AddingDefaultBlockOutputStream.h
deleted file mode 100644
index 45ff30a3daa..00000000000
--- a/src/DataStreams/AddingDefaultBlockOutputStream.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockOutputStream.h>
-#include <Columns/ColumnConst.h>
-#include <Storages/ColumnsDescription.h>
-
-
-namespace DB
-{
-
-class ExpressionActions;
-using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
-
-class Context;
-
-/** This stream adds three types of columns into block
-  * 1. Columns, that are missed inside request, but present in table without defaults (missed columns)
-  * 2. Columns, that are missed inside request, but present in table with defaults (columns with default values)
-  * 3. Columns that materialized from other columns (materialized columns)
-  * Also the stream can substitute NULL into DEFAULT value in case of INSERT SELECT query (null_as_default) if according setting is 1.
-  * All three types of columns are materialized (not constants).
-  */
-class AddingDefaultBlockOutputStream : public IBlockOutputStream
-{
-public:
-    AddingDefaultBlockOutputStream(
-        const BlockOutputStreamPtr & output_,
-        const Block & header_,
-        const ColumnsDescription & columns_,
-        ContextPtr context_,
-        bool null_as_default_ = false);
-
-    Block getHeader() const override { return header; }
-    void write(const Block & block) override;
-
-    void flush() override;
-
-    void writePrefix() override;
-    void writeSuffix() override;
-
-private:
-    BlockOutputStreamPtr output;
-    const Block header;
-    ExpressionActionsPtr adding_defaults_actions;
-};
-
-
-}
diff --git a/src/DataStreams/AsynchronousBlockInputStream.cpp b/src/DataStreams/AsynchronousBlockInputStream.cpp
deleted file mode 100644
index 2aa70abd692..00000000000
--- a/src/DataStreams/AsynchronousBlockInputStream.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "AsynchronousBlockInputStream.h"
-#include <Common/setThreadName.h>
-#include <Common/CurrentThread.h>
-
-
-namespace DB
-{
-
-Block AsynchronousBlockInputStream::readImpl()
-{
-    /// If there were no calculations yet, calculate the first block synchronously
-    if (!started)
-    {
-        calculate();
-        started = true;
-    }
-    else    /// If the calculations are already in progress - wait for the result
-        pool.wait();
-
-    if (exception)
-        std::rethrow_exception(exception);
-
-    Block res = block;
-    if (!res)
-        return res;
-
-    /// Start the next block calculation
-    block.clear();
-    next();
-
-    return res;
-}
-
-
-void AsynchronousBlockInputStream::next()
-{
-    ready.reset();
-
-    pool.scheduleOrThrowOnError([this, thread_group = CurrentThread::getGroup()]()
-    {
-        CurrentMetrics::Increment metric_increment{CurrentMetrics::QueryThread};
-
-        try
-        {
-            if (first)
-                setThreadName("AsyncBlockInput");
-
-            /// AsynchronousBlockInputStream is used in Client which does not create queries and thread groups
-            if (thread_group)
-                CurrentThread::attachToIfDetached(thread_group);
-        }
-        catch (...)
-        {
-            exception = std::current_exception();
-            ready.set();
-            return;
-        }
-
-        calculate();
-    });
-}
-
-
-void AsynchronousBlockInputStream::calculate()
-{
-    try
-    {
-        if (first)
-        {
-            first = false;
-            children.back()->readPrefix();
-        }
-
-        block = children.back()->read();
-    }
-    catch (...)
-    {
-        exception = std::current_exception();
-    }
-
-    ready.set();
-}
-
-}
-
diff --git a/src/DataStreams/AsynchronousBlockInputStream.h b/src/DataStreams/AsynchronousBlockInputStream.h
deleted file mode 100644
index 77aeacf9c13..00000000000
--- a/src/DataStreams/AsynchronousBlockInputStream.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#pragma once
-
-#include <Poco/Event.h>
-
-#include <DataStreams/IBlockInputStream.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/ThreadPool.h>
-
-
-namespace CurrentMetrics
-{
-    extern const Metric QueryThread;
-}
-
-namespace DB
-{
-
-/** Executes another BlockInputStream in a separate thread.
-  * This serves two purposes:
-  * 1. Allows you to make the different stages of the query execution pipeline work in parallel.
-  * 2. Allows you not to wait until the data is ready, and periodically check their readiness without blocking.
-  *    This is necessary, for example, so that during the waiting period you can check if a packet
-  *     has come over the network with a request to interrupt the execution of the query.
-  *    It also allows you to execute multiple queries at the same time.
-  */
-class AsynchronousBlockInputStream : public IBlockInputStream
-{
-public:
-    AsynchronousBlockInputStream(const BlockInputStreamPtr & in)
-    {
-        children.push_back(in);
-    }
-
-    String getName() const override { return "Asynchronous"; }
-
-    void waitInnerThread()
-    {
-        if (started)
-            pool.wait();
-    }
-
-    void readPrefix() override
-    {
-        /// Do not call `readPrefix` on the child, so that the corresponding actions are performed in a separate thread.
-        if (!started)
-        {
-            next();
-            started = true;
-        }
-    }
-
-    void readSuffix() override
-    {
-        if (started)
-        {
-            pool.wait();
-            if (exception)
-                std::rethrow_exception(exception);
-            children.back()->readSuffix();
-            started = false;
-        }
-    }
-
-
-    /** Wait for the data to be ready no more than the specified timeout. Start receiving data if necessary.
-      * If the function returned true - the data is ready and you can do `read()`; You can not call the function just at the same moment again.
-      */
-    bool poll(UInt64 milliseconds)
-    {
-        if (!started)
-        {
-            next();
-            started = true;
-        }
-
-        return ready.tryWait(milliseconds);
-    }
-
-
-    Block getHeader() const override { return children.at(0)->getHeader(); }
-
-    void cancel(bool kill) override
-    {
-        IBlockInputStream::cancel(kill);
-
-        /// Wait for some background calculations to be sure,
-        ///  that after end of stream nothing is being executing.
-        if (started)
-            pool.wait();
-    }
-
-    ~AsynchronousBlockInputStream() override
-    {
-        if (started)
-            pool.wait();
-    }
-
-protected:
-    ThreadPool pool{1};
-    Poco::Event ready;
-    bool started = false;
-    bool first = true;
-
-    Block block;
-    std::exception_ptr exception;
-
-    Block readImpl() override;
-
-    void next();
-
-    /// Calculations that can be performed in a separate thread
-    void calculate();
-};
-
-}
-
diff --git a/src/DataStreams/BlockStreamProfileInfo.cpp b/src/DataStreams/BlockStreamProfileInfo.cpp
deleted file mode 100644
index 09ad8a8e4ac..00000000000
--- a/src/DataStreams/BlockStreamProfileInfo.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-#include <DataStreams/BlockStreamProfileInfo.h>
-#include <DataStreams/IBlockInputStream.h>
-
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-
-#include <Core/Block.h>
-
-namespace DB
-{
-
-void BlockStreamProfileInfo::read(ReadBuffer & in)
-{
-    readVarUInt(rows, in);
-    readVarUInt(blocks, in);
-    readVarUInt(bytes, in);
-    readBinary(applied_limit, in);
-    readVarUInt(rows_before_limit, in);
-    readBinary(calculated_rows_before_limit, in);
-}
-
-
-void BlockStreamProfileInfo::write(WriteBuffer & out) const
-{
-    writeVarUInt(rows, out);
-    writeVarUInt(blocks, out);
-    writeVarUInt(bytes, out);
-    writeBinary(hasAppliedLimit(), out);
-    writeVarUInt(getRowsBeforeLimit(), out);
-    writeBinary(calculated_rows_before_limit, out);
-}
-
-
-void BlockStreamProfileInfo::setFrom(const BlockStreamProfileInfo & rhs, bool skip_block_size_info)
-{
-    if (!skip_block_size_info)
-    {
-        rows = rhs.rows;
-        blocks = rhs.blocks;
-        bytes = rhs.bytes;
-    }
-    applied_limit = rhs.applied_limit;
-    rows_before_limit = rhs.rows_before_limit;
-    calculated_rows_before_limit = rhs.calculated_rows_before_limit;
-}
-
-
-size_t BlockStreamProfileInfo::getRowsBeforeLimit() const
-{
-    if (!calculated_rows_before_limit)
-        calculateRowsBeforeLimit();
-    return rows_before_limit;
-}
-
-
-bool BlockStreamProfileInfo::hasAppliedLimit() const
-{
-    if (!calculated_rows_before_limit)
-        calculateRowsBeforeLimit();
-    return applied_limit;
-}
-
-
-void BlockStreamProfileInfo::update(Block & block)
-{
-    update(block.rows(), block.bytes());
-}
-
-void BlockStreamProfileInfo::update(size_t num_rows, size_t num_bytes)
-{
-    ++blocks;
-    rows += num_rows;
-    bytes += num_bytes;
-}
-
-
-void BlockStreamProfileInfo::collectInfosForStreamsWithName(const char * name, BlockStreamProfileInfos & res) const
-{
-    if (!parent)
-        return;
-
-    if (parent->getName() == name)
-    {
-        res.push_back(this);
-        return;
-    }
-
-    parent->forEachChild([&] (IBlockInputStream & child)
-    {
-        child.getProfileInfo().collectInfosForStreamsWithName(name, res);
-        return false;
-    });
-}
-
-
-void BlockStreamProfileInfo::calculateRowsBeforeLimit() const
-{
-    calculated_rows_before_limit = true;
-
-    /// is there a Limit?
-    BlockStreamProfileInfos limits;
-    collectInfosForStreamsWithName("Limit", limits);
-
-    if (!limits.empty())
-    {
-        applied_limit = true;
-
-        /** Take the number of lines read below `PartialSorting`, if any, or below `Limit`.
-          * This is necessary, because sorting can return only part of the rows.
-          */
-        BlockStreamProfileInfos partial_sortings;
-        collectInfosForStreamsWithName("PartialSorting", partial_sortings);
-
-        BlockStreamProfileInfos & limits_or_sortings = partial_sortings.empty() ? limits : partial_sortings;
-
-        for (const BlockStreamProfileInfo * info_limit_or_sort : limits_or_sortings)
-        {
-            info_limit_or_sort->parent->forEachChild([&] (IBlockInputStream & child)
-            {
-                rows_before_limit += child.getProfileInfo().rows;
-                return false;
-            });
-        }
-    }
-    else
-    {
-        /// Then the data about `rows_before_limit` can be in `RemoteBlockInputStream` (come from a remote server).
-        BlockStreamProfileInfos remotes;
-        collectInfosForStreamsWithName("Remote", remotes);
-        collectInfosForStreamsWithName("TreeExecutor", remotes);
-
-        if (remotes.empty())
-            return;
-
-        for (const auto & info : remotes)
-        {
-            if (info->applied_limit)
-            {
-                applied_limit = true;
-                rows_before_limit += info->rows_before_limit;
-            }
-        }
-    }
-}
-
-}
diff --git a/src/DataStreams/ColumnGathererStream.cpp b/src/DataStreams/ColumnGathererStream.cpp
deleted file mode 100644
index 683b8012efe..00000000000
--- a/src/DataStreams/ColumnGathererStream.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#include <DataStreams/ColumnGathererStream.h>
-#include <common/logger_useful.h>
-#include <Common/typeid_cast.h>
-#include <Common/formatReadable.h>
-#include <IO/WriteHelpers.h>
-#include <iomanip>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int INCOMPATIBLE_COLUMNS;
-    extern const int INCORRECT_NUMBER_OF_COLUMNS;
-    extern const int EMPTY_DATA_PASSED;
-    extern const int RECEIVED_EMPTY_DATA;
-}
-
-ColumnGathererStream::ColumnGathererStream(
-        const String & column_name_, const BlockInputStreams & source_streams, ReadBuffer & row_sources_buf_,
-        size_t block_preferred_size_)
-    : column_name(column_name_), sources(source_streams.size()), row_sources_buf(row_sources_buf_)
-    , block_preferred_size(block_preferred_size_), log(&Poco::Logger::get("ColumnGathererStream"))
-{
-    if (source_streams.empty())
-        throw Exception("There are no streams to gather", ErrorCodes::EMPTY_DATA_PASSED);
-
-    children.assign(source_streams.begin(), source_streams.end());
-
-    for (size_t i = 0; i < children.size(); ++i)
-    {
-        const Block & header = children[i]->getHeader();
-
-        /// Sometimes MergeTreeReader injects additional column with partitioning key
-        if (header.columns() > 2)
-            throw Exception(
-                "Block should have 1 or 2 columns, but contains " + toString(header.columns()),
-                ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS);
-
-        if (i == 0)
-        {
-            column.name = column_name;
-            column.type = header.getByName(column_name).type;
-            column.column = column.type->createColumn();
-        }
-        else if (header.getByName(column_name).column->getName() != column.column->getName())
-            throw Exception("Column types don't match", ErrorCodes::INCOMPATIBLE_COLUMNS);
-    }
-}
-
-
-Block ColumnGathererStream::readImpl()
-{
-    /// Special case: single source and there are no skipped rows
-    if (children.size() == 1 && row_sources_buf.eof() && !source_to_fully_copy)
-        return children[0]->read();
-
-    if (!source_to_fully_copy && row_sources_buf.eof())
-        return Block();
-
-    MutableColumnPtr output_column = column.column->cloneEmpty();
-    output_block = Block{column.cloneEmpty()};
-    /// Surprisingly this call may directly change output_block, bypassing
-    /// output_column. See ColumnGathererStream::gather.
-    output_column->gather(*this);
-    if (!output_column->empty())
-        output_block.getByPosition(0).column = std::move(output_column);
-
-    return output_block;
-}
-
-
-void ColumnGathererStream::fetchNewBlock(Source & source, size_t source_num)
-{
-    try
-    {
-        source.block = children[source_num]->read();
-        source.update(column_name);
-    }
-    catch (Exception & e)
-    {
-        e.addMessage("Cannot fetch required block. Stream " + children[source_num]->getName() + ", part " + toString(source_num));
-        throw;
-    }
-
-    if (0 == source.size)
-    {
-        throw Exception("Fetched block is empty. Stream " + children[source_num]->getName() + ", part " + toString(source_num),
-                        ErrorCodes::RECEIVED_EMPTY_DATA);
-    }
-}
-
-
-void ColumnGathererStream::readSuffixImpl()
-{
-    const BlockStreamProfileInfo & profile_info = getProfileInfo();
-
-    /// Don't print info for small parts (< 10M rows)
-    if (profile_info.rows < 10000000)
-        return;
-
-    double seconds = profile_info.total_stopwatch.elapsedSeconds();
-
-    if (!seconds)
-        LOG_DEBUG(log, "Gathered column {} ({} bytes/elem.) in 0 sec.",
-            column_name, static_cast<double>(profile_info.bytes) / profile_info.rows);
-    else
-        LOG_DEBUG(log, "Gathered column {} ({} bytes/elem.) in {} sec., {} rows/sec., {}/sec.",
-            column_name, static_cast<double>(profile_info.bytes) / profile_info.rows, seconds,
-            profile_info.rows / seconds, ReadableSize(profile_info.bytes / seconds));
-}
-
-}
diff --git a/src/DataStreams/ConvertingBlockInputStream.cpp b/src/DataStreams/ConvertingBlockInputStream.cpp
deleted file mode 100644
index 826e802296e..00000000000
--- a/src/DataStreams/ConvertingBlockInputStream.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include <DataStreams/ConvertingBlockInputStream.h>
-#include <Interpreters/castColumn.h>
-#include <Columns/ColumnConst.h>
-#include <Common/assert_cast.h>
-#include <Common/quoteString.h>
-#include <Parsers/IAST.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int THERE_IS_NO_COLUMN;
-    extern const int ILLEGAL_COLUMN;
-    extern const int NUMBER_OF_COLUMNS_DOESNT_MATCH;
-}
-
-
-static ColumnPtr castColumnWithDiagnostic(const ColumnWithTypeAndName & src_elem, const ColumnWithTypeAndName & res_elem)
-{
-    try
-    {
-        return castColumn(src_elem, res_elem.type);
-    }
-    catch (Exception & e)
-    {
-        e.addMessage("while converting source column " + backQuoteIfNeed(src_elem.name) + " to destination column " + backQuoteIfNeed(res_elem.name));
-        throw;
-    }
-}
-
-
-ConvertingBlockInputStream::ConvertingBlockInputStream(
-    const BlockInputStreamPtr & input,
-    const Block & result_header,
-    MatchColumnsMode mode)
-    : header(result_header), conversion(header.columns())
-{
-    children.emplace_back(input);
-
-    Block input_header = input->getHeader();
-
-    size_t num_input_columns = input_header.columns();
-    size_t num_result_columns = result_header.columns();
-
-    if (mode == MatchColumnsMode::Position && num_input_columns != num_result_columns)
-        throw Exception("Number of columns doesn't match", ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH);
-
-    for (size_t result_col_num = 0; result_col_num < num_result_columns; ++result_col_num)
-    {
-        const auto & res_elem = result_header.getByPosition(result_col_num);
-
-        switch (mode)
-        {
-            case MatchColumnsMode::Position:
-                conversion[result_col_num] = result_col_num;
-                break;
-
-            case MatchColumnsMode::Name:
-                if (input_header.has(res_elem.name))
-                    conversion[result_col_num] = input_header.getPositionByName(res_elem.name);
-                else
-                    throw Exception("Cannot find column " + backQuote(res_elem.name) + " in source stream",
-                        ErrorCodes::THERE_IS_NO_COLUMN);
-                break;
-        }
-
-        const auto & src_elem = input_header.getByPosition(conversion[result_col_num]);
-
-        /// Check constants.
-
-        if (isColumnConst(*res_elem.column))
-        {
-            if (!isColumnConst(*src_elem.column))
-                throw Exception("Cannot convert column " + backQuoteIfNeed(res_elem.name)
-                    + " because it is non constant in source stream but must be constant in result",
-                    ErrorCodes::ILLEGAL_COLUMN);
-            else if (assert_cast<const ColumnConst &>(*src_elem.column).getField() != assert_cast<const ColumnConst &>(*res_elem.column).getField())
-                throw Exception("Cannot convert column " + backQuoteIfNeed(res_elem.name)
-                    + " because it is constant but values of constants are different in source and result",
-                    ErrorCodes::ILLEGAL_COLUMN);
-        }
-
-        /// Check conversion by dry run CAST function.
-
-        castColumnWithDiagnostic(src_elem, res_elem);
-    }
-}
-
-
-Block ConvertingBlockInputStream::readImpl()
-{
-    Block src = children.back()->read();
-
-    if (!src)
-        return src;
-
-    Block res = header.cloneEmpty();
-    /// This is important because header.cloneEmpty() doesn't copy info about aggregation bucket.
-    /// Otherwise information in buckets may be lost (and aggregation will return wrong result).
-    res.info = src.info;
-
-    for (size_t res_pos = 0, size = conversion.size(); res_pos < size; ++res_pos)
-    {
-        const auto & src_elem = src.getByPosition(conversion[res_pos]);
-        auto & res_elem = res.getByPosition(res_pos);
-
-        ColumnPtr converted = castColumnWithDiagnostic(src_elem, res_elem);
-
-        if (isColumnConst(*src_elem.column) && !isColumnConst(*res_elem.column))
-            converted = converted->convertToFullColumnIfConst();
-
-        res_elem.column = std::move(converted);
-    }
-    return res;
-}
-
-}
diff --git a/src/DataStreams/ConvertingBlockInputStream.h b/src/DataStreams/ConvertingBlockInputStream.h
deleted file mode 100644
index b0324618408..00000000000
--- a/src/DataStreams/ConvertingBlockInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-#include <DataStreams/IBlockInputStream.h>
-
-
-namespace DB
-{
-
-/** Convert one block structure to another:
-  *
-  * Leaves only necessary columns;
-  *
-  * Columns are searched in source first by name;
-  *  and if there is no column with same name, then by position.
-  *
-  * Converting types of matching columns (with CAST function).
-  *
-  * Materializing columns which are const in source and non-const in result,
-  *  throw if they are const in result and non const in source,
-  *   or if they are const and have different values.
-  */
-class ConvertingBlockInputStream : public IBlockInputStream
-{
-public:
-    enum class MatchColumnsMode
-    {
-        /// Require same number of columns in source and result. Match columns by corresponding positions, regardless to names.
-        Position,
-        /// Find columns in source by their names. Allow excessive columns in source.
-        Name
-    };
-
-    ConvertingBlockInputStream(
-        const BlockInputStreamPtr & input,
-        const Block & result_header,
-        MatchColumnsMode mode);
-
-    String getName() const override { return "Converting"; }
-    Block getHeader() const override { return header; }
-
-private:
-    Block readImpl() override;
-
-    Block header;
-
-    /// How to construct result block. Position in source block, where to get each column.
-    using Conversion = std::vector<size_t>;
-    Conversion conversion;
-};
-
-}
diff --git a/src/DataStreams/CountingBlockOutputStream.cpp b/src/DataStreams/CountingBlockOutputStream.cpp
deleted file mode 100644
index 6594b3b2ce1..00000000000
--- a/src/DataStreams/CountingBlockOutputStream.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <DataStreams/CountingBlockOutputStream.h>
-#include <Common/ProfileEvents.h>
-
-
-namespace ProfileEvents
-{
-    extern const Event InsertedRows;
-    extern const Event InsertedBytes;
-}
-
-
-namespace DB
-{
-
-void CountingBlockOutputStream::write(const Block & block)
-{
-    stream->write(block);
-
-    Progress local_progress(block.rows(), block.bytes(), 0);
-    progress.incrementPiecewiseAtomically(local_progress);
-
-    ProfileEvents::increment(ProfileEvents::InsertedRows, local_progress.read_rows);
-    ProfileEvents::increment(ProfileEvents::InsertedBytes, local_progress.read_bytes);
-
-    if (process_elem)
-        process_elem->updateProgressOut(local_progress);
-
-    if (progress_callback)
-        progress_callback(local_progress);
-}
-
-}
diff --git a/src/DataStreams/CountingBlockOutputStream.h b/src/DataStreams/CountingBlockOutputStream.h
deleted file mode 100644
index c7247b39945..00000000000
--- a/src/DataStreams/CountingBlockOutputStream.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockOutputStream.h>
-#include <Interpreters/ProcessList.h>
-
-
-namespace DB
-{
-
-
-/// Proxy class which counts number of written block, rows, bytes
-class CountingBlockOutputStream : public IBlockOutputStream
-{
-public:
-    CountingBlockOutputStream(const BlockOutputStreamPtr & stream_)
-        : stream(stream_) {}
-
-    void setProgressCallback(const ProgressCallback & callback)
-    {
-        progress_callback = callback;
-    }
-
-    void setProcessListElement(QueryStatus * elem)
-    {
-        process_elem = elem;
-    }
-
-    const Progress & getProgress() const
-    {
-        return progress;
-    }
-
-    Block getHeader() const override { return stream->getHeader(); }
-    void write(const Block & block) override;
-
-    void writePrefix() override                         { stream->writePrefix(); }
-    void writeSuffix() override                         { stream->writeSuffix(); }
-    void flush() override                               { stream->flush(); }
-    void onProgress(const Progress & current_progress) override { stream->onProgress(current_progress); }
-    String getContentType() const override              { return stream->getContentType(); }
-
-protected:
-    BlockOutputStreamPtr stream;
-    Progress progress;
-    ProgressCallback progress_callback;
-    QueryStatus * process_elem = nullptr;
-};
-
-}
diff --git a/src/DataStreams/ExpressionBlockInputStream.cpp b/src/DataStreams/ExpressionBlockInputStream.cpp
deleted file mode 100644
index 4840a6263f6..00000000000
--- a/src/DataStreams/ExpressionBlockInputStream.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Interpreters/ExpressionActions.h>
-#include <DataStreams/ExpressionBlockInputStream.h>
-
-
-namespace DB
-{
-
-ExpressionBlockInputStream::ExpressionBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_)
-    : expression(expression_)
-{
-    children.push_back(input);
-    cached_header = children.back()->getHeader();
-    expression->execute(cached_header, true);
-}
-
-String ExpressionBlockInputStream::getName() const { return "Expression"; }
-
-Block ExpressionBlockInputStream::getTotals()
-{
-    totals = children.back()->getTotals();
-    expression->execute(totals);
-
-    return totals;
-}
-
-Block ExpressionBlockInputStream::getHeader() const
-{
-    return cached_header.cloneEmpty();
-}
-
-Block ExpressionBlockInputStream::readImpl()
-{
-    Block res = children.back()->read();
-    if (res)
-        expression->execute(res);
-    return res;
-}
-
-}
diff --git a/src/DataStreams/ExpressionBlockInputStream.h b/src/DataStreams/ExpressionBlockInputStream.h
deleted file mode 100644
index fae54fbcfbf..00000000000
--- a/src/DataStreams/ExpressionBlockInputStream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-
-
-namespace DB
-{
-
-class ExpressionActions;
-
-/** Executes a certain expression over the block.
-  * The expression consists of column identifiers from the block, constants, common functions.
-  * For example: hits * 2 + 3, url LIKE '%yandex%'
-  * The expression processes each row independently of the others.
-  */
-class ExpressionBlockInputStream : public IBlockInputStream
-{
-public:
-    using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
-
-    ExpressionBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_);
-
-    String getName() const override;
-    Block getTotals() override;
-    Block getHeader() const override;
-
-protected:
-    ExpressionActionsPtr expression;
-
-    Block readImpl() override;
-
-private:
-    Block cached_header;
-};
-
-/// ExpressionBlockInputStream that could generate many out blocks for single input block.
-class InflatingExpressionBlockInputStream : public ExpressionBlockInputStream
-{
-public:
-    InflatingExpressionBlockInputStream(const BlockInputStreamPtr & input, const ExpressionActionsPtr & expression_)
-    :   ExpressionBlockInputStream(input, expression_)
-    {}
-
-protected:
-    Block readImpl() override;
-
-private:
-    ExtraBlockPtr not_processed;
-    size_t action_number = 0;
-};
-
-}
diff --git a/src/DataStreams/IBlockInputStream.cpp b/src/DataStreams/IBlockInputStream.cpp
deleted file mode 100644
index c3071cdcf20..00000000000
--- a/src/DataStreams/IBlockInputStream.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-#include <DataStreams/IBlockInputStream.h>
-
-#include <Core/Field.h>
-#include <Interpreters/ProcessList.h>
-#include <Access/EnabledQuota.h>
-#include <Common/CurrentThread.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
-
-namespace ProfileEvents
-{
-    extern const Event ThrottlerSleepMicroseconds;
-    extern const Event SelectedRows;
-    extern const Event SelectedBytes;
-}
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int QUERY_WAS_CANCELLED;
-    extern const int TOO_MANY_ROWS;
-    extern const int TOO_MANY_BYTES;
-    extern const int TOO_MANY_ROWS_OR_BYTES;
-    extern const int LOGICAL_ERROR;
-}
-
-
-/// It's safe to access children without mutex as long as these methods are called before first call to `read()` or `readPrefix()`.
-
-
-Block IBlockInputStream::read()
-{
-    if (total_rows_approx)
-    {
-        progressImpl(Progress(0, 0, total_rows_approx));
-        total_rows_approx = 0;
-    }
-
-    if (!info.started)
-    {
-        info.total_stopwatch.start();
-        info.started = true;
-    }
-
-    Block res;
-
-    if (isCancelledOrThrowIfKilled())
-        return res;
-
-    if (!checkTimeLimit())
-        limit_exceeded_need_break = true;
-
-    if (!limit_exceeded_need_break)
-        res = readImpl();
-
-    if (res)
-    {
-        info.update(res);
-
-        if (enabled_extremes)
-            updateExtremes(res);
-
-        if (limits.mode == LimitsMode::LIMITS_CURRENT && !limits.size_limits.check(info.rows, info.bytes, "result", ErrorCodes::TOO_MANY_ROWS_OR_BYTES))
-            limit_exceeded_need_break = true;
-
-        if (quota)
-            checkQuota(res);
-    }
-    else
-    {
-        /** If the stream is over, then we will ask all children to abort the execution.
-          * This makes sense when running a query with LIMIT
-          * - there is a situation when all the necessary data has already been read,
-          *   but children sources are still working,
-          *   herewith they can work in separate threads or even remotely.
-          */
-        cancel(false);
-    }
-
-    progress(Progress(res.rows(), res.bytes()));
-
-#ifndef NDEBUG
-    if (res)
-    {
-        Block header = getHeader();
-        if (header)
-            assertBlocksHaveEqualStructure(res, header, getName());
-    }
-#endif
-
-    return res;
-}
-
-
-void IBlockInputStream::readPrefix()
-{
-#ifndef NDEBUG
-    if (!read_prefix_is_called)
-        read_prefix_is_called = true;
-    else
-        throw Exception("readPrefix is called twice for " + getName() + " stream", ErrorCodes::LOGICAL_ERROR);
-#endif
-
-    readPrefixImpl();
-
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        child.readPrefix();
-        return false;
-    });
-}
-
-
-void IBlockInputStream::readSuffix()
-{
-#ifndef NDEBUG
-    if (!read_suffix_is_called)
-        read_suffix_is_called = true;
-    else
-        throw Exception("readSuffix is called twice for " + getName() + " stream", ErrorCodes::LOGICAL_ERROR);
-#endif
-
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        child.readSuffix();
-        return false;
-    });
-
-    readSuffixImpl();
-}
-
-
-void IBlockInputStream::updateExtremes(Block & block)
-{
-    size_t num_columns = block.columns();
-
-    if (!extremes)
-    {
-        MutableColumns extremes_columns(num_columns);
-
-        for (size_t i = 0; i < num_columns; ++i)
-        {
-            const ColumnPtr & src = block.safeGetByPosition(i).column;
-
-            if (isColumnConst(*src))
-            {
-                /// Equal min and max.
-                extremes_columns[i] = src->cloneResized(2);
-            }
-            else
-            {
-                Field min_value;
-                Field max_value;
-
-                src->getExtremes(min_value, max_value);
-
-                extremes_columns[i] = src->cloneEmpty();
-
-                extremes_columns[i]->insert(min_value);
-                extremes_columns[i]->insert(max_value);
-            }
-        }
-
-        extremes = block.cloneWithColumns(std::move(extremes_columns));
-    }
-    else
-    {
-        for (size_t i = 0; i < num_columns; ++i)
-        {
-            ColumnPtr & old_extremes = extremes.safeGetByPosition(i).column;
-
-            if (isColumnConst(*old_extremes))
-                continue;
-
-            Field min_value = (*old_extremes)[0];
-            Field max_value = (*old_extremes)[1];
-
-            Field cur_min_value;
-            Field cur_max_value;
-
-            block.safeGetByPosition(i).column->getExtremes(cur_min_value, cur_max_value);
-
-            if (cur_min_value < min_value)
-                min_value = cur_min_value;
-            if (cur_max_value > max_value)
-                max_value = cur_max_value;
-
-            MutableColumnPtr new_extremes = old_extremes->cloneEmpty();
-
-            new_extremes->insert(min_value);
-            new_extremes->insert(max_value);
-
-            old_extremes = std::move(new_extremes);
-        }
-    }
-}
-
-
-bool IBlockInputStream::checkTimeLimit() const
-{
-    return limits.speed_limits.checkTimeLimit(info.total_stopwatch.elapsed(), limits.timeout_overflow_mode);
-}
-
-
-void IBlockInputStream::checkQuota(Block & block)
-{
-    switch (limits.mode)
-    {
-        case LimitsMode::LIMITS_TOTAL:
-            /// Checked in `progress` method.
-            break;
-
-        case LimitsMode::LIMITS_CURRENT:
-        {
-            UInt64 total_elapsed = info.total_stopwatch.elapsedNanoseconds();
-            quota->used({Quota::RESULT_ROWS, block.rows()}, {Quota::RESULT_BYTES, block.bytes()}, {Quota::EXECUTION_TIME, total_elapsed - prev_elapsed});
-            prev_elapsed = total_elapsed;
-            break;
-        }
-    }
-}
-
-
-void IBlockInputStream::progressImpl(const Progress & value)
-{
-    if (progress_callback)
-        progress_callback(value);
-
-    if (process_list_elem)
-    {
-        if (!process_list_elem->updateProgressIn(value))
-            cancel(/* kill */ true);
-
-        /// The total amount of data processed or intended for processing in all leaf sources, possibly on remote servers.
-
-        ProgressValues progress = process_list_elem->getProgressIn();
-        size_t total_rows_estimate = std::max(progress.read_rows, progress.total_rows_to_read);
-
-        /** Check the restrictions on the amount of data to read, the speed of the query, the quota on the amount of data to read.
-            * NOTE: Maybe it makes sense to have them checked directly in ProcessList?
-            */
-        if (limits.mode == LimitsMode::LIMITS_TOTAL)
-        {
-            if (!limits.size_limits.check(total_rows_estimate, progress.read_bytes, "rows to read",
-                                         ErrorCodes::TOO_MANY_ROWS, ErrorCodes::TOO_MANY_BYTES))
-                cancel(false);
-        }
-
-        size_t total_rows = progress.total_rows_to_read;
-
-        constexpr UInt64 profile_events_update_period_microseconds = 10 * 1000; // 10 milliseconds
-        UInt64 total_elapsed_microseconds = info.total_stopwatch.elapsedMicroseconds();
-
-        if (last_profile_events_update_time + profile_events_update_period_microseconds < total_elapsed_microseconds)
-        {
-            CurrentThread::updatePerformanceCounters();
-            last_profile_events_update_time = total_elapsed_microseconds;
-        }
-
-        limits.speed_limits.throttle(progress.read_rows, progress.read_bytes, total_rows, total_elapsed_microseconds);
-
-        if (quota && limits.mode == LimitsMode::LIMITS_TOTAL)
-            quota->used({Quota::READ_ROWS, value.read_rows}, {Quota::READ_BYTES, value.read_bytes});
-    }
-
-    ProfileEvents::increment(ProfileEvents::SelectedRows, value.read_rows);
-    ProfileEvents::increment(ProfileEvents::SelectedBytes, value.read_bytes);
-}
-
-
-void IBlockInputStream::cancel(bool kill)
-{
-    if (kill)
-        is_killed = true;
-
-    bool old_val = false;
-    if (!is_cancelled.compare_exchange_strong(old_val, true, std::memory_order_seq_cst, std::memory_order_relaxed))
-        return;
-
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        child.cancel(kill);
-        return false;
-    });
-}
-
-
-bool IBlockInputStream::isCancelled() const
-{
-    return is_cancelled;
-}
-
-bool IBlockInputStream::isCancelledOrThrowIfKilled() const
-{
-    if (!is_cancelled)
-        return false;
-    if (is_killed)
-        throw Exception("Query was cancelled", ErrorCodes::QUERY_WAS_CANCELLED);
-    return true;
-}
-
-
-void IBlockInputStream::setProgressCallback(const ProgressCallback & callback)
-{
-    progress_callback = callback;
-
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        child.setProgressCallback(callback);
-        return false;
-    });
-}
-
-
-void IBlockInputStream::setProcessListElement(QueryStatus * elem)
-{
-    process_list_elem = elem;
-
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        child.setProcessListElement(elem);
-        return false;
-    });
-}
-
-
-Block IBlockInputStream::getTotals()
-{
-    if (totals)
-        return totals;
-
-    Block res;
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        res = child.getTotals();
-        return bool(res);
-    });
-    return res;
-}
-
-
-Block IBlockInputStream::getExtremes()
-{
-    if (extremes)
-        return extremes;
-
-    Block res;
-    forEachChild([&] (IBlockInputStream & child)
-    {
-        res = child.getExtremes();
-        return bool(res);
-    });
-    return res;
-}
-
-}
diff --git a/src/DataStreams/IBlockInputStream.h b/src/DataStreams/IBlockInputStream.h
deleted file mode 100644
index 8b3e2512e47..00000000000
--- a/src/DataStreams/IBlockInputStream.h
+++ /dev/null
@@ -1,271 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <DataStreams/BlockStreamProfileInfo.h>
-#include <DataStreams/ExecutionSpeedLimits.h>
-#include <DataStreams/SizeLimits.h>
-#include <DataStreams/StreamLocalLimits.h>
-#include <IO/Progress.h>
-#include <Storages/TableLockHolder.h>
-#include <Common/TypePromotion.h>
-
-#include <atomic>
-#include <shared_mutex>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-}
-
-class ProcessListElement;
-class EnabledQuota;
-class QueryStatus;
-
-
-/** The stream interface for reading data by blocks from the database.
-  * Relational operations are supposed to be done also as implementations of this interface.
-  * Watches out at how the source of the blocks works.
-  * Lets you get information for profiling: rows per second, blocks per second, megabytes per second, etc.
-  * Allows you to stop reading data (in nested sources).
-  */
-class IBlockInputStream : public TypePromotion<IBlockInputStream>
-{
-    friend struct BlockStreamProfileInfo;
-
-public:
-    IBlockInputStream() { info.parent = this; }
-    virtual ~IBlockInputStream() {}
-
-    IBlockInputStream(const IBlockInputStream &) = delete;
-    IBlockInputStream & operator=(const IBlockInputStream &) = delete;
-
-    /// To output the data stream transformation tree (query execution plan).
-    virtual String getName() const = 0;
-
-    /** Get data structure of the stream in a form of "header" block (it is also called "sample block").
-      * Header block contains column names, data types, columns of size 0. Constant columns must have corresponding values.
-      * It is guaranteed that method "read" returns blocks of exactly that structure.
-      */
-    virtual Block getHeader() const = 0;
-
-    virtual const BlockMissingValues & getMissingValues() const
-    {
-        static const BlockMissingValues none;
-        return none;
-    }
-
-    /** Read next block.
-      * If there are no more blocks, return an empty block (for which operator `bool` returns false).
-      * NOTE: Only one thread can read from one instance of IBlockInputStream simultaneously.
-      * This also applies for readPrefix, readSuffix.
-      */
-    Block read();
-
-    /** Read something before starting all data or after the end of all data.
-      * In the `readSuffix` function, you can implement a finalization that can lead to an exception.
-      * readPrefix() must be called before the first call to read().
-      * readSuffix() should be called after read() returns an empty block, or after a call to cancel(), but not during read() execution.
-      */
-
-    /** The default implementation calls readPrefixImpl() on itself, and then readPrefix() recursively for all children.
-      * There are cases when you do not want `readPrefix` of children to be called synchronously, in this function,
-      *  but you want them to be called, for example, in separate threads (for parallel initialization of children).
-      * Then overload `readPrefix` function.
-      */
-    virtual void readPrefix();
-
-    /** The default implementation calls recursively readSuffix() on all children, and then readSuffixImpl() on itself.
-      * If this stream calls read() in children in a separate thread, this behavior is usually incorrect:
-      * readSuffix() of the child can not be called at the moment when the same child's read() is executed in another thread.
-      * In this case, you need to override this method so that readSuffix() in children is called, for example, after connecting streams.
-      */
-    virtual void readSuffix();
-
-    /// Do not allow to change the table while the blocks stream and its children are alive.
-    void addTableLock(const TableLockHolder & lock) { table_locks.push_back(lock); }
-
-    /// Get information about execution speed.
-    const BlockStreamProfileInfo & getProfileInfo() const { return info; }
-
-    /** Get "total" values.
-      * The default implementation takes them from itself or from the first child source in which they are.
-      * The overridden method can perform some calculations. For example, apply an expression to the `totals` of the child source.
-      * There can be no total values - then an empty block is returned.
-      *
-      * Call this method only after all the data has been retrieved with `read`,
-      *  otherwise there will be problems if any data at the same time is computed in another thread.
-      */
-    virtual Block getTotals();
-
-    /// The same for minimums and maximums.
-    virtual Block getExtremes();
-
-
-    /** Set the execution progress bar callback.
-      * The callback is passed to all child sources.
-      * By default, it is called for leaf sources, after each block.
-      * (But this can be overridden in the progress() method)
-      * The function takes the number of rows in the last block, the number of bytes in the last block.
-      * Note that the callback can be called from different threads.
-      */
-    virtual void setProgressCallback(const ProgressCallback & callback);
-
-
-    /** In this method:
-      * - the progress callback is called;
-      * - the status of the query execution in ProcessList is updated;
-      * - checks restrictions and quotas that should be checked not within the same source,
-      *   but over the total amount of resources spent in all sources at once (information in the ProcessList).
-      */
-    virtual void progress(const Progress & value)
-    {
-        /// The data for progress is taken from leaf sources.
-        if (children.empty())
-            progressImpl(value);
-    }
-
-    void progressImpl(const Progress & value);
-
-
-    /** Set the pointer to the process list item.
-      * It is passed to all child sources.
-      * General information about the resources spent on the request will be written into it.
-      * Based on this information, the quota and some restrictions will be checked.
-      * This information will also be available in the SHOW PROCESSLIST request.
-      */
-    virtual void setProcessListElement(QueryStatus * elem);
-
-    /** Set the approximate total number of rows to read.
-      */
-    void addTotalRowsApprox(size_t value) { total_rows_approx += value; }
-
-
-    /** Ask to abort the receipt of data as soon as possible.
-      * By default - just sets the flag is_cancelled and asks that all children be interrupted.
-      * This function can be called several times, including simultaneously from different threads.
-      * Have two modes:
-      *  with kill = false only is_cancelled is set - streams will stop silently with returning some processed data.
-      *  with kill = true also is_killed set - queries will stop with exception.
-      */
-    virtual void cancel(bool kill);
-
-    bool isCancelled() const;
-    bool isCancelledOrThrowIfKilled() const;
-
-    /** Set limitations that checked on each block. */
-    virtual void setLimits(const StreamLocalLimits & limits_)
-    {
-        limits = limits_;
-    }
-
-    const StreamLocalLimits & getLimits() const
-    {
-        return limits;
-    }
-
-    /** Set the quota. If you set a quota on the amount of raw data,
-      * then you should also set mode = LIMITS_TOTAL to LocalLimits with setLimits.
-      */
-    virtual void setQuota(const std::shared_ptr<const EnabledQuota> & new_quota)
-    {
-        quota = new_quota;
-    }
-
-    /// Enable calculation of minimums and maximums by the result columns.
-    void enableExtremes() { enabled_extremes = true; }
-
-protected:
-    /// Order is important: `table_locks` must be destroyed after `children` so that tables from
-    /// which child streams read are protected by the locks during the lifetime of the child streams.
-    std::vector<TableLockHolder> table_locks;
-
-    BlockInputStreams children;
-    std::shared_mutex children_mutex;
-
-    BlockStreamProfileInfo info;
-    std::atomic<bool> is_cancelled{false};
-    std::atomic<bool> is_killed{false};
-    ProgressCallback progress_callback;
-    QueryStatus * process_list_elem = nullptr;
-    /// According to total_stopwatch in microseconds
-    UInt64 last_profile_events_update_time = 0;
-
-    /// Additional information that can be generated during the work process.
-
-    /// Total values during aggregation.
-    Block totals;
-    /// Minimums and maximums. The first row of the block - minimums, the second - the maximums.
-    Block extremes;
-
-
-    void addChild(const BlockInputStreamPtr & child)
-    {
-        std::unique_lock lock(children_mutex);
-        children.push_back(child);
-    }
-
-    /** Check limits.
-      * But only those that can be checked within each separate stream.
-      */
-    bool checkTimeLimit() const;
-
-#ifndef NDEBUG
-    bool read_prefix_is_called = false;
-    bool read_suffix_is_called = false;
-#endif
-
-private:
-    bool enabled_extremes = false;
-
-    /// The limit on the number of rows/bytes has been exceeded, and you need to stop execution on the next `read` call, as if the thread has run out.
-    bool limit_exceeded_need_break = false;
-
-    /// Limitations and quotas.
-
-    StreamLocalLimits limits;
-
-    std::shared_ptr<const EnabledQuota> quota;    /// If nullptr - the quota is not used.
-    UInt64 prev_elapsed = 0;
-
-    /// The approximate total number of rows to read. For progress bar.
-    size_t total_rows_approx = 0;
-
-    /// Derived classes must implement this function.
-    virtual Block readImpl() = 0;
-
-    /// Here you can do a preliminary initialization.
-    virtual void readPrefixImpl() {}
-
-    /// Here you need to do a finalization, which can lead to an exception.
-    virtual void readSuffixImpl() {}
-
-    void updateExtremes(Block & block);
-
-    /** Check quotas.
-      * But only those that can be checked within each separate stream.
-      */
-    void checkQuota(Block & block);
-
-    size_t checkDepthImpl(size_t max_depth, size_t level) const;
-
-    template <typename F>
-    void forEachChild(F && f)
-    {
-        /// NOTE: Acquire a read lock, therefore f() should be thread safe
-        std::shared_lock lock(children_mutex);
-
-        // Reduce lock scope and avoid recursive locking since that is undefined for shared_mutex.
-        const auto children_copy = children;
-        lock.unlock();
-
-        for (auto & child : children_copy)
-            if (f(*child))
-                return;
-    }
-
-};
-
-}
diff --git a/src/DataStreams/IBlockOutputStream.h b/src/DataStreams/IBlockOutputStream.h
deleted file mode 100644
index 79c13b6fa47..00000000000
--- a/src/DataStreams/IBlockOutputStream.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <DataStreams/IBlockStream_fwd.h>
-#include <Storages/TableLockHolder.h>
-
-#include <boost/noncopyable.hpp>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-
-namespace DB
-{
-
-struct Progress;
-
-/** Interface of stream for writing data (into table, filesystem, network, terminal, etc.)
-  */
-class IBlockOutputStream : private boost::noncopyable
-{
-public:
-    IBlockOutputStream() {}
-
-    /** Get data structure of the stream in a form of "header" block (it is also called "sample block").
-      * Header block contains column names, data types, columns of size 0. Constant columns must have corresponding values.
-      * You must pass blocks of exactly this structure to the 'write' method.
-      */
-    virtual Block getHeader() const = 0;
-
-    /** Write block.
-      */
-    virtual void write(const Block & block) = 0;
-
-    /** Write or do something before all data or after all data.
-      */
-    virtual void writePrefix() {}
-    virtual void writeSuffix() {}
-
-    /** Flush output buffers if any.
-      */
-    virtual void flush() {}
-
-    /** Methods to set additional information for output in formats, that support it.
-      */
-    virtual void setRowsBeforeLimit(size_t /*rows_before_limit*/) {}
-    virtual void setTotals(const Block & /*totals*/) {}
-    virtual void setExtremes(const Block & /*extremes*/) {}
-
-    /** Notify about progress. Method could be called from different threads.
-      * Passed value are delta, that must be summarized.
-      */
-    virtual void onProgress(const Progress & /*progress*/) {}
-
-    /** Content-Type to set when sending HTTP response.
-      */
-    virtual std::string getContentType() const { return "text/plain; charset=UTF-8"; }
-
-    virtual ~IBlockOutputStream() = default;
-
-    /** Don't let to alter table while instance of stream is alive.
-      */
-    void addTableLock(const TableLockHolder & lock) { table_locks.push_back(lock); }
-
-private:
-    std::vector<TableLockHolder> table_locks;
-};
-
-}
diff --git a/src/DataStreams/IBlockStream_fwd.h b/src/DataStreams/IBlockStream_fwd.h
deleted file mode 100644
index d74a9528ed9..00000000000
--- a/src/DataStreams/IBlockStream_fwd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-
-namespace DB
-{
-
-class IBlockInputStream;
-class IBlockOutputStream;
-
-using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
-using BlockInputStreams = std::vector<BlockInputStreamPtr>;
-using BlockOutputStreamPtr = std::shared_ptr<IBlockOutputStream>;
-using BlockOutputStreams = std::vector<BlockOutputStreamPtr>;
-
-}
diff --git a/src/DataStreams/InternalTextLogsRowOutputStream.h b/src/DataStreams/InternalTextLogsRowOutputStream.h
deleted file mode 100644
index 8ade76b34a7..00000000000
--- a/src/DataStreams/InternalTextLogsRowOutputStream.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-#include <DataStreams/IBlockOutputStream.h>
-#include <IO/WriteBuffer.h>
-
-
-namespace DB
-{
-
-/// Prints internal server logs
-/// Input blocks have to have the same structure as SystemLogsQueue::getSampleBlock()
-/// NOTE: IRowOutputFormat does not suite well for this case
-class InternalTextLogsRowOutputStream : public IBlockOutputStream
-{
-public:
-    InternalTextLogsRowOutputStream(WriteBuffer & buf_out, bool color_) : wb(buf_out), color(color_) {}
-
-    Block getHeader() const override;
-
-    void write(const Block & block) override;
-
-    void flush() override
-    {
-        wb.next();
-    }
-
-private:
-    WriteBuffer & wb;
-    bool color;
-};
-
-}
diff --git a/src/DataStreams/MaterializingBlockInputStream.cpp b/src/DataStreams/MaterializingBlockInputStream.cpp
deleted file mode 100644
index e0f287d44fa..00000000000
--- a/src/DataStreams/MaterializingBlockInputStream.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <DataStreams/MaterializingBlockInputStream.h>
-#include <DataStreams/materializeBlock.h>
-
-
-namespace DB
-{
-
-MaterializingBlockInputStream::MaterializingBlockInputStream(const BlockInputStreamPtr & input)
-{
-    children.push_back(input);
-}
-
-String MaterializingBlockInputStream::getName() const
-{
-    return "Materializing";
-}
-
-Block MaterializingBlockInputStream::getHeader() const
-{
-    return materializeBlock(children.back()->getHeader());
-}
-
-Block MaterializingBlockInputStream::readImpl()
-{
-    return materializeBlock(children.back()->read());
-}
-
-}
diff --git a/src/DataStreams/MaterializingBlockInputStream.h b/src/DataStreams/MaterializingBlockInputStream.h
deleted file mode 100644
index 90fd91bd550..00000000000
--- a/src/DataStreams/MaterializingBlockInputStream.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-
-namespace DB
-{
-
-/** Converts columns-constants to full columns ("materializes" them).
-  */
-class MaterializingBlockInputStream : public IBlockInputStream
-{
-public:
-    MaterializingBlockInputStream(const BlockInputStreamPtr & input);
-    String getName() const override;
-    Block getHeader() const override;
-
-protected:
-    Block readImpl() override;
-};
-
-}
diff --git a/src/DataStreams/MaterializingBlockOutputStream.h b/src/DataStreams/MaterializingBlockOutputStream.h
deleted file mode 100644
index 64c2bc12a57..00000000000
--- a/src/DataStreams/MaterializingBlockOutputStream.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <DataStreams/materializeBlock.h>
-#include <DataStreams/IBlockOutputStream.h>
-
-
-namespace DB
-{
-
-/** Converts columns-constants to full columns ("materializes" them).
-  */
-class MaterializingBlockOutputStream : public IBlockOutputStream
-{
-public:
-    MaterializingBlockOutputStream(const BlockOutputStreamPtr & output_, const Block & header_)
-        : output{output_}, header(header_) {}
-
-    Block getHeader() const                           override { return header; }
-    void write(const Block & block)                   override { output->write(materializeBlock(block)); }
-    void flush()                                      override { output->flush(); }
-    void writePrefix()                                override { output->writePrefix(); }
-    void writeSuffix()                                override { output->writeSuffix(); }
-    void setRowsBeforeLimit(size_t rows_before_limit) override { output->setRowsBeforeLimit(rows_before_limit); }
-    void setTotals(const Block & totals)              override { output->setTotals(materializeBlock(totals)); }
-    void setExtremes(const Block & extremes)          override { output->setExtremes(materializeBlock(extremes)); }
-    void onProgress(const Progress & progress)        override { output->onProgress(progress); }
-    String getContentType() const                     override { return output->getContentType(); }
-
-private:
-    BlockOutputStreamPtr output;
-    Block header;
-};
-
-}
diff --git a/src/DataStreams/NullAndDoCopyBlockInputStream.h b/src/DataStreams/NullAndDoCopyBlockInputStream.h
deleted file mode 100644
index 8bfb3538f3a..00000000000
--- a/src/DataStreams/NullAndDoCopyBlockInputStream.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/copyData.h>
-
-
-namespace DB
-{
-
-class IBlockOutputStream;
-using BlockOutputStreamPtr = std::shared_ptr<IBlockOutputStream>;
-
-
-/** An empty stream of blocks.
-  * But at the first read attempt, copies the data from the passed `input` to the `output`.
-  * This is necessary to execute the query INSERT SELECT - the query copies data, but returns nothing.
-  * The query could be executed without wrapping it in an empty BlockInputStream,
-  *  but the progress of query execution and the ability to cancel the query would not work.
-  */
-class NullAndDoCopyBlockInputStream : public IBlockInputStream
-{
-public:
-    NullAndDoCopyBlockInputStream(const BlockInputStreamPtr & input_, BlockOutputStreamPtr output_)
-        : input(std::move(input_))
-        , output(std::move(output_))
-    {
-        children.push_back(input);
-    }
-
-    /// Suppress readPrefix and readSuffix, because they are called by copyData.
-    void readPrefix() override {}
-    void readSuffix() override {}
-
-    String getName() const override { return "NullAndDoCopy"; }
-
-    Block getHeader() const override { return {}; }
-    Block getTotals() override { return {}; }
-    Block getExtremes() override { return {}; }
-
-protected:
-    Block readImpl() override
-    {
-        /// We do not use cancel flag here.
-        /// If query was cancelled, it will be processed by child streams.
-        /// Part of the data will be processed.
-
-        copyData(*input, *output);
-        return Block();
-    }
-
-private:
-    BlockInputStreamPtr input;
-    BlockOutputStreamPtr output;
-};
-
-}
diff --git a/src/DataStreams/NullBlockOutputStream.h b/src/DataStreams/NullBlockOutputStream.h
deleted file mode 100644
index 8b3e61d35a7..00000000000
--- a/src/DataStreams/NullBlockOutputStream.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockOutputStream.h>
-
-
-namespace DB
-{
-
-/** Does nothing. Used for debugging and benchmarks.
-  */
-class NullBlockOutputStream : public IBlockOutputStream
-{
-public:
-    NullBlockOutputStream(const Block & header_) : header(header_) {}
-    Block getHeader() const override { return header; }
-    void write(const Block &) override {}
-
-private:
-    Block header;
-};
-
-}
diff --git a/src/DataStreams/OneBlockInputStream.h b/src/DataStreams/OneBlockInputStream.h
deleted file mode 100644
index d401082ce62..00000000000
--- a/src/DataStreams/OneBlockInputStream.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-
-
-namespace DB
-{
-
-/** A stream of blocks from which you can read one block.
-  */
-class OneBlockInputStream : public IBlockInputStream
-{
-public:
-    explicit OneBlockInputStream(Block block_) : block(std::move(block_)) { block.checkNumberOfRows(); }
-
-    String getName() const override { return "One"; }
-
-    Block getHeader() const override
-    {
-        Block res;
-        for (const auto & elem : block)
-            res.insert({ elem.column->cloneEmpty(), elem.type, elem.name });
-        return res;
-    }
-
-protected:
-    Block readImpl() override
-    {
-        if (has_been_read)
-            return Block();
-
-        has_been_read = true;
-        return block;
-    }
-
-private:
-    Block block;
-    bool has_been_read = false;
-};
-
-}
diff --git a/src/DataStreams/OwningBlockInputStream.h b/src/DataStreams/OwningBlockInputStream.h
deleted file mode 100644
index dac42028cd7..00000000000
--- a/src/DataStreams/OwningBlockInputStream.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include <DataStreams/IBlockInputStream.h>
-
-namespace DB
-{
-
-/** Provides reading from a Buffer, taking exclusive ownership over it's lifetime,
-  *    simplifies usage of ReadBufferFromFile (no need to manage buffer lifetime) etc.
-  */
-template <typename OwnType>
-class OwningBlockInputStream : public IBlockInputStream
-{
-public:
-    OwningBlockInputStream(const BlockInputStreamPtr & stream_, std::unique_ptr<OwnType> own_)
-        : stream{stream_}, own{std::move(own_)}
-    {
-        children.push_back(stream);
-    }
-
-    Block getHeader() const override { return children.at(0)->getHeader(); }
-
-private:
-    Block readImpl() override { return stream->read(); }
-
-    String getName() const override { return "Owning"; }
-
-protected:
-    BlockInputStreamPtr stream;
-    std::unique_ptr<OwnType> own;
-};
-
-}
diff --git a/src/DataStreams/ParallelInputsProcessor.h b/src/DataStreams/ParallelInputsProcessor.h
deleted file mode 100644
index 65c7e741ec2..00000000000
--- a/src/DataStreams/ParallelInputsProcessor.h
+++ /dev/null
@@ -1,365 +0,0 @@
-#pragma once
-
-#include <list>
-#include <queue>
-#include <atomic>
-#include <thread>
-#include <mutex>
-
-#include <common/logger_useful.h>
-
-#include <Common/setThreadName.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/CurrentThread.h>
-#include <Common/ThreadPool.h>
-
-
-/** Allows to process multiple block input streams (sources) in parallel, using specified number of threads.
-  * Reads (pulls) blocks from any available source and passes it to specified handler.
-  *
-  * Before any reading, calls "readPrefix" method of sources in parallel.
-  *
-  * (As an example, "readPrefix" can prepare connections to remote servers,
-  *  and we want this work to be executed in parallel for different sources)
-  *
-  * Implemented in following way:
-  * - there are multiple input sources to read blocks from;
-  * - there are multiple threads, that could simultaneously read blocks from different sources;
-  * - "available" sources (that are not read in any thread right now) are put in queue of sources;
-  * - when thread take a source to read from, it removes source from queue of sources,
-  *    then read block from source and then put source back to queue of available sources.
-  */
-
-namespace CurrentMetrics
-{
-    extern const Metric QueryThread;
-}
-
-namespace DB
-{
-
-/// Example of the handler.
-struct ParallelInputsHandler
-{
-    /// Processing the data block.
-    void onBlock(Block & /*block*/, size_t /*thread_num*/) {}
-
-    /// Called for each thread, when the thread has nothing else to do.
-    /// Due to the fact that part of the sources has run out, and now there are fewer sources left than streams.
-    /// Called if the `onException` method does not throw an exception; is called before the `onFinish` method.
-    void onFinishThread(size_t /*thread_num*/) {}
-
-    /// Blocks are over. Due to the fact that all sources ran out or because of the cancellation of work.
-    /// This method is always called exactly once, at the end of the work, if the `onException` method does not throw an exception.
-    void onFinish() {}
-
-    /// Exception handling. It is reasonable to call the ParallelInputsProcessor::cancel method in this method, and also pass the exception to the main thread.
-    void onException(std::exception_ptr & /*exception*/, size_t /*thread_num*/) {}
-};
-
-
-template <typename Handler>
-class ParallelInputsProcessor
-{
-public:
-    /** additional_input_at_end - if not nullptr,
-      *  then the blocks from this source will start to be processed only after all other sources are processed.
-      * This is done in the main thread.
-      *
-      * Intended for implementation of FULL and RIGHT JOIN
-      * - where you must first make JOIN in parallel, while noting which keys are not found,
-      *   and only after the completion of this work, create blocks of keys that are not found.
-      */
-    ParallelInputsProcessor(const BlockInputStreams & inputs_, const BlockInputStreamPtr & additional_input_at_end_, size_t max_threads_, Handler & handler_)
-        : inputs(inputs_), additional_input_at_end(additional_input_at_end_), max_threads(std::min(inputs_.size(), max_threads_)), handler(handler_)
-    {
-        for (size_t i = 0; i < inputs_.size(); ++i)
-            unprepared_inputs.emplace(inputs_[i], i);
-    }
-
-    ~ParallelInputsProcessor()
-    {
-        try
-        {
-            wait();
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-
-    /// Start background threads, start work.
-    void process()
-    {
-        active_threads = max_threads;
-        threads.reserve(max_threads);
-
-        try
-        {
-            for (size_t i = 0; i < max_threads; ++i)
-                threads.emplace_back(&ParallelInputsProcessor::thread, this, CurrentThread::getGroup(), i);
-        }
-        catch (...)
-        {
-            cancel(false);
-            wait();
-            if (active_threads)
-            {
-                active_threads = 0;
-                /// handler.onFinish() is supposed to be called from one of the threads when the number of
-                /// finished threads reaches max_threads. But since we weren't able to launch all threads,
-                /// we have to call onFinish() manually here.
-                handler.onFinish();
-            }
-            throw;
-        }
-    }
-
-    /// Ask all sources to stop earlier than they run out.
-    void cancel(bool kill)
-    {
-        finish = true;
-
-        for (auto & input : inputs)
-        {
-            try
-            {
-                input->cancel(kill);
-            }
-            catch (...)
-            {
-                /** If you can not ask one or more sources to stop.
-                  * (for example, the connection is broken for distributed query processing)
-                  * - then do not care.
-                  */
-                LOG_ERROR(log, "Exception while cancelling {}", input->getName());
-            }
-        }
-    }
-
-    /// Wait until all threads are finished, before the destructor.
-    void wait()
-    {
-        if (joined_threads)
-            return;
-
-        for (auto & thread : threads)
-            thread.join();
-
-        threads.clear();
-        joined_threads = true;
-    }
-
-    size_t getNumActiveThreads() const
-    {
-        return active_threads;
-    }
-
-private:
-    /// Single source data
-    struct InputData
-    {
-        BlockInputStreamPtr in;
-        size_t i = 0;      /// The source number (for debugging).
-
-        InputData() {}
-        InputData(const BlockInputStreamPtr & in_, size_t i_) : in(in_), i(i_) {}
-    };
-
-    void publishPayload(Block & block, size_t thread_num)
-    {
-        handler.onBlock(block, thread_num);
-    }
-
-    void thread(ThreadGroupStatusPtr thread_group, size_t thread_num)
-    {
-        std::exception_ptr exception;
-        CurrentMetrics::Increment metric_increment{CurrentMetrics::QueryThread};
-
-        try
-        {
-            setThreadName("ParalInputsProc");
-            if (thread_group)
-                CurrentThread::attachTo(thread_group);
-
-            while (!finish)
-            {
-                InputData unprepared_input;
-                {
-                    std::lock_guard lock(unprepared_inputs_mutex);
-
-                    if (unprepared_inputs.empty())
-                        break;
-
-                    unprepared_input = unprepared_inputs.front();
-                    unprepared_inputs.pop();
-                }
-
-                unprepared_input.in->readPrefix();
-
-                {
-                    std::lock_guard lock(available_inputs_mutex);
-                    available_inputs.push(unprepared_input);
-                }
-            }
-
-            loop(thread_num);
-
-            handler.onFinishThread(thread_num);
-        }
-        catch (...)
-        {
-            exception = std::current_exception();
-        }
-
-        if (exception)
-        {
-            handler.onException(exception, thread_num);
-        }
-
-        /// The last thread on the output indicates that there is no more data.
-        if (0 == --active_threads)
-        {
-            /// And then it processes an additional source, if there is one.
-            if (additional_input_at_end)
-            {
-                try
-                {
-                    additional_input_at_end->readPrefix();
-                    while (Block block = additional_input_at_end->read())
-                        publishPayload(block, thread_num);
-                }
-                catch (...)
-                {
-                    exception = std::current_exception();
-                }
-
-                if (exception)
-                {
-                    handler.onException(exception, thread_num);
-                }
-            }
-
-            try
-            {
-                handler.onFinish();
-            }
-            catch (...)
-            {
-                exception = std::current_exception();
-            }
-
-            if (exception)
-            {
-                handler.onException(exception, thread_num);
-            }
-        }
-    }
-
-    void loop(size_t thread_num)
-    {
-        while (!finish)    /// You may need to stop work earlier than all sources run out.
-        {
-            InputData input;
-
-            /// Select the next source.
-            {
-                std::lock_guard lock(available_inputs_mutex);
-
-                /// If there are no free sources, then this thread is no longer needed. (But other threads can work with their sources.)
-                if (available_inputs.empty())
-                    break;
-
-                input = available_inputs.front();
-
-                /// We remove the source from the queue of available sources.
-                available_inputs.pop();
-            }
-
-            /// The main work.
-            Block block = input.in->read();
-
-            {
-                if (finish)
-                    break;
-
-                /// If this source is not run out yet, then put the resulting block in the ready queue.
-                {
-                    std::lock_guard lock(available_inputs_mutex);
-
-                    if (block)
-                    {
-                        available_inputs.push(input);
-                    }
-                    else
-                    {
-                        if (available_inputs.empty())
-                            break;
-                    }
-                }
-
-                if (finish)
-                    break;
-
-                if (block)
-                    publishPayload(block, thread_num);
-            }
-        }
-    }
-
-    BlockInputStreams inputs;
-    BlockInputStreamPtr additional_input_at_end;
-    unsigned max_threads;
-
-    Handler & handler;
-
-    /// Threads.
-    using ThreadsData = std::vector<ThreadFromGlobalPool>;
-    ThreadsData threads;
-
-    /** A set of available sources that are not currently processed by any thread.
-      * Each thread takes one source from this set, takes a block out of the source (at this moment the source does the calculations)
-      *  and (if the source is not run out), puts it back into the set of available sources.
-      *
-      * The question arises what is better to use:
-      * - the queue (just processed source will be processed the next time later than the rest)
-      * - stack (just processed source will be processed as soon as possible).
-      *
-      * The stack is better than the queue when you need to do work on reading one source more consequently,
-      *  and theoretically, this allows you to achieve more consequent/consistent reads from the disk.
-      *
-      * But when using the stack, there is a problem with distributed query processing:
-      *  data is read only from a part of the servers, and on the other servers
-      * a timeout occurs during send, and the request processing ends with an exception.
-      *
-      * Therefore, a queue is used. This can be improved in the future.
-      */
-    using AvailableInputs = std::queue<InputData>;
-    AvailableInputs available_inputs;
-
-    /** For parallel preparing (readPrefix) child streams.
-      * First, streams are located here.
-      * After a stream was prepared, it is moved to "available_inputs" for reading.
-      */
-    using UnpreparedInputs = std::queue<InputData>;
-    UnpreparedInputs unprepared_inputs;
-
-    /// For operations with available_inputs.
-    std::mutex available_inputs_mutex;
-
-    /// For operations with unprepared_inputs.
-    std::mutex unprepared_inputs_mutex;
-
-    /// How many sources ran out.
-    std::atomic<size_t> active_threads { 0 };
-    /// Finish the threads work (before the sources run out).
-    std::atomic<bool> finish { false };
-    /// Wait for the completion of all threads.
-    std::atomic<bool> joined_threads { false };
-
-    Poco::Logger * log = &Poco::Logger::get("ParallelInputsProcessor");
-};
-
-
-}
diff --git a/src/DataStreams/PushingToSinkBlockOutputStream.h b/src/DataStreams/PushingToSinkBlockOutputStream.h
deleted file mode 100644
index eeca8506d8e..00000000000
--- a/src/DataStreams/PushingToSinkBlockOutputStream.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-#include <DataStreams/IBlockOutputStream.h>
-#include <Processors/Sinks/SinkToStorage.h>
-#include <iostream>
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-class PushingToSinkBlockOutputStream : public IBlockOutputStream
-{
-public:
-    explicit PushingToSinkBlockOutputStream(SinkToStoragePtr sink_)
-        : sink(std::move(sink_)), port(sink->getPort().getHeader(), sink.get()) {}
-
-    Block getHeader() const override { return sink->getPort().getHeader(); }
-
-    void write(const Block & block) override
-    {
-        /// In case writePrefix was not called.
-        if (!port.isConnected())
-            writePrefix();
-
-        if (!block)
-            return;
-
-        size_t num_rows = block.rows();
-        Chunk chunk(block.getColumns(), num_rows);
-        port.push(std::move(chunk));
-
-        while (true)
-        {
-            auto status = sink->prepare();
-            switch (status)
-            {
-                case IProcessor::Status::Ready:
-                    sink->work();
-                    continue;
-                case IProcessor::Status::NeedData:
-                    return;
-                case IProcessor::Status::Async: [[fallthrough]];
-                case IProcessor::Status::ExpandPipeline: [[fallthrough]];
-                case IProcessor::Status::Finished: [[fallthrough]];
-                case IProcessor::Status::PortFull:
-                    throw Exception(
-                        ErrorCodes::LOGICAL_ERROR,
-                        "Status {} in not expected in PushingToSinkBlockOutputStream::writePrefix",
-                        IProcessor::statusToName(status));
-            }
-        }
-    }
-
-    void writePrefix() override
-    {
-        connect(port, sink->getPort());
-
-        while (true)
-        {
-            auto status = sink->prepare();
-            switch (status)
-            {
-                case IProcessor::Status::Ready:
-                    sink->work();
-                    continue;
-                case IProcessor::Status::NeedData:
-                    return;
-                case IProcessor::Status::Async: [[fallthrough]];
-                case IProcessor::Status::ExpandPipeline: [[fallthrough]];
-                case IProcessor::Status::Finished: [[fallthrough]];
-                case IProcessor::Status::PortFull:
-                    throw Exception(
-                        ErrorCodes::LOGICAL_ERROR,
-                        "Status {} in not expected in PushingToSinkBlockOutputStream::writePrefix",
-                        IProcessor::statusToName(status));
-            }
-        }
-    }
-
-    void writeSuffix() override
-    {
-        port.finish();
-        while (true)
-        {
-            auto status = sink->prepare();
-            switch (status)
-            {
-                case IProcessor::Status::Ready:
-                    sink->work();
-                    continue;
-                case IProcessor::Status::Finished:
-
-                    ///flush();
-                    return;
-                case IProcessor::Status::NeedData:
-                case IProcessor::Status::Async:
-                case IProcessor::Status::ExpandPipeline:
-                case IProcessor::Status::PortFull:
-                    throw Exception(
-                        ErrorCodes::LOGICAL_ERROR,
-                        "Status {} in not expected in PushingToSinkBlockOutputStream::writeSuffix",
-                        IProcessor::statusToName(status));
-            }
-        }
-    }
-
-private:
-    SinkToStoragePtr sink;
-    OutputPort port;
-};
-
-}
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.cpp b/src/DataStreams/PushingToViewsBlockOutputStream.cpp
deleted file mode 100644
index 7729eb5fb44..00000000000
--- a/src/DataStreams/PushingToViewsBlockOutputStream.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-#include <DataStreams/ConvertingBlockInputStream.h>
-#include <DataStreams/PushingToViewsBlockOutputStream.h>
-#include <DataStreams/SquashingBlockInputStream.h>
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/MaterializingBlockInputStream.h>
-#include <DataStreams/copyData.h>
-#include <DataTypes/NestedUtils.h>
-#include <Interpreters/InterpreterSelectQuery.h>
-#include <Interpreters/InterpreterInsertQuery.h>
-#include <Interpreters/Context.h>
-#include <Parsers/ASTInsertQuery.h>
-#include <Common/CurrentThread.h>
-#include <Common/setThreadName.h>
-#include <Common/ThreadPool.h>
-#include <Common/checkStackSize.h>
-#include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
-#include <Storages/StorageValues.h>
-#include <Storages/LiveView/StorageLiveView.h>
-#include <Storages/StorageMaterializedView.h>
-#include <common/logger_useful.h>
-#include <DataStreams/PushingToSinkBlockOutputStream.h>
-
-namespace DB
-{
-
-PushingToViewsBlockOutputStream::PushingToViewsBlockOutputStream(
-    const StoragePtr & storage_,
-    const StorageMetadataPtr & metadata_snapshot_,
-    ContextPtr context_,
-    const ASTPtr & query_ptr_,
-    bool no_destination)
-    : WithContext(context_)
-    , storage(storage_)
-    , metadata_snapshot(metadata_snapshot_)
-    , log(&Poco::Logger::get("PushingToViewsBlockOutputStream"))
-    , query_ptr(query_ptr_)
-{
-    checkStackSize();
-
-    /** TODO This is a very important line. At any insertion into the table one of streams should own lock.
-      * Although now any insertion into the table is done via PushingToViewsBlockOutputStream,
-      *  but it's clear that here is not the best place for this functionality.
-      */
-    addTableLock(
-        storage->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout));
-
-    /// If the "root" table deduplicates blocks, there are no need to make deduplication for children
-    /// Moreover, deduplication for AggregatingMergeTree children could produce false positives due to low size of inserting blocks
-    bool disable_deduplication_for_children = false;
-    if (!getContext()->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
-        disable_deduplication_for_children = !no_destination && storage->supportsDeduplication();
-
-    auto table_id = storage->getStorageID();
-    Dependencies dependencies = DatabaseCatalog::instance().getDependencies(table_id);
-
-    /// We need special context for materialized views insertions
-    if (!dependencies.empty())
-    {
-        select_context = Context::createCopy(context);
-        insert_context = Context::createCopy(context);
-
-        const auto & insert_settings = insert_context->getSettingsRef();
-
-        // Do not deduplicate insertions into MV if the main insertion is Ok
-        if (disable_deduplication_for_children)
-            insert_context->setSetting("insert_deduplicate", Field{false});
-
-        // Separate min_insert_block_size_rows/min_insert_block_size_bytes for children
-        if (insert_settings.min_insert_block_size_rows_for_materialized_views)
-            insert_context->setSetting("min_insert_block_size_rows", insert_settings.min_insert_block_size_rows_for_materialized_views.value);
-        if (insert_settings.min_insert_block_size_bytes_for_materialized_views)
-            insert_context->setSetting("min_insert_block_size_bytes", insert_settings.min_insert_block_size_bytes_for_materialized_views.value);
-    }
-
-    for (const auto & database_table : dependencies)
-    {
-        auto dependent_table = DatabaseCatalog::instance().getTable(database_table, getContext());
-        auto dependent_metadata_snapshot = dependent_table->getInMemoryMetadataPtr();
-
-        ASTPtr query;
-        BlockOutputStreamPtr out;
-
-        if (auto * materialized_view = dynamic_cast<StorageMaterializedView *>(dependent_table.get()))
-        {
-            addTableLock(
-                materialized_view->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout));
-
-            StoragePtr inner_table = materialized_view->getTargetTable();
-            auto inner_table_id = inner_table->getStorageID();
-            auto inner_metadata_snapshot = inner_table->getInMemoryMetadataPtr();
-            query = dependent_metadata_snapshot->getSelectQuery().inner_query;
-
-            std::unique_ptr<ASTInsertQuery> insert = std::make_unique<ASTInsertQuery>();
-            insert->table_id = inner_table_id;
-
-            /// Get list of columns we get from select query.
-            auto header = InterpreterSelectQuery(query, select_context, SelectQueryOptions().analyze())
-                .getSampleBlock();
-
-            /// Insert only columns returned by select.
-            auto list = std::make_shared<ASTExpressionList>();
-            const auto & inner_table_columns = inner_metadata_snapshot->getColumns();
-            for (const auto & column : header)
-            {
-                /// But skip columns which storage doesn't have.
-                if (inner_table_columns.hasPhysical(column.name))
-                    list->children.emplace_back(std::make_shared<ASTIdentifier>(column.name));
-            }
-
-            insert->columns = std::move(list);
-
-            ASTPtr insert_query_ptr(insert.release());
-            InterpreterInsertQuery interpreter(insert_query_ptr, insert_context);
-            BlockIO io = interpreter.execute();
-            out = io.out;
-        }
-        else if (dynamic_cast<const StorageLiveView *>(dependent_table.get()))
-            out = std::make_shared<PushingToViewsBlockOutputStream>(
-                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr(), true);
-        else
-            out = std::make_shared<PushingToViewsBlockOutputStream>(
-                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr());
-
-        views.emplace_back(ViewInfo{std::move(query), database_table, std::move(out), nullptr, 0 /* elapsed_ms */});
-    }
-
-    /// Do not push to destination table if the flag is set
-    if (!no_destination)
-    {
-        auto sink = storage->write(query_ptr, storage->getInMemoryMetadataPtr(), getContext());
-
-        metadata_snapshot->check(sink->getPort().getHeader().getColumnsWithTypeAndName());
-
-        replicated_output = dynamic_cast<ReplicatedMergeTreeSink *>(sink.get());
-        output = std::make_shared<PushingToSinkBlockOutputStream>(std::move(sink));
-    }
-}
-
-
-Block PushingToViewsBlockOutputStream::getHeader() const
-{
-    /// If we don't write directly to the destination
-    /// then expect that we're inserting with precalculated virtual columns
-    if (output)
-        return metadata_snapshot->getSampleBlock();
-    else
-        return metadata_snapshot->getSampleBlockWithVirtuals(storage->getVirtuals());
-}
-
-
-void PushingToViewsBlockOutputStream::write(const Block & block)
-{
-    /** Throw an exception if the sizes of arrays - elements of nested data structures doesn't match.
-      * We have to make this assertion before writing to table, because storage engine may assume that they have equal sizes.
-      * NOTE It'd better to do this check in serialization of nested structures (in place when this assumption is required),
-      * but currently we don't have methods for serialization of nested structures "as a whole".
-      */
-    Nested::validateArraySizes(block);
-
-    if (auto * live_view = dynamic_cast<StorageLiveView *>(storage.get()))
-    {
-        StorageLiveView::writeIntoLiveView(*live_view, block, getContext());
-    }
-    else
-    {
-        if (output)
-            /// TODO: to support virtual and alias columns inside MVs, we should return here the inserted block extended
-            ///       with additional columns directly from storage and pass it to MVs instead of raw block.
-            output->write(block);
-    }
-
-    /// Don't process materialized views if this block is duplicate
-    if (!getContext()->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views && replicated_output && replicated_output->lastBlockIsDuplicate())
-        return;
-
-    // Insert data into materialized views only after successful insert into main table
-    const Settings & settings = getContext()->getSettingsRef();
-    if (settings.parallel_view_processing && views.size() > 1)
-    {
-        // Push to views concurrently if enabled and more than one view is attached
-        ThreadPool pool(std::min(size_t(settings.max_threads), views.size()));
-        for (auto & view : views)
-        {
-            auto thread_group = CurrentThread::getGroup();
-            pool.scheduleOrThrowOnError([=, &view, this]
-            {
-                setThreadName("PushingToViews");
-                if (thread_group)
-                    CurrentThread::attachToIfDetached(thread_group);
-                process(block, view);
-            });
-        }
-        // Wait for concurrent view processing
-        pool.wait();
-    }
-    else
-    {
-        // Process sequentially
-        for (auto & view : views)
-        {
-            process(block, view);
-
-            if (view.exception)
-                std::rethrow_exception(view.exception);
-        }
-    }
-}
-
-void PushingToViewsBlockOutputStream::writePrefix()
-{
-    if (output)
-        output->writePrefix();
-
-    for (auto & view : views)
-    {
-        try
-        {
-            view.out->writePrefix();
-        }
-        catch (Exception & ex)
-        {
-            ex.addMessage("while write prefix to view " + view.table_id.getNameForLogs());
-            throw;
-        }
-    }
-}
-
-void PushingToViewsBlockOutputStream::writeSuffix()
-{
-    if (output)
-        output->writeSuffix();
-
-    std::exception_ptr first_exception;
-
-    const Settings & settings = getContext()->getSettingsRef();
-    bool parallel_processing = false;
-
-    /// Run writeSuffix() for views in separate thread pool.
-    /// In could have been done in PushingToViewsBlockOutputStream::process, however
-    /// it is not good if insert into main table fail but into view succeed.
-    if (settings.parallel_view_processing && views.size() > 1)
-    {
-        parallel_processing = true;
-
-        // Push to views concurrently if enabled and more than one view is attached
-        ThreadPool pool(std::min(size_t(settings.max_threads), views.size()));
-        auto thread_group = CurrentThread::getGroup();
-
-        for (auto & view : views)
-        {
-            if (view.exception)
-                continue;
-
-            pool.scheduleOrThrowOnError([thread_group, &view, this]
-            {
-                setThreadName("PushingToViews");
-                if (thread_group)
-                    CurrentThread::attachToIfDetached(thread_group);
-
-                Stopwatch watch;
-                try
-                {
-                    view.out->writeSuffix();
-                }
-                catch (...)
-                {
-                    view.exception = std::current_exception();
-                }
-                view.elapsed_ms += watch.elapsedMilliseconds();
-
-                LOG_TRACE(log, "Pushing from {} to {} took {} ms.",
-                    storage->getStorageID().getNameForLogs(),
-                    view.table_id.getNameForLogs(),
-                    view.elapsed_ms);
-            });
-        }
-        // Wait for concurrent view processing
-        pool.wait();
-    }
-
-    for (auto & view : views)
-    {
-        if (view.exception)
-        {
-            if (!first_exception)
-                first_exception = view.exception;
-
-            continue;
-        }
-
-        if (parallel_processing)
-            continue;
-
-        Stopwatch watch;
-        try
-        {
-            view.out->writeSuffix();
-        }
-        catch (Exception & ex)
-        {
-            ex.addMessage("while write prefix to view " + view.table_id.getNameForLogs());
-            throw;
-        }
-        view.elapsed_ms += watch.elapsedMilliseconds();
-
-        LOG_TRACE(log, "Pushing from {} to {} took {} ms.",
-            storage->getStorageID().getNameForLogs(),
-            view.table_id.getNameForLogs(),
-            view.elapsed_ms);
-    }
-
-    if (first_exception)
-        std::rethrow_exception(first_exception);
-
-    UInt64 milliseconds = main_watch.elapsedMilliseconds();
-    if (views.size() > 1)
-    {
-        LOG_DEBUG(log, "Pushing from {} to {} views took {} ms.",
-            storage->getStorageID().getNameForLogs(), views.size(),
-            milliseconds);
-    }
-}
-
-void PushingToViewsBlockOutputStream::flush()
-{
-    if (output)
-        output->flush();
-
-    for (auto & view : views)
-        view.out->flush();
-}
-
-void PushingToViewsBlockOutputStream::process(const Block & block, ViewInfo & view)
-{
-    Stopwatch watch;
-
-    try
-    {
-        BlockInputStreamPtr in;
-
-        /// We need keep InterpreterSelectQuery, until the processing will be finished, since:
-        ///
-        /// - We copy Context inside InterpreterSelectQuery to support
-        ///   modification of context (Settings) for subqueries
-        /// - InterpreterSelectQuery lives shorter than query pipeline.
-        ///   It's used just to build the query pipeline and no longer needed
-        /// - ExpressionAnalyzer and then, Functions, that created in InterpreterSelectQuery,
-        ///   **can** take a reference to Context from InterpreterSelectQuery
-        ///   (the problem raises only when function uses context from the
-        ///    execute*() method, like FunctionDictGet do)
-        /// - These objects live inside query pipeline (DataStreams) and the reference become dangling.
-        std::optional<InterpreterSelectQuery> select;
-
-        if (view.query)
-        {
-            /// We create a table with the same name as original table and the same alias columns,
-            ///  but it will contain single block (that is INSERT-ed into main table).
-            /// InterpreterSelectQuery will do processing of alias columns.
-
-            auto local_context = Context::createCopy(select_context);
-            local_context->addViewSource(
-                StorageValues::create(storage->getStorageID(), metadata_snapshot->getColumns(), block, storage->getVirtuals()));
-            select.emplace(view.query, local_context, SelectQueryOptions());
-            in = std::make_shared<MaterializingBlockInputStream>(select->execute().getInputStream());
-
-            /// Squashing is needed here because the materialized view query can generate a lot of blocks
-            /// even when only one block is inserted into the parent table (e.g. if the query is a GROUP BY
-            /// and two-level aggregation is triggered).
-            in = std::make_shared<SquashingBlockInputStream>(
-                    in, getContext()->getSettingsRef().min_insert_block_size_rows, getContext()->getSettingsRef().min_insert_block_size_bytes);
-            in = std::make_shared<ConvertingBlockInputStream>(in, view.out->getHeader(), ConvertingBlockInputStream::MatchColumnsMode::Name);
-        }
-        else
-            in = std::make_shared<OneBlockInputStream>(block);
-
-        in->readPrefix();
-
-        while (Block result_block = in->read())
-        {
-            Nested::validateArraySizes(result_block);
-            view.out->write(result_block);
-        }
-
-        in->readSuffix();
-    }
-    catch (Exception & ex)
-    {
-        ex.addMessage("while pushing to view " + view.table_id.getNameForLogs());
-        view.exception = std::current_exception();
-    }
-    catch (...)
-    {
-        view.exception = std::current_exception();
-    }
-
-    view.elapsed_ms += watch.elapsedMilliseconds();
-}
-
-}
diff --git a/src/DataStreams/PushingToViewsBlockOutputStream.h b/src/DataStreams/PushingToViewsBlockOutputStream.h
deleted file mode 100644
index db6b671ce2c..00000000000
--- a/src/DataStreams/PushingToViewsBlockOutputStream.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockOutputStream.h>
-#include <Parsers/IAST_fwd.h>
-#include <Storages/IStorage.h>
-#include <Common/Stopwatch.h>
-
-namespace Poco
-{
-class Logger;
-};
-
-namespace DB
-{
-
-class ReplicatedMergeTreeSink;
-
-/** Writes data to the specified table and to all dependent materialized views.
-  */
-class PushingToViewsBlockOutputStream : public IBlockOutputStream, WithContext
-{
-public:
-    PushingToViewsBlockOutputStream(
-        const StoragePtr & storage_,
-        const StorageMetadataPtr & metadata_snapshot_,
-        ContextPtr context_,
-        const ASTPtr & query_ptr_,
-        bool no_destination = false);
-
-    Block getHeader() const override;
-    void write(const Block & block) override;
-
-    void flush() override;
-    void writePrefix() override;
-    void writeSuffix() override;
-
-private:
-    StoragePtr storage;
-    StorageMetadataPtr metadata_snapshot;
-    BlockOutputStreamPtr output;
-    ReplicatedMergeTreeSink * replicated_output = nullptr;
-    Poco::Logger * log;
-
-    ASTPtr query_ptr;
-    Stopwatch main_watch;
-
-    struct ViewInfo
-    {
-        ASTPtr query;
-        StorageID table_id;
-        BlockOutputStreamPtr out;
-        std::exception_ptr exception;
-        UInt64 elapsed_ms = 0;
-    };
-
-    std::vector<ViewInfo> views;
-    ContextMutablePtr select_context;
-    ContextMutablePtr insert_context;
-
-    void process(const Block & block, ViewInfo & view);
-};
-
-
-}
diff --git a/src/DataStreams/RemoteBlockInputStream.cpp b/src/DataStreams/RemoteBlockInputStream.cpp
deleted file mode 100644
index 7caa54cff22..00000000000
--- a/src/DataStreams/RemoteBlockInputStream.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <DataStreams/RemoteBlockInputStream.h>
-#include <Interpreters/Context.h>
-
-namespace DB
-{
-
-RemoteBlockInputStream::RemoteBlockInputStream(
-    Connection & connection,
-    const String & query_, const Block & header_, ContextPtr context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
-    : query_executor(connection, query_, header_, context_, throttler, scalars_, external_tables_, stage_)
-{
-    init();
-}
-
-RemoteBlockInputStream::RemoteBlockInputStream(
-    const ConnectionPoolWithFailoverPtr & pool,
-    std::vector<IConnectionPool::Entry> && connections,
-    const String & query_, const Block & header_, ContextPtr context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
-    : query_executor(pool, std::move(connections), query_, header_, context_, throttler, scalars_, external_tables_, stage_)
-{
-    init();
-}
-
-RemoteBlockInputStream::RemoteBlockInputStream(
-    const ConnectionPoolWithFailoverPtr & pool,
-    const String & query_, const Block & header_, ContextPtr context_,
-    const ThrottlerPtr & throttler, const Scalars & scalars_, const Tables & external_tables_, QueryProcessingStage::Enum stage_)
-    : query_executor(pool, query_, header_, context_, throttler, scalars_, external_tables_, stage_)
-{
-    init();
-}
-
-void RemoteBlockInputStream::init()
-{
-    query_executor.setProgressCallback([this](const Progress & progress) { progressImpl(progress); });
-    query_executor.setProfileInfoCallback([this](const BlockStreamProfileInfo & info_) { info.setFrom(info_, true); });
-    query_executor.setLogger(log);
-}
-
-void RemoteBlockInputStream::cancel(bool kill)
-{
-    if (kill)
-        is_killed = true;
-
-    bool old_val = false;
-    if (!is_cancelled.compare_exchange_strong(old_val, true, std::memory_order_seq_cst, std::memory_order_relaxed))
-        return;
-
-    query_executor.cancel();
-}
-
-Block RemoteBlockInputStream::readImpl()
-{
-    auto block = query_executor.read();
-
-    if (isCancelledOrThrowIfKilled())
-        return Block();
-
-    return block;
-}
-
-void RemoteBlockInputStream::readSuffixImpl()
-{
-    query_executor.finish();
-}
-
-}
diff --git a/src/DataStreams/RemoteBlockInputStream.h b/src/DataStreams/RemoteBlockInputStream.h
deleted file mode 100644
index 1be6b031520..00000000000
--- a/src/DataStreams/RemoteBlockInputStream.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma once
-
-#include <optional>
-
-#include <common/logger_useful.h>
-
-#include <DataStreams/IBlockInputStream.h>
-#include <Common/Throttler.h>
-#include <Client/ConnectionPool.h>
-#include <Client/MultiplexedConnections.h>
-#include <Interpreters/Cluster.h>
-
-#include <DataStreams/RemoteQueryExecutor.h>
-
-namespace DB
-{
-
-class Context;
-
-/** This class allows one to launch queries on remote replicas of one shard and get results
-  */
-class RemoteBlockInputStream : public IBlockInputStream
-{
-public:
-    /// Takes already set connection.
-    RemoteBlockInputStream(
-        Connection & connection,
-        const String & query_, const Block & header_, ContextPtr context_,
-        const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
-
-    /// Accepts several connections already taken from pool.
-    RemoteBlockInputStream(
-        const ConnectionPoolWithFailoverPtr & pool,
-        std::vector<IConnectionPool::Entry> && connections,
-        const String & query_, const Block & header_, ContextPtr context_,
-        const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
-
-    /// Takes a pool and gets one or several connections from it.
-    RemoteBlockInputStream(
-        const ConnectionPoolWithFailoverPtr & pool,
-        const String & query_, const Block & header_, ContextPtr context_,
-        const ThrottlerPtr & throttler = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete);
-
-    /// Set the query_id. For now, used by performance test to later find the query
-    /// in the server query_log. Must be called before sending the query to the server.
-    void setQueryId(const std::string & query_id) { query_executor.setQueryId(query_id); }
-
-    /// Specify how we allocate connections on a shard.
-    void setPoolMode(PoolMode pool_mode) { query_executor.setPoolMode(pool_mode); }
-
-    void setMainTable(StorageID main_table_) { query_executor.setMainTable(std::move(main_table_)); }
-
-    /// Prevent default progress notification because progress' callback is called by its own.
-    void progress(const Progress & /*value*/) override {}
-
-    void cancel(bool kill) override;
-
-    String getName() const override { return "Remote"; }
-
-    Block getHeader() const override { return query_executor.getHeader(); }
-    Block getTotals() override { return query_executor.getTotals(); }
-    Block getExtremes() override { return query_executor.getExtremes(); }
-
-protected:
-    Block readImpl() override;
-    void readSuffixImpl() override;
-
-private:
-    RemoteQueryExecutor query_executor;
-    Poco::Logger * log = &Poco::Logger::get("RemoteBlockInputStream");
-
-    void init();
-};
-
-}
diff --git a/src/DataStreams/RemoteBlockOutputStream.h b/src/DataStreams/RemoteBlockOutputStream.h
deleted file mode 100644
index 2c89a7358ad..00000000000
--- a/src/DataStreams/RemoteBlockOutputStream.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-#include <DataStreams/IBlockOutputStream.h>
-#include <Common/Throttler.h>
-#include <IO/ConnectionTimeouts.h>
-#include <Interpreters/ClientInfo.h>
-
-
-namespace DB
-{
-
-class Connection;
-class ReadBuffer;
-struct Settings;
-
-
-/** Allow to execute INSERT query on remote server and send data for it.
-  */
-class RemoteBlockOutputStream : public IBlockOutputStream
-{
-public:
-    RemoteBlockOutputStream(Connection & connection_,
-                            const ConnectionTimeouts & timeouts,
-                            const String & query_,
-                            const Settings & settings_,
-                            const ClientInfo & client_info_);
-
-    Block getHeader() const override { return header; }
-
-    void write(const Block & block) override;
-    void writeSuffix() override;
-
-    /// Send pre-serialized and possibly pre-compressed block of data, that will be read from 'input'.
-    void writePrepared(ReadBuffer & input, size_t size = 0);
-
-    ~RemoteBlockOutputStream() override;
-
-private:
-    Connection & connection;
-    String query;
-    Block header;
-    bool finished = false;
-};
-
-}
diff --git a/src/DataStreams/SquashingBlockInputStream.cpp b/src/DataStreams/SquashingBlockInputStream.cpp
deleted file mode 100644
index e13dee37008..00000000000
--- a/src/DataStreams/SquashingBlockInputStream.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <DataStreams/SquashingBlockInputStream.h>
-
-
-namespace DB
-{
-
-SquashingBlockInputStream::SquashingBlockInputStream(
-    const BlockInputStreamPtr & src, size_t min_block_size_rows, size_t min_block_size_bytes, bool reserve_memory)
-    : header(src->getHeader()), transform(min_block_size_rows, min_block_size_bytes, reserve_memory)
-{
-    children.emplace_back(src);
-}
-
-
-Block SquashingBlockInputStream::readImpl()
-{
-    while (!all_read)
-    {
-        Block block = children[0]->read();
-        if (!block)
-            all_read = true;
-
-        auto squashed_block = transform.add(std::move(block));
-        if (squashed_block)
-        {
-            return squashed_block;
-        }
-    }
-    return {};
-}
-
-}
diff --git a/src/DataStreams/SquashingBlockInputStream.h b/src/DataStreams/SquashingBlockInputStream.h
deleted file mode 100644
index c2732d520cc..00000000000
--- a/src/DataStreams/SquashingBlockInputStream.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/SquashingTransform.h>
-
-
-namespace DB
-{
-
-/** Merging consecutive blocks of stream to specified minimum size.
-  */
-class SquashingBlockInputStream : public IBlockInputStream
-{
-public:
-    SquashingBlockInputStream(const BlockInputStreamPtr & src, size_t min_block_size_rows, size_t min_block_size_bytes,
-                              bool reserve_memory = false);
-
-    String getName() const override { return "Squashing"; }
-
-    Block getHeader() const override { return header; }
-
-protected:
-    Block readImpl() override;
-
-private:
-    Block header;
-    SquashingTransform transform;
-    bool all_read = false;
-};
-
-}
diff --git a/src/DataStreams/SquashingBlockOutputStream.cpp b/src/DataStreams/SquashingBlockOutputStream.cpp
deleted file mode 100644
index ab12f66590f..00000000000
--- a/src/DataStreams/SquashingBlockOutputStream.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <DataStreams/SquashingBlockOutputStream.h>
-
-
-namespace DB
-{
-
-SquashingBlockOutputStream::SquashingBlockOutputStream(BlockOutputStreamPtr dst, Block header_, size_t min_block_size_rows, size_t min_block_size_bytes)
-    : output(std::move(dst)), header(std::move(header_)), transform(min_block_size_rows, min_block_size_bytes)
-{
-}
-
-
-void SquashingBlockOutputStream::write(const Block & block)
-{
-    auto squashed_block = transform.add(block);
-    if (squashed_block)
-        output->write(squashed_block);
-}
-
-
-void SquashingBlockOutputStream::finalize()
-{
-    if (all_written)
-        return;
-
-    all_written = true;
-
-    auto squashed_block = transform.add({});
-    if (squashed_block)
-        output->write(squashed_block);
-}
-
-
-void SquashingBlockOutputStream::flush()
-{
-    if (!disable_flush)
-        finalize();
-    output->flush();
-}
-
-
-void SquashingBlockOutputStream::writePrefix()
-{
-    output->writePrefix();
-}
-
-
-void SquashingBlockOutputStream::writeSuffix()
-{
-    finalize();
-    output->writeSuffix();
-}
-
-}
diff --git a/src/DataStreams/SquashingBlockOutputStream.h b/src/DataStreams/SquashingBlockOutputStream.h
deleted file mode 100644
index 7828ad7e96d..00000000000
--- a/src/DataStreams/SquashingBlockOutputStream.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/SquashingTransform.h>
-
-
-namespace DB
-{
-
-/** Merging consecutive blocks of stream to specified minimum size.
-  */
-class SquashingBlockOutputStream : public IBlockOutputStream
-{
-public:
-    SquashingBlockOutputStream(BlockOutputStreamPtr dst, Block header_, size_t min_block_size_rows, size_t min_block_size_bytes);
-
-    Block getHeader() const override { return header; }
-    void write(const Block & block) override;
-
-    void flush() override;
-    void writePrefix() override;
-    void writeSuffix() override;
-
-    /// Don't write blocks less than specified size even when flush method was called by user.
-    void disableFlush() { disable_flush = true; }
-
-private:
-    BlockOutputStreamPtr output;
-    Block header;
-
-    SquashingTransform transform;
-    bool all_written = false;
-
-    void finalize();
-
-    bool disable_flush = false;
-};
-
-}
diff --git a/src/DataStreams/TTLUpdateInfoAlgorithm.cpp b/src/DataStreams/TTLUpdateInfoAlgorithm.cpp
deleted file mode 100644
index d5feb14658b..00000000000
--- a/src/DataStreams/TTLUpdateInfoAlgorithm.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <DataStreams/TTLUpdateInfoAlgorithm.h>
-
-namespace DB
-{
-
-TTLUpdateInfoAlgorithm::TTLUpdateInfoAlgorithm(
-    const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
-    : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
-{
-}
-
-void TTLUpdateInfoAlgorithm::execute(Block & block)
-{
-    if (!block)
-        return;
-
-    auto ttl_column = executeExpressionAndGetColumn(description.expression, block, description.result_column);
-    for (size_t i = 0; i < block.rows(); ++i)
-    {
-        UInt32 cur_ttl = ITTLAlgorithm::getTimestampByIndex(ttl_column.get(), i);
-        new_ttl_info.update(cur_ttl);
-    }
-}
-
-TTLMoveAlgorithm::TTLMoveAlgorithm(
-    const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
-    : TTLUpdateInfoAlgorithm(description_, old_ttl_info_, current_time_, force_)
-{
-}
-
-void TTLMoveAlgorithm::finalize(const MutableDataPartPtr & data_part) const
-{
-    data_part->ttl_infos.moves_ttl[description.result_column] = new_ttl_info;
-}
-
-TTLRecompressionAlgorithm::TTLRecompressionAlgorithm(
-    const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
-    : TTLUpdateInfoAlgorithm(description_, old_ttl_info_, current_time_, force_)
-{
-}
-
-void TTLRecompressionAlgorithm::finalize(const MutableDataPartPtr & data_part) const
-{
-    data_part->ttl_infos.recompression_ttl[description.result_column] = new_ttl_info;
-}
-
-}
diff --git a/src/DataStreams/TTLUpdateInfoAlgorithm.h b/src/DataStreams/TTLUpdateInfoAlgorithm.h
deleted file mode 100644
index c1ef0e1c90d..00000000000
--- a/src/DataStreams/TTLUpdateInfoAlgorithm.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <DataStreams/ITTLAlgorithm.h>
-
-namespace DB
-{
-
-/// Calculates new ttl_info and does nothing with data.
-class TTLUpdateInfoAlgorithm : public ITTLAlgorithm
-{
-public:
-    TTLUpdateInfoAlgorithm(const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
-
-    void execute(Block & block) override;
-    void finalize(const MutableDataPartPtr & data_part) const override = 0;
-};
-
-class TTLMoveAlgorithm final : public TTLUpdateInfoAlgorithm
-{
-public:
-    TTLMoveAlgorithm(const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
-    void finalize(const MutableDataPartPtr & data_part) const override;
-};
-
-class TTLRecompressionAlgorithm final : public TTLUpdateInfoAlgorithm
-{
-public:
-    TTLRecompressionAlgorithm(const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
-    void finalize(const MutableDataPartPtr & data_part) const override;
-};
-
-}
diff --git a/src/DataStreams/TemporaryFileStream.h b/src/DataStreams/TemporaryFileStream.h
deleted file mode 100644
index ec38f6c1baa..00000000000
--- a/src/DataStreams/TemporaryFileStream.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <DataStreams/copyData.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/ISource.h>
-#include <Compression/CompressedReadBuffer.h>
-#include <Compression/CompressedWriteBuffer.h>
-#include <IO/ReadBufferFromFile.h>
-#include <IO/WriteBufferFromFile.h>
-
-namespace DB
-{
-
-/// To read the data that was flushed into the temporary data file.
-struct TemporaryFileStream
-{
-    ReadBufferFromFile file_in;
-    CompressedReadBuffer compressed_in;
-    BlockInputStreamPtr block_in;
-
-    explicit TemporaryFileStream(const std::string & path)
-        : file_in(path)
-        , compressed_in(file_in)
-        , block_in(std::make_shared<NativeBlockInputStream>(compressed_in, DBMS_TCP_PROTOCOL_VERSION))
-    {}
-
-    TemporaryFileStream(const std::string & path, const Block & header_)
-        : file_in(path)
-        , compressed_in(file_in)
-        , block_in(std::make_shared<NativeBlockInputStream>(compressed_in, header_, 0))
-    {}
-
-    /// Flush data from input stream into file for future reading
-    static void write(const std::string & path, const Block & header, QueryPipeline pipeline, const std::string & codec)
-    {
-        WriteBufferFromFile file_buf(path);
-        CompressedWriteBuffer compressed_buf(file_buf, CompressionCodecFactory::instance().get(codec, {}));
-        NativeBlockOutputStream output(compressed_buf, 0, header);
-
-        PullingPipelineExecutor executor(pipeline);
-
-        output.writePrefix();
-
-        Block block;
-        while (executor.pull(block))
-            output.write(block);
-
-        output.writeSuffix();
-        compressed_buf.finalize();
-    }
-};
-
-class TemporaryFileLazySource : public ISource
-{
-public:
-    TemporaryFileLazySource(const std::string & path_, const Block & header_)
-        : ISource(header_)
-        , path(path_)
-        , done(false)
-    {}
-
-    String getName() const override { return "TemporaryFileLazySource"; }
-
-protected:
-    Chunk generate() override
-    {
-        if (done)
-            return {};
-
-        if (!stream)
-            stream = std::make_unique<TemporaryFileStream>(path, header);
-
-        auto block = stream->block_in->read();
-        if (!block)
-        {
-            done = true;
-            stream.reset();
-        }
-        return Chunk(block.getColumns(), block.rows());
-    }
-
-private:
-    const std::string path;
-    Block header;
-    bool done;
-    std::unique_ptr<TemporaryFileStream> stream;
-};
-
-}
diff --git a/src/DataStreams/UnionBlockInputStream.h b/src/DataStreams/UnionBlockInputStream.h
deleted file mode 100644
index ab667ac2e36..00000000000
--- a/src/DataStreams/UnionBlockInputStream.h
+++ /dev/null
@@ -1,259 +0,0 @@
-#pragma once
-
-#include <common/logger_useful.h>
-
-#include <Common/ConcurrentBoundedQueue.h>
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/ParallelInputsProcessor.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-
-/** Merges several sources into one.
-  * Blocks from different sources are interleaved with each other in an arbitrary way.
-  * You can specify the number of threads (max_threads),
-  *  in which data will be retrieved from different sources.
-  *
-  * It's managed like this:
-  * - with the help of ParallelInputsProcessor in several threads it takes out blocks from the sources;
-  * - the completed blocks are added to a limited queue of finished blocks;
-  * - the main thread takes out completed blocks from the queue of finished blocks;
-  */
-class UnionBlockInputStream final : public IBlockInputStream
-{
-private:
-    /// A block or an exception.
-    struct OutputData
-    {
-        Block block;
-        std::exception_ptr exception;
-
-        OutputData() {}
-        OutputData(Block & block_) : block(block_) {}
-        OutputData(std::exception_ptr & exception_) : exception(exception_) {}
-    };
-
-public:
-    using ExceptionCallback = std::function<void()>;
-
-    UnionBlockInputStream(
-        BlockInputStreams inputs,
-        BlockInputStreamPtr additional_input_at_end,
-        size_t max_threads,
-        ExceptionCallback exception_callback_ = ExceptionCallback()
-    ) :
-        output_queue(std::min(inputs.size(), max_threads)), handler(*this),
-        processor(inputs, additional_input_at_end, max_threads, handler),
-        exception_callback(exception_callback_)
-    {
-        children = inputs;
-        if (additional_input_at_end)
-            children.push_back(additional_input_at_end);
-
-        size_t num_children = children.size();
-        if (num_children > 1)
-        {
-            Block header = children.at(0)->getHeader();
-            for (size_t i = 1; i < num_children; ++i)
-                assertBlocksHaveEqualStructure(children[i]->getHeader(), header, "UNION");
-        }
-    }
-
-    String getName() const override { return "Union"; }
-
-    ~UnionBlockInputStream() override
-    {
-        try
-        {
-            if (!all_read)
-                cancel(false);
-
-            finalize();
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-
-    /** Different from the default implementation by trying to stop all sources,
-      * skipping failed by execution.
-      */
-    void cancel(bool kill) override
-    {
-        if (kill)
-            is_killed = true;
-
-        bool old_val = false;
-        if (!is_cancelled.compare_exchange_strong(old_val, true, std::memory_order_seq_cst, std::memory_order_relaxed))
-            return;
-
-        //std::cerr << "cancelling\n";
-        processor.cancel(kill);
-    }
-
-    Block getHeader() const override { return children.at(0)->getHeader(); }
-
-protected:
-    void finalize()
-    {
-        if (!started)
-            return;
-
-        LOG_TRACE(log, "Waiting for threads to finish");
-
-        std::exception_ptr exception;
-        if (!all_read)
-        {
-            /** Let's read everything up to the end, so that ParallelInputsProcessor is not blocked when trying to insert into the queue.
-              * Maybe there is an exception in the queue.
-              */
-            OutputData res;
-            while (true)
-            {
-                //std::cerr << "popping\n";
-                output_queue.pop(res);
-
-                if (res.exception)
-                {
-                    if (!exception)
-                        exception = res.exception;
-                    else if (Exception * e = exception_cast<Exception *>(exception))
-                        e->addMessage("\n" + getExceptionMessage(res.exception, false));
-                }
-                else if (!res.block)
-                    break;
-            }
-
-            all_read = true;
-        }
-
-        processor.wait();
-
-        LOG_TRACE(log, "Waited for threads to finish");
-
-        if (exception)
-            std::rethrow_exception(exception);
-    }
-
-    /// Do nothing, to make the preparation for the query execution in parallel, in ParallelInputsProcessor.
-    void readPrefix() override
-    {
-    }
-
-    /** The following options are possible:
-      * 1. `readImpl` function is called until it returns an empty block.
-      *  Then `readSuffix` function is called and then destructor.
-      * 2. `readImpl` function is called. At some point, `cancel` function is called perhaps from another thread.
-      *  Then `readSuffix` function is called and then destructor.
-      * 3. At any time, the object can be destroyed (destructor called).
-      */
-
-    Block readImpl() override
-    {
-        if (all_read)
-            return received_payload.block;
-
-        /// Run threads if this has not already been done.
-        if (!started)
-        {
-            started = true;
-            processor.process();
-        }
-
-        /// We will wait until the next block is ready or an exception is thrown.
-        //std::cerr << "popping\n";
-        output_queue.pop(received_payload);
-
-        if (received_payload.exception)
-        {
-            if (exception_callback)
-                exception_callback();
-            std::rethrow_exception(received_payload.exception);
-        }
-
-        if (!received_payload.block)
-            all_read = true;
-
-        return received_payload.block;
-    }
-
-    /// Called either after everything is read, or after cancel.
-    void readSuffix() override
-    {
-        //std::cerr << "readSuffix\n";
-        if (!all_read && !isCancelled())
-            throw Exception("readSuffix called before all data is read", ErrorCodes::LOGICAL_ERROR);
-
-        finalize();
-
-        for (size_t i = 0; i < children.size(); ++i)
-            children[i]->readSuffix();
-    }
-
-private:
-    using Payload = OutputData;
-    using OutputQueue = ConcurrentBoundedQueue<Payload>;
-
-    /** The queue of the finished blocks. Also, you can put an exception instead of a block.
-      * When data is run out, an empty block is inserted into the queue.
-      * Sooner or later, an empty block is always inserted into the queue (even after exception or query cancellation).
-      * The queue is always (even after exception or canceling the query, even in destructor) you must read up to an empty block,
-      *  otherwise ParallelInputsProcessor can be blocked during insertion into the queue.
-      */
-    OutputQueue output_queue;
-
-    struct Handler
-    {
-        Handler(UnionBlockInputStream & parent_) : parent(parent_) {}
-
-        void onBlock(Block & block, size_t /*thread_num*/)
-        {
-            parent.output_queue.push(Payload(block));
-        }
-
-        void onFinish()
-        {
-            parent.output_queue.push(Payload());
-        }
-
-        void onFinishThread(size_t /*thread_num*/)
-        {
-        }
-
-        void onException(std::exception_ptr & exception, size_t /*thread_num*/)
-        {
-            //std::cerr << "pushing exception\n";
-
-            /// The order of the rows matters. If it is changed, then the situation is possible,
-            ///  when before exception, an empty block (end of data) will be put into the queue,
-            ///  and the exception is lost.
-
-            parent.output_queue.push(exception);
-            parent.cancel(false);    /// Does not throw exceptions.
-        }
-
-        UnionBlockInputStream & parent;
-    };
-
-    Handler handler;
-    ParallelInputsProcessor<Handler> processor;
-
-    ExceptionCallback exception_callback;
-
-    Payload received_payload;
-
-    bool started = false;
-    bool all_read = false;
-
-    Poco::Logger * log = &Poco::Logger::get("UnionBlockInputStream");
-};
-
-}
diff --git a/src/DataStreams/copyData.cpp b/src/DataStreams/copyData.cpp
deleted file mode 100644
index a26052778a8..00000000000
--- a/src/DataStreams/copyData.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/copyData.h>
-#include <Common/ThreadPool.h>
-
-
-namespace DB
-{
-
-namespace
-{
-
-bool isAtomicSet(std::atomic<bool> * val)
-{
-    return ((val != nullptr) && val->load(std::memory_order_seq_cst));
-}
-
-}
-
-template <typename TCancelCallback, typename TProgressCallback>
-void copyDataImpl(IBlockInputStream & from, IBlockOutputStream & to, TCancelCallback && is_cancelled, TProgressCallback && progress)
-{
-    from.readPrefix();
-    to.writePrefix();
-
-    while (Block block = from.read())
-    {
-        if (is_cancelled())
-            break;
-
-        to.write(block);
-        progress(block);
-    }
-
-    if (is_cancelled())
-        return;
-
-    /// For outputting additional information in some formats.
-    if (from.getProfileInfo().hasAppliedLimit())
-        to.setRowsBeforeLimit(from.getProfileInfo().getRowsBeforeLimit());
-
-    to.setTotals(from.getTotals());
-    to.setExtremes(from.getExtremes());
-
-    if (is_cancelled())
-        return;
-
-    from.readSuffix();
-    to.writeSuffix();
-}
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<void(const Block & block)> & progress,
-              std::atomic<bool> * is_cancelled)
-{
-    auto is_cancelled_pred = [is_cancelled] ()
-    {
-        return isAtomicSet(is_cancelled);
-    };
-
-    copyDataImpl(from, to, is_cancelled_pred, progress);
-}
-
-inline void doNothing(const Block &) {}
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, std::atomic<bool> * is_cancelled)
-{
-    auto is_cancelled_pred = [is_cancelled] ()
-    {
-        return isAtomicSet(is_cancelled);
-    };
-
-    copyDataImpl(from, to, is_cancelled_pred, doNothing);
-}
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<bool()> & is_cancelled)
-{
-    copyDataImpl(from, to, is_cancelled, doNothing);
-}
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<bool()> & is_cancelled,
-              const std::function<void(const Block & block)> & progress)
-{
-    copyDataImpl(from, to, is_cancelled, progress);
-}
-
-}
diff --git a/src/DataStreams/copyData.h b/src/DataStreams/copyData.h
deleted file mode 100644
index 3dc90aed37d..00000000000
--- a/src/DataStreams/copyData.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockStream_fwd.h>
-
-#include <atomic>
-#include <functional>
-
-
-namespace DB
-{
-
-class Block;
-
-/** Copies data from the InputStream into the OutputStream
-  * (for example, from the database to the console, etc.)
-  */
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, std::atomic<bool> * is_cancelled = nullptr);
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<void(const Block & block)> & progress,
-              std::atomic<bool> * is_cancelled = nullptr);
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<bool()> & is_cancelled);
-
-void copyData(IBlockInputStream & from, IBlockOutputStream & to, const std::function<bool()> & is_cancelled,
-              const std::function<void(const Block & block)> & progress);
-
-}
diff --git a/src/DataStreams/finalizeBlock.cpp b/src/DataStreams/finalizeBlock.cpp
deleted file mode 100644
index 56068edcc29..00000000000
--- a/src/DataStreams/finalizeBlock.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <DataStreams/finalizeBlock.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
-#include <Columns/ColumnAggregateFunction.h>
-#include <Common/typeid_cast.h>
-
-
-namespace DB
-{
-    void finalizeBlock(Block & block)
-    {
-        for (size_t i = 0; i < block.columns(); ++i)
-        {
-            ColumnWithTypeAndName & current = block.getByPosition(i);
-            const DataTypeAggregateFunction * unfinalized_type = typeid_cast<const DataTypeAggregateFunction *>(current.type.get());
-
-            if (unfinalized_type)
-            {
-                current.type = unfinalized_type->getReturnType();
-                if (current.column)
-                {
-                    auto mut_column = IColumn::mutate(std::move(current.column));
-                    current.column = ColumnAggregateFunction::convertToValues(std::move(mut_column));
-                }
-            }
-        }
-    }
-}
diff --git a/src/DataStreams/finalizeBlock.h b/src/DataStreams/finalizeBlock.h
deleted file mode 100644
index 3c81ddae1c7..00000000000
--- a/src/DataStreams/finalizeBlock.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-
-namespace DB
-{
-    /// Converts aggregate function columns with non-finalized states to final values
-    void finalizeBlock(Block & block);
-}
diff --git a/src/DataStreams/formatBlock.cpp b/src/DataStreams/formatBlock.cpp
deleted file mode 100644
index e38540256ac..00000000000
--- a/src/DataStreams/formatBlock.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <Core/Block.h>
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/formatBlock.h>
-
-namespace DB
-{
-void formatBlock(BlockOutputStreamPtr & out, const Block & block)
-{
-    out->writePrefix();
-    out->write(block);
-    out->writeSuffix();
-    out->flush();
-}
-
-}
diff --git a/src/DataStreams/formatBlock.h b/src/DataStreams/formatBlock.h
deleted file mode 100644
index 939b72682c3..00000000000
--- a/src/DataStreams/formatBlock.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockStream_fwd.h>
-
-namespace DB
-{
-void formatBlock(BlockOutputStreamPtr & out, const Block & block);
-
-}
diff --git a/src/DataStreams/materializeBlock.cpp b/src/DataStreams/materializeBlock.cpp
deleted file mode 100644
index 6b47cb87baa..00000000000
--- a/src/DataStreams/materializeBlock.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <DataStreams/materializeBlock.h>
-
-
-namespace DB
-{
-
-Block materializeBlock(const Block & block)
-{
-    if (!block)
-        return block;
-
-    Block res = block;
-    size_t columns = res.columns();
-    for (size_t i = 0; i < columns; ++i)
-    {
-        auto & element = res.getByPosition(i);
-        element.column = element.column->convertToFullColumnIfConst();
-    }
-
-    return res;
-}
-
-void materializeBlockInplace(Block & block)
-{
-    for (size_t i = 0; i < block.columns(); ++i)
-        block.getByPosition(i).column = block.getByPosition(i).column->convertToFullColumnIfConst();
-}
-
-}
diff --git a/src/DataStreams/materializeBlock.h b/src/DataStreams/materializeBlock.h
deleted file mode 100644
index 5e1499319c1..00000000000
--- a/src/DataStreams/materializeBlock.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <Core/Block.h>
-
-
-namespace DB
-{
-
-/** Converts columns-constants to full columns ("materializes" them).
-  */
-Block materializeBlock(const Block & block);
-void materializeBlockInplace(Block & block);
-
-}
diff --git a/src/DataStreams/ya.make b/src/DataStreams/ya.make
deleted file mode 100644
index 2012af76697..00000000000
--- a/src/DataStreams/ya.make
+++ /dev/null
@@ -1,57 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/MongoDB
-    contrib/restricted/boost/libs
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-    AddingDefaultBlockOutputStream.cpp
-    AsynchronousBlockInputStream.cpp
-    BlockIO.cpp
-    BlockStreamProfileInfo.cpp
-    CheckConstraintsBlockOutputStream.cpp
-    ColumnGathererStream.cpp
-    ConnectionCollector.cpp
-    ConvertingBlockInputStream.cpp
-    CountingBlockOutputStream.cpp
-    DistinctSortedBlockInputStream.cpp
-    ExecutionSpeedLimits.cpp
-    ExpressionBlockInputStream.cpp
-    IBlockInputStream.cpp
-    ITTLAlgorithm.cpp
-    InternalTextLogsRowOutputStream.cpp
-    MaterializingBlockInputStream.cpp
-    MongoDBBlockInputStream.cpp
-    NativeBlockInputStream.cpp
-    NativeBlockOutputStream.cpp
-    PushingToViewsBlockOutputStream.cpp
-    RemoteBlockInputStream.cpp
-    RemoteBlockOutputStream.cpp
-    RemoteQueryExecutor.cpp
-    RemoteQueryExecutorReadContext.cpp
-    SQLiteBlockInputStream.cpp
-    SizeLimits.cpp
-    SquashingBlockInputStream.cpp
-    SquashingBlockOutputStream.cpp
-    SquashingTransform.cpp
-    TTLAggregationAlgorithm.cpp
-    TTLBlockInputStream.cpp
-    TTLColumnAlgorithm.cpp
-    TTLDeleteAlgorithm.cpp
-    TTLUpdateInfoAlgorithm.cpp
-    copyData.cpp
-    finalizeBlock.cpp
-    materializeBlock.cpp
-    narrowBlockInputStreams.cpp
-
-)
-
-END()
diff --git a/src/DataStreams/ya.make.in b/src/DataStreams/ya.make.in
deleted file mode 100644
index 6969f644307..00000000000
--- a/src/DataStreams/ya.make.in
+++ /dev/null
@@ -1,18 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/MongoDB
-    contrib/restricted/boost/libs
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index f7ae3170119..5c4b94ad823 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -3,8 +3,6 @@
 
 #include <Columns/ColumnAggregateFunction.h>
 
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/FieldVisitorToString.h>
 
diff --git a/src/DataTypes/DataTypeArray.cpp b/src/DataTypes/DataTypeArray.cpp
index bcf3a9c1f57..f78aebd2d99 100644
--- a/src/DataTypes/DataTypeArray.cpp
+++ b/src/DataTypes/DataTypeArray.cpp
@@ -1,17 +1,9 @@
 #include <Columns/ColumnArray.h>
 
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/WriteBufferFromString.h>
-
 #include <Formats/FormatSettings.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationArray.h>
-#include <DataTypes/Serializations/SerializationTupleElement.h>
-#include <DataTypes/Serializations/SerializationNumber.h>
 
 #include <Parsers/IAST.h>
 
@@ -53,69 +45,6 @@ bool DataTypeArray::equals(const IDataType & rhs) const
     return typeid(rhs) == typeid(*this) && nested->equals(*static_cast<const DataTypeArray &>(rhs).nested);
 }
 
-DataTypePtr DataTypeArray::tryGetSubcolumnType(const String & subcolumn_name) const
-{
-    return tryGetSubcolumnTypeImpl(subcolumn_name, 0);
-}
-
-DataTypePtr DataTypeArray::tryGetSubcolumnTypeImpl(const String & subcolumn_name, size_t level) const
-{
-    if (subcolumn_name == "size" + std::to_string(level))
-        return std::make_shared<DataTypeUInt64>();
-
-    DataTypePtr subcolumn;
-    if (const auto * nested_array = typeid_cast<const DataTypeArray *>(nested.get()))
-        subcolumn = nested_array->tryGetSubcolumnTypeImpl(subcolumn_name, level + 1);
-    else
-        subcolumn = nested->tryGetSubcolumnType(subcolumn_name);
-
-    if (subcolumn && subcolumn_name != MAIN_SUBCOLUMN_NAME)
-        subcolumn = std::make_shared<DataTypeArray>(std::move(subcolumn));
-
-    return subcolumn;
-}
-
-ColumnPtr DataTypeArray::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
-{
-    return getSubcolumnImpl(subcolumn_name, column, 0);
-}
-
-ColumnPtr DataTypeArray::getSubcolumnImpl(const String & subcolumn_name, const IColumn & column, size_t level) const
-{
-    const auto & column_array = assert_cast<const ColumnArray &>(column);
-    if (subcolumn_name == "size" + std::to_string(level))
-        return arrayOffsetsToSizes(column_array.getOffsetsColumn());
-
-    ColumnPtr subcolumn;
-    if (const auto * nested_array = typeid_cast<const DataTypeArray *>(nested.get()))
-        subcolumn = nested_array->getSubcolumnImpl(subcolumn_name, column_array.getData(), level + 1);
-    else
-        subcolumn = nested->getSubcolumn(subcolumn_name, column_array.getData());
-
-    return ColumnArray::create(subcolumn, column_array.getOffsetsPtr());
-}
-
-SerializationPtr DataTypeArray::getSubcolumnSerialization(
-    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
-{
-    return getSubcolumnSerializationImpl(subcolumn_name, base_serialization_getter, 0);
-}
-
-SerializationPtr DataTypeArray::getSubcolumnSerializationImpl(
-    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter, size_t level) const
-{
-    if (subcolumn_name == "size" + std::to_string(level))
-        return std::make_shared<SerializationTupleElement>(base_serialization_getter(DataTypeUInt64()), subcolumn_name, false);
-
-    SerializationPtr subcolumn;
-    if (const auto * nested_array = typeid_cast<const DataTypeArray *>(nested.get()))
-        subcolumn = nested_array->getSubcolumnSerializationImpl(subcolumn_name, base_serialization_getter, level + 1);
-    else
-        subcolumn = nested->getSubcolumnSerialization(subcolumn_name, base_serialization_getter);
-
-    return std::make_shared<SerializationArray>(subcolumn);
-}
-
 SerializationPtr DataTypeArray::doGetDefaultSerialization() const
 {
     return std::make_shared<SerializationArray>(nested->getDefaultSerialization());
diff --git a/src/DataTypes/DataTypeArray.h b/src/DataTypes/DataTypeArray.h
index c720a15d798..564dbba8503 100644
--- a/src/DataTypes/DataTypeArray.h
+++ b/src/DataTypes/DataTypeArray.h
@@ -54,23 +54,12 @@ public:
         return nested->isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion();
     }
 
-    DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
-    ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
-    SerializationPtr getSubcolumnSerialization(
-        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
-
     SerializationPtr doGetDefaultSerialization() const override;
 
     const DataTypePtr & getNestedType() const { return nested; }
 
     /// 1 for plain array, 2 for array of arrays and so on.
     size_t getNumberOfDimensions() const;
-
-private:
-    ColumnPtr getSubcolumnImpl(const String & subcolumn_name, const IColumn & column, size_t level) const;
-    DataTypePtr tryGetSubcolumnTypeImpl(const String & subcolumn_name, size_t level) const;
-    SerializationPtr getSubcolumnSerializationImpl(
-        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter, size_t level) const;
 };
 
 }
diff --git a/src/DataTypes/DataTypeDate.cpp b/src/DataTypes/DataTypeDate.cpp
index 0df2e329702..ee4b0065e59 100644
--- a/src/DataTypes/DataTypeDate.cpp
+++ b/src/DataTypes/DataTypeDate.cpp
@@ -1,14 +1,7 @@
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-
-#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/Serializations/SerializationDate.h>
 #include <DataTypes/DataTypeFactory.h>
 
-#include <Common/assert_cast.h>
-
-
 namespace DB
 {
 
diff --git a/src/DataTypes/DataTypeDate32.h b/src/DataTypes/DataTypeDate32.h
index e74e4553614..9b93e5feb16 100644
--- a/src/DataTypes/DataTypeDate32.h
+++ b/src/DataTypes/DataTypeDate32.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataTypes/DataTypeNumberBase.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
diff --git a/src/DataTypes/DataTypeDateTime.cpp b/src/DataTypes/DataTypeDateTime.cpp
index 820bfd70766..c7722e1c1d9 100644
--- a/src/DataTypes/DataTypeDateTime.cpp
+++ b/src/DataTypes/DataTypeDateTime.cpp
@@ -1,28 +1,12 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/Serializations/SerializationDateTime.h>
 
-#include <Columns/ColumnVector.h>
-#include <Common/assert_cast.h>
-#include <common/DateLUT.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <Formats/FormatSettings.h>
 #include <IO/Operators.h>
-#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/WriteHelpers.h>
-#include <IO/parseDateTimeBestEffort.h>
-#include <Parsers/ASTLiteral.h>
 
 namespace DB
 {
 
-TimezoneMixin::TimezoneMixin(const String & time_zone_name)
-    : has_explicit_time_zone(!time_zone_name.empty()),
-    time_zone(DateLUT::instance(time_zone_name)),
-    utc_time_zone(DateLUT::instance("UTC"))
-{
-}
-
 DataTypeDateTime::DataTypeDateTime(const String & time_zone_name)
     : TimezoneMixin(time_zone_name)
 {
@@ -52,7 +36,7 @@ bool DataTypeDateTime::equals(const IDataType & rhs) const
 
 SerializationPtr DataTypeDateTime::doGetDefaultSerialization() const
 {
-    return std::make_shared<SerializationDateTime>(time_zone, utc_time_zone);
+    return std::make_shared<SerializationDateTime>(*this);
 }
 
 }
diff --git a/src/DataTypes/DataTypeDateTime.h b/src/DataTypes/DataTypeDateTime.h
index 926d529a5d8..57052144216 100644
--- a/src/DataTypes/DataTypeDateTime.h
+++ b/src/DataTypes/DataTypeDateTime.h
@@ -2,33 +2,11 @@
 
 #include <Core/Types.h>
 #include <DataTypes/DataTypeNumberBase.h>
-
-class DateLUTImpl;
+#include <DataTypes/TimezoneMixin.h>
 
 namespace DB
 {
 
-/** Mixin-class that manages timezone info for timezone-aware DateTime implementations
- *
- * Must be used as a (second) base for class implementing IDateType-interface.
- */
-class TimezoneMixin
-{
-public:
-    explicit TimezoneMixin(const String & time_zone_name = "");
-    TimezoneMixin(const TimezoneMixin &) = default;
-
-    const DateLUTImpl & getTimeZone() const { return time_zone; }
-    bool hasExplicitTimeZone() const { return has_explicit_time_zone; }
-
-protected:
-    /// true if time zone name was provided in data type parameters, false if it's using default time zone.
-    bool has_explicit_time_zone;
-
-    const DateLUTImpl & time_zone;
-    const DateLUTImpl & utc_time_zone;
-};
-
 /** DateTime stores time as unix timestamp.
   * The value itself is independent of time zone.
   *
diff --git a/src/DataTypes/DataTypeDateTime64.cpp b/src/DataTypes/DataTypeDateTime64.cpp
index eaec585b6b4..4fa1569f0e8 100644
--- a/src/DataTypes/DataTypeDateTime64.cpp
+++ b/src/DataTypes/DataTypeDateTime64.cpp
@@ -1,19 +1,7 @@
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/Serializations/SerializationDateTime64.h>
-
-#include <Columns/ColumnVector.h>
-#include <Common/assert_cast.h>
-#include <Common/typeid_cast.h>
-#include <common/DateLUT.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <Formats/FormatSettings.h>
 #include <IO/Operators.h>
-#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/WriteHelpers.h>
-#include <IO/parseDateTimeBestEffort.h>
-#include <Parsers/ASTLiteral.h>
-
 #include <optional>
 #include <string>
 
@@ -65,7 +53,7 @@ bool DataTypeDateTime64::equals(const IDataType & rhs) const
 
 SerializationPtr DataTypeDateTime64::doGetDefaultSerialization() const
 {
-    return std::make_shared<SerializationDateTime64>(time_zone, utc_time_zone, scale);
+    return std::make_shared<SerializationDateTime64>(scale, *this);
 }
 
 }
diff --git a/src/DataTypes/DataTypeDecimalBase.cpp b/src/DataTypes/DataTypeDecimalBase.cpp
index 683710b8880..62218694924 100644
--- a/src/DataTypes/DataTypeDecimalBase.cpp
+++ b/src/DataTypes/DataTypeDecimalBase.cpp
@@ -1,15 +1,5 @@
 #include <DataTypes/DataTypeDecimalBase.h>
-
-#include <Common/assert_cast.h>
-#include <Common/typeid_cast.h>
-#include <Core/DecimalFunctions.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/IAST.h>
-
 #include <type_traits>
 
 namespace DB
@@ -28,19 +18,19 @@ bool decimalCheckArithmeticOverflow(ContextPtr context)
     return context->getSettingsRef().decimal_check_overflow;
 }
 
-template <typename T>
+template <is_decimal T>
 Field DataTypeDecimalBase<T>::getDefault() const
 {
     return DecimalField(T(0), scale);
 }
 
-template <typename T>
+template <is_decimal T>
 MutableColumnPtr DataTypeDecimalBase<T>::createColumn() const
 {
     return ColumnType::create(0, scale);
 }
 
-template <typename T>
+template <is_decimal T>
 T DataTypeDecimalBase<T>::getScaleMultiplier(UInt32 scale_)
 {
     return DecimalUtils::scaleMultiplier<typename T::NativeType>(scale_);
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index aea837f890f..c0585095eeb 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -53,11 +53,9 @@ inline UInt32 leastDecimalPrecisionFor(TypeIndex int_type)
 /// Operation between two decimals leads to Decimal(P, S), where
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimalBase : public IDataType
 {
-    static_assert(IsDecimalNumber<T>);
-
 public:
     using FieldType = T;
     using ColumnType = ColumnDecimal<T>;
diff --git a/src/DataTypes/DataTypeEnum.cpp b/src/DataTypes/DataTypeEnum.cpp
index 89fc2b0c0fd..b659d92e3f4 100644
--- a/src/DataTypes/DataTypeEnum.cpp
+++ b/src/DataTypes/DataTypeEnum.cpp
@@ -1,5 +1,4 @@
 #include <IO/WriteBufferFromString.h>
-#include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/Serializations/SerializationEnum.h>
 #include <DataTypes/DataTypeFactory.h>
@@ -134,7 +133,8 @@ Field DataTypeEnum<Type>::castToName(const Field & value_or_name) const
         return this->getNameForValue(static_cast<Type>(value)).toString();
     }
     else
-        throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
+        throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD,
+            "DataTypeEnum: Unsupported type of field {}", value_or_name.getTypeName());
 }
 
 template <typename Type>
@@ -153,7 +153,8 @@ Field DataTypeEnum<Type>::castToValue(const Field & value_or_name) const
         return value;
     }
     else
-        throw Exception(String("DataTypeEnum: Unsupported type of field ") + value_or_name.getTypeName(), ErrorCodes::BAD_TYPE_OF_FIELD);
+        throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD,
+            "DataTypeEnum: Unsupported type of field {}", value_or_name.getTypeName());
 }
 
 
diff --git a/src/DataTypes/DataTypeEnum.h b/src/DataTypes/DataTypeEnum.h
index 57657d1d110..92c72b87afa 100644
--- a/src/DataTypes/DataTypeEnum.h
+++ b/src/DataTypes/DataTypeEnum.h
@@ -27,6 +27,8 @@ public:
     bool isCategorial() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
     bool isComparable() const override { return true; }
+
+    virtual bool contains(const IDataType & rhs) const = 0;
 };
 
 
@@ -76,7 +78,7 @@ public:
     /// Example:
     /// Enum('a' = 1, 'b' = 2) -> Enum('c' = 1, 'b' = 2, 'd' = 3) OK
     /// Enum('a' = 1, 'b' = 2) -> Enum('a' = 2, 'b' = 1) NOT OK
-    bool contains(const IDataType & rhs) const;
+    bool contains(const IDataType & rhs) const override;
 
     SerializationPtr doGetDefaultSerialization() const override;
 };
diff --git a/src/DataTypes/DataTypeFixedString.cpp b/src/DataTypes/DataTypeFixedString.cpp
index a40592ba023..48034a31707 100644
--- a/src/DataTypes/DataTypeFixedString.cpp
+++ b/src/DataTypes/DataTypeFixedString.cpp
@@ -1,22 +1,12 @@
 #include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnConst.h>
 
-#include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationFixedString.h>
 
-#include <IO/WriteBuffer.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <IO/VarInt.h>
-
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-
 
 namespace DB
 {
diff --git a/src/DataTypes/DataTypeFixedString.h b/src/DataTypes/DataTypeFixedString.h
index d82ea9824f3..f88d2f5337a 100644
--- a/src/DataTypes/DataTypeFixedString.h
+++ b/src/DataTypes/DataTypeFixedString.h
@@ -2,6 +2,7 @@
 
 #include <DataTypes/IDataType.h>
 #include <Common/PODArray_fwd.h>
+#include <Common/Exception.h>
 
 #define MAX_FIXEDSTRING_SIZE 0xFFFFFF
 
diff --git a/src/DataTypes/DataTypeInterval.h b/src/DataTypes/DataTypeInterval.h
index a44fd686b61..9ef6237ec41 100644
--- a/src/DataTypes/DataTypeInterval.h
+++ b/src/DataTypes/DataTypeInterval.h
@@ -27,7 +27,7 @@ public:
 
     DataTypeInterval(IntervalKind kind_) : kind(kind_) {}
 
-    std::string doGetName() const override { return std::string("Interval") + kind.toString(); }
+    std::string doGetName() const override { return fmt::format("Interval{}", kind.toString()); }
     const char * getFamilyName() const override { return "Interval"; }
     TypeIndex getTypeId() const override { return TypeIndex::Interval; }
 
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 600d83bb112..6357ead0978 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -6,7 +6,7 @@
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
 #include <Core/Field.h>
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeFactory.h>
@@ -53,8 +53,8 @@ namespace
         {
         }
 
-        template <typename T, size_t>
-        void operator()()
+        template <class T>
+        void operator()(Id<T>)
         {
             if (typeid_cast<const DataTypeNumber<T> *>(&keys_type))
                 column = creator(static_cast<ColumnVector<T> *>(nullptr));
@@ -89,7 +89,7 @@ MutableColumnUniquePtr DataTypeLowCardinality::createColumnUniqueImpl(const IDat
     else if (which.isInt() || which.isUInt() || which.isFloat())
     {
         MutableColumnUniquePtr column;
-        TypeListNativeNumbers::forEach(CreateColumnVector(column, *type, creator));
+        TLUtils::forEach(TLIntegral{}, CreateColumnVector(column, *type, creator));
 
         if (!column)
             throw Exception("Unexpected numeric type: " + type->getName(), ErrorCodes::LOGICAL_ERROR);
diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index 8fd375aa86e..41de17982aa 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -1,9 +1,7 @@
-#include <common/map.h>
+#include <base/map.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Columns/ColumnMap.h>
-#include <Columns/ColumnArray.h>
 #include <Core/Field.h>
-#include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -11,14 +9,7 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationMap.h>
 #include <Parsers/IAST.h>
-#include <Parsers/ASTNameTypePair.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Common/quoteString.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/ReadBufferFromString.h>
 #include <IO/Operators.h>
 
 
@@ -79,32 +70,11 @@ void DataTypeMap::assertKeyType() const
 std::string DataTypeMap::doGetName() const
 {
     WriteBufferFromOwnString s;
-    s << "Map(" << key_type->getName() << "," << value_type->getName() << ")";
+    s << "Map(" << key_type->getName() << ", " << value_type->getName() << ")";
 
     return s.str();
 }
 
-static const IColumn & extractNestedColumn(const IColumn & column)
-{
-    return assert_cast<const ColumnMap &>(column).getNestedColumn();
-}
-
-DataTypePtr DataTypeMap::tryGetSubcolumnType(const String & subcolumn_name) const
-{
-    return nested->tryGetSubcolumnType(subcolumn_name);
-}
-
-ColumnPtr DataTypeMap::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
-{
-    return nested->getSubcolumn(subcolumn_name, extractNestedColumn(column));
-}
-
-SerializationPtr DataTypeMap::getSubcolumnSerialization(
-    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
-{
-    return nested->getSubcolumnSerialization(subcolumn_name, base_serialization_getter);
-}
-
 MutableColumnPtr DataTypeMap::createColumn() const
 {
     return ColumnMap::create(nested->createColumn());
diff --git a/src/DataTypes/DataTypeMap.h b/src/DataTypes/DataTypeMap.h
index 09b8448885a..04377f85cfb 100644
--- a/src/DataTypes/DataTypeMap.h
+++ b/src/DataTypes/DataTypeMap.h
@@ -32,11 +32,6 @@ public:
 
     bool canBeInsideNullable() const override { return false; }
 
-    DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
-    ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
-    SerializationPtr getSubcolumnSerialization(
-        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
-
     MutableColumnPtr createColumn() const override;
 
     Field getDefault() const override;
diff --git a/src/DataTypes/DataTypeNested.cpp b/src/DataTypes/DataTypeNested.cpp
index eba1bba5dfe..fe7cd515c81 100644
--- a/src/DataTypes/DataTypeNested.cpp
+++ b/src/DataTypes/DataTypeNested.cpp
@@ -2,7 +2,6 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Common/quoteString.h>
 #include <Parsers/ASTNameTypePair.h>
diff --git a/src/DataTypes/DataTypeNothing.cpp b/src/DataTypes/DataTypeNothing.cpp
index 388a65754b5..c2b552035a0 100644
--- a/src/DataTypes/DataTypeNothing.cpp
+++ b/src/DataTypes/DataTypeNothing.cpp
@@ -1,10 +1,7 @@
-#include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeNothing.h>
 #include <DataTypes/Serializations/SerializationNothing.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Columns/ColumnNothing.h>
-#include <IO/ReadBuffer.h>
-#include <IO/WriteBuffer.h>
 
 
 namespace DB
diff --git a/src/DataTypes/DataTypeNullable.cpp b/src/DataTypes/DataTypeNullable.cpp
index 3820a320c6d..b354b1278be 100644
--- a/src/DataTypes/DataTypeNullable.cpp
+++ b/src/DataTypes/DataTypeNullable.cpp
@@ -1,17 +1,9 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
-#include <DataTypes/Serializations/SerializationTupleElement.h>
 #include <Columns/ColumnNullable.h>
 #include <Core/Field.h>
-#include <IO/ReadBuffer.h>
-#include <IO/ReadBufferFromMemory.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteBuffer.h>
-#include <IO/WriteHelpers.h>
-#include <IO/ConcatReadBuffer.h>
 #include <Parsers/IAST.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
@@ -63,32 +55,6 @@ bool DataTypeNullable::equals(const IDataType & rhs) const
     return rhs.isNullable() && nested_data_type->equals(*static_cast<const DataTypeNullable &>(rhs).nested_data_type);
 }
 
-DataTypePtr DataTypeNullable::tryGetSubcolumnType(const String & subcolumn_name) const
-{
-    if (subcolumn_name == "null")
-        return std::make_shared<DataTypeUInt8>();
-
-    return nested_data_type->tryGetSubcolumnType(subcolumn_name);
-}
-
-ColumnPtr DataTypeNullable::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
-{
-    const auto & column_nullable = assert_cast<const ColumnNullable &>(column);
-    if (subcolumn_name == "null")
-        return column_nullable.getNullMapColumnPtr();
-
-    return nested_data_type->getSubcolumn(subcolumn_name, column_nullable.getNestedColumn());
-}
-
-SerializationPtr DataTypeNullable::getSubcolumnSerialization(
-    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
-{
-    if (subcolumn_name == "null")
-        return std::make_shared<SerializationTupleElement>(base_serialization_getter(DataTypeUInt8()), subcolumn_name, false);
-
-    return nested_data_type->getSubcolumnSerialization(subcolumn_name, base_serialization_getter);
-}
-
 SerializationPtr DataTypeNullable::doGetDefaultSerialization() const
 {
     return std::make_shared<SerializationNullable>(nested_data_type->getDefaultSerialization());
diff --git a/src/DataTypes/DataTypeNullable.h b/src/DataTypes/DataTypeNullable.h
index 1557179d072..1a54d0de611 100644
--- a/src/DataTypes/DataTypeNullable.h
+++ b/src/DataTypes/DataTypeNullable.h
@@ -41,11 +41,6 @@ public:
     bool onlyNull() const override;
     bool canBeInsideLowCardinality() const override { return nested_data_type->canBeInsideLowCardinality(); }
 
-    DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
-    ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
-    SerializationPtr getSubcolumnSerialization(
-        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
-
     const DataTypePtr & getNestedType() const { return nested_data_type; }
 private:
     SerializationPtr doGetDefaultSerialization() const override;
diff --git a/src/DataTypes/DataTypeNumberBase.cpp b/src/DataTypes/DataTypeNumberBase.cpp
index 12d1989a9d6..f668a4c522e 100644
--- a/src/DataTypes/DataTypeNumberBase.cpp
+++ b/src/DataTypes/DataTypeNumberBase.cpp
@@ -1,13 +1,6 @@
 #include <type_traits>
 #include <DataTypes/DataTypeNumberBase.h>
 #include <Columns/ColumnVector.h>
-#include <Columns/ColumnConst.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Common/NaNUtils.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Formats/FormatSettings.h>
 
 
 namespace DB
@@ -28,13 +21,13 @@ MutableColumnPtr DataTypeNumberBase<T>::createColumn() const
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByInteger() const
 {
-    return is_integer_v<T>;
+    return is_integer<T>;
 }
 
 template <typename T>
 bool DataTypeNumberBase<T>::isValueRepresentedByUnsignedInteger() const
 {
-    return is_integer_v<T> && is_unsigned_v<T>;
+    return is_integer<T> && is_unsigned_v<T>;
 }
 
 
diff --git a/src/DataTypes/DataTypeNumberBase.h b/src/DataTypes/DataTypeNumberBase.h
index c24778691d9..95975051600 100644
--- a/src/DataTypes/DataTypeNumberBase.h
+++ b/src/DataTypes/DataTypeNumberBase.h
@@ -24,7 +24,7 @@ public:
     using FieldType = T;
     using ColumnType = ColumnVector<T>;
 
-    const char * getFamilyName() const override { return TypeName<T>; }
+    const char * getFamilyName() const override { return TypeName<T>.data(); }
     TypeIndex getTypeId() const override { return TypeId<T>; }
 
     Field getDefault() const override;
diff --git a/src/DataTypes/DataTypeString.cpp b/src/DataTypes/DataTypeString.cpp
index 41ae578a70f..84610557d21 100644
--- a/src/DataTypes/DataTypeString.cpp
+++ b/src/DataTypes/DataTypeString.cpp
@@ -1,14 +1,6 @@
-#include <Core/Defines.h>
-
 #include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
-
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-
 #include <Core/Field.h>
 
-#include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationString.h>
@@ -16,15 +8,6 @@
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
 
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <IO/VarInt.h>
-
-#ifdef __SSE2__
-    #include <emmintrin.h>
-#endif
-
-
 namespace DB
 {
 
diff --git a/src/DataTypes/DataTypeString.h b/src/DataTypes/DataTypeString.h
index 0fc38e9c6f0..fd674505bc0 100644
--- a/src/DataTypes/DataTypeString.h
+++ b/src/DataTypes/DataTypeString.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <ostream>
-
 #include <DataTypes/IDataType.h>
 
 
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index ed00582fd29..4e1a5a05d45 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -1,22 +1,19 @@
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Columns/ColumnTuple.h>
 #include <Core/Field.h>
-#include <Formats/FormatSettings.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationTuple.h>
-#include <DataTypes/Serializations/SerializationTupleElement.h>
+#include <DataTypes/Serializations/SerializationNamed.h>
 #include <DataTypes/NestedUtils.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTNameTypePair.h>
-#include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/quoteString.h>
 #include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
@@ -30,7 +27,6 @@ namespace ErrorCodes
     extern const int DUPLICATE_COLUMN;
     extern const int EMPTY_DATA_PASSED;
     extern const int NOT_FOUND_COLUMN_IN_BLOCK;
-    extern const int ILLEGAL_COLUMN;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH;
 }
@@ -107,11 +103,6 @@ static inline IColumn & extractElementColumn(IColumn & column, size_t idx)
     return assert_cast<ColumnTuple &>(column).getColumn(idx);
 }
 
-static inline const IColumn & extractElementColumn(const IColumn & column, size_t idx)
-{
-    return assert_cast<const ColumnTuple &>(column).getColumn(idx);
-}
-
 template <typename F>
 static void addElementSafe(const DataTypes & elems, IColumn & column, F && impl)
 {
@@ -234,74 +225,6 @@ size_t DataTypeTuple::getSizeOfValueInMemory() const
     return res;
 }
 
-template <typename OnSuccess, typename OnContinue>
-auto DataTypeTuple::getSubcolumnEntity(const String & subcolumn_name,
-    const OnSuccess & on_success, const OnContinue & on_continue) const
-{
-    using ReturnType = decltype(on_success(0));
-    for (size_t i = 0; i < names.size(); ++i)
-    {
-        if (startsWith(subcolumn_name, names[i]))
-        {
-            size_t name_length = names[i].size();
-
-            if (subcolumn_name.size() == name_length)
-                return on_success(i);
-
-            if (subcolumn_name[name_length] == '.')
-                return on_continue(i, subcolumn_name.substr(name_length + 1));
-        }
-    }
-
-    return ReturnType{};
-}
-
-DataTypePtr DataTypeTuple::tryGetSubcolumnType(const String & subcolumn_name) const
-{
-    if (subcolumn_name == MAIN_SUBCOLUMN_NAME)
-        return shared_from_this();
-
-    auto on_success = [&](size_t pos) { return elems[pos]; };
-    auto on_continue = [&](size_t pos, const String & next_subcolumn) { return elems[pos]->tryGetSubcolumnType(next_subcolumn); };
-
-    return getSubcolumnEntity(subcolumn_name, on_success, on_continue);
-}
-
-ColumnPtr DataTypeTuple::getSubcolumn(const String & subcolumn_name, const IColumn & column) const
-{
-    auto on_success = [&](size_t pos) { return extractElementColumn(column, pos).getPtr(); };
-    auto on_continue = [&](size_t pos, const String & next_subcolumn)
-    {
-        return elems[pos]->getSubcolumn(next_subcolumn, extractElementColumn(column, pos));
-    };
-
-    if (auto subcolumn = getSubcolumnEntity(subcolumn_name, on_success, on_continue))
-        return subcolumn;
-
-    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
-}
-
-SerializationPtr DataTypeTuple::getSubcolumnSerialization(
-    const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const
-{
-    auto on_success = [&](size_t pos)
-    {
-        return std::make_shared<SerializationTupleElement>(base_serialization_getter(*elems[pos]), names[pos]);
-    };
-
-    auto on_continue = [&](size_t pos, const String & next_subcolumn)
-    {
-        auto next_serialization = elems[pos]->getSubcolumnSerialization(next_subcolumn, base_serialization_getter);
-        return std::make_shared<SerializationTupleElement>(next_serialization, names[pos]);
-    };
-
-    if (auto serialization = getSubcolumnEntity(subcolumn_name, on_success, on_continue))
-        return serialization;
-
-    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
-}
-
-
 SerializationPtr DataTypeTuple::doGetDefaultSerialization() const
 {
     SerializationTuple::ElementSerializations serializations(elems.size());
@@ -310,7 +233,7 @@ SerializationPtr DataTypeTuple::doGetDefaultSerialization() const
     {
         String elem_name = use_explicit_names ? names[i] : toString(i + 1);
         auto serialization = elems[i]->getDefaultSerialization();
-        serializations[i] = std::make_shared<SerializationTupleElement>(serialization, elem_name);
+        serializations[i] = std::make_shared<SerializationNamed>(serialization, elem_name);
     }
 
     return std::make_shared<SerializationTuple>(std::move(serializations), use_explicit_names);
@@ -325,7 +248,7 @@ SerializationPtr DataTypeTuple::getSerialization(const String & column_name, con
         String elem_name = use_explicit_names ? names[i] : toString(i + 1);
         auto subcolumn_name = Nested::concatenateName(column_name, elem_name);
         auto serializaion = elems[i]->getSerialization(subcolumn_name, callback);
-        serializations[i] = std::make_shared<SerializationTupleElement>(serializaion, elem_name);
+        serializations[i] = std::make_shared<SerializationNamed>(serializaion, elem_name);
     }
 
     return std::make_shared<SerializationTuple>(std::move(serializations), use_explicit_names);
diff --git a/src/DataTypes/DataTypeTuple.h b/src/DataTypes/DataTypeTuple.h
index e572b23f987..8dae8b7765b 100644
--- a/src/DataTypes/DataTypeTuple.h
+++ b/src/DataTypes/DataTypeTuple.h
@@ -52,16 +52,11 @@ public:
     size_t getMaximumSizeOfValueInMemory() const override;
     size_t getSizeOfValueInMemory() const override;
 
-    DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const override;
-    ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const override;
-
     SerializationPtr getSerialization(const String & column_name, const StreamExistenceCallback & callback) const override;
 
-    SerializationPtr getSubcolumnSerialization(
-        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const override;
-
     SerializationPtr doGetDefaultSerialization() const override;
 
+    const DataTypePtr & getElement(size_t i) const { return elems[i]; }
     const DataTypes & getElements() const { return elems; }
     const Strings & getElementNames() const { return names; }
 
@@ -69,11 +64,6 @@ public:
 
     bool haveExplicitNames() const { return have_explicit_names; }
     bool serializeNames() const { return serialize_names; }
-
-private:
-    template <typename OnSuccess, typename OnContinue>
-    auto getSubcolumnEntity(const String & subcolumn_name,
-        const OnSuccess & on_success, const OnContinue & on_continue) const;
 };
 
 }
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index cecfcea8dac..f0fbd6cab26 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -1,16 +1,13 @@
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/Serializations/SerializationDecimal.h>
 
-#include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
 #include <Core/DecimalFunctions.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/readDecimalText.h>
-#include <Interpreters/Context.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/IAST.h>
 
 #include <type_traits>
 
@@ -25,14 +22,14 @@ namespace ErrorCodes
 }
 
 
-template <typename T>
+template <is_decimal T>
 std::string DataTypeDecimal<T>::doGetName() const
 {
     return fmt::format("Decimal({}, {})", this->precision, this->scale);
 }
 
 
-template <typename T>
+template <is_decimal T>
 bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
 {
     if (auto * ptype = typeid_cast<const DataTypeDecimal<T> *>(&rhs))
@@ -40,14 +37,14 @@ bool DataTypeDecimal<T>::equals(const IDataType & rhs) const
     return false;
 }
 
-template <typename T>
+template <is_decimal T>
 DataTypePtr DataTypeDecimal<T>::promoteNumericType() const
 {
     using PromotedType = DataTypeDecimal<Decimal128>;
     return std::make_shared<PromotedType>(PromotedType::maxPrecision(), this->scale);
 }
 
-template <typename T>
+template <is_decimal T>
 T DataTypeDecimal<T>::parseFromString(const String & str) const
 {
     ReadBufferFromMemory buf(str.data(), str.size());
@@ -61,7 +58,7 @@ T DataTypeDecimal<T>::parseFromString(const String & str) const
     return x;
 }
 
-template <typename T>
+template <is_decimal T>
 SerializationPtr DataTypeDecimal<T>::doGetDefaultSerialization() const
 {
     return std::make_shared<SerializationDecimal<T>>(this->precision, this->scale);
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index f08bdb80d41..199f7796f02 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/arithmeticOverflow.h>
-#include <common/extended_types.h>
+#include <base/arithmeticOverflow.h>
+#include <base/extended_types.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeDecimalBase.h>
@@ -24,11 +24,10 @@ namespace ErrorCodes
 /// Operation between two decimals leads to Decimal(P, S), where
 ///     P is one of (9, 18, 38, 76); equals to the maximum precision for the biggest underlying type of operands.
 ///     S is maximum scale of operands. The allowed valuas are [0, precision]
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimal final : public DataTypeDecimalBase<T>
 {
     using Base = DataTypeDecimalBase<T>;
-    static_assert(IsDecimalNumber<T>);
 
 public:
     using typename Base::FieldType;
@@ -48,6 +47,11 @@ public:
     SerializationPtr doGetDefaultSerialization() const override;
 };
 
+using DataTypeDecimal32 = DataTypeDecimal<Decimal32>;
+using DataTypeDecimal64 = DataTypeDecimal<Decimal64>;
+using DataTypeDecimal128 = DataTypeDecimal<Decimal128>;
+using DataTypeDecimal256 = DataTypeDecimal<Decimal256>;
+
 template <typename T>
 inline const DataTypeDecimal<T> * checkDecimal(const IDataType & data_type)
 {
diff --git a/src/DataTypes/EnumValues.cpp b/src/DataTypes/EnumValues.cpp
index 6df899ba9a2..ab5ea0ca249 100644
--- a/src/DataTypes/EnumValues.cpp
+++ b/src/DataTypes/EnumValues.cpp
@@ -1,4 +1,5 @@
 #include <DataTypes/EnumValues.h>
+#include <boost/algorithm/string.hpp>
 
 namespace DB
 {
@@ -82,6 +83,24 @@ Names EnumValues<T>::getAllRegisteredNames() const
     return result;
 }
 
+template <typename T>
+std::unordered_set<String> EnumValues<T>::getSetOfAllNames(bool to_lower) const
+{
+    std::unordered_set<String> result;
+    for (const auto & value : values)
+        result.insert(to_lower ? boost::algorithm::to_lower_copy(value.first) : value.first);
+    return result;
+}
+
+template <typename T>
+std::unordered_set<T> EnumValues<T>::getSetOfAllValues() const
+{
+    std::unordered_set<T> result;
+    for (const auto & value : values)
+        result.insert(value.second);
+    return result;
+}
+
 template class EnumValues<Int8>;
 template class EnumValues<Int16>;
 
diff --git a/src/DataTypes/EnumValues.h b/src/DataTypes/EnumValues.h
index 1e5e4f55ea7..17c292c5551 100644
--- a/src/DataTypes/EnumValues.h
+++ b/src/DataTypes/EnumValues.h
@@ -80,6 +80,10 @@ public:
     }
 
     Names getAllRegisteredNames() const override;
+
+    std::unordered_set<String> getSetOfAllNames(bool to_lower) const;
+
+    std::unordered_set<T> getSetOfAllValues() const;
 };
 
 }
diff --git a/src/DataTypes/FieldToDataType.cpp b/src/DataTypes/FieldToDataType.cpp
index 3c3439593ed..c1a8cacd5c2 100644
--- a/src/DataTypes/FieldToDataType.cpp
+++ b/src/DataTypes/FieldToDataType.cpp
@@ -19,7 +19,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int EMPTY_DATA_PASSED;
-    extern const int LOGICAL_ERROR;
 }
 
 
@@ -28,16 +27,6 @@ DataTypePtr FieldToDataType::operator() (const Null &) const
     return std::make_shared<DataTypeNullable>(std::make_shared<DataTypeNothing>());
 }
 
-DataTypePtr FieldToDataType::operator() (const NegativeInfinity &) const
-{
-    throw Exception("It's invalid to have -inf literals in SQL", ErrorCodes::LOGICAL_ERROR);
-}
-
-DataTypePtr FieldToDataType::operator() (const PositiveInfinity &) const
-{
-    throw Exception("It's invalid to have +inf literals in SQL", ErrorCodes::LOGICAL_ERROR);
-}
-
 DataTypePtr FieldToDataType::operator() (const UInt64 & x) const
 {
     if (x <= std::numeric_limits<UInt8>::max()) return std::make_shared<DataTypeUInt8>();
diff --git a/src/DataTypes/FieldToDataType.h b/src/DataTypes/FieldToDataType.h
index 6d579b2bf65..ca83ce868fc 100644
--- a/src/DataTypes/FieldToDataType.h
+++ b/src/DataTypes/FieldToDataType.h
@@ -21,8 +21,6 @@ class FieldToDataType : public StaticVisitor<DataTypePtr>
 {
 public:
     DataTypePtr operator() (const Null & x) const;
-    DataTypePtr operator() (const NegativeInfinity & x) const;
-    DataTypePtr operator() (const PositiveInfinity & x) const;
     DataTypePtr operator() (const UInt64 & x) const;
     DataTypePtr operator() (const UInt128 & x) const;
     DataTypePtr operator() (const UInt256 & x) const;
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index c0679557ec9..669876c792d 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -2,7 +2,6 @@
 #include <Columns/ColumnConst.h>
 
 #include <Common/Exception.h>
-#include <Common/escapeForFileName.h>
 #include <Common/SipHash.h>
 
 #include <IO/WriteHelpers.h>
@@ -11,7 +10,6 @@
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypeCustom.h>
 #include <DataTypes/NestedUtils.h>
-#include <DataTypes/Serializations/SerializationTupleElement.h>
 
 
 namespace DB
@@ -26,23 +24,6 @@ namespace ErrorCodes
 
 IDataType::~IDataType() = default;
 
-String IDataType::getName() const
-{
-    if (custom_name)
-    {
-        return custom_name->getName();
-    }
-    else
-    {
-        return doGetName();
-    }
-}
-
-String IDataType::doGetName() const
-{
-    return getFamilyName();
-}
-
 void IDataType::updateAvgValueSizeHint(const IColumn & column, double & avg_value_size_hint)
 {
     /// Update the average value size hint if amount of read rows isn't too small
@@ -82,12 +63,40 @@ size_t IDataType::getSizeOfValueInMemory() const
     throw Exception("Value of type " + getName() + " in memory is not of fixed size.", ErrorCodes::LOGICAL_ERROR);
 }
 
+void IDataType::forEachSubcolumn(
+    const SubcolumnCallback & callback,
+    const SerializationPtr & serialization,
+    const DataTypePtr & type,
+    const ColumnPtr & column)
+{
+    ISerialization::StreamCallback callback_with_data = [&](const auto & subpath)
+    {
+        for (size_t i = 0; i < subpath.size(); ++i)
+        {
+            if (!subpath[i].visited && ISerialization::hasSubcolumnForPath(subpath, i + 1))
+            {
+                auto name = ISerialization::getSubcolumnNameForStream(subpath, i + 1);
+                auto data = ISerialization::createFromPath(subpath, i);
+                callback(subpath, name, data);
+            }
+            subpath[i].visited = true;
+        }
+    };
+
+    ISerialization::SubstreamPath path;
+    serialization->enumerateStreams(path, callback_with_data, type, column);
+}
+
 DataTypePtr IDataType::tryGetSubcolumnType(const String & subcolumn_name) const
 {
-    if (subcolumn_name == MAIN_SUBCOLUMN_NAME)
-        return shared_from_this();
+    DataTypePtr res;
+    forEachSubcolumn([&](const auto &, const auto & name, const auto & data)
+    {
+        if (name == subcolumn_name)
+            res = data.type;
+    }, getDefaultSerialization(), getPtr(), nullptr);
 
-    return nullptr;
+    return res;
 }
 
 DataTypePtr IDataType::getSubcolumnType(const String & subcolumn_name) const
@@ -99,28 +108,44 @@ DataTypePtr IDataType::getSubcolumnType(const String & subcolumn_name) const
     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
 }
 
-ColumnPtr IDataType::getSubcolumn(const String & subcolumn_name, const IColumn &) const
+SerializationPtr IDataType::getSubcolumnSerialization(const String & subcolumn_name, const SerializationPtr & serialization) const
 {
+    SerializationPtr res;
+    forEachSubcolumn([&](const auto &, const auto & name, const auto & data)
+    {
+        if (name == subcolumn_name)
+            res = data.serialization;
+    }, serialization, nullptr, nullptr);
+
+    if (res)
+        return res;
+
+    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
+}
+
+ColumnPtr IDataType::getSubcolumn(const String & subcolumn_name, const ColumnPtr & column) const
+{
+    ColumnPtr res;
+    forEachSubcolumn([&](const auto &, const auto & name, const auto & data)
+    {
+        if (name == subcolumn_name)
+            res = data.column;
+    }, getDefaultSerialization(), nullptr, column);
+
+    if (res)
+        return res;
+
     throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
 }
 
 Names IDataType::getSubcolumnNames() const
 {
-    NameSet res;
-    getDefaultSerialization()->enumerateStreams([&res, this](const ISerialization::SubstreamPath & substream_path)
+    Names res;
+    forEachSubcolumn([&](const auto &, const auto & name, const auto &)
     {
-        ISerialization::SubstreamPath new_path;
-        /// Iterate over path to try to get intermediate subcolumns for complex nested types.
-        for (const auto & elem : substream_path)
-        {
-            new_path.push_back(elem);
-            auto subcolumn_name = ISerialization::getSubcolumnNameForStream(new_path);
-            if (!subcolumn_name.empty() && tryGetSubcolumnType(subcolumn_name))
-                res.insert(subcolumn_name);
-        }
-    });
-
-    return Names(std::make_move_iterator(res.begin()), std::make_move_iterator(res.end()));
+        res.push_back(name);
+    }, getDefaultSerialization(), nullptr, nullptr);
+    return res;
 }
 
 void IDataType::insertDefaultInto(IColumn & column) const
@@ -146,24 +171,14 @@ SerializationPtr IDataType::getDefaultSerialization() const
     return doGetDefaultSerialization();
 }
 
-SerializationPtr IDataType::getSubcolumnSerialization(const String & subcolumn_name, const BaseSerializationGetter &) const
-{
-    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
-}
-
 // static
 SerializationPtr IDataType::getSerialization(const NameAndTypePair & column, const IDataType::StreamExistenceCallback & callback)
 {
     if (column.isSubcolumn())
     {
-        /// Wrap to custom serialization deepest subcolumn, which is represented in non-complex type.
-        auto base_serialization_getter = [&](const IDataType & subcolumn_type)
-        {
-            return subcolumn_type.getSerialization(column.name, callback);
-        };
-
-        auto type_in_storage = column.getTypeInStorage();
-        return type_in_storage->getSubcolumnSerialization(column.getSubcolumnName(), base_serialization_getter);
+        const auto & type_in_storage = column.getTypeInStorage();
+        auto default_serialization = type_in_storage->getDefaultSerialization();
+        return type_in_storage->getSubcolumnSerialization(column.getSubcolumnName(), default_serialization);
     }
 
     return column.type->getSerialization(column.name, callback);
@@ -174,21 +189,4 @@ SerializationPtr IDataType::getSerialization(const String &, const StreamExisten
     return getDefaultSerialization();
 }
 
-DataTypePtr IDataType::getTypeForSubstream(const ISerialization::SubstreamPath & substream_path) const
-{
-    auto type = tryGetSubcolumnType(ISerialization::getSubcolumnNameForStream(substream_path));
-    if (type)
-        return type->getSubcolumnType(MAIN_SUBCOLUMN_NAME);
-
-    return getSubcolumnType(MAIN_SUBCOLUMN_NAME);
-}
-
-void IDataType::enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback, ISerialization::SubstreamPath & path) const
-{
-    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
-    {
-        callback(substream_path, *getTypeForSubstream(substream_path));
-    }, path);
-}
-
 }
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index c4f04282487..a53fdac797f 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -4,7 +4,7 @@
 #include <Common/COW.h>
 #include <boost/noncopyable.hpp>
 #include <Core/Names.h>
-#include <Core/Types.h>
+#include <Core/TypeId.h>
 #include <DataTypes/DataTypeCustom.h>
 
 
@@ -29,6 +29,13 @@ using DataTypes = std::vector<DataTypePtr>;
 struct NameAndTypePair;
 class SerializationInfo;
 
+struct DataTypeWithConstInfo
+{
+    DataTypePtr type;
+    bool is_const;
+};
+
+using DataTypesWithConstInfo = std::vector<DataTypeWithConstInfo>;
 
 /** Properties of data type.
   *
@@ -55,7 +62,15 @@ public:
     /// static constexpr bool is_parametric = false;
 
     /// Name of data type (examples: UInt64, Array(String)).
-    String getName() const;
+    String getName() const
+    {
+      if (custom_name)
+          return custom_name->getName();
+      else
+          return doGetName();
+    }
+
+    DataTypePtr getPtr() const { return shared_from_this(); }
 
     /// Name of data type family (example: FixedString, Array).
     virtual const char * getFamilyName() const = 0;
@@ -63,10 +78,23 @@ public:
     /// Data type id. It's used for runtime type checks.
     virtual TypeIndex getTypeId() const = 0;
 
-    static constexpr auto MAIN_SUBCOLUMN_NAME = "__main";
-    virtual DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const;
+    DataTypePtr tryGetSubcolumnType(const String & subcolumn_name) const;
     DataTypePtr getSubcolumnType(const String & subcolumn_name) const;
-    virtual ColumnPtr getSubcolumn(const String & subcolumn_name, const IColumn & column) const;
+
+    SerializationPtr getSubcolumnSerialization(const String & subcolumn_name, const SerializationPtr & serialization) const;
+    ColumnPtr getSubcolumn(const String & subcolumn_name, const ColumnPtr & column) const;
+
+    using SubcolumnCallback = std::function<void(
+        const ISerialization::SubstreamPath &,
+        const String &,
+        const ISerialization::SubstreamData &)>;
+
+    static void forEachSubcolumn(
+        const SubcolumnCallback & callback,
+        const SerializationPtr & serialization,
+        const DataTypePtr & type,
+        const ColumnPtr & column);
+
     Names getSubcolumnNames() const;
 
     /// Returns default serialization of data type.
@@ -77,7 +105,6 @@ public:
     /// one of serialization types, that serialization will be chosen for reading.
     /// If callback always returned false, the default serialization will be chosen.
     using StreamExistenceCallback = std::function<bool(const String &)>;
-    using BaseSerializationGetter = std::function<SerializationPtr(const IDataType &)>;
 
     /// Chooses serialization for reading of one column or subcolumns by
     /// checking existence of substreams using callback.
@@ -87,22 +114,10 @@ public:
 
     virtual SerializationPtr getSerialization(const String & column_name, const StreamExistenceCallback & callback) const;
 
-    /// Returns serialization wrapper for reading one particular subcolumn of data type.
-    virtual SerializationPtr getSubcolumnSerialization(
-        const String & subcolumn_name, const BaseSerializationGetter & base_serialization_getter) const;
-
-    using StreamCallbackWithType = std::function<void(const ISerialization::SubstreamPath &, const IDataType &)>;
-
-    void enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback, ISerialization::SubstreamPath & path) const;
-    void enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback, ISerialization::SubstreamPath && path) const { enumerateStreams(serialization, callback, path); }
-    void enumerateStreams(const SerializationPtr & serialization, const StreamCallbackWithType & callback) const { enumerateStreams(serialization, callback, {}); }
-
 protected:
-    virtual String doGetName() const;
+    virtual String doGetName() const { return getFamilyName(); }
     virtual SerializationPtr doGetDefaultSerialization() const = 0;
 
-    DataTypePtr getTypeForSubstream(const ISerialization::SubstreamPath & substream_path) const;
-
 public:
     /** Create empty column for corresponding type.
       */
@@ -371,6 +386,12 @@ inline bool isUInt8(const T & data_type)
     return WhichDataType(data_type).isUInt8();
 }
 
+template <typename T>
+inline bool isUInt64(const T & data_type)
+{
+    return WhichDataType(data_type).isUInt64();
+}
+
 template <typename T>
 inline bool isUnsignedInteger(const T & data_type)
 {
@@ -477,7 +498,7 @@ template <typename DataType> constexpr bool IsDataTypeDateOrDateTime = false;
 
 template <typename DataType> constexpr bool IsDataTypeDecimalOrNumber = IsDataTypeDecimal<DataType> || IsDataTypeNumber<DataType>;
 
-template <typename T>
+template <is_decimal T>
 class DataTypeDecimal;
 
 template <typename T>
@@ -488,7 +509,7 @@ class DataTypeDate32;
 class DataTypeDateTime;
 class DataTypeDateTime64;
 
-template <typename T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
+template <is_decimal T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
 template <> inline constexpr bool IsDataTypeDecimal<DataTypeDateTime64> = true;
 
 template <typename T> constexpr bool IsDataTypeNumber<DataTypeNumber<T>> = true;
diff --git a/src/DataTypes/Native.h b/src/DataTypes/Native.h
index 970b70f9f0b..b72e479cb1d 100644
--- a/src/DataTypes/Native.h
+++ b/src/DataTypes/Native.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 #    include <Common/Exception.h>
diff --git a/src/DataTypes/NestedUtils.cpp b/src/DataTypes/NestedUtils.cpp
index ed9ea3e1b5c..4f804a0ca50 100644
--- a/src/DataTypes/NestedUtils.cpp
+++ b/src/DataTypes/NestedUtils.cpp
@@ -141,7 +141,7 @@ NamesAndTypesList collect(const NamesAndTypesList & names_and_types)
     auto nested_types = getSubcolumnsOfNested(names_and_types);
 
     for (const auto & name_type : names_and_types)
-        if (!nested_types.count(splitName(name_type.name).first))
+        if (!isArray(name_type.type) || !nested_types.count(splitName(name_type.name).first))
             res.push_back(name_type);
 
     for (const auto & name_type : nested_types)
@@ -157,6 +157,9 @@ NamesAndTypesList convertToSubcolumns(const NamesAndTypesList & names_and_types)
 
     for (auto & name_type : res)
     {
+        if (!isArray(name_type.type))
+            continue;
+
         auto split = splitName(name_type.name);
         if (name_type.isSubcolumn() || split.second.empty())
             continue;
@@ -208,6 +211,18 @@ void validateArraySizes(const Block & block)
     }
 }
 
+std::unordered_set<String> getAllTableNames(const Block & block)
+{
+    std::unordered_set<String> nested_table_names;
+    for (auto & name : block.getNames())
+    {
+        auto nested_table_name = Nested::extractTableName(name);
+        if (!nested_table_name.empty())
+            nested_table_names.insert(nested_table_name);
+    }
+    return nested_table_names;
+}
+
 }
 
 }
diff --git a/src/DataTypes/NestedUtils.h b/src/DataTypes/NestedUtils.h
index b8428b96d3e..d16e309fc81 100644
--- a/src/DataTypes/NestedUtils.h
+++ b/src/DataTypes/NestedUtils.h
@@ -28,6 +28,9 @@ namespace Nested
 
     /// Check that sizes of arrays - elements of nested data structures - are equal.
     void validateArraySizes(const Block & block);
+
+    /// Get all nested tables names from a block.
+    std::unordered_set<String> getAllTableNames(const Block & block);
 }
 
 }
diff --git a/src/DataTypes/NumberTraits.h b/src/DataTypes/NumberTraits.h
index 3216149c647..e63c5bcdcb7 100644
--- a/src/DataTypes/NumberTraits.h
+++ b/src/DataTypes/NumberTraits.h
@@ -172,14 +172,14 @@ template <typename A, typename B>
 struct ResultOfIf
 {
     static constexpr bool has_float = std::is_floating_point_v<A> || std::is_floating_point_v<B>;
-    static constexpr bool has_integer = is_integer_v<A> || is_integer_v<B>;
+    static constexpr bool has_integer = is_integer<A> || is_integer<B>;
     static constexpr bool has_signed = is_signed_v<A> || is_signed_v<B>;
     static constexpr bool has_unsigned = !is_signed_v<A> || !is_signed_v<B>;
     static constexpr bool has_big_int = is_big_int_v<A> || is_big_int_v<B>;
 
     static constexpr size_t max_size_of_unsigned_integer = max(is_signed_v<A> ? 0 : sizeof(A), is_signed_v<B> ? 0 : sizeof(B));
     static constexpr size_t max_size_of_signed_integer = max(is_signed_v<A> ? sizeof(A) : 0, is_signed_v<B> ? sizeof(B) : 0);
-    static constexpr size_t max_size_of_integer = max(is_integer_v<A> ? sizeof(A) : 0, is_integer_v<B> ? sizeof(B) : 0);
+    static constexpr size_t max_size_of_integer = max(is_integer<A> ? sizeof(A) : 0, is_integer<B> ? sizeof(B) : 0);
     static constexpr size_t max_size_of_float = max(std::is_floating_point_v<A> ? sizeof(A) : 0, std::is_floating_point_v<B> ? sizeof(B) : 0);
 
     using ConstructedType = typename Construct<has_signed, has_float,
@@ -190,9 +190,9 @@ struct ResultOfIf
 
     using Type =
         std::conditional_t<std::is_same_v<A, B>, A,
-        std::conditional_t<IsDecimalNumber<A> && IsDecimalNumber<B>,
+        std::conditional_t<is_decimal<A> && is_decimal<B>,
             std::conditional_t<(sizeof(A) > sizeof(B)), A, B>,
-        std::conditional_t<!IsDecimalNumber<A> && !IsDecimalNumber<B>,
+        std::conditional_t<!is_decimal<A> && !is_decimal<B>,
             ConstructedType, Error>>>;
 };
 
diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
index ab2e8e1958b..5c0274b0e35 100644
--- a/src/DataTypes/Serializations/ISerialization.cpp
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -1,9 +1,11 @@
 #include <DataTypes/Serializations/ISerialization.h>
+#include <Compression/CompressionFactory.h>
 #include <Columns/IColumn.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 #include <Common/escapeForFileName.h>
 #include <DataTypes/NestedUtils.h>
+#include <base/EnumReflection.h>
 
 
 namespace DB
@@ -16,30 +18,11 @@ namespace ErrorCodes
 
 String ISerialization::Substream::toString() const
 {
-    switch (type)
-    {
-        case ArrayElements:
-            return "ArrayElements";
-        case ArraySizes:
-            return "ArraySizes";
-        case NullableElements:
-            return "NullableElements";
-        case NullMap:
-            return "NullMap";
-        case TupleElement:
-            return "TupleElement(" + tuple_element_name + ", "
-                + std::to_string(escape_tuple_delimiter) + ")";
-        case DictionaryKeys:
-            return "DictionaryKeys";
-        case DictionaryIndexes:
-            return "DictionaryIndexes";
-        case SparseElements:
-            return "SparseElements";
-        case SparseOffsets:
-            return "SparseOffsets";
-    }
+    if (type == TupleElement)
+        return fmt::format("TupleElement({}, escape_tuple_delimiter={})",
+            tuple_element_name, escape_tuple_delimiter ? "true" : "false");
 
-    __builtin_unreachable();
+    return String(magic_enum::enum_name(type));
 }
 
 String ISerialization::SubstreamPath::toString() const
@@ -56,9 +39,21 @@ String ISerialization::SubstreamPath::toString() const
     return wb.str();
 }
 
+void ISerialization::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
+{
+    path.push_back(Substream::Regular);
+    path.back().data = {type, column, getPtr(), nullptr};
+    callback(path);
+    path.pop_back();
+}
+
 void ISerialization::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
 {
-    callback(path);
+    enumerateStreams(path, callback, nullptr, nullptr);
 }
 
 void ISerialization::serializeBinaryBulk(const IColumn & column, WriteBuffer &, size_t, size_t) const
@@ -103,40 +98,48 @@ void ISerialization::deserializeBinaryBulkWithMultipleStreams(
     }
 }
 
-static String getNameForSubstreamPath(
+namespace
+{
+
+using SubstreamIterator = ISerialization::SubstreamPath::const_iterator;
+
+String getNameForSubstreamPath(
     String stream_name,
-    const ISerialization::SubstreamPath & path,
+    SubstreamIterator begin,
+    SubstreamIterator end,
     bool escape_tuple_delimiter)
 {
     using Substream = ISerialization::Substream;
 
     size_t array_level = 0;
-    for (const auto & elem : path)
+    for (auto it = begin; it != end; ++it)
     {
-        if (elem.type == Substream::NullMap)
+        if (it->type == Substream::NullMap)
             stream_name += ".null";
-        else if (elem.type == Substream::ArraySizes)
+        else if (it->type == Substream::ArraySizes)
             stream_name += ".size" + toString(array_level);
-        else if (elem.type == Substream::ArrayElements)
+        else if (it->type == Substream::ArrayElements)
             ++array_level;
-        else if (elem.type == Substream::DictionaryKeys)
+        else if (it->type == Substream::DictionaryKeys)
             stream_name += ".dict";
-        else if (elem.type == Substream::SparseOffsets)
+        else if (it->type == Substream::SparseOffsets)
             stream_name += ".sparse.idx";
-        else if (elem.type == Substream::TupleElement)
+        else if (it->type == Substream::TupleElement)
         {
             /// For compatibility reasons, we use %2E (escaped dot) instead of dot.
             /// Because nested data may be represented not by Array of Tuple,
             ///  but by separate Array columns with names in a form of a.b,
             ///  and name is encoded as a whole.
-            stream_name += (escape_tuple_delimiter && elem.escape_tuple_delimiter ?
-                escapeForFileName(".") : ".") + escapeForFileName(elem.tuple_element_name);
+            stream_name += (escape_tuple_delimiter && it->escape_tuple_delimiter ?
+                escapeForFileName(".") : ".") + escapeForFileName(it->tuple_element_name);
         }
     }
 
     return stream_name;
 }
 
+}
+
 String ISerialization::getFileNameForStream(const NameAndTypePair & column, const SubstreamPath & path)
 {
     return getFileNameForStream(column.getNameInStorage(), path);
@@ -151,12 +154,17 @@ String ISerialization::getFileNameForStream(const String & name_in_storage, cons
     else
         stream_name = escapeForFileName(name_in_storage);
 
-    return getNameForSubstreamPath(std::move(stream_name), path, true);
+    return getNameForSubstreamPath(std::move(stream_name), path.begin(), path.end(), true);
 }
 
 String ISerialization::getSubcolumnNameForStream(const SubstreamPath & path)
 {
-    auto subcolumn_name = getNameForSubstreamPath("", path, false);
+    return getSubcolumnNameForStream(path, path.size());
+}
+
+String ISerialization::getSubcolumnNameForStream(const SubstreamPath & path, size_t prefix_len)
+{
+    auto subcolumn_name = getNameForSubstreamPath("", path.begin(), path.begin() + prefix_len, false);
     if (!subcolumn_name.empty())
         subcolumn_name = subcolumn_name.substr(1); // It starts with a dot.
 
@@ -194,4 +202,44 @@ bool ISerialization::isSpecialCompressionAllowed(const SubstreamPath & path)
     return true;
 }
 
+size_t ISerialization::getArrayLevel(const SubstreamPath & path)
+{
+    size_t level = 0;
+    for (const auto & elem : path)
+        level += elem.type == Substream::ArrayElements;
+    return level;
 }
+
+bool ISerialization::hasSubcolumnForPath(const SubstreamPath & path, size_t prefix_len)
+{
+    if (prefix_len == 0 || prefix_len > path.size())
+        return false;
+
+    size_t last_elem = prefix_len - 1;
+    return path[last_elem].type == Substream::NullMap
+            || path[last_elem].type == Substream::TupleElement
+            || path[last_elem].type == Substream::ArraySizes;
+}
+
+ISerialization::SubstreamData ISerialization::createFromPath(const SubstreamPath & path, size_t prefix_len)
+{
+    assert(prefix_len < path.size());
+
+    SubstreamData res = path[prefix_len].data;
+    res.creator.reset();
+    for (ssize_t i = static_cast<ssize_t>(prefix_len) - 1; i >= 0; --i)
+    {
+        const auto & creator = path[i].data.creator;
+        if (creator)
+        {
+            res.type = res.type ? creator->create(res.type) : res.type;
+            res.serialization = res.serialization ? creator->create(res.serialization) : res.serialization;
+            res.column = res.column ? creator->create(res.column) : res.column;
+        }
+    }
+
+    return res;
+}
+
+}
+
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
index 03785fc07f4..7562cfcb9a0 100644
--- a/src/DataTypes/Serializations/ISerialization.h
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -2,35 +2,39 @@
 
 #include <Common/COW.h>
 #include <Core/Types.h>
+#include <Columns/IColumn.h>
 
+#include <boost/noncopyable.hpp>
 #include <unordered_map>
 #include <memory>
 
 namespace DB
 {
 
-class IDataType;
-
 class ReadBuffer;
 class WriteBuffer;
 class ProtobufReader;
 class ProtobufWriter;
 
-class IColumn;
-using ColumnPtr = COW<IColumn>::Ptr;
-using MutableColumnPtr = COW<IColumn>::MutablePtr;
+class IDataType;
+using DataTypePtr = std::shared_ptr<const IDataType>;
+
+class ISerialization;
+using SerializationPtr = std::shared_ptr<const ISerialization>;
 
 class Field;
 
 struct FormatSettings;
 struct NameAndTypePair;
 
-class ISerialization
+class ISerialization : private boost::noncopyable, public std::enable_shared_from_this<ISerialization>
 {
 public:
     ISerialization() = default;
     virtual ~ISerialization() = default;
 
+    SerializationPtr getPtr() const { return shared_from_this(); }
+
     /** Binary serialization for range of values in column - for writing to disk/network, etc.
       *
       * Some data types are represented in multiple streams while being serialized.
@@ -54,6 +58,24 @@ public:
       * Default implementations of ...WithMultipleStreams methods will call serializeBinaryBulk, deserializeBinaryBulk for single stream.
       */
 
+    struct ISubcolumnCreator
+    {
+        virtual DataTypePtr create(const DataTypePtr & prev) const = 0;
+        virtual SerializationPtr create(const SerializationPtr & prev) const = 0;
+        virtual ColumnPtr create(const ColumnPtr & prev) const = 0;
+        virtual ~ISubcolumnCreator() = default;
+    };
+
+    using SubcolumnCreatorPtr = std::shared_ptr<const ISubcolumnCreator>;
+
+    struct SubstreamData
+    {
+        DataTypePtr type;
+        ColumnPtr column;
+        SerializationPtr serialization;
+        SubcolumnCreatorPtr creator;
+    };
+
     struct Substream
     {
         enum Type
@@ -71,7 +93,10 @@ public:
 
             SparseElements,
             SparseOffsets,
+
+            Regular,
         };
+
         Type type;
 
         /// Index of tuple element, starting at 1 or name.
@@ -80,6 +105,12 @@ public:
         /// Do we need to escape a dot in filenames for tuple elements.
         bool escape_tuple_delimiter = true;
 
+        /// Data for current substream.
+        SubstreamData data;
+
+        /// Flag, that may help to traverse substream paths.
+        mutable bool visited = false;
+
         Substream(Type type_) : type(type_) {}
 
         String toString() const;
@@ -96,7 +127,13 @@ public:
 
     using StreamCallback = std::function<void(const SubstreamPath &)>;
 
-    virtual void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const;
+    virtual void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const;
+
+    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const;
     void enumerateStreams(const StreamCallback & callback, SubstreamPath && path) const { enumerateStreams(callback, path); }
     void enumerateStreams(const StreamCallback & callback) const { enumerateStreams(callback, {}); }
 
@@ -136,6 +173,9 @@ public:
         bool continuous_reading = true;
 
         bool position_independent_encoding = true;
+
+        bool native_format = false;
+
         /// If not zero, may be used to avoid reallocations while reading column of String type.
         double avg_value_size_hint = 0;
     };
@@ -246,11 +286,16 @@ public:
     static String getFileNameForStream(const NameAndTypePair & column, const SubstreamPath & path);
     static String getFileNameForStream(const String & name_in_storage, const SubstreamPath & path);
     static String getSubcolumnNameForStream(const SubstreamPath & path);
+    static String getSubcolumnNameForStream(const SubstreamPath & path, size_t prefix_len);
 
     static void addToSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path, ColumnPtr column);
     static ColumnPtr getFromSubstreamsCache(SubstreamsCache * cache, const SubstreamPath & path);
 
     static bool isSpecialCompressionAllowed(const SubstreamPath & path);
+    static size_t getArrayLevel(const SubstreamPath & path);
+
+    static bool hasSubcolumnForPath(const SubstreamPath & path, size_t prefix_len);
+    static SubstreamData createFromPath(const SubstreamPath & path, size_t prefix_len);
 };
 
 using SerializationPtr = std::shared_ptr<const ISerialization>;
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
index 925ba0b9e74..2339f23853e 100644
--- a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
@@ -1,7 +1,6 @@
 #include <DataTypes/Serializations/SerializationAggregateFunction.h>
 
 #include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
 
 #include <Columns/ColumnAggregateFunction.h>
 
diff --git a/src/DataTypes/Serializations/SerializationArray.cpp b/src/DataTypes/Serializations/SerializationArray.cpp
index 70a72c51e78..4ccee54c294 100644
--- a/src/DataTypes/Serializations/SerializationArray.cpp
+++ b/src/DataTypes/Serializations/SerializationArray.cpp
@@ -1,5 +1,8 @@
 #include <DataTypes/Serializations/SerializationArray.h>
 #include <DataTypes/Serializations/SerializationNumber.h>
+#include <DataTypes/Serializations/SerializationNamed.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnArray.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -177,16 +180,53 @@ ColumnPtr arrayOffsetsToSizes(const IColumn & column)
     return column_sizes;
 }
 
-
-void SerializationArray::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+DataTypePtr SerializationArray::SubcolumnCreator::create(const DataTypePtr & prev) const
 {
-    path.push_back(Substream::ArraySizes);
-    callback(path);
-    path.back() = Substream::ArrayElements;
-    nested->enumerateStreams(callback, path);
-    path.pop_back();
+    return std::make_shared<DataTypeArray>(prev);
 }
 
+SerializationPtr SerializationArray::SubcolumnCreator::create(const SerializationPtr & prev) const
+{
+    return std::make_shared<SerializationArray>(prev);
+}
+
+ColumnPtr SerializationArray::SubcolumnCreator::create(const ColumnPtr & prev) const
+{
+    return ColumnArray::create(prev, offsets);
+}
+
+void SerializationArray::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
+{
+    const auto * type_array = type ? &assert_cast<const DataTypeArray &>(*type) : nullptr;
+    const auto * column_array = column ? &assert_cast<const ColumnArray &>(*column) : nullptr;
+    auto offsets_column = column_array ? column_array->getOffsetsPtr() : nullptr;
+
+    path.push_back(Substream::ArraySizes);
+    path.back().data =
+    {
+        type ? std::make_shared<DataTypeUInt64>() : nullptr,
+        offsets_column ? arrayOffsetsToSizes(*offsets_column) : nullptr,
+        std::make_shared<SerializationNamed>(
+            std::make_shared<SerializationNumber<UInt64>>(),
+                "size" + std::to_string(getArrayLevel(path)), false),
+        nullptr,
+    };
+
+    callback(path);
+
+    path.back() = Substream::ArrayElements;
+    path.back().data = {type, column, getPtr(), std::make_shared<SubcolumnCreator>(offsets_column)};
+
+    auto next_type = type_array ? type_array->getNestedType() : nullptr;
+    auto next_column = column_array ? column_array->getDataPtr() : nullptr;
+
+    nested->enumerateStreams(path, callback, next_type, next_column);
+    path.pop_back();
+}
 
 void SerializationArray::serializeBinaryBulkStatePrefix(
     SerializeBinaryBulkSettings & settings,
diff --git a/src/DataTypes/Serializations/SerializationArray.h b/src/DataTypes/Serializations/SerializationArray.h
index 71037090a48..83045d4c033 100644
--- a/src/DataTypes/Serializations/SerializationArray.h
+++ b/src/DataTypes/Serializations/SerializationArray.h
@@ -35,7 +35,11 @@ public:
       * This is necessary, because when implementing nested structures, several arrays can have common sizes.
       */
 
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+    void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
             SerializeBinaryBulkSettings & settings,
@@ -62,6 +66,18 @@ public:
         DeserializeBinaryBulkSettings & settings,
         DeserializeBinaryBulkStatePtr & state,
         SubstreamsCache * cache) const override;
+
+private:
+    struct SubcolumnCreator : public ISubcolumnCreator
+    {
+        const ColumnPtr offsets;
+
+        SubcolumnCreator(const ColumnPtr & offsets_) : offsets(offsets_) {}
+
+        DataTypePtr create(const DataTypePtr & prev) const override;
+        SerializationPtr create(const SerializationPtr & prev) const override;
+        ColumnPtr create(const ColumnPtr & prev) const override;
+    };
 };
 
 ColumnPtr arrayOffsetsToSizes(const IColumn & column);
diff --git a/src/DataTypes/Serializations/SerializationDate32.cpp b/src/DataTypes/Serializations/SerializationDate32.cpp
index e43edbac592..ff1bb9b2c30 100644
--- a/src/DataTypes/Serializations/SerializationDate32.cpp
+++ b/src/DataTypes/Serializations/SerializationDate32.cpp
@@ -8,6 +8,7 @@
 
 namespace DB
 {
+
 void SerializationDate32::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
 {
     writeDateText(ExtendedDayNum(assert_cast<const ColumnInt32 &>(column).getData()[row_num]), ostr);
diff --git a/src/DataTypes/Serializations/SerializationDateTime.cpp b/src/DataTypes/Serializations/SerializationDateTime.cpp
index 16e47601eeb..0e3b60f3772 100644
--- a/src/DataTypes/Serializations/SerializationDateTime.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime.cpp
@@ -2,7 +2,7 @@
 
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/ProtobufReader.h>
 #include <Formats/ProtobufWriter.h>
@@ -32,9 +32,8 @@ inline void readText(time_t & x, ReadBuffer & istr, const FormatSettings & setti
 
 }
 
-SerializationDateTime::SerializationDateTime(
-    const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_)
-    : time_zone(time_zone_), utc_time_zone(utc_time_zone_)
+SerializationDateTime::SerializationDateTime(const TimezoneMixin & time_zone_)
+    : TimezoneMixin(time_zone_)
 {
 }
 
diff --git a/src/DataTypes/Serializations/SerializationDateTime.h b/src/DataTypes/Serializations/SerializationDateTime.h
index 8cf57ddef89..75334592422 100644
--- a/src/DataTypes/Serializations/SerializationDateTime.h
+++ b/src/DataTypes/Serializations/SerializationDateTime.h
@@ -1,20 +1,17 @@
 #pragma once
 
 #include <DataTypes/Serializations/SerializationNumber.h>
+#include <DataTypes/TimezoneMixin.h>
 
 class DateLUTImpl;
 
 namespace DB
 {
 
-class SerializationDateTime final : public SerializationNumber<UInt32>
+class SerializationDateTime final : public SerializationNumber<UInt32>, public TimezoneMixin
 {
-private:
-    const DateLUTImpl & time_zone;
-    const DateLUTImpl & utc_time_zone;
-
 public:
-    SerializationDateTime(const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_);
+    SerializationDateTime(const TimezoneMixin & time_zone_);
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.cpp b/src/DataTypes/Serializations/SerializationDateTime64.cpp
index 9f3958faa4d..613422f21fb 100644
--- a/src/DataTypes/Serializations/SerializationDateTime64.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime64.cpp
@@ -3,7 +3,7 @@
 #include <Columns/ColumnVector.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/ProtobufReader.h>
 #include <Formats/ProtobufWriter.h>
@@ -17,9 +17,9 @@ namespace DB
 {
 
 SerializationDateTime64::SerializationDateTime64(
-    const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_, UInt32 scale_)
+    UInt32 scale_, const TimezoneMixin & time_zone_)
     : SerializationDecimalBase<DateTime64>(DecimalUtils::max_precision<DateTime64>, scale_)
-    , time_zone(time_zone_), utc_time_zone(utc_time_zone_)
+    , TimezoneMixin(time_zone_)
 {
 }
 
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.h b/src/DataTypes/Serializations/SerializationDateTime64.h
index c36649daef1..1679170b36f 100644
--- a/src/DataTypes/Serializations/SerializationDateTime64.h
+++ b/src/DataTypes/Serializations/SerializationDateTime64.h
@@ -1,20 +1,17 @@
 #pragma once
 
 #include <DataTypes/Serializations/SerializationDecimalBase.h>
+#include <DataTypes/TimezoneMixin.h>
 
 class DateLUTImpl;
 
 namespace DB
 {
 
-class SerializationDateTime64 final : public SerializationDecimalBase<DateTime64>
+class SerializationDateTime64 final : public SerializationDecimalBase<DateTime64>, public TimezoneMixin
 {
-private:
-    const DateLUTImpl & time_zone;
-    const DateLUTImpl & utc_time_zone;
-
 public:
-    SerializationDateTime64(const DateLUTImpl & time_zone_, const DateLUTImpl & utc_time_zone_, UInt32 scale_);
+    SerializationDateTime64(UInt32 scale_, const TimezoneMixin & time_zone_);
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
diff --git a/src/DataTypes/Serializations/SerializationDecimal.cpp b/src/DataTypes/Serializations/SerializationDecimal.cpp
index e0073c80aca..88c6d970980 100644
--- a/src/DataTypes/Serializations/SerializationDecimal.cpp
+++ b/src/DataTypes/Serializations/SerializationDecimal.cpp
@@ -44,10 +44,10 @@ void SerializationDecimal<T>::readText(T & x, ReadBuffer & istr, UInt32 precisio
 }
 
 template <typename T>
-void SerializationDecimal<T>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+void SerializationDecimal<T>::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     T value = assert_cast<const ColumnType &>(column).getData()[row_num];
-    writeText(value, this->scale, ostr);
+    writeText(value, this->scale, ostr, settings.decimal_trailing_zeros);
 }
 
 template <typename T>
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
index 69a41d83138..7a86d5413b2 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.cpp
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -18,6 +18,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int INCORRECT_DATA;
 }
 
 namespace
@@ -39,11 +40,27 @@ SerializationLowCardinality::SerializationLowCardinality(const DataTypePtr & dic
 {
 }
 
-void SerializationLowCardinality::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+void SerializationLowCardinality::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
 {
+    const auto * column_lc = column ? &getColumnLowCardinality(*column) : nullptr;
+
+    SubstreamData data;
+    data.type = type ? dictionary_type : nullptr;
+    data.column = column_lc ? column_lc->getDictionary().getNestedColumn() : nullptr;
+    data.serialization = dict_inner_serialization;
+
     path.push_back(Substream::DictionaryKeys);
-    dict_inner_serialization->enumerateStreams(callback, path);
+    path.back().data = data;
+
+    dict_inner_serialization->enumerateStreams(path, callback, data.type, data.column);
+
     path.back() = Substream::DictionaryIndexes;
+    path.back().data = {type, column, getPtr(), nullptr};
+
     callback(path);
     path.pop_back();
 }
@@ -64,7 +81,7 @@ struct KeysSerializationVersion
     static void checkVersion(UInt64 version)
     {
         if (version != SharedDictionariesWithAdditionalKeys)
-            throw Exception("Invalid version for SerializationLowCardinality key column.", ErrorCodes::LOGICAL_ERROR);
+            throw Exception("Invalid version for SerializationLowCardinality key column.", ErrorCodes::INCORRECT_DATA);
     }
 
     explicit KeysSerializationVersion(UInt64 version) : value(static_cast<Value>(version)) { checkVersion(version); }
@@ -105,7 +122,7 @@ struct IndexesSerializationType
         if (value <= TUInt64)
             return;
 
-        throw Exception("Invalid type for SerializationLowCardinality index column.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception("Invalid type for SerializationLowCardinality index column.", ErrorCodes::INCORRECT_DATA);
     }
 
     void serialize(WriteBuffer & buffer) const
@@ -120,15 +137,24 @@ struct IndexesSerializationType
         writeIntBinary(val, buffer);
     }
 
-    void deserialize(ReadBuffer & buffer)
+    void deserialize(ReadBuffer & buffer, const ISerialization::DeserializeBinaryBulkSettings & settings)
     {
         SerializationType val;
         readIntBinary(val, buffer);
+
         checkType(val);
         has_additional_keys = (val & HasAdditionalKeysBit) != 0;
         need_global_dictionary = (val & NeedGlobalDictionaryBit) != 0;
         need_update_dictionary = (val & NeedUpdateDictionary) != 0;
         type = static_cast<Type>(resetFlags(val));
+
+        if (settings.native_format)
+        {
+            if (need_global_dictionary)
+                throw Exception(ErrorCodes::INCORRECT_DATA,
+                                "LowCardinality indexes serialization type for Native format "
+                                "cannot use global dictionary");
+        }
     }
 
     IndexesSerializationType(const IColumn & column,
@@ -519,8 +545,8 @@ void SerializationLowCardinality::serializeBinaryBulkWithMultipleStreams(
         /// Insert used_keys into global dictionary and update sub_index.
         auto indexes_with_overflow = global_dictionary->uniqueInsertRangeWithOverflow(*keys, 0, keys->size(),
                                                                                       settings.low_cardinality_max_dictionary_size);
-        size_t max_size = settings.low_cardinality_max_dictionary_size + indexes_with_overflow.overflowed_keys->size();
-        ColumnLowCardinality::Index(indexes_with_overflow.indexes->getPtr()).check(max_size);
+        // size_t max_size = settings.low_cardinality_max_dictionary_size + indexes_with_overflow.overflowed_keys->size();
+        // ColumnLowCardinality::Index(indexes_with_overflow.indexes->getPtr()).check(max_size);
 
         if (global_dictionary->size() > settings.low_cardinality_max_dictionary_size)
             throw Exception("Got dictionary with size " + toString(global_dictionary->size()) +
@@ -614,6 +640,7 @@ void SerializationLowCardinality::deserializeBinaryBulkWithMultipleStreams(
     {
         UInt64 num_keys;
         readIntBinary(num_keys, *indexes_stream);
+
         auto keys_type = removeNullable(dictionary_type);
         auto additional_keys = keys_type->createColumn();
         dict_inner_serialization->deserializeBinaryBulk(*additional_keys, *indexes_stream, num_keys, 0);
@@ -660,10 +687,10 @@ void SerializationLowCardinality::deserializeBinaryBulkWithMultipleStreams(
         {
             auto maps = mapIndexWithAdditionalKeys(*indexes_column, global_dictionary->size());
 
-            ColumnLowCardinality::Index(maps.additional_keys_map->getPtr()).check(additional_keys->size());
+            // ColumnLowCardinality::Index(maps.additional_keys_map->getPtr()).check(additional_keys->size());
 
-            ColumnLowCardinality::Index(indexes_column->getPtr()).check(
-                    maps.dictionary_map->size() + maps.additional_keys_map->size());
+            // ColumnLowCardinality::Index(indexes_column->getPtr()).check(
+            //         maps.dictionary_map->size() + maps.additional_keys_map->size());
 
             auto used_keys = IColumn::mutate(global_dictionary->getNestedColumn()->index(*maps.dictionary_map, 0));
 
@@ -702,7 +729,7 @@ void SerializationLowCardinality::deserializeBinaryBulkWithMultipleStreams(
             auto & index_type = low_cardinality_state->index_type;
             auto & global_dictionary = low_cardinality_state->global_dictionary;
 
-            index_type.deserialize(*indexes_stream);
+            index_type.deserialize(*indexes_stream, settings);
 
             bool need_update_dictionary =
                 !global_dictionary || index_type.need_update_dictionary || low_cardinality_state->need_update_dictionary;
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.h b/src/DataTypes/Serializations/SerializationLowCardinality.h
index e9ca0349e38..f82b35a52d5 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.h
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.h
@@ -17,7 +17,11 @@ private:
 public:
     SerializationLowCardinality(const DataTypePtr & dictionary_type);
 
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+    void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
             SerializeBinaryBulkSettings & settings,
diff --git a/src/DataTypes/Serializations/SerializationMap.cpp b/src/DataTypes/Serializations/SerializationMap.cpp
index a76784695a9..2e436070e1c 100644
--- a/src/DataTypes/Serializations/SerializationMap.cpp
+++ b/src/DataTypes/Serializations/SerializationMap.cpp
@@ -1,8 +1,9 @@
-#include <common/map.h>
+#include <base/map.h>
 
 #include <DataTypes/Serializations/SerializationMap.h>
 #include <DataTypes/Serializations/SerializationArray.h>
 #include <DataTypes/Serializations/SerializationTuple.h>
+#include <DataTypes/DataTypeMap.h>
 
 #include <Common/StringUtils/StringUtils.h>
 #include <Columns/ColumnMap.h>
@@ -250,10 +251,16 @@ void SerializationMap::deserializeTextCSV(IColumn & column, ReadBuffer & istr, c
     deserializeText(column, rb, settings);
 }
 
-
-void SerializationMap::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+void SerializationMap::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
 {
-    nested->enumerateStreams(callback, path);
+    auto next_type = type ? assert_cast<const DataTypeMap &>(*type).getNestedType() : nullptr;
+    auto next_column = column ? assert_cast<const ColumnMap &>(*column).getNestedColumnPtr() : nullptr;
+
+    nested->enumerateStreams(path, callback, next_type, next_column);
 }
 
 void SerializationMap::serializeBinaryBulkStatePrefix(
diff --git a/src/DataTypes/Serializations/SerializationMap.h b/src/DataTypes/Serializations/SerializationMap.h
index 6523d5388d0..b6a003139ec 100644
--- a/src/DataTypes/Serializations/SerializationMap.h
+++ b/src/DataTypes/Serializations/SerializationMap.h
@@ -31,7 +31,11 @@ public:
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+    void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
         SerializeBinaryBulkSettings & settings,
diff --git a/src/DataTypes/Serializations/SerializationTupleElement.cpp b/src/DataTypes/Serializations/SerializationNamed.cpp
similarity index 69%
rename from src/DataTypes/Serializations/SerializationTupleElement.cpp
rename to src/DataTypes/Serializations/SerializationNamed.cpp
index 4b50810fcd6..4ef4d4527f8 100644
--- a/src/DataTypes/Serializations/SerializationTupleElement.cpp
+++ b/src/DataTypes/Serializations/SerializationNamed.cpp
@@ -1,18 +1,21 @@
-#include <DataTypes/Serializations/SerializationTupleElement.h>
+#include <DataTypes/Serializations/SerializationNamed.h>
 
 namespace DB
 {
 
-void SerializationTupleElement::enumerateStreams(
+void SerializationNamed::enumerateStreams(
+    SubstreamPath & path,
     const StreamCallback & callback,
-    SubstreamPath & path) const
+    DataTypePtr type,
+    ColumnPtr column) const
 {
     addToPath(path);
-    nested_serialization->enumerateStreams(callback, path);
+    path.back().data = {type, column, getPtr(), std::make_shared<SubcolumnCreator>(name, escape_delimiter)};
+    nested_serialization->enumerateStreams(path, callback, type, column);
     path.pop_back();
 }
 
-void SerializationTupleElement::serializeBinaryBulkStatePrefix(
+void SerializationNamed::serializeBinaryBulkStatePrefix(
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & state) const
 {
@@ -21,7 +24,7 @@ void SerializationTupleElement::serializeBinaryBulkStatePrefix(
     settings.path.pop_back();
 }
 
-void SerializationTupleElement::serializeBinaryBulkStateSuffix(
+void SerializationNamed::serializeBinaryBulkStateSuffix(
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & state) const
 {
@@ -30,7 +33,7 @@ void SerializationTupleElement::serializeBinaryBulkStateSuffix(
     settings.path.pop_back();
 }
 
-void SerializationTupleElement::deserializeBinaryBulkStatePrefix(
+void SerializationNamed::deserializeBinaryBulkStatePrefix(
     DeserializeBinaryBulkSettings & settings,
     DeserializeBinaryBulkStatePtr & state) const
 {
@@ -39,7 +42,7 @@ void SerializationTupleElement::deserializeBinaryBulkStatePrefix(
     settings.path.pop_back();
 }
 
-void SerializationTupleElement::serializeBinaryBulkWithMultipleStreams(
+void SerializationNamed::serializeBinaryBulkWithMultipleStreams(
     const IColumn & column,
     size_t offset,
     size_t limit,
@@ -51,7 +54,7 @@ void SerializationTupleElement::serializeBinaryBulkWithMultipleStreams(
     settings.path.pop_back();
 }
 
-void SerializationTupleElement::deserializeBinaryBulkWithMultipleStreams(
+void SerializationNamed::deserializeBinaryBulkWithMultipleStreams(
     ColumnPtr & column,
     size_t limit,
     DeserializeBinaryBulkSettings & settings,
@@ -63,7 +66,7 @@ void SerializationTupleElement::deserializeBinaryBulkWithMultipleStreams(
     settings.path.pop_back();
 }
 
-void SerializationTupleElement::addToPath(SubstreamPath & path) const
+void SerializationNamed::addToPath(SubstreamPath & path) const
 {
     path.push_back(Substream::TupleElement);
     path.back().tuple_element_name = name;
diff --git a/src/DataTypes/Serializations/SerializationTupleElement.h b/src/DataTypes/Serializations/SerializationNamed.h
similarity index 59%
rename from src/DataTypes/Serializations/SerializationTupleElement.h
rename to src/DataTypes/Serializations/SerializationNamed.h
index b85014c9e64..20dd15a20ba 100644
--- a/src/DataTypes/Serializations/SerializationTupleElement.h
+++ b/src/DataTypes/Serializations/SerializationNamed.h
@@ -5,14 +5,14 @@
 namespace DB
 {
 
-class SerializationTupleElement final : public SerializationWrapper
+class SerializationNamed final : public SerializationWrapper
 {
 private:
     String name;
     bool escape_delimiter;
 
 public:
-    SerializationTupleElement(const SerializationPtr & nested_, const String & name_, bool escape_delimiter_ = true)
+    SerializationNamed(const SerializationPtr & nested_, const String & name_, bool escape_delimiter_ = true)
         : SerializationWrapper(nested_)
         , name(name_), escape_delimiter(escape_delimiter_)
     {
@@ -21,11 +21,13 @@ public:
     const String & getElementName() const { return name; }
 
     void enumerateStreams(
+        SubstreamPath & path,
         const StreamCallback & callback,
-        SubstreamPath & path) const override;
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
-         SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkSettings & settings,
         SerializeBinaryBulkStatePtr & state) const override;
 
     void serializeBinaryBulkStateSuffix(
@@ -51,6 +53,22 @@ public:
         SubstreamsCache * cache) const override;
 
 private:
+    struct SubcolumnCreator : public ISubcolumnCreator
+    {
+        const String name;
+        const bool escape_delimiter;
+
+        SubcolumnCreator(const String & name_, bool escape_delimiter_)
+            : name(name_), escape_delimiter(escape_delimiter_) {}
+
+        DataTypePtr create(const DataTypePtr & prev) const override { return prev; }
+        ColumnPtr create(const ColumnPtr & prev) const override { return prev; }
+        SerializationPtr create(const SerializationPtr & prev) const override
+        {
+            return std::make_shared<SerializationNamed>(prev, name, escape_delimiter);
+        }
+    };
+
     void addToPath(SubstreamPath & path) const;
 };
 
diff --git a/src/DataTypes/Serializations/SerializationNullable.cpp b/src/DataTypes/Serializations/SerializationNullable.cpp
index 4de2b08c043..560a4812123 100644
--- a/src/DataTypes/Serializations/SerializationNullable.cpp
+++ b/src/DataTypes/Serializations/SerializationNullable.cpp
@@ -1,5 +1,8 @@
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/Serializations/SerializationNumber.h>
+#include <DataTypes/Serializations/SerializationNamed.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
 
 #include <Columns/ColumnNullable.h>
 #include <Core/Field.h>
@@ -20,15 +23,50 @@ namespace ErrorCodes
     extern const int CANNOT_READ_ALL_DATA;
 }
 
-void SerializationNullable::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+DataTypePtr SerializationNullable::SubcolumnCreator::create(const DataTypePtr & prev) const
 {
-    path.push_back(Substream::NullMap);
-    callback(path);
-    path.back() = Substream::NullableElements;
-    nested->enumerateStreams(callback, path);
-    path.pop_back();
+    return std::make_shared<DataTypeNullable>(prev);
 }
 
+SerializationPtr SerializationNullable::SubcolumnCreator::create(const SerializationPtr & prev) const
+{
+    return std::make_shared<SerializationNullable>(prev);
+}
+
+ColumnPtr SerializationNullable::SubcolumnCreator::create(const ColumnPtr & prev) const
+{
+    return ColumnNullable::create(prev, null_map);
+}
+
+void SerializationNullable::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
+{
+    const auto * type_nullable = type ? &assert_cast<const DataTypeNullable &>(*type) : nullptr;
+    const auto * column_nullable = column ? &assert_cast<const ColumnNullable &>(*column) : nullptr;
+
+    path.push_back(Substream::NullMap);
+    path.back().data =
+    {
+        type_nullable ? std::make_shared<DataTypeUInt8>() : nullptr,
+        column_nullable ? column_nullable->getNullMapColumnPtr() : nullptr,
+        std::make_shared<SerializationNamed>(std::make_shared<SerializationNumber<UInt8>>(), "null", false),
+        nullptr,
+    };
+
+    callback(path);
+
+    path.back() = Substream::NullableElements;
+    path.back().data = {type, column, getPtr(), std::make_shared<SubcolumnCreator>(path.back().data.column)};
+
+    auto next_type = type_nullable ? type_nullable->getNestedType() : nullptr;
+    auto next_column = column_nullable ? column_nullable->getNestedColumnPtr() : nullptr;
+
+    nested->enumerateStreams(path, callback, next_type, next_column);
+    path.pop_back();
+}
 
 void SerializationNullable::serializeBinaryBulkStatePrefix(
         SerializeBinaryBulkSettings & settings,
@@ -327,7 +365,7 @@ void SerializationNullable::serializeTextCSV(const IColumn & column, size_t row_
     const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
 
     if (col.isNullAt(row_num))
-        writeCString("\\N", ostr);
+        writeString(settings.csv.null_representation, ostr);
     else
         nested->serializeTextCSV(col.getNestedColumn(), row_num, ostr, settings);
 }
diff --git a/src/DataTypes/Serializations/SerializationNullable.h b/src/DataTypes/Serializations/SerializationNullable.h
index b0b96c021d3..c39c4dd6573 100644
--- a/src/DataTypes/Serializations/SerializationNullable.h
+++ b/src/DataTypes/Serializations/SerializationNullable.h
@@ -13,7 +13,11 @@ private:
 public:
     SerializationNullable(const SerializationPtr & nested_) : nested(nested_) {}
 
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+    void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
             SerializeBinaryBulkSettings & settings,
@@ -80,6 +84,18 @@ public:
     static ReturnType deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
     template <typename ReturnType = bool>
     static ReturnType deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
+
+private:
+    struct SubcolumnCreator : public ISubcolumnCreator
+    {
+        const ColumnPtr null_map;
+
+        SubcolumnCreator(const ColumnPtr & null_map_) : null_map(null_map_) {}
+
+        DataTypePtr create(const DataTypePtr & prev) const override;
+        SerializationPtr create(const SerializationPtr & prev) const override;
+        ColumnPtr create(const ColumnPtr & prev) const override;
+    };
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
index 347db5d0aa5..7e8e99f76d0 100644
--- a/src/DataTypes/Serializations/SerializationNumber.cpp
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -25,7 +25,7 @@ void SerializationNumber<T>::deserializeText(IColumn & column, ReadBuffer & istr
 {
     T x;
 
-    if constexpr (is_integer_v<T> && is_arithmetic_v<T>)
+    if constexpr (is_integer<T> && is_arithmetic_v<T>)
         readIntTextUnsafe(x, istr);
     else
         readText(x, istr);
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index 6ce3761ff98..33a90a4abf6 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -1,6 +1,7 @@
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 #include <DataTypes/Serializations/SerializationTuple.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <Core/Field.h>
 #include <Columns/ColumnTuple.h>
 #include <Common/assert_cast.h>
@@ -281,10 +282,22 @@ void SerializationTuple::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
     });
 }
 
-void SerializationTuple::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+void SerializationTuple::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
 {
-    for (const auto & elem : elems)
-        elem->enumerateStreams(callback, path);
+    const auto * type_tuple = type ? &assert_cast<const DataTypeTuple &>(*type) : nullptr;
+    const auto * column_tuple = column ? &assert_cast<const ColumnTuple &>(*column) : nullptr;
+
+    for (size_t i = 0; i < elems.size(); ++i)
+    {
+        auto next_type = type_tuple ? type_tuple->getElement(i) : nullptr;
+        auto next_column = column_tuple ? column_tuple->getColumnPtr(i) : nullptr;
+
+        elems[i]->enumerateStreams(path, callback, next_type, next_column);
+    }
 }
 
 struct SerializeBinaryBulkStateTuple : public ISerialization::SerializeBinaryBulkState
diff --git a/src/DataTypes/Serializations/SerializationTuple.h b/src/DataTypes/Serializations/SerializationTuple.h
index 13668572fff..77f8de90c83 100644
--- a/src/DataTypes/Serializations/SerializationTuple.h
+++ b/src/DataTypes/Serializations/SerializationTuple.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataTypes/Serializations/SimpleTextSerialization.h>
-#include <DataTypes/Serializations/SerializationTupleElement.h>
+#include <DataTypes/Serializations/SerializationNamed.h>
 
 namespace DB
 {
@@ -9,7 +9,7 @@ namespace DB
 class SerializationTuple final : public SimpleTextSerialization
 {
 public:
-    using ElementSerializationPtr = std::shared_ptr<const SerializationTupleElement>;
+    using ElementSerializationPtr = std::shared_ptr<const SerializationNamed>;
     using ElementSerializations = std::vector<ElementSerializationPtr>;
 
     SerializationTuple(const ElementSerializations & elems_, bool have_explicit_names_)
@@ -31,7 +31,11 @@ public:
 
     /** Each sub-column in a tuple is serialized in separate stream.
       */
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+    void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
             SerializeBinaryBulkSettings & settings,
diff --git a/src/DataTypes/Serializations/SerializationWrapper.cpp b/src/DataTypes/Serializations/SerializationWrapper.cpp
index f75c9a1dd8b..c0829ab1b26 100644
--- a/src/DataTypes/Serializations/SerializationWrapper.cpp
+++ b/src/DataTypes/Serializations/SerializationWrapper.cpp
@@ -4,9 +4,13 @@
 namespace DB
 {
 
-void SerializationWrapper::enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const
+void SerializationWrapper::enumerateStreams(
+    SubstreamPath & path,
+    const StreamCallback & callback,
+    DataTypePtr type,
+    ColumnPtr column) const
 {
-    nested_serialization->enumerateStreams(callback, path);
+    nested_serialization->enumerateStreams(path, callback, type, column);
 }
 
 void SerializationWrapper::serializeBinaryBulkStatePrefix(
diff --git a/src/DataTypes/Serializations/SerializationWrapper.h b/src/DataTypes/Serializations/SerializationWrapper.h
index 399d3b198b3..c48278d53db 100644
--- a/src/DataTypes/Serializations/SerializationWrapper.h
+++ b/src/DataTypes/Serializations/SerializationWrapper.h
@@ -16,7 +16,11 @@ protected:
 public:
     SerializationWrapper(const SerializationPtr & nested_serialization_) : nested_serialization(nested_serialization_) {}
 
-    void enumerateStreams(const StreamCallback & callback, SubstreamPath & path) const override;
+    void enumerateStreams(
+        SubstreamPath & path,
+        const StreamCallback & callback,
+        DataTypePtr type,
+        ColumnPtr column) const override;
 
     void serializeBinaryBulkStatePrefix(
         SerializeBinaryBulkSettings & settings,
diff --git a/src/DataTypes/TimezoneMixin.h b/src/DataTypes/TimezoneMixin.h
new file mode 100644
index 00000000000..e6e9f7a7989
--- /dev/null
+++ b/src/DataTypes/TimezoneMixin.h
@@ -0,0 +1,32 @@
+#pragma once
+#include <Core/Types.h>
+#include <base/DateLUT.h>
+
+class DateLUTImpl;
+
+/** Mixin-class that manages timezone info for timezone-aware DateTime implementations
+ *
+ * Must be used as a (second) base for class implementing IDateType/ISerialization-interface.
+ */
+class TimezoneMixin
+{
+public:
+    TimezoneMixin(const TimezoneMixin &) = default;
+
+    explicit TimezoneMixin(const String & time_zone_name = "")
+        : has_explicit_time_zone(!time_zone_name.empty())
+        , time_zone(DateLUT::instance(time_zone_name))
+        , utc_time_zone(DateLUT::instance("UTC"))
+    {
+    }
+
+    const DateLUTImpl & getTimeZone() const { return time_zone; }
+    bool hasExplicitTimeZone() const { return has_explicit_time_zone; }
+
+protected:
+    /// true if time zone name was provided in data type parameters, false if it's using default time zone.
+    bool has_explicit_time_zone;
+
+    const DateLUTImpl & time_zone;
+    const DateLUTImpl & utc_time_zone;
+};
diff --git a/src/DataTypes/convertMySQLDataType.cpp b/src/DataTypes/convertMySQLDataType.cpp
index bcccb58966a..5ad8c43d0cf 100644
--- a/src/DataTypes/convertMySQLDataType.cpp
+++ b/src/DataTypes/convertMySQLDataType.cpp
@@ -1,7 +1,7 @@
 #include "convertMySQLDataType.h"
 
 #include <Core/Field.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MultiEnum.h>
 #include <Core/SettingsEnums.h>
 #include <Parsers/ASTFunction.h>
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index a950d18b50a..f8d10535be2 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -277,17 +277,18 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
     /// For Date and DateTime/DateTime64, the common type is DateTime/DateTime64. No other types are compatible.
     {
         UInt32 have_date = type_ids.count(TypeIndex::Date);
+        UInt32 have_date32 = type_ids.count(TypeIndex::Date32);
         UInt32 have_datetime = type_ids.count(TypeIndex::DateTime);
         UInt32 have_datetime64 = type_ids.count(TypeIndex::DateTime64);
 
-        if (have_date || have_datetime || have_datetime64)
+        if (have_date || have_date32 || have_datetime || have_datetime64)
         {
-            bool all_date_or_datetime = type_ids.size() == (have_date + have_datetime + have_datetime64);
+            bool all_date_or_datetime = type_ids.size() == (have_date + have_date32 + have_datetime + have_datetime64);
             if (!all_date_or_datetime)
-                throw Exception(getExceptionMessagePrefix(types) + " because some of them are Date/DateTime/DateTime64 and some of them are not",
+                throw Exception(getExceptionMessagePrefix(types) + " because some of them are Date/Date32/DateTime/DateTime64 and some of them are not",
                     ErrorCodes::NO_COMMON_TYPE);
 
-            if (have_datetime64 == 0)
+            if (have_datetime64 == 0 && have_date32 == 0)
             {
                 for (const auto & type : types)
                 {
@@ -298,6 +299,22 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
                 return std::make_shared<DataTypeDateTime>();
             }
 
+            /// For Date and Date32, the common type is Date32
+            if (have_datetime == 0 && have_datetime64 == 0)
+            {
+                for (const auto & type : types)
+                {
+                    if (isDate32(type))
+                        return type;
+                }
+            }
+
+            /// For Datetime and Date32, the common type is Datetime64
+            if (have_datetime == 1 && have_date32 == 1 && have_datetime64 == 0)
+            {
+                return std::make_shared<DataTypeDateTime64>(0);
+            }
+
             UInt8 max_scale = 0;
             size_t max_scale_date_time_index = 0;
 
diff --git a/src/DataTypes/registerDataTypeDateTime.cpp b/src/DataTypes/registerDataTypeDateTime.cpp
index 815948c6531..6d5f6c42799 100644
--- a/src/DataTypes/registerDataTypeDateTime.cpp
+++ b/src/DataTypes/registerDataTypeDateTime.cpp
@@ -26,10 +26,8 @@ String getExceptionMessage(
     const String & message, size_t argument_index, const char * argument_name,
     const std::string & context_data_type_name, Field::Types::Which field_type)
 {
-    return std::string("Parameter #") + std::to_string(argument_index) + " '"
-           + argument_name + "' for " + context_data_type_name
-           + message
-           + ", expected: " + Field::Types::toString(field_type) + " literal.";
+    return fmt::format("Parameter #{} '{}' for {}{}, expected {} literal",
+        argument_index, argument_name, context_data_type_name, message, field_type);
 }
 
 template <typename T, ArgumentKind Kind>
@@ -49,7 +47,7 @@ getArgument(const ASTPtr & arguments, size_t argument_index, const char * argume
         else
         {
             if (argument && argument->value.getType() != field_type)
-                throw Exception(getExceptionMessage(String(" has wrong type: ") + argument->value.getTypeName(),
+                throw Exception(getExceptionMessage(fmt::format(" has wrong type: {}", argument->value.getTypeName()),
                     argument_index, argument_name, context_data_type_name, field_type), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             else
                 throw Exception(getExceptionMessage(" is missing", argument_index, argument_name, context_data_type_name, field_type),
diff --git a/src/DataTypes/tests/gtest_NestedUtils.cpp b/src/DataTypes/tests/gtest_NestedUtils.cpp
new file mode 100644
index 00000000000..c01758b8f0f
--- /dev/null
+++ b/src/DataTypes/tests/gtest_NestedUtils.cpp
@@ -0,0 +1,43 @@
+#include <DataTypes/NestedUtils.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNested.h>
+#include <gtest/gtest.h>
+
+using namespace DB;
+
+GTEST_TEST(NestedUtils, collect)
+{
+    DataTypePtr uint_type = std::make_shared<DataTypeUInt32>();
+    DataTypePtr array_type = std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt32>());
+
+    const NamesAndTypesList source_columns =
+    {
+        {"id", uint_type},
+        {"arr1", array_type},
+        {"b.id", uint_type},
+        {"b.arr1", array_type},
+        {"b.arr2", array_type}
+    };
+
+    auto nested_type = createNested({uint_type, uint_type}, {"arr1", "arr2"});
+    const NamesAndTypesList columns_with_subcolumns =
+    {
+        {"id", uint_type},
+        {"arr1", array_type},
+        {"b.id", uint_type},
+        {"b", "arr1", nested_type, array_type},
+        {"b", "arr2", nested_type, array_type}
+    };
+
+    const NamesAndTypesList columns_with_nested =
+    {
+        {"id", uint_type},
+        {"arr1", array_type},
+        {"b.id", uint_type},
+        {"b", nested_type},
+    };
+
+    ASSERT_EQ(Nested::convertToSubcolumns(source_columns).toString(), columns_with_subcolumns.toString());
+    ASSERT_EQ(Nested::collect(source_columns).toString(), columns_with_nested.toString());
+}
diff --git a/src/DataTypes/ya.make b/src/DataTypes/ya.make
deleted file mode 100644
index ab34e467795..00000000000
--- a/src/DataTypes/ya.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Formats
-)
-
-
-SRCS(
-    DataTypeAggregateFunction.cpp
-    DataTypeArray.cpp
-    DataTypeCustomGeo.cpp
-    DataTypeCustomIPv4AndIPv6.cpp
-    DataTypeCustomSimpleAggregateFunction.cpp
-    DataTypeDate.cpp
-    DataTypeDate32.cpp
-    DataTypeDateTime.cpp
-    DataTypeDateTime64.cpp
-    DataTypeDecimalBase.cpp
-    DataTypeEnum.cpp
-    DataTypeFactory.cpp
-    DataTypeFixedString.cpp
-    DataTypeFunction.cpp
-    DataTypeInterval.cpp
-    DataTypeLowCardinality.cpp
-    DataTypeLowCardinalityHelpers.cpp
-    DataTypeMap.cpp
-    DataTypeNested.cpp
-    DataTypeNothing.cpp
-    DataTypeNullable.cpp
-    DataTypeNumberBase.cpp
-    DataTypeString.cpp
-    DataTypeTuple.cpp
-    DataTypeUUID.cpp
-    DataTypesDecimal.cpp
-    DataTypesNumber.cpp
-    EnumValues.cpp
-    FieldToDataType.cpp
-    IDataType.cpp
-    NestedUtils.cpp
-    Serializations/ISerialization.cpp
-    Serializations/SerializationAggregateFunction.cpp
-    Serializations/SerializationArray.cpp
-    Serializations/SerializationCustomSimpleText.cpp
-    Serializations/SerializationDate.cpp
-    Serializations/SerializationDate32.cpp
-    Serializations/SerializationDateTime.cpp
-    Serializations/SerializationDateTime64.cpp
-    Serializations/SerializationDecimal.cpp
-    Serializations/SerializationDecimalBase.cpp
-    Serializations/SerializationEnum.cpp
-    Serializations/SerializationFixedString.cpp
-    Serializations/SerializationIP.cpp
-    Serializations/SerializationLowCardinality.cpp
-    Serializations/SerializationMap.cpp
-    Serializations/SerializationNothing.cpp
-    Serializations/SerializationNullable.cpp
-    Serializations/SerializationNumber.cpp
-    Serializations/SerializationString.cpp
-    Serializations/SerializationTuple.cpp
-    Serializations/SerializationTupleElement.cpp
-    Serializations/SerializationUUID.cpp
-    Serializations/SerializationWrapper.cpp
-    convertMySQLDataType.cpp
-    getLeastSupertype.cpp
-    getMostSubtype.cpp
-    registerDataTypeDateTime.cpp
-
-)
-
-END()
diff --git a/src/DataTypes/ya.make.in b/src/DataTypes/ya.make.in
deleted file mode 100644
index 1d46c197d64..00000000000
--- a/src/DataTypes/ya.make.in
+++ /dev/null
@@ -1,15 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Formats
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
new file mode 100644
index 00000000000..98f697ef641
--- /dev/null
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -0,0 +1,124 @@
+#include <Databases/DDLDependencyVisitor.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Dictionaries/getDictionaryConfigurationFromAST.h>
+#include <Poco/String.h>
+
+namespace DB
+{
+
+void DDLDependencyVisitor::visit(const ASTPtr & ast, Data & data)
+{
+    /// Looking for functions in column default expressions and dictionary source definition
+    if (const auto * function = ast->as<ASTFunction>())
+        visit(*function, data);
+    else if (const auto * dict_source = ast->as<ASTFunctionWithKeyValueArguments>())
+        visit(*dict_source, data);
+    else if (const auto * storage = ast->as<ASTStorage>())
+        visit(*storage, data);
+}
+
+bool DDLDependencyVisitor::needChildVisit(const ASTPtr & node, const ASTPtr & child)
+{
+    if (node->as<ASTStorage>())
+        return false;
+
+    if (auto * create = node->as<ASTCreateQuery>())
+    {
+        if (child.get() == create->select)
+            return false;
+    }
+
+    return true;
+}
+
+void DDLDependencyVisitor::visit(const ASTFunction & function, Data & data)
+{
+    if (function.name == "joinGet" ||
+        function.name == "dictHas" ||
+        function.name == "dictIsIn" ||
+        function.name.starts_with("dictGet"))
+    {
+        extractTableNameFromArgument(function, data, 0);
+    }
+    else if (Poco::toLower(function.name) == "in")
+    {
+        extractTableNameFromArgument(function, data, 1);
+    }
+
+}
+
+void DDLDependencyVisitor::visit(const ASTFunctionWithKeyValueArguments & dict_source, Data & data)
+{
+    if (dict_source.name != "clickhouse")
+        return;
+    if (!dict_source.elements)
+        return;
+
+    auto config = getDictionaryConfigurationFromAST(data.create_query->as<ASTCreateQuery &>(), data.global_context);
+    auto info = getInfoIfClickHouseDictionarySource(config, data.global_context);
+
+    if (!info || !info->is_local)
+        return;
+
+    if (info->table_name.database.empty())
+        info->table_name.database = data.default_database;
+    data.dependencies.emplace(std::move(info->table_name));
+}
+
+void DDLDependencyVisitor::visit(const ASTStorage & storage, Data & data)
+{
+    if (!storage.engine)
+        return;
+    if (storage.engine->name != "Dictionary")
+        return;
+
+    extractTableNameFromArgument(*storage.engine, data, 0);
+}
+
+
+void DDLDependencyVisitor::extractTableNameFromArgument(const ASTFunction & function, Data & data, size_t arg_idx)
+{
+    /// Just ignore incorrect arguments, proper exception will be thrown later
+    if (!function.arguments || function.arguments->children.size() <= arg_idx)
+        return;
+
+    QualifiedTableName qualified_name;
+
+    const auto * arg = function.arguments->as<ASTExpressionList>()->children[arg_idx].get();
+    if (const auto * literal = arg->as<ASTLiteral>())
+    {
+        if (literal->value.getType() != Field::Types::String)
+            return;
+
+        auto maybe_qualified_name = QualifiedTableName::tryParseFromString(literal->value.get<String>());
+        /// Just return if name if invalid
+        if (!maybe_qualified_name)
+            return;
+
+        qualified_name = std::move(*maybe_qualified_name);
+    }
+    else if (const auto * identifier = arg->as<ASTIdentifier>())
+    {
+        auto table_identifier = identifier->createTable();
+        /// Just return if table identified is invalid
+        if (!table_identifier)
+            return;
+
+        qualified_name.database = table_identifier->getDatabaseName();
+        qualified_name.table = table_identifier->shortName();
+    }
+    else
+    {
+        assert(false);
+        return;
+    }
+
+    if (qualified_name.database.empty())
+        qualified_name.database = data.default_database;
+    data.dependencies.emplace(std::move(qualified_name));
+}
+
+}
diff --git a/src/Databases/DDLDependencyVisitor.h b/src/Databases/DDLDependencyVisitor.h
new file mode 100644
index 00000000000..5779aee7d33
--- /dev/null
+++ b/src/Databases/DDLDependencyVisitor.h
@@ -0,0 +1,44 @@
+#pragma once
+#include <Core/QualifiedTableName.h>
+#include <Parsers/IAST_fwd.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTFunction;
+class ASTFunctionWithKeyValueArguments;
+class ASTStorage;
+
+/// Visits ASTCreateQuery and extracts names of table (or dictionary) dependencies
+/// from column default expressions (joinGet, dictGet, etc)
+/// or dictionary source (for dictionaries from local ClickHouse table).
+/// Does not validate AST, works a best-effort way.
+class DDLDependencyVisitor
+{
+public:
+    struct Data
+    {
+        using TableNamesSet = std::set<QualifiedTableName>;
+        String default_database;
+        TableNamesSet dependencies;
+        ContextPtr global_context;
+        ASTPtr create_query;
+    };
+
+    using Visitor = ConstInDepthNodeVisitor<DDLDependencyVisitor, true>;
+
+    static void visit(const ASTPtr & ast, Data & data);
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child);
+
+private:
+    static void visit(const ASTFunction & function, Data & data);
+    static void visit(const ASTFunctionWithKeyValueArguments & dict_source, Data & data);
+    static void visit(const ASTStorage & storage, Data & data);
+
+    static void extractTableNameFromArgument(const ASTFunction & function, Data & data, size_t arg_idx);
+};
+
+using TableLoadingDependenciesVisitor = DDLDependencyVisitor::Visitor;
+
+}
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index b69b74451c7..ae90f1a6900 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -140,6 +140,9 @@ void DatabaseAtomic::dropTable(ContextPtr local_context, const String & table_na
     if (table->storesDataOnDisk())
         tryRemoveSymlink(table_name);
 
+    if (table->dropTableImmediately())
+        table->drop();
+
     /// Notify DatabaseCatalog that table was dropped. It will remove table data in background.
     /// Cleanup is performed outside of database to allow easily DROP DATABASE without waiting for cleanup to complete.
     DatabaseCatalog::instance().enqueueDroppedTableCleanup(table->getStorageID(), table, table_metadata_path_drop, no_delay);
@@ -403,7 +406,7 @@ void DatabaseAtomic::assertCanBeDetached(bool cleanup)
 }
 
 DatabaseTablesIteratorPtr
-DatabaseAtomic::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction & filter_by_table_name)
+DatabaseAtomic::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction & filter_by_table_name) const
 {
     auto base_iter = DatabaseWithOwnTablesBase::getTablesIterator(local_context, filter_by_table_name);
     return std::make_unique<AtomicDatabaseTablesSnapshotIterator>(std::move(typeid_cast<DatabaseTablesSnapshotIterator &>(*base_iter)));
@@ -416,39 +419,49 @@ UUID DatabaseAtomic::tryGetTableUUID(const String & table_name) const
     return UUIDHelpers::Nil;
 }
 
-void DatabaseAtomic::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseAtomic::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool force_restore, bool /*force_attach*/)
 {
+    if (!force_restore)
+        return;
+
     /// Recreate symlinks to table data dirs in case of force restore, because some of them may be broken
-    if (has_force_restore_data_flag)
+    for (const auto & table_path : fs::directory_iterator(path_to_table_symlinks))
     {
-        for (const auto & table_path : fs::directory_iterator(path_to_table_symlinks))
+        if (!fs::is_symlink(table_path))
         {
-            if (!fs::is_symlink(table_path))
-            {
-                throw Exception(ErrorCodes::ABORTED,
-                    "'{}' is not a symlink. Atomic database should contains only symlinks.", std::string(table_path.path()));
-            }
-
-            fs::remove(table_path);
-        }
-    }
-
-    DatabaseOrdinary::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
-
-    if (has_force_restore_data_flag)
-    {
-        NameToPathMap table_names;
-        {
-            std::lock_guard lock{mutex};
-            table_names = table_name_to_path;
+            throw Exception(ErrorCodes::ABORTED,
+                "'{}' is not a symlink. Atomic database should contains only symlinks.", std::string(table_path.path()));
         }
 
-        fs::create_directories(path_to_table_symlinks);
-        for (const auto & table : table_names)
-            tryCreateSymlink(table.first, table.second, true);
+        fs::remove(table_path);
     }
 }
 
+void DatabaseAtomic::loadStoredObjects(
+    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+{
+    beforeLoadingMetadata(local_context, force_restore, force_attach);
+    DatabaseOrdinary::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+}
+
+void DatabaseAtomic::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+{
+    DatabaseOrdinary::startupTables(thread_pool, force_restore, force_attach);
+
+    if (!force_restore)
+        return;
+
+    NameToPathMap table_names;
+    {
+        std::lock_guard lock{mutex};
+        table_names = table_name_to_path;
+    }
+
+    fs::create_directories(path_to_table_symlinks);
+    for (const auto & table : table_names)
+        tryCreateSymlink(table.first, table.second, true);
+}
+
 void DatabaseAtomic::tryCreateSymlink(const String & table_name, const String & actual_data_path, bool if_data_path_exist)
 {
     try
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index c5dedf00d23..1fe13f8b27f 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -45,9 +45,13 @@ public:
 
     void drop(ContextPtr /*context*/) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+
+    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index 40034015f27..db7da95fb27 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -3,7 +3,7 @@
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <Storages/StorageDictionary.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -52,7 +52,7 @@ DatabaseDictionary::DatabaseDictionary(const String & name_, ContextPtr context_
 {
 }
 
-Tables DatabaseDictionary::listTables(const FilterByNameFunction & filter_by_name)
+Tables DatabaseDictionary::listTables(const FilterByNameFunction & filter_by_name) const
 {
     Tables tables;
     auto load_results = getContext()->getExternalDictionariesLoader().getLoadResults(filter_by_name);
@@ -77,7 +77,7 @@ StoragePtr DatabaseDictionary::tryGetTable(const String & table_name, ContextPtr
     return createStorageDictionary(getDatabaseName(), load_result, getContext());
 }
 
-DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name) const
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(listTables(filter_by_table_name), getDatabaseName());
 }
@@ -126,6 +126,8 @@ ASTPtr DatabaseDictionary::getCreateDatabaseQuery() const
     {
         WriteBufferFromString buffer(query);
         buffer << "CREATE DATABASE " << backQuoteIfNeed(getDatabaseName()) << " ENGINE = Dictionary";
+        if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
+            buffer << " COMMENT " << backQuote(comment_value);
     }
     auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
diff --git a/src/Databases/DatabaseDictionary.h b/src/Databases/DatabaseDictionary.h
index 06402a96381..425d048aa65 100644
--- a/src/Databases/DatabaseDictionary.h
+++ b/src/Databases/DatabaseDictionary.h
@@ -34,7 +34,7 @@ public:
 
     StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
     bool empty() const override;
 
@@ -50,7 +50,7 @@ protected:
 private:
     Poco::Logger * log;
 
-    Tables listTables(const FilterByNameFunction & filter_by_name);
+    Tables listTables(const FilterByNameFunction & filter_by_name) const;
 };
 
 }
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index 22f98d32d69..03d91324672 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -13,11 +13,10 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/formatAST.h>
 #include <Common/Macros.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <filesystem>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #    include <Core/MySQL/MySQLClient.h>
@@ -35,9 +34,10 @@
 #endif
 
 #if USE_LIBPQXX
-#include <Databases/PostgreSQL/DatabasePostgreSQL.h> // Y_IGNORE
+#include <Databases/PostgreSQL/DatabasePostgreSQL.h>
 #include <Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h>
 #include <Storages/PostgreSQL/MaterializedPostgreSQLSettings.h>
+#include <Storages/StoragePostgreSQL.h>
 #endif
 
 #if USE_SQLITE
@@ -69,6 +69,7 @@ DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & m
         /// Before 20.7 it's possible that .sql metadata file does not exist for some old database.
         /// In this case Ordinary database is created on server startup if the corresponding metadata directory exists.
         /// So we should remove metadata directory if database creation failed.
+        /// TODO remove this code
         created = fs::create_directory(metadata_path);
 
         DatabasePtr impl = getImpl(create, metadata_path, context);
@@ -76,8 +77,11 @@ DatabasePtr DatabaseFactory::get(const ASTCreateQuery & create, const String & m
         if (impl && context->hasQueryContext() && context->getSettingsRef().log_queries)
             context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Database, impl->getEngineName());
 
-        return impl;
+        // Attach database metadata
+        if (impl && create.comment)
+            impl->setDatabaseComment(create.comment->as<ASTLiteral>()->value.safeGet<String>());
 
+        return impl;
     }
     catch (...)
     {
@@ -103,19 +107,29 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     const String & engine_name = engine_define->engine->name;
     const UUID & uuid = create.uuid;
 
-    bool engine_may_have_arguments = engine_name == "MySQL" || engine_name == "MaterializeMySQL" || engine_name == "MaterializedMySQL" ||
-                                     engine_name == "Lazy" || engine_name == "Replicated" || engine_name == "PostgreSQL" ||
-                                     engine_name == "MaterializedPostgreSQL" || engine_name == "SQLite";
+    static const std::unordered_set<std::string_view> database_engines{"Ordinary", "Atomic", "Memory",
+        "Dictionary", "Lazy", "Replicated", "MySQL", "MaterializeMySQL", "MaterializedMySQL",
+        "PostgreSQL", "MaterializedPostgreSQL", "SQLite"};
+
+    if (!database_engines.contains(engine_name))
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database engine name `{}` does not exist", engine_name);
+
+    static const std::unordered_set<std::string_view> engines_with_arguments{"MySQL", "MaterializeMySQL", "MaterializedMySQL",
+        "Lazy", "Replicated", "PostgreSQL", "MaterializedPostgreSQL", "SQLite"};
+
+    bool engine_may_have_arguments = engines_with_arguments.contains(engine_name);
+
     if (engine_define->engine->arguments && !engine_may_have_arguments)
-        throw Exception("Database engine " + engine_name + " cannot have arguments", ErrorCodes::BAD_ARGUMENTS);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database engine `{}` cannot have arguments", engine_name);
 
     bool has_unexpected_element = engine_define->engine->parameters || engine_define->partition_by ||
                                   engine_define->primary_key || engine_define->order_by ||
                                   engine_define->sample_by;
     bool may_have_settings = endsWith(engine_name, "MySQL") || engine_name == "Replicated" || engine_name == "MaterializedPostgreSQL";
+
     if (has_unexpected_element || (!may_have_settings && engine_define->settings))
-        throw Exception("Database engine " + engine_name + " cannot have parameters, primary_key, order_by, sample_by, settings",
-                        ErrorCodes::UNKNOWN_ELEMENT_IN_AST);
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_AST,
+                        "Database engine `{}` cannot have parameters, primary_key, order_by, sample_by, settings", engine_name);
 
     if (engine_name == "Ordinary")
         return std::make_shared<DatabaseOrdinary>(database_name, metadata_path, context);
@@ -131,40 +145,66 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     else if (engine_name == "MySQL" || engine_name == "MaterializeMySQL" || engine_name == "MaterializedMySQL")
     {
         const ASTFunction * engine = engine_define->engine;
-        if (!engine->arguments || engine->arguments->children.size() != 4)
-            throw Exception(
-                engine_name + " Database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.",
-                ErrorCodes::BAD_ARGUMENTS);
+        if (!engine->arguments)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
+        StorageMySQLConfiguration configuration;
         ASTs & arguments = engine->arguments->children;
-        arguments[1] = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[1], context);
 
-        const auto & host_port = safeGetLiteralValue<String>(arguments[0], engine_name);
-        const auto & mysql_database_name = safeGetLiteralValue<String>(arguments[1], engine_name);
-        const auto & mysql_user_name = safeGetLiteralValue<String>(arguments[2], engine_name);
-        const auto & mysql_user_password = safeGetLiteralValue<String>(arguments[3], engine_name);
+        if (auto named_collection = getExternalDataSourceConfiguration(arguments, context, true))
+        {
+            auto [common_configuration, storage_specific_args] = named_collection.value();
+
+            configuration.set(common_configuration);
+            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+
+            if (!storage_specific_args.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "MySQL database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.");
+        }
+        else
+        {
+            if (arguments.size() != 4)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "MySQL database require mysql_hostname, mysql_database_name, mysql_username, mysql_password arguments.");
+
+
+            arguments[1] = evaluateConstantExpressionOrIdentifierAsLiteral(arguments[1], context);
+            const auto & host_port = safeGetLiteralValue<String>(arguments[0], engine_name);
+
+            if (engine_name == "MySQL")
+            {
+                size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+                configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+            }
+            else
+            {
+                const auto & [remote_host, remote_port] = parseAddress(host_port, 3306);
+                configuration.host = remote_host;
+                configuration.port = remote_port;
+            }
+
+            configuration.database = safeGetLiteralValue<String>(arguments[1], engine_name);
+            configuration.username = safeGetLiteralValue<String>(arguments[2], engine_name);
+            configuration.password = safeGetLiteralValue<String>(arguments[3], engine_name);
+        }
 
         try
         {
             if (engine_name == "MySQL")
             {
                 auto mysql_database_settings = std::make_unique<ConnectionMySQLSettings>();
-                /// Split into replicas if needed.
-                size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-                auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
-                auto mysql_pool = mysqlxx::PoolWithFailover(mysql_database_name, addresses, mysql_user_name, mysql_user_password);
+                auto mysql_pool = mysqlxx::PoolWithFailover(configuration.database, configuration.addresses, configuration.username, configuration.password);
 
                 mysql_database_settings->loadFromQueryContext(context);
                 mysql_database_settings->loadFromQuery(*engine_define); /// higher priority
 
                 return std::make_shared<DatabaseMySQL>(
-                    context, database_name, metadata_path, engine_define, mysql_database_name, std::move(mysql_database_settings), std::move(mysql_pool));
+                    context, database_name, metadata_path, engine_define, configuration.database, std::move(mysql_database_settings), std::move(mysql_pool));
             }
 
-            const auto & [remote_host_name, remote_port] = parseAddress(host_port, 3306);
-            MySQLClient client(remote_host_name, remote_port, mysql_user_name, mysql_user_password);
-            auto mysql_pool = mysqlxx::Pool(mysql_database_name, remote_host_name, mysql_user_name, mysql_user_password, remote_port);
-
+            MySQLClient client(configuration.host, configuration.port, configuration.username, configuration.password);
+            auto mysql_pool = mysqlxx::Pool(configuration.database, configuration.host, configuration.username, configuration.password, configuration.port);
 
             auto materialize_mode_settings = std::make_unique<MaterializedMySQLSettings>();
 
@@ -173,12 +213,12 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
 
             if (create.uuid == UUIDHelpers::Nil)
                 return std::make_shared<DatabaseMaterializedMySQL<DatabaseOrdinary>>(
-                    context, database_name, metadata_path, uuid, mysql_database_name, std::move(mysql_pool), std::move(client)
-                    , std::move(materialize_mode_settings));
+                    context, database_name, metadata_path, uuid, configuration.database, std::move(mysql_pool),
+                    std::move(client), std::move(materialize_mode_settings));
             else
                 return std::make_shared<DatabaseMaterializedMySQL<DatabaseAtomic>>(
-                    context, database_name, metadata_path, uuid, mysql_database_name, std::move(mysql_pool), std::move(client)
-                    , std::move(materialize_mode_settings));
+                    context, database_name, metadata_path, uuid, configuration.database, std::move(mysql_pool),
+                    std::move(client), std::move(materialize_mode_settings));
         }
         catch (...)
         {
@@ -232,74 +272,109 @@ DatabasePtr DatabaseFactory::getImpl(const ASTCreateQuery & create, const String
     else if (engine_name == "PostgreSQL")
     {
         const ASTFunction * engine = engine_define->engine;
-
-        if (!engine->arguments || engine->arguments->children.size() < 4 || engine->arguments->children.size() > 5)
-            throw Exception(fmt::format(
-                        "{} Database require host:port, database_name, username, password arguments "
-                        "[, use_table_cache = 0].", engine_name),
-                ErrorCodes::BAD_ARGUMENTS);
+        if (!engine->arguments)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
         ASTs & engine_args = engine->arguments->children;
+        auto use_table_cache = false;
+        StoragePostgreSQLConfiguration configuration;
 
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+        if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context, true))
+        {
+            auto [common_configuration, storage_specific_args] = named_collection.value();
 
-        const auto & host_port = safeGetLiteralValue<String>(engine_args[0], engine_name);
-        const auto & postgres_database_name = safeGetLiteralValue<String>(engine_args[1], engine_name);
-        const auto & username = safeGetLiteralValue<String>(engine_args[2], engine_name);
-        const auto & password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+            configuration.set(common_configuration);
+            configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
 
-        auto use_table_cache = 0;
-        if (engine->arguments->children.size() == 5)
-            use_table_cache = safeGetLiteralValue<UInt64>(engine_args[4], engine_name);
+            for (const auto & [arg_name, arg_value] : storage_specific_args)
+            {
+                if (arg_name == "use_table_cache")
+                    use_table_cache = true;
+                else
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Unexpected key-value argument."
+                            "Got: {}, but expected one of:"
+                            "host, port, username, password, database, schema, use_table_cache.", arg_name);
+            }
+        }
+        else
+        {
+            if (engine_args.size() < 4 || engine_args.size() > 6)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "PostgreSQL Database require `host:port`, `database_name`, `username`, `password`"
+                                "[, `schema` = "", `use_table_cache` = 0");
 
-        /// Split into replicas if needed.
-        size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+            for (auto & engine_arg : engine_args)
+                engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
 
-        /// no connection is made here
-        auto connection_pool = std::make_shared<postgres::PoolWithFailover>(
-            postgres_database_name,
-            addresses,
-            username, password,
+            const auto & host_port = safeGetLiteralValue<String>(engine_args[0], engine_name);
+            size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+
+            configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+            configuration.database = safeGetLiteralValue<String>(engine_args[1], engine_name);
+            configuration.username = safeGetLiteralValue<String>(engine_args[2], engine_name);
+            configuration.password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+
+            if (engine_args.size() >= 5)
+                configuration.schema = safeGetLiteralValue<String>(engine_args[4], engine_name);
+        }
+
+        if (engine_args.size() >= 6)
+            use_table_cache = safeGetLiteralValue<UInt8>(engine_args[5], engine_name);
+
+        auto pool = std::make_shared<postgres::PoolWithFailover>(configuration,
             context->getSettingsRef().postgresql_connection_pool_size,
             context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return std::make_shared<DatabasePostgreSQL>(
-            context, metadata_path, engine_define, database_name, postgres_database_name, connection_pool, use_table_cache);
+            context, metadata_path, engine_define, database_name, configuration, pool, use_table_cache);
     }
     else if (engine_name == "MaterializedPostgreSQL")
     {
         const ASTFunction * engine = engine_define->engine;
-
-        if (!engine->arguments || engine->arguments->children.size() != 4)
-        {
-            throw Exception(
-                    fmt::format("{} Database require host:port, database_name, username, password arguments ", engine_name),
-                    ErrorCodes::BAD_ARGUMENTS);
-        }
+        if (!engine->arguments)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine `{}` must have arguments", engine_name);
 
         ASTs & engine_args = engine->arguments->children;
+        StoragePostgreSQLConfiguration configuration;
 
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+        if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context, true))
+        {
+            auto [common_configuration, storage_specific_args] = named_collection.value();
+            configuration.set(common_configuration);
 
-        const auto & host_port = safeGetLiteralValue<String>(engine_args[0], engine_name);
-        const auto & postgres_database_name = safeGetLiteralValue<String>(engine_args[1], engine_name);
-        const auto & username = safeGetLiteralValue<String>(engine_args[2], engine_name);
-        const auto & password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+            if (!storage_specific_args.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "MaterializedPostgreSQL Database requires only `host`, `port`, `database_name`, `username`, `password`.");
+        }
+        else
+        {
+            if (engine_args.size() != 4)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "MaterializedPostgreSQL Database require `host:port`, `database_name`, `username`, `password`.");
 
-        auto parsed_host_port = parseAddress(host_port, 5432);
-        auto connection_info = postgres::formatConnectionString(postgres_database_name, parsed_host_port.first, parsed_host_port.second, username, password);
+            for (auto & engine_arg : engine_args)
+                engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+
+            auto parsed_host_port = parseAddress(safeGetLiteralValue<String>(engine_args[0], engine_name), 5432);
+
+            configuration.host = parsed_host_port.first;
+            configuration.port = parsed_host_port.second;
+            configuration.database = safeGetLiteralValue<String>(engine_args[1], engine_name);
+            configuration.username = safeGetLiteralValue<String>(engine_args[2], engine_name);
+            configuration.password = safeGetLiteralValue<String>(engine_args[3], engine_name);
+        }
+
+        auto connection_info = postgres::formatConnectionString(
+            configuration.database, configuration.host, configuration.port, configuration.username, configuration.password);
 
         auto postgresql_replica_settings = std::make_unique<MaterializedPostgreSQLSettings>();
-
         if (engine_define->settings)
             postgresql_replica_settings->loadFromQuery(*engine_define);
 
         return std::make_shared<DatabaseMaterializedPostgreSQL>(
-                context, metadata_path, uuid, engine_define, create.attach,
-                database_name, postgres_database_name, connection_info,
+                context, metadata_path, uuid, create.attach,
+                database_name, configuration.database, connection_info,
                 std::move(postgresql_replica_settings));
     }
 
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index abcb8dbb974..f4336fc7ef9 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -8,9 +8,10 @@
 #include <IO/WriteHelpers.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Storages/IStorage.h>
+#include <Common/escapeForFileName.h>
 
-#include <common/logger_useful.h>
-#include <common/scope_guard_safe.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard_safe.h>
 #include <iomanip>
 #include <filesystem>
 
@@ -36,13 +37,11 @@ DatabaseLazy::DatabaseLazy(const String & name_, const String & metadata_path_,
 
 
 void DatabaseLazy::loadStoredObjects(
-    ContextMutablePtr local_context,
-    bool /* has_force_restore_data_flag */,
-    bool /*force_attach*/)
+    ContextMutablePtr local_context, bool /* force_restore */, bool /*force_attach*/, bool /* skip_startup_tables */)
 {
     iterateMetadataFiles(local_context, [this](const String & file_name)
     {
-        const std::string table_name = file_name.substr(0, file_name.size() - 4);
+        const std::string table_name = unescapeForFileName(file_name.substr(0, file_name.size() - 4));
 
         fs::path detached_permanently_flag = fs::path(getMetadataPath()) / (file_name + detached_suffix);
         if (fs::exists(detached_permanently_flag))
@@ -143,7 +142,7 @@ StoragePtr DatabaseLazy::tryGetTable(const String & table_name) const
     return loadTable(table_name);
 }
 
-DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name) const
 {
     std::lock_guard lock(mutex);
     Strings filtered_tables;
@@ -246,6 +245,8 @@ StoragePtr DatabaseLazy::loadTable(const String & table_name) const
 
         if (!ast || !endsWith(table->getName(), "Log"))
             throw Exception("Only *Log tables can be used with Lazy database engine.", ErrorCodes::LOGICAL_ERROR);
+
+        table->startup();
         {
             std::lock_guard lock(mutex);
             auto it = tables_cache.find(table_name);
@@ -304,7 +305,7 @@ void DatabaseLazy::clearExpiredTables() const
 }
 
 
-DatabaseLazyIterator::DatabaseLazyIterator(DatabaseLazy & database_, Strings && table_names_)
+DatabaseLazyIterator::DatabaseLazyIterator(const DatabaseLazy & database_, Strings && table_names_)
     : IDatabaseTablesIterator(database_.database_name)
     , database(database_)
     , table_names(std::move(table_names_))
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index 949869f4509..45c816c2e76 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -26,9 +26,7 @@ public:
 
     bool canContainDistributedTables() const override { return false; }
 
-    void loadStoredObjects(
-        ContextMutablePtr context,
-        bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
 
     void createTable(
         ContextPtr context,
@@ -64,7 +62,7 @@ public:
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
     void attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path) override;
 
@@ -119,7 +117,7 @@ class DatabaseLazyIterator final : public IDatabaseTablesIterator
 {
 public:
     DatabaseLazyIterator(
-        DatabaseLazy & database_,
+        const DatabaseLazy & database_,
         Strings && table_names_);
 
     void next() override;
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index c0af027e027..87e5f86c893 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -1,4 +1,5 @@
-#include <common/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
 #include <Databases/DatabaseMemory.h>
 #include <Databases/DatabasesCommon.h>
 #include <Interpreters/Context.h>
@@ -41,13 +42,25 @@ void DatabaseMemory::dropTable(
     auto table = detachTableUnlocked(table_name, lock);
     try
     {
+        /// Remove table w/o lock since:
+        /// - it does not require it
+        /// - it may cause lock-order-inversion if underlying storage need to
+        ///   resolve tables (like StorageLiveView)
+        SCOPE_EXIT(lock.lock());
+        lock.unlock();
         table->drop();
-        fs::path table_data_dir{getTableDataPath(table_name)};
-        if (fs::exists(table_data_dir))
-            fs::remove_all(table_data_dir);
+
+        if (table->storesDataOnDisk())
+        {
+            assert(database_name != DatabaseCatalog::TEMPORARY_DATABASE);
+            fs::path table_data_dir{getTableDataPath(table_name)};
+            if (fs::exists(table_data_dir))
+                fs::remove_all(table_data_dir);
+        }
     }
     catch (...)
     {
+        assert(database_name != DatabaseCatalog::TEMPORARY_DATABASE);
         attachTableUnlocked(table_name, table, lock);
         throw;
     }
@@ -64,6 +77,10 @@ ASTPtr DatabaseMemory::getCreateDatabaseQuery() const
     create_query->database = getDatabaseName();
     create_query->set(create_query->storage, std::make_shared<ASTStorage>());
     create_query->storage->set(create_query->storage->engine, makeASTFunction(getEngineName()));
+
+    if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
+        create_query->set(create_query->comment, std::make_shared<ASTLiteral>(comment_value));
+
     return create_query;
 }
 
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 620e560b64c..638aef7186c 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -14,7 +14,7 @@
 #include <Storages/StorageFactory.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/escapeForFileName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabaseAtomic.h>
 #include <Common/assert_cast.h>
@@ -34,10 +34,12 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
     extern const int FILE_DOESNT_EXIST;
+    extern const int CANNOT_OPEN_FILE;
     extern const int INCORRECT_FILE_NAME;
     extern const int SYNTAX_ERROR;
     extern const int TABLE_ALREADY_EXISTS;
     extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+    extern const int DATABASE_NOT_EMPTY;
 }
 
 
@@ -46,7 +48,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     const String & database_name,
     const String & table_data_path_relative,
     ContextMutablePtr context,
-    bool has_force_restore_data_flag)
+    bool force_restore)
 {
     ast_create_query.attach = true;
     ast_create_query.database = database_name;
@@ -88,7 +90,7 @@ std::pair<String, StoragePtr> createTableFromAST(
             context->getGlobalContext(),
             columns,
             constraints,
-            has_force_restore_data_flag)
+            force_restore)
     };
 }
 
@@ -178,6 +180,8 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
 
             if (metadata.sampling_key.definition_ast)
                 storage_ast.set(storage_ast.sample_by, metadata.sampling_key.definition_ast);
+            else if (storage_ast.sample_by != nullptr) /// SAMPLE BY was removed
+                storage_ast.sample_by = nullptr;
 
             if (metadata.table_ttl.definition_ast)
                 storage_ast.set(storage_ast.ttl_table, metadata.table_ttl.definition_ast);
@@ -188,6 +192,11 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
                 storage_ast.set(storage_ast.settings, metadata.settings_changes);
         }
     }
+
+    if (metadata.comment.empty())
+        ast_create_query.reset(ast_create_query.comment);
+    else
+        ast_create_query.set(ast_create_query.comment, std::make_shared<ASTLiteral>(metadata.comment));
 }
 
 
@@ -522,14 +531,40 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
         ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
     }
 
+    if (const auto database_comment = getDatabaseComment(); !database_comment.empty())
+    {
+        auto & ast_create_query = ast->as<ASTCreateQuery &>();
+        ast_create_query.set(ast_create_query.comment, std::make_shared<ASTLiteral>(database_comment));
+    }
+
     return ast;
 }
 
 void DatabaseOnDisk::drop(ContextPtr local_context)
 {
     assert(tables.empty());
-    fs::remove(local_context->getPath() + getDataPath());
-    fs::remove(getMetadataPath());
+    if (local_context->getSettingsRef().force_remove_data_recursively_on_drop)
+    {
+        fs::remove_all(local_context->getPath() + getDataPath());
+        fs::remove_all(getMetadataPath());
+    }
+    else
+    {
+        try
+        {
+            fs::remove(local_context->getPath() + getDataPath());
+            fs::remove(getMetadataPath());
+        }
+        catch (const fs::filesystem_error & e)
+        {
+            if (e.code() != std::errc::directory_not_empty)
+                throw Exception(Exception::CreateFromSTDTag{}, e);
+            throw Exception(ErrorCodes::DATABASE_NOT_EMPTY, "Cannot drop: {}. "
+                "Probably database contain some detached tables or metadata leftovers from Ordinary engine. "
+                "If you want to remove all data anyway, try to attach database back and drop it again "
+                "with enabled force_remove_data_recursively_on_drop setting", e.what());
+        }
+    }
 }
 
 String DatabaseOnDisk::getObjectMetadataPath(const String & object_name) const
@@ -631,19 +666,20 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
 {
     String query;
 
-    try
+    int metadata_file_fd = ::open(metadata_file_path.c_str(), O_RDONLY | O_CLOEXEC);
+
+    if (metadata_file_fd == -1)
     {
-        ReadBufferFromFile in(metadata_file_path, METADATA_FILE_BUFFER_SIZE);
-        readStringUntilEOF(query, in);
-    }
-    catch (const Exception & e)
-    {
-        if (!throw_on_error && e.code() == ErrorCodes::FILE_DOESNT_EXIST)
+        if (errno == ENOENT && !throw_on_error)
             return nullptr;
-        else
-            throw;
+
+        throwFromErrnoWithPath("Cannot open file " + metadata_file_path, metadata_file_path,
+                               errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
     }
 
+    ReadBufferFromFile in(metadata_file_fd, metadata_file_path, METADATA_FILE_BUFFER_SIZE);
+    readStringUntilEOF(query, in);
+
     /** Empty files with metadata are generated after a rough restart of the server.
       * Remove these files to slightly reduce the work of the admins on startup.
       */
@@ -699,4 +735,55 @@ ASTPtr DatabaseOnDisk::getCreateQueryFromMetadata(const String & database_metada
     return ast;
 }
 
+void DatabaseOnDisk::modifySettingsMetadata(const SettingsChanges & settings_changes, ContextPtr query_context)
+{
+    std::lock_guard lock(modify_settings_mutex);
+
+    auto create_query = getCreateDatabaseQuery()->clone();
+    auto * create = create_query->as<ASTCreateQuery>();
+    auto * settings = create->storage->settings;
+    if (settings)
+    {
+        auto & storage_settings = settings->changes;
+        for (const auto & change : settings_changes)
+        {
+            auto it = std::find_if(storage_settings.begin(), storage_settings.end(),
+                                   [&](const auto & prev){ return prev.name == change.name; });
+            if (it != storage_settings.end())
+                it->value = change.value;
+            else
+                storage_settings.push_back(change);
+        }
+    }
+    else
+    {
+        auto storage_settings = std::make_shared<ASTSetQuery>();
+        storage_settings->is_standalone = false;
+        storage_settings->changes = settings_changes;
+        create->storage->set(create->storage->settings, storage_settings->clone());
+    }
+
+    create->attach = true;
+    create->if_not_exists = false;
+
+    WriteBufferFromOwnString statement_buf;
+    formatAST(*create, statement_buf, false);
+    writeChar('\n', statement_buf);
+    String statement = statement_buf.str();
+
+    String database_name_escaped = escapeForFileName(database_name);
+    fs::path metadata_root_path = fs::canonical(query_context->getGlobalContext()->getPath());
+    fs::path metadata_file_tmp_path = fs::path(metadata_root_path) / "metadata" / (database_name_escaped + ".sql.tmp");
+    fs::path metadata_file_path = fs::path(metadata_root_path) / "metadata" / (database_name_escaped + ".sql");
+
+    WriteBufferFromFile out(metadata_file_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
+    writeString(statement, out);
+
+    out.next();
+    if (getContext()->getSettingsRef().fsync_metadata)
+        out.sync();
+    out.close();
+
+    fs::rename(metadata_file_tmp_path, metadata_file_path);
+}
 }
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index 73b69dd43a5..dce82c2b441 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -11,13 +11,12 @@ namespace DB
 {
 
 class Context;
-
 std::pair<String, StoragePtr> createTableFromAST(
     ASTCreateQuery ast_create_query,
     const String & database_name,
     const String & table_data_path_relative,
     ContextMutablePtr context,
-    bool has_force_restore_data_flag);
+    bool force_restore);
 
 /** Get the string with the table definition based on the CREATE query.
   * It is an ATTACH query that you can execute to create a table from the correspondent database.
@@ -75,6 +74,8 @@ public:
     void checkMetadataFilenameAvailability(const String & to_table_name) const;
     void checkMetadataFilenameAvailabilityUnlocked(const String & to_table_name, std::unique_lock<std::mutex> &) const;
 
+    void modifySettingsMetadata(const SettingsChanges & settings_changes, ContextPtr query_context);
+
 protected:
     static constexpr const char * create_suffix = ".tmp";
     static constexpr const char * drop_suffix = ".tmp_drop";
@@ -98,6 +99,9 @@ protected:
 
     const String metadata_path;
     const String data_path;
+
+    /// For alter settings.
+    std::mutex modify_settings_mutex;
 };
 
 }
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index 7758841afc2..22b5430a08a 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -4,6 +4,8 @@
 #include <Databases/DatabaseOnDisk.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabasesCommon.h>
+#include <Databases/DDLDependencyVisitor.h>
+#include <Databases/TablesLoader.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
@@ -21,14 +23,12 @@
 #include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace fs = std::filesystem;
 
 namespace DB
 {
-static constexpr size_t PRINT_MESSAGE_EACH_N_OBJECTS = 256;
-static constexpr size_t PRINT_MESSAGE_EACH_N_SECONDS = 5;
 static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 
 namespace
@@ -39,7 +39,7 @@ namespace
         DatabaseOrdinary & database,
         const String & database_name,
         const String & metadata_path,
-        bool has_force_restore_data_flag)
+        bool force_restore)
     {
         try
         {
@@ -48,7 +48,7 @@ namespace
                 database_name,
                 database.getTableDataPath(query),
                 context,
-                has_force_restore_data_flag);
+                force_restore);
 
             database.attachTable(table_name, table, database.getTableDataPath(query));
         }
@@ -60,15 +60,6 @@ namespace
             throw;
         }
     }
-
-    void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch)
-    {
-        if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
-        {
-            LOG_INFO(log, "{}%", processed * 100.0 / total);
-            watch.restart();
-        }
-    }
 }
 
 
@@ -83,20 +74,89 @@ DatabaseOrdinary::DatabaseOrdinary(
 {
 }
 
-void DatabaseOrdinary::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool /*force_attach*/)
+void DatabaseOrdinary::loadStoredObjects(
+    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
 {
     /** Tables load faster if they are loaded in sorted (by name) order.
       * Otherwise (for the ext4 filesystem), `DirectoryIterator` iterates through them in some order,
       *  which does not correspond to order tables creation and does not correspond to order of their location on disk.
       */
-    using FileNames = std::map<std::string, ASTPtr>;
-    std::mutex file_names_mutex;
-    FileNames file_names;
 
-    size_t total_dictionaries = 0;
+    ParsedTablesMetadata metadata;
+    loadTablesMetadata(local_context, metadata);
 
-    auto process_metadata = [&file_names, &total_dictionaries, &file_names_mutex, this](
-                                const String & file_name)
+    size_t total_tables = metadata.parsed_tables.size() - metadata.total_dictionaries;
+
+    AtomicStopwatch watch;
+    std::atomic<size_t> dictionaries_processed{0};
+    std::atomic<size_t> tables_processed{0};
+
+    ThreadPool pool;
+
+    /// We must attach dictionaries before attaching tables
+    /// because while we're attaching tables we may need to have some dictionaries attached
+    /// (for example, dictionaries can be used in the default expressions for some tables).
+    /// On the other hand we can attach any dictionary (even sourced from ClickHouse table)
+    /// without having any tables attached. It is so because attaching of a dictionary means
+    /// loading of its config only, it doesn't involve loading the dictionary itself.
+
+    /// Attach dictionaries.
+    for (const auto & name_with_path_and_query : metadata.parsed_tables)
+    {
+        const auto & name = name_with_path_and_query.first;
+        const auto & path = name_with_path_and_query.second.path;
+        const auto & ast = name_with_path_and_query.second.ast;
+        const auto & create_query = ast->as<const ASTCreateQuery &>();
+
+        if (create_query.is_dictionary)
+        {
+            pool.scheduleOrThrowOnError([&]()
+            {
+                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+
+                /// Messages, so that it's not boring to wait for the server to load for a long time.
+                logAboutProgress(log, ++dictionaries_processed, metadata.total_dictionaries, watch);
+            });
+        }
+    }
+
+    pool.wait();
+
+    /// Attach tables.
+    for (const auto & name_with_path_and_query : metadata.parsed_tables)
+    {
+        const auto & name = name_with_path_and_query.first;
+        const auto & path = name_with_path_and_query.second.path;
+        const auto & ast = name_with_path_and_query.second.ast;
+        const auto & create_query = ast->as<const ASTCreateQuery &>();
+
+        if (!create_query.is_dictionary)
+        {
+            pool.scheduleOrThrowOnError([&]()
+            {
+                loadTableFromMetadata(local_context, path, name, ast, force_restore);
+
+                /// Messages, so that it's not boring to wait for the server to load for a long time.
+                logAboutProgress(log, ++tables_processed, total_tables, watch);
+            });
+        }
+    }
+
+    pool.wait();
+
+    if (!skip_startup_tables)
+    {
+        /// After all tables was basically initialized, startup them.
+        startupTables(pool, force_restore, force_attach);
+    }
+}
+
+void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTablesMetadata & metadata)
+{
+    size_t prev_tables_count = metadata.parsed_tables.size();
+    size_t prev_total_dictionaries = metadata.total_dictionaries;
+
+    auto process_metadata = [&metadata, this](const String & file_name)
     {
         fs::path path(getMetadataPath());
         fs::path file_path(file_name);
@@ -116,14 +176,34 @@ void DatabaseOrdinary::loadStoredObjects(ContextMutablePtr local_context, bool h
                     /// if (create_query->uuid != UUIDHelpers::Nil)
                     ///     DatabaseCatalog::instance().addUUIDMapping(create_query->uuid);
 
-                    const std::string table_name = file_name.substr(0, file_name.size() - 4);
+                    const std::string table_name = unescapeForFileName(file_name.substr(0, file_name.size() - 4));
                     LOG_DEBUG(log, "Skipping permanently detached table {}.", backQuote(table_name));
                     return;
                 }
 
-                std::lock_guard lock{file_names_mutex};
-                file_names[file_name] = ast;
-                total_dictionaries += create_query->is_dictionary;
+                TableLoadingDependenciesVisitor::Data data;
+                data.default_database = metadata.default_database;
+                data.create_query = ast;
+                data.global_context = getContext();
+                TableLoadingDependenciesVisitor visitor{data};
+                visitor.visit(ast);
+                QualifiedTableName qualified_name{database_name, create_query->table};
+
+                std::lock_guard lock{metadata.mutex};
+                metadata.parsed_tables[qualified_name] = ParsedTableMetadata{full_path.string(), ast};
+                if (data.dependencies.empty())
+                {
+                    metadata.independent_database_objects.emplace_back(std::move(qualified_name));
+                }
+                else
+                {
+                    for (const auto & dependency : data.dependencies)
+                    {
+                        metadata.dependencies_info[dependency].dependent_database_objects.push_back(qualified_name);
+                        ++metadata.dependencies_info[qualified_name].dependencies_count;
+                    }
+                }
+                metadata.total_dictionaries += create_query->is_dictionary;
             }
         }
         catch (Exception & e)
@@ -135,78 +215,29 @@ void DatabaseOrdinary::loadStoredObjects(ContextMutablePtr local_context, bool h
 
     iterateMetadataFiles(local_context, process_metadata);
 
-    size_t total_tables = file_names.size() - total_dictionaries;
+    size_t objects_in_database = metadata.parsed_tables.size() - prev_tables_count;
+    size_t dictionaries_in_database = metadata.total_dictionaries - prev_total_dictionaries;
+    size_t tables_in_database = objects_in_database - dictionaries_in_database;
 
-    LOG_INFO(log, "Total {} tables and {} dictionaries.", total_tables, total_dictionaries);
-
-    AtomicStopwatch watch;
-    std::atomic<size_t> tables_processed{0};
-
-    ThreadPool pool;
-
-    /// We must attach dictionaries before attaching tables
-    /// because while we're attaching tables we may need to have some dictionaries attached
-    /// (for example, dictionaries can be used in the default expressions for some tables).
-    /// On the other hand we can attach any dictionary (even sourced from ClickHouse table)
-    /// without having any tables attached. It is so because attaching of a dictionary means
-    /// loading of its config only, it doesn't involve loading the dictionary itself.
-
-    /// Attach dictionaries.
-    for (const auto & name_with_query : file_names)
-    {
-        const auto & create_query = name_with_query.second->as<const ASTCreateQuery &>();
-
-        if (create_query.is_dictionary)
-        {
-            pool.scheduleOrThrowOnError([&]()
-            {
-                tryAttachTable(
-                    local_context,
-                    create_query,
-                    *this,
-                    database_name,
-                    getMetadataPath() + name_with_query.first,
-                    has_force_restore_data_flag);
-
-                /// Messages, so that it's not boring to wait for the server to load for a long time.
-                logAboutProgress(log, ++tables_processed, total_tables, watch);
-            });
-        }
-    }
-
-    pool.wait();
-
-    /// Attach tables.
-    for (const auto & name_with_query : file_names)
-    {
-        const auto & create_query = name_with_query.second->as<const ASTCreateQuery &>();
-
-        if (!create_query.is_dictionary)
-        {
-            pool.scheduleOrThrowOnError([&]()
-            {
-                tryAttachTable(
-                    local_context,
-                    create_query,
-                    *this,
-                    database_name,
-                    getMetadataPath() + name_with_query.first,
-                    has_force_restore_data_flag);
-
-                /// Messages, so that it's not boring to wait for the server to load for a long time.
-                logAboutProgress(log, ++tables_processed, total_tables, watch);
-            });
-        }
-    }
-
-    pool.wait();
-
-    /// After all tables was basically initialized, startup them.
-    startupTables(pool);
+    LOG_INFO(log, "Metadata processed, database {} has {} tables and {} dictionaries in total.",
+             database_name, tables_in_database, dictionaries_in_database);
 }
 
+void DatabaseOrdinary::loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore)
+{
+    assert(name.database == database_name);
+    const auto & create_query = ast->as<const ASTCreateQuery &>();
 
-void DatabaseOrdinary::startupTables(ThreadPool & thread_pool)
+    tryAttachTable(
+        local_context,
+        create_query,
+        *this,
+        name.database,
+        file_path,
+        force_restore);
+}
+
+void DatabaseOrdinary::startupTables(ThreadPool & thread_pool, bool /*force_restore*/, bool /*force_attach*/)
 {
     LOG_INFO(log, "Starting up tables.");
 
@@ -231,6 +262,7 @@ void DatabaseOrdinary::startupTables(ThreadPool & thread_pool)
     }
     catch (...)
     {
+        /// We have to wait for jobs to finish here, because job function has reference to variables on the stack of current thread.
         thread_pool.wait();
         throw;
     }
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index 4d68890cc2b..982be2024ce 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -16,11 +16,20 @@ class DatabaseOrdinary : public DatabaseOnDisk
 public:
     DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context);
     DatabaseOrdinary(
-        const String & name_, const String & metadata_path_, const String & data_path_, const String & logger, ContextPtr context_);
+        const String & name_, const String & metadata_path_, const String & data_path_,
+        const String & logger, ContextPtr context_);
 
     String getEngineName() const override { return "Ordinary"; }
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+
+    bool supportsLoadingInTopologicalOrder() const override { return true; }
+
+    void loadTablesMetadata(ContextPtr context, ParsedTablesMetadata & metadata) override;
+
+    void loadTableFromMetadata(ContextMutablePtr local_context, const String & file_path, const QualifiedTableName & name, const ASTPtr & ast, bool force_restore) override;
+
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     void alterTable(
         ContextPtr context,
@@ -34,8 +43,6 @@ protected:
         const String & table_metadata_path,
         const String & statement,
         ContextPtr query_context);
-
-    void startupTables(ThreadPool & thread_pool);
 };
 
 }
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index ac6c525af68..3f253ed0924 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -8,7 +8,6 @@
 #include <Interpreters/executeQuery.h>
 #include <Parsers/queryToString.h>
 #include <Common/Exception.h>
-#include <Common/Stopwatch.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
@@ -16,7 +15,7 @@
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/Cluster.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -299,19 +298,48 @@ void DatabaseReplicated::createReplicaNodesInZooKeeper(const zkutil::ZooKeeperPt
     /// Write host name to replica_path, it will protect from multiple replicas with the same name
     auto host_id = getHostID(getContext(), db_uuid);
 
-    Coordination::Requests ops;
-    ops.emplace_back(zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent));
-    ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent));
-    current_zookeeper->multi(ops);
+    for (int attempts = 10; attempts > 0; --attempts)
+    {
+        Coordination::Stat stat;
+        String max_log_ptr_str = current_zookeeper->get(zookeeper_path + "/max_log_ptr", &stat);
+        Coordination::Requests ops;
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path, host_id, zkutil::CreateMode::Persistent));
+        ops.emplace_back(zkutil::makeCreateRequest(replica_path + "/log_ptr", "0", zkutil::CreateMode::Persistent));
+        /// In addition to creating the replica nodes, we record the max_log_ptr at the instant where
+        /// we declared ourself as an existing replica. We'll need this during recoverLostReplica to
+        /// notify other nodes that issued new queries while this node was recovering.
+        ops.emplace_back(zkutil::makeCheckRequest(zookeeper_path + "/max_log_ptr", stat.version));
+        Coordination::Responses responses;
+        const auto code = current_zookeeper->tryMulti(ops, responses);
+        if (code == Coordination::Error::ZOK)
+        {
+            max_log_ptr_at_creation = parse<UInt32>(max_log_ptr_str);
+            break;
+        }
+        else if (code == Coordination::Error::ZNODEEXISTS || attempts == 1)
+        {
+            /// If its our last attempt, or if the replica already exists, fail immediately.
+            zkutil::KeeperMultiException::check(code, ops, responses);
+        }
+    }
     createEmptyLogEntry(current_zookeeper);
 }
 
-void DatabaseReplicated::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseReplicated::beforeLoadingMetadata(ContextMutablePtr /*context*/, bool /*force_restore*/, bool force_attach)
 {
     tryConnectToZooKeeperAndInitDatabase(force_attach);
+}
 
-    DatabaseAtomic::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
+void DatabaseReplicated::loadStoredObjects(
+    ContextMutablePtr local_context, bool force_restore, bool force_attach, bool skip_startup_tables)
+{
+    beforeLoadingMetadata(local_context, force_restore, force_attach);
+    DatabaseAtomic::loadStoredObjects(local_context, force_restore, force_attach, skip_startup_tables);
+}
 
+void DatabaseReplicated::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
+{
+    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
     ddl_worker = std::make_unique<DatabaseReplicatedDDLWorker>(this, getContext());
     ddl_worker->startup();
 }
@@ -525,7 +553,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         query_context->getClientInfo().is_replicated_database_internal = true;
         query_context->setCurrentDatabase(database_name);
         query_context->setCurrentQueryId("");
-        auto txn = std::make_shared<ZooKeeperMetadataTransaction>(current_zookeeper, zookeeper_path, false);
+        auto txn = std::make_shared<ZooKeeperMetadataTransaction>(current_zookeeper, zookeeper_path, false, "");
         query_context->initZooKeeperMetadataTransaction(txn);
         return query_context;
     };
@@ -613,6 +641,21 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         InterpreterCreateQuery(query_ast, create_query_context).execute();
     }
 
+    if (max_log_ptr_at_creation != 0)
+    {
+        /// If the replica is new and some of the queries applied during recovery
+        /// where issued after the replica was created, then other nodes might be
+        /// waiting for this node to notify them that the query was applied.
+        for (UInt32 ptr = max_log_ptr_at_creation; ptr <= max_log_ptr; ++ptr)
+        {
+            auto entry_name = DDLTaskBase::getLogEntryName(ptr);
+            auto path = fs::path(zookeeper_path) / "log" / entry_name / "finished" / getFullReplicaName();
+            auto status = ExecutionStatus(0).serializeText();
+            auto res = current_zookeeper->tryCreate(path, status, zkutil::CreateMode::Persistent);
+            if (res == Coordination::Error::ZOK)
+                LOG_INFO(log, "Marked recovered {} as finished", entry_name);
+        }
+    }
     current_zookeeper->set(replica_path + "/log_ptr", toString(max_log_ptr));
 }
 
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 41b1bf13e5f..34cfb7df151 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -4,8 +4,7 @@
 #include <Databases/DatabaseReplicatedSettings.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <DataStreams/BlockIO.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Interpreters/Context.h>
 
 
@@ -57,7 +56,12 @@ public:
 
     void drop(ContextPtr /*context*/) override;
 
-    void loadStoredObjects(ContextMutablePtr context, bool has_force_restore_data_flag, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr context, bool force_restore, bool force_attach, bool skip_startup_tables) override;
+
+    void beforeLoadingMetadata(ContextMutablePtr context, bool force_restore, bool force_attach) override;
+
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
+
     void shutdown() override;
 
     friend struct DatabaseReplicatedTask;
@@ -90,6 +94,7 @@ private:
 
     std::atomic_bool is_readonly = true;
     std::unique_ptr<DatabaseReplicatedDDLWorker> ddl_worker;
+    UInt32 max_log_ptr_at_creation = 0;
 
     mutable ClusterPtr cluster;
 };
diff --git a/src/Databases/DatabaseReplicatedWorker.h b/src/Databases/DatabaseReplicatedWorker.h
index 4020906f9b2..773612e403c 100644
--- a/src/Databases/DatabaseReplicatedWorker.h
+++ b/src/Databases/DatabaseReplicatedWorker.h
@@ -43,7 +43,7 @@ private:
     mutable std::mutex mutex;
     std::condition_variable wait_current_task_change;
     String current_task;
-    UInt32 logs_to_keep = std::numeric_limits<UInt32>::max();
+    std::atomic<UInt32> logs_to_keep = std::numeric_limits<UInt32>::max();
 };
 
 }
diff --git a/src/Databases/DatabasesCommon.cpp b/src/Databases/DatabasesCommon.cpp
index 9d79a0dfe96..8c0da37a111 100644
--- a/src/Databases/DatabasesCommon.cpp
+++ b/src/Databases/DatabasesCommon.cpp
@@ -1,6 +1,7 @@
 #include <Databases/DatabasesCommon.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/Context.h>
+#include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/formatAST.h>
 #include <Storages/StorageDictionary.h>
@@ -40,7 +41,7 @@ StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, Con
     return {};
 }
 
-DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name) const
 {
     std::lock_guard lock(mutex);
     if (!filter_by_table_name)
diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h
index da1bd6c1852..dfa99b632e3 100644
--- a/src/Databases/DatabasesCommon.h
+++ b/src/Databases/DatabasesCommon.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>
@@ -29,7 +29,7 @@ public:
 
     StoragePtr detachTable(const String & table_name) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
     void shutdown() override;
 
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 0c8382465f7..819a11c2785 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context_fwd.h>
 #include <Common/Exception.h>
+#include <Common/ThreadPool.h>
 #include <Core/UUID.h>
 
 #include <ctime>
@@ -24,12 +25,17 @@ struct IndicesDescription;
 struct StorageInMemoryMetadata;
 struct StorageID;
 class ASTCreateQuery;
+class AlterCommands;
+class SettingsChanges;
 using DictionariesWithID = std::vector<std::pair<String, UUID>>;
+struct ParsedTablesMetadata;
+struct QualifiedTableName;
 
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_GET_CREATE_TABLE_QUERY;
+    extern const int LOGICAL_ERROR;
 }
 
 class IDatabaseTablesIterator
@@ -123,7 +129,34 @@ public:
 
     /// Load a set of existing tables.
     /// You can call only once, right after the object is created.
-    virtual void loadStoredObjects(ContextMutablePtr /*context*/, bool /*has_force_restore_data_flag*/, bool /*force_attach*/ = false) {}
+    virtual void loadStoredObjects(
+        ContextMutablePtr /*context*/,
+        bool /*force_restore*/,
+        bool /*force_attach*/ = false,
+        bool /* skip_startup_tables */ = false)
+    {
+    }
+
+    virtual bool supportsLoadingInTopologicalOrder() const { return false; }
+
+    virtual void beforeLoadingMetadata(
+        ContextMutablePtr /*context*/,
+        bool /*force_restore*/,
+        bool /*force_attach*/)
+    {
+    }
+
+    virtual void loadTablesMetadata(ContextPtr /*local_context*/, ParsedTablesMetadata & /*metadata*/)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
+    }
+
+    virtual void loadTableFromMetadata(ContextMutablePtr /*local_context*/, const String & /*file_path*/, const QualifiedTableName & /*name*/, const ASTPtr & /*ast*/, bool /*force_restore*/)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
+    }
+
+    virtual void startupTables(ThreadPool & /*thread_pool*/, bool /*force_restore*/, bool /*force_attach*/) {}
 
     /// Check the existence of the table.
     virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
@@ -137,7 +170,7 @@ public:
 
     /// Get an iterator that allows you to pass through all the tables.
     /// It is possible to have "hidden" tables that are not visible when passing through, but are visible if you get them by name using the functions above.
-    virtual DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}) = 0;
+    virtual DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}) const = 0;
 
     /// Is the database empty.
     virtual bool empty() const = 0;
@@ -226,6 +259,17 @@ public:
     /// Get the CREATE DATABASE query for current database.
     virtual ASTPtr getCreateDatabaseQuery() const = 0;
 
+    String getDatabaseComment() const
+    {
+        std::lock_guard lock{mutex};
+        return comment;
+    }
+    void setDatabaseComment(String new_comment)
+    {
+        std::lock_guard lock{mutex};
+        comment = std::move(new_comment);
+    }
+
     /// Get name of database.
     String getDatabaseName() const
     {
@@ -240,6 +284,12 @@ public:
         throw Exception(getEngineName() + ": RENAME DATABASE is not supported", ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    /// Whether the contained tables should be written to a backup.
+    virtual DatabaseTablesIteratorPtr getTablesIteratorForBackup(ContextPtr context) const
+    {
+        return getTablesIterator(context); /// By default we backup each table.
+    }
+
     /// Returns path for persistent data storage if the database supports it, empty string otherwise
     virtual String getDataPath() const { return {}; }
 
@@ -266,6 +316,13 @@ public:
     /// Delete data and metadata stored inside the database, if exists.
     virtual void drop(ContextPtr /*context*/) {}
 
+    virtual void applySettingsChanges(const SettingsChanges &, ContextPtr)
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                        "Database engine {} either does not support settings, or does not support altering settings",
+                        getEngineName());
+    }
+
     virtual ~IDatabase() = default;
 
 protected:
@@ -278,6 +335,7 @@ protected:
 
     mutable std::mutex mutex;
     String database_name;
+    String comment;
 };
 
 using DatabasePtr = std::shared_ptr<IDatabase>;
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
index 4046c6929c2..a2e03b10d47 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 
@@ -93,10 +91,11 @@ void DatabaseMaterializedMySQL<Base>::setException(const std::exception_ptr & ex
     exception = exception_;
 }
 
-template<typename Base>
-void DatabaseMaterializedMySQL<Base>::loadStoredObjects(ContextMutablePtr context_, bool has_force_restore_data_flag, bool force_attach)
+template <typename Base>
+void DatabaseMaterializedMySQL<Base>::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
 {
-    Base::loadStoredObjects(context_, has_force_restore_data_flag, force_attach);
+    Base::startupTables(thread_pool, force_restore, force_attach);
+
     if (!force_attach)
         materialize_thread.assertMySQLAvailable();
 
@@ -186,7 +185,7 @@ StoragePtr DatabaseMaterializedMySQL<Base>::tryGetTable(const String & name, Con
 
 template <typename Base>
 DatabaseTablesIteratorPtr
-DatabaseMaterializedMySQL<Base>::getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name)
+DatabaseMaterializedMySQL<Base>::getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const
 {
     if (!MaterializedMySQLSyncThread::isMySQLSyncThread())
     {
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.h b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
index cdeb8a595db..ac32607a22c 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
@@ -43,7 +43,7 @@ protected:
 public:
     String getEngineName() const override { return "MaterializedMySQL"; }
 
-    void loadStoredObjects(ContextMutablePtr context_, bool has_force_restore_data_flag, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
     void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
@@ -61,7 +61,7 @@ public:
 
     StoragePtr tryGetTable(const String & name, ContextPtr context_) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
 
     void assertCalledFromSyncThreadOrDrop(const char * method) const;
 
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 5f356348829..feebf33f58a 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #    include <string>
@@ -11,7 +9,9 @@
 #    include <DataTypes/convertMySQLDataType.h>
 #    include <Databases/MySQL/DatabaseMySQL.h>
 #    include <Databases/MySQL/FetchTablesColumnsList.h>
-#    include <Formats/MySQLBlockInputStream.h>
+#    include <Processors/Sources/MySQLSource.h>
+#    include <Processors/Executors/PullingPipelineExecutor.h>
+#    include <QueryPipeline/QueryPipelineBuilder.h>
 #    include <IO/Operators.h>
 #    include <Interpreters/Context.h>
 #    include <Parsers/ASTCreateQuery.h>
@@ -82,7 +82,7 @@ bool DatabaseMySQL::empty() const
     return true;
 }
 
-DatabaseTablesIteratorPtr DatabaseMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name)
+DatabaseTablesIteratorPtr DatabaseMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name) const
 {
     Tables tables;
     std::lock_guard<std::mutex> lock(mutex);
@@ -194,6 +194,10 @@ ASTPtr DatabaseMySQL::getCreateDatabaseQuery() const
     const auto & create_query = std::make_shared<ASTCreateQuery>();
     create_query->database = getDatabaseName();
     create_query->set(create_query->storage, database_engine_define);
+
+    if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
+        create_query->set(create_query->comment, std::make_shared<ASTLiteral>(comment_value));
+
     return create_query;
 }
 
@@ -281,9 +285,12 @@ std::map<String, UInt64> DatabaseMySQL::fetchTablesWithModificationTime(ContextP
 
     std::map<String, UInt64> tables_with_modification_time;
     StreamSettings mysql_input_stream_settings(local_context->getSettingsRef());
-    MySQLBlockInputStream result(mysql_pool.get(), query.str(), tables_status_sample_block, mysql_input_stream_settings);
+    auto result = std::make_unique<MySQLSource>(mysql_pool.get(), query.str(), tables_status_sample_block, mysql_input_stream_settings);
+    QueryPipeline pipeline(std::move(result));
 
-    while (Block block = result.read())
+    Block block;
+    PullingPipelineExecutor executor(pipeline);
+    while (executor.pull(block))
     {
         size_t rows = block.rows();
         for (size_t index = 0; index < rows; ++index)
@@ -399,7 +406,7 @@ String DatabaseMySQL::getMetadataPath() const
     return metadata_path;
 }
 
-void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/)
+void DatabaseMySQL::loadStoredObjects(ContextMutablePtr, bool, bool /*force_attach*/, bool /* skip_startup_tables */)
 {
 
     std::lock_guard<std::mutex> lock{mutex};
diff --git a/src/Databases/MySQL/DatabaseMySQL.h b/src/Databases/MySQL/DatabaseMySQL.h
index 0b364f0d8d3..363557fbacb 100644
--- a/src/Databases/MySQL/DatabaseMySQL.h
+++ b/src/Databases/MySQL/DatabaseMySQL.h
@@ -57,7 +57,7 @@ public:
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
     ASTPtr getCreateDatabaseQuery() const override;
 
@@ -75,7 +75,7 @@ public:
 
     void createTable(ContextPtr, const String & table_name, const StoragePtr & storage, const ASTPtr & create_query) override;
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
 
     StoragePtr detachTable(const String & table_name) override;
 
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.cpp b/src/Databases/MySQL/FetchTablesColumnsList.cpp
index bbd187090df..529940f713c 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.cpp
+++ b/src/Databases/MySQL/FetchTablesColumnsList.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #include <Core/Block.h>
@@ -8,7 +6,9 @@
 #include <DataTypes/convertMySQLDataType.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Formats/MySQLBlockInputStream.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Sources/MySQLSource.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
@@ -85,8 +85,12 @@ std::map<String, ColumnsDescription> fetchTablesColumnsList(
     query << " TABLE_NAME IN " << toQueryStringWithQuote(tables_name) << " ORDER BY ORDINAL_POSITION";
 
     StreamSettings mysql_input_stream_settings(settings);
-    MySQLBlockInputStream result(pool.get(), query.str(), tables_columns_sample_block, mysql_input_stream_settings);
-    while (Block block = result.read())
+    auto result = std::make_unique<MySQLSource>(pool.get(), query.str(), tables_columns_sample_block, mysql_input_stream_settings);
+    QueryPipeline pipeline(std::move(result));
+
+    Block block;
+    PullingPipelineExecutor executor(pipeline);
+    while (executor.pull(block))
     {
         const auto & table_name_col = *block.getByPosition(0).column;
         const auto & column_name_col = *block.getByPosition(1).column;
diff --git a/src/Databases/MySQL/FetchTablesColumnsList.h b/src/Databases/MySQL/FetchTablesColumnsList.h
index 4b49fea864e..f039ccdbd69 100644
--- a/src/Databases/MySQL/FetchTablesColumnsList.h
+++ b/src/Databases/MySQL/FetchTablesColumnsList.h
@@ -5,7 +5,7 @@
 
 #include <mysqlxx/PoolWithFailover.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MultiEnum.h>
 #include <Core/SettingsEnums.h>
 #include <Storages/ColumnsDescription.h>
diff --git a/src/Databases/MySQL/MaterializeMetadata.cpp b/src/Databases/MySQL/MaterializeMetadata.cpp
index 4fd99ca3438..0facdfc20be 100644
--- a/src/Databases/MySQL/MaterializeMetadata.cpp
+++ b/src/Databases/MySQL/MaterializeMetadata.cpp
@@ -5,7 +5,9 @@
 #include <Core/Block.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Formats/MySQLBlockInputStream.h>
+#include <Processors/Sources/MySQLSource.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Common/quoteString.h>
@@ -13,6 +15,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 #include <filesystem>
+#include <base/FnTraits.h>
 
 namespace fs = std::filesystem;
 
@@ -38,11 +41,15 @@ static std::unordered_map<String, String> fetchTablesCreateQuery(
         };
 
         StreamSettings mysql_input_stream_settings(global_settings, false, true);
-        MySQLBlockInputStream show_create_table(
+        auto show_create_table = std::make_unique<MySQLSource>(
             connection, "SHOW CREATE TABLE " + backQuoteIfNeed(database_name) + "." + backQuoteIfNeed(fetch_table_name),
             show_create_table_header, mysql_input_stream_settings);
 
-        Block create_query_block = show_create_table.read();
+        QueryPipeline pipeline(std::move(show_create_table));
+
+        Block create_query_block;
+        PullingPipelineExecutor executor(pipeline);
+        executor.pull(create_query_block);
         if (!create_query_block || create_query_block.rows() != 1)
             throw Exception("LOGICAL ERROR mysql show create return more rows.", ErrorCodes::LOGICAL_ERROR);
 
@@ -60,9 +67,13 @@ static std::vector<String> fetchTablesInDB(const mysqlxx::PoolWithFailover::Entr
 
     std::vector<String> tables_in_db;
     StreamSettings mysql_input_stream_settings(global_settings);
-    MySQLBlockInputStream input(connection, query, header, mysql_input_stream_settings);
+    auto input = std::make_unique<MySQLSource>(connection, query, header, mysql_input_stream_settings);
 
-    while (Block block = input.read())
+    QueryPipeline pipeline(std::move(input));
+
+    Block block;
+    PullingPipelineExecutor executor(pipeline);
+    while (executor.pull(block))
     {
         tables_in_db.reserve(tables_in_db.size() + block.rows());
         for (size_t index = 0; index < block.rows(); ++index)
@@ -83,8 +94,13 @@ void MaterializeMetadata::fetchMasterStatus(mysqlxx::PoolWithFailover::Entry & c
     };
 
     StreamSettings mysql_input_stream_settings(settings, false, true);
-    MySQLBlockInputStream input(connection, "SHOW MASTER STATUS;", header, mysql_input_stream_settings);
-    Block master_status = input.read();
+    auto input = std::make_unique<MySQLSource>(connection, "SHOW MASTER STATUS;", header, mysql_input_stream_settings);
+
+    QueryPipeline pipeline(std::move(input));
+
+    Block master_status;
+    PullingPipelineExecutor executor(pipeline);
+    executor.pull(master_status);
 
     if (!master_status || master_status.rows() != 1)
         throw Exception("Unable to get master status from MySQL.", ErrorCodes::LOGICAL_ERROR);
@@ -106,9 +122,12 @@ void MaterializeMetadata::fetchMasterVariablesValue(const mysqlxx::PoolWithFailo
 
     const String & fetch_query = "SHOW VARIABLES WHERE Variable_name = 'binlog_checksum'";
     StreamSettings mysql_input_stream_settings(settings, false, true);
-    MySQLBlockInputStream variables_input(connection, fetch_query, variables_header, mysql_input_stream_settings);
+    auto variables_input = std::make_unique<MySQLSource>(connection, fetch_query, variables_header, mysql_input_stream_settings);
+    QueryPipeline pipeline(std::move(variables_input));
 
-    while (Block variables_block = variables_input.read())
+    Block variables_block;
+    PullingPipelineExecutor executor(pipeline);
+    while (executor.pull(variables_block))
     {
         ColumnPtr variables_name = variables_block.getByName("Variable_name").column;
         ColumnPtr variables_value = variables_block.getByName("Value").column;
@@ -130,8 +149,12 @@ static bool checkSyncUserPrivImpl(const mysqlxx::PoolWithFailover::Entry & conne
 
     String grants_query, sub_privs;
     StreamSettings mysql_input_stream_settings(global_settings);
-    MySQLBlockInputStream input(connection, "SHOW GRANTS FOR CURRENT_USER();", sync_user_privs_header, mysql_input_stream_settings);
-    while (Block block = input.read())
+    auto input = std::make_unique<MySQLSource>(connection, "SHOW GRANTS FOR CURRENT_USER();", sync_user_privs_header, mysql_input_stream_settings);
+    QueryPipeline pipeline(std::move(input));
+
+    Block block;
+    PullingPipelineExecutor executor(pipeline);
+    while (executor.pull(block))
     {
         for (size_t index = 0; index < block.rows(); ++index)
         {
@@ -176,9 +199,12 @@ bool MaterializeMetadata::checkBinlogFileExists(const mysqlxx::PoolWithFailover:
     };
 
     StreamSettings mysql_input_stream_settings(settings, false, true);
-    MySQLBlockInputStream input(connection, "SHOW MASTER LOGS", logs_header, mysql_input_stream_settings);
+    auto input = std::make_unique<MySQLSource>(connection, "SHOW MASTER LOGS", logs_header, mysql_input_stream_settings);
+    QueryPipeline pipeline(std::move(input));
 
-    while (Block block = input.read())
+    Block block;
+    PullingPipelineExecutor executor(pipeline);
+    while (executor.pull(block))
     {
         for (size_t index = 0; index < block.rows(); ++index)
         {
@@ -190,7 +216,7 @@ bool MaterializeMetadata::checkBinlogFileExists(const mysqlxx::PoolWithFailover:
     return false;
 }
 
-void commitMetadata(const std::function<void()> & function, const String & persistent_tmp_path, const String & persistent_path)
+void commitMetadata(Fn<void()> auto && function, const String & persistent_tmp_path, const String & persistent_path)
 {
     try
     {
diff --git a/src/Databases/MySQL/MaterializeMetadata.h b/src/Databases/MySQL/MaterializeMetadata.h
index 079786c261c..bcb0465b61e 100644
--- a/src/Databases/MySQL/MaterializeMetadata.h
+++ b/src/Databases/MySQL/MaterializeMetadata.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/MySQL/MySQLReplication.h>
 #include <mysqlxx/Connection.h>
 #include <mysqlxx/PoolWithFailover.h>
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index dcf77f56e18..d0c5d12e848 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 
@@ -9,20 +7,22 @@
 #    include <random>
 #    include <Columns/ColumnTuple.h>
 #    include <Columns/ColumnDecimal.h>
-#    include <DataStreams/CountingBlockOutputStream.h>
-#    include <DataStreams/OneBlockInputStream.h>
-#    include <DataStreams/copyData.h>
+#    include <QueryPipeline/QueryPipelineBuilder.h>
+#    include <Processors/Executors/PullingPipelineExecutor.h>
+#    include <Processors/Executors/CompletedPipelineExecutor.h>
+#    include <Processors/Sources/SourceFromSingleChunk.h>
+#    include <Processors/Transforms/CountingTransform.h>
 #    include <Databases/MySQL/DatabaseMaterializedMySQL.h>
 #    include <Databases/MySQL/MaterializeMetadata.h>
-#    include <Formats/MySQLBlockInputStream.h>
+#    include <Processors/Sources/MySQLSource.h>
 #    include <IO/ReadBufferFromString.h>
 #    include <Interpreters/Context.h>
 #    include <Interpreters/executeQuery.h>
 #    include <Storages/StorageMergeTree.h>
 #    include <Common/quoteString.h>
 #    include <Common/setThreadName.h>
-#    include <common/sleep.h>
-#    include <common/bit_cast.h>
+#    include <base/sleep.h>
+#    include <base/bit_cast.h>
 
 namespace DB
 {
@@ -100,7 +100,7 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection, const S
     const String & check_query = "SHOW VARIABLES;";
 
     StreamSettings mysql_input_stream_settings(settings, false, true);
-    MySQLBlockInputStream variables_input(connection, check_query, variables_header, mysql_input_stream_settings);
+    auto variables_input = std::make_unique<MySQLSource>(connection, check_query, variables_header, mysql_input_stream_settings);
 
     std::unordered_map<String, String> variables_error_message{
         {"log_bin", "ON"},
@@ -110,7 +110,11 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection, const S
         {"log_bin_use_v1_row_events", "OFF"}
     };
 
-    while (Block variables_block = variables_input.read())
+    QueryPipeline pipeline(std::move(variables_input));
+
+    PullingPipelineExecutor executor(pipeline);
+    Block variables_block;
+    while (executor.pull(variables_block))
     {
         ColumnPtr variable_name_column = variables_block.getByName("Variable_name").column;
         ColumnPtr variable_value_column = variables_block.getByName("Value").column;
@@ -226,7 +230,8 @@ void MaterializedMySQLSyncThread::stopSynchronization()
     if (!sync_quit && background_thread_pool)
     {
         sync_quit = true;
-        background_thread_pool->join();
+        if (background_thread_pool->joinable())
+            background_thread_pool->join();
         client.disconnect();
     }
 }
@@ -240,7 +245,7 @@ void MaterializedMySQLSyncThread::assertMySQLAvailable()
 {
     try
     {
-        checkMySQLVariables(pool.get(), getContext()->getSettingsRef());
+        checkMySQLVariables(pool.get(/* wait_timeout= */ UINT64_MAX), getContext()->getSettingsRef());
     }
     catch (const mysqlxx::ConnectionFailed & e)
     {
@@ -280,7 +285,7 @@ static inline void cleanOutdatedTables(const String & database_name, ContextPtr
     }
 }
 
-static inline BlockOutputStreamPtr
+static inline QueryPipeline
 getTableOutput(const String & database_name, const String & table_name, ContextMutablePtr query_context, bool insert_materialized = false)
 {
     const StoragePtr & storage = DatabaseCatalog::instance().getTable(StorageID(database_name, table_name), query_context);
@@ -304,10 +309,7 @@ getTableOutput(const String & database_name, const String & table_name, ContextM
     BlockIO res = tryToExecuteQuery("INSERT INTO " + backQuoteIfNeed(table_name) + "(" + insert_columns_str.str() + ")" + " VALUES",
         query_context, database_name, comment);
 
-    if (!res.out)
-        throw Exception("LOGICAL ERROR: It is a bug.", ErrorCodes::LOGICAL_ERROR);
-
-    return res.out;
+    return std::move(res.pipeline);
 }
 
 static inline void dumpDataForTables(
@@ -325,15 +327,21 @@ static inline void dumpDataForTables(
             String comment = "Materialize MySQL step 1: execute MySQL DDL for dump data";
             tryToExecuteQuery(query_prefix + " " + iterator->second, query_context, database_name, comment); /// create table.
 
-            auto out = std::make_shared<CountingBlockOutputStream>(getTableOutput(database_name, table_name, query_context));
+            auto pipeline = getTableOutput(database_name, table_name, query_context);
             StreamSettings mysql_input_stream_settings(context->getSettingsRef());
-            MySQLBlockInputStream input(
+            auto input = std::make_unique<MySQLSource>(
                 connection, "SELECT * FROM " + backQuoteIfNeed(mysql_database_name) + "." + backQuoteIfNeed(table_name),
-                out->getHeader(), mysql_input_stream_settings);
+                pipeline.getHeader(), mysql_input_stream_settings);
+            auto counting = std::make_shared<CountingTransform>(pipeline.getHeader());
+            Pipe pipe(std::move(input));
+            pipe.addTransform(counting);
+            pipeline.complete(std::move(pipe));
 
             Stopwatch watch;
-            copyData(input, *out, is_cancelled);
-            const Progress & progress = out->getProgress();
+            CompletedPipelineExecutor executor(pipeline);
+            executor.execute();
+
+            const Progress & progress = counting->getProgress();
             LOG_INFO(&Poco::Logger::get("MaterializedMySQLSyncThread(" + database_name + ")"),
                 "Materialize MySQL step 1: dump {}, {} rows, {} in {} sec., {} rows/sec., {}/sec."
                 , table_name, formatReadableQuantity(progress.written_rows), formatReadableSizeWithBinarySuffix(progress.written_bytes)
@@ -712,7 +720,7 @@ void MaterializedMySQLSyncThread::onEvent(Buffers & buffers, const BinlogEventPt
         {
             /// Some behaviors(such as changing the value of "binlog_checksum") rotate the binlog file.
             /// To ensure that the synchronization continues, we need to handle these events
-            metadata.fetchMasterVariablesValue(pool.get());
+            metadata.fetchMasterVariablesValue(pool.get(/* wait_timeout= */ UINT64_MAX));
             client.setBinlogChecksum(metadata.binlog_checksum);
         }
         else if (receive_event->header.type != HEARTBEAT_EVENT)
@@ -783,9 +791,12 @@ void MaterializedMySQLSyncThread::Buffers::commit(ContextPtr context)
         for (auto & table_name_and_buffer : data)
         {
             auto query_context = createQueryContext(context);
-            OneBlockInputStream input(table_name_and_buffer.second->first);
-            BlockOutputStreamPtr out = getTableOutput(database, table_name_and_buffer.first, query_context, true);
-            copyData(input, *out);
+            auto input = std::make_shared<SourceFromSingleChunk>(table_name_and_buffer.second->first);
+            auto pipeline = getTableOutput(database, table_name_and_buffer.first, query_context, true);
+            pipeline.complete(Pipe(std::move(input)));
+
+            CompletedPipelineExecutor executor(pipeline);
+            executor.execute();
         }
 
         data.clear();
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.h b/src/Databases/MySQL/MaterializedMySQLSyncThread.h
index 0cd0701439f..524426bada6 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.h
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 
 #    include <mutex>
 #    include <Core/MySQL/MySQLClient.h>
-#    include <DataStreams/BlockIO.h>
+#    include <QueryPipeline/BlockIO.h>
 #    include <DataTypes/DataTypeString.h>
 #    include <DataTypes/DataTypesNumber.h>
 #    include <Databases/DatabaseOrdinary.h>
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index 742eb28c7a4..2b0d73a02ae 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -5,45 +5,47 @@
 #include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 
+#include <base/logger_useful.h>
+#include <Common/Macros.h>
+#include <Core/UUID.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/DatabaseAtomic.h>
 #include <Storages/StoragePostgreSQL.h>
+#include <Storages/AlterCommands.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
+#include <Interpreters/InterpreterAlterQuery.h>
 #include <Common/escapeForFileName.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
-#include <Common/Macros.h>
-#include <common/logger_useful.h>
-
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
+    extern const int QUERY_NOT_ALLOWED;
+    extern const int UNKNOWN_TABLE;
+    extern const int BAD_ARGUMENTS;
 }
 
 DatabaseMaterializedPostgreSQL::DatabaseMaterializedPostgreSQL(
         ContextPtr context_,
         const String & metadata_path_,
         UUID uuid_,
-        const ASTStorage * database_engine_define_,
         bool is_attach_,
         const String & database_name_,
         const String & postgres_database_name,
         const postgres::ConnectionInfo & connection_info_,
         std::unique_ptr<MaterializedPostgreSQLSettings> settings_)
     : DatabaseAtomic(database_name_, metadata_path_, uuid_, "DatabaseMaterializedPostgreSQL (" + database_name_ + ")", context_)
-    , database_engine_define(database_engine_define_->clone())
     , is_attach(is_attach_)
     , remote_database_name(postgres_database_name)
     , connection_info(connection_info_)
@@ -61,16 +63,13 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
             connection_info,
             getContext(),
             is_attach,
-            settings->materialized_postgresql_max_block_size.value,
-            settings->materialized_postgresql_allow_automatic_update,
-            /* is_materialized_postgresql_database = */ true,
-            settings->materialized_postgresql_tables_list.value);
+            *settings,
+            /* is_materialized_postgresql_database = */ true);
 
-    postgres::Connection connection(connection_info);
-    NameSet tables_to_replicate;
+    std::set<String> tables_to_replicate;
     try
     {
-        tables_to_replicate = replication_handler->fetchRequiredTables(connection);
+        tables_to_replicate = replication_handler->fetchRequiredTables();
     }
     catch (...)
     {
@@ -89,12 +88,12 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
         if (storage)
         {
             /// Nested table was already created and synchronized.
-            storage = StorageMaterializedPostgreSQL::create(storage, getContext());
+            storage = StorageMaterializedPostgreSQL::create(storage, getContext(), remote_database_name, table_name);
         }
         else
         {
             /// Nested table does not exist and will be created by replication thread.
-            storage = StorageMaterializedPostgreSQL::create(StorageID(database_name, table_name), getContext());
+            storage = StorageMaterializedPostgreSQL::create(StorageID(database_name, table_name), getContext(), remote_database_name, table_name);
         }
 
         /// Cache MaterializedPostgreSQL wrapper over nested table.
@@ -109,10 +108,9 @@ void DatabaseMaterializedPostgreSQL::startSynchronization()
 }
 
 
-void DatabaseMaterializedPostgreSQL::loadStoredObjects(ContextMutablePtr local_context, bool has_force_restore_data_flag, bool force_attach)
+void DatabaseMaterializedPostgreSQL::startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach)
 {
-    DatabaseAtomic::loadStoredObjects(local_context, has_force_restore_data_flag, force_attach);
-
+    DatabaseAtomic::startupTables(thread_pool, force_restore, force_attach);
     try
     {
         startSynchronization();
@@ -124,7 +122,41 @@ void DatabaseMaterializedPostgreSQL::loadStoredObjects(ContextMutablePtr local_c
         if (!force_attach)
             throw;
     }
+}
 
+
+void DatabaseMaterializedPostgreSQL::applySettingsChanges(const SettingsChanges & settings_changes, ContextPtr query_context)
+{
+    std::lock_guard lock(handler_mutex);
+    bool need_update_on_disk = false;
+
+    for (const auto & change : settings_changes)
+    {
+        if (!settings->has(change.name))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Database engine {} does not support setting `{}`", getEngineName(), change.name);
+
+        if ((change.name == "materialized_postgresql_tables_list"))
+        {
+            if (!query_context->isInternalQuery())
+                throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "Changing setting `{}` is not allowed", change.name);
+
+            need_update_on_disk = true;
+        }
+        else if ((change.name == "materialized_postgresql_allow_automatic_update") || (change.name == "materialized_postgresql_max_block_size"))
+        {
+            replication_handler->setSetting(change);
+            need_update_on_disk = true;
+        }
+        else
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown setting");
+        }
+
+        settings->applyChange(change);
+    }
+
+    if (need_update_on_disk)
+        DatabaseOnDisk::modifySettingsMetadata(settings_changes, query_context);
 }
 
 
@@ -155,6 +187,64 @@ StoragePtr DatabaseMaterializedPostgreSQL::tryGetTable(const String & name, Cont
 }
 
 
+/// `except` is not empty in case it is detach and it will contain only one table name - name of detached table.
+/// In case we have a user defined setting `materialized_postgresql_tables_list`, then list of tables is always taken there.
+/// Otherwise we traverse materialized storages to find out the list.
+String DatabaseMaterializedPostgreSQL::getFormattedTablesList(const String & except) const
+{
+    String tables_list;
+    for (const auto & table : materialized_tables)
+    {
+        if (table.first == except)
+            continue;
+
+        if (!tables_list.empty())
+            tables_list += ',';
+
+        tables_list += table.first;
+    }
+    return tables_list;
+}
+
+
+ASTPtr DatabaseMaterializedPostgreSQL::getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const
+{
+    if (!local_context->hasQueryContext())
+        return DatabaseAtomic::getCreateTableQueryImpl(table_name, local_context, throw_on_error);
+
+    std::lock_guard lock(handler_mutex);
+
+    auto storage = StorageMaterializedPostgreSQL::create(StorageID(database_name, table_name), getContext(), remote_database_name, table_name);
+    auto ast_storage = replication_handler->getCreateNestedTableQuery(storage.get(), table_name);
+    assert_cast<ASTCreateQuery *>(ast_storage.get())->uuid = UUIDHelpers::generateV4();
+    return ast_storage;
+}
+
+
+ASTPtr DatabaseMaterializedPostgreSQL::createAlterSettingsQuery(const SettingChange & new_setting)
+{
+    auto set = std::make_shared<ASTSetQuery>();
+    set->is_standalone = false;
+    set->changes = {new_setting};
+
+    auto command = std::make_shared<ASTAlterCommand>();
+    command->type = ASTAlterCommand::Type::MODIFY_DATABASE_SETTING;
+    command->settings_changes = std::move(set);
+
+    auto command_list = std::make_shared<ASTExpressionList>();
+    command_list->children.push_back(command);
+
+    auto query = std::make_shared<ASTAlterQuery>();
+    auto * alter = query->as<ASTAlterQuery>();
+
+    alter->alter_object = ASTAlterQuery::AlterObjectType::DATABASE;
+    alter->database = database_name;
+    alter->set(alter->command_list, command_list);
+
+    return query;
+}
+
+
 void DatabaseMaterializedPostgreSQL::createTable(ContextPtr local_context, const String & table_name, const StoragePtr & table, const ASTPtr & query)
 {
     /// Create table query can only be called from replication thread.
@@ -164,8 +254,123 @@ void DatabaseMaterializedPostgreSQL::createTable(ContextPtr local_context, const
         return;
     }
 
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-        "Create table query allowed only for ReplacingMergeTree engine and from synchronization thread");
+    const auto & create = query->as<ASTCreateQuery>();
+    if (!create->attach)
+        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "CREATE TABLE is not allowed for database engine {}. Use ATTACH TABLE instead", getEngineName());
+
+    /// Create ReplacingMergeTree table.
+    auto query_copy = query->clone();
+    auto * create_query = assert_cast<ASTCreateQuery *>(query_copy.get());
+    create_query->attach = false;
+    create_query->attach_short_syntax = false;
+    DatabaseAtomic::createTable(StorageMaterializedPostgreSQL::makeNestedTableContext(local_context), table_name, table, query_copy);
+
+    /// Attach MaterializedPostgreSQL table.
+    attachTable(table_name, table, {});
+}
+
+
+void DatabaseMaterializedPostgreSQL::attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path)
+{
+    /// If there is query context then we need to attach materialized storage.
+    /// If there is no query context then we need to attach internal storage from atomic database.
+    if (CurrentThread::isInitialized() && CurrentThread::get().getQueryContext())
+    {
+        auto current_context = Context::createCopy(getContext()->getGlobalContext());
+        current_context->setInternalQuery(true);
+
+        /// We just came from createTable() and created nested table there. Add assert.
+        auto nested_table = DatabaseAtomic::tryGetTable(table_name, current_context);
+        assert(nested_table != nullptr);
+
+        try
+        {
+            auto tables_to_replicate = settings->materialized_postgresql_tables_list.value;
+            if (tables_to_replicate.empty())
+                tables_to_replicate = getFormattedTablesList();
+
+            /// tables_to_replicate can be empty if postgres database had no tables when this database was created.
+            SettingChange new_setting("materialized_postgresql_tables_list", tables_to_replicate.empty() ? table_name : (tables_to_replicate + "," + table_name));
+            auto alter_query = createAlterSettingsQuery(new_setting);
+
+            InterpreterAlterQuery(alter_query, current_context).execute();
+
+            auto storage = StorageMaterializedPostgreSQL::create(table, getContext(), remote_database_name, table_name);
+            materialized_tables[table_name] = storage;
+
+            std::lock_guard lock(handler_mutex);
+            replication_handler->addTableToReplication(dynamic_cast<StorageMaterializedPostgreSQL *>(storage.get()), table_name);
+        }
+        catch (...)
+        {
+            /// This is a failed attach table. Remove already created nested table.
+            DatabaseAtomic::dropTable(current_context, table_name, true);
+            throw;
+        }
+    }
+    else
+    {
+        DatabaseAtomic::attachTable(table_name, table, relative_table_path);
+    }
+}
+
+
+StoragePtr DatabaseMaterializedPostgreSQL::detachTable(const String & table_name)
+{
+    /// If there is query context then we need to detach materialized storage.
+    /// If there is no query context then we need to detach internal storage from atomic database.
+    if (CurrentThread::isInitialized() && CurrentThread::get().getQueryContext())
+    {
+        auto & table_to_delete = materialized_tables[table_name];
+        if (!table_to_delete)
+            throw Exception(ErrorCodes::UNKNOWN_TABLE, "Materialized table `{}` does not exist", table_name);
+
+        auto tables_to_replicate = getFormattedTablesList(table_name);
+
+        /// tables_to_replicate can be empty if postgres database had no tables when this database was created.
+        SettingChange new_setting("materialized_postgresql_tables_list", tables_to_replicate);
+        auto alter_query = createAlterSettingsQuery(new_setting);
+
+        {
+            auto current_context = Context::createCopy(getContext()->getGlobalContext());
+            current_context->setInternalQuery(true);
+            InterpreterAlterQuery(alter_query, current_context).execute();
+        }
+
+        auto nested = table_to_delete->as<StorageMaterializedPostgreSQL>()->getNested();
+        if (!nested)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Inner table `{}` does not exist", table_name);
+
+        std::lock_guard lock(handler_mutex);
+        replication_handler->removeTableFromReplication(table_name);
+
+        try
+        {
+            auto current_context = Context::createCopy(getContext()->getGlobalContext());
+            current_context->makeQueryContext();
+            DatabaseAtomic::dropTable(current_context, table_name, true);
+        }
+        catch (Exception & e)
+        {
+            /// We already removed this table from replication and adding it back will be an overkill..
+            /// TODO: this is bad, we leave a table lying somewhere not dropped, and if user will want
+            /// to move it back into replication, he will fail to do so because there is undropped nested with the same name.
+            /// This can also happen if we crash after removing table from replication and before dropping nested.
+            /// As a solution, we could drop a table if it already exists and add a fresh one instead for these two cases.
+            /// TODO: sounds good.
+            materialized_tables.erase(table_name);
+
+            e.addMessage("while removing table `" + table_name + "` from replication");
+            throw;
+        }
+
+        materialized_tables.erase(table_name);
+        return nullptr;
+    }
+    else
+    {
+        return DatabaseAtomic::detachTable(table_name);
+    }
 }
 
 
@@ -178,6 +383,7 @@ void DatabaseMaterializedPostgreSQL::shutdown()
 
 void DatabaseMaterializedPostgreSQL::stopReplication()
 {
+    std::lock_guard lock(handler_mutex);
     if (replication_handler)
         replication_handler->shutdown();
 
@@ -195,6 +401,7 @@ void DatabaseMaterializedPostgreSQL::dropTable(ContextPtr local_context, const S
 
 void DatabaseMaterializedPostgreSQL::drop(ContextPtr local_context)
 {
+    std::lock_guard lock(handler_mutex);
     if (replication_handler)
         replication_handler->shutdownFinal();
 
@@ -203,13 +410,12 @@ void DatabaseMaterializedPostgreSQL::drop(ContextPtr local_context)
 
 
 DatabaseTablesIteratorPtr DatabaseMaterializedPostgreSQL::getTablesIterator(
-        ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name)
+    ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const
 {
     /// Modify context into nested_context and pass query to Atomic database.
     return DatabaseAtomic::getTablesIterator(StorageMaterializedPostgreSQL::makeNestedTableContext(local_context), filter_by_table_name);
 }
 
-
 }
 
 #endif
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
index 7ca84f079ed..25e32fb0312 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
@@ -32,7 +30,6 @@ public:
         ContextPtr context_,
         const String & metadata_path_,
         UUID uuid_,
-        const ASTStorage * database_engine_define_,
         bool is_attach_,
         const String & database_name_,
         const String & postgres_database_name,
@@ -43,14 +40,18 @@ public:
 
     String getMetadataPath() const override { return metadata_path; }
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach) override;
+    void startupTables(ThreadPool & thread_pool, bool force_restore, bool force_attach) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(
-            ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr
+    getTablesIterator(ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
 
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
-    void createTable(ContextPtr context, const String & name, const StoragePtr & table, const ASTPtr & query) override;
+    void createTable(ContextPtr context, const String & table_name, const StoragePtr & table, const ASTPtr & query) override;
+
+    void attachTable(const String & table_name, const StoragePtr & table, const String & relative_table_path) override;
+
+    StoragePtr detachTable(const String & table_name) override;
 
     void dropTable(ContextPtr local_context, const String & name, bool no_delay) override;
 
@@ -58,12 +59,22 @@ public:
 
     void stopReplication();
 
+    void applySettingsChanges(const SettingsChanges & settings_changes, ContextPtr query_context) override;
+
     void shutdown() override;
 
+    String getPostgreSQLDatabaseName() const { return remote_database_name; }
+
+protected:
+    ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr local_context, bool throw_on_error) const override;
+
 private:
     void startSynchronization();
 
-    ASTPtr database_engine_define;
+    ASTPtr createAlterSettingsQuery(const SettingChange & new_setting);
+
+    String getFormattedTablesList(const String & except = {}) const;
+
     bool is_attach;
     String remote_database_name;
     postgres::ConnectionInfo connection_info;
@@ -72,6 +83,7 @@ private:
     std::shared_ptr<PostgreSQLReplicationHandler> replication_handler;
     std::map<std::string, StoragePtr> materialized_tables;
     mutable std::mutex tables_mutex;
+    mutable std::mutex handler_mutex;
 };
 
 }
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index c8ef5a44682..5d3493d0c82 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -39,14 +39,14 @@ DatabasePostgreSQL::DatabasePostgreSQL(
         const String & metadata_path_,
         const ASTStorage * database_engine_define_,
         const String & dbname_,
-        const String & postgres_dbname,
+        const StoragePostgreSQLConfiguration & configuration_,
         postgres::PoolWithFailoverPtr pool_,
         bool cache_tables_)
     : IDatabase(dbname_)
     , WithContext(context_->getGlobalContext())
     , metadata_path(metadata_path_)
     , database_engine_define(database_engine_define_->clone())
-    , dbname(postgres_dbname)
+    , configuration(configuration_)
     , pool(std::move(pool_))
     , cache_tables(cache_tables_)
 {
@@ -55,12 +55,29 @@ DatabasePostgreSQL::DatabasePostgreSQL(
 }
 
 
+String DatabasePostgreSQL::getTableNameForLogs(const String & table_name) const
+{
+    if (configuration.schema.empty())
+        return fmt::format("{}.{}", configuration.database, table_name);
+    return fmt::format("{}.{}.{}", configuration.database, configuration.schema, table_name);
+}
+
+
+String DatabasePostgreSQL::formatTableName(const String & table_name, bool quoted) const
+{
+    if (configuration.schema.empty())
+        return quoted ? doubleQuoteString(table_name) : table_name;
+    return quoted ? fmt::format("{}.{}", doubleQuoteString(configuration.schema), doubleQuoteString(table_name))
+                  : fmt::format("{}.{}", configuration.schema, table_name);
+}
+
+
 bool DatabasePostgreSQL::empty() const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
     auto connection_holder = pool->get();
-    auto tables_list = fetchPostgreSQLTablesList(connection_holder->get());
+    auto tables_list = fetchPostgreSQLTablesList(connection_holder->get(), configuration.schema);
 
     for (const auto & table_name : tables_list)
         if (!detached_or_dropped.count(table_name))
@@ -70,17 +87,26 @@ bool DatabasePostgreSQL::empty() const
 }
 
 
-DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & /* filter_by_table_name */)
+DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & /* filter_by_table_name */) const
 {
     std::lock_guard<std::mutex> lock(mutex);
-
     Tables tables;
-    auto connection_holder = pool->get();
-    auto table_names = fetchPostgreSQLTablesList(connection_holder->get());
 
-    for (const auto & table_name : table_names)
-        if (!detached_or_dropped.count(table_name))
-            tables[table_name] = fetchTable(table_name, local_context, true);
+    /// Do not allow to throw here, because this might be, for example, a query to system.tables.
+    /// It must not fail on case of some postgres error.
+    try
+    {
+        auto connection_holder = pool->get();
+        auto table_names = fetchPostgreSQLTablesList(connection_holder->get(), configuration.schema);
+
+        for (const auto & table_name : table_names)
+            if (!detached_or_dropped.count(table_name))
+                tables[table_name] = fetchTable(table_name, local_context, true);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
 
     return std::make_unique<DatabaseTablesSnapshotIterator>(tables, database_name);
 }
@@ -104,8 +130,11 @@ bool DatabasePostgreSQL::checkPostgresTable(const String & table_name) const
         pqxx::result result = tx.exec(fmt::format(
                     "SELECT '{}'::regclass, tablename "
                     "FROM pg_catalog.pg_tables "
-                    "WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema' "
-                    "AND tablename = '{}'", table_name, table_name));
+                    "WHERE schemaname != 'pg_catalog' AND {} "
+                    "AND tablename = '{}'",
+                    formatTableName(table_name),
+                    (configuration.schema.empty() ? "schemaname != 'information_schema'" : "schemaname = " + quoteString(configuration.schema)),
+                    formatTableName(table_name)));
     }
     catch (pqxx::undefined_table const &)
     {
@@ -143,7 +172,7 @@ StoragePtr DatabasePostgreSQL::tryGetTable(const String & table_name, ContextPtr
 }
 
 
-StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr local_context, const bool table_checked) const
+StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr, const bool table_checked) const
 {
     if (!cache_tables || !cached_tables.count(table_name))
     {
@@ -151,14 +180,14 @@ StoragePtr DatabasePostgreSQL::fetchTable(const String & table_name, ContextPtr
             return StoragePtr{};
 
         auto connection_holder = pool->get();
-        auto columns = fetchPostgreSQLTableStructure(connection_holder->get(), doubleQuoteString(table_name)).columns;
+        auto columns = fetchPostgreSQLTableStructure(connection_holder->get(), table_name, configuration.schema).columns;
 
         if (!columns)
             return StoragePtr{};
 
         auto storage = StoragePostgreSQL::create(
                 StorageID(database_name, table_name), pool, table_name,
-                ColumnsDescription{*columns}, ConstraintsDescription{}, String{}, local_context);
+                ColumnsDescription{*columns}, ConstraintsDescription{}, String{}, configuration.schema, configuration.on_conflict);
 
         if (cache_tables)
             cached_tables[table_name] = storage;
@@ -182,10 +211,14 @@ void DatabasePostgreSQL::attachTable(const String & table_name, const StoragePtr
     std::lock_guard<std::mutex> lock{mutex};
 
     if (!checkPostgresTable(table_name))
-        throw Exception(fmt::format("Cannot attach table {}.{} because it does not exist", database_name, table_name), ErrorCodes::UNKNOWN_TABLE);
+        throw Exception(ErrorCodes::UNKNOWN_TABLE,
+                        "Cannot attach PostgreSQL table {} because it does not exist in PostgreSQL",
+                        getTableNameForLogs(table_name), database_name);
 
     if (!detached_or_dropped.count(table_name))
-        throw Exception(fmt::format("Cannot attach table {}.{}. It already exists", database_name, table_name), ErrorCodes::TABLE_ALREADY_EXISTS);
+        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS,
+                        "Cannot attach PostgreSQL table {} because it already exists",
+                        getTableNameForLogs(table_name), database_name);
 
     if (cache_tables)
         cached_tables[table_name] = storage;
@@ -203,10 +236,10 @@ StoragePtr DatabasePostgreSQL::detachTable(const String & table_name)
     std::lock_guard<std::mutex> lock{mutex};
 
     if (detached_or_dropped.count(table_name))
-        throw Exception(fmt::format("Cannot detach table {}.{}. It is already dropped/detached", database_name, table_name), ErrorCodes::TABLE_IS_DROPPED);
+        throw Exception(ErrorCodes::TABLE_IS_DROPPED, "Cannot detach table {}. It is already dropped/detached", getTableNameForLogs(table_name));
 
     if (!checkPostgresTable(table_name))
-        throw Exception(fmt::format("Cannot detach table {}.{} because it does not exist", database_name, table_name), ErrorCodes::UNKNOWN_TABLE);
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Cannot detach table {}, because it does not exist", getTableNameForLogs(table_name));
 
     if (cache_tables)
         cached_tables.erase(table_name);
@@ -234,10 +267,10 @@ void DatabasePostgreSQL::dropTable(ContextPtr, const String & table_name, bool /
     std::lock_guard<std::mutex> lock{mutex};
 
     if (!checkPostgresTable(table_name))
-        throw Exception(fmt::format("Cannot drop table {}.{} because it does not exist", database_name, table_name), ErrorCodes::UNKNOWN_TABLE);
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "Cannot drop table {} because it does not exist", getTableNameForLogs(table_name));
 
     if (detached_or_dropped.count(table_name))
-        throw Exception(fmt::format("Table {}.{} is already dropped/detached", database_name, table_name), ErrorCodes::TABLE_IS_DROPPED);
+        throw Exception(ErrorCodes::TABLE_IS_DROPPED, "Table {} is already dropped/detached", getTableNameForLogs(table_name));
 
     fs::path mark_table_removed = fs::path(getMetadataPath()) / (escapeForFileName(table_name) + suffix);
     FS::createFile(mark_table_removed);
@@ -255,7 +288,7 @@ void DatabasePostgreSQL::drop(ContextPtr /*context*/)
 }
 
 
-void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, bool, bool /*force_attach*/)
+void DatabasePostgreSQL::loadStoredObjects(ContextMutablePtr /* context */, bool, bool /*force_attach*/, bool /* skip_startup_tables */)
 {
     {
         std::lock_guard<std::mutex> lock{mutex};
@@ -281,7 +314,7 @@ void DatabasePostgreSQL::removeOutdatedTables()
 {
     std::lock_guard<std::mutex> lock{mutex};
     auto connection_holder = pool->get();
-    auto actual_tables = fetchPostgreSQLTablesList(connection_holder->get());
+    auto actual_tables = fetchPostgreSQLTablesList(connection_holder->get(), configuration.schema);
 
     if (cache_tables)
     {
@@ -324,6 +357,10 @@ ASTPtr DatabasePostgreSQL::getCreateDatabaseQuery() const
     const auto & create_query = std::make_shared<ASTCreateQuery>();
     create_query->database = getDatabaseName();
     create_query->set(create_query->storage, database_engine_define);
+
+    if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
+        create_query->set(create_query->comment, std::make_shared<ASTLiteral>(comment_value));
+
     return create_query;
 }
 
@@ -334,7 +371,7 @@ ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, Co
     if (!storage)
     {
         if (throw_on_error)
-            throw Exception(fmt::format("PostgreSQL table {}.{} does not exist", database_name, table_name), ErrorCodes::UNKNOWN_TABLE);
+            throw Exception(ErrorCodes::UNKNOWN_TABLE, "PostgreSQL table {} does not exist", getTableNameForLogs(table_name));
 
         return nullptr;
     }
@@ -367,9 +404,9 @@ ASTPtr DatabasePostgreSQL::getCreateTableQueryImpl(const String & table_name, Co
     ASTs storage_children = ast_storage->children;
     auto storage_engine_arguments = ast_storage->engine->arguments;
 
-    /// Remove extra engine argument (`use_table_cache`)
-    if (storage_engine_arguments->children.size() > 4)
-        storage_engine_arguments->children.resize(storage_engine_arguments->children.size() - 1);
+    /// Remove extra engine argument (`schema` and `use_table_cache`)
+    if (storage_engine_arguments->children.size() >= 5)
+        storage_engine_arguments->children.resize(4);
 
     /// Add table_name to engine arguments
     assert(storage_engine_arguments->children.size() >= 2);
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index ea465390099..f801f9585d6 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 
@@ -10,7 +8,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
-
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace DB
 {
@@ -32,7 +30,7 @@ public:
         const String & metadata_path_,
         const ASTStorage * database_engine_define,
         const String & dbname_,
-        const String & postgres_dbname,
+        const StoragePostgreSQLConfiguration & configuration,
         postgres::PoolWithFailoverPtr pool_,
         bool cache_tables_);
 
@@ -47,9 +45,9 @@ public:
 
     bool empty() const override;
 
-    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach) override;
+    void loadStoredObjects(ContextMutablePtr, bool, bool force_attach, bool skip_startup_tables) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
     bool isTableExist(const String & name, ContextPtr context) const override;
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
@@ -69,7 +67,7 @@ protected:
 private:
     String metadata_path;
     ASTPtr database_engine_define;
-    String dbname;
+    StoragePostgreSQLConfiguration configuration;
     postgres::PoolWithFailoverPtr pool;
     const bool cache_tables;
 
@@ -77,6 +75,10 @@ private:
     std::unordered_set<std::string> detached_or_dropped;
     BackgroundSchedulePool::TaskHolder cleaner_task;
 
+    String getTableNameForLogs(const String & table_name) const;
+
+    String formatTableName(const String & table_name, bool quoted = true) const;
+
     bool checkPostgresTable(const String & table_name) const;
 
     StoragePtr fetchTable(const String & table_name, ContextPtr context, const bool table_checked) const;
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index a5eccc817d0..16e7ce89579 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -14,6 +14,7 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <Common/quoteString.h>
 #include <Core/PostgreSQL/Utils.h>
+#include <base/FnTraits.h>
 
 
 namespace DB
@@ -27,11 +28,12 @@ namespace ErrorCodes
 
 
 template<typename T>
-std::unordered_set<std::string> fetchPostgreSQLTablesList(T & tx)
+std::set<String> fetchPostgreSQLTablesList(T & tx, const String & postgres_schema)
 {
-    std::unordered_set<std::string> tables;
-    std::string query = "SELECT tablename FROM pg_catalog.pg_tables "
-        "WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'";
+    std::set<String> tables;
+    std::string query = fmt::format("SELECT tablename FROM pg_catalog.pg_tables "
+                                    "WHERE schemaname != 'pg_catalog' AND {}",
+                                    postgres_schema.empty() ? "schemaname != 'information_schema'" : "schemaname = " + quoteString(postgres_schema));
 
     for (auto table_name : tx.template stream<std::string>(query))
         tables.insert(std::get<0>(table_name));
@@ -40,7 +42,7 @@ std::unordered_set<std::string> fetchPostgreSQLTablesList(T & tx)
 }
 
 
-static DataTypePtr convertPostgreSQLDataType(String & type, const std::function<void()> & recheck_array, bool is_nullable = false, uint16_t dimensions = 0)
+static DataTypePtr convertPostgreSQLDataType(String & type, Fn<void()> auto && recheck_array, bool is_nullable = false, uint16_t dimensions = 0)
 {
     DataTypePtr res;
     bool is_array = false;
@@ -133,7 +135,7 @@ static DataTypePtr convertPostgreSQLDataType(String & type, const std::function<
 
 template<typename T>
 std::shared_ptr<NamesAndTypesList> readNamesAndTypesList(
-        T & tx, const String & postgres_table_name, const String & query, bool use_nulls, bool only_names_and_types)
+        T & tx, const String & postgres_table, const String & query, bool use_nulls, bool only_names_and_types)
 {
     auto columns = NamesAndTypes();
 
@@ -178,7 +180,7 @@ std::shared_ptr<NamesAndTypesList> readNamesAndTypesList(
 
             /// All rows must contain the same number of dimensions, so limit 1 is ok. If number of dimensions in all rows is not the same -
             /// such arrays are not able to be used as ClickHouse Array at all.
-            pqxx::result result{tx.exec(fmt::format("SELECT array_ndims({}) FROM {} LIMIT 1", name_and_type.name, postgres_table_name))};
+            pqxx::result result{tx.exec(fmt::format("SELECT array_ndims({}) FROM {} LIMIT 1", name_and_type.name, postgres_table))};
             auto dimensions = result[0][0].as<int>();
 
             /// It is always 1d array if it is in recheck.
@@ -189,10 +191,13 @@ std::shared_ptr<NamesAndTypesList> readNamesAndTypesList(
             columns[i] = NameAndTypePair(name_and_type.name, type);
         }
     }
-
     catch (const pqxx::undefined_table &)
     {
-        throw Exception(ErrorCodes::UNKNOWN_TABLE, "PostgreSQL table {} does not exist", postgres_table_name);
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "PostgreSQL table {} does not exist", postgres_table);
+    }
+    catch (const pqxx::syntax_error & e)
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Error: {} (in query: {})", e.what(), query);
     }
     catch (Exception & e)
     {
@@ -206,18 +211,27 @@ std::shared_ptr<NamesAndTypesList> readNamesAndTypesList(
 
 template<typename T>
 PostgreSQLTableStructure fetchPostgreSQLTableStructure(
-        T & tx, const String & postgres_table_name, bool use_nulls, bool with_primary_key, bool with_replica_identity_index)
+        T & tx, const String & postgres_table, const String & postgres_schema, bool use_nulls, bool with_primary_key, bool with_replica_identity_index)
 {
     PostgreSQLTableStructure table;
 
+    auto where = fmt::format("relname = {}", quoteString(postgres_table));
+    if (postgres_schema.empty())
+        where += " AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')";
+    else
+        where += fmt::format(" AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = {})", quoteString(postgres_schema));
+
     std::string query = fmt::format(
            "SELECT attname AS name, format_type(atttypid, atttypmod) AS type, "
            "attnotnull AS not_null, attndims AS dims "
            "FROM pg_attribute "
-           "WHERE attrelid = {}::regclass "
-           "AND NOT attisdropped AND attnum > 0", quoteString(postgres_table_name));
+           "WHERE attrelid = (SELECT oid FROM pg_class WHERE {}) "
+           "AND NOT attisdropped AND attnum > 0", where);
 
-    table.columns = readNamesAndTypesList(tx, postgres_table_name, query, use_nulls, false);
+    table.columns = readNamesAndTypesList(tx, postgres_table, query, use_nulls, false);
+
+    if (!table.columns)
+        throw Exception(ErrorCodes::UNKNOWN_TABLE, "PostgreSQL table {} does not exist", postgres_table);
 
     if (with_primary_key)
     {
@@ -227,9 +241,9 @@ PostgreSQLTableStructure fetchPostgreSQLTableStructure(
                 "FROM pg_index i "
                 "JOIN pg_attribute a ON a.attrelid = i.indrelid "
                 "AND a.attnum = ANY(i.indkey) "
-                "WHERE  i.indrelid = {}::regclass AND i.indisprimary", quoteString(postgres_table_name));
+                "WHERE attrelid = (SELECT oid FROM pg_class WHERE {}) AND i.indisprimary", where);
 
-        table.primary_key_columns = readNamesAndTypesList(tx, postgres_table_name, query, use_nulls, true);
+        table.primary_key_columns = readNamesAndTypesList(tx, postgres_table, query, use_nulls, true);
     }
 
     if (with_replica_identity_index && !table.primary_key_columns)
@@ -248,32 +262,32 @@ PostgreSQLTableStructure fetchPostgreSQLTableStructure(
             "and i.oid = ix.indexrelid "
             "and a.attrelid = t.oid "
             "and a.attnum = ANY(ix.indkey) "
-            "and t.relkind = 'r' " /// simple tables
+            "and t.relkind in ('r', 'p') " /// simple tables
             "and t.relname = {} " /// Connection is already done to a needed database, only table name is needed.
             "and ix.indisreplident = 't' " /// index is is replica identity index
             "ORDER BY a.attname", /// column names
-        quoteString(postgres_table_name));
+        quoteString(postgres_table));
 
-        table.replica_identity_columns = readNamesAndTypesList(tx, postgres_table_name, query, use_nulls, true);
+        table.replica_identity_columns = readNamesAndTypesList(tx, postgres_table, query, use_nulls, true);
     }
 
     return table;
 }
 
 
-PostgreSQLTableStructure fetchPostgreSQLTableStructure(pqxx::connection & connection, const String & postgres_table_name, bool use_nulls)
+PostgreSQLTableStructure fetchPostgreSQLTableStructure(pqxx::connection & connection, const String & postgres_table, const String & postgres_schema, bool use_nulls)
 {
     pqxx::ReadTransaction tx(connection);
-    auto result = fetchPostgreSQLTableStructure(tx, postgres_table_name, use_nulls, false, false);
+    auto result = fetchPostgreSQLTableStructure(tx, postgres_table, postgres_schema, use_nulls, false, false);
     tx.commit();
     return result;
 }
 
 
-std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::connection & connection)
+std::set<String> fetchPostgreSQLTablesList(pqxx::connection & connection, const String & postgres_schema)
 {
     pqxx::ReadTransaction tx(connection);
-    auto result = fetchPostgreSQLTablesList(tx);
+    auto result = fetchPostgreSQLTablesList(tx, postgres_schema);
     tx.commit();
     return result;
 }
@@ -281,19 +295,27 @@ std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::connection & con
 
 template
 PostgreSQLTableStructure fetchPostgreSQLTableStructure(
-        pqxx::ReadTransaction & tx, const String & postgres_table_name, bool use_nulls,
-        bool with_primary_key, bool with_replica_identity_index);
+        pqxx::ReadTransaction & tx, const String & postgres_table, const String & postgres_schema,
+        bool use_nulls, bool with_primary_key, bool with_replica_identity_index);
 
 template
 PostgreSQLTableStructure fetchPostgreSQLTableStructure(
-        pqxx::ReplicationTransaction & tx, const String & postgres_table_name, bool use_nulls,
-        bool with_primary_key, bool with_replica_identity_index);
+        pqxx::ReplicationTransaction & tx, const String & postgres_table, const String & postgres_schema,
+        bool use_nulls, bool with_primary_key, bool with_replica_identity_index);
 
 template
-std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::work & tx);
+PostgreSQLTableStructure fetchPostgreSQLTableStructure(
+        pqxx::nontransaction & tx, const String & postgres_table, const String & postrges_schema,
+        bool use_nulls, bool with_primary_key, bool with_replica_identity_index);
 
 template
-std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::ReadTransaction & tx);
+std::set<String> fetchPostgreSQLTablesList(pqxx::work & tx, const String & postgres_schema);
+
+template
+std::set<String> fetchPostgreSQLTablesList(pqxx::ReadTransaction & tx, const String & postgres_schema);
+
+template
+std::set<String> fetchPostgreSQLTablesList(pqxx::nontransaction & tx, const String & postgres_schema);
 
 }
 
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
index 07562cd69fa..19871234e28 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 #include <Core/PostgreSQL/ConnectionHolder.h>
@@ -21,18 +19,18 @@ struct PostgreSQLTableStructure
 
 using PostgreSQLTableStructurePtr = std::unique_ptr<PostgreSQLTableStructure>;
 
-std::unordered_set<std::string> fetchPostgreSQLTablesList(pqxx::connection & connection);
+std::set<String> fetchPostgreSQLTablesList(pqxx::connection & connection, const String & postgres_schema);
 
 PostgreSQLTableStructure fetchPostgreSQLTableStructure(
-    pqxx::connection & connection, const String & postgres_table_name, bool use_nulls = true);
+    pqxx::connection & connection, const String & postgres_table, const String & postgres_schema, bool use_nulls = true);
 
 template<typename T>
 PostgreSQLTableStructure fetchPostgreSQLTableStructure(
-    T & tx, const String & postgres_table_name, bool use_nulls = true,
+    T & tx, const String & postgres_table, const String & postgres_schema, bool use_nulls = true,
     bool with_primary_key = false, bool with_replica_identity_index = false);
 
 template<typename T>
-std::unordered_set<std::string> fetchPostgreSQLTablesList(T & tx);
+std::set<String> fetchPostgreSQLTablesList(T & tx, const String & postgres_schema);
 
 }
 
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index b3966288316..05bc2f24834 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -2,7 +2,7 @@
 
 #if USE_SQLITE
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Databases/SQLite/fetchSQLiteTableStructure.h>
@@ -44,7 +44,7 @@ bool DatabaseSQLite::empty() const
 }
 
 
-DatabaseTablesIteratorPtr DatabaseSQLite::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction &)
+DatabaseTablesIteratorPtr DatabaseSQLite::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction &) const
 {
     std::lock_guard<std::mutex> lock(mutex);
 
@@ -162,6 +162,10 @@ ASTPtr DatabaseSQLite::getCreateDatabaseQuery() const
     const auto & create_query = std::make_shared<ASTCreateQuery>();
     create_query->database = getDatabaseName();
     create_query->set(create_query->storage, database_engine_define);
+
+    if (const auto comment_value = getDatabaseComment(); !comment_value.empty())
+        create_query->set(create_query->comment, std::make_shared<ASTLiteral>(comment_value));
+
     return create_query;
 }
 
diff --git a/src/Databases/SQLite/DatabaseSQLite.h b/src/Databases/SQLite/DatabaseSQLite.h
index a754b56f8ed..d0b8d582844 100644
--- a/src/Databases/SQLite/DatabaseSQLite.h
+++ b/src/Databases/SQLite/DatabaseSQLite.h
@@ -1,15 +1,13 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_SQLITE
 #include <Core/Names.h>
 #include <Databases/DatabasesCommon.h>
 #include <Parsers/ASTCreateQuery.h>
 
-#include <sqlite3.h> // Y_IGNORE
+#include <sqlite3.h>
 
 
 namespace DB
@@ -34,7 +32,7 @@ public:
 
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
 
     bool empty() const override;
 
diff --git a/src/Databases/SQLite/SQLiteUtils.cpp b/src/Databases/SQLite/SQLiteUtils.cpp
index 3046eea0b56..954576d9c05 100644
--- a/src/Databases/SQLite/SQLiteUtils.cpp
+++ b/src/Databases/SQLite/SQLiteUtils.cpp
@@ -1,7 +1,7 @@
 #include "SQLiteUtils.h"
 
 #if USE_SQLITE
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
diff --git a/src/Databases/SQLite/SQLiteUtils.h b/src/Databases/SQLite/SQLiteUtils.h
index 35f00904d0d..09119b3f145 100644
--- a/src/Databases/SQLite/SQLiteUtils.h
+++ b/src/Databases/SQLite/SQLiteUtils.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_SQLITE
 #include <Core/Types.h>
 #include <Interpreters/Context.h>
-#include <sqlite3.h> // Y_IGNORE
+#include <sqlite3.h>
 
 
 namespace DB
diff --git a/src/Databases/SQLite/fetchSQLiteTableStructure.h b/src/Databases/SQLite/fetchSQLiteTableStructure.h
index 80f50173e5e..dbdf35be4bb 100644
--- a/src/Databases/SQLite/fetchSQLiteTableStructure.h
+++ b/src/Databases/SQLite/fetchSQLiteTableStructure.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_SQLITE
 
 #include <Storages/StorageSQLite.h>
-#include <sqlite3.h> // Y_IGNORE
+#include <sqlite3.h>
 
 
 namespace DB
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
new file mode 100644
index 00000000000..cd0e0609c15
--- /dev/null
+++ b/src/Databases/TablesLoader.cpp
@@ -0,0 +1,255 @@
+#include <Databases/TablesLoader.h>
+#include <Databases/IDatabase.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <base/logger_useful.h>
+#include <Common/ThreadPool.h>
+#include <numeric>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INFINITE_LOOP;
+    extern const int LOGICAL_ERROR;
+}
+
+static constexpr size_t PRINT_MESSAGE_EACH_N_OBJECTS = 256;
+static constexpr size_t PRINT_MESSAGE_EACH_N_SECONDS = 5;
+
+
+void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch)
+{
+    if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
+    {
+        LOG_INFO(log, "{}%", processed * 100.0 / total);
+        watch.restart();
+    }
+}
+
+TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_, bool force_attach_)
+: global_context(global_context_)
+, databases(std::move(databases_))
+, force_restore(force_restore_)
+, force_attach(force_attach_)
+{
+    metadata.default_database = global_context->getCurrentDatabase();
+    log = &Poco::Logger::get("TablesLoader");
+}
+
+
+void TablesLoader::loadTables()
+{
+    bool need_resolve_dependencies = !global_context->getConfigRef().has("ignore_table_dependencies_on_metadata_loading");
+
+    /// Load all Lazy, MySQl, PostgreSQL, SQLite, etc databases first.
+    for (auto & database : databases)
+    {
+        if (need_resolve_dependencies && database.second->supportsLoadingInTopologicalOrder())
+            databases_to_load.push_back(database.first);
+        else
+            database.second->loadStoredObjects(global_context, force_restore, force_attach, true);
+    }
+
+    if (databases_to_load.empty())
+        return;
+
+    /// Read and parse metadata from Ordinary, Atomic, Materialized*, Replicated, etc databases. Build dependency graph.
+    for (auto & database_name : databases_to_load)
+    {
+        databases[database_name]->beforeLoadingMetadata(global_context, force_restore, force_attach);
+        databases[database_name]->loadTablesMetadata(global_context, metadata);
+    }
+
+    LOG_INFO(log, "Parsed metadata of {} tables in {} databases in {} sec",
+             metadata.parsed_tables.size(), databases_to_load.size(), stopwatch.elapsedSeconds());
+
+    stopwatch.restart();
+
+    logDependencyGraph();
+
+    /// Some tables were loaded by database with loadStoredObjects(...). Remove them from graph if necessary.
+    removeUnresolvableDependencies();
+
+    loadTablesInTopologicalOrder(pool);
+}
+
+void TablesLoader::startupTables()
+{
+    /// Startup tables after all tables are loaded. Background tasks (merges, mutations, etc) may slow down data parts loading.
+    for (auto & database : databases)
+        database.second->startupTables(pool, force_restore, force_attach);
+}
+
+
+void TablesLoader::removeUnresolvableDependencies()
+{
+    auto need_exclude_dependency = [this](const QualifiedTableName & dependency_name, const DependenciesInfo & info)
+    {
+        /// Table exists and will be loaded
+        if (metadata.parsed_tables.contains(dependency_name))
+            return false;
+        /// Table exists and it's already loaded
+        if (DatabaseCatalog::instance().isTableExist(StorageID(dependency_name.database, dependency_name.table), global_context))
+            return true;
+        /// It's XML dictionary. It was loaded before tables and DDL dictionaries.
+        if (dependency_name.database == metadata.default_database &&
+            global_context->getExternalDictionariesLoader().has(dependency_name.table))
+            return true;
+
+        /// Some tables depends on table "dependency_name", but there is no such table in DatabaseCatalog and we don't have its metadata.
+        /// We will ignore it and try to load dependent tables without "dependency_name"
+        /// (but most likely dependent tables will fail to load).
+        LOG_WARNING(log, "Tables {} depend on {}, but seems like the it does not exist. Will ignore it and try to load existing tables",
+                    fmt::join(info.dependent_database_objects, ", "), dependency_name);
+
+        if (info.dependencies_count)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} does not exist, but we have seen its AST and found {} dependencies."
+                                                       "It's a bug", dependency_name, info.dependencies_count);
+        if (info.dependent_database_objects.empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} does not have dependencies and dependent tables as it expected to."
+                                                       "It's a bug", dependency_name);
+
+        return true;
+    };
+
+    auto table_it = metadata.dependencies_info.begin();
+    while (table_it != metadata.dependencies_info.end())
+    {
+        auto & info = table_it->second;
+        if (need_exclude_dependency(table_it->first, info))
+            table_it = removeResolvedDependency(table_it, metadata.independent_database_objects);
+        else
+            ++table_it;
+    }
+}
+
+void TablesLoader::loadTablesInTopologicalOrder(ThreadPool & pool)
+{
+    /// Load independent tables in parallel.
+    /// Then remove loaded tables from dependency graph, find tables/dictionaries that do not have unresolved dependencies anymore,
+    /// move them to the list of independent tables and load.
+    /// Repeat until we have some tables to load.
+    /// If we do not, then either all objects are loaded or there is cyclic dependency.
+    /// Complexity: O(V + E)
+    size_t level = 0;
+    do
+    {
+        assert(metadata.parsed_tables.size() == tables_processed + metadata.independent_database_objects.size() + getNumberOfTablesWithDependencies());
+        logDependencyGraph();
+
+        startLoadingIndependentTables(pool, level);
+
+        TableNames new_independent_database_objects;
+        for (const auto & table_name : metadata.independent_database_objects)
+        {
+            auto info_it = metadata.dependencies_info.find(table_name);
+            if (info_it == metadata.dependencies_info.end())
+            {
+                /// No tables depend on table_name and it was not even added to dependencies_info
+                continue;
+            }
+            removeResolvedDependency(info_it, new_independent_database_objects);
+        }
+
+        pool.wait();
+
+        metadata.independent_database_objects = std::move(new_independent_database_objects);
+        ++level;
+    } while (!metadata.independent_database_objects.empty());
+
+    checkCyclicDependencies();
+}
+
+DependenciesInfosIter TablesLoader::removeResolvedDependency(const DependenciesInfosIter & info_it, TableNames & independent_database_objects)
+{
+    auto & info = info_it->second;
+    if (info.dependencies_count)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} is in list of independent tables, but dependencies count is {}."
+                                                   "It's a bug", info_it->first, info.dependencies_count);
+    if (info.dependent_database_objects.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table {} does not have dependent tables. It's a bug", info_it->first);
+
+    /// Decrement number of dependencies for each dependent table
+    for (auto & dependent_table : info.dependent_database_objects)
+    {
+        auto & dependent_info = metadata.dependencies_info[dependent_table];
+        auto & dependencies_count = dependent_info.dependencies_count;
+        if (dependencies_count == 0)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to decrement 0 dependencies counter for {}. It's a bug", dependent_table);
+        --dependencies_count;
+        if (dependencies_count == 0)
+        {
+            independent_database_objects.push_back(dependent_table);
+            if (dependent_info.dependent_database_objects.empty())
+                metadata.dependencies_info.erase(dependent_table);
+        }
+    }
+
+    return metadata.dependencies_info.erase(info_it);
+}
+
+void TablesLoader::startLoadingIndependentTables(ThreadPool & pool, size_t level)
+{
+    size_t total_tables = metadata.parsed_tables.size();
+
+    LOG_INFO(log, "Loading {} tables with {} dependency level", metadata.independent_database_objects.size(), level);
+
+    for (const auto & table_name : metadata.independent_database_objects)
+    {
+        pool.scheduleOrThrowOnError([this, total_tables, &table_name]()
+        {
+            const auto & path_and_query = metadata.parsed_tables[table_name];
+            databases[table_name.database]->loadTableFromMetadata(global_context, path_and_query.path, table_name, path_and_query.ast, force_restore);
+            logAboutProgress(log, ++tables_processed, total_tables, stopwatch);
+        });
+    }
+}
+
+size_t TablesLoader::getNumberOfTablesWithDependencies() const
+{
+    size_t number_of_tables_with_dependencies = 0;
+    for (const auto & info : metadata.dependencies_info)
+        if (info.second.dependencies_count)
+            ++number_of_tables_with_dependencies;
+    return number_of_tables_with_dependencies;
+}
+
+void TablesLoader::checkCyclicDependencies() const
+{
+    /// Loading is finished if all dependencies are resolved
+    if (metadata.dependencies_info.empty())
+        return;
+
+    for (const auto & info : metadata.dependencies_info)
+    {
+        LOG_WARNING(log, "Cannot resolve dependencies: Table {} have {} dependencies and {} dependent tables. List of dependent tables: {}",
+                    info.first, info.second.dependencies_count,
+                    info.second.dependent_database_objects.size(), fmt::join(info.second.dependent_database_objects, ", "));
+        assert(info.second.dependencies_count == 0);
+    }
+
+    throw Exception(ErrorCodes::INFINITE_LOOP, "Cannot attach {} tables due to cyclic dependencies. "
+                                               "See server log for details.", metadata.dependencies_info.size());
+}
+
+void TablesLoader::logDependencyGraph() const
+{
+    LOG_TEST(log, "Have {} independent tables: {}",
+              metadata.independent_database_objects.size(),
+              fmt::join(metadata.independent_database_objects, ", "));
+    for (const auto & dependencies : metadata.dependencies_info)
+    {
+        LOG_TEST(log,
+            "Table {} have {} dependencies and {} dependent tables. List of dependent tables: {}",
+            dependencies.first,
+            dependencies.second.dependencies_count,
+            dependencies.second.dependent_database_objects.size(),
+            fmt::join(dependencies.second.dependent_database_objects, ", "));
+    }
+}
+
+}
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
new file mode 100644
index 00000000000..12f6c2e86a5
--- /dev/null
+++ b/src/Databases/TablesLoader.h
@@ -0,0 +1,112 @@
+#pragma once
+#include <Core/Types.h>
+#include <Core/QualifiedTableName.h>
+#include <Parsers/IAST_fwd.h>
+#include <Interpreters/Context_fwd.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <map>
+#include <unordered_map>
+#include <unordered_set>
+#include <mutex>
+
+namespace Poco
+{
+    class Logger;
+}
+
+class AtomicStopwatch;
+
+namespace DB
+{
+
+void logAboutProgress(Poco::Logger * log, size_t processed, size_t total, AtomicStopwatch & watch);
+
+
+class IDatabase;
+using DatabasePtr = std::shared_ptr<IDatabase>;
+
+struct ParsedTableMetadata
+{
+    String path;
+    ASTPtr ast;
+};
+
+using ParsedMetadata = std::map<QualifiedTableName, ParsedTableMetadata>;
+using TableNames = std::vector<QualifiedTableName>;
+
+struct DependenciesInfo
+{
+    /// How many dependencies this table have
+    size_t dependencies_count = 0;
+    /// List of tables/dictionaries which depend on this table/dictionary
+    TableNames dependent_database_objects;
+};
+
+using DependenciesInfos = std::unordered_map<QualifiedTableName, DependenciesInfo>;
+using DependenciesInfosIter = std::unordered_map<QualifiedTableName, DependenciesInfo>::iterator;
+
+struct ParsedTablesMetadata
+{
+    String default_database;
+
+    std::mutex mutex;
+    ParsedMetadata parsed_tables;
+
+    /// For logging
+    size_t total_dictionaries = 0;
+
+    /// List of tables/dictionaries that do not have any dependencies and can be loaded
+    TableNames independent_database_objects;
+
+    /// Actually it contains two different maps (with, probably, intersecting keys):
+    /// 1. table/dictionary name -> number of dependencies
+    /// 2. table/dictionary name -> dependent tables/dictionaries list (adjacency list of dependencies graph).
+    /// If table A depends on table B, then there is an edge B --> A, i.e. dependencies_info[B].dependent_database_objects contains A.
+    /// And dependencies_info[C].dependencies_count is a number of incoming edges for vertex C (how many tables we have to load before C).
+    DependenciesInfos dependencies_info;
+};
+
+/// Loads tables (and dictionaries) from specified databases
+/// taking into account dependencies between them.
+class TablesLoader
+{
+public:
+    using Databases = std::map<String, DatabasePtr>;
+
+    TablesLoader(ContextMutablePtr global_context_, Databases databases_, bool force_restore_ = false, bool force_attach_ = false);
+    TablesLoader() = delete;
+
+    void loadTables();
+    void startupTables();
+
+private:
+    ContextMutablePtr global_context;
+    Databases databases;
+    bool force_restore;
+    bool force_attach;
+
+    Strings databases_to_load;
+    ParsedTablesMetadata metadata;
+    Poco::Logger * log;
+    std::atomic<size_t> tables_processed{0};
+    AtomicStopwatch stopwatch;
+
+    ThreadPool pool;
+
+    void removeUnresolvableDependencies();
+
+    void loadTablesInTopologicalOrder(ThreadPool & pool);
+
+    DependenciesInfosIter removeResolvedDependency(const DependenciesInfosIter & info_it, TableNames & independent_database_objects);
+
+    void startLoadingIndependentTables(ThreadPool & pool, size_t level);
+
+    void checkCyclicDependencies() const;
+
+    size_t getNumberOfTablesWithDependencies() const;
+
+    void logDependencyGraph() const;
+};
+
+}
diff --git a/src/Databases/ya.make b/src/Databases/ya.make
deleted file mode 100644
index 34f47a5edf0..00000000000
--- a/src/Databases/ya.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    DatabaseAtomic.cpp
-    DatabaseDictionary.cpp
-    DatabaseFactory.cpp
-    DatabaseLazy.cpp
-    DatabaseMemory.cpp
-    DatabaseOnDisk.cpp
-    DatabaseOrdinary.cpp
-    DatabaseReplicated.cpp
-    DatabaseReplicatedSettings.cpp
-    DatabaseReplicatedWorker.cpp
-    DatabasesCommon.cpp
-    MySQL/ConnectionMySQLSettings.cpp
-    MySQL/DatabaseMaterializedMySQL.cpp
-    MySQL/DatabaseMySQL.cpp
-    MySQL/FetchTablesColumnsList.cpp
-    MySQL/MaterializeMetadata.cpp
-    MySQL/MaterializedMySQLSettings.cpp
-    MySQL/MaterializedMySQLSyncThread.cpp
-    SQLite/DatabaseSQLite.cpp
-    SQLite/SQLiteUtils.cpp
-    SQLite/fetchSQLiteTableStructure.cpp
-
-)
-
-END()
diff --git a/src/Databases/ya.make.in b/src/Databases/ya.make.in
deleted file mode 100644
index cb8b23b43af..00000000000
--- a/src/Databases/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F examples | grep -v -F 'PostgreSQL' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Dictionaries/CMakeLists.txt b/src/Dictionaries/CMakeLists.txt
index bc5f0dc9567..b1b3d6d55e0 100644
--- a/src/Dictionaries/CMakeLists.txt
+++ b/src/Dictionaries/CMakeLists.txt
@@ -10,6 +10,7 @@ if (CMAKE_BUILD_TYPE_UC STREQUAL "RELEASE" OR CMAKE_BUILD_TYPE_UC STREQUAL "RELW
     set_source_files_properties(
         FlatDictionary.cpp
         HashedDictionary.cpp
+        HashedArrayDictionary.cpp
         CacheDictionary.cpp
         RangeHashedDictionary.cpp
         DirectDictionary.cpp
diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index 8a8a64fab36..723457fba5b 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -1,7 +1,7 @@
 #include "CacheDictionary.h"
 
 #include <memory>
-#include <common/chrono_io.h>
+#include <base/chrono_io.h>
 
 #include <Core/Defines.h>
 #include <Common/CurrentMetrics.h>
@@ -10,26 +10,29 @@
 #include <Common/ProfileEvents.h>
 #include <Common/ProfilingScopedRWLock.h>
 
-#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <Dictionaries//DictionarySource.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+
 namespace ProfileEvents
 {
-extern const Event DictCacheKeysRequested;
-extern const Event DictCacheKeysRequestedMiss;
-extern const Event DictCacheKeysRequestedFound;
-extern const Event DictCacheKeysExpired;
-extern const Event DictCacheKeysNotFound;
-extern const Event DictCacheKeysHit;
-extern const Event DictCacheRequestTimeNs;
-extern const Event DictCacheRequests;
-extern const Event DictCacheLockWriteNs;
-extern const Event DictCacheLockReadNs;
+    extern const Event DictCacheKeysRequested;
+    extern const Event DictCacheKeysRequestedMiss;
+    extern const Event DictCacheKeysRequestedFound;
+    extern const Event DictCacheKeysExpired;
+    extern const Event DictCacheKeysNotFound;
+    extern const Event DictCacheKeysHit;
+    extern const Event DictCacheRequestTimeNs;
+    extern const Event DictCacheRequests;
+    extern const Event DictCacheLockWriteNs;
+    extern const Event DictCacheLockReadNs;
 }
 
 namespace CurrentMetrics
 {
-extern const Metric DictCacheRequests;
+    extern const Metric DictCacheRequests;
 }
 
 namespace DB
@@ -148,7 +151,7 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
     * use default value.
     */
 
-    if (dictionary_key_type == DictionaryKeyType::complex)
+    if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
     DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
@@ -265,7 +268,7 @@ ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::hasKeys(const Columns & k
     * Check that key was fetched during update for that key set true in result array.
     */
 
-    if (dictionary_key_type == DictionaryKeyType::complex)
+    if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
 
@@ -361,7 +364,7 @@ ColumnPtr CacheDictionary<dictionary_key_type>::getHierarchy(
     ColumnPtr key_column [[maybe_unused]],
     const DataTypePtr & key_type [[maybe_unused]]) const
 {
-    if (dictionary_key_type == DictionaryKeyType::simple)
+    if (dictionary_key_type == DictionaryKeyType::Simple)
     {
         size_t keys_found;
         auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type, keys_found);
@@ -379,7 +382,7 @@ ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::isInHierarchy(
     ColumnPtr in_key_column [[maybe_unused]],
     const DataTypePtr & key_type [[maybe_unused]]) const
 {
-    if (dictionary_key_type == DictionaryKeyType::simple)
+    if (dictionary_key_type == DictionaryKeyType::Simple)
     {
         size_t keys_found;
         auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type, keys_found);
@@ -481,24 +484,37 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumns(
 }
 
 template <DictionaryKeyType dictionary_key_type>
-BlockInputStreamPtr CacheDictionary<dictionary_key_type>::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+Pipe CacheDictionary<dictionary_key_type>::read(const Names & column_names, size_t max_block_size, size_t num_streams) const
 {
-    std::shared_ptr<DictionaryBlockInputStream> stream;
+    ColumnsWithTypeAndName key_columns;
 
     {
         /// Write lock on storage
         const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
-            stream = std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, cache_storage_ptr->getCachedSimpleKeys(), column_names);
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+        {
+            auto keys = cache_storage_ptr->getCachedSimpleKeys();
+            key_columns = {ColumnWithTypeAndName(getColumnFromPODArray(keys), std::make_shared<DataTypeUInt64>(), dict_struct.id->name)};
+        }
         else
         {
             auto keys = cache_storage_ptr->getCachedComplexKeys();
-            stream = std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, keys, column_names);
+            key_columns = deserializeColumnsWithTypeAndNameFromKeys(dict_struct, keys, 0, keys.size());
         }
     }
 
-    return stream;
+    std::shared_ptr<const IDictionary> dictionary = shared_from_this();
+    auto coordinator = std::make_shared<DictionarySourceCoordinator>(dictionary, column_names, std::move(key_columns), max_block_size);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<DictionarySource>(coordinator);
+        pipes.emplace_back(Pipe(std::move(source)));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 template <DictionaryKeyType dictionary_key_type>
@@ -531,7 +547,7 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
     std::vector<UInt64> requested_keys_vector;
     std::vector<size_t> requested_complex_key_rows;
 
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
         requested_keys_vector.reserve(requested_keys.size());
     else
         requested_complex_key_rows.reserve(requested_keys.size());
@@ -543,7 +559,7 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
         if (key_index_to_state_from_storage[i].isExpired()
             || key_index_to_state_from_storage[i].isNotFound())
         {
-            if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+            if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
                 requested_keys_vector.emplace_back(requested_keys[i]);
             else
                 requested_complex_key_rows.emplace_back(i);
@@ -567,21 +583,21 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
             auto current_source_ptr = getSourceAndUpdateIfNeeded();
 
             Stopwatch watch;
-            BlockInputStreamPtr stream;
+            QueryPipeline pipeline;
 
-            if constexpr (dictionary_key_type == DictionaryKeyType::simple)
-                stream = current_source_ptr->loadIds(requested_keys_vector);
+            if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+                pipeline = QueryPipeline(current_source_ptr->loadIds(requested_keys_vector));
             else
-                stream = current_source_ptr->loadKeys(update_unit_ptr->key_columns, requested_complex_key_rows);
-
-            stream->readPrefix();
+                pipeline = QueryPipeline(current_source_ptr->loadKeys(update_unit_ptr->key_columns, requested_complex_key_rows));
 
             size_t skip_keys_size_offset = dict_struct.getKeysSize();
             PaddedPODArray<KeyType> found_keys_in_source;
 
             Columns fetched_columns_during_update = fetch_request.makeAttributesResultColumnsNonMutable();
 
-            while (Block block = stream->read())
+            PullingPipelineExecutor executor(pipeline);
+            Block block;
+            while (executor.pull(block))
             {
                 Columns key_columns;
                 key_columns.reserve(skip_keys_size_offset);
@@ -625,8 +641,6 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
             for (const auto & fetched_column : fetched_columns_during_update)
                 update_unit_ptr_mutable_columns.emplace_back(fetched_column->assumeMutable());
 
-            stream->readSuffix();
-
             {
                 /// Lock for cache modification
                 ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
@@ -683,7 +697,7 @@ void CacheDictionary<dictionary_key_type>::update(CacheDictionaryUpdateUnitPtr<d
     }
 }
 
-template class CacheDictionary<DictionaryKeyType::simple>;
-template class CacheDictionary<DictionaryKeyType::complex>;
+template class CacheDictionary<DictionaryKeyType::Simple>;
+template class CacheDictionary<DictionaryKeyType::Complex>;
 
 }
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index baaf99d290b..d2c2ed9a212 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -10,7 +10,7 @@
 
 #include <pcg_random.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/randomSeed.h>
 #include <Common/ThreadPool.h>
@@ -51,8 +51,7 @@ template <DictionaryKeyType dictionary_key_type>
 class CacheDictionary final : public IDictionary
 {
 public:
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by cache dictionary");
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     CacheDictionary(
         const StorageID & dict_id_,
@@ -118,7 +117,7 @@ public:
 
     DictionaryKeyType getKeyType() const override
     {
-        return dictionary_key_type == DictionaryKeyType::simple ? DictionaryKeyType::simple : DictionaryKeyType::complex;
+        return dictionary_key_type == DictionaryKeyType::Simple ? DictionaryKeyType::Simple : DictionaryKeyType::Complex;
     }
 
     ColumnPtr getColumn(
@@ -137,11 +136,11 @@ public:
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
     std::exception_ptr getLastException() const override;
 
-    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::simple && dict_struct.hierarchical_attribute_index.has_value(); }
+    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::Simple && dict_struct.hierarchical_attribute_index.has_value(); }
 
     ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & key_type) const override;
 
@@ -151,7 +150,7 @@ public:
         const DataTypePtr & key_type) const override;
 
 private:
-    using FetchResult = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, SimpleKeysStorageFetchResult, ComplexKeysStorageFetchResult>;
+    using FetchResult = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, SimpleKeysStorageFetchResult, ComplexKeysStorageFetchResult>;
 
     static MutableColumns aggregateColumnsInOrderOfKeys(
         const PaddedPODArray<KeyType> & keys,
@@ -219,7 +218,7 @@ private:
 
 };
 
-extern template class CacheDictionary<DictionaryKeyType::simple>;
-extern template class CacheDictionary<DictionaryKeyType::complex>;
+extern template class CacheDictionary<DictionaryKeyType::Simple>;
+extern template class CacheDictionary<DictionaryKeyType::Complex>;
 
 }
diff --git a/src/Dictionaries/CacheDictionaryStorage.h b/src/Dictionaries/CacheDictionaryStorage.h
index 8374e649cd1..2c7e9ad7092 100644
--- a/src/Dictionaries/CacheDictionaryStorage.h
+++ b/src/Dictionaries/CacheDictionaryStorage.h
@@ -41,8 +41,7 @@ class CacheDictionaryStorage final : public ICacheDictionaryStorage
     static constexpr size_t max_collision_length = 10;
 
 public:
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionaryStorage");
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     explicit CacheDictionaryStorage(
         const DictionaryStructure & dictionary_structure,
@@ -62,19 +61,19 @@ public:
 
     String getName() const override
     {
-        if (dictionary_key_type == DictionaryKeyType::simple)
+        if (dictionary_key_type == DictionaryKeyType::Simple)
             return "Cache";
         else
             return "ComplexKeyCache";
     }
 
-    bool supportsSimpleKeys() const override { return dictionary_key_type == DictionaryKeyType::simple; }
+    bool supportsSimpleKeys() const override { return dictionary_key_type == DictionaryKeyType::Simple; }
 
     SimpleKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<UInt64> & keys,
         const DictionaryStorageFetchRequest & fetch_request) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for complex key storage");
@@ -82,7 +81,7 @@ public:
 
     void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             insertColumnsForKeysImpl(keys, columns);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
@@ -90,7 +89,7 @@ public:
 
     void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             insertDefaultKeysImpl(keys);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for complex key storage");
@@ -98,19 +97,19 @@ public:
 
     PaddedPODArray<UInt64> getCachedSimpleKeys() const override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             return getCachedKeysImpl();
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for complex key storage");
     }
 
-    bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::complex; }
+    bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::Complex; }
 
     ComplexKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<StringRef> & keys,
         const DictionaryStorageFetchRequest & column_fetch_requests) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, column_fetch_requests);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
@@ -118,7 +117,7 @@ public:
 
     void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             insertColumnsForKeysImpl(keys, columns);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for simple key storage");
@@ -126,7 +125,7 @@ public:
 
     void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             insertDefaultKeysImpl(keys);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for simple key storage");
@@ -134,7 +133,7 @@ public:
 
     PaddedPODArray<StringRef> getCachedComplexKeys() const override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             return getCachedKeysImpl();
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedComplexKeys is not supported for simple key storage");
diff --git a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
index 310abed822f..2077f846f09 100644
--- a/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
+++ b/src/Dictionaries/CacheDictionaryUpdateQueue.cpp
@@ -14,8 +14,8 @@ namespace ErrorCodes
     extern const int TIMEOUT_EXCEEDED;
 }
 
-template class CacheDictionaryUpdateUnit<DictionaryKeyType::simple>;
-template class CacheDictionaryUpdateUnit<DictionaryKeyType::complex>;
+template class CacheDictionaryUpdateUnit<DictionaryKeyType::Simple>;
+template class CacheDictionaryUpdateUnit<DictionaryKeyType::Complex>;
 
 template <DictionaryKeyType dictionary_key_type>
 CacheDictionaryUpdateQueue<dictionary_key_type>::CacheDictionaryUpdateQueue(
@@ -35,9 +35,11 @@ CacheDictionaryUpdateQueue<dictionary_key_type>::CacheDictionaryUpdateQueue(
 template <DictionaryKeyType dictionary_key_type>
 CacheDictionaryUpdateQueue<dictionary_key_type>::~CacheDictionaryUpdateQueue()
 {
+    if (update_queue.isFinished())
+        return;
+
     try {
-        if (!finished)
-            stopAndWait();
+        stopAndWait();
     }
     catch (...)
     {
@@ -48,7 +50,7 @@ CacheDictionaryUpdateQueue<dictionary_key_type>::~CacheDictionaryUpdateQueue()
 template <DictionaryKeyType dictionary_key_type>
 void CacheDictionaryUpdateQueue<dictionary_key_type>::tryPushToUpdateQueueOrThrow(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr)
 {
-    if (finished)
+    if (update_queue.isFinished())
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
 
     if (!update_queue.tryPush(update_unit_ptr, configuration.update_queue_push_timeout_milliseconds))
@@ -63,7 +65,7 @@ void CacheDictionaryUpdateQueue<dictionary_key_type>::tryPushToUpdateQueueOrThro
 template <DictionaryKeyType dictionary_key_type>
 void CacheDictionaryUpdateQueue<dictionary_key_type>::waitForCurrentUpdateFinish(CacheDictionaryUpdateUnitPtr<dictionary_key_type> & update_unit_ptr) const
 {
-    if (finished)
+    if (update_queue.isFinished())
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
 
     std::unique_lock<std::mutex> update_lock(update_mutex);
@@ -108,15 +110,10 @@ void CacheDictionaryUpdateQueue<dictionary_key_type>::waitForCurrentUpdateFinish
 template <DictionaryKeyType dictionary_key_type>
 void CacheDictionaryUpdateQueue<dictionary_key_type>::stopAndWait()
 {
-    finished = true;
-    update_queue.clear();
-
-    for (size_t i = 0; i < configuration.max_threads_for_updates; ++i)
-    {
-        auto empty_finishing_ptr = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>();
-        update_queue.push(empty_finishing_ptr);
-    }
+    if (update_queue.isFinished())
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "CacheDictionaryUpdateQueue finished");
 
+    update_queue.clearAndFinish();
     update_pool.wait();
 }
 
@@ -125,12 +122,10 @@ void CacheDictionaryUpdateQueue<dictionary_key_type>::updateThreadFunction()
 {
     setThreadName("UpdQueue");
 
-    while (!finished)
+    while (!update_queue.isFinished())
     {
         CacheDictionaryUpdateUnitPtr<dictionary_key_type> unit_to_update;
-        update_queue.pop(unit_to_update);
-
-        if (finished)
+        if (!update_queue.pop(unit_to_update))
             break;
 
         try
@@ -155,7 +150,7 @@ void CacheDictionaryUpdateQueue<dictionary_key_type>::updateThreadFunction()
     }
 }
 
-template class CacheDictionaryUpdateQueue<DictionaryKeyType::simple>;
-template class CacheDictionaryUpdateQueue<DictionaryKeyType::complex>;
+template class CacheDictionaryUpdateQueue<DictionaryKeyType::Simple>;
+template class CacheDictionaryUpdateQueue<DictionaryKeyType::Complex>;
 
 }
diff --git a/src/Dictionaries/CacheDictionaryUpdateQueue.h b/src/Dictionaries/CacheDictionaryUpdateQueue.h
index 3d27a157752..7725ce7588f 100644
--- a/src/Dictionaries/CacheDictionaryUpdateQueue.h
+++ b/src/Dictionaries/CacheDictionaryUpdateQueue.h
@@ -39,7 +39,7 @@ template <DictionaryKeyType dictionary_key_type>
 class CacheDictionaryUpdateUnit
 {
 public:
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     /// Constructor for complex keys update request
     explicit CacheDictionaryUpdateUnit(
@@ -85,8 +85,8 @@ private:
 template <DictionaryKeyType dictionary_key_type>
 using CacheDictionaryUpdateUnitPtr = std::shared_ptr<CacheDictionaryUpdateUnit<dictionary_key_type>>;
 
-extern template class CacheDictionaryUpdateUnit<DictionaryKeyType::simple>;
-extern template class CacheDictionaryUpdateUnit<DictionaryKeyType::complex>;
+extern template class CacheDictionaryUpdateUnit<DictionaryKeyType::Simple>;
+extern template class CacheDictionaryUpdateUnit<DictionaryKeyType::Complex>;
 
 struct CacheDictionaryUpdateQueueConfiguration
 {
@@ -110,7 +110,6 @@ class CacheDictionaryUpdateQueue
 public:
     /// Client of update queue must provide this function in constructor and perform update using update unit.
     using UpdateFunction = std::function<void (CacheDictionaryUpdateUnitPtr<dictionary_key_type>)>;
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionaryUpdateQueue");
 
     CacheDictionaryUpdateQueue(
         String dictionary_name_for_logs_,
@@ -123,7 +122,7 @@ public:
     const CacheDictionaryUpdateQueueConfiguration & getConfiguration() const { return configuration; }
 
     /// Is queue finished
-    bool isFinished() const { return finished; }
+    bool isFinished() const { return update_queue.isFinished(); }
 
     /// Synchronous wait for update queue to stop
     void stopAndWait();
@@ -163,11 +162,9 @@ private:
 
     mutable std::mutex update_mutex;
     mutable std::condition_variable is_update_finished;
-
-    std::atomic<bool> finished{false};
 };
 
-extern template class CacheDictionaryUpdateQueue<DictionaryKeyType::simple>;
-extern template class CacheDictionaryUpdateQueue<DictionaryKeyType::complex>;
+extern template class CacheDictionaryUpdateQueue<DictionaryKeyType::Simple>;
+extern template class CacheDictionaryUpdateQueue<DictionaryKeyType::Complex>;
 
 }
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
index 7605b86ef90..2ff349043ff 100644
--- a/src/Dictionaries/CassandraDictionarySource.cpp
+++ b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -17,7 +17,7 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
-                                                    ContextPtr /* context */,
+                                                    ContextPtr /* global_context */,
                                                     const std::string & /* default_database */,
                                                     bool /*created_from_ddl*/) -> DictionarySourcePtr
     {
@@ -36,11 +36,10 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & factory)
 
 #if USE_CASSANDRA
 
-#include <IO/WriteHelpers.h>
+#include <base/logger_useful.h>
 #include <Common/SipHash.h>
-#include "CassandraBlockInputStream.h"
-#include <common/logger_useful.h>
-#include <DataStreams/UnionBlockInputStream.h>
+#include <IO/WriteHelpers.h>
+#include <Dictionaries/CassandraSource.h>
 
 namespace DB
 {
@@ -50,7 +49,7 @@ namespace ErrorCodes
     extern const int INVALID_CONFIG_PARAMETER;
 }
 
-CassandraSettings::CassandraSettings(
+CassandraDictionarySource::Configuration::Configuration(
     const Poco::Util::AbstractConfiguration & config,
     const String & config_prefix)
     : host(config.getString(config_prefix + ".host"))
@@ -67,7 +66,7 @@ CassandraSettings::CassandraSettings(
     setConsistency(config.getString(config_prefix + ".consistency", "One"));
 }
 
-void CassandraSettings::setConsistency(const String & config_str)
+void CassandraDictionarySource::Configuration::setConsistency(const String & config_str)
 {
     if (config_str == "One")
         consistency = CASS_CONSISTENCY_ONE;
@@ -97,19 +96,19 @@ static const size_t max_block_size = 8192;
 
 CassandraDictionarySource::CassandraDictionarySource(
     const DictionaryStructure & dict_struct_,
-    const CassandraSettings & settings_,
+    const Configuration & configuration_,
     const Block & sample_block_)
     : log(&Poco::Logger::get("CassandraDictionarySource"))
     , dict_struct(dict_struct_)
-    , settings(settings_)
+    , configuration(configuration_)
     , sample_block(sample_block_)
-    , query_builder(dict_struct, settings.db, "", settings.table, settings.where, IdentifierQuotingStyle::DoubleQuotes)
+    , query_builder(dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::DoubleQuotes)
 {
-    cassandraCheck(cass_cluster_set_contact_points(cluster, settings.host.c_str()));
-    if (settings.port)
-        cassandraCheck(cass_cluster_set_port(cluster, settings.port));
-    cass_cluster_set_credentials(cluster, settings.user.c_str(), settings.password.c_str());
-    cassandraCheck(cass_cluster_set_consistency(cluster, settings.consistency));
+    cassandraCheck(cass_cluster_set_contact_points(cluster, configuration.host.c_str()));
+    if (configuration.port)
+        cassandraCheck(cass_cluster_set_port(cluster, configuration.port));
+    cass_cluster_set_credentials(cluster, configuration.user.c_str(), configuration.password.c_str());
+    cassandraCheck(cass_cluster_set_consistency(cluster, configuration.consistency));
 }
 
 CassandraDictionarySource::CassandraDictionarySource(
@@ -119,41 +118,41 @@ CassandraDictionarySource::CassandraDictionarySource(
     Block & sample_block_)
     : CassandraDictionarySource(
         dict_struct_,
-        CassandraSettings(config, config_prefix),
+        Configuration(config, config_prefix),
         sample_block_)
 {
 }
 
 void CassandraDictionarySource::maybeAllowFiltering(String & query) const
 {
-    if (!settings.allow_filtering)
+    if (!configuration.allow_filtering)
         return;
     query.pop_back();   /// remove semicolon
     query += " ALLOW FILTERING;";
 }
 
-BlockInputStreamPtr CassandraDictionarySource::loadAll()
+Pipe CassandraDictionarySource::loadAll()
 {
     String query = query_builder.composeLoadAllQuery();
     maybeAllowFiltering(query);
     LOG_INFO(log, "Loading all using query: {}", query);
-    return std::make_shared<CassandraBlockInputStream>(getSession(), query, sample_block, max_block_size);
+    return Pipe(std::make_shared<CassandraSource>(getSession(), query, sample_block, max_block_size));
 }
 
 std::string CassandraDictionarySource::toString() const
 {
-    return "Cassandra: " + settings.db + '.' + settings.table;
+    return "Cassandra: " + configuration.db + '.' + configuration.table;
 }
 
-BlockInputStreamPtr CassandraDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe CassandraDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     String query = query_builder.composeLoadIdsQuery(ids);
     maybeAllowFiltering(query);
     LOG_INFO(log, "Loading ids using query: {}", query);
-    return std::make_shared<CassandraBlockInputStream>(getSession(), query, sample_block, max_block_size);
+    return Pipe(std::make_shared<CassandraSource>(getSession(), query, sample_block, max_block_size));
 }
 
-BlockInputStreamPtr CassandraDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe CassandraDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     if (requested_rows.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "No rows requested");
@@ -163,27 +162,24 @@ BlockInputStreamPtr CassandraDictionarySource::loadKeys(const Columns & key_colu
     for (const auto & row : requested_rows)
     {
         SipHash partition_key;
-        for (size_t i = 0; i < settings.partition_key_prefix; ++i)
+        for (size_t i = 0; i < configuration.partition_key_prefix; ++i)
             key_columns[i]->updateHashWithValue(row, partition_key);
         partitions[partition_key.get64()].push_back(row);
     }
 
-    BlockInputStreams streams;
+    Pipes pipes;
     for (const auto & partition : partitions)
     {
-        String query = query_builder.composeLoadKeysQuery(key_columns, partition.second, ExternalQueryBuilder::CASSANDRA_SEPARATE_PARTITION_KEY, settings.partition_key_prefix);
+        String query = query_builder.composeLoadKeysQuery(key_columns, partition.second, ExternalQueryBuilder::CASSANDRA_SEPARATE_PARTITION_KEY, configuration.partition_key_prefix);
         maybeAllowFiltering(query);
         LOG_INFO(log, "Loading keys for partition hash {} using query: {}", partition.first, query);
-        streams.push_back(std::make_shared<CassandraBlockInputStream>(getSession(), query, sample_block, max_block_size));
+        pipes.push_back(Pipe(std::make_shared<CassandraSource>(getSession(), query, sample_block, max_block_size)));
     }
 
-    if (streams.size() == 1)
-        return streams.front();
-
-    return std::make_shared<UnionBlockInputStream>(streams, nullptr, settings.max_threads);
+    return Pipe::unitePipes(std::move(pipes));
 }
 
-BlockInputStreamPtr CassandraDictionarySource::loadUpdatedAll()
+Pipe CassandraDictionarySource::loadUpdatedAll()
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for CassandraDictionarySource");
 }
diff --git a/src/Dictionaries/CassandraDictionarySource.h b/src/Dictionaries/CassandraDictionarySource.h
index c0a4e774d23..35419d3ea7d 100644
--- a/src/Dictionaries/CassandraDictionarySource.h
+++ b/src/Dictionaries/CassandraDictionarySource.h
@@ -14,33 +14,35 @@
 namespace DB
 {
 
-struct CassandraSettings
-{
-    String host;
-    UInt16 port;
-    String user;
-    String password;
-    String db;
-    String table;
-
-    CassConsistency consistency;
-    bool allow_filtering;
-    /// TODO get information about key from the driver
-    size_t partition_key_prefix;
-    size_t max_threads;
-    String where;
-
-    CassandraSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
-
-    void setConsistency(const String & config_str);
-};
-
 class CassandraDictionarySource final : public IDictionarySource
 {
 public:
+
+    struct Configuration
+    {
+        String host;
+        UInt16 port;
+        String user;
+        String password;
+        String db;
+        String table;
+        String query;
+
+        CassConsistency consistency;
+        bool allow_filtering;
+        /// TODO get information about key from the driver
+        size_t partition_key_prefix;
+        size_t max_threads;
+        String where;
+
+        Configuration(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
+
+        void setConsistency(const String & config_str);
+    };
+
     CassandraDictionarySource(
         const DictionaryStructure & dict_struct,
-        const CassandraSettings & settings_,
+        const Configuration & configuration,
         const Block & sample_block);
 
     CassandraDictionarySource(
@@ -49,7 +51,7 @@ public:
             const String & config_prefix,
             Block & sample_block);
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
     bool supportsSelectiveLoad() const override { return true; }
 
@@ -59,14 +61,14 @@ public:
 
     DictionarySourcePtr clone() const override
     {
-        return std::make_unique<CassandraDictionarySource>(dict_struct, settings, sample_block);
+        return std::make_unique<CassandraDictionarySource>(dict_struct, configuration, sample_block);
     }
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
     String toString() const override;
 
@@ -76,7 +78,7 @@ private:
 
     Poco::Logger * log;
     const DictionaryStructure dict_struct;
-    const CassandraSettings settings;
+    const Configuration configuration;
     Block sample_block;
     ExternalQueryBuilder query_builder;
 
diff --git a/src/Dictionaries/CassandraHelpers.cpp b/src/Dictionaries/CassandraHelpers.cpp
index 81f7d6d9a63..a33ab288a34 100644
--- a/src/Dictionaries/CassandraHelpers.cpp
+++ b/src/Dictionaries/CassandraHelpers.cpp
@@ -2,7 +2,7 @@
 
 #if USE_CASSANDRA
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <mutex>
 
 namespace DB
diff --git a/src/Dictionaries/CassandraHelpers.h b/src/Dictionaries/CassandraHelpers.h
index 8a00e372c96..30111e11686 100644
--- a/src/Dictionaries/CassandraHelpers.h
+++ b/src/Dictionaries/CassandraHelpers.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_CASSANDRA
-#include <cassandra.h> // Y_IGNORE
+#include <cassandra.h>
 #include <utility>
 #include <memory>
 
diff --git a/src/Dictionaries/CassandraBlockInputStream.cpp b/src/Dictionaries/CassandraSource.cpp
similarity index 93%
rename from src/Dictionaries/CassandraBlockInputStream.cpp
rename to src/Dictionaries/CassandraSource.cpp
index 57a4555ea87..5b84936a137 100644
--- a/src/Dictionaries/CassandraBlockInputStream.cpp
+++ b/src/Dictionaries/CassandraSource.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_CASSANDRA
 
@@ -10,7 +8,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Core/ExternalResultDescription.h>
 #include <IO/ReadHelpers.h>
-#include "CassandraBlockInputStream.h"
+#include "CassandraSource.h"
 
 
 namespace DB
@@ -22,12 +20,13 @@ namespace ErrorCodes
     extern const int UNKNOWN_TYPE;
 }
 
-CassandraBlockInputStream::CassandraBlockInputStream(
+CassandraSource::CassandraSource(
     const CassSessionShared & session_,
     const String & query_str,
     const Block & sample_block,
     size_t max_block_size_)
-    : session(session_)
+    : SourceWithProgress(sample_block)
+    , session(session_)
     , statement(query_str.c_str(), /*parameters count*/ 0)
     , max_block_size(max_block_size_)
     , has_more_pages(cass_true)
@@ -36,7 +35,7 @@ CassandraBlockInputStream::CassandraBlockInputStream(
     cassandraCheck(cass_statement_set_paging_size(statement, max_block_size));
 }
 
-void CassandraBlockInputStream::insertValue(IColumn & column, ValueType type, const CassValue * cass_value)
+void CassandraSource::insertValue(IColumn & column, ValueType type, const CassValue * cass_value)
 {
     switch (type)
     {
@@ -148,13 +147,15 @@ void CassandraBlockInputStream::insertValue(IColumn & column, ValueType type, co
     }
 }
 
-void CassandraBlockInputStream::readPrefix()
-{
-    result_future = cass_session_execute(*session, statement);
-}
 
-Block CassandraBlockInputStream::readImpl()
+Chunk CassandraSource::generate()
 {
+    if (!is_initialized)
+    {
+        result_future = cass_session_execute(*session, statement);
+        is_initialized = true;
+    }
+
     if (!has_more_pages)
         return {};
 
@@ -194,12 +195,13 @@ Block CassandraBlockInputStream::readImpl()
         }
     }
 
-    assert(cass_result_row_count(result) == columns.front()->size());
+    size_t num_rows = columns.front()->size();
+    assert(cass_result_row_count(result) == num_rows);
 
-    return description.sample_block.cloneWithColumns(std::move(columns));
+    return Chunk(std::move(columns), num_rows);
 }
 
-void CassandraBlockInputStream::assertTypes(const CassResultPtr & result)
+void CassandraSource::assertTypes(const CassResultPtr & result)
 {
     if (!assert_types)
         return;
diff --git a/src/Dictionaries/CassandraBlockInputStream.h b/src/Dictionaries/CassandraSource.h
similarity index 74%
rename from src/Dictionaries/CassandraBlockInputStream.h
rename to src/Dictionaries/CassandraSource.h
index 3b0e583e3ad..ba76e72c245 100644
--- a/src/Dictionaries/CassandraBlockInputStream.h
+++ b/src/Dictionaries/CassandraSource.h
@@ -4,17 +4,17 @@
 
 #if USE_CASSANDRA
 #include <Core/Block.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Core/ExternalResultDescription.h>
 
 
 namespace DB
 {
 
-class CassandraBlockInputStream final : public IBlockInputStream
+class CassandraSource final : public SourceWithProgress
 {
 public:
-    CassandraBlockInputStream(
+    CassandraSource(
             const CassSessionShared & session_,
             const String & query_str,
             const Block & sample_block,
@@ -22,14 +22,10 @@ public:
 
     String getName() const override { return "Cassandra"; }
 
-    Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
-    void readPrefix() override;
-
 private:
     using ValueType = ExternalResultDescription::ValueType;
 
-    Block readImpl() override;
+    Chunk generate() override;
     static void insertValue(IColumn & column, ValueType type, const CassValue * cass_value);
     void assertTypes(const CassResultPtr & result);
 
@@ -40,6 +36,7 @@ private:
     ExternalResultDescription description;
     cass_bool_t has_more_pages;
     bool assert_types = true;
+    bool is_initialized = false;
 };
 
 }
diff --git a/src/Dictionaries/ClickHouseDictionarySource.cpp b/src/Dictionaries/ClickHouseDictionarySource.cpp
index 42ec73ee520..a5a04d277da 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -1,12 +1,17 @@
 #include "ClickHouseDictionarySource.h"
 #include <memory>
 #include <Client/ConnectionPool.h>
-#include <DataStreams/RemoteBlockInputStream.h>
-#include <DataStreams/ConvertingBlockInputStream.h>
+#include <Processors/Sources/RemoteSource.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+#include <Interpreters/ActionsDAG.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/ConnectionTimeouts.h>
+#include <Interpreters/Session.h>
 #include <Interpreters/executeQuery.h>
 #include <Common/isLocalAddress.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "ExternalQueryBuilder.h"
@@ -60,19 +65,18 @@ ClickHouseDictionarySource::ClickHouseDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Configuration & configuration_,
     const Block & sample_block_,
-    ContextPtr context_)
+    ContextMutablePtr context_,
+    std::shared_ptr<Session> local_session_)
     : update_time{std::chrono::system_clock::from_time_t(0)}
     , dict_struct{dict_struct_}
     , configuration{configuration_}
-    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks}
     , sample_block{sample_block_}
-    , context(Context::createCopy(context_))
+    , local_session(local_session_)
+    , context(context_)
     , pool{createPool(configuration)}
     , load_all_query{query_builder.composeLoadAllQuery()}
 {
-    /// Query context is needed because some code in executeQuery function may assume it exists.
-    /// Current example is Context::getSampleBlockCache from InterpreterSelectWithUnionQuery::getSampleBlock.
-    context->makeQueryContext();
 }
 
 ClickHouseDictionarySource::ClickHouseDictionarySource(const ClickHouseDictionarySource & other)
@@ -80,13 +84,13 @@ ClickHouseDictionarySource::ClickHouseDictionarySource(const ClickHouseDictionar
     , dict_struct{other.dict_struct}
     , configuration{other.configuration}
     , invalidate_query_response{other.invalidate_query_response}
-    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks}
     , sample_block{other.sample_block}
+    , local_session(other.local_session)
     , context(Context::createCopy(other.context))
     , pool{createPool(configuration)}
     , load_all_query{other.load_all_query}
 {
-    context->makeQueryContext();
 }
 
 std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
@@ -105,29 +109,29 @@ std::string ClickHouseDictionarySource::getUpdateFieldAndDate()
     }
 }
 
-BlockInputStreamPtr ClickHouseDictionarySource::loadAllWithSizeHint(std::atomic<size_t> * result_size_hint)
+Pipe ClickHouseDictionarySource::loadAllWithSizeHint(std::atomic<size_t> * result_size_hint)
 {
     return createStreamForQuery(load_all_query, result_size_hint);
 }
 
-BlockInputStreamPtr ClickHouseDictionarySource::loadAll()
+Pipe ClickHouseDictionarySource::loadAll()
 {
     return createStreamForQuery(load_all_query);
 }
 
-BlockInputStreamPtr ClickHouseDictionarySource::loadUpdatedAll()
+Pipe ClickHouseDictionarySource::loadUpdatedAll()
 {
     String load_update_query = getUpdateFieldAndDate();
     return createStreamForQuery(load_update_query);
 }
 
-BlockInputStreamPtr ClickHouseDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe ClickHouseDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     return createStreamForQuery(query_builder.composeLoadIdsQuery(ids));
 }
 
 
-BlockInputStreamPtr ClickHouseDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe ClickHouseDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     String query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::IN_WITH_TUPLES);
     return createStreamForQuery(query);
@@ -157,32 +161,41 @@ std::string ClickHouseDictionarySource::toString() const
     return "ClickHouse: " + configuration.db + '.' + configuration.table + (where.empty() ? "" : ", where: " + where);
 }
 
-BlockInputStreamPtr ClickHouseDictionarySource::createStreamForQuery(const String & query, std::atomic<size_t> * result_size_hint)
+Pipe ClickHouseDictionarySource::createStreamForQuery(const String & query, std::atomic<size_t> * result_size_hint)
 {
-    BlockInputStreamPtr stream;
+    QueryPipelineBuilder builder;
 
     /// Sample block should not contain first row default values
     auto empty_sample_block = sample_block.cloneEmpty();
 
     if (configuration.is_local)
     {
-        stream = executeQuery(query, context, true).getInputStream();
-        stream = std::make_shared<ConvertingBlockInputStream>(stream, empty_sample_block, ConvertingBlockInputStream::MatchColumnsMode::Position);
+        builder.init(executeQuery(query, context, true).pipeline);
+        auto converting = ActionsDAG::makeConvertingActions(
+            builder.getHeader().getColumnsWithTypeAndName(),
+            empty_sample_block.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Position);
+
+        builder.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<ExpressionTransform>(header, std::make_shared<ExpressionActions>(converting));
+        });
     }
     else
     {
-        stream = std::make_shared<RemoteBlockInputStream>(pool, query, empty_sample_block, context);
+        builder.init(Pipe(std::make_shared<RemoteSource>(
+            std::make_shared<RemoteQueryExecutor>(pool, query, empty_sample_block, context), false, false)));
     }
 
     if (result_size_hint)
     {
-        stream->setProgressCallback([result_size_hint](const Progress & progress)
+        builder.setProgressCallback([result_size_hint](const Progress & progress)
         {
             *result_size_hint += progress.total_rows_to_read;
         });
     }
 
-    return stream;
+    return QueryPipelineBuilder::getPipe(std::move(builder));
 }
 
 std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & request) const
@@ -191,15 +204,15 @@ std::string ClickHouseDictionarySource::doInvalidateQuery(const std::string & re
     if (configuration.is_local)
     {
         auto query_context = Context::createCopy(context);
-        auto input_block = executeQuery(request, query_context, true).getInputStream();
-        return readInvalidateQuery(*input_block);
+        return readInvalidateQuery(executeQuery(request, query_context, true).pipeline);
     }
     else
     {
         /// We pass empty block to RemoteBlockInputStream, because we don't know the structure of the result.
         Block invalidate_sample_block;
-        RemoteBlockInputStream invalidate_stream(pool, request, invalidate_sample_block, context);
-        return readInvalidateQuery(invalidate_stream);
+        QueryPipeline pipeline(std::make_shared<RemoteSource>(
+            std::make_shared<RemoteQueryExecutor>(pool, request, invalidate_sample_block, context), false, false));
+        return readInvalidateQuery(std::move(pipeline));
     }
 }
 
@@ -209,14 +222,13 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 ContextPtr context,
+                                 ContextPtr global_context,
                                  const std::string & default_database [[maybe_unused]],
                                  bool /* created_from_ddl */) -> DictionarySourcePtr
     {
         bool secure = config.getBool(config_prefix + ".secure", false);
-        auto context_copy = Context::createCopy(context);
 
-        UInt16 default_port = getPortFromContext(context_copy, secure);
+        UInt16 default_port = getPortFromContext(global_context, secure);
 
         std::string settings_config_prefix = config_prefix + ".clickhouse";
         std::string host = config.getString(settings_config_prefix + ".host", "localhost");
@@ -228,7 +240,8 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             .user = config.getString(settings_config_prefix + ".user", "default"),
             .password = config.getString(settings_config_prefix + ".password", ""),
             .db = config.getString(settings_config_prefix + ".db", default_database),
-            .table = config.getString(settings_config_prefix + ".table"),
+            .table = config.getString(settings_config_prefix + ".table", ""),
+            .query = config.getString(settings_config_prefix + ".query", ""),
             .where = config.getString(settings_config_prefix + ".where", ""),
             .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
@@ -238,12 +251,18 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
             .secure = config.getBool(settings_config_prefix + ".secure", false)
         };
 
-        /// We should set user info even for the case when the dictionary is loaded in-process (without TCP communication).
+        ContextMutablePtr context;
+        std::shared_ptr<Session> local_session;
         if (configuration.is_local)
         {
-            context_copy->setUser(configuration.user, configuration.password, Poco::Net::SocketAddress("127.0.0.1", 0));
-            context_copy = copyContextAndApplySettings(config_prefix, context_copy, config);
+            /// Start local session in case when the dictionary is loaded in-process (without TCP communication).
+            local_session = std::make_shared<Session>(global_context, ClientInfo::Interface::LOCAL);
+            local_session->authenticate(configuration.user, configuration.password, {});
+            context = local_session->makeQueryContext();
+            context->applySettingsChanges(readSettingsFromDictionaryConfig(config, config_prefix));
         }
+        else
+            context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
 
         String dictionary_name = config.getString(".dictionary.name", "");
         String dictionary_database = config.getString(".dictionary.database", "");
@@ -251,7 +270,7 @@ void registerDictionarySourceClickHouse(DictionarySourceFactory & factory)
         if (dictionary_name == configuration.table && dictionary_database == configuration.db)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "ClickHouseDictionarySource table cannot be dictionary table");
 
-        return std::make_unique<ClickHouseDictionarySource>(dict_struct, configuration, sample_block, context_copy);
+        return std::make_unique<ClickHouseDictionarySource>(dict_struct, configuration, sample_block, context, local_session);
     };
 
     factory.registerSource("clickhouse", create_table_source);
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index fe37610b9c4..58243e43b15 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -25,6 +25,7 @@ public:
         const std::string password;
         const std::string db;
         const std::string table;
+        const std::string query;
         const std::string where;
         const std::string invalidate_query;
         const std::string update_field;
@@ -38,21 +39,22 @@ public:
         const DictionaryStructure & dict_struct_,
         const Configuration & configuration_,
         const Block & sample_block_,
-        ContextPtr context);
+        ContextMutablePtr context_,
+        std::shared_ptr<Session> local_session_);
 
     /// copy-constructor is provided in order to support cloneability
     ClickHouseDictionarySource(const ClickHouseDictionarySource & other);
     ClickHouseDictionarySource & operator=(const ClickHouseDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAllWithSizeHint(std::atomic<size_t> * result_size_hint) override;
+    Pipe loadAllWithSizeHint(std::atomic<size_t> * result_size_hint) override;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
     bool supportsSelectiveLoad() const override { return true; }
@@ -70,7 +72,7 @@ public:
 private:
     std::string getUpdateFieldAndDate();
 
-    BlockInputStreamPtr createStreamForQuery(const String & query, std::atomic<size_t> * result_size_hint = nullptr);
+    Pipe createStreamForQuery(const String & query, std::atomic<size_t> * result_size_hint = nullptr);
 
     std::string doInvalidateQuery(const std::string & request) const;
 
@@ -80,6 +82,7 @@ private:
     mutable std::string invalidate_query_response;
     ExternalQueryBuilder query_builder;
     Block sample_block;
+    std::shared_ptr<Session> local_session;
     ContextMutablePtr context;
     ConnectionPoolWithFailoverPtr pool;
     const std::string load_all_query;
diff --git a/src/Dictionaries/DictionaryBlockInputStream.cpp b/src/Dictionaries/DictionaryBlockInputStream.cpp
deleted file mode 100644
index c902a87cfe3..00000000000
--- a/src/Dictionaries/DictionaryBlockInputStream.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-#include "DictionaryBlockInputStream.h"
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-DictionaryBlockInputStream::DictionaryBlockInputStream(
-    std::shared_ptr<const IDictionary> dictionary_, UInt64 max_block_size_, PaddedPODArray<UInt64> && ids_, const Names & column_names_)
-    : DictionaryBlockInputStreamBase(ids_.size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_)
-    , ids(std::move(ids_))
-    , key_type(DictionaryInputStreamKeyType::Id)
-{
-}
-
-DictionaryBlockInputStream::DictionaryBlockInputStream(
-    std::shared_ptr<const IDictionary> dictionary_,
-    UInt64 max_block_size_,
-    const PaddedPODArray<StringRef> & keys,
-    const Names & column_names_)
-    : DictionaryBlockInputStreamBase(keys.size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_)
-    , key_type(DictionaryInputStreamKeyType::ComplexKey)
-{
-    const DictionaryStructure & dictionary_structure = dictionary->getStructure();
-    fillKeyColumns(keys, 0, keys.size(), dictionary_structure, key_columns);
-}
-
-DictionaryBlockInputStream::DictionaryBlockInputStream(
-    std::shared_ptr<const IDictionary> dictionary_,
-    UInt64 max_block_size_,
-    const Columns & data_columns_,
-    const Names & column_names_,
-    GetColumnsFunction && get_key_columns_function_,
-    GetColumnsFunction && get_view_columns_function_)
-    : DictionaryBlockInputStreamBase(data_columns_.front()->size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_)
-    , data_columns(data_columns_)
-    , get_key_columns_function(std::move(get_key_columns_function_))
-    , get_view_columns_function(std::move(get_view_columns_function_))
-    , key_type(DictionaryInputStreamKeyType::Callback)
-{
-}
-
-Block DictionaryBlockInputStream::getBlock(size_t start, size_t length) const
-{
-    /// TODO: Rewrite
-    switch (key_type)
-    {
-        case DictionaryInputStreamKeyType::ComplexKey:
-        {
-            Columns columns;
-            ColumnsWithTypeAndName view_columns;
-            columns.reserve(key_columns.size());
-            for (const auto & key_column : key_columns)
-            {
-                ColumnPtr column = key_column.column->cut(start, length);
-                columns.emplace_back(column);
-                view_columns.emplace_back(column, key_column.type, key_column.name);
-            }
-            return fillBlock({}, columns, {}, std::move(view_columns));
-        }
-
-        case DictionaryInputStreamKeyType::Id:
-        {
-            PaddedPODArray<UInt64> ids_to_fill(ids.begin() + start, ids.begin() + start + length);
-            return fillBlock(ids_to_fill, {}, {}, {});
-        }
-
-        case DictionaryInputStreamKeyType::Callback:
-        {
-            Columns columns;
-            columns.reserve(data_columns.size());
-            for (const auto & data_column : data_columns)
-                columns.push_back(data_column->cut(start, length));
-            const DictionaryStructure & dictionaty_structure = dictionary->getStructure();
-            const auto & attributes = *dictionaty_structure.key;
-            ColumnsWithTypeAndName keys_with_type_and_name = get_key_columns_function(columns, attributes);
-            ColumnsWithTypeAndName view_with_type_and_name = get_view_columns_function(columns, attributes);
-            DataTypes types;
-            columns.clear();
-            for (const auto & key_column : keys_with_type_and_name)
-            {
-                columns.push_back(key_column.column);
-                types.push_back(key_column.type);
-            }
-            return fillBlock({}, columns, types, std::move(view_with_type_and_name));
-        }
-    }
-
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected DictionaryInputStreamKeyType.");
-}
-
-Block DictionaryBlockInputStream::fillBlock(
-    const PaddedPODArray<UInt64> & ids_to_fill,
-    const Columns & keys,
-    const DataTypes & types,
-    ColumnsWithTypeAndName && view) const
-{
-    std::unordered_set<std::string> names(column_names.begin(), column_names.end());
-
-    DataTypes data_types = types;
-    ColumnsWithTypeAndName block_columns;
-
-    data_types.reserve(keys.size());
-    const DictionaryStructure & dictionary_structure = dictionary->getStructure();
-    if (data_types.empty() && dictionary_structure.key)
-        for (const auto & key : *dictionary_structure.key)
-            data_types.push_back(key.type);
-
-    for (const auto & column : view)
-        if (names.find(column.name) != names.end())
-            block_columns.push_back(column);
-
-    const DictionaryStructure & structure = dictionary->getStructure();
-    ColumnPtr ids_column = getColumnFromIds(ids_to_fill);
-
-    if (structure.id && names.find(structure.id->name) != names.end())
-    {
-        block_columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), structure.id->name);
-    }
-
-    auto dictionary_key_type = dictionary->getKeyType();
-
-    for (const auto & attribute : structure.attributes)
-    {
-        if (names.find(attribute.name) != names.end())
-        {
-            ColumnPtr column;
-
-            if (dictionary_key_type == DictionaryKeyType::simple)
-            {
-                column = dictionary->getColumn(
-                    attribute.name,
-                    attribute.type,
-                    {ids_column},
-                    {std::make_shared<DataTypeUInt64>()},
-                    nullptr /* default_values_column */);
-            }
-            else
-            {
-                column = dictionary->getColumn(
-                    attribute.name,
-                    attribute.type,
-                    keys,
-                    data_types,
-                    nullptr /* default_values_column*/);
-            }
-
-            block_columns.emplace_back(column, attribute.type, attribute.name);
-        }
-    }
-
-    return Block(block_columns);
-}
-
-ColumnPtr DictionaryBlockInputStream::getColumnFromIds(const PaddedPODArray<UInt64> & ids_to_fill)
-{
-    auto column_vector = ColumnVector<UInt64>::create();
-    column_vector->getData().assign(ids_to_fill);
-    return column_vector;
-}
-
-void DictionaryBlockInputStream::fillKeyColumns(
-    const PaddedPODArray<StringRef> & keys,
-    size_t start,
-    size_t size,
-    const DictionaryStructure & dictionary_structure,
-    ColumnsWithTypeAndName & result)
-{
-    MutableColumns columns;
-    columns.reserve(dictionary_structure.key->size());
-
-    for (const DictionaryAttribute & attribute : *dictionary_structure.key)
-        columns.emplace_back(attribute.type->createColumn());
-
-    for (size_t index = start; index < size; ++index)
-    {
-        const auto & key = keys[index];
-        const auto *ptr = key.data;
-        for (auto & column : columns)
-            ptr = column->deserializeAndInsertFromArena(ptr);
-    }
-
-    for (size_t i = 0, num_columns = columns.size(); i < num_columns; ++i)
-    {
-        const auto & dictionary_attribute = (*dictionary_structure.key)[i];
-        result.emplace_back(ColumnWithTypeAndName{std::move(columns[i]), dictionary_attribute.type, dictionary_attribute.name});
-    }
-}
-
-}
diff --git a/src/Dictionaries/DictionaryBlockInputStream.h b/src/Dictionaries/DictionaryBlockInputStream.h
deleted file mode 100644
index 7692c910b94..00000000000
--- a/src/Dictionaries/DictionaryBlockInputStream.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/IColumn.h>
-#include <Core/Names.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <common/logger_useful.h>
-#include "DictionaryBlockInputStreamBase.h"
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-
-
-namespace DB
-{
-
-/// TODO: Remove this class
-/* BlockInputStream implementation for external dictionaries
- * read() returns blocks consisting of the in-memory contents of the dictionaries
- */
-class DictionaryBlockInputStream : public DictionaryBlockInputStreamBase
-{
-public:
-    DictionaryBlockInputStream(
-        std::shared_ptr<const IDictionary> dictionary,
-        UInt64 max_block_size,
-        PaddedPODArray<UInt64> && ids,
-        const Names & column_names);
-
-    DictionaryBlockInputStream(
-        std::shared_ptr<const IDictionary> dictionary,
-        UInt64 max_block_size,
-        const PaddedPODArray<StringRef> & keys,
-        const Names & column_names);
-
-    using GetColumnsFunction = std::function<ColumnsWithTypeAndName(const Columns &, const std::vector<DictionaryAttribute> & attributes)>;
-
-    // Used to separate key columns format for storage and view.
-    // Calls get_key_columns_function to get key column for dictionary get function call
-    // and get_view_columns_function to get key representation.
-    // Now used in trie dictionary, where columns are stored as ip and mask, and are showed as string
-    DictionaryBlockInputStream(
-        std::shared_ptr<const IDictionary> dictionary,
-        UInt64 max_block_size,
-        const Columns & data_columns,
-        const Names & column_names,
-        GetColumnsFunction && get_key_columns_function,
-        GetColumnsFunction && get_view_columns_function);
-
-    String getName() const override { return "Dictionary"; }
-
-protected:
-    Block getBlock(size_t start, size_t length) const override;
-
-private:
-    Block fillBlock(
-        const PaddedPODArray<UInt64> & ids_to_fill,
-        const Columns & keys,
-        const DataTypes & types,
-        ColumnsWithTypeAndName && view) const;
-
-    static ColumnPtr getColumnFromIds(const PaddedPODArray<UInt64> & ids_to_fill);
-
-    static void fillKeyColumns(
-        const PaddedPODArray<StringRef> & keys,
-        size_t start,
-        size_t size,
-        const DictionaryStructure & dictionary_structure,
-        ColumnsWithTypeAndName & result);
-
-    std::shared_ptr<const IDictionary> dictionary;
-    Names column_names;
-    PaddedPODArray<UInt64> ids;
-    ColumnsWithTypeAndName key_columns;
-
-    Columns data_columns;
-    GetColumnsFunction get_key_columns_function;
-    GetColumnsFunction get_view_columns_function;
-
-    enum class DictionaryInputStreamKeyType
-    {
-        Id,
-        ComplexKey,
-        Callback
-    };
-
-    DictionaryInputStreamKeyType key_type;
-};
-
-}
diff --git a/src/Dictionaries/DictionaryBlockInputStreamBase.cpp b/src/Dictionaries/DictionaryBlockInputStreamBase.cpp
deleted file mode 100644
index 3a3fd09220f..00000000000
--- a/src/Dictionaries/DictionaryBlockInputStreamBase.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "DictionaryBlockInputStreamBase.h"
-
-namespace DB
-{
-DictionaryBlockInputStreamBase::DictionaryBlockInputStreamBase(size_t rows_count_, size_t max_block_size_)
-    : rows_count(rows_count_), max_block_size(max_block_size_)
-{
-}
-
-Block DictionaryBlockInputStreamBase::readImpl()
-{
-    if (next_row == rows_count)
-        return Block();
-
-    size_t block_size = std::min(max_block_size, rows_count - next_row);
-    Block block = getBlock(next_row, block_size);
-    next_row += block_size;
-    return block;
-}
-
-Block DictionaryBlockInputStreamBase::getHeader() const
-{
-    return getBlock(0, 0);
-}
-
-}
diff --git a/src/Dictionaries/DictionaryBlockInputStreamBase.h b/src/Dictionaries/DictionaryBlockInputStreamBase.h
deleted file mode 100644
index fb99918aed8..00000000000
--- a/src/Dictionaries/DictionaryBlockInputStreamBase.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-
-namespace DB
-{
-class DictionaryBlockInputStreamBase : public IBlockInputStream
-{
-protected:
-    DictionaryBlockInputStreamBase(size_t rows_count_, size_t max_block_size_);
-
-    virtual Block getBlock(size_t start, size_t length) const = 0;
-
-    Block getHeader() const override;
-
-private:
-    const size_t rows_count;
-    const size_t max_block_size;
-    size_t next_row = 0;
-
-    Block readImpl() override;
-};
-
-}
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index 62b28ed7d14..92ff269a5ac 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -5,7 +5,7 @@
 #include "DictionaryStructure.h"
 #include "getDictionaryConfigurationFromAST.h"
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -31,7 +31,7 @@ DictionaryPtr DictionaryFactory::create(
     const std::string & name,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
-    ContextPtr context,
+    ContextPtr global_context,
     bool created_from_ddl) const
 {
     Poco::Util::AbstractConfiguration::Keys keys;
@@ -45,12 +45,9 @@ DictionaryPtr DictionaryFactory::create(
     const DictionaryStructure dict_struct{config, config_prefix};
 
     DictionarySourcePtr source_ptr = DictionarySourceFactory::instance().create(
-        name, config, config_prefix + ".source", dict_struct, context, config.getString(config_prefix + ".database", ""), created_from_ddl);
+        name, config, config_prefix + ".source", dict_struct, global_context, config.getString(config_prefix + ".database", ""), created_from_ddl);
     LOG_TRACE(&Poco::Logger::get("DictionaryFactory"), "Created dictionary source '{}' for dictionary '{}'", source_ptr->toString(), name);
 
-    if (context->hasQueryContext() && context->getSettingsRef().log_queries)
-        context->getQueryContext()->addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, name);
-
     const auto & layout_type = keys.front();
 
     {
@@ -58,7 +55,11 @@ DictionaryPtr DictionaryFactory::create(
         if (found != registered_layouts.end())
         {
             const auto & layout_creator = found->second.layout_create_function;
-            return layout_creator(name, dict_struct, config, config_prefix, std::move(source_ptr), context, created_from_ddl);
+            auto result = layout_creator(name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
+            if (config.hasProperty(config_prefix + ".comment"))
+                result->setDictionaryComment(config.getString(config_prefix + ".comment"));
+
+            return result;
         }
     }
 
@@ -68,10 +69,10 @@ DictionaryPtr DictionaryFactory::create(
         layout_type);
 }
 
-DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, ContextPtr context) const
+DictionaryPtr DictionaryFactory::create(const std::string & name, const ASTCreateQuery & ast, ContextPtr global_context) const
 {
-    auto configuration = getDictionaryConfigurationFromAST(ast, context);
-    return DictionaryFactory::create(name, *configuration, "dictionary", context, true);
+    auto configuration = getDictionaryConfigurationFromAST(ast, global_context);
+    return DictionaryFactory::create(name, *configuration, "dictionary", global_context, true);
 }
 
 bool DictionaryFactory::isComplex(const std::string & layout_type) const
diff --git a/src/Dictionaries/DictionaryFactory.h b/src/Dictionaries/DictionaryFactory.h
index b717009aa8a..b1dad340f4b 100644
--- a/src/Dictionaries/DictionaryFactory.h
+++ b/src/Dictionaries/DictionaryFactory.h
@@ -36,13 +36,13 @@ public:
         const std::string & name,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
-        ContextPtr context,
+        ContextPtr global_context,
         bool created_from_ddl) const;
 
     /// Create dictionary from DDL-query
     DictionaryPtr create(const std::string & name,
         const ASTCreateQuery & ast,
-        ContextPtr context) const;
+        ContextPtr global_context) const;
 
     using LayoutCreateFunction = std::function<DictionaryPtr(
         const std::string & name,
@@ -50,7 +50,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         DictionarySourcePtr source_ptr,
-        ContextPtr context,
+        ContextPtr global_context,
         bool created_from_ddl)>;
 
     bool isComplex(const std::string & layout_type) const;
diff --git a/src/Dictionaries/DictionaryHelpers.cpp b/src/Dictionaries/DictionaryHelpers.cpp
new file mode 100644
index 00000000000..b54b9eabfb6
--- /dev/null
+++ b/src/Dictionaries/DictionaryHelpers.cpp
@@ -0,0 +1,48 @@
+#include "DictionaryHelpers.h"
+
+namespace DB
+{
+
+MutableColumns deserializeColumnsFromKeys(
+    const DictionaryStructure & dictionary_structure,
+    const PaddedPODArray<StringRef> & keys,
+    size_t start,
+    size_t end)
+{
+    MutableColumns result_columns;
+    result_columns.reserve(dictionary_structure.key->size());
+
+    for (const DictionaryAttribute & attribute : *dictionary_structure.key)
+        result_columns.emplace_back(attribute.type->createColumn());
+
+    for (size_t index = start; index < end; ++index)
+    {
+        const auto & key = keys[index];
+        const auto * ptr = key.data;
+
+        for (auto & result_column : result_columns)
+            ptr = result_column->deserializeAndInsertFromArena(ptr);
+    }
+
+    return result_columns;
+}
+
+ColumnsWithTypeAndName deserializeColumnsWithTypeAndNameFromKeys(
+    const DictionaryStructure & dictionary_structure,
+    const PaddedPODArray<StringRef> & keys,
+    size_t start,
+    size_t end)
+{
+    ColumnsWithTypeAndName result;
+    MutableColumns columns = deserializeColumnsFromKeys(dictionary_structure, keys, start, end);
+
+    for (size_t i = 0, num_columns = columns.size(); i < num_columns; ++i)
+    {
+        const auto & dictionary_attribute = (*dictionary_structure.key)[i];
+        result.emplace_back(ColumnWithTypeAndName{std::move(columns[i]), dictionary_attribute.type, dictionary_attribute.name});
+    }
+
+    return result;
+}
+
+}
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index ed124ce1e0a..26fbb6f193f 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -15,7 +15,8 @@
 #include <Core/Block.h>
 #include <Dictionaries/IDictionary.h>
 #include <Dictionaries/DictionaryStructure.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 
 namespace DB
@@ -239,8 +240,7 @@ public:
     using ColumnType =
         std::conditional_t<std::is_same_v<DictionaryAttributeType, Array>, ColumnArray,
             std::conditional_t<std::is_same_v<DictionaryAttributeType, String>, ColumnString,
-                std::conditional_t<IsDecimalNumber<DictionaryAttributeType>, ColumnDecimal<DictionaryAttributeType>,
-                    ColumnVector<DictionaryAttributeType>>>>;
+                ColumnVectorOrDecimal<DictionaryAttributeType>>>;
 
     using ColumnPtr = typename ColumnType::MutablePtr;
 
@@ -266,7 +266,7 @@ public:
         {
             return ColumnType::create(size);
         }
-        else if constexpr (IsDecimalNumber<DictionaryAttributeType>)
+        else if constexpr (is_decimal<DictionaryAttributeType>)
         {
             auto nested_type = removeNullable(dictionary_attribute.type);
             auto scale = getDecimalScale(*nested_type);
@@ -379,14 +379,14 @@ template <DictionaryKeyType key_type>
 class DictionaryKeysArenaHolder;
 
 template <>
-class DictionaryKeysArenaHolder<DictionaryKeyType::simple>
+class DictionaryKeysArenaHolder<DictionaryKeyType::Simple>
 {
 public:
     static Arena * getComplexKeyArena() { return nullptr; }
 };
 
 template <>
-class DictionaryKeysArenaHolder<DictionaryKeyType::complex>
+class DictionaryKeysArenaHolder<DictionaryKeyType::Complex>
 {
 public:
 
@@ -401,8 +401,7 @@ template <DictionaryKeyType key_type>
 class DictionaryKeysExtractor
 {
 public:
-    using KeyType = std::conditional_t<key_type == DictionaryKeyType::simple, UInt64, StringRef>;
-    static_assert(key_type != DictionaryKeyType::range, "Range key type is not supported by DictionaryKeysExtractor");
+    using KeyType = std::conditional_t<key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     explicit DictionaryKeysExtractor(const Columns & key_columns_, Arena * complex_key_arena_)
         : key_columns(key_columns_)
@@ -410,7 +409,7 @@ public:
     {
         assert(!key_columns.empty());
 
-        if constexpr (key_type == DictionaryKeyType::simple)
+        if constexpr (key_type == DictionaryKeyType::Simple)
         {
             key_columns[0] = key_columns[0]->convertToFullColumnIfConst();
 
@@ -436,7 +435,7 @@ public:
     {
         assert(current_key_index < keys_size);
 
-        if constexpr (key_type == DictionaryKeyType::simple)
+        if constexpr (key_type == DictionaryKeyType::Simple)
         {
             const auto & column_vector = static_cast<const ColumnVector<UInt64> &>(*key_columns[0]);
             const auto & data = column_vector.getData();
@@ -464,7 +463,7 @@ public:
 
     void rollbackCurrentKey() const
     {
-        if constexpr (key_type == DictionaryKeyType::complex)
+        if constexpr (key_type == DictionaryKeyType::Complex)
             complex_key_arena->rollback(current_complex_key.size);
     }
 
@@ -496,18 +495,31 @@ private:
     Arena * complex_key_arena;
 };
 
+/// Deserialize columns from keys array using dictionary structure
+MutableColumns deserializeColumnsFromKeys(
+    const DictionaryStructure & dictionary_structure,
+    const PaddedPODArray<StringRef> & keys,
+    size_t start,
+    size_t end);
+
+/// Deserialize columns with type and name from keys array using dictionary structure
+ColumnsWithTypeAndName deserializeColumnsWithTypeAndNameFromKeys(
+    const DictionaryStructure & dictionary_structure,
+    const PaddedPODArray<StringRef> & keys,
+    size_t start,
+    size_t end);
+
 /** Merge block with blocks from stream. If there are duplicate keys in block they are filtered out.
   * In result block_to_update will be merged with blocks from stream.
   * Note: readPrefix readImpl readSuffix will be called on stream object during function execution.
   */
 template <DictionaryKeyType dictionary_key_type>
-void mergeBlockWithStream(
+void mergeBlockWithPipe(
     size_t key_columns_size,
     Block & block_to_update,
-    BlockInputStreamPtr & stream)
+    Pipe pipe)
 {
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by updatePreviousyLoadedBlockWithStream");
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     Columns saved_block_key_columns;
     saved_block_key_columns.reserve(key_columns_size);
@@ -555,9 +567,12 @@ void mergeBlockWithStream(
 
     auto result_fetched_columns = block_to_update.cloneEmptyColumns();
 
-    stream->readPrefix();
+    QueryPipeline pipeline(std::move(pipe));
 
-    while (Block block = stream->read())
+    PullingPipelineExecutor executor(pipeline);
+    Block block;
+
+    while (executor.pull(block))
     {
         Columns block_key_columns;
         block_key_columns.reserve(key_columns_size);
@@ -591,8 +606,6 @@ void mergeBlockWithStream(
         }
     }
 
-    stream->readSuffix();
-
     size_t result_fetched_rows = result_fetched_columns.front()->size();
     size_t filter_hint = filter.size() - indexes_to_remove_count;
 
@@ -645,4 +658,26 @@ static const PaddedPODArray<T> & getColumnVectorData(
     }
 }
 
+template <typename T>
+static ColumnPtr getColumnFromPODArray(const PaddedPODArray<T> & array)
+{
+    auto column_vector = ColumnVector<T>::create();
+    column_vector->getData().reserve(array.size());
+    column_vector->getData().insert(array.begin(), array.end());
+
+    return column_vector;
 }
+
+template <typename T>
+static ColumnPtr getColumnFromPODArray(const PaddedPODArray<T> & array, size_t start, size_t length)
+{
+    auto column_vector = ColumnVector<T>::create();
+    column_vector->getData().reserve(length);
+    column_vector->getData().insert(array.begin() + start, array.begin() + start + length);
+
+    return column_vector;
+}
+
+}
+
+
diff --git a/src/Dictionaries/DictionarySource.cpp b/src/Dictionaries/DictionarySource.cpp
new file mode 100644
index 00000000000..fa25dab6115
--- /dev/null
+++ b/src/Dictionaries/DictionarySource.cpp
@@ -0,0 +1,184 @@
+#include "DictionarySource.h"
+#include <Dictionaries/DictionaryHelpers.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
+bool DictionarySourceCoordinator::getKeyColumnsNextRangeToRead(ColumnsWithTypeAndName & key_columns, ColumnsWithTypeAndName & data_columns)
+{
+    size_t read_block_index = parallel_read_block_index++;
+
+    size_t start = read_block_index * max_block_size;
+    size_t end = (read_block_index + 1) * max_block_size;
+
+    size_t keys_size = key_columns_with_type[0].column->size();
+
+    if (start >= keys_size)
+        return false;
+
+    end = std::min(end, keys_size);
+    size_t length = end - start;
+
+    key_columns = cutColumns(key_columns_with_type, start, length);
+    data_columns = cutColumns(data_columns_with_type, start, length);
+
+    return true;
+}
+
+void DictionarySourceCoordinator::initialize(const Names & column_names)
+{
+    ColumnsWithTypeAndName columns_with_type;
+
+    const auto & dictionary_structure = dictionary->getStructure();
+
+    for (const auto & column_name : column_names)
+    {
+        ColumnWithTypeAndName column_with_type;
+        column_with_type.name = column_name;
+
+        auto it = dictionary_structure.attribute_name_to_index.find(column_name);
+        if (it == dictionary_structure.attribute_name_to_index.end())
+        {
+            if (dictionary_structure.id.has_value() && column_name == dictionary_structure.id->name)
+            {
+                column_with_type.type = std::make_shared<DataTypeUInt64>();
+            }
+            else if (dictionary_structure.range_min.has_value() && column_name == dictionary_structure.range_min->name)
+            {
+                column_with_type.type = dictionary_structure.range_min->type;
+            }
+            else if (dictionary_structure.range_max.has_value() && column_name == dictionary_structure.range_max->name)
+            {
+                column_with_type.type = dictionary_structure.range_max->type;
+            }
+            else if (dictionary_structure.key.has_value())
+            {
+                const auto & dictionary_key_attributes = *dictionary_structure.key;
+                for (const auto & attribute : dictionary_key_attributes)
+                {
+                    if (column_name == attribute.name)
+                    {
+                        column_with_type.type = attribute.type;
+                        break;
+                    }
+                }
+            }
+        }
+        else
+        {
+            const auto & attribute = dictionary_structure.attributes[it->second];
+            attributes_names_to_read.emplace_back(attribute.name);
+            attributes_types_to_read.emplace_back(attribute.type);
+            attributes_default_values_columns.emplace_back(nullptr);
+
+            column_with_type.type = attribute.type;
+        }
+
+        if (!column_with_type.type)
+            throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "No such column name {} in dictionary {}",
+                column_name,
+                dictionary->getDictionaryID().getNameForLogs());
+
+        column_with_type.column = column_with_type.type->createColumn();
+        columns_with_type.emplace_back(std::move(column_with_type));
+    }
+
+    header = Block(std::move(columns_with_type));
+}
+
+ColumnsWithTypeAndName
+DictionarySourceCoordinator::cutColumns(const ColumnsWithTypeAndName & columns_with_type, size_t start, size_t length)
+{
+    ColumnsWithTypeAndName result;
+    result.reserve(columns_with_type.size());
+
+    for (const auto & column_with_type : columns_with_type)
+    {
+        ColumnWithTypeAndName result_column_with_type;
+
+        result_column_with_type.column = column_with_type.column->cut(start, length);
+        result_column_with_type.type = column_with_type.type;
+        result_column_with_type.name = column_with_type.name;
+
+        result.emplace_back(std::move(result_column_with_type));
+    }
+
+    return result;
+}
+
+
+Chunk DictionarySource::generate()
+{
+    ColumnsWithTypeAndName key_columns_to_read;
+    ColumnsWithTypeAndName data_columns;
+
+    if (!coordinator->getKeyColumnsNextRangeToRead(key_columns_to_read, data_columns))
+        return {};
+
+    const auto & header = coordinator->getHeader();
+
+    std::vector<ColumnPtr> key_columns;
+    std::vector<DataTypePtr> key_types;
+
+    key_columns.reserve(key_columns_to_read.size());
+    key_types.reserve(key_columns_to_read.size());
+
+    std::unordered_map<std::string_view, ColumnPtr> name_to_column;
+
+    for (const auto & key_column_to_read : key_columns_to_read)
+    {
+        key_columns.emplace_back(key_column_to_read.column);
+        key_types.emplace_back(key_column_to_read.type);
+
+        if (header.has(key_column_to_read.name))
+            name_to_column.emplace(key_column_to_read.name, key_column_to_read.column);
+    }
+
+    for (const auto & data_column : data_columns)
+    {
+        if (header.has(data_column.name))
+            name_to_column.emplace(data_column.name, data_column.column);
+    }
+
+    const auto & attributes_names_to_read = coordinator->getAttributesNamesToRead();
+    const auto & attributes_types_to_read = coordinator->getAttributesTypesToRead();
+    const auto & attributes_default_values_columns = coordinator->getAttributesDefaultValuesColumns();
+
+    const auto & dictionary = coordinator->getDictionary();
+    auto attributes_columns = dictionary->getColumns(
+        attributes_names_to_read,
+        attributes_types_to_read,
+        key_columns,
+        key_types,
+        attributes_default_values_columns);
+
+    for (size_t i = 0; i < attributes_names_to_read.size(); ++i)
+    {
+        const auto & attribute_name = attributes_names_to_read[i];
+        name_to_column.emplace(attribute_name, attributes_columns[i]);
+    }
+
+    std::vector<ColumnPtr> result_columns;
+    result_columns.reserve(header.columns());
+
+    for (const auto & column_with_type : header)
+    {
+        const auto & header_name = column_with_type.name;
+        auto it = name_to_column.find(header_name);
+        if (it == name_to_column.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column name {} not found in result columns", header_name);
+
+        result_columns.emplace_back(it->second);
+    }
+
+    size_t rows_size = result_columns[0]->size();
+    return Chunk(result_columns, rows_size);
+}
+
+}
diff --git a/src/Dictionaries/DictionarySource.h b/src/Dictionaries/DictionarySource.h
new file mode 100644
index 00000000000..d1851b73a21
--- /dev/null
+++ b/src/Dictionaries/DictionarySource.h
@@ -0,0 +1,97 @@
+#pragma once
+
+#include <memory>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/IColumn.h>
+#include <Core/Names.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionary.h>
+
+
+namespace DB
+{
+
+class DictionarySourceCoordinator
+{
+public:
+
+    explicit DictionarySourceCoordinator(
+        std::shared_ptr<const IDictionary> dictionary_,
+        const Names & column_names,
+        ColumnsWithTypeAndName && key_columns_with_type_,
+        size_t max_block_size_)
+        : dictionary(std::move(dictionary_))
+        , key_columns_with_type(std::move(key_columns_with_type_))
+        , max_block_size(max_block_size_)
+    {
+        initialize(column_names);
+    }
+
+    explicit DictionarySourceCoordinator(
+        std::shared_ptr<const IDictionary> dictionary_,
+        const Names & column_names,
+        ColumnsWithTypeAndName && key_columns_with_type_,
+        ColumnsWithTypeAndName && data_columns_with_type_,
+        size_t max_block_size_)
+        : dictionary(std::move(dictionary_))
+        , key_columns_with_type(std::move(key_columns_with_type_))
+        , data_columns_with_type(std::move(data_columns_with_type_))
+        , max_block_size(max_block_size_)
+    {
+        initialize(column_names);
+    }
+
+    bool getKeyColumnsNextRangeToRead(ColumnsWithTypeAndName & key_columns, ColumnsWithTypeAndName & data_columns);
+
+    const Block & getHeader() const { return header; }
+
+    const std::vector<std::string> & getAttributesNamesToRead() const { return attributes_names_to_read; }
+
+    const std::vector<DataTypePtr> & getAttributesTypesToRead() const { return attributes_types_to_read; }
+
+    const std::vector<ColumnPtr> & getAttributesDefaultValuesColumns() const { return attributes_default_values_columns; }
+
+    const std::shared_ptr<const IDictionary> & getDictionary() const { return dictionary; }
+
+private:
+    void initialize(const Names & column_names);
+
+    static ColumnsWithTypeAndName cutColumns(const ColumnsWithTypeAndName & columns_with_type, size_t start, size_t length);
+
+    std::shared_ptr<const IDictionary> dictionary;
+
+    ColumnsWithTypeAndName key_columns_with_type;
+    ColumnsWithTypeAndName data_columns_with_type;
+
+    Block header;
+
+    std::vector<std::string> attributes_names_to_read;
+    std::vector<DataTypePtr> attributes_types_to_read;
+    std::vector<ColumnPtr> attributes_default_values_columns;
+
+    const size_t max_block_size;
+    std::atomic<size_t> parallel_read_block_index = 0;
+};
+
+class DictionarySource : public SourceWithProgress
+{
+public:
+
+    explicit DictionarySource(std::shared_ptr<DictionarySourceCoordinator> coordinator_)
+        : SourceWithProgress(coordinator_->getHeader()), coordinator(std::move(coordinator_))
+    {
+    }
+
+private:
+    String getName() const override { return "DictionarySource"; }
+
+    Chunk generate() override;
+
+    std::shared_ptr<DictionarySourceCoordinator> coordinator;
+};
+
+}
diff --git a/src/Dictionaries/DictionarySourceFactory.cpp b/src/Dictionaries/DictionarySourceFactory.cpp
index 1992c87d31f..937f246a6da 100644
--- a/src/Dictionaries/DictionarySourceFactory.cpp
+++ b/src/Dictionaries/DictionarySourceFactory.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DictionaryStructure.h"
 
 namespace DB
@@ -80,7 +80,7 @@ DictionarySourcePtr DictionarySourceFactory::create(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     const DictionaryStructure & dict_struct,
-    ContextPtr context,
+    ContextPtr global_context,
     const std::string & default_database,
     bool check_config) const
 {
@@ -99,7 +99,7 @@ DictionarySourcePtr DictionarySourceFactory::create(
     {
         const auto & create_source = found->second;
         auto sample_block = createSampleBlock(dict_struct);
-        return create_source(dict_struct, config, config_prefix, sample_block, context, default_database, check_config);
+        return create_source(dict_struct, config, config_prefix, sample_block, global_context, default_database, check_config);
     }
 
     throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
diff --git a/src/Dictionaries/DictionarySourceFactory.h b/src/Dictionaries/DictionarySourceFactory.h
index bb583927ac4..f4c3fa12163 100644
--- a/src/Dictionaries/DictionarySourceFactory.h
+++ b/src/Dictionaries/DictionarySourceFactory.h
@@ -35,7 +35,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         Block & sample_block,
-        ContextPtr context,
+        ContextPtr global_context,
         const std::string & default_database,
         bool check_config)>;
 
@@ -48,7 +48,7 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         const DictionaryStructure & dict_struct,
-        ContextPtr context,
+        ContextPtr global_context,
         const std::string & default_database,
         bool check_config) const;
 
diff --git a/src/Dictionaries/DictionarySourceHelpers.cpp b/src/Dictionaries/DictionarySourceHelpers.cpp
index 54ed07092d3..cd87cf831a2 100644
--- a/src/Dictionaries/DictionarySourceHelpers.cpp
+++ b/src/Dictionaries/DictionarySourceHelpers.cpp
@@ -1,7 +1,6 @@
 #include "DictionarySourceHelpers.h"
 #include <Columns/ColumnsNumber.h>
 #include <Core/ColumnWithTypeAndName.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <IO/WriteHelpers.h>
 #include "DictionaryStructure.h"
@@ -59,88 +58,76 @@ Block blockForKeys(
     return block;
 }
 
-ContextMutablePtr copyContextAndApplySettings(
-    const std::string & config_prefix,
-    ContextPtr context,
-    const Poco::Util::AbstractConfiguration & config)
+
+SettingsChanges readSettingsFromDictionaryConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
 {
-    auto local_context = Context::createCopy(context);
-    if (config.has(config_prefix + ".settings"))
+    if (!config.has(config_prefix + ".settings"))
+        return {};
+
+    const auto prefix = config_prefix + ".settings";
+
+    Poco::Util::AbstractConfiguration::Keys config_keys;
+    config.keys(prefix, config_keys);
+
+    SettingsChanges changes;
+
+    for (const std::string & key : config_keys)
     {
-        const auto prefix = config_prefix + ".settings";
-
-        Poco::Util::AbstractConfiguration::Keys config_keys;
-        config.keys(prefix, config_keys);
-
-        SettingsChanges changes;
-
-        for (const std::string & key : config_keys)
-        {
-            const auto value = config.getString(prefix + "." + key);
-            changes.emplace_back(key, value);
-        }
-
-        local_context->applySettingsChanges(changes);
+        const auto value = config.getString(prefix + "." + key);
+        changes.emplace_back(key, value);
     }
-    return local_context;
+
+    return changes;
 }
 
 
-BlockInputStreamWithAdditionalColumns::BlockInputStreamWithAdditionalColumns(
-    Block block_to_add_, std::unique_ptr<IBlockInputStream> && stream_)
-    : block_to_add(std::move(block_to_add_))
-    , stream(std::move(stream_))
+ContextMutablePtr copyContextAndApplySettingsFromDictionaryConfig(
+    const ContextPtr & context, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
 {
+    auto context_copy = Context::createCopy(context);
+    auto changes = readSettingsFromDictionaryConfig(config, config_prefix);
+    context_copy->applySettingsChanges(changes);
+    return context_copy;
 }
 
-Block BlockInputStreamWithAdditionalColumns::getHeader() const
+static Block transformHeader(Block header, Block block_to_add)
 {
-    auto header = stream->getHeader();
-
-    if (header)
-    {
-        for (Int64 i = static_cast<Int64>(block_to_add.columns() - 1); i >= 0; --i)
-            header.insert(0, block_to_add.getByPosition(i).cloneEmpty());
-    }
+    for (Int64 i = static_cast<Int64>(block_to_add.columns() - 1); i >= 0; --i)
+        header.insert(0, block_to_add.getByPosition(i).cloneEmpty());
 
     return header;
 }
 
-Block BlockInputStreamWithAdditionalColumns::readImpl()
+TransformWithAdditionalColumns::TransformWithAdditionalColumns(
+    Block block_to_add_, const Block & header)
+    : ISimpleTransform(header, transformHeader(header, block_to_add_), true)
+    , block_to_add(std::move(block_to_add_))
 {
-    auto block = stream->read();
+}
 
-    if (block)
+void TransformWithAdditionalColumns::transform(Chunk & chunk)
+{
+    if (chunk)
     {
-        auto block_rows = block.rows();
+        auto num_rows = chunk.getNumRows();
+        auto columns = chunk.detachColumns();
 
-        auto cut_block = block_to_add.cloneWithCutColumns(current_range_index, block_rows);
+        auto cut_block = block_to_add.cloneWithCutColumns(current_range_index, num_rows);
 
-        if (cut_block.rows() != block_rows)
+        if (cut_block.rows() != num_rows)
             throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
                 "Number of rows in block to add after cut must equal to number of rows in block from inner stream");
 
         for (Int64 i = static_cast<Int64>(cut_block.columns() - 1); i >= 0; --i)
-            block.insert(0, cut_block.getByPosition(i));
+            columns.insert(columns.begin(), cut_block.getByPosition(i).column);
 
-        current_range_index += block_rows;
+        current_range_index += num_rows;
+        chunk.setColumns(std::move(columns), num_rows);
     }
-
-    return block;
 }
 
-void BlockInputStreamWithAdditionalColumns::readPrefix()
+String TransformWithAdditionalColumns::getName() const
 {
-    stream->readPrefix();
-}
-
-void BlockInputStreamWithAdditionalColumns::readSuffix()
-{
-    stream->readSuffix();
-}
-
-String BlockInputStreamWithAdditionalColumns::getName() const
-{
-    return "BlockInputStreamWithAdditionalColumns";
+    return "TransformWithAdditionalColumns";
 }
 }
diff --git a/src/Dictionaries/DictionarySourceHelpers.h b/src/Dictionaries/DictionarySourceHelpers.h
index 6fed4c7181c..39c6e7b3c42 100644
--- a/src/Dictionaries/DictionarySourceHelpers.h
+++ b/src/Dictionaries/DictionarySourceHelpers.h
@@ -2,9 +2,9 @@
 
 #include <vector>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/ISimpleTransform.h>
 #include <Columns/IColumn.h>
 #include <Core/Block.h>
 #include <Interpreters/Context_fwd.h>
@@ -14,6 +14,7 @@ namespace DB
 {
 
 struct DictionaryStructure;
+class SettingsChanges;
 
 /// For simple key
 
@@ -29,33 +30,24 @@ Block blockForKeys(
     const std::vector<size_t> & requested_rows);
 
 /// Used for applying settings to copied context in some register[...]Source functions
-ContextMutablePtr copyContextAndApplySettings(
-    const std::string & config_prefix,
-    ContextPtr context,
-    const Poco::Util::AbstractConfiguration & config);
+SettingsChanges readSettingsFromDictionaryConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
+ContextMutablePtr copyContextAndApplySettingsFromDictionaryConfig(const ContextPtr & context, const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
 
 /** A stream, adds additional columns to each block that it will read from inner stream.
      *
      *  block_to_add rows size must be equal to final sum rows size of all inner stream blocks.
      */
-class BlockInputStreamWithAdditionalColumns final : public IBlockInputStream
+class TransformWithAdditionalColumns final : public ISimpleTransform
 {
 public:
-    BlockInputStreamWithAdditionalColumns(Block block_to_add_, std::unique_ptr<IBlockInputStream> && stream_);
+    TransformWithAdditionalColumns(Block block_to_add_, const Block & header);
 
-    Block getHeader() const override;
-
-    Block readImpl() override;
-
-    void readPrefix() override;
-
-    void readSuffix() override;
+    void transform(Chunk & chunk) override;
 
     String getName() const override;
 
 private:
     Block block_to_add;
-    std::unique_ptr<IBlockInputStream> stream;
     size_t current_range_index = 0;
 };
 
diff --git a/src/Dictionaries/DictionaryStructure.cpp b/src/Dictionaries/DictionaryStructure.cpp
index 9f46addd912..21d43031204 100644
--- a/src/Dictionaries/DictionaryStructure.cpp
+++ b/src/Dictionaries/DictionaryStructure.cpp
@@ -19,84 +19,37 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_TYPE;
-    extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int TYPE_MISMATCH;
     extern const int BAD_ARGUMENTS;
 }
 
 namespace
 {
-    DictionaryTypedSpecialAttribute makeDictionaryTypedSpecialAttribute(
-        const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const std::string & default_type)
-    {
-        const auto name = config.getString(config_prefix + ".name", "");
-        const auto expression = config.getString(config_prefix + ".expression", "");
+DictionaryTypedSpecialAttribute makeDictionaryTypedSpecialAttribute(
+    const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const std::string & default_type)
+{
+    const auto name = config.getString(config_prefix + ".name", "");
+    const auto expression = config.getString(config_prefix + ".expression", "");
 
-        if (name.empty() && !expression.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
-
-        const auto type_name = config.getString(config_prefix + ".type", default_type);
-        return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
-    }
+    if (name.empty() && !expression.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Element {}.name is empty");
 
+    const auto type_name = config.getString(config_prefix + ".type", default_type);
+    return DictionaryTypedSpecialAttribute{std::move(name), std::move(expression), DataTypeFactory::instance().get(type_name)};
 }
 
-
-AttributeUnderlyingType getAttributeUnderlyingType(const DataTypePtr & type)
+std::optional<AttributeUnderlyingType> maybeGetAttributeUnderlyingType(TypeIndex index)
 {
-    auto type_index = type->getTypeId();
-
-    switch (type_index)
+    switch (index) /// Special cases which do not map TypeIndex::T -> AttributeUnderlyingType::T
     {
-        case TypeIndex::UInt8:          return AttributeUnderlyingType::UInt8;
-        case TypeIndex::UInt16:         return AttributeUnderlyingType::UInt16;
-        case TypeIndex::UInt32:         return AttributeUnderlyingType::UInt32;
-        case TypeIndex::UInt64:         return AttributeUnderlyingType::UInt64;
-        case TypeIndex::UInt128:        return AttributeUnderlyingType::UInt128;
-        case TypeIndex::UInt256:        return AttributeUnderlyingType::UInt256;
-
-        case TypeIndex::Int8:           return AttributeUnderlyingType::Int8;
-        case TypeIndex::Int16:          return AttributeUnderlyingType::Int16;
-        case TypeIndex::Int32:          return AttributeUnderlyingType::Int32;
-        case TypeIndex::Int64:          return AttributeUnderlyingType::Int64;
-        case TypeIndex::Int128:         return AttributeUnderlyingType::Int128;
-        case TypeIndex::Int256:         return AttributeUnderlyingType::Int256;
-
-        case TypeIndex::Float32:        return AttributeUnderlyingType::Float32;
-        case TypeIndex::Float64:        return AttributeUnderlyingType::Float64;
-
-        case TypeIndex::Decimal32:      return AttributeUnderlyingType::Decimal32;
-        case TypeIndex::Decimal64:      return AttributeUnderlyingType::Decimal64;
-        case TypeIndex::Decimal128:     return AttributeUnderlyingType::Decimal128;
-        case TypeIndex::Decimal256:     return AttributeUnderlyingType::Decimal256;
-
-        case TypeIndex::Date:           return AttributeUnderlyingType::UInt16;
-        case TypeIndex::DateTime:       return AttributeUnderlyingType::UInt32;
-        case TypeIndex::DateTime64:     return AttributeUnderlyingType::UInt64;
-
-        case TypeIndex::UUID:           return AttributeUnderlyingType::UUID;
-
-        case TypeIndex::String:         return AttributeUnderlyingType::String;
-
-        case TypeIndex::Array:          return AttributeUnderlyingType::Array;
-
+        case TypeIndex::Date:       return AttributeUnderlyingType::UInt16;
+        case TypeIndex::DateTime:   return AttributeUnderlyingType::UInt32;
+        case TypeIndex::DateTime64: return AttributeUnderlyingType::UInt64;
         default: break;
     }
 
-    throw Exception(ErrorCodes::UNKNOWN_TYPE, "Unknown type {} for dictionary attribute", type->getName());
+    return magic_enum::enum_cast<AttributeUnderlyingType>(static_cast<TypeIndexUnderlying>(index));
 }
-
-
-std::string toString(AttributeUnderlyingType type)
-{
-    switch (type)
-    {
-#define M(TYPE) case AttributeUnderlyingType::TYPE: return #TYPE;
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
-    }
-
-    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Unknown dictionary attribute type {}", toString(static_cast<int>(type)));
 }
 
 
@@ -134,42 +87,11 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
         if (id->name.empty())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "'id' cannot be empty");
 
-        const char * range_default_type = "Date";
-        if (config.has(structure_prefix + ".range_min"))
-            range_min.emplace(makeDictionaryTypedSpecialAttribute(config, structure_prefix + ".range_min", range_default_type));
-
-        if (config.has(structure_prefix + ".range_max"))
-            range_max.emplace(makeDictionaryTypedSpecialAttribute(config, structure_prefix + ".range_max", range_default_type));
-
-        if (range_min.has_value() != range_max.has_value())
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Dictionary structure should have both 'range_min' and 'range_max' either specified or not.");
-        }
-
-        if (range_min && range_max && !range_min->type->equals(*range_max->type))
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Dictionary structure 'range_min' and 'range_max' should have same type, "
-                "'range_min' type: {},"
-                "'range_max' type: {}",
-                range_min->type->getName(),
-                range_max->type->getName());
-        }
-
-        if (range_min)
-        {
-            if (!range_min->type->isValueRepresentedByInteger())
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Dictionary structure type of 'range_min' and 'range_max' should be an integer, Date, DateTime, or Enum."
-                    " Actual 'range_min' and 'range_max' type is {}",
-                    range_min->type->getName());
-        }
-
-        if (!id->expression.empty() || (range_min && !range_min->expression.empty()) || (range_max && !range_max->expression.empty()))
+        if (!id->expression.empty())
             has_expressions = true;
     }
 
+    parseRangeConfiguration(config, structure_prefix);
     attributes = getAttributes(config, structure_prefix, /*complex_key_attributes =*/ false);
 
     for (size_t i = 0; i < attributes.size(); ++i)
@@ -183,7 +105,7 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
             if (id && attribute.underlying_type != AttributeUnderlyingType::UInt64)
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
                     "Hierarchical attribute type for dictionary with simple key must be UInt64. Actual {}",
-                    toString(attribute.underlying_type));
+                    attribute.underlying_type);
 
             else if (key)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary with complex key does not support hierarchy");
@@ -192,9 +114,6 @@ DictionaryStructure::DictionaryStructure(const Poco::Util::AbstractConfiguration
         }
     }
 
-    if (attributes.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary has no attributes defined");
-
     if (config.getBool(config_prefix + ".layout.ip_trie.access_to_key_from_attributes", false))
         access_to_key_from_attributes = true;
 }
@@ -367,7 +286,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
 
         if (!inserted)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Dictionary attributes names must be unique. Attribute name ({}) is not unique",
+                "Dictionary attributes names must be unique. Attribute name {} is not unique",
                 name);
 
         const auto type_string = config.getString(prefix + "type");
@@ -376,7 +295,12 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
         bool is_nullable = initial_type->isNullable();
 
         auto non_nullable_type = removeNullable(initial_type);
-        const auto underlying_type = getAttributeUnderlyingType(non_nullable_type);
+
+        const auto underlying_type_opt = maybeGetAttributeUnderlyingType(non_nullable_type->getTypeId());
+
+        if (!underlying_type_opt)
+            throw Exception(ErrorCodes::UNKNOWN_TYPE,
+                "Unknown type {} for dictionary attribute", non_nullable_type->getName());
 
         const auto expression = config.getString(prefix + "expression", "");
         if (!expression.empty())
@@ -425,7 +349,7 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
 
         res_attributes.emplace_back(DictionaryAttribute{
             name,
-            underlying_type,
+            *underlying_type_opt,
             initial_type,
             initial_type_serialization,
             expression,
@@ -439,4 +363,42 @@ std::vector<DictionaryAttribute> DictionaryStructure::getAttributes(
     return res_attributes;
 }
 
+void DictionaryStructure::parseRangeConfiguration(const Poco::Util::AbstractConfiguration & config, const std::string & structure_prefix)
+{
+    const char * range_default_type = "Date";
+    if (config.has(structure_prefix + ".range_min"))
+        range_min.emplace(makeDictionaryTypedSpecialAttribute(config, structure_prefix + ".range_min", range_default_type));
+
+    if (config.has(structure_prefix + ".range_max"))
+        range_max.emplace(makeDictionaryTypedSpecialAttribute(config, structure_prefix + ".range_max", range_default_type));
+
+    if (range_min.has_value() != range_max.has_value())
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Dictionary structure should have both 'range_min' and 'range_max' either specified or not.");
+    }
+
+    if (range_min && range_max && !range_min->type->equals(*range_max->type))
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Dictionary structure 'range_min' and 'range_max' should have same type, "
+            "'range_min' type: {},"
+            "'range_max' type: {}",
+            range_min->type->getName(),
+            range_max->type->getName());
+    }
+
+    if (range_min)
+    {
+        if (!range_min->type->isValueRepresentedByInteger())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Dictionary structure type of 'range_min' and 'range_max' should be an integer, Date, DateTime, or Enum."
+                " Actual 'range_min' and 'range_max' type is {}",
+                range_min->type->getName());
+    }
+
+    if ((range_min && !range_min->expression.empty()) || (range_max && !range_max->expression.empty()))
+        has_expressions = true;
+}
+
 }
diff --git a/src/Dictionaries/DictionaryStructure.h b/src/Dictionaries/DictionaryStructure.h
index 3ea640d77e8..4de00ddd259 100644
--- a/src/Dictionaries/DictionaryStructure.h
+++ b/src/Dictionaries/DictionaryStructure.h
@@ -11,53 +11,37 @@
 #include <IO/ReadBufferFromString.h>
 #include <DataTypes/IDataType.h>
 #include <Interpreters/IExternalLoadable.h>
+#include <base/EnumReflection.h>
+#include <Core/TypeId.h>
 
 #if defined(__GNUC__)
     /// GCC mistakenly warns about the names in enum class.
     #pragma GCC diagnostic ignored "-Wshadow"
 #endif
 
-
-#define FOR_ATTRIBUTE_TYPES(M) \
-    M(UInt8) \
-    M(UInt16) \
-    M(UInt32) \
-    M(UInt64) \
-    M(UInt128) \
-    M(UInt256) \
-    M(Int8) \
-    M(Int16) \
-    M(Int32) \
-    M(Int64) \
-    M(Int128) \
-    M(Int256) \
-    M(Float32) \
-    M(Float64) \
-    M(Decimal32) \
-    M(Decimal64) \
-    M(Decimal128) \
-    M(Decimal256) \
-    M(UUID) \
-    M(String) \
-    M(Array) \
-
-
 namespace DB
 {
+using TypeIndexUnderlying = magic_enum::underlying_type_t<TypeIndex>;
 
-enum class AttributeUnderlyingType
+// We need to be able to map TypeIndex -> AttributeUnderlyingType and AttributeUnderlyingType -> real type
+// The first can be done by defining AttributeUnderlyingType enum values to TypeIndex values and then performing
+// a enum_cast.
+// The second can be achieved by using ReverseTypeId
+#define map_item(__T) __T = static_cast<TypeIndexUnderlying>(TypeIndex::__T)
+
+enum class AttributeUnderlyingType : TypeIndexUnderlying
 {
-#define M(TYPE) TYPE,
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
+    map_item(Int8), map_item(Int16), map_item(Int32), map_item(Int64), map_item(Int128), map_item(Int256),
+    map_item(UInt8), map_item(UInt16), map_item(UInt32), map_item(UInt64), map_item(UInt128), map_item(UInt256),
+    map_item(Float32), map_item(Float64),
+    map_item(Decimal32), map_item(Decimal64), map_item(Decimal128), map_item(Decimal256),
+
+    map_item(UUID), map_item(String), map_item(Array)
 };
 
+#undef map_item
 
-AttributeUnderlyingType getAttributeUnderlyingType(const std::string & type);
-
-std::string toString(AttributeUnderlyingType type);
-
-/// Min and max lifetimes for a dictionary or it's entry
+/// Min and max lifetimes for a dictionary or its entry
 using DictionaryLifetime = ExternalLoadableLifetime;
 
 /** Holds the description of a single dictionary attribute:
@@ -67,8 +51,9 @@ using DictionaryLifetime = ExternalLoadableLifetime;
 *    - null_value, used as a default value for non-existent entries in the dictionary,
 *        decimal representation for numeric attributes;
 *    - hierarchical, whether this attribute defines a hierarchy;
-*    - injective, whether the mapping to parent is injective (can be used for optimization of GROUP BY?)
-*    - is_object_id, used in mongo dictionary, converts string key to objectid
+*    - injective, whether the mapping to parent is injective (can be used for optimization of GROUP BY?);
+*    - is_object_id, used in mongo dictionary, converts string key to objectid;
+*    - is_nullable, is attribute nullable;
 */
 struct DictionaryAttribute final
 {
@@ -84,24 +69,23 @@ struct DictionaryAttribute final
     const bool is_nullable;
 };
 
-template <typename Type>
+template <AttributeUnderlyingType type>
 struct DictionaryAttributeType
 {
-    using AttributeType = Type;
+    /// Converts @c type to it underlying type e.g. AttributeUnderlyingType::UInt8 -> UInt8
+    using AttributeType = ReverseTypeId<
+        static_cast<TypeIndex>(
+            static_cast<TypeIndexUnderlying>(type))>;
 };
 
 template <typename F>
-void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
+constexpr void callOnDictionaryAttributeType(AttributeUnderlyingType type, F && func)
 {
-    switch (type)
+    static_for<AttributeUnderlyingType>([type, func = std::forward<F>(func)](auto other)
     {
-#define M(TYPE) \
-        case AttributeUnderlyingType::TYPE: \
-            func(DictionaryAttributeType<TYPE>()); \
-            break;
-    FOR_ATTRIBUTE_TYPES(M)
-#undef M
-    }
+        if (type == other)
+            func(DictionaryAttributeType<other>{});
+    });
 };
 
 struct DictionarySpecialAttribute final
@@ -153,6 +137,10 @@ private:
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         bool complex_key_attributes);
+
+    /// parse range_min and range_max
+    void parseRangeConfiguration(const Poco::Util::AbstractConfiguration & config, const std::string & structure_prefix);
+
 };
 
 }
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index c9b38acfbb5..551f485e5bb 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -8,6 +8,8 @@
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 
 namespace DB
 {
@@ -38,7 +40,7 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
     const DataTypes & key_types [[maybe_unused]],
     const Columns & default_values_columns) const
 {
-    if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
     DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
@@ -66,11 +68,12 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
     size_t dictionary_keys_size = dict_struct.getKeysNames().size();
     block_key_columns.reserve(dictionary_keys_size);
 
-    BlockInputStreamPtr stream = getSourceBlockInputStream(key_columns, requested_keys);
+    QueryPipeline pipeline(getSourceBlockInputStream(key_columns, requested_keys));
 
-    stream->readPrefix();
+    PullingPipelineExecutor executor(pipeline);
 
-    while (const auto block = stream->read())
+    Block block;
+    while (executor.pull(block))
     {
         /// Split into keys columns and attribute columns
         for (size_t i = 0; i < dictionary_keys_size; ++i)
@@ -98,8 +101,6 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
         block_key_columns.clear();
     }
 
-    stream->readSuffix();
-
     Field value_to_insert;
 
     size_t requested_keys_size = requested_keys.size();
@@ -159,7 +160,7 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
     const Columns & key_columns,
     const DataTypes & key_types [[maybe_unused]]) const
 {
-    if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
     DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
@@ -183,13 +184,12 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
     size_t dictionary_keys_size = dict_struct.getKeysNames().size();
     block_key_columns.reserve(dictionary_keys_size);
 
-    BlockInputStreamPtr stream = getSourceBlockInputStream(key_columns, requested_keys);
-
-    stream->readPrefix();
+    QueryPipeline pipeline(getSourceBlockInputStream(key_columns, requested_keys));
+    PullingPipelineExecutor executor(pipeline);
 
     size_t keys_found = 0;
-
-    while (const auto block = stream->read())
+    Block block;
+    while (executor.pull(block))
     {
         /// Split into keys columns and attribute columns
         for (size_t i = 0; i < dictionary_keys_size; ++i)
@@ -216,8 +216,6 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::hasKeys(
         block_key_columns.clear();
     }
 
-    stream->readSuffix();
-
     query_count.fetch_add(requested_keys_size, std::memory_order_relaxed);
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
@@ -229,7 +227,7 @@ ColumnPtr DirectDictionary<dictionary_key_type>::getHierarchy(
     ColumnPtr key_column,
     const DataTypePtr & key_type) const
 {
-    if (dictionary_key_type == DictionaryKeyType::simple)
+    if (dictionary_key_type == DictionaryKeyType::Simple)
     {
         size_t keys_found;
         auto result = getKeysHierarchyDefaultImplementation(this, key_column, key_type, keys_found);
@@ -247,7 +245,7 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::isInHierarchy(
     ColumnPtr in_key_column,
     const DataTypePtr & key_type) const
 {
-    if (dictionary_key_type == DictionaryKeyType::simple)
+    if (dictionary_key_type == DictionaryKeyType::Simple)
     {
         size_t keys_found = 0;
         auto result = getKeysIsInHierarchyDefaultImplementation(this, key_column, in_key_column, key_type, keys_found);
@@ -260,15 +258,15 @@ ColumnUInt8::Ptr DirectDictionary<dictionary_key_type>::isInHierarchy(
 }
 
 template <DictionaryKeyType dictionary_key_type>
-BlockInputStreamPtr DirectDictionary<dictionary_key_type>::getSourceBlockInputStream(
+Pipe DirectDictionary<dictionary_key_type>::getSourceBlockInputStream(
     const Columns & key_columns [[maybe_unused]],
     const PaddedPODArray<KeyType> & requested_keys [[maybe_unused]]) const
 {
     size_t requested_keys_size = requested_keys.size();
 
-    BlockInputStreamPtr stream;
+    Pipe pipe;
 
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
         std::vector<UInt64> ids;
         ids.reserve(requested_keys_size);
@@ -276,7 +274,7 @@ BlockInputStreamPtr DirectDictionary<dictionary_key_type>::getSourceBlockInputSt
         for (auto key : requested_keys)
             ids.emplace_back(key);
 
-        stream = source_ptr->loadIds(ids);
+        pipe = source_ptr->loadIds(ids);
     }
     else
     {
@@ -285,14 +283,14 @@ BlockInputStreamPtr DirectDictionary<dictionary_key_type>::getSourceBlockInputSt
         for (size_t i = 0; i < requested_keys_size; ++i)
             requested_rows.emplace_back(i);
 
-        stream = source_ptr->loadKeys(key_columns, requested_rows);
+        pipe = source_ptr->loadKeys(key_columns, requested_rows);
     }
 
-    return stream;
+    return pipe;
 }
 
 template <DictionaryKeyType dictionary_key_type>
-BlockInputStreamPtr DirectDictionary<dictionary_key_type>::getBlockInputStream(const Names & /* column_names */, size_t /* max_block_size */) const
+Pipe DirectDictionary<dictionary_key_type>::read(const Names & /* column_names */, size_t /* max_block_size */, size_t /* num_streams */) const
 {
     return source_ptr->loadAll();
 }
@@ -306,12 +304,12 @@ namespace
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_prefix,
         DictionarySourcePtr source_ptr,
-        ContextPtr /* context */,
+        ContextPtr /* global_context */,
         bool /* created_from_ddl */)
     {
-        const auto * layout_name = dictionary_key_type == DictionaryKeyType::simple ? "direct" : "complex_key_direct";
+        const auto * layout_name = dictionary_key_type == DictionaryKeyType::Simple ? "direct" : "complex_key_direct";
 
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
         {
             if (dict_struct.key)
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
@@ -343,13 +341,13 @@ namespace
     }
 }
 
-template class DirectDictionary<DictionaryKeyType::simple>;
-template class DirectDictionary<DictionaryKeyType::complex>;
+template class DirectDictionary<DictionaryKeyType::Simple>;
+template class DirectDictionary<DictionaryKeyType::Complex>;
 
 void registerDictionaryDirect(DictionaryFactory & factory)
 {
-    factory.registerLayout("direct", createDirectDictionary<DictionaryKeyType::simple>, false);
-    factory.registerLayout("complex_key_direct", createDirectDictionary<DictionaryKeyType::complex>, true);
+    factory.registerLayout("direct", createDirectDictionary<DictionaryKeyType::Simple>, false);
+    factory.registerLayout("complex_key_direct", createDirectDictionary<DictionaryKeyType::Complex>, true);
 }
 
 
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index a4e8d5f82e6..edf4c8d1d9a 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -20,8 +20,7 @@ template <DictionaryKeyType dictionary_key_type>
 class DirectDictionary final : public IDictionary
 {
 public:
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by direct dictionary");
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     DirectDictionary(
         const StorageID & dict_id_,
@@ -30,7 +29,7 @@ public:
 
     std::string getTypeName() const override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             return "Direct";
         else
             return "ComplexKeyDirect";
@@ -97,10 +96,10 @@ public:
         ColumnPtr in_key_column,
         const DataTypePtr & key_type) const override;
 
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
 private:
-    BlockInputStreamPtr getSourceBlockInputStream(const Columns & key_columns, const PaddedPODArray<KeyType> & requested_keys) const;
+    Pipe getSourceBlockInputStream(const Columns & key_columns, const PaddedPODArray<KeyType> & requested_keys) const;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
@@ -110,7 +109,7 @@ private:
     mutable std::atomic<size_t> found_count{0};
 };
 
-extern template class DirectDictionary<DictionaryKeyType::simple>;
-extern template class DirectDictionary<DictionaryKeyType::complex>;
+extern template class DirectDictionary<DictionaryKeyType::Simple>;
+extern template class DirectDictionary<DictionaryKeyType::Complex>;
 
 }
diff --git a/src/Dictionaries/Embedded/GeodataProviders/Types.h b/src/Dictionaries/Embedded/GeodataProviders/Types.h
index 5f291ee7abd..e63f6bae716 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/Types.h
+++ b/src/Dictionaries/Embedded/GeodataProviders/Types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 using RegionID = UInt32;
diff --git a/src/Dictionaries/Embedded/RegionsHierarchies.cpp b/src/Dictionaries/Embedded/RegionsHierarchies.cpp
index 15e14db4664..15a7017e5f4 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchies.cpp
+++ b/src/Dictionaries/Embedded/RegionsHierarchies.cpp
@@ -1,7 +1,7 @@
 #include "RegionsHierarchies.h"
 
 #include <Poco/DirectoryIterator.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 RegionsHierarchies::RegionsHierarchies(IRegionsHierarchiesDataProviderPtr data_provider)
diff --git a/src/Dictionaries/Embedded/RegionsHierarchy.cpp b/src/Dictionaries/Embedded/RegionsHierarchy.cpp
index 115ae30d93e..1b8ac126f69 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchy.cpp
+++ b/src/Dictionaries/Embedded/RegionsHierarchy.cpp
@@ -3,7 +3,7 @@
 #include <IO/WriteHelpers.h>
 #include <Poco/Exception.h>
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "GeodataProviders/IHierarchiesProvider.h"
 
 
diff --git a/src/Dictionaries/Embedded/RegionsHierarchy.h b/src/Dictionaries/Embedded/RegionsHierarchy.h
index 7f42a76ecc2..45d6c5246ca 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchy.h
+++ b/src/Dictionaries/Embedded/RegionsHierarchy.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <boost/noncopyable.hpp>
-#include <common/types.h>
+#include <base/types.h>
 #include "GeodataProviders/IHierarchiesProvider.h"
 #include <Core/Defines.h>
 
diff --git a/src/Dictionaries/Embedded/RegionsNames.cpp b/src/Dictionaries/Embedded/RegionsNames.cpp
index 30ba8259b3e..61cbd7d97e1 100644
--- a/src/Dictionaries/Embedded/RegionsNames.cpp
+++ b/src/Dictionaries/Embedded/RegionsNames.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Poco/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "GeodataProviders/INamesProvider.h"
 
 
diff --git a/src/Dictionaries/Embedded/RegionsNames.h b/src/Dictionaries/Embedded/RegionsNames.h
index 91830490325..ff60c274401 100644
--- a/src/Dictionaries/Embedded/RegionsNames.h
+++ b/src/Dictionaries/Embedded/RegionsNames.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <vector>
 #include <Poco/Exception.h>
-#include <common/StringRef.h>
-#include <common/types.h>
+#include <base/StringRef.h>
+#include <base/types.h>
 #include "GeodataProviders/INamesProvider.h"
 
 
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index daf79965428..c09993c2a84 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -1,29 +1,25 @@
 #include "ExecutableDictionarySource.h"
 
-#include <functional>
-#include <common/scope_guard.h>
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/OwningBlockInputStream.h>
-#include <DataStreams/formatBlock.h>
+#include <base/logger_useful.h>
+#include <base/LocalDateTime.h>
+#include <Common/ShellCommand.h>
+
+#include <Processors/Sources/ShellCommandSource.h>
+#include <Formats/formatBlock.h>
+
 #include <Interpreters/Context.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
-#include <IO/copyData.h>
-#include <Common/ShellCommand.h>
-#include <Common/ThreadPool.h>
-#include <common/logger_useful.h>
-#include <common/LocalDateTime.h>
-#include "DictionarySourceFactory.h"
-#include "DictionarySourceHelpers.h"
-#include "DictionaryStructure.h"
-#include "registerDictionaries.h"
+
+#include <Dictionaries/DictionarySourceFactory.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/registerDictionaries.h>
 
 
 namespace DB
 {
 
-static const UInt64 max_block_size = 8192;
-
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
@@ -31,34 +27,6 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
-namespace
-{
-    /// Owns ShellCommand and calls wait for it.
-    class ShellCommandOwningBlockInputStream : public OwningBlockInputStream<ShellCommand>
-    {
-    private:
-        Poco::Logger * log;
-    public:
-        ShellCommandOwningBlockInputStream(Poco::Logger * log_, const BlockInputStreamPtr & impl, std::unique_ptr<ShellCommand> command_)
-            : OwningBlockInputStream(std::move(impl), std::move(command_)), log(log_)
-        {
-        }
-
-        void readSuffix() override
-        {
-            OwningBlockInputStream<ShellCommand>::readSuffix();
-
-            std::string err;
-            readStringUntilEOF(err, own->err);
-            if (!err.empty())
-                LOG_ERROR(log, "Having stderr: {}", err);
-
-            own->wait();
-        }
-    };
-
-}
-
 ExecutableDictionarySource::ExecutableDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Configuration & configuration_,
@@ -94,18 +62,21 @@ ExecutableDictionarySource::ExecutableDictionarySource(const ExecutableDictionar
 {
 }
 
-BlockInputStreamPtr ExecutableDictionarySource::loadAll()
+Pipe ExecutableDictionarySource::loadAll()
 {
     if (configuration.implicit_key)
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutableDictionarySource with implicit_key does not support loadAll method");
 
     LOG_TRACE(log, "loadAll {}", toString());
-    auto process = ShellCommand::execute(configuration.command);
-    auto input_stream = context->getInputFormat(configuration.format, process->out, sample_block, max_block_size);
-    return std::make_shared<ShellCommandOwningBlockInputStream>(log, input_stream, std::move(process));
+
+    ShellCommand::Config config(configuration.command);
+    auto process = ShellCommand::execute(config);
+
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process)));
+    return pipe;
 }
 
-BlockInputStreamPtr ExecutableDictionarySource::loadUpdatedAll()
+Pipe ExecutableDictionarySource::loadUpdatedAll()
 {
     if (configuration.implicit_key)
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutableDictionarySource with implicit_key does not support loadUpdatedAll method");
@@ -118,82 +89,13 @@ BlockInputStreamPtr ExecutableDictionarySource::loadUpdatedAll()
         command_with_update_field += " " + configuration.update_field + " " + DB::toString(LocalDateTime(update_time - configuration.update_lag));
 
     LOG_TRACE(log, "loadUpdatedAll {}", command_with_update_field);
-    auto process = ShellCommand::execute(command_with_update_field);
-    auto input_stream = context->getInputFormat(configuration.format, process->out, sample_block, max_block_size);
-    return std::make_shared<ShellCommandOwningBlockInputStream>(log, input_stream, std::move(process));
+    ShellCommand::Config config(command_with_update_field);
+    auto process = ShellCommand::execute(config);
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process)));
+    return pipe;
 }
 
-namespace
-{
-    /** A stream, that runs child process and sends data to its stdin in background thread,
-      *  and receives data from its stdout.
-      */
-    class BlockInputStreamWithBackgroundThread final : public IBlockInputStream
-    {
-    public:
-        BlockInputStreamWithBackgroundThread(
-            ContextPtr context,
-            const std::string & format,
-            const Block & sample_block,
-            const std::string & command_str,
-            Poco::Logger * log_,
-            std::function<void(WriteBufferFromFile &)> && send_data_)
-            : log(log_),
-            command(ShellCommand::execute(command_str)),
-            send_data(std::move(send_data_)),
-            thread([this] { send_data(command->in); })
-        {
-            stream = context->getInputFormat(format, command->out, sample_block, max_block_size);
-        }
-
-        ~BlockInputStreamWithBackgroundThread() override
-        {
-            if (thread.joinable())
-                thread.join();
-        }
-
-        Block getHeader() const override
-        {
-            return stream->getHeader();
-        }
-
-    private:
-        Block readImpl() override
-        {
-            return stream->read();
-        }
-
-        void readPrefix() override
-        {
-            stream->readPrefix();
-        }
-
-        void readSuffix() override
-        {
-            stream->readSuffix();
-
-            std::string err;
-            readStringUntilEOF(err, command->err);
-            if (!err.empty())
-                LOG_ERROR(log, "Having stderr: {}", err);
-
-            if (thread.joinable())
-                thread.join();
-
-            command->wait();
-        }
-
-        String getName() const override { return "WithBackgroundThread"; }
-
-        Poco::Logger * log;
-        BlockInputStreamPtr stream;
-        std::unique_ptr<ShellCommand> command;
-        std::function<void(WriteBufferFromFile &)> send_data;
-        ThreadFromGlobalPool thread;
-    };
-}
-
-BlockInputStreamPtr ExecutableDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe ExecutableDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
 
@@ -201,7 +103,7 @@ BlockInputStreamPtr ExecutableDictionarySource::loadIds(const std::vector<UInt64
     return getStreamForBlock(block);
 }
 
-BlockInputStreamPtr ExecutableDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe ExecutableDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
 
@@ -209,21 +111,34 @@ BlockInputStreamPtr ExecutableDictionarySource::loadKeys(const Columns & key_col
     return getStreamForBlock(block);
 }
 
-BlockInputStreamPtr ExecutableDictionarySource::getStreamForBlock(const Block & block)
+Pipe ExecutableDictionarySource::getStreamForBlock(const Block & block)
 {
-    auto stream = std::make_unique<BlockInputStreamWithBackgroundThread>(
-        context, configuration.format, sample_block, configuration.command, log,
-        [block, this](WriteBufferFromFile & out) mutable
+    ShellCommand::Config config(configuration.command);
+    auto process = ShellCommand::execute(config);
+    auto * process_in = &process->in;
+
+    ShellCommandSource::SendDataTask task = {[process_in, block, this]()
+    {
+        auto & out = *process_in;
+
+        if (configuration.send_chunk_header)
         {
-            auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
-            formatBlock(output_stream, block);
-            out.close();
-        });
+            writeText(block.rows(), out);
+            writeChar('\n', out);
+        }
+
+        auto output_format = context->getOutputFormat(configuration.format, out, block.cloneEmpty());
+        formatBlock(output_format, block);
+        out.close();
+    }};
+    std::vector<ShellCommandSource::SendDataTask> tasks = {std::move(task)};
+
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), std::move(tasks)));
 
     if (configuration.implicit_key)
-        return std::make_shared<BlockInputStreamWithAdditionalColumns>(block, std::move(stream));
-    else
-        return std::shared_ptr<BlockInputStreamWithBackgroundThread>(stream.release());
+        pipe.addTransform(std::make_shared<TransformWithAdditionalColumns>(block, pipe.getHeader()));
+
+    return pipe;
 }
 
 bool ExecutableDictionarySource::isModified() const
@@ -257,7 +172,7 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 ContextPtr context,
+                                 ContextPtr global_context,
                                  const std::string & /* default_database */,
                                  bool created_from_ddl) -> DictionarySourcePtr
     {
@@ -267,10 +182,10 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
         /// Executable dictionaries may execute arbitrary commands.
         /// It's OK for dictionaries created by administrator from xml-file, but
         /// maybe dangerous for dictionaries created from DDL-queries.
-        if (created_from_ddl && context->getApplicationType() != Context::ApplicationType::LOCAL)
+        if (created_from_ddl && global_context->getApplicationType() != Context::ApplicationType::LOCAL)
             throw Exception(ErrorCodes::DICTIONARY_ACCESS_DENIED, "Dictionaries with executable dictionary source are not allowed to be created from DDL query");
 
-        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
 
         std::string settings_config_prefix = config_prefix + ".executable";
 
@@ -280,10 +195,11 @@ void registerDictionarySourceExecutable(DictionarySourceFactory & factory)
             .format = config.getString(settings_config_prefix + ".format"),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
-            .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false)
+            .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
+            .send_chunk_header = config.getBool(settings_config_prefix + ".send_chunk_header", false)
         };
 
-        return std::make_unique<ExecutableDictionarySource>(dict_struct, configuration, sample_block, context_local_copy);
+        return std::make_unique<ExecutableDictionarySource>(dict_struct, configuration, sample_block, context);
     };
 
     factory.registerSource("executable", create_table_source);
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index 0b92023df36..a7ffc8bebcb 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "DictionaryStructure.h"
-#include "IDictionarySource.h"
+#include <base/logger_useful.h>
+
 #include <Core/Block.h>
 #include <Interpreters/Context.h>
 
-namespace Poco { class Logger; }
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 
 namespace DB
@@ -18,13 +19,15 @@ public:
 
     struct Configuration
     {
-        const std::string command;
-        const std::string format;
-        const std::string update_field;
-        const UInt64 update_lag;
+        std::string command;
+        std::string format;
+        std::string update_field;
+        UInt64 update_lag;
         /// Implicit key means that the source script will return only values,
         /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
-        const bool implicit_key;
+        bool implicit_key;
+        /// Send number_of_rows\n before sending chunk to process
+        bool send_chunk_header;
     };
 
     ExecutableDictionarySource(
@@ -36,17 +39,17 @@ public:
     ExecutableDictionarySource(const ExecutableDictionarySource & other);
     ExecutableDictionarySource & operator=(const ExecutableDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
     /** The logic of this method is flawed, absolutely incorrect and ignorant.
       * It may lead to skipping some values due to clock sync or timezone changes.
       * The intended usage of "update_field" is totally different.
       */
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
 
@@ -58,7 +61,7 @@ public:
 
     std::string toString() const override;
 
-    BlockInputStreamPtr getStreamForBlock(const Block & block);
+    Pipe getStreamForBlock(const Block & block);
 
 private:
     Poco::Logger * log;
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index 9eacda343cf..dce2ce94b93 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -1,21 +1,18 @@
 #include "ExecutablePoolDictionarySource.h"
 
-#include <functional>
-#include <common/scope_guard.h>
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/formatBlock.h>
+#include <base/logger_useful.h>
+#include <base/LocalDateTime.h>
+#include <Common/ShellCommand.h>
+
+#include <Formats/formatBlock.h>
+
 #include <Interpreters/Context.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
-#include <IO/copyData.h>
-#include <Common/ShellCommand.h>
-#include <Common/ThreadPool.h>
-#include <common/logger_useful.h>
-#include <common/LocalDateTime.h>
-#include "DictionarySourceFactory.h"
-#include "DictionarySourceHelpers.h"
-#include "DictionaryStructure.h"
-#include "registerDictionaries.h"
+
+#include <Dictionaries/DictionarySourceFactory.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 
 namespace DB
@@ -34,13 +31,13 @@ ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(
     const Configuration & configuration_,
     Block & sample_block_,
     ContextPtr context_)
-    : log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
-    , dict_struct{dict_struct_}
-    , configuration{configuration_}
-    , sample_block{sample_block_}
-    , context{context_}
+    : dict_struct(dict_struct_)
+    , configuration(configuration_)
+    , sample_block(sample_block_)
+    , context(context_)
     /// If pool size == 0 then there is no size restrictions. Poco max size of semaphore is integer type.
-    , process_pool{std::make_shared<ProcessPool>(configuration.pool_size == 0 ? std::numeric_limits<int>::max() : configuration.pool_size)}
+    , process_pool(std::make_shared<ProcessPool>(configuration.pool_size == 0 ? std::numeric_limits<int>::max() : configuration.pool_size))
+    , log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
 {
     /// Remove keys from sample_block for implicit_key dictionary because
     /// these columns will not be returned from source
@@ -59,142 +56,26 @@ ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(
 }
 
 ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(const ExecutablePoolDictionarySource & other)
-    : log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
-    , update_time{other.update_time}
-    , dict_struct{other.dict_struct}
-    , configuration{other.configuration}
-    , sample_block{other.sample_block}
-    , context{Context::createCopy(other.context)}
-    , process_pool{std::make_shared<ProcessPool>(configuration.pool_size)}
+    : dict_struct(other.dict_struct)
+    , configuration(other.configuration)
+    , sample_block(other.sample_block)
+    , context(Context::createCopy(other.context))
+    , process_pool(std::make_shared<ProcessPool>(configuration.pool_size))
+    , log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
 {
 }
 
-BlockInputStreamPtr ExecutablePoolDictionarySource::loadAll()
+Pipe ExecutablePoolDictionarySource::loadAll()
 {
     throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutablePoolDictionarySource does not support loadAll method");
 }
 
-BlockInputStreamPtr ExecutablePoolDictionarySource::loadUpdatedAll()
+Pipe ExecutablePoolDictionarySource::loadUpdatedAll()
 {
     throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "ExecutablePoolDictionarySource does not support loadUpdatedAll method");
 }
 
-namespace
-{
-    /** A stream, that runs child process and sends data to its stdin in background thread,
-      *  and receives data from its stdout.
-      */
-    class PoolBlockInputStreamWithBackgroundThread final : public IBlockInputStream
-    {
-    public:
-        PoolBlockInputStreamWithBackgroundThread(
-            std::shared_ptr<ProcessPool> process_pool_,
-            std::unique_ptr<ShellCommand> && command_,
-            BlockInputStreamPtr && stream_,
-            size_t read_rows_,
-            Poco::Logger * log_,
-            std::function<void(WriteBufferFromFile &)> && send_data_)
-            : process_pool(process_pool_)
-            , command(std::move(command_))
-            , stream(std::move(stream_))
-            , rows_to_read(read_rows_)
-            , log(log_)
-            , send_data(std::move(send_data_))
-            , thread([this]
-            {
-                try
-                {
-                    send_data(command->in);
-                }
-                catch (...)
-                {
-                    std::lock_guard<std::mutex> lck(exception_during_read_lock);
-                    exception_during_read = std::current_exception();
-                }
-            })
-        {}
-
-        ~PoolBlockInputStreamWithBackgroundThread() override
-        {
-            if (thread.joinable())
-                thread.join();
-
-            if (command)
-                process_pool->returnObject(std::move(command));
-        }
-
-        Block getHeader() const override
-        {
-            return stream->getHeader();
-        }
-
-    private:
-        Block readImpl() override
-        {
-            rethrowExceptionDuringReadIfNeeded();
-
-            if (current_read_rows == rows_to_read)
-                return Block();
-
-            Block block;
-
-            try
-            {
-                block = stream->read();
-                current_read_rows += block.rows();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(log);
-                command = nullptr;
-                throw;
-            }
-
-            return block;
-        }
-
-        void readPrefix() override
-        {
-            rethrowExceptionDuringReadIfNeeded();
-            stream->readPrefix();
-        }
-
-        void readSuffix() override
-        {
-            if (thread.joinable())
-                thread.join();
-
-            rethrowExceptionDuringReadIfNeeded();
-            stream->readSuffix();
-        }
-
-        void rethrowExceptionDuringReadIfNeeded()
-        {
-            std::lock_guard<std::mutex> lck(exception_during_read_lock);
-            if (exception_during_read)
-            {
-                command = nullptr;
-                std::rethrow_exception(exception_during_read);
-            }
-        }
-
-        String getName() const override { return "PoolWithBackgroundThread"; }
-
-        std::shared_ptr<ProcessPool> process_pool;
-        std::unique_ptr<ShellCommand> command;
-        BlockInputStreamPtr stream;
-        size_t rows_to_read;
-        Poco::Logger * log;
-        std::function<void(WriteBufferFromFile &)> send_data;
-        ThreadFromGlobalPool thread;
-        size_t current_read_rows = 0;
-        std::mutex exception_during_read_lock;
-        std::exception_ptr exception_during_read;
-    };
-
-}
-
-BlockInputStreamPtr ExecutablePoolDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe ExecutablePoolDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
 
@@ -202,7 +83,7 @@ BlockInputStreamPtr ExecutablePoolDictionarySource::loadIds(const std::vector<UI
     return getStreamForBlock(block);
 }
 
-BlockInputStreamPtr ExecutablePoolDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe ExecutablePoolDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
 
@@ -210,37 +91,48 @@ BlockInputStreamPtr ExecutablePoolDictionarySource::loadKeys(const Columns & key
     return getStreamForBlock(block);
 }
 
-BlockInputStreamPtr ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
+Pipe ExecutablePoolDictionarySource::getStreamForBlock(const Block & block)
 {
     std::unique_ptr<ShellCommand> process;
     bool result = process_pool->tryBorrowObject(process, [this]()
     {
-        bool terminate_in_destructor = true;
-        ShellCommandDestructorStrategy strategy { terminate_in_destructor, configuration.command_termination_timeout };
-        auto shell_command = ShellCommand::execute(configuration.command, false, strategy);
+        ShellCommand::Config config(configuration.command);
+        config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, configuration.command_termination_timeout };
+        auto shell_command = ShellCommand::execute(config);
         return shell_command;
     }, configuration.max_command_execution_time * 10000);
 
     if (!result)
         throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
-            "Could not get process from pool, max command execution timeout exceeded ({}) seconds",
+            "Could not get process from pool, max command execution timeout exceeded {} seconds",
             configuration.max_command_execution_time);
 
     size_t rows_to_read = block.rows();
-    auto read_stream = context->getInputFormat(configuration.format, process->out, sample_block, rows_to_read);
+    auto * process_in = &process->in;
+    ShellCommandSource::SendDataTask task = [process_in, block, this]() mutable
+    {
+        auto & out = *process_in;
 
-    auto stream = std::make_unique<PoolBlockInputStreamWithBackgroundThread>(
-        process_pool, std::move(process), std::move(read_stream), rows_to_read, log,
-        [block, this](WriteBufferFromFile & out) mutable
+        if (configuration.send_chunk_header)
         {
-            auto output_stream = context->getOutputStream(configuration.format, out, block.cloneEmpty());
-            formatBlock(output_stream, block);
-        });
+            writeText(block.rows(), out);
+            writeChar('\n', out);
+        }
+
+        auto output_format = context->getOutputFormat(configuration.format, out, block.cloneEmpty());
+        formatBlock(output_format, block);
+    };
+    std::vector<ShellCommandSource::SendDataTask> tasks = {std::move(task)};
+
+    ShellCommandSourceConfiguration command_configuration;
+    command_configuration.read_fixed_number_of_rows = true;
+    command_configuration.number_of_rows_to_read = rows_to_read;
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, configuration.format, sample_block, std::move(process), std::move(tasks), command_configuration, process_pool));
 
     if (configuration.implicit_key)
-        return std::make_shared<BlockInputStreamWithAdditionalColumns>(block, std::move(stream));
-    else
-        return std::shared_ptr<PoolBlockInputStreamWithBackgroundThread>(stream.release());
+        pipe.addTransform(std::make_shared<TransformWithAdditionalColumns>(block, pipe.getHeader()));
+
+    return pipe;
 }
 
 bool ExecutablePoolDictionarySource::isModified() const
@@ -274,7 +166,7 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 ContextPtr context,
+                                 ContextPtr global_context,
                                  const std::string & /* default_database */,
                                  bool created_from_ddl) -> DictionarySourcePtr
     {
@@ -284,17 +176,10 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
         /// Executable dictionaries may execute arbitrary commands.
         /// It's OK for dictionaries created by administrator from xml-file, but
         /// maybe dangerous for dictionaries created from DDL-queries.
-        if (created_from_ddl && context->getApplicationType() != Context::ApplicationType::LOCAL)
+        if (created_from_ddl && global_context->getApplicationType() != Context::ApplicationType::LOCAL)
             throw Exception(ErrorCodes::DICTIONARY_ACCESS_DENIED, "Dictionaries with executable pool dictionary source are not allowed to be created from DDL query");
 
-        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
-
-        /** Currently parallel parsing input format cannot read exactly max_block_size rows from input,
-         *  so it will be blocked on ReadBufferFromFileDescriptor because this file descriptor represent pipe that does not have eof.
-         */
-        auto settings_no_parallel_parsing = context_local_copy->getSettings();
-        settings_no_parallel_parsing.input_format_parallel_parsing = false;
-        context_local_copy->setSettings(settings_no_parallel_parsing);
+        ContextMutablePtr context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
 
         String settings_config_prefix = config_prefix + ".executable_pool";
 
@@ -312,9 +197,10 @@ void registerDictionarySourceExecutablePool(DictionarySourceFactory & factory)
             .command_termination_timeout = config.getUInt64(settings_config_prefix + ".command_termination_timeout", 10),
             .max_command_execution_time = max_command_execution_time,
             .implicit_key = config.getBool(settings_config_prefix + ".implicit_key", false),
+            .send_chunk_header = config.getBool(settings_config_prefix + ".send_chunk_header", false)
         };
 
-        return std::make_unique<ExecutablePoolDictionarySource>(dict_struct, configuration, sample_block, context_local_copy);
+        return std::make_unique<ExecutablePoolDictionarySource>(dict_struct, configuration, sample_block, context);
     };
 
     factory.registerSource("executable_pool", create_table_source);
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index 02b0288a52e..51215b6311b 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -1,20 +1,18 @@
 #pragma once
 
-#include <common/BorrowedObjectPool.h>
+#include <base/logger_useful.h>
 
 #include <Core/Block.h>
 #include <Interpreters/Context.h>
 
-#include "IDictionarySource.h"
-#include "DictionaryStructure.h"
-
-namespace Poco { class Logger; }
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Processors/Sources/ShellCommandSource.h>
 
 
 namespace DB
 {
 
-using ProcessPool = BorrowedObjectPool<std::unique_ptr<ShellCommand>>;
 
 /** ExecutablePoolDictionarySource allows loading data from pool of processes.
   * When client requests ids or keys source get process from ProcessPool
@@ -29,14 +27,16 @@ class ExecutablePoolDictionarySource final : public IDictionarySource
 public:
     struct Configuration
     {
-        const String command;
-        const String format;
-        const size_t pool_size;
-        const size_t command_termination_timeout;
-        const size_t max_command_execution_time;
+        String command;
+        String format;
+        size_t pool_size;
+        size_t command_termination_timeout;
+        size_t max_command_execution_time;
         /// Implicit key means that the source script will return only values,
         /// and the correspondence to the requested keys is determined implicitly - by the order of rows in the result.
-        const bool implicit_key;
+        bool implicit_key;
+        /// Send number_of_rows\n before sending chunk to process
+        bool send_chunk_header;
     };
 
     ExecutablePoolDictionarySource(
@@ -48,17 +48,17 @@ public:
     ExecutablePoolDictionarySource(const ExecutablePoolDictionarySource & other);
     ExecutablePoolDictionarySource & operator=(const ExecutablePoolDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
     /** The logic of this method is flawed, absolutely incorrect and ignorant.
       * It may lead to skipping some values due to clock sync or timezone changes.
       * The intended usage of "update_field" is totally different.
       */
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
 
@@ -70,17 +70,16 @@ public:
 
     std::string toString() const override;
 
-    BlockInputStreamPtr getStreamForBlock(const Block & block);
+    Pipe getStreamForBlock(const Block & block);
 
 private:
-    Poco::Logger * log;
-    time_t update_time = 0;
     const DictionaryStructure dict_struct;
     const Configuration configuration;
 
     Block sample_block;
     ContextPtr context;
     std::shared_ptr<ProcessPool> process_pool;
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Dictionaries/ExternalQueryBuilder.cpp b/src/Dictionaries/ExternalQueryBuilder.cpp
index e0920535e33..9ddaaeb573a 100644
--- a/src/Dictionaries/ExternalQueryBuilder.cpp
+++ b/src/Dictionaries/ExternalQueryBuilder.cpp
@@ -21,10 +21,23 @@ ExternalQueryBuilder::ExternalQueryBuilder(
     const std::string & db_,
     const std::string & schema_,
     const std::string & table_,
+    const std::string & query_,
     const std::string & where_,
     IdentifierQuotingStyle quoting_style_)
-    : dict_struct(dict_struct_), db(db_), schema(schema_), table(table_), where(where_), quoting_style(quoting_style_)
-{}
+    : dict_struct(dict_struct_)
+    , db(db_)
+    , schema(schema_)
+    , table(table_)
+    , query(query_)
+    , where(where_)
+    , quoting_style(quoting_style_)
+{
+    if (table.empty() && query.empty())
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Setting `table` or `query` must be non empty");
+
+    if (!query.empty() && (!table.empty() || !where.empty()))
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Setting `table` or `where` cannot be used with `query` parameter");
+}
 
 
 void ExternalQueryBuilder::writeQuoted(const std::string & s, WriteBuffer & out) const
@@ -52,10 +65,17 @@ void ExternalQueryBuilder::writeQuoted(const std::string & s, WriteBuffer & out)
 
 std::string ExternalQueryBuilder::composeLoadAllQuery() const
 {
-    WriteBufferFromOwnString out;
-    composeLoadAllQuery(out);
-    writeChar(';', out);
-    return out.str();
+    if (query.empty())
+    {
+        WriteBufferFromOwnString out;
+        composeLoadAllQuery(out);
+        writeChar(';', out);
+        return out.str();
+    }
+    else
+    {
+        return query;
+    }
 }
 
 void ExternalQueryBuilder::composeLoadAllQuery(WriteBuffer & out) const
@@ -113,6 +133,29 @@ void ExternalQueryBuilder::composeLoadAllQuery(WriteBuffer & out) const
 
             writeQuoted(key.name, out);
         }
+
+        if (dict_struct.range_min && dict_struct.range_max)
+        {
+            writeString(", ", out);
+
+            if (!dict_struct.range_min->expression.empty())
+            {
+                writeParenthesisedString(dict_struct.range_min->expression, out);
+                writeString(" AS ", out);
+            }
+
+            writeQuoted(dict_struct.range_min->name, out);
+
+            writeString(", ", out);
+
+            if (!dict_struct.range_max->expression.empty())
+            {
+                writeParenthesisedString(dict_struct.range_max->expression, out);
+                writeString(" AS ", out);
+            }
+
+            writeQuoted(dict_struct.range_max->name, out);
+        }
     }
 
     for (const auto & attr : dict_struct.attributes)
@@ -152,74 +195,314 @@ void ExternalQueryBuilder::composeLoadAllQuery(WriteBuffer & out) const
 std::string ExternalQueryBuilder::composeUpdateQuery(const std::string & update_field, const std::string & time_point) const
 {
     WriteBufferFromOwnString out;
-    composeLoadAllQuery(out);
 
-    if (!where.empty())
-        writeString(" AND ", out);
+    if (query.empty())
+    {
+        composeLoadAllQuery(out);
+
+        if (!where.empty())
+            writeString(" AND ", out);
+        else
+            writeString(" WHERE ", out);
+
+        composeUpdateCondition(update_field, time_point, out);
+
+        writeChar(';', out);
+
+        return out.str();
+    }
     else
-        writeString(" WHERE ", out);
+    {
+        writeString(query, out);
 
-    writeString(update_field, out);
-    writeString(" >= '", out);
-    writeString(time_point, out);
-    writeChar('\'', out);
+        auto condition_position = query.find("{condition}");
+        if (condition_position == std::string::npos)
+        {
+            writeString(" WHERE ", out);
+            composeUpdateCondition(update_field, time_point, out);
+            writeString(";", out);
 
-    writeChar(';', out);
-    return out.str();
+            return out.str();
+        }
+
+        WriteBufferFromOwnString condition_value_buffer;
+        composeUpdateCondition(update_field, time_point, condition_value_buffer);
+        const auto & condition_value = condition_value_buffer.str();
+
+        auto query_copy = query;
+        query_copy.replace(condition_position, condition_value.size(), condition_value);
+
+        return query_copy;
+    }
 }
 
 
-std::string ExternalQueryBuilder::composeLoadIdsQuery(const std::vector<UInt64> & ids)
+std::string ExternalQueryBuilder::composeLoadIdsQuery(const std::vector<UInt64> & ids) const
 {
     if (!dict_struct.id)
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Simple key required for method");
 
     WriteBufferFromOwnString out;
-    writeString("SELECT ", out);
 
-    if (!dict_struct.id->expression.empty())
+    if (query.empty())
     {
-        writeParenthesisedString(dict_struct.id->expression, out);
-        writeString(" AS ", out);
-    }
+        writeString("SELECT ", out);
 
-    writeQuoted(dict_struct.id->name, out);
-
-    for (const auto & attr : dict_struct.attributes)
-    {
-        writeString(", ", out);
-
-        if (!attr.expression.empty())
+        if (!dict_struct.id->expression.empty())
         {
-            writeParenthesisedString(attr.expression, out);
+            writeParenthesisedString(dict_struct.id->expression, out);
             writeString(" AS ", out);
         }
 
-        writeQuoted(attr.name, out);
-    }
+        writeQuoted(dict_struct.id->name, out);
 
-    writeString(" FROM ", out);
-    if (!db.empty())
+        for (const auto & attr : dict_struct.attributes)
+        {
+            writeString(", ", out);
+
+            if (!attr.expression.empty())
+            {
+                writeParenthesisedString(attr.expression, out);
+                writeString(" AS ", out);
+            }
+
+            writeQuoted(attr.name, out);
+        }
+
+        writeString(" FROM ", out);
+        if (!db.empty())
+        {
+            writeQuoted(db, out);
+            writeChar('.', out);
+        }
+        if (!schema.empty())
+        {
+            writeQuoted(schema, out);
+            writeChar('.', out);
+        }
+
+        writeQuoted(table, out);
+
+        writeString(" WHERE ", out);
+
+        if (!where.empty())
+        {
+            writeString(where, out);
+            writeString(" AND ", out);
+        }
+
+        composeIdsCondition(ids, out);
+        writeString(";", out);
+
+        return out.str();
+    }
+    else
     {
-        writeQuoted(db, out);
-        writeChar('.', out);
+        writeString(query, out);
+
+        auto condition_position = query.find("{condition}");
+        if (condition_position == std::string::npos)
+        {
+            writeString(" WHERE ", out);
+            composeIdsCondition(ids, out);
+            writeString(";", out);
+
+            return out.str();
+        }
+
+        WriteBufferFromOwnString condition_value_buffer;
+        composeIdsCondition(ids, condition_value_buffer);
+        const auto & condition_value = condition_value_buffer.str();
+
+        auto query_copy = query;
+        query_copy.replace(condition_position, condition_value.size(), condition_value);
+
+        return query_copy;
     }
-    if (!schema.empty())
+}
+
+
+std::string ExternalQueryBuilder::composeLoadKeysQuery(
+    const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix) const
+{
+    if (!dict_struct.key)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
+
+    if (key_columns.size() != dict_struct.key->size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The size of key_columns does not equal to the size of dictionary key");
+
+    WriteBufferFromOwnString out;
+
+    if (query.empty())
     {
-        writeQuoted(schema, out);
-        writeChar('.', out);
+        writeString("SELECT ", out);
+
+        auto first = true;
+        for (const auto & key_or_attribute : boost::join(*dict_struct.key, dict_struct.attributes))
+        {
+            if (!first)
+                writeString(", ", out);
+
+            first = false;
+
+            if (!key_or_attribute.expression.empty())
+            {
+                writeParenthesisedString(key_or_attribute.expression, out);
+                writeString(" AS ", out);
+            }
+
+            writeQuoted(key_or_attribute.name, out);
+        }
+
+        writeString(" FROM ", out);
+        if (!db.empty())
+        {
+            writeQuoted(db, out);
+            writeChar('.', out);
+        }
+        if (!schema.empty())
+        {
+            writeQuoted(schema, out);
+            writeChar('.', out);
+        }
+
+        writeQuoted(table, out);
+
+        writeString(" WHERE ", out);
+
+        if (!where.empty())
+        {
+            if (method != CASSANDRA_SEPARATE_PARTITION_KEY)
+                writeString("(", out);
+            writeString(where, out);
+            if (method != CASSANDRA_SEPARATE_PARTITION_KEY)
+                writeString(") AND (", out);
+            else
+                writeString(" AND ", out);
+        }
+
+        composeKeysCondition(key_columns, requested_rows, method, partition_key_prefix, out);
+
+        writeString(";", out);
+
+        return out.str();
     }
-
-    writeQuoted(table, out);
-
-    writeString(" WHERE ", out);
-
-    if (!where.empty())
+    else
     {
-        writeString(where, out);
-        writeString(" AND ", out);
+        writeString(query, out);
+
+        auto condition_position = query.find("{condition}");
+        if (condition_position == std::string::npos)
+        {
+            writeString(" WHERE ", out);
+            composeKeysCondition(key_columns, requested_rows, method, partition_key_prefix, out);
+            writeString(";", out);
+
+            return out.str();
+        }
+
+        WriteBufferFromOwnString condition_value_buffer;
+        composeKeysCondition(key_columns, requested_rows, method, partition_key_prefix, condition_value_buffer);
+        const auto & condition_value = condition_value_buffer.str();
+
+        auto query_copy = query;
+        query_copy.replace(condition_position, condition_value.size(), condition_value);
+
+        return query_copy;
+    }
+}
+
+
+void ExternalQueryBuilder::composeKeyCondition(const Columns & key_columns, size_t row, WriteBuffer & out,
+                                               size_t beg, size_t end) const
+{
+    auto first = true;
+    for (size_t i = beg; i < end; ++i)
+    {
+        if (!first)
+            writeString(" AND ", out);
+
+        first = false;
+
+        const auto & key_description = (*dict_struct.key)[i];
+
+        /// key_i=value_i
+        writeQuoted(key_description.name, out);
+        writeString("=", out);
+        key_description.type_serialization->serializeTextQuoted(*key_columns[i], row, out, format_settings);
+    }
+}
+
+
+void ExternalQueryBuilder::composeInWithTuples(const Columns & key_columns, const std::vector<size_t> & requested_rows,
+                                               WriteBuffer & out, size_t beg, size_t end) const
+{
+    composeKeyTupleDefinition(out, beg, end);
+    writeString(" IN (", out);
+
+    bool first = true;
+    for (const auto row : requested_rows)
+    {
+        if (!first)
+            writeString(", ", out);
+
+        first = false;
+        composeKeyTuple(key_columns, row, out, beg, end);
     }
 
+    writeString(")", out);
+}
+
+
+void ExternalQueryBuilder::composeKeyTupleDefinition(WriteBuffer & out, size_t beg, size_t end) const
+{
+    if (!dict_struct.key)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
+
+    writeChar('(', out);
+
+    auto first = true;
+    for (size_t i = beg; i < end; ++i)
+    {
+        if (!first)
+            writeString(", ", out);
+
+        first = false;
+        writeQuoted((*dict_struct.key)[i].name, out);
+    }
+
+    writeChar(')', out);
+}
+
+
+void ExternalQueryBuilder::composeKeyTuple(const Columns & key_columns, size_t row, WriteBuffer & out, size_t beg, size_t end) const
+{
+    writeString("(", out);
+
+    auto first = true;
+    for (size_t i = beg; i < end; ++i)
+    {
+        if (!first)
+            writeString(", ", out);
+
+        first = false;
+        auto serialization = (*dict_struct.key)[i].type_serialization;
+        serialization->serializeTextQuoted(*key_columns[i], row, out, format_settings);
+    }
+
+    writeString(")", out);
+}
+
+void ExternalQueryBuilder::composeUpdateCondition(const std::string & update_field, const std::string & time_point, WriteBuffer & out)
+{
+    writeString(update_field, out);
+    writeString(" >= '", out);
+    writeString(time_point, out);
+    writeChar('\'', out);
+}
+
+void ExternalQueryBuilder::composeIdsCondition(const std::vector<UInt64> & ids, WriteBuffer & out) const
+{
     writeQuoted(dict_struct.id->name, out);
     writeString(" IN (", out);
 
@@ -233,67 +516,12 @@ std::string ExternalQueryBuilder::composeLoadIdsQuery(const std::vector<UInt64>
         writeString(DB::toString(id), out);
     }
 
-    writeString(");", out);
-
-    return out.str();
+    writeString(")", out);
 }
 
-
-std::string ExternalQueryBuilder::composeLoadKeysQuery(
-    const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix)
+void ExternalQueryBuilder::composeKeysCondition(const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix, WriteBuffer & out) const
 {
-    if (!dict_struct.key)
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
-
-    if (key_columns.size() != dict_struct.key->size())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "The size of key_columns does not equal to the size of dictionary key");
-
-    WriteBufferFromOwnString out;
-    writeString("SELECT ", out);
-
-    auto first = true;
-    for (const auto & key_or_attribute : boost::join(*dict_struct.key, dict_struct.attributes))
-    {
-        if (!first)
-            writeString(", ", out);
-
-        first = false;
-
-        if (!key_or_attribute.expression.empty())
-        {
-            writeParenthesisedString(key_or_attribute.expression, out);
-            writeString(" AS ", out);
-        }
-
-        writeQuoted(key_or_attribute.name, out);
-    }
-
-    writeString(" FROM ", out);
-    if (!db.empty())
-    {
-        writeQuoted(db, out);
-        writeChar('.', out);
-    }
-    if (!schema.empty())
-    {
-        writeQuoted(schema, out);
-        writeChar('.', out);
-    }
-
-    writeQuoted(table, out);
-
-    writeString(" WHERE ", out);
-
-    if (!where.empty())
-    {
-        if (method != CASSANDRA_SEPARATE_PARTITION_KEY)
-            writeString("(", out);
-        writeString(where, out);
-        if (method != CASSANDRA_SEPARATE_PARTITION_KEY)
-            writeString(") AND (", out);
-        else
-            writeString(" AND ", out);
-    }
+    bool first = true;
 
     if (method == AND_OR_CHAIN)
     {
@@ -334,92 +562,6 @@ std::string ExternalQueryBuilder::composeLoadKeysQuery(
     {
         writeString(")", out);
     }
-
-    writeString(";", out);
-
-    return out.str();
 }
 
-
-void ExternalQueryBuilder::composeKeyCondition(const Columns & key_columns, const size_t row, WriteBuffer & out,
-                                               size_t beg, size_t end) const
-{
-    auto first = true;
-    for (size_t i = beg; i < end; ++i)
-    {
-        if (!first)
-            writeString(" AND ", out);
-
-        first = false;
-
-        const auto & key_description = (*dict_struct.key)[i];
-
-        /// key_i=value_i
-        writeQuoted(key_description.name, out);
-        writeString("=", out);
-        key_description.type_serialization->serializeTextQuoted(*key_columns[i], row, out, format_settings);
-    }
-}
-
-
-void ExternalQueryBuilder::composeInWithTuples(const Columns & key_columns, const std::vector<size_t> & requested_rows,
-                                               WriteBuffer & out, size_t beg, size_t end)
-{
-    composeKeyTupleDefinition(out, beg, end);
-    writeString(" IN (", out);
-
-    bool first = true;
-    for (const auto row : requested_rows)
-    {
-        if (!first)
-            writeString(", ", out);
-
-        first = false;
-        composeKeyTuple(key_columns, row, out, beg, end);
-    }
-
-    writeString(")", out);
-}
-
-
-void ExternalQueryBuilder::composeKeyTupleDefinition(WriteBuffer & out, size_t beg, size_t end) const
-{
-    if (!dict_struct.key)
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Composite key required for method");
-
-    writeChar('(', out);
-
-    auto first = true;
-    for (size_t i = beg; i < end; ++i)
-    {
-        if (!first)
-            writeString(", ", out);
-
-        first = false;
-        writeQuoted((*dict_struct.key)[i].name, out);
-    }
-
-    writeChar(')', out);
-}
-
-
-void ExternalQueryBuilder::composeKeyTuple(const Columns & key_columns, const size_t row, WriteBuffer & out, size_t beg, size_t end) const
-{
-    writeString("(", out);
-
-    auto first = true;
-    for (size_t i = beg; i < end; ++i)
-    {
-        if (!first)
-            writeString(", ", out);
-
-        first = false;
-        auto serialization = (*dict_struct.key)[i].type_serialization;
-        serialization->serializeTextQuoted(*key_columns[i], row, out, format_settings);
-    }
-
-    writeString(")", out);
-}
-
-
 }
diff --git a/src/Dictionaries/ExternalQueryBuilder.h b/src/Dictionaries/ExternalQueryBuilder.h
index 9f9ccd65001..9d79ec3e702 100644
--- a/src/Dictionaries/ExternalQueryBuilder.h
+++ b/src/Dictionaries/ExternalQueryBuilder.h
@@ -21,6 +21,7 @@ struct ExternalQueryBuilder
     const std::string db;
     const std::string schema;
     const std::string table;
+    const std::string query;
     const std::string where;
 
     IdentifierQuotingStyle quoting_style;
@@ -31,6 +32,7 @@ struct ExternalQueryBuilder
         const std::string & db_,
         const std::string & schema_,
         const std::string & table_,
+        const std::string & query_,
         const std::string & where_,
         IdentifierQuotingStyle quoting_style_);
 
@@ -41,7 +43,7 @@ struct ExternalQueryBuilder
     std::string composeUpdateQuery(const std::string & update_field, const std::string & time_point) const;
 
     /** Generate a query to load data by set of UInt64 keys. */
-    std::string composeLoadIdsQuery(const std::vector<UInt64> & ids);
+    std::string composeLoadIdsQuery(const std::vector<UInt64> & ids) const;
 
     /** Generate a query to load data by set of composite keys.
       * There are three methods of specification of composite keys in WHERE:
@@ -56,7 +58,7 @@ struct ExternalQueryBuilder
         CASSANDRA_SEPARATE_PARTITION_KEY,
     };
 
-    std::string composeLoadKeysQuery(const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix = 0);
+    std::string composeLoadKeysQuery(const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix = 0) const;
 
 
 private:
@@ -67,16 +69,25 @@ private:
     /// In the following methods `beg` and `end` specifies which columns to write in expression
 
     /// Expression in form (x = c1 AND y = c2 ...)
-    void composeKeyCondition(const Columns & key_columns, const size_t row, WriteBuffer & out, size_t beg, size_t end) const;
+    void composeKeyCondition(const Columns & key_columns, size_t row, WriteBuffer & out, size_t beg, size_t end) const;
 
     /// Expression in form (x, y, ...) IN ((c1, c2, ...), ...)
-    void composeInWithTuples(const Columns & key_columns, const std::vector<size_t> & requested_rows, WriteBuffer & out, size_t beg, size_t end);
+    void composeInWithTuples(const Columns & key_columns, const std::vector<size_t> & requested_rows, WriteBuffer & out, size_t beg, size_t end) const;
 
     /// Expression in form (x, y, ...)
     void composeKeyTupleDefinition(WriteBuffer & out, size_t beg, size_t end) const;
 
     /// Expression in form (c1, c2, ...)
-    void composeKeyTuple(const Columns & key_columns, const size_t row, WriteBuffer & out, size_t beg, size_t end) const;
+    void composeKeyTuple(const Columns & key_columns, size_t row, WriteBuffer & out, size_t beg, size_t end) const;
+
+    /// Compose update condition
+    static void composeUpdateCondition(const std::string & update_field, const std::string & time_point, WriteBuffer & out);
+
+    /// Compose ids condition
+    void composeIdsCondition(const std::vector<UInt64> & ids, WriteBuffer & out) const;
+
+    /// Compose keys condition
+    void composeKeysCondition(const Columns & key_columns, const std::vector<size_t> & requested_rows, LoadKeysMethod method, size_t partition_key_prefix, WriteBuffer & out) const;
 
     /// Write string with specified quoting style.
     void writeQuoted(const std::string & s, WriteBuffer & out) const;
diff --git a/src/Dictionaries/FileDictionarySource.cpp b/src/Dictionaries/FileDictionarySource.cpp
index 239c13e71c2..7fd2dbf80f1 100644
--- a/src/Dictionaries/FileDictionarySource.cpp
+++ b/src/Dictionaries/FileDictionarySource.cpp
@@ -1,10 +1,10 @@
 #include "FileDictionarySource.h"
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/filesystemHelpers.h>
-#include <DataStreams/OwningBlockInputStream.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Interpreters/Context.h>
+#include <Processors/Formats/IInputFormat.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
@@ -30,8 +30,9 @@ FileDictionarySource::FileDictionarySource(
     , sample_block{sample_block_}
     , context(context_)
 {
-    if (created_from_ddl && !pathStartsWith(filepath, context->getUserFilesPath()))
-        throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", filepath, context->getUserFilesPath());
+    auto user_files_path = context->getUserFilesPath();
+    if (created_from_ddl && !fileOrSymlinkPathStartsWith(filepath, user_files_path))
+        throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", filepath, user_files_path);
 }
 
 
@@ -45,14 +46,15 @@ FileDictionarySource::FileDictionarySource(const FileDictionarySource & other)
 }
 
 
-BlockInputStreamPtr FileDictionarySource::loadAll()
+Pipe FileDictionarySource::loadAll()
 {
     LOG_TRACE(&Poco::Logger::get("FileDictionary"), "loadAll {}", toString());
     auto in_ptr = std::make_unique<ReadBufferFromFile>(filepath);
-    auto stream = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    auto source = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
+    source->addBuffer(std::move(in_ptr));
     last_modification = getLastModification();
 
-    return std::make_shared<OwningBlockInputStream<ReadBuffer>>(stream, std::move(in_ptr));
+    return Pipe(std::move(source));
 }
 
 
@@ -74,7 +76,7 @@ void registerDictionarySourceFile(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 ContextPtr context,
+                                 ContextPtr global_context,
                                  const std::string & /* default_database */,
                                  bool created_from_ddl) -> DictionarySourcePtr
     {
@@ -84,9 +86,9 @@ void registerDictionarySourceFile(DictionarySourceFactory & factory)
         const auto filepath = config.getString(config_prefix + ".file.path");
         const auto format = config.getString(config_prefix + ".file.format");
 
-        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        const auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
 
-        return std::make_unique<FileDictionarySource>(filepath, format, sample_block, context_local_copy, created_from_ddl);
+        return std::make_unique<FileDictionarySource>(filepath, format, sample_block, context, created_from_ddl);
     };
 
     factory.registerSource("file", create_table_source);
diff --git a/src/Dictionaries/FileDictionarySource.h b/src/Dictionaries/FileDictionarySource.h
index ffc29374f4f..c8e37986b2f 100644
--- a/src/Dictionaries/FileDictionarySource.h
+++ b/src/Dictionaries/FileDictionarySource.h
@@ -21,19 +21,19 @@ public:
 
     FileDictionarySource(const FileDictionarySource & other);
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override
+    Pipe loadUpdatedAll() override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for FileDictionarySource");
     }
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & /*ids*/) override
+    Pipe loadIds(const std::vector<UInt64> & /*ids*/) override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadIds is unsupported for FileDictionarySource");
     }
 
-    BlockInputStreamPtr loadKeys(const Columns & /*key_columns*/, const std::vector<size_t> & /*requested_rows*/) override
+    Pipe loadKeys(const Columns & /*key_columns*/, const std::vector<size_t> & /*requested_rows*/) override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadKeys is unsupported for FileDictionarySource");
     }
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index abef2335ffd..b6c5f10564b 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -10,7 +10,10 @@
 #include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
 
-#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+
+#include <Dictionaries//DictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
@@ -286,8 +289,8 @@ void FlatDictionary::blockToAttributes(const Block & block)
 {
     const auto keys_column = block.safeGetByPosition(0).column;
 
-    DictionaryKeysArenaHolder<DictionaryKeyType::simple> arena_holder;
-    DictionaryKeysExtractor<DictionaryKeyType::simple> keys_extractor({ keys_column }, arena_holder.getComplexKeyArena());
+    DictionaryKeysArenaHolder<DictionaryKeyType::Simple> arena_holder;
+    DictionaryKeysExtractor<DictionaryKeyType::Simple> keys_extractor({ keys_column }, arena_holder.getComplexKeyArena());
     auto keys = keys_extractor.extractAllKeys();
 
     HashSet<UInt64> already_processed_keys;
@@ -319,10 +322,11 @@ void FlatDictionary::updateData()
 {
     if (!update_field_loaded_block || update_field_loaded_block->rows() == 0)
     {
-        auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
+        QueryPipeline pipeline(source_ptr->loadUpdatedAll());
 
-        while (const auto block = stream->read())
+        PullingPipelineExecutor executor(pipeline);
+        Block block;
+        while (executor.pull(block))
         {
             /// We are using this to keep saved data if input stream consists of multiple blocks
             if (!update_field_loaded_block)
@@ -335,15 +339,14 @@ void FlatDictionary::updateData()
                 saved_column->insertRangeFrom(update_column, 0, update_column.size());
             }
         }
-        stream->readSuffix();
     }
     else
     {
-        auto stream = source_ptr->loadUpdatedAll();
-        mergeBlockWithStream<DictionaryKeyType::simple>(
+        Pipe pipe(source_ptr->loadUpdatedAll());
+        mergeBlockWithPipe<DictionaryKeyType::Simple>(
             dict_struct.getKeysSize(),
             *update_field_loaded_block,
-            stream);
+            std::move(pipe));
     }
 
     if (update_field_loaded_block)
@@ -354,13 +357,12 @@ void FlatDictionary::loadData()
 {
     if (!source_ptr->hasUpdateField())
     {
-        auto stream = source_ptr->loadAll();
-        stream->readPrefix();
+        QueryPipeline pipeline(source_ptr->loadAll());
+        PullingPipelineExecutor executor(pipeline);
 
-        while (const auto block = stream->read())
+        Block block;
+        while (executor.pull(block))
             blockToAttributes(block);
-
-        stream->readSuffix();
     }
     else
         updateData();
@@ -401,6 +403,11 @@ void FlatDictionary::calculateBytesAllocated()
         };
 
         callOnDictionaryAttributeType(attribute.type, type_call);
+
+        bytes_allocated += sizeof(attribute.is_nullable_set);
+
+        if (attribute.is_nullable_set.has_value())
+            bytes_allocated = attribute.is_nullable_set->getBufferSizeInBytes();
     }
 
     if (update_field_loaded_block)
@@ -531,7 +538,7 @@ void FlatDictionary::setAttributeValue(Attribute & attribute, const UInt64 key,
     callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
-BlockInputStreamPtr FlatDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+Pipe FlatDictionary::read(const Names & column_names, size_t max_block_size, size_t num_streams) const
 {
     const auto keys_count = loaded_keys.size();
 
@@ -542,7 +549,20 @@ BlockInputStreamPtr FlatDictionary::getBlockInputStream(const Names & column_nam
         if (loaded_keys[key_index])
             keys.push_back(key_index);
 
-    return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, std::move(keys), column_names);
+    ColumnsWithTypeAndName key_columns = {ColumnWithTypeAndName(getColumnFromPODArray(keys), std::make_shared<DataTypeUInt64>(), dict_struct.id->name)};
+
+    std::shared_ptr<const IDictionary> dictionary = shared_from_this();
+    auto coordinator = std::make_shared<DictionarySourceCoordinator>(dictionary, column_names, std::move(key_columns), max_block_size);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<DictionarySource>(coordinator);
+        pipes.emplace_back(Pipe(std::move(source)));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 void registerDictionaryFlat(DictionaryFactory & factory)
@@ -552,7 +572,7 @@ void registerDictionaryFlat(DictionaryFactory & factory)
                             const Poco::Util::AbstractConfiguration & config,
                             const std::string & config_prefix,
                             DictionarySourcePtr source_ptr,
-                            ContextPtr /* context */,
+                            ContextPtr /* global_context */,
                             bool /* created_from_ddl */) -> DictionaryPtr
     {
         if (dict_struct.key)
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index ccd3bf9d9eb..5c3a1d634d8 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -72,7 +72,7 @@ public:
         return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::simple; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::Simple; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -97,7 +97,7 @@ public:
         const DataTypePtr & key_type,
         size_t level) const override;
 
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
 private:
     template <typename Value>
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index ea26e9b7a2a..29f503fc160 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -1,16 +1,15 @@
 #include "HTTPDictionarySource.h"
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/OwningBlockInputStream.h>
-#include <DataStreams/formatBlock.h>
+#include <Formats/formatBlock.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromOStream.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
+#include <Processors/Formats/IInputFormat.h>
 #include <Interpreters/Context.h>
 #include <Poco/Net/HTTPRequest.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionarySourceHelpers.h"
 #include "DictionaryStructure.h"
@@ -62,14 +61,15 @@ HTTPDictionarySource::HTTPDictionarySource(const HTTPDictionarySource & other)
     credentials.setPassword(other.credentials.getPassword());
 }
 
-BlockInputStreamPtr HTTPDictionarySource::createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer_ptr)
+Pipe HTTPDictionarySource::createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer_ptr)
 {
     Poco::URI uri(configuration.url);
     String http_request_compression_method_str = http_buffer_ptr->getCompressionMethod();
     auto in_ptr_wrapped
         = wrapReadBufferWithCompressionMethod(std::move(http_buffer_ptr), chooseCompressionMethod(uri.getPath(), http_request_compression_method_str));
-    auto input_stream = context->getInputFormat(configuration.format, *in_ptr_wrapped, sample_block, max_block_size);
-    return std::make_shared<OwningBlockInputStream<ReadBuffer>>(input_stream, std::move(in_ptr_wrapped));
+    auto source = context->getInputFormat(configuration.format, *in_ptr_wrapped, sample_block, max_block_size);
+    source->addBuffer(std::move(in_ptr_wrapped));
+    return Pipe(std::move(source));
 }
 
 void HTTPDictionarySource::getUpdateFieldAndDate(Poco::URI & uri)
@@ -89,7 +89,7 @@ void HTTPDictionarySource::getUpdateFieldAndDate(Poco::URI & uri)
     }
 }
 
-BlockInputStreamPtr HTTPDictionarySource::loadAll()
+Pipe HTTPDictionarySource::loadAll()
 {
     LOG_TRACE(log, "loadAll {}", toString());
     Poco::URI uri(configuration.url);
@@ -101,12 +101,13 @@ BlockInputStreamPtr HTTPDictionarySource::loadAll()
         0,
         credentials,
         DBMS_DEFAULT_BUFFER_SIZE,
+        context->getReadSettings(),
         configuration.header_entries);
 
     return createWrappedBuffer(std::move(in_ptr));
 }
 
-BlockInputStreamPtr HTTPDictionarySource::loadUpdatedAll()
+Pipe HTTPDictionarySource::loadUpdatedAll()
 {
     Poco::URI uri(configuration.url);
     getUpdateFieldAndDate(uri);
@@ -119,12 +120,13 @@ BlockInputStreamPtr HTTPDictionarySource::loadUpdatedAll()
         0,
         credentials,
         DBMS_DEFAULT_BUFFER_SIZE,
+        context->getReadSettings(),
         configuration.header_entries);
 
     return createWrappedBuffer(std::move(in_ptr));
 }
 
-BlockInputStreamPtr HTTPDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe HTTPDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
 
@@ -133,8 +135,8 @@ BlockInputStreamPtr HTTPDictionarySource::loadIds(const std::vector<UInt64> & id
     ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [block, this](std::ostream & ostr)
     {
         WriteBufferFromOStream out_buffer(ostr);
-        auto output_stream = context->getOutputStreamParallelIfPossible(configuration.format, out_buffer, sample_block);
-        formatBlock(output_stream, block);
+        auto output_format = context->getOutputFormatParallelIfPossible(configuration.format, out_buffer, block.cloneEmpty());
+        formatBlock(output_format, block);
     };
 
     Poco::URI uri(configuration.url);
@@ -146,12 +148,13 @@ BlockInputStreamPtr HTTPDictionarySource::loadIds(const std::vector<UInt64> & id
         0,
         credentials,
         DBMS_DEFAULT_BUFFER_SIZE,
+        context->getReadSettings(),
         configuration.header_entries);
 
     return createWrappedBuffer(std::move(in_ptr));
 }
 
-BlockInputStreamPtr HTTPDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe HTTPDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
 
@@ -160,8 +163,8 @@ BlockInputStreamPtr HTTPDictionarySource::loadKeys(const Columns & key_columns,
     ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = [block, this](std::ostream & ostr)
     {
         WriteBufferFromOStream out_buffer(ostr);
-        auto output_stream = context->getOutputStreamParallelIfPossible(configuration.format, out_buffer, sample_block);
-        formatBlock(output_stream, block);
+        auto output_format = context->getOutputFormatParallelIfPossible(configuration.format, out_buffer, block.cloneEmpty());
+        formatBlock(output_format, block);
     };
 
     Poco::URI uri(configuration.url);
@@ -173,6 +176,7 @@ BlockInputStreamPtr HTTPDictionarySource::loadKeys(const Columns & key_columns,
         0,
         credentials,
         DBMS_DEFAULT_BUFFER_SIZE,
+        context->getReadSettings(),
         configuration.header_entries);
 
     return createWrappedBuffer(std::move(in_ptr));
@@ -210,13 +214,13 @@ void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
                                    const Poco::Util::AbstractConfiguration & config,
                                    const std::string & config_prefix,
                                    Block & sample_block,
-                                   ContextPtr context,
+                                   ContextPtr global_context,
                                    const std::string & /* default_database */,
                                    bool created_from_ddl) -> DictionarySourcePtr {
         if (dict_struct.has_expressions)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Dictionary source of type `http` does not support attribute expressions");
 
-        auto context_local_copy = copyContextAndApplySettings(config_prefix, context, config);
+        auto context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
 
         const auto & settings_config_prefix = config_prefix + ".http";
         const auto & credentials_prefix = settings_config_prefix + ".credentials";
@@ -252,10 +256,10 @@ void registerDictionarySourceHTTP(DictionarySourceFactory & factory)
             .format =config.getString(settings_config_prefix + ".format", ""),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1),
-            .header_entries = std::move(header_entries)
+            .header_entries = std::move(header_entries) //-V1030
         };
 
-        return std::make_unique<HTTPDictionarySource>(dict_struct, configuration, credentials, sample_block, context_local_copy, created_from_ddl);
+        return std::make_unique<HTTPDictionarySource>(dict_struct, configuration, credentials, sample_block, context, created_from_ddl);
     };
     factory.registerSource("http", create_table_source);
 }
diff --git a/src/Dictionaries/HTTPDictionarySource.h b/src/Dictionaries/HTTPDictionarySource.h
index 638fcc876ed..35fbabecf2a 100644
--- a/src/Dictionaries/HTTPDictionarySource.h
+++ b/src/Dictionaries/HTTPDictionarySource.h
@@ -4,7 +4,7 @@
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/URI.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 #include "DictionaryStructure.h"
 #include "IDictionarySource.h"
 #include <Interpreters/Context.h>
@@ -43,13 +43,13 @@ public:
     HTTPDictionarySource(const HTTPDictionarySource & other);
     HTTPDictionarySource & operator=(const HTTPDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
 
@@ -65,7 +65,7 @@ private:
     void getUpdateFieldAndDate(Poco::URI & uri);
 
     // wrap buffer using encoding from made request
-    BlockInputStreamPtr createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer);
+    Pipe createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer);
 
     Poco::Logger * log;
 
@@ -81,4 +81,3 @@ private:
 };
 
 }
-
diff --git a/src/Dictionaries/HashedArrayDictionary.cpp b/src/Dictionaries/HashedArrayDictionary.cpp
new file mode 100644
index 00000000000..a92f8bc1191
--- /dev/null
+++ b/src/Dictionaries/HashedArrayDictionary.cpp
@@ -0,0 +1,838 @@
+#include "HashedArrayDictionary.h"
+
+#include <Core/Defines.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <Dictionaries/DictionarySource.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/HierarchyDictionariesUtils.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int DICTIONARY_IS_EMPTY;
+    extern const int UNSUPPORTED_METHOD;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+HashedArrayDictionary<dictionary_key_type>::HashedArrayDictionary(
+    const StorageID & dict_id_,
+    const DictionaryStructure & dict_struct_,
+    DictionarySourcePtr source_ptr_,
+    const HashedArrayDictionaryStorageConfiguration & configuration_,
+    BlockPtr update_field_loaded_block_)
+    : IDictionary(dict_id_)
+    , dict_struct(dict_struct_)
+    , source_ptr(std::move(source_ptr_))
+    , configuration(configuration_)
+    , update_field_loaded_block(std::move(update_field_loaded_block_))
+{
+    createAttributes();
+    loadData();
+    calculateBytesAllocated();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr HashedArrayDictionary<dictionary_key_type>::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr & result_type,
+    const Columns & key_columns,
+    const DataTypes & key_types [[maybe_unused]],
+    const ColumnPtr & default_values_column) const
+{
+    if (dictionary_key_type == DictionaryKeyType::Complex)
+        dict_struct.validateKeyTypes(key_types);
+
+    ColumnPtr result;
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+
+    const size_t keys_size = extractor.getKeysSize();
+
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+    auto & attribute = attributes[attribute_index];
+
+    return getAttributeColumn(attribute, dictionary_attribute, keys_size, default_values_column, extractor);
+}
+
+template <DictionaryKeyType dictionary_key_type>
+Columns HashedArrayDictionary<dictionary_key_type>::getColumns(
+    const Strings & attribute_names,
+    const DataTypes & result_types,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    const Columns & default_values_columns) const
+{
+    if (dictionary_key_type == DictionaryKeyType::Complex)
+        dict_struct.validateKeyTypes(key_types);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+
+    const size_t keys_size = extractor.getKeysSize();
+
+    PaddedPODArray<ssize_t> key_index_to_element_index;
+
+    /** Optimization for multiple attributes.
+      * For each key save element index in key_index_to_element_index array.
+      * Later in type_call for attribute use getItemsImpl specialization with key_index_to_element_index array
+      * instead of DictionaryKeyExtractor.
+      */
+    if (attribute_names.size() > 1)
+    {
+        const auto & key_attribute_container = key_attribute.container;
+        size_t keys_found = 0;
+
+        key_index_to_element_index.resize(keys_size);
+
+        for (size_t key_index = 0; key_index < keys_size; ++key_index)
+        {
+            auto key = extractor.extractCurrentKey();
+
+            auto it = key_attribute_container.find(key);
+            if (it == key_attribute_container.end())
+            {
+                key_index_to_element_index[key_index] = -1;
+            }
+            else
+            {
+                key_index_to_element_index[key_index] = it->getMapped();
+                ++keys_found;
+            }
+
+            extractor.rollbackCurrentKey();
+        }
+
+        query_count.fetch_add(keys_size, std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
+    }
+
+    size_t attribute_names_size = attribute_names.size();
+
+    Columns result_columns;
+    result_columns.reserve(attribute_names_size);
+
+    for (size_t i = 0; i < attribute_names_size; ++i)
+    {
+        ColumnPtr result_column;
+
+        const auto & attribute_name = attribute_names[i];
+        const auto & result_type = result_types[i];
+        const auto & default_values_column = default_values_columns[i];
+
+        const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+        const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+        auto & attribute = attributes[attribute_index];
+
+        if (attribute_names_size > 1)
+            result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size, default_values_column, key_index_to_element_index);
+        else
+            result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size, default_values_column, extractor);
+
+        result_columns.emplace_back(std::move(result_column));
+    }
+
+    return result_columns;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr HashedArrayDictionary<dictionary_key_type>::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
+{
+    if (dictionary_key_type == DictionaryKeyType::Complex)
+        dict_struct.validateKeyTypes(key_types);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
+
+    size_t keys_size = extractor.getKeysSize();
+
+    auto result = ColumnUInt8::create(keys_size, false);
+    auto & out = result->getData();
+
+    if (attributes.empty())
+    {
+        query_count.fetch_add(keys_size, std::memory_order_relaxed);
+        return result;
+    }
+
+    size_t keys_found = 0;
+
+    for (size_t requested_key_index = 0; requested_key_index < keys_size; ++requested_key_index)
+    {
+        auto requested_key = extractor.extractCurrentKey();
+
+        out[requested_key_index] = key_attribute.container.find(requested_key) != key_attribute.container.end();
+
+        keys_found += out[requested_key_index];
+        extractor.rollbackCurrentKey();
+    }
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+
+    return result;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr HashedArrayDictionary<dictionary_key_type>::getHierarchy(ColumnPtr key_column [[maybe_unused]], const DataTypePtr &) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+    {
+        PaddedPODArray<UInt64> keys_backup_storage;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+
+        const auto & dictionary_attribute = dict_struct.attributes[hierarchical_attribute_index];
+        const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+
+        const auto & key_attribute_container = key_attribute.container;
+
+        const UInt64 null_value = dictionary_attribute.null_value.template get<UInt64>();
+        const AttributeContainerType<UInt64> & parent_keys_container = std::get<AttributeContainerType<UInt64>>(hierarchical_attribute.container);
+
+        auto is_key_valid_func = [&](auto & key) { return key_attribute_container.find(key) != key_attribute_container.end(); };
+
+        size_t keys_found = 0;
+
+        auto get_parent_func = [&](auto & hierarchy_key)
+        {
+            std::optional<UInt64> result;
+
+            auto it = key_attribute_container.find(hierarchy_key);
+
+            if (it != key_attribute_container.end())
+                result = parent_keys_container[it->getMapped()];
+
+            keys_found += result.has_value();
+
+            return result;
+        };
+
+        auto dictionary_hierarchy_array = getKeysHierarchyArray(keys, null_value, is_key_valid_func, get_parent_func);
+
+        query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
+
+        return dictionary_hierarchy_array;
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr HashedArrayDictionary<dictionary_key_type>::isInHierarchy(
+    ColumnPtr key_column [[maybe_unused]],
+    ColumnPtr in_key_column [[maybe_unused]],
+    const DataTypePtr &) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+    {
+        PaddedPODArray<UInt64> keys_backup_storage;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
+
+        PaddedPODArray<UInt64> keys_in_backup_storage;
+        const auto & keys_in = getColumnVectorData(this, in_key_column, keys_in_backup_storage);
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+
+        const auto & dictionary_attribute = dict_struct.attributes[hierarchical_attribute_index];
+        auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+
+        const auto & key_attribute_container = key_attribute.container;
+
+        const UInt64 null_value = dictionary_attribute.null_value.template get<UInt64>();
+        const AttributeContainerType<UInt64> & parent_keys_container = std::get<AttributeContainerType<UInt64>>(hierarchical_attribute.container);
+
+        auto is_key_valid_func = [&](auto & key) { return key_attribute_container.find(key) != key_attribute_container.end(); };
+
+        size_t keys_found = 0;
+
+        auto get_parent_func = [&](auto & hierarchy_key)
+        {
+            std::optional<UInt64> result;
+
+            auto it = key_attribute_container.find(hierarchy_key);
+
+            if (it != key_attribute_container.end())
+                result = parent_keys_container[it->getMapped()];
+
+            keys_found += result.has_value();
+
+            return result;
+        };
+
+        auto result = getKeysIsInHierarchyColumn(keys, keys_in, null_value, is_key_valid_func, get_parent_func);
+
+        query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
+
+        return result;
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr HashedArrayDictionary<dictionary_key_type>::getDescendants(
+    ColumnPtr key_column [[maybe_unused]],
+    const DataTypePtr &,
+    size_t level [[maybe_unused]]) const
+{
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+    {
+        PaddedPODArray<UInt64> keys_backup;
+        const auto & keys = getColumnVectorData(this, key_column, keys_backup);
+
+        size_t hierarchical_attribute_index = *dict_struct.hierarchical_attribute_index;
+
+        const auto & hierarchical_attribute = attributes[hierarchical_attribute_index];
+        const AttributeContainerType<UInt64> & parent_keys_container = std::get<AttributeContainerType<UInt64>>(hierarchical_attribute.container);
+
+        const auto & key_attribute_container = key_attribute.container;
+
+        HashMap<size_t, UInt64> index_to_key;
+        index_to_key.reserve(key_attribute.container.size());
+
+        for (auto & [key, value] : key_attribute_container)
+            index_to_key[value] = key;
+
+        HashMap<UInt64, PaddedPODArray<UInt64>> parent_to_child;
+
+        for (size_t i = 0; i < parent_keys_container.size(); ++i)
+        {
+            const auto * it = index_to_key.find(i);
+            if (it == index_to_key.end())
+                continue;
+
+            auto parent_key = it->getMapped();
+            auto child_key = parent_keys_container[i];
+            parent_to_child[parent_key].emplace_back(child_key);
+        }
+
+        size_t keys_found = 0;
+        auto result = getKeysDescendantsArray(keys, parent_to_child, level, keys_found);
+
+        query_count.fetch_add(keys.size(), std::memory_order_relaxed);
+        found_count.fetch_add(keys_found, std::memory_order_relaxed);
+
+        return result;
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::createAttributes()
+{
+    const auto size = dict_struct.attributes.size();
+    attributes.reserve(size);
+
+    for (const auto & dictionary_attribute : dict_struct.attributes)
+    {
+        auto type_call = [&, this](const auto & dictionary_attribute_type)
+        {
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            using ValueType = DictionaryValueType<AttributeType>;
+
+            auto is_index_null = dictionary_attribute.is_nullable ? std::make_optional<std::vector<bool>>() : std::optional<std::vector<bool>>{};
+            std::unique_ptr<Arena> string_arena = std::is_same_v<AttributeType, String> ? std::make_unique<Arena>() : nullptr;
+            Attribute attribute{dictionary_attribute.underlying_type, AttributeContainerType<ValueType>(), std::move(is_index_null), std::move(string_arena)};
+            attributes.emplace_back(std::move(attribute));
+        };
+
+        callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::updateData()
+{
+    if (!update_field_loaded_block || update_field_loaded_block->rows() == 0)
+    {
+        QueryPipeline pipeline(source_ptr->loadUpdatedAll());
+
+        PullingPipelineExecutor executor(pipeline);
+        Block block;
+        while (executor.pull(block))
+        {
+            /// We are using this to keep saved data if input stream consists of multiple blocks
+            if (!update_field_loaded_block)
+                update_field_loaded_block = std::make_shared<DB::Block>(block.cloneEmpty());
+
+            for (size_t attribute_index = 0; attribute_index < block.columns(); ++attribute_index)
+            {
+                const IColumn & update_column = *block.getByPosition(attribute_index).column.get();
+                MutableColumnPtr saved_column = update_field_loaded_block->getByPosition(attribute_index).column->assumeMutable();
+                saved_column->insertRangeFrom(update_column, 0, update_column.size());
+            }
+        }
+    }
+    else
+    {
+        auto pipe = source_ptr->loadUpdatedAll();
+        mergeBlockWithPipe<dictionary_key_type>(
+            dict_struct.getKeysSize(),
+            *update_field_loaded_block,
+            std::move(pipe));
+    }
+
+    if (update_field_loaded_block)
+    {
+        resize(update_field_loaded_block->rows());
+        blockToAttributes(*update_field_loaded_block.get());
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::blockToAttributes(const Block & block [[maybe_unused]])
+{
+    size_t skip_keys_size_offset = dict_struct.getKeysSize();
+
+    Columns key_columns;
+    key_columns.reserve(skip_keys_size_offset);
+
+    /// Split into keys columns and attribute columns
+    for (size_t i = 0; i < skip_keys_size_offset; ++i)
+        key_columns.emplace_back(block.safeGetByPosition(i).column);
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns, arena_holder.getComplexKeyArena());
+    const size_t keys_size = keys_extractor.getKeysSize();
+
+    Field column_value_to_insert;
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        auto key = keys_extractor.extractCurrentKey();
+
+        auto it = key_attribute.container.find(key);
+
+        if (it != key_attribute.container.end())
+        {
+            keys_extractor.rollbackCurrentKey();
+            continue;
+        }
+
+        if constexpr (std::is_same_v<KeyType, StringRef>)
+            key = copyKeyInArena(key);
+
+        key_attribute.container.insert({key, element_count});
+
+        for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
+        {
+            const IColumn & attribute_column = *block.safeGetByPosition(skip_keys_size_offset + attribute_index).column;
+            auto & attribute = attributes[attribute_index];
+            bool attribute_is_nullable = attribute.is_index_null.has_value();
+
+            attribute_column.get(key_index, column_value_to_insert);
+
+            auto type_call = [&](const auto & dictionary_attribute_type)
+            {
+                using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+                using AttributeType = typename Type::AttributeType;
+                using AttributeValueType = DictionaryValueType<AttributeType>;
+
+                auto & attribute_container = std::get<AttributeContainerType<AttributeValueType>>(attribute.container);
+                attribute_container.emplace_back();
+
+                if (attribute_is_nullable)
+                {
+                    attribute.is_index_null->emplace_back();
+
+                    if (column_value_to_insert.isNull())
+                    {
+                        (*attribute.is_index_null).back() = true;
+                        return;
+                    }
+                }
+
+                if constexpr (std::is_same_v<AttributeValueType, StringRef>)
+                {
+                    String & value_to_insert = column_value_to_insert.get<String>();
+                    size_t value_to_insert_size = value_to_insert.size();
+
+                    const char * string_in_arena = attribute.string_arena->insert(value_to_insert.data(), value_to_insert_size);
+
+                    StringRef string_in_arena_reference = StringRef{string_in_arena, value_to_insert_size};
+                    attribute_container.back() = string_in_arena_reference;
+                }
+                else
+                {
+                    auto value_to_insert = column_value_to_insert.get<NearestFieldType<AttributeValueType>>();
+                    attribute_container.back() = value_to_insert;
+                }
+            };
+
+            callOnDictionaryAttributeType(attribute.type, type_call);
+        }
+
+        ++element_count;
+        keys_extractor.rollbackCurrentKey();
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::resize(size_t added_rows)
+{
+    if (unlikely(!added_rows))
+        return;
+
+    key_attribute.container.reserve(added_rows);
+}
+
+template <DictionaryKeyType dictionary_key_type>
+template <typename KeysProvider>
+ColumnPtr HashedArrayDictionary<dictionary_key_type>::getAttributeColumn(
+    const Attribute & attribute,
+    const DictionaryAttribute & dictionary_attribute,
+    size_t keys_size,
+    ColumnPtr default_values_column,
+    KeysProvider && keys_object) const
+{
+    ColumnPtr result;
+
+    bool is_attribute_nullable = attribute.is_index_null.has_value();
+
+    ColumnUInt8::MutablePtr col_null_map_to;
+    ColumnUInt8::Container * vec_null_map_to = nullptr;
+    if (attribute.is_index_null)
+    {
+        col_null_map_to = ColumnUInt8::create(keys_size, false);
+        vec_null_map_to = &col_null_map_to->getData();
+    }
+
+    auto type_call = [&](const auto & dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+
+        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(dictionary_attribute.null_value, default_values_column);
+
+        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
+
+        if constexpr (std::is_same_v<ValueType, Array>)
+        {
+            auto * out = column.get();
+
+            getItemsImpl<ValueType, false>(
+                attribute,
+                keys_object,
+                [&](const size_t, const Array & value, bool) { out->insert(value); },
+                default_value_extractor);
+        }
+        else if constexpr (std::is_same_v<ValueType, StringRef>)
+        {
+            auto * out = column.get();
+
+            if (is_attribute_nullable)
+                getItemsImpl<ValueType, true>(
+                    attribute,
+                    keys_object,
+                    [&](size_t row, const StringRef value, bool is_null)
+                    {
+                        (*vec_null_map_to)[row] = is_null;
+                        out->insertData(value.data, value.size);
+                    },
+                    default_value_extractor);
+            else
+                getItemsImpl<ValueType, false>(
+                    attribute,
+                    keys_object,
+                    [&](size_t, const StringRef value, bool) { out->insertData(value.data, value.size); },
+                    default_value_extractor);
+        }
+        else
+        {
+            auto & out = column->getData();
+
+            if (is_attribute_nullable)
+                getItemsImpl<ValueType, true>(
+                    attribute,
+                    keys_object,
+                    [&](size_t row, const auto value, bool is_null)
+                    {
+                        (*vec_null_map_to)[row] = is_null;
+                        out[row] = value;
+                    },
+                    default_value_extractor);
+            else
+                getItemsImpl<ValueType, false>(
+                    attribute,
+                    keys_object,
+                    [&](size_t row, const auto value, bool) { out[row] = value; },
+                    default_value_extractor);
+        }
+
+        result = std::move(column);
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+
+    if (is_attribute_nullable)
+        result = ColumnNullable::create(std::move(result), std::move(col_null_map_to));
+
+    return result;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
+void HashedArrayDictionary<dictionary_key_type>::getItemsImpl(
+    const Attribute & attribute,
+    DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+    ValueSetter && set_value [[maybe_unused]],
+    DefaultValueExtractor & default_value_extractor) const
+{
+    const auto & key_attribute_container = key_attribute.container;
+    const auto & attribute_container = std::get<AttributeContainerType<AttributeType>>(attribute.container);
+    const size_t keys_size = keys_extractor.getKeysSize();
+
+    size_t keys_found = 0;
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        auto key = keys_extractor.extractCurrentKey();
+
+        const auto it = key_attribute_container.find(key);
+
+        if (it != key_attribute_container.end())
+        {
+            size_t element_index = it->getMapped();
+
+            const auto & element = attribute_container[element_index];
+
+            if constexpr (is_nullable)
+                set_value(key_index, element, (*attribute.is_index_null)[element_index]);
+            else
+                set_value(key_index, element, false);
+
+            ++keys_found;
+        }
+        else
+        {
+            if constexpr (is_nullable)
+                set_value(key_index, default_value_extractor[key_index], default_value_extractor.isNullAt(key_index));
+            else
+                set_value(key_index, default_value_extractor[key_index], false);
+        }
+
+        keys_extractor.rollbackCurrentKey();
+    }
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+}
+
+template <DictionaryKeyType dictionary_key_type>
+template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
+void HashedArrayDictionary<dictionary_key_type>::getItemsImpl(
+    const Attribute & attribute,
+    const PaddedPODArray<ssize_t> & key_index_to_element_index,
+    ValueSetter && set_value,
+    DefaultValueExtractor & default_value_extractor) const
+{
+    const auto & attribute_container = std::get<AttributeContainerType<AttributeType>>(attribute.container);
+    const size_t keys_size = key_index_to_element_index.size();
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        bool key_exists = key_index_to_element_index[key_index] != -1;
+
+        if (key_exists)
+        {
+            size_t element_index = static_cast<size_t>(key_index_to_element_index[key_index]);
+            const auto & element = attribute_container[element_index];
+
+            if constexpr (is_nullable)
+                set_value(key_index, element, (*attribute.is_index_null)[element_index]);
+            else
+                set_value(key_index, element, false);
+        }
+        else
+        {
+            if constexpr (is_nullable)
+                set_value(key_index, default_value_extractor[key_index], default_value_extractor.isNullAt(key_index));
+            else
+                set_value(key_index, default_value_extractor[key_index], false);
+        }
+    }
+}
+
+template <DictionaryKeyType dictionary_key_type>
+StringRef HashedArrayDictionary<dictionary_key_type>::copyKeyInArena(StringRef key)
+{
+    size_t key_size = key.size;
+    char * place_for_key = complex_key_arena.alloc(key_size);
+    memcpy(reinterpret_cast<void *>(place_for_key), reinterpret_cast<const void *>(key.data), key_size);
+    StringRef updated_key{place_for_key, key_size};
+    return updated_key;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::loadData()
+{
+    if (!source_ptr->hasUpdateField())
+    {
+        QueryPipeline pipeline;
+        pipeline = QueryPipeline(source_ptr->loadAll());
+
+        PullingPipelineExecutor executor(pipeline);
+        Block block;
+        while (executor.pull(block))
+        {
+            resize(block.rows());
+            blockToAttributes(block);
+        }
+    }
+    else
+    {
+        updateData();
+    }
+
+    if (configuration.require_nonempty && 0 == element_count)
+        throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY,
+            "{}: dictionary source is empty and 'require_nonempty' property is set.",
+            full_name);
+}
+
+template <DictionaryKeyType dictionary_key_type>
+void HashedArrayDictionary<dictionary_key_type>::calculateBytesAllocated()
+{
+    bytes_allocated += attributes.size() * sizeof(attributes.front());
+
+    bytes_allocated += key_attribute.container.size();
+
+    for (auto & attribute : attributes)
+    {
+        auto type_call = [&](const auto & dictionary_attribute_type)
+        {
+            using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+            using AttributeType = typename Type::AttributeType;
+            using ValueType = DictionaryValueType<AttributeType>;
+
+            const auto & container = std::get<AttributeContainerType<ValueType>>(attribute.container);
+            bytes_allocated += sizeof(AttributeContainerType<ValueType>);
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                /// It is not accurate calculations
+                bytes_allocated += sizeof(Array) * container.size();
+            }
+            else
+            {
+                bytes_allocated += container.allocated_bytes();
+            }
+
+            bucket_count = container.capacity();
+
+            if constexpr (std::is_same_v<ValueType, StringRef>)
+                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
+        };
+
+        callOnDictionaryAttributeType(attribute.type, type_call);
+
+        if (attribute.string_arena)
+            bytes_allocated += attribute.string_arena->size();
+
+        if (attribute.is_index_null.has_value())
+            bytes_allocated += (*attribute.is_index_null).size();
+    }
+
+    bytes_allocated += complex_key_arena.size();
+
+    if (update_field_loaded_block)
+        bytes_allocated += update_field_loaded_block->allocatedBytes();
+}
+
+template <DictionaryKeyType dictionary_key_type>
+Pipe HashedArrayDictionary<dictionary_key_type>::read(const Names & column_names, size_t max_block_size, size_t num_streams) const
+{
+    PaddedPODArray<HashedArrayDictionary::KeyType> keys;
+    keys.reserve(key_attribute.container.size());
+
+    for (auto & [key, _] : key_attribute.container)
+        keys.emplace_back(key);
+
+    ColumnsWithTypeAndName key_columns;
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+        key_columns = {ColumnWithTypeAndName(getColumnFromPODArray(keys), std::make_shared<DataTypeUInt64>(), dict_struct.id->name)};
+    else
+        key_columns = deserializeColumnsWithTypeAndNameFromKeys(dict_struct, keys, 0, keys.size());
+
+    std::shared_ptr<const IDictionary> dictionary = shared_from_this();
+    auto coordinator = std::make_shared<DictionarySourceCoordinator>(dictionary, column_names, std::move(key_columns), max_block_size);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<DictionarySource>(coordinator);
+        pipes.emplace_back(Pipe(std::move(source)));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+template class HashedArrayDictionary<DictionaryKeyType::Simple>;
+template class HashedArrayDictionary<DictionaryKeyType::Complex>;
+
+void registerDictionaryArrayHashed(DictionaryFactory & factory)
+{
+    auto create_layout = [](const std::string & full_name,
+                             const DictionaryStructure & dict_struct,
+                             const Poco::Util::AbstractConfiguration & config,
+                             const std::string & config_prefix,
+                             DictionarySourcePtr source_ptr,
+                             DictionaryKeyType dictionary_key_type) -> DictionaryPtr
+    {
+        if (dictionary_key_type == DictionaryKeyType::Simple && dict_struct.key)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for simple key hashed array dictionary");
+        else if (dictionary_key_type == DictionaryKeyType::Complex && dict_struct.id)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for complex key hashed array dictionary");
+
+        if (dict_struct.range_min || dict_struct.range_max)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "{}: elements .structure.range_min and .structure.range_max should be defined only "
+                "for a dictionary of layout 'range_hashed'",
+                full_name);
+
+        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
+        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
+        const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
+
+        HashedArrayDictionaryStorageConfiguration configuration{require_nonempty, dict_lifetime};
+
+        if (dictionary_key_type == DictionaryKeyType::Simple)
+            return std::make_unique<HashedArrayDictionary<DictionaryKeyType::Simple>>(dict_id, dict_struct, std::move(source_ptr), configuration);
+        else
+            return std::make_unique<HashedArrayDictionary<DictionaryKeyType::Complex>>(dict_id, dict_struct, std::move(source_ptr), configuration);
+    };
+
+    using namespace std::placeholders;
+
+    factory.registerLayout("hashed_array",
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* global_context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::Simple); }, false);
+    factory.registerLayout("complex_key_hashed_array",
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* global_context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::Complex); }, true);
+}
+
+}
diff --git a/src/Dictionaries/HashedArrayDictionary.h b/src/Dictionaries/HashedArrayDictionary.h
new file mode 100644
index 00000000000..5ad1efeb056
--- /dev/null
+++ b/src/Dictionaries/HashedArrayDictionary.h
@@ -0,0 +1,233 @@
+#pragma once
+
+#include <atomic>
+#include <memory>
+#include <variant>
+#include <optional>
+
+#include <Common/SparseHashMap.h>
+
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
+#include <Core/Block.h>
+
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryHelpers.h>
+
+/** This dictionary stores all attributes in arrays.
+  * Key is stored in hash table and value is index into attribute array.
+  */
+
+namespace DB
+{
+
+struct HashedArrayDictionaryStorageConfiguration
+{
+    const bool require_nonempty;
+    const DictionaryLifetime lifetime;
+};
+
+template <DictionaryKeyType dictionary_key_type>
+class HashedArrayDictionary final : public IDictionary
+{
+public:
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
+
+    HashedArrayDictionary(
+        const StorageID & dict_id_,
+        const DictionaryStructure & dict_struct_,
+        DictionarySourcePtr source_ptr_,
+        const HashedArrayDictionaryStorageConfiguration & configuration_,
+        BlockPtr update_field_loaded_block_ = nullptr);
+
+    std::string getTypeName() const override
+    {
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+            return "HashedArray";
+        else
+            return "ComplexHashedArray";
+    }
+
+    size_t getBytesAllocated() const override { return bytes_allocated; }
+
+    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+
+    double getFoundRate() const override
+    {
+        size_t queries = query_count.load(std::memory_order_relaxed);
+        if (!queries)
+            return 0;
+        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+    }
+
+    double getHitRate() const override { return 1.0; }
+
+    size_t getElementCount() const override { return element_count; }
+
+    double getLoadFactor() const override { return static_cast<double>(element_count) / bucket_count; }
+
+    std::shared_ptr<const IExternalLoadable> clone() const override
+    {
+        return std::make_shared<HashedArrayDictionary<dictionary_key_type>>(getDictionaryID(), dict_struct, source_ptr->clone(), configuration, update_field_loaded_block);
+    }
+
+    const IDictionarySource * getSource() const override { return source_ptr.get(); }
+
+    const DictionaryLifetime & getLifetime() const override { return configuration.lifetime; }
+
+    const DictionaryStructure & getStructure() const override { return dict_struct; }
+
+    bool isInjective(const std::string & attribute_name) const override
+    {
+        return dict_struct.getAttribute(attribute_name).injective;
+    }
+
+    DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
+
+    ColumnPtr getColumn(
+        const std::string& attribute_name,
+        const DataTypePtr & result_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const ColumnPtr & default_values_column) const override;
+
+    Columns getColumns(
+        const Strings & attribute_names,
+        const DataTypes & result_types,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        const Columns & default_values_columns) const override;
+
+    ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
+
+    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::Simple && dict_struct.hierarchical_attribute_index.has_value(); }
+
+    ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & hierarchy_attribute_type) const override;
+
+    ColumnUInt8::Ptr isInHierarchy(
+        ColumnPtr key_column,
+        ColumnPtr in_key_column,
+        const DataTypePtr & key_type) const override;
+
+    ColumnPtr getDescendants(
+        ColumnPtr key_column,
+        const DataTypePtr & key_type,
+        size_t level) const override;
+
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
+
+private:
+
+    using KeyContainerType = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        HashMap<UInt64, size_t>,
+        HashMapWithSavedHash<StringRef, size_t, DefaultHash<StringRef>>>;
+
+    template <typename Value>
+    using AttributeContainerType = std::conditional_t<std::is_same_v<Value, Array>, std::vector<Value>, PaddedPODArray<Value>>;
+
+    struct Attribute final
+    {
+        AttributeUnderlyingType type;
+
+        std::variant<
+            AttributeContainerType<UInt8>,
+            AttributeContainerType<UInt16>,
+            AttributeContainerType<UInt32>,
+            AttributeContainerType<UInt64>,
+            AttributeContainerType<UInt128>,
+            AttributeContainerType<UInt256>,
+            AttributeContainerType<Int8>,
+            AttributeContainerType<Int16>,
+            AttributeContainerType<Int32>,
+            AttributeContainerType<Int64>,
+            AttributeContainerType<Int128>,
+            AttributeContainerType<Int256>,
+            AttributeContainerType<Decimal32>,
+            AttributeContainerType<Decimal64>,
+            AttributeContainerType<Decimal128>,
+            AttributeContainerType<Decimal256>,
+            AttributeContainerType<Float32>,
+            AttributeContainerType<Float64>,
+            AttributeContainerType<UUID>,
+            AttributeContainerType<StringRef>,
+            AttributeContainerType<Array>>
+            container;
+
+        std::optional<std::vector<bool>> is_index_null;
+        std::unique_ptr<Arena> string_arena;
+    };
+
+    struct KeyAttribute final
+    {
+
+        KeyContainerType container;
+
+    };
+
+    void createAttributes();
+
+    void blockToAttributes(const Block & block);
+
+    void updateData();
+
+    void loadData();
+
+    void calculateBytesAllocated();
+
+    template <typename KeysProvider>
+    ColumnPtr getAttributeColumn(
+        const Attribute & attribute,
+        const DictionaryAttribute & dictionary_attribute,
+        size_t keys_size,
+        ColumnPtr default_values_column,
+        KeysProvider && keys_object) const;
+
+    template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
+    void getItemsImpl(
+        const Attribute & attribute,
+        DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+        ValueSetter && set_value,
+        DefaultValueExtractor & default_value_extractor) const;
+
+    template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
+    void getItemsImpl(
+        const Attribute & attribute,
+        const PaddedPODArray<ssize_t> & key_index_to_element_index,
+        ValueSetter && set_value,
+        DefaultValueExtractor & default_value_extractor) const;
+
+    template <typename GetContainerFunc>
+    void getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func);
+
+    template <typename GetContainerFunc>
+    void getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func) const;
+
+    void resize(size_t added_rows);
+
+    StringRef copyKeyInArena(StringRef key);
+
+    const DictionaryStructure dict_struct;
+    const DictionarySourcePtr source_ptr;
+    const HashedArrayDictionaryStorageConfiguration configuration;
+
+    std::vector<Attribute> attributes;
+
+    KeyAttribute key_attribute;
+
+    size_t bytes_allocated = 0;
+    size_t element_count = 0;
+    size_t bucket_count = 0;
+    mutable std::atomic<size_t> query_count{0};
+    mutable std::atomic<size_t> found_count{0};
+
+    BlockPtr update_field_loaded_block;
+    Arena complex_key_arena;
+};
+
+extern template class HashedArrayDictionary<DictionaryKeyType::Simple>;
+extern template class HashedArrayDictionary<DictionaryKeyType::Complex>;
+
+}
diff --git a/src/Dictionaries/HashedDictionary.cpp b/src/Dictionaries/HashedDictionary.cpp
index d65338b9a4b..728d8c1c352 100644
--- a/src/Dictionaries/HashedDictionary.cpp
+++ b/src/Dictionaries/HashedDictionary.cpp
@@ -6,7 +6,9 @@
 #include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
 
-#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
+
+#include <Dictionaries//DictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
@@ -61,7 +63,7 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getColumn(
     const DataTypes & key_types [[maybe_unused]],
     const ColumnPtr & default_values_column) const
 {
-    if (dictionary_key_type == DictionaryKeyType::complex)
+    if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
     ColumnPtr result;
@@ -163,7 +165,7 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getColumn(
 template <DictionaryKeyType dictionary_key_type, bool sparse>
 ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
-    if (dictionary_key_type == DictionaryKeyType::complex)
+    if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
     DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
@@ -210,7 +212,7 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::hasKeys(const Co
 template <DictionaryKeyType dictionary_key_type, bool sparse>
 ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getHierarchy(ColumnPtr key_column [[maybe_unused]], const DataTypePtr &) const
 {
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
         PaddedPODArray<UInt64> keys_backup_storage;
         const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
@@ -258,7 +260,7 @@ ColumnUInt8::Ptr HashedDictionary<dictionary_key_type, sparse>::isInHierarchy(
     ColumnPtr in_key_column [[maybe_unused]],
     const DataTypePtr &) const
 {
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
         PaddedPODArray<UInt64> keys_backup_storage;
         const auto & keys = getColumnVectorData(this, key_column, keys_backup_storage);
@@ -309,7 +311,7 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse>::getDescendants(
     const DataTypePtr &,
     size_t level [[maybe_unused]]) const
 {
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
         PaddedPODArray<UInt64> keys_backup;
         const auto & keys = getColumnVectorData(this, key_column, keys_backup);
@@ -367,10 +369,11 @@ void HashedDictionary<dictionary_key_type, sparse>::updateData()
 
     if (!update_field_loaded_block || update_field_loaded_block->rows() == 0)
     {
-        auto stream = source_ptr->loadUpdatedAll();
-        stream->readPrefix();
+        QueryPipeline pipeline(source_ptr->loadUpdatedAll());
 
-        while (const auto block = stream->read())
+        PullingPipelineExecutor executor(pipeline);
+        Block block;
+        while (executor.pull(block))
         {
             /// We are using this to keep saved data if input stream consists of multiple blocks
             if (!update_field_loaded_block)
@@ -383,15 +386,14 @@ void HashedDictionary<dictionary_key_type, sparse>::updateData()
                 saved_column->insertRangeFrom(update_column, 0, update_column.size());
             }
         }
-        stream->readSuffix();
     }
     else
     {
-        auto stream = source_ptr->loadUpdatedAll();
-        mergeBlockWithStream<dictionary_key_type>(
+        auto pipe = source_ptr->loadUpdatedAll();
+        mergeBlockWithPipe<dictionary_key_type>(
             dict_struct.getKeysSize(),
             *update_field_loaded_block,
-            stream);
+            std::move(pipe));
     }
 
     if (update_field_loaded_block)
@@ -560,15 +562,15 @@ void HashedDictionary<dictionary_key_type, sparse>::loadData()
     {
         std::atomic<size_t> new_size = 0;
 
-        BlockInputStreamPtr stream;
+        QueryPipeline pipeline;
         if (configuration.preallocate)
-            stream = source_ptr->loadAllWithSizeHint(&new_size);
+            pipeline = QueryPipeline(source_ptr->loadAllWithSizeHint(&new_size));
         else
-            stream = source_ptr->loadAll();
+            pipeline = QueryPipeline(source_ptr->loadAll());
 
-        stream->readPrefix();
-
-        while (const auto block = stream->read())
+        PullingPipelineExecutor executor(pipeline);
+        Block block;
+        while (executor.pull(block))
         {
             if (configuration.preallocate && new_size)
             {
@@ -584,8 +586,6 @@ void HashedDictionary<dictionary_key_type, sparse>::loadData()
 
             blockToAttributes(block);
         }
-
-        stream->readSuffix();
     }
     else
         updateData();
@@ -628,6 +628,11 @@ void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
 
         if (attributes[i].string_arena)
             bytes_allocated += attributes[i].string_arena->size();
+
+        bytes_allocated += sizeof(attributes[i].is_nullable_set);
+
+        if (attributes[i].is_nullable_set.has_value())
+            bytes_allocated = attributes[i].is_nullable_set->getBufferSizeInBytes();
     }
 
     bytes_allocated += complex_key_arena.size();
@@ -637,7 +642,7 @@ void HashedDictionary<dictionary_key_type, sparse>::calculateBytesAllocated()
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse>
-BlockInputStreamPtr HashedDictionary<dictionary_key_type, sparse>::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+Pipe HashedDictionary<dictionary_key_type, sparse>::read(const Names & column_names, size_t max_block_size, size_t num_streams) const
 {
     PaddedPODArray<HashedDictionary::KeyType> keys;
 
@@ -666,10 +671,25 @@ BlockInputStreamPtr HashedDictionary<dictionary_key_type, sparse>::getBlockInput
         });
     }
 
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
-        return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, std::move(keys), column_names);
+    ColumnsWithTypeAndName key_columns;
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+        key_columns = {ColumnWithTypeAndName(getColumnFromPODArray(keys), std::make_shared<DataTypeUInt64>(), dict_struct.id->name)};
     else
-        return std::make_shared<DictionaryBlockInputStream>(shared_from_this(), max_block_size, keys, column_names);
+        key_columns = deserializeColumnsWithTypeAndNameFromKeys(dict_struct, keys, 0, keys.size());
+
+    std::shared_ptr<const IDictionary> dictionary = shared_from_this();
+    auto coordinator = std::make_shared<DictionarySourceCoordinator>(dictionary, column_names, std::move(key_columns), max_block_size);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<DictionarySource>(coordinator);
+        pipes.emplace_back(Pipe(std::move(source)));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse>
@@ -703,10 +723,10 @@ void HashedDictionary<dictionary_key_type, sparse>::getAttributeContainer(size_t
     });
 }
 
-template class HashedDictionary<DictionaryKeyType::simple, true>;
-template class HashedDictionary<DictionaryKeyType::simple, false>;
-template class HashedDictionary<DictionaryKeyType::complex, true>;
-template class HashedDictionary<DictionaryKeyType::complex, false>;
+template class HashedDictionary<DictionaryKeyType::Simple, true>;
+template class HashedDictionary<DictionaryKeyType::Simple, false>;
+template class HashedDictionary<DictionaryKeyType::Complex, true>;
+template class HashedDictionary<DictionaryKeyType::Complex, false>;
 
 void registerDictionaryHashed(DictionaryFactory & factory)
 {
@@ -718,9 +738,9 @@ void registerDictionaryHashed(DictionaryFactory & factory)
                              DictionaryKeyType dictionary_key_type,
                              bool sparse) -> DictionaryPtr
     {
-        if (dictionary_key_type == DictionaryKeyType::simple && dict_struct.key)
+        if (dictionary_key_type == DictionaryKeyType::Simple && dict_struct.key)
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is not supported for simple key hashed dictionary");
-        else if (dictionary_key_type == DictionaryKeyType::complex && dict_struct.id)
+        else if (dictionary_key_type == DictionaryKeyType::Complex && dict_struct.id)
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for complex key hashed dictionary");
 
         if (dict_struct.range_min || dict_struct.range_max)
@@ -733,37 +753,47 @@ void registerDictionaryHashed(DictionaryFactory & factory)
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
         const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
 
-        const std::string & layout_prefix = sparse ? ".layout.sparse_hashed" : ".layout.hashed";
-        const bool preallocate = config.getBool(config_prefix + layout_prefix + ".preallocate", false);
+        std::string dictionary_layout_name;
+
+        if (dictionary_key_type == DictionaryKeyType::Simple)
+            dictionary_layout_name = "hashed";
+        else
+            dictionary_layout_name = "complex_key_hashed";
+
+        if (sparse)
+            dictionary_layout_name = "sparse_" + dictionary_layout_name;
+
+        const std::string dictionary_layout_prefix = ".layout." + dictionary_layout_name;
+        const bool preallocate = config.getBool(config_prefix + dictionary_layout_prefix + ".preallocate", false);
 
         HashedDictionaryStorageConfiguration configuration{preallocate, require_nonempty, dict_lifetime};
 
-        if (dictionary_key_type == DictionaryKeyType::simple)
+        if (dictionary_key_type == DictionaryKeyType::Simple)
         {
             if (sparse)
-                return std::make_unique<HashedDictionary<DictionaryKeyType::simple, true>>(dict_id, dict_struct, std::move(source_ptr), configuration);
+                return std::make_unique<HashedDictionary<DictionaryKeyType::Simple, true>>(dict_id, dict_struct, std::move(source_ptr), configuration);
             else
-                return std::make_unique<HashedDictionary<DictionaryKeyType::simple, false>>(dict_id, dict_struct, std::move(source_ptr), configuration);
+                return std::make_unique<HashedDictionary<DictionaryKeyType::Simple, false>>(dict_id, dict_struct, std::move(source_ptr), configuration);
         }
         else
         {
             if (sparse)
-                return std::make_unique<HashedDictionary<DictionaryKeyType::complex, true>>(dict_id, dict_struct, std::move(source_ptr), configuration);
+                return std::make_unique<HashedDictionary<DictionaryKeyType::Complex, true>>(dict_id, dict_struct, std::move(source_ptr), configuration);
             else
-                return std::make_unique<HashedDictionary<DictionaryKeyType::complex, false>>(dict_id, dict_struct, std::move(source_ptr), configuration);
+                return std::make_unique<HashedDictionary<DictionaryKeyType::Complex, false>>(dict_id, dict_struct, std::move(source_ptr), configuration);
         }
     };
 
     using namespace std::placeholders;
 
     factory.registerLayout("hashed",
-        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::simple, /* sparse = */ false); }, false);
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* global_context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::Simple, /* sparse = */ false); }, false);
     factory.registerLayout("sparse_hashed",
-        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::simple, /* sparse = */ true); }, false);
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* global_context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::Simple, /* sparse = */ true); }, false);
     factory.registerLayout("complex_key_hashed",
-        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::complex, /* sparse = */ false); }, true);
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* global_context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::Complex, /* sparse = */ false); }, true);
     factory.registerLayout("complex_key_sparse_hashed",
-        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::complex, /* sparse = */ true); }, true);
+        [=](auto && a, auto && b, auto && c, auto && d, DictionarySourcePtr e, ContextPtr /* global_context */, bool /*created_from_ddl*/){ return create_layout(a, b, c, d, std::move(e), DictionaryKeyType::Complex, /* sparse = */ true); }, true);
 
 }
 
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 842e49aa8f0..23919c009c5 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -5,7 +5,7 @@
 #include <variant>
 #include <optional>
 
-#include <sparsehash/sparse_hash_map>
+#include <Common/SparseHashMap.h>
 
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
@@ -35,8 +35,7 @@ template <DictionaryKeyType dictionary_key_type, bool sparse>
 class HashedDictionary final : public IDictionary
 {
 public:
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by hashed dictionary");
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     HashedDictionary(
         const StorageID & dict_id_,
@@ -47,11 +46,11 @@ public:
 
     std::string getTypeName() const override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple && sparse)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple && sparse)
             return "SparseHashed";
-        else if constexpr (dictionary_key_type == DictionaryKeyType::simple && !sparse)
+        else if constexpr (dictionary_key_type == DictionaryKeyType::Simple && !sparse)
             return "Hashed";
-        else if constexpr (dictionary_key_type == DictionaryKeyType::complex && sparse)
+        else if constexpr (dictionary_key_type == DictionaryKeyType::Complex && sparse)
             return "ComplexKeySparseHashed";
         else
             return "ComplexKeyHashed";
@@ -102,7 +101,7 @@ public:
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::simple && dict_struct.hierarchical_attribute_index.has_value(); }
+    bool hasHierarchy() const override { return dictionary_key_type == DictionaryKeyType::Simple && dict_struct.hierarchical_attribute_index.has_value(); }
 
     ColumnPtr getHierarchy(ColumnPtr key_column, const DataTypePtr & hierarchy_attribute_type) const override;
 
@@ -116,26 +115,18 @@ public:
         const DataTypePtr & key_type,
         size_t level) const override;
 
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
 private:
     template <typename Value>
     using CollectionTypeNonSparse = std::conditional_t<
-        dictionary_key_type == DictionaryKeyType::simple,
+        dictionary_key_type == DictionaryKeyType::Simple,
         HashMap<UInt64, Value>,
         HashMapWithSavedHash<StringRef, Value, DefaultHash<StringRef>>>;
 
-#if !defined(ARCADIA_BUILD)
-    template <typename Key, typename Value>
-    using SparseHashMap = google::sparse_hash_map<Key, Value, DefaultHash<Key>>;
-#else
-        template <typename Key, typename Value>
-        using SparseHashMap = google::sparsehash::sparse_hash_map<Key, Value, DefaultHash<Key>>;
-#endif
-
     template <typename Value>
     using CollectionTypeSparse = std::conditional_t<
-        dictionary_key_type == DictionaryKeyType::simple,
+        dictionary_key_type == DictionaryKeyType::Simple,
         SparseHashMap<UInt64, Value>,
         SparseHashMap<StringRef, Value>>;
 
@@ -219,10 +210,10 @@ private:
     Arena complex_key_arena;
 };
 
-extern template class HashedDictionary<DictionaryKeyType::simple, false>;
-extern template class HashedDictionary<DictionaryKeyType::simple, true>;
+extern template class HashedDictionary<DictionaryKeyType::Simple, false>;
+extern template class HashedDictionary<DictionaryKeyType::Simple, true>;
 
-extern template class HashedDictionary<DictionaryKeyType::complex, false>;
-extern template class HashedDictionary<DictionaryKeyType::complex, true>;
+extern template class HashedDictionary<DictionaryKeyType::Complex, false>;
+extern template class HashedDictionary<DictionaryKeyType::Complex, true>;
 
 }
diff --git a/src/Dictionaries/HierarchyDictionariesUtils.h b/src/Dictionaries/HierarchyDictionariesUtils.h
index 44382f4720f..f0c6b4b1a0f 100644
--- a/src/Dictionaries/HierarchyDictionariesUtils.h
+++ b/src/Dictionaries/HierarchyDictionariesUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/PODArray.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
diff --git a/src/Dictionaries/ICacheDictionaryStorage.h b/src/Dictionaries/ICacheDictionaryStorage.h
index 72b3ef76f11..b094d76a9a7 100644
--- a/src/Dictionaries/ICacheDictionaryStorage.h
+++ b/src/Dictionaries/ICacheDictionaryStorage.h
@@ -106,7 +106,8 @@ public:
     /// Insert default keys
     virtual void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) = 0;
 
-    /// Return cached simple keys
+    /// Return cached complex keys.
+    /// It is client responsibility to ensure keys proper lifetime.
     virtual PaddedPODArray<StringRef> getCachedComplexKeys() const = 0;
 
     /// Return size of keys in storage
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index 5467a673503..66e35c8fa12 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -1,22 +1,17 @@
 #pragma once
 
-
 #include <Core/Names.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/StorageID.h>
-#include <Poco/Util/XMLConfiguration.h>
-#include <Common/PODArray.h>
-#include <common/StringRef.h>
-#include "IDictionarySource.h"
+#include <Columns/ColumnsNumber.h>
+#include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <DataTypes/IDataType.h>
-#include <Columns/ColumnsNumber.h>
 
-#include <chrono>
 #include <memory>
 #include <mutex>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -33,15 +28,20 @@ using DictionaryPtr = std::unique_ptr<IDictionary>;
   * Simple is for dictionaries that support UInt64 key column.
   *
   * Complex is for dictionaries that support any combination of key columns.
-  *
-  * Range is for dictionary that support combination of UInt64 key column,
-  * and numeric representable range key column.
   */
 enum class DictionaryKeyType
 {
-    simple,
-    complex,
-    range
+    Simple,
+    Complex
+};
+
+/** DictionarySpecialKeyType provides IDictionary client information about
+  * which special key type is supported by dictionary.
+  */
+enum class DictionarySpecialKeyType
+{
+    None,
+    Range
 };
 
 /**
@@ -56,6 +56,7 @@ struct IDictionary : public IExternalLoadable
     }
 
     const std::string & getFullName() const{ return full_name; }
+
     StorageID getDictionaryID() const
     {
         std::lock_guard lock{name_mutex};
@@ -109,6 +110,8 @@ struct IDictionary : public IExternalLoadable
       */
     virtual DictionaryKeyType getKeyType() const = 0;
 
+    virtual DictionarySpecialKeyType getSpecialKeyType() const { return DictionarySpecialKeyType::None; }
+
     /** Subclass must validate key columns and keys types
       * and return column representation of dictionary attribute.
       *
@@ -191,7 +194,7 @@ struct IDictionary : public IExternalLoadable
                         getDictionaryID().getNameForLogs());
     }
 
-    virtual BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const = 0;
+    virtual Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const = 0;
 
     bool supportUpdates() const override { return true; }
 
@@ -213,12 +216,25 @@ struct IDictionary : public IExternalLoadable
         return std::static_pointer_cast<const IDictionary>(IExternalLoadable::shared_from_this());
     }
 
+    void setDictionaryComment(String new_comment)
+    {
+        std::lock_guard lock{name_mutex};
+        dictionary_comment = std::move(new_comment);
+    }
+
+    String getDictionaryComment() const
+    {
+        std::lock_guard lock{name_mutex};
+        return dictionary_comment;
+    }
+
 private:
     mutable std::mutex name_mutex;
     mutable StorageID dictionary_id;
 
 protected:
     const String full_name;
+    String dictionary_comment;
 };
 
 }
diff --git a/src/Dictionaries/IDictionarySource.h b/src/Dictionaries/IDictionarySource.h
index 42b35c95062..5071b69d2bf 100644
--- a/src/Dictionaries/IDictionarySource.h
+++ b/src/Dictionaries/IDictionarySource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Columns/IColumn.h>
-#include <DataStreams/IBlockStream_fwd.h>
+#include <QueryPipeline/Pipe.h>
 
 #include <vector>
 #include <atomic>
@@ -21,28 +21,30 @@ class IDictionarySource
 {
 public:
 
-    /// Returns an input stream with all the data available from this source.
-    virtual BlockInputStreamPtr loadAll() = 0;
+    /// Returns a pipe with all the data available from this source.
+    virtual Pipe loadAll() = 0;
 
-    /// Returns an input stream with updated data available from this source.
-    virtual BlockInputStreamPtr loadUpdatedAll() = 0;
+    /// Returns a pipe with updated data available from this source.
+    virtual Pipe loadUpdatedAll() = 0;
 
     /**
      * result_size_hint - approx number of rows in the stream.
-     * Returns an input stream with all the data available from this source.
+     * Returns a pipe with all the data available from this source.
      *
      * NOTE: result_size_hint may be changed during you are reading (usually it
      * will be non zero for the first block and zero for others, since it uses
-     * Progress::total_rows_approx,) from the input stream, and may be called
+     * Progress::total_rows_approx,) from the pipe, and may be called
      * in parallel, so you should use something like this:
      *
      *   ...
      *   std::atomic<uint64_t> new_size = 0;
      *
-     *   auto stream = source->loadAll(&new_size);
-     *   stream->readPrefix();
+     *   QueryPipeline pipeline;
+     *   pipeline.init(source->loadAll(&new_size));
+     *   PullingPipelineExecutor executor;
      *
-     *   while (const auto block = stream->read())
+     *   Block block;
+     *   while (executor.pull(block))
      *   {
      *       if (new_size)
      *       {
@@ -56,10 +58,9 @@ public:
      *       }
      *   }
      *
-     *   stream->readSuffix();
      *   ...
      */
-    virtual BlockInputStreamPtr loadAllWithSizeHint(std::atomic<size_t> * /* result_size_hint */)
+    virtual Pipe loadAllWithSizeHint(std::atomic<size_t> * /* result_size_hint */)
     {
         return loadAll();
     }
@@ -72,13 +73,13 @@ public:
     /** Returns an input stream with the data for a collection of identifiers.
       * It must be guaranteed, that 'ids' array will live at least until all data will be read from returned stream.
       */
-    virtual BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) = 0;
+    virtual Pipe loadIds(const std::vector<UInt64> & ids) = 0;
 
     /** Returns an input stream with the data for a collection of composite keys.
       * `requested_rows` contains indices of all rows containing unique keys.
       * It must be guaranteed, that 'requested_rows' array will live at least until all data will be read from returned stream.
       */
-    virtual BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) = 0;
+    virtual Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) = 0;
 
     /// indicates whether the source has been modified since last load* operation
     virtual bool isModified() const = 0;
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index a36aeb59f01..266f8a7415c 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -10,10 +10,10 @@
 #include <DataTypes/DataTypesDecimal.h>
 #include <Poco/ByteOrder.h>
 #include <Common/formatIPv6.h>
-#include <common/itoa.h>
-#include <common/map.h>
-#include <common/range.h>
-#include <Dictionaries/DictionaryBlockInputStream.h>
+#include <base/itoa.h>
+#include <base/map.h>
+#include <base/range.h>
+#include <Dictionaries/DictionarySource.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionHelpers.h>
 
@@ -352,14 +352,15 @@ void IPAddressDictionary::createAttributes()
 
 void IPAddressDictionary::loadData()
 {
-    auto stream = source_ptr->loadAll();
-    stream->readPrefix();
+    QueryPipeline pipeline(source_ptr->loadAll());
 
     std::vector<IPRecord> ip_records;
 
     bool has_ipv6 = false;
 
-    while (const auto block = stream->read())
+    PullingPipelineExecutor executor(pipeline);
+    Block block;
+    while (executor.pull(block))
     {
         const auto rows = block.rows();
         element_count += rows;
@@ -387,8 +388,6 @@ void IPAddressDictionary::loadData()
         }
     }
 
-    stream->readSuffix();
-
     if (access_to_key_from_attributes)
     {
         /// We format key attribute values here instead of filling with data from key_column
@@ -808,13 +807,14 @@ Columns IPAddressDictionary::getKeyColumns() const
         key_ip_column->insertData(data, IPV6_BINARY_LENGTH);
         key_mask_column->insertValue(mask_column[row]);
     }
+
     return {std::move(key_ip_column), std::move(key_mask_column)};
 }
 
 template <typename KeyColumnType, bool IsIPv4>
 static auto keyViewGetter()
 {
-    return [](const Columns & columns, const std::vector<DictionaryAttribute> & dict_attributes)
+    return [](const Columns & columns, const std::vector<DictionaryAttribute> & dictonary_key_attributes)
     {
         auto column = ColumnString::create();
         const auto & key_ip_column = assert_cast<const KeyColumnType &>(*columns.front());
@@ -831,39 +831,52 @@ static auto keyViewGetter()
             column->insertData(buffer, str_len);
         }
         return ColumnsWithTypeAndName{
-            ColumnWithTypeAndName(std::move(column), std::make_shared<DataTypeString>(), dict_attributes.front().name)};
+            ColumnWithTypeAndName(std::move(column), std::make_shared<DataTypeString>(), dictonary_key_attributes.front().name)};
     };
 }
 
-BlockInputStreamPtr IPAddressDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+Pipe IPAddressDictionary::read(const Names & column_names, size_t max_block_size, size_t num_streams) const
 {
     const bool is_ipv4 = std::get_if<IPv4Container>(&ip_column) != nullptr;
 
-    auto get_keys = [is_ipv4](const Columns & columns, const std::vector<DictionaryAttribute> & dict_attributes)
-    {
-        const auto & attr = dict_attributes.front();
-        std::shared_ptr<const IDataType> key_typ;
-        if (is_ipv4)
-            key_typ = std::make_shared<DataTypeUInt32>();
-        else
-            key_typ = std::make_shared<DataTypeFixedString>(IPV6_BINARY_LENGTH);
+    auto key_columns = getKeyColumns();
 
-        return ColumnsWithTypeAndName({
-            ColumnWithTypeAndName(columns.front(), key_typ, attr.name),
-            ColumnWithTypeAndName(columns.back(), std::make_shared<DataTypeUInt8>(), attr.name + ".mask")
-        });
+    std::shared_ptr<const IDataType> key_type;
+    if (is_ipv4)
+        key_type = std::make_shared<DataTypeUInt32>();
+    else
+        key_type = std::make_shared<DataTypeFixedString>(IPV6_BINARY_LENGTH);
+
+    ColumnsWithTypeAndName key_columns_with_type = {
+        ColumnWithTypeAndName(key_columns.front(), key_type, ""),
+        ColumnWithTypeAndName(key_columns.back(), std::make_shared<DataTypeUInt8>(), "")
     };
 
+    ColumnsWithTypeAndName view_columns;
+
     if (is_ipv4)
     {
         auto get_view = keyViewGetter<ColumnVector<UInt32>, true>();
-        return std::make_shared<DictionaryBlockInputStream>(
-            shared_from_this(), max_block_size, getKeyColumns(), column_names, std::move(get_keys), std::move(get_view));
+        view_columns = get_view(key_columns, *dict_struct.key);
+    }
+    else
+    {
+        auto get_view = keyViewGetter<ColumnFixedString, false>();
+        view_columns = get_view(key_columns, *dict_struct.key);
     }
 
-    auto get_view = keyViewGetter<ColumnFixedString, false>();
-    return std::make_shared<DictionaryBlockInputStream>(
-        shared_from_this(), max_block_size, getKeyColumns(), column_names, std::move(get_keys), std::move(get_view));
+    std::shared_ptr<const IDictionary> dictionary = shared_from_this();
+    auto coordinator = std::make_shared<DictionarySourceCoordinator>(dictionary, column_names, std::move(key_columns_with_type), std::move(view_columns), max_block_size);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<DictionarySource>(coordinator);
+        pipes.emplace_back(Pipe(std::move(source)));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 IPAddressDictionary::RowIdxConstIter IPAddressDictionary::ipNotFound() const
@@ -952,7 +965,7 @@ void registerDictionaryTrie(DictionaryFactory & factory)
                              const Poco::Util::AbstractConfiguration & config,
                              const std::string & config_prefix,
                              DictionarySourcePtr source_ptr,
-                             ContextPtr /* context */,
+                             ContextPtr /* global_context */,
                              bool /*created_from_ddl*/) -> DictionaryPtr
     {
         if (!dict_struct.key || dict_struct.key->size() != 1)
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index f44291cec6a..ed0d8692d21 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -10,8 +10,8 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnVector.h>
 #include <Poco/Net/IPAddress.h>
-#include <common/StringRef.h>
-#include <common/logger_useful.h>
+#include <base/StringRef.h>
+#include <base/logger_useful.h>
 #include "DictionaryStructure.h"
 #include "IDictionary.h"
 #include "IDictionarySource.h"
@@ -64,10 +64,10 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override
     {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
+        return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::Complex; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -78,7 +78,7 @@ public:
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
 private:
 
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index 4747d3f1216..42683fb884c 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -1,8 +1,7 @@
 #include "LibraryDictionarySource.h"
 
-#include <DataStreams/OneBlockInputStream.h>
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/filesystemHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
@@ -41,11 +40,9 @@ LibraryDictionarySource::LibraryDictionarySource(
     , sample_block{sample_block_}
     , context(Context::createCopy(context_))
 {
-    if (fs::path(path).is_relative())
-        path = fs::canonical(path);
-
-    if (created_from_ddl && !pathStartsWith(path, context->getDictionariesLibPath()))
-        throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", path, context->getDictionariesLibPath());
+    auto dictionaries_lib_path = context->getDictionariesLibPath();
+    if (created_from_ddl && !fileOrSymlinkPathStartsWith(path, dictionaries_lib_path))
+        throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", path, dictionaries_lib_path);
 
     if (!fs::exists(path))
         throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "LibraryDictionarySource: Can't load library {}: file doesn't exist", path);
@@ -108,21 +105,21 @@ bool LibraryDictionarySource::supportsSelectiveLoad() const
 }
 
 
-BlockInputStreamPtr LibraryDictionarySource::loadAll()
+Pipe LibraryDictionarySource::loadAll()
 {
     LOG_TRACE(log, "loadAll {}", toString());
     return bridge_helper->loadAll();
 }
 
 
-BlockInputStreamPtr LibraryDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe LibraryDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     LOG_TRACE(log, "loadIds {} size = {}", toString(), ids.size());
     return bridge_helper->loadIds(ids);
 }
 
 
-BlockInputStreamPtr LibraryDictionarySource::loadKeys(const Columns & key_columns, const std::vector<std::size_t> & requested_rows)
+Pipe LibraryDictionarySource::loadKeys(const Columns & key_columns, const std::vector<std::size_t> & requested_rows)
 {
     LOG_TRACE(log, "loadKeys {} size = {}", toString(), requested_rows.size());
     auto block = blockForKeys(dict_struct, key_columns, requested_rows);
@@ -183,11 +180,11 @@ void registerDictionarySourceLibrary(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & config,
                                  const std::string & config_prefix,
                                  Block & sample_block,
-                                 ContextPtr context,
+                                 ContextPtr global_context,
                                  const std::string & /* default_database */,
                                  bool created_from_ddl) -> DictionarySourcePtr
     {
-        return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, context, created_from_ddl);
+        return std::make_unique<LibraryDictionarySource>(dict_struct, config, config_prefix + ".library", sample_block, global_context, created_from_ddl);
     };
 
     factory.registerSource("library", create_table_source);
diff --git a/src/Dictionaries/LibraryDictionarySource.h b/src/Dictionaries/LibraryDictionarySource.h
index b5cf4f68b05..e1cb01c0a14 100644
--- a/src/Dictionaries/LibraryDictionarySource.h
+++ b/src/Dictionaries/LibraryDictionarySource.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <Common/SharedLibrary.h>
 #include <Bridge/LibraryBridgeHelper.h>
-#include <common/LocalDateTime.h>
+#include <base/LocalDateTime.h>
 #include <Core/UUID.h>
 #include "DictionaryStructure.h"
 #include <Core/ExternalResultDescription.h>
@@ -47,16 +46,16 @@ public:
 
     ~LibraryDictionarySource() override;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override
+    Pipe loadUpdatedAll() override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for LibraryDictionarySource");
     }
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<std::size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<std::size_t> & requested_rows) override;
 
     bool isModified() const override;
 
diff --git a/src/Dictionaries/MongoDBDictionarySource.cpp b/src/Dictionaries/MongoDBDictionarySource.cpp
index 4a5207dc5d8..1e8be726941 100644
--- a/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -2,6 +2,8 @@
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "registerDictionaries.h"
+#include <Storages/ExternalDataSourceConfiguration.h>
+
 
 namespace DB
 {
@@ -13,19 +15,34 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
         const Poco::Util::AbstractConfiguration & config,
         const std::string & root_config_prefix,
         Block & sample_block,
-        ContextPtr,
+        ContextPtr context,
         const std::string & /* default_database */,
         bool /* created_from_ddl */)
     {
         const auto config_prefix = root_config_prefix + ".mongodb";
+        ExternalDataSourceConfiguration configuration;
+        auto named_collection = getExternalDataSourceConfiguration(config, config_prefix, context);
+        if (named_collection)
+        {
+            configuration = *named_collection;
+        }
+        else
+        {
+            configuration.host = config.getString(config_prefix + ".host", "");
+            configuration.port = config.getUInt(config_prefix + ".port", 0);
+            configuration.username = config.getString(config_prefix + ".user", "");
+            configuration.password = config.getString(config_prefix + ".password", "");
+            configuration.database = config.getString(config_prefix + ".db", "");
+        }
+
         return std::make_unique<MongoDBDictionarySource>(dict_struct,
             config.getString(config_prefix + ".uri", ""),
-            config.getString(config_prefix + ".host", ""),
-            config.getUInt(config_prefix + ".port", 0),
-            config.getString(config_prefix + ".user", ""),
-            config.getString(config_prefix + ".password", ""),
+            configuration.host,
+            configuration.port,
+            configuration.username,
+            configuration.password,
             config.getString(config_prefix + ".method", ""),
-            config.getString(config_prefix + ".db", ""),
+            configuration.database,
             config.getString(config_prefix + ".collection"),
             sample_block);
     };
@@ -35,7 +52,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 
 }
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/MongoDB/Array.h>
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
@@ -50,7 +67,7 @@ void registerDictionarySourceMongoDB(DictionarySourceFactory & factory)
 // Poco/MongoDB/BSONWriter.h:54: void writeCString(const std::string & value);
 // src/IO/WriteHelpers.h:146 #define writeCString(s, buf)
 #include <IO/WriteHelpers.h>
-#include <DataStreams/MongoDBBlockInputStream.h>
+#include <Processors/Transforms/MongoDBSource.h>
 
 
 namespace DB
@@ -142,12 +159,12 @@ MongoDBDictionarySource::MongoDBDictionarySource(const MongoDBDictionarySource &
 
 MongoDBDictionarySource::~MongoDBDictionarySource() = default;
 
-BlockInputStreamPtr MongoDBDictionarySource::loadAll()
+Pipe MongoDBDictionarySource::loadAll()
 {
-    return std::make_shared<MongoDBBlockInputStream>(connection, createCursor(db, collection, sample_block), sample_block, max_block_size);
+    return Pipe(std::make_shared<MongoDBSource>(connection, createCursor(db, collection, sample_block), sample_block, max_block_size));
 }
 
-BlockInputStreamPtr MongoDBDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe MongoDBDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     if (!dict_struct.id)
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is required for selective loading");
@@ -164,11 +181,11 @@ BlockInputStreamPtr MongoDBDictionarySource::loadIds(const std::vector<UInt64> &
 
     cursor->query().selector().addNewDocument(dict_struct.id->name).add("$in", ids_array);
 
-    return std::make_shared<MongoDBBlockInputStream>(connection, std::move(cursor), sample_block, max_block_size);
+    return Pipe(std::make_shared<MongoDBSource>(connection, std::move(cursor), sample_block, max_block_size));
 }
 
 
-BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe MongoDBDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     if (!dict_struct.key)
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'key' is required for selective loading");
@@ -230,7 +247,7 @@ BlockInputStreamPtr MongoDBDictionarySource::loadKeys(const Columns & key_column
     /// If more than one key we should use $or
     cursor->query().selector().add("$or", keys_array);
 
-    return std::make_shared<MongoDBBlockInputStream>(connection, std::move(cursor), sample_block, max_block_size);
+    return Pipe(std::make_shared<MongoDBSource>(connection, std::move(cursor), sample_block, max_block_size));
 }
 
 std::string MongoDBDictionarySource::toString() const
diff --git a/src/Dictionaries/MongoDBDictionarySource.h b/src/Dictionaries/MongoDBDictionarySource.h
index fef5749190f..3625deca9c6 100644
--- a/src/Dictionaries/MongoDBDictionarySource.h
+++ b/src/Dictionaries/MongoDBDictionarySource.h
@@ -46,18 +46,18 @@ public:
 
     ~MongoDBDictionarySource() override;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override
+    Pipe loadUpdatedAll() override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for MongoDBDictionarySource");
     }
 
     bool supportsSelectiveLoad() const override { return true; }
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     /// @todo: for MongoDB, modification date can somehow be determined from the `_id` object field
     bool isModified() const override { return true; }
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index 77ad1e4bf29..f6de6ca0cc1 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -11,6 +11,10 @@
 #include "registerDictionaries.h"
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
+
 
 namespace DB
 {
@@ -21,6 +25,7 @@ static const size_t default_num_tries_on_connection_loss = 3;
 namespace ErrorCodes
 {
     extern const int SUPPORT_IS_DISABLED;
+    extern const int UNSUPPORTED_METHOD;
 }
 
 void registerDictionarySourceMysql(DictionarySourceFactory & factory)
@@ -29,21 +34,42 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
                                    [[maybe_unused]] const Poco::Util::AbstractConfiguration & config,
                                    [[maybe_unused]] const std::string & config_prefix,
                                    [[maybe_unused]] Block & sample_block,
-                                   [[maybe_unused]] ContextPtr context,
-                                 const std::string & /* default_database */,
-                                 bool /* created_from_ddl */) -> DictionarySourcePtr {
+                                   [[maybe_unused]] ContextPtr global_context,
+                                   const std::string & /* default_database */,
+                                   [[maybe_unused]] bool created_from_ddl) -> DictionarySourcePtr {
 #if USE_MYSQL
-        StreamSettings mysql_input_stream_settings(context->getSettingsRef()
-            , config.getBool(config_prefix + ".mysql.close_connection", false) || config.getBool(config_prefix + ".mysql.share_connection", false)
-            , false
-            , config.getBool(config_prefix + ".mysql.fail_on_connection_loss", false) ? 1 : default_num_tries_on_connection_loss);
+        StreamSettings mysql_input_stream_settings(
+            global_context->getSettingsRef(),
+            config.getBool(config_prefix + ".mysql.close_connection", false) || config.getBool(config_prefix + ".mysql.share_connection", false),
+            false,
+            config.getBool(config_prefix + ".mysql.fail_on_connection_loss", false) ? 1 : default_num_tries_on_connection_loss);
 
         auto settings_config_prefix = config_prefix + ".mysql";
-
-        MySQLDictionarySource::Configuration configuration
+        std::shared_ptr<mysqlxx::PoolWithFailover> pool;
+        ExternalDataSourceConfiguration configuration;
+        auto named_collection = created_from_ddl ? getExternalDataSourceConfiguration(config, settings_config_prefix, global_context) : std::nullopt;
+        if (named_collection)
         {
-            .db = config.getString(settings_config_prefix + ".db", ""),
-            .table = config.getString(settings_config_prefix + ".table"),
+            configuration = *named_collection;
+            std::vector<std::pair<String, UInt16>> addresses{std::make_pair(configuration.host, configuration.port)};
+            pool = std::make_shared<mysqlxx::PoolWithFailover>(configuration.database, addresses, configuration.username, configuration.password);
+        }
+        else
+        {
+            configuration.database = config.getString(settings_config_prefix + ".db", "");
+            configuration.table = config.getString(settings_config_prefix + ".table", "");
+            pool = std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
+        }
+
+        auto query = config.getString(settings_config_prefix + ".query", "");
+        if (query.empty() && configuration.table.empty())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "MySQL dictionary source configuration must contain table or query field");
+
+        MySQLDictionarySource::Configuration dictionary_configuration
+        {
+            .db = configuration.database,
+            .table = configuration.table,
+            .query = query,
             .where = config.getString(settings_config_prefix + ".where", ""),
             .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
@@ -51,9 +77,7 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
             .dont_check_update_time = config.getBool(settings_config_prefix + ".dont_check_update_time", false)
         };
 
-        auto pool = std::make_shared<mysqlxx::PoolWithFailover>(mysqlxx::PoolFactory::instance().get(config, settings_config_prefix));
-
-        return std::make_unique<MySQLDictionarySource>(dict_struct, configuration, std::move(pool), sample_block, mysql_input_stream_settings);
+        return std::make_unique<MySQLDictionarySource>(dict_struct, dictionary_configuration, std::move(pool), sample_block, mysql_input_stream_settings);
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
             "Dictionary source of type `mysql` is disabled because ClickHouse was built without mysql support.");
@@ -71,8 +95,8 @@ void registerDictionarySourceMysql(DictionarySourceFactory & factory)
 #    include <DataTypes/DataTypeString.h>
 #    include <IO/WriteBufferFromString.h>
 #    include <IO/WriteHelpers.h>
-#    include <common/LocalDateTime.h>
-#    include <common/logger_useful.h>
+#    include <base/LocalDateTime.h>
+#    include <base/logger_useful.h>
 #    include "readInvalidateQuery.h"
 #    include <mysqlxx/Exception.h>
 #    include <Core/Settings.h>
@@ -93,7 +117,7 @@ MySQLDictionarySource::MySQLDictionarySource(
     , configuration(configuration_)
     , pool(std::move(pool_))
     , sample_block(sample_block_)
-    , query_builder(dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks)
+    , query_builder(dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks)
     , load_all_query(query_builder.composeLoadAllQuery())
     , settings(settings_)
 {
@@ -107,7 +131,7 @@ MySQLDictionarySource::MySQLDictionarySource(const MySQLDictionarySource & other
     , configuration(other.configuration)
     , pool(other.pool)
     , sample_block(other.sample_block)
-    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.where, IdentifierQuotingStyle::Backticks}
+    , query_builder{dict_struct, configuration.db, "", configuration.table, configuration.query, configuration.where, IdentifierQuotingStyle::Backticks}
     , load_all_query{other.load_all_query}
     , last_modification{other.last_modification}
     , invalidate_query_response{other.invalidate_query_response}
@@ -127,17 +151,17 @@ std::string MySQLDictionarySource::getUpdateFieldAndDate()
     else
     {
         update_time = std::chrono::system_clock::now();
-        return query_builder.composeLoadAllQuery();
+        return load_all_query;
     }
 }
 
-BlockInputStreamPtr MySQLDictionarySource::loadFromQuery(const String & query)
+Pipe MySQLDictionarySource::loadFromQuery(const String & query)
 {
-    return std::make_shared<MySQLWithFailoverBlockInputStream>(
-            pool, query, sample_block, settings);
+    return Pipe(std::make_shared<MySQLWithFailoverSource>(
+            pool, query, sample_block, settings));
 }
 
-BlockInputStreamPtr MySQLDictionarySource::loadAll()
+Pipe MySQLDictionarySource::loadAll()
 {
     auto connection = pool->get();
     last_modification = getLastModification(connection, false);
@@ -146,7 +170,7 @@ BlockInputStreamPtr MySQLDictionarySource::loadAll()
     return loadFromQuery(load_all_query);
 }
 
-BlockInputStreamPtr MySQLDictionarySource::loadUpdatedAll()
+Pipe MySQLDictionarySource::loadUpdatedAll()
 {
     auto connection = pool->get();
     last_modification = getLastModification(connection, false);
@@ -156,14 +180,14 @@ BlockInputStreamPtr MySQLDictionarySource::loadUpdatedAll()
     return loadFromQuery(load_update_query);
 }
 
-BlockInputStreamPtr MySQLDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe MySQLDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     /// We do not log in here and do not update the modification time, as the request can be large, and often called.
     const auto query = query_builder.composeLoadIdsQuery(ids);
     return loadFromQuery(query);
 }
 
-BlockInputStreamPtr MySQLDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe MySQLDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     /// We do not log in here and do not update the modification time, as the request can be large, and often called.
     const auto query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::AND_OR_CHAIN);
@@ -284,8 +308,7 @@ std::string MySQLDictionarySource::doInvalidateQuery(const std::string & request
     Block invalidate_sample_block;
     ColumnPtr column(ColumnString::create());
     invalidate_sample_block.insert(ColumnWithTypeAndName(column, std::make_shared<DataTypeString>(), "Sample Block"));
-    MySQLBlockInputStream block_input_stream(pool->get(), request, invalidate_sample_block, settings);
-    return readInvalidateQuery(block_input_stream);
+    return readInvalidateQuery(QueryPipeline(std::make_unique<MySQLSource>(pool->get(), request, invalidate_sample_block, settings)));
 }
 
 }
diff --git a/src/Dictionaries/MySQLDictionarySource.h b/src/Dictionaries/MySQLDictionarySource.h
index afe0f0cfcc7..37743ca2f62 100644
--- a/src/Dictionaries/MySQLDictionarySource.h
+++ b/src/Dictionaries/MySQLDictionarySource.h
@@ -2,17 +2,15 @@
 
 #include <Core/Block.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
-#    include <common/LocalDateTime.h>
+#    include <base/LocalDateTime.h>
 #    include <mysqlxx/PoolWithFailover.h>
 #    include "DictionaryStructure.h"
 #    include "ExternalQueryBuilder.h"
 #    include "IDictionarySource.h"
-#    include <Formats/MySQLBlockInputStream.h>
+#    include <Processors/Sources/MySQLSource.h>
 
 namespace Poco
 {
@@ -35,6 +33,7 @@ public:
     {
         const std::string db;
         const std::string table;
+        const std::string query;
         const std::string where;
         const std::string invalidate_query;
         const std::string update_field;
@@ -53,13 +52,13 @@ public:
     MySQLDictionarySource(const MySQLDictionarySource & other);
     MySQLDictionarySource & operator=(const MySQLDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
 
@@ -72,7 +71,7 @@ public:
     std::string toString() const override;
 
 private:
-    BlockInputStreamPtr loadFromQuery(const String & query);
+    Pipe loadFromQuery(const String & query);
 
     std::string getUpdateFieldAndDate();
 
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 73810d4b057..8c31be329aa 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -3,14 +3,15 @@
 #include <numeric>
 #include <cmath>
 
-#include "DictionaryBlockInputStream.h"
-#include "DictionaryFactory.h"
-
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypesDecimal.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/DictionarySource.h>
+
 
 namespace DB
 {
@@ -28,14 +29,12 @@ IPolygonDictionary::IPolygonDictionary(
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
         const DictionaryLifetime dict_lifetime_,
-        InputType input_type_,
-        PointType point_type_)
+        Configuration configuration_)
         : IDictionary(dict_id_)
         , dict_struct(dict_struct_)
         , source_ptr(std::move(source_ptr_))
         , dict_lifetime(dict_lifetime_)
-        , input_type(input_type_)
-        , point_type(point_type_)
+        , configuration(configuration_)
 {
     setup();
     loadData();
@@ -55,7 +54,7 @@ ColumnPtr IPolygonDictionary::getColumn(
     DefaultValueProvider default_value_provider(attribute.null_value, default_values_column);
 
     size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
-    const auto & attribute_values_column = attributes[attribute_index];
+    const auto & attribute_values_column = attributes_columns[attribute_index];
 
     auto result = attribute_values_column->cloneEmpty();
     result->reserve(requested_key_points.size());
@@ -119,21 +118,56 @@ ColumnPtr IPolygonDictionary::getColumn(
     return result;
 }
 
-BlockInputStreamPtr IPolygonDictionary::getBlockInputStream(const Names &, size_t) const
+Pipe IPolygonDictionary::read(const Names & column_names, size_t, size_t) const
 {
-    // TODO: In order for this to work one would first have to support retrieving arrays from dictionaries.
-    //  I believe this is a separate task done by some other people.
-    throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Reading the dictionary is not allowed");
+    if (!configuration.store_polygon_key_column)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Set `store_polygon_key_column` setting in dictionary configuration to true to support reading from PolygonDictionary.");
+
+    const auto & dictionary_structure_keys = *dict_struct.key;
+    const auto & dictionary_key_attribute = dictionary_structure_keys[0];
+
+    ColumnsWithTypeAndName result_columns;
+    result_columns.reserve(column_names.size());
+
+    for (const auto & column_name : column_names)
+    {
+        ColumnWithTypeAndName column_with_type;
+
+        if (column_name == dictionary_key_attribute.name)
+        {
+            column_with_type.column = key_attribute_column;
+            column_with_type.type = dictionary_key_attribute.type;
+        }
+        else
+        {
+            const auto & dictionary_attribute = dict_struct.getAttribute(column_name);
+            size_t attribute_index = dict_struct.attribute_name_to_index.find(dictionary_attribute.name)->second;
+
+            column_with_type.column = attributes_columns[attribute_index];
+            column_with_type.type = dictionary_attribute.type;
+        }
+
+        column_with_type.name = column_name;
+
+        result_columns.emplace_back(column_with_type);
+    }
+
+    auto source = std::make_shared<SourceFromSingleChunk>(Block(result_columns));
+    return Pipe(std::move(source));
 }
 
 void IPolygonDictionary::setup()
 {
-    attributes.reserve(dict_struct.attributes.size());
+    const auto & dictionary_structure_keys = *dict_struct.key;
+    key_attribute_column = dictionary_structure_keys[0].type->createColumn();
+
+    attributes_columns.reserve(dict_struct.attributes.size());
 
     for (const auto & attribute : dict_struct.attributes)
     {
         auto column = attribute.type->createColumn();
-        attributes.emplace_back(std::move(column));
+        attributes_columns.emplace_back(std::move(column));
 
         if (attribute.hierarchical)
             throw Exception(ErrorCodes::TYPE_MISMATCH,
@@ -147,30 +181,34 @@ void IPolygonDictionary::blockToAttributes(const DB::Block & block)
     const auto rows = block.rows();
 
     size_t skip_key_column_offset = 1;
-    for (size_t i = 0; i < attributes.size(); ++i)
+    for (size_t i = 0; i < attributes_columns.size(); ++i)
     {
         const auto & block_column = block.safeGetByPosition(i + skip_key_column_offset);
         const auto & column = block_column.column;
 
-        attributes[i]->assumeMutable()->insertRangeFrom(*column, 0, column->size());
+        attributes_columns[i]->assumeMutable()->insertRangeFrom(*column, 0, column->size());
     }
 
     /** Multi-polygons could cause bigger sizes, but this is better than nothing. */
     polygons.reserve(polygons.size() + rows);
     polygon_index_to_attribute_value_index.reserve(polygon_index_to_attribute_value_index.size() + rows);
 
-    const auto & key = block.safeGetByPosition(0).column;
-    extractPolygons(key);
+    const auto & key_column = block.safeGetByPosition(0).column;
+
+    if (configuration.store_polygon_key_column)
+        key_attribute_column->assumeMutable()->insertRangeFrom(*key_column, 0, key_column->size());
+
+    extractPolygons(key_column);
 }
 
 void IPolygonDictionary::loadData()
 {
-    auto stream = source_ptr->loadAll();
-    stream->readPrefix();
-    while (const auto block = stream->read())
-        blockToAttributes(block);
-    stream->readSuffix();
+    QueryPipeline pipeline(source_ptr->loadAll());
 
+    PullingPipelineExecutor executor(pipeline);
+    Block block;
+    while (executor.pull(block))
+        blockToAttributes(block);
 
     /// Correct and sort polygons by area and update polygon_index_to_attribute_value_index after sort
     PaddedPODArray<double> areas;
@@ -210,7 +248,10 @@ void IPolygonDictionary::calculateBytesAllocated()
 {
     /// Index allocated by subclass not counted because it take a small part in relation to attributes and polygons
 
-    for (const auto & column : attributes)
+    if (configuration.store_polygon_key_column)
+        bytes_allocated += key_attribute_column->allocatedBytes();
+
+    for (const auto & column : attributes_columns)
         bytes_allocated += column->allocatedBytes();
 
     for (auto & polygon : polygons)
@@ -487,7 +528,7 @@ void IPolygonDictionary::extractPolygons(const ColumnPtr & column)
     Offset offset;
 
     const IColumn * points_collection = nullptr;
-    switch (input_type)
+    switch (configuration.input_type)
     {
         case InputType::MultiPolygon:
             points_collection = unrollMultiPolygons(column, offset);
@@ -504,7 +545,7 @@ void IPolygonDictionary::extractPolygons(const ColumnPtr & column)
     /** Adding the first empty polygon */
     data.addPolygon(true);
 
-    switch (point_type)
+    switch (configuration.point_type)
     {
         case PointType::Array:
             handlePointsReprByArrays(points_collection, data, offset);
@@ -516,4 +557,3 @@ void IPolygonDictionary::extractPolygons(const ColumnPtr & column)
 }
 
 }
-
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index 14492df6469..346160c342f 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -50,13 +50,22 @@ public:
         Tuple,
     };
 
+    struct Configuration
+    {
+        InputType input_type = InputType::MultiPolygon;
+
+        PointType point_type = PointType::Array;
+
+        /// Store polygon key column. That will allow to read columns from polygon dictionary.
+        bool store_polygon_key_column = false;
+    };
+
     IPolygonDictionary(
             const StorageID & dict_id_,
             const DictionaryStructure & dict_struct_,
             DictionarySourcePtr source_ptr_,
             DictionaryLifetime dict_lifetime_,
-            InputType input_type_,
-            PointType point_type_);
+            Configuration configuration_);
 
     std::string getTypeName() const override { return "Polygon"; }
 
@@ -74,7 +83,7 @@ public:
 
     double getHitRate() const override { return 1.0; }
 
-    size_t getElementCount() const override { return attributes.empty() ? 0 : attributes.front()->size(); }
+    size_t getElementCount() const override { return attributes_columns.empty() ? 0 : attributes_columns.front()->size(); }
 
     double getLoadFactor() const override { return 1.0; }
 
@@ -86,7 +95,7 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override { return dict_struct.getAttribute(attribute_name).injective; }
 
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::complex; }
+    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::Complex; }
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -97,7 +106,7 @@ public:
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
     /** Single coordinate type. */
     using Coord = Float32;
@@ -120,9 +129,7 @@ protected:
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
     const DictionaryLifetime dict_lifetime;
-
-    const InputType input_type;
-    const PointType point_type;
+    const Configuration configuration;
 
 private:
     /** Helper functions for loading the data from the configuration.
@@ -146,7 +153,9 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
-    Columns attributes;
+    ColumnPtr key_attribute_column;
+
+    Columns attributes_columns;
 
     size_t bytes_allocated = 0;
     mutable std::atomic<size_t> query_count{0};
@@ -167,4 +176,3 @@ private:
 };
 
 }
-
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
index 7c3eb421a4a..4f515586120 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.cpp
+++ b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <numeric>
 
@@ -22,9 +22,8 @@ PolygonDictionarySimple::PolygonDictionarySimple(
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
         const DictionaryLifetime dict_lifetime_,
-        InputType input_type_,
-        PointType point_type_):
-        IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_)
+        Configuration configuration_)
+    : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, configuration_)
 {
 }
 
@@ -35,8 +34,7 @@ std::shared_ptr<const IExternalLoadable> PolygonDictionarySimple::clone() const
             this->dict_struct,
             this->source_ptr->clone(),
             this->dict_lifetime,
-            this->input_type,
-            this->point_type);
+            this->configuration);
 }
 
 bool PolygonDictionarySimple::find(const Point & point, size_t & polygon_index) const
@@ -59,11 +57,10 @@ PolygonDictionaryIndexEach::PolygonDictionaryIndexEach(
         const DictionaryStructure & dict_struct_,
         DictionarySourcePtr source_ptr_,
         const DictionaryLifetime dict_lifetime_,
-        InputType input_type_,
-        PointType point_type_,
+        Configuration configuration_,
         int min_intersections_,
         int max_depth_)
-        : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_),
+        : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, configuration_),
           grid(min_intersections_, max_depth_, polygons),
           min_intersections(min_intersections_),
           max_depth(max_depth_)
@@ -84,8 +81,7 @@ std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexEach::clone() con
             this->dict_struct,
             this->source_ptr->clone(),
             this->dict_lifetime,
-            this->input_type,
-            this->point_type,
+            this->configuration,
             this->min_intersections,
             this->max_depth);
 }
@@ -118,11 +114,10 @@ PolygonDictionaryIndexCell::PolygonDictionaryIndexCell(
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
     const DictionaryLifetime dict_lifetime_,
-    InputType input_type_,
-    PointType point_type_,
+    Configuration configuration_,
     size_t min_intersections_,
     size_t max_depth_)
-    : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, input_type_, point_type_),
+    : IPolygonDictionary(dict_id_, dict_struct_, std::move(source_ptr_), dict_lifetime_, configuration_),
       index(min_intersections_, max_depth_, polygons),
       min_intersections(min_intersections_),
       max_depth(max_depth_)
@@ -136,8 +131,7 @@ std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexCell::clone() con
             this->dict_struct,
             this->source_ptr->clone(),
             this->dict_lifetime,
-            this->input_type,
-            this->point_type,
+            this->configuration,
             this->min_intersections,
             this->max_depth);
 }
@@ -167,7 +161,7 @@ DictionaryPtr createLayout(const std::string & ,
                            const Poco::Util::AbstractConfiguration & config,
                            const std::string & config_prefix,
                            DictionarySourcePtr source_ptr,
-                           ContextPtr /* context */,
+                           ContextPtr /* global_context */,
                            bool /*created_from_ddl*/)
 {
     const String database = config.getString(config_prefix + ".database", "");
@@ -179,14 +173,16 @@ DictionaryPtr createLayout(const std::string & ,
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
             "The 'key' should consist of a single attribute for a polygon dictionary");
 
-    IPolygonDictionary::InputType input_type;
-    IPolygonDictionary::PointType point_type;
     const auto key_type = (*dict_struct.key)[0].type;
     const auto f64 = std::make_shared<DataTypeFloat64>();
     const auto multi_polygon_array = DataTypeArray(std::make_shared<DataTypeArray>(std::make_shared<DataTypeArray>(std::make_shared<DataTypeArray>(f64))));
     const auto multi_polygon_tuple = DataTypeArray(std::make_shared<DataTypeArray>(std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(std::vector<DataTypePtr>{f64, f64}))));
     const auto simple_polygon_array = DataTypeArray(std::make_shared<DataTypeArray>(f64));
     const auto simple_polygon_tuple = DataTypeArray(std::make_shared<DataTypeTuple>(std::vector<DataTypePtr>{f64, f64}));
+
+    IPolygonDictionary::InputType input_type;
+    IPolygonDictionary::PointType point_type;
+
     if (key_type->equals(multi_polygon_array))
     {
         input_type = IPolygonDictionary::InputType::MultiPolygon;
@@ -208,6 +204,7 @@ DictionaryPtr createLayout(const std::string & ,
         point_type = IPolygonDictionary::PointType::Tuple;
     }
     else
+    {
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
             "The key type {} is not one of the following allowed types for a polygon dictionary: {} {} {} {} ",
             key_type->getName(),
@@ -215,6 +212,19 @@ DictionaryPtr createLayout(const std::string & ,
             multi_polygon_tuple.getName(),
             simple_polygon_array.getName(),
             simple_polygon_tuple.getName());
+    }
+
+    const auto & layout_prefix = config_prefix + ".layout";
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(layout_prefix, keys);
+    const auto & dict_prefix = layout_prefix + "." + keys.front();
+
+    IPolygonDictionary::Configuration configuration
+    {
+        .input_type = input_type,
+        .point_type = point_type,
+        .store_polygon_key_column = config.getBool(dict_prefix + ".store_polygon_key_column", false)
+    };
 
     if (dict_struct.range_min || dict_struct.range_max)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -228,16 +238,12 @@ DictionaryPtr createLayout(const std::string & ,
 
     if constexpr (std::is_same_v<PolygonDictionary, PolygonDictionaryIndexEach> || std::is_same_v<PolygonDictionary, PolygonDictionaryIndexCell>)
     {
-        const auto & layout_prefix = config_prefix + ".layout";
-        Poco::Util::AbstractConfiguration::Keys keys;
-        config.keys(layout_prefix, keys);
-        const auto & dict_prefix = layout_prefix + "." + keys.front();
         size_t max_depth = config.getUInt(dict_prefix + ".max_depth", PolygonDictionary::kMaxDepthDefault);
         size_t min_intersections = config.getUInt(dict_prefix + ".min_intersections", PolygonDictionary::kMinIntersectionsDefault);
-        return std::make_unique<PolygonDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, input_type, point_type, min_intersections, max_depth);
+        return std::make_unique<PolygonDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, configuration, min_intersections, max_depth);
     }
     else
-        return std::make_unique<PolygonDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, input_type, point_type);
+        return std::make_unique<PolygonDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, configuration);
 }
 
 void registerDictionaryPolygon(DictionaryFactory & factory)
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.h b/src/Dictionaries/PolygonDictionaryImplementations.h
index b49bf3f4d6c..912d501bcde 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.h
+++ b/src/Dictionaries/PolygonDictionaryImplementations.h
@@ -21,8 +21,7 @@ public:
             const DictionaryStructure & dict_struct_,
             DictionarySourcePtr source_ptr_,
             DictionaryLifetime dict_lifetime_,
-            InputType input_type_,
-            PointType point_type_);
+            Configuration configuration_);
 
     std::shared_ptr<const IExternalLoadable> clone() const override;
 
@@ -44,8 +43,7 @@ public:
             const DictionaryStructure & dict_struct_,
             DictionarySourcePtr source_ptr_,
             DictionaryLifetime dict_lifetime_,
-            InputType input_type_,
-            PointType point_type_,
+            Configuration configuration_,
             int min_intersections_,
             int max_depth_);
 
@@ -73,8 +71,7 @@ public:
             const DictionaryStructure & dict_struct_,
             DictionarySourcePtr source_ptr_,
             DictionaryLifetime dict_lifetime_,
-            InputType input_type_,
-            PointType point_type_,
+            Configuration configuration_,
             size_t min_intersections_,
             size_t max_depth_);
 
diff --git a/src/Dictionaries/PolygonDictionaryUtils.cpp b/src/Dictionaries/PolygonDictionaryUtils.cpp
index 2575affbb56..fced18a6f88 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.cpp
+++ b/src/Dictionaries/PolygonDictionaryUtils.cpp
@@ -2,7 +2,7 @@
 
 #include <Common/ThreadPool.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <algorithm>
 #include <thread>
diff --git a/src/Dictionaries/PolygonDictionaryUtils.h b/src/Dictionaries/PolygonDictionaryUtils.h
index 865d78a7cad..0aca7cd8af0 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.h
+++ b/src/Dictionaries/PolygonDictionaryUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ThreadPool.h>
 #include <Poco/Logger.h>
 
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index f1ca3d4855b..c9fb8b86b77 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -1,15 +1,18 @@
 #include "PostgreSQLDictionarySource.h"
 
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Core/QualifiedTableName.h>
 #include "DictionarySourceFactory.h"
 #include "registerDictionaries.h"
 
 #if USE_LIBPQXX
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataStreams/PostgreSQLBlockInputStream.h>
+#include <Processors/Transforms/PostgreSQLSource.h>
 #include "readInvalidateQuery.h"
 #include <Interpreters/Context.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #endif
 
 
@@ -27,21 +30,15 @@ static const UInt64 max_block_size = 8192;
 
 namespace
 {
-    ExternalQueryBuilder makeExternalQueryBuilder(const DictionaryStructure & dict_struct, const String & schema, const String & table, const String & where)
+    ExternalQueryBuilder makeExternalQueryBuilder(const DictionaryStructure & dict_struct, const String & schema, const String & table, const String & query, const String & where)
     {
-        auto schema_value = schema;
-        auto table_value = table;
+        QualifiedTableName qualified_name{schema, table};
+
+        if (qualified_name.database.empty() && !qualified_name.table.empty())
+            qualified_name = QualifiedTableName::parseFromString(qualified_name.table);
 
-        if (schema_value.empty())
-        {
-            if (auto pos = table_value.find('.'); pos != std::string::npos)
-            {
-                schema_value = table_value.substr(0, pos);
-                table_value = table_value.substr(pos + 1);
-            }
-        }
         /// Do not need db because it is already in a connection string.
-        return {dict_struct, "", schema_value, table_value, where, IdentifierQuotingStyle::DoubleQuotes};
+        return {dict_struct, "", qualified_name.database, qualified_name.table, query, where, IdentifierQuotingStyle::DoubleQuotes};
     }
 }
 
@@ -56,7 +53,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(
     , pool(std::move(pool_))
     , sample_block(sample_block_)
     , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
-    , query_builder(makeExternalQueryBuilder(dict_struct, configuration.schema, configuration.table, configuration.where))
+    , query_builder(makeExternalQueryBuilder(dict_struct, configuration.schema, configuration.table, configuration.query, configuration.where))
     , load_all_query(query_builder.composeLoadAllQuery())
 {
 }
@@ -69,7 +66,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(const PostgreSQLDictionar
     , pool(other.pool)
     , sample_block(other.sample_block)
     , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
-    , query_builder(makeExternalQueryBuilder(dict_struct, configuration.schema, configuration.table, configuration.where))
+    , query_builder(makeExternalQueryBuilder(dict_struct, configuration.schema, configuration.table, configuration.query, configuration.where))
     , load_all_query(query_builder.composeLoadAllQuery())
     , update_time(other.update_time)
     , invalidate_query_response(other.invalidate_query_response)
@@ -77,37 +74,37 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(const PostgreSQLDictionar
 }
 
 
-BlockInputStreamPtr PostgreSQLDictionarySource::loadAll()
+Pipe PostgreSQLDictionarySource::loadAll()
 {
     LOG_TRACE(log, load_all_query);
     return loadBase(load_all_query);
 }
 
 
-BlockInputStreamPtr PostgreSQLDictionarySource::loadUpdatedAll()
+Pipe PostgreSQLDictionarySource::loadUpdatedAll()
 {
     auto load_update_query = getUpdateFieldAndDate();
     LOG_TRACE(log, load_update_query);
     return loadBase(load_update_query);
 }
 
-BlockInputStreamPtr PostgreSQLDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe PostgreSQLDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     const auto query = query_builder.composeLoadIdsQuery(ids);
     return loadBase(query);
 }
 
 
-BlockInputStreamPtr PostgreSQLDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe PostgreSQLDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     const auto query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::AND_OR_CHAIN);
     return loadBase(query);
 }
 
 
-BlockInputStreamPtr PostgreSQLDictionarySource::loadBase(const String & query)
+Pipe PostgreSQLDictionarySource::loadBase(const String & query)
 {
-    return std::make_shared<PostgreSQLBlockInputStream<>>(pool->get(), query, sample_block, max_block_size);
+    return Pipe(std::make_shared<PostgreSQLSource<>>(pool->get(), query, sample_block, max_block_size));
 }
 
 
@@ -129,8 +126,7 @@ std::string PostgreSQLDictionarySource::doInvalidateQuery(const std::string & re
     Block invalidate_sample_block;
     ColumnPtr column(ColumnString::create());
     invalidate_sample_block.insert(ColumnWithTypeAndName(column, std::make_shared<DataTypeString>(), "Sample Block"));
-    PostgreSQLBlockInputStream<> block_input_stream(pool->get(), request, invalidate_sample_block, 1);
-    return readInvalidateQuery(block_input_stream);
+    return readInvalidateQuery(QueryPipeline(std::make_unique<PostgreSQLSource<>>(pool->get(), request, invalidate_sample_block, 1)));
 }
 
 
@@ -189,23 +185,26 @@ void registerDictionarySourcePostgreSQL(DictionarySourceFactory & factory)
     {
 #if USE_LIBPQXX
         const auto settings_config_prefix = config_prefix + ".postgresql";
+
+        auto configuration = getExternalDataSourceConfigurationByPriority(config, settings_config_prefix, context);
         auto pool = std::make_shared<postgres::PoolWithFailover>(
-                    config, settings_config_prefix,
+                    configuration.replicas_configurations,
                     context->getSettingsRef().postgresql_connection_pool_size,
                     context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
-        PostgreSQLDictionarySource::Configuration configuration
+        PostgreSQLDictionarySource::Configuration dictionary_configuration
         {
-            .db = config.getString(fmt::format("{}.db", settings_config_prefix), ""),
-            .schema = config.getString(fmt::format("{}.schema", settings_config_prefix), ""),
-            .table = config.getString(fmt::format("{}.table", settings_config_prefix), ""),
+            .db = configuration.database,
+            .schema = configuration.schema,
+            .table = configuration.table,
+            .query = config.getString(fmt::format("{}.query", settings_config_prefix), ""),
             .where = config.getString(fmt::format("{}.where", settings_config_prefix), ""),
             .invalidate_query = config.getString(fmt::format("{}.invalidate_query", settings_config_prefix), ""),
             .update_field = config.getString(fmt::format("{}.update_field", settings_config_prefix), ""),
             .update_lag = config.getUInt64(fmt::format("{}.update_lag", settings_config_prefix), 1)
         };
 
-        return std::make_unique<PostgreSQLDictionarySource>(dict_struct, configuration, pool, sample_block);
+        return std::make_unique<PostgreSQLDictionarySource>(dict_struct, dictionary_configuration, pool, sample_block);
 #else
         (void)dict_struct;
         (void)config;
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.h b/src/Dictionaries/PostgreSQLDictionarySource.h
index 789f0d13966..1cde2958107 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.h
+++ b/src/Dictionaries/PostgreSQLDictionarySource.h
@@ -1,16 +1,14 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 #include "DictionaryStructure.h"
 #include "IDictionarySource.h"
 
 #if USE_LIBPQXX
 #include "ExternalQueryBuilder.h"
 #include <Core/Block.h>
-#include <common/LocalDateTime.h>
-#include <common/logger_useful.h>
+#include <base/LocalDateTime.h>
+#include <base/logger_useful.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
 
 
@@ -26,6 +24,7 @@ public:
         const String db;
         const String schema;
         const String table;
+        const String query;
         const String where;
         const String invalidate_query;
         const String update_field;
@@ -42,10 +41,10 @@ public:
     PostgreSQLDictionarySource(const PostgreSQLDictionarySource & other);
     PostgreSQLDictionarySource & operator=(const PostgreSQLDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAll() override;
-    BlockInputStreamPtr loadUpdatedAll() override;
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadAll() override;
+    Pipe loadUpdatedAll() override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
     bool supportsSelectiveLoad() const override;
@@ -57,7 +56,7 @@ public:
 private:
     String getUpdateFieldAndDate();
     String doInvalidateQuery(const std::string & request) const;
-    BlockInputStreamPtr loadBase(const String & query);
+    Pipe loadBase(const String & query);
 
     const DictionaryStructure dict_struct;
     const Configuration configuration;
diff --git a/src/Dictionaries/RangeDictionaryBlockInputStream.h b/src/Dictionaries/RangeDictionaryBlockInputStream.h
deleted file mode 100644
index 7d40531cfa5..00000000000
--- a/src/Dictionaries/RangeDictionaryBlockInputStream.h
+++ /dev/null
@@ -1,173 +0,0 @@
-#pragma once
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/IColumn.h>
-#include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <common/range.h>
-#include "DictionaryBlockInputStreamBase.h"
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "RangeHashedDictionary.h"
-
-
-namespace DB
-{
-/*
- * BlockInputStream implementation for external dictionaries
- * read() returns single block consisting of the in-memory contents of the dictionaries
- */
-template <typename RangeType>
-class RangeDictionaryBlockInputStream : public DictionaryBlockInputStreamBase
-{
-public:
-    using Key = UInt64;
-
-    RangeDictionaryBlockInputStream(
-        std::shared_ptr<const IDictionary> dictionary,
-        size_t max_block_size,
-        const Names & column_names,
-        PaddedPODArray<Key> && ids_to_fill,
-        PaddedPODArray<RangeType> && start_dates,
-        PaddedPODArray<RangeType> && end_dates);
-
-    String getName() const override { return "RangeDictionary"; }
-
-protected:
-    Block getBlock(size_t start, size_t length) const override;
-
-private:
-    template <typename T>
-    ColumnPtr getColumnFromPODArray(const PaddedPODArray<T> & array) const;
-
-    Block fillBlock(
-        const PaddedPODArray<Key> & ids_to_fill,
-        const PaddedPODArray<RangeType> & block_start_dates,
-        const PaddedPODArray<RangeType> & block_end_dates) const;
-
-    PaddedPODArray<Int64> makeDateKey(
-        const PaddedPODArray<RangeType> & block_start_dates,
-        const PaddedPODArray<RangeType> & block_end_dates) const;
-
-    std::shared_ptr<const IDictionary> dictionary;
-    NameSet column_names;
-    PaddedPODArray<Key> ids;
-    PaddedPODArray<RangeType> start_dates;
-    PaddedPODArray<RangeType> end_dates;
-};
-
-
-template <typename RangeType>
-RangeDictionaryBlockInputStream<RangeType>::RangeDictionaryBlockInputStream(
-    std::shared_ptr<const IDictionary> dictionary_,
-    size_t max_block_size_,
-    const Names & column_names_,
-    PaddedPODArray<Key> && ids_,
-    PaddedPODArray<RangeType> && block_start_dates,
-    PaddedPODArray<RangeType> && block_end_dates)
-    : DictionaryBlockInputStreamBase(ids_.size(), max_block_size_)
-    , dictionary(dictionary_)
-    , column_names(column_names_.begin(), column_names_.end())
-    , ids(std::move(ids_))
-    , start_dates(std::move(block_start_dates))
-    , end_dates(std::move(block_end_dates))
-{
-}
-
-template <typename RangeType>
-Block RangeDictionaryBlockInputStream<RangeType>::getBlock(size_t start, size_t length) const
-{
-    PaddedPODArray<Key> block_ids;
-    PaddedPODArray<RangeType> block_start_dates;
-    PaddedPODArray<RangeType> block_end_dates;
-    block_ids.reserve(length);
-    block_start_dates.reserve(length);
-    block_end_dates.reserve(length);
-
-    for (auto idx : collections::range(start, start + length))
-    {
-        block_ids.push_back(ids[idx]);
-        block_start_dates.push_back(start_dates[idx]);
-        block_end_dates.push_back(end_dates[idx]);
-    }
-
-    return fillBlock(block_ids, block_start_dates, block_end_dates);
-}
-
-template <typename RangeType>
-template <typename T>
-ColumnPtr RangeDictionaryBlockInputStream<RangeType>::getColumnFromPODArray(const PaddedPODArray<T> & array) const
-{
-    auto column_vector = ColumnVector<T>::create();
-    column_vector->getData().reserve(array.size());
-    column_vector->getData().insert(array.begin(), array.end());
-
-    return column_vector;
-}
-
-template <typename RangeType>
-PaddedPODArray<Int64> RangeDictionaryBlockInputStream<RangeType>::makeDateKey(
-    const PaddedPODArray<RangeType> & block_start_dates, const PaddedPODArray<RangeType> & block_end_dates) const
-{
-    PaddedPODArray<Int64> key(block_start_dates.size());
-    for (size_t i = 0; i < key.size(); ++i)
-    {
-        if (RangeHashedDictionary::Range::isCorrectDate(block_start_dates[i]))
-            key[i] = block_start_dates[i];
-        else
-            key[i] = block_end_dates[i];
-    }
-
-    return key;
-}
-
-
-template <typename RangeType>
-Block RangeDictionaryBlockInputStream<RangeType>::fillBlock(
-    const PaddedPODArray<Key> & ids_to_fill,
-    const PaddedPODArray<RangeType> & block_start_dates,
-    const PaddedPODArray<RangeType> & block_end_dates) const
-{
-    ColumnsWithTypeAndName columns;
-    const DictionaryStructure & structure = dictionary->getStructure();
-
-    auto ids_column = getColumnFromPODArray(ids_to_fill);
-    const std::string & id_column_name = structure.id->name;
-    if (column_names.find(id_column_name) != column_names.end())
-        columns.emplace_back(ids_column, std::make_shared<DataTypeUInt64>(), id_column_name);
-
-    auto date_key = makeDateKey(block_start_dates, block_end_dates);
-    auto date_column = getColumnFromPODArray(date_key);
-
-    const std::string & range_min_column_name = structure.range_min->name;
-    if (column_names.find(range_min_column_name) != column_names.end())
-    {
-        auto range_min_column = getColumnFromPODArray(block_start_dates);
-        columns.emplace_back(range_min_column, structure.range_max->type, range_min_column_name);
-    }
-
-    const std::string & range_max_column_name = structure.range_max->name;
-    if (column_names.find(range_max_column_name) != column_names.end())
-    {
-        auto range_max_column = getColumnFromPODArray(block_end_dates);
-        columns.emplace_back(range_max_column, structure.range_max->type, range_max_column_name);
-    }
-
-    for (const auto idx : collections::range(0, structure.attributes.size()))
-    {
-        const DictionaryAttribute & attribute = structure.attributes[idx];
-        if (column_names.find(attribute.name) != column_names.end())
-        {
-            ColumnPtr column = dictionary->getColumn(
-                attribute.name,
-                attribute.type,
-                {ids_column, date_column},
-                {std::make_shared<DataTypeUInt64>(), std::make_shared<DataTypeInt64>()},
-                nullptr);
-            columns.emplace_back(column, attribute.type, attribute.name);
-        }
-    }
-    return Block(columns);
-}
-
-}
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
index eadfc03ef33..42d6a0c0c03 100644
--- a/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -1,16 +1,20 @@
-#include "RangeHashedDictionary.h"
+#include <Dictionaries/RangeHashedDictionary.h>
+
 #include <Columns/ColumnNullable.h>
 #include <Functions/FunctionHelpers.h>
-#include <Common/TypeList.h>
-#include <common/range.h>
-#include "DictionaryFactory.h"
-#include "RangeDictionaryBlockInputStream.h"
 #include <Interpreters/castColumn.h>
 #include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/DictionarySource.h>
+
 
 namespace
 {
-using RangeStorageType = DB::RangeHashedDictionary::RangeStorageType;
+
+using RangeStorageType = DB::RangeStorageType;
 
 // Null values mean that specified boundary, either min or max is not set on range.
 // To simplify comparison, null value of min bound should be bigger than any other value,
@@ -25,7 +29,7 @@ RangeStorageType getColumnIntValueOrDefault(const DB::IColumn & column, size_t i
         return default_value;
 
     const RangeStorageType result = static_cast<RangeStorageType>(column.getInt(index));
-    if (isDate && !DB::RangeHashedDictionary::Range::isCorrectDate(result))
+    if (isDate && !DB::Range::isCorrectDate(result))
         return default_value;
 
     return result;
@@ -50,27 +54,26 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
     extern const int DICTIONARY_IS_EMPTY;
-    extern const int TYPE_MISMATCH;
     extern const int UNSUPPORTED_METHOD;
 }
 
-bool RangeHashedDictionary::Range::isCorrectDate(const RangeStorageType & date)
+bool Range::isCorrectDate(const RangeStorageType & date)
 {
     return 0 < date && date <= DATE_LUT_MAX_DAY_NUM;
 }
 
-bool RangeHashedDictionary::Range::contains(const RangeStorageType & value) const
+bool Range::contains(const RangeStorageType & value) const
 {
     return left <= value && value <= right;
 }
 
-static bool operator<(const RangeHashedDictionary::Range & left, const RangeHashedDictionary::Range & right)
+static bool operator<(const Range & left, const Range & right)
 {
     return std::tie(left.left, left.right) < std::tie(right.left, right.right);
 }
 
-
-RangeHashedDictionary::RangeHashedDictionary(
+template <DictionaryKeyType dictionary_key_type>
+RangeHashedDictionary<dictionary_key_type>::RangeHashedDictionary(
     const StorageID & dict_id_,
     const DictionaryStructure & dict_struct_,
     DictionarySourcePtr source_ptr_,
@@ -87,29 +90,35 @@ RangeHashedDictionary::RangeHashedDictionary(
     calculateBytesAllocated();
 }
 
-ColumnPtr RangeHashedDictionary::getColumn(
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr RangeHashedDictionary<dictionary_key_type>::getColumn(
     const std::string & attribute_name,
     const DataTypePtr & result_type,
     const Columns & key_columns,
     const DataTypes & key_types,
     const ColumnPtr & default_values_column) const
 {
+    if (dictionary_key_type == DictionaryKeyType::Complex)
+    {
+        auto key_types_copy = key_types;
+        key_types_copy.pop_back();
+        dict_struct.validateKeyTypes(key_types_copy);
+    }
+
     ColumnPtr result;
 
-    const auto & attribute = getAttribute(attribute_name);
     const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-
-    auto keys_size = key_columns.front()->size();
+    const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+    const auto & attribute = attributes[attribute_index];
 
     /// Cast second column to storage type
     Columns modified_key_columns = key_columns;
-
-    auto range_storage_column = key_columns[1];
-    ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types[1], ""};
-
+    auto range_storage_column = key_columns.back();
+    ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types.back(), ""};
     auto range_column_storage_type = std::make_shared<DataTypeInt64>();
-    modified_key_columns[1] = castColumnAccurate(column_to_cast, range_column_storage_type);
+    modified_key_columns.back() = castColumnAccurate(column_to_cast, range_column_storage_type);
 
+    size_t keys_size = key_columns.front()->size();
     bool is_attribute_nullable = attribute.is_nullable;
 
     ColumnUInt8::MutablePtr col_null_map_to;
@@ -204,24 +213,33 @@ ColumnPtr RangeHashedDictionary::getColumn(
     return result;
 }
 
-ColumnUInt8::Ptr RangeHashedDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
+template <DictionaryKeyType dictionary_key_type>
+ColumnUInt8::Ptr RangeHashedDictionary<dictionary_key_type>::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
-    auto range_storage_column = key_columns[1];
-    ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types[1], ""};
+    if (dictionary_key_type == DictionaryKeyType::Complex)
+    {
+        auto key_types_copy = key_types;
+        key_types_copy.pop_back();
+        dict_struct.validateKeyTypes(key_types_copy);
+    }
 
     auto range_column_storage_type = std::make_shared<DataTypeInt64>();
+    auto 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, range_column_storage_type);
-
-    PaddedPODArray<UInt64> key_backup_storage;
     PaddedPODArray<RangeStorageType> range_backup_storage;
-
-    const PaddedPODArray<UInt64> & ids = getColumnVectorData(this, key_columns[0], key_backup_storage);
     const PaddedPODArray<RangeStorageType> & dates = getColumnVectorData(this, range_column_updated, range_backup_storage);
 
+    auto key_columns_copy = key_columns;
+    key_columns_copy.pop_back();
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns_copy, arena_holder.getComplexKeyArena());
+    const size_t keys_size = keys_extractor.getKeysSize();
+
     const auto & attribute = attributes.front();
 
-    ColumnUInt8::Ptr result;
-
+    auto result = ColumnUInt8::create(keys_size);
+    auto & out = result->getData();
     size_t keys_found = 0;
 
     auto type_call = [&](const auto & dictionary_attribute_type)
@@ -229,58 +247,48 @@ ColumnUInt8::Ptr RangeHashedDictionary::hasKeys(const Columns & key_columns, con
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
-        result = hasKeysImpl<ValueType>(attribute, ids, dates, keys_found);
+
+        const auto & collection = std::get<CollectionType<ValueType>>(attribute.maps);
+
+        for (size_t key_index = 0; key_index < keys_size; ++key_index)
+        {
+            const auto key = keys_extractor.extractCurrentKey();
+            const auto it = collection.find(key);
+
+            if (it)
+            {
+                const auto date = dates[key_index];
+                const auto & ranges_and_values = it->getMapped();
+                const auto val_it = std::find_if(
+                    std::begin(ranges_and_values),
+                    std::end(ranges_and_values),
+                    [date](const Value<ValueType> & v)
+                    {
+                        return v.range.contains(date);
+                    });
+
+                out[key_index] = val_it != std::end(ranges_and_values);
+                keys_found += out[key_index];
+            }
+            else
+            {
+                out[key_index] = false;
+            }
+
+            keys_extractor.rollbackCurrentKey();
+        }
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 
-    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 
     return result;
 }
 
-template <typename AttributeType>
-ColumnUInt8::Ptr RangeHashedDictionary::hasKeysImpl(
-    const Attribute & attribute,
-    const PaddedPODArray<UInt64> & ids,
-    const PaddedPODArray<RangeStorageType> & dates,
-    size_t & keys_found) const
-{
-    auto result = ColumnUInt8::create(ids.size());
-    auto& out = result->getData();
-
-    const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
-
-    keys_found = 0;
-
-    for (const auto row : collections::range(0, ids.size()))
-    {
-        const auto it = attr.find(ids[row]);
-
-        if (it)
-        {
-            const auto date = dates[row];
-            const auto & ranges_and_values = it->getMapped();
-            const auto val_it = std::find_if(
-                std::begin(ranges_and_values),
-                std::end(ranges_and_values),
-                [date](const Value<AttributeType> & v)
-                {
-                    return v.range.contains(date);
-                });
-
-            out[row] = val_it != std::end(ranges_and_values);
-            keys_found += out[row];
-        }
-        else
-            out[row] = false;
-    }
-
-    return result;
-}
-
-void RangeHashedDictionary::createAttributes()
+template <DictionaryKeyType dictionary_key_type>
+void RangeHashedDictionary<dictionary_key_type>::createAttributes()
 {
     const auto size = dict_struct.attributes.size();
     attributes.reserve(size);
@@ -296,72 +304,79 @@ void RangeHashedDictionary::createAttributes()
     }
 }
 
-void RangeHashedDictionary::loadData()
+template <DictionaryKeyType dictionary_key_type>
+void RangeHashedDictionary<dictionary_key_type>::loadData()
 {
-    auto stream = source_ptr->loadAll();
-    stream->readPrefix();
+    QueryPipeline pipeline(source_ptr->loadAll());
 
-    while (const auto block = stream->read())
+    PullingPipelineExecutor executor(pipeline);
+    Block block;
+    while (executor.pull(block))
     {
-        const auto & id_column = *block.safeGetByPosition(0).column;
+        size_t skip_keys_size_offset = dict_struct.getKeysSize();
+
+        Columns key_columns;
+        key_columns.reserve(skip_keys_size_offset);
+
+        /// Split into keys columns and attribute columns
+        for (size_t i = 0; i < skip_keys_size_offset; ++i)
+            key_columns.emplace_back(block.safeGetByPosition(i).column);
+
+        DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+        DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns, arena_holder.getComplexKeyArena());
+        const size_t keys_size = keys_extractor.getKeysSize();
+
+        element_count += keys_size;
 
         // Support old behaviour, where invalid date means 'open range'.
         const bool is_date = isDate(dict_struct.range_min->type);
 
-        const auto & min_range_column = unwrapNullableColumn(*block.safeGetByPosition(1).column);
-        const auto & max_range_column = unwrapNullableColumn(*block.safeGetByPosition(2).column);
+        const auto & min_range_column = unwrapNullableColumn(*block.safeGetByPosition(skip_keys_size_offset).column);
+        const auto & max_range_column = unwrapNullableColumn(*block.safeGetByPosition(skip_keys_size_offset + 1).column);
 
-        element_count += id_column.size();
+        skip_keys_size_offset += 2;
 
-        for (const auto attribute_idx : collections::range(0, attributes.size()))
+        for (size_t attribute_index = 0; attribute_index < attributes.size(); ++attribute_index)
         {
-            const auto & attribute_column = *block.safeGetByPosition(attribute_idx + 3).column;
-            auto & attribute = attributes[attribute_idx];
+            const auto & attribute_column = *block.safeGetByPosition(attribute_index + skip_keys_size_offset).column;
+            auto & attribute = attributes[attribute_index];
 
-            for (const auto row_idx : collections::range(0, id_column.size()))
+            for (size_t key_index = 0; key_index < keys_size; ++key_index)
             {
+                auto key = keys_extractor.extractCurrentKey();
+
                 RangeStorageType lower_bound;
                 RangeStorageType upper_bound;
 
                 if (is_date)
                 {
-                    lower_bound = getColumnIntValueOrDefault(min_range_column, row_idx, is_date, 0);
-                    upper_bound = getColumnIntValueOrDefault(max_range_column, row_idx, is_date, DATE_LUT_MAX_DAY_NUM + 1);
+                    lower_bound = getColumnIntValueOrDefault(min_range_column, key_index, is_date, 0);
+                    upper_bound = getColumnIntValueOrDefault(max_range_column, key_index, is_date, DATE_LUT_MAX_DAY_NUM + 1);
                 }
                 else
                 {
-                    lower_bound = getColumnIntValueOrDefault(min_range_column, row_idx, is_date, RANGE_MIN_NULL_VALUE);
-                    upper_bound = getColumnIntValueOrDefault(max_range_column, row_idx, is_date, RANGE_MAX_NULL_VALUE);
+                    lower_bound = getColumnIntValueOrDefault(min_range_column, key_index, is_date, RANGE_MIN_NULL_VALUE);
+                    upper_bound = getColumnIntValueOrDefault(max_range_column, key_index, is_date, RANGE_MAX_NULL_VALUE);
                 }
 
-                setAttributeValue(attribute, id_column.getUInt(row_idx), Range{lower_bound, upper_bound}, attribute_column[row_idx]);
+                if constexpr (std::is_same_v<KeyType, StringRef>)
+                    key = copyKeyInArena(key);
+
+                setAttributeValue(attribute, key, Range{lower_bound, upper_bound}, attribute_column[key_index]);
+                keys_extractor.rollbackCurrentKey();
             }
+
+            keys_extractor.reset();
         }
     }
 
-    stream->readSuffix();
-
     if (require_nonempty && 0 == element_count)
         throw Exception(ErrorCodes::DICTIONARY_IS_EMPTY,
             "{}: dictionary source is empty and 'require_nonempty' property is set.");
 }
 
-template <typename T>
-void RangeHashedDictionary::addAttributeSize(const Attribute & attribute)
-{
-    const auto & map_ref = std::get<Ptr<T>>(attribute.maps);
-    bytes_allocated += sizeof(Collection<T>) + map_ref->getBufferSizeInBytes();
-    bucket_count = map_ref->getBufferSizeInCells();
-}
-
-template <>
-void RangeHashedDictionary::addAttributeSize<String>(const Attribute & attribute)
-{
-    addAttributeSize<StringRef>(attribute);
-    bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
-}
-
-void RangeHashedDictionary::calculateBytesAllocated()
+template <DictionaryKeyType dictionary_key_type>
+void RangeHashedDictionary<dictionary_key_type>::calculateBytesAllocated()
 {
     bytes_allocated += attributes.size() * sizeof(attributes.front());
 
@@ -371,14 +386,25 @@ void RangeHashedDictionary::calculateBytesAllocated()
         {
             using Type = std::decay_t<decltype(dictionary_attribute_type)>;
             using AttributeType = typename Type::AttributeType;
-            addAttributeSize<AttributeType>(attribute);
+            using ValueType = DictionaryValueType<AttributeType>;
+
+            const auto & collection = std::get<CollectionType<ValueType>>(attribute.maps);
+            bytes_allocated += sizeof(CollectionType<ValueType>) + collection.getBufferSizeInBytes();
+            bucket_count = collection.getBufferSizeInCells();
+
+            if constexpr (std::is_same_v<ValueType, StringRef>)
+                bytes_allocated += sizeof(Arena) + attribute.string_arena->size();
         };
 
         callOnDictionaryAttributeType(attribute.type, type_call);
     }
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
+        bytes_allocated += complex_key_arena.size();
 }
 
-RangeHashedDictionary::Attribute RangeHashedDictionary::createAttribute(const DictionaryAttribute & dictionary_attribute)
+template <DictionaryKeyType dictionary_key_type>
+typename RangeHashedDictionary<dictionary_key_type>::Attribute RangeHashedDictionary<dictionary_key_type>::createAttribute(const DictionaryAttribute & dictionary_attribute)
 {
     Attribute attribute{dictionary_attribute.underlying_type, dictionary_attribute.is_nullable, {}, {}};
 
@@ -391,7 +417,7 @@ RangeHashedDictionary::Attribute RangeHashedDictionary::createAttribute(const Di
         if constexpr (std::is_same_v<AttributeType, String>)
             attribute.string_arena = std::make_unique<Arena>();
 
-        attribute.maps = std::make_unique<Collection<ValueType>>();
+        attribute.maps = CollectionType<ValueType>();
     };
 
     callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
@@ -399,29 +425,35 @@ RangeHashedDictionary::Attribute RangeHashedDictionary::createAttribute(const Di
     return attribute;
 }
 
+template <DictionaryKeyType dictionary_key_type>
 template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
-void RangeHashedDictionary::getItemsImpl(
+void RangeHashedDictionary<dictionary_key_type>::getItemsImpl(
     const Attribute & attribute,
     const Columns & key_columns,
     ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
-    PaddedPODArray<UInt64> key_backup_storage;
-    PaddedPODArray<RangeStorageType> range_backup_storage;
-
-    const PaddedPODArray<UInt64> & ids = getColumnVectorData(this, key_columns[0], key_backup_storage);
-    const PaddedPODArray<RangeStorageType> & dates = getColumnVectorData(this, key_columns[1], range_backup_storage);
-
-    const auto & attr = *std::get<Ptr<AttributeType>>(attribute.maps);
+    const auto & collection = std::get<CollectionType<AttributeType>>(attribute.maps);
 
     size_t keys_found = 0;
 
-    for (const auto row : collections::range(0, ids.size()))
+    PaddedPODArray<RangeStorageType> range_backup_storage;
+    const auto & dates = getColumnVectorData(this, key_columns.back(), range_backup_storage);
+
+    auto key_columns_copy = key_columns;
+    key_columns_copy.pop_back();
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns_copy, arena_holder.getComplexKeyArena());
+    const size_t keys_size = keys_extractor.getKeysSize();
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
     {
-        const auto it = attr.find(ids[row]);
+        auto key = keys_extractor.extractCurrentKey();
+        const auto it = collection.find(key);
+
         if (it)
         {
-            const auto date = dates[row];
+            const auto date = dates[key_index];
             const auto & ranges_and_values = it->getMapped();
             const auto val_it = std::find_if(
                 std::begin(ranges_and_values),
@@ -439,35 +471,38 @@ void RangeHashedDictionary::getItemsImpl(
                 if constexpr (is_nullable)
                 {
                     if (value.has_value())
-                        set_value(row, *value, false);
+                        set_value(key_index, *value, false);
                     else
-                        set_value(row, default_value_extractor[row], true);
+                        set_value(key_index, default_value_extractor[key_index], true);
                 }
                 else
                 {
-                    set_value(row, *value, false);
+                    set_value(key_index, *value, false);
                 }
 
+                keys_extractor.rollbackCurrentKey();
                 continue;
             }
         }
 
         if constexpr (is_nullable)
-            set_value(row, default_value_extractor[row], default_value_extractor.isNullAt(row));
+            set_value(key_index, default_value_extractor[key_index], default_value_extractor.isNullAt(key_index));
         else
-            set_value(row, default_value_extractor[row], false);
+            set_value(key_index, default_value_extractor[key_index], false);
+
+        keys_extractor.rollbackCurrentKey();
     }
 
-    query_count.fetch_add(ids.size(), std::memory_order_relaxed);
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
-
+template <DictionaryKeyType dictionary_key_type>
 template <typename T>
-void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const UInt64 id, const Range & range, const Field & value)
+void RangeHashedDictionary<dictionary_key_type>::setAttributeValueImpl(Attribute & attribute, KeyType key, const Range & range, const Field & value)
 {
     using ValueType = std::conditional_t<std::is_same_v<T, String>, StringRef, T>;
-    auto & map = *std::get<Ptr<ValueType>>(attribute.maps);
+    auto & collection = std::get<CollectionType<ValueType>>(attribute.maps);
 
     Value<ValueType> value_to_insert;
 
@@ -490,98 +525,85 @@ void RangeHashedDictionary::setAttributeValueImpl(Attribute & attribute, const U
         }
     }
 
-    const auto it = map.find(id);
+    const auto it = collection.find(key);
 
     if (it)
     {
         auto & values = it->getMapped();
 
-        const auto insert_it
-            = std::lower_bound(std::begin(values), std::end(values), range, [](const Value<ValueType> & lhs, const Range & rhs_range)
-              {
-                  return lhs.range < rhs_range;
-              });
+        const auto insert_it = std::lower_bound(
+            std::begin(values),
+            std::end(values),
+            range,
+            [](const Value<ValueType> & lhs, const Range & rhs_range)
+            {
+                return lhs.range < rhs_range;
+            });
 
         values.insert(insert_it, std::move(value_to_insert));
     }
     else
-        map.insert({id, Values<ValueType>{std::move(value_to_insert)}});
+    {
+        collection.insert({key, Values<ValueType>{std::move(value_to_insert)}});
+    }
 }
 
-void RangeHashedDictionary::setAttributeValue(Attribute & attribute, const UInt64 id, const Range & range, const Field & value)
+template <DictionaryKeyType dictionary_key_type>
+void RangeHashedDictionary<dictionary_key_type>::setAttributeValue(Attribute & attribute, KeyType key, const Range & range, const Field & value)
 {
     auto type_call = [&](const auto &dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
 
-        setAttributeValueImpl<AttributeType>(attribute, id, range, value);
+        setAttributeValueImpl<AttributeType>(attribute, key, range, value);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
-const RangeHashedDictionary::Attribute & RangeHashedDictionary::getAttribute(const std::string & attribute_name) const
-{
-    const auto it = attribute_index_by_name.find(attribute_name);
-    if (it == std::end(attribute_index_by_name))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: no such attribute '{}'", full_name, attribute_name);
-
-    return attributes[it->second];
-}
-
-const RangeHashedDictionary::Attribute &
-RangeHashedDictionary::getAttributeWithType(const std::string & attribute_name, const AttributeUnderlyingType type) const
-{
-    const auto & attribute = getAttribute(attribute_name);
-    if (attribute.type != type)
-        throw Exception(ErrorCodes::TYPE_MISMATCH, "attribute {} has type {}",
-            attribute_name,
-            toString(attribute.type));
-
-    return attribute;
-}
-
+template <DictionaryKeyType dictionary_key_type>
 template <typename RangeType>
-void RangeHashedDictionary::getIdsAndDates(
-    PaddedPODArray<UInt64> & ids,
+void RangeHashedDictionary<dictionary_key_type>::getKeysAndDates(
+    PaddedPODArray<KeyType> & keys,
     PaddedPODArray<RangeType> & start_dates,
     PaddedPODArray<RangeType> & end_dates) const
 {
     const auto & attribute = attributes.front();
 
-    auto type_call = [&](const auto &dictionary_attribute_type)
+    auto type_call = [&](const auto & dictionary_attribute_type)
     {
         using Type = std::decay_t<decltype(dictionary_attribute_type)>;
         using AttributeType = typename Type::AttributeType;
         using ValueType = DictionaryValueType<AttributeType>;
 
-        getIdsAndDates<ValueType>(attribute, ids, start_dates, end_dates);
+        getKeysAndDates<ValueType>(attribute, keys, start_dates, end_dates);
     };
 
     callOnDictionaryAttributeType(attribute.type, type_call);
 }
 
+template <DictionaryKeyType dictionary_key_type>
 template <typename T, typename RangeType>
-void RangeHashedDictionary::getIdsAndDates(
+void RangeHashedDictionary<dictionary_key_type>::getKeysAndDates(
     const Attribute & attribute,
-    PaddedPODArray<UInt64> & ids,
+    PaddedPODArray<KeyType> & keys,
     PaddedPODArray<RangeType> & start_dates,
     PaddedPODArray<RangeType> & end_dates) const
 {
-    const HashMap<UInt64, Values<T>> & attr = *std::get<Ptr<T>>(attribute.maps);
+    const auto & collection = std::get<CollectionType<T>>(attribute.maps);
 
-    ids.reserve(attr.size());
-    start_dates.reserve(attr.size());
-    end_dates.reserve(attr.size());
+    keys.reserve(collection.size());
+    start_dates.reserve(collection.size());
+    end_dates.reserve(collection.size());
 
     const bool is_date = isDate(dict_struct.range_min->type);
 
-    for (const auto & key : attr)
+    for (const auto & key : collection)
     {
         for (const auto & value : key.getMapped())
         {
-            ids.push_back(key.getKey());
+            keys.push_back(key.getKey());
             start_dates.push_back(value.range.left);
             end_dates.push_back(value.range.right);
 
@@ -592,72 +614,108 @@ void RangeHashedDictionary::getIdsAndDates(
     }
 }
 
-
-template <typename RangeType>
-BlockInputStreamPtr RangeHashedDictionary::getBlockInputStreamImpl(const Names & column_names, size_t max_block_size) const
+template <DictionaryKeyType dictionary_key_type>
+StringRef RangeHashedDictionary<dictionary_key_type>::copyKeyInArena(StringRef key)
 {
-    PaddedPODArray<UInt64> ids;
-    PaddedPODArray<RangeType> start_dates;
-    PaddedPODArray<RangeType> end_dates;
-    getIdsAndDates(ids, start_dates, end_dates);
-
-    using BlockInputStreamType = RangeDictionaryBlockInputStream<RangeType>;
-
-    auto stream = std::make_shared<BlockInputStreamType>(
-        shared_from_this(),
-        max_block_size,
-        column_names,
-        std::move(ids),
-        std::move(start_dates),
-        std::move(end_dates));
-
-    return stream;
+    size_t key_size = key.size;
+    char * place_for_key = complex_key_arena.alloc(key_size);
+    memcpy(reinterpret_cast<void *>(place_for_key), reinterpret_cast<const void *>(key.data), key_size);
+    StringRef updated_key{place_for_key, key_size};
+    return updated_key;
 }
 
-struct RangeHashedDictionaryCallGetBlockInputStreamImpl
+template <DictionaryKeyType dictionary_key_type>
+template <typename RangeType>
+PaddedPODArray<Int64> RangeHashedDictionary<dictionary_key_type>::makeDateKeys(
+    const PaddedPODArray<RangeType> & block_start_dates,
+    const PaddedPODArray<RangeType> & block_end_dates) const
 {
-    BlockInputStreamPtr stream;
-    const RangeHashedDictionary * dict;
-    const Names * column_names;
-    size_t max_block_size;
+    PaddedPODArray<Int64> keys(block_start_dates.size());
 
-    template <typename RangeType, size_t>
-    void operator()()
+    for (size_t i = 0; i < keys.size(); ++i)
     {
-        const auto & type = dict->dict_struct.range_min->type;
-        if (!stream && dynamic_cast<const DataTypeNumberBase<RangeType> *>(type.get()))
-            stream = dict->getBlockInputStreamImpl<RangeType>(*column_names, max_block_size);
+        if (Range::isCorrectDate(block_start_dates[i]))
+            keys[i] = block_start_dates[i]; // NOLINT
+        else
+            keys[i] = block_end_dates[i]; // NOLINT
     }
-};
 
-BlockInputStreamPtr RangeHashedDictionary::getBlockInputStream(const Names & column_names, size_t max_block_size) const
+    return keys;
+}
+
+template <DictionaryKeyType dictionary_key_type>
+Pipe RangeHashedDictionary<dictionary_key_type>::read(const Names & column_names, size_t max_block_size, size_t num_streams) const
 {
-    using ListType = TypeList<UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Int128, Float32, Float64>;
+    auto type = dict_struct.range_min->type;
 
-    RangeHashedDictionaryCallGetBlockInputStreamImpl callable;
-    callable.dict = this;
-    callable.column_names = &column_names;
-    callable.max_block_size = max_block_size;
+    ColumnsWithTypeAndName key_columns;
+    ColumnWithTypeAndName range_min_column;
+    ColumnWithTypeAndName range_max_column;
 
-    ListType::forEach(callable);
+    auto type_call = [&](const auto & types) mutable -> bool
+    {
+        using Types = std::decay_t<decltype(types)>;
+        using LeftDataType = typename Types::LeftType;
 
-    if (!callable.stream)
-        throw Exception(ErrorCodes::LOGICAL_ERROR,
-            "Unexpected range type for RangeHashed dictionary: {}",
-            dict_struct.range_min->type->getName());
+        if constexpr (IsDataTypeNumber<LeftDataType> ||
+            std::is_same_v<LeftDataType, DataTypeDate> ||
+            std::is_same_v<LeftDataType, DataTypeDate32> ||
+            std::is_same_v<LeftDataType, DataTypeDateTime>)
+        {
+            using RangeType = typename LeftDataType::FieldType;
 
-    return callable.stream;
+            PaddedPODArray<KeyType> keys;
+            PaddedPODArray<RangeType> start_dates;
+            PaddedPODArray<RangeType> end_dates;
+            getKeysAndDates(keys, start_dates, end_dates);
+
+            range_min_column = ColumnWithTypeAndName{getColumnFromPODArray(start_dates), dict_struct.range_min->type, dict_struct.range_min->name};
+            range_max_column = ColumnWithTypeAndName{getColumnFromPODArray(end_dates), dict_struct.range_max->type, dict_struct.range_max->name};
+
+            if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
+                key_columns = {ColumnWithTypeAndName(getColumnFromPODArray(keys), std::make_shared<DataTypeUInt64>(), dict_struct.id->name)};
+            else
+                key_columns = deserializeColumnsWithTypeAndNameFromKeys(dict_struct, keys, 0, keys.size());
+
+            auto date_column = getColumnFromPODArray(makeDateKeys(start_dates, end_dates));
+            key_columns.emplace_back(ColumnWithTypeAndName{std::move(date_column), std::make_shared<DataTypeInt64>(), ""});
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    };
+
+    if (!callOnIndexAndDataType<void>(type->getTypeId(), type_call))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "RangeHashedDictionary min max range type should be numeric");
+
+    ColumnsWithTypeAndName data_columns = {std::move(range_min_column), std::move(range_max_column)};
+
+    std::shared_ptr<const IDictionary> dictionary = shared_from_this();
+    auto coordinator = std::make_shared<DictionarySourceCoordinator>(dictionary, column_names, std::move(key_columns), std::move(data_columns), max_block_size);
+
+    Pipes pipes;
+
+    for (size_t i = 0; i < num_streams; ++i)
+    {
+        auto source = std::make_shared<DictionarySource>(coordinator);
+        pipes.emplace_back(Pipe(std::move(source)));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
 }
 
 
 void registerDictionaryRangeHashed(DictionaryFactory & factory)
 {
-    auto create_layout = [=](const std::string & full_name,
+    auto create_layout_simple = [=](const std::string & full_name,
                              const DictionaryStructure & dict_struct,
                              const Poco::Util::AbstractConfiguration & config,
                              const std::string & config_prefix,
                              DictionarySourcePtr source_ptr,
-                             ContextPtr /* context */,
+                             ContextPtr /* global_context */,
                              bool /*created_from_ddl*/) -> DictionaryPtr
     {
         if (dict_struct.key)
@@ -671,9 +729,32 @@ void registerDictionaryRangeHashed(DictionaryFactory & factory)
         const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
         const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
         const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
-        return std::make_unique<RangeHashedDictionary>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+        return std::make_unique<RangeHashedDictionary<DictionaryKeyType::Simple>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
     };
-    factory.registerLayout("range_hashed", create_layout, false);
+    factory.registerLayout("range_hashed", create_layout_simple, false);
+
+    auto create_layout_complex = [=](const std::string & full_name,
+                             const DictionaryStructure & dict_struct,
+                             const Poco::Util::AbstractConfiguration & config,
+                             const std::string & config_prefix,
+                             DictionarySourcePtr source_ptr,
+                             ContextPtr /* context */,
+                             bool /*created_from_ddl*/) -> DictionaryPtr
+    {
+        if (dict_struct.id)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "'id' is not supported for dictionary of layout 'complex_key_range_hashed'");
+
+        if (!dict_struct.range_min || !dict_struct.range_max)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "{}: dictionary of layout 'complex_key_range_hashed' requires .structure.range_min and .structure.range_max",
+                full_name);
+
+        const auto dict_id = StorageID::fromDictionaryConfig(config, config_prefix);
+        const DictionaryLifetime dict_lifetime{config, config_prefix + ".lifetime"};
+        const bool require_nonempty = config.getBool(config_prefix + ".require_nonempty", false);
+        return std::make_unique<RangeHashedDictionary<DictionaryKeyType::Complex>>(dict_id, dict_struct, std::move(source_ptr), dict_lifetime, require_nonempty);
+    };
+    factory.registerLayout("complex_key_range_hashed", create_layout_complex, true);
 }
 
 }
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index 0dd9c41fd71..1ccd9708d79 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -9,16 +9,31 @@
 #include <Columns/ColumnString.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
-#include "DictionaryStructure.h"
-#include "IDictionary.h"
-#include "IDictionarySource.h"
-#include "DictionaryHelpers.h"
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryHelpers.h>
 
 namespace DB
 {
+
+using RangeStorageType = Int64;
+
+struct Range
+{
+    RangeStorageType left;
+    RangeStorageType right;
+
+    static bool isCorrectDate(const RangeStorageType & date);
+    bool contains(const RangeStorageType & value) const;
+};
+
+template <DictionaryKeyType dictionary_key_type>
 class RangeHashedDictionary final : public IDictionary
 {
 public:
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
+
     RangeHashedDictionary(
         const StorageID & dict_id_,
         const DictionaryStructure & dict_struct_,
@@ -59,10 +74,12 @@ public:
 
     bool isInjective(const std::string & attribute_name) const override
     {
-        return dict_struct.attributes[&getAttribute(attribute_name) - attributes.data()].injective;
+        return dict_struct.getAttribute(attribute_name).injective;
     }
 
-    DictionaryKeyType getKeyType() const override { return DictionaryKeyType::range; }
+    DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
+
+    DictionarySpecialKeyType getSpecialKeyType() const override { return DictionarySpecialKeyType::Range;}
 
     ColumnPtr getColumn(
         const std::string& attribute_name,
@@ -73,18 +90,7 @@ public:
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
-    using RangeStorageType = Int64;
-
-    BlockInputStreamPtr getBlockInputStream(const Names & column_names, size_t max_block_size) const override;
-
-    struct Range
-    {
-        RangeStorageType left;
-        RangeStorageType right;
-
-        static bool isCorrectDate(const RangeStorageType & date);
-        bool contains(const RangeStorageType & value) const;
-    };
+    Pipe read(const Names & column_names, size_t max_block_size, size_t num_streams) const override;
 
 private:
     template <typename T>
@@ -96,10 +102,12 @@ private:
 
     template <typename T>
     using Values = std::vector<Value<T>>;
-    template <typename T>
-    using Collection = HashMap<UInt64, Values<T>>;
-    template <typename T>
-    using Ptr = std::unique_ptr<Collection<T>>;
+
+    template <typename Value>
+    using CollectionType = std::conditional_t<
+        dictionary_key_type == DictionaryKeyType::Simple,
+        HashMap<UInt64, Values<Value>>,
+        HashMapWithSavedHash<StringRef, Values<Value>, DefaultHash<StringRef>>>;
 
     struct Attribute final
     {
@@ -108,27 +116,27 @@ private:
         bool is_nullable;
 
         std::variant<
-            Ptr<UInt8>,
-            Ptr<UInt16>,
-            Ptr<UInt32>,
-            Ptr<UInt64>,
-            Ptr<UInt128>,
-            Ptr<UInt256>,
-            Ptr<Int8>,
-            Ptr<Int16>,
-            Ptr<Int32>,
-            Ptr<Int64>,
-            Ptr<Int128>,
-            Ptr<Int256>,
-            Ptr<Decimal32>,
-            Ptr<Decimal64>,
-            Ptr<Decimal128>,
-            Ptr<Decimal256>,
-            Ptr<Float32>,
-            Ptr<Float64>,
-            Ptr<UUID>,
-            Ptr<StringRef>,
-            Ptr<Array>>
+            CollectionType<UInt8>,
+            CollectionType<UInt16>,
+            CollectionType<UInt32>,
+            CollectionType<UInt64>,
+            CollectionType<UInt128>,
+            CollectionType<UInt256>,
+            CollectionType<Int8>,
+            CollectionType<Int16>,
+            CollectionType<Int32>,
+            CollectionType<Int64>,
+            CollectionType<Int128>,
+            CollectionType<Int256>,
+            CollectionType<Decimal32>,
+            CollectionType<Decimal64>,
+            CollectionType<Decimal128>,
+            CollectionType<Decimal256>,
+            CollectionType<Float32>,
+            CollectionType<Float64>,
+            CollectionType<UUID>,
+            CollectionType<StringRef>,
+            CollectionType<Array>>
             maps;
         std::unique_ptr<Arena> string_arena;
     };
@@ -137,9 +145,6 @@ private:
 
     void loadData();
 
-    template <typename T>
-    void addAttributeSize(const Attribute & attribute);
-
     void calculateBytesAllocated();
 
     static Attribute createAttribute(const DictionaryAttribute & dictionary_attribute);
@@ -151,36 +156,30 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
-    template <typename AttributeType>
-    ColumnUInt8::Ptr hasKeysImpl(
-        const Attribute & attribute,
-        const PaddedPODArray<UInt64> & ids,
-        const PaddedPODArray<RangeStorageType> & dates,
-        size_t & keys_found) const;
-
     template <typename T>
-    static void setAttributeValueImpl(Attribute & attribute, const UInt64 id, const Range & range, const Field & value);
+    static void setAttributeValueImpl(Attribute & attribute, KeyType key, const Range & range, const Field & value);
 
-    static void setAttributeValue(Attribute & attribute, const UInt64 id, const Range & range, const Field & value);
-
-    const Attribute & getAttribute(const std::string & attribute_name) const;
-
-    const Attribute & getAttributeWithType(const std::string & name, const AttributeUnderlyingType type) const;
+    static void setAttributeValue(Attribute & attribute, KeyType key, const Range & range, const Field & value);
 
     template <typename RangeType>
-    void getIdsAndDates(PaddedPODArray<UInt64> & ids, PaddedPODArray<RangeType> & start_dates, PaddedPODArray<RangeType> & end_dates) const;
+    void getKeysAndDates(
+        PaddedPODArray<KeyType> & keys,
+        PaddedPODArray<RangeType> & start_dates,
+        PaddedPODArray<RangeType> & end_dates) const;
 
     template <typename T, typename RangeType>
-    void getIdsAndDates(
+    void getKeysAndDates(
         const Attribute & attribute,
-        PaddedPODArray<UInt64> & ids,
+        PaddedPODArray<KeyType> & keys,
         PaddedPODArray<RangeType> & start_dates,
         PaddedPODArray<RangeType> & end_dates) const;
 
     template <typename RangeType>
-    BlockInputStreamPtr getBlockInputStreamImpl(const Names & column_names, size_t max_block_size) const;
+    PaddedPODArray<Int64> makeDateKeys(
+        const PaddedPODArray<RangeType> & block_start_dates,
+        const PaddedPODArray<RangeType> & block_end_dates) const;
 
-    friend struct RangeHashedDictionaryCallGetBlockInputStreamImpl;
+    StringRef copyKeyInArena(StringRef key);
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
@@ -189,6 +188,7 @@ private:
 
     std::map<std::string, size_t> attribute_index_by_name;
     std::vector<Attribute> attributes;
+    Arena complex_key_arena;
 
     size_t bytes_allocated = 0;
     size_t element_count = 0;
diff --git a/src/Dictionaries/RedisDictionarySource.cpp b/src/Dictionaries/RedisDictionarySource.cpp
index 4e79a75c1d4..24a14d8cc80 100644
--- a/src/Dictionaries/RedisDictionarySource.cpp
+++ b/src/Dictionaries/RedisDictionarySource.cpp
@@ -12,7 +12,7 @@ void registerDictionarySourceRedis(DictionarySourceFactory & factory)
                                    const Poco::Util::AbstractConfiguration & config,
                                    const String & config_prefix,
                                    Block & sample_block,
-                                   ContextPtr /* context */,
+                                   ContextPtr /* global_context */,
                                    const std::string & /* default_database */,
                                    bool /* created_from_ddl */) -> DictionarySourcePtr {
         return std::make_unique<RedisDictionarySource>(dict_struct, config, config_prefix + ".redis", sample_block);
@@ -31,7 +31,7 @@ void registerDictionarySourceRedis(DictionarySourceFactory & factory)
 
 #include <IO/WriteHelpers.h>
 
-#include "RedisBlockInputStream.h"
+#include "RedisSource.h"
 
 
 namespace DB
@@ -159,7 +159,7 @@ namespace DB
         __builtin_unreachable();
     }
 
-    BlockInputStreamPtr RedisDictionarySource::loadAll()
+    Pipe RedisDictionarySource::loadAll()
     {
         if (!client->isConnected())
             client->connect(host, port);
@@ -170,7 +170,7 @@ namespace DB
         /// Get only keys for specified storage type.
         auto all_keys = client->execute<RedisArray>(command_for_keys);
         if (all_keys.isNull())
-            return std::make_shared<RedisBlockInputStream>(client, RedisArray{}, storage_type, sample_block, max_block_size);
+            return Pipe(std::make_shared<RedisSource>(client, RedisArray{}, storage_type, sample_block, max_block_size));
 
         RedisArray keys;
         auto key_type = storageTypeToKeyType(storage_type);
@@ -209,11 +209,11 @@ namespace DB
             keys = std::move(hkeys);
         }
 
-        return std::make_shared<RedisBlockInputStream>(client, std::move(keys), storage_type, sample_block, max_block_size);
+        return Pipe(std::make_shared<RedisSource>(client, std::move(keys), storage_type, sample_block, max_block_size));
     }
 
 
-    BlockInputStreamPtr RedisDictionarySource::loadIds(const std::vector<UInt64> & ids)
+    Pipe RedisDictionarySource::loadIds(const std::vector<UInt64> & ids)
     {
         if (!client->isConnected())
             client->connect(host, port);
@@ -229,10 +229,10 @@ namespace DB
         for (UInt64 id : ids)
             keys << DB::toString(id);
 
-        return std::make_shared<RedisBlockInputStream>(client, std::move(keys), storage_type, sample_block, max_block_size);
+        return Pipe(std::make_shared<RedisSource>(client, std::move(keys), storage_type, sample_block, max_block_size));
     }
 
-    BlockInputStreamPtr RedisDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+    Pipe RedisDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
     {
         if (!client->isConnected())
             client->connect(host, port);
@@ -258,7 +258,7 @@ namespace DB
             keys.add(key);
         }
 
-        return std::make_shared<RedisBlockInputStream>(client, std::move(keys), storage_type, sample_block, max_block_size);
+        return Pipe(std::make_shared<RedisSource>(client, std::move(keys), storage_type, sample_block, max_block_size));
     }
 
 
diff --git a/src/Dictionaries/RedisDictionarySource.h b/src/Dictionaries/RedisDictionarySource.h
index d67403a7f1c..053094e2303 100644
--- a/src/Dictionaries/RedisDictionarySource.h
+++ b/src/Dictionaries/RedisDictionarySource.h
@@ -59,18 +59,18 @@ namespace ErrorCodes
 
         ~RedisDictionarySource() override;
 
-        BlockInputStreamPtr loadAll() override;
+        Pipe loadAll() override;
 
-        BlockInputStreamPtr loadUpdatedAll() override
+        Pipe loadUpdatedAll() override
         {
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method loadUpdatedAll is unsupported for RedisDictionarySource");
         }
 
         bool supportsSelectiveLoad() const override { return true; }
 
-        BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+        Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-        BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+        Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
         bool isModified() const override { return true; }
 
diff --git a/src/Dictionaries/RedisBlockInputStream.cpp b/src/Dictionaries/RedisSource.cpp
similarity index 95%
rename from src/Dictionaries/RedisBlockInputStream.cpp
rename to src/Dictionaries/RedisSource.cpp
index 71d055e1d68..ad5cf8a0977 100644
--- a/src/Dictionaries/RedisBlockInputStream.cpp
+++ b/src/Dictionaries/RedisSource.cpp
@@ -1,4 +1,4 @@
-#include "RedisBlockInputStream.h"
+#include "RedisSource.h"
 
 #include <string>
 #include <vector>
@@ -29,18 +29,19 @@ namespace DB
     }
 
 
-    RedisBlockInputStream::RedisBlockInputStream(
+    RedisSource::RedisSource(
             const std::shared_ptr<Poco::Redis::Client> & client_,
             const RedisArray & keys_,
             const RedisStorageType & storage_type_,
             const DB::Block & sample_block,
             const size_t max_block_size_)
-            : client(client_), keys(keys_), storage_type(storage_type_), max_block_size{max_block_size_}
+            : SourceWithProgress(sample_block)
+            , client(client_), keys(keys_), storage_type(storage_type_), max_block_size{max_block_size_}
     {
         description.init(sample_block);
     }
 
-    RedisBlockInputStream::~RedisBlockInputStream() = default;
+    RedisSource::~RedisSource() = default;
 
 
     namespace
@@ -121,7 +122,7 @@ namespace DB
     }
 
 
-    Block RedisBlockInputStream::readImpl()
+    Chunk RedisSource::generate()
     {
         if (keys.isNull() || description.sample_block.rows() == 0 || cursor >= keys.size())
             all_read = true;
@@ -218,6 +219,7 @@ namespace DB
             cursor += need_values;
         }
 
-        return description.sample_block.cloneWithColumns(std::move(columns));
+        size_t num_rows = columns.at(0)->size();
+        return Chunk(std::move(columns), num_rows);
     }
 }
diff --git a/src/Dictionaries/RedisBlockInputStream.h b/src/Dictionaries/RedisSource.h
similarity index 76%
rename from src/Dictionaries/RedisBlockInputStream.h
rename to src/Dictionaries/RedisSource.h
index 185cfedb09d..db2e643eb4e 100644
--- a/src/Dictionaries/RedisBlockInputStream.h
+++ b/src/Dictionaries/RedisSource.h
@@ -3,7 +3,7 @@
 #include <Core/Block.h>
 
 #include <Core/ExternalResultDescription.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Poco/Redis/Array.h>
 #include <Poco/Redis/Type.h>
 #include "RedisDictionarySource.h"
@@ -19,27 +19,25 @@ namespace Poco
 
 namespace DB
 {
-    class RedisBlockInputStream final : public IBlockInputStream
+    class RedisSource final : public SourceWithProgress
     {
     public:
         using RedisArray = Poco::Redis::Array;
         using RedisBulkString = Poco::Redis::BulkString;
 
-        RedisBlockInputStream(
+        RedisSource(
                 const std::shared_ptr<Poco::Redis::Client> & client_,
                 const Poco::Redis::Array & keys_,
                 const RedisStorageType & storage_type_,
                 const Block & sample_block,
                 const size_t max_block_size);
 
-        ~RedisBlockInputStream() override;
+        ~RedisSource() override;
 
         String getName() const override { return "Redis"; }
 
-        Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
     private:
-        Block readImpl() override;
+        Chunk generate() override;
 
         std::shared_ptr<Poco::Redis::Client> client;
         Poco::Redis::Array keys;
@@ -51,3 +49,4 @@ namespace DB
     };
 
 }
+
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index 395328a904d..7c53ecc2b2c 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -11,14 +11,14 @@
 #include <absl/container/flat_hash_map.h>
 #include <absl/container/flat_hash_set.h>
 
-#include <common/unaligned.h>
-#include <Common/Stopwatch.h>
+#include <base/unaligned.h>
 #include <Common/randomSeed.h>
 #include <Common/Arena.h>
 #include <Common/ArenaWithFreeLists.h>
 #include <Common/MemorySanitizer.h>
 #include <Common/HashTable/HashMap.h>
 #include <IO/AIO.h>
+#include <IO/BufferWithOwnMemory.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <Dictionaries/ICacheDictionaryStorage.h>
 #include <Dictionaries/DictionaryHelpers.h>
@@ -824,8 +824,8 @@ template <DictionaryKeyType dictionary_key_type>
 class SSDCacheDictionaryStorage final : public ICacheDictionaryStorage
 {
 public:
-    using SSDCacheKeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, SSDCacheSimpleKey, SSDCacheComplexKey>;
-    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::simple, UInt64, StringRef>;
+    using SSDCacheKeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, SSDCacheSimpleKey, SSDCacheComplexKey>;
+    using KeyType = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, UInt64, StringRef>;
 
     explicit SSDCacheDictionaryStorage(const SSDCacheDictionaryStorageConfiguration & configuration_)
         : configuration(configuration_)
@@ -839,19 +839,19 @@ public:
 
     String getName() const override
     {
-        if (dictionary_key_type == DictionaryKeyType::simple)
+        if (dictionary_key_type == DictionaryKeyType::Simple)
             return "SSDCache";
         else
             return "SSDComplexKeyCache";
     }
 
-    bool supportsSimpleKeys() const override { return dictionary_key_type == DictionaryKeyType::simple; }
+    bool supportsSimpleKeys() const override { return dictionary_key_type == DictionaryKeyType::Simple; }
 
     SimpleKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<UInt64> & keys,
         const DictionaryStorageFetchRequest & fetch_request) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
@@ -859,7 +859,7 @@ public:
 
     void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             insertColumnsForKeysImpl(keys, columns);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
@@ -867,7 +867,7 @@ public:
 
     void insertDefaultKeys(const PaddedPODArray<UInt64> & keys) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             insertDefaultKeysImpl(keys);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for complex key storage");
@@ -875,19 +875,19 @@ public:
 
     PaddedPODArray<UInt64> getCachedSimpleKeys() const override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
             return getCachedKeysImpl();
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for complex key storage");
     }
 
-    bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::complex; }
+    bool supportsComplexKeys() const override { return dictionary_key_type == DictionaryKeyType::Complex; }
 
     ComplexKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<StringRef> & keys,
         const DictionaryStorageFetchRequest & fetch_request) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, fetch_request);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
@@ -895,7 +895,7 @@ public:
 
     void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             insertColumnsForKeysImpl(keys, columns);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for simple key storage");
@@ -903,7 +903,7 @@ public:
 
     void insertDefaultKeys(const PaddedPODArray<StringRef> & keys) override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             insertDefaultKeysImpl(keys);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertDefaultKeysImpl is not supported for simple key storage");
@@ -911,7 +911,7 @@ public:
 
     PaddedPODArray<StringRef> getCachedComplexKeys() const override
     {
-        if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+        if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             return getCachedKeysImpl();
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getCachedSimpleKeys is not supported for simple key storage");
@@ -1135,7 +1135,7 @@ private:
             Cell cell;
             setCellDeadline(cell, now);
 
-            if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             {
                 /// Copy complex key into arena and put in cache
                 size_t key_size = key.size;
@@ -1167,7 +1167,7 @@ private:
             cell.state = Cell::default_value;
 
 
-            if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+            if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
             {
                 /// Copy complex key into arena and put in cache
                 size_t key_size = key.size;
@@ -1383,7 +1383,7 @@ private:
     using ComplexKeyHashMap = HashMapWithSavedHash<StringRef, Cell>;
 
     using CacheMap = std::conditional_t<
-        dictionary_key_type == DictionaryKeyType::simple,
+        dictionary_key_type == DictionaryKeyType::Simple,
         SimpleKeyHashMap,
         ComplexKeyHashMap>;
 
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 51984e9103a..ba993ec5783 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -1,23 +1,23 @@
 #include "XDBCDictionarySource.h"
 
 #include <Columns/ColumnString.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <DataTypes/DataTypeString.h>
-#include <Formats/FormatFactory.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/Context.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/LocalDateTime.h>
-#include <common/logger_useful.h>
+#include <base/LocalDateTime.h>
+#include <base/logger_useful.h>
 #include "DictionarySourceFactory.h"
 #include "DictionaryStructure.h"
 #include "readInvalidateQuery.h"
 #include "registerDictionaries.h"
 #include <Common/escapeForFileName.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Formats/IInputFormat.h>
 
 
 namespace DB
@@ -30,67 +30,30 @@ namespace ErrorCodes
 
 namespace
 {
-    class XDBCBridgeBlockInputStream : public IBlockInputStream
-    {
-    public:
-        XDBCBridgeBlockInputStream(
-            const Poco::URI & uri,
-            std::function<void(std::ostream &)> callback,
-            const Block & sample_block,
-            ContextPtr context,
-            UInt64 max_block_size,
-            const ConnectionTimeouts & timeouts,
-            const String name_)
-            : name(name_)
-        {
-            read_buf = std::make_unique<ReadWriteBufferFromHTTP>(uri, Poco::Net::HTTPRequest::HTTP_POST, callback, timeouts);
-            auto format = FormatFactory::instance().getInput(IXDBCBridgeHelper::DEFAULT_FORMAT, *read_buf, sample_block, context, max_block_size);
-            reader = std::make_shared<InputStreamFromInputFormat>(format);
-        }
-
-        Block getHeader() const override { return reader->getHeader(); }
-
-        String getName() const override { return name; }
-
-    private:
-        Block readImpl() override { return reader->read(); }
-
-        String name;
-        std::unique_ptr<ReadWriteBufferFromHTTP> read_buf;
-        BlockInputStreamPtr reader;
-    };
-
-
     ExternalQueryBuilder makeExternalQueryBuilder(const DictionaryStructure & dict_struct_,
                                                   const std::string & db_,
                                                   const std::string & schema_,
                                                   const std::string & table_,
+                                                  const std::string & query_,
                                                   const std::string & where_,
                                                   IXDBCBridgeHelper & bridge_)
     {
-        std::string schema = schema_;
-        std::string table = table_;
+        QualifiedTableName qualified_name{schema_, table_};
 
         if (bridge_.isSchemaAllowed())
         {
-            if (schema.empty())
-            {
-                if (auto pos = table.find('.'); pos != std::string::npos)
-                {
-                    schema = table.substr(0, pos);
-                    table = table.substr(pos + 1);
-                }
-            }
+            if (qualified_name.database.empty())
+                qualified_name = QualifiedTableName::parseFromString(qualified_name.table);
         }
         else
         {
-            if (!schema.empty())
+            if (!qualified_name.database.empty())
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Dictionary source of type {} specifies a schema but schema is not supported by {}-driver",
                     bridge_.getName());
         }
 
-        return {dict_struct_, db_, schema, table, where_, bridge_.getIdentifierQuotingStyle()};
+        return {dict_struct_, db_, qualified_name.database, qualified_name.table, query_, where_, bridge_.getIdentifierQuotingStyle()};
     }
 }
 
@@ -109,7 +72,7 @@ XDBCDictionarySource::XDBCDictionarySource(
     , dict_struct(dict_struct_)
     , configuration(configuration_)
     , sample_block(sample_block_)
-    , query_builder(makeExternalQueryBuilder(dict_struct, configuration.db, configuration.schema, configuration.table, configuration.where, *bridge_))
+    , query_builder(makeExternalQueryBuilder(dict_struct, configuration.db, configuration.schema, configuration.table, configuration.query, configuration.where, *bridge_))
     , load_all_query(query_builder.composeLoadAllQuery())
     , bridge_helper(bridge_)
     , bridge_url(bridge_helper->getMainURI())
@@ -150,19 +113,19 @@ std::string XDBCDictionarySource::getUpdateFieldAndDate()
     else
     {
         update_time = std::chrono::system_clock::now();
-        return query_builder.composeLoadAllQuery();
+        return load_all_query;
     }
 }
 
 
-BlockInputStreamPtr XDBCDictionarySource::loadAll()
+Pipe XDBCDictionarySource::loadAll()
 {
     LOG_TRACE(log, load_all_query);
     return loadFromQuery(bridge_url, sample_block, load_all_query);
 }
 
 
-BlockInputStreamPtr XDBCDictionarySource::loadUpdatedAll()
+Pipe XDBCDictionarySource::loadUpdatedAll()
 {
     std::string load_query_update = getUpdateFieldAndDate();
 
@@ -171,14 +134,14 @@ BlockInputStreamPtr XDBCDictionarySource::loadUpdatedAll()
 }
 
 
-BlockInputStreamPtr XDBCDictionarySource::loadIds(const std::vector<UInt64> & ids)
+Pipe XDBCDictionarySource::loadIds(const std::vector<UInt64> & ids)
 {
     const auto query = query_builder.composeLoadIdsQuery(ids);
     return loadFromQuery(bridge_url, sample_block, query);
 }
 
 
-BlockInputStreamPtr XDBCDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
+Pipe XDBCDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
 {
     const auto query = query_builder.composeLoadKeysQuery(key_columns, requested_rows, ExternalQueryBuilder::AND_OR_CHAIN);
     return loadFromQuery(bridge_url, sample_block, query);
@@ -236,11 +199,11 @@ std::string XDBCDictionarySource::doInvalidateQuery(const std::string & request)
     for (const auto & [name, value] : url_params)
         invalidate_url.addQueryParameter(name, value);
 
-    return readInvalidateQuery(*loadFromQuery(invalidate_url, invalidate_sample_block, request));
+    return readInvalidateQuery(QueryPipeline(loadFromQuery(invalidate_url, invalidate_sample_block, request)));
 }
 
 
-BlockInputStreamPtr XDBCDictionarySource::loadFromQuery(const Poco::URI & url, const Block & required_sample_block, const std::string & query) const
+Pipe XDBCDictionarySource::loadFromQuery(const Poco::URI & url, const Block & required_sample_block, const std::string & query) const
 {
     bridge_helper->startBridgeSync();
 
@@ -251,16 +214,12 @@ BlockInputStreamPtr XDBCDictionarySource::loadFromQuery(const Poco::URI & url, c
         os << "query=" << escapeForFileName(query);
     };
 
-    return std::make_shared<XDBCBridgeBlockInputStream>(
-        url,
-        write_body_callback,
-        required_sample_block,
-        getContext(),
-        max_block_size,
-        timeouts,
-        bridge_helper->getName() + "BlockInputStream");
-}
+    auto read_buf = std::make_unique<ReadWriteBufferFromHTTP>(url, Poco::Net::HTTPRequest::HTTP_POST, write_body_callback, timeouts);
+    auto format = getContext()->getInputFormat(IXDBCBridgeHelper::DEFAULT_FORMAT, *read_buf, required_sample_block, max_block_size);
+    format->addBuffer(std::move(read_buf));
 
+    return Pipe(std::move(format));
+}
 
 void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
 {
@@ -268,12 +227,12 @@ void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
                                    const Poco::Util::AbstractConfiguration & config,
                                    const std::string & config_prefix,
                                    Block & sample_block,
-                                   ContextPtr context,
+                                   ContextPtr global_context,
                                    const std::string & /* default_database */,
                                    bool /* check_config */) -> DictionarySourcePtr {
 #if USE_ODBC
         BridgeHelperPtr bridge = std::make_shared<XDBCBridgeHelper<ODBCBridgeMixin>>(
-            context, context->getSettings().http_receive_timeout, config.getString(config_prefix + ".odbc.connection_string"));
+            global_context, global_context->getSettings().http_receive_timeout, config.getString(config_prefix + ".odbc.connection_string"));
 
         std::string settings_config_prefix = config_prefix + ".odbc";
 
@@ -281,20 +240,21 @@ void registerDictionarySourceXDBC(DictionarySourceFactory & factory)
         {
             .db = config.getString(settings_config_prefix + ".db", ""),
             .schema = config.getString(settings_config_prefix + ".schema", ""),
-            .table = config.getString(settings_config_prefix + ".table"),
+            .table = config.getString(settings_config_prefix + ".table", ""),
+            .query = config.getString(settings_config_prefix + ".query", ""),
             .where = config.getString(settings_config_prefix + ".where", ""),
             .invalidate_query = config.getString(settings_config_prefix + ".invalidate_query", ""),
             .update_field = config.getString(settings_config_prefix + ".update_field", ""),
             .update_lag = config.getUInt64(settings_config_prefix + ".update_lag", 1)
         };
 
-        return std::make_unique<XDBCDictionarySource>(dict_struct, configuration, sample_block, context, bridge);
+        return std::make_unique<XDBCDictionarySource>(dict_struct, configuration, sample_block, global_context, bridge);
 #else
         (void)dict_struct;
         (void)config;
         (void)config_prefix;
         (void)sample_block;
-        (void)context;
+        (void)global_context;
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
             "Dictionary source of type `odbc` is disabled because poco library was built without ODBC support.");
 #endif
@@ -309,7 +269,7 @@ void registerDictionarySourceJDBC(DictionarySourceFactory & factory)
                                  const Poco::Util::AbstractConfiguration & /* config */,
                                  const std::string & /* config_prefix */,
                                  Block & /* sample_block */,
-                                 ContextPtr /* context */,
+                                 ContextPtr /* global_context */,
                                  const std::string & /* default_database */,
                                  bool /* created_from_ddl */) -> DictionarySourcePtr {
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
diff --git a/src/Dictionaries/XDBCDictionarySource.h b/src/Dictionaries/XDBCDictionarySource.h
index ab68ab05804..df31e8a87cf 100644
--- a/src/Dictionaries/XDBCDictionarySource.h
+++ b/src/Dictionaries/XDBCDictionarySource.h
@@ -32,6 +32,7 @@ public:
         const std::string db;
         const std::string schema;
         const std::string table;
+        const std::string query;
         const std::string where;
         const std::string invalidate_query;
         const std::string update_field;
@@ -49,13 +50,13 @@ public:
     XDBCDictionarySource(const XDBCDictionarySource & other);
     XDBCDictionarySource & operator=(const XDBCDictionarySource &) = delete;
 
-    BlockInputStreamPtr loadAll() override;
+    Pipe loadAll() override;
 
-    BlockInputStreamPtr loadUpdatedAll() override;
+    Pipe loadUpdatedAll() override;
 
-    BlockInputStreamPtr loadIds(const std::vector<UInt64> & ids) override;
+    Pipe loadIds(const std::vector<UInt64> & ids) override;
 
-    BlockInputStreamPtr loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
+    Pipe loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows) override;
 
     bool isModified() const override;
 
@@ -73,7 +74,7 @@ private:
     // execute invalidate_query. expects single cell in result
     std::string doInvalidateQuery(const std::string & request) const;
 
-    BlockInputStreamPtr loadFromQuery(const Poco::URI & url, const Block & required_sample_block, const std::string & query) const;
+    Pipe loadFromQuery(const Poco::URI & url, const Block & required_sample_block, const std::string & query) const;
 
     Poco::Logger * log;
 
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
index ba81b1f1364..0c6944eeccc 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.cpp
@@ -4,7 +4,6 @@
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/Element.h>
 #include <Poco/DOM/Text.h>
-#include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/queryToString.h>
@@ -16,6 +15,8 @@
 #include <Parsers/ASTDictionaryAttributeDeclaration.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionFactory.h>
+#include <Common/isLocalAddress.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -27,12 +28,14 @@ namespace ErrorCodes
     extern const int INCORRECT_DICTIONARY_DEFINITION;
 }
 
+
 /// There are a lot of code, but it's very simple and straightforward
-/// We just convert
+/// We just perform conversion.
 namespace
 {
 
 using NamesToTypeNames = std::unordered_map<std::string, std::string>;
+
 /// Get value from field and convert it to string.
 /// Also remove quotes from strings.
 String getFieldAsString(const Field & field)
@@ -45,8 +48,8 @@ String getFieldAsString(const Field & field)
 
 using namespace Poco;
 using namespace Poco::XML;
-/*
- * Transforms next definition
+
+/* Transforms next definition
  *  LIFETIME(MIN 10, MAX 100)
  * to the next configuration
  *  <lifetime>
@@ -75,8 +78,7 @@ void buildLifetimeConfiguration(
     }
 }
 
-/*
- * Transforms next definition
+/* Transforms next definition
  *  LAYOUT(FLAT())
  * to the next configuration
  *  <layout>
@@ -103,6 +105,7 @@ void buildLayoutConfiguration(
     layout_element->appendChild(layout_type_element);
 
     if (layout->parameters)
+    {
         for (const auto & param : layout->parameters->children)
         {
             const ASTPair * pair = param->as<ASTPair>();
@@ -135,10 +138,11 @@ void buildLayoutConfiguration(
             layout_type_parameter_element->appendChild(value_to_append);
             layout_type_element->appendChild(layout_type_parameter_element);
         }
+    }
 }
 
-/*
- * Transforms next definition
+
+/* Transforms next definition
  *  RANGE(MIN StartDate, MAX EndDate)
  * to the next configuration
  *  <range_min><name>StartDate</name></range_min>
@@ -181,9 +185,9 @@ Names getPrimaryKeyColumns(const ASTExpressionList * primary_key)
     Names result;
     const auto & children = primary_key->children;
 
-    for (size_t index = 0; index != children.size(); ++index)
+    for (const auto & child : children)
     {
-        const ASTIdentifier * key_part = children[index]->as<const ASTIdentifier>();
+        const ASTIdentifier * key_part = child->as<const ASTIdentifier>();
         result.push_back(key_part->name());
     }
     return result;
@@ -215,8 +219,7 @@ void buildAttributeExpressionIfNeeded(
     }
 }
 
-/**
-  * Transofrms single dictionary attribute to configuration
+/** Transofrms single dictionary attribute to configuration
   *  third_column UInt8 DEFAULT 2 EXPRESSION rand() % 100 * 77
   * to
   *  <attribute>
@@ -280,8 +283,7 @@ void buildSingleAttribute(
 }
 
 
-/**
-  * Transforms
+/** Transforms
   *   PRIMARY KEY Attr1 ,..., AttrN
   * to the next configuration
   *  <id><name>Attr1</name></id>
@@ -368,8 +370,7 @@ void buildPrimaryKeyConfiguration(
 }
 
 
-/**
-  * Transforms list of ASTDictionaryAttributeDeclarations to list of dictionary attributes
+/** Transforms list of ASTDictionaryAttributeDeclarations to list of dictionary attributes
   */
 NamesToTypeNames buildDictionaryAttributesConfiguration(
     AutoPtr<Document> doc,
@@ -402,9 +403,9 @@ void buildConfigurationFromFunctionWithKeyValueArguments(
     ContextPtr context)
 {
     const auto & children = ast_expr_list->children;
-    for (size_t i = 0; i != children.size(); ++i)
+    for (const auto & child : children)
     {
-        const ASTPair * pair = children[i]->as<const ASTPair>();
+        const ASTPair * pair = child->as<const ASTPair>();
         AutoPtr<Element> current_xml_element(doc->createElement(pair->first));
         root->appendChild(current_xml_element);
 
@@ -496,9 +497,6 @@ void checkAST(const ASTCreateQuery & query)
     if (!query.is_dictionary || query.dictionary == nullptr)
         throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot convert dictionary to configuration from non-dictionary AST.");
 
-    if (query.dictionary_attributes_list == nullptr || query.dictionary_attributes_list->children.empty())
-        throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty attributes list");
-
     if (query.dictionary->layout == nullptr)
         throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty layout");
 
@@ -512,8 +510,6 @@ void checkAST(const ASTCreateQuery & query)
 
     if (query.dictionary->source == nullptr)
         throw Exception(ErrorCodes::INCORRECT_DICTIONARY_DEFINITION, "Cannot create dictionary with empty source");
-
-    /// Range can be empty
 }
 
 void checkPrimaryKey(const NamesToTypeNames & all_attrs, const Names & key_attrs)
@@ -577,8 +573,41 @@ getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr conte
     if (query.dictionary->range)
         buildRangeConfiguration(xml_document, structure_element, query.dictionary->range, all_attr_names_and_types);
 
+    if (query.comment)
+    {
+        AutoPtr<Element> comment_element(xml_document->createElement("comment"));
+        current_dictionary->appendChild(comment_element);
+        AutoPtr<Text> comment_value(xml_document->createTextNode(query.comment->as<ASTLiteral>()->value.safeGet<String>()));
+
+        comment_element->appendChild(comment_value);
+    }
+
     conf->load(xml_document);
     return conf;
 }
 
+std::optional<ClickHouseDictionarySourceInfo>
+getInfoIfClickHouseDictionarySource(DictionaryConfigurationPtr & config, ContextPtr global_context)
+{
+    ClickHouseDictionarySourceInfo info;
+
+    String host = config->getString("dictionary.source.clickhouse.host", "");
+    UInt16 port = config->getUInt("dictionary.source.clickhouse.port", 0);
+    String database = config->getString("dictionary.source.clickhouse.db", "");
+    String table = config->getString("dictionary.source.clickhouse.table", "");
+    bool secure = config->getBool("dictionary.source.clickhouse.secure", false);
+
+    if (host.empty() || port == 0 || table.empty())
+        return {};
+
+    info.table_name = {database, table};
+
+    UInt16 default_port = secure ? global_context->getTCPPortSecure().value_or(0) : global_context->getTCPPort();
+    if (!isLocalAddress({host, port}, default_port))
+        return info;
+
+    info.is_local = true;
+    return info;
+}
+
 }
diff --git a/src/Dictionaries/getDictionaryConfigurationFromAST.h b/src/Dictionaries/getDictionaryConfigurationFromAST.h
index de8659e4d7b..ec44b9815ff 100644
--- a/src/Dictionaries/getDictionaryConfigurationFromAST.h
+++ b/src/Dictionaries/getDictionaryConfigurationFromAST.h
@@ -6,6 +6,7 @@
 
 namespace DB
 {
+
 using DictionaryConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
 
 /// Convert dictionary AST to Poco::AbstractConfiguration
@@ -13,4 +14,14 @@ using DictionaryConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfigurati
 /// Can throw exception if query is ill-formed
 DictionaryConfigurationPtr
 getDictionaryConfigurationFromAST(const ASTCreateQuery & query, ContextPtr context, const std::string & database_ = "");
+
+struct ClickHouseDictionarySourceInfo
+{
+    QualifiedTableName table_name;
+    bool is_local = false;
+};
+
+std::optional<ClickHouseDictionarySourceInfo>
+getInfoIfClickHouseDictionarySource(DictionaryConfigurationPtr & config, ContextPtr global_context);
+
 }
diff --git a/src/Dictionaries/readInvalidateQuery.cpp b/src/Dictionaries/readInvalidateQuery.cpp
index 4664b61bfc4..370e1457832 100644
--- a/src/Dictionaries/readInvalidateQuery.cpp
+++ b/src/Dictionaries/readInvalidateQuery.cpp
@@ -1,5 +1,6 @@
 #include "readInvalidateQuery.h"
-#include <DataStreams/IBlockInputStream.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 #include <IO/WriteBufferFromString.h>
 #include <Formats/FormatSettings.h>
 
@@ -14,11 +15,15 @@ namespace ErrorCodes
     extern const int RECEIVED_EMPTY_DATA;
 }
 
-std::string readInvalidateQuery(IBlockInputStream & block_input_stream)
+std::string readInvalidateQuery(QueryPipeline pipeline)
 {
-    block_input_stream.readPrefix();
+    PullingPipelineExecutor executor(pipeline);
+
+    Block block;
+    while (executor.pull(block))
+        if (block)
+            break;
 
-    Block block = block_input_stream.read();
     if (!block)
         throw Exception(ErrorCodes::RECEIVED_EMPTY_DATA, "Empty response");
 
@@ -36,11 +41,10 @@ std::string readInvalidateQuery(IBlockInputStream & block_input_stream)
     auto & column_type = block.getByPosition(0);
     column_type.type->getDefaultSerialization()->serializeTextQuoted(*column_type.column->convertToFullColumnIfConst(), 0, out, FormatSettings());
 
-    while ((block = block_input_stream.read()))
+    while (executor.pull(block))
         if (block.rows() > 0)
             throw Exception(ErrorCodes::TOO_MANY_ROWS, "Expected single row in resultset, got at least {}", std::to_string(rows + 1));
 
-    block_input_stream.readSuffix();
     return out.str();
 }
 
diff --git a/src/Dictionaries/readInvalidateQuery.h b/src/Dictionaries/readInvalidateQuery.h
index 0a259e1ec24..52cd9f54b2b 100644
--- a/src/Dictionaries/readInvalidateQuery.h
+++ b/src/Dictionaries/readInvalidateQuery.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DataStreams/IBlockStream_fwd.h>
-
 #include <string>
 
 namespace DB
 {
 
+class QueryPipeline;
+
 /// Using in MySQLDictionarySource and XDBCDictionarySource after processing invalidate_query.
-std::string readInvalidateQuery(IBlockInputStream & block_input_stream);
+std::string readInvalidateQuery(QueryPipeline pipeline);
 
 }
diff --git a/src/Dictionaries/registerCacheDictionaries.cpp b/src/Dictionaries/registerCacheDictionaries.cpp
index d039c5b6630..88e01a31402 100644
--- a/src/Dictionaries/registerCacheDictionaries.cpp
+++ b/src/Dictionaries/registerCacheDictionaries.cpp
@@ -154,27 +154,26 @@ DictionaryPtr createCacheDictionaryLayout(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_prefix,
     DictionarySourcePtr source_ptr,
-    ContextPtr context [[maybe_unused]],
+    ContextPtr global_context [[maybe_unused]],
     bool created_from_ddl [[maybe_unused]])
 {
-    static_assert(dictionary_key_type != DictionaryKeyType::range, "Range key type is not supported by CacheDictionary");
-
     String layout_type;
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple && !ssd)
+
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple && !ssd)
         layout_type = "cache";
-    else if constexpr (dictionary_key_type == DictionaryKeyType::simple && ssd)
+    else if constexpr (dictionary_key_type == DictionaryKeyType::Simple && ssd)
         layout_type = "ssd_cache";
-    else if constexpr (dictionary_key_type == DictionaryKeyType::complex && !ssd)
+    else if constexpr (dictionary_key_type == DictionaryKeyType::Complex && !ssd)
         layout_type = "complex_key_cache";
-    else if constexpr (dictionary_key_type == DictionaryKeyType::complex && ssd)
+    else if constexpr (dictionary_key_type == DictionaryKeyType::Complex && ssd)
         layout_type = "complex_key_ssd_cache";
 
-    if constexpr (dictionary_key_type == DictionaryKeyType::simple)
+    if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
     {
         if (dict_struct.key)
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "{}: dictionary of layout '{}' 'key' is not supported", full_name, layout_type);
     }
-    else if constexpr (dictionary_key_type == DictionaryKeyType::complex)
+    else if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
     {
         if (dict_struct.id)
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "{}: dictionary of layout '{}' 'id' is not supported", full_name, layout_type);
@@ -214,8 +213,9 @@ DictionaryPtr createCacheDictionaryLayout(
     else
     {
         auto storage_configuration = parseSSDCacheStorageConfiguration(config, full_name, layout_type, dictionary_layout_prefix, dict_lifetime);
-        if (created_from_ddl && !pathStartsWith(storage_configuration.file_path, context->getUserFilesPath()))
-            throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", storage_configuration.file_path, context->getUserFilesPath());
+        auto user_files_path = global_context->getUserFilesPath();
+        if (created_from_ddl && !pathStartsWith(storage_configuration.file_path, user_files_path))
+            throw Exception(ErrorCodes::PATH_ACCESS_DENIED, "File path {} is not inside {}", storage_configuration.file_path, user_files_path);
 
         storage = std::make_shared<SSDCacheDictionaryStorage<dictionary_key_type>>(storage_configuration);
     }
@@ -240,10 +240,10 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                           const Poco::Util::AbstractConfiguration & config,
                                           const std::string & config_prefix,
                                           DictionarySourcePtr source_ptr,
-                                          ContextPtr context,
+                                          ContextPtr global_context,
                                           bool created_from_ddl) -> DictionaryPtr
     {
-        return createCacheDictionaryLayout<DictionaryKeyType::simple, false/* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), std::move(context), created_from_ddl);
+        return createCacheDictionaryLayout<DictionaryKeyType::Simple, false/* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
     };
 
     factory.registerLayout("cache", create_simple_cache_layout, false);
@@ -253,10 +253,10 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                                const Poco::Util::AbstractConfiguration & config,
                                                const std::string & config_prefix,
                                                DictionarySourcePtr source_ptr,
-                                               ContextPtr context,
+                                               ContextPtr global_context,
                                                bool created_from_ddl) -> DictionaryPtr
     {
-        return createCacheDictionaryLayout<DictionaryKeyType::complex, false /* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), std::move(context), created_from_ddl);
+        return createCacheDictionaryLayout<DictionaryKeyType::Complex, false /* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
     };
 
     factory.registerLayout("complex_key_cache", create_complex_key_cache_layout, true);
@@ -268,10 +268,10 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                               const Poco::Util::AbstractConfiguration & config,
                                               const std::string & config_prefix,
                                               DictionarySourcePtr source_ptr,
-                                              ContextPtr context,
+                                              ContextPtr global_context,
                                               bool created_from_ddl) -> DictionaryPtr
     {
-        return createCacheDictionaryLayout<DictionaryKeyType::simple, true /* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), std::move(context), created_from_ddl);
+        return createCacheDictionaryLayout<DictionaryKeyType::Simple, true /* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
     };
 
     factory.registerLayout("ssd_cache", create_simple_ssd_cache_layout, false);
@@ -281,9 +281,9 @@ void registerDictionaryCache(DictionaryFactory & factory)
                                                    const Poco::Util::AbstractConfiguration & config,
                                                    const std::string & config_prefix,
                                                    DictionarySourcePtr source_ptr,
-                                                   ContextPtr context,
+                                                   ContextPtr global_context,
                                                    bool created_from_ddl) -> DictionaryPtr {
-        return createCacheDictionaryLayout<DictionaryKeyType::complex, true /* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), std::move(context), created_from_ddl);
+        return createCacheDictionaryLayout<DictionaryKeyType::Complex, true /* ssd */>(full_name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
     };
 
     factory.registerLayout("complex_key_ssd_cache", create_complex_key_ssd_cache_layout, true);
diff --git a/src/Dictionaries/registerDictionaries.cpp b/src/Dictionaries/registerDictionaries.cpp
index 8d24a6ea979..4ade5d88bd4 100644
--- a/src/Dictionaries/registerDictionaries.cpp
+++ b/src/Dictionaries/registerDictionaries.cpp
@@ -14,9 +14,7 @@ void registerDictionarySourceCassandra(DictionarySourceFactory & source_factory)
 void registerDictionarySourceRedis(DictionarySourceFactory & source_factory);
 void registerDictionarySourceXDBC(DictionarySourceFactory & source_factory);
 void registerDictionarySourceJDBC(DictionarySourceFactory & source_factory);
-#if !defined(ARCADIA_BUILD)
 void registerDictionarySourcePostgreSQL(DictionarySourceFactory & source_factory);
-#endif
 void registerDictionarySourceExecutable(DictionarySourceFactory & source_factory);
 void registerDictionarySourceExecutablePool(DictionarySourceFactory & source_factory);
 void registerDictionarySourceHTTP(DictionarySourceFactory & source_factory);
@@ -28,6 +26,7 @@ void registerDictionaryComplexKeyHashed(DictionaryFactory & factory);
 void registerDictionaryTrie(DictionaryFactory & factory);
 void registerDictionaryFlat(DictionaryFactory & factory);
 void registerDictionaryHashed(DictionaryFactory & factory);
+void registerDictionaryArrayHashed(DictionaryFactory & factory);
 void registerDictionaryCache(DictionaryFactory & factory);
 void registerDictionaryPolygon(DictionaryFactory & factory);
 void registerDictionaryDirect(DictionaryFactory & factory);
@@ -45,9 +44,7 @@ void registerDictionaries()
         registerDictionarySourceCassandra(source_factory);
         registerDictionarySourceXDBC(source_factory);
         registerDictionarySourceJDBC(source_factory);
-#if !defined(ARCADIA_BUILD)
         registerDictionarySourcePostgreSQL(source_factory);
-#endif
         registerDictionarySourceExecutable(source_factory);
         registerDictionarySourceExecutablePool(source_factory);
         registerDictionarySourceHTTP(source_factory);
@@ -60,6 +57,7 @@ void registerDictionaries()
         registerDictionaryTrie(factory);
         registerDictionaryFlat(factory);
         registerDictionaryHashed(factory);
+        registerDictionaryArrayHashed(factory);
         registerDictionaryCache(factory);
         registerDictionaryPolygon(factory);
         registerDictionaryDirect(factory);
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 2b16228b59e..6e97910c6e1 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -8,7 +8,7 @@
 #include <Parsers/parseQuery.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Common/tests/gtest_global_context.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <gtest/gtest.h>
 
@@ -44,7 +44,8 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
                    " SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' PASSWORD '' DB 'test' TABLE 'table_for_dict'))"
                    " LAYOUT(FLAT())"
                    " LIFETIME(MIN 1 MAX 10)"
-                   " RANGE(MIN second_column MAX third_column)";
+                   " RANGE(MIN second_column MAX third_column)"
+                   " COMMENT 'hello world!'";
 
     ParserCreateDictionaryQuery parser;
     ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
@@ -92,6 +93,9 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
 
     /// layout
     EXPECT_TRUE(config->has("dictionary.layout.flat"));
+
+    // comment
+    EXPECT_TRUE(config->has("dictionary.comment"));
 }
 
 
diff --git a/src/Dictionaries/ya.make b/src/Dictionaries/ya.make
deleted file mode 100644
index 36152fe439a..00000000000
--- a/src/Dictionaries/ya.make
+++ /dev/null
@@ -1,71 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Data
-    contrib/libs/poco/MongoDB
-    contrib/libs/poco/Redis
-    contrib/libs/sparsehash
-    contrib/restricted/abseil-cpp
-)
-
-IF (USE_ODBC)
-    PEERDIR(contrib/libs/poco/Data/ODBC)
-ENDIF ()
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-    CacheDictionary.cpp
-    CacheDictionaryUpdateQueue.cpp
-    CassandraBlockInputStream.cpp
-    CassandraDictionarySource.cpp
-    CassandraHelpers.cpp
-    ClickHouseDictionarySource.cpp
-    DictionaryBlockInputStream.cpp
-    DictionaryBlockInputStreamBase.cpp
-    DictionaryFactory.cpp
-    DictionarySourceFactory.cpp
-    DictionarySourceHelpers.cpp
-    DictionaryStructure.cpp
-    DirectDictionary.cpp
-    Embedded/GeoDictionariesLoader.cpp
-    Embedded/GeodataProviders/HierarchiesProvider.cpp
-    Embedded/GeodataProviders/HierarchyFormatReader.cpp
-    Embedded/GeodataProviders/NamesFormatReader.cpp
-    Embedded/GeodataProviders/NamesProvider.cpp
-    Embedded/RegionsHierarchies.cpp
-    Embedded/RegionsHierarchy.cpp
-    Embedded/RegionsNames.cpp
-    ExecutableDictionarySource.cpp
-    ExecutablePoolDictionarySource.cpp
-    ExternalQueryBuilder.cpp
-    FileDictionarySource.cpp
-    FlatDictionary.cpp
-    HTTPDictionarySource.cpp
-    HashedDictionary.cpp
-    HierarchyDictionariesUtils.cpp
-    IPAddressDictionary.cpp
-    LibraryDictionarySource.cpp
-    MongoDBDictionarySource.cpp
-    MySQLDictionarySource.cpp
-    PolygonDictionary.cpp
-    PolygonDictionaryImplementations.cpp
-    PolygonDictionaryUtils.cpp
-    RangeHashedDictionary.cpp
-    RedisBlockInputStream.cpp
-    RedisDictionarySource.cpp
-    XDBCDictionarySource.cpp
-    getDictionaryConfigurationFromAST.cpp
-    readInvalidateQuery.cpp
-    registerCacheDictionaries.cpp
-    registerDictionaries.cpp
-    writeParenthesisedString.cpp
-
-)
-
-END()
diff --git a/src/Dictionaries/ya.make.in b/src/Dictionaries/ya.make.in
deleted file mode 100644
index 051696a18ed..00000000000
--- a/src/Dictionaries/ya.make.in
+++ /dev/null
@@ -1,25 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Data
-    contrib/libs/poco/MongoDB
-    contrib/libs/poco/Redis
-    contrib/libs/sparsehash
-    contrib/restricted/abseil-cpp
-)
-
-IF (USE_ODBC)
-    PEERDIR(contrib/libs/poco/Data/ODBC)
-ENDIF ()
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -P 'tests|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Disks/DiskCacheWrapper.cpp b/src/Disks/DiskCacheWrapper.cpp
index f672376841e..45ec3d2f95b 100644
--- a/src/Disks/DiskCacheWrapper.cpp
+++ b/src/Disks/DiskCacheWrapper.cpp
@@ -88,19 +88,16 @@ std::shared_ptr<FileDownloadMetadata> DiskCacheWrapper::acquireDownloadMetadata(
 std::unique_ptr<ReadBufferFromFileBase>
 DiskCacheWrapper::readFile(
     const String & path,
-    size_t buf_size,
-    size_t estimated_size,
-    size_t direct_io_threshold,
-    size_t mmap_threshold,
-    MMappedFileCache * mmap_cache) const
+    const ReadSettings & settings,
+    std::optional<size_t> size) const
 {
     if (!cache_file_predicate(path))
-        return DiskDecorator::readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
+        return DiskDecorator::readFile(path, settings, size);
 
     LOG_DEBUG(log, "Read file {} from cache", backQuote(path));
 
     if (cache_disk->exists(path))
-        return cache_disk->readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
+        return cache_disk->readFile(path, settings, size);
 
     auto metadata = acquireDownloadMetadata(path);
 
@@ -134,8 +131,8 @@ DiskCacheWrapper::readFile(
 
                 auto tmp_path = path + ".tmp";
                 {
-                    auto src_buffer = DiskDecorator::readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
-                    auto dst_buffer = cache_disk->writeFile(tmp_path, buf_size, WriteMode::Rewrite);
+                    auto src_buffer = DiskDecorator::readFile(path, settings, size);
+                    auto dst_buffer = cache_disk->writeFile(tmp_path, settings.local_fs_buffer_size, WriteMode::Rewrite);
                     copyData(*src_buffer, *dst_buffer);
                 }
                 cache_disk->moveFile(tmp_path, path);
@@ -158,9 +155,9 @@ DiskCacheWrapper::readFile(
     }
 
     if (metadata->status == DOWNLOADED)
-        return cache_disk->readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
+        return cache_disk->readFile(path, settings, size);
 
-    return DiskDecorator::readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
+    return DiskDecorator::readFile(path, settings, size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
@@ -180,7 +177,7 @@ DiskCacheWrapper::writeFile(const String & path, size_t buf_size, WriteMode mode
         [this, path, buf_size, mode]()
         {
             /// Copy file from cache to actual disk when cached buffer is finalized.
-            auto src_buffer = cache_disk->readFile(path, buf_size, 0, 0, 0, nullptr);
+            auto src_buffer = cache_disk->readFile(path, ReadSettings(), /* size= */ {});
             auto dst_buffer = DiskDecorator::writeFile(path, buf_size, mode);
             copyData(*src_buffer, *dst_buffer);
             dst_buffer->finalize();
diff --git a/src/Disks/DiskCacheWrapper.h b/src/Disks/DiskCacheWrapper.h
index 7e711dd521c..8b15a8875be 100644
--- a/src/Disks/DiskCacheWrapper.h
+++ b/src/Disks/DiskCacheWrapper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <unordered_map>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "DiskDecorator.h"
 #include "DiskLocal.h"
 
@@ -36,11 +36,8 @@ public:
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode) override;
 
diff --git a/src/Disks/DiskDecorator.cpp b/src/Disks/DiskDecorator.cpp
index 58059dbe355..263c6c9c0ff 100644
--- a/src/Disks/DiskDecorator.cpp
+++ b/src/Disks/DiskDecorator.cpp
@@ -115,9 +115,9 @@ void DiskDecorator::listFiles(const String & path, std::vector<String> & file_na
 
 std::unique_ptr<ReadBufferFromFileBase>
 DiskDecorator::readFile(
-    const String & path, size_t buf_size, size_t estimated_size, size_t direct_io_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache) const
+    const String & path, const ReadSettings & settings, std::optional<size_t> size) const
 {
-    return delegate->readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
+    return delegate->readFile(path, settings, size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
diff --git a/src/Disks/DiskDecorator.h b/src/Disks/DiskDecorator.h
index 6586675d1de..5b88f4a36fa 100644
--- a/src/Disks/DiskDecorator.h
+++ b/src/Disks/DiskDecorator.h
@@ -37,11 +37,8 @@ public:
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
@@ -64,7 +61,8 @@ public:
     void sync(int fd) const;
     String getUniqueId(const String & path) const override { return delegate->getUniqueId(path); }
     bool checkUniqueId(const String & id) const override { return delegate->checkUniqueId(id); }
-    DiskType::Type getType() const override { return delegate->getType(); }
+    DiskType getType() const override { return delegate->getType(); }
+    bool isRemote() const override { return delegate->isRemote(); }
     bool supportZeroCopyReplication() const override { return delegate->supportZeroCopyReplication(); }
     void onFreeze(const String & path) override;
     SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
diff --git a/src/Disks/DiskEncrypted.cpp b/src/Disks/DiskEncrypted.cpp
index 9980dc0d8dc..de569d82c60 100644
--- a/src/Disks/DiskEncrypted.cpp
+++ b/src/Disks/DiskEncrypted.cpp
@@ -4,6 +4,8 @@
 #include <Disks/DiskFactory.h>
 #include <IO/FileEncryptionCommon.h>
 #include <IO/ReadBufferFromEncryptedFile.h>
+#include <IO/ReadBufferFromFileDecorator.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromEncryptedFile.h>
 #include <boost/algorithm/hex.hpp>
 
@@ -76,6 +78,17 @@ namespace
             if (res->keys.empty())
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "No keys, an encrypted disk needs keys to work");
 
+            if (!config.has(config_prefix + ".current_key_id"))
+            {
+                /// In case of multiple keys, current_key_id is mandatory
+                if (res->keys.size() > 1)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "There are multiple keys in config. current_key_id is required");
+
+                /// If there is only one key with non zero ID, curren_key_id should be defined.
+                if (res->keys.size() == 1 && !res->keys.contains(0))
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Config has one key with non zero id. сurrent_key_id is required");
+            }
+
             res->current_key_id = config.getUInt64(config_prefix + ".current_key_id", 0);
             if (!res->keys.contains(res->current_key_id))
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not found a key with the current ID {}", res->current_key_id);
@@ -238,18 +251,21 @@ void DiskEncrypted::copy(const String & from_path, const std::shared_ptr<IDisk>
 
 std::unique_ptr<ReadBufferFromFileBase> DiskEncrypted::readFile(
     const String & path,
-    size_t buf_size,
-    size_t estimated_size,
-    size_t aio_threshold,
-    size_t mmap_threshold,
-    MMappedFileCache * mmap_cache) const
+    const ReadSettings & settings,
+    std::optional<size_t> size) const
 {
     auto wrapped_path = wrappedPath(path);
-    auto buffer = delegate->readFile(wrapped_path, buf_size, estimated_size, aio_threshold, mmap_threshold, mmap_cache);
-    auto settings = current_settings.get();
+    auto buffer = delegate->readFile(wrapped_path, settings, size);
+    if (buffer->eof())
+    {
+        /// File is empty, that's a normal case, see DiskEncrypted::truncateFile().
+        /// There is no header so we just return `ReadBufferFromString("")`.
+        return std::make_unique<ReadBufferFromFileDecorator>(std::make_unique<ReadBufferFromString>(std::string_view{}), wrapped_path);
+    }
+    auto encryption_settings = current_settings.get();
     FileEncryption::Header header = readHeader(*buffer);
-    String key = getKey(path, header, *settings);
-    return std::make_unique<ReadBufferFromEncryptedFile>(buf_size, std::move(buffer), key, header);
+    String key = getKey(path, header, *encryption_settings);
+    return std::make_unique<ReadBufferFromEncryptedFile>(settings.local_fs_buffer_size, std::move(buffer), key, header);
 }
 
 std::unique_ptr<WriteBufferFromFileBase> DiskEncrypted::writeFile(const String & path, size_t buf_size, WriteMode mode)
@@ -265,7 +281,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskEncrypted::writeFile(const String &
         if (old_file_size)
         {
             /// Append mode: we continue to use the same header.
-            auto read_buffer = delegate->readFile(wrapped_path, FileEncryption::Header::kSize);
+            auto read_buffer = delegate->readFile(wrapped_path, ReadSettings().adjustBufferSize(FileEncryption::Header::kSize));
             header = readHeader(*read_buffer);
             key = getKey(path, header, *settings);
         }
diff --git a/src/Disks/DiskEncrypted.h b/src/Disks/DiskEncrypted.h
index 8217db4141a..5b1bd7c5c6d 100644
--- a/src/Disks/DiskEncrypted.h
+++ b/src/Disks/DiskEncrypted.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_SSL
 #include <Disks/IDisk.h>
@@ -121,11 +119,8 @@ public:
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t aio_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
@@ -215,7 +210,8 @@ public:
 
     void applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String & config_prefix, const DisksMap & map) override;
 
-    DiskType::Type getType() const override { return DiskType::Type::Encrypted; }
+    DiskType getType() const override { return DiskType::Encrypted; }
+    bool isRemote() const override { return delegate->isRemote(); }
 
     SyncGuardPtr getDirectorySyncGuard(const String & path) const override;
 
diff --git a/src/Disks/DiskFactory.h b/src/Disks/DiskFactory.h
index 7fcac8928c8..998ef569ed5 100644
--- a/src/Disks/DiskFactory.h
+++ b/src/Disks/DiskFactory.h
@@ -2,7 +2,7 @@
 
 #include <Disks/IDisk.h>
 #include <Interpreters/Context_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <boost/noncopyable.hpp>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index b4d7f74f10f..2774bb1bfd2 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -259,11 +259,9 @@ void DiskLocal::replaceFile(const String & from_path, const String & to_path)
     fs::rename(from_file, to_file);
 }
 
-std::unique_ptr<ReadBufferFromFileBase>
-DiskLocal::readFile(
-    const String & path, size_t buf_size, size_t estimated_size, size_t direct_io_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache) const
+std::unique_ptr<ReadBufferFromFileBase> DiskLocal::readFile(const String & path, const ReadSettings & settings, std::optional<size_t> size) const
 {
-    return createReadBufferFromFileBase(fs::path(disk_path) / path, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache, buf_size);
+    return createReadBufferFromFileBase(fs::path(disk_path) / path, settings, size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase>
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index 0cf0cf39bbc..37855327578 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
@@ -73,11 +73,8 @@ public:
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
@@ -99,7 +96,8 @@ public:
 
     void truncateFile(const String & path, size_t size) override;
 
-    DiskType::Type getType() const override { return DiskType::Type::Local; }
+    DiskType getType() const override { return DiskType::Local; }
+    bool isRemote() const override { return false; }
 
     bool supportZeroCopyReplication() const override { return false; }
 
diff --git a/src/Disks/DiskMemory.cpp b/src/Disks/DiskMemory.cpp
index 337b9784080..f8e77d0a0b3 100644
--- a/src/Disks/DiskMemory.cpp
+++ b/src/Disks/DiskMemory.cpp
@@ -103,6 +103,8 @@ public:
         /// str() finalizes buffer.
         String value = impl.str();
 
+        std::lock_guard lock(disk->mutex);
+
         auto iter = disk->files.find(path);
 
         if (iter == disk->files.end())
@@ -313,7 +315,7 @@ void DiskMemory::replaceFileImpl(const String & from_path, const String & to_pat
     files.insert(std::move(node));
 }
 
-std::unique_ptr<ReadBufferFromFileBase> DiskMemory::readFile(const String & path, size_t /*buf_size*/, size_t, size_t, size_t, MMappedFileCache *) const
+std::unique_ptr<ReadBufferFromFileBase> DiskMemory::readFile(const String & path, const ReadSettings &, std::optional<size_t>) const
 {
     std::lock_guard lock(mutex);
 
diff --git a/src/Disks/DiskMemory.h b/src/Disks/DiskMemory.h
index d168bc26ff3..d77161d898e 100644
--- a/src/Disks/DiskMemory.h
+++ b/src/Disks/DiskMemory.h
@@ -64,11 +64,8 @@ public:
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
@@ -90,7 +87,8 @@ public:
 
     void truncateFile(const String & path, size_t size) override;
 
-    DiskType::Type getType() const override { return DiskType::Type::RAM; }
+    DiskType getType() const override { return DiskType::RAM; }
+    bool isRemote() const override { return false; }
 
     bool supportZeroCopyReplication() const override { return false; }
 
diff --git a/src/Disks/DiskRestartProxy.cpp b/src/Disks/DiskRestartProxy.cpp
index 1bd5b2acf50..f2b27c2c876 100644
--- a/src/Disks/DiskRestartProxy.cpp
+++ b/src/Disks/DiskRestartProxy.cpp
@@ -20,6 +20,10 @@ public:
     RestartAwareReadBuffer(const DiskRestartProxy & disk, std::unique_ptr<ReadBufferFromFileBase> impl_)
         : ReadBufferFromFileDecorator(std::move(impl_)), lock(disk.mutex) { }
 
+    void prefetch() override { impl->prefetch(); }
+
+    void setReadUntilPosition(size_t position) override { impl->setReadUntilPosition(position); }
+
 private:
     ReadLock lock;
 };
@@ -187,11 +191,10 @@ void DiskRestartProxy::listFiles(const String & path, std::vector<String> & file
 }
 
 std::unique_ptr<ReadBufferFromFileBase> DiskRestartProxy::readFile(
-    const String & path, size_t buf_size, size_t estimated_size, size_t direct_io_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache)
-    const
+    const String & path, const ReadSettings & settings, std::optional<size_t> size) const
 {
     ReadLock lock (mutex);
-    auto impl = DiskDecorator::readFile(path, buf_size, estimated_size, direct_io_threshold, mmap_threshold, mmap_cache);
+    auto impl = DiskDecorator::readFile(path, settings, size);
     return std::make_unique<RestartAwareReadBuffer>(*this, std::move(impl));
 }
 
diff --git a/src/Disks/DiskRestartProxy.h b/src/Disks/DiskRestartProxy.h
index e6c94d9ad7b..e8b5891947a 100644
--- a/src/Disks/DiskRestartProxy.h
+++ b/src/Disks/DiskRestartProxy.h
@@ -2,7 +2,7 @@
 
 #include "DiskDecorator.h"
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <shared_mutex>
 
 namespace DB
@@ -45,11 +45,8 @@ public:
     void listFiles(const String & path, std::vector<String> & file_names) override;
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
     std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode) override;
     void removeFile(const String & path) override;
     void removeFileIfExists(const String & path) override;
diff --git a/src/Disks/DiskSelector.cpp b/src/Disks/DiskSelector.cpp
index bc7810479c5..5c117c1b69d 100644
--- a/src/Disks/DiskSelector.cpp
+++ b/src/Disks/DiskSelector.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteHelpers.h>
 #include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Interpreters/Context.h>
 
 #include <set>
diff --git a/src/Disks/DiskType.h b/src/Disks/DiskType.h
index 5eeeaaeb2e3..42d87b2381f 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -1,37 +1,38 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
 
-struct DiskType
+enum class DiskType
 {
-    enum class Type
-    {
-        Local,
-        RAM,
-        S3,
-        HDFS,
-        Encrypted
-    };
-    static String toString(Type disk_type)
-    {
-        switch (disk_type)
-        {
-            case Type::Local:
-                return "local";
-            case Type::RAM:
-                return "memory";
-            case Type::S3:
-                return "s3";
-            case Type::HDFS:
-                return "hdfs";
-            case Type::Encrypted:
-                return "encrypted";
-        }
-        __builtin_unreachable();
-    }
+    Local,
+    RAM,
+    S3,
+    HDFS,
+    Encrypted,
+    WebServer,
 };
 
+inline String toString(DiskType disk_type)
+{
+    switch (disk_type)
+    {
+        case DiskType::Local:
+            return "local";
+        case DiskType::RAM:
+            return "memory";
+        case DiskType::S3:
+            return "s3";
+        case DiskType::HDFS:
+            return "hdfs";
+        case DiskType::Encrypted:
+            return "encrypted";
+        case DiskType::WebServer:
+            return "web";
+    }
+    __builtin_unreachable();
+}
+
 }
diff --git a/src/Disks/DiskWebServer.cpp b/src/Disks/DiskWebServer.cpp
new file mode 100644
index 00000000000..55ea91c40c9
--- /dev/null
+++ b/src/Disks/DiskWebServer.cpp
@@ -0,0 +1,275 @@
+#include "DiskWebServer.h"
+
+#include <base/logger_useful.h>
+#include <Common/escapeForFileName.h>
+
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/SeekAvoidingReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Disks/IDiskRemote.h>
+#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+
+#include <Storages/MergeTree/MergeTreeData.h>
+
+#include <Poco/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int DIRECTORY_DOESNT_EXIST;
+    extern const int NETWORK_ERROR;
+}
+
+
+void DiskWebServer::initialize(const String & uri_path) const
+{
+    std::vector<String> directories_to_load;
+    LOG_TRACE(log, "Loading metadata for directory: {}", uri_path);
+    try
+    {
+        ReadWriteBufferFromHTTP metadata_buf(Poco::URI(fs::path(uri_path) / ".index"),
+                                            Poco::Net::HTTPRequest::HTTP_GET,
+                                            ReadWriteBufferFromHTTP::OutStreamCallback(),
+                                            ConnectionTimeouts::getHTTPTimeouts(getContext()));
+        String file_name;
+        FileData file_data{};
+
+        String dir_name = fs::path(uri_path.substr(url.size())) / "";
+        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
+
+        while (!metadata_buf.eof())
+        {
+            readText(file_name, metadata_buf);
+            assertChar('\t', metadata_buf);
+
+            bool is_directory;
+            readBoolText(is_directory, metadata_buf);
+            if (!is_directory)
+            {
+                assertChar('\t', metadata_buf);
+                readIntText(file_data.size, metadata_buf);
+            }
+            assertChar('\n', metadata_buf);
+
+            file_data.type = is_directory ? FileType::Directory : FileType::File;
+            String file_path = fs::path(uri_path) / file_name;
+            if (file_data.type == FileType::Directory)
+            {
+                directories_to_load.push_back(file_path);
+                // file_path = fs::path(file_path) / "";
+            }
+
+            file_path = file_path.substr(url.size());
+            files.emplace(std::make_pair(file_path, file_data));
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
+        }
+
+        files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
+    }
+    catch (Exception & e)
+    {
+        e.addMessage("while loading disk metadata");
+        throw;
+    }
+
+    for (const auto & directory_path : directories_to_load)
+        initialize(directory_path);
+}
+
+
+class DiskWebServerDirectoryIterator final : public IDiskDirectoryIterator
+{
+public:
+    explicit DiskWebServerDirectoryIterator(std::vector<fs::path> && dir_file_paths_)
+        : dir_file_paths(std::move(dir_file_paths_)), iter(dir_file_paths.begin()) {}
+
+    void next() override { ++iter; }
+
+    bool isValid() const override { return iter != dir_file_paths.end(); }
+
+    String path() const override { return iter->string(); }
+
+    String name() const override { return iter->filename(); }
+
+private:
+    std::vector<fs::path> dir_file_paths;
+    std::vector<fs::path>::iterator iter;
+};
+
+
+DiskWebServer::DiskWebServer(
+            const String & disk_name_,
+            const String & url_,
+            ContextPtr context_,
+            size_t min_bytes_for_seek_)
+        : WithContext(context_->getGlobalContext())
+        , log(&Poco::Logger::get("DiskWeb"))
+        , url(url_)
+        , name(disk_name_)
+        , min_bytes_for_seek(min_bytes_for_seek_)
+{
+}
+
+
+bool DiskWebServer::exists(const String & path) const
+{
+    LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
+
+    if (files.find(path) != files.end())
+        return true;
+
+    if (path.ends_with(MergeTreeData::FORMAT_VERSION_FILE_NAME) && files.find(fs::path(path).parent_path() / "") == files.end())
+    {
+        try
+        {
+            initialize(fs::path(url) / fs::path(path).parent_path());
+            return files.find(path) != files.end();
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return false;
+        }
+    }
+
+    return false;
+}
+
+
+std::unique_ptr<ReadBufferFromFileBase> DiskWebServer::readFile(const String & path, const ReadSettings & read_settings, std::optional<size_t>) const
+{
+    LOG_TRACE(log, "Read from path: {}", path);
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    auto fs_path = fs::path(url) / path;
+    auto remote_path = fs_path.parent_path() / (escapeForFileName(fs_path.stem()) + fs_path.extension().string());
+    remote_path = remote_path.string().substr(url.size());
+
+    RemoteMetadata meta(path, remote_path);
+    meta.remote_fs_objects.emplace_back(std::make_pair(remote_path, iter->second.size));
+
+    bool threadpool_read = read_settings.remote_fs_method == RemoteFSReadMethod::read_threadpool;
+
+    auto web_impl = std::make_unique<ReadBufferFromWebServerGather>(path, url, meta, getContext(), threadpool_read, read_settings);
+
+    if (threadpool_read)
+    {
+        auto reader = IDiskRemote::getThreadPoolReader();
+        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(web_impl), min_bytes_for_seek);
+    }
+    else
+    {
+        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(web_impl));
+        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), min_bytes_for_seek);
+    }
+}
+
+
+DiskDirectoryIteratorPtr DiskWebServer::iterateDirectory(const String & path)
+{
+    std::vector<fs::path> dir_file_paths;
+    if (files.find(path) == files.end())
+    {
+        try
+        {
+            initialize(fs::path(url) / path);
+        }
+        catch (...)
+        {
+            const auto message = getCurrentExceptionMessage(false);
+            bool can_throw = CurrentThread::isInitialized() && CurrentThread::get().getQueryContext();
+            if (can_throw)
+                throw Exception(ErrorCodes::NETWORK_ERROR, "Cannot load disk metadata. Error: {}", message);
+
+            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Cannot load disk metadata. Error: {}", message);
+            return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+        }
+    }
+
+    if (files.find(path) == files.end())
+        throw Exception("Directory '" + path + "' does not exist", ErrorCodes::DIRECTORY_DOESNT_EXIST);
+
+    for (const auto & file : files)
+        if (parentPath(file.first) == path)
+            dir_file_paths.emplace_back(file.first);
+
+    LOG_TRACE(log, "Iterate directory {} with {} files", path, dir_file_paths.size());
+    return std::make_unique<DiskWebServerDirectoryIterator>(std::move(dir_file_paths));
+}
+
+
+size_t DiskWebServer::getFileSize(const String & path) const
+{
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    return iter->second.size;
+}
+
+
+bool DiskWebServer::isFile(const String & path) const
+{
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    return iter->second.type == FileType::File;
+}
+
+
+bool DiskWebServer::isDirectory(const String & path) const
+{
+    auto iter = files.find(path);
+    if (iter == files.end())
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File path {} does not exist", path);
+
+    return iter->second.type == FileType::Directory;
+}
+
+
+void registerDiskWebServer(DiskFactory & factory)
+{
+    auto creator = [](const String & disk_name,
+                      const Poco::Util::AbstractConfiguration & config,
+                      const String & config_prefix,
+                      ContextPtr context,
+                      const DisksMap & /*map*/) -> DiskPtr
+    {
+        String uri{config.getString(config_prefix + ".endpoint")};
+        if (!uri.ends_with('/'))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
+        try
+        {
+            Poco::URI poco_uri(uri);
+        }
+        catch (const Poco::Exception & e)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
+        }
+
+        return std::make_shared<DiskWebServer>(disk_name, uri, context, config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024));
+    };
+
+    factory.registerDiskType("web", creator);
+}
+
+}
diff --git a/src/Disks/DiskWebServer.h b/src/Disks/DiskWebServer.h
new file mode 100644
index 00000000000..1a193d91adf
--- /dev/null
+++ b/src/Disks/DiskWebServer.h
@@ -0,0 +1,202 @@
+#pragma once
+
+#include <Disks/IDiskRemote.h>
+#include <IO/WriteBufferFromFile.h>
+#include <Core/UUID.h>
+#include <set>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+/*
+ * Quick ready test: ATTACH TABLE test_hits UUID '1ae36516-d62d-4218-9ae3-6516d62da218' ( WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS storage_policy='web';
+ *
+ *   <storage_configuration>
+ *       <disks>
+ *           <web>
+ *               <type>web</type>
+ *               <endpoint>https://clickhouse-datasets.s3.yandex.net/disk-with-static-files-tests/test-hits/</endpoint>
+ *           </web>
+ *       </disks>
+ *       <policies>
+ *           <web>
+ *               <volumes>
+ *                   <main>
+ *                       <disk>web</disk>
+ *                   </main>
+ *               </volumes>
+ *           </web>
+ *       </policies>
+ *   </storage_configuration>
+ *
+ * If query fails with `DB:Exception Unreachable URL` -- may help to adjust settings: http_connection_timeout, http_receive_timeout, keep_alive_timeout.
+ *
+ * To get files for upload run:
+ * clickhouse static-files-disk-uploader --metadata-path <path> --output-dir <dir>
+ * (--metadata-path can be found in query: `select data_paths from system.tables where name='<table_name>';`)
+ *
+ * When loading files by <endpoint> they must be loaded into <endpoint>/store/ path, but config must conrain only <endpoint>.
+ *
+ * If url is not reachable on disk load when server is starting up tables, then all errors are caught.
+ * If in this case there were errors, tables can be reloaded (become visible) via detach table table_name -> attach table table_name.
+ * If metadata was successfully loaded at server startup, then tables are available straight away.
+**/
+class DiskWebServer : public IDisk, WithContext
+{
+
+public:
+    DiskWebServer(const String & disk_name_,
+                  const String & url_,
+                  ContextPtr context,
+                  size_t min_bytes_for_seek_);
+
+    bool supportZeroCopyReplication() const override { return false; }
+
+    DiskType getType() const override { return DiskType::WebServer; }
+
+    bool isRemote() const override { return true; }
+
+    std::unique_ptr<ReadBufferFromFileBase> readFile(const String & path,
+                                                     const ReadSettings & settings,
+                                                     std::optional<size_t> size) const override;
+
+    /// Disk info
+
+    const String & getName() const final override { return name; }
+
+    const String & getPath() const final override { return url; }
+
+    bool isReadOnly() const override { return true; }
+
+    UInt64 getTotalSpace() const final override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getAvailableSpace() const final override { return std::numeric_limits<UInt64>::max(); }
+
+    UInt64 getUnreservedSpace() const final override { return std::numeric_limits<UInt64>::max(); }
+
+    /// Read-only part
+
+    bool exists(const String & path) const override;
+
+    bool isFile(const String & path) const override;
+
+    size_t getFileSize(const String & path) const 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;
+
+    DiskDirectoryIteratorPtr iterateDirectory(const String & /* path */) override;
+
+    Poco::Timestamp getLastModified(const String &) override { return Poco::Timestamp{}; }
+
+    /// Write and modification part
+
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String &, size_t, WriteMode) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void moveFile(const String &, const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void replaceFile(const String &, const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void removeFile(const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void removeFileIfExists(const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    ReservationPtr reserve(UInt64 /*bytes*/) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void removeRecursive(const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void removeSharedFile(const String &, bool) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void removeSharedRecursive(const String &, bool) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void clearDirectory(const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void moveDirectory(const String &, const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void removeDirectory(const String &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    void setLastModified(const String &, const Poco::Timestamp &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Disk {} is read-only", getName());
+    }
+
+    /// Create part
+
+    void createFile(const String &) final override {}
+
+    void createDirectory(const String &) override {}
+
+    void createDirectories(const String &) override {}
+
+    void createHardLink(const String &, const String &) override {}
+
+private:
+    void initialize(const String & uri_path) const;
+
+    enum class FileType
+    {
+        File,
+        Directory
+    };
+
+    struct FileData
+    {
+        FileType type{};
+        size_t size = 0;
+    };
+
+    using Files = std::unordered_map<String, FileData>; /// file path -> file data
+    mutable Files files;
+
+    Poco::Logger * log;
+    String url;
+    String name;
+
+    size_t min_bytes_for_seek;
+};
+
+}
diff --git a/src/Disks/HDFS/DiskHDFS.cpp b/src/Disks/HDFS/DiskHDFS.cpp
index 4eb43eaf7b5..9071ce1d139 100644
--- a/src/Disks/HDFS/DiskHDFS.cpp
+++ b/src/Disks/HDFS/DiskHDFS.cpp
@@ -1,11 +1,16 @@
 #include <Disks/HDFS/DiskHDFS.h>
 
-#include <Storages/HDFS/ReadBufferFromHDFS.h>
-#include <Storages/HDFS/WriteBufferFromHDFS.h>
 #include <IO/SeekAvoidingReadBuffer.h>
-#include <Disks/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/WriteIndirectBufferFromRemoteFS.h>
-#include <common/logger_useful.h>
+#include <Storages/HDFS/WriteBufferFromHDFS.h>
+
+#include <Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/WriteIndirectBufferFromRemoteFS.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+
+#include <base/logger_useful.h>
+#include <base/FnTraits.h>
 
 
 namespace DB
@@ -36,7 +41,7 @@ public:
         chunks.back().push_back(path.data());
     }
 
-    void removePaths(const std::function<void(Chunk &&)> & remove_chunk_func)
+    void removePaths(Fn<void(Chunk &&)> auto && remove_chunk_func)
     {
         for (auto & chunk : chunks)
             remove_chunk_func(std::move(chunk));
@@ -47,37 +52,6 @@ private:
 };
 
 
-/// Reads data from HDFS using stored paths in metadata.
-class ReadIndirectBufferFromHDFS final : public ReadIndirectBufferFromRemoteFS<ReadBufferFromHDFS>
-{
-public:
-    ReadIndirectBufferFromHDFS(
-            const Poco::Util::AbstractConfiguration & config_,
-            const String & hdfs_uri_,
-            DiskHDFS::Metadata metadata_,
-            size_t buf_size_)
-        : ReadIndirectBufferFromRemoteFS<ReadBufferFromHDFS>(metadata_)
-        , config(config_)
-        , buf_size(buf_size_)
-    {
-        const size_t begin_of_path = hdfs_uri_.find('/', hdfs_uri_.find("//") + 2);
-        hdfs_directory = hdfs_uri_.substr(begin_of_path);
-        hdfs_uri = hdfs_uri_.substr(0, begin_of_path);
-    }
-
-    std::unique_ptr<ReadBufferFromHDFS> createReadBuffer(const String & path) override
-    {
-        return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, hdfs_directory + path, config, buf_size);
-    }
-
-private:
-    const Poco::Util::AbstractConfiguration & config;
-    String hdfs_uri;
-    String hdfs_directory;
-    size_t buf_size;
-};
-
-
 DiskHDFS::DiskHDFS(
     const String & disk_name_,
     const String & hdfs_root_path_,
@@ -93,16 +67,26 @@ DiskHDFS::DiskHDFS(
 }
 
 
-std::unique_ptr<ReadBufferFromFileBase> DiskHDFS::readFile(const String & path, size_t buf_size, size_t, size_t, size_t, MMappedFileCache *) const
+std::unique_ptr<ReadBufferFromFileBase> DiskHDFS::readFile(const String & path, const ReadSettings & read_settings, std::optional<size_t>) const
 {
     auto metadata = readMeta(path);
 
-    LOG_DEBUG(log,
+    LOG_TRACE(log,
         "Read from file by path: {}. Existing HDFS objects: {}",
         backQuote(metadata_path + path), metadata.remote_fs_objects.size());
 
-    auto reader = std::make_unique<ReadIndirectBufferFromHDFS>(config, remote_fs_root_path, metadata, buf_size);
-    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), settings->min_bytes_for_seek);
+    auto hdfs_impl = std::make_unique<ReadBufferFromHDFSGather>(path, config, remote_fs_root_path, metadata, read_settings.remote_fs_buffer_size);
+
+    if (read_settings.remote_fs_method == RemoteFSReadMethod::read_threadpool)
+    {
+        auto reader = getThreadPoolReader();
+        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, read_settings, std::move(hdfs_impl));
+    }
+    else
+    {
+        auto buf = std::make_unique<ReadIndirectBufferFromRemoteFS>(std::move(hdfs_impl));
+        return std::make_unique<SeekAvoidingReadBuffer>(std::move(buf), settings->min_bytes_for_seek);
+    }
 }
 
 
@@ -114,7 +98,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskHDFS::writeFile(const String & path
     auto file_name = getRandomName();
     auto hdfs_path = remote_fs_root_path + file_name;
 
-    LOG_DEBUG(log, "{} to file by path: {}. HDFS path: {}", mode == WriteMode::Rewrite ? "Write" : "Append",
+    LOG_TRACE(log, "{} to file by path: {}. HDFS path: {}", mode == WriteMode::Rewrite ? "Write" : "Append",
               backQuote(metadata_path + path), hdfs_path);
 
     /// Single O_WRONLY in libhdfs adds O_TRUNC
diff --git a/src/Disks/HDFS/DiskHDFS.h b/src/Disks/HDFS/DiskHDFS.h
index 068572daa62..5bb947c9f58 100644
--- a/src/Disks/HDFS/DiskHDFS.h
+++ b/src/Disks/HDFS/DiskHDFS.h
@@ -42,17 +42,15 @@ public:
         const String & metadata_path_,
         const Poco::Util::AbstractConfiguration & config_);
 
-    DiskType::Type getType() const override { return DiskType::Type::HDFS; }
+    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,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & path, size_t buf_size, WriteMode mode) override;
 
diff --git a/src/Disks/IDisk.cpp b/src/Disks/IDisk.cpp
index df0f921389f..42d5f5fce10 100644
--- a/src/Disks/IDisk.cpp
+++ b/src/Disks/IDisk.cpp
@@ -4,7 +4,7 @@
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/copyData.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/setThreadName.h>
 
 namespace DB
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 61c805961ae..03ed92e7d5e 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -3,29 +3,39 @@
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/Context.h>
 #include <Core/Defines.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Disks/Executor.h>
 #include <Disks/DiskType.h>
+#include <IO/ReadSettings.h>
 
 #include <memory>
 #include <mutex>
 #include <utility>
 #include <boost/noncopyable.hpp>
-#include "Poco/Util/AbstractConfiguration.h"
 #include <Poco/Timestamp.h>
 #include <filesystem>
 
+
 namespace fs = std::filesystem;
 
+namespace Poco
+{
+    namespace Util
+    {
+        class AbstractConfiguration;
+    }
+}
+
 namespace CurrentMetrics
 {
-extern const Metric DiskSpaceReservedForMerge;
+    extern const Metric DiskSpaceReservedForMerge;
 }
 
 namespace DB
 {
+
 class IDiskDirectoryIterator;
 using DiskDirectoryIteratorPtr = std::unique_ptr<IDiskDirectoryIterator>;
 
@@ -155,11 +165,8 @@ public:
     /// Open the file for read and return ReadBufferFromFileBase object.
     virtual std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        size_t estimated_size = 0,
-        size_t direct_io_threshold = 0,
-        size_t mmap_threshold = 0,
-        MMappedFileCache * mmap_cache = nullptr) const = 0;
+        const ReadSettings & settings = ReadSettings{},
+        std::optional<size_t> size = {}) const = 0;
 
     /// Open the file for write and return WriteBufferFromFileBase object.
     virtual std::unique_ptr<WriteBufferFromFileBase> writeFile(
@@ -210,12 +217,17 @@ public:
     virtual void truncateFile(const String & path, size_t size);
 
     /// Return disk type - "local", "s3", etc.
-    virtual DiskType::Type getType() const = 0;
+    virtual DiskType getType() const = 0;
+
+    /// Involves network interaction.
+    virtual bool isRemote() const = 0;
 
     /// Whether this disk support zero-copy replication.
     /// Overrode in remote fs disks.
     virtual bool supportZeroCopyReplication() const = 0;
 
+    virtual bool isReadOnly() const { return false; }
+
     /// Invoked when Global Context is shutdown.
     virtual void shutdown() {}
 
@@ -238,7 +250,7 @@ public:
     virtual SyncGuardPtr getDirectorySyncGuard(const String & path) const;
 
     /// Applies new settings for disk in runtime.
-    virtual void applyNewSettings(const Poco::Util::AbstractConfiguration &, ContextPtr, const String &, const DisksMap &) { }
+    virtual void applyNewSettings(const Poco::Util::AbstractConfiguration &, ContextPtr, const String &, const DisksMap &) {}
 
 protected:
     friend class DiskDecorator;
diff --git a/src/Disks/IDiskRemote.cpp b/src/Disks/IDiskRemote.cpp
index 398e617196d..cf1baafce6c 100644
--- a/src/Disks/IDiskRemote.cpp
+++ b/src/Disks/IDiskRemote.cpp
@@ -8,10 +8,11 @@
 #include <IO/WriteHelpers.h>
 #include <Common/createHardLink.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/checkStackSize.h>
 #include <boost/algorithm/string.hpp>
 #include <Common/filesystemHelpers.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
 
 
 namespace DB
@@ -33,10 +34,9 @@ IDiskRemote::Metadata::Metadata(
         const String & disk_path_,
         const String & metadata_file_path_,
         bool create)
-    : remote_fs_root_path(remote_fs_root_path_)
+    : RemoteMetadata(remote_fs_root_path_, metadata_file_path_)
     , disk_path(disk_path_)
-    , metadata_file_path(metadata_file_path_)
-    , total_size(0), remote_fs_objects(0), ref_count(0)
+    , total_size(0), ref_count(0)
 {
     if (create)
         return;
@@ -72,10 +72,9 @@ IDiskRemote::Metadata::Metadata(
             readEscapedString(remote_fs_object_path, buf);
             if (version == VERSION_ABSOLUTE_PATHS)
             {
-                if (!boost::algorithm::starts_with(remote_fs_object_path, remote_fs_root_path))
-                    throw Exception(
-                        ErrorCodes::UNKNOWN_FORMAT,
-                        "Path in metadata does not correspond S3 root path. Path: {}, root path: {}, disk path: {}",
+                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, disk_path_);
 
                 remote_fs_object_path = remote_fs_object_path.substr(remote_fs_root_path.size());
@@ -498,4 +497,13 @@ String IDiskRemote::getUniqueId(const String & path) const
     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;
+}
+
 }
diff --git a/src/Disks/IDiskRemote.h b/src/Disks/IDiskRemote.h
index 80b01c3c949..50c8d73c048 100644
--- a/src/Disks/IDiskRemote.h
+++ b/src/Disks/IDiskRemote.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #include <atomic>
-#include "Disks/DiskFactory.h"
-#include "Disks/Executor.h"
+#include <Disks/DiskFactory.h>
+#include <Disks/Executor.h>
 #include <utility>
 #include <Common/MultiVersion.h>
 #include <Common/ThreadPool.h>
@@ -35,6 +33,10 @@ protected:
 using RemoteFSPathKeeperPtr = std::shared_ptr<RemoteFSPathKeeper>;
 
 
+class IAsynchronousReader;
+using AsynchronousReaderPtr = std::shared_ptr<IAsynchronousReader>;
+
+
 /// Base Disk class for remote FS's, which are not posix-compatible (DiskS3 and DiskHDFS)
 class IDiskRemote : public IDisk
 {
@@ -127,6 +129,8 @@ public:
 
     virtual RemoteFSPathKeeperPtr createFSPathKeeper() const = 0;
 
+    static AsynchronousReaderPtr getThreadPoolReader();
+
 protected:
     Poco::Logger * log;
     const String name;
@@ -148,34 +152,42 @@ private:
 
 using RemoteDiskPtr = std::shared_ptr<IDiskRemote>;
 
-/// Remote FS (S3, HDFS) metadata file layout:
-/// Number of FS objects, Total size of all FS objects.
-/// Each FS object represents path where object located in FS and size of object.
 
-struct IDiskRemote::Metadata
+/// Minimum info, required to be passed to ReadIndirectBufferFromRemoteFS<T>
+struct RemoteMetadata
+{
+    using PathAndSize = std::pair<String, size_t>;
+
+    /// Remote FS objects paths and their sizes.
+    std::vector<PathAndSize> remote_fs_objects;
+
+    /// URI
+    const String & remote_fs_root_path;
+
+    /// Relative path to metadata file on local FS.
+    const String metadata_file_path;
+
+    RemoteMetadata(const String & remote_fs_root_path_, const String & metadata_file_path_)
+        : remote_fs_root_path(remote_fs_root_path_), metadata_file_path(metadata_file_path_) {}
+};
+
+/// 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 : RemoteMetadata
 {
     /// 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;
 
-    using PathAndSize = std::pair<String, size_t>;
-
-    /// Remote FS (S3, HDFS) root path.
-    const String & remote_fs_root_path;
-
     /// Disk path.
     const String & disk_path;
 
-    /// Relative path to metadata file on local FS.
-    String metadata_file_path;
-
     /// Total size of all remote FS (S3, HDFS) objects.
     size_t total_size = 0;
 
-    /// Remote FS (S3, HDFS) objects paths and their sizes.
-    std::vector<PathAndSize> remote_fs_objects;
-
     /// Number of references (hardlinks) to this metadata file.
     UInt32 ref_count = 0;
 
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
new file mode 100644
index 00000000000..c283e0ea159
--- /dev/null
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.cpp
@@ -0,0 +1,262 @@
+#include "AsynchronousReadIndirectBufferFromRemoteFS.h"
+
+#include <Common/Stopwatch.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+#include <IO/ReadSettings.h>
+#include <base/logger_useful.h>
+
+
+namespace CurrentMetrics
+{
+    extern const Metric AsynchronousReadWait;
+}
+
+namespace ProfileEvents
+{
+    extern const Event AsynchronousReadWaitMicroseconds;
+    extern const Event RemoteFSSeeks;
+    extern const Event RemoteFSPrefetches;
+    extern const Event RemoteFSCancelledPrefetches;
+    extern const Event RemoteFSUnusedPrefetches;
+    extern const Event RemoteFSPrefetchedReads;
+    extern const Event RemoteFSUnprefetchedReads;
+    extern const Event RemoteFSBuffers;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+}
+
+
+AsynchronousReadIndirectBufferFromRemoteFS::AsynchronousReadIndirectBufferFromRemoteFS(
+        AsynchronousReaderPtr reader_,
+        const ReadSettings & settings_,
+        std::shared_ptr<ReadBufferFromRemoteFSGather> impl_,
+        size_t min_bytes_for_seek_)
+    : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0)
+    , reader(reader_)
+    , priority(settings_.priority)
+    , impl(impl_)
+    , prefetch_buffer(settings_.remote_fs_buffer_size)
+    , min_bytes_for_seek(min_bytes_for_seek_)
+    , must_read_until_position(settings_.must_read_until_position)
+{
+    ProfileEvents::increment(ProfileEvents::RemoteFSBuffers);
+}
+
+
+String AsynchronousReadIndirectBufferFromRemoteFS::getFileName() const
+{
+    return impl->getFileName();
+}
+
+
+bool AsynchronousReadIndirectBufferFromRemoteFS::hasPendingDataToRead()
+{
+    /// Position is set only for MergeTree tables.
+    if (read_until_position)
+    {
+        /// Everything is already read.
+        if (file_offset_of_buffer_end == read_until_position)
+            return false;
+
+        if (file_offset_of_buffer_end > read_until_position)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Read beyond last offset ({} > {})",
+                            file_offset_of_buffer_end, read_until_position);
+    }
+    else if (must_read_until_position)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Reading for MergeTree family tables must be done with last position boundary");
+
+    return true;
+}
+
+
+std::future<IAsynchronousReader::Result> AsynchronousReadIndirectBufferFromRemoteFS::readInto(char * data, size_t size)
+{
+    IAsynchronousReader::Request request;
+    request.descriptor = std::make_shared<ThreadPoolRemoteFSReader::RemoteFSFileDescriptor>(impl);
+    request.buf = data;
+    request.size = size;
+    request.offset = file_offset_of_buffer_end;
+    request.priority = priority;
+
+    if (bytes_to_ignore)
+    {
+        request.ignore = bytes_to_ignore;
+        bytes_to_ignore = 0;
+    }
+    return reader->submit(request);
+}
+
+
+void AsynchronousReadIndirectBufferFromRemoteFS::prefetch()
+{
+    if (prefetch_future.valid())
+        return;
+
+    /// Check boundary, which was set in readUntilPosition().
+    if (!hasPendingDataToRead())
+        return;
+
+    /// Prefetch even in case hasPendingData() == true.
+    prefetch_future = readInto(prefetch_buffer.data(), prefetch_buffer.size());
+    ProfileEvents::increment(ProfileEvents::RemoteFSPrefetches);
+}
+
+
+void AsynchronousReadIndirectBufferFromRemoteFS::setReadUntilPosition(size_t position)
+{
+    if (prefetch_future.valid())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Prefetch is valid in readUntilPosition");
+
+    read_until_position = position;
+    impl->setReadUntilPosition(read_until_position);
+}
+
+
+void AsynchronousReadIndirectBufferFromRemoteFS::setReadUntilEnd()
+{
+    if (prefetch_future.valid())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Prefetch is valid in readUntilEnd");
+
+    read_until_position = impl->getFileSize();
+    impl->setReadUntilPosition(read_until_position);
+}
+
+
+bool AsynchronousReadIndirectBufferFromRemoteFS::nextImpl()
+{
+    if (!hasPendingDataToRead())
+        return false;
+
+    size_t size = 0;
+
+    if (prefetch_future.valid())
+    {
+        ProfileEvents::increment(ProfileEvents::RemoteFSPrefetchedReads);
+
+        CurrentMetrics::Increment metric_increment{CurrentMetrics::AsynchronousReadWait};
+        Stopwatch watch;
+        {
+            size = prefetch_future.get();
+            if (size)
+            {
+                memory.swap(prefetch_buffer);
+                set(memory.data(), memory.size());
+                working_buffer.resize(size);
+                file_offset_of_buffer_end += size;
+            }
+        }
+
+        watch.stop();
+        ProfileEvents::increment(ProfileEvents::AsynchronousReadWaitMicroseconds, watch.elapsedMicroseconds());
+    }
+    else
+    {
+        ProfileEvents::increment(ProfileEvents::RemoteFSUnprefetchedReads);
+        size = readInto(memory.data(), memory.size()).get();
+
+        if (size)
+        {
+            set(memory.data(), memory.size());
+            working_buffer.resize(size);
+            file_offset_of_buffer_end += size;
+        }
+    }
+
+    prefetch_future = {};
+    return size;
+}
+
+
+off_t AsynchronousReadIndirectBufferFromRemoteFS::seek(off_t offset_, int whence)
+{
+    ProfileEvents::increment(ProfileEvents::RemoteFSSeeks);
+
+    if (whence == SEEK_CUR)
+    {
+        /// If position within current working buffer - shift pos.
+        if (!working_buffer.empty() && static_cast<size_t>(getPosition() + offset_) < file_offset_of_buffer_end)
+        {
+            pos += offset_;
+            return getPosition();
+        }
+        else
+        {
+            file_offset_of_buffer_end += offset_;
+        }
+    }
+    else if (whence == SEEK_SET)
+    {
+        /// If position is within current working buffer - shift pos.
+        if (!working_buffer.empty()
+            && static_cast<size_t>(offset_) >= file_offset_of_buffer_end - working_buffer.size()
+            && size_t(offset_) < file_offset_of_buffer_end)
+        {
+            pos = working_buffer.end() - (file_offset_of_buffer_end - offset_);
+
+            assert(pos >= working_buffer.begin());
+            assert(pos <= working_buffer.end());
+
+            return getPosition();
+        }
+        else
+        {
+            file_offset_of_buffer_end = offset_;
+        }
+    }
+    else
+        throw Exception("Only SEEK_SET or SEEK_CUR modes are allowed.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
+
+    if (prefetch_future.valid())
+    {
+        ProfileEvents::increment(ProfileEvents::RemoteFSCancelledPrefetches);
+        prefetch_future.wait();
+        prefetch_future = {};
+    }
+
+    pos = working_buffer.end();
+
+    /// Note: we read in range [file_offset_of_buffer_end, read_until_position).
+    if (file_offset_of_buffer_end < read_until_position
+        && static_cast<off_t>(file_offset_of_buffer_end) >= getPosition()
+        && static_cast<off_t>(file_offset_of_buffer_end) < getPosition() + static_cast<off_t>(min_bytes_for_seek))
+    {
+       /**
+        * Lazy ignore. Save number of bytes to ignore and ignore it either for prefetch buffer or current buffer.
+        */
+        bytes_to_ignore = file_offset_of_buffer_end - getPosition();
+    }
+    else
+    {
+        impl->reset();
+    }
+
+    return file_offset_of_buffer_end;
+}
+
+
+void AsynchronousReadIndirectBufferFromRemoteFS::finalize()
+{
+    if (prefetch_future.valid())
+    {
+        ProfileEvents::increment(ProfileEvents::RemoteFSUnusedPrefetches);
+        prefetch_future.wait();
+        prefetch_future = {};
+    }
+}
+
+
+AsynchronousReadIndirectBufferFromRemoteFS::~AsynchronousReadIndirectBufferFromRemoteFS()
+{
+    finalize();
+}
+
+}
diff --git a/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
new file mode 100644
index 00000000000..d8fad08bc8a
--- /dev/null
+++ b/src/Disks/IO/AsynchronousReadIndirectBufferFromRemoteFS.h
@@ -0,0 +1,84 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#include <IO/ReadBufferFromFile.h>
+#include <IO/AsynchronousReader.h>
+#include <utility>
+
+
+namespace DB
+{
+
+class ReadBufferFromRemoteFSGather;
+struct ReadSettings;
+
+/**
+ * Reads data from S3/HDFS/Web using stored paths in metadata.
+* This class is an asynchronous version of ReadIndirectBufferFromRemoteFS.
+*
+* Buffers chain for diskS3:
+* AsynchronousIndirectReadBufferFromRemoteFS -> ReadBufferFromRemoteFS ->
+* -> ReadBufferFromS3 -> ReadBufferFromIStream.
+*
+* Buffers chain for diskWeb:
+* AsynchronousIndirectReadBufferFromRemoteFS -> ReadBufferFromRemoteFS ->
+* -> ReadIndirectBufferFromWebServer -> ReadBufferFromHttp -> ReadBufferFromIStream.
+*
+* We pass either `memory` or `prefetch_buffer` through all this chain and return it back.
+*/
+class AsynchronousReadIndirectBufferFromRemoteFS : public ReadBufferFromFileBase
+{
+public:
+    explicit AsynchronousReadIndirectBufferFromRemoteFS(
+        AsynchronousReaderPtr reader_, const ReadSettings & settings_,
+        std::shared_ptr<ReadBufferFromRemoteFSGather> impl_,
+        size_t min_bytes_for_seek = 1024 * 1024);
+
+    ~AsynchronousReadIndirectBufferFromRemoteFS() override;
+
+    off_t seek(off_t offset_, int whence) override;
+
+    off_t getPosition() override { return file_offset_of_buffer_end - available(); }
+
+    String getFileName() const override;
+
+    void prefetch() override;
+
+    void setReadUntilPosition(size_t position) override;
+
+    void setReadUntilEnd() override;
+
+private:
+    bool nextImpl() override;
+
+    void finalize();
+
+    bool hasPendingDataToRead();
+
+    std::future<IAsynchronousReader::Result> readInto(char * data, size_t size);
+
+    AsynchronousReaderPtr reader;
+
+    Int32 priority;
+
+    std::shared_ptr<ReadBufferFromRemoteFSGather> impl;
+
+    std::future<IAsynchronousReader::Result> prefetch_future;
+
+    size_t file_offset_of_buffer_end = 0;
+
+    Memory<> prefetch_buffer;
+
+    size_t min_bytes_for_seek;
+
+    size_t bytes_to_ignore = 0;
+
+    size_t read_until_position = 0;
+
+    bool must_read_until_position;
+};
+
+}
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
new file mode 100644
index 00000000000..a9a94fa63e2
--- /dev/null
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -0,0 +1,182 @@
+#include "ReadBufferFromRemoteFSGather.h"
+
+#include <Disks/IDiskRemote.h>
+#include <IO/SeekableReadBuffer.h>
+#include <Disks/IO/ReadBufferFromWebServer.h>
+
+#if USE_AWS_S3
+#include <IO/ReadBufferFromS3.h>
+#endif
+
+#if USE_HDFS
+#include <Storages/HDFS/ReadBufferFromHDFS.h>
+#endif
+
+#include <base/logger_useful.h>
+#include <filesystem>
+#include <iostream>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+
+#if USE_AWS_S3
+SeekableReadBufferPtr ReadBufferFromS3Gather::createImplementationBuffer(const String & path, size_t read_until_position_) const
+{
+    return std::make_unique<ReadBufferFromS3>(client_ptr, bucket,
+        fs::path(metadata.remote_fs_root_path) / path, max_single_read_retries, settings, threadpool_read, read_until_position_);
+}
+#endif
+
+
+SeekableReadBufferPtr ReadBufferFromWebServerGather::createImplementationBuffer(const String & path, size_t read_until_position_) const
+{
+    return std::make_unique<ReadBufferFromWebServer>(fs::path(uri) / path, context, settings, threadpool_read, read_until_position_);
+}
+
+
+#if USE_HDFS
+SeekableReadBufferPtr ReadBufferFromHDFSGather::createImplementationBuffer(const String & path, size_t read_until_position_) const
+{
+    return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, fs::path(hdfs_directory) / path, config, buf_size, read_until_position_);
+}
+#endif
+
+
+ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(const RemoteMetadata & metadata_, const String & path_)
+    : ReadBuffer(nullptr, 0)
+    , metadata(metadata_)
+    , canonical_path(path_)
+{
+}
+
+
+size_t ReadBufferFromRemoteFSGather::readInto(char * data, size_t size, size_t offset, size_t ignore)
+{
+    /**
+     * Set `data` to current working and internal buffers.
+     * Internal buffer with size `size`. Working buffer with size 0.
+     */
+    set(data, size);
+
+    absolute_position = offset;
+    bytes_to_ignore = ignore;
+
+    auto result = nextImpl();
+    bytes_to_ignore = 0;
+
+    if (result)
+        return working_buffer.size();
+
+    return 0;
+}
+
+
+void ReadBufferFromRemoteFSGather::initialize()
+{
+    /// One clickhouse file can be split into multiple files in remote fs.
+    auto current_buf_offset = absolute_position;
+    for (size_t i = 0; i < metadata.remote_fs_objects.size(); ++i)
+    {
+        const auto & [file_path, size] = metadata.remote_fs_objects[i];
+
+        if (size > current_buf_offset)
+        {
+            /// Do not create a new buffer if we already have what we need.
+            if (!current_buf || current_buf_idx != i)
+            {
+                current_buf = createImplementationBuffer(file_path, read_until_position);
+                current_buf_idx = i;
+            }
+
+            current_buf->seek(current_buf_offset, SEEK_SET);
+            return;
+        }
+
+        current_buf_offset -= size;
+    }
+    current_buf_idx = metadata.remote_fs_objects.size();
+    current_buf = nullptr;
+}
+
+
+bool ReadBufferFromRemoteFSGather::nextImpl()
+{
+    /// Find first available buffer that fits to given offset.
+    if (!current_buf)
+        initialize();
+
+    /// If current buffer has remaining data - use it.
+    if (current_buf)
+    {
+        if (readImpl())
+            return true;
+    }
+    else
+        return false;
+
+    /// If there is no available buffers - nothing to read.
+    if (current_buf_idx + 1 >= metadata.remote_fs_objects.size())
+        return false;
+
+    ++current_buf_idx;
+
+    const auto & current_path = metadata.remote_fs_objects[current_buf_idx].first;
+    current_buf = createImplementationBuffer(current_path, read_until_position);
+
+    return readImpl();
+}
+
+
+bool ReadBufferFromRemoteFSGather::readImpl()
+{
+    swap(*current_buf);
+
+    /**
+     * Lazy seek is performed here.
+     * In asynchronous buffer when seeking to offset in range [pos, pos + min_bytes_for_seek]
+     * we save how many bytes need to be ignored (new_offset - position() bytes).
+     */
+    if (bytes_to_ignore)
+        current_buf->ignore(bytes_to_ignore);
+
+    auto result = current_buf->next();
+
+    swap(*current_buf);
+
+    if (result)
+        absolute_position += working_buffer.size();
+
+    return result;
+}
+
+
+void ReadBufferFromRemoteFSGather::setReadUntilPosition(size_t position)
+{
+    read_until_position = position;
+    reset();
+}
+
+
+void ReadBufferFromRemoteFSGather::reset()
+{
+    current_buf.reset();
+}
+
+
+String ReadBufferFromRemoteFSGather::getFileName() const
+{
+    return canonical_path;
+}
+
+
+size_t ReadBufferFromRemoteFSGather::getFileSize() const
+{
+    size_t size = 0;
+    for (const auto & object : metadata.remote_fs_objects)
+        size += object.second;
+    return size;
+}
+
+}
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
new file mode 100644
index 00000000000..5bc7d4e4819
--- /dev/null
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -0,0 +1,161 @@
+#pragma once
+
+#if !defined(ARCADIA_BUILD)
+#include <Common/config.h>
+#endif
+
+#include <Disks/IDiskRemote.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadSettings.h>
+
+namespace Aws
+{
+namespace S3
+{
+class S3Client;
+}
+}
+
+namespace DB
+{
+
+/**
+ * Remote disk might need to split one clickhouse file into multiple files in remote fs.
+ * This class works like a proxy to allow transition from one file into multiple.
+ */
+class ReadBufferFromRemoteFSGather : public ReadBuffer
+{
+friend class ReadIndirectBufferFromRemoteFS;
+
+public:
+    explicit ReadBufferFromRemoteFSGather(const RemoteMetadata & metadata_, const String & path_);
+
+    String getFileName() const;
+
+    void reset();
+
+    void setReadUntilPosition(size_t position) override;
+
+    size_t readInto(char * data, size_t size, size_t offset, size_t ignore = 0);
+
+    size_t getFileSize() const;
+
+protected:
+    virtual SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t read_until_position) const = 0;
+
+    RemoteMetadata metadata;
+
+private:
+    bool nextImpl() override;
+
+    void initialize();
+
+    bool readImpl();
+
+    SeekableReadBufferPtr current_buf;
+
+    size_t current_buf_idx = 0;
+
+    size_t absolute_position = 0;
+
+    size_t bytes_to_ignore = 0;
+
+    size_t read_until_position = 0;
+
+    String canonical_path;
+};
+
+
+#if USE_AWS_S3
+/// Reads data from S3 using stored paths in metadata.
+class ReadBufferFromS3Gather final : public ReadBufferFromRemoteFSGather
+{
+public:
+    ReadBufferFromS3Gather(
+        const String & path_,
+        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
+        const String & bucket_,
+        IDiskRemote::Metadata metadata_,
+        size_t max_single_read_retries_,
+        const ReadSettings & settings_,
+        bool threadpool_read_ = false)
+        : ReadBufferFromRemoteFSGather(metadata_, path_)
+        , client_ptr(std::move(client_ptr_))
+        , bucket(bucket_)
+        , max_single_read_retries(max_single_read_retries_)
+        , settings(settings_)
+        , threadpool_read(threadpool_read_)
+    {
+    }
+
+    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t read_until_position) const override;
+
+private:
+    std::shared_ptr<Aws::S3::S3Client> client_ptr;
+    String bucket;
+    UInt64 max_single_read_retries;
+    ReadSettings settings;
+    bool threadpool_read;
+};
+#endif
+
+
+class ReadBufferFromWebServerGather final : public ReadBufferFromRemoteFSGather
+{
+public:
+    ReadBufferFromWebServerGather(
+            const String & path_,
+            const String & uri_,
+            RemoteMetadata metadata_,
+            ContextPtr context_,
+            size_t threadpool_read_,
+            const ReadSettings & settings_)
+        : ReadBufferFromRemoteFSGather(metadata_, path_)
+        , uri(uri_)
+        , context(context_)
+        , threadpool_read(threadpool_read_)
+        , settings(settings_)
+    {
+    }
+
+    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t read_until_position) const override;
+
+private:
+    String uri;
+    ContextPtr context;
+    bool threadpool_read;
+    ReadSettings settings;
+};
+
+
+#if USE_HDFS
+/// Reads data from HDFS using stored paths in metadata.
+class ReadBufferFromHDFSGather final : public ReadBufferFromRemoteFSGather
+{
+public:
+    ReadBufferFromHDFSGather(
+            const String & path_,
+            const Poco::Util::AbstractConfiguration & config_,
+            const String & hdfs_uri_,
+            IDiskRemote::Metadata metadata_,
+            size_t buf_size_)
+        : ReadBufferFromRemoteFSGather(metadata_, path_)
+        , config(config_)
+        , buf_size(buf_size_)
+    {
+        const size_t begin_of_path = hdfs_uri_.find('/', hdfs_uri_.find("//") + 2);
+        hdfs_directory = hdfs_uri_.substr(begin_of_path);
+        hdfs_uri = hdfs_uri_.substr(0, begin_of_path);
+    }
+
+    SeekableReadBufferPtr createImplementationBuffer(const String & path, size_t read_until_position) const override;
+
+private:
+    const Poco::Util::AbstractConfiguration & config;
+    String hdfs_uri;
+    String hdfs_directory;
+    size_t buf_size;
+};
+#endif
+
+}
diff --git a/src/Disks/IO/ReadBufferFromWebServer.cpp b/src/Disks/IO/ReadBufferFromWebServer.cpp
new file mode 100644
index 00000000000..bda20f78e79
--- /dev/null
+++ b/src/Disks/IO/ReadBufferFromWebServer.cpp
@@ -0,0 +1,198 @@
+#include "ReadBufferFromWebServer.h"
+
+#include <base/logger_useful.h>
+#include <base/sleep.h>
+#include <Core/Types.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <IO/ConnectionTimeoutsContext.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+#include <thread>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+    extern const int SEEK_POSITION_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
+}
+
+
+static constexpr size_t HTTP_MAX_TRIES = 10;
+static constexpr size_t WAIT_INIT = 100;
+
+ReadBufferFromWebServer::ReadBufferFromWebServer(
+    const String & url_,
+    ContextPtr context_,
+    const ReadSettings & settings_,
+    bool use_external_buffer_,
+    size_t last_offset_)
+    : SeekableReadBuffer(nullptr, 0)
+    , log(&Poco::Logger::get("ReadBufferFromWebServer"))
+    , context(context_)
+    , url(url_)
+    , buf_size(settings_.remote_fs_buffer_size)
+    , read_settings(settings_)
+    , use_external_buffer(use_external_buffer_)
+    , last_offset(last_offset_)
+{
+}
+
+
+std::unique_ptr<ReadBuffer> ReadBufferFromWebServer::initialize()
+{
+    Poco::URI uri(url);
+
+    ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
+
+    if (last_offset)
+    {
+        if (last_offset < offset)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, last_offset - 1);
+
+        headers.emplace_back(std::make_pair("Range", fmt::format("bytes={}-{}", offset, last_offset - 1)));
+        LOG_DEBUG(log, "Reading with range: {}-{}", offset, last_offset);
+    }
+    else
+    {
+        headers.emplace_back(std::make_pair("Range", fmt::format("bytes={}-", offset)));
+        LOG_DEBUG(log, "Reading from offset: {}", offset);
+    }
+
+    const auto & settings = context->getSettingsRef();
+    const auto & config = context->getConfigRef();
+    Poco::Timespan http_keep_alive_timeout{config.getUInt("keep_alive_timeout", 20), 0};
+
+    return std::make_unique<ReadWriteBufferFromHTTP>(
+        uri,
+        Poco::Net::HTTPRequest::HTTP_GET,
+        ReadWriteBufferFromHTTP::OutStreamCallback(),
+        ConnectionTimeouts(std::max(Poco::Timespan(settings.http_connection_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
+                           settings.http_send_timeout,
+                           std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
+                           settings.tcp_keep_alive_timeout,
+                           http_keep_alive_timeout),
+        0,
+        Poco::Net::HTTPBasicCredentials{},
+        buf_size,
+        read_settings,
+        headers,
+        context->getRemoteHostFilter(),
+        use_external_buffer);
+}
+
+
+void ReadBufferFromWebServer::initializeWithRetry()
+{
+    /// Initialize impl with retry.
+    size_t milliseconds_to_wait = WAIT_INIT;
+    for (size_t i = 0; i < HTTP_MAX_TRIES; ++i)
+    {
+        try
+        {
+            impl = initialize();
+
+            if (use_external_buffer)
+            {
+                /**
+                 * See comment 30 lines lower.
+                 */
+                impl->set(internal_buffer.begin(), internal_buffer.size());
+                assert(working_buffer.begin() != nullptr);
+                assert(!internal_buffer.empty());
+            }
+
+            break;
+        }
+        catch (Poco::Exception & e)
+        {
+            if (i == HTTP_MAX_TRIES - 1)
+                throw;
+
+            LOG_ERROR(&Poco::Logger::get("ReadBufferFromWeb"), "Error: {}, code: {}", e.what(), e.code());
+            sleepForMilliseconds(milliseconds_to_wait);
+            milliseconds_to_wait *= 2;
+        }
+    }
+}
+
+
+bool ReadBufferFromWebServer::nextImpl()
+{
+    if (last_offset)
+    {
+        if (last_offset == offset)
+            return false;
+
+        if (last_offset < offset)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, last_offset - 1);
+    }
+
+    if (impl)
+    {
+        if (use_external_buffer)
+        {
+            /**
+            * use_external_buffer -- means we read into the buffer which
+            * was passed to us from somewhere else. We do not check whether
+            * previously returned buffer was read or not, because this branch
+            * means we are prefetching data, each nextImpl() call we can fill
+            * a different buffer.
+            */
+            impl->set(internal_buffer.begin(), internal_buffer.size());
+            assert(working_buffer.begin() != nullptr);
+            assert(!internal_buffer.empty());
+        }
+        else
+        {
+            /**
+            * impl was initialized before, pass position() to it to make
+            * sure there is no pending data which was not read, because
+            * this branch means we read sequentially.
+            */
+            impl->position() = position();
+            assert(!impl->hasPendingData());
+        }
+    }
+    else
+    {
+        initializeWithRetry();
+    }
+
+    auto result = impl->next();
+    if (result)
+    {
+        BufferBase::set(impl->buffer().begin(), impl->buffer().size(), impl->offset());
+        offset += working_buffer.size();
+    }
+
+    return result;
+}
+
+
+off_t ReadBufferFromWebServer::seek(off_t offset_, int whence)
+{
+    if (impl)
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Seek is allowed only before first read attempt from the buffer");
+
+    if (whence != SEEK_SET)
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET mode is allowed");
+
+    if (offset_ < 0)
+        throw Exception(ErrorCodes::SEEK_POSITION_OUT_OF_BOUND, "Seek position is out of bounds. Offset: {}", std::to_string(offset_));
+
+    offset = offset_;
+
+    return offset;
+}
+
+
+off_t ReadBufferFromWebServer::getPosition()
+{
+    return offset - available();
+}
+
+}
diff --git a/src/Disks/IO/ReadBufferFromWebServer.h b/src/Disks/IO/ReadBufferFromWebServer.h
new file mode 100644
index 00000000000..1ffb8589392
--- /dev/null
+++ b/src/Disks/IO/ReadBufferFromWebServer.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <IO/SeekableReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/ReadSettings.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+/* Read buffer, which reads via http, but is used as ReadBufferFromFileBase.
+ * Used to read files, hosted on a web server with static files.
+ *
+ * Usage: ReadIndirectBufferFromRemoteFS -> SeekAvoidingReadBuffer -> ReadBufferFromWebServer -> ReadWriteBufferFromHTTP.
+ */
+class ReadBufferFromWebServer : public SeekableReadBuffer
+{
+public:
+    explicit ReadBufferFromWebServer(
+        const String & url_, ContextPtr context_,
+        const ReadSettings & settings_ = {},
+        bool use_external_buffer_ = false,
+        size_t last_offset = 0);
+
+    bool nextImpl() override;
+
+    off_t seek(off_t off, int whence) override;
+
+    off_t getPosition() override;
+
+private:
+    std::unique_ptr<ReadBuffer> initialize();
+
+    void initializeWithRetry();
+
+    Poco::Logger * log;
+    ContextPtr context;
+
+    const String url;
+    size_t buf_size;
+
+    std::unique_ptr<ReadBuffer> impl;
+
+    off_t offset = 0;
+
+    ReadSettings read_settings;
+
+    bool use_external_buffer;
+
+    off_t last_offset = 0;
+};
+
+}
diff --git a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp
new file mode 100644
index 00000000000..112124d9fd7
--- /dev/null
+++ b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.cpp
@@ -0,0 +1,85 @@
+#include "ReadIndirectBufferFromRemoteFS.h"
+
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+}
+
+
+ReadIndirectBufferFromRemoteFS::ReadIndirectBufferFromRemoteFS(
+    std::shared_ptr<ReadBufferFromRemoteFSGather> impl_) : impl(std::move(impl_))
+{
+}
+
+
+off_t ReadIndirectBufferFromRemoteFS::getPosition()
+{
+    return impl->absolute_position - available();
+}
+
+
+String ReadIndirectBufferFromRemoteFS::getFileName() const
+{
+    return impl->getFileName();
+}
+
+
+off_t ReadIndirectBufferFromRemoteFS::seek(off_t offset_, int whence)
+{
+    if (whence == SEEK_CUR)
+    {
+        /// If position within current working buffer - shift pos.
+        if (!working_buffer.empty() && size_t(getPosition() + offset_) < impl->absolute_position)
+        {
+            pos += offset_;
+            return getPosition();
+        }
+        else
+        {
+            impl->absolute_position += offset_;
+        }
+    }
+    else if (whence == SEEK_SET)
+    {
+        /// If position within current working buffer - shift pos.
+        if (!working_buffer.empty()
+            && size_t(offset_) >= impl->absolute_position - working_buffer.size()
+            && size_t(offset_) < impl->absolute_position)
+        {
+            pos = working_buffer.end() - (impl->absolute_position - offset_);
+            return getPosition();
+        }
+        else
+        {
+            impl->absolute_position = offset_;
+        }
+    }
+    else
+        throw Exception("Only SEEK_SET or SEEK_CUR modes are allowed.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
+
+    impl->reset();
+    pos = working_buffer.end();
+
+    return impl->absolute_position;
+}
+
+
+bool ReadIndirectBufferFromRemoteFS::nextImpl()
+{
+    /// Transfer current position and working_buffer to actual ReadBuffer
+    swap(*impl);
+    /// Position and working_buffer will be updated in next() call
+    auto result = impl->next();
+    /// and assigned to current buffer.
+    swap(*impl);
+
+    return result;
+}
+
+}
diff --git a/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
new file mode 100644
index 00000000000..0c8b1b4dd21
--- /dev/null
+++ b/src/Disks/IO/ReadIndirectBufferFromRemoteFS.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <Common/config.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Disks/IDiskRemote.h>
+#include <utility>
+
+
+namespace DB
+{
+
+class ReadBufferFromRemoteFSGather;
+
+/**
+* Reads data from S3/HDFS/Web using stored paths in metadata.
+* There is asynchronous version of this class -- AsynchronousReadIndirectBufferFromRemoteFS.
+*/
+class ReadIndirectBufferFromRemoteFS : public ReadBufferFromFileBase
+{
+
+public:
+    explicit ReadIndirectBufferFromRemoteFS(std::shared_ptr<ReadBufferFromRemoteFSGather> impl_);
+
+    off_t seek(off_t offset_, int whence) override;
+
+    off_t getPosition() override;
+
+    String getFileName() const override;
+
+private:
+    bool nextImpl() override;
+
+    std::shared_ptr<ReadBufferFromRemoteFSGather> impl;
+};
+
+}
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.cpp b/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
new file mode 100644
index 00000000000..945b2d3eb7e
--- /dev/null
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
@@ -0,0 +1,68 @@
+#include "ThreadPoolRemoteFSReader.h"
+
+#include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/Stopwatch.h>
+#include <Common/assert_cast.h>
+#include <Common/setThreadName.h>
+
+#include <IO/SeekableReadBuffer.h>
+#include <Disks/IO/ReadBufferFromRemoteFSGather.h>
+
+#include <future>
+#include <iostream>
+
+
+namespace ProfileEvents
+{
+    extern const Event RemoteFSReadMicroseconds;
+    extern const Event RemoteFSReadBytes;
+}
+
+namespace CurrentMetrics
+{
+    extern const Metric Read;
+}
+
+namespace DB
+{
+
+size_t ThreadPoolRemoteFSReader::RemoteFSFileDescriptor::readInto(char * data, size_t size, size_t offset, size_t ignore)
+{
+    return reader->readInto(data, size, offset, ignore);
+}
+
+
+ThreadPoolRemoteFSReader::ThreadPoolRemoteFSReader(size_t pool_size, size_t queue_size_)
+    : pool(pool_size, pool_size, queue_size_)
+{
+}
+
+
+std::future<IAsynchronousReader::Result> ThreadPoolRemoteFSReader::submit(Request request)
+{
+    auto task = std::make_shared<std::packaged_task<Result()>>([request]
+    {
+        setThreadName("ThreadPoolRemoteFSRead");
+        CurrentMetrics::Increment metric_increment{CurrentMetrics::Read};
+        auto * remote_fs_fd = assert_cast<RemoteFSFileDescriptor *>(request.descriptor.get());
+
+        Stopwatch watch(CLOCK_MONOTONIC);
+        auto bytes_read = remote_fs_fd->readInto(request.buf, request.size, request.offset, request.ignore);
+        watch.stop();
+
+        ProfileEvents::increment(ProfileEvents::RemoteFSReadMicroseconds, watch.elapsedMicroseconds());
+        ProfileEvents::increment(ProfileEvents::RemoteFSReadBytes, bytes_read);
+
+        return bytes_read;
+    });
+
+    auto future = task->get_future();
+
+    /// ThreadPool is using "bigger is higher priority" instead of "smaller is more priority".
+    pool.scheduleOrThrow([task]{ (*task)(); }, -request.priority);
+
+    return future;
+}
+}
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.h b/src/Disks/IO/ThreadPoolRemoteFSReader.h
new file mode 100644
index 00000000000..c300162e214
--- /dev/null
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <IO/AsynchronousReader.h>
+#include <IO/SeekableReadBuffer.h>
+#include <Common/ThreadPool.h>
+#include <Disks/IDiskRemote.h>
+
+
+namespace DB
+{
+class ReadBufferFromRemoteFSGather;
+
+class ThreadPoolRemoteFSReader : public IAsynchronousReader
+{
+
+private:
+    ThreadPool pool;
+
+public:
+    ThreadPoolRemoteFSReader(size_t pool_size, size_t queue_size_);
+
+    std::future<Result> submit(Request request) override;
+
+    struct RemoteFSFileDescriptor;
+};
+
+
+struct ThreadPoolRemoteFSReader::RemoteFSFileDescriptor : public IFileDescriptor
+{
+public:
+    RemoteFSFileDescriptor(std::shared_ptr<ReadBufferFromRemoteFSGather> reader_) : reader(reader_) {}
+
+    size_t readInto(char * data, size_t size, size_t offset, size_t ignore = 0);
+
+private:
+    std::shared_ptr<ReadBufferFromRemoteFSGather> reader;
+};
+
+}
diff --git a/src/Disks/WriteIndirectBufferFromRemoteFS.cpp b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
similarity index 92%
rename from src/Disks/WriteIndirectBufferFromRemoteFS.cpp
rename to src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
index 6951b9fa92e..9a805ad6a5b 100644
--- a/src/Disks/WriteIndirectBufferFromRemoteFS.cpp
+++ b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.cpp
@@ -1,8 +1,8 @@
 #include "WriteIndirectBufferFromRemoteFS.h"
 
-#if USE_AWS_S3 || USE_HDFS
 #include <IO/WriteBufferFromS3.h>
 #include <Storages/HDFS/WriteBufferFromHDFS.h>
+#include <IO/WriteBufferFromHTTP.h>
 
 
 namespace DB
@@ -65,6 +65,7 @@ template
 class WriteIndirectBufferFromRemoteFS<WriteBufferFromHDFS>;
 #endif
 
-}
+template
+class WriteIndirectBufferFromRemoteFS<WriteBufferFromHTTP>;
 
-#endif
+}
diff --git a/src/Disks/WriteIndirectBufferFromRemoteFS.h b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
similarity index 91%
rename from src/Disks/WriteIndirectBufferFromRemoteFS.h
rename to src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
index 4285736858a..ef021686221 100644
--- a/src/Disks/WriteIndirectBufferFromRemoteFS.h
+++ b/src/Disks/IO/WriteIndirectBufferFromRemoteFS.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
-
-#if USE_AWS_S3 || USE_HDFS
 
 #include <Disks/IDiskRemote.h>
 #include <IO/WriteBufferFromFile.h>
@@ -38,5 +34,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/src/Disks/IStoragePolicy.h b/src/Disks/IStoragePolicy.h
index 59cff3c85d5..8c6d56bdcfd 100644
--- a/src/Disks/IStoragePolicy.h
+++ b/src/Disks/IStoragePolicy.h
@@ -4,7 +4,7 @@
 
 #include <memory>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
@@ -17,6 +17,7 @@ class IDisk;
 using DiskPtr = std::shared_ptr<IDisk>;
 using Disks = std::vector<DiskPtr>;
 class IReservation;
+using ReservationSharedPtr = std::shared_ptr<IReservation>;
 using ReservationPtr = std::unique_ptr<IReservation>;
 using Reservations = std::vector<ReservationPtr>;
 
@@ -39,7 +40,6 @@ public:
     /// mutations files
     virtual DiskPtr getAnyDisk() const = 0;
     virtual DiskPtr getDiskByName(const String & disk_name) const = 0;
-    virtual Disks getDisksByType(DiskType::Type type) const = 0;
     /// Get free space from most free disk
     virtual UInt64 getMaxUnreservedFreeSpace() const = 0;
     /// Reserves space on any volume with index > min_volume_index or returns nullptr
diff --git a/src/Disks/IVolume.cpp b/src/Disks/IVolume.cpp
index ac277d962ed..c135dade128 100644
--- a/src/Disks/IVolume.cpp
+++ b/src/Disks/IVolume.cpp
@@ -12,23 +12,6 @@ namespace ErrorCodes
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int INCONSISTENT_RESERVATIONS;
     extern const int NO_RESERVATIONS_PROVIDED;
-    extern const int UNKNOWN_VOLUME_TYPE;
-}
-
-String volumeTypeToString(VolumeType type)
-{
-    switch (type)
-    {
-        case VolumeType::JBOD:
-            return "JBOD";
-        case VolumeType::RAID1:
-            return "RAID1";
-        case VolumeType::SINGLE_DISK:
-            return "SINGLE_DISK";
-        case VolumeType::UNKNOWN:
-            return "UNKNOWN";
-    }
-    throw Exception("Unknown volume type, please add it to DB::volumeTypeToString", ErrorCodes::UNKNOWN_VOLUME_TYPE);
 }
 
 IVolume::IVolume(
diff --git a/src/Disks/IVolume.h b/src/Disks/IVolume.h
index c040d9d58e1..d26ddea787d 100644
--- a/src/Disks/IVolume.h
+++ b/src/Disks/IVolume.h
@@ -16,8 +16,6 @@ enum class VolumeType
     UNKNOWN
 };
 
-String volumeTypeToString(VolumeType t);
-
 class IVolume;
 using VolumePtr = std::shared_ptr<IVolume>;
 using Volumes = std::vector<VolumePtr>;
diff --git a/src/Disks/ReadIndirectBufferFromRemoteFS.cpp b/src/Disks/ReadIndirectBufferFromRemoteFS.cpp
deleted file mode 100644
index 960844e5281..00000000000
--- a/src/Disks/ReadIndirectBufferFromRemoteFS.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "ReadIndirectBufferFromRemoteFS.h"
-
-#if USE_AWS_S3 || USE_HDFS
-#include <IO/ReadBufferFromS3.h>
-#include <Storages/HDFS/ReadBufferFromHDFS.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_SEEK_THROUGH_FILE;
-}
-
-
-template<typename T>
-ReadIndirectBufferFromRemoteFS<T>::ReadIndirectBufferFromRemoteFS(
-    IDiskRemote::Metadata metadata_)
-    : metadata(std::move(metadata_))
-{
-}
-
-
-template<typename T>
-off_t ReadIndirectBufferFromRemoteFS<T>::seek(off_t offset_, int whence)
-{
-    if (whence == SEEK_CUR)
-    {
-        /// If position within current working buffer - shift pos.
-        if (!working_buffer.empty() && size_t(getPosition() + offset_) < absolute_position)
-        {
-            pos += offset_;
-            return getPosition();
-        }
-        else
-        {
-            absolute_position += offset_;
-        }
-    }
-    else if (whence == SEEK_SET)
-    {
-        /// If position within current working buffer - shift pos.
-        if (!working_buffer.empty() && size_t(offset_) >= absolute_position - working_buffer.size()
-            && size_t(offset_) < absolute_position)
-        {
-            pos = working_buffer.end() - (absolute_position - offset_);
-            return getPosition();
-        }
-        else
-        {
-            absolute_position = offset_;
-        }
-    }
-    else
-        throw Exception("Only SEEK_SET or SEEK_CUR modes are allowed.", ErrorCodes::CANNOT_SEEK_THROUGH_FILE);
-
-    current_buf = initialize();
-    pos = working_buffer.end();
-
-    return absolute_position;
-}
-
-
-template<typename T>
-std::unique_ptr<T> ReadIndirectBufferFromRemoteFS<T>::initialize()
-{
-    size_t offset = absolute_position;
-    for (size_t i = 0; i < metadata.remote_fs_objects.size(); ++i)
-    {
-        current_buf_idx = i;
-        const auto & [file_path, size] = metadata.remote_fs_objects[i];
-        if (size > offset)
-        {
-            auto buf = createReadBuffer(file_path);
-            buf->seek(offset, SEEK_SET);
-            return buf;
-        }
-        offset -= size;
-    }
-    return nullptr;
-}
-
-
-template<typename T>
-bool ReadIndirectBufferFromRemoteFS<T>::nextImpl()
-{
-    /// Find first available buffer that fits to given offset.
-    if (!current_buf)
-        current_buf = initialize();
-
-    /// If current buffer has remaining data - use it.
-    if (current_buf)
-    {
-        bool result = nextAndShiftPosition();
-        if (result)
-            return true;
-    }
-
-    /// If there is no available buffers - nothing to read.
-    if (current_buf_idx + 1 >= metadata.remote_fs_objects.size())
-        return false;
-
-    ++current_buf_idx;
-    const auto & path = metadata.remote_fs_objects[current_buf_idx].first;
-
-    current_buf = createReadBuffer(path);
-
-    return nextAndShiftPosition();
-}
-
-template <typename T>
-bool ReadIndirectBufferFromRemoteFS<T>::nextAndShiftPosition()
-{
-    /// Transfer current position and working_buffer to actual ReadBuffer
-    swap(*current_buf);
-    /// Position and working_buffer will be updated in next() call
-    auto result = current_buf->next();
-    /// and assigned to current buffer.
-    swap(*current_buf);
-
-    /// absolute position is shifted by a data size that was read in next() call above.
-    if (result)
-        absolute_position += working_buffer.size();
-
-    return result;
-}
-
-
-#if USE_AWS_S3
-template
-class ReadIndirectBufferFromRemoteFS<ReadBufferFromS3>;
-#endif
-
-#if USE_HDFS
-template
-class ReadIndirectBufferFromRemoteFS<ReadBufferFromHDFS>;
-#endif
-
-}
-
-#endif
diff --git a/src/Disks/ReadIndirectBufferFromRemoteFS.h b/src/Disks/ReadIndirectBufferFromRemoteFS.h
deleted file mode 100644
index 3af38e39167..00000000000
--- a/src/Disks/ReadIndirectBufferFromRemoteFS.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#if !defined(ARCADIA_BUILD)
-#include <Common/config.h>
-#endif
-
-#if USE_AWS_S3 || USE_HDFS
-
-#include <IO/ReadBufferFromFile.h>
-#include <Disks/IDiskRemote.h>
-#include <utility>
-
-
-namespace DB
-{
-
-/// Reads data from S3/HDFS using stored paths in metadata.
-template <typename T>
-class ReadIndirectBufferFromRemoteFS : public ReadBufferFromFileBase
-{
-public:
-    explicit ReadIndirectBufferFromRemoteFS(IDiskRemote::Metadata metadata_);
-
-    off_t seek(off_t offset_, int whence) override;
-
-    off_t getPosition() override { return absolute_position - available(); }
-
-    String getFileName() const override { return metadata.metadata_file_path; }
-
-    virtual std::unique_ptr<T> createReadBuffer(const String & path) = 0;
-
-protected:
-    IDiskRemote::Metadata metadata;
-
-private:
-    std::unique_ptr<T> initialize();
-
-    bool nextAndShiftPosition();
-
-    bool nextImpl() override;
-
-    size_t absolute_position = 0;
-
-    size_t current_buf_idx = 0;
-
-    std::unique_ptr<T> current_buf;
-};
-
-}
-
-#endif
diff --git a/src/Disks/S3/DiskS3.cpp b/src/Disks/S3/DiskS3.cpp
index 6dd29165566..ef8bb8e0feb 100644
--- a/src/Disks/S3/DiskS3.cpp
+++ b/src/Disks/S3/DiskS3.cpp
@@ -6,25 +6,40 @@
 #include <bitset>
 #include <random>
 #include <utility>
-#include <IO/ReadBufferFromString.h>
+
+#include <boost/algorithm/string.hpp>
+
+#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 <Interpreters/Context.h>
 #include <IO/ReadBufferFromS3.h>
-#include <Disks/ReadIndirectBufferFromRemoteFS.h>
-#include <Disks/WriteIndirectBufferFromRemoteFS.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/SeekAvoidingReadBuffer.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>
-#include <Common/createHardLink.h>
-#include <Common/quoteString.h>
-#include <Common/thread_local_rng.h>
-#include <Common/checkStackSize.h>
-#include <boost/algorithm/string.hpp>
-#include <aws/s3/model/CopyObjectRequest.h> // Y_IGNORE
-#include <aws/s3/model/DeleteObjectsRequest.h> // Y_IGNORE
-#include <aws/s3/model/GetObjectRequest.h> // Y_IGNORE
-#include <aws/s3/model/ListObjectsV2Request.h> // Y_IGNORE
-#include <aws/s3/model/HeadObjectRequest.h> // Y_IGNORE
+
+#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
@@ -62,7 +77,7 @@ public:
         chunks.back().push_back(obj);
     }
 
-    void removePaths(const std::function<void(Chunk &&)> & remove_chunk_func)
+    void removePaths(Fn<void(Chunk &&)> auto && remove_chunk_func)
     {
         for (auto & chunk : chunks)
             remove_chunk_func(std::move(chunk));
@@ -114,47 +129,19 @@ void throwIfError(const Aws::Utils::Outcome<Result, Error> & response)
     }
 }
 
-/// Reads data from S3 using stored paths in metadata.
-class ReadIndirectBufferFromS3 final : public ReadIndirectBufferFromRemoteFS<ReadBufferFromS3>
-{
-public:
-    ReadIndirectBufferFromS3(
-        std::shared_ptr<Aws::S3::S3Client> client_ptr_,
-        const String & bucket_,
-        DiskS3::Metadata metadata_,
-        size_t max_single_read_retries_,
-        size_t buf_size_)
-        : ReadIndirectBufferFromRemoteFS<ReadBufferFromS3>(metadata_)
-        , client_ptr(std::move(client_ptr_))
-        , bucket(bucket_)
-        , max_single_read_retries(max_single_read_retries_)
-        , buf_size(buf_size_)
-    {
-    }
-
-    std::unique_ptr<ReadBufferFromS3> createReadBuffer(const String & path) override
-    {
-        return std::make_unique<ReadBufferFromS3>(client_ptr, bucket, metadata.remote_fs_root_path + path, max_single_read_retries, buf_size);
-    }
-
-private:
-    std::shared_ptr<Aws::S3::S3Client> client_ptr;
-    const String & bucket;
-    UInt64 max_single_read_retries;
-    size_t buf_size;
-};
-
 DiskS3::DiskS3(
     String name_,
     String bucket_,
     String s3_root_path_,
     String metadata_path_,
+    ContextPtr context_,
     SettingsPtr settings_,
     GetDiskSettings settings_getter_)
     : IDiskRemote(name_, s3_root_path_, metadata_path_, "DiskS3", settings_->thread_pool_size)
     , bucket(std::move(bucket_))
     , current_settings(std::move(settings_))
     , settings_getter(settings_getter_)
+    , context(context_)
 {
 }
 
@@ -172,7 +159,7 @@ void DiskS3::removeFromRemoteFS(RemoteFSPathKeeperPtr fs_paths_keeper)
     if (s3_paths_keeper)
         s3_paths_keeper->removePaths([&](S3PathKeeper::Chunk && chunk)
         {
-            LOG_DEBUG(log, "Remove AWS keys {}", S3PathKeeper::getChunkKeys(chunk));
+            LOG_TRACE(log, "Remove AWS keys {}", S3PathKeeper::getChunkKeys(chunk));
             Aws::S3::Model::Delete delkeys;
             delkeys.SetObjects(chunk);
             /// TODO: Make operation idempotent. Do not throw exception if key is already deleted.
@@ -209,16 +196,31 @@ void DiskS3::moveFile(const String & from_path, const String & to_path, bool sen
     fs::rename(fs::path(metadata_path) / from_path, fs::path(metadata_path) / to_path);
 }
 
-std::unique_ptr<ReadBufferFromFileBase> DiskS3::readFile(const String & path, size_t buf_size, size_t, size_t, size_t, MMappedFileCache *) const
+std::unique_ptr<ReadBufferFromFileBase> DiskS3::readFile(const String & path, const ReadSettings & read_settings, std::optional<size_t>) const
 {
     auto settings = current_settings.get();
     auto metadata = readMeta(path);
 
-    LOG_DEBUG(log, "Read from file by path: {}. Existing S3 objects: {}",
+    LOG_TRACE(log, "Read from file by path: {}. Existing S3 objects: {}",
         backQuote(metadata_path + path), metadata.remote_fs_objects.size());
 
-    auto reader = std::make_unique<ReadIndirectBufferFromS3>(settings->client, bucket, metadata, settings->s3_max_single_read_retries, buf_size);
-    return std::make_unique<SeekAvoidingReadBuffer>(std::move(reader), settings->min_bytes_for_seek);
+    bool threadpool_read = read_settings.remote_fs_method == RemoteFSReadMethod::read_threadpool;
+
+    auto s3_impl = std::make_unique<ReadBufferFromS3Gather>(
+        path,
+        settings->client, bucket, metadata,
+        settings->s3_max_single_read_retries, read_settings, threadpool_read);
+
+    if (threadpool_read)
+    {
+        auto reader = getThreadPoolReader();
+        return std::make_unique<AsynchronousReadIndirectBufferFromRemoteFS>(reader, 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)
@@ -239,7 +241,7 @@ std::unique_ptr<WriteBufferFromFileBase> DiskS3::writeFile(const String & path,
         s3_path = "r" + revisionToString(revision) + "-file-" + s3_path;
     }
 
-    LOG_DEBUG(log, "{} to file by path: {}. S3 path: {}",
+    LOG_TRACE(log, "{} to file by path: {}. S3 path: {}",
               mode == WriteMode::Rewrite ? "Write" : "Append", backQuote(metadata_path + path), remote_fs_root_path + s3_path);
 
     auto s3_buffer = std::make_unique<WriteBufferFromS3>(
@@ -339,7 +341,7 @@ void DiskS3::findLastRevision()
     {
         auto revision_prefix = revision + "1";
 
-        LOG_DEBUG(log, "Check object exists with revision prefix {}", revision_prefix);
+        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)
@@ -364,7 +366,7 @@ int DiskS3::readSchemaVersion(const String & source_bucket, const String & sourc
         source_bucket,
         source_path + SCHEMA_VERSION_OBJECT,
         settings->s3_max_single_read_retries,
-        DBMS_DEFAULT_BUFFER_SIZE);
+        context->getReadSettings());
 
     readIntText(version, buffer);
 
@@ -388,21 +390,12 @@ void DiskS3::saveSchemaVersion(const int & version)
 
 void DiskS3::updateObjectMetadata(const String & key, const ObjectMetadata & metadata)
 {
-    auto settings = current_settings.get();
-    Aws::S3::Model::CopyObjectRequest request;
-    request.SetCopySource(bucket + "/" + key);
-    request.SetBucket(bucket);
-    request.SetKey(key);
-    request.SetMetadata(metadata);
-    request.SetMetadataDirective(Aws::S3::Model::MetadataDirective::REPLACE);
-
-    auto outcome = settings->client->CopyObject(request);
-    throwIfError(outcome);
+    copyObjectImpl(bucket, key, bucket, key, std::nullopt, metadata);
 }
 
 void DiskS3::migrateFileToRestorableSchema(const String & path)
 {
-    LOG_DEBUG(log, "Migrate file {} to restorable schema", metadata_path + path);
+    LOG_TRACE(log, "Migrate file {} to restorable schema", metadata_path + path);
 
     auto meta = readMeta(path);
 
@@ -419,7 +412,7 @@ void DiskS3::migrateToRestorableSchemaRecursive(const String & path, Futures & r
 {
     checkStackSize(); /// This is needed to prevent stack overflow in case of cyclic symlinks.
 
-    LOG_DEBUG(log, "Migrate directory {} to restorable schema", metadata_path + path);
+    LOG_TRACE(log, "Migrate directory {} to restorable schema", metadata_path + path);
 
     bool dir_contains_only_files = true;
     for (auto it = iterateDirectory(path); it->isValid(); it->next())
@@ -553,18 +546,124 @@ void DiskS3::listObjects(const String & source_bucket, const String & source_pat
     } while (outcome.GetResult().GetIsTruncated());
 }
 
-void DiskS3::copyObject(const String & src_bucket, const String & src_key, const String & dst_bucket, const String & dst_key) const
+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_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;
@@ -757,12 +856,12 @@ void DiskS3::processRestoreFiles(const String & source_bucket, const String & so
 
         /// 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);
+            copyObject(source_bucket, key, bucket, remote_fs_root_path + relative_key, head_result);
 
         metadata.addObject(relative_key, head_result.GetContentLength());
         metadata.save();
 
-        LOG_DEBUG(log, "Restored file {}", path);
+        LOG_TRACE(log, "Restored file {}", path);
     }
 }
 
@@ -809,7 +908,7 @@ void DiskS3::restoreFileOperations(const RestoreInformation & restore_informatio
                 if (exists(from_path))
                 {
                     moveFile(from_path, to_path, send_metadata);
-                    LOG_DEBUG(log, "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
+                    LOG_TRACE(log, "Revision {}. Restored rename {} -> {}", revision, from_path, to_path);
 
                     if (restore_information.detached && isDirectory(to_path))
                     {
@@ -836,7 +935,7 @@ void DiskS3::restoreFileOperations(const RestoreInformation & restore_informatio
                 {
                     createDirectories(directoryPath(dst_path));
                     createHardLink(src_path, dst_path, send_metadata);
-                    LOG_DEBUG(log, "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
+                    LOG_TRACE(log, "Revision {}. Restored hardlink {} -> {}", revision, src_path, dst_path);
                 }
             }
         }
@@ -867,7 +966,7 @@ void DiskS3::restoreFileOperations(const RestoreInformation & restore_informatio
 
             auto detached_path = pathToDetached(path);
 
-            LOG_DEBUG(log, "Move directory to 'detached' {} -> {}", path, detached_path);
+            LOG_TRACE(log, "Move directory to 'detached' {} -> {}", path, detached_path);
 
             fs::path from_path = fs::path(metadata_path) / path;
             fs::path to_path = fs::path(metadata_path) / detached_path;
@@ -922,9 +1021,9 @@ void DiskS3::onFreeze(const String & path)
     revision_file_buf.finalize();
 }
 
-void DiskS3::applyNewSettings(const Poco::Util::AbstractConfiguration & config, ContextPtr context, const String &, const DisksMap &)
+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);
+    auto new_settings = settings_getter(config, "storage_configuration.disks." + name, context_);
 
     current_settings.set(std::move(new_settings));
 
diff --git a/src/Disks/S3/DiskS3.h b/src/Disks/S3/DiskS3.h
index 133488ad31f..19bcb925cb4 100644
--- a/src/Disks/S3/DiskS3.h
+++ b/src/Disks/S3/DiskS3.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
 #include <atomic>
-#include <common/logger_useful.h>
+#include <optional>
+#include <base/logger_useful.h>
 #include "Disks/DiskFactory.h"
 #include "Disks/Executor.h"
 
@@ -70,16 +69,14 @@ public:
         String bucket_,
         String s3_root_path_,
         String metadata_path_,
+        ContextPtr context_,
         SettingsPtr settings_,
         GetDiskSettings settings_getter_);
 
     std::unique_ptr<ReadBufferFromFileBase> readFile(
         const String & path,
-        size_t buf_size,
-        size_t estimated_size,
-        size_t direct_io_threshold,
-        size_t mmap_threshold,
-        MMappedFileCache * mmap_cache) const override;
+        const ReadSettings & settings,
+        std::optional<size_t> size) const override;
 
     std::unique_ptr<WriteBufferFromFileBase> writeFile(
         const String & path,
@@ -96,7 +93,8 @@ public:
     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::Type getType() const override { return DiskType::Type::S3; }
+    DiskType getType() const override { return DiskType::S3; }
+    bool isRemote() const override { return true; }
 
     bool supportZeroCopyReplication() const override { return true; }
 
@@ -131,7 +129,15 @@ private:
 
     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) 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();
@@ -170,6 +176,8 @@ private:
     static constexpr int RESTORABLE_SCHEMA_VERSION = 1;
     /// Directories with data.
     const std::vector<String> data_roots {"data", "store"};
+
+    ContextPtr context;
 };
 
 }
diff --git a/src/Disks/S3/ProxyConfiguration.h b/src/Disks/S3/ProxyConfiguration.h
index 888f4c6faf9..a567c2abb5a 100644
--- a/src/Disks/S3/ProxyConfiguration.h
+++ b/src/Disks/S3/ProxyConfiguration.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
 #include <utility>
-#include <common/types.h>
-#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
+#include <base/types.h>
+#include <aws/core/client/ClientConfiguration.h>
 #include <Poco/URI.h>
 
 namespace DB::S3
@@ -19,6 +17,7 @@ public:
     virtual ~ProxyConfiguration() = default;
     /// Returns proxy configuration on each HTTP request.
     virtual Aws::Client::ClientConfigurationPerRequest getConfiguration(const Aws::Http::HttpRequest & request) = 0;
+    virtual void errorReport(const Aws::Client::ClientConfigurationPerRequest & config) = 0;
 };
 
 }
diff --git a/src/Disks/S3/ProxyListConfiguration.cpp b/src/Disks/S3/ProxyListConfiguration.cpp
index 4e058f49fbf..4c7a42f8fb9 100644
--- a/src/Disks/S3/ProxyListConfiguration.cpp
+++ b/src/Disks/S3/ProxyListConfiguration.cpp
@@ -3,7 +3,7 @@
 #if USE_AWS_S3
 
 #include <utility>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB::S3
 {
diff --git a/src/Disks/S3/ProxyListConfiguration.h b/src/Disks/S3/ProxyListConfiguration.h
index 4d37d2b6d69..c7a4ee9ec58 100644
--- a/src/Disks/S3/ProxyListConfiguration.h
+++ b/src/Disks/S3/ProxyListConfiguration.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
@@ -20,6 +18,7 @@ class ProxyListConfiguration : public ProxyConfiguration
 public:
     explicit ProxyListConfiguration(std::vector<Poco::URI> proxies_);
     Aws::Client::ClientConfigurationPerRequest getConfiguration(const Aws::Http::HttpRequest & request) override;
+    void errorReport(const Aws::Client::ClientConfigurationPerRequest &) override {}
 
 private:
     /// List of configured proxies.
diff --git a/src/Disks/S3/ProxyResolverConfiguration.cpp b/src/Disks/S3/ProxyResolverConfiguration.cpp
index b959d8b4415..0fc7a9a1fa8 100644
--- a/src/Disks/S3/ProxyResolverConfiguration.cpp
+++ b/src/Disks/S3/ProxyResolverConfiguration.cpp
@@ -7,7 +7,7 @@
 #include "Poco/StreamCopier.h"
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB::ErrorCodes
 {
@@ -16,8 +16,10 @@ namespace DB::ErrorCodes
 
 namespace DB::S3
 {
-ProxyResolverConfiguration::ProxyResolverConfiguration(const Poco::URI & endpoint_, String proxy_scheme_, unsigned proxy_port_)
-    : endpoint(endpoint_), proxy_scheme(std::move(proxy_scheme_)), proxy_port(proxy_port_)
+
+ProxyResolverConfiguration::ProxyResolverConfiguration(const Poco::URI & endpoint_, String proxy_scheme_
+    , unsigned proxy_port_, unsigned cache_ttl_)
+    : endpoint(endpoint_), proxy_scheme(std::move(proxy_scheme_)), proxy_port(proxy_port_), cache_ttl(cache_ttl_)
 {
 }
 
@@ -25,16 +27,25 @@ Aws::Client::ClientConfigurationPerRequest ProxyResolverConfiguration::getConfig
 {
     LOG_DEBUG(&Poco::Logger::get("AWSClient"), "Obtain proxy using resolver: {}", endpoint.toString());
 
+    std::unique_lock lock(cache_mutex);
+
+    std::chrono::time_point<std::chrono::system_clock> now = std::chrono::system_clock::now();
+
+    if (cache_ttl.count() && cache_valid && now <= cache_timestamp + cache_ttl && now >= cache_timestamp)
+    {
+        LOG_DEBUG(&Poco::Logger::get("AWSClient"), "Use cached proxy: {}://{}:{}", Aws::Http::SchemeMapper::ToString(cached_config.proxyScheme), cached_config.proxyHost, cached_config.proxyPort);
+        return cached_config;
+    }
+
     /// 1 second is enough for now.
     /// TODO: Make timeouts configurable.
     ConnectionTimeouts timeouts(
         Poco::Timespan(1000000), /// Connection timeout.
         Poco::Timespan(1000000), /// Send timeout.
-        Poco::Timespan(1000000) /// Receive timeout.
+        Poco::Timespan(1000000)  /// Receive timeout.
     );
     auto session = makeHTTPSession(endpoint, timeouts);
 
-    Aws::Client::ClientConfigurationPerRequest cfg;
     try
     {
         /// It should be just empty GET request.
@@ -53,20 +64,41 @@ Aws::Client::ClientConfigurationPerRequest ProxyResolverConfiguration::getConfig
 
         LOG_DEBUG(&Poco::Logger::get("AWSClient"), "Use proxy: {}://{}:{}", proxy_scheme, proxy_host, proxy_port);
 
-        cfg.proxyScheme = Aws::Http::SchemeMapper::FromString(proxy_scheme.c_str());
-        cfg.proxyHost = proxy_host;
-        cfg.proxyPort = proxy_port;
+        cached_config.proxyScheme = Aws::Http::SchemeMapper::FromString(proxy_scheme.c_str());
+        cached_config.proxyHost = proxy_host;
+        cached_config.proxyPort = proxy_port;
+        cache_timestamp = std::chrono::system_clock::now();
+        cache_valid = true;
 
-        return cfg;
+        return cached_config;
     }
     catch (...)
     {
         tryLogCurrentException("AWSClient", "Failed to obtain proxy");
         /// Don't use proxy if it can't be obtained.
+        Aws::Client::ClientConfigurationPerRequest cfg;
         return cfg;
     }
 }
 
+void ProxyResolverConfiguration::errorReport(const Aws::Client::ClientConfigurationPerRequest & config)
+{
+    if (config.proxyHost.empty())
+        return;
+
+    std::unique_lock lock(cache_mutex);
+
+    if (!cache_ttl.count() || !cache_valid)
+        return;
+
+    if (cached_config.proxyScheme != config.proxyScheme || cached_config.proxyHost != config.proxyHost
+            || cached_config.proxyPort != config.proxyPort)
+        return;
+
+    /// Invalidate cached proxy when got error with this proxy
+    cache_valid = false;
+}
+
 }
 
 #endif
diff --git a/src/Disks/S3/ProxyResolverConfiguration.h b/src/Disks/S3/ProxyResolverConfiguration.h
index 8eea662f257..f5baac54fba 100644
--- a/src/Disks/S3/ProxyResolverConfiguration.h
+++ b/src/Disks/S3/ProxyResolverConfiguration.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
 #include "ProxyConfiguration.h"
 
+#include <mutex>
+
 namespace DB::S3
 {
 /**
@@ -18,8 +18,9 @@ namespace DB::S3
 class ProxyResolverConfiguration : public ProxyConfiguration
 {
 public:
-    ProxyResolverConfiguration(const Poco::URI & endpoint_, String proxy_scheme_, unsigned proxy_port_);
+    ProxyResolverConfiguration(const Poco::URI & endpoint_, String proxy_scheme_, unsigned proxy_port_, unsigned cache_ttl_);
     Aws::Client::ClientConfigurationPerRequest getConfiguration(const Aws::Http::HttpRequest & request) override;
+    void errorReport(const Aws::Client::ClientConfigurationPerRequest & config) override;
 
 private:
     /// Endpoint to obtain a proxy host.
@@ -28,6 +29,12 @@ private:
     const String proxy_scheme;
     /// Port for obtained proxy.
     const unsigned proxy_port;
+
+    std::mutex cache_mutex;
+    bool cache_valid = false;
+    std::chrono::time_point<std::chrono::system_clock> cache_timestamp;
+    const std::chrono::seconds cache_ttl{0};
+    Aws::Client::ClientConfigurationPerRequest cached_config;
 };
 
 }
diff --git a/src/Disks/S3/registerDiskS3.cpp b/src/Disks/S3/registerDiskS3.cpp
index 49a11b1dbb9..8174ccea330 100644
--- a/src/Disks/S3/registerDiskS3.cpp
+++ b/src/Disks/S3/registerDiskS3.cpp
@@ -1,8 +1,6 @@
-#if !defined(ARCADIA_BUILD)
-    #include <Common/config.h>
-#endif
+#include <Common/config.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
@@ -10,7 +8,7 @@
 
 #if USE_AWS_S3
 
-#include <aws/core/client/DefaultRetryStrategy.h> // Y_IGNORE
+#include <aws/core/client/DefaultRetryStrategy.h>
 #include <IO/S3Common.h>
 #include "DiskS3.h"
 #include "Disks/DiskCacheWrapper.h"
@@ -39,7 +37,7 @@ void checkWriteAccess(IDisk & disk)
 
 void checkReadAccess(const String & disk_name, IDisk & disk)
 {
-    auto file = disk.readFile("test_acl", DBMS_DEFAULT_BUFFER_SIZE);
+    auto file = disk.readFile("test_acl");
     String buf(4, '0');
     file->readStrict(buf.data(), 4);
     if (buf != "test")
@@ -56,11 +54,12 @@ std::shared_ptr<S3::ProxyResolverConfiguration> getProxyResolverConfiguration(
     if (proxy_scheme != "http" && proxy_scheme != "https")
         throw Exception("Only HTTP/HTTPS schemas allowed in proxy resolver config: " + proxy_scheme, ErrorCodes::BAD_ARGUMENTS);
     auto proxy_port = proxy_resolver_config.getUInt(prefix + ".proxy_port");
+    auto cache_ttl = proxy_resolver_config.getUInt(prefix + ".proxy_cache_time", 10);
 
     LOG_DEBUG(&Poco::Logger::get("DiskS3"), "Configured proxy resolver: {}, Scheme: {}, Port: {}",
         endpoint.toString(), proxy_scheme, proxy_port);
 
-    return std::make_shared<S3::ProxyResolverConfiguration>(endpoint, proxy_scheme, proxy_port);
+    return std::make_shared<S3::ProxyResolverConfiguration>(endpoint, proxy_scheme, proxy_port, cache_ttl);
 }
 
 std::shared_ptr<S3::ProxyListConfiguration> getProxyListConfiguration(
@@ -128,8 +127,12 @@ getClient(const Poco::Util::AbstractConfiguration & config, const String & confi
 
     auto proxy_config = getProxyConfiguration(config_prefix, config);
     if (proxy_config)
+    {
         client_configuration.perRequestConfiguration
             = [proxy_config](const auto & request) { return proxy_config->getConfiguration(request); };
+        client_configuration.error_report
+            = [proxy_config](const auto & request_config) { proxy_config->errorReport(request_config); };
+    }
 
     client_configuration.retryStrategy
         = std::make_shared<Aws::Client::DefaultRetryStrategy>(config.getUInt(config_prefix + ".retry_attempts", 10));
@@ -181,6 +184,7 @@ void registerDiskS3(DiskFactory & factory)
             uri.bucket,
             uri.key,
             metadata_path,
+            context,
             getSettings(config, config_prefix, context),
             getSettings);
 
diff --git a/src/Disks/S3/ya.make b/src/Disks/S3/ya.make
deleted file mode 100644
index f4df540168d..00000000000
--- a/src/Disks/S3/ya.make
+++ /dev/null
@@ -1,17 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    DiskS3.cpp
-    registerDiskS3.cpp
-    ProxyListConfiguration.cpp
-    ProxyResolverConfiguration.cpp
-)
-
-END()
diff --git a/src/Disks/StoragePolicy.cpp b/src/Disks/StoragePolicy.cpp
index efedff9929f..c47f517bf88 100644
--- a/src/Disks/StoragePolicy.cpp
+++ b/src/Disks/StoragePolicy.cpp
@@ -157,17 +157,6 @@ Disks StoragePolicy::getDisks() const
 }
 
 
-Disks StoragePolicy::getDisksByType(DiskType::Type type) const
-{
-    Disks res;
-    for (const auto & volume : volumes)
-        for (const auto & disk : volume->getDisks())
-            if (disk->getType() == type)
-                res.push_back(disk);
-    return res;
-}
-
-
 DiskPtr StoragePolicy::getAnyDisk() const
 {
     /// StoragePolicy must contain at least one Volume
diff --git a/src/Disks/StoragePolicy.h b/src/Disks/StoragePolicy.h
index 71773e91f70..b09baf09bda 100644
--- a/src/Disks/StoragePolicy.h
+++ b/src/Disks/StoragePolicy.h
@@ -11,7 +11,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Common/formatReadable.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <memory>
 #include <mutex>
@@ -47,9 +47,6 @@ public:
     /// Returns disks ordered by volumes priority
     Disks getDisks() const override;
 
-    /// Returns disks by type ordered by volumes priority
-    Disks getDisksByType(DiskType::Type type) const override;
-
     /// Returns any disk
     /// Used when it's not important, for example for
     /// mutations files
diff --git a/src/Disks/TemporaryFileOnDisk.cpp b/src/Disks/TemporaryFileOnDisk.cpp
new file mode 100644
index 00000000000..90e51dcc369
--- /dev/null
+++ b/src/Disks/TemporaryFileOnDisk.cpp
@@ -0,0 +1,27 @@
+#include <Disks/TemporaryFileOnDisk.h>
+#include <Disks/IDisk.h>
+#include <Poco/TemporaryFile.h>
+
+
+namespace DB
+{
+
+TemporaryFileOnDisk::TemporaryFileOnDisk(const DiskPtr & disk_, const String & prefix_)
+    : disk(disk_)
+{
+    String dummy_prefix = "a/";
+    filepath = Poco::TemporaryFile::tempName(dummy_prefix);
+    dummy_prefix += "tmp";
+    assert(filepath.starts_with(dummy_prefix));
+    filepath.replace(0, dummy_prefix.length(), prefix_);
+}
+
+TemporaryFileOnDisk::~TemporaryFileOnDisk()
+{
+#if 1
+    if (disk && !filepath.empty())
+        disk->removeRecursive(filepath);
+#endif
+}
+
+}
diff --git a/src/Disks/TemporaryFileOnDisk.h b/src/Disks/TemporaryFileOnDisk.h
new file mode 100644
index 00000000000..c854a600146
--- /dev/null
+++ b/src/Disks/TemporaryFileOnDisk.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <memory>
+
+namespace DB
+{
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
+/// This class helps with the handling of temporary files or directories.
+/// A unique name for the temporary file or directory is automatically chosen based on a specified prefix.
+/// Optionally can create a directory in the constructor.
+/// The destructor always removes the temporary file or directory with all contained files.
+class TemporaryFileOnDisk
+{
+public:
+    TemporaryFileOnDisk(const DiskPtr & disk_, const String & prefix_ = "tmp");
+    ~TemporaryFileOnDisk();
+
+    DiskPtr getDisk() const { return disk; }
+    const String & getPath() const { return filepath; }
+
+private:
+    DiskPtr disk;
+    String filepath;
+};
+
+}
diff --git a/src/Disks/VolumeJBOD.cpp b/src/Disks/VolumeJBOD.cpp
index e5905f77db3..ff4975d63ef 100644
--- a/src/Disks/VolumeJBOD.cpp
+++ b/src/Disks/VolumeJBOD.cpp
@@ -3,7 +3,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/formatReadable.h>
 #include <Common/quoteString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp
index bf2f09853fe..5dd86043d83 100644
--- a/src/Disks/registerDisks.cpp
+++ b/src/Disks/registerDisks.cpp
@@ -2,9 +2,7 @@
 
 #include "DiskFactory.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 namespace DB
 {
@@ -24,6 +22,8 @@ void registerDiskEncrypted(DiskFactory & factory);
 void registerDiskHDFS(DiskFactory & factory);
 #endif
 
+void registerDiskWebServer(DiskFactory & factory);
+
 
 void registerDisks()
 {
@@ -43,6 +43,8 @@ void registerDisks()
 #if USE_HDFS
     registerDiskHDFS(factory);
 #endif
+
+    registerDiskWebServer(factory);
 }
 
 }
diff --git a/src/Disks/tests/gtest_disk_encrypted.cpp b/src/Disks/tests/gtest_disk_encrypted.cpp
new file mode 100644
index 00000000000..85dd8eb78b8
--- /dev/null
+++ b/src/Disks/tests/gtest_disk_encrypted.cpp
@@ -0,0 +1,292 @@
+#include <gtest/gtest.h>
+
+#include <Disks/IDisk.h>
+#include <Disks/DiskLocal.h>
+#include <Disks/DiskEncrypted.h>
+#include <IO/FileEncryptionCommon.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/createReadBufferFromFileBase.h>
+#include <Poco/TemporaryFile.h>
+#include <boost/algorithm/string/join.hpp>
+
+using namespace DB;
+
+constexpr auto kHeaderSize = FileEncryption::Header::kSize;
+
+
+class DiskEncryptedTest : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        /// Make local disk.
+        temp_dir = std::make_unique<Poco::TemporaryFile>();
+        temp_dir->createDirectories();
+        local_disk = std::make_shared<DiskLocal>("local_disk", getDirectory(), 0);
+    }
+
+    void TearDown() override
+    {
+        encrypted_disk.reset();
+        local_disk.reset();
+    }
+
+    void makeEncryptedDisk(FileEncryption::Algorithm algorithm, const String & key, const String & path = "")
+    {
+        auto settings = std::make_unique<DiskEncryptedSettings>();
+        settings->wrapped_disk = local_disk;
+        settings->current_algorithm = algorithm;
+        settings->keys[0] = key;
+        settings->current_key_id = 0;
+        settings->disk_path = path;
+        encrypted_disk = std::make_shared<DiskEncrypted>("encrypted_disk", std::move(settings));
+    }
+
+    String getFileNames()
+    {
+        Strings file_names;
+        encrypted_disk->listFiles("", file_names);
+        return boost::algorithm::join(file_names, ", ");
+    }
+
+    String getDirectory()
+    {
+        return temp_dir->path() + "/";
+    }
+
+    String getFileContents(const String & file_name)
+    {
+        auto buf = encrypted_disk->readFile(file_name, /* settings= */ {}, /* size= */ {});
+        String str;
+        readStringUntilEOF(str, *buf);
+        return str;
+    }
+
+    static String getBinaryRepresentation(const String & abs_path)
+    {
+        auto buf = createReadBufferFromFileBase(abs_path, /* settings= */ {});
+        String str;
+        readStringUntilEOF(str, *buf);
+        return str;
+    }
+
+    static void checkBinaryRepresentation(const String & abs_path, size_t size)
+    {
+        String str = getBinaryRepresentation(abs_path);
+        EXPECT_EQ(str.size(), size);
+        if (str.size() >= 3)
+        {
+            EXPECT_EQ(str.substr(0, 3), "ENC");
+        }
+    }
+
+    std::unique_ptr<Poco::TemporaryFile> temp_dir;
+    std::shared_ptr<DiskLocal> local_disk;
+    std::shared_ptr<DiskEncrypted> encrypted_disk;
+};
+
+
+TEST_F(DiskEncryptedTest, WriteAndRead)
+{
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456");
+
+    /// No files
+    EXPECT_EQ(getFileNames(), "");
+
+    /// Write a file.
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+        writeString(std::string_view{"Some text"}, *buf);
+    }
+
+    /// Now we have one file.
+    EXPECT_EQ(getFileNames(), "a.txt");
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 9);
+
+    /// Read the file.
+    EXPECT_EQ(getFileContents("a.txt"), "Some text");
+    checkBinaryRepresentation(getDirectory() + "a.txt", kHeaderSize + 9);
+
+    /// Remove the file.
+    encrypted_disk->removeFile("a.txt");
+
+    /// No files again.
+    EXPECT_EQ(getFileNames(), "");
+}
+
+
+TEST_F(DiskEncryptedTest, Append)
+{
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456");
+
+    /// Write a file (we use the append mode).
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
+        writeString(std::string_view{"Some text"}, *buf);
+    }
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 9);
+    EXPECT_EQ(getFileContents("a.txt"), "Some text");
+    checkBinaryRepresentation(getDirectory() + "a.txt", kHeaderSize + 9);
+
+    /// Append the file.
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
+        writeString(std::string_view{" Another text"}, *buf);
+    }
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 22);
+    EXPECT_EQ(getFileContents("a.txt"), "Some text Another text");
+    checkBinaryRepresentation(getDirectory() + "a.txt", kHeaderSize + 22);
+}
+
+
+TEST_F(DiskEncryptedTest, Truncate)
+{
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456");
+
+    /// Write a file (we use the append mode).
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
+        writeString(std::string_view{"Some text"}, *buf);
+    }
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 9);
+    EXPECT_EQ(getFileContents("a.txt"), "Some text");
+    checkBinaryRepresentation(getDirectory() + "a.txt", kHeaderSize + 9);
+
+    /// Truncate the file.
+    encrypted_disk->truncateFile("a.txt", 4);
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 4);
+    EXPECT_EQ(getFileContents("a.txt"), "Some");
+    checkBinaryRepresentation(getDirectory() + "a.txt", kHeaderSize + 4);
+
+    /// Truncate the file to zero size.
+    encrypted_disk->truncateFile("a.txt", 0);
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 0);
+    EXPECT_EQ(getFileContents("a.txt"), "");
+    checkBinaryRepresentation(getDirectory() + "a.txt", 0);
+}
+
+
+TEST_F(DiskEncryptedTest, ZeroFileSize)
+{
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456");
+
+    /// Write nothing to a file.
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+    }
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 0);
+    EXPECT_EQ(getFileContents("a.txt"), "");
+    checkBinaryRepresentation(getDirectory() + "a.txt", 0);
+
+    /// Append the file with nothing.
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
+    }
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 0);
+    EXPECT_EQ(getFileContents("a.txt"), "");
+    checkBinaryRepresentation(getDirectory() + "a.txt", 0);
+
+    /// Truncate the file to zero size.
+    encrypted_disk->truncateFile("a.txt", 0);
+
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 0);
+    EXPECT_EQ(getFileContents("a.txt"), "");
+    checkBinaryRepresentation(getDirectory() + "a.txt", 0);
+}
+
+
+TEST_F(DiskEncryptedTest, AnotherFolder)
+{
+    /// Encrypted disk will store its files at the path "folder1/folder2/".
+    local_disk->createDirectories("folder1/folder2");
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456", "folder1/folder2/");
+
+    /// Write a file.
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+        writeString(std::string_view{"Some text"}, *buf);
+    }
+
+    /// Now we have one file.
+    EXPECT_EQ(getFileNames(), "a.txt");
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 9);
+
+    /// Read the file.
+    EXPECT_EQ(getFileContents("a.txt"), "Some text");
+    checkBinaryRepresentation(getDirectory() + "folder1/folder2/a.txt", kHeaderSize + 9);
+}
+
+
+TEST_F(DiskEncryptedTest, RandomIV)
+{
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456");
+
+    /// Write two files with the same contents.
+    {
+        auto buf = encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+        writeString(std::string_view{"Some text"}, *buf);
+    }
+    {
+        auto buf = encrypted_disk->writeFile("b.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite);
+        writeString(std::string_view{"Some text"}, *buf);
+    }
+
+    /// Now we have two files.
+    EXPECT_EQ(encrypted_disk->getFileSize("a.txt"), 9);
+    EXPECT_EQ(encrypted_disk->getFileSize("b.txt"), 9);
+
+    /// Read the files.
+    EXPECT_EQ(getFileContents("a.txt"), "Some text");
+    EXPECT_EQ(getFileContents("b.txt"), "Some text");
+    checkBinaryRepresentation(getDirectory() + "a.txt", kHeaderSize + 9);
+    checkBinaryRepresentation(getDirectory() + "b.txt", kHeaderSize + 9);
+
+    String bina = getBinaryRepresentation(getDirectory() + "a.txt");
+    String binb = getBinaryRepresentation(getDirectory() + "b.txt");
+    constexpr size_t iv_offset = 16;
+    constexpr size_t iv_size = FileEncryption::InitVector::kSize;
+    EXPECT_EQ(bina.substr(0, iv_offset), binb.substr(0, iv_offset)); /// Part of the header before IV is the same.
+    EXPECT_NE(bina.substr(iv_offset, iv_size), binb.substr(iv_offset, iv_size)); /// IV differs.
+    EXPECT_EQ(bina.substr(iv_offset + iv_size, kHeaderSize - iv_offset - iv_size),
+              binb.substr(iv_offset + iv_size, kHeaderSize - iv_offset - iv_size)); /// Part of the header after IV is the same.
+    EXPECT_NE(bina.substr(kHeaderSize), binb.substr(kHeaderSize)); /// Encrypted data differs.
+}
+
+
+#if 0
+/// TODO: Try to change DiskEncrypted::writeFile() to fix this test.
+/// It fails sometimes with quite an unexpected error:
+/// libc++abi: terminating with uncaught exception of type std::__1::__fs::filesystem::filesystem_error:
+///           filesystem error: in file_size: No such file or directory [/tmp/tmp14608aaaaaa/a.txt]
+/// Aborted (core dumped)
+/// It happens because for encrypted disks file appending is not atomic (see DiskEncrypted::writeFile())
+/// and a file could be removed after checking its existence but before getting its size.
+TEST_F(DiskEncryptedTest, RemoveFileDuringWriting)
+{
+    makeEncryptedDisk(FileEncryption::Algorithm::AES_128_CTR, "1234567890123456");
+
+    size_t n = 100000;
+    std::thread t1{[&]
+    {
+        for (size_t i = 0; i != n; ++i)
+            encrypted_disk->writeFile("a.txt", DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
+    }};
+
+    std::thread t2{[&]
+    {
+        for (size_t i = 0; i != n; ++i)
+            encrypted_disk->removeFileIfExists("a.txt");
+    }};
+
+    t1.join();
+    t2.join();
+}
+#endif
diff --git a/src/Disks/tests/gtest_disk_hdfs.cpp b/src/Disks/tests/gtest_disk_hdfs.cpp
index d537ac967e5..2864797aae3 100644
--- a/src/Disks/tests/gtest_disk_hdfs.cpp
+++ b/src/Disks/tests/gtest_disk_hdfs.cpp
@@ -53,7 +53,7 @@ TEST(DiskTestHDFS, WriteReadHDFS)
 
     {
         DB::String result;
-        auto in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        auto in = disk.readFile(file_name, {}, 1024);
         readString(result, *in);
         EXPECT_EQ("Test write to file", result);
     }
@@ -76,7 +76,7 @@ TEST(DiskTestHDFS, RewriteFileHDFS)
 
     {
         String result;
-        auto in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        auto in = disk.readFile(file_name, {}, 1024);
         readString(result, *in);
         EXPECT_EQ("Text10", result);
         readString(result, *in);
@@ -104,7 +104,7 @@ TEST(DiskTestHDFS, AppendFileHDFS)
 
     {
         String result, expected;
-        auto in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        auto in = disk.readFile(file_name, {}, 1024);
 
         readString(result, *in);
         EXPECT_EQ("Text0123456789", result);
@@ -131,7 +131,7 @@ TEST(DiskTestHDFS, SeekHDFS)
     /// Test SEEK_SET
     {
         String buf(4, '0');
-        std::unique_ptr<DB::SeekableReadBuffer> in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        std::unique_ptr<DB::SeekableReadBuffer> in = disk.readFile(file_name, {}, 1024);
 
         in->seek(5, SEEK_SET);
 
@@ -141,7 +141,7 @@ TEST(DiskTestHDFS, SeekHDFS)
 
     /// Test SEEK_CUR
     {
-        std::unique_ptr<DB::SeekableReadBuffer> in = disk.readFile(file_name, 1024, 1024, 1024, 1024, nullptr);
+        std::unique_ptr<DB::SeekableReadBuffer> in = disk.readFile(file_name, {}, 1024);
         String buf(4, '0');
 
         in->readStrict(buf.data(), 4);
diff --git a/src/Disks/ya.make b/src/Disks/ya.make
deleted file mode 100644
index 925dfd2a0ce..00000000000
--- a/src/Disks/ya.make
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-    DiskCacheWrapper.cpp
-    DiskDecorator.cpp
-    DiskEncrypted.cpp
-    DiskFactory.cpp
-    DiskLocal.cpp
-    DiskMemory.cpp
-    DiskRestartProxy.cpp
-    DiskSelector.cpp
-    IDisk.cpp
-    IDiskRemote.cpp
-    IVolume.cpp
-    LocalDirectorySyncGuard.cpp
-    ReadIndirectBufferFromRemoteFS.cpp
-    SingleDiskVolume.cpp
-    StoragePolicy.cpp
-    VolumeJBOD.cpp
-    VolumeRAID1.cpp
-    WriteIndirectBufferFromRemoteFS.cpp
-    createVolume.cpp
-    registerDisks.cpp
-
-)
-
-END()
diff --git a/src/Disks/ya.make.in b/src/Disks/ya.make.in
deleted file mode 100644
index b803294afbe..00000000000
--- a/src/Disks/ya.make.in
+++ /dev/null
@@ -1,13 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -P 'S3|HDFS' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Formats/CapnProtoUtils.cpp b/src/Formats/CapnProtoUtils.cpp
new file mode 100644
index 00000000000..ecfa5df8351
--- /dev/null
+++ b/src/Formats/CapnProtoUtils.cpp
@@ -0,0 +1,432 @@
+#include <Formats/CapnProtoUtils.h>
+
+#if USE_CAPNP
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/IDataType.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <capnp/schema.h>
+#include <capnp/schema-parser.h>
+#include <fcntl.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_PARSE_CAPN_PROTO_SCHEMA;
+    extern const int THERE_IS_NO_COLUMN;
+    extern const int BAD_TYPE_OF_FIELD;
+    extern const int CAPN_PROTO_BAD_CAST;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int UNKNOWN_EXCEPTION;
+    extern const int INCORRECT_DATA;
+}
+
+capnp::StructSchema CapnProtoSchemaParser::getMessageSchema(const FormatSchemaInfo & schema_info)
+{
+    capnp::ParsedSchema schema;
+    try
+    {
+        int fd;
+        KJ_SYSCALL(fd = open(schema_info.schemaDirectory().data(), O_RDONLY));
+        auto schema_dir = kj::newDiskDirectory(kj::OsFileHandle(fd));
+        schema = impl.parseFromDirectory(*schema_dir, kj::Path::parse(schema_info.schemaPath()), {});
+    }
+    catch (const kj::Exception & e)
+    {
+        /// That's not good to determine the type of error by its description, but
+        /// this is the only way to do it here, because kj doesn't specify the type of error.
+        auto description = std::string_view(e.getDescription().cStr());
+        if (description.find("No such file or directory") != String::npos || description.find("no such directory") != String::npos)
+            throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Cannot open CapnProto schema, file {} doesn't exists", schema_info.absoluteSchemaPath());
+
+        if (description.find("Parse error") != String::npos)
+            throw Exception(ErrorCodes::CANNOT_PARSE_CAPN_PROTO_SCHEMA, "Cannot parse CapnProto schema {}:{}", schema_info.schemaPath(), e.getLine());
+
+        throw Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Unknown exception while parsing CapnProro schema: {}, schema dir and file: {}, {}", description, schema_info.schemaDirectory(), schema_info.schemaPath());
+    }
+
+    auto message_maybe = schema.findNested(schema_info.messageName());
+    auto * message_schema = kj::_::readMaybe(message_maybe);
+    if (!message_schema)
+        throw Exception(ErrorCodes::CANNOT_PARSE_CAPN_PROTO_SCHEMA, "CapnProto schema doesn't contain message with name {}", schema_info.messageName());
+    return message_schema->asStruct();
+}
+
+bool compareEnumNames(const String & first, const String & second, FormatSettings::EnumComparingMode mode)
+{
+    if (mode == FormatSettings::EnumComparingMode::BY_NAMES_CASE_INSENSITIVE)
+        return boost::algorithm::to_lower_copy(first) == boost::algorithm::to_lower_copy(second);
+    return first == second;
+}
+
+static const std::map<capnp::schema::Type::Which, String> capnp_simple_type_names =
+{
+        {capnp::schema::Type::Which::BOOL, "Bool"},
+        {capnp::schema::Type::Which::VOID, "Void"},
+        {capnp::schema::Type::Which::INT8, "Int8"},
+        {capnp::schema::Type::Which::INT16, "Int16"},
+        {capnp::schema::Type::Which::INT32, "Int32"},
+        {capnp::schema::Type::Which::INT64, "Int64"},
+        {capnp::schema::Type::Which::UINT8, "UInt8"},
+        {capnp::schema::Type::Which::UINT16, "UInt16"},
+        {capnp::schema::Type::Which::UINT32, "UInt32"},
+        {capnp::schema::Type::Which::UINT64, "UInt64"},
+        {capnp::schema::Type::Which::FLOAT32, "Float32"},
+        {capnp::schema::Type::Which::FLOAT64, "Float64"},
+        {capnp::schema::Type::Which::TEXT, "Text"},
+        {capnp::schema::Type::Which::DATA, "Data"},
+        {capnp::schema::Type::Which::INTERFACE, "Interface"},
+        {capnp::schema::Type::Which::ANY_POINTER, "AnyPointer"},
+};
+
+static bool checkIfStructContainsUnnamedUnion(const capnp::StructSchema & struct_schema)
+{
+    return struct_schema.getFields().size() != struct_schema.getNonUnionFields().size();
+}
+
+static bool checkIfStructIsNamedUnion(const capnp::StructSchema & struct_schema)
+{
+    return struct_schema.getFields().size() == struct_schema.getUnionFields().size();
+}
+
+/// Get full name of type for better exception messages.
+static String getCapnProtoFullTypeName(const capnp::Type & type)
+{
+    switch (type.which())
+    {
+        case capnp::schema::Type::Which::STRUCT:
+        {
+            auto struct_schema = type.asStruct();
+
+            auto non_union_fields = struct_schema.getNonUnionFields();
+            std::vector<String> non_union_field_names;
+            for (auto nested_field : non_union_fields)
+                non_union_field_names.push_back(String(nested_field.getProto().getName()) + " " + getCapnProtoFullTypeName(nested_field.getType()));
+
+            auto union_fields = struct_schema.getUnionFields();
+            std::vector<String> union_field_names;
+            for (auto nested_field : union_fields)
+                union_field_names.push_back(String(nested_field.getProto().getName()) + " " + getCapnProtoFullTypeName(nested_field.getType()));
+
+            String union_name = "Union(" + boost::algorithm::join(union_field_names, ", ") + ")";
+            /// Check if the struct is a named union.
+            if (non_union_field_names.empty())
+                return union_name;
+
+            String type_name = "Struct(" + boost::algorithm::join(non_union_field_names, ", ");
+            /// Check if the struct contains unnamed union.
+            if (!union_field_names.empty())
+                type_name += ", " + union_name;
+            type_name += ")";
+            return type_name;
+        }
+        case capnp::schema::Type::Which::LIST:
+            return "List(" + getCapnProtoFullTypeName(type.asList().getElementType()) + ")";
+        case capnp::schema::Type::Which::ENUM:
+        {
+            auto enum_schema = type.asEnum();
+            String enum_name = "Enum(";
+            auto enumerants = enum_schema.getEnumerants();
+            for (size_t i = 0; i != enumerants.size(); ++i)
+            {
+                enum_name += String(enumerants[i].getProto().getName()) + " = " + std::to_string(enumerants[i].getOrdinal());
+                if (i + 1 != enumerants.size())
+                    enum_name += ", ";
+            }
+            enum_name += ")";
+            return enum_name;
+        }
+        default:
+            auto it = capnp_simple_type_names.find(type.which());
+            if (it == capnp_simple_type_names.end())
+                throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD, "Unknown CapnProto type");
+            return it->second;
+    }
+}
+
+template <typename Type>
+static bool checkEnums(const capnp::Type & capnp_type, const DataTypePtr column_type, FormatSettings::EnumComparingMode mode, UInt64 max_value, String & error_message)
+{
+    if (!capnp_type.isEnum())
+        return false;
+
+    auto enum_schema = capnp_type.asEnum();
+    bool to_lower = mode == FormatSettings::EnumComparingMode::BY_NAMES_CASE_INSENSITIVE;
+    const auto * enum_type = assert_cast<const DataTypeEnum<Type> *>(column_type.get());
+    const auto & enum_values = dynamic_cast<const EnumValues<Type> &>(*enum_type);
+
+    auto enumerants = enum_schema.getEnumerants();
+    if (mode == FormatSettings::EnumComparingMode::BY_VALUES)
+    {
+        /// In CapnProto Enum fields are numbered sequentially starting from zero.
+        if (enumerants.size() > max_value)
+        {
+            error_message += "Enum from CapnProto schema contains values that is out of range for Clickhouse Enum";
+            return false;
+        }
+
+        auto values = enum_values.getSetOfAllValues();
+        std::unordered_set<Type> capn_enum_values;
+        for (auto enumerant : enumerants)
+            capn_enum_values.insert(Type(enumerant.getOrdinal()));
+        auto result = values == capn_enum_values;
+        if (!result)
+            error_message += "The set of values in Enum from CapnProto schema is different from the set of values in ClickHouse Enum";
+        return result;
+    }
+
+    auto names = enum_values.getSetOfAllNames(to_lower);
+    std::unordered_set<String> capn_enum_names;
+
+    for (auto enumerant : enumerants)
+    {
+        String name = enumerant.getProto().getName();
+        capn_enum_names.insert(to_lower ? boost::algorithm::to_lower_copy(name) : name);
+    }
+
+    auto result = names == capn_enum_names;
+    if (!result)
+        error_message += "The set of names in Enum from CapnProto schema is different from the set of names in ClickHouse Enum";
+    return result;
+}
+
+static bool checkCapnProtoType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message);
+
+static bool checkNullableType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message)
+{
+    if (!capnp_type.isStruct())
+        return false;
+
+    /// Check that struct is a named union of type VOID and one arbitrary type.
+    auto struct_schema = capnp_type.asStruct();
+    if (!checkIfStructIsNamedUnion(struct_schema))
+        return false;
+
+    auto union_fields = struct_schema.getUnionFields();
+    if (union_fields.size() != 2)
+        return false;
+
+    auto first = union_fields[0];
+    auto second = union_fields[1];
+
+    auto nested_type = assert_cast<const DataTypeNullable *>(data_type.get())->getNestedType();
+    if (first.getType().isVoid())
+        return checkCapnProtoType(second.getType(), nested_type, mode, error_message);
+    if (second.getType().isVoid())
+        return checkCapnProtoType(first.getType(), nested_type, mode, error_message);
+    return false;
+}
+
+static bool checkTupleType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message)
+{
+    if (!capnp_type.isStruct())
+        return false;
+    auto struct_schema = capnp_type.asStruct();
+
+    if (checkIfStructIsNamedUnion(struct_schema))
+        return false;
+
+    if (checkIfStructContainsUnnamedUnion(struct_schema))
+    {
+        error_message += "CapnProto struct contains unnamed union";
+        return false;
+    }
+
+    const auto * tuple_data_type = assert_cast<const DataTypeTuple *>(data_type.get());
+    auto nested_types = tuple_data_type->getElements();
+    if (nested_types.size() != struct_schema.getFields().size())
+    {
+        error_message += "Tuple and Struct types have different sizes";
+        return false;
+    }
+
+    if (!tuple_data_type->haveExplicitNames())
+    {
+        error_message += "Only named Tuple can be converted to CapnProto Struct";
+        return false;
+    }
+    for (const auto & name : tuple_data_type->getElementNames())
+    {
+        KJ_IF_MAYBE(field, struct_schema.findFieldByName(name))
+        {
+            if (!checkCapnProtoType(field->getType(), nested_types[tuple_data_type->getPositionByName(name)], mode, error_message))
+                return false;
+        }
+        else
+        {
+            error_message += "CapnProto struct doesn't contain a field with name " + name;
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static bool checkArrayType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message)
+{
+    if (!capnp_type.isList())
+        return false;
+    auto list_schema = capnp_type.asList();
+    auto nested_type = assert_cast<const DataTypeArray *>(data_type.get())->getNestedType();
+    return checkCapnProtoType(list_schema.getElementType(), nested_type, mode, error_message);
+}
+
+static bool checkCapnProtoType(const capnp::Type & capnp_type, const DataTypePtr & data_type, FormatSettings::EnumComparingMode mode, String & error_message)
+{
+    switch (data_type->getTypeId())
+    {
+        case TypeIndex::UInt8:
+            return capnp_type.isBool() || capnp_type.isUInt8();
+        case TypeIndex::Date: [[fallthrough]];
+        case TypeIndex::UInt16:
+            return capnp_type.isUInt16();
+        case TypeIndex::DateTime: [[fallthrough]];
+        case TypeIndex::UInt32:
+            return capnp_type.isUInt32();
+        case TypeIndex::UInt64:
+            return capnp_type.isUInt64();
+        case TypeIndex::Int8:
+            return capnp_type.isInt8();
+        case TypeIndex::Int16:
+            return capnp_type.isInt16();
+        case TypeIndex::Date32: [[fallthrough]];
+        case TypeIndex::Int32:
+            return capnp_type.isInt32();
+        case TypeIndex::DateTime64: [[fallthrough]];
+        case TypeIndex::Int64:
+            return capnp_type.isInt64();
+        case TypeIndex::Float32:
+            return capnp_type.isFloat32();
+        case TypeIndex::Float64:
+            return capnp_type.isFloat64();
+        case TypeIndex::Enum8:
+            return checkEnums<Int8>(capnp_type, data_type, mode, INT8_MAX, error_message);
+        case TypeIndex::Enum16:
+            return checkEnums<Int16>(capnp_type, data_type, mode, INT16_MAX, error_message);
+        case TypeIndex::Tuple:
+            return checkTupleType(capnp_type, data_type, mode, error_message);
+        case TypeIndex::Nullable:
+        {
+            auto result = checkNullableType(capnp_type, data_type, mode, error_message);
+            if (!result)
+                error_message += "Nullable can be represented only as a named union of type Void and nested type";
+            return result;
+        }
+        case TypeIndex::Array:
+            return checkArrayType(capnp_type, data_type, mode, error_message);
+        case TypeIndex::LowCardinality:
+            return checkCapnProtoType(capnp_type, assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType(), mode, error_message);
+        case TypeIndex::FixedString: [[fallthrough]];
+        case TypeIndex::String:
+            return capnp_type.isText() || capnp_type.isData();
+        default:
+            return false;
+    }
+}
+
+static std::pair<String, String> splitFieldName(const String & name)
+{
+    const auto * begin = name.data();
+    const auto * end = name.data() + name.size();
+    const auto * it = find_first_symbols<'_', '.'>(begin, end);
+    String first = String(begin, it);
+    String second = it == end ? "" : String(it + 1, end);
+    return {first, second};
+}
+
+capnp::DynamicValue::Reader getReaderByColumnName(const capnp::DynamicStruct::Reader & struct_reader, const String & name)
+{
+    auto [field_name, nested_name] = splitFieldName(name);
+    KJ_IF_MAYBE(field, struct_reader.getSchema().findFieldByName(field_name))
+    {
+        capnp::DynamicValue::Reader field_reader;
+        try
+        {
+            field_reader = struct_reader.get(*field);
+        }
+        catch (const kj::Exception & e)
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot extract field value from struct by provided schema, error: {} Perhaps the data was generated by another schema", String(e.getDescription().cStr()));
+        }
+
+        if (nested_name.empty())
+            return field_reader;
+
+        if (field_reader.getType() != capnp::DynamicValue::STRUCT)
+            throw Exception(ErrorCodes::CAPN_PROTO_BAD_CAST, "Field {} is not a struct", field_name);
+
+        return getReaderByColumnName(field_reader.as<capnp::DynamicStruct>(), nested_name);
+    }
+
+    throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Capnproto struct doesn't contain field with name {}", field_name);
+}
+
+std::pair<capnp::DynamicStruct::Builder, capnp::StructSchema::Field> getStructBuilderAndFieldByColumnName(capnp::DynamicStruct::Builder struct_builder, const String & name)
+{
+    auto [field_name, nested_name] = splitFieldName(name);
+    KJ_IF_MAYBE(field, struct_builder.getSchema().findFieldByName(field_name))
+    {
+        if (nested_name.empty())
+            return {struct_builder, *field};
+
+        auto field_builder = struct_builder.get(*field);
+        if (field_builder.getType() != capnp::DynamicValue::STRUCT)
+            throw Exception(ErrorCodes::CAPN_PROTO_BAD_CAST, "Field {} is not a struct", field_name);
+
+        return getStructBuilderAndFieldByColumnName(field_builder.as<capnp::DynamicStruct>(), nested_name);
+    }
+
+    throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Capnproto struct doesn't contain field with name {}", field_name);
+}
+
+static capnp::StructSchema::Field getFieldByName(const capnp::StructSchema & schema, const String & name)
+{
+    auto [field_name, nested_name] = splitFieldName(name);
+    KJ_IF_MAYBE(field, schema.findFieldByName(field_name))
+    {
+        if (nested_name.empty())
+            return *field;
+
+        if (!field->getType().isStruct())
+            throw Exception(ErrorCodes::CAPN_PROTO_BAD_CAST, "Field {} is not a struct", field_name);
+
+        return getFieldByName(field->getType().asStruct(), nested_name);
+    }
+
+    throw Exception(ErrorCodes::THERE_IS_NO_COLUMN, "Capnproto schema doesn't contain field with name {}", field_name);
+}
+
+void checkCapnProtoSchemaStructure(const capnp::StructSchema & schema, const Block & header, FormatSettings::EnumComparingMode mode)
+{
+    /// Firstly check that struct doesn't contain unnamed union, because we don't support it.
+    if (checkIfStructContainsUnnamedUnion(schema))
+        throw Exception(ErrorCodes::CAPN_PROTO_BAD_CAST, "Schema contains unnamed union that is not supported");
+    auto names_and_types = header.getNamesAndTypesList();
+    String additional_error_message;
+    for (auto & [name, type] : names_and_types)
+    {
+        auto field = getFieldByName(schema, name);
+        if (!checkCapnProtoType(field.getType(), type, mode, additional_error_message))
+        {
+            auto e = Exception(
+                ErrorCodes::CAPN_PROTO_BAD_CAST,
+                "Cannot convert ClickHouse type {} to CapnProto type {}",
+                type->getName(),
+                getCapnProtoFullTypeName(field.getType()));
+            if (!additional_error_message.empty())
+                e.addMessage(additional_error_message);
+            throw std::move(e);
+        }
+    }
+}
+
+}
+
+#endif
diff --git a/src/Formats/CapnProtoUtils.h b/src/Formats/CapnProtoUtils.h
new file mode 100644
index 00000000000..93ca0a5e616
--- /dev/null
+++ b/src/Formats/CapnProtoUtils.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "config_formats.h"
+#if USE_CAPNP
+
+#include <Formats/FormatSchemaInfo.h>
+#include <Formats/FormatSettings.h>
+#include <Core/Block.h>
+#include <capnp/schema-parser.h>
+#include <capnp/dynamic.h>
+
+namespace DB
+{
+// Wrapper for classes that could throw in destructor
+// https://github.com/capnproto/capnproto/issues/553
+template <typename T>
+struct DestructorCatcher
+{
+    T impl;
+    template <typename ... Arg>
+    DestructorCatcher(Arg && ... args) : impl(kj::fwd<Arg>(args)...) {}
+    ~DestructorCatcher() noexcept try { } catch (...) { return; }
+};
+
+class CapnProtoSchemaParser : public DestructorCatcher<capnp::SchemaParser>
+{
+public:
+    CapnProtoSchemaParser() {}
+
+    capnp::StructSchema getMessageSchema(const FormatSchemaInfo & schema_info);
+};
+
+bool compareEnumNames(const String & first, const String & second, FormatSettings::EnumComparingMode mode);
+
+std::pair<capnp::DynamicStruct::Builder, capnp::StructSchema::Field> getStructBuilderAndFieldByColumnName(capnp::DynamicStruct::Builder struct_builder, const String & name);
+
+capnp::DynamicValue::Reader getReaderByColumnName(const capnp::DynamicStruct::Reader & struct_reader, const String & name);
+
+void checkCapnProtoSchemaStructure(const capnp::StructSchema & schema, const Block & header, FormatSettings::EnumComparingMode mode);
+
+}
+
+#endif
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index d2d6d92dea3..d2dc18a03fd 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -4,25 +4,18 @@
 #include <Common/Exception.h>
 #include <Interpreters/Context.h>
 #include <Core/Settings.h>
-#include <DataStreams/MaterializingBlockOutputStream.h>
-#include <DataStreams/NativeBlockInputStream.h>
 #include <Formats/FormatSettings.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Processors/Formats/IRowOutputFormat.h>
-#include <Processors/Formats/OutputStreamToOutputFormat.h>
 #include <Processors/Formats/Impl/ValuesBlockInputFormat.h>
 #include <Processors/Formats/Impl/MySQLOutputFormat.h>
-#include <Processors/Formats/Impl/NativeFormat.h>
 #include <Processors/Formats/Impl/ParallelParsingInputFormat.h>
 #include <Processors/Formats/Impl/ParallelFormattingOutputFormat.h>
 #include <Poco/URI.h>
 
+#include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadHelpers.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
-
 namespace DB
 {
 
@@ -32,7 +25,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int FORMAT_IS_NOT_SUITABLE_FOR_INPUT;
     extern const int FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT;
-    extern const int UNSUPPORTED_METHOD;
 }
 
 const FormatFactory::Creators & FormatFactory::getCreators(const String & name) const
@@ -66,6 +58,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.csv.delimiter = settings.format_csv_delimiter;
     format_settings.csv.empty_as_default = settings.input_format_defaults_for_omitted_fields;
     format_settings.csv.input_format_enum_as_number = settings.input_format_csv_enum_as_number;
+    format_settings.csv.null_representation = settings.output_format_csv_null_representation;
     format_settings.csv.unquoted_null_literal_as_null = settings.input_format_csv_unquoted_null_literal_as_null;
     format_settings.csv.input_format_arrays_as_nested_csv = settings.input_format_csv_arrays_as_nested_csv;
     format_settings.custom.escaping_rule = settings.format_custom_escaping_rule;
@@ -87,7 +80,9 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.json.quote_64bit_integers = settings.output_format_json_quote_64bit_integers;
     format_settings.json.quote_denormals = settings.output_format_json_quote_denormals;
     format_settings.null_as_default = settings.input_format_null_as_default;
+    format_settings.decimal_trailing_zeros = settings.output_format_decimal_trailing_zeros;
     format_settings.parquet.row_group_size = settings.output_format_parquet_row_group_size;
+    format_settings.parquet.import_nested = settings.input_format_parquet_import_nested;
     format_settings.pretty.charset = settings.output_format_pretty_grid_charset.toString() == "ASCII" ? FormatSettings::Pretty::Charset::ASCII : FormatSettings::Pretty::Charset::UTF8;
     format_settings.pretty.color = settings.output_format_pretty_color;
     format_settings.pretty.max_column_pad_width = settings.output_format_pretty_max_column_pad_width;
@@ -114,6 +109,9 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.with_names_use_header = settings.input_format_with_names_use_header;
     format_settings.write_statistics = settings.output_format_write_statistics;
     format_settings.arrow.low_cardinality_as_dictionary = settings.output_format_arrow_low_cardinality_as_dictionary;
+    format_settings.arrow.import_nested = settings.input_format_arrow_import_nested;
+    format_settings.orc.import_nested = settings.input_format_orc_import_nested;
+    format_settings.capn_proto.enum_comparing_mode = settings.format_capn_proto_enum_comparising_mode;
 
     /// Validate avro_schema_registry_url with RemoteHostFilter when non-empty and in Server context
     if (format_settings.schema.is_server)
@@ -139,13 +137,10 @@ InputFormatPtr FormatFactory::getInput(
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings) const
 {
-    if (name == "Native")
-        return std::make_shared<NativeInputFormatFromNativeBlockInputStream>(sample, buf);
-
     auto format_settings = _format_settings
         ? *_format_settings : getFormatSettings(context);
 
-    if (!getCreators(name).input_processor_creator)
+    if (!getCreators(name).input_creator)
     {
         throw Exception("Format " + name + " is not suitable for input (with processors)", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
     }
@@ -163,19 +158,17 @@ InputFormatPtr FormatFactory::getInput(
     if (settings.max_memory_usage_for_user && settings.min_chunk_bytes_for_parallel_parsing * settings.max_threads * 2 > settings.max_memory_usage_for_user)
         parallel_parsing = false;
 
-    if (parallel_parsing && name == "JSONEachRow")
+    if (parallel_parsing)
     {
-        /// FIXME ParallelParsingBlockInputStream doesn't support formats with non-trivial readPrefix() and readSuffix()
-
-        /// For JSONEachRow we can safely skip whitespace characters
-        skipWhitespaceIfAny(buf);
-        if (buf.eof() || *buf.position() == '[')
-            parallel_parsing = false; /// Disable it for JSONEachRow if data is in square brackets (see JSONEachRowRowInputFormat)
+        const auto & non_trivial_prefix_and_suffix_checker = getCreators(name).non_trivial_prefix_and_suffix_checker;
+        /// Disable parallel parsing for input formats with non-trivial readPrefix() and readSuffix().
+        if (non_trivial_prefix_and_suffix_checker && non_trivial_prefix_and_suffix_checker(buf))
+            parallel_parsing = false;
     }
 
     if (parallel_parsing)
     {
-        const auto & input_getter = getCreators(name).input_processor_creator;
+        const auto & input_getter = getCreators(name).input_creator;
 
         RowInputFormatParams row_input_format_params;
         row_input_format_params.max_block_size = max_block_size;
@@ -200,71 +193,6 @@ InputFormatPtr FormatFactory::getInput(
     return format;
 }
 
-BlockOutputStreamPtr FormatFactory::getOutputStreamParallelIfPossible(
-    const String & name,
-    WriteBuffer & buf,
-    const Block & sample,
-    ContextPtr context,
-    WriteCallback callback,
-    const std::optional<FormatSettings> & _format_settings) const
-{
-    const auto & output_getter = getCreators(name).output_processor_creator;
-
-    const Settings & settings = context->getSettingsRef();
-    bool parallel_formatting = settings.output_format_parallel_formatting;
-
-    if (output_getter && parallel_formatting && getCreators(name).supports_parallel_formatting
-        && !settings.output_format_json_array_of_rows)
-    {
-        auto format_settings = _format_settings
-        ? *_format_settings : getFormatSettings(context);
-
-        auto formatter_creator = [output_getter, sample, callback, format_settings]
-            (WriteBuffer & output) -> OutputFormatPtr
-            { return output_getter(output, sample, {std::move(callback)}, format_settings);};
-
-        ParallelFormattingOutputFormat::Params params{buf, sample, formatter_creator, settings.max_threads};
-        auto format = std::make_shared<ParallelFormattingOutputFormat>(params);
-
-        /// Enable auto-flush for streaming mode. Currently it is needed by INSERT WATCH query.
-        if (format_settings.enable_streaming)
-            format->setAutoFlush();
-
-        return std::make_shared<MaterializingBlockOutputStream>(std::make_shared<OutputStreamToOutputFormat>(format), sample);
-    }
-
-    return getOutputStream(name, buf, sample, context, callback, _format_settings);
-}
-
-
-BlockOutputStreamPtr FormatFactory::getOutputStream(
-    const String & name,
-    WriteBuffer & buf,
-    const Block & sample,
-    ContextPtr context,
-    WriteCallback callback,
-    const std::optional<FormatSettings> & _format_settings) const
-{
-    auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
-
-    if (!getCreators(name).output_processor_creator)
-    {
-        const auto & output_getter = getCreators(name).output_creator;
-        if (!output_getter)
-            throw Exception("Format " + name + " is not suitable for output", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT);
-
-        /**  Materialization is needed, because formats can use the functions `IDataType`,
-          *  which only work with full columns.
-          */
-        return std::make_shared<MaterializingBlockOutputStream>(
-            output_getter(buf, sample, std::move(callback), format_settings),
-            sample);
-    }
-
-    auto format = getOutputFormat(name, buf, sample, context, std::move(callback), _format_settings);
-    return std::make_shared<MaterializingBlockOutputStream>(std::make_shared<OutputStreamToOutputFormat>(format), sample);
-}
-
 
 InputFormatPtr FormatFactory::getInputFormat(
     const String & name,
@@ -274,7 +202,7 @@ InputFormatPtr FormatFactory::getInputFormat(
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings) const
 {
-    const auto & input_getter = getCreators(name).input_processor_creator;
+    const auto & input_getter = getCreators(name).input_creator;
     if (!input_getter)
         throw Exception("Format " + name + " is not suitable for input", ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_INPUT);
 
@@ -308,7 +236,7 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
     WriteCallback callback,
     const std::optional<FormatSettings> & _format_settings) const
 {
-    const auto & output_getter = getCreators(name).output_processor_creator;
+    const auto & output_getter = getCreators(name).output_creator;
     if (!output_getter)
         throw Exception(ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT, "Format {} is not suitable for output (with processors)", name);
 
@@ -343,7 +271,7 @@ OutputFormatPtr FormatFactory::getOutputFormat(
     WriteCallback callback,
     const std::optional<FormatSettings> & _format_settings) const
 {
-    const auto & output_getter = getCreators(name).output_processor_creator;
+    const auto & output_getter = getCreators(name).output_creator;
     if (!output_getter)
         throw Exception(ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT, "Format {} is not suitable for output (with processors)", name);
 
@@ -355,10 +283,6 @@ OutputFormatPtr FormatFactory::getOutputFormat(
 
     auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
 
-    /// If we're handling MySQL protocol connection right now then MySQLWire is only allowed output format.
-    if (format_settings.mysql_wire.sequence_id && (name != "MySQLWire"))
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "MySQL protocol does not support custom output formats");
-
     /** TODO: Materialization is needed, because formats can use the functions `IDataType`,
       *  which only work with full columns.
       */
@@ -375,7 +299,6 @@ OutputFormatPtr FormatFactory::getOutputFormat(
     return format;
 }
 
-
 void FormatFactory::registerInputFormat(const String & name, InputCreator input_creator)
 {
     auto & target = dict[name].input_creator;
@@ -384,6 +307,14 @@ void FormatFactory::registerInputFormat(const String & name, InputCreator input_
     target = std::move(input_creator);
 }
 
+void FormatFactory::registerNonTrivialPrefixAndSuffixChecker(const String & name, NonTrivialPrefixAndSuffixChecker non_trivial_prefix_and_suffix_checker)
+{
+    auto & target = dict[name].non_trivial_prefix_and_suffix_checker;
+    if (target)
+        throw Exception("FormatFactory: Non trivial prefix and suffix checker " + name + " is already registered", ErrorCodes::LOGICAL_ERROR);
+    target = std::move(non_trivial_prefix_and_suffix_checker);
+}
+
 void FormatFactory::registerOutputFormat(const String & name, OutputCreator output_creator)
 {
     auto & target = dict[name].output_creator;
@@ -392,22 +323,6 @@ void FormatFactory::registerOutputFormat(const String & name, OutputCreator outp
     target = std::move(output_creator);
 }
 
-void FormatFactory::registerInputFormatProcessor(const String & name, InputProcessorCreator input_creator)
-{
-    auto & target = dict[name].input_processor_creator;
-    if (target)
-        throw Exception("FormatFactory: Input format " + name + " is already registered", ErrorCodes::LOGICAL_ERROR);
-    target = std::move(input_creator);
-}
-
-void FormatFactory::registerOutputFormatProcessor(const String & name, OutputProcessorCreator output_creator)
-{
-    auto & target = dict[name].output_processor_creator;
-    if (target)
-        throw Exception("FormatFactory: Output format " + name + " is already registered", ErrorCodes::LOGICAL_ERROR);
-    target = std::move(output_creator);
-}
-
 void FormatFactory::registerFileSegmentationEngine(const String & name, FileSegmentationEngine file_segmentation_engine)
 {
     auto & target = dict[name].file_segmentation_engine;
@@ -441,6 +356,18 @@ bool FormatFactory::checkIfFormatIsColumnOriented(const String & name)
     return target.is_column_oriented;
 }
 
+bool FormatFactory::isInputFormat(const String & name) const
+{
+    auto it = dict.find(name);
+    return it != dict.end() && it->second.input_creator;
+}
+
+bool FormatFactory::isOutputFormat(const String & name) const
+{
+    auto it = dict.find(name);
+    return it != dict.end() && it->second.output_creator;
+}
+
 FormatFactory & FormatFactory::instance()
 {
     static FormatFactory ret;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 6edbafd2d64..ee3824081bb 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -1,11 +1,10 @@
 #pragma once
 
+#include <Common/Allocator.h>
 #include <Columns/IColumn.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Formats/FormatSettings.h>
 #include <Interpreters/Context_fwd.h>
-#include <IO/BufferWithOwnMemory.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -35,12 +34,15 @@ struct RowOutputFormatParams;
 using InputFormatPtr = std::shared_ptr<IInputFormat>;
 using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
 
+template <typename Allocator>
+struct Memory;
+
 FormatSettings getFormatSettings(ContextPtr context);
 
 template <typename T>
 FormatSettings getFormatSettings(ContextPtr context, const T & settings);
 
-/** Allows to create an IBlockInputStream or IBlockOutputStream by the name of the format.
+/** Allows to create an IInputFormat or IOutputFormat by the name of the format.
   * Note: format and compression are independent things.
   */
 class FormatFactory final : private boost::noncopyable
@@ -56,7 +58,7 @@ public:
       */
     using FileSegmentationEngine = std::function<std::pair<bool, size_t>(
         ReadBuffer & buf,
-        DB::Memory<> & memory,
+        DB::Memory<Allocator<false>> & memory,
         size_t min_chunk_bytes)>;
 
     /// This callback allows to perform some additional actions after writing a single row.
@@ -66,42 +68,34 @@ public:
         size_t row)>;
 
 private:
-    using InputCreator = std::function<BlockInputStreamPtr(
-        ReadBuffer & buf,
-        const Block & sample,
-        UInt64 max_block_size,
-        ReadCallback callback,
-        const FormatSettings & settings)>;
 
-    using OutputCreator = std::function<BlockOutputStreamPtr(
-        WriteBuffer & buf,
-        const Block & sample,
-        WriteCallback callback,
-        const FormatSettings & settings)>;
-
-    using InputProcessorCreatorFunc = InputFormatPtr(
+    using InputCreatorFunc = InputFormatPtr(
         ReadBuffer & buf,
         const Block & header,
         const RowInputFormatParams & params,
         const FormatSettings & settings);
 
-    using InputProcessorCreator = std::function<InputProcessorCreatorFunc>;
+    using InputCreator = std::function<InputCreatorFunc>;
 
-    using OutputProcessorCreator = std::function<OutputFormatPtr(
+    using OutputCreator = std::function<OutputFormatPtr(
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
             const FormatSettings & settings)>;
 
+    /// Some input formats can have non trivial readPrefix() and readSuffix(),
+    /// so in some cases there is no possibility to use parallel parsing.
+    /// The checker should return true if parallel parsing should be disabled.
+    using NonTrivialPrefixAndSuffixChecker = std::function<bool(ReadBuffer & buf)>;
+
     struct Creators
     {
         InputCreator input_creator;
         OutputCreator output_creator;
-        InputProcessorCreator input_processor_creator;
-        OutputProcessorCreator output_processor_creator;
         FileSegmentationEngine file_segmentation_engine;
         bool supports_parallel_formatting{false};
         bool is_column_oriented{false};
+        NonTrivialPrefixAndSuffixChecker non_trivial_prefix_and_suffix_checker;
     };
 
     using FormatsDictionary = std::unordered_map<String, Creators>;
@@ -117,25 +111,6 @@ public:
         UInt64 max_block_size,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
-    /// Checks all preconditions. Returns ordinary stream if parallel formatting cannot be done.
-    /// Currently used only in Client. Don't use it something else! Better look at getOutputFormatParallelIfPossible.
-    BlockOutputStreamPtr getOutputStreamParallelIfPossible(
-        const String & name,
-        WriteBuffer & buf,
-        const Block & sample,
-        ContextPtr context,
-        WriteCallback callback = {},
-        const std::optional<FormatSettings> & format_settings = std::nullopt) const;
-
-    /// Currently used only in Client. Don't use it something else! Better look at getOutputFormat.
-    BlockOutputStreamPtr getOutputStream(
-        const String & name,
-        WriteBuffer & buf,
-        const Block & sample,
-        ContextPtr context,
-        WriteCallback callback = {},
-        const std::optional<FormatSettings> & format_settings = std::nullopt) const;
-
     InputFormatPtr getInputFormat(
         const String & name,
         ReadBuffer & buf,
@@ -161,13 +136,13 @@ public:
         WriteCallback callback = {},
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
+    void registerFileSegmentationEngine(const String & name, FileSegmentationEngine file_segmentation_engine);
+
+    void registerNonTrivialPrefixAndSuffixChecker(const String & name, NonTrivialPrefixAndSuffixChecker non_trivial_prefix_and_suffix_checker);
+
     /// Register format by its name.
     void registerInputFormat(const String & name, InputCreator input_creator);
     void registerOutputFormat(const String & name, OutputCreator output_creator);
-    void registerFileSegmentationEngine(const String & name, FileSegmentationEngine file_segmentation_engine);
-
-    void registerInputFormatProcessor(const String & name, InputProcessorCreator input_creator);
-    void registerOutputFormatProcessor(const String & name, OutputProcessorCreator output_creator);
 
     void markOutputFormatSupportsParallelFormatting(const String & name);
     void markFormatAsColumnOriented(const String & name);
@@ -179,6 +154,9 @@ public:
         return dict;
     }
 
+    bool isInputFormat(const String & name) const;
+    bool isOutputFormat(const String & name) const;
+
 private:
     FormatsDictionary dict;
 
diff --git a/src/Formats/FormatSchemaInfo.cpp b/src/Formats/FormatSchemaInfo.cpp
index 2605c0bdf04..24c8dfc14f2 100644
--- a/src/Formats/FormatSchemaInfo.cpp
+++ b/src/Formats/FormatSchemaInfo.cpp
@@ -99,4 +99,10 @@ FormatSchemaInfo::FormatSchemaInfo(const String & format_schema, const String &
     }
 }
 
+FormatSchemaInfo::FormatSchemaInfo(const FormatSettings & settings, const String & format, bool require_message)
+    : FormatSchemaInfo(
+        settings.schema.format_schema, format, require_message, settings.schema.is_server, settings.schema.format_schema_path)
+{
+}
+
 }
diff --git a/src/Formats/FormatSchemaInfo.h b/src/Formats/FormatSchemaInfo.h
index 67f1baca84b..8c430218af0 100644
--- a/src/Formats/FormatSchemaInfo.h
+++ b/src/Formats/FormatSchemaInfo.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
+#include <Formats/FormatSettings.h>
 
 namespace DB
 {
@@ -11,6 +12,7 @@ class FormatSchemaInfo
 {
 public:
     FormatSchemaInfo(const String & format_schema, const String & format, bool require_message, bool is_server, const std::string & format_schema_path);
+    FormatSchemaInfo(const FormatSettings & settings, const String & format, bool require_message);
 
     /// Returns path to the schema file.
     const String & schemaPath() const { return schema_path; }
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 69df095bca8..403ccbc6763 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
@@ -28,6 +28,7 @@ struct FormatSettings
     bool write_statistics = true;
     bool import_nested_json = false;
     bool null_as_default = true;
+    bool decimal_trailing_zeros = false;
 
     enum class DateTimeInputFormat
     {
@@ -53,6 +54,7 @@ struct FormatSettings
     {
         UInt64 row_group_size = 1000000;
         bool low_cardinality_as_dictionary = false;
+        bool import_nested = false;
     } arrow;
 
     struct
@@ -74,6 +76,7 @@ struct FormatSettings
         bool crlf_end_of_line = false;
         bool input_format_enum_as_number = false;
         bool input_format_arrays_as_nested_csv = false;
+        String null_representation = "\\N";
     } csv;
 
     struct Custom
@@ -100,6 +103,7 @@ struct FormatSettings
     struct
     {
         UInt64 row_group_size = 1000000;
+        bool import_nested = false;
     } parquet;
 
     struct Pretty
@@ -174,6 +178,25 @@ struct FormatSettings
         bool deduce_templates_of_expressions = true;
         bool accurate_types_of_literals = true;
     } values;
+
+    struct
+    {
+        bool import_nested = false;
+    } orc;
+
+    /// For capnProto format we should determine how to
+    /// compare ClickHouse Enum and Enum from schema.
+    enum class EnumComparingMode
+    {
+        BY_NAMES, // Names in enums should be the same, values can be different.
+        BY_NAMES_CASE_INSENSITIVE, // Case-insensitive name comparison.
+        BY_VALUES, // Values should be the same, names can be different.
+    };
+
+    struct
+    {
+        EnumComparingMode enum_comparing_mode = EnumComparingMode::BY_VALUES;
+    } capn_proto;
 };
 
 }
diff --git a/src/Formats/JSONEachRowUtils.cpp b/src/Formats/JSONEachRowUtils.cpp
index d06f507f044..8ef05fa584e 100644
--- a/src/Formats/JSONEachRowUtils.cpp
+++ b/src/Formats/JSONEachRowUtils.cpp
@@ -1,5 +1,6 @@
 #include <IO/ReadHelpers.h>
-#include <common/find_symbols.h>
+#include <Formats/JSONEachRowUtils.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
@@ -87,4 +88,11 @@ std::pair<bool, size_t> fileSegmentationEngineJSONEachRowImpl(ReadBuffer & in, D
     return {loadAtPosition(in, memory, pos), number_of_rows};
 }
 
+bool nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl(ReadBuffer & buf)
+{
+    /// For JSONEachRow we can safely skip whitespace characters
+    skipWhitespaceIfAny(buf);
+    return buf.eof() || *buf.position() == '[';
+}
+
 }
diff --git a/src/Formats/JSONEachRowUtils.h b/src/Formats/JSONEachRowUtils.h
index adf85f37a22..2d2d4ad5531 100644
--- a/src/Formats/JSONEachRowUtils.h
+++ b/src/Formats/JSONEachRowUtils.h
@@ -1,8 +1,14 @@
 #pragma once
 
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/ReadBuffer.h>
+#include <utility>
+
 namespace DB
 {
 
 std::pair<bool, size_t> fileSegmentationEngineJSONEachRowImpl(ReadBuffer & in, DB::Memory<> & memory, size_t min_chunk_size);
 
+bool nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl(ReadBuffer & buf);
+
 }
diff --git a/src/DataStreams/MarkInCompressedFile.h b/src/Formats/MarkInCompressedFile.h
similarity index 98%
rename from src/DataStreams/MarkInCompressedFile.h
rename to src/Formats/MarkInCompressedFile.h
index 94ff5414762..ceefde43615 100644
--- a/src/DataStreams/MarkInCompressedFile.h
+++ b/src/Formats/MarkInCompressedFile.h
@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Common/PODArray.h>
 
diff --git a/src/Formats/NativeFormat.cpp b/src/Formats/NativeFormat.cpp
deleted file mode 100644
index f9cafbe5459..00000000000
--- a/src/Formats/NativeFormat.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <Formats/FormatFactory.h>
-
-
-namespace DB
-{
-
-void registerInputFormatNative(FormatFactory & factory)
-{
-    factory.registerInputFormat("Native", [](
-        ReadBuffer & buf,
-        const Block & sample,
-        UInt64 /* max_block_size */,
-        FormatFactory::ReadCallback /* callback */,
-        const FormatSettings &)
-    {
-        return std::make_shared<NativeBlockInputStream>(buf, sample, 0);
-    });
-}
-
-void registerOutputFormatNative(FormatFactory & factory)
-{
-    factory.registerOutputFormat("Native", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        FormatFactory::WriteCallback,
-        const FormatSettings &)
-    {
-        return std::make_shared<NativeBlockOutputStream>(buf, 0, sample);
-    });
-}
-
-}
diff --git a/src/DataStreams/NativeBlockInputStream.cpp b/src/Formats/NativeReader.cpp
similarity index 88%
rename from src/DataStreams/NativeBlockInputStream.cpp
rename to src/Formats/NativeReader.cpp
index c76126e950b..9ef248dc904 100644
--- a/src/DataStreams/NativeBlockInputStream.cpp
+++ b/src/Formats/NativeReader.cpp
@@ -6,9 +6,9 @@
 
 #include <DataTypes/DataTypeFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
-#include <DataStreams/NativeBlockInputStream.h>
+#include <Formats/NativeReader.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
 
@@ -23,17 +23,17 @@ namespace ErrorCodes
 }
 
 
-NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_)
+NativeReader::NativeReader(ReadBuffer & istr_, UInt64 server_revision_)
     : istr(istr_), server_revision(server_revision_)
 {
 }
 
-NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_)
+NativeReader::NativeReader(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_)
     : istr(istr_), header(header_), server_revision(server_revision_)
 {
 }
 
-NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_,
+NativeReader::NativeReader(ReadBuffer & istr_, UInt64 server_revision_,
     IndexForNativeFormat::Blocks::const_iterator index_block_it_,
     IndexForNativeFormat::Blocks::const_iterator index_block_end_)
     : istr(istr_), server_revision(server_revision_),
@@ -56,27 +56,19 @@ NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, UInt64 server
     }
 }
 
-// also resets few vars from IBlockInputStream (I didn't want to propagate resetParser upthere)
-void NativeBlockInputStream::resetParser()
+void NativeReader::resetParser()
 {
     istr_concrete = nullptr;
     use_index = false;
-
-#ifndef NDEBUG
-    read_prefix_is_called = false;
-    read_suffix_is_called = false;
-#endif
-
-    is_cancelled.store(false);
-    is_killed.store(false);
 }
 
-void NativeBlockInputStream::readData(const IDataType & type, ColumnPtr & column, ReadBuffer & istr, size_t rows, double avg_value_size_hint)
+void NativeReader::readData(const IDataType & type, ColumnPtr & column, ReadBuffer & istr, size_t rows, double avg_value_size_hint)
 {
     ISerialization::DeserializeBinaryBulkSettings settings;
     settings.getter = [&](ISerialization::SubstreamPath) -> ReadBuffer * { return &istr; };
     settings.avg_value_size_hint = avg_value_size_hint;
     settings.position_independent_encoding = false;
+    settings.native_format = true;
 
     ISerialization::DeserializeBinaryBulkStatePtr state;
     auto serialization = type.getDefaultSerialization();
@@ -90,13 +82,13 @@ void NativeBlockInputStream::readData(const IDataType & type, ColumnPtr & column
 }
 
 
-Block NativeBlockInputStream::getHeader() const
+Block NativeReader::getHeader() const
 {
     return header;
 }
 
 
-Block NativeBlockInputStream::readImpl()
+Block NativeReader::read()
 {
     Block res;
 
@@ -214,7 +206,7 @@ Block NativeBlockInputStream::readImpl()
     return res;
 }
 
-void NativeBlockInputStream::updateAvgValueSizeHints(const Block & block)
+void NativeReader::updateAvgValueSizeHints(const Block & block)
 {
     auto rows = block.rows();
     if (rows < 10)
diff --git a/src/DataStreams/NativeBlockInputStream.h b/src/Formats/NativeReader.h
similarity index 83%
rename from src/DataStreams/NativeBlockInputStream.h
rename to src/Formats/NativeReader.h
index 8f3d2843e0f..49c2db7703f 100644
--- a/src/DataStreams/NativeBlockInputStream.h
+++ b/src/Formats/NativeReader.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/MarkInCompressedFile.h>
+#include <Formats/MarkInCompressedFile.h>
 #include <Common/PODArray.h>
+#include <Core/Block.h>
 
 namespace DB
 {
@@ -57,32 +57,28 @@ struct IndexForNativeFormat
   * Can also be used to store data on disk.
   * In this case, can use the index.
   */
-class NativeBlockInputStream : public IBlockInputStream
+class NativeReader
 {
 public:
     /// If a non-zero server_revision is specified, additional block information may be expected and read.
-    NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_);
+    NativeReader(ReadBuffer & istr_, UInt64 server_revision_);
 
     /// For cases when data structure (header) is known in advance.
     /// NOTE We may use header for data validation and/or type conversions. It is not implemented.
-    NativeBlockInputStream(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_);
+    NativeReader(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_);
 
     /// For cases when we have an index. It allows to skip columns. Only columns specified in the index will be read.
-    NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_,
+    NativeReader(ReadBuffer & istr_, UInt64 server_revision_,
         IndexForNativeFormat::Blocks::const_iterator index_block_it_,
         IndexForNativeFormat::Blocks::const_iterator index_block_end_);
 
-    String getName() const override { return "Native"; }
-
     static void readData(const IDataType & type, ColumnPtr & column, ReadBuffer & istr, size_t rows, double avg_value_size_hint);
 
-    Block getHeader() const override;
+    Block getHeader() const;
 
     void resetParser();
 
-
-protected:
-    Block readImpl() override;
+    Block read();
 
 private:
     ReadBuffer & istr;
diff --git a/src/DataStreams/NativeBlockOutputStream.cpp b/src/Formats/NativeWriter.cpp
similarity index 94%
rename from src/DataStreams/NativeBlockOutputStream.cpp
rename to src/Formats/NativeWriter.cpp
index a5d8c15986b..9da0c312362 100644
--- a/src/DataStreams/NativeBlockOutputStream.cpp
+++ b/src/Formats/NativeWriter.cpp
@@ -1,12 +1,12 @@
-#include <Core/Defines.h>
+#include <Core/ProtocolDefines.h>
 #include <Core/Block.h>
 
 #include <IO/WriteHelpers.h>
 #include <IO/VarInt.h>
 #include <Compression/CompressedWriteBuffer.h>
 
-#include <DataStreams/MarkInCompressedFile.h>
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/MarkInCompressedFile.h>
+#include <Formats/NativeWriter.h>
 
 #include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeLowCardinality.h>
@@ -20,7 +20,7 @@ namespace ErrorCodes
 }
 
 
-NativeBlockOutputStream::NativeBlockOutputStream(
+NativeWriter::NativeWriter(
     WriteBuffer & ostr_, UInt64 client_revision_, const Block & header_, bool remove_low_cardinality_,
     WriteBuffer * index_ostr_, size_t initial_size_of_file_)
     : ostr(ostr_), client_revision(client_revision_), header(header_),
@@ -35,7 +35,7 @@ NativeBlockOutputStream::NativeBlockOutputStream(
 }
 
 
-void NativeBlockOutputStream::flush()
+void NativeWriter::flush()
 {
     ostr.next();
 }
@@ -62,7 +62,7 @@ static void writeData(const IDataType & type, const ColumnPtr & column, WriteBuf
 }
 
 
-void NativeBlockOutputStream::write(const Block & block)
+void NativeWriter::write(const Block & block)
 {
     /// Additional information about the block.
     if (client_revision > 0)
diff --git a/src/DataStreams/NativeBlockOutputStream.h b/src/Formats/NativeWriter.h
similarity index 76%
rename from src/DataStreams/NativeBlockOutputStream.h
rename to src/Formats/NativeWriter.h
index c47d7b2f1c3..67fc179b620 100644
--- a/src/DataStreams/NativeBlockOutputStream.h
+++ b/src/Formats/NativeWriter.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DataStreams/IBlockOutputStream.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <DataTypes/IDataType.h>
+#include <Core/Block.h>
 
 namespace DB
 {
@@ -17,20 +17,20 @@ class CompressedWriteBuffer;
   * A stream can be specified to write the index. The index contains offsets to each part of each column.
   * If an `append` is made to an existing file, and you need to write the index, then specify `initial_size_of_file`.
   */
-class NativeBlockOutputStream : public IBlockOutputStream
+class NativeWriter
 {
 public:
     /** If non-zero client_revision is specified, additional block information can be written.
       */
-    NativeBlockOutputStream(
+    NativeWriter(
         WriteBuffer & ostr_, UInt64 client_revision_, const Block & header_, bool remove_low_cardinality_ = false,
         WriteBuffer * index_ostr_ = nullptr, size_t initial_size_of_file_ = 0);
 
-    Block getHeader() const override { return header; }
-    void write(const Block & block) override;
-    void flush() override;
+    Block getHeader() const { return header; }
+    void write(const Block & block);
+    void flush();
 
-    String getContentType() const override { return "application/octet-stream"; }
+    static String getContentType() { return "application/octet-stream"; }
 
 private:
     WriteBuffer & ostr;
diff --git a/src/Formats/NullFormat.cpp b/src/Formats/NullFormat.cpp
deleted file mode 100644
index c07723211eb..00000000000
--- a/src/Formats/NullFormat.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <DataStreams/NullBlockOutputStream.h>
-#include <Formats/FormatFactory.h>
-
-
-namespace DB
-{
-
-void registerOutputFormatNull(FormatFactory & factory)
-{
-    factory.registerOutputFormat("Null", [](
-        WriteBuffer &,
-        const Block & sample,
-        FormatFactory::WriteCallback,
-        const FormatSettings &)
-    {
-        return std::make_shared<NullBlockOutputStream>(sample);
-    });
-}
-
-}
diff --git a/src/Formats/ParsedTemplateFormatString.h b/src/Formats/ParsedTemplateFormatString.h
index f2e801faeab..4021b71656f 100644
--- a/src/Formats/ParsedTemplateFormatString.h
+++ b/src/Formats/ParsedTemplateFormatString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <functional>
 #include <optional>
 #include <vector>
diff --git a/src/Formats/ProtobufReader.h b/src/Formats/ProtobufReader.h
index 31d6f9a08e0..0df139eeacd 100644
--- a/src/Formats/ProtobufReader.h
+++ b/src/Formats/ProtobufReader.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#   include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_PROTOBUF
 #   include <Common/PODArray.h>
diff --git a/src/Formats/ProtobufSchemas.cpp b/src/Formats/ProtobufSchemas.cpp
index 9c6ed76ef27..a6e63b1c256 100644
--- a/src/Formats/ProtobufSchemas.cpp
+++ b/src/Formats/ProtobufSchemas.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_PROTOBUF
 #    include <Formats/FormatSchemaInfo.h>
diff --git a/src/Formats/ProtobufSchemas.h b/src/Formats/ProtobufSchemas.h
index 05778a85343..f911cb2ce4b 100644
--- a/src/Formats/ProtobufSchemas.h
+++ b/src/Formats/ProtobufSchemas.h
@@ -5,7 +5,7 @@
 
 #include <memory>
 #include <unordered_map>
-#include <common/types.h>
+#include <base/types.h>
 #include <boost/noncopyable.hpp>
 
 
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index c5781ee6c9f..ac89203c6e0 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -32,7 +32,7 @@
 #   include <IO/ReadHelpers.h>
 #   include <IO/WriteBufferFromString.h>
 #   include <IO/WriteHelpers.h>
-#   include <common/range.h>
+#   include <base/range.h>
 #   include <google/protobuf/descriptor.h>
 #   include <google/protobuf/descriptor.pb.h>
 #   include <boost/algorithm/string.hpp>
@@ -41,7 +41,7 @@
 #   include <boost/numeric/conversion/cast.hpp>
 #   include <boost/range/algorithm.hpp>
 #   include <boost/range/algorithm_ext/erase.hpp>
-#   include <common/logger_useful.h>
+#   include <base/logger_useful.h>
 
 namespace DB
 {
@@ -1239,7 +1239,7 @@ namespace
                             else
                             {
                                 WriteBufferFromOwnString buf;
-                                writeText(decimal, scale, buf);
+                                writeText(decimal, scale, buf, false);
                                 cannotConvertValue(buf.str(), TypeName<DecimalType>, field_descriptor.type_name());
                             }
                         };
@@ -1316,9 +1316,9 @@ namespace
         {
             WriteBufferFromString buf{str};
             if constexpr (std::is_same_v<DecimalType, DateTime64>)
-               writeDateTimeText(decimal, scale, buf);
+                writeDateTimeText(decimal, scale, buf);
             else
-                writeText(decimal, scale, buf);
+                writeText(decimal, scale, buf, false);
         }
 
         DecimalType stringToDecimal(const String & str) const
diff --git a/src/Formats/ProtobufSerializer.h b/src/Formats/ProtobufSerializer.h
index 86a2f2f36dd..315a138f9cf 100644
--- a/src/Formats/ProtobufSerializer.h
+++ b/src/Formats/ProtobufSerializer.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_PROTOBUF
 #   include <Columns/IColumn.h>
diff --git a/src/Formats/ProtobufWriter.h b/src/Formats/ProtobufWriter.h
index 6af1a237fbd..c564db110cc 100644
--- a/src/Formats/ProtobufWriter.h
+++ b/src/Formats/ProtobufWriter.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_PROTOBUF
 #   include <Core/Types.h>
diff --git a/src/Formats/TemporaryFileStream.cpp b/src/Formats/TemporaryFileStream.cpp
new file mode 100644
index 00000000000..b19c4aeff35
--- /dev/null
+++ b/src/Formats/TemporaryFileStream.cpp
@@ -0,0 +1,44 @@
+#include <Formats/TemporaryFileStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/ISource.h>
+#include <Compression/CompressedWriteBuffer.h>
+#include <IO/WriteBufferFromFile.h>
+#include <Core/ProtocolDefines.h>
+
+
+namespace DB
+{
+
+/// To read the data that was flushed into the temporary data file.
+TemporaryFileStream::TemporaryFileStream(const std::string & path)
+    : file_in(path)
+    , compressed_in(file_in)
+    , block_in(std::make_unique<NativeReader>(compressed_in, DBMS_TCP_PROTOCOL_VERSION))
+{}
+
+TemporaryFileStream::TemporaryFileStream(const std::string & path, const Block & header_)
+    : file_in(path)
+    , compressed_in(file_in)
+    , block_in(std::make_unique<NativeReader>(compressed_in, header_, 0))
+{}
+
+/// Flush data from input stream into file for future reading
+void TemporaryFileStream::write(const std::string & path, const Block & header, QueryPipelineBuilder builder, const std::string & codec)
+{
+    WriteBufferFromFile file_buf(path);
+    CompressedWriteBuffer compressed_buf(file_buf, CompressionCodecFactory::instance().get(codec, {}));
+    NativeWriter output(compressed_buf, 0, header);
+
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+    PullingPipelineExecutor executor(pipeline);
+
+    Block block;
+    while (executor.pull(block))
+        output.write(block);
+
+    compressed_buf.finalize();
+}
+
+}
diff --git a/src/Formats/TemporaryFileStream.h b/src/Formats/TemporaryFileStream.h
new file mode 100644
index 00000000000..4a2aa2d55e0
--- /dev/null
+++ b/src/Formats/TemporaryFileStream.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <Processors/ISource.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Compression/CompressedReadBuffer.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Formats/NativeReader.h>
+
+namespace DB
+{
+
+/// To read the data that was flushed into the temporary data file.
+struct TemporaryFileStream
+{
+    ReadBufferFromFile file_in;
+    CompressedReadBuffer compressed_in;
+    std::unique_ptr<NativeReader> block_in;
+
+    explicit TemporaryFileStream(const std::string & path);
+    TemporaryFileStream(const std::string & path, const Block & header_);
+
+    /// Flush data from input stream into file for future reading
+    static void write(const std::string & path, const Block & header, QueryPipelineBuilder builder, const std::string & codec);
+};
+
+}
diff --git a/src/Formats/formatBlock.cpp b/src/Formats/formatBlock.cpp
new file mode 100644
index 00000000000..d2b401207aa
--- /dev/null
+++ b/src/Formats/formatBlock.cpp
@@ -0,0 +1,21 @@
+#include <Core/Block.h>
+#include <Formats/formatBlock.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+
+namespace DB
+{
+
+void formatBlock(OutputFormatPtr out, const Block & block)
+{
+    auto source = std::make_shared<SourceFromSingleChunk>(block);
+    QueryPipeline pipeline(source);
+    pipeline.complete(out);
+    CompletedPipelineExecutor executor(pipeline);
+    executor.execute();
+    out->flush();
+}
+
+}
diff --git a/src/Formats/formatBlock.h b/src/Formats/formatBlock.h
new file mode 100644
index 00000000000..fd206a23a45
--- /dev/null
+++ b/src/Formats/formatBlock.h
@@ -0,0 +1,14 @@
+#pragma once
+#include <memory>
+
+namespace DB
+{
+
+class Block;
+
+class IOutputFormat;
+using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
+
+void formatBlock(OutputFormatPtr out, const Block & block);
+
+}
diff --git a/src/Formats/registerFormats.cpp b/src/Formats/registerFormats.cpp
index c035ec0a1d1..a95ccb8b064 100644
--- a/src/Formats/registerFormats.cpp
+++ b/src/Formats/registerFormats.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #include <Formats/FormatFactory.h>
 
@@ -21,64 +19,64 @@ void registerFileSegmentationEngineJSONAsString(FormatFactory & factory);
 void registerInputFormatNative(FormatFactory & factory);
 void registerOutputFormatNative(FormatFactory & factory);
 
-void registerInputFormatProcessorNative(FormatFactory & factory);
-void registerOutputFormatProcessorNative(FormatFactory & factory);
-void registerInputFormatProcessorRowBinary(FormatFactory & factory);
-void registerOutputFormatProcessorRowBinary(FormatFactory & factory);
-void registerInputFormatProcessorTabSeparated(FormatFactory & factory);
-void registerOutputFormatProcessorTabSeparated(FormatFactory & factory);
-void registerInputFormatProcessorValues(FormatFactory & factory);
-void registerOutputFormatProcessorValues(FormatFactory & factory);
-void registerInputFormatProcessorCSV(FormatFactory & factory);
-void registerOutputFormatProcessorCSV(FormatFactory & factory);
-void registerInputFormatProcessorTSKV(FormatFactory & factory);
-void registerOutputFormatProcessorTSKV(FormatFactory & factory);
-void registerInputFormatProcessorJSONEachRow(FormatFactory & factory);
-void registerOutputFormatProcessorJSONEachRow(FormatFactory & factory);
-void registerInputFormatProcessorJSONCompactEachRow(FormatFactory & factory);
-void registerOutputFormatProcessorJSONCompactEachRow(FormatFactory & factory);
-void registerInputFormatProcessorProtobuf(FormatFactory & factory);
-void registerOutputFormatProcessorProtobuf(FormatFactory & factory);
-void registerInputFormatProcessorTemplate(FormatFactory & factory);
-void registerOutputFormatProcessorTemplate(FormatFactory & factory);
-void registerInputFormatProcessorMsgPack(FormatFactory & factory);
-void registerOutputFormatProcessorMsgPack(FormatFactory & factory);
-void registerInputFormatProcessorORC(FormatFactory & factory);
-void registerOutputFormatProcessorORC(FormatFactory & factory);
-void registerInputFormatProcessorParquet(FormatFactory & factory);
-void registerOutputFormatProcessorParquet(FormatFactory & factory);
-void registerInputFormatProcessorArrow(FormatFactory & factory);
-void registerOutputFormatProcessorArrow(FormatFactory & factory);
-void registerInputFormatProcessorAvro(FormatFactory & factory);
-void registerOutputFormatProcessorAvro(FormatFactory & factory);
-void registerInputFormatProcessorRawBLOB(FormatFactory & factory);
-void registerOutputFormatProcessorRawBLOB(FormatFactory & factory);
+void registerInputFormatRowBinary(FormatFactory & factory);
+void registerOutputFormatRowBinary(FormatFactory & factory);
+void registerInputFormatTabSeparated(FormatFactory & factory);
+void registerOutputFormatTabSeparated(FormatFactory & factory);
+void registerInputFormatValues(FormatFactory & factory);
+void registerOutputFormatValues(FormatFactory & factory);
+void registerInputFormatCSV(FormatFactory & factory);
+void registerOutputFormatCSV(FormatFactory & factory);
+void registerInputFormatTSKV(FormatFactory & factory);
+void registerOutputFormatTSKV(FormatFactory & factory);
+void registerInputFormatJSONEachRow(FormatFactory & factory);
+void registerOutputFormatJSONEachRow(FormatFactory & factory);
+void registerInputFormatJSONCompactEachRow(FormatFactory & factory);
+void registerOutputFormatJSONCompactEachRow(FormatFactory & factory);
+void registerInputFormatProtobuf(FormatFactory & factory);
+void registerOutputFormatProtobuf(FormatFactory & factory);
+void registerInputFormatTemplate(FormatFactory & factory);
+void registerOutputFormatTemplate(FormatFactory & factory);
+void registerInputFormatMsgPack(FormatFactory & factory);
+void registerOutputFormatMsgPack(FormatFactory & factory);
+void registerInputFormatORC(FormatFactory & factory);
+void registerOutputFormatORC(FormatFactory & factory);
+void registerInputFormatParquet(FormatFactory & factory);
+void registerOutputFormatParquet(FormatFactory & factory);
+void registerInputFormatArrow(FormatFactory & factory);
+void registerOutputFormatArrow(FormatFactory & factory);
+void registerInputFormatAvro(FormatFactory & factory);
+void registerOutputFormatAvro(FormatFactory & factory);
+void registerInputFormatRawBLOB(FormatFactory & factory);
+void registerOutputFormatRawBLOB(FormatFactory & factory);
 
 /// Output only (presentational) formats.
 
+void registerOutputFormatPretty(FormatFactory & factory);
+void registerOutputFormatPrettyCompact(FormatFactory & factory);
+void registerOutputFormatPrettySpace(FormatFactory & factory);
+void registerOutputFormatVertical(FormatFactory & factory);
+void registerOutputFormatJSON(FormatFactory & factory);
+void registerOutputFormatJSONCompact(FormatFactory & factory);
+void registerOutputFormatJSONEachRowWithProgress(FormatFactory & factory);
+void registerOutputFormatXML(FormatFactory & factory);
+void registerOutputFormatODBCDriver2(FormatFactory & factory);
 void registerOutputFormatNull(FormatFactory & factory);
-
-void registerOutputFormatProcessorPretty(FormatFactory & factory);
-void registerOutputFormatProcessorPrettyCompact(FormatFactory & factory);
-void registerOutputFormatProcessorPrettySpace(FormatFactory & factory);
-void registerOutputFormatProcessorVertical(FormatFactory & factory);
-void registerOutputFormatProcessorJSON(FormatFactory & factory);
-void registerOutputFormatProcessorJSONCompact(FormatFactory & factory);
-void registerOutputFormatProcessorJSONEachRowWithProgress(FormatFactory & factory);
-void registerOutputFormatProcessorXML(FormatFactory & factory);
-void registerOutputFormatProcessorODBCDriver2(FormatFactory & factory);
-void registerOutputFormatProcessorNull(FormatFactory & factory);
-void registerOutputFormatProcessorMySQLWire(FormatFactory & factory);
-void registerOutputFormatProcessorMarkdown(FormatFactory & factory);
-void registerOutputFormatProcessorPostgreSQLWire(FormatFactory & factory);
+void registerOutputFormatMySQLWire(FormatFactory & factory);
+void registerOutputFormatMarkdown(FormatFactory & factory);
+void registerOutputFormatPostgreSQLWire(FormatFactory & factory);
+void registerOutputFormatCapnProto(FormatFactory & factory);
 
 /// Input only formats.
 
-void registerInputFormatProcessorRegexp(FormatFactory & factory);
-void registerInputFormatProcessorJSONAsString(FormatFactory & factory);
-void registerInputFormatProcessorLineAsString(FormatFactory & factory);
-void registerInputFormatProcessorCapnProto(FormatFactory & factory);
+void registerInputFormatRegexp(FormatFactory & factory);
+void registerInputFormatJSONAsString(FormatFactory & factory);
+void registerInputFormatLineAsString(FormatFactory & factory);
+void registerInputFormatCapnProto(FormatFactory & factory);
 
+/// Non trivial prefix and suffix checkers for disabling parallel parsing.
+void registerNonTrivialPrefixAndSuffixCheckerJSONEachRow(FormatFactory & factory);
+void registerNonTrivialPrefixAndSuffixCheckerJSONAsString(FormatFactory & factory);
 
 void registerFormats()
 {
@@ -93,66 +91,61 @@ void registerFormats()
     registerInputFormatNative(factory);
     registerOutputFormatNative(factory);
 
-    registerInputFormatProcessorNative(factory);
-    registerOutputFormatProcessorNative(factory);
-    registerInputFormatProcessorRowBinary(factory);
-    registerOutputFormatProcessorRowBinary(factory);
-    registerInputFormatProcessorTabSeparated(factory);
-    registerOutputFormatProcessorTabSeparated(factory);
-    registerInputFormatProcessorValues(factory);
-    registerOutputFormatProcessorValues(factory);
-    registerInputFormatProcessorCSV(factory);
-    registerOutputFormatProcessorCSV(factory);
-    registerInputFormatProcessorTSKV(factory);
-    registerOutputFormatProcessorTSKV(factory);
-    registerInputFormatProcessorJSONEachRow(factory);
-    registerOutputFormatProcessorJSONEachRow(factory);
-    registerInputFormatProcessorJSONCompactEachRow(factory);
-    registerOutputFormatProcessorJSONCompactEachRow(factory);
-    registerInputFormatProcessorProtobuf(factory);
-    registerOutputFormatProcessorProtobuf(factory);
-    registerInputFormatProcessorTemplate(factory);
-    registerOutputFormatProcessorTemplate(factory);
-    registerInputFormatProcessorMsgPack(factory);
-    registerOutputFormatProcessorMsgPack(factory);
-    registerInputFormatProcessorRawBLOB(factory);
-    registerOutputFormatProcessorRawBLOB(factory);
+    registerInputFormatRowBinary(factory);
+    registerOutputFormatRowBinary(factory);
+    registerInputFormatTabSeparated(factory);
+    registerOutputFormatTabSeparated(factory);
+    registerInputFormatValues(factory);
+    registerOutputFormatValues(factory);
+    registerInputFormatCSV(factory);
+    registerOutputFormatCSV(factory);
+    registerInputFormatTSKV(factory);
+    registerOutputFormatTSKV(factory);
+    registerInputFormatJSONEachRow(factory);
+    registerOutputFormatJSONEachRow(factory);
+    registerInputFormatJSONCompactEachRow(factory);
+    registerOutputFormatJSONCompactEachRow(factory);
+    registerInputFormatProtobuf(factory);
+    registerOutputFormatProtobuf(factory);
+    registerInputFormatTemplate(factory);
+    registerOutputFormatTemplate(factory);
+    registerInputFormatMsgPack(factory);
+    registerOutputFormatMsgPack(factory);
+    registerInputFormatRawBLOB(factory);
+    registerOutputFormatRawBLOB(factory);
 
-#if !defined(ARCADIA_BUILD)
-    registerInputFormatProcessorORC(factory);
-    registerOutputFormatProcessorORC(factory);
-    registerInputFormatProcessorParquet(factory);
-    registerOutputFormatProcessorParquet(factory);
-    registerInputFormatProcessorAvro(factory);
-    registerOutputFormatProcessorAvro(factory);
-#endif
-
-    registerInputFormatProcessorArrow(factory);
-    registerOutputFormatProcessorArrow(factory);
+    registerInputFormatORC(factory);
+    registerOutputFormatORC(factory);
+    registerInputFormatParquet(factory);
+    registerOutputFormatParquet(factory);
+    registerInputFormatAvro(factory);
+    registerOutputFormatAvro(factory);
+    registerInputFormatArrow(factory);
+    registerOutputFormatArrow(factory);
 
+    registerOutputFormatPretty(factory);
+    registerOutputFormatPrettyCompact(factory);
+    registerOutputFormatPrettySpace(factory);
+    registerOutputFormatVertical(factory);
+    registerOutputFormatJSON(factory);
+    registerOutputFormatJSONCompact(factory);
+    registerOutputFormatJSONEachRowWithProgress(factory);
+    registerOutputFormatXML(factory);
+    registerOutputFormatODBCDriver2(factory);
     registerOutputFormatNull(factory);
+    registerOutputFormatMySQLWire(factory);
+    registerOutputFormatMarkdown(factory);
+    registerOutputFormatPostgreSQLWire(factory);
+    registerOutputFormatCapnProto(factory);
 
-    registerOutputFormatProcessorPretty(factory);
-    registerOutputFormatProcessorPrettyCompact(factory);
-    registerOutputFormatProcessorPrettySpace(factory);
-    registerOutputFormatProcessorVertical(factory);
-    registerOutputFormatProcessorJSON(factory);
-    registerOutputFormatProcessorJSONCompact(factory);
-    registerOutputFormatProcessorJSONEachRowWithProgress(factory);
-    registerOutputFormatProcessorXML(factory);
-    registerOutputFormatProcessorODBCDriver2(factory);
-    registerOutputFormatProcessorNull(factory);
-    registerOutputFormatProcessorMySQLWire(factory);
-    registerOutputFormatProcessorMarkdown(factory);
-    registerOutputFormatProcessorPostgreSQLWire(factory);
+    registerInputFormatRegexp(factory);
+    registerInputFormatJSONAsString(factory);
+    registerInputFormatLineAsString(factory);
 
-    registerInputFormatProcessorRegexp(factory);
-    registerInputFormatProcessorJSONAsString(factory);
-    registerInputFormatProcessorLineAsString(factory);
+    registerInputFormatCapnProto(factory);
 
-#if !defined(ARCADIA_BUILD)
-    registerInputFormatProcessorCapnProto(factory);
-#endif
+    registerNonTrivialPrefixAndSuffixCheckerJSONEachRow(factory);
+    registerNonTrivialPrefixAndSuffixCheckerJSONAsString(factory);
 }
 
 }
diff --git a/src/Formats/ya.make b/src/Formats/ya.make
deleted file mode 100644
index 476e13f9a4f..00000000000
--- a/src/Formats/ya.make
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/protobuf
-    contrib/libs/protoc
-)
-
-
-SRCS(
-    FormatFactory.cpp
-    FormatSchemaInfo.cpp
-    JSONEachRowUtils.cpp
-    MySQLBlockInputStream.cpp
-    NativeFormat.cpp
-    NullFormat.cpp
-    ParsedTemplateFormatString.cpp
-    ProtobufReader.cpp
-    ProtobufSchemas.cpp
-    ProtobufSerializer.cpp
-    ProtobufWriter.cpp
-    registerFormats.cpp
-    verbosePrintString.cpp
-
-)
-
-END()
diff --git a/src/Formats/ya.make.in b/src/Formats/ya.make.in
deleted file mode 100644
index 525e582755e..00000000000
--- a/src/Formats/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/protobuf
-    contrib/libs/protoc
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Functions/CastOverloadResolver.cpp b/src/Functions/CastOverloadResolver.cpp
new file mode 100644
index 00000000000..fd6fecc37d6
--- /dev/null
+++ b/src/Functions/CastOverloadResolver.cpp
@@ -0,0 +1,19 @@
+#include <Functions/FunctionFactory.h>
+#include <Functions/CastOverloadResolver.h>
+
+
+namespace DB
+{
+
+void registerCastOverloadResolvers(FunctionFactory & factory)
+{
+    factory.registerFunction<CastInternalOverloadResolver<CastType::nonAccurate>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<CastInternalOverloadResolver<CastType::accurate>>();
+    factory.registerFunction<CastInternalOverloadResolver<CastType::accurateOrNull>>();
+
+    factory.registerFunction<CastOverloadResolver<CastType::nonAccurate>>(FunctionFactory::CaseInsensitive);
+    factory.registerFunction<CastOverloadResolver<CastType::accurate>>();
+    factory.registerFunction<CastOverloadResolver<CastType::accurateOrNull>>();
+}
+
+}
diff --git a/src/Functions/CastOverloadResolver.h b/src/Functions/CastOverloadResolver.h
new file mode 100644
index 00000000000..ffd5dda4af3
--- /dev/null
+++ b/src/Functions/CastOverloadResolver.h
@@ -0,0 +1,121 @@
+#pragma once
+#include <Functions/FunctionsConversion.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+/*
+ * CastInternal does not preserve nullability of the data type,
+ * i.e. CastInternal(toNullable(toInt8(1)) as Int32) will be Int32(1).
+ *
+ * Cast preserves nullability according to setting `cast_keep_nullable`,
+ * i.e. Cast(toNullable(toInt8(1)) as Int32) will be Nullable(Int32(1)) if `cast_keep_nullable` == 1.
+**/
+template<CastType cast_type, bool internal, typename CastName, typename FunctionName>
+class CastOverloadResolverImpl : public IFunctionOverloadResolver
+{
+public:
+    using MonotonicityForRange = FunctionCastBase::MonotonicityForRange;
+    using Diagnostic = FunctionCastBase::Diagnostic;
+
+    static constexpr auto name = cast_type == CastType::accurate
+        ? CastName::accurate_cast_name
+        : (cast_type == CastType::accurateOrNull ? CastName::accurate_cast_or_null_name : CastName::cast_name);
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+    explicit CastOverloadResolverImpl(std::optional<Diagnostic> diagnostic_, bool keep_nullable_)
+        : diagnostic(std::move(diagnostic_)), keep_nullable(keep_nullable_)
+    {
+    }
+
+    static FunctionOverloadResolverPtr create(ContextPtr context)
+    {
+        if constexpr (internal)
+            return createImpl();
+        return createImpl({}, context->getSettingsRef().cast_keep_nullable);
+    }
+
+    static FunctionOverloadResolverPtr createImpl(std::optional<Diagnostic> diagnostic = {}, bool keep_nullable = false)
+    {
+        assert(!internal || !keep_nullable);
+        return std::make_unique<CastOverloadResolverImpl>(std::move(diagnostic), keep_nullable);
+    }
+
+protected:
+
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    {
+        DataTypes data_types(arguments.size());
+
+        for (size_t i = 0; i < arguments.size(); ++i)
+            data_types[i] = arguments[i].type;
+
+        auto monotonicity = MonotonicityHelper::getMonotonicityInformation(arguments.front().type, return_type.get());
+        return std::make_unique<FunctionCast<FunctionName>>(name, std::move(monotonicity), data_types, return_type, diagnostic, cast_type);
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto & column = arguments.back().column;
+        if (!column)
+            throw Exception("Second argument to " + getName() + " must be a constant string describing type."
+                " Instead there is non-constant column of type " + arguments.back().type->getName(),
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+        const auto * type_col = checkAndGetColumnConst<ColumnString>(column.get());
+        if (!type_col)
+            throw Exception("Second argument to " + getName() + " must be a constant string describing type."
+                " Instead there is a column with the following structure: " + column->dumpStructure(),
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+        DataTypePtr type = DataTypeFactory::instance().get(type_col->getValue<String>());
+
+        if constexpr (cast_type == CastType::accurateOrNull)
+            return makeNullable(type);
+
+        if constexpr (internal)
+            return type;
+
+        if (keep_nullable && arguments.front().type->isNullable() && type->canBeInsideNullable())
+            return makeNullable(type);
+
+        return type;
+    }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+
+private:
+    std::optional<Diagnostic> diagnostic;
+    bool keep_nullable;
+};
+
+
+struct CastOverloadName
+{
+    static constexpr auto cast_name = "CAST";
+    static constexpr auto accurate_cast_name = "accurateCast";
+    static constexpr auto accurate_cast_or_null_name = "accurateCastOrNull";
+};
+
+struct CastInternalOverloadName
+{
+    static constexpr auto cast_name = "_CAST";
+    static constexpr auto accurate_cast_name = "accurate_Cast";
+    static constexpr auto accurate_cast_or_null_name = "accurate_CastOrNull";
+};
+
+template <CastType cast_type> using CastOverloadResolver = CastOverloadResolverImpl<cast_type, false, CastOverloadName, CastName>;
+template <CastType cast_type> using CastInternalOverloadResolver = CastOverloadResolverImpl<cast_type, true, CastInternalOverloadName, CastInternalName>;
+
+}
diff --git a/src/Functions/CountSubstringsImpl.h b/src/Functions/CountSubstringsImpl.h
index 2c2ae20488f..6668ca0a392 100644
--- a/src/Functions/CountSubstringsImpl.h
+++ b/src/Functions/CountSubstringsImpl.h
@@ -19,11 +19,12 @@ namespace ErrorCodes
 /// NOTE: Intersecting substrings in haystack accounted only once, i.e.:
 ///
 ///     countSubstrings('aaaa', 'aa') == 2
-template <typename Impl>
+template <typename Name, typename Impl>
 struct CountSubstringsImpl
 {
     static constexpr bool use_default_implementation_for_constants = false;
     static constexpr bool supports_start_pos = true;
+    static constexpr auto name = Name::name;
 
     using ResultType = UInt64;
 
@@ -225,7 +226,7 @@ struct CountSubstringsImpl
     template <typename... Args>
     static void vectorFixedConstant(Args &&...)
     {
-        throw Exception("Functions 'position' don't support FixedString haystack argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support FixedString haystack argument", name);
     }
 };
 
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index bb9856096a9..218dcd083eb 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -2,14 +2,14 @@
 
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnsNumber.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Functions/IFunction.h>
 #include <Common/Exception.h>
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 
 /// The default mode value to use for the WEEK() function
 #define DEFAULT_WEEK_MODE 0
diff --git a/tests/external_models/catboost/helpers/__init__.py b/src/Functions/DateOrDateTimeFunctionsConvertion.cpp
similarity index 100%
rename from tests/external_models/catboost/helpers/__init__.py
rename to src/Functions/DateOrDateTimeFunctionsConvertion.cpp
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 1891410a18e..15a08c4e76d 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/DecimalFunctions.h>
 #include <Common/Exception.h>
-#include <common/DateLUTImpl.h>
-#include <common/DateLUT.h>
+#include <base/DateLUTImpl.h>
+#include <base/DateLUT.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Functions/FunctionHelpers.h>
diff --git a/src/Functions/DivisionUtils.h b/src/Functions/DivisionUtils.h
index f10e15c1574..2e601888ecc 100644
--- a/src/Functions/DivisionUtils.h
+++ b/src/Functions/DivisionUtils.h
@@ -6,9 +6,7 @@
 #include <Common/NaNUtils.h>
 #include <DataTypes/NumberTraits.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 
 namespace DB
@@ -72,6 +70,7 @@ struct DivideIntegralImpl
 {
     using ResultType = typename NumberTraits::ResultOfIntegerDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -81,7 +80,7 @@ struct DivideIntegralImpl
 
         /// Otherwise overflow may occur due to integer promotion. Example: int8_t(-1) / uint64_t(2).
         /// NOTE: overflow is still possible when dividing large signed number to large unsigned number or vice-versa. But it's less harmful.
-        if constexpr (is_integer_v<A> && is_integer_v<B> && (is_signed_v<A> || is_signed_v<B>))
+        if constexpr (is_integer<A> && is_integer<B> && (is_signed_v<A> || is_signed_v<B>))
         {
             using SignedCastA = make_signed_t<CastA>;
             using SignedCastB = std::conditional_t<sizeof(A) <= sizeof(B), make_signed_t<CastB>, SignedCastA>;
@@ -126,6 +125,7 @@ struct ModuloImpl
     using IntegerBType = typename NumberTraits::ToInteger<B>::Type;
 
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/DummyJSONParser.h b/src/Functions/DummyJSONParser.h
index 01fdab1abb6..c14aacece86 100644
--- a/src/Functions/DummyJSONParser.h
+++ b/src/Functions/DummyJSONParser.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Functions/FunctionBase64Conversion.h b/src/Functions/FunctionBase64Conversion.h
index 29aa5913b83..6b1234f6228 100644
--- a/src/Functions/FunctionBase64Conversion.h
+++ b/src/Functions/FunctionBase64Conversion.h
@@ -1,7 +1,5 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_BASE64
 #    include <Columns/ColumnConst.h>
@@ -76,6 +74,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override
     {
         return true;
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index fc36541a078..5d87347d8b5 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -5,7 +5,7 @@
 // sanitizer/asan_interface.h
 #include <memory>
 #include <type_traits>
-#include <common/wide_integer_to_string.h>
+#include <base/wide_integer_to_string.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -15,13 +15,16 @@
 #include <DataTypes/DataTypeInterval.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/Native.h>
 #include <DataTypes/NumberTraits.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnNullable.h>
 #include "Core/DecimalFunctions.h"
 #include "IFunction.h"
 #include "FunctionHelpers.h"
@@ -33,11 +36,10 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <common/map.h>
+#include <base/Typelist.h>
+#include <base/map.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    pragma GCC diagnostic push
@@ -48,7 +50,6 @@
 
 #include <cassert>
 
-
 namespace DB
 {
 
@@ -183,34 +184,119 @@ namespace impl_
 
 enum class OpCase { Vector, LeftConstant, RightConstant };
 
-template <class T>
-inline constexpr const auto & undec(const T & x)
-{
-    if constexpr (IsDecimalNumber<T>)
-        return x.value;
-    else
-        return x;
-}
+constexpr const auto & undec(const auto & x) { return x; }
+constexpr const auto & undec(const is_decimal auto & x) { return x.value; }
 
 template <typename A, typename B, typename Op, typename OpResultType = typename Op::ResultType>
 struct BinaryOperation
 {
     using ResultType = OpResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
-    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
+    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size, const NullMap * right_nullmap = nullptr)
     {
-        for (size_t i = 0; i < size; ++i)
-            if constexpr (op_case == OpCase::Vector)
-                c[i] = Op::template apply<ResultType>(a[i], b[i]);
-            else if constexpr (op_case == OpCase::LeftConstant)
-                c[i] = Op::template apply<ResultType>(*a, b[i]);
-            else
+        if constexpr (op_case == OpCase::RightConstant)
+        {
+            if (right_nullmap && (*right_nullmap)[0])
+                return;
+
+            for (size_t i = 0; i < size; ++i)
                 c[i] = Op::template apply<ResultType>(a[i], *b);
+        }
+        else
+        {
+            if (right_nullmap)
+            {
+                for (size_t i = 0; i < size; ++i)
+                    if ((*right_nullmap)[i])
+                        c[i] = ResultType();
+                    else
+                        apply<op_case>(a, b, c, i);
+            }
+            else
+                for (size_t i = 0; i < size; ++i)
+                    apply<op_case>(a, b, c, i);
+        }
     }
 
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
+
+private:
+    template <OpCase op_case>
+    static inline void apply(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t i)
+    {
+        if constexpr (op_case == OpCase::Vector)
+            c[i] = Op::template apply<ResultType>(a[i], b[i]);
+        else
+            c[i] = Op::template apply<ResultType>(*a, b[i]);
+    }
+};
+
+template <typename B, typename Op>
+struct StringIntegerOperationImpl
+{
+    static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
+
+    template <OpCase op_case>
+    static void NO_INLINE processFixedString(const UInt8 * __restrict in_vec, const UInt64 n, const B * __restrict b, ColumnFixedString::Chars & out_vec, size_t size)
+    {
+        size_t prev_offset = 0;
+        out_vec.reserve(n * size);
+        for (size_t i = 0; i < size; ++i)
+        {
+            if constexpr (op_case == OpCase::LeftConstant)
+            {
+                Op::apply(&in_vec[0], &in_vec[n], b[i], out_vec);
+            }
+            else
+            {
+                size_t new_offset = prev_offset + n;
+
+                if constexpr (op_case == OpCase::Vector)
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[i], out_vec);
+                }
+                else
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset], b[0], out_vec);
+                }
+                prev_offset = new_offset;
+            }
+        }
+    }
+
+
+    template <OpCase op_case>
+    static void NO_INLINE processString(const UInt8 * __restrict in_vec, const UInt64 * __restrict in_offsets, const B * __restrict b, ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets, size_t size)
+    {
+        size_t prev_offset = 0;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            if constexpr (op_case == OpCase::LeftConstant)
+            {
+                Op::apply(&in_vec[0], &in_vec[in_offsets[0] - 1], b[i], out_vec, out_offsets);
+            }
+            else
+            {
+                size_t new_offset = in_offsets[i];
+
+                if constexpr (op_case == OpCase::Vector)
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset - 1], b[i], out_vec, out_offsets);
+                }
+                else
+                {
+                    Op::apply(&in_vec[prev_offset], &in_vec[new_offset - 1], b[0], out_vec, out_offsets);
+                }
+
+                prev_offset = new_offset;
+            }
+        }
+    }
 };
 
 template <typename Op>
@@ -301,19 +387,17 @@ struct DecimalBinaryOperation
 {
 private:
     using ResultType = OpResultType; // e.g. Decimal32
-    using NativeResultType = typename NativeType<ResultType>::Type; // e.g. UInt32 for Decimal32
+    using NativeResultType = NativeType<ResultType>; // e.g. UInt32 for Decimal32
 
-    using ResultContainerType = typename std::conditional_t<IsDecimalNumber<ResultType>,
-        ColumnDecimal<ResultType>,
-        ColumnVector<ResultType>>::Container;
+    using ResultContainerType = typename ColumnVectorOrDecimal<ResultType>::Container;
 
 public:
-    template <OpCase op_case, bool is_decimal_a, bool is_decimal_b, class A, class B>
-    static void NO_INLINE process(const A & a, const B & b, ResultContainerType & c,
-        NativeResultType scale_a, NativeResultType scale_b)
+    template <OpCase op_case, bool is_decimal_a, bool is_decimal_b>
+    static void NO_INLINE process(const auto & a, const auto & b, ResultContainerType & c,
+        NativeResultType scale_a, NativeResultType scale_b, const NullMap * right_nullmap = nullptr)
     {
-        if constexpr (op_case == OpCase::LeftConstant) static_assert(!IsDecimalNumber<A>);
-        if constexpr (op_case == OpCase::RightConstant) static_assert(!IsDecimalNumber<B>);
+        if constexpr (op_case == OpCase::LeftConstant) static_assert(!is_decimal<decltype(a)>);
+        if constexpr (op_case == OpCase::RightConstant) static_assert(!is_decimal<decltype(b)>);
 
         size_t size;
 
@@ -367,26 +451,20 @@ public:
         }
         else if constexpr (is_division && is_decimal_b)
         {
-            for (size_t i = 0; i < size; ++i)
-                c[i] = applyScaledDiv<is_decimal_a>(
-                    unwrap<op_case, OpCase::LeftConstant>(a, i),
-                    unwrap<op_case, OpCase::RightConstant>(b, i),
-                    scale_a);
+            processWithRightNullmapImpl<op_case>(a, b, c, size, right_nullmap, [&scale_a](const auto & left, const auto & right)
+            {
+                return applyScaledDiv<is_decimal_a>(left, right, scale_a);
+            });
             return;
         }
 
-        for (size_t i = 0; i < size; ++i)
-            c[i] = apply(
-                unwrap<op_case, OpCase::LeftConstant>(a, i),
-                unwrap<op_case, OpCase::RightConstant>(b, i));
+        processWithRightNullmapImpl<op_case>(a, b, c, size, right_nullmap, [](const auto & left, const auto & right){ return apply(left, right); });
     }
 
     template <bool is_decimal_a, bool is_decimal_b, class A, class B>
     static ResultType process(A a, B b, NativeResultType scale_a, NativeResultType scale_b)
+        requires(!is_decimal<A> && !is_decimal<B>)
     {
-        static_assert(!IsDecimalNumber<A>);
-        static_assert(!IsDecimalNumber<B>);
-
         if constexpr (is_division && is_decimal_b)
             return applyScaledDiv<is_decimal_a>(a, b, scale_a);
         else if constexpr (is_plus_minus_compare)
@@ -401,6 +479,35 @@ public:
     }
 
 private:
+    template <OpCase op_case, typename ApplyFunc>
+    static inline void processWithRightNullmapImpl(const auto & a, const auto & b, ResultContainerType & c, size_t size, const NullMap * right_nullmap, ApplyFunc apply_func)
+    {
+        if (right_nullmap)
+        {
+            if constexpr (op_case == OpCase::RightConstant)
+            {
+                if ((*right_nullmap)[0])
+                    return;
+
+                for (size_t i = 0; i < size; ++i)
+                    c[i] = apply_func(undec(a[i]), undec(b));
+            }
+            else
+            {
+                for (size_t i = 0; i < size; ++i)
+                {
+                    if ((*right_nullmap)[i])
+                        c[i] = ResultType();
+                    else
+                        c[i] = apply_func(unwrap<op_case, OpCase::LeftConstant>(a, i), undec(b[i]));
+                }
+            }
+        }
+        else
+            for (size_t i = 0; i < size; ++i)
+                c[i] = apply_func(unwrap<op_case, OpCase::LeftConstant>(a, i), unwrap<op_case, OpCase::RightConstant>(b, i));
+    }
+
     static constexpr bool is_plus_minus =   IsOperation<Operation>::plus ||
                                             IsOperation<Operation>::minus;
     static constexpr bool is_multiply =     IsOperation<Operation>::multiply;
@@ -505,7 +612,7 @@ private:
 using namespace traits_;
 using namespace impl_;
 
-template <template <typename, typename> class Op, typename Name, bool valid_on_default_arguments = true, bool valid_on_float_arguments = true>
+template <template <typename, typename> class Op, typename Name, bool valid_on_default_arguments = true, bool valid_on_float_arguments = true, bool division_by_nullable = false>
 class FunctionBinaryArithmetic : public IFunction
 {
     static constexpr const bool is_plus = IsOperation<Op>::plus;
@@ -516,83 +623,34 @@ class FunctionBinaryArithmetic : public IFunction
     ContextPtr context;
     bool check_decimal_overflow = true;
 
-    template <typename F>
-    static bool castType(const IDataType * type, F && f)
+    static bool castType(const IDataType * type, auto && f)
     {
-        return castTypeToEither<
-            DataTypeUInt8,
-            DataTypeUInt16,
-            DataTypeUInt32,
-            DataTypeUInt64,
-            DataTypeUInt128,
-            DataTypeUInt256,
-            DataTypeInt8,
-            DataTypeInt16,
-            DataTypeInt32,
-            DataTypeInt64,
-            DataTypeInt128,
-            DataTypeInt256,
-            DataTypeFloat32,
-            DataTypeFloat64,
-            DataTypeDate,
-            DataTypeDateTime,
-            DataTypeDecimal<Decimal32>,
-            DataTypeDecimal<Decimal64>,
-            DataTypeDecimal<Decimal128>,
-            DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
-        >(type, std::forward<F>(f));
-    }
+        using Types = Typelist<
+            DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,
+            DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
+            DataTypeDecimal32, DataTypeDecimal64, DataTypeDecimal128, DataTypeDecimal256,
+            DataTypeDate, DataTypeDateTime,
+            DataTypeFixedString, DataTypeString>;
 
-    template <typename F>
-    static bool castTypeNoFloats(const IDataType * type, F && f)
-    {
-        return castTypeToEither<
-            DataTypeUInt8,
-            DataTypeUInt16,
-            DataTypeUInt32,
-            DataTypeUInt64,
-            DataTypeUInt128,
-            DataTypeUInt256,
-            DataTypeInt8,
-            DataTypeInt16,
-            DataTypeInt32,
-            DataTypeInt64,
-            DataTypeInt128,
-            DataTypeInt256,
-            DataTypeDate,
-            DataTypeDateTime,
-            DataTypeDecimal<Decimal32>,
-            DataTypeDecimal<Decimal64>,
-            DataTypeDecimal<Decimal128>,
-            DataTypeDecimal<Decimal256>,
-            DataTypeFixedString
-        >(type, std::forward<F>(f));
+        using Floats = Typelist<DataTypeFloat32, DataTypeFloat64>;
+
+        using ValidTypes = std::conditional_t<valid_on_float_arguments,
+            TLConcat<Types, Floats>,
+            Types>;
+
+        return castTypeToEither(ValidTypes{}, type, std::forward<decltype(f)>(f));
     }
 
     template <typename F>
     static bool castBothTypes(const IDataType * left, const IDataType * right, F && f)
     {
-        if constexpr (valid_on_float_arguments)
+        return castType(left, [&](const auto & left_)
         {
-            return castType(left, [&](const auto & left_)
+            return castType(right, [&](const auto & right_)
             {
-                return castType(right, [&](const auto & right_)
-                {
-                    return f(left_, right_);
-                });
+                return f(left_, right_);
             });
-        }
-        else
-        {
-            return castTypeNoFloats(left, [&](const auto & left_)
-            {
-                return castTypeNoFloats(right, [&](const auto & right_)
-                {
-                    return f(left_, right_);
-                });
-            });
-        }
+        });
     }
 
     static FunctionOverloadResolverPtr
@@ -626,13 +684,15 @@ class FunctionBinaryArithmetic : public IFunction
         }
 
         if (second_is_date_or_datetime && is_minus)
-            throw Exception("Wrong order of arguments for function " + String(name) + ": argument of type Interval cannot be first.",
+            throw Exception("Wrong order of arguments for function " + String(name) + ": argument of type Interval cannot be first",
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
         std::string function_name;
         if (interval_data_type)
         {
-            function_name = String(is_plus ? "add" : "subtract") + interval_data_type->getKind().toString() + 's';
+            function_name = fmt::format("{}{}s",
+                is_plus ? "add" : "subtract",
+                interval_data_type->getKind().toString());
         }
         else
         {
@@ -645,6 +705,64 @@ class FunctionBinaryArithmetic : public IFunction
         return FunctionFactory::instance().get(function_name, context);
     }
 
+    static FunctionOverloadResolverPtr
+    getFunctionForTupleArithmetic(const DataTypePtr & type0, const DataTypePtr & type1, ContextPtr context)
+    {
+        if (!isTuple(type0) || !isTuple(type1))
+            return {};
+
+        /// Special case when the function is plus, minus or multiply, both arguments are tuples.
+        /// We construct another function (example: tuplePlus) and call it.
+
+        if constexpr (!is_plus && !is_minus && !is_multiply)
+            return {};
+
+        std::string function_name;
+        if (is_plus)
+        {
+            function_name = "tuplePlus";
+        }
+        else if (is_minus)
+        {
+            function_name = "tupleMinus";
+        }
+        else
+        {
+            function_name = "dotProduct";
+        }
+
+        return FunctionFactory::instance().get(function_name, context);
+    }
+
+    static FunctionOverloadResolverPtr
+    getFunctionForTupleAndNumberArithmetic(const DataTypePtr & type0, const DataTypePtr & type1, ContextPtr context)
+    {
+        if (!(isTuple(type0) && isNumber(type1)) && !(isTuple(type1) && isNumber(type0)))
+            return {};
+
+        /// Special case when the function is multiply or divide, one of arguments is Tuple and another is Number.
+        /// We construct another function (example: tupleMultiplyByNumber) and call it.
+
+        if constexpr (!is_multiply && !is_division)
+            return {};
+
+        if (isNumber(type0) && is_division)
+            throw Exception("Wrong order of arguments for function " + String(name) + ": argument of numeric type cannot be first",
+                            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+        std::string function_name;
+        if (is_multiply)
+        {
+            function_name = "tupleMultiplyByNumber";
+        }
+        else
+        {
+            function_name = "tupleDivideByNumber";
+        }
+
+        return FunctionFactory::instance().get(function_name, context);
+    }
+
     static bool isAggregateMultiply(const DataTypePtr & type0, const DataTypePtr & type1)
     {
         if constexpr (!is_multiply)
@@ -785,51 +903,62 @@ class FunctionBinaryArithmetic : public IFunction
         return function->execute(new_arguments, result_type, input_rows_count);
     }
 
-    template <typename T, typename ResultDataType, typename CC, typename C>
-    static auto helperGetOrConvert(const CC & col_const, const C & col)
+    ColumnPtr executeTupleNumberOperator(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type,
+                                               size_t input_rows_count, const FunctionOverloadResolverPtr & function_builder) const
+    {
+        ColumnsWithTypeAndName new_arguments = arguments;
+
+        /// Number argument must be second.
+        if (isNumber(arguments[0].type))
+            std::swap(new_arguments[0], new_arguments[1]);
+
+        auto function = function_builder->build(new_arguments);
+
+        return function->execute(new_arguments, result_type, input_rows_count);
+    }
+
+    template <typename T, typename ResultDataType>
+    static auto helperGetOrConvert(const auto & col_const, const auto & col)
     {
         using ResultType = typename ResultDataType::FieldType;
-        using NativeResultType = typename NativeType<ResultType>::Type;
+        using NativeResultType = NativeType<ResultType>;
 
-        if constexpr (IsFloatingPoint<ResultDataType> && IsDecimalNumber<T>)
+        if constexpr (IsFloatingPoint<ResultDataType> && is_decimal<T>)
             return DecimalUtils::convertTo<NativeResultType>(col_const->template getValue<T>(), col.getScale());
-        else if constexpr (IsDecimalNumber<T>)
+        else if constexpr (is_decimal<T>)
             return col_const->template getValue<T>().value;
         else
             return col_const->template getValue<T>();
     }
 
-    template <OpCase op_case, bool left_decimal, bool right_decimal, typename OpImpl, typename OpImplCheck,
-              typename L, typename R, typename VR, typename SA, typename SB>
-    void helperInvokeEither(const L& left, const R& right, VR& vec_res, SA scale_a, SB scale_b) const
+    template <OpCase op_case, bool left_decimal, bool right_decimal, typename OpImpl, typename OpImplCheck>
+    void helperInvokeEither(const auto& left, const auto& right, auto& vec_res, auto scale_a, auto scale_b, const NullMap * right_nullmap) const
     {
         if (check_decimal_overflow)
-            OpImplCheck::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b);
+            OpImplCheck::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b, right_nullmap);
         else
-            OpImpl::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b);
+            OpImpl::template process<op_case, left_decimal, right_decimal>(left, right, vec_res, scale_a, scale_b, right_nullmap);
     }
 
-    template <class LeftDataType, class RightDataType, class ResultDataType,
-              class L, class R, class CL, class CR>
+    template <class LeftDataType, class RightDataType, class ResultDataType>
     ColumnPtr executeNumericWithDecimal(
-        const L & left, const R & right,
+        const auto & left, const auto & right,
         const ColumnConst * const col_left_const, const ColumnConst * const col_right_const,
-        const CL * const col_left, const CR * const col_right,
-        size_t col_left_size) const
+        const auto * const col_left, const auto * const col_right,
+        size_t col_left_size, const NullMap * right_nullmap) const
     {
         using T0 = typename LeftDataType::FieldType;
         using T1 = typename RightDataType::FieldType;
         using ResultType = typename ResultDataType::FieldType;
 
-        using NativeResultType = typename NativeType<ResultType>::Type;
+        using NativeResultType = NativeType<ResultType>;
         using OpImpl = DecimalBinaryOperation<Op, ResultType, false>;
         using OpImplCheck = DecimalBinaryOperation<Op, ResultType, true>;
 
-        using ColVecResult = std::conditional_t<IsDecimalNumber<ResultType>,
-            ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+        using ColVecResult = ColumnVectorOrDecimal<ResultType>;
 
-        static constexpr const bool left_is_decimal = IsDecimalNumber<T0>;
-        static constexpr const bool right_is_decimal = IsDecimalNumber<T1>;
+        static constexpr const bool left_is_decimal = is_decimal<T0>;
+        static constexpr const bool right_is_decimal = is_decimal<T1>;
         static constexpr const bool result_is_decimal = IsDataTypeDecimal<ResultDataType>;
 
         typename ColVecResult::MutablePtr col_res = nullptr;
@@ -898,9 +1027,10 @@ class FunctionBinaryArithmetic : public IFunction
             const NativeResultType const_a = helperGetOrConvert<T0, ResultDataType>(col_left_const, left);
             const NativeResultType const_b = helperGetOrConvert<T1, ResultDataType>(col_right_const, right);
 
-            const ResultType res = check_decimal_overflow
-                ? OpImplCheck::template process<left_is_decimal, right_is_decimal>(const_a, const_b, scale_a, scale_b)
-                : OpImpl::template process<left_is_decimal, right_is_decimal>(const_a, const_b, scale_a, scale_b);
+            ResultType res = {};
+            if (!right_nullmap || !(*right_nullmap)[0])
+                res = check_decimal_overflow ? OpImplCheck::template process<left_is_decimal, right_is_decimal>(const_a, const_b, scale_a, scale_b)
+                    : OpImpl::template process<left_is_decimal, right_is_decimal>(const_a, const_b, scale_a, scale_b);
 
             if constexpr (result_is_decimal)
                 return ResultDataType(type.getPrecision(), type.getScale()).createColumnConst(
@@ -920,21 +1050,21 @@ class FunctionBinaryArithmetic : public IFunction
         if (col_left && col_right)
         {
             helperInvokeEither<OpCase::Vector, left_is_decimal, right_is_decimal, OpImpl, OpImplCheck>(
-                col_left->getData(), col_right->getData(), vec_res, scale_a, scale_b);
+                col_left->getData(), col_right->getData(), vec_res, scale_a, scale_b, right_nullmap);
         }
         else if (col_left_const && col_right)
         {
             const NativeResultType const_a = helperGetOrConvert<T0, ResultDataType>(col_left_const, left);
 
             helperInvokeEither<OpCase::LeftConstant, left_is_decimal, right_is_decimal, OpImpl, OpImplCheck>(
-                const_a, col_right->getData(), vec_res, scale_a, scale_b);
+                const_a, col_right->getData(), vec_res, scale_a, scale_b, right_nullmap);
         }
         else if (col_left && col_right_const)
         {
             const NativeResultType const_b = helperGetOrConvert<T1, ResultDataType>(col_right_const, right);
 
             helperInvokeEither<OpCase::RightConstant, left_is_decimal, right_is_decimal, OpImpl, OpImplCheck>(
-                col_left->getData(), const_b, vec_res, scale_a, scale_b);
+                col_left->getData(), const_b, vec_res, scale_a, scale_b, right_nullmap);
         }
         else
             return nullptr;
@@ -955,6 +1085,20 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool useDefaultImplementationForNulls() const override
+    {
+        /// We shouldn't use default implementation for nulls for the case when operation is divide,
+        /// intDiv or modulo and denominator is Nullable(Something), because it may cause division
+        /// by zero error (when value is Null we store default value 0 in nested column).
+        return !division_by_nullable;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        return ((IsOperation<Op>::div_int || IsOperation<Op>::modulo) && !arguments[1].is_const)
+            || (IsOperation<Op>::div_floating && (isDecimalOrNullableDecimal(arguments[0].type) || isDecimalOrNullableDecimal(arguments[1].type)));
+    }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         return getReturnTypeImplStatic(arguments, context);
@@ -999,6 +1143,34 @@ public:
             return function->getResultType();
         }
 
+        /// Special case when the function is plus, minus or multiply, both arguments are tuples.
+        if (auto function_builder = getFunctionForTupleArithmetic(arguments[0], arguments[1], context))
+        {
+            ColumnsWithTypeAndName new_arguments(2);
+
+            for (size_t i = 0; i < 2; ++i)
+                new_arguments[i].type = arguments[i];
+
+            auto function = function_builder->build(new_arguments);
+            return function->getResultType();
+        }
+
+        /// Special case when the function is multiply or divide, one of arguments is Tuple and another is Number.
+        if (auto function_builder = getFunctionForTupleAndNumberArithmetic(arguments[0], arguments[1], context))
+        {
+            ColumnsWithTypeAndName new_arguments(2);
+
+            for (size_t i = 0; i < 2; ++i)
+                new_arguments[i].type = arguments[i];
+
+            /// Number argument must be second.
+            if (isNumber(new_arguments[0].type))
+                std::swap(new_arguments[0], new_arguments[1]);
+
+            auto function = function_builder->build(new_arguments);
+            return function->getResultType();
+        }
+
         DataTypePtr type_res;
 
         const bool valid = castBothTypes(arguments[0].get(), arguments[1].get(), [&](const auto & left, const auto & right)
@@ -1006,19 +1178,33 @@ public:
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
 
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> ||
-                          std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr ((std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeString, LeftDataType>) ||
+                (std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, RightDataType>))
             {
-                if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
-                    return false;
-                else if constexpr (std::is_same_v<LeftDataType, RightDataType>)
+                if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> &&
+                              std::is_same_v<DataTypeFixedString, RightDataType>)
                 {
-                    if (left.getN() == right.getN())
+                    if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                        return false;
+                    else
                     {
-                        type_res = std::make_shared<LeftDataType>(left.getN());
-                        return true;
+                        if (left.getN() == right.getN())
+                        {
+                            type_res = std::make_shared<LeftDataType>(left.getN());
+                            return true;
+                        }
                     }
                 }
+
+                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
+                    return false;
+                else if constexpr (!IsIntegral<RightDataType>)
+                    return false;
+                else if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType>)
+                    type_res = std::make_shared<LeftDataType>(left.getN());
+                else
+                    type_res = std::make_shared<DataTypeString>();
+                return true;
             }
             else
             {
@@ -1155,8 +1341,108 @@ public:
         return nullptr;
     }
 
+
+    template <typename LeftColumnType, typename A, typename B>
+    ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
+    {
+        using LeftDataType = std::decay_t<decltype(left)>;
+        using RightDataType = std::decay_t<decltype(right)>;
+
+        const auto * const col_left_raw = arguments[0].column.get();
+        const auto * const col_right_raw = arguments[1].column.get();
+        using T1 = typename RightDataType::FieldType;
+
+        using ColVecT1 = ColumnVector<T1>;
+        const ColVecT1 * const col_right = checkAndGetColumn<ColVecT1>(col_right_raw);
+        const ColumnConst * const col_right_const = checkAndGetColumnConst<ColVecT1>(col_right_raw);
+
+        using OpImpl = StringIntegerOperationImpl<T1, Op<LeftDataType, T1>>;
+
+        const ColumnConst * const col_left_const = checkAndGetColumnConst<LeftColumnType>(col_left_raw);
+
+        const auto * col_left = col_left_const ? checkAndGetColumn<LeftColumnType>(col_left_const->getDataColumn())
+                                               : checkAndGetColumn<LeftColumnType>(col_left_raw);
+
+        if (!col_left)
+            return nullptr;
+
+        const typename LeftColumnType::Chars & in_vec = col_left->getChars();
+
+        typename LeftColumnType::MutablePtr col_res;
+        if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            col_res = LeftColumnType::create(col_left->getN());
+        else
+            col_res = LeftColumnType::create();
+
+        typename LeftColumnType::Chars & out_vec = col_res->getChars();
+
+        if (col_left_const && col_right_const)
+        {
+            const T1 value = col_right_const->template getValue<T1>();
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::Vector>(in_vec.data(), col_left->getN(), &value, out_vec, 1);
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                OpImpl::template processString<OpCase::Vector>(in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, 1);
+            }
+
+            return ColumnConst::create(std::move(col_res), col_left->size());
+        }
+        else if (!col_left_const && !col_right_const && col_right)
+        {
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::Vector>(in_vec.data(), col_left->getN(), col_right->getData().data(), out_vec, col_left->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_left->size());
+                OpImpl::template processString<OpCase::Vector>(
+                    in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_left->size());
+            }
+        }
+        else if (col_left_const && col_right)
+        {
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::LeftConstant>(
+                    in_vec.data(), col_left->getN(), col_right->getData().data(), out_vec, col_right->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_right->size());
+                OpImpl::template processString<OpCase::LeftConstant>(
+                    in_vec.data(), col_left->getOffsets().data(), col_right->getData().data(), out_vec, out_offsets, col_right->size());
+            }
+        }
+        else if (col_right_const)
+        {
+            const T1 value = col_right_const->template getValue<T1>();
+            if constexpr (std::is_same_v<LeftDataType, DataTypeFixedString>)
+            {
+                OpImpl::template processFixedString<OpCase::RightConstant>(in_vec.data(), col_left->getN(), &value, out_vec, col_left->size());
+            }
+            else
+            {
+                ColumnString::Offsets & out_offsets = col_res->getOffsets();
+                out_offsets.reserve(col_left->size());
+                OpImpl::template processString<OpCase::RightConstant>(
+                    in_vec.data(), col_left->getOffsets().data(), &value, out_vec, out_offsets, col_left->size());
+            }
+        }
+        else
+            return nullptr;
+
+        return col_res;
+    }
+
     template <typename A, typename B>
-    ColumnPtr executeNumeric(const ColumnsWithTypeAndName & arguments, const A & left, const B & right) const
+    ColumnPtr executeNumeric(const ColumnsWithTypeAndName & arguments, const A & left, const B & right, const NullMap * right_nullmap) const
     {
         using LeftDataType = std::decay_t<decltype(left)>;
         using RightDataType = std::decay_t<decltype(right)>;
@@ -1170,9 +1456,9 @@ public:
             using T0 = typename LeftDataType::FieldType;
             using T1 = typename RightDataType::FieldType;
             using ResultType = typename ResultDataType::FieldType;
-            using ColVecT0 = std::conditional_t<IsDecimalNumber<T0>, ColumnDecimal<T0>, ColumnVector<T0>>;
-            using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
-            using ColVecResult = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+            using ColVecT0 = ColumnVectorOrDecimal<T0>;
+            using ColVecT1 = ColumnVectorOrDecimal<T1>;
+            using ColVecResult = ColumnVectorOrDecimal<ResultType>;
 
             const auto * const col_left_raw = arguments[0].column.get();
             const auto * const col_right_raw = arguments[1].column.get();
@@ -1191,7 +1477,8 @@ public:
                     left, right,
                     col_left_const, col_right_const,
                     col_left, col_right,
-                    col_left_size);
+                    col_left_size,
+                    right_nullmap);
             }
             else // can't avoid else and another indentation level, otherwise the compiler would try to instantiate
                  // ColVecResult for Decimals which would lead to a compile error.
@@ -1201,7 +1488,7 @@ public:
                 /// non-vector result
                 if (col_left_const && col_right_const)
                 {
-                    const auto res = OpImpl::process(
+                    const auto res = right_nullmap && (*right_nullmap)[0] ? ResultType() : OpImpl::process(
                         col_left_const->template getValue<T0>(),
                         col_right_const->template getValue<T1>());
 
@@ -1219,7 +1506,8 @@ public:
                         col_left->getData().data(),
                         col_right->getData().data(),
                         vec_res.data(),
-                        vec_res.size());
+                        vec_res.size(),
+                        right_nullmap);
                 }
                 else if (col_left_const && col_right)
                 {
@@ -1229,7 +1517,8 @@ public:
                         &value,
                         col_right->getData().data(),
                         vec_res.data(),
-                        vec_res.size());
+                        vec_res.size(),
+                        right_nullmap);
                 }
                 else if (col_left && col_right_const)
                 {
@@ -1239,7 +1528,8 @@ public:
                         col_left->getData().data(),
                         &value,
                         vec_res.data(),
-                        vec_res.size());
+                        vec_res.size(),
+                        right_nullmap);
                 }
                 else
                     return nullptr;
@@ -1264,14 +1554,46 @@ public:
         }
 
         /// Special case when the function is plus or minus, one of arguments is Date/DateTime and another is Interval.
-        if (auto function_builder
-            = getFunctionForIntervalArithmetic(arguments[0].type, arguments[1].type, context))
+        if (auto function_builder = getFunctionForIntervalArithmetic(arguments[0].type, arguments[1].type, context))
         {
             return executeDateTimeIntervalPlusMinus(arguments, result_type, input_rows_count, function_builder);
         }
 
+        /// Special case when the function is plus, minus or multiply, both arguments are tuples.
+        if (auto function_builder = getFunctionForTupleArithmetic(arguments[0].type, arguments[1].type, context))
+        {
+            return function_builder->build(arguments)->execute(arguments, result_type, input_rows_count);
+        }
+
+        /// Special case when the function is multiply or divide, one of arguments is Tuple and another is Number.
+        if (auto function_builder = getFunctionForTupleAndNumberArithmetic(arguments[0].type, arguments[1].type, context))
+        {
+            return executeTupleNumberOperator(arguments, result_type, input_rows_count, function_builder);
+        }
+
+        return executeImpl2(arguments, result_type, input_rows_count);
+    }
+
+    ColumnPtr executeImpl2(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, const NullMap * right_nullmap = nullptr) const
+    {
         const auto & left_argument = arguments[0];
         const auto & right_argument = arguments[1];
+
+        /// Process special case when operation is divide, intDiv or modulo and denominator
+        /// is Nullable(Something) to prevent division by zero error.
+        if (division_by_nullable && !right_nullmap)
+        {
+            assert(right_argument.type->isNullable());
+
+            bool is_const = checkColumnConst<ColumnNullable>(right_argument.column.get());
+            const ColumnNullable * nullable_column = is_const ? checkAndGetColumnConstData<ColumnNullable>(right_argument.column.get())
+                                                              : checkAndGetColumn<ColumnNullable>(*right_argument.column);
+
+            const auto & null_bytemap = nullable_column->getNullMapData();
+            auto res = executeImpl2(createBlockWithNestedColumns(arguments), removeNullable(result_type), input_rows_count, &null_bytemap);
+            return wrapInNullable(res, arguments, result_type, input_rows_count);
+        }
+
         const auto * const left_generic = left_argument.type.get();
         const auto * const right_generic = right_argument.type.get();
         ColumnPtr res;
@@ -1281,16 +1603,31 @@ public:
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
 
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> ||
-                std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr ((std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeString, LeftDataType>) ||
+                          (std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, RightDataType>))
             {
-                if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> &&
+                              std::is_same_v<DataTypeFixedString, RightDataType>)
+                {
+                    if constexpr (!Op<DataTypeFixedString, DataTypeFixedString>::allow_fixed_string)
+                        return false;
+                    else
+                        return (res = executeFixedString(arguments)) != nullptr;
+                }
+
+                if constexpr (!Op<LeftDataType, RightDataType>::allow_string_integer)
                     return false;
-                else
-                    return (res = executeFixedString(arguments)) != nullptr;
+                else if constexpr (!IsIntegral<RightDataType>)
+                    return false;
+                else if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType>)
+                {
+                    return (res = executeStringInteger<ColumnFixedString>(arguments, left, right)) != nullptr;
+                }
+                else if constexpr (std::is_same_v<DataTypeString, LeftDataType>)
+                    return (res = executeStringInteger<ColumnString>(arguments, left, right)) != nullptr;
             }
             else
-                return (res = executeNumeric(arguments, left, right)) != nullptr;
+                return (res = executeNumeric(arguments, left, right, right_nullmap)) != nullptr;
         });
 
         if (!valid)
@@ -1317,7 +1654,7 @@ public:
         {
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
-            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr (std::is_same_v<DataTypeFixedString, LeftDataType> || std::is_same_v<DataTypeFixedString, RightDataType> || std::is_same_v<DataTypeString, LeftDataType> || std::is_same_v<DataTypeString, RightDataType>)
                 return false;
             else
             {
@@ -1337,7 +1674,7 @@ public:
         {
             using LeftDataType = std::decay_t<decltype(left)>;
             using RightDataType = std::decay_t<decltype(right)>;
-            if constexpr (!std::is_same_v<DataTypeFixedString, LeftDataType> && !std::is_same_v<DataTypeFixedString, RightDataType>)
+            if constexpr (!std::is_same_v<DataTypeFixedString, LeftDataType> && !std::is_same_v<DataTypeFixedString, RightDataType> && !std::is_same_v<DataTypeString, LeftDataType> && !std::is_same_v<DataTypeString, RightDataType>)
             {
                 using ResultDataType = typename BinaryOperationTraits<Op, LeftDataType, RightDataType>::ResultDataType;
                 using OpSpec = Op<typename LeftDataType::FieldType, typename RightDataType::FieldType>;
@@ -1361,11 +1698,11 @@ public:
 };
 
 
-template <template <typename, typename> class Op, typename Name, bool valid_on_default_arguments = true, bool valid_on_float_arguments = true>
-class FunctionBinaryArithmeticWithConstants : public FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments>
+template <template <typename, typename> class Op, typename Name, bool valid_on_default_arguments = true, bool valid_on_float_arguments = true, bool division_by_nullable = false>
+class FunctionBinaryArithmeticWithConstants : public FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments, division_by_nullable>
 {
 public:
-    using Base = FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments>;
+    using Base = FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments, division_by_nullable>;
     using Monotonicity = typename Base::Monotonicity;
 
     static FunctionPtr create(
@@ -1416,16 +1753,32 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field & left_point, const Field & right_point) const override
     {
-        // For simplicity, we treat null values as monotonicity breakers.
+        const std::string_view name_view = Name::name;
+
+        // For simplicity, we treat null values as monotonicity breakers, except for variable / non-zero constant.
         if (left_point.isNull() || right_point.isNull())
+        {
+            if (name_view == "divide" || name_view == "intDiv")
+            {
+                // variable / constant
+                if (right.column && isColumnConst(*right.column))
+                {
+                    auto constant = (*right.column)[0];
+                    if (applyVisitor(FieldVisitorAccurateEquals(), constant, Field(0)))
+                        return {false, true, false}; // variable / 0 is undefined, let's treat it as non-monotonic
+                    bool is_constant_positive = applyVisitor(FieldVisitorAccurateLess(), Field(0), constant);
+
+                    // division is saturated to `inf`, thus it doesn't have overflow issues.
+                    return {true, is_constant_positive, true};
+                }
+            }
             return {false, true, false};
+        }
 
         // For simplicity, we treat every single value interval as positive monotonic.
         if (applyVisitor(FieldVisitorAccurateEquals(), left_point, right_point))
             return {true, true, false};
 
-        const std::string_view name_view = Name::name;
-
         if (name_view == "minus" || name_view == "plus")
         {
             // const +|- variable
@@ -1497,14 +1850,14 @@ public:
                     return {true, true, false}; // 0 / 0 is undefined, thus it's not always monotonic
 
                 bool is_constant_positive = applyVisitor(FieldVisitorAccurateLess(), Field(0), constant);
-                if (applyVisitor(FieldVisitorAccurateLess(), left_point, Field(0)) &&
-                        applyVisitor(FieldVisitorAccurateLess(), right_point, Field(0)))
+                if (applyVisitor(FieldVisitorAccurateLess(), left_point, Field(0))
+                    && applyVisitor(FieldVisitorAccurateLess(), right_point, Field(0)))
                 {
                     return {true, is_constant_positive, false};
                 }
-                else
-                if (applyVisitor(FieldVisitorAccurateLess(), Field(0), left_point) &&
-                        applyVisitor(FieldVisitorAccurateLess(), Field(0), right_point))
+                else if (
+                    applyVisitor(FieldVisitorAccurateLess(), Field(0), left_point)
+                    && applyVisitor(FieldVisitorAccurateLess(), Field(0), right_point))
                 {
                     return {true, !is_constant_positive, false};
                 }
@@ -1518,7 +1871,7 @@ public:
 
                 bool is_constant_positive = applyVisitor(FieldVisitorAccurateLess(), Field(0), constant);
                 // division is saturated to `inf`, thus it doesn't have overflow issues.
-                return {true, is_constant_positive, false};
+                return {true, is_constant_positive, true};
             }
         }
         return {false, true, false};
@@ -1548,22 +1901,37 @@ public:
 
     FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
+        /// Check the case when operation is divide, intDiv or modulo and denominator is Nullable(Something).
+        /// For divide operation we should check only Nullable(Decimal), because only this case can throw division by zero error.
+        bool division_by_nullable = !arguments[0].type->onlyNull() && !arguments[1].type->onlyNull() && arguments[1].type->isNullable()
+            && (IsOperation<Op>::div_int || IsOperation<Op>::modulo
+                || (IsOperation<Op>::div_floating
+                    && (isDecimalOrNullableDecimal(arguments[0].type) || isDecimalOrNullableDecimal(arguments[1].type))));
+
         /// More efficient specialization for two numeric arguments.
         if (arguments.size() == 2
             && ((arguments[0].column && isColumnConst(*arguments[0].column))
                 || (arguments[1].column && isColumnConst(*arguments[1].column))))
         {
+            auto function = division_by_nullable ? FunctionBinaryArithmeticWithConstants<Op, Name, valid_on_default_arguments, valid_on_float_arguments, true>::create(
+                    arguments[0], arguments[1], return_type, context)
+                : FunctionBinaryArithmeticWithConstants<Op, Name, valid_on_default_arguments, valid_on_float_arguments, false>::create(
+                    arguments[0], arguments[1], return_type, context);
+
             return std::make_unique<FunctionToFunctionBaseAdaptor>(
-                FunctionBinaryArithmeticWithConstants<Op, Name, valid_on_default_arguments, valid_on_float_arguments>::create(
-                    arguments[0], arguments[1], return_type, context),
+                function,
                 collections::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
                 return_type);
         }
+        auto function = division_by_nullable
+            ? FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments, true>::create(context)
+            : FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments, false>::create(context);
 
         return std::make_unique<FunctionToFunctionBaseAdaptor>(
-            FunctionBinaryArithmetic<Op, Name, valid_on_default_arguments, valid_on_float_arguments>::create(context),
+            function,
             collections::map<DataTypes>(arguments, [](const auto & elem) { return elem.type; }),
             return_type);
+
     }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/FunctionBitTestMany.h b/src/Functions/FunctionBitTestMany.h
index c2797ee69b4..808c3711631 100644
--- a/src/Functions/FunctionBitTestMany.h
+++ b/src/Functions/FunctionBitTestMany.h
@@ -5,7 +5,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -29,6 +29,7 @@ public:
     String getName() const override { return name; }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/FunctionChar.cpp b/src/Functions/FunctionChar.cpp
index 1cbb60b7760..f50e212d9b2 100644
--- a/src/Functions/FunctionChar.cpp
+++ b/src/Functions/FunctionChar.cpp
@@ -30,6 +30,7 @@ public:
 
     bool isVariadic() const override { return true; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/FunctionConstantBase.h b/src/Functions/FunctionConstantBase.h
new file mode 100644
index 00000000000..2d237c77256
--- /dev/null
+++ b/src/Functions/FunctionConstantBase.h
@@ -0,0 +1,55 @@
+#pragma once
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+/// Base class for constant functions
+template<typename Derived, typename T, typename ColumnT>
+class FunctionConstantBase : public IFunction
+{
+public:
+    template <typename U>
+    explicit FunctionConstantBase(U && constant_value_, bool is_distributed_ = false)
+        : constant_value(std::forward<U>(constant_value_)), is_distributed(is_distributed_)
+    {
+    }
+
+    String getName() const override
+    {
+        return Derived::name;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 0;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<ColumnT>();
+    }
+
+    bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return true; }
+
+    /// Some functions may return different values on different shards/replicas, so it's not constant for distributed query
+    bool isSuitableForConstantFolding() const override { return !is_distributed; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return ColumnT().createColumnConst(input_rows_count, constant_value);
+    }
+
+private:
+    const T constant_value;
+    bool is_distributed;
+};
+
+}
+
diff --git a/src/Functions/FunctionCustomWeekToSomething.h b/src/Functions/FunctionCustomWeekToSomething.h
index b5ea01418c1..542062151ce 100644
--- a/src/Functions/FunctionCustomWeekToSomething.h
+++ b/src/Functions/FunctionCustomWeekToSomething.h
@@ -30,6 +30,7 @@ public:
     String getName() const override { return name; }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -129,20 +130,17 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
     {
-        IFunction::Monotonicity is_monotonic{true};
-        IFunction::Monotonicity is_not_monotonic;
+        if constexpr (std::is_same_v<typename Transform::FactorTransform, ZeroTransform>)
+            return { .is_monotonic = true, .is_always_monotonic = true };
 
-        if (std::is_same_v<typename Transform::FactorTransform, ZeroTransform>)
-        {
-            is_monotonic.is_always_monotonic = true;
-            return is_monotonic;
-        }
+        const IFunction::Monotonicity is_monotonic = { .is_monotonic = true };
+        const IFunction::Monotonicity is_not_monotonic;
 
         /// This method is called only if the function has one argument. Therefore, we do not care about the non-local time zone.
         const DateLUTImpl & date_lut = DateLUT::instance();
 
         if (left.isNull() || right.isNull())
-            return is_not_monotonic;
+            return {};
 
         /// The function is monotonous on the [left, right] segment, if the factor transformation returns the same values for them.
 
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index cfb53a65f7f..af34f27d6b8 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
@@ -399,6 +399,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/FunctionDateOrDateTimeToSomething.h b/src/Functions/FunctionDateOrDateTimeToSomething.h
index abf7f967653..00678e65364 100644
--- a/src/Functions/FunctionDateOrDateTimeToSomething.h
+++ b/src/Functions/FunctionDateOrDateTimeToSomething.h
@@ -33,6 +33,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -127,14 +128,11 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
     {
-        IFunction::Monotonicity is_monotonic { true };
-        IFunction::Monotonicity is_not_monotonic;
+        if constexpr (std::is_same_v<typename Transform::FactorTransform, ZeroTransform>)
+            return { .is_monotonic = true, .is_always_monotonic = true };
 
-        if (std::is_same_v<typename Transform::FactorTransform, ZeroTransform>)
-        {
-            is_monotonic.is_always_monotonic = true;
-            return is_monotonic;
-        }
+        const IFunction::Monotonicity is_monotonic = { .is_monotonic = true };
+        const IFunction::Monotonicity is_not_monotonic;
 
         /// This method is called only if the function has one argument. Therefore, we do not care about the non-local time zone.
         const DateLUTImpl & date_lut = DateLUT::instance();
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index 304aad17d22..7385de807a1 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -1,7 +1,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Core/Field.h>
 
 
@@ -24,6 +24,8 @@ public:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index b1437d58c09..664c18a9aaf 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -26,8 +26,8 @@ const String & getFunctionCanonicalNameIfAny(const String & name)
     return FunctionFactory::instance().getCanonicalNameIfAny(name);
 }
 
-void FunctionFactory::registerFunction(const
-    std::string & name,
+void FunctionFactory::registerFunction(
+    const std::string & name,
     Value creator,
     CaseSensitiveness case_sensitiveness)
 {
@@ -87,6 +87,15 @@ FunctionOverloadResolverPtr FunctionFactory::get(
     return getImpl(name, context);
 }
 
+bool FunctionFactory::has(const std::string & name) const
+{
+    String canonical_name = getAliasToOrName(name);
+    if (functions.contains(canonical_name))
+        return true;
+    canonical_name = Poco::toLower(canonical_name);
+    return case_insensitive_functions.contains(canonical_name);
+}
+
 FunctionOverloadResolverPtr FunctionFactory::tryGetImpl(
     const std::string & name_param,
     ContextPtr context) const
@@ -119,8 +128,8 @@ FunctionOverloadResolverPtr FunctionFactory::tryGetImpl(
 }
 
 FunctionOverloadResolverPtr FunctionFactory::tryGet(
-        const std::string & name,
-        ContextPtr context) const
+    const std::string & name,
+    ContextPtr context) const
 {
     auto impl = tryGetImpl(name, context);
     return impl ? std::move(impl) : nullptr;
diff --git a/src/Functions/FunctionFactory.h b/src/Functions/FunctionFactory.h
index bac55dade16..898a463cd58 100644
--- a/src/Functions/FunctionFactory.h
+++ b/src/Functions/FunctionFactory.h
@@ -43,6 +43,8 @@ public:
     /// This function is used by YQL - internal Yandex product that depends on ClickHouse by source code.
     std::vector<std::string> getAllNames() const;
 
+    bool has(const std::string & name) const;
+
     /// Throws an exception if not found.
     FunctionOverloadResolverPtr get(const std::string & name, ContextPtr context) const;
 
diff --git a/src/Functions/FunctionFile.cpp b/src/Functions/FunctionFile.cpp
index 3239705281e..5a123c9557c 100644
--- a/src/Functions/FunctionFile.cpp
+++ b/src/Functions/FunctionFile.cpp
@@ -33,6 +33,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/FunctionHelpers.cpp b/src/Functions/FunctionHelpers.cpp
index eac1a7ad1a1..e44962f4c38 100644
--- a/src/Functions/FunctionHelpers.cpp
+++ b/src/Functions/FunctionHelpers.cpp
@@ -224,14 +224,19 @@ checkAndGetNestedArrayOffset(const IColumn ** columns, size_t num_arguments)
     return {nested_columns, offsets->data()};
 }
 
-bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs)
+bool areTypesEqual(const IDataType & lhs, const IDataType & rhs)
 {
-    const auto & lhs_name = lhs->getName();
-    const auto & rhs_name = rhs->getName();
+    const auto & lhs_name = lhs.getName();
+    const auto & rhs_name = rhs.getName();
 
     return lhs_name == rhs_name;
 }
 
+bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs)
+{
+    return areTypesEqual(*lhs, *rhs);
+}
+
 ColumnPtr wrapInNullable(const ColumnPtr & src, const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count)
 {
     ColumnPtr result_null_map_column;
@@ -303,4 +308,14 @@ NullPresence getNullPresense(const ColumnsWithTypeAndName & args)
     return res;
 }
 
+bool isDecimalOrNullableDecimal(const DataTypePtr & type)
+{
+    WhichDataType which(type);
+    if (which.isDecimal())
+        return true;
+    if (!which.isNullable())
+        return false;
+    return isDecimal(assert_cast<const DataTypeNullable *>(type.get())->getNestedType());
+}
+
 }
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 5abe24f4e50..8d33c820185 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -3,6 +3,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
@@ -67,13 +68,13 @@ const ColumnConst * checkAndGetColumnConstStringOrFixedString(const IColumn * co
 
 /// Transform anything to Field.
 template <typename T>
-inline std::enable_if_t<!IsDecimalNumber<T>, Field> toField(const T & x)
+Field toField(const T & x)
 {
     return Field(NearestFieldType<T>(x));
 }
 
-template <typename T>
-inline std::enable_if_t<IsDecimalNumber<T>, Field> toField(const T & x, UInt32 scale)
+template <is_decimal T>
+Field toField(const T & x, UInt32 scale)
 {
     return Field(NearestFieldType<T>(x, scale));
 }
@@ -107,8 +108,8 @@ struct FunctionArgumentDescriptor
 {
     const char * argument_name;
 
-    bool (* type_validator_func)(const IDataType &);
-    bool (* column_validator_func)(const IColumn &);
+    std::function<bool (const IDataType &)> type_validator_func;
+    std::function<bool (const IColumn &)> column_validator_func;
 
     const char * expected_type_description;
 
@@ -154,8 +155,9 @@ void validateFunctionArgumentTypes(const IFunction & func, const ColumnsWithType
 std::pair<std::vector<const IColumn *>, const ColumnArray::Offset *>
 checkAndGetNestedArrayOffset(const IColumn ** columns, size_t num_arguments);
 
-
 /// Check if two types are equal
+bool areTypesEqual(const IDataType & lhs, const IDataType & rhs);
+
 bool areTypesEqual(const DataTypePtr & lhs, const DataTypePtr & rhs);
 
 /** Return ColumnNullable of src, with null map as OR-ed null maps of args columns.
@@ -171,4 +173,5 @@ struct NullPresence
 
 NullPresence getNullPresense(const ColumnsWithTypeAndName & args);
 
+bool isDecimalOrNullableDecimal(const DataTypePtr & type);
 }
diff --git a/src/Functions/FunctionIfBase.h b/src/Functions/FunctionIfBase.h
index 17d02de2e27..d0e69ca1ebc 100644
--- a/src/Functions/FunctionIfBase.h
+++ b/src/Functions/FunctionIfBase.h
@@ -3,9 +3,7 @@
 #include <Functions/IFunction.h>
 #include <DataTypes/Native.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 namespace DB
 {
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index a78cd70f419..df131538275 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -25,14 +25,14 @@ ColumnPtr ExecutableFunctionJoinGet<or_null>::executeImpl(const ColumnsWithTypeA
         auto key = arguments[i];
         keys.emplace_back(std::move(key));
     }
-    return storage_join->joinGet(keys, result_columns).column;
+    return storage_join->joinGet(keys, result_columns, getContext()).column;
 }
 
 template <bool or_null>
 ExecutableFunctionPtr FunctionJoinGet<or_null>::prepare(const ColumnsWithTypeAndName &) const
 {
     Block result_columns {{return_type->createColumn(), return_type, attr_name}};
-    return std::make_unique<ExecutableFunctionJoinGet<or_null>>(table_lock, storage_join, result_columns);
+    return std::make_unique<ExecutableFunctionJoinGet<or_null>>(getContext(), table_lock, storage_join, result_columns);
 }
 
 static std::pair<std::shared_ptr<StorageJoin>, String>
@@ -48,22 +48,11 @@ getJoin(const ColumnsWithTypeAndName & arguments, ContextPtr context)
             "Illegal type " + arguments[0].type->getName() + " of first argument of function joinGet, expected a const string.",
             ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
-    size_t dot = join_name.find('.');
-    String database_name;
-    if (dot == String::npos)
-    {
-        database_name = context->getCurrentDatabase();
-        dot = 0;
-    }
-    else
-    {
-        database_name = join_name.substr(0, dot);
-        ++dot;
-    }
-    String table_name = join_name.substr(dot);
-    if (table_name.empty())
-        throw Exception("joinGet does not allow empty table name", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-    auto table = DatabaseCatalog::instance().getTable({database_name, table_name}, std::const_pointer_cast<Context>(context));
+    auto qualified_name = QualifiedTableName::parseFromString(join_name);
+    if (qualified_name.database.empty())
+        qualified_name.database = context->getCurrentDatabase();
+
+    auto table = DatabaseCatalog::instance().getTable({qualified_name.database, qualified_name.table}, std::const_pointer_cast<Context>(context));
     auto storage_join = std::dynamic_pointer_cast<StorageJoin>(table);
     if (!storage_join)
         throw Exception("Table " + join_name + " should have engine StorageJoin", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
@@ -90,11 +79,17 @@ FunctionBasePtr JoinGetOverloadResolver<or_null>::buildImpl(const ColumnsWithTyp
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
     auto [storage_join, attr_name] = getJoin(arguments, getContext());
     DataTypes data_types(arguments.size() - 2);
-    for (size_t i = 2; i < arguments.size(); ++i)
-        data_types[i - 2] = arguments[i].type;
+    DataTypes argument_types(arguments.size());
+    for (size_t i = 0; i < arguments.size(); ++i)
+    {
+        if (i >= 2)
+            data_types[i - 2] = arguments[i].type;
+        argument_types[i] = arguments[i].type;
+    }
     auto return_type = storage_join->joinGetCheckAndGetReturnType(data_types, attr_name, or_null);
     auto table_lock = storage_join->lockForShare(getContext()->getInitialQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
-    return std::make_unique<FunctionJoinGet<or_null>>(table_lock, storage_join, attr_name, data_types, return_type);
+
+    return std::make_unique<FunctionJoinGet<or_null>>(getContext(), table_lock, storage_join, attr_name, argument_types, return_type);
 }
 
 void registerFunctionJoinGet(FunctionFactory & factory)
diff --git a/src/Functions/FunctionJoinGet.h b/src/Functions/FunctionJoinGet.h
index c701625e9cd..2dd0cb9fdea 100644
--- a/src/Functions/FunctionJoinGet.h
+++ b/src/Functions/FunctionJoinGet.h
@@ -14,13 +14,15 @@ class StorageJoin;
 using StorageJoinPtr = std::shared_ptr<StorageJoin>;
 
 template <bool or_null>
-class ExecutableFunctionJoinGet final : public IExecutableFunction
+class ExecutableFunctionJoinGet final : public IExecutableFunction, WithContext
 {
 public:
-    ExecutableFunctionJoinGet(TableLockHolder table_lock_,
+    ExecutableFunctionJoinGet(ContextPtr context_,
+                              TableLockHolder table_lock_,
                               StorageJoinPtr storage_join_,
                               const DB::Block & result_columns_)
-        : table_lock(std::move(table_lock_))
+        : WithContext(context_)
+        , table_lock(std::move(table_lock_))
         , storage_join(std::move(storage_join_))
         , result_columns(result_columns_)
     {}
@@ -42,15 +44,17 @@ private:
 };
 
 template <bool or_null>
-class FunctionJoinGet final : public IFunctionBase
+class FunctionJoinGet final : public IFunctionBase, WithContext
 {
 public:
     static constexpr auto name = or_null ? "joinGetOrNull" : "joinGet";
 
-    FunctionJoinGet(TableLockHolder table_lock_,
+    FunctionJoinGet(ContextPtr context_,
+                    TableLockHolder table_lock_,
                     StorageJoinPtr storage_join_, String attr_name_,
                     DataTypes argument_types_, DataTypePtr return_type_)
-        : table_lock(std::move(table_lock_))
+        : WithContext(context_)
+        , table_lock(std::move(table_lock_))
         , storage_join(storage_join_)
         , attr_name(std::move(attr_name_))
         , argument_types(std::move(argument_types_))
@@ -60,6 +64,8 @@ public:
 
     String getName() const override { return name; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     const DataTypes & getArgumentTypes() const override { return argument_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
 
diff --git a/src/Functions/FunctionMathBinaryFloat64.h b/src/Functions/FunctionMathBinaryFloat64.h
index 8cc012d3ab2..badbde280f1 100644
--- a/src/Functions/FunctionMathBinaryFloat64.h
+++ b/src/Functions/FunctionMathBinaryFloat64.h
@@ -9,9 +9,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 namespace DB
 {
@@ -32,6 +30,7 @@ public:
     static_assert(Impl::rows_per_iteration > 0, "Impl must process at least one row per iteration");
 
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
 private:
     String getName() const override { return name; }
diff --git a/src/Functions/FunctionMathConstFloat64.h b/src/Functions/FunctionMathConstFloat64.h
deleted file mode 100644
index ab7d401e99e..00000000000
--- a/src/Functions/FunctionMathConstFloat64.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include <DataTypes/DataTypesNumber.h>
-#include <Columns/ColumnsNumber.h>
-#include <Functions/IFunction.h>
-
-
-namespace DB
-{
-
-template <typename Impl>
-class FunctionMathConstFloat64 : public IFunction
-{
-public:
-    static constexpr auto name = Impl::name;
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathConstFloat64>(); }
-
-private:
-    String getName() const override { return name; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeFloat64>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return result_type->createColumnConst(input_rows_count, Impl::value);
-    }
-};
-
-}
diff --git a/src/Functions/FunctionMathUnary.h b/src/Functions/FunctionMathUnary.h
index a637bbe3bd8..2d39daac366 100644
--- a/src/Functions/FunctionMathUnary.h
+++ b/src/Functions/FunctionMathUnary.h
@@ -8,9 +8,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 /** FastOps is a fast vector math library from Mikhail Parakhin (former Yandex CTO),
   * Enabled by default.
@@ -41,6 +39,8 @@ private:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const auto & arg = arguments.front();
@@ -148,7 +148,7 @@ private:
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
             using ReturnType = std::conditional_t<Impl::always_returns_float64 || !std::is_floating_point_v<Type>, Float64, Type>;
-            using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+            using ColVecType = ColumnVectorOrDecimal<Type>;
 
             const auto col_vec = checkAndGetColumn<ColVecType>(col.column.get());
             return (res = execute<Type, ReturnType>(col_vec)) != nullptr;
diff --git a/src/Functions/FunctionNumericPredicate.h b/src/Functions/FunctionNumericPredicate.h
index c539907ddc8..9d98f0c929d 100644
--- a/src/Functions/FunctionNumericPredicate.h
+++ b/src/Functions/FunctionNumericPredicate.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 #include <Interpreters/Context_fwd.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -38,6 +38,11 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isNativeNumber(arguments.front()))
diff --git a/src/Functions/FunctionSQLJSON.h b/src/Functions/FunctionSQLJSON.h
index 497909b5242..aaed980c62a 100644
--- a/src/Functions/FunctionSQLJSON.h
+++ b/src/Functions/FunctionSQLJSON.h
@@ -18,11 +18,9 @@
 #include <Interpreters/Context.h>
 #include <Parsers/IParser.h>
 #include <Parsers/Lexer.h>
-#include <common/range.h>
+#include <base/range.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 namespace DB
 {
@@ -50,36 +48,33 @@ public:
                 throw Exception{"JSONPath functions require at least 2 arguments", ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION};
             }
 
-            const auto & first_column = arguments[0];
+            const auto & json_column = arguments[0];
 
-            /// Check 1 argument: must be of type String (JSONPath)
-            if (!isString(first_column.type))
+            if (!isString(json_column.type))
             {
                 throw Exception(
-                    "JSONPath functions require 1 argument to be JSONPath of type string, illegal type: " + first_column.type->getName(),
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-            }
-            /// Check 1 argument: must be const (JSONPath)
-            if (!isColumnConst(*first_column.column))
-            {
-                throw Exception("1 argument (JSONPath) must be const", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-            }
-
-            const auto & second_column = arguments[1];
-
-            /// Check 2 argument: must be of type String (JSON)
-            if (!isString(second_column.type))
-            {
-                throw Exception(
-                    "JSONPath functions require 2 argument to be JSON of string, illegal type: " + second_column.type->getName(),
+                    "JSONPath functions require first argument to be JSON of string, illegal type: " + json_column.type->getName(),
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             }
 
-            const ColumnPtr & arg_jsonpath = first_column.column;
+            const auto & json_path_column = arguments[1];
+
+            if (!isString(json_path_column.type))
+            {
+                throw Exception(
+                    "JSONPath functions require second argument to be JSONPath of type string, illegal type: " + json_path_column.type->getName(),
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            }
+            if (!isColumnConst(*json_path_column.column))
+            {
+                throw Exception("Second argument (JSONPath) must be constant string", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            }
+
+            const ColumnPtr & arg_jsonpath = json_path_column.column;
             const auto * arg_jsonpath_const = typeid_cast<const ColumnConst *>(arg_jsonpath.get());
             const auto * arg_jsonpath_string = typeid_cast<const ColumnString *>(arg_jsonpath_const->getDataColumnPtr().get());
 
-            const ColumnPtr & arg_json = second_column.column;
+            const ColumnPtr & arg_json = json_column.column;
             const auto * col_json_const = typeid_cast<const ColumnConst *>(arg_json.get());
             const auto * col_json_string
                 = typeid_cast<const ColumnString *>(col_json_const ? col_json_const->getDataColumnPtr().get() : arg_json.get());
@@ -152,7 +147,8 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/FunctionSnowflake.h b/src/Functions/FunctionSnowflake.h
new file mode 100644
index 00000000000..1ba15433e94
--- /dev/null
+++ b/src/Functions/FunctionSnowflake.h
@@ -0,0 +1,207 @@
+#pragma once
+
+#include <Functions/extractTimeZoneFromFunctionArguments.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+
+#include <base/arithmeticOverflow.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+/** According to Twitter's post on Snowflake, we can extract the timestamp for a snowflake ID by right shifting
+ * the snowflake ID by 22 bits(10 bits machine ID and 12 bits sequence ID) and adding the Twitter epoch time of 1288834974657.
+ * https://en.wikipedia.org/wiki/Snowflake_ID
+ * https://blog.twitter.com/engineering/en_us/a/2010/announcing-snowflake
+ * https://ws-dl.blogspot.com/2019/08/2019-08-03-tweetedat-finding-tweet.html
+*/
+static constexpr long snowflake_epoch = 1288834974657L;
+static constexpr int time_shift = 22;
+
+class FunctionDateTimeToSnowflake : public IFunction
+{
+private:
+    const char * name;
+
+public:
+    FunctionDateTimeToSnowflake(const char * name_) : name(name_) { }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool isVariadic() const override { return false; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (!isDateTime(arguments[0].type))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The only argument for function {} must be DateTime", name);
+
+        return std::make_shared<DataTypeInt64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto & src = arguments[0];
+        const auto & col = *src.column;
+
+        auto res_column = ColumnInt64::create(input_rows_count);
+        auto & result_data = res_column->getData();
+
+        const auto & source_data = typeid_cast<const ColumnUInt32 &>(col).getData();
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            result_data[i] = (Int64(source_data[i]) * 1000 - snowflake_epoch) << time_shift;
+        }
+
+        return res_column;
+    }
+};
+
+
+class FunctionSnowflakeToDateTime : public IFunction
+{
+private:
+    const char * name;
+
+public:
+    FunctionSnowflakeToDateTime(const char * name_) : name(name_) { }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isVariadic() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() < 1 || arguments.size() > 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} takes one or two arguments", name);
+
+        if (!typeid_cast<const DataTypeInt64 *>(arguments[0].type.get()))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The first argument for function {} must be Int64", name);
+
+        std::string timezone;
+        if (arguments.size() == 2)
+            timezone = extractTimeZoneNameFromFunctionArguments(arguments, 1, 0);
+
+        return std::make_shared<DataTypeDateTime>(timezone);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto & src = arguments[0];
+        const auto & col = *src.column;
+
+        auto res_column = ColumnUInt32::create(input_rows_count);
+        auto & result_data = res_column->getData();
+
+        const auto & source_data = typeid_cast<const ColumnInt64 &>(col).getData();
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            result_data[i] = ((source_data[i] >> time_shift) + snowflake_epoch) / 1000;
+        }
+        return res_column;
+    }
+};
+
+
+class FunctionDateTime64ToSnowflake : public IFunction
+{
+private:
+    const char * name;
+
+public:
+    FunctionDateTime64ToSnowflake(const char * name_) : name(name_) { }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool isVariadic() const override { return false; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (!isDateTime64(arguments[0].type))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The only argument for function {} must be DateTime64", name);
+
+        return std::make_shared<DataTypeInt64>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto & src = arguments[0];
+        const auto & col = *src.column;
+
+        auto res_column = ColumnInt64::create(input_rows_count);
+        auto & result_data = res_column->getData();
+
+        const auto & source_data = typeid_cast<const ColumnDecimal<DateTime64> &>(col).getData();
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            result_data[i] = (source_data[i] - snowflake_epoch) << time_shift;
+        }
+
+        return res_column;
+    }
+};
+
+
+class FunctionSnowflakeToDateTime64 : public IFunction
+{
+private:
+    const char * name;
+
+public:
+    FunctionSnowflakeToDateTime64(const char * name_) : name(name_) { }
+
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isVariadic() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() < 1 || arguments.size() > 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} takes one or two arguments", name);
+
+        if (!typeid_cast<const DataTypeInt64 *>(arguments[0].type.get()))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The first argument for function {} must be Int64", name);
+
+        std::string timezone;
+        if (arguments.size() == 2)
+            timezone = extractTimeZoneNameFromFunctionArguments(arguments, 1, 0);
+
+        return std::make_shared<DataTypeDateTime64>(3, timezone);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto & src = arguments[0];
+        const auto & col = *src.column;
+
+        auto res_column = ColumnDecimal<DateTime64>::create(input_rows_count, 3);
+        auto & result_data = res_column->getData();
+
+        const auto & source_data = typeid_cast<const ColumnInt64 &>(col).getData();
+
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            result_data[i] = (source_data[i] >> time_shift) + snowflake_epoch;
+        }
+        return res_column;
+    }
+};
+
+}
diff --git a/src/Functions/FunctionStartsEndsWith.h b/src/Functions/FunctionStartsEndsWith.h
index 65dbf393290..5a3aba62f26 100644
--- a/src/Functions/FunctionStartsEndsWith.h
+++ b/src/Functions/FunctionStartsEndsWith.h
@@ -42,6 +42,11 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return true;
+    }
+
     size_t getNumberOfArguments() const override
     {
         return 2;
diff --git a/src/Functions/FunctionStringOrArrayToT.h b/src/Functions/FunctionStringOrArrayToT.h
index 69f0741a741..3bf1f0a5d34 100644
--- a/src/Functions/FunctionStringOrArrayToT.h
+++ b/src/Functions/FunctionStringOrArrayToT.h
@@ -21,7 +21,7 @@ namespace ErrorCodes
 }
 
 
-template <typename Impl, typename Name, typename ResultType>
+template <typename Impl, typename Name, typename ResultType, bool is_suitable_for_short_circuit_arguments_execution = true>
 class FunctionStringOrArrayToT : public IFunction
 {
 public:
@@ -41,6 +41,11 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return is_suitable_for_short_circuit_arguments_execution;
+    }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isStringOrFixedString(arguments[0])
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index 2e99f58531a..09aa5586929 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -29,6 +29,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 3; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
diff --git a/src/Functions/FunctionStringToString.h b/src/Functions/FunctionStringToString.h
index 26480a83995..4dafdb6627f 100644
--- a/src/Functions/FunctionStringToString.h
+++ b/src/Functions/FunctionStringToString.h
@@ -43,6 +43,11 @@ public:
         return is_injective;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return true;
+    }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isStringOrFixedString(arguments[0]))
diff --git a/src/Functions/FunctionUnaryArithmetic.h b/src/Functions/FunctionUnaryArithmetic.h
index 68fcfadfb84..3207b80af71 100644
--- a/src/Functions/FunctionUnaryArithmetic.h
+++ b/src/Functions/FunctionUnaryArithmetic.h
@@ -12,9 +12,7 @@
 #include <Functions/IsOperation.h>
 #include <Functions/castTypeToEither.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    pragma GCC diagnostic push
@@ -38,8 +36,8 @@ template <typename A, typename Op>
 struct UnaryOperationImpl
 {
     using ResultType = typename Op::ResultType;
-    using ColVecA = std::conditional_t<IsDecimalNumber<A>, ColumnDecimal<A>, ColumnVector<A>>;
-    using ColVecC = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+    using ColVecA = ColumnVectorOrDecimal<A>;
+    using ColVecC = ColumnVectorOrDecimal<ResultType>;
     using ArrayA = typename ColVecA::Container;
     using ArrayC = typename ColVecC::Container;
 
@@ -83,6 +81,8 @@ class FunctionUnaryArithmetic : public IFunction
     static constexpr bool allow_fixed_string = Op<UInt8>::allow_fixed_string;
     static constexpr bool is_sign_function = IsUnaryOperation<Op>::sign;
 
+    ContextPtr context;
+
     template <typename F>
     static bool castType(const IDataType * type, F && f)
     {
@@ -109,10 +109,29 @@ class FunctionUnaryArithmetic : public IFunction
         >(type, std::forward<F>(f));
     }
 
+    static FunctionOverloadResolverPtr
+    getFunctionForTupleArithmetic(const DataTypePtr & type, ContextPtr context)
+    {
+        if (!isTuple(type))
+            return {};
+
+        /// Special case when the function is negate, argument is tuple.
+        /// We construct another function (example: tupleNegate) and call it.
+
+        if constexpr (!IsUnaryOperation<Op>::negate)
+            return {};
+
+        return FunctionFactory::instance().get("tupleNegate", context);
+    }
+
 public:
     static constexpr auto name = Name::name;
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionUnaryArithmetic>(); }
 
+    FunctionUnaryArithmetic() = default;
+
+    explicit FunctionUnaryArithmetic(ContextPtr context_) : context(context_) {}
+
     String getName() const override
     {
         return name;
@@ -120,11 +139,28 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return is_injective; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
+        return getReturnTypeImplStatic(arguments, context);
+    }
+
+    static DataTypePtr getReturnTypeImplStatic(const DataTypes & arguments, ContextPtr context)
+    {
+        /// Special case when the function is negate, argument is tuple.
+        if (auto function_builder = getFunctionForTupleArithmetic(arguments[0], context))
+        {
+            ColumnsWithTypeAndName new_arguments(1);
+
+            new_arguments[0].type = arguments[0];
+
+            auto function = function_builder->build(new_arguments);
+            return function->getResultType();
+        }
+
         DataTypePtr result;
         bool valid = castType(arguments[0].get(), [&](const auto & type)
         {
@@ -151,13 +187,19 @@ public:
             return true;
         });
         if (!valid)
-            throw Exception("Illegal type " + arguments[0]->getName() + " of argument of function " + getName(),
+            throw Exception("Illegal type " + arguments[0]->getName() + " of argument of function " + String(name),
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
         return result;
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        /// Special case when the function is negate, argument is tuple.
+        if (auto function_builder = getFunctionForTupleArithmetic(arguments[0].type, context))
+        {
+            return function_builder->build(arguments)->execute(arguments, result_type, input_rows_count);
+        }
+
         ColumnPtr result_column;
         bool valid = castType(arguments[0].type.get(), [&](const auto & type)
         {
@@ -289,7 +331,7 @@ struct PositiveMonotonicity
     static bool has() { return true; }
     static IFunction::Monotonicity get(const Field &, const Field &)
     {
-        return { true };
+        return { .is_monotonic = true };
     }
 };
 
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index a4357c148ac..8c507077acd 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
@@ -35,6 +35,7 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
     bool isVariadic() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -99,6 +100,7 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index b76b454fd77..58a7947a135 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #include <DataTypes/DataTypeString.h>
@@ -148,6 +146,7 @@ private:
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
     bool useDefaultImplementationForConstants() const override { return true; }
@@ -155,21 +154,21 @@ private:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         auto optional_args = FunctionArgumentDescriptors{
-            {"IV", isStringOrFixedString, nullptr, "Initialization vector binary string"},
+            {"IV", &isStringOrFixedString<IDataType>, nullptr, "Initialization vector binary string"},
         };
 
         if constexpr (compatibility_mode == OpenSSLDetails::CompatibilityMode::OpenSSL)
         {
             optional_args.emplace_back(FunctionArgumentDescriptor{
-                "AAD", isStringOrFixedString, nullptr, "Additional authenticated data binary string for GCM mode"
+                "AAD", &isStringOrFixedString<IDataType>, nullptr, "Additional authenticated data binary string for GCM mode"
             });
         }
 
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
-                {"mode", isStringOrFixedString, isColumnConst, "encryption mode string"},
-                {"input", isStringOrFixedString, nullptr, "plaintext"},
-                {"key", isStringOrFixedString, nullptr, "encryption key binary string"},
+                {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "encryption mode string"},
+                {"input", &isStringOrFixedString<IDataType>, nullptr, "plaintext"},
+                {"key", &isStringOrFixedString<IDataType>, nullptr, "encryption key binary string"},
             },
             optional_args
         );
@@ -423,6 +422,7 @@ private:
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
     bool useDefaultImplementationForConstants() const override { return true; }
@@ -430,21 +430,21 @@ private:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         auto optional_args = FunctionArgumentDescriptors{
-            {"IV", isStringOrFixedString, nullptr, "Initialization vector binary string"},
+            {"IV", &isStringOrFixedString<IDataType>, nullptr, "Initialization vector binary string"},
         };
 
         if constexpr (compatibility_mode == OpenSSLDetails::CompatibilityMode::OpenSSL)
         {
             optional_args.emplace_back(FunctionArgumentDescriptor{
-                "AAD", isStringOrFixedString, nullptr, "Additional authenticated data binary string for GCM mode"
+                "AAD", &isStringOrFixedString<IDataType>, nullptr, "Additional authenticated data binary string for GCM mode"
             });
         }
 
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
-                {"mode", isStringOrFixedString, isColumnConst, "decryption mode string"},
+                {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "decryption mode string"},
                 {"input", nullptr, nullptr, "ciphertext"},
-                {"key", isStringOrFixedString, nullptr, "decryption key binary string"},
+                {"key", &isStringOrFixedString<IDataType>, nullptr, "decryption key binary string"},
             },
             optional_args
         );
diff --git a/src/Functions/FunctionsBinaryRepr.cpp b/src/Functions/FunctionsBinaryRepr.cpp
index 08d74b30166..20b2acac88a 100644
--- a/src/Functions/FunctionsBinaryRepr.cpp
+++ b/src/Functions/FunctionsBinaryRepr.cpp
@@ -50,7 +50,7 @@ struct HexImpl
             UInt8 byte = x >> offset;
 
             /// Skip leading zeros
-            if (byte == 0 && !was_nonzero && offset)
+            if (byte == 0 && !was_nonzero && offset) //-V560
                 continue;
 
             was_nonzero = true;
@@ -138,7 +138,7 @@ struct BinImpl
             UInt8 byte = x >> offset;
 
             /// Skip leading zeros
-            if (byte == 0 && !was_nonzero && offset)
+            if (byte == 0 && !was_nonzero && offset) //-V560
                 continue;
 
             was_nonzero = true;
@@ -262,6 +262,8 @@ public:
 
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         WhichDataType which(arguments[0]);
@@ -494,6 +496,8 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/FunctionsBitToArray.cpp b/src/Functions/FunctionsBitToArray.cpp
index 32c45823e0f..309fbafaf91 100644
--- a/src/Functions/FunctionsBitToArray.cpp
+++ b/src/Functions/FunctionsBitToArray.cpp
@@ -45,6 +45,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -141,6 +142,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -227,6 +229,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/FunctionsBitmap.cpp b/src/Functions/FunctionsBitmap.cpp
index 72652288872..159d0ff6777 100644
--- a/src/Functions/FunctionsBitmap.cpp
+++ b/src/Functions/FunctionsBitmap.cpp
@@ -13,6 +13,7 @@ void registerFunctionsBitmap(FunctionFactory & factory)
     factory.registerFunction<FunctionBitmapToArray>();
     factory.registerFunction<FunctionBitmapSubsetInRange>();
     factory.registerFunction<FunctionBitmapSubsetLimit>();
+    factory.registerFunction<FunctionBitmapSubsetOffsetLimit>();
     factory.registerFunction<FunctionBitmapTransform>();
 
     factory.registerFunction<FunctionBitmapSelfCardinality>();
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index bbdc53c3006..775a39f4d08 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -99,6 +99,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -227,6 +229,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -317,6 +321,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 3; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -460,9 +466,24 @@ public:
     }
 };
 
+struct BitmapSubsetOffsetLimitImpl
+{
+public:
+    static constexpr auto name = "subBitmap";
+    template <typename T>
+    static void apply(
+        const AggregateFunctionGroupBitmapData<T> & bitmap_data_0,
+        UInt64 range_start,
+        UInt64 range_end,
+        AggregateFunctionGroupBitmapData<T> & bitmap_data_2)
+        {
+        bitmap_data_0.rbs.rb_offset_limit(range_start, range_end, bitmap_data_2.rbs);
+        }
+};
+
 using FunctionBitmapSubsetInRange = FunctionBitmapSubset<BitmapSubsetInRangeImpl>;
 using FunctionBitmapSubsetLimit = FunctionBitmapSubset<BitmapSubsetLimitImpl>;
-
+using FunctionBitmapSubsetOffsetLimit = FunctionBitmapSubset<BitmapSubsetOffsetLimitImpl>;
 
 class FunctionBitmapTransform : public IFunction
 {
@@ -475,6 +496,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 3; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -641,6 +664,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -813,6 +838,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 2; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -917,6 +944,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 2; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -1048,6 +1077,11 @@ struct BitmapAndnotImpl
     }
 };
 
+struct NameBitmapAnd
+{
+    static constexpr auto name = "bitmapAnd";
+};
+
 template <template <typename> class Impl, typename Name>
 class FunctionBitmap : public IFunction
 {
@@ -1060,6 +1094,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 2; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -1145,10 +1181,16 @@ private:
             const AggregateDataPtr data_ptr_0 = is_column_const[0] ? container0[0] : container0[i];
             const AggregateDataPtr data_ptr_1 = is_column_const[1] ? container1[0] : container1[i];
 
-            col_to->insertFrom(data_ptr_0);
+            // bitmapAnd(RoaringBitMap, SmallSet) is slower than bitmapAnd(SmallSet, RoaringBitMap), so we can exchange the position of two arguments for the speed
+            auto * bm_1 = reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(data_ptr_0);
+            auto * bm_2 = reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(data_ptr_1);
+
+            // check the name of operation (bitmapAnd) and check if it is the situation mentioned above
+            auto need_exchange = (name == NameBitmapAnd::name) && bm_1->rbs.isLarge() && bm_2->rbs.isSmall();
+            col_to->insertFrom(need_exchange ? data_ptr_1 : data_ptr_0);
             AggregateFunctionGroupBitmapData<T> & bitmap_data_1 = *reinterpret_cast<AggregateFunctionGroupBitmapData<T> *>(col_to->getData()[i]);
             const AggregateFunctionGroupBitmapData<T> & bitmap_data_2
-                = *reinterpret_cast<const AggregateFunctionGroupBitmapData<T> *>(data_ptr_1);
+                = *reinterpret_cast<const AggregateFunctionGroupBitmapData<T> *>(need_exchange ? data_ptr_0 : data_ptr_1);
             Impl<T>::apply(bitmap_data_1, bitmap_data_2);
         }
         return col_to;
@@ -1206,10 +1248,6 @@ using FunctionBitmapAndnotCardinality = FunctionBitmapCardinality<BitmapAndnotCa
 using FunctionBitmapHasAll = FunctionBitmapCardinality<BitmapHasAllImpl, NameBitmapHasAll, UInt8>;
 using FunctionBitmapHasAny = FunctionBitmapCardinality<BitmapHasAnyImpl, NameBitmapHasAny, UInt8>;
 
-struct NameBitmapAnd
-{
-    static constexpr auto name = "bitmapAnd";
-};
 struct NameBitmapOr
 {
     static constexpr auto name = "bitmapOr";
diff --git a/src/Functions/FunctionsCodingIP.cpp b/src/Functions/FunctionsCodingIP.cpp
index 20af7d41aca..3e7c8bff4d5 100644
--- a/src/Functions/FunctionsCodingIP.cpp
+++ b/src/Functions/FunctionsCodingIP.cpp
@@ -1,3 +1,7 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnFixedString.h>
@@ -50,6 +54,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -120,6 +125,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 3; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const auto * ptr = checkAndGetDataType<DataTypeFixedString>(arguments[0].get());
@@ -249,6 +256,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
@@ -324,6 +333,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return mask_tail_octets == 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -385,6 +395,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
@@ -445,6 +457,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -501,6 +514,8 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -521,6 +536,8 @@ public:
 
     String getName() const override { return name; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
@@ -544,6 +561,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -674,6 +692,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
@@ -763,6 +783,7 @@ public:
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -877,6 +898,7 @@ public:
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -958,6 +980,8 @@ public:
 
     String getName() const override { return name; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
@@ -1004,6 +1028,8 @@ public:
 
     String getName() const override { return name; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/FunctionsCodingUUID.cpp b/src/Functions/FunctionsCodingUUID.cpp
index 5f3e7b0de4a..5ac1d585325 100644
--- a/src/Functions/FunctionsCodingUUID.cpp
+++ b/src/Functions/FunctionsCodingUUID.cpp
@@ -39,6 +39,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -137,6 +138,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index b9c7c211b74..945090781dc 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -1071,6 +1071,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     /// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -1086,7 +1088,7 @@ public:
         if (!((both_represented_by_number && !has_date)   /// Do not allow to compare date and number.
             || (left.isStringOrFixedString() || right.isStringOrFixedString())  /// Everything can be compared with string by conversion.
             /// You can compare the date, datetime, or datatime64 and an enumeration with a constant string.
-            || ((left.isDate() || left.isDateTime() || left.isDateTime64()) && (right.isDate() || right.isDateTime() || right.isDateTime64()) && left.idx == right.idx) /// only date vs date, or datetime vs datetime
+            || ((left.isDate() || left.isDate32() || left.isDateTime() || left.isDateTime64()) && (right.isDate() || right.isDate32() || right.isDateTime() || right.isDateTime64()) && left.idx == right.idx) /// only date vs date, or datetime vs datetime
             || (left.isUUID() && right.isUUID())
             || (left.isEnum() && right.isEnum() && arguments[0]->getName() == arguments[1]->getName()) /// only equivalent enum type values can be compared against
             || (left_tuple && right_tuple && left_tuple->getElements().size() == right_tuple->getElements().size())
@@ -1176,8 +1178,8 @@ public:
         const bool left_is_string = isStringOrFixedString(which_left);
         const bool right_is_string = isStringOrFixedString(which_right);
 
-        bool date_and_datetime = (which_left.idx != which_right.idx) && (which_left.isDate() || which_left.isDateTime() || which_left.isDateTime64())
-            && (which_right.isDate() || which_right.isDateTime() || which_right.isDateTime64());
+        bool date_and_datetime = (which_left.idx != which_right.idx) && (which_left.isDate() || which_left.isDate32() || which_left.isDateTime() || which_left.isDateTime64())
+            && (which_right.isDate() || which_right.isDate32() || which_right.isDateTime() || which_right.isDateTime64());
 
         ColumnPtr res;
         if (left_is_num && right_is_num && !date_and_datetime)
@@ -1220,8 +1222,8 @@ public:
         }
         else if ((isColumnedAsDecimal(left_type) || isColumnedAsDecimal(right_type)))
         {
-            // Comparing Date and DateTime64 requires implicit conversion,
-            if (date_and_datetime && (isDate(left_type) || isDate(right_type)))
+            // Comparing Date/Date32 and DateTime64 requires implicit conversion,
+            if (date_and_datetime && (isDateOrDate32(left_type) || isDateOrDate32(right_type)))
             {
                 DataTypePtr common_type = getLeastSupertype({left_type, right_type});
                 ColumnPtr c0_converted = castColumn(col_with_type_and_name_left, common_type);
@@ -1245,8 +1247,10 @@ public:
             ColumnPtr c0_converted = castColumn(col_with_type_and_name_left, common_type);
             ColumnPtr c1_converted = castColumn(col_with_type_and_name_right, common_type);
             if (!((res = executeNumLeftType<UInt32>(c0_converted.get(), c1_converted.get()))
-                  || (res = executeNumLeftType<UInt64>(c0_converted.get(), c1_converted.get()))))
-                throw Exception("Date related common types can only be UInt32 or UInt64", ErrorCodes::LOGICAL_ERROR);
+                  || (res = executeNumLeftType<UInt64>(c0_converted.get(), c1_converted.get()))
+                  || (res = executeNumLeftType<Int32>(c0_converted.get(), c1_converted.get()))
+                  || (res = executeDecimal({c0_converted, common_type, "left"}, {c1_converted, common_type, "right"}))))
+                throw Exception("Date related common types can only be UInt32/UInt64/Int32/Decimal", ErrorCodes::LOGICAL_ERROR);
             return res;
         }
         else if (left_type->equals(*right_type))
diff --git a/src/Functions/FunctionsConsistentHashing.h b/src/Functions/FunctionsConsistentHashing.h
index 4c393f6ee01..5e41303d822 100644
--- a/src/Functions/FunctionsConsistentHashing.h
+++ b/src/Functions/FunctionsConsistentHashing.h
@@ -39,6 +39,8 @@ public:
         return 2;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isInteger(arguments[0]))
@@ -104,8 +106,9 @@ private:
         else if (buckets_field.getType() == Field::Types::UInt64)
             num_buckets = checkBucketsRange(buckets_field.get<UInt64>());
         else
-            throw Exception("Illegal type " + String(buckets_field.getTypeName()) + " of the second argument of function " + getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of the second argument of function {}",
+                buckets_field.getTypeName(), getName());
 
         const auto & hash_col = arguments[0].column;
         const IDataType * hash_type = arguments[0].type.get();
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index d7686318efc..f32d5df8a21 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -7,6 +7,8 @@ namespace DB
 
 void registerFunctionFixedString(FunctionFactory & factory);
 
+void registerCastOverloadResolvers(FunctionFactory & factory);
+
 void registerFunctionsConversion(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionToUInt8>();
@@ -43,9 +45,7 @@ void registerFunctionsConversion(FunctionFactory & factory)
 
     factory.registerFunction<FunctionToUnixTimestamp>();
 
-    factory.registerFunction<CastOverloadResolver<CastType::nonAccurate>>(FunctionFactory::CaseInsensitive);
-    factory.registerFunction<CastOverloadResolver<CastType::accurate>>();
-    factory.registerFunction<CastOverloadResolver<CastType::accurateOrNull>>();
+    registerCastOverloadResolvers(factory);
 
     factory.registerFunction<FunctionToUInt8OrZero>();
     factory.registerFunction<FunctionToUInt16OrZero>();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
index 67a02e3fd34..9238cc81c37 100644
--- a/src/Functions/FunctionsConversion.h
+++ b/src/Functions/FunctionsConversion.h
@@ -301,7 +301,7 @@ struct ToDateTimeImpl
         return time_zone.fromDayNum(DayNum(d));
     }
 
-    static inline UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
+    static inline Int64 execute(Int32 d, const DateLUTImpl & time_zone)
     {
         return time_zone.fromDayNum(ExtendedDayNum(d));
     }
@@ -370,6 +370,9 @@ struct ToDateTransform8Or16Signed
     }
 };
 
+template <typename Name> struct ConvertImpl<DataTypeDateTime64, DataTypeDate32, Name, ConvertDefaultBehaviorTag>
+        : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate32, TransformDateTime64<ToDate32Impl>> {};
+
 /// Implementation of toDate32 function.
 
 template <typename FromType, typename ToType>
@@ -632,6 +635,12 @@ struct ToDateTime64Transform
         return execute(dt, time_zone);
     }
 
+    inline DateTime64::NativeType execute(Int32 d, const DateLUTImpl & time_zone) const
+    {
+        const auto dt = ToDateTimeImpl::execute(d, time_zone);
+        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
+    }
+
     inline DateTime64::NativeType execute(UInt32 dt, const DateLUTImpl & /*time_zone*/) const
     {
         return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
@@ -642,6 +651,8 @@ struct ToDateTime64Transform
   */
 template <typename Name> struct ConvertImpl<DataTypeDate, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeDate, DataTypeDateTime64, ToDateTime64Transform> {};
+template <typename Name> struct ConvertImpl<DataTypeDate32, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
+    : DateTimeTransformImpl<DataTypeDate32, DataTypeDateTime64, ToDateTime64Transform> {};
 template <typename Name> struct ConvertImpl<DataTypeDateTime, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag>
     : DateTimeTransformImpl<DataTypeDateTime, DataTypeDateTime64, ToDateTime64Transform> {};
 
@@ -733,7 +744,7 @@ struct FormatImpl<DataTypeDecimal<FieldType>>
     template <typename ReturnType = void>
     static ReturnType execute(const FieldType x, WriteBuffer & wb, const DataTypeDecimal<FieldType> * type, const DateLUTImpl *)
     {
-        writeText(x, type->getScale(), wb);
+        writeText(x, type->getScale(), wb, false);
         return ReturnType(true);
     }
 };
@@ -764,7 +775,7 @@ template <typename FromDataType, typename Name>
 struct ConvertImpl<FromDataType, std::enable_if_t<!std::is_same_v<FromDataType, DataTypeString>, DataTypeString>, Name, ConvertDefaultBehaviorTag>
 {
     using FromFieldType = typename FromDataType::FieldType;
-    using ColVecType = std::conditional_t<IsDecimalNumber<FromFieldType>, ColumnDecimal<FromFieldType>, ColumnVector<FromFieldType>>;
+    using ColVecType = ColumnVectorOrDecimal<FromFieldType>;
 
     static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
     {
@@ -1454,6 +1465,10 @@ public:
     static constexpr bool to_string_or_fixed_string = std::is_same_v<ToDataType, DataTypeFixedString> ||
                                                       std::is_same_v<ToDataType, DataTypeString>;
 
+    static constexpr bool to_date_or_datetime = std::is_same_v<ToDataType, DataTypeDate> ||
+                                                std::is_same_v<ToDataType, DataTypeDate32> ||
+                                                std::is_same_v<ToDataType, DataTypeDateTime>;
+
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionConvert>(); }
     static FunctionPtr create() { return std::make_shared<FunctionConvert>(); }
 
@@ -1465,6 +1480,11 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return std::is_same_v<Name, NameToString>; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        /// TODO: We can make more optimizations here.
+        return !(to_date_or_datetime && isNumber(*arguments[0].type));
+    }
 
     using DefaultReturnTypeGetter = std::function<DataTypePtr(const ColumnsWithTypeAndName &)>;
     static DataTypePtr getReturnTypeDefaultImplementationForNulls(const ColumnsWithTypeAndName & arguments, const DefaultReturnTypeGetter & getter)
@@ -1501,12 +1521,12 @@ public:
 
         if constexpr (to_decimal)
         {
-            mandatory_args.push_back({"scale", &isNativeInteger, &isColumnConst, "const Integer"});
+            mandatory_args.push_back({"scale", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"});
         }
 
         if (!to_decimal && isDateTime64<Name, ToDataType>(arguments))
         {
-            mandatory_args.push_back({"scale", &isNativeInteger, &isColumnConst, "const Integer"});
+            mandatory_args.push_back({"scale", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"});
         }
 
         // toString(DateTime or DateTime64, [timezone: String])
@@ -1522,7 +1542,7 @@ public:
             // toDateTime64(value, scale : Integer[, timezone: String])
             || std::is_same_v<ToDataType, DataTypeDateTime64>)
         {
-            optional_args.push_back({"timezone", &isString, &isColumnConst, "const String"});
+            optional_args.push_back({"timezone", &isString<IDataType>, &isColumnConst, "const String"});
         }
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
@@ -1690,9 +1710,9 @@ private:
                 using RightT = typename RightDataType::FieldType;
 
                 static constexpr bool bad_left =
-                    IsDecimalNumber<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
+                    is_decimal<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
                 static constexpr bool bad_right =
-                    IsDecimalNumber<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
+                    is_decimal<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
 
                 /// Disallow int vs UUID conversion (but support int vs UInt128 conversion)
                 if constexpr ((bad_left && std::is_same_v<RightDataType, DataTypeUUID>) ||
@@ -1789,6 +1809,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
@@ -1801,11 +1822,11 @@ public:
         if (isDateTime64<Name, ToDataType>(arguments))
         {
             validateFunctionArgumentTypes(*this, arguments,
-                FunctionArgumentDescriptors{{"string", isStringOrFixedString, nullptr, "String or FixedString"}},
+                FunctionArgumentDescriptors{{"string", &isStringOrFixedString<IDataType>, nullptr, "String or FixedString"}},
                 // optional
                 FunctionArgumentDescriptors{
-                    {"precision", isUInt8, isColumnConst, "const UInt8"},
-                    {"timezone", isStringOrFixedString, isColumnConst, "const String or FixedString"},
+                    {"precision", &isUInt8<IDataType>, isColumnConst, "const UInt8"},
+                    {"timezone", &isStringOrFixedString<IDataType>, isColumnConst, "const String or FixedString"},
                 });
 
             UInt64 scale = to_datetime64 ? DataTypeDateTime64::default_scale : 0;
@@ -1944,7 +1965,7 @@ struct PositiveMonotonicity
     static bool has() { return true; }
     static IFunction::Monotonicity get(const IDataType &, const Field &, const Field &)
     {
-        return { true };
+        return { .is_monotonic = true };
     }
 };
 
@@ -1953,7 +1974,7 @@ struct UnknownMonotonicity
     static bool has() { return false; }
     static IFunction::Monotonicity get(const IDataType &, const Field &, const Field &)
     {
-        return { false };
+        return { };
     }
 };
 
@@ -1979,13 +2000,13 @@ struct ToNumberMonotonicity
         /// (Enum has separate case, because it is different data type)
         if (checkAndGetDataType<DataTypeNumber<T>>(&type) ||
             checkAndGetDataType<DataTypeEnum<T>>(&type))
-            return { true, true, true };
+            return { .is_monotonic = true, .is_always_monotonic = true };
 
         /// Float cases.
 
         /// When converting to Float, the conversion is always monotonic.
-        if (std::is_floating_point_v<T>)
-            return {true, true, true};
+        if constexpr (std::is_floating_point_v<T>)
+            return { .is_monotonic = true, .is_always_monotonic = true };
 
         /// If converting from Float, for monotonicity, arguments must fit in range of result type.
         if (WhichDataType(type).isFloat())
@@ -2000,7 +2021,7 @@ struct ToNumberMonotonicity
                 && left_float <= static_cast<Float64>(std::numeric_limits<T>::max())
                 && right_float >= static_cast<Float64>(std::numeric_limits<T>::min())
                 && right_float <= static_cast<Float64>(std::numeric_limits<T>::max()))
-                return { true };
+                return { .is_monotonic = true };
 
             return {};
         }
@@ -2025,10 +2046,10 @@ struct ToNumberMonotonicity
         if (size_of_from == size_of_to)
         {
             if (from_is_unsigned == to_is_unsigned)
-                return {true, true, true};
+                return { .is_monotonic = true, .is_always_monotonic = true };
 
             if (left_in_first_half == right_in_first_half)
-                return {true};
+                return { .is_monotonic = true };
 
             return {};
         }
@@ -2037,14 +2058,14 @@ struct ToNumberMonotonicity
         if (size_of_from < size_of_to)
         {
             if (from_is_unsigned == to_is_unsigned)
-                return {true, true, true};
+                return { .is_monotonic = true, .is_always_monotonic = true };
 
             if (!to_is_unsigned)
-                return {true, true, true};
+                return { .is_monotonic = true, .is_always_monotonic = true };
 
             /// signed -> unsigned. If arguments from the same half, then function is monotonic.
             if (left_in_first_half == right_in_first_half)
-                return {true};
+                return { .is_monotonic = true };
 
             return {};
         }
@@ -2061,10 +2082,14 @@ struct ToNumberMonotonicity
                 return {};
 
             if (to_is_unsigned)
-                return {true};
+                return { .is_monotonic = true };
             else
+            {
                 // If To is signed, it's possible that the signedness is different after conversion. So we check it explicitly.
-                return {(T(left.get<UInt64>()) >= 0) == (T(right.get<UInt64>()) >= 0)};
+                const bool is_monotonic = (T(left.get<UInt64>()) >= 0) == (T(right.get<UInt64>()) >= 0);
+
+                return { .is_monotonic = is_monotonic };
+            }
         }
 
         __builtin_unreachable();
@@ -2079,7 +2104,7 @@ struct ToDateMonotonicity
     {
         auto which = WhichDataType(type);
         if (which.isDateOrDate32() || which.isDateTime() || which.isDateTime64() || which.isInt8() || which.isInt16() || which.isUInt8() || which.isUInt16())
-            return {true, true, true};
+            return { .is_monotonic = true, .is_always_monotonic = true };
         else if (
             (which.isUInt() && ((left.isNull() || left.get<UInt64>() < 0xFFFF) && (right.isNull() || right.get<UInt64>() >= 0xFFFF)))
             || (which.isInt() && ((left.isNull() || left.get<Int64>() < 0xFFFF) && (right.isNull() || right.get<Int64>() >= 0xFFFF)))
@@ -2087,7 +2112,7 @@ struct ToDateMonotonicity
             || !type.isValueRepresentedByNumber())
             return {};
         else
-            return {true, true, true};
+            return { .is_monotonic = true, .is_always_monotonic = true };
     }
 };
 
@@ -2098,7 +2123,7 @@ struct ToDateTimeMonotonicity
     static IFunction::Monotonicity get(const IDataType & type, const Field &, const Field &)
     {
         if (type.isValueRepresentedByNumber())
-            return {true, true, true};
+            return { .is_monotonic = true, .is_always_monotonic = true };
         else
             return {};
     }
@@ -2113,7 +2138,7 @@ struct ToStringMonotonicity
 
     static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
     {
-        IFunction::Monotonicity positive(true, true);
+        IFunction::Monotonicity positive{ .is_monotonic = true };
         IFunction::Monotonicity not_monotonic;
 
         const auto * type_ptr = &type;
@@ -2412,7 +2437,8 @@ private:
     std::optional<Diagnostic> diagnostic;
 };
 
-struct NameCast { static constexpr auto name = "CAST"; };
+struct CastName { static constexpr auto name = "CAST"; };
+struct CastInternalName { static constexpr auto name = "_CAST"; };
 
 enum class CastType
 {
@@ -2421,17 +2447,26 @@ enum class CastType
     accurateOrNull
 };
 
-class FunctionCast final : public IFunctionBase
+class FunctionCastBase : public IFunctionBase
+{
+public:
+    using MonotonicityForRange = std::function<Monotonicity(const IDataType &, const Field &, const Field &)>;
+    using Diagnostic = ExecutableFunctionCast::Diagnostic;
+};
+
+template <typename FunctionName>
+class FunctionCast final : public FunctionCastBase
 {
 public:
     using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
-    using MonotonicityForRange = std::function<Monotonicity(const IDataType &, const Field &, const Field &)>;
-    using Diagnostic = ExecutableFunctionCast::Diagnostic;
 
-    FunctionCast(const char * name_, MonotonicityForRange && monotonicity_for_range_
-        , const DataTypes & argument_types_, const DataTypePtr & return_type_
-        , std::optional<Diagnostic> diagnostic_, CastType cast_type_)
-        : name(name_), monotonicity_for_range(std::move(monotonicity_for_range_))
+    FunctionCast(const char * cast_name_
+            , MonotonicityForRange && monotonicity_for_range_
+            , const DataTypes & argument_types_
+            , const DataTypePtr & return_type_
+            , std::optional<Diagnostic> diagnostic_
+            , CastType cast_type_)
+        : cast_name(cast_name_), monotonicity_for_range(std::move(monotonicity_for_range_))
         , argument_types(argument_types_), return_type(return_type_), diagnostic(std::move(diagnostic_))
         , cast_type(cast_type_)
     {
@@ -2445,7 +2480,7 @@ public:
         try
         {
             return std::make_unique<ExecutableFunctionCast>(
-                    prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), name, diagnostic);
+                    prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), cast_name, diagnostic);
         }
         catch (Exception & e)
         {
@@ -2456,10 +2491,11 @@ public:
         }
     }
 
-    String getName() const override { return name; }
+    String getName() const override { return cast_name; }
 
     bool isDeterministic() const override { return true; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     bool hasInformationAboutMonotonicity() const override
     {
@@ -2473,7 +2509,7 @@ public:
 
 private:
 
-    const char * name;
+    const char * cast_name;
     MonotonicityForRange monotonicity_for_range;
 
     DataTypes argument_types;
@@ -2515,7 +2551,7 @@ private:
         {
             /// In case when converting to Nullable type, we apply different parsing rule,
             /// that will not throw an exception but return NULL in case of malformed input.
-            FunctionPtr function = FunctionConvertFromString<ToDataType, NameCast, ConvertFromStringExceptionMode::Null>::create();
+            FunctionPtr function = FunctionConvertFromString<ToDataType, FunctionName, ConvertFromStringExceptionMode::Null>::create();
             return createFunctionAdaptor(function, from_type);
         }
         else if (!can_apply_accurate_cast)
@@ -2539,12 +2575,12 @@ private:
                 {
                     if (wrapper_cast_type == CastType::accurate)
                     {
-                        result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(
                             arguments, result_type, input_rows_count, AccurateConvertStrategyAdditions());
                     }
                     else
                     {
-                        result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(
                             arguments, result_type, input_rows_count, AccurateOrNullConvertStrategyAdditions());
                     }
 
@@ -2559,13 +2595,14 @@ private:
             {
                 if (wrapper_cast_type == CastType::accurateOrNull)
                 {
-                    auto nullable_column_wrapper = FunctionCast::createToNullableColumnWrapper();
+                    auto nullable_column_wrapper = FunctionCast<FunctionName>::createToNullableColumnWrapper();
                     return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
                 }
                 else
                 {
-                    throw Exception{"Conversion from " + std::string(getTypeName(from_type_index)) + " to " + to_type->getName() + " is not supported",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        from_type_index, to_type->getName());
                 }
             }
 
@@ -2631,7 +2668,7 @@ private:
                     {
                         AccurateConvertStrategyAdditions additions;
                         additions.scale = scale;
-                        result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(
                             arguments, result_type, input_rows_count, additions);
 
                         return true;
@@ -2640,7 +2677,7 @@ private:
                     {
                         AccurateOrNullConvertStrategyAdditions additions;
                         additions.scale = scale;
-                        result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(
                             arguments, result_type, input_rows_count, additions);
 
                         return true;
@@ -2653,14 +2690,14 @@ private:
                         /// Consistent with CAST(Nullable(String) AS Nullable(Numbers))
                         /// In case when converting to Nullable type, we apply different parsing rule,
                         /// that will not throw an exception but return NULL in case of malformed input.
-                        result_column = ConvertImpl<LeftDataType, RightDataType, NameCast, ConvertReturnNullOnErrorTag>::execute(
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName, ConvertReturnNullOnErrorTag>::execute(
                             arguments, result_type, input_rows_count, scale);
 
                         return true;
                     }
                 }
 
-                result_column = ConvertImpl<LeftDataType, RightDataType, NameCast>::execute(arguments, result_type, input_rows_count, scale);
+                result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(arguments, result_type, input_rows_count, scale);
 
                 return true;
             });
@@ -2670,12 +2707,13 @@ private:
             {
                 if (wrapper_cast_type == CastType::accurateOrNull)
                 {
-                    auto nullable_column_wrapper = FunctionCast::createToNullableColumnWrapper();
+                    auto nullable_column_wrapper = FunctionCast<FunctionName>::createToNullableColumnWrapper();
                     return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
                 }
                 else
-                    throw Exception{"Conversion from " + std::string(getTypeName(type_index)) + " to " + to_type->getName() + " is not supported",
-                        ErrorCodes::CANNOT_CONVERT_TYPE};
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        type_index, to_type->getName());
             }
 
             return result_column;
@@ -2990,7 +3028,7 @@ private:
     template <typename ColumnStringType, typename EnumType>
     WrapperType createStringToEnumWrapper() const
     {
-        const char * function_name = name;
+        const char * function_name = cast_name;
         return [function_name] (
             ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, const ColumnNullable * nullable_col, size_t /*input_rows_count*/)
         {
@@ -3324,7 +3362,7 @@ private:
 class MonotonicityHelper
 {
 public:
-    using MonotonicityForRange = FunctionCast::MonotonicityForRange;
+    using MonotonicityForRange = FunctionCastBase::MonotonicityForRange;
 
     template <typename DataType>
     static auto monotonicityForType(const DataType * const)
@@ -3382,89 +3420,4 @@ public:
     }
 };
 
-template<CastType cast_type>
-class CastOverloadResolver : public IFunctionOverloadResolver
-{
-public:
-    using MonotonicityForRange = FunctionCast::MonotonicityForRange;
-    using Diagnostic = FunctionCast::Diagnostic;
-
-    static constexpr auto accurate_cast_name = "accurateCast";
-    static constexpr auto accurate_cast_or_null_name = "accurateCastOrNull";
-    static constexpr auto cast_name = "CAST";
-
-    static constexpr auto name = cast_type == CastType::accurate
-        ? accurate_cast_name
-        : (cast_type == CastType::accurateOrNull ? accurate_cast_or_null_name : cast_name);
-
-    static FunctionOverloadResolverPtr create(ContextPtr context)
-    {
-        return createImpl(context->getSettingsRef().cast_keep_nullable);
-    }
-
-    static FunctionOverloadResolverPtr createImpl(bool keep_nullable, std::optional<Diagnostic> diagnostic = {})
-    {
-        return std::make_unique<CastOverloadResolver>(keep_nullable, std::move(diagnostic));
-    }
-
-
-    explicit CastOverloadResolver(bool keep_nullable_, std::optional<Diagnostic> diagnostic_ = {})
-        : keep_nullable(keep_nullable_), diagnostic(std::move(diagnostic_))
-    {}
-
-    String getName() const override { return name; }
-
-    size_t getNumberOfArguments() const override { return 2; }
-
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
-
-protected:
-
-    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
-    {
-        DataTypes data_types(arguments.size());
-
-        for (size_t i = 0; i < arguments.size(); ++i)
-            data_types[i] = arguments[i].type;
-
-        auto monotonicity = MonotonicityHelper::getMonotonicityInformation(arguments.front().type, return_type.get());
-        return std::make_unique<FunctionCast>(name, std::move(monotonicity), data_types, return_type, diagnostic, cast_type);
-    }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        const auto & column = arguments.back().column;
-        if (!column)
-            throw Exception("Second argument to " + getName() + " must be a constant string describing type."
-                " Instead there is non-constant column of type " + arguments.back().type->getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        const auto * type_col = checkAndGetColumnConst<ColumnString>(column.get());
-        if (!type_col)
-            throw Exception("Second argument to " + getName() + " must be a constant string describing type."
-                " Instead there is a column with the following structure: " + column->dumpStructure(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        DataTypePtr type = DataTypeFactory::instance().get(type_col->getValue<String>());
-
-        if constexpr (cast_type == CastType::accurateOrNull)
-        {
-            return makeNullable(type);
-        }
-        else
-        {
-            if (keep_nullable && arguments.front().type->isNullable())
-                return makeNullable(type);
-            return type;
-        }
-    }
-
-    bool useDefaultImplementationForNulls() const override { return false; }
-    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
-
-private:
-    bool keep_nullable;
-    std::optional<Diagnostic> diagnostic;
-};
-
 }
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index 884f53125eb..0f75750354a 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -18,9 +18,7 @@
 #include <Common/typeid_cast.h>
 #include <Core/Defines.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 
 namespace DB
@@ -157,6 +155,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -251,6 +250,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -389,6 +389,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -595,6 +596,8 @@ public:
     ///  even in face of fact that there are many different cities named Moscow.
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() != 1 && arguments.size() != 2)
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 118855b4bf8..7697d86dc34 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -29,7 +29,7 @@
 
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <type_traits>
 
@@ -42,7 +42,6 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_COLUMN;
-    extern const int BAD_ARGUMENTS;
     extern const int TYPE_MISMATCH;
 }
 
@@ -105,9 +104,11 @@ public:
 
         const auto * attr_name_col = checkAndGetColumnConst<ColumnString>(sample_columns.getByPosition(1).column.get());
         if (!attr_name_col)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument of function dictGet... must be a constant string");
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument of function dictGet must be a constant string");
 
-        return getDictionary(dict_name_col->getValue<String>())->isInjective(attr_name_col->getValue<String>());
+        const auto dictionary_name = dict_name_col->getValue<String>();
+        const auto attribute_name = attr_name_col->getValue<String>();
+        return getDictionary(dictionary_name)->isInjective(attribute_name);
     }
 
     DictionaryStructure getDictionaryStructure(const String & dictionary_name) const
@@ -146,6 +147,8 @@ public:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const final { return true; }
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
@@ -180,15 +183,16 @@ public:
 
         auto dictionary = helper.getDictionary(arguments[0].column);
         auto dictionary_key_type = dictionary->getKeyType();
+        auto dictionary_special_key_type = dictionary->getSpecialKeyType();
 
-        const ColumnWithTypeAndName & key_column_with_type = arguments[1];
+        const auto & key_column_with_type = arguments[1];
         auto key_column = key_column_with_type.column;
         auto key_column_type = key_column_with_type.type;
 
-        ColumnPtr range_col = nullptr;
-        DataTypePtr range_col_type = nullptr;
+        ColumnPtr range_col;
+        DataTypePtr range_col_type;
 
-        if (dictionary_key_type == DictionaryKeyType::range)
+        if (dictionary_special_key_type == DictionarySpecialKeyType::Range)
         {
             if (arguments.size() != 3)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
@@ -205,7 +209,10 @@ public:
                     getName());
         }
 
-        if (dictionary_key_type == DictionaryKeyType::simple)
+        Columns key_columns;
+        DataTypes key_types;
+
+        if (dictionary_key_type == DictionaryKeyType::Simple)
         {
             if (!WhichDataType(key_column_type).isUInt64())
                  throw Exception(
@@ -214,16 +221,23 @@ public:
                      getName(),
                      key_column_with_type.type->getName());
 
-            return dictionary->hasKeys({key_column}, {std::make_shared<DataTypeUInt64>()});
+            key_columns = {key_column};
+            key_types = {std::make_shared<DataTypeUInt64>()};
         }
-        else if (dictionary_key_type == DictionaryKeyType::complex)
+        else if (dictionary_key_type == DictionaryKeyType::Complex)
         {
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
             key_column = key_column->convertToFullColumnIfConst();
-            size_t keys_size = dictionary->getStructure().getKeysSize();
 
-            if (!isTuple(key_column_type))
+            if (isTuple(key_column_type))
             {
+                key_columns = assert_cast<const ColumnTuple &>(*key_column).getColumnsCopy();
+                key_types = assert_cast<const DataTypeTuple &>(*key_column_type).getElements();
+            }
+            else
+            {
+                size_t keys_size = dictionary->getStructure().getKeysSize();
+
                 if (keys_size > 1)
                 {
                     throw Exception(
@@ -235,30 +249,19 @@ public:
                 }
                 else
                 {
-                    Columns tuple_columns = {std::move(key_column)};
-                    key_column = ColumnTuple::create(tuple_columns);
-
-                    DataTypes tuple_types = {key_column_type};
-                    key_column_type = std::make_shared<DataTypeTuple>(tuple_types);
+                    key_columns = {key_column};
+                    key_types = {key_column_type};
                 }
             }
-
-            const auto & key_columns = assert_cast<const ColumnTuple &>(*key_column).getColumnsCopy();
-            const auto & key_types = assert_cast<const DataTypeTuple &>(*key_column_type).getElements();
-
-            return dictionary->hasKeys(key_columns, key_types);
         }
-        else
+
+        if (dictionary_special_key_type == DictionarySpecialKeyType::Range)
         {
-            if (!WhichDataType(key_column_type).isUInt64())
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Second argument of function {} must be UInt64 when dictionary is range. Actual type {}.",
-                    getName(),
-                    key_column_with_type.type->getName());
-
-            return dictionary->hasKeys({key_column, range_col}, {std::make_shared<DataTypeUInt64>(), range_col_type});
+            key_columns.emplace_back(range_col);
+            key_types.emplace_back(range_col_type);
         }
+
+        return dictionary->hasKeys(key_columns, key_types);
     }
 
 private:
@@ -288,6 +291,7 @@ public:
     String getName() const override { return name; }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
     bool useDefaultImplementationForConstants() const final { return true; }
@@ -319,21 +323,32 @@ public:
 
         Strings attribute_names = getAttributeNamesFromColumn(arguments[1].column, arguments[1].type);
 
-        DataTypes types;
-
         auto dictionary_structure = helper.getDictionaryStructure(dictionary_name);
 
+        DataTypes attribute_types;
+        attribute_types.reserve(attribute_names.size());
         for (auto & attribute_name : attribute_names)
         {
             /// We're extracting the return type from the dictionary's config, without loading the dictionary.
-            auto attribute = dictionary_structure.getAttribute(attribute_name);
-            types.emplace_back(attribute.type);
+            const auto & attribute = dictionary_structure.getAttribute(attribute_name);
+            attribute_types.emplace_back(attribute.type);
         }
 
-        if (types.size() > 1)
-            return std::make_shared<DataTypeTuple>(types, attribute_names);
+        bool key_is_nullable = arguments[2].type->isNullable();
+        if (attribute_types.size() > 1)
+        {
+            if (key_is_nullable)
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Function {} support nullable key only for single dictionary attribute", getName());
+
+            return std::make_shared<DataTypeTuple>(attribute_types, attribute_names);
+        }
         else
-            return types.front();
+        {
+            if (key_is_nullable)
+                return makeNullable(attribute_types.front());
+            else
+                return attribute_types.front();
+        }
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
@@ -355,13 +370,14 @@ public:
 
         auto dictionary = helper.getDictionary(dictionary_name);
         auto dictionary_key_type = dictionary->getKeyType();
+        auto dictionary_special_key_type = dictionary->getSpecialKeyType();
 
         size_t current_arguments_index = 3;
 
         ColumnPtr range_col = nullptr;
         DataTypePtr range_col_type = nullptr;
 
-        if (dictionary_key_type == DictionaryKeyType::range)
+        if (dictionary_special_key_type == DictionarySpecialKeyType::Range)
         {
             if (current_arguments_index >= arguments.size())
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
@@ -415,7 +431,9 @@ public:
                 default_cols = tuple_column->getColumnsCopy();
             }
             else
+            {
                 default_cols.emplace_back(result);
+            }
         }
         else
         {
@@ -423,12 +441,22 @@ public:
                 default_cols.emplace_back(nullptr);
         }
 
-        ColumnPtr result;
+        auto key_col_with_type = arguments[2];
 
-        const ColumnWithTypeAndName & key_col_with_type = arguments[2];
-        const auto key_column = key_col_with_type.column;
+        bool key_is_only_null = key_col_with_type.type->onlyNull();
+        if (key_is_only_null)
+            return result_type->createColumnConstWithDefaultValue(input_rows_count);
 
-        if (dictionary_key_type == DictionaryKeyType::simple)
+        bool key_is_nullable = key_col_with_type.type->isNullable();
+        if (key_is_nullable)
+            key_col_with_type = columnGetNested(key_col_with_type);
+
+        auto key_column = key_col_with_type.column;
+
+        Columns key_columns;
+        DataTypes key_types;
+
+        if (dictionary_key_type == DictionaryKeyType::Simple)
         {
             if (!WhichDataType(key_col_with_type.type).isUInt64())
                  throw Exception(
@@ -437,24 +465,24 @@ public:
                      getName(),
                      key_col_with_type.type->getName());
 
-            result = executeDictionaryRequest(
-                dictionary,
-                attribute_names,
-                {key_column},
-                {std::make_shared<DataTypeUInt64>()},
-                result_type,
-                default_cols);
+            key_columns = {key_column};
+            key_types = {std::make_shared<DataTypeUInt64>()};
         }
-        else if (dictionary_key_type == DictionaryKeyType::complex)
+        else if (dictionary_key_type == DictionaryKeyType::Complex)
         {
             /// Functions in external dictionaries_loader only support full-value (not constant) columns with keys.
-            ColumnPtr key_column = key_col_with_type.column->convertToFullColumnIfConst();
+            key_column = key_column->convertToFullColumnIfConst();
             DataTypePtr key_column_type = key_col_with_type.type;
 
-            size_t keys_size = dictionary->getStructure().getKeysSize();
-
-            if (!isTuple(key_column_type))
+            if (isTuple(key_column_type))
             {
+                key_columns = assert_cast<const ColumnTuple &>(*key_column).getColumnsCopy();
+                key_types = assert_cast<const DataTypeTuple &>(*key_column_type).getElements();
+            }
+            else if (!isTuple(key_column_type))
+            {
+                size_t keys_size = dictionary->getStructure().getKeysSize();
+
                 if (keys_size > 1)
                 {
                     throw Exception(
@@ -466,46 +494,38 @@ public:
                 }
                 else
                 {
-                    Columns tuple_columns = {std::move(key_column)};
-                    key_column = ColumnTuple::create(tuple_columns);
-
-                    DataTypes tuple_types = {key_column_type};
-                    key_column_type = std::make_shared<DataTypeTuple>(tuple_types);
+                    key_columns = {std::move(key_column)};
+                    key_types = {std::move(key_column_type)};
                 }
             }
-
-            const auto & key_columns = assert_cast<const ColumnTuple &>(*key_column).getColumnsCopy();
-            const auto & key_types = assert_cast<const DataTypeTuple &>(*key_column_type).getElements();
-
-            result = executeDictionaryRequest(
-                dictionary,
-                attribute_names,
-                key_columns,
-                key_types,
-                result_type,
-                default_cols);
         }
-        else if (dictionary_key_type == DictionaryKeyType::range)
+
+        if (dictionary_special_key_type == DictionarySpecialKeyType::Range)
         {
-            if (!WhichDataType(key_col_with_type.type).isUInt64())
-                 throw Exception(
-                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                     "Third argument of function {} must be UInt64 when dictionary is range. Actual type {}.",
-                     getName(),
-                     key_col_with_type.type->getName());
-
-            result = executeDictionaryRequest(
-                dictionary,
-                attribute_names,
-                {key_column, range_col},
-                {std::make_shared<DataTypeUInt64>(), range_col_type},
-                result_type,
-                default_cols);
+            key_columns.emplace_back(range_col);
+            key_types.emplace_back(range_col_type);
         }
-        else
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown dictionary identifier type");
 
-        return result;
+        DataTypePtr attribute_type = result_type;
+        if (key_is_nullable)
+        {
+            DataTypes attribute_types;
+            attribute_types.reserve(attribute_names.size());
+            for (auto & attribute_name : attribute_names)
+            {
+                const auto & attribute = dictionary->getStructure().getAttribute(attribute_name);
+                attribute_types.emplace_back(attribute.type);
+            }
+
+            attribute_type = attribute_types.front();
+        }
+
+        auto result_column = executeDictionaryRequest(dictionary, attribute_names, key_columns, key_types, attribute_type, default_cols);
+
+        if (key_is_nullable)
+            result_column = wrapInNullable(result_column, {arguments[2]}, result_type, input_rows_count);
+
+        return result_column;
     }
 
 private:
@@ -534,12 +554,14 @@ private:
             result = ColumnTuple::create(std::move(result_columns));
         }
         else
+        {
             result = dictionary->getColumn(
                 attribute_names[0],
                 result_type,
                 key_columns,
                 key_types,
                 default_cols.front());
+        }
 
         return result;
     }
@@ -549,7 +571,9 @@ private:
         Strings attribute_names;
 
         if (const auto * name_col = checkAndGetColumnConst<ColumnString>(column.get()))
+        {
             attribute_names.emplace_back(name_col->getValue<String>());
+        }
         else if (const auto * tuple_col_const = checkAndGetColumnConst<ColumnTuple>(column.get()))
         {
             const ColumnTuple & tuple_col = assert_cast<const ColumnTuple &>(tuple_col_const->getDataColumn());
@@ -574,10 +598,12 @@ private:
             }
         }
         else
+        {
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                 "Illegal type {} of second argument of function {}, expected a const string or const tuple of const strings.",
                 type->getName(),
                 getName());
+        }
 
         return attribute_names;
     }
@@ -611,6 +637,8 @@ private:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0, 1}; }
 
     bool isInjective(const ColumnsWithTypeAndName & sample_columns) const override
@@ -750,6 +778,8 @@ private:
 
     bool isVariadic() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
 
     bool useDefaultImplementationForNulls() const override { return false; }
@@ -907,6 +937,7 @@ public:
 private:
     size_t getNumberOfArguments() const override { return 2; }
     bool isInjective(const ColumnsWithTypeAndName & /*sample_columns*/) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     bool useDefaultImplementationForConstants() const final { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
@@ -969,6 +1000,7 @@ private:
     size_t getNumberOfArguments() const override { return 3; }
 
     bool useDefaultImplementationForConstants() const final { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -1037,6 +1069,7 @@ private:
     bool useDefaultImplementationForConstants() const final { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
     bool isDeterministic() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -1097,6 +1130,7 @@ private:
     bool useDefaultImplementationForConstants() const final { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const final { return {0}; }
     bool isDeterministic() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/FunctionsExternalModels.cpp b/src/Functions/FunctionsExternalModels.cpp
deleted file mode 100644
index e3b0e852731..00000000000
--- a/src/Functions/FunctionsExternalModels.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-#include <Functions/FunctionsExternalModels.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
-
-#include <Interpreters/Context.h>
-#include <Interpreters/ExternalModelsLoader.h>
-#include <Columns/ColumnString.h>
-#include <common/range.h>
-#include <string>
-#include <memory>
-#include <DataTypes/DataTypeNullable.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnTuple.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <Common/assert_cast.h>
-
-
-namespace DB
-{
-
-FunctionPtr FunctionModelEvaluate::create(ContextPtr context)
-{
-    return std::make_shared<FunctionModelEvaluate>(context->getExternalModelsLoader());
-}
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
-    extern const int ILLEGAL_COLUMN;
-}
-
-DataTypePtr FunctionModelEvaluate::getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const
-{
-    if (arguments.size() < 2)
-        throw Exception("Function " + getName() + " expects at least 2 arguments",
-                        ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION);
-
-    if (!isString(arguments[0].type))
-        throw Exception("Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
-                        + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-    const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
-    if (!name_col)
-        throw Exception("First argument of function " + getName() + " must be a constant string",
-                        ErrorCodes::ILLEGAL_COLUMN);
-
-    bool has_nullable = false;
-    for (size_t i = 1; i < arguments.size(); ++i)
-        has_nullable = has_nullable || arguments[i].type->isNullable();
-
-    auto model = models_loader.getModel(name_col->getValue<String>());
-    auto type = model->getReturnType();
-
-    if (has_nullable)
-    {
-        if (const auto * tuple = typeid_cast<const DataTypeTuple *>(type.get()))
-        {
-            auto elements = tuple->getElements();
-            for (auto & element : elements)
-                element = makeNullable(element);
-
-            type = std::make_shared<DataTypeTuple>(elements);
-        }
-        else
-            type = makeNullable(type);
-    }
-
-    return type;
-}
-
-ColumnPtr FunctionModelEvaluate::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const
-{
-    const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
-    if (!name_col)
-        throw Exception("First argument of function " + getName() + " must be a constant string",
-                        ErrorCodes::ILLEGAL_COLUMN);
-
-    auto model = models_loader.getModel(name_col->getValue<String>());
-
-    ColumnRawPtrs column_ptrs;
-    Columns materialized_columns;
-    ColumnPtr null_map;
-
-    column_ptrs.reserve(arguments.size());
-    for (auto arg : collections::range(1, arguments.size()))
-    {
-        const auto & column = arguments[arg].column;
-        column_ptrs.push_back(column.get());
-        if (auto full_column = column->convertToFullColumnIfConst())
-        {
-            materialized_columns.push_back(full_column);
-            column_ptrs.back() = full_column.get();
-        }
-        if (const auto * col_nullable = checkAndGetColumn<ColumnNullable>(*column_ptrs.back()))
-        {
-            if (!null_map)
-                null_map = col_nullable->getNullMapColumnPtr();
-            else
-            {
-                auto mut_null_map = IColumn::mutate(std::move(null_map));
-
-                NullMap & result_null_map = assert_cast<ColumnUInt8 &>(*mut_null_map).getData();
-                const NullMap & src_null_map = col_nullable->getNullMapColumn().getData();
-
-                for (size_t i = 0, size = result_null_map.size(); i < size; ++i)
-                    if (src_null_map[i])
-                        result_null_map[i] = 1;
-
-                null_map = std::move(mut_null_map);
-            }
-
-            column_ptrs.back() = &col_nullable->getNestedColumn();
-        }
-    }
-
-    auto res = model->evaluate(column_ptrs);
-
-    if (null_map)
-    {
-        if (const auto * tuple = typeid_cast<const ColumnTuple *>(res.get()))
-        {
-            auto nested = tuple->getColumns();
-            for (auto & col : nested)
-                col = ColumnNullable::create(col, null_map);
-
-            res = ColumnTuple::create(nested);
-        }
-        else
-            res = ColumnNullable::create(res, null_map);
-    }
-
-    return res;
-}
-
-void registerFunctionsExternalModels(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionModelEvaluate>();
-}
-
-}
diff --git a/src/Functions/FunctionsExternalModels.h b/src/Functions/FunctionsExternalModels.h
deleted file mode 100644
index 8f8b0e0c860..00000000000
--- a/src/Functions/FunctionsExternalModels.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include <Functions/IFunction.h>
-#include <Interpreters/Context_fwd.h>
-
-namespace DB
-{
-
-class ExternalModelsLoader;
-
-/// Evaluate external model.
-/// First argument - model name, the others - model arguments.
-///   * for CatBoost model - float features first, then categorical
-/// Result - Float64.
-class FunctionModelEvaluate final : public IFunction
-{
-public:
-    static constexpr auto name = "modelEvaluate";
-
-    static FunctionPtr create(ContextPtr context);
-
-    explicit FunctionModelEvaluate(const ExternalModelsLoader & models_loader_) : models_loader(models_loader_) {}
-
-    String getName() const override { return name; }
-
-    bool isVariadic() const override { return true; }
-
-    bool isDeterministic() const override { return false; }
-
-    bool useDefaultImplementationForNulls() const override { return false; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
-
-private:
-    const ExternalModelsLoader & models_loader;
-};
-
-}
diff --git a/src/Functions/FunctionsHashing.cpp b/src/Functions/FunctionsHashing.cpp
index 5983e97a093..3f334e9c302 100644
--- a/src/Functions/FunctionsHashing.cpp
+++ b/src/Functions/FunctionsHashing.cpp
@@ -9,11 +9,14 @@ namespace DB
 void registerFunctionsHashing(FunctionFactory & factory)
 {
 #if USE_SSL
+    factory.registerFunction<FunctionMD4>();
     factory.registerFunction<FunctionHalfMD5>();
     factory.registerFunction<FunctionMD5>();
     factory.registerFunction<FunctionSHA1>();
     factory.registerFunction<FunctionSHA224>();
     factory.registerFunction<FunctionSHA256>();
+    factory.registerFunction<FunctionSHA384>();
+    factory.registerFunction<FunctionSHA512>();
 #endif
     factory.registerFunction<FunctionSipHash64>();
     factory.registerFunction<FunctionSipHash128>();
@@ -27,14 +30,12 @@ void registerFunctionsHashing(FunctionFactory & factory)
     factory.registerFunction<FunctionJavaHash>();
     factory.registerFunction<FunctionJavaHashUTF16LE>();
     factory.registerFunction<FunctionHiveHash>();
-#if !defined(ARCADIA_BUILD)
     factory.registerFunction<FunctionMurmurHash2_32>();
     factory.registerFunction<FunctionMurmurHash2_64>();
     factory.registerFunction<FunctionMurmurHash3_32>();
     factory.registerFunction<FunctionMurmurHash3_64>();
     factory.registerFunction<FunctionMurmurHash3_128>();
     factory.registerFunction<FunctionGccMurmurHash>();
-#endif
 
 #if USE_XXHASH
     factory.registerFunction<FunctionXxHash32>();
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index d83ef024394..6b39f2ed5cf 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -6,10 +6,8 @@
 #include <MurmurHash2.h>
 #include <MurmurHash3.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#    include "config_core.h"
-#endif
+#include "config_functions.h"
+#include "config_core.h"
 
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
@@ -20,6 +18,7 @@
 #endif
 
 #if USE_SSL
+#    include <openssl/md4.h>
 #    include <openssl/md5.h>
 #    include <openssl/sha.h>
 #endif
@@ -44,8 +43,8 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/TargetSpecific.h>
 #include <Functions/PerformanceAdaptors.h>
-#include <common/range.h>
-#include <common/bit_cast.h>
+#include <base/range.h>
+#include <base/bit_cast.h>
 
 
 namespace DB
@@ -138,10 +137,24 @@ struct HalfMD5Impl
     static constexpr bool use_int_hash_for_pods = false;
 };
 
+struct MD4Impl
+{
+    static constexpr auto name = "MD4";
+    enum { length = MD4_DIGEST_LENGTH };
+
+    static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
+    {
+        MD4_CTX ctx;
+        MD4_Init(&ctx);
+        MD4_Update(&ctx, reinterpret_cast<const unsigned char *>(begin), size);
+        MD4_Final(out_char_data, &ctx);
+    }
+};
+
 struct MD5Impl
 {
     static constexpr auto name = "MD5";
-    enum { length = 16 };
+    enum { length = MD5_DIGEST_LENGTH };
 
     static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
     {
@@ -155,7 +168,7 @@ struct MD5Impl
 struct SHA1Impl
 {
     static constexpr auto name = "SHA1";
-    enum { length = 20 };
+    enum { length = SHA_DIGEST_LENGTH };
 
     static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
     {
@@ -169,7 +182,7 @@ struct SHA1Impl
 struct SHA224Impl
 {
     static constexpr auto name = "SHA224";
-    enum { length = 28 };
+    enum { length = SHA224_DIGEST_LENGTH };
 
     static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
     {
@@ -183,7 +196,7 @@ struct SHA224Impl
 struct SHA256Impl
 {
     static constexpr auto name = "SHA256";
-    enum { length = 32 };
+    enum { length = SHA256_DIGEST_LENGTH };
 
     static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
     {
@@ -193,6 +206,34 @@ struct SHA256Impl
         SHA256_Final(out_char_data, &ctx);
     }
 };
+
+struct SHA384Impl
+{
+    static constexpr auto name = "SHA384";
+    enum { length = SHA384_DIGEST_LENGTH };
+
+    static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
+    {
+        SHA512_CTX ctx;
+        SHA384_Init(&ctx);
+        SHA384_Update(&ctx, reinterpret_cast<const unsigned char *>(begin), size);
+        SHA384_Final(out_char_data, &ctx);
+    }
+};
+
+struct SHA512Impl
+{
+    static constexpr auto name = "SHA512";
+    enum { length = 64 };
+
+    static void apply(const char * begin, const size_t size, unsigned char * out_char_data)
+    {
+        SHA512_CTX ctx;
+        SHA512_Init(&ctx);
+        SHA512_Update(&ctx, reinterpret_cast<const unsigned char *>(begin), size);
+        SHA512_Final(out_char_data, &ctx);
+    }
+};
 #endif
 
 struct SipHash64Impl
@@ -225,7 +266,6 @@ struct SipHash128Impl
     }
 };
 
-#if !defined(ARCADIA_BUILD)
 /** Why we need MurmurHash2?
   * MurmurHash2 is an outdated hash function, superseded by MurmurHash3 and subsequently by CityHash, xxHash, HighwayHash.
   * Usually there is no reason to use MurmurHash.
@@ -347,7 +387,6 @@ struct MurmurHash3Impl128
         MurmurHash3_x64_128(begin, size, 0, out_char_data);
     }
 };
-#endif
 
 /// http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/478a4add975b/src/share/classes/java/lang/String.java#l1452
 /// Care should be taken to do all calculation in unsigned integers (to avoid undefined behaviour on overflow)
@@ -556,6 +595,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         if (const ColumnString * col_from = checkAndGetColumn<ColumnString>(arguments[0].column.get()))
@@ -619,7 +660,7 @@ private:
     template <typename FromType>
     ColumnPtr executeType(const ColumnsWithTypeAndName & arguments) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(arguments[0].column.get()))
         {
@@ -660,6 +701,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const IDataType * from_type = arguments[0].type.get();
@@ -744,7 +787,7 @@ private:
     template <typename FromType, bool first>
     void executeIntType(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(column))
         {
@@ -801,7 +844,7 @@ private:
     template <typename FromType, bool first>
     void executeBigIntType(const IColumn * column, typename ColumnVector<ToType>::Container & vec_to) const
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<FromType>, ColumnDecimal<FromType>, ColumnVector<FromType>>;
+        using ColVecType = ColumnVectorOrDecimal<FromType>;
 
         if (const ColVecType * col_from = checkAndGetColumn<ColVecType>(column))
         {
@@ -1046,6 +1089,7 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
     {
@@ -1192,6 +1236,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -1301,17 +1346,18 @@ private:
 struct NameIntHash32 { static constexpr auto name = "intHash32"; };
 struct NameIntHash64 { static constexpr auto name = "intHash64"; };
 
-#if USE_SSL
-using FunctionHalfMD5 = FunctionAnyHash<HalfMD5Impl>;
-#endif
 using FunctionSipHash64 = FunctionAnyHash<SipHash64Impl>;
 using FunctionIntHash32 = FunctionIntHash<IntHash32Impl, NameIntHash32>;
 using FunctionIntHash64 = FunctionIntHash<IntHash64Impl, NameIntHash64>;
 #if USE_SSL
+using FunctionMD4 = FunctionStringHashFixedString<MD4Impl>;
+using FunctionHalfMD5 = FunctionAnyHash<HalfMD5Impl>;
 using FunctionMD5 = FunctionStringHashFixedString<MD5Impl>;
 using FunctionSHA1 = FunctionStringHashFixedString<SHA1Impl>;
 using FunctionSHA224 = FunctionStringHashFixedString<SHA224Impl>;
 using FunctionSHA256 = FunctionStringHashFixedString<SHA256Impl>;
+using FunctionSHA384 = FunctionStringHashFixedString<SHA384Impl>;
+using FunctionSHA512 = FunctionStringHashFixedString<SHA512Impl>;
 #endif
 using FunctionSipHash128 = FunctionStringHashFixedString<SipHash128Impl>;
 using FunctionCityHash64 = FunctionAnyHash<ImplCityHash64>;
@@ -1319,14 +1365,12 @@ using FunctionFarmFingerprint64 = FunctionAnyHash<ImplFarmFingerprint64>;
 using FunctionFarmHash64 = FunctionAnyHash<ImplFarmHash64>;
 using FunctionMetroHash64 = FunctionAnyHash<ImplMetroHash64>;
 
-#if !defined(ARCADIA_BUILD)
 using FunctionMurmurHash2_32 = FunctionAnyHash<MurmurHash2Impl32>;
 using FunctionMurmurHash2_64 = FunctionAnyHash<MurmurHash2Impl64>;
 using FunctionGccMurmurHash = FunctionAnyHash<GccMurmurHashImpl>;
 using FunctionMurmurHash3_32 = FunctionAnyHash<MurmurHash3Impl32>;
 using FunctionMurmurHash3_64 = FunctionAnyHash<MurmurHash3Impl64>;
 using FunctionMurmurHash3_128 = FunctionStringHashFixedString<MurmurHash3Impl128>;
-#endif
 
 using FunctionJavaHash = FunctionAnyHash<JavaHashImpl>;
 using FunctionJavaHashUTF16LE = FunctionAnyHash<JavaHashUTF16LEImpl>;
diff --git a/src/Functions/FunctionsJSON.cpp b/src/Functions/FunctionsJSON.cpp
index b220a59f8eb..105643ff82b 100644
--- a/src/Functions/FunctionsJSON.cpp
+++ b/src/Functions/FunctionsJSON.cpp
@@ -1,78 +1,1460 @@
-#include <Functions/FunctionsJSON.h>
+#include <type_traits>
+#include <boost/tti/has_member_function.hpp>
+
+#include <base/range.h>
+
+#include <Common/CpuId.h>
+#include <Common/typeid_cast.h>
+#include <Common/assert_cast.h>
+
+#include <Core/AccurateComparison.h>
+#include <Core/Settings.h>
+
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+
+#include <DataTypes/Serializations/SerializationDecimal.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+
 #include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Functions/DummyJSONParser.h>
+#include <Functions/SimdJSONParser.h>
+#include <Functions/RapidJSONParser.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <Interpreters/Context.h>
+
+
+#include "config_functions.h"
 
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-
-std::vector<FunctionJSONHelpers::Move> FunctionJSONHelpers::prepareMoves(const char * function_name, const ColumnsWithTypeAndName & columns, size_t first_index_argument, size_t num_index_arguments)
+template <typename T>
+concept HasIndexOperator = requires (T t)
 {
-    std::vector<Move> moves;
-    moves.reserve(num_index_arguments);
-    for (const auto i : collections::range(first_index_argument, first_index_argument + num_index_arguments))
-    {
-        const auto & column = columns[i];
-        if (!isString(column.type) && !isInteger(column.type))
-            throw Exception{"The argument " + std::to_string(i + 1) + " of function " + String(function_name)
-                                + " should be a string specifying key or an integer specifying index, illegal type: " + column.type->getName(),
-                            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+    t[0];
+};
 
-        if (column.column && isColumnConst(*column.column))
+/// Functions to parse JSONs and extract values from it.
+/// The first argument of all these functions gets a JSON,
+/// after that there are any number of arguments specifying path to a desired part from the JSON's root.
+/// For example,
+/// select JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1) = -100
+
+class FunctionJSONHelpers
+{
+public:
+    template <typename Name, template<typename> typename Impl, class JSONParser>
+    class Executor
+    {
+    public:
+        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
         {
-            const auto & column_const = assert_cast<const ColumnConst &>(*column.column);
-            if (isString(column.type))
-                moves.emplace_back(MoveType::ConstKey, column_const.getValue<String>());
+            MutableColumnPtr to{result_type->createColumn()};
+            to->reserve(input_rows_count);
+
+            if (arguments.empty())
+                throw Exception{"Function " + String(Name::name) + " requires at least one argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+            const auto & first_column = arguments[0];
+            if (!isString(first_column.type))
+                throw Exception{"The first argument of function " + String(Name::name) + " should be a string containing JSON, illegal type: " + first_column.type->getName(),
+                                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+            const ColumnPtr & arg_json = first_column.column;
+            const auto * col_json_const = typeid_cast<const ColumnConst *>(arg_json.get());
+            const auto * col_json_string
+                = typeid_cast<const ColumnString *>(col_json_const ? col_json_const->getDataColumnPtr().get() : arg_json.get());
+
+            if (!col_json_string)
+                throw Exception{"Illegal column " + arg_json->getName(), ErrorCodes::ILLEGAL_COLUMN};
+
+            const ColumnString::Chars & chars = col_json_string->getChars();
+            const ColumnString::Offsets & offsets = col_json_string->getOffsets();
+
+            size_t num_index_arguments = Impl<JSONParser>::getNumberOfIndexArguments(arguments);
+            std::vector<Move> moves = prepareMoves(Name::name, arguments, 1, num_index_arguments);
+
+            /// Preallocate memory in parser if necessary.
+            JSONParser parser;
+            if constexpr (has_member_function_reserve<void (JSONParser::*)(size_t)>::value)
+            {
+                size_t max_size = calculateMaxSize(offsets);
+                if (max_size)
+                    parser.reserve(max_size);
+            }
+
+            Impl<JSONParser> impl;
+
+            /// prepare() does Impl-specific preparation before handling each row.
+            if constexpr (has_member_function_prepare<void (Impl<JSONParser>::*)(const char *, const ColumnsWithTypeAndName &, const DataTypePtr &)>::value)
+                impl.prepare(Name::name, arguments, result_type);
+
+            using Element = typename JSONParser::Element;
+
+            Element document;
+            bool document_ok = false;
+            if (col_json_const)
+            {
+                std::string_view json{reinterpret_cast<const char *>(&chars[0]), offsets[0] - 1};
+                document_ok = parser.parse(json, document);
+            }
+
+            for (const auto i : collections::range(0, input_rows_count))
+            {
+                if (!col_json_const)
+                {
+                    std::string_view json{reinterpret_cast<const char *>(&chars[offsets[i - 1]]), offsets[i] - offsets[i - 1] - 1};
+                    document_ok = parser.parse(json, document);
+                }
+
+                bool added_to_column = false;
+                if (document_ok)
+                {
+                    /// Perform moves.
+                    Element element;
+                    std::string_view last_key;
+                    bool moves_ok = performMoves<JSONParser>(arguments, i, document, moves, element, last_key);
+
+                    if (moves_ok)
+                        added_to_column = impl.insertResultToColumn(*to, element, last_key);
+                }
+
+                /// We add default value (=null or zero) if something goes wrong, we don't throw exceptions in these JSON functions.
+                if (!added_to_column)
+                    to->insertDefault();
+            }
+            return to;
+        }
+    };
+
+private:
+    BOOST_TTI_HAS_MEMBER_FUNCTION(reserve)
+    BOOST_TTI_HAS_MEMBER_FUNCTION(prepare)
+
+    /// Represents a move of a JSON iterator described by a single argument passed to a JSON function.
+    /// For example, the call JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1)
+    /// contains two moves: {MoveType::ConstKey, "b"} and {MoveType::ConstIndex, 1}.
+    /// Keys and indices can be nonconst, in this case they are calculated for each row.
+    enum class MoveType
+    {
+        Key,
+        Index,
+        ConstKey,
+        ConstIndex,
+    };
+
+    struct Move
+    {
+        explicit Move(MoveType type_, size_t index_ = 0) : type(type_), index(index_) {}
+        Move(MoveType type_, const String & key_) : type(type_), key(key_) {}
+        MoveType type;
+        size_t index = 0;
+        String key;
+    };
+
+    static std::vector<FunctionJSONHelpers::Move> prepareMoves(
+        const char * function_name,
+        const ColumnsWithTypeAndName & columns,
+        size_t first_index_argument,
+        size_t num_index_arguments)
+    {
+        std::vector<Move> moves;
+        moves.reserve(num_index_arguments);
+        for (const auto i : collections::range(first_index_argument, first_index_argument + num_index_arguments))
+        {
+            const auto & column = columns[i];
+            if (!isString(column.type) && !isInteger(column.type))
+                throw Exception{"The argument " + std::to_string(i + 1) + " of function " + String(function_name)
+                                    + " should be a string specifying key or an integer specifying index, illegal type: " + column.type->getName(),
+                                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+            if (column.column && isColumnConst(*column.column))
+            {
+                const auto & column_const = assert_cast<const ColumnConst &>(*column.column);
+                if (isString(column.type))
+                    moves.emplace_back(MoveType::ConstKey, column_const.getValue<String>());
+                else
+                    moves.emplace_back(MoveType::ConstIndex, column_const.getInt(0));
+            }
             else
-                moves.emplace_back(MoveType::ConstIndex, column_const.getInt(0));
+            {
+                if (isString(column.type))
+                    moves.emplace_back(MoveType::Key, "");
+                else
+                    moves.emplace_back(MoveType::Index, 0);
+            }
+        }
+        return moves;
+    }
+
+
+    /// Performs moves of types MoveType::Index and MoveType::ConstIndex.
+    template <typename JSONParser>
+    static bool performMoves(const ColumnsWithTypeAndName & arguments, size_t row,
+                             const typename JSONParser::Element & document, const std::vector<Move> & moves,
+                             typename JSONParser::Element & element, std::string_view & last_key)
+    {
+        typename JSONParser::Element res_element = document;
+        std::string_view key;
+
+        for (size_t j = 0; j != moves.size(); ++j)
+        {
+            switch (moves[j].type)
+            {
+                case MoveType::ConstIndex:
+                {
+                    if (!moveToElementByIndex<JSONParser>(res_element, moves[j].index, key))
+                        return false;
+                    break;
+                }
+                case MoveType::ConstKey:
+                {
+                    key = moves[j].key;
+                    if (!moveToElementByKey<JSONParser>(res_element, key))
+                        return false;
+                    break;
+                }
+                case MoveType::Index:
+                {
+                    Int64 index = (*arguments[j + 1].column)[row].get<Int64>();
+                    if (!moveToElementByIndex<JSONParser>(res_element, index, key))
+                        return false;
+                    break;
+                }
+                case MoveType::Key:
+                {
+                    key = std::string_view{(*arguments[j + 1].column).getDataAt(row)};
+                    if (!moveToElementByKey<JSONParser>(res_element, key))
+                        return false;
+                    break;
+                }
+            }
+        }
+
+        element = res_element;
+        last_key = key;
+        return true;
+    }
+
+    template <typename JSONParser>
+    static bool moveToElementByIndex(typename JSONParser::Element & element, int index, std::string_view & out_key)
+    {
+        if (element.isArray())
+        {
+            auto array = element.getArray();
+            if (index >= 0)
+                --index;
+            else
+                index += array.size();
+
+            if (static_cast<size_t>(index) >= array.size())
+                return false;
+            element = array[index];
+            out_key = {};
+            return true;
+        }
+
+        if constexpr (HasIndexOperator<typename JSONParser::Object>)
+        {
+            if (element.isObject())
+            {
+                auto object = element.getObject();
+                if (index >= 0)
+                    --index;
+                else
+                    index += object.size();
+
+                if (static_cast<size_t>(index) >= object.size())
+                    return false;
+                std::tie(out_key, element) = object[index];
+                return true;
+            }
+        }
+
+        return {};
+    }
+
+    /// Performs moves of types MoveType::Key and MoveType::ConstKey.
+    template <typename JSONParser>
+    static bool moveToElementByKey(typename JSONParser::Element & element, const std::string_view & key)
+    {
+        if (!element.isObject())
+            return false;
+        auto object = element.getObject();
+        return object.find(key, element);
+    }
+
+    static size_t calculateMaxSize(const ColumnString::Offsets & offsets)
+    {
+        size_t max_size = 0;
+        for (const auto i : collections::range(0, offsets.size()))
+        {
+            size_t size = offsets[i] - offsets[i - 1];
+            if (max_size < size)
+                max_size = size;
+        }
+        if (max_size)
+            --max_size;
+        return max_size;
+    }
+
+};
+
+
+template <typename Name, template<typename> typename Impl>
+class ExecutableFunctionJSON : public IExecutableFunction, WithContext
+{
+
+public:
+    explicit ExecutableFunctionJSON(const NullPresence & null_presence_, bool allow_simdjson_, const DataTypePtr & json_return_type_)
+        : null_presence(null_presence_), allow_simdjson(allow_simdjson_), json_return_type(json_return_type_)
+    {
+    }
+
+    String getName() const override { return Name::name; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        if (null_presence.has_null_constant)
+            return result_type->createColumnConstWithDefaultValue(input_rows_count);
+
+        ColumnsWithTypeAndName temporary_columns = null_presence.has_nullable ? createBlockWithNestedColumns(arguments) : arguments;
+        ColumnPtr temporary_result = chooseAndRunJSONParser(temporary_columns, json_return_type, input_rows_count);
+        if (null_presence.has_nullable)
+            return wrapInNullable(temporary_result, arguments, result_type, input_rows_count);
+        return temporary_result;
+    }
+
+private:
+
+    ColumnPtr
+    chooseAndRunJSONParser(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    {
+#if USE_SIMDJSON
+        if (allow_simdjson)
+            return FunctionJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count);
+#endif
+
+#if USE_RAPIDJSON
+        return FunctionJSONHelpers::Executor<Name, Impl, RapidJSONParser>::run(arguments, result_type, input_rows_count);
+#else
+        return FunctionJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count);
+#endif
+    }
+
+    NullPresence null_presence;
+    bool allow_simdjson;
+    DataTypePtr json_return_type;
+};
+
+
+template <typename Name, template<typename> typename Impl>
+class FunctionBaseFunctionJSON : public IFunctionBase
+{
+public:
+    explicit FunctionBaseFunctionJSON(
+        const NullPresence & null_presence_,
+        bool allow_simdjson_,
+        DataTypes argument_types_,
+        DataTypePtr return_type_,
+        DataTypePtr json_return_type_)
+        : null_presence(null_presence_)
+        , allow_simdjson(allow_simdjson_)
+        , argument_types(std::move(argument_types_))
+        , return_type(std::move(return_type_))
+        , json_return_type(std::move(json_return_type_))
+    {
+    }
+
+    String getName() const override { return Name::name; }
+
+    const DataTypes & getArgumentTypes() const override
+    {
+        return argument_types;
+    }
+
+    const DataTypePtr & getResultType() const override
+    {
+        return return_type;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_unique<ExecutableFunctionJSON<Name, Impl>>(null_presence, allow_simdjson, json_return_type);
+    }
+
+private:
+    NullPresence null_presence;
+    bool allow_simdjson;
+    DataTypes argument_types;
+    DataTypePtr return_type;
+    DataTypePtr json_return_type;
+};
+
+
+/// We use IFunctionOverloadResolver instead of IFunction to handle non-default NULL processing.
+/// Both NULL and JSON NULL should generate NULL value. If any argument is NULL, return NULL.
+template <typename Name, template<typename> typename Impl>
+class JSONOverloadResolver : public IFunctionOverloadResolver, WithContext
+{
+public:
+    static constexpr auto name = Name::name;
+
+    String getName() const override { return name; }
+
+    static FunctionOverloadResolverPtr create(ContextPtr context_)
+    {
+        return std::make_unique<JSONOverloadResolver>(context_);
+    }
+
+    explicit JSONOverloadResolver(ContextPtr context_) : WithContext(context_) {}
+
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const override
+    {
+        DataTypePtr json_return_type = Impl<DummyJSONParser>::getReturnType(Name::name, createBlockWithNestedColumns(arguments));
+        NullPresence null_presence = getNullPresense(arguments);
+        DataTypePtr return_type;
+        if (null_presence.has_null_constant)
+            return_type = makeNullable(std::make_shared<DataTypeNothing>());
+        else if (null_presence.has_nullable)
+            return_type = makeNullable(json_return_type);
+        else
+            return_type = json_return_type;
+
+        /// Top-level LowCardinality columns are processed outside JSON parser.
+        json_return_type = removeLowCardinality(json_return_type);
+
+        DataTypes argument_types;
+        argument_types.reserve(arguments.size());
+        for (const auto & argument : arguments)
+            argument_types.emplace_back(argument.type);
+        return std::make_unique<FunctionBaseFunctionJSON<Name, Impl>>(
+                null_presence, getContext()->getSettingsRef().allow_simdjson, argument_types, return_type, json_return_type);
+    }
+};
+
+
+struct NameJSONHas { static constexpr auto name{"JSONHas"}; };
+struct NameIsValidJSON { static constexpr auto name{"isValidJSON"}; };
+struct NameJSONLength { static constexpr auto name{"JSONLength"}; };
+struct NameJSONKey { static constexpr auto name{"JSONKey"}; };
+struct NameJSONType { static constexpr auto name{"JSONType"}; };
+struct NameJSONExtractInt { static constexpr auto name{"JSONExtractInt"}; };
+struct NameJSONExtractUInt { static constexpr auto name{"JSONExtractUInt"}; };
+struct NameJSONExtractFloat { static constexpr auto name{"JSONExtractFloat"}; };
+struct NameJSONExtractBool { static constexpr auto name{"JSONExtractBool"}; };
+struct NameJSONExtractString { static constexpr auto name{"JSONExtractString"}; };
+struct NameJSONExtract { static constexpr auto name{"JSONExtract"}; };
+struct NameJSONExtractKeysAndValues { static constexpr auto name{"JSONExtractKeysAndValues"}; };
+struct NameJSONExtractRaw { static constexpr auto name{"JSONExtractRaw"}; };
+struct NameJSONExtractArrayRaw { static constexpr auto name{"JSONExtractArrayRaw"}; };
+struct NameJSONExtractKeysAndValuesRaw { static constexpr auto name{"JSONExtractKeysAndValuesRaw"}; };
+struct NameJSONExtractKeys { static constexpr auto name{"JSONExtractKeys"}; };
+
+
+template <typename JSONParser>
+class JSONHasImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeUInt8>(); }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element &, const std::string_view &)
+    {
+        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
+        col_vec.insertValue(1);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class IsValidJSONImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
+    {
+        if (arguments.size() != 1)
+        {
+            /// IsValidJSON() shouldn't get parameters other than JSON.
+            throw Exception{"Function " + String(function_name) + " needs exactly one argument",
+                            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+        }
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName &) { return 0; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element &, const std::string_view &)
+    {
+        /// This function is called only if JSON is valid.
+        /// If JSON isn't valid then `FunctionJSON::Executor::run()` adds default value (=zero) to `dest` without calling this function.
+        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
+        col_vec.insertValue(1);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONLengthImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeUInt64>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        size_t size;
+        if (element.isArray())
+            size = element.getArray().size();
+        else if (element.isObject())
+            size = element.getObject().size();
+        else
+            return false;
+
+        ColumnVector<UInt64> & col_vec = assert_cast<ColumnVector<UInt64> &>(dest);
+        col_vec.insertValue(size);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONKeyImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element &, const std::string_view & last_key)
+    {
+        if (last_key.empty())
+            return false;
+        ColumnString & col_str = assert_cast<ColumnString &>(dest);
+        col_str.insertData(last_key.data(), last_key.size());
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONTypeImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        static const std::vector<std::pair<String, Int8>> values = {
+            {"Array", '['},
+            {"Object", '{'},
+            {"String", '"'},
+            {"Int64", 'i'},
+            {"UInt64", 'u'},
+            {"Double", 'd'},
+            {"Bool", 'b'},
+            {"Null", 0}, /// the default value for the column.
+        };
+        return std::make_shared<DataTypeEnum<Int8>>(values);
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        UInt8 type;
+        if (element.isInt64())
+            type = 'i';
+        else if (element.isUInt64())
+            type = 'u';
+        else if (element.isDouble())
+            type = 'd';
+        else if (element.isBool())
+            type = 'b';
+        else if (element.isString())
+            type = '"';
+        else if (element.isArray())
+            type = '[';
+        else if (element.isObject())
+            type = '{';
+        else if (element.isNull())
+            type = 0;
+        else
+            return false;
+
+        ColumnVector<Int8> & col_vec = assert_cast<ColumnVector<Int8> &>(dest);
+        col_vec.insertValue(type);
+        return true;
+    }
+};
+
+
+template <typename JSONParser, typename NumberType, bool convert_bool_to_integer = false>
+class JSONExtractNumericImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeNumber<NumberType>>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        NumberType value;
+
+        if (element.isInt64())
+        {
+            if (!accurate::convertNumeric(element.getInt64(), value))
+                return false;
+        }
+        else if (element.isUInt64())
+        {
+            if (!accurate::convertNumeric(element.getUInt64(), value))
+                return false;
+        }
+        else if (element.isDouble())
+        {
+            if constexpr (std::is_floating_point_v<NumberType>)
+            {
+                /// We permit inaccurate conversion of double to float.
+                /// Example: double 0.1 from JSON is not representable in float.
+                /// But it will be more convenient for user to perform conversion.
+                value = element.getDouble();
+            }
+            else if (!accurate::convertNumeric(element.getDouble(), value))
+                return false;
+        }
+        else if (element.isBool() && is_integer<NumberType> && convert_bool_to_integer)
+        {
+            value = static_cast<NumberType>(element.getBool());
         }
         else
+            return false;
+
+        auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
+        col_vec.insertValue(value);
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+using JSONExtractInt8Impl = JSONExtractNumericImpl<JSONParser, Int8>;
+template <typename JSONParser>
+using JSONExtractUInt8Impl = JSONExtractNumericImpl<JSONParser, UInt8>;
+template <typename JSONParser>
+using JSONExtractInt16Impl = JSONExtractNumericImpl<JSONParser, Int16>;
+template <typename JSONParser>
+using JSONExtractUInt16Impl = JSONExtractNumericImpl<JSONParser, UInt16>;
+template <typename JSONParser>
+using JSONExtractInt32Impl = JSONExtractNumericImpl<JSONParser, Int32>;
+template <typename JSONParser>
+using JSONExtractUInt32Impl = JSONExtractNumericImpl<JSONParser, UInt32>;
+template <typename JSONParser>
+using JSONExtractInt64Impl = JSONExtractNumericImpl<JSONParser, Int64>;
+template <typename JSONParser>
+using JSONExtractUInt64Impl = JSONExtractNumericImpl<JSONParser, UInt64>;
+template <typename JSONParser>
+using JSONExtractFloat32Impl = JSONExtractNumericImpl<JSONParser, Float32>;
+template <typename JSONParser>
+using JSONExtractFloat64Impl = JSONExtractNumericImpl<JSONParser, Float64>;
+
+
+template <typename JSONParser>
+class JSONExtractBoolImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        if (!element.isBool())
+            return false;
+
+        auto & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
+        col_vec.insertValue(static_cast<UInt8>(element.getBool()));
+        return true;
+    }
+};
+
+template <typename JSONParser>
+class JSONExtractRawImpl;
+
+template <typename JSONParser>
+class JSONExtractStringImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        if (element.isNull())
+            return false;
+
+        if (!element.isString())
+            return JSONExtractRawImpl<JSONParser>::insertResultToColumn(dest, element, {});
+
+        auto str = element.getString();
+        ColumnString & col_str = assert_cast<ColumnString &>(dest);
+        col_str.insertData(str.data(), str.size());
+        return true;
+    }
+};
+
+/// Nodes of the extract tree. We need the extract tree to extract from JSON complex values containing array, tuples or nullables.
+template <typename JSONParser>
+struct JSONExtractTree
+{
+    using Element = typename JSONParser::Element;
+
+    class Node
+    {
+    public:
+        Node() = default;
+        virtual ~Node() = default;
+        virtual bool insertResultToColumn(IColumn &, const Element &) = 0;
+    };
+
+    template <typename NumberType>
+    class NumericNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
         {
-            if (isString(column.type))
-                moves.emplace_back(MoveType::Key, "");
-            else
-                moves.emplace_back(MoveType::Index, 0);
+            return JSONExtractNumericImpl<JSONParser, NumberType, true>::insertResultToColumn(dest, element, {});
+        }
+    };
+
+    class LowCardinalityNode : public Node
+    {
+    public:
+        LowCardinalityNode(DataTypePtr dictionary_type_, std::unique_ptr<Node> impl_)
+            : dictionary_type(dictionary_type_), impl(std::move(impl_)) {}
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            auto from_col = dictionary_type->createColumn();
+            if (impl->insertResultToColumn(*from_col, element))
+            {
+                StringRef value = from_col->getDataAt(0);
+                assert_cast<ColumnLowCardinality &>(dest).insertData(value.data, value.size);
+                return true;
+            }
+            return false;
+        }
+    private:
+        DataTypePtr dictionary_type;
+        std::unique_ptr<Node> impl;
+    };
+
+    class UUIDNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isString())
+                return false;
+
+            auto uuid = parseFromString<UUID>(element.getString());
+            assert_cast<ColumnUUID &>(dest).insert(uuid);
+            return true;
+        }
+    };
+
+    template <typename DecimalType>
+    class DecimalNode : public Node
+    {
+    public:
+        explicit DecimalNode(DataTypePtr data_type_) : data_type(data_type_) {}
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isDouble())
+                return false;
+
+            const auto * type = assert_cast<const DataTypeDecimal<DecimalType> *>(data_type.get());
+            auto result = convertToDecimal<DataTypeNumber<Float64>, DataTypeDecimal<DecimalType>>(element.getDouble(), type->getScale());
+            assert_cast<ColumnDecimal<DecimalType> &>(dest).insert(result);
+            return true;
+        }
+    private:
+        DataTypePtr data_type;
+    };
+
+    class StringNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            return JSONExtractStringImpl<JSONParser>::insertResultToColumn(dest, element, {});
+        }
+    };
+
+    class FixedStringNode : public Node
+    {
+    public:
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isString())
+                return false;
+            auto & col_str = assert_cast<ColumnFixedString &>(dest);
+            auto str = element.getString();
+            if (str.size() > col_str.getN())
+                return false;
+            col_str.insertData(str.data(), str.size());
+            return true;
+        }
+    };
+
+    template <typename Type>
+    class EnumNode : public Node
+    {
+    public:
+        explicit EnumNode(const std::vector<std::pair<String, Type>> & name_value_pairs_) : name_value_pairs(name_value_pairs_)
+        {
+            for (const auto & name_value_pair : name_value_pairs)
+            {
+                name_to_value_map.emplace(name_value_pair.first, name_value_pair.second);
+                only_values.emplace(name_value_pair.second);
+            }
+        }
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            auto & col_vec = assert_cast<ColumnVector<Type> &>(dest);
+
+            if (element.isInt64())
+            {
+                Type value;
+                if (!accurate::convertNumeric(element.getInt64(), value) || !only_values.count(value))
+                    return false;
+                col_vec.insertValue(value);
+                return true;
+            }
+
+            if (element.isUInt64())
+            {
+                Type value;
+                if (!accurate::convertNumeric(element.getUInt64(), value) || !only_values.count(value))
+                    return false;
+                col_vec.insertValue(value);
+                return true;
+            }
+
+            if (element.isString())
+            {
+                auto value = name_to_value_map.find(element.getString());
+                if (value == name_to_value_map.end())
+                    return false;
+                col_vec.insertValue(value->second);
+                return true;
+            }
+
+            return false;
+        }
+
+    private:
+        std::vector<std::pair<String, Type>> name_value_pairs;
+        std::unordered_map<std::string_view, Type> name_to_value_map;
+        std::unordered_set<Type> only_values;
+    };
+
+    class NullableNode : public Node
+    {
+    public:
+        explicit NullableNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            ColumnNullable & col_null = assert_cast<ColumnNullable &>(dest);
+            if (!nested->insertResultToColumn(col_null.getNestedColumn(), element))
+                return false;
+            col_null.getNullMapColumn().insertValue(0);
+            return true;
+        }
+
+    private:
+        std::unique_ptr<Node> nested;
+    };
+
+    class ArrayNode : public Node
+    {
+    public:
+        explicit ArrayNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            if (!element.isArray())
+                return false;
+
+            auto array = element.getArray();
+
+            ColumnArray & col_arr = assert_cast<ColumnArray &>(dest);
+            auto & data = col_arr.getData();
+            size_t old_size = data.size();
+            bool were_valid_elements = false;
+
+            for (auto value : array)
+            {
+                if (nested->insertResultToColumn(data, value))
+                    were_valid_elements = true;
+                else
+                    data.insertDefault();
+            }
+
+            if (!were_valid_elements)
+            {
+                data.popBack(data.size() - old_size);
+                return false;
+            }
+
+            col_arr.getOffsets().push_back(data.size());
+            return true;
+        }
+
+    private:
+        std::unique_ptr<Node> nested;
+    };
+
+    class TupleNode : public Node
+    {
+    public:
+        TupleNode(std::vector<std::unique_ptr<Node>> nested_, const std::vector<String> & explicit_names_) : nested(std::move(nested_)), explicit_names(explicit_names_)
+        {
+            for (size_t i = 0; i != explicit_names.size(); ++i)
+                name_to_index_map.emplace(explicit_names[i], i);
+        }
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            ColumnTuple & tuple = assert_cast<ColumnTuple &>(dest);
+            size_t old_size = dest.size();
+            bool were_valid_elements = false;
+
+            auto set_size = [&](size_t size)
+            {
+                for (size_t i = 0; i != tuple.tupleSize(); ++i)
+                {
+                    auto & col = tuple.getColumn(i);
+                    if (col.size() != size)
+                    {
+                        if (col.size() > size)
+                            col.popBack(col.size() - size);
+                        else
+                            while (col.size() < size)
+                                col.insertDefault();
+                    }
+                }
+            };
+
+            if (element.isArray())
+            {
+                auto array = element.getArray();
+                auto it = array.begin();
+
+                for (size_t index = 0; (index != nested.size()) && (it != array.end()); ++index)
+                {
+                    if (nested[index]->insertResultToColumn(tuple.getColumn(index), *it++))
+                        were_valid_elements = true;
+                    else
+                        tuple.getColumn(index).insertDefault();
+                }
+
+                set_size(old_size + static_cast<size_t>(were_valid_elements));
+                return were_valid_elements;
+            }
+
+            if (element.isObject())
+            {
+                auto object = element.getObject();
+                if (name_to_index_map.empty())
+                {
+                    auto it = object.begin();
+                    for (size_t index = 0; (index != nested.size()) && (it != object.end()); ++index)
+                    {
+                        if (nested[index]->insertResultToColumn(tuple.getColumn(index), (*it++).second))
+                            were_valid_elements = true;
+                        else
+                            tuple.getColumn(index).insertDefault();
+                    }
+                }
+                else
+                {
+                    for (const auto & [key, value] : object)
+                    {
+                        auto index = name_to_index_map.find(key);
+                        if (index != name_to_index_map.end())
+                        {
+                            if (nested[index->second]->insertResultToColumn(tuple.getColumn(index->second), value))
+                                were_valid_elements = true;
+                        }
+                    }
+                }
+
+                set_size(old_size + static_cast<size_t>(were_valid_elements));
+                return were_valid_elements;
+            }
+
+            return false;
+        }
+
+    private:
+        std::vector<std::unique_ptr<Node>> nested;
+        std::vector<String> explicit_names;
+        std::unordered_map<std::string_view, size_t> name_to_index_map;
+    };
+
+    static std::unique_ptr<Node> build(const char * function_name, const DataTypePtr & type)
+    {
+        switch (type->getTypeId())
+        {
+            case TypeIndex::UInt8: return std::make_unique<NumericNode<UInt8>>();
+            case TypeIndex::UInt16: return std::make_unique<NumericNode<UInt16>>();
+            case TypeIndex::UInt32: return std::make_unique<NumericNode<UInt32>>();
+            case TypeIndex::UInt64: return std::make_unique<NumericNode<UInt64>>();
+            case TypeIndex::Int8: return std::make_unique<NumericNode<Int8>>();
+            case TypeIndex::Int16: return std::make_unique<NumericNode<Int16>>();
+            case TypeIndex::Int32: return std::make_unique<NumericNode<Int32>>();
+            case TypeIndex::Int64: return std::make_unique<NumericNode<Int64>>();
+            case TypeIndex::Float32: return std::make_unique<NumericNode<Float32>>();
+            case TypeIndex::Float64: return std::make_unique<NumericNode<Float64>>();
+            case TypeIndex::String: return std::make_unique<StringNode>();
+            case TypeIndex::FixedString: return std::make_unique<FixedStringNode>();
+            case TypeIndex::UUID: return std::make_unique<UUIDNode>();
+            case TypeIndex::LowCardinality:
+            {
+                auto dictionary_type = typeid_cast<const DataTypeLowCardinality *>(type.get())->getDictionaryType();
+                auto impl = build(function_name, dictionary_type);
+                return std::make_unique<LowCardinalityNode>(dictionary_type, std::move(impl));
+            }
+            case TypeIndex::Decimal256: return std::make_unique<DecimalNode<Decimal256>>(type);
+            case TypeIndex::Decimal128: return std::make_unique<DecimalNode<Decimal128>>(type);
+            case TypeIndex::Decimal64: return std::make_unique<DecimalNode<Decimal64>>(type);
+            case TypeIndex::Decimal32: return std::make_unique<DecimalNode<Decimal32>>(type);
+            case TypeIndex::Enum8:
+                return std::make_unique<EnumNode<Int8>>(static_cast<const DataTypeEnum8 &>(*type).getValues());
+            case TypeIndex::Enum16:
+                return std::make_unique<EnumNode<Int16>>(static_cast<const DataTypeEnum16 &>(*type).getValues());
+            case TypeIndex::Nullable:
+            {
+                return std::make_unique<NullableNode>(build(function_name, static_cast<const DataTypeNullable &>(*type).getNestedType()));
+            }
+            case TypeIndex::Array:
+            {
+                return std::make_unique<ArrayNode>(build(function_name, static_cast<const DataTypeArray &>(*type).getNestedType()));
+            }
+            case TypeIndex::Tuple:
+            {
+                const auto & tuple = static_cast<const DataTypeTuple &>(*type);
+                const auto & tuple_elements = tuple.getElements();
+                std::vector<std::unique_ptr<Node>> elements;
+                elements.reserve(tuple_elements.size());
+                for (const auto & tuple_element : tuple_elements)
+                    elements.emplace_back(build(function_name, tuple_element));
+                return std::make_unique<TupleNode>(std::move(elements), tuple.haveExplicitNames() ? tuple.getElementNames() : Strings{});
+            }
+            default:
+                throw Exception{"Function " + String(function_name) + " doesn't support the return type schema: " + type->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
         }
     }
-    return moves;
-}
+};
 
-size_t FunctionJSONHelpers::calculateMaxSize(const ColumnString::Offsets & offsets)
+
+template <typename JSONParser>
+class JSONExtractImpl
 {
-    size_t max_size = 0;
-    for (const auto i : collections::range(0, offsets.size()))
-    {
-        size_t size = offsets[i] - offsets[i - 1];
-        if (max_size < size)
-            max_size = size;
-    }
-    if (max_size)
-        --max_size;
-    return max_size;
-}
+public:
+    using Element = typename JSONParser::Element;
 
+    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
+    {
+        if (arguments.size() < 2)
+            throw Exception{"Function " + String(function_name) + " requires at least two arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+        const auto & col = arguments.back();
+        const auto * col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
+        if (!col_type_const || !isString(col.type))
+            throw Exception{"The last argument of function " + String(function_name)
+                                + " should be a constant string specifying the return data type, illegal value: " + col.name,
+                            ErrorCodes::ILLEGAL_COLUMN};
+
+        return DataTypeFactory::instance().get(col_type_const->getValue<String>());
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
+
+    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
+    {
+        extract_tree = JSONExtractTree<JSONParser>::build(function_name, result_type);
+    }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        return extract_tree->insertResultToColumn(dest, element);
+    }
+
+protected:
+    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
+};
+
+
+template <typename JSONParser>
+class JSONExtractKeysAndValuesImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
+    {
+        if (arguments.size() < 2)
+            throw Exception{"Function " + String(function_name) + " requires at least two arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+
+        const auto & col = arguments.back();
+        const auto * col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
+        if (!col_type_const || !isString(col.type))
+            throw Exception{"The last argument of function " + String(function_name)
+                                + " should be a constant string specifying the values' data type, illegal value: " + col.name,
+                            ErrorCodes::ILLEGAL_COLUMN};
+
+        DataTypePtr key_type = std::make_unique<DataTypeString>();
+        DataTypePtr value_type = DataTypeFactory::instance().get(col_type_const->getValue<String>());
+        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{key_type, value_type});
+        return std::make_unique<DataTypeArray>(tuple_type);
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
+
+    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
+    {
+        const auto tuple_type = typeid_cast<const DataTypeArray *>(result_type.get())->getNestedType();
+        const auto value_type = typeid_cast<const DataTypeTuple *>(tuple_type.get())->getElements()[1];
+        extract_tree = JSONExtractTree<JSONParser>::build(function_name, value_type);
+    }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        if (!element.isObject())
+            return false;
+
+        auto object = element.getObject();
+
+        auto & col_arr = assert_cast<ColumnArray &>(dest);
+        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
+        size_t old_size = col_tuple.size();
+        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
+        auto & col_value = col_tuple.getColumn(1);
+
+        for (const auto & [key, value] : object)
+        {
+            if (extract_tree->insertResultToColumn(col_value, value))
+                col_key.insertData(key.data(), key.size());
+        }
+
+        if (col_tuple.size() == old_size)
+            return false;
+
+        col_arr.getOffsets().push_back(col_tuple.size());
+        return true;
+    }
+
+private:
+    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
+};
+
+
+template <typename JSONParser>
+class JSONExtractRawImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        ColumnString & col_str = assert_cast<ColumnString &>(dest);
+        auto & chars = col_str.getChars();
+        WriteBufferFromVector<ColumnString::Chars> buf(chars, WriteBufferFromVector<ColumnString::Chars>::AppendModeTag());
+        traverse(element, buf);
+        buf.finalize();
+        chars.push_back(0);
+        col_str.getOffsets().push_back(chars.size());
+        return true;
+    }
+
+private:
+    static void traverse(const Element & element, WriteBuffer & buf)
+    {
+        if (element.isInt64())
+        {
+            writeIntText(element.getInt64(), buf);
+            return;
+        }
+        if (element.isUInt64())
+        {
+            writeIntText(element.getUInt64(), buf);
+            return;
+        }
+        if (element.isDouble())
+        {
+            writeFloatText(element.getDouble(), buf);
+            return;
+        }
+        if (element.isBool())
+        {
+            if (element.getBool())
+                writeCString("true", buf);
+            else
+                writeCString("false", buf);
+            return;
+        }
+        if (element.isString())
+        {
+            writeJSONString(element.getString(), buf, formatSettings());
+            return;
+        }
+        if (element.isArray())
+        {
+            writeChar('[', buf);
+            bool need_comma = false;
+            for (auto value : element.getArray())
+            {
+                if (std::exchange(need_comma, true))
+                    writeChar(',', buf);
+                traverse(value, buf);
+            }
+            writeChar(']', buf);
+            return;
+        }
+        if (element.isObject())
+        {
+            writeChar('{', buf);
+            bool need_comma = false;
+            for (auto [key, value] : element.getObject())
+            {
+                if (std::exchange(need_comma, true))
+                    writeChar(',', buf);
+                writeJSONString(key, buf, formatSettings());
+                writeChar(':', buf);
+                traverse(value, buf);
+            }
+            writeChar('}', buf);
+            return;
+        }
+        if (element.isNull())
+        {
+            writeCString("null", buf);
+            return;
+        }
+    }
+
+    static const FormatSettings & formatSettings()
+    {
+        static const FormatSettings the_instance = []
+        {
+            FormatSettings settings;
+            settings.json.escape_forward_slashes = false;
+            return settings;
+        }();
+        return the_instance;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONExtractArrayRawImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        if (!element.isArray())
+            return false;
+
+        auto array = element.getArray();
+        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
+
+        for (auto value : array)
+            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_res.getData(), value, {});
+
+        col_res.getOffsets().push_back(col_res.getOffsets().back() + array.size());
+        return true;
+    }
+};
+
+
+template <typename JSONParser>
+class JSONExtractKeysAndValuesRawImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        DataTypePtr string_type = std::make_unique<DataTypeString>();
+        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{string_type, string_type});
+        return std::make_unique<DataTypeArray>(tuple_type);
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        if (!element.isObject())
+            return false;
+
+        auto object = element.getObject();
+
+        auto & col_arr = assert_cast<ColumnArray &>(dest);
+        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
+        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
+        auto & col_value = assert_cast<ColumnString &>(col_tuple.getColumn(1));
+
+        for (const auto & [key, value] : object)
+        {
+            col_key.insertData(key.data(), key.size());
+            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_value, value, {});
+        }
+
+        col_arr.getOffsets().push_back(col_arr.getOffsets().back() + object.size());
+        return true;
+    }
+};
+
+template <typename JSONParser>
+class JSONExtractKeysImpl
+{
+public:
+    using Element = typename JSONParser::Element;
+
+    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
+    {
+        return std::make_unique<DataTypeArray>(std::make_shared<DataTypeString>());
+    }
+
+    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
+
+    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
+    {
+        if (!element.isObject())
+            return false;
+
+        auto object = element.getObject();
+
+        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
+        auto & col_key = assert_cast<ColumnString &>(col_res.getData());
+
+        for (const auto & [key, value] : object)
+        {
+            col_key.insertData(key.data(), key.size());
+        }
+
+        col_res.getOffsets().push_back(col_res.getOffsets().back() + object.size());
+        return true;
+    }
+};
 
 void registerFunctionsJSON(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionJSON<NameJSONHas, JSONHasImpl>>();
-    factory.registerFunction<FunctionJSON<NameIsValidJSON, IsValidJSONImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONLength, JSONLengthImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONKey, JSONKeyImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONType, JSONTypeImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractInt, JSONExtractInt64Impl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractUInt, JSONExtractUInt64Impl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractFloat, JSONExtractFloat64Impl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractBool, JSONExtractBoolImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractString, JSONExtractStringImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtract, JSONExtractImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractKeysAndValues, JSONExtractKeysAndValuesImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractRaw, JSONExtractRawImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractArrayRaw, JSONExtractArrayRawImpl>>();
-    factory.registerFunction<FunctionJSON<NameJSONExtractKeysAndValuesRaw, JSONExtractKeysAndValuesRawImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONHas, JSONHasImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameIsValidJSON, IsValidJSONImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONLength, JSONLengthImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONKey, JSONKeyImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONType, JSONTypeImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractInt, JSONExtractInt64Impl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractUInt, JSONExtractUInt64Impl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractFloat, JSONExtractFloat64Impl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractBool, JSONExtractBoolImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractString, JSONExtractStringImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtract, JSONExtractImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractKeysAndValues, JSONExtractKeysAndValuesImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractRaw, JSONExtractRawImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractArrayRaw, JSONExtractArrayRawImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractKeysAndValuesRaw, JSONExtractKeysAndValuesRawImpl>>();
+    factory.registerFunction<JSONOverloadResolver<NameJSONExtractKeys, JSONExtractKeysImpl>>();
 }
 
 }
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
deleted file mode 100644
index d0762ff9a8d..00000000000
--- a/src/Functions/FunctionsJSON.h
+++ /dev/null
@@ -1,1246 +0,0 @@
-#pragma once
-
-#include <Functions/IFunction.h>
-#include <Core/AccurateComparison.h>
-#include <Functions/DummyJSONParser.h>
-#include <Functions/SimdJSONParser.h>
-#include <Functions/RapidJSONParser.h>
-#include <Common/CpuId.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Core/Settings.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnLowCardinality.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnTuple.h>
-#include <DataTypes/Serializations/SerializationDecimal.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <DataTypes/DataTypeEnum.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <Interpreters/Context.h>
-#include <common/range.h>
-#include <type_traits>
-#include <boost/tti/has_member_function.hpp>
-
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-
-/// Functions to parse JSONs and extract values from it.
-/// The first argument of all these functions gets a JSON,
-/// after that there are any number of arguments specifying path to a desired part from the JSON's root.
-/// For example,
-/// select JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1) = -100
-
-class FunctionJSONHelpers
-{
-public:
-    template <typename Name, template<typename> typename Impl, class JSONParser>
-    class Executor
-    {
-    public:
-        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count)
-        {
-            MutableColumnPtr to{result_type->createColumn()};
-            to->reserve(input_rows_count);
-
-            if (arguments.empty())
-                throw Exception{"Function " + String(Name::name) + " requires at least one argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-            const auto & first_column = arguments[0];
-            if (!isString(first_column.type))
-                throw Exception{"The first argument of function " + String(Name::name) + " should be a string containing JSON, illegal type: " + first_column.type->getName(),
-                                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-            const ColumnPtr & arg_json = first_column.column;
-            const auto * col_json_const = typeid_cast<const ColumnConst *>(arg_json.get());
-            const auto * col_json_string
-                = typeid_cast<const ColumnString *>(col_json_const ? col_json_const->getDataColumnPtr().get() : arg_json.get());
-
-            if (!col_json_string)
-                throw Exception{"Illegal column " + arg_json->getName(), ErrorCodes::ILLEGAL_COLUMN};
-
-            const ColumnString::Chars & chars = col_json_string->getChars();
-            const ColumnString::Offsets & offsets = col_json_string->getOffsets();
-
-            size_t num_index_arguments = Impl<JSONParser>::getNumberOfIndexArguments(arguments);
-            std::vector<Move> moves = prepareMoves(Name::name, arguments, 1, num_index_arguments);
-
-            /// Preallocate memory in parser if necessary.
-            JSONParser parser;
-            if constexpr (has_member_function_reserve<void (JSONParser::*)(size_t)>::value)
-            {
-                size_t max_size = calculateMaxSize(offsets);
-                if (max_size)
-                    parser.reserve(max_size);
-            }
-
-            Impl<JSONParser> impl;
-
-            /// prepare() does Impl-specific preparation before handling each row.
-            if constexpr (has_member_function_prepare<void (Impl<JSONParser>::*)(const char *, const ColumnsWithTypeAndName &, const DataTypePtr &)>::value)
-                impl.prepare(Name::name, arguments, result_type);
-
-            using Element = typename JSONParser::Element;
-
-            Element document;
-            bool document_ok = false;
-            if (col_json_const)
-            {
-                std::string_view json{reinterpret_cast<const char *>(&chars[0]), offsets[0] - 1};
-                document_ok = parser.parse(json, document);
-            }
-
-            for (const auto i : collections::range(0, input_rows_count))
-            {
-                if (!col_json_const)
-                {
-                    std::string_view json{reinterpret_cast<const char *>(&chars[offsets[i - 1]]), offsets[i] - offsets[i - 1] - 1};
-                    document_ok = parser.parse(json, document);
-                }
-
-                bool added_to_column = false;
-                if (document_ok)
-                {
-                    /// Perform moves.
-                    Element element;
-                    std::string_view last_key;
-                    bool moves_ok = performMoves<JSONParser>(arguments, i, document, moves, element, last_key);
-
-                    if (moves_ok)
-                        added_to_column = impl.insertResultToColumn(*to, element, last_key);
-                }
-
-                /// We add default value (=null or zero) if something goes wrong, we don't throw exceptions in these JSON functions.
-                if (!added_to_column)
-                    to->insertDefault();
-            }
-            return to;
-        }
-    };
-
-private:
-    BOOST_TTI_HAS_MEMBER_FUNCTION(reserve)
-    BOOST_TTI_HAS_MEMBER_FUNCTION(prepare)
-
-    template <class T, class = void>
-    struct has_index_operator : std::false_type {};
-
-    template <class T>
-    struct has_index_operator<T, std::void_t<decltype(std::declval<T>()[0])>> : std::true_type {};
-
-    /// Represents a move of a JSON iterator described by a single argument passed to a JSON function.
-    /// For example, the call JSONExtractInt('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1)
-    /// contains two moves: {MoveType::ConstKey, "b"} and {MoveType::ConstIndex, 1}.
-    /// Keys and indices can be nonconst, in this case they are calculated for each row.
-    enum class MoveType
-    {
-        Key,
-        Index,
-        ConstKey,
-        ConstIndex,
-    };
-
-    struct Move
-    {
-        Move(MoveType type_, size_t index_ = 0) : type(type_), index(index_) {}
-        Move(MoveType type_, const String & key_) : type(type_), key(key_) {}
-        MoveType type;
-        size_t index = 0;
-        String key;
-    };
-
-    static std::vector<Move> prepareMoves(const char * function_name, const ColumnsWithTypeAndName & columns, size_t first_index_argument, size_t num_index_arguments);
-
-    /// Performs moves of types MoveType::Index and MoveType::ConstIndex.
-    template <typename JSONParser>
-    static bool performMoves(const ColumnsWithTypeAndName & arguments, size_t row,
-                             const typename JSONParser::Element & document, const std::vector<Move> & moves,
-                             typename JSONParser::Element & element, std::string_view & last_key)
-    {
-        typename JSONParser::Element res_element = document;
-        std::string_view key;
-
-        for (size_t j = 0; j != moves.size(); ++j)
-        {
-            switch (moves[j].type)
-            {
-                case MoveType::ConstIndex:
-                {
-                    if (!moveToElementByIndex<JSONParser>(res_element, moves[j].index, key))
-                        return false;
-                    break;
-                }
-                case MoveType::ConstKey:
-                {
-                    key = moves[j].key;
-                    if (!moveToElementByKey<JSONParser>(res_element, key))
-                        return false;
-                    break;
-                }
-                case MoveType::Index:
-                {
-                    Int64 index = (*arguments[j + 1].column)[row].get<Int64>();
-                    if (!moveToElementByIndex<JSONParser>(res_element, index, key))
-                        return false;
-                    break;
-                }
-                case MoveType::Key:
-                {
-                    key = std::string_view{(*arguments[j + 1].column).getDataAt(row)};
-                    if (!moveToElementByKey<JSONParser>(res_element, key))
-                        return false;
-                    break;
-                }
-            }
-        }
-
-        element = res_element;
-        last_key = key;
-        return true;
-    }
-
-    template <typename JSONParser>
-    static bool moveToElementByIndex(typename JSONParser::Element & element, int index, std::string_view & out_key)
-    {
-        if (element.isArray())
-        {
-            auto array = element.getArray();
-            if (index >= 0)
-                --index;
-            else
-                index += array.size();
-
-            if (static_cast<size_t>(index) >= array.size())
-                return false;
-            element = array[index];
-            out_key = {};
-            return true;
-        }
-
-        if constexpr (has_index_operator<typename JSONParser::Object>::value)
-        {
-            if (element.isObject())
-            {
-                auto object = element.getObject();
-                if (index >= 0)
-                    --index;
-                else
-                    index += object.size();
-
-                if (static_cast<size_t>(index) >= object.size())
-                    return false;
-                std::tie(out_key, element) = object[index];
-                return true;
-            }
-        }
-
-        return {};
-    }
-
-    /// Performs moves of types MoveType::Key and MoveType::ConstKey.
-    template <typename JSONParser>
-    static bool moveToElementByKey(typename JSONParser::Element & element, const std::string_view & key)
-    {
-        if (!element.isObject())
-            return false;
-        auto object = element.getObject();
-        return object.find(key, element);
-    }
-
-    static size_t calculateMaxSize(const ColumnString::Offsets & offsets);
-};
-
-
-template <typename Name, template<typename> typename Impl>
-class FunctionJSON : public IFunction, WithContext
-{
-public:
-    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionJSON>(context_); }
-    FunctionJSON(ContextPtr context_) : WithContext(context_) {}
-
-    static constexpr auto name = Name::name;
-    String getName() const override { return Name::name; }
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        return Impl<DummyJSONParser>::getReturnType(Name::name, arguments);
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        /// Choose JSONParser.
-#if USE_SIMDJSON
-        if (getContext()->getSettingsRef().allow_simdjson)
-            return FunctionJSONHelpers::Executor<Name, Impl, SimdJSONParser>::run(arguments, result_type, input_rows_count);
-#endif
-
-#if USE_RAPIDJSON
-        return FunctionJSONHelpers::Executor<Name, Impl, RapidJSONParser>::run(arguments, result_type, input_rows_count);
-#else
-        return FunctionJSONHelpers::Executor<Name, Impl, DummyJSONParser>::run(arguments, result_type, input_rows_count);
-#endif
-    }
-};
-
-
-struct NameJSONHas { static constexpr auto name{"JSONHas"}; };
-struct NameIsValidJSON { static constexpr auto name{"isValidJSON"}; };
-struct NameJSONLength { static constexpr auto name{"JSONLength"}; };
-struct NameJSONKey { static constexpr auto name{"JSONKey"}; };
-struct NameJSONType { static constexpr auto name{"JSONType"}; };
-struct NameJSONExtractInt { static constexpr auto name{"JSONExtractInt"}; };
-struct NameJSONExtractUInt { static constexpr auto name{"JSONExtractUInt"}; };
-struct NameJSONExtractFloat { static constexpr auto name{"JSONExtractFloat"}; };
-struct NameJSONExtractBool { static constexpr auto name{"JSONExtractBool"}; };
-struct NameJSONExtractString { static constexpr auto name{"JSONExtractString"}; };
-struct NameJSONExtract { static constexpr auto name{"JSONExtract"}; };
-struct NameJSONExtractKeysAndValues { static constexpr auto name{"JSONExtractKeysAndValues"}; };
-struct NameJSONExtractRaw { static constexpr auto name{"JSONExtractRaw"}; };
-struct NameJSONExtractArrayRaw { static constexpr auto name{"JSONExtractArrayRaw"}; };
-struct NameJSONExtractKeysAndValuesRaw { static constexpr auto name{"JSONExtractKeysAndValuesRaw"}; };
-
-
-template <typename JSONParser>
-class JSONHasImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &) { return std::make_shared<DataTypeUInt8>(); }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element &, const std::string_view &)
-    {
-        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
-        col_vec.insertValue(1);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class IsValidJSONImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
-    {
-        if (arguments.size() != 1)
-        {
-            /// IsValidJSON() shouldn't get parameters other than JSON.
-            throw Exception{"Function " + String(function_name) + " needs exactly one argument",
-                            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-        }
-        return std::make_shared<DataTypeUInt8>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName &) { return 0; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element &, const std::string_view &)
-    {
-        /// This function is called only if JSON is valid.
-        /// If JSON isn't valid then `FunctionJSON::Executor::run()` adds default value (=zero) to `dest` without calling this function.
-        ColumnVector<UInt8> & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
-        col_vec.insertValue(1);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONLengthImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeUInt64>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        size_t size;
-        if (element.isArray())
-            size = element.getArray().size();
-        else if (element.isObject())
-            size = element.getObject().size();
-        else
-            return false;
-
-        ColumnVector<UInt64> & col_vec = assert_cast<ColumnVector<UInt64> &>(dest);
-        col_vec.insertValue(size);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONKeyImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element &, const std::string_view & last_key)
-    {
-        if (last_key.empty())
-            return false;
-        ColumnString & col_str = assert_cast<ColumnString &>(dest);
-        col_str.insertData(last_key.data(), last_key.size());
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONTypeImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        static const std::vector<std::pair<String, Int8>> values = {
-            {"Array", '['},
-            {"Object", '{'},
-            {"String", '"'},
-            {"Int64", 'i'},
-            {"UInt64", 'u'},
-            {"Double", 'd'},
-            {"Bool", 'b'},
-            {"Null", 0}, /// the default value for the column.
-        };
-        return std::make_shared<DataTypeEnum<Int8>>(values);
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        UInt8 type;
-        if (element.isInt64())
-            type = 'i';
-        else if (element.isUInt64())
-            type = 'u';
-        else if (element.isDouble())
-            type = 'd';
-        else if (element.isBool())
-            type = 'b';
-        else if (element.isString())
-            type = '"';
-        else if (element.isArray())
-            type = '[';
-        else if (element.isObject())
-            type = '{';
-        else if (element.isNull())
-            type = 0;
-        else
-            return false;
-
-        ColumnVector<Int8> & col_vec = assert_cast<ColumnVector<Int8> &>(dest);
-        col_vec.insertValue(type);
-        return true;
-    }
-};
-
-
-template <typename JSONParser, typename NumberType, bool convert_bool_to_integer = false>
-class JSONExtractNumericImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeNumber<NumberType>>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        NumberType value;
-
-        if (element.isInt64())
-        {
-            if (!accurate::convertNumeric(element.getInt64(), value))
-                return false;
-        }
-        else if (element.isUInt64())
-        {
-            if (!accurate::convertNumeric(element.getUInt64(), value))
-                return false;
-        }
-        else if (element.isDouble())
-        {
-            if constexpr (std::is_floating_point_v<NumberType>)
-            {
-                /// We permit inaccurate conversion of double to float.
-                /// Example: double 0.1 from JSON is not representable in float.
-                /// But it will be more convenient for user to perform conversion.
-                value = element.getDouble();
-            }
-            else if (!accurate::convertNumeric(element.getDouble(), value))
-                return false;
-        }
-        else if (element.isBool() && is_integer_v<NumberType> && convert_bool_to_integer)
-        {
-            value = static_cast<NumberType>(element.getBool());
-        }
-        else
-            return false;
-
-        auto & col_vec = assert_cast<ColumnVector<NumberType> &>(dest);
-        col_vec.insertValue(value);
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-using JSONExtractInt8Impl = JSONExtractNumericImpl<JSONParser, Int8>;
-template <typename JSONParser>
-using JSONExtractUInt8Impl = JSONExtractNumericImpl<JSONParser, UInt8>;
-template <typename JSONParser>
-using JSONExtractInt16Impl = JSONExtractNumericImpl<JSONParser, Int16>;
-template <typename JSONParser>
-using JSONExtractUInt16Impl = JSONExtractNumericImpl<JSONParser, UInt16>;
-template <typename JSONParser>
-using JSONExtractInt32Impl = JSONExtractNumericImpl<JSONParser, Int32>;
-template <typename JSONParser>
-using JSONExtractUInt32Impl = JSONExtractNumericImpl<JSONParser, UInt32>;
-template <typename JSONParser>
-using JSONExtractInt64Impl = JSONExtractNumericImpl<JSONParser, Int64>;
-template <typename JSONParser>
-using JSONExtractUInt64Impl = JSONExtractNumericImpl<JSONParser, UInt64>;
-template <typename JSONParser>
-using JSONExtractFloat32Impl = JSONExtractNumericImpl<JSONParser, Float32>;
-template <typename JSONParser>
-using JSONExtractFloat64Impl = JSONExtractNumericImpl<JSONParser, Float64>;
-
-
-template <typename JSONParser>
-class JSONExtractBoolImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeUInt8>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        if (!element.isBool())
-            return false;
-
-        auto & col_vec = assert_cast<ColumnVector<UInt8> &>(dest);
-        col_vec.insertValue(static_cast<UInt8>(element.getBool()));
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractStringImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        if (!element.isString())
-            return false;
-
-        auto str = element.getString();
-        ColumnString & col_str = assert_cast<ColumnString &>(dest);
-        col_str.insertData(str.data(), str.size());
-        return true;
-    }
-};
-
-template <typename JSONParser>
-class JSONExtractRawImpl;
-
-/// Nodes of the extract tree. We need the extract tree to extract from JSON complex values containing array, tuples or nullables.
-template <typename JSONParser>
-struct JSONExtractTree
-{
-    using Element = typename JSONParser::Element;
-
-    class Node
-    {
-    public:
-        Node() = default;
-        virtual ~Node() = default;
-        virtual bool insertResultToColumn(IColumn &, const Element &) = 0;
-    };
-
-    template <typename NumberType>
-    class NumericNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            return JSONExtractNumericImpl<JSONParser, NumberType, true>::insertResultToColumn(dest, element, {});
-        }
-    };
-
-    class LowCardinalityNode : public Node
-    {
-    public:
-        LowCardinalityNode(DataTypePtr dictionary_type_, std::unique_ptr<Node> impl_)
-            : dictionary_type(dictionary_type_), impl(std::move(impl_)) {}
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            auto from_col = dictionary_type->createColumn();
-            if (impl->insertResultToColumn(*from_col, element))
-            {
-                StringRef value = from_col->getDataAt(0);
-                assert_cast<ColumnLowCardinality &>(dest).insertData(value.data, value.size);
-                return true;
-            }
-            return false;
-        }
-    private:
-        DataTypePtr dictionary_type;
-        std::unique_ptr<Node> impl;
-    };
-
-    class UUIDNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (!element.isString())
-                return false;
-
-            auto uuid = parseFromString<UUID>(element.getString());
-            assert_cast<ColumnUUID &>(dest).insert(uuid);
-            return true;
-        }
-    };
-
-    template <typename DecimalType>
-    class DecimalNode : public Node
-    {
-    public:
-        DecimalNode(DataTypePtr data_type_) : data_type(data_type_) {}
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (!element.isDouble())
-                return false;
-
-            const auto * type = assert_cast<const DataTypeDecimal<DecimalType> *>(data_type.get());
-            auto result = convertToDecimal<DataTypeNumber<Float64>, DataTypeDecimal<DecimalType>>(element.getDouble(), type->getScale());
-            assert_cast<ColumnDecimal<DecimalType> &>(dest).insert(result);
-            return true;
-        }
-    private:
-        DataTypePtr data_type;
-    };
-
-    class StringNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (element.isString())
-                return JSONExtractStringImpl<JSONParser>::insertResultToColumn(dest, element, {});
-            else
-                return JSONExtractRawImpl<JSONParser>::insertResultToColumn(dest, element, {});
-        }
-    };
-
-    class FixedStringNode : public Node
-    {
-    public:
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (!element.isString())
-                return false;
-            auto & col_str = assert_cast<ColumnFixedString &>(dest);
-            auto str = element.getString();
-            if (str.size() > col_str.getN())
-                return false;
-            col_str.insertData(str.data(), str.size());
-            return true;
-        }
-    };
-
-    template <typename Type>
-    class EnumNode : public Node
-    {
-    public:
-        EnumNode(const std::vector<std::pair<String, Type>> & name_value_pairs_) : name_value_pairs(name_value_pairs_)
-        {
-            for (const auto & name_value_pair : name_value_pairs)
-            {
-                name_to_value_map.emplace(name_value_pair.first, name_value_pair.second);
-                only_values.emplace(name_value_pair.second);
-            }
-        }
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            auto & col_vec = assert_cast<ColumnVector<Type> &>(dest);
-
-            if (element.isInt64())
-            {
-                Type value;
-                if (!accurate::convertNumeric(element.getInt64(), value) || !only_values.count(value))
-                    return false;
-                col_vec.insertValue(value);
-                return true;
-            }
-
-            if (element.isUInt64())
-            {
-                Type value;
-                if (!accurate::convertNumeric(element.getUInt64(), value) || !only_values.count(value))
-                    return false;
-                col_vec.insertValue(value);
-                return true;
-            }
-
-            if (element.isString())
-            {
-                auto value = name_to_value_map.find(element.getString());
-                if (value == name_to_value_map.end())
-                    return false;
-                col_vec.insertValue(value->second);
-                return true;
-            }
-
-            return false;
-        }
-
-    private:
-        std::vector<std::pair<String, Type>> name_value_pairs;
-        std::unordered_map<std::string_view, Type> name_to_value_map;
-        std::unordered_set<Type> only_values;
-    };
-
-    class NullableNode : public Node
-    {
-    public:
-        NullableNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            ColumnNullable & col_null = assert_cast<ColumnNullable &>(dest);
-            if (!nested->insertResultToColumn(col_null.getNestedColumn(), element))
-                return false;
-            col_null.getNullMapColumn().insertValue(0);
-            return true;
-        }
-
-    private:
-        std::unique_ptr<Node> nested;
-    };
-
-    class ArrayNode : public Node
-    {
-    public:
-        ArrayNode(std::unique_ptr<Node> nested_) : nested(std::move(nested_)) {}
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            if (!element.isArray())
-                return false;
-
-            auto array = element.getArray();
-
-            ColumnArray & col_arr = assert_cast<ColumnArray &>(dest);
-            auto & data = col_arr.getData();
-            size_t old_size = data.size();
-            bool were_valid_elements = false;
-
-            for (auto value : array)
-            {
-                if (nested->insertResultToColumn(data, value))
-                    were_valid_elements = true;
-                else
-                    data.insertDefault();
-            }
-
-            if (!were_valid_elements)
-            {
-                data.popBack(data.size() - old_size);
-                return false;
-            }
-
-            col_arr.getOffsets().push_back(data.size());
-            return true;
-        }
-
-    private:
-        std::unique_ptr<Node> nested;
-    };
-
-    class TupleNode : public Node
-    {
-    public:
-        TupleNode(std::vector<std::unique_ptr<Node>> nested_, const std::vector<String> & explicit_names_) : nested(std::move(nested_)), explicit_names(explicit_names_)
-        {
-            for (size_t i = 0; i != explicit_names.size(); ++i)
-                name_to_index_map.emplace(explicit_names[i], i);
-        }
-
-        bool insertResultToColumn(IColumn & dest, const Element & element) override
-        {
-            ColumnTuple & tuple = assert_cast<ColumnTuple &>(dest);
-            size_t old_size = dest.size();
-            bool were_valid_elements = false;
-
-            auto set_size = [&](size_t size)
-            {
-                for (size_t i = 0; i != tuple.tupleSize(); ++i)
-                {
-                    auto & col = tuple.getColumn(i);
-                    if (col.size() != size)
-                    {
-                        if (col.size() > size)
-                            col.popBack(col.size() - size);
-                        else
-                            while (col.size() < size)
-                                col.insertDefault();
-                    }
-                }
-            };
-
-            if (element.isArray())
-            {
-                auto array = element.getArray();
-                auto it = array.begin();
-
-                for (size_t index = 0; (index != nested.size()) && (it != array.end()); ++index)
-                {
-                    if (nested[index]->insertResultToColumn(tuple.getColumn(index), *it++))
-                        were_valid_elements = true;
-                    else
-                        tuple.getColumn(index).insertDefault();
-                }
-
-                set_size(old_size + static_cast<size_t>(were_valid_elements));
-                return were_valid_elements;
-            }
-
-            if (element.isObject())
-            {
-                auto object = element.getObject();
-                if (name_to_index_map.empty())
-                {
-                    auto it = object.begin();
-                    for (size_t index = 0; (index != nested.size()) && (it != object.end()); ++index)
-                    {
-                        if (nested[index]->insertResultToColumn(tuple.getColumn(index), (*it++).second))
-                            were_valid_elements = true;
-                        else
-                            tuple.getColumn(index).insertDefault();
-                    }
-                }
-                else
-                {
-                    for (auto [key, value] : object)
-                    {
-                        auto index = name_to_index_map.find(key);
-                        if (index != name_to_index_map.end())
-                        {
-                            if (nested[index->second]->insertResultToColumn(tuple.getColumn(index->second), value))
-                                were_valid_elements = true;
-                        }
-                    }
-                }
-
-                set_size(old_size + static_cast<size_t>(were_valid_elements));
-                return were_valid_elements;
-            }
-
-            return false;
-        }
-
-    private:
-        std::vector<std::unique_ptr<Node>> nested;
-        std::vector<String> explicit_names;
-        std::unordered_map<std::string_view, size_t> name_to_index_map;
-    };
-
-    static std::unique_ptr<Node> build(const char * function_name, const DataTypePtr & type)
-    {
-        switch (type->getTypeId())
-        {
-            case TypeIndex::UInt8: return std::make_unique<NumericNode<UInt8>>();
-            case TypeIndex::UInt16: return std::make_unique<NumericNode<UInt16>>();
-            case TypeIndex::UInt32: return std::make_unique<NumericNode<UInt32>>();
-            case TypeIndex::UInt64: return std::make_unique<NumericNode<UInt64>>();
-            case TypeIndex::Int8: return std::make_unique<NumericNode<Int8>>();
-            case TypeIndex::Int16: return std::make_unique<NumericNode<Int16>>();
-            case TypeIndex::Int32: return std::make_unique<NumericNode<Int32>>();
-            case TypeIndex::Int64: return std::make_unique<NumericNode<Int64>>();
-            case TypeIndex::Float32: return std::make_unique<NumericNode<Float32>>();
-            case TypeIndex::Float64: return std::make_unique<NumericNode<Float64>>();
-            case TypeIndex::String: return std::make_unique<StringNode>();
-            case TypeIndex::FixedString: return std::make_unique<FixedStringNode>();
-            case TypeIndex::UUID: return std::make_unique<UUIDNode>();
-            case TypeIndex::LowCardinality:
-            {
-                auto dictionary_type = typeid_cast<const DataTypeLowCardinality *>(type.get())->getDictionaryType();
-                auto impl = build(function_name, dictionary_type);
-                return std::make_unique<LowCardinalityNode>(dictionary_type, std::move(impl));
-            }
-            case TypeIndex::Decimal256: return std::make_unique<DecimalNode<Decimal256>>(type);
-            case TypeIndex::Decimal128: return std::make_unique<DecimalNode<Decimal128>>(type);
-            case TypeIndex::Decimal64: return std::make_unique<DecimalNode<Decimal64>>(type);
-            case TypeIndex::Decimal32: return std::make_unique<DecimalNode<Decimal32>>(type);
-            case TypeIndex::Enum8:
-                return std::make_unique<EnumNode<Int8>>(static_cast<const DataTypeEnum8 &>(*type).getValues());
-            case TypeIndex::Enum16:
-                return std::make_unique<EnumNode<Int16>>(static_cast<const DataTypeEnum16 &>(*type).getValues());
-            case TypeIndex::Nullable:
-            {
-                return std::make_unique<NullableNode>(build(function_name, static_cast<const DataTypeNullable &>(*type).getNestedType()));
-            }
-            case TypeIndex::Array:
-            {
-                return std::make_unique<ArrayNode>(build(function_name, static_cast<const DataTypeArray &>(*type).getNestedType()));
-            }
-            case TypeIndex::Tuple:
-            {
-                const auto & tuple = static_cast<const DataTypeTuple &>(*type);
-                const auto & tuple_elements = tuple.getElements();
-                std::vector<std::unique_ptr<Node>> elements;
-                for (const auto & tuple_element : tuple_elements)
-                    elements.emplace_back(build(function_name, tuple_element));
-                return std::make_unique<TupleNode>(std::move(elements), tuple.haveExplicitNames() ? tuple.getElementNames() : Strings{});
-            }
-            default:
-                throw Exception{"Function " + String(function_name) + " doesn't support the return type schema: " + type->getName(), ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-        }
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
-    {
-        if (arguments.size() < 2)
-            throw Exception{"Function " + String(function_name) + " requires at least two arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto & col = arguments.back();
-        auto col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
-        if (!col_type_const || !isString(col.type))
-            throw Exception{"The last argument of function " + String(function_name)
-                                + " should be a constant string specifying the return data type, illegal value: " + col.name,
-                            ErrorCodes::ILLEGAL_COLUMN};
-
-        return DataTypeFactory::instance().get(col_type_const->getValue<String>());
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
-
-    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
-    {
-        extract_tree = JSONExtractTree<JSONParser>::build(function_name, result_type);
-    }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        return extract_tree->insertResultToColumn(dest, element);
-    }
-
-protected:
-    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
-};
-
-
-template <typename JSONParser>
-class JSONExtractKeysAndValuesImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char * function_name, const ColumnsWithTypeAndName & arguments)
-    {
-        if (arguments.size() < 2)
-            throw Exception{"Function " + String(function_name) + " requires at least two arguments", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
-
-        const auto & col = arguments.back();
-        auto col_type_const = typeid_cast<const ColumnConst *>(col.column.get());
-        if (!col_type_const || !isString(col.type))
-            throw Exception{"The last argument of function " + String(function_name)
-                                + " should be a constant string specifying the values' data type, illegal value: " + col.name,
-                            ErrorCodes::ILLEGAL_COLUMN};
-
-        DataTypePtr key_type = std::make_unique<DataTypeString>();
-        DataTypePtr value_type = DataTypeFactory::instance().get(col_type_const->getValue<String>());
-        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{key_type, value_type});
-        return std::make_unique<DataTypeArray>(tuple_type);
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 2; }
-
-    void prepare(const char * function_name, const ColumnsWithTypeAndName &, const DataTypePtr & result_type)
-    {
-        const auto tuple_type = typeid_cast<const DataTypeArray *>(result_type.get())->getNestedType();
-        const auto value_type = typeid_cast<const DataTypeTuple *>(tuple_type.get())->getElements()[1];
-        extract_tree = JSONExtractTree<JSONParser>::build(function_name, value_type);
-    }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        if (!element.isObject())
-            return false;
-
-        auto object = element.getObject();
-
-        auto & col_arr = assert_cast<ColumnArray &>(dest);
-        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
-        size_t old_size = col_tuple.size();
-        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
-        auto & col_value = col_tuple.getColumn(1);
-
-        for (auto [key, value] : object)
-        {
-            if (extract_tree->insertResultToColumn(col_value, value))
-                col_key.insertData(key.data(), key.size());
-        }
-
-        if (col_tuple.size() == old_size)
-            return false;
-
-        col_arr.getOffsets().push_back(col_tuple.size());
-        return true;
-    }
-
-private:
-    std::unique_ptr<typename JSONExtractTree<JSONParser>::Node> extract_tree;
-};
-
-
-template <typename JSONParser>
-class JSONExtractRawImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        ColumnString & col_str = assert_cast<ColumnString &>(dest);
-        auto & chars = col_str.getChars();
-        WriteBufferFromVector<ColumnString::Chars> buf(chars, WriteBufferFromVector<ColumnString::Chars>::AppendModeTag());
-        traverse(element, buf);
-        buf.finalize();
-        chars.push_back(0);
-        col_str.getOffsets().push_back(chars.size());
-        return true;
-    }
-
-private:
-    static void traverse(const Element & element, WriteBuffer & buf)
-    {
-        if (element.isInt64())
-        {
-            writeIntText(element.getInt64(), buf);
-            return;
-        }
-        if (element.isUInt64())
-        {
-            writeIntText(element.getUInt64(), buf);
-            return;
-        }
-        if (element.isDouble())
-        {
-            writeFloatText(element.getDouble(), buf);
-            return;
-        }
-        if (element.isBool())
-        {
-            if (element.getBool())
-                writeCString("true", buf);
-            else
-                writeCString("false", buf);
-            return;
-        }
-        if (element.isString())
-        {
-            writeJSONString(element.getString(), buf, format_settings());
-            return;
-        }
-        if (element.isArray())
-        {
-            writeChar('[', buf);
-            bool need_comma = false;
-            for (auto value : element.getArray())
-            {
-                if (std::exchange(need_comma, true))
-                    writeChar(',', buf);
-                traverse(value, buf);
-            }
-            writeChar(']', buf);
-            return;
-        }
-        if (element.isObject())
-        {
-            writeChar('{', buf);
-            bool need_comma = false;
-            for (auto [key, value] : element.getObject())
-            {
-                if (std::exchange(need_comma, true))
-                    writeChar(',', buf);
-                writeJSONString(key, buf, format_settings());
-                writeChar(':', buf);
-                traverse(value, buf);
-            }
-            writeChar('}', buf);
-            return;
-        }
-        if (element.isNull())
-        {
-            writeCString("null", buf);
-            return;
-        }
-    }
-
-    static const FormatSettings & format_settings()
-    {
-        static const FormatSettings the_instance = []
-        {
-            FormatSettings settings;
-            settings.json.escape_forward_slashes = false;
-            return settings;
-        }();
-        return the_instance;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractArrayRawImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    static bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        if (!element.isArray())
-            return false;
-
-        auto array = element.getArray();
-        ColumnArray & col_res = assert_cast<ColumnArray &>(dest);
-
-        for (auto value : array)
-            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_res.getData(), value, {});
-
-        col_res.getOffsets().push_back(col_res.getOffsets().back() + array.size());
-        return true;
-    }
-};
-
-
-template <typename JSONParser>
-class JSONExtractKeysAndValuesRawImpl
-{
-public:
-    using Element = typename JSONParser::Element;
-
-    static DataTypePtr getReturnType(const char *, const ColumnsWithTypeAndName &)
-    {
-        DataTypePtr string_type = std::make_unique<DataTypeString>();
-        DataTypePtr tuple_type = std::make_unique<DataTypeTuple>(DataTypes{string_type, string_type});
-        return std::make_unique<DataTypeArray>(tuple_type);
-    }
-
-    static size_t getNumberOfIndexArguments(const ColumnsWithTypeAndName & arguments) { return arguments.size() - 1; }
-
-    bool insertResultToColumn(IColumn & dest, const Element & element, const std::string_view &)
-    {
-        if (!element.isObject())
-            return false;
-
-        auto object = element.getObject();
-
-        auto & col_arr = assert_cast<ColumnArray &>(dest);
-        auto & col_tuple = assert_cast<ColumnTuple &>(col_arr.getData());
-        auto & col_key = assert_cast<ColumnString &>(col_tuple.getColumn(0));
-        auto & col_value = assert_cast<ColumnString &>(col_tuple.getColumn(1));
-
-        for (auto [key, value] : object)
-        {
-            col_key.insertData(key.data(), key.size());
-            JSONExtractRawImpl<JSONParser>::insertResultToColumn(col_value, value, {});
-        }
-
-        col_arr.getOffsets().push_back(col_arr.getOffsets().back() + object.size());
-        return true;
-    }
-};
-
-}
diff --git a/src/Functions/FunctionsLogical.cpp b/src/Functions/FunctionsLogical.cpp
index f427c9a9440..f427deced3a 100644
--- a/src/Functions/FunctionsLogical.cpp
+++ b/src/Functions/FunctionsLogical.cpp
@@ -1,16 +1,18 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsLogical.h>
 
-#include <Columns/IColumn.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnsNumber.h>
 #include <Common/FieldVisitorConvertToNumber.h>
+#include <Columns/MaskOperations.h>
 #include <Common/typeid_cast.h>
+#include <Columns/IColumn.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
+#include <Common/FieldVisitors.h>
 
 #include <algorithm>
 
@@ -507,10 +509,109 @@ DataTypePtr FunctionAnyArityLogical<Impl, Name>::getReturnTypeImpl(const DataTyp
             : result_type;
 }
 
+template <bool inverted>
+static void applyTernaryLogicImpl(const IColumn::Filter & mask, IColumn::Filter & null_bytemap)
+{
+    for (size_t i = 0; i != mask.size(); ++i)
+    {
+        UInt8 value = mask[i];
+        if constexpr (inverted)
+            value = !value;
+
+        if (null_bytemap[i] && value)
+            null_bytemap[i] = 0;
+    }
+}
+
+template <typename Name>
+static void applyTernaryLogic(const IColumn::Filter & mask, IColumn::Filter & null_bytemap)
+{
+    if (Name::name == NameAnd::name)
+        applyTernaryLogicImpl<true>(mask, null_bytemap);
+    else if (Name::name == NameOr::name)
+        applyTernaryLogicImpl<false>(mask, null_bytemap);
+}
+
+template <typename Impl, typename Name>
+ColumnPtr FunctionAnyArityLogical<Impl, Name>::executeShortCircuit(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
+{
+    if (Name::name != NameAnd::name && Name::name != NameOr::name)
+        throw Exception("Function " + getName() + " doesn't support short circuit execution", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    /// Let's denote x_i' = maskedExecute(x_i, mask).
+    /// 1) AND(x_0, x_1, x_2, ..., x_n)
+    /// We will support mask_i = x_0 & x_1 & ... & x_i.
+    /// Base:
+    /// mask_0 is 1 everywhere, x_0' = x_0.
+    /// Iteration:
+    /// mask_i = extractMask(mask_{i - 1}, x_{i - 1}')
+    /// x_i' = maskedExecute(x_i, mask)
+    /// Also we will treat NULL as 1 if x_i' is Nullable
+    /// to support ternary logic.
+    /// The result is mask_n.
+    ///
+    /// 1) OR(x_0, x_1, x_2, ..., x_n)
+    /// We will support mask_i = !x_0 & !x_1 & ... & !x_i.
+    /// mask_0 is 1 everywhere, x_0' = x_0.
+    /// mask = extractMask(mask, !x_{i - 1}')
+    /// x_i' = maskedExecute(x_i, mask)
+    /// Also we will treat NULL as 0 if x_i' is Nullable
+    /// to support ternary logic.
+    /// The result is !mask_n.
+
+    bool inverted = Name::name != NameAnd::name;
+    UInt8 null_value = UInt8(Name::name == NameAnd::name);
+    IColumn::Filter mask(arguments[0].column->size(), 1);
+
+    /// If result is nullable, we need to create null bytemap of the resulting column.
+    /// We will fill it while extracting mask from arguments.
+    std::unique_ptr<IColumn::Filter> nulls;
+    if (result_type->isNullable())
+        nulls = std::make_unique<IColumn::Filter>(arguments[0].column->size(), 0);
+
+    MaskInfo mask_info;
+    for (size_t i = 1; i <= arguments.size(); ++i)
+    {
+        if (inverted)
+            mask_info = extractInvertedMask(mask, arguments[i - 1].column, nulls.get(), null_value);
+        else
+            mask_info = extractMask(mask, arguments[i - 1].column, nulls.get(), null_value);
+
+        /// If mask doesn't have ones, we don't need to execute the rest arguments,
+        /// because the result won't change.
+        if (!mask_info.has_ones || i == arguments.size())
+            break;
+
+        maskedExecute(arguments[i], mask, mask_info);
+    }
+    /// For OR function we need to inverse mask to get the resulting column.
+    if (inverted)
+        inverseMask(mask, mask_info);
+
+    if (nulls)
+        applyTernaryLogic<Name>(mask, *nulls);
+
+    MutableColumnPtr res = ColumnUInt8::create();
+    typeid_cast<ColumnUInt8 *>(res.get())->getData() = std::move(mask);
+
+    if (!nulls)
+        return res;
+
+    MutableColumnPtr bytemap = ColumnUInt8::create();
+    typeid_cast<ColumnUInt8 *>(bytemap.get())->getData() = std::move(*nulls);
+    return ColumnNullable::create(std::move(res), std::move(bytemap));
+}
+
 template <typename Impl, typename Name>
 ColumnPtr FunctionAnyArityLogical<Impl, Name>::executeImpl(
-    const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const
 {
+    ColumnsWithTypeAndName arguments = std::move(args);
+
+    /// Special implementation for short-circuit arguments.
+    if (checkShirtCircuitArguments(arguments) != -1)
+        return executeShortCircuit(arguments, result_type);
+
     ColumnRawPtrs args_in;
     for (const auto & arg_index : arguments)
         args_in.push_back(arg_index.column.get());
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index 264eeeef0fe..3ddf7ea84eb 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Defines.h>
 #include <DataTypes/IDataType.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -31,6 +31,12 @@
 
 namespace DB
 {
+
+struct NameAnd { static constexpr auto name = "and"; };
+struct NameOr { static constexpr auto name = "or"; };
+struct NameXor { static constexpr auto name = "xor"; };
+struct NameNot { static constexpr auto name = "not"; };
+
 namespace FunctionsLogicalDetail
 {
 namespace Ternary
@@ -148,6 +154,15 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
+    {
+        settings.enable_lazy_execution_for_first_argument = false;
+        settings.enable_lazy_execution_for_common_descendants_of_arguments = true;
+        settings.force_enable_lazy_execution = false;
+        return name == NameAnd::name || name == NameOr::name;
+    }
+    ColumnPtr executeShortCircuit(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const;
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     bool useDefaultImplementationForNulls() const override { return !Impl::specialImplementationForNulls(); }
@@ -155,7 +170,7 @@ public:
     /// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override;
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override;
 
     ColumnPtr getConstantResultForNonConstArguments(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override;
 
@@ -220,6 +235,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override;
 
 #if USE_EMBEDDED_COMPILER
@@ -235,11 +252,6 @@ public:
 
 }
 
-struct NameAnd { static constexpr auto name = "and"; };
-struct NameOr { static constexpr auto name = "or"; };
-struct NameXor { static constexpr auto name = "xor"; };
-struct NameNot { static constexpr auto name = "not"; };
-
 using FunctionAnd = FunctionsLogicalDetail::FunctionAnyArityLogical<FunctionsLogicalDetail::AndImpl, NameAnd>;
 using FunctionOr = FunctionsLogicalDetail::FunctionAnyArityLogical<FunctionsLogicalDetail::OrImpl, NameOr>;
 using FunctionXor = FunctionsLogicalDetail::FunctionAnyArityLogical<FunctionsLogicalDetail::XorImpl, NameXor>;
diff --git a/src/Functions/FunctionsMiscellaneous.h b/src/Functions/FunctionsMiscellaneous.h
index 00a67a1c172..7e8cab842c8 100644
--- a/src/Functions/FunctionsMiscellaneous.h
+++ b/src/Functions/FunctionsMiscellaneous.h
@@ -77,6 +77,7 @@ public:
 
     bool isDeterministic() const override { return true; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     const DataTypes & getArgumentTypes() const override { return argument_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
@@ -169,6 +170,7 @@ public:
 
     bool isDeterministic() const override { return true; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     const DataTypes & getArgumentTypes() const override { return capture->captured_types; }
     const DataTypePtr & getResultType() const override { return return_type; }
@@ -236,7 +238,7 @@ public:
 
         capture = std::make_shared<Capture>(Capture{
                 .captured_names = captured_names_,
-                .captured_types = std::move(captured_types),
+                .captured_types = std::move(captured_types), //-V1030
                 .lambda_arguments = lambda_arguments_,
                 .return_name = expression_return_name_,
                 .return_type = function_return_type_,
diff --git a/src/Functions/FunctionsMultiStringFuzzySearch.h b/src/Functions/FunctionsMultiStringFuzzySearch.h
index 209efb0fc2f..e082cfbec2f 100644
--- a/src/Functions/FunctionsMultiStringFuzzySearch.h
+++ b/src/Functions/FunctionsMultiStringFuzzySearch.h
@@ -10,9 +10,10 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
+#include <Functions/hyperscanRegexpChecker.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <optional>
 
@@ -27,26 +28,33 @@ namespace ErrorCodes
 }
 
 
-template <typename Impl, typename Name, size_t LimitArgs>
+template <typename Impl, size_t LimitArgs>
 class FunctionsMultiStringFuzzySearch : public IFunction
 {
     static_assert(LimitArgs > 0);
 
 public:
-    static constexpr auto name = Name::name;
+    static constexpr auto name = Impl::name;
     static FunctionPtr create(ContextPtr context)
     {
         if (Impl::is_using_hyperscan && !context->getSettingsRef().allow_hyperscan)
             throw Exception(
                 "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0", ErrorCodes::FUNCTION_NOT_ALLOWED);
 
-        return std::make_shared<FunctionsMultiStringFuzzySearch>();
+        return std::make_shared<FunctionsMultiStringFuzzySearch>(
+            context->getSettingsRef().max_hyperscan_regexp_length, context->getSettingsRef().max_hyperscan_regexp_total_length);
+    }
+
+    FunctionsMultiStringFuzzySearch(size_t max_hyperscan_regexp_length_, size_t max_hyperscan_regexp_total_length_)
+        : max_hyperscan_regexp_length(max_hyperscan_regexp_length_), max_hyperscan_regexp_total_length(max_hyperscan_regexp_total_length_)
+    {
     }
 
     String getName() const override { return name; }
 
     size_t getNumberOfArguments() const override { return 3; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -113,6 +121,9 @@ public:
         for (const auto & el : src_arr)
             refs.emplace_back(el.get<String>());
 
+        if (Impl::is_using_hyperscan)
+            checkRegexp(refs, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
+
         auto col_res = ColumnVector<ResultType>::create();
         auto col_offsets = ColumnArray::ColumnOffsets::create();
 
@@ -131,6 +142,10 @@ public:
         else
             return col_res;
     }
+
+private:
+    size_t max_hyperscan_regexp_length;
+    size_t max_hyperscan_regexp_total_length;
 };
 
 }
diff --git a/src/Functions/FunctionsMultiStringPosition.h b/src/Functions/FunctionsMultiStringPosition.h
index f36f7639ccd..357606f4042 100644
--- a/src/Functions/FunctionsMultiStringPosition.h
+++ b/src/Functions/FunctionsMultiStringPosition.h
@@ -12,7 +12,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
@@ -58,6 +58,7 @@ public:
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/FunctionsMultiStringSearch.h b/src/Functions/FunctionsMultiStringSearch.h
index 08b4668940e..4bc8af3f214 100644
--- a/src/Functions/FunctionsMultiStringSearch.h
+++ b/src/Functions/FunctionsMultiStringSearch.h
@@ -10,9 +10,10 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
+#include <Functions/hyperscanRegexpChecker.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
@@ -40,26 +41,33 @@ namespace ErrorCodes
 
 /// The argument limiting raises from Volnitsky searcher -- it is performance crucial to save only one byte for pattern number.
 /// But some other searchers use this function, for example, multiMatchAny -- hyperscan does not have such restrictions
-template <typename Impl, typename Name, size_t LimitArgs = std::numeric_limits<UInt8>::max()>
+template <typename Impl, size_t LimitArgs = std::numeric_limits<UInt8>::max()>
 class FunctionsMultiStringSearch : public IFunction
 {
     static_assert(LimitArgs > 0);
 
 public:
-    static constexpr auto name = Name::name;
+    static constexpr auto name = Impl::name;
     static FunctionPtr create(ContextPtr context)
     {
         if (Impl::is_using_hyperscan && !context->getSettingsRef().allow_hyperscan)
             throw Exception(
                 "Hyperscan functions are disabled, because setting 'allow_hyperscan' is set to 0", ErrorCodes::FUNCTION_NOT_ALLOWED);
 
-        return std::make_shared<FunctionsMultiStringSearch>();
+        return std::make_shared<FunctionsMultiStringSearch>(
+            context->getSettingsRef().max_hyperscan_regexp_length, context->getSettingsRef().max_hyperscan_regexp_total_length);
+    }
+
+    FunctionsMultiStringSearch(size_t max_hyperscan_regexp_length_, size_t max_hyperscan_regexp_total_length_)
+        : max_hyperscan_regexp_length(max_hyperscan_regexp_length_), max_hyperscan_regexp_total_length(max_hyperscan_regexp_total_length_)
+    {
     }
 
     String getName() const override { return name; }
 
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -105,6 +113,9 @@ public:
         for (const auto & el : src_arr)
             refs.emplace_back(el.get<String>());
 
+        if (Impl::is_using_hyperscan)
+            checkRegexp(refs, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length);
+
         auto col_res = ColumnVector<ResultType>::create();
         auto col_offsets = ColumnArray::ColumnOffsets::create();
 
@@ -122,6 +133,10 @@ public:
         else
             return col_res;
     }
+
+private:
+    size_t max_hyperscan_regexp_length;
+    size_t max_hyperscan_regexp_total_length;
 };
 
 }
diff --git a/src/Functions/FunctionsRandom.cpp b/src/Functions/FunctionsRandom.cpp
index 9436ce0f5e2..96c41225242 100644
--- a/src/Functions/FunctionsRandom.cpp
+++ b/src/Functions/FunctionsRandom.cpp
@@ -3,7 +3,7 @@
 #include <Functions/VectorExtension.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/randomSeed.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 #if USE_MULTITARGET_CODE
 #  include <x86intrin.h>
 #endif
diff --git a/src/Functions/FunctionsRandom.h b/src/Functions/FunctionsRandom.h
index 75037d02a2d..2dacd6d6db9 100644
--- a/src/Functions/FunctionsRandom.h
+++ b/src/Functions/FunctionsRandom.h
@@ -60,6 +60,7 @@ public:
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
     bool useDefaultImplementationForNulls() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
diff --git a/src/Functions/FunctionsRound.h b/src/Functions/FunctionsRound.h
index 29e86b23c10..edba82a5b4e 100644
--- a/src/Functions/FunctionsRound.h
+++ b/src/Functions/FunctionsRound.h
@@ -16,7 +16,7 @@
 #include <cmath>
 #include <type_traits>
 #include <array>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <algorithm>
 
 #ifdef __SSE4_1__
@@ -315,11 +315,11 @@ template <typename T, RoundingMode rounding_mode, ScaleMode scale_mode>
 struct FloatRoundingImpl
 {
 private:
-    static_assert(!IsDecimalNumber<T>);
+    static_assert(!is_decimal<T>);
 
     using Op = FloatRoundingComputation<T, rounding_mode, scale_mode>;
     using Data = std::array<T, Op::data_count>;
-    using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColumnType = ColumnVector<T>;
     using Container = typename ColumnType::Container;
 
 public:
@@ -413,12 +413,10 @@ public:
 };
 
 
-template <typename T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
+template <is_decimal T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
 class DecimalRoundingImpl
 {
 private:
-    static_assert(IsDecimalNumber<T>);
-
     using NativeType = typename T::NativeType;
     using Op = IntegerRoundingComputation<NativeType, rounding_mode, ScaleMode::Negative, tie_breaking_mode>;
     using Container = typename ColumnDecimal<T>::Container;
@@ -453,15 +451,16 @@ public:
 /** Select the appropriate processing algorithm depending on the scale.
   */
 template <typename T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
-class Dispatcher
+struct Dispatcher
 {
     template <ScaleMode scale_mode>
     using FunctionRoundingImpl = std::conditional_t<std::is_floating_point_v<T>,
         FloatRoundingImpl<T, rounding_mode, scale_mode>,
         IntegerRoundingImpl<T, rounding_mode, scale_mode, tie_breaking_mode>>;
 
-    static ColumnPtr apply(const ColumnVector<T> * col, Scale scale_arg)
+    static ColumnPtr apply(const IColumn * col_general, Scale scale_arg)
     {
+        const auto * const col = checkAndGetColumn<ColumnVector<T>>(col_general);
         auto col_res = ColumnVector<T>::create();
 
         typename ColumnVector<T>::Container & vec_res = col_res->getData();
@@ -488,9 +487,15 @@ class Dispatcher
 
         return col_res;
     }
+};
 
-    static ColumnPtr apply(const ColumnDecimal<T> * col, Scale scale_arg)
+template <is_decimal T, RoundingMode rounding_mode, TieBreakingMode tie_breaking_mode>
+struct Dispatcher<T, rounding_mode, tie_breaking_mode>
+{
+public:
+    static ColumnPtr apply(const IColumn * col_general, Scale scale_arg)
     {
+        const auto * const col = checkAndGetColumn<ColumnDecimal<T>>(col_general);
         const typename ColumnDecimal<T>::Container & vec_src = col->getData();
 
         auto col_res = ColumnDecimal<T>::create(vec_src.size(), vec_src.getScale());
@@ -501,15 +506,6 @@ class Dispatcher
 
         return col_res;
     }
-
-public:
-    static ColumnPtr apply(const IColumn * column, Scale scale_arg)
-    {
-        if constexpr (is_arithmetic_v<T>)
-            return apply(checkAndGetColumn<ColumnVector<T>>(column), scale_arg);
-        else if constexpr (IsDecimalNumber<T>)
-            return apply(checkAndGetColumn<ColumnDecimal<T>>(column), scale_arg);
-    }
 };
 
 /** A template for functions that round the value of an input parameter of type
@@ -529,6 +525,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     /// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -617,7 +614,7 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override
     {
-        return { true, true, true };
+        return { .is_monotonic = true, .is_always_monotonic = true };
     }
 };
 
@@ -637,6 +634,7 @@ public:
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/FunctionsStringArray.cpp b/src/Functions/FunctionsStringArray.cpp
index 765317093c1..0c76cde701a 100644
--- a/src/Functions/FunctionsStringArray.cpp
+++ b/src/Functions/FunctionsStringArray.cpp
@@ -1,9 +1,49 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsStringArray.h>
 
+namespace
+{
+bool isNullableStringOrNullableNothing(DB::DataTypePtr type)
+{
+    if (type->isNullable())
+    {
+        const auto & nested_type = assert_cast<const DB::DataTypeNullable &>(*type).getNestedType();
+        if (isString(nested_type) || isNothing(nested_type))
+            return true;
+    }
+    return false;
+}
+
+}
 
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+DataTypePtr FunctionArrayStringConcat::getReturnTypeImpl(const DataTypes & arguments) const
+{
+    if (arguments.size() != 1 && arguments.size() != 2)
+        throw Exception(
+            "Number of arguments for function " + getName() + " doesn't match: passed " + toString(arguments.size())
+                + ", should be 1 or 2.",
+            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+    const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].get());
+    // An array consisting of only Null-s has type Array(Nullable(Nothing))
+    if (!array_type || !(isString(array_type->getNestedType()) || isNullableStringOrNullableNothing(array_type->getNestedType())))
+        throw Exception(
+            "First argument for function " + getName() + " must be an array of String-s or Nullable(String)-s.",
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    if (arguments.size() == 2 && !isString(arguments[1]))
+        throw Exception("Second argument for function " + getName() + " must be constant string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+    return std::make_shared<DataTypeString>();
+}
 
 void registerFunctionsStringArray(FunctionFactory & factory)
 {
diff --git a/src/Functions/FunctionsStringArray.h b/src/Functions/FunctionsStringArray.h
index 4d2312f207c..c15a8db8186 100644
--- a/src/Functions/FunctionsStringArray.h
+++ b/src/Functions/FunctionsStringArray.h
@@ -1,18 +1,21 @@
 #pragma once
 
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeString.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnConst.h>
 #include <Columns/ColumnArray.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <Functions/Regexps.h>
-#include <Functions/FunctionHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/Context_fwd.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
@@ -21,7 +24,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
     extern const int ILLEGAL_COLUMN;
 }
@@ -552,6 +554,8 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return Generator::getNumberOfArguments(); }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
@@ -648,13 +652,15 @@ public:
 class FunctionArrayStringConcat : public IFunction
 {
 private:
-    void executeInternal(
+    static void executeInternal(
         const ColumnString::Chars & src_chars,
         const ColumnString::Offsets & src_string_offsets,
         const ColumnArray::Offsets & src_array_offsets,
-        const char * delimiter, const size_t delimiter_size,
+        const char * delimiter,
+        const size_t delimiter_size,
         ColumnString::Chars & dst_chars,
-        ColumnString::Offsets & dst_string_offsets) const
+        ColumnString::Offsets & dst_string_offsets,
+        const char8_t * null_map)
     {
         size_t size = src_array_offsets.size();
 
@@ -672,29 +678,33 @@ private:
         dst_string_offsets.resize(src_array_offsets.size());
 
         ColumnArray::Offset current_src_array_offset = 0;
-        ColumnString::Offset current_src_string_offset = 0;
 
         ColumnString::Offset current_dst_string_offset = 0;
 
         /// Loop through the array of strings.
         for (size_t i = 0; i < size; ++i)
         {
+            bool first_non_null = true;
             /// Loop through the rows within the array. /// NOTE You can do everything in one copy, if the separator has a size of 1.
             for (auto next_src_array_offset = src_array_offsets[i]; current_src_array_offset < next_src_array_offset; ++current_src_array_offset)
             {
+                if (unlikely(null_map && null_map[current_src_array_offset]))
+                    continue;
+
+                if (!first_non_null)
+                {
+                    memcpy(&dst_chars[current_dst_string_offset], delimiter, delimiter_size);
+                    current_dst_string_offset += delimiter_size;
+                }
+                first_non_null = false;
+
+                const auto current_src_string_offset = current_src_array_offset ? src_string_offsets[current_src_array_offset - 1] : 0;
                 size_t bytes_to_copy = src_string_offsets[current_src_array_offset] - current_src_string_offset - 1;
 
                 memcpySmallAllowReadWriteOverflow15(
                     &dst_chars[current_dst_string_offset], &src_chars[current_src_string_offset], bytes_to_copy);
 
-                current_src_string_offset = src_string_offsets[current_src_array_offset];
                 current_dst_string_offset += bytes_to_copy;
-
-                if (current_src_array_offset + 1 != next_src_array_offset)
-                {
-                    memcpy(&dst_chars[current_dst_string_offset], delimiter, delimiter_size);
-                    current_dst_string_offset += delimiter_size;
-                }
             }
 
             dst_chars[current_dst_string_offset] = 0;
@@ -706,6 +716,24 @@ private:
         dst_chars.resize(dst_string_offsets.back());
     }
 
+    static void executeInternal(
+        const ColumnString & col_string,
+        const ColumnArray & col_arr,
+        const String & delimiter,
+        ColumnString & col_res,
+        const char8_t * null_map = nullptr)
+    {
+        executeInternal(
+            col_string.getChars(),
+            col_string.getOffsets(),
+            col_arr.getOffsets(),
+            delimiter.data(),
+            delimiter.size(),
+            col_res.getChars(),
+            col_res.getOffsets(),
+            null_map);
+    }
+
 public:
     static constexpr auto name = "arrayStringConcat";
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayStringConcat>(); }
@@ -716,25 +744,10 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        if (arguments.size() != 1 && arguments.size() != 2)
-            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
-                + toString(arguments.size()) + ", should be 1 or 2.",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].get());
-        if (!array_type || !isString(array_type->getNestedType()))
-            throw Exception("First argument for function " + getName() + " must be array of strings.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        if (arguments.size() == 2
-            && !isString(arguments[1]))
-            throw Exception("Second argument for function " + getName() + " must be constant string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        return std::make_shared<DataTypeString>();
-    }
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
@@ -752,10 +765,14 @@ public:
         {
             Array src_arr = col_const_arr->getValue<Array>();
             String dst_str;
+            bool first_non_null = true;
             for (size_t i = 0, size = src_arr.size(); i < size; ++i)
             {
-                if (i != 0)
+                if (src_arr[i].isNull())
+                    continue;
+                if (!first_non_null)
                     dst_str += delimiter;
+                first_non_null = false;
                 dst_str += src_arr[i].get<const String &>();
             }
 
@@ -764,15 +781,20 @@ public:
         else
         {
             const ColumnArray & col_arr = assert_cast<const ColumnArray &>(*arguments[0].column);
-            const ColumnString & col_string = assert_cast<const ColumnString &>(col_arr.getData());
-
             auto col_res = ColumnString::create();
-
-            executeInternal(
-                col_string.getChars(), col_string.getOffsets(), col_arr.getOffsets(),
-                delimiter.data(), delimiter.size(),
-                col_res->getChars(), col_res->getOffsets());
-
+            if (WhichDataType(col_arr.getData().getDataType()).isString())
+            {
+                const ColumnString & col_string = assert_cast<const ColumnString &>(col_arr.getData());
+                executeInternal(col_string, col_arr, delimiter, *col_res);
+            }
+            else
+            {
+                const ColumnNullable & col_nullable = assert_cast<const ColumnNullable &>(col_arr.getData());
+                if (const ColumnString * col_string = typeid_cast<const ColumnString *>(col_nullable.getNestedColumnPtr().get()))
+                    executeInternal(*col_string, col_arr, delimiter, *col_res, col_nullable.getNullMapData().data());
+                else
+                    col_res->insertManyDefaults(col_arr.size());
+            }
             return col_res;
         }
     }
diff --git a/src/Functions/FunctionsStringHash.cpp b/src/Functions/FunctionsStringHash.cpp
index e5ed5dc77c0..c9ad8285485 100644
--- a/src/Functions/FunctionsStringHash.cpp
+++ b/src/Functions/FunctionsStringHash.cpp
@@ -10,7 +10,7 @@
 #include <functional>
 #include <tuple>
 #include <vector>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <city.h>
 
diff --git a/src/Functions/FunctionsStringHash.h b/src/Functions/FunctionsStringHash.h
index 37fa7d618b9..6f3e37cf7fe 100644
--- a/src/Functions/FunctionsStringHash.h
+++ b/src/Functions/FunctionsStringHash.h
@@ -41,6 +41,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override
     {
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 0789247e2d4..4aa76ceec28 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -46,17 +46,19 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
-template <typename Impl, typename Name>
+template <typename Impl>
 class FunctionsStringSearch : public IFunction
 {
 public:
-    static constexpr auto name = Name::name;
+    static constexpr auto name = Impl::name;
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsStringSearch>(); }
 
     String getName() const override { return name; }
 
     bool isVariadic() const override { return Impl::supports_start_pos; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override
     {
         if (Impl::supports_start_pos)
@@ -78,7 +80,7 @@ public:
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() < 2 || 3 < arguments.size())
-            throw Exception("Number of arguments for function " + String(Name::name) + " doesn't match: passed "
+            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
                 + toString(arguments.size()) + ", should be 2 or 3.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
diff --git a/src/Functions/FunctionsStringSearchToString.h b/src/Functions/FunctionsStringSearchToString.h
index af91a9511e1..6d2d5efdb3d 100644
--- a/src/Functions/FunctionsStringSearchToString.h
+++ b/src/Functions/FunctionsStringSearchToString.h
@@ -12,7 +12,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
@@ -45,6 +45,8 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/FunctionsStringSimilarity.cpp b/src/Functions/FunctionsStringSimilarity.cpp
index 10fcfc40ba8..a8cf6a5cf38 100644
--- a/src/Functions/FunctionsStringSimilarity.cpp
+++ b/src/Functions/FunctionsStringSimilarity.cpp
@@ -7,7 +7,7 @@
 
 #include <Core/Defines.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <algorithm>
 #include <climits>
diff --git a/src/Functions/FunctionsStringSimilarity.h b/src/Functions/FunctionsStringSimilarity.h
index 6efb373aace..195e4c126c5 100644
--- a/src/Functions/FunctionsStringSimilarity.h
+++ b/src/Functions/FunctionsStringSimilarity.h
@@ -37,6 +37,8 @@ public:
 
     String getName() const override { return name; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 2; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/FunctionsVisitParam.h b/src/Functions/FunctionsVisitParam.h
index 922ea44be9a..362c3bcd693 100644
--- a/src/Functions/FunctionsVisitParam.h
+++ b/src/Functions/FunctionsVisitParam.h
@@ -74,13 +74,14 @@ struct ExtractNumericType
  * If a field was not found or an incorrect value is associated with the field,
  * then the default value used - 0.
  */
-template <typename ParamExtractor>
+template <typename Name, typename ParamExtractor>
 struct ExtractParamImpl
 {
     using ResultType = typename ParamExtractor::ResultType;
 
     static constexpr bool use_default_implementation_for_constants = true;
     static constexpr bool supports_start_pos = false;
+    static constexpr auto name = Name::name;
 
     /// It is assumed that `res` is the correct size and initialized with zeros.
     static void vectorConstant(
@@ -91,7 +92,7 @@ struct ExtractParamImpl
         PaddedPODArray<ResultType> & res)
     {
         if (start_pos != nullptr)
-            throw Exception("Functions 'visitParamHas' and 'visitParamExtract*' doesn't support start_pos argument", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' doesn't support start_pos argument", name);
 
         /// We are looking for a parameter simply as a substring of the form "name"
         needle = "\"" + needle + "\":";
@@ -131,18 +132,18 @@ struct ExtractParamImpl
 
     template <typename... Args> static void vectorVector(Args &&...)
     {
-        throw Exception("Functions 'visitParamHas' and 'visitParamExtract*' doesn't support non-constant needle argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support non-constant needle argument", name);
     }
 
     template <typename... Args> static void constantVector(Args &&...)
     {
-        throw Exception("Functions 'visitParamHas' and 'visitParamExtract*' doesn't support non-constant needle argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support non-constant needle argument", name);
     }
 
     template <typename... Args>
     static void vectorFixedConstant(Args &&...)
     {
-        throw Exception("Functions 'visitParamHas' don't support FixedString haystack argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support FixedString haystack argument", name);
     }
 };
 
diff --git a/src/Functions/GCDLCMImpl.h b/src/Functions/GCDLCMImpl.h
index f13a6dc3f95..f4988e3a585 100644
--- a/src/Functions/GCDLCMImpl.h
+++ b/src/Functions/GCDLCMImpl.h
@@ -2,13 +2,11 @@
 
 #include <DataTypes/NumberTraits.h>
 #include <Common/Exception.h>
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 #include <limits>
 #include <type_traits>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 
 namespace DB
@@ -25,6 +23,7 @@ struct GCDLCMImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/GatherUtils/Algorithms.h b/src/Functions/GatherUtils/Algorithms.h
index fbd658ca7be..fc54eaf88ab 100644
--- a/src/Functions/GatherUtils/Algorithms.h
+++ b/src/Functions/GatherUtils/Algorithms.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/FieldVisitorConvertToNumber.h>
 #include "Sources.h"
 #include "Sinks.h"
 #include <Core/AccurateComparison.h>
-#include <common/range.h>
+#include <base/range.h>
 #include "GatherUtils.h"
 
 
@@ -34,7 +34,7 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<T> & sink)
 template <typename T, typename U>
 void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
 {
-    using NativeU = typename NativeType<U>::Type;
+    using NativeU = NativeType<U>;
 
     sink.elements.resize(sink.current_offset + slice.size);
     for (size_t i = 0; i < slice.size; ++i)
@@ -42,9 +42,9 @@ void writeSlice(const NumericArraySlice<T> & slice, NumericArraySink<U> & sink)
         const auto & src = slice.data[i];
         auto & dst = sink.elements[sink.current_offset];
 
-        if constexpr (OverBigInt<T> || OverBigInt<U>)
+        if constexpr (is_over_big_int<T> || is_over_big_int<U>)
         {
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 dst = static_cast<NativeU>(src.value);
             else
                 dst = static_cast<NativeU>(src);
@@ -99,7 +99,7 @@ inline ALWAYS_INLINE void writeSlice(const NumericArraySlice<T> & slice, Generic
 {
     for (size_t i = 0; i < slice.size; ++i)
     {
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
         {
             DecimalField field(T(slice.data[i]), 0); /// TODO: Decimal scale
             sink.elements.insert(field);
@@ -397,6 +397,9 @@ void NO_INLINE conditional(SourceA && src_a, SourceB && src_b, Sink && sink, con
     const UInt8 * cond_pos = condition.data();
     const UInt8 * cond_end = cond_pos + condition.size();
 
+    bool a_is_short = src_a.getColumnSize() < condition.size();
+    bool b_is_short = src_b.getColumnSize() < condition.size();
+
     while (cond_pos < cond_end)
     {
         if (*cond_pos)
@@ -404,9 +407,12 @@ void NO_INLINE conditional(SourceA && src_a, SourceB && src_b, Sink && sink, con
         else
             writeSlice(src_b.getWhole(), sink);
 
+        if (!a_is_short || *cond_pos)
+            src_a.next();
+        if (!b_is_short || !*cond_pos)
+            src_b.next();
+
         ++cond_pos;
-        src_a.next();
-        src_b.next();
         sink.next();
     }
 }
@@ -552,9 +558,9 @@ bool sliceEqualElements(const NumericArraySlice<T> & first [[maybe_unused]],
                         size_t second_ind [[maybe_unused]])
 {
     /// TODO: Decimal scale
-    if constexpr (IsDecimalNumber<T> && IsDecimalNumber<U>)
+    if constexpr (is_decimal<T> && is_decimal<U>)
         return accurate::equalsOp(first.data[first_ind].value, second.data[second_ind].value);
-    else if constexpr (IsDecimalNumber<T> || IsDecimalNumber<U>)
+    else if constexpr (is_decimal<T> || is_decimal<U>)
         return false;
     else
         return accurate::equalsOp(first.data[first_ind], second.data[second_ind]);
@@ -582,7 +588,7 @@ bool insliceEqualElements(const NumericArraySlice<T> & first [[maybe_unused]],
                           size_t first_ind [[maybe_unused]],
                           size_t second_ind [[maybe_unused]])
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
         return accurate::equalsOp(first.data[first_ind].value, first.data[second_ind].value);
     else
         return accurate::equalsOp(first.data[first_ind], first.data[second_ind]);
diff --git a/src/Functions/GatherUtils/ArraySinkVisitor.h b/src/Functions/GatherUtils/ArraySinkVisitor.h
index 7a53da25869..245c5d4451d 100644
--- a/src/Functions/GatherUtils/ArraySinkVisitor.h
+++ b/src/Functions/GatherUtils/ArraySinkVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Common/Visitor.h>
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 
 namespace DB::GatherUtils
 {
@@ -14,12 +14,12 @@ struct GenericArraySink;
 template <typename ArraySink>
 struct NullableArraySink;
 
-using NumericArraySinks = typename TypeListMap<NumericArraySink, TypeListNumbersAndUUID>::Type;
-using BasicArraySinks = typename AppendToTypeList<GenericArraySink, NumericArraySinks>::Type;
-using NullableArraySinks = typename TypeListMap<NullableArraySink, BasicArraySinks>::Type;
-using TypeListArraySinks = typename TypeListConcat<BasicArraySinks, NullableArraySinks>::Type;
+using NumericArraySinks = TLMap<NumericArraySink, TLNumbersWithUUID>;
+using BasicArraySinks = TLAppend<GenericArraySink, NumericArraySinks>;
+using NullableArraySinks = TLMap<NullableArraySink, BasicArraySinks>;
+using TLArraySinks = TLConcat<BasicArraySinks, NullableArraySinks>;
 
-class ArraySinkVisitor : public ApplyTypeListForClass<Visitor, TypeListArraySinks>::Type
+class ArraySinkVisitor : public TLChangeRoot<Visitor, TLArraySinks>
 {
 protected:
     ~ArraySinkVisitor() = default;
diff --git a/src/Functions/GatherUtils/ArraySourceVisitor.h b/src/Functions/GatherUtils/ArraySourceVisitor.h
index 1b92a9d2e81..707503f35e8 100644
--- a/src/Functions/GatherUtils/ArraySourceVisitor.h
+++ b/src/Functions/GatherUtils/ArraySourceVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Common/Visitor.h>
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 
 namespace DB::GatherUtils
 {
@@ -17,10 +17,10 @@ struct NullableArraySource;
 template <typename Base>
 struct ConstSource;
 
-using NumericArraySources = typename TypeListMap<NumericArraySource, TypeListNumbersAndUUID>::Type;
-using BasicArraySources = typename AppendToTypeList<GenericArraySource, NumericArraySources>::Type;
+using NumericArraySources = TLMap<NumericArraySource, TLNumbersWithUUID>;
+using BasicArraySources = TLAppend<GenericArraySource, NumericArraySources>;
 
-class ArraySourceVisitor : public ApplyTypeListForClass<Visitor, BasicArraySources>::Type
+class ArraySourceVisitor : public TLChangeRoot<Visitor, BasicArraySources>
 {
 protected:
     ~ArraySourceVisitor() = default;
diff --git a/src/Functions/GatherUtils/Sinks.h b/src/Functions/GatherUtils/Sinks.h
index fb1792585ae..e801ba9990c 100644
--- a/src/Functions/GatherUtils/Sinks.h
+++ b/src/Functions/GatherUtils/Sinks.h
@@ -36,7 +36,7 @@ struct NullableValueSource;
 template <typename T>
 struct NumericArraySink : public ArraySinkImpl<NumericArraySink<T>>
 {
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
     using CompatibleArraySource = NumericArraySource<T>;
     using CompatibleValueSource = NumericValueSource<T>;
 
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index 9a459860a68..c8014d3e855 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -39,7 +39,7 @@ template <typename ArraySink> struct NullableArraySink;
 template <typename T>
 struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 {
-    using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using ColVecType = ColumnVectorOrDecimal<T>;
     using Slice = NumericArraySlice<T>;
     using Column = ColumnArray;
 
@@ -281,6 +281,11 @@ struct StringSource
         return offsets[row_num] - prev_offset - 1;
     }
 
+    size_t getColumnSize() const
+    {
+        return offsets.size();
+    }
+
     Slice getWhole() const
     {
         return {&elements[prev_offset], offsets[row_num] - prev_offset - 1};
@@ -320,7 +325,7 @@ struct StringSource
 };
 
 
-/// Differs to StringSource by having 'offest' and 'length' in code points instead of bytes in getSlice* methods.
+/// Differs to StringSource by having 'offset' and 'length' in code points instead of bytes in getSlice* methods.
 /** NOTE: The behaviour of substring and substringUTF8 is inconsistent when negative offset is greater than string size:
   * substring:
   *      hello
@@ -417,6 +422,7 @@ struct FixedStringSource
     const UInt8 * end;
     size_t string_size;
     size_t row_num = 0;
+    size_t column_size = 0;
 
     explicit FixedStringSource(const ColumnFixedString & col)
             : string_size(col.getN())
@@ -424,6 +430,7 @@ struct FixedStringSource
         const auto & chars = col.getChars();
         pos = chars.data();
         end = pos + chars.size();
+        column_size = col.size();
     }
 
     void next()
@@ -452,6 +459,11 @@ struct FixedStringSource
         return string_size;
     }
 
+    size_t getColumnSize() const
+    {
+        return column_size;
+    }
+
     Slice getWhole() const
     {
         return {pos, string_size};
@@ -708,7 +720,7 @@ template <typename T>
 struct NumericValueSource : ValueSourceImpl<NumericValueSource<T>>
 {
     using Slice = NumericValueSlice<T>;
-    using Column = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+    using Column = ColumnVectorOrDecimal<T>;
 
     using SinkType = NumericArraySink<T>;
 
diff --git a/src/Functions/GatherUtils/ValueSourceVisitor.h b/src/Functions/GatherUtils/ValueSourceVisitor.h
index be503cdcfcf..6577afd5616 100644
--- a/src/Functions/GatherUtils/ValueSourceVisitor.h
+++ b/src/Functions/GatherUtils/ValueSourceVisitor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Common/Visitor.h>
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 
 namespace DB::GatherUtils
 {
@@ -17,14 +17,14 @@ struct NullableValueSource;
 template <typename Base>
 struct ConstSource;
 
-using NumericValueSources = typename TypeListMap<NumericValueSource, TypeListNumbersAndUUID>::Type;
-using BasicValueSources = typename AppendToTypeList<GenericValueSource, NumericValueSources>::Type;
-using NullableValueSources = typename TypeListMap<NullableValueSource, BasicValueSources>::Type;
-using BasicAndNullableValueSources = typename TypeListConcat<BasicValueSources, NullableValueSources>::Type;
-using ConstValueSources = typename TypeListMap<ConstSource, BasicAndNullableValueSources>::Type;
-using TypeListValueSources = typename TypeListConcat<BasicAndNullableValueSources, ConstValueSources>::Type;
+using NumericValueSources = TLMap<NumericValueSource, TLNumbersWithUUID>;
+using BasicValueSources = TLAppend<GenericValueSource, NumericValueSources>;
+using NullableValueSources = TLMap<NullableValueSource, BasicValueSources>;
+using BasicAndNullableValueSources = TLConcat<BasicValueSources, NullableValueSources>;
+using ConstValueSources = TLMap<ConstSource, BasicAndNullableValueSources>;
+using TypeListValueSources = TLConcat<BasicAndNullableValueSources, ConstValueSources>;
 
-class ValueSourceVisitor : public ApplyTypeListForClass<Visitor, TypeListValueSources>::Type
+class ValueSourceVisitor : public TLChangeRoot<Visitor, TypeListValueSources>
 {
 protected:
     ~ValueSourceVisitor() = default;
diff --git a/src/Functions/GatherUtils/createArraySink.cpp b/src/Functions/GatherUtils/createArraySink.cpp
index 90983c9c25c..f461790baf7 100644
--- a/src/Functions/GatherUtils/createArraySink.cpp
+++ b/src/Functions/GatherUtils/createArraySink.cpp
@@ -1,7 +1,7 @@
 #include "GatherUtils.h"
 #include "Sinks.h"
 #include "Sources.h"
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 
 namespace DB::GatherUtils
 {
@@ -18,7 +18,7 @@ struct ArraySinkCreator<Type, Types...>
 {
     static std::unique_ptr<IArraySink> create(IColumn & values, ColumnArray::Offsets & offsets, size_t column_size)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         IColumn * not_null_values = &values;
         bool is_nullable = false;
@@ -55,7 +55,7 @@ struct ArraySinkCreator<>
 
 std::unique_ptr<IArraySink> createArraySink(ColumnArray & col, size_t column_size)
 {
-    using Creator = ApplyTypeListForClass<ArraySinkCreator, TypeListNumbersAndUUID>::Type;
+    using Creator = TLChangeRoot<ArraySinkCreator, TLNumbersWithUUID>;
     return Creator::create(col.getData(), col.getOffsets(), column_size);
 }
 }
diff --git a/src/Functions/GatherUtils/createArraySource.cpp b/src/Functions/GatherUtils/createArraySource.cpp
index d98a72e456f..605b2057e53 100644
--- a/src/Functions/GatherUtils/createArraySource.cpp
+++ b/src/Functions/GatherUtils/createArraySource.cpp
@@ -1,7 +1,7 @@
 #include "GatherUtils.h"
 #include "Sinks.h"
 #include "Sources.h"
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 
 namespace DB::GatherUtils
 {
@@ -18,7 +18,7 @@ struct ArraySourceCreator<Type, Types...>
 {
     static std::unique_ptr<IArraySource> create(const ColumnArray & col, const NullMap * null_map, bool is_const, size_t total_rows)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         if (typeid_cast<const ColVecType *>(&col.getData()))
         {
@@ -58,7 +58,7 @@ struct ArraySourceCreator<>
 
 std::unique_ptr<IArraySource> createArraySource(const ColumnArray & col, bool is_const, size_t total_rows)
 {
-    using Creator = typename ApplyTypeListForClass<ArraySourceCreator, TypeListNumbersAndUUID>::Type;
+    using Creator = TLChangeRoot<ArraySourceCreator, TLNumbersWithUUID>;
     if (const auto * column_nullable = typeid_cast<const ColumnNullable *>(&col.getData()))
     {
         auto column = ColumnArray::create(column_nullable->getNestedColumnPtr(), col.getOffsetsPtr());
diff --git a/src/Functions/GatherUtils/createValueSource.cpp b/src/Functions/GatherUtils/createValueSource.cpp
index 4f538b95369..53cd26ffdd7 100644
--- a/src/Functions/GatherUtils/createValueSource.cpp
+++ b/src/Functions/GatherUtils/createValueSource.cpp
@@ -1,7 +1,7 @@
 #include "GatherUtils.h"
 #include "Sinks.h"
 #include "Sources.h"
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 
 namespace DB::GatherUtils
 {
@@ -18,7 +18,7 @@ struct ValueSourceCreator<Type, Types...>
 {
     static std::unique_ptr<IValueSource> create(const IColumn & col, const NullMap * null_map, bool is_const, size_t total_rows)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+        using ColVecType = ColumnVectorOrDecimal<Type>;
 
         if (auto column_vector = typeid_cast<const ColVecType *>(&col))
         {
@@ -58,7 +58,7 @@ struct ValueSourceCreator<>
 
 std::unique_ptr<IValueSource> createValueSource(const IColumn & col, bool is_const, size_t total_rows)
 {
-    using Creator = typename ApplyTypeListForClass<ValueSourceCreator, TypeListNumbersAndUUID>::Type;
+    using Creator = TLChangeRoot<ValueSourceCreator, TLNumbersWithUUID>;
     if (const auto * column_nullable = typeid_cast<const ColumnNullable *>(&col))
     {
         return Creator::create(column_nullable->getNestedColumn(), &column_nullable->getNullMapData(), is_const, total_rows);
diff --git a/src/Functions/GeoHash.h b/src/Functions/GeoHash.h
index f918602d473..d97eda31cef 100644
--- a/src/Functions/GeoHash.h
+++ b/src/Functions/GeoHash.h
@@ -2,7 +2,7 @@
 
 #include <map>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index 5f179483b53..b44b6c0dd13 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/extended_types.h>
+#include <base/extended_types.h>
 #include <Common/Exception.h>
 #include <Core/Types.h>
 #include <IO/ReadBuffer.h>
@@ -38,14 +38,13 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
-        GregorianDate(T mjd);
+        GregorianDate(is_integer auto mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral type
           * which should be at least 32 bits wide, and should preferably
           * signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <is_integer T>
         T toModifiedJulianDay() const;
 
         /** Write the date in text form 'YYYY-MM-DD' to a buffer.
@@ -90,14 +89,13 @@ namespace DB
           * integral type which should be at least 32 bits wide, and
           * should preferably signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
-        OrdinalDate(T mjd);
+        OrdinalDate(is_integer auto mjd);
 
         /** Convert to Modified Julian Day. The type T is an integral
           * type which should be at least 32 bits wide, and should
           * preferably be signed.
           */
-        template <typename T, std::enable_if_t<is_integer_v<T>> * = nullptr>
+        template <is_integer T>
         T toModifiedJulianDay() const noexcept;
 
         YearT year() const noexcept
@@ -259,8 +257,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
-    GregorianDate<YearT>::GregorianDate(T mjd)
+    GregorianDate<YearT>::GregorianDate(is_integer auto mjd)
     {
         const OrdinalDate<YearT> ord(mjd);
         const MonthDay md(gd::is_leap_year(ord.year()), ord.dayOfYear());
@@ -270,7 +267,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <is_integer T>
     T GregorianDate<YearT>::toModifiedJulianDay() const
     {
         const MonthDay md(month_, day_of_month_);
@@ -332,8 +329,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
-    OrdinalDate<YearT>::OrdinalDate(T mjd)
+    OrdinalDate<YearT>::OrdinalDate(is_integer auto mjd)
     {
         const auto a         = mjd + 678575;
         const auto quad_cent = gd::div(a, 146097);
@@ -348,7 +344,7 @@ namespace DB
     }
 
     template <typename YearT>
-    template <typename T, std::enable_if_t<is_integer_v<T>> *>
+    template <is_integer T>
     T OrdinalDate<YearT>::toModifiedJulianDay() const noexcept
     {
         const auto y = year_ - 1;
diff --git a/src/Functions/HasTokenImpl.h b/src/Functions/HasTokenImpl.h
index 044c50b6742..ec33a07fce3 100644
--- a/src/Functions/HasTokenImpl.h
+++ b/src/Functions/HasTokenImpl.h
@@ -14,13 +14,14 @@ namespace ErrorCodes
 
 /** Token search the string, means that needle must be surrounded by some separator chars, like whitespace or puctuation.
   */
-template <typename TokenSearcher, bool negate_result = false>
+template <typename Name, typename TokenSearcher, bool negate_result = false>
 struct HasTokenImpl
 {
     using ResultType = UInt8;
 
     static constexpr bool use_default_implementation_for_constants = true;
     static constexpr bool supports_start_pos = false;
+    static constexpr auto name = Name::name;
 
     static void vectorConstant(
         const ColumnString::Chars & data,
@@ -30,7 +31,7 @@ struct HasTokenImpl
         PaddedPODArray<UInt8> & res)
     {
         if (start_pos != nullptr)
-            throw Exception("Function 'hasToken' does not support start_pos argument", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function '{}' does not support start_pos argument", name);
 
         if (offsets.empty())
             return;
@@ -72,20 +73,20 @@ struct HasTokenImpl
     template <typename... Args>
     static void vectorVector(Args &&...)
     {
-        throw Exception("Function 'hasToken' does not support non-constant needle argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support non-constant needle argument", name);
     }
 
     /// Search different needles in single haystack.
     template <typename... Args>
     static void constantVector(Args &&...)
     {
-        throw Exception("Function 'hasToken' does not support non-constant needle argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support non-constant needle argument", name);
     }
 
     template <typename... Args>
     static void vectorFixedConstant(Args &&...)
     {
-        throw Exception("Functions 'hasToken' don't support FixedString haystack argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support FixedString haystack argument", name);
     }
 };
 
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index e3802b98abf..12f2f50a5f0 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -16,9 +16,7 @@
 #include <cstdlib>
 #include <memory>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_EMBEDDED_COMPILER
 #    pragma GCC diagnostic push
@@ -378,6 +376,7 @@ static std::optional<DataTypes> removeNullables(const DataTypes & types)
 
 bool IFunction::isCompilable(const DataTypes & arguments) const
 {
+
     if (useDefaultImplementationForNulls())
         if (auto denulled = removeNullables(arguments))
             return isCompilableImpl(*denulled);
diff --git a/src/Functions/IFunction.h b/src/Functions/IFunction.h
index c00baf2850b..dfa3f00d1cf 100644
--- a/src/Functions/IFunction.h
+++ b/src/Functions/IFunction.h
@@ -5,9 +5,7 @@
 #include <Core/Names.h>
 #include <DataTypes/IDataType.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <memory>
 
@@ -211,15 +209,48 @@ public:
       */
     virtual bool hasInformationAboutMonotonicity() const { return false; }
 
+    struct ShortCircuitSettings
+    {
+        /// Should we enable lazy execution for the first argument of short-circuit function?
+        /// Example: if(cond, then, else), we don't need to execute cond lazily.
+        bool enable_lazy_execution_for_first_argument;
+        /// Should we enable lazy execution for functions, that are common descendants of
+        /// different short-circuit function arguments?
+        /// Example 1: if (cond, expr1(..., expr, ...), expr2(..., expr, ...)), we don't need
+        /// to execute expr lazily, because it's used in both branches.
+        /// Example 2: and(expr1, expr2(..., expr, ...), expr3(..., expr, ...)), here we
+        /// should enable lazy execution for expr, because it must be filtered by expr1.
+        bool enable_lazy_execution_for_common_descendants_of_arguments;
+        /// Should we enable lazy execution without checking isSuitableForShortCircuitArgumentsExecution?
+        /// Example: toTypeName(expr), even if expr contains functions that are not suitable for
+        /// lazy execution (because of their simplicity), we shouldn't execute them at all.
+        bool force_enable_lazy_execution;
+    };
+
+    /** Function is called "short-circuit" if it's arguments can be evaluated lazily
+      * (examples: and, or, if, multiIf). If function is short circuit, it should be
+      *  able to work with lazy executed arguments,
+      *  this method will be called before function execution.
+      *  If function is short circuit, it must define all fields in settings for
+      *  appropriate preparations. Number of arguments is provided because some settings might depend on it.
+      *  Example: multiIf(cond, else, then) and multiIf(cond1, else1, cond2, else2, ...), the first
+      *  version can enable enable_lazy_execution_for_common_descendants_of_arguments setting, the second - not.
+      */
+    virtual bool isShortCircuit(ShortCircuitSettings & /*settings*/, size_t /*number_of_arguments*/) const { return false; }
+
+    /** Should we evaluate this function lazily in short-circuit function arguments?
+      * If function can throw an exception or it's computationally heavy, then
+      * it's suitable, otherwise it's not (due to the overhead of lazy execution).
+      * Suitability may depend on function arguments.
+      */
+    virtual bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const = 0;
+
     /// The property of monotonicity for a certain range.
     struct Monotonicity
     {
-        bool is_monotonic = false;    /// Is the function monotonous (nondecreasing or nonincreasing).
-        bool is_positive = true;    /// true if the function is nondecreasing, false, if notincreasing. If is_monotonic = false, then it does not matter.
+        bool is_monotonic = false;    /// Is the function monotonous (non-decreasing or non-increasing).
+        bool is_positive = true;    /// true if the function is non-decreasing, false if non-increasing. If is_monotonic = false, then it does not matter.
         bool is_always_monotonic = false; /// Is true if function is monotonic on the whole input range I
-
-        Monotonicity(bool is_monotonic_ = false, bool is_positive_ = true, bool is_always_monotonic_ = false)
-                : is_monotonic(is_monotonic_), is_positive(is_positive_), is_always_monotonic(is_always_monotonic_) {}
     };
 
     /** Get information about monotonicity on a range of values. Call only if hasInformationAboutMonotonicity.
@@ -242,9 +273,7 @@ class IFunctionOverloadResolver
 public:
     virtual ~IFunctionOverloadResolver() = default;
 
-    FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const;
-
-    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const;
+    virtual FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const;
 
     void getLambdaArgumentTypes(DataTypes & arguments) const;
 
@@ -286,7 +315,10 @@ public:
 
 protected:
 
-    virtual FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const = 0;
+    virtual FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & /* arguments */, const DataTypePtr & /* result_type */) const
+    {
+        throw Exception("buildImpl is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
 
     virtual DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const
     {
@@ -324,6 +356,8 @@ protected:
 
 private:
 
+    DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments) const;
+
     DataTypePtr getReturnTypeWithoutLowCardinality(const ColumnsWithTypeAndName & arguments) const;
 };
 
@@ -385,6 +419,11 @@ public:
     virtual bool isDeterministic() const { return true; }
     virtual bool isDeterministicInScopeOfQuery() const { return true; }
     virtual bool isStateful() const { return false; }
+
+    using ShortCircuitSettings = IFunctionBase::ShortCircuitSettings;
+    virtual bool isShortCircuit(ShortCircuitSettings & /*settings*/, size_t /*number_of_arguments*/) const { return false; }
+    virtual bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const = 0;
+
     virtual bool hasInformationAboutMonotonicity() const { return false; }
 
     using Monotonicity = IFunctionBase::Monotonicity;
diff --git a/src/Functions/IFunctionAdaptors.h b/src/Functions/IFunctionAdaptors.h
index 6a865af0dd3..9bfe010c0d0 100644
--- a/src/Functions/IFunctionAdaptors.h
+++ b/src/Functions/IFunctionAdaptors.h
@@ -80,6 +80,10 @@ public:
 
     bool isDeterministicInScopeOfQuery() const override { return function->isDeterministicInScopeOfQuery(); }
 
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t number_of_arguments) const override { return function->isShortCircuit(settings, number_of_arguments); }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & args) const override { return function->isSuitableForShortCircuitArgumentsExecution(args); }
+
     bool hasInformationAboutMonotonicity() const override { return function->hasInformationAboutMonotonicity(); }
 
     Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
diff --git a/src/Functions/ITupleFunction.h b/src/Functions/ITupleFunction.h
new file mode 100644
index 00000000000..836e5d273fc
--- /dev/null
+++ b/src/Functions/ITupleFunction.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <Functions/IFunction.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+class ITupleFunction : public IFunction
+{
+protected:
+    ContextPtr context;
+
+public:
+    explicit ITupleFunction(ContextPtr context_) : context(context_) {}
+
+    Columns getTupleElements(const IColumn & column) const
+    {
+        if (const auto * const_column = typeid_cast<const ColumnConst *>(&column))
+            return convertConstTupleToConstantElements(*const_column);
+
+        if (const auto * column_tuple = typeid_cast<const ColumnTuple *>(&column))
+        {
+            Columns columns(column_tuple->tupleSize());
+            for (size_t i = 0; i < columns.size(); ++i)
+                columns[i] = column_tuple->getColumnPtr(i);
+            return columns;
+        }
+
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument of function {} should be tuples, got {}",
+                        getName(), column.getName());
+    }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+};
+}
diff --git a/src/Functions/IsOperation.h b/src/Functions/IsOperation.h
index 5b03ae3d189..369978fe271 100644
--- a/src/Functions/IsOperation.h
+++ b/src/Functions/IsOperation.h
@@ -3,7 +3,7 @@
 namespace DB
 {
 
-/// These classes should be present in DB namespace (cannot place them into nemelesspace)
+/// These classes should be present in DB namespace (cannot place them into namelesspace)
 template <typename> struct AbsImpl;
 template <typename> struct NegateImpl;
 template <typename, typename> struct PlusImpl;
diff --git a/src/Functions/LeastGreatestGeneric.h b/src/Functions/LeastGreatestGeneric.h
index 68cfda7d116..128243a2661 100644
--- a/src/Functions/LeastGreatestGeneric.h
+++ b/src/Functions/LeastGreatestGeneric.h
@@ -6,7 +6,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
@@ -37,6 +37,7 @@ private:
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & types) const override
     {
@@ -106,6 +107,8 @@ public:
     FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
         DataTypes argument_types;
+        for (const auto & argument : arguments)
+            argument_types.push_back(argument.type);
 
         /// More efficient specialization for two numeric arguments.
         if (arguments.size() == 2 && isNumber(arguments[0].type) && isNumber(arguments[1].type))
diff --git a/src/Functions/MatchImpl.h b/src/Functions/MatchImpl.h
index e1e8394f7b1..63a14484fe2 100644
--- a/src/Functions/MatchImpl.h
+++ b/src/Functions/MatchImpl.h
@@ -1,15 +1,13 @@
 #pragma once
 
 #include <type_traits>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Volnitsky.h>
 #include <Columns/ColumnString.h>
 #include "Regexps.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#    include <Common/config.h>
-#endif
+#include "config_functions.h"
+#include <Common/config.h>
 
 #if USE_RE2_ST
 #    include <re2_st/re2.h>
@@ -73,11 +71,12 @@ static inline bool likePatternIsStrstr(const String & pattern, String & res)
   * NOTE: We want to run regexp search for whole columns by one call (as implemented in function 'position')
   *  but for that, regexp engine must support \0 bytes and their interpretation as string boundaries.
   */
-template <bool like, bool revert = false, bool case_insensitive = false>
+template <typename Name, bool like, bool revert = false, bool case_insensitive = false>
 struct MatchImpl
 {
     static constexpr bool use_default_implementation_for_constants = true;
     static constexpr bool supports_start_pos = false;
+    static constexpr auto name = Name::name;
 
     using ResultType = UInt8;
 
@@ -93,7 +92,8 @@ struct MatchImpl
         PaddedPODArray<UInt8> & res)
     {
         if (start_pos != nullptr)
-            throw Exception("Functions 'like' and 'match' don't support start_pos argument", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Function '{}' doesn't support start_pos argument", name);
 
         if (offsets.empty())
             return;
@@ -198,7 +198,7 @@ struct MatchImpl
                     }
 
                     /// We check that the entry does not pass through the boundaries of strings.
-                    if (pos + strstr_pattern.size() < begin + offsets[i])
+                    if (pos + required_substring.size() < begin + offsets[i])
                     {
                         /// And if it does not, if necessary, we check the regexp.
 
@@ -342,7 +342,7 @@ struct MatchImpl
                 const UInt8 * next_pos = begin;
 
                 /// If required substring is larger than string size - it cannot be found.
-                if (strstr_pattern.size() <= n)
+                if (required_substring.size() <= n)
                 {
                     Searcher searcher(required_substring.data(), required_substring.size(), end - pos);
 
@@ -358,7 +358,7 @@ struct MatchImpl
                         }
                         next_pos += n;
 
-                        if (pos + strstr_pattern.size() <= next_pos)
+                        if (pos + required_substring.size() <= next_pos)
                         {
                             /// And if it does not, if necessary, we check the regexp.
 
@@ -406,14 +406,14 @@ struct MatchImpl
     template <typename... Args>
     static void vectorVector(Args &&...)
     {
-        throw Exception("Functions 'like' and 'match' don't support non-constant needle argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support non-constant needle argument", name);
     }
 
     /// Search different needles in single haystack.
     template <typename... Args>
     static void constantVector(Args &&...)
     {
-        throw Exception("Functions 'like' and 'match' don't support non-constant needle argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support non-constant needle argument", name);
     }
 };
 
diff --git a/src/Functions/MultiMatchAllIndicesImpl.h b/src/Functions/MultiMatchAllIndicesImpl.h
index f0a94ed5eed..c2e64671d1f 100644
--- a/src/Functions/MultiMatchAllIndicesImpl.h
+++ b/src/Functions/MultiMatchAllIndicesImpl.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include "Regexps.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#    include <Common/config.h>
-#endif
+#include "config_functions.h"
+#include <Common/config.h>
 
 #if USE_HYPERSCAN
 #    include <hs.h>
@@ -29,7 +27,7 @@ namespace ErrorCodes
 }
 
 
-template <typename Type, bool MultiSearchDistance>
+template <typename Name, typename Type, bool MultiSearchDistance>
 struct MultiMatchAllIndicesImpl
 {
     using ResultType = Type;
@@ -37,6 +35,8 @@ struct MultiMatchAllIndicesImpl
     /// Variable for understanding, if we used offsets for the output, most
     /// likely to determine whether the function returns ColumnVector of ColumnArray.
     static constexpr bool is_column_array = true;
+    static constexpr auto name = Name::name;
+
     static auto getReturnType()
     {
         return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>());
diff --git a/src/Functions/MultiMatchAnyImpl.h b/src/Functions/MultiMatchAnyImpl.h
index c8d0ea6c87f..747c0e5e62c 100644
--- a/src/Functions/MultiMatchAnyImpl.h
+++ b/src/Functions/MultiMatchAnyImpl.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include "Regexps.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#    include <Common/config.h>
-#endif
+#include "config_functions.h"
+#include <Common/config.h>
 
 #if USE_HYPERSCAN
 #    include <hs.h>
@@ -29,7 +27,7 @@ namespace ErrorCodes
 }
 
 
-template <typename Type, bool FindAny, bool FindAnyIndex, bool MultiSearchDistance>
+template <typename Name, typename Type, bool FindAny, bool FindAnyIndex, bool MultiSearchDistance>
 struct MultiMatchAnyImpl
 {
     static_assert(static_cast<int>(FindAny) + static_cast<int>(FindAnyIndex) == 1);
@@ -38,6 +36,8 @@ struct MultiMatchAnyImpl
     /// Variable for understanding, if we used offsets for the output, most
     /// likely to determine whether the function returns ColumnVector of ColumnArray.
     static constexpr bool is_column_array = false;
+    static constexpr auto name = Name::name;
+
     static auto getReturnType()
     {
         return std::make_shared<DataTypeNumber<ResultType>>();
@@ -120,7 +120,7 @@ struct MultiMatchAnyImpl
         memset(accum.data(), 0, accum.size());
         for (size_t j = 0; j < needles.size(); ++j)
         {
-            MatchImpl<false, false>::vectorConstant(haystack_data, haystack_offsets, needles[j].toString(), nullptr, accum);
+            MatchImpl<Name, false, false>::vectorConstant(haystack_data, haystack_offsets, needles[j].toString(), nullptr, accum);
             for (size_t i = 0; i < res.size(); ++i)
             {
                 if constexpr (FindAny)
diff --git a/src/Functions/MultiSearchFirstIndexImpl.h b/src/Functions/MultiSearchFirstIndexImpl.h
index bb0bb57b9db..26709119f6e 100644
--- a/src/Functions/MultiSearchFirstIndexImpl.h
+++ b/src/Functions/MultiSearchFirstIndexImpl.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-template <typename Impl>
+template <typename Name, typename Impl>
 struct MultiSearchFirstIndexImpl
 {
     using ResultType = UInt64;
@@ -15,6 +15,8 @@ struct MultiSearchFirstIndexImpl
     /// Variable for understanding, if we used offsets for the output, most
     /// likely to determine whether the function returns ColumnVector of ColumnArray.
     static constexpr bool is_column_array = false;
+    static constexpr auto name = Name::name;
+
     static auto getReturnType() { return std::make_shared<DataTypeNumber<ResultType>>(); }
 
     static void vectorConstant(
@@ -42,6 +44,8 @@ struct MultiSearchFirstIndexImpl
             }
             ++iteration;
         }
+        if (iteration == 0)
+            std::fill(res.begin(), res.end(), 0);
     }
 };
 
diff --git a/src/Functions/MultiSearchFirstPositionImpl.h b/src/Functions/MultiSearchFirstPositionImpl.h
index 4743518e61e..1db8dcbde83 100644
--- a/src/Functions/MultiSearchFirstPositionImpl.h
+++ b/src/Functions/MultiSearchFirstPositionImpl.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-template <typename Impl>
+template <typename Name, typename Impl>
 struct MultiSearchFirstPositionImpl
 {
     using ResultType = UInt64;
@@ -15,6 +15,8 @@ struct MultiSearchFirstPositionImpl
     /// Variable for understanding, if we used offsets for the output, most
     /// likely to determine whether the function returns ColumnVector of ColumnArray.
     static constexpr bool is_column_array = false;
+    static constexpr auto name = Name::name;
+
     static auto getReturnType() { return std::make_shared<DataTypeNumber<ResultType>>(); }
 
     static void vectorConstant(
@@ -51,6 +53,8 @@ struct MultiSearchFirstPositionImpl
             }
             ++iteration;
         }
+        if (iteration == 0)
+            std::fill(res.begin(), res.end(), 0);
     }
 };
 
diff --git a/src/Functions/MultiSearchImpl.h b/src/Functions/MultiSearchImpl.h
index 5b881e2fd55..7cb0cefe580 100644
--- a/src/Functions/MultiSearchImpl.h
+++ b/src/Functions/MultiSearchImpl.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-template <typename Impl>
+template <typename Name, typename Impl>
 struct MultiSearchImpl
 {
     using ResultType = UInt8;
@@ -15,6 +15,8 @@ struct MultiSearchImpl
     /// Variable for understanding, if we used offsets for the output, most
     /// likely to determine whether the function returns ColumnVector of ColumnArray.
     static constexpr bool is_column_array = false;
+    static constexpr auto name = Name::name;
+
     static auto getReturnType() { return std::make_shared<DataTypeNumber<ResultType>>(); }
 
     static void vectorConstant(
@@ -41,6 +43,8 @@ struct MultiSearchImpl
             }
             ++iteration;
         }
+        if (iteration == 0)
+            std::fill(res.begin(), res.end(), 0);
     }
 };
 
diff --git a/src/Functions/PolygonUtils.h b/src/Functions/PolygonUtils.h
index a050de2edb6..0f9b84344e6 100644
--- a/src/Functions/PolygonUtils.h
+++ b/src/Functions/PolygonUtils.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Defines.h>
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnVector.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
 #include <Common/SipHash.h>
-#include <common/range.h>
+#include <base/range.h>
 
 /// Warning in boost::geometry during template strategy substitution.
 #pragma GCC diagnostic push
@@ -604,7 +604,7 @@ struct CallPointInPolygon<Type, Types ...>
     template <typename PointInPolygonImpl>
     static ColumnPtr call(const IColumn & x, const IColumn & y, PointInPolygonImpl && impl)
     {
-        using Impl = typename ApplyTypeListForClass<CallPointInPolygon, TypeListNativeNumbers>::Type;
+        using Impl = TLChangeRoot<CallPointInPolygon, TLIntegral>;
         if (auto column = typeid_cast<const ColumnVector<Type> *>(&x))
             return Impl::template call<Type>(*column, y, impl);
         return CallPointInPolygon<Types ...>::call(x, y, impl);
@@ -630,7 +630,7 @@ struct CallPointInPolygon<>
 template <typename PointInPolygonImpl>
 NO_INLINE ColumnPtr pointInPolygon(const IColumn & x, const IColumn & y, PointInPolygonImpl && impl)
 {
-    using Impl = typename ApplyTypeListForClass<CallPointInPolygon, TypeListNativeNumbers>::Type;
+    using Impl = TLChangeRoot<CallPointInPolygon, TLIntegral>;
     return Impl::call(x, y, impl);
 }
 
diff --git a/src/Functions/PositionImpl.h b/src/Functions/PositionImpl.h
index fe9b49bd2b8..d3b6d74c3cd 100644
--- a/src/Functions/PositionImpl.h
+++ b/src/Functions/PositionImpl.h
@@ -175,11 +175,12 @@ struct PositionCaseInsensitiveUTF8
 };
 
 
-template <typename Impl>
+template <typename Name, typename Impl>
 struct PositionImpl
 {
     static constexpr bool use_default_implementation_for_constants = false;
     static constexpr bool supports_start_pos = true;
+    static constexpr auto name = Name::name;
 
     using ResultType = UInt64;
 
@@ -408,7 +409,7 @@ struct PositionImpl
     template <typename... Args>
     static void vectorFixedConstant(Args &&...)
     {
-        throw Exception("Functions 'position' don't support FixedString haystack argument", ErrorCodes::ILLEGAL_COLUMN);
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Function '{}' doesn't support FixedString haystack argument", name);
     }
 };
 
diff --git a/src/Functions/RapidJSONParser.h b/src/Functions/RapidJSONParser.h
index 992480d64f7..0e791fe744f 100644
--- a/src/Functions/RapidJSONParser.h
+++ b/src/Functions/RapidJSONParser.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_RAPIDJSON
-#    include <common/types.h>
-#    include <common/defines.h>
+#    include <base/types.h>
+#    include <base/defines.h>
 #    include <rapidjson/document.h>
 
 
diff --git a/src/Functions/Regexps.h b/src/Functions/Regexps.h
index 5da1224ab8c..b3477f6f32c 100644
--- a/src/Functions/Regexps.h
+++ b/src/Functions/Regexps.h
@@ -12,11 +12,9 @@
 #include <Common/ObjectPool.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/ProfileEvents.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_HYPERSCAN
 #    include <hs.h>
@@ -61,7 +59,7 @@ namespace Regexps
     template <bool like, bool no_capture, bool case_insensitive = false>
     inline Pool::Pointer get(const std::string & pattern)
     {
-        /// C++11 has thread-safe function-local statics on most modern compilers.
+        /// C++11 has thread-safe function-local static on most modern compilers.
         static Pool known_regexps; /// Different variables for different pattern parameters.
 
         return known_regexps.get(pattern, [&pattern]
@@ -257,7 +255,7 @@ namespace MultiRegexps
     template <bool save_indices, bool CompileForEditDistance>
     inline Regexps * get(const std::vector<StringRef> & patterns, std::optional<UInt32> edit_distance)
     {
-        /// C++11 has thread-safe function-local statics on most modern compilers.
+        /// C++11 has thread-safe function-local static on most modern compilers.
         static Pool known_regexps; /// Different variables for different pattern parameters.
 
         std::vector<String> str_patterns;
diff --git a/src/Functions/ReplaceRegexpImpl.h b/src/Functions/ReplaceRegexpImpl.h
index 3e80dd5b337..4320f47c424 100644
--- a/src/Functions/ReplaceRegexpImpl.h
+++ b/src/Functions/ReplaceRegexpImpl.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Volnitsky.h>
 #include <Columns/ColumnString.h>
 #include <IO/WriteHelpers.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#    include <Common/config.h>
-#endif
+#include "config_functions.h"
+#include <Common/config.h>
 
 #if USE_RE2_ST
 #    include <re2_st/re2.h>
@@ -96,6 +94,9 @@ struct ReplaceRegexpImpl
         re2_st::StringPiece matches[max_captures];
 
         size_t start_pos = 0;
+        bool is_first_match = true;
+        bool is_start_pos_added_one = false;
+
         while (start_pos < static_cast<size_t>(input.length()))
         {
             /// If no more replacements possible for current string
@@ -103,6 +104,9 @@ struct ReplaceRegexpImpl
 
             if (searcher.Match(input, start_pos, input.length(), re2_st::RE2::Anchor::UNANCHORED, matches, num_captures))
             {
+                if (is_start_pos_added_one)
+                    start_pos -= 1;
+
                 const auto & match = matches[0];
                 size_t bytes_to_copy = (match.data() - input.data()) - start_pos;
 
@@ -112,6 +116,13 @@ struct ReplaceRegexpImpl
                 res_offset += bytes_to_copy;
                 start_pos += bytes_to_copy + match.length();
 
+                /// To avoid infinite loop.
+                if (is_first_match && match.length() == 0 && !replace_one && input.length() > 1)
+                {
+                    start_pos += 1;
+                    is_start_pos_added_one = true;
+                }
+
                 /// Do substitution instructions
                 for (const auto & it : instructions)
                 {
@@ -129,8 +140,9 @@ struct ReplaceRegexpImpl
                     }
                 }
 
-                if (replace_one || match.length() == 0) /// Stop after match of zero length, to avoid infinite loop.
+                if (replace_one || (!is_first_match && match.length() == 0))
                     can_finish_current_string = true;
+                is_first_match = false;
             }
             else
                 can_finish_current_string = true;
diff --git a/src/Functions/ReplaceStringImpl.h b/src/Functions/ReplaceStringImpl.h
index a120350d4c7..ab0e53d3c45 100644
--- a/src/Functions/ReplaceStringImpl.h
+++ b/src/Functions/ReplaceStringImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Volnitsky.h>
 #include <Columns/ColumnString.h>
 
diff --git a/src/Functions/SimdJSONParser.h b/src/Functions/SimdJSONParser.h
index c5793088baf..be85d74619b 100644
--- a/src/Functions/SimdJSONParser.h
+++ b/src/Functions/SimdJSONParser.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_SIMDJSON
-#    include <common/types.h>
+#    include <base/types.h>
 #    include <Common/Exception.h>
-#    include <common/defines.h>
+#    include <base/defines.h>
 #    include <simdjson.h>
 
 
diff --git a/src/Functions/TargetSpecific.h b/src/Functions/TargetSpecific.h
index e6d3fe6d665..fa230a56fb7 100644
--- a/src/Functions/TargetSpecific.h
+++ b/src/Functions/TargetSpecific.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 /* This file contains macros and helpers for writing platform-dependent code.
  *
@@ -106,7 +106,7 @@ String toString(TargetArch arch);
 /* Clang shows warning when there aren't any objects to apply pragma.
  * To prevent this warning we define this function inside every macros with pragmas.
  */
-#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void __dummy_function_definition();
+#   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void _dummy_function_definition();
 #else
 #   define BEGIN_AVX512F_SPECIFIC_CODE \
         _Pragma("GCC push_options") \
diff --git a/src/Functions/URL/ExtractFirstSignificantSubdomain.h b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
index 974574058e9..4f9b1ec3c6c 100644
--- a/src/Functions/URL/ExtractFirstSignificantSubdomain.h
+++ b/src/Functions/URL/ExtractFirstSignificantSubdomain.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include "domain.h"
 #include "tldLookup.h"
 
diff --git a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
index 08576fe59ec..8a76d52741b 100644
--- a/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
+++ b/src/Functions/URL/FirstSignificantSubdomainCustomImpl.h
@@ -40,6 +40,7 @@ public:
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
diff --git a/src/Functions/URL/basename.cpp b/src/Functions/URL/basename.cpp
index 1d7a3a3bc61..f97724020cb 100644
--- a/src/Functions/URL/basename.cpp
+++ b/src/Functions/URL/basename.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include "FunctionsURL.h"
 
 namespace DB
diff --git a/src/Functions/URL/cutURLParameter.cpp b/src/Functions/URL/cutURLParameter.cpp
index f0103f42acd..2ff7c3e33d9 100644
--- a/src/Functions/URL/cutURLParameter.cpp
+++ b/src/Functions/URL/cutURLParameter.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsStringSearchToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/cutWWW.cpp b/src/Functions/URL/cutWWW.cpp
index 87c26b830f1..9b55b0929b0 100644
--- a/src/Functions/URL/cutWWW.cpp
+++ b/src/Functions/URL/cutWWW.cpp
@@ -1,7 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include "protocol.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/decodeURLComponent.cpp b/src/Functions/URL/decodeURLComponent.cpp
index 96cdcb64537..b6abaab515e 100644
--- a/src/Functions/URL/decodeURLComponent.cpp
+++ b/src/Functions/URL/decodeURLComponent.cpp
@@ -1,7 +1,7 @@
 #include <Common/hex.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/domain.h b/src/Functions/URL/domain.h
index dacb740a87d..d43be198043 100644
--- a/src/Functions/URL/domain.h
+++ b/src/Functions/URL/domain.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "protocol.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <cstring>
 #include <Common/StringUtils/StringUtils.h>
 
diff --git a/src/Functions/URL/extractURLParameter.cpp b/src/Functions/URL/extractURLParameter.cpp
index c6234c66fc0..983426ef0fc 100644
--- a/src/Functions/URL/extractURLParameter.cpp
+++ b/src/Functions/URL/extractURLParameter.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsStringSearchToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/fragment.h b/src/Functions/URL/fragment.h
index e60263e9245..6c11d0fbb34 100644
--- a/src/Functions/URL/fragment.h
+++ b/src/Functions/URL/fragment.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FunctionsURL.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/path.cpp b/src/Functions/URL/path.cpp
index 2260604c1fc..c3037956118 100644
--- a/src/Functions/URL/path.cpp
+++ b/src/Functions/URL/path.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionStringToString.h>
 #include "FunctionsURL.h"
 #include "path.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/path.h b/src/Functions/URL/path.h
index f2c5d31a0b0..89244659088 100644
--- a/src/Functions/URL/path.h
+++ b/src/Functions/URL/path.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Functions/URL/FunctionsURL.h>
 
 
diff --git a/src/Functions/URL/pathFull.cpp b/src/Functions/URL/pathFull.cpp
index 661fb298c04..f37c42e3753 100644
--- a/src/Functions/URL/pathFull.cpp
+++ b/src/Functions/URL/pathFull.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionStringToString.h>
 #include "FunctionsURL.h"
 #include "path.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Functions/URL/port.cpp b/src/Functions/URL/port.cpp
index 179a2be4471..8cc5ce711d5 100644
--- a/src/Functions/URL/port.cpp
+++ b/src/Functions/URL/port.cpp
@@ -28,6 +28,7 @@ struct FunctionPort : public IFunction
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/URL/queryString.h b/src/Functions/URL/queryString.h
index fc6ba6c26af..a0777a5c9a1 100644
--- a/src/Functions/URL/queryString.h
+++ b/src/Functions/URL/queryString.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FunctionsURL.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/URL/queryStringAndFragment.h b/src/Functions/URL/queryStringAndFragment.h
index b1d7291f0e5..ed19cd14b74 100644
--- a/src/Functions/URL/queryStringAndFragment.h
+++ b/src/Functions/URL/queryStringAndFragment.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FunctionsURL.h"
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/VectorExtension.h b/src/Functions/VectorExtension.h
index bffc04a6024..cb4347e3031 100644
--- a/src/Functions/VectorExtension.h
+++ b/src/Functions/VectorExtension.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 // Contains types declarations and wrappers for GCC vector extension.
 
 namespace DB::VectorExtension
diff --git a/src/Functions/abs.cpp b/src/Functions/abs.cpp
index 10664f7b421..f8c68c0ded2 100644
--- a/src/Functions/abs.cpp
+++ b/src/Functions/abs.cpp
@@ -9,18 +9,19 @@ namespace DB
 template <typename A>
 struct AbsImpl
 {
-    using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
+    using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfAbs<A>::Type>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-        if constexpr (IsDecimalNumber<A>)
+        if constexpr (is_decimal<A>)
             return a < A(0) ? A(-a) : a;
         else if constexpr (is_big_int_v<A> && is_signed_v<A>)
             return (a < 0) ? -a : a;
-        else if constexpr (is_integer_v<A> && is_signed_v<A>)
+        else if constexpr (is_integer<A> && is_signed_v<A>)
             return a < 0 ? static_cast<ResultType>(~a) + 1 : static_cast<ResultType>(a);
-        else if constexpr (is_integer_v<A> && is_unsigned_v<A>)
+        else if constexpr (is_integer<A> && is_unsigned_v<A>)
             return static_cast<ResultType>(a);
         else if constexpr (std::is_floating_point_v<A>)
             return static_cast<ResultType>(std::abs(a));
@@ -45,7 +46,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameAbs>
         if ((left_float < 0 && right_float > 0) || (left_float > 0 && right_float < 0))
             return {};
 
-        return { true, (left_float > 0) };
+        return { .is_monotonic = true, .is_positive = left_float > 0 };
     }
 };
 
diff --git a/src/Functions/abtesting.cpp b/src/Functions/abtesting.cpp
deleted file mode 100644
index 871357fe450..00000000000
--- a/src/Functions/abtesting.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-#include <Functions/abtesting.h>
-
-#if !defined(ARCADIA_BUILD) && USE_STATS
-
-#include <math.h>
-
-#include <DataTypes/DataTypeString.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnsNumber.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <IO/WriteBufferFromString.h>
-
-#define STATS_ENABLE_STDVEC_WRAPPERS
-#include <stats.hpp>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int BAD_ARGUMENTS;
-}
-
-static const String BETA = "beta";
-static const String GAMMA = "gamma";
-
-template <bool higher_is_better>
-Variants bayesian_ab_test(String distribution, PODArray<Float64> & xs, PODArray<Float64> & ys)
-{
-    const size_t r = 1000, c = 100;
-
-    Variants variants(xs.size(), {0.0, 0.0, 0.0, 0.0});
-    std::vector<std::vector<Float64>> samples_matrix;
-
-    for (size_t i = 0; i < xs.size(); ++i)
-    {
-        variants[i].x = xs[i];
-        variants[i].y = ys[i];
-    }
-
-    if (distribution == BETA)
-    {
-        Float64 alpha, beta;
-
-        for (size_t i = 0; i < xs.size(); ++i)
-            if (xs[i] < ys[i])
-                throw Exception("Conversions cannot be larger than trials", ErrorCodes::BAD_ARGUMENTS);
-
-        for (size_t i = 0; i < xs.size(); ++i)
-        {
-            alpha = 1.0 + ys[i];
-            beta = 1.0 + xs[i] - ys[i];
-
-            samples_matrix.emplace_back(stats::rbeta<std::vector<Float64>>(r, c, alpha, beta));
-        }
-    }
-    else if (distribution == GAMMA)
-    {
-        Float64 shape, scale;
-
-        for (size_t i = 0; i < xs.size(); ++i)
-        {
-            shape = 1.0 + xs[i];
-            scale = 250.0 / (1 + 250.0 * ys[i]);
-
-            std::vector<Float64> samples = stats::rgamma<std::vector<Float64>>(r, c, shape, scale);
-            for (auto & sample : samples)
-                sample = 1 / sample;
-            samples_matrix.emplace_back(std::move(samples));
-        }
-    }
-
-    PODArray<Float64> means;
-    for (auto & samples : samples_matrix)
-    {
-        Float64 total = 0.0;
-        for (auto sample : samples)
-            total += sample;
-        means.push_back(total / samples.size());
-    }
-
-    // Beats control
-    for (size_t i = 1; i < xs.size(); ++i)
-    {
-        for (size_t n = 0; n < r * c; ++n)
-        {
-            if (higher_is_better)
-            {
-                if (samples_matrix[i][n] > samples_matrix[0][n])
-                    ++variants[i].beats_control;
-            }
-            else
-            {
-                if (samples_matrix[i][n] < samples_matrix[0][n])
-                    ++variants[i].beats_control;
-            }
-        }
-    }
-
-    for (auto & variant : variants)
-        variant.beats_control = static_cast<Float64>(variant.beats_control) / r / c;
-
-    // To be best
-    PODArray<size_t> count_m(xs.size(), 0);
-    PODArray<Float64> row(xs.size(), 0);
-
-    for (size_t n = 0; n < r * c; ++n)
-    {
-        for (size_t i = 0; i < xs.size(); ++i)
-            row[i] = samples_matrix[i][n];
-
-        Float64 m;
-        if (higher_is_better)
-            m = *std::max_element(row.begin(), row.end());
-        else
-            m = *std::min_element(row.begin(), row.end());
-
-        for (size_t i = 0; i < xs.size(); ++i)
-        {
-            if (m == samples_matrix[i][n])
-            {
-                ++variants[i].best;
-                break;
-            }
-        }
-    }
-
-    for (auto & variant : variants)
-        variant.best = static_cast<Float64>(variant.best) / r / c;
-
-    return variants;
-}
-
-String convertToJson(const PODArray<String> & variant_names, const Variants & variants)
-{
-    FormatSettings settings;
-
-    WriteBufferFromOwnString buf;
-
-    writeCString("{\"data\":[", buf);
-    for (size_t i = 0; i < variants.size(); ++i)
-    {
-        writeCString("{\"variant_name\":", buf);
-        writeJSONString(variant_names[i], buf, settings);
-        writeCString(",\"x\":", buf);
-        writeText(variants[i].x, buf);
-        writeCString(",\"y\":", buf);
-        writeText(variants[i].y, buf);
-        writeCString(",\"beats_control\":", buf);
-        writeText(variants[i].beats_control, buf);
-        writeCString(",\"to_be_best\":", buf);
-        writeText(variants[i].best, buf);
-        writeCString("}", buf);
-        if (i != variant_names.size() -1)
-            writeCString(",", buf);
-    }
-    writeCString("]}", buf);
-
-    return buf.str();
-}
-
-class FunctionBayesAB : public IFunction
-{
-public:
-    static constexpr auto name = "bayesAB";
-
-    static FunctionPtr create(ContextPtr)
-    {
-        return std::make_shared<FunctionBayesAB>();
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return false; }
-
-    size_t getNumberOfArguments() const override { return 5; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    static bool toFloat64(const ColumnConst * col_const_arr, PODArray<Float64> & output)
-    {
-        Array src_arr = col_const_arr->getValue<Array>();
-
-        for (size_t i = 0, size = src_arr.size(); i < size; ++i)
-        {
-            switch (src_arr[i].getType())
-            {
-                case Field::Types::Int64:
-                    output.push_back(static_cast<Float64>(src_arr[i].get<const Int64 &>()));
-                    break;
-                case Field::Types::UInt64:
-                    output.push_back(static_cast<Float64>(src_arr[i].get<const UInt64 &>()));
-                    break;
-                case Field::Types::Float64:
-                    output.push_back(src_arr[i].get<const Float64 &>());
-                    break;
-                default:
-                    return false;
-            }
-        }
-
-        return true;
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        if (input_rows_count == 0)
-            return ColumnString::create();
-
-        PODArray<Float64> xs, ys;
-        PODArray<String> variant_names;
-        String dist;
-        bool higher_is_better;
-
-        if (const ColumnConst * col_dist = checkAndGetColumnConst<ColumnString>(arguments[0].column.get()))
-        {
-            dist = col_dist->getDataAt(0).data;
-            dist = Poco::toLower(dist);
-            if (dist != BETA && dist != GAMMA)
-                throw Exception("First argument for function " + getName() + " cannot be " + dist, ErrorCodes::BAD_ARGUMENTS);
-        }
-        else
-            throw Exception("First argument for function " + getName() + " must be Constant string", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        if (const ColumnConst * col_higher_is_better = checkAndGetColumnConst<ColumnUInt8>(arguments[1].column.get()))
-            higher_is_better = col_higher_is_better->getBool(0);
-        else
-            throw Exception("Second argument for function " + getName() + " must be Constant boolean", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        if (const ColumnConst * col_const_arr = checkAndGetColumnConst<ColumnArray>(arguments[2].column.get()))
-        {
-            Array src_arr = col_const_arr->getValue<Array>();
-
-            for (size_t i = 0; i < src_arr.size(); ++i)
-            {
-                if (src_arr[i].getType() != Field::Types::String)
-                    throw Exception("Third argument for function " + getName() + " must be Array of constant strings", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-                variant_names.push_back(src_arr[i].get<const String &>());
-            }
-        }
-        else
-            throw Exception("Third argument for function " + getName() + " must be Array of constant strings", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        if (const ColumnConst * col_const_arr = checkAndGetColumnConst<ColumnArray>(arguments[3].column.get()))
-        {
-            if (!toFloat64(col_const_arr, xs))
-                throw Exception("Forth and fifth Argument for function " + getName() + " must be Array of constant Numbers", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        }
-        else
-            throw Exception("Forth argument for function " + getName() + " must be Array of constant numbers", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        if (const ColumnConst * col_const_arr = checkAndGetColumnConst<ColumnArray>(arguments[4].column.get()))
-        {
-            if (!toFloat64(col_const_arr, ys))
-                throw Exception("Fifth Argument for function " + getName() + " must be Array of constant Numbers", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        }
-        else
-            throw Exception("Fifth argument for function " + getName() + " must be Array of constant numbers", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-        if (variant_names.size() != xs.size() || xs.size() != ys.size())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Sizes of arguments doesn't match: variant_names: {}, xs: {}, ys: {}", variant_names.size(), xs.size(), ys.size());
-
-        if (variant_names.size() < 2)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Sizes of arguments must be larger than 1. variant_names: {}, xs: {}, ys: {}", variant_names.size(), xs.size(), ys.size());
-
-        if (std::count_if(xs.begin(), xs.end(), [](Float64 v) { return v < 0; }) > 0 ||
-            std::count_if(ys.begin(), ys.end(), [](Float64 v) { return v < 0; }) > 0)
-            throw Exception("Negative values don't allowed", ErrorCodes::BAD_ARGUMENTS);
-
-        Variants variants;
-        if (higher_is_better)
-            variants = bayesian_ab_test<true>(dist, xs, ys);
-        else
-            variants = bayesian_ab_test<false>(dist, xs, ys);
-
-        auto dst = ColumnString::create();
-        std::string result_str = convertToJson(variant_names, variants);
-        dst->insertData(result_str.c_str(), result_str.length());
-        return dst;
-    }
-};
-
-void registerFunctionBayesAB(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionBayesAB>();
-}
-
-}
-
-#else
-
-namespace DB
-{
-
-class FunctionFactory;
-
-void registerFunctionBayesAB(FunctionFactory & /* factory */)
-{
-}
-
-}
-
-#endif
diff --git a/src/Functions/abtesting.h b/src/Functions/abtesting.h
deleted file mode 100644
index 0be41db0538..00000000000
--- a/src/Functions/abtesting.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <Common/config.h>
-
-#if !defined(ARCADIA_BUILD) && USE_STATS
-
-#    include <common/types.h>
-#    include <Common/PODArray.h>
-
-#    include <algorithm>
-#    include <iostream>
-#    include <vector>
-
-
-namespace DB
-{
-
-struct Variant
-{
-    Float64 x;
-    Float64 y;
-    Float64 beats_control;
-    Float64 best;
-};
-
-using Variants = PODArray<Variant>;
-
-template <bool higher_is_better>
-Variants bayesian_ab_test(String distribution, PODArray<Float64> & xs, PODArray<Float64> & ys);
-
-String convertToJson(const PODArray<String> & variant_names, const Variants & variants);
-
-}
-
-#endif
diff --git a/src/Functions/addressToLine.cpp b/src/Functions/addressToLine.cpp
index aabf388b428..d513a8767dc 100644
--- a/src/Functions/addressToLine.cpp
+++ b/src/Functions/addressToLine.cpp
@@ -52,6 +52,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1)
diff --git a/src/Functions/addressToSymbol.cpp b/src/Functions/addressToSymbol.cpp
index 7ffdc6d4260..1561e0ee506 100644
--- a/src/Functions/addressToSymbol.cpp
+++ b/src/Functions/addressToSymbol.cpp
@@ -44,6 +44,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1)
diff --git a/src/Functions/aes_decrypt_mysql.cpp b/src/Functions/aes_decrypt_mysql.cpp
index d5d7a6660e4..764fcf06c1a 100644
--- a/src/Functions/aes_decrypt_mysql.cpp
+++ b/src/Functions/aes_decrypt_mysql.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 
diff --git a/src/Functions/aes_encrypt_mysql.cpp b/src/Functions/aes_encrypt_mysql.cpp
index bdf7d8d2cce..1d84824d9d6 100644
--- a/src/Functions/aes_encrypt_mysql.cpp
+++ b/src/Functions/aes_encrypt_mysql.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 64687b8c166..698eeeed5f6 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -4,7 +4,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -34,6 +34,8 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
 
 private:
     size_t getNumberOfArguments() const override
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index 3609398bc3f..029e33db0cf 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -53,6 +53,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     /// Called if at least one function argument is a lambda expression.
     /// For argument-lambda expressions, it defines the types of arguments of these expressions.
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index 1f513defc6f..72380c0a2bf 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -23,6 +23,7 @@ public:
     bool useDefaultImplementationForConstants() const override { return true; }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/array/arrayAggregation.cpp b/src/Functions/array/arrayAggregation.cpp
index 3d40dfe83ea..da2304e1bb6 100644
--- a/src/Functions/array/arrayAggregation.cpp
+++ b/src/Functions/array/arrayAggregation.cpp
@@ -5,7 +5,7 @@
 #include <Columns/ColumnDecimal.h>
 #include "FunctionArrayMapped.h"
 #include <Functions/FunctionFactory.h>
-#include <common/defines.h>
+#include <base/defines.h>
 
 
 namespace DB
@@ -71,7 +71,7 @@ struct ArrayAggregateResultImpl<ArrayElement, AggregateOperation::sum>
         std::conditional_t<std::is_same_v<ArrayElement, UInt128>, UInt128,
         std::conditional_t<std::is_same_v<ArrayElement, Int256>, Int256,
         std::conditional_t<std::is_same_v<ArrayElement, UInt256>, UInt256,
-        std::conditional_t<IsDecimalNumber<ArrayElement>, Decimal128,
+        std::conditional_t<is_decimal<ArrayElement>, Decimal128,
         std::conditional_t<std::is_floating_point_v<ArrayElement>, Float64,
         std::conditional_t<std::is_signed_v<ArrayElement>, Int64,
             UInt64>>>>>>>;
@@ -135,8 +135,8 @@ struct ArrayAggregateImpl
     static NO_SANITIZE_UNDEFINED bool executeType(const ColumnPtr & mapped, const ColumnArray::Offsets & offsets, ColumnPtr & res_ptr)
     {
         using ResultType = ArrayAggregateResult<Element, aggregate_operation>;
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResultType = std::conditional_t<IsDecimalNumber<ResultType>, ColumnDecimal<ResultType>, ColumnVector<ResultType>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResultType = ColumnVectorOrDecimal<ResultType>;
 
         /// For average and product of array we return Float64 as result, but we want to keep precision
         /// so we convert to Float64 as last step, but intermediate value is represented as result of sum operation
@@ -160,7 +160,7 @@ struct ArrayAggregateImpl
             const auto & data = checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
 
             typename ColVecResultType::MutablePtr res_column;
-            if constexpr (IsDecimalNumber<Element>)
+            if constexpr (is_decimal<Element>)
                 res_column = ColVecResultType::create(offsets.size(), data.getScale());
             else
                 res_column = ColVecResultType::create(offsets.size());
@@ -183,7 +183,7 @@ struct ArrayAggregateImpl
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::average)
                 {
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         res[i] = DecimalUtils::convertTo<ResultType>(x, data.getScale());
                     }
@@ -197,7 +197,7 @@ struct ArrayAggregateImpl
                     size_t array_size = offsets[i] - pos;
                     AggregationType product = x;
 
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         using T = decltype(x.value);
                         T x_val = x.value;
@@ -235,7 +235,7 @@ struct ArrayAggregateImpl
         const auto & data = column->getData();
 
         typename ColVecResultType::MutablePtr res_column;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_column = ColVecResultType::create(offsets.size(), data.getScale());
         else
             res_column = ColVecResultType::create(offsets.size());
@@ -250,7 +250,7 @@ struct ArrayAggregateImpl
             /// Array is empty
             if (offsets[i] == pos)
             {
-                if constexpr (IsDecimalNumber<AggregationType>)
+                if constexpr (is_decimal<AggregationType>)
                     res[i] = aggregate_value.value;
                 else
                     res[i] = aggregate_value;
@@ -286,7 +286,7 @@ struct ArrayAggregateImpl
                 }
                 else if constexpr (aggregate_operation == AggregateOperation::product)
                 {
-                    if constexpr (IsDecimalNumber<Element>)
+                    if constexpr (is_decimal<Element>)
                     {
                         using AggregateValueDecimalUnderlyingValue = decltype(aggregate_value.value);
                         AggregateValueDecimalUnderlyingValue current_aggregate_value = aggregate_value.value;
@@ -306,7 +306,7 @@ struct ArrayAggregateImpl
 
             if constexpr (aggregate_operation == AggregateOperation::average)
             {
-                if constexpr (IsDecimalNumber<Element>)
+                if constexpr (is_decimal<Element>)
                 {
                     aggregate_value = aggregate_value / AggregationType(count);
                     res[i] = DecimalUtils::convertTo<ResultType>(aggregate_value, data.getScale());
@@ -316,7 +316,7 @@ struct ArrayAggregateImpl
                     res[i] = static_cast<ResultType>(aggregate_value) / count;
                 }
             }
-            else if constexpr (aggregate_operation == AggregateOperation::product && IsDecimalNumber<Element>)
+            else if constexpr (aggregate_operation == AggregateOperation::product && is_decimal<Element>)
             {
                 auto result_scale = data.getScale() * count;
 
diff --git a/src/Functions/array/arrayCompact.cpp b/src/Functions/array/arrayCompact.cpp
index e0f73207da8..7914b9a154e 100644
--- a/src/Functions/array/arrayCompact.cpp
+++ b/src/Functions/array/arrayCompact.cpp
@@ -16,7 +16,6 @@ namespace ErrorCodes
 
 struct ArrayCompactImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -29,7 +28,7 @@ struct ArrayCompactImpl
     template <typename T>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColVecType = ColumnVectorOrDecimal<T>;
 
         const ColVecType * src_values_column = checkAndGetColumn<ColVecType>(mapped.get());
 
@@ -40,7 +39,7 @@ struct ArrayCompactImpl
         const typename ColVecType::Container & src_values = src_values_column->getData();
 
         typename ColVecType::MutablePtr res_values_column;
-        if constexpr (IsDecimalNumber<T>)
+        if constexpr (is_decimal<T>)
             res_values_column = ColVecType::create(src_values.size(), src_values.getScale());
         else
             res_values_column = ColVecType::create(src_values.size());
@@ -129,6 +128,7 @@ struct ArrayCompactImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (!(executeType< UInt8 >(mapped, array, res) ||
             executeType< UInt16>(mapped, array, res) ||
             executeType< UInt32>(mapped, array, res) ||
diff --git a/src/Functions/array/arrayConcat.cpp b/src/Functions/array/arrayConcat.cpp
index 0a689714eb4..0a8f289ab3f 100644
--- a/src/Functions/array/arrayConcat.cpp
+++ b/src/Functions/array/arrayConcat.cpp
@@ -7,7 +7,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -32,6 +32,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/arrayCumSum.cpp b/src/Functions/array/arrayCumSum.cpp
index 9a6eafb8822..da8ef3d7852 100644
--- a/src/Functions/array/arrayCumSum.cpp
+++ b/src/Functions/array/arrayCumSum.cpp
@@ -83,8 +83,8 @@ struct ArrayCumSumImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -99,7 +99,7 @@ struct ArrayCumSumImpl
             const IColumn::Offsets & offsets = array.getOffsets();
 
             typename ColVecResult::MutablePtr res_nested;
-            if constexpr (IsDecimalNumber<Element>)
+            if constexpr (is_decimal<Element>)
             {
                 const typename ColVecType::Container & data =
                     checkAndGetColumn<ColVecType>(&column_const->getDataColumn())->getData();
@@ -119,7 +119,7 @@ struct ArrayCumSumImpl
         const IColumn::Offsets & offsets = array.getOffsets();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
diff --git a/src/Functions/array/arrayCumSumNonNegative.cpp b/src/Functions/array/arrayCumSumNonNegative.cpp
index 288422c1c9c..c40df27c1cc 100644
--- a/src/Functions/array/arrayCumSumNonNegative.cpp
+++ b/src/Functions/array/arrayCumSumNonNegative.cpp
@@ -19,7 +19,6 @@ namespace ErrorCodes
   */
 struct ArrayCumSumNonNegativeImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -71,8 +70,8 @@ struct ArrayCumSumNonNegativeImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -83,7 +82,7 @@ struct ArrayCumSumNonNegativeImpl
         const typename ColVecType::Container & data = column->getData();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
@@ -100,6 +99,7 @@ struct ArrayCumSumNonNegativeImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (executeType< UInt8 , UInt64>(mapped, array, res) ||
             executeType< UInt16, UInt64>(mapped, array, res) ||
             executeType< UInt32, UInt64>(mapped, array, res) ||
diff --git a/src/Functions/array/arrayDifference.cpp b/src/Functions/array/arrayDifference.cpp
index 7d11c6e89c8..97243f2cf74 100644
--- a/src/Functions/array/arrayDifference.cpp
+++ b/src/Functions/array/arrayDifference.cpp
@@ -20,7 +20,6 @@ namespace ErrorCodes
   */
 struct ArrayDifferenceImpl
 {
-    static bool useDefaultImplementationForConstants() { return true; }
     static bool needBoolean() { return false; }
     static bool needExpression() { return false; }
     static bool needOneArray() { return false; }
@@ -65,7 +64,7 @@ struct ArrayDifferenceImpl
             {
                 Element curr = src[pos];
 
-                if constexpr (IsDecimalNumber<Element>)
+                if constexpr (is_decimal<Element>)
                 {
                     using ResultNativeType = typename Result::NativeType;
 
@@ -93,8 +92,8 @@ struct ArrayDifferenceImpl
     template <typename Element, typename Result>
     static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
     {
-        using ColVecType = std::conditional_t<IsDecimalNumber<Element>, ColumnDecimal<Element>, ColumnVector<Element>>;
-        using ColVecResult = std::conditional_t<IsDecimalNumber<Result>, ColumnDecimal<Result>, ColumnVector<Result>>;
+        using ColVecType = ColumnVectorOrDecimal<Element>;
+        using ColVecResult = ColumnVectorOrDecimal<Result>;
 
         const ColVecType * column = checkAndGetColumn<ColVecType>(&*mapped);
 
@@ -105,7 +104,7 @@ struct ArrayDifferenceImpl
         const typename ColVecType::Container & data = column->getData();
 
         typename ColVecResult::MutablePtr res_nested;
-        if constexpr (IsDecimalNumber<Element>)
+        if constexpr (is_decimal<Element>)
             res_nested = ColVecResult::create(0, data.getScale());
         else
             res_nested = ColVecResult::create();
@@ -129,6 +128,7 @@ struct ArrayDifferenceImpl
     {
         ColumnPtr res;
 
+        mapped = mapped->convertToFullColumnIfConst();
         if (executeType< UInt8 ,  Int16>(mapped, array, res) ||
             executeType< UInt16,  Int32>(mapped, array, res) ||
             executeType< UInt32,  Int64>(mapped, array, res) ||
diff --git a/src/Functions/array/arrayDistinct.cpp b/src/Functions/array/arrayDistinct.cpp
index 916af560c8f..e71a582bbe0 100644
--- a/src/Functions/array/arrayDistinct.cpp
+++ b/src/Functions/array/arrayDistinct.cpp
@@ -38,6 +38,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
diff --git a/src/Functions/array/arrayElement.cpp b/src/Functions/array/arrayElement.cpp
index d39a865133e..887203ae58e 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -1,6 +1,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
+#include <Functions/castTypeToEither.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -47,6 +48,7 @@ public:
     String getName() const override;
 
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 2; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
@@ -94,32 +96,30 @@ private:
 
     using Offsets = ColumnArray::Offsets;
 
-    static bool matchKeyToIndex(const IColumn & data, const Offsets & offsets,
-        const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs);
+    static bool matchKeyToIndexNumber(
+        const IColumn & data, const Offsets & offsets, bool is_key_const,
+        const IColumn & index, PaddedPODArray<UInt64> & matched_idxs);
 
-    static bool matchKeyToIndexConst(const IColumn & data, const Offsets & offsets,
+    static bool matchKeyToIndexNumberConst(
+        const IColumn & data, const Offsets & offsets,
         const Field & index, PaddedPODArray<UInt64> & matched_idxs);
 
-    template <typename DataType>
-    static bool matchKeyToIndexNumber(const IColumn & data, const Offsets & offsets,
-        const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs);
+    static bool matchKeyToIndexString(
+        const IColumn & data, const Offsets & offsets, bool is_key_const,
+        const IColumn & index, PaddedPODArray<UInt64> & matched_idxs);
 
-    template <typename DataType>
-    static bool matchKeyToIndexNumberConst(const IColumn & data, const Offsets & offsets,
-        const Field & index, PaddedPODArray<UInt64> & matched_idxs);
-
-    static bool matchKeyToIndexString(const IColumn & data, const Offsets & offsets,
-        const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs);
-
-    static bool matchKeyToIndexFixedString(const IColumn & data, const Offsets & offsets,
-        const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs);
-
-    static bool matchKeyToIndexStringConst(const IColumn & data, const Offsets & offsets,
+    static bool matchKeyToIndexStringConst(
+        const IColumn & data, const Offsets & offsets,
         const Field & index, PaddedPODArray<UInt64> & matched_idxs);
 
     template <typename Matcher>
     static void executeMatchKeyToIndex(const Offsets & offsets,
         PaddedPODArray<UInt64> & matched_idxs, const Matcher & matcher);
+
+    template <typename Matcher>
+    static void executeMatchConstKeyToIndex(
+        size_t num_rows, size_t num_values,
+        PaddedPODArray<UInt64> & matched_idxs, const Matcher & matcher);
 };
 
 
@@ -758,23 +758,11 @@ ColumnPtr FunctionArrayElement::executeTuple(const ColumnsWithTypeAndName & argu
 namespace
 {
 
+template<typename DataColumn, typename IndexColumn>
 struct MatcherString
 {
-    const ColumnString & data;
-    const ColumnString & index;
-
-    bool match(size_t row_data, size_t row_index) const
-    {
-        auto data_ref = data.getDataAt(row_data);
-        auto index_ref = index.getDataAt(row_index);
-        return memequalSmallAllowOverflow15(index_ref.data, index_ref.size, data_ref.data, data_ref.size);
-    }
-};
-
-struct MatcherFixedString
-{
-    const ColumnFixedString & data;
-    const ColumnFixedString & index;
+    const DataColumn & data;
+    const IndexColumn & index;
 
     bool match(size_t row_data, size_t row_index) const
     {
@@ -784,9 +772,10 @@ struct MatcherFixedString
     }
 };
 
+template<typename DataColumn>
 struct MatcherStringConst
 {
-    const ColumnString & data;
+    const DataColumn & data;
     const String & index;
 
     bool match(size_t row_data, size_t /* row_index */) const
@@ -796,23 +785,23 @@ struct MatcherStringConst
     }
 };
 
-template <typename T>
+template <typename DataType, typename IndexType>
 struct MatcherNumber
 {
-    const PaddedPODArray<T> & data;
-    const PaddedPODArray<T> & index;
+    const PaddedPODArray<DataType> & data;
+    const PaddedPODArray<IndexType> & index;
 
     bool match(size_t row_data, size_t row_index) const
     {
-        return data[row_data] == index[row_index];
+        return data[row_data] == static_cast<DataType>(index[row_index]);
     }
 };
 
-template <typename T>
+template <typename DataType>
 struct MatcherNumberConst
 {
-    const PaddedPODArray<T> & data;
-    T index;
+    const PaddedPODArray<DataType> & data;
+    DataType index;
 
     bool match(size_t row_data, size_t /* row_index */) const
     {
@@ -847,147 +836,158 @@ void FunctionArrayElement::executeMatchKeyToIndex(
     }
 }
 
+template <typename Matcher>
+void FunctionArrayElement::executeMatchConstKeyToIndex(
+    size_t num_rows, size_t num_values,
+    PaddedPODArray<UInt64> & matched_idxs, const Matcher & matcher)
+{
+    for (size_t i = 0; i < num_rows; ++i)
+    {
+        bool matched = false;
+        for (size_t j = 0; j < num_values; ++j)
+        {
+            if (matcher.match(j, i))
+            {
+                matched_idxs.push_back(j + 1);
+                matched = true;
+                break;
+            }
+        }
+
+        if (!matched)
+            matched_idxs.push_back(0);
+    }
+}
+
+template <typename F>
+static bool castColumnString(const IColumn * column, F && f)
+{
+    return castTypeToEither<ColumnString, ColumnFixedString>(column, std::forward<F>(f));
+}
+
 bool FunctionArrayElement::matchKeyToIndexStringConst(
     const IColumn & data, const Offsets & offsets,
     const Field & index, PaddedPODArray<UInt64> & matched_idxs)
 {
-    const auto * data_string = checkAndGetColumn<ColumnString>(&data);
-    if (!data_string)
-        return false;
+    return castColumnString(&data, [&](const auto & data_column)
+    {
+        using DataColumn = std::decay_t<decltype(data_column)>;
 
-    if (index.getType() != Field::Types::String)
-        return false;
-
-    MatcherStringConst matcher{*data_string, get<const String &>(index)};
-    executeMatchKeyToIndex(offsets, matched_idxs, matcher);
-    return true;
+        MatcherStringConst<DataColumn> matcher{data_column, get<const String &>(index)};
+        executeMatchKeyToIndex(offsets, matched_idxs, matcher);
+        return true;
+    });
 }
 
 bool FunctionArrayElement::matchKeyToIndexString(
-    const IColumn & data, const Offsets & offsets,
-    const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs)
+    const IColumn & data, const Offsets & offsets, bool is_key_const,
+    const IColumn & index, PaddedPODArray<UInt64> & matched_idxs)
 {
-    const auto * index_string = checkAndGetColumn<ColumnString>(arguments[1].column.get());
-    if (!index_string)
-        return false;
+    return castColumnString(&data, [&](const auto & data_column)
+    {
+        return castColumnString(&index, [&](const auto & index_column)
+        {
+            using DataColumn = std::decay_t<decltype(data_column)>;
+            using IndexColumn = std::decay_t<decltype(index_column)>;
 
-    const auto * data_string = checkAndGetColumn<ColumnString>(&data);
-    if (!data_string)
-        return false;
+            MatcherString<DataColumn, IndexColumn> matcher{data_column, index_column};
+            if (is_key_const)
+                executeMatchConstKeyToIndex(index.size(), data.size(), matched_idxs, matcher);
+            else
+                executeMatchKeyToIndex(offsets, matched_idxs, matcher);
 
-    MatcherString matcher{*data_string, *index_string};
-    executeMatchKeyToIndex(offsets, matched_idxs, matcher);
-    return true;
+            return true;
+        });
+    });
 }
 
-bool FunctionArrayElement::matchKeyToIndexFixedString(
-    const IColumn & data, const Offsets & offsets,
-    const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs)
+template <typename FromType, typename ToType>
+static constexpr bool areConvertibleTypes =
+    std::is_same_v<FromType, ToType>
+        || (is_integer<FromType> && is_integer<ToType>
+            && std::is_convertible_v<FromType, ToType>);
+
+template <typename F>
+static bool castColumnNumeric(const IColumn * column, F && f)
 {
-    const auto * index_string = checkAndGetColumn<ColumnFixedString>(arguments[1].column.get());
-    if (!index_string)
-        return false;
-
-    const auto * data_string = checkAndGetColumn<ColumnFixedString>(&data);
-    if (!data_string)
-        return false;
-
-    MatcherFixedString matcher{*data_string, *index_string};
-    executeMatchKeyToIndex(offsets, matched_idxs, matcher);
-    return true;
+    return castTypeToEither<
+        ColumnVector<UInt8>,
+        ColumnVector<UInt16>,
+        ColumnVector<UInt32>,
+        ColumnVector<UInt64>,
+        ColumnVector<UInt128>,
+        ColumnVector<UInt256>,
+        ColumnVector<Int8>,
+        ColumnVector<Int16>,
+        ColumnVector<Int32>,
+        ColumnVector<Int64>,
+        ColumnVector<Int128>,
+        ColumnVector<Int256>,
+        ColumnVector<UUID>
+    >(column, std::forward<F>(f));
 }
 
-template <typename DataType>
 bool FunctionArrayElement::matchKeyToIndexNumberConst(
     const IColumn & data, const Offsets & offsets,
     const Field & index, PaddedPODArray<UInt64> & matched_idxs)
 {
-    const auto * data_numeric = checkAndGetColumn<ColumnVector<DataType>>(&data);
-    if (!data_numeric)
-        return false;
-
-    std::optional<DataType> index_as_integer;
-    Field::dispatch([&](const auto & value)
+    return castColumnNumeric(&data, [&](const auto & data_column)
     {
-        using FieldType = std::decay_t<decltype(value)>;
-        if constexpr (std::is_same_v<FieldType, DataType> || (is_integer_v<FieldType> && std::is_convertible_v<FieldType, DataType>))
-            index_as_integer = static_cast<DataType>(value);
-    }, index);
+        using DataType = typename std::decay_t<decltype(data_column)>::ValueType;
+        std::optional<DataType> index_as_integer;
 
-    if (!index_as_integer)
-        return false;
+        Field::dispatch([&](const auto & value)
+        {
+            using FieldType = std::decay_t<decltype(value)>;
+            if constexpr (areConvertibleTypes<FieldType, DataType>)
+                index_as_integer = static_cast<DataType>(value);
+        }, index);
 
-    MatcherNumberConst<DataType> matcher{data_numeric->getData(), *index_as_integer};
-    executeMatchKeyToIndex(offsets, matched_idxs, matcher);
-    return true;
+        if (!index_as_integer)
+            return false;
+
+        MatcherNumberConst<DataType> matcher{data_column.getData(), *index_as_integer};
+        executeMatchKeyToIndex(offsets, matched_idxs, matcher);
+        return true;
+    });
 }
 
-template <typename DataType>
 bool FunctionArrayElement::matchKeyToIndexNumber(
-    const IColumn & data, const Offsets & offsets,
-    const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs)
+    const IColumn & data, const Offsets & offsets, bool is_key_const,
+    const IColumn & index, PaddedPODArray<UInt64> & matched_idxs)
 {
-    const auto * index_numeric = checkAndGetColumn<ColumnVector<DataType>>(arguments[1].column.get());
-    if (!index_numeric)
-        return false;
+    return castColumnNumeric(&data, [&](const auto & data_column)
+    {
+        return castColumnNumeric(&index, [&](const auto & index_column)
+        {
+            using DataType = typename std::decay_t<decltype(data_column)>::ValueType;
+            using IndexType = typename std::decay_t<decltype(index_column)>::ValueType;
 
-    const auto * data_numeric = checkAndGetColumn<ColumnVector<DataType>>(&data);
-    if (!data_numeric)
-        return false;
+            if constexpr (areConvertibleTypes<IndexType, DataType>)
+            {
+                MatcherNumber<DataType, IndexType> matcher{data_column.getData(), index_column.getData()};
+                if (is_key_const)
+                    executeMatchConstKeyToIndex(index_column.size(), data_column.size(), matched_idxs, matcher);
+                else
+                    executeMatchKeyToIndex(offsets, matched_idxs, matcher);
 
-    MatcherNumber<DataType> matcher{data_numeric->getData(), index_numeric->getData()};
-    executeMatchKeyToIndex(offsets, matched_idxs, matcher);
-    return true;
-}
+                return true;
+            }
 
-bool FunctionArrayElement::matchKeyToIndex(
-    const IColumn & data, const Offsets & offsets,
-    const ColumnsWithTypeAndName & arguments, PaddedPODArray<UInt64> & matched_idxs)
-{
-    return matchKeyToIndexNumber<UInt8>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UInt16>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UInt32>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UInt64>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UInt128>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UInt256>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<Int8>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<Int16>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<Int32>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<Int64>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<Int128>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<Int256>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UInt256>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexNumber<UUID>(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexString(data, offsets, arguments, matched_idxs)
-        || matchKeyToIndexFixedString(data, offsets, arguments, matched_idxs);
-}
-
-bool FunctionArrayElement::matchKeyToIndexConst(
-    const IColumn & data, const Offsets & offsets,
-    const Field & index, PaddedPODArray<UInt64> & matched_idxs)
-{
-    return matchKeyToIndexNumberConst<UInt8>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UInt16>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UInt32>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UInt64>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UInt128>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UInt256>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<Int8>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<Int16>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<Int32>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<Int64>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<Int128>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<Int256>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexNumberConst<UUID>(data, offsets, index, matched_idxs)
-        || matchKeyToIndexStringConst(data, offsets, index, matched_idxs);
+            return false;
+        });
+    });
 }
 
 ColumnPtr FunctionArrayElement::executeMap(
     const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
-    const ColumnMap * col_map = typeid_cast<const ColumnMap *>(arguments[0].column.get());
-    if (!col_map)
-        return nullptr;
+    const auto * col_map = checkAndGetColumn<ColumnMap>(arguments[0].column.get());
+    const auto * col_const_map = checkAndGetColumnConst<ColumnMap>(arguments[0].column.get());
+    assert(col_map || col_const_map);
+
+    if (col_const_map)
+        col_map = typeid_cast<const ColumnMap *>(&col_const_map->getDataColumn());
 
     const auto & nested_column = col_map->getNestedColumn();
     const auto & keys_data = col_map->getNestedData().getColumn(0);
@@ -999,29 +999,33 @@ ColumnPtr FunctionArrayElement::executeMap(
     indices_column->reserve(input_rows_count);
     auto & indices_data = assert_cast<ColumnVector<UInt64> &>(*indices_column).getData();
 
+    bool executed = false;
     if (!isColumnConst(*arguments[1].column))
     {
-        if (input_rows_count > 0 && !matchKeyToIndex(keys_data, offsets, arguments, indices_data))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal types of arguments: {}, {} for function {}",
-                arguments[0].type->getName(), arguments[1].type->getName(), getName());
+        executed = matchKeyToIndexNumber(keys_data, offsets, !!col_const_map, *arguments[1].column, indices_data)
+            || matchKeyToIndexString(keys_data, offsets, !!col_const_map, *arguments[1].column, indices_data);
     }
     else
     {
         Field index = (*arguments[1].column)[0];
-
-        // Get Matched key's value
-        if (input_rows_count > 0 && !matchKeyToIndexConst(keys_data, offsets, index, indices_data))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal types of arguments: {}, {} for function {}",
-                arguments[0].type->getName(), arguments[1].type->getName(), getName());
+        executed = matchKeyToIndexNumberConst(keys_data, offsets, index, indices_data)
+            || matchKeyToIndexStringConst(keys_data, offsets, index, indices_data);
     }
 
+    if (!executed)
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+            "Illegal types of arguments: {}, {} for function {}",
+            arguments[0].type->getName(), arguments[1].type->getName(), getName());
+
+    ColumnPtr values_array = ColumnArray::create(values_data.getPtr(), nested_column.getOffsetsPtr());
+    if (col_const_map)
+        values_array = ColumnConst::create(values_array, input_rows_count);
+
     /// Prepare arguments to call arrayElement for array with values and calculated indices at previous step.
     ColumnsWithTypeAndName new_arguments =
     {
         {
-            ColumnArray::create(values_data.getPtr(), nested_column.getOffsetsPtr()),
+            values_array,
             std::make_shared<DataTypeArray>(result_type),
             ""
         },
@@ -1065,13 +1069,14 @@ DataTypePtr FunctionArrayElement::getReturnTypeImpl(const DataTypes & arguments)
 
 ColumnPtr FunctionArrayElement::executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
 {
-    /// Check nullability.
-    bool is_array_of_nullable = false;
+    const auto * col_map = checkAndGetColumn<ColumnMap>(arguments[0].column.get());
+    const auto * col_const_map = checkAndGetColumnConst<ColumnMap>(arguments[0].column.get());
 
-    const ColumnMap * col_map = checkAndGetColumn<ColumnMap>(arguments[0].column.get());
-    if (col_map)
+    if (col_map || col_const_map)
         return executeMap(arguments, result_type, input_rows_count);
 
+    /// Check nullability.
+    bool is_array_of_nullable = false;
     const ColumnArray * col_array = nullptr;
     const ColumnArray * col_const_array = nullptr;
 
diff --git a/src/Functions/array/arrayEnumerate.cpp b/src/Functions/array/arrayEnumerate.cpp
index 6d59a2c3805..f7b6a7e9547 100644
--- a/src/Functions/array/arrayEnumerate.cpp
+++ b/src/Functions/array/arrayEnumerate.cpp
@@ -34,6 +34,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/arrayEnumerateExtended.h b/src/Functions/array/arrayEnumerateExtended.h
index 7e4fe24873a..6dfa8d348db 100644
--- a/src/Functions/array/arrayEnumerateExtended.h
+++ b/src/Functions/array/arrayEnumerateExtended.h
@@ -37,6 +37,7 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index 2c999415f33..4d03c52460f 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -96,6 +96,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/array/arrayFlatten.cpp b/src/Functions/array/arrayFlatten.cpp
index 3d286aa0bb4..929ad041b9a 100644
--- a/src/Functions/array/arrayFlatten.cpp
+++ b/src/Functions/array/arrayFlatten.cpp
@@ -24,6 +24,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index a390abc4eaf..c231ddbb373 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -3,10 +3,12 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnMap.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnsNumber.h>
@@ -115,6 +117,13 @@ private:
         [[maybe_unused]] const NullMap * const null_map_data,
         [[maybe_unused]] const NullMap * const null_map_item)
     {
+        if constexpr (std::is_same_v<Data, IColumn> && std::is_same_v<Target, IColumn>)
+        {
+            /// Generic variant is using IColumn::compare function that only allows to compare columns of identical types.
+            if (typeid(data) != typeid(target))
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Columns {} and {} cannot be compared", data.getName(), target.getName());
+        }
+
         const size_t size = offsets.size();
 
         result.resize(size);
@@ -362,26 +371,112 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     size_t getNumberOfArguments() const override { return 2; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].get());
+        auto first_argument_type = arguments[0].type;
+        auto second_argument_type = arguments[1].type;
 
-        if (!array_type)
-            throw Exception("First argument for function " + getName() + " must be an array.",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(first_argument_type.get());
+        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(first_argument_type.get());
 
-        if (!arguments[1]->onlyNull() && !allowArguments(array_type->getNestedType(), arguments[1]))
+        DataTypePtr inner_type;
+
+        /// If map is first argument only has(map_column, key) function is supported
+        if constexpr (std::is_same_v<ConcreteAction, HasAction>)
+        {
+            if (!array_type && !map_type)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument for function {} must be an array or map.",
+                    getName());
+
+            inner_type = map_type ? map_type->getKeyType() : array_type->getNestedType();
+        }
+        else
+        {
+            if (!array_type)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument for function {} must be an array.",
+                    getName());
+
+            inner_type = array_type->getNestedType();
+        }
+
+        if (!second_argument_type->onlyNull() && !allowArguments(inner_type, second_argument_type))
+        {
+            const char * first_argument_type_name = map_type ? "map" : "array";
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Types of array and 2nd argument of function `{}` must be identical up to nullability, cardinality, "
+                "Types of {} and 2nd argument of function `{}` must be identical up to nullability, cardinality, "
                 "numeric types, or Enum and numeric type. Passed: {} and {}.",
-                getName(), arguments[0]->getName(), arguments[1]->getName());
+                first_argument_type_name,
+                getName(),
+                first_argument_type->getName(),
+                second_argument_type->getName());
+        }
 
         return std::make_shared<DataTypeNumber<ResultType>>();
     }
 
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    {
+        if constexpr (std::is_same_v<ConcreteAction, HasAction>)
+        {
+            if (isMap(arguments[0].type))
+            {
+                auto non_const_map_column = arguments[0].column->convertToFullColumnIfConst();
+
+                const auto & map_column = assert_cast<const ColumnMap &>(*non_const_map_column);
+                const auto & map_array_column = map_column.getNestedColumn();
+                auto offsets = map_array_column.getOffsetsPtr();
+                auto keys = map_column.getNestedData().getColumnPtr(0);
+                auto array_column = ColumnArray::create(std::move(keys), std::move(offsets));
+
+                const auto & type_map = assert_cast<const DataTypeMap &>(*arguments[0].type);
+                auto array_type = std::make_shared<DataTypeArray>(type_map.getKeyType());
+
+                auto arguments_copy = arguments;
+                arguments_copy[0].column = std::move(array_column);
+                arguments_copy[0].type = std::move(array_type);
+                arguments_copy[0].name = arguments[0].name;
+
+                return executeArrayImpl(arguments_copy, result_type);
+            }
+        }
+
+        return executeArrayImpl(arguments, result_type);
+    }
+
+private:
+    using ResultType = typename ConcreteAction::ResultType;
+    using ResultColumnType = ColumnVector<ResultType>;
+    using ResultColumnPtr = decltype(ResultColumnType::create());
+
+    using NullMaps = std::pair<const NullMap *, const NullMap *>;
+
+    struct ExecutionData
+    {
+        const IColumn& left;
+        const IColumn& right;
+        const ColumnArray::Offsets& offsets;
+        ColumnPtr result_column;
+        NullMaps maps;
+        ResultColumnPtr result { ResultColumnType::create() };
+
+        inline void moveResult() { result_column = std::move(result); }
+    };
+
+    static inline bool allowArguments(const DataTypePtr & inner_type, const DataTypePtr & arg)
+    {
+        auto inner_type_decayed = removeNullable(removeLowCardinality(inner_type));
+        auto arg_decayed = removeNullable(removeLowCardinality(arg));
+
+        return ((isNativeNumber(inner_type_decayed) || isEnum(inner_type_decayed)) && isNativeNumber(arg_decayed))
+            || getLeastSupertype({inner_type_decayed, arg_decayed});
+    }
+
     /**
       * If one or both arguments passed to this function are nullable,
       * we create a new column that contains non-nullable arguments:
@@ -396,7 +491,7 @@ public:
       * (they are vectors of Fields, which may represent the NULL value),
       * they do not require any preprocessing.
       */
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
+    ColumnPtr executeArrayImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
     {
         const ColumnPtr & ptr = arguments[0].column;
 
@@ -411,11 +506,13 @@ public:
         if (col_array)
             nullable = checkAndGetColumn<ColumnNullable>(col_array->getData());
 
-        auto & arg_column = arguments[1].column;
+        const auto & arg_column = arguments[1].column;
         const ColumnNullable * arg_nullable = checkAndGetColumn<ColumnNullable>(*arg_column);
 
         if (!nullable && !arg_nullable)
+        {
             return executeOnNonNullable(arguments, result_type);
+        }
         else
         {
             /**
@@ -475,34 +572,6 @@ public:
         }
     }
 
-private:
-    using ResultType = typename ConcreteAction::ResultType;
-    using ResultColumnType = ColumnVector<ResultType>;
-    using ResultColumnPtr = decltype(ResultColumnType::create());
-
-    using NullMaps = std::pair<const NullMap *, const NullMap *>;
-
-    struct ExecutionData
-    {
-        const IColumn& left;
-        const IColumn& right;
-        const ColumnArray::Offsets& offsets;
-        ColumnPtr result_column;
-        NullMaps maps;
-        ResultColumnPtr result { ResultColumnType::create() };
-
-        inline void moveResult() { result_column = std::move(result); }
-    };
-
-    static inline bool allowArguments(const DataTypePtr & array_inner_type, const DataTypePtr & arg)
-    {
-        auto inner_type_decayed = removeNullable(removeLowCardinality(array_inner_type));
-        auto arg_decayed = removeNullable(removeLowCardinality(arg));
-
-        return ((isNativeNumber(inner_type_decayed) || isEnum(inner_type_decayed)) && isNativeNumber(arg_decayed))
-            || getLeastSupertype({inner_type_decayed, arg_decayed});
-    }
-
 #define INTEGRAL_TPL_PACK UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64
 
     ColumnPtr executeOnNonNullable(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index 4ed2b212875..7df14fd9981 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -20,9 +20,9 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/assert_cast.h>
-#include <Core/TypeListNumber.h>
+#include <base/Typelists.h>
 #include <Interpreters/castColumn.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -46,6 +46,7 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
 
@@ -105,8 +106,8 @@ private:
         NumberExecutor(const UnpackedArrays & arrays_, const DataTypePtr & data_type_, ColumnPtr & result_)
             : arrays(arrays_), data_type(data_type_), result(result_) {}
 
-        template <typename T, size_t>
-        void operator()();
+        template <class T>
+        void operator()(Id<T>);
     };
 
     struct DecimalExecutor
@@ -118,8 +119,8 @@ private:
         DecimalExecutor(const UnpackedArrays & arrays_, const DataTypePtr & data_type_, ColumnPtr & result_)
             : arrays(arrays_), data_type(data_type_), result(result_) {}
 
-        template <typename T, size_t>
-        void operator()();
+        template <class T>
+        void operator()(Id<T>);
     };
 };
 
@@ -402,8 +403,8 @@ ColumnPtr FunctionArrayIntersect::executeImpl(const ColumnsWithTypeAndName & arg
 
     ColumnPtr result_column;
     auto not_nullable_nested_return_type = removeNullable(nested_return_type);
-    TypeListNativeNumbers::forEach(NumberExecutor(arrays, not_nullable_nested_return_type, result_column));
-    TypeListDecimalNumbers::forEach(DecimalExecutor(arrays, not_nullable_nested_return_type, result_column));
+    TLUtils::forEach(TLIntegral{}, NumberExecutor(arrays, not_nullable_nested_return_type, result_column));
+    TLUtils::forEach(TLDecimals{}, DecimalExecutor(arrays, not_nullable_nested_return_type, result_column));
 
     using DateMap = ClearableHashMapWithStackMemory<DataTypeDate::FieldType,
         size_t, DefaultHash<DataTypeDate::FieldType>, INITIAL_SIZE_DEGREE>;
@@ -443,8 +444,8 @@ ColumnPtr FunctionArrayIntersect::executeImpl(const ColumnsWithTypeAndName & arg
     return result_column;
 }
 
-template <typename T, size_t>
-void FunctionArrayIntersect::NumberExecutor::operator()()
+template <class T>
+void FunctionArrayIntersect::NumberExecutor::operator()(Id<T>)
 {
     using Container = ClearableHashMapWithStackMemory<T, size_t, DefaultHash<T>,
         INITIAL_SIZE_DEGREE>;
@@ -453,8 +454,8 @@ void FunctionArrayIntersect::NumberExecutor::operator()()
         result = execute<Container, ColumnVector<T>, true>(arrays, ColumnVector<T>::create());
 }
 
-template <typename T, size_t>
-void FunctionArrayIntersect::DecimalExecutor::operator()()
+template <class T>
+void FunctionArrayIntersect::DecimalExecutor::operator()(Id<T>)
 {
     using Container = ClearableHashMapWithStackMemory<T, size_t, DefaultHash<T>,
         INITIAL_SIZE_DEGREE>;
diff --git a/src/Functions/array/arrayJoin.cpp b/src/Functions/array/arrayJoin.cpp
index da8c4e6e80b..6d9950d9110 100644
--- a/src/Functions/array/arrayJoin.cpp
+++ b/src/Functions/array/arrayJoin.cpp
@@ -45,6 +45,8 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const DataTypeArray * arr = checkAndGetDataType<DataTypeArray>(arguments[0].get());
diff --git a/src/Functions/array/arrayPop.h b/src/Functions/array/arrayPop.h
index 270b5e20f85..1679f14bb43 100644
--- a/src/Functions/array/arrayPop.h
+++ b/src/Functions/array/arrayPop.h
@@ -25,6 +25,7 @@ public:
 
     bool isVariadic() const override { return false; }
     size_t getNumberOfArguments() const override { return 1; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/arrayPush.h b/src/Functions/array/arrayPush.h
index 3a63e7b631d..18815b7cabf 100644
--- a/src/Functions/array/arrayPush.h
+++ b/src/Functions/array/arrayPush.h
@@ -29,6 +29,7 @@ public:
 
     bool isVariadic() const override { return false; }
     size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index e070596e5ee..affa8b9e0fc 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -11,7 +11,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
@@ -45,6 +45,8 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index 18140fe504d..cdafb56a4db 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -13,7 +13,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
@@ -48,6 +48,8 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
diff --git a/src/Functions/array/arrayResize.cpp b/src/Functions/array/arrayResize.cpp
index f8eea06335b..9d2a29b2fb4 100644
--- a/src/Functions/array/arrayResize.cpp
+++ b/src/Functions/array/arrayResize.cpp
@@ -32,6 +32,8 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const size_t number_of_arguments = arguments.size();
diff --git a/src/Functions/array/arrayReverse.cpp b/src/Functions/array/arrayReverse.cpp
index fb4a559b37f..1a6b1aa6c1f 100644
--- a/src/Functions/array/arrayReverse.cpp
+++ b/src/Functions/array/arrayReverse.cpp
@@ -31,6 +31,8 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].get());
diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
index 6a23d6a45d8..87161038d4c 100644
--- a/src/Functions/array/arrayScalarProduct.h
+++ b/src/Functions/array/arrayScalarProduct.h
@@ -105,6 +105,9 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         // Basic type check
diff --git a/src/Functions/array/arraySlice.cpp b/src/Functions/array/arraySlice.cpp
index 567135de884..d6b50f55563 100644
--- a/src/Functions/array/arraySlice.cpp
+++ b/src/Functions/array/arraySlice.cpp
@@ -41,6 +41,8 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const size_t number_of_arguments = arguments.size();
diff --git a/src/Functions/array/arrayUniq.cpp b/src/Functions/array/arrayUniq.cpp
index 62de746f136..8d3393c43c4 100644
--- a/src/Functions/array/arrayUniq.cpp
+++ b/src/Functions/array/arrayUniq.cpp
@@ -39,6 +39,8 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.empty())
diff --git a/src/Functions/array/arrayWithConstant.cpp b/src/Functions/array/arrayWithConstant.cpp
index 578e8bf2296..a178147837c 100644
--- a/src/Functions/array/arrayWithConstant.cpp
+++ b/src/Functions/array/arrayWithConstant.cpp
@@ -35,6 +35,8 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isNativeNumber(arguments[0]))
diff --git a/src/Functions/array/arrayZip.cpp b/src/Functions/array/arrayZip.cpp
index f77b4f6dfe9..6e77d9a5442 100644
--- a/src/Functions/array/arrayZip.cpp
+++ b/src/Functions/array/arrayZip.cpp
@@ -34,6 +34,8 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.empty())
diff --git a/src/Functions/array/emptyArray.cpp b/src/Functions/array/emptyArray.cpp
index 370c51f3e8d..28e9b5ca2e2 100644
--- a/src/Functions/array/emptyArray.cpp
+++ b/src/Functions/array/emptyArray.cpp
@@ -37,6 +37,8 @@ private:
         return std::make_shared<DataTypeArray>(std::make_shared<DataType>());
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return ColumnArray::create(
diff --git a/src/Functions/array/emptyArrayToSingle.cpp b/src/Functions/array/emptyArrayToSingle.cpp
index be387620e60..d6501216bd8 100644
--- a/src/Functions/array/emptyArrayToSingle.cpp
+++ b/src/Functions/array/emptyArrayToSingle.cpp
@@ -34,6 +34,7 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/hasAllAny.h b/src/Functions/array/hasAllAny.h
index 40eba0207ab..cd55fea3521 100644
--- a/src/Functions/array/hasAllAny.h
+++ b/src/Functions/array/hasAllAny.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/range.h>
-#include <common/map.h>
+#include <base/range.h>
+#include <base/map.h>
 
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
@@ -38,6 +38,7 @@ public:
 
     bool isVariadic() const override { return false; }
     size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/array/length.cpp b/src/Functions/array/length.cpp
index 768590c6313..3e41f9e3a38 100644
--- a/src/Functions/array/length.cpp
+++ b/src/Functions/array/length.cpp
@@ -51,7 +51,7 @@ struct NameLength
     static constexpr auto name = "length";
 };
 
-using FunctionLength = FunctionStringOrArrayToT<LengthImpl, NameLength, UInt64>;
+using FunctionLength = FunctionStringOrArrayToT<LengthImpl, NameLength, UInt64, false>;
 
 void registerFunctionLength(FunctionFactory & factory)
 {
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 72d6707c4b2..a5913105146 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -10,7 +10,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include "Columns/ColumnMap.h"
 #include "DataTypes/DataTypeMap.h"
 
@@ -56,6 +56,7 @@ private:
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     void checkTypes(
         DataTypePtr & key_type, DataTypePtr & promoted_val_type, const DataTypePtr & check_key_type, DataTypePtr & check_val_type) const
@@ -230,12 +231,10 @@ private:
                             key = col_fixed->getDataAt(offset + j).toString();
                         else if (const auto * col_str = checkAndGetColumn<ColumnString>(arg.key_column.get()))
                             key = col_str->getDataAt(offset + j).toString();
-                        else
-                            // should not happen
-                            throw Exception(
-                                "Expected String or FixedString, got " + std::string(getTypeName(arg.key_column->getDataType()))
-                                    + " in " + getName(),
-                                ErrorCodes::LOGICAL_ERROR);
+                        else // should not happen
+                            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Expected String or FixedString, got {} in {}",
+                                arg.key_column->getDataType(), getName());
                     }
                     else
                     {
diff --git a/src/Functions/array/mapPopulateSeries.cpp b/src/Functions/array/mapPopulateSeries.cpp
index eb2f6192346..b253a85c95d 100644
--- a/src/Functions/array/mapPopulateSeries.cpp
+++ b/src/Functions/array/mapPopulateSeries.cpp
@@ -1,4 +1,5 @@
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnMap.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnVector.h>
 #include <DataTypes/DataTypeArray.h>
@@ -7,6 +8,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include "Core/ColumnWithTypeAndName.h"
+#include "DataTypes/DataTypeMap.h"
 #include "DataTypes/IDataType.h"
 
 namespace DB
@@ -31,86 +33,213 @@ private:
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    void checkTypes(const DataTypePtr & key_type, const DataTypePtr max_key_type) const
+    {
+        WhichDataType which_key(key_type);
+        if (!(which_key.isInt() || which_key.isUInt()))
+        {
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Keys for {} function should be of integer type (signed or unsigned)", getName());
+        }
+
+        if (max_key_type)
+        {
+            WhichDataType which_max_key(max_key_type);
+
+            if (which_max_key.isNullable())
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Max key argument in arguments of function " + getName() + " can not be Nullable");
+
+            if (key_type->getTypeId() != max_key_type->getTypeId())
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Max key type in {} should be same as keys type", getName());
+        }
+    }
+
+    DataTypePtr getReturnTypeForTuple(const DataTypes & arguments) const
     {
         if (arguments.size() < 2)
-            throw Exception{getName() + " accepts at least two arrays for key and value", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Function {} accepts at least two arrays for key and value", getName());
 
         if (arguments.size() > 3)
-            throw Exception{"too many arguments in " + getName() + " call", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH};
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Too many arguments in {} call", getName());
 
         const DataTypeArray * key_array_type = checkAndGetDataType<DataTypeArray>(arguments[0].get());
         const DataTypeArray * val_array_type = checkAndGetDataType<DataTypeArray>(arguments[1].get());
 
         if (!key_array_type || !val_array_type)
-            throw Exception{getName() + " accepts two arrays for key and value", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Function {} accepts two arrays for key and value", getName());
 
-        DataTypePtr keys_type = key_array_type->getNestedType();
-        WhichDataType which_key(keys_type);
-        if (!(which_key.isNativeInt() || which_key.isNativeUInt()))
-        {
-            throw Exception(
-                "Keys for " + getName() + " should be of native integer type (signed or unsigned)", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        }
+        const auto & key_type = key_array_type->getNestedType();
 
         if (arguments.size() == 3)
-        {
-            DataTypePtr max_key_type = arguments[2];
-            WhichDataType which_max_key(max_key_type);
-
-            if (which_max_key.isNullable())
-                throw Exception(
-                    "Max key argument in arguments of function " + getName() + " can not be Nullable",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-
-            if (keys_type->getTypeId() != max_key_type->getTypeId())
-                throw Exception("Max key type in " + getName() + " should be same as keys type", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-        }
+            this->checkTypes(key_type, arguments[2]);
+        else
+            this->checkTypes(key_type, nullptr);
 
         return std::make_shared<DataTypeTuple>(DataTypes{arguments[0], arguments[1]});
     }
 
-    template <typename KeyType, typename ValType>
-    ColumnPtr execute2(ColumnPtr key_column, ColumnPtr val_column, ColumnPtr max_key_column, const DataTypeTuple & res_type) const
+    DataTypePtr getReturnTypeForMap(const DataTypes & arguments) const
     {
-        MutableColumnPtr res_tuple = res_type.createColumn();
+        const auto * map = assert_cast<const DataTypeMap *>(arguments[0].get());
+        if (arguments.size() == 1)
+            this->checkTypes(map->getKeyType(), nullptr);
+        else if (arguments.size() == 2)
+            this->checkTypes(map->getKeyType(), arguments[1]);
+        else
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Too many arguments in {} call", getName());
 
-        auto * to_tuple = assert_cast<ColumnTuple *>(res_tuple.get());
-        auto & to_keys_arr = assert_cast<ColumnArray &>(to_tuple->getColumn(0));
-        auto & to_keys_data = to_keys_arr.getData();
-        auto & to_keys_offsets = to_keys_arr.getOffsets();
+        return std::make_shared<DataTypeMap>(map->getKeyType(), map->getValueType());
+    }
 
-        auto & to_vals_arr = assert_cast<ColumnArray &>(to_tuple->getColumn(1));
-        auto & to_values_data = to_vals_arr.getData();
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, getName() + " accepts at least one map or two arrays");
 
-        bool max_key_is_const = false, key_is_const = false, val_is_const = false;
+        if (arguments[0]->getTypeId() == TypeIndex::Array)
+            return getReturnTypeForTuple(arguments);
+        else if (arguments[0]->getTypeId() == TypeIndex::Map)
+            return getReturnTypeForMap(arguments);
+        else
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Function {} only accepts one map or arrays, but got {}",
+                getName(),
+                arguments[0]->getName());
+    }
 
-        const auto * keys_array = checkAndGetColumn<ColumnArray>(key_column.get());
-        if (!keys_array)
+    // Struct holds input and output columns references,
+    // Both arrays and maps have similar columns to work with but extracted differently
+    template <typename KeyType, typename ValType>
+    struct ColumnsInOut
+    {
+        // inputs
+        const PaddedPODArray<KeyType> & in_keys_data;
+        const PaddedPODArray<ValType> & in_vals_data;
+        const IColumn::Offsets & in_key_offsets;
+        const IColumn::Offsets & in_val_offsets;
+        size_t row_count;
+        bool key_is_const;
+        bool val_is_const;
+
+        // outputs
+        PaddedPODArray<KeyType> & out_keys_data;
+        PaddedPODArray<ValType> & out_vals_data;
+
+        IColumn::Offsets & out_keys_offsets;
+        // with map argument this field will not be used
+        IColumn::Offsets * out_vals_offsets;
+    };
+
+    template <typename KeyType, typename ValType>
+    ColumnsInOut<KeyType, ValType> getInOutDataFromArrays(MutableColumnPtr & res_column, ColumnPtr * arg_columns) const
+    {
+        auto * out_tuple = assert_cast<ColumnTuple *>(res_column.get());
+        auto & out_keys_array = assert_cast<ColumnArray &>(out_tuple->getColumn(0));
+        auto & out_vals_array = assert_cast<ColumnArray &>(out_tuple->getColumn(1));
+
+        const auto * key_column = arg_columns[0].get();
+        const auto * in_keys_array = checkAndGetColumn<ColumnArray>(key_column);
+
+        bool key_is_const = false, val_is_const = false;
+
+        if (!in_keys_array)
         {
-            const ColumnConst * const_array = checkAndGetColumnConst<ColumnArray>(key_column.get());
+            const ColumnConst * const_array = checkAndGetColumnConst<ColumnArray>(key_column);
             if (!const_array)
-                throw Exception("Expected array column, found " + key_column->getName(), ErrorCodes::ILLEGAL_COLUMN);
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN, "Expected array column in function {}, found {}", getName(), key_column->getName());
 
-            keys_array = checkAndGetColumn<ColumnArray>(const_array->getDataColumnPtr().get());
+            in_keys_array = checkAndGetColumn<ColumnArray>(const_array->getDataColumnPtr().get());
             key_is_const = true;
         }
 
-        const auto * values_array = checkAndGetColumn<ColumnArray>(val_column.get());
-        if (!values_array)
+        const auto * val_column = arg_columns[1].get();
+        const auto * in_values_array = checkAndGetColumn<ColumnArray>(val_column);
+        if (!in_values_array)
         {
-            const ColumnConst * const_array = checkAndGetColumnConst<ColumnArray>(val_column.get());
+            const ColumnConst * const_array = checkAndGetColumnConst<ColumnArray>(val_column);
             if (!const_array)
-                throw Exception("Expected array column, found " + val_column->getName(), ErrorCodes::ILLEGAL_COLUMN);
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN, "Expected array column in function {}, found {}", getName(), val_column->getName());
 
-            values_array = checkAndGetColumn<ColumnArray>(const_array->getDataColumnPtr().get());
+            in_values_array = checkAndGetColumn<ColumnArray>(const_array->getDataColumnPtr().get());
             val_is_const = true;
         }
 
-        if (!keys_array || !values_array)
+        if (!in_keys_array || !in_values_array)
             /* something went wrong */
-            throw Exception{"Illegal columns in arguments of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal columns in arguments of function " + getName());
+
+        const auto & in_keys_data = assert_cast<const ColumnVector<KeyType> &>(in_keys_array->getData()).getData();
+        const auto & in_values_data = assert_cast<const ColumnVector<ValType> &>(in_values_array->getData()).getData();
+        const auto & in_keys_offsets = in_keys_array->getOffsets();
+        const auto & in_vals_offsets = in_values_array->getOffsets();
+
+        auto & out_keys_data = assert_cast<ColumnVector<KeyType> &>(out_keys_array.getData()).getData();
+        auto & out_vals_data = assert_cast<ColumnVector<ValType> &>(out_vals_array.getData()).getData();
+        auto & out_keys_offsets = out_keys_array.getOffsets();
+
+        size_t row_count = key_is_const ? in_values_array->size() : in_keys_array->size();
+        IColumn::Offsets * out_vals_offsets = &out_vals_array.getOffsets();
+
+        return {
+            in_keys_data,
+            in_values_data,
+            in_keys_offsets,
+            in_vals_offsets,
+            row_count,
+            key_is_const,
+            val_is_const,
+            out_keys_data,
+            out_vals_data,
+            out_keys_offsets,
+            out_vals_offsets};
+    }
+
+    template <typename KeyType, typename ValType>
+    ColumnsInOut<KeyType, ValType> getInOutDataFromMap(MutableColumnPtr & res_column, ColumnPtr * arg_columns) const
+    {
+        const auto * in_map = assert_cast<const ColumnMap *>(arg_columns[0].get());
+        const auto & in_nested_array = in_map->getNestedColumn();
+        const auto & in_nested_tuple = in_map->getNestedData();
+        const auto & in_keys_data = assert_cast<const ColumnVector<KeyType> &>(in_nested_tuple.getColumn(0)).getData();
+        const auto & in_vals_data = assert_cast<const ColumnVector<ValType> &>(in_nested_tuple.getColumn(1)).getData();
+        const auto & in_keys_offsets = in_nested_array.getOffsets();
+
+        auto * out_map = assert_cast<ColumnMap *>(res_column.get());
+        auto & out_nested_array = out_map->getNestedColumn();
+        auto & out_nested_tuple = out_map->getNestedData();
+        auto & out_keys_data = assert_cast<ColumnVector<KeyType> &>(out_nested_tuple.getColumn(0)).getData();
+        auto & out_vals_data = assert_cast<ColumnVector<ValType> &>(out_nested_tuple.getColumn(1)).getData();
+        auto & out_keys_offsets = out_nested_array.getOffsets();
+
+        return {
+            in_keys_data,
+            in_vals_data,
+            in_keys_offsets,
+            in_keys_offsets,
+            in_nested_array.size(),
+            false,
+            false,
+            out_keys_data,
+            out_vals_data,
+            out_keys_offsets,
+            nullptr};
+    }
+
+    template <typename KeyType, typename ValType>
+    ColumnPtr execute2(ColumnPtr * arg_columns, ColumnPtr max_key_column, const DataTypePtr & res_type) const
+    {
+        MutableColumnPtr res_column = res_type->createColumn();
+        bool max_key_is_const = false;
+        auto columns = res_column->getDataType() == TypeIndex::Tuple ? getInOutDataFromArrays<KeyType, ValType>(res_column, arg_columns)
+                                                                     : getInOutDataFromMap<KeyType, ValType>(res_column, arg_columns);
 
         KeyType max_key_const{0};
 
@@ -121,49 +250,43 @@ private:
             max_key_is_const = true;
         }
 
-        auto & keys_data = assert_cast<const ColumnVector<KeyType> &>(keys_array->getData()).getData();
-        auto & values_data = assert_cast<const ColumnVector<ValType> &>(values_array->getData()).getData();
-
-        // Original offsets
-        const IColumn::Offsets & key_offsets = keys_array->getOffsets();
-        const IColumn::Offsets & val_offsets = values_array->getOffsets();
-
         IColumn::Offset offset{0};
-        size_t row_count = key_is_const ? values_array->size() : keys_array->size();
-
         std::map<KeyType, ValType> res_map;
 
         //Iterate through two arrays and fill result values.
-        for (size_t row = 0; row < row_count; ++row)
+        for (size_t row = 0; row < columns.row_count; ++row)
         {
-            size_t key_offset = 0, val_offset = 0, array_size = key_offsets[0], val_array_size = val_offsets[0];
+            size_t key_offset = 0, val_offset = 0, items_count = columns.in_key_offsets[0], val_array_size = columns.in_val_offsets[0];
 
             res_map.clear();
 
-            if (!key_is_const)
+            if (!columns.key_is_const)
             {
-                key_offset = row > 0 ? key_offsets[row - 1] : 0;
-                array_size = key_offsets[row] - key_offset;
+                key_offset = row > 0 ? columns.in_key_offsets[row - 1] : 0;
+                items_count = columns.in_key_offsets[row] - key_offset;
             }
 
-            if (!val_is_const)
+            if (!columns.val_is_const)
             {
-                val_offset = row > 0 ? val_offsets[row - 1] : 0;
-                val_array_size = val_offsets[row] - val_offset;
+                val_offset = row > 0 ? columns.in_val_offsets[row - 1] : 0;
+                val_array_size = columns.in_val_offsets[row] - val_offset;
             }
 
-            if (array_size != val_array_size)
-                throw Exception("Key and value array should have same amount of elements", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+            if (items_count != val_array_size)
+                throw Exception(
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Key and value array should have same amount of elements in function {}",
+                    getName());
 
-            if (array_size == 0)
+            if (items_count == 0)
             {
-                to_keys_offsets.push_back(offset);
+                columns.out_keys_offsets.push_back(offset);
                 continue;
             }
 
-            for (size_t i = 0; i < array_size; ++i)
+            for (size_t i = 0; i < items_count; ++i)
             {
-                res_map.insert({keys_data[key_offset + i], values_data[val_offset + i]});
+                res_map.insert({columns.in_keys_data[key_offset + i], columns.in_vals_data[val_offset + i]});
             }
 
             auto min_key = res_map.begin()->first;
@@ -184,7 +307,7 @@ private:
                 /* no need to add anything, max key is less that first key */
                 if (max_key < min_key)
                 {
-                    to_keys_offsets.push_back(offset);
+                    columns.out_keys_offsets.push_back(offset);
                     continue;
                 }
             }
@@ -197,16 +320,16 @@ private:
             KeyType key;
             for (key = min_key;; ++key)
             {
-                to_keys_data.insert(key);
+                columns.out_keys_data.push_back(key);
 
                 auto it = res_map.find(key);
                 if (it != res_map.end())
                 {
-                    to_values_data.insert(it->second);
+                    columns.out_vals_data.push_back(it->second);
                 }
                 else
                 {
-                    to_values_data.insertDefault();
+                    columns.out_vals_data.push_back(0);
                 }
 
                 ++offset;
@@ -214,80 +337,112 @@ private:
                     break;
             }
 
-            to_keys_offsets.push_back(offset);
+            columns.out_keys_offsets.push_back(offset);
         }
 
-        to_vals_arr.getOffsets().insert(to_keys_offsets.begin(), to_keys_offsets.end());
-        return res_tuple;
+        if (columns.out_vals_offsets)
+            columns.out_vals_offsets->insert(columns.out_keys_offsets.begin(), columns.out_keys_offsets.end());
+
+        return res_column;
     }
 
     template <typename KeyType>
-    ColumnPtr execute1(ColumnPtr key_column, ColumnPtr val_column, ColumnPtr max_key_column, const DataTypeTuple & res_type) const
+    ColumnPtr execute1(ColumnPtr * arg_columns, ColumnPtr max_key_column, const DataTypePtr & res_type, const DataTypePtr & val_type) const
     {
-        const auto & val_type = (assert_cast<const DataTypeArray *>(res_type.getElements()[1].get()))->getNestedType();
         switch (val_type->getTypeId())
         {
             case TypeIndex::Int8:
-                return execute2<KeyType, Int8>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, Int8>(arg_columns, max_key_column, res_type);
             case TypeIndex::Int16:
-                return execute2<KeyType, Int16>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, Int16>(arg_columns, max_key_column, res_type);
             case TypeIndex::Int32:
-                return execute2<KeyType, Int32>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, Int32>(arg_columns, max_key_column, res_type);
             case TypeIndex::Int64:
-                return execute2<KeyType, Int64>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, Int64>(arg_columns, max_key_column, res_type);
+            case TypeIndex::Int128:
+                return execute2<KeyType, Int128>(arg_columns, max_key_column, res_type);
+            case TypeIndex::Int256:
+                return execute2<KeyType, Int256>(arg_columns, max_key_column, res_type);
             case TypeIndex::UInt8:
-                return execute2<KeyType, UInt8>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, UInt8>(arg_columns, max_key_column, res_type);
             case TypeIndex::UInt16:
-                return execute2<KeyType, UInt16>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, UInt16>(arg_columns, max_key_column, res_type);
             case TypeIndex::UInt32:
-                return execute2<KeyType, UInt32>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, UInt32>(arg_columns, max_key_column, res_type);
             case TypeIndex::UInt64:
-                return execute2<KeyType, UInt64>(key_column, val_column, max_key_column, res_type);
+                return execute2<KeyType, UInt64>(arg_columns, max_key_column, res_type);
+            case TypeIndex::UInt128:
+                return execute2<KeyType, UInt128>(arg_columns, max_key_column, res_type);
+            case TypeIndex::UInt256:
+                return execute2<KeyType, UInt256>(arg_columns, max_key_column, res_type);
             default:
-                throw Exception{"Illegal columns in arguments of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal columns in arguments of function " + getName());
         }
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
-        auto col1 = arguments[0];
-        auto col2 = arguments[1];
-
-        const auto * k = assert_cast<const DataTypeArray *>(col1.type.get());
-        const auto * v = assert_cast<const DataTypeArray *>(col2.type.get());
-
-        /* determine output type */
-        const DataTypeTuple & res_type = DataTypeTuple(
-            DataTypes{std::make_shared<DataTypeArray>(k->getNestedType()), std::make_shared<DataTypeArray>(v->getNestedType())});
-
+        DataTypePtr res_type, key_type, val_type;
         ColumnPtr max_key_column = nullptr;
+        ColumnPtr arg_columns[] = {arguments[0].column, nullptr};
 
-        if (arguments.size() == 3)
+        if (arguments[0].type->getTypeId() == TypeIndex::Array)
         {
-            /* max key provided */
-            max_key_column = arguments[2].column;
+            key_type = assert_cast<const DataTypeArray *>(arguments[0].type.get())->getNestedType();
+            val_type = assert_cast<const DataTypeArray *>(arguments[1].type.get())->getNestedType();
+            res_type = getReturnTypeImpl(DataTypes{arguments[0].type, arguments[1].type});
+
+            arg_columns[1] = arguments[1].column;
+            if (arguments.size() == 3)
+            {
+                /* max key provided */
+                max_key_column = arguments[2].column;
+            }
+        }
+        else
+        {
+            assert(arguments[0].type->getTypeId() == TypeIndex::Map);
+
+            const auto * map_type = assert_cast<const DataTypeMap *>(arguments[0].type.get());
+            res_type = getReturnTypeImpl(DataTypes{arguments[0].type});
+            key_type = map_type->getKeyType();
+            val_type = map_type->getValueType();
+
+            if (arguments.size() == 2)
+            {
+                /* max key provided */
+                max_key_column = arguments[1].column;
+            }
         }
 
-        switch (k->getNestedType()->getTypeId())
+        switch (key_type->getTypeId())
         {
             case TypeIndex::Int8:
-                return execute1<Int8>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<Int8>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::Int16:
-                return execute1<Int16>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<Int16>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::Int32:
-                return execute1<Int32>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<Int32>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::Int64:
-                return execute1<Int64>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<Int64>(arg_columns, max_key_column, res_type, val_type);
+            case TypeIndex::Int128:
+                return execute1<Int128>(arg_columns, max_key_column, res_type, val_type);
+            case TypeIndex::Int256:
+                return execute1<Int256>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::UInt8:
-                return execute1<UInt8>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<UInt8>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::UInt16:
-                return execute1<UInt16>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<UInt16>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::UInt32:
-                return execute1<UInt32>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<UInt32>(arg_columns, max_key_column, res_type, val_type);
             case TypeIndex::UInt64:
-                return execute1<UInt64>(col1.column, col2.column, max_key_column, res_type);
+                return execute1<UInt64>(arg_columns, max_key_column, res_type, val_type);
+            case TypeIndex::UInt128:
+                return execute1<UInt128>(arg_columns, max_key_column, res_type, val_type);
+            case TypeIndex::UInt256:
+                return execute1<UInt256>(arg_columns, max_key_column, res_type, val_type);
             default:
-                throw Exception{"Illegal columns in arguments of function " + getName(), ErrorCodes::ILLEGAL_COLUMN};
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal columns in arguments of function " + getName());
         }
     }
 };
@@ -296,5 +451,4 @@ void registerFunctionMapPopulateSeries(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionMapPopulateSeries>();
 }
-
 }
diff --git a/src/Functions/array/range.cpp b/src/Functions/array/range.cpp
index 9eefc4f178d..47e28da536a 100644
--- a/src/Functions/array/range.cpp
+++ b/src/Functions/array/range.cpp
@@ -43,6 +43,7 @@ private:
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/assumeNotNull.cpp b/src/Functions/assumeNotNull.cpp
index 019c637e50c..b180931a83a 100644
--- a/src/Functions/assumeNotNull.cpp
+++ b/src/Functions/assumeNotNull.cpp
@@ -29,6 +29,8 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
diff --git a/src/Functions/bar.cpp b/src/Functions/bar.cpp
index 2e26f7af0bb..0b5e48de067 100644
--- a/src/Functions/bar.cpp
+++ b/src/Functions/bar.cpp
@@ -42,6 +42,9 @@ public:
     {
         return true;
     }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/base64Encode.cpp b/src/Functions/base64Encode.cpp
index 0c038eb5fca..1f181a31144 100644
--- a/src/Functions/base64Encode.cpp
+++ b/src/Functions/base64Encode.cpp
@@ -1,9 +1,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBase64Conversion.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_BASE64
 #    include <DataTypes/DataTypeString.h>
diff --git a/src/Functions/bitAnd.cpp b/src/Functions/bitAnd.cpp
index aa4b7593c79..63f92839638 100644
--- a/src/Functions/bitAnd.cpp
+++ b/src/Functions/bitAnd.cpp
@@ -17,6 +17,7 @@ struct BitAndImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr const bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitBoolMaskAnd.cpp b/src/Functions/bitBoolMaskAnd.cpp
index 9b0ea85f3fd..ec208615363 100644
--- a/src/Functions/bitBoolMaskAnd.cpp
+++ b/src/Functions/bitBoolMaskAnd.cpp
@@ -22,6 +22,7 @@ struct BitBoolMaskAndImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply([[maybe_unused]] A left, [[maybe_unused]] B right)
diff --git a/src/Functions/bitBoolMaskOr.cpp b/src/Functions/bitBoolMaskOr.cpp
index d68a54924d0..595417d04b4 100644
--- a/src/Functions/bitBoolMaskOr.cpp
+++ b/src/Functions/bitBoolMaskOr.cpp
@@ -22,6 +22,7 @@ struct BitBoolMaskOrImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply([[maybe_unused]] A left, [[maybe_unused]] B right)
diff --git a/src/Functions/bitCount.cpp b/src/Functions/bitCount.cpp
index 2890b1a8253..84743ae24ed 100644
--- a/src/Functions/bitCount.cpp
+++ b/src/Functions/bitCount.cpp
@@ -1,4 +1,4 @@
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionUnaryArithmetic.h>
 
@@ -14,6 +14,7 @@ struct BitCountImpl
 {
     using ResultType = UInt8;
     static constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A a)
     {
diff --git a/src/Functions/bitHammingDistance.cpp b/src/Functions/bitHammingDistance.cpp
index 25b902b8bd5..bbb60a764fe 100644
--- a/src/Functions/bitHammingDistance.cpp
+++ b/src/Functions/bitHammingDistance.cpp
@@ -80,6 +80,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isInteger(arguments[0]))
diff --git a/src/Functions/bitNot.cpp b/src/Functions/bitNot.cpp
index 050d8dc3e3d..3e1e69fccc2 100644
--- a/src/Functions/bitNot.cpp
+++ b/src/Functions/bitNot.cpp
@@ -18,6 +18,7 @@ struct BitNotImpl
 {
     using ResultType = typename NumberTraits::ResultOfBitNot<A>::Type;
     static const constexpr bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A a)
     {
diff --git a/src/Functions/bitOr.cpp b/src/Functions/bitOr.cpp
index adf2244bc0a..65847e93b8b 100644
--- a/src/Functions/bitOr.cpp
+++ b/src/Functions/bitOr.cpp
@@ -16,6 +16,7 @@ struct BitOrImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr const bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/bitRotateLeft.cpp b/src/Functions/bitRotateLeft.cpp
index 9962ac174fd..2cddb93e333 100644
--- a/src/Functions/bitRotateLeft.cpp
+++ b/src/Functions/bitRotateLeft.cpp
@@ -17,6 +17,7 @@ struct BitRotateLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitRotateRight.cpp b/src/Functions/bitRotateRight.cpp
index 8352f2f92bc..66664c4ab8d 100644
--- a/src/Functions/bitRotateRight.cpp
+++ b/src/Functions/bitRotateRight.cpp
@@ -17,6 +17,7 @@ struct BitRotateRightImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitShiftLeft.cpp b/src/Functions/bitShiftLeft.cpp
index 96e0fbe6d6f..60e61753d53 100644
--- a/src/Functions/bitShiftLeft.cpp
+++ b/src/Functions/bitShiftLeft.cpp
@@ -17,6 +17,7 @@ struct BitShiftLeftImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
@@ -29,6 +30,118 @@ struct BitShiftLeftImpl
             return static_cast<Result>(a) << static_cast<Result>(b);
     }
 
+    /// For String
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(end - pos) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.push_back(0);
+                out_offsets.push_back(out_offsets.back() + 1);
+                return;
+            }
+
+            size_t shift_left_bits = b % word_size;
+            size_t shift_left_bytes = b / word_size;
+
+            const UInt8 * begin = pos;
+
+            const size_t old_size = out_vec.size();
+            size_t length;
+            if (shift_left_bits)
+                length = end + shift_left_bytes - begin + 1; /// Moving to the left here will make a redundant byte to store the overflowing bits in the front
+            else
+                length = end + shift_left_bytes - begin;
+
+            const size_t new_size = old_size + length + 1;
+            out_vec.resize(new_size);
+            out_vec[old_size + length] = 0;
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(begin);
+            UInt8 * out = out_vec.data() + old_size;
+
+            UInt8 previous = 0;
+            while (op_pointer < end)
+            {
+                if (shift_left_bits)
+                {
+                    /// The left b bit of the right byte is moved to the right b bit of this byte
+                    *out = UInt8(UInt8(*(op_pointer) >> (8 - shift_left_bits)) | previous);
+                    previous = *op_pointer << shift_left_bits;
+                }
+                else
+                {
+                    *out = *op_pointer;
+                }
+                op_pointer++;
+                out++;
+            }
+            if (shift_left_bits)
+            {
+                *out = *(op_pointer - 1) << shift_left_bits;
+                out++;
+            }
+
+            for (size_t i = 0; i < shift_left_bytes; ++i)
+                *(out + i) = 0;
+
+            out_offsets.push_back(new_size);
+        }
+    }
+
+    /// For FixedString
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnFixedString::Chars & out_vec)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftLeft is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            size_t n = end - pos;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(n) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.resize_fill(out_vec.size() + n);
+                return;
+            }
+
+            size_t shift_left_bytes = b / word_size;
+            size_t shift_left_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+
+            const size_t old_size = out_vec.size();
+            const size_t new_size = old_size + n;
+
+            out_vec.resize(new_size);
+
+            UInt8 * op_pointer = const_cast<UInt8 *>(begin + shift_left_bytes);
+            UInt8 * out = out_vec.data() + old_size;
+
+            while (op_pointer < end)
+            {
+                *out = *op_pointer << shift_left_bits;
+                if (op_pointer + 1 < end)
+                {
+                    /// The left b bit of the right byte is moved to the right b bit of this byte
+                    *out = UInt8(UInt8(*(op_pointer + 1) >> (8 - shift_left_bits)) | *out);
+                }
+                op_pointer++;
+                out++;
+            }
+
+            for (size_t i = 0; i < shift_left_bytes; ++i)
+                *(out + i) = 0;
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
diff --git a/src/Functions/bitShiftRight.cpp b/src/Functions/bitShiftRight.cpp
index 37c3908f8de..f3e16e4ed62 100644
--- a/src/Functions/bitShiftRight.cpp
+++ b/src/Functions/bitShiftRight.cpp
@@ -1,5 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
+#include <Common/hex.h>
 
 namespace DB
 {
@@ -17,6 +18,7 @@ struct BitShiftRightImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = true;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
@@ -29,6 +31,95 @@ struct BitShiftRightImpl
             return static_cast<Result>(a) >> static_cast<Result>(b);
     }
 
+    static inline NO_SANITIZE_UNDEFINED void bitShiftRightForBytes(const UInt8 * op_pointer, const UInt8 * begin, UInt8 * out, const size_t shift_right_bits)
+    {
+        while (op_pointer > begin)
+        {
+            op_pointer--;
+            out--;
+            *out = *op_pointer >> shift_right_bits;
+            if (op_pointer - 1 >= begin)
+            {
+                /// The right b bit of the left byte is moved to the left b bit of this byte
+                *out = UInt8(UInt8(*(op_pointer - 1) << (8 - shift_right_bits)) | *out);
+            }
+        }
+    }
+
+    /// For String
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnString::Chars & out_vec, ColumnString::Offsets & out_offsets)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(end - pos) * word_size) || b < 0)
+            {
+                /// insert default value
+                out_vec.push_back(0);
+                out_offsets.push_back(out_offsets.back() + 1);
+                return;
+            }
+
+            size_t shift_right_bytes = b / word_size;
+            size_t shift_right_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+            const UInt8 * shift_right_end = end - shift_right_bytes;
+
+            const size_t old_size = out_vec.size();
+            size_t length = shift_right_end - begin;
+            const size_t new_size = old_size + length + 1;
+            out_vec.resize(new_size);
+            out_vec[old_size + length] = 0;
+
+            /// We start from the byte on the right and shift right shift_right_bits bit by byte
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
+            UInt8 * out = out_vec.data() + old_size + length;
+            bitShiftRightForBytes(op_pointer, begin, out, shift_right_bits);
+            out_offsets.push_back(new_size);
+        }
+    }
+
+    /// For FixedString
+    static ALWAYS_INLINE NO_SANITIZE_UNDEFINED void apply(const UInt8 * pos [[maybe_unused]], const UInt8 * end [[maybe_unused]], const B & b [[maybe_unused]], ColumnFixedString::Chars & out_vec)
+    {
+        if constexpr (is_big_int_v<B>)
+            throw Exception("BitShiftRight is not implemented for big integers as second argument", ErrorCodes::NOT_IMPLEMENTED);
+        else
+        {
+            UInt8 word_size = 8;
+            size_t n = end - pos;
+            /// To prevent overflow
+            if (static_cast<double>(b) >= (static_cast<double>(n) * word_size) || b < 0)
+            {
+                // insert default value
+                out_vec.resize_fill(out_vec.size() + n);
+                return;
+            }
+
+            size_t shift_right_bytes = b / word_size;
+            size_t shift_right_bits = b % word_size;
+
+            const UInt8 * begin = pos;
+            const UInt8 * shift_right_end = end - shift_right_bytes;
+
+            const size_t old_size = out_vec.size();
+            const size_t new_size = old_size + n;
+
+            /// Fill 0 to the left
+            out_vec.resize_fill(out_vec.size() + old_size + shift_right_bytes);
+            out_vec.resize(new_size);
+
+            /// We start from the byte on the right and shift right shift_right_bits bit by byte
+            UInt8 * op_pointer = const_cast<UInt8 *>(shift_right_end);
+            UInt8 * out = out_vec.data() + new_size;
+            bitShiftRightForBytes(op_pointer, begin, out, shift_right_bits);
+        }
+    }
+
 #if USE_EMBEDDED_COMPILER
     static constexpr bool compilable = true;
 
@@ -41,6 +132,7 @@ struct BitShiftRightImpl
 #endif
 };
 
+
 struct NameBitShiftRight { static constexpr auto name = "bitShiftRight"; };
 using FunctionBitShiftRight = BinaryArithmeticOverloadResolver<BitShiftRightImpl, NameBitShiftRight, true, false>;
 
diff --git a/src/Functions/bitSwapLastTwo.cpp b/src/Functions/bitSwapLastTwo.cpp
index 4103511085d..566e6a47352 100644
--- a/src/Functions/bitSwapLastTwo.cpp
+++ b/src/Functions/bitSwapLastTwo.cpp
@@ -20,6 +20,7 @@ struct BitSwapLastTwoImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply([[maybe_unused]] A a)
     {
diff --git a/src/Functions/bitTest.cpp b/src/Functions/bitTest.cpp
index b7e9a84c6c1..9c12268d2ef 100644
--- a/src/Functions/bitTest.cpp
+++ b/src/Functions/bitTest.cpp
@@ -18,6 +18,7 @@ struct BitTestImpl
 {
     using ResultType = UInt8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     NO_SANITIZE_UNDEFINED static inline Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/bitWrapperFunc.cpp b/src/Functions/bitWrapperFunc.cpp
index 8395865d554..f47ffbfe883 100644
--- a/src/Functions/bitWrapperFunc.cpp
+++ b/src/Functions/bitWrapperFunc.cpp
@@ -20,12 +20,13 @@ struct BitWrapperFuncImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType NO_SANITIZE_UNDEFINED apply(A a [[maybe_unused]])
     {
         // Should be a logical error, but this function is callable from SQL.
         // Need to investigate this.
-        if constexpr (!is_integer_v<A>)
+        if constexpr (!is_integer<A>)
             throw DB::Exception("It's a bug! Only integer types are supported by __bitWrapperFunc.", ErrorCodes::BAD_ARGUMENTS);
         return a == 0 ? static_cast<ResultType>(0b10) : static_cast<ResultType >(0b1);
     }
diff --git a/src/Functions/bitXor.cpp b/src/Functions/bitXor.cpp
index d8901c6c9ff..8f3b6a1f9ca 100644
--- a/src/Functions/bitXor.cpp
+++ b/src/Functions/bitXor.cpp
@@ -16,6 +16,7 @@ struct BitXorImpl
 {
     using ResultType = typename NumberTraits::ResultOfBit<A, B>::Type;
     static constexpr bool allow_fixed_string = true;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/blockNumber.cpp b/src/Functions/blockNumber.cpp
index 9a57f8a96b0..e88fc68d01f 100644
--- a/src/Functions/blockNumber.cpp
+++ b/src/Functions/blockNumber.cpp
@@ -34,6 +34,11 @@ public:
         return true;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
+
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/blockSerializedSize.cpp b/src/Functions/blockSerializedSize.cpp
index 30f77bbf627..dd4fd1a4588 100644
--- a/src/Functions/blockSerializedSize.cpp
+++ b/src/Functions/blockSerializedSize.cpp
@@ -24,6 +24,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
     {
diff --git a/src/Functions/blockSize.cpp b/src/Functions/blockSize.cpp
index 294686054f0..a5e87f58d98 100644
--- a/src/Functions/blockSize.cpp
+++ b/src/Functions/blockSize.cpp
@@ -33,6 +33,11 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
+
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/buildId.cpp b/src/Functions/buildId.cpp
deleted file mode 100644
index 5329d4a40b4..00000000000
--- a/src/Functions/buildId.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#if defined(__ELF__) && !defined(__FreeBSD__)
-
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Common/SymbolIndex.h>
-#include <Core/Field.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-namespace
-{
-
-/** buildId() - returns the compiler build id of the running binary.
-  */
-class FunctionBuildId : public IFunction
-{
-public:
-    static constexpr auto name = "buildId";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionBuildId>(context->isDistributed());
-    }
-
-    explicit FunctionBuildId(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, SymbolIndex::instance()->getBuildIDHex());
-    }
-
-private:
-    bool is_distributed;
-};
-
-}
-
-void registerFunctionBuildId(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionBuildId>();
-}
-
-}
-
-#else
-
-namespace DB
-{
-class FunctionFactory;
-void registerFunctionBuildId(FunctionFactory &) {}
-}
-
-#endif
diff --git a/src/Functions/byteSize.cpp b/src/Functions/byteSize.cpp
index 54a7da59b9c..5a2dd3b2ec1 100644
--- a/src/Functions/byteSize.cpp
+++ b/src/Functions/byteSize.cpp
@@ -26,6 +26,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index 24b5855cc5b..37ee89c1f11 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -24,6 +24,7 @@ public:
 
     explicit FunctionCaseWithExpression(ContextPtr context_) : context(context_) {}
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     String getName() const override { return name; }
 
diff --git a/src/Functions/castOrDefault.cpp b/src/Functions/castOrDefault.cpp
new file mode 100644
index 00000000000..7394e0f36f9
--- /dev/null
+++ b/src/Functions/castOrDefault.cpp
@@ -0,0 +1,384 @@
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
+
+#include <Interpreters/Context.h>
+#include <Interpreters/castColumn.h>
+
+#include <Functions/IFunction.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/extractTimeZoneFromFunctionArguments.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+class FunctionCastOrDefault final : public IFunction
+{
+public:
+    static constexpr auto name = "accurateCastOrDefault";
+
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionCastOrDefault>(context);
+    }
+
+    explicit FunctionCastOrDefault(ContextPtr context_)
+        : keep_nullable(context_->getSettingsRef().cast_keep_nullable)
+    {
+    }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isVariadic() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForConstants() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        size_t arguments_size = arguments.size();
+        if (arguments_size != 2 && arguments_size != 3)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} expected 2 or 3 arguments. Actual {}",
+                getName(),
+                arguments_size);
+
+        const auto & type_column = arguments[1].column;
+        const auto * type_column_typed = checkAndGetColumnConst<ColumnString>(type_column.get());
+
+        if (!type_column_typed)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Second argument to {} must be a constant string describing type. Actual {}",
+                getName(),
+                arguments[1].type->getName());
+
+        DataTypePtr result_type = DataTypeFactory::instance().get(type_column_typed->getValue<String>());
+
+        if (keep_nullable && arguments.front().type->isNullable())
+            result_type = makeNullable(result_type);
+
+        if (arguments.size() == 3)
+        {
+            auto default_value_type = arguments[2].type;
+
+            if (!areTypesEqual(result_type, default_value_type))
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Default value type should be same as cast type. Expected {}. Actual {}",
+                    result_type->getName(),
+                    default_value_type->getName());
+            }
+        }
+
+        return result_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t) const override
+    {
+        const ColumnWithTypeAndName & column_to_cast = arguments[0];
+        auto non_const_column_to_cast = column_to_cast.column->convertToFullColumnIfConst();
+        ColumnWithTypeAndName column_to_cast_non_const { std::move(non_const_column_to_cast), column_to_cast.type, column_to_cast.name };
+
+        auto cast_result = castColumnAccurateOrNull(column_to_cast_non_const, return_type);
+
+        const auto & cast_result_nullable = assert_cast<const ColumnNullable &>(*cast_result);
+        const auto & null_map_data = cast_result_nullable.getNullMapData();
+        size_t null_map_data_size = null_map_data.size();
+        const auto & nested_column = cast_result_nullable.getNestedColumn();
+        IColumn::MutablePtr result = return_type->createColumn();
+        result->reserve(null_map_data_size);
+
+        size_t start_insert_index = 0;
+
+        /// Created separate branch because cast and inserting field from other column is slower
+        if (arguments.size() == 3)
+        {
+            const auto & default_column_with_type = arguments[2];
+            auto default_column = default_column_with_type.column->convertToFullColumnIfConst();
+
+            for (size_t i = 0; i < null_map_data_size; ++i)
+            {
+                bool is_current_index_null = null_map_data[i];
+                if (!is_current_index_null)
+                    continue;
+
+                if (i != start_insert_index)
+                    result->insertRangeFrom(nested_column, start_insert_index, i - start_insert_index);
+
+                result->insertFrom(*default_column, i);
+                start_insert_index = i + 1;
+            }
+        }
+        else
+        {
+            for (size_t i = 0; i < null_map_data_size; ++i)
+            {
+                bool is_current_index_null = null_map_data[i];
+                if (!is_current_index_null)
+                    continue;
+
+                if (i != start_insert_index)
+                    result->insertRangeFrom(nested_column, start_insert_index, i - start_insert_index);
+
+                result->insertDefault();
+                start_insert_index = i + 1;
+            }
+        }
+
+        if (null_map_data_size != start_insert_index)
+            result->insertRangeFrom(nested_column, start_insert_index, null_map_data_size - start_insert_index);
+
+        return result;
+    }
+
+private:
+
+    bool keep_nullable;
+};
+
+template <typename Type, typename Name>
+class FunctionCastOrDefaultTyped final : public IFunction
+{
+public:
+    static constexpr auto name = Name::name;
+
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionCastOrDefaultTyped>(context);
+    }
+
+    explicit FunctionCastOrDefaultTyped(ContextPtr context_)
+        : impl(context_)
+    {
+    }
+
+    String getName() const override { return name; }
+
+private:
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isVariadic() const override { return true; }
+
+    bool useDefaultImplementationForNulls() const override { return impl.useDefaultImplementationForNulls(); }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return impl.useDefaultImplementationForLowCardinalityColumns();}
+    bool useDefaultImplementationForConstants() const override { return impl.useDefaultImplementationForConstants();}
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        return impl.isSuitableForShortCircuitArgumentsExecution(arguments);
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        FunctionArgumentDescriptors mandatory_args = {{"Value", nullptr, nullptr, nullptr}};
+        FunctionArgumentDescriptors optional_args;
+
+        if constexpr (IsDataTypeDecimal<Type>)
+            mandatory_args.push_back({"scale", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"});
+
+        if (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>)
+            optional_args.push_back({"timezone", &isString<IDataType>, isColumnConst, "const String"});
+
+        optional_args.push_back({"default_value", nullptr, nullptr, nullptr});
+
+        validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
+
+        size_t additional_argument_index = 1;
+
+        size_t scale = 0;
+        std::string time_zone;
+
+        if constexpr (IsDataTypeDecimal<Type>)
+        {
+            const auto & scale_argument = arguments[additional_argument_index];
+
+            WhichDataType scale_argument_type(scale_argument.type);
+
+            if (!scale_argument_type.isNativeUInt())
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Function {} decimal scale should have native UInt type. Actual {}",
+                    scale_argument.type->getName());
+            }
+
+            scale = arguments[additional_argument_index].column->getUInt(0);
+            ++additional_argument_index;
+        }
+
+        if constexpr (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>)
+        {
+            if (additional_argument_index < arguments.size())
+            {
+                time_zone = extractTimeZoneNameFromColumn(*arguments[additional_argument_index].column);
+                ++additional_argument_index;
+            }
+        }
+
+        std::shared_ptr<Type> cast_type;
+
+        if constexpr (std::is_same_v<Type, DataTypeDateTime64>)
+            cast_type = std::make_shared<Type>(scale, time_zone);
+        else if constexpr (IsDataTypeDecimal<Type>)
+            cast_type = std::make_shared<Type>(Type::maxPrecision(), scale);
+        else if constexpr (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>)
+            cast_type = std::make_shared<Type>(time_zone);
+        else
+            cast_type = std::make_shared<Type>();
+
+        ColumnWithTypeAndName type_argument =
+        {
+            DataTypeString().createColumnConst(1, cast_type->getName()),
+            std::make_shared<DataTypeString>(),
+            ""
+        };
+
+        ColumnsWithTypeAndName arguments_with_cast_type;
+        arguments_with_cast_type.reserve(arguments.size());
+
+        arguments_with_cast_type.emplace_back(arguments[0]);
+        arguments_with_cast_type.emplace_back(type_argument);
+
+        if (additional_argument_index < arguments.size())
+        {
+            arguments_with_cast_type.emplace_back(arguments[additional_argument_index]);
+            ++additional_argument_index;
+        }
+
+        if (additional_argument_index < arguments.size())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "{} wrong arguments size", getName());
+
+        return impl.getReturnTypeImpl(arguments_with_cast_type);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_size) const override
+    {
+        size_t additional_arguments_size = IsDataTypeDecimal<Type> + (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>);
+
+        ColumnWithTypeAndName second_argument =
+        {
+            DataTypeString().createColumnConst(arguments.begin()->column->size(), result_type->getName()),
+            std::make_shared<DataTypeString>(),
+            ""
+        };
+
+        ColumnsWithTypeAndName arguments_with_cast_type;
+        arguments_with_cast_type.reserve(arguments.size());
+
+        arguments_with_cast_type.emplace_back(arguments[0]);
+        arguments_with_cast_type.emplace_back(second_argument);
+
+        size_t default_column_argument = 1 + additional_arguments_size;
+        if (default_column_argument < arguments.size())
+            arguments_with_cast_type.emplace_back(arguments[default_column_argument]);
+
+        return impl.executeImpl(arguments_with_cast_type, result_type, input_rows_size);
+    }
+
+    FunctionCastOrDefault impl;
+};
+
+struct NameToUInt8OrDefault { static constexpr auto name = "toUInt8OrDefault"; };
+struct NameToUInt16OrDefault { static constexpr auto name = "toUInt16OrDefault"; };
+struct NameToUInt32OrDefault { static constexpr auto name = "toUInt32OrDefault"; };
+struct NameToUInt64OrDefault { static constexpr auto name = "toUInt64OrDefault"; };
+struct NameToUInt256OrDefault { static constexpr auto name = "toUInt256OrDefault"; };
+struct NameToInt8OrDefault { static constexpr auto name = "toInt8OrDefault"; };
+struct NameToInt16OrDefault { static constexpr auto name = "toInt16OrDefault"; };
+struct NameToInt32OrDefault { static constexpr auto name = "toInt32OrDefault"; };
+struct NameToInt64OrDefault { static constexpr auto name = "toInt64OrDefault"; };
+struct NameToInt128OrDefault { static constexpr auto name = "toInt128OrDefault"; };
+struct NameToInt256OrDefault { static constexpr auto name = "toInt256OrDefault"; };
+struct NameToFloat32OrDefault { static constexpr auto name = "toFloat32OrDefault"; };
+struct NameToFloat64OrDefault { static constexpr auto name = "toFloat64OrDefault"; };
+struct NameToDateOrDefault { static constexpr auto name = "toDateOrDefault"; };
+struct NameToDate32OrDefault { static constexpr auto name = "toDate32OrDefault"; };
+struct NameToDateTimeOrDefault { static constexpr auto name = "toDateTimeOrDefault"; };
+struct NameToDateTime64OrDefault { static constexpr auto name = "toDateTime64OrDefault"; };
+struct NameToDecimal32OrDefault { static constexpr auto name = "toDecimal32OrDefault"; };
+struct NameToDecimal64OrDefault { static constexpr auto name = "toDecimal64OrDefault"; };
+struct NameToDecimal128OrDefault { static constexpr auto name = "toDecimal128OrDefault"; };
+struct NameToDecimal256OrDefault { static constexpr auto name = "toDecimal256OrDefault"; };
+struct NameToUUIDOrDefault { static constexpr auto name = "toUUIDOrDefault"; };
+
+using FunctionToUInt8OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt8, NameToUInt8OrDefault>;
+using FunctionToUInt16OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt16, NameToUInt16OrDefault>;
+using FunctionToUInt32OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt32, NameToUInt32OrDefault>;
+using FunctionToUInt64OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt64, NameToUInt64OrDefault>;
+using FunctionToUInt256OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt256, NameToUInt256OrDefault>;
+
+using FunctionToInt8OrDefault = FunctionCastOrDefaultTyped<DataTypeInt8, NameToInt8OrDefault>;
+using FunctionToInt16OrDefault = FunctionCastOrDefaultTyped<DataTypeInt16, NameToInt16OrDefault>;
+using FunctionToInt32OrDefault = FunctionCastOrDefaultTyped<DataTypeInt32, NameToInt32OrDefault>;
+using FunctionToInt64OrDefault = FunctionCastOrDefaultTyped<DataTypeInt64, NameToInt64OrDefault>;
+using FunctionToInt128OrDefault = FunctionCastOrDefaultTyped<DataTypeInt128, NameToInt128OrDefault>;
+using FunctionToInt256OrDefault = FunctionCastOrDefaultTyped<DataTypeInt256, NameToInt256OrDefault>;
+
+using FunctionToFloat32OrDefault = FunctionCastOrDefaultTyped<DataTypeFloat32, NameToFloat32OrDefault>;
+using FunctionToFloat64OrDefault = FunctionCastOrDefaultTyped<DataTypeFloat64, NameToFloat64OrDefault>;
+
+using FunctionToDateOrDefault = FunctionCastOrDefaultTyped<DataTypeDate, NameToDateOrDefault>;
+using FunctionToDate32OrDefault = FunctionCastOrDefaultTyped<DataTypeDate32, NameToDate32OrDefault>;
+using FunctionToDateTimeOrDefault = FunctionCastOrDefaultTyped<DataTypeDateTime, NameToDateTimeOrDefault>;
+using FunctionToDateTime64OrDefault = FunctionCastOrDefaultTyped<DataTypeDateTime64, NameToDateTime64OrDefault>;
+
+using FunctionToDecimal32OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal32>, NameToDecimal32OrDefault>;
+using FunctionToDecimal64OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal64>, NameToDecimal64OrDefault>;
+using FunctionToDecimal128OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal128>, NameToDecimal128OrDefault>;
+using FunctionToDecimal256OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal256>, NameToDecimal256OrDefault>;
+
+using FunctionToUUIDOrDefault = FunctionCastOrDefaultTyped<DataTypeUUID, NameToUUIDOrDefault>;
+
+void registerFunctionCastOrDefault(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionCastOrDefault>();
+
+    factory.registerFunction<FunctionToUInt8OrDefault>();
+    factory.registerFunction<FunctionToUInt16OrDefault>();
+    factory.registerFunction<FunctionToUInt32OrDefault>();
+    factory.registerFunction<FunctionToUInt64OrDefault>();
+    factory.registerFunction<FunctionToUInt256OrDefault>();
+
+    factory.registerFunction<FunctionToInt8OrDefault>();
+    factory.registerFunction<FunctionToInt16OrDefault>();
+    factory.registerFunction<FunctionToInt32OrDefault>();
+    factory.registerFunction<FunctionToInt64OrDefault>();
+    factory.registerFunction<FunctionToInt128OrDefault>();
+    factory.registerFunction<FunctionToInt256OrDefault>();
+
+    factory.registerFunction<FunctionToFloat32OrDefault>();
+    factory.registerFunction<FunctionToFloat64OrDefault>();
+
+    factory.registerFunction<FunctionToDateOrDefault>();
+    factory.registerFunction<FunctionToDate32OrDefault>();
+    factory.registerFunction<FunctionToDateTimeOrDefault>();
+    factory.registerFunction<FunctionToDateTime64OrDefault>();
+
+    factory.registerFunction<FunctionToDecimal32OrDefault>();
+    factory.registerFunction<FunctionToDecimal64OrDefault>();
+    factory.registerFunction<FunctionToDecimal128OrDefault>();
+    factory.registerFunction<FunctionToDecimal256OrDefault>();
+
+    factory.registerFunction<FunctionToUUIDOrDefault>();
+}
+
+}
diff --git a/src/Functions/castTypeToEither.h b/src/Functions/castTypeToEither.h
index bff4047768d..c55336adb5a 100644
--- a/src/Functions/castTypeToEither.h
+++ b/src/Functions/castTypeToEither.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <Common/typeid_cast.h>
+#include <base/Typelist.h>
 
 namespace DB
 {
-
 template <typename... Ts, typename T, typename F>
 static bool castTypeToEither(const T * type, F && f)
 {
@@ -12,4 +12,14 @@ static bool castTypeToEither(const T * type, F && f)
     return ((typeid_cast<const Ts *>(type) ? f(*typeid_cast<const Ts *>(type)) : false) || ...);
 }
 
+template <class ...Args>
+constexpr bool castTypeToEither(Typelist<Args...>, const auto * type, auto && f)
+{
+    return (
+        (typeid_cast<const Args *>(type) != nullptr
+            ? std::forward<decltype(f)>(f)(
+                *typeid_cast<const Args *>(type))
+            : false)
+        || ...);
+}
 }
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index 791b9d993b4..96aa110a489 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -38,6 +38,7 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t number_of_arguments) const override
     {
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index 195107cb221..cd83223de3e 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -9,8 +9,8 @@
 #include <Functions/GatherUtils/Sources.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
-#include <common/map.h>
-#include <common/range.h>
+#include <base/map.h>
+#include <base/range.h>
 
 #include "formatString.h"
 
@@ -44,6 +44,8 @@ public:
 
     bool isInjective(const ColumnsWithTypeAndName &) const override { return is_injective; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/connectionId.cpp b/src/Functions/connectionId.cpp
index ae04cfd1af6..69c8b9e86ea 100644
--- a/src/Functions/connectionId.cpp
+++ b/src/Functions/connectionId.cpp
@@ -21,6 +21,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override { return std::make_shared<DataTypeUInt64>(); }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
diff --git a/src/Functions/convertCharset.cpp b/src/Functions/convertCharset.cpp
index 7e351af6cce..ccfb28ad7ef 100644
--- a/src/Functions/convertCharset.cpp
+++ b/src/Functions/convertCharset.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_ICU
 #    include <Columns/ColumnConst.h>
@@ -12,7 +10,7 @@
 #    include <IO/WriteHelpers.h>
 #    include <Common/ObjectPool.h>
 #    include <Common/typeid_cast.h>
-#    include <common/range.h>
+#    include <base/range.h>
 
 #    include <memory>
 #    include <string>
@@ -171,6 +169,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 3; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t i : collections::range(0, 3))
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 597a2c625b9..47877f042b9 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -36,6 +36,7 @@ public:
     String getName() const override { return name; }
     bool useDefaultImplementationForConstants() const override { return true; }
     size_t getNumberOfArguments() const override { return 1; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -60,7 +61,7 @@ public:
         {
             using Types = std::decay_t<decltype(types)>;
             using Type = typename Types::RightType;
-            using ColVecType = std::conditional_t<IsDecimalNumber<Type>, ColumnDecimal<Type>, ColumnVector<Type>>;
+            using ColVecType = ColumnVectorOrDecimal<Type>;
 
             if (const ColVecType * col_vec = checkAndGetColumn<ColVecType>(src_column.column.get()))
             {
@@ -83,7 +84,7 @@ private:
     template <typename T, typename ColVecType>
     static void execute(const ColVecType & col, ColumnUInt8 & result_column, size_t rows_count)
     {
-        using NativeT = typename NativeType<T>::Type;
+        using NativeT = NativeType<T>;
 
         const auto & src_data = col.getData();
         auto & dst_data = result_column.getData();
@@ -91,7 +92,7 @@ private:
 
         for (size_t i = 0; i < rows_count; ++i)
         {
-            if constexpr (IsDecimalNumber<T>)
+            if constexpr (is_decimal<T>)
                 dst_data[i] = digits<NativeT>(src_data[i].value);
             else
                 dst_data[i] = digits<NativeT>(src_data[i]);
@@ -101,7 +102,7 @@ private:
     template <typename T>
     static UInt32 digits(T value)
     {
-        static_assert(!IsDecimalNumber<T>);
+        static_assert(!is_decimal<T>);
         using DivT = std::conditional_t<is_signed_v<T>, Int32, UInt32>;
 
         UInt32 res = 0;
diff --git a/src/Functions/countMatches.h b/src/Functions/countMatches.h
index 6ae69520cb9..6d60ca94c18 100644
--- a/src/Functions/countMatches.h
+++ b/src/Functions/countMatches.h
@@ -31,6 +31,7 @@ public:
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/countSubstrings.cpp b/src/Functions/countSubstrings.cpp
index d0dd469b962..1bf95f9526f 100644
--- a/src/Functions/countSubstrings.cpp
+++ b/src/Functions/countSubstrings.cpp
@@ -13,7 +13,7 @@ struct NameCountSubstrings
     static constexpr auto name = "countSubstrings";
 };
 
-using FunctionCountSubstrings = FunctionsStringSearch<CountSubstringsImpl<PositionCaseSensitiveASCII>, NameCountSubstrings>;
+using FunctionCountSubstrings = FunctionsStringSearch<CountSubstringsImpl<NameCountSubstrings, PositionCaseSensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/countSubstringsCaseInsensitive.cpp b/src/Functions/countSubstringsCaseInsensitive.cpp
index 9207f2d4f20..fa234953cc3 100644
--- a/src/Functions/countSubstringsCaseInsensitive.cpp
+++ b/src/Functions/countSubstringsCaseInsensitive.cpp
@@ -13,7 +13,7 @@ struct NameCountSubstringsCaseInsensitive
     static constexpr auto name = "countSubstringsCaseInsensitive";
 };
 
-using FunctionCountSubstringsCaseInsensitive = FunctionsStringSearch<CountSubstringsImpl<PositionCaseInsensitiveASCII>, NameCountSubstringsCaseInsensitive>;
+using FunctionCountSubstringsCaseInsensitive = FunctionsStringSearch<CountSubstringsImpl<NameCountSubstringsCaseInsensitive, PositionCaseInsensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp b/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp
index b1747bbd7ff..93f77fddd7f 100644
--- a/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp
+++ b/src/Functions/countSubstringsCaseInsensitiveUTF8.cpp
@@ -13,7 +13,8 @@ struct NameCountSubstringsCaseInsensitiveUTF8
     static constexpr auto name = "countSubstringsCaseInsensitiveUTF8";
 };
 
-using FunctionCountSubstringsCaseInsensitiveUTF8 = FunctionsStringSearch<CountSubstringsImpl<PositionCaseInsensitiveUTF8>, NameCountSubstringsCaseInsensitiveUTF8>;
+using FunctionCountSubstringsCaseInsensitiveUTF8 = FunctionsStringSearch<
+        CountSubstringsImpl<NameCountSubstringsCaseInsensitiveUTF8, PositionCaseInsensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/currentDatabase.cpp b/src/Functions/currentDatabase.cpp
index 16eff20cfd5..c5f559d0838 100644
--- a/src/Functions/currentDatabase.cpp
+++ b/src/Functions/currentDatabase.cpp
@@ -41,6 +41,8 @@ public:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, db_name);
diff --git a/src/Functions/currentProfiles.cpp b/src/Functions/currentProfiles.cpp
index afe54fd6582..c578268160e 100644
--- a/src/Functions/currentProfiles.cpp
+++ b/src/Functions/currentProfiles.cpp
@@ -29,6 +29,8 @@ namespace
         static constexpr auto name = (kind == Kind::CURRENT_PROFILES) ? "currentProfiles" : ((kind == Kind::ENABLED_PROFILES) ? "enabledProfiles" : "defaultProfiles");
         static FunctionPtr create(const ContextPtr & context) { return std::make_shared<FunctionCurrentProfiles>(context); }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
         String getName() const override { return name; }
 
         explicit FunctionCurrentProfiles(const ContextPtr & context)
diff --git a/src/Functions/currentRoles.cpp b/src/Functions/currentRoles.cpp
index 0a4e23308d8..c2545edd002 100644
--- a/src/Functions/currentRoles.cpp
+++ b/src/Functions/currentRoles.cpp
@@ -30,6 +30,8 @@ namespace
         static constexpr auto name = (kind == Kind::CURRENT_ROLES) ? "currentRoles" : ((kind == Kind::ENABLED_ROLES) ? "enabledRoles" : "defaultRoles");
         static FunctionPtr create(const ContextPtr & context) { return std::make_shared<FunctionCurrentRoles>(context); }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
         String getName() const override { return name; }
 
         explicit FunctionCurrentRoles(const ContextPtr & context)
diff --git a/src/Functions/currentUser.cpp b/src/Functions/currentUser.cpp
index 22ad49fb29d..efa6e2cad2a 100644
--- a/src/Functions/currentUser.cpp
+++ b/src/Functions/currentUser.cpp
@@ -41,6 +41,8 @@ public:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, user_name);
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index d2d1d7c6e0d..b632627fea9 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -14,7 +14,7 @@
 
 #include <IO/WriteHelpers.h>
 
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 #include <type_traits>
 
@@ -55,6 +55,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/dateName.cpp b/src/Functions/dateName.cpp
index 9c34b0ae55c..c8c86060265 100644
--- a/src/Functions/dateName.cpp
+++ b/src/Functions/dateName.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 
 #include <Core/DecimalFunctions.h>
 #include <IO/WriteHelpers.h>
@@ -58,6 +58,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0, 2}; }
 
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index 1f2bcabf1f9..da6a4839ca0 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -32,6 +32,7 @@ public:
     String getName() const override { return name; }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -142,7 +143,7 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override
     {
-        return { true, true, true };
+        return { .is_monotonic = true, .is_always_monotonic = true };
     }
 
 private:
diff --git a/src/Functions/decodeXMLComponent.cpp b/src/Functions/decodeXMLComponent.cpp
index 9b9cf5a081d..79af3024c09 100644
--- a/src/Functions/decodeXMLComponent.cpp
+++ b/src/Functions/decodeXMLComponent.cpp
@@ -3,7 +3,7 @@
 #include <Functions/FunctionStringToString.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/hex.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/decrypt.cpp b/src/Functions/decrypt.cpp
index a9090a31f0e..1cbda0dba99 100644
--- a/src/Functions/decrypt.cpp
+++ b/src/Functions/decrypt.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 
diff --git a/src/Functions/defaultValueOfArgumentType.cpp b/src/Functions/defaultValueOfArgumentType.cpp
index c0abe1b63d9..f4031692b4b 100644
--- a/src/Functions/defaultValueOfArgumentType.cpp
+++ b/src/Functions/defaultValueOfArgumentType.cpp
@@ -23,6 +23,11 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
+
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
diff --git a/src/Functions/defaultValueOfTypeName.cpp b/src/Functions/defaultValueOfTypeName.cpp
index 1bf978ab17b..2efbaef46c5 100644
--- a/src/Functions/defaultValueOfTypeName.cpp
+++ b/src/Functions/defaultValueOfTypeName.cpp
@@ -31,6 +31,11 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
+
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
diff --git a/src/Functions/demange.cpp b/src/Functions/demange.cpp
index 755a50dccbb..0f50eb5e141 100644
--- a/src/Functions/demange.cpp
+++ b/src/Functions/demange.cpp
@@ -1,4 +1,4 @@
-#include <common/demangle.h>
+#include <base/demangle.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/IFunction.h>
@@ -41,6 +41,11 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return true;
+    }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1)
diff --git a/src/Functions/divide.cpp b/src/Functions/divide.cpp
index aa36e23d344..7b8fcf94313 100644
--- a/src/Functions/divide.cpp
+++ b/src/Functions/divide.cpp
@@ -13,6 +13,7 @@ struct DivideFloatingImpl
 {
     using ResultType = typename NumberTraits::ResultOfFloatingPointDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a [[maybe_unused]], B b [[maybe_unused]])
diff --git a/src/Functions/divide/divide.cpp b/src/Functions/divide/divide.cpp
index 5ab11df2a65..cf2cd354a7d 100644
--- a/src/Functions/divide/divide.cpp
+++ b/src/Functions/divide/divide.cpp
@@ -1,7 +1,7 @@
 #include "divide.h"
 #include <Common/CpuId.h>
 
-#if defined(__x86_64__) && !defined(ARCADIA_BUILD)
+#if defined(__x86_64__)
 namespace SSE2
 {
     template <typename A, typename B, typename ResultType>
@@ -25,7 +25,7 @@ namespace Generic
 template <typename A, typename B, typename ResultType>
 void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
 {
-#if defined(__x86_64__) && !defined(ARCADIA_BUILD)
+#if defined(__x86_64__)
     if (DB::Cpu::CpuFlagsCache::have_AVX2)
         AVX2::divideImpl(a_pos, b, c_pos, size);
     else if (DB::Cpu::CpuFlagsCache::have_SSE2)
diff --git a/src/Functions/divide/divideImpl.cpp b/src/Functions/divide/divideImpl.cpp
index f4c1a97d3ad..6c151dfefb5 100644
--- a/src/Functions/divide/divideImpl.cpp
+++ b/src/Functions/divide/divideImpl.cpp
@@ -1,14 +1,6 @@
 /// This translation unit should be compiled multiple times
 /// with different values of NAMESPACE and machine flags (sse2, avx2).
 
-#if !defined(NAMESPACE)
-    #if defined(ARCADIA_BUILD)
-        #define NAMESPACE Generic
-    #else
-        #error "NAMESPACE macro must be defined"
-    #endif
-#endif
-
 #if defined(__AVX2__)
     #define REG_SIZE 32
     #define LIBDIVIDE_AVX2
diff --git a/src/Functions/dumpColumnStructure.cpp b/src/Functions/dumpColumnStructure.cpp
index 3189e343beb..f1e53cc6759 100644
--- a/src/Functions/dumpColumnStructure.cpp
+++ b/src/Functions/dumpColumnStructure.cpp
@@ -26,6 +26,8 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override
     {
         return 1;
diff --git a/src/Functions/e.cpp b/src/Functions/e.cpp
deleted file mode 100644
index c43bb7d572a..00000000000
--- a/src/Functions/e.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionMathConstFloat64.h>
-
-namespace DB
-{
-namespace
-{
-
-struct EImpl
-{
-    static constexpr auto name = "e";
-    static constexpr double value = 2.7182818284590452353602874713526624977572470;
-};
-
-using FunctionE = FunctionMathConstFloat64<EImpl>;
-
-}
-
-void registerFunctionE(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionE>();
-}
-
-}
diff --git a/src/Functions/empty.cpp b/src/Functions/empty.cpp
index 552fce85de0..d53f3585158 100644
--- a/src/Functions/empty.cpp
+++ b/src/Functions/empty.cpp
@@ -13,7 +13,7 @@ struct NameEmpty
 {
     static constexpr auto name = "empty";
 };
-using FunctionEmpty = FunctionStringOrArrayToT<EmptyImpl<false>, NameEmpty, UInt8>;
+using FunctionEmpty = FunctionStringOrArrayToT<EmptyImpl<false>, NameEmpty, UInt8, false>;
 
 }
 
diff --git a/src/Functions/encodeXMLComponent.cpp b/src/Functions/encodeXMLComponent.cpp
index d839a3a9264..380d0da69ac 100644
--- a/src/Functions/encodeXMLComponent.cpp
+++ b/src/Functions/encodeXMLComponent.cpp
@@ -1,7 +1,7 @@
 #include <Columns/ColumnString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/encrypt.cpp b/src/Functions/encrypt.cpp
index ba8ffa1bc59..807443a2fb8 100644
--- a/src/Functions/encrypt.cpp
+++ b/src/Functions/encrypt.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 
diff --git a/src/Functions/endsWith.cpp b/src/Functions/endsWith.cpp
index 40ea7902465..5f32fbbe200 100644
--- a/src/Functions/endsWith.cpp
+++ b/src/Functions/endsWith.cpp
@@ -12,5 +12,6 @@ void registerFunctionEndsWith(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionEndsWith>();
 }
+
 }
 
diff --git a/src/Functions/errorCodeToName.cpp b/src/Functions/errorCodeToName.cpp
index d8e8e0f0d29..f447621c23c 100644
--- a/src/Functions/errorCodeToName.cpp
+++ b/src/Functions/errorCodeToName.cpp
@@ -27,6 +27,7 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & types) const override
     {
diff --git a/src/Functions/evalMLMethod.cpp b/src/Functions/evalMLMethod.cpp
index a69a6f0f550..876fec39c7b 100644
--- a/src/Functions/evalMLMethod.cpp
+++ b/src/Functions/evalMLMethod.cpp
@@ -44,6 +44,12 @@ public:
     {
         return true;
     }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return true;
+    }
+
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/exp10.cpp b/src/Functions/exp10.cpp
index 4be7e15562e..abd0755c245 100644
--- a/src/Functions/exp10.cpp
+++ b/src/Functions/exp10.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionMathUnary.h>
 #include <Functions/FunctionFactory.h>
-#include <common/preciseExp10.h>
+#include <base/preciseExp10.h>
 
 namespace DB
 {
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index 62026dcc147..fa75e305af4 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -65,14 +65,16 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"haystack", isStringOrFixedString, nullptr, "const String or const FixedString"},
-            {"needle", isStringOrFixedString, isColumnConst, "const String or const FixedString"},
+            {"haystack", &isStringOrFixedString<IDataType>, nullptr, "const String or const FixedString"},
+            {"needle", &isStringOrFixedString<IDataType>, isColumnConst, "const String or const FixedString"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index f1d728ee3f6..2286951bb8f 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -37,14 +37,16 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return false; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"haystack", isStringOrFixedString, nullptr, "const String or const FixedString"},
-            {"needle", isStringOrFixedString, isColumnConst, "const String or const FixedString"},
+            {"haystack", &isStringOrFixedString<IDataType>, nullptr, "const String or const FixedString"},
+            {"needle", &isStringOrFixedString<IDataType>, isColumnConst, "const String or const FixedString"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/extractTextFromHTML.cpp b/src/Functions/extractTextFromHTML.cpp
index 6a7bdbeaba9..b38ea74d6ce 100644
--- a/src/Functions/extractTextFromHTML.cpp
+++ b/src/Functions/extractTextFromHTML.cpp
@@ -2,7 +2,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 
 
@@ -300,6 +300,7 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 19c02ed2390..50254606510 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <Columns/ColumnString.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 
 namespace DB
@@ -17,7 +17,7 @@ namespace ErrorCodes
 }
 
 
-static std::string extractTimeZoneNameFromColumn(const IColumn & column)
+std::string extractTimeZoneNameFromColumn(const IColumn & column)
 {
     const ColumnConst * time_zone_column = checkAndGetColumnConst<ColumnString>(&column);
 
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.h b/src/Functions/extractTimeZoneFromFunctionArguments.h
index 9dd3fdd4903..751d7a463f1 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.h
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.h
@@ -12,6 +12,8 @@ namespace DB
 
 class Block;
 
+std::string extractTimeZoneNameFromColumn(const IColumn & column);
+
 /// Determine working timezone either from optional argument with time zone name or from time zone in DateTime type of argument.
 /// Returns empty string if default time zone should be used.
 std::string extractTimeZoneNameFromFunctionArguments(
diff --git a/src/Functions/filesystem.cpp b/src/Functions/filesystem.cpp
index d264c972656..bea7ffdf818 100644
--- a/src/Functions/filesystem.cpp
+++ b/src/Functions/filesystem.cpp
@@ -39,6 +39,11 @@ public:
         return std::make_shared<FilesystemImpl<Impl>>(std::filesystem::space(context->getConfigRef().getString("path")));
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return false;
+    }
+
     explicit FilesystemImpl(std::filesystem::space_info spaceinfo_) : spaceinfo(spaceinfo_) { }
 
     String getName() const override { return name; }
diff --git a/src/Functions/finalizeAggregation.cpp b/src/Functions/finalizeAggregation.cpp
index b3dfbc0aa15..237d9fa3ef8 100644
--- a/src/Functions/finalizeAggregation.cpp
+++ b/src/Functions/finalizeAggregation.cpp
@@ -39,6 +39,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index dc075dea7d0..9bb2abcb2c7 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -14,8 +14,8 @@
 
 #include <IO/WriteHelpers.h>
 
-#include <common/DateLUTImpl.h>
-#include <common/find_symbols.h>
+#include <base/DateLUTImpl.h>
+#include <base/find_symbols.h>
 #include <Core/DecimalFunctions.h>
 
 #include <type_traits>
@@ -290,6 +290,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
 
     bool isVariadic() const override { return true; }
diff --git a/src/Functions/formatReadable.h b/src/Functions/formatReadable.h
index 6cf4fadbf05..7c0d6c5c817 100644
--- a/src/Functions/formatReadable.h
+++ b/src/Functions/formatReadable.h
@@ -35,6 +35,11 @@ public:
         return name;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return true;
+    }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/formatReadableTimeDelta.cpp b/src/Functions/formatReadableTimeDelta.cpp
index 69dbaa71041..d781d227c64 100644
--- a/src/Functions/formatReadableTimeDelta.cpp
+++ b/src/Functions/formatReadableTimeDelta.cpp
@@ -44,6 +44,8 @@ public:
 
     bool isVariadic() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index f45986ea08e..ee9696cf34f 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -1,6 +1,5 @@
 #include <memory>
 #include <Columns/ColumnString.h>
-#include <DataStreams/materializeBlock.h>
 #include <DataTypes/DataTypeString.h>
 #include <Formats/FormatFactory.h>
 #include <Functions/FunctionFactory.h>
@@ -9,7 +8,7 @@
 #include <IO/WriteBufferFromVector.h>
 #include <IO/WriteHelpers.h>
 #include <Processors/Formats/IOutputFormat.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
@@ -45,6 +44,7 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
diff --git a/src/Functions/formatString.cpp b/src/Functions/formatString.cpp
index 71da598060f..e138c072639 100644
--- a/src/Functions/formatString.cpp
+++ b/src/Functions/formatString.cpp
@@ -5,7 +5,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <memory>
 #include <string>
@@ -37,6 +37,8 @@ public:
 
     bool isVariadic() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 0; }
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
diff --git a/src/Functions/formatString.h b/src/Functions/formatString.h
index bea4fa2e1bc..c72e7db9579 100644
--- a/src/Functions/formatString.h
+++ b/src/Functions/formatString.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Columns/ColumnString.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/memcpySmall.h>
diff --git a/src/Functions/fromModifiedJulianDay.cpp b/src/Functions/fromModifiedJulianDay.cpp
index bdd8b9b6bd4..e699547e346 100644
--- a/src/Functions/fromModifiedJulianDay.cpp
+++ b/src/Functions/fromModifiedJulianDay.cpp
@@ -127,6 +127,11 @@ namespace DB
             return true;
         }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+        {
+            return true;
+        }
+
         bool hasInformationAboutMonotonicity() const override
         {
             return true;
@@ -134,10 +139,7 @@ namespace DB
 
         Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override
         {
-            return Monotonicity(
-                true,  // is_monotonic
-                true,  // is_positive
-                true); // is_always_monotonic
+            return { .is_monotonic = true, .is_always_monotonic = true };
         }
 
     private:
diff --git a/src/Functions/fuzzBits.cpp b/src/Functions/fuzzBits.cpp
index 0884f586082..eb2af22d1ab 100644
--- a/src/Functions/fuzzBits.cpp
+++ b/src/Functions/fuzzBits.cpp
@@ -6,7 +6,7 @@
 #include <Functions/IFunction.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 #include <memory>
 
@@ -59,6 +59,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 2; }
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; } // indexing from 0
diff --git a/src/Functions/generateUUIDv4.cpp b/src/Functions/generateUUIDv4.cpp
index 7ca127857df..659c4c2c7c6 100644
--- a/src/Functions/generateUUIDv4.cpp
+++ b/src/Functions/generateUUIDv4.cpp
@@ -23,6 +23,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes &) const override
     {
         return std::make_shared<DataTypeUUID>();
diff --git a/src/Functions/geoToH3.cpp b/src/Functions/geoToH3.cpp
index 1b12e6c9ad3..e7da254117b 100644
--- a/src/Functions/geoToH3.cpp
+++ b/src/Functions/geoToH3.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -11,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
@@ -40,6 +38,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 3; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/geoToS2.cpp b/src/Functions/geoToS2.cpp
index c415cfade89..644e4661412 100644
--- a/src/Functions/geoToS2.cpp
+++ b/src/Functions/geoToS2.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -9,7 +7,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -49,6 +47,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t i = 0; i < getNumberOfArguments(); ++i)
diff --git a/src/Functions/geohashDecode.cpp b/src/Functions/geohashDecode.cpp
index bf774905868..199d1a62f1d 100644
--- a/src/Functions/geohashDecode.cpp
+++ b/src/Functions/geohashDecode.cpp
@@ -36,6 +36,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/geohashEncode.cpp b/src/Functions/geohashEncode.cpp
index 15abe96e3e5..ebfa8167998 100644
--- a/src/Functions/geohashEncode.cpp
+++ b/src/Functions/geohashEncode.cpp
@@ -39,6 +39,7 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {2}; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/geohashesInBox.cpp b/src/Functions/geohashesInBox.cpp
index c0629ab9655..f6a8526ba9f 100644
--- a/src/Functions/geohashesInBox.cpp
+++ b/src/Functions/geohashesInBox.cpp
@@ -61,6 +61,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     template <typename LonAndLatType, typename PrecisionType>
     void execute(
         const IColumn * lon_min_column,
diff --git a/src/Functions/geometryConverters.h b/src/Functions/geometryConverters.h
index 3e912cb42d7..644ed1960d0 100644
--- a/src/Functions/geometryConverters.h
+++ b/src/Functions/geometryConverters.h
@@ -18,7 +18,7 @@
 #include <Interpreters/castColumn.h>
 
 #include <cmath>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
diff --git a/src/Functions/getMacro.cpp b/src/Functions/getMacro.cpp
index c869685af42..fb48a06aabc 100644
--- a/src/Functions/getMacro.cpp
+++ b/src/Functions/getMacro.cpp
@@ -44,6 +44,8 @@ public:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     bool isDeterministicInScopeOfQuery() const override
     {
         return false;
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index 13ec97a94fb..b06fb360366 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -42,6 +42,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1 || !isString(arguments[0].type) || !arguments[0].column || !isColumnConst(*arguments[0].column))
@@ -105,6 +107,8 @@ public:
 
     bool isSuitableForConstantFolding() const override { return !is_distributed; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/getServerPort.cpp b/src/Functions/getServerPort.cpp
new file mode 100644
index 00000000000..8596bcd6a07
--- /dev/null
+++ b/src/Functions/getServerPort.cpp
@@ -0,0 +1,136 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_COLUMN;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class ExecutableFunctionGetServerPort : public IExecutableFunction
+{
+public:
+    explicit ExecutableFunctionGetServerPort(UInt16 port_) : port(port_) {}
+
+    String getName() const override { return "getServerPort"; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        return DataTypeNumber<UInt16>().createColumnConst(input_rows_count, port);
+    }
+
+private:
+    UInt16 port;
+};
+
+class FunctionBaseGetServerPort : public IFunctionBase
+{
+public:
+    explicit FunctionBaseGetServerPort(bool is_distributed_, UInt16 port_, DataTypes argument_types_, DataTypePtr return_type_)
+        : is_distributed(is_distributed_), port(port_), argument_types(std::move(argument_types_)), return_type(std::move(return_type_))
+    {
+    }
+
+    String getName() const override { return "getServerPort"; }
+
+    const DataTypes & getArgumentTypes() const override
+    {
+        return argument_types;
+    }
+
+    const DataTypePtr & getResultType() const override
+    {
+        return return_type;
+    }
+
+    bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForConstantFolding() const override { return !is_distributed; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
+    {
+        return std::make_unique<ExecutableFunctionGetServerPort>(port);
+    }
+
+private:
+    bool is_distributed;
+    UInt16 port;
+    DataTypes argument_types;
+    DataTypePtr return_type;
+};
+
+class GetServerPortOverloadResolver : public IFunctionOverloadResolver, WithContext
+{
+public:
+    static constexpr auto name = "getServerPort";
+
+    String getName() const override { return name; }
+
+    static FunctionOverloadResolverPtr create(ContextPtr context_)
+    {
+        return std::make_unique<GetServerPortOverloadResolver>(context_);
+    }
+
+    explicit GetServerPortOverloadResolver(ContextPtr context_) : WithContext(context_) {}
+
+    size_t getNumberOfArguments() const override { return 1; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
+    bool isDeterministic() const override { return false; }
+    bool isDeterministicInScopeOfQuery() const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & data_types) const override
+    {
+        size_t number_of_arguments = data_types.size();
+        if (number_of_arguments != 1)
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Number of arguments for function {} doesn't match: passed {}, should be 1",
+                getName(),
+                number_of_arguments);
+        return std::make_shared<DataTypeNumber<UInt16>>();
+    }
+
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
+    {
+        if (!isString(arguments[0].type))
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "The argument of function {} should be a constant string with the name of a setting",
+                getName());
+        const auto * column = arguments[0].column.get();
+        if (!column || !checkAndGetColumnConstStringOrFixedString(column))
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "The argument of function {} should be a constant string with the name of a setting",
+                getName());
+
+        String port_name{column->getDataAt(0)};
+        auto port = getContext()->getServerPort(port_name);
+
+        DataTypes argument_types;
+        argument_types.emplace_back(arguments.back().type);
+        return std::make_unique<FunctionBaseGetServerPort>(getContext()->isDistributed(), port, argument_types, return_type);
+    }
+};
+
+}
+
+void registerFunctionGetServerPort(FunctionFactory & factory)
+{
+    factory.registerFunction<GetServerPortOverloadResolver>();
+}
+
+}
diff --git a/src/Functions/getSetting.cpp b/src/Functions/getSetting.cpp
index 0206de33125..7e146448dd6 100644
--- a/src/Functions/getSetting.cpp
+++ b/src/Functions/getSetting.cpp
@@ -29,10 +29,24 @@ public:
 
     String getName() const override { return name; }
     bool isDeterministic() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 1; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        auto value = getValue(arguments);
+        return applyVisitor(FieldToDataType{}, value);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        auto value = getValue(arguments);
+        return result_type->createColumnConst(input_rows_count, convertFieldToType(value, *result_type));
+    }
+
+private:
+    Field getValue(const ColumnsWithTypeAndName & arguments) const
     {
         if (!isString(arguments[0].type))
             throw Exception{"The argument of function " + String{name} + " should be a constant string with the name of a setting",
@@ -43,20 +57,8 @@ public:
                             ErrorCodes::ILLEGAL_COLUMN};
 
         std::string_view setting_name{column->getDataAt(0)};
-        value = getContext()->getSettingsRef().get(setting_name);
-
-        DataTypePtr type = applyVisitor(FieldToDataType{}, value);
-        value = convertFieldToType(value, *type);
-        return type;
+        return getContext()->getSettingsRef().get(setting_name);
     }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return result_type->createColumnConst(input_rows_count, value);
-    }
-
-private:
-    mutable Field value;
 };
 
 }
diff --git a/src/Functions/getSizeOfEnumType.cpp b/src/Functions/getSizeOfEnumType.cpp
index 504c088a737..17436de02f7 100644
--- a/src/Functions/getSizeOfEnumType.cpp
+++ b/src/Functions/getSizeOfEnumType.cpp
@@ -37,6 +37,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         WhichDataType which(arguments[0]);
diff --git a/src/Functions/globalVariable.cpp b/src/Functions/globalVariable.cpp
index c141ceb2692..581ddbea371 100644
--- a/src/Functions/globalVariable.cpp
+++ b/src/Functions/globalVariable.cpp
@@ -45,6 +45,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (!checkColumnConst<ColumnString>(arguments[0].column.get()))
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index bc02033cfc9..1f7be1a6374 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -8,7 +8,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/TargetSpecific.h>
 #include <Functions/PerformanceAdaptors.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <cmath>
 
 
@@ -246,6 +246,7 @@ private:
     size_t getNumberOfArguments() const override { return 4; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/greatest.cpp b/src/Functions/greatest.cpp
index 9fda95db01f..75837a409e9 100644
--- a/src/Functions/greatest.cpp
+++ b/src/Functions/greatest.cpp
@@ -12,6 +12,7 @@ struct GreatestBaseImpl
 {
     using ResultType = NumberTraits::ResultOfGreatest<A, B>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -42,6 +43,7 @@ struct GreatestSpecialImpl
 {
     using ResultType = make_unsigned_t<A>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/h3EdgeAngle.cpp b/src/Functions/h3EdgeAngle.cpp
index aab8aeaf3a2..6f018e6aa3f 100644
--- a/src/Functions/h3EdgeAngle.cpp
+++ b/src/Functions/h3EdgeAngle.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -10,7 +8,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
@@ -38,6 +36,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3EdgeLengthM.cpp b/src/Functions/h3EdgeLengthM.cpp
index 3d745b21bd7..a50da41620c 100644
--- a/src/Functions/h3EdgeLengthM.cpp
+++ b/src/Functions/h3EdgeLengthM.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -10,7 +8,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
@@ -43,6 +41,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3GetBaseCell.cpp b/src/Functions/h3GetBaseCell.cpp
index 4c424e4a1ab..de4e6ade291 100644
--- a/src/Functions/h3GetBaseCell.cpp
+++ b/src/Functions/h3GetBaseCell.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -9,7 +7,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
@@ -35,6 +33,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3GetFaces.cpp b/src/Functions/h3GetFaces.cpp
new file mode 100644
index 00000000000..5d82c16296c
--- /dev/null
+++ b/src/Functions/h3GetFaces.cpp
@@ -0,0 +1,103 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <base/range.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class FunctionH3GetFaces : public IFunction
+{
+public:
+    static constexpr auto name = "h3GetFaces";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3GetFaces>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt8>());
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+        const auto & data = column->getData();
+
+        auto result_column_data = ColumnUInt8::create();
+        auto & result_data = result_column_data->getData();
+
+        auto result_column_offsets = ColumnArray::ColumnOffsets::create();
+        auto & result_offsets = result_column_offsets->getData();
+        result_offsets.resize(input_rows_count);
+
+        auto current_offset = 0;
+        std::vector<int> faces;
+
+        for (size_t row = 0; row < input_rows_count; row++)
+        {
+            int max_faces = maxFaceCount(data[row]);
+
+            faces.resize(max_faces);
+
+            // function name h3GetFaces (v3.x) changed to getIcosahedronFaces (v4.0.0).
+            getIcosahedronFaces(data[row], faces.data());
+
+            for (int i = 0; i < max_faces; i++)
+            {
+                // valid icosahedron faces are represented by integers 0-19
+                if (faces[i] >= 0 && faces[i] <= 19)
+                {
+                    ++current_offset;
+                    result_data.emplace_back(faces[i]);
+                }
+            }
+
+            result_offsets[row] = current_offset;
+            faces.clear();
+        }
+
+        return ColumnArray::create(std::move(result_column_data), std::move(result_column_offsets));
+    }
+};
+
+}
+
+void registerFunctionH3GetFaces(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3GetFaces>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3GetResolution.cpp b/src/Functions/h3GetResolution.cpp
index f387cdac2f0..5715ceae62d 100644
--- a/src/Functions/h3GetResolution.cpp
+++ b/src/Functions/h3GetResolution.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -9,7 +7,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
@@ -35,6 +33,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3HexAreaM2.cpp b/src/Functions/h3HexAreaM2.cpp
index c4c6b5a57b2..6bd81b84224 100644
--- a/src/Functions/h3HexAreaM2.cpp
+++ b/src/Functions/h3HexAreaM2.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -10,7 +8,7 @@
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
@@ -38,6 +36,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3IndexesAreNeighbors.cpp b/src/Functions/h3IndexesAreNeighbors.cpp
index 2c9ceb9cc32..e84bc431054 100644
--- a/src/Functions/h3IndexesAreNeighbors.cpp
+++ b/src/Functions/h3IndexesAreNeighbors.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -9,7 +7,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
@@ -35,6 +33,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3IsPentagon.cpp b/src/Functions/h3IsPentagon.cpp
new file mode 100644
index 00000000000..039fea39f2a
--- /dev/null
+++ b/src/Functions/h3IsPentagon.cpp
@@ -0,0 +1,77 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <base/range.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class FunctionH3IsPentagon : public IFunction
+{
+public:
+    static constexpr auto name = "h3IsPentagon";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3IsPentagon>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+        const auto & data = column->getData();
+
+        auto dst = ColumnVector<UInt8>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0 ; row < input_rows_count ; row++)
+        {
+            UInt8 res = isPentagon(data[row]);
+            dst_data[row] = res;
+        }
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3IsPentagon(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3IsPentagon>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3IsResClassIII.cpp b/src/Functions/h3IsResClassIII.cpp
new file mode 100644
index 00000000000..f2f7ae445f2
--- /dev/null
+++ b/src/Functions/h3IsResClassIII.cpp
@@ -0,0 +1,77 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/typeid_cast.h>
+#include <base/range.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+class FunctionH3IsResClassIII : public IFunction
+{
+public:
+    static constexpr auto name = "h3IsResClassIII";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3IsResClassIII>(); }
+
+    std::string getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto * arg = arguments[0].get();
+        if (!WhichDataType(arg).isUInt64())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * column = checkAndGetColumn<ColumnUInt64>(arguments[0].column.get());
+        const auto & data = column->getData();
+
+        auto dst = ColumnVector<UInt8>::create();
+        auto & dst_data = dst->getData();
+        dst_data.resize(input_rows_count);
+
+        for (size_t row = 0 ; row < input_rows_count ; row++)
+        {
+            UInt8 res = isResClassIII(data[row]);
+            dst_data[row] = res;
+        }
+        return dst;
+    }
+};
+
+}
+
+void registerFunctionH3IsResClassIII(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3IsResClassIII>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3IsValid.cpp b/src/Functions/h3IsValid.cpp
index 37ec2b99cd9..8f21895db01 100644
--- a/src/Functions/h3IsValid.cpp
+++ b/src/Functions/h3IsValid.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -9,7 +7,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
@@ -35,6 +33,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3ToChildren.cpp b/src/Functions/h3ToChildren.cpp
index d0d586cdf19..30a46bd711a 100644
--- a/src/Functions/h3ToChildren.cpp
+++ b/src/Functions/h3ToChildren.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -12,7 +10,7 @@
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
@@ -44,6 +42,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3ToGeoBoundary.cpp b/src/Functions/h3ToGeoBoundary.cpp
new file mode 100644
index 00000000000..e1e34d1eef3
--- /dev/null
+++ b/src/Functions/h3ToGeoBoundary.cpp
@@ -0,0 +1,94 @@
+#include "config_functions.h"
+
+#if USE_H3
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+
+#include <h3api.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int INCORRECT_DATA;
+}
+
+class FunctionH3ToGeoBoundary : public IFunction
+{
+public:
+    static constexpr auto name = "h3ToGeoBoundary";
+    String getName() const override { return name; }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionH3ToGeoBoundary>(); }
+
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        const auto & arg = arguments[0];
+        if (!isUInt64(arg))
+        {
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument {} of function {}. Must be UInt64",
+                arg->getName(), 1, getName());
+        }
+
+        return std::make_shared<DataTypeArray>(
+            std::make_shared<DataTypeTuple>(
+                DataTypes{std::make_shared<DataTypeFloat64>(), std::make_shared<DataTypeFloat64>()}));
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * col_hindex = arguments[0].column.get();
+
+        auto latitude = ColumnFloat64::create();
+        auto longitude = ColumnFloat64::create();
+        auto offsets = DataTypeNumber<IColumn::Offset>().createColumn();
+        offsets->reserve(input_rows_count);
+        IColumn::Offset current_offset = 0;
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            H3Index h3index = col_hindex->getUInt(row);
+            CellBoundary boundary{};
+
+            auto err = cellToBoundary(h3index, &boundary);
+            if (err)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect H3 index: {}, error: {}", h3index, err);
+
+            for (int vert = 0; vert < boundary.numVerts; ++vert)
+            {
+                latitude->insert(radsToDegs(boundary.verts[vert].lat));
+                longitude->insert(radsToDegs(boundary.verts[vert].lng));
+            }
+
+            current_offset += boundary.numVerts;
+            offsets->insert(current_offset);
+        }
+
+        return ColumnArray::create(
+            ColumnTuple::create(Columns{std::move(latitude), std::move(longitude)}),
+            std::move(offsets));
+    }
+};
+
+void registerFunctionH3ToGeoBoundary(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionH3ToGeoBoundary>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/h3ToParent.cpp b/src/Functions/h3ToParent.cpp
index 0ec3df37e2e..d896253822d 100644
--- a/src/Functions/h3ToParent.cpp
+++ b/src/Functions/h3ToParent.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -10,7 +8,7 @@
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
 #include <IO/WriteHelpers.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <constants.h>
 #include <h3api.h>
@@ -38,6 +36,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3ToString.cpp b/src/Functions/h3ToString.cpp
index 372afb97296..25d82d2d40c 100644
--- a/src/Functions/h3ToString.cpp
+++ b/src/Functions/h3ToString.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -37,6 +35,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const auto * arg = arguments[0].get();
diff --git a/src/Functions/h3kRing.cpp b/src/Functions/h3kRing.cpp
index 583681e315e..857282ec0aa 100644
--- a/src/Functions/h3kRing.cpp
+++ b/src/Functions/h3kRing.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -13,7 +11,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include <h3api.h>
 
@@ -41,6 +39,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/h3toGeo.cpp b/src/Functions/h3toGeo.cpp
index 64facd1f010..d92ac2aadbb 100644
--- a/src/Functions/h3toGeo.cpp
+++ b/src/Functions/h3toGeo.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -42,6 +40,8 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const auto * arg = arguments[0].get();
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index 2e7428332cb..1062fbed600 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -56,6 +56,8 @@ public:
 
     bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override;
 };
 
diff --git a/src/Functions/hasThreadFuzzer.cpp b/src/Functions/hasThreadFuzzer.cpp
index e9b48aa70f9..7ee0b3ee687 100644
--- a/src/Functions/hasThreadFuzzer.cpp
+++ b/src/Functions/hasThreadFuzzer.cpp
@@ -31,6 +31,8 @@ public:
         return 0;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
     {
         return std::make_shared<DataTypeUInt8>();
diff --git a/src/Functions/hasToken.cpp b/src/Functions/hasToken.cpp
index f20edffbdd8..72d6c11a5fa 100644
--- a/src/Functions/hasToken.cpp
+++ b/src/Functions/hasToken.cpp
@@ -14,7 +14,7 @@ struct NameHasToken
     static constexpr auto name = "hasToken";
 };
 
-using FunctionHasToken = FunctionsStringSearch<HasTokenImpl<VolnitskyCaseSensitiveToken, false>, NameHasToken>;
+using FunctionHasToken = FunctionsStringSearch<HasTokenImpl<NameHasToken, VolnitskyCaseSensitiveToken, false>>;
 
 }
 
diff --git a/src/Functions/hasTokenCaseInsensitive.cpp b/src/Functions/hasTokenCaseInsensitive.cpp
index 28f5b9e80c1..a0280bc12a5 100644
--- a/src/Functions/hasTokenCaseInsensitive.cpp
+++ b/src/Functions/hasTokenCaseInsensitive.cpp
@@ -15,7 +15,7 @@ struct NameHasTokenCaseInsensitive
 };
 
 using FunctionHasTokenCaseInsensitive
-    = FunctionsStringSearch<HasTokenImpl<VolnitskyCaseInsensitiveToken, false>, NameHasTokenCaseInsensitive>;
+    = FunctionsStringSearch<HasTokenImpl<NameHasTokenCaseInsensitive, VolnitskyCaseInsensitiveToken, false>>;
 
 }
 
diff --git a/src/Functions/hostName.cpp b/src/Functions/hostName.cpp
deleted file mode 100644
index fd8400d3b9f..00000000000
--- a/src/Functions/hostName.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Common/DNSResolver.h>
-#include <Core/Field.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-namespace
-{
-
-/// Get the host name. Is is constant on single server, but is not constant in distributed queries.
-class FunctionHostName : public IFunction
-{
-public:
-    static constexpr auto name = "hostName";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionHostName>(context->isDistributed());
-    }
-
-    explicit FunctionHostName(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isDeterministic() const override { return false; }
-
-    bool isDeterministicInScopeOfQuery() const override
-    {
-        return true;
-    }
-
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        return result_type->createColumnConst(input_rows_count, DNSResolver::instance().getHostName());
-    }
-private:
-    bool is_distributed;
-};
-
-}
-
-void registerFunctionHostName(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionHostName>();
-    factory.registerAlias("hostname", "hostName");
-}
-
-}
diff --git a/src/Functions/hyperscanRegexpChecker.cpp b/src/Functions/hyperscanRegexpChecker.cpp
new file mode 100644
index 00000000000..b3c46e34daa
--- /dev/null
+++ b/src/Functions/hyperscanRegexpChecker.cpp
@@ -0,0 +1,29 @@
+#include <Functions/hyperscanRegexpChecker.h>
+
+#include <Common/Exception.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+void checkRegexp(const std::vector<StringRef> & refs, size_t max_hyperscan_regexp_length, size_t max_hyperscan_regexp_total_length)
+{
+    if (max_hyperscan_regexp_length > 0 || max_hyperscan_regexp_total_length > 0)
+    {
+        size_t total_regexp_length = 0;
+        for (const auto & pattern : refs)
+        {
+            if (max_hyperscan_regexp_length > 0 && pattern.size > max_hyperscan_regexp_length)
+                throw Exception("Regexp length too large", ErrorCodes::BAD_ARGUMENTS);
+            total_regexp_length += pattern.size;
+        }
+
+        if (max_hyperscan_regexp_total_length > 0 && total_regexp_length > max_hyperscan_regexp_total_length)
+            throw Exception("Total regexp lengths too large", ErrorCodes::BAD_ARGUMENTS);
+    }
+}
+
+}
diff --git a/src/Functions/hyperscanRegexpChecker.h b/src/Functions/hyperscanRegexpChecker.h
new file mode 100644
index 00000000000..1eea53722c1
--- /dev/null
+++ b/src/Functions/hyperscanRegexpChecker.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <base/StringRef.h>
+
+namespace DB
+{
+
+void checkRegexp(const std::vector<StringRef> & refs, size_t max_hyperscan_regexp_length, size_t max_hyperscan_regexp_total_length);
+
+}
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index d15d9e1f710..b3d05226bda 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -19,6 +19,7 @@ public:
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
     bool isSuitableForConstantFolding() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index 8b930a73dfb..953aff3568e 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -1,7 +1,6 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -15,15 +14,15 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/MaskOperations.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/GatherUtils/GatherUtils.h>
 #include <Functions/GatherUtils/Algorithms.h>
 #include <Functions/FunctionIfBase.h>
-#include <Functions/FunctionFactory.h>
 #include <Interpreters/castColumn.h>
+#include <Functions/FunctionFactory.h>
 
 
 namespace DB
@@ -45,6 +44,74 @@ using namespace GatherUtils;
   * then, else - numeric types for which there is a general type, or dates, datetimes, or strings, or arrays of these types.
   */
 
+template <typename ArrayCond, typename ArrayA, typename ArrayB, typename ArrayResult, typename ResultType>
+static inline void fillVectorVector(const ArrayCond & cond, const ArrayA & a, const ArrayB & b, ArrayResult & res)
+{
+    size_t size = cond.size();
+    bool a_is_short = a.size() < size;
+    bool b_is_short = b.size() < size;
+
+    if (a_is_short && b_is_short)
+    {
+        size_t a_index = 0, b_index = 0;
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a[a_index++]) : static_cast<ResultType>(b[b_index++]);
+    }
+    else if (a_is_short)
+    {
+        size_t a_index = 0;
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a[a_index++]) : static_cast<ResultType>(b[i]);
+    }
+    else if (b_is_short)
+    {
+        size_t b_index = 0;
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[b_index++]);
+    }
+    else
+    {
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[i]);
+    }
+}
+
+template <typename ArrayCond, typename ArrayA, typename B, typename ArrayResult, typename ResultType>
+static inline void fillVectorConstant(const ArrayCond & cond, const ArrayA & a, B b, ArrayResult & res)
+{
+    size_t size = cond.size();
+    bool a_is_short = a.size() < size;
+    if (a_is_short)
+    {
+        size_t a_index = 0;
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a[a_index++]) : static_cast<ResultType>(b);
+    }
+    else
+    {
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b);
+    }
+}
+
+template <typename ArrayCond, typename A, typename ArrayB, typename ArrayResult, typename ResultType>
+static inline void fillConstantVector(const ArrayCond & cond, A a, const ArrayB & b, ArrayResult & res)
+{
+    size_t size = cond.size();
+    bool b_is_short = b.size() < size;
+    if (b_is_short)
+    {
+        size_t b_index = 0;
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[b_index++]);
+    }
+    else
+    {
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[i]);
+    }
+}
+
 template <typename A, typename B, typename ResultType>
 struct NumIfImpl
 {
@@ -52,15 +119,14 @@ struct NumIfImpl
     using ArrayA = typename ColumnVector<A>::Container;
     using ArrayB = typename ColumnVector<B>::Container;
     using ColVecResult = ColumnVector<ResultType>;
+    using ArrayResult = typename ColVecResult::Container;
 
     static ColumnPtr vectorVector(const ArrayCond & cond, const ArrayA & a, const ArrayB & b, UInt32)
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size);
-        typename ColVecResult::Container & res = col_res->getData();
-
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[i]);
+        ArrayResult & res = col_res->getData();
+        fillVectorVector<ArrayCond, ArrayA, ArrayB, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 
@@ -68,10 +134,8 @@ struct NumIfImpl
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size);
-        typename ColVecResult::Container & res = col_res->getData();
-
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b);
+        ArrayResult & res = col_res->getData();
+        fillVectorConstant<ArrayCond, ArrayA, B, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 
@@ -79,10 +143,8 @@ struct NumIfImpl
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size);
-        typename ColVecResult::Container & res = col_res->getData();
-
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[i]);
+        ArrayResult & res = col_res->getData();
+        fillConstantVector<ArrayCond, A, ArrayB, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 
@@ -90,7 +152,7 @@ struct NumIfImpl
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size);
-        typename ColVecResult::Container & res = col_res->getData();
+        ArrayResult & res = col_res->getData();
 
         for (size_t i = 0; i < size; ++i)
             res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b);
@@ -107,15 +169,14 @@ struct NumIfImpl<Decimal<A>, Decimal<B>, Decimal<R>>
     using ArrayB = typename ColumnDecimal<Decimal<B>>::Container;
     using ColVecResult = ColumnDecimal<ResultType>;
     using Block = ColumnsWithTypeAndName;
+    using ArrayResult = typename ColVecResult::Container;
 
     static ColumnPtr vectorVector(const ArrayCond & cond, const ArrayA & a, const ArrayB & b, UInt32 scale)
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size, scale);
-        typename ColVecResult::Container & res = col_res->getData();
-
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[i]);
+        ArrayResult & res = col_res->getData();
+        fillVectorVector<ArrayCond, ArrayA, ArrayB, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 
@@ -123,10 +184,8 @@ struct NumIfImpl<Decimal<A>, Decimal<B>, Decimal<R>>
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size, scale);
-        typename ColVecResult::Container & res = col_res->getData();
-
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b);
+        ArrayResult & res = col_res->getData();
+        fillVectorConstant<ArrayCond, ArrayA, B, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 
@@ -134,10 +193,8 @@ struct NumIfImpl<Decimal<A>, Decimal<B>, Decimal<R>>
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size, scale);
-        typename ColVecResult::Container & res = col_res->getData();
-
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[i]);
+        ArrayResult & res = col_res->getData();
+        fillConstantVector<ArrayCond, A, ArrayB, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 
@@ -145,7 +202,7 @@ struct NumIfImpl<Decimal<A>, Decimal<B>, Decimal<R>>
     {
         size_t size = cond.size();
         auto col_res = ColVecResult::create(size, scale);
-        typename ColVecResult::Container & res = col_res->getData();
+        ArrayResult & res = col_res->getData();
 
         for (size_t i = 0; i < size; ++i)
             res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b);
@@ -164,7 +221,7 @@ private:
     template <typename T0, typename T1>
     static UInt32 decimalScale(const ColumnsWithTypeAndName & arguments [[maybe_unused]])
     {
-        if constexpr (IsDecimalNumber<T0> && IsDecimalNumber<T1>)
+        if constexpr (is_decimal<T0> && is_decimal<T1>)
         {
             UInt32 left_scale = getDecimalScale(*arguments[1].type);
             UInt32 right_scale = getDecimalScale(*arguments[2].type);
@@ -359,8 +416,8 @@ private:
     ColumnPtr executeTyped(
         const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
-        using ColVecT0 = std::conditional_t<IsDecimalNumber<T0>, ColumnDecimal<T0>, ColumnVector<T0>>;
-        using ColVecT1 = std::conditional_t<IsDecimalNumber<T1>, ColumnDecimal<T1>, ColumnVector<T1>>;
+        using ColVecT0 = ColumnVectorOrDecimal<T0>;
+        using ColVecT1 = ColumnVectorOrDecimal<T1>;
 
         const IColumn * col_left_untyped = arguments[1].column.get();
 
@@ -586,6 +643,9 @@ private:
         bool then_is_const = isColumnConst(*col_then);
         bool else_is_const = isColumnConst(*col_else);
 
+        bool then_is_short = col_then->size() < cond_col->size();
+        bool else_is_short = col_else->size() < cond_col->size();
+
         const auto & cond_array = cond_col->getData();
 
         if (then_is_const && else_is_const)
@@ -605,30 +665,38 @@ private:
         {
             const IColumn & then_nested_column = assert_cast<const ColumnConst &>(*col_then).getDataColumn();
 
+            size_t else_index = 0;
             for (size_t i = 0; i < input_rows_count; ++i)
             {
                 if (cond_array[i])
                     result_column->insertFrom(then_nested_column, 0);
                 else
-                    result_column->insertFrom(*col_else, i);
+                    result_column->insertFrom(*col_else, else_is_short ? else_index++ : i);
             }
         }
         else if (else_is_const)
         {
             const IColumn & else_nested_column = assert_cast<const ColumnConst &>(*col_else).getDataColumn();
 
+            size_t then_index = 0;
             for (size_t i = 0; i < input_rows_count; ++i)
             {
                 if (cond_array[i])
-                    result_column->insertFrom(*col_then, i);
+                    result_column->insertFrom(*col_then, then_is_short ? then_index++ : i);
                 else
                     result_column->insertFrom(else_nested_column, 0);
             }
         }
         else
         {
+            size_t then_index = 0, else_index = 0;
             for (size_t i = 0; i < input_rows_count; ++i)
-                result_column->insertFrom(cond_array[i] ? *col_then : *col_else, i);
+            {
+                if (cond_array[i])
+                    result_column->insertFrom(*col_then, then_is_short ? then_index++ : i);
+                else
+                    result_column->insertFrom(*col_else, else_is_short ? else_index++ : i);
+            }
         }
 
         return result_column;
@@ -702,7 +770,8 @@ private:
         return nullptr;
     }
 
-    static ColumnPtr materializeColumnIfConst(const ColumnPtr & column)
+    template <typename AnyColumnPtr>
+    static ColumnPtr materializeColumnIfConst(const AnyColumnPtr & column)
     {
         return column->convertToFullColumnIfConst();
     }
@@ -816,6 +885,9 @@ private:
         if (then_is_null && else_is_null)
             return result_type->createColumnConstWithDefaultValue(input_rows_count);
 
+        bool then_is_short = arg_then.column->size() < arg_cond.column->size();
+        bool else_is_short = arg_else.column->size() < arg_cond.column->size();
+
         const ColumnUInt8 * cond_col = typeid_cast<const ColumnUInt8 *>(arg_cond.column.get());
         const ColumnConst * cond_const_col = checkAndGetColumnConst<ColumnVector<UInt8>>(arg_cond.column.get());
 
@@ -824,15 +896,17 @@ private:
         {
             if (cond_col)
             {
+                auto arg_else_column = arg_else.column;
+                auto result_column = IColumn::mutate(std::move(arg_else_column));
+                if (else_is_short)
+                    result_column->expand(cond_col->getData(), true);
                 if (isColumnNullable(*arg_else.column))
                 {
-                    auto arg_else_column = arg_else.column;
-                    auto result_column = IColumn::mutate(std::move(arg_else_column));
                     assert_cast<ColumnNullable &>(*result_column).applyNullMap(assert_cast<const ColumnUInt8 &>(*arg_cond.column));
                     return result_column;
                 }
                 else
-                    return ColumnNullable::create(materializeColumnIfConst(arg_else.column), arg_cond.column);
+                    return ColumnNullable::create(materializeColumnIfConst(result_column), arg_cond.column);
             }
             else if (cond_const_col)
             {
@@ -852,25 +926,30 @@ private:
         {
             if (cond_col)
             {
-                size_t size = input_rows_count;
-                const auto & null_map_data = cond_col->getData();
-
-                auto negated_null_map = ColumnUInt8::create();
-                auto & negated_null_map_data = negated_null_map->getData();
-                negated_null_map_data.resize(size);
-
-                for (size_t i = 0; i < size; ++i)
-                    negated_null_map_data[i] = !null_map_data[i];
+                auto arg_then_column = arg_then.column;
+                auto result_column = IColumn::mutate(std::move(arg_then_column));
+                if (then_is_short)
+                    result_column->expand(cond_col->getData(), false);
 
                 if (isColumnNullable(*arg_then.column))
                 {
-                    auto arg_then_column = arg_then.column;
-                    auto result_column = IColumn::mutate(std::move(arg_then_column));
                     assert_cast<ColumnNullable &>(*result_column).applyNegatedNullMap(assert_cast<const ColumnUInt8 &>(*arg_cond.column));
                     return result_column;
                 }
                 else
-                    return ColumnNullable::create(materializeColumnIfConst(arg_then.column), std::move(negated_null_map));
+                {
+                    size_t size = input_rows_count;
+                    const auto & null_map_data = cond_col->getData();
+
+                    auto negated_null_map = ColumnUInt8::create();
+                    auto & negated_null_map_data = negated_null_map->getData();
+                    negated_null_map_data.resize(size);
+
+                    for (size_t i = 0; i < size; ++i)
+                        negated_null_map_data[i] = !null_map_data[i];
+
+                    return ColumnNullable::create(materializeColumnIfConst(result_column), std::move(negated_null_map));
+                }
             }
             else if (cond_const_col)
             {
@@ -888,6 +967,28 @@ private:
         return nullptr;
     }
 
+    static void executeShortCircuitArguments(ColumnsWithTypeAndName & arguments)
+    {
+        int last_short_circuit_argument_index = checkShirtCircuitArguments(arguments);
+        if (last_short_circuit_argument_index == -1)
+            return;
+
+        /// Check if condition is const or null to not create full mask from it.
+        if ((isColumnConst(*arguments[0].column) || arguments[0].column->onlyNull()) && !arguments[0].column->empty())
+        {
+            bool value = arguments[0].column->getBool(0);
+            executeColumnIfNeeded(arguments[1], !value);
+            executeColumnIfNeeded(arguments[2], value);
+            return;
+        }
+
+        IColumn::Filter mask(arguments[0].column->size(), 1);
+        auto mask_info = extractMask(mask, arguments[0].column);
+        maskedExecute(arguments[1], mask, mask_info);
+        inverseMask(mask, mask_info);
+        maskedExecute(arguments[2], mask, mask_info);
+    }
+
 public:
     String getName() const override
     {
@@ -897,6 +998,14 @@ public:
     size_t getNumberOfArguments() const override { return 3; }
 
     bool useDefaultImplementationForNulls() const override { return false; }
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
+    {
+        settings.enable_lazy_execution_for_first_argument = false;
+        settings.enable_lazy_execution_for_common_descendants_of_arguments = false;
+        settings.force_enable_lazy_execution = false;
+        return true;
+    }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
     /// Get result types by argument types. If the function does not apply to these arguments, throw an exception.
@@ -916,8 +1025,10 @@ public:
         return getLeastSupertype({arguments[1], arguments[2]});
     }
 
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        ColumnsWithTypeAndName arguments = std::move(args);
+        executeShortCircuitArguments(arguments);
         ColumnPtr res;
         if (   (res = executeForConstAndNullableCondition(arguments, result_type, input_rows_count))
             || (res = executeForNullThenElse(arguments, result_type, input_rows_count))
diff --git a/src/Functions/ifNotFinite.cpp b/src/Functions/ifNotFinite.cpp
index a5e3131117e..49f74c2f5d0 100644
--- a/src/Functions/ifNotFinite.cpp
+++ b/src/Functions/ifNotFinite.cpp
@@ -32,6 +32,7 @@ public:
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
diff --git a/src/Functions/ifNull.cpp b/src/Functions/ifNull.cpp
index 82b63f4dbda..31880b81a41 100644
--- a/src/Functions/ifNull.cpp
+++ b/src/Functions/ifNull.cpp
@@ -36,6 +36,7 @@ public:
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/ignore.cpp b/src/Functions/ignore.cpp
index 176bc9afee2..931ef4a00ed 100644
--- a/src/Functions/ignore.cpp
+++ b/src/Functions/ignore.cpp
@@ -30,6 +30,7 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
     bool isSuitableForConstantFolding() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     /// We should never return LowCardinality result, cause we declare that result is always constant zero.
     /// (in getResultIfAlwaysReturnsConstantAndHasArguments)
diff --git a/src/Functions/ilike.cpp b/src/Functions/ilike.cpp
index fc3e38daeba..116c945e04f 100644
--- a/src/Functions/ilike.cpp
+++ b/src/Functions/ilike.cpp
@@ -12,8 +12,8 @@ struct NameILike
     static constexpr auto name = "ilike";
 };
 
-using ILikeImpl = MatchImpl<true, false, /*case-insensitive*/true>;
-using FunctionILike = FunctionsStringSearch<ILikeImpl, NameILike>;
+using ILikeImpl = MatchImpl<NameILike, true, false, /*case-insensitive*/true>;
+using FunctionILike = FunctionsStringSearch<ILikeImpl>;
 
 }
 
diff --git a/src/Functions/in.cpp b/src/Functions/in.cpp
index 7cd9f64004d..87e5886b247 100644
--- a/src/Functions/in.cpp
+++ b/src/Functions/in.cpp
@@ -88,6 +88,8 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return null_is_skipped; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, [[maybe_unused]] size_t input_rows_count) const override
     {
         if constexpr (ignore_set)
@@ -102,7 +104,7 @@ public:
             throw Exception("Second argument for function '" + getName() + "' must be Set; found " + column_set_ptr->getName(),
                 ErrorCodes::ILLEGAL_COLUMN);
 
-        DB::Block columns_of_key_columns;
+        ColumnsWithTypeAndName columns_of_key_columns;
 
         /// First argument may be a tuple or a single column.
         const ColumnWithTypeAndName & left_arg = arguments[0];
@@ -125,16 +127,16 @@ public:
             const DataTypes & tuple_types = type_tuple->getElements();
             size_t tuple_size = tuple_columns.size();
             for (size_t i = 0; i < tuple_size; ++i)
-                columns_of_key_columns.insert({ tuple_columns[i], tuple_types[i], "" });
+                columns_of_key_columns.emplace_back(tuple_columns[i], tuple_types[i], "_" + toString(i));
         }
         else
-            columns_of_key_columns.insert(left_arg);
+            columns_of_key_columns.emplace_back(left_arg);
 
         /// Replace single LowCardinality column to it's dictionary if possible.
         ColumnPtr lc_indexes = nullptr;
-        if (columns_of_key_columns.columns() == 1)
+        if (columns_of_key_columns.size() == 1)
         {
-            auto & arg = columns_of_key_columns.safeGetByPosition(0);
+            auto & arg = columns_of_key_columns.at(0);
             const auto * col = arg.column.get();
             if (const auto * const_col = typeid_cast<const ColumnConst *>(col))
                 col = &const_col->getDataColumn();
diff --git a/src/Functions/indexHint.cpp b/src/Functions/indexHint.cpp
index f3c856c38ce..bb38a56cf27 100644
--- a/src/Functions/indexHint.cpp
+++ b/src/Functions/indexHint.cpp
@@ -41,6 +41,8 @@ public:
 
     bool isSuitableForConstantFolding() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     String getName() const override
     {
         return name;
diff --git a/src/Functions/initialQueryID.cpp b/src/Functions/initialQueryID.cpp
index 118339a8fb6..d032bde24e3 100644
--- a/src/Functions/initialQueryID.cpp
+++ b/src/Functions/initialQueryID.cpp
@@ -30,6 +30,8 @@ public:
 
     inline bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, initial_query_id);
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index b097d81e385..02db90bfc43 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -9,7 +9,7 @@
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
 
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
@@ -37,7 +37,10 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForNulls() const override { return false; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
diff --git a/src/Functions/intDiv.cpp b/src/Functions/intDiv.cpp
index 14df8af66ca..f2713bb1adb 100644
--- a/src/Functions/intDiv.cpp
+++ b/src/Functions/intDiv.cpp
@@ -23,18 +23,32 @@ struct DivideIntegralByConstantImpl
     using Op = DivideIntegralImpl<A, B>;
     using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
-    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
+    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size, const NullMap * right_nullmap)
     {
-        if constexpr (op_case == OpCase::Vector)
-            for (size_t i = 0; i < size; ++i)
-                c[i] = Op::template apply<ResultType>(a[i], b[i]);
-        else if constexpr (op_case == OpCase::LeftConstant)
-            for (size_t i = 0; i < size; ++i)
-                c[i] = Op::template apply<ResultType>(*a, b[i]);
-        else
+        if constexpr (op_case == OpCase::RightConstant)
+        {
+            if (right_nullmap && (*right_nullmap)[0])
+                return;
+
             vectorConstant(a, *b, c, size);
+        }
+        else
+        {
+            if (right_nullmap)
+            {
+                for (size_t i = 0; i < size; ++i)
+                    if ((*right_nullmap)[i])
+                        c[i] = ResultType();
+                    else
+                        apply<op_case>(a, b, c, i);
+            }
+            else
+                for (size_t i = 0; i < size; ++i)
+                    apply<op_case>(a, b, c, i);
+        }
     }
 
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
@@ -68,6 +82,16 @@ struct DivideIntegralByConstantImpl
 
         divideImpl(a_pos, b, c_pos, size);
     }
+
+private:
+    template <OpCase op_case>
+    static inline void apply(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t i)
+    {
+        if constexpr (op_case == OpCase::Vector)
+            c[i] = Op::template apply<ResultType>(a[i], b[i]);
+        else
+            c[i] = Op::template apply<ResultType>(*a, b[i]);
+    }
 };
 
 /** Specializations are specified for dividing numbers of the type UInt64, UInt32, Int64, Int32 by the numbers of the same sign.
diff --git a/src/Functions/intDivOrZero.cpp b/src/Functions/intDivOrZero.cpp
index e44d53244cb..d1b3429abfb 100644
--- a/src/Functions/intDivOrZero.cpp
+++ b/src/Functions/intDivOrZero.cpp
@@ -10,6 +10,7 @@ struct DivideIntegralOrZeroImpl
 {
     using ResultType = typename NumberTraits::ResultOfIntegerDivision<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/intExp10.cpp b/src/Functions/intExp10.cpp
index daf87e717e9..abaa17c862b 100644
--- a/src/Functions/intExp10.cpp
+++ b/src/Functions/intExp10.cpp
@@ -18,6 +18,7 @@ struct IntExp10Impl
 {
     using ResultType = UInt64;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
@@ -54,7 +55,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameIntExp10>
         if (left_float < 0 || right_float > 19)
             return {};
 
-        return { true };
+        return { .is_monotonic = true };
     }
 };
 
diff --git a/src/Functions/intExp2.cpp b/src/Functions/intExp2.cpp
index d09f51a1269..b2c7e80ae4b 100644
--- a/src/Functions/intExp2.cpp
+++ b/src/Functions/intExp2.cpp
@@ -19,6 +19,7 @@ struct IntExp2Impl
 {
     using ResultType = UInt64;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply([[maybe_unused]] A a)
     {
@@ -57,7 +58,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameIntExp2>
         if (left_float < 0 || right_float > 63)
             return {};
 
-        return { true };
+        return { .is_monotonic = true };
     }
 };
 
diff --git a/src/Functions/isConstant.cpp b/src/Functions/isConstant.cpp
index 3069ec79ae1..7ea3e26cb82 100644
--- a/src/Functions/isConstant.cpp
+++ b/src/Functions/isConstant.cpp
@@ -27,6 +27,8 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override
     {
         return 1;
diff --git a/src/Functions/isDecimalOverflow.cpp b/src/Functions/isDecimalOverflow.cpp
index d409afaf234..9962d4b7314 100644
--- a/src/Functions/isDecimalOverflow.cpp
+++ b/src/Functions/isDecimalOverflow.cpp
@@ -36,6 +36,7 @@ public:
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -127,10 +128,9 @@ private:
             dst_data[i] = outOfDigits<T>(src_data[i], precision);
     }
 
-    template <typename T>
+    template <is_decimal T>
     static bool outOfDigits(T dec, UInt32 precision)
     {
-        static_assert(IsDecimalNumber<T>);
         using NativeT = typename T::NativeType;
 
         if (precision > DecimalUtils::max_precision<T>)
diff --git a/src/Functions/isFinite.cpp b/src/Functions/isFinite.cpp
index 85e84e55b3b..b1ff5f326e5 100644
--- a/src/Functions/isFinite.cpp
+++ b/src/Functions/isFinite.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionNumericPredicate.h>
 #include <Functions/FunctionFactory.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <type_traits>
 
 
diff --git a/src/Functions/isIPAddressContainedIn.cpp b/src/Functions/isIPAddressContainedIn.cpp
index 0886ef55e7b..048fa04adb1 100644
--- a/src/Functions/isIPAddressContainedIn.cpp
+++ b/src/Functions/isIPAddressContainedIn.cpp
@@ -12,7 +12,7 @@
 #include <charconv>
 
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 namespace DB::ErrorCodes
 {
     extern const int CANNOT_PARSE_TEXT;
@@ -126,6 +126,7 @@ namespace DB
         static constexpr auto name = "isIPAddressInRange";
         String getName() const override { return name; }
         static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIsIPAddressContainedIn>(); }
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
         ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /* return_type */, size_t input_rows_count) const override
         {
diff --git a/src/Functions/isInfinite.cpp b/src/Functions/isInfinite.cpp
index b509d5e0765..1fbc134d0c9 100644
--- a/src/Functions/isInfinite.cpp
+++ b/src/Functions/isInfinite.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionNumericPredicate.h>
 #include <Functions/FunctionFactory.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <type_traits>
 
 
diff --git a/src/Functions/isNotNull.cpp b/src/Functions/isNotNull.cpp
index 81c870a6303..49c5964012a 100644
--- a/src/Functions/isNotNull.cpp
+++ b/src/Functions/isNotNull.cpp
@@ -32,6 +32,7 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes &) const override
diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index de840dab2bf..f9111b2dbbb 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -31,6 +31,7 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes &) const override
diff --git a/src/Functions/isValidUTF8.cpp b/src/Functions/isValidUTF8.cpp
index abdda53990d..0168a36b5b5 100644
--- a/src/Functions/isValidUTF8.cpp
+++ b/src/Functions/isValidUTF8.cpp
@@ -1,14 +1,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringOrArrayToT.h>
-
-#include <cstring>
-
-#ifdef __SSE4_1__
-#    include <emmintrin.h>
-#    include <smmintrin.h>
-#    include <tmmintrin.h>
-#endif
+#include <Common/isValidUTF8.h>
 
 namespace DB
 {
@@ -71,75 +64,8 @@ SOFTWARE.
  * +--------------------+------------+-------------+------------+-------------+
  */
 
-    static inline UInt8 isValidUTF8Naive(const UInt8 * data, UInt64 len)
-    {
-        while (len)
-        {
-            int bytes;
-            const UInt8 byte1 = data[0];
-            /* 00..7F */
-            if (byte1 <= 0x7F)
-            {
-                bytes = 1;
-            }
-            /* C2..DF, 80..BF */
-            else if (len >= 2 && byte1 >= 0xC2 && byte1 <= 0xDF && static_cast<Int8>(data[1]) <= static_cast<Int8>(0xBF))
-            {
-                bytes = 2;
-            }
-            else if (len >= 3)
-            {
-                const UInt8 byte2 = data[1];
-                bool byte2_ok = static_cast<Int8>(byte2) <= static_cast<Int8>(0xBF);
-                bool byte3_ok = static_cast<Int8>(data[2]) <= static_cast<Int8>(0xBF);
-
-                if (byte2_ok && byte3_ok &&
-                    /* E0, A0..BF, 80..BF */
-                    ((byte1 == 0xE0 && byte2 >= 0xA0) ||
-                     /* E1..EC, 80..BF, 80..BF */
-                     (byte1 >= 0xE1 && byte1 <= 0xEC) ||
-                     /* ED, 80..9F, 80..BF */
-                     (byte1 == 0xED && byte2 <= 0x9F) ||
-                     /* EE..EF, 80..BF, 80..BF */
-                     (byte1 >= 0xEE && byte1 <= 0xEF)))
-                {
-                    bytes = 3;
-                }
-                else if (len >= 4)
-                {
-                    bool byte4_ok = static_cast<Int8>(data[3]) <= static_cast<Int8>(0xBF);
-                    if (byte2_ok && byte3_ok && byte4_ok &&
-                        /* F0, 90..BF, 80..BF, 80..BF */
-                        ((byte1 == 0xF0 && byte2 >= 0x90) ||
-                         /* F1..F3, 80..BF, 80..BF, 80..BF */
-                         (byte1 >= 0xF1 && byte1 <= 0xF3) ||
-                         /* F4, 80..8F, 80..BF, 80..BF */
-                         (byte1 == 0xF4 && byte2 <= 0x8F)))
-                    {
-                        bytes = 4;
-                    }
-                    else
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-            len -= bytes;
-            data += bytes;
-        }
-        return true;
-    }
-
 #ifndef __SSE4_1__
-    static inline UInt8 isValidUTF8(const UInt8 * data, UInt64 len) { return isValidUTF8Naive(data, len); }
+    static inline UInt8 isValidUTF8(const UInt8 * data, UInt64 len) { return DB::UTF8::isValidUTF8(data, len); }
 #else
     static inline UInt8 isValidUTF8(const UInt8 * data, UInt64 len)
     {
diff --git a/src/Functions/isZeroOrNull.cpp b/src/Functions/isZeroOrNull.cpp
index a2a06af7569..1c3b6889f16 100644
--- a/src/Functions/isZeroOrNull.cpp
+++ b/src/Functions/isZeroOrNull.cpp
@@ -39,6 +39,7 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & types) const override
diff --git a/src/Functions/least.cpp b/src/Functions/least.cpp
index 6ba7989a344..b7fe2b302ff 100644
--- a/src/Functions/least.cpp
+++ b/src/Functions/least.cpp
@@ -12,6 +12,7 @@ struct LeastBaseImpl
 {
     using ResultType = NumberTraits::ResultOfLeast<A, B>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
@@ -42,6 +43,7 @@ struct LeastSpecialImpl
 {
     using ResultType = std::make_signed_t<A>;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/lemmatize.cpp b/src/Functions/lemmatize.cpp
index 35d2bfebe08..78f9ee75ed8 100644
--- a/src/Functions/lemmatize.cpp
+++ b/src/Functions/lemmatize.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
@@ -79,6 +77,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/like.cpp b/src/Functions/like.cpp
index 37d9f006187..bd73aa4d471 100644
--- a/src/Functions/like.cpp
+++ b/src/Functions/like.cpp
@@ -1,22 +1,10 @@
 #include "FunctionsStringSearch.h"
 #include "FunctionFactory.h"
-#include "MatchImpl.h"
+#include "like.h"
 
 
 namespace DB
 {
-namespace
-{
-
-struct NameLike
-{
-    static constexpr auto name = "like";
-};
-
-using LikeImpl = MatchImpl</*SQL LIKE */ true, /*revert*/false>;
-using FunctionLike = FunctionsStringSearch<LikeImpl, NameLike>;
-
-}
 
 void registerFunctionLike(FunctionFactory & factory)
 {
diff --git a/src/Functions/like.h b/src/Functions/like.h
new file mode 100644
index 00000000000..a00891ec64c
--- /dev/null
+++ b/src/Functions/like.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "MatchImpl.h"
+#include "FunctionsStringSearch.h"
+
+namespace DB
+{
+
+struct NameLike
+{
+    static constexpr auto name = "like";
+};
+
+using LikeImpl = MatchImpl<NameLike, /*SQL LIKE */ true, /*revert*/false>;
+using FunctionLike = FunctionsStringSearch<LikeImpl>;
+
+}
diff --git a/src/Functions/likePatternToRegexp.h b/src/Functions/likePatternToRegexp.h
index 0cdaba9a866..15e38e61ab4 100644
--- a/src/Functions/likePatternToRegexp.h
+++ b/src/Functions/likePatternToRegexp.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index 2ccc4d2ffd2..acf2a2041ec 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -6,7 +6,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
@@ -27,6 +27,8 @@ namespace
 
         size_t getNumberOfArguments() const override { return 1; }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
         DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
         {
             if (!isString(arguments[0]))
diff --git a/src/Functions/lowCardinalityIndices.cpp b/src/Functions/lowCardinalityIndices.cpp
index 580e7381955..de96053c1e7 100644
--- a/src/Functions/lowCardinalityIndices.cpp
+++ b/src/Functions/lowCardinalityIndices.cpp
@@ -30,6 +30,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/lowCardinalityKeys.cpp b/src/Functions/lowCardinalityKeys.cpp
index 46128267871..aa5c87d5b6d 100644
--- a/src/Functions/lowCardinalityKeys.cpp
+++ b/src/Functions/lowCardinalityKeys.cpp
@@ -28,6 +28,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index dea82470393..edb0c28c980 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -4,6 +4,7 @@
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeFixedString.h>
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnString.h>
@@ -15,6 +16,8 @@
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
 #include "array/arrayIndex.h"
+#include "Functions/like.h"
+#include "Functions/FunctionsStringSearch.h"
 
 
 namespace DB
@@ -59,6 +62,8 @@ public:
         return true;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
@@ -153,57 +158,25 @@ public:
         return NameMapContains::name;
     }
 
-    size_t getNumberOfArguments() const override { return 2; }
+    size_t getNumberOfArguments() const override { return impl.getNumberOfArguments(); }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        return impl.isSuitableForShortCircuitArgumentsExecution(arguments);
+    }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if (arguments.size() != 2)
-            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
-                + toString(arguments.size()) + ", should be 2",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
-
-        if (!map_type)
-            throw Exception{"First argument for function " + getName() + " must be a map",
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        auto key_type = map_type->getKeyType();
-
-        if (!(isNumber(arguments[1].type) && isNumber(key_type))
-            && key_type->getName() != arguments[1].type->getName())
-            throw Exception{"Second argument for function " + getName() + " must be a " + key_type->getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        return std::make_shared<DataTypeUInt8>();
+        return impl.getReturnTypeImpl(arguments);
     }
 
-    bool useDefaultImplementationForConstants() const override { return true; }
-
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        bool is_const = isColumnConst(*arguments[0].column);
-        const ColumnMap * col_map = is_const ? checkAndGetColumnConstData<ColumnMap>(arguments[0].column.get()) : checkAndGetColumn<ColumnMap>(arguments[0].column.get());
-        if (!col_map)
-            throw Exception{"First argument for function " + getName() + " must be a map", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
-
-        const auto & nested_column = col_map->getNestedColumn();
-        const auto & keys_data = col_map->getNestedData().getColumn(0);
-
-        /// Prepare arguments to call arrayIndex for check has the array element.
-        ColumnPtr column_array = ColumnArray::create(keys_data.getPtr(), nested_column.getOffsetsPtr());
-        ColumnsWithTypeAndName new_arguments =
-        {
-            {
-                is_const ? ColumnConst::create(std::move(column_array), keys_data.size()) : std::move(column_array),
-                std::make_shared<DataTypeArray>(result_type),
-                ""
-            },
-            arguments[1]
-        };
-
-        return FunctionArrayIndex<HasAction, NameMapContains>().executeImpl(new_arguments, result_type, input_rows_count);
+        return impl.executeImpl(arguments, result_type, input_rows_count);
     }
+
+private:
+    FunctionArrayIndex<HasAction, NameMapContains> impl;
 };
 
 
@@ -220,6 +193,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1)
@@ -267,6 +242,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (arguments.size() != 1)
@@ -300,6 +277,111 @@ public:
     }
 };
 
+class FunctionMapContainsKeyLike : public IFunction
+{
+public:
+    static constexpr auto name = "mapContainsKeyLike";
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMapContainsKeyLike>(); }
+    String getName() const override { return name; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*info*/) const override { return true; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        bool is_const = isColumnConst(*arguments[0].column);
+        const ColumnMap * col_map = is_const ? checkAndGetColumnConstData<ColumnMap>(arguments[0].column.get())
+                                             : checkAndGetColumn<ColumnMap>(arguments[0].column.get());
+        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+        if (!col_map || !map_type)
+            throw Exception{"First argument for function " + getName() + " must be a map", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        auto col_res = ColumnVector<UInt8>::create();
+        typename ColumnVector<UInt8>::Container & vec_res = col_res->getData();
+
+        if (input_rows_count == 0)
+            return col_res;
+
+        vec_res.resize(input_rows_count);
+
+        const auto & column_array = typeid_cast<const ColumnArray &>(col_map->getNestedColumn());
+        const auto & column_tuple = typeid_cast<const ColumnTuple &>(column_array.getData());
+
+        const ColumnString * column_string = checkAndGetColumn<ColumnString>(column_tuple.getColumn(0));
+        const ColumnFixedString * column_fixed_string = checkAndGetColumn<ColumnFixedString>(column_tuple.getColumn(0));
+
+        FunctionLike func_like;
+
+        for (size_t row = 0; row < input_rows_count; row++)
+        {
+            size_t element_start_row = row != 0 ? column_array.getOffsets()[row-1] : 0;
+            size_t elem_size = column_array.getOffsets()[row]- element_start_row;
+
+            ColumnPtr sub_map_column;
+            DataTypePtr data_type;
+
+            //The keys of one row map will be processed as a single ColumnString
+            if (column_string)
+            {
+               sub_map_column = column_string->cut(element_start_row, elem_size);
+               data_type = std::make_shared<DataTypeString>();
+            }
+            else
+            {
+               sub_map_column = column_fixed_string->cut(element_start_row, elem_size);
+               data_type = std::make_shared<DataTypeFixedString>(checkAndGetColumn<ColumnFixedString>(sub_map_column.get())->getN());
+            }
+
+            size_t col_key_size = sub_map_column->size();
+            auto column = is_const? ColumnConst::create(std::move(sub_map_column), std::move(col_key_size)) : std::move(sub_map_column);
+
+            ColumnsWithTypeAndName new_arguments =
+                {
+                    {
+                        column,
+                        data_type,
+                        ""
+                    },
+                    arguments[1]
+                };
+
+            auto res = func_like.executeImpl(new_arguments, result_type, input_rows_count);
+            const auto & container = checkAndGetColumn<ColumnUInt8>(res.get())->getData();
+
+            const auto it = std::find_if(container.begin(), container.end(), [](int element){ return element == 1; });  // NOLINT
+            vec_res[row] = it == container.end() ? 0 : 1;
+        }
+
+        return col_res;
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() != 2)
+            throw Exception("Number of arguments for function " + getName() + " doesn't match: passed "
+                            + toString(arguments.size()) + ", should be 2",
+                            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        const DataTypeMap * map_type = checkAndGetDataType<DataTypeMap>(arguments[0].type.get());
+        const DataTypeString * pattern_type = checkAndGetDataType<DataTypeString>(arguments[1].type.get());
+
+        if (!map_type)
+            throw Exception{"First argument for function " + getName() + " must be a Map",
+                            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+        if (!pattern_type)
+            throw Exception{"Second argument for function " + getName() + " must be String",
+                            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        if (!isStringOrFixedString(map_type->getKeyType()))
+            throw Exception{"Key type of map for function " + getName() + " must be `String` or `FixedString`",
+                            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT};
+
+        return std::make_shared<DataTypeUInt8>();
+    }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+};
+
 }
 
 void registerFunctionsMap(FunctionFactory & factory)
@@ -308,6 +390,7 @@ void registerFunctionsMap(FunctionFactory & factory)
     factory.registerFunction<FunctionMapContains>();
     factory.registerFunction<FunctionMapKeys>();
     factory.registerFunction<FunctionMapValues>();
+    factory.registerFunction<FunctionMapContainsKeyLike>();
 }
 
 }
diff --git a/src/Functions/match.cpp b/src/Functions/match.cpp
index 3460d54c6b6..31d36577445 100644
--- a/src/Functions/match.cpp
+++ b/src/Functions/match.cpp
@@ -13,7 +13,7 @@ struct NameMatch
     static constexpr auto name = "match";
 };
 
-using FunctionMatch = FunctionsStringSearch<MatchImpl<false>, NameMatch>;
+using FunctionMatch = FunctionsStringSearch<MatchImpl<NameMatch, false>>;
 
 }
 
diff --git a/src/Functions/materialize.h b/src/Functions/materialize.h
index 376fb34a672..aab4e5bdbdf 100644
--- a/src/Functions/materialize.h
+++ b/src/Functions/materialize.h
@@ -36,6 +36,8 @@ public:
 
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override
     {
         return 1;
diff --git a/src/Functions/mathConstants.cpp b/src/Functions/mathConstants.cpp
new file mode 100644
index 00000000000..ecc2f8c48b5
--- /dev/null
+++ b/src/Functions/mathConstants.cpp
@@ -0,0 +1,47 @@
+#include <Functions/FunctionConstantBase.h>
+#include <DataTypes/DataTypesNumber.h>
+
+namespace DB
+{
+
+namespace
+{
+    template <typename Impl>
+    class FunctionMathConstFloat64 : public FunctionConstantBase<FunctionMathConstFloat64<Impl>, Float64, DataTypeFloat64>
+    {
+    public:
+        static constexpr auto name = Impl::name;
+        static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionMathConstFloat64>(); }
+        FunctionMathConstFloat64() : FunctionConstantBase<FunctionMathConstFloat64<Impl>, Float64, DataTypeFloat64>(Impl::value) {}
+    };
+
+
+    struct EImpl
+    {
+        static constexpr char name[] = "e";
+        static constexpr double value = 2.7182818284590452353602874713526624977572470;
+    };
+
+    using FunctionE = FunctionMathConstFloat64<EImpl>;
+
+
+    struct PiImpl
+    {
+        static constexpr char name[] = "pi";
+        static constexpr double value = 3.1415926535897932384626433832795028841971693;
+    };
+
+    using FunctionPi = FunctionMathConstFloat64<PiImpl>;
+}
+
+void registerFunctionE(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionE>();
+}
+
+void registerFunctionPi(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionPi>(FunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/Functions/max2.cpp b/src/Functions/max2.cpp
new file mode 100644
index 00000000000..bbe3a870811
--- /dev/null
+++ b/src/Functions/max2.cpp
@@ -0,0 +1,22 @@
+#include <Functions/FunctionMathBinaryFloat64.h>
+#include <Functions/FunctionFactory.h>
+
+template <typename T>
+T max(T a, T b)
+{
+    return a > b ? a : b;
+}
+
+namespace DB
+{
+namespace
+{
+    struct Max2Name { static constexpr auto name = "max2"; };
+    using FunctionMax2 = FunctionMathBinaryFloat64<BinaryFunctionVectorized<Max2Name, max>>;
+}
+
+void registerFunctionMax2(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionMax2>(FunctionFactory::CaseInsensitive);
+}
+}
diff --git a/src/Functions/min2.cpp b/src/Functions/min2.cpp
new file mode 100644
index 00000000000..50597a30dc2
--- /dev/null
+++ b/src/Functions/min2.cpp
@@ -0,0 +1,22 @@
+#include <Functions/FunctionMathBinaryFloat64.h>
+#include <Functions/FunctionFactory.h>
+
+template <typename T>
+T min(T a, T b)
+{
+    return a < b ? a : b;
+}
+
+namespace DB
+{
+namespace
+{
+    struct Min2Name { static constexpr auto name = "min2"; };
+    using FunctionMin2 = FunctionMathBinaryFloat64<BinaryFunctionVectorized<Min2Name, min>>;
+}
+
+void registerFunctionMin2(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionMin2>(FunctionFactory::CaseInsensitive);
+}
+}
diff --git a/src/Functions/minus.cpp b/src/Functions/minus.cpp
index 0ce90f3544d..76459545790 100644
--- a/src/Functions/minus.cpp
+++ b/src/Functions/minus.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 namespace DB
 {
@@ -10,6 +10,7 @@ struct MinusImpl
 {
     using ResultType = typename NumberTraits::ResultOfSubtraction<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/modelEvaluate.cpp b/src/Functions/modelEvaluate.cpp
new file mode 100644
index 00000000000..53bb109728a
--- /dev/null
+++ b/src/Functions/modelEvaluate.cpp
@@ -0,0 +1,176 @@
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionFactory.h>
+
+#include <base/range.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalModelsLoader.h>
+#include <Columns/ColumnString.h>
+#include <string>
+#include <memory>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Common/assert_cast.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context_fwd.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+    extern const int ILLEGAL_COLUMN;
+}
+
+class ExternalModelsLoader;
+
+
+/// Evaluate external model.
+/// First argument - model name, the others - model arguments.
+///   * for CatBoost model - float features first, then categorical
+/// Result - Float64.
+class FunctionModelEvaluate final : public IFunction
+{
+public:
+    static constexpr auto name = "modelEvaluate";
+
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionModelEvaluate>(context->getExternalModelsLoader());
+    }
+
+    explicit FunctionModelEvaluate(const ExternalModelsLoader & models_loader_)
+        : models_loader(models_loader_) {}
+
+    String getName() const override { return name; }
+
+    bool isVariadic() const override { return true; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    bool isDeterministic() const override { return false; }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() < 2)
+            throw Exception("Function " + getName() + " expects at least 2 arguments",
+                            ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION);
+
+        if (!isString(arguments[0].type))
+            throw Exception("Illegal type " + arguments[0].type->getName() + " of first argument of function " + getName()
+                            + ", expected a string.", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+
+        const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
+        if (!name_col)
+            throw Exception("First argument of function " + getName() + " must be a constant string",
+                            ErrorCodes::ILLEGAL_COLUMN);
+
+        bool has_nullable = false;
+        for (size_t i = 1; i < arguments.size(); ++i)
+            has_nullable = has_nullable || arguments[i].type->isNullable();
+
+        auto model = models_loader.getModel(name_col->getValue<String>());
+        auto type = model->getReturnType();
+
+        if (has_nullable)
+        {
+            if (const auto * tuple = typeid_cast<const DataTypeTuple *>(type.get()))
+            {
+                auto elements = tuple->getElements();
+                for (auto & element : elements)
+                    element = makeNullable(element);
+
+                type = std::make_shared<DataTypeTuple>(elements);
+            }
+            else
+                type = makeNullable(type);
+        }
+
+        return type;
+    }
+
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    {
+        const auto * name_col = checkAndGetColumnConst<ColumnString>(arguments[0].column.get());
+        if (!name_col)
+            throw Exception("First argument of function " + getName() + " must be a constant string",
+                            ErrorCodes::ILLEGAL_COLUMN);
+
+        auto model = models_loader.getModel(name_col->getValue<String>());
+
+        ColumnRawPtrs column_ptrs;
+        Columns materialized_columns;
+        ColumnPtr null_map;
+
+        column_ptrs.reserve(arguments.size());
+        for (auto arg : collections::range(1, arguments.size()))
+        {
+            const auto & column = arguments[arg].column;
+            column_ptrs.push_back(column.get());
+            if (auto full_column = column->convertToFullColumnIfConst())
+            {
+                materialized_columns.push_back(full_column);
+                column_ptrs.back() = full_column.get();
+            }
+            if (const auto * col_nullable = checkAndGetColumn<ColumnNullable>(*column_ptrs.back()))
+            {
+                if (!null_map)
+                    null_map = col_nullable->getNullMapColumnPtr();
+                else
+                {
+                    auto mut_null_map = IColumn::mutate(std::move(null_map));
+
+                    NullMap & result_null_map = assert_cast<ColumnUInt8 &>(*mut_null_map).getData();
+                    const NullMap & src_null_map = col_nullable->getNullMapColumn().getData();
+
+                    for (size_t i = 0, size = result_null_map.size(); i < size; ++i)
+                        if (src_null_map[i])
+                            result_null_map[i] = 1;
+
+                    null_map = std::move(mut_null_map);
+                }
+
+                column_ptrs.back() = &col_nullable->getNestedColumn();
+            }
+        }
+
+        auto res = model->evaluate(column_ptrs);
+
+        if (null_map)
+        {
+            if (const auto * tuple = typeid_cast<const ColumnTuple *>(res.get()))
+            {
+                auto nested = tuple->getColumns();
+                for (auto & col : nested)
+                    col = ColumnNullable::create(col, null_map);
+
+                res = ColumnTuple::create(nested);
+            }
+            else
+                res = ColumnNullable::create(res, null_map);
+        }
+
+        return res;
+    }
+
+private:
+    const ExternalModelsLoader & models_loader;
+};
+
+
+void registerFunctionsExternalModels(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionModelEvaluate>();
+}
+
+}
diff --git a/src/Functions/modulo.cpp b/src/Functions/modulo.cpp
index 115f7a23443..d494dfca74d 100644
--- a/src/Functions/modulo.cpp
+++ b/src/Functions/modulo.cpp
@@ -27,18 +27,31 @@ struct ModuloByConstantImpl
     using Op = ModuloImpl<A, B>;
     using ResultType = typename Op::ResultType;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <OpCase op_case>
-    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size)
+    static void NO_INLINE process(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t size, const NullMap * right_nullmap)
     {
-        if constexpr (op_case == OpCase::Vector)
-            for (size_t i = 0; i < size; ++i)
-                c[i] = Op::template apply<ResultType>(a[i], b[i]);
-        else if constexpr (op_case == OpCase::LeftConstant)
-            for (size_t i = 0; i < size; ++i)
-                c[i] = Op::template apply<ResultType>(*a, b[i]);
-        else
+        if constexpr (op_case == OpCase::RightConstant)
+        {
+            if (right_nullmap && (*right_nullmap)[0])
+                return;
             vectorConstant(a, *b, c, size);
+        }
+        else
+        {
+            if (right_nullmap)
+            {
+                for (size_t i = 0; i < size; ++i)
+                    if ((*right_nullmap)[i])
+                        c[i] = ResultType();
+                    else
+                        apply<op_case>(a, b, c, i);
+            }
+            else
+                for (size_t i = 0; i < size; ++i)
+                    apply<op_case>(a, b, c, i);
+        }
     }
 
     static ResultType process(A a, B b) { return Op::template apply<ResultType>(a, b); }
@@ -94,6 +107,16 @@ struct ModuloByConstantImpl
                 dst[i] = src[i] & mask;
         }
     }
+
+private:
+    template <OpCase op_case>
+    static inline void apply(const A * __restrict a, const B * __restrict b, ResultType * __restrict c, size_t i)
+    {
+        if constexpr (op_case == OpCase::Vector)
+            c[i] = Op::template apply<ResultType>(a[i], b[i]);
+        else
+            c[i] = Op::template apply<ResultType>(*a, b[i]);
+    }
 };
 
 template <typename A, typename B>
diff --git a/src/Functions/moduloOrZero.cpp b/src/Functions/moduloOrZero.cpp
index 4143266518a..ca55ccc79fd 100644
--- a/src/Functions/moduloOrZero.cpp
+++ b/src/Functions/moduloOrZero.cpp
@@ -12,6 +12,7 @@ struct ModuloOrZeroImpl
 {
     using ResultType = typename NumberTraits::ResultOfModulo<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline Result apply(A a, B b)
diff --git a/src/Functions/multiFuzzyMatchAllIndices.cpp b/src/Functions/multiFuzzyMatchAllIndices.cpp
index 8b104e9ed2d..d0121ee3981 100644
--- a/src/Functions/multiFuzzyMatchAllIndices.cpp
+++ b/src/Functions/multiFuzzyMatchAllIndices.cpp
@@ -14,8 +14,7 @@ struct NameMultiFuzzyMatchAllIndices
 };
 
 using FunctionMultiFuzzyMatchAllIndices = FunctionsMultiStringFuzzySearch<
-    MultiMatchAllIndicesImpl<UInt64, true>,
-    NameMultiFuzzyMatchAllIndices,
+    MultiMatchAllIndicesImpl<NameMultiFuzzyMatchAllIndices, UInt64, true>,
     std::numeric_limits<UInt32>::max()>;
 
 }
diff --git a/src/Functions/multiFuzzyMatchAny.cpp b/src/Functions/multiFuzzyMatchAny.cpp
index 4d0c3470d91..640e93a23b0 100644
--- a/src/Functions/multiFuzzyMatchAny.cpp
+++ b/src/Functions/multiFuzzyMatchAny.cpp
@@ -14,8 +14,7 @@ struct NameMultiFuzzyMatchAny
 };
 
 using FunctionMultiFuzzyMatchAny = FunctionsMultiStringFuzzySearch<
-    MultiMatchAnyImpl<UInt8, true, false, true>,
-    NameMultiFuzzyMatchAny,
+    MultiMatchAnyImpl<NameMultiFuzzyMatchAny, UInt8, true, false, true>,
     std::numeric_limits<UInt32>::max()>;
 
 }
diff --git a/src/Functions/multiFuzzyMatchAnyIndex.cpp b/src/Functions/multiFuzzyMatchAnyIndex.cpp
index 1680f413154..f8bad1bc461 100644
--- a/src/Functions/multiFuzzyMatchAnyIndex.cpp
+++ b/src/Functions/multiFuzzyMatchAnyIndex.cpp
@@ -14,8 +14,7 @@ struct NameMultiFuzzyMatchAnyIndex
 };
 
 using FunctionMultiFuzzyMatchAnyIndex = FunctionsMultiStringFuzzySearch<
-    MultiMatchAnyImpl<UInt64, false, true, true>,
-    NameMultiFuzzyMatchAnyIndex,
+    MultiMatchAnyImpl<NameMultiFuzzyMatchAnyIndex, UInt64, false, true, true>,
     std::numeric_limits<UInt32>::max()>;
 
 }
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index 92f05df472b..3e5242d5f9b 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -3,9 +3,10 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/MaskOperations.h>
 #include <Interpreters/castColumn.h>
-#include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/getLeastSupertype.h>
 
@@ -39,6 +40,14 @@ public:
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t number_of_arguments) const override
+    {
+        settings.enable_lazy_execution_for_first_argument = false;
+        settings.enable_lazy_execution_for_common_descendants_of_arguments = (number_of_arguments != 3);
+        settings.force_enable_lazy_execution = false;
+        return true;
+    }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForNulls() const override { return false; }
 
@@ -108,33 +117,40 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        ColumnsWithTypeAndName arguments = std::move(args);
+        executeShortCircuitArguments(arguments);
         /** We will gather values from columns in branches to result column,
         *  depending on values of conditions.
         */
         struct Instruction
         {
-            const IColumn * condition = nullptr;
-            const IColumn * source = nullptr;
+            IColumn::Ptr condition = nullptr;
+            IColumn::Ptr source = nullptr;
 
             bool condition_always_true = false;
             bool condition_is_nullable = false;
             bool source_is_constant = false;
+
+            bool condition_is_short = false;
+            bool source_is_short = false;
+            size_t condition_index = 0;
+            size_t source_index = 0;
         };
 
         std::vector<Instruction> instructions;
-        instructions.reserve(args.size() / 2 + 1);
+        instructions.reserve(arguments.size() / 2 + 1);
 
         Columns converted_columns_holder;
         converted_columns_holder.reserve(instructions.size());
 
         const DataTypePtr & return_type = result_type;
 
-        for (size_t i = 0; i < args.size(); i += 2)
+        for (size_t i = 0; i < arguments.size(); i += 2)
         {
             Instruction instruction;
             size_t source_idx = i + 1;
 
-            bool last_else_branch = source_idx == args.size();
+            bool last_else_branch = source_idx == arguments.size();
 
             if (last_else_branch)
             {
@@ -144,15 +160,15 @@ public:
             }
             else
             {
-                const ColumnWithTypeAndName & cond_col = args[i];
+                IColumn::Ptr cond_col = arguments[i].column->convertToFullColumnIfLowCardinality();
 
                 /// We skip branches that are always false.
                 /// If we encounter a branch that is always true, we can finish.
 
-                if (cond_col.column->onlyNull())
+                if (cond_col->onlyNull())
                     continue;
 
-                if (const auto * column_const = checkAndGetColumn<ColumnConst>(*cond_col.column))
+                if (const auto * column_const = checkAndGetColumn<ColumnConst>(*cond_col))
                 {
                     Field value = column_const->getField();
 
@@ -165,23 +181,24 @@ public:
                 }
                 else
                 {
-                    if (isColumnNullable(*cond_col.column))
-                        instruction.condition_is_nullable = true;
-
-                    instruction.condition = cond_col.column.get();
+                    instruction.condition = cond_col;
+                    instruction.condition_is_nullable = instruction.condition->isNullable();
                 }
+
+                instruction.condition_is_short = cond_col->size() < arguments[0].column->size();
             }
 
-            const ColumnWithTypeAndName & source_col = args[source_idx];
+            const ColumnWithTypeAndName & source_col = arguments[source_idx];
+            instruction.source_is_short = source_col.column->size() < arguments[0].column->size();
             if (source_col.type->equals(*return_type))
             {
-                instruction.source = source_col.column.get();
+                instruction.source = source_col.column;
             }
             else
             {
                 /// Cast all columns to result type.
                 converted_columns_holder.emplace_back(castColumn(source_col, return_type));
-                instruction.source = converted_columns_holder.back().get();
+                instruction.source = converted_columns_holder.back();
             }
 
             if (instruction.source && isColumnConst(*instruction.source))
@@ -208,27 +225,29 @@ public:
 
         for (size_t i = 0; i < rows; ++i)
         {
-            for (const auto & instruction : instructions)
+            for (auto & instruction : instructions)
             {
                 bool insert = false;
 
+                size_t condition_index = instruction.condition_is_short ? instruction.condition_index++ : i;
                 if (instruction.condition_always_true)
                     insert = true;
                 else if (!instruction.condition_is_nullable)
-                    insert = assert_cast<const ColumnUInt8 &>(*instruction.condition).getData()[i];
+                    insert = assert_cast<const ColumnUInt8 &>(*instruction.condition).getData()[condition_index];
                 else
                 {
                     const ColumnNullable & condition_nullable = assert_cast<const ColumnNullable &>(*instruction.condition);
                     const ColumnUInt8 & condition_nested = assert_cast<const ColumnUInt8 &>(condition_nullable.getNestedColumn());
                     const NullMap & condition_null_map = condition_nullable.getNullMapData();
 
-                    insert = !condition_null_map[i] && condition_nested.getData()[i];
+                    insert = !condition_null_map[condition_index] && condition_nested.getData()[condition_index];
                 }
 
                 if (insert)
                 {
+                    size_t source_index = instruction.source_is_short ? instruction.source_index++ : i;
                     if (!instruction.source_is_constant)
-                        res->insertFrom(*instruction.source, i);
+                        res->insertFrom(*instruction.source, source_index);
                     else
                         res->insertFrom(assert_cast<const ColumnConst &>(*instruction.source).getDataColumn(), 0);
 
@@ -239,6 +258,74 @@ public:
 
         return res;
     }
+
+private:
+    static void executeShortCircuitArguments(ColumnsWithTypeAndName & arguments)
+    {
+        int last_short_circuit_argument_index = checkShirtCircuitArguments(arguments);
+        if (last_short_circuit_argument_index < 0)
+            return;
+
+        /// Let's denote x_i' = maskedExecute(x_i, mask).
+        /// multiIf(x_0, y_0, x_1, y_1, x_2, y_2, ..., x_{n-1}, y_{n-1}, y_n)
+        /// We will support mask_i = !x_0 & !x_1 & ... & !x_i
+        /// and condition_i = !x_0 & ... & !x_{i - 1} & x_i
+        /// Base:
+        /// mask_0 and condition_0 is 1 everywhere, x_0' = x_0.
+        /// Iteration:
+        /// condition_i = extractMask(mask_{i - 1}, x_{i - 1}')
+        /// y_i' = maskedExecute(y_i, condition)
+        /// mask_i = extractMask(mask_{i - 1}, !x_{i - 1}')
+        /// x_i' = maskedExecute(x_i, mask)
+        /// Also we will treat NULL as 0 if x_i' is Nullable.
+
+        IColumn::Filter mask(arguments[0].column->size(), 1);
+        MaskInfo mask_info = {.has_ones = true, .has_zeros = false};
+        IColumn::Filter condition_mask(arguments[0].column->size());
+        MaskInfo condition_mask_info = {.has_ones = true, .has_zeros = false};
+
+        int i = 1;
+        while (i <= last_short_circuit_argument_index)
+        {
+            auto & cond_column = arguments[i - 1].column;
+            /// If condition is const or null and value is false, we can skip execution of expression after this condition.
+            if ((isColumnConst(*cond_column) || cond_column->onlyNull()) && !cond_column->empty() && !cond_column->getBool(0))
+            {
+                condition_mask_info.has_ones = false;
+                condition_mask_info.has_zeros = true;
+            }
+            else
+            {
+                copyMask(mask, condition_mask);
+                condition_mask_info = extractMask(condition_mask, cond_column);
+                maskedExecute(arguments[i], condition_mask, condition_mask_info);
+            }
+
+            /// Check if the condition is always true and we don't need to execute the rest arguments.
+            if (!condition_mask_info.has_zeros)
+                break;
+
+            ++i;
+            if (i > last_short_circuit_argument_index)
+                break;
+
+            /// Extract mask only if it make sense.
+            if (condition_mask_info.has_ones)
+                mask_info = extractInvertedMask(mask, cond_column);
+
+            /// mask is a inverted disjunction of previous conditions and if it doesn't have once, we don't need to execute the rest arguments.
+            if (!mask_info.has_ones)
+                break;
+
+            maskedExecute(arguments[i], mask, mask_info);
+            ++i;
+        }
+
+        /// We could skip some arguments execution, but we cannot leave them as ColumnFunction.
+        /// So, create an empty column with the execution result type.
+        for (; i <= last_short_circuit_argument_index; ++i)
+            executeColumnIfNeeded(arguments[i], true);
+    }
 };
 
 }
diff --git a/src/Functions/multiMatchAllIndices.cpp b/src/Functions/multiMatchAllIndices.cpp
index 171fa6baf74..940c9e7e3bf 100644
--- a/src/Functions/multiMatchAllIndices.cpp
+++ b/src/Functions/multiMatchAllIndices.cpp
@@ -14,8 +14,7 @@ struct NameMultiMatchAllIndices
 };
 
 using FunctionMultiMatchAllIndices = FunctionsMultiStringSearch<
-    MultiMatchAllIndicesImpl<UInt64, false>,
-    NameMultiMatchAllIndices,
+    MultiMatchAllIndicesImpl<NameMultiMatchAllIndices, UInt64, false>,
     std::numeric_limits<UInt32>::max()>;
 
 }
diff --git a/src/Functions/multiMatchAny.cpp b/src/Functions/multiMatchAny.cpp
index 146c27e250c..47510e0ecc2 100644
--- a/src/Functions/multiMatchAny.cpp
+++ b/src/Functions/multiMatchAny.cpp
@@ -14,8 +14,7 @@ struct NameMultiMatchAny
 };
 
 using FunctionMultiMatchAny = FunctionsMultiStringSearch<
-    MultiMatchAnyImpl<UInt8, true, false, false>,
-    NameMultiMatchAny,
+    MultiMatchAnyImpl<NameMultiMatchAny, UInt8, true, false, false>,
     std::numeric_limits<UInt32>::max()>;
 
 }
diff --git a/src/Functions/multiMatchAnyIndex.cpp b/src/Functions/multiMatchAnyIndex.cpp
index c43cd061187..a56d41dc95b 100644
--- a/src/Functions/multiMatchAnyIndex.cpp
+++ b/src/Functions/multiMatchAnyIndex.cpp
@@ -14,8 +14,7 @@ struct NameMultiMatchAnyIndex
 };
 
 using FunctionMultiMatchAnyIndex = FunctionsMultiStringSearch<
-    MultiMatchAnyImpl<UInt64, false, true, false>,
-    NameMultiMatchAnyIndex,
+    MultiMatchAnyImpl<NameMultiMatchAnyIndex, UInt64, false, true, false>,
     std::numeric_limits<UInt32>::max()>;
 
 }
diff --git a/src/Functions/multiSearchAny.cpp b/src/Functions/multiSearchAny.cpp
index 5cd688ac65d..113289b83ed 100644
--- a/src/Functions/multiSearchAny.cpp
+++ b/src/Functions/multiSearchAny.cpp
@@ -14,7 +14,7 @@ struct NameMultiSearchAny
     static constexpr auto name = "multiSearchAny";
 };
 
-using FunctionMultiSearch = FunctionsMultiStringSearch<MultiSearchImpl<PositionCaseSensitiveASCII>, NameMultiSearchAny>;
+using FunctionMultiSearch = FunctionsMultiStringSearch<MultiSearchImpl<NameMultiSearchAny, PositionCaseSensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/multiSearchAnyCaseInsensitive.cpp b/src/Functions/multiSearchAnyCaseInsensitive.cpp
index 2358ce64bf8..9bc950c0d3d 100644
--- a/src/Functions/multiSearchAnyCaseInsensitive.cpp
+++ b/src/Functions/multiSearchAnyCaseInsensitive.cpp
@@ -14,7 +14,7 @@ struct NameMultiSearchAnyCaseInsensitive
     static constexpr auto name = "multiSearchAnyCaseInsensitive";
 };
 using FunctionMultiSearchCaseInsensitive
-    = FunctionsMultiStringSearch<MultiSearchImpl<PositionCaseInsensitiveASCII>, NameMultiSearchAnyCaseInsensitive>;
+    = FunctionsMultiStringSearch<MultiSearchImpl<NameMultiSearchAnyCaseInsensitive, PositionCaseInsensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp
index f84762d2bb4..c83dc843f78 100644
--- a/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchAnyCaseInsensitiveUTF8.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchAnyCaseInsensitiveUTF8
 };
 
 using FunctionMultiSearchCaseInsensitiveUTF8
-    = FunctionsMultiStringSearch<MultiSearchImpl<PositionCaseInsensitiveUTF8>, NameMultiSearchAnyCaseInsensitiveUTF8>;
+    = FunctionsMultiStringSearch<MultiSearchImpl<NameMultiSearchAnyCaseInsensitiveUTF8, PositionCaseInsensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/multiSearchAnyUTF8.cpp b/src/Functions/multiSearchAnyUTF8.cpp
index b2c8342ba7f..3f34f70ab51 100644
--- a/src/Functions/multiSearchAnyUTF8.cpp
+++ b/src/Functions/multiSearchAnyUTF8.cpp
@@ -13,7 +13,7 @@ struct NameMultiSearchAnyUTF8
 {
     static constexpr auto name = "multiSearchAnyUTF8";
 };
-using FunctionMultiSearchUTF8 = FunctionsMultiStringSearch<MultiSearchImpl<PositionCaseSensitiveUTF8>, NameMultiSearchAnyUTF8>;
+using FunctionMultiSearchUTF8 = FunctionsMultiStringSearch<MultiSearchImpl<NameMultiSearchAnyUTF8, PositionCaseSensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstIndex.cpp b/src/Functions/multiSearchFirstIndex.cpp
index fcbeb552ae1..a96ebed029c 100644
--- a/src/Functions/multiSearchFirstIndex.cpp
+++ b/src/Functions/multiSearchFirstIndex.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstIndex
 };
 
 using FunctionMultiSearchFirstIndex
-    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<PositionCaseSensitiveASCII>, NameMultiSearchFirstIndex>;
+    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<NameMultiSearchFirstIndex, PositionCaseSensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp b/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp
index 87483734cf9..cc4869d1200 100644
--- a/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp
+++ b/src/Functions/multiSearchFirstIndexCaseInsensitive.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstIndexCaseInsensitive
 };
 
 using FunctionMultiSearchFirstIndexCaseInsensitive
-    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<PositionCaseInsensitiveASCII>, NameMultiSearchFirstIndexCaseInsensitive>;
+    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<NameMultiSearchFirstIndexCaseInsensitive, PositionCaseInsensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp
index 69e14adb32a..fd95947bc67 100644
--- a/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchFirstIndexCaseInsensitiveUTF8.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstIndexCaseInsensitiveUTF8
 };
 
 using FunctionMultiSearchFirstIndexCaseInsensitiveUTF8
-    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<PositionCaseInsensitiveUTF8>, NameMultiSearchFirstIndexCaseInsensitiveUTF8>;
+    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<NameMultiSearchFirstIndexCaseInsensitiveUTF8, PositionCaseInsensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstIndexUTF8.cpp b/src/Functions/multiSearchFirstIndexUTF8.cpp
index 699281dad4b..6854201d14d 100644
--- a/src/Functions/multiSearchFirstIndexUTF8.cpp
+++ b/src/Functions/multiSearchFirstIndexUTF8.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstIndexUTF8
 };
 
 using FunctionMultiSearchFirstIndexUTF8
-    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<PositionCaseSensitiveUTF8>, NameMultiSearchFirstIndexUTF8>;
+    = FunctionsMultiStringSearch<MultiSearchFirstIndexImpl<NameMultiSearchFirstIndexUTF8, PositionCaseSensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstPosition.cpp b/src/Functions/multiSearchFirstPosition.cpp
index 003345afde6..4ca1ac35a4d 100644
--- a/src/Functions/multiSearchFirstPosition.cpp
+++ b/src/Functions/multiSearchFirstPosition.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstPosition
 };
 
 using FunctionMultiSearchFirstPosition
-    = FunctionsMultiStringSearch<MultiSearchFirstPositionImpl<PositionCaseSensitiveASCII>, NameMultiSearchFirstPosition>;
+    = FunctionsMultiStringSearch<MultiSearchFirstPositionImpl<NameMultiSearchFirstPosition, PositionCaseSensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp b/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp
index 7aa1ef991f3..4e356335e98 100644
--- a/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp
+++ b/src/Functions/multiSearchFirstPositionCaseInsensitive.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstPositionCaseInsensitive
 };
 
 using FunctionMultiSearchFirstPositionCaseInsensitive
-    = FunctionsMultiStringSearch<MultiSearchFirstPositionImpl<PositionCaseInsensitiveASCII>, NameMultiSearchFirstPositionCaseInsensitive>;
+    = FunctionsMultiStringSearch<MultiSearchFirstPositionImpl<NameMultiSearchFirstPositionCaseInsensitive, PositionCaseInsensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp b/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp
index d20ce6c2de3..647fc3a2cc8 100644
--- a/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp
+++ b/src/Functions/multiSearchFirstPositionCaseInsensitiveUTF8.cpp
@@ -15,8 +15,7 @@ struct NameMultiSearchFirstPositionCaseInsensitiveUTF8
 };
 
 using FunctionMultiSearchFirstPositionCaseInsensitiveUTF8 = FunctionsMultiStringSearch<
-    MultiSearchFirstPositionImpl<PositionCaseInsensitiveUTF8>,
-    NameMultiSearchFirstPositionCaseInsensitiveUTF8>;
+    MultiSearchFirstPositionImpl<NameMultiSearchFirstPositionCaseInsensitiveUTF8, PositionCaseInsensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/multiSearchFirstPositionUTF8.cpp b/src/Functions/multiSearchFirstPositionUTF8.cpp
index c0739808f7b..fbb1099ec35 100644
--- a/src/Functions/multiSearchFirstPositionUTF8.cpp
+++ b/src/Functions/multiSearchFirstPositionUTF8.cpp
@@ -15,7 +15,7 @@ struct NameMultiSearchFirstPositionUTF8
 };
 
 using FunctionMultiSearchFirstPositionUTF8
-    = FunctionsMultiStringSearch<MultiSearchFirstPositionImpl<PositionCaseSensitiveUTF8>, NameMultiSearchFirstPositionUTF8>;
+    = FunctionsMultiStringSearch<MultiSearchFirstPositionImpl<NameMultiSearchFirstPositionUTF8, PositionCaseSensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/multiply.cpp b/src/Functions/multiply.cpp
index 52ab8decbf7..7cbf806faa0 100644
--- a/src/Functions/multiply.cpp
+++ b/src/Functions/multiply.cpp
@@ -1,7 +1,7 @@
 #include <type_traits>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 namespace DB
 {
@@ -11,6 +11,7 @@ struct MultiplyImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     template <typename Result = ResultType>
     static inline NO_SANITIZE_UNDEFINED Result apply(A a, B b)
diff --git a/src/Functions/negate.cpp b/src/Functions/negate.cpp
index de3995927d3..a378589fe30 100644
--- a/src/Functions/negate.cpp
+++ b/src/Functions/negate.cpp
@@ -8,8 +8,9 @@ namespace DB
 template <typename A>
 struct NegateImpl
 {
-    using ResultType = std::conditional_t<IsDecimalNumber<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
+    using ResultType = std::conditional_t<is_decimal<A>, A, typename NumberTraits::ResultOfNegate<A>::Type>;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
@@ -41,7 +42,7 @@ template <> struct FunctionUnaryArithmeticMonotonicity<NameNegate>
     static bool has() { return true; }
     static IFunction::Monotonicity get(const Field &, const Field &)
     {
-        return { true, false };
+        return { .is_monotonic = true, .is_positive = false };
     }
 };
 
diff --git a/src/Functions/neighbor.cpp b/src/Functions/neighbor.cpp
index 785c5817176..a1254446e01 100644
--- a/src/Functions/neighbor.cpp
+++ b/src/Functions/neighbor.cpp
@@ -46,6 +46,8 @@ public:
 
     bool isDeterministicInScopeOfQuery() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     bool useDefaultImplementationForNulls() const override { return false; }
 
     bool useDefaultImplementationForConstants() const override { return false; }
diff --git a/src/Functions/normalizeQuery.cpp b/src/Functions/normalizeQuery.cpp
index 0635dd6b7ed..dd36e931bc4 100644
--- a/src/Functions/normalizeQuery.cpp
+++ b/src/Functions/normalizeQuery.cpp
@@ -3,7 +3,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 #include <Parsers/queryNormalization.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 
 
diff --git a/src/Functions/normalizeString.cpp b/src/Functions/normalizeString.cpp
new file mode 100644
index 00000000000..2fe6a1159af
--- /dev/null
+++ b/src/Functions/normalizeString.cpp
@@ -0,0 +1,180 @@
+#include "config_core.h"
+
+#if USE_ICU
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionStringToString.h>
+#include <unicode/rep.h>
+#include <unicode/unistr.h>
+#include <unicode/unorm2.h>
+#include <unicode/ustring.h>
+#include <unicode/utypes.h>
+#include <base/logger_useful.h>
+#include <Columns/ColumnString.h>
+#include <Parsers/IAST_fwd.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_COLUMN;
+    extern const int CANNOT_NORMALIZE_STRING;
+}
+
+namespace
+{
+
+// Expansion factors are specified for UTF-32, since icu uses UTF-32 for normalization
+// Maximum expansion factors for different normalization forms
+// https://unicode.org/faq/normalization.html#12
+
+struct NormalizeNFCImpl
+{
+    static constexpr auto name = "normalizeUTF8NFC";
+
+    static constexpr auto expansionFactor = 3;
+
+    static const UNormalizer2 *getNormalizer(UErrorCode *err)
+    {
+        return unorm2_getNFCInstance(err);
+    }
+};
+
+struct NormalizeNFDImpl
+{
+    static constexpr auto name = "normalizeUTF8NFD";
+
+    static constexpr auto expansionFactor = 4;
+
+    static const UNormalizer2 *getNormalizer(UErrorCode *err)
+    {
+        return unorm2_getNFDInstance(err);
+    }
+};
+
+struct NormalizeNFKCImpl
+{
+    static constexpr auto name = "normalizeUTF8NFKC";
+
+    static constexpr auto expansionFactor = 18;
+
+    static const UNormalizer2 *getNormalizer(UErrorCode *err)
+    {
+        return unorm2_getNFKCInstance(err);
+    }
+};
+
+
+struct NormalizeNFKDImpl
+{
+    static constexpr auto name = "normalizeUTF8NFKD";
+
+    static constexpr auto expansionFactor = 18;
+
+    static const UNormalizer2 *getNormalizer(UErrorCode *err)
+    {
+        return unorm2_getNFKDInstance(err);
+    }
+};
+
+template<typename NormalizeImpl>
+struct NormalizeUTF8Impl
+{
+
+    static void vector(const ColumnString::Chars & data,
+        const ColumnString::Offsets & offsets,
+        ColumnString::Chars & res_data,
+        ColumnString::Offsets & res_offsets)
+    {
+        UErrorCode err = U_ZERO_ERROR;
+
+        const UNormalizer2 *normalizer = NormalizeImpl::getNormalizer(&err);
+        if (U_FAILURE(err))
+            throw Exception(ErrorCodes::CANNOT_NORMALIZE_STRING, "Normalization failed (getNormalizer): {}", u_errorName(err));
+
+        size_t size = offsets.size();
+        res_offsets.resize(size);
+
+        ColumnString::Offset current_from_offset = 0;
+        ColumnString::Offset current_to_offset = 0;
+
+        icu::UnicodeString to_string;
+
+        PODArray<UChar> from_uchars;
+        PODArray<UChar> to_uchars;
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            size_t from_size = offsets[i] - current_from_offset - 1;
+
+            from_uchars.resize(from_size + 1);
+            int32_t from_code_points;
+            u_strFromUTF8(
+                from_uchars.data(),
+                from_uchars.size(),
+                &from_code_points,
+                reinterpret_cast<const char*>(&data[current_from_offset]),
+                from_size,
+                &err);
+            if (U_FAILURE(err))
+                throw Exception(ErrorCodes::CANNOT_NORMALIZE_STRING, "Normalization failed (strFromUTF8): {}", u_errorName(err));
+
+            to_uchars.resize(from_code_points * NormalizeImpl::expansionFactor + 1);
+
+            int32_t to_code_points = unorm2_normalize(
+                normalizer,
+                from_uchars.data(),
+                from_code_points,
+                to_uchars.data(),
+                to_uchars.size(),
+                &err);
+            if (U_FAILURE(err))
+                throw Exception(ErrorCodes::CANNOT_NORMALIZE_STRING, "Normalization failed (normalize): {}", u_errorName(err));
+
+            size_t max_to_size = current_to_offset + 4 * to_code_points + 1;
+            if (res_data.size() < max_to_size)
+                res_data.resize(max_to_size);
+
+            int32_t to_size;
+            u_strToUTF8(
+                reinterpret_cast<char*>(&res_data[current_to_offset]),
+                res_data.size() - current_to_offset,
+                &to_size,
+                to_uchars.data(),
+                to_code_points,
+                &err);
+            if (U_FAILURE(err))
+                throw Exception(ErrorCodes::CANNOT_NORMALIZE_STRING, "Normalization failed (strToUTF8): {}", u_errorName(err));
+
+            current_to_offset += to_size;
+            res_data[current_to_offset] = 0;
+            ++current_to_offset;
+            res_offsets[i] = current_to_offset;
+
+            current_from_offset = offsets[i];
+        }
+    }
+
+    [[noreturn]] static void vectorFixed(const ColumnString::Chars &, size_t, ColumnString::Chars &)
+    {
+        throw Exception("Cannot apply function normalizeUTF8 to fixed string.", ErrorCodes::ILLEGAL_COLUMN);
+    }
+};
+
+using FunctionNormalizeUTF8NFC = FunctionStringToString<NormalizeUTF8Impl<NormalizeNFCImpl>, NormalizeNFCImpl>;
+using FunctionNormalizeUTF8NFD = FunctionStringToString<NormalizeUTF8Impl<NormalizeNFDImpl>, NormalizeNFDImpl>;
+using FunctionNormalizeUTF8NFKC = FunctionStringToString<NormalizeUTF8Impl<NormalizeNFKCImpl>, NormalizeNFKCImpl>;
+using FunctionNormalizeUTF8NFKD = FunctionStringToString<NormalizeUTF8Impl<NormalizeNFKDImpl>, NormalizeNFKDImpl>;
+}
+
+void registerFunctionNormalizeUTF8(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionNormalizeUTF8NFC>();
+    factory.registerFunction<FunctionNormalizeUTF8NFD>();
+    factory.registerFunction<FunctionNormalizeUTF8NFKC>();
+    factory.registerFunction<FunctionNormalizeUTF8NFKD>();
+}
+
+}
+
+#endif
diff --git a/src/Functions/normalizedQueryHash.cpp b/src/Functions/normalizedQueryHash.cpp
index e08680518c1..1e2875ae3e3 100644
--- a/src/Functions/normalizedQueryHash.cpp
+++ b/src/Functions/normalizedQueryHash.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Parsers/queryNormalization.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/SipHash.h>
 
@@ -76,6 +76,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
     {
         const ColumnPtr column = arguments[0].column;
diff --git a/src/Functions/notEmpty.cpp b/src/Functions/notEmpty.cpp
index 6285e59652c..cc40be88ab1 100644
--- a/src/Functions/notEmpty.cpp
+++ b/src/Functions/notEmpty.cpp
@@ -13,7 +13,7 @@ struct NameNotEmpty
 {
     static constexpr auto name = "notEmpty";
 };
-using FunctionNotEmpty = FunctionStringOrArrayToT<EmptyImpl<true>, NameNotEmpty, UInt8>;
+using FunctionNotEmpty = FunctionStringOrArrayToT<EmptyImpl<true>, NameNotEmpty, UInt8, false>;
 
 }
 
diff --git a/src/Functions/notILike.cpp b/src/Functions/notILike.cpp
index 1fc0ab65ea8..be40e2b989e 100644
--- a/src/Functions/notILike.cpp
+++ b/src/Functions/notILike.cpp
@@ -12,8 +12,8 @@ struct NameNotILike
     static constexpr auto name = "notILike";
 };
 
-using NotILikeImpl = MatchImpl<true, true, /*case-insensitive*/true>;
-using FunctionNotILike = FunctionsStringSearch<NotILikeImpl, NameNotILike>;
+using NotILikeImpl = MatchImpl<NameNotILike, true, true, /*case-insensitive*/true>;
+using FunctionNotILike = FunctionsStringSearch<NotILikeImpl>;
 
 }
 
diff --git a/src/Functions/notLike.cpp b/src/Functions/notLike.cpp
index 54e2c7481f0..7c4ea8ab2dc 100644
--- a/src/Functions/notLike.cpp
+++ b/src/Functions/notLike.cpp
@@ -12,7 +12,7 @@ struct NameNotLike
     static constexpr auto name = "notLike";
 };
 
-using FunctionNotLike = FunctionsStringSearch<MatchImpl<true, true>, NameNotLike>;
+using FunctionNotLike = FunctionsStringSearch<MatchImpl<NameNotLike, true, true>>;
 
 }
 
diff --git a/src/Functions/now.cpp b/src/Functions/now.cpp
index 673484b2ad2..653a39b38d0 100644
--- a/src/Functions/now.cpp
+++ b/src/Functions/now.cpp
@@ -43,13 +43,13 @@ private:
 class FunctionBaseNow : public IFunctionBase
 {
 public:
-    explicit FunctionBaseNow(time_t time_, DataTypePtr return_type_) : time_value(time_), return_type(return_type_) {}
+    explicit FunctionBaseNow(time_t time_, DataTypes argument_types_, DataTypePtr return_type_)
+        : time_value(time_), argument_types(std::move(argument_types_)), return_type(std::move(return_type_)) {}
 
     String getName() const override { return "now"; }
 
     const DataTypes & getArgumentTypes() const override
     {
-        static const DataTypes argument_types;
         return argument_types;
     }
 
@@ -65,9 +65,11 @@ public:
 
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
 private:
     time_t time_value;
+    DataTypes argument_types;
     DataTypePtr return_type;
 };
 
@@ -116,8 +118,10 @@ public:
         }
         if (arguments.size() == 1)
             return std::make_unique<FunctionBaseNow>(
-                time(nullptr), std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 0, 0)));
-        return std::make_unique<FunctionBaseNow>(time(nullptr), std::make_shared<DataTypeDateTime>());
+                time(nullptr), DataTypes{arguments.front().type},
+                std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 0, 0)));
+
+        return std::make_unique<FunctionBaseNow>(time(nullptr), DataTypes(), std::make_shared<DataTypeDateTime>());
     }
 };
 
diff --git a/src/Functions/now64.cpp b/src/Functions/now64.cpp
index cccfb9de6b6..bd1038b1fc6 100644
--- a/src/Functions/now64.cpp
+++ b/src/Functions/now64.cpp
@@ -67,13 +67,13 @@ private:
 class FunctionBaseNow64 : public IFunctionBase
 {
 public:
-    explicit FunctionBaseNow64(Field time_, DataTypePtr return_type_) : time_value(time_), return_type(return_type_) {}
+    explicit FunctionBaseNow64(Field time_, DataTypes argument_types_, DataTypePtr return_type_)
+        : time_value(time_), argument_types(std::move(argument_types_)), return_type(std::move(return_type_)) {}
 
     String getName() const override { return "now64"; }
 
     const DataTypes & getArgumentTypes() const override
     {
-        static const DataTypes argument_types;
         return argument_types;
     }
 
@@ -89,9 +89,11 @@ public:
 
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
 private:
     Field time_value;
+    DataTypes argument_types;
     DataTypePtr return_type;
 };
 
@@ -138,14 +140,19 @@ public:
         return std::make_shared<DataTypeDateTime64>(scale, timezone_name);
     }
 
-    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName &, const DataTypePtr & result_type) const override
+    FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type) const override
     {
         UInt32 scale = DataTypeDateTime64::default_scale;
         auto res_type = removeNullable(result_type);
         if (const auto * type = typeid_cast<const DataTypeDateTime64 *>(res_type.get()))
             scale = type->getScale();
 
-        return std::make_unique<FunctionBaseNow64>(nowSubsecond(scale), result_type);
+        DataTypes arg_types;
+        arg_types.reserve(arguments.size());
+        for (const auto & arg : arguments)
+            arg_types.push_back(arg.type);
+
+        return std::make_unique<FunctionBaseNow64>(nowSubsecond(scale), std::move(arg_types), std::move(result_type));
     }
 };
 
diff --git a/src/Functions/nullIf.cpp b/src/Functions/nullIf.cpp
index 14f2f72fe61..c54bbc08bcd 100644
--- a/src/Functions/nullIf.cpp
+++ b/src/Functions/nullIf.cpp
@@ -37,6 +37,7 @@ public:
     size_t getNumberOfArguments() const override { return 2; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/padString.cpp b/src/Functions/padString.cpp
index c03733a1198..544911919fe 100644
--- a/src/Functions/padString.cpp
+++ b/src/Functions/padString.cpp
@@ -5,7 +5,7 @@
 #include <Functions/GatherUtils/Algorithms.h>
 #include <Functions/GatherUtils/Sinks.h>
 #include <Functions/GatherUtils/Sources.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 namespace DB
 {
@@ -152,6 +152,8 @@ namespace
         bool isVariadic() const override { return true; }
         size_t getNumberOfArguments() const override { return 0; }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
         bool useDefaultImplementationForConstants() const override { return false; }
 
         DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/partitionId.cpp b/src/Functions/partitionId.cpp
index cf679452da1..eed3dd31bf9 100644
--- a/src/Functions/partitionId.cpp
+++ b/src/Functions/partitionId.cpp
@@ -35,6 +35,7 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return true; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/pi.cpp b/src/Functions/pi.cpp
deleted file mode 100644
index efa536c7314..00000000000
--- a/src/Functions/pi.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionMathConstFloat64.h>
-
-namespace DB
-{
-namespace
-{
-
-struct PiImpl
-{
-    static constexpr auto name = "pi";
-    static constexpr double value = 3.1415926535897932384626433832795028841971693;
-};
-
-using FunctionPi = FunctionMathConstFloat64<PiImpl>;
-
-}
-
-void registerFunctionPi(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionPi>(FunctionFactory::CaseInsensitive);
-}
-
-}
diff --git a/src/Functions/plus.cpp b/src/Functions/plus.cpp
index 0a63741ea3b..997cae0dbed 100644
--- a/src/Functions/plus.cpp
+++ b/src/Functions/plus.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionBinaryArithmetic.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 namespace DB
 {
@@ -10,6 +10,7 @@ struct PlusImpl
 {
     using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<A, B>::Type;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
     static const constexpr bool is_commutative = true;
 
     template <typename Result = ResultType>
diff --git a/src/Functions/pointInEllipses.cpp b/src/Functions/pointInEllipses.cpp
index ac0f47d2264..ea08b276670 100644
--- a/src/Functions/pointInEllipses.cpp
+++ b/src/Functions/pointInEllipses.cpp
@@ -6,7 +6,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
@@ -55,6 +55,8 @@ private:
 
     bool isVariadic() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/pointInPolygon.cpp b/src/Functions/pointInPolygon.cpp
index 3848721c051..03e46541cdf 100644
--- a/src/Functions/pointInPolygon.cpp
+++ b/src/Functions/pointInPolygon.cpp
@@ -13,7 +13,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Common/ObjectPool.h>
 #include <Common/ProfileEvents.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeTuple.h>
@@ -81,6 +81,8 @@ public:
         return 0;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() < 2)
@@ -186,7 +188,7 @@ public:
             /// Preprocessing can be computationally heavy but dramatically speeds up matching.
 
             using Pool = ObjectPoolMap<PointInConstPolygonImpl, UInt128>;
-            /// C++11 has thread-safe function-local statics.
+            /// C++11 has thread-safe function-local static.
             static Pool known_polygons;
 
             auto factory = [&polygon]()
diff --git a/src/Functions/polygonArea.cpp b/src/Functions/polygonArea.cpp
index 9a36b71d5b1..2e38d6c74b9 100644
--- a/src/Functions/polygonArea.cpp
+++ b/src/Functions/polygonArea.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -59,6 +59,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         auto res_column = ColumnFloat64::create();
diff --git a/src/Functions/polygonConvexHull.cpp b/src/Functions/polygonConvexHull.cpp
index 5bce3c5bbdd..887a12b8b6a 100644
--- a/src/Functions/polygonConvexHull.cpp
+++ b/src/Functions/polygonConvexHull.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -48,6 +48,8 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     size_t getNumberOfArguments() const override
     {
         return 1;
diff --git a/src/Functions/polygonPerimeter.cpp b/src/Functions/polygonPerimeter.cpp
index 5a6e293630e..8291020197a 100644
--- a/src/Functions/polygonPerimeter.cpp
+++ b/src/Functions/polygonPerimeter.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -58,6 +58,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         auto res_column = ColumnFloat64::create();
diff --git a/src/Functions/polygonsDistance.cpp b/src/Functions/polygonsDistance.cpp
index d6c4ff36e4d..8dd88e1c3bd 100644
--- a/src/Functions/polygonsDistance.cpp
+++ b/src/Functions/polygonsDistance.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -60,6 +60,8 @@ public:
         return std::make_shared<DataTypeFloat64>();
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         auto res_column = ColumnFloat64::create();
diff --git a/src/Functions/polygonsEquals.cpp b/src/Functions/polygonsEquals.cpp
index 9e2902d0528..da1db43229b 100644
--- a/src/Functions/polygonsEquals.cpp
+++ b/src/Functions/polygonsEquals.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -59,6 +59,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         auto res_column = ColumnUInt8::create();
diff --git a/src/Functions/polygonsIntersection.cpp b/src/Functions/polygonsIntersection.cpp
index 699488abab1..35e2a1d4ea8 100644
--- a/src/Functions/polygonsIntersection.cpp
+++ b/src/Functions/polygonsIntersection.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -60,6 +60,8 @@ public:
         return DataTypeFactory::instance().get("MultiPolygon");
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         MultiPolygonSerializer<Point> serializer;
diff --git a/src/Functions/polygonsSymDifference.cpp b/src/Functions/polygonsSymDifference.cpp
index 129e553f060..8ef0142072a 100644
--- a/src/Functions/polygonsSymDifference.cpp
+++ b/src/Functions/polygonsSymDifference.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -59,6 +59,8 @@ public:
         return DataTypeFactory::instance().get("MultiPolygon");
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         MultiPolygonSerializer<Point> serializer;
diff --git a/src/Functions/polygonsUnion.cpp b/src/Functions/polygonsUnion.cpp
index e7281c299d0..770aa14ac52 100644
--- a/src/Functions/polygonsUnion.cpp
+++ b/src/Functions/polygonsUnion.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -59,6 +59,8 @@ public:
         return DataTypeFactory::instance().get("MultiPolygon");
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         MultiPolygonSerializer<Point> serializer;
diff --git a/src/Functions/polygonsWithin.cpp b/src/Functions/polygonsWithin.cpp
index 2fd5b7e2225..66e5b4e6e17 100644
--- a/src/Functions/polygonsWithin.cpp
+++ b/src/Functions/polygonsWithin.cpp
@@ -5,7 +5,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
@@ -61,6 +61,8 @@ public:
         return std::make_shared<DataTypeUInt8>();
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         auto res_column = ColumnUInt8::create();
diff --git a/src/Functions/position.cpp b/src/Functions/position.cpp
index 5b8af16fef1..e38dc52b9af 100644
--- a/src/Functions/position.cpp
+++ b/src/Functions/position.cpp
@@ -13,7 +13,7 @@ struct NamePosition
     static constexpr auto name = "position";
 };
 
-using FunctionPosition = FunctionsStringSearch<PositionImpl<PositionCaseSensitiveASCII>, NamePosition>;
+using FunctionPosition = FunctionsStringSearch<PositionImpl<NamePosition, PositionCaseSensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/positionCaseInsensitive.cpp b/src/Functions/positionCaseInsensitive.cpp
index f72766a1875..ed9d86c033c 100644
--- a/src/Functions/positionCaseInsensitive.cpp
+++ b/src/Functions/positionCaseInsensitive.cpp
@@ -13,7 +13,7 @@ struct NamePositionCaseInsensitive
     static constexpr auto name = "positionCaseInsensitive";
 };
 
-using FunctionPositionCaseInsensitive = FunctionsStringSearch<PositionImpl<PositionCaseInsensitiveASCII>, NamePositionCaseInsensitive>;
+using FunctionPositionCaseInsensitive = FunctionsStringSearch<PositionImpl<NamePositionCaseInsensitive, PositionCaseInsensitiveASCII>>;
 
 }
 
diff --git a/src/Functions/positionCaseInsensitiveUTF8.cpp b/src/Functions/positionCaseInsensitiveUTF8.cpp
index 0af545cc6a3..f6e344b119e 100644
--- a/src/Functions/positionCaseInsensitiveUTF8.cpp
+++ b/src/Functions/positionCaseInsensitiveUTF8.cpp
@@ -14,7 +14,7 @@ struct NamePositionCaseInsensitiveUTF8
 };
 
 using FunctionPositionCaseInsensitiveUTF8
-    = FunctionsStringSearch<PositionImpl<PositionCaseInsensitiveUTF8>, NamePositionCaseInsensitiveUTF8>;
+    = FunctionsStringSearch<PositionImpl<NamePositionCaseInsensitiveUTF8, PositionCaseInsensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/positionUTF8.cpp b/src/Functions/positionUTF8.cpp
index 68b2f5c274e..ecb2a1e9e97 100644
--- a/src/Functions/positionUTF8.cpp
+++ b/src/Functions/positionUTF8.cpp
@@ -13,7 +13,7 @@ struct NamePositionUTF8
     static constexpr auto name = "positionUTF8";
 };
 
-using FunctionPositionUTF8 = FunctionsStringSearch<PositionImpl<PositionCaseSensitiveUTF8>, NamePositionUTF8>;
+using FunctionPositionUTF8 = FunctionsStringSearch<PositionImpl<NamePositionUTF8, PositionCaseSensitiveUTF8>>;
 
 }
 
diff --git a/src/Functions/queryID.cpp b/src/Functions/queryID.cpp
index b55d3fa0326..b1945bb1686 100644
--- a/src/Functions/queryID.cpp
+++ b/src/Functions/queryID.cpp
@@ -30,6 +30,8 @@ public:
 
     inline bool isDeterministic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
         return DataTypeString().createColumnConst(input_rows_count, query_id)->convertToFullColumnIfConst();
diff --git a/src/Functions/randConstant.cpp b/src/Functions/randConstant.cpp
index 77d8e1f2a33..e273eb4992e 100644
--- a/src/Functions/randConstant.cpp
+++ b/src/Functions/randConstant.cpp
@@ -52,6 +52,8 @@ public:
         return return_type;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
     {
         return std::make_unique<ExecutableFunctionRandomConstant<ToType, Name>>(value);
diff --git a/src/Functions/randomFixedString.cpp b/src/Functions/randomFixedString.cpp
index 13996eee677..eb8214383a7 100644
--- a/src/Functions/randomFixedString.cpp
+++ b/src/Functions/randomFixedString.cpp
@@ -7,10 +7,10 @@
 #include <Functions/FunctionsRandom.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
-#include <common/arithmeticOverflow.h>
-#include <common/unaligned.h>
+#include <base/arithmeticOverflow.h>
+#include <base/unaligned.h>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 namespace DB
 {
@@ -35,6 +35,8 @@ public:
 
     bool isVariadic() const override { return false; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override { return 1; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
diff --git a/src/Functions/randomPrintableASCII.cpp b/src/Functions/randomPrintableASCII.cpp
index ba8c16aa689..3bfa1fbda6d 100644
--- a/src/Functions/randomPrintableASCII.cpp
+++ b/src/Functions/randomPrintableASCII.cpp
@@ -35,6 +35,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/randomString.cpp b/src/Functions/randomString.cpp
index 10795626326..0e64892bbf4 100644
--- a/src/Functions/randomString.cpp
+++ b/src/Functions/randomString.cpp
@@ -7,7 +7,7 @@
 #include <Functions/PerformanceAdaptors.h>
 #include <pcg_random.hpp>
 #include <Common/randomSeed.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 
 namespace DB
@@ -33,6 +33,8 @@ public:
 
     bool isVariadic() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override { return 0; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/randomStringUTF8.cpp b/src/Functions/randomStringUTF8.cpp
index 018c591a1fe..59fc45a574d 100644
--- a/src/Functions/randomStringUTF8.cpp
+++ b/src/Functions/randomStringUTF8.cpp
@@ -7,7 +7,7 @@
 #include <Common/UTF8Helpers.h>
 #include <Common/randomSeed.h>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 namespace DB
 {
@@ -48,6 +48,7 @@ public:
 
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
diff --git a/src/Functions/readWkt.cpp b/src/Functions/readWkt.cpp
index 2ce4becb01c..c3ae6516e0f 100644
--- a/src/Functions/readWkt.cpp
+++ b/src/Functions/readWkt.cpp
@@ -18,10 +18,10 @@ namespace ErrorCodes
 
 
 template <class DataTypeName, class Geometry, class Serializer, class NameHolder>
-class FunctionReadWkt : public IFunction
+class FunctionReadWKT : public IFunction
 {
 public:
-    explicit FunctionReadWkt() = default;
+    explicit FunctionReadWKT() = default;
 
     static constexpr const char * name = NameHolder::name;
 
@@ -35,6 +35,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (checkAndGetDataType<DataTypeString>(arguments[0].get()) == nullptr)
@@ -70,36 +72,36 @@ public:
 
     static FunctionPtr create(ContextPtr)
     {
-        return std::make_shared<FunctionReadWkt<DataTypeName, Geometry, Serializer, NameHolder>>();
+        return std::make_shared<FunctionReadWKT<DataTypeName, Geometry, Serializer, NameHolder>>();
     }
 };
 
-struct ReadWktPointNameHolder
+struct ReadWKTPointNameHolder
 {
-    static constexpr const char * name = "readWktPoint";
+    static constexpr const char * name = "readWKTPoint";
 };
 
-struct ReadWktRingNameHolder
+struct ReadWKTRingNameHolder
 {
-    static constexpr const char * name = "readWktRing";
+    static constexpr const char * name = "readWKTRing";
 };
 
-struct ReadWktPolygonNameHolder
+struct ReadWKTPolygonNameHolder
 {
-    static constexpr const char * name = "readWktPolygon";
+    static constexpr const char * name = "readWKTPolygon";
 };
 
-struct ReadWktMultiPolygonNameHolder
+struct ReadWKTMultiPolygonNameHolder
 {
-    static constexpr const char * name = "readWktMultiPolygon";
+    static constexpr const char * name = "readWKTMultiPolygon";
 };
 
-void registerFunctionReadWkt(FunctionFactory & factory)
+void registerFunctionReadWKT(FunctionFactory & factory)
 {
-    factory.registerFunction<FunctionReadWkt<DataTypePointName, CartesianPoint, PointSerializer<CartesianPoint>, ReadWktPointNameHolder>>();
-    factory.registerFunction<FunctionReadWkt<DataTypeRingName, CartesianRing, RingSerializer<CartesianPoint>, ReadWktRingNameHolder>>();
-    factory.registerFunction<FunctionReadWkt<DataTypePolygonName, CartesianPolygon, PolygonSerializer<CartesianPoint>, ReadWktPolygonNameHolder>>();
-    factory.registerFunction<FunctionReadWkt<DataTypeMultiPolygonName, CartesianMultiPolygon, MultiPolygonSerializer<CartesianPoint>, ReadWktMultiPolygonNameHolder>>();
+    factory.registerFunction<FunctionReadWKT<DataTypePointName, CartesianPoint, PointSerializer<CartesianPoint>, ReadWKTPointNameHolder>>();
+    factory.registerFunction<FunctionReadWKT<DataTypeRingName, CartesianRing, RingSerializer<CartesianPoint>, ReadWKTRingNameHolder>>();
+    factory.registerFunction<FunctionReadWKT<DataTypePolygonName, CartesianPolygon, PolygonSerializer<CartesianPoint>, ReadWKTPolygonNameHolder>>();
+    factory.registerFunction<FunctionReadWKT<DataTypeMultiPolygonName, CartesianMultiPolygon, MultiPolygonSerializer<CartesianPoint>, ReadWKTMultiPolygonNameHolder>>();
 }
 
 }
diff --git a/src/Functions/regexpQuoteMeta.cpp b/src/Functions/regexpQuoteMeta.cpp
index 0f1ec476a3b..0db0405323a 100644
--- a/src/Functions/regexpQuoteMeta.cpp
+++ b/src/Functions/regexpQuoteMeta.cpp
@@ -2,7 +2,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
@@ -41,6 +41,8 @@ public:
         return true;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         if (!WhichDataType(arguments[0].type).isString())
diff --git a/src/Functions/registerFunctions.cpp b/src/Functions/registerFunctions.cpp
index 7e8f35bc0c4..a76b56fe610 100644
--- a/src/Functions/registerFunctions.cpp
+++ b/src/Functions/registerFunctions.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include "config_core.h"
 
 #include <Functions/FunctionFactory.h>
 
@@ -19,6 +17,7 @@ void registerFunctionChar(FunctionFactory &);
 void registerFunctionsComparison(FunctionFactory &);
 void registerFunctionsConditional(FunctionFactory &);
 void registerFunctionsConversion(FunctionFactory &);
+void registerFunctionCastOrDefault(FunctionFactory &);
 void registerFunctionsDateTime(FunctionFactory &);
 void registerFunctionsEmbeddedDictionaries(FunctionFactory &);
 void registerFunctionsExternalDictionaries(FunctionFactory &);
@@ -36,6 +35,7 @@ void registerFunctionsStringArray(FunctionFactory &);
 void registerFunctionsStringSearch(FunctionFactory &);
 void registerFunctionsStringRegexp(FunctionFactory &);
 void registerFunctionsStringSimilarity(FunctionFactory &);
+void registerFunctionsStringTokenExtractor(FunctionFactory &);
 void registerFunctionsURL(FunctionFactory &);
 void registerFunctionsVisitParam(FunctionFactory &);
 void registerFunctionsMath(FunctionFactory &);
@@ -51,9 +51,7 @@ void registerFunctionBitHammingDistance(FunctionFactory & factory);
 void registerFunctionTupleHammingDistance(FunctionFactory & factory);
 void registerFunctionsStringHash(FunctionFactory & factory);
 void registerFunctionValidateNestedArraySizes(FunctionFactory & factory);
-#if !defined(ARCADIA_BUILD)
-void registerFunctionBayesAB(FunctionFactory &);
-#endif
+void registerFunctionsSnowflake(FunctionFactory & factory);
 void registerFunctionTid(FunctionFactory & factory);
 void registerFunctionLogTrace(FunctionFactory & factory);
 
@@ -73,9 +71,7 @@ void registerFunctions()
     registerFunctionsArray(factory);
     registerFunctionsTuple(factory);
     registerFunctionsMap(factory);
-#if !defined(ARCADIA_BUILD)
     registerFunctionsBitmap(factory);
-#endif
     registerFunctionsBinaryRepr(factory);
     registerFunctionsCoding(factory);
     registerFunctionsCodingUUID(factory);
@@ -83,6 +79,7 @@ void registerFunctions()
     registerFunctionsComparison(factory);
     registerFunctionsConditional(factory);
     registerFunctionsConversion(factory);
+    registerFunctionCastOrDefault(factory);
     registerFunctionsDateTime(factory);
     registerFunctionsEmbeddedDictionaries(factory);
     registerFunctionsExternalDictionaries(factory);
@@ -100,6 +97,7 @@ void registerFunctions()
     registerFunctionsStringSearch(factory);
     registerFunctionsStringRegexp(factory);
     registerFunctionsStringSimilarity(factory);
+    registerFunctionsStringTokenExtractor(factory);
     registerFunctionsURL(factory);
     registerFunctionsVisitParam(factory);
     registerFunctionsMath(factory);
@@ -115,10 +113,7 @@ void registerFunctions()
     registerFunctionTupleHammingDistance(factory);
     registerFunctionsStringHash(factory);
     registerFunctionValidateNestedArraySizes(factory);
-
-#if !defined(ARCADIA_BUILD)
-    registerFunctionBayesAB(factory);
-#endif
+    registerFunctionsSnowflake(factory);
 
 #if USE_SSL
     registerFunctionEncrypt(factory);
diff --git a/src/Functions/registerFunctionsGeo.cpp b/src/Functions/registerFunctionsGeo.cpp
index eb881870446..b24dc4cb9c0 100644
--- a/src/Functions/registerFunctionsGeo.cpp
+++ b/src/Functions/registerFunctionsGeo.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 namespace DB
 {
@@ -23,12 +21,13 @@ void registerFunctionGeohashEncode(FunctionFactory & factory);
 void registerFunctionGeohashDecode(FunctionFactory & factory);
 void registerFunctionGeohashesInBox(FunctionFactory & factory);
 void registerFunctionWkt(FunctionFactory & factory);
-void registerFunctionReadWkt(FunctionFactory & factory);
+void registerFunctionReadWKT(FunctionFactory & factory);
 void registerFunctionSvg(FunctionFactory & factory);
 
 #if USE_H3
 void registerFunctionGeoToH3(FunctionFactory &);
 void registerFunctionH3ToGeo(FunctionFactory &);
+void registerFunctionH3ToGeoBoundary(FunctionFactory &);
 void registerFunctionH3EdgeAngle(FunctionFactory &);
 void registerFunctionH3EdgeLengthM(FunctionFactory &);
 void registerFunctionH3GetResolution(FunctionFactory &);
@@ -41,6 +40,9 @@ void registerFunctionH3IndexesAreNeighbors(FunctionFactory &);
 void registerFunctionStringToH3(FunctionFactory &);
 void registerFunctionH3ToString(FunctionFactory &);
 void registerFunctionH3HexAreaM2(FunctionFactory &);
+void registerFunctionH3IsResClassIII(FunctionFactory &);
+void registerFunctionH3IsPentagon(FunctionFactory &);
+void registerFunctionH3GetFaces(FunctionFactory &);
 #endif
 
 #if USE_S2_GEOMETRY
@@ -75,12 +77,13 @@ void registerFunctionsGeo(FunctionFactory & factory)
     registerFunctionGeohashDecode(factory);
     registerFunctionGeohashesInBox(factory);
     registerFunctionWkt(factory);
-    registerFunctionReadWkt(factory);
+    registerFunctionReadWKT(factory);
     registerFunctionSvg(factory);
 
 #if USE_H3
     registerFunctionGeoToH3(factory);
     registerFunctionH3ToGeo(factory);
+    registerFunctionH3ToGeoBoundary(factory);
     registerFunctionH3EdgeAngle(factory);
     registerFunctionH3EdgeLengthM(factory);
     registerFunctionH3GetResolution(factory);
@@ -93,6 +96,9 @@ void registerFunctionsGeo(FunctionFactory & factory)
     registerFunctionStringToH3(factory);
     registerFunctionH3ToString(factory);
     registerFunctionH3HexAreaM2(factory);
+    registerFunctionH3IsResClassIII(factory);
+    registerFunctionH3IsPentagon(factory);
+    registerFunctionH3GetFaces(factory);
 #endif
 
 #if USE_S2_GEOMETRY
diff --git a/src/Functions/registerFunctionsMath.cpp b/src/Functions/registerFunctionsMath.cpp
index bc851de9b93..9df24f4a8eb 100644
--- a/src/Functions/registerFunctionsMath.cpp
+++ b/src/Functions/registerFunctionsMath.cpp
@@ -34,6 +34,9 @@ void registerFunctionAcosh(FunctionFactory & factory);
 void registerFunctionAtanh(FunctionFactory & factory);
 void registerFunctionPow(FunctionFactory & factory);
 void registerFunctionSign(FunctionFactory & factory);
+void registerFunctionMax2(FunctionFactory & factory);
+void registerFunctionMin2(FunctionFactory & factory);
+void registerVectorFunctions(FunctionFactory &);
 
 
 void registerFunctionsMath(FunctionFactory & factory)
@@ -70,6 +73,9 @@ void registerFunctionsMath(FunctionFactory & factory)
     registerFunctionAtanh(factory);
     registerFunctionPow(factory);
     registerFunctionSign(factory);
+    registerFunctionMax2(factory);
+    registerFunctionMin2(factory);
+    registerVectorFunctions(factory);
 }
 
 }
diff --git a/src/Functions/registerFunctionsMiscellaneous.cpp b/src/Functions/registerFunctionsMiscellaneous.cpp
index 12c54aeeefd..ffe195973d3 100644
--- a/src/Functions/registerFunctionsMiscellaneous.cpp
+++ b/src/Functions/registerFunctionsMiscellaneous.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <config_core.h>
-#endif
+#include <config_core.h>
 
 namespace DB
 {
@@ -71,6 +69,7 @@ void registerFunctionHasThreadFuzzer(FunctionFactory &);
 void registerFunctionInitializeAggregation(FunctionFactory &);
 void registerFunctionErrorCodeToName(FunctionFactory &);
 void registerFunctionTcpPort(FunctionFactory &);
+void registerFunctionGetServerPort(FunctionFactory &);
 void registerFunctionByteSize(FunctionFactory &);
 void registerFunctionFile(FunctionFactory & factory);
 void registerFunctionConnectionId(FunctionFactory & factory);
@@ -78,6 +77,9 @@ void registerFunctionPartitionId(FunctionFactory & factory);
 void registerFunctionIsIPAddressContainedIn(FunctionFactory &);
 void registerFunctionQueryID(FunctionFactory & factory);
 void registerFunctionInitialQueryID(FunctionFactory & factory);
+void registerFunctionServerUUID(FunctionFactory &);
+void registerFunctionZooKeeperSessionUptime(FunctionFactory &);
+void registerFunctionGetOSKernelVersion(FunctionFactory &);
 
 #if USE_ICU
 void registerFunctionConvertCharset(FunctionFactory &);
@@ -149,6 +151,7 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionInitializeAggregation(factory);
     registerFunctionErrorCodeToName(factory);
     registerFunctionTcpPort(factory);
+    registerFunctionGetServerPort(factory);
     registerFunctionByteSize(factory);
     registerFunctionFile(factory);
     registerFunctionConnectionId(factory);
@@ -156,6 +159,9 @@ void registerFunctionsMiscellaneous(FunctionFactory & factory)
     registerFunctionIsIPAddressContainedIn(factory);
     registerFunctionQueryID(factory);
     registerFunctionInitialQueryID(factory);
+    registerFunctionServerUUID(factory);
+    registerFunctionZooKeeperSessionUptime(factory);
+    registerFunctionGetOSKernelVersion(factory);
 
 #if USE_ICU
     registerFunctionConvertCharset(factory);
diff --git a/src/Functions/registerFunctionsSnowflake.cpp b/src/Functions/registerFunctionsSnowflake.cpp
new file mode 100644
index 00000000000..7a0569ee16a
--- /dev/null
+++ b/src/Functions/registerFunctionsSnowflake.cpp
@@ -0,0 +1,22 @@
+namespace DB
+{
+
+class FunctionFactory;
+
+void registerDateTimeToSnowflake(FunctionFactory &);
+void registerSnowflakeToDateTime(FunctionFactory &);
+
+void registerDateTime64ToSnowflake(FunctionFactory &);
+void registerSnowflakeToDateTime64(FunctionFactory &);
+
+
+void registerFunctionsSnowflake(FunctionFactory & factory)
+{
+    registerDateTimeToSnowflake(factory);
+    registerSnowflakeToDateTime(factory);
+
+    registerDateTime64ToSnowflake(factory);
+    registerSnowflakeToDateTime64(factory);
+}
+
+}
diff --git a/src/Functions/registerFunctionsString.cpp b/src/Functions/registerFunctionsString.cpp
index ba6a294abba..79002f0a97d 100644
--- a/src/Functions/registerFunctionsString.cpp
+++ b/src/Functions/registerFunctionsString.cpp
@@ -1,7 +1,5 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#    include "config_core.h"
-#endif
+#include "config_functions.h"
+#include "config_core.h"
 
 namespace DB
 {
@@ -52,6 +50,10 @@ void registerFunctionSynonyms(FunctionFactory &);
 void registerFunctionLemmatize(FunctionFactory &);
 #endif
 
+#if USE_ICU
+void registerFunctionNormalizeUTF8(FunctionFactory &);
+#endif
+
 void registerFunctionsString(FunctionFactory & factory)
 {
     registerFunctionRepeat(factory);
@@ -97,6 +99,10 @@ void registerFunctionsString(FunctionFactory & factory)
     registerFunctionSynonyms(factory);
     registerFunctionLemmatize(factory);
 #endif
+
+#if USE_ICU
+    registerFunctionNormalizeUTF8(factory);
+#endif
 }
 
 }
diff --git a/src/Functions/registerFunctionsTuple.cpp b/src/Functions/registerFunctionsTuple.cpp
index 12092e1e7e0..33f078675e9 100644
--- a/src/Functions/registerFunctionsTuple.cpp
+++ b/src/Functions/registerFunctionsTuple.cpp
@@ -5,11 +5,13 @@ class FunctionFactory;
 
 void registerFunctionTuple(FunctionFactory &);
 void registerFunctionTupleElement(FunctionFactory &);
+void registerFunctionTupleToNameValuePairs(FunctionFactory &);
 
 void registerFunctionsTuple(FunctionFactory & factory)
 {
     registerFunctionTuple(factory);
     registerFunctionTupleElement(factory);
+    registerFunctionTupleToNameValuePairs(factory);
 }
 
 }
diff --git a/src/Functions/reinterpretAs.cpp b/src/Functions/reinterpretAs.cpp
index 460651ac5c1..f237b158fe5 100644
--- a/src/Functions/reinterpretAs.cpp
+++ b/src/Functions/reinterpretAs.cpp
@@ -22,7 +22,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/memcpySmall.h>
 
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 namespace DB
 {
@@ -55,6 +55,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -65,9 +67,11 @@ public:
 
         const auto * type_col = checkAndGetColumnConst<ColumnString>(column.get());
         if (!type_col)
-            throw Exception("Second argument to " + getName() + " must be a constant string describing type."
-                " Instead there is non-constant column of type " + arguments.back().type->getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Second argument to {} must be a constant string describing type."
+                " Instead there is non-constant column of type {}",
+                getName(),
+                arguments.back().type->getName());
 
         DataTypePtr to_type = DataTypeFactory::instance().get(type_col->getValue<String>());
 
@@ -76,30 +80,34 @@ public:
         if (result_reinterpret_type.isFixedString())
         {
             if (!from_type->isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion())
-                throw Exception("Cannot reinterpret " + from_type->getName() +
-                    " as FixedString because it is not fixed size and contiguous in memory",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Cannot reinterpret {} as FixedString because it is not fixed size and contiguous in memory",
+                    from_type->getName());
         }
         else if (result_reinterpret_type.isString())
         {
             if (!from_type->isValueUnambiguouslyRepresentedInContiguousMemoryRegion())
-                throw Exception("Cannot reinterpret " + from_type->getName() +
-                    " as String because it is not contiguous in memory",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Cannot reinterpret {} as String because it is not contiguous in memory",
+                    from_type->getName());
         }
         else if (canBeReinterpretedAsNumeric(result_reinterpret_type))
         {
             WhichDataType from_data_type(from_type);
 
             if (!canBeReinterpretedAsNumeric(from_data_type) && !from_data_type.isStringOrFixedString())
-                throw Exception("Cannot reinterpret " + from_type->getName() + " as " + to_type->getName()
-                    + " because only Numeric, String or FixedString can be reinterpreted in Numeric",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Cannot reinterpret {} as {} because only Numeric, String or FixedString can be reinterpreted in Numeric",
+                    from_type->getName(),
+                    to_type->getName());
         }
         else
-            throw Exception("Cannot reinterpret " + from_type->getName() + " as " + to_type->getName()
-                    + " because only reinterpretation in String, FixedString and Numeric types is supported",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+        {
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Cannot reinterpret {} as {} because only reinterpretation in String, FixedString and Numeric types is supported",
+                from_type->getName(),
+                to_type->getName());
+        }
 
         return to_type;
     }
@@ -154,7 +162,6 @@ public:
             }
             else if constexpr (CanBeReinterpretedAsNumeric<ToType>)
             {
-                using ToColumnType = typename ToType::ColumnType;
                 using ToFieldType = typename ToType::FieldType;
 
                 if constexpr (std::is_same_v<FromType, DataTypeString>)
@@ -163,10 +170,10 @@ public:
 
                     auto col_res = numericColumnCreateHelper<ToType>(static_cast<const ToType&>(*result_type.get()));
 
-                    const ColumnString::Chars & data_from = col_from->getChars();
-                    const ColumnString::Offsets & offsets_from = col_from->getOffsets();
+                    const auto & data_from = col_from->getChars();
+                    const auto & offsets_from = col_from->getOffsets();
                     size_t size = offsets_from.size();
-                    typename ToColumnType::Container & vec_res = col_res->getData();
+                    auto & vec_res = col_res->getData();
                     vec_res.resize(size);
 
                     size_t offset = 0;
@@ -190,10 +197,10 @@ public:
 
                     auto col_res = numericColumnCreateHelper<ToType>(static_cast<const ToType&>(*result_type.get()));
 
-                    const ColumnString::Chars & data_from = col_from_fixed->getChars();
+                    const auto& data_from = col_from_fixed->getChars();
                     size_t step = col_from_fixed->getN();
                     size_t size = data_from.size() / step;
-                    typename ToColumnType::Container & vec_res = col_res->getData();
+                    auto & vec_res = col_res->getData();
                     vec_res.resize(size);
 
                     size_t offset = 0;
@@ -215,7 +222,7 @@ public:
                     using From = typename FromType::FieldType;
                     using To = typename ToType::FieldType;
 
-                    using FromColumnType = std::conditional_t<IsDecimalNumber<From>, ColumnDecimal<From>, ColumnVector<From>>;
+                    using FromColumnType = ColumnVectorOrDecimal<From>;
 
                     const auto * column_from = assert_cast<const FromColumnType*>(arguments[0].column.get());
 
@@ -241,8 +248,10 @@ public:
             return false;
         }))
         {
-            throw Exception("Cannot reinterpret " + from_type->getName() + " as " + result_type->getName(),
-                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Cannot reinterpret {} as {}",
+                from_type->getName(),
+                result_type->getName());
         }
 
         return result;
@@ -253,6 +262,7 @@ private:
         IsDataTypeDecimalOrNumber<T> ||
         std::is_same_v<T, DataTypeDate> ||
         std::is_same_v<T, DataTypeDateTime> ||
+        std::is_same_v<T, DataTypeDateTime64> ||
         std::is_same_v<T, DataTypeUUID>;
 
     static bool canBeReinterpretedAsNumeric(const WhichDataType & type)
@@ -357,7 +367,12 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
-    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return impl.useDefaultImplementationForConstants(); }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        return impl.isSuitableForShortCircuitArgumentsExecution(arguments);
+    }
 
     static ColumnsWithTypeAndName addTypeColumnToArguments(const ColumnsWithTypeAndName & arguments)
     {
@@ -370,9 +385,9 @@ public:
             const auto & type = argument.type;
 
             if (!type->isValueUnambiguouslyRepresentedInFixedSizeContiguousMemoryRegion())
-                throw Exception("Cannot reinterpret " + type->getName() +
-                    " as FixedString because it is not fixed size and contiguous in memory",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Cannot reinterpret {} as FixedString because it is not fixed size and contiguous in memory",
+                    type->getName());
 
             size_t type_value_size_in_memory = type->getSizeOfValueInMemory();
             data_type = std::make_shared<DataTypeFixedString>(type_value_size_in_memory);
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index 423ed53c53f..6100b523420 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -179,6 +179,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/replicate.h b/src/Functions/replicate.h
index 71b39e9e60e..2455fda39c9 100644
--- a/src/Functions/replicate.h
+++ b/src/Functions/replicate.h
@@ -30,6 +30,8 @@ public:
 
     bool isVariadic() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForNulls() const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
diff --git a/src/Functions/reverse.cpp b/src/Functions/reverse.cpp
index 2b3692f6f22..9edd2927706 100644
--- a/src/Functions/reverse.cpp
+++ b/src/Functions/reverse.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnArray.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
@@ -77,6 +77,8 @@ public:
         return true;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isStringOrFixedString(arguments[0])
diff --git a/src/Functions/roundAge.cpp b/src/Functions/roundAge.cpp
index 08ac941c2df..54e34dc7266 100644
--- a/src/Functions/roundAge.cpp
+++ b/src/Functions/roundAge.cpp
@@ -11,6 +11,7 @@ struct RoundAgeImpl
 {
     using ResultType = UInt8;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundDuration.cpp b/src/Functions/roundDuration.cpp
index dec3427a7e1..40018753d5e 100644
--- a/src/Functions/roundDuration.cpp
+++ b/src/Functions/roundDuration.cpp
@@ -11,6 +11,7 @@ struct RoundDurationImpl
 {
     using ResultType = UInt16;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline ResultType apply(A x)
     {
diff --git a/src/Functions/roundToExp2.cpp b/src/Functions/roundToExp2.cpp
index 8f467aa9281..37f0637c79a 100644
--- a/src/Functions/roundToExp2.cpp
+++ b/src/Functions/roundToExp2.cpp
@@ -1,5 +1,5 @@
 #include <type_traits>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionUnaryArithmetic.h>
 
@@ -64,6 +64,7 @@ struct RoundToExp2Impl
 {
     using ResultType = T;
     static constexpr const bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline T apply(T x)
     {
diff --git a/src/Functions/rowNumberInAllBlocks.cpp b/src/Functions/rowNumberInAllBlocks.cpp
index 9c358aec8f0..b12fe351553 100644
--- a/src/Functions/rowNumberInAllBlocks.cpp
+++ b/src/Functions/rowNumberInAllBlocks.cpp
@@ -46,6 +46,8 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
     {
         return std::make_shared<DataTypeUInt64>();
diff --git a/src/Functions/rowNumberInBlock.cpp b/src/Functions/rowNumberInBlock.cpp
index 48fa472e1dd..89a9124691f 100644
--- a/src/Functions/rowNumberInBlock.cpp
+++ b/src/Functions/rowNumberInBlock.cpp
@@ -41,6 +41,8 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
     {
         return std::make_shared<DataTypeUInt64>();
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index 796c501e86f..fb38c59531e 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 
 namespace DB
@@ -59,6 +59,8 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.empty() || arguments.size() > 2)
diff --git a/src/Functions/runningConcurrency.cpp b/src/Functions/runningConcurrency.cpp
index 022e2be5f6c..4d190dd0f79 100644
--- a/src/Functions/runningConcurrency.cpp
+++ b/src/Functions/runningConcurrency.cpp
@@ -10,7 +10,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteBufferFromString.h>
-#include <common/defines.h>
+#include <base/defines.h>
 #include <set>
 
 namespace DB
@@ -119,6 +119,8 @@ namespace DB
             return true;
         }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     private:
         DataTypes argument_types;
         DataTypePtr return_type;
diff --git a/src/Functions/runningDifference.h b/src/Functions/runningDifference.h
index 52796653d32..f3caf245d08 100644
--- a/src/Functions/runningDifference.h
+++ b/src/Functions/runningDifference.h
@@ -153,6 +153,8 @@ public:
         return false;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     bool useDefaultImplementationForNulls() const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/s2CapContains.cpp b/src/Functions/s2CapContains.cpp
index ce2abc14fad..c3ebbf0d251 100644
--- a/src/Functions/s2CapContains.cpp
+++ b/src/Functions/s2CapContains.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -11,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -56,6 +54,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t index = 0; index < getNumberOfArguments(); ++index)
diff --git a/src/Functions/s2CapUnion.cpp b/src/Functions/s2CapUnion.cpp
index 4520f436161..2328db4cb52 100644
--- a/src/Functions/s2CapUnion.cpp
+++ b/src/Functions/s2CapUnion.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -11,7 +9,7 @@
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -52,6 +50,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t index = 0; index < getNumberOfArguments(); ++index)
diff --git a/src/Functions/s2CellsIntersect.cpp b/src/Functions/s2CellsIntersect.cpp
index 3d25fdbe44d..d7801afe0d0 100644
--- a/src/Functions/s2CellsIntersect.cpp
+++ b/src/Functions/s2CellsIntersect.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -48,6 +46,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t i = 0; i < getNumberOfArguments(); ++i)
diff --git a/src/Functions/s2GetNeighbors.cpp b/src/Functions/s2GetNeighbors.cpp
index 8da0777a4ef..99c1395f3cd 100644
--- a/src/Functions/s2GetNeighbors.cpp
+++ b/src/Functions/s2GetNeighbors.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -49,6 +47,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const auto * arg = arguments[0].get();
diff --git a/src/Functions/s2RectAdd.cpp b/src/Functions/s2RectAdd.cpp
index ceceb11da05..9a6fcd25e5a 100644
--- a/src/Functions/s2RectAdd.cpp
+++ b/src/Functions/s2RectAdd.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -41,10 +39,12 @@ public:
         return name;
     }
 
-    size_t getNumberOfArguments() const override { return 4; }
+    size_t getNumberOfArguments() const override { return 3; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t index = 0; index < getNumberOfArguments(); ++index)
diff --git a/src/Functions/s2RectContains.cpp b/src/Functions/s2RectContains.cpp
index 2b4ae31a6b2..11db27e68ca 100644
--- a/src/Functions/s2RectContains.cpp
+++ b/src/Functions/s2RectContains.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -41,10 +39,12 @@ public:
         return name;
     }
 
-    size_t getNumberOfArguments() const override { return 4; }
+    size_t getNumberOfArguments() const override { return 3; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t i = 0; i < getNumberOfArguments(); ++i)
diff --git a/src/Functions/s2RectIntersection.cpp b/src/Functions/s2RectIntersection.cpp
index f106167247b..a8a4536c9e7 100644
--- a/src/Functions/s2RectIntersection.cpp
+++ b/src/Functions/s2RectIntersection.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -48,6 +46,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t i = 0; i < getNumberOfArguments(); ++i)
diff --git a/src/Functions/s2RectUnion.cpp b/src/Functions/s2RectUnion.cpp
index 387d8b25f29..f187c068345 100644
--- a/src/Functions/s2RectUnion.cpp
+++ b/src/Functions/s2RectUnion.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -46,6 +44,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         for (size_t i = 0; i < getNumberOfArguments(); ++i)
diff --git a/src/Functions/s2ToGeo.cpp b/src/Functions/s2ToGeo.cpp
index 98f71e898bd..032fdbfe323 100644
--- a/src/Functions/s2ToGeo.cpp
+++ b/src/Functions/s2ToGeo.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_S2_GEOMETRY
 
@@ -10,7 +8,7 @@
 #include <DataTypes/DataTypeTuple.h>
 #include <Functions/FunctionFactory.h>
 #include <Common/typeid_cast.h>
-#include <common/range.h>
+#include <base/range.h>
 
 #include "s2_fwd.h"
 
@@ -50,6 +48,8 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         const auto * arg = arguments[0].get();
diff --git a/src/Functions/s2_fwd.h b/src/Functions/s2_fwd.h
index e3f7026e48c..6e0b58ae118 100644
--- a/src/Functions/s2_fwd.h
+++ b/src/Functions/s2_fwd.h
@@ -4,12 +4,12 @@
 #pragma clang diagnostic ignored "-Wambiguous-reversed-operator"
 #endif
 
-#include <s2/s2latlng.h> // Y_IGNORE
-#include <s2/s2cell_id.h> // Y_IGNORE
-#include <s2/s2point.h> // Y_IGNORE
-#include <s2/s2latlng_rect.h> // Y_IGNORE
-#include <s2/s2cap.h> // Y_IGNORE
-#include <s2/s1angle.h> // Y_IGNORE
+#include <s2/s2latlng.h>
+#include <s2/s2cell_id.h>
+#include <s2/s2point.h>
+#include <s2/s2latlng_rect.h>
+#include <s2/s2cap.h>
+#include <s2/s1angle.h>
 
 #ifdef __clang__
 #pragma clang diagnostic pop
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
new file mode 100644
index 00000000000..87d5f955e88
--- /dev/null
+++ b/src/Functions/serverConstants.cpp
@@ -0,0 +1,169 @@
+#include <Functions/FunctionConstantBase.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Core/ServerUUID.h>
+#include <Common/SymbolIndex.h>
+#include <Common/DNSResolver.h>
+#include <base/DateLUT.h>
+
+#if defined(OS_LINUX)
+#    include <Poco/Environment.h>
+#endif
+
+#include <Common/config_version.h>
+
+
+namespace DB
+{
+namespace
+{
+
+#if defined(__ELF__) && !defined(__FreeBSD__)
+    /// buildId() - returns the compiler build id of the running binary.
+    class FunctionBuildId : public FunctionConstantBase<FunctionBuildId, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "buildId";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionBuildId>(context); }
+        explicit FunctionBuildId(ContextPtr context) : FunctionConstantBase(SymbolIndex::instance()->getBuildIDHex(), context->isDistributed()) {}
+    };
+#endif
+
+
+    /// Get the host name. Is is constant on single server, but is not constant in distributed queries.
+    class FunctionHostName : public FunctionConstantBase<FunctionHostName, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "hostName";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionHostName>(context); }
+        explicit FunctionHostName(ContextPtr context) : FunctionConstantBase(DNSResolver::instance().getHostName(), context->isDistributed()) {}
+    };
+
+
+    class FunctionServerUUID : public FunctionConstantBase<FunctionServerUUID, UUID, DataTypeUUID>
+    {
+    public:
+        static constexpr auto name = "serverUUID";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionServerUUID>(context); }
+        explicit FunctionServerUUID(ContextPtr context) : FunctionConstantBase(ServerUUID::get(), context->isDistributed()) {}
+    };
+
+
+    class FunctionTcpPort : public FunctionConstantBase<FunctionTcpPort, UInt16, DataTypeUInt16>
+    {
+    public:
+        static constexpr auto name = "tcpPort";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTcpPort>(context); }
+        explicit FunctionTcpPort(ContextPtr context) : FunctionConstantBase(context->getTCPPort(), context->isDistributed()) {}
+    };
+
+
+    /// Returns the server time zone.
+    class FunctionTimezone : public FunctionConstantBase<FunctionTimezone, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "timezone";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTimezone>(context); }
+        explicit FunctionTimezone(ContextPtr context) : FunctionConstantBase(String{DateLUT::instance().getTimeZone()}, context->isDistributed()) {}
+    };
+
+
+    /// Returns server uptime in seconds.
+    class FunctionUptime : public FunctionConstantBase<FunctionUptime, UInt32, DataTypeUInt32>
+    {
+    public:
+        static constexpr auto name = "uptime";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionUptime>(context); }
+        explicit FunctionUptime(ContextPtr context) : FunctionConstantBase(context->getUptimeSeconds(), context->isDistributed()) {}
+    };
+
+
+    /// version() - returns the current version as a string.
+    class FunctionVersion : public FunctionConstantBase<FunctionVersion, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "version";
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionVersion>(context); }
+        explicit FunctionVersion(ContextPtr context) : FunctionConstantBase(VERSION_STRING, context->isDistributed()) {}
+    };
+
+    class FunctionZooKeeperSessionUptime : public FunctionConstantBase<FunctionZooKeeperSessionUptime, UInt32, DataTypeUInt32>
+    {
+    public:
+        static constexpr auto name = "zookeeperSessionUptime";
+        explicit FunctionZooKeeperSessionUptime(ContextPtr context)
+            : FunctionConstantBase(context->getZooKeeperSessionUptime(), context->isDistributed())
+        {
+        }
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionZooKeeperSessionUptime>(context); }
+    };
+
+#if defined(OS_LINUX)
+    class FunctionGetOSKernelVersion : public FunctionConstantBase<FunctionGetOSKernelVersion, String, DataTypeString>
+    {
+    public:
+        static constexpr auto name = "getOSKernelVersion";
+        explicit FunctionGetOSKernelVersion(ContextPtr context) : FunctionConstantBase(Poco::Environment::osName() + " " + Poco::Environment::osVersion(), context->isDistributed()) {}
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionGetOSKernelVersion>(context); }
+    };
+#endif
+
+}
+
+
+void registerFunctionBuildId([[maybe_unused]] FunctionFactory & factory)
+{
+#if defined(__ELF__) && !defined(__FreeBSD__)
+    factory.registerFunction<FunctionBuildId>();
+#endif
+}
+
+void registerFunctionHostName(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionHostName>();
+    factory.registerAlias("hostname", "hostName");
+}
+
+void registerFunctionServerUUID(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionServerUUID>();
+}
+
+void registerFunctionTcpPort(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTcpPort>();
+}
+
+void registerFunctionTimezone(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTimezone>();
+    factory.registerAlias("timeZone", "timezone");
+}
+
+void registerFunctionUptime(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionUptime>();
+}
+
+void registerFunctionVersion(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
+}
+
+void registerFunctionZooKeeperSessionUptime(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionZooKeeperSessionUptime>();
+}
+
+
+void registerFunctionGetOSKernelVersion([[maybe_unused]] FunctionFactory & factory)
+{
+#if defined(OS_LINUX)
+    factory.registerFunction<FunctionGetOSKernelVersion>();
+#endif
+}
+
+
+}
+
diff --git a/src/Functions/sign.cpp b/src/Functions/sign.cpp
index 8e2964c1859..5dfe6538b32 100644
--- a/src/Functions/sign.cpp
+++ b/src/Functions/sign.cpp
@@ -10,10 +10,11 @@ struct SignImpl
 {
     using ResultType = Int8;
     static const constexpr bool allow_fixed_string = false;
+    static const constexpr bool allow_string_integer = false;
 
     static inline NO_SANITIZE_UNDEFINED ResultType apply(A a)
     {
-        if constexpr (IsDecimalNumber<A> || std::is_floating_point_v<A>)
+        if constexpr (is_decimal<A> || std::is_floating_point_v<A>)
             return a < A(0) ? -1 : a == A(0) ? 0 : 1;
         else if constexpr (is_signed_v<A>)
             return a < 0 ? -1 : a == 0 ? 0 : 1;
@@ -36,7 +37,10 @@ template <>
 struct FunctionUnaryArithmeticMonotonicity<NameSign>
 {
     static bool has() { return true; }
-    static IFunction::Monotonicity get(const Field &, const Field &) { return {true, true, false}; }
+    static IFunction::Monotonicity get(const Field &, const Field &)
+    {
+        return { .is_monotonic = true };
+    }
 };
 
 void registerFunctionSign(FunctionFactory & factory)
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 304d51760de..6582f75b0e8 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -7,7 +7,7 @@
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/ProfileEvents.h>
 #include <Common/assert_cast.h>
-#include <common/sleep.h>
+#include <base/sleep.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context_fwd.h>
 
@@ -64,6 +64,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         WhichDataType which(arguments[0]);
diff --git a/src/Functions/snowflake.cpp b/src/Functions/snowflake.cpp
new file mode 100644
index 00000000000..5ac1d229d17
--- /dev/null
+++ b/src/Functions/snowflake.cpp
@@ -0,0 +1,34 @@
+#include <Functions/FunctionSnowflake.h>
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
+
+void registerDateTimeToSnowflake(FunctionFactory & factory)
+{
+    factory.registerFunction("dateTimeToSnowflake",
+        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionDateTimeToSnowflake>("dateTimeToSnowflake")); });
+}
+
+void registerDateTime64ToSnowflake(FunctionFactory & factory)
+{
+    factory.registerFunction("dateTime64ToSnowflake",
+        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionDateTime64ToSnowflake>("dateTime64ToSnowflake")); });
+}
+
+void registerSnowflakeToDateTime(FunctionFactory & factory)
+{
+    factory.registerFunction("snowflakeToDateTime",
+        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionSnowflakeToDateTime>("snowflakeToDateTime")); });
+}
+void registerSnowflakeToDateTime64(FunctionFactory & factory)
+{
+    factory.registerFunction("snowflakeToDateTime64",
+        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
+            std::make_shared<FunctionSnowflakeToDateTime64>("snowflakeToDateTime64")); });
+}
+
+}
diff --git a/src/Functions/stem.cpp b/src/Functions/stem.cpp
index 98dcbccd005..3da4a7fdd07 100644
--- a/src/Functions/stem.cpp
+++ b/src/Functions/stem.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
@@ -85,6 +83,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/stringCutToZero.cpp b/src/Functions/stringCutToZero.cpp
index ed8cee0d70c..baebf67c0e3 100644
--- a/src/Functions/stringCutToZero.cpp
+++ b/src/Functions/stringCutToZero.cpp
@@ -27,6 +27,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isStringOrFixedString(arguments[0]))
diff --git a/src/Functions/stringToH3.cpp b/src/Functions/stringToH3.cpp
index 9b02711db50..1cafd1661f1 100644
--- a/src/Functions/stringToH3.cpp
+++ b/src/Functions/stringToH3.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_functions.h"
-#endif
+#include "config_functions.h"
 
 #if USE_H3
 
@@ -40,6 +38,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
@@ -84,7 +83,7 @@ private:
         {
             auto h3index = h3index_source.getWhole();
 
-            // covert to std::string and get the c_str to have the delimiting \0 at the end.
+            // convert to std::string and get the c_str to have the delimiting \0 at the end.
             auto h3index_str = StringRef(h3index.data, h3index.size).toString();
             res_data[row_num] = stringToH3(h3index_str.c_str());
 
diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index 5ce75035475..ca94071187a 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -49,6 +49,8 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     bool useDefaultImplementationForConstants() const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
diff --git a/src/Functions/svg.cpp b/src/Functions/svg.cpp
index 39473816c8c..b3a89c0393c 100644
--- a/src/Functions/svg.cpp
+++ b/src/Functions/svg.cpp
@@ -44,6 +44,8 @@ public:
         return 2;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (arguments.size() > 2)
@@ -100,6 +102,7 @@ public:
 void registerFunctionSvg(FunctionFactory & factory)
 {
     factory.registerFunction<FunctionSvg>();
+    factory.registerAlias("SVG", "svg");
 }
 
 }
diff --git a/src/Functions/synonyms.cpp b/src/Functions/synonyms.cpp
index 4201fbfa677..6d879f9d42c 100644
--- a/src/Functions/synonyms.cpp
+++ b/src/Functions/synonyms.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
@@ -50,6 +48,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/tcpPort.cpp b/src/Functions/tcpPort.cpp
deleted file mode 100644
index e0905ed4d0c..00000000000
--- a/src/Functions/tcpPort.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <DataTypes/DataTypesNumber.h>
-#include <Functions/FunctionFactory.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-
-namespace
-{
-
-class FunctionTcpPort : public IFunction
-{
-public:
-    static constexpr auto name = "tcpPort";
-
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionTcpPort>(context->isDistributed(), context->getTCPPort());
-    }
-
-    explicit FunctionTcpPort(bool is_distributed_, UInt16 port_) : is_distributed(is_distributed_), port(port_)
-    {
-    }
-
-    String getName() const override { return name; }
-
-    size_t getNumberOfArguments() const override { return 0; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeUInt16>(); }
-
-    bool isDeterministic() const override { return false; }
-
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeUInt16().createColumnConst(input_rows_count, port);
-    }
-
-private:
-    bool is_distributed;
-    const UInt64 port;
-};
-
-}
-
-void registerFunctionTcpPort(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionTcpPort>();
-}
-
-}
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.reference b/src/Functions/tests/CMakeLists.txt
similarity index 100%
rename from tests/queries/0_stateless/00083_create_merge_tree_zookeeper.reference
rename to src/Functions/tests/CMakeLists.txt
diff --git a/src/Functions/tests/gtest_abtesting.cpp b/src/Functions/tests/gtest_abtesting.cpp
deleted file mode 100644
index e7ef5b5c3cf..00000000000
--- a/src/Functions/tests/gtest_abtesting.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <Functions/abtesting.h>
-
-#if !defined(ARCADIA_BUILD) && USE_STATS
-
-#    include <gtest/gtest.h>
-
-using namespace DB;
-
-Variants test_bayesab(std::string dist, PODArray<Float64> xs, PODArray<Float64> ys, size_t & max, size_t & min)
-{
-    Variants variants;
-
-    //std::cout << std::fixed;
-    if (dist == "beta")
-    {
-/*        std::cout << dist << "\nclicks: ";
-        for (auto x : xs)
-            std::cout << x << " ";
-
-        std::cout <<"\tconversions: ";
-        for (auto y : ys)
-            std::cout << y << " ";
-
-        std::cout << "\n";*/
-
-        variants = bayesian_ab_test<true>(dist, xs, ys);
-    }
-    else if (dist == "gamma")
-    {
-/*        std::cout << dist << "\nclicks: ";
-        for (auto x : xs)
-            std::cout << x << " ";
-
-        std::cout <<"\tcost: ";
-        for (auto y : ys)
-            std::cout << y << " ";
-
-        std::cout << "\n";*/
-
-        variants = bayesian_ab_test<true>(dist, xs, ys);
-    }
-
-/*    for (size_t i = 0; i < variants.size(); ++i)
-        std::cout << i << " beats 0: " << variants[i].beats_control << std::endl;
-
-    for (size_t i = 0; i < variants.size(); ++i)
-        std::cout << i << " to be best: " << variants[i].best << std::endl;
-
-    std::cout << convertToJson({"0", "1", "2"}, variants) << std::endl;
-*/
-    Float64 max_val = 0.0, min_val = 2.0;
-    for (size_t i = 0; i < variants.size(); ++i)
-    {
-        if (variants[i].best > max_val)
-        {
-            max_val = variants[i].best;
-            max = i;
-        }
-
-        if (variants[i].best < min_val)
-        {
-            min_val = variants[i].best;
-            min = i;
-        }
-    }
-
-    return variants;
-}
-
-
-TEST(BayesAB, beta)
-{
-    size_t max = 0, min = 0;
-
-    auto variants = test_bayesab("beta", {10000, 1000, 900}, {600, 110, 90}, max, min);
-    ASSERT_EQ(1, max);
-
-    variants = test_bayesab("beta", {3000, 3000, 3000}, {600, 100, 90}, max, min);
-    ASSERT_EQ(0, max);
-
-    variants = test_bayesab("beta", {3000, 3000, 3000}, {100, 90, 110}, max, min);
-    ASSERT_EQ(2, max);
-
-    variants = test_bayesab("beta", {3000, 3000, 3000}, {110, 90, 100}, max, min);
-    ASSERT_EQ(0, max);
-}
-
-
-TEST(BayesAB, gamma)
-{
-    size_t max = 0, min = 0;
-    auto variants = test_bayesab("gamma", {10000, 1000, 900}, {600, 110, 90}, max, min);
-    ASSERT_EQ(1, max);
-
-    variants = test_bayesab("gamma", {3000, 3000, 3000}, {600, 100, 90}, max, min);
-    ASSERT_EQ(0, max);
-
-    variants = test_bayesab("gamma", {3000, 3000, 3000}, {100, 90, 110}, max, min);
-    ASSERT_EQ(2, max);
-
-    variants = test_bayesab("gamma", {3000, 3000, 3000}, {110, 90, 100}, max, min);
-    ASSERT_EQ(0, max);
-}
-
-#endif
diff --git a/src/Functions/throwIf.cpp b/src/Functions/throwIf.cpp
index 1b56cc0d188..d499f1f492f 100644
--- a/src/Functions/throwIf.cpp
+++ b/src/Functions/throwIf.cpp
@@ -37,6 +37,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override
     {
         return 0;
diff --git a/src/Functions/tid.cpp b/src/Functions/tid.cpp
index 404eff862b3..ec767e8ec84 100644
--- a/src/Functions/tid.cpp
+++ b/src/Functions/tid.cpp
@@ -3,7 +3,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 namespace DB
 {
@@ -21,6 +21,8 @@ namespace
 
         DataTypePtr getReturnTypeImpl(const DataTypes &) const override { return std::make_shared<DataTypeUInt64>(); }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
         ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
         {
             auto current_tid = getThreadId();
diff --git a/src/Functions/timeSlots.cpp b/src/Functions/timeSlots.cpp
index b64d2687b05..34af410befa 100644
--- a/src/Functions/timeSlots.cpp
+++ b/src/Functions/timeSlots.cpp
@@ -117,6 +117,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {2}; }
diff --git a/src/Functions/timezone.cpp b/src/Functions/timezone.cpp
deleted file mode 100644
index dda30352750..00000000000
--- a/src/Functions/timezone.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <common/DateLUT.h>
-#include <Core/Field.h>
-#include <DataTypes/DataTypeString.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-namespace
-{
-
-/** Returns the server time zone.
-  */
-class FunctionTimezone : public IFunction
-{
-public:
-    static constexpr auto name = "timezone";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionTimezone>(context->isDistributed());
-    }
-
-    explicit FunctionTimezone(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, DateLUT::instance().getTimeZone());
-    }
-private:
-    bool is_distributed;
-};
-
-}
-
-void registerFunctionTimezone(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionTimezone>();
-    factory.registerAlias("timeZone", "timezone");
-}
-
-}
diff --git a/src/Functions/timezoneOf.cpp b/src/Functions/timezoneOf.cpp
index 3dc72424a4f..a6556bdb800 100644
--- a/src/Functions/timezoneOf.cpp
+++ b/src/Functions/timezoneOf.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeDateTime.h>
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 #include <Core/Field.h>
 
 
@@ -32,6 +32,8 @@ public:
 
     size_t getNumberOfArguments() const override { return 1; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & types) const override
     {
         DataTypePtr type_no_nullable = removeNullable(types[0]);
diff --git a/src/Functions/toColumnTypeName.cpp b/src/Functions/toColumnTypeName.cpp
index d64fa12604e..95c35243567 100644
--- a/src/Functions/toColumnTypeName.cpp
+++ b/src/Functions/toColumnTypeName.cpp
@@ -26,6 +26,16 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
+    {
+        settings.enable_lazy_execution_for_first_argument = true;
+        settings.enable_lazy_execution_for_common_descendants_of_arguments = true;
+        settings.force_enable_lazy_execution = true;
+        return true;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     size_t getNumberOfArguments() const override
     {
         return 1;
diff --git a/src/Functions/toFixedString.h b/src/Functions/toFixedString.h
index fe437a24303..129e3e0e8b2 100644
--- a/src/Functions/toFixedString.h
+++ b/src/Functions/toFixedString.h
@@ -42,6 +42,7 @@ public:
 
     size_t getNumberOfArguments() const override { return 2; }
     bool isInjective(const ColumnsWithTypeAndName &) const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/toJSONString.cpp b/src/Functions/toJSONString.cpp
index 8e5e67219af..0ec13e019f7 100644
--- a/src/Functions/toJSONString.cpp
+++ b/src/Functions/toJSONString.cpp
@@ -26,6 +26,8 @@ namespace
 
         bool useDefaultImplementationForConstants() const override { return true; }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
         ColumnPtr
         executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
         {
diff --git a/src/Functions/toLowCardinality.cpp b/src/Functions/toLowCardinality.cpp
index 983e66d1007..b66f2ad90fd 100644
--- a/src/Functions/toLowCardinality.cpp
+++ b/src/Functions/toLowCardinality.cpp
@@ -23,6 +23,7 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/toModifiedJulianDay.cpp b/src/Functions/toModifiedJulianDay.cpp
index a44979b52ff..7873baa11af 100644
--- a/src/Functions/toModifiedJulianDay.cpp
+++ b/src/Functions/toModifiedJulianDay.cpp
@@ -138,6 +138,8 @@ namespace DB
             return return_type;
         }
 
+        bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
         ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName &) const override
         {
             return std::make_unique<ExecutableFunctionToModifiedJulianDay<Name, ToDataType, nullOnErrors>>();
@@ -155,10 +157,7 @@ namespace DB
 
         Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override
         {
-            return Monotonicity(
-                true,  // is_monotonic
-                true,  // is_positive
-                true); // is_always_monotonic
+            return { .is_monotonic = true, .is_always_monotonic = true };
         }
 
     private:
diff --git a/src/Functions/toNullable.cpp b/src/Functions/toNullable.cpp
index 5e383893476..b7fe831f4ff 100644
--- a/src/Functions/toNullable.cpp
+++ b/src/Functions/toNullable.cpp
@@ -29,6 +29,7 @@ public:
     size_t getNumberOfArguments() const override { return 1; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index ab87836de35..ecc3b80f088 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDate32.h>
@@ -222,6 +222,8 @@ public:
 
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
@@ -259,10 +261,10 @@ public:
                         + ". This argument is optional and must be a constant string with timezone name",
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
             if (first_argument_is_date && result_type_is_date)
-                throw Exception(
-                    "The timezone argument of function " + getName() + " with interval type " + interval_type->getKind().toString()
-                        + " is allowed only when the 1st argument has the type DateTime",
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "The timezone argument of function {} with interval type {} is allowed only when the 1st argument "
+                    "has the type DateTime",
+                        getName(), interval_type->getKind().toString());
         };
 
         if (arguments.size() == 2)
@@ -309,7 +311,7 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType &, const Field &, const Field &) const override
     {
-        return { true, true, true };
+        return { .is_monotonic = true, .is_always_monotonic = true };
     }
 
 private:
diff --git a/src/Functions/toTimezone.cpp b/src/Functions/toTimezone.cpp
index 4bb5ab47659..092b79131d8 100644
--- a/src/Functions/toTimezone.cpp
+++ b/src/Functions/toTimezone.cpp
@@ -45,6 +45,8 @@ public:
 
     String getName() const override { return "toTimezone"; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     const DataTypes & getArgumentTypes() const override
     {
         return argument_types;
@@ -64,7 +66,8 @@ public:
 
     Monotonicity getMonotonicityForRange(const IDataType & /*type*/, const Field & /*left*/, const Field & /*right*/) const override
     {
-        return {is_constant_timezone, is_constant_timezone, is_constant_timezone};
+        const bool b = is_constant_timezone;
+        return { .is_monotonic = b, .is_positive = b, .is_always_monotonic = b };
     }
 
 private:
diff --git a/src/Functions/toTypeName.cpp b/src/Functions/toTypeName.cpp
index 3c733fb3ea7..41567ac1ee3 100644
--- a/src/Functions/toTypeName.cpp
+++ b/src/Functions/toTypeName.cpp
@@ -1,5 +1,5 @@
-#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
 #include <Core/Field.h>
 #include <DataTypes/DataTypeString.h>
 
@@ -30,6 +30,16 @@ public:
 
     bool useDefaultImplementationForNulls() const override { return false; }
 
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
+    {
+        settings.enable_lazy_execution_for_first_argument = false;
+        settings.enable_lazy_execution_for_common_descendants_of_arguments = true;
+        settings.force_enable_lazy_execution = true;
+        return true;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
     size_t getNumberOfArguments() const override
@@ -53,7 +63,6 @@ public:
     }
 
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
-
 };
 
 }
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index 43be4c4582a..fb9fd945239 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 #include <Core/Field.h>
 
@@ -54,6 +54,7 @@ public:
 
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
 private:
     DayNum day_value;
diff --git a/src/Functions/tokenExtractors.cpp b/src/Functions/tokenExtractors.cpp
new file mode 100644
index 00000000000..be232c3b742
--- /dev/null
+++ b/src/Functions/tokenExtractors.cpp
@@ -0,0 +1,166 @@
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnArray.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/ITokenExtractor.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+enum TokenExtractorStrategy
+{
+    ngrams,
+    tokens
+};
+
+template <TokenExtractorStrategy strategy>
+class FunctionTokenExtractor : public IFunction
+{
+public:
+
+    static constexpr auto name = strategy == ngrams ? "ngrams" : "tokens";
+
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionTokenExtractor>();
+    }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return strategy == ngrams ? 2 : 1; }
+    bool isVariadic() const override { return false; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return strategy == ngrams ? ColumnNumbers{1} : ColumnNumbers{}; }
+
+    bool useDefaultImplementationForNulls() const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        auto ngram_input_argument_type = WhichDataType(arguments[0].type);
+        if (!ngram_input_argument_type.isStringOrFixedString())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Function {} first argument type should be String or FixedString. Actual {}",
+                getName(),
+                arguments[0].type->getName());
+
+        if constexpr (strategy == ngrams)
+        {
+            const auto & column_with_type = arguments[1];
+            const auto & ngram_argument_column = arguments[1].column;
+            auto ngram_argument_type = WhichDataType(column_with_type.type);
+
+            if (!ngram_argument_type.isNativeUInt() || !ngram_argument_column || !isColumnConst(*ngram_argument_column))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Function {} second argument type should be constant UInt. Actual {}",
+                    getName(),
+                    arguments[1].type->getName());
+
+            Field ngram_argument_value;
+            ngram_argument_column->get(0, ngram_argument_value);
+            auto ngram_value = ngram_argument_value.safeGet<UInt64>();
+
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFixedString>(ngram_value));
+        }
+        else
+        {
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>());
+        }
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
+    {
+        auto column_offsets = ColumnArray::ColumnOffsets::create();
+
+        if constexpr (strategy == TokenExtractorStrategy::ngrams)
+        {
+            Field ngram_argument_value;
+            arguments[1].column->get(0, ngram_argument_value);
+            auto ngram_value = ngram_argument_value.safeGet<UInt64>();
+
+            NgramTokenExtractor extractor(ngram_value);
+
+            auto result_column_fixed_string = ColumnFixedString::create(ngram_value);
+
+            auto input_column = arguments[0].column;
+
+            if (const auto * column_string = checkAndGetColumn<ColumnString>(input_column.get()))
+                executeImpl(extractor, *column_string, *result_column_fixed_string, *column_offsets);
+            else if (const auto * column_fixed_string = checkAndGetColumn<ColumnFixedString>(input_column.get()))
+                executeImpl(extractor, *column_fixed_string, *result_column_fixed_string, *column_offsets);
+
+            return ColumnArray::create(std::move(result_column_fixed_string), std::move(column_offsets));
+        }
+        else
+        {
+            SplitTokenExtractor extractor;
+
+            auto result_column_string = ColumnString::create();
+
+            auto input_column = arguments[0].column;
+
+            if (const auto * column_string = checkAndGetColumn<ColumnString>(input_column.get()))
+                executeImpl(extractor, *column_string, *result_column_string, *column_offsets);
+            else if (const auto * column_fixed_string = checkAndGetColumn<ColumnFixedString>(input_column.get()))
+                executeImpl(extractor, *column_fixed_string, *result_column_string, *column_offsets);
+
+            return ColumnArray::create(std::move(result_column_string), std::move(column_offsets));
+        }
+    }
+
+private:
+
+    template <typename ExtractorType, typename StringColumnType, typename ResultStringColumnType>
+    inline void executeImpl(
+        const ExtractorType & extractor,
+        StringColumnType & input_data_column,
+        ResultStringColumnType & result_data_column,
+        ColumnArray::ColumnOffsets & offsets_column) const
+    {
+        size_t current_tokens_size = 0;
+        auto & offsets_data = offsets_column.getData();
+
+        size_t column_size = input_data_column.size();
+        offsets_data.resize(column_size);
+
+        for (size_t i = 0; i < column_size; ++i)
+        {
+            auto data = input_data_column.getDataAt(i);
+
+            size_t cur = 0;
+            size_t token_start = 0;
+            size_t token_length = 0;
+
+            while (cur < data.size && extractor.nextInString(data.data, data.size, &cur, &token_start, &token_length))
+            {
+                result_data_column.insertData(data.data + token_start, token_length);
+                ++current_tokens_size;
+            }
+
+            offsets_data[i] = current_tokens_size;
+        }
+    }
+};
+
+void registerFunctionsStringTokenExtractor(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTokenExtractor<TokenExtractorStrategy::ngrams>>();
+    factory.registerFunction<FunctionTokenExtractor<TokenExtractorStrategy::tokens>>();
+}
+
+}
+
+
diff --git a/src/Functions/transform.cpp b/src/Functions/transform.cpp
index e93d6d089b6..f9ab66b5243 100644
--- a/src/Functions/transform.cpp
+++ b/src/Functions/transform.cpp
@@ -1,5 +1,5 @@
 #include <mutex>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <DataTypes/DataTypeArray.h>
@@ -10,7 +10,7 @@
 #include <Common/Arena.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/typeid_cast.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
@@ -66,6 +66,7 @@ public:
     }
 
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2}; }
diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index d499885ae31..4fa0770e61b 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -7,7 +7,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnString.h>
 #include <Interpreters/Context.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <thread>
 #include <memory>
@@ -53,6 +53,8 @@ public:
         return 1;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         if (!isString(arguments[0]))
diff --git a/src/Functions/trim.cpp b/src/Functions/trim.cpp
index fdaf25b815e..a1737fc12a1 100644
--- a/src/Functions/trim.cpp
+++ b/src/Functions/trim.cpp
@@ -1,7 +1,7 @@
 #include <Columns/ColumnString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 
 namespace DB
diff --git a/src/Functions/tuple.cpp b/src/Functions/tuple.cpp
index dda034ee911..8e8b18e335d 100644
--- a/src/Functions/tuple.cpp
+++ b/src/Functions/tuple.cpp
@@ -49,6 +49,8 @@ public:
         return true;
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
 
diff --git a/src/Functions/tupleElement.cpp b/src/Functions/tupleElement.cpp
index 97e2f70fccf..023dc266b43 100644
--- a/src/Functions/tupleElement.cpp
+++ b/src/Functions/tupleElement.cpp
@@ -55,6 +55,8 @@ public:
         return {1};
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         size_t count_arrays = 0;
diff --git a/src/Functions/tupleHammingDistance.cpp b/src/Functions/tupleHammingDistance.cpp
index 9d660e388cb..11c8cf84b40 100644
--- a/src/Functions/tupleHammingDistance.cpp
+++ b/src/Functions/tupleHammingDistance.cpp
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/IFunction.h>
+#include <Functions/ITupleFunction.h>
 #include <Functions/castTypeToEither.h>
 
 namespace DB
@@ -16,17 +16,13 @@ namespace ErrorCodes
 
 /// tupleHammingDistance function: (Tuple(...), Tuple(...))-> N
 /// Return the number of non-equal tuple elements
-class FunctionTupleHammingDistance : public IFunction
+class FunctionTupleHammingDistance : public ITupleFunction
 {
-private:
-    ContextPtr context;
-
 public:
     static constexpr auto name = "tupleHammingDistance";
-    using ResultType = UInt8;
 
-    explicit FunctionTupleHammingDistance(ContextPtr context_) : context(context_) {}
-    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTupleHammingDistance>(context); }
+    explicit FunctionTupleHammingDistance(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionTupleHammingDistance>(context_); }
 
     String getName() const override { return name; }
 
@@ -34,22 +30,7 @@ public:
 
     bool useDefaultImplementationForConstants() const override { return true; }
 
-    Columns getTupleElements(const IColumn & column) const
-    {
-        if (const auto * const_column = typeid_cast<const ColumnConst *>(&column))
-            return convertConstTupleToConstantElements(*const_column);
-
-        if (const auto * column_tuple = typeid_cast<const ColumnTuple *>(&column))
-        {
-            Columns columns(column_tuple->tupleSize());
-            for (size_t i = 0; i < columns.size(); ++i)
-                columns[i] = column_tuple->getColumnPtr(i);
-            return columns;
-        }
-
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument of function {} should be tuples, got {}",
-                        getName(), column.getName());
-    }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
@@ -57,11 +38,11 @@ public:
         const auto * right_tuple = checkAndGetDataType<DataTypeTuple>(arguments[1].type.get());
 
         if (!left_tuple)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuples, got {}",
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
                             getName(), arguments[0].type->getName());
 
         if (!right_tuple)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 1 of function {} should be tuples, got {}",
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 1 of function {} should be tuple, got {}",
                             getName(), arguments[1].type->getName());
 
         const auto & left_types = left_tuple->getElements();
@@ -85,7 +66,7 @@ public:
 
         auto compare = FunctionFactory::instance().get("notEquals", context);
         auto plus = FunctionFactory::instance().get("plus", context);
-        DataTypes types(tuple_size);
+        DataTypePtr res_type;
         for (size_t i = 0; i < tuple_size; ++i)
         {
             try
@@ -93,7 +74,17 @@ public:
                 ColumnWithTypeAndName left{left_elements.empty() ? nullptr : left_elements[i], left_types[i], {}};
                 ColumnWithTypeAndName right{right_elements.empty() ? nullptr : right_elements[i], right_types[i], {}};
                 auto elem_compare = compare->build(ColumnsWithTypeAndName{left, right});
-                types[i] = elem_compare->getResultType();
+
+                if (i == 0)
+                {
+                    res_type = elem_compare->getResultType();
+                    continue;
+                }
+
+                ColumnWithTypeAndName left_type{res_type, {}};
+                ColumnWithTypeAndName right_type{elem_compare->getResultType(), {}};
+                auto plus_elem = plus->build({left_type, right_type});
+                res_type = plus_elem->getResultType();
             }
             catch (DB::Exception & e)
             {
@@ -102,15 +93,6 @@ public:
             }
         }
 
-        auto res_type = types[0];
-        for (size_t i = 1; i < tuple_size; ++i)
-        {
-            ColumnWithTypeAndName left{res_type, {}};
-            ColumnWithTypeAndName right{types[i], {}};
-            auto plus_elem = plus->build({left, right});
-            res_type = plus_elem->getResultType();
-        }
-
         return res_type;
     }
 
@@ -129,23 +111,28 @@ public:
 
         auto compare = FunctionFactory::instance().get("notEquals", context);
         auto plus = FunctionFactory::instance().get("plus", context);
-        ColumnsWithTypeAndName columns(tuple_size);
+        ColumnWithTypeAndName res;
         for (size_t i = 0; i < tuple_size; ++i)
         {
             ColumnWithTypeAndName left{left_elements[i], left_types[i], {}};
             ColumnWithTypeAndName right{right_elements[i], right_types[i], {}};
             auto elem_compare = compare->build(ColumnsWithTypeAndName{left, right});
-            columns[i].type = elem_compare->getResultType();
-            columns[i].column = elem_compare->execute({left, right}, columns[i].type, input_rows_count);
-        }
 
-        auto res = columns[0];
-        for (size_t i = 1; i < tuple_size; ++i)
-        {
-            auto plus_elem = plus->build({res, columns[i]});
-            auto res_type = plus_elem->getResultType();
-            res.column = plus_elem->execute({res, columns[i]}, res_type, input_rows_count);
-            res.type = res_type;
+            ColumnWithTypeAndName column;
+            column.type = elem_compare->getResultType();
+            column.column = elem_compare->execute({left, right}, column.type, input_rows_count);
+
+            if (i == 0)
+            {
+                res = std::move(column);
+            }
+            else
+            {
+                auto plus_elem = plus->build({res, column});
+                auto res_type = plus_elem->getResultType();
+                res.column = plus_elem->execute({res, column}, res_type, input_rows_count);
+                res.type = res_type;
+            }
         }
 
         return res.column;
diff --git a/src/Functions/tupleToNameValuePairs.cpp b/src/Functions/tupleToNameValuePairs.cpp
new file mode 100644
index 00000000000..1d51b77bbee
--- /dev/null
+++ b/src/Functions/tupleToNameValuePairs.cpp
@@ -0,0 +1,137 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Common/assert_cast.h>
+#include <memory>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+/** Transform a named tuple into an array of pairs, where the first element
+  * of the pair corresponds to the tuple field name and the second one to the
+  * tuple value.
+  */
+class FunctionTupleToNameValuePairs : public IFunction
+{
+public:
+    static constexpr auto name = "tupleToNameValuePairs";
+    static FunctionPtr create(ContextPtr)
+    {
+        return std::make_shared<FunctionTupleToNameValuePairs>();
+    }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    bool useDefaultImplementationForConstants() const override
+    {
+        return true;
+    }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override
+    {
+        return true;
+    }
+
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        // get the type of all the fields in the tuple
+        const IDataType * col = arguments[0].type.get();
+        const DataTypeTuple * tuple = checkAndGetDataType<DataTypeTuple>(col);
+
+        if (!tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "First argument for function {} must be a tuple.",
+                            getName());
+
+        const auto & element_types = tuple->getElements();
+
+        if (element_types.empty())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "The argument tuple for function {} must not be empty.",
+                            getName());
+
+        const auto & first_element_type = element_types[0];
+
+        bool all_value_types_equal = std::all_of(element_types.begin() + 1,
+                                                 element_types.end(),
+                                                 [&](const auto &other)
+                                                 {
+                                                     return first_element_type->equals(*other);
+                                                 });
+
+        if (!all_value_types_equal)
+        {
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "The argument tuple for function {} must contain just one type.",
+                            getName());
+        }
+
+        DataTypePtr tuple_name_type = std::make_shared<DataTypeString>();
+        DataTypes item_data_types = {tuple_name_type,
+                                     first_element_type};
+
+        auto item_data_type = std::make_shared<DataTypeTuple>(item_data_types);
+
+        return std::make_shared<DataTypeArray>(item_data_type);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
+    {
+        const IColumn * tuple_col = arguments[0].column.get();
+        const DataTypeTuple * tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto * tuple_col_concrete = assert_cast<const ColumnTuple*>(tuple_col);
+
+        auto keys = ColumnString::create();
+        MutableColumnPtr values = tuple_col_concrete->getColumn(0).cloneEmpty();
+        auto offsets = ColumnVector<UInt64>::create();
+        for (size_t row = 0; row < tuple_col_concrete->size(); ++row)
+        {
+            for (size_t col = 0; col < tuple_col_concrete->tupleSize(); ++col)
+            {
+                const std::string & key = tuple->getElementNames()[col];
+                const IColumn & value_column = tuple_col_concrete->getColumn(col);
+
+                values->insertFrom(value_column, row);
+                keys->insertData(key.data(), key.size());
+            }
+            offsets->insertValue(tuple_col_concrete->tupleSize() * (row + 1));
+        }
+
+        std::vector<ColumnPtr> tuple_columns = { std::move(keys), std::move(values) };
+        auto tuple_column = ColumnTuple::create(std::move(tuple_columns));
+        return ColumnArray::create(std::move(tuple_column), std::move(offsets));
+    }
+};
+
+}
+
+void registerFunctionTupleToNameValuePairs(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTupleToNameValuePairs>();
+}
+
+}
diff --git a/src/Functions/uptime.cpp b/src/Functions/uptime.cpp
deleted file mode 100644
index f0175031fc4..00000000000
--- a/src/Functions/uptime.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-
-/** Returns server uptime in seconds.
-  */
-class FunctionUptime : public IFunction
-{
-public:
-    static constexpr auto name = "uptime";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionUptime>(context->isDistributed(), context->getUptimeSeconds());
-    }
-
-    explicit FunctionUptime(bool is_distributed_, time_t uptime_) : is_distributed(is_distributed_), uptime(uptime_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeUInt32>();
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeUInt32().createColumnConst(input_rows_count, static_cast<UInt64>(uptime));
-    }
-
-private:
-    bool is_distributed;
-    time_t uptime;
-};
-
-
-void registerFunctionUptime(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionUptime>();
-}
-
-}
diff --git a/src/Functions/validateNestedArraySizes.cpp b/src/Functions/validateNestedArraySizes.cpp
index 1d96f988690..42b0e401fa0 100644
--- a/src/Functions/validateNestedArraySizes.cpp
+++ b/src/Functions/validateNestedArraySizes.cpp
@@ -28,6 +28,7 @@ public:
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForConstants() const override { return true; }
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override;
diff --git a/src/Functions/vectorFunctions.cpp b/src/Functions/vectorFunctions.cpp
new file mode 100644
index 00000000000..62cfdcd9ee7
--- /dev/null
+++ b/src/Functions/vectorFunctions.cpp
@@ -0,0 +1,1116 @@
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/ITupleFunction.h>
+#include <Functions/castTypeToEither.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int ILLEGAL_COLUMN;
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+struct PlusName { static constexpr auto name = "plus"; };
+struct MinusName { static constexpr auto name = "minus"; };
+struct MultiplyName { static constexpr auto name = "multiply"; };
+struct DivideName { static constexpr auto name = "divide"; };
+
+struct L1Label { static constexpr auto name = "1"; };
+struct L2Label { static constexpr auto name = "2"; };
+struct LinfLabel { static constexpr auto name = "inf"; };
+struct LpLabel { static constexpr auto name = "p"; };
+
+/// str starts from the lowercase letter; not constexpr due to the compiler version
+/*constexpr*/ std::string makeFirstLetterUppercase(const std::string& str)
+{
+    std::string res(str);
+    res[0] += 'A' - 'a';
+    return res;
+}
+
+template <class FuncName>
+class FunctionTupleOperator : public ITupleFunction
+{
+public:
+    /// constexpr cannot be used due to std::string has not constexpr constructor in this compiler version
+    static inline auto name = "tuple" + makeFirstLetterUppercase(FuncName::name);
+
+    explicit FunctionTupleOperator(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionTupleOperator>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * left_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto * right_tuple = checkAndGetDataType<DataTypeTuple>(arguments[1].type.get());
+
+        if (!left_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        if (!right_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 1 of function {} should be tuple, got {}",
+                            getName(), arguments[1].type->getName());
+
+        const auto & left_types = left_tuple->getElements();
+        const auto & right_types = right_tuple->getElements();
+
+        Columns left_elements;
+        Columns right_elements;
+        if (arguments[0].column)
+            left_elements = getTupleElements(*arguments[0].column);
+        if (arguments[1].column)
+            right_elements = getTupleElements(*arguments[1].column);
+
+        if (left_types.size() != right_types.size())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Expected tuples of the same size as arguments of function {}. Got {} and {}",
+                            getName(), arguments[0].type->getName(), arguments[1].type->getName());
+
+        size_t tuple_size = left_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        auto func = FunctionFactory::instance().get(FuncName::name, context);
+        DataTypes types(tuple_size);
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName left{left_elements.empty() ? nullptr : left_elements[i], left_types[i], {}};
+                ColumnWithTypeAndName right{right_elements.empty() ? nullptr : right_elements[i], right_types[i], {}};
+                auto elem_func = func->build(ColumnsWithTypeAndName{left, right});
+                types[i] = elem_func->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        return std::make_shared<DataTypeTuple>(types);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * left_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto * right_tuple = checkAndGetDataType<DataTypeTuple>(arguments[1].type.get());
+        const auto & left_types = left_tuple->getElements();
+        const auto & right_types = right_tuple->getElements();
+        auto left_elements = getTupleElements(*arguments[0].column);
+        auto right_elements = getTupleElements(*arguments[1].column);
+
+        size_t tuple_size = left_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        auto func = FunctionFactory::instance().get(FuncName::name, context);
+        Columns columns(tuple_size);
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName left{left_elements[i], left_types[i], {}};
+            ColumnWithTypeAndName right{right_elements[i], right_types[i], {}};
+            auto elem_func = func->build(ColumnsWithTypeAndName{left, right});
+            columns[i] = elem_func->execute({left, right}, elem_func->getResultType(), input_rows_count)
+                                  ->convertToFullColumnIfConst();
+        }
+
+        return ColumnTuple::create(columns);
+    }
+};
+
+using FunctionTuplePlus = FunctionTupleOperator<PlusName>;
+
+using FunctionTupleMinus = FunctionTupleOperator<MinusName>;
+
+using FunctionTupleMultiply = FunctionTupleOperator<MultiplyName>;
+
+using FunctionTupleDivide = FunctionTupleOperator<DivideName>;
+
+class FunctionTupleNegate : public ITupleFunction
+{
+public:
+    static constexpr auto name = "tupleNegate";
+
+    explicit FunctionTupleNegate(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionTupleNegate>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+
+        if (!cur_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        const auto & cur_types = cur_tuple->getElements();
+
+        Columns cur_elements;
+        if (arguments[0].column)
+            cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        auto negate = FunctionFactory::instance().get("negate", context);
+        DataTypes types(tuple_size);
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName cur{cur_elements.empty() ? nullptr : cur_elements[i], cur_types[i], {}};
+                auto elem_negate = negate->build(ColumnsWithTypeAndName{cur});
+                types[i] = elem_negate->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        return std::make_shared<DataTypeTuple>(types);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto & cur_types = cur_tuple->getElements();
+        auto cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        auto negate = FunctionFactory::instance().get("negate", context);
+        Columns columns(tuple_size);
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName cur{cur_elements[i], cur_types[i], {}};
+            auto elem_negate = negate->build(ColumnsWithTypeAndName{cur});
+            columns[i] = elem_negate->execute({cur}, elem_negate->getResultType(), input_rows_count)
+                                    ->convertToFullColumnIfConst();
+        }
+
+        return ColumnTuple::create(columns);
+    }
+};
+
+template <class FuncName>
+class FunctionTupleOperatorByNumber : public ITupleFunction
+{
+public:
+    /// constexpr cannot be used due to std::string has not constexpr constructor in this compiler version
+    static inline auto name = "tuple" + makeFirstLetterUppercase(FuncName::name) + "ByNumber";
+
+    explicit FunctionTupleOperatorByNumber(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionTupleOperatorByNumber>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+
+        if (!cur_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        const auto & cur_types = cur_tuple->getElements();
+
+        Columns cur_elements;
+        if (arguments[0].column)
+            cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        const auto & p_column = arguments[1];
+        auto func = FunctionFactory::instance().get(FuncName::name, context);
+        DataTypes types(tuple_size);
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName cur{cur_elements.empty() ? nullptr : cur_elements[i], cur_types[i], {}};
+                auto elem_func = func->build(ColumnsWithTypeAndName{cur, p_column});
+                types[i] = elem_func->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        return std::make_shared<DataTypeTuple>(types);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto & cur_types = cur_tuple->getElements();
+        auto cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        const auto & p_column = arguments[1];
+        auto func = FunctionFactory::instance().get(FuncName::name, context);
+        Columns columns(tuple_size);
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName cur{cur_elements[i], cur_types[i], {}};
+            auto elem_func = func->build(ColumnsWithTypeAndName{cur, p_column});
+            columns[i] = elem_func->execute({cur, p_column}, elem_func->getResultType(), input_rows_count)
+                                  ->convertToFullColumnIfConst();
+        }
+
+        return ColumnTuple::create(columns);
+    }
+};
+
+using FunctionTupleMultiplyByNumber = FunctionTupleOperatorByNumber<MultiplyName>;
+
+using FunctionTupleDivideByNumber = FunctionTupleOperatorByNumber<DivideName>;
+
+class FunctionDotProduct : public ITupleFunction
+{
+public:
+    static constexpr auto name = "dotProduct";
+
+    explicit FunctionDotProduct(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionDotProduct>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * left_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto * right_tuple = checkAndGetDataType<DataTypeTuple>(arguments[1].type.get());
+
+        if (!left_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        if (!right_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 1 of function {} should be tuple, got {}",
+                            getName(), arguments[1].type->getName());
+
+        const auto & left_types = left_tuple->getElements();
+        const auto & right_types = right_tuple->getElements();
+
+        Columns left_elements;
+        Columns right_elements;
+        if (arguments[0].column)
+            left_elements = getTupleElements(*arguments[0].column);
+        if (arguments[1].column)
+            right_elements = getTupleElements(*arguments[1].column);
+
+        if (left_types.size() != right_types.size())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Expected tuples of the same size as arguments of function {}. Got {} and {}",
+                            getName(), arguments[0].type->getName(), arguments[1].type->getName());
+
+        size_t tuple_size = left_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        auto multiply = FunctionFactory::instance().get("multiply", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        DataTypePtr res_type;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName left{left_elements.empty() ? nullptr : left_elements[i], left_types[i], {}};
+                ColumnWithTypeAndName right{right_elements.empty() ? nullptr : right_elements[i], right_types[i], {}};
+                auto elem_multiply = multiply->build(ColumnsWithTypeAndName{left, right});
+
+                if (i == 0)
+                {
+                    res_type = elem_multiply->getResultType();
+                    continue;
+                }
+
+                ColumnWithTypeAndName left_type{res_type, {}};
+                ColumnWithTypeAndName right_type{elem_multiply->getResultType(), {}};
+                auto plus_elem = plus->build({left_type, right_type});
+                res_type = plus_elem->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        return res_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * left_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto * right_tuple = checkAndGetDataType<DataTypeTuple>(arguments[1].type.get());
+        const auto & left_types = left_tuple->getElements();
+        const auto & right_types = right_tuple->getElements();
+        auto left_elements = getTupleElements(*arguments[0].column);
+        auto right_elements = getTupleElements(*arguments[1].column);
+
+        size_t tuple_size = left_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        auto multiply = FunctionFactory::instance().get("multiply", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        ColumnWithTypeAndName res;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName left{left_elements[i], left_types[i], {}};
+            ColumnWithTypeAndName right{right_elements[i], right_types[i], {}};
+            auto elem_multiply = multiply->build(ColumnsWithTypeAndName{left, right});
+
+            ColumnWithTypeAndName column;
+            column.type = elem_multiply->getResultType();
+            column.column = elem_multiply->execute({left, right}, column.type, input_rows_count);
+
+            if (i == 0)
+            {
+                res = std::move(column);
+            }
+            else
+            {
+                auto plus_elem = plus->build({res, column});
+                auto res_type = plus_elem->getResultType();
+                res.column = plus_elem->execute({res, column}, res_type, input_rows_count);
+                res.type = res_type;
+            }
+        }
+
+        return res.column;
+    }
+};
+
+/// this is for convenient usage in LNormalize
+template <class FuncLabel>
+class FunctionLNorm : public ITupleFunction {};
+
+template <>
+class FunctionLNorm<L1Label> : public ITupleFunction
+{
+public:
+    static constexpr auto name = "L1Norm";
+
+    explicit FunctionLNorm(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionLNorm>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+
+        if (!cur_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        const auto & cur_types = cur_tuple->getElements();
+
+        Columns cur_elements;
+        if (arguments[0].column)
+            cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        auto abs = FunctionFactory::instance().get("abs", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        DataTypePtr res_type;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName cur{cur_elements.empty() ? nullptr : cur_elements[i], cur_types[i], {}};
+                auto elem_abs = abs->build(ColumnsWithTypeAndName{cur});
+
+                if (i == 0)
+                {
+                    res_type = elem_abs->getResultType();
+                    continue;
+                }
+
+                ColumnWithTypeAndName left_type{res_type, {}};
+                ColumnWithTypeAndName right_type{elem_abs->getResultType(), {}};
+                auto plus_elem = plus->build({left_type, right_type});
+                res_type = plus_elem->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        return res_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto & cur_types = cur_tuple->getElements();
+        auto cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        auto abs = FunctionFactory::instance().get("abs", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        ColumnWithTypeAndName res;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName cur{cur_elements[i], cur_types[i], {}};
+            auto elem_abs = abs->build(ColumnsWithTypeAndName{cur});
+
+            ColumnWithTypeAndName column;
+            column.type = elem_abs->getResultType();
+            column.column = elem_abs->execute({cur}, column.type, input_rows_count);
+
+            if (i == 0)
+            {
+                res = std::move(column);
+            }
+            else
+            {
+                auto plus_elem = plus->build({res, column});
+                auto res_type = plus_elem->getResultType();
+                res.column = plus_elem->execute({res, column}, res_type, input_rows_count);
+                res.type = res_type;
+            }
+        }
+
+        return res.column;
+    }
+};
+using FunctionL1Norm = FunctionLNorm<L1Label>;
+
+template <>
+class FunctionLNorm<L2Label> : public ITupleFunction
+{
+public:
+    static constexpr auto name = "L2Norm";
+
+    explicit FunctionLNorm(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionLNorm>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+
+        if (!cur_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        const auto & cur_types = cur_tuple->getElements();
+
+        Columns cur_elements;
+        if (arguments[0].column)
+            cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        auto multiply = FunctionFactory::instance().get("multiply", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        DataTypePtr res_type;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName cur{cur_elements.empty() ? nullptr : cur_elements[i], cur_types[i], {}};
+                auto elem_multiply = multiply->build(ColumnsWithTypeAndName{cur, cur});
+
+                if (i == 0)
+                {
+                    res_type = elem_multiply->getResultType();
+                    continue;
+                }
+
+                ColumnWithTypeAndName left_type{res_type, {}};
+                ColumnWithTypeAndName right_type{elem_multiply->getResultType(), {}};
+                auto plus_elem = plus->build({left_type, right_type});
+                res_type = plus_elem->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        auto sqrt = FunctionFactory::instance().get("sqrt", context);
+        return sqrt->build({ColumnWithTypeAndName{res_type, {}}})->getResultType();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto & cur_types = cur_tuple->getElements();
+        auto cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        auto multiply = FunctionFactory::instance().get("multiply", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        ColumnWithTypeAndName res;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName cur{cur_elements[i], cur_types[i], {}};
+            auto elem_multiply = multiply->build(ColumnsWithTypeAndName{cur, cur});
+
+            ColumnWithTypeAndName column;
+            column.type = elem_multiply->getResultType();
+            column.column = elem_multiply->execute({cur, cur}, column.type, input_rows_count);
+
+            if (i == 0)
+            {
+                res = std::move(column);
+            }
+            else
+            {
+                auto plus_elem = plus->build({res, column});
+                auto res_type = plus_elem->getResultType();
+                res.column = plus_elem->execute({res, column}, res_type, input_rows_count);
+                res.type = res_type;
+            }
+        }
+
+        auto sqrt = FunctionFactory::instance().get("sqrt", context);
+        auto sqrt_elem = sqrt->build({res});
+        return sqrt_elem->execute({res}, sqrt_elem->getResultType(), input_rows_count);
+    }
+};
+using FunctionL2Norm = FunctionLNorm<L2Label>;
+
+template <>
+class FunctionLNorm<LinfLabel> : public ITupleFunction
+{
+public:
+    static constexpr auto name = "LinfNorm";
+
+    explicit FunctionLNorm(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionLNorm>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 1; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+
+        if (!cur_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        const auto & cur_types = cur_tuple->getElements();
+
+        Columns cur_elements;
+        if (arguments[0].column)
+            cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        auto abs = FunctionFactory::instance().get("abs", context);
+        auto max = FunctionFactory::instance().get("max2", context);
+        DataTypePtr res_type;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName cur{cur_elements.empty() ? nullptr : cur_elements[i], cur_types[i], {}};
+                auto elem_abs = abs->build(ColumnsWithTypeAndName{cur});
+
+                if (i == 0)
+                {
+                    res_type = elem_abs->getResultType();
+                    continue;
+                }
+
+                ColumnWithTypeAndName left_type{res_type, {}};
+                ColumnWithTypeAndName right_type{elem_abs->getResultType(), {}};
+                auto max_elem = max->build({left_type, right_type});
+                res_type = max_elem->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        return res_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto & cur_types = cur_tuple->getElements();
+        auto cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        auto abs = FunctionFactory::instance().get("abs", context);
+        auto max = FunctionFactory::instance().get("max2", context);
+        ColumnWithTypeAndName res;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName cur{cur_elements[i], cur_types[i], {}};
+            auto elem_abs = abs->build(ColumnsWithTypeAndName{cur});
+
+            ColumnWithTypeAndName column;
+            column.type = elem_abs->getResultType();
+            column.column = elem_abs->execute({cur}, column.type, input_rows_count);
+
+            if (i == 0)
+            {
+                res = std::move(column);
+            }
+            else
+            {
+                auto max_elem = max->build({res, column});
+                auto res_type = max_elem->getResultType();
+                res.column = max_elem->execute({res, column}, res_type, input_rows_count);
+                res.type = res_type;
+            }
+        }
+
+        return res.column;
+    }
+};
+using FunctionLinfNorm = FunctionLNorm<LinfLabel>;
+
+template <>
+class FunctionLNorm<LpLabel> : public ITupleFunction
+{
+public:
+    static constexpr auto name = "LpNorm";
+
+    explicit FunctionLNorm(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionLNorm>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+
+        if (!cur_tuple)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Argument 0 of function {} should be tuple, got {}",
+                            getName(), arguments[0].type->getName());
+
+        const auto & cur_types = cur_tuple->getElements();
+
+        Columns cur_elements;
+        if (arguments[0].column)
+            cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_types.size();
+        if (tuple_size == 0)
+            return std::make_shared<DataTypeUInt8>();
+
+        const auto & p_column = arguments[1];
+        auto abs = FunctionFactory::instance().get("abs", context);
+        auto pow = FunctionFactory::instance().get("pow", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        DataTypePtr res_type;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            try
+            {
+                ColumnWithTypeAndName cur{cur_elements.empty() ? nullptr : cur_elements[i], cur_types[i], {}};
+                auto elem_abs = abs->build(ColumnsWithTypeAndName{cur});
+                cur.type = elem_abs->getResultType();
+                cur.column = cur.type->createColumn();
+
+                auto elem_pow = pow->build(ColumnsWithTypeAndName{cur, p_column});
+
+                if (i == 0)
+                {
+                    res_type = elem_pow->getResultType();
+                    continue;
+                }
+
+                ColumnWithTypeAndName left_type{res_type, {}};
+                ColumnWithTypeAndName right_type{elem_pow->getResultType(), {}};
+                auto plus_elem = plus->build({left_type, right_type});
+                res_type = plus_elem->getResultType();
+            }
+            catch (DB::Exception & e)
+            {
+                e.addMessage("While executing function {} for tuple element {}", getName(), i);
+                throw;
+            }
+        }
+
+        ColumnWithTypeAndName inv_p_column{std::make_shared<DataTypeFloat64>(), {}};
+        return pow->build({ColumnWithTypeAndName{res_type, {}}, inv_p_column})->getResultType();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto * cur_tuple = checkAndGetDataType<DataTypeTuple>(arguments[0].type.get());
+        const auto & cur_types = cur_tuple->getElements();
+        auto cur_elements = getTupleElements(*arguments[0].column);
+
+        size_t tuple_size = cur_elements.size();
+        if (tuple_size == 0)
+            return DataTypeUInt8().createColumnConstWithDefaultValue(input_rows_count);
+
+        const auto & p_column = arguments[1];
+
+        const auto * p_column_const = assert_cast<const ColumnConst *>(p_column.column.get());
+        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);
+        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)
+            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);
+        auto pow = FunctionFactory::instance().get("pow", context);
+        auto plus = FunctionFactory::instance().get("plus", context);
+        ColumnWithTypeAndName res;
+        for (size_t i = 0; i < tuple_size; ++i)
+        {
+            ColumnWithTypeAndName cur{cur_elements[i], cur_types[i], {}};
+            auto elem_abs = abs->build(ColumnsWithTypeAndName{cur});
+            cur.column = elem_abs->execute({cur}, elem_abs->getResultType(), input_rows_count);
+            cur.type = elem_abs->getResultType();
+
+            auto elem_pow = pow->build(ColumnsWithTypeAndName{cur, p_column});
+
+            ColumnWithTypeAndName column;
+            column.type = elem_pow->getResultType();
+            column.column = elem_pow->execute({cur, p_column}, column.type, input_rows_count);
+
+            if (i == 0)
+            {
+                res = std::move(column);
+            }
+            else
+            {
+                auto plus_elem = plus->build({res, column});
+                auto res_type = plus_elem->getResultType();
+                res.column = plus_elem->execute({res, column}, res_type, input_rows_count);
+                res.type = res_type;
+            }
+        }
+
+        ColumnWithTypeAndName inv_p_column{DataTypeFloat64().createColumnConst(input_rows_count, 1 / p),
+                                           std::make_shared<DataTypeFloat64>(), {}};
+        auto pow_elem = pow->build({res, inv_p_column});
+        return pow_elem->execute({res, inv_p_column}, pow_elem->getResultType(), input_rows_count);
+    }
+};
+using FunctionLpNorm = FunctionLNorm<LpLabel>;
+
+template <class FuncLabel>
+class FunctionLDistance : public ITupleFunction
+{
+public:
+    /// constexpr cannot be used due to std::string has not constexpr constructor in this compiler version
+    static inline auto name = std::string("L") + FuncLabel::name + "Distance";
+
+    explicit FunctionLDistance(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionLDistance>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override
+    {
+        if constexpr (FuncLabel::name[0] == 'p')
+            return 3;
+        else
+            return 2;
+    }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override
+    {
+        if constexpr (FuncLabel::name[0] == 'p')
+            return {2};
+        else
+            return {};
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        FunctionTupleMinus tuple_minus(context);
+        auto type = tuple_minus.getReturnTypeImpl(arguments);
+
+        ColumnWithTypeAndName minus_res{type, {}};
+
+        auto func = FunctionFactory::instance().get(std::string("L") + FuncLabel::name + "Norm", context);
+        if constexpr (FuncLabel::name[0] == 'p')
+            return func->build({minus_res, arguments[2]})->getResultType();
+        else
+            return func->build({minus_res})->getResultType();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        FunctionTupleMinus tuple_minus(context);
+        auto type = tuple_minus.getReturnTypeImpl(arguments);
+        auto column = tuple_minus.executeImpl(arguments, DataTypePtr(), input_rows_count);
+
+        ColumnWithTypeAndName minus_res{column, type, {}};
+
+        auto func = FunctionFactory::instance().get(std::string("L") + FuncLabel::name + "Norm", context);
+        if constexpr (FuncLabel::name[0] == 'p')
+        {
+            auto func_elem = func->build({minus_res, arguments[2]});
+            return func_elem->execute({minus_res, arguments[2]}, func_elem->getResultType(), input_rows_count);
+        }
+        else
+        {
+            auto func_elem = func->build({minus_res});
+            return func_elem->execute({minus_res}, func_elem->getResultType(), input_rows_count);
+        }
+    }
+};
+
+using FunctionL1Distance = FunctionLDistance<L1Label>;
+
+using FunctionL2Distance = FunctionLDistance<L2Label>;
+
+using FunctionLinfDistance = FunctionLDistance<LinfLabel>;
+
+using FunctionLpDistance = FunctionLDistance<LpLabel>;
+
+template <class FuncLabel>
+class FunctionLNormalize : public ITupleFunction
+{
+public:
+    /// constexpr cannot be used due to std::string has not constexpr constructor in this compiler version
+    static inline auto name = std::string("L") + FuncLabel::name + "Normalize";
+
+    explicit FunctionLNormalize(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionLNormalize>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override
+    {
+        if constexpr (FuncLabel::name[0] == 'p')
+            return 2;
+        else
+            return 1;
+    }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override
+    {
+        if constexpr (FuncLabel::name[0] == 'p')
+            return {1};
+        else
+            return {};
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        FunctionLNorm<FuncLabel> norm(context);
+        auto type = norm.getReturnTypeImpl(arguments);
+
+        ColumnWithTypeAndName norm_res{type, {}};
+
+        FunctionTupleDivideByNumber divide(context);
+        return divide.getReturnTypeImpl({arguments[0], norm_res});
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        FunctionLNorm<FuncLabel> norm(context);
+        auto type = norm.getReturnTypeImpl(arguments);
+        auto column = norm.executeImpl(arguments, DataTypePtr(), input_rows_count);
+
+        ColumnWithTypeAndName norm_res{column, type, {}};
+
+        FunctionTupleDivideByNumber divide(context);
+        return divide.executeImpl({arguments[0], norm_res}, DataTypePtr(), input_rows_count);
+    }
+};
+
+using FunctionL1Normalize = FunctionLNormalize<L1Label>;
+
+using FunctionL2Normalize = FunctionLNormalize<L2Label>;
+
+using FunctionLinfNormalize = FunctionLNormalize<LinfLabel>;
+
+using FunctionLpNormalize = FunctionLNormalize<LpLabel>;
+
+class FunctionCosineDistance : public ITupleFunction
+{
+public:
+    /// constexpr cannot be used due to std::string has not constexpr constructor in this compiler version
+    static inline auto name = "cosineDistance";
+
+    explicit FunctionCosineDistance(ContextPtr context_) : ITupleFunction(context_) {}
+    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionCosineDistance>(context_); }
+
+    String getName() const override { return name; }
+
+    size_t getNumberOfArguments() const override { return 2; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        FunctionDotProduct dot(context);
+        ColumnWithTypeAndName dot_result{dot.getReturnTypeImpl(arguments), {}};
+
+        FunctionL2Norm norm(context);
+        ColumnWithTypeAndName first_norm{norm.getReturnTypeImpl({arguments[0]}), {}};
+        ColumnWithTypeAndName second_norm{norm.getReturnTypeImpl({arguments[1]}), {}};
+
+        auto minus = FunctionFactory::instance().get("minus", context);
+        auto multiply = FunctionFactory::instance().get("multiply", context);
+        auto divide = FunctionFactory::instance().get("divide", context);
+
+        ColumnWithTypeAndName one{std::make_shared<DataTypeUInt8>(), {}};
+
+        ColumnWithTypeAndName multiply_result{multiply->build({first_norm, second_norm})->getResultType(), {}};
+        ColumnWithTypeAndName divide_result{divide->build({dot_result, multiply_result})->getResultType(), {}};
+        return minus->build({one, divide_result})->getResultType();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        if (getReturnTypeImpl(arguments)->isNullable())
+        {
+            return DataTypeNullable(std::make_shared<DataTypeNothing>())
+                   .createColumnConstWithDefaultValue(input_rows_count);
+        }
+
+        FunctionDotProduct dot(context);
+        ColumnWithTypeAndName dot_result{dot.executeImpl(arguments, DataTypePtr(), input_rows_count),
+                                         dot.getReturnTypeImpl(arguments), {}};
+
+        FunctionL2Norm norm(context);
+        ColumnWithTypeAndName first_norm{norm.executeImpl({arguments[0]}, DataTypePtr(), input_rows_count),
+                                         norm.getReturnTypeImpl({arguments[0]}), {}};
+        ColumnWithTypeAndName second_norm{norm.executeImpl({arguments[1]}, DataTypePtr(), input_rows_count),
+                                          norm.getReturnTypeImpl({arguments[1]}), {}};
+
+        auto minus = FunctionFactory::instance().get("minus", context);
+        auto multiply = FunctionFactory::instance().get("multiply", context);
+        auto divide = FunctionFactory::instance().get("divide", context);
+
+        ColumnWithTypeAndName one{DataTypeUInt8().createColumnConst(input_rows_count, 1),
+                                  std::make_shared<DataTypeUInt8>(), {}};
+
+        auto multiply_elem = multiply->build({first_norm, second_norm});
+        ColumnWithTypeAndName multiply_result;
+        multiply_result.type = multiply_elem->getResultType();
+        multiply_result.column = multiply_elem->execute({first_norm, second_norm},
+                                                        multiply_result.type, input_rows_count);
+
+        auto divide_elem = divide->build({dot_result, multiply_result});
+        ColumnWithTypeAndName divide_result;
+        divide_result.type = divide_elem->getResultType();
+        divide_result.column = divide_elem->execute({dot_result, multiply_result},
+                                                    divide_result.type, input_rows_count);
+
+        auto minus_elem = minus->build({one, divide_result});
+        return minus_elem->execute({one, divide_result}, minus_elem->getResultType(), {});
+    }
+};
+
+void registerVectorFunctions(FunctionFactory & factory)
+{
+    factory.registerFunction<FunctionTuplePlus>();
+    factory.registerAlias("vectorSum", FunctionTuplePlus::name, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionTupleMinus>();
+    factory.registerAlias("vectorDifference", FunctionTupleMinus::name, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionTupleMultiply>();
+    factory.registerFunction<FunctionTupleDivide>();
+    factory.registerFunction<FunctionTupleNegate>();
+
+    factory.registerFunction<FunctionTupleMultiplyByNumber>();
+    factory.registerFunction<FunctionTupleDivideByNumber>();
+
+    factory.registerFunction<FunctionDotProduct>();
+    factory.registerAlias("scalarProduct", FunctionDotProduct::name, FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionL1Norm>();
+    factory.registerFunction<FunctionL2Norm>();
+    factory.registerFunction<FunctionLinfNorm>();
+    factory.registerFunction<FunctionLpNorm>();
+
+    factory.registerAlias("normL1", FunctionL1Norm::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normL2", FunctionL2Norm::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normLinf", FunctionLinfNorm::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normLp", FunctionLpNorm::name, FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionL1Distance>();
+    factory.registerFunction<FunctionL2Distance>();
+    factory.registerFunction<FunctionLinfDistance>();
+    factory.registerFunction<FunctionLpDistance>();
+
+    factory.registerAlias("distanceL1", FunctionL1Distance::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("distanceL2", FunctionL2Distance::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("distanceLinf", FunctionLinfDistance::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("distanceLp", FunctionLpDistance::name, FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionL1Normalize>();
+    factory.registerFunction<FunctionL2Normalize>();
+    factory.registerFunction<FunctionLinfNormalize>();
+    factory.registerFunction<FunctionLpNormalize>();
+
+    factory.registerAlias("normalizeL1", FunctionL1Normalize::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normalizeL2", FunctionL2Normalize::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normalizeLinf", FunctionLinfNormalize::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("normalizeLp", FunctionLpNormalize::name, FunctionFactory::CaseInsensitive);
+
+    factory.registerFunction<FunctionCosineDistance>();
+}
+}
diff --git a/src/Functions/version.cpp b/src/Functions/version.cpp
deleted file mode 100644
index 5a31bd073d4..00000000000
--- a/src/Functions/version.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Core/Field.h>
-#include <Interpreters/Context.h>
-
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
-
-namespace DB
-{
-
-/** version() - returns the current version as a string.
-  */
-class FunctionVersion : public IFunction
-{
-public:
-    static constexpr auto name = "version";
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionVersion>(context->isDistributed());
-    }
-
-    explicit FunctionVersion(bool is_distributed_) : is_distributed(is_distributed_)
-    {
-    }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isDeterministic() const override { return false; }
-    bool isDeterministicInScopeOfQuery() const override { return true; }
-    bool isSuitableForConstantFolding() const override { return !is_distributed; }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 0;
-    }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, VERSION_STRING);
-    }
-private:
-    bool is_distributed;
-};
-
-
-void registerFunctionVersion(FunctionFactory & factory)
-{
-    factory.registerFunction<FunctionVersion>(FunctionFactory::CaseInsensitive);
-}
-
-}
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index 6e96a4844ce..4e09aeb399a 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -27,6 +27,8 @@ public:
     bool useDefaultImplementationForNulls() const override { return false; }
     ColumnNumbers getArgumentsThatDontImplyNullableReturnType(size_t /*number_of_arguments*/) const override { return {0}; }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     /// Get the name of the function.
     String getName() const override
     {
diff --git a/src/Functions/visitParamExtractBool.cpp b/src/Functions/visitParamExtractBool.cpp
index 059115b5b13..48fb78ba9b6 100644
--- a/src/Functions/visitParamExtractBool.cpp
+++ b/src/Functions/visitParamExtractBool.cpp
@@ -17,10 +17,10 @@ struct ExtractBool
 };
 
 struct NameVisitParamExtractBool   { static constexpr auto name = "visitParamExtractBool"; };
-using FunctionVisitParamExtractBool = FunctionsStringSearch<ExtractParamImpl<ExtractBool>, NameVisitParamExtractBool>;
+using FunctionVisitParamExtractBool = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractBool, ExtractBool>>;
 
 struct NameSimpleJSONExtractBool   { static constexpr auto name = "simpleJSONExtractBool"; };
-using FunctionSimpleJSONExtractBool = FunctionsStringSearch<ExtractParamImpl<ExtractBool>, NameSimpleJSONExtractBool>;
+using FunctionSimpleJSONExtractBool = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractBool, ExtractBool>>;
 
 void registerFunctionVisitParamExtractBool(FunctionFactory & factory)
 {
diff --git a/src/Functions/visitParamExtractFloat.cpp b/src/Functions/visitParamExtractFloat.cpp
index 7a55cff365c..e7967b6de2c 100644
--- a/src/Functions/visitParamExtractFloat.cpp
+++ b/src/Functions/visitParamExtractFloat.cpp
@@ -7,10 +7,10 @@ namespace DB
 {
 
 struct NameVisitParamExtractFloat  { static constexpr auto name = "visitParamExtractFloat"; };
-using FunctionVisitParamExtractFloat = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Float64>>, NameVisitParamExtractFloat>;
+using FunctionVisitParamExtractFloat = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractFloat, ExtractNumericType<Float64>>>;
 
 struct NameSimpleJSONExtractFloat  { static constexpr auto name = "simpleJSONExtractFloat"; };
-using FunctionSimpleJSONExtractFloat = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Float64>>, NameSimpleJSONExtractFloat>;
+using FunctionSimpleJSONExtractFloat = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractFloat, ExtractNumericType<Float64>>>;
 
 void registerFunctionVisitParamExtractFloat(FunctionFactory & factory)
 {
diff --git a/src/Functions/visitParamExtractInt.cpp b/src/Functions/visitParamExtractInt.cpp
index 7c2188c10fc..b7f1050972c 100644
--- a/src/Functions/visitParamExtractInt.cpp
+++ b/src/Functions/visitParamExtractInt.cpp
@@ -7,10 +7,10 @@ namespace DB
 {
 
 struct NameVisitParamExtractInt    { static constexpr auto name = "visitParamExtractInt"; };
-using FunctionVisitParamExtractInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Int64>>, NameVisitParamExtractInt>;
+using FunctionVisitParamExtractInt = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractInt, ExtractNumericType<Int64>>>;
 
 struct NameSimpleJSONExtractInt    { static constexpr auto name = "simpleJSONExtractInt"; };
-using FunctionSimpleJSONExtractInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<Int64>>, NameSimpleJSONExtractInt>;
+using FunctionSimpleJSONExtractInt = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractInt, ExtractNumericType<Int64>>>;
 
 void registerFunctionVisitParamExtractInt(FunctionFactory & factory)
 {
diff --git a/src/Functions/visitParamExtractUInt.cpp b/src/Functions/visitParamExtractUInt.cpp
index f5466a63b0d..d89b796263e 100644
--- a/src/Functions/visitParamExtractUInt.cpp
+++ b/src/Functions/visitParamExtractUInt.cpp
@@ -7,10 +7,10 @@ namespace DB
 {
 
 struct NameVisitParamExtractUInt   { static constexpr auto name = "visitParamExtractUInt"; };
-using FunctionVisitParamExtractUInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<UInt64>>, NameVisitParamExtractUInt>;
+using FunctionVisitParamExtractUInt = FunctionsStringSearch<ExtractParamImpl<NameVisitParamExtractUInt, ExtractNumericType<UInt64>>>;
 
 struct NameSimpleJSONExtractUInt   { static constexpr auto name = "simpleJSONExtractUInt"; };
-using FunctionSimpleJSONExtractUInt = FunctionsStringSearch<ExtractParamImpl<ExtractNumericType<UInt64>>, NameSimpleJSONExtractUInt>;
+using FunctionSimpleJSONExtractUInt = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONExtractUInt, ExtractNumericType<UInt64>>>;
 
 
 void registerFunctionVisitParamExtractUInt(FunctionFactory & factory)
diff --git a/src/Functions/visitParamHas.cpp b/src/Functions/visitParamHas.cpp
index f4f377f9e8f..71d69ef5768 100644
--- a/src/Functions/visitParamHas.cpp
+++ b/src/Functions/visitParamHas.cpp
@@ -17,10 +17,10 @@ struct HasParam
 };
 
 struct NameVisitParamHas           { static constexpr auto name = "visitParamHas"; };
-using FunctionVisitParamHas = FunctionsStringSearch<ExtractParamImpl<HasParam>, NameVisitParamHas>;
+using FunctionVisitParamHas = FunctionsStringSearch<ExtractParamImpl<NameVisitParamHas, HasParam>>;
 
 struct NameSimpleJSONHas           { static constexpr auto name = "simpleJSONHas"; };
-using FunctionSimpleJSONHas = FunctionsStringSearch<ExtractParamImpl<HasParam>, NameSimpleJSONHas>;
+using FunctionSimpleJSONHas = FunctionsStringSearch<ExtractParamImpl<NameSimpleJSONHas, HasParam>>;
 
 void registerFunctionVisitParamHas(FunctionFactory & factory)
 {
diff --git a/src/Functions/wkt.cpp b/src/Functions/wkt.cpp
index b5567a19e89..8fbb8f59d33 100644
--- a/src/Functions/wkt.cpp
+++ b/src/Functions/wkt.cpp
@@ -36,6 +36,8 @@ public:
         return std::make_shared<DataTypeString>();
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
     {
         auto res_column = ColumnString::create();
diff --git a/src/Functions/ya.make b/src/Functions/ya.make
deleted file mode 100644
index 2b9b3d94313..00000000000
--- a/src/Functions/ya.make
+++ /dev/null
@@ -1,586 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-CFLAGS(
-    -DUSE_SSL -DUSE_XXHASH
-)
-
-ADDINCL(
-    library/cpp/consistent_hashing
-    contrib/libs/farmhash
-    contrib/libs/h3/h3lib/include
-    contrib/libs/hyperscan/src
-    contrib/libs/libdivide
-    contrib/libs/rapidjson/include
-    contrib/libs/xxhash
-    GLOBAL contrib/restricted/murmurhash
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Parsers
-    clickhouse/src/Dictionaries
-    contrib/libs/farmhash
-    contrib/libs/fastops/fastops
-    contrib/libs/h3
-    contrib/libs/hyperscan
-    contrib/libs/icu
-    contrib/libs/libdivide
-    contrib/libs/metrohash
-    contrib/libs/rapidjson
-    contrib/libs/xxhash
-    contrib/restricted/murmurhash
-    library/cpp/consistent_hashing
-)
-
-# "Arcadia" build is slightly deficient. It lacks many libraries that we need.
-
-SRCS(
-    CRC.cpp
-    FunctionChar.cpp
-    FunctionFQDN.cpp
-    FunctionFactory.cpp
-    FunctionFile.cpp
-    FunctionHelpers.cpp
-    FunctionJoinGet.cpp
-    FunctionSQLJSON.cpp
-    FunctionsAES.cpp
-    FunctionsBinaryRepr.cpp
-    FunctionsBitToArray.cpp
-    FunctionsCodingIP.cpp
-    FunctionsCodingUUID.cpp
-    FunctionsConversion.cpp
-    FunctionsEmbeddedDictionaries.cpp
-    FunctionsExternalDictionaries.cpp
-    FunctionsExternalModels.cpp
-    FunctionsHashing.cpp
-    FunctionsJSON.cpp
-    FunctionsLogical.cpp
-    FunctionsRandom.cpp
-    FunctionsRound.cpp
-    FunctionsStringArray.cpp
-    FunctionsStringHash.cpp
-    FunctionsStringSimilarity.cpp
-    GatherUtils/concat.cpp
-    GatherUtils/createArraySink.cpp
-    GatherUtils/createArraySource.cpp
-    GatherUtils/createValueSource.cpp
-    GatherUtils/has_all.cpp
-    GatherUtils/has_any.cpp
-    GatherUtils/has_substr.cpp
-    GatherUtils/push.cpp
-    GatherUtils/resizeConstantSize.cpp
-    GatherUtils/resizeDynamicSize.cpp
-    GatherUtils/sliceDynamicOffsetBounded.cpp
-    GatherUtils/sliceDynamicOffsetUnbounded.cpp
-    GatherUtils/sliceFromLeftConstantOffsetBounded.cpp
-    GatherUtils/sliceFromLeftConstantOffsetUnbounded.cpp
-    GatherUtils/sliceFromRightConstantOffsetBounded.cpp
-    GatherUtils/sliceFromRightConstantOffsetUnbounded.cpp
-    GeoHash.cpp
-    IFunction.cpp
-    JSONPath/Parsers/ParserJSONPath.cpp
-    JSONPath/Parsers/ParserJSONPathMemberAccess.cpp
-    JSONPath/Parsers/ParserJSONPathQuery.cpp
-    JSONPath/Parsers/ParserJSONPathRange.cpp
-    JSONPath/Parsers/ParserJSONPathRoot.cpp
-    JSONPath/Parsers/ParserJSONPathStar.cpp
-    TargetSpecific.cpp
-    URL/URLHierarchy.cpp
-    URL/URLPathHierarchy.cpp
-    URL/basename.cpp
-    URL/cutFragment.cpp
-    URL/cutQueryString.cpp
-    URL/cutQueryStringAndFragment.cpp
-    URL/cutToFirstSignificantSubdomain.cpp
-    URL/cutToFirstSignificantSubdomainCustom.cpp
-    URL/cutURLParameter.cpp
-    URL/cutWWW.cpp
-    URL/decodeURLComponent.cpp
-    URL/domain.cpp
-    URL/domainWithoutWWW.cpp
-    URL/extractURLParameter.cpp
-    URL/extractURLParameterNames.cpp
-    URL/extractURLParameters.cpp
-    URL/firstSignificantSubdomain.cpp
-    URL/firstSignificantSubdomainCustom.cpp
-    URL/fragment.cpp
-    URL/netloc.cpp
-    URL/path.cpp
-    URL/pathFull.cpp
-    URL/port.cpp
-    URL/protocol.cpp
-    URL/queryString.cpp
-    URL/queryStringAndFragment.cpp
-    URL/registerFunctionsURL.cpp
-    URL/tldLookup.generated.cpp
-    URL/topLevelDomain.cpp
-    abs.cpp
-    acos.cpp
-    acosh.cpp
-    addDays.cpp
-    addHours.cpp
-    addMinutes.cpp
-    addMonths.cpp
-    addQuarters.cpp
-    addSeconds.cpp
-    addWeeks.cpp
-    addYears.cpp
-    addressToLine.cpp
-    addressToSymbol.cpp
-    aes_decrypt_mysql.cpp
-    aes_encrypt_mysql.cpp
-    appendTrailingCharIfAbsent.cpp
-    array/array.cpp
-    array/arrayAUC.cpp
-    array/arrayAggregation.cpp
-    array/arrayAll.cpp
-    array/arrayCompact.cpp
-    array/arrayConcat.cpp
-    array/arrayCount.cpp
-    array/arrayCumSum.cpp
-    array/arrayCumSumNonNegative.cpp
-    array/arrayDifference.cpp
-    array/arrayDistinct.cpp
-    array/arrayElement.cpp
-    array/arrayEnumerate.cpp
-    array/arrayEnumerateDense.cpp
-    array/arrayEnumerateDenseRanked.cpp
-    array/arrayEnumerateRanked.cpp
-    array/arrayEnumerateUniq.cpp
-    array/arrayEnumerateUniqRanked.cpp
-    array/arrayExists.cpp
-    array/arrayFill.cpp
-    array/arrayFilter.cpp
-    array/arrayFirst.cpp
-    array/arrayFirstIndex.cpp
-    array/arrayFlatten.cpp
-    array/arrayIntersect.cpp
-    array/arrayJoin.cpp
-    array/arrayMap.cpp
-    array/arrayPopBack.cpp
-    array/arrayPopFront.cpp
-    array/arrayPushBack.cpp
-    array/arrayPushFront.cpp
-    array/arrayReduce.cpp
-    array/arrayReduceInRanges.cpp
-    array/arrayResize.cpp
-    array/arrayReverse.cpp
-    array/arraySlice.cpp
-    array/arraySort.cpp
-    array/arraySplit.cpp
-    array/arrayUniq.cpp
-    array/arrayWithConstant.cpp
-    array/arrayZip.cpp
-    array/countEqual.cpp
-    array/emptyArray.cpp
-    array/emptyArrayToSingle.cpp
-    array/has.cpp
-    array/hasAll.cpp
-    array/hasAny.cpp
-    array/hasSubstr.cpp
-    array/indexOf.cpp
-    array/length.cpp
-    array/mapOp.cpp
-    array/mapPopulateSeries.cpp
-    array/range.cpp
-    array/registerFunctionsArray.cpp
-    asin.cpp
-    asinh.cpp
-    assumeNotNull.cpp
-    atan.cpp
-    atan2.cpp
-    atanh.cpp
-    bar.cpp
-    base64Decode.cpp
-    base64Encode.cpp
-    bitAnd.cpp
-    bitBoolMaskAnd.cpp
-    bitBoolMaskOr.cpp
-    bitCount.cpp
-    bitHammingDistance.cpp
-    bitNot.cpp
-    bitOr.cpp
-    bitRotateLeft.cpp
-    bitRotateRight.cpp
-    bitShiftLeft.cpp
-    bitShiftRight.cpp
-    bitSwapLastTwo.cpp
-    bitTest.cpp
-    bitTestAll.cpp
-    bitTestAny.cpp
-    bitWrapperFunc.cpp
-    bitXor.cpp
-    blockNumber.cpp
-    blockSerializedSize.cpp
-    blockSize.cpp
-    buildId.cpp
-    byteSize.cpp
-    caseWithExpression.cpp
-    cbrt.cpp
-    coalesce.cpp
-    concat.cpp
-    connectionId.cpp
-    convertCharset.cpp
-    cos.cpp
-    cosh.cpp
-    countDigits.cpp
-    countMatches.cpp
-    countSubstrings.cpp
-    countSubstringsCaseInsensitive.cpp
-    countSubstringsCaseInsensitiveUTF8.cpp
-    currentDatabase.cpp
-    currentProfiles.cpp
-    currentRoles.cpp
-    currentUser.cpp
-    dateDiff.cpp
-    dateName.cpp
-    date_trunc.cpp
-    decodeXMLComponent.cpp
-    decrypt.cpp
-    defaultValueOfArgumentType.cpp
-    defaultValueOfTypeName.cpp
-    demange.cpp
-    divide.cpp
-    divide/divide.cpp
-    divide/divideImpl.cpp
-    dumpColumnStructure.cpp
-    e.cpp
-    empty.cpp
-    encodeXMLComponent.cpp
-    encrypt.cpp
-    endsWith.cpp
-    equals.cpp
-    erf.cpp
-    erfc.cpp
-    errorCodeToName.cpp
-    evalMLMethod.cpp
-    exp.cpp
-    exp10.cpp
-    exp2.cpp
-    extract.cpp
-    extractAllGroupsHorizontal.cpp
-    extractAllGroupsVertical.cpp
-    extractGroups.cpp
-    extractTextFromHTML.cpp
-    extractTimeZoneFromFunctionArguments.cpp
-    filesystem.cpp
-    finalizeAggregation.cpp
-    formatDateTime.cpp
-    formatReadableQuantity.cpp
-    formatReadableSize.cpp
-    formatReadableTimeDelta.cpp
-    formatRow.cpp
-    formatString.cpp
-    fromModifiedJulianDay.cpp
-    fromUnixTimestamp64Micro.cpp
-    fromUnixTimestamp64Milli.cpp
-    fromUnixTimestamp64Nano.cpp
-    fuzzBits.cpp
-    gcd.cpp
-    generateUUIDv4.cpp
-    geoToH3.cpp
-    geoToS2.cpp
-    geohashDecode.cpp
-    geohashEncode.cpp
-    geohashesInBox.cpp
-    getMacro.cpp
-    getScalar.cpp
-    getSetting.cpp
-    getSizeOfEnumType.cpp
-    globalVariable.cpp
-    greatCircleDistance.cpp
-    greater.cpp
-    greaterOrEquals.cpp
-    greatest.cpp
-    h3EdgeAngle.cpp
-    h3EdgeLengthM.cpp
-    h3GetBaseCell.cpp
-    h3GetResolution.cpp
-    h3HexAreaM2.cpp
-    h3IndexesAreNeighbors.cpp
-    h3IsValid.cpp
-    h3ToChildren.cpp
-    h3ToParent.cpp
-    h3ToString.cpp
-    h3kRing.cpp
-    h3toGeo.cpp
-    hasColumnInTable.cpp
-    hasThreadFuzzer.cpp
-    hasToken.cpp
-    hasTokenCaseInsensitive.cpp
-    hostName.cpp
-    hypot.cpp
-    identity.cpp
-    if.cpp
-    ifNotFinite.cpp
-    ifNull.cpp
-    ignore.cpp
-    ilike.cpp
-    in.cpp
-    indexHint.cpp
-    initialQueryID.cpp
-    initializeAggregation.cpp
-    intDiv.cpp
-    intDivOrZero.cpp
-    intExp10.cpp
-    intExp2.cpp
-    isConstant.cpp
-    isDecimalOverflow.cpp
-    isFinite.cpp
-    isIPAddressContainedIn.cpp
-    isInfinite.cpp
-    isNaN.cpp
-    isNotNull.cpp
-    isNull.cpp
-    isValidUTF8.cpp
-    isZeroOrNull.cpp
-    jumpConsistentHash.cpp
-    lcm.cpp
-    least.cpp
-    lemmatize.cpp
-    lengthUTF8.cpp
-    less.cpp
-    lessOrEquals.cpp
-    lgamma.cpp
-    like.cpp
-    log.cpp
-    log10.cpp
-    log1p.cpp
-    log2.cpp
-    logTrace.cpp
-    lowCardinalityIndices.cpp
-    lowCardinalityKeys.cpp
-    lower.cpp
-    lowerUTF8.cpp
-    map.cpp
-    match.cpp
-    materialize.cpp
-    minus.cpp
-    modulo.cpp
-    moduloOrZero.cpp
-    multiFuzzyMatchAllIndices.cpp
-    multiFuzzyMatchAny.cpp
-    multiFuzzyMatchAnyIndex.cpp
-    multiIf.cpp
-    multiMatchAllIndices.cpp
-    multiMatchAny.cpp
-    multiMatchAnyIndex.cpp
-    multiSearchAllPositions.cpp
-    multiSearchAllPositionsCaseInsensitive.cpp
-    multiSearchAllPositionsCaseInsensitiveUTF8.cpp
-    multiSearchAllPositionsUTF8.cpp
-    multiSearchAny.cpp
-    multiSearchAnyCaseInsensitive.cpp
-    multiSearchAnyCaseInsensitiveUTF8.cpp
-    multiSearchAnyUTF8.cpp
-    multiSearchFirstIndex.cpp
-    multiSearchFirstIndexCaseInsensitive.cpp
-    multiSearchFirstIndexCaseInsensitiveUTF8.cpp
-    multiSearchFirstIndexUTF8.cpp
-    multiSearchFirstPosition.cpp
-    multiSearchFirstPositionCaseInsensitive.cpp
-    multiSearchFirstPositionCaseInsensitiveUTF8.cpp
-    multiSearchFirstPositionUTF8.cpp
-    multiply.cpp
-    negate.cpp
-    neighbor.cpp
-    normalizeQuery.cpp
-    normalizedQueryHash.cpp
-    notEmpty.cpp
-    notEquals.cpp
-    notILike.cpp
-    notLike.cpp
-    now.cpp
-    now64.cpp
-    nullIf.cpp
-    padString.cpp
-    partitionId.cpp
-    pi.cpp
-    plus.cpp
-    pointInEllipses.cpp
-    pointInPolygon.cpp
-    polygonArea.cpp
-    polygonConvexHull.cpp
-    polygonPerimeter.cpp
-    polygonsDistance.cpp
-    polygonsEquals.cpp
-    polygonsIntersection.cpp
-    polygonsSymDifference.cpp
-    polygonsUnion.cpp
-    polygonsWithin.cpp
-    position.cpp
-    positionCaseInsensitive.cpp
-    positionCaseInsensitiveUTF8.cpp
-    positionUTF8.cpp
-    pow.cpp
-    queryID.cpp
-    rand.cpp
-    rand64.cpp
-    randConstant.cpp
-    randomFixedString.cpp
-    randomPrintableASCII.cpp
-    randomString.cpp
-    randomStringUTF8.cpp
-    readWkt.cpp
-    regexpQuoteMeta.cpp
-    registerFunctions.cpp
-    registerFunctionsArithmetic.cpp
-    registerFunctionsComparison.cpp
-    registerFunctionsConditional.cpp
-    registerFunctionsConsistentHashing.cpp
-    registerFunctionsDateTime.cpp
-    registerFunctionsFormatting.cpp
-    registerFunctionsGeo.cpp
-    registerFunctionsHigherOrder.cpp
-    registerFunctionsIntrospection.cpp
-    registerFunctionsMath.cpp
-    registerFunctionsMiscellaneous.cpp
-    registerFunctionsNull.cpp
-    registerFunctionsRandom.cpp
-    registerFunctionsReinterpret.cpp
-    registerFunctionsString.cpp
-    registerFunctionsStringRegexp.cpp
-    registerFunctionsStringSearch.cpp
-    registerFunctionsTuple.cpp
-    registerFunctionsUnixTimestamp64.cpp
-    registerFunctionsVisitParam.cpp
-    reinterpretAs.cpp
-    repeat.cpp
-    replaceAll.cpp
-    replaceOne.cpp
-    replaceRegexpAll.cpp
-    replaceRegexpOne.cpp
-    replicate.cpp
-    reverse.cpp
-    reverseUTF8.cpp
-    roundAge.cpp
-    roundDuration.cpp
-    roundToExp2.cpp
-    rowNumberInAllBlocks.cpp
-    rowNumberInBlock.cpp
-    runningAccumulate.cpp
-    runningConcurrency.cpp
-    runningDifference.cpp
-    runningDifferenceStartingWithFirstValue.cpp
-    s2CapContains.cpp
-    s2CapUnion.cpp
-    s2CellsIntersect.cpp
-    s2GetNeighbors.cpp
-    s2RectAdd.cpp
-    s2RectContains.cpp
-    s2RectIntersection.cpp
-    s2RectUnion.cpp
-    s2ToGeo.cpp
-    sigmoid.cpp
-    sign.cpp
-    sin.cpp
-    sinh.cpp
-    sleep.cpp
-    sleepEachRow.cpp
-    sqrt.cpp
-    startsWith.cpp
-    stem.cpp
-    stringCutToZero.cpp
-    stringToH3.cpp
-    substring.cpp
-    subtractDays.cpp
-    subtractHours.cpp
-    subtractMinutes.cpp
-    subtractMonths.cpp
-    subtractQuarters.cpp
-    subtractSeconds.cpp
-    subtractWeeks.cpp
-    subtractYears.cpp
-    svg.cpp
-    synonyms.cpp
-    tan.cpp
-    tanh.cpp
-    tcpPort.cpp
-    tgamma.cpp
-    throwIf.cpp
-    tid.cpp
-    timeSlot.cpp
-    timeSlots.cpp
-    timezone.cpp
-    timezoneOf.cpp
-    timezoneOffset.cpp
-    toColumnTypeName.cpp
-    toCustomWeek.cpp
-    toDayOfMonth.cpp
-    toDayOfWeek.cpp
-    toDayOfYear.cpp
-    toFixedString.cpp
-    toHour.cpp
-    toISOWeek.cpp
-    toISOYear.cpp
-    toJSONString.cpp
-    toLowCardinality.cpp
-    toMinute.cpp
-    toModifiedJulianDay.cpp
-    toMonday.cpp
-    toMonth.cpp
-    toNullable.cpp
-    toQuarter.cpp
-    toRelativeDayNum.cpp
-    toRelativeHourNum.cpp
-    toRelativeMinuteNum.cpp
-    toRelativeMonthNum.cpp
-    toRelativeQuarterNum.cpp
-    toRelativeSecondNum.cpp
-    toRelativeWeekNum.cpp
-    toRelativeYearNum.cpp
-    toSecond.cpp
-    toStartOfDay.cpp
-    toStartOfFifteenMinutes.cpp
-    toStartOfFiveMinute.cpp
-    toStartOfHour.cpp
-    toStartOfISOYear.cpp
-    toStartOfInterval.cpp
-    toStartOfMinute.cpp
-    toStartOfMonth.cpp
-    toStartOfQuarter.cpp
-    toStartOfSecond.cpp
-    toStartOfTenMinutes.cpp
-    toStartOfYear.cpp
-    toTime.cpp
-    toTimezone.cpp
-    toTypeName.cpp
-    toUnixTimestamp64Micro.cpp
-    toUnixTimestamp64Milli.cpp
-    toUnixTimestamp64Nano.cpp
-    toValidUTF8.cpp
-    toYYYYMM.cpp
-    toYYYYMMDD.cpp
-    toYYYYMMDDhhmmss.cpp
-    toYear.cpp
-    today.cpp
-    transform.cpp
-    trap.cpp
-    trim.cpp
-    tryBase64Decode.cpp
-    tuple.cpp
-    tupleElement.cpp
-    tupleHammingDistance.cpp
-    upper.cpp
-    upperUTF8.cpp
-    uptime.cpp
-    validateNestedArraySizes.cpp
-    version.cpp
-    visibleWidth.cpp
-    visitParamExtractBool.cpp
-    visitParamExtractFloat.cpp
-    visitParamExtractInt.cpp
-    visitParamExtractRaw.cpp
-    visitParamExtractString.cpp
-    visitParamExtractUInt.cpp
-    visitParamHas.cpp
-    wkt.cpp
-    yandexConsistentHash.cpp
-    yesterday.cpp
-
-)
-
-END()
diff --git a/src/Functions/ya.make.in b/src/Functions/ya.make.in
deleted file mode 100644
index b21bf64304a..00000000000
--- a/src/Functions/ya.make.in
+++ /dev/null
@@ -1,43 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-CFLAGS(
-    -DUSE_SSL -DUSE_XXHASH
-)
-
-ADDINCL(
-    library/cpp/consistent_hashing
-    contrib/libs/farmhash
-    contrib/libs/h3/h3lib/include
-    contrib/libs/hyperscan/src
-    contrib/libs/libdivide
-    contrib/libs/rapidjson/include
-    contrib/libs/xxhash
-    GLOBAL contrib/restricted/murmurhash
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    clickhouse/src/Parsers
-    clickhouse/src/Dictionaries
-    contrib/libs/farmhash
-    contrib/libs/fastops/fastops
-    contrib/libs/h3
-    contrib/libs/hyperscan
-    contrib/libs/icu
-    contrib/libs/libdivide
-    contrib/libs/metrohash
-    contrib/libs/rapidjson
-    contrib/libs/xxhash
-    contrib/restricted/murmurhash
-    library/cpp/consistent_hashing
-)
-
-# "Arcadia" build is slightly deficient. It lacks many libraries that we need.
-
-SRCS(
-<? find . -name '*.cpp' | grep -i -v -P 'tests|Bitmap|abtesting' | grep -v -F examples  | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Functions/yesterday.cpp b/src/Functions/yesterday.cpp
index 737552e192e..f792f885472 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 #include <Core/Field.h>
 
@@ -52,6 +52,7 @@ public:
 
     bool isDeterministic() const override { return false; }
     bool isDeterministicInScopeOfQuery() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
 private:
     DayNum day_value;
diff --git a/src/IO/AIO.cpp b/src/IO/AIO.cpp
index f0422d04434..777d9bbbc7f 100644
--- a/src/IO/AIO.cpp
+++ b/src/IO/AIO.cpp
@@ -6,6 +6,7 @@
 
 #    include <sys/syscall.h>
 #    include <unistd.h>
+#    include <utility>
 
 
 /** Small wrappers for asynchronous I/O.
@@ -50,7 +51,19 @@ AIOContext::AIOContext(unsigned int nr_events)
 
 AIOContext::~AIOContext()
 {
-    io_destroy(ctx);
+    if (ctx)
+        io_destroy(ctx);
+}
+
+AIOContext::AIOContext(AIOContext && rhs)
+{
+    *this = std::move(rhs);
+}
+
+AIOContext & AIOContext::operator=(AIOContext && rhs)
+{
+    std::swap(ctx, rhs.ctx);
+    return *this;
 }
 
 #elif defined(OS_FREEBSD)
diff --git a/src/IO/AIO.h b/src/IO/AIO.h
index 499d1f3bf60..5149aa2eb71 100644
--- a/src/IO/AIO.h
+++ b/src/IO/AIO.h
@@ -33,10 +33,13 @@ int io_getevents(aio_context_t ctx, long min_nr, long max_nr, io_event * events,
 
 struct AIOContext : private boost::noncopyable
 {
-    aio_context_t ctx;
+    aio_context_t ctx = 0;
 
-    AIOContext(unsigned int nr_events = 128);
+    AIOContext() {}
+    AIOContext(unsigned int nr_events);
     ~AIOContext();
+    AIOContext(AIOContext && rhs);
+    AIOContext & operator=(AIOContext && rhs);
 };
 
 #elif defined(OS_FREEBSD)
diff --git a/src/IO/AIOContextPool.cpp b/src/IO/AIOContextPool.cpp
deleted file mode 100644
index 99fdfc67d97..00000000000
--- a/src/IO/AIOContextPool.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-
-#include <Common/Exception.h>
-#include <common/logger_useful.h>
-#include <Common/MemorySanitizer.h>
-#include <Poco/Logger.h>
-#include <boost/range/iterator_range.hpp>
-#include <errno.h>
-
-#include <IO/AIOContextPool.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_IO_SUBMIT;
-    extern const int CANNOT_IO_GETEVENTS;
-}
-
-
-AIOContextPool::~AIOContextPool()
-{
-    cancelled.store(true, std::memory_order_relaxed);
-    io_completion_monitor.join();
-}
-
-
-void AIOContextPool::doMonitor()
-{
-    /// continue checking for events unless cancelled
-    while (!cancelled.load(std::memory_order_relaxed))
-        waitForCompletion();
-
-    /// wait until all requests have been completed
-    while (!promises.empty())
-        waitForCompletion();
-}
-
-
-void AIOContextPool::waitForCompletion()
-{
-    /// array to hold completion events
-    std::vector<io_event> events(max_concurrent_events);
-
-    try
-    {
-        const auto num_events = getCompletionEvents(events.data(), max_concurrent_events);
-        fulfillPromises(events.data(), num_events);
-        notifyProducers(num_events);
-    }
-    catch (...)
-    {
-        /// there was an error, log it, return to any producer and continue
-        reportExceptionToAnyProducer();
-        tryLogCurrentException("AIOContextPool::waitForCompletion()");
-    }
-}
-
-
-int AIOContextPool::getCompletionEvents(io_event events[], const int max_events) const
-{
-    timespec timeout{timeout_sec, 0};
-
-    auto num_events = 0;
-
-    /// request 1 to `max_events` events
-    while ((num_events = io_getevents(aio_context.ctx, 1, max_events, events, &timeout)) < 0)
-        if (errno != EINTR)
-            throwFromErrno("io_getevents: Failed to wait for asynchronous IO completion", ErrorCodes::CANNOT_IO_GETEVENTS, errno);
-
-    /// Unpoison the memory returned from a non-instrumented system call.
-    __msan_unpoison(events, sizeof(*events) * num_events);
-
-    return num_events;
-}
-
-
-void AIOContextPool::fulfillPromises(const io_event events[], const int num_events)
-{
-    if (num_events == 0)
-        return;
-
-    const std::lock_guard lock{mutex};
-
-    /// look at returned events and find corresponding promise, set result and erase promise from map
-    for (const auto & event : boost::make_iterator_range(events, events + num_events))
-    {
-        /// get id from event
-#if defined(__FreeBSD__)
-        const auto completed_id = (reinterpret_cast<struct iocb *>(event.udata))->aio_data;
-#else
-        const auto completed_id = event.data;
-#endif
-
-        /// set value via promise and release it
-        const auto it = promises.find(completed_id);
-        if (it == std::end(promises))
-        {
-            LOG_ERROR(&Poco::Logger::get("AIOcontextPool"), "Found io_event with unknown id {}", completed_id);
-            continue;
-        }
-
-#if defined(__FreeBSD__)
-        it->second.set_value(aio_return(reinterpret_cast<struct aiocb *>(event.udata)));
-#else
-        it->second.set_value(event.res);
-#endif
-        promises.erase(it);
-    }
-}
-
-
-void AIOContextPool::notifyProducers(const int num_producers) const
-{
-    if (num_producers == 0)
-        return;
-
-    if (num_producers > 1)
-        have_resources.notify_all();
-    else
-        have_resources.notify_one();
-}
-
-
-void AIOContextPool::reportExceptionToAnyProducer()
-{
-    const std::lock_guard lock{mutex};
-
-    const auto any_promise_it = std::begin(promises);
-    any_promise_it->second.set_exception(std::current_exception());
-}
-
-
-std::future<AIOContextPool::BytesRead> AIOContextPool::post(struct iocb & iocb)
-{
-    std::unique_lock lock{mutex};
-
-    /// get current id and increment it by one
-    const auto request_id = next_id;
-    ++next_id;
-
-    /// create a promise and put request in "queue"
-    promises.emplace(request_id, std::promise<BytesRead>{});
-    /// store id in AIO request for further identification
-    iocb.aio_data = request_id;
-
-    struct iocb * requests[] { &iocb };
-
-    /// submit a request
-    while (io_submit(aio_context.ctx, 1, requests) < 0)
-    {
-        if (errno == EAGAIN)
-            /// wait until at least one event has been completed (or a spurious wakeup) and try again
-            have_resources.wait(lock);
-        else if (errno != EINTR)
-            throwFromErrno("io_submit: Failed to submit a request for asynchronous IO", ErrorCodes::CANNOT_IO_SUBMIT);
-    }
-
-    return promises[request_id].get_future();
-}
-
-AIOContextPool & AIOContextPool::instance()
-{
-    static AIOContextPool instance;
-    return instance;
-}
-
-}
-
-#endif
diff --git a/src/IO/AIOContextPool.h b/src/IO/AIOContextPool.h
deleted file mode 100644
index 9f4047939f4..00000000000
--- a/src/IO/AIOContextPool.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#if defined(OS_LINUX) || defined(__FreeBSD__)
-
-#include <condition_variable>
-#include <future>
-#include <mutex>
-#include <map>
-#include <IO/AIO.h>
-#include <Common/ThreadPool.h>
-
-
-namespace DB
-{
-
-class AIOContextPool : private boost::noncopyable
-{
-    static const auto max_concurrent_events = 128;
-    static const auto timeout_sec = 1;
-
-    AIOContext aio_context{max_concurrent_events};
-
-    using ID = size_t;
-    using BytesRead = ssize_t;
-
-    /// Autoincremental id used to identify completed requests
-    ID next_id{};
-    mutable std::mutex mutex;
-    mutable std::condition_variable have_resources;
-    std::map<ID, std::promise<BytesRead>> promises;
-
-    std::atomic<bool> cancelled{false};
-    ThreadFromGlobalPool io_completion_monitor{&AIOContextPool::doMonitor, this};
-
-    ~AIOContextPool();
-
-    void doMonitor();
-    void waitForCompletion();
-    int getCompletionEvents(io_event events[], const int max_events) const;
-    void fulfillPromises(const io_event events[], const int num_events);
-    void notifyProducers(const int num_producers) const;
-    void reportExceptionToAnyProducer();
-
-public:
-    static AIOContextPool & instance();
-
-    /// Request AIO read operation for iocb, returns a future with number of bytes read
-    std::future<BytesRead> post(struct iocb & iocb);
-};
-
-}
-
-#endif
diff --git a/src/IO/AsynchronousReadBufferFromFile.cpp b/src/IO/AsynchronousReadBufferFromFile.cpp
new file mode 100644
index 00000000000..9327b80738d
--- /dev/null
+++ b/src/IO/AsynchronousReadBufferFromFile.cpp
@@ -0,0 +1,106 @@
+#include <fcntl.h>
+
+#include <IO/AsynchronousReadBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <Common/ProfileEvents.h>
+#include <errno.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event FileOpen;
+}
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FILE_DOESNT_EXIST;
+    extern const int CANNOT_OPEN_FILE;
+    extern const int CANNOT_CLOSE_FILE;
+}
+
+
+AsynchronousReadBufferFromFile::AsynchronousReadBufferFromFile(
+    AsynchronousReaderPtr reader_,
+    Int32 priority_,
+    const std::string & file_name_,
+    size_t buf_size,
+    int flags,
+    char * existing_memory,
+    size_t alignment)
+    : AsynchronousReadBufferFromFileDescriptor(std::move(reader_), priority_, -1, buf_size, existing_memory, alignment), file_name(file_name_)
+{
+    ProfileEvents::increment(ProfileEvents::FileOpen);
+
+#ifdef __APPLE__
+    bool o_direct = (flags != -1) && (flags & O_DIRECT);
+    if (o_direct)
+        flags = flags & ~O_DIRECT;
+#endif
+    fd = ::open(file_name.c_str(), flags == -1 ? O_RDONLY | O_CLOEXEC : flags | O_CLOEXEC);
+
+    if (-1 == fd)
+        throwFromErrnoWithPath("Cannot open file " + file_name, file_name,
+                               errno == ENOENT ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE);
+#ifdef __APPLE__
+    if (o_direct)
+    {
+        if (fcntl(fd, F_NOCACHE, 1) == -1)
+            throwFromErrnoWithPath("Cannot set F_NOCACHE on file " + file_name, file_name, ErrorCodes::CANNOT_OPEN_FILE);
+    }
+#endif
+}
+
+
+AsynchronousReadBufferFromFile::AsynchronousReadBufferFromFile(
+    AsynchronousReaderPtr reader_,
+    Int32 priority_,
+    int & fd_,
+    const std::string & original_file_name,
+    size_t buf_size,
+    char * existing_memory,
+    size_t alignment)
+    :
+    AsynchronousReadBufferFromFileDescriptor(std::move(reader_), priority_, fd_, buf_size, existing_memory, alignment),
+    file_name(original_file_name.empty() ? "(fd = " + toString(fd_) + ")" : original_file_name)
+{
+    fd_ = -1;
+}
+
+
+AsynchronousReadBufferFromFile::~AsynchronousReadBufferFromFile()
+{
+    /// Must wait for events in flight before closing the file.
+    finalize();
+
+    if (fd < 0)
+        return;
+
+    ::close(fd);
+}
+
+
+void AsynchronousReadBufferFromFile::close()
+{
+    if (fd < 0)
+        return;
+
+    if (0 != ::close(fd))
+        throw Exception("Cannot close file", ErrorCodes::CANNOT_CLOSE_FILE);
+
+    fd = -1;
+}
+
+
+AsynchronousReadBufferFromFileWithDescriptorsCache::~AsynchronousReadBufferFromFileWithDescriptorsCache()
+{
+    /// Must wait for events in flight before potentially closing the file by destroying OpenedFilePtr.
+    finalize();
+}
+
+
+}
+
diff --git a/src/IO/AsynchronousReadBufferFromFile.h b/src/IO/AsynchronousReadBufferFromFile.h
new file mode 100644
index 00000000000..d9d5e43e0d4
--- /dev/null
+++ b/src/IO/AsynchronousReadBufferFromFile.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <IO/AsynchronousReadBufferFromFileDescriptor.h>
+#include <IO/OpenedFileCache.h>
+
+
+namespace DB
+{
+
+class AsynchronousReadBufferFromFile : public AsynchronousReadBufferFromFileDescriptor
+{
+protected:
+    std::string file_name;
+
+public:
+    explicit AsynchronousReadBufferFromFile(
+        AsynchronousReaderPtr reader_, Int32 priority_,
+        const std::string & file_name_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, int flags = -1,
+        char * existing_memory = nullptr, size_t alignment = 0);
+
+    /// Use pre-opened file descriptor.
+    explicit AsynchronousReadBufferFromFile(
+        AsynchronousReaderPtr reader_, Int32 priority_,
+        int & fd, /// Will be set to -1 if constructor didn't throw and ownership of file descriptor is passed to the object.
+        const std::string & original_file_name = {},
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        char * existing_memory = nullptr, size_t alignment = 0);
+
+    ~AsynchronousReadBufferFromFile() override;
+
+    /// Close file before destruction of object.
+    void close();
+
+    std::string getFileName() const override
+    {
+        return file_name;
+    }
+};
+
+
+/** Similar to AsynchronousReadBufferFromFile but also transparently shares open file descriptors.
+  */
+class AsynchronousReadBufferFromFileWithDescriptorsCache : public AsynchronousReadBufferFromFileDescriptor
+{
+private:
+    std::string file_name;
+    OpenedFileCache::OpenedFilePtr file;
+
+public:
+    AsynchronousReadBufferFromFileWithDescriptorsCache(
+        AsynchronousReaderPtr reader_, Int32 priority_,
+        const std::string & file_name_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, int flags = -1,
+        char * existing_memory = nullptr, size_t alignment = 0)
+        : AsynchronousReadBufferFromFileDescriptor(std::move(reader_), priority_, -1, buf_size, existing_memory, alignment),
+        file_name(file_name_)
+    {
+        file = OpenedFileCache::instance().get(file_name, flags);
+        fd = file->getFD();
+    }
+
+    ~AsynchronousReadBufferFromFileWithDescriptorsCache() override;
+
+    std::string getFileName() const override
+    {
+        return file_name;
+    }
+};
+
+}
+
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
new file mode 100644
index 00000000000..b2be45471c8
--- /dev/null
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
@@ -0,0 +1,204 @@
+#include <errno.h>
+#include <time.h>
+#include <optional>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
+#include <Common/Exception.h>
+#include <Common/CurrentMetrics.h>
+#include <IO/AsynchronousReadBufferFromFileDescriptor.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event AsynchronousReadWaitMicroseconds;
+}
+
+namespace CurrentMetrics
+{
+    extern const Metric AsynchronousReadWait;
+}
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ARGUMENT_OUT_OF_BOUND;
+}
+
+
+std::string AsynchronousReadBufferFromFileDescriptor::getFileName() const
+{
+    return "(fd = " + toString(fd) + ")";
+}
+
+
+std::future<IAsynchronousReader::Result> AsynchronousReadBufferFromFileDescriptor::readInto(char * data, size_t size)
+{
+    IAsynchronousReader::Request request;
+    request.descriptor = std::make_shared<IAsynchronousReader::LocalFileDescriptor>(fd);
+    request.buf = data;
+    request.size = size;
+    request.offset = file_offset_of_buffer_end;
+    request.priority = priority;
+
+    return reader->submit(request);
+}
+
+
+void AsynchronousReadBufferFromFileDescriptor::prefetch()
+{
+    if (prefetch_future.valid())
+        return;
+
+    /// Will request the same amount of data that is read in nextImpl.
+    prefetch_buffer.resize(internal_buffer.size());
+    prefetch_future = readInto(prefetch_buffer.data(), prefetch_buffer.size());
+}
+
+
+bool AsynchronousReadBufferFromFileDescriptor::nextImpl()
+{
+    if (prefetch_future.valid())
+    {
+        /// Read request already in flight. Wait for its completion.
+
+        size_t size = 0;
+        {
+            Stopwatch watch;
+            CurrentMetrics::Increment metric_increment{CurrentMetrics::AsynchronousReadWait};
+            size = prefetch_future.get();
+            ProfileEvents::increment(ProfileEvents::AsynchronousReadWaitMicroseconds, watch.elapsedMicroseconds());
+        }
+
+        prefetch_future = {};
+        file_offset_of_buffer_end += size;
+
+        if (size)
+        {
+            prefetch_buffer.swap(memory);
+            set(memory.data(), memory.size());
+            working_buffer.resize(size);
+            return true;
+        }
+
+        return false;
+    }
+    else
+    {
+        /// No pending request. Do synchronous read.
+
+        auto size = readInto(memory.data(), memory.size()).get();
+        file_offset_of_buffer_end += size;
+
+        if (size)
+        {
+            set(memory.data(), memory.size());
+            working_buffer.resize(size);
+            return true;
+        }
+
+        return false;
+    }
+}
+
+
+void AsynchronousReadBufferFromFileDescriptor::finalize()
+{
+    if (prefetch_future.valid())
+    {
+        prefetch_future.wait();
+        prefetch_future = {};
+    }
+}
+
+
+AsynchronousReadBufferFromFileDescriptor::~AsynchronousReadBufferFromFileDescriptor()
+{
+    finalize();
+}
+
+
+/// If 'offset' is small enough to stay in buffer after seek, then true seek in file does not happen.
+off_t AsynchronousReadBufferFromFileDescriptor::seek(off_t offset, int whence)
+{
+    size_t new_pos;
+    if (whence == SEEK_SET)
+    {
+        assert(offset >= 0);
+        new_pos = offset;
+    }
+    else if (whence == SEEK_CUR)
+    {
+        new_pos = file_offset_of_buffer_end - (working_buffer.end() - pos) + offset;
+    }
+    else
+    {
+        throw Exception("ReadBufferFromFileDescriptor::seek expects SEEK_SET or SEEK_CUR as whence", ErrorCodes::ARGUMENT_OUT_OF_BOUND);
+    }
+
+    /// Position is unchanged.
+    if (new_pos + (working_buffer.end() - pos) == file_offset_of_buffer_end)
+        return new_pos;
+
+    if (file_offset_of_buffer_end - working_buffer.size() <= static_cast<size_t>(new_pos)
+        && new_pos <= file_offset_of_buffer_end)
+    {
+        /// Position is still inside the buffer.
+        /// Probably it is at the end of the buffer - then we will load data on the following 'next' call.
+
+        pos = working_buffer.end() - file_offset_of_buffer_end + new_pos;
+        assert(pos >= working_buffer.begin());
+        assert(pos <= working_buffer.end());
+
+        return new_pos;
+    }
+    else
+    {
+        if (prefetch_future.valid())
+        {
+            //std::cerr << "Ignoring prefetched data" << "\n";
+            prefetch_future.wait();
+            prefetch_future = {};
+        }
+
+        /// Position is out of the buffer, we need to do real seek.
+        off_t seek_pos = required_alignment > 1
+            ? new_pos / required_alignment * required_alignment
+            : new_pos;
+
+        off_t offset_after_seek_pos = new_pos - seek_pos;
+
+        /// First put position at the end of the buffer so the next read will fetch new data to the buffer.
+        pos = working_buffer.end();
+
+        /// Just update the info about the next position in file.
+
+        file_offset_of_buffer_end = seek_pos;
+
+        if (offset_after_seek_pos > 0)
+            ignore(offset_after_seek_pos);
+
+        return seek_pos;
+    }
+}
+
+
+void AsynchronousReadBufferFromFileDescriptor::rewind()
+{
+    if (prefetch_future.valid())
+    {
+        prefetch_future.wait();
+        prefetch_future = {};
+    }
+
+    /// Clearing the buffer with existing data. New data will be read on subsequent call to 'next'.
+    working_buffer.resize(0);
+    pos = working_buffer.begin();
+    file_offset_of_buffer_end = 0;
+}
+
+}
+
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.h b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
new file mode 100644
index 00000000000..50d8f5819fe
--- /dev/null
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <IO/ReadBufferFromFileBase.h>
+#include <IO/AsynchronousReader.h>
+#include <Interpreters/Context.h>
+
+#include <optional>
+#include <unistd.h>
+
+
+namespace DB
+{
+
+/** Use ready file descriptor. Does not open or close a file.
+  */
+class AsynchronousReadBufferFromFileDescriptor : public ReadBufferFromFileBase
+{
+protected:
+    AsynchronousReaderPtr reader;
+    Int32 priority;
+
+    Memory<> prefetch_buffer;
+    std::future<IAsynchronousReader::Result> prefetch_future;
+
+    const size_t required_alignment = 0;  /// For O_DIRECT both file offsets and memory addresses have to be aligned.
+    size_t file_offset_of_buffer_end = 0; /// What offset in file corresponds to working_buffer.end().
+    int fd;
+
+    bool nextImpl() override;
+
+    /// Name or some description of file.
+    std::string getFileName() const override;
+
+    void finalize();
+
+public:
+    AsynchronousReadBufferFromFileDescriptor(
+        AsynchronousReaderPtr reader_, Int32 priority_,
+        int fd_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, char * existing_memory = nullptr, size_t alignment = 0)
+        : ReadBufferFromFileBase(buf_size, existing_memory, alignment),
+        reader(std::move(reader_)), priority(priority_), required_alignment(alignment), fd(fd_)
+    {
+        prefetch_buffer.alignment = alignment;
+    }
+
+    ~AsynchronousReadBufferFromFileDescriptor() override;
+
+    void prefetch() override;
+
+    int getFD() const
+    {
+        return fd;
+    }
+
+    off_t getPosition() override
+    {
+        return file_offset_of_buffer_end - (working_buffer.end() - pos);
+    }
+
+    /// If 'offset' is small enough to stay in buffer after seek, then true seek in file does not happen.
+    off_t seek(off_t off, int whence) override;
+
+    /// Seek to the beginning, discarding already read data if any. Useful to reread file that changes on every read.
+    void rewind();
+
+private:
+    std::future<IAsynchronousReader::Result> readInto(char * data, size_t size);
+};
+
+}
+
diff --git a/src/IO/AsynchronousReader.h b/src/IO/AsynchronousReader.h
new file mode 100644
index 00000000000..e4a81623205
--- /dev/null
+++ b/src/IO/AsynchronousReader.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <Core/Types.h>
+#include <optional>
+#include <memory>
+#include <future>
+
+
+namespace DB
+{
+
+/** Interface for asynchronous reads from file descriptors.
+  * It can abstract Linux AIO, io_uring or normal reads from separate thread pool,
+  * and also reads from non-local filesystems.
+  * The implementation not necessarily to be efficient for large number of small requests,
+  * instead it should be ok for moderate number of sufficiently large requests
+  * (e.g. read 1 MB of data 50 000 times per seconds; BTW this is normal performance for reading from page cache).
+  * For example, this interface may not suffice if you want to serve 10 000 000 of 4 KiB requests per second.
+  * This interface is fairly limited.
+  */
+class IAsynchronousReader
+{
+public:
+    /// For local filesystems, the file descriptor is simply integer
+    /// but it can be arbitrary opaque object for remote filesystems.
+    struct IFileDescriptor
+    {
+        virtual ~IFileDescriptor() = default;
+    };
+
+    using FileDescriptorPtr = std::shared_ptr<IFileDescriptor>;
+
+    struct LocalFileDescriptor : public IFileDescriptor
+    {
+        LocalFileDescriptor(int fd_) : fd(fd_) {}
+        int fd;
+    };
+
+    /// Read from file descriptor at specified offset up to size bytes into buf.
+    /// Some implementations may require alignment and it is responsibility of
+    /// the caller to provide conforming requests.
+    struct Request
+    {
+        FileDescriptorPtr descriptor;
+        size_t offset = 0;
+        size_t size = 0;
+        char * buf = nullptr;
+        int64_t priority = 0;
+        size_t ignore = 0;
+    };
+
+    /// Less than requested amount of data can be returned.
+    /// If size is zero - the file has ended.
+    /// (for example, EINTR must be handled by implementation automatically)
+    using Result = size_t;
+
+    /// Submit request and obtain a handle. This method don't perform any waits.
+    /// If this method did not throw, the caller must wait for the result with 'wait' method
+    /// or destroy the whole reader before destroying the buffer for request.
+    /// The method can be called concurrently from multiple threads.
+    virtual std::future<Result> submit(Request request) = 0;
+
+    /// Destructor must wait for all not completed request and ignore the results.
+    /// It may also cancel the requests.
+    virtual ~IAsynchronousReader() = default;
+};
+
+using AsynchronousReaderPtr = std::shared_ptr<IAsynchronousReader>;
+
+}
diff --git a/src/IO/BitHelpers.h b/src/IO/BitHelpers.h
index 1cb62f5f367..d15297637a3 100644
--- a/src/IO/BitHelpers.h
+++ b/src/IO/BitHelpers.h
@@ -1,23 +1,12 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/BitHelpers.h>
 #include <Common/Exception.h>
 
 #include <cstring>
 #include <cassert>
 
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined (__ANDROID__)
-#   include <sys/endian.h>
-#elif defined(__sun)
-#   include <endian.h>
-#elif defined(__APPLE__)
-#   include <libkern/OSByteOrder.h>
-
-#   define htobe64(x) OSSwapHostToBigInt64(x)
-#   define be64toh(x) OSSwapBigToHostInt64(x)
-#endif
-
 
 namespace DB
 {
@@ -152,7 +141,7 @@ private:
         memcpy(&tmp_buffer, source_current, bytes_to_read);
         source_current += bytes_to_read;
 
-        tmp_buffer = be64toh(tmp_buffer);
+        tmp_buffer = __builtin_bswap64(tmp_buffer);
 
         bits_buffer |= BufferType(tmp_buffer) << ((sizeof(BufferType) - sizeof(tmp_buffer)) * 8 - bits_count);
         bits_count += static_cast<UInt8>(bytes_to_read) * 8;
@@ -200,7 +189,7 @@ public:
             capacity = BIT_BUFFER_SIZE - bits_count;
         }
 
-//      write low bits of value as high bits of bits_buffer
+        // write low bits of value as high bits of bits_buffer
         const UInt64 mask = maskLowBits<UInt64>(bits_to_write);
         BufferType v = value & mask;
         v <<= capacity - bits_to_write;
@@ -212,7 +201,7 @@ public:
     // flush contents of bits_buffer to the dest_current, partial bytes are completed with zeroes.
     inline void flush()
     {
-        bits_count = (bits_count + 8 - 1) & ~(8 - 1); // align UP to 8-bytes, so doFlush will write ALL data from bits_buffer
+        bits_count = (bits_count + 8 - 1) & ~(8 - 1); // align up to 8-bytes, so doFlush will write all data from bits_buffer
         while (bits_count != 0)
             doFlush();
     }
@@ -231,13 +220,12 @@ private:
 
         if (available < to_write)
         {
-            throw Exception("Can not write past end of buffer. Space available "
-                            + std::to_string(available) + " bytes, required to write: "
-                            + std::to_string(to_write) + ".",
-                            ErrorCodes::CANNOT_WRITE_AFTER_END_OF_BUFFER);
+            throw Exception(ErrorCodes::CANNOT_WRITE_AFTER_END_OF_BUFFER,
+                "Can not write past end of buffer. Space available {} bytes, required to write {} bytes.",
+                available, to_write);
         }
 
-        const auto tmp_buffer = htobe64(static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8));
+        const auto tmp_buffer = __builtin_bswap64(static_cast<UInt64>(bits_buffer >> (sizeof(bits_buffer) - sizeof(UInt64)) * 8));
         memcpy(dest_current, &tmp_buffer, to_write);
         dest_current += to_write;
 
diff --git a/src/IO/BrotliReadBuffer.cpp b/src/IO/BrotliReadBuffer.cpp
index 41991ad0516..b66bbf45054 100644
--- a/src/IO/BrotliReadBuffer.cpp
+++ b/src/IO/BrotliReadBuffer.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_BROTLI
 #    include <brotli/decode.h>
diff --git a/src/IO/BrotliWriteBuffer.cpp b/src/IO/BrotliWriteBuffer.cpp
index 3d0afa86360..6d815c3abab 100644
--- a/src/IO/BrotliWriteBuffer.cpp
+++ b/src/IO/BrotliWriteBuffer.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_BROTLI
 #    include <IO/BrotliWriteBuffer.h>
diff --git a/src/IO/BufferWithOwnMemory.h b/src/IO/BufferWithOwnMemory.h
index f8cc8b7febb..0d571d6ae7c 100644
--- a/src/IO/BufferWithOwnMemory.h
+++ b/src/IO/BufferWithOwnMemory.h
@@ -48,18 +48,22 @@ struct Memory : boost::noncopyable, Allocator
         dealloc();
     }
 
-    Memory(Memory && rhs) noexcept
-    {
-        *this = std::move(rhs);
-    }
-
-    Memory & operator=(Memory && rhs) noexcept
+    void swap(Memory & rhs) noexcept
     {
         std::swap(m_capacity, rhs.m_capacity);
         std::swap(m_size, rhs.m_size);
         std::swap(m_data, rhs.m_data);
         std::swap(alignment, rhs.alignment);
+    }
 
+    Memory(Memory && rhs) noexcept
+    {
+        swap(rhs);
+    }
+
+    Memory & operator=(Memory && rhs) noexcept
+    {
+        swap(rhs);
         return *this;
     }
 
@@ -84,7 +88,11 @@ struct Memory : boost::noncopyable, Allocator
         }
         else
         {
-            size_t new_capacity = align(new_size + pad_right, alignment);
+            size_t new_capacity = align(new_size, alignment) + pad_right;
+
+            size_t diff = new_capacity - m_capacity;
+            ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, diff);
+
             m_data = static_cast<char *>(Allocator::realloc(m_data, m_capacity, new_capacity, alignment));
             m_capacity = new_capacity;
             m_size = m_capacity - pad_right;
@@ -97,6 +105,9 @@ private:
         if (!alignment)
             return value;
 
+        if (!(value % alignment))
+            return value;
+
         return (value + alignment - 1) / alignment * alignment;
     }
 
@@ -108,12 +119,10 @@ private:
             return;
         }
 
-        size_t padded_capacity = m_capacity + pad_right;
-
         ProfileEvents::increment(ProfileEvents::IOBufferAllocs);
-        ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, padded_capacity);
+        ProfileEvents::increment(ProfileEvents::IOBufferAllocBytes, m_capacity);
 
-        size_t new_capacity = align(padded_capacity, alignment);
+        size_t new_capacity = align(m_capacity, alignment) + pad_right;
         m_data = static_cast<char *>(Allocator::alloc(new_capacity, alignment));
         m_capacity = new_capacity;
         m_size = m_capacity - pad_right;
diff --git a/src/IO/Bzip2ReadBuffer.cpp b/src/IO/Bzip2ReadBuffer.cpp
new file mode 100644
index 00000000000..df9a8d5b369
--- /dev/null
+++ b/src/IO/Bzip2ReadBuffer.cpp
@@ -0,0 +1,102 @@
+#include <Common/config.h>
+
+#if USE_BZIP2
+#    include <IO/Bzip2ReadBuffer.h>
+#    include <bzlib.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BZIP2_STREAM_DECODER_FAILED;
+    extern const int UNEXPECTED_END_OF_FILE;
+}
+
+
+class Bzip2ReadBuffer::Bzip2StateWrapper
+{
+public:
+    Bzip2StateWrapper()
+    {
+        memset(&stream, 0, sizeof(stream));
+
+        int ret = BZ2_bzDecompressInit(&stream, 0, 0);
+
+        if (ret != BZ_OK)
+            throw Exception(
+                ErrorCodes::BZIP2_STREAM_DECODER_FAILED,
+                "bzip2 stream encoder init failed: error code: {}",
+                ret);
+    }
+
+    ~Bzip2StateWrapper()
+    {
+        BZ2_bzDecompressEnd(&stream);
+    }
+
+    bz_stream stream;
+};
+
+Bzip2ReadBuffer::Bzip2ReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t buf_size, char *existing_memory, size_t alignment)
+        : BufferWithOwnMemory<ReadBuffer>(buf_size, existing_memory, alignment)
+        , in(std::move(in_))
+        , bz(std::make_unique<Bzip2StateWrapper>())
+        , eof(false)
+{
+}
+
+Bzip2ReadBuffer::~Bzip2ReadBuffer() = default;
+
+bool Bzip2ReadBuffer::nextImpl()
+{
+    if (eof)
+        return false;
+
+    if (!bz->stream.avail_in)
+    {
+        in->nextIfAtEnd();
+        bz->stream.avail_in = in->buffer().end() - in->position();
+        bz->stream.next_in = in->position();
+    }
+
+    bz->stream.avail_out = internal_buffer.size();
+    bz->stream.next_out = internal_buffer.begin();
+
+    int ret = BZ2_bzDecompress(&bz->stream);
+
+    in->position() = in->buffer().end() - bz->stream.avail_in;
+    working_buffer.resize(internal_buffer.size() - bz->stream.avail_out);
+
+    if (ret == BZ_STREAM_END)
+    {
+        if (in->eof())
+        {
+            eof = true;
+            return !working_buffer.empty();
+        }
+        else
+        {
+            throw Exception(
+                ErrorCodes::BZIP2_STREAM_DECODER_FAILED,
+                "bzip2 decoder finished, but input stream has not exceeded: error code: {}", ret);
+        }
+    }
+
+    if (ret != BZ_OK)
+        throw Exception(
+            ErrorCodes::BZIP2_STREAM_DECODER_FAILED,
+            "bzip2 stream decoder failed: error code: {}",
+            ret);
+
+    if (in->eof())
+    {
+        eof = true;
+        throw Exception(ErrorCodes::UNEXPECTED_END_OF_FILE, "Unexpected end of bzip2 archive");
+    }
+
+    return true;
+}
+}
+
+#endif
diff --git a/src/IO/Bzip2ReadBuffer.h b/src/IO/Bzip2ReadBuffer.h
new file mode 100644
index 00000000000..dc113800683
--- /dev/null
+++ b/src/IO/Bzip2ReadBuffer.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+
+
+namespace DB
+{
+
+class Bzip2ReadBuffer : public BufferWithOwnMemory<ReadBuffer>
+{
+public:
+    Bzip2ReadBuffer(
+            std::unique_ptr<ReadBuffer> in_,
+            size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+            char * existing_memory = nullptr,
+            size_t alignment = 0);
+
+    ~Bzip2ReadBuffer() override;
+
+private:
+    bool nextImpl() override;
+
+    std::unique_ptr<ReadBuffer> in;
+
+    class Bzip2StateWrapper;
+    std::unique_ptr<Bzip2StateWrapper> bz;
+
+    bool eof;
+};
+
+}
+
diff --git a/src/IO/Bzip2WriteBuffer.cpp b/src/IO/Bzip2WriteBuffer.cpp
new file mode 100644
index 00000000000..033a86b0158
--- /dev/null
+++ b/src/IO/Bzip2WriteBuffer.cpp
@@ -0,0 +1,136 @@
+#include <Common/config.h>
+
+#if USE_BZIP2
+#    include <IO/Bzip2WriteBuffer.h>
+#    include <bzlib.h>
+
+#include <Common/MemoryTracker.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BZIP2_STREAM_ENCODER_FAILED;
+}
+
+
+class Bzip2WriteBuffer::Bzip2StateWrapper
+{
+public:
+    explicit Bzip2StateWrapper(int compression_level)
+    {
+        memset(&stream, 0, sizeof(stream));
+
+        int ret = BZ2_bzCompressInit(&stream, compression_level, 0, 0);
+
+        if (ret != BZ_OK)
+            throw Exception(
+                ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
+                "bzip2 stream encoder init failed: error code: {}",
+                ret);
+    }
+
+    ~Bzip2StateWrapper()
+    {
+        BZ2_bzCompressEnd(&stream);
+    }
+
+    bz_stream stream;
+};
+
+Bzip2WriteBuffer::Bzip2WriteBuffer(std::unique_ptr<WriteBuffer> out_, int compression_level, size_t buf_size, char * existing_memory, size_t alignment)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment)
+    , bz(std::make_unique<Bzip2StateWrapper>(compression_level))
+    , out(std::move(out_))
+{
+}
+
+Bzip2WriteBuffer::~Bzip2WriteBuffer()
+{
+    /// FIXME move final flush into the caller
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
+    finish();
+}
+
+void Bzip2WriteBuffer::nextImpl()
+{
+    if (!offset())
+    {
+        return;
+    }
+
+    bz->stream.next_in = working_buffer.begin();
+    bz->stream.avail_in = offset();
+
+    try
+    {
+        do
+        {
+            out->nextIfAtEnd();
+            bz->stream.next_out = out->position();
+            bz->stream.avail_out = out->buffer().end() - out->position();
+
+            int ret = BZ2_bzCompress(&bz->stream, BZ_RUN);
+
+            out->position() = out->buffer().end() - bz->stream.avail_out;
+
+            if (ret != BZ_RUN_OK)
+                throw Exception(
+                    ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
+                    "bzip2 stream encoder failed: error code: {}",
+                    ret);
+
+        }
+        while (bz->stream.avail_in > 0);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out->position() = out->buffer().begin();
+        throw;
+    }
+}
+
+void Bzip2WriteBuffer::finish()
+{
+    if (finished)
+        return;
+
+    try
+    {
+        finishImpl();
+        out->finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out->position() = out->buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+void Bzip2WriteBuffer::finishImpl()
+{
+    next();
+
+    out->nextIfAtEnd();
+    bz->stream.next_out = out->position();
+    bz->stream.avail_out = out->buffer().end() - out->position();
+
+    int ret = BZ2_bzCompress(&bz->stream, BZ_FINISH);
+
+    out->position() = out->buffer().end() - bz->stream.avail_out;
+
+    if (ret != BZ_STREAM_END && ret != BZ_FINISH_OK)
+        throw Exception(
+            ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
+            "bzip2 stream encoder failed: error code: {}",
+            ret);
+}
+
+}
+
+#endif
diff --git a/src/IO/Bzip2WriteBuffer.h b/src/IO/Bzip2WriteBuffer.h
new file mode 100644
index 00000000000..72f14a344e3
--- /dev/null
+++ b/src/IO/Bzip2WriteBuffer.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+
+namespace DB
+{
+
+class Bzip2WriteBuffer : public BufferWithOwnMemory<WriteBuffer>
+{
+public:
+    Bzip2WriteBuffer(
+        std::unique_ptr<WriteBuffer> out_,
+        int compression_level,
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        char * existing_memory = nullptr,
+        size_t alignment = 0);
+
+    ~Bzip2WriteBuffer() override;
+
+    void finalize() override { finish(); }
+
+private:
+    void nextImpl() override;
+
+    void finish();
+    void finishImpl();
+
+    class Bzip2StateWrapper;
+    std::unique_ptr<Bzip2StateWrapper> bz;
+
+    std::unique_ptr<WriteBuffer> out;
+
+    bool finished = false;
+};
+
+}
diff --git a/src/IO/CompressionMethod.cpp b/src/IO/CompressionMethod.cpp
index c6bb5232c0c..c61d091cd09 100644
--- a/src/IO/CompressionMethod.cpp
+++ b/src/IO/CompressionMethod.cpp
@@ -10,10 +10,12 @@
 #include <IO/ZlibInflatingReadBuffer.h>
 #include <IO/ZstdDeflatingWriteBuffer.h>
 #include <IO/ZstdInflatingReadBuffer.h>
+#include <IO/Lz4DeflatingWriteBuffer.h>
+#include <IO/Lz4InflatingReadBuffer.h>
+#include <IO/Bzip2ReadBuffer.h>
+#include <IO/Bzip2WriteBuffer.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 
@@ -40,6 +42,10 @@ std::string toContentEncodingName(CompressionMethod method)
             return "xz";
         case CompressionMethod::Zstd:
             return "zstd";
+        case CompressionMethod::Lz4:
+            return "lz4";
+        case CompressionMethod::Bzip2:
+            return "bz2";
         case CompressionMethod::None:
             return "";
     }
@@ -69,11 +75,15 @@ CompressionMethod chooseCompressionMethod(const std::string & path, const std::s
         return CompressionMethod::Xz;
     if (method_str == "zstd" || method_str == "zst")
         return CompressionMethod::Zstd;
+    if (method_str == "lz4")
+        return CompressionMethod::Lz4;
+    if (method_str == "bz2")
+        return CompressionMethod::Bzip2;
     if (hint.empty() || hint == "auto" || hint == "none")
         return CompressionMethod::None;
 
     throw Exception(
-        "Unknown compression method " + hint + ". Only 'auto', 'none', 'gzip', 'deflate', 'br', 'xz', 'zstd' are supported as compression methods",
+        "Unknown compression method " + hint + ". Only 'auto', 'none', 'gzip', 'deflate', 'br', 'xz', 'zstd', 'lz4', 'bz2' are supported as compression methods",
         ErrorCodes::NOT_IMPLEMENTED);
 }
 
@@ -91,7 +101,12 @@ std::unique_ptr<ReadBuffer> wrapReadBufferWithCompressionMethod(
         return std::make_unique<LZMAInflatingReadBuffer>(std::move(nested), buf_size, existing_memory, alignment);
     if (method == CompressionMethod::Zstd)
         return std::make_unique<ZstdInflatingReadBuffer>(std::move(nested), buf_size, existing_memory, alignment);
-
+    if (method == CompressionMethod::Lz4)
+        return std::make_unique<Lz4InflatingReadBuffer>(std::move(nested), buf_size, existing_memory, alignment);
+#if USE_BZIP2
+    if (method == CompressionMethod::Bzip2)
+        return std::make_unique<Bzip2ReadBuffer>(std::move(nested), buf_size, existing_memory, alignment);
+#endif
     if (method == CompressionMethod::None)
         return nested;
 
@@ -115,6 +130,13 @@ std::unique_ptr<WriteBuffer> wrapWriteBufferWithCompressionMethod(
     if (method == CompressionMethod::Zstd)
         return std::make_unique<ZstdDeflatingWriteBuffer>(std::move(nested), level, buf_size, existing_memory, alignment);
 
+    if (method == CompressionMethod::Lz4)
+        return std::make_unique<Lz4DeflatingWriteBuffer>(std::move(nested), level, buf_size, existing_memory, alignment);
+
+#if USE_BZIP2
+    if (method == CompressionMethod::Bzip2)
+        return std::make_unique<Bzip2WriteBuffer>(std::move(nested), level, buf_size, existing_memory, alignment);
+#endif
     if (method == CompressionMethod::None)
         return nested;
 
diff --git a/src/IO/CompressionMethod.h b/src/IO/CompressionMethod.h
index 6f2d87b45cf..df6400c55a3 100644
--- a/src/IO/CompressionMethod.h
+++ b/src/IO/CompressionMethod.h
@@ -31,7 +31,9 @@ enum class CompressionMethod
     /// Zstd compressor
     ///  This option corresponds to HTTP Content-Encoding: zstd
     Zstd,
-    Brotli
+    Brotli,
+    Lz4,
+    Bzip2
 };
 
 /// How the compression method is named in HTTP.
diff --git a/src/IO/ConcatReadBuffer.h b/src/IO/ConcatReadBuffer.h
index c416b0fd892..4ef8d04d4c9 100644
--- a/src/IO/ConcatReadBuffer.h
+++ b/src/IO/ConcatReadBuffer.h
@@ -8,16 +8,37 @@
 namespace DB
 {
 
-/** Reads from the concatenation of multiple ReadBuffers
-  */
+/// Reads from the concatenation of multiple ReadBuffer's
 class ConcatReadBuffer : public ReadBuffer
 {
 public:
-    using ReadBuffers = std::vector<ReadBuffer *>;
+    using Buffers = std::vector<std::unique_ptr<ReadBuffer>>;
+
+    ConcatReadBuffer() : ReadBuffer(nullptr, 0), current(buffers.end())
+    {
+    }
+
+    explicit ConcatReadBuffer(Buffers && buffers_) : ReadBuffer(nullptr, 0), buffers(std::move(buffers_)), current(buffers.begin())
+    {
+        assert(!buffers.empty());
+    }
+
+    ConcatReadBuffer(ReadBuffer & buf1, ReadBuffer & buf2) : ConcatReadBuffer()
+    {
+        appendBuffer(wrapReadBufferReference(buf1));
+        appendBuffer(wrapReadBufferReference(buf2));
+    }
+
+    void appendBuffer(std::unique_ptr<ReadBuffer> buffer)
+    {
+        assert(!count());
+        buffers.push_back(std::move(buffer));
+        current = buffers.begin();
+    }
 
 protected:
-    ReadBuffers buffers;
-    ReadBuffers::iterator current;
+    Buffers buffers;
+    Buffers::iterator current;
 
     bool nextImpl() override
     {
@@ -54,14 +75,6 @@ protected:
         working_buffer = Buffer((*current)->position(), (*current)->buffer().end());
         return true;
     }
-
-public:
-    explicit ConcatReadBuffer(const ReadBuffers & buffers_) : ReadBuffer(nullptr, 0), buffers(buffers_), current(buffers.begin())
-    {
-        assert(!buffers.empty());
-    }
-
-    ConcatReadBuffer(ReadBuffer & buf1, ReadBuffer & buf2) : ConcatReadBuffer({&buf1, &buf2}) {}
 };
 
 }
diff --git a/src/IO/FileEncryptionCommon.cpp b/src/IO/FileEncryptionCommon.cpp
index 134c446c102..13d8acb8c7b 100644
--- a/src/IO/FileEncryptionCommon.cpp
+++ b/src/IO/FileEncryptionCommon.cpp
@@ -253,8 +253,8 @@ InitVector InitVector::random()
     std::mt19937 gen{rd()};
     std::uniform_int_distribution<UInt128::base_type> dis;
     UInt128 counter;
-    for (size_t i = 0; i != std::size(counter.items); ++i)
-        counter.items[i] = dis(gen);
+    for (auto & i : counter.items)
+        i = dis(gen);
     return InitVector{counter};
 }
 
diff --git a/src/IO/FileEncryptionCommon.h b/src/IO/FileEncryptionCommon.h
index 91fc80c0b22..28d924e6d81 100644
--- a/src/IO/FileEncryptionCommon.h
+++ b/src/IO/FileEncryptionCommon.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_SSL
 #include <Core/Types.h>
diff --git a/src/IO/HTTPChunkedReadBuffer.cpp b/src/IO/HTTPChunkedReadBuffer.cpp
index 374e04031d0..75827679d0c 100644
--- a/src/IO/HTTPChunkedReadBuffer.cpp
+++ b/src/IO/HTTPChunkedReadBuffer.cpp
@@ -3,7 +3,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/hex.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 
 
 namespace DB
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index 346bbf0427e..9f53572fcde 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -9,9 +9,7 @@
 
 #include <Poco/Version.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #    include <Poco/Net/AcceptCertificateHandler.h>
@@ -120,7 +118,7 @@ namespace
                 session->setProxyHost(proxy_host);
                 session->setProxyPort(proxy_port);
 
-#if !defined(ARCADIA_BUILD) && defined(POCO_CLICKHOUSE_PATCH)
+#if defined(POCO_CLICKHOUSE_PATCH)
                 session->setProxyProtocol(proxy_scheme);
 
                 /// Turn on tunnel mode if proxy scheme is HTTP while endpoint scheme is HTTPS.
@@ -315,6 +313,7 @@ void assertResponseIsOk(const Poco::Net::HTTPRequest & request, Poco::Net::HTTPR
     if (!(status == Poco::Net::HTTPResponse::HTTP_OK
         || status == Poco::Net::HTTPResponse::HTTP_CREATED
         || status == Poco::Net::HTTPResponse::HTTP_ACCEPTED
+        || status == Poco::Net::HTTPResponse::HTTP_PARTIAL_CONTENT /// Reading with Range header was successful.
         || (isRedirect(status) && allow_redirects)))
     {
         std::stringstream error_message;        // STYLE_CHECK_ALLOW_STD_STRING_STREAM
diff --git a/src/IO/LZMADeflatingWriteBuffer.cpp b/src/IO/LZMADeflatingWriteBuffer.cpp
index 29cde872241..69d4065f0e5 100644
--- a/src/IO/LZMADeflatingWriteBuffer.cpp
+++ b/src/IO/LZMADeflatingWriteBuffer.cpp
@@ -1,8 +1,6 @@
 #include <IO/LZMADeflatingWriteBuffer.h>
 #include <Common/MemoryTracker.h>
 
-#if !defined(ARCADIA_BUILD)
-
 namespace DB
 {
 namespace ErrorCodes
@@ -146,4 +144,3 @@ void LZMADeflatingWriteBuffer::finishImpl()
 }
 }
 
-#endif
diff --git a/src/IO/LZMADeflatingWriteBuffer.h b/src/IO/LZMADeflatingWriteBuffer.h
index 98eb1732e76..388bb622df9 100644
--- a/src/IO/LZMADeflatingWriteBuffer.h
+++ b/src/IO/LZMADeflatingWriteBuffer.h
@@ -3,16 +3,12 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/WriteBuffer.h>
 
-#if !defined(ARCADIA_BUILD)
-    #include <lzma.h> // Y_IGNORE
-#endif
+#include <lzma.h>
 
 
 namespace DB
 {
 
-#if !defined(ARCADIA_BUILD)
-
 /// Performs compression using lzma library and writes compressed data to out_ WriteBuffer.
 class LZMADeflatingWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
 {
@@ -39,26 +35,4 @@ private:
     bool finished = false;
 };
 
-#else
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-class LZMADeflatingWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
-{
-public:
-    LZMADeflatingWriteBuffer(
-        std::unique_ptr<WriteBuffer> out_ [[maybe_unused]],
-        int compression_level [[maybe_unused]],
-        size_t buf_size [[maybe_unused]] = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory [[maybe_unused]] = nullptr,
-        size_t alignment [[maybe_unused]] = 0)
-    {
-        throw Exception("LZMADeflatingWriteBuffer is not implemented for arcadia build", ErrorCodes::NOT_IMPLEMENTED);
-    }
-};
-
-#endif
 }
diff --git a/src/IO/LZMAInflatingReadBuffer.cpp b/src/IO/LZMAInflatingReadBuffer.cpp
index 6a0a7e5ee31..f2df6bdca6a 100644
--- a/src/IO/LZMAInflatingReadBuffer.cpp
+++ b/src/IO/LZMAInflatingReadBuffer.cpp
@@ -1,6 +1,5 @@
 #include <IO/LZMAInflatingReadBuffer.h>
 
-#if !defined(ARCADIA_BUILD)
 namespace DB
 {
 namespace ErrorCodes
@@ -88,4 +87,3 @@ bool LZMAInflatingReadBuffer::nextImpl()
     return true;
 }
 }
-#endif
diff --git a/src/IO/LZMAInflatingReadBuffer.h b/src/IO/LZMAInflatingReadBuffer.h
index 46bd5d83183..18922f64516 100644
--- a/src/IO/LZMAInflatingReadBuffer.h
+++ b/src/IO/LZMAInflatingReadBuffer.h
@@ -3,14 +3,11 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadBuffer.h>
 
-#if !defined(ARCADIA_BUILD)
-    #include <lzma.h> // Y_IGNORE
-#endif
+#include <lzma.h>
 
 namespace DB
 {
 
-#if !defined(ARCADIA_BUILD)
 class LZMAInflatingReadBuffer : public BufferWithOwnMemory<ReadBuffer>
 {
 public:
@@ -31,25 +28,4 @@ private:
     bool eof;
 };
 
-#else
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-class LZMAInflatingReadBuffer : public BufferWithOwnMemory<ReadBuffer>
-{
-public:
-    LZMAInflatingReadBuffer(
-            std::unique_ptr<ReadBuffer> in_ [[maybe_unused]],
-            size_t buf_size [[maybe_unused]] = DBMS_DEFAULT_BUFFER_SIZE,
-            char * existing_memory [[maybe_unused]] = nullptr,
-            size_t alignment [[maybe_unused]] = 0)
-    {
-        throw Exception("LZMADeflatingWriteBuffer is not implemented for arcadia build", ErrorCodes::NOT_IMPLEMENTED);
-    }
-};
-
-#endif
 }
diff --git a/src/IO/LimitReadBuffer.h b/src/IO/LimitReadBuffer.h
index a5fa0f0d5cc..92e5fbb0aa6 100644
--- a/src/IO/LimitReadBuffer.h
+++ b/src/IO/LimitReadBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 
 
diff --git a/src/IO/Lz4DeflatingWriteBuffer.cpp b/src/IO/Lz4DeflatingWriteBuffer.cpp
new file mode 100644
index 00000000000..13909cfdaac
--- /dev/null
+++ b/src/IO/Lz4DeflatingWriteBuffer.cpp
@@ -0,0 +1,168 @@
+#include <IO/Lz4DeflatingWriteBuffer.h>
+#include <Common/Exception.h>
+#include <Common/MemoryTracker.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LZ4_ENCODER_FAILED;
+}
+
+Lz4DeflatingWriteBuffer::Lz4DeflatingWriteBuffer(
+    std::unique_ptr<WriteBuffer> out_, int compression_level, size_t buf_size, char * existing_memory, size_t alignment)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment)
+    , out(std::move(out_))
+    , in_data(nullptr)
+    , out_data(nullptr)
+    , in_capacity(0)
+    , out_capacity(0)
+{
+    kPrefs = {
+        {LZ4F_max256KB,
+         LZ4F_blockLinked,
+         LZ4F_noContentChecksum,
+         LZ4F_frame,
+         0 /* unknown content size */,
+         0 /* no dictID */,
+         LZ4F_noBlockChecksum},
+        compression_level, /* compression level; 0 == default */
+        0, /* autoflush */
+        0, /* favor decompression speed */
+        {0, 0, 0}, /* reserved, must be set to 0 */
+    };
+
+    size_t ret = LZ4F_createCompressionContext(&ctx, LZ4F_VERSION);
+
+    if (LZ4F_isError(ret))
+        throw Exception(
+            ErrorCodes::LZ4_ENCODER_FAILED,
+            "creation of LZ4 compression context failed. LZ4F version: {}",
+            LZ4F_VERSION,
+            ErrorCodes::LZ4_ENCODER_FAILED);
+}
+
+Lz4DeflatingWriteBuffer::~Lz4DeflatingWriteBuffer()
+{
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
+    finish();
+    LZ4F_freeCompressionContext(ctx);
+}
+
+void Lz4DeflatingWriteBuffer::nextImpl()
+{
+    if (!offset())
+        return;
+
+    in_data = reinterpret_cast<void *>(working_buffer.begin());
+    in_capacity = offset();
+
+    try
+    {
+        if (first_time)
+        {
+            out->nextIfAtEnd();
+
+            out_data = reinterpret_cast<void *>(out->position());
+            out_capacity = out->buffer().end() - out->position();
+
+            /// write frame header and check for errors
+            size_t header_size = LZ4F_compressBegin(ctx, out_data, out_capacity, &kPrefs);
+
+            if (LZ4F_isError(header_size))
+                throw Exception(
+                    ErrorCodes::LZ4_ENCODER_FAILED,
+                    "LZ4 failed to start stream encoding. LZ4F version: {}",
+                    LZ4F_VERSION);
+
+            out_capacity -= header_size;
+            out->position() = out->buffer().end() - out_capacity;
+            first_time = false;
+        }
+
+        do
+        {
+            /// Ensure that there is enough space for compressed block of minimal size
+            if (out_capacity < LZ4F_compressBound(0, &kPrefs))
+            {
+                out->next();
+                out_capacity = out->buffer().end() - out->position();
+            }
+
+            out_data = reinterpret_cast<void *>(out->position());
+
+            /// LZ4F_compressUpdate compresses whole input buffer at once so we need to shink it manually
+            size_t cur_buffer_size = in_capacity;
+            while (out_capacity < LZ4F_compressBound(cur_buffer_size, &kPrefs))
+                cur_buffer_size /= 2;
+
+            size_t compressed_size = LZ4F_compressUpdate(ctx, out_data, out_capacity, in_data, cur_buffer_size, nullptr);
+
+            if (LZ4F_isError(compressed_size))
+                throw Exception(
+                    ErrorCodes::LZ4_ENCODER_FAILED,
+                    "LZ4 failed to encode stream. LZ4F version: {}",
+                    LZ4F_VERSION);
+
+            out_capacity -= compressed_size;
+            in_capacity -= cur_buffer_size;
+
+            in_data = reinterpret_cast<void *>(working_buffer.end() - in_capacity);
+            out->position() = out->buffer().end() - out_capacity;
+        }
+        while (in_capacity > 0);
+    }
+    catch (...)
+    {
+        out->position() = out->buffer().begin();
+        throw;
+    }
+}
+
+void Lz4DeflatingWriteBuffer::finish()
+{
+    if (finished)
+        return;
+
+    try
+    {
+        finishImpl();
+        out->finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out->position() = out->buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+void Lz4DeflatingWriteBuffer::finishImpl()
+{
+    next();
+
+    if (out_capacity < LZ4F_compressBound(0, &kPrefs))
+    {
+        out->next();
+        out_capacity = out->buffer().end() - out->position();
+    }
+
+    out_data = reinterpret_cast<void *>(out->position());
+
+    /// compression end
+    size_t end_size = LZ4F_compressEnd(ctx, out_data, out_capacity, nullptr);
+
+    if (LZ4F_isError(end_size))
+        throw Exception(
+            ErrorCodes::LZ4_ENCODER_FAILED,
+            "LZ4 failed to end stream encoding. LZ4F version: {}",
+            LZ4F_VERSION);
+
+    out_capacity -= end_size;
+    out->position() = out->buffer().end() - out_capacity;
+}
+
+}
diff --git a/src/IO/Lz4DeflatingWriteBuffer.h b/src/IO/Lz4DeflatingWriteBuffer.h
new file mode 100644
index 00000000000..292fbf5637d
--- /dev/null
+++ b/src/IO/Lz4DeflatingWriteBuffer.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/CompressionMethod.h>
+#include <IO/WriteBuffer.h>
+
+#include <lz4.h>
+#include <lz4frame.h>
+
+namespace DB
+{
+/// Performs compression using lz4 library and writes compressed data to out_ WriteBuffer.
+class Lz4DeflatingWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
+{
+public:
+    Lz4DeflatingWriteBuffer(
+        std::unique_ptr<WriteBuffer> out_,
+        int compression_level,
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        char * existing_memory = nullptr,
+        size_t alignment = 0);
+
+    void finalize() override { finish(); }
+
+    ~Lz4DeflatingWriteBuffer() override;
+
+private:
+    void nextImpl() override;
+
+    void finish();
+    void finishImpl();
+
+    std::unique_ptr<WriteBuffer> out;
+
+    LZ4F_preferences_t kPrefs;
+    LZ4F_compressionContext_t ctx;
+
+    void * in_data;
+    void * out_data;
+
+    size_t in_capacity;
+    size_t out_capacity;
+
+    bool first_time = true;
+    bool finished = false;
+};
+}
diff --git a/src/IO/Lz4InflatingReadBuffer.cpp b/src/IO/Lz4InflatingReadBuffer.cpp
new file mode 100644
index 00000000000..22bce94cad2
--- /dev/null
+++ b/src/IO/Lz4InflatingReadBuffer.cpp
@@ -0,0 +1,75 @@
+#include <IO/Lz4InflatingReadBuffer.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LZ4_DECODER_FAILED;
+}
+
+Lz4InflatingReadBuffer::Lz4InflatingReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t buf_size, char * existing_memory, size_t alignment)
+    : BufferWithOwnMemory<ReadBuffer>(buf_size, existing_memory, alignment)
+    , in(std::move(in_))
+    , in_data(nullptr)
+    , out_data(nullptr)
+    , in_available(0)
+    , out_available(0)
+{
+    size_t ret = LZ4F_createDecompressionContext(&dctx, LZ4F_VERSION);
+
+    if (LZ4F_isError(ret))
+        throw Exception(
+            ErrorCodes::LZ4_DECODER_FAILED,
+            "LZ4 failed create decompression context LZ4F_dctx. LZ4F version: {}. Error: {}",
+            LZ4F_VERSION,
+            LZ4F_getErrorName(ret));
+}
+
+Lz4InflatingReadBuffer::~Lz4InflatingReadBuffer()
+{
+    LZ4F_freeDecompressionContext(dctx);
+}
+
+bool Lz4InflatingReadBuffer::nextImpl()
+{
+    if (eof)
+        return false;
+
+    if (!in_available)
+    {
+        in->nextIfAtEnd();
+        in_available = in->buffer().end() - in->position();
+    }
+
+    in_data = reinterpret_cast<void *>(in->position());
+    out_data = reinterpret_cast<void *>(internal_buffer.begin());
+
+    out_available = internal_buffer.size();
+
+    size_t bytes_read = in_available;
+    size_t bytes_written = out_available;
+
+    size_t ret = LZ4F_decompress(dctx, out_data, &bytes_written, in_data, &bytes_read, /* LZ4F_decompressOptions_t */ nullptr);
+
+    in_available -= bytes_read;
+    out_available -= bytes_written;
+
+    in->position() = in->buffer().end() - in_available;
+    working_buffer.resize(internal_buffer.size() - out_available);
+
+    if (LZ4F_isError(ret))
+        throw Exception(
+            ErrorCodes::LZ4_DECODER_FAILED,
+            "LZ4 decompression failed. LZ4F version: {}. Error: {}",
+            LZ4F_VERSION,
+            LZ4F_getErrorName(ret));
+
+    if (in->eof())
+    {
+        eof = true;
+        return !working_buffer.empty();
+    }
+
+    return true;
+}
+}
diff --git a/src/IO/Lz4InflatingReadBuffer.h b/src/IO/Lz4InflatingReadBuffer.h
new file mode 100644
index 00000000000..0462d85adf7
--- /dev/null
+++ b/src/IO/Lz4InflatingReadBuffer.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/CompressionMethod.h>
+#include <IO/ReadBuffer.h>
+
+#include <lz4.h>
+#include <lz4frame.h>
+
+
+namespace DB
+{
+
+class Lz4InflatingReadBuffer : public BufferWithOwnMemory<ReadBuffer>
+{
+public:
+    Lz4InflatingReadBuffer(
+        std::unique_ptr<ReadBuffer> in_,
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        char * existing_memory = nullptr,
+        size_t alignment = 0);
+
+    ~Lz4InflatingReadBuffer() override;
+
+private:
+    bool nextImpl() override;
+
+    std::unique_ptr<ReadBuffer> in;
+
+    LZ4F_dctx* dctx;
+
+    void * in_data;
+    void * out_data;
+
+    size_t in_available;
+    size_t out_available;
+
+    bool eof = false;
+};
+
+}
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.cpp b/src/IO/MMapReadBufferFromFileDescriptor.cpp
index c5adfc017ae..463252ca78d 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.cpp
+++ b/src/IO/MMapReadBufferFromFileDescriptor.cpp
@@ -6,7 +6,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <IO/WriteHelpers.h>
 #include <IO/MMapReadBufferFromFileDescriptor.h>
 
diff --git a/src/IO/MMappedFileDescriptor.cpp b/src/IO/MMappedFileDescriptor.cpp
index db2752d14f9..205cede0993 100644
--- a/src/IO/MMappedFileDescriptor.cpp
+++ b/src/IO/MMappedFileDescriptor.cpp
@@ -7,7 +7,7 @@
 
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <IO/MMappedFileDescriptor.h>
 
 
diff --git a/src/IO/OpenedFileCache.h b/src/IO/OpenedFileCache.h
index 3ae668c20e1..5a96a6240e1 100644
--- a/src/IO/OpenedFileCache.h
+++ b/src/IO/OpenedFileCache.h
@@ -65,6 +65,12 @@ public:
         it->second = res;
         return res;
     }
+
+    static OpenedFileCache & instance()
+    {
+        static OpenedFileCache res;
+        return res;
+    }
 };
 
 using OpenedFileCachePtr = std::shared_ptr<OpenedFileCache>;
diff --git a/src/IO/Operators.h b/src/IO/Operators.h
index 9f83e656106..114ab692dc3 100644
--- a/src/IO/Operators.h
+++ b/src/IO/Operators.h
@@ -41,16 +41,8 @@ struct QuoteManipReadBuffer          : std::reference_wrapper<ReadBuffer> { usin
 struct DoubleQuoteManipReadBuffer    : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 struct BinaryManipReadBuffer         : std::reference_wrapper<ReadBuffer> { using std::reference_wrapper<ReadBuffer>::reference_wrapper; };
 
-
-template <typename T>     WriteBuffer & operator<< (WriteBuffer & buf, const T & x)        { writeText(x, buf);     return buf; }
-/// If you do not use the manipulators, the string is displayed without an escape, as is.
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const String & x)   { writeString(x, buf);   return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const std::string_view & x)   { writeString(StringRef(x), buf);   return buf; }
-template <> inline WriteBuffer & operator<< (WriteBuffer & buf, const StringRef & x) { writeString(x, buf); return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const char & x)     { writeChar(x, buf);     return buf; }
-template <> inline        WriteBuffer & operator<< (WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
-
-inline WriteBuffer & operator<< (WriteBuffer & buf, const char * x)     { writeCString(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, const auto & x) { writeText(x, buf); return buf; }
+inline WriteBuffer & operator<<(WriteBuffer & buf, const pcg32_fast & x) { PcgSerializer::serializePcg32(x, buf); return buf; }
 
 inline EscapeManipWriteBuffer      operator<< (WriteBuffer & buf, EscapeManip)      { return buf; }
 inline QuoteManipWriteBuffer       operator<< (WriteBuffer & buf, QuoteManip)       { return buf; }
@@ -62,10 +54,10 @@ template <typename T> WriteBuffer & operator<< (QuoteManipWriteBuffer buf,
 template <typename T> WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf,   const T & x) { writeDoubleQuoted(x, buf.get()); return buf; }
 template <typename T> WriteBuffer & operator<< (BinaryManipWriteBuffer buf,        const T & x) { writeBinary(x, buf.get());       return buf; }
 
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)           { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const std::string_view & x) { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const StringRef & x)        { writeEscapedString(x, buf); return buf; }
-inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const char * x)             { writeEscapedString(x, strlen(x), buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const String & x)   { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, std::string_view x) { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, StringRef x)        { writeEscapedString(x, buf); return buf; }
+inline  WriteBuffer & operator<< (EscapeManipWriteBuffer buf, const char * x)     { writeEscapedString(x, strlen(x), buf); return buf; }
 
 inline WriteBuffer & operator<< (QuoteManipWriteBuffer buf,       const char * x) { writeAnyQuotedString<'\''>(x, x + strlen(x), buf.get()); return buf; }
 inline WriteBuffer & operator<< (DoubleQuoteManipWriteBuffer buf, const char * x) { writeAnyQuotedString<'"'>(x, x + strlen(x), buf.get()); return buf; }
diff --git a/src/IO/Progress.cpp b/src/IO/Progress.cpp
index 7cc1504a978..ebc7d04e86e 100644
--- a/src/IO/Progress.cpp
+++ b/src/IO/Progress.cpp
@@ -4,6 +4,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <Core/ProtocolDefines.h>
 
 
 namespace DB
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index e1253ab8eb8..c00eea98ff4 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -3,11 +3,9 @@
 #include <atomic>
 #include <cstddef>
 #include <functional>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <Core/Defines.h>
-#include <Common/Stopwatch.h>
-
 
 namespace DB
 {
@@ -123,7 +121,7 @@ struct Progress
 
 
 /** Callback to track the progress of the query.
-  * Used in IBlockInputStream and Context.
+  * Used in QueryPipeline and Context.
   * The function takes the number of rows in the last block, the number of bytes in the last block.
   * Note that the callback can be called from different threads.
   */
diff --git a/src/IO/ReadBuffer.h b/src/IO/ReadBuffer.h
index e3166ba8180..be456ea398c 100644
--- a/src/IO/ReadBuffer.h
+++ b/src/IO/ReadBuffer.h
@@ -197,6 +197,17 @@ public:
         return read(to, n);
     }
 
+    /** Do something to allow faster subsequent call to 'nextImpl' if possible.
+      * It's used for asynchronous readers with double-buffering.
+      */
+    virtual void prefetch() {}
+
+    /**
+     * For reading from remote filesystem, when it matters how much we read.
+     */
+    virtual void setReadUntilPosition(size_t /* position */) {}
+    virtual void setReadUntilEnd() {}
+
 protected:
     /// The number of bytes to ignore from the initial position of `working_buffer`
     /// buffer. Apparently this is an additional out-parameter for nextImpl(),
@@ -253,5 +264,33 @@ inline std::unique_ptr<ReadBuffer> wrapReadBufferReference(ReadBuffer & buf)
     return std::make_unique<ReadBufferWrapper>(buf);
 }
 
+inline std::unique_ptr<ReadBuffer> wrapReadBufferPointer(ReadBufferPtr ptr)
+{
+    class ReadBufferWrapper : public ReadBuffer
+    {
+        public:
+            explicit ReadBufferWrapper(ReadBufferPtr ptr_) : ReadBuffer(ptr_->position(), 0), ptr(ptr_)
+            {
+                working_buffer = Buffer(ptr->position(), ptr->buffer().end());
+            }
+
+        private:
+            ReadBufferPtr ptr;
+
+            bool nextImpl() override
+            {
+                ptr->position() = position();
+
+                if (!ptr->next())
+                    return false;
+
+                working_buffer = ptr->buffer();
+
+                return true;
+            }
+    };
+
+    return std::make_unique<ReadBufferWrapper>(ptr);
+}
 
 }
diff --git a/src/IO/ReadBufferFromEncryptedFile.h b/src/IO/ReadBufferFromEncryptedFile.h
index 9409c4577d2..66768beb28e 100644
--- a/src/IO/ReadBufferFromEncryptedFile.h
+++ b/src/IO/ReadBufferFromEncryptedFile.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_SSL
 #include <IO/ReadBufferFromFileBase.h>
diff --git a/src/IO/ReadBufferFromFile.cpp b/src/IO/ReadBufferFromFile.cpp
index 2d0d135f886..d0f94441622 100644
--- a/src/IO/ReadBufferFromFile.cpp
+++ b/src/IO/ReadBufferFromFile.cpp
@@ -88,7 +88,4 @@ void ReadBufferFromFile::close()
     metric_increment.destroy();
 }
 
-
-OpenedFileCache ReadBufferFromFilePReadWithCache::cache;
-
 }
diff --git a/src/IO/ReadBufferFromFile.h b/src/IO/ReadBufferFromFile.h
index 5b4f997ce3d..1a45e4c1829 100644
--- a/src/IO/ReadBufferFromFile.h
+++ b/src/IO/ReadBufferFromFile.h
@@ -4,10 +4,6 @@
 #include <IO/OpenedFileCache.h>
 #include <Common/CurrentMetrics.h>
 
-#ifndef O_DIRECT
-#define O_DIRECT 00040000
-#endif
-
 
 namespace CurrentMetrics
 {
@@ -65,21 +61,19 @@ public:
 
 /** Similar to ReadBufferFromFilePRead but also transparently shares open file descriptors.
   */
-class ReadBufferFromFilePReadWithCache : public ReadBufferFromFileDescriptorPRead
+class ReadBufferFromFilePReadWithDescriptorsCache : public ReadBufferFromFileDescriptorPRead
 {
 private:
-    static OpenedFileCache cache;
-
     std::string file_name;
     OpenedFileCache::OpenedFilePtr file;
 
 public:
-    ReadBufferFromFilePReadWithCache(const std::string & file_name_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, int flags = -1,
+    ReadBufferFromFilePReadWithDescriptorsCache(const std::string & file_name_, size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE, int flags = -1,
         char * existing_memory = nullptr, size_t alignment = 0)
         : ReadBufferFromFileDescriptorPRead(-1, buf_size, existing_memory, alignment),
         file_name(file_name_)
     {
-        file = cache.get(file_name, flags);
+        file = OpenedFileCache::instance().get(file_name, flags);
         fd = file->getFD();
     }
 
diff --git a/src/IO/ReadBufferFromFileBase.h b/src/IO/ReadBufferFromFileBase.h
index f2a724e03a4..731fd373e24 100644
--- a/src/IO/ReadBufferFromFileBase.h
+++ b/src/IO/ReadBufferFromFileBase.h
@@ -2,13 +2,19 @@
 
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/SeekableReadBuffer.h>
-#include <common/time.h>
+#include <base/time.h>
 
 #include <functional>
 #include <string>
 
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <fcntl.h>
 
+#ifndef O_DIRECT
+#define O_DIRECT 00040000
+#endif
+
 
 namespace DB
 {
diff --git a/src/IO/ReadBufferFromFileDecorator.cpp b/src/IO/ReadBufferFromFileDecorator.cpp
index 5810eccbac7..f4a996fc278 100644
--- a/src/IO/ReadBufferFromFileDecorator.cpp
+++ b/src/IO/ReadBufferFromFileDecorator.cpp
@@ -5,7 +5,13 @@ namespace DB
 {
 
 ReadBufferFromFileDecorator::ReadBufferFromFileDecorator(std::unique_ptr<SeekableReadBuffer> impl_)
-    : impl(std::move(impl_))
+    : ReadBufferFromFileDecorator(std::move(impl_), "")
+{
+}
+
+
+ReadBufferFromFileDecorator::ReadBufferFromFileDecorator(std::unique_ptr<SeekableReadBuffer> impl_, const String & file_name_)
+    : impl(std::move(impl_)), file_name(file_name_)
 {
     swap(*impl);
 }
@@ -13,6 +19,8 @@ ReadBufferFromFileDecorator::ReadBufferFromFileDecorator(std::unique_ptr<Seekabl
 
 std::string ReadBufferFromFileDecorator::getFileName() const
 {
+    if (!file_name.empty())
+        return file_name;
     if (ReadBufferFromFileBase * buffer = dynamic_cast<ReadBufferFromFileBase *>(impl.get()))
         return buffer->getFileName();
     return std::string();
diff --git a/src/IO/ReadBufferFromFileDecorator.h b/src/IO/ReadBufferFromFileDecorator.h
index 1122e02bb20..c83ec669203 100644
--- a/src/IO/ReadBufferFromFileDecorator.h
+++ b/src/IO/ReadBufferFromFileDecorator.h
@@ -11,6 +11,7 @@ class ReadBufferFromFileDecorator : public ReadBufferFromFileBase
 {
 public:
     explicit ReadBufferFromFileDecorator(std::unique_ptr<SeekableReadBuffer> impl_);
+    ReadBufferFromFileDecorator(std::unique_ptr<SeekableReadBuffer> impl_, const String & file_name_);
 
     std::string getFileName() const override;
 
@@ -22,6 +23,7 @@ public:
 
 protected:
     std::unique_ptr<SeekableReadBuffer> impl;
+    String file_name;
 };
 
 }
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index fdb538d4a49..a710dfe33fb 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -6,14 +6,15 @@
 #include <Common/Exception.h>
 #include <Common/CurrentMetrics.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
-#include <IO/WriteBufferFromFile.h>
 #include <IO/WriteHelpers.h>
+#include <IO/Progress.h>
 #include <sys/stat.h>
-#include <Common/UnicodeBar.h>
-#include <Common/TerminalSize.h>
-#include <IO/Operators.h>
 
 
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 namespace ProfileEvents
 {
     extern const Event ReadBufferFromFileDescriptorRead;
@@ -38,6 +39,7 @@ namespace ErrorCodes
     extern const int CANNOT_SEEK_THROUGH_FILE;
     extern const int CANNOT_SELECT;
     extern const int CANNOT_FSTAT;
+    extern const int CANNOT_ADVISE;
 }
 
 
@@ -110,6 +112,20 @@ bool ReadBufferFromFileDescriptor::nextImpl()
 }
 
 
+void ReadBufferFromFileDescriptor::prefetch()
+{
+#if defined(POSIX_FADV_WILLNEED)
+    /// For direct IO, loading data into page cache is pointless.
+    if (required_alignment)
+        return;
+
+    /// Ask OS to prefetch data into page cache.
+    if (0 != posix_fadvise(fd, file_offset_of_buffer_end, internal_buffer.size(), POSIX_FADV_WILLNEED))
+        throwFromErrno("Cannot posix_fadvise", ErrorCodes::CANNOT_ADVISE);
+#endif
+}
+
+
 /// If 'offset' is small enough to stay in buffer after seek, then true seek in file does not happen.
 off_t ReadBufferFromFileDescriptor::seek(off_t offset, int whence)
 {
@@ -132,16 +148,15 @@ off_t ReadBufferFromFileDescriptor::seek(off_t offset, int whence)
     if (new_pos + (working_buffer.end() - pos) == file_offset_of_buffer_end)
         return new_pos;
 
-    /// file_offset_of_buffer_end corresponds to working_buffer.end(); it's a past-the-end pos,
-    /// so the second inequality is strict.
     if (file_offset_of_buffer_end - working_buffer.size() <= static_cast<size_t>(new_pos)
-        && new_pos < file_offset_of_buffer_end)
+        && new_pos <= file_offset_of_buffer_end)
     {
         /// Position is still inside the buffer.
+        /// Probably it is at the end of the buffer - then we will load data on the following 'next' call.
 
         pos = working_buffer.end() - file_offset_of_buffer_end + new_pos;
         assert(pos >= working_buffer.begin());
-        assert(pos < working_buffer.end());
+        assert(pos <= working_buffer.end());
 
         return new_pos;
     }
diff --git a/src/IO/ReadBufferFromFileDescriptor.h b/src/IO/ReadBufferFromFileDescriptor.h
index 84970820abf..8dbe8707bdb 100644
--- a/src/IO/ReadBufferFromFileDescriptor.h
+++ b/src/IO/ReadBufferFromFileDescriptor.h
@@ -21,6 +21,7 @@ protected:
     int fd;
 
     bool nextImpl() override;
+    void prefetch() override;
 
     /// Name or some description of file.
     std::string getFileName() const override;
diff --git a/src/IO/ReadBufferFromPocoSocket.cpp b/src/IO/ReadBufferFromPocoSocket.cpp
index 5e8e41d0c3e..527b68e623a 100644
--- a/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/src/IO/ReadBufferFromPocoSocket.cpp
@@ -1,7 +1,6 @@
 #include <Poco/Net/NetException.h>
 
 #include <IO/ReadBufferFromPocoSocket.h>
-#include <IO/TimeoutSetter.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
 #include <Common/Stopwatch.h>
@@ -55,7 +54,9 @@ bool ReadBufferFromPocoSocket::nextImpl()
     }
     catch (const Poco::TimeoutException &)
     {
-        throw NetException("Timeout exceeded while reading from socket (" + peer_address.toString() + ")", ErrorCodes::SOCKET_TIMEOUT);
+        throw NetException(fmt::format("Timeout exceeded while reading from socket ({}, {} ms)",
+            peer_address.toString(),
+            socket.impl()->getReceiveTimeout().totalMilliseconds()), ErrorCodes::SOCKET_TIMEOUT);
     }
     catch (const Poco::IOException & e)
     {
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index aa241322edf..78d296be60e 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -2,15 +2,17 @@
 
 #if USE_AWS_S3
 
-#    include <IO/ReadBufferFromIStream.h>
-#    include <IO/ReadBufferFromS3.h>
-#    include <Common/Stopwatch.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/ReadBufferFromS3.h>
+#include <Common/Stopwatch.h>
 
-#    include <aws/s3/S3Client.h>
-#    include <aws/s3/model/GetObjectRequest.h>
-#    include <common/logger_useful.h>
+#include <aws/s3/S3Client.h>
+#include <aws/s3/model/GetObjectRequest.h>
 
-#    include <utility>
+#include <base/logger_useful.h>
+#include <base/sleep.h>
+
+#include <utility>
 
 
 namespace ProfileEvents
@@ -27,68 +29,108 @@ namespace ErrorCodes
     extern const int S3_ERROR;
     extern const int CANNOT_SEEK_THROUGH_FILE;
     extern const int SEEK_POSITION_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
 }
 
 
 ReadBufferFromS3::ReadBufferFromS3(
-    std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, const String & key_, UInt64 max_single_read_retries_, size_t buffer_size_)
+    std::shared_ptr<Aws::S3::S3Client> client_ptr_, const String & bucket_, const String & key_,
+    UInt64 max_single_read_retries_, const ReadSettings & settings_, bool use_external_buffer_, size_t read_until_position_)
     : SeekableReadBuffer(nullptr, 0)
     , client_ptr(std::move(client_ptr_))
     , bucket(bucket_)
     , key(key_)
     , max_single_read_retries(max_single_read_retries_)
-    , buffer_size(buffer_size_)
+    , read_settings(settings_)
+    , use_external_buffer(use_external_buffer_)
+    , read_until_position(read_until_position_)
 {
 }
 
 bool ReadBufferFromS3::nextImpl()
 {
-    Stopwatch watch;
+    if (read_until_position)
+    {
+        if (read_until_position == offset)
+            return false;
+
+        if (read_until_position < offset)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, read_until_position - 1);
+    }
+
     bool next_result = false;
 
     if (impl)
     {
-        /// `impl` has been initialized earlier and now we're at the end of the current portion of data.
-        impl->position() = position();
-        assert(!impl->hasPendingData());
-    }
-    else
-    {
-        /// `impl` is not initialized and we're about to read the first portion of data.
-        impl = initialize();
-        next_result = impl->hasPendingData();
+        if (use_external_buffer)
+        {
+            /**
+            * use_external_buffer -- means we read into the buffer which
+            * was passed to us from somewhere else. We do not check whether
+            * previously returned buffer was read or not (no hasPendingData() check is needed),
+            * because this branch means we are prefetching data,
+            * each nextImpl() call we can fill a different buffer.
+            */
+            impl->set(internal_buffer.begin(), internal_buffer.size());
+            assert(working_buffer.begin() != nullptr);
+            assert(!internal_buffer.empty());
+        }
+        else
+        {
+            /**
+            * impl was initialized before, pass position() to it to make
+            * sure there is no pending data which was not read.
+            */
+            impl->position() = position();
+            assert(!impl->hasPendingData());
+        }
     }
 
-    auto sleep_time_with_backoff_milliseconds = std::chrono::milliseconds(100);
+    size_t sleep_time_with_backoff_milliseconds = 100;
     for (size_t attempt = 0; (attempt < max_single_read_retries) && !next_result; ++attempt)
     {
+        Stopwatch watch;
         try
         {
+            if (!impl)
+            {
+                impl = initialize();
+
+                if (use_external_buffer)
+                {
+                    impl->set(internal_buffer.begin(), internal_buffer.size());
+                    assert(working_buffer.begin() != nullptr);
+                    assert(!internal_buffer.empty());
+                }
+            }
+
             /// Try to read a next portion of data.
             next_result = impl->next();
+            watch.stop();
+            ProfileEvents::increment(ProfileEvents::S3ReadMicroseconds, watch.elapsedMicroseconds());
             break;
         }
         catch (const Exception & e)
         {
+            watch.stop();
+            ProfileEvents::increment(ProfileEvents::S3ReadMicroseconds, watch.elapsedMicroseconds());
             ProfileEvents::increment(ProfileEvents::S3ReadRequestsErrors, 1);
 
-            LOG_INFO(log, "Caught exception while reading S3 object. Bucket: {}, Key: {}, Offset: {}, Attempt: {}, Message: {}",
+            LOG_DEBUG(log, "Caught exception while reading S3 object. Bucket: {}, Key: {}, Offset: {}, Attempt: {}, Message: {}",
                     bucket, key, getPosition(), attempt, e.message());
 
+            if (attempt + 1 == max_single_read_retries)
+                throw;
+
             /// Pause before next attempt.
-            std::this_thread::sleep_for(sleep_time_with_backoff_milliseconds);
+            sleepForMilliseconds(sleep_time_with_backoff_milliseconds);
             sleep_time_with_backoff_milliseconds *= 2;
 
             /// Try to reinitialize `impl`.
             impl.reset();
-            impl = initialize();
-            next_result = impl->hasPendingData();
         }
     }
 
-    watch.stop();
-    ProfileEvents::increment(ProfileEvents::S3ReadMicroseconds, watch.elapsedMicroseconds());
-
     if (!next_result)
         return false;
 
@@ -123,19 +165,34 @@ off_t ReadBufferFromS3::getPosition()
 
 std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize()
 {
-    LOG_TRACE(log, "Read S3 object. Bucket: {}, Key: {}, Offset: {}", bucket, key, offset);
-
     Aws::S3::Model::GetObjectRequest req;
     req.SetBucket(bucket);
     req.SetKey(key);
-    req.SetRange(fmt::format("bytes={}-", offset));
+
+    /**
+     * If remote_filesystem_read_method = 'read_threadpool', then for MergeTree family tables
+     * exact byte ranges to read are always passed here.
+     */
+    if (read_until_position)
+    {
+        if (offset >= read_until_position)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, read_until_position - 1);
+
+        req.SetRange(fmt::format("bytes={}-{}", offset, read_until_position - 1));
+        LOG_DEBUG(log, "Read S3 object. Bucket: {}, Key: {}, Range: {}-{}", bucket, key, offset, read_until_position - 1);
+    }
+    else
+    {
+        req.SetRange(fmt::format("bytes={}-", offset));
+        LOG_DEBUG(log, "Read S3 object. Bucket: {}, Key: {}, Offset: {}", bucket, key, offset);
+    }
 
     Aws::S3::Model::GetObjectOutcome outcome = client_ptr->GetObject(req);
 
     if (outcome.IsSuccess())
     {
         read_result = outcome.GetResultWithOwnership();
-        return std::make_unique<ReadBufferFromIStream>(read_result.GetBody(), buffer_size);
+        return std::make_unique<ReadBufferFromIStream>(read_result.GetBody(), read_settings.remote_fs_buffer_size);
     }
     else
         throw Exception(outcome.GetError().GetMessage(), ErrorCodes::S3_ERROR);
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index e24d571b557..d0df5c59eb3 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
-#    include <memory>
+#include <memory>
 
-#    include <IO/HTTPCommon.h>
-#    include <IO/ReadBuffer.h>
-#    include <aws/s3/model/GetObjectResult.h>
-#    include "SeekableReadBuffer.h"
+#include <IO/HTTPCommon.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadSettings.h>
+#include <IO/SeekableReadBuffer.h>
+
+#include <aws/s3/model/GetObjectResult.h>
 
 namespace Aws::S3
 {
@@ -30,7 +30,6 @@ private:
     String bucket;
     String key;
     UInt64 max_single_read_retries;
-    size_t buffer_size;
     off_t offset = 0;
     Aws::S3::Model::GetObjectResult read_result;
     std::unique_ptr<ReadBuffer> impl;
@@ -38,12 +37,14 @@ private:
     Poco::Logger * log = &Poco::Logger::get("ReadBufferFromS3");
 
 public:
-    explicit ReadBufferFromS3(
+    ReadBufferFromS3(
         std::shared_ptr<Aws::S3::S3Client> client_ptr_,
         const String & bucket_,
         const String & key_,
         UInt64 max_single_read_retries_,
-        size_t buffer_size_);
+        const ReadSettings & settings_,
+        bool use_external_buffer = false,
+        size_t read_until_position_ = 0);
 
     bool nextImpl() override;
 
@@ -52,6 +53,10 @@ public:
 
 private:
     std::unique_ptr<ReadBuffer> initialize();
+
+    ReadSettings read_settings;
+    bool use_external_buffer;
+    off_t read_until_position = 0;
 };
 
 }
diff --git a/src/IO/ReadBufferFromString.h b/src/IO/ReadBufferFromString.h
index fac1b230a2c..09646e9b41f 100644
--- a/src/IO/ReadBufferFromString.h
+++ b/src/IO/ReadBufferFromString.h
@@ -2,18 +2,17 @@
 
 #include <IO/ReadBufferFromMemory.h>
 
-
 namespace DB
 {
 
-/** Allows to read from std::string-like object.
-  */
+/// Allows to read from std::string-like object.
 class ReadBufferFromString : public ReadBufferFromMemory
 {
 public:
     /// std::string or something similar
     template <typename S>
-    ReadBufferFromString(const S & s) : ReadBufferFromMemory(s.data(), s.size()) {}
-};
+    explicit ReadBufferFromString(const S & s) : ReadBufferFromMemory(s.data(), s.size()) {}
 
+    explicit ReadBufferFromString(std::string_view s) : ReadBufferFromMemory(s.data(), s.size()) {}
+};
 }
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index f6ccfbd56bb..5fe0fda88cd 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -6,9 +6,10 @@
 #include <Formats/FormatSettings.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/BufferWithOwnMemory.h>
 #include <IO/readFloatText.h>
 #include <IO/Operators.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <stdlib.h>
 
 #ifdef __SSE2__
@@ -1120,7 +1121,7 @@ void skipToUnescapedNextLineOrEOF(ReadBuffer & buf)
     }
 }
 
-void saveUpToPosition(ReadBuffer & in, DB::Memory<> & memory, char * current)
+void saveUpToPosition(ReadBuffer & in, Memory<> & memory, char * current)
 {
     assert(current >= in.position());
     assert(current <= in.buffer().end());
@@ -1140,7 +1141,7 @@ void saveUpToPosition(ReadBuffer & in, DB::Memory<> & memory, char * current)
     in.position() = current;
 }
 
-bool loadAtPosition(ReadBuffer & in, DB::Memory<> & memory, char * & current)
+bool loadAtPosition(ReadBuffer & in, Memory<> & memory, char * & current)
 {
     assert(current <= in.buffer().end());
 
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index f985070788c..fda8c213ebf 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -8,16 +8,18 @@
 
 #include <type_traits>
 
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
-#include <common/StringRef.h>
-#include <common/arithmeticOverflow.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
+#include <base/StringRef.h>
+#include <base/arithmeticOverflow.h>
+#include <base/unit.h>
 
 #include <Core/Types.h>
 #include <Core/DecimalFunctions.h>
 #include <Core/UUID.h>
 
+#include <Common/Allocator.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Arena.h>
@@ -28,21 +30,20 @@
 #include <IO/CompressionMethod.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromMemory.h>
-#include <IO/BufferWithOwnMemory.h>
 #include <IO/VarInt.h>
 
 #include <DataTypes/DataTypeDateTime.h>
 
 #include <double-conversion/double-conversion.h>
 
-
-/// 1 GiB
-#define DEFAULT_MAX_STRING_SIZE (1ULL << 30)
-
+static constexpr auto DEFAULT_MAX_STRING_SIZE = 1_GiB;
 
 namespace DB
 {
 
+template <typename Allocator>
+struct Memory;
+
 namespace ErrorCodes
 {
     extern const int CANNOT_PARSE_DATE;
@@ -163,14 +164,22 @@ void assertEOF(ReadBuffer & buf);
 
 [[noreturn]] void throwAtAssertionFailed(const char * s, ReadBuffer & buf);
 
+inline bool checkChar(char c, ReadBuffer & buf)  // -V1071
+{
+    char a;
+    if (!buf.peek(a) || a != c)
+        return false;
+    buf.ignore();
+    return true;
+}
+
 inline void assertChar(char symbol, ReadBuffer & buf)
 {
-    if (buf.eof() || *buf.position() != symbol)
+    if (!checkChar(symbol, buf))
     {
         char err[2] = {symbol, '\0'};
         throwAtAssertionFailed(err, buf);
     }
-    ++buf.position();
 }
 
 inline void assertString(const String & s, ReadBuffer & buf)
@@ -184,14 +193,6 @@ inline bool checkString(const String & s, ReadBuffer & buf)
     return checkString(s.c_str(), buf);
 }
 
-inline bool checkChar(char c, ReadBuffer & buf)  // -V1071
-{
-    if (buf.eof() || *buf.position() != c)
-        return false;
-    ++buf.position();
-    return true;
-}
-
 bool checkStringCaseInsensitive(const char * s, ReadBuffer & buf);
 inline bool checkStringCaseInsensitive(const String & s, ReadBuffer & buf)
 {
@@ -278,29 +279,39 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
         {
             case '+':
             {
-                if (has_sign || has_number)
+                /// 123+ or +123+, just stop after 123 or +123.
+                if (has_number)
+                    goto end;
+
+                /// No digits read yet, but we already read sign, like ++, -+.
+                if (has_sign)
                 {
                     if constexpr (throw_exception)
                         throw ParsingException(
-                            "Cannot parse number with multiple sign (+/-) characters or intermediate sign character",
+                            "Cannot parse number with multiple sign (+/-) characters",
                             ErrorCodes::CANNOT_PARSE_NUMBER);
                     else
                         return ReturnType(false);
                 }
+
                 has_sign = true;
                 break;
             }
             case '-':
             {
-                if (has_sign || has_number)
+                if (has_number)
+                    goto end;
+
+                if (has_sign)
                 {
                     if constexpr (throw_exception)
                         throw ParsingException(
-                            "Cannot parse number with multiple sign (+/-) characters or intermediate sign character",
+                            "Cannot parse number with multiple sign (+/-) characters",
                             ErrorCodes::CANNOT_PARSE_NUMBER);
                     else
                         return ReturnType(false);
                 }
+
                 if constexpr (is_signed_v<T>)
                     negative = true;
                 else
@@ -333,12 +344,24 @@ ReturnType readIntTextImpl(T & x, ReadBuffer & buf)
 
                     if (buf.count() - initial_pos + 1 >= std::numeric_limits<T>::max_digits10)
                     {
-                        T signed_res = res;
-                        if (common::mulOverflow<T>(signed_res, 10, signed_res)
-                            || common::addOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
-                            return ReturnType(false);
+                        if (negative)
+                        {
+                            T signed_res = -res;
+                            if (common::mulOverflow<T>(signed_res, 10, signed_res) ||
+                                common::subOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
+                                return ReturnType(false);
 
-                        res = signed_res;
+                            res = -static_cast<UnsignedT>(signed_res);
+                        }
+                        else
+                        {
+                            T signed_res = res;
+                            if (common::mulOverflow<T>(signed_res, 10, signed_res) ||
+                                common::addOverflow<T>(signed_res, (*buf.position() - '0'), signed_res))
+                                return ReturnType(false);
+
+                            res = signed_res;
+                        }
                         break;
                     }
                 }
@@ -368,7 +391,7 @@ end:
         {
             if constexpr (check_overflow == ReadIntTextCheckOverflow::CHECK_OVERFLOW)
             {
-                if (common::mulOverflow<T>(x, -1, x))
+                if (common::mulOverflow<UnsignedT, Int8, T>(res, -1, x))
                     return ReturnType(false);
             }
             else
@@ -382,7 +405,7 @@ end:
 template <ReadIntTextCheckOverflow check_overflow = ReadIntTextCheckOverflow::DO_NOT_CHECK_OVERFLOW, typename T>
 void readIntText(T & x, ReadBuffer & buf)
 {
-    if constexpr (IsDecimalNumber<T>)
+    if constexpr (is_decimal<T>)
     {
         readIntText<check_overflow>(x.value, buf);
     }
@@ -930,23 +953,22 @@ readBinaryBigEndian(T & x, ReadBuffer & buf)    /// Assuming little endian archi
 
 
 /// Generic methods to read value in text tab-separated format.
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-readText(T & x, ReadBuffer & buf) { readIntText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, bool>
-tryReadText(T & x, ReadBuffer & buf) { return tryReadIntText(x, buf); }
+inline void readText(is_integer auto & x, ReadBuffer & buf)
+{
+    if constexpr (std::is_same_v<decltype(x), bool &>)
+        readBoolText(x, buf);
+    else
+        readIntText(x, buf);
+}
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, void>
-readText(T & x, ReadBuffer & buf) { readFloatText(x, buf); }
+inline bool tryReadText(is_integer auto & x, ReadBuffer & buf)
+{
+    return tryReadIntText(x, buf);
+}
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, bool>
-tryReadText(T & x, ReadBuffer & buf) { return tryReadFloatText(x, buf); }
+inline void readText(is_floating_point auto & x, ReadBuffer & buf) { readFloatText(x, buf); }
 
-inline void readText(bool & x, ReadBuffer & buf) { readBoolText(x, buf); }
 inline void readText(String & x, ReadBuffer & buf) { readEscapedString(x, buf); }
 inline void readText(LocalDate & x, ReadBuffer & buf) { readDateText(x, buf); }
 inline void readText(LocalDateTime & x, ReadBuffer & buf) { readDateTimeText(x, buf); }
@@ -1155,12 +1177,10 @@ inline bool tryParse(T & res, const char * data, size_t size)
 }
 
 template <typename T>
-inline std::enable_if_t<!is_integer_v<T>, void>
-readTextWithSizeSuffix(T & x, ReadBuffer & buf) { readText(x, buf); }
+inline void readTextWithSizeSuffix(T & x, ReadBuffer & buf) { readText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-readTextWithSizeSuffix(T & x, ReadBuffer & buf)
+template <is_integer T>
+inline void readTextWithSizeSuffix(T & x, ReadBuffer & buf)
 {
     readIntText(x, buf);
     if (buf.eof())
@@ -1283,7 +1303,7 @@ void skipToUnescapedNextLineOrEOF(ReadBuffer & buf);
 /** This function just copies the data from buffer's internal position (in.position())
   * to current position (from arguments) into memory.
   */
-void saveUpToPosition(ReadBuffer & in, Memory<> & memory, char * current);
+void saveUpToPosition(ReadBuffer & in, Memory<Allocator<false>> & memory, char * current);
 
 /** This function is negative to eof().
   * In fact it returns whether the data was loaded to internal ReadBuffers's buffer or not.
@@ -1292,7 +1312,7 @@ void saveUpToPosition(ReadBuffer & in, Memory<> & memory, char * current);
   * of our buffer and the current cursor in the end of the buffer. When we call eof() it calls next().
   * And this function can fill the buffer with new data, so we will lose the data from previous buffer state.
   */
-bool loadAtPosition(ReadBuffer & in, Memory<> & memory, char * & current);
+bool loadAtPosition(ReadBuffer & in, Memory<Allocator<false>> & memory, char * & current);
 
 
 struct PcgDeserializer
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
new file mode 100644
index 00000000000..be328e28118
--- /dev/null
+++ b/src/IO/ReadSettings.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <Core/Defines.h>
+
+namespace DB
+{
+enum class LocalFSReadMethod
+{
+    /**
+     * Simple synchronous reads with 'read'.
+     * Can use direct IO after specified size.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    read,
+
+    /**
+     * Simple synchronous reads with 'pread'.
+     * In contrast to 'read', shares single file descriptor from multiple threads.
+     * Can use direct IO after specified size.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    pread,
+
+    /**
+     * Use mmap after specified size or simple synchronous reads with 'pread'.
+     * Can use prefetch by asking OS to perform readahead.
+     */
+    mmap,
+
+    /**
+     * Checks if data is in page cache with 'preadv2' on modern Linux kernels.
+     * If data is in page cache, read from the same thread.
+     * If not, offload IO to separate threadpool.
+     * Can do prefetch with double buffering.
+     * Can use specified priorities and limit the number of concurrent reads.
+     */
+    pread_threadpool,
+
+    /// Use asynchronous reader with fake backend that in fact synchronous.
+    /// @attention Use only for testing purposes.
+    pread_fake_async
+};
+
+enum class RemoteFSReadMethod
+{
+    read,
+    read_threadpool,
+};
+
+class MMappedFileCache;
+
+struct ReadSettings
+{
+    /// Method to use reading from local filesystem.
+    LocalFSReadMethod local_fs_method = LocalFSReadMethod::pread;
+    /// Method to use reading from remote filesystem.
+    RemoteFSReadMethod remote_fs_method = RemoteFSReadMethod::read;
+
+    size_t local_fs_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+    size_t remote_fs_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+
+    bool local_fs_prefetch = false;
+    bool remote_fs_prefetch = false;
+
+    /// For 'read', 'pread' and 'pread_threadpool' methods.
+    size_t direct_io_threshold = 0;
+
+    /// For 'mmap' method.
+    size_t mmap_threshold = 0;
+    MMappedFileCache * mmap_cache = nullptr;
+
+    /// For 'pread_threadpool' method. Lower is more priority.
+    size_t priority = 0;
+
+    size_t remote_fs_read_max_backoff_ms = 10000;
+    size_t remote_fs_read_backoff_max_tries = 4;
+
+    /// Set to true for MergeTree tables to make sure
+    /// that last position (offset in compressed file) is always passed.
+    /// (Otherwise asynchronous reading from remote fs is not efficient).
+    /// If reading is done without final position set, throw logical_error.
+    bool must_read_until_position = false;
+
+    ReadSettings adjustBufferSize(size_t file_size) const
+    {
+        ReadSettings res = *this;
+        res.local_fs_buffer_size = std::min(file_size, local_fs_buffer_size);
+        res.remote_fs_buffer_size = std::min(file_size, remote_fs_buffer_size);
+        return res;
+    }
+};
+
+}
diff --git a/src/IO/ReadWriteBufferFromHTTP.h b/src/IO/ReadWriteBufferFromHTTP.h
index 2f0d598cd6e..5254b140679 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -1,11 +1,13 @@
 #pragma once
 
 #include <functional>
-#include <common/types.h>
+#include <base/types.h>
+#include <base/sleep.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromIStream.h>
+#include <IO/ReadSettings.h>
 #include <Poco/Any.h>
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/Net/HTTPClientSession.h>
@@ -15,17 +17,12 @@
 #include <Poco/Version.h>
 #include <Common/DNSResolver.h>
 #include <Common/RemoteHostFilter.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/URIStreamFactory.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 
-#define DEFAULT_HTTP_READ_BUFFER_TIMEOUT 1800
-#define DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT 1
-
 namespace DB
 {
 /** Perform HTTP POST request and provide response to read.
@@ -104,6 +101,9 @@ namespace detail
         RemoteHostFilter remote_host_filter;
         std::function<void(size_t)> next_callback;
 
+        size_t buffer_size;
+        ReadSettings settings;
+
         std::istream * call(Poco::URI uri_, Poco::Net::HTTPResponse & response)
         {
             // With empty path poco will send "POST  HTTP/1.1" its bug.
@@ -151,6 +151,9 @@ namespace detail
             }
         }
 
+    private:
+        bool use_external_buffer;
+
     public:
         using NextCallback = std::function<void(size_t)>;
         using OutStreamCallback = std::function<void(std::ostream &)>;
@@ -162,8 +165,10 @@ namespace detail
             OutStreamCallback out_stream_callback_ = {},
             const Poco::Net::HTTPBasicCredentials & credentials_ = {},
             size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
+            const ReadSettings & settings_ = {},
             HTTPHeaderEntries http_header_entries_ = {},
-            const RemoteHostFilter & remote_host_filter_ = {})
+            const RemoteHostFilter & remote_host_filter_ = {},
+            bool use_external_buffer_ = false)
             : ReadBuffer(nullptr, 0)
             , uri {uri_}
             , method {!method_.empty() ? method_ : out_stream_callback_ ? Poco::Net::HTTPRequest::HTTP_POST : Poco::Net::HTTPRequest::HTTP_GET}
@@ -172,9 +177,17 @@ namespace detail
             , credentials {credentials_}
             , http_header_entries {http_header_entries_}
             , remote_host_filter {remote_host_filter_}
+            , buffer_size {buffer_size_}
+            , settings {settings_}
+            , use_external_buffer {use_external_buffer_}
         {
-            Poco::Net::HTTPResponse response;
+            initialize();
+        }
 
+        void initialize()
+        {
+
+            Poco::Net::HTTPResponse response;
             istr = call(uri, response);
 
             while (isRedirect(response.getStatus()))
@@ -189,7 +202,17 @@ namespace detail
 
             try
             {
-                impl = std::make_unique<ReadBufferFromIStream>(*istr, buffer_size_);
+                impl = std::make_unique<ReadBufferFromIStream>(*istr, buffer_size);
+
+                if (use_external_buffer)
+                {
+                    /**
+                    * See comment 30 lines below.
+                    */
+                    impl->set(internal_buffer.begin(), internal_buffer.size());
+                    assert(working_buffer.begin() != nullptr);
+                    assert(!internal_buffer.empty());
+                }
             }
             catch (const Poco::Exception & e)
             {
@@ -205,10 +228,36 @@ namespace detail
         {
             if (next_callback)
                 next_callback(count());
+
+            if (use_external_buffer)
+            {
+                /**
+                * use_external_buffer -- means we read into the buffer which
+                * was passed to us from somewhere else. We do not check whether
+                * previously returned buffer was read or not (no hasPendingData() check is needed),
+                * because this branch means we are prefetching data,
+                * each nextImpl() call we can fill a different buffer.
+                */
+                impl->set(internal_buffer.begin(), internal_buffer.size());
+                assert(working_buffer.begin() != nullptr);
+                assert(!internal_buffer.empty());
+            }
+            else
+            {
+                /**
+                * impl was initialized before, pass position() to it to make
+                * sure there is no pending data which was not read.
+                */
+                if (!working_buffer.empty())
+                    impl->position() = position();
+            }
+
             if (!working_buffer.empty())
                 impl->position() = position();
+
             if (!impl->next())
                 return false;
+
             internal_buffer = impl->buffer();
             working_buffer = internal_buffer;
             return true;
@@ -273,10 +322,13 @@ public:
         const UInt64 max_redirects = 0,
         const Poco::Net::HTTPBasicCredentials & credentials_ = {},
         size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
+        const ReadSettings & settings_ = {},
         const HTTPHeaderEntries & http_header_entries_ = {},
-        const RemoteHostFilter & remote_host_filter_ = {})
+        const RemoteHostFilter & remote_host_filter_ = {},
+        bool use_external_buffer_ = false)
         : Parent(std::make_shared<UpdatableSession>(uri_, timeouts, max_redirects),
-            uri_, method_, out_stream_callback_, credentials_, buffer_size_, http_header_entries_, remote_host_filter_)
+                 uri_, method_, out_stream_callback_, credentials_, buffer_size_,
+                 settings_, http_header_entries_, remote_host_filter_, use_external_buffer_)
     {
     }
 };
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index 618d9ab7661..68bdbc9cf86 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -16,7 +16,7 @@
 #include "Poco/StreamCopier.h"
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <re2/re2.h>
 
 #include <boost/algorithm/string.hpp>
@@ -89,6 +89,7 @@ void PocoHTTPClientConfiguration::updateSchemeAndRegion()
 
 PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & clientConfiguration)
     : per_request_configuration(clientConfiguration.perRequestConfiguration)
+    , error_report(clientConfiguration.error_report)
     , timeouts(ConnectionTimeouts(
           Poco::Timespan(clientConfiguration.connectTimeoutMs * 1000), /// connection timeout.
           Poco::Timespan(clientConfiguration.requestTimeoutMs * 1000), /// send timeout.
@@ -165,15 +166,14 @@ void PocoHTTPClient::makeRequestInternal(
         for (unsigned int attempt = 0; attempt <= s3_max_redirects; ++attempt)
         {
             Poco::URI target_uri(uri);
-
-            /// Reverse proxy can replace host header with resolved ip address instead of host name.
-            /// This can lead to request signature difference on S3 side.
-            auto session = makeHTTPSession(target_uri, timeouts, false);
-
+            HTTPSessionPtr session;
             auto request_configuration = per_request_configuration(request);
 
             if (!request_configuration.proxyHost.empty())
             {
+                /// Reverse proxy can replace host header with resolved ip address instead of host name.
+                /// This can lead to request signature difference on S3 side.
+                session = makeHTTPSession(target_uri, timeouts, /* resolve_host = */ false);
                 bool use_tunnel = request_configuration.proxyScheme == Aws::Http::Scheme::HTTP && target_uri.getScheme() == "https";
 
                 session->setProxy(
@@ -183,6 +183,11 @@ void PocoHTTPClient::makeRequestInternal(
                     use_tunnel
                 );
             }
+            else
+            {
+                session = makeHTTPSession(target_uri, timeouts, /* resolve_host = */ true);
+            }
+
 
             Poco::Net::HTTPRequest poco_request(Poco::Net::HTTPRequest::HTTP_1_1);
 
@@ -296,6 +301,8 @@ void PocoHTTPClient::makeRequestInternal(
             else if (status_code >= 300)
             {
                 ProfileEvents::increment(select_metric(S3MetricType::Errors));
+                if (status_code >= 500 && error_report)
+                    error_report(request_configuration);
             }
 
             response->SetResponseBody(response_body_stream, session);
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index e374863cf00..2647e254626 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
@@ -10,10 +8,10 @@
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/S3/SessionAwareIOStream.h>
-#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
-#include <aws/core/http/HttpClient.h> // Y_IGNORE
-#include <aws/core/http/HttpRequest.h> // Y_IGNORE
-#include <aws/core/http/standard/StandardHttpResponse.h> // Y_IGNORE
+#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/http/HttpClient.h>
+#include <aws/core/http/HttpRequest.h>
+#include <aws/core/http/standard/StandardHttpResponse.h>
 
 namespace Aws::Http::Standard
 {
@@ -37,6 +35,8 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
 
     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_);
 
@@ -95,6 +95,7 @@ private:
         Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const;
 
     std::function<Aws::Client::ClientConfigurationPerRequest(const Aws::Http::HttpRequest &)> per_request_configuration;
+    std::function<void(const Aws::Client::ClientConfigurationPerRequest &)> error_report;
     ConnectionTimeouts timeouts;
     const RemoteHostFilter & remote_host_filter;
     unsigned int s3_max_redirects;
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 74c328661c4..89e1542d946 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -2,9 +2,10 @@
 
 #if USE_AWS_S3
 
+#    include <IO/S3Common.h>
+
 #    include <Common/quoteString.h>
 
-#    include <IO/S3Common.h>
 #    include <IO/WriteBufferFromString.h>
 #    include <Storages/StorageS3Settings.h>
 
@@ -27,7 +28,7 @@
 #    include <Poco/URI.h>
 #    include <re2/re2.h>
 #    include <boost/algorithm/string/case_conv.hpp>
-#    include <common/logger_useful.h>
+#    include <base/logger_useful.h>
 
 namespace
 {
@@ -279,7 +280,7 @@ protected:
 
         auto credentials_view = credentials_doc.View();
         access_key = credentials_view.GetString("AccessKeyId");
-        LOG_ERROR(logger, "Successfully pulled credentials from EC2MetadataService with access key {}.", access_key);
+        LOG_TRACE(logger, "Successfully pulled credentials from EC2MetadataService with access key {}.", access_key);
 
         secret_key = credentials_view.GetString("SecretAccessKey");
         token = credentials_view.GetString("Token");
@@ -602,7 +603,7 @@ namespace S3
         /// Case when bucket name represented in domain name of S3 URL.
         /// E.g. (https://bucket-name.s3.Region.amazonaws.com/key)
         /// https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#virtual-hosted-style-access
-        static const RE2 virtual_hosted_style_pattern(R"((.+)\.(s3|cos)([.\-][a-z0-9\-.:]+))");
+        static const RE2 virtual_hosted_style_pattern(R"((.+)\.(s3|cos|obs)([.\-][a-z0-9\-.:]+))");
 
         /// Case when bucket name and key represented in path of S3 URL.
         /// E.g. (https://s3.Region.amazonaws.com/bucket-name/key)
@@ -612,12 +613,14 @@ namespace S3
         static constexpr auto S3 = "S3";
         static constexpr auto COSN = "COSN";
         static constexpr auto COS = "COS";
+        static constexpr auto OBS = "OBS";
+
 
         uri = uri_;
         storage_name = S3;
 
         if (uri.getHost().empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Host is empty in S3 URI: {}", uri.toString());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Host is empty in S3 URI.");
 
         String name;
         String endpoint_authority_from_uri;
@@ -626,12 +629,7 @@ namespace S3
         {
             is_virtual_hosted_style = true;
             endpoint = uri.getScheme() + "://" + name + endpoint_authority_from_uri;
-
-            /// S3 specification requires at least 3 and at most 63 characters in bucket name.
-            /// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html
-            if (bucket.length() < 3 || bucket.length() > 63)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "Bucket name length is out of bounds in virtual hosted style S3 URI: {} ({})", quoteString(bucket), uri.toString());
+            validateBucket(bucket, uri);
 
             if (!uri.getPath().empty())
             {
@@ -640,14 +638,18 @@ namespace S3
             }
 
             boost::to_upper(name);
-            if (name != S3 && name != COS)
+            if (name != S3 && name != COS && name != OBS)
             {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Object storage system name is unrecognized in virtual hosted style S3 URI: {} ({})", quoteString(name), uri.toString());
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Object storage system name is unrecognized in virtual hosted style S3 URI: {}", quoteString(name));
             }
             if (name == S3)
             {
                 storage_name = name;
             }
+            else if (name == OBS)
+            {
+                storage_name = OBS;
+            }
             else
             {
                 storage_name = COSN;
@@ -657,14 +659,19 @@ namespace S3
         {
             is_virtual_hosted_style = false;
             endpoint = uri.getScheme() + "://" + uri.getAuthority();
-
-            /// S3 specification requires at least 3 and at most 63 characters in bucket name.
-            /// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html
-            if (bucket.length() < 3 || bucket.length() > 63)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bucket name length is out of bounds in virtual hosted style S3 URI: {} ({})", quoteString(bucket), uri.toString());
+            validateBucket(bucket, uri);
         }
         else
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bucket or key name are invalid in S3 URI: {}", uri.toString());
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bucket or key name are invalid in S3 URI.");
+    }
+
+    void URI::validateBucket(const String & bucket, const Poco::URI & uri)
+    {
+        /// S3 specification requires at least 3 and at most 63 characters in bucket name.
+        /// https://docs.aws.amazon.com/awscloudtrail/latest/userguide/cloudtrail-s3-bucket-naming-requirements.html
+        if (bucket.length() < 3 || bucket.length() > 63)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Bucket name length is out of bounds in virtual hosted style S3 URI:     {}{}",
+                            quoteString(bucket), !uri.empty() ? " (" + uri.toString() + ")" : "");
     }
 }
 
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 886230e36c6..72774499445 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
-#include <common/types.h>
-#include <aws/core/Aws.h>  // Y_IGNORE
-#include <aws/core/client/ClientConfiguration.h> // Y_IGNORE
+#include <base/types.h>
+#include <aws/core/Aws.h>
+#include <aws/core/client/ClientConfiguration.h>
 #include <IO/S3/PocoHTTPClient.h>
 #include <Poco/URI.h>
 
@@ -74,6 +72,8 @@ struct URI
     bool is_virtual_hosted_style;
 
     explicit URI(const Poco::URI & uri_);
+
+    static void validateBucket(const String & bucket, const Poco::URI & uri);
 };
 
 }
diff --git a/src/IO/SeekAvoidingReadBuffer.cpp b/src/IO/SeekAvoidingReadBuffer.cpp
index 2ce2db977df..4d6406d8ddf 100644
--- a/src/IO/SeekAvoidingReadBuffer.cpp
+++ b/src/IO/SeekAvoidingReadBuffer.cpp
@@ -7,7 +7,9 @@ namespace DB
 SeekAvoidingReadBuffer::SeekAvoidingReadBuffer(std::unique_ptr<ReadBufferFromFileBase> impl_, UInt64 min_bytes_for_seek_)
     : ReadBufferFromFileDecorator(std::move(impl_))
     , min_bytes_for_seek(min_bytes_for_seek_)
-{ }
+{
+}
+
 
 off_t SeekAvoidingReadBuffer::seek(off_t off, int whence)
 {
diff --git a/src/IO/SeekAvoidingReadBuffer.h b/src/IO/SeekAvoidingReadBuffer.h
index 5896efc4462..6662675cdfc 100644
--- a/src/IO/SeekAvoidingReadBuffer.h
+++ b/src/IO/SeekAvoidingReadBuffer.h
@@ -17,6 +17,8 @@ public:
 
     off_t seek(off_t off, int whence) override;
 
+    void prefetch() override { impl->prefetch(); }
+
 private:
     UInt64 min_bytes_for_seek; /// Minimum positive seek offset which shall be executed using seek operation.
 };
diff --git a/src/IO/SeekableReadBuffer.h b/src/IO/SeekableReadBuffer.h
index 97620f0c03c..400fb99db16 100644
--- a/src/IO/SeekableReadBuffer.h
+++ b/src/IO/SeekableReadBuffer.h
@@ -33,4 +33,5 @@ public:
     virtual off_t getPosition() = 0;
 };
 
+using SeekableReadBufferPtr = std::shared_ptr<SeekableReadBuffer>;
 }
diff --git a/src/IO/SynchronousReader.cpp b/src/IO/SynchronousReader.cpp
new file mode 100644
index 00000000000..82f29da7d91
--- /dev/null
+++ b/src/IO/SynchronousReader.cpp
@@ -0,0 +1,89 @@
+#include <IO/SynchronousReader.h>
+#include <Common/assert_cast.h>
+#include <Common/Exception.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
+#include <base/errnoToString.h>
+#include <unordered_map>
+#include <mutex>
+#include <unistd.h>
+#include <fcntl.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event ReadBufferFromFileDescriptorRead;
+    extern const Event ReadBufferFromFileDescriptorReadFailed;
+    extern const Event ReadBufferFromFileDescriptorReadBytes;
+    extern const Event DiskReadElapsedMicroseconds;
+    extern const Event Seek;
+}
+
+namespace CurrentMetrics
+{
+    extern const Metric Read;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR;
+    extern const int CANNOT_ADVISE;
+}
+
+
+std::future<IAsynchronousReader::Result> SynchronousReader::submit(Request request)
+{
+    int fd = assert_cast<const LocalFileDescriptor &>(*request.descriptor).fd;
+
+#if defined(POSIX_FADV_WILLNEED)
+    if (0 != posix_fadvise(fd, request.offset, request.size, POSIX_FADV_WILLNEED))
+        throwFromErrno("Cannot posix_fadvise", ErrorCodes::CANNOT_ADVISE);
+#endif
+
+    return std::async(std::launch::deferred, [fd, request]
+    {
+        ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorRead);
+        Stopwatch watch(CLOCK_MONOTONIC);
+
+        size_t bytes_read = 0;
+        while (!bytes_read)
+        {
+            ssize_t res = 0;
+
+            {
+                CurrentMetrics::Increment metric_increment{CurrentMetrics::Read};
+                res = ::pread(fd, request.buf, request.size, request.offset);
+            }
+            if (!res)
+                break;
+
+            if (-1 == res && errno != EINTR)
+            {
+                ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadFailed);
+                throwFromErrno(fmt::format("Cannot read from file {}", fd), ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR);
+            }
+
+            if (res > 0)
+                bytes_read += res;
+        }
+
+        ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadBytes, bytes_read);
+
+        /// It reports real time spent including the time spent while thread was preempted doing nothing.
+        /// And it is Ok for the purpose of this watch (it is used to lower the number of threads to read from tables).
+        /// Sometimes it is better to use taskstats::blkio_delay_total, but it is quite expensive to get it
+        /// (TaskStatsInfoGetter has about 500K RPS).
+        watch.stop();
+        ProfileEvents::increment(ProfileEvents::DiskReadElapsedMicroseconds, watch.elapsedMicroseconds());
+
+        return bytes_read;
+    });
+}
+
+}
+
+
diff --git a/src/IO/SynchronousReader.h b/src/IO/SynchronousReader.h
new file mode 100644
index 00000000000..7b5113a4487
--- /dev/null
+++ b/src/IO/SynchronousReader.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <IO/AsynchronousReader.h>
+
+
+namespace DB
+{
+
+/** Implementation of IAsynchronousReader that in fact synchronous.
+  * The only addition is posix_fadvise.
+  */
+class SynchronousReader final : public IAsynchronousReader
+{
+public:
+    std::future<Result> submit(Request request) override;
+};
+
+}
+
diff --git a/src/IO/ThreadPoolReader.cpp b/src/IO/ThreadPoolReader.cpp
new file mode 100644
index 00000000000..701fa759848
--- /dev/null
+++ b/src/IO/ThreadPoolReader.cpp
@@ -0,0 +1,228 @@
+#include <IO/ThreadPoolReader.h>
+#include <Common/assert_cast.h>
+#include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/Stopwatch.h>
+#include <Common/setThreadName.h>
+#include <Common/MemorySanitizer.h>
+#include <base/errnoToString.h>
+#include <Poco/Event.h>
+#include <future>
+#include <unistd.h>
+#include <fcntl.h>
+
+#if defined(__linux__)
+
+#include <sys/syscall.h>
+#include <sys/uio.h>
+
+/// We don't want to depend on specific glibc version.
+
+#if !defined(RWF_NOWAIT)
+    #define RWF_NOWAIT 8
+#endif
+
+#if !defined(SYS_preadv2)
+    #if defined(__x86_64__)
+        #define SYS_preadv2 327
+    #elif defined(__aarch64__)
+        #define SYS_preadv2 286
+    #elif defined(__ppc64__)
+        #define SYS_preadv2 380
+    #else
+        #error "Unsupported architecture"
+    #endif
+#endif
+
+#endif
+
+
+namespace ProfileEvents
+{
+    extern const Event ThreadPoolReaderPageCacheHit;
+    extern const Event ThreadPoolReaderPageCacheHitBytes;
+    extern const Event ThreadPoolReaderPageCacheHitElapsedMicroseconds;
+    extern const Event ThreadPoolReaderPageCacheMiss;
+    extern const Event ThreadPoolReaderPageCacheMissBytes;
+    extern const Event ThreadPoolReaderPageCacheMissElapsedMicroseconds;
+
+    extern const Event ReadBufferFromFileDescriptorRead;
+    extern const Event ReadBufferFromFileDescriptorReadFailed;
+    extern const Event ReadBufferFromFileDescriptorReadBytes;
+    extern const Event DiskReadElapsedMicroseconds;
+}
+
+namespace CurrentMetrics
+{
+    extern const Metric Read;
+}
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR;
+
+}
+
+
+ThreadPoolReader::ThreadPoolReader(size_t pool_size, size_t queue_size_)
+    : pool(pool_size, pool_size, queue_size_)
+{
+}
+
+std::future<IAsynchronousReader::Result> ThreadPoolReader::submit(Request request)
+{
+    int fd = assert_cast<const LocalFileDescriptor &>(*request.descriptor).fd;
+
+#if defined(__linux__)
+    /// Check if data is already in page cache with preadv2 syscall.
+
+    /// We don't want to depend on new Linux kernel.
+    static std::atomic<bool> has_pread_nowait_support{true};
+
+    if (has_pread_nowait_support.load(std::memory_order_relaxed))
+    {
+        Stopwatch watch(CLOCK_MONOTONIC);
+
+        std::promise<Result> promise;
+        std::future<Result> future = promise.get_future();
+
+        size_t bytes_read = 0;
+        while (!bytes_read)
+        {
+            ssize_t res = 0;
+
+            {
+                CurrentMetrics::Increment metric_increment{CurrentMetrics::Read};
+
+                struct iovec io_vec{ .iov_base = request.buf, .iov_len = request.size };
+                res = syscall(
+                    SYS_preadv2, fd,
+                    &io_vec, 1,
+                    /// This is kind of weird calling convention for syscall.
+                    static_cast<int64_t>(request.offset), static_cast<int64_t>(request.offset >> 32),
+                    /// This flag forces read from page cache or returning EAGAIN.
+                    RWF_NOWAIT);
+            }
+
+            if (!res)
+            {
+                /// The file has ended.
+                promise.set_value(0);
+
+                watch.stop();
+                ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheHitElapsedMicroseconds, watch.elapsedMicroseconds());
+                ProfileEvents::increment(ProfileEvents::DiskReadElapsedMicroseconds, watch.elapsedMicroseconds());
+
+                return future;
+            }
+
+            if (-1 == res)
+            {
+                if (errno == ENOSYS || errno == EOPNOTSUPP)
+                {
+                    /// No support for the syscall or the flag in the Linux kernel.
+                    has_pread_nowait_support.store(false, std::memory_order_relaxed);
+                    break;
+                }
+                else if (errno == EAGAIN)
+                {
+                    /// Data is not available in page cache. Will hand off to thread pool.
+                    break;
+                }
+                else if (errno == EINTR)
+                {
+                    /// Interrupted by a signal.
+                    continue;
+                }
+                else
+                {
+                    ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadFailed);
+                    promise.set_exception(std::make_exception_ptr(ErrnoException(
+                        fmt::format("Cannot read from file {}, {}", fd,
+                            errnoToString(ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR, errno)),
+                        ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR, errno)));
+                    return future;
+                }
+            }
+            else
+            {
+                bytes_read += res;
+                __msan_unpoison(request.buf, res);
+            }
+        }
+
+        if (bytes_read)
+        {
+            /// It reports real time spent including the time spent while thread was preempted doing nothing.
+            /// And it is Ok for the purpose of this watch (it is used to lower the number of threads to read from tables).
+            /// Sometimes it is better to use taskstats::blkio_delay_total, but it is quite expensive to get it
+            /// (TaskStatsInfoGetter has about 500K RPS).
+            watch.stop();
+
+            /// Read successfully from page cache.
+            ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheHit);
+            ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheHitBytes, bytes_read);
+            ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadBytes, bytes_read);
+            ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheHitElapsedMicroseconds, watch.elapsedMicroseconds());
+            ProfileEvents::increment(ProfileEvents::DiskReadElapsedMicroseconds, watch.elapsedMicroseconds());
+
+            promise.set_value(bytes_read);
+            return future;
+        }
+    }
+#endif
+
+    ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheMiss);
+
+    auto task = std::make_shared<std::packaged_task<Result()>>([request, fd]
+    {
+        setThreadName("ThreadPoolRead");
+        Stopwatch watch(CLOCK_MONOTONIC);
+
+        size_t bytes_read = 0;
+        while (!bytes_read)
+        {
+            ssize_t res = 0;
+
+            {
+                CurrentMetrics::Increment metric_increment{CurrentMetrics::Read};
+                res = ::pread(fd, request.buf, request.size, request.offset);
+            }
+
+            /// File has ended.
+            if (!res)
+                break;
+
+            if (-1 == res && errno != EINTR)
+            {
+                ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadFailed);
+                throwFromErrno(fmt::format("Cannot read from file {}", fd), ErrorCodes::CANNOT_READ_FROM_FILE_DESCRIPTOR);
+            }
+
+            bytes_read += res;
+        }
+
+        watch.stop();
+
+        ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheMissBytes, bytes_read);
+        ProfileEvents::increment(ProfileEvents::ReadBufferFromFileDescriptorReadBytes, bytes_read);
+        ProfileEvents::increment(ProfileEvents::ThreadPoolReaderPageCacheMissElapsedMicroseconds, watch.elapsedMicroseconds());
+        ProfileEvents::increment(ProfileEvents::DiskReadElapsedMicroseconds, watch.elapsedMicroseconds());
+
+        return bytes_read;
+    });
+
+    auto future = task->get_future();
+
+    /// ThreadPool is using "bigger is higher priority" instead of "smaller is more priority".
+    pool.scheduleOrThrow([task]{ (*task)(); }, -request.priority);
+
+    return future;
+}
+
+}
diff --git a/src/IO/ThreadPoolReader.h b/src/IO/ThreadPoolReader.h
new file mode 100644
index 00000000000..15486a7ac1f
--- /dev/null
+++ b/src/IO/ThreadPoolReader.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <IO/AsynchronousReader.h>
+#include <Common/ThreadPool.h>
+
+
+namespace DB
+{
+
+/** Perform reads from separate thread pool of specified size.
+  *
+  * Note: doing reads from thread pool is usually bad idea for the following reasons:
+  * - for fast devices or when data is in page cache, it is less cache-friendly and less NUMA friendly
+  *   and also involves extra synchronization overhead;
+  * - for fast devices and lots of small random reads, it cannot utilize the device, because
+  *   OS will spent all the time in switching between threads and wasting CPU;
+  * - you don't know how many threads do you need, for example, when reading from page cache,
+  *   you need the number of threads similar to the number of CPU cores;
+  *   when reading from HDD array you need the number of threads as the number of disks times N;
+  *   when reading from SSD you may need at least hundreds of threads for efficient random reads,
+  *   but it is impractical;
+  * For example, this method is used in POSIX AIO that is notoriously useless (in contrast to Linux AIO).
+  *
+  * This is intended only as example for implementation of readers from remote filesystems,
+  * where this method can be feasible.
+  */
+class ThreadPoolReader final : public IAsynchronousReader
+{
+private:
+    ThreadPool pool;
+
+public:
+    ThreadPoolReader(size_t pool_size, size_t queue_size_);
+    std::future<Result> submit(Request request) override;
+
+    /// pool automatically waits for all tasks in destructor.
+};
+
+}
diff --git a/src/IO/TimeoutSetter.cpp b/src/IO/TimeoutSetter.cpp
index a82e526bf30..44e921c8ffa 100644
--- a/src/IO/TimeoutSetter.cpp
+++ b/src/IO/TimeoutSetter.cpp
@@ -1,6 +1,6 @@
 #include <IO/TimeoutSetter.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/IO/UseSSL.cpp b/src/IO/UseSSL.cpp
index 119a3471c07..9ddeb9ccdb5 100644
--- a/src/IO/UseSSL.cpp
+++ b/src/IO/UseSSL.cpp
@@ -1,8 +1,6 @@
 #include "UseSSL.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #    include <Poco/Net/SSLManager.h>
diff --git a/src/IO/VarInt.h b/src/IO/VarInt.h
index 8c57395a250..50fc158ba76 100644
--- a/src/IO/VarInt.h
+++ b/src/IO/VarInt.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iostream>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
diff --git a/src/IO/WriteBufferFromArena.h b/src/IO/WriteBufferFromArena.h
index 0e8a11fb5d6..c667196ebcd 100644
--- a/src/IO/WriteBufferFromArena.h
+++ b/src/IO/WriteBufferFromArena.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Arena.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <IO/WriteBuffer.h>
 
 
diff --git a/src/IO/WriteBufferFromEncryptedFile.h b/src/IO/WriteBufferFromEncryptedFile.h
index 8ae72b405d6..9707343ac4d 100644
--- a/src/IO/WriteBufferFromEncryptedFile.h
+++ b/src/IO/WriteBufferFromEncryptedFile.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_SSL
 #include <IO/WriteBufferFromFileBase.h>
diff --git a/src/IO/WriteBufferFromFile.cpp b/src/IO/WriteBufferFromFile.cpp
index 67cd7ba27d6..270882d0774 100644
--- a/src/IO/WriteBufferFromFile.cpp
+++ b/src/IO/WriteBufferFromFile.cpp
@@ -32,7 +32,7 @@ WriteBufferFromFile::WriteBufferFromFile(
     mode_t mode,
     char * existing_memory,
     size_t alignment)
-    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment), file_name(file_name_)
+    : WriteBufferFromFileDescriptor(-1, buf_size, existing_memory, alignment, file_name_)
 {
     ProfileEvents::increment(ProfileEvents::FileOpen);
 
@@ -65,9 +65,7 @@ WriteBufferFromFile::WriteBufferFromFile(
     size_t buf_size,
     char * existing_memory,
     size_t alignment)
-    :
-    WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment),
-    file_name(original_file_name.empty() ? "(fd = " + toString(fd_) + ")" : original_file_name)
+    : WriteBufferFromFileDescriptor(fd_, buf_size, existing_memory, alignment, original_file_name)
 {
     fd_ = -1;
 }
diff --git a/src/IO/WriteBufferFromFile.h b/src/IO/WriteBufferFromFile.h
index b7d58638113..584a0221f1a 100644
--- a/src/IO/WriteBufferFromFile.h
+++ b/src/IO/WriteBufferFromFile.h
@@ -25,7 +25,6 @@ namespace DB
 class WriteBufferFromFile : public WriteBufferFromFileDescriptor
 {
 protected:
-    std::string file_name;
     CurrentMetrics::Increment metric_increment{CurrentMetrics::OpenFileForWrite};
 
 public:
diff --git a/src/IO/WriteBufferFromFileDescriptor.cpp b/src/IO/WriteBufferFromFileDescriptor.cpp
index cd265653bb9..38aaa945362 100644
--- a/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -61,7 +61,12 @@ void WriteBufferFromFileDescriptor::nextImpl()
         if ((-1 == res || 0 == res) && errno != EINTR)
         {
             ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteFailed);
-            throwFromErrnoWithPath("Cannot write to file " + getFileName(), getFileName(),
+
+            /// Don't use getFileName() here because this method can be called from destructor
+            String error_file_name = file_name;
+            if (error_file_name.empty())
+                error_file_name = "(fd = " + toString(fd) + ")";
+            throwFromErrnoWithPath("Cannot write to file " + error_file_name, error_file_name,
                                    ErrorCodes::CANNOT_WRITE_TO_FILE_DESCRIPTOR);
         }
 
@@ -73,20 +78,20 @@ void WriteBufferFromFileDescriptor::nextImpl()
     ProfileEvents::increment(ProfileEvents::WriteBufferFromFileDescriptorWriteBytes, bytes_written);
 }
 
-
-/// Name or some description of file.
-std::string WriteBufferFromFileDescriptor::getFileName() const
-{
-    return "(fd = " + toString(fd) + ")";
-}
-
-
+/// NOTE: This class can be used as a very low-level building block, for example
+/// in trace collector. In such places allocations of memory can be dangerous,
+/// so don't allocate anything in this constructor.
 WriteBufferFromFileDescriptor::WriteBufferFromFileDescriptor(
     int fd_,
     size_t buf_size,
     char * existing_memory,
-    size_t alignment)
-    : WriteBufferFromFileBase(buf_size, existing_memory, alignment), fd(fd_) {}
+    size_t alignment,
+    std::string file_name_)
+    : WriteBufferFromFileBase(buf_size, existing_memory, alignment)
+    , fd(fd_)
+    , file_name(std::move(file_name_))
+{
+}
 
 
 WriteBufferFromFileDescriptor::~WriteBufferFromFileDescriptor()
@@ -115,7 +120,7 @@ void WriteBufferFromFileDescriptor::sync()
 }
 
 
-off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence)
+off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence) // NOLINT
 {
     off_t res = lseek(fd, offset, whence);
     if (-1 == res)
@@ -125,7 +130,7 @@ off_t WriteBufferFromFileDescriptor::seek(off_t offset, int whence)
 }
 
 
-void WriteBufferFromFileDescriptor::truncate(off_t length)
+void WriteBufferFromFileDescriptor::truncate(off_t length) // NOLINT
 {
     int res = ftruncate(fd, length);
     if (-1 == res)
@@ -133,7 +138,7 @@ void WriteBufferFromFileDescriptor::truncate(off_t length)
 }
 
 
-off_t WriteBufferFromFileDescriptor::size()
+off_t WriteBufferFromFileDescriptor::size() const
 {
     struct stat buf;
     int res = fstat(fd, &buf);
@@ -142,4 +147,13 @@ off_t WriteBufferFromFileDescriptor::size()
     return buf.st_size;
 }
 
+std::string WriteBufferFromFileDescriptor::getFileName() const
+{
+    if (file_name.empty())
+        return "(fd = " + toString(fd) + ")";
+
+    return file_name;
+}
+
+
 }
diff --git a/src/IO/WriteBufferFromFileDescriptor.h b/src/IO/WriteBufferFromFileDescriptor.h
index 18c0ac64f63..cad45067548 100644
--- a/src/IO/WriteBufferFromFileDescriptor.h
+++ b/src/IO/WriteBufferFromFileDescriptor.h
@@ -13,17 +13,17 @@ class WriteBufferFromFileDescriptor : public WriteBufferFromFileBase
 protected:
     int fd;
 
+    /// If file has name contains filename, otherwise contains string "(fd=...)"
+    std::string file_name;
+
     void nextImpl() override;
-
-    /// Name or some description of file.
-    std::string getFileName() const override;
-
 public:
     WriteBufferFromFileDescriptor(
         int fd_ = -1,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
         char * existing_memory = nullptr,
-        size_t alignment = 0);
+        size_t alignment = 0,
+        std::string file_name_ = "");
 
     /** Could be used before initialization if needed 'fd' was not passed to constructor.
       * It's not possible to change 'fd' during work.
@@ -42,10 +42,15 @@ public:
 
     void sync() override;
 
-    off_t seek(off_t offset, int whence);
-    void truncate(off_t length);
+    /// clang-tidy wants these methods to be const, but
+    /// they are not const semantically
+    off_t seek(off_t offset, int whence); // NOLINT
+    void truncate(off_t length); // NOLINT
 
-    off_t size();
+    /// Name or some description of file.
+    std::string getFileName() const override;
+
+    off_t size() const;
 };
 
 }
diff --git a/src/IO/WriteBufferFromHTTP.cpp b/src/IO/WriteBufferFromHTTP.cpp
index 70cbd7484b4..dd69e85a7d4 100644
--- a/src/IO/WriteBufferFromHTTP.cpp
+++ b/src/IO/WriteBufferFromHTTP.cpp
@@ -1,6 +1,6 @@
 #include <IO/WriteBufferFromHTTP.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/IO/WriteBufferFromPocoSocket.cpp b/src/IO/WriteBufferFromPocoSocket.cpp
index a0e4de4c831..79c8952f5a3 100644
--- a/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/src/IO/WriteBufferFromPocoSocket.cpp
@@ -57,7 +57,9 @@ void WriteBufferFromPocoSocket::nextImpl()
         }
         catch (const Poco::TimeoutException &)
         {
-            throw NetException("Timeout exceeded while writing to socket (" + peer_address.toString() + ")", ErrorCodes::SOCKET_TIMEOUT);
+            throw NetException(fmt::format("Timeout exceeded while writing to socket ({}, {} ms)",
+                peer_address.toString(),
+                socket.impl()->getSendTimeout().totalMilliseconds()), ErrorCodes::SOCKET_TIMEOUT);
         }
         catch (const Poco::IOException & e)
         {
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 1ae1b56933d..3a2ec9827de 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -11,7 +11,7 @@
 #    include <aws/s3/model/CompleteMultipartUploadRequest.h>
 #    include <aws/s3/model/PutObjectRequest.h>
 #    include <aws/s3/model/UploadPartRequest.h>
-#    include <common/logger_useful.h>
+#    include <base/logger_useful.h>
 
 #    include <utility>
 
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 48a0ba4ddfe..946ecb45948 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -1,20 +1,18 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
 #    include <memory>
 #    include <vector>
-#    include <common/logger_useful.h>
-#    include <common/types.h>
+#    include <base/logger_useful.h>
+#    include <base/types.h>
 
 #    include <IO/BufferWithOwnMemory.h>
 #    include <IO/WriteBuffer.h>
 
-#    include <aws/core/utils/memory/stl/AWSStringStream.h> // Y_IGNORE
+#    include <aws/core/utils/memory/stl/AWSStringStream.h>
 
 namespace Aws::S3
 {
diff --git a/src/IO/WriteBufferFromString.h b/src/IO/WriteBufferFromString.h
index 9bfb13dfe96..f4515254e6e 100644
--- a/src/IO/WriteBufferFromString.h
+++ b/src/IO/WriteBufferFromString.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <IO/WriteBufferFromVector.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/IO/WriteBufferValidUTF8.cpp b/src/IO/WriteBufferValidUTF8.cpp
index ecdf38eae34..62f871ee71d 100644
--- a/src/IO/WriteBufferValidUTF8.cpp
+++ b/src/IO/WriteBufferValidUTF8.cpp
@@ -1,7 +1,7 @@
 #include <Poco/UTF8Encoding.h>
 #include <IO/WriteBufferValidUTF8.h>
 #include <Common/MemoryTracker.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #ifdef __SSE2__
     #include <emmintrin.h>
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index 556adbe2d6f..9cdc77df957 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -5,15 +5,17 @@
 #include <limits>
 #include <algorithm>
 #include <iterator>
+#include <concepts>
 
 #include <pcg-random/pcg_random.hpp>
 
-#include <common/DateLUT.h>
-#include <common/LocalDate.h>
-#include <common/LocalDateTime.h>
-#include <common/find_symbols.h>
-#include <common/StringRef.h>
-#include <common/DecomposedFloat.h>
+#include <base/DateLUT.h>
+#include <base/LocalDate.h>
+#include <base/LocalDateTime.h>
+#include <base/find_symbols.h>
+#include <base/StringRef.h>
+#include <base/DecomposedFloat.h>
+#include <base/EnumReflection.h>
 
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
@@ -183,11 +185,16 @@ inline void writeString(const char * data, size_t size, WriteBuffer & buf)
     buf.write(data, size);
 }
 
-inline void writeString(const StringRef & ref, WriteBuffer & buf)
+// Otherwise StringRef and string_view overloads are ambiguous when passing string literal. Prefer std::string_view
+void writeString(std::same_as<StringRef> auto ref, WriteBuffer & buf)
 {
     writeString(ref.data, ref.size, buf);
 }
 
+inline void writeString(std::string_view ref, WriteBuffer & buf)
+{
+    writeString(ref.data(), ref.size(), buf);
+}
 
 /** Writes a C-string without creating a temporary object. If the string is a literal, then `strlen` is executed at the compilation stage.
   * Use when the string is a literal.
@@ -372,7 +379,7 @@ void writeJSONNumber(T x, WriteBuffer & ostr, const FormatSettings & settings)
 {
     bool is_finite = isFinite(x);
 
-    const bool need_quote = (is_integer_v<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
+    const bool need_quote = (is_integer<T> && (sizeof(T) >= 8) && settings.json.quote_64bit_integers)
         || (settings.json.quote_denormals && !is_finite);
 
     if (need_quote)
@@ -876,24 +883,22 @@ inline void writeBinary(const LocalDateTime & x, WriteBuffer & buf) { writePODBi
 inline void writeBinary(const UUID & x, WriteBuffer & buf) { writePODBinary(x, buf); }
 
 /// Methods for outputting the value in text form for a tab-separated format.
-template <typename T>
-inline std::enable_if_t<is_integer_v<T>, void>
-writeText(const T & x, WriteBuffer & buf) { writeIntText(x, buf); }
 
-template <typename T>
-inline std::enable_if_t<std::is_floating_point_v<T>, void>
-writeText(const T & x, WriteBuffer & buf) { writeFloatText(x, buf); }
+inline void writeText(is_integer auto x, WriteBuffer & buf)
+{
+    if constexpr (std::is_same_v<decltype(x), bool>)
+        writeBoolText(x, buf);
+    else if constexpr (std::is_same_v<decltype(x), char>)
+        writeChar(x, buf);
+    else
+        writeIntText(x, buf);
+}
 
-inline void writeText(const String & x, WriteBuffer & buf) { writeString(x.c_str(), x.size(), buf); }
-inline void writeText(const std::string_view & x, WriteBuffer & buf) { writeString(x.data(), x.size(), buf); }
+inline void writeText(is_floating_point auto x, WriteBuffer & buf) { writeFloatText(x, buf); }
 
-/// Implemented as template specialization (not function overload) to avoid preference over templates on arithmetic types above.
-template <> inline void writeText<bool>(const bool & x, WriteBuffer & buf) { writeBoolText(x, buf); }
+inline void writeText(is_enum auto x, WriteBuffer & buf) { writeText(magic_enum::enum_name(x), buf); }
 
-/// unlike the method for std::string
-/// assumes here that `x` is a null-terminated string.
-inline void writeText(const char * x, WriteBuffer & buf) { writeCString(x, buf); }
-inline void writeText(const char * x, size_t size, WriteBuffer & buf) { writeString(x, size, buf); }
+inline void writeText(std::string_view x, WriteBuffer & buf) { writeString(x.data(), x.size(), buf); }
 
 inline void writeText(const DayNum & x, WriteBuffer & buf) { writeDateText(LocalDate(x), buf); }
 inline void writeText(const LocalDate & x, WriteBuffer & buf) { writeDateText(x, buf); }
@@ -901,34 +906,67 @@ inline void writeText(const LocalDateTime & x, WriteBuffer & buf) { writeDateTim
 inline void writeText(const UUID & x, WriteBuffer & buf) { writeUUIDText(x, buf); }
 
 template <typename T>
-String decimalFractional(const T & x, UInt32 scale)
+void writeDecimalFractional(const T & x, UInt32 scale, WriteBuffer & ostr, bool trailing_zeros)
 {
+    /// If it's big integer, but the number of digits is small,
+    /// use the implementation for smaller integers for more efficient arithmetic.
+
     if constexpr (std::is_same_v<T, Int256>)
     {
         if (x <= std::numeric_limits<UInt32>::max())
-            return decimalFractional(static_cast<UInt32>(x), scale);
+        {
+            writeDecimalFractional(static_cast<UInt32>(x), scale, ostr, trailing_zeros);
+            return;
+        }
         else if (x <= std::numeric_limits<UInt64>::max())
-            return decimalFractional(static_cast<UInt64>(x), scale);
+        {
+            writeDecimalFractional(static_cast<UInt64>(x), scale, ostr, trailing_zeros);
+            return;
+        }
         else if (x <= std::numeric_limits<UInt128>::max())
-            return decimalFractional(static_cast<UInt128>(x), scale);
+        {
+            writeDecimalFractional(static_cast<UInt128>(x), scale, ostr, trailing_zeros);
+            return;
+        }
     }
     else if constexpr (std::is_same_v<T, Int128>)
     {
         if (x <= std::numeric_limits<UInt32>::max())
-            return decimalFractional(static_cast<UInt32>(x), scale);
+        {
+            writeDecimalFractional(static_cast<UInt32>(x), scale, ostr, trailing_zeros);
+            return;
+        }
         else if (x <= std::numeric_limits<UInt64>::max())
-            return decimalFractional(static_cast<UInt64>(x), scale);
+        {
+            writeDecimalFractional(static_cast<UInt64>(x), scale, ostr, trailing_zeros);
+            return;
+        }
     }
 
-    String str(scale, '0');
+    constexpr size_t max_digits = std::numeric_limits<UInt256>::digits10;
+    assert(scale <= max_digits);
+    char buf[max_digits];
+    memset(buf, '0', scale);
+
     T value = x;
-    for (Int32 pos = scale - 1; pos >= 0; --pos, value /= 10)
-        str[pos] += static_cast<char>(value % 10);
-    return str;
+    Int32 last_nonzero_pos = 0;
+    for (Int32 pos = scale - 1; pos >= 0; --pos)
+    {
+        auto remainder = value % 10;
+        value /= 10;
+
+        if (remainder != 0 && last_nonzero_pos == 0)
+            last_nonzero_pos = pos;
+
+        buf[pos] += static_cast<char>(remainder);
+    }
+
+    writeChar('.', ostr);
+    ostr.write(buf, trailing_zeros ? scale : last_nonzero_pos + 1);
 }
 
 template <typename T>
-void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr)
+void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr, bool trailing_zeros)
 {
     T part = DecimalUtils::getWholePart(x, scale);
 
@@ -941,10 +979,9 @@ void writeText(Decimal<T> x, UInt32 scale, WriteBuffer & ostr)
 
     if (scale)
     {
-        writeChar('.', ostr);
         part = DecimalUtils::getFractionalPart(x, scale);
-        String fractional = decimalFractional(part, scale);
-        ostr.write(fractional.data(), scale);
+        if (part || trailing_zeros)
+            writeDecimalFractional(part, scale, ostr, trailing_zeros);
     }
 }
 
diff --git a/src/IO/WriteIntText.h b/src/IO/WriteIntText.h
index 456aed350fc..b8d2acc7d5d 100644
--- a/src/IO/WriteIntText.h
+++ b/src/IO/WriteIntText.h
@@ -2,7 +2,7 @@
 
 #include <Core/Defines.h>
 #include <IO/WriteBuffer.h>
-#include <common/itoa.h>
+#include <base/itoa.h>
 
 
 namespace
diff --git a/src/IO/ZlibDeflatingWriteBuffer.h b/src/IO/ZlibDeflatingWriteBuffer.h
index 6f623f55f56..132f529cc54 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.h
+++ b/src/IO/ZlibDeflatingWriteBuffer.h
@@ -4,6 +4,7 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/CompressionMethod.h>
 
+
 #include <zlib.h>
 
 
diff --git a/src/IO/ZlibInflatingReadBuffer.cpp b/src/IO/ZlibInflatingReadBuffer.cpp
index bea83c74e21..472399dea3d 100644
--- a/src/IO/ZlibInflatingReadBuffer.cpp
+++ b/src/IO/ZlibInflatingReadBuffer.cpp
@@ -38,7 +38,7 @@ ZlibInflatingReadBuffer::ZlibInflatingReadBuffer(
 #pragma GCC diagnostic pop
 
     if (rc != Z_OK)
-        throw Exception(std::string("inflateInit2 failed: ") + zError(rc) + "; zlib version: " + ZLIB_VERSION, ErrorCodes::ZLIB_INFLATE_FAILED);
+        throw Exception(ErrorCodes::ZLIB_INFLATE_FAILED, "inflateInit2 failed: {}; zlib version: {}.", zError(rc), ZLIB_VERSION);
 }
 
 ZlibInflatingReadBuffer::~ZlibInflatingReadBuffer()
@@ -48,41 +48,60 @@ ZlibInflatingReadBuffer::~ZlibInflatingReadBuffer()
 
 bool ZlibInflatingReadBuffer::nextImpl()
 {
-    if (eof)
-        return false;
-
-    if (!zstr.avail_in)
+    /// Need do-while loop to prevent situation, when
+    /// eof was not reached, but working buffer became empty (when nothing was decompressed in current iteration)
+    /// (this happens with compression algorithms, same idea is implemented in ZstdInflatingReadBuffer)
+    do
     {
-        in->nextIfAtEnd();
-        zstr.next_in = reinterpret_cast<unsigned char *>(in->position());
-        zstr.avail_in = in->buffer().end() - in->position();
-    }
-    zstr.next_out = reinterpret_cast<unsigned char *>(internal_buffer.begin());
-    zstr.avail_out = internal_buffer.size();
+        /// if we already found eof, we shouldn't do anything
+        if (eof)
+            return false;
 
-    int rc = inflate(&zstr, Z_NO_FLUSH);
-
-    in->position() = in->buffer().end() - zstr.avail_in;
-    working_buffer.resize(internal_buffer.size() - zstr.avail_out);
-
-    if (rc == Z_STREAM_END)
-    {
-        if (in->eof())
+        /// if there is no available bytes in zstr, move ptr to next available data
+        if (!zstr.avail_in)
         {
-            eof = true;
-            return !working_buffer.empty();
+            in->nextIfAtEnd();
+            zstr.next_in = reinterpret_cast<unsigned char *>(in->position());
+            zstr.avail_in = in->buffer().end() - in->position();
         }
-        else
-        {
-            rc = inflateReset(&zstr);
-            if (rc != Z_OK)
-                throw Exception(std::string("inflateReset failed: ") + zError(rc), ErrorCodes::ZLIB_INFLATE_FAILED);
-            return true;
-        }
-    }
-    if (rc != Z_OK)
-        throw Exception(std::string("inflate failed: ") + zError(rc), ErrorCodes::ZLIB_INFLATE_FAILED);
+        /// init output bytes (place, where decompressed data will be)
+        zstr.next_out = reinterpret_cast<unsigned char *>(internal_buffer.begin());
+        zstr.avail_out = internal_buffer.size();
 
+        int rc = inflate(&zstr, Z_NO_FLUSH);
+
+        /// move in stream on place, where reading stopped
+        in->position() = in->buffer().end() - zstr.avail_in;
+        /// change size of working buffer (it's size equal to internal_buffer size without unused uncompressed values)
+        working_buffer.resize(internal_buffer.size() - zstr.avail_out);
+
+        /// If end was reached, it can be end of file or end of part (for example, chunk)
+        if (rc == Z_STREAM_END)
+        {
+            /// if it is end of file, remember this and return
+            /// * true if we can work with working buffer (we still have something to read, so next must return true)
+            /// * false if there is no data in working buffer
+            if (in->eof())
+            {
+                eof = true;
+                return !working_buffer.empty();
+            }
+            /// If it is not end of file, we need to reset zstr and return true, because we still have some data to read
+            else
+            {
+                rc = inflateReset(&zstr);
+                if (rc != Z_OK)
+                    throw Exception(ErrorCodes::ZLIB_INFLATE_FAILED, "inflateReset failed: {}", zError(rc));
+                return true;
+            }
+        }
+        /// If it is not end and not OK, something went wrong, throw exception
+        if (rc != Z_OK)
+            throw Exception(ErrorCodes::ZLIB_INFLATE_FAILED, "inflateReset failed: {}", zError(rc));
+    }
+    while (working_buffer.empty());
+
+    /// if code reach this section, working buffer is not empty, so we have some data to process
     return true;
 }
 
diff --git a/src/IO/ZlibInflatingReadBuffer.h b/src/IO/ZlibInflatingReadBuffer.h
index b8c141e9b9b..e868dd6999d 100644
--- a/src/IO/ZlibInflatingReadBuffer.h
+++ b/src/IO/ZlibInflatingReadBuffer.h
@@ -4,6 +4,7 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/CompressionMethod.h>
 
+
 #include <zlib.h>
 
 
diff --git a/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
new file mode 100644
index 00000000000..536fbf35113
--- /dev/null
+++ b/src/IO/ZstdDeflatingAppendableWriteBuffer.cpp
@@ -0,0 +1,164 @@
+#include <IO/ZstdDeflatingAppendableWriteBuffer.h>
+#include <Common/MemoryTracker.h>
+#include <Common/Exception.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ZSTD_ENCODER_FAILED;
+}
+
+ZstdDeflatingAppendableWriteBuffer::ZstdDeflatingAppendableWriteBuffer(
+    WriteBuffer & out_, int compression_level, bool append_to_existing_stream_,
+    size_t buf_size, char * existing_memory, size_t alignment)
+    : BufferWithOwnMemory<WriteBuffer>(buf_size, existing_memory, alignment)
+    , out(out_)
+    , append_to_existing_stream(append_to_existing_stream_)
+{
+    cctx = ZSTD_createCCtx();
+    if (cctx == nullptr)
+        throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder init failed: zstd version: {}", ZSTD_VERSION_STRING);
+    size_t ret = ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, compression_level);
+    if (ZSTD_isError(ret))
+        throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder option setting failed: error code: {}; zstd version: {}", ret, ZSTD_VERSION_STRING);
+
+    input = {nullptr, 0, 0};
+    output = {nullptr, 0, 0};
+}
+
+void ZstdDeflatingAppendableWriteBuffer::nextImpl()
+{
+    if (!offset())
+        return;
+
+    ZSTD_EndDirective mode = ZSTD_e_flush;
+
+    input.src = reinterpret_cast<unsigned char *>(working_buffer.begin());
+    input.size = offset();
+    input.pos = 0;
+
+    if (first_write && append_to_existing_stream)
+    {
+        addEmptyBlock();
+        first_write = false;
+    }
+
+    try
+    {
+        bool ended = false;
+        do
+        {
+            out.nextIfAtEnd();
+
+            output.dst = reinterpret_cast<unsigned char *>(out.buffer().begin());
+            output.size = out.buffer().size();
+            output.pos = out.offset();
+
+            size_t compression_result = ZSTD_compressStream2(cctx, &output, &input, mode);
+            if (ZSTD_isError(compression_result))
+                throw Exception(
+                    ErrorCodes::ZSTD_ENCODER_FAILED, "Zstd stream encoding failed: error code: {}; zstd version: {}", ZSTD_getErrorName(compression_result), ZSTD_VERSION_STRING);
+
+            out.position() = out.buffer().begin() + output.pos;
+
+            bool everything_was_compressed = (input.pos == input.size);
+            bool everything_was_flushed = compression_result == 0;
+
+            ended = everything_was_compressed && everything_was_flushed;
+        } while (!ended);
+    }
+    catch (...)
+    {
+        /// Do not try to write next time after exception.
+        out.position() = out.buffer().begin();
+        throw;
+    }
+}
+
+void ZstdDeflatingAppendableWriteBuffer::finish()
+{
+    if (finished || first_write)
+    {
+        /// Nothing was written or we have already finished
+        return;
+    }
+
+    try
+    {
+        finishImpl();
+        out.finalize();
+        finished = true;
+    }
+    catch (...)
+    {
+        /// Do not try to flush next time after exception.
+        out.position() = out.buffer().begin();
+        finished = true;
+        throw;
+    }
+}
+
+
+ZstdDeflatingAppendableWriteBuffer::~ZstdDeflatingAppendableWriteBuffer()
+{
+    /// FIXME move final flush into the caller
+    MemoryTracker::LockExceptionInThread lock(VariableContext::Global);
+
+    finish();
+
+    try
+    {
+        int err = ZSTD_freeCCtx(cctx);
+        /// This is just in case, since it is impossible to get an error by using this wrapper.
+        if (unlikely(err))
+            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD_freeCCtx failed: error: '{}'; zstd version: {}", ZSTD_getErrorName(err), ZSTD_VERSION_STRING);
+    }
+    catch (...)
+    {
+        /// It is OK not to terminate under an error from ZSTD_freeCCtx()
+        /// since all data already written to the stream.
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void ZstdDeflatingAppendableWriteBuffer::finishImpl()
+{
+    next();
+
+    out.nextIfAtEnd();
+
+    input.src = reinterpret_cast<unsigned char *>(working_buffer.begin());
+    input.size = offset();
+    input.pos = 0;
+
+    output.dst = reinterpret_cast<unsigned char *>(out.buffer().begin());
+    output.size = out.buffer().size();
+    output.pos = out.offset();
+
+    size_t remaining = ZSTD_compressStream2(cctx, &output, &input, ZSTD_e_end);
+    while (remaining != 0)
+    {
+        if (ZSTD_isError(remaining))
+            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "zstd stream encoder end failed: error: '{}' zstd version: {}", ZSTD_getErrorName(remaining), ZSTD_VERSION_STRING);
+
+        remaining = ZSTD_compressStream2(cctx, &output, &input, ZSTD_e_end);
+    }
+    out.position() = out.buffer().begin() + output.pos;
+}
+
+void ZstdDeflatingAppendableWriteBuffer::addEmptyBlock()
+{
+    /// HACK: https://github.com/facebook/zstd/issues/2090#issuecomment-620158967
+    static const char empty_block[3] = {0x01, 0x00, 0x00};
+
+    if (out.buffer().size() - out.offset() < sizeof(empty_block))
+        out.next();
+
+    std::memcpy(out.buffer().begin() + out.offset(), empty_block, sizeof(empty_block));
+
+    out.position() = out.buffer().begin() + out.offset() + sizeof(empty_block);
+}
+
+}
diff --git a/src/IO/ZstdDeflatingAppendableWriteBuffer.h b/src/IO/ZstdDeflatingAppendableWriteBuffer.h
new file mode 100644
index 00000000000..e958f9895f4
--- /dev/null
+++ b/src/IO/ZstdDeflatingAppendableWriteBuffer.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/CompressionMethod.h>
+#include <IO/WriteBuffer.h>
+
+#include <zstd.h>
+
+
+namespace DB
+{
+
+/// Performs stream compression using zstd library and writes compressed data to out_ WriteBuffer.
+/// Main differences from ZstdDeflatingWriteBuffer:
+/// 1) Allows to continue to write to the same output even if finalize() (or destructor) was not called, for example
+///    when server was killed with 9 signal. Natively zstd doesn't support such feature because
+///    ZSTD_decompressStream expect to see empty block at the end of each frame. There is not API function for it
+///    so we just use HACK and add empty block manually on the first write (see addEmptyBlock). Maintainers of zstd
+///    said that there is no risks of compatibility issues https://github.com/facebook/zstd/issues/2090#issuecomment-620158967.
+/// 2) Doesn't support internal ZSTD check-summing, because ZSTD checksums written at the end of frame (frame epilogue).
+///
+class ZstdDeflatingAppendableWriteBuffer : public BufferWithOwnMemory<WriteBuffer>
+{
+public:
+    ZstdDeflatingAppendableWriteBuffer(
+        WriteBuffer & out_,
+        int compression_level,
+        bool append_to_existing_stream_, /// if true then out mustn't be empty
+        size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
+        char * existing_memory = nullptr,
+        size_t alignment = 0);
+
+    /// Write terminating ZSTD_e_end: empty block + frame epilogue. BTW it
+    /// should be almost noop, because frame epilogue contains only checksums,
+    /// and they are disabled for this buffer.
+    void finalize() override { finish(); }
+
+    ~ZstdDeflatingAppendableWriteBuffer() override;
+
+    void sync() override
+    {
+        next();
+        out.sync();
+    }
+
+private:
+    /// NOTE: will fill compressed data to the out.working_buffer, but will not call out.next method until the buffer is full
+    void nextImpl() override;
+
+    /// Flush all pending data and write zstd footer to the underlying buffer.
+    /// After the first call to this function, subsequent calls will have no effect and
+    /// an attempt to write to this buffer will result in exception.
+    void finish();
+    void finishImpl();
+    /// Adding zstd empty block to out.working_buffer
+    void addEmptyBlock();
+
+    WriteBuffer & out;
+    /// We appending data to existing stream so on the first nextImpl call we
+    /// will append empty block.
+    bool append_to_existing_stream;
+    ZSTD_CCtx * cctx;
+    ZSTD_inBuffer input;
+    ZSTD_outBuffer output;
+    /// Flipped in finish call
+    bool finished = false;
+    /// Flipped on the first nextImpl call
+    bool first_write = true;
+};
+
+}
diff --git a/src/IO/ZstdDeflatingWriteBuffer.cpp b/src/IO/ZstdDeflatingWriteBuffer.cpp
index 08b289a2e04..f66d48151c8 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.cpp
+++ b/src/IO/ZstdDeflatingWriteBuffer.cpp
@@ -40,7 +40,7 @@ ZstdDeflatingWriteBuffer::~ZstdDeflatingWriteBuffer()
         int err = ZSTD_freeCCtx(cctx);
         /// This is just in case, since it is impossible to get an error by using this wrapper.
         if (unlikely(err))
-            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD_freeCCtx failed: error code: {}; zstd version: {}", err, ZSTD_VERSION_STRING);
+            throw Exception(ErrorCodes::ZSTD_ENCODER_FAILED, "ZSTD_freeCCtx failed: error: '{}'; zstd version: {}", ZSTD_getErrorName(err), ZSTD_VERSION_STRING);
     }
     catch (...)
     {
@@ -73,9 +73,17 @@ void ZstdDeflatingWriteBuffer::nextImpl()
             output.pos = out->offset();
 
 
-            ZSTD_compressStream2(cctx, &output, &input, mode);
+            size_t compression_result = ZSTD_compressStream2(cctx, &output, &input, mode);
+            if (ZSTD_isError(compression_result))
+                throw Exception(
+                    ErrorCodes::ZSTD_ENCODER_FAILED, "Zstd stream encoding failed: error: '{}'; zstd version: {}", ZSTD_getErrorName(compression_result), ZSTD_VERSION_STRING);
+
             out->position() = out->buffer().begin() + output.pos;
-            ended = (input.pos == input.size);
+
+            bool everything_was_compressed = (input.pos == input.size);
+            bool everything_was_flushed = compression_result == 0;
+
+            ended = everything_was_compressed && everything_was_flushed;
         } while (!ended);
     }
     catch (...)
diff --git a/src/IO/ZstdDeflatingWriteBuffer.h b/src/IO/ZstdDeflatingWriteBuffer.h
index b4ecc44d6f4..941223bac45 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.h
+++ b/src/IO/ZstdDeflatingWriteBuffer.h
@@ -24,6 +24,11 @@ public:
 
     ~ZstdDeflatingWriteBuffer() override;
 
+    void sync() override
+    {
+        out->sync();
+    }
+
 private:
     void nextImpl() override;
 
diff --git a/src/IO/ZstdInflatingReadBuffer.cpp b/src/IO/ZstdInflatingReadBuffer.cpp
index 6c03ea420a9..ce89f09f955 100644
--- a/src/IO/ZstdInflatingReadBuffer.cpp
+++ b/src/IO/ZstdInflatingReadBuffer.cpp
@@ -28,41 +28,49 @@ ZstdInflatingReadBuffer::~ZstdInflatingReadBuffer()
 
 bool ZstdInflatingReadBuffer::nextImpl()
 {
-    if (eof)
-        return false;
-
-    if (input.pos >= input.size)
+    do
     {
-        in->nextIfAtEnd();
-        input.src = reinterpret_cast<unsigned char *>(in->position());
-        input.pos = 0;
-        input.size = in->buffer().end() - in->position();
-    }
+        // If it is known that end of file was reached, return false
+        if (eof)
+            return false;
 
-    output.dst = reinterpret_cast<unsigned char *>(internal_buffer.begin());
-    output.size = internal_buffer.size();
-    output.pos = 0;
+        /// If end was reached, get next part
+        if (input.pos >= input.size)
+        {
+            in->nextIfAtEnd();
+            input.src = reinterpret_cast<unsigned char *>(in->position());
+            input.pos = 0;
+            input.size = in->buffer().end() - in->position();
+        }
 
-    size_t ret = ZSTD_decompressStream(dctx, &output, &input);
-    if (ZSTD_isError(ret))
-        throw Exception(
-            ErrorCodes::ZSTD_DECODER_FAILED, "Zstd stream decoding failed: error code: {}; zstd version: {}", ret, ZSTD_VERSION_STRING);
+        /// fill output
+        output.dst = reinterpret_cast<unsigned char *>(internal_buffer.begin());
+        output.size = internal_buffer.size();
+        output.pos = 0;
 
-    in->position() = in->buffer().begin() + input.pos;
-    working_buffer.resize(output.pos);
+        /// Decompress data and check errors.
+        size_t ret = ZSTD_decompressStream(dctx, &output, &input);
+        if (ZSTD_isError(ret))
+            throw Exception(
+                ErrorCodes::ZSTD_DECODER_FAILED, "Zstd stream encoding failed: error '{}'; zstd version: {}", ZSTD_getErrorName(ret), ZSTD_VERSION_STRING);
 
-    if (in->eof())
-    {
-        eof = true;
-        return !working_buffer.empty();
-    }
-    else if (output.pos == 0)
-    {
+        /// Check that something has changed after decompress (input or output position)
+        assert(in->eof() || output.pos > 0 || in->position() < in->buffer().begin() + input.pos);
+
+        /// move position to the end of read data
+        in->position() = in->buffer().begin() + input.pos;
+        working_buffer.resize(output.pos);
+
+        /// If end of file is reached, fill eof variable and return true if there is some data in buffer, otherwise return false
+        if (in->eof())
+        {
+            eof = true;
+            return !working_buffer.empty();
+        }
         /// It is possible, that input buffer is not at eof yet, but nothing was decompressed in current iteration.
         /// But there are cases, when such behaviour is not allowed - i.e. if input buffer is not eof, then
         /// it has to be guaranteed that working_buffer is not empty. So if it is empty, continue.
-        return nextImpl();
-    }
+    } while (output.pos == 0);
 
     return true;
 }
diff --git a/src/IO/createReadBufferFromFileBase.cpp b/src/IO/createReadBufferFromFileBase.cpp
index 9675d89c0dd..05de97c5c92 100644
--- a/src/IO/createReadBufferFromFileBase.cpp
+++ b/src/IO/createReadBufferFromFileBase.cpp
@@ -1,6 +1,9 @@
 #include <IO/createReadBufferFromFileBase.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/MMapReadBufferFromFileWithCache.h>
+#include <IO/AsynchronousReadBufferFromFile.h>
+#include <IO/ThreadPoolReader.h>
+#include <IO/SynchronousReader.h>
 #include <Common/ProfileEvents.h>
 
 
@@ -16,16 +19,31 @@ namespace ProfileEvents
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
 std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     const std::string & filename,
-    size_t estimated_size, size_t direct_io_threshold, size_t mmap_threshold, MMappedFileCache * mmap_cache,
-    size_t buffer_size, int flags, char * existing_memory, size_t alignment)
+    const ReadSettings & settings,
+    std::optional<size_t> size,
+    int flags,
+    char * existing_memory,
+    size_t alignment)
 {
-    if (!existing_memory && mmap_threshold && mmap_cache && estimated_size >= mmap_threshold)
+    size_t estimated_size = size.has_value() ? *size : 0;
+
+    if (!existing_memory
+        && settings.local_fs_method == LocalFSReadMethod::mmap
+        && settings.mmap_threshold
+        && settings.mmap_cache
+        && estimated_size >= settings.mmap_threshold)
     {
         try
         {
-            auto res = std::make_unique<MMapReadBufferFromFileWithCache>(*mmap_cache, filename, 0);
+            auto res = std::make_unique<MMapReadBufferFromFileWithCache>(*settings.mmap_cache, filename, 0);
             ProfileEvents::increment(ProfileEvents::CreatedReadBufferMMap);
             return res;
         }
@@ -36,8 +54,41 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
         }
     }
 
+    auto create = [&](size_t buffer_size, int actual_flags)
+    {
+        std::unique_ptr<ReadBufferFromFileBase> res;
+
+        if (settings.local_fs_method == LocalFSReadMethod::read)
+        {
+            res = std::make_unique<ReadBufferFromFile>(filename, buffer_size, actual_flags, existing_memory, alignment);
+        }
+        else if (settings.local_fs_method == LocalFSReadMethod::pread || settings.local_fs_method == LocalFSReadMethod::mmap)
+        {
+            res = std::make_unique<ReadBufferFromFilePReadWithDescriptorsCache>(filename, buffer_size, actual_flags, existing_memory, alignment);
+        }
+        else if (settings.local_fs_method == LocalFSReadMethod::pread_fake_async)
+        {
+            static AsynchronousReaderPtr reader = std::make_shared<SynchronousReader>();
+            res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
+                reader, settings.priority, filename, buffer_size, actual_flags, existing_memory, alignment);
+        }
+        else if (settings.local_fs_method == LocalFSReadMethod::pread_threadpool)
+        {
+            static AsynchronousReaderPtr reader = std::make_shared<ThreadPoolReader>(16, 1000000);
+            res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
+                reader, settings.priority, filename, buffer_size, actual_flags, existing_memory, alignment);
+        }
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown read method");
+
+        return res;
+    };
+
+    if (flags == -1)
+        flags = O_RDONLY | O_CLOEXEC;
+
 #if defined(OS_LINUX) || defined(__FreeBSD__)
-    if (direct_io_threshold && estimated_size >= direct_io_threshold)
+    if (settings.direct_io_threshold && estimated_size >= settings.direct_io_threshold)
     {
         /** O_DIRECT
           * The O_DIRECT flag may impose alignment restrictions on the length and address of user-space buffers and the file offset of I/Os.
@@ -61,6 +112,8 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
         else if (alignment % min_alignment)
             alignment = align_up(alignment);
 
+        size_t buffer_size = settings.local_fs_buffer_size;
+
         if (buffer_size % min_alignment)
         {
             existing_memory = nullptr;  /// Cannot reuse existing memory is it has unaligned size.
@@ -75,8 +128,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
         /// Attempt to open a file with O_DIRECT
         try
         {
-            auto res = std::make_unique<ReadBufferFromFilePReadWithCache>(
-                filename, buffer_size, (flags == -1 ? O_RDONLY | O_CLOEXEC : flags) | O_DIRECT, existing_memory, alignment);
+            std::unique_ptr<ReadBufferFromFileBase> res = create(buffer_size, flags | O_DIRECT);
             ProfileEvents::increment(ProfileEvents::CreatedReadBufferDirectIO);
             return res;
         }
@@ -86,13 +138,10 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
             ProfileEvents::increment(ProfileEvents::CreatedReadBufferDirectIOFailed);
         }
     }
-#else
-    (void)direct_io_threshold;
-    (void)estimated_size;
 #endif
 
     ProfileEvents::increment(ProfileEvents::CreatedReadBufferOrdinary);
-    return std::make_unique<ReadBufferFromFilePReadWithCache>(filename, buffer_size, flags, existing_memory, alignment);
+    return create(settings.local_fs_buffer_size, flags);
 }
 
 }
diff --git a/src/IO/createReadBufferFromFileBase.h b/src/IO/createReadBufferFromFileBase.h
index dc2912ea752..86da469b55d 100644
--- a/src/IO/createReadBufferFromFileBase.h
+++ b/src/IO/createReadBufferFromFileBase.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadSettings.h>
 #include <string>
 #include <memory>
 
@@ -8,23 +9,14 @@
 namespace DB
 {
 
-class MMappedFileCache;
-
-
 /** Create an object to read data from a file.
-  * estimated_size - the number of bytes to read
-  * direct_io_threshold - the minimum number of bytes for asynchronous reads
   *
-  * If direct_io_threshold = 0 or estimated_size < direct_io_threshold, read operations are executed synchronously.
-  * Otherwise, the read operations are performed asynchronously.
+  * @param size - the number of bytes to read
   */
 std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     const std::string & filename,
-    size_t estimated_size,
-    size_t direct_io_threshold,
-    size_t mmap_threshold,
-    MMappedFileCache * mmap_cache,
-    size_t buffer_size = DBMS_DEFAULT_BUFFER_SIZE,
+    const ReadSettings & settings,
+    std::optional<size_t> size = {},
     int flags_ = -1,
     char * existing_memory = nullptr,
     size_t alignment = 0);
diff --git a/src/IO/examples/o_direct_and_dirty_pages.cpp b/src/IO/examples/o_direct_and_dirty_pages.cpp
index c60141d286f..228b7ffe146 100644
--- a/src/IO/examples/o_direct_and_dirty_pages.cpp
+++ b/src/IO/examples/o_direct_and_dirty_pages.cpp
@@ -2,8 +2,8 @@
 
 #include <iostream>
 
-#include <common/types.h>
-#include <common/getPageSize.h>
+#include <base/types.h>
+#include <base/getPageSize.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
diff --git a/src/IO/examples/parse_int_perf.cpp b/src/IO/examples/parse_int_perf.cpp
index 5a8f8b01f50..f2a04dc1541 100644
--- a/src/IO/examples/parse_int_perf.cpp
+++ b/src/IO/examples/parse_int_perf.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
diff --git a/src/IO/examples/read_buffer.cpp b/src/IO/examples/read_buffer.cpp
index 647382e667b..ea3da690ca5 100644
--- a/src/IO/examples/read_buffer.cpp
+++ b/src/IO/examples/read_buffer.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 
diff --git a/src/IO/examples/read_buffer_perf.cpp b/src/IO/examples/read_buffer_perf.cpp
index a8198bce71f..fd9b3b6f7cb 100644
--- a/src/IO/examples/read_buffer_perf.cpp
+++ b/src/IO/examples/read_buffer_perf.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromFile.h>
 
diff --git a/src/IO/examples/read_float_perf.cpp b/src/IO/examples/read_float_perf.cpp
index 40742d17b1c..03e3810bdd0 100644
--- a/src/IO/examples/read_float_perf.cpp
+++ b/src/IO/examples/read_float_perf.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <IO/readFloatText.h>
diff --git a/src/IO/examples/read_write_int.cpp b/src/IO/examples/read_write_int.cpp
index c09db10cbe2..49374878790 100644
--- a/src/IO/examples/read_write_int.cpp
+++ b/src/IO/examples/read_write_int.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/IO/examples/write_buffer.cpp b/src/IO/examples/write_buffer.cpp
index 09b46f810bf..5587b8aa1a2 100644
--- a/src/IO/examples/write_buffer.cpp
+++ b/src/IO/examples/write_buffer.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromOStream.h>
 
diff --git a/src/IO/examples/write_buffer_perf.cpp b/src/IO/examples/write_buffer_perf.cpp
index 096b58cb7c4..0b3d0a61241 100644
--- a/src/IO/examples/write_buffer_perf.cpp
+++ b/src/IO/examples/write_buffer_perf.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromOStream.h>
 
diff --git a/src/IO/examples/zlib_ng_bug.cpp b/src/IO/examples/zlib_ng_bug.cpp
index e9b3c448b88..9fe3c961913 100644
--- a/src/IO/examples/zlib_ng_bug.cpp
+++ b/src/IO/examples/zlib_ng_bug.cpp
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <vector>
 #include <stdexcept>
+
 #include <zlib.h>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index a7a9eaaa4dd..274a4ecc2f2 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -1,4 +1,4 @@
-#include <common/DateLUTImpl.h>
+#include <base/DateLUTImpl.h>
 #include <Common/StringUtils/StringUtils.h>
 
 #include <IO/ReadBuffer.h>
diff --git a/src/IO/readDecimalText.h b/src/IO/readDecimalText.h
index 81dcaa4d708..2e06acb2f3e 100644
--- a/src/IO/readDecimalText.h
+++ b/src/IO/readDecimalText.h
@@ -3,7 +3,7 @@
 #include <limits>
 #include <IO/ReadHelpers.h>
 #include <Common/intExp.h>
-#include <common/wide_integer_to_string.h>
+#include <base/wide_integer_to_string.h>
 
 
 namespace DB
diff --git a/src/IO/readFloatText.h b/src/IO/readFloatText.h
index 8fed7feeef3..eb1ff67ac99 100644
--- a/src/IO/readFloatText.h
+++ b/src/IO/readFloatText.h
@@ -2,7 +2,7 @@
 #include <type_traits>
 #include <IO/ReadHelpers.h>
 #include <Core/Defines.h>
-#include <common/shift10.h>
+#include <base/shift10.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <double-conversion/double-conversion.h>
 
diff --git a/src/IO/tests/gtest_DateTimeToString.cpp b/src/IO/tests/gtest_DateTimeToString.cpp
index 058e7c12fdd..c30c8943944 100644
--- a/src/IO/tests/gtest_DateTimeToString.cpp
+++ b/src/IO/tests/gtest_DateTimeToString.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 
diff --git a/src/IO/tests/gtest_bit_io.cpp b/src/IO/tests/gtest_bit_io.cpp
index 2302a6c6135..98db7226b5d 100644
--- a/src/IO/tests/gtest_bit_io.cpp
+++ b/src/IO/tests/gtest_bit_io.cpp
@@ -1,7 +1,11 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <string.h>
 #include <IO/BitHelpers.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadBufferFromMemory.h>
 #include <Common/BitHelpers.h>
@@ -158,7 +162,6 @@ TEST_P(BitIO, WriteAndRead)
 
         BitReader reader(data.data(), data.size());
 
-        int bitpos = 0;
         int item = 0;
         for (const auto & bv : bits_and_vals)
         {
@@ -172,7 +175,6 @@ TEST_P(BitIO, WriteAndRead)
             ASSERT_TRUE(BinaryEqual(getBits(bv.first, bv.second), reader.readBits(bv.first)));
 
             ++item;
-            bitpos += bv.first;
         }
     }
 }
diff --git a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
index 656e40b2ad7..36b4ec10de0 100644
--- a/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
+++ b/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -33,8 +33,7 @@ static void testCascadeBufferRedability(
     EXPECT_EQ(cascade.count(), data.size());
 
     std::vector<WriteBufferPtr> write_buffers;
-    std::vector<ReadBufferPtr> read_buffers;
-    std::vector<ReadBuffer *> read_buffers_raw;
+    ConcatReadBuffer concat;
     cascade.getResultBuffers(write_buffers);
 
     for (WriteBufferPtr & wbuf : write_buffers)
@@ -47,11 +46,9 @@ static void testCascadeBufferRedability(
         auto rbuf = wbuf_readable.tryGetReadBuffer();
         ASSERT_FALSE(!rbuf);
 
-        read_buffers.emplace_back(rbuf);
-        read_buffers_raw.emplace_back(rbuf.get());
+        concat.appendBuffer(wrapReadBufferPointer(rbuf));
     }
 
-    ConcatReadBuffer concat(read_buffers_raw);
     std::string decoded_data;
     {
         WriteBufferFromString decoded_data_writer(decoded_data);
diff --git a/src/IO/tests/gtest_file_encryption.cpp b/src/IO/tests/gtest_file_encryption.cpp
index 187073c7262..3a114f94ee0 100644
--- a/src/IO/tests/gtest_file_encryption.cpp
+++ b/src/IO/tests/gtest_file_encryption.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_SSL
 #include <gtest/gtest.h>
diff --git a/src/IO/tests/gtest_manip.cpp b/src/IO/tests/gtest_manip.cpp
index c3989ca0d7a..afcffc7dfb9 100644
--- a/src/IO/tests/gtest_manip.cpp
+++ b/src/IO/tests/gtest_manip.cpp
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <type_traits>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <IO/Operators.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
diff --git a/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp b/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
index 536e5a89ca9..6c4d7436e52 100644
--- a/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
+++ b/src/IO/tests/gtest_mysql_binlog_event_read_buffer.cpp
@@ -33,19 +33,16 @@ TEST(MySQLBinlogEventReadBuffer, NiceBufferSize)
 TEST(MySQLBinlogEventReadBuffer, BadBufferSizes)
 {
     char res[4];
-    std::vector<ReadBufferPtr> buffers;
-    std::vector<ReadBuffer *> nested_buffers;
+    ConcatReadBuffer concat_buffer;
     std::vector<std::shared_ptr<std::vector<char>>> memory_buffers_data;
     std::vector<size_t> bad_buffers_size = {2, 1, 2, 3};
 
     for (const auto & bad_buffer_size : bad_buffers_size)
     {
         memory_buffers_data.emplace_back(std::make_shared<std::vector<char>>(bad_buffer_size, 0x01));
-        buffers.emplace_back(std::make_shared<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
-        nested_buffers.emplace_back(buffers.back().get());
+        concat_buffer.appendBuffer(std::make_unique<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
     }
 
-    ConcatReadBuffer concat_buffer(nested_buffers);
     MySQLBinlogEventReadBuffer binlog_in(concat_buffer, 4);
     binlog_in.readStrict(res, 4);
 
@@ -58,19 +55,17 @@ TEST(MySQLBinlogEventReadBuffer, BadBufferSizes)
 TEST(MySQLBinlogEventReadBuffer, NiceAndBadBufferSizes)
 {
     char res[12];
-    std::vector<ReadBufferPtr> buffers;
-    std::vector<ReadBuffer *> nested_buffers;
+    ConcatReadBuffer::Buffers nested_buffers;
     std::vector<std::shared_ptr<std::vector<char>>> memory_buffers_data;
     std::vector<size_t> buffers_size = {6, 1, 3, 6};
 
     for (const auto & bad_buffer_size : buffers_size)
     {
         memory_buffers_data.emplace_back(std::make_shared<std::vector<char>>(bad_buffer_size, 0x01));
-        buffers.emplace_back(std::make_shared<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
-        nested_buffers.emplace_back(buffers.back().get());
+        nested_buffers.emplace_back(std::make_unique<ReadBufferFromMemory>(memory_buffers_data.back()->data(), bad_buffer_size));
     }
 
-    ConcatReadBuffer concat_buffer(nested_buffers);
+    ConcatReadBuffer concat_buffer(std::move(nested_buffers));
     MySQLBinlogEventReadBuffer binlog_in(concat_buffer, 4);
     binlog_in.readStrict(res, 12);
 
diff --git a/src/IO/tests/gtest_peekable_read_buffer.cpp b/src/IO/tests/gtest_peekable_read_buffer.cpp
index 2e5ca47c0aa..37c8a66668f 100644
--- a/src/IO/tests/gtest_peekable_read_buffer.cpp
+++ b/src/IO/tests/gtest_peekable_read_buffer.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ConcatReadBuffer.h>
@@ -28,12 +28,12 @@ try
     std::string s2 = "qwertyuiop";
     std::string s3 = "asdfghjkl;";
     std::string s4 = "zxcvbnm,./";
-    DB::ReadBufferFromString b1(s1);
-    DB::ReadBufferFromString b2(s2);
-    DB::ReadBufferFromString b3(s3);
-    DB::ReadBufferFromString b4(s4);
 
-    DB::ConcatReadBuffer concat({&b1, &b2, &b3, &b4});
+    DB::ConcatReadBuffer concat;
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s1));
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s2));
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s3));
+    concat.appendBuffer(std::make_unique<DB::ReadBufferFromString>(s4));
     DB::PeekableReadBuffer peekable(concat, 0);
 
     ASSERT_TRUE(!peekable.eof());
diff --git a/src/IO/ya.make b/src/IO/ya.make
deleted file mode 100644
index 9e35a062a96..00000000000
--- a/src/IO/ya.make
+++ /dev/null
@@ -1,84 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/zstd/include
-    contrib/restricted/fast_float/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/brotli/dec
-    contrib/libs/brotli/enc
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/zstd
-    contrib/restricted/fast_float
-)
-
-
-SRCS(
-    AIO.cpp
-    AIOContextPool.cpp
-    BrotliReadBuffer.cpp
-    BrotliWriteBuffer.cpp
-    CascadeWriteBuffer.cpp
-    CompressionMethod.cpp
-    DoubleConverter.cpp
-    FileEncryptionCommon.cpp
-    HTTPChunkedReadBuffer.cpp
-    HTTPCommon.cpp
-    HashingWriteBuffer.cpp
-    LZMADeflatingWriteBuffer.cpp
-    LZMAInflatingReadBuffer.cpp
-    LimitReadBuffer.cpp
-    MMapReadBufferFromFile.cpp
-    MMapReadBufferFromFileDescriptor.cpp
-    MMapReadBufferFromFileWithCache.cpp
-    MMappedFile.cpp
-    MMappedFileDescriptor.cpp
-    MemoryReadWriteBuffer.cpp
-    MySQLBinlogEventReadBuffer.cpp
-    MySQLPacketPayloadReadBuffer.cpp
-    MySQLPacketPayloadWriteBuffer.cpp
-    NullWriteBuffer.cpp
-    OpenedFile.cpp
-    PeekableReadBuffer.cpp
-    Progress.cpp
-    ReadBufferFromEncryptedFile.cpp
-    ReadBufferFromFile.cpp
-    ReadBufferFromFileBase.cpp
-    ReadBufferFromFileDecorator.cpp
-    ReadBufferFromFileDescriptor.cpp
-    ReadBufferFromIStream.cpp
-    ReadBufferFromMemory.cpp
-    ReadBufferFromPocoSocket.cpp
-    ReadHelpers.cpp
-    SeekAvoidingReadBuffer.cpp
-    TimeoutSetter.cpp
-    UseSSL.cpp
-    WriteBufferFromEncryptedFile.cpp
-    WriteBufferFromFile.cpp
-    WriteBufferFromFileBase.cpp
-    WriteBufferFromFileDecorator.cpp
-    WriteBufferFromFileDescriptor.cpp
-    WriteBufferFromFileDescriptorDiscardOnFailure.cpp
-    WriteBufferFromHTTP.cpp
-    WriteBufferFromOStream.cpp
-    WriteBufferFromPocoSocket.cpp
-    WriteBufferFromTemporaryFile.cpp
-    WriteBufferValidUTF8.cpp
-    WriteHelpers.cpp
-    ZlibDeflatingWriteBuffer.cpp
-    ZlibInflatingReadBuffer.cpp
-    ZstdDeflatingWriteBuffer.cpp
-    ZstdInflatingReadBuffer.cpp
-    copyData.cpp
-    createReadBufferFromFileBase.cpp
-    parseDateTimeBestEffort.cpp
-    readFloatText.cpp
-
-)
-
-END()
diff --git a/src/IO/ya.make.in b/src/IO/ya.make.in
deleted file mode 100644
index 0b579b0df37..00000000000
--- a/src/IO/ya.make.in
+++ /dev/null
@@ -1,24 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/zstd/include
-    contrib/restricted/fast_float/include
-)
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/brotli/dec
-    contrib/libs/brotli/enc
-    contrib/libs/poco/NetSSL_OpenSSL
-    contrib/libs/zstd
-    contrib/restricted/fast_float
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -P 'S3|HDFS' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Interpreters/ActionLocksManager.h b/src/Interpreters/ActionLocksManager.h
index f030afec891..be112e71950 100644
--- a/src/Interpreters/ActionLocksManager.h
+++ b/src/Interpreters/ActionLocksManager.h
@@ -4,7 +4,7 @@
 #include <Interpreters/StorageID.h>
 #include <Storages/IStorage_fwd.h>
 #include <Common/ActionLock.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <mutex>
 #include <unordered_map>
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 63b0345b372..d0b360dda82 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -7,6 +7,7 @@
 #include <Functions/FunctionsConversion.h>
 #include <Functions/materialize.h>
 #include <Functions/FunctionsLogical.h>
+#include <Functions/CastOverloadResolver.h>
 #include <Interpreters/Context.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
@@ -29,34 +30,15 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-const char * ActionsDAG::typeToString(ActionsDAG::ActionType type)
-{
-    switch (type)
-    {
-        case ActionType::INPUT:
-            return "Input";
-        case ActionType::COLUMN:
-            return "Column";
-        case ActionType::ALIAS:
-            return "Alias";
-        case ActionType::ARRAY_JOIN:
-            return "ArrayJoin";
-        case ActionType::FUNCTION:
-            return "Function";
-    }
-
-    __builtin_unreachable();
-}
-
 void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
 {
-    map.add("Node Type", ActionsDAG::typeToString(type));
+    map.add("Node Type", magic_enum::enum_name(type));
 
     if (result_type)
         map.add("Result Type", result_type->getName());
 
     if (!result_name.empty())
-        map.add("Result Type", ActionsDAG::typeToString(type));
+        map.add("Result Type", magic_enum::enum_name(type));
 
     if (column)
         map.add("Column", column->getName());
@@ -343,7 +325,7 @@ std::string ActionsDAG::dumpNames() const
     return out.str();
 }
 
-void ActionsDAG::removeUnusedActions(const NameSet & required_names)
+void ActionsDAG::removeUnusedActions(const NameSet & required_names, bool allow_remove_inputs, bool allow_constant_folding)
 {
     NodeRawConstPtrs required_nodes;
     required_nodes.reserve(required_names.size());
@@ -367,10 +349,10 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names)
     }
 
     index.swap(required_nodes);
-    removeUnusedActions();
+    removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
 
-void ActionsDAG::removeUnusedActions(const Names & required_names)
+void ActionsDAG::removeUnusedActions(const Names & required_names, bool allow_remove_inputs, bool allow_constant_folding)
 {
     NodeRawConstPtrs required_nodes;
     required_nodes.reserve(required_names.size());
@@ -390,10 +372,10 @@ void ActionsDAG::removeUnusedActions(const Names & required_names)
     }
 
     index.swap(required_nodes);
-    removeUnusedActions();
+    removeUnusedActions(allow_remove_inputs, allow_constant_folding);
 }
 
-void ActionsDAG::removeUnusedActions(bool allow_remove_inputs)
+void ActionsDAG::removeUnusedActions(bool allow_remove_inputs, bool allow_constant_folding)
 {
     std::unordered_set<const Node *> visited_nodes;
     std::stack<Node *> stack;
@@ -424,9 +406,9 @@ void ActionsDAG::removeUnusedActions(bool allow_remove_inputs)
         auto * node = stack.top();
         stack.pop();
 
-        if (!node->children.empty() && node->column && isColumnConst(*node->column))
+        /// Constant folding.
+        if (allow_constant_folding && !node->children.empty() && node->column && isColumnConst(*node->column))
         {
-            /// Constant folding.
             node->type = ActionsDAG::ActionType::COLUMN;
 
             for (const auto & child : node->children)
@@ -893,9 +875,9 @@ ActionsDAGPtr ActionsDAG::clone() const
 }
 
 #if USE_EMBEDDED_COMPILER
-void ActionsDAG::compileExpressions(size_t min_count_to_compile_expression)
+void ActionsDAG::compileExpressions(size_t min_count_to_compile_expression, const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
-    compileFunctions(min_count_to_compile_expression);
+    compileFunctions(min_count_to_compile_expression, lazy_executed_nodes);
     removeUnusedActions();
 }
 #endif
@@ -1069,8 +1051,10 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
                     if (ignore_constant_values && res_const)
                         src_node = dst_node = &actions_dag->addColumn(res_elem);
                     else
-                        throw Exception("Cannot find column " + backQuote(res_elem.name) + " in source stream",
-                                        ErrorCodes::THERE_IS_NO_COLUMN);
+                        throw Exception(ErrorCodes::THERE_IS_NO_COLUMN,
+                                        "Cannot find column `{}` in source stream, there are only columns: [{}]",
+                                        res_elem.name, Block(source).dumpNames());
+
                 }
                 else
                 {
@@ -1110,8 +1094,8 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
             const auto * right_arg = &actions_dag->addColumn(std::move(column));
             const auto * left_arg = dst_node;
 
-            FunctionCast::Diagnostic diagnostic = {dst_node->result_name, res_elem.name};
-            FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<CastType::nonAccurate>::createImpl(false, std::move(diagnostic));
+            FunctionCastBase::Diagnostic diagnostic = {dst_node->result_name, res_elem.name};
+            FunctionOverloadResolverPtr func_builder_cast = CastInternalOverloadResolver<CastType::nonAccurate>::createImpl(std::move(diagnostic));
 
             NodeRawConstPtrs children = { left_arg, right_arg };
             dst_node = &actions_dag->addFunction(func_builder_cast, std::move(children), {});
@@ -1570,11 +1554,37 @@ ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordere
     std::unordered_set<const ActionsDAG::Node *> allowed;
     std::unordered_set<const ActionsDAG::Node *> rejected;
 
+    /// Parts of predicate in case predicate is conjunction (or just predicate itself).
+    std::unordered_set<const ActionsDAG::Node *> predicates;
+    {
+        std::stack<const ActionsDAG::Node *> stack;
+        std::unordered_set<const ActionsDAG::Node *> visited_nodes;
+        stack.push(predicate);
+        visited_nodes.insert(predicate);
+        while (!stack.empty())
+        {
+            const auto * node = stack.top();
+            stack.pop();
+            bool is_conjunction = node->type == ActionsDAG::ActionType::FUNCTION && node->function_base->getName() == "and";
+            if (is_conjunction)
+            {
+                for (const auto & child : node->children)
+                {
+                    if (visited_nodes.count(child) == 0)
+                    {
+                        visited_nodes.insert(child);
+                        stack.push(child);
+                    }
+                }
+            }
+            else
+                predicates.insert(node);
+        }
+    }
+
     struct Frame
     {
         const ActionsDAG::Node * node = nullptr;
-        /// Node is a part of predicate (predicate itself, or some part of AND)
-        bool is_predicate = false;
         size_t next_child_to_visit = 0;
         size_t num_allowed_children = 0;
     };
@@ -1582,14 +1592,11 @@ ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordere
     std::stack<Frame> stack;
     std::unordered_set<const ActionsDAG::Node *> visited_nodes;
 
-    stack.push(Frame{.node = predicate, .is_predicate = true});
+    stack.push(Frame{.node = predicate});
     visited_nodes.insert(predicate);
     while (!stack.empty())
     {
         auto & cur = stack.top();
-        bool is_conjunction = cur.is_predicate
-                                && cur.node->type == ActionsDAG::ActionType::FUNCTION
-                                && cur.node->function_base->getName() == "and";
 
         /// At first, visit all children.
         while (cur.next_child_to_visit < cur.node->children.size())
@@ -1599,7 +1606,7 @@ ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordere
             if (visited_nodes.count(child) == 0)
             {
                 visited_nodes.insert(child);
-                stack.push({.node = child, .is_predicate = is_conjunction});
+                stack.push({.node = child});
                 break;
             }
 
@@ -1616,8 +1623,7 @@ ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordere
                     allowed_nodes.emplace(cur.node);
             }
 
-            /// Add parts of AND to result. Do not add function AND.
-            if (cur.is_predicate && ! is_conjunction)
+            if (predicates.count(cur.node))
             {
                 if (allowed_nodes.count(cur.node))
                 {
@@ -1636,6 +1642,13 @@ ConjunctionNodes getConjunctionNodes(ActionsDAG::Node * predicate, std::unordere
         }
     }
 
+    // std::cerr << "Allowed " << conjunction.allowed.size() << std::endl;
+    // for (const auto & node : conjunction.allowed)
+    //     std::cerr << node->result_name << std::endl;
+    // std::cerr << "Rejected " << conjunction.rejected.size() << std::endl;
+    // for (const auto & node : conjunction.rejected)
+    //     std::cerr << node->result_name << std::endl;
+
     return conjunction;
 }
 
@@ -1876,7 +1889,7 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
                 predicate->children = {left_arg, right_arg};
                 auto arguments = prepareFunctionArguments(predicate->children);
 
-                FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<CastType::nonAccurate>::createImpl(false);
+                FunctionOverloadResolverPtr func_builder_cast = CastInternalOverloadResolver<CastType::nonAccurate>::createImpl();
 
                 predicate->function_builder = func_builder_cast;
                 predicate->function_base = predicate->function_builder->build(arguments);
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index bfb5b177ac7..9a5ad01a252 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -5,9 +5,7 @@
 #include <Core/Names.h>
 #include <Interpreters/Context_fwd.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 namespace DB
 {
@@ -61,8 +59,6 @@ public:
         FUNCTION,
     };
 
-    static const char * typeToString(ActionType type);
-
     struct Node;
     using NodeRawPtrs = std::vector<Node *>;
     using NodeRawConstPtrs = std::vector<const Node *>;
@@ -164,8 +160,8 @@ public:
     bool isInputProjected() const { return project_input; }
     bool isOutputProjected() const { return projected_output; }
 
-    void removeUnusedActions(const Names & required_names);
-    void removeUnusedActions(const NameSet & required_names);
+    void removeUnusedActions(const Names & required_names, bool allow_remove_inputs = true, bool allow_constant_folding = true);
+    void removeUnusedActions(const NameSet & required_names, bool allow_remove_inputs = true, bool allow_constant_folding = true);
 
     NameSet foldActionsByProjection(
         const NameSet & required_columns,
@@ -181,7 +177,7 @@ public:
     void assertDeterministic() const; /// Throw if not isDeterministic.
 
 #if USE_EMBEDDED_COMPILER
-    void compileExpressions(size_t min_count_to_compile_expression);
+    void compileExpressions(size_t min_count_to_compile_expression, const std::unordered_set<const Node *> & lazy_executed_nodes = {});
 #endif
 
     ActionsDAGPtr clone() const;
@@ -273,10 +269,10 @@ public:
 private:
     Node & addNode(Node node);
 
-    void removeUnusedActions(bool allow_remove_inputs = true);
+    void removeUnusedActions(bool allow_remove_inputs = true, bool allow_constant_folding = true);
 
 #if USE_EMBEDDED_COMPILER
-    void compileFunctions(size_t min_count_to_compile_expression);
+    void compileFunctions(size_t min_count_to_compile_expression, const std::unordered_set<const Node *> & lazy_executed_nodes = {});
 #endif
 
     static ActionsDAGPtr cloneActionsForConjunction(NodeRawConstPtrs conjunction, const ColumnsWithTypeAndName & all_inputs);
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 03fa756276e..e358696fa40 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -26,6 +26,8 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
+#include <Processors/QueryPlan/QueryPlan.h>
+
 #include <Interpreters/Context.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/misc.h>
@@ -37,6 +39,8 @@
 #include <Interpreters/interpretSubquery.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
+
 
 namespace DB
 {
@@ -185,9 +189,11 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
 
                 /// If the function is not a tuple, treat it as a constant expression that returns tuple and extract it.
                 function_result = extractValueFromNode(elem, *tuple_type, context);
+
                 if (function_result.getType() != Field::Types::Tuple)
-                    throw Exception("Invalid type of set. Expected tuple, got " + String(function_result.getTypeName()),
-                                    ErrorCodes::INCORRECT_ELEMENT_OF_SET);
+                    throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET,
+                        "Invalid type of set. Expected tuple, got {}",
+                        function_result.getTypeName());
 
                 tuple = &function_result.get<Tuple>();
             }
@@ -198,8 +204,9 @@ static Block createBlockFromAST(const ASTPtr & node, const DataTypes & types, Co
             {
                 /// The literal must be tuple.
                 if (literal->value.getType() != Field::Types::Tuple)
-                    throw Exception("Invalid type in set. Expected tuple, got "
-                        + String(literal->value.getTypeName()), ErrorCodes::INCORRECT_ELEMENT_OF_SET);
+                    throw Exception(ErrorCodes::INCORRECT_ELEMENT_OF_SET,
+                        "Invalid type in set. Expected tuple, got {}",
+                        literal->value.getTypeName());
 
                 tuple = &literal->value.get<Tuple>();
             }
@@ -348,7 +355,7 @@ SetPtr makeExplicitSet(
     const ASTPtr & left_arg = args.children.at(0);
     const ASTPtr & right_arg = args.children.at(1);
 
-    auto column_name = left_arg->getColumnName(context->getSettingsRef());
+    auto column_name = left_arg->getColumnName();
     const auto & dag_node = actions.findInIndex(column_name);
     const DataTypePtr & left_arg_type = dag_node.result_type;
 
@@ -374,8 +381,8 @@ SetPtr makeExplicitSet(
 
     SetPtr set
         = std::make_shared<Set>(size_limits, create_ordered_set, context->getSettingsRef().transform_null_in);
-    set->setHeader(block.cloneEmpty());
-    set->insertFromBlock(block);
+    set->setHeader(block.cloneEmpty().getColumnsWithTypeAndName());
+    set->insertFromBlock(block.getColumnsWithTypeAndName());
     set->finishInsert();
 
     prepared_sets[set_key] = set;
@@ -641,7 +648,7 @@ std::optional<NameAndTypePair> ActionsMatcher::getNameAndTypeFromAST(const ASTPt
 {
     // If the argument is a literal, we generated a unique column name for it.
     // Use it instead of a generic display name.
-    auto child_column_name = ast->getColumnName(data.getContext()->getSettingsRef());
+    auto child_column_name = ast->getColumnName();
     const auto * as_literal = ast->as<ASTLiteral>();
     if (as_literal)
     {
@@ -698,7 +705,7 @@ ASTs ActionsMatcher::doUntuple(const ASTFunction * function, ActionsMatcher::Dat
         auto func = makeASTFunction("tupleElement", tuple_ast, literal);
 
         auto function_builder = FunctionFactory::instance().get(func->name, data.getContext());
-        data.addFunction(function_builder, {tuple_name_type->name, literal->getColumnName(data.getContext()->getSettingsRef())}, func->getColumnName(data.getContext()->getSettingsRef()));
+        data.addFunction(function_builder, {tuple_name_type->name, literal->getColumnName()}, func->getColumnName());
 
         columns.push_back(std::move(func));
     }
@@ -762,7 +769,7 @@ void ActionsMatcher::visit(const ASTIdentifier & identifier, const ASTPtr &, Dat
 
 void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data & data)
 {
-    auto column_name = ast->getColumnName(data.getContext()->getSettingsRef());
+    auto column_name = ast->getColumnName();
     if (data.hasColumn(column_name))
         return;
 
@@ -778,7 +785,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
         ASTPtr arg = node.arguments->children.at(0);
         visit(arg, data);
         if (!data.only_consts)
-            data.addArrayJoin(arg->getColumnName(data.getContext()->getSettingsRef()), column_name);
+            data.addArrayJoin(arg->getColumnName(), column_name);
 
         return;
     }
@@ -800,7 +807,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                 /// We are in the part of the tree that we are not going to compute. You just need to define types.
                 /// Do not subquery and create sets. We replace "in*" function to "in*IgnoreSet".
 
-                auto argument_name = node.arguments->children.at(0)->getColumnName(data.getContext()->getSettingsRef());
+                auto argument_name = node.arguments->children.at(0)->getColumnName();
 
                 data.addFunction(
                         FunctionFactory::instance().get(node.name + "IgnoreSet", data.getContext()),
@@ -851,17 +858,21 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     if (AggregateFunctionFactory::instance().isAggregateFunctionName(node.name))
         return;
 
-    FunctionOverloadResolverPtr function_builder;
-    try
+    FunctionOverloadResolverPtr function_builder = UserDefinedExecutableFunctionFactory::instance().tryGet(node.name, data.getContext());
+
+    if (!function_builder)
     {
-        function_builder = FunctionFactory::instance().get(node.name, data.getContext());
-    }
-    catch (Exception & e)
-    {
-        auto hints = AggregateFunctionFactory::instance().getHints(node.name);
-        if (!hints.empty())
-            e.addMessage("Or unknown aggregate function " + node.name + ". Maybe you meant: " + toString(hints));
-        throw;
+        try
+        {
+            function_builder = FunctionFactory::instance().get(node.name, data.getContext());
+        }
+        catch (Exception & e)
+        {
+            auto hints = AggregateFunctionFactory::instance().getHints(node.name);
+            if (!hints.empty())
+                e.addMessage("Or unknown aggregate function " + node.name + ". Maybe you meant: " + toString(hints));
+            throw;
+        }
     }
 
     Names argument_names;
@@ -929,7 +940,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                 if (!prepared_set->empty())
                     column.name = data.getUniqueName("__set");
                 else
-                    column.name = child->getColumnName(data.getContext()->getSettingsRef());
+                    column.name = child->getColumnName();
 
                 if (!data.hasColumn(column.name))
                 {
@@ -1008,7 +1019,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                     visit(lambda->arguments->children.at(1), data);
                     auto lambda_dag = data.actions_stack.popLevel();
 
-                    String result_name = lambda->arguments->children.at(1)->getColumnName(data.getContext()->getSettingsRef());
+                    String result_name = lambda->arguments->children.at(1)->getColumnName();
                     lambda_dag->removeUnusedActions(Names(1, result_name));
 
                     auto lambda_actions = std::make_shared<ExpressionActions>(
@@ -1023,7 +1034,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
                         if (findColumn(required_arg, lambda_arguments) == lambda_arguments.end())
                             captured.push_back(required_arg);
 
-                    /// We can not name `getColumnName(data.getContext()->getSettingsRef())`,
+                    /// We can not name `getColumnName()`,
                     ///  because it does not uniquely define the expression (the types of arguments can be different).
                     String lambda_name = data.getUniqueName("__lambda");
 
@@ -1053,7 +1064,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
     if (arguments_present)
     {
         /// Calculate column name here again, because AST may be changed here (in case of untuple).
-        data.addFunction(function_builder, argument_names, ast->getColumnName(data.getContext()->getSettingsRef()));
+        data.addFunction(function_builder, argument_names, ast->getColumnName());
     }
 }
 
@@ -1067,7 +1078,7 @@ void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
     // AST here? Anyway, do not modify the column name if it is set already.
     if (literal.unique_column_name.empty())
     {
-        const auto default_name = literal.getColumnName(data.getContext()->getSettingsRef());
+        const auto default_name = literal.getColumnName();
         const auto & index = data.actions_stack.getLastActionsIndex();
         const auto * existing_column = index.tryGetNode(default_name);
 
@@ -1147,7 +1158,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
         }
 
         /// We get the stream of blocks for the subquery. Create Set and put it in place of the subquery.
-        String set_id = right_in_operand->getColumnName(data.getContext()->getSettingsRef());
+        String set_id = right_in_operand->getColumnName();
 
         SubqueryForSet & subquery_for_set = data.subqueries_for_sets[set_id];
 
@@ -1183,7 +1194,7 @@ SetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool no_su
     {
         const auto & last_actions = data.actions_stack.getLastActions();
         const auto & index = data.actions_stack.getLastActionsIndex();
-        if (index.contains(left_in_operand->getColumnName(data.getContext()->getSettingsRef())))
+        if (index.contains(left_in_operand->getColumnName()))
             /// An explicit enumeration of values in parentheses.
             return makeExplicitSet(&node, last_actions, false, data.getContext(), data.set_size_limit, data.prepared_sets);
         else
diff --git a/src/Interpreters/AddDefaultDatabaseVisitor.h b/src/Interpreters/AddDefaultDatabaseVisitor.h
index fe3edc00957..5d7483c45c0 100644
--- a/src/Interpreters/AddDefaultDatabaseVisitor.h
+++ b/src/Interpreters/AddDefaultDatabaseVisitor.h
@@ -10,9 +10,14 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTCreateQuery.h>
 #include <Parsers/DumpASTNode.h>
+#include <Parsers/ASTAlterQuery.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/IdentifierSemantic.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/misc.h>
 
 namespace DB
 {
@@ -25,18 +30,20 @@ class AddDefaultDatabaseVisitor
 {
 public:
     explicit AddDefaultDatabaseVisitor(
-        const String & database_name_, bool only_replace_current_database_function_ = false, WriteBuffer * ostr_ = nullptr)
-        : database_name(database_name_)
+        ContextPtr context_,
+        const String & database_name_,
+        bool only_replace_current_database_function_ = false)
+        : context(context_)
+        , database_name(database_name_)
         , only_replace_current_database_function(only_replace_current_database_function_)
-        , visit_depth(0)
-        , ostr(ostr_)
     {}
 
     void visitDDL(ASTPtr & ast) const
     {
         visitDDLChildren(ast);
 
-        if (!tryVisitDynamicCast<ASTQueryWithTableAndOutput>(ast) &&
+        if (!tryVisitDynamicCast<ASTAlterQuery>(ast) &&
+            !tryVisitDynamicCast<ASTQueryWithTableAndOutput>(ast) &&
             !tryVisitDynamicCast<ASTRenameQuery>(ast) &&
             !tryVisitDynamicCast<ASTFunction>(ast))
         {}
@@ -62,11 +69,19 @@ public:
         visit(select, unused);
     }
 
+    void visit(ASTColumns & columns) const
+    {
+        for (auto & child : columns.children)
+            visit(child);
+    }
+
 private:
+
+    ContextPtr context;
+
     const String database_name;
+
     bool only_replace_current_database_function = false;
-    mutable size_t visit_depth;
-    WriteBuffer * ostr;
 
     void visit(ASTSelectWithUnionQuery & select, ASTPtr &) const
     {
@@ -105,7 +120,12 @@ private:
     void visit(const ASTTableIdentifier & identifier, ASTPtr & ast) const
     {
         if (!identifier.compound())
-            ast = std::make_shared<ASTTableIdentifier>(database_name, identifier.name());
+        {
+            auto qualified_identifier = std::make_shared<ASTTableIdentifier>(database_name, identifier.name());
+            if (!identifier.alias.empty())
+                qualified_identifier->setAlias(identifier.alias);
+            ast = qualified_identifier;
+        }
     }
 
     void visit(ASTSubquery & subquery, ASTPtr &) const
@@ -115,15 +135,8 @@ private:
 
     void visit(ASTFunction & function, ASTPtr &) const
     {
-        bool is_operator_in = false;
-        for (const auto * name : {"in", "notIn", "globalIn", "globalNotIn"})
-        {
-            if (function.name == name)
-            {
-                is_operator_in = true;
-                break;
-            }
-        }
+        bool is_operator_in = functionIsInOrGlobalInOperator(function.name);
+        bool is_dict_get = functionIsDictGet(function.name);
 
         for (auto & child : function.children)
         {
@@ -131,12 +144,40 @@ private:
             {
                 for (size_t i = 0; i < child->children.size(); ++i)
                 {
-                    if (is_operator_in && i == 1)
+                    if (is_dict_get && i == 0)
+                    {
+                        if (auto * identifier = child->children[i]->as<ASTIdentifier>())
+                        {
+                            /// Identifier already qualified
+                            if (identifier->compound())
+                                continue;
+
+                            auto qualified_dictionary_name = context->getExternalDictionariesLoader().qualifyDictionaryNameWithDatabase(identifier->name(), context);
+                            child->children[i] = std::make_shared<ASTIdentifier>(qualified_dictionary_name.getParts());
+                        }
+                        else if (auto * literal = child->children[i]->as<ASTLiteral>())
+                        {
+                            auto & literal_value = literal->value;
+
+                            if (literal_value.getType() != Field::Types::String)
+                                continue;
+
+                            auto dictionary_name = literal_value.get<String>();
+                            auto qualified_dictionary_name = context->getExternalDictionariesLoader().qualifyDictionaryNameWithDatabase(dictionary_name, context);
+                            literal_value = qualified_dictionary_name.getFullName();
+                        }
+                    }
+                    else if (is_operator_in && i == 1)
                     {
                         /// XXX: for some unknown reason this place assumes that argument can't be an alias,
                         ///      like in the similar code in `MarkTableIdentifierVisitor`.
                         if (auto * identifier = child->children[i]->as<ASTIdentifier>())
-                            child->children[i] = identifier->createTable();
+                        {
+                            /// If identifier is broken then we can do nothing and get an exception
+                            auto maybe_table_identifier = identifier->createTable();
+                            if (maybe_table_identifier)
+                                child->children[i] = maybe_table_identifier;
+                        }
 
                         /// Second argument of the "in" function (or similar) may be a table name or a subselect.
                         /// Rewrite the table name or descend into subselect.
@@ -144,11 +185,15 @@ private:
                             visit(child->children[i]);
                     }
                     else
+                    {
                         visit(child->children[i]);
+                    }
                 }
             }
             else
+            {
                 visit(child);
+            }
         }
     }
 
@@ -163,7 +208,6 @@ private:
     {
         if (T * t = typeid_cast<T *>(ast.get()))
         {
-            DumpASTNode dump(*ast, ostr, visit_depth, "addDefaultDatabaseName");
             visit(*t, ast);
             return true;
         }
@@ -194,6 +238,24 @@ private:
         }
     }
 
+    void visitDDL(ASTAlterQuery & node, ASTPtr &) const
+    {
+        if (only_replace_current_database_function)
+            return;
+
+        if (node.database.empty())
+            node.database = database_name;
+
+        for (const auto & child : node.command_list->children)
+        {
+            auto * command_ast = child->as<ASTAlterCommand>();
+            if (command_ast->from_database.empty())
+                command_ast->from_database = database_name;
+            if (command_ast->to_database.empty())
+                command_ast->to_database = database_name;
+        }
+    }
+
     void visitDDL(ASTFunction & function, ASTPtr & node) const
     {
         if (function.name == "currentDatabase")
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index dc94c2981b3..00d2f76f043 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -8,7 +8,7 @@
 #include <Common/memcpySmall.h>
 #include <Common/assert_cast.h>
 #include <Core/Defines.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index 7ffae761c0c..4f4b981b44d 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -9,8 +9,7 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <DataStreams/materializeBlock.h>
+#include <Formats/NativeWriter.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
@@ -24,6 +23,7 @@
 #include <IO/Operators.h>
 #include <Interpreters/JIT/compileFunction.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
+#include <Core/ProtocolDefines.h>
 
 
 namespace ProfileEvents
@@ -781,15 +781,62 @@ void NO_INLINE Aggregator::executeImplBatch(
 }
 
 
+template <bool use_compiled_functions>
 void NO_INLINE Aggregator::executeWithoutKeyImpl(
     AggregatedDataWithoutKey & res,
     size_t rows,
     AggregateFunctionInstruction * aggregate_instructions,
-    Arena * arena)
+    Arena * arena) const
 {
-    /// Adding values
-    for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
+#if USE_EMBEDDED_COMPILER
+    if constexpr (use_compiled_functions)
     {
+        std::vector<ColumnData> columns_data;
+
+        for (size_t i = 0; i < aggregate_functions.size(); ++i)
+        {
+            if (!is_aggregate_function_compiled[i])
+                continue;
+
+            AggregateFunctionInstruction * inst = aggregate_instructions + i;
+            size_t arguments_size = inst->that->getArgumentTypes().size();
+
+            for (size_t argument_index = 0; argument_index < arguments_size; ++argument_index)
+            {
+                columns_data.emplace_back(getColumnData(inst->batch_arguments[argument_index]));
+            }
+        }
+
+        auto add_into_aggregate_states_function_single_place = compiled_aggregate_functions_holder->compiled_aggregate_functions.add_into_aggregate_states_function_single_place;
+        add_into_aggregate_states_function_single_place(rows, columns_data.data(), res);
+
+#if defined(MEMORY_SANITIZER)
+
+        /// We compile only functions that do not allocate some data in Arena. Only store necessary state in AggregateData place.
+        for (size_t aggregate_function_index = 0; aggregate_function_index < aggregate_functions.size(); ++aggregate_function_index)
+        {
+            if (!is_aggregate_function_compiled[aggregate_function_index])
+                continue;
+
+            auto aggregate_data_with_offset = res + offsets_of_aggregate_states[aggregate_function_index];
+            auto data_size = params.aggregates[aggregate_function_index].function->sizeOfData();
+            __msan_unpoison(aggregate_data_with_offset, data_size);
+        }
+#endif
+    }
+#endif
+
+    /// Adding values
+    for (size_t i = 0; i < aggregate_functions.size(); ++i)
+    {
+        AggregateFunctionInstruction * inst = aggregate_instructions + i;
+
+#if USE_EMBEDDED_COMPILER
+        if constexpr (use_compiled_functions)
+            if (is_aggregate_function_compiled[i])
+                continue;
+#endif
+
         if (inst->offsets)
             inst->batch_that->addBatchSinglePlace(
                 inst->offsets[static_cast<ssize_t>(rows - 1)], res + inst->state_offset, inst->batch_arguments, arena);
@@ -818,7 +865,7 @@ void NO_INLINE Aggregator::executeOnIntervalWithoutKeyImpl(
 
 
 void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns & aggregate_columns, Columns & materialized_columns,
-    AggregateFunctionInstructions & aggregate_functions_instructions, NestedColumnsHolder & nested_columns_holder)
+    AggregateFunctionInstructions & aggregate_functions_instructions, NestedColumnsHolder & nested_columns_holder) const
 {
     for (size_t i = 0; i < params.aggregates_size; ++i)
         aggregate_columns[i].resize(params.aggregates[i].arguments.size());
@@ -870,7 +917,7 @@ void Aggregator::prepareAggregateInstructions(Columns columns, AggregateColumns
 
 
 bool Aggregator::executeOnBlock(const Block & block, AggregatedDataVariants & result,
-                                ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys)
+                                ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys) const
 {
     UInt64 num_rows = block.rows();
     return executeOnBlock(block.getColumns(), num_rows, result, key_columns, aggregate_columns, no_more_keys);
@@ -878,7 +925,7 @@ bool Aggregator::executeOnBlock(const Block & block, AggregatedDataVariants & re
 
 
 bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedDataVariants & result,
-    ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys)
+    ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, bool & no_more_keys) const
 {
     /// `result` will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
@@ -930,7 +977,17 @@ bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedData
     /// For the case when there are no keys (all aggregate into one row).
     if (result.type == AggregatedDataVariants::Type::without_key)
     {
-        executeWithoutKeyImpl(result.without_key, num_rows, aggregate_functions_instructions.data(), result.aggregates_pool);
+        /// TODO: Enable compilation after investigation
+// #if USE_EMBEDDED_COMPILER
+//         if (compiled_aggregate_functions_holder)
+//         {
+//             executeWithoutKeyImpl<true>(result.without_key, num_rows, aggregate_functions_instructions.data(), result.aggregates_pool);
+//         }
+//         else
+// #endif
+        {
+            executeWithoutKeyImpl<false>(result.without_key, num_rows, aggregate_functions_instructions.data(), result.aggregates_pool);
+        }
     }
     else
     {
@@ -1001,7 +1058,7 @@ bool Aggregator::executeOnBlock(Columns columns, UInt64 num_rows, AggregatedData
 }
 
 
-void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path)
+void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path) const
 {
     Stopwatch watch;
     size_t rows = data_variants.size();
@@ -1010,7 +1067,7 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, co
     const std::string & path = file->path();
     WriteBufferFromFile file_buf(path);
     CompressedWriteBuffer compressed_buf(file_buf);
-    NativeBlockOutputStream block_out(compressed_buf, DBMS_TCP_PROTOCOL_VERSION, getHeader(false));
+    NativeWriter block_out(compressed_buf, DBMS_TCP_PROTOCOL_VERSION, getHeader(false));
 
     LOG_DEBUG(log, "Writing part of aggregation data into temporary file {}.", path);
     ProfileEvents::increment(ProfileEvents::ExternalAggregationWritePart);
@@ -1073,7 +1130,7 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, co
 }
 
 
-void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants)
+void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants) const
 {
     String tmp_path = params.tmp_volume->getDisk()->getPath();
     return writeToTemporaryFile(data_variants, tmp_path);
@@ -1135,7 +1192,7 @@ template <typename Method>
 void Aggregator::writeToTemporaryFileImpl(
     AggregatedDataVariants & data_variants,
     Method & method,
-    IBlockOutputStream & out)
+    NativeWriter & out) const
 {
     size_t max_temporary_block_size_rows = 0;
     size_t max_temporary_block_size_bytes = 0;
@@ -1193,6 +1250,9 @@ bool Aggregator::checkLimits(size_t result_size, bool & no_more_keys) const
         }
     }
 
+    /// Some aggregate functions cannot throw exceptions on allocations (e.g. from C malloc)
+    /// but still tracks memory. Check it here.
+    CurrentMemoryTracker::check();
     return true;
 }
 
@@ -2251,7 +2311,7 @@ void NO_INLINE Aggregator::mergeWithoutKeyStreamsImpl(
     block.clear();
 }
 
-bool Aggregator::mergeBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys)
+bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys) const
 {
     /// `result` will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
@@ -2601,7 +2661,7 @@ void NO_INLINE Aggregator::convertBlockToTwoLevelImpl(
 }
 
 
-std::vector<Block> Aggregator::convertBlockToTwoLevel(const Block & block)
+std::vector<Block> Aggregator::convertBlockToTwoLevel(const Block & block) const
 {
     if (!block)
         return {};
@@ -2693,7 +2753,7 @@ void Aggregator::destroyWithoutKey(AggregatedDataVariants & result) const
 }
 
 
-void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result)
+void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result) const
 {
     if (result.empty())
         return;
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index 265ef912794..3c53769e128 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -4,9 +4,9 @@
 #include <memory>
 #include <functional>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/HashTable/HashMap.h>
@@ -19,8 +19,7 @@
 #include <Common/assert_cast.h>
 #include <Common/filesystemHelpers.h>
 
-#include <DataStreams/IBlockStream_fwd.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 
 #include <Disks/SingleDiskVolume.h>
 
@@ -44,8 +43,6 @@ namespace ErrorCodes
     extern const int UNKNOWN_AGGREGATED_DATA_VARIANT;
 }
 
-class IBlockOutputStream;
-
 /** Different data structures that can be used for aggregation
   * For efficiency, the aggregation data itself is put into the pool.
   * Data and pool ownership (states of aggregate functions)
@@ -506,7 +503,7 @@ struct AggregatedDataVariants : private boost::noncopyable
       * But this can hardly be done simply because it is planned to put variable-length strings into the same pool.
       * In this case, the pool will not be able to know with what offsets objects are stored.
       */
-    Aggregator * aggregator = nullptr;
+    const Aggregator * aggregator = nullptr;
 
     size_t keys_size{};  /// Number of keys. NOTE do we need this field?
     Sizes key_sizes;     /// Dimensions of keys, if keys of fixed length
@@ -853,6 +850,7 @@ using ManyAggregatedDataVariants = std::vector<AggregatedDataVariantsPtr>;
 using ManyAggregatedDataVariantsPtr = std::shared_ptr<ManyAggregatedDataVariants>;
 
 class CompiledAggregateFunctionsHolder;
+class NativeWriter;
 
 /** How are "total" values calculated with WITH TOTALS?
   * (For more details, see TotalsHavingTransform.)
@@ -975,11 +973,14 @@ public:
     /// Process one block. Return false if the processing should be aborted (with group_by_overflow_mode = 'break').
     bool executeOnBlock(const Block & block, AggregatedDataVariants & result,
         ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns,    /// Passed to not create them anew for each block
-        bool & no_more_keys);
+        bool & no_more_keys) const;
 
     bool executeOnBlock(Columns columns, UInt64 num_rows, AggregatedDataVariants & result,
         ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns,    /// Passed to not create them anew for each block
-        bool & no_more_keys);
+        bool & no_more_keys) const;
+
+    /// Used for aggregate projection.
+    bool mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys) const;
 
     /** Convert the aggregation data structure into a block.
       * If overflow_row = true, then aggregates for rows that are not included in max_rows_to_group_by are put in the first block.
@@ -996,8 +997,6 @@ public:
     /// Merge partially aggregated blocks separated to buckets into one data structure.
     void mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads);
 
-    bool mergeBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys);
-
     /// Merge several partially aggregated blocks into one.
     /// Precondition: for all blocks block.info.is_overflows flag must be the same.
     /// (either all blocks are from overflow data or none blocks are).
@@ -1007,11 +1006,11 @@ public:
     /** Split block with partially-aggregated data to many blocks, as if two-level method of aggregation was used.
       * This is needed to simplify merging of that data with other results, that are already two-level.
       */
-    std::vector<Block> convertBlockToTwoLevel(const Block & block);
+    std::vector<Block> convertBlockToTwoLevel(const Block & block) const;
 
     /// For external aggregation.
-    void writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path);
-    void writeToTemporaryFile(AggregatedDataVariants & data_variants);
+    void writeToTemporaryFile(AggregatedDataVariants & data_variants, const String & tmp_path) const;
+    void writeToTemporaryFile(AggregatedDataVariants & data_variants) const;
 
     bool hasTemporaryFiles() const { return !temporary_files.empty(); }
 
@@ -1083,7 +1082,7 @@ private:
     Poco::Logger * log = &Poco::Logger::get("Aggregator");
 
     /// For external aggregation.
-    TemporaryFiles temporary_files;
+    mutable TemporaryFiles temporary_files;
 
 #if USE_EMBEDDED_COMPILER
     std::shared_ptr<CompiledAggregateFunctionsHolder> compiled_aggregate_functions_holder;
@@ -1106,7 +1105,7 @@ private:
     /** Call `destroy` methods for states of aggregate functions.
       * Used in the exception handler for aggregation, since RAII in this case is not applicable.
       */
-    void destroyAllAggregateStates(AggregatedDataVariants & result);
+    void destroyAllAggregateStates(AggregatedDataVariants & result) const;
 
 
     /// Process one data block, aggregate the data into a hash table.
@@ -1121,7 +1120,7 @@ private:
         AggregateDataPtr overflow_row) const;
 
     /// Specialization for a particular value no_more_keys.
-    template <bool no_more_keys, bool use_compiled_expressions, typename Method>
+    template <bool no_more_keys, bool use_compiled_functions, typename Method>
     void executeImplBatch(
         Method & method,
         typename Method::State & state,
@@ -1131,11 +1130,12 @@ private:
         AggregateDataPtr overflow_row) const;
 
     /// For case when there are no keys (all aggregate into one row).
-    static void executeWithoutKeyImpl(
+    template <bool use_compiled_functions>
+    void executeWithoutKeyImpl(
         AggregatedDataWithoutKey & res,
         size_t rows,
         AggregateFunctionInstruction * aggregate_instructions,
-        Arena * arena);
+        Arena * arena) const;
 
     static void executeOnIntervalWithoutKeyImpl(
         AggregatedDataWithoutKey & res,
@@ -1148,7 +1148,7 @@ private:
     void writeToTemporaryFileImpl(
         AggregatedDataVariants & data_variants,
         Method & method,
-        IBlockOutputStream & out);
+        NativeWriter & out) const;
 
     /// Merge NULL key data from hash table `src` into `dst`.
     template <typename Method, typename Table>
@@ -1303,7 +1303,7 @@ private:
         AggregateColumns & aggregate_columns,
         Columns & materialized_columns,
         AggregateFunctionInstructions & instructions,
-        NestedColumnsHolder & nested_columns_holder);
+        NestedColumnsHolder & nested_columns_holder) const;
 
     void addSingleKeyToAggregateColumns(
         const AggregatedDataVariants & data_variants,
diff --git a/src/Interpreters/Aliases.h b/src/Interpreters/Aliases.h
index 0bdffe27933..0eb8dbf9572 100644
--- a/src/Interpreters/Aliases.h
+++ b/src/Interpreters/Aliases.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 
 #include <unordered_map>
diff --git a/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp b/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
index bdd9ce32707..70a58971d3f 100644
--- a/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
+++ b/src/Interpreters/ArithmeticOperationsInAgrFuncOptimize.cpp
@@ -107,10 +107,7 @@ ASTPtr tryExchangeFunctions(const ASTFunction & func)
         || !supported.find(lower_name)->second.count(child_func->name))
         return {};
 
-    /// Cannot rewrite function with alias cause alias could become undefined
-    if (!func.tryGetAlias().empty() || !child_func->tryGetAlias().empty())
-        return {};
-
+    auto original_alias = func.tryGetAlias();
     const auto & child_func_args = child_func->arguments->children;
     const auto * first_literal = child_func_args[0]->as<ASTLiteral>();
     const auto * second_literal = child_func_args[1]->as<ASTLiteral>();
@@ -132,7 +129,12 @@ ASTPtr tryExchangeFunctions(const ASTFunction & func)
         optimized_ast = exchangeExtractSecondArgument(new_name, *child_func);
     }
 
-    return optimized_ast;
+    if (optimized_ast)
+    {
+        optimized_ast->setAlias(original_alias);
+        return optimized_ast;
+    }
+    return {};
 }
 
 }
diff --git a/src/Interpreters/ArrayJoinedColumnsVisitor.h b/src/Interpreters/ArrayJoinedColumnsVisitor.h
index 94f6bdaf138..b64a170cb00 100644
--- a/src/Interpreters/ArrayJoinedColumnsVisitor.h
+++ b/src/Interpreters/ArrayJoinedColumnsVisitor.h
@@ -60,7 +60,7 @@ public:
 private:
     static void visit(const ASTSelectQuery & node, ASTPtr &, Data & data)
     {
-        ASTPtr array_join_expression_list = node.arrayJoinExpressionList();
+        auto [array_join_expression_list, _] = node.arrayJoinExpressionList();
         if (!array_join_expression_list)
             throw Exception("Logical error: no ARRAY JOIN", ErrorCodes::LOGICAL_ERROR);
 
diff --git a/src/Interpreters/AsynchronousInsertQueue.cpp b/src/Interpreters/AsynchronousInsertQueue.cpp
new file mode 100644
index 00000000000..2f86c8bef28
--- /dev/null
+++ b/src/Interpreters/AsynchronousInsertQueue.cpp
@@ -0,0 +1,474 @@
+#include <Interpreters/AsynchronousInsertQueue.h>
+
+#include <Core/Settings.h>
+#include <QueryPipeline/BlockIO.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/Context.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/copyData.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/queryToString.h>
+#include <Storages/IStorage.h>
+#include <Common/SipHash.h>
+#include <Common/FieldVisitorHash.h>
+#include <Access/AccessFlags.h>
+#include <Formats/FormatFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int TIMEOUT_EXCEEDED;
+    extern const int UNKNOWN_EXCEPTION;
+    extern const int UNKNOWN_FORMAT;
+}
+
+AsynchronousInsertQueue::InsertQuery::InsertQuery(const ASTPtr & query_, const Settings & settings_)
+    : query(query_->clone()), settings(settings_)
+{
+}
+
+AsynchronousInsertQueue::InsertQuery::InsertQuery(const InsertQuery & other)
+    : query(other.query->clone()), settings(other.settings)
+{
+}
+
+AsynchronousInsertQueue::InsertQuery &
+AsynchronousInsertQueue::InsertQuery::operator=(const InsertQuery & other)
+{
+    if (this != &other)
+    {
+        query = other.query->clone();
+        settings = other.settings;
+    }
+
+    return *this;
+}
+
+UInt64 AsynchronousInsertQueue::InsertQuery::Hash::operator()(const InsertQuery & insert_query) const
+{
+    SipHash hash;
+    insert_query.query->updateTreeHash(hash);
+
+    for (const auto & setting : insert_query.settings.allChanged())
+    {
+        hash.update(setting.getName());
+        applyVisitor(FieldVisitorHash(hash), setting.getValue());
+    }
+
+    return hash.get64();
+}
+
+bool AsynchronousInsertQueue::InsertQuery::operator==(const InsertQuery & other) const
+{
+    return queryToString(query) == queryToString(other.query) && settings == other.settings;
+}
+
+AsynchronousInsertQueue::InsertData::Entry::Entry(String && bytes_, String && query_id_)
+    : bytes(std::move(bytes_)), query_id(std::move(query_id_))
+{
+}
+
+void AsynchronousInsertQueue::InsertData::Entry::finish(std::exception_ptr exception_)
+{
+    std::lock_guard lock(mutex);
+    finished = true;
+    exception = exception_;
+    cv.notify_all();
+}
+
+bool AsynchronousInsertQueue::InsertData::Entry::wait(const Milliseconds & timeout) const
+{
+    std::unique_lock lock(mutex);
+    return cv.wait_for(lock, timeout, [&] { return finished; });
+}
+
+bool AsynchronousInsertQueue::InsertData::Entry::isFinished() const
+{
+    std::lock_guard lock(mutex);
+    return finished;
+}
+
+std::exception_ptr AsynchronousInsertQueue::InsertData::Entry::getException() const
+{
+    std::lock_guard lock(mutex);
+    return exception;
+}
+
+
+AsynchronousInsertQueue::AsynchronousInsertQueue(ContextPtr context_, size_t pool_size, size_t max_data_size_, const Timeout & timeouts)
+    : WithContext(context_)
+    , max_data_size(max_data_size_)
+    , busy_timeout(timeouts.busy)
+    , stale_timeout(timeouts.stale)
+    , pool(pool_size)
+    , dump_by_first_update_thread(&AsynchronousInsertQueue::busyCheck, this)
+    , cleanup_thread(&AsynchronousInsertQueue::cleanup, this)
+{
+    using namespace std::chrono;
+
+    assert(pool_size);
+
+    if (stale_timeout > 0ms)
+        dump_by_last_update_thread = ThreadFromGlobalPool(&AsynchronousInsertQueue::staleCheck, this);
+}
+
+AsynchronousInsertQueue::~AsynchronousInsertQueue()
+{
+    /// TODO: add a setting for graceful shutdown.
+
+    shutdown = true;
+
+    assert(dump_by_first_update_thread.joinable());
+    dump_by_first_update_thread.join();
+
+    assert(cleanup_thread.joinable());
+    cleanup_thread.join();
+
+    if (dump_by_last_update_thread.joinable())
+        dump_by_last_update_thread.join();
+
+    pool.wait();
+
+    std::lock_guard lock(currently_processing_mutex);
+    for (const auto & [_, entry] : currently_processing_queries)
+    {
+        if (!entry->isFinished())
+            entry->finish(std::make_exception_ptr(Exception(
+                ErrorCodes::TIMEOUT_EXCEEDED,
+                "Wait for async insert timeout exceeded)")));
+    }
+}
+
+void AsynchronousInsertQueue::scheduleDataProcessingJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context)
+{
+    /// Wrap 'unique_ptr' with 'shared_ptr' to make this
+    /// lambda copyable and allow to save it to the thread pool.
+    pool.scheduleOrThrowOnError([=, data = std::make_shared<InsertDataPtr>(std::move(data))]
+    {
+        processData(std::move(key), std::move(*data), std::move(global_context));
+    });
+}
+
+void AsynchronousInsertQueue::push(ASTPtr query, ContextPtr query_context)
+{
+    query = query->clone();
+    const auto & settings = query_context->getSettingsRef();
+    auto & insert_query = query->as<ASTInsertQuery &>();
+
+    InterpreterInsertQuery interpreter(query, query_context, settings.insert_allow_materialized_columns);
+    auto table = interpreter.getTable(insert_query);
+    auto sample_block = interpreter.getSampleBlock(insert_query, table, table->getInMemoryMetadataPtr());
+
+    if (!FormatFactory::instance().isInputFormat(insert_query.format))
+        throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown input format {}", insert_query.format);
+
+    query_context->checkAccess(AccessType::INSERT, insert_query.table_id, sample_block.getNames());
+
+    String bytes;
+    {
+        auto read_buf = getReadBufferFromASTInsertQuery(query);
+        WriteBufferFromString write_buf(bytes);
+        copyData(*read_buf, write_buf);
+    }
+
+    auto entry = std::make_shared<InsertData::Entry>(std::move(bytes), query_context->getCurrentQueryId());
+    InsertQuery key{query, settings};
+
+    {
+        /// Firstly try to get entry from queue without exclusive lock.
+        std::shared_lock read_lock(rwlock);
+        if (auto it = queue.find(key); it != queue.end())
+        {
+            pushImpl(std::move(entry), it);
+            return;
+        }
+    }
+
+    std::unique_lock write_lock(rwlock);
+    auto it = queue.emplace(key, std::make_shared<Container>()).first;
+    pushImpl(std::move(entry), it);
+}
+
+void AsynchronousInsertQueue::pushImpl(InsertData::EntryPtr entry, QueueIterator it)
+{
+    auto & [data_mutex, data] = *it->second;
+    std::lock_guard data_lock(data_mutex);
+
+    if (!data)
+        data = std::make_unique<InsertData>();
+
+    data->size += entry->bytes.size();
+    data->last_update = std::chrono::steady_clock::now();
+    data->entries.emplace_back(entry);
+
+    {
+        std::lock_guard currently_processing_lock(currently_processing_mutex);
+        currently_processing_queries.emplace(entry->query_id, entry);
+    }
+
+    LOG_TRACE(log, "Have {} pending inserts with total {} bytes of data for query '{}'",
+        data->entries.size(), data->size, queryToString(it->first.query));
+
+    if (data->size > max_data_size)
+        scheduleDataProcessingJob(it->first, std::move(data), getContext());
+}
+
+void AsynchronousInsertQueue::waitForProcessingQuery(const String & query_id, const Milliseconds & timeout)
+{
+    InsertData::EntryPtr entry;
+
+    {
+        std::lock_guard lock(currently_processing_mutex);
+        auto it = currently_processing_queries.find(query_id);
+        if (it == currently_processing_queries.end())
+            return;
+
+        entry = it->second;
+    }
+
+    bool finished = entry->wait(timeout);
+
+    if (!finished)
+        throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Wait for async insert timeout ({} ms) exceeded)", timeout.count());
+
+    if (auto exception = entry->getException())
+        std::rethrow_exception(exception);
+}
+
+void AsynchronousInsertQueue::busyCheck()
+{
+    auto timeout = busy_timeout;
+
+    while (!shutdown)
+    {
+        std::this_thread::sleep_for(timeout);
+
+        /// TODO: use priority queue instead of raw unsorted queue.
+        timeout = busy_timeout;
+        std::shared_lock read_lock(rwlock);
+
+        for (auto & [key, elem] : queue)
+        {
+            std::lock_guard data_lock(elem->mutex);
+            if (!elem->data)
+                continue;
+
+            auto lag = std::chrono::steady_clock::now() - elem->data->first_update;
+            if (lag >= busy_timeout)
+                scheduleDataProcessingJob(key, std::move(elem->data), getContext());
+            else
+                timeout = std::min(timeout, std::chrono::ceil<std::chrono::milliseconds>(busy_timeout - lag));
+        }
+    }
+}
+
+void AsynchronousInsertQueue::staleCheck()
+{
+    while (!shutdown)
+    {
+        std::this_thread::sleep_for(stale_timeout);
+        std::shared_lock read_lock(rwlock);
+
+        for (auto & [key, elem] : queue)
+        {
+            std::lock_guard data_lock(elem->mutex);
+            if (!elem->data)
+                continue;
+
+            auto lag = std::chrono::steady_clock::now() - elem->data->last_update;
+            if (lag >= stale_timeout)
+                scheduleDataProcessingJob(key, std::move(elem->data), getContext());
+        }
+    }
+}
+
+void AsynchronousInsertQueue::cleanup()
+{
+    /// Do not run cleanup too often,
+    /// because it holds exclusive lock.
+    auto timeout = busy_timeout * 5;
+
+    while (!shutdown)
+    {
+        std::this_thread::sleep_for(timeout);
+        std::vector<InsertQuery> keys_to_remove;
+
+        {
+            std::shared_lock read_lock(rwlock);
+
+            for (auto & [key, elem] : queue)
+            {
+                std::lock_guard data_lock(elem->mutex);
+                if (!elem->data)
+                    keys_to_remove.push_back(key);
+            }
+        }
+
+        if (!keys_to_remove.empty())
+        {
+            std::unique_lock write_lock(rwlock);
+            size_t total_removed = 0;
+
+            for (const auto & key : keys_to_remove)
+            {
+                auto it = queue.find(key);
+                if (it != queue.end() && !it->second->data)
+                {
+                    queue.erase(it);
+                    ++total_removed;
+                }
+            }
+
+            if (total_removed)
+                LOG_TRACE(log, "Removed stale entries for {} queries from asynchronous insertion queue", total_removed);
+        }
+
+        {
+            std::vector<String> ids_to_remove;
+            std::lock_guard lock(currently_processing_mutex);
+
+            for (const auto & [query_id, entry] : currently_processing_queries)
+                if (entry->isFinished())
+                    ids_to_remove.push_back(query_id);
+
+            if (!ids_to_remove.empty())
+            {
+                for (const auto & id : ids_to_remove)
+                    currently_processing_queries.erase(id);
+
+                LOG_TRACE(log, "Removed {} finished entries from asynchronous insertion queue", ids_to_remove.size());
+            }
+        }
+    }
+}
+
+// static
+void AsynchronousInsertQueue::processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context)
+try
+{
+    if (!data)
+        return;
+
+    const auto * log = &Poco::Logger::get("AsynchronousInsertQueue");
+    const auto & insert_query = assert_cast<const ASTInsertQuery &>(*key.query);
+    auto insert_context = Context::createCopy(global_context);
+
+    /// 'resetParser' doesn't work for parallel parsing.
+    key.settings.set("input_format_parallel_parsing", false);
+    insert_context->makeQueryContext();
+    insert_context->setSettings(key.settings);
+
+    /// Set initial_query_id, because it's used in InterpreterInsertQuery for table lock.
+    insert_context->getClientInfo().query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
+    insert_context->setCurrentQueryId("");
+
+    InterpreterInsertQuery interpreter(key.query, insert_context, key.settings.insert_allow_materialized_columns, false, false, true);
+    auto pipeline = interpreter.execute().pipeline;
+    assert(pipeline.pushing());
+
+    auto header = pipeline.getHeader();
+    auto format = getInputFormatFromASTInsertQuery(key.query, false, header, insert_context, nullptr);
+
+    size_t total_rows = 0;
+    InsertData::EntryPtr current_entry;
+
+    auto on_error = [&](const MutableColumns & result_columns, Exception & e)
+    {
+        LOG_ERROR(log, "Failed parsing for query '{}' with query id {}. {}",
+            queryToString(key.query), current_entry->query_id, e.displayText());
+
+        for (const auto & column : result_columns)
+            if (column->size() > total_rows)
+                column->popBack(column->size() - total_rows);
+
+        current_entry->finish(std::current_exception());
+        return 0;
+    };
+
+    std::shared_ptr<ISimpleTransform> adding_defaults_transform;
+    if (insert_context->getSettingsRef().input_format_defaults_for_omitted_fields)
+    {
+        StoragePtr storage = DatabaseCatalog::instance().getTable(insert_query.table_id, insert_context);
+        auto metadata_snapshot = storage->getInMemoryMetadataPtr();
+        const auto & columns = metadata_snapshot->getColumns();
+        if (columns.hasDefaults())
+            adding_defaults_transform = std::make_shared<AddingDefaultsTransform>(header, columns, *format, insert_context);
+    }
+
+    StreamingFormatExecutor executor(header, format, std::move(on_error), std::move(adding_defaults_transform));
+    std::unique_ptr<ReadBuffer> last_buffer;
+    for (const auto & entry : data->entries)
+    {
+        auto buffer = std::make_unique<ReadBufferFromString>(entry->bytes);
+        current_entry = entry;
+        total_rows += executor.execute(*buffer);
+
+        /// Keep buffer, because it still can be used
+        /// in destructor, while resetting buffer at next iteration.
+        last_buffer = std::move(buffer);
+    }
+
+    format->addBuffer(std::move(last_buffer));
+
+    auto chunk = Chunk(executor.getResultColumns(), total_rows);
+    size_t total_bytes = chunk.bytes();
+
+    auto source = std::make_shared<SourceFromSingleChunk>(header, std::move(chunk));
+    pipeline.complete(Pipe(std::move(source)));
+
+    CompletedPipelineExecutor completed_executor(pipeline);
+    completed_executor.execute();
+
+    LOG_INFO(log, "Flushed {} rows, {} bytes for query '{}'",
+        total_rows, total_bytes, queryToString(key.query));
+
+    for (const auto & entry : data->entries)
+        if (!entry->isFinished())
+            entry->finish();
+}
+catch (const Exception & e)
+{
+    finishWithException(key.query, data->entries, e);
+}
+catch (const Poco::Exception & e)
+{
+    finishWithException(key.query, data->entries, e);
+}
+catch (const std::exception & e)
+{
+    finishWithException(key.query, data->entries, e);
+}
+catch (...)
+{
+    finishWithException(key.query, data->entries, Exception(ErrorCodes::UNKNOWN_EXCEPTION, "Unknown exception"));
+}
+
+template <typename E>
+void AsynchronousInsertQueue::finishWithException(
+    const ASTPtr & query, const std::list<InsertData::EntryPtr> & entries, const E & exception)
+{
+    tryLogCurrentException("AsynchronousInsertQueue", fmt::format("Failed insertion for query '{}'", queryToString(query)));
+
+    for (const auto & entry : entries)
+    {
+        if (!entry->isFinished())
+        {
+            /// Make a copy of exception to avoid concurrent usage of
+            /// one exception object from several threads.
+            entry->finish(std::make_exception_ptr(exception));
+        }
+    }
+}
+
+}
diff --git a/src/Interpreters/AsynchronousInsertQueue.h b/src/Interpreters/AsynchronousInsertQueue.h
new file mode 100644
index 00000000000..1dd2ad216aa
--- /dev/null
+++ b/src/Interpreters/AsynchronousInsertQueue.h
@@ -0,0 +1,148 @@
+#pragma once
+
+#include <Parsers/IAST_fwd.h>
+#include <Common/RWLock.h>
+#include <Common/ThreadPool.h>
+#include <Core/Settings.h>
+#include <Poco/Logger.h>
+
+#include <unordered_map>
+
+
+namespace DB
+{
+
+/// A queue, that stores data for insert queries and periodically flushes it to tables.
+/// The data is grouped by table, format and settings of insert query.
+class AsynchronousInsertQueue : public WithContext
+{
+public:
+    using Milliseconds = std::chrono::milliseconds;
+
+    /// Using structure to allow and benefit from designated initialization and not mess with a positional arguments in ctor.
+    struct Timeout
+    {
+        Milliseconds busy;
+        Milliseconds stale;
+    };
+
+    AsynchronousInsertQueue(ContextPtr context_, size_t pool_size, size_t max_data_size, const Timeout & timeouts);
+    ~AsynchronousInsertQueue();
+
+    void push(ASTPtr query, ContextPtr query_context);
+    void waitForProcessingQuery(const String & query_id, const Milliseconds & timeout);
+
+private:
+
+    struct InsertQuery
+    {
+        ASTPtr query;
+        Settings settings;
+
+        InsertQuery(const ASTPtr & query_, const Settings & settings_);
+        InsertQuery(const InsertQuery & other);
+        InsertQuery & operator=(const InsertQuery & other);
+
+        bool operator==(const InsertQuery & other) const;
+        struct Hash { UInt64 operator()(const InsertQuery & insert_query) const; };
+    };
+
+    struct InsertData
+    {
+        struct Entry
+        {
+        public:
+            const String bytes;
+            const String query_id;
+
+            Entry(String && bytes_, String && query_id_);
+
+            void finish(std::exception_ptr exception_ = nullptr);
+            bool wait(const Milliseconds & timeout) const;
+            bool isFinished() const;
+            std::exception_ptr getException() const;
+
+        private:
+            mutable std::mutex mutex;
+            mutable std::condition_variable cv;
+
+            bool finished = false;
+            std::exception_ptr exception;
+        };
+
+        using EntryPtr = std::shared_ptr<Entry>;
+
+        std::list<EntryPtr> entries;
+        size_t size = 0;
+
+        /// Timestamp of the first insert into queue, or after the last queue dump.
+        /// Used to detect for how long the queue is active, so we can dump it by timer.
+        std::chrono::time_point<std::chrono::steady_clock> first_update = std::chrono::steady_clock::now();
+
+        /// Timestamp of the last insert into queue.
+        /// Used to detect for how long the queue is stale, so we can dump it by another timer.
+        std::chrono::time_point<std::chrono::steady_clock> last_update;
+    };
+
+    using InsertDataPtr = std::unique_ptr<InsertData>;
+
+    /// A separate container, that holds a data and a mutex for it.
+    /// When it's needed to process current chunk of data, it can be moved for processing
+    /// and new data can be recreated without holding a lock during processing.
+    struct Container
+    {
+        std::mutex mutex;
+        InsertDataPtr data;
+    };
+
+    using Queue = std::unordered_map<InsertQuery, std::shared_ptr<Container>, InsertQuery::Hash>;
+    using QueueIterator = Queue::iterator;
+
+    mutable std::shared_mutex rwlock;
+    Queue queue;
+
+    using QueryIdToEntry = std::unordered_map<String, InsertData::EntryPtr>;
+    mutable std::mutex currently_processing_mutex;
+    QueryIdToEntry currently_processing_queries;
+
+    /// Logic and events behind queue are as follows:
+    ///  - busy_timeout:   if queue is active for too long and there are a lot of rapid inserts, then we dump the data, so it doesn't
+    ///                    grow for a long period of time and users will be able to select new data in deterministic manner.
+    ///  - stale_timeout:  if queue is stale for too long, then we dump the data too, so that users will be able to select the last
+    ///                    piece of inserted data.
+    ///  - max_data_size:  if the maximum size of data is reached, then again we dump the data.
+
+    const size_t max_data_size;  /// in bytes
+    const Milliseconds busy_timeout;
+    const Milliseconds stale_timeout;
+
+    std::atomic<bool> shutdown{false};
+    ThreadPool pool;  /// dump the data only inside this pool.
+    ThreadFromGlobalPool dump_by_first_update_thread;  /// uses busy_timeout and busyCheck()
+    ThreadFromGlobalPool dump_by_last_update_thread;   /// uses stale_timeout and staleCheck()
+    ThreadFromGlobalPool cleanup_thread;               /// uses busy_timeout and cleanup()
+
+    Poco::Logger * log = &Poco::Logger::get("AsynchronousInsertQueue");
+
+    void busyCheck();
+    void staleCheck();
+    void cleanup();
+
+    /// Should be called with shared or exclusively locked 'rwlock'.
+    void pushImpl(InsertData::EntryPtr entry, QueueIterator it);
+
+    void scheduleDataProcessingJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context);
+    static void processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context);
+
+    template <typename E>
+    static void finishWithException(const ASTPtr & query, const std::list<InsertData::EntryPtr> & entries, const E & exception);
+
+public:
+    Queue getQueue() const
+    {
+        std::shared_lock lock(rwlock);
+        return queue;
+    }
+};
+
+}
diff --git a/src/Interpreters/AsynchronousMetrics.cpp b/src/Interpreters/AsynchronousMetrics.cpp
index d708ff4f9e0..66b105970af 100644
--- a/src/Interpreters/AsynchronousMetrics.cpp
+++ b/src/Interpreters/AsynchronousMetrics.cpp
@@ -19,9 +19,7 @@
 #include <chrono>
 
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_JEMALLOC
 #    include <jemalloc/jemalloc.h>
@@ -88,6 +86,20 @@ AsynchronousMetrics::AsynchronousMetrics(
     openFileIfExists("/proc/uptime", uptime);
     openFileIfExists("/proc/net/dev", net_dev);
 
+    openSensors();
+    openBlockDevices();
+    openEDAC();
+    openSensorsChips();
+#endif
+}
+
+#if defined(OS_LINUX)
+void AsynchronousMetrics::openSensors()
+{
+    LOG_TRACE(log, "Scanning /sys/class/thermal");
+
+    thermal.clear();
+
     for (size_t thermal_device_index = 0;; ++thermal_device_index)
     {
         std::unique_ptr<ReadBufferFromFilePRead> file = openFileIfExists(fmt::format("/sys/class/thermal/thermal_zone{}/temp", thermal_device_index));
@@ -101,6 +113,71 @@ AsynchronousMetrics::AsynchronousMetrics(
         }
         thermal.emplace_back(std::move(file));
     }
+}
+
+void AsynchronousMetrics::openBlockDevices()
+{
+    LOG_TRACE(log, "Scanning /sys/block");
+
+    if (!std::filesystem::exists("/sys/block"))
+        return;
+
+    block_devices_rescan_delay.restart();
+
+    block_devs.clear();
+
+    for (const auto & device_dir : std::filesystem::directory_iterator("/sys/block"))
+    {
+        String device_name = device_dir.path().filename();
+
+        /// We are not interested in loopback devices.
+        if (device_name.starts_with("loop"))
+            continue;
+
+        std::unique_ptr<ReadBufferFromFilePRead> file = openFileIfExists(device_dir.path() / "stat");
+        if (!file)
+            continue;
+
+        block_devs[device_name] = std::move(file);
+    }
+}
+
+void AsynchronousMetrics::openEDAC()
+{
+    LOG_TRACE(log, "Scanning /sys/devices/system/edac");
+
+    edac.clear();
+
+    for (size_t edac_index = 0;; ++edac_index)
+    {
+        String edac_correctable_file = fmt::format("/sys/devices/system/edac/mc/mc{}/ce_count", edac_index);
+        String edac_uncorrectable_file = fmt::format("/sys/devices/system/edac/mc/mc{}/ue_count", edac_index);
+
+        bool edac_correctable_file_exists = std::filesystem::exists(edac_correctable_file);
+        bool edac_uncorrectable_file_exists = std::filesystem::exists(edac_uncorrectable_file);
+
+        if (!edac_correctable_file_exists && !edac_uncorrectable_file_exists)
+        {
+            if (edac_index == 0)
+                continue;
+            else
+                break;
+        }
+
+        edac.emplace_back();
+
+        if (edac_correctable_file_exists)
+            edac.back().first = openFileIfExists(edac_correctable_file);
+        if (edac_uncorrectable_file_exists)
+            edac.back().second = openFileIfExists(edac_uncorrectable_file);
+    }
+}
+
+void AsynchronousMetrics::openSensorsChips()
+{
+    LOG_TRACE(log, "Scanning /sys/class/hwmon");
+
+    hwmon_devices.clear();
 
     for (size_t hwmon_index = 0;; ++hwmon_index)
     {
@@ -150,61 +227,6 @@ AsynchronousMetrics::AsynchronousMetrics(
             hwmon_devices[hwmon_name][sensor_name] = std::move(file);
         }
     }
-
-    for (size_t edac_index = 0;; ++edac_index)
-    {
-        String edac_correctable_file = fmt::format("/sys/devices/system/edac/mc/mc{}/ce_count", edac_index);
-        String edac_uncorrectable_file = fmt::format("/sys/devices/system/edac/mc/mc{}/ue_count", edac_index);
-
-        bool edac_correctable_file_exists = std::filesystem::exists(edac_correctable_file);
-        bool edac_uncorrectable_file_exists = std::filesystem::exists(edac_uncorrectable_file);
-
-        if (!edac_correctable_file_exists && !edac_uncorrectable_file_exists)
-        {
-            if (edac_index == 0)
-                continue;
-            else
-                break;
-        }
-
-        edac.emplace_back();
-
-        if (edac_correctable_file_exists)
-            edac.back().first = openFileIfExists(edac_correctable_file);
-        if (edac_uncorrectable_file_exists)
-            edac.back().second = openFileIfExists(edac_uncorrectable_file);
-    }
-
-    openBlockDevices();
-#endif
-}
-
-#if defined(OS_LINUX)
-void AsynchronousMetrics::openBlockDevices()
-{
-    LOG_TRACE(log, "Scanning /sys/block");
-
-    if (!std::filesystem::exists("/sys/block"))
-        return;
-
-    block_devices_rescan_delay.restart();
-
-    block_devs.clear();
-
-    for (const auto & device_dir : std::filesystem::directory_iterator("/sys/block"))
-    {
-        String device_name = device_dir.path().filename();
-
-        /// We are not interested in loopback devices.
-        if (device_name.starts_with("loop"))
-            continue;
-
-        std::unique_ptr<ReadBufferFromFilePRead> file = openFileIfExists(device_dir.path() / "stat");
-        if (!file)
-            continue;
-
-        block_devs[device_name] = std::move(file);
-    }
 }
 #endif
 
@@ -522,6 +544,22 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
         }
     }
 
+    {
+        if (auto index_mark_cache = getContext()->getIndexMarkCache())
+        {
+            new_values["IndexMarkCacheBytes"] = index_mark_cache->weight();
+            new_values["IndexMarkCacheFiles"] = index_mark_cache->count();
+        }
+    }
+
+    {
+        if (auto index_uncompressed_cache = getContext()->getIndexUncompressedCache())
+        {
+            new_values["IndexUncompressedCacheBytes"] = index_uncompressed_cache->weight();
+            new_values["IndexUncompressedCacheCells"] = index_uncompressed_cache->count();
+        }
+    }
+
     {
         if (auto mmap_cache = getContext()->getMMappedFileCache())
         {
@@ -779,43 +817,60 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
 
                 uint64_t kb = 0;
                 readText(kb, *meminfo);
-                if (kb)
+
+                if (!kb)
                 {
-                    skipWhitespaceIfAny(*meminfo, true);
-                    assertString("kB", *meminfo);
+                    skipToNextLineOrEOF(*meminfo);
+                    continue;
+                }
 
-                    uint64_t bytes = kb * 1024;
+                skipWhitespaceIfAny(*meminfo, true);
 
-                    if (name == "MemTotal:")
-                    {
-                        new_values["OSMemoryTotal"] = bytes;
-                    }
-                    else if (name == "MemFree:")
-                    {
-                        /// We cannot simply name this metric "Free", because it confuses users.
-                        /// See https://www.linuxatemyram.com/
-                        /// For convenience we also provide OSMemoryFreePlusCached, that should be somewhat similar to OSMemoryAvailable.
+                /**
+                 * Not all entries in /proc/meminfo contain the kB suffix, e.g.
+                 * HugePages_Total:       0
+                 * HugePages_Free:        0
+                 * We simply skip such entries as they're not needed
+                 */
+                if (*meminfo->position() == '\n')
+                {
+                    skipToNextLineOrEOF(*meminfo);
+                    continue;
+                }
 
-                        free_plus_cached_bytes += bytes;
-                        new_values["OSMemoryFreeWithoutCached"] = bytes;
-                    }
-                    else if (name == "MemAvailable:")
-                    {
-                        new_values["OSMemoryAvailable"] = bytes;
-                    }
-                    else if (name == "Buffers:")
-                    {
-                        new_values["OSMemoryBuffers"] = bytes;
-                    }
-                    else if (name == "Cached:")
-                    {
-                        free_plus_cached_bytes += bytes;
-                        new_values["OSMemoryCached"] = bytes;
-                    }
-                    else if (name == "SwapCached:")
-                    {
-                        new_values["OSMemorySwapCached"] = bytes;
-                    }
+                assertString("kB", *meminfo);
+
+                uint64_t bytes = kb * 1024;
+
+                if (name == "MemTotal:")
+                {
+                    new_values["OSMemoryTotal"] = bytes;
+                }
+                else if (name == "MemFree:")
+                {
+                    /// We cannot simply name this metric "Free", because it confuses users.
+                    /// See https://www.linuxatemyram.com/
+                    /// For convenience we also provide OSMemoryFreePlusCached, that should be somewhat similar to OSMemoryAvailable.
+
+                    free_plus_cached_bytes += bytes;
+                    new_values["OSMemoryFreeWithoutCached"] = bytes;
+                }
+                else if (name == "MemAvailable:")
+                {
+                    new_values["OSMemoryAvailable"] = bytes;
+                }
+                else if (name == "Buffers:")
+                {
+                    new_values["OSMemoryBuffers"] = bytes;
+                }
+                else if (name == "Cached:")
+                {
+                    free_plus_cached_bytes += bytes;
+                    new_values["OSMemoryCached"] = bytes;
+                }
+                else if (name == "SwapCached:")
+                {
+                    new_values["OSMemorySwapCached"] = bytes;
                 }
 
                 skipToNextLineOrEOF(*meminfo);
@@ -896,9 +951,9 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
     if (block_devices_rescan_delay.elapsedSeconds() >= 300)
         openBlockDevices();
 
-    for (auto & [name, device] : block_devs)
+    try
     {
-        try
+        for (auto & [name, device] : block_devs)
         {
             device->rewind();
 
@@ -947,18 +1002,19 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
                 new_values["BlockQueueTimePerOp_" + name] = delta_values.time_in_queue * time_multiplier / delta_values.in_flight_ios;
             }
         }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+
+        /// Try to reopen block devices in case of error
+        /// (i.e. ENOENT means that some disk had been replaced, and it may apperas with a new name)
+        try
+        {
+            openBlockDevices();
+        }
         catch (...)
         {
-            /// Try to reopen block devices in case of error
-            /// (i.e. ENOENT means that some disk had been replaced, and it may apperas with a new name)
-            try
-            {
-                openBlockDevices();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
     }
@@ -1049,9 +1105,9 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
         }
     }
 
-    for (size_t i = 0, size = thermal.size(); i < size; ++i)
+    try
     {
-        try
+        for (size_t i = 0, size = thermal.size(); i < size; ++i)
         {
             ReadBufferFromFilePRead & in = *thermal[i];
 
@@ -1060,21 +1116,39 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
             readText(temperature, in);
             new_values[fmt::format("Temperature{}", i)] = temperature * 0.001;
         }
+    }
+    catch (...)
+    {
+        if (errno != ENODATA)   /// Ok for thermal sensors.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+
+        /// Files maybe re-created on module load/unload
+        try
+        {
+            openSensors();
+        }
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
     }
 
-    for (const auto & [hwmon_name, sensors] : hwmon_devices)
+    try
     {
-        try
+        for (const auto & [hwmon_name, sensors] : hwmon_devices)
         {
             for (const auto & [sensor_name, sensor_file] : sensors)
             {
                 sensor_file->rewind();
                 Int64 temperature = 0;
-                readText(temperature, *sensor_file);
+                try
+                {
+                    readText(temperature, *sensor_file);
+                }
+                catch (const ErrnoException & e)
+                {
+                    LOG_DEBUG(&Poco::Logger::get("AsynchronousMetrics"), "Hardware monitor '{}', sensor '{}' exists but could not be read, error {}.", hwmon_name, sensor_name, e.getErrno());
+                }
 
                 if (sensor_name.empty())
                     new_values[fmt::format("Temperature_{}", hwmon_name)] = temperature * 0.001;
@@ -1082,19 +1156,33 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
                     new_values[fmt::format("Temperature_{}_{}", hwmon_name, sensor_name)] = temperature * 0.001;
             }
         }
+    }
+    catch (...)
+    {
+        if (errno != ENODATA)   /// Ok for thermal sensors.
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+
+        /// Files can be re-created on:
+        /// - module load/unload
+        /// - suspend/resume cycle
+        /// So file descriptors should be reopened.
+        try
+        {
+            openSensorsChips();
+        }
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
         }
     }
 
-    for (size_t i = 0, size = edac.size(); i < size; ++i)
+    try
     {
-        /// NOTE maybe we need to take difference with previous values.
-        /// But these metrics should be exceptionally rare, so it's ok to keep them accumulated.
-
-        try
+        for (size_t i = 0, size = edac.size(); i < size; ++i)
         {
+            /// NOTE maybe we need to take difference with previous values.
+            /// But these metrics should be exceptionally rare, so it's ok to keep them accumulated.
+
             if (edac[i].first)
             {
                 ReadBufferFromFilePRead & in = *edac[i].first;
@@ -1113,6 +1201,16 @@ void AsynchronousMetrics::update(std::chrono::system_clock::time_point update_ti
                 new_values[fmt::format("EDAC{}_Uncorrectable", i)] = errors;
             }
         }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+
+        /// EDAC files can be re-created on module load/unload
+        try
+        {
+            openEDAC();
+        }
         catch (...)
         {
             tryLogCurrentException(__PRETTY_FUNCTION__);
diff --git a/src/Interpreters/AsynchronousMetrics.h b/src/Interpreters/AsynchronousMetrics.h
index c8677ac3ced..7a5c2d638d7 100644
--- a/src/Interpreters/AsynchronousMetrics.h
+++ b/src/Interpreters/AsynchronousMetrics.h
@@ -41,9 +41,6 @@ using AsynchronousMetricValues = std::unordered_map<std::string, AsynchronousMet
 class AsynchronousMetrics : WithContext
 {
 public:
-    /// The default value of update_period_seconds is for ClickHouse-over-YT
-    /// in Arcadia -- it uses its own server implementation that also uses these
-    /// metrics.
     AsynchronousMetrics(
         ContextPtr global_context_,
         int update_period_seconds,
@@ -58,18 +55,6 @@ public:
     /// Returns copy of all values.
     AsynchronousMetricValues getValues() const;
 
-#if defined(ARCADIA_BUILD)
-    /// This constructor needs only to provide backward compatibility with some other projects (hello, Arcadia).
-    /// Never use this in the ClickHouse codebase.
-    AsynchronousMetrics(
-        ContextPtr global_context_,
-        int update_period_seconds = 60)
-        : WithContext(global_context_)
-        , update_period(update_period_seconds)
-    {
-    }
-#endif
-
 private:
     const std::chrono::seconds update_period;
     std::shared_ptr<std::vector<ProtocolServerAdapter>> servers_to_start_before_tables{nullptr};
@@ -183,7 +168,10 @@ private:
 
     Stopwatch block_devices_rescan_delay;
 
+    void openSensors();
     void openBlockDevices();
+    void openSensorsChips();
+    void openEDAC();
 #endif
 
     std::unique_ptr<ThreadFromGlobalPool> thread;
diff --git a/src/Interpreters/BloomFilter.h b/src/Interpreters/BloomFilter.h
index ccfb35bd68f..279ab6947ec 100644
--- a/src/Interpreters/BloomFilter.h
+++ b/src/Interpreters/BloomFilter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Field.h>
 #include <Common/PODArray.h>
 #include <Common/Allocator.h>
diff --git a/src/Interpreters/BloomFilterHash.h b/src/Interpreters/BloomFilterHash.h
index 8a891ff1dfe..31532cc888a 100644
--- a/src/Interpreters/BloomFilterHash.h
+++ b/src/Interpreters/BloomFilterHash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Common/HashTable/Hash.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnArray.h>
diff --git a/src/Interpreters/CMakeLists.txt b/src/Interpreters/CMakeLists.txt
index 1068fee4cea..3f3c58ef63d 100644
--- a/src/Interpreters/CMakeLists.txt
+++ b/src/Interpreters/CMakeLists.txt
@@ -4,4 +4,8 @@ endif()
 
 if (ENABLE_EXAMPLES)
     add_subdirectory(examples)
-endif()
\ No newline at end of file
+endif()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/Interpreters/CatBoostModel.h b/src/Interpreters/CatBoostModel.h
index 820c26a1fb4..eb599b43ef2 100644
--- a/src/Interpreters/CatBoostModel.h
+++ b/src/Interpreters/CatBoostModel.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Interpreters/IExternalLoadable.h>
 #include <Columns/IColumn.h>
 #include <Columns/ColumnsNumber.h>
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index c8b945ef9b5..79956aaebed 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -3,13 +3,11 @@
 #include <IO/WriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <Core/Defines.h>
-#include <common/getFQDNOrHostName.h>
+#include <Core/ProtocolDefines.h>
+#include <base/getFQDNOrHostName.h>
 #include <unistd.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 
 namespace DB
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index 7c169e6ebb5..d42c34f07e2 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -2,7 +2,7 @@
 
 #include <Core/UUID.h>
 #include <Poco/Net/SocketAddress.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/OpenTelemetryTraceContext.h>
 
 namespace DB
@@ -28,13 +28,16 @@ public:
         GRPC = 3,
         MYSQL = 4,
         POSTGRESQL = 5,
+        LOCAL = 6,
+        TCP_INTERSERVER = 7,
     };
 
     enum class HTTPMethod : uint8_t
     {
         UNKNOWN = 0,
-        GET = 1,
-        POST = 2,
+        GET     = 1,
+        POST    = 2,
+        OPTIONS = 3
     };
 
     enum class QueryKind : uint8_t
@@ -52,11 +55,6 @@ public:
     String current_query_id;
     Poco::Net::SocketAddress current_address;
 
-#if defined(ARCADIA_BUILD)
-    /// This field is only used in foreign "Arcadia" build.
-    String current_password;
-#endif
-
     /// When query_kind == INITIAL_QUERY, these values are equal to current.
     String initial_user;
     String initial_query_id;
@@ -81,6 +79,14 @@ public:
     UInt64 client_version_patch = 0;
     unsigned client_tcp_protocol_version = 0;
 
+    /// In case of distributed query, client info for query is actually a client info of client.
+    /// In order to get a version of server-initiator, use connection_ values.
+    /// Also for tcp only.
+    UInt64 connection_client_version_major = 0;
+    UInt64 connection_client_version_minor = 0;
+    UInt64 connection_client_version_patch = 0;
+    unsigned connection_tcp_protocol_version = 0;
+
     /// For http
     HTTPMethod http_method = HTTPMethod::UNKNOWN;
     String http_user_agent;
diff --git a/src/Interpreters/Cluster.cpp b/src/Interpreters/Cluster.cpp
index 1a7554a8c27..30d0dd4cece 100644
--- a/src/Interpreters/Cluster.cpp
+++ b/src/Interpreters/Cluster.cpp
@@ -1,5 +1,4 @@
 #include <Interpreters/Cluster.h>
-#include <common/SimpleCache.h>
 #include <Common/DNSResolver.h>
 #include <Common/escapeForFileName.h>
 #include <Common/isLocalAddress.h>
@@ -11,7 +10,7 @@
 #include <IO/ReadHelpers.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/erase.hpp>
 
 namespace DB
diff --git a/src/Interpreters/Cluster.h b/src/Interpreters/Cluster.h
index a77eb3983dc..ec78abf574c 100644
--- a/src/Interpreters/Cluster.h
+++ b/src/Interpreters/Cluster.h
@@ -85,7 +85,7 @@ public:
         */
 
         String host_name;
-        UInt16 port;
+        UInt16 port{0};
         String user;
         String password;
 
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index 961de45c491..b644f2936d9 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -9,7 +9,7 @@
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index 95b279fd59b..0db07267231 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -6,7 +6,7 @@
 #include <Interpreters/IInterpreter.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromRemote.h>
 #include <Processors/QueryPlan/UnionStep.h>
diff --git a/src/Interpreters/ColumnAliasesVisitor.cpp b/src/Interpreters/ColumnAliasesVisitor.cpp
index 9b7e0a91c18..43a6c4d4cf1 100644
--- a/src/Interpreters/ColumnAliasesVisitor.cpp
+++ b/src/Interpreters/ColumnAliasesVisitor.cpp
@@ -3,7 +3,6 @@
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Interpreters/addTypeConversionToAST.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTAlterQuery.h>
@@ -14,8 +13,11 @@
 namespace DB
 {
 
-bool ColumnAliasesMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &)
+bool ColumnAliasesMatcher::needChildVisit(const ASTPtr & node, const ASTPtr &, const Data & data)
 {
+    if (data.excluded_nodes.contains(node.get()))
+        return false;
+
     if (const auto * f = node->as<ASTFunction>())
     {
         /// "lambda" visits children itself.
diff --git a/src/Interpreters/ColumnAliasesVisitor.h b/src/Interpreters/ColumnAliasesVisitor.h
index 9be83d83d49..b593842e133 100644
--- a/src/Interpreters/ColumnAliasesVisitor.h
+++ b/src/Interpreters/ColumnAliasesVisitor.h
@@ -46,7 +46,7 @@ using DataTypePtr = std::shared_ptr<const IDataType>;
 class ColumnAliasesMatcher
 {
 public:
-    using Visitor = InDepthNodeVisitor<ColumnAliasesMatcher, false>;
+    using Visitor = InDepthNodeVisitor<ColumnAliasesMatcher, false, true>;
 
     struct Data
     {
@@ -57,14 +57,16 @@ public:
         NameSet array_join_source_columns;
         ContextPtr context;
 
+        const std::unordered_set<IAST *> & excluded_nodes;
+
         /// private_aliases are from lambda, so these are local names.
         NameSet private_aliases;
 
         /// Check if query is changed by this visitor.
         bool changed = false;
 
-        Data(const ColumnsDescription & columns_, const NameToNameMap & array_join_result_columns_, ContextPtr context_)
-            : columns(columns_), context(context_)
+        Data(const ColumnsDescription & columns_, const NameToNameMap & array_join_result_columns_, ContextPtr context_, const std::unordered_set<IAST *> & excluded_nodes_)
+            : columns(columns_), context(context_), excluded_nodes(excluded_nodes_)
         {
             for (const auto & [result, source] : array_join_result_columns_)
             {
@@ -75,7 +77,7 @@ public:
     };
 
     static void visit(ASTPtr & ast, Data & data);
-    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child);
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child, const Data & data);
 
 private:
     static void visit(ASTIdentifier & node, ASTPtr & ast, Data & data);
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index 69c986d88c3..eb2642e1838 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -14,11 +14,11 @@
 #include <Common/Throttler.h>
 #include <Common/thread_local_rng.h>
 #include <Common/FieldVisitorToString.h>
-#include <Coordination/KeeperStorageDispatcher.h>
+#include <Common/getMultipleKeysFromConfig.h>
+#include <Coordination/KeeperDispatcher.h>
 #include <Compression/ICompressionCodec.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Formats/FormatFactory.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage.h>
 #include <Storages/MarkCache.h>
@@ -46,9 +46,11 @@
 #include <Access/SettingsConstraintsAndProfileIDs.h>
 #include <Access/ExternalAuthenticators.h>
 #include <Access/GSSAcceptor.h>
+#include <Backups/BackupFactory.h>
 #include <Dictionaries/Embedded/GeoDictionariesLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h>
 #include <Interpreters/ExternalModelsLoader.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ProcessList.h>
@@ -56,9 +58,11 @@
 #include <Interpreters/Cluster.h>
 #include <Interpreters/InterserverIOHandler.h>
 #include <Interpreters/SystemLog.h>
+#include <Interpreters/SessionLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DDLWorker.h>
 #include <Interpreters/DDLTask.h>
+#include <Interpreters/Session.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/UncompressedCache.h>
 #include <IO/MMappedFileCache.h>
@@ -71,11 +75,14 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ShellCommand.h>
 #include <Common/TraceCollector.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
+#include <base/EnumReflection.h>
 #include <Common/RemoteHostFilter.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 #include <Interpreters/SynonymsExtensions.h>
 #include <Interpreters/Lemmatizers.h>
@@ -98,9 +105,16 @@ namespace CurrentMetrics
     extern const Metric BackgroundBufferFlushSchedulePoolTask;
     extern const Metric BackgroundDistributedSchedulePoolTask;
     extern const Metric BackgroundMessageBrokerSchedulePoolTask;
-}
 
 
+    extern const Metric DelayedInserts;
+    extern const Metric BackgroundMergesAndMutationsPoolTask;
+    extern const Metric BackgroundMovePoolTask;
+    extern const Metric BackgroundFetchesPoolTask;
+    extern const Metric BackgroundCommonPoolTask;
+
+}
+
 namespace DB
 {
 
@@ -115,186 +129,9 @@ namespace ErrorCodes
     extern const int THERE_IS_NO_QUERY;
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int TABLE_SIZE_EXCEEDS_MAX_DROP_SIZE_LIMIT;
-    extern const int SESSION_NOT_FOUND;
-    extern const int SESSION_IS_LOCKED;
     extern const int LOGICAL_ERROR;
-    extern const int NOT_IMPLEMENTED;
-}
-
-
-class NamedSessions
-{
-public:
-    using Key = NamedSessionKey;
-
-    ~NamedSessions()
-    {
-        try
-        {
-            {
-                std::lock_guard lock{mutex};
-                quit = true;
-            }
-
-            cond.notify_one();
-            thread.join();
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-
-    /// Find existing session or create a new.
-    std::shared_ptr<NamedSession> acquireSession(
-        const String & session_id,
-        ContextMutablePtr context,
-        std::chrono::steady_clock::duration timeout,
-        bool throw_if_not_found)
-    {
-        std::unique_lock lock(mutex);
-
-        auto & user_name = context->client_info.current_user;
-
-        if (user_name.empty())
-            throw Exception("Empty user name.", ErrorCodes::LOGICAL_ERROR);
-
-        Key key(user_name, session_id);
-
-        auto it = sessions.find(key);
-        if (it == sessions.end())
-        {
-            if (throw_if_not_found)
-                throw Exception("Session not found.", ErrorCodes::SESSION_NOT_FOUND);
-
-            /// Create a new session from current context.
-            it = sessions.insert(std::make_pair(key, std::make_shared<NamedSession>(key, context, timeout, *this))).first;
-        }
-        else if (it->second->key.first != context->client_info.current_user)
-        {
-            throw Exception("Session belongs to a different user", ErrorCodes::SESSION_IS_LOCKED);
-        }
-
-        /// Use existing session.
-        const auto & session = it->second;
-
-        if (!session.unique())
-            throw Exception("Session is locked by a concurrent client.", ErrorCodes::SESSION_IS_LOCKED);
-
-        session->context->client_info = context->client_info;
-
-        return session;
-    }
-
-    void releaseSession(NamedSession & session)
-    {
-        std::unique_lock lock(mutex);
-        scheduleCloseSession(session, lock);
-    }
-
-private:
-    class SessionKeyHash
-    {
-    public:
-        size_t operator()(const Key & key) const
-        {
-            SipHash hash;
-            hash.update(key.first);
-            hash.update(key.second);
-            return hash.get64();
-        }
-    };
-
-    /// TODO it's very complicated. Make simple std::map with time_t or boost::multi_index.
-    using Container = std::unordered_map<Key, std::shared_ptr<NamedSession>, SessionKeyHash>;
-    using CloseTimes = std::deque<std::vector<Key>>;
-    Container sessions;
-    CloseTimes close_times;
-    std::chrono::steady_clock::duration close_interval = std::chrono::seconds(1);
-    std::chrono::steady_clock::time_point close_cycle_time = std::chrono::steady_clock::now();
-    UInt64 close_cycle = 0;
-
-    void scheduleCloseSession(NamedSession & session, std::unique_lock<std::mutex> &)
-    {
-        /// Push it on a queue of sessions to close, on a position corresponding to the timeout.
-        /// (timeout is measured from current moment of time)
-
-        const UInt64 close_index = session.timeout / close_interval + 1;
-        const auto new_close_cycle = close_cycle + close_index;
-
-        if (session.close_cycle != new_close_cycle)
-        {
-            session.close_cycle = new_close_cycle;
-            if (close_times.size() < close_index + 1)
-                close_times.resize(close_index + 1);
-            close_times[close_index].emplace_back(session.key);
-        }
-    }
-
-    void cleanThread()
-    {
-        setThreadName("SessionCleaner");
-        std::unique_lock lock{mutex};
-
-        while (true)
-        {
-            auto interval = closeSessions(lock);
-
-            if (cond.wait_for(lock, interval, [this]() -> bool { return quit; }))
-                break;
-        }
-    }
-
-    /// Close sessions, that has been expired. Returns how long to wait for next session to be expired, if no new sessions will be added.
-    std::chrono::steady_clock::duration closeSessions(std::unique_lock<std::mutex> & lock)
-    {
-        const auto now = std::chrono::steady_clock::now();
-
-        /// The time to close the next session did not come
-        if (now < close_cycle_time)
-            return close_cycle_time - now;  /// Will sleep until it comes.
-
-        const auto current_cycle = close_cycle;
-
-        ++close_cycle;
-        close_cycle_time = now + close_interval;
-
-        if (close_times.empty())
-            return close_interval;
-
-        auto & sessions_to_close = close_times.front();
-
-        for (const auto & key : sessions_to_close)
-        {
-            const auto session = sessions.find(key);
-
-            if (session != sessions.end() && session->second->close_cycle <= current_cycle)
-            {
-                if (!session->second.unique())
-                {
-                    /// Skip but move it to close on the next cycle.
-                    session->second->timeout = std::chrono::steady_clock::duration{0};
-                    scheduleCloseSession(*session->second, lock);
-                }
-                else
-                    sessions.erase(session);
-            }
-        }
-
-        close_times.pop_front();
-        return close_interval;
-    }
-
-    std::mutex mutex;
-    std::condition_variable cond;
-    std::atomic<bool> quit{false};
-    ThreadFromGlobalPool thread{&NamedSessions::cleanThread, this};
-};
-
-
-void NamedSession::release()
-{
-    parent.releaseSession(*this);
+    extern const int INVALID_SETTING_VALUE;
+    extern const int UNKNOWN_READ_METHOD;
 }
 
 
@@ -310,6 +147,7 @@ struct ContextSharedPart
     /// Separate mutex for access of dictionaries. Separate mutex to avoid locks when server doing request to itself.
     mutable std::mutex embedded_dictionaries_mutex;
     mutable std::mutex external_dictionaries_mutex;
+    mutable std::mutex external_user_defined_executable_functions_mutex;
     mutable std::mutex external_models_mutex;
     /// Separate mutex for storage policies. During server startup we may
     /// initialize some important storages (system logs with MergeTree engine)
@@ -322,8 +160,8 @@ struct ContextSharedPart
     ConfigurationPtr zookeeper_config;                      /// Stores zookeeper configs
 
 #if USE_NURAFT
-    mutable std::mutex keeper_storage_dispatcher_mutex;
-    mutable std::shared_ptr<KeeperStorageDispatcher> keeper_storage_dispatcher;
+    mutable std::mutex keeper_dispatcher_mutex;
+    mutable std::shared_ptr<KeeperDispatcher> keeper_dispatcher;
 #endif
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers;    /// Map for auxiliary ZooKeeper clients.
@@ -338,19 +176,28 @@ struct ContextSharedPart
     String flags_path;                                      /// Path to the directory with some control flags for server maintenance.
     String user_files_path;                                 /// Path to the directory with user provided files, usable by 'file' table function.
     String dictionaries_lib_path;                           /// Path to the directory with user provided binaries and libraries for external dictionaries.
+    String user_scripts_path;                               /// Path to the directory with user provided scripts.
     ConfigurationPtr config;                                /// Global configuration settings.
 
     String tmp_path;                                        /// Path to the temporary files that occur when processing the request.
     mutable VolumePtr tmp_volume;                           /// Volume for the the temporary files that occur when processing the request.
 
+    mutable VolumePtr backups_volume;                       /// Volume for all the backups.
+
     mutable std::optional<EmbeddedDictionaries> embedded_dictionaries;    /// Metrica's dictionaries. Have lazy initialization.
     mutable std::optional<ExternalDictionariesLoader> external_dictionaries_loader;
+    mutable std::optional<ExternalUserDefinedExecutableFunctionsLoader> external_user_defined_executable_functions_loader;
     mutable std::optional<ExternalModelsLoader> external_models_loader;
-    ConfigurationPtr external_models_config;
+
+    ExternalLoaderXMLConfigRepository * external_models_config_repository = nullptr;
     scope_guard models_repository_guard;
 
+    ExternalLoaderXMLConfigRepository * external_dictionaries_config_repository = nullptr;
     scope_guard dictionaries_xmls;
 
+    ExternalLoaderXMLConfigRepository * user_defined_executable_functions_config_repository = nullptr;
+    scope_guard user_defined_executable_functions_xmls;
+
 #if USE_NLP
     mutable std::optional<SynonymsExtensions> synonyms_extensions;
     mutable std::optional<Lemmatizers> lemmatizers;
@@ -359,9 +206,11 @@ struct ContextSharedPart
     String default_profile_name;                            /// Default profile name used for default values.
     String system_profile_name;                             /// Profile used by system processes
     String buffer_profile_name;                             /// Profile used by Buffer engine for flushing to the underlying
-    AccessControlManager access_control_manager;
+    std::unique_ptr<AccessControlManager> access_control_manager;
     mutable UncompressedCachePtr uncompressed_cache;        /// The cache of decompressed blocks.
     mutable MarkCachePtr mark_cache;                        /// Cache of marks in compressed files.
+    mutable UncompressedCachePtr index_uncompressed_cache;  /// The cache of decompressed blocks for MergeTree indices.
+    mutable MarkCachePtr index_mark_cache;                  /// Cache of marks in compressed files of MergeTree indices.
     mutable MMappedFileCachePtr mmap_cache; /// Cache of mmapped files to avoid frequent open/map/unmap/close and to reuse from several threads.
     ProcessList process_list;                               /// Executing queries at the moment.
     MergeList merge_list;                                   /// The list of executable merge (for (Replicated)?MergeTree)
@@ -396,10 +245,15 @@ struct ContextSharedPart
     std::optional<StorageS3Settings> storage_s3_settings;   /// Settings of S3 storage
     std::vector<String> warnings;                           /// Store warning messages about server configuration.
 
+    /// Background executors for *MergeTree tables
+    MergeMutateBackgroundExecutorPtr merge_mutate_executor;
+    OrdinaryBackgroundExecutorPtr moves_executor;
+    OrdinaryBackgroundExecutorPtr fetch_executor;
+    OrdinaryBackgroundExecutorPtr common_executor;
+
     RemoteHostFilter remote_host_filter; /// Allowed URL from config.xml
 
     std::optional<TraceCollector> trace_collector;        /// Thread collecting traces from threads executing queries
-    std::optional<NamedSessions> named_sessions;        /// Controls named HTTP sessions.
 
     /// Clusters for distributed tables
     /// Initialized on demand (on distributed storages initialization) since Settings should be initialized
@@ -407,8 +261,14 @@ struct ContextSharedPart
     ConfigurationPtr clusters_config;                        /// Stores updated configs
     mutable std::mutex clusters_mutex;                       /// Guards clusters and clusters_config
 
+    std::shared_ptr<AsynchronousInsertQueue> async_insert_queue;
+    std::map<String, UInt16> server_ports;
+
     bool shutdown_called = false;
 
+    /// Has background executors for MergeTree tables been initialized?
+    bool is_background_executors_initialized = false;
+
     Stopwatch uptime_watch;
 
     Context::ApplicationType application_type = Context::ApplicationType::SERVER;
@@ -419,7 +279,7 @@ struct ContextSharedPart
     Context::ConfigReloadCallback config_reload_callback;
 
     ContextSharedPart()
-        : macros(std::make_unique<Macros>())
+        : access_control_manager(std::make_unique<AccessControlManager>()), macros(std::make_unique<Macros>())
     {
         /// TODO: make it singleton (?)
         static std::atomic<size_t> num_calls{0};
@@ -453,6 +313,8 @@ struct ContextSharedPart
             return;
         shutdown_called = true;
 
+        Session::shutdownNamedSessions();
+
         /**  After system_logs have been shut down it is guaranteed that no system table gets created or written to.
           *  Note that part changes at shutdown won't be logged to part log.
           */
@@ -462,6 +324,15 @@ struct ContextSharedPart
 
         DatabaseCatalog::shutdown();
 
+        if (merge_mutate_executor)
+            merge_mutate_executor->wait();
+        if (fetch_executor)
+            fetch_executor->wait();
+        if (moves_executor)
+            moves_executor->wait();
+        if (common_executor)
+            common_executor->wait();
+
         std::unique_ptr<SystemLogs> delete_system_logs;
         {
             auto lock = std::lock_guard(mutex);
@@ -487,10 +358,12 @@ struct ContextSharedPart
             /// But they cannot be created before storages since they may required table as a source,
             /// but at least they can be preserved for storage termination.
             dictionaries_xmls.reset();
+            user_defined_executable_functions_xmls.reset();
 
             delete_system_logs = std::move(system_logs);
             embedded_dictionaries.reset();
             external_dictionaries_loader.reset();
+            external_user_defined_executable_functions_loader.reset();
             models_repository_guard.reset();
             external_models_loader.reset();
             buffer_flush_schedule_pool.reset();
@@ -498,6 +371,7 @@ struct ContextSharedPart
             distributed_schedule_pool.reset();
             message_broker_schedule_pool.reset();
             ddl_worker.reset();
+            access_control_manager.reset();
 
             /// Stop trace collector if any
             trace_collector.reset();
@@ -580,14 +454,8 @@ ContextMutablePtr Context::createCopy(const ContextMutablePtr & other)
     return createCopy(std::const_pointer_cast<const Context>(other));
 }
 
-void Context::copyFrom(const ContextPtr & other)
-{
-    *this = *other;
-}
-
 Context::~Context() = default;
 
-
 InterserverIOHandler & Context::getInterserverIOHandler() { return shared->interserver_io_handler; }
 
 std::unique_lock<std::recursive_mutex> Context::getLock() const
@@ -604,21 +472,6 @@ const MergeList & Context::getMergeList() const { return shared->merge_list; }
 ReplicatedFetchList & Context::getReplicatedFetchList() { return shared->replicated_fetch_list; }
 const ReplicatedFetchList & Context::getReplicatedFetchList() const { return shared->replicated_fetch_list; }
 
-
-void Context::enableNamedSessions()
-{
-    shared->named_sessions.emplace();
-}
-
-std::shared_ptr<NamedSession>
-Context::acquireNamedSession(const String & session_id, std::chrono::steady_clock::duration timeout, bool session_check)
-{
-    if (!shared->named_sessions)
-        throw Exception("Support for named sessions is not enabled", ErrorCodes::NOT_IMPLEMENTED);
-
-    return shared->named_sessions->acquireSession(session_id, shared_from_this(), timeout, session_check);
-}
-
 String Context::resolveDatabase(const String & database_name) const
 {
     String res = database_name.empty() ? getCurrentDatabase() : database_name;
@@ -651,6 +504,12 @@ String Context::getDictionariesLibPath() const
     return shared->dictionaries_lib_path;
 }
 
+String Context::getUserScriptsPath() const
+{
+    auto lock = getLock();
+    return shared->user_scripts_path;
+}
+
 std::vector<String> Context::getWarnings() const
 {
     auto lock = getLock();
@@ -680,6 +539,9 @@ void Context::setPath(const String & path)
 
     if (shared->dictionaries_lib_path.empty())
         shared->dictionaries_lib_path = shared->path + "dictionaries_lib/";
+
+    if (shared->user_scripts_path.empty())
+        shared->user_scripts_path = shared->path + "user_scripts/";
 }
 
 VolumePtr Context::setTemporaryStorage(const String & path, const String & policy_name)
@@ -710,6 +572,35 @@ VolumePtr Context::setTemporaryStorage(const String & path, const String & polic
     return shared->tmp_volume;
 }
 
+void Context::setBackupsVolume(const String & path, const String & policy_name)
+{
+    std::lock_guard lock(shared->storage_policies_mutex);
+    if (policy_name.empty())
+    {
+        String path_with_separator = path;
+        if (!path_with_separator.ends_with('/'))
+            path_with_separator += '/';
+        auto disk = std::make_shared<DiskLocal>("_backups_default", path_with_separator, 0);
+        shared->backups_volume = std::make_shared<SingleDiskVolume>("_backups_default", disk, 0);
+    }
+    else
+    {
+        StoragePolicyPtr policy = getStoragePolicySelector(lock)->get(policy_name);
+        if (policy->getVolumes().size() != 1)
+             throw Exception("Policy " + policy_name + " is used for backups, such policy should have exactly one volume",
+                             ErrorCodes::NO_ELEMENTS_IN_CONFIG);
+        shared->backups_volume = policy->getVolume(0);
+    }
+
+    BackupFactory::instance().setBackupsVolume(shared->backups_volume);
+}
+
+VolumePtr Context::getBackupsVolume() const
+{
+    std::lock_guard lock(shared->storage_policies_mutex);
+    return shared->backups_volume;
+}
+
 void Context::setFlagsPath(const String & path)
 {
     auto lock = getLock();
@@ -728,6 +619,12 @@ void Context::setDictionariesLibPath(const String & path)
     shared->dictionaries_lib_path = path;
 }
 
+void Context::setUserScriptsPath(const String & path)
+{
+    auto lock = getLock();
+    shared->user_scripts_path = path;
+}
+
 void Context::addWarningMessage(const String & msg)
 {
     auto lock = getLock();
@@ -738,7 +635,7 @@ void Context::setConfig(const ConfigurationPtr & config)
 {
     auto lock = getLock();
     shared->config = config;
-    shared->access_control_manager.setExternalAuthenticatorsConfig(*shared->config);
+    shared->access_control_manager->setExternalAuthenticatorsConfig(*shared->config);
 }
 
 const Poco::Util::AbstractConfiguration & Context::getConfigRef() const
@@ -750,31 +647,31 @@ const Poco::Util::AbstractConfiguration & Context::getConfigRef() const
 
 AccessControlManager & Context::getAccessControlManager()
 {
-    return shared->access_control_manager;
+    return *shared->access_control_manager;
 }
 
 const AccessControlManager & Context::getAccessControlManager() const
 {
-    return shared->access_control_manager;
+    return *shared->access_control_manager;
 }
 
 void Context::setExternalAuthenticatorsConfig(const Poco::Util::AbstractConfiguration & config)
 {
     auto lock = getLock();
-    shared->access_control_manager.setExternalAuthenticatorsConfig(config);
+    shared->access_control_manager->setExternalAuthenticatorsConfig(config);
 }
 
 std::unique_ptr<GSSAcceptorContext> Context::makeGSSAcceptorContext() const
 {
     auto lock = getLock();
-    return std::make_unique<GSSAcceptorContext>(shared->access_control_manager.getExternalAuthenticators().getKerberosParams());
+    return std::make_unique<GSSAcceptorContext>(shared->access_control_manager->getExternalAuthenticators().getKerberosParams());
 }
 
 void Context::setUsersConfig(const ConfigurationPtr & config)
 {
     auto lock = getLock();
     shared->users_config = config;
-    shared->access_control_manager.setUsersConfig(*shared->users_config);
+    shared->access_control_manager->setUsersConfig(*shared->users_config);
 }
 
 ConfigurationPtr Context::getUsersConfig()
@@ -783,49 +680,24 @@ ConfigurationPtr Context::getUsersConfig()
     return shared->users_config;
 }
 
-
-void Context::setUser(const Credentials & credentials, const Poco::Net::SocketAddress & address)
+void Context::setUser(const UUID & user_id_)
 {
     auto lock = getLock();
 
-    client_info.current_user = credentials.getUserName();
-    client_info.current_address = address;
+    user_id = user_id_;
 
-#if defined(ARCADIA_BUILD)
-    /// This is harmful field that is used only in foreign "Arcadia" build.
-    client_info.current_password.clear();
-    if (const auto * basic_credentials = dynamic_cast<const BasicCredentials *>(&credentials))
-        client_info.current_password = basic_credentials->getPassword();
-#endif
-
-    /// Find a user with such name and check the credentials.
-    auto new_user_id = getAccessControlManager().login(credentials, address.host());
-    auto new_access = getAccessControlManager().getContextAccess(
-        new_user_id, /* current_roles = */ {}, /* use_default_roles = */ true,
-        settings, current_database, client_info);
-
-    user_id = new_user_id;
-    access = std::move(new_access);
+    access = getAccessControlManager().getContextAccess(
+        user_id_, /* current_roles = */ {}, /* use_default_roles = */ true, settings, current_database, client_info);
 
     auto user = access->getUser();
     current_roles = std::make_shared<std::vector<UUID>>(user->granted_roles.findGranted(user->default_roles));
 
-    if (!user->default_database.empty())
-        setCurrentDatabase(user->default_database);
-
     auto default_profile_info = access->getDefaultProfileInfo();
     settings_constraints_and_current_profiles = default_profile_info->getConstraintsAndProfileIDs();
     applySettingsChanges(default_profile_info->settings);
-}
 
-void Context::setUser(const String & name, const String & password, const Poco::Net::SocketAddress & address)
-{
-    setUser(BasicCredentials(name, password), address);
-}
-
-void Context::setUserWithoutCheckingPassword(const String & name, const Poco::Net::SocketAddress & address)
-{
-    setUser(AlwaysAllowCredentials(name), address);
+    if (!user->default_database.empty())
+        setCurrentDatabase(user->default_database);
 }
 
 std::shared_ptr<const User> Context::getUser() const
@@ -833,12 +705,6 @@ std::shared_ptr<const User> Context::getUser() const
     return getAccess()->getUser();
 }
 
-void Context::setQuotaKey(String quota_key_)
-{
-    auto lock = getLock();
-    client_info.quota_key = std::move(quota_key_);
-}
-
 String Context::getUserName() const
 {
     return getAccess()->getUserName();
@@ -851,6 +717,13 @@ std::optional<UUID> Context::getUserID() const
 }
 
 
+void Context::setQuotaKey(String quota_key_)
+{
+    auto lock = getLock();
+    client_info.quota_key = std::move(quota_key_);
+}
+
+
 void Context::setCurrentRoles(const std::vector<UUID> & current_roles_)
 {
     auto lock = getLock();
@@ -932,10 +805,13 @@ ASTPtr Context::getRowPolicyCondition(const String & database, const String & ta
 void Context::setInitialRowPolicy()
 {
     auto lock = getLock();
-    auto initial_user_id = getAccessControlManager().find<User>(client_info.initial_user);
     initial_row_policy = nullptr;
-    if (initial_user_id)
-        initial_row_policy = getAccessControlManager().getEnabledRowPolicies(*initial_user_id, {});
+    if (client_info.initial_user == client_info.current_user)
+        return;
+    auto initial_user_id = getAccessControlManager().find<User>(client_info.initial_user);
+    if (!initial_user_id)
+        return;
+    initial_row_policy = getAccessControlManager().getEnabledRowPolicies(*initial_user_id, {});
 }
 
 
@@ -1088,7 +964,11 @@ bool Context::hasScalar(const String & name) const
 
 
 void Context::addQueryAccessInfo(
-    const String & quoted_database_name, const String & full_quoted_table_name, const Names & column_names, const String & projection_name)
+    const String & quoted_database_name,
+    const String & full_quoted_table_name,
+    const Names & column_names,
+    const String & projection_name,
+    const String & view_name)
 {
     assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
     std::lock_guard<std::mutex> lock(query_access_info.mutex);
@@ -1098,9 +978,10 @@ void Context::addQueryAccessInfo(
         query_access_info.columns.emplace(full_quoted_table_name + "." + backQuoteIfNeed(column_name));
     if (!projection_name.empty())
         query_access_info.projections.emplace(full_quoted_table_name + "." + backQuoteIfNeed(projection_name));
+    if (!view_name.empty())
+        query_access_info.views.emplace(view_name);
 }
 
-
 void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
     assert(!isGlobalContext() || getApplicationType() == ApplicationType::LOCAL);
@@ -1370,6 +1251,9 @@ void Context::setCurrentQueryId(const String & query_id)
     }
 
     client_info.current_query_id = query_id_to_set;
+
+    if (client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        client_info.initial_query_id = client_info.current_query_id;
 }
 
 void Context::killCurrentQuery()
@@ -1454,11 +1338,33 @@ const ExternalDictionariesLoader & Context::getExternalDictionariesLoader() cons
 ExternalDictionariesLoader & Context::getExternalDictionariesLoader()
 {
     std::lock_guard lock(shared->external_dictionaries_mutex);
+    return getExternalDictionariesLoaderUnlocked();
+}
+
+ExternalDictionariesLoader & Context::getExternalDictionariesLoaderUnlocked()
+{
     if (!shared->external_dictionaries_loader)
         shared->external_dictionaries_loader.emplace(getGlobalContext());
     return *shared->external_dictionaries_loader;
 }
 
+const ExternalUserDefinedExecutableFunctionsLoader & Context::getExternalUserDefinedExecutableFunctionsLoader() const
+{
+    return const_cast<Context *>(this)->getExternalUserDefinedExecutableFunctionsLoader();
+}
+
+ExternalUserDefinedExecutableFunctionsLoader & Context::getExternalUserDefinedExecutableFunctionsLoader()
+{
+    std::lock_guard lock(shared->external_user_defined_executable_functions_mutex);
+    return getExternalUserDefinedExecutableFunctionsLoaderUnlocked();
+}
+
+ExternalUserDefinedExecutableFunctionsLoader & Context::getExternalUserDefinedExecutableFunctionsLoaderUnlocked()
+{
+    if (!shared->external_user_defined_executable_functions_loader)
+        shared->external_user_defined_executable_functions_loader.emplace(getGlobalContext());
+    return *shared->external_user_defined_executable_functions_loader;
+}
 
 const ExternalModelsLoader & Context::getExternalModelsLoader() const
 {
@@ -1478,20 +1384,29 @@ ExternalModelsLoader & Context::getExternalModelsLoaderUnlocked()
     return *shared->external_models_loader;
 }
 
-void Context::setExternalModelsConfig(const ConfigurationPtr & config, const std::string & config_name)
+void Context::loadOrReloadModels(const Poco::Util::AbstractConfiguration & config)
 {
+    auto patterns_values = getMultipleValuesFromConfig(config, "", "models_config");
+    std::unordered_set<std::string> patterns(patterns_values.begin(), patterns_values.end());
+
     std::lock_guard lock(shared->external_models_mutex);
 
-    if (shared->external_models_config && isSameConfigurationWithMultipleKeys(*config, *shared->external_models_config, "", config_name))
+    auto & external_models_loader = getExternalModelsLoaderUnlocked();
+
+    if (shared->external_models_config_repository)
+    {
+        shared->external_models_config_repository->updatePatterns(patterns);
+        external_models_loader.reloadConfig(shared->external_models_config_repository->getName());
         return;
+    }
 
-    shared->external_models_config = config;
-    shared->models_repository_guard .reset();
-    shared->models_repository_guard = getExternalModelsLoaderUnlocked().addConfigRepository(
-        std::make_unique<ExternalLoaderXMLConfigRepository>(*config, config_name));
+    auto app_path = getPath();
+    auto config_path = getConfigRef().getString("config-file", "config.xml");
+    auto repository = std::make_unique<ExternalLoaderXMLConfigRepository>(app_path, config_path, patterns);
+    shared->external_models_config_repository = repository.get();
+    shared->models_repository_guard = external_models_loader.addConfigRepository(std::move(repository));
 }
 
-
 EmbeddedDictionaries & Context::getEmbeddedDictionariesImpl(const bool throw_on_error) const
 {
     std::lock_guard lock(shared->embedded_dictionaries_mutex);
@@ -1510,20 +1425,58 @@ EmbeddedDictionaries & Context::getEmbeddedDictionariesImpl(const bool throw_on_
 }
 
 
-void Context::tryCreateEmbeddedDictionaries() const
-{
-    static_cast<void>(getEmbeddedDictionariesImpl(true));
-}
-
-void Context::loadDictionaries(const Poco::Util::AbstractConfiguration & config)
+void Context::tryCreateEmbeddedDictionaries(const Poco::Util::AbstractConfiguration & config) const
 {
     if (!config.getBool("dictionaries_lazy_load", true))
+        static_cast<void>(getEmbeddedDictionariesImpl(true));
+}
+
+void Context::loadOrReloadDictionaries(const Poco::Util::AbstractConfiguration & config)
+{
+    bool dictionaries_lazy_load = config.getBool("dictionaries_lazy_load", true);
+    auto patterns_values = getMultipleValuesFromConfig(config, "", "dictionaries_config");
+    std::unordered_set<std::string> patterns(patterns_values.begin(), patterns_values.end());
+
+    std::lock_guard lock(shared->external_dictionaries_mutex);
+
+    auto & external_dictionaries_loader = getExternalDictionariesLoaderUnlocked();
+    external_dictionaries_loader.enableAlwaysLoadEverything(!dictionaries_lazy_load);
+
+    if (shared->external_dictionaries_config_repository)
     {
-        tryCreateEmbeddedDictionaries();
-        getExternalDictionariesLoader().enableAlwaysLoadEverything(true);
+        shared->external_dictionaries_config_repository->updatePatterns(patterns);
+        external_dictionaries_loader.reloadConfig(shared->external_dictionaries_config_repository->getName());
+        return;
     }
-    shared->dictionaries_xmls = getExternalDictionariesLoader().addConfigRepository(
-        std::make_unique<ExternalLoaderXMLConfigRepository>(config, "dictionaries_config"));
+
+    auto app_path = getPath();
+    auto config_path = getConfigRef().getString("config-file", "config.xml");
+    auto repository = std::make_unique<ExternalLoaderXMLConfigRepository>(app_path, config_path, patterns);
+    shared->external_dictionaries_config_repository = repository.get();
+    shared->dictionaries_xmls = external_dictionaries_loader.addConfigRepository(std::move(repository));
+}
+
+void Context::loadOrReloadUserDefinedExecutableFunctions(const Poco::Util::AbstractConfiguration & config)
+{
+    auto patterns_values = getMultipleValuesFromConfig(config, "", "user_defined_executable_functions_config");
+    std::unordered_set<std::string> patterns(patterns_values.begin(), patterns_values.end());
+
+    std::lock_guard lock(shared->external_user_defined_executable_functions_mutex);
+
+    auto & external_user_defined_executable_functions_loader = getExternalUserDefinedExecutableFunctionsLoaderUnlocked();
+
+    if (shared->user_defined_executable_functions_config_repository)
+    {
+        shared->user_defined_executable_functions_config_repository->updatePatterns(patterns);
+        external_user_defined_executable_functions_loader.reloadConfig(shared->user_defined_executable_functions_config_repository->getName());
+        return;
+    }
+
+    auto app_path = getPath();
+    auto config_path = getConfigRef().getString("config-file", "config.xml");
+    auto repository = std::make_unique<ExternalLoaderXMLConfigRepository>(app_path, config_path, patterns);
+    shared->user_defined_executable_functions_config_repository = repository.get();
+    shared->user_defined_executable_functions_xmls = external_user_defined_executable_functions_loader.addConfigRepository(std::move(repository));
 }
 
 #if USE_NLP
@@ -1623,6 +1576,56 @@ void Context::dropMarkCache() const
 }
 
 
+void Context::setIndexUncompressedCache(size_t max_size_in_bytes)
+{
+    auto lock = getLock();
+
+    if (shared->index_uncompressed_cache)
+        throw Exception("Index uncompressed cache has been already created.", ErrorCodes::LOGICAL_ERROR);
+
+    shared->index_uncompressed_cache = std::make_shared<UncompressedCache>(max_size_in_bytes);
+}
+
+
+UncompressedCachePtr Context::getIndexUncompressedCache() const
+{
+    auto lock = getLock();
+    return shared->index_uncompressed_cache;
+}
+
+
+void Context::dropIndexUncompressedCache() const
+{
+    auto lock = getLock();
+    if (shared->index_uncompressed_cache)
+        shared->index_uncompressed_cache->reset();
+}
+
+
+void Context::setIndexMarkCache(size_t cache_size_in_bytes)
+{
+    auto lock = getLock();
+
+    if (shared->index_mark_cache)
+        throw Exception("Index mark cache has been already created.", ErrorCodes::LOGICAL_ERROR);
+
+    shared->index_mark_cache = std::make_shared<MarkCache>(cache_size_in_bytes);
+}
+
+MarkCachePtr Context::getIndexMarkCache() const
+{
+    auto lock = getLock();
+    return shared->index_mark_cache;
+}
+
+void Context::dropIndexMarkCache() const
+{
+    auto lock = getLock();
+    if (shared->index_mark_cache)
+        shared->index_mark_cache->reset();
+}
+
+
 void Context::setMMappedFileCache(size_t cache_size_in_num_entries)
 {
     auto lock = getLock();
@@ -1657,6 +1660,12 @@ void Context::dropCaches() const
     if (shared->mark_cache)
         shared->mark_cache->reset();
 
+    if (shared->index_uncompressed_cache)
+        shared->index_uncompressed_cache->reset();
+
+    if (shared->index_mark_cache)
+        shared->index_mark_cache->reset();
+
     if (shared->mmap_cache)
         shared->mmap_cache->reset();
 }
@@ -1731,7 +1740,7 @@ BackgroundSchedulePool & Context::getMessageBrokerSchedulePool() const
     if (!shared->message_broker_schedule_pool)
         shared->message_broker_schedule_pool.emplace(
             settings.background_message_broker_schedule_pool_size,
-            CurrentMetrics::BackgroundDistributedSchedulePoolTask,
+            CurrentMetrics::BackgroundMessageBrokerSchedulePoolTask,
             "BgMBSchPool");
     return *shared->message_broker_schedule_pool;
 }
@@ -1799,6 +1808,76 @@ zkutil::ZooKeeperPtr Context::getZooKeeper() const
     return shared->zookeeper;
 }
 
+namespace
+{
+
+bool checkZooKeeperConfigIsLocal(const Poco::Util::AbstractConfiguration & config, const std::string & config_name)
+{
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(config_name, keys);
+
+    for (const auto & key : keys)
+    {
+        if (startsWith(key, "node"))
+        {
+            String host = config.getString(config_name + "." + key + ".host");
+            if (isLocalAddress(DNSResolver::instance().resolveHost(host)))
+                return true;
+        }
+    }
+    return false;
+}
+
+}
+
+
+bool Context::tryCheckClientConnectionToMyKeeperCluster() const
+{
+    try
+    {
+        /// If our server is part of main Keeper cluster
+        if (checkZooKeeperConfigIsLocal(getConfigRef(), "zookeeper"))
+        {
+            LOG_DEBUG(shared->log, "Keeper server is participant of the main zookeeper cluster, will try to connect to it");
+            getZooKeeper();
+            /// Connected, return true
+            return true;
+        }
+        else
+        {
+            Poco::Util::AbstractConfiguration::Keys keys;
+            getConfigRef().keys("auxiliary_zookeepers", keys);
+
+            /// If our server is part of some auxiliary_zookeeper
+            for (const auto & aux_zk_name : keys)
+            {
+                if (checkZooKeeperConfigIsLocal(getConfigRef(), "auxiliary_zookeepers." + aux_zk_name))
+                {
+                    LOG_DEBUG(shared->log, "Our Keeper server is participant of the auxiliary zookeeper cluster ({}), will try to connect to it", aux_zk_name);
+                    getAuxiliaryZooKeeper(aux_zk_name);
+                    /// Connected, return true
+                    return true;
+                }
+            }
+        }
+
+        /// Our server doesn't depend on our Keeper cluster
+        return true;
+    }
+    catch (...)
+    {
+        return false;
+    }
+}
+
+UInt32 Context::getZooKeeperSessionUptime() const
+{
+    std::lock_guard lock(shared->zookeeper_mutex);
+    if (!shared->zookeeper || shared->zookeeper->expired())
+        return 0;
+    return shared->zookeeper->getSessionUptime();
+}
+
 void Context::setSystemZooKeeperLogAfterInitializationIfNeeded()
 {
     /// It can be nearly impossible to understand in which order global objects are initialized on server startup.
@@ -1818,47 +1897,72 @@ void Context::setSystemZooKeeperLogAfterInitializationIfNeeded()
         zk.second->setZooKeeperLog(shared->system_logs->zookeeper_log);
 }
 
-void Context::initializeKeeperStorageDispatcher() const
+void Context::initializeKeeperDispatcher([[maybe_unused]] bool start_async) const
 {
 #if USE_NURAFT
-    std::lock_guard lock(shared->keeper_storage_dispatcher_mutex);
+    std::lock_guard lock(shared->keeper_dispatcher_mutex);
 
-    if (shared->keeper_storage_dispatcher)
+    if (shared->keeper_dispatcher)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to initialize Keeper multiple times");
 
     const auto & config = getConfigRef();
     if (config.has("keeper_server"))
     {
-        shared->keeper_storage_dispatcher = std::make_shared<KeeperStorageDispatcher>();
-        shared->keeper_storage_dispatcher->initialize(config, getApplicationType() == ApplicationType::KEEPER);
+        bool is_standalone_app = getApplicationType() == ApplicationType::KEEPER;
+        if (start_async)
+        {
+            assert(!is_standalone_app);
+            LOG_INFO(shared->log, "Connected to ZooKeeper (or Keeper) before internal Keeper start or we don't depend on our Keeper cluster, "
+                     "will wait for Keeper asynchronously");
+        }
+        else
+        {
+            LOG_INFO(shared->log, "Cannot connect to ZooKeeper (or Keeper) before internal Keeper start, "
+                     "will wait for Keeper synchronously");
+        }
+
+        shared->keeper_dispatcher = std::make_shared<KeeperDispatcher>();
+        shared->keeper_dispatcher->initialize(config, is_standalone_app, start_async);
     }
 #endif
 }
 
 #if USE_NURAFT
-std::shared_ptr<KeeperStorageDispatcher> & Context::getKeeperStorageDispatcher() const
+std::shared_ptr<KeeperDispatcher> & Context::getKeeperDispatcher() const
 {
-    std::lock_guard lock(shared->keeper_storage_dispatcher_mutex);
-    if (!shared->keeper_storage_dispatcher)
+    std::lock_guard lock(shared->keeper_dispatcher_mutex);
+    if (!shared->keeper_dispatcher)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Keeper must be initialized before requests");
 
-    return shared->keeper_storage_dispatcher;
+    return shared->keeper_dispatcher;
 }
 #endif
 
-void Context::shutdownKeeperStorageDispatcher() const
+void Context::shutdownKeeperDispatcher() const
 {
 #if USE_NURAFT
-    std::lock_guard lock(shared->keeper_storage_dispatcher_mutex);
-    if (shared->keeper_storage_dispatcher)
+    std::lock_guard lock(shared->keeper_dispatcher_mutex);
+    if (shared->keeper_dispatcher)
     {
-        shared->keeper_storage_dispatcher->shutdown();
-        shared->keeper_storage_dispatcher.reset();
+        shared->keeper_dispatcher->shutdown();
+        shared->keeper_dispatcher.reset();
     }
 #endif
 }
 
 
+void Context::updateKeeperConfiguration(const Poco::Util::AbstractConfiguration & config)
+{
+#if USE_NURAFT
+    std::lock_guard lock(shared->keeper_dispatcher_mutex);
+    if (!shared->keeper_dispatcher)
+        return;
+
+    shared->keeper_dispatcher->updateConfiguration(config);
+#endif
+}
+
+
 zkutil::ZooKeeperPtr Context::getAuxiliaryZooKeeper(const String & name) const
 {
     std::lock_guard lock(shared->auxiliary_zookeepers_mutex);
@@ -1866,6 +1970,9 @@ zkutil::ZooKeeperPtr Context::getAuxiliaryZooKeeper(const String & name) const
     auto zookeeper = shared->auxiliary_zookeepers.find(name);
     if (zookeeper == shared->auxiliary_zookeepers.end())
     {
+        if (name.find(':') != std::string::npos || name.find('/') != std::string::npos)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid auxiliary ZooKeeper name {}: ':' and '/' are not allowed", name);
+
         const auto & config = shared->auxiliary_zookeepers_config ? *shared->auxiliary_zookeepers_config : getConfigRef();
         if (!config.has("auxiliary_zookeepers." + name))
             throw Exception(
@@ -1895,7 +2002,7 @@ static void reloadZooKeeperIfChangedImpl(const ConfigurationPtr & config, const
     if (!zk || zk->configChanged(*config, config_name))
     {
         if (zk)
-            zk->finalize();
+            zk->finalize("Config changed");
 
         zk = std::make_shared<zkutil::ZooKeeper>(*config, config_name, std::move(zk_log));
     }
@@ -2001,13 +2108,27 @@ std::optional<UInt16> Context::getTCPPortSecure() const
     return {};
 }
 
+void Context::registerServerPort(String port_name, UInt16 port)
+{
+    shared->server_ports.emplace(std::move(port_name), port);
+}
+
+UInt16 Context::getServerPort(const String & port_name) const
+{
+    auto it = shared->server_ports.find(port_name);
+    if (it == shared->server_ports.end())
+        throw Exception(ErrorCodes::BAD_GET, "There is no port named {}", port_name);
+    else
+        return it->second;
+}
+
 std::shared_ptr<Cluster> Context::getCluster(const std::string & cluster_name) const
 {
     auto res = getClusters()->getCluster(cluster_name);
     if (res)
         return res;
-
-    res = tryGetReplicatedDatabaseCluster(cluster_name);
+    if (!cluster_name.empty())
+        res = tryGetReplicatedDatabaseCluster(cluster_name);
     if (res)
         return res;
 
@@ -2118,7 +2239,6 @@ std::shared_ptr<QueryLog> Context::getQueryLog() const
     return shared->system_logs->query_log;
 }
 
-
 std::shared_ptr<QueryThreadLog> Context::getQueryThreadLog() const
 {
     auto lock = getLock();
@@ -2129,6 +2249,15 @@ std::shared_ptr<QueryThreadLog> Context::getQueryThreadLog() const
     return shared->system_logs->query_thread_log;
 }
 
+std::shared_ptr<QueryViewsLog> Context::getQueryViewsLog() const
+{
+    auto lock = getLock();
+
+    if (!shared->system_logs)
+        return {};
+
+    return shared->system_logs->query_views_log;
+}
 
 std::shared_ptr<PartLog> Context::getPartLog(const String & part_database) const
 {
@@ -2202,6 +2331,16 @@ std::shared_ptr<OpenTelemetrySpanLog> Context::getOpenTelemetrySpanLog() const
     return shared->system_logs->opentelemetry_span_log;
 }
 
+std::shared_ptr<SessionLog> Context::getSessionLog() const
+{
+    auto lock = getLock();
+
+    if (!shared->system_logs)
+        return {};
+
+    return shared->system_logs->session_log;
+}
+
 
 std::shared_ptr<ZooKeeperLog> Context::getZooKeeperLog() const
 {
@@ -2311,12 +2450,10 @@ void Context::updateStorageConfiguration(const Poco::Util::AbstractConfiguration
         }
     }
 
-#if !defined(ARCADIA_BUILD)
     if (shared->storage_s3_settings)
     {
         shared->storage_s3_settings->loadFromConfig("s3", config);
     }
-#endif
 }
 
 
@@ -2353,7 +2490,6 @@ const MergeTreeSettings & Context::getReplicatedMergeTreeSettings() const
 
 const StorageS3Settings & Context::getStorageS3Settings() const
 {
-#if !defined(ARCADIA_BUILD)
     auto lock = getLock();
 
     if (!shared->storage_s3_settings)
@@ -2363,9 +2499,6 @@ const StorageS3Settings & Context::getStorageS3Settings() const
     }
 
     return *shared->storage_s3_settings;
-#else
-    throw Exception("S3 is unavailable in Arcadia", ErrorCodes::NOT_IMPLEMENTED);
-#endif
 }
 
 void Context::checkCanBeDropped(const String & database, const String & table, const size_t & size, const size_t & max_size_to_drop) const
@@ -2438,20 +2571,14 @@ void Context::checkPartitionCanBeDropped(const String & database, const String &
 }
 
 
-BlockInputStreamPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size) const
+InputFormatPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size, const std::optional<FormatSettings> & format_settings) const
 {
-    return std::make_shared<InputStreamFromInputFormat>(
-        FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size));
+    return FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size, format_settings);
 }
 
-BlockOutputStreamPtr Context::getOutputStreamParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const
+OutputFormatPtr Context::getOutputFormat(const String & name, WriteBuffer & buf, const Block & sample) const
 {
-    return FormatFactory::instance().getOutputStreamParallelIfPossible(name, buf, sample, shared_from_this());
-}
-
-BlockOutputStreamPtr Context::getOutputStream(const String & name, WriteBuffer & buf, const Block & sample) const
-{
-    return FormatFactory::instance().getOutputStream(name, buf, sample, shared_from_this());
+    return FormatFactory::instance().getOutputFormat(name, buf, sample, shared_from_this());
 }
 
 OutputFormatPtr Context::getOutputFormatParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const
@@ -2548,6 +2675,7 @@ void Context::setFormatSchemaPath(const String & path)
 
 Context::SampleBlockCache & Context::getSampleBlockCache() const
 {
+    assert(hasQueryContext());
     return getQueryContext()->sample_block_cache;
 }
 
@@ -2796,6 +2924,13 @@ ZooKeeperMetadataTransactionPtr Context::getZooKeeperMetadataTransaction() const
     return metadata_transaction;
 }
 
+void Context::resetZooKeeperMetadataTransaction()
+{
+    assert(metadata_transaction);
+    assert(hasQueryContext());
+    metadata_transaction = nullptr;
+}
+
 PartUUIDsPtr Context::getPartUUIDs() const
 {
     auto lock = getLock();
@@ -2831,4 +2966,131 @@ PartUUIDsPtr Context::getIgnoredPartUUIDs() const
     return ignored_part_uuids;
 }
 
+AsynchronousInsertQueue * Context::getAsynchronousInsertQueue() const
+{
+    return shared->async_insert_queue.get();
+}
+
+void Context::setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr)
+{
+    using namespace std::chrono;
+
+    if (std::chrono::milliseconds(settings.async_insert_busy_timeout_ms) == 0ms)
+        throw Exception("Setting async_insert_busy_timeout_ms can't be zero", ErrorCodes::INVALID_SETTING_VALUE);
+
+    shared->async_insert_queue = ptr;
+}
+
+void Context::initializeBackgroundExecutorsIfNeeded()
+{
+    auto lock = getLock();
+    if (shared->is_background_executors_initialized)
+        return;
+
+    const size_t max_merges_and_mutations = getSettingsRef().background_pool_size * getSettingsRef().background_merges_mutations_concurrency_ratio;
+
+    /// With this executor we can execute more tasks than threads we have
+    shared->merge_mutate_executor = MergeMutateBackgroundExecutor::create
+    (
+        "MergeMutate",
+        /*max_threads_count*/getSettingsRef().background_pool_size,
+        /*max_tasks_count*/max_merges_and_mutations,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+    );
+
+    LOG_INFO(shared->log, "Initialized background executor for merges and mutations with num_threads={}, num_tasks={}",
+        getSettingsRef().background_pool_size, max_merges_and_mutations);
+
+    shared->moves_executor = OrdinaryBackgroundExecutor::create
+    (
+        "Move",
+        getSettingsRef().background_move_pool_size,
+        getSettingsRef().background_move_pool_size,
+        CurrentMetrics::BackgroundMovePoolTask
+    );
+
+    LOG_INFO(shared->log, "Initialized background executor for move operations with num_threads={}, num_tasks={}",
+        getSettingsRef().background_move_pool_size, getSettingsRef().background_move_pool_size);
+
+    shared->fetch_executor = OrdinaryBackgroundExecutor::create
+    (
+        "Fetch",
+        getSettingsRef().background_fetches_pool_size,
+        getSettingsRef().background_fetches_pool_size,
+        CurrentMetrics::BackgroundFetchesPoolTask
+    );
+
+    LOG_INFO(shared->log, "Initialized background executor for fetches with num_threads={}, num_tasks={}",
+        getSettingsRef().background_fetches_pool_size, getSettingsRef().background_fetches_pool_size);
+
+    shared->common_executor = OrdinaryBackgroundExecutor::create
+    (
+        "Common",
+        getSettingsRef().background_common_pool_size,
+        getSettingsRef().background_common_pool_size,
+        CurrentMetrics::BackgroundCommonPoolTask
+    );
+
+    LOG_INFO(shared->log, "Initialized background executor for common operations (e.g. clearing old parts) with num_threads={}, num_tasks={}",
+        getSettingsRef().background_common_pool_size, getSettingsRef().background_common_pool_size);
+
+    shared->is_background_executors_initialized = true;
+}
+
+
+MergeMutateBackgroundExecutorPtr Context::getMergeMutateExecutor() const
+{
+    return shared->merge_mutate_executor;
+}
+
+OrdinaryBackgroundExecutorPtr Context::getMovesExecutor() const
+{
+    return shared->moves_executor;
+}
+
+OrdinaryBackgroundExecutorPtr Context::getFetchesExecutor() const
+{
+    return shared->fetch_executor;
+}
+
+OrdinaryBackgroundExecutorPtr Context::getCommonExecutor() const
+{
+    return shared->common_executor;
+}
+
+
+ReadSettings Context::getReadSettings() const
+{
+    ReadSettings res;
+
+    std::string_view read_method_str = settings.local_filesystem_read_method.value;
+
+    if (auto opt_method = magic_enum::enum_cast<LocalFSReadMethod>(read_method_str))
+        res.local_fs_method = *opt_method;
+    else
+        throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}' for local filesystem", read_method_str);
+
+    read_method_str = settings.remote_filesystem_read_method.value;
+
+    if (auto opt_method = magic_enum::enum_cast<RemoteFSReadMethod>(read_method_str))
+        res.remote_fs_method = *opt_method;
+    else
+        throw Exception(ErrorCodes::UNKNOWN_READ_METHOD, "Unknown read method '{}' for remote filesystem", read_method_str);
+
+    res.local_fs_prefetch = settings.local_filesystem_read_prefetch;
+    res.remote_fs_prefetch = settings.remote_filesystem_read_prefetch;
+
+    res.remote_fs_read_max_backoff_ms = settings.remote_fs_read_max_backoff_ms;
+    res.remote_fs_read_backoff_max_tries = settings.remote_fs_read_backoff_max_tries;
+
+    res.local_fs_buffer_size = settings.max_read_buffer_size;
+    res.direct_io_threshold = settings.min_bytes_to_use_direct_io;
+    res.mmap_threshold = settings.min_bytes_to_use_mmap_io;
+    res.priority = settings.read_priority;
+
+    res.mmap_cache = getMMappedFileCache().get();
+
+    return res;
+}
+
 }
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index f72427d2a7a..cc6df875f7d 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -5,7 +5,6 @@
 #include <Core/NamesAndTypes.h>
 #include <Core/Settings.h>
 #include <Core/UUID.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/DatabaseCatalog.h>
@@ -14,21 +13,16 @@
 #include <Common/MultiVersion.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/RemoteHostFilter.h>
-#include <Common/ThreadPool.h>
-#include <common/types.h>
+#include <Common/isLocalAddress.h>
+#include <base/types.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <thread>
+#include <exception>
 
 
 namespace Poco::Net { class IPAddress; }
@@ -52,6 +46,7 @@ class AccessRightsElements;
 class EmbeddedDictionaries;
 class ExternalDictionariesLoader;
 class ExternalModelsLoader;
+class ExternalUserDefinedExecutableFunctionsLoader;
 class InterserverCredentials;
 using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
 class InterserverIOHandler;
@@ -67,9 +62,11 @@ class ProcessList;
 class QueryStatus;
 class Macros;
 struct Progress;
+struct FileProgress;
 class Clusters;
 class QueryLog;
 class QueryThreadLog;
+class QueryViewsLog;
 class PartLog;
 class TextLog;
 class TraceLog;
@@ -77,6 +74,7 @@ class MetricLog;
 class AsynchronousMetricLog;
 class OpenTelemetrySpanLog;
 class ZooKeeperLog;
+class SessionLog;
 struct MergeTreeSettings;
 class StorageS3Settings;
 class IDatabase;
@@ -103,11 +101,22 @@ using StoragePolicyPtr = std::shared_ptr<const IStoragePolicy>;
 using StoragePoliciesMap = std::map<String, StoragePolicyPtr>;
 class StoragePolicySelector;
 using StoragePolicySelectorPtr = std::shared_ptr<const StoragePolicySelector>;
+template <class Queue>
+class MergeTreeBackgroundExecutor;
+class MergeMutateRuntimeQueue;
+class OrdinaryRuntimeQueue;
+using MergeMutateBackgroundExecutor = MergeTreeBackgroundExecutor<MergeMutateRuntimeQueue>;
+using MergeMutateBackgroundExecutorPtr = std::shared_ptr<MergeMutateBackgroundExecutor>;
+using OrdinaryBackgroundExecutor = MergeTreeBackgroundExecutor<OrdinaryRuntimeQueue>;
+using OrdinaryBackgroundExecutorPtr = std::shared_ptr<OrdinaryBackgroundExecutor>;
 struct PartUUIDs;
 using PartUUIDsPtr = std::shared_ptr<PartUUIDs>;
-class KeeperStorageDispatcher;
+class KeeperDispatcher;
+class Session;
 
+class IInputFormat;
 class IOutputFormat;
+using InputFormatPtr = std::shared_ptr<IInputFormat>;
 using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
 class IVolume;
 using VolumePtr = std::shared_ptr<IVolume>;
@@ -125,6 +134,8 @@ using ThrottlerPtr = std::shared_ptr<Throttler>;
 class ZooKeeperMetadataTransaction;
 using ZooKeeperMetadataTransactionPtr = std::shared_ptr<ZooKeeperMetadataTransaction>;
 
+class AsynchronousInsertQueue;
+
 /// Callback for external tables initializer
 using ExternalTablesInitializer = std::function<void(ContextPtr)>;
 
@@ -219,6 +230,7 @@ private:
             tables = rhs.tables;
             columns = rhs.columns;
             projections = rhs.projections;
+            views = rhs.views;
         }
 
         QueryAccessInfo(QueryAccessInfo && rhs) = delete;
@@ -235,6 +247,7 @@ private:
             std::swap(tables, rhs.tables);
             std::swap(columns, rhs.columns);
             std::swap(projections, rhs.projections);
+            std::swap(views, rhs.views);
         }
 
         /// To prevent a race between copy-constructor and other uses of this structure.
@@ -242,7 +255,8 @@ private:
         std::set<std::string> databases{};
         std::set<std::string> tables{};
         std::set<std::string> columns{};
-        std::set<std::string> projections;
+        std::set<std::string> projections{};
+        std::set<std::string> views{};
     };
 
     QueryAccessInfo query_access_info;
@@ -275,16 +289,15 @@ private:
     /// XXX: move this stuff to shared part instead.
     ContextMutablePtr buffer_context;  /// Buffer context. Could be equal to this.
 
-    /// A flag, used to distinguish between user query and internal query to a database engine (MaterializePostgreSQL).
+    /// A flag, used to distinguish between user query and internal query to a database engine (MaterializedPostgreSQL).
     bool is_internal_query = false;
 
+
 public:
     // Top-level OpenTelemetry trace context for the query. Makes sense only for a query context.
     OpenTelemetryTraceContext query_trace_context;
 
 private:
-    friend class NamedSessions;
-
     using SampleBlockCache = std::unordered_map<std::string, Block>;
     mutable SampleBlockCache sample_block_cache;
 
@@ -318,14 +331,13 @@ public:
     static ContextMutablePtr createCopy(const ContextPtr & other);
     static SharedContextHolder createShared();
 
-    void copyFrom(const ContextPtr & other);
-
     ~Context();
 
     String getPath() const;
     String getFlagsPath() const;
     String getUserFilesPath() const;
     String getDictionariesLibPath() const;
+    String getUserScriptsPath() const;
 
     /// A list of warnings about server configuration to place in `system.warnings` table.
     std::vector<String> getWarnings() const;
@@ -336,11 +348,15 @@ public:
     void setFlagsPath(const String & path);
     void setUserFilesPath(const String & path);
     void setDictionariesLibPath(const String & path);
+    void setUserScriptsPath(const String & path);
 
     void addWarningMessage(const String & msg);
 
     VolumePtr setTemporaryStorage(const String & path, const String & policy_name = "");
 
+    void setBackupsVolume(const String & path, const String & policy_name = "");
+    VolumePtr getBackupsVolume() const;
+
     using ConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
 
     /// Global application configuration settings.
@@ -363,23 +379,17 @@ public:
     void setUsersConfig(const ConfigurationPtr & config);
     ConfigurationPtr getUsersConfig();
 
-    /// Sets the current user, checks the credentials and that the specified host is allowed.
-    /// Must be called before getClientInfo() can be called.
-    void setUser(const Credentials & credentials, const Poco::Net::SocketAddress & address);
-    void setUser(const String & name, const String & password, const Poco::Net::SocketAddress & address);
-
-    /// Sets the current user, *does not check the password/credentials and that the specified host is allowed*.
-    /// Must be called before getClientInfo.
-    ///
-    /// (Used only internally in cluster, if the secret matches)
-    void setUserWithoutCheckingPassword(const String & name, const Poco::Net::SocketAddress & address);
-
-    void setQuotaKey(String quota_key_);
+    /// Sets the current user assuming that he/she is already authenticated.
+    /// WARNING: This function doesn't check password!
+    /// Normally you shouldn't call this function. Use the Session class to do authentication instead.
+    void setUser(const UUID & user_id_);
 
     UserPtr getUser() const;
     String getUserName() const;
     std::optional<UUID> getUserID() const;
 
+    void setQuotaKey(String quota_key_);
+
     void setCurrentRoles(const std::vector<UUID> & current_roles_);
     void setCurrentRolesDefault();
     boost::container::flat_set<UUID> getCurrentRoles() const;
@@ -469,7 +479,9 @@ public:
         const String & quoted_database_name,
         const String & full_quoted_table_name,
         const Names & column_names,
-        const String & projection_name = {});
+        const String & projection_name = {},
+        const String & view_name = {});
+
 
     /// Supported factories for records in query_log
     enum class QueryLogFactories
@@ -540,27 +552,28 @@ public:
     const EmbeddedDictionaries & getEmbeddedDictionaries() const;
     const ExternalDictionariesLoader & getExternalDictionariesLoader() const;
     const ExternalModelsLoader & getExternalModelsLoader() const;
+    const ExternalUserDefinedExecutableFunctionsLoader & getExternalUserDefinedExecutableFunctionsLoader() const;
     EmbeddedDictionaries & getEmbeddedDictionaries();
     ExternalDictionariesLoader & getExternalDictionariesLoader();
+    ExternalDictionariesLoader & getExternalDictionariesLoaderUnlocked();
+    ExternalUserDefinedExecutableFunctionsLoader & getExternalUserDefinedExecutableFunctionsLoader();
+    ExternalUserDefinedExecutableFunctionsLoader & getExternalUserDefinedExecutableFunctionsLoaderUnlocked();
     ExternalModelsLoader & getExternalModelsLoader();
     ExternalModelsLoader & getExternalModelsLoaderUnlocked();
-    void tryCreateEmbeddedDictionaries() const;
-    void loadDictionaries(const Poco::Util::AbstractConfiguration & config);
+    void tryCreateEmbeddedDictionaries(const Poco::Util::AbstractConfiguration & config) const;
+    void loadOrReloadDictionaries(const Poco::Util::AbstractConfiguration & config);
+    void loadOrReloadUserDefinedExecutableFunctions(const Poco::Util::AbstractConfiguration & config);
+    void loadOrReloadModels(const Poco::Util::AbstractConfiguration & config);
 
 #if USE_NLP
     SynonymsExtensions & getSynonymsExtensions() const;
     Lemmatizers & getLemmatizers() const;
 #endif
 
-    void setExternalModelsConfig(const ConfigurationPtr & config, const std::string & config_name = "models_config");
-
     /// I/O formats.
-    BlockInputStreamPtr getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size) const;
-
-    /// Don't use streams. Better look at getOutputFormat...
-    BlockOutputStreamPtr getOutputStreamParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const;
-    BlockOutputStreamPtr getOutputStream(const String & name, WriteBuffer & buf, const Block & sample) const;
+    InputFormatPtr getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size, const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
+    OutputFormatPtr getOutputFormat(const String & name, WriteBuffer & buf, const Block & sample) const;
     OutputFormatPtr getOutputFormatParallelIfPossible(const String & name, WriteBuffer & buf, const Block & sample) const;
 
     InterserverIOHandler & getInterserverIOHandler();
@@ -586,11 +599,10 @@ public:
 
     std::optional<UInt16> getTCPPortSecure() const;
 
-    /// Allow to use named sessions. The thread will be run to cleanup sessions after timeout has expired.
-    /// The method must be called at the server startup.
-    void enableNamedSessions();
+    /// Register server ports during server starting up. No lock is held.
+    void registerServerPort(String port_name, UInt16 port);
 
-    std::shared_ptr<NamedSession> acquireNamedSession(const String & session_id, std::chrono::steady_clock::duration timeout, bool session_check);
+    UInt16 getServerPort(const String & port_name) const;
 
     /// For methods below you may need to acquire the context lock by yourself.
 
@@ -602,6 +614,7 @@ public:
     bool hasSessionContext() const { return !session_context.expired(); }
 
     ContextMutablePtr getGlobalContext() const;
+
     bool hasGlobalContext() const { return !global_context.expired(); }
     bool isGlobalContext() const
     {
@@ -621,13 +634,13 @@ public:
     const Settings & getSettingsRef() const { return settings; }
 
     void setProgressCallback(ProgressCallback callback);
-    /// Used in InterpreterSelectQuery to pass it to the IBlockInputStream.
+    /// Used in executeQuery() to pass it to the QueryPipeline.
     ProgressCallback getProgressCallback() const;
 
     void setFileProgressCallback(FileProgressCallback && callback) { file_progress_callback = callback; }
     FileProgressCallback getFileProgressCallback() const { return file_progress_callback; }
 
-    /** Set in executeQuery and InterpreterSelectQuery. Then it is used in IBlockInputStream,
+    /** Set in executeQuery and InterpreterSelectQuery. Then it is used in QueryPipeline,
       *  to update and monitor information about the total number of resources spent for the query.
       */
     void setProcessListElement(QueryStatus * elem);
@@ -650,11 +663,20 @@ public:
     /// Same as above but return a zookeeper connection from auxiliary_zookeepers configuration entry.
     std::shared_ptr<zkutil::ZooKeeper> getAuxiliaryZooKeeper(const String & name) const;
 
+    /// Try to connect to Keeper using get(Auxiliary)ZooKeeper. Useful for
+    /// internal Keeper start (check connection to some other node). Return true
+    /// if connected successfully (without exception) or our zookeeper client
+    /// connection configured for some other cluster without our node.
+    bool tryCheckClientConnectionToMyKeeperCluster() const;
+
+    UInt32 getZooKeeperSessionUptime() const;
+
 #if USE_NURAFT
-    std::shared_ptr<KeeperStorageDispatcher> & getKeeperStorageDispatcher() const;
+    std::shared_ptr<KeeperDispatcher> & getKeeperDispatcher() const;
 #endif
-    void initializeKeeperStorageDispatcher() const;
-    void shutdownKeeperStorageDispatcher() const;
+    void initializeKeeperDispatcher(bool start_async) const;
+    void shutdownKeeperDispatcher() const;
+    void updateKeeperConfiguration(const Poco::Util::AbstractConfiguration & config);
 
     /// Set auxiliary zookeepers configuration at server starting or configuration reloading.
     void reloadAuxiliaryZooKeepersConfigIfChanged(const ConfigurationPtr & config);
@@ -679,6 +701,16 @@ public:
     std::shared_ptr<MarkCache> getMarkCache() const;
     void dropMarkCache() const;
 
+    /// Create a cache of index uncompressed blocks of specified size. This can be done only once.
+    void setIndexUncompressedCache(size_t max_size_in_bytes);
+    std::shared_ptr<UncompressedCache> getIndexUncompressedCache() const;
+    void dropIndexUncompressedCache() const;
+
+    /// Create a cache of index marks of specified size. This can be done only once.
+    void setIndexMarkCache(size_t cache_size_in_bytes);
+    std::shared_ptr<MarkCache> getIndexMarkCache() const;
+    void dropIndexMarkCache() const;
+
     /// Create a cache of mapped files to avoid frequent open/map/unmap/close and to reuse from several threads.
     void setMMappedFileCache(size_t cache_size_in_num_entries);
     std::shared_ptr<MMappedFileCache> getMMappedFileCache() const;
@@ -730,12 +762,14 @@ public:
     /// Nullptr if the query log is not ready for this moment.
     std::shared_ptr<QueryLog> getQueryLog() const;
     std::shared_ptr<QueryThreadLog> getQueryThreadLog() const;
+    std::shared_ptr<QueryViewsLog> getQueryViewsLog() const;
     std::shared_ptr<TraceLog> getTraceLog() const;
     std::shared_ptr<TextLog> getTextLog() const;
     std::shared_ptr<MetricLog> getMetricLog() const;
     std::shared_ptr<AsynchronousMetricLog> getAsynchronousMetricLog() const;
     std::shared_ptr<OpenTelemetrySpanLog> getOpenTelemetrySpanLog() const;
     std::shared_ptr<ZooKeeperLog> getZooKeeperLog() const;
+    std::shared_ptr<SessionLog> getSessionLog() const;
 
     /// Returns an object used to log operations with parts if it possible.
     /// Provide table name to make required checks.
@@ -764,6 +798,7 @@ public:
     DisksMap getDisksMap() const;
     void updateStorageConfiguration(const Poco::Util::AbstractConfiguration & config);
 
+
     /// Provides storage politics schemes
     StoragePolicyPtr getStoragePolicy(const String & name) const;
 
@@ -819,13 +854,29 @@ public:
     void initZooKeeperMetadataTransaction(ZooKeeperMetadataTransactionPtr txn, bool attach_existing = false);
     /// Returns context of current distributed DDL query or nullptr.
     ZooKeeperMetadataTransactionPtr getZooKeeperMetadataTransaction() const;
+    /// Removes context of current distributed DDL.
+    void resetZooKeeperMetadataTransaction();
 
     PartUUIDsPtr getPartUUIDs() const;
     PartUUIDsPtr getIgnoredPartUUIDs() const;
 
+    AsynchronousInsertQueue * getAsynchronousInsertQueue() const;
+    void setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr);
+
     ReadTaskCallback getReadTaskCallback() const;
     void setReadTaskCallback(ReadTaskCallback && callback);
 
+    /// Background executors related methods
+    void initializeBackgroundExecutorsIfNeeded();
+
+    MergeMutateBackgroundExecutorPtr getMergeMutateExecutor() const;
+    OrdinaryBackgroundExecutorPtr getMovesExecutor() const;
+    OrdinaryBackgroundExecutorPtr getFetchesExecutor() const;
+    OrdinaryBackgroundExecutorPtr getCommonExecutor() const;
+
+    /** Get settings for reading from filesystem. */
+    ReadSettings getReadSettings() const;
+
 private:
     std::unique_lock<std::recursive_mutex> getLock() const;
 
@@ -844,32 +895,6 @@ private:
     StoragePolicySelectorPtr getStoragePolicySelector(std::lock_guard<std::mutex> & lock) const;
 
     DiskSelectorPtr getDiskSelector(std::lock_guard<std::mutex> & /* lock */) const;
-
-    /// If the password is not set, the password will not be checked
-    void setUserImpl(const String & name, const std::optional<String> & password, const Poco::Net::SocketAddress & address);
-};
-
-
-class NamedSessions;
-
-/// User name and session identifier. Named sessions are local to users.
-using NamedSessionKey = std::pair<String, String>;
-
-/// Named sessions. The user could specify session identifier to reuse settings and temporary tables in subsequent requests.
-struct NamedSession
-{
-    NamedSessionKey key;
-    UInt64 close_cycle = 0;
-    ContextMutablePtr context;
-    std::chrono::steady_clock::duration timeout;
-    NamedSessions & parent;
-
-    NamedSession(NamedSessionKey key_, ContextPtr context_, std::chrono::steady_clock::duration timeout_, NamedSessions & parent_)
-        : key(key_), context(Context::createCopy(context_)), timeout(timeout_), parent(parent_)
-    {
-    }
-
-    void release();
 };
 
 }
diff --git a/src/Interpreters/ConvertStringsToEnumVisitor.cpp b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
index fa2e0b6613a..4ca0909cd23 100644
--- a/src/Interpreters/ConvertStringsToEnumVisitor.cpp
+++ b/src/Interpreters/ConvertStringsToEnumVisitor.cpp
@@ -43,11 +43,11 @@ void changeIfArguments(ASTPtr & first, ASTPtr & second)
     String enum_string = makeStringsEnum(values);
     auto enum_literal = std::make_shared<ASTLiteral>(enum_string);
 
-    auto first_cast = makeASTFunction("CAST");
+    auto first_cast = makeASTFunction("_CAST");
     first_cast->arguments->children.push_back(first);
     first_cast->arguments->children.push_back(enum_literal);
 
-    auto second_cast = makeASTFunction("CAST");
+    auto second_cast = makeASTFunction("_CAST");
     second_cast->arguments->children.push_back(second);
     second_cast->arguments->children.push_back(enum_literal);
 
@@ -65,12 +65,12 @@ void changeTransformArguments(ASTPtr & array_to, ASTPtr & other)
 
     String enum_string = makeStringsEnum(values);
 
-    auto array_cast = makeASTFunction("CAST");
+    auto array_cast = makeASTFunction("_CAST");
     array_cast->arguments->children.push_back(array_to);
     array_cast->arguments->children.push_back(std::make_shared<ASTLiteral>("Array(" + enum_string + ")"));
     array_to = array_cast;
 
-    auto other_cast = makeASTFunction("CAST");
+    auto other_cast = makeASTFunction("_CAST");
     other_cast->arguments->children.push_back(other);
     other_cast->arguments->children.push_back(std::make_shared<ASTLiteral>(enum_string));
     other = other_cast;
@@ -149,8 +149,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (!literal1 || !literal2)
             return;
 
-        if (literal1->value.getTypeName() != std::string_view{"String"}
-            || literal2->value.getTypeName() != std::string_view{"String"})
+        if (literal1->value.getTypeName() != "String" || literal2->value.getTypeName() != "String")
             return;
 
         changeIfArguments(function_node.arguments->children[1],
@@ -166,8 +165,7 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
         if (!literal_to || !literal_other)
             return;
 
-        if (literal_to->value.getTypeName() != std::string_view{"Array"}
-            || literal_other->value.getTypeName() != std::string_view{"String"})
+        if (literal_to->value.getTypeName() != "Array" || literal_other->value.getTypeName() != "String")
             return;
 
         Array array_to = literal_to->value.get<Array>();
@@ -183,4 +181,3 @@ void ConvertStringsToEnumMatcher::visit(ASTFunction & function_node, Data & data
 }
 
 }
-
diff --git a/src/Interpreters/CrashLog.cpp b/src/Interpreters/CrashLog.cpp
index a9da804f1d2..1abaec4a17f 100644
--- a/src/Interpreters/CrashLog.cpp
+++ b/src/Interpreters/CrashLog.cpp
@@ -6,10 +6,9 @@
 #include <DataTypes/DataTypeDateTime.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/SymbolIndex.h>
+#include <Common/Stopwatch.h>
 
-#if !defined(ARCADIA_BUILD)
-#   include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 
 namespace DB
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index b6f977cd9b5..511d0a6b8a6 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -1,4 +1,5 @@
 #include <Common/typeid_cast.h>
+#include <Parsers/queryToString.h>
 #include <Functions/FunctionsComparison.h>
 #include <Functions/FunctionsLogical.h>
 #include <IO/WriteHelpers.h>
@@ -146,71 +147,52 @@ ASTPtr makeOnExpression(const std::vector<ASTPtr> & expressions)
     return makeASTFunction(NameAnd::name, std::move(arguments));
 }
 
-bool getTables(ASTSelectQuery & select, std::vector<JoinedElement> & joined_tables, size_t & num_comma)
+std::vector<JoinedElement> getTables(const ASTSelectQuery & select)
 {
     if (!select.tables())
-        return false;
+        return {};
 
     const auto * tables = select.tables()->as<ASTTablesInSelectQuery>();
     if (!tables)
-        return false;
+        return {};
 
     size_t num_tables = tables->children.size();
     if (num_tables < 2)
-        return false;
+        return {};
 
+    std::vector<JoinedElement> joined_tables;
     joined_tables.reserve(num_tables);
-    size_t num_array_join = 0;
-    size_t num_using = 0;
-
-    // For diagnostic messages.
-    std::vector<IAST *> tables_with_using;
-    tables_with_using.reserve(num_tables);
+    bool has_using = false;
 
     for (const auto & child : tables->children)
     {
-        auto * table_element = child->as<ASTTablesInSelectQueryElement>();
+        const auto * table_element = child->as<ASTTablesInSelectQueryElement>();
         if (!table_element)
             throw Exception("Logical error: TablesInSelectQueryElement expected", ErrorCodes::LOGICAL_ERROR);
 
-        joined_tables.emplace_back(JoinedElement(*table_element));
-        JoinedElement & t = joined_tables.back();
+        JoinedElement & t = joined_tables.emplace_back(*table_element);
+        t.rewriteCommaToCross();
 
         if (t.arrayJoin())
-        {
-            ++num_array_join;
-            continue;
-        }
+            return {};
 
         if (t.hasUsing())
         {
-            ++num_using;
-            tables_with_using.push_back(table_element);
-            continue;
+            if (has_using)
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Multuple USING statements are not supported");
+            has_using = true;
         }
 
-        if (const auto * join = t.tableJoin())
+        if (const auto * join = t.tableJoin(); join && isCrossOrComma(join->kind))
         {
-            if (join->kind == ASTTableJoin::Kind::Cross ||
-                join->kind == ASTTableJoin::Kind::Comma)
-            {
-                if (!join->children.empty())
-                    throw Exception("Logical error: CROSS JOIN has expressions", ErrorCodes::LOGICAL_ERROR);
-            }
-
-            if (join->kind == ASTTableJoin::Kind::Comma)
-                ++num_comma;
+            if (!join->children.empty())
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR, "CROSS JOIN has {} expressions: [{}, ...]",
+                    join->children.size(), queryToString(join->children[0]));
         }
     }
 
-    if (num_using && (num_tables - num_array_join) > 2)
-    {
-        throw Exception("Multiple CROSS/COMMA JOIN do not support USING (while "
-            "processing '" + IAST::formatForErrorMessage(tables_with_using) + "')",
-            ErrorCodes::NOT_IMPLEMENTED);
-    }
-
-    return !(num_array_join || num_using);
+    return joined_tables;
 }
 
 }
@@ -229,27 +211,21 @@ void CrossToInnerJoinMatcher::visit(ASTPtr & ast, Data & data)
 
 void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & data)
 {
-    size_t num_comma = 0;
-    std::vector<JoinedElement> joined_tables;
-    if (!getTables(select, joined_tables, num_comma))
+    std::vector<JoinedElement> joined_tables = getTables(select);
+    if (joined_tables.empty())
         return;
 
     /// Check if joined_tables are consistent with known tables_with_columns
     {
         if (joined_tables.size() != data.tables_with_columns.size())
-            throw Exception("Logical error: inconsistent number of tables", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Logical error: inconsistent number of tables: {} != {}",
+                            joined_tables.size(), data.tables_with_columns.size());
 
         for (size_t i = 0; i < joined_tables.size(); ++i)
             joined_tables[i].checkTableName(data.tables_with_columns[i].table, data.current_database);
     }
 
-    /// COMMA to CROSS
-    if (num_comma)
-    {
-        for (auto & table : joined_tables)
-            table.rewriteCommaToCross();
-    }
-
     /// CROSS to INNER
     if (data.cross_to_inner_join_rewrite && select.where())
     {
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index 8bebc2fb442..cfce6ac9463 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -6,7 +6,7 @@
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <Poco/Net/NetException.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
@@ -22,6 +22,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_FORMAT_VERSION;
     extern const int UNKNOWN_TYPE_OF_QUERY;
     extern const int INCONSISTENT_CLUSTER_DEFINITION;
+    extern const int LOGICAL_ERROR;
 }
 
 HostID HostID::fromString(const String & host_port_str)
@@ -362,7 +363,7 @@ ContextMutablePtr DatabaseReplicatedTask::makeQueryContext(ContextPtr from_conte
     query_context->getClientInfo().is_replicated_database_internal = true;
     query_context->setCurrentDatabase(database->getDatabaseName());
 
-    auto txn = std::make_shared<ZooKeeperMetadataTransaction>(zookeeper, database->zookeeper_path, is_initial_query);
+    auto txn = std::make_shared<ZooKeeperMetadataTransaction>(zookeeper, database->zookeeper_path, is_initial_query, entry_path);
     query_context->initZooKeeperMetadataTransaction(txn);
 
     if (is_initial_query)
@@ -402,7 +403,8 @@ UInt32 DDLTaskBase::getLogEntryNumber(const String & log_entry_name)
 
 void ZooKeeperMetadataTransaction::commit()
 {
-    assert(state == CREATED);
+    if (state != CREATED)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect state ({}), it's a bug", state);
     state = FAILED;
     current_zookeeper->multi(ops);
     state = COMMITTED;
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index 41ab9ec8058..ee49274707a 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -20,6 +20,11 @@ namespace fs = std::filesystem;
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 class ASTQueryWithOnCluster;
 using ZooKeeperPtr = std::shared_ptr<zkutil::ZooKeeper>;
 using ClusterPtr = std::shared_ptr<Cluster>;
@@ -164,13 +169,15 @@ class ZooKeeperMetadataTransaction
     ZooKeeperPtr current_zookeeper;
     String zookeeper_path;
     bool is_initial_query;
+    String task_path;
     Coordination::Requests ops;
 
 public:
-    ZooKeeperMetadataTransaction(const ZooKeeperPtr & current_zookeeper_, const String & zookeeper_path_, bool is_initial_query_)
+    ZooKeeperMetadataTransaction(const ZooKeeperPtr & current_zookeeper_, const String & zookeeper_path_, bool is_initial_query_, const String & task_path_)
     : current_zookeeper(current_zookeeper_)
     , zookeeper_path(zookeeper_path_)
     , is_initial_query(is_initial_query_)
+    , task_path(task_path_)
     {
     }
 
@@ -180,15 +187,21 @@ public:
 
     String getDatabaseZooKeeperPath() const { return zookeeper_path; }
 
+    String getTaskZooKeeperPath() const { return task_path; }
+
+    ZooKeeperPtr getZooKeeper() const { return current_zookeeper; }
+
     void addOp(Coordination::RequestPtr && op)
     {
-        assert(!isExecuted());
+        if (isExecuted())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add ZooKeeper operation because query is executed. It's a bug.");
         ops.emplace_back(op);
     }
 
     void moveOpsTo(Coordination::Requests & other_ops)
     {
-        assert(!isExecuted());
+        if (isExecuted())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot add ZooKeeper operation because query is executed. It's a bug.");
         std::move(ops.begin(), ops.end(), std::back_inserter(other_ops));
         ops.clear();
         state = COMMITTED;
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index 47ca2b72db8..d7984af30c7 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -24,12 +24,12 @@
 #include <Common/isLocalAddress.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Poco/Timestamp.h>
-#include <common/sleep.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/logger_useful.h>
+#include <base/sleep.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/logger_useful.h>
 #include <random>
 #include <pcg_random.hpp>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 #include <Interpreters/ZooKeeperLog.h>
 
@@ -158,15 +158,20 @@ DDLWorker::DDLWorker(
     const Poco::Util::AbstractConfiguration * config,
     const String & prefix,
     const String & logger_name,
-    const CurrentMetrics::Metric * max_entry_metric_)
+    const CurrentMetrics::Metric * max_entry_metric_,
+    const CurrentMetrics::Metric * max_pushed_entry_metric_)
     : context(Context::createCopy(context_))
     , log(&Poco::Logger::get(logger_name))
     , pool_size(pool_size_)
     , max_entry_metric(max_entry_metric_)
+    , max_pushed_entry_metric(max_pushed_entry_metric_)
 {
     if (max_entry_metric)
         CurrentMetrics::set(*max_entry_metric, 0);
 
+    if (max_pushed_entry_metric)
+        CurrentMetrics::set(*max_pushed_entry_metric, 0);
+
     if (1 < pool_size)
     {
         LOG_WARNING(log, "DDLWorker is configured to use multiple threads. "
@@ -629,7 +634,7 @@ void DDLWorker::processTask(DDLTaskBase & task, const ZooKeeperPtr & zookeeper)
             String dummy;
             if (zookeeper->tryGet(active_node_path, dummy, nullptr, eph_node_disappeared))
             {
-                constexpr int timeout_ms = 30 * 1000;
+                constexpr int timeout_ms = 60 * 1000;
                 if (!eph_node_disappeared->tryWait(timeout_ms))
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Ephemeral node {} still exists, "
                                     "probably it's owned by someone else", active_node_path);
@@ -767,7 +772,9 @@ bool DDLWorker::tryExecuteQueryOnLeaderReplica(
     String shard_path = task.getShardNodePath();
     String is_executed_path = fs::path(shard_path) / "executed";
     String tries_to_execute_path = fs::path(shard_path) / "tries_to_execute";
-    zookeeper->createAncestors(fs::path(shard_path) / ""); /* appends "/" at the end of shard_path */
+    assert(shard_path.starts_with(String(fs::path(task.entry_path) / "shards" / "")));
+    zookeeper->createIfNotExists(fs::path(task.entry_path) / "shards", "");
+    zookeeper->createIfNotExists(shard_path, "");
 
     /// Leader replica creates is_executed_path node on successful query execution.
     /// We will remove create_shard_flag from zk operations list, if current replica is just waiting for leader to execute the query.
@@ -1046,6 +1053,15 @@ String DDLWorker::enqueueQuery(DDLLogEntry & entry)
     zookeeper->createAncestors(query_path_prefix);
 
     String node_path = zookeeper->create(query_path_prefix, entry.toString(), zkutil::CreateMode::PersistentSequential);
+    if (max_pushed_entry_metric)
+    {
+        String str_buf = node_path.substr(query_path_prefix.length());
+        DB::ReadBufferFromString in(str_buf);
+        CurrentMetrics::Metric id;
+        readText(id, in);
+        id = std::max(*max_pushed_entry_metric, id);
+        CurrentMetrics::set(*max_pushed_entry_metric, id);
+    }
 
     /// We cannot create status dirs in a single transaction with previous request,
     /// because we don't know node_path until previous request is executed.
@@ -1140,30 +1156,7 @@ void DDLWorker::runMainThread()
 
             LOG_DEBUG(log, "Waiting for queue updates (stat: {}, {}, {}, {})",
                       queue_node_stat.version, queue_node_stat.cversion, queue_node_stat.numChildren, queue_node_stat.pzxid);
-            /// FIXME It may hang for unknown reason. Timeout is just a hotfix.
-            constexpr int queue_wait_timeout_ms = 10000;
-            bool updated = queue_updated_event->tryWait(queue_wait_timeout_ms);
-            if (!updated)
-            {
-                Coordination::Stat new_stat;
-                tryGetZooKeeper()->get(queue_dir, &new_stat);
-                bool queue_changed = memcmp(&queue_node_stat, &new_stat, sizeof(Coordination::Stat)) != 0;
-                bool watch_triggered = queue_updated_event->tryWait(0);
-                if (queue_changed && !watch_triggered)
-                {
-                    /// It should never happen.
-                    /// Maybe log message, abort() and system.zookeeper_log will help to debug it and remove timeout (#26036).
-                    LOG_TRACE(
-                        log,
-                        "Queue was not updated (stat: {}, {}, {}, {})",
-                        new_stat.version,
-                        new_stat.cversion,
-                        new_stat.numChildren,
-                        new_stat.pzxid);
-                    context->getZooKeeperLog()->flush();
-                    abort();
-                }
-            }
+            queue_updated_event->wait();
         }
         catch (const Coordination::Exception & e)
         {
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index d05b9b27611..d2b7c9d169d 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -44,7 +44,7 @@ class DDLWorker
 {
 public:
     DDLWorker(int pool_size_, const std::string & zk_root_dir, ContextPtr context_, const Poco::Util::AbstractConfiguration * config, const String & prefix,
-              const String & logger_name = "DDLWorker", const CurrentMetrics::Metric * max_entry_metric_ = nullptr);
+              const String & logger_name = "DDLWorker", const CurrentMetrics::Metric * max_entry_metric_ = nullptr, const CurrentMetrics::Metric * max_pushed_entry_metric_ = nullptr);
     virtual ~DDLWorker();
 
     /// Pushes query into DDL queue, returns path to created node
@@ -148,6 +148,7 @@ protected:
 
     std::atomic<UInt64> max_id = 0;
     const CurrentMetrics::Metric * max_entry_metric;
+    const CurrentMetrics::Metric * max_pushed_entry_metric;
 };
 
 
diff --git a/src/Interpreters/DNSCacheUpdater.h b/src/Interpreters/DNSCacheUpdater.h
index bbbc2ab3d21..5d5486bd012 100644
--- a/src/Interpreters/DNSCacheUpdater.h
+++ b/src/Interpreters/DNSCacheUpdater.h
@@ -2,8 +2,6 @@
 
 #include <Core/BackgroundSchedulePool.h>
 #include <Interpreters/Context_fwd.h>
-#include <Common/Stopwatch.h>
-
 
 namespace DB
 {
diff --git a/src/Interpreters/DatabaseAndTableWithAlias.h b/src/Interpreters/DatabaseAndTableWithAlias.h
index e43481025a0..237c56d3ce3 100644
--- a/src/Interpreters/DatabaseAndTableWithAlias.h
+++ b/src/Interpreters/DatabaseAndTableWithAlias.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IAST_fwd.h>
 
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index fd6b5b9a810..205d7052d0c 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -14,14 +14,12 @@
 #include <Poco/DirectoryIterator.h>
 #include <Common/renameat2.h>
 #include <Common/CurrentMetrics.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
 #include <Common/filesystemHelpers.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #    include <Databases/MySQL/MaterializedMySQLSyncThread.h>
@@ -30,6 +28,7 @@
 
 #if USE_LIBPQXX
 #    include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
+#    include <Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h>
 #endif
 
 namespace fs = std::filesystem;
@@ -146,7 +145,6 @@ void DatabaseCatalog::initializeAndLoadTemporaryDatabase()
 
 void DatabaseCatalog::loadDatabases()
 {
-    loadMarkedAsDroppedTables();
     auto task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
     drop_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(task_holder));
     (*drop_task)->activate();
@@ -241,7 +239,9 @@ DatabaseAndTable DatabaseCatalog::getTableImpl(
 #if USE_LIBPQXX
         if (!context_->isInternalQuery() && (db_and_table.first->getEngineName() == "MaterializedPostgreSQL"))
         {
-            db_and_table.second = std::make_shared<StorageMaterializedPostgreSQL>(std::move(db_and_table.second), getContext());
+            db_and_table.second = std::make_shared<StorageMaterializedPostgreSQL>(std::move(db_and_table.second), getContext(),
+                                        assert_cast<const DatabaseMaterializedPostgreSQL *>(db_and_table.first.get())->getPostgreSQLDatabaseName(),
+                                        db_and_table.second->getStorageID().table_name);
         }
 #endif
 
@@ -327,7 +327,7 @@ void DatabaseCatalog::attachDatabase(const String & database_name, const Databas
 }
 
 
-DatabasePtr DatabaseCatalog::detachDatabase(const String & database_name, bool drop, bool check_empty)
+DatabasePtr DatabaseCatalog::detachDatabase(ContextPtr local_context, const String & database_name, bool drop, bool check_empty)
 {
     if (database_name == TEMPORARY_DATABASE)
         throw Exception("Cannot detach database with temporary tables.", ErrorCodes::DATABASE_ACCESS_DENIED);
@@ -363,12 +363,14 @@ DatabasePtr DatabaseCatalog::detachDatabase(const String & database_name, bool d
     if (drop)
     {
         /// Delete the database.
-        db->drop(getContext());
+        db->drop(local_context);
 
         /// Old ClickHouse versions did not store database.sql files
+        /// Remove metadata dir (if exists) to avoid recreation of .sql file on server startup
+        fs::path database_metadata_dir = fs::path(getContext()->getPath()) / "metadata" / escapeForFileName(database_name);
+        fs::remove(database_metadata_dir);
         fs::path database_metadata_file = fs::path(getContext()->getPath()) / "metadata" / (escapeForFileName(database_name) + ".sql");
-        if (fs::exists(database_metadata_file))
-            fs::remove(database_metadata_file);
+        fs::remove(database_metadata_file);
     }
 
     return db;
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 74bfb814ce4..6079553b025 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -123,6 +123,8 @@ class DatabaseCatalog : boost::noncopyable, WithMutableContext
 public:
     static constexpr const char * TEMPORARY_DATABASE = "_temporary_and_external_tables";
     static constexpr const char * SYSTEM_DATABASE = "system";
+    static constexpr const char * INFORMATION_SCHEMA = "information_schema";
+    static constexpr const char * INFORMATION_SCHEMA_UPPERCASE = "INFORMATION_SCHEMA";
 
     static DatabaseCatalog & init(ContextMutablePtr global_context_);
     static DatabaseCatalog & instance();
@@ -130,6 +132,7 @@ public:
 
     void initializeAndLoadTemporaryDatabase();
     void loadDatabases();
+    void loadMarkedAsDroppedTables();
 
     /// Get an object that protects the table from concurrently executing multiple DDL operations.
     DDLGuardPtr getDDLGuard(const String & database, const String & table);
@@ -144,7 +147,7 @@ public:
     DatabasePtr getSystemDatabase() const;
 
     void attachDatabase(const String & database_name, const DatabasePtr & database);
-    DatabasePtr detachDatabase(const String & database_name, bool drop = false, bool check_empty = true);
+    DatabasePtr detachDatabase(ContextPtr local_context, const String & database_name, bool drop = false, bool check_empty = true);
     void updateDatabaseName(const String & old_name, const String & new_name);
 
     /// database_name must be not empty
@@ -240,7 +243,6 @@ private:
     };
     using TablesMarkedAsDropped = std::list<TableMarkedAsDropped>;
 
-    void loadMarkedAsDroppedTables();
     void dropTableDataTask();
     void dropTableFinally(const TableMarkedAsDropped & table);
 
diff --git a/src/Interpreters/DictionaryReader.cpp b/src/Interpreters/DictionaryReader.cpp
index fc795b9cdfb..3c66b0019ed 100644
--- a/src/Interpreters/DictionaryReader.cpp
+++ b/src/Interpreters/DictionaryReader.cpp
@@ -128,7 +128,7 @@ void DictionaryReader::readKeys(const IColumn & keys, Block & out_block, ColumnV
     found.swap(typeid_cast<ColumnVector<UInt8> &>(*mutable_has).getData());
     has_column.column = nullptr;
 
-    /// set mapping form source keys to resulting rows in output block
+    /// set mapping from source keys to resulting rows in output block
     positions.clear();
     positions.resize(size, 0);
     size_t pos = 0;
diff --git a/src/Interpreters/DuplicateOrderByVisitor.cpp b/src/Interpreters/DuplicateOrderByVisitor.cpp
new file mode 100644
index 00000000000..df063fc849e
--- /dev/null
+++ b/src/Interpreters/DuplicateOrderByVisitor.cpp
@@ -0,0 +1,124 @@
+#include <Interpreters/DuplicateOrderByVisitor.h>
+#include <Functions/FunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
+}
+
+
+namespace
+{
+
+/// Checks if SELECT has stateful functions
+class ASTFunctionStatefulData
+{
+public:
+    using TypeToVisit = ASTFunction;
+
+    ContextPtr context;
+    bool & is_stateful;
+    void visit(ASTFunction & ast_function, ASTPtr &)
+    {
+        auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
+
+        if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
+        {
+            is_stateful = true;
+            return;
+        }
+
+        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
+
+        if (function && function->isStateful())
+        {
+            is_stateful = true;
+            return;
+        }
+    }
+};
+
+using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
+using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
+
+}
+
+
+void DuplicateOrderByFromSubqueriesData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    if (done)
+        return;
+    done = true;
+
+    if (select_query.orderBy())
+    {
+        /// If we have limits then the ORDER BY is non-removable.
+        if (select_query.limitBy()
+            || select_query.limitByOffset()
+            || select_query.limitByLength()
+            || select_query.limitLength()
+            || select_query.limitOffset())
+        {
+            return;
+        }
+
+        /// If ORDER BY contains filling (in addition to sorting) it is non-removable.
+        for (const auto & child : select_query.orderBy()->children)
+        {
+            auto * ast = child->as<ASTOrderByElement>();
+            if (!ast || ast->children.empty())
+                throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+            if (ast->with_fill)
+                return;
+        }
+
+        select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
+    }
+}
+
+void DuplicateOrderByData::visit(ASTSelectQuery & select_query, ASTPtr &)
+{
+    if (select_query.orderBy() || select_query.groupBy())
+    {
+        for (auto & elem : select_query.children)
+        {
+            if (elem->as<ASTExpressionList>())
+            {
+                bool is_stateful = false;
+                ASTFunctionStatefulVisitor::Data data{context, is_stateful};
+                ASTFunctionStatefulVisitor(data).visit(elem);
+                if (is_stateful) //-V547
+                    return;
+            }
+        }
+
+        if (auto select_table_ptr = select_query.tables())
+        {
+            if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
+            {
+                if (!select_table->children.empty())
+                {
+                    DuplicateOrderByFromSubqueriesVisitor::Data data{false};
+                    DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
+                }
+            }
+        }
+    }
+}
+
+}
+
diff --git a/src/Interpreters/DuplicateOrderByVisitor.h b/src/Interpreters/DuplicateOrderByVisitor.h
index 4231b2600af..de8cb4c8f32 100644
--- a/src/Interpreters/DuplicateOrderByVisitor.h
+++ b/src/Interpreters/DuplicateOrderByVisitor.h
@@ -1,51 +1,13 @@
 #pragma once
 
-#include <Functions/FunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <IO/WriteHelpers.h>
 #include <Interpreters/InDepthNodeVisitor.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTSelectQuery.h>
-#include <Parsers/ASTSetQuery.h>
-#include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/IAST.h>
-#include <Common/typeid_cast.h>
+
 
 namespace DB
 {
 
-/// Checks if SELECT has stateful functions
-class ASTFunctionStatefulData
-{
-public:
-    using TypeToVisit = ASTFunction;
-
-    ContextPtr context;
-    bool & is_stateful;
-    void visit(ASTFunction & ast_function, ASTPtr &)
-    {
-        auto aggregate_function_properties = AggregateFunctionFactory::instance().tryGetProperties(ast_function.name);
-
-        if (aggregate_function_properties && aggregate_function_properties->is_order_dependent)
-        {
-            is_stateful = true;
-            return;
-        }
-
-        const auto & function = FunctionFactory::instance().tryGet(ast_function.name, context);
-
-        if (function && function->isStateful())
-        {
-            is_stateful = true;
-            return;
-        }
-    }
-};
-
-using ASTFunctionStatefulMatcher = OneTypeMatcher<ASTFunctionStatefulData>;
-using ASTFunctionStatefulVisitor = InDepthNodeVisitor<ASTFunctionStatefulMatcher, true>;
-
+class ASTSelectQuery;
 
 /// Erases unnecessary ORDER BY from subquery
 class DuplicateOrderByFromSubqueriesData
@@ -55,19 +17,7 @@ public:
 
     bool done = false;
 
-    void visit(ASTSelectQuery & select_query, ASTPtr &)
-    {
-        if (done)
-            return;
-
-        if (select_query.orderBy() && !select_query.limitBy() && !select_query.limitByOffset() &&
-            !select_query.limitByLength() && !select_query.limitLength() && !select_query.limitOffset())
-        {
-            select_query.setExpression(ASTSelectQuery::Expression::ORDER_BY, nullptr);
-        }
-
-        done = true;
-    }
+    void visit(ASTSelectQuery & select_query, ASTPtr &);
 };
 
 using DuplicateOrderByFromSubqueriesMatcher = OneTypeMatcher<DuplicateOrderByFromSubqueriesData>;
@@ -82,35 +32,7 @@ public:
 
     ContextPtr context;
 
-    void visit(ASTSelectQuery & select_query, ASTPtr &)
-    {
-        if (select_query.orderBy() || select_query.groupBy())
-        {
-            for (auto & elem : select_query.children)
-            {
-                if (elem->as<ASTExpressionList>())
-                {
-                    bool is_stateful = false;
-                    ASTFunctionStatefulVisitor::Data data{context, is_stateful};
-                    ASTFunctionStatefulVisitor(data).visit(elem);
-                    if (is_stateful) //-V547
-                        return;
-                }
-            }
-
-            if (auto select_table_ptr = select_query.tables())
-            {
-                if (auto * select_table = select_table_ptr->as<ASTTablesInSelectQuery>())
-                {
-                    if (!select_table->children.empty())
-                    {
-                        DuplicateOrderByFromSubqueriesVisitor::Data data{false};
-                        DuplicateOrderByFromSubqueriesVisitor(data).visit(select_table->children[0]);
-                    }
-                }
-            }
-        }
-    }
+    void visit(ASTSelectQuery & select_query, ASTPtr &);
 };
 
 using DuplicateOrderByMatcher = OneTypeMatcher<DuplicateOrderByData>;
diff --git a/src/Interpreters/EmbeddedDictionaries.cpp b/src/Interpreters/EmbeddedDictionaries.cpp
index 947768ad3d7..afb41962dfe 100644
--- a/src/Interpreters/EmbeddedDictionaries.cpp
+++ b/src/Interpreters/EmbeddedDictionaries.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Common/setThreadName.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Util/Application.h>
 
 
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index f46cbdd2465..2117eec0063 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -2,7 +2,6 @@
 
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnNullable.h>
-#include <DataStreams/materializeBlock.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <IO/WriteHelpers.h>
@@ -80,9 +79,13 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
 
     Block scalar;
     if (data.getContext()->hasQueryContext() && data.getContext()->getQueryContext()->hasScalar(scalar_query_hash_str))
+    {
         scalar = data.getContext()->getQueryContext()->getScalar(scalar_query_hash_str);
+    }
     else if (data.scalars.count(scalar_query_hash_str))
+    {
         scalar = data.scalars[scalar_query_hash_str];
+    }
     else
     {
         auto subquery_context = Context::createCopy(data.getContext());
@@ -149,7 +152,8 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
                 throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
 
             Block tmp_block;
-            while (tmp_block.rows() == 0 && executor.pull(tmp_block));
+            while (tmp_block.rows() == 0 && executor.pull(tmp_block))
+                ;
 
             if (tmp_block.rows() != 0)
                 throw Exception("Scalar subquery returned more than one row", ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY);
@@ -173,10 +177,10 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
         }
         else
         {
-            ColumnWithTypeAndName ctn;
-            ctn.type = std::make_shared<DataTypeTuple>(block.getDataTypes());
-            ctn.column = ColumnTuple::create(block.getColumns());
-            scalar.insert(ctn);
+            scalar.insert({
+                ColumnTuple::create(block.getColumns()),
+                std::make_shared<DataTypeTuple>(block.getDataTypes()),
+                "tuple"});
         }
     }
 
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index 6797947a101..73c191d39ab 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -5,6 +5,7 @@
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/Context.h>
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnFunction.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -16,6 +17,8 @@
 #include <queue>
 #include <stack>
 #include <Common/JSONBuilder.h>
+#include <Core/SettingsEnums.h>
+
 
 #if defined(MEMORY_SANITIZER)
     #include <sanitizer/msan_interface.h>
@@ -45,17 +48,22 @@ namespace ErrorCodes
 
 ExpressionActions::~ExpressionActions() = default;
 
+static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions(const ActionsDAG & actions_dag, ShortCircuitFunctionEvaluation short_circuit_function_evaluation);
+
 ExpressionActions::ExpressionActions(ActionsDAGPtr actions_dag_, const ExpressionActionsSettings & settings_)
     : settings(settings_)
 {
     actions_dag = actions_dag_->clone();
 
+    /// It's important to determine lazy executed nodes before compiling expressions.
+    std::unordered_set<const ActionsDAG::Node *> lazy_executed_nodes = processShortCircuitFunctions(*actions_dag, settings.short_circuit_function_evaluation);
+
 #if USE_EMBEDDED_COMPILER
     if (settings.can_compile_expressions && settings.compile_expressions == CompileExpressions::yes)
-        actions_dag->compileExpressions(settings.min_count_to_compile_expression);
+        actions_dag->compileExpressions(settings.min_count_to_compile_expression, lazy_executed_nodes);
 #endif
 
-    linearizeActions();
+    linearizeActions(lazy_executed_nodes);
 
     if (settings.max_temporary_columns && num_columns > settings.max_temporary_columns)
         throw Exception(ErrorCodes::TOO_MANY_TEMPORARY_COLUMNS,
@@ -68,7 +76,244 @@ ExpressionActionsPtr ExpressionActions::clone() const
     return std::make_shared<ExpressionActions>(*this);
 }
 
-void ExpressionActions::linearizeActions()
+namespace
+{
+    struct ActionsDAGReverseInfo
+    {
+        struct NodeInfo
+        {
+            std::vector<const ActionsDAG::Node *> parents;
+            bool used_in_result = false;
+        };
+
+        using ReverseIndex = std::unordered_map<const ActionsDAG::Node *, size_t>;
+        std::vector<NodeInfo> nodes_info;
+        ReverseIndex reverse_index;
+    };
+}
+
+static ActionsDAGReverseInfo getActionsDAGReverseInfo(const std::list<ActionsDAG::Node> & nodes, const ActionsDAG::NodeRawConstPtrs & index)
+{
+    ActionsDAGReverseInfo result_info;
+    result_info.nodes_info.resize(nodes.size());
+
+    for (const auto & node : nodes)
+    {
+        size_t id = result_info.reverse_index.size();
+        result_info.reverse_index[&node] = id;
+    }
+
+    for (const auto * node : index)
+        result_info.nodes_info[result_info.reverse_index[node]].used_in_result = true;
+
+    for (const auto & node : nodes)
+    {
+        for (const auto & child : node.children)
+            result_info.nodes_info[result_info.reverse_index[child]].parents.emplace_back(&node);
+    }
+
+    return result_info;
+}
+
+static DataTypesWithConstInfo getDataTypesWithConstInfoFromNodes(const ActionsDAG::NodeRawConstPtrs & nodes)
+{
+    DataTypesWithConstInfo types;
+    types.reserve(nodes.size());
+    for (const auto & child : nodes)
+    {
+        bool is_const = child->column && isColumnConst(*child->column);
+        types.push_back({child->result_type, is_const});
+    }
+    return types;
+}
+
+namespace
+{
+    /// Information about the node that helps to determine if it can be executed lazily.
+    struct LazyExecutionInfo
+    {
+        bool can_be_lazy_executed;
+        /// For each node we need to know all it's ancestors that are short-circuit functions.
+        /// Also we need to know which arguments of this short-circuit functions are ancestors for the node
+        /// (we will store the set of indexes of arguments), because for some short-circuit function we shouldn't
+        /// enable lazy execution for nodes that are common descendants of different function arguments.
+        /// Example: if(cond, expr1(..., expr, ...), expr2(..., expr, ...))).
+        std::unordered_map<const ActionsDAG::Node *, std::unordered_set<size_t>> short_circuit_ancestors_info;
+    };
+}
+
+/// Create lazy execution info for node.
+static void setLazyExecutionInfo(
+    const ActionsDAG::Node * node,
+    const ActionsDAGReverseInfo & reverse_info,
+    const std::unordered_map<const ActionsDAG::Node *, IFunctionBase::ShortCircuitSettings> & short_circuit_nodes,
+    std::unordered_map<const ActionsDAG::Node *, LazyExecutionInfo> & lazy_execution_infos)
+{
+    /// If we already created info about this node, just do nothing.
+    if (lazy_execution_infos.contains(node))
+        return;
+
+    LazyExecutionInfo & lazy_execution_info = lazy_execution_infos[node];
+    lazy_execution_info.can_be_lazy_executed = true;
+
+    const ActionsDAGReverseInfo::NodeInfo & node_info = reverse_info.nodes_info[reverse_info.reverse_index.at(node)];
+
+    /// If node is used in result, we can't enable lazy execution.
+    if (node_info.used_in_result)
+        lazy_execution_info.can_be_lazy_executed = false;
+
+    /// To fill lazy execution info for current node we need to create it for all it's parents.
+    for (const auto & parent : node_info.parents)
+    {
+        setLazyExecutionInfo(parent, reverse_info, short_circuit_nodes, lazy_execution_infos);
+        /// Update current node info according to parent info.
+        if (short_circuit_nodes.contains(parent))
+        {
+            /// Use set, because one node can be more than one argument.
+            /// Example: expr1 AND expr2 AND expr1.
+            std::set<size_t> indexes;
+            for (size_t i = 0; i != parent->children.size(); ++i)
+            {
+                if (node == parent->children[i])
+                    indexes.insert(i);
+            }
+
+            if (!short_circuit_nodes.at(parent).enable_lazy_execution_for_first_argument && node == parent->children[0])
+            {
+                /// We shouldn't add 0 index in node info in this case.
+                indexes.erase(0);
+                /// Disable lazy execution for current node only if it's disabled for short-circuit node,
+                /// because we can have nested short-circuit nodes.
+                if (!lazy_execution_infos[parent].can_be_lazy_executed)
+                    lazy_execution_info.can_be_lazy_executed = false;
+            }
+
+            lazy_execution_info.short_circuit_ancestors_info[parent].insert(indexes.begin(), indexes.end());
+        }
+        else
+            /// If lazy execution is disabled for one of parents, we should disable it for current node.
+            lazy_execution_info.can_be_lazy_executed &= lazy_execution_infos[parent].can_be_lazy_executed;
+
+        /// Update info about short-circuit ancestors according to parent info.
+        for (const auto & [short_circuit_node, indexes] : lazy_execution_infos[parent].short_circuit_ancestors_info)
+            lazy_execution_info.short_circuit_ancestors_info[short_circuit_node].insert(indexes.begin(), indexes.end());
+    }
+
+    if (!lazy_execution_info.can_be_lazy_executed)
+        return;
+
+    /// Check if current node is common descendant of different function arguments of
+    /// short-circuit function that disables lazy execution on this case.
+    for (const auto & [short_circuit_node, indexes] : lazy_execution_info.short_circuit_ancestors_info)
+    {
+        /// If lazy execution is enabled for this short-circuit node,
+        /// we shouldn't disable it for current node.
+        if (lazy_execution_infos[short_circuit_node].can_be_lazy_executed)
+            continue;
+
+        if (!short_circuit_nodes.at(short_circuit_node).enable_lazy_execution_for_common_descendants_of_arguments && indexes.size() > 1)
+        {
+            lazy_execution_info.can_be_lazy_executed = false;
+            return;
+        }
+    }
+}
+
+
+/// Enable lazy execution for short-circuit function arguments.
+static bool findLazyExecutedNodes(
+    const ActionsDAG::NodeRawConstPtrs & children,
+    std::unordered_map<const ActionsDAG::Node *, LazyExecutionInfo> & lazy_execution_infos,
+    bool force_enable_lazy_execution,
+    std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes_out)
+{
+    bool has_lazy_node = false;
+    for (const auto * child : children)
+    {
+        /// Skip node that have already been found as lazy executed.
+        if (lazy_executed_nodes_out.contains(child))
+        {
+            has_lazy_node = true;
+            continue;
+        }
+
+        /// Skip nodes that cannot be lazy executed.
+        if (!lazy_execution_infos[child].can_be_lazy_executed)
+            continue;
+
+        /// We cannot propagate lazy execution through arrayJoin, because when we execute
+        /// arrayJoin we need to know the exact offset of it's argument to replicate the other arguments.
+        /// We cannot determine the exact offset without it's argument execution, because the offset
+        /// can depend on on it.
+        /// Example: arrayJoin(range(number)), we use lazy execution for masked function execution,
+        /// but if we filter column number by mask and then execute function range() and arrayJoin, we will get
+        /// the offset that is differ from what we would get without filtering.
+        switch (child->type)
+        {
+            case ActionsDAG::ActionType::FUNCTION:
+            {
+                /// Propagate lazy execution through function arguments.
+                bool has_lazy_child = findLazyExecutedNodes(child->children, lazy_execution_infos, force_enable_lazy_execution, lazy_executed_nodes_out);
+
+                /// Use lazy execution when:
+                ///  - It's force enabled.
+                ///  - Function is suitable for lazy execution.
+                ///  - Function has lazy executed arguments.
+                if (force_enable_lazy_execution || has_lazy_child || child->function_base->isSuitableForShortCircuitArgumentsExecution(getDataTypesWithConstInfoFromNodes(child->children)))
+                {
+                    has_lazy_node = true;
+                    lazy_executed_nodes_out.insert(child);
+                }
+                break;
+            }
+            case ActionsDAG::ActionType::ALIAS:
+                /// Propagate lazy execution through alias.
+                has_lazy_node |= findLazyExecutedNodes(child->children, lazy_execution_infos, force_enable_lazy_execution, lazy_executed_nodes_out);
+                break;
+            default:
+                break;
+        }
+    }
+    return has_lazy_node;
+}
+
+static std::unordered_set<const ActionsDAG::Node *> processShortCircuitFunctions(const ActionsDAG & actions_dag, ShortCircuitFunctionEvaluation short_circuit_function_evaluation)
+{
+    if (short_circuit_function_evaluation == ShortCircuitFunctionEvaluation::DISABLE)
+        return {};
+
+    const auto & nodes = actions_dag.getNodes();
+
+    /// Firstly, find all short-circuit functions and get their settings.
+    std::unordered_map<const ActionsDAG::Node *, IFunctionBase::ShortCircuitSettings> short_circuit_nodes;
+    IFunctionBase::ShortCircuitSettings short_circuit_settings;
+    for (const auto & node : nodes)
+    {
+        if (node.type == ActionsDAG::ActionType::FUNCTION && node.function_base->isShortCircuit(short_circuit_settings, node.children.size()) && !node.children.empty())
+            short_circuit_nodes[&node] = short_circuit_settings;
+    }
+
+    auto reverse_info = getActionsDAGReverseInfo(nodes, actions_dag.getIndex());
+
+    /// For each node we fill LazyExecutionInfo.
+    std::unordered_map<const ActionsDAG::Node *, LazyExecutionInfo> lazy_execution_infos;
+    for (const auto & node : nodes)
+        setLazyExecutionInfo(&node, reverse_info, short_circuit_nodes, lazy_execution_infos);
+
+    std::unordered_set<const ActionsDAG::Node *> lazy_executed_nodes;
+    for (const auto & [node, settings] : short_circuit_nodes)
+    {
+        /// Recursively find nodes that should be lazy executed.
+        findLazyExecutedNodes(
+            node->children,
+            lazy_execution_infos,
+            settings.force_enable_lazy_execution || short_circuit_function_evaluation == ShortCircuitFunctionEvaluation::FORCE_ENABLE,
+            lazy_executed_nodes);
+    }
+    return lazy_executed_nodes;
+}
+
+void ExpressionActions::linearizeActions(const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     /// This function does the topological sort on DAG and fills all the fields of ExpressionActions.
     /// Algorithm traverses DAG starting from nodes without children.
@@ -77,41 +322,24 @@ void ExpressionActions::linearizeActions()
     {
         const Node * node = nullptr;
         size_t num_created_children = 0;
-        std::vector<const Node *> parents;
-
         ssize_t position = -1;
         size_t num_created_parents = 0;
-        bool used_in_result = false;
     };
 
     const auto & nodes = getNodes();
     const auto & index = actions_dag->getIndex();
     const auto & inputs = actions_dag->getInputs();
 
-    std::vector<Data> data(nodes.size());
-    std::unordered_map<const Node *, size_t> reverse_index;
-
+    auto reverse_info = getActionsDAGReverseInfo(nodes, index);
+    std::vector<Data> data;
     for (const auto & node : nodes)
-    {
-        size_t id = reverse_index.size();
-        data[id].node = &node;
-        reverse_index[&node] = id;
-    }
+        data.push_back({.node = &node});
 
     /// There are independent queues for arrayJoin and other actions.
     /// We delay creation of arrayJoin as long as we can, so that they will be executed closer to end.
     std::queue<const Node *> ready_nodes;
     std::queue<const Node *> ready_array_joins;
 
-    for (const auto * node : index)
-        data[reverse_index[node]].used_in_result = true;
-
-    for (const auto & node : nodes)
-    {
-        for (const auto & child : node.children)
-            data[reverse_index[child]].parents.emplace_back(&node);
-    }
-
     for (const auto & node : nodes)
     {
         if (node.children.empty())
@@ -128,7 +356,9 @@ void ExpressionActions::linearizeActions()
         const Node * node = stack.front();
         stack.pop();
 
-        auto & cur = data[reverse_index[node]];
+        auto cur_index = reverse_info.reverse_index[node];
+        auto & cur = data[cur_index];
+        auto & cur_info = reverse_info.nodes_info[cur_index];
 
         /// Select position for action result.
         size_t free_position = num_columns;
@@ -146,7 +376,9 @@ void ExpressionActions::linearizeActions()
         arguments.reserve(cur.node->children.size());
         for (const auto * child : cur.node->children)
         {
-            auto & arg = data[reverse_index[child]];
+            auto arg_index = reverse_info.reverse_index[child];
+            auto & arg = data[arg_index];
+            auto arg_info = reverse_info.nodes_info[arg_index];
 
             if (arg.position < 0)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Argument was not calculated for {}", child->result_name);
@@ -155,7 +387,7 @@ void ExpressionActions::linearizeActions()
 
             ExpressionActions::Argument argument;
             argument.pos = arg.position;
-            argument.needed_later = arg.used_in_result || arg.num_created_parents != arg.parents.size();
+            argument.needed_later = arg_info.used_in_result || arg.num_created_parents != arg_info.parents.size();
 
             if (!argument.needed_later)
                 free_positions.push(argument.pos);
@@ -167,17 +399,17 @@ void ExpressionActions::linearizeActions()
         {
             /// Argument for input is special. It contains the position from required columns.
             ExpressionActions::Argument argument;
-            argument.needed_later = !cur.parents.empty();
+            argument.needed_later = !cur_info.parents.empty();
             arguments.emplace_back(argument);
 
             //required_columns.push_back({node->result_name, node->result_type});
         }
 
-        actions.push_back({node, arguments, free_position});
+        actions.push_back({node, arguments, free_position, lazy_executed_nodes.contains(node)});
 
-        for (const auto & parent : cur.parents)
+        for (const auto & parent : cur_info.parents)
         {
-            auto & parent_data = data[reverse_index[parent]];
+            auto & parent_data = data[reverse_info.reverse_index[parent]];
             ++parent_data.num_created_children;
 
             if (parent_data.num_created_children == parent->children.size())
@@ -192,7 +424,7 @@ void ExpressionActions::linearizeActions()
 
     for (const auto & node : index)
     {
-        auto pos = data[reverse_index[node]].position;
+        auto pos = data[reverse_info.reverse_index[node]].position;
 
         if (pos < 0)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Action for {} was not calculated", node->result_name);
@@ -205,7 +437,7 @@ void ExpressionActions::linearizeActions()
 
     for (const auto * input : inputs)
     {
-        const auto & cur = data[reverse_index[input]];
+        const auto & cur = data[reverse_info.reverse_index[input]];
         auto pos = required_columns.size();
         actions[cur.position].arguments.front().pos = pos;
         required_columns.push_back({input->result_name, input->result_type});
@@ -342,6 +574,13 @@ static void executeAction(const ExpressionActions::Action & action, ExecutionCon
             res_column.type = action.node->result_type;
             res_column.name = action.node->result_name;
 
+            if (action.node->column)
+            {
+                /// Do not execute function if it's result is already known.
+                res_column.column = action.node->column->cloneResized(num_rows);
+                break;
+            }
+
             ColumnsWithTypeAndName arguments(action.arguments.size());
             for (size_t i = 0; i < arguments.size(); ++i)
             {
@@ -351,11 +590,16 @@ static void executeAction(const ExpressionActions::Action & action, ExecutionCon
                     arguments[i] = columns[action.arguments[i].pos];
             }
 
-            ProfileEvents::increment(ProfileEvents::FunctionExecute);
-            if (action.node->is_function_compiled)
-                ProfileEvents::increment(ProfileEvents::CompiledFunctionExecute);
+            if (action.is_lazy_executed)
+                res_column.column = ColumnFunction::create(num_rows, action.node->function_base, std::move(arguments), true, action.node->is_function_compiled);
+            else
+            {
+                ProfileEvents::increment(ProfileEvents::FunctionExecute);
+                if (action.node->is_function_compiled)
+                    ProfileEvents::increment(ProfileEvents::CompiledFunctionExecute);
 
-            res_column.column = action.node->function->execute(arguments, res_column.type, num_rows, dry_run);
+                res_column.column = action.node->function->execute(arguments, res_column.type, num_rows, dry_run);
+            }
             break;
         }
 
@@ -548,7 +792,7 @@ std::string ExpressionActions::getSmallestColumn(const NamesAndTypesList & colum
     for (const auto & column : columns)
     {
         /// Skip .sizeX and similar meta information
-        if (!column.getSubcolumnName().empty())
+        if (column.isSubcolumn())
             continue;
 
         /// @todo resolve evil constant
@@ -793,12 +1037,15 @@ ExpressionActionsChain::JoinStep::JoinStep(
     : Step({})
     , analyzed_join(std::move(analyzed_join_))
     , join(std::move(join_))
-    , result_columns(std::move(required_columns_))
 {
-    for (const auto & column : result_columns)
+    for (const auto & column : required_columns_)
         required_columns.emplace_back(column.name, column.type);
 
-    analyzed_join->addJoinedColumnsAndCorrectTypes(result_columns);
+    NamesAndTypesList result_names_and_types = required_columns;
+    analyzed_join->addJoinedColumnsAndCorrectTypes(result_names_and_types, true);
+    for (const auto & [name, type] : result_names_and_types)
+        /// `column` is `nullptr` because we don't care on constness here, it may be changed in join
+        result_columns.emplace_back(nullptr, type, name);
 }
 
 void ExpressionActionsChain::JoinStep::finalize(const NameSet & required_output_)
@@ -809,11 +1056,12 @@ void ExpressionActionsChain::JoinStep::finalize(const NameSet & required_output_
 
     /// That's an input columns we need.
     NameSet required_names = required_output_;
-    for (const auto & name : analyzed_join->keyNamesLeft())
+    for (const auto & name : analyzed_join->getAllNames(JoinTableSide::Left))
         required_names.emplace(name);
 
-    if (ASTPtr extra_condition_column = analyzed_join->joinConditionColumn(JoinTableSide::Left))
-        required_names.emplace(extra_condition_column->getColumnName());
+    for (const auto & onexpr : analyzed_join->getClauses())
+        if (const auto & cond_name = onexpr.condColumnNames().first; !cond_name.empty())
+            required_names.emplace(cond_name);
 
     for (const auto & column : required_columns)
     {
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index 4fddd1fd27e..c942f33b6df 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -7,9 +7,7 @@
 
 #include <variant>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 
 namespace DB
@@ -56,6 +54,10 @@ public:
         Arguments arguments;
         size_t result_position;
 
+        /// Determine if this action should be executed lazily. If it should and the node type is FUNCTION, then the function
+        /// won't be executed and will be stored with it's arguments in ColumnFunction with isShortCircuitArgument() = true.
+        bool is_lazy_executed;
+
         std::string toString() const;
         JSONBuilder::ItemPtr toTree() const;
     };
@@ -68,7 +70,6 @@ public:
     using NameToInputMap = std::unordered_map<std::string_view, std::list<size_t>>;
 
 private:
-
     ActionsDAGPtr actions_dag;
     Actions actions;
     size_t num_columns = 0;
@@ -122,7 +123,7 @@ public:
 private:
     void checkLimits(const ColumnsWithTypeAndName & columns) const;
 
-    void linearizeActions();
+    void linearizeActions(const std::unordered_set<const Node *> & lazy_executed_nodes);
 };
 
 
diff --git a/src/Interpreters/ExpressionActionsSettings.cpp b/src/Interpreters/ExpressionActionsSettings.cpp
index 550aa4d339c..8aec7afef4d 100644
--- a/src/Interpreters/ExpressionActionsSettings.cpp
+++ b/src/Interpreters/ExpressionActionsSettings.cpp
@@ -14,6 +14,7 @@ ExpressionActionsSettings ExpressionActionsSettings::fromSettings(const Settings
     settings.max_temporary_columns = from.max_temporary_columns;
     settings.max_temporary_non_const_columns = from.max_temporary_non_const_columns;
     settings.compile_expressions = compile_expressions;
+    settings.short_circuit_function_evaluation = from.short_circuit_function_evaluation;
 
     return settings;
 }
diff --git a/src/Interpreters/ExpressionActionsSettings.h b/src/Interpreters/ExpressionActionsSettings.h
index 26532128805..326de983748 100644
--- a/src/Interpreters/ExpressionActionsSettings.h
+++ b/src/Interpreters/ExpressionActionsSettings.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Interpreters/Context_fwd.h>
+#include <Core/SettingsEnums.h>
 
 #include <cstddef>
 
@@ -25,6 +26,8 @@ struct ExpressionActionsSettings
 
     CompileExpressions compile_expressions = CompileExpressions::no;
 
+    ShortCircuitFunctionEvaluation short_circuit_function_evaluation = ShortCircuitFunctionEvaluation::DISABLE;
+
     static ExpressionActionsSettings fromSettings(const Settings & from, CompileExpressions compile_expressions = CompileExpressions::no);
     static ExpressionActionsSettings fromContext(ContextPtr from, CompileExpressions compile_expressions = CompileExpressions::no);
 };
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 6245b297b36..d40a92972b2 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -35,7 +35,6 @@
 #include <Storages/StorageDictionary.h>
 #include <Storages/StorageJoin.h>
 
-#include <DataStreams/copyData.h>
 
 #include <Dictionaries/DictionaryStructure.h>
 
@@ -43,7 +42,6 @@
 #include <Common/StringUtils/StringUtils.h>
 
 #include <DataTypes/DataTypeFactory.h>
-#include <Parsers/parseQuery.h>
 
 #include <Interpreters/ActionsVisitor.h>
 #include <Interpreters/GetAggregatesVisitor.h>
@@ -56,6 +54,7 @@
 #include <IO/WriteBufferFromString.h>
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Parsers/formatAST.h>
 
 namespace DB
@@ -97,6 +96,96 @@ bool allowEarlyConstantFolding(const ActionsDAG & actions, const Settings & sett
     return true;
 }
 
+bool checkPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
+{
+    auto columns = select_query->select()->children;
+
+    /// In case of expression/function (order by 1+2 and 2*x1, greatest(1, 2)) replace
+    /// positions only if all literals are numbers, otherwise it is not positional.
+    bool positional = true;
+
+    /// Case when GROUP BY element is position.
+    if (const auto * ast_literal = typeid_cast<const ASTLiteral *>(argument.get()))
+    {
+        auto which = ast_literal->value.getType();
+        if (which == Field::Types::UInt64)
+        {
+            auto pos = ast_literal->value.get<UInt64>();
+            if (pos > 0 && pos <= columns.size())
+            {
+                const auto & column = columns[--pos];
+                if (typeid_cast<const ASTIdentifier *>(column.get()))
+                {
+                    argument = column->clone();
+                }
+                else if (typeid_cast<const ASTFunction *>(column.get()))
+                {
+                    std::function<void(ASTPtr)> throw_if_aggregate_function = [&](ASTPtr node)
+                    {
+                        if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
+                        {
+                            auto is_aggregate_function = AggregateFunctionFactory::instance().isAggregateFunctionName(function->name);
+                            if (is_aggregate_function)
+                            {
+                                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                                "Illegal value (aggregate function) for positional argument in {}",
+                                                ASTSelectQuery::expressionToString(expression));
+                            }
+                            else
+                            {
+                                if (function->arguments)
+                                {
+                                    for (const auto & arg : function->arguments->children)
+                                        throw_if_aggregate_function(arg);
+                                }
+                            }
+                        }
+                    };
+
+                    if (expression == ASTSelectQuery::Expression::GROUP_BY)
+                        throw_if_aggregate_function(column);
+
+                    argument = column->clone();
+                }
+                else
+                {
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                    "Illegal value for positional argument in {}",
+                                    ASTSelectQuery::expressionToString(expression));
+                }
+            }
+            else if (pos > columns.size() || !pos)
+            {
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                                "Positional argument out of bounds: {} (exprected in range [1, {}]",
+                                pos, columns.size());
+            }
+            /// Do not throw if pos < 0, because of TreeOptimizer::appendUnusedColumn()
+        }
+        else
+            positional = false;
+    }
+    else if (const auto * ast_function = typeid_cast<const ASTFunction *>(argument.get()))
+    {
+        if (ast_function->arguments)
+        {
+            for (auto & arg : ast_function->arguments->children)
+                positional &= checkPositionalArguments(arg, select_query, expression);
+        }
+    }
+    else
+        positional = false;
+
+    return positional;
+}
+
+void replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
+{
+    auto argument_with_replacement = argument->clone();
+    if (checkPositionalArguments(argument_with_replacement, select_query, expression))
+        argument = argument_with_replacement;
+}
+
 }
 
 bool sanitizeBlock(Block & block, bool throw_if_cannot_create_column)
@@ -152,6 +241,9 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     /// Replaces global subqueries with the generated names of temporary tables that will be sent to remote servers.
     initGlobalSubqueriesAndExternalTables(do_global);
 
+    auto temp_actions = std::make_shared<ActionsDAG>(sourceColumns());
+    columns_after_array_join = getColumnsAfterArrayJoin(temp_actions, sourceColumns());
+    columns_after_join = analyzeJoin(temp_actions, columns_after_array_join);
     /// has_aggregation, aggregation_keys, aggregate_descriptions, aggregated_columns.
     /// This analysis should be performed after processing global subqueries, because otherwise,
     /// if the aggregate function contains a global subquery, then `analyzeAggregation` method will save
@@ -159,11 +251,67 @@ ExpressionAnalyzer::ExpressionAnalyzer(
     /// global subquery. Then, when you call `initGlobalSubqueriesAndExternalTables` method, this
     /// the global subquery will be replaced with a temporary table, resulting in aggregate_descriptions
     /// will contain out-of-date information, which will lead to an error when the query is executed.
-    analyzeAggregation();
+    analyzeAggregation(temp_actions);
 }
 
+NamesAndTypesList ExpressionAnalyzer::getColumnsAfterArrayJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns)
+{
+    const auto * select_query = query->as<ASTSelectQuery>();
+    if (!select_query)
+        return {};
 
-void ExpressionAnalyzer::analyzeAggregation()
+    auto [array_join_expression_list, is_array_join_left] = select_query->arrayJoinExpressionList();
+
+    if (!array_join_expression_list)
+        return src_columns;
+
+    getRootActionsNoMakeSet(array_join_expression_list, true, actions, false);
+
+    auto array_join = addMultipleArrayJoinAction(actions, is_array_join_left);
+    auto sample_columns = actions->getResultColumns();
+    array_join->prepare(sample_columns);
+    actions = std::make_shared<ActionsDAG>(sample_columns);
+
+    NamesAndTypesList new_columns_after_array_join;
+    NameSet added_columns;
+
+    for (auto & column : actions->getResultColumns())
+    {
+        if (syntax->array_join_result_to_source.count(column.name))
+        {
+            new_columns_after_array_join.emplace_back(column.name, column.type);
+            added_columns.emplace(column.name);
+        }
+    }
+
+    for (const auto & column : src_columns)
+        if (added_columns.count(column.name) == 0)
+            new_columns_after_array_join.emplace_back(column.name, column.type);
+
+    return new_columns_after_array_join;
+}
+
+NamesAndTypesList ExpressionAnalyzer::analyzeJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns)
+{
+    const auto * select_query = query->as<ASTSelectQuery>();
+    if (!select_query)
+        return {};
+
+    const ASTTablesInSelectQueryElement * join = select_query->join();
+    if (join)
+    {
+        getRootActionsNoMakeSet(analyzedJoin().leftKeysList(), true, actions, false);
+        auto sample_columns = actions->getNamesAndTypesList();
+        syntax->analyzed_join->addJoinedColumnsAndCorrectTypes(sample_columns, true);
+        actions = std::make_shared<ActionsDAG>(sample_columns);
+    }
+
+    NamesAndTypesList result_columns = src_columns;
+    syntax->analyzed_join->addJoinedColumnsAndCorrectTypes(result_columns,false);
+    return result_columns;
+}
+
+void ExpressionAnalyzer::analyzeAggregation(ActionsDAGPtr & temp_actions)
 {
     /** Find aggregation keys (aggregation_keys), information about aggregate functions (aggregate_descriptions),
      *  as well as a set of columns obtained after the aggregation, if any,
@@ -174,137 +322,88 @@ void ExpressionAnalyzer::analyzeAggregation()
 
     auto * select_query = query->as<ASTSelectQuery>();
 
-    auto temp_actions = std::make_shared<ActionsDAG>(sourceColumns());
+    makeAggregateDescriptions(temp_actions, aggregate_descriptions);
+    has_aggregation = !aggregate_descriptions.empty() || (select_query && (select_query->groupBy() || select_query->having()));
 
-    if (select_query)
+    if (!has_aggregation)
     {
-        NamesAndTypesList array_join_columns;
-        columns_after_array_join = sourceColumns();
-
-        bool is_array_join_left;
-        if (ASTPtr array_join_expression_list = select_query->arrayJoinExpressionList(is_array_join_left))
-        {
-            getRootActionsNoMakeSet(array_join_expression_list, true, temp_actions, false);
-
-            auto array_join = addMultipleArrayJoinAction(temp_actions, is_array_join_left);
-            auto sample_columns = temp_actions->getResultColumns();
-            array_join->prepare(sample_columns);
-            temp_actions = std::make_shared<ActionsDAG>(sample_columns);
-
-            NamesAndTypesList new_columns_after_array_join;
-            NameSet added_columns;
-
-            for (auto & column : temp_actions->getResultColumns())
-            {
-                if (syntax->array_join_result_to_source.count(column.name))
-                {
-                    new_columns_after_array_join.emplace_back(column.name, column.type);
-                    added_columns.emplace(column.name);
-                }
-            }
-
-            for (auto & column : columns_after_array_join)
-                if (added_columns.count(column.name) == 0)
-                    new_columns_after_array_join.emplace_back(column.name, column.type);
-
-            columns_after_array_join.swap(new_columns_after_array_join);
-        }
-
-        columns_after_array_join.insert(columns_after_array_join.end(), array_join_columns.begin(), array_join_columns.end());
-
-        const ASTTablesInSelectQueryElement * join = select_query->join();
-        if (join)
-        {
-            getRootActionsNoMakeSet(analyzedJoin().leftKeysList(), true, temp_actions, false);
-            auto sample_columns = temp_actions->getResultColumns();
-            analyzedJoin().addJoinedColumnsAndCorrectTypes(sample_columns);
-            temp_actions = std::make_shared<ActionsDAG>(sample_columns);
-        }
-
-        columns_after_join = columns_after_array_join;
-        analyzedJoin().addJoinedColumnsAndCorrectTypes(columns_after_join, false);
+        aggregated_columns = temp_actions->getNamesAndTypesList();
+        return;
     }
 
-    has_aggregation = makeAggregateDescriptions(temp_actions);
-    if (select_query && (select_query->groupBy() || select_query->having()))
-        has_aggregation = true;
-
-    if (has_aggregation)
+    /// Find out aggregation keys.
+    if (select_query)
     {
-        /// Find out aggregation keys.
-        if (select_query)
+        if (ASTPtr group_by_ast = select_query->groupBy())
         {
-            if (select_query->groupBy())
+            NameSet unique_keys;
+            ASTs & group_asts = group_by_ast->children;
+            for (ssize_t i = 0; i < ssize_t(group_asts.size()); ++i)
             {
-                NameSet unique_keys;
-                ASTs & group_asts = select_query->groupBy()->children;
-                for (ssize_t i = 0; i < ssize_t(group_asts.size()); ++i)
+                ssize_t size = group_asts.size();
+
+                if (getContext()->getSettingsRef().enable_positional_arguments)
+                    replaceForPositionalArguments(group_asts[i], select_query, ASTSelectQuery::Expression::GROUP_BY);
+
+                getRootActionsNoMakeSet(group_asts[i], true, temp_actions, false);
+
+                const auto & column_name = group_asts[i]->getColumnName();
+
+                const auto * node = temp_actions->tryFindInIndex(column_name);
+                if (!node)
+                    throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
+
+                /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
+                if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
                 {
-                    ssize_t size = group_asts.size();
-                    getRootActionsNoMakeSet(group_asts[i], true, temp_actions, false);
-
-                    const auto & column_name = group_asts[i]->getColumnName(getContext()->getSettingsRef());
-                    const auto * node = temp_actions->tryFindInIndex(column_name);
-                    if (!node)
-                        throw Exception("Unknown identifier (in GROUP BY): " + column_name, ErrorCodes::UNKNOWN_IDENTIFIER);
-
-                    /// Only removes constant keys if it's an initiator or distributed_group_by_no_merge is enabled.
-                    if (getContext()->getClientInfo().distributed_depth == 0 || settings.distributed_group_by_no_merge > 0)
+                    /// Constant expressions have non-null column pointer at this stage.
+                    if (node->column && isColumnConst(*node->column))
                     {
-                        /// Constant expressions have non-null column pointer at this stage.
-                        if (node->column && isColumnConst(*node->column))
+                        select_query->group_by_with_constant_keys = true;
+
+                        /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
+                        if (!aggregate_descriptions.empty() || size > 1)
                         {
-                            select_query->group_by_with_constant_keys = true;
+                            if (i + 1 < static_cast<ssize_t>(size))
+                                group_asts[i] = std::move(group_asts.back());
 
-                            /// But don't remove last key column if no aggregate functions, otherwise aggregation will not work.
-                            if (!aggregate_descriptions.empty() || size > 1)
-                            {
-                                if (i + 1 < static_cast<ssize_t>(size))
-                                    group_asts[i] = std::move(group_asts.back());
+                            group_asts.pop_back();
 
-                                group_asts.pop_back();
-
-                                --i;
-                                continue;
-                            }
+                            --i;
+                            continue;
                         }
                     }
-
-                    NameAndTypePair key{column_name, node->result_type};
-
-                    /// Aggregation keys are uniqued.
-                    if (!unique_keys.count(key.name))
-                    {
-                        unique_keys.insert(key.name);
-                        aggregation_keys.push_back(key);
-
-                        /// Key is no longer needed, therefore we can save a little by moving it.
-                        aggregated_columns.push_back(std::move(key));
-                    }
                 }
 
-                if (group_asts.empty())
+                NameAndTypePair key{column_name, node->result_type};
+
+                /// Aggregation keys are uniqued.
+                if (!unique_keys.count(key.name))
                 {
-                    select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
-                    has_aggregation = select_query->having() || !aggregate_descriptions.empty();
+                    unique_keys.insert(key.name);
+                    aggregation_keys.push_back(key);
+
+                    /// Key is no longer needed, therefore we can save a little by moving it.
+                    aggregated_columns.push_back(std::move(key));
                 }
             }
+
+            if (group_asts.empty())
+            {
+                select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, {});
+                has_aggregation = select_query->having() || !aggregate_descriptions.empty();
+            }
         }
-        else
-            aggregated_columns = temp_actions->getNamesAndTypesList();
 
         /// Constant expressions are already removed during first 'analyze' run.
         /// So for second `analyze` information is taken from select_query.
-        if (select_query)
-            has_const_aggregation_keys = select_query->group_by_with_constant_keys;
-
-        for (const auto & desc : aggregate_descriptions)
-            aggregated_columns.emplace_back(desc.column_name, desc.function->getReturnType());
+        has_const_aggregation_keys = select_query->group_by_with_constant_keys;
     }
     else
-    {
         aggregated_columns = temp_actions->getNamesAndTypesList();
-    }
+
+    for (const auto & desc : aggregate_descriptions)
+        aggregated_columns.emplace_back(desc.column_name, desc.function->getReturnType());
 }
 
 
@@ -337,7 +436,7 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
     PullingAsyncPipelineExecutor executor(io.pipeline);
 
     SetPtr set = std::make_shared<Set>(settings.size_limits_for_set, true, getContext()->getSettingsRef().transform_null_in);
-    set->setHeader(executor.getHeader());
+    set->setHeader(executor.getHeader().getColumnsWithTypeAndName());
 
     Block block;
     while (executor.pull(block))
@@ -346,7 +445,7 @@ void ExpressionAnalyzer::tryMakeSetForIndexFromSubquery(const ASTPtr & subquery_
             continue;
 
         /// If the limits have been exceeded, give up and let the default subquery processing actions take place.
-        if (!set->insertFromBlock(block))
+        if (!set->insertFromBlock(block.getColumnsWithTypeAndName()))
             return;
     }
 
@@ -408,7 +507,7 @@ void SelectQueryExpressionAnalyzer::makeSetsForIndex(const ASTPtr & node)
                 auto temp_actions = std::make_shared<ActionsDAG>(columns_after_join);
                 getRootActions(left_in_operand, true, temp_actions);
 
-                if (temp_actions->tryFindInIndex(left_in_operand->getColumnName(getContext()->getSettingsRef())))
+                if (temp_actions->tryFindInIndex(left_in_operand->getColumnName()))
                     makeExplicitSet(func, *temp_actions, true, getContext(), settings.size_limits_for_set, prepared_sets);
             }
         }
@@ -448,7 +547,7 @@ void ExpressionAnalyzer::getRootActionsForHaving(const ASTPtr & ast, bool no_sub
 }
 
 
-bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
+void ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions, AggregateDescriptions & descriptions)
 {
     for (const ASTFunction * node : aggregates())
     {
@@ -456,7 +555,7 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
         if (node->arguments)
             getRootActionsNoMakeSet(node->arguments, true, actions);
 
-        aggregate.column_name = node->getColumnName(getContext()->getSettingsRef());
+        aggregate.column_name = node->getColumnName();
 
         const ASTs & arguments = node->arguments ? node->arguments->children : ASTs();
         aggregate.argument_names.resize(arguments.size());
@@ -464,7 +563,7 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
 
         for (size_t i = 0; i < arguments.size(); ++i)
         {
-            const std::string & name = arguments[i]->getColumnName(getContext()->getSettingsRef());
+            const std::string & name = arguments[i]->getColumnName();
             const auto * dag_node = actions->tryFindInIndex(name);
             if (!dag_node)
             {
@@ -481,10 +580,8 @@ bool ExpressionAnalyzer::makeAggregateDescriptions(ActionsDAGPtr & actions)
         aggregate.parameters = (node->parameters) ? getAggregateFunctionParametersArray(node->parameters, "", getContext()) : Array();
         aggregate.function = AggregateFunctionFactory::instance().get(node->name, types, aggregate.parameters, properties);
 
-        aggregate_descriptions.push_back(aggregate);
+        descriptions.push_back(aggregate);
     }
-
-    return !aggregates().empty();
 }
 
 void makeWindowDescriptionFromAST(const Context & context,
@@ -585,7 +682,7 @@ void makeWindowDescriptionFromAST(const Context & context,
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "Window frame '{}' is not implemented (while processing '{}')",
-            WindowFrame::toString(definition.frame_type),
+            definition.frame_type,
             ast->formatForErrorMessage());
     }
 
@@ -645,7 +742,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
         WindowFunctionDescription window_function;
         window_function.function_node = function_node;
         window_function.column_name
-            = window_function.function_node->getColumnName(getContext()->getSettingsRef());
+            = window_function.function_node->getColumnName();
         window_function.function_parameters
             = window_function.function_node->parameters
                 ? getAggregateFunctionParametersArray(
@@ -664,7 +761,7 @@ void ExpressionAnalyzer::makeWindowDescriptions(ActionsDAGPtr actions)
         window_function.argument_names.resize(arguments.size());
         for (size_t i = 0; i < arguments.size(); ++i)
         {
-            const std::string & name = arguments[i]->getColumnName(getContext()->getSettingsRef());
+            const std::string & name = arguments[i]->getColumnName();
             const auto * node = actions->tryFindInIndex(name);
 
             if (!node)
@@ -765,8 +862,7 @@ ArrayJoinActionPtr SelectQueryExpressionAnalyzer::appendArrayJoin(ExpressionActi
 {
     const auto * select_query = getSelectQuery();
 
-    bool is_array_join_left;
-    ASTPtr array_join_expression_list = select_query->arrayJoinExpressionList(is_array_join_left);
+    auto [array_join_expression_list, is_array_join_left] = select_query->arrayJoinExpressionList();
     if (!array_join_expression_list)
         return nullptr;
 
@@ -793,14 +889,14 @@ bool SelectQueryExpressionAnalyzer::appendJoinLeftKeys(ExpressionActionsChain &
     return true;
 }
 
-JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain)
+JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain, ActionsDAGPtr & converting_join_columns)
 {
     const ColumnsWithTypeAndName & left_sample_columns = chain.getLastStep().getResultColumns();
-    JoinPtr table_join = makeTableJoin(*syntax->ast_join, left_sample_columns);
+    JoinPtr table_join = makeTableJoin(*syntax->ast_join, left_sample_columns, converting_join_columns);
 
-    if (syntax->analyzed_join->needConvert())
+    if (converting_join_columns)
     {
-        chain.steps.push_back(std::make_unique<ExpressionActionsChain::ExpressionActionsStep>(syntax->analyzed_join->leftConvertingActions()));
+        chain.steps.push_back(std::make_unique<ExpressionActionsChain::ExpressionActionsStep>(converting_join_columns));
         chain.addStep();
     }
 
@@ -811,14 +907,6 @@ JoinPtr SelectQueryExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain
     return table_join;
 }
 
-static JoinPtr tryGetStorageJoin(std::shared_ptr<TableJoin> analyzed_join)
-{
-    if (auto * table = analyzed_join->joined_storage.get())
-        if (auto * storage_join = dynamic_cast<StorageJoin *>(table))
-            return storage_join->getJoinLocked(analyzed_join);
-    return {};
-}
-
 static ActionsDAGPtr createJoinedBlockActions(ContextPtr context, const TableJoin & analyzed_join)
 {
     ASTPtr expression_list = analyzed_join.rightKeysList();
@@ -826,44 +914,13 @@ static ActionsDAGPtr createJoinedBlockActions(ContextPtr context, const TableJoi
     return ExpressionAnalyzer(expression_list, syntax_result, context).getActionsDAG(true, false);
 }
 
-static bool allowDictJoin(StoragePtr joined_storage, ContextPtr context, String & dict_name, String & key_name)
+static std::shared_ptr<IJoin> chooseJoinAlgorithm(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, ContextPtr context)
 {
-    if (!joined_storage->isDictionary())
-        return false;
-
-    StorageDictionary & storage_dictionary = static_cast<StorageDictionary &>(*joined_storage);
-    dict_name = storage_dictionary.getDictionaryName();
-    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
-    if (!dictionary)
-        return false;
-
-    const DictionaryStructure & structure = dictionary->getStructure();
-    if (structure.id)
-    {
-        key_name = structure.id->name;
-        return true;
-    }
-    return false;
-}
-
-static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join, const Block & sample_block, ContextPtr context)
-{
-    bool allow_merge_join = analyzed_join->allowMergeJoin();
-
     /// HashJoin with Dictionary optimisation
-    String dict_name;
-    String key_name;
-    if (analyzed_join->joined_storage && allowDictJoin(analyzed_join->joined_storage, context, dict_name, key_name))
-    {
-        Names original_names;
-        NamesAndTypesList result_columns;
-        if (analyzed_join->allowDictJoin(key_name, sample_block, original_names, result_columns))
-        {
-            analyzed_join->dictionary_reader = std::make_shared<DictionaryReader>(dict_name, original_names, result_columns, context);
-            return std::make_shared<HashJoin>(analyzed_join, sample_block);
-        }
-    }
+    if (analyzed_join->tryInitDictJoin(sample_block, context))
+        return std::make_shared<HashJoin>(analyzed_join, sample_block);
 
+    bool allow_merge_join = analyzed_join->allowMergeJoin();
     if (analyzed_join->forceHashJoin() || (analyzed_join->preferMergeJoin() && !allow_merge_join))
         return std::make_shared<HashJoin>(analyzed_join, sample_block);
     else if (analyzed_join->forceMergeJoin() || (analyzed_join->preferMergeJoin() && allow_merge_join))
@@ -871,79 +928,92 @@ static std::shared_ptr<IJoin> makeJoin(std::shared_ptr<TableJoin> analyzed_join,
     return std::make_shared<JoinSwitcher>(analyzed_join, sample_block);
 }
 
+static std::unique_ptr<QueryPlan> buildJoinedPlan(
+    ContextPtr context,
+    const ASTTablesInSelectQueryElement & join_element,
+    TableJoin & analyzed_join,
+    SelectQueryOptions query_options)
+{
+    /// Actions which need to be calculated on joined block.
+    auto joined_block_actions = createJoinedBlockActions(context, analyzed_join);
+    Names original_right_columns;
+
+    NamesWithAliases required_columns_with_aliases = analyzed_join.getRequiredColumns(
+        Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
+    for (auto & pr : required_columns_with_aliases)
+        original_right_columns.push_back(pr.first);
+
+    /** For GLOBAL JOINs (in the case, for example, of the push method for executing GLOBAL subqueries), the following occurs
+        * - in the addExternalStorage function, the JOIN (SELECT ...) subquery is replaced with JOIN _data1,
+        *   in the subquery_for_set object this subquery is exposed as source and the temporary table _data1 as the `table`.
+        * - this function shows the expression JOIN _data1.
+        * - JOIN tables will need aliases to correctly resolve USING clause.
+        */
+    auto interpreter = interpretSubquery(
+        join_element.table_expression, context, original_right_columns, query_options.copy().setWithAllColumns().ignoreAlias(false));
+    auto joined_plan = std::make_unique<QueryPlan>();
+    interpreter->buildQueryPlan(*joined_plan);
+    {
+        auto sample_block = interpreter->getSampleBlock();
+        auto rename_dag = std::make_unique<ActionsDAG>(sample_block.getColumnsWithTypeAndName());
+        for (const auto & name_with_alias : required_columns_with_aliases)
+        {
+            if (sample_block.has(name_with_alias.first))
+            {
+                auto pos = sample_block.getPositionByName(name_with_alias.first);
+                const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
+                rename_dag->getIndex()[pos] = &alias;
+            }
+        }
+
+        auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
+        rename_step->setStepDescription("Rename joined columns");
+        joined_plan->addStep(std::move(rename_step));
+    }
+
+    auto joined_actions_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(joined_block_actions));
+    joined_actions_step->setStepDescription("Joined actions");
+    joined_plan->addStep(std::move(joined_actions_step));
+
+    return joined_plan;
+}
+
 JoinPtr SelectQueryExpressionAnalyzer::makeTableJoin(
-    const ASTTablesInSelectQueryElement & join_element, const ColumnsWithTypeAndName & left_sample_columns)
+    const ASTTablesInSelectQueryElement & join_element,
+    const ColumnsWithTypeAndName & left_columns,
+    ActionsDAGPtr & left_convert_actions)
 {
     /// Two JOINs are not supported with the same subquery, but different USINGs.
 
     if (joined_plan)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Table join was already created for query");
 
-    /// Use StorageJoin if any.
-    JoinPtr join = tryGetStorageJoin(syntax->analyzed_join);
+    ActionsDAGPtr right_convert_actions = nullptr;
 
-    if (!join)
+    const auto & analyzed_join = syntax->analyzed_join;
+
+    if (auto storage = analyzed_join->getStorageJoin())
     {
-        /// Actions which need to be calculated on joined block.
-        auto joined_block_actions = createJoinedBlockActions(getContext(), analyzedJoin());
-
-        Names original_right_columns;
-
-        NamesWithAliases required_columns_with_aliases = analyzedJoin().getRequiredColumns(
-            Block(joined_block_actions->getResultColumns()), joined_block_actions->getRequiredColumns().getNames());
-        for (auto & pr : required_columns_with_aliases)
-            original_right_columns.push_back(pr.first);
-
-        /** For GLOBAL JOINs (in the case, for example, of the push method for executing GLOBAL subqueries), the following occurs
-            * - in the addExternalStorage function, the JOIN (SELECT ...) subquery is replaced with JOIN _data1,
-            *   in the subquery_for_set object this subquery is exposed as source and the temporary table _data1 as the `table`.
-            * - this function shows the expression JOIN _data1.
-            */
-        auto interpreter = interpretSubquery(
-            join_element.table_expression, getContext(), original_right_columns, query_options.copy().setWithAllColumns());
-        {
-            joined_plan = std::make_unique<QueryPlan>();
-            interpreter->buildQueryPlan(*joined_plan);
-
-            auto sample_block = interpreter->getSampleBlock();
-
-            auto rename_dag = std::make_unique<ActionsDAG>(sample_block.getColumnsWithTypeAndName());
-            for (const auto & name_with_alias : required_columns_with_aliases)
-            {
-                if (sample_block.has(name_with_alias.first))
-                {
-                    auto pos = sample_block.getPositionByName(name_with_alias.first);
-                    const auto & alias = rename_dag->addAlias(*rename_dag->getInputs()[pos], name_with_alias.second);
-                    rename_dag->getIndex()[pos] = &alias;
-                }
-            }
-
-            auto rename_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(rename_dag));
-            rename_step->setStepDescription("Rename joined columns");
-            joined_plan->addStep(std::move(rename_step));
-        }
-
-        auto joined_actions_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), std::move(joined_block_actions));
-        joined_actions_step->setStepDescription("Joined actions");
-        joined_plan->addStep(std::move(joined_actions_step));
-
-        const ColumnsWithTypeAndName & right_sample_columns = joined_plan->getCurrentDataStream().header.getColumnsWithTypeAndName();
-        bool need_convert = syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, right_sample_columns);
-        if (need_convert)
-        {
-            auto converting_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), syntax->analyzed_join->rightConvertingActions());
-            converting_step->setStepDescription("Convert joined columns");
-            joined_plan->addStep(std::move(converting_step));
-        }
-
-        join = makeJoin(syntax->analyzed_join, joined_plan->getCurrentDataStream().header, getContext());
-
-        /// Do not make subquery for join over dictionary.
-        if (syntax->analyzed_join->dictionary_reader)
-            joined_plan.reset();
+        std::tie(left_convert_actions, right_convert_actions) = analyzed_join->createConvertingActions(left_columns, {});
+        return storage->getJoinLocked(analyzed_join, getContext());
     }
-    else
-        syntax->analyzed_join->applyJoinKeyConvert(left_sample_columns, {});
+
+    joined_plan = buildJoinedPlan(getContext(), join_element, *analyzed_join, query_options);
+
+    const ColumnsWithTypeAndName & right_columns = joined_plan->getCurrentDataStream().header.getColumnsWithTypeAndName();
+    std::tie(left_convert_actions, right_convert_actions) = analyzed_join->createConvertingActions(left_columns, right_columns);
+    if (right_convert_actions)
+    {
+        auto converting_step = std::make_unique<ExpressionStep>(joined_plan->getCurrentDataStream(), right_convert_actions);
+        converting_step->setStepDescription("Convert joined columns");
+        joined_plan->addStep(std::move(converting_step));
+    }
+
+    JoinPtr join = chooseJoinAlgorithm(analyzed_join, joined_plan->getCurrentDataStream().header, getContext());
+
+    /// Do not make subquery for join over dictionary.
+    if (analyzed_join->getDictionaryReader())
+        joined_plan.reset();
 
     return join;
 }
@@ -961,7 +1031,7 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
 
     auto & step = chain.lastStep(sourceColumns());
     getRootActions(select_query->prewhere(), only_types, step.actions());
-    String prewhere_column_name = select_query->prewhere()->getColumnName(getContext()->getSettingsRef());
+    String prewhere_column_name = select_query->prewhere()->getColumnName();
     step.addRequiredOutput(prewhere_column_name);
 
     const auto & node = step.actions()->findInIndex(prewhere_column_name);
@@ -975,7 +1045,12 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendPrewhere(
         /// Remove unused source_columns from prewhere actions.
         auto tmp_actions_dag = std::make_shared<ActionsDAG>(sourceColumns());
         getRootActions(select_query->prewhere(), only_types, tmp_actions_dag);
-        tmp_actions_dag->removeUnusedActions(NameSet{prewhere_column_name});
+        /// Constants cannot be removed since they can be used in other parts of the query.
+        /// And if they are not used anywhere, except PREWHERE, they will be removed on the next step.
+        tmp_actions_dag->removeUnusedActions(
+            NameSet{prewhere_column_name},
+            /* allow_remove_inputs= */ true,
+            /* allow_constant_folding= */ false);
 
         auto required_columns = tmp_actions_dag->getRequiredColumnsNames();
         NameSet required_source_columns(required_columns.begin(), required_columns.end());
@@ -1047,7 +1122,7 @@ bool SelectQueryExpressionAnalyzer::appendWhere(ExpressionActionsChain & chain,
 
     getRootActions(select_query->where(), only_types, step.actions());
 
-    auto where_column_name = select_query->where()->getColumnName(getContext()->getSettingsRef());
+    auto where_column_name = select_query->where()->getColumnName();
     step.addRequiredOutput(where_column_name);
 
     const auto & node = step.actions()->findInIndex(where_column_name);
@@ -1072,7 +1147,7 @@ bool SelectQueryExpressionAnalyzer::appendGroupBy(ExpressionActionsChain & chain
     ASTs asts = select_query->groupBy()->children;
     for (const auto & ast : asts)
     {
-        step.addRequiredOutput(ast->getColumnName(getContext()->getSettingsRef()));
+        step.addRequiredOutput(ast->getColumnName());
         getRootActions(ast, only_types, step.actions());
     }
 
@@ -1100,7 +1175,7 @@ void SelectQueryExpressionAnalyzer::appendAggregateFunctionsArguments(Expression
         for (const auto & name : desc.argument_names)
             step.addRequiredOutput(name);
 
-    /// Collect aggregates removing duplicates by node.getColumnName(getContext()->getSettingsRef())
+    /// Collect aggregates removing duplicates by node.getColumnName()
     /// It's not clear why we recollect aggregates (for query parts) while we're able to use previously collected ones (for entire query)
     /// @note The original recollection logic didn't remove duplicates.
     GetAggregatesVisitor::Data data;
@@ -1155,7 +1230,7 @@ void SelectQueryExpressionAnalyzer::appendWindowFunctionsArguments(
             // (2b) Required function argument columns.
             for (const auto & a : f.function_node->arguments->children)
             {
-                step.addRequiredOutput(a->getColumnName(getContext()->getSettingsRef()));
+                step.addRequiredOutput(a->getColumnName());
             }
         }
 
@@ -1177,7 +1252,7 @@ bool SelectQueryExpressionAnalyzer::appendHaving(ExpressionActionsChain & chain,
     ExpressionActionsChain::Step & step = chain.lastStep(aggregated_columns);
 
     getRootActionsForHaving(select_query->having(), only_types, step.actions());
-    step.addRequiredOutput(select_query->having()->getColumnName(getContext()->getSettingsRef()));
+    step.addRequiredOutput(select_query->having()->getColumnName());
 
     return true;
 }
@@ -1201,12 +1276,12 @@ void SelectQueryExpressionAnalyzer::appendSelect(ExpressionActionsChain & chain,
             continue;
         }
 
-        step.addRequiredOutput(child->getColumnName(getContext()->getSettingsRef()));
+        step.addRequiredOutput(child->getColumnName());
     }
 }
 
 ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChain & chain, bool only_types, bool optimize_read_in_order,
-                                                  ManyExpressionActions & order_by_elements_actions)
+                                                           ManyExpressionActions & order_by_elements_actions)
 {
     const auto * select_query = getSelectQuery();
 
@@ -1219,17 +1294,26 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendOrderBy(ExpressionActionsChai
 
     ExpressionActionsChain::Step & step = chain.lastStep(aggregated_columns);
 
+    for (auto & child : select_query->orderBy()->children)
+    {
+        auto * ast = child->as<ASTOrderByElement>();
+        if (!ast || ast->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (getContext()->getSettingsRef().enable_positional_arguments)
+            replaceForPositionalArguments(ast->children.at(0), select_query, ASTSelectQuery::Expression::ORDER_BY);
+    }
+
     getRootActions(select_query->orderBy(), only_types, step.actions());
 
     bool with_fill = false;
     NameSet order_by_keys;
+
     for (auto & child : select_query->orderBy()->children)
     {
-        const auto * ast = child->as<ASTOrderByElement>();
-        if (!ast || ast->children.empty())
-            throw Exception("Bad order expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+        auto * ast = child->as<ASTOrderByElement>();
         ASTPtr order_expression = ast->children.at(0);
-        step.addRequiredOutput(order_expression->getColumnName(getContext()->getSettingsRef()));
+        step.addRequiredOutput(order_expression->getColumnName());
 
         if (ast->with_fill)
             with_fill = true;
@@ -1277,9 +1361,13 @@ bool SelectQueryExpressionAnalyzer::appendLimitBy(ExpressionActionsChain & chain
         aggregated_names.insert(column.name);
     }
 
-    for (const auto & child : select_query->limitBy()->children)
+    auto & children = select_query->limitBy()->children;
+    for (auto & child : children)
     {
-        auto child_name = child->getColumnName(getContext()->getSettingsRef());
+        if (getContext()->getSettingsRef().enable_positional_arguments)
+            replaceForPositionalArguments(child, select_query, ASTSelectQuery::Expression::LIMIT_BY);
+
+        auto child_name = child->getColumnName();
         if (!aggregated_names.count(child_name))
             step.addRequiredOutput(std::move(child_name));
     }
@@ -1295,15 +1383,13 @@ ActionsDAGPtr SelectQueryExpressionAnalyzer::appendProjectResult(ExpressionActio
 
     NamesWithAliases result_columns;
 
-    const auto & settings = getContext()->getSettingsRef();
-
     ASTs asts = select_query->select()->children;
     for (const auto & ast : asts)
     {
-        String result_name = ast->getAliasOrColumnName(settings);
+        String result_name = ast->getAliasOrColumnName();
         if (required_result_columns.empty() || required_result_columns.count(result_name))
         {
-            std::string source_name = ast->getColumnName(settings);
+            std::string source_name = ast->getColumnName();
 
             /*
              * For temporary columns created by ExpressionAnalyzer for literals,
@@ -1345,7 +1431,7 @@ void ExpressionAnalyzer::appendExpression(ExpressionActionsChain & chain, const
 {
     ExpressionActionsChain::Step & step = chain.lastStep(sourceColumns());
     getRootActions(expr, only_types, step.actions());
-    step.addRequiredOutput(expr->getColumnName(getContext()->getSettingsRef()));
+    step.addRequiredOutput(expr->getColumnName());
 }
 
 
@@ -1362,13 +1448,12 @@ ActionsDAGPtr ExpressionAnalyzer::getActionsDAG(bool add_aliases, bool project_r
     else
         asts = ASTs(1, query);
 
-    const auto & settings = getContext()->getSettingsRef();
     for (const auto & ast : asts)
     {
-        std::string name = ast->getColumnName(settings);
+        std::string name = ast->getColumnName();
         std::string alias;
         if (add_aliases)
-            alias = ast->getAliasOrColumnName(settings);
+            alias = ast->getAliasOrColumnName();
         else
             alias = name;
         result_columns.emplace_back(name, alias);
@@ -1455,18 +1540,15 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
     const Settings & settings = context->getSettingsRef();
     const ConstStoragePtr & storage = query_analyzer.storage();
 
-    bool finalized = false;
-    size_t where_step_num = 0;
+    ssize_t prewhere_step_num = -1;
+    ssize_t where_step_num = -1;
+    ssize_t having_step_num = -1;
 
     auto finalize_chain = [&](ExpressionActionsChain & chain)
     {
         chain.finalize();
 
-        if (!finalized)
-        {
-            finalize(chain, where_step_num, query);
-            finalized = true;
-        }
+        finalize(chain, prewhere_step_num, where_step_num, having_step_num, query);
 
         chain.clear();
     };
@@ -1497,7 +1579,9 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
         if (auto actions = query_analyzer.appendPrewhere(chain, !first_stage, additional_required_columns_after_prewhere))
         {
-            prewhere_info = std::make_shared<PrewhereInfo>(actions, query.prewhere()->getColumnName(settings));
+            /// Prewhere is always the first one.
+            prewhere_step_num = 0;
+            prewhere_info = std::make_shared<PrewhereInfo>(actions, query.prewhere()->getColumnName());
 
             if (allowEarlyConstantFolding(*prewhere_info->prewhere_actions, settings))
             {
@@ -1507,7 +1591,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                     ExpressionActions(
                         prewhere_info->prewhere_actions,
                         ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_prewhere_sample);
-                    auto & column_elem = before_prewhere_sample.getByName(query.prewhere()->getColumnName(settings));
+                    auto & column_elem = before_prewhere_sample.getByName(query.prewhere()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
                         prewhere_constant_filter_description = ConstantFilterDescription(*column_elem.column);
@@ -1521,8 +1605,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
         {
             query_analyzer.appendJoinLeftKeys(chain, only_types || !first_stage);
             before_join = chain.getLastActions();
-            join = query_analyzer.appendJoin(chain);
-            converting_join_columns = query_analyzer.analyzedJoin().leftConvertingActions();
+            join = query_analyzer.appendJoin(chain, converting_join_columns);
             chain.addStep();
         }
 
@@ -1542,7 +1625,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
                     ExpressionActions(
                         before_where,
                         ExpressionActionsSettings::fromSettings(context->getSettingsRef())).execute(before_where_sample);
-                    auto & column_elem = before_where_sample.getByName(query.where()->getColumnName(settings));
+                    auto & column_elem = before_where_sample.getByName(query.where()->getColumnName());
                     /// If the filter column is a constant, record it.
                     if (column_elem.column)
                         where_constant_filter_description = ConstantFilterDescription(*column_elem.column);
@@ -1566,6 +1649,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
 
             if (query_analyzer.appendHaving(chain, only_types || !second_stage))
             {
+                having_step_num = chain.steps.size() - 1;
                 before_having = chain.getLastActions();
                 chain.addStep();
             }
@@ -1633,7 +1717,7 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
             const auto * select_query = query_analyzer.getSelectQuery();
             for (const auto & child : select_query->select()->children)
             {
-                step.addRequiredOutput(child->getColumnName(settings));
+                step.addRequiredOutput(child->getColumnName());
             }
         }
 
@@ -1666,13 +1750,16 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
     checkActions();
 }
 
-void ExpressionAnalysisResult::finalize(const ExpressionActionsChain & chain, size_t where_step_num, const ASTSelectQuery & query)
+void ExpressionAnalysisResult::finalize(
+    const ExpressionActionsChain & chain,
+    ssize_t & prewhere_step_num,
+    ssize_t & where_step_num,
+    ssize_t & having_step_num,
+    const ASTSelectQuery & query)
 {
-    size_t next_step_i = 0;
-
-    if (hasPrewhere())
+    if (prewhere_step_num >= 0)
     {
-        const ExpressionActionsChain::Step & step = *chain.steps.at(next_step_i++);
+        const ExpressionActionsChain::Step & step = *chain.steps.at(prewhere_step_num);
         prewhere_info->prewhere_actions->projectInput(false);
 
         NameSet columns_to_remove;
@@ -1685,13 +1772,21 @@ void ExpressionAnalysisResult::finalize(const ExpressionActionsChain & chain, si
         }
 
         columns_to_remove_after_prewhere = std::move(columns_to_remove);
+        prewhere_step_num = -1;
     }
 
-    if (hasWhere())
+    if (where_step_num >= 0)
     {
-        const auto & settings = chain.getContext()->getSettingsRef();
-        where_column_name = query.where()->getColumnName(settings);
+        where_column_name = query.where()->getColumnName();
         remove_where_filter = chain.steps.at(where_step_num)->required_output.find(where_column_name)->second;
+        where_step_num = -1;
+    }
+
+    if (having_step_num >= 0)
+    {
+        having_column_name = query.having()->getColumnName();
+        remove_having_filter = chain.steps.at(having_step_num)->required_output.find(having_column_name)->second;
+        having_step_num = -1;
     }
 }
 
diff --git a/src/Interpreters/ExpressionAnalyzer.h b/src/Interpreters/ExpressionAnalyzer.h
index 2d0041bd96b..b6bb3c5fad5 100644
--- a/src/Interpreters/ExpressionAnalyzer.h
+++ b/src/Interpreters/ExpressionAnalyzer.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Columns/FilterDescription.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/AggregateDescription.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/SubqueryForSet.h>
@@ -92,7 +91,7 @@ private:
         const SizeLimits size_limits_for_set;
         const UInt64 distributed_group_by_no_merge;
 
-        ExtractedSettings(const Settings & settings_);
+        explicit ExtractedSettings(const Settings & settings_);
     };
 
 public:
@@ -188,12 +187,15 @@ protected:
       *  or after all the actions that are normally performed before aggregation.
       * Set has_aggregation = true if there is GROUP BY or at least one aggregate function.
       */
-    void analyzeAggregation();
-    bool makeAggregateDescriptions(ActionsDAGPtr & actions);
+    void analyzeAggregation(ActionsDAGPtr & temp_actions);
+    void makeAggregateDescriptions(ActionsDAGPtr & actions, AggregateDescriptions & descriptions);
 
     const ASTSelectQuery * getSelectQuery() const;
 
     bool isRemoteStorage() const { return syntax->is_remote_storage; }
+
+    NamesAndTypesList getColumnsAfterArrayJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
+    NamesAndTypesList analyzeJoin(ActionsDAGPtr & actions, const NamesAndTypesList & src_columns);
 };
 
 class SelectQueryExpressionAnalyzer;
@@ -226,6 +228,8 @@ struct ExpressionAnalysisResult
     ActionsDAGPtr before_where;
     ActionsDAGPtr before_aggregation;
     ActionsDAGPtr before_having;
+    String having_column_name;
+    bool remove_having_filter = false;
     ActionsDAGPtr before_window;
     ActionsDAGPtr before_order_by;
     ActionsDAGPtr before_limit_by;
@@ -271,7 +275,12 @@ struct ExpressionAnalysisResult
 
     void removeExtraColumns() const;
     void checkActions() const;
-    void finalize(const ExpressionActionsChain & chain, size_t where_step_num, const ASTSelectQuery & query);
+    void finalize(
+        const ExpressionActionsChain & chain,
+        ssize_t & prewhere_step_num,
+        ssize_t & where_step_num,
+        ssize_t & having_step_num,
+        const ASTSelectQuery & query);
 };
 
 /// SelectQuery specific ExpressionAnalyzer part.
@@ -338,7 +347,8 @@ private:
 
     JoinPtr makeTableJoin(
         const ASTTablesInSelectQueryElement & join_element,
-        const ColumnsWithTypeAndName & left_sample_columns);
+        const ColumnsWithTypeAndName & left_columns,
+        ActionsDAGPtr & left_convert_actions);
 
     const ASTSelectQuery * getAggregatingQuery() const;
 
@@ -359,7 +369,8 @@ private:
     /// Before aggregation:
     ArrayJoinActionPtr appendArrayJoin(ExpressionActionsChain & chain, ActionsDAGPtr & before_array_join, bool only_types);
     bool appendJoinLeftKeys(ExpressionActionsChain & chain, bool only_types);
-    JoinPtr appendJoin(ExpressionActionsChain & chain);
+    JoinPtr appendJoin(ExpressionActionsChain & chain, ActionsDAGPtr & converting_join_columns);
+
     /// remove_filter is set in ExpressionActionsChain::finalize();
     /// Columns in `additional_required_columns` will not be removed (they can be used for e.g. sampling or FINAL modifier).
     ActionsDAGPtr appendPrewhere(ExpressionActionsChain & chain, bool only_types, const Names & additional_required_columns);
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 497aa56ab13..90292d17fae 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -1,13 +1,11 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 
 #include <optional>
 #include <stack>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnVector.h>
@@ -166,6 +164,15 @@ public:
         return dag.compile(builder, values);
     }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        for (const auto & f : nested_functions)
+            if (!f->isSuitableForShortCircuitArgumentsExecution(arguments))
+                return false;
+
+        return true;
+    }
+
     String getName() const override { return name; }
 
     const DataTypes & getArgumentTypes() const override { return argument_types; }
@@ -230,7 +237,9 @@ public:
         const IDataType * type_ptr = &type;
         Field left_mut = left;
         Field right_mut = right;
-        Monotonicity result(true, true, true);
+
+        Monotonicity result = { .is_monotonic = true, .is_positive = true, .is_always_monotonic = true };
+
         /// monotonicity is only defined for unary functions, so the chain must describe a sequence of nested calls
         for (size_t i = 0; i < nested_functions.size(); ++i)
         {
@@ -313,13 +322,35 @@ static bool isCompilableConstant(const ActionsDAG::Node & node)
     return node.column && isColumnConst(*node.column) && canBeNativeType(*node.result_type);
 }
 
-static bool isCompilableFunction(const ActionsDAG::Node & node)
+static const ActionsDAG::Node * removeAliasIfNecessary(const ActionsDAG::Node * node)
+{
+    const ActionsDAG::Node * node_no_alias = node;
+
+    while (node_no_alias->type == ActionsDAG::ActionType::ALIAS)
+        node_no_alias = node_no_alias->children[0];
+
+    return node_no_alias;
+}
+
+static bool isCompilableFunction(const ActionsDAG::Node & node, const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     if (node.type != ActionsDAG::ActionType::FUNCTION)
         return false;
 
     auto & function = *node.function_base;
 
+    IFunction::ShortCircuitSettings settings;
+    if (function.isShortCircuit(settings, node.children.size()))
+    {
+        for (const auto & child : node.children)
+        {
+            const ActionsDAG::Node * child_no_alias = removeAliasIfNecessary(child);
+
+            if (lazy_executed_nodes.contains(child_no_alias))
+                return false;
+        }
+    }
+
     if (!canBeNativeType(*function.getResultType()))
         return false;
 
@@ -334,7 +365,8 @@ static bool isCompilableFunction(const ActionsDAG::Node & node)
 
 static CompileDAG getCompilableDAG(
     const ActionsDAG::Node * root,
-    ActionsDAG::NodeRawConstPtrs & children)
+    ActionsDAG::NodeRawConstPtrs & children,
+    const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     /// Extract CompileDAG from root actions dag node.
 
@@ -357,29 +389,29 @@ static CompileDAG getCompilableDAG(
         const auto * node = frame.node;
 
         bool is_compilable_constant = isCompilableConstant(*node);
-        bool is_compilable_function = isCompilableFunction(*node);
+        bool is_compilable_function = isCompilableFunction(*node, lazy_executed_nodes);
 
         if (!is_compilable_function || is_compilable_constant)
         {
-           CompileDAG::Node compile_node;
-           compile_node.function = node->function_base;
-           compile_node.result_type = node->result_type;
+            CompileDAG::Node compile_node;
+            compile_node.function = node->function_base;
+            compile_node.result_type = node->result_type;
 
-           if (is_compilable_constant)
-           {
-               compile_node.type = CompileDAG::CompileType::CONSTANT;
-               compile_node.column = node->column;
-           }
-           else
-           {
+            if (is_compilable_constant)
+            {
+                compile_node.type = CompileDAG::CompileType::CONSTANT;
+                compile_node.column = node->column;
+            }
+            else
+            {
                 compile_node.type = CompileDAG::CompileType::INPUT;
                 children.emplace_back(node);
-           }
+            }
 
-           visited_node_to_compile_dag_position[node] = dag.getNodesCount();
-           dag.addNode(std::move(compile_node));
-           stack.pop();
-           continue;
+            visited_node_to_compile_dag_position[node] = dag.getNodesCount();
+            dag.addNode(std::move(compile_node));
+            stack.pop();
+            continue;
         }
 
         while (frame.next_child_to_visit < node->children.size())
@@ -420,7 +452,7 @@ static CompileDAG getCompilableDAG(
     return dag;
 }
 
-void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
+void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression, const std::unordered_set<const ActionsDAG::Node *> & lazy_executed_nodes)
 {
     struct Data
     {
@@ -436,7 +468,7 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
 
     for (const auto & node : nodes)
     {
-        bool node_is_compilable_in_isolation = isCompilableFunction(node) && !isCompilableConstant(node);
+        bool node_is_compilable_in_isolation = isCompilableFunction(node, lazy_executed_nodes) && !isCompilableConstant(node);
         node_to_data[&node].is_compilable_in_isolation = node_is_compilable_in_isolation;
     }
 
@@ -549,7 +581,7 @@ void ActionsDAG::compileFunctions(size_t min_count_to_compile_expression)
     for (auto & node : nodes_to_compile)
     {
         NodeRawConstPtrs new_children;
-        auto dag = getCompilableDAG(node, new_children);
+        auto dag = getCompilableDAG(node, new_children, lazy_executed_nodes);
 
         if (dag.getInputNodesCount() == 0)
             continue;
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index 83931649443..e682a98114d 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -6,9 +6,7 @@
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #   include <mysqlxx/PoolFactory.h>
@@ -45,12 +43,20 @@ ExternalLoader::LoadablePtr ExternalDictionariesLoader::create(
 ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::getDictionary(const std::string & dictionary_name, ContextPtr local_context) const
 {
     std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
+
+    if (local_context->hasQueryContext() && local_context->getSettingsRef().log_queries)
+        local_context->addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, resolved_dictionary_name);
+
     return std::static_pointer_cast<const IDictionary>(load(resolved_dictionary_name));
 }
 
 ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::tryGetDictionary(const std::string & dictionary_name, ContextPtr local_context) const
 {
     std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
+
+    if (local_context->hasQueryContext() && local_context->getSettingsRef().log_queries)
+        local_context->addQueryFactoriesInfo(Context::QueryLogFactories::Dictionary, resolved_dictionary_name);
+
     return std::static_pointer_cast<const IDictionary>(tryLoad(resolved_dictionary_name));
 }
 
@@ -79,59 +85,77 @@ DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std
     return ExternalDictionariesLoader::getDictionaryStructure(*load_result.config);
 }
 
-std::string ExternalDictionariesLoader::resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const
+QualifiedTableName ExternalDictionariesLoader::qualifyDictionaryNameWithDatabase(const std::string & dictionary_name, ContextPtr query_context) const
 {
-    bool has_dictionary = has(dictionary_name);
-    if (has_dictionary)
-        return dictionary_name;
-
-    std::string resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name);
-    has_dictionary = has(resolved_name);
-
-    if (!has_dictionary)
+    auto qualified_name = QualifiedTableName::tryParseFromString(dictionary_name);
+    if (!qualified_name)
     {
-        /// If dictionary not found. And database was not implicitly specified
-        /// we can qualify dictionary name with current database name.
-        /// It will help if dictionary is created with DDL and is in current database.
-        if (dictionary_name.find('.') == std::string::npos)
-        {
-            String dictionary_name_with_database = current_database_name + '.' + dictionary_name;
-            resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name_with_database);
-            has_dictionary = has(resolved_name);
-        }
+        QualifiedTableName qualified_dictionary_name;
+        qualified_dictionary_name.table = dictionary_name;
+        return qualified_dictionary_name;
     }
 
-    if (!has_dictionary)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary ({}) not found", backQuote(dictionary_name));
+    if (qualified_name->database.empty() && has(dictionary_name))
+    {
+        /// This is xml dictionary
+        return *qualified_name;
+    }
 
-    return resolved_name;
+    if (qualified_name->database.empty())
+        qualified_name->database = query_context->getCurrentDatabase();
+
+    return *qualified_name;
 }
 
-std::string ExternalDictionariesLoader::resolveDictionaryNameFromDatabaseCatalog(const std::string & name) const
+std::string ExternalDictionariesLoader::resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const
+{
+    if (has(dictionary_name))
+        return dictionary_name;
+
+    std::string resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name, current_database_name);
+
+    if (has(resolved_name))
+        return resolved_name;
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Dictionary ({}) not found", backQuote(dictionary_name));
+}
+
+std::string ExternalDictionariesLoader::resolveDictionaryNameFromDatabaseCatalog(const std::string & name, const std::string & current_database_name) const
 {
     /// If it's dictionary from Atomic database, then we need to convert qualified name to UUID.
     /// Try to split name and get id from associated StorageDictionary.
     /// If something went wrong, return name as is.
 
-    auto pos = name.find('.');
-    if (pos == std::string::npos || name.find('.', pos + 1) != std::string::npos)
-        return name;
+    String res = name;
 
-    std::string maybe_database_name = name.substr(0, pos);
-    std::string maybe_table_name = name.substr(pos + 1);
+    auto qualified_name = QualifiedTableName::tryParseFromString(name);
+    if (!qualified_name)
+        return res;
+
+    if (qualified_name->database.empty())
+    {
+        /// Ether database name is not specified and we should use current one
+        /// or it's an XML dictionary.
+        bool is_xml_dictionary = has(name);
+        if (is_xml_dictionary)
+            return res;
+
+        qualified_name->database = current_database_name;
+        res = current_database_name + '.' + name;
+    }
 
     auto [db, table] = DatabaseCatalog::instance().tryGetDatabaseAndTable(
-        {maybe_database_name, maybe_table_name},
+        {qualified_name->database, qualified_name->table},
         const_pointer_cast<Context>(getContext()));
 
     if (!db)
-        return name;
+        return res;
     assert(table);
 
     if (db->getUUID() == UUIDHelpers::Nil)
-        return name;
+        return res;
     if (table->getName() != "Dictionary")
-        return name;
+        return res;
 
     return toString(table->getStorageID().uuid);
 }
diff --git a/src/Interpreters/ExternalDictionariesLoader.h b/src/Interpreters/ExternalDictionariesLoader.h
index 06f64ef30c5..421154a6d4f 100644
--- a/src/Interpreters/ExternalDictionariesLoader.h
+++ b/src/Interpreters/ExternalDictionariesLoader.h
@@ -27,6 +27,8 @@ public:
 
     void reloadDictionary(const std::string & dictionary_name, ContextPtr context) const;
 
+    QualifiedTableName qualifyDictionaryNameWithDatabase(const std::string & dictionary_name, ContextPtr context) const;
+
     DictionaryStructure getDictionaryStructure(const std::string & dictionary_name, ContextPtr context) const;
 
     static DictionaryStructure getDictionaryStructure(const Poco::Util::AbstractConfiguration & config, const std::string & key_in_config = "dictionary");
@@ -42,7 +44,7 @@ protected:
     std::string resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const;
 
     /// Try convert qualified dictionary name to persistent UUID
-    std::string resolveDictionaryNameFromDatabaseCatalog(const std::string & name) const;
+    std::string resolveDictionaryNameFromDatabaseCatalog(const std::string & name, const std::string & current_database_name) const;
 
     friend class StorageSystemDictionaries;
     friend class DatabaseDictionary;
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index eb7824a1124..b2cd9495feb 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -9,8 +9,8 @@
 #include <Common/randomSeed.h>
 #include <Common/setThreadName.h>
 #include <Common/StatusInfo.h>
-#include <common/chrono_io.h>
-#include <common/scope_guard_safe.h>
+#include <base/chrono_io.h>
+#include <base/scope_guard_safe.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 #include <unordered_set>
@@ -133,7 +133,13 @@ public:
         settings = settings_;
     }
 
-    using ObjectConfigsPtr = std::shared_ptr<const std::unordered_map<String /* object's name */, std::shared_ptr<const ObjectConfig>>>;
+    struct ObjectConfigs
+    {
+        std::unordered_map<String /* object's name */, std::shared_ptr<const ObjectConfig>> configs_by_name;
+        size_t counter = 0;
+    };
+
+    using ObjectConfigsPtr = std::shared_ptr<const ObjectConfigs>;
 
     /// Reads all repositories.
     ObjectConfigsPtr read()
@@ -336,7 +342,7 @@ private:
         need_collect_object_configs = false;
 
         // Generate new result.
-        auto new_configs = std::make_shared<std::unordered_map<String /* object's name */, std::shared_ptr<const ObjectConfig>>>();
+        auto new_configs = std::make_shared<ObjectConfigs>();
 
         for (const auto & [repository, repository_info] : repositories)
         {
@@ -344,8 +350,8 @@ private:
             {
                 for (const auto & [object_name, key_in_config] : file_info.objects)
                 {
-                    auto already_added_it = new_configs->find(object_name);
-                    if (already_added_it == new_configs->end())
+                    auto already_added_it = new_configs->configs_by_name.find(object_name);
+                    if (already_added_it == new_configs->configs_by_name.end())
                     {
                         auto new_config = std::make_shared<ObjectConfig>();
                         new_config->config = file_info.file_contents;
@@ -353,7 +359,7 @@ private:
                         new_config->repository_name = repository->getName();
                         new_config->from_temp_repository = repository->isTemporary();
                         new_config->path = path;
-                        new_configs->emplace(object_name, std::move(new_config));
+                        new_configs->configs_by_name.emplace(object_name, std::move(new_config));
                     }
                     else
                     {
@@ -372,6 +378,7 @@ private:
             }
         }
 
+        new_configs->counter = counter++;
         object_configs = new_configs;
     }
 
@@ -383,6 +390,7 @@ private:
     std::unordered_map<Repository *, RepositoryInfo> repositories;
     ObjectConfigsPtr object_configs;
     bool need_collect_object_configs = false;
+    size_t counter = 0;
 };
 
 
@@ -433,13 +441,22 @@ public:
         if (configs == new_configs)
             return;
 
+        /// The following check prevents a race when two threads are trying to update configuration
+        /// at almost the same time:
+        /// 1) first thread reads a configuration (for example as a part of periodic updates)
+        /// 2) second thread sets a new configuration (for example after executing CREATE DICTIONARY)
+        /// 3) first thread sets the configuration it read in 1) and thus discards the changes made in 2).
+        /// So we use `counter` here to ensure we exchange the current configuration only for a newer one.
+        if (configs && (configs->counter >= new_configs->counter))
+            return;
+
         configs = new_configs;
 
         std::vector<String> removed_names;
         for (auto & [name, info] : infos)
         {
-            auto new_config_it = new_configs->find(name);
-            if (new_config_it == new_configs->end())
+            auto new_config_it = new_configs->configs_by_name.find(name);
+            if (new_config_it == new_configs->configs_by_name.end())
             {
                 removed_names.emplace_back(name);
             }
@@ -462,7 +479,7 @@ public:
         }
 
         /// Insert to the map those objects which added to the new configuration.
-        for (const auto & [name, config] : *new_configs)
+        for (const auto & [name, config] : new_configs->configs_by_name)
         {
             if (infos.find(name) == infos.end())
             {
@@ -1250,7 +1267,6 @@ private:
 
     LoadablesConfigReader & config_files_reader;
     LoadingDispatcher & loading_dispatcher;
-
     mutable std::mutex mutex;
     bool enabled = false;
     ThreadFromGlobalPool thread;
@@ -1276,6 +1292,7 @@ scope_guard ExternalLoader::addConfigRepository(std::unique_ptr<IExternalLoaderC
 {
     auto * ptr = repository.get();
     String name = ptr->getName();
+
     config_files_reader->addConfigRepository(std::move(repository));
     reloadConfig(name);
 
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 2ea79d3aade..81e043e40bf 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -3,11 +3,11 @@
 #include <chrono>
 #include <functional>
 #include <unordered_map>
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/IExternalLoadable.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Common/ExternalLoaderStatus.h>
 
 
diff --git a/src/Interpreters/ExternalLoaderTempConfigRepository.h b/src/Interpreters/ExternalLoaderTempConfigRepository.h
index d042f310ed1..92816dcb7f2 100644
--- a/src/Interpreters/ExternalLoaderTempConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderTempConfigRepository.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
 #include <Poco/Timestamp.h>
 
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp b/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
index 00c31110ea4..ba4d9beffe3 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
@@ -1,20 +1,26 @@
 #include <Interpreters/ExternalLoaderXMLConfigRepository.h>
 
+#include <filesystem>
+
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Poco/Glob.h>
 #include <Common/filesystemHelpers.h>
-#include <filesystem>
 
 
 namespace fs = std::filesystem;
 
 namespace DB
 {
+
 ExternalLoaderXMLConfigRepository::ExternalLoaderXMLConfigRepository(
-    const Poco::Util::AbstractConfiguration & main_config_, const std::string & config_key_)
-    : main_config(main_config_), config_key(config_key_)
+    const std::string & app_path_,
+    const std::string & main_config_path_,
+    const std::unordered_set<std::string> & patterns_)
+    : app_path(app_path_)
+    , main_config_path(main_config_path_)
+    , patterns(patterns_)
 {
 }
 
@@ -25,20 +31,25 @@ Poco::Timestamp ExternalLoaderXMLConfigRepository::getUpdateTime(const std::stri
 
 std::set<std::string> ExternalLoaderXMLConfigRepository::getAllLoadablesDefinitionNames()
 {
+    std::unordered_set<std::string> patterns_copy;
+
+    {
+        std::lock_guard<std::mutex> lock(patterns_mutex);
+        patterns_copy = patterns;
+    }
+
+    const String config_dir = fs::path(main_config_path).parent_path();
     std::set<std::string> files;
 
-    auto patterns = getMultipleValuesFromConfig(main_config, "", config_key);
-
-    for (auto & pattern : patterns)
+    for (const auto & pattern : patterns_copy)
     {
         if (pattern.empty())
             continue;
 
         if (pattern[0] != '/')
         {
-            const auto app_config_path = main_config.getString("config-file", "config.xml");
-            const String config_dir = fs::path(app_config_path).parent_path();
             const String absolute_path = fs::path(config_dir) / pattern;
+
             Poco::Glob::glob(absolute_path, files, 0);
             if (!files.empty())
                 continue;
@@ -47,10 +58,10 @@ std::set<std::string> ExternalLoaderXMLConfigRepository::getAllLoadablesDefiniti
         Poco::Glob::glob(pattern, files, 0);
     }
 
-    for (std::set<std::string>::iterator it = files.begin(); it != files.end();)
+    for (auto it = files.begin(); it != files.end();)
     {
         if (ConfigProcessor::isPreprocessedFile(*it))
-            files.erase(it++);
+            it = files.erase(it);
         else
             ++it;
     }
@@ -58,6 +69,16 @@ std::set<std::string> ExternalLoaderXMLConfigRepository::getAllLoadablesDefiniti
     return files;
 }
 
+void ExternalLoaderXMLConfigRepository::updatePatterns(const std::unordered_set<std::string> & patterns_)
+{
+    std::lock_guard<std::mutex> lock(patterns_mutex);
+
+    if (patterns == patterns_)
+        return;
+
+    patterns = patterns_;
+}
+
 bool ExternalLoaderXMLConfigRepository::exists(const std::string & definition_entity_name)
 {
     return fs::exists(fs::path(definition_entity_name));
@@ -68,7 +89,7 @@ Poco::AutoPtr<Poco::Util::AbstractConfiguration> ExternalLoaderXMLConfigReposito
 {
     ConfigProcessor config_processor{config_file};
     ConfigProcessor::LoadedConfig preprocessed = config_processor.loadConfig();
-    config_processor.savePreprocessedConfig(preprocessed, main_config.getString("path", DBMS_DEFAULT_PATH));
+    config_processor.savePreprocessedConfig(preprocessed, app_path);
     return preprocessed.configuration;
 }
 
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.h b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
index 76f51f04397..25646d72db3 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
@@ -1,10 +1,12 @@
 #pragma once
 
-#include <common/types.h>
-#include <unordered_map>
+#include <base/types.h>
+#include <unordered_set>
+#include <mutex>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
 #include <Poco/Timestamp.h>
 
+
 namespace DB
 {
 
@@ -13,7 +15,7 @@ namespace DB
 class ExternalLoaderXMLConfigRepository : public IExternalLoaderConfigRepository
 {
 public:
-    ExternalLoaderXMLConfigRepository(const Poco::Util::AbstractConfiguration & main_config_, const std::string & config_key_);
+    ExternalLoaderXMLConfigRepository(const std::string & app_path_, const std::string & main_config_path_, const std::unordered_set<std::string> & patterns_);
 
     std::string getName() const override { return name; }
 
@@ -29,14 +31,20 @@ public:
     /// May contain definition about several entities (several dictionaries in one .xml file)
     LoadablesConfigurationPtr load(const std::string & config_file) override;
 
+    void updatePatterns(const std::unordered_set<std::string> & patterns_);
+
 private:
+
     const String name;
 
-    /// Main server config (config.xml).
-    const Poco::Util::AbstractConfiguration & main_config;
+    const std::string app_path;
+
+    const std::string main_config_path;
+
+    std::unordered_set<std::string> patterns;
+
+    mutable std::mutex patterns_mutex;
 
-    /// Key which contains path to directory with .xml configs for entries
-    std::string config_key;
 };
 
 }
diff --git a/src/Interpreters/ExternalModelsLoader.h b/src/Interpreters/ExternalModelsLoader.h
index f0a7592f4d3..18e1f1123f6 100644
--- a/src/Interpreters/ExternalModelsLoader.h
+++ b/src/Interpreters/ExternalModelsLoader.h
@@ -3,7 +3,7 @@
 #include <Interpreters/CatBoostModel.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/ExternalLoader.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <memory>
 
diff --git a/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.cpp b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.cpp
new file mode 100644
index 00000000000..2de7b4b7846
--- /dev/null
+++ b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.cpp
@@ -0,0 +1,124 @@
+#include "ExternalUserDefinedExecutableFunctionsLoader.h"
+
+#include <DataTypes/DataTypeFactory.h>
+
+#include <Interpreters/UserDefinedExecutableFunction.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
+#include <Functions/FunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int FUNCTION_ALREADY_EXISTS;
+}
+
+ExternalUserDefinedExecutableFunctionsLoader::ExternalUserDefinedExecutableFunctionsLoader(ContextPtr global_context_)
+    : ExternalLoader("external user defined function", &Poco::Logger::get("ExternalUserDefinedExecutableFunctionsLoader"))
+    , WithContext(global_context_)
+{
+    setConfigSettings({"function", "name", "database", "uuid"});
+    enableAsyncLoading(false);
+    enablePeriodicUpdates(true);
+    enableAlwaysLoadEverything(true);
+}
+
+ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr ExternalUserDefinedExecutableFunctionsLoader::getUserDefinedFunction(const std::string & user_defined_function_name) const
+{
+    return std::static_pointer_cast<const UserDefinedExecutableFunction>(load(user_defined_function_name));
+}
+
+ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr ExternalUserDefinedExecutableFunctionsLoader::tryGetUserDefinedFunction(const std::string & user_defined_function_name) const
+{
+    return std::static_pointer_cast<const UserDefinedExecutableFunction>(tryLoad(user_defined_function_name));
+}
+
+void ExternalUserDefinedExecutableFunctionsLoader::reloadFunction(const std::string & user_defined_function_name) const
+{
+    loadOrReload(user_defined_function_name);
+}
+
+ExternalLoader::LoadablePtr ExternalUserDefinedExecutableFunctionsLoader::create(const std::string & name,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & key_in_config,
+    const std::string &) const
+{
+    if (FunctionFactory::instance().hasNameOrAlias(name))
+        throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The function '{}' already exists", name);
+
+    if (AggregateFunctionFactory::instance().hasNameOrAlias(name))
+        throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The aggregate function '{}' already exists", name);
+
+    String type = config.getString(key_in_config + ".type");
+    UserDefinedExecutableFunctionType function_type;
+
+    if (type == "executable")
+        function_type = UserDefinedExecutableFunctionType::executable;
+    else if (type == "executable_pool")
+        function_type = UserDefinedExecutableFunctionType::executable_pool;
+    else
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            "Wrong user defined function type expected 'executable' or 'executable_pool' actual {}",
+            function_type);
+
+    String command = config.getString(key_in_config + ".command");
+    String format = config.getString(key_in_config + ".format");
+    DataTypePtr result_type = DataTypeFactory::instance().get(config.getString(key_in_config + ".return_type"));
+    bool send_chunk_header = config.getBool(key_in_config + ".send_chunk_header", false);
+
+    size_t pool_size = 0;
+    size_t command_termination_timeout = 0;
+    size_t max_command_execution_time = 0;
+    if (function_type == UserDefinedExecutableFunctionType::executable_pool)
+    {
+        pool_size = config.getUInt64(key_in_config + ".pool_size", 16);
+        command_termination_timeout = config.getUInt64(key_in_config + ".command_termination_timeout", 10);
+        max_command_execution_time = config.getUInt64(key_in_config + ".max_command_execution_time", 10);
+
+        size_t max_execution_time_seconds = static_cast<size_t>(getContext()->getSettings().max_execution_time.totalSeconds());
+        if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
+            max_command_execution_time = max_execution_time_seconds;
+    }
+
+    ExternalLoadableLifetime lifetime;
+
+    if (config.has(key_in_config + ".lifetime"))
+        lifetime = ExternalLoadableLifetime(config, key_in_config + ".lifetime");
+
+    std::vector<DataTypePtr> argument_types;
+
+    Poco::Util::AbstractConfiguration::Keys config_elems;
+    config.keys(key_in_config, config_elems);
+
+    for (const auto & config_elem : config_elems)
+    {
+        if (!startsWith(config_elem, "argument"))
+            continue;
+
+        const auto argument_prefix = key_in_config + '.' + config_elem + '.';
+        auto argument_type = DataTypeFactory::instance().get(config.getString(argument_prefix + "type"));
+        argument_types.emplace_back(std::move(argument_type));
+    }
+
+    UserDefinedExecutableFunctionConfiguration function_configuration
+    {
+        .type = function_type,
+        .name = std::move(name), //-V1030
+        .script_path = std::move(command), //-V1030
+        .format = std::move(format), //-V1030
+        .argument_types = std::move(argument_types), //-V1030
+        .result_type = std::move(result_type), //-V1030
+        .pool_size = pool_size,
+        .command_termination_timeout = command_termination_timeout,
+        .max_command_execution_time = max_command_execution_time,
+        .send_chunk_header = send_chunk_header
+    };
+
+    return std::make_shared<UserDefinedExecutableFunction>(function_configuration, lifetime);
+}
+
+}
diff --git a/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h
new file mode 100644
index 00000000000..4d4843e8677
--- /dev/null
+++ b/src/Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <memory>
+
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/ExternalLoader.h>
+#include <Interpreters/UserDefinedExecutableFunction.h>
+
+namespace DB
+{
+
+class IExternalLoaderConfigRepository;
+
+/// Manages external user-defined functions.
+class ExternalUserDefinedExecutableFunctionsLoader : public ExternalLoader, WithContext
+{
+public:
+
+    using UserDefinedExecutableFunctionPtr = std::shared_ptr<const UserDefinedExecutableFunction>;
+
+    /// External user-defined functions will be loaded immediately and then will be updated in separate thread, each 'reload_period' seconds.
+    explicit ExternalUserDefinedExecutableFunctionsLoader(ContextPtr global_context_);
+
+    UserDefinedExecutableFunctionPtr getUserDefinedFunction(const std::string & user_defined_function_name) const;
+
+    UserDefinedExecutableFunctionPtr tryGetUserDefinedFunction(const std::string & user_defined_function_name) const;
+
+    void reloadFunction(const std::string & user_defined_function_name) const;
+
+protected:
+    LoadablePtr create(const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & key_in_config,
+        const std::string & repository_name) const override;
+
+};
+
+}
diff --git a/src/Interpreters/FillingRow.h b/src/Interpreters/FillingRow.h
index 434a9270718..604f4b1ee74 100644
--- a/src/Interpreters/FillingRow.h
+++ b/src/Interpreters/FillingRow.h
@@ -24,14 +24,14 @@ public:
 
     void initFromDefaults(size_t from_pos = 0);
 
-    Field & operator[](size_t ind) { return row[ind]; }
-    const Field & operator[](size_t ind) const { return row[ind]; }
+    Field & operator[](size_t index) { return row[index]; }
+    const Field & operator[](size_t index) const { return row[index]; }
     size_t size() const { return row.size(); }
     bool operator<(const FillingRow & other) const;
     bool operator==(const FillingRow & other) const;
 
-    int getDirection(size_t ind) const { return description[ind].direction; }
-    FillColumnDescription & getFillDescription(size_t ind) { return description[ind].fill_description; }
+    int getDirection(size_t index) const { return description[index].direction; }
+    FillColumnDescription & getFillDescription(size_t index) { return description[index].fill_description; }
 
 private:
     Row row;
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.cpp b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
new file mode 100644
index 00000000000..b23daa2d648
--- /dev/null
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
@@ -0,0 +1,85 @@
+#include <string>
+#include <Interpreters/GatherFunctionQuantileVisitor.h>
+#include <Common/Exception.h>
+#include <base/types.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+/// Mapping from quantile functions for single value to plural
+static const std::unordered_map<String, String> quantile_fuse_name_mapping = {
+    {NameQuantile::name, NameQuantiles::name},
+    {NameQuantileBFloat16::name, NameQuantilesBFloat16::name},
+    {NameQuantileBFloat16Weighted::name, NameQuantilesBFloat16Weighted::name},
+    {NameQuantileDeterministic::name, NameQuantilesDeterministic::name},
+    {NameQuantileExact::name, NameQuantilesExact::name},
+    {NameQuantileExactExclusive::name, NameQuantilesExactExclusive::name},
+    {NameQuantileExactHigh::name, NameQuantilesExactHigh::name},
+    {NameQuantileExactInclusive::name, NameQuantilesExactInclusive::name},
+    {NameQuantileExactLow::name, NameQuantilesExactLow::name},
+    {NameQuantileExactWeighted::name, NameQuantilesExactWeighted::name},
+    {NameQuantileTDigest::name, NameQuantilesTDigest::name},
+    {NameQuantileTDigestWeighted::name, NameQuantilesTDigestWeighted::name},
+    {NameQuantileTiming::name, NameQuantilesTiming::name},
+    {NameQuantileTimingWeighted::name, NameQuantilesTimingWeighted::name},
+};
+
+String GatherFunctionQuantileData::getFusedName(const String & func_name)
+{
+    if (auto it = quantile_fuse_name_mapping.find(func_name); it != quantile_fuse_name_mapping.end())
+        return it->second;
+    throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Function '{}' is not quantile-family or cannot be fused", func_name);
+}
+
+void GatherFunctionQuantileData::visit(ASTFunction & function, ASTPtr & ast)
+{
+    if (!quantile_fuse_name_mapping.contains(function.name))
+        return;
+
+    fuse_quantile[function.name].addFuncNode(ast);
+}
+
+void GatherFunctionQuantileData::FuseQuantileAggregatesData::addFuncNode(ASTPtr & ast)
+{
+    const auto * func = ast->as<ASTFunction>();
+    if (!func || func->parameters == nullptr)
+        return;
+
+    const auto & arguments = func->arguments->children;
+
+    bool need_two_args = func->name == NameQuantileDeterministic::name
+                         || func->name == NameQuantileExactWeighted::name
+                         || func->name == NameQuantileTimingWeighted::name
+                         || func->name == NameQuantileTDigestWeighted::name
+                         || func->name == NameQuantileBFloat16Weighted::name;
+    if (arguments.size() != (need_two_args ? 2 : 1))
+        return;
+
+    if (arguments[0]->getColumnName().find(',') != std::string::npos)
+        return;
+    String arg_name = arguments[0]->getColumnName();
+    if (need_two_args)
+    {
+        if (arguments[1]->getColumnName().find(',') != std::string::npos)
+            return;
+        arg_name += "," + arguments[1]->getColumnName();
+    }
+
+    arg_map_function[arg_name].push_back(&ast);
+}
+
+bool GatherFunctionQuantileData::needChild(const ASTPtr & node, const ASTPtr &)
+{
+    /// Skip children of quantile* functions to escape cycles in further processing
+    if (const auto * func = node ? node->as<ASTFunction>() : nullptr)
+        return !quantile_fuse_name_mapping.contains(func->name);
+    return true;
+}
+
+}
+
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.h b/src/Interpreters/GatherFunctionQuantileVisitor.h
new file mode 100644
index 00000000000..19f092720af
--- /dev/null
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
+
+namespace DB
+{
+
+/// Gather all the `quantile*` functions
+class GatherFunctionQuantileData
+{
+public:
+    struct FuseQuantileAggregatesData
+    {
+        std::unordered_map<String, std::vector<ASTPtr *>> arg_map_function;
+
+        void addFuncNode(ASTPtr & ast);
+    };
+
+    using TypeToVisit = ASTFunction;
+
+    std::unordered_map<String, FuseQuantileAggregatesData> fuse_quantile;
+
+    void visit(ASTFunction & function, ASTPtr & ast);
+
+    static String getFusedName(const String & func_name);
+
+    static bool needChild(const ASTPtr & node, const ASTPtr &);
+};
+
+using GatherFunctionQuantileVisitor = InDepthNodeVisitor<OneTypeMatcher<GatherFunctionQuantileData, GatherFunctionQuantileData::needChild>, true>;
+
+}
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 6a87527dc9c..70f7c0c0359 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -8,6 +8,7 @@
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/interpretSubquery.h>
+#include <Interpreters/SubqueryForSet.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
@@ -15,7 +16,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/IAST.h>
-#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Common/typeid_cast.h>
 
@@ -158,13 +159,9 @@ public:
                 auto external_table = external_storage_holder->getTable();
                 auto table_out = external_table->write({}, external_table->getInMemoryMetadataPtr(), getContext());
                 auto io = interpreter->execute();
-                io.pipeline.resize(1);
-                io.pipeline.setSinks([&](const Block &, Pipe::StreamType) -> ProcessorPtr
-                {
-                    return table_out;
-                });
-                auto executor = io.pipeline.execute();
-                executor->execute(io.pipeline.getNumStreams());
+                io.pipeline.complete(std::move(table_out));
+                CompletedPipelineExecutor executor(io.pipeline);
+                executor.execute();
             }
             else
             {
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index dd17fc1004c..1d112a7c548 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -1,7 +1,9 @@
 #include <any>
 #include <limits>
+#include <unordered_map>
+#include <vector>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnString.h>
@@ -21,13 +23,10 @@
 
 #include <Storages/StorageDictionary.h>
 
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/materializeBlock.h>
 
 #include <Core/ColumnNumbers.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-
 namespace DB
 {
 
@@ -57,53 +56,107 @@ struct NotProcessedCrossJoin : public ExtraBlock
 
 namespace JoinStuff
 {
-    /// Version of `getUsed` with dynamic dispatch
+    /// for single disjunct
     bool JoinUsedFlags::getUsedSafe(size_t i) const
     {
-        if (flags.empty())
-            return !need_flags;
-        return flags[i].load();
+        return getUsedSafe(nullptr, i);
     }
 
+    /// for multiple disjuncts
+    bool JoinUsedFlags::getUsedSafe(const Block * block_ptr, size_t row_idx) const
+    {
+        if (auto it = flags.find(block_ptr); it != flags.end())
+            return it->second[row_idx].load();
+        return !need_flags;
+    }
+
+    /// for single disjunct
     template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
     void JoinUsedFlags::reinit(size_t size)
     {
         if constexpr (MapGetter<KIND, STRICTNESS>::flagged)
         {
-            assert(flags.size() <= size);
+            assert(flags[nullptr].size() <= size);
             need_flags = true;
-            flags = std::vector<std::atomic_bool>(size);
+            flags[nullptr] = std::vector<std::atomic_bool>(size);
         }
     }
 
-    template <>
-    void JoinUsedFlags::setUsed<false>(size_t i [[maybe_unused]]) {}
-
-    template <>
-    bool JoinUsedFlags::getUsed<false>(size_t i [[maybe_unused]]) { return true; }
-
-    template <>
-    bool JoinUsedFlags::setUsedOnce<false>(size_t i [[maybe_unused]]) { return true; }
-
-    template <>
-    void JoinUsedFlags::setUsed<true>(size_t i)
+    /// for multiple disjuncts
+    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+    void JoinUsedFlags::reinit(const Block * block_ptr)
     {
-        /// Could be set simultaneously from different threads.
-        flags[i].store(true, std::memory_order_relaxed);
+        if constexpr (MapGetter<KIND, STRICTNESS>::flagged)
+        {
+            assert(flags[block_ptr].size() <= block_ptr->rows());
+            need_flags = true;
+            flags[block_ptr] = std::vector<std::atomic_bool>(block_ptr->rows());
+        }
     }
 
-    template <>
-    bool JoinUsedFlags::getUsed<true>(size_t i) { return flags[i].load(); }
-
-    template <>
-    bool JoinUsedFlags::setUsedOnce<true>(size_t i)
+    template <bool use_flags, bool multiple_disjuncts, typename FindResult>
+    void JoinUsedFlags::setUsed(const FindResult & f)
     {
-        /// fast check to prevent heavy CAS with seq_cst order
-        if (flags[i].load(std::memory_order_relaxed))
-            return false;
+        if constexpr (!use_flags)
+            return;
 
-        bool expected = false;
-        return flags[i].compare_exchange_strong(expected, true);
+        /// Could be set simultaneously from different threads.
+        if constexpr (multiple_disjuncts)
+        {
+            auto & mapped = f.getMapped();
+            flags[mapped.block][mapped.row_num].store(true, std::memory_order_relaxed);
+        }
+        else
+        {
+            flags[nullptr][f.getOffset()].store(true, std::memory_order_relaxed);
+        }
+    }
+
+    template <bool use_flags, bool multiple_disjuncts, typename FindResult>
+    bool JoinUsedFlags::getUsed(const FindResult & f)
+    {
+        if constexpr (!use_flags)
+            return true;
+
+        if constexpr (multiple_disjuncts)
+        {
+            auto & mapped = f.getMapped();
+            return flags[mapped.block][mapped.row_num].load();
+        }
+        else
+        {
+            return flags[nullptr][f.getOffset()].load();
+        }
+    }
+
+    template <bool use_flags, bool multiple_disjuncts, typename FindResult>
+    bool JoinUsedFlags::setUsedOnce(const FindResult & f)
+    {
+        if constexpr (!use_flags)
+            return true;
+
+        if constexpr (multiple_disjuncts)
+        {
+            auto & mapped = f.getMapped();
+
+            /// fast check to prevent heavy CAS with seq_cst order
+            if (flags[mapped.block][mapped.row_num].load(std::memory_order_relaxed))
+                return false;
+
+            bool expected = false;
+            return flags[mapped.block][mapped.row_num].compare_exchange_strong(expected, true);
+        }
+        else
+        {
+            auto off = f.getOffset();
+
+            /// fast check to prevent heavy CAS with seq_cst order
+            if (flags[nullptr][off].load(std::memory_order_relaxed))
+                return false;
+
+            bool expected = false;
+            return flags[nullptr][off].compare_exchange_strong(expected, true);
+        }
     }
 }
 
@@ -174,12 +227,10 @@ static ColumnWithTypeAndName correctNullability(ColumnWithTypeAndName && column,
     return std::move(column);
 }
 
-
 HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_, bool any_take_last_row_)
     : table_join(table_join_)
     , kind(table_join->kind())
     , strictness(table_join->strictness())
-    , key_names_right(table_join->keyNamesRight())
     , nullable_right_side(table_join->forceNullableRight())
     , nullable_left_side(table_join->forceNullableLeft())
     , any_take_last_row(any_take_last_row_)
@@ -190,57 +241,102 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
 {
     LOG_DEBUG(log, "Right sample block: {}", right_sample_block.dumpStructure());
 
-    JoinCommon::splitAdditionalColumns(key_names_right, right_sample_block, right_table_keys, sample_block_with_columns_to_add);
-
-    required_right_keys = table_join->getRequiredRightKeys(right_table_keys, required_right_keys_sources);
-
-    std::tie(condition_mask_column_name_left, condition_mask_column_name_right) = table_join->joinConditionColumnNames();
-
-    JoinCommon::removeLowCardinalityInplace(right_table_keys);
-    initRightBlockStructure(data->sample_block);
-
-    ColumnRawPtrs key_columns = JoinCommon::extractKeysForJoin(right_table_keys, key_names_right);
-
-    JoinCommon::createMissedColumns(sample_block_with_columns_to_add);
-    if (nullable_right_side)
-        JoinCommon::convertColumnsToNullable(sample_block_with_columns_to_add);
-
-    if (table_join->dictionary_reader)
+    if (isCrossOrComma(kind))
     {
-        LOG_DEBUG(log, "Performing join over dict");
-        data->type = Type::DICT;
-        std::get<MapsOne>(data->maps).create(Type::DICT);
-        chooseMethod(key_columns, key_sizes); /// init key_sizes
+        data->type = Type::CROSS;
+        sample_block_with_columns_to_add = right_sample_block;
     }
-    else if (strictness == ASTTableJoin::Strictness::Asof)
+    else if (table_join->oneDisjunct())
     {
-        /// @note ASOF JOIN is not INNER. It's better avoid use of 'INNER ASOF' combination in messages.
-        /// In fact INNER means 'LEFT SEMI ASOF' while LEFT means 'LEFT OUTER ASOF'.
-        if (!isLeft(kind) && !isInner(kind))
-            throw Exception("Wrong ASOF JOIN type. Only ASOF and LEFT ASOF joins are supported", ErrorCodes::NOT_IMPLEMENTED);
-
-        if (key_columns.size() <= 1)
-            throw Exception("ASOF join needs at least one equi-join column", ErrorCodes::SYNTAX_ERROR);
-
-        if (right_table_keys.getByName(key_names_right.back()).type->isNullable())
-            throw Exception("ASOF join over right table Nullable column is not implemented", ErrorCodes::NOT_IMPLEMENTED);
-
-        size_t asof_size;
-        asof_type = AsofRowRefs::getTypeSize(*key_columns.back(), asof_size);
-        key_columns.pop_back();
-
-        /// this is going to set up the appropriate hash table for the direct lookup part of the join
-        /// However, this does not depend on the size of the asof join key (as that goes into the BST)
-        /// Therefore, add it back in such that it can be extracted appropriately from the full stored
-        /// key_columns and key_sizes
-        init(chooseMethod(key_columns, key_sizes));
-        key_sizes.push_back(asof_size);
+        const auto & key_names_right = table_join->getOnlyClause().key_names_right;
+        JoinCommon::splitAdditionalColumns(key_names_right, right_sample_block, right_table_keys, sample_block_with_columns_to_add);
+        required_right_keys = table_join->getRequiredRightKeys(right_table_keys, required_right_keys_sources);
     }
     else
     {
-        /// Choose data structure to use for JOIN.
-        init(chooseMethod(key_columns, key_sizes));
+        /// required right keys concept does not work well if multiple disjuncts, we need all keys
+        sample_block_with_columns_to_add = right_table_keys = materializeBlock(right_sample_block);
     }
+
+    LOG_TRACE(log, "Columns to add: [{}], required right [{}]",
+              sample_block_with_columns_to_add.dumpStructure(), fmt::join(required_right_keys.getNames(), ", "));
+    {
+        std::vector<String> log_text;
+        for (const auto & clause : table_join->getClauses())
+            log_text.push_back(clause.formatDebug());
+        LOG_TRACE(log, "Joining on: {}", fmt::join(log_text, " | "));
+    }
+
+    JoinCommon::removeLowCardinalityInplace(right_table_keys);
+
+    initRightBlockStructure(data->sample_block);
+
+
+    JoinCommon::createMissedColumns(sample_block_with_columns_to_add);
+
+    if (nullable_right_side)
+        JoinCommon::convertColumnsToNullable(sample_block_with_columns_to_add);
+
+    size_t disjuncts_num = table_join->getClauses().size();
+    data->maps.resize(disjuncts_num);
+    key_sizes.reserve(disjuncts_num);
+
+    for (const auto & clause : table_join->getClauses())
+    {
+        const auto & key_names_right = clause.key_names_right;
+        ColumnRawPtrs key_columns = JoinCommon::extractKeysForJoin(right_table_keys, key_names_right);
+
+        if (table_join->getDictionaryReader())
+        {
+            assert(disjuncts_num == 1);
+            LOG_DEBUG(log, "Performing join over dict");
+            data->type = Type::DICT;
+
+            data->maps.resize(disjuncts_num);
+            std::get<MapsOne>(data->maps[0]).create(Type::DICT);
+            key_sizes.resize(1);
+            chooseMethod(key_columns, key_sizes[0]); /// init key_sizes
+        }
+        else if (strictness == ASTTableJoin::Strictness::Asof)
+        {
+            assert(disjuncts_num == 1);
+
+            /// @note ASOF JOIN is not INNER. It's better avoid use of 'INNER ASOF' combination in messages.
+            /// In fact INNER means 'LEFT SEMI ASOF' while LEFT means 'LEFT OUTER ASOF'.
+            if (!isLeft(kind) && !isInner(kind))
+                throw Exception("Wrong ASOF JOIN type. Only ASOF and LEFT ASOF joins are supported", ErrorCodes::NOT_IMPLEMENTED);
+
+            if (key_columns.size() <= 1)
+                throw Exception("ASOF join needs at least one equi-join column", ErrorCodes::SYNTAX_ERROR);
+
+            if (right_table_keys.getByName(key_names_right.back()).type->isNullable())
+                throw Exception("ASOF join over right table Nullable column is not implemented", ErrorCodes::NOT_IMPLEMENTED);
+
+            size_t asof_size;
+            asof_type = AsofRowRefs::getTypeSize(*key_columns.back(), asof_size);
+            key_columns.pop_back();
+
+            /// this is going to set up the appropriate hash table for the direct lookup part of the join
+            /// However, this does not depend on the size of the asof join key (as that goes into the BST)
+            /// Therefore, add it back in such that it can be extracted appropriately from the full stored
+            /// key_columns and key_sizes
+            auto & asof_key_sizes = key_sizes.emplace_back();
+            data->type = chooseMethod(key_columns, asof_key_sizes);
+            asof_key_sizes.push_back(asof_size);
+        }
+        else
+        {
+            /// Choose data structure to use for JOIN.
+            auto current_join_method = chooseMethod(key_columns, key_sizes.emplace_back());
+            if (data->type == Type::EMPTY)
+                data->type = current_join_method;
+            else if (data->type != current_join_method)
+                data->type = Type::hashed;
+        }
+    }
+
+    for (auto & maps : data->maps)
+        dataMapInit(maps);
 }
 
 HashJoin::Type HashJoin::chooseMethod(const ColumnRawPtrs & key_columns, Sizes & key_sizes)
@@ -317,22 +413,26 @@ static KeyGetter createKeyGetter(const ColumnRawPtrs & key_columns, const Sizes
         return KeyGetter(key_columns, key_sizes, nullptr);
 }
 
+template <typename Mapped, bool need_offset = false>
+using FindResultImpl = ColumnsHashing::columns_hashing_impl::FindResultImpl<Mapped, true>;
+
 class KeyGetterForDict
 {
 public:
     using Mapped = RowRef;
-    using FindResult = ColumnsHashing::columns_hashing_impl::FindResultImpl<Mapped, true>;
+    using FindResult = FindResultImpl<Mapped, true>;
 
     KeyGetterForDict(const TableJoin & table_join, const ColumnRawPtrs & key_columns)
     {
-        table_join.dictionary_reader->readKeys(*key_columns[0], read_result, found, positions);
+        assert(table_join.getDictionaryReader());
+        table_join.getDictionaryReader()->readKeys(*key_columns[0], read_result, found, positions);
 
         for (ColumnWithTypeAndName & column : read_result)
             if (table_join.rightBecomeNullable(column.type))
                 JoinCommon::convertColumnToNullable(column);
     }
 
-    FindResult findKey(void *, size_t row, const Arena &)
+    FindResult findKey(const TableJoin &, size_t row, const Arena &)
     {
         result.block = &read_result;
         result.row_num = positions[row];
@@ -397,15 +497,14 @@ struct KeyGetterForType
     using Type = typename KeyGetterForTypeImpl<type, Value, Mapped>::Type;
 };
 
-
-void HashJoin::init(Type type_)
+void HashJoin::dataMapInit(MapsVariant & map)
 {
-    data->type = type_;
-
+    if (data->type == Type::DICT)
+        return;
     if (kind == ASTTableJoin::Kind::Cross)
         return;
-    joinDispatchInit(kind, strictness, data->maps);
-    joinDispatch(kind, strictness, data->maps, [&](auto, auto, auto & map) { map.create(data->type); });
+    joinDispatchInit(kind, strictness, map);
+    joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { map_.create(data->type); });
 }
 
 bool HashJoin::overDictionary() const
@@ -434,7 +533,10 @@ size_t HashJoin::getTotalRowCount() const
     }
     else if (data->type != Type::DICT)
     {
-        joinDispatch(kind, strictness, data->maps, [&](auto, auto, auto & map) { res += map.getTotalRowCount(data->type); });
+        for (const auto & map : data->maps)
+        {
+            joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { res += map_.getTotalRowCount(data->type); });
+        }
     }
 
     return res;
@@ -451,7 +553,10 @@ size_t HashJoin::getTotalByteCount() const
     }
     else if (data->type != Type::DICT)
     {
-        joinDispatch(kind, strictness, data->maps, [&](auto, auto, auto & map) { res += map.getTotalByteCountImpl(data->type); });
+        for (const auto & map : data->maps)
+        {
+            joinDispatch(kind, strictness, map, [&](auto, auto, auto & map_) { res += map_.getTotalByteCountImpl(data->type); });
+        }
         res += data->pool.size();
     }
 
@@ -573,8 +678,9 @@ namespace
 
 void HashJoin::initRightBlockStructure(Block & saved_block_sample)
 {
+    bool multiple_disjuncts = !table_join->oneDisjunct();
     /// We could remove key columns for LEFT | INNER HashJoin but we should keep them for JoinSwitcher (if any).
-    bool save_key_columns = !table_join->forceHashJoin() || isRightOrFull(kind);
+    bool save_key_columns = !table_join->forceHashJoin() || isRightOrFull(kind) || multiple_disjuncts;
     if (save_key_columns)
     {
         saved_block_sample = right_table_keys.cloneEmpty();
@@ -587,10 +693,18 @@ void HashJoin::initRightBlockStructure(Block & saved_block_sample)
 
     /// Save non key columns
     for (auto & column : sample_block_with_columns_to_add)
-        saved_block_sample.insert(column);
+    {
+        if (!saved_block_sample.findByName(column.name))
+        {
+            saved_block_sample.insert(column);
+        }
+    }
 
     if (nullable_right_side)
-        JoinCommon::convertColumnsToNullable(saved_block_sample, (isFull(kind) ? right_table_keys.columns() : 0));
+    {
+        JoinCommon::convertColumnsToNullable(saved_block_sample, (isFull(kind) && !multiple_disjuncts ? right_table_keys.columns() : 0));
+    }
+
 }
 
 Block HashJoin::structureRightBlock(const Block & block) const
@@ -623,50 +737,13 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
     Block block = materializeBlock(source_block);
     size_t rows = block.rows();
 
-    ColumnRawPtrs key_columns = JoinCommon::materializeColumnsInplace(block, key_names_right);
-
-    /// We will insert to the map only keys, where all components are not NULL.
-    ConstNullMapPtr null_map{};
-    ColumnPtr null_map_holder = extractNestedColumnsAndNullMap(key_columns, null_map);
-
-    /// If RIGHT or FULL save blocks with nulls for NonJoinedBlockInputStream
-    UInt8 save_nullmap = 0;
-    if (isRightOrFull(kind) && null_map)
-    {
-        /// Save rows with NULL keys
-        for (size_t i = 0; !save_nullmap && i < null_map->size(); ++i)
-            save_nullmap |= (*null_map)[i];
-    }
-
-    auto join_mask_col = JoinCommon::getColumnAsMask(block, condition_mask_column_name_right);
-
-    /// Save blocks that do not hold conditions in ON section
-    ColumnUInt8::MutablePtr not_joined_map = nullptr;
-    if (isRightOrFull(kind) && join_mask_col)
-    {
-        const auto & join_mask = assert_cast<const ColumnUInt8 &>(*join_mask_col).getData();
-        /// Save rows that do not hold conditions
-        not_joined_map = ColumnUInt8::create(block.rows(), 0);
-        for (size_t i = 0, sz = join_mask.size(); i < sz; ++i)
-        {
-            /// Condition hold, do not save row
-            if (join_mask[i])
-                continue;
-
-            /// NULL key will be saved anyway because, do not save twice
-            if (save_nullmap && (*null_map)[i])
-                continue;
-
-            not_joined_map->getData()[i] = 1;
-        }
-    }
+    ColumnRawPtrMap all_key_columns = JoinCommon::materializeColumnsInplaceMap(block, table_join->getAllNames(JoinTableSide::Right));
 
     Block structured_block = structureRightBlock(block);
     size_t total_rows = 0;
     size_t total_bytes = 0;
-
     {
-        if (storage_join_lock.mutex())
+        if (storage_join_lock)
             throw DB::Exception("addJoinedBlock called when HashJoin locked to prevent updates",
                                 ErrorCodes::LOGICAL_ERROR);
 
@@ -676,31 +753,79 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
         if (rows)
             data->empty = false;
 
-        if (kind != ASTTableJoin::Kind::Cross)
+        bool multiple_disjuncts = !table_join->oneDisjunct();
+        const auto & onexprs = table_join->getClauses();
+        for (size_t onexpr_idx = 0; onexpr_idx < onexprs.size(); ++onexpr_idx)
         {
-            joinDispatch(kind, strictness, data->maps, [&](auto kind_, auto strictness_, auto & map)
+            ColumnRawPtrs key_columns;
+            for (const auto & name : onexprs[onexpr_idx].key_names_right)
+                key_columns.push_back(all_key_columns[name]);
+
+            /// We will insert to the map only keys, where all components are not NULL.
+            ConstNullMapPtr null_map{};
+            ColumnPtr null_map_holder = extractNestedColumnsAndNullMap(key_columns, null_map);
+
+            /// If RIGHT or FULL save blocks with nulls for NotJoinedBlocks
+            UInt8 save_nullmap = 0;
+            if (isRightOrFull(kind) && null_map)
             {
-                size_t size = insertFromBlockImpl<strictness_>(
-                                 *this, data->type, map, rows, key_columns, key_sizes, stored_block, null_map,
-                                 join_mask_col ? &assert_cast<const ColumnUInt8 &>(*join_mask_col).getData() : nullptr,
-                                 data->pool);
-                /// Number of buckets + 1 value from zero storage
-                used_flags.reinit<kind_, strictness_>(size + 1);
-            });
+                /// Save rows with NULL keys
+                for (size_t i = 0; !save_nullmap && i < null_map->size(); ++i)
+                    save_nullmap |= (*null_map)[i];
+            }
+
+            auto join_mask_col = JoinCommon::getColumnAsMask(block, onexprs[onexpr_idx].condColumnNames().second);
+            /// Save blocks that do not hold conditions in ON section
+            ColumnUInt8::MutablePtr not_joined_map = nullptr;
+            if (!multiple_disjuncts && isRightOrFull(kind) && join_mask_col)
+            {
+                const auto & join_mask = assert_cast<const ColumnUInt8 &>(*join_mask_col).getData();
+                /// Save rows that do not hold conditions
+                not_joined_map = ColumnUInt8::create(block.rows(), 0);
+                for (size_t i = 0, sz = join_mask.size(); i < sz; ++i)
+                {
+                    /// Condition hold, do not save row
+                    if (join_mask[i])
+                        continue;
+
+                    /// NULL key will be saved anyway because, do not save twice
+                    if (save_nullmap && (*null_map)[i])
+                        continue;
+
+                    not_joined_map->getData()[i] = 1;
+                }
+            }
+
+            if (kind != ASTTableJoin::Kind::Cross)
+            {
+                joinDispatch(kind, strictness, data->maps[onexpr_idx], [&](auto kind_, auto strictness_, auto & map)
+                {
+                    size_t size = insertFromBlockImpl<strictness_>(
+                        *this, data->type, map, rows, key_columns, key_sizes[onexpr_idx], stored_block, null_map,
+                        join_mask_col ? &assert_cast<const ColumnUInt8 &>(*join_mask_col).getData() : nullptr,
+                        data->pool);
+
+                    if (multiple_disjuncts)
+                        used_flags.reinit<kind_, strictness_>(stored_block);
+                    else
+                        /// Number of buckets + 1 value from zero storage
+                        used_flags.reinit<kind_, strictness_>(size + 1);
+                });
+            }
+
+            if (!multiple_disjuncts && save_nullmap)
+                data->blocks_nullmaps.emplace_back(stored_block, null_map_holder);
+
+            if (!multiple_disjuncts && not_joined_map)
+                data->blocks_nullmaps.emplace_back(stored_block, std::move(not_joined_map));
+
+            if (!check_limits)
+                return true;
+
+            /// TODO: Do not calculate them every time
+            total_rows = getTotalRowCount();
+            total_bytes = getTotalByteCount();
         }
-
-        if (save_nullmap)
-            data->blocks_nullmaps.emplace_back(stored_block, null_map_holder);
-
-        if (not_joined_map)
-            data->blocks_nullmaps.emplace_back(stored_block, std::move(not_joined_map));
-
-        if (!check_limits)
-            return true;
-
-        /// TODO: Do not calculate them every time
-        total_rows = getTotalRowCount();
-        total_bytes = getTotalByteCount();
     }
 
     return table_join->sizeLimits().check(total_rows, total_bytes, "JOIN", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED);
@@ -710,6 +835,43 @@ bool HashJoin::addJoinedBlock(const Block & source_block, bool check_limits)
 namespace
 {
 
+struct JoinOnKeyColumns
+{
+    Names key_names;
+
+    Columns materialized_keys_holder;
+    ColumnRawPtrs key_columns;
+
+    ConstNullMapPtr null_map;
+    ColumnPtr null_map_holder;
+
+    /// Only rows where mask == true can be joined
+    ColumnPtr join_mask_column;
+
+    Sizes key_sizes;
+
+
+    explicit JoinOnKeyColumns(const Block & block, const Names & key_names_, const String & cond_column_name, const Sizes & key_sizes_)
+        : key_names(key_names_)
+        , materialized_keys_holder(JoinCommon::materializeColumns(block, key_names)) /// Rare case, when keys are constant or low cardinality. To avoid code bloat, simply materialize them.
+        , key_columns(JoinCommon::getRawPointers(materialized_keys_holder))
+        , null_map(nullptr)
+        , null_map_holder(extractNestedColumnsAndNullMap(key_columns, null_map))
+        , join_mask_column(JoinCommon::getColumnAsMask(block, cond_column_name))
+        , key_sizes(key_sizes_)
+    {}
+
+    bool isRowFiltered(size_t i) const
+    {
+        if (join_mask_column)
+        {
+            UInt8ColumnDataPtr mask = &assert_cast<const ColumnUInt8 &>(*(join_mask_column)).getData();
+            return !(*mask)[i];
+        }
+        return false;
+    }
+};
+
 class AddedColumns
 {
 public:
@@ -730,17 +892,13 @@ public:
         const Block & block,
         const Block & saved_block_sample,
         const HashJoin & join,
-        const ColumnRawPtrs & key_columns_,
-        const Sizes & key_sizes_,
-        const UInt8ColumnDataPtr & join_mask_column_,
+        std::vector<JoinOnKeyColumns> && join_on_keys_,
         bool is_asof_join,
         bool is_join_get_)
-        : key_columns(key_columns_)
-        , key_sizes(key_sizes_)
+        : join_on_keys(join_on_keys_)
         , rows_to_add(block.rows())
         , asof_type(join.getAsofType())
         , asof_inequality(join.getAsofInequality())
-        , join_mask_column(join_mask_column_)
         , is_join_get(is_join_get_)
     {
         size_t num_columns_to_add = block_with_columns_to_add.columns();
@@ -763,9 +921,10 @@ public:
 
         if (is_asof_join)
         {
+            assert(join_on_keys.size() == 1);
             const ColumnWithTypeAndName & right_asof_column = join.rightAsofKeyColumn();
             addColumn(right_asof_column, right_asof_column.name);
-            left_asof_key = key_columns.back();
+            left_asof_key = join_on_keys[0].key_columns.back();
         }
 
         for (auto & tn : type_name)
@@ -825,10 +984,7 @@ public:
     ASOF::Inequality asofInequality() const { return asof_inequality; }
     const IColumn & leftAsofKey() const { return *left_asof_key; }
 
-    bool isRowFiltered(size_t i) { return join_mask_column && !(*join_mask_column)[i]; }
-
-    const ColumnRawPtrs & key_columns;
-    const Sizes & key_sizes;
+    std::vector<JoinOnKeyColumns> join_on_keys;
     size_t rows_to_add;
     std::unique_ptr<IColumn::Offsets> offsets_to_replicate;
     bool need_filter = false;
@@ -842,7 +998,6 @@ private:
     std::optional<TypeIndex> asof_type;
     ASOF::Inequality asof_inequality;
     const IColumn * left_asof_key = nullptr;
-    UInt8ColumnDataPtr join_mask_column;
     bool is_join_get;
 
     void addColumn(const ColumnWithTypeAndName & src_column, const std::string & qualified_name)
@@ -853,16 +1008,150 @@ private:
     }
 };
 
-template <typename Map, bool add_missing>
-void addFoundRowAll(const typename Map::mapped_type & mapped, AddedColumns & added, IColumn::Offset & current_offset)
+template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+struct JoinFeatures
+{
+    static constexpr bool is_any_join = STRICTNESS == ASTTableJoin::Strictness::Any;
+    static constexpr bool is_any_or_semi_join = STRICTNESS == ASTTableJoin::Strictness::Any || STRICTNESS == ASTTableJoin::Strictness::RightAny || (STRICTNESS == ASTTableJoin::Strictness::Semi && KIND == ASTTableJoin::Kind::Left);
+    static constexpr bool is_all_join = STRICTNESS == ASTTableJoin::Strictness::All;
+    static constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
+    static constexpr bool is_semi_join = STRICTNESS == ASTTableJoin::Strictness::Semi;
+    static constexpr bool is_anti_join = STRICTNESS == ASTTableJoin::Strictness::Anti;
+
+    static constexpr bool left = KIND == ASTTableJoin::Kind::Left;
+    static constexpr bool right = KIND == ASTTableJoin::Kind::Right;
+    static constexpr bool inner = KIND == ASTTableJoin::Kind::Inner;
+    static constexpr bool full = KIND == ASTTableJoin::Kind::Full;
+
+    static constexpr bool need_replication = is_all_join || (is_any_join && right) || (is_semi_join && right);
+    static constexpr bool need_filter = !need_replication && (inner || right || (is_semi_join && left) || (is_anti_join && left));
+    static constexpr bool add_missing = (left || full) && !is_semi_join;
+
+    static constexpr bool need_flags = MapGetter<KIND, STRICTNESS>::flagged;
+
+};
+
+template <bool multiple_disjuncts>
+class KnownRowsHolder;
+
+/// Keep already joined rows to prevent duplication if many disjuncts
+///   if for a particular pair of rows condition looks like TRUE or TRUE or TRUE
+///   we want to have it once in resultset
+template<>
+class KnownRowsHolder<true>
+{
+public:
+    using Type = std::pair<const Block *, DB::RowRef::SizeT>;
+
+private:
+    static const size_t MAX_LINEAR = 16; // threshold to switch from Array to Set
+    using ArrayHolder = std::array<Type, MAX_LINEAR>;
+    using SetHolder = std::set<Type>;
+    using SetHolderPtr = std::unique_ptr<SetHolder>;
+
+    ArrayHolder array_holder;
+    SetHolderPtr set_holder_ptr;
+
+    size_t items;
+
+public:
+    KnownRowsHolder()
+        : items(0)
+    {
+    }
+
+
+    template<class InputIt>
+    void add(InputIt from, InputIt to)
+    {
+        const size_t new_items = std::distance(from, to);
+        if (items + new_items <= MAX_LINEAR)
+        {
+            std::copy(from, to, &array_holder[items]);
+        }
+        else
+        {
+            if (items <= MAX_LINEAR)
+            {
+                set_holder_ptr = std::make_unique<SetHolder>();
+                set_holder_ptr->insert(std::cbegin(array_holder), std::cbegin(array_holder) + items);
+            }
+            set_holder_ptr->insert(from, to);
+        }
+        items += new_items;
+    }
+
+    template<class Needle>
+    bool isKnown(const Needle & needle)
+    {
+        return items <= MAX_LINEAR
+            ? std::find(std::cbegin(array_holder), std::cbegin(array_holder) + items, needle) != std::cbegin(array_holder) + items
+            : set_holder_ptr->find(needle) != set_holder_ptr->end();
+    }
+};
+
+template<>
+class KnownRowsHolder<false>
+{
+public:
+    template<class InputIt>
+    void add(InputIt, InputIt)
+    {
+    }
+
+    template<class Needle>
+    static bool isKnown(const Needle &)
+    {
+        return false;
+    }
+};
+
+template <typename Map, bool add_missing, bool multiple_disjuncts>
+void addFoundRowAll(
+    const typename Map::mapped_type & mapped,
+    AddedColumns & added,
+    IColumn::Offset & current_offset,
+    KnownRowsHolder<multiple_disjuncts> & known_rows [[maybe_unused]],
+    JoinStuff::JoinUsedFlags * used_flags [[maybe_unused]])
 {
     if constexpr (add_missing)
         added.applyLazyDefaults();
 
-    for (auto it = mapped.begin(); it.ok(); ++it)
+    if constexpr (multiple_disjuncts)
     {
-        added.appendFromBlock<false>(*it->block, it->row_num);
-        ++current_offset;
+        std::unique_ptr<std::vector<KnownRowsHolder<true>::Type>> new_known_rows_ptr;
+
+        for (auto it = mapped.begin(); it.ok(); ++it)
+        {
+            if (!known_rows.isKnown(std::make_pair(it->block, it->row_num)))
+            {
+                added.appendFromBlock<false>(*it->block, it->row_num);
+                ++current_offset;
+                if (!new_known_rows_ptr)
+                {
+                    new_known_rows_ptr = std::make_unique<std::vector<KnownRowsHolder<true>::Type>>();
+                }
+                new_known_rows_ptr->push_back(std::make_pair(it->block, it->row_num));
+                if (used_flags)
+                {
+                    used_flags->JoinStuff::JoinUsedFlags::setUsedOnce<true, multiple_disjuncts>(
+                        FindResultImpl<const RowRef, false>(*it, true, 0));
+                }
+            }
+        }
+
+        if (new_known_rows_ptr)
+        {
+            known_rows.add(std::cbegin(*new_known_rows_ptr), std::cend(*new_known_rows_ptr));
+        }
+    }
+    else
+    {
+        for (auto it = mapped.begin(); it.ok(); ++it)
+        {
+            added.appendFromBlock<false>(*it->block, it->row_num);
+            ++current_offset;
+        }
     }
 };
 
@@ -884,30 +1173,16 @@ void setUsed(IColumn::Filter & filter [[maybe_unused]], size_t pos [[maybe_unuse
         filter[pos] = 1;
 }
 
-
 /// Joins right table columns which indexes are present in right_indexes using specified map.
 /// Makes filter (1 if row presented in right table) and returns offsets to replicate (for ALL JOINS).
-template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map>
+template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map, bool multiple_disjuncts>
 NO_INLINE IColumn::Filter joinRightColumns(
-    KeyGetter && key_getter,
-    const Map & map,
+    std::vector<KeyGetter> && key_getter_vector,
+    const std::vector<const Map *> & mapv,
     AddedColumns & added_columns,
-    const ConstNullMapPtr & null_map [[maybe_unused]],
     JoinStuff::JoinUsedFlags & used_flags [[maybe_unused]])
 {
-    constexpr bool is_any_join = STRICTNESS == ASTTableJoin::Strictness::Any;
-    constexpr bool is_all_join = STRICTNESS == ASTTableJoin::Strictness::All;
-    constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
-    constexpr bool is_semi_join = STRICTNESS == ASTTableJoin::Strictness::Semi;
-    constexpr bool is_anti_join = STRICTNESS == ASTTableJoin::Strictness::Anti;
-    constexpr bool left = KIND == ASTTableJoin::Kind::Left;
-    constexpr bool right = KIND == ASTTableJoin::Kind::Right;
-    constexpr bool full = KIND == ASTTableJoin::Kind::Full;
-
-    constexpr bool need_flags = MapGetter<KIND, STRICTNESS>::flagged;
-
-    constexpr bool add_missing = (left || full) && !is_semi_join;
-    constexpr bool need_replication = is_all_join || (is_any_join && right) || (is_semi_join && right);
+    constexpr JoinFeatures<KIND, STRICTNESS> jf;
 
     size_t rows = added_columns.rows_to_add;
     IColumn::Filter filter;
@@ -916,141 +1191,183 @@ NO_INLINE IColumn::Filter joinRightColumns(
 
     Arena pool;
 
-    if constexpr (need_replication)
+    if constexpr (jf.need_replication)
         added_columns.offsets_to_replicate = std::make_unique<IColumn::Offsets>(rows);
 
     IColumn::Offset current_offset = 0;
 
     for (size_t i = 0; i < rows; ++i)
     {
+        bool right_row_found = false;
+        bool null_element_found = false;
+
+        KnownRowsHolder<multiple_disjuncts> known_rows;
+        for (size_t onexpr_idx = 0; onexpr_idx < added_columns.join_on_keys.size(); ++onexpr_idx)
+        {
+            const auto & join_keys = added_columns.join_on_keys[onexpr_idx];
+            if constexpr (has_null_map)
+            {
+                if (join_keys.null_map && (*join_keys.null_map)[i])
+                {
+                    null_element_found = true;
+                    continue;
+                }
+            }
+
+            bool row_acceptable = !join_keys.isRowFiltered(i);
+            using FindResult = typename KeyGetter::FindResult;
+            auto find_result = row_acceptable ? key_getter_vector[onexpr_idx].findKey(*(mapv[onexpr_idx]), i, pool) : FindResult();
+
+            if (find_result.isFound())
+            {
+                right_row_found = true;
+                auto & mapped = find_result.getMapped();
+                if constexpr (jf.is_asof_join)
+                {
+                    TypeIndex asof_type = added_columns.asofType();
+                    ASOF::Inequality asof_inequality = added_columns.asofInequality();
+                    const IColumn & left_asof_key = added_columns.leftAsofKey();
+
+                    if (const RowRef * found = mapped.findAsof(asof_type, asof_inequality, left_asof_key, i))
+                    {
+                        setUsed<need_filter>(filter, i);
+                        if constexpr (multiple_disjuncts)
+                            used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(FindResultImpl<const RowRef, false>(found, true, 0));
+                        else
+                            used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
+
+                        added_columns.appendFromBlock<jf.add_missing>(*found->block, found->row_num);
+                    }
+                    else
+                        addNotFoundRow<jf.add_missing, jf.need_replication>(added_columns, current_offset);
+                }
+                else if constexpr (jf.is_all_join)
+                {
+                    setUsed<need_filter>(filter, i);
+                    used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
+                    auto used_flags_opt = jf.need_flags ? &used_flags : nullptr;
+                    addFoundRowAll<Map, jf.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
+                }
+                else if constexpr ((jf.is_any_join || jf.is_semi_join) && jf.right)
+                {
+                    /// Use first appeared left key + it needs left columns replication
+                    bool used_once = used_flags.template setUsedOnce<jf.need_flags, multiple_disjuncts>(find_result);
+                    if (used_once)
+                    {
+                        auto used_flags_opt = jf.need_flags ? &used_flags : nullptr;
+                        setUsed<need_filter>(filter, i);
+                        addFoundRowAll<Map, jf.add_missing>(mapped, added_columns, current_offset, known_rows, used_flags_opt);
+                    }
+                }
+                else if constexpr (jf.is_any_join && KIND == ASTTableJoin::Kind::Inner)
+                {
+                    bool used_once = used_flags.template setUsedOnce<jf.need_flags, multiple_disjuncts>(find_result);
+
+                    /// Use first appeared left key only
+                    if (used_once)
+                    {
+                        setUsed<need_filter>(filter, i);
+                        added_columns.appendFromBlock<jf.add_missing>(*mapped.block, mapped.row_num);
+                    }
+
+                    break;
+                }
+                else if constexpr (jf.is_any_join && jf.full)
+                {
+                    /// TODO
+                }
+                else if constexpr (jf.is_anti_join)
+                {
+                    if constexpr (jf.right && jf.need_flags)
+                        used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
+                }
+                else /// ANY LEFT, SEMI LEFT, old ANY (RightAny)
+                {
+                    setUsed<need_filter>(filter, i);
+                    used_flags.template setUsed<jf.need_flags, multiple_disjuncts>(find_result);
+                    added_columns.appendFromBlock<jf.add_missing>(*mapped.block, mapped.row_num);
+
+                    if (jf.is_any_or_semi_join)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
         if constexpr (has_null_map)
         {
-            if ((*null_map)[i])
+            if (!right_row_found && null_element_found)
             {
-                addNotFoundRow<add_missing, need_replication>(added_columns, current_offset);
+                addNotFoundRow<jf.add_missing, jf.need_replication>(added_columns, current_offset);
 
-                if constexpr (need_replication)
-                    (*added_columns.offsets_to_replicate)[i] = current_offset;
+                if constexpr (jf.need_replication)
+                {
+                   (*added_columns.offsets_to_replicate)[i] = current_offset;
+                }
                 continue;
             }
         }
 
-        bool row_acceptable = !added_columns.isRowFiltered(i);
-        using FindResult = typename KeyGetter::FindResult;
-        auto find_result = row_acceptable ? key_getter.findKey(map, i, pool) : FindResult();
-
-        if (find_result.isFound())
+        if (!right_row_found)
         {
-            auto & mapped = find_result.getMapped();
-
-            if constexpr (is_asof_join)
-            {
-                TypeIndex asof_type = added_columns.asofType();
-                ASOF::Inequality asof_inequality = added_columns.asofInequality();
-                const IColumn & left_asof_key = added_columns.leftAsofKey();
-
-                if (const RowRef * found = mapped.findAsof(asof_type, asof_inequality, left_asof_key, i))
-                {
-                    setUsed<need_filter>(filter, i);
-                    used_flags.template setUsed<need_flags>(find_result.getOffset());
-                    added_columns.appendFromBlock<add_missing>(*found->block, found->row_num);
-                }
-                else
-                    addNotFoundRow<add_missing, need_replication>(added_columns, current_offset);
-            }
-            else if constexpr (is_all_join)
-            {
+            if constexpr (jf.is_anti_join && jf.left)
                 setUsed<need_filter>(filter, i);
-                used_flags.template setUsed<need_flags>(find_result.getOffset());
-                addFoundRowAll<Map, add_missing>(mapped, added_columns, current_offset);
-            }
-            else if constexpr ((is_any_join || is_semi_join) && right)
-            {
-                /// Use first appeared left key + it needs left columns replication
-                bool used_once = used_flags.template setUsedOnce<need_flags>(find_result.getOffset());
-
-                if (used_once)
-                {
-                    setUsed<need_filter>(filter, i);
-                    addFoundRowAll<Map, add_missing>(mapped, added_columns, current_offset);
-                }
-            }
-            else if constexpr (is_any_join && KIND == ASTTableJoin::Kind::Inner)
-            {
-                bool used_once = used_flags.template setUsedOnce<need_flags>(find_result.getOffset());
-
-                /// Use first appeared left key only
-                if (used_once)
-                {
-                    setUsed<need_filter>(filter, i);
-                    added_columns.appendFromBlock<add_missing>(*mapped.block, mapped.row_num);
-                }
-            }
-            else if constexpr (is_any_join && full)
-            {
-                /// TODO
-            }
-            else if constexpr (is_anti_join)
-            {
-                if constexpr (right && need_flags)
-                    used_flags.template setUsed<need_flags>(find_result.getOffset());
-            }
-            else /// ANY LEFT, SEMI LEFT, old ANY (RightAny)
-            {
-                setUsed<need_filter>(filter, i);
-                used_flags.template setUsed<need_flags>(find_result.getOffset());
-                added_columns.appendFromBlock<add_missing>(*mapped.block, mapped.row_num);
-            }
-        }
-        else
-        {
-            if constexpr (is_anti_join && left)
-                setUsed<need_filter>(filter, i);
-            addNotFoundRow<add_missing, need_replication>(added_columns, current_offset);
+            addNotFoundRow<jf.add_missing, jf.need_replication>(added_columns, current_offset);
         }
 
-        if constexpr (need_replication)
-            (*added_columns.offsets_to_replicate)[i] = current_offset;
+        if constexpr (jf.need_replication)
+        {
+           (*added_columns.offsets_to_replicate)[i] = current_offset;
+        }
     }
 
     added_columns.applyLazyDefaults();
     return filter;
 }
 
+template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool has_null_map>
+IColumn::Filter joinRightColumnsSwitchMultipleDisjuncts(
+    std::vector<KeyGetter> && key_getter_vector,
+    const std::vector<const Map *> & mapv,
+    AddedColumns & added_columns,
+    JoinStuff::JoinUsedFlags & used_flags [[maybe_unused]])
+{
+    return mapv.size() > 1
+        ? joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, true, true, true>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags)
+        : joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, true, true, false>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
+}
+
 template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename KeyGetter, typename Map>
 IColumn::Filter joinRightColumnsSwitchNullability(
-        KeyGetter && key_getter,
-        const Map & map,
-        AddedColumns & added_columns,
-        const ConstNullMapPtr & null_map,
-        JoinStuff::JoinUsedFlags & used_flags)
+    std::vector<KeyGetter> && key_getter_vector,
+    const std::vector<const Map *> & mapv,
+    AddedColumns & added_columns,
+    JoinStuff::JoinUsedFlags & used_flags)
 {
+    bool has_null_map = std::any_of(added_columns.join_on_keys.begin(), added_columns.join_on_keys.end(),
+                                    [](const auto & k) { return k.null_map; });
     if (added_columns.need_filter)
     {
-        if (null_map)
-            return joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, true, true>(
-                    std::forward<KeyGetter>(key_getter), map, added_columns, null_map, used_flags);
+        if (has_null_map)
+            return joinRightColumnsSwitchMultipleDisjuncts<KIND, STRICTNESS, KeyGetter, Map, true, true>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
         else
-            return joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, true, false>(
-                    std::forward<KeyGetter>(key_getter), map, added_columns, nullptr, used_flags);
+            return joinRightColumnsSwitchMultipleDisjuncts<KIND, STRICTNESS, KeyGetter, Map, true, false>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
     }
     else
     {
-        if (null_map)
-            return joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, false, true>(
-                    std::forward<KeyGetter>(key_getter), map, added_columns, null_map, used_flags);
+        if (has_null_map)
+            return joinRightColumnsSwitchMultipleDisjuncts<KIND, STRICTNESS, KeyGetter, Map, false, true>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
         else
-            return joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, false, false>(
-                    std::forward<KeyGetter>(key_getter), map, added_columns, nullptr, used_flags);
+            return joinRightColumnsSwitchMultipleDisjuncts<KIND, STRICTNESS, KeyGetter, Map, false, false>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
     }
 }
 
 template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
 IColumn::Filter switchJoinRightColumns(
-    const Maps & maps_,
+    const std::vector<const Maps *> & mapv,
     AddedColumns & added_columns,
     HashJoin::Type type,
-    const ConstNullMapPtr & null_map,
     JoinStuff::JoinUsedFlags & used_flags)
 {
     constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
@@ -1058,12 +1375,20 @@ IColumn::Filter switchJoinRightColumns(
     {
     #define M(TYPE) \
         case HashJoin::Type::TYPE: \
-        { \
-            using KeyGetter = typename KeyGetterForType<HashJoin::Type::TYPE, const std::remove_reference_t<decltype(*maps_.TYPE)>>::Type; \
-            auto key_getter = createKeyGetter<KeyGetter, is_asof_join>(added_columns.key_columns, added_columns.key_sizes); \
+            {                                                           \
+            using MapTypeVal = const typename std::remove_reference_t<decltype(Maps::TYPE)>::element_type; \
+            using KeyGetter = typename KeyGetterForType<HashJoin::Type::TYPE, MapTypeVal>::Type; \
+            std::vector<const MapTypeVal*> a_map_type_vector(mapv.size()); \
+            std::vector<KeyGetter> key_getter_vector;                     \
+            for (size_t d = 0; d < added_columns.join_on_keys.size(); ++d)                   \
+            {       \
+                const auto & join_on_key = added_columns.join_on_keys[d];     \
+                a_map_type_vector[d] = mapv[d]->TYPE.get();              \
+                key_getter_vector.push_back(std::move(createKeyGetter<KeyGetter, is_asof_join>(join_on_key.key_columns, join_on_key.key_sizes))); \
+            }                                                           \
             return joinRightColumnsSwitchNullability<KIND, STRICTNESS, KeyGetter>( \
-                std::move(key_getter), *maps_.TYPE, added_columns, null_map, used_flags); \
-        }
+                              std::move(key_getter_vector), a_map_type_vector, added_columns, used_flags); \
+    }
         APPLY_FOR_JOIN_VARIANTS(M)
     #undef M
 
@@ -1073,64 +1398,52 @@ IColumn::Filter switchJoinRightColumns(
 }
 
 template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
-IColumn::Filter dictionaryJoinRightColumns(const TableJoin & table_join, AddedColumns & added_columns, const ConstNullMapPtr & null_map)
+IColumn::Filter dictionaryJoinRightColumns(const TableJoin & table_join, AddedColumns & added_columns)
 {
     if constexpr (KIND == ASTTableJoin::Kind::Left &&
         (STRICTNESS == ASTTableJoin::Strictness::Any ||
         STRICTNESS == ASTTableJoin::Strictness::Semi ||
         STRICTNESS == ASTTableJoin::Strictness::Anti))
     {
-        assert(added_columns.key_columns.size() == 1);
+        assert(added_columns.join_on_keys.size() == 1);
+
+        std::vector<const TableJoin *> maps_vector;
+        maps_vector.push_back(&table_join);
 
         JoinStuff::JoinUsedFlags flags;
-        KeyGetterForDict key_getter(table_join, added_columns.key_columns);
-        return joinRightColumnsSwitchNullability<KIND, STRICTNESS, KeyGetterForDict>(
-                std::move(key_getter), nullptr, added_columns, null_map, flags);
+        std::vector<KeyGetterForDict> key_getter_vector;
+        key_getter_vector.push_back(KeyGetterForDict(table_join, added_columns.join_on_keys[0].key_columns));
+        return joinRightColumnsSwitchNullability<KIND, STRICTNESS, KeyGetterForDict>(std::move(key_getter_vector), maps_vector, added_columns, flags);
     }
 
-    throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", STRICTNESS, KIND);
 }
 
 } /// nameless
 
-
 template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
 void HashJoin::joinBlockImpl(
     Block & block,
-    const Names & key_names_left,
     const Block & block_with_columns_to_add,
-    const Maps & maps_,
+    const std::vector<const Maps *> & maps_,
     bool is_join_get) const
 {
-    constexpr bool is_any_join = STRICTNESS == ASTTableJoin::Strictness::Any;
-    constexpr bool is_all_join = STRICTNESS == ASTTableJoin::Strictness::All;
-    constexpr bool is_asof_join = STRICTNESS == ASTTableJoin::Strictness::Asof;
-    constexpr bool is_semi_join = STRICTNESS == ASTTableJoin::Strictness::Semi;
-    constexpr bool is_anti_join = STRICTNESS == ASTTableJoin::Strictness::Anti;
-
-    constexpr bool left = KIND == ASTTableJoin::Kind::Left;
-    constexpr bool right = KIND == ASTTableJoin::Kind::Right;
-    constexpr bool inner = KIND == ASTTableJoin::Kind::Inner;
-    constexpr bool full = KIND == ASTTableJoin::Kind::Full;
-
-    constexpr bool need_replication = is_all_join || (is_any_join && right) || (is_semi_join && right);
-    constexpr bool need_filter = !need_replication && (inner || right || (is_semi_join && left) || (is_anti_join && left));
-
-    /// Rare case, when keys are constant or low cardinality. To avoid code bloat, simply materialize them.
-    Columns materialized_keys = JoinCommon::materializeColumns(block, key_names_left);
-    ColumnRawPtrs left_key_columns = JoinCommon::getRawPointers(materialized_keys);
-
-    /// Keys with NULL value in any column won't join to anything.
-    ConstNullMapPtr null_map{};
-    ColumnPtr null_map_holder = extractNestedColumnsAndNullMap(left_key_columns, null_map);
+    constexpr JoinFeatures<KIND, STRICTNESS> jf;
 
+    std::vector<JoinOnKeyColumns> join_on_keys;
+    const auto & onexprs = table_join->getClauses();
+    for (size_t i = 0; i < onexprs.size(); ++i)
+    {
+        const auto & key_names = !is_join_get ? onexprs[i].key_names_left : onexprs[i].key_names_right;
+        join_on_keys.emplace_back(block, key_names, onexprs[i].condColumnNames().first, key_sizes[i]);
+    }
     size_t existing_columns = block.columns();
 
     /** If you use FULL or RIGHT JOIN, then the columns from the "left" table must be materialized.
       * Because if they are constants, then in the "not joined" rows, they may have different values
       *  - default values, which can differ from the values of these constants.
       */
-    if constexpr (right || full)
+    if constexpr (jf.right || jf.full)
     {
         materializeBlockInplace(block);
 
@@ -1143,58 +1456,55 @@ void HashJoin::joinBlockImpl(
       *  but they will not be used at this stage of joining (and will be in `AdderNonJoined`), and they need to be skipped.
       * For ASOF, the last column is used as the ASOF column
       */
-
-    /// Only rows where mask == true can be joined
-    ColumnPtr join_mask_column = JoinCommon::getColumnAsMask(block, condition_mask_column_name_left);
-
     AddedColumns added_columns(
         block_with_columns_to_add,
         block,
         savedBlockSample(),
         *this,
-        left_key_columns,
-        key_sizes,
-        join_mask_column ? &assert_cast<const ColumnUInt8 &>(*join_mask_column).getData() : nullptr,
-        is_asof_join,
+        std::move(join_on_keys),
+        jf.is_asof_join,
         is_join_get);
 
     bool has_required_right_keys = (required_right_keys.columns() != 0);
-    added_columns.need_filter = need_filter || has_required_right_keys;
+    added_columns.need_filter = jf.need_filter || has_required_right_keys;
 
     IColumn::Filter row_filter = overDictionary() ?
-        dictionaryJoinRightColumns<KIND, STRICTNESS>(*table_join, added_columns, null_map) :
-        switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, null_map, used_flags);
+        dictionaryJoinRightColumns<KIND, STRICTNESS>(*table_join, added_columns) :
+        switchJoinRightColumns<KIND, STRICTNESS>(maps_, added_columns, data->type, used_flags);
 
     for (size_t i = 0; i < added_columns.size(); ++i)
         block.insert(added_columns.moveColumn(i));
 
     std::vector<size_t> right_keys_to_replicate [[maybe_unused]];
 
-    if constexpr (need_filter)
+    if constexpr (jf.need_filter)
     {
         /// If ANY INNER | RIGHT JOIN - filter all the columns except the new ones.
         for (size_t i = 0; i < existing_columns; ++i)
             block.safeGetByPosition(i).column = block.safeGetByPosition(i).column->filter(row_filter, -1);
 
-        /// Add join key columns from right block if needed.
+        /// Add join key columns from right block if needed using value from left table because of equality
         for (size_t i = 0; i < required_right_keys.columns(); ++i)
         {
             const auto & right_key = required_right_keys.getByPosition(i);
-            const auto & left_name = required_right_keys_sources[i];
+            // renamed ???
+            if (!block.findByName(right_key.name))
+            {
+                const auto & left_name = required_right_keys_sources[i];
 
-            /// asof column is already in block.
-            if (is_asof_join && right_key.name == key_names_right.back())
-                continue;
+                /// asof column is already in block.
+                if (jf.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
+                    continue;
 
-            const auto & col = block.getByName(left_name);
-            bool is_nullable = nullable_right_side || right_key.type->isNullable();
-
-            auto right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
-            ColumnWithTypeAndName right_col(col.column, col.type, right_col_name);
-            if (right_col.type->lowCardinality() != right_key.type->lowCardinality())
-                JoinCommon::changeLowCardinalityInplace(right_col);
-            right_col = correctNullability(std::move(right_col), is_nullable);
-            block.insert(right_col);
+                const auto & col = block.getByName(left_name);
+                bool is_nullable = nullable_right_side || right_key.type->isNullable();
+                auto right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
+                ColumnWithTypeAndName right_col(col.column, col.type, right_col_name);
+                if (right_col.type->lowCardinality() != right_key.type->lowCardinality())
+                    JoinCommon::changeLowCardinalityInplace(right_col);
+                right_col = correctNullability(std::move(right_col), is_nullable);
+                block.insert(right_col);
+            }
         }
     }
     else if (has_required_right_keys)
@@ -1209,30 +1519,33 @@ void HashJoin::joinBlockImpl(
         for (size_t i = 0; i < required_right_keys.columns(); ++i)
         {
             const auto & right_key = required_right_keys.getByPosition(i);
-            const auto & left_name = required_right_keys_sources[i];
-
-            /// asof column is already in block.
-            if (is_asof_join && right_key.name == key_names_right.back())
-                continue;
-
-            const auto & col = block.getByName(left_name);
-            bool is_nullable = nullable_right_side || right_key.type->isNullable();
-
-            ColumnPtr thin_column = filterWithBlanks(col.column, filter);
-
             auto right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
-            ColumnWithTypeAndName right_col(thin_column, col.type, right_col_name);
-            if (right_col.type->lowCardinality() != right_key.type->lowCardinality())
-                JoinCommon::changeLowCardinalityInplace(right_col);
-            right_col = correctNullability(std::move(right_col), is_nullable, null_map_filter);
-            block.insert(right_col);
+            if (!block.findByName(right_col_name /*right_key.name*/))
+            {
+                const auto & left_name = required_right_keys_sources[i];
 
-            if constexpr (need_replication)
-                right_keys_to_replicate.push_back(block.getPositionByName(right_key.name));
+                /// asof column is already in block.
+                if (jf.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
+                    continue;
+
+                const auto & col = block.getByName(left_name);
+                bool is_nullable = nullable_right_side || right_key.type->isNullable();
+
+                ColumnPtr thin_column = filterWithBlanks(col.column, filter);
+
+                ColumnWithTypeAndName right_col(thin_column, col.type, right_col_name);
+                if (right_col.type->lowCardinality() != right_key.type->lowCardinality())
+                    JoinCommon::changeLowCardinalityInplace(right_col);
+                right_col = correctNullability(std::move(right_col), is_nullable, null_map_filter);
+                block.insert(right_col);
+
+                if constexpr (jf.need_replication)
+                    right_keys_to_replicate.push_back(block.getPositionByName(right_key.name));
+            }
         }
     }
 
-    if constexpr (need_replication)
+    if constexpr (jf.need_replication)
     {
         std::unique_ptr<IColumn::Offsets> & offsets_to_replicate = added_columns.offsets_to_replicate;
 
@@ -1363,6 +1676,7 @@ ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block
         && kind == ASTTableJoin::Kind::Left;
     if (!is_valid)
         throw Exception("joinGet only supports StorageJoin of type Left Any", ErrorCodes::INCOMPATIBLE_TYPE_OF_JOIN);
+    const auto & key_names_right = table_join->getOnlyClause().key_names_right;
 
     /// Assemble the key block with correct names.
     Block keys;
@@ -1375,57 +1689,95 @@ ColumnWithTypeAndName HashJoin::joinGet(const Block & block, const Block & block
 
     static_assert(!MapGetter<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>::flagged,
                   "joinGet are not protected from hash table changes between block processing");
+
+    std::vector<const MapsOne *> maps_vector;
+    maps_vector.push_back(&std::get<MapsOne>(data->maps[0]));
     joinBlockImpl<ASTTableJoin::Kind::Left, ASTTableJoin::Strictness::Any>(
-        keys, key_names_right, block_with_columns_to_add, std::get<MapsOne>(data->maps), /* is_join_get  */ true);
+        keys, block_with_columns_to_add, maps_vector, true);
     return keys.getByPosition(keys.columns() - 1);
 }
 
+void HashJoin::checkTypesOfKeys(const Block & block) const
+{
+    for (const auto & onexpr : table_join->getClauses())
+    {
+        JoinCommon::checkTypesOfKeys(block, onexpr.key_names_left, right_table_keys, onexpr.key_names_right);
+    }
+}
+
 void HashJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 {
-    const Names & key_names_left = table_join->keyNamesLeft();
-    JoinCommon::checkTypesOfKeys(block, key_names_left, condition_mask_column_name_left,
-                                 right_sample_block, key_names_right, condition_mask_column_name_right);
+    for (const auto & onexpr : table_join->getClauses())
+    {
+        auto cond_column_name = onexpr.condColumnNames();
+        JoinCommon::checkTypesOfKeys(
+            block, onexpr.key_names_left, cond_column_name.first,
+            right_sample_block, onexpr.key_names_right, cond_column_name.second);
+    }
+
+    if (kind == ASTTableJoin::Kind::Cross)
+    {
+        joinBlockImplCross(block, not_processed);
+        return;
+    }
+
+    if (kind == ASTTableJoin::Kind::Right || kind == ASTTableJoin::Kind::Full)
+    {
+        materializeBlockInplace(block);
+        if (nullable_left_side)
+            JoinCommon::convertColumnsToNullable(block);
+    }
 
     if (overDictionary())
     {
         using Kind = ASTTableJoin::Kind;
         using Strictness = ASTTableJoin::Strictness;
 
-        auto & map = std::get<MapsOne>(data->maps);
+        auto & map = std::get<MapsOne>(data->maps[0]);
+        std::vector<const std::decay_t<decltype(map)>*> maps_vector;
+        maps_vector.push_back(&map);
+
         if (kind == Kind::Left)
         {
             switch (strictness)
             {
-                case Strictness::Any:
-                case Strictness::All:
-                    joinBlockImpl<Kind::Left, Strictness::Any>(block, key_names_left, sample_block_with_columns_to_add, map);
+            case Strictness::Any:
+            case Strictness::All:
+                    joinBlockImpl<Kind::Left, Strictness::Any>(block, sample_block_with_columns_to_add, maps_vector);
                     break;
-                case Strictness::Semi:
-                    joinBlockImpl<Kind::Left, Strictness::Semi>(block, key_names_left, sample_block_with_columns_to_add, map);
+            case Strictness::Semi:
+                    joinBlockImpl<Kind::Left, Strictness::Semi>(block, sample_block_with_columns_to_add, maps_vector);
                     break;
-                case Strictness::Anti:
-                    joinBlockImpl<Kind::Left, Strictness::Anti>(block, key_names_left, sample_block_with_columns_to_add, map);
+            case Strictness::Anti:
+                    joinBlockImpl<Kind::Left, Strictness::Anti>(block, sample_block_with_columns_to_add, maps_vector);
                     break;
-                default:
-                    throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: dictionary + {} {}", strictness, kind);
             }
         }
         else if (kind == Kind::Inner && strictness == Strictness::All)
-            joinBlockImpl<Kind::Left, Strictness::Semi>(block, key_names_left, sample_block_with_columns_to_add, map);
+            joinBlockImpl<Kind::Left, Strictness::Semi>(block, sample_block_with_columns_to_add, maps_vector);
+
         else
-            throw Exception("Logical error: wrong JOIN combination", ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", strictness, kind);
     }
-    else if (joinDispatch(kind, strictness, data->maps, [&](auto kind_, auto strictness_, auto & map)
-        {
-            joinBlockImpl<kind_, strictness_>(block, key_names_left, sample_block_with_columns_to_add, map);
-        }))
-    {
-        /// Joined
-    }
-    else if (kind == ASTTableJoin::Kind::Cross)
-        joinBlockImplCross(block, not_processed);
     else
-        throw Exception("Logical error: unknown combination of JOIN", ErrorCodes::LOGICAL_ERROR);
+    {
+
+        std::vector<const std::decay_t<decltype(data->maps[0])> * > maps_vector;
+        for (size_t i = 0; i < table_join->getClauses().size(); ++i)
+            maps_vector.push_back(&data->maps[i]);
+
+        if (joinDispatch(kind, strictness, maps_vector, [&](auto kind_, auto strictness_, auto & maps_vector_)
+        {
+            joinBlockImpl<kind_, strictness_>(block, sample_block_with_columns_to_add, maps_vector_);
+        }))
+        {
+            /// Joined
+        }
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong JOIN combination: {} {}", strictness, kind);
+    }
 }
 
 template <typename Mapped>
@@ -1468,27 +1820,36 @@ struct AdderNonJoined
 
 
 /// Stream from not joined earlier rows of the right table.
-class NonJoinedBlockInputStream : private NotJoined, public IBlockInputStream
+/// Based on:
+///   - map offsetInternal saved in used_flags for single disjuncts
+///   - flags in BlockWithFlags for multiple disjuncts
+template<bool multiple_disjuncts>
+class NotJoinedHash final : public NotJoinedBlocks::RightColumnsFiller
 {
 public:
-    NonJoinedBlockInputStream(const HashJoin & parent_, const Block & result_sample_block_, UInt64 max_block_size_)
-        : NotJoined(*parent_.table_join,
-                    parent_.savedBlockSample(),
-                    parent_.right_sample_block,
-                    result_sample_block_)
-        , parent(parent_)
-        , max_block_size(max_block_size_)
+    NotJoinedHash(const HashJoin & parent_, UInt64 max_block_size_)
+        : parent(parent_), max_block_size(max_block_size_)
     {}
 
-    String getName() const override { return "NonJoined"; }
-    Block getHeader() const override { return result_sample_block; }
+    Block getEmptyBlock() override { return parent.savedBlockSample().cloneEmpty(); }
 
-protected:
-    Block readImpl() override
+    size_t fillColumns(MutableColumns & columns_right) override
     {
-        if (parent.data->blocks.empty())
-            return Block();
-        return createBlock();
+        size_t rows_added = 0;
+        auto fill_callback = [&](auto, auto strictness, auto & map)
+        {
+            rows_added = fillColumnsFromMap<strictness>(map, columns_right);
+        };
+
+        if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps.front(), fill_callback))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown JOIN strictness '{}' (must be on of: ANY, ALL, ASOF)", parent.strictness);
+
+        if constexpr (!multiple_disjuncts)
+        {
+            fillNullsFromBlocks(columns_right, rows_added);
+        }
+
+        return rows_added;
     }
 
 private:
@@ -1497,33 +1858,7 @@ private:
 
     std::any position;
     std::optional<HashJoin::BlockNullmapList::const_iterator> nulls_position;
-
-    Block createBlock()
-    {
-        MutableColumns columns_right = saved_block_sample.cloneEmptyColumns();
-
-        size_t rows_added = 0;
-
-        auto fill_callback = [&](auto, auto strictness, auto & map)
-        {
-            rows_added = fillColumnsFromMap<strictness>(map, columns_right);
-        };
-
-        if (!joinDispatch(parent.kind, parent.strictness, parent.data->maps, fill_callback))
-            throw Exception("Logical error: unknown JOIN strictness (must be on of: ANY, ALL, ASOF)", ErrorCodes::LOGICAL_ERROR);
-
-        fillNullsFromBlocks(columns_right, rows_added);
-        if (!rows_added)
-            return {};
-
-        correctLowcardAndNullability(columns_right);
-
-        Block res = result_sample_block.cloneEmpty();
-        addLeftColumns(res, rows_added);
-        addRightColumns(res, columns_right);
-        copySameKeys(res);
-        return res;
-    }
+    std::optional<BlocksList::const_iterator> used_position;
 
     template <ASTTableJoin::Strictness STRICTNESS, typename Maps>
     size_t fillColumnsFromMap(const Maps & maps, MutableColumns & columns_keys_and_right)
@@ -1546,31 +1881,59 @@ private:
     template <ASTTableJoin::Strictness STRICTNESS, typename Map>
     size_t fillColumns(const Map & map, MutableColumns & columns_keys_and_right)
     {
-        using Mapped = typename Map::mapped_type;
-        using Iterator = typename Map::const_iterator;
-
         size_t rows_added = 0;
 
-        if (!position.has_value())
-            position = std::make_any<Iterator>(map.begin());
-
-        Iterator & it = std::any_cast<Iterator &>(position);
-        auto end = map.end();
-
-        for (; it != end; ++it)
+        if constexpr (multiple_disjuncts)
         {
-            const Mapped & mapped = it->getMapped();
+            if (!used_position.has_value())
+                used_position = parent.data->blocks.begin();
 
-            size_t off = map.offsetInternal(it.getPtr());
-            if (parent.isUsed(off))
-                continue;
+            auto end = parent.data->blocks.end();
 
-            AdderNonJoined<Mapped>::add(mapped, rows_added, columns_keys_and_right);
-
-            if (rows_added >= max_block_size)
+            for (auto & it = *used_position; it != end && rows_added < max_block_size; ++it)
             {
-                ++it;
-                break;
+                const Block & mapped_block = *it;
+
+                for (size_t row = 0; row < mapped_block.rows(); ++row)
+                {
+                    if (!parent.isUsed(&mapped_block, row))
+                    {
+                        for (size_t colnum = 0; colnum < columns_keys_and_right.size(); ++colnum)
+                        {
+                            columns_keys_and_right[colnum]->insertFrom(*mapped_block.getByPosition(colnum).column, row);
+                        }
+
+                        ++rows_added;
+                    }
+                }
+            }
+        }
+        else
+        {
+            using Mapped = typename Map::mapped_type;
+            using Iterator = typename Map::const_iterator;
+
+
+            if (!position.has_value())
+                position = std::make_any<Iterator>(map.begin());
+
+            Iterator & it = std::any_cast<Iterator &>(position);
+            auto end = map.end();
+
+            for (; it != end; ++it)
+            {
+                const Mapped & mapped = it->getMapped();
+
+                size_t off = map.offsetInternal(it.getPtr());
+                if (parent.isUsed(off))
+                    continue;
+                AdderNonJoined<Mapped>::add(mapped, rows_added, columns_keys_and_right);
+
+                if (rows_added >= max_block_size)
+                {
+                    ++it;
+                    break;
+                }
             }
         }
 
@@ -1602,26 +1965,58 @@ private:
     }
 };
 
-
-BlockInputStreamPtr HashJoin::createStreamWithNonJoinedRows(const Block & result_sample_block, UInt64 max_block_size) const
+std::shared_ptr<NotJoinedBlocks> HashJoin::getNonJoinedBlocks(const Block & left_sample_block,
+                                                              const Block & result_sample_block,
+                                                              UInt64 max_block_size) const
 {
     if (table_join->strictness() == ASTTableJoin::Strictness::Asof ||
-        table_join->strictness() == ASTTableJoin::Strictness::Semi)
+        table_join->strictness() == ASTTableJoin::Strictness::Semi ||
+        !isRightOrFull(table_join->kind()))
+    {
         return {};
+    }
+    bool multiple_disjuncts = !table_join->oneDisjunct();
 
-    if (isRightOrFull(table_join->kind()))
-        return std::make_shared<NonJoinedBlockInputStream>(*this, result_sample_block, max_block_size);
-    return {};
+    if (multiple_disjuncts)
+    {
+        /// ... calculate `left_columns_count` ...
+        // throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "TODO");
+        size_t left_columns_count = left_sample_block.columns();
+        auto non_joined = std::make_unique<NotJoinedHash<true>>(*this, max_block_size);
+        return std::make_shared<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, table_join->leftToRightKeyRemap());
+
+    }
+    else
+    {
+        size_t left_columns_count = left_sample_block.columns();
+        assert(left_columns_count == result_sample_block.columns() - required_right_keys.columns() - sample_block_with_columns_to_add.columns());
+        auto non_joined = std::make_unique<NotJoinedHash<false>>(*this, max_block_size);
+        return std::make_shared<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, table_join->leftToRightKeyRemap());
+    }
 }
 
 void HashJoin::reuseJoinedData(const HashJoin & join)
 {
     data = join.data;
     from_storage_join = true;
-    joinDispatch(kind, strictness, data->maps, [this](auto kind_, auto strictness_, auto & map)
+
+    bool multiple_disjuncts = !table_join->oneDisjunct();
+    if (multiple_disjuncts)
+        throw Exception("StorageJoin with ORs is not supported", ErrorCodes::NOT_IMPLEMENTED);
+
+    for (auto & map : data->maps)
     {
-        used_flags.reinit<kind_, strictness_>(map.getBufferSizeInCells(data->type) + 1);
-    });
+        joinDispatch(kind, strictness, map, [this](auto kind_, auto strictness_, auto & map_)
+        {
+            used_flags.reinit<kind_, strictness_>(map_.getBufferSizeInCells(data->type) + 1);
+        });
+    }
+}
+
+const ColumnWithTypeAndName & HashJoin::rightAsofKeyColumn() const
+{
+    /// It should be nullable if nullable_right_side is true
+    return savedBlockSample().getByName(table_join->getOnlyClause().key_names_right.back());
 }
 
 }
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index 65e3f5dbabe..f41f63a6a55 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -4,6 +4,7 @@
 #include <optional>
 #include <shared_mutex>
 #include <deque>
+#include <vector>
 
 #include <Parsers/ASTTablesInSelectQuery.h>
 
@@ -15,12 +16,12 @@
 #include <Common/ColumnsHashing.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/FixedHashMap.h>
+#include <Common/RWLock.h>
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 
-#include <DataStreams/SizeLimits.h>
-#include <DataStreams/IBlockStream_fwd.h>
+#include <QueryPipeline/SizeLimits.h>
 
 #include <Core/Block.h>
 
@@ -36,27 +37,36 @@ namespace JoinStuff
 /// Flags needed to implement RIGHT and FULL JOINs.
 class JoinUsedFlags
 {
-    std::vector<std::atomic_bool> flags;
+    using RawBlockPtr = const Block *;
+    using UsedFlagsForBlock = std::vector<std::atomic_bool>;
+
+    /// For multiple dijuncts each empty in hashmap stores flags for particular block
+    /// For single dicunct we store all flags in `nullptr` entry, index is the offset in FindResult
+    std::unordered_map<RawBlockPtr, UsedFlagsForBlock> flags;
+
     bool need_flags;
 
 public:
-
     /// Update size for vector with flags.
     /// Calling this method invalidates existing flags.
     /// It can be called several times, but all of them should happen before using this structure.
     template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
     void reinit(size_t size_);
 
+    template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS>
+    void reinit(const Block * block_ptr);
+
     bool getUsedSafe(size_t i) const;
+    bool getUsedSafe(const Block * block_ptr, size_t row_idx) const;
 
-    template <bool use_flags>
-    void setUsed(size_t i);
+    template <bool use_flags, bool multiple_disjuncts, typename T>
+    void setUsed(const T & f);
 
-    template <bool use_flags>
-    bool getUsed(size_t i);
+    template <bool use_flags, bool multiple_disjuncts, typename T>
+    bool getUsed(const T & f);
 
-    template <bool use_flags>
-    bool setUsedOnce(size_t i);
+    template <bool use_flags, bool multiple_disjuncts, typename T>
+    bool setUsedOnce(const T & f);
 };
 
 }
@@ -141,6 +151,8 @@ public:
       */
     bool addJoinedBlock(const Block & block, bool check_limits) override;
 
+    void checkTypesOfKeys(const Block & block) const override;
+
     /** Join data from the map (that was previously built by calls to addJoinedBlock) to the block with data from "left" table.
       * Could be called from different threads in parallel.
       */
@@ -164,7 +176,8 @@ public:
       * Use only after all calls to joinBlock was done.
       * left_sample_block is passed without account of 'use_nulls' setting (columns will be converted to Nullable inside).
       */
-    BlockInputStreamPtr createStreamWithNonJoinedRows(const Block & result_sample_block, UInt64 max_block_size) const override;
+    std::shared_ptr<NotJoinedBlocks> getNonJoinedBlocks(
+        const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const override;
 
     /// Number of keys in all built JOIN maps.
     size_t getTotalRowCount() const final;
@@ -179,11 +192,7 @@ public:
     ASOF::Inequality getAsofInequality() const { return asof_inequality; }
     bool anyTakeLastRow() const { return any_take_last_row; }
 
-    const ColumnWithTypeAndName & rightAsofKeyColumn() const
-    {
-        /// It should be nullable if nullable_right_side is true
-        return savedBlockSample().getByName(key_names_right.back());
-    }
+    const ColumnWithTypeAndName & rightAsofKeyColumn() const;
 
     /// Different types of keys for maps.
     #define APPLY_FOR_JOIN_VARIANTS(M) \
@@ -304,14 +313,16 @@ public:
     using MapsAsof = MapsTemplate<AsofRowRefs>;
 
     using MapsVariant = std::variant<MapsOne, MapsAll, MapsAsof>;
-    using BlockNullmapList = std::deque<std::pair<const Block *, ColumnPtr>>;
+
+    using RawBlockPtr = const Block *;
+    using BlockNullmapList = std::deque<std::pair<RawBlockPtr, ColumnPtr>>;
 
     struct RightTableData
     {
         Type type = Type::EMPTY;
         bool empty = true;
 
-        MapsVariant maps;
+        std::vector<MapsVariant> maps;
         Block sample_block; /// Block as it would appear in the BlockList
         BlocksList blocks; /// Blocks of "right" table.
         BlockNullmapList blocks_nullmaps; /// Nullmaps for blocks of "right" table (if needed)
@@ -320,24 +331,25 @@ public:
         Arena pool;
     };
 
+    using RightTableDataPtr = std::shared_ptr<RightTableData>;
+
     /// We keep correspondence between used_flags and hash table internal buffer.
     /// Hash table cannot be modified during HashJoin lifetime and must be protected with lock.
-    void setLock(std::shared_mutex & rwlock)
+    void setLock(RWLockImpl::LockHolder rwlock_holder)
     {
-        storage_join_lock = std::shared_lock<std::shared_mutex>(rwlock);
+        storage_join_lock = rwlock_holder;
     }
 
     void reuseJoinedData(const HashJoin & join);
 
-    std::shared_ptr<RightTableData> getJoinedData() const
-    {
-        return data;
-    }
+    RightTableDataPtr getJoinedData() const { return data; }
 
     bool isUsed(size_t off) const { return used_flags.getUsedSafe(off); }
+    bool isUsed(const Block * block_ptr, size_t row_idx) const { return used_flags.getUsedSafe(block_ptr, row_idx); }
 
 private:
-    friend class NonJoinedBlockInputStream;
+    template<bool> friend class NotJoinedHash;
+
     friend class JoinSource;
 
     std::shared_ptr<TableJoin> table_join;
@@ -347,9 +359,6 @@ private:
     /// This join was created from StorageJoin and it is already filled.
     bool from_storage_join = false;
 
-    /// Names of key columns in right-side table (in the order they appear in ON/USING clause). @note It could contain duplicates.
-    const Names & key_names_right;
-
     bool nullable_right_side; /// In case of LEFT and FULL joins, if use_nulls, convert right-side columns to Nullable.
     bool nullable_left_side; /// In case of RIGHT and FULL joins, if use_nulls, convert left-side columns to Nullable.
     bool any_take_last_row; /// Overwrite existing values when encountering the same key again
@@ -357,14 +366,14 @@ private:
     ASOF::Inequality asof_inequality;
 
     /// Right table data. StorageJoin shares it between many Join objects.
-    std::shared_ptr<RightTableData> data;
     /// Flags that indicate that particular row already used in join.
     /// Flag is stored for every record in hash map.
     /// Number of this flags equals to hashtable buffer size (plus one for zero value).
     /// Changes in hash table broke correspondence,
     /// so we must guarantee constantness of hash table during HashJoin lifetime (using method setLock)
     mutable JoinStuff::JoinUsedFlags used_flags;
-    Sizes key_sizes;
+    RightTableDataPtr data;
+    std::vector<Sizes> key_sizes;
 
     /// Block with columns from the right-side table.
     Block right_sample_block;
@@ -377,19 +386,15 @@ private:
     /// Left table column names that are sources for required_right_keys columns
     std::vector<String> required_right_keys_sources;
 
-    /// Additional conditions for rows to join from JOIN ON section
-    String condition_mask_column_name_left;
-    String condition_mask_column_name_right;
-
     Poco::Logger * log;
 
     Block totals;
 
     /// Should be set via setLock to protect hash table from modification from StorageJoin
     /// If set HashJoin instance is not available for modification (addJoinedBlock)
-    std::shared_lock<std::shared_mutex> storage_join_lock;
+    RWLockImpl::LockHolder storage_join_lock = nullptr;
 
-    void init(Type type_);
+    void dataMapInit(MapsVariant &);
 
     const Block & savedBlockSample() const { return data->sample_block; }
 
@@ -400,9 +405,8 @@ private:
     template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
     void joinBlockImpl(
         Block & block,
-        const Names & key_names_left,
         const Block & block_with_columns_to_add,
-        const Maps & maps,
+        const std::vector<const Maps *> & maps_,
         bool is_join_get = false) const;
 
     void joinBlockImplCross(Block & block, ExtraBlockPtr & not_processed) const;
diff --git a/src/Interpreters/IExternalLoadable.h b/src/Interpreters/IExternalLoadable.h
index 2d9a9abfa5f..f49e8e86b3a 100644
--- a/src/Interpreters/IExternalLoadable.h
+++ b/src/Interpreters/IExternalLoadable.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <pcg_random.hpp>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace Poco::Util
diff --git a/src/Interpreters/IInterpreter.h b/src/Interpreters/IInterpreter.h
index 1b4eada3c9f..665a46190fd 100644
--- a/src/Interpreters/IInterpreter.h
+++ b/src/Interpreters/IInterpreter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 7233ab332dd..55c007e2713 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -1,5 +1,8 @@
 #include <Interpreters/IInterpreterUnionOrSelectQuery.h>
 #include <Interpreters/QueryLog.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 
 namespace DB
 {
@@ -9,4 +12,15 @@ void IInterpreterUnionOrSelectQuery::extendQueryLogElemImpl(QueryLogElement & el
     elem.query_kind = "Select";
 }
 
+
+QueryPipelineBuilder IInterpreterUnionOrSelectQuery::buildQueryPipeline()
+{
+    QueryPlan query_plan;
+
+    buildQueryPlan(query_plan);
+
+    return std::move(*query_plan.buildQueryPipeline(
+        QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context)));
+}
+
 }
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.h b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
index cc960e748f6..db9cc086e35 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.h
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.h
@@ -28,6 +28,7 @@ public:
     }
 
     virtual void buildQueryPlan(QueryPlan & query_plan) = 0;
+    QueryPipelineBuilder buildQueryPipeline();
 
     virtual void ignoreWithTotals() = 0;
 
diff --git a/src/Interpreters/IJoin.h b/src/Interpreters/IJoin.h
index 8fa85de4951..ba8367b57e3 100644
--- a/src/Interpreters/IJoin.h
+++ b/src/Interpreters/IJoin.h
@@ -5,7 +5,6 @@
 
 #include <Core/Names.h>
 #include <Columns/IColumn.h>
-#include <DataStreams/IBlockStream_fwd.h>
 
 namespace DB
 {
@@ -15,6 +14,7 @@ struct ExtraBlock;
 using ExtraBlockPtr = std::shared_ptr<ExtraBlock>;
 
 class TableJoin;
+class NotJoinedBlocks;
 
 class IJoin
 {
@@ -27,6 +27,8 @@ public:
     /// @returns false, if some limit was exceeded and you should not insert more data.
     virtual bool addJoinedBlock(const Block & block, bool check_limits = true) = 0;
 
+    virtual void checkTypesOfKeys(const Block & block) const = 0;
+
     /// Join the block with data from left hand of JOIN to the right hand data (that was previously built by calls to addJoinedBlock).
     /// Could be called from different threads in parallel.
     virtual void joinBlock(Block & block, std::shared_ptr<ExtraBlock> & not_processed) = 0;
@@ -43,7 +45,8 @@ public:
     /// Different query plan is used for such joins.
     virtual bool isFilled() const { return false; }
 
-    virtual BlockInputStreamPtr createStreamWithNonJoinedRows(const Block &, UInt64) const { return {}; }
+    virtual std::shared_ptr<NotJoinedBlocks>
+    getNonJoinedBlocks(const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const = 0;
 };
 
 using JoinPtr = std::shared_ptr<IJoin>;
diff --git a/src/Interpreters/ITokenExtractor.cpp b/src/Interpreters/ITokenExtractor.cpp
new file mode 100644
index 00000000000..8c1af130f71
--- /dev/null
+++ b/src/Interpreters/ITokenExtractor.cpp
@@ -0,0 +1,242 @@
+#include "ITokenExtractor.h"
+
+#include <boost/algorithm/string.hpp>
+
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/UTF8Helpers.h>
+
+#if defined(__SSE2__)
+#include <emmintrin.h>
+
+#if defined(__SSE4_2__)
+#include <nmmintrin.h>
+#endif
+
+#endif
+
+
+namespace DB
+{
+
+bool NgramTokenExtractor::nextInString(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const
+{
+    *token_start = *pos;
+    *token_length = 0;
+    size_t code_points = 0;
+    for (; code_points < n && *token_start + *token_length < length; ++code_points)
+    {
+        size_t sz = UTF8::seqLength(static_cast<UInt8>(data[*token_start + *token_length]));
+        *token_length += sz;
+    }
+    *pos += UTF8::seqLength(static_cast<UInt8>(data[*pos]));
+    return code_points == n;
+}
+
+bool NgramTokenExtractor::nextInStringLike(const char * data, size_t length, size_t * pos, String & token) const
+{
+    token.clear();
+
+    size_t code_points = 0;
+    bool escaped = false;
+    for (size_t i = *pos; i < length;)
+    {
+        if (escaped && (data[i] == '%' || data[i] == '_' || data[i] == '\\'))
+        {
+            token += data[i];
+            ++code_points;
+            escaped = false;
+            ++i;
+        }
+        else if (!escaped && (data[i] == '%' || data[i] == '_'))
+        {
+            /// This token is too small, go to the next.
+            token.clear();
+            code_points = 0;
+            escaped = false;
+            *pos = ++i;
+        }
+        else if (!escaped && data[i] == '\\')
+        {
+            escaped = true;
+            ++i;
+        }
+        else
+        {
+            const size_t sz = UTF8::seqLength(static_cast<UInt8>(data[i]));
+            for (size_t j = 0; j < sz; ++j)
+                token += data[i + j];
+            i += sz;
+            ++code_points;
+            escaped = false;
+        }
+
+        if (code_points == n)
+        {
+            *pos += UTF8::seqLength(static_cast<UInt8>(data[*pos]));
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool SplitTokenExtractor::nextInString(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const
+{
+    *token_start = *pos;
+    *token_length = 0;
+
+    while (*pos < length)
+    {
+        if (isASCII(data[*pos]) && !isAlphaNumericASCII(data[*pos]))
+        {
+            /// Finish current token if any
+            if (*token_length > 0)
+                return true;
+            *token_start = ++*pos;
+        }
+        else
+        {
+            /// Note that UTF-8 sequence is completely consisted of non-ASCII bytes.
+            ++*pos;
+            ++*token_length;
+        }
+    }
+
+    return *token_length > 0;
+}
+
+bool SplitTokenExtractor::nextInStringPadded(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const
+{
+    *token_start = *pos;
+    *token_length = 0;
+
+    while (*pos < length)
+    {
+#if defined(__SSE2__) && !defined(MEMORY_SANITIZER) /// We read uninitialized bytes and decide on the calculated mask
+        // NOTE: we assume that `data` string is padded from the right with 15 bytes.
+        const __m128i haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(data + *pos));
+        const size_t haystack_length = 16;
+
+#if defined(__SSE4_2__)
+        // With the help of https://www.strchr.com/strcmp_and_strlen_using_sse_4.2
+        const auto alnum_chars_ranges = _mm_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
+                '\xFF', '\x80', 'z', 'a', 'Z', 'A', '9', '0');
+        // Every bit represents if `haystack` character is in the ranges (1) or not (0)
+        const int result_bitmask = _mm_cvtsi128_si32(_mm_cmpestrm(alnum_chars_ranges, 8, haystack, haystack_length, _SIDD_CMP_RANGES));
+#else
+        // NOTE: -1 and +1 required since SSE2 has no `>=` and `<=` instructions on packed 8-bit integers (epi8).
+        const auto number_begin =      _mm_set1_epi8('0' - 1);
+        const auto number_end =        _mm_set1_epi8('9' + 1);
+        const auto alpha_lower_begin = _mm_set1_epi8('a' - 1);
+        const auto alpha_lower_end =   _mm_set1_epi8('z' + 1);
+        const auto alpha_upper_begin = _mm_set1_epi8('A' - 1);
+        const auto alpha_upper_end =   _mm_set1_epi8('Z' + 1);
+        const auto zero =              _mm_set1_epi8(0);
+
+        // every bit represents if `haystack` character `c` satisfies condition:
+        // (c < 0) || (c > '0' - 1 && c < '9' + 1) || (c > 'a' - 1 && c < 'z' + 1) || (c > 'A' - 1 && c < 'Z' + 1)
+        // < 0 since _mm_cmplt_epi8 threats chars as SIGNED, and so all chars > 0x80 are negative.
+        const int result_bitmask = _mm_movemask_epi8(_mm_or_si128(_mm_or_si128(_mm_or_si128(
+                _mm_cmplt_epi8(haystack, zero),
+                _mm_and_si128(_mm_cmpgt_epi8(haystack, number_begin),      _mm_cmplt_epi8(haystack, number_end))),
+                _mm_and_si128(_mm_cmpgt_epi8(haystack, alpha_lower_begin), _mm_cmplt_epi8(haystack, alpha_lower_end))),
+                _mm_and_si128(_mm_cmpgt_epi8(haystack, alpha_upper_begin), _mm_cmplt_epi8(haystack, alpha_upper_end))));
+#endif
+        if (result_bitmask == 0)
+        {
+            if (*token_length != 0)
+                // end of token started on previous haystack
+                return true;
+
+            *pos += haystack_length;
+            continue;
+        }
+
+        const auto token_start_pos_in_current_haystack = getTrailingZeroBitsUnsafe(result_bitmask);
+        if (*token_length == 0)
+            // new token
+            *token_start = *pos + token_start_pos_in_current_haystack;
+        else if (token_start_pos_in_current_haystack != 0)
+            // end of token starting in one of previous haystacks
+            return true;
+
+        const auto token_bytes_in_current_haystack = getTrailingZeroBitsUnsafe(~(result_bitmask >> token_start_pos_in_current_haystack));
+        *token_length += token_bytes_in_current_haystack;
+
+        *pos += token_start_pos_in_current_haystack + token_bytes_in_current_haystack;
+        if (token_start_pos_in_current_haystack + token_bytes_in_current_haystack == haystack_length)
+            // check if there are leftovers in next `haystack`
+            continue;
+
+        break;
+#else
+        if (isASCII(data[*pos]) && !isAlphaNumericASCII(data[*pos]))
+        {
+            /// Finish current token if any
+            if (*token_length > 0)
+                return true;
+            *token_start = ++*pos;
+        }
+        else
+        {
+            /// Note that UTF-8 sequence is completely consisted of non-ASCII bytes.
+            ++*pos;
+            ++*token_length;
+        }
+#endif
+    }
+
+#if defined(__SSE2__) && !defined(MEMORY_SANITIZER)
+    // Could happen only if string is not padded with zeros, and we accidentally hopped over the end of data.
+    if (*token_start > length)
+        return false;
+    *token_length = std::min(length - *token_start, *token_length);
+#endif
+
+    return *token_length > 0;
+}
+
+bool SplitTokenExtractor::nextInStringLike(const char * data, size_t length, size_t * pos, String & token) const
+{
+    token.clear();
+    bool bad_token = false; // % or _ before token
+    bool escaped = false;
+    while (*pos < length)
+    {
+        if (!escaped && (data[*pos] == '%' || data[*pos] == '_'))
+        {
+            token.clear();
+            bad_token = true;
+            ++*pos;
+        }
+        else if (!escaped && data[*pos] == '\\')
+        {
+            escaped = true;
+            ++*pos;
+        }
+        else if (isASCII(data[*pos]) && !isAlphaNumericASCII(data[*pos]))
+        {
+            if (!bad_token && !token.empty())
+                return true;
+
+            token.clear();
+            bad_token = false;
+            escaped = false;
+            ++*pos;
+        }
+        else
+        {
+            const size_t sz = UTF8::seqLength(static_cast<UInt8>(data[*pos]));
+            for (size_t j = 0; j < sz; ++j)
+            {
+                token += data[*pos];
+                ++*pos;
+            }
+            escaped = false;
+        }
+    }
+
+    return !bad_token && !token.empty();
+}
+
+}
diff --git a/src/Interpreters/ITokenExtractor.h b/src/Interpreters/ITokenExtractor.h
new file mode 100644
index 00000000000..afcc8442d58
--- /dev/null
+++ b/src/Interpreters/ITokenExtractor.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <base/types.h>
+
+#include <Interpreters/BloomFilter.h>
+
+
+namespace DB
+{
+
+/// Interface for string parsers.
+struct ITokenExtractor
+{
+    virtual ~ITokenExtractor() = default;
+
+    /// Fast inplace implementation for regular use.
+    /// Gets string (data ptr and len) and start position for extracting next token (state of extractor).
+    /// Returns false if parsing is finished, otherwise returns true.
+    virtual bool nextInString(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const = 0;
+
+    /// Optimized version that can assume at least 15 padding bytes after data + len (as our Columns provide).
+    virtual bool nextInStringPadded(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const
+    {
+        return nextInString(data, length, pos, token_start, token_length);
+    }
+
+    /// Special implementation for creating bloom filter for LIKE function.
+    /// It skips unescaped `%` and `_` and supports escaping symbols, but it is less lightweight.
+    virtual bool nextInStringLike(const char * data, size_t length, size_t * pos, String & out) const = 0;
+
+    virtual void stringToBloomFilter(const char * data, size_t length, BloomFilter & bloom_filter) const = 0;
+
+    virtual void stringPaddedToBloomFilter(const char * data, size_t length, BloomFilter & bloom_filter) const
+    {
+        return stringToBloomFilter(data, length, bloom_filter);
+    }
+
+    virtual void stringLikeToBloomFilter(const char * data, size_t length, BloomFilter & bloom_filter) const = 0;
+
+};
+
+using TokenExtractorPtr = const ITokenExtractor *;
+
+template <typename Derived>
+class ITokenExtractorHelper : public ITokenExtractor
+{
+    void stringToBloomFilter(const char * data, size_t length, BloomFilter & bloom_filter) const override
+    {
+        size_t cur = 0;
+        size_t token_start = 0;
+        size_t token_len = 0;
+
+        while (cur < length && static_cast<const Derived *>(this)->nextInString(data, length, &cur, &token_start, &token_len))
+            bloom_filter.add(data + token_start, token_len);
+    }
+
+    void stringPaddedToBloomFilter(const char * data, size_t length, BloomFilter & bloom_filter) const override
+    {
+        size_t cur = 0;
+        size_t token_start = 0;
+        size_t token_len = 0;
+
+        while (cur < length && static_cast<const Derived *>(this)->nextInStringPadded(data, length, &cur, &token_start, &token_len))
+            bloom_filter.add(data + token_start, token_len);
+    }
+
+    void stringLikeToBloomFilter(const char * data, size_t length, BloomFilter & bloom_filter) const override
+    {
+        size_t cur = 0;
+        String token;
+        while (cur < length && static_cast<const Derived *>(this)->nextInStringLike(data, length, &cur, token))
+            bloom_filter.add(token.c_str(), token.size());
+    }
+};
+
+
+/// Parser extracting all ngrams from string.
+struct NgramTokenExtractor final : public ITokenExtractorHelper<NgramTokenExtractor>
+{
+    explicit NgramTokenExtractor(size_t n_) : n(n_) {}
+
+    static const char * getName() { return "ngrambf_v1"; }
+
+    bool nextInString(const char * data, size_t length, size_t *  __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const override;
+
+    bool nextInStringLike(const char * data, size_t length, size_t * pos, String & token) const override;
+
+    size_t getN() const { return n; }
+
+private:
+
+    size_t n;
+};
+
+/// Parser extracting tokens (sequences of numbers and ascii letters).
+struct SplitTokenExtractor final : public ITokenExtractorHelper<SplitTokenExtractor>
+{
+    static const char * getName() { return "tokenbf_v1"; }
+
+    bool nextInString(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const override;
+
+    bool nextInStringPadded(const char * data, size_t length, size_t * __restrict pos, size_t * __restrict token_start, size_t * __restrict token_length) const override;
+
+    bool nextInStringLike(const char * data, size_t length, size_t * __restrict pos, String & token) const override;
+
+};
+
+}
diff --git a/src/Interpreters/IdentifierSemantic.cpp b/src/Interpreters/IdentifierSemantic.cpp
index 098bf033399..1112b5c3bda 100644
--- a/src/Interpreters/IdentifierSemantic.cpp
+++ b/src/Interpreters/IdentifierSemantic.cpp
@@ -162,7 +162,7 @@ IdentifierSemantic::ColumnMatch IdentifierSemantic::canReferColumnToTable(const
 {
     /// database.table.column
     if (doesIdentifierBelongTo(identifier, db_and_table.database, db_and_table.table))
-        return ColumnMatch::DbAndTable;
+        return ColumnMatch::DBAndTable;
 
     /// alias.column
     if (doesIdentifierBelongTo(identifier, db_and_table.alias))
@@ -199,7 +199,7 @@ void IdentifierSemantic::setColumnShortName(ASTIdentifier & identifier, const Da
         case ColumnMatch::TableAlias:
             to_strip = 1;
             break;
-        case ColumnMatch::DbAndTable:
+        case ColumnMatch::DBAndTable:
             to_strip = 2;
             break;
         default:
diff --git a/src/Interpreters/IdentifierSemantic.h b/src/Interpreters/IdentifierSemantic.h
index b36c1ad00dd..cabe755027c 100644
--- a/src/Interpreters/IdentifierSemantic.h
+++ b/src/Interpreters/IdentifierSemantic.h
@@ -31,7 +31,7 @@ struct IdentifierSemantic
         ColumnName,       /// column qualified with column names list
         AliasedTableName, /// column qualified with table name (but table has an alias so its priority is lower than TableName)
         TableName,        /// column qualified with table name
-        DbAndTable,       /// column qualified with database and table name
+        DBAndTable,       /// column qualified with database and table name
         TableAlias,       /// column qualified with table alias
         Ambiguous,
     };
diff --git a/src/Interpreters/InDepthNodeVisitor.h b/src/Interpreters/InDepthNodeVisitor.h
index 3ba25a327c4..b7353f2c243 100644
--- a/src/Interpreters/InDepthNodeVisitor.h
+++ b/src/Interpreters/InDepthNodeVisitor.h
@@ -10,13 +10,13 @@ namespace DB
 
 /// Visits AST tree in depth, call functions for nodes according to Matcher type data.
 /// You need to define Data, visit() and needChildVisit() in Matcher class.
-template <typename Matcher, bool _top_to_bottom, typename T = ASTPtr>
+template <typename Matcher, bool _top_to_bottom, bool need_child_accept_data = false, typename T = ASTPtr>
 class InDepthNodeVisitor
 {
 public:
     using Data = typename Matcher::Data;
 
-    InDepthNodeVisitor(Data & data_, WriteBuffer * ostr_ = nullptr)
+    explicit InDepthNodeVisitor(Data & data_, WriteBuffer * ostr_ = nullptr)
     :   data(data_),
         visit_depth(0),
         ostr(ostr_)
@@ -51,13 +51,21 @@ private:
     void visitChildren(T & ast)
     {
         for (auto & child : ast->children)
-            if (Matcher::needChildVisit(ast, child))
+        {
+            bool need_visit_child = false;
+            if constexpr (need_child_accept_data)
+                need_visit_child = Matcher::needChildVisit(ast, child, data);
+            else
+                need_visit_child = Matcher::needChildVisit(ast, child);
+
+            if (need_visit_child)
                 visit(child);
+        }
     }
 };
 
-template <typename Matcher, bool top_to_bottom>
-using ConstInDepthNodeVisitor = InDepthNodeVisitor<Matcher, top_to_bottom, const ASTPtr>;
+template <typename Matcher, bool top_to_bottom, bool need_child_accept_data = false>
+using ConstInDepthNodeVisitor = InDepthNodeVisitor<Matcher, top_to_bottom, need_child_accept_data, const ASTPtr>;
 
 struct NeedChild
 {
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.h b/src/Interpreters/InJoinSubqueriesPreprocessor.h
index 92a408e7ae3..d2166185d2b 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.h
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.h
@@ -3,7 +3,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <memory>
 #include <string>
diff --git a/src/Interpreters/InternalTextLogsQueue.cpp b/src/Interpreters/InternalTextLogsQueue.cpp
index a61b0d6dd9e..e541e1c76cc 100644
--- a/src/Interpreters/InternalTextLogsQueue.cpp
+++ b/src/Interpreters/InternalTextLogsQueue.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Message.h>
 
@@ -41,7 +41,7 @@ void InternalTextLogsQueue::pushBlock(Block && log_block)
     static Block sample_block = getSampleBlock();
 
     if (blocksHaveEqualStructure(sample_block, log_block))
-        emplace(log_block.mutateColumns());
+        (void)(emplace(log_block.mutateColumns()));
     else
         LOG_WARNING(&Poco::Logger::get("InternalTextLogsQueue"), "Log block have different structure");
 }
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index 76e7afb7009..729a495987f 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -32,6 +32,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int INCORRECT_QUERY;
     extern const int NOT_IMPLEMENTED;
+    extern const int TABLE_IS_READ_ONLY;
 }
 
 
@@ -39,12 +40,23 @@ InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextP
 {
 }
 
+
 BlockIO InterpreterAlterQuery::execute()
 {
-    BlockIO res;
     const auto & alter = query_ptr->as<ASTAlterQuery &>();
+    if (alter.alter_object == ASTAlterQuery::AlterObjectType::DATABASE)
+        return executeToDatabase(alter);
+    else if (alter.alter_object == ASTAlterQuery::AlterObjectType::TABLE
+            || alter.alter_object == ASTAlterQuery::AlterObjectType::LIVE_VIEW)
+        return executeToTable(alter);
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown alter object type");
+}
 
 
+BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
+{
+    BlockIO res;
+
     if (!alter.cluster.empty())
         return executeDDLQueryOnCluster(query_ptr, getContext(), getRequiredAccess());
 
@@ -54,7 +66,10 @@ BlockIO InterpreterAlterQuery::execute()
 
     DatabasePtr database = DatabaseCatalog::instance().getDatabase(table_id.database_name);
     if (typeid_cast<DatabaseReplicated *>(database.get())
-        && !getContext()->getClientInfo().is_replicated_database_internal)
+        && !getContext()->getClientInfo().is_replicated_database_internal
+        && !alter.isAttachAlter()
+        && !alter.isFetchAlter()
+        && !alter.isDropPartitionAlter())
     {
         auto guard = DatabaseCatalog::instance().getDDLGuard(table_id.database_name, table_id.table_name);
         guard->releaseTableLock();
@@ -62,11 +77,14 @@ BlockIO InterpreterAlterQuery::execute()
     }
 
     StoragePtr table = DatabaseCatalog::instance().getTable(table_id, getContext());
-    auto alter_lock = table->lockForAlter(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
+    if (table->isStaticStorage())
+        throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
+    auto table_lock = table->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
+    auto alter_lock = table->lockForAlter(getContext()->getSettingsRef().lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
     /// Add default database to table identifiers that we can encounter in e.g. default expressions, mutation expression, etc.
-    AddDefaultDatabaseVisitor visitor(table_id.getDatabaseName());
+    AddDefaultDatabaseVisitor visitor(getContext(), table_id.getDatabaseName());
     ASTPtr command_list_ptr = alter.command_list->ptr();
     visitor.visit(command_list_ptr);
 
@@ -78,7 +96,9 @@ BlockIO InterpreterAlterQuery::execute()
     {
         auto * command_ast = child->as<ASTAlterCommand>();
         if (auto alter_command = AlterCommand::parse(command_ast))
+        {
             alter_commands.emplace_back(std::move(*alter_command));
+        }
         else if (auto partition_command = PartitionCommand::parse(command_ast))
         {
             partition_commands.emplace_back(std::move(*partition_command));
@@ -92,7 +112,9 @@ BlockIO InterpreterAlterQuery::execute()
             mutation_commands.emplace_back(std::move(*mut_command));
         }
         else if (auto live_view_command = LiveViewCommand::parse(command_ast))
+        {
             live_view_commands.emplace_back(std::move(*live_view_command));
+        }
         else
             throw Exception("Wrong parameter type in ALTER query", ErrorCodes::LOGICAL_ERROR);
     }
@@ -118,7 +140,7 @@ BlockIO InterpreterAlterQuery::execute()
         table->checkAlterPartitionIsPossible(partition_commands, metadata_snapshot, getContext()->getSettingsRef());
         auto partition_commands_pipe = table->alterPartition(metadata_snapshot, partition_commands, getContext());
         if (!partition_commands_pipe.empty())
-            res.pipeline.init(std::move(partition_commands_pipe));
+            res.pipeline = QueryPipeline(std::move(partition_commands_pipe));
     }
 
     if (!live_view_commands.empty())
@@ -149,6 +171,45 @@ BlockIO InterpreterAlterQuery::execute()
 }
 
 
+BlockIO InterpreterAlterQuery::executeToDatabase(const ASTAlterQuery & alter)
+{
+    BlockIO res;
+    getContext()->checkAccess(getRequiredAccess());
+    DatabasePtr database = DatabaseCatalog::instance().getDatabase(alter.database);
+    AlterCommands alter_commands;
+
+    for (const auto & child : alter.command_list->children)
+    {
+        auto * command_ast = child->as<ASTAlterCommand>();
+        if (auto alter_command = AlterCommand::parse(command_ast))
+            alter_commands.emplace_back(std::move(*alter_command));
+        else
+            throw Exception("Wrong parameter type in ALTER DATABASE query", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    if (!alter_commands.empty())
+    {
+        /// Only ALTER SETTING is supported.
+        for (const auto & command : alter_commands)
+        {
+            if (command.type != AlterCommand::MODIFY_DATABASE_SETTING)
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported alter type for database engines");
+        }
+
+        for (const auto & command : alter_commands)
+        {
+            if (!command.ignore)
+            {
+                if (command.type == AlterCommand::MODIFY_DATABASE_SETTING)
+                    database->applySettingsChanges(command.settings_changes, getContext());
+                else
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Unsupported alter command");
+            }
+        }
+    }
+
+    return res;
+}
 AccessRightsElements InterpreterAlterQuery::getRequiredAccess() const
 {
     AccessRightsElements required_access;
@@ -203,11 +264,17 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_COMMENT_COLUMN, database, table, column_name());
             break;
         }
+        case ASTAlterCommand::MATERIALIZE_COLUMN:
+        {
+            required_access.emplace_back(AccessType::ALTER_MATERIALIZE_COLUMN, database, table);
+            break;
+        }
         case ASTAlterCommand::MODIFY_ORDER_BY:
         {
             required_access.emplace_back(AccessType::ALTER_ORDER_BY, database, table);
             break;
         }
+        case ASTAlterCommand::REMOVE_SAMPLE_BY:
         case ASTAlterCommand::MODIFY_SAMPLE_BY:
         {
             required_access.emplace_back(AccessType::ALTER_SAMPLE_BY, database, table);
@@ -343,7 +410,17 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_RENAME_COLUMN, database, table, column_name());
             break;
         }
+        case ASTAlterCommand::MODIFY_DATABASE_SETTING:
+        {
+            required_access.emplace_back(AccessType::ALTER_DATABASE_SETTINGS, database, table);
+            break;
+        }
         case ASTAlterCommand::NO_TYPE: break;
+        case ASTAlterCommand::MODIFY_COMMENT:
+        {
+            required_access.emplace_back(AccessType::ALTER_MODIFY_COMMENT, database, table);
+            break;
+        }
     }
 
     return required_access;
@@ -354,7 +431,7 @@ void InterpreterAlterQuery::extendQueryLogElemImpl(QueryLogElement & elem, const
     const auto & alter = ast->as<const ASTAlterQuery &>();
 
     elem.query_kind = "Alter";
-    if (alter.command_list != nullptr)
+    if (alter.command_list != nullptr && alter.alter_object != ASTAlterQuery::AlterObjectType::DATABASE)
     {
         // Alter queries already have their target table inserted into `elem`.
         if (elem.query_tables.size() != 1)
diff --git a/src/Interpreters/InterpreterAlterQuery.h b/src/Interpreters/InterpreterAlterQuery.h
index ae9750b0b62..9494a400e7b 100644
--- a/src/Interpreters/InterpreterAlterQuery.h
+++ b/src/Interpreters/InterpreterAlterQuery.h
@@ -9,6 +9,7 @@ namespace DB
 
 class AccessRightsElements;
 class ASTAlterCommand;
+class ASTAlterQuery;
 
 
 /** Allows you add or remove a column in the table.
@@ -28,6 +29,10 @@ public:
 private:
     AccessRightsElements getRequiredAccess() const;
 
+    BlockIO executeToTable(const ASTAlterQuery & alter);
+
+    BlockIO executeToDatabase(const ASTAlterQuery & alter);
+
     ASTPtr query_ptr;
 };
 
diff --git a/src/Interpreters/InterpreterBackupQuery.cpp b/src/Interpreters/InterpreterBackupQuery.cpp
new file mode 100644
index 00000000000..11e0b2e40ef
--- /dev/null
+++ b/src/Interpreters/InterpreterBackupQuery.cpp
@@ -0,0 +1,64 @@
+#include <Interpreters/InterpreterBackupQuery.h>
+#include <Backups/BackupFactory.h>
+#include <Backups/BackupSettings.h>
+#include <Backups/BackupUtils.h>
+#include <Backups/IBackup.h>
+#include <Backups/IBackupEntry.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+namespace
+{
+    BackupSettings getBackupSettings(const ASTBackupQuery & query)
+    {
+        BackupSettings settings;
+        if (query.settings)
+            settings.applyChanges(query.settings->as<const ASTSetQuery &>().changes);
+        return settings;
+    }
+
+    BackupPtr getBaseBackup(const BackupSettings & settings)
+    {
+        const String & base_backup_name = settings.base_backup;
+        if (base_backup_name.empty())
+            return nullptr;
+        return BackupFactory::instance().openBackup(base_backup_name);
+    }
+
+    void executeBackup(const ASTBackupQuery & query, const ContextPtr & context)
+    {
+        auto settings = getBackupSettings(query);
+        auto base_backup = getBaseBackup(settings);
+
+        auto backup_entries = makeBackupEntries(query.elements, context);
+        UInt64 estimated_backup_size = estimateBackupSize(backup_entries, base_backup);
+
+        auto backup = BackupFactory::instance().createBackup(query.backup_name, estimated_backup_size, base_backup);
+        writeBackupEntries(backup, std::move(backup_entries), context->getSettingsRef().max_backup_threads);
+    }
+
+    void executeRestore(const ASTBackupQuery & query, ContextMutablePtr context)
+    {
+        auto settings = getBackupSettings(query);
+        auto base_backup = getBaseBackup(settings);
+
+        auto backup = BackupFactory::instance().openBackup(query.backup_name, base_backup);
+        auto restore_tasks = makeRestoreTasks(query.elements, context, backup);
+        executeRestoreTasks(std::move(restore_tasks), context->getSettingsRef().max_backup_threads);
+    }
+}
+
+BlockIO InterpreterBackupQuery::execute()
+{
+    const auto & query = query_ptr->as<const ASTBackupQuery &>();
+    if (query.kind == ASTBackupQuery::BACKUP)
+        executeBackup(query, context);
+    else if (query.kind == ASTBackupQuery::RESTORE)
+        executeRestore(query, context);
+    return {};
+}
+
+}
diff --git a/src/Interpreters/InterpreterBackupQuery.h b/src/Interpreters/InterpreterBackupQuery.h
new file mode 100644
index 00000000000..1c4b579acc7
--- /dev/null
+++ b/src/Interpreters/InterpreterBackupQuery.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Interpreters/IInterpreter.h>
+#include <Parsers/IAST_fwd.h>
+
+
+namespace DB
+{
+class InterpreterBackupQuery : public IInterpreter
+{
+public:
+    InterpreterBackupQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : query_ptr(query_ptr_), context(context_) {}
+
+    BlockIO execute() override;
+
+private:
+    ASTPtr query_ptr;
+    ContextMutablePtr context;
+};
+}
diff --git a/src/Interpreters/InterpreterCheckQuery.cpp b/src/Interpreters/InterpreterCheckQuery.cpp
index e8a4f884dd0..9fd318ee4cf 100644
--- a/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/src/Interpreters/InterpreterCheckQuery.cpp
@@ -3,7 +3,7 @@
 #include <Access/AccessFlags.h>
 #include <Storages/IStorage.h>
 #include <Parsers/ASTCheckQuery.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnsNumber.h>
@@ -72,7 +72,7 @@ BlockIO InterpreterCheckQuery::execute()
     }
 
     BlockIO res;
-    res.in = std::make_shared<OneBlockInputStream>(block);
+    res.pipeline = QueryPipeline(std::make_shared<SourceFromSingleChunk>(std::move(block)));
 
     return res;
 }
diff --git a/src/Interpreters/InterpreterCreateFunctionQuery.cpp b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
new file mode 100644
index 00000000000..d39e22f55f0
--- /dev/null
+++ b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
@@ -0,0 +1,85 @@
+#include <Interpreters/InterpreterCreateFunctionQuery.h>
+
+#include <Access/ContextAccess.h>
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/executeDDLQueryOnCluster.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_CREATE_RECURSIVE_FUNCTION;
+    extern const int UNSUPPORTED_METHOD;
+}
+
+BlockIO InterpreterCreateFunctionQuery::execute()
+{
+    FunctionNameNormalizer().visit(query_ptr.get());
+    ASTCreateFunctionQuery & create_function_query = query_ptr->as<ASTCreateFunctionQuery &>();
+
+    AccessRightsElements access_rights_elements;
+    access_rights_elements.emplace_back(AccessType::CREATE_FUNCTION);
+
+    if (create_function_query.or_replace)
+        access_rights_elements.emplace_back(AccessType::DROP_FUNCTION);
+
+    if (!create_function_query.cluster.empty())
+        return executeDDLQueryOnCluster(query_ptr, getContext(), access_rights_elements);
+
+    auto current_context = getContext();
+    current_context->checkAccess(access_rights_elements);
+
+    auto & user_defined_function_factory = UserDefinedSQLFunctionFactory::instance();
+
+    auto & function_name = create_function_query.function_name;
+
+    bool if_not_exists = create_function_query.if_not_exists;
+    bool replace = create_function_query.or_replace;
+
+    create_function_query.if_not_exists = false;
+    create_function_query.or_replace = false;
+
+    validateFunction(create_function_query.function_core, function_name);
+    user_defined_function_factory.registerFunction(current_context, function_name, query_ptr, replace, if_not_exists, persist_function);
+
+    return {};
+}
+
+void InterpreterCreateFunctionQuery::validateFunction(ASTPtr function, const String & name)
+{
+    const auto * args_tuple = function->as<ASTFunction>()->arguments->children.at(0)->as<ASTFunction>();
+    std::unordered_set<String> arguments;
+    for (const auto & argument : args_tuple->arguments->children)
+    {
+        const auto & argument_name = argument->as<ASTIdentifier>()->name();
+        auto [_, inserted] = arguments.insert(argument_name);
+        if (!inserted)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Identifier {} already used as function parameter", argument_name);
+    }
+
+    ASTPtr function_body = function->as<ASTFunction>()->children.at(0)->children.at(1);
+    validateFunctionRecursiveness(function_body, name);
+}
+
+void InterpreterCreateFunctionQuery::validateFunctionRecursiveness(ASTPtr node, const String & function_to_create)
+{
+    for (const auto & child : node->children)
+    {
+        auto function_name_opt = tryGetFunctionName(child);
+        if (function_name_opt && function_name_opt.value() == function_to_create)
+            throw Exception(ErrorCodes::CANNOT_CREATE_RECURSIVE_FUNCTION, "You cannot create recursive function");
+
+        validateFunctionRecursiveness(child, function_to_create);
+    }
+}
+
+}
diff --git a/src/Interpreters/InterpreterCreateFunctionQuery.h b/src/Interpreters/InterpreterCreateFunctionQuery.h
new file mode 100644
index 00000000000..a67fdb9605d
--- /dev/null
+++ b/src/Interpreters/InterpreterCreateFunctionQuery.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <Interpreters/IInterpreter.h>
+
+
+namespace DB
+{
+
+class Context;
+
+class InterpreterCreateFunctionQuery : public IInterpreter, WithContext
+{
+public:
+    InterpreterCreateFunctionQuery(const ASTPtr & query_ptr_, ContextPtr context_, bool persist_function_)
+        : WithContext(context_)
+        , query_ptr(query_ptr_)
+        , persist_function(persist_function_) {}
+
+    BlockIO execute() override;
+
+    void setInternal(bool internal_);
+
+private:
+    static void validateFunction(ASTPtr function, const String & name);
+    static void validateFunctionRecursiveness(ASTPtr node, const String & function_to_create);
+
+    ASTPtr query_ptr;
+    bool persist_function;
+};
+
+}
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index b3cbfdcd035..6d38c55bd62 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -8,6 +8,7 @@
 #include <Common/Macros.h>
 #include <Common/randomSeed.h>
 #include <Common/renameat2.h>
+#include <Common/hex.h>
 
 #include <Core/Defines.h>
 #include <Core/Settings.h>
@@ -31,7 +32,9 @@
 
 #include <Interpreters/Context.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
+#include <Interpreters/executeQuery.h>
 #include <Interpreters/Cluster.h>
+#include <Interpreters/DDLTask.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
@@ -50,6 +53,7 @@
 #include <Databases/DatabaseReplicated.h>
 #include <Databases/IDatabase.h>
 #include <Databases/DatabaseOnDisk.h>
+#include <Databases/TablesLoader.h>
 
 #include <Compression/CompressionFactory.h>
 
@@ -60,7 +64,7 @@
 #include <Interpreters/ApplyWithSubqueryVisitor.h>
 
 #include <TableFunctions/TableFunctionFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -84,7 +88,6 @@ namespace ErrorCodes
     extern const int UNKNOWN_DATABASE;
     extern const int PATH_ACCESS_DENIED;
     extern const int NOT_IMPLEMENTED;
-    extern const int UNKNOWN_TABLE;
 }
 
 namespace fs = std::filesystem;
@@ -151,7 +154,9 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         throw Exception(ErrorCodes::UNKNOWN_DATABASE_ENGINE, "Unknown database engine: {}", serializeAST(*create.storage));
     }
 
-    if (create.storage->engine->name == "Atomic" || create.storage->engine->name == "Replicated" || create.storage->engine->name == "MaterializedPostgreSQL")
+    if (create.storage->engine->name == "Atomic"
+        || create.storage->engine->name == "Replicated"
+        || create.storage->engine->name == "MaterializedPostgreSQL")
     {
         if (create.attach && create.uuid == UUIDHelpers::Nil)
             throw Exception(ErrorCodes::INCORRECT_QUERY, "UUID must be specified for ATTACH. "
@@ -164,7 +169,8 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
         if (!create.attach && fs::exists(metadata_path))
             throw Exception(ErrorCodes::DATABASE_ALREADY_EXISTS, "Metadata directory {} already exists", metadata_path.string());
     }
-    else if (create.storage->engine->name == "MaterializeMySQL" || create.storage->engine->name == "MaterializedMySQL")
+    else if (create.storage->engine->name == "MaterializeMySQL"
+        || create.storage->engine->name == "MaterializedMySQL")
     {
         /// It creates nested database with Ordinary or Atomic engine depending on UUID in query and default engine setting.
         /// Do nothing if it's an internal ATTACH on server startup or short-syntax ATTACH query from user,
@@ -212,16 +218,20 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
                         "Enable allow_experimental_database_materialized_mysql to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    if (create.storage->engine->name == "Replicated" && !getContext()->getSettingsRef().allow_experimental_database_replicated && !internal)
+    if (create.storage->engine->name == "Replicated"
+        && !getContext()->getSettingsRef().allow_experimental_database_replicated
+        && !internal)
     {
         throw Exception("Replicated is an experimental database engine. "
                         "Enable allow_experimental_database_replicated to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
-    if (create.storage->engine->name == "MaterializedPostgreSQL" && !getContext()->getSettingsRef().allow_experimental_database_materialized_postgresql && !internal)
+    if (create.storage->engine->name == "MaterializedPostgreSQL"
+        && !getContext()->getSettingsRef().allow_experimental_database_materialized_postgresql
+        && !internal)
     {
         throw Exception("MaterializedPostgreSQL is an experimental database engine. "
-                        "Enable allow_experimental_database_postgresql_replica to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
+                        "Enable allow_experimental_database_materialized_postgresql to use it.", ErrorCodes::UNKNOWN_DATABASE_ENGINE);
     }
 
     DatabasePtr database = DatabaseFactory::get(create, metadata_path / "", getContext());
@@ -269,8 +279,13 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
             renamed = true;
         }
 
-        /// We use global context here, because storages lifetime is bigger than query context lifetime
-        database->loadStoredObjects(getContext()->getGlobalContext(), has_force_restore_data_flag, create.attach && force_attach); //-V560
+        if (!load_database_without_tables)
+        {
+            /// We use global context here, because storages lifetime is bigger than query context lifetime
+            TablesLoader loader{getContext()->getGlobalContext(), {{database_name, database}}, has_force_restore_data_flag, create.attach && force_attach}; //-V560
+            loader.loadTables();
+            loader.startupTables();
+        }
     }
     catch (...)
     {
@@ -280,7 +295,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
             assert(removed);
         }
         if (added)
-            DatabaseCatalog::instance().detachDatabase(database_name, false, false);
+            DatabaseCatalog::instance().detachDatabase(getContext(), database_name, false, false);
 
         throw;
     }
@@ -548,7 +563,7 @@ ConstraintsDescription InterpreterCreateQuery::getConstraintsDescription(const A
 }
 
 
-InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(ASTCreateQuery & create) const
+InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTablePropertiesAndNormalizeCreateQuery(ASTCreateQuery & create) const
 {
     TableProperties properties;
     TableLockHolder as_storage_lock;
@@ -587,10 +602,13 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
         auto as_storage_metadata = as_storage->getInMemoryMetadataPtr();
         properties.columns = as_storage_metadata->getColumns();
 
-        /// Secondary indices make sense only for MergeTree family of storage engines.
+        /// Secondary indices and projections make sense only for MergeTree family of storage engines.
         /// We should not copy them for other storages.
         if (create.storage && endsWith(create.storage->engine->name, "MergeTree"))
+        {
             properties.indices = as_storage_metadata->getSecondaryIndices();
+            properties.projections = as_storage_metadata->getProjections().clone();
+        }
 
         properties.constraints = as_storage_metadata->getConstraints();
     }
@@ -613,7 +631,6 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::setProperties(AS
     else
         throw Exception("Incorrect CREATE query: required list of column descriptions or AS section or SELECT.", ErrorCodes::INCORRECT_QUERY);
 
-
     /// Even if query has list of columns, canonicalize it (unfold Nested columns).
     if (!create.columns_list)
         create.set(create.columns_list, std::make_shared<ASTColumns>());
@@ -762,7 +779,7 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
     const auto * kind = create.is_dictionary ? "Dictionary" : "Table";
     const auto * kind_upper = create.is_dictionary ? "DICTIONARY" : "TABLE";
 
-    if (database->getEngineName() == "Replicated" && getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY
+    if (database->getEngineName() == "Replicated" && getContext()->getClientInfo().is_replicated_database_internal
         && !internal)
     {
         if (create.uuid == UUIDHelpers::Nil)
@@ -803,36 +820,6 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
         create.uuid = UUIDHelpers::Nil;
         create.to_inner_uuid = UUIDHelpers::Nil;
     }
-
-    if (create.replace_table)
-    {
-        if (database->getUUID() == UUIDHelpers::Nil)
-            throw Exception(ErrorCodes::INCORRECT_QUERY,
-                            "{} query is supported only for Atomic databases",
-                            create.create_or_replace ? "CREATE OR REPLACE TABLE" : "REPLACE TABLE");
-
-        UUID uuid_of_table_to_replace;
-        if (create.create_or_replace)
-        {
-            uuid_of_table_to_replace = getContext()->tryResolveStorageID(StorageID(create.database, create.table)).uuid;
-            if (uuid_of_table_to_replace == UUIDHelpers::Nil)
-            {
-                /// Convert to usual CREATE
-                create.replace_table = false;
-                assert(!database->isTableExist(create.table, getContext()));
-            }
-            else
-                create.table = "_tmp_replace_" + toString(uuid_of_table_to_replace);
-        }
-        else
-        {
-            uuid_of_table_to_replace = getContext()->resolveStorageID(StorageID(create.database, create.table)).uuid;
-            if (uuid_of_table_to_replace == UUIDHelpers::Nil)
-                throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {}.{} doesn't exist",
-                                backQuoteIfNeed(create.database), backQuoteIfNeed(create.table));
-            create.table = "_tmp_replace_" + toString(uuid_of_table_to_replace);
-        }
-    }
 }
 
 
@@ -933,12 +920,18 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     {
         // Expand CTE before filling default database
         ApplyWithSubqueryVisitor().visit(*create.select);
-        AddDefaultDatabaseVisitor visitor(current_database);
+        AddDefaultDatabaseVisitor visitor(getContext(), current_database);
         visitor.visit(*create.select);
     }
 
+    if (create.columns_list)
+    {
+        AddDefaultDatabaseVisitor visitor(getContext(), current_database);
+        visitor.visit(*create.columns_list);
+    }
+
     /// Set and retrieve list of columns, indices and constraints. Set table engine if needed. Rewrite query in canonical way.
-    TableProperties properties = setProperties(create);
+    TableProperties properties = getTablePropertiesAndNormalizeCreateQuery(create);
 
     DatabasePtr database;
     bool need_add_to_database = !create.temporary;
@@ -1012,7 +1005,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
             }
             else
                 throw Exception(storage_already_exists_error_code,
-                    "{} {}.{} already exists.", storage_name, backQuoteIfNeed(create.database), backQuoteIfNeed(create.table));
+                    "{} {}.{} already exists", storage_name, backQuoteIfNeed(create.database), backQuoteIfNeed(create.table));
         }
 
         data_path = database->getTableDataPath(create);
@@ -1110,23 +1103,72 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
 BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
                                                        const InterpreterCreateQuery::TableProperties & properties)
 {
+    /// Replicated database requires separate contexts for each DDL query
+    ContextPtr current_context = getContext();
+    ContextMutablePtr create_context = Context::createCopy(current_context);
+    create_context->setQueryContext(std::const_pointer_cast<Context>(current_context));
+
+    auto make_drop_context = [&](bool on_error) -> ContextMutablePtr
+    {
+        ContextMutablePtr drop_context = Context::createCopy(current_context);
+        drop_context->makeQueryContext();
+        if (on_error)
+            return drop_context;
+
+        if (auto txn = current_context->getZooKeeperMetadataTransaction())
+        {
+            /// Execute drop as separate query, because [CREATE OR] REPLACE query can be considered as
+            /// successfully executed after RENAME/EXCHANGE query.
+            drop_context->resetZooKeeperMetadataTransaction();
+            auto drop_txn = std::make_shared<ZooKeeperMetadataTransaction>(txn->getZooKeeper(), txn->getDatabaseZooKeeperPath(),
+                                                                           txn->isInitialQuery(), txn->getTaskZooKeeperPath());
+            drop_context->initZooKeeperMetadataTransaction(drop_txn);
+        }
+        return drop_context;
+    };
+
     auto ast_drop = std::make_shared<ASTDropQuery>();
     String table_to_replace_name = create.table;
-    bool created = false;
-    bool replaced = false;
 
-    try
     {
-        [[maybe_unused]] bool done = doCreateTable(create, properties);
-        assert(done);
+        auto database = DatabaseCatalog::instance().getDatabase(create.database);
+        if (database->getUUID() == UUIDHelpers::Nil)
+            throw Exception(ErrorCodes::INCORRECT_QUERY,
+                            "{} query is supported only for Atomic databases",
+                            create.create_or_replace ? "CREATE OR REPLACE TABLE" : "REPLACE TABLE");
+
+
+        UInt64 name_hash = sipHash64(create.database + create.table);
+        UInt16 random_suffix = thread_local_rng();
+        if (auto txn = current_context->getZooKeeperMetadataTransaction())
+        {
+            /// Avoid different table name on database replicas
+            random_suffix = sipHash64(txn->getTaskZooKeeperPath());
+        }
+        create.table = fmt::format("_tmp_replace_{}_{}",
+                                   getHexUIntLowercase(name_hash),
+                                   getHexUIntLowercase(random_suffix));
+
         ast_drop->table = create.table;
         ast_drop->is_dictionary = create.is_dictionary;
         ast_drop->database = create.database;
         ast_drop->kind = ASTDropQuery::Drop;
-        created = true;
-        if (!create.replace_table)
-            return fillTableIfNeeded(create);
+    }
 
+    bool created = false;
+    bool renamed = false;
+    try
+    {
+        /// Create temporary table (random name will be generated)
+        [[maybe_unused]] bool done = InterpreterCreateQuery(query_ptr, create_context).doCreateTable(create, properties);
+        assert(done);
+        created = true;
+
+        /// Try fill temporary table
+        BlockIO fill_io = fillTableIfNeeded(create);
+        executeTrivialBlockIO(fill_io, getContext());
+
+        /// Replace target table with created one
         auto ast_rename = std::make_shared<ASTRenameQuery>();
         ASTRenameQuery::Element elem
         {
@@ -1135,22 +1177,44 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         };
 
         ast_rename->elements.push_back(std::move(elem));
-        ast_rename->exchange = true;
         ast_rename->dictionary = create.is_dictionary;
+        if (create.create_or_replace)
+        {
+            /// CREATE OR REPLACE TABLE
+            /// Will execute ordinary RENAME instead of EXCHANGE if the target table does not exist
+            ast_rename->rename_if_cannot_exchange = true;
+            ast_rename->exchange = false;
+        }
+        else
+        {
+            /// REPLACE TABLE
+            /// Will execute EXCHANGE query and fail if the target table does not exist
+            ast_rename->exchange = true;
+        }
 
-        InterpreterRenameQuery(ast_rename, getContext()).execute();
-        replaced = true;
+        InterpreterRenameQuery interpreter_rename{ast_rename, current_context};
+        interpreter_rename.execute();
+        renamed = true;
 
-        InterpreterDropQuery(ast_drop, getContext()).execute();
+        if (!interpreter_rename.renamedInsteadOfExchange())
+        {
+            /// Target table was replaced with new one, drop old table
+            auto drop_context = make_drop_context(false);
+            InterpreterDropQuery(ast_drop, drop_context).execute();
+        }
 
         create.table = table_to_replace_name;
 
-        return fillTableIfNeeded(create);
+        return {};
     }
     catch (...)
     {
-        if (created && create.replace_table && !replaced)
-            InterpreterDropQuery(ast_drop, getContext()).execute();
+        /// Drop temporary table if it was successfully created, but was not renamed to target name
+        if (created && !renamed)
+        {
+            auto drop_context = make_drop_context(true);
+            InterpreterDropQuery(ast_drop, drop_context).execute();
+        }
         throw;
     }
 }
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index 7bd3ef25746..89d27a30555 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -52,6 +52,11 @@ public:
         force_attach = force_attach_;
     }
 
+    void setLoadDatabaseWithoutTables(bool load_database_without_tables_)
+    {
+        load_database_without_tables = load_database_without_tables_;
+    }
+
     /// Obtain information about columns, their types, default values and column comments,
     ///  for case when columns in CREATE query is specified explicitly.
     static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, ContextPtr context, bool attach);
@@ -74,7 +79,7 @@ private:
     BlockIO createTable(ASTCreateQuery & create);
 
     /// Calculate list of columns, constraints, indices, etc... of table. Rewrite query in canonical way.
-    TableProperties setProperties(ASTCreateQuery & create) const;
+    TableProperties getTablePropertiesAndNormalizeCreateQuery(ASTCreateQuery & create) const;
     void validateTableStructure(const ASTCreateQuery & create, const TableProperties & properties) const;
     void setEngine(ASTCreateQuery & create) const;
     AccessRightsElements getRequiredAccess() const;
@@ -94,6 +99,7 @@ private:
     /// Is this an internal query - not from the user.
     bool internal = false;
     bool force_attach = false;
+    bool load_database_without_tables = false;
 
     mutable String as_database_saved;
     mutable String as_table_saved;
diff --git a/src/Interpreters/InterpreterCreateQuotaQuery.cpp b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
index c6983c65cef..b4f61e43186 100644
--- a/src/Interpreters/InterpreterCreateQuotaQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuotaQuery.cpp
@@ -5,7 +5,7 @@
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Access/AccessControlManager.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/find_if.hpp>
 #include <boost/range/algorithm/upper_bound.hpp>
 #include <boost/range/algorithm/sort.hpp>
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 705e52da72c..5370aee1096 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -1,6 +1,6 @@
 #include <Storages/IStorage.h>
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/BlockIO.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <QueryPipeline/BlockIO.h>
 #include <DataTypes/DataTypeString.h>
 #include <Parsers/queryToString.h>
 #include <Common/typeid_cast.h>
@@ -15,20 +15,13 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
+#include <DataTypes/NestedUtils.h>
 
 
 namespace DB
 {
 
-BlockIO InterpreterDescribeQuery::execute()
-{
-    BlockIO res;
-    res.in = executeImpl();
-    return res;
-}
-
-
-Block InterpreterDescribeQuery::getSampleBlock()
+Block InterpreterDescribeQuery::getSampleBlock(bool include_subcolumns)
 {
     Block block;
 
@@ -56,11 +49,19 @@ Block InterpreterDescribeQuery::getSampleBlock()
     col.name = "ttl_expression";
     block.insert(col);
 
+    if (include_subcolumns)
+    {
+        col.name = "is_subcolumn";
+        col.type = std::make_shared<DataTypeUInt8>();
+        col.column = col.type->createColumn();
+        block.insert(col);
+    }
+
     return block;
 }
 
 
-BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
+BlockIO InterpreterDescribeQuery::execute()
 {
     ColumnsDescription columns;
 
@@ -87,7 +88,8 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
         columns = metadata_snapshot->getColumns();
     }
 
-    Block sample_block = getSampleBlock();
+    bool include_subcolumns = getContext()->getSettingsRef().describe_include_subcolumns;
+    Block sample_block = getSampleBlock(include_subcolumns);
     MutableColumns res_columns = sample_block.cloneEmptyColumns();
 
     for (const auto & column : columns)
@@ -117,9 +119,47 @@ BlockInputStreamPtr InterpreterDescribeQuery::executeImpl()
             res_columns[6]->insert(queryToString(column.ttl));
         else
             res_columns[6]->insertDefault();
+
+        if (include_subcolumns)
+            res_columns[7]->insertDefault();
     }
 
-    return std::make_shared<OneBlockInputStream>(sample_block.cloneWithColumns(std::move(res_columns)));
+    if (include_subcolumns)
+    {
+        for (const auto & column : columns)
+        {
+            IDataType::forEachSubcolumn([&](const auto & path, const auto & name, const auto & data)
+            {
+                res_columns[0]->insert(Nested::concatenateName(column.name, name));
+                res_columns[1]->insert(data.type->getName());
+
+                /// It's not trivial to calculate default expression for subcolumn.
+                /// So, leave it empty.
+                res_columns[2]->insertDefault();
+                res_columns[3]->insertDefault();
+                res_columns[4]->insert(column.comment);
+
+                if (column.codec && ISerialization::isSpecialCompressionAllowed(path))
+                    res_columns[5]->insert(queryToString(column.codec->as<ASTFunction>()->arguments));
+                else
+                    res_columns[5]->insertDefault();
+
+                if (column.ttl)
+                    res_columns[6]->insert(queryToString(column.ttl));
+                else
+                    res_columns[6]->insertDefault();
+
+                res_columns[7]->insert(1u);
+            }, column.type->getDefaultSerialization(), column.type, nullptr);
+        }
+    }
+
+    BlockIO res;
+    size_t num_rows = res_columns[0]->size();
+    auto source = std::make_shared<SourceFromSingleChunk>(sample_block, Chunk(std::move(res_columns), num_rows));
+    res.pipeline = QueryPipeline(std::move(source));
+
+    return res;
 }
 
 }
diff --git a/src/Interpreters/InterpreterDescribeQuery.h b/src/Interpreters/InterpreterDescribeQuery.h
index 627d1ca0353..c0b380d57ab 100644
--- a/src/Interpreters/InterpreterDescribeQuery.h
+++ b/src/Interpreters/InterpreterDescribeQuery.h
@@ -16,12 +16,10 @@ public:
 
     BlockIO execute() override;
 
-    static Block getSampleBlock();
+    static Block getSampleBlock(bool include_subcolumns);
 
 private:
     ASTPtr query_ptr;
-
-    BlockInputStreamPtr executeImpl();
 };
 
 
diff --git a/src/Interpreters/InterpreterDropFunctionQuery.cpp b/src/Interpreters/InterpreterDropFunctionQuery.cpp
new file mode 100644
index 00000000000..be67ea68cdd
--- /dev/null
+++ b/src/Interpreters/InterpreterDropFunctionQuery.cpp
@@ -0,0 +1,34 @@
+#include <Parsers/ASTDropFunctionQuery.h>
+
+#include <Access/ContextAccess.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/InterpreterDropFunctionQuery.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/executeDDLQueryOnCluster.h>
+
+
+namespace DB
+{
+
+BlockIO InterpreterDropFunctionQuery::execute()
+{
+    FunctionNameNormalizer().visit(query_ptr.get());
+    ASTDropFunctionQuery & drop_function_query = query_ptr->as<ASTDropFunctionQuery &>();
+
+    AccessRightsElements access_rights_elements;
+    access_rights_elements.emplace_back(AccessType::DROP_FUNCTION);
+
+    if (!drop_function_query.cluster.empty())
+        return executeDDLQueryOnCluster(query_ptr, getContext(), access_rights_elements);
+
+    auto current_context = getContext();
+    current_context->checkAccess(access_rights_elements);
+
+    UserDefinedSQLFunctionFactory::instance().unregisterFunction(current_context, drop_function_query.function_name, drop_function_query.if_exists);
+
+    return {};
+}
+
+}
diff --git a/src/Interpreters/InterpreterDropFunctionQuery.h b/src/Interpreters/InterpreterDropFunctionQuery.h
new file mode 100644
index 00000000000..5842851f5db
--- /dev/null
+++ b/src/Interpreters/InterpreterDropFunctionQuery.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <Interpreters/IInterpreter.h>
+
+namespace DB
+{
+
+class Context;
+
+class InterpreterDropFunctionQuery : public IInterpreter, WithMutableContext
+{
+public:
+    InterpreterDropFunctionQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_) {}
+
+    BlockIO execute() override;
+
+private:
+    ASTPtr query_ptr;
+};
+
+}
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 0e15c6be27c..4fbad7e5471 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -12,9 +12,7 @@
 #include <Common/typeid_cast.h>
 #include <Databases/DatabaseReplicated.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #   include <Databases/MySQL/DatabaseMaterializedMySQL.h>
@@ -34,6 +32,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_TABLE;
     extern const int NOT_IMPLEMENTED;
     extern const int INCORRECT_QUERY;
+    extern const int TABLE_IS_READ_ONLY;
 }
 
 
@@ -195,6 +194,8 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ASTDropQuery & query, DatabaseP
                 throw Exception("Cannot TRUNCATE dictionary", ErrorCodes::SYNTAX_ERROR);
 
             getContext()->checkAccess(AccessType::TRUNCATE, table_id);
+            if (table->isStaticStorage())
+                throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
 
             table->checkTableCanBeDropped();
 
@@ -352,6 +353,13 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 }
             }
 
+            if (!drop && query.no_delay)
+            {
+                /// Avoid "some tables are still in use" when sync mode is enabled
+                for (const auto & table_uuid : uuids_to_wait)
+                    database->waitDetachedTableNotInUse(table_uuid);
+            }
+
             /// Protects from concurrent CREATE TABLE queries
             auto db_guard = DatabaseCatalog::instance().getExclusiveDDLGuardForDatabase(database_name);
 
@@ -359,7 +367,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 database->assertCanBeDetached(true);
 
             /// DETACH or DROP database itself
-            DatabaseCatalog::instance().detachDatabase(database_name, drop, database->shouldBeEmptyOnDetach());
+            DatabaseCatalog::instance().detachDatabase(getContext(), database_name, drop, database->shouldBeEmptyOnDetach());
         }
     }
 
diff --git a/src/Interpreters/InterpreterExistsQuery.cpp b/src/Interpreters/InterpreterExistsQuery.cpp
index 9e254db4bb3..24c30a8be30 100644
--- a/src/Interpreters/InterpreterExistsQuery.cpp
+++ b/src/Interpreters/InterpreterExistsQuery.cpp
@@ -1,8 +1,7 @@
 #include <Storages/IStorage.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/BlockIO.h>
-#include <DataStreams/copyData.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <QueryPipeline/BlockIO.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 #include <Interpreters/Context.h>
@@ -21,7 +20,7 @@ namespace ErrorCodes
 BlockIO InterpreterExistsQuery::execute()
 {
     BlockIO res;
-    res.in = executeImpl();
+    res.pipeline = executeImpl();
     return res;
 }
 
@@ -35,7 +34,7 @@ Block InterpreterExistsQuery::getSampleBlock()
 }
 
 
-BlockInputStreamPtr InterpreterExistsQuery::executeImpl()
+QueryPipeline InterpreterExistsQuery::executeImpl()
 {
     ASTQueryWithTableAndOutput * exists_query;
     bool result = false;
@@ -76,10 +75,10 @@ BlockInputStreamPtr InterpreterExistsQuery::executeImpl()
         result = DatabaseCatalog::instance().isDictionaryExist({database, exists_query->table});
     }
 
-    return std::make_shared<OneBlockInputStream>(Block{{
+    return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{
         ColumnUInt8::create(1, result),
         std::make_shared<DataTypeUInt8>(),
-        "result" }});
+        "result" }}));
 }
 
 }
diff --git a/src/Interpreters/InterpreterExistsQuery.h b/src/Interpreters/InterpreterExistsQuery.h
index efc664f07c3..5ef940bdd3f 100644
--- a/src/Interpreters/InterpreterExistsQuery.h
+++ b/src/Interpreters/InterpreterExistsQuery.h
@@ -21,7 +21,7 @@ public:
 private:
     ASTPtr query_ptr;
 
-    BlockInputStreamPtr executeImpl();
+    QueryPipeline executeImpl();
 };
 
 
diff --git a/src/Interpreters/InterpreterExplainQuery.cpp b/src/Interpreters/InterpreterExplainQuery.cpp
index 37650f5caa7..3afb1e1fbb0 100644
--- a/src/Interpreters/InterpreterExplainQuery.cpp
+++ b/src/Interpreters/InterpreterExplainQuery.cpp
@@ -1,7 +1,7 @@
 #include <Interpreters/InterpreterExplainQuery.h>
 
-#include <DataStreams/BlockIO.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <QueryPipeline/BlockIO.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <DataTypes/DataTypeString.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
@@ -17,7 +17,7 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
-#include <Processors/printPipeline.h>
+#include <QueryPipeline/printPipeline.h>
 
 #include <Common/JSONBuilder.h>
 
@@ -73,7 +73,7 @@ namespace
 BlockIO InterpreterExplainQuery::execute()
 {
     BlockIO res;
-    res.in = executeImpl();
+    res.pipeline = executeImpl();
     return res;
 }
 
@@ -223,8 +223,9 @@ ExplainSettings<Settings> checkAndGetSettings(const ASTPtr & ast_settings)
                             "Supported settings: " + settings.getSettingsList(), ErrorCodes::UNKNOWN_SETTING);
 
         if (change.value.getType() != Field::Types::UInt64)
-            throw Exception("Invalid type " + std::string(change.value.getTypeName()) + " for setting \"" + change.name +
-                            "\" only boolean settings are supported", ErrorCodes::INVALID_SETTING_VALUE);
+            throw Exception(ErrorCodes::INVALID_SETTING_VALUE,
+                "Invalid type {} for setting \"{}\" only boolean settings are supported",
+                change.value.getTypeName(), change.name);
 
         auto value = change.value.get<UInt64>();
         if (value > 1)
@@ -239,7 +240,7 @@ ExplainSettings<Settings> checkAndGetSettings(const ASTPtr & ast_settings)
 
 }
 
-BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
+QueryPipeline InterpreterExplainQuery::executeImpl()
 {
     const auto & ast = query->as<const ASTExplainQuery &>();
 
@@ -303,33 +304,41 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
     }
     else if (ast.getKind() == ASTExplainQuery::QueryPipeline)
     {
-        if (!dynamic_cast<const ASTSelectWithUnionQuery *>(ast.getExplainedQuery().get()))
-            throw Exception("Only SELECT is supported for EXPLAIN query", ErrorCodes::INCORRECT_QUERY);
-
-        auto settings = checkAndGetSettings<QueryPipelineSettings>(ast.getSettings());
-        QueryPlan plan;
-
-        InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), SelectQueryOptions());
-        interpreter.buildQueryPlan(plan);
-        auto pipeline = plan.buildQueryPipeline(
-            QueryPlanOptimizationSettings::fromContext(getContext()),
-            BuildQueryPipelineSettings::fromContext(getContext()));
-
-        if (settings.graph)
+        if (dynamic_cast<const ASTSelectWithUnionQuery *>(ast.getExplainedQuery().get()))
         {
-            /// Pipe holds QueryPlan, should not go out-of-scope
-            auto pipe = QueryPipeline::getPipe(std::move(*pipeline));
-            const auto & processors = pipe.getProcessors();
+            auto settings = checkAndGetSettings<QueryPipelineSettings>(ast.getSettings());
+            QueryPlan plan;
 
-            if (settings.compact)
-                printPipelineCompact(processors, buf, settings.query_pipeline_options.header);
+            InterpreterSelectWithUnionQuery interpreter(ast.getExplainedQuery(), getContext(), SelectQueryOptions());
+            interpreter.buildQueryPlan(plan);
+            auto pipeline = plan.buildQueryPipeline(
+                QueryPlanOptimizationSettings::fromContext(getContext()),
+                BuildQueryPipelineSettings::fromContext(getContext()));
+
+            if (settings.graph)
+            {
+                /// Pipe holds QueryPlan, should not go out-of-scope
+                auto pipe = QueryPipelineBuilder::getPipe(std::move(*pipeline));
+                const auto & processors = pipe.getProcessors();
+
+                if (settings.compact)
+                    printPipelineCompact(processors, buf, settings.query_pipeline_options.header);
+                else
+                    printPipeline(processors, buf);
+            }
             else
-                printPipeline(processors, buf);
+            {
+                plan.explainPipeline(buf, settings.query_pipeline_options);
+            }
+        }
+        else if (dynamic_cast<const ASTInsertQuery *>(ast.getExplainedQuery().get()))
+        {
+            InterpreterInsertQuery insert(ast.getExplainedQuery(), getContext());
+            auto io = insert.execute();
+            printPipeline(io.pipeline.getProcessors(), buf);
         }
         else
-        {
-            plan.explainPipeline(buf, settings.query_pipeline_options);
-        }
+            throw Exception("Only SELECT and INSERT is supported for EXPLAIN PIPELINE query", ErrorCodes::INCORRECT_QUERY);
     }
     else if (ast.getKind() == ASTExplainQuery::QueryEstimates)
     {
@@ -358,7 +367,7 @@ BlockInputStreamPtr InterpreterExplainQuery::executeImpl()
             fillColumn(*res_columns[0], buf.str());
     }
 
-    return std::make_shared<OneBlockInputStream>(sample_block.cloneWithColumns(std::move(res_columns)));
+    return QueryPipeline(std::make_shared<SourceFromSingleChunk>(sample_block.cloneWithColumns(std::move(res_columns))));
 }
 
 }
diff --git a/src/Interpreters/InterpreterExplainQuery.h b/src/Interpreters/InterpreterExplainQuery.h
index a7f54a10e3e..a640b1c977c 100644
--- a/src/Interpreters/InterpreterExplainQuery.h
+++ b/src/Interpreters/InterpreterExplainQuery.h
@@ -15,12 +15,12 @@ public:
 
     BlockIO execute() override;
 
-    static Block getSampleBlock(const ASTExplainQuery::ExplainKind kind);
+    static Block getSampleBlock(ASTExplainQuery::ExplainKind kind);
 
 private:
     ASTPtr query;
 
-    BlockInputStreamPtr executeImpl();
+    QueryPipeline executeImpl();
 };
 
 
diff --git a/src/Interpreters/InterpreterExternalDDLQuery.cpp b/src/Interpreters/InterpreterExternalDDLQuery.cpp
index e91b95a988d..ac3f18f1741 100644
--- a/src/Interpreters/InterpreterExternalDDLQuery.cpp
+++ b/src/Interpreters/InterpreterExternalDDLQuery.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <Interpreters/InterpreterExternalDDLQuery.h>
 #include <Interpreters/Context.h>
diff --git a/src/Interpreters/InterpreterFactory.cpp b/src/Interpreters/InterpreterFactory.cpp
index 9e6061c2525..fcf5f19aef6 100644
--- a/src/Interpreters/InterpreterFactory.cpp
+++ b/src/Interpreters/InterpreterFactory.cpp
@@ -1,14 +1,20 @@
 #include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTBackupQuery.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTCreateUserQuery.h>
-#include <Parsers/ASTCreateRoleQuery.h>
 #include <Parsers/ASTCreateQuotaQuery.h>
+#include <Parsers/ASTCreateRoleQuery.h>
 #include <Parsers/ASTCreateRowPolicyQuery.h>
 #include <Parsers/ASTCreateSettingsProfileQuery.h>
+#include <Parsers/ASTCreateUserQuery.h>
+#include <Parsers/ASTCreateFunctionQuery.h>
 #include <Parsers/ASTDropAccessEntityQuery.h>
+#include <Parsers/ASTDropFunctionQuery.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTExplainQuery.h>
+#include <Parsers/ASTGrantQuery.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/ASTKillQueryQuery.h>
 #include <Parsers/ASTOptimizeQuery.h>
 #include <Parsers/ASTRenameQuery.h>
@@ -24,15 +30,15 @@
 #include <Parsers/ASTShowProcesslistQuery.h>
 #include <Parsers/ASTShowTablesQuery.h>
 #include <Parsers/ASTUseQuery.h>
-#include <Parsers/ASTExplainQuery.h>
-#include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/ASTWatchQuery.h>
-#include <Parsers/ASTGrantQuery.h>
 #include <Parsers/MySQL/ASTCreateQuery.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/InterpreterBackupQuery.h>
 #include <Interpreters/InterpreterCheckQuery.h>
+#include <Interpreters/InterpreterCreateFunctionQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterCreateQuotaQuery.h>
 #include <Interpreters/InterpreterCreateRoleQuery.h>
@@ -41,12 +47,15 @@
 #include <Interpreters/InterpreterCreateUserQuery.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
 #include <Interpreters/InterpreterDropAccessEntityQuery.h>
+#include <Interpreters/InterpreterDropFunctionQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/InterpreterExistsQuery.h>
 #include <Interpreters/InterpreterExplainQuery.h>
+#include <Interpreters/InterpreterExternalDDLQuery.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterGrantQuery.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
 #include <Interpreters/InterpreterKillQueryQuery.h>
 #include <Interpreters/InterpreterOptimizeQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
@@ -65,7 +74,6 @@
 #include <Interpreters/InterpreterSystemQuery.h>
 #include <Interpreters/InterpreterUseQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
-#include <Interpreters/InterpreterExternalDDLQuery.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
 
 #include <Parsers/ASTSystemQuery.h>
@@ -109,6 +117,10 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextMut
         ProfileEvents::increment(ProfileEvents::SelectQuery);
         return std::make_unique<InterpreterSelectWithUnionQuery>(query, context, options);
     }
+    else if (query->as<ASTSelectIntersectExceptQuery>())
+    {
+        return std::make_unique<InterpreterSelectIntersectExceptQuery>(query, context, options);
+    }
     else if (query->as<ASTInsertQuery>())
     {
         ProfileEvents::increment(ProfileEvents::InsertQuery);
@@ -264,6 +276,18 @@ std::unique_ptr<IInterpreter> InterpreterFactory::get(ASTPtr & query, ContextMut
     {
         return std::make_unique<InterpreterExternalDDLQuery>(query, context);
     }
+    else if (query->as<ASTCreateFunctionQuery>())
+    {
+        return std::make_unique<InterpreterCreateFunctionQuery>(query, context, true /*persist_function*/);
+    }
+    else if (query->as<ASTDropFunctionQuery>())
+    {
+        return std::make_unique<InterpreterDropFunctionQuery>(query, context);
+    }
+    else if (query->as<ASTBackupQuery>())
+    {
+        return std::make_unique<InterpreterBackupQuery>(query, context);
+    }
     else
     {
         throw Exception("Unknown type of query: " + query->getID(), ErrorCodes::UNKNOWN_TYPE_OF_QUERY);
diff --git a/src/Interpreters/InterpreterGrantQuery.cpp b/src/Interpreters/InterpreterGrantQuery.cpp
index 42c440b4c52..506ab8a3387 100644
--- a/src/Interpreters/InterpreterGrantQuery.cpp
+++ b/src/Interpreters/InterpreterGrantQuery.cpp
@@ -22,69 +22,108 @@ namespace ErrorCodes
 
 namespace
 {
-    template <typename T>
-    void updateFromQueryTemplate(
-        T & grantee,
+    /// Extracts access rights elements which are going to be granted or revoked from a query.
+    void collectAccessRightsElementsToGrantOrRevoke(
         const ASTGrantQuery & query,
-        const std::vector<UUID> & roles_to_grant_or_revoke)
+        AccessRightsElements & elements_to_grant,
+        AccessRightsElements & elements_to_revoke)
     {
-        if (!query.is_revoke)
+        elements_to_grant.clear();
+        elements_to_revoke.clear();
+
+        if (query.is_revoke)
         {
-            if (query.replace_access)
-                grantee.access = {};
-            if (query.replace_granted_roles)
-                grantee.granted_roles = {};
+            /// REVOKE
+            elements_to_revoke = query.access_rights_elements;
         }
-
-
-        if (!query.access_rights_elements.empty())
+        else if (query.replace_access)
         {
-            if (query.is_revoke)
-                grantee.access.revoke(query.access_rights_elements);
-            else
-                grantee.access.grant(query.access_rights_elements);
+            /// GRANT WITH REPLACE OPTION
+            elements_to_grant = query.access_rights_elements;
+            elements_to_revoke.emplace_back(AccessType::ALL);
         }
-
-        if (!roles_to_grant_or_revoke.empty())
+        else
         {
-            if (query.is_revoke)
-            {
-                if (query.admin_option)
-                    grantee.granted_roles.revokeAdminOption(roles_to_grant_or_revoke);
-                else
-                    grantee.granted_roles.revoke(roles_to_grant_or_revoke);
-            }
-            else
-            {
-                if (query.admin_option)
-                    grantee.granted_roles.grantWithAdminOption(roles_to_grant_or_revoke);
-                else
-                    grantee.granted_roles.grant(roles_to_grant_or_revoke);
-            }
+            /// GRANT
+            elements_to_grant = query.access_rights_elements;
         }
     }
 
-    void updateFromQueryImpl(
-        IAccessEntity & grantee,
+    /// Extracts roles which are going to be granted or revoked from a query.
+    void collectRolesToGrantOrRevoke(
+        const AccessControlManager & access_control,
         const ASTGrantQuery & query,
-        const std::vector<UUID> & roles_to_grant_or_revoke)
+        std::vector<UUID> & roles_to_grant,
+        RolesOrUsersSet & roles_to_revoke)
     {
-        if (auto * user = typeid_cast<User *>(&grantee))
-            updateFromQueryTemplate(*user, query, roles_to_grant_or_revoke);
-        else if (auto * role = typeid_cast<Role *>(&grantee))
-            updateFromQueryTemplate(*role, query, roles_to_grant_or_revoke);
+        roles_to_grant.clear();
+        roles_to_revoke.clear();
+
+        RolesOrUsersSet roles_to_grant_or_revoke;
+        if (query.roles)
+            roles_to_grant_or_revoke = RolesOrUsersSet{*query.roles, access_control};
+
+        if (query.is_revoke)
+        {
+            /// REVOKE
+            roles_to_revoke = std::move(roles_to_grant_or_revoke);
+        }
+        else if (query.replace_granted_roles)
+        {
+            /// GRANT WITH REPLACE OPTION
+            roles_to_grant = roles_to_grant_or_revoke.getMatchingIDs(access_control);
+            roles_to_revoke = RolesOrUsersSet::AllTag{};
+        }
+        else
+        {
+            /// GRANT
+            roles_to_grant = roles_to_grant_or_revoke.getMatchingIDs(access_control);
+        }
     }
 
-    void checkGranteeIsAllowed(const ContextAccess & access, const UUID & grantee_id, const IAccessEntity & grantee)
+    /// Extracts roles which are going to be granted or revoked from a query.
+    void collectRolesToGrantOrRevoke(
+        const ASTGrantQuery & query,
+        std::vector<UUID> & roles_to_grant,
+        RolesOrUsersSet & roles_to_revoke)
     {
-        auto current_user = access.getUser();
+        roles_to_grant.clear();
+        roles_to_revoke.clear();
+
+        RolesOrUsersSet roles_to_grant_or_revoke;
+        if (query.roles)
+            roles_to_grant_or_revoke = RolesOrUsersSet{*query.roles};
+
+        if (query.is_revoke)
+        {
+            /// REVOKE
+            roles_to_revoke = std::move(roles_to_grant_or_revoke);
+        }
+        else if (query.replace_granted_roles)
+        {
+            /// GRANT WITH REPLACE OPTION
+            roles_to_grant = roles_to_grant_or_revoke.getMatchingIDs();
+            roles_to_revoke = RolesOrUsersSet::AllTag{};
+        }
+        else
+        {
+            /// GRANT
+            roles_to_grant = roles_to_grant_or_revoke.getMatchingIDs();
+        }
+    }
+
+    /// Checks if a grantee is allowed for the current user, throws an exception if not.
+    void checkGranteeIsAllowed(const ContextAccess & current_user_access, const UUID & grantee_id, const IAccessEntity & grantee)
+    {
+        auto current_user = current_user_access.getUser();
         if (current_user && !current_user->grantees.match(grantee_id))
             throw Exception(grantee.outputTypeAndName() + " is not allowed as grantee", ErrorCodes::ACCESS_DENIED);
     }
 
-    void checkGranteesAreAllowed(const AccessControlManager & access_control, const ContextAccess & access, const std::vector<UUID> & grantee_ids)
+    /// Checks if grantees are allowed for the current user, throws an exception if not.
+    void checkGranteesAreAllowed(const AccessControlManager & access_control, const ContextAccess & current_user_access, const std::vector<UUID> & grantee_ids)
     {
-        auto current_user = access.getUser();
+        auto current_user = current_user_access.getUser();
         if (!current_user || (current_user->grantees == RolesOrUsersSet::AllTag{}))
             return;
 
@@ -92,36 +131,26 @@ namespace
         {
             auto entity = access_control.tryRead(id);
             if (auto role = typeid_cast<RolePtr>(entity))
-                checkGranteeIsAllowed(access, id, *role);
+                checkGranteeIsAllowed(current_user_access, id, *role);
             else if (auto user = typeid_cast<UserPtr>(entity))
-                checkGranteeIsAllowed(access, id, *user);
+                checkGranteeIsAllowed(current_user_access, id, *user);
         }
     }
 
+    /// Checks if the current user has enough access rights granted with grant option to grant or revoke specified access rights.
     void checkGrantOption(
         const AccessControlManager & access_control,
-        const ContextAccess & access,
-        const ASTGrantQuery & query,
+        const ContextAccess & current_user_access,
         const std::vector<UUID> & grantees_from_query,
-        bool & need_check_grantees_are_allowed)
+        bool & need_check_grantees_are_allowed,
+        const AccessRightsElements & elements_to_grant,
+        AccessRightsElements & elements_to_revoke)
     {
-        const auto & elements = query.access_rights_elements;
-        need_check_grantees_are_allowed = true;
-        if (elements.empty())
-        {
-            /// No access rights to grant or revoke.
-            need_check_grantees_are_allowed = false;
-            return;
-        }
+        /// Check access rights which are going to be granted.
+        /// To execute the command GRANT the current user needs to have the access granted with GRANT OPTION.
+        current_user_access.checkGrantOption(elements_to_grant);
 
-        if (!query.is_revoke)
-        {
-            /// To execute the command GRANT the current user needs to have the access granted with GRANT OPTION.
-            access.checkGrantOption(elements);
-            return;
-        }
-
-        if (access.hasGrantOption(elements))
+        if (current_user_access.hasGrantOption(elements_to_revoke))
         {
             /// Simple case: the current user has the grant option for all the access rights specified for REVOKE.
             return;
@@ -141,69 +170,62 @@ namespace
             auto entity = access_control.tryRead(id);
             if (auto role = typeid_cast<RolePtr>(entity))
             {
-                checkGranteeIsAllowed(access, id, *role);
+                if (need_check_grantees_are_allowed)
+                    checkGranteeIsAllowed(current_user_access, id, *role);
                 all_granted_access.makeUnion(role->access);
             }
             else if (auto user = typeid_cast<UserPtr>(entity))
             {
-                checkGranteeIsAllowed(access, id, *user);
+                if (need_check_grantees_are_allowed)
+                    checkGranteeIsAllowed(current_user_access, id, *user);
                 all_granted_access.makeUnion(user->access);
             }
         }
+
         need_check_grantees_are_allowed = false; /// already checked
 
-        AccessRights required_access;
-        if (elements[0].is_partial_revoke)
-        {
-            AccessRightsElements non_revoke_elements = elements;
-            std::for_each(non_revoke_elements.begin(), non_revoke_elements.end(), [&](AccessRightsElement & element) { element.is_partial_revoke = false; });
-            required_access.grant(non_revoke_elements);
-        }
-        else
-        {
-            required_access.grant(elements);
-        }
-        required_access.makeIntersection(all_granted_access);
+        if (!elements_to_revoke.empty() && elements_to_revoke[0].is_partial_revoke)
+            std::for_each(elements_to_revoke.begin(), elements_to_revoke.end(), [&](AccessRightsElement & element) { element.is_partial_revoke = false; });
+        AccessRights access_to_revoke;
+        access_to_revoke.grant(elements_to_revoke);
+        access_to_revoke.makeIntersection(all_granted_access);
 
-        for (auto & required_access_element : required_access.getElements())
+        /// Build more accurate list of elements to revoke, now we use an intesection of the initial list of elements to revoke
+        /// and all the granted access rights to these grantees.
+        bool grant_option = !elements_to_revoke.empty() && elements_to_revoke[0].grant_option;
+        elements_to_revoke.clear();
+        for (auto & element_to_revoke : access_to_revoke.getElements())
         {
-            if (!required_access_element.is_partial_revoke && (required_access_element.grant_option || !elements[0].grant_option))
-                access.checkGrantOption(required_access_element);
+            if (!element_to_revoke.is_partial_revoke && (element_to_revoke.grant_option || !grant_option))
+                elements_to_revoke.emplace_back(std::move(element_to_revoke));
         }
+
+        current_user_access.checkGrantOption(elements_to_revoke);
     }
 
-    std::vector<UUID> getRoleIDsAndCheckAdminOption(
+    /// Checks if the current user has enough roles granted with admin option to grant or revoke specified roles.
+    void checkAdminOption(
         const AccessControlManager & access_control,
-        const ContextAccess & access,
-        const ASTGrantQuery & query,
-        const RolesOrUsersSet & roles_from_query,
+        const ContextAccess & current_user_access,
         const std::vector<UUID> & grantees_from_query,
-        bool & need_check_grantees_are_allowed)
+        bool & need_check_grantees_are_allowed,
+        const std::vector<UUID> & roles_to_grant,
+        RolesOrUsersSet & roles_to_revoke,
+        bool admin_option)
     {
-        need_check_grantees_are_allowed = true;
-        if (roles_from_query.empty())
-        {
-            /// No roles to grant or revoke.
-            need_check_grantees_are_allowed = false;
-            return {};
-        }
+        /// Check roles which are going to be granted.
+        /// To execute the command GRANT the current user needs to have the roles granted with ADMIN OPTION.
+        current_user_access.checkAdminOption(roles_to_grant);
 
-        std::vector<UUID> matching_ids;
-        if (!query.is_revoke)
+        /// Check roles which are going to be revoked.
+        std::vector<UUID> roles_to_revoke_ids;
+        if (!roles_to_revoke.all)
         {
-            /// To execute the command GRANT the current user needs to have the roles granted with ADMIN OPTION.
-            matching_ids = roles_from_query.getMatchingIDs(access_control);
-            access.checkAdminOption(matching_ids);
-            return matching_ids;
-        }
-
-        if (!roles_from_query.all)
-        {
-            matching_ids = roles_from_query.getMatchingIDs();
-            if (access.hasAdminOption(matching_ids))
+            roles_to_revoke_ids = roles_to_revoke.getMatchingIDs();
+            if (current_user_access.hasAdminOption(roles_to_revoke_ids))
             {
                 /// Simple case: the current user has the admin option for all the roles specified for REVOKE.
-                return matching_ids;
+                return;
             }
         }
 
@@ -221,51 +243,129 @@ namespace
             auto entity = access_control.tryRead(id);
             if (auto role = typeid_cast<RolePtr>(entity))
             {
-                checkGranteeIsAllowed(access, id, *role);
+                if (need_check_grantees_are_allowed)
+                    checkGranteeIsAllowed(current_user_access, id, *role);
                 all_granted_roles.makeUnion(role->granted_roles);
             }
             else if (auto user = typeid_cast<UserPtr>(entity))
             {
-                checkGranteeIsAllowed(access, id, *user);
+                if (need_check_grantees_are_allowed)
+                    checkGranteeIsAllowed(current_user_access, id, *user);
                 all_granted_roles.makeUnion(user->granted_roles);
             }
         }
+
         need_check_grantees_are_allowed = false; /// already checked
 
-        const auto & all_granted_roles_set = query.admin_option ? all_granted_roles.getGrantedWithAdminOption() : all_granted_roles.getGranted();
-        if (roles_from_query.all)
-            boost::range::set_difference(all_granted_roles_set, roles_from_query.except_ids, std::back_inserter(matching_ids));
+        const auto & all_granted_roles_set = admin_option ? all_granted_roles.getGrantedWithAdminOption() : all_granted_roles.getGranted();
+        if (roles_to_revoke.all)
+            boost::range::set_difference(all_granted_roles_set, roles_to_revoke.except_ids, std::back_inserter(roles_to_revoke_ids));
         else
-            boost::range::remove_erase_if(matching_ids, [&](const UUID & id) { return !all_granted_roles_set.count(id); });
-        access.checkAdminOption(matching_ids);
-        return matching_ids;
+            boost::range::remove_erase_if(roles_to_revoke_ids, [&](const UUID & id) { return !all_granted_roles_set.count(id); });
+
+        roles_to_revoke = roles_to_revoke_ids;
+        current_user_access.checkAdminOption(roles_to_revoke_ids);
     }
 
-    void checkGrantOptionAndGrantees(
-        const AccessControlManager & access_control,
-        const ContextAccess & access,
-        const ASTGrantQuery & query,
-        const std::vector<UUID> & grantees_from_query)
+    /// Returns access rights which should be checked for executing GRANT/REVOKE on cluster.
+    /// This function is less accurate than checkGrantOption() because it cannot use any information about
+    /// access rights the grantees currently have (due to those grantees are located on multiple nodes,
+    /// we just don't have the full information about them).
+    AccessRightsElements getRequiredAccessForExecutingOnCluster(const AccessRightsElements & elements_to_grant, const AccessRightsElements & elements_to_revoke)
     {
-        bool need_check_grantees_are_allowed = true;
-        checkGrantOption(access_control, access, query, grantees_from_query, need_check_grantees_are_allowed);
-        if (need_check_grantees_are_allowed)
-            checkGranteesAreAllowed(access_control, access, grantees_from_query);
+        auto required_access = elements_to_grant;
+        required_access.insert(required_access.end(), elements_to_revoke.begin(), elements_to_revoke.end());
+        std::for_each(required_access.begin(), required_access.end(), [&](AccessRightsElement & element) { element.grant_option = true; });
+        return required_access;
     }
 
-    std::vector<UUID> getRoleIDsAndCheckAdminOptionAndGrantees(
-        const AccessControlManager & access_control,
-        const ContextAccess & access,
-        const ASTGrantQuery & query,
-        const RolesOrUsersSet & roles_from_query,
-        const std::vector<UUID> & grantees_from_query)
+    /// Checks if the current user has enough roles granted with admin option to grant or revoke specified roles on cluster.
+    /// This function is less accurate than checkAdminOption() because it cannot use any information about
+    /// granted roles the grantees currently have (due to those grantees are located on multiple nodes,
+    /// we just don't have the full information about them).
+    void checkAdminOptionForExecutingOnCluster(const ContextAccess & current_user_access,
+                                               const std::vector<UUID> roles_to_grant,
+                                               const RolesOrUsersSet & roles_to_revoke)
     {
-        bool need_check_grantees_are_allowed = true;
-        auto role_ids = getRoleIDsAndCheckAdminOption(
-            access_control, access, query, roles_from_query, grantees_from_query, need_check_grantees_are_allowed);
-        if (need_check_grantees_are_allowed)
-            checkGranteesAreAllowed(access_control, access, grantees_from_query);
-        return role_ids;
+        if (roles_to_revoke.all)
+        {
+            /// Revoking all the roles on cluster always requires ROLE_ADMIN privilege
+            /// because when we send the query REVOKE ALL to each shard we don't know at this point
+            /// which roles exactly this is going to revoke on each shard.
+            /// However ROLE_ADMIN just allows to revoke every role, that's why we check it here.
+            current_user_access.checkAccess(AccessType::ROLE_ADMIN);
+            return;
+        }
+
+        if (current_user_access.isGranted(AccessType::ROLE_ADMIN))
+            return;
+
+        for (const auto & role_id : roles_to_grant)
+            current_user_access.checkAdminOption(role_id);
+
+
+        for (const auto & role_id : roles_to_revoke.getMatchingIDs())
+            current_user_access.checkAdminOption(role_id);
+    }
+
+    template <typename T>
+    void updateGrantedAccessRightsAndRolesTemplate(
+        T & grantee,
+        const AccessRightsElements & elements_to_grant,
+        const AccessRightsElements & elements_to_revoke,
+        const std::vector<UUID> & roles_to_grant,
+        const RolesOrUsersSet & roles_to_revoke,
+        bool admin_option)
+    {
+        if (!elements_to_revoke.empty())
+            grantee.access.revoke(elements_to_revoke);
+
+        if (!elements_to_grant.empty())
+            grantee.access.grant(elements_to_grant);
+
+        if (!roles_to_revoke.empty())
+        {
+            if (admin_option)
+                grantee.granted_roles.revokeAdminOption(grantee.granted_roles.findGrantedWithAdminOption(roles_to_revoke));
+            else
+                grantee.granted_roles.revoke(grantee.granted_roles.findGranted(roles_to_revoke));
+        }
+
+        if (!roles_to_grant.empty())
+        {
+            if (admin_option)
+                grantee.granted_roles.grantWithAdminOption(roles_to_grant);
+            else
+                grantee.granted_roles.grant(roles_to_grant);
+        }
+    }
+
+    /// Updates grants of a specified user or role.
+    void updateGrantedAccessRightsAndRoles(
+        IAccessEntity & grantee,
+        const AccessRightsElements & elements_to_grant,
+        const AccessRightsElements & elements_to_revoke,
+        const std::vector<UUID> & roles_to_grant,
+        const RolesOrUsersSet & roles_to_revoke,
+        bool admin_option)
+    {
+        if (auto * user = typeid_cast<User *>(&grantee))
+            updateGrantedAccessRightsAndRolesTemplate(*user, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, admin_option);
+        else if (auto * role = typeid_cast<Role *>(&grantee))
+            updateGrantedAccessRightsAndRolesTemplate(*role, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, admin_option);
+    }
+
+    /// Updates grants of a specified user or role.
+    void updateFromQuery(IAccessEntity & grantee, const ASTGrantQuery & query)
+    {
+        AccessRightsElements elements_to_grant, elements_to_revoke;
+        collectAccessRightsElementsToGrantOrRevoke(query, elements_to_grant, elements_to_revoke);
+
+        std::vector<UUID> roles_to_grant;
+        RolesOrUsersSet roles_to_revoke;
+        collectRolesToGrantOrRevoke(query, roles_to_grant, roles_to_revoke);
+
+        updateGrantedAccessRightsAndRoles(grantee, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, query.admin_option);
     }
 }
 
@@ -283,37 +383,45 @@ BlockIO InterpreterGrantQuery::execute()
         throw Exception("A partial revoke should be revoked, not granted", ErrorCodes::LOGICAL_ERROR);
 
     auto & access_control = getContext()->getAccessControlManager();
-    std::optional<RolesOrUsersSet> roles_set;
-    if (query.roles)
-        roles_set = RolesOrUsersSet{*query.roles, access_control};
+    auto current_user_access = getContext()->getAccess();
 
     std::vector<UUID> grantees = RolesOrUsersSet{*query.grantees, access_control, getContext()->getUserID()}.getMatchingIDs(access_control);
 
-    /// Check if the current user has corresponding roles granted with admin option.
-    std::vector<UUID> roles;
-    if (roles_set)
-        roles = getRoleIDsAndCheckAdminOptionAndGrantees(access_control, *getContext()->getAccess(), query, *roles_set, grantees);
+    /// Collect access rights and roles we're going to grant or revoke.
+    AccessRightsElements elements_to_grant, elements_to_revoke;
+    collectAccessRightsElementsToGrantOrRevoke(query, elements_to_grant, elements_to_revoke);
 
+    std::vector<UUID> roles_to_grant;
+    RolesOrUsersSet roles_to_revoke;
+    collectRolesToGrantOrRevoke(access_control, query, roles_to_grant, roles_to_revoke);
+
+    /// Executing on cluster.
     if (!query.cluster.empty())
     {
-        /// To execute the command GRANT the current user needs to have the access granted with GRANT OPTION.
-        auto required_access = query.access_rights_elements;
-        std::for_each(required_access.begin(), required_access.end(), [&](AccessRightsElement & element) { element.grant_option = true; });
-        checkGranteesAreAllowed(access_control, *getContext()->getAccess(), grantees);
+        auto required_access = getRequiredAccessForExecutingOnCluster(elements_to_grant, elements_to_revoke);
+        checkAdminOptionForExecutingOnCluster(*current_user_access, roles_to_grant, roles_to_revoke);
+        checkGranteesAreAllowed(access_control, *current_user_access, grantees);
         return executeDDLQueryOnCluster(query_ptr, getContext(), std::move(required_access));
     }
 
-    query.replaceEmptyDatabase(getContext()->getCurrentDatabase());
+    /// Check if the current user has corresponding access rights granted with grant option.
+    String current_database = getContext()->getCurrentDatabase();
+    elements_to_grant.replaceEmptyDatabase(current_database);
+    elements_to_revoke.replaceEmptyDatabase(current_database);
+    bool need_check_grantees_are_allowed = true;
+    checkGrantOption(access_control, *current_user_access, grantees, need_check_grantees_are_allowed, elements_to_grant, elements_to_revoke);
 
-    /// Check if the current user has corresponding access rights with grant option.
-    if (!query.access_rights_elements.empty())
-        checkGrantOptionAndGrantees(access_control, *getContext()->getAccess(), query, grantees);
+    /// Check if the current user has corresponding roles granted with admin option.
+    checkAdminOption(access_control, *current_user_access, grantees, need_check_grantees_are_allowed, roles_to_grant, roles_to_revoke, query.admin_option);
+
+    if (need_check_grantees_are_allowed)
+        checkGranteesAreAllowed(access_control, *current_user_access, grantees);
 
     /// Update roles and users listed in `grantees`.
     auto update_func = [&](const AccessEntityPtr & entity) -> AccessEntityPtr
     {
         auto clone = entity->clone();
-        updateFromQueryImpl(*clone, query, roles);
+        updateGrantedAccessRightsAndRoles(*clone, elements_to_grant, elements_to_revoke, roles_to_grant, roles_to_revoke, query.admin_option);
         return clone;
     };
 
@@ -325,21 +433,15 @@ BlockIO InterpreterGrantQuery::execute()
 
 void InterpreterGrantQuery::updateUserFromQuery(User & user, const ASTGrantQuery & query)
 {
-    std::vector<UUID> roles_to_grant_or_revoke;
-    if (query.roles)
-        roles_to_grant_or_revoke = RolesOrUsersSet{*query.roles}.getMatchingIDs();
-    updateFromQueryImpl(user, query, roles_to_grant_or_revoke);
+    updateFromQuery(user, query);
 }
 
-
 void InterpreterGrantQuery::updateRoleFromQuery(Role & role, const ASTGrantQuery & query)
 {
-    std::vector<UUID> roles_to_grant_or_revoke;
-    if (query.roles)
-        roles_to_grant_or_revoke = RolesOrUsersSet{*query.roles}.getMatchingIDs();
-    updateFromQueryImpl(role, query, roles_to_grant_or_revoke);
+    updateFromQuery(role, query);
 }
 
+
 void InterpreterGrantQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & /*ast*/, ContextPtr) const
 {
     auto & query = query_ptr->as<ASTGrantQuery &>();
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index e5d4d952a0c..6a1a8652b23 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -1,35 +1,32 @@
 #include <Interpreters/InterpreterInsertQuery.h>
 
 #include <Access/AccessFlags.h>
-#include <DataStreams/AddingDefaultBlockOutputStream.h>
-#include <DataStreams/CheckConstraintsBlockOutputStream.h>
-#include <DataStreams/CountingBlockOutputStream.h>
-#include <Processors/Transforms/getSourceFromFromASTInsertQuery.h>
-#include <DataStreams/PushingToViewsBlockOutputStream.h>
-#include <DataStreams/SquashingBlockOutputStream.h>
-#include <DataStreams/copyData.h>
-#include <DataStreams/PushingToSinkBlockOutputStream.h>
+#include <Columns/ColumnNullable.h>
+#include <Processors/Transforms/buildPushingToViewsChain.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <IO/ConnectionTimeoutsContext.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
+#include <Interpreters/QueryLog.h>
+#include <Interpreters/TranslateQualifiedNamesVisitor.h>
+#include <Interpreters/addMissingDefaults.h>
+#include <Interpreters/getTableExpressions.h>
+#include <Interpreters/processColumnTransformers.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Processors/Sources/SinkToOutputStream.h>
-#include <Processors/Sources/SourceFromInputStream.h>
+#include <Processors/Sinks/EmptySink.h>
+#include <Processors/Transforms/CheckConstraintsTransform.h>
+#include <Processors/Transforms/CountingTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/SquashingChunksTransform.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
 #include <Storages/StorageDistributed.h>
 #include <Storages/StorageMaterializedView.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Common/checkStackSize.h>
-#include <Interpreters/QueryLog.h>
-#include <Interpreters/TranslateQualifiedNamesVisitor.h>
-#include <Interpreters/getTableExpressions.h>
-#include <Interpreters/processColumnTransformers.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <Columns/ColumnNullable.h>
 
 
 namespace DB
@@ -37,18 +34,20 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int NOT_IMPLEMENTED;
     extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int ILLEGAL_COLUMN;
     extern const int DUPLICATE_COLUMN;
 }
 
 InterpreterInsertQuery::InterpreterInsertQuery(
-    const ASTPtr & query_ptr_, ContextPtr context_, bool allow_materialized_, bool no_squash_, bool no_destination_)
+    const ASTPtr & query_ptr_, ContextPtr context_, bool allow_materialized_, bool no_squash_, bool no_destination_, bool async_insert_)
     : WithContext(context_)
     , query_ptr(query_ptr_)
     , allow_materialized(allow_materialized_)
     , no_squash(no_squash_)
     , no_destination(no_destination_)
+    , async_insert(async_insert_)
 {
     checkStackSize();
 }
@@ -72,26 +71,37 @@ Block InterpreterInsertQuery::getSampleBlock(
     const StoragePtr & table,
     const StorageMetadataPtr & metadata_snapshot) const
 {
-    Block table_sample_non_materialized = metadata_snapshot->getSampleBlockNonMaterialized();
     /// If the query does not include information about columns
     if (!query.columns)
     {
         if (no_destination)
             return metadata_snapshot->getSampleBlockWithVirtuals(table->getVirtuals());
         else
-            return table_sample_non_materialized;
+            return metadata_snapshot->getSampleBlockNonMaterialized();
     }
 
-    Block table_sample = metadata_snapshot->getSampleBlock();
-
-    const auto columns_ast = processColumnTransformers(getContext()->getCurrentDatabase(), table, metadata_snapshot, query.columns);
-
     /// Form the block based on the column names from the query
-    Block res;
+    Names names;
+    const auto columns_ast = processColumnTransformers(getContext()->getCurrentDatabase(), table, metadata_snapshot, query.columns);
     for (const auto & identifier : columns_ast->children)
     {
         std::string current_name = identifier->getColumnName();
+        names.emplace_back(std::move(current_name));
+    }
 
+    return getSampleBlock(names, table, metadata_snapshot);
+}
+
+Block InterpreterInsertQuery::getSampleBlock(
+    const Names & names,
+    const StoragePtr & table,
+    const StorageMetadataPtr & metadata_snapshot) const
+{
+    Block table_sample = metadata_snapshot->getSampleBlock();
+    Block table_sample_non_materialized = metadata_snapshot->getSampleBlockNonMaterialized();
+    Block res;
+    for (const auto & current_name : names)
+    {
         /// The table does not have a column with that name
         if (!table_sample.has(current_name))
             throw Exception("No such column " + current_name + " in table " + table->getStorageID().getNameForLogs(),
@@ -146,15 +156,101 @@ static bool isTrivialSelect(const ASTPtr & select)
     return false;
 };
 
+Chain InterpreterInsertQuery::buildChain(
+    const StoragePtr & table,
+    const StorageMetadataPtr & metadata_snapshot,
+    const Names & columns,
+    ThreadStatus * thread_status,
+    std::atomic_uint64_t * elapsed_counter_ms)
+{
+    auto sample = getSampleBlock(columns, table, metadata_snapshot);
+    return buildChainImpl(table, metadata_snapshot, std::move(sample) , thread_status, elapsed_counter_ms);
+}
+
+Chain InterpreterInsertQuery::buildChainImpl(
+    const StoragePtr & table,
+    const StorageMetadataPtr & metadata_snapshot,
+    const Block & query_sample_block,
+    ThreadStatus * thread_status,
+    std::atomic_uint64_t * elapsed_counter_ms)
+{
+    auto context_ptr = getContext();
+    const ASTInsertQuery * query = nullptr;
+    if (query_ptr)
+        query = query_ptr->as<ASTInsertQuery>();
+
+    const Settings & settings = context_ptr->getSettingsRef();
+    bool null_as_default = query && query->select && context_ptr->getSettingsRef().insert_null_as_default;
+
+    /// We create a pipeline of several streams, into which we will write data.
+    Chain out;
+
+    /// NOTE: we explicitly ignore bound materialized views when inserting into Kafka Storage.
+    ///       Otherwise we'll get duplicates when MV reads same rows again from Kafka.
+    if (table->noPushingToViews() && !no_destination)
+    {
+        auto sink = table->write(query_ptr, metadata_snapshot, context_ptr);
+        sink->setRuntimeData(thread_status, elapsed_counter_ms);
+        out.addSource(std::move(sink));
+    }
+    else
+    {
+        out = buildPushingToViewsChain(table, metadata_snapshot, context_ptr, query_ptr, no_destination, thread_status, elapsed_counter_ms);
+    }
+
+    /// Note that we wrap transforms one on top of another, so we write them in reverse of data processing order.
+
+    /// Checking constraints. It must be done after calculation of all defaults, so we can check them on calculated columns.
+    if (const auto & constraints = metadata_snapshot->getConstraints(); !constraints.empty())
+        out.addSource(std::make_shared<CheckConstraintsTransform>(
+            table->getStorageID(), out.getInputHeader(), metadata_snapshot->getConstraints(), context_ptr));
+
+    auto adding_missing_defaults_dag = addMissingDefaults(
+        query_sample_block,
+        out.getInputHeader().getNamesAndTypesList(),
+        metadata_snapshot->getColumns(),
+        context_ptr,
+        null_as_default);
+
+    auto adding_missing_defaults_actions = std::make_shared<ExpressionActions>(adding_missing_defaults_dag);
+
+    /// Actually we don't know structure of input blocks from query/table,
+    /// because some clients break insertion protocol (columns != header)
+    out.addSource(std::make_shared<ConvertingTransform>(query_sample_block, adding_missing_defaults_actions));
+
+    /// It's important to squash blocks as early as possible (before other transforms),
+    ///  because other transforms may work inefficient if block size is small.
+
+    /// Do not squash blocks if it is a sync INSERT into Distributed, since it lead to double bufferization on client and server side.
+    /// Client-side bufferization might cause excessive timeouts (especially in case of big blocks).
+    if (!(settings.insert_distributed_sync && table->isRemote()) && !no_squash && !(query && query->watch))
+    {
+        bool table_prefers_large_blocks = table->prefersLargeBlocks();
+
+        out.addSource(std::make_shared<SquashingChunksTransform>(
+            out.getInputHeader(),
+            table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
+            table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0));
+    }
+
+    auto counting = std::make_shared<CountingTransform>(out.getInputHeader(), thread_status);
+    counting->setProcessListElement(context_ptr->getProcessListElement());
+    out.addSource(std::move(counting));
+
+    return out;
+}
 
 BlockIO InterpreterInsertQuery::execute()
 {
     const Settings & settings = getContext()->getSettingsRef();
     auto & query = query_ptr->as<ASTInsertQuery &>();
 
-    BlockIO res;
+    QueryPipelineBuilder pipeline;
 
     StoragePtr table = getTable(query);
+    if (query.partition_by && !table->supportsPartitionBy())
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "PARTITION BY clause is not supported by storage");
+
     auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
@@ -169,15 +265,16 @@ BlockIO InterpreterInsertQuery::execute()
         // Distributed INSERT SELECT
         if (auto maybe_pipeline = table->distributedWrite(query, getContext()))
         {
-            res.pipeline = std::move(*maybe_pipeline);
+            pipeline = std::move(*maybe_pipeline);
             is_distributed_insert_select = true;
         }
     }
 
-    BlockOutputStreams out_streams;
+    std::vector<Chain> out_chains;
     if (!is_distributed_insert_select || query.watch)
     {
         size_t out_streams_size = 1;
+
         if (query.select)
         {
             bool is_trivial_insert_select = false;
@@ -221,27 +318,27 @@ BlockIO InterpreterInsertQuery::execute()
 
                 InterpreterSelectWithUnionQuery interpreter_select{
                     query.select, new_context, SelectQueryOptions(QueryProcessingStage::Complete, 1)};
-                res = interpreter_select.execute();
+                pipeline = interpreter_select.buildQueryPipeline();
             }
             else
             {
                 /// Passing 1 as subquery_depth will disable limiting size of intermediate result.
                 InterpreterSelectWithUnionQuery interpreter_select{
                     query.select, getContext(), SelectQueryOptions(QueryProcessingStage::Complete, 1)};
-                res = interpreter_select.execute();
+                pipeline = interpreter_select.buildQueryPipeline();
             }
 
-            res.pipeline.dropTotalsAndExtremes();
+            pipeline.dropTotalsAndExtremes();
 
             if (table->supportsParallelInsert() && settings.max_insert_threads > 1)
-                out_streams_size = std::min(size_t(settings.max_insert_threads), res.pipeline.getNumStreams());
+                out_streams_size = std::min(size_t(settings.max_insert_threads), pipeline.getNumStreams());
 
-            res.pipeline.resize(out_streams_size);
+            pipeline.resize(out_streams_size);
 
             /// Allow to insert Nullable into non-Nullable columns, NULL values will be added as defaults values.
             if (getContext()->getSettingsRef().insert_null_as_default)
             {
-                const auto & input_columns = res.pipeline.getHeader().getColumnsWithTypeAndName();
+                const auto & input_columns = pipeline.getHeader().getColumnsWithTypeAndName();
                 const auto & query_columns = query_sample_block.getColumnsWithTypeAndName();
                 const auto & output_columns = metadata_snapshot->getColumns();
 
@@ -260,86 +357,59 @@ BlockIO InterpreterInsertQuery::execute()
         else if (query.watch)
         {
             InterpreterWatchQuery interpreter_watch{ query.watch, getContext() };
-            res = interpreter_watch.execute();
-            res.pipeline.init(Pipe(std::make_shared<SourceFromInputStream>(std::move(res.in))));
+            pipeline = interpreter_watch.buildQueryPipeline();
         }
 
         for (size_t i = 0; i < out_streams_size; i++)
         {
-            /// We create a pipeline of several streams, into which we will write data.
-            BlockOutputStreamPtr out;
-
-            /// NOTE: we explicitly ignore bound materialized views when inserting into Kafka Storage.
-            ///       Otherwise we'll get duplicates when MV reads same rows again from Kafka.
-            if (table->noPushingToViews() && !no_destination)
-                out = std::make_shared<PushingToSinkBlockOutputStream>(table->write(query_ptr, metadata_snapshot, getContext()));
-            else
-                out = std::make_shared<PushingToViewsBlockOutputStream>(table, metadata_snapshot, getContext(), query_ptr, no_destination);
-
-            /// Note that we wrap transforms one on top of another, so we write them in reverse of data processing order.
-
-            /// Checking constraints. It must be done after calculation of all defaults, so we can check them on calculated columns.
-            if (const auto & constraints = metadata_snapshot->getConstraints(); !constraints.empty())
-                out = std::make_shared<CheckConstraintsBlockOutputStream>(
-                    query.table_id, out, out->getHeader(), metadata_snapshot->getConstraints(), getContext());
-
-            bool null_as_default = query.select && getContext()->getSettingsRef().insert_null_as_default;
-
-            /// Actually we don't know structure of input blocks from query/table,
-            /// because some clients break insertion protocol (columns != header)
-            out = std::make_shared<AddingDefaultBlockOutputStream>(
-                out, query_sample_block, metadata_snapshot->getColumns(), getContext(), null_as_default);
-
-            /// It's important to squash blocks as early as possible (before other transforms),
-            ///  because other transforms may work inefficient if block size is small.
-
-            /// Do not squash blocks if it is a sync INSERT into Distributed, since it lead to double bufferization on client and server side.
-            /// Client-side bufferization might cause excessive timeouts (especially in case of big blocks).
-            if (!(settings.insert_distributed_sync && table->isRemote()) && !no_squash && !query.watch)
-            {
-                bool table_prefers_large_blocks = table->prefersLargeBlocks();
-
-                out = std::make_shared<SquashingBlockOutputStream>(
-                    out,
-                    out->getHeader(),
-                    table_prefers_large_blocks ? settings.min_insert_block_size_rows : settings.max_block_size,
-                    table_prefers_large_blocks ? settings.min_insert_block_size_bytes : 0);
-            }
-
-            auto out_wrapper = std::make_shared<CountingBlockOutputStream>(out);
-            out_wrapper->setProcessListElement(getContext()->getProcessListElement());
-            out_streams.emplace_back(std::move(out_wrapper));
+            auto out = buildChainImpl(table, metadata_snapshot, query_sample_block, nullptr, nullptr);
+            out_chains.emplace_back(std::move(out));
         }
     }
 
+    BlockIO res;
+
+    res.pipeline.addStorageHolder(table);
+    if (const auto * mv = dynamic_cast<const StorageMaterializedView *>(table.get()))
+    {
+        if (auto inner_table = mv->tryGetTargetTable())
+            res.pipeline.addStorageHolder(inner_table);
+    }
+
     /// What type of query: INSERT or INSERT SELECT or INSERT WATCH?
     if (is_distributed_insert_select)
     {
-        /// Pipeline was already built.
+        res.pipeline = QueryPipelineBuilder::getPipeline(std::move(pipeline));
     }
     else if (query.select || query.watch)
     {
-        const auto & header = out_streams.at(0)->getHeader();
+        const auto & header = out_chains.at(0).getInputHeader();
         auto actions_dag = ActionsDAG::makeConvertingActions(
-                res.pipeline.getHeader().getColumnsWithTypeAndName(),
+                pipeline.getHeader().getColumnsWithTypeAndName(),
                 header.getColumnsWithTypeAndName(),
                 ActionsDAG::MatchColumnsMode::Position);
         auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext(), CompileExpressions::yes));
 
-        res.pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
+        pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
         {
             return std::make_shared<ExpressionTransform>(in_header, actions);
         });
 
-        res.pipeline.setSinks([&](const Block &, QueryPipeline::StreamType type) -> ProcessorPtr
+        size_t num_select_threads = pipeline.getNumThreads();
+        size_t num_insert_threads = std::max_element(out_chains.begin(), out_chains.end(), [&](const auto &a, const auto &b)
         {
-            if (type != QueryPipeline::StreamType::Main)
-                return nullptr;
+            return a.getNumThreads() < b.getNumThreads();
+        })->getNumThreads();
+        pipeline.addChains(std::move(out_chains));
 
-            auto stream = std::move(out_streams.back());
-            out_streams.pop_back();
+        pipeline.setMaxThreads(num_insert_threads);
+        /// Don't use more threads for insert then for select to reduce memory consumption.
+        if (!settings.parallel_view_processing && pipeline.getNumThreads() > num_select_threads)
+            pipeline.setMaxThreads(num_select_threads);
 
-            return std::make_shared<SinkToOutputStream>(std::move(stream));
+        pipeline.setSinks([&](const Block & cur_header, QueryPipelineBuilder::StreamType) -> ProcessorPtr
+        {
+            return std::make_shared<EmptySink>(cur_header);
         });
 
         if (!allow_materialized)
@@ -348,25 +418,20 @@ BlockIO InterpreterInsertQuery::execute()
                 if (column.default_desc.kind == ColumnDefaultKind::Materialized && header.has(column.name))
                     throw Exception("Cannot insert column " + column.name + ", because it is MATERIALIZED column.", ErrorCodes::ILLEGAL_COLUMN);
         }
-    }
-    else if (query.data && !query.has_tail) /// can execute without additional data
-    {
-        auto pipe = getSourceFromFromASTInsertQuery(query_ptr, nullptr, query_sample_block, getContext(), nullptr);
-        res.pipeline.init(std::move(pipe));
-        res.pipeline.resize(1);
-        res.pipeline.setSinks([&](const Block &, Pipe::StreamType)
-        {
-            return std::make_shared<SinkToOutputStream>(out_streams.at(0));
-        });
+
+        res.pipeline = QueryPipelineBuilder::getPipeline(std::move(pipeline));
     }
     else
-        res.out = std::move(out_streams.at(0));
-
-    res.pipeline.addStorageHolder(table);
-    if (const auto * mv = dynamic_cast<const StorageMaterializedView *>(table.get()))
     {
-        if (auto inner_table = mv->tryGetTargetTable())
-            res.pipeline.addStorageHolder(inner_table);
+        res.pipeline = QueryPipeline(std::move(out_chains.at(0)));
+        res.pipeline.setNumThreads(std::min<size_t>(res.pipeline.getNumThreads(), settings.max_threads));
+
+        if (query.hasInlinedData() && !async_insert)
+        {
+            /// can execute without additional data
+            auto pipe = getSourceFromASTInsertQuery(query_ptr, true, query_sample_block, getContext(), nullptr);
+            res.pipeline.complete(std::move(pipe));
+        }
     }
 
     return res;
diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h
index 71b8c827702..e5733a8c28b 100644
--- a/src/Interpreters/InterpreterInsertQuery.h
+++ b/src/Interpreters/InterpreterInsertQuery.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Storages/StorageInMemoryMetadata.h>
@@ -9,6 +8,9 @@
 namespace DB
 {
 
+class Chain;
+class ThreadStatus;
+
 /** Interprets the INSERT query.
   */
 class InterpreterInsertQuery : public IInterpreter, WithContext
@@ -19,7 +21,8 @@ public:
         ContextPtr context_,
         bool allow_materialized_ = false,
         bool no_squash_ = false,
-        bool no_destination_ = false);
+        bool no_destination_ = false,
+        bool async_insert_ = false);
 
     /** Prepare a request for execution. Return block streams
       * - the stream into which you can write data to execute the query, if INSERT;
@@ -30,16 +33,33 @@ public:
 
     StorageID getDatabaseTable() const;
 
+    Chain buildChain(
+        const StoragePtr & table,
+        const StorageMetadataPtr & metadata_snapshot,
+        const Names & columns,
+        ThreadStatus * thread_status = nullptr,
+        std::atomic_uint64_t * elapsed_counter_ms = nullptr);
+
     void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context_) const override;
 
-private:
     StoragePtr getTable(ASTInsertQuery & query);
     Block getSampleBlock(const ASTInsertQuery & query, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
 
+private:
+    Block getSampleBlock(const Names & names, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
+
     ASTPtr query_ptr;
     const bool allow_materialized;
     const bool no_squash;
     const bool no_destination;
+    const bool async_insert;
+
+    Chain buildChainImpl(
+        const StoragePtr & table,
+        const StorageMetadataPtr & metadata_snapshot,
+        const Block & query_sample_block,
+        ThreadStatus * thread_status,
+        std::atomic_uint64_t * elapsed_counter_ms);
 };
 
 
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index 7e58cccf13a..2b949266c17 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -16,7 +16,9 @@
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Storages/IStorage.h>
 #include <Common/quoteString.h>
 #include <thread>
@@ -31,6 +33,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int ACCESS_DENIED;
+    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -121,15 +124,16 @@ static QueryDescriptors extractQueriesExceptMeAndCheckAccess(const Block & proce
 }
 
 
-class SyncKillQueryInputStream : public IBlockInputStream
+class SyncKillQuerySource : public SourceWithProgress
 {
 public:
-    SyncKillQueryInputStream(ProcessList & process_list_, QueryDescriptors && processes_to_stop_, Block && processes_block_,
+    SyncKillQuerySource(ProcessList & process_list_, QueryDescriptors && processes_to_stop_, Block && processes_block_,
                              const Block & res_sample_block_)
-        : process_list(process_list_),
-        processes_to_stop(std::move(processes_to_stop_)),
-        processes_block(std::move(processes_block_)),
-        res_sample_block(res_sample_block_)
+        : SourceWithProgress(res_sample_block_)
+        , process_list(process_list_)
+        , processes_to_stop(std::move(processes_to_stop_))
+        , processes_block(std::move(processes_block_))
+        , res_sample_block(std::move(res_sample_block_))
     {
         addTotalRowsApprox(processes_to_stop.size());
     }
@@ -139,14 +143,12 @@ public:
         return "SynchronousQueryKiller";
     }
 
-    Block getHeader() const override { return res_sample_block; }
-
-    Block readImpl() override
+    Chunk generate() override
     {
         size_t num_result_queries = processes_to_stop.size();
 
         if (num_processed_queries >= num_result_queries)
-            return Block();
+            return {};
 
         MutableColumns columns = res_sample_block.cloneEmptyColumns();
 
@@ -179,7 +181,8 @@ public:
         /// Don't produce empty block
         } while (columns.empty() || columns[0]->empty());
 
-        return res_sample_block.cloneWithColumns(std::move(columns));
+        size_t num_rows = columns.empty() ? 0 : columns.front()->size();
+        return Chunk(std::move(columns), num_rows);
     }
 
     ProcessList & process_list;
@@ -221,12 +224,12 @@ BlockIO InterpreterKillQueryQuery::execute()
                 insertResultRow(query_desc.source_num, code, processes_block, header, res_columns);
             }
 
-            res_io.in = std::make_shared<OneBlockInputStream>(header.cloneWithColumns(std::move(res_columns)));
+            res_io.pipeline = QueryPipeline(std::make_shared<SourceFromSingleChunk>(header.cloneWithColumns(std::move(res_columns))));
         }
         else
         {
-            res_io.in = std::make_shared<SyncKillQueryInputStream>(
-                process_list, std::move(queries_to_stop), std::move(processes_block), header);
+            res_io.pipeline = QueryPipeline(std::make_shared<SyncKillQuerySource>(
+                process_list, std::move(queries_to_stop), std::move(processes_block), header));
         }
 
         break;
@@ -286,7 +289,72 @@ BlockIO InterpreterKillQueryQuery::execute()
                 "Not allowed to kill mutation. To execute this query it's necessary to have the grant " + required_access_rights.toString(),
                 ErrorCodes::ACCESS_DENIED);
 
-        res_io.in = std::make_shared<OneBlockInputStream>(header.cloneWithColumns(std::move(res_columns)));
+        res_io.pipeline = QueryPipeline(Pipe(std::make_shared<SourceFromSingleChunk>(header.cloneWithColumns(std::move(res_columns)))));
+
+        break;
+    }
+    case ASTKillQueryQuery::Type::PartMoveToShard:
+    {
+        if (query.sync)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "SYNC modifier is not supported for this statement.");
+
+        Block moves_block = getSelectResult(
+            "database, table, task_name, task_uuid, part_name, to_shard, state",
+            "system.part_moves_between_shards");
+
+        if (!moves_block)
+            return res_io;
+
+        const ColumnString & database_col = typeid_cast<const ColumnString &>(*moves_block.getByName("database").column);
+        const ColumnString & table_col = typeid_cast<const ColumnString &>(*moves_block.getByName("table").column);
+        const ColumnUUID & task_uuid_col = typeid_cast<const ColumnUUID &>(*moves_block.getByName("task_uuid").column);
+
+        auto header = moves_block.cloneEmpty();
+        header.insert(0, {ColumnString::create(), std::make_shared<DataTypeString>(), "kill_status"});
+
+        MutableColumns res_columns = header.cloneEmptyColumns();
+        auto table_id = StorageID::createEmpty();
+        AccessRightsElements required_access_rights;
+        auto access = getContext()->getAccess();
+        bool access_denied = false;
+
+        for (size_t i = 0; i < moves_block.rows(); ++i)
+        {
+            table_id = StorageID{database_col.getDataAt(i).toString(), table_col.getDataAt(i).toString()};
+            auto task_uuid = get<UUID>(task_uuid_col[i]);
+
+            CancellationCode code = CancellationCode::Unknown;
+
+            if (!query.test)
+            {
+                auto storage = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
+                if (!storage)
+                    code = CancellationCode::NotFound;
+                else
+                {
+                    ASTAlterCommand alter_command{};
+                    alter_command.type = ASTAlterCommand::MOVE_PARTITION;
+                    alter_command.move_destination_type = DataDestinationType::SHARD;
+                    required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(
+                        alter_command, table_id.database_name, table_id.table_name);
+                    if (!access->isGranted(required_access_rights))
+                    {
+                        access_denied = true;
+                        continue;
+                    }
+                    code = storage->killPartMoveToShard(task_uuid);
+                }
+            }
+
+            insertResultRow(i, code, moves_block, header, res_columns);
+        }
+
+        if (res_columns[0]->empty() && access_denied)
+            throw Exception(
+                "Not allowed to kill move partition. To execute this query it's necessary to have the grant " + required_access_rights.toString(),
+                ErrorCodes::ACCESS_DENIED);
+
+        res_io.pipeline = QueryPipeline(Pipe(std::make_shared<SourceFromSingleChunk>(header.cloneWithColumns(std::move(res_columns)))));
 
         break;
     }
@@ -302,10 +370,15 @@ Block InterpreterKillQueryQuery::getSelectResult(const String & columns, const S
     if (where_expression)
         select_query += " WHERE " + queryToString(where_expression);
 
-    auto stream = executeQuery(select_query, getContext(), true).getInputStream();
-    Block res = stream->read();
+    auto io = executeQuery(select_query, getContext(), true);
+    PullingPipelineExecutor executor(io.pipeline);
+    Block res;
+    while (!res && executor.pull(res));
 
-    if (res && stream->read())
+    Block tmp_block;
+    while (executor.pull(tmp_block));
+
+    if (tmp_block)
         throw Exception("Expected one block from input stream", ErrorCodes::LOGICAL_ERROR);
 
     return res;
@@ -319,7 +392,13 @@ AccessRightsElements InterpreterKillQueryQuery::getRequiredAccessForDDLOnCluster
     if (query.type == ASTKillQueryQuery::Type::Query)
         required_access.emplace_back(AccessType::KILL_QUERY);
     else if (query.type == ASTKillQueryQuery::Type::Mutation)
-        required_access.emplace_back(AccessType::ALTER_UPDATE | AccessType::ALTER_DELETE | AccessType::ALTER_MATERIALIZE_INDEX | AccessType::ALTER_MATERIALIZE_TTL);
+        required_access.emplace_back(
+                AccessType::ALTER_UPDATE
+                | AccessType::ALTER_DELETE
+                | AccessType::ALTER_MATERIALIZE_INDEX
+                | AccessType::ALTER_MATERIALIZE_COLUMN
+                | AccessType::ALTER_MATERIALIZE_TTL
+            );
     return required_access;
 }
 
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 373953e7530..e3d52487a52 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -72,12 +72,27 @@ BlockIO InterpreterRenameQuery::execute()
 
 BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, const RenameDescriptions & descriptions, TableGuards & ddl_guards)
 {
+    assert(!rename.rename_if_cannot_exchange || descriptions.size() == 1);
+    assert(!(rename.rename_if_cannot_exchange && rename.exchange));
     auto & database_catalog = DatabaseCatalog::instance();
 
     for (const auto & elem : descriptions)
     {
-        if (!rename.exchange)
+        bool exchange_tables;
+        if (rename.exchange)
+        {
+            exchange_tables = true;
+        }
+        else if (rename.rename_if_cannot_exchange)
+        {
+            exchange_tables = database_catalog.isTableExist(StorageID(elem.to_database_name, elem.to_table_name), getContext());
+            renamed_instead_of_exchange = !exchange_tables;
+        }
+        else
+        {
+            exchange_tables = false;
             database_catalog.assertTableDoesntExist(StorageID(elem.to_database_name, elem.to_table_name), getContext());
+        }
 
         DatabasePtr database = database_catalog.getDatabase(elem.from_database_name);
         if (typeid_cast<DatabaseReplicated *>(database.get())
@@ -100,7 +115,7 @@ BlockIO InterpreterRenameQuery::executeToTables(const ASTRenameQuery & rename, c
                 elem.from_table_name,
                 *database_catalog.getDatabase(elem.to_database_name),
                 elem.to_table_name,
-                rename.exchange,
+                exchange_tables,
                 rename.dictionary);
         }
     }
diff --git a/src/Interpreters/InterpreterRenameQuery.h b/src/Interpreters/InterpreterRenameQuery.h
index 49fdd50f52d..dfcd741754e 100644
--- a/src/Interpreters/InterpreterRenameQuery.h
+++ b/src/Interpreters/InterpreterRenameQuery.h
@@ -55,6 +55,8 @@ public:
     BlockIO execute() override;
     void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const override;
 
+    bool renamedInsteadOfExchange() const { return renamed_instead_of_exchange; }
+
 private:
     BlockIO executeToTables(const ASTRenameQuery & rename, const RenameDescriptions & descriptions, TableGuards & ddl_guards);
     static BlockIO executeToDatabase(const ASTRenameQuery & rename, const RenameDescriptions & descriptions);
@@ -62,6 +64,7 @@ private:
     AccessRightsElements getRequiredAccess() const;
 
     ASTPtr query_ptr;
+    bool renamed_instead_of_exchange{false};
 };
 
 }
diff --git a/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp b/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp
new file mode 100644
index 00000000000..f7d98e2e0fe
--- /dev/null
+++ b/src/Interpreters/InterpreterSelectIntersectExceptQuery.cpp
@@ -0,0 +1,150 @@
+#include <Columns/getLeastSuperColumn.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <Processors/QueryPlan/IntersectOrExceptStep.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INTERSECT_OR_EXCEPT_RESULT_STRUCTURES_MISMATCH;
+    extern const int LOGICAL_ERROR;
+}
+
+static Block getCommonHeader(const Blocks & headers)
+{
+    size_t num_selects = headers.size();
+    Block common_header = headers.front();
+    size_t num_columns = common_header.columns();
+
+    for (size_t query_num = 1; query_num < num_selects; ++query_num)
+    {
+        if (headers[query_num].columns() != num_columns)
+            throw Exception(ErrorCodes::INTERSECT_OR_EXCEPT_RESULT_STRUCTURES_MISMATCH,
+                            "Different number of columns in IntersectExceptQuery elements:\n {} \nand\n {}",
+                            common_header.dumpNames(), headers[query_num].dumpNames());
+    }
+
+    std::vector<const ColumnWithTypeAndName *> columns(num_selects);
+    for (size_t column_num = 0; column_num < num_columns; ++column_num)
+    {
+        for (size_t i = 0; i < num_selects; ++i)
+            columns[i] = &headers[i].getByPosition(column_num);
+
+        ColumnWithTypeAndName & result_elem = common_header.getByPosition(column_num);
+        result_elem = getLeastSuperColumn(columns);
+    }
+
+    return common_header;
+}
+
+InterpreterSelectIntersectExceptQuery::InterpreterSelectIntersectExceptQuery(
+    const ASTPtr & query_ptr_,
+    ContextPtr context_,
+    const SelectQueryOptions & options_)
+    : IInterpreterUnionOrSelectQuery(query_ptr_->clone(), context_, options_)
+{
+    ASTSelectIntersectExceptQuery * ast = query_ptr->as<ASTSelectIntersectExceptQuery>();
+    final_operator = ast->final_operator;
+
+    const auto & children = ast->children;
+    size_t num_children = children.size();
+
+    /// AST must have been changed by the visitor.
+    if (final_operator == Operator::UNKNOWN || num_children != 2)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "SelectIntersectExceptyQuery has not been normalized (number of children: {})",
+                        num_children);
+
+    nested_interpreters.resize(num_children);
+
+    for (size_t i = 0; i < num_children; ++i)
+        nested_interpreters[i] = buildCurrentChildInterpreter(children.at(i));
+
+    Blocks headers(num_children);
+    for (size_t query_num = 0; query_num < num_children; ++query_num)
+        headers[query_num] = nested_interpreters[query_num]->getSampleBlock();
+
+    result_header = getCommonHeader(headers);
+}
+
+std::unique_ptr<IInterpreterUnionOrSelectQuery>
+InterpreterSelectIntersectExceptQuery::buildCurrentChildInterpreter(const ASTPtr & ast_ptr_)
+{
+    if (ast_ptr_->as<ASTSelectWithUnionQuery>())
+        return std::make_unique<InterpreterSelectWithUnionQuery>(ast_ptr_, context, SelectQueryOptions());
+
+    if (ast_ptr_->as<ASTSelectQuery>())
+        return std::make_unique<InterpreterSelectQuery>(ast_ptr_, context, SelectQueryOptions());
+
+    if (ast_ptr_->as<ASTSelectIntersectExceptQuery>())
+        return std::make_unique<InterpreterSelectIntersectExceptQuery>(ast_ptr_, context, SelectQueryOptions());
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected query: {}", ast_ptr_->getID());
+}
+
+void InterpreterSelectIntersectExceptQuery::buildQueryPlan(QueryPlan & query_plan)
+{
+    size_t num_plans = nested_interpreters.size();
+    std::vector<std::unique_ptr<QueryPlan>> plans(num_plans);
+    DataStreams data_streams(num_plans);
+
+    for (size_t i = 0; i < num_plans; ++i)
+    {
+        plans[i] = std::make_unique<QueryPlan>();
+        nested_interpreters[i]->buildQueryPlan(*plans[i]);
+
+        if (!blocksHaveEqualStructure(plans[i]->getCurrentDataStream().header, result_header))
+        {
+            auto actions_dag = ActionsDAG::makeConvertingActions(
+                    plans[i]->getCurrentDataStream().header.getColumnsWithTypeAndName(),
+                    result_header.getColumnsWithTypeAndName(),
+                    ActionsDAG::MatchColumnsMode::Position);
+            auto converting_step = std::make_unique<ExpressionStep>(plans[i]->getCurrentDataStream(), std::move(actions_dag));
+            converting_step->setStepDescription("Conversion before UNION");
+            plans[i]->addStep(std::move(converting_step));
+        }
+
+        data_streams[i] = plans[i]->getCurrentDataStream();
+    }
+
+    auto max_threads = context->getSettingsRef().max_threads;
+    auto step = std::make_unique<IntersectOrExceptStep>(std::move(data_streams), final_operator, max_threads);
+    query_plan.unitePlans(std::move(step), std::move(plans));
+}
+
+BlockIO InterpreterSelectIntersectExceptQuery::execute()
+{
+    BlockIO res;
+
+    QueryPlan query_plan;
+    buildQueryPlan(query_plan);
+
+    auto pipeline = query_plan.buildQueryPipeline(
+        QueryPlanOptimizationSettings::fromContext(context),
+        BuildQueryPipelineSettings::fromContext(context));
+
+    pipeline->addInterpreterContext(context);
+
+    res.pipeline = QueryPipelineBuilder::getPipeline(std::move(*query_plan.buildQueryPipeline(
+    QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context))));
+
+    return res;
+}
+
+void InterpreterSelectIntersectExceptQuery::ignoreWithTotals()
+{
+    for (auto & interpreter : nested_interpreters)
+        interpreter->ignoreWithTotals();
+}
+
+}
diff --git a/src/Interpreters/InterpreterSelectIntersectExceptQuery.h b/src/Interpreters/InterpreterSelectIntersectExceptQuery.h
new file mode 100644
index 00000000000..805565e4c51
--- /dev/null
+++ b/src/Interpreters/InterpreterSelectIntersectExceptQuery.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <Core/QueryProcessingStage.h>
+#include <Interpreters/IInterpreter.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/IInterpreterUnionOrSelectQuery.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
+
+
+namespace DB
+{
+
+class Context;
+class InterpreterSelectQuery;
+class QueryPlan;
+
+class InterpreterSelectIntersectExceptQuery : public IInterpreterUnionOrSelectQuery
+{
+using Operator = ASTSelectIntersectExceptQuery::Operator;
+
+public:
+    InterpreterSelectIntersectExceptQuery(
+        const ASTPtr & query_ptr_,
+        ContextPtr context_,
+        const SelectQueryOptions & options_);
+
+    BlockIO execute() override;
+
+    Block getSampleBlock() { return result_header; }
+
+    void ignoreWithTotals() override;
+
+private:
+    static String getName() { return "SelectIntersectExceptQuery"; }
+
+    std::unique_ptr<IInterpreterUnionOrSelectQuery>
+    buildCurrentChildInterpreter(const ASTPtr & ast_ptr_);
+
+    void buildQueryPlan(QueryPlan & query_plan) override;
+
+    std::vector<std::unique_ptr<IInterpreterUnionOrSelectQuery>> nested_interpreters;
+
+    Operator final_operator;
+};
+
+}
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index 33f9deaf805..0ed7df2d18f 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -1,6 +1,3 @@
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/materializeBlock.h>
-
 #include <DataTypes/DataTypeAggregateFunction.h>
 
 #include <Parsers/ASTFunction.h>
@@ -8,6 +5,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTOrderByElement.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
@@ -35,7 +33,7 @@
 #include <Interpreters/QueryAliasesVisitor.h>
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
 #include <Processors/QueryPlan/ArrayJoinStep.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
@@ -45,15 +43,12 @@
 #include <Processors/QueryPlan/ExtremesStep.h>
 #include <Processors/QueryPlan/FillingStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
-#include <Processors/QueryPlan/FinishSortingStep.h>
 #include <Processors/QueryPlan/JoinStep.h>
 #include <Processors/QueryPlan/LimitByStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
-#include <Processors/QueryPlan/MergeSortingStep.h>
+#include <Processors/QueryPlan/SortingStep.h>
 #include <Processors/QueryPlan/MergingAggregatedStep.h>
-#include <Processors/QueryPlan/MergingSortedStep.h>
 #include <Processors/QueryPlan/OffsetStep.h>
-#include <Processors/QueryPlan/PartialSortingStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/ReadNothingStep.h>
@@ -63,7 +58,7 @@
 #include <Processors/QueryPlan/WindowStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/Sources/NullSource.h>
-#include <Processors/Sources/SourceFromInputStream.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/FilterTransform.h>
@@ -74,14 +69,15 @@
 
 #include <Functions/IFunction.h>
 #include <Core/Field.h>
-#include <common/types.h>
+#include <Core/ProtocolDefines.h>
+#include <base/types.h>
 #include <Columns/Collator.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
-#include <common/map.h>
-#include <common/scope_guard_safe.h>
+#include <base/map.h>
+#include <base/scope_guard_safe.h>
 #include <memory>
 
 
@@ -141,7 +137,7 @@ String InterpreterSelectQuery::generateFilterActions(ActionsDAGPtr & actions, co
     SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, context, metadata_snapshot);
     actions = analyzer.simpleSelectActions();
 
-    auto column_name = expr_list->children.at(0)->getColumnName(context->getSettingsRef());
+    auto column_name = expr_list->children.at(0)->getColumnName();
     actions->removeUnusedActions(NameSet{column_name});
     actions->projectInput(false);
 
@@ -156,24 +152,16 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     ContextPtr context_,
     const SelectQueryOptions & options_,
     const Names & required_result_column_names_)
-    : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::nullopt, nullptr, options_, required_result_column_names_)
+    : InterpreterSelectQuery(query_ptr_, context_, std::nullopt, nullptr, options_, required_result_column_names_)
 {
 }
 
-InterpreterSelectQuery::InterpreterSelectQuery(
-    const ASTPtr & query_ptr_,
-    ContextPtr context_,
-    const BlockInputStreamPtr & input_,
-    const SelectQueryOptions & options_)
-    : InterpreterSelectQuery(query_ptr_, context_, input_, std::nullopt, nullptr, options_.copy().noSubquery())
-{}
-
 InterpreterSelectQuery::InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
         ContextPtr context_,
         Pipe input_pipe_,
         const SelectQueryOptions & options_)
-        : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::move(input_pipe_), nullptr, options_.copy().noSubquery())
+        : InterpreterSelectQuery(query_ptr_, context_, std::move(input_pipe_), nullptr, options_.copy().noSubquery())
 {}
 
 InterpreterSelectQuery::InterpreterSelectQuery(
@@ -182,7 +170,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const StoragePtr & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const SelectQueryOptions & options_)
-    : InterpreterSelectQuery(query_ptr_, context_, nullptr, std::nullopt, storage_, options_.copy().noSubquery(), {}, metadata_snapshot_)
+    : InterpreterSelectQuery(query_ptr_, context_, std::nullopt, storage_, options_.copy().noSubquery(), {}, metadata_snapshot_)
 {}
 
 InterpreterSelectQuery::~InterpreterSelectQuery() = default;
@@ -266,7 +254,6 @@ static bool shouldIgnoreQuotaAndLimits(const StorageID & table_id)
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
     ContextPtr context_,
-    const BlockInputStreamPtr & input_,
     std::optional<Pipe> input_pipe_,
     const StoragePtr & storage_,
     const SelectQueryOptions & options_,
@@ -275,7 +262,6 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     /// NOTE: the query almost always should be cloned because it will be modified during analysis.
     : IInterpreterUnionOrSelectQuery(options_.modify_inplace ? query_ptr_ : query_ptr_->clone(), context_, options_)
     , storage(storage_)
-    , input(input_)
     , input_pipe(std::move(input_pipe_))
     , log(&Poco::Logger::get("InterpreterSelectQuery"))
     , metadata_snapshot(metadata_snapshot_)
@@ -284,6 +270,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
     query_info.ignore_projections = options.ignore_projections;
     query_info.is_projection_query = options.is_projection_query;
+    query_info.original_query = query_ptr->clone();
 
     initSettings();
     const Settings & settings = context->getSettingsRef();
@@ -292,13 +279,8 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         throw Exception("Too deep subqueries. Maximum: " + settings.max_subquery_depth.toString(),
             ErrorCodes::TOO_DEEP_SUBQUERIES);
 
-    bool has_input = input || input_pipe;
-    if (input)
-    {
-        /// Read from prepared input.
-        source_header = input->getHeader();
-    }
-    else if (input_pipe)
+    bool has_input = input_pipe != std::nullopt;
+    if (input_pipe)
     {
         /// Read from prepared input.
         source_header = input_pipe->getHeader();
@@ -448,17 +430,17 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
         if (!options.only_analyze)
         {
-            if (query.sampleSize() && (input || input_pipe || !storage || !storage->supportsSampling()))
+            if (query.sampleSize() && (input_pipe || !storage || !storage->supportsSampling()))
                 throw Exception("Illegal SAMPLE: table doesn't support sampling", ErrorCodes::SAMPLING_NOT_SUPPORTED);
 
-            if (query.final() && (input || input_pipe || !storage || !storage->supportsFinal()))
+            if (query.final() && (input_pipe || !storage || !storage->supportsFinal()))
                 throw Exception(
-                    (!input && !input_pipe && storage) ? "Storage " + storage->getName() + " doesn't support FINAL" : "Illegal FINAL",
+                    (!input_pipe && storage) ? "Storage " + storage->getName() + " doesn't support FINAL" : "Illegal FINAL",
                     ErrorCodes::ILLEGAL_FINAL);
 
-            if (query.prewhere() && (input || input_pipe || !storage || !storage->supportsPrewhere()))
+            if (query.prewhere() && (input_pipe || !storage || !storage->supportsPrewhere()))
                 throw Exception(
-                    (!input && !input_pipe && storage) ? "Storage " + storage->getName() + " doesn't support PREWHERE" : "Illegal PREWHERE",
+                    (!input_pipe && storage) ? "Storage " + storage->getName() + " doesn't support PREWHERE" : "Illegal PREWHERE",
                     ErrorCodes::ILLEGAL_PREWHERE);
 
             /// Save the new temporary tables in the query context
@@ -576,7 +558,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
 
 void InterpreterSelectQuery::buildQueryPlan(QueryPlan & query_plan)
 {
-    executeImpl(query_plan, input, std::move(input_pipe));
+    executeImpl(query_plan, std::move(input_pipe));
 
     /// We must guarantee that result structure is the same as in getSampleBlock()
     ///
@@ -602,8 +584,8 @@ BlockIO InterpreterSelectQuery::execute()
 
     buildQueryPlan(query_plan);
 
-    res.pipeline = std::move(*query_plan.buildQueryPipeline(
-        QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context)));
+    res.pipeline = QueryPipelineBuilder::getPipeline(std::move(*query_plan.buildQueryPipeline(
+        QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context))));
     return res;
 }
 
@@ -782,7 +764,7 @@ static SortDescription getSortDescription(const ASTSelectQuery & query, ContextP
     order_descr.reserve(query.orderBy()->children.size());
     for (const auto & elem : query.orderBy()->children)
     {
-        String name = elem->children.front()->getColumnName(context->getSettingsRef());
+        String name = elem->children.front()->getColumnName();
         const auto & order_by_elem = elem->as<ASTOrderByElement &>();
 
         std::shared_ptr<Collator> collator;
@@ -801,14 +783,14 @@ static SortDescription getSortDescription(const ASTSelectQuery & query, ContextP
     return order_descr;
 }
 
-static SortDescription getSortDescriptionFromGroupBy(const ASTSelectQuery & query, ContextPtr context)
+static SortDescription getSortDescriptionFromGroupBy(const ASTSelectQuery & query)
 {
     SortDescription order_descr;
     order_descr.reserve(query.groupBy()->children.size());
 
     for (const auto & elem : query.groupBy()->children)
     {
-        String name = elem->getColumnName(context->getSettingsRef());
+        String name = elem->getColumnName();
         order_descr.emplace_back(name, 1, 1);
     }
 
@@ -853,7 +835,7 @@ static std::pair<UInt64, UInt64> getLimitLengthAndOffset(const ASTSelectQuery &
 static UInt64 getLimitForSorting(const ASTSelectQuery & query, ContextPtr context)
 {
     /// Partial sort can be done if there is LIMIT but no DISTINCT or LIMIT BY, neither ARRAY JOIN.
-    if (!query.distinct && !query.limitBy() && !query.limit_with_ties && !query.arrayJoinExpressionList() && query.limitLength())
+    if (!query.distinct && !query.limitBy() && !query.limit_with_ties && !query.arrayJoinExpressionList().first && query.limitLength())
     {
         auto [limit_length, limit_offset] = getLimitLengthAndOffset(query, context);
         if (limit_length > std::numeric_limits<UInt64>::max() - limit_offset)
@@ -878,16 +860,39 @@ static bool hasWithTotalsInAnySubqueryInFromClause(const ASTSelectQuery & query)
     {
         if (const auto * ast_union = query_table->as<ASTSelectWithUnionQuery>())
         {
-            /// NOTE: Child of subquery can be ASTSelectWithUnionQuery or ASTSelectQuery,
-            /// and after normalization, the height of the AST tree is at most 2
             for (const auto & elem : ast_union->list_of_selects->children)
             {
+                /// After normalization for union child node the height of the AST tree is at most 2.
                 if (const auto * child_union = elem->as<ASTSelectWithUnionQuery>())
                 {
                     for (const auto & child_elem : child_union->list_of_selects->children)
                         if (hasWithTotalsInAnySubqueryInFromClause(child_elem->as<ASTSelectQuery &>()))
                             return true;
                 }
+                /// After normalization in case there are intersect or except nodes, the height of
+                /// the AST tree can have any depth (each intersect/except adds a level), but the
+                /// number of children in those nodes is always 2.
+                else if (elem->as<ASTSelectIntersectExceptQuery>())
+                {
+                    std::function<bool(ASTPtr)> traverse_recursively = [&](ASTPtr child_ast) -> bool
+                    {
+                        if (const auto * child = child_ast->as <ASTSelectQuery>())
+                            return hasWithTotalsInAnySubqueryInFromClause(child->as<ASTSelectQuery &>());
+
+                        if (const auto * child = child_ast->as<ASTSelectWithUnionQuery>())
+                            for (const auto & subchild : child->list_of_selects->children)
+                                if (traverse_recursively(subchild))
+                                    return true;
+
+                        if (const auto * child = child_ast->as<ASTSelectIntersectExceptQuery>())
+                            for (const auto & subchild : child->children)
+                                if (traverse_recursively(subchild))
+                                    return true;
+                        return false;
+                    };
+                    if (traverse_recursively(elem))
+                        return true;
+                }
                 else
                 {
                     if (hasWithTotalsInAnySubqueryInFromClause(elem->as<ASTSelectQuery &>()))
@@ -901,7 +906,7 @@ static bool hasWithTotalsInAnySubqueryInFromClause(const ASTSelectQuery & query)
 }
 
 
-void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInputStreamPtr & prepared_input, std::optional<Pipe> prepared_pipe)
+void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<Pipe> prepared_pipe)
 {
     /** Streams of data. When the query is executed in parallel, we have several data streams.
      *  If there is no GROUP BY, then perform all operations before ORDER BY and LIMIT in parallel, then
@@ -985,13 +990,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
     }
     else
     {
-        if (prepared_input)
-        {
-            auto prepared_source_step
-                = std::make_unique<ReadFromPreparedSource>(Pipe(std::make_shared<SourceFromInputStream>(prepared_input)), context);
-            query_plan.addStep(std::move(prepared_source_step));
-        }
-        else if (prepared_pipe)
+        if (prepared_pipe)
         {
             auto prepared_source_step = std::make_unique<ReadFromPreparedSource>(std::move(*prepared_pipe), context);
             query_plan.addStep(std::move(prepared_source_step));
@@ -1108,8 +1107,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             }
 
             /// Optional step to convert key columns to common supertype.
-            /// Columns with changed types will be returned to user,
-            ///  so its only suitable for `USING` join.
             if (expressions.converting_join_columns)
             {
                 QueryPlanStepPtr convert_join_step = std::make_unique<ExpressionStep>(
@@ -1226,7 +1223,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
                     {
                         bool final = !query.group_by_with_rollup && !query.group_by_with_cube;
                         executeTotalsAndHaving(
-                            query_plan, expressions.hasHaving(), expressions.before_having, aggregate_overflow_row, final);
+                            query_plan, expressions.hasHaving(), expressions.before_having, expressions.remove_having_filter, aggregate_overflow_row, final);
                     }
 
                     if (query.group_by_with_rollup)
@@ -1240,11 +1237,11 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
                             throw Exception(
                                 "WITH TOTALS and WITH ROLLUP or CUBE are not supported together in presence of HAVING",
                                 ErrorCodes::NOT_IMPLEMENTED);
-                        executeHaving(query_plan, expressions.before_having);
+                        executeHaving(query_plan, expressions.before_having, expressions.remove_having_filter);
                     }
                 }
                 else if (expressions.hasHaving())
-                    executeHaving(query_plan, expressions.before_having);
+                    executeHaving(query_plan, expressions.before_having, expressions.remove_having_filter);
             }
             else if (query.group_by_with_totals || query.group_by_with_rollup || query.group_by_with_cube)
                 throw Exception("WITH TOTALS, ROLLUP or CUBE are not supported without aggregation", ErrorCodes::NOT_IMPLEMENTED);
@@ -1327,24 +1324,27 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             }
 
             bool apply_limit = options.to_stage != QueryProcessingStage::WithMergeableStateAfterAggregation;
+            bool apply_prelimit = apply_limit &&
+                                  query.limitLength() && !query.limit_with_ties &&
+                                  !hasWithTotalsInAnySubqueryInFromClause(query) &&
+                                  !query.arrayJoinExpressionList().first &&
+                                  !query.distinct &&
+                                  !expressions.hasLimitBy() &&
+                                  !settings.extremes &&
+                                  !has_withfill;
             bool apply_offset = options.to_stage != QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
-            bool has_prelimit = false;
-            if (apply_limit &&
-                query.limitLength() && !query.limit_with_ties && !hasWithTotalsInAnySubqueryInFromClause(query) &&
-                !query.arrayJoinExpressionList() && !query.distinct && !expressions.hasLimitBy() && !settings.extremes &&
-                !has_withfill)
+            if (apply_prelimit)
             {
                 executePreLimit(query_plan, /* do_not_skip_offset= */!apply_offset);
-                has_prelimit = true;
             }
 
             /** If there was more than one stream,
               * then DISTINCT needs to be performed once again after merging all streams.
               */
-            if (query.distinct)
+            if (!from_aggregation_stage && query.distinct)
                 executeDistinct(query_plan, false, expressions.selected_columns, false);
 
-            if (expressions.hasLimitBy())
+            if (!from_aggregation_stage && expressions.hasLimitBy())
             {
                 executeExpression(query_plan, expressions.before_limit_by, "Before LIMIT BY");
                 executeLimitBy(query_plan);
@@ -1354,10 +1354,9 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
 
             /// If we have 'WITH TIES', we need execute limit before projection,
             /// because in that case columns from 'ORDER BY' are used.
-            if (query.limit_with_ties)
+            if (query.limit_with_ties && apply_offset)
             {
                 executeLimit(query_plan);
-                has_prelimit = true;
             }
 
             /// Projection not be done on the shards, since then initiator will not find column in blocks.
@@ -1371,8 +1370,14 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu
             /// Extremes are calculated before LIMIT, but after LIMIT BY. This is Ok.
             executeExtremes(query_plan);
 
+            bool limit_applied = apply_prelimit || (query.limit_with_ties && apply_offset);
             /// Limit is no longer needed if there is prelimit.
-            if (apply_limit && !has_prelimit)
+            ///
+            /// NOTE: that LIMIT cannot be applied if OFFSET should not be applied,
+            /// since LIMIT will apply OFFSET too.
+            /// This is the case for various optimizations for distributed queries,
+            /// and when LIMIT cannot be applied it will be applied on the initiator anyway.
+            if (apply_limit && !limit_applied && apply_offset)
                 executeLimit(query_plan);
 
             if (apply_offset)
@@ -1549,7 +1554,7 @@ void InterpreterSelectQuery::addPrewhereAliasActions()
     {
         if (!expressions.prewhere_info)
         {
-            const bool does_storage_support_prewhere = !input && !input_pipe && storage && storage->supportsPrewhere();
+            const bool does_storage_support_prewhere = !input_pipe && storage && storage->supportsPrewhere();
             if (does_storage_support_prewhere && shouldMoveToPrewhere())
             {
                 /// Execute row level filter in prewhere as a part of "move to prewhere" optimization.
@@ -1785,8 +1790,8 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
             Block block_with_count{
                 {std::move(column), std::make_shared<DataTypeAggregateFunction>(func, argument_types, desc.parameters), desc.column_name}};
 
-            auto istream = std::make_shared<OneBlockInputStream>(block_with_count);
-            auto prepared_count = std::make_unique<ReadFromPreparedSource>(Pipe(std::make_shared<SourceFromInputStream>(istream)), context);
+            auto source = std::make_shared<SourceFromSingleChunk>(block_with_count);
+            auto prepared_count = std::make_unique<ReadFromPreparedSource>(Pipe(std::move(source)), context);
             prepared_count->setStepDescription("Optimized trivial count");
             query_plan.addStep(std::move(prepared_count));
             from_stage = QueryProcessingStage::WithMergeableState;
@@ -1918,13 +1923,13 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
                 {
                     query_info.projection->order_optimizer = std::make_shared<ReadInOrderOptimizer>(
                         query_info.projection->group_by_elements_actions,
-                        getSortDescriptionFromGroupBy(query, context),
+                        getSortDescriptionFromGroupBy(query),
                         query_info.syntax_analyzer_result);
                 }
                 else
                 {
                     query_info.order_optimizer = std::make_shared<ReadInOrderOptimizer>(
-                        analysis_result.group_by_elements_actions, getSortDescriptionFromGroupBy(query, context), query_info.syntax_analyzer_result);
+                        analysis_result.group_by_elements_actions, getSortDescriptionFromGroupBy(query), query_info.syntax_analyzer_result);
                 }
             }
 
@@ -1955,12 +1960,14 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
 
         if (context->hasQueryContext() && !options.is_internal)
         {
+            const String view_name{};
             auto local_storage_id = storage->getStorageID();
             context->getQueryContext()->addQueryAccessInfo(
                 backQuoteIfNeed(local_storage_id.getDatabaseName()),
                 local_storage_id.getFullTableName(),
                 required_columns,
-                query_info.projection ? query_info.projection->desc->name : "");
+                query_info.projection ? query_info.projection->desc->name : "",
+                view_name);
         }
 
         /// Create step which reads from empty source if storage has no data.
@@ -2005,7 +2012,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
 void InterpreterSelectQuery::executeWhere(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter)
 {
     auto where_step = std::make_unique<FilterStep>(
-        query_plan.getCurrentDataStream(), expression, getSelectQuery().where()->getColumnName(context->getSettingsRef()), remove_filter);
+        query_plan.getCurrentDataStream(), expression, getSelectQuery().where()->getColumnName(), remove_filter);
 
     where_step->setStepDescription("WHERE");
     query_plan.addStep(std::move(where_step));
@@ -2044,7 +2051,9 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
         settings.group_by_two_level_threshold,
         settings.group_by_two_level_threshold_bytes,
         settings.max_bytes_before_external_group_by,
-        settings.empty_result_for_aggregation_by_empty_set || (keys.empty() && query_analyzer->hasConstAggregationKeys()),
+        settings.empty_result_for_aggregation_by_empty_set
+            || (settings.empty_result_for_aggregation_by_constant_keys_on_empty_set && keys.empty()
+                && query_analyzer->hasConstAggregationKeys()),
         context->getTemporaryVolume(),
         settings.max_threads,
         settings.min_free_disk_space_for_temporary_data,
@@ -2054,7 +2063,7 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
     SortDescription group_by_sort_description;
 
     if (group_by_info && settings.optimize_aggregation_in_order)
-        group_by_sort_description = getSortDescriptionFromGroupBy(getSelectQuery(), context);
+        group_by_sort_description = getSortDescriptionFromGroupBy(getSelectQuery());
     else
         group_by_info = nullptr;
 
@@ -2070,6 +2079,7 @@ void InterpreterSelectQuery::executeAggregation(QueryPlan & query_plan, const Ac
         params,
         final,
         settings.max_block_size,
+        settings.aggregation_in_order_max_block_bytes,
         merge_threads,
         temporary_data_merge_threads,
         storage_has_evenly_distributed_read,
@@ -2099,10 +2109,10 @@ void InterpreterSelectQuery::executeMergeAggregated(QueryPlan & query_plan, bool
 }
 
 
-void InterpreterSelectQuery::executeHaving(QueryPlan & query_plan, const ActionsDAGPtr & expression)
+void InterpreterSelectQuery::executeHaving(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter)
 {
     auto having_step
-        = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(), expression, getSelectQuery().having()->getColumnName(context->getSettingsRef()), false);
+        = std::make_unique<FilterStep>(query_plan.getCurrentDataStream(), expression, getSelectQuery().having()->getColumnName(), remove_filter);
 
     having_step->setStepDescription("HAVING");
     query_plan.addStep(std::move(having_step));
@@ -2110,7 +2120,7 @@ void InterpreterSelectQuery::executeHaving(QueryPlan & query_plan, const Actions
 
 
 void InterpreterSelectQuery::executeTotalsAndHaving(
-    QueryPlan & query_plan, bool has_having, const ActionsDAGPtr & expression, bool overflow_row, bool final)
+    QueryPlan & query_plan, bool has_having, const ActionsDAGPtr & expression, bool remove_filter, bool overflow_row, bool final)
 {
     const Settings & settings = context->getSettingsRef();
 
@@ -2118,7 +2128,8 @@ void InterpreterSelectQuery::executeTotalsAndHaving(
         query_plan.getCurrentDataStream(),
         overflow_row,
         expression,
-        has_having ? getSelectQuery().having()->getColumnName(context->getSettingsRef()) : "",
+        has_having ? getSelectQuery().having()->getColumnName() : "",
+        remove_filter,
         settings.totals_mode,
         settings.totals_auto_threshold,
         final);
@@ -2249,35 +2260,20 @@ void InterpreterSelectQuery::executeWindow(QueryPlan & query_plan)
         // happens in case of `over ()`.
         if (!w.full_sort_description.empty() && (i == 0 || !sortIsPrefix(w, *windows_sorted[i - 1])))
         {
-            auto partial_sorting = std::make_unique<PartialSortingStep>(
-                query_plan.getCurrentDataStream(),
-                w.full_sort_description,
-                0 /* LIMIT */,
-                SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode));
-            partial_sorting->setStepDescription("Sort each block for window '" + w.window_name + "'");
-            query_plan.addStep(std::move(partial_sorting));
 
-            auto merge_sorting_step = std::make_unique<MergeSortingStep>(
+            auto sorting_step = std::make_unique<SortingStep>(
                 query_plan.getCurrentDataStream(),
                 w.full_sort_description,
                 settings.max_block_size,
                 0 /* LIMIT */,
+                SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode),
                 settings.max_bytes_before_remerge_sort,
                 settings.remerge_sort_lowered_memory_bytes_ratio,
                 settings.max_bytes_before_external_sort,
                 context->getTemporaryVolume(),
                 settings.min_free_disk_space_for_temporary_data);
-            merge_sorting_step->setStepDescription("Merge sorted blocks for window '" + w.window_name + "'");
-            query_plan.addStep(std::move(merge_sorting_step));
-
-            // First MergeSorted, now MergingSorted.
-            auto merging_sorted = std::make_unique<MergingSortedStep>(
-                query_plan.getCurrentDataStream(),
-                w.full_sort_description,
-                settings.max_block_size,
-                0 /* LIMIT */);
-            merging_sorted->setStepDescription("Merge sorted streams for window '" + w.window_name + "'");
-            query_plan.addStep(std::move(merging_sorted));
+            sorting_step->setStepDescription("Sorting for window '" + w.window_name + "'");
+            query_plan.addStep(std::move(sorting_step));
         }
 
         auto window_step = std::make_unique<WindowStep>(query_plan.getCurrentDataStream(), w, w.window_functions);
@@ -2292,14 +2288,12 @@ void InterpreterSelectQuery::executeOrderOptimized(QueryPlan & query_plan, Input
 {
     const Settings & settings = context->getSettingsRef();
 
-    const auto & query = getSelectQuery();
-    auto finish_sorting_step = std::make_unique<FinishSortingStep>(
+    auto finish_sorting_step = std::make_unique<SortingStep>(
         query_plan.getCurrentDataStream(),
         input_sorting_info->order_key_prefix_descr,
         output_order_descr,
         settings.max_block_size,
-        limit,
-        query.hasFiltration());
+        limit);
 
     query_plan.addStep(std::move(finish_sorting_step));
 }
@@ -2324,32 +2318,21 @@ void InterpreterSelectQuery::executeOrder(QueryPlan & query_plan, InputOrderInfo
 
     const Settings & settings = context->getSettingsRef();
 
-    auto partial_sorting = std::make_unique<PartialSortingStep>(
-        query_plan.getCurrentDataStream(),
-        output_order_descr,
-        limit,
-        SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode));
-
-    partial_sorting->setStepDescription("Sort each block for ORDER BY");
-    query_plan.addStep(std::move(partial_sorting));
-
     /// Merge the sorted blocks.
-    auto merge_sorting_step = std::make_unique<MergeSortingStep>(
+    auto sorting_step = std::make_unique<SortingStep>(
         query_plan.getCurrentDataStream(),
         output_order_descr,
         settings.max_block_size,
         limit,
+        SizeLimits(settings.max_rows_to_sort, settings.max_bytes_to_sort, settings.sort_overflow_mode),
         settings.max_bytes_before_remerge_sort,
         settings.remerge_sort_lowered_memory_bytes_ratio,
         settings.max_bytes_before_external_sort,
         context->getTemporaryVolume(),
         settings.min_free_disk_space_for_temporary_data);
 
-    merge_sorting_step->setStepDescription("Merge sorted blocks for ORDER BY");
-    query_plan.addStep(std::move(merge_sorting_step));
-
-    /// If there are several streams, we merge them into one
-    executeMergeSorted(query_plan, output_order_descr, limit, "for ORDER BY");
+    sorting_step->setStepDescription("Sorting for ORDER BY");
+    query_plan.addStep(std::move(sorting_step));
 }
 
 
@@ -2367,7 +2350,7 @@ void InterpreterSelectQuery::executeMergeSorted(QueryPlan & query_plan, const So
     const Settings & settings = context->getSettingsRef();
 
     auto merging_sorted
-        = std::make_unique<MergingSortedStep>(query_plan.getCurrentDataStream(), sort_description, settings.max_block_size, limit);
+        = std::make_unique<SortingStep>(query_plan.getCurrentDataStream(), sort_description, settings.max_block_size, limit);
 
     merging_sorted->setStepDescription("Merge sorted streams " + description);
     query_plan.addStep(std::move(merging_sorted));
@@ -2429,7 +2412,10 @@ void InterpreterSelectQuery::executePreLimit(QueryPlan & query_plan, bool do_not
         }
 
         auto limit = std::make_unique<LimitStep>(query_plan.getCurrentDataStream(), limit_length, limit_offset);
-        limit->setStepDescription("preliminary LIMIT");
+        if (do_not_skip_offset)
+            limit->setStepDescription("preliminary LIMIT (with OFFSET)");
+        else
+            limit->setStepDescription("preliminary LIMIT (without OFFSET)");
         query_plan.addStep(std::move(limit));
     }
 }
@@ -2443,7 +2429,7 @@ void InterpreterSelectQuery::executeLimitBy(QueryPlan & query_plan)
 
     Names columns;
     for (const auto & elem : query.limitBy()->children)
-        columns.emplace_back(elem->getColumnName(context->getSettingsRef()));
+        columns.emplace_back(elem->getColumnName());
 
     UInt64 length = getLimitUIntValue(query.limitByLength(), context, "LIMIT");
     UInt64 offset = (query.limitByOffset() ? getLimitUIntValue(query.limitByOffset(), context, "OFFSET") : 0);
@@ -2571,6 +2557,19 @@ void InterpreterSelectQuery::initSettings()
     auto & query = getSelectQuery();
     if (query.settings())
         InterpreterSetQuery(query.settings(), context).executeForCurrentContext();
+
+    auto & client_info = context->getClientInfo();
+    auto min_major = DBMS_MIN_MAJOR_VERSION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD;
+    auto min_minor = DBMS_MIN_MINOR_VERSION_WITH_CURRENT_AGGREGATION_VARIANT_SELECTION_METHOD;
+
+    if (client_info.query_kind == ClientInfo::QueryKind::SECONDARY_QUERY &&
+        std::forward_as_tuple(client_info.connection_client_version_major, client_info.connection_client_version_minor) < std::forward_as_tuple(min_major, min_minor))
+    {
+        /// Disable two-level aggregation due to version incompatibility.
+        context->setSetting("group_by_two_level_threshold", Field(0));
+        context->setSetting("group_by_two_level_threshold_bytes", Field(0));
+
+    }
 }
 
 }
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index aec3b0b8bd3..cf24d14b737 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -3,7 +3,6 @@
 #include <memory>
 
 #include <Core/QueryProcessingStage.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/IInterpreterUnionOrSelectQuery.h>
@@ -52,13 +51,6 @@ public:
         const SelectQueryOptions &,
         const Names & required_result_column_names_ = Names{});
 
-    /// Read data not from the table specified in the query, but from the prepared source `input`.
-    InterpreterSelectQuery(
-        const ASTPtr & query_ptr_,
-        ContextPtr context_,
-        const BlockInputStreamPtr & input_,
-        const SelectQueryOptions & = {});
-
     /// Read data not from the table specified in the query, but from the prepared pipe `input`.
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
@@ -108,7 +100,6 @@ private:
     InterpreterSelectQuery(
         const ASTPtr & query_ptr_,
         ContextPtr context_,
-        const BlockInputStreamPtr & input_,
         std::optional<Pipe> input_pipe,
         const StoragePtr & storage_,
         const SelectQueryOptions &,
@@ -122,7 +113,7 @@ private:
 
     Block getSampleBlockImpl();
 
-    void executeImpl(QueryPlan & query_plan, const BlockInputStreamPtr & prepared_input, std::optional<Pipe> prepared_pipe);
+    void executeImpl(QueryPlan & query_plan, std::optional<Pipe> prepared_pipe);
 
     /// Different stages of query execution.
 
@@ -131,8 +122,8 @@ private:
     void executeAggregation(
         QueryPlan & query_plan, const ActionsDAGPtr & expression, bool overflow_row, bool final, InputOrderInfoPtr group_by_info);
     void executeMergeAggregated(QueryPlan & query_plan, bool overflow_row, bool final);
-    void executeTotalsAndHaving(QueryPlan & query_plan, bool has_having, const ActionsDAGPtr & expression, bool overflow_row, bool final);
-    void executeHaving(QueryPlan & query_plan, const ActionsDAGPtr & expression);
+    void executeTotalsAndHaving(QueryPlan & query_plan, bool has_having, const ActionsDAGPtr & expression, bool remove_filter, bool overflow_row, bool final);
+    void executeHaving(QueryPlan & query_plan, const ActionsDAGPtr & expression, bool remove_filter);
     static void executeExpression(QueryPlan & query_plan, const ActionsDAGPtr & expression, const std::string & description);
     /// FIXME should go through ActionsDAG to behave as a proper function
     void executeWindow(QueryPlan & query_plan);
@@ -198,7 +189,6 @@ private:
     TableLockHolder table_lock;
 
     /// Used when we read from prepared input, not table or subquery.
-    BlockInputStreamPtr input;
     std::optional<Pipe> input_pipe;
 
     Poco::Logger * log;
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index 3cf4a905d38..e7ea08e557d 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -2,8 +2,10 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/InterpreterSelectIntersectExceptQuery.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Parsers/queryToString.h>
 #include <Processors/QueryPlan/DistinctStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
@@ -29,10 +31,12 @@ namespace ErrorCodes
 }
 
 InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
-    const ASTPtr & query_ptr_, ContextPtr context_, const SelectQueryOptions & options_, const Names & required_result_column_names)
+        const ASTPtr & query_ptr_, ContextPtr context_,
+        const SelectQueryOptions & options_, const Names & required_result_column_names)
     : IInterpreterUnionOrSelectQuery(query_ptr_, context_, options_)
 {
     ASTSelectWithUnionQuery * ast = query_ptr->as<ASTSelectWithUnionQuery>();
+    bool require_full_header = ast->hasNonDefaultUnionMode();
 
     const Settings & settings = context->getSettingsRef();
     if (options.subquery_depth == 0 && (settings.limit > 0 || settings.offset > 0))
@@ -49,7 +53,7 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
     nested_interpreters.reserve(num_children);
     std::vector<Names> required_result_column_names_for_other_selects(num_children);
 
-    if (!required_result_column_names.empty() && num_children > 1)
+    if (!require_full_header && !required_result_column_names.empty() && num_children > 1)
     {
         /// Result header if there are no filtering by 'required_result_column_names'.
         /// We use it to determine positions of 'required_result_column_names' in SELECT clause.
@@ -131,7 +135,7 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
             = query_num == 0 ? required_result_column_names : required_result_column_names_for_other_selects[query_num];
 
         nested_interpreters.emplace_back(
-            buildCurrentChildInterpreter(ast->list_of_selects->children.at(query_num), current_required_result_column_names));
+            buildCurrentChildInterpreter(ast->list_of_selects->children.at(query_num), require_full_header ? Names() : current_required_result_column_names));
     }
 
     /// Determine structure of the result.
@@ -208,14 +212,24 @@ InterpreterSelectWithUnionQuery::buildCurrentChildInterpreter(const ASTPtr & ast
 {
     if (ast_ptr_->as<ASTSelectWithUnionQuery>())
         return std::make_unique<InterpreterSelectWithUnionQuery>(ast_ptr_, context, options, current_required_result_column_names);
-    else
+    else if (ast_ptr_->as<ASTSelectQuery>())
         return std::make_unique<InterpreterSelectQuery>(ast_ptr_, context, options, current_required_result_column_names);
+    else
+        return std::make_unique<InterpreterSelectIntersectExceptQuery>(ast_ptr_, context, options);
 }
 
 InterpreterSelectWithUnionQuery::~InterpreterSelectWithUnionQuery() = default;
 
 Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_, ContextPtr context_, bool is_subquery)
 {
+    if (!context_->hasQueryContext())
+    {
+        if (is_subquery)
+            return InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().subquery().analyze()).getSampleBlock();
+        else
+            return InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().analyze()).getSampleBlock();
+    }
+
     auto & cache = context_->getSampleBlockCache();
     /// Using query string because query_ptr changes for every internal SELECT
     auto key = queryToString(query_ptr_);
@@ -225,10 +239,14 @@ Block InterpreterSelectWithUnionQuery::getSampleBlock(const ASTPtr & query_ptr_,
     }
 
     if (is_subquery)
+    {
         return cache[key]
             = InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().subquery().analyze()).getSampleBlock();
+    }
     else
+    {
         return cache[key] = InterpreterSelectWithUnionQuery(query_ptr_, context_, SelectQueryOptions().analyze()).getSampleBlock();
+    }
 }
 
 
@@ -310,13 +328,13 @@ BlockIO InterpreterSelectWithUnionQuery::execute()
     QueryPlan query_plan;
     buildQueryPlan(query_plan);
 
-    auto pipeline = query_plan.buildQueryPipeline(
+    auto pipeline_builder = query_plan.buildQueryPipeline(
         QueryPlanOptimizationSettings::fromContext(context),
         BuildQueryPipelineSettings::fromContext(context));
 
-    res.pipeline = std::move(*pipeline);
-    res.pipeline.addInterpreterContext(context);
+    pipeline_builder->addInterpreterContext(context);
 
+    res.pipeline = QueryPipelineBuilder::getPipeline(std::move(*pipeline_builder));
     return res;
 }
 
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.h b/src/Interpreters/InterpreterSelectWithUnionQuery.h
index bd18b8e7907..720632e7be5 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.h
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.h
@@ -48,7 +48,6 @@ private:
 
     std::unique_ptr<IInterpreterUnionOrSelectQuery>
     buildCurrentChildInterpreter(const ASTPtr & ast_ptr_, const Names & current_required_result_column_names);
-
 };
 
 }
diff --git a/src/Interpreters/InterpreterShowAccessQuery.cpp b/src/Interpreters/InterpreterShowAccessQuery.cpp
index a82ba0411b4..86ab409d82b 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.cpp
+++ b/src/Interpreters/InterpreterShowAccessQuery.cpp
@@ -5,11 +5,11 @@
 #include <Interpreters/InterpreterShowCreateAccessEntityQuery.h>
 #include <Interpreters/InterpreterShowGrantsQuery.h>
 #include <Columns/ColumnString.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <DataTypes/DataTypeString.h>
 #include <Access/AccessFlags.h>
 #include <Access/AccessControlManager.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/sort.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
@@ -22,12 +22,12 @@ using EntityType = IAccessEntity::Type;
 BlockIO InterpreterShowAccessQuery::execute()
 {
     BlockIO res;
-    res.in = executeImpl();
+    res.pipeline = executeImpl();
     return res;
 }
 
 
-BlockInputStreamPtr InterpreterShowAccessQuery::executeImpl() const
+QueryPipeline InterpreterShowAccessQuery::executeImpl() const
 {
     /// Build a create query.
     ASTs queries = getCreateAndGrantQueries();
@@ -43,7 +43,7 @@ BlockInputStreamPtr InterpreterShowAccessQuery::executeImpl() const
     }
 
     String desc = "ACCESS";
-    return std::make_shared<OneBlockInputStream>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}});
+    return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}}));
 }
 
 
diff --git a/src/Interpreters/InterpreterShowAccessQuery.h b/src/Interpreters/InterpreterShowAccessQuery.h
index d08d8962abc..d305af9487f 100644
--- a/src/Interpreters/InterpreterShowAccessQuery.h
+++ b/src/Interpreters/InterpreterShowAccessQuery.h
@@ -23,7 +23,7 @@ public:
     bool ignoreLimits() const override { return true; }
 
 private:
-    BlockInputStreamPtr executeImpl() const;
+    QueryPipeline executeImpl() const;
     ASTs getCreateAndGrantQueries() const;
     std::vector<AccessEntityPtr> getEntities() const;
 
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
index 8115b4a63df..7be7032f48a 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.cpp
@@ -20,11 +20,11 @@
 #include <Access/Role.h>
 #include <Access/SettingsProfile.h>
 #include <Columns/ColumnString.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <DataTypes/DataTypeString.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Core/Defines.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/sort.hpp>
 
 
@@ -241,12 +241,12 @@ InterpreterShowCreateAccessEntityQuery::InterpreterShowCreateAccessEntityQuery(c
 BlockIO InterpreterShowCreateAccessEntityQuery::execute()
 {
     BlockIO res;
-    res.in = executeImpl();
+    res.pipeline = executeImpl();
     return res;
 }
 
 
-BlockInputStreamPtr InterpreterShowCreateAccessEntityQuery::executeImpl()
+QueryPipeline InterpreterShowCreateAccessEntityQuery::executeImpl()
 {
     /// Build a create queries.
     ASTs create_queries = getCreateQueries();
@@ -270,7 +270,7 @@ BlockInputStreamPtr InterpreterShowCreateAccessEntityQuery::executeImpl()
     if (startsWith(desc, prefix))
         desc = desc.substr(prefix.length()); /// `desc` always starts with "SHOW ", so we can trim this prefix.
 
-    return std::make_shared<OneBlockInputStream>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}});
+    return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}}));
 }
 
 
diff --git a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
index 6d026d2b81b..0aedeb18be4 100644
--- a/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
+++ b/src/Interpreters/InterpreterShowCreateAccessEntityQuery.h
@@ -30,7 +30,7 @@ public:
     static ASTPtr getAttachQuery(const IAccessEntity & entity);
 
 private:
-    BlockInputStreamPtr executeImpl();
+    QueryPipeline executeImpl();
     std::vector<AccessEntityPtr> getEntities() const;
     ASTs getCreateQueries() const;
     AccessRightsElements getRequiredAccess() const;
diff --git a/src/Interpreters/InterpreterShowCreateQuery.cpp b/src/Interpreters/InterpreterShowCreateQuery.cpp
index 967d3e7f570..30a417f6fa7 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.cpp
+++ b/src/Interpreters/InterpreterShowCreateQuery.cpp
@@ -1,9 +1,8 @@
 #include <Storages/IStorage.h>
 #include <Parsers/TablePropertiesQueriesASTs.h>
 #include <Parsers/formatAST.h>
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/BlockIO.h>
-#include <DataStreams/copyData.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <QueryPipeline/BlockIO.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
@@ -26,7 +25,7 @@ namespace ErrorCodes
 BlockIO InterpreterShowCreateQuery::execute()
 {
     BlockIO res;
-    res.in = executeImpl();
+    res.pipeline = executeImpl();
     return res;
 }
 
@@ -40,7 +39,7 @@ Block InterpreterShowCreateQuery::getSampleBlock()
 }
 
 
-BlockInputStreamPtr InterpreterShowCreateQuery::executeImpl()
+QueryPipeline InterpreterShowCreateQuery::executeImpl()
 {
     ASTPtr create_query;
     ASTQueryWithTableAndOutput * show_query;
@@ -100,10 +99,10 @@ BlockInputStreamPtr InterpreterShowCreateQuery::executeImpl()
     MutableColumnPtr column = ColumnString::create();
     column->insert(res);
 
-    return std::make_shared<OneBlockInputStream>(Block{{
+    return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{
         std::move(column),
         std::make_shared<DataTypeString>(),
-        "statement"}});
+        "statement"}}));
 }
 
 }
diff --git a/src/Interpreters/InterpreterShowCreateQuery.h b/src/Interpreters/InterpreterShowCreateQuery.h
index 53f587d3e7d..da622de7fc6 100644
--- a/src/Interpreters/InterpreterShowCreateQuery.h
+++ b/src/Interpreters/InterpreterShowCreateQuery.h
@@ -21,7 +21,7 @@ public:
 private:
     ASTPtr query_ptr;
 
-    BlockInputStreamPtr executeImpl();
+    QueryPipeline executeImpl();
 };
 
 
diff --git a/src/Interpreters/InterpreterShowGrantsQuery.cpp b/src/Interpreters/InterpreterShowGrantsQuery.cpp
index f3e554122e1..7302e893cdd 100644
--- a/src/Interpreters/InterpreterShowGrantsQuery.cpp
+++ b/src/Interpreters/InterpreterShowGrantsQuery.cpp
@@ -5,7 +5,7 @@
 #include <Parsers/formatAST.h>
 #include <Interpreters/Context.h>
 #include <Columns/ColumnString.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <DataTypes/DataTypeString.h>
 #include <Access/AccessControlManager.h>
 #include <Access/User.h>
@@ -100,12 +100,12 @@ namespace
 BlockIO InterpreterShowGrantsQuery::execute()
 {
     BlockIO res;
-    res.in = executeImpl();
+    res.pipeline = executeImpl();
     return res;
 }
 
 
-BlockInputStreamPtr InterpreterShowGrantsQuery::executeImpl()
+QueryPipeline InterpreterShowGrantsQuery::executeImpl()
 {
     /// Build a create query.
     ASTs grant_queries = getGrantQueries();
@@ -129,7 +129,7 @@ BlockInputStreamPtr InterpreterShowGrantsQuery::executeImpl()
     if (desc.starts_with(prefix))
         desc = desc.substr(prefix.length()); /// `desc` always starts with "SHOW ", so we can trim this prefix.
 
-    return std::make_shared<OneBlockInputStream>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}});
+    return QueryPipeline(std::make_shared<SourceFromSingleChunk>(Block{{std::move(column), std::make_shared<DataTypeString>(), desc}}));
 }
 
 
diff --git a/src/Interpreters/InterpreterShowGrantsQuery.h b/src/Interpreters/InterpreterShowGrantsQuery.h
index c23aa1e3b94..06bdcf169b1 100644
--- a/src/Interpreters/InterpreterShowGrantsQuery.h
+++ b/src/Interpreters/InterpreterShowGrantsQuery.h
@@ -27,7 +27,7 @@ public:
     bool ignoreLimits() const override { return true; }
 
 private:
-    BlockInputStreamPtr executeImpl();
+    QueryPipeline executeImpl();
     ASTs getGrantQueries() const;
     std::vector<AccessEntityPtr> getEntities() const;
 
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index e1ca021deeb..e34d974fa80 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/ExternalModelsLoader.h>
+#include <Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
 #include <Interpreters/ActionLocksManager.h>
 #include <Interpreters/InterpreterDropQuery.h>
@@ -20,6 +21,8 @@
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/PartLog.h>
 #include <Interpreters/QueryThreadLog.h>
+#include <Interpreters/QueryViewsLog.h>
+#include <Interpreters/SessionLog.h>
 #include <Interpreters/TraceLog.h>
 #include <Interpreters/TextLog.h>
 #include <Interpreters/MetricLog.h>
@@ -37,12 +40,11 @@
 #include <Parsers/ASTSystemQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Common/ThreadFuzzer.h>
 #include <csignal>
 #include <algorithm>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 namespace DB
 {
@@ -276,6 +278,14 @@ BlockIO InterpreterSystemQuery::execute()
             getContext()->checkAccess(AccessType::SYSTEM_DROP_UNCOMPRESSED_CACHE);
             system_context->dropUncompressedCache();
             break;
+        case Type::DROP_INDEX_MARK_CACHE:
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_MARK_CACHE);
+            system_context->dropIndexMarkCache();
+            break;
+        case Type::DROP_INDEX_UNCOMPRESSED_CACHE:
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_UNCOMPRESSED_CACHE);
+            system_context->dropIndexUncompressedCache();
+            break;
         case Type::DROP_MMAP_CACHE:
             getContext()->checkAccess(AccessType::SYSTEM_DROP_MMAP_CACHE);
             system_context->dropMMappedFileCache();
@@ -294,7 +304,6 @@ BlockIO InterpreterSystemQuery::execute()
             auto & external_dictionaries_loader = system_context->getExternalDictionariesLoader();
             external_dictionaries_loader.reloadDictionary(query.table, getContext());
 
-
             ExternalDictionariesLoader::resetAll();
             break;
         }
@@ -324,6 +333,22 @@ BlockIO InterpreterSystemQuery::execute()
             external_models_loader.reloadAllTriedToLoad();
             break;
         }
+        case Type::RELOAD_FUNCTION:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_FUNCTION);
+
+            auto & external_user_defined_executable_functions_loader = system_context->getExternalUserDefinedExecutableFunctionsLoader();
+            external_user_defined_executable_functions_loader.reloadFunction(query.target_function);
+            break;
+        }
+        case Type::RELOAD_FUNCTIONS:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_FUNCTION);
+
+            auto & external_user_defined_executable_functions_loader = system_context->getExternalUserDefinedExecutableFunctionsLoader();
+            external_user_defined_executable_functions_loader.reloadAllTriedToLoad();
+            break;
+        }
         case Type::RELOAD_EMBEDDED_DICTIONARIES:
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_EMBEDDED_DICTIONARIES);
             system_context->getEmbeddedDictionaries().reload();
@@ -336,7 +361,7 @@ BlockIO InterpreterSystemQuery::execute()
         {
 #if defined(__ELF__) && !defined(__FreeBSD__)
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_SYMBOLS);
-            (void)SymbolIndex::instance(true);
+            SymbolIndex::reload();
             break;
 #else
             throw Exception("SYSTEM RELOAD SYMBOLS is not supported on current platform", ErrorCodes::NOT_IMPLEMENTED);
@@ -418,13 +443,21 @@ BlockIO InterpreterSystemQuery::execute()
                 [&] { if (auto metric_log = getContext()->getMetricLog()) metric_log->flush(true); },
                 [&] { if (auto asynchronous_metric_log = getContext()->getAsynchronousMetricLog()) asynchronous_metric_log->flush(true); },
                 [&] { if (auto opentelemetry_span_log = getContext()->getOpenTelemetrySpanLog()) opentelemetry_span_log->flush(true); },
-                [&] { if (auto zookeeper_log = getContext()->getZooKeeperLog()) zookeeper_log->flush(true); }
+                [&] { if (auto query_views_log = getContext()->getQueryViewsLog()) query_views_log->flush(true); },
+                [&] { if (auto zookeeper_log = getContext()->getZooKeeperLog()) zookeeper_log->flush(true); },
+                [&] { if (auto session_log = getContext()->getSessionLog()) session_log->flush(true); }
             );
             break;
         }
         case Type::STOP_LISTEN_QUERIES:
         case Type::START_LISTEN_QUERIES:
-            throw Exception(String(ASTSystemQuery::typeToString(query.type)) + " is not supported yet", ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not supported yet", query.type);
+        case Type::STOP_THREAD_FUZZER:
+            ThreadFuzzer::stop();
+            break;
+        case Type::START_THREAD_FUZZER:
+            ThreadFuzzer::start();
+            break;
         default:
             throw Exception("Unknown type of SYSTEM query", ErrorCodes::BAD_ARGUMENTS);
     }
@@ -719,6 +752,8 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         case Type::DROP_COMPILED_EXPRESSION_CACHE: [[fallthrough]];
 #endif
         case Type::DROP_UNCOMPRESSED_CACHE:
+        case Type::DROP_INDEX_MARK_CACHE:
+        case Type::DROP_INDEX_UNCOMPRESSED_CACHE:
         {
             required_access.emplace_back(AccessType::SYSTEM_DROP_CACHE);
             break;
@@ -736,6 +771,12 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_MODEL);
             break;
         }
+        case Type::RELOAD_FUNCTION: [[fallthrough]];
+        case Type::RELOAD_FUNCTIONS:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_RELOAD_FUNCTION);
+            break;
+        }
         case Type::RELOAD_CONFIG:
         {
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_CONFIG);
@@ -851,6 +892,8 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
         }
         case Type::STOP_LISTEN_QUERIES: break;
         case Type::START_LISTEN_QUERIES: break;
+        case Type::STOP_THREAD_FUZZER: break;
+        case Type::START_THREAD_FUZZER: break;
         case Type::UNKNOWN: break;
         case Type::END: break;
     }
diff --git a/src/Interpreters/InterpreterWatchQuery.cpp b/src/Interpreters/InterpreterWatchQuery.cpp
index edf0f37c00e..e5e447562c6 100644
--- a/src/Interpreters/InterpreterWatchQuery.cpp
+++ b/src/Interpreters/InterpreterWatchQuery.cpp
@@ -15,8 +15,7 @@ limitations under the License. */
 #include <Interpreters/InterpreterWatchQuery.h>
 #include <Interpreters/Context.h>
 #include <Access/AccessFlags.h>
-#include <DataStreams/IBlockInputStream.h>
-#include <DataStreams/StreamLocalLimits.h>
+#include <QueryPipeline/StreamLocalLimits.h>
 
 
 namespace DB
@@ -31,11 +30,17 @@ namespace ErrorCodes
 
 
 BlockIO InterpreterWatchQuery::execute()
+{
+    BlockIO res;
+    res.pipeline = QueryPipelineBuilder::getPipeline(buildQueryPipeline());
+    return res;
+}
+
+QueryPipelineBuilder InterpreterWatchQuery::buildQueryPipeline()
 {
     if (!getContext()->getSettingsRef().allow_experimental_live_view)
         throw Exception("Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')", ErrorCodes::SUPPORT_IS_DISABLED);
 
-    BlockIO res;
     const ASTWatchQuery & query = typeid_cast<const ASTWatchQuery &>(*query_ptr);
     auto table_id = getContext()->resolveStorageID(query, Context::ResolveOrdinary);
 
@@ -71,10 +76,9 @@ BlockIO InterpreterWatchQuery::execute()
     QueryProcessingStage::Enum from_stage = QueryProcessingStage::FetchColumns;
 
     /// Watch storage
-    streams = storage->watch(required_columns, query_info, getContext(), from_stage, max_block_size, max_streams);
+    auto pipe = storage->watch(required_columns, query_info, getContext(), from_stage, max_block_size, max_streams);
 
     /// Constraints on the result, the quota on the result, and also callback for progress.
-    if (IBlockInputStream * stream = dynamic_cast<IBlockInputStream *>(streams[0].get()))
     {
         StreamLocalLimits limits;
         limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
@@ -82,14 +86,13 @@ BlockIO InterpreterWatchQuery::execute()
         limits.size_limits.max_bytes = settings.max_result_bytes;
         limits.size_limits.overflow_mode = settings.result_overflow_mode;
 
-        stream->setLimits(limits);
-        stream->setQuota(getContext()->getQuota());
+        pipe.setLimits(limits);
+        pipe.setQuota(getContext()->getQuota());
     }
 
-    res.in = streams[0];
-
-    return res;
+    QueryPipelineBuilder pipeline;
+    pipeline.init(std::move(pipe));
+    return pipeline;
 }
 
-
 }
diff --git a/src/Interpreters/InterpreterWatchQuery.h b/src/Interpreters/InterpreterWatchQuery.h
index 51eb4a00556..ac167182a71 100644
--- a/src/Interpreters/InterpreterWatchQuery.h
+++ b/src/Interpreters/InterpreterWatchQuery.h
@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License. */
 
 #include <Core/QueryProcessingStage.h>
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Interpreters/IInterpreter.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
@@ -31,14 +31,13 @@ public:
     InterpreterWatchQuery(const ASTPtr & query_ptr_, ContextPtr context_) : WithContext(context_), query_ptr(query_ptr_) {}
 
     BlockIO execute() override;
+    QueryPipelineBuilder buildQueryPipeline();
 
 private:
     ASTPtr query_ptr;
 
     /// Table from where to read data, if not subquery.
     StoragePtr storage;
-    /// Streams of read data
-    BlockInputStreams streams;
 };
 
 }
diff --git a/src/Interpreters/InterserverCredentials.cpp b/src/Interpreters/InterserverCredentials.cpp
index e60d397eb02..b0426976198 100644
--- a/src/Interpreters/InterserverCredentials.cpp
+++ b/src/Interpreters/InterserverCredentials.cpp
@@ -1,5 +1,5 @@
 #include <Interpreters/InterserverCredentials.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/StringUtils/StringUtils.h>
 
 namespace DB
diff --git a/src/Interpreters/InterserverCredentials.h b/src/Interpreters/InterserverCredentials.h
index ffe568868dd..341013ab73a 100644
--- a/src/Interpreters/InterserverCredentials.h
+++ b/src/Interpreters/InterserverCredentials.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <unordered_set>
 
 namespace DB
diff --git a/src/Interpreters/InterserverIOHandler.h b/src/Interpreters/InterserverIOHandler.h
index b0c95ed3835..7ad1c01cbf1 100644
--- a/src/Interpreters/InterserverIOHandler.h
+++ b/src/Interpreters/InterserverIOHandler.h
@@ -7,7 +7,7 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <Common/ActionBlocker.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <atomic>
 #include <map>
diff --git a/src/Interpreters/JIT/CHJIT.cpp b/src/Interpreters/JIT/CHJIT.cpp
index c06b4132309..9eec82b4179 100644
--- a/src/Interpreters/JIT/CHJIT.cpp
+++ b/src/Interpreters/JIT/CHJIT.cpp
@@ -2,6 +2,10 @@
 
 #if USE_EMBEDDED_COMPILER
 
+#include <sys/mman.h>
+
+#include <boost/noncopyable.hpp>
+
 #include <llvm/Analysis/TargetTransformInfo.h>
 #include <llvm/IR/BasicBlock.h>
 #include <llvm/IR/DataLayout.h>
@@ -22,7 +26,10 @@
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <llvm/Support/SmallVectorMemoryBuffer.h>
 
+#include <base/getPageSize.h>
 #include <Common/Exception.h>
+#include <Common/formatReadable.h>
+
 
 namespace DB
 {
@@ -31,6 +38,8 @@ namespace ErrorCodes
 {
     extern const int CANNOT_COMPILE_CODE;
     extern const int LOGICAL_ERROR;
+    extern const int CANNOT_ALLOCATE_MEMORY;
+    extern const int CANNOT_MPROTECT;
 }
 
 /** Simple module to object file compiler.
@@ -80,6 +89,161 @@ private:
     llvm::TargetMachine & target_machine;
 };
 
+/** Arena that allocate all memory with system page_size.
+  * All allocated pages can be protected with protection_flags using protect method.
+  * During destruction all allocated pages protection_flags will be reset.
+  */
+class PageArena : private boost::noncopyable
+{
+public:
+    PageArena() : page_size(::getPageSize()) {}
+
+    char * allocate(size_t size, size_t alignment)
+    {
+        /** First check if in some allocated page blocks there are enough free memory to make allocation.
+          * If there is no such block create it and then allocate from it.
+          */
+
+        for (size_t i = 0; i < page_blocks.size(); ++i)
+        {
+            char * result = tryAllocateFromPageBlockWithIndex(size, alignment, i);
+            if (result)
+                return result;
+        }
+
+        allocateNextPageBlock(size);
+        size_t allocated_page_index = page_blocks.size() - 1;
+        char * result = tryAllocateFromPageBlockWithIndex(size, alignment, allocated_page_index);
+        assert(result);
+
+        return result;
+    }
+
+    inline size_t getAllocatedSize() const { return allocated_size; }
+
+    inline size_t getPageSize() const { return page_size; }
+
+    ~PageArena()
+    {
+        protect(PROT_READ | PROT_WRITE);
+
+        for (auto & page_block : page_blocks)
+            free(page_block.base());
+    }
+
+    void protect(int protection_flags)
+    {
+        /** The code is partially based on the LLVM codebase
+              * The LLVM Project is under the Apache License v2.0 with LLVM Exceptions.
+              */
+
+#    if defined(__NetBSD__) && defined(PROT_MPROTECT)
+        protection_flags |= PROT_MPROTECT(PROT_READ | PROT_WRITE | PROT_EXEC);
+#    endif
+
+        bool invalidate_cache = (protection_flags & PROT_EXEC);
+
+        for (const auto & block : page_blocks)
+        {
+#    if defined(__arm__) || defined(__aarch64__)
+            /// Certain ARM implementations treat icache clear instruction as a memory read,
+            /// and CPU segfaults on trying to clear cache on !PROT_READ page.
+            /// Therefore we need to temporarily add PROT_READ for the sake of flushing the instruction caches.
+            if (invalidate_cache && !(protection_flags & PROT_READ))
+            {
+                int res = mprotect(block.base(), block.blockSize(), protection_flags | PROT_READ);
+                if (res != 0)
+                    throwFromErrno("Cannot mprotect memory region", ErrorCodes::CANNOT_MPROTECT);
+
+                llvm::sys::Memory::InvalidateInstructionCache(block.base(), block.blockSize());
+                invalidate_cache = false;
+            }
+#    endif
+            int res = mprotect(block.base(), block.blockSize(), protection_flags);
+            if (res != 0)
+                throwFromErrno("Cannot mprotect memory region", ErrorCodes::CANNOT_MPROTECT);
+
+            if (invalidate_cache)
+                llvm::sys::Memory::InvalidateInstructionCache(block.base(), block.blockSize());
+        }
+    }
+
+private:
+    struct PageBlock
+    {
+    public:
+        PageBlock(void * pages_base_, size_t pages_size_, size_t page_size_)
+            : pages_base(pages_base_), pages_size(pages_size_), page_size(page_size_)
+        {
+        }
+
+        inline void * base() const { return pages_base; }
+        inline size_t pagesSize() const { return pages_size; }
+        inline size_t pageSize() const { return page_size; }
+        inline size_t blockSize() const { return pages_size * page_size; }
+
+    private:
+        void * pages_base;
+        size_t pages_size;
+        size_t page_size;
+    };
+
+    std::vector<PageBlock> page_blocks;
+
+    std::vector<size_t> page_blocks_allocated_size;
+
+    size_t page_size = 0;
+
+    size_t allocated_size = 0;
+
+    char * tryAllocateFromPageBlockWithIndex(size_t size, size_t alignment, size_t page_block_index)
+    {
+        assert(page_block_index < page_blocks.size());
+        auto & pages_block = page_blocks[page_block_index];
+
+        size_t block_size = pages_block.blockSize();
+        size_t & block_allocated_size = page_blocks_allocated_size[page_block_index];
+        size_t block_free_size = block_size - block_allocated_size;
+
+        uint8_t * pages_start = static_cast<uint8_t *>(pages_block.base());
+        void * pages_offset = pages_start + block_allocated_size;
+
+        auto * result = std::align(alignment, size, pages_offset, block_free_size);
+
+        if (result)
+        {
+            block_allocated_size = reinterpret_cast<uint8_t *>(result) - pages_start;
+            block_allocated_size += size;
+
+            return static_cast<char *>(result);
+        }
+        else
+        {
+            return nullptr;
+        }
+    }
+
+    void allocateNextPageBlock(size_t size)
+    {
+        size_t pages_to_allocate_size = ((size / page_size) + 1) * 2;
+        size_t allocate_size = page_size * pages_to_allocate_size;
+
+        void * buf = nullptr;
+        int res = posix_memalign(&buf, page_size, allocate_size);
+
+        if (res != 0)
+            throwFromErrno(
+                fmt::format("Cannot allocate memory (posix_memalign) alignment {} size {}.", page_size, ReadableSize(allocate_size)),
+                ErrorCodes::CANNOT_ALLOCATE_MEMORY,
+                res);
+
+        page_blocks.emplace_back(buf, pages_to_allocate_size, page_size);
+        page_blocks_allocated_size.emplace_back(0);
+
+        allocated_size += allocate_size;
+    }
+};
+
 // class AssemblyPrinter
 // {
 // public:
@@ -104,46 +268,43 @@ private:
 
 /** MemoryManager for module.
   * Keep total allocated size during RuntimeDyld linker execution.
-  * Actual compiled code memory is stored in llvm::SectionMemoryManager member, we cannot use ZeroBase optimization here
-  * because it is required for llvm::SectionMemoryManager::MemoryMapper to live longer than llvm::SectionMemoryManager.
   */
-class JITModuleMemoryManager
+class JITModuleMemoryManager : public llvm::RTDyldMemoryManager
 {
-    class DefaultMMapper final : public llvm::SectionMemoryManager::MemoryMapper
-    {
-    public:
-        llvm::sys::MemoryBlock allocateMappedMemory(
-            llvm::SectionMemoryManager::AllocationPurpose Purpose [[maybe_unused]],
-            size_t NumBytes,
-            const llvm::sys::MemoryBlock * const NearBlock,
-            unsigned Flags,
-            std::error_code & EC) override
-        {
-            auto allocated_memory_block = llvm::sys::Memory::allocateMappedMemory(NumBytes, NearBlock, Flags, EC);
-            allocated_size += allocated_memory_block.allocatedSize();
-            return allocated_memory_block;
-        }
-
-        std::error_code protectMappedMemory(const llvm::sys::MemoryBlock & Block, unsigned Flags) override
-        {
-            return llvm::sys::Memory::protectMappedMemory(Block, Flags);
-        }
-
-        std::error_code releaseMappedMemory(llvm::sys::MemoryBlock & M) override { return llvm::sys::Memory::releaseMappedMemory(M); }
-
-        size_t allocated_size = 0;
-    };
-
 public:
-    JITModuleMemoryManager() : manager(&mmaper) { }
 
-    inline size_t getAllocatedSize() const { return mmaper.allocated_size; }
+    uint8_t * allocateCodeSection(uintptr_t size, unsigned alignment, unsigned, llvm::StringRef) override
+    {
+        return reinterpret_cast<uint8_t *>(ex_page_arena.allocate(size, alignment));
+    }
 
-    inline llvm::SectionMemoryManager & getManager() { return manager; }
+    uint8_t * allocateDataSection(uintptr_t size, unsigned alignment, unsigned, llvm::StringRef, bool is_read_only) override
+    {
+        if (is_read_only)
+            return reinterpret_cast<uint8_t *>(ro_page_arena.allocate(size, alignment));
+        else
+            return reinterpret_cast<uint8_t *>(rw_page_arena.allocate(size, alignment));
+    }
+
+    bool finalizeMemory(std::string *) override
+    {
+        ro_page_arena.protect(PROT_READ);
+        ex_page_arena.protect(PROT_READ | PROT_EXEC);
+        return true;
+    }
+
+    inline size_t allocatedSize() const
+    {
+        size_t data_size = rw_page_arena.getAllocatedSize() + ro_page_arena.getAllocatedSize();
+        size_t code_size = ex_page_arena.getAllocatedSize();
+
+        return data_size + code_size;
+    }
 
 private:
-    DefaultMMapper mmaper;
-    llvm::SectionMemoryManager manager;
+    PageArena rw_page_arena;
+    PageArena ro_page_arena;
+    PageArena ex_page_arena;
 };
 
 class JITSymbolResolver : public llvm::LegacyJITSymbolResolver
@@ -249,12 +410,12 @@ CHJIT::CompiledModule CHJIT::compileModule(std::unique_ptr<llvm::Module> module)
     }
 
     std::unique_ptr<JITModuleMemoryManager> module_memory_manager = std::make_unique<JITModuleMemoryManager>();
-    llvm::RuntimeDyld dynamic_linker = {module_memory_manager->getManager(), *symbol_resolver};
+    llvm::RuntimeDyld dynamic_linker = {*module_memory_manager, *symbol_resolver};
 
     std::unique_ptr<llvm::RuntimeDyld::LoadedObjectInfo> linked_object = dynamic_linker.loadObject(*object.get());
 
     dynamic_linker.resolveRelocations();
-    module_memory_manager->getManager().finalizeMemory();
+    module_memory_manager->finalizeMemory(nullptr);
 
     CompiledModule compiled_module;
 
@@ -275,7 +436,7 @@ CHJIT::CompiledModule CHJIT::compileModule(std::unique_ptr<llvm::Module> module)
         compiled_module.function_name_to_symbol.emplace(std::move(function_name), jit_symbol_address);
     }
 
-    compiled_module.size = module_memory_manager->getAllocatedSize();
+    compiled_module.size = module_memory_manager->allocatedSize();
     compiled_module.identifier = current_module_key;
 
     module_identifier_to_memory_manager[current_module_key] = std::move(module_memory_manager);
diff --git a/src/Interpreters/JIT/CHJIT.h b/src/Interpreters/JIT/CHJIT.h
index 0a553be6bb3..58da0fcffcc 100644
--- a/src/Interpreters/JIT/CHJIT.h
+++ b/src/Interpreters/JIT/CHJIT.h
@@ -1,17 +1,15 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 
 #include <unordered_map>
 #include <atomic>
 
-#include <llvm/IR/LLVMContext.h> // Y_IGNORE
-#include <llvm/IR/Module.h> // Y_IGNORE
-#include <llvm/Target/TargetMachine.h> // Y_IGNORE
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
+#include <llvm/Target/TargetMachine.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/JIT/CompileDAG.h b/src/Interpreters/JIT/CompileDAG.h
index ee9cc5cc83a..84bfc738cfc 100644
--- a/src/Interpreters/JIT/CompileDAG.h
+++ b/src/Interpreters/JIT/CompileDAG.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 
diff --git a/src/Interpreters/JIT/CompiledExpressionCache.cpp b/src/Interpreters/JIT/CompiledExpressionCache.cpp
index 98f4eec982d..674e02236f5 100644
--- a/src/Interpreters/JIT/CompiledExpressionCache.cpp
+++ b/src/Interpreters/JIT/CompiledExpressionCache.cpp
@@ -16,12 +16,12 @@ CompiledExpressionCacheFactory & CompiledExpressionCacheFactory::instance()
     return factory;
 }
 
-void CompiledExpressionCacheFactory::init(size_t cache_size)
+void CompiledExpressionCacheFactory::init(size_t cache_size_in_bytes, size_t cache_size_in_elements)
 {
     if (cache)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "CompiledExpressionCache was already initialized");
 
-    cache = std::make_unique<CompiledExpressionCache>(cache_size);
+    cache = std::make_unique<CompiledExpressionCache>(cache_size_in_bytes, cache_size_in_elements);
 }
 
 CompiledExpressionCache * CompiledExpressionCacheFactory::tryGetCache()
diff --git a/src/Interpreters/JIT/CompiledExpressionCache.h b/src/Interpreters/JIT/CompiledExpressionCache.h
index 5182a77d77a..936b5798280 100644
--- a/src/Interpreters/JIT/CompiledExpressionCache.h
+++ b/src/Interpreters/JIT/CompiledExpressionCache.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 #    include <Common/LRUCache.h>
@@ -52,7 +50,7 @@ private:
 public:
     static CompiledExpressionCacheFactory & instance();
 
-    void init(size_t cache_size);
+    void init(size_t cache_size_in_bytes, size_t cache_size_in_elements);
     CompiledExpressionCache * tryGetCache();
 };
 
diff --git a/src/Interpreters/JIT/compileFunction.cpp b/src/Interpreters/JIT/compileFunction.cpp
index 03ef0500757..aaf722b505e 100644
--- a/src/Interpreters/JIT/compileFunction.cpp
+++ b/src/Interpreters/JIT/compileFunction.cpp
@@ -143,8 +143,6 @@ static void compileFunction(llvm::Module & module, const IFunctionBase & functio
      * }
      */
 
-    ProfileEvents::increment(ProfileEvents::CompileFunction);
-
     const auto & arg_types = function.getArgumentTypes();
 
     llvm::IRBuilder<> b(module.getContext());
@@ -436,6 +434,133 @@ static void compileAddIntoAggregateStatesFunctions(llvm::Module & module, const
     b.CreateRetVoid();
 }
 
+static void compileAddIntoAggregateStatesFunctionsSinglePlace(llvm::Module & module, const std::vector<AggregateFunctionWithOffset> & functions, const std::string & name)
+{
+    auto & context = module.getContext();
+    llvm::IRBuilder<> b(context);
+
+    auto * size_type = b.getIntNTy(sizeof(size_t) * 8);
+    auto * places_type = b.getInt8Ty()->getPointerTo();
+    auto * column_data_type = llvm::StructType::get(b.getInt8PtrTy(), b.getInt8PtrTy());
+
+    auto * aggregate_loop_func_declaration = llvm::FunctionType::get(b.getVoidTy(), { size_type, column_data_type->getPointerTo(), places_type }, false);
+    auto * aggregate_loop_func_definition = llvm::Function::Create(aggregate_loop_func_declaration, llvm::Function::ExternalLinkage, name, module);
+
+    auto * arguments = aggregate_loop_func_definition->args().begin();
+    llvm::Value * rows_count_arg = arguments++;
+    llvm::Value * columns_arg = arguments++;
+    llvm::Value * place_arg = arguments++;
+
+    /// Initialize ColumnDataPlaceholder llvm representation of ColumnData
+
+    auto * entry = llvm::BasicBlock::Create(b.getContext(), "entry", aggregate_loop_func_definition);
+    b.SetInsertPoint(entry);
+
+    std::vector<ColumnDataPlaceholder> columns;
+    size_t previous_columns_size = 0;
+
+    for (const auto & function : functions)
+    {
+        auto argument_types = function.function->getArgumentTypes();
+
+        ColumnDataPlaceholder data_placeholder;
+
+        size_t function_arguments_size = argument_types.size();
+
+        for (size_t column_argument_index = 0; column_argument_index < function_arguments_size; ++column_argument_index)
+        {
+            const auto & argument_type = argument_types[column_argument_index];
+            auto * data = b.CreateLoad(column_data_type, b.CreateConstInBoundsGEP1_64(column_data_type, columns_arg, previous_columns_size + column_argument_index));
+            data_placeholder.data_init = b.CreatePointerCast(b.CreateExtractValue(data, {0}), toNativeType(b, removeNullable(argument_type))->getPointerTo());
+            data_placeholder.null_init = argument_type->isNullable() ? b.CreateExtractValue(data, {1}) : nullptr;
+            columns.emplace_back(data_placeholder);
+        }
+
+        previous_columns_size += function_arguments_size;
+    }
+
+    /// Initialize loop
+
+    auto * end = llvm::BasicBlock::Create(b.getContext(), "end", aggregate_loop_func_definition);
+    auto * loop = llvm::BasicBlock::Create(b.getContext(), "loop", aggregate_loop_func_definition);
+
+    b.CreateCondBr(b.CreateICmpEQ(rows_count_arg, llvm::ConstantInt::get(size_type, 0)), end, loop);
+
+    b.SetInsertPoint(loop);
+
+    auto * counter_phi = b.CreatePHI(rows_count_arg->getType(), 2);
+    counter_phi->addIncoming(llvm::ConstantInt::get(size_type, 0), entry);
+
+    for (auto & col : columns)
+    {
+        col.data = b.CreatePHI(col.data_init->getType(), 2);
+        col.data->addIncoming(col.data_init, entry);
+
+        if (col.null_init)
+        {
+            col.null = b.CreatePHI(col.null_init->getType(), 2);
+            col.null->addIncoming(col.null_init, entry);
+        }
+    }
+
+    previous_columns_size = 0;
+    for (const auto & function : functions)
+    {
+        size_t aggregate_function_offset = function.aggregate_data_offset;
+        const auto * aggregate_function_ptr = function.function;
+
+        auto arguments_types = function.function->getArgumentTypes();
+        std::vector<llvm::Value *> arguments_values;
+
+        size_t function_arguments_size = arguments_types.size();
+        arguments_values.resize(function_arguments_size);
+
+        for (size_t column_argument_index = 0; column_argument_index < function_arguments_size; ++column_argument_index)
+        {
+            auto * column_argument_data = columns[previous_columns_size + column_argument_index].data;
+            auto * column_argument_null_data = columns[previous_columns_size + column_argument_index].null;
+
+            auto & argument_type = arguments_types[column_argument_index];
+
+            auto * value = b.CreateLoad(toNativeType(b, removeNullable(argument_type)), column_argument_data);
+            if (!argument_type->isNullable())
+            {
+                arguments_values[column_argument_index] = value;
+                continue;
+            }
+
+            auto * is_null = b.CreateICmpNE(b.CreateLoad(b.getInt8Ty(), column_argument_null_data), b.getInt8(0));
+            auto * nullable_unitilized = llvm::Constant::getNullValue(toNativeType(b, argument_type));
+            auto * nullable_value = b.CreateInsertValue(b.CreateInsertValue(nullable_unitilized, value, {0}), is_null, {1});
+            arguments_values[column_argument_index] = nullable_value;
+        }
+
+        auto * aggregation_place_with_offset = b.CreateConstInBoundsGEP1_64(nullptr, place_arg, aggregate_function_offset);
+        aggregate_function_ptr->compileAdd(b, aggregation_place_with_offset, arguments_types, arguments_values);
+
+        previous_columns_size += function_arguments_size;
+    }
+
+    /// End of loop
+
+    auto * cur_block = b.GetInsertBlock();
+    for (auto & col : columns)
+    {
+        col.data->addIncoming(b.CreateConstInBoundsGEP1_64(nullptr, col.data, 1), cur_block);
+
+        if (col.null)
+            col.null->addIncoming(b.CreateConstInBoundsGEP1_64(nullptr, col.null, 1), cur_block);
+    }
+
+    auto * value = b.CreateAdd(counter_phi, llvm::ConstantInt::get(size_type, 1));
+    counter_phi->addIncoming(value, cur_block);
+
+    b.CreateCondBr(b.CreateICmpEQ(value, rows_count_arg), end, loop);
+
+    b.SetInsertPoint(end);
+    b.CreateRetVoid();
+}
+
 static void compileMergeAggregatesStates(llvm::Module & module, const std::vector<AggregateFunctionWithOffset> & functions, const std::string & name)
 {
     auto & context = module.getContext();
@@ -569,6 +694,7 @@ CompiledAggregateFunctions compileAggregateFunctions(CHJIT & jit, const std::vec
 
     std::string create_aggregate_states_functions_name = functions_dump_name + "_create";
     std::string add_aggregate_states_functions_name = functions_dump_name + "_add";
+    std::string add_aggregate_states_functions_name_single_place = functions_dump_name + "_add_single_place";
     std::string merge_aggregate_states_functions_name = functions_dump_name + "_merge";
     std::string insert_aggregate_states_functions_name = functions_dump_name + "_insert";
 
@@ -576,17 +702,20 @@ CompiledAggregateFunctions compileAggregateFunctions(CHJIT & jit, const std::vec
     {
         compileCreateAggregateStatesFunctions(module, functions, create_aggregate_states_functions_name);
         compileAddIntoAggregateStatesFunctions(module, functions, add_aggregate_states_functions_name);
+        compileAddIntoAggregateStatesFunctionsSinglePlace(module, functions, add_aggregate_states_functions_name_single_place);
         compileMergeAggregatesStates(module, functions, merge_aggregate_states_functions_name);
         compileInsertAggregatesIntoResultColumns(module, functions, insert_aggregate_states_functions_name);
     });
 
     auto create_aggregate_states_function = reinterpret_cast<JITCreateAggregateStatesFunction>(compiled_module.function_name_to_symbol[create_aggregate_states_functions_name]);
     auto add_into_aggregate_states_function = reinterpret_cast<JITAddIntoAggregateStatesFunction>(compiled_module.function_name_to_symbol[add_aggregate_states_functions_name]);
+    auto add_into_aggregate_states_function_single_place = reinterpret_cast<JITAddIntoAggregateStatesFunctionSinglePlace>(compiled_module.function_name_to_symbol[add_aggregate_states_functions_name_single_place]);
     auto merge_aggregate_states_function = reinterpret_cast<JITMergeAggregateStatesFunction>(compiled_module.function_name_to_symbol[merge_aggregate_states_functions_name]);
     auto insert_aggregate_states_function = reinterpret_cast<JITInsertAggregateStatesIntoColumnsFunction>(compiled_module.function_name_to_symbol[insert_aggregate_states_functions_name]);
 
     assert(create_aggregate_states_function);
     assert(add_into_aggregate_states_function);
+    assert(add_into_aggregate_states_function_single_place);
     assert(merge_aggregate_states_function);
     assert(insert_aggregate_states_function);
 
@@ -598,6 +727,7 @@ CompiledAggregateFunctions compileAggregateFunctions(CHJIT & jit, const std::vec
     {
         .create_aggregate_states_function = create_aggregate_states_function,
         .add_into_aggregate_states_function = add_into_aggregate_states_function,
+        .add_into_aggregate_states_function_single_place = add_into_aggregate_states_function_single_place,
         .merge_aggregate_states_function = merge_aggregate_states_function,
         .insert_aggregates_into_columns_function = insert_aggregate_states_function,
 
diff --git a/src/Interpreters/JIT/compileFunction.h b/src/Interpreters/JIT/compileFunction.h
index 1cf15e15201..e35ea49291c 100644
--- a/src/Interpreters/JIT/compileFunction.h
+++ b/src/Interpreters/JIT/compileFunction.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 
@@ -54,6 +52,7 @@ struct AggregateFunctionWithOffset
 
 using JITCreateAggregateStatesFunction = void (*)(AggregateDataPtr);
 using JITAddIntoAggregateStatesFunction = void (*)(ColumnDataRowsSize, ColumnData *, AggregateDataPtr *);
+using JITAddIntoAggregateStatesFunctionSinglePlace = void (*)(ColumnDataRowsSize, ColumnData *, AggregateDataPtr);
 using JITMergeAggregateStatesFunction = void (*)(AggregateDataPtr, AggregateDataPtr);
 using JITInsertAggregateStatesIntoColumnsFunction = void (*)(ColumnDataRowsSize, ColumnData *, AggregateDataPtr *);
 
@@ -61,6 +60,8 @@ struct CompiledAggregateFunctions
 {
     JITCreateAggregateStatesFunction create_aggregate_states_function;
     JITAddIntoAggregateStatesFunction add_into_aggregate_states_function;
+    JITAddIntoAggregateStatesFunctionSinglePlace add_into_aggregate_states_function_single_place;
+
     JITMergeAggregateStatesFunction merge_aggregate_states_function;
     JITInsertAggregateStatesIntoColumnsFunction insert_aggregates_into_columns_function;
 
@@ -75,6 +76,7 @@ struct CompiledAggregateFunctions
   *
   * JITCreateAggregateStatesFunction will initialize aggregate data ptr with initial aggregate states values.
   * JITAddIntoAggregateStatesFunction will update aggregate states for aggregate functions with specified ColumnData.
+  * JITAddIntoAggregateStatesFunctionSinglePlace will update single aggregate state for aggregate functions with specified ColumnData.
   * JITMergeAggregateStatesFunction will merge aggregate states for aggregate functions.
   * JITInsertAggregateStatesIntoColumnsFunction will insert aggregate states for aggregate functions into result columns.
   */
diff --git a/src/Interpreters/JoinSwitcher.h b/src/Interpreters/JoinSwitcher.h
index a89ac6d5d98..30115710e22 100644
--- a/src/Interpreters/JoinSwitcher.h
+++ b/src/Interpreters/JoinSwitcher.h
@@ -5,7 +5,6 @@
 #include <Core/Block.h>
 #include <Interpreters/IJoin.h>
 #include <Interpreters/TableJoin.h>
-#include <DataStreams/IBlockInputStream.h>
 
 
 namespace DB
@@ -26,6 +25,11 @@ public:
     /// @returns false, if join-on-disk disk limit exceeded
     bool addJoinedBlock(const Block & block, bool check_limits) override;
 
+    void checkTypesOfKeys(const Block & block) const override
+    {
+        join->checkTypesOfKeys(block);
+    }
+
     void joinBlock(Block & block, std::shared_ptr<ExtraBlock> & not_processed) override
     {
         join->joinBlock(block, not_processed);
@@ -56,9 +60,10 @@ public:
         return join->alwaysReturnsEmptySet();
     }
 
-    BlockInputStreamPtr createStreamWithNonJoinedRows(const Block & block, UInt64 max_block_size) const override
+    std::shared_ptr<NotJoinedBlocks>
+    getNonJoinedBlocks(const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const override
     {
-        return join->createStreamWithNonJoinedRows(block, max_block_size);
+        return join->getNonJoinedBlocks(left_sample_block, result_sample_block, max_block_size);
     }
 
 private:
@@ -74,38 +79,4 @@ private:
     void switchJoin();
 };
 
-
-/// Creates NonJoinedBlockInputStream on the first read. Allows to swap join algo before it.
-class LazyNonJoinedBlockInputStream : public IBlockInputStream
-{
-public:
-    LazyNonJoinedBlockInputStream(const IJoin & join_, const Block & block, UInt64 max_block_size_)
-        : join(join_)
-        , result_sample_block(block)
-        , max_block_size(max_block_size_)
-    {}
-
-    String getName() const override { return "LazyNonMergeJoined"; }
-    Block getHeader() const override { return result_sample_block; }
-
-protected:
-    Block readImpl() override
-    {
-        if (!stream)
-        {
-            stream = join.createStreamWithNonJoinedRows(result_sample_block, max_block_size);
-            if (!stream)
-                return {};
-        }
-
-        return stream->read();
-    }
-
-private:
-    BlockInputStreamPtr stream;
-    const IJoin & join;
-    Block result_sample_block;
-    UInt64 max_block_size;
-};
-
 }
diff --git a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
index eabdeaefc04..ed20b1b2048 100644
--- a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
+++ b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
@@ -18,7 +18,7 @@
 #include <Parsers/parseQuery.h>
 #include <IO/WriteHelpers.h>
 #include <Core/Defines.h>
-
+#include <Common/StringUtils/StringUtils.h>
 
 namespace DB
 {
@@ -222,7 +222,7 @@ bool needRewrite(ASTSelectQuery & select, std::vector<const ASTTableExpression *
         }
 
         const auto & join = table->table_join->as<ASTTableJoin &>();
-        if (isComma(join.kind))
+        if (join.kind == ASTTableJoin::Kind::Comma)
             throw Exception("COMMA to CROSS JOIN rewriter is not enabled or cannot rewrite query", ErrorCodes::NOT_IMPLEMENTED);
 
         if (join.using_expression_list)
@@ -524,7 +524,8 @@ std::vector<TableNeededColumns> normalizeColumnNamesExtractNeeded(
 
                 size_t count = countTablesWithColumn(tables, short_name);
 
-                if (count > 1 || aliases.count(short_name))
+                /// isValidIdentifierBegin retuired to be consistent with TableJoin::deduplicateAndQualifyColumnNames
+                if (count > 1 || aliases.count(short_name) || !isValidIdentifierBegin(short_name.at(0)))
                 {
                     const auto & table = tables[*table_pos];
                     IdentifierSemantic::setColumnLongName(*ident, table.table); /// table.column -> table_alias.column
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index 099fb5c2f44..3aae3982758 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -128,7 +128,7 @@ private:
             /// Table has an alias. We do not need to rewrite qualified names with table alias (match == ColumnMatch::TableName).
             auto match = IdentifierSemantic::canReferColumnToTable(identifier, table);
             if (match == IdentifierSemantic::ColumnMatch::AliasedTableName ||
-                match == IdentifierSemantic::ColumnMatch::DbAndTable)
+                match == IdentifierSemantic::ColumnMatch::DBAndTable)
             {
                 if (rewritten)
                     throw Exception("Failed to rewrite distributed table names. Ambiguous column '" + identifier.name() + "'",
@@ -299,16 +299,17 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
     if (table_to_join.database_and_table_name)
     {
         auto joined_table_id = context->resolveStorageID(table_to_join.database_and_table_name);
-        StoragePtr table = DatabaseCatalog::instance().tryGetTable(joined_table_id, context);
-        if (table)
+        StoragePtr storage = DatabaseCatalog::instance().tryGetTable(joined_table_id, context);
+        if (storage)
         {
-            if (dynamic_cast<StorageJoin *>(table.get()) ||
-                dynamic_cast<StorageDictionary *>(table.get()))
-                table_join->joined_storage = table;
+            if (auto storage_join = std::dynamic_pointer_cast<StorageJoin>(storage); storage_join)
+                table_join->setStorageJoin(storage_join);
+            else if (auto storage_dict = std::dynamic_pointer_cast<StorageDictionary>(storage); storage_dict)
+                table_join->setStorageJoin(storage_dict);
         }
     }
 
-    if (!table_join->joined_storage &&
+    if (!table_join->isSpecialStorage() &&
         settings.enable_optimize_predicate_expression)
         replaceJoinedTable(select_query);
 
diff --git a/src/Interpreters/Lemmatizers.cpp b/src/Interpreters/Lemmatizers.cpp
index 38cd4c33678..72f0161b8fd 100644
--- a/src/Interpreters/Lemmatizers.cpp
+++ b/src/Interpreters/Lemmatizers.cpp
@@ -1,7 +1,4 @@
-
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
diff --git a/src/Interpreters/Lemmatizers.h b/src/Interpreters/Lemmatizers.h
index 6682afaa415..936c796bd74 100644
--- a/src/Interpreters/Lemmatizers.h
+++ b/src/Interpreters/Lemmatizers.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Util/Application.h>
 
 #include <mutex>
diff --git a/src/Interpreters/LogicalExpressionsOptimizer.cpp b/src/Interpreters/LogicalExpressionsOptimizer.cpp
index c0d5a16fa65..936ed0149d2 100644
--- a/src/Interpreters/LogicalExpressionsOptimizer.cpp
+++ b/src/Interpreters/LogicalExpressionsOptimizer.cpp
@@ -225,22 +225,19 @@ void LogicalExpressionsOptimizer::addInExpression(const DisjunctiveEqualityChain
 
     /// 1. Create a new IN expression based on information from the OR-chain.
 
-    /// Construct a list of literals `x1, ..., xN` from the string `expr = x1 OR ... OR expr = xN`
-    ASTPtr value_list = std::make_shared<ASTExpressionList>();
+    /// Construct a tuple of literals `x1, ..., xN` from the string `expr = x1 OR ... OR expr = xN`
+
+    Tuple tuple;
+    tuple.reserve(equality_functions.size());
+
     for (const auto * function : equality_functions)
     {
         const auto & operands = getFunctionOperands(function);
-        value_list->children.push_back(operands[1]);
+        tuple.push_back(operands[1]->as<ASTLiteral>()->value);
     }
 
     /// Sort the literals so that they are specified in the same order in the IN expression.
-    /// Otherwise, they would be specified in the order of the ASTLiteral addresses, which is nondeterministic.
-    std::sort(value_list->children.begin(), value_list->children.end(), [](const DB::ASTPtr & lhs, const DB::ASTPtr & rhs)
-    {
-        const auto * val_lhs = lhs->as<ASTLiteral>();
-        const auto * val_rhs = rhs->as<ASTLiteral>();
-        return val_lhs->value < val_rhs->value;
-    });
+    std::sort(tuple.begin(), tuple.end());
 
     /// Get the expression `expr` from the chain `expr = x1 OR ... OR expr = xN`
     ASTPtr equals_expr_lhs;
@@ -250,14 +247,11 @@ void LogicalExpressionsOptimizer::addInExpression(const DisjunctiveEqualityChain
         equals_expr_lhs = operands[0];
     }
 
-    auto tuple_function = std::make_shared<ASTFunction>();
-    tuple_function->name = "tuple";
-    tuple_function->arguments = value_list;
-    tuple_function->children.push_back(tuple_function->arguments);
+    auto tuple_literal = std::make_shared<ASTLiteral>(std::move(tuple));
 
     ASTPtr expression_list = std::make_shared<ASTExpressionList>();
     expression_list->children.push_back(equals_expr_lhs);
-    expression_list->children.push_back(tuple_function);
+    expression_list->children.push_back(tuple_literal);
 
     /// Construct the expression `expr IN (x1, ..., xN)`
     auto in_function = std::make_shared<ASTFunction>();
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index b93a94b4215..7fb9f1a3ceb 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -1,10 +1,10 @@
 #include <limits>
 
 #include <Columns/ColumnNullable.h>
-#include <Core/NamesAndTypes.h>
+#include <Columns/ColumnLowCardinality.h>
+
 #include <Core/SortCursor.h>
-#include <DataStreams/TemporaryFileStream.h>
-#include <DataStreams/materializeBlock.h>
+#include <Formats/TemporaryFileStream.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/MergeJoin.h>
@@ -12,9 +12,9 @@
 #include <Interpreters/join_common.h>
 #include <Interpreters/sortBlock.h>
 #include <Processors/Sources/BlocksListSource.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/MergeSortingTransform.h>
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 
 
 namespace DB
@@ -506,7 +506,11 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
                             ErrorCodes::PARAMETER_OUT_OF_BOUND);
     }
 
-    std::tie(mask_column_name_left, mask_column_name_right) = table_join->joinConditionColumnNames();
+    if (!table_join->oneDisjunct())
+        throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "MergeJoin does not support OR in JOIN ON section");
+
+    const auto & onexpr = table_join->getOnlyClause();
+    std::tie(mask_column_name_left, mask_column_name_right) = onexpr.condColumnNames();
 
     /// Add auxiliary joining keys to join only rows where conditions from JOIN ON sections holds
     /// Input boolean column converted to nullable and only rows with non NULLS value will be joined
@@ -518,8 +522,8 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
         key_names_right.push_back(deriveTempName(mask_column_name_right));
     }
 
-    key_names_left.insert(key_names_left.end(), table_join->keyNamesLeft().begin(), table_join->keyNamesLeft().end());
-    key_names_right.insert(key_names_right.end(), table_join->keyNamesRight().begin(), table_join->keyNamesRight().end());
+    key_names_left.insert(key_names_left.end(), onexpr.key_names_left.begin(), onexpr.key_names_left.end());
+    key_names_right.insert(key_names_right.end(), onexpr.key_names_right.begin(), onexpr.key_names_right.end());
 
     addConditionJoinColumn(right_sample_block, JoinTableSide::Right);
     JoinCommon::splitAdditionalColumns(key_names_right, right_sample_block, right_table_keys, right_columns_to_add);
@@ -579,16 +583,18 @@ void MergeJoin::mergeInMemoryRightBlocks()
     Pipe source(std::make_shared<BlocksListSource>(std::move(right_blocks.blocks)));
     right_blocks.clear();
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(source));
+    QueryPipelineBuilder builder;
+    builder.init(std::move(source));
 
     /// TODO: there should be no split keys by blocks for RIGHT|FULL JOIN
-    pipeline.addTransform(std::make_shared<MergeSortingTransform>(
-        pipeline.getHeader(), right_sort_description, max_rows_in_right_block, 0, 0, 0, 0, nullptr, 0));
+    builder.addTransform(std::make_shared<MergeSortingTransform>(
+        builder.getHeader(), right_sort_description, max_rows_in_right_block, 0, 0, 0, 0, nullptr, 0));
 
-    auto sorted_input = PipelineExecutingBlockInputStream(std::move(pipeline));
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+    PullingPipelineExecutor executor(pipeline);
 
-    while (Block block = sorted_input.read())
+    Block block;
+    while (executor.pull(block))
     {
         if (!block.rows())
             continue;
@@ -652,7 +658,7 @@ bool MergeJoin::saveRightBlock(Block && block)
 Block MergeJoin::modifyRightBlock(const Block & src_block) const
 {
     Block block = materializeBlock(src_block);
-    JoinCommon::removeLowCardinalityInplace(block, table_join->keyNamesRight());
+    JoinCommon::removeLowCardinalityInplace(block, table_join->getOnlyClause().key_names_right);
     return block;
 }
 
@@ -665,16 +671,25 @@ bool MergeJoin::addJoinedBlock(const Block & src_block, bool)
     return saveRightBlock(std::move(block));
 }
 
+void MergeJoin::checkTypesOfKeys(const Block & block) const
+{
+    /// Do not check auxailary column for extra conditions, use original key names
+    const auto & onexpr = table_join->getOnlyClause();
+    JoinCommon::checkTypesOfKeys(block, onexpr.key_names_left, right_table_keys, onexpr.key_names_right);
+}
+
 void MergeJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
 {
     Names lowcard_keys = lowcard_right_keys;
     if (block)
     {
+        /// We need to check type of masks before `addConditionJoinColumn`, because it assumes that types is correct
         JoinCommon::checkTypesOfMasks(block, mask_column_name_left, right_sample_block, mask_column_name_right);
 
         /// Add auxiliary column, will be removed after joining
         addConditionJoinColumn(block, JoinTableSide::Left);
 
+        /// Types of keys can be checked only after `checkTypesOfKeys`
         JoinCommon::checkTypesOfKeys(block, key_names_left, right_table_keys, key_names_right);
 
         materializeBlockInplace(block);
@@ -723,15 +738,7 @@ void MergeJoin::joinBlock(Block & block, ExtraBlockPtr & not_processed)
     if (needConditionJoinColumn())
         block.erase(deriveTempName(mask_column_name_left));
 
-    for (const auto & column_name : lowcard_keys)
-    {
-        if (!block.has(column_name))
-            continue;
-        if (auto & col = block.getByName(column_name); !col.type->lowCardinality())
-            JoinCommon::changeLowCardinalityInplace(col);
-    }
-
-    JoinCommon::restoreLowCardinalityInplace(block);
+    JoinCommon::restoreLowCardinalityInplace(block, lowcard_keys);
 }
 
 template <bool in_memory, bool is_all>
@@ -1035,56 +1042,16 @@ void MergeJoin::initRightTableWriter()
 }
 
 /// Stream from not joined earlier rows of the right table.
-class NonMergeJoinedBlockInputStream : private NotJoined, public IBlockInputStream
+class NotJoinedMerge final : public NotJoinedBlocks::RightColumnsFiller
 {
 public:
-    NonMergeJoinedBlockInputStream(const MergeJoin & parent_,
-                                   const Block & result_sample_block_,
-                                   const Names & key_names_right_,
-                                   UInt64 max_block_size_)
-        : NotJoined(*parent_.table_join,
-                    parent_.modifyRightBlock(parent_.right_sample_block),
-                    parent_.right_sample_block,
-                    result_sample_block_,
-                    {}, key_names_right_)
-        , parent(parent_)
-        , max_block_size(max_block_size_)
+    NotJoinedMerge(const MergeJoin & parent_, UInt64 max_block_size_)
+        : parent(parent_), max_block_size(max_block_size_)
     {}
 
-    String getName() const override { return "NonMergeJoined"; }
-    Block getHeader() const override { return result_sample_block; }
+    Block getEmptyBlock() override { return parent.modifyRightBlock(parent.right_sample_block).cloneEmpty(); }
 
-protected:
-    Block readImpl() override
-    {
-        if (parent.getRightBlocksCount())
-            return createBlock();
-        return {};
-    }
-
-private:
-    const MergeJoin & parent;
-    size_t max_block_size;
-    size_t block_number = 0;
-
-    Block createBlock()
-    {
-        MutableColumns columns_right = saved_block_sample.cloneEmptyColumns();
-
-        size_t rows_added = fillColumns(columns_right);
-        if (!rows_added)
-            return {};
-
-        correctLowcardAndNullability(columns_right);
-
-        Block res = result_sample_block.cloneEmpty();
-        addLeftColumns(res, rows_added);
-        addRightColumns(res, columns_right);
-        copySameKeys(res);
-        return res;
-    }
-
-    size_t fillColumns(MutableColumns & columns_right)
+    size_t fillColumns(MutableColumns & columns_right) override
     {
         const RowBitmaps & bitmaps = *parent.used_rows_bitmap;
         size_t rows_added = 0;
@@ -1128,14 +1095,25 @@ private:
 
         return rows_added;
     }
+
+private:
+    const MergeJoin & parent;
+    size_t max_block_size;
+    size_t block_number = 0;
 };
 
 
-BlockInputStreamPtr MergeJoin::createStreamWithNonJoinedRows(const Block & result_sample_block, UInt64 max_block_size) const
+std::shared_ptr<NotJoinedBlocks> MergeJoin::getNonJoinedBlocks(
+    const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const
 {
     if (table_join->strictness() == ASTTableJoin::Strictness::All && (is_right || is_full))
-        return std::make_shared<NonMergeJoinedBlockInputStream>(*this, result_sample_block, key_names_right, max_block_size);
-    return {};
+    {
+        size_t left_columns_count = left_sample_block.columns();
+        assert(left_columns_count == result_sample_block.columns() - right_columns_to_add.columns());
+        auto non_joined = std::make_unique<NotJoinedMerge>(*this, max_block_size);
+        return std::make_shared<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, table_join->leftToRightKeyRemap());
+    }
+    return nullptr;
 }
 
 bool MergeJoin::needConditionJoinColumn() const
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index 844c730de4f..0e2e771255d 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -7,7 +7,7 @@
 #include <Core/SortDescription.h>
 #include <Interpreters/IJoin.h>
 #include <Interpreters/SortedBlocksWriter.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
@@ -25,6 +25,7 @@ public:
 
     const TableJoin & getTableJoin() const override { return *table_join; }
     bool addJoinedBlock(const Block & block, bool check_limits) override;
+    void checkTypesOfKeys(const Block & block) const override;
     void joinBlock(Block &, ExtraBlockPtr & not_processed) override;
 
     void setTotals(const Block &) override;
@@ -35,10 +36,10 @@ public:
     /// Has to be called only after setTotals()/mergeRightBlocks()
     bool alwaysReturnsEmptySet() const override { return (is_right || is_inner) && min_max_right_blocks.empty(); }
 
-    BlockInputStreamPtr createStreamWithNonJoinedRows(const Block & result_sample_block, UInt64 max_block_size) const override;
+    std::shared_ptr<NotJoinedBlocks> getNonJoinedBlocks(const Block & left_sample_block, const Block & result_sample_block, UInt64 max_block_size) const override;
 
 private:
-    friend class NonMergeJoinedBlockInputStream;
+    friend class NotJoinedMerge;
 
     struct NotProcessed : public ExtraBlock
     {
@@ -78,6 +79,7 @@ private:
     SortDescription right_merge_description;
     Block right_sample_block;
     Block right_table_keys;
+    /// Columns from right side of join, both key and additional
     Block right_columns_to_add;
     SortedBlocksWriter::Blocks right_blocks;
 
diff --git a/src/Interpreters/MonotonicityCheckVisitor.h b/src/Interpreters/MonotonicityCheckVisitor.h
index 350318047c7..a25fbf26420 100644
--- a/src/Interpreters/MonotonicityCheckVisitor.h
+++ b/src/Interpreters/MonotonicityCheckVisitor.h
@@ -28,7 +28,9 @@ public:
         const TablesWithColumns & tables;
         ContextPtr context;
         const std::unordered_set<String> & group_by_function_hashes;
-        Monotonicity monotonicity{true, true, true};
+
+        Monotonicity monotonicity = { .is_monotonic = true, .is_positive = true, .is_always_monotonic = true };
+
         ASTIdentifier * identifier = nullptr;
         DataTypePtr arg_data_type = {};
 
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index fe0594bb58f..471ad67d4e7 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -6,17 +6,18 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
+#include <Storages/StorageMergeTree.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/CreatingSetsTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Sources/NullSource.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/Transforms/CheckSortedTransform.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
@@ -53,24 +54,33 @@ public:
     {
         ContextPtr context;
         std::optional<String> nondeterministic_function_name;
+        bool subquery = false;
     };
 
-    static bool needChildVisit(const ASTPtr & /*node*/, const ASTPtr & child)
+    static bool needChildVisit(const ASTPtr & /*node*/, const ASTPtr & /*child*/)
     {
-        return child != nullptr;
+        return true;
     }
 
     static void visit(const ASTPtr & node, Data & data)
     {
-        if (data.nondeterministic_function_name)
+        if (data.nondeterministic_function_name || data.subquery)
             return;
 
-        if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
+        if (node->as<ASTSelectQuery>())
+        {
+            /// We cannot determine if subquery is deterministic or not,
+            /// so we do not allow to use subqueries in mutation without allow_nondeterministic_mutations=1
+            data.subquery = true;
+        }
+        else if (const auto * function = typeid_cast<const ASTFunction *>(node.get()))
         {
             /// Property of being deterministic for lambda expression is completely determined
             /// by the contents of its definition, so we just proceed to it.
             if (function->name != "lambda")
             {
+                /// NOTE It may be an aggregate function, so get(...) may throw.
+                /// However, an aggregate function can be used only in subquery and we do not go into subquery.
                 const auto func = FunctionFactory::instance().get(function->name, data.context);
                 if (!func->isDeterministic())
                     data.nondeterministic_function_name = func->getName();
@@ -80,10 +90,11 @@ public:
 };
 
 using FirstNonDeterministicFunctionFinder = InDepthNodeVisitor<FirstNonDeterministicFunctionMatcher, true>;
+using FirstNonDeterministicFunctionData = FirstNonDeterministicFunctionMatcher::Data;
 
-std::optional<String> findFirstNonDeterministicFunctionName(const MutationCommand & command, ContextPtr context)
+FirstNonDeterministicFunctionData findFirstNonDeterministicFunctionName(const MutationCommand & command, ContextPtr context)
 {
-    FirstNonDeterministicFunctionMatcher::Data finder_data{context, std::nullopt};
+    FirstNonDeterministicFunctionMatcher::Data finder_data{context, std::nullopt, false};
 
     switch (command.type)
     {
@@ -93,7 +104,7 @@ std::optional<String> findFirstNonDeterministicFunctionName(const MutationComman
             FirstNonDeterministicFunctionFinder(finder_data).visit(update_assignments_ast);
 
             if (finder_data.nondeterministic_function_name)
-                return finder_data.nondeterministic_function_name;
+                return finder_data;
 
             /// Currently UPDATE and DELETE both always have predicates so we can use fallthrough
             [[fallthrough]];
@@ -104,7 +115,7 @@ std::optional<String> findFirstNonDeterministicFunctionName(const MutationComman
             auto predicate_ast = command.predicate->clone();
             FirstNonDeterministicFunctionFinder(finder_data).visit(predicate_ast);
 
-            return finder_data.nondeterministic_function_name;
+            return finder_data;
         }
 
         default:
@@ -156,7 +167,7 @@ ColumnDependencies getAllColumnDependencies(const StorageMetadataPtr & metadata_
     ColumnDependencies dependencies;
     while (!new_updated_columns.empty())
     {
-        auto new_dependencies = metadata_snapshot->getColumnDependencies(new_updated_columns);
+        auto new_dependencies = metadata_snapshot->getColumnDependencies(new_updated_columns, true);
         new_updated_columns.clear();
         for (const auto & dependency : new_dependencies)
         {
@@ -213,18 +224,24 @@ bool isStorageTouchedByMutations(
     ASTPtr select_query = prepareQueryAffectedAST(commands, storage, context_copy);
 
     /// Interpreter must be alive, when we use result of execute() method.
-    /// For some reason it may copy context and and give it into ExpressionBlockInputStream
+    /// For some reason it may copy context and and give it into ExpressionTransform
     /// after that we will use context from destroyed stack frame in our stream.
     InterpreterSelectQuery interpreter(select_query, context_copy, storage, metadata_snapshot, SelectQueryOptions().ignoreLimits());
-    BlockInputStreamPtr in = interpreter.execute().getInputStream();
+    auto io = interpreter.execute();
+    PullingPipelineExecutor executor(io.pipeline);
 
-    Block block = in->read();
+    Block block;
+    while (!block.rows())
+        executor.pull(block);
     if (!block.rows())
         return false;
     else if (block.rows() != 1)
         throw Exception("count() expression returned " + toString(block.rows()) + " rows, not 1",
             ErrorCodes::LOGICAL_ERROR);
 
+    Block tmp_block;
+    while (executor.pull(tmp_block));
+
     auto count = (*block.getByName("count()").column)[0].get<UInt64>();
     return count != 0;
 }
@@ -303,6 +320,15 @@ static NameSet getKeyColumns(const StoragePtr & storage, const StorageMetadataPt
     return key_columns;
 }
 
+static bool materializeTTLRecalculateOnly(const StoragePtr & storage)
+{
+    auto storage_from_merge_tree_data_part = std::dynamic_pointer_cast<StorageFromMergeTreeDataPart>(storage);
+    if (!storage_from_merge_tree_data_part)
+        return false;
+
+    return storage_from_merge_tree_data_part->materializeTTLRecalculateOnly();
+}
+
 static void validateUpdateColumns(
     const StoragePtr & storage,
     const StorageMetadataPtr & metadata_snapshot, const NameSet & updated_columns,
@@ -394,8 +420,13 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
     NamesAndTypesList all_columns = columns_desc.getAllPhysical();
 
     NameSet updated_columns;
+    bool materialize_ttl_recalculate_only = materializeTTLRecalculateOnly(storage);
     for (const MutationCommand & command : commands)
     {
+        if (command.type == MutationCommand::Type::UPDATE
+            || command.type == MutationCommand::Type::DELETE)
+            materialize_ttl_recalculate_only = false;
+
         for (const auto & kv : command.column_to_update_expression)
         {
             updated_columns.insert(kv.first);
@@ -503,10 +534,10 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                     }
                 }
 
-                auto updated_column = makeASTFunction("CAST",
+                auto updated_column = makeASTFunction("_CAST",
                     makeASTFunction("if",
                         condition,
-                        makeASTFunction("CAST",
+                        makeASTFunction("_CAST",
                             update_expr->clone(),
                             type_literal),
                         std::make_shared<ASTIdentifier>(column)),
@@ -529,6 +560,17 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                 }
             }
         }
+        else if (command.type == MutationCommand::MATERIALIZE_COLUMN)
+        {
+            mutation_kind.set(MutationKind::MUTATE_OTHER);
+            if (stages.empty() || !stages.back().column_to_updated.empty())
+                stages.emplace_back(context);
+            if (stages.size() == 1) /// First stage only supports filtering and can't update columns.
+                stages.emplace_back(context);
+
+            const auto & column = columns_desc.get(command.column_name);
+            stages.back().column_to_updated.emplace(column.name, column.default_desc.expression->clone());
+        }
         else if (command.type == MutationCommand::MATERIALIZE_INDEX)
         {
             mutation_kind.set(MutationKind::MUTATE_INDEX_PROJECTION);
@@ -569,7 +611,18 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
         else if (command.type == MutationCommand::MATERIALIZE_TTL)
         {
             mutation_kind.set(MutationKind::MUTATE_OTHER);
-            if (metadata_snapshot->hasRowsTTL())
+            if (materialize_ttl_recalculate_only)
+            {
+                // just recalculate ttl_infos without remove expired data
+                auto all_columns_vec = all_columns.getNames();
+                auto new_dependencies = metadata_snapshot->getColumnDependencies(NameSet(all_columns_vec.begin(), all_columns_vec.end()), false);
+                for (const auto & dependency : new_dependencies)
+                {
+                    if (dependency.kind == ColumnDependency::TTL_EXPRESSION)
+                        dependencies.insert(dependency);
+                }
+            }
+            else if (metadata_snapshot->hasRowsTTL())
             {
                 for (const auto & column : all_columns)
                     dependencies.emplace(column.name, ColumnDependency::TTL_TARGET);
@@ -594,19 +647,19 @@ ASTPtr MutationsInterpreter::prepare(bool dry_run)
                 }
 
                 /// Recalc only skip indices and projections of columns which could be updated by TTL.
-                auto new_dependencies = metadata_snapshot->getColumnDependencies(new_updated_columns);
+                auto new_dependencies = metadata_snapshot->getColumnDependencies(new_updated_columns, true);
                 for (const auto & dependency : new_dependencies)
                 {
                     if (dependency.kind == ColumnDependency::SKIP_INDEX || dependency.kind == ColumnDependency::PROJECTION)
                         dependencies.insert(dependency);
                 }
+            }
 
-                if (dependencies.empty())
-                {
-                    /// Very rare case. It can happen if we have only one MOVE TTL with constant expression.
-                    /// But we still have to read at least one column.
-                    dependencies.emplace(all_columns.front().name, ColumnDependency::TTL_EXPRESSION);
-                }
+            if (dependencies.empty())
+            {
+                /// Very rare case. It can happen if we have only one MOVE TTL with constant expression.
+                /// But we still have to read at least one column.
+                dependencies.emplace(all_columns.front().name, ColumnDependency::TTL_EXPRESSION);
             }
         }
         else if (command.type == MutationCommand::READ_COLUMN)
@@ -732,8 +785,12 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
         for (const String & column : stage.output_columns)
             all_asts->children.push_back(std::make_shared<ASTIdentifier>(column));
 
-        auto syntax_result = TreeRewriter(context).analyze(all_asts, all_columns, storage, metadata_snapshot);
-        if (context->hasQueryContext())
+        /// Executing scalar subquery on that stage can lead to deadlock
+        /// e.g. ALTER referencing the same table in scalar subquery
+        bool execute_scalar_subqueries = !dry_run;
+        auto syntax_result = TreeRewriter(context).analyze(
+            all_asts, all_columns, storage, metadata_snapshot, false, true, execute_scalar_subqueries);
+        if (execute_scalar_subqueries && context->hasQueryContext())
             for (const auto & it : syntax_result->getScalars())
                 context->getQueryContext()->addScalar(it.first, it.second);
 
@@ -816,7 +873,7 @@ ASTPtr MutationsInterpreter::prepareInterpreterSelectQuery(std::vector<Stage> &
     return select;
 }
 
-QueryPipelinePtr MutationsInterpreter::addStreamsForLaterStages(const std::vector<Stage> & prepared_stages, QueryPlan & plan) const
+QueryPipelineBuilderPtr MutationsInterpreter::addStreamsForLaterStages(const std::vector<Stage> & prepared_stages, QueryPlan & plan) const
 {
     for (size_t i_stage = 1; i_stage < prepared_stages.size(); ++i_stage)
     {
@@ -875,12 +932,15 @@ void MutationsInterpreter::validate()
     {
         for (const auto & command : commands)
         {
-            const auto nondeterministic_func_name = findFirstNonDeterministicFunctionName(command, context);
-            if (nondeterministic_func_name)
-                throw Exception(
-                    "ALTER UPDATE/ALTER DELETE statements must use only deterministic functions! "
-                    "Function '" + *nondeterministic_func_name + "' is non-deterministic",
-                    ErrorCodes::BAD_ARGUMENTS);
+            const auto nondeterministic_func_data = findFirstNonDeterministicFunctionName(command, context);
+            if (nondeterministic_func_data.subquery)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "ALTER UPDATE/ALTER DELETE statement with subquery may be nondeterministic, "
+                                                           "see allow_nondeterministic_mutations setting");
+
+            if (nondeterministic_func_data.nondeterministic_function_name)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "ALTER UPDATE/ALTER DELETE statements must use only deterministic functions. "
+                    "Function '{}' is non-deterministic", *nondeterministic_func_data.nondeterministic_function_name);
         }
     }
 
@@ -889,7 +949,7 @@ void MutationsInterpreter::validate()
     auto pipeline = addStreamsForLaterStages(stages, plan);
 }
 
-BlockInputStreamPtr MutationsInterpreter::execute()
+QueryPipeline MutationsInterpreter::execute()
 {
     if (!can_execute)
         throw Exception("Cannot execute mutations interpreter because can_execute flag set to false", ErrorCodes::LOGICAL_ERROR);
@@ -900,29 +960,30 @@ BlockInputStreamPtr MutationsInterpreter::execute()
     QueryPlan plan;
     select_interpreter->buildQueryPlan(plan);
 
-    auto pipeline = addStreamsForLaterStages(stages, plan);
+    auto builder = addStreamsForLaterStages(stages, plan);
 
     /// Sometimes we update just part of columns (for example UPDATE mutation)
     /// in this case we don't read sorting key, so just we don't check anything.
-    if (auto sort_desc = getStorageSortDescriptionIfPossible(pipeline->getHeader()))
+    if (auto sort_desc = getStorageSortDescriptionIfPossible(builder->getHeader()))
     {
-        pipeline->addSimpleTransform([&](const Block & header)
+        builder->addSimpleTransform([&](const Block & header)
         {
             return std::make_shared<CheckSortedTransform>(header, *sort_desc);
         });
     }
 
-    BlockInputStreamPtr result_stream = std::make_shared<PipelineExecutingBlockInputStream>(std::move(*pipeline));
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
 
     if (!updated_header)
-        updated_header = std::make_unique<Block>(result_stream->getHeader());
+        updated_header = std::make_unique<Block>(pipeline.getHeader());
 
-    return result_stream;
+    return pipeline;
 }
 
-const Block & MutationsInterpreter::getUpdatedHeader() const
+Block MutationsInterpreter::getUpdatedHeader() const
 {
-    return *updated_header;
+    // If it's an index/projection materialization, we don't write any data columns, thus empty header is used
+    return mutation_kind.mutation_kind == MutationKind::MUTATE_INDEX_PROJECTION ? Block{} : *updated_header;
 }
 
 const ColumnDependencies & MutationsInterpreter::getColumnDependencies() const
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index c9a589e6b6d..7b0ccb3bae5 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -14,8 +14,8 @@ namespace DB
 class Context;
 class QueryPlan;
 
-class QueryPipeline;
-using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
+class QueryPipelineBuilder;
+using QueryPipelineBuilderPtr = std::unique_ptr<QueryPipelineBuilder>;
 
 /// Return false if the data isn't going to be changed by mutations.
 bool isStorageTouchedByMutations(
@@ -50,10 +50,10 @@ public:
     size_t evaluateCommandsSize();
 
     /// The resulting stream will return blocks containing only changed columns and columns, that we need to recalculate indices.
-    BlockInputStreamPtr execute();
+    QueryPipeline execute();
 
     /// Only changed columns.
-    const Block & getUpdatedHeader() const;
+    Block getUpdatedHeader() const;
 
     const ColumnDependencies & getColumnDependencies() const;
 
@@ -84,7 +84,7 @@ private:
     struct Stage;
 
     ASTPtr prepareInterpreterSelectQuery(std::vector<Stage> &prepared_stages, bool dry_run);
-    QueryPipelinePtr addStreamsForLaterStages(const std::vector<Stage> & prepared_stages, QueryPlan & plan) const;
+    QueryPipelineBuilderPtr addStreamsForLaterStages(const std::vector<Stage> & prepared_stages, QueryPlan & plan) const;
 
     std::optional<SortDescription> getStorageSortDescriptionIfPossible(const Block & header) const;
 
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
index 90917a0fd7e..a96713e3b5d 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
@@ -120,7 +120,7 @@ static NamesAndTypesList getColumnsList(const ASTExpressionList * columns_defini
                     auto * literal = child->as<ASTLiteral>();
 
                     new_child->arguments = std::make_shared<ASTExpressionList>();
-                    new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(literal->value.get<String>()));
+                    new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(literal->value.safeGet<String>()));
                     new_child->arguments->children.push_back(std::make_shared<ASTLiteral>(Int16(++i)));
                     child = new_child;
                 }
@@ -571,6 +571,7 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
     auto rewritten_rename_query = std::make_shared<ASTRenameQuery>();
     rewritten_alter_query->database = mapped_to_database;
     rewritten_alter_query->table = alter_query.table;
+    rewritten_alter_query->alter_object = ASTAlterQuery::AlterObjectType::TABLE;
     rewritten_alter_query->set(rewritten_alter_query->command_list, std::make_shared<ASTExpressionList>());
 
     String default_after_column;
diff --git a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
index 08af123448e..6055d53cf11 100644
--- a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
+++ b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <gtest/gtest.h>
 
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
index 798c2f2e376..f2818bce0bf 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/NormalizeSelectWithUnionQueryVisitor.h>
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
 #include <Common/typeid_cast.h>
 
 namespace DB
@@ -8,13 +9,14 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int EXPECTED_ALL_OR_DISTINCT;
+    extern const int LOGICAL_ERROR;
 }
 
-void NormalizeSelectWithUnionQueryMatcher::getSelectsFromUnionListNode(ASTPtr & ast_select, ASTs & selects)
+void NormalizeSelectWithUnionQueryMatcher::getSelectsFromUnionListNode(ASTPtr ast_select, ASTs & selects)
 {
-    if (auto * inner_union = ast_select->as<ASTSelectWithUnionQuery>())
+    if (const auto * inner_union = ast_select->as<ASTSelectWithUnionQuery>())
     {
-        for (auto & child : inner_union->list_of_selects->children)
+        for (const auto & child : inner_union->list_of_selects->children)
             getSelectsFromUnionListNode(child, selects);
 
         return;
@@ -33,11 +35,28 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
 {
     auto & union_modes = ast.list_of_modes;
     ASTs selects;
-    auto & select_list = ast.list_of_selects->children;
+    const auto & select_list = ast.list_of_selects->children;
+
+    if (select_list.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty list of selects for ASTSelectWithUnionQuery");
+
+    /// Since nodes are traversed from bottom to top, we can also collect union modes from children up to parents.
+    ASTSelectWithUnionQuery::UnionModesSet current_set_of_modes;
+    bool distinct_found = false;
 
     int i;
     for (i = union_modes.size() - 1; i >= 0; --i)
     {
+        current_set_of_modes.insert(union_modes[i]);
+        if (const auto * union_ast = typeid_cast<const ASTSelectWithUnionQuery *>(select_list[i + 1].get()))
+        {
+            const auto & current_select_modes = union_ast->set_of_modes;
+            current_set_of_modes.insert(current_select_modes.begin(), current_select_modes.end());
+        }
+
+        if (distinct_found)
+            continue;
+
         /// Rewrite UNION Mode
         if (union_modes[i] == ASTSelectWithUnionQuery::Mode::Unspecified)
         {
@@ -79,12 +98,18 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
             distinct_list->union_mode = ASTSelectWithUnionQuery::Mode::DISTINCT;
             distinct_list->is_normalized = true;
             selects.push_back(std::move(distinct_list));
-            break;
+            distinct_found = true;
         }
     }
 
+    if (const auto * union_ast = typeid_cast<const ASTSelectWithUnionQuery *>(select_list[0].get()))
+    {
+        const auto & current_select_modes = union_ast->set_of_modes;
+        current_set_of_modes.insert(current_select_modes.begin(), current_select_modes.end());
+    }
+
     /// No UNION DISTINCT or only one child in select_list
-    if (i == -1)
+    if (!distinct_found)
     {
         if (auto * inner_union = select_list[0]->as<ASTSelectWithUnionQuery>();
             inner_union && inner_union->union_mode == ASTSelectWithUnionQuery::Mode::ALL)
@@ -102,6 +127,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
     if (selects.size() == 1 && selects[0]->as<ASTSelectWithUnionQuery>())
     {
         ast = *(selects[0]->as<ASTSelectWithUnionQuery>());
+        ast.set_of_modes = std::move(current_set_of_modes);
         return;
     }
 
@@ -110,6 +136,7 @@ void NormalizeSelectWithUnionQueryMatcher::visit(ASTSelectWithUnionQuery & ast,
 
     ast.is_normalized = true;
     ast.union_mode = ASTSelectWithUnionQuery::Mode::ALL;
+    ast.set_of_modes = std::move(current_set_of_modes);
 
     ast.list_of_selects->children = std::move(selects);
 }
diff --git a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
index cec2e4265e2..3e6124dc2ce 100644
--- a/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
+++ b/src/Interpreters/NormalizeSelectWithUnionQueryVisitor.h
@@ -21,7 +21,7 @@ public:
         const UnionMode & union_default_mode;
     };
 
-    static void getSelectsFromUnionListNode(ASTPtr & ast_select, ASTs & selects);
+    static void getSelectsFromUnionListNode(ASTPtr ast_select, ASTs & selects);
 
     static void visit(ASTPtr & ast, Data &);
     static void visit(ASTSelectWithUnionQuery &, Data &);
diff --git a/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp b/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
index a8e2d371e05..993c9945039 100644
--- a/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
+++ b/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
@@ -1,6 +1,7 @@
 #include <Common/typeid_cast.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTHelpers.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Interpreters/OptimizeIfWithConstantConditionVisitor.h>
 #include <IO/WriteHelpers.h>
@@ -29,7 +30,7 @@ static bool tryExtractConstValueFromCondition(const ASTPtr & condition, bool & v
     /// cast of numeric constant in condition to UInt8
     if (const auto * function = condition->as<ASTFunction>())
     {
-        if (function->name == "CAST")
+        if (isFunctionCast(function))
         {
             if (const auto * expr_list = function->arguments->as<ASTExpressionList>())
             {
diff --git a/src/Interpreters/PredicateExpressionsOptimizer.cpp b/src/Interpreters/PredicateExpressionsOptimizer.cpp
index f2e55441fb6..adc164e0596 100644
--- a/src/Interpreters/PredicateExpressionsOptimizer.cpp
+++ b/src/Interpreters/PredicateExpressionsOptimizer.cpp
@@ -39,7 +39,7 @@ bool PredicateExpressionsOptimizer::optimize(ASTSelectQuery & select_query)
     if (!select_query.tables() || select_query.tables()->children.empty())
         return false;
 
-    if ((!select_query.where() && !select_query.prewhere()) || select_query.arrayJoinExpressionList())
+    if ((!select_query.where() && !select_query.prewhere()) || select_query.arrayJoinExpressionList().first)
         return false;
 
     const auto & tables_predicates = extractTablesPredicates(select_query.where(), select_query.prewhere());
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 06320f00dfa..81afa990d3b 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -11,8 +11,7 @@
 #include <Common/Exception.h>
 #include <Common/CurrentThread.h>
 #include <IO/WriteHelpers.h>
-#include <DataStreams/IBlockInputStream.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <chrono>
 
 
@@ -203,7 +202,6 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
             if (query_context->hasTraceCollector())
             {
                 /// Set up memory profiling
-                thread_group->memory_tracker.setOrRaiseProfilerLimit(settings.memory_profiler_step);
                 thread_group->memory_tracker.setProfilerStep(settings.memory_profiler_step);
                 thread_group->memory_tracker.setSampleProbability(settings.memory_profiler_sample_probability);
             }
@@ -238,9 +236,6 @@ ProcessList::EntryPtr ProcessList::insert(const String & query_, const IAST * as
 
 ProcessListEntry::~ProcessListEntry()
 {
-    /// Destroy all streams to avoid long lock of ProcessList
-    it->releaseQueryStreams();
-
     std::lock_guard lock(parent.mutex);
 
     String user = it->getClientInfo().current_user;
@@ -303,88 +298,30 @@ QueryStatus::~QueryStatus()
     assert(executors.empty());
 }
 
-void QueryStatus::setQueryStreams(const BlockIO & io)
+CancellationCode QueryStatus::cancelQuery(bool)
 {
-    std::lock_guard lock(query_streams_mutex);
-
-    query_stream_in = io.in;
-    query_stream_out = io.out;
-    query_streams_status = QueryStreamsStatus::Initialized;
-}
-
-void QueryStatus::releaseQueryStreams()
-{
-    BlockInputStreamPtr in;
-    BlockOutputStreamPtr out;
-
-    {
-        std::lock_guard lock(query_streams_mutex);
-
-        query_streams_status = QueryStreamsStatus::Released;
-        in = std::move(query_stream_in);
-        out = std::move(query_stream_out);
-    }
-
-    /// Destroy streams outside the mutex lock
-}
-
-bool QueryStatus::streamsAreReleased()
-{
-    std::lock_guard lock(query_streams_mutex);
-
-    return query_streams_status == QueryStreamsStatus::Released;
-}
-
-bool QueryStatus::tryGetQueryStreams(BlockInputStreamPtr & in, BlockOutputStreamPtr & out) const
-{
-    std::lock_guard lock(query_streams_mutex);
-
-    if (query_streams_status != QueryStreamsStatus::Initialized)
-        return false;
-
-    in = query_stream_in;
-    out = query_stream_out;
-    return true;
-}
-
-CancellationCode QueryStatus::cancelQuery(bool kill)
-{
-    /// Streams are destroyed, and ProcessListElement will be deleted from ProcessList soon. We need wait a little bit
-    if (streamsAreReleased())
+    if (is_killed.load())
         return CancellationCode::CancelSent;
 
-    BlockInputStreamPtr input_stream;
-    BlockOutputStreamPtr output_stream;
-    SCOPE_EXIT({
-        std::lock_guard lock(query_streams_mutex);
-        for (auto * e : executors)
-            e->cancel();
-    });
-
-    if (tryGetQueryStreams(input_stream, output_stream))
-    {
-        if (input_stream)
-        {
-            input_stream->cancel(kill);
-            return CancellationCode::CancelSent;
-        }
-        return CancellationCode::CancelCannotBeSent;
-    }
-    /// Query is not even started
     is_killed.store(true);
+
+    std::lock_guard lock(executors_mutex);
+    for (auto * e : executors)
+        e->cancel();
+
     return CancellationCode::CancelSent;
 }
 
 void QueryStatus::addPipelineExecutor(PipelineExecutor * e)
 {
-    std::lock_guard lock(query_streams_mutex);
+    std::lock_guard lock(executors_mutex);
     assert(std::find(executors.begin(), executors.end(), e) == executors.end());
     executors.push_back(e);
 }
 
 void QueryStatus::removePipelineExecutor(PipelineExecutor * e)
 {
-    std::lock_guard lock(query_streams_mutex);
+    std::lock_guard lock(executors_mutex);
     assert(std::find(executors.begin(), executors.end(), e) != executors.end());
     std::erase_if(executors, [e](PipelineExecutor * x) { return x == e; });
 }
@@ -470,7 +407,7 @@ QueryStatusInfo QueryStatus::getInfo(bool get_thread_list, bool get_profile_even
         }
 
         if (get_profile_events)
-            res.profile_counters = std::make_shared<ProfileEvents::Counters>(thread_group->performance_counters.getPartiallyAtomicSnapshot());
+            res.profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(thread_group->performance_counters.getPartiallyAtomicSnapshot());
     }
 
     if (get_settings && getContext())
@@ -508,7 +445,7 @@ ProcessListForUserInfo ProcessListForUser::getInfo(bool get_profile_events) cons
     res.peak_memory_usage = user_memory_tracker.getPeak();
 
     if (get_profile_events)
-        res.profile_counters = std::make_shared<ProfileEvents::Counters>(user_performance_counters.getPartiallyAtomicSnapshot());
+        res.profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(user_performance_counters.getPartiallyAtomicSnapshot());
 
     return res;
 }
diff --git a/src/Interpreters/ProcessList.h b/src/Interpreters/ProcessList.h
index 1adad84c040..02be24bb2bd 100644
--- a/src/Interpreters/ProcessList.h
+++ b/src/Interpreters/ProcessList.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Defines.h>
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <IO/Progress.h>
 #include <Interpreters/CancellationCode.h>
 #include <Interpreters/ClientInfo.h>
@@ -66,7 +66,7 @@ struct QueryStatusInfo
 
     /// Optional fields, filled by query
     std::vector<UInt64> thread_ids;
-    std::shared_ptr<ProfileEvents::Counters> profile_counters;
+    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters;
     std::shared_ptr<Settings> query_settings;
     std::string current_database;
 };
@@ -103,13 +103,7 @@ protected:
     /// Be careful using it. For example, queries field of ProcessListForUser could be modified concurrently.
     const ProcessListForUser * getUserProcessList() const { return user_process_list; }
 
-    mutable std::mutex query_streams_mutex;
-
-    /// Streams with query results, point to BlockIO from executeQuery()
-    /// This declaration is compatible with notes about BlockIO::process_list_entry:
-    ///  there are no cyclic dependencies: BlockIO::in,out point to objects inside ProcessListElement (not whole object)
-    BlockInputStreamPtr query_stream_in;
-    BlockOutputStreamPtr query_stream_out;
+    mutable std::mutex executors_mutex;
 
     /// Array of PipelineExecutors to be cancelled when a cancelQuery is received
     std::vector<PipelineExecutor *> executors;
@@ -173,18 +167,6 @@ public:
 
     QueryStatusInfo getInfo(bool get_thread_list = false, bool get_profile_events = false, bool get_settings = false) const;
 
-    /// Copies pointers to in/out streams
-    void setQueryStreams(const BlockIO & io);
-
-    /// Frees in/out streams
-    void releaseQueryStreams();
-
-    /// It means that ProcessListEntry still exists, but stream was already destroyed
-    bool streamsAreReleased();
-
-    /// Get query in/out pointers from BlockIO
-    bool tryGetQueryStreams(BlockInputStreamPtr & in, BlockOutputStreamPtr & out) const;
-
     CancellationCode cancelQuery(bool kill);
 
     bool isKilled() const { return is_killed; }
@@ -204,7 +186,7 @@ struct ProcessListForUserInfo
     Int64 peak_memory_usage;
 
     // Optional field, filled by request.
-    std::shared_ptr<ProfileEvents::Counters> profile_counters;
+    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters;
 };
 
 
diff --git a/src/Interpreters/ProfileEventsExt.cpp b/src/Interpreters/ProfileEventsExt.cpp
index 2e8f986ca6c..472efc109fb 100644
--- a/src/Interpreters/ProfileEventsExt.cpp
+++ b/src/Interpreters/ProfileEventsExt.cpp
@@ -11,8 +11,13 @@
 namespace ProfileEvents
 {
 
+std::shared_ptr<DB::DataTypeEnum8> TypeEnum = std::make_shared<DB::DataTypeEnum8>(DB::DataTypeEnum8::Values{
+    { "increment", static_cast<Int8>(INCREMENT)},
+    { "gauge",     static_cast<Int8>(GAUGE)},
+});
+
 /// Put implementation here to avoid extra linking dependencies for clickhouse_common_io
-void dumpToMapColumn(const Counters & counters, DB::IColumn * column, bool nonzero_only)
+void dumpToMapColumn(const Counters::Snapshot & counters, DB::IColumn * column, bool nonzero_only)
 {
     auto * column_map = column ? &typeid_cast<DB::ColumnMap &>(*column) : nullptr;
     if (!column_map)
@@ -26,7 +31,7 @@ void dumpToMapColumn(const Counters & counters, DB::IColumn * column, bool nonze
     size_t size = 0;
     for (Event event = 0; event < Counters::num_counters; ++event)
     {
-        UInt64 value = counters[event].load(std::memory_order_relaxed);
+        UInt64 value = counters[event];
 
         if (nonzero_only && 0 == value)
             continue;
diff --git a/src/Interpreters/ProfileEventsExt.h b/src/Interpreters/ProfileEventsExt.h
index 7d513f0cd02..8a92eadec79 100644
--- a/src/Interpreters/ProfileEventsExt.h
+++ b/src/Interpreters/ProfileEventsExt.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <Common/ProfileEvents.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <Columns/IColumn.h>
 
 
@@ -7,6 +8,15 @@ namespace ProfileEvents
 {
 
 /// Dumps profile events to columns Map(String, UInt64)
-void dumpToMapColumn(const Counters & counters, DB::IColumn * column, bool nonzero_only = true);
+void dumpToMapColumn(const Counters::Snapshot & counters, DB::IColumn * column, bool nonzero_only = true);
+
+/// This is for ProfileEvents packets.
+enum Type : int8_t
+{
+    INCREMENT = 1,
+    GAUGE     = 2,
+};
+
+extern std::shared_ptr<DB::DataTypeEnum8> TypeEnum;
 
 }
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index 3f668e5e0ab..2cbb9634446 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -57,6 +57,7 @@ NamesAndTypesList QueryLogElement::getNamesAndTypes()
 
         {"current_database", std::make_shared<DataTypeString>()},
         {"query", std::make_shared<DataTypeString>()},
+        {"formatted_query", std::make_shared<DataTypeString>()},
         {"normalized_query_hash", std::make_shared<DataTypeUInt64>()},
         {"query_kind", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
         {"databases", std::make_shared<DataTypeArray>(
@@ -67,6 +68,8 @@ NamesAndTypesList QueryLogElement::getNamesAndTypes()
             std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
         {"projections", std::make_shared<DataTypeArray>(
             std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
+        {"views", std::make_shared<DataTypeArray>(
+            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()))},
         {"exception_code", std::make_shared<DataTypeInt32>()},
         {"exception", std::make_shared<DataTypeString>()},
         {"stack_trace", std::make_shared<DataTypeString>()},
@@ -151,6 +154,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
 
     columns[i++]->insertData(current_database.data(), current_database.size());
     columns[i++]->insertData(query.data(), query.size());
+    columns[i++]->insertData(formatted_query.data(), formatted_query.size());
     columns[i++]->insert(normalized_query_hash);
     columns[i++]->insertData(query_kind.data(), query_kind.size());
 
@@ -159,6 +163,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         auto & column_tables = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_columns = typeid_cast<ColumnArray &>(*columns[i++]);
         auto & column_projections = typeid_cast<ColumnArray &>(*columns[i++]);
+        auto & column_views = typeid_cast<ColumnArray &>(*columns[i++]);
 
         auto fill_column = [](const std::set<String> & data, ColumnArray & column)
         {
@@ -176,6 +181,7 @@ void QueryLogElement::appendToBlock(MutableColumns & columns) const
         fill_column(query_tables, column_tables);
         fill_column(query_columns, column_columns);
         fill_column(query_projections, column_projections);
+        fill_column(query_views, column_views);
     }
 
     columns[i++]->insert(exception_code);
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index 0aa02104306..49c38e7d2a9 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -51,6 +51,7 @@ struct QueryLogElement
 
     String current_database;
     String query;
+    String formatted_query;
     UInt64 normalized_query_hash{};
 
     String query_kind;
@@ -58,6 +59,7 @@ struct QueryLogElement
     std::set<String> query_tables;
     std::set<String> query_columns;
     std::set<String> query_projections;
+    std::set<String> query_views;
 
     std::unordered_set<String> used_aggregate_functions;
     std::unordered_set<String> used_aggregate_function_combinators;
@@ -78,7 +80,7 @@ struct QueryLogElement
     String log_comment;
 
     std::vector<UInt64> thread_ids;
-    std::shared_ptr<ProfileEvents::Counters> profile_counters;
+    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters;
     std::shared_ptr<Settings> query_settings;
 
     static std::string name() { return "QueryLog"; }
diff --git a/src/Interpreters/QueryNormalizer.cpp b/src/Interpreters/QueryNormalizer.cpp
index aae714198b5..7c820622c37 100644
--- a/src/Interpreters/QueryNormalizer.cpp
+++ b/src/Interpreters/QueryNormalizer.cpp
@@ -3,6 +3,7 @@
 #include <Interpreters/QueryNormalizer.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSelectQuery.h>
@@ -170,6 +171,24 @@ void QueryNormalizer::visitChildren(IAST * node, Data & data)
             /// Don't go into query argument.
             return;
         }
+
+        /// For lambda functions we need to avoid replacing lambda parameters with external aliases, for example,
+        /// Select 1 as x, arrayMap(x -> x + 2, [1, 2, 3])
+        /// shouldn't be replaced with Select 1 as x, arrayMap(x -> **(1 as x)** + 2, [1, 2, 3])
+        Aliases extracted_aliases;
+        if (func_node->name == "lambda")
+        {
+            Names lambda_aliases = RequiredSourceColumnsMatcher::extractNamesFromLambda(*func_node);
+            for (const auto & name : lambda_aliases)
+            {
+                auto it = data.aliases.find(name);
+                if (it != data.aliases.end())
+                {
+                    extracted_aliases.insert(data.aliases.extract(it));
+                }
+            }
+        }
+
         /// We skip the first argument. We also assume that the lambda function can not have parameters.
         size_t first_pos = 0;
         if (func_node->name == "lambda")
@@ -192,6 +211,11 @@ void QueryNormalizer::visitChildren(IAST * node, Data & data)
         {
             visitChildren(func_node->window_definition.get(), data);
         }
+
+        for (auto & it : extracted_aliases)
+        {
+            data.aliases.insert(it);
+        }
     }
     else if (!node->as<ASTSelectQuery>())
     {
@@ -232,6 +256,9 @@ void QueryNormalizer::visit(ASTPtr & ast, Data & data)
         visit(*node_select, ast, data);
     else if (auto * node_param = ast->as<ASTQueryParameter>())
         throw Exception("Query parameter " + backQuote(node_param->name) + " was not set", ErrorCodes::UNKNOWN_QUERY_PARAMETER);
+    else if (auto * node_function = ast->as<ASTFunction>())
+        if (node_function->parameters)
+            visit(node_function->parameters, data);
 
     /// If we replace the root of the subtree, we will be called again for the new root, in case the alias is replaced by an alias.
     if (ast.get() != initial_ast.get())
diff --git a/src/Interpreters/QueryNormalizer.h b/src/Interpreters/QueryNormalizer.h
index 7fc0f4bdf82..eebcff62cde 100644
--- a/src/Interpreters/QueryNormalizer.h
+++ b/src/Interpreters/QueryNormalizer.h
@@ -39,7 +39,7 @@ public:
         using SetOfASTs = std::set<const IAST *>;
         using MapOfASTs = std::map<ASTPtr, ASTPtr>;
 
-        const Aliases & aliases;
+        Aliases & aliases;
         const NameSet & source_columns_set;
         ExtractedSettings settings;
 
@@ -53,7 +53,7 @@ public:
         /// It's Ok to have "c + 1 AS c" in queries, but not in table definition
         const bool allow_self_aliases; /// for constructs like "SELECT column + 1 AS column"
 
-        Data(const Aliases & aliases_, const NameSet & source_columns_set_, bool ignore_alias_, ExtractedSettings && settings_, bool allow_self_aliases_)
+        Data(Aliases & aliases_, const NameSet & source_columns_set_, bool ignore_alias_, ExtractedSettings && settings_, bool allow_self_aliases_)
             : aliases(aliases_)
             , source_columns_set(source_columns_set_)
             , settings(settings_)
diff --git a/src/Interpreters/QueryPriorities.h b/src/Interpreters/QueryPriorities.h
index 4a271510537..9e18e7bcff3 100644
--- a/src/Interpreters/QueryPriorities.h
+++ b/src/Interpreters/QueryPriorities.h
@@ -6,8 +6,6 @@
 #include <memory>
 #include <chrono>
 #include <Common/CurrentMetrics.h>
-#include <Common/Stopwatch.h>
-
 
 namespace CurrentMetrics
 {
diff --git a/src/Interpreters/QueryThreadLog.h b/src/Interpreters/QueryThreadLog.h
index 57e93edbaf7..f826ebac4fd 100644
--- a/src/Interpreters/QueryThreadLog.h
+++ b/src/Interpreters/QueryThreadLog.h
@@ -45,7 +45,7 @@ struct QueryThreadLogElement
 
     ClientInfo client_info;
 
-    std::shared_ptr<ProfileEvents::Counters> profile_counters;
+    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters;
 
     static std::string name() { return "QueryThreadLog"; }
 
diff --git a/src/Interpreters/QueryViewsLog.cpp b/src/Interpreters/QueryViewsLog.cpp
new file mode 100644
index 00000000000..2c0f1ecd878
--- /dev/null
+++ b/src/Interpreters/QueryViewsLog.cpp
@@ -0,0 +1,104 @@
+#include "QueryViewsLog.h"
+
+#include <Columns/IColumn.h>
+#include <Core/Block.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/ProfileEventsExt.h>
+#include <base/DateLUT.h>
+#include <base/types.h>
+
+namespace DB
+{
+NamesAndTypesList QueryViewsLogElement::getNamesAndTypes()
+{
+    auto view_status_datatype = std::make_shared<DataTypeEnum8>(DataTypeEnum8::Values{
+        {"QueryStart", static_cast<Int8>(QUERY_START)},
+        {"QueryFinish", static_cast<Int8>(QUERY_FINISH)},
+        {"ExceptionBeforeStart", static_cast<Int8>(EXCEPTION_BEFORE_START)},
+        {"ExceptionWhileProcessing", static_cast<Int8>(EXCEPTION_WHILE_PROCESSING)}});
+
+    auto view_type_datatype = std::make_shared<DataTypeEnum8>(DataTypeEnum8::Values{
+        {"Default", static_cast<Int8>(ViewType::DEFAULT)},
+        {"Materialized", static_cast<Int8>(ViewType::MATERIALIZED)},
+        {"Live", static_cast<Int8>(ViewType::LIVE)}});
+
+    return {
+        {"event_date", std::make_shared<DataTypeDate>()},
+        {"event_time", std::make_shared<DataTypeDateTime>()},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+        {"view_duration_ms", std::make_shared<DataTypeUInt64>()},
+
+        {"initial_query_id", std::make_shared<DataTypeString>()},
+        {"view_name", std::make_shared<DataTypeString>()},
+        {"view_uuid", std::make_shared<DataTypeUUID>()},
+        {"view_type", std::move(view_type_datatype)},
+        {"view_query", std::make_shared<DataTypeString>()},
+        {"view_target", std::make_shared<DataTypeString>()},
+
+        {"read_rows", std::make_shared<DataTypeUInt64>()},
+        {"read_bytes", std::make_shared<DataTypeUInt64>()},
+        {"written_rows", std::make_shared<DataTypeUInt64>()},
+        {"written_bytes", std::make_shared<DataTypeUInt64>()},
+        {"peak_memory_usage", std::make_shared<DataTypeInt64>()},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
+
+        {"status", std::move(view_status_datatype)},
+        {"exception_code", std::make_shared<DataTypeInt32>()},
+        {"exception", std::make_shared<DataTypeString>()},
+        {"stack_trace", std::make_shared<DataTypeString>()}};
+}
+
+NamesAndAliases QueryViewsLogElement::getNamesAndAliases()
+{
+    return {
+        {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(ProfileEvents)"},
+        {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"}};
+}
+
+void QueryViewsLogElement::appendToBlock(MutableColumns & columns) const
+{
+    size_t i = 0;
+
+    columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType()); // event_date
+    columns[i++]->insert(event_time);
+    columns[i++]->insert(event_time_microseconds);
+    columns[i++]->insert(view_duration_ms);
+
+    columns[i++]->insertData(initial_query_id.data(), initial_query_id.size());
+    columns[i++]->insertData(view_name.data(), view_name.size());
+    columns[i++]->insert(view_uuid);
+    columns[i++]->insert(view_type);
+    columns[i++]->insertData(view_query.data(), view_query.size());
+    columns[i++]->insertData(view_target.data(), view_target.size());
+
+    columns[i++]->insert(read_rows);
+    columns[i++]->insert(read_bytes);
+    columns[i++]->insert(written_rows);
+    columns[i++]->insert(written_bytes);
+    columns[i++]->insert(peak_memory_usage);
+
+    if (profile_counters)
+    {
+        auto * column = columns[i++].get();
+        ProfileEvents::dumpToMapColumn(*profile_counters, column, true);
+    }
+    else
+    {
+        columns[i++]->insertDefault();
+    }
+
+    columns[i++]->insert(status);
+    columns[i++]->insert(exception_code);
+    columns[i++]->insertData(exception.data(), exception.size());
+    columns[i++]->insertData(stack_trace.data(), stack_trace.size());
+}
+
+}
diff --git a/src/Interpreters/QueryViewsLog.h b/src/Interpreters/QueryViewsLog.h
new file mode 100644
index 00000000000..5b0567c3b60
--- /dev/null
+++ b/src/Interpreters/QueryViewsLog.h
@@ -0,0 +1,87 @@
+#pragma once
+
+#include <chrono>
+#include <memory>
+#include <sys/types.h>
+
+#include <Columns/IColumn.h>
+#include <Core/Block.h>
+#include <Core/SettingsEnums.h>
+#include <Core/Types.h>
+#include <Core/UUID.h>
+#include <Interpreters/SystemLog.h>
+#include <base/types.h>
+
+namespace ProfileEvents
+{
+class Counters;
+}
+
+namespace DB
+{
+class ThreadStatus;
+
+struct QueryViewsLogElement
+{
+    using ViewStatus = QueryLogElementType;
+
+    enum class ViewType : int8_t
+    {
+        DEFAULT = 1,
+        MATERIALIZED = 2,
+        LIVE = 3
+    };
+
+    struct ViewRuntimeStats
+    {
+        String target_name;
+        ViewType type = ViewType::DEFAULT;
+        std::unique_ptr<ThreadStatus> thread_status = nullptr;
+        std::atomic_uint64_t elapsed_ms = 0;
+        std::chrono::time_point<std::chrono::system_clock> event_time;
+        ViewStatus event_status = ViewStatus::QUERY_START;
+
+        void setStatus(ViewStatus s)
+        {
+            event_status = s;
+            event_time = std::chrono::system_clock::now();
+        }
+    };
+
+    time_t event_time{};
+    Decimal64 event_time_microseconds{};
+    UInt64 view_duration_ms{};
+
+    String initial_query_id;
+    String view_name;
+    UUID view_uuid{UUIDHelpers::Nil};
+    ViewType view_type{ViewType::DEFAULT};
+    String view_query;
+    String view_target;
+
+    UInt64 read_rows{};
+    UInt64 read_bytes{};
+    UInt64 written_rows{};
+    UInt64 written_bytes{};
+    Int64 peak_memory_usage{};
+    std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters;
+
+    ViewStatus status = ViewStatus::QUERY_START;
+    Int32 exception_code{};
+    String exception;
+    String stack_trace;
+
+    static std::string name() { return "QueryLog"; }
+
+    static NamesAndTypesList getNamesAndTypes();
+    static NamesAndAliases getNamesAndAliases();
+    void appendToBlock(MutableColumns & columns) const;
+};
+
+
+class QueryViewsLog : public SystemLog<QueryViewsLogElement>
+{
+    using SystemLog<QueryViewsLogElement>::SystemLog;
+};
+
+}
diff --git a/src/Interpreters/ReplaceQueryParameterVisitor.h b/src/Interpreters/ReplaceQueryParameterVisitor.h
index 23e36df3fee..cb3d0f668d8 100644
--- a/src/Interpreters/ReplaceQueryParameterVisitor.h
+++ b/src/Interpreters/ReplaceQueryParameterVisitor.h
@@ -13,7 +13,7 @@ class ASTQueryParameter;
 class ReplaceQueryParameterVisitor
 {
 public:
-    ReplaceQueryParameterVisitor(const NameToNameMap & parameters)
+    explicit ReplaceQueryParameterVisitor(const NameToNameMap & parameters)
         : query_parameters(parameters)
     {}
 
diff --git a/src/Interpreters/RequiredSourceColumnsData.h b/src/Interpreters/RequiredSourceColumnsData.h
index d425989393e..501f6961efa 100644
--- a/src/Interpreters/RequiredSourceColumnsData.h
+++ b/src/Interpreters/RequiredSourceColumnsData.h
@@ -4,7 +4,7 @@
 #include <optional>
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 
 namespace DB
diff --git a/src/Interpreters/RequiredSourceColumnsVisitor.cpp b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
index 2f2a68656bc..21ec94a6917 100644
--- a/src/Interpreters/RequiredSourceColumnsVisitor.cpp
+++ b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
@@ -123,6 +123,17 @@ void RequiredSourceColumnsMatcher::visit(const ASTSelectQuery & select, const AS
             data.addColumnAliasIfAny(*node);
     }
 
+    if (const auto & with = select.with())
+    {
+        for (auto & node : with->children)
+        {
+            if (const auto * identifier = node->as<ASTIdentifier>())
+                data.addColumnIdentifier(*identifier);
+            else
+                data.addColumnAliasIfAny(*node);
+        }
+    }
+
     std::vector<ASTPtr *> out;
     for (const auto & node : select.children)
     {
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 03abae01453..e67e16b9b64 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -1,7 +1,7 @@
 #include <Interpreters/RowRefs.h>
 
 #include <Core/Block.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/typeid_cast.h>
 #include <Common/ColumnsHashing.h>
 #include <Columns/IColumn.h>
@@ -69,7 +69,7 @@ void AsofRowRefs::insert(TypeIndex type, const IColumn & asof_column, const Bloc
         using T = std::decay_t<decltype(t)>;
         using LookupPtr = typename Entry<T>::LookupPtr;
 
-        using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColumnType = ColumnVectorOrDecimal<T>;
         const auto & column = typeid_cast<const ColumnType &>(asof_column);
 
         T key = column.getElement(row_num);
@@ -93,7 +93,7 @@ const RowRef * AsofRowRefs::findAsof(TypeIndex type, ASOF::Inequality inequality
         using EntryType = Entry<T>;
         using LookupPtr = typename EntryType::LookupPtr;
 
-        using ColumnType = std::conditional_t<IsDecimalNumber<T>, ColumnDecimal<T>, ColumnVector<T>>;
+        using ColumnType = ColumnVectorOrDecimal<T>;
         const auto & column = typeid_cast<const ColumnType &>(asof_column);
         T key = column.getElement(row_num);
         auto & typed_lookup = std::get<LookupPtr>(lookups);
diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h
index 8e5141be199..047146d569c 100644
--- a/src/Interpreters/RowRefs.h
+++ b/src/Interpreters/RowRefs.h
@@ -77,6 +77,13 @@ struct RowRefList : RowRef
             return &batch->row_refs[position];
         }
 
+        const RowRef * operator * () const
+        {
+            if (first)
+                return root;
+            return &batch->row_refs[position];
+        }
+
         void operator ++ ()
         {
             if (first)
diff --git a/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp b/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp
new file mode 100644
index 00000000000..e26c4371591
--- /dev/null
+++ b/src/Interpreters/SelectIntersectExceptQueryVisitor.cpp
@@ -0,0 +1,129 @@
+#include <Interpreters/SelectIntersectExceptQueryVisitor.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Common/typeid_cast.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+/*
+ * Note: there is a difference between intersect and except behaviour.
+ * `intersect` is supposed to be a part of the last SelectQuery, i.e. the sequence with no parenthesis:
+ * select 1 union all select 2 except select 1 intersect 2 except select 2 union distinct select 5;
+ * is interpreted as:
+ * select 1 union all select 2 except (select 1 intersect 2) except select 2 union distinct select 5;
+ * Whereas `except` is applied to all left union part like:
+ * (((select 1 union all select 2) except (select 1 intersect 2)) except select 2) union distinct select 5;
+**/
+
+void SelectIntersectExceptQueryMatcher::visit(ASTPtr & ast, Data & data)
+{
+    if (auto * select_union = ast->as<ASTSelectWithUnionQuery>())
+        visit(*select_union, data);
+}
+
+void SelectIntersectExceptQueryMatcher::visit(ASTSelectWithUnionQuery & ast, Data &)
+{
+    const auto & union_modes = ast.list_of_modes;
+
+    if (union_modes.empty())
+        return;
+
+    auto selects = std::move(ast.list_of_selects->children);
+
+    if (union_modes.size() + 1 != selects.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect ASTSelectWithUnionQuery (modes: {}, selects: {})",
+                        union_modes.size(), selects.size());
+
+    std::reverse(selects.begin(), selects.end());
+
+    ASTs children = {selects.back()};
+    selects.pop_back();
+    ASTSelectWithUnionQuery::UnionModes modes;
+
+    for (const auto & mode : union_modes)
+    {
+        switch (mode)
+        {
+            case ASTSelectWithUnionQuery::Mode::EXCEPT:
+            {
+                auto left = std::make_shared<ASTSelectWithUnionQuery>();
+                left->union_mode = ASTSelectWithUnionQuery::Mode::ALL;
+
+                left->list_of_selects = std::make_shared<ASTExpressionList>();
+                left->children.push_back(left->list_of_selects);
+                left->list_of_selects->children = std::move(children);
+
+                left->list_of_modes = std::move(modes);
+                modes = {};
+
+                auto right = selects.back();
+                selects.pop_back();
+
+                auto except_node = std::make_shared<ASTSelectIntersectExceptQuery>();
+                except_node->final_operator = ASTSelectIntersectExceptQuery::Operator::EXCEPT;
+                except_node->children = {left, right};
+
+                children = {except_node};
+                break;
+            }
+            case ASTSelectWithUnionQuery::Mode::INTERSECT:
+            {
+                bool from_except = false;
+                const auto * except_ast = typeid_cast<const ASTSelectIntersectExceptQuery *>(children.back().get());
+                if (except_ast && (except_ast->final_operator == ASTSelectIntersectExceptQuery::Operator::EXCEPT))
+                    from_except = true;
+
+                ASTPtr left;
+                if (from_except)
+                {
+                    left = std::move(children.back()->children[1]);
+                }
+                else
+                {
+                    left = children.back();
+                    children.pop_back();
+                }
+
+                auto right = selects.back();
+                selects.pop_back();
+
+                auto intersect_node = std::make_shared<ASTSelectIntersectExceptQuery>();
+                intersect_node->final_operator = ASTSelectIntersectExceptQuery::Operator::INTERSECT;
+                intersect_node->children = {left, right};
+
+                if (from_except)
+                    children.back()->children[1] = std::move(intersect_node);
+                else
+                    children.push_back(std::move(intersect_node));
+
+                break;
+            }
+            default:
+            {
+                auto right = selects.back();
+                selects.pop_back();
+                children.emplace_back(std::move(right));
+                modes.push_back(mode);
+                break;
+            }
+        }
+    }
+
+    if (!selects.empty())
+    {
+        auto right = selects.back();
+        selects.pop_back();
+        children.emplace_back(std::move(right));
+    }
+
+    ast.union_mode = ASTSelectWithUnionQuery::Mode::Unspecified;
+    ast.list_of_selects->children = std::move(children);
+    ast.list_of_modes = std::move(modes);
+}
+
+}
diff --git a/src/Interpreters/SelectIntersectExceptQueryVisitor.h b/src/Interpreters/SelectIntersectExceptQueryVisitor.h
new file mode 100644
index 00000000000..07a6ad606a1
--- /dev/null
+++ b/src/Interpreters/SelectIntersectExceptQueryVisitor.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <unordered_set>
+
+#include <Parsers/IAST.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+
+
+namespace DB
+{
+
+class ASTFunction;
+
+class SelectIntersectExceptQueryMatcher
+{
+public:
+    struct Data {};
+
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+
+    static void visit(ASTPtr & ast, Data &);
+    static void visit(ASTSelectWithUnionQuery &, Data &);
+};
+
+/// Visit children first.
+using SelectIntersectExceptQueryVisitor
+    = InDepthNodeVisitor<SelectIntersectExceptQueryMatcher, false>;
+}
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
new file mode 100644
index 00000000000..a652ee7e81a
--- /dev/null
+++ b/src/Interpreters/Session.cpp
@@ -0,0 +1,502 @@
+#include <Interpreters/Session.h>
+
+#include <Access/AccessControlManager.h>
+#include <Access/Credentials.h>
+#include <Access/ContextAccess.h>
+#include <Access/User.h>
+#include <base/logger_useful.h>
+#include <Common/Exception.h>
+#include <Common/ThreadPool.h>
+#include <Common/setThreadName.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/SessionLog.h>
+
+#include <magic_enum.hpp>
+
+#include <atomic>
+#include <condition_variable>
+#include <deque>
+#include <mutex>
+#include <unordered_map>
+#include <vector>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int SESSION_NOT_FOUND;
+    extern const int SESSION_IS_LOCKED;
+}
+
+
+class NamedSessionsStorage;
+
+/// User ID and session identifier. Named sessions are local to users.
+using NamedSessionKey = std::pair<UUID, String>;
+
+/// Named sessions. The user could specify session identifier to reuse settings and temporary tables in subsequent requests.
+struct NamedSessionData
+{
+    NamedSessionKey key;
+    UInt64 close_cycle = 0;
+    ContextMutablePtr context;
+    std::chrono::steady_clock::duration timeout;
+    NamedSessionsStorage & parent;
+
+    NamedSessionData(NamedSessionKey key_, ContextPtr context_, std::chrono::steady_clock::duration timeout_, NamedSessionsStorage & parent_)
+        : key(std::move(key_)), context(Context::createCopy(context_)), timeout(timeout_), parent(parent_)
+    {}
+
+    void release();
+};
+
+class NamedSessionsStorage
+{
+public:
+    using Key = NamedSessionKey;
+
+    static NamedSessionsStorage & instance()
+    {
+        static NamedSessionsStorage the_instance;
+        return the_instance;
+    }
+
+    ~NamedSessionsStorage()
+    {
+        try
+        {
+            shutdown();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+
+    void shutdown()
+    {
+        {
+            std::lock_guard lock{mutex};
+            sessions.clear();
+            if (!thread.joinable())
+                return;
+            quit = true;
+        }
+
+        cond.notify_one();
+        thread.join();
+    }
+
+    /// Find existing session or create a new.
+    std::pair<std::shared_ptr<NamedSessionData>, bool> acquireSession(
+        const ContextPtr & global_context,
+        const UUID & user_id,
+        const String & session_id,
+        std::chrono::steady_clock::duration timeout,
+        bool throw_if_not_found)
+    {
+        std::unique_lock lock(mutex);
+
+        Key key{user_id, session_id};
+
+        auto it = sessions.find(key);
+        if (it == sessions.end())
+        {
+            if (throw_if_not_found)
+                throw Exception("Session not found.", ErrorCodes::SESSION_NOT_FOUND);
+
+            /// Create a new session from current context.
+            auto context = Context::createCopy(global_context);
+            it = sessions.insert(std::make_pair(key, std::make_shared<NamedSessionData>(key, context, timeout, *this))).first;
+            const auto & session = it->second;
+
+            if (!thread.joinable())
+                thread = ThreadFromGlobalPool{&NamedSessionsStorage::cleanThread, this};
+
+            return {session, true};
+        }
+        else
+        {
+            /// Use existing session.
+            const auto & session = it->second;
+
+            if (!session.unique())
+                throw Exception("Session is locked by a concurrent client.", ErrorCodes::SESSION_IS_LOCKED);
+            return {session, false};
+        }
+    }
+
+    void releaseSession(NamedSessionData & session)
+    {
+        std::unique_lock lock(mutex);
+        scheduleCloseSession(session, lock);
+    }
+
+private:
+    class SessionKeyHash
+    {
+    public:
+        size_t operator()(const Key & key) const
+        {
+            SipHash hash;
+            hash.update(key.first);
+            hash.update(key.second);
+            return hash.get64();
+        }
+    };
+
+    /// TODO it's very complicated. Make simple std::map with time_t or boost::multi_index.
+    using Container = std::unordered_map<Key, std::shared_ptr<NamedSessionData>, SessionKeyHash>;
+    using CloseTimes = std::deque<std::vector<Key>>;
+    Container sessions;
+    CloseTimes close_times;
+    std::chrono::steady_clock::duration close_interval = std::chrono::seconds(1);
+    std::chrono::steady_clock::time_point close_cycle_time = std::chrono::steady_clock::now();
+    UInt64 close_cycle = 0;
+
+    void scheduleCloseSession(NamedSessionData & session, std::unique_lock<std::mutex> &)
+    {
+        /// Push it on a queue of sessions to close, on a position corresponding to the timeout.
+        /// (timeout is measured from current moment of time)
+
+        const UInt64 close_index = session.timeout / close_interval + 1;
+        const auto new_close_cycle = close_cycle + close_index;
+
+        if (session.close_cycle != new_close_cycle)
+        {
+            session.close_cycle = new_close_cycle;
+            if (close_times.size() < close_index + 1)
+                close_times.resize(close_index + 1);
+            close_times[close_index].emplace_back(session.key);
+        }
+    }
+
+    void cleanThread()
+    {
+        setThreadName("SessionCleaner");
+        std::unique_lock lock{mutex};
+        while (!quit)
+        {
+            auto interval = closeSessions(lock);
+            if (cond.wait_for(lock, interval, [this]() -> bool { return quit; }))
+                break;
+        }
+    }
+
+    /// Close sessions, that has been expired. Returns how long to wait for next session to be expired, if no new sessions will be added.
+    std::chrono::steady_clock::duration closeSessions(std::unique_lock<std::mutex> & lock)
+    {
+        const auto now = std::chrono::steady_clock::now();
+
+        /// The time to close the next session did not come
+        if (now < close_cycle_time)
+            return close_cycle_time - now;  /// Will sleep until it comes.
+
+        const auto current_cycle = close_cycle;
+
+        ++close_cycle;
+        close_cycle_time = now + close_interval;
+
+        if (close_times.empty())
+            return close_interval;
+
+        auto & sessions_to_close = close_times.front();
+
+        for (const auto & key : sessions_to_close)
+        {
+            const auto session = sessions.find(key);
+
+            if (session != sessions.end() && session->second->close_cycle <= current_cycle)
+            {
+                if (!session->second.unique())
+                {
+                    /// Skip but move it to close on the next cycle.
+                    session->second->timeout = std::chrono::steady_clock::duration{0};
+                    scheduleCloseSession(*session->second, lock);
+                }
+                else
+                    sessions.erase(session);
+            }
+        }
+
+        close_times.pop_front();
+        return close_interval;
+    }
+
+    std::mutex mutex;
+    std::condition_variable cond;
+    ThreadFromGlobalPool thread;
+    bool quit = false;
+};
+
+
+void NamedSessionData::release()
+{
+    parent.releaseSession(*this);
+}
+
+void Session::shutdownNamedSessions()
+{
+    NamedSessionsStorage::instance().shutdown();
+}
+
+Session::Session(const ContextPtr & global_context_, ClientInfo::Interface interface_)
+    : session_id(UUIDHelpers::generateV4()),
+      global_context(global_context_),
+      log(&Poco::Logger::get(String{magic_enum::enum_name(interface_)} + "-Session"))
+{
+    prepared_client_info.emplace();
+    prepared_client_info->interface = interface_;
+}
+
+Session::~Session()
+{
+    LOG_DEBUG(log, "{} Destroying {} of user {}",
+        toString(session_id),
+        (named_session ? "named session '" + named_session->key.second + "'" : "unnamed session"),
+        (user_id ? toString(*user_id) : "<EMPTY>")
+    );
+
+    /// Early release a NamedSessionData.
+    if (named_session)
+        named_session->release();
+
+    if (notified_session_log_about_login)
+    {
+        if (auto session_log = getSessionLog(); session_log && user)
+            session_log->addLogOut(session_id, user->getName(), getClientInfo());
+    }
+}
+
+Authentication::Type Session::getAuthenticationType(const String & user_name) const
+{
+    return global_context->getAccessControlManager().read<User>(user_name)->authentication.getType();
+}
+
+Authentication::Type Session::getAuthenticationTypeOrLogInFailure(const String & user_name) const
+{
+    try
+    {
+        return getAuthenticationType(user_name);
+    }
+    catch (const Exception & e)
+    {
+        if (auto session_log = getSessionLog())
+            session_log->addLoginFailure(session_id, getClientInfo(), user_name, e);
+
+        throw;
+    }
+}
+
+void Session::authenticate(const String & user_name, const String & password, const Poco::Net::SocketAddress & address)
+{
+    authenticate(BasicCredentials{user_name, password}, address);
+}
+
+void Session::authenticate(const Credentials & credentials_, const Poco::Net::SocketAddress & address_)
+{
+    if (session_context)
+        throw Exception("If there is a session context it must be created after authentication", ErrorCodes::LOGICAL_ERROR);
+
+    auto address = address_;
+    if ((address == Poco::Net::SocketAddress{}) && (prepared_client_info->interface == ClientInfo::Interface::LOCAL))
+        address = Poco::Net::SocketAddress{"127.0.0.1", 0};
+
+    LOG_DEBUG(log, "{} Authenticating user '{}' from {}",
+            toString(session_id), credentials_.getUserName(), address.toString());
+
+    try
+    {
+        user_id = global_context->getAccessControlManager().login(credentials_, address.host());
+        LOG_DEBUG(log, "{} Authenticated with global context as user {}",
+                toString(session_id), user_id ? toString(*user_id) : "<EMPTY>");
+    }
+    catch (const Exception & e)
+    {
+        LOG_DEBUG(log, "{} Authentication failed with error: {}", toString(session_id), e.what());
+        if (auto session_log = getSessionLog())
+            session_log->addLoginFailure(session_id, *prepared_client_info, credentials_.getUserName(), e);
+        throw;
+    }
+
+    prepared_client_info->current_user = credentials_.getUserName();
+    prepared_client_info->current_address = address;
+}
+
+ClientInfo & Session::getClientInfo()
+{
+    return session_context ? session_context->getClientInfo() : *prepared_client_info;
+}
+
+const ClientInfo & Session::getClientInfo() const
+{
+    return session_context ? session_context->getClientInfo() : *prepared_client_info;
+}
+
+ContextMutablePtr Session::makeSessionContext()
+{
+    if (session_context)
+        throw Exception("Session context already exists", ErrorCodes::LOGICAL_ERROR);
+    if (query_context_created)
+        throw Exception("Session context must be created before any query context", ErrorCodes::LOGICAL_ERROR);
+
+    LOG_DEBUG(log, "{} Creating session context with user_id: {}",
+            toString(session_id), user_id ? toString(*user_id) : "<EMPTY>");
+    /// Make a new session context.
+    ContextMutablePtr new_session_context;
+    new_session_context = Context::createCopy(global_context);
+    new_session_context->makeSessionContext();
+
+    /// Copy prepared client info to the new session context.
+    auto & res_client_info = new_session_context->getClientInfo();
+    res_client_info = std::move(prepared_client_info).value();
+    prepared_client_info.reset();
+
+    /// Set user information for the new context: current profiles, roles, access rights.
+    if (user_id)
+        new_session_context->setUser(*user_id);
+
+    /// Session context is ready.
+    session_context = new_session_context;
+    user = session_context->getUser();
+
+    return session_context;
+}
+
+ContextMutablePtr Session::makeSessionContext(const String & session_name_, std::chrono::steady_clock::duration timeout_, bool session_check_)
+{
+    if (session_context)
+        throw Exception("Session context already exists", ErrorCodes::LOGICAL_ERROR);
+    if (query_context_created)
+        throw Exception("Session context must be created before any query context", ErrorCodes::LOGICAL_ERROR);
+
+    LOG_DEBUG(log, "{} Creating named session context with name: {}, user_id: {}",
+              toString(session_id), session_name_, user_id ? toString(*user_id) : "<EMPTY>");
+
+    /// Make a new session context OR
+    /// if the `session_id` and `user_id` were used before then just get a previously created session context.
+    std::shared_ptr<NamedSessionData> new_named_session;
+    bool new_named_session_created = false;
+    std::tie(new_named_session, new_named_session_created)
+        = NamedSessionsStorage::instance().acquireSession(global_context, user_id.value_or(UUID{}), session_name_, timeout_, session_check_);
+
+    auto new_session_context = new_named_session->context;
+    new_session_context->makeSessionContext();
+
+    /// Copy prepared client info to the session context, no matter it's been just created or not.
+    /// If we continue using a previously created session context found by session ID
+    /// it's necessary to replace the client info in it anyway, because it contains actual connection information (client address, etc.)
+    auto & res_client_info = new_session_context->getClientInfo();
+    res_client_info = std::move(prepared_client_info).value();
+    prepared_client_info.reset();
+
+    /// Set user information for the new context: current profiles, roles, access rights.
+    if (user_id && !new_session_context->getUser())
+        new_session_context->setUser(*user_id);
+
+    /// Session context is ready.
+    session_context = std::move(new_session_context);
+    named_session = new_named_session;
+    named_session_created = new_named_session_created;
+    user = session_context->getUser();
+
+    return session_context;
+}
+
+ContextMutablePtr Session::makeQueryContext(const ClientInfo & query_client_info) const
+{
+    return makeQueryContextImpl(&query_client_info, nullptr);
+}
+
+ContextMutablePtr Session::makeQueryContext(ClientInfo && query_client_info) const
+{
+    return makeQueryContextImpl(nullptr, &query_client_info);
+}
+
+std::shared_ptr<SessionLog> Session::getSessionLog() const
+{
+    // take it from global context, since it outlives the Session and always available.
+    // please note that server may have session_log disabled, hence this may return nullptr.
+    return global_context->getSessionLog();
+}
+
+ContextMutablePtr Session::makeQueryContextImpl(const ClientInfo * client_info_to_copy, ClientInfo * client_info_to_move) const
+{
+    /// We can create a query context either from a session context or from a global context.
+    bool from_session_context = static_cast<bool>(session_context);
+
+    /// Create a new query context.
+    ContextMutablePtr query_context = Context::createCopy(from_session_context ? session_context : global_context);
+    query_context->makeQueryContext();
+
+    LOG_DEBUG(log, "{} Creating query context from {} context, user_id: {}, parent context user: {}",
+              toString(session_id),
+              from_session_context ? "session" : "global",
+              user_id ? toString(*user_id) : "<EMPTY>",
+              query_context->getUser() ? query_context->getUser()->getName() : "<NOT SET>");
+
+    /// Copy the specified client info to the new query context.
+    auto & res_client_info = query_context->getClientInfo();
+    if (client_info_to_move)
+        res_client_info = std::move(*client_info_to_move);
+    else if (client_info_to_copy && (client_info_to_copy != &getClientInfo()))
+        res_client_info = *client_info_to_copy;
+
+    /// Copy current user's name and address if it was authenticated after query_client_info was initialized.
+    if (prepared_client_info && !prepared_client_info->current_user.empty())
+    {
+        res_client_info.current_user = prepared_client_info->current_user;
+        res_client_info.current_address = prepared_client_info->current_address;
+    }
+
+    /// Set parameters of initial query.
+    if (res_client_info.query_kind == ClientInfo::QueryKind::NO_QUERY)
+        res_client_info.query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
+
+    if (res_client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+    {
+        res_client_info.initial_user = res_client_info.current_user;
+        res_client_info.initial_address = res_client_info.current_address;
+    }
+
+    /// Sets that row policies from the initial user should be used too.
+    query_context->setInitialRowPolicy();
+
+    /// Set user information for the new context: current profiles, roles, access rights.
+    if (user_id && !query_context->getUser())
+        query_context->setUser(*user_id);
+
+    /// Query context is ready.
+    query_context_created = true;
+    user = query_context->getUser();
+
+    if (!notified_session_log_about_login)
+    {
+        if (auto session_log = getSessionLog(); user && user_id && session_log)
+        {
+            session_log->addLoginSuccess(
+                    session_id,
+                    named_session ? std::optional<std::string>(named_session->key.second) : std::nullopt,
+                    *query_context);
+
+            notified_session_log_about_login = true;
+        }
+    }
+
+    return query_context;
+}
+
+
+void Session::releaseSessionID()
+{
+    if (!named_session)
+        return;
+    named_session->release();
+    named_session = nullptr;
+}
+
+}
+
diff --git a/src/Interpreters/Session.h b/src/Interpreters/Session.h
new file mode 100644
index 00000000000..b62327103e9
--- /dev/null
+++ b/src/Interpreters/Session.h
@@ -0,0 +1,99 @@
+#pragma once
+
+#include <Common/SettingsChanges.h>
+#include <Access/Authentication.h>
+#include <Interpreters/ClientInfo.h>
+#include <Interpreters/Context_fwd.h>
+
+#include <chrono>
+#include <memory>
+#include <optional>
+
+namespace Poco::Net { class SocketAddress; }
+
+namespace DB
+{
+class Credentials;
+class Authentication;
+struct NamedSessionData;
+class NamedSessionsStorage;
+struct User;
+using UserPtr = std::shared_ptr<const User>;
+class SessionLog;
+
+/** Represents user-session from the server perspective,
+ *  basically it is just a smaller subset of Context API, simplifies Context management.
+ *
+ * Holds session context, facilitates acquisition of NamedSession and proper creation of query contexts.
+ */
+class Session
+{
+public:
+    /// Stops using named sessions. The method must be called at the server shutdown.
+    static void shutdownNamedSessions();
+
+    Session(const ContextPtr & global_context_, ClientInfo::Interface interface_);
+    ~Session();
+
+    Session(const Session &&) = delete;
+    Session& operator=(const Session &&) = delete;
+    Session(const Session &) = delete;
+    Session& operator=(const Session &) = delete;
+
+    /// Provides information about the authentication type of a specified user.
+    Authentication::Type getAuthenticationType(const String & user_name) const;
+
+    /// Same as getAuthenticationType, but adds LoginFailure event in case of error.
+    Authentication::Type getAuthenticationTypeOrLogInFailure(const String & user_name) const;
+
+    /// Sets the current user, checks the credentials and that the specified address is allowed to connect from.
+    /// The function throws an exception if there is no such user or password is wrong.
+    void authenticate(const String & user_name, const String & password, const Poco::Net::SocketAddress & address);
+    void authenticate(const Credentials & credentials_, const Poco::Net::SocketAddress & address_);
+
+    /// Returns a reference to session ClientInfo.
+    ClientInfo & getClientInfo();
+    const ClientInfo & getClientInfo() const;
+
+    /// Makes a session context, can be used one or zero times.
+    /// The function also assigns an user to this context.
+    ContextMutablePtr makeSessionContext();
+    ContextMutablePtr makeSessionContext(const String & session_name_, std::chrono::steady_clock::duration timeout_, bool session_check_);
+    ContextMutablePtr sessionContext() { return session_context; }
+    ContextPtr sessionContext() const { return session_context; }
+
+    /// Makes a query context, can be used multiple times, with or without makeSession() called earlier.
+    /// The query context will be created from a copy of a session context if it exists, or from a copy of
+    /// a global context otherwise. In the latter case the function also assigns an user to this context.
+    ContextMutablePtr makeQueryContext() const { return makeQueryContext(getClientInfo()); }
+    ContextMutablePtr makeQueryContext(const ClientInfo & query_client_info) const;
+    ContextMutablePtr makeQueryContext(ClientInfo && query_client_info) const;
+
+    /// Releases the currently used session ID so it becomes available for reuse by another session.
+    void releaseSessionID();
+
+private:
+    std::shared_ptr<SessionLog> getSessionLog() const;
+    ContextMutablePtr makeQueryContextImpl(const ClientInfo * client_info_to_copy, ClientInfo * client_info_to_move) const;
+
+    mutable bool notified_session_log_about_login = false;
+    const UUID session_id;
+    const ContextPtr global_context;
+
+    /// ClientInfo that will be copied to a session context when it's created.
+    std::optional<ClientInfo> prepared_client_info;
+
+    mutable UserPtr user;
+    std::optional<UUID> user_id;
+
+    ContextMutablePtr session_context;
+    mutable bool query_context_created = false;
+
+    std::shared_ptr<NamedSessionData> named_session;
+    bool named_session_created = false;
+
+    Poco::Logger * log = nullptr;
+};
+
+}
+
diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp
new file mode 100644
index 00000000000..4967cb867c8
--- /dev/null
+++ b/src/Interpreters/SessionLog.cpp
@@ -0,0 +1,261 @@
+#include <Interpreters/SessionLog.h>
+
+#include <Access/ContextAccess.h>
+#include <Access/User.h>
+#include <Access/EnabledRolesInfo.h>
+#include <Core/Settings.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Common/IPv6ToBinary.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Access/SettingsProfilesInfo.h>
+
+#include <cassert>
+
+namespace
+{
+using namespace DB;
+
+inline DateTime64 time_in_microseconds(std::chrono::time_point<std::chrono::system_clock> timepoint)
+{
+    return std::chrono::duration_cast<std::chrono::microseconds>(timepoint.time_since_epoch()).count();
+}
+
+inline time_t time_in_seconds(std::chrono::time_point<std::chrono::system_clock> timepoint)
+{
+    return std::chrono::duration_cast<std::chrono::seconds>(timepoint.time_since_epoch()).count();
+}
+
+auto eventTime()
+{
+    const auto finish_time = std::chrono::system_clock::now();
+
+    return std::make_pair(time_in_seconds(finish_time), time_in_microseconds(finish_time));
+}
+
+using AuthType = Authentication::Type;
+using Interface = ClientInfo::Interface;
+
+void fillColumnArray(const Strings & data, IColumn & column)
+{
+    auto & array = typeid_cast<ColumnArray &>(column);
+    size_t size = 0;
+    auto & data_col = array.getData();
+    for (const auto & name : data)
+    {
+        data_col.insertData(name.data(), name.size());
+        ++size;
+    }
+    auto & offsets = array.getOffsets();
+    offsets.push_back(offsets.back() + size);
+};
+
+}
+
+namespace DB
+{
+
+SessionLogElement::SessionLogElement(const UUID & session_id_, Type type_)
+    : session_id(session_id_),
+      type(type_)
+{
+    std::tie(event_time, event_time_microseconds) = eventTime();
+}
+
+NamesAndTypesList SessionLogElement::getNamesAndTypes()
+{
+    const auto event_type = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            {"LoginFailure",           static_cast<Int8>(SESSION_LOGIN_FAILURE)},
+            {"LoginSuccess",           static_cast<Int8>(SESSION_LOGIN_SUCCESS)},
+            {"Logout",                 static_cast<Int8>(SESSION_LOGOUT)}
+        });
+
+#define AUTH_TYPE_NAME_AND_VALUE(v) std::make_pair(Authentication::TypeInfo::get(v).raw_name, static_cast<Int8>(v))
+    const auto identified_with_column = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::NO_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::PLAINTEXT_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::SHA256_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::DOUBLE_SHA1_PASSWORD),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::LDAP),
+            AUTH_TYPE_NAME_AND_VALUE(AuthType::KERBEROS)
+        });
+#undef AUTH_TYPE_NAME_AND_VALUE
+
+    const auto interface_type_column = std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+        {
+            {"TCP",                    static_cast<Int8>(Interface::TCP)},
+            {"HTTP",                   static_cast<Int8>(Interface::HTTP)},
+            {"gRPC",                   static_cast<Int8>(Interface::GRPC)},
+            {"MySQL",                  static_cast<Int8>(Interface::MYSQL)},
+            {"PostgreSQL",             static_cast<Int8>(Interface::POSTGRESQL)}
+        });
+
+    const auto lc_string_datatype = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+
+    const auto changed_settings_type_column = std::make_shared<DataTypeArray>(
+        std::make_shared<DataTypeTuple>(
+            DataTypes({
+                // setting name
+                lc_string_datatype,
+                // value
+                std::make_shared<DataTypeString>()
+            })));
+
+    return
+    {
+        {"type", std::move(event_type)},
+        {"session_id", std::make_shared<DataTypeUUID>()},
+        {"session_name", std::make_shared<DataTypeString>()},
+        {"event_date", std::make_shared<DataTypeDate>()},
+        {"event_time", std::make_shared<DataTypeDateTime>()},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+
+        {"user", std::make_shared<DataTypeString>()},
+        {"auth_type", std::move(identified_with_column)},
+
+        {"profiles", std::make_shared<DataTypeArray>(lc_string_datatype)},
+        {"roles", std::make_shared<DataTypeArray>(lc_string_datatype)},
+        {"changed_settings", std::move(changed_settings_type_column)},
+
+        {"client_address", DataTypeFactory::instance().get("IPv6")},
+        {"client_port", std::make_shared<DataTypeUInt16>()},
+        {"interface", std::move(interface_type_column)},
+
+        {"client_hostname", std::make_shared<DataTypeString>()},
+        {"client_name", std::make_shared<DataTypeString>()},
+        {"client_revision", std::make_shared<DataTypeUInt32>()},
+        {"client_version_major", std::make_shared<DataTypeUInt32>()},
+        {"client_version_minor", std::make_shared<DataTypeUInt32>()},
+        {"client_version_patch", std::make_shared<DataTypeUInt32>()},
+
+        {"failure_reason", std::make_shared<DataTypeString>()},
+    };
+}
+
+void SessionLogElement::appendToBlock(MutableColumns & columns) const
+{
+    assert(type >= SESSION_LOGIN_FAILURE && type <= SESSION_LOGOUT);
+    assert(user_identified_with >= Authentication::Type::NO_PASSWORD && user_identified_with <= Authentication::Type::MAX_TYPE);
+
+    size_t i = 0;
+
+    columns[i++]->insert(type);
+    columns[i++]->insert(session_id);
+    columns[i++]->insert(session_name);
+    columns[i++]->insert(static_cast<DayNum>(DateLUT::instance().toDayNum(event_time).toUnderType()));
+    columns[i++]->insert(event_time);
+    columns[i++]->insert(event_time_microseconds);
+
+    columns[i++]->insert(user);
+    columns[i++]->insert(user_identified_with);
+
+    fillColumnArray(profiles, *columns[i++]);
+    fillColumnArray(roles, *columns[i++]);
+
+    {
+        auto & changed_settings_array_col = assert_cast<ColumnArray &>(*columns[i++]);
+        auto & changed_settings_tuple_col = assert_cast<ColumnTuple &>(changed_settings_array_col.getData());
+        auto & names_col = *changed_settings_tuple_col.getColumnPtr(0)->assumeMutable();
+        auto & values_col = assert_cast<ColumnString &>(*changed_settings_tuple_col.getColumnPtr(1)->assumeMutable());
+
+        size_t items_added = 0;
+        for (const auto & kv : changed_settings)
+        {
+            names_col.insert(kv.first);
+            values_col.insert(kv.second);
+            ++items_added;
+        }
+
+        auto & offsets = changed_settings_array_col.getOffsets();
+        offsets.push_back(changed_settings_tuple_col.size());
+    }
+
+    columns[i++]->insertData(IPv6ToBinary(client_info.current_address.host()).data(), 16);
+    columns[i++]->insert(client_info.current_address.port());
+
+    columns[i++]->insert(client_info.interface);
+
+    columns[i++]->insertData(client_info.client_hostname.data(), client_info.client_hostname.length());
+    columns[i++]->insertData(client_info.client_name.data(), client_info.client_name.length());
+    columns[i++]->insert(client_info.client_tcp_protocol_version);
+    columns[i++]->insert(client_info.client_version_major);
+    columns[i++]->insert(client_info.client_version_minor);
+    columns[i++]->insert(client_info.client_version_patch);
+
+    columns[i++]->insertData(auth_failure_reason.data(), auth_failure_reason.length());
+}
+
+void SessionLog::addLoginSuccess(const UUID & session_id, std::optional<String> session_name, const Context & login_context)
+{
+    const auto access = login_context.getAccess();
+    const auto & settings = login_context.getSettingsRef();
+    const auto & client_info = login_context.getClientInfo();
+
+    DB::SessionLogElement log_entry(session_id, SESSION_LOGIN_SUCCESS);
+    log_entry.client_info = client_info;
+
+    {
+        const auto user = access->getUser();
+        log_entry.user = user->getName();
+        log_entry.user_identified_with = user->authentication.getType();
+        log_entry.external_auth_server = user->authentication.getLDAPServerName();
+    }
+
+    if (session_name)
+        log_entry.session_name = *session_name;
+
+    if (const auto roles_info = access->getRolesInfo())
+        log_entry.roles = roles_info->getCurrentRolesNames();
+
+    if (const auto profile_info = access->getDefaultProfileInfo())
+    log_entry.profiles = profile_info->getProfileNames();
+
+    for (const auto & s : settings.allChanged())
+        log_entry.changed_settings.emplace_back(s.getName(), s.getValueString());
+
+    add(log_entry);
+}
+
+void SessionLog::addLoginFailure(
+        const UUID & session_id,
+        const ClientInfo & info,
+        const String & user,
+        const Exception & reason)
+{
+    SessionLogElement log_entry(session_id, SESSION_LOGIN_FAILURE);
+
+    log_entry.user = user;
+    log_entry.auth_failure_reason = reason.message();
+    log_entry.client_info = info;
+    log_entry.user_identified_with = Authentication::Type::NO_PASSWORD;
+
+    add(log_entry);
+}
+
+void SessionLog::addLogOut(const UUID & session_id, const String & user, const ClientInfo & client_info)
+{
+    auto log_entry = SessionLogElement(session_id, SESSION_LOGOUT);
+    log_entry.user = user;
+    log_entry.client_info = client_info;
+
+    add(log_entry);
+}
+
+}
diff --git a/src/Interpreters/SessionLog.h b/src/Interpreters/SessionLog.h
new file mode 100644
index 00000000000..fddabf45e4e
--- /dev/null
+++ b/src/Interpreters/SessionLog.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include <Interpreters/SystemLog.h>
+#include <Interpreters/ClientInfo.h>
+#include <Access/Authentication.h>
+
+namespace DB
+{
+
+enum SessionLogElementType : int8_t
+{
+    SESSION_LOGIN_FAILURE = 0,
+    SESSION_LOGIN_SUCCESS = 1,
+    SESSION_LOGOUT = 2,
+};
+
+class ContextAccess;
+
+/** A struct which will be inserted as row into session_log table.
+  *
+  *  Allows to log information about user sessions:
+  * - auth attempts, auth result, auth method, etc.
+  * - log out events
+  */
+struct SessionLogElement
+{
+    using Type = SessionLogElementType;
+
+    SessionLogElement() = default;
+    SessionLogElement(const UUID & session_id_, Type type_);
+    SessionLogElement(const SessionLogElement &) = default;
+    SessionLogElement & operator=(const SessionLogElement &) = default;
+    SessionLogElement(SessionLogElement &&) = default;
+    SessionLogElement & operator=(SessionLogElement &&) = default;
+
+    UUID session_id;
+
+    Type type = SESSION_LOGIN_FAILURE;
+
+    String session_name;
+    time_t event_time{};
+    Decimal64 event_time_microseconds{};
+
+    String user;
+    Authentication::Type user_identified_with = Authentication::Type::NO_PASSWORD;
+    String external_auth_server;
+    Strings roles;
+    Strings profiles;
+    std::vector<std::pair<String, String>> changed_settings;
+
+    ClientInfo client_info;
+    String auth_failure_reason;
+
+    static std::string name() { return "SessionLog"; }
+
+    static NamesAndTypesList getNamesAndTypes();
+    static NamesAndAliases getNamesAndAliases() { return {}; }
+
+    void appendToBlock(MutableColumns & columns) const;
+};
+
+
+/// Instead of typedef - to allow forward declaration.
+class SessionLog : public SystemLog<SessionLogElement>
+{
+    using SystemLog<SessionLogElement>::SystemLog;
+
+public:
+    void addLoginSuccess(const UUID & session_id, std::optional<String> session_name, const Context & login_context);
+    void addLoginFailure(const UUID & session_id, const ClientInfo & info, const String & user, const Exception & reason);
+    void addLogOut(const UUID & session_id, const String & user, const ClientInfo & client_info);
+};
+
+}
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index ff502b499cd..90fc0f6c0d0 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -24,7 +24,7 @@
 
 #include <Storages/MergeTree/KeyCondition.h>
 
-#include <common/range.h>
+#include <base/range.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
@@ -99,14 +99,14 @@ void NO_INLINE Set::insertFromBlockImplCase(
 }
 
 
-void Set::setHeader(const Block & header)
+void Set::setHeader(const ColumnsWithTypeAndName & header)
 {
     std::unique_lock lock(rwlock);
 
     if (!data.empty())
         return;
 
-    keys_size = header.columns();
+    keys_size = header.size();
     ColumnRawPtrs key_columns;
     key_columns.reserve(keys_size);
     data_types.reserve(keys_size);
@@ -118,10 +118,10 @@ void Set::setHeader(const Block & header)
     /// Remember the columns we will work with
     for (size_t i = 0; i < keys_size; ++i)
     {
-        materialized_columns.emplace_back(header.safeGetByPosition(i).column->convertToFullColumnIfConst());
+        materialized_columns.emplace_back(header.at(i).column->convertToFullColumnIfConst());
         key_columns.emplace_back(materialized_columns.back().get());
-        data_types.emplace_back(header.safeGetByPosition(i).type);
-        set_elements_types.emplace_back(header.safeGetByPosition(i).type);
+        data_types.emplace_back(header.at(i).type);
+        set_elements_types.emplace_back(header.at(i).type);
 
         /// Convert low cardinality column to full.
         if (const auto * low_cardinality_type = typeid_cast<const DataTypeLowCardinality *>(data_types.back().get()))
@@ -161,7 +161,7 @@ void Set::setHeader(const Block & header)
 }
 
 
-bool Set::insertFromBlock(const Block & block)
+bool Set::insertFromBlock(const ColumnsWithTypeAndName & columns)
 {
     std::unique_lock lock(rwlock);
 
@@ -177,11 +177,11 @@ bool Set::insertFromBlock(const Block & block)
     /// Remember the columns we will work with
     for (size_t i = 0; i < keys_size; ++i)
     {
-        materialized_columns.emplace_back(block.safeGetByPosition(i).column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality());
+        materialized_columns.emplace_back(columns.at(i).column->convertToFullColumnIfConst()->convertToFullColumnIfLowCardinality());
         key_columns.emplace_back(materialized_columns.back().get());
     }
 
-    size_t rows = block.rows();
+    size_t rows = columns.at(0).column->size();
 
     /// We will insert to the Set only keys, where all components are not NULL.
     ConstNullMapPtr null_map{};
@@ -192,7 +192,7 @@ bool Set::insertFromBlock(const Block & block)
     /// Filter to extract distinct values from the block.
     ColumnUInt8::MutablePtr filter;
     if (fill_set_elements)
-        filter = ColumnUInt8::create(block.rows());
+        filter = ColumnUInt8::create(rows);
 
     switch (data.type)
     {
@@ -224,16 +224,16 @@ bool Set::insertFromBlock(const Block & block)
 }
 
 
-ColumnPtr Set::execute(const Block & block, bool negative) const
+ColumnPtr Set::execute(const ColumnsWithTypeAndName & columns, bool negative) const
 {
-    size_t num_key_columns = block.columns();
+    size_t num_key_columns = columns.size();
 
     if (0 == num_key_columns)
         throw Exception("Logical error: no columns passed to Set::execute method.", ErrorCodes::LOGICAL_ERROR);
 
     auto res = ColumnUInt8::create();
     ColumnUInt8::Container & vec_res = res->getData();
-    vec_res.resize(block.safeGetByPosition(0).column->size());
+    vec_res.resize(columns.at(0).column->size());
 
     if (vec_res.empty())
         return res;
@@ -264,7 +264,7 @@ ColumnPtr Set::execute(const Block & block, bool negative) const
     {
         ColumnPtr result;
 
-        const auto & column_before_cast = block.safeGetByPosition(i);
+        const auto & column_before_cast = columns.at(i);
         ColumnWithTypeAndName column_to_cast
             = {column_before_cast.column->convertToFullColumnIfConst(), column_before_cast.type, column_before_cast.name};
 
@@ -402,8 +402,8 @@ void Set::checkTypesEqual(size_t set_type_idx, const DataTypePtr & other_type) c
                         + data_types[set_type_idx]->getName() + " on the right", ErrorCodes::TYPE_MISMATCH);
 }
 
-MergeTreeSetIndex::MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && index_mapping_)
-    : indexes_mapping(std::move(index_mapping_))
+MergeTreeSetIndex::MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && indexes_mapping_)
+    : has_all_keys(set_elements.size() == indexes_mapping_.size()), indexes_mapping(std::move(indexes_mapping_))
 {
     std::sort(indexes_mapping.begin(), indexes_mapping.end(),
         [](const KeyTuplePositionMapping & l, const KeyTuplePositionMapping & r)
@@ -428,7 +428,7 @@ MergeTreeSetIndex::MergeTreeSetIndex(const Columns & set_elements, std::vector<K
     SortDescription sort_description;
     for (size_t i = 0; i < tuple_size; ++i)
     {
-        block_to_sort.insert({ ordered_set[i], nullptr, "" });
+        block_to_sort.insert({ ordered_set[i], nullptr, "_" + toString(i) });
         sort_description.emplace_back(i, 1, 1);
     }
 
@@ -548,11 +548,11 @@ BoolMask MergeTreeSetIndex::checkInRange(const std::vector<Range> & key_ranges,
             break;
         }
     }
-    if (one_element_range)
+    if (one_element_range && has_all_keys)
     {
         /// Here we know that there is one element in range.
         /// The main difference with the normal case is that we can definitely say that
-        /// condition in this range always TRUE (can_be_false = 0) xor always FALSE (can_be_true = 0).
+        /// condition in this range is always TRUE (can_be_false = 0) or always FALSE (can_be_true = 0).
 
         /// Check if it's an empty range
         if (!left_included || !right_included)
diff --git a/src/Interpreters/Set.h b/src/Interpreters/Set.h
index 9bf6630b844..3146b6af03f 100644
--- a/src/Interpreters/Set.h
+++ b/src/Interpreters/Set.h
@@ -2,13 +2,13 @@
 
 #include <shared_mutex>
 #include <Core/Block.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <DataTypes/IDataType.h>
 #include <Interpreters/SetVariants.h>
 #include <Parsers/IAST.h>
 #include <Storages/MergeTree/BoolMask.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -42,10 +42,10 @@ public:
     /** Create a Set from stream.
       * Call setHeader, then call insertFromBlock for each block.
       */
-    void setHeader(const Block & header);
+    void setHeader(const ColumnsWithTypeAndName & header);
 
     /// Returns false, if some limit was exceeded and no need to insert more data.
-    bool insertFromBlock(const Block & block);
+    bool insertFromBlock(const ColumnsWithTypeAndName & columns);
     /// Call after all blocks were inserted. To get the information that set is already created.
     void finishInsert() { is_created = true; }
 
@@ -54,7 +54,7 @@ public:
     /** For columns of 'block', check belonging of corresponding rows to the set.
       * Return UInt8 column with the result.
       */
-    ColumnPtr execute(const Block & block, bool negative) const;
+    ColumnPtr execute(const ColumnsWithTypeAndName & columns, bool negative) const;
 
     bool empty() const;
     size_t getTotalRowCount() const;
@@ -208,7 +208,7 @@ public:
         std::vector<FunctionBasePtr> functions;
     };
 
-    MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && index_mapping_);
+    MergeTreeSetIndex(const Columns & set_elements, std::vector<KeyTuplePositionMapping> && indexes_mapping_);
 
     size_t size() const { return ordered_set.at(0)->size(); }
 
@@ -217,6 +217,8 @@ public:
     BoolMask checkInRange(const std::vector<Range> & key_ranges, const DataTypes & data_types) const;
 
 private:
+    // If all arguments in tuple are key columns, we can optimize NOT IN when there is only one element.
+    bool has_all_keys;
     Columns ordered_set;
     std::vector<KeyTuplePositionMapping> indexes_mapping;
 
diff --git a/src/Interpreters/SortedBlocksWriter.cpp b/src/Interpreters/SortedBlocksWriter.cpp
index 3ce9f2d1b90..1945824636f 100644
--- a/src/Interpreters/SortedBlocksWriter.cpp
+++ b/src/Interpreters/SortedBlocksWriter.cpp
@@ -1,11 +1,11 @@
 #include <Core/SortCursor.h>
 #include <Interpreters/SortedBlocksWriter.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Merges/MergingSortedTransform.h>
-#include <DataStreams/TemporaryFileStream.h>
-#include <DataStreams/materializeBlock.h>
+#include <Processors/Sources/TemporaryFileLazySource.h>
+#include <Formats/TemporaryFileStream.h>
 #include <Disks/IVolume.h>
 
 
@@ -15,7 +15,7 @@ namespace DB
 namespace
 {
 
-std::unique_ptr<TemporaryFile> flushToFile(const String & tmp_path, const Block & header, QueryPipeline pipeline, const String & codec)
+std::unique_ptr<TemporaryFile> flushToFile(const String & tmp_path, const Block & header, QueryPipelineBuilder pipeline, const String & codec)
 {
     auto tmp_file = createTemporaryFile(tmp_path);
 
@@ -24,10 +24,11 @@ std::unique_ptr<TemporaryFile> flushToFile(const String & tmp_path, const Block
     return tmp_file;
 }
 
-SortedBlocksWriter::SortedFiles flushToManyFiles(const String & tmp_path, const Block & header, QueryPipeline pipeline,
+SortedBlocksWriter::SortedFiles flushToManyFiles(const String & tmp_path, const Block & header, QueryPipelineBuilder builder,
                                                  const String & codec, std::function<void(const Block &)> callback = [](const Block &){})
 {
     std::vector<std::unique_ptr<TemporaryFile>> files;
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
     PullingPipelineExecutor executor(pipeline);
 
     Block block;
@@ -38,7 +39,7 @@ SortedBlocksWriter::SortedFiles flushToManyFiles(const String & tmp_path, const
 
         callback(block);
 
-        QueryPipeline one_block_pipeline;
+        QueryPipelineBuilder one_block_pipeline;
         Chunk chunk(block.getColumns(), block.rows());
         one_block_pipeline.init(Pipe(std::make_shared<SourceFromSingleChunk>(block.cloneEmpty(), std::move(chunk))));
         auto tmp_file = flushToFile(tmp_path, header, std::move(one_block_pipeline), codec);
@@ -126,7 +127,7 @@ SortedBlocksWriter::TmpFilePtr SortedBlocksWriter::flush(const BlocksList & bloc
     if (pipes.empty())
         return {};
 
-    QueryPipeline pipeline;
+    QueryPipelineBuilder pipeline;
     pipeline.init(Pipe::unitePipes(std::move(pipes)));
 
     if (pipeline.getNumStreams() > 1)
@@ -179,7 +180,7 @@ SortedBlocksWriter::PremergedFiles SortedBlocksWriter::premerge()
 
                 if (pipes.size() == num_files_for_merge || &file == &files.back())
                 {
-                    QueryPipeline pipeline;
+                    QueryPipelineBuilder pipeline;
                     pipeline.init(Pipe::unitePipes(std::move(pipes)));
                     pipes = Pipes();
 
@@ -212,7 +213,7 @@ SortedBlocksWriter::PremergedFiles SortedBlocksWriter::premerge()
 SortedBlocksWriter::SortedFiles SortedBlocksWriter::finishMerge(std::function<void(const Block &)> callback)
 {
     PremergedFiles files = premerge();
-    QueryPipeline pipeline;
+    QueryPipelineBuilder pipeline;
     pipeline.init(std::move(files.pipe));
 
     if (pipeline.getNumStreams() > 1)
@@ -293,20 +294,21 @@ Block SortedBlocksBuffer::mergeBlocks(Blocks && blocks) const
 
         Blocks tmp_blocks;
 
-        QueryPipeline pipeline;
-        pipeline.init(Pipe::unitePipes(std::move(pipes)));
+        QueryPipelineBuilder builder;
+        builder.init(Pipe::unitePipes(std::move(pipes)));
 
-        if (pipeline.getNumStreams() > 1)
+        if (builder.getNumStreams() > 1)
         {
             auto transform = std::make_shared<MergingSortedTransform>(
-                pipeline.getHeader(),
-                pipeline.getNumStreams(),
+                builder.getHeader(),
+                builder.getNumStreams(),
                 sort_description,
                 num_rows);
 
-            pipeline.addTransform(std::move(transform));
+            builder.addTransform(std::move(transform));
         }
 
+        auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
         PullingPipelineExecutor executor(pipeline);
         Block block;
         while (executor.pull(block))
diff --git a/src/Interpreters/SortedBlocksWriter.h b/src/Interpreters/SortedBlocksWriter.h
index c65511e943e..0262a274c68 100644
--- a/src/Interpreters/SortedBlocksWriter.h
+++ b/src/Interpreters/SortedBlocksWriter.h
@@ -6,9 +6,8 @@
 #include <Common/filesystemHelpers.h>
 #include <Core/Block.h>
 #include <Core/SortDescription.h>
-#include <Processors/Pipe.h>
-#include <DataStreams/SizeLimits.h>
-#include <DataStreams/IBlockStream_fwd.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/SizeLimits.h>
 
 
 namespace DB
diff --git a/src/DataStreams/SquashingTransform.cpp b/src/Interpreters/SquashingTransform.cpp
similarity index 98%
rename from src/DataStreams/SquashingTransform.cpp
rename to src/Interpreters/SquashingTransform.cpp
index 1f6ca8a7306..54d9a1db25e 100644
--- a/src/DataStreams/SquashingTransform.cpp
+++ b/src/Interpreters/SquashingTransform.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/SquashingTransform.h>
+#include <Interpreters/SquashingTransform.h>
 
 
 namespace DB
@@ -67,7 +67,6 @@ Block SquashingTransform::addImpl(ReferenceType input_block)
     }
 
     append<ReferenceType>(std::move(input_block));
-
     if (isEnoughSize(accumulated_block))
     {
         Block to_return;
diff --git a/src/DataStreams/SquashingTransform.h b/src/Interpreters/SquashingTransform.h
similarity index 100%
rename from src/DataStreams/SquashingTransform.h
rename to src/Interpreters/SquashingTransform.h
diff --git a/src/Interpreters/StorageID.cpp b/src/Interpreters/StorageID.cpp
index bfb969cab25..2e76618e4c0 100644
--- a/src/Interpreters/StorageID.cpp
+++ b/src/Interpreters/StorageID.cpp
@@ -110,7 +110,7 @@ StorageID StorageID::fromDictionaryConfig(const Poco::Util::AbstractConfiguratio
     return res;
 }
 
-String StorageID::getInternalDictionaryName() const
+String StorageID::getShortName() const
 {
     assertNotEmpty();
     if (hasUUID())
diff --git a/src/Interpreters/StorageID.h b/src/Interpreters/StorageID.h
index fb94501bb94..f1fcfde25c0 100644
--- a/src/Interpreters/StorageID.h
+++ b/src/Interpreters/StorageID.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/UUID.h>
 #include <tuple>
 #include <Parsers/IAST_fwd.h>
@@ -91,7 +91,9 @@ struct StorageID
 
     /// If dictionary has UUID, then use it as dictionary name in ExternalLoader to allow dictionary renaming.
     /// ExternalDictnariesLoader::resolveDictionaryName(...) should be used to access such dictionaries by name.
-    String getInternalDictionaryName() const;
+    String getInternalDictionaryName() const { return getShortName(); }
+    /// Get short, but unique, name.
+    String getShortName() const;
 
 private:
     StorageID() = default;
diff --git a/src/Interpreters/SynonymsExtensions.cpp b/src/Interpreters/SynonymsExtensions.cpp
index 22fa91a4349..ddc90d04e02 100644
--- a/src/Interpreters/SynonymsExtensions.cpp
+++ b/src/Interpreters/SynonymsExtensions.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
diff --git a/src/Interpreters/SynonymsExtensions.h b/src/Interpreters/SynonymsExtensions.h
index fd2bf03e162..c4a70b28c60 100644
--- a/src/Interpreters/SynonymsExtensions.h
+++ b/src/Interpreters/SynonymsExtensions.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_NLP
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Poco/Util/Application.h>
 
 #include <memory>
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index d3224a53ccd..71155760aea 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -1,17 +1,18 @@
-#include <Interpreters/SystemLog.h>
-#include <Interpreters/QueryLog.h>
-#include <Interpreters/QueryThreadLog.h>
-#include <Interpreters/PartLog.h>
-#include <Interpreters/TextLog.h>
-#include <Interpreters/TraceLog.h>
+#include <Interpreters/AsynchronousMetricLog.h>
 #include <Interpreters/CrashLog.h>
 #include <Interpreters/MetricLog.h>
-#include <Interpreters/AsynchronousMetricLog.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
+#include <Interpreters/PartLog.h>
+#include <Interpreters/QueryLog.h>
+#include <Interpreters/QueryThreadLog.h>
+#include <Interpreters/QueryViewsLog.h>
+#include <Interpreters/SessionLog.h>
+#include <Interpreters/TextLog.h>
+#include <Interpreters/TraceLog.h>
 #include <Interpreters/ZooKeeperLog.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -38,7 +39,13 @@ std::shared_ptr<TSystemLog> createSystemLog(
     const String & config_prefix)
 {
     if (!config.has(config_prefix))
+    {
+        LOG_DEBUG(&Poco::Logger::get("SystemLog"),
+                "Not creating {}.{} since corresponding section '{}' is missing from config",
+                default_database_name, default_table_name, config_prefix);
+
         return {};
+    }
 
     String database = config.getString(config_prefix + ".database", default_database_name);
     String table = config.getString(config_prefix + ".table", default_table_name);
@@ -104,7 +111,9 @@ SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConf
     opentelemetry_span_log = createSystemLog<OpenTelemetrySpanLog>(
         global_context, "system", "opentelemetry_span_log", config,
         "opentelemetry_span_log");
+    query_views_log = createSystemLog<QueryViewsLog>(global_context, "system", "query_views_log", config, "query_views_log");
     zookeeper_log = createSystemLog<ZooKeeperLog>(global_context, "system", "zookeeper_log", config, "zookeeper_log");
+    session_log = createSystemLog<SessionLog>(global_context, "system", "session_log", config, "session_log");
 
     if (query_log)
         logs.emplace_back(query_log.get());
@@ -124,8 +133,12 @@ SystemLogs::SystemLogs(ContextPtr global_context, const Poco::Util::AbstractConf
         logs.emplace_back(asynchronous_metric_log.get());
     if (opentelemetry_span_log)
         logs.emplace_back(opentelemetry_span_log.get());
+    if (query_views_log)
+        logs.emplace_back(query_views_log.get());
     if (zookeeper_log)
         logs.emplace_back(zookeeper_log.get());
+    if (session_log)
+        logs.emplace_back(session_log.get());
 
     try
     {
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index b94f3f7d456..ce0062e8c77 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -7,12 +7,11 @@
 
 #include <condition_variable>
 #include <boost/noncopyable.hpp>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
-#include <common/types.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
+#include <base/types.h>
 #include <Core/Defines.h>
 #include <Storages/IStorage.h>
-#include <Common/Stopwatch.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -20,6 +19,7 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/InterpreterInsertQuery.h>
@@ -74,7 +74,9 @@ class CrashLog;
 class MetricLog;
 class AsynchronousMetricLog;
 class OpenTelemetrySpanLog;
+class QueryViewsLog;
 class ZooKeeperLog;
+class SessionLog;
 
 
 class ISystemLog
@@ -111,8 +113,12 @@ struct SystemLogs
     std::shared_ptr<AsynchronousMetricLog> asynchronous_metric_log;
     /// OpenTelemetry trace spans.
     std::shared_ptr<OpenTelemetrySpanLog> opentelemetry_span_log;
+    /// Used to log queries of materialized and live views
+    std::shared_ptr<QueryViewsLog> query_views_log;
     /// Used to log all actions of ZooKeeper client
     std::shared_ptr<ZooKeeperLog> zookeeper_log;
+    /// Login, LogOut and Login failure events
+    std::shared_ptr<SessionLog> session_log;
 
     std::vector<ISystemLog *> logs;
 };
@@ -483,9 +489,11 @@ void SystemLog<LogElement>::flushImpl(const std::vector<LogElement> & to_flush,
         InterpreterInsertQuery interpreter(query_ptr, insert_context);
         BlockIO io = interpreter.execute();
 
-        io.out->writePrefix();
-        io.out->write(block);
-        io.out->writeSuffix();
+        PushingPipelineExecutor executor(io.pipeline);
+
+        executor.start();
+        executor.push(block);
+        executor.finish();
     }
     catch (...)
     {
@@ -519,7 +527,7 @@ void SystemLog<LogElement>::prepareTable()
         auto alias_columns = LogElement::getNamesAndAliases();
         auto current_query = InterpreterCreateQuery::formatColumns(ordinary_columns, alias_columns);
 
-        if (old_query->getTreeHash() != current_query->getTreeHash())
+        if (serializeAST(*old_query) != serializeAST(*current_query))
         {
             /// Rename the existing table.
             int suffix = 0;
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index 20e8f6b18b4..ad16cc5af7f 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -1,5 +1,7 @@
 #include <Interpreters/TableJoin.h>
 
+#include <Common/Exception.h>
+#include <base/types.h>
 #include <Common/StringUtils/StringUtils.h>
 
 #include <Core/Block.h>
@@ -7,11 +9,22 @@
 #include <Core/Settings.h>
 
 #include <DataTypes/DataTypeNullable.h>
+
+#include <Dictionaries/DictionaryStructure.h>
+
+#include <Interpreters/DictionaryReader.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/queryToString.h>
 
-#include <common/logger_useful.h>
+#include <Storages/IStorage.h>
+#include <Storages/StorageDictionary.h>
+#include <Storages/StorageJoin.h>
+
+#include <base/logger_useful.h>
+#include <algorithm>
 
 
 namespace DB
@@ -20,6 +33,64 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int TYPE_MISMATCH;
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+}
+
+namespace
+{
+
+std::string formatTypeMap(const TableJoin::NameToTypeMap & target, const TableJoin::NameToTypeMap & source)
+{
+    std::vector<std::string> text;
+    for (const auto & [k, v] : target)
+    {
+        auto src_type_it = source.find(k);
+        std::string src_type_name = src_type_it != source.end() ? src_type_it->second->getName() : "";
+        text.push_back(fmt::format("{} : {} -> {}", k, src_type_name, v->getName()));
+    }
+    return fmt::format("{}", fmt::join(text, ", "));
+}
+
+}
+
+namespace
+{
+
+struct BothSidesTag {};
+struct LeftSideTag {};
+struct RightSideTag {};
+
+template <typename SideTag = BothSidesTag, typename OnExpr, typename Func>
+bool forAllKeys(OnExpr & expressions, Func callback)
+{
+    static_assert(std::is_same_v<SideTag, BothSidesTag> ||
+                  std::is_same_v<SideTag, LeftSideTag> ||
+                  std::is_same_v<SideTag, RightSideTag>);
+
+    for (auto & expr : expressions)
+    {
+        if constexpr (std::is_same_v<SideTag, BothSidesTag>)
+            assert(expr.key_names_left.size() == expr.key_names_right.size());
+
+        size_t sz = !std::is_same_v<SideTag, RightSideTag> ? expr.key_names_left.size() : expr.key_names_right.size();
+        for (size_t i = 0; i < sz; ++i)
+        {
+            bool cont;
+            if constexpr (std::is_same_v<SideTag, BothSidesTag>)
+                cont = callback(expr.key_names_left[i], expr.key_names_right[i]);
+            if constexpr (std::is_same_v<SideTag, LeftSideTag>)
+                cont = callback(expr.key_names_left[i]);
+            if constexpr (std::is_same_v<SideTag, RightSideTag>)
+                cont = callback(expr.key_names_right[i]);
+
+            if (!cont)
+                return false;
+        }
+    }
+    return true;
+}
+
 }
 
 TableJoin::TableJoin(const Settings & settings, VolumePtr tmp_volume_)
@@ -39,40 +110,31 @@ TableJoin::TableJoin(const Settings & settings, VolumePtr tmp_volume_)
 
 void TableJoin::resetCollected()
 {
-    key_names_left.clear();
-    key_names_right.clear();
-    key_asts_left.clear();
-    key_asts_right.clear();
+    clauses.clear();
     columns_from_joined_table.clear();
     columns_added_by_join.clear();
     original_names.clear();
     renames.clear();
     left_type_map.clear();
     right_type_map.clear();
-    left_converting_actions = nullptr;
-    right_converting_actions = nullptr;
 }
 
 void TableJoin::addUsingKey(const ASTPtr & ast)
 {
-    key_names_left.push_back(ast->getColumnName());
-    key_names_right.push_back(ast->getAliasOrColumnName());
+    addKey(ast->getColumnName(), renamedRightColumnName(ast->getAliasOrColumnName()), ast);
+}
 
-    key_asts_left.push_back(ast);
-    key_asts_right.push_back(ast);
+void TableJoin::addDisjunct()
+{
+    clauses.emplace_back();
 
-    auto & right_key = key_names_right.back();
-    if (renames.count(right_key))
-        right_key = renames[right_key];
+    if (getStorageJoin() && clauses.size() > 1)
+        throw Exception("StorageJoin with ORs is not supported", ErrorCodes::NOT_IMPLEMENTED);
 }
 
 void TableJoin::addOnKeys(ASTPtr & left_table_ast, ASTPtr & right_table_ast)
 {
-    key_names_left.push_back(left_table_ast->getColumnName());
-    key_names_right.push_back(right_table_ast->getAliasOrColumnName());
-
-    key_asts_left.push_back(left_table_ast);
-    key_asts_right.push_back(right_table_ast);
+    addKey(left_table_ast->getColumnName(), right_table_ast->getAliasOrColumnName(), left_table_ast, right_table_ast);
 }
 
 /// @return how many times right key appears in ON section.
@@ -82,9 +144,8 @@ size_t TableJoin::rightKeyInclusion(const String & name) const
         return 0;
 
     size_t count = 0;
-    for (const auto & key_name : key_names_right)
-        if (name == key_name)
-            ++count;
+    for (const auto & clause : clauses)
+        count += std::count(clause.key_names_right.begin(), clause.key_names_right.end(), name);
     return count;
 }
 
@@ -132,23 +193,33 @@ ASTPtr TableJoin::leftKeysList() const
 {
     ASTPtr keys_list = std::make_shared<ASTExpressionList>();
     keys_list->children = key_asts_left;
-    if (ASTPtr extra_cond = joinConditionColumn(JoinTableSide::Left))
-        keys_list->children.push_back(extra_cond);
+
+    for (const auto & clause : clauses)
+    {
+        if (clause.on_filter_condition_left)
+            keys_list->children.push_back(clause.on_filter_condition_left);
+    }
     return keys_list;
 }
 
 ASTPtr TableJoin::rightKeysList() const
 {
     ASTPtr keys_list = std::make_shared<ASTExpressionList>();
+
     if (hasOn())
         keys_list->children = key_asts_right;
-    if (ASTPtr extra_cond = joinConditionColumn(JoinTableSide::Right))
-        keys_list->children.push_back(extra_cond);
+
+    for (const auto & clause : clauses)
+    {
+        if (clause.on_filter_condition_right)
+            keys_list->children.push_back(clause.on_filter_condition_right);
+    }
     return keys_list;
 }
 
 Names TableJoin::requiredJoinedNames() const
 {
+    Names key_names_right = getAllNames(JoinTableSide::Right);
     NameSet required_columns_set(key_names_right.begin(), key_names_right.end());
     for (const auto & joined_column : columns_added_by_join)
         required_columns_set.insert(joined_column.name);
@@ -159,13 +230,14 @@ Names TableJoin::requiredJoinedNames() const
 NameSet TableJoin::requiredRightKeys() const
 {
     NameSet required;
-    for (const auto & name : key_names_right)
+    forAllKeys<RightSideTag>(clauses, [this, &required](const auto & name)
     {
         auto rename = renamedRightColumnName(name);
         for (const auto & column : columns_added_by_join)
             if (rename == column.name)
                 required.insert(name);
-    }
+        return true;
+    });
     return required;
 }
 
@@ -182,27 +254,24 @@ NamesWithAliases TableJoin::getRequiredColumns(const Block & sample, const Names
 
 Block TableJoin::getRequiredRightKeys(const Block & right_table_keys, std::vector<String> & keys_sources) const
 {
-    const Names & left_keys = keyNamesLeft();
-    const Names & right_keys = keyNamesRight();
-    NameSet required_keys(requiredRightKeys().begin(), requiredRightKeys().end());
+    NameSet required_keys = requiredRightKeys();
     Block required_right_keys;
+    if (required_keys.empty())
+        return required_right_keys;
 
-    for (size_t i = 0; i < right_keys.size(); ++i)
+    forAllKeys(clauses, [&](const auto & left_key_name, const auto & right_key_name)
     {
-        const String & right_key_name = right_keys[i];
-
         if (required_keys.count(right_key_name) && !required_right_keys.has(right_key_name))
         {
             const auto & right_key = right_table_keys.getByName(right_key_name);
             required_right_keys.insert(right_key);
-            keys_sources.push_back(left_keys[i]);
+            keys_sources.push_back(left_key_name);
         }
-    }
-
+        return true;
+    });
     return required_right_keys;
 }
 
-
 bool TableJoin::leftBecomeNullable(const DataTypePtr & column_type) const
 {
     return forceNullableLeft() && JoinCommon::canBecomeNullable(column_type);
@@ -215,54 +284,54 @@ bool TableJoin::rightBecomeNullable(const DataTypePtr & column_type) const
 
 void TableJoin::addJoinedColumn(const NameAndTypePair & joined_column)
 {
-    DataTypePtr type = joined_column.type;
+    columns_added_by_join.emplace_back(joined_column);
+}
 
-    if (hasUsing())
+NamesAndTypesList TableJoin::correctedColumnsAddedByJoin() const
+{
+    NamesAndTypesList result;
+    for (const auto & col : columns_added_by_join)
     {
-        if (auto it = right_type_map.find(joined_column.name); it != right_type_map.end())
-            type = it->second;
+        DataTypePtr type = col.type;
+        if (hasUsing())
+        {
+            if (auto it = right_type_map.find(col.name); it != right_type_map.end())
+                type = it->second;
+        }
+
+        if (rightBecomeNullable(type))
+            type = JoinCommon::convertTypeToNullable(type);
+        result.emplace_back(col.name, type);
     }
 
-    if (rightBecomeNullable(type))
-        type = JoinCommon::convertTypeToNullable(type);
-
-    columns_added_by_join.emplace_back(joined_column.name, type);
+    return result;
 }
 
-void TableJoin::addJoinedColumnsAndCorrectTypes(NamesAndTypesList & names_and_types, bool correct_nullability) const
+void TableJoin::addJoinedColumnsAndCorrectTypes(NamesAndTypesList & left_columns, bool correct_nullability)
 {
-    ColumnsWithTypeAndName columns;
-    for (auto & pair : names_and_types)
-        columns.emplace_back(nullptr, std::move(pair.type), std::move(pair.name));
-    names_and_types.clear();
-
-    addJoinedColumnsAndCorrectTypes(columns, correct_nullability);
-
-    for (auto & col : columns)
-        names_and_types.emplace_back(std::move(col.name), std::move(col.type));
-}
-
-void TableJoin::addJoinedColumnsAndCorrectTypes(ColumnsWithTypeAndName & columns, bool correct_nullability) const
-{
-    for (auto & col : columns)
+    for (auto & col : left_columns)
     {
         if (hasUsing())
         {
+            /*
+             * Join with `USING` semantic allows to have columns with changed types in result table.
+             * But `JOIN ON` should preserve types from original table.
+             * So we need to know changed types in result tables before further analysis (e.g. analyzeAggregation)
+             * For `JOIN ON expr1 == expr2` we will infer common type later in makeTableJoin,
+             *   when part of plan built and types of expression will be known.
+             */
+            inferJoinKeyCommonType(left_columns, columns_from_joined_table, !isSpecialStorage());
+
             if (auto it = left_type_map.find(col.name); it != left_type_map.end())
                 col.type = it->second;
         }
+
         if (correct_nullability && leftBecomeNullable(col.type))
-        {
-            /// No need to nullify constants
-            bool is_column_const = col.column && isColumnConst(*col.column);
-            if (!is_column_const)
-                col.type = JoinCommon::convertTypeToNullable(col.type);
-        }
+            col.type = JoinCommon::convertTypeToNullable(col.type);
     }
 
-    /// Types in columns_added_by_join already converted and set nullable if needed
-    for (const auto & col : columns_added_by_join)
-        columns.emplace_back(nullptr, col.type, col.name);
+    for (const auto & col : correctedColumnsAddedByJoin())
+        left_columns.emplace_back(col.name, col.type);
 }
 
 bool TableJoin::sameStrictnessAndKind(ASTTableJoin::Strictness strictness_, ASTTableJoin::Kind kind_) const
@@ -281,6 +350,13 @@ bool TableJoin::sameStrictnessAndKind(ASTTableJoin::Strictness strictness_, ASTT
     return false;
 }
 
+bool TableJoin::oneDisjunct() const
+{
+    if (!isCrossOrComma(kind()))
+        assert(!clauses.empty());
+    return clauses.size() <= 1;
+}
+
 bool TableJoin::allowMergeJoin() const
 {
     bool is_any = (strictness() == ASTTableJoin::Strictness::Any);
@@ -289,7 +365,8 @@ bool TableJoin::allowMergeJoin() const
 
     bool all_join = is_all && (isInner(kind()) || isLeft(kind()) || isRight(kind()) || isFull(kind()));
     bool special_left = isLeft(kind()) && (is_any || is_semi);
-    return all_join || special_left;
+
+    return (all_join || special_left) && oneDisjunct();
 }
 
 bool TableJoin::needStreamWithNonJoinedRows() const
@@ -300,27 +377,55 @@ bool TableJoin::needStreamWithNonJoinedRows() const
     return isRightOrFull(kind());
 }
 
-bool TableJoin::allowDictJoin(const String & dict_key, const Block & sample_block, Names & src_names, NamesAndTypesList & dst_columns) const
+static std::optional<String> getDictKeyName(const String & dict_name , ContextPtr context)
 {
+    auto dictionary = context->getExternalDictionariesLoader().getDictionary(dict_name, context);
+    if (!dictionary)
+        return {};
+
+    if (const auto & structure = dictionary->getStructure(); structure.id)
+        return structure.id->name;
+    return {};
+}
+
+bool TableJoin::tryInitDictJoin(const Block & sample_block, ContextPtr context)
+{
+    using Strictness = ASTTableJoin::Strictness;
+
+    bool allowed_inner = isInner(kind()) && strictness() == Strictness::All;
+    bool allowed_left = isLeft(kind()) && (strictness() == Strictness::Any ||
+                                           strictness() == Strictness::All ||
+                                           strictness() == Strictness::Semi ||
+                                           strictness() == Strictness::Anti);
+
     /// Support ALL INNER, [ANY | ALL | SEMI | ANTI] LEFT
-    if (!isLeft(kind()) && !(isInner(kind()) && strictness() == ASTTableJoin::Strictness::All))
+    if (!allowed_inner && !allowed_left)
         return false;
 
-    const Names & right_keys = keyNamesRight();
-    if (right_keys.size() != 1)
+    if (clauses.size() != 1 || clauses[0].key_names_right.size() != 1)
         return false;
 
+    const auto & right_key = getOnlyClause().key_names_right[0];
+
     /// TODO: support 'JOIN ... ON expr(dict_key) = table_key'
-    auto it_key = original_names.find(right_keys[0]);
+    auto it_key = original_names.find(right_key);
     if (it_key == original_names.end())
         return false;
 
-    if (dict_key != it_key->second)
+    if (!right_storage_dictionary)
+        return false;
+
+    auto dict_name = right_storage_dictionary->getDictionaryName();
+
+    auto dict_key = getDictKeyName(dict_name, context);
+    if (!dict_key.has_value() || *dict_key != it_key->second)
         return false; /// JOIN key != Dictionary key
 
+    Names src_names;
+    NamesAndTypesList dst_columns;
     for (const auto & col : sample_block)
     {
-        if (col.name == right_keys[0])
+        if (col.name == right_key)
             continue; /// do not extract key column
 
         auto it = original_names.find(col.name);
@@ -331,56 +436,56 @@ bool TableJoin::allowDictJoin(const String & dict_key, const Block & sample_bloc
             dst_columns.push_back({col.name, col.type});
         }
     }
+    dictionary_reader = std::make_shared<DictionaryReader>(dict_name, src_names, dst_columns, context);
 
     return true;
 }
 
-bool TableJoin::applyJoinKeyConvert(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns)
+static void renameIfNeeded(String & name, const NameToNameMap & renames)
 {
-    bool need_convert = needConvert();
-    if (!need_convert && !hasUsing())
-    {
-        /// For `USING` we already inferred common type an syntax analyzer stage
-        NamesAndTypesList left_list;
-        NamesAndTypesList right_list;
-        for (const auto & col : left_sample_columns)
-            left_list.emplace_back(col.name, col.type);
-        for (const auto & col : right_sample_columns)
-            right_list.emplace_back(col.name, col.type);
-
-        need_convert = inferJoinKeyCommonType(left_list, right_list);
-    }
-
-    if (need_convert)
-    {
-        left_converting_actions = applyKeyConvertToTable(left_sample_columns, left_type_map, key_names_left);
-        right_converting_actions = applyKeyConvertToTable(right_sample_columns, right_type_map, key_names_right);
-    }
-
-    return need_convert;
+    if (const auto it = renames.find(name); it != renames.end())
+        name = it->second;
 }
 
-bool TableJoin::inferJoinKeyCommonType(const NamesAndTypesList & left, const NamesAndTypesList & right)
+std::pair<ActionsDAGPtr, ActionsDAGPtr>
+TableJoin::createConvertingActions(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns)
 {
-    std::unordered_map<String, DataTypePtr> left_types;
+    inferJoinKeyCommonType(left_sample_columns, right_sample_columns, !isSpecialStorage());
+
+    NameToNameMap left_key_column_rename;
+    NameToNameMap right_key_column_rename;
+    auto left_converting_actions = applyKeyConvertToTable(left_sample_columns, left_type_map, left_key_column_rename);
+    auto right_converting_actions = applyKeyConvertToTable(right_sample_columns, right_type_map, right_key_column_rename);
+
+    forAllKeys(clauses, [&](auto & left_key, auto & right_key)
+    {
+        renameIfNeeded(left_key, left_key_column_rename);
+        renameIfNeeded(right_key, right_key_column_rename);
+        return true;
+    });
+
+    return {left_converting_actions, right_converting_actions};
+}
+
+template <typename LeftNamesAndTypes, typename RightNamesAndTypes>
+bool TableJoin::inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool allow_right)
+{
+    if (!left_type_map.empty() || !right_type_map.empty())
+        return true;
+
+    NameToTypeMap left_types;
     for (const auto & col : left)
-    {
         left_types[col.name] = col.type;
-    }
 
-    std::unordered_map<String, DataTypePtr> right_types;
+    NameToTypeMap right_types;
     for (const auto & col : right)
-    {
-        if (auto it = renames.find(col.name); it != renames.end())
-            right_types[it->second] = col.type;
-        else
-            right_types[col.name] = col.type;
-    }
+        right_types[renamedRightColumnName(col.name)] = col.type;
 
-    for (size_t i = 0; i < key_names_left.size(); ++i)
+
+    forAllKeys(clauses, [&](const auto & left_key_name, const auto & right_key_name)
     {
-        auto ltype = left_types.find(key_names_left[i]);
-        auto rtype = right_types.find(key_names_right[i]);
+        auto ltype = left_types.find(left_key_name);
+        auto rtype = right_types.find(right_key_name);
         if (ltype == left_types.end() || rtype == right_types.end())
         {
             /// Name mismatch, give up
@@ -390,71 +495,84 @@ bool TableJoin::inferJoinKeyCommonType(const NamesAndTypesList & left, const Nam
         }
 
         if (JoinCommon::typesEqualUpToNullability(ltype->second, rtype->second))
-            continue;
+            return true;
 
-        DataTypePtr supertype;
+        DataTypePtr common_type;
         try
         {
-            supertype = DB::getLeastSupertype({ltype->second, rtype->second});
+            /// TODO(vdimir): use getMostSubtype if possible
+            common_type = DB::getLeastSupertype({ltype->second, rtype->second});
         }
         catch (DB::Exception & ex)
         {
-            throw Exception(
-                "Type mismatch of columns to JOIN by: " +
-                    key_names_left[i] + ": " + ltype->second->getName() + " at left, " +
-                    key_names_right[i] + ": " + rtype->second->getName() + " at right. " +
-                    "Can't get supertype: " + ex.message(),
-                ErrorCodes::TYPE_MISMATCH);
+            throw DB::Exception(ErrorCodes::TYPE_MISMATCH,
+                "Can't infer common type for joined columns: {}: {} at left, {}: {} at right. {}",
+                left_key_name, ltype->second->getName(),
+                right_key_name, rtype->second->getName(),
+                ex.message());
         }
-        left_type_map[key_names_left[i]] = right_type_map[key_names_right[i]] = supertype;
-    }
+        if (!allow_right && !common_type->equals(*rtype->second))
+        {
+            throw DB::Exception(ErrorCodes::TYPE_MISMATCH,
+                "Can't change type for right table: {}: {} -> {}.",
+                right_key_name, rtype->second->getName(), common_type->getName());
+        }
+        left_type_map[left_key_name] = right_type_map[right_key_name] = common_type;
+
+        return true;
+    });
 
     if (!left_type_map.empty() || !right_type_map.empty())
     {
-        auto format_type_map = [](NameToTypeMap mapping) -> std::string
-        {
-            std::vector<std::string> text;
-            for (const auto & [k, v] : mapping)
-                text.push_back(k + ": " + v->getName());
-            return fmt::format("{}", fmt::join(text, ", "));
-        };
         LOG_TRACE(
             &Poco::Logger::get("TableJoin"),
             "Infer supertype for joined columns. Left: [{}], Right: [{}]",
-            format_type_map(left_type_map),
-            format_type_map(right_type_map));
+            formatTypeMap(left_type_map, left_types),
+            formatTypeMap(right_type_map, right_types));
     }
 
     return !left_type_map.empty();
 }
 
 ActionsDAGPtr TableJoin::applyKeyConvertToTable(
-    const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, Names & names_to_rename) const
+    const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, NameToNameMap & key_column_rename) const
 {
+    bool has_some_to_do = false;
+
     ColumnsWithTypeAndName cols_dst = cols_src;
     for (auto & col : cols_dst)
     {
         if (auto it = type_mapping.find(col.name); it != type_mapping.end())
         {
+            has_some_to_do = true;
             col.type = it->second;
             col.column = nullptr;
         }
     }
+    if (!has_some_to_do)
+        return nullptr;
 
-    NameToNameMap key_column_rename;
     /// Returns converting actions for tables that need to be performed before join
     auto dag = ActionsDAG::makeConvertingActions(
         cols_src, cols_dst, ActionsDAG::MatchColumnsMode::Name, true, !hasUsing(), &key_column_rename);
 
-    for (auto & name : names_to_rename)
-    {
-        const auto it = key_column_rename.find(name);
-        if (it != key_column_rename.end())
-            name = it->second;
-    }
     return dag;
 }
 
+void TableJoin::setStorageJoin(std::shared_ptr<StorageJoin> storage)
+{
+    if (right_storage_dictionary)
+        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
+    right_storage_join = storage;
+}
+
+void TableJoin::setStorageJoin(std::shared_ptr<StorageDictionary> storage)
+{
+    if (right_storage_join)
+        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "StorageJoin and Dictionary join are mutually exclusive");
+    right_storage_dictionary = storage;
+}
+
 String TableJoin::renamedRightColumnName(const String & name) const
 {
     if (const auto it = renames.find(name); it != renames.end())
@@ -462,48 +580,74 @@ String TableJoin::renamedRightColumnName(const String & name) const
     return name;
 }
 
+void TableJoin::addKey(const String & left_name, const String & right_name, const ASTPtr & left_ast, const ASTPtr & right_ast)
+{
+    clauses.back().key_names_left.emplace_back(left_name);
+    key_asts_left.emplace_back(left_ast);
+
+    clauses.back().key_names_right.emplace_back(right_name);
+    key_asts_right.emplace_back(right_ast ? right_ast : left_ast);
+}
+
+static void addJoinConditionWithAnd(ASTPtr & current_cond, const ASTPtr & new_cond)
+{
+    if (current_cond == nullptr)
+        /// no conditions, set new one
+        current_cond = new_cond;
+    else if (const auto * func = current_cond->as<ASTFunction>(); func && func->name == "and")
+        /// already have `and` in condition, just add new argument
+        func->arguments->children.push_back(new_cond);
+    else
+        /// already have some conditions, unite it with `and`
+        current_cond = makeASTFunction("and", current_cond, new_cond);
+}
+
 void TableJoin::addJoinCondition(const ASTPtr & ast, bool is_left)
 {
-    LOG_TRACE(&Poco::Logger::get("TableJoin"), "Add join condition for {} table: {}", (is_left ? "left" : "right"), queryToString(ast));
-
-    if (is_left)
-        on_filter_condition_asts_left.push_back(ast);
-    else
-        on_filter_condition_asts_right.push_back(ast);
+    auto & cond_ast = is_left ? clauses.back().on_filter_condition_left : clauses.back().on_filter_condition_right;
+    LOG_TRACE(&Poco::Logger::get("TableJoin"), "Adding join condition for {} table: {} -> {}",
+              (is_left ? "left" : "right"), ast ? queryToString(ast) : "NULL", cond_ast ? queryToString(cond_ast) : "NULL");
+    addJoinConditionWithAnd(cond_ast, ast);
 }
 
-/// Returns all conditions related to one table joined with 'and' function
-static ASTPtr buildJoinConditionColumn(const ASTs & on_filter_condition_asts)
+std::unordered_map<String, String> TableJoin::leftToRightKeyRemap() const
 {
-    if (on_filter_condition_asts.empty())
-        return nullptr;
-
-    if (on_filter_condition_asts.size() == 1)
-        return on_filter_condition_asts[0];
-
-    auto function = std::make_shared<ASTFunction>();
-    function->name = "and";
-    function->arguments = std::make_shared<ASTExpressionList>();
-    function->children.push_back(function->arguments);
-    function->arguments->children = on_filter_condition_asts;
-    return function;
+    std::unordered_map<String, String> left_to_right_key_remap;
+    if (hasUsing())
+    {
+        const auto & required_right_keys = requiredRightKeys();
+        forAllKeys(clauses, [&](const auto & left_key_name, const auto & right_key_name)
+        {
+            if (!required_right_keys.contains(right_key_name))
+                left_to_right_key_remap[left_key_name] = right_key_name;
+            return true;
+        });
+    }
+    return left_to_right_key_remap;
 }
 
-ASTPtr TableJoin::joinConditionColumn(JoinTableSide side) const
+Names TableJoin::getAllNames(JoinTableSide side) const
 {
+    Names res;
+    auto func = [&res](const auto & name) { res.emplace_back(name); return true; };
     if (side == JoinTableSide::Left)
-        return buildJoinConditionColumn(on_filter_condition_asts_left);
-    return buildJoinConditionColumn(on_filter_condition_asts_right);
-}
-
-std::pair<String, String> TableJoin::joinConditionColumnNames() const
-{
-    std::pair<String, String> res;
-    if (auto cond_ast = joinConditionColumn(JoinTableSide::Left))
-        res.first = cond_ast->getColumnName();
-    if (auto cond_ast = joinConditionColumn(JoinTableSide::Right))
-        res.second = cond_ast->getColumnName();
+        forAllKeys<LeftSideTag>(clauses, func);
+    else
+        forAllKeys<RightSideTag>(clauses, func);
     return res;
 }
 
+void TableJoin::assertHasOneOnExpr() const
+{
+    if (!oneDisjunct())
+    {
+        std::vector<String> text;
+        for (const auto & onexpr : clauses)
+            text.push_back(onexpr.formatDebug());
+        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Expected to have only one join clause, got {}: [{}], query: '{}'",
+                            clauses.size(), fmt::join(text, " | "), queryToString(table_join));
+
+    }
+}
+
 }
diff --git a/src/Interpreters/TableJoin.h b/src/Interpreters/TableJoin.h
index 4c8c16028f5..7cd53442ffd 100644
--- a/src/Interpreters/TableJoin.h
+++ b/src/Interpreters/TableJoin.h
@@ -7,14 +7,19 @@
 #include <Interpreters/IJoin.h>
 #include <Interpreters/join_common.h>
 #include <Interpreters/asof.h>
-#include <DataStreams/IBlockStream_fwd.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <DataTypes/getLeastSupertype.h>
 #include <Storages/IStorage_fwd.h>
+#include <Common/Exception.h>
+#include <Parsers/IAST_fwd.h>
+
+#include <cstddef>
+#include <unordered_map>
 
 #include <utility>
 #include <memory>
-
+#include <base/types.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
@@ -24,6 +29,8 @@ class ASTSelectQuery;
 struct DatabaseAndTableWithAlias;
 class Block;
 class DictionaryReader;
+class StorageJoin;
+class StorageDictionary;
 
 struct ColumnWithTypeAndName;
 using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
@@ -45,6 +52,43 @@ class TableJoin
 public:
     using NameToTypeMap = std::unordered_map<String, DataTypePtr>;
 
+    /// Corresponds to one disjunct
+    struct JoinOnClause
+    {
+        Names key_names_left;
+        Names key_names_right; /// Duplicating right key names are qualified.
+
+        ASTPtr on_filter_condition_left;
+        ASTPtr on_filter_condition_right;
+
+        JoinOnClause() = default;
+
+        std::pair<String, String> condColumnNames() const
+        {
+            std::pair<String, String> res;
+            if (on_filter_condition_left)
+                res.first = on_filter_condition_left->getColumnName();
+            if (on_filter_condition_right)
+                res.second = on_filter_condition_right->getColumnName();
+            return res;
+        }
+
+        size_t keysCount() const
+        {
+            assert(key_names_left.size() == key_names_right.size());
+            return key_names_right.size();
+        }
+
+        String formatDebug() const
+        {
+            return fmt::format("Left keys: [{}] Right keys [{}] Condition columns: '{}', '{}'",
+                               fmt::join(key_names_left, ", "), fmt::join(key_names_right, ", "),
+                               condColumnNames().first, condColumnNames().second);
+        }
+    };
+
+    using Clauses = std::vector<JoinOnClause>;
+
 private:
     /** Query of the form `SELECT expr(x) AS k FROM t1 ANY LEFT JOIN (SELECT expr(x) AS k FROM t2) USING k`
       * The join is made by column k.
@@ -71,14 +115,14 @@ private:
     const size_t max_files_to_merge = 0;
     const String temporary_files_codec = "LZ4";
 
-    Names key_names_left;
-    Names key_names_right; /// Duplicating names are qualified.
-    ASTs on_filter_condition_asts_left;
-    ASTs on_filter_condition_asts_right;
+    /// the limit has no technical reasons, it supposed to improve safety
+    const size_t MAX_DISJUNCTS = 16;
 
     ASTs key_asts_left;
     ASTs key_asts_right;
 
+    Clauses clauses;
+
     ASTTableJoin table_join;
 
     ASOF::Inequality asof_inequality = ASOF::Inequality::GreaterOrEquals;
@@ -86,16 +130,14 @@ private:
     /// All columns which can be read from joined table. Duplicating names are qualified.
     NamesAndTypesList columns_from_joined_table;
     /// Columns will be added to block by JOIN.
-    /// It's a subset of columns_from_joined_table with corrected Nullability and type (if inplace type conversion is required)
+    /// It's a subset of columns_from_joined_table
+    /// Note: without corrected Nullability or type, see correctedColumnsAddedByJoin
     NamesAndTypesList columns_added_by_join;
 
     /// Target type to convert key columns before join
     NameToTypeMap left_type_map;
     NameToTypeMap right_type_map;
 
-    ActionsDAGPtr left_converting_actions;
-    ActionsDAGPtr right_converting_actions;
-
     /// Name -> original name. Names are the same as in columns_from_joined_table list.
     std::unordered_map<String, String> original_names;
     /// Original name -> name. Only renamed columns.
@@ -103,39 +145,51 @@ private:
 
     VolumePtr tmp_volume;
 
+    std::shared_ptr<StorageJoin> right_storage_join;
+
+    std::shared_ptr<StorageDictionary> right_storage_dictionary;
+    std::shared_ptr<DictionaryReader> dictionary_reader;
+
     Names requiredJoinedNames() const;
 
     /// Create converting actions and change key column names if required
     ActionsDAGPtr applyKeyConvertToTable(
-        const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, Names & names_to_rename) const;
+        const ColumnsWithTypeAndName & cols_src, const NameToTypeMap & type_mapping, NameToNameMap & key_column_rename) const;
+
+    void addKey(const String & left_name, const String & right_name, const ASTPtr & left_ast, const ASTPtr & right_ast = nullptr);
+
+    void assertHasOneOnExpr() const;
+
+    /// Calculates common supertypes for corresponding join key columns.
+    template <typename LeftNamesAndTypes, typename RightNamesAndTypes>
+    bool inferJoinKeyCommonType(const LeftNamesAndTypes & left, const RightNamesAndTypes & right, bool allow_right);
+
+    NamesAndTypesList correctedColumnsAddedByJoin() const;
 
 public:
     TableJoin() = default;
-    TableJoin(const Settings &, VolumePtr tmp_volume);
+
+    TableJoin(const Settings & settings, VolumePtr tmp_volume_);
 
     /// for StorageJoin
     TableJoin(SizeLimits limits, bool use_nulls, ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness,
-              const Names & key_names_right_)
+              const Names & key_names_right)
         : size_limits(limits)
         , default_max_bytes(0)
         , join_use_nulls(use_nulls)
         , join_algorithm(JoinAlgorithm::HASH)
-        , key_names_right(key_names_right_)
     {
+        clauses.emplace_back().key_names_right = key_names_right;
         table_join.kind = kind;
         table_join.strictness = strictness;
     }
 
-    StoragePtr joined_storage;
-    std::shared_ptr<DictionaryReader> dictionary_reader;
-
     ASTTableJoin::Kind kind() const { return table_join.kind; }
     ASTTableJoin::Strictness strictness() const { return table_join.strictness; }
     bool sameStrictnessAndKind(ASTTableJoin::Strictness, ASTTableJoin::Kind) const;
     const SizeLimits & sizeLimits() const { return size_limits; }
     VolumePtr getTemporaryVolume() { return tmp_volume; }
     bool allowMergeJoin() const;
-    bool allowDictJoin(const String & dict_key, const Block & sample_block, Names &, NamesAndTypesList &) const;
     bool preferMergeJoin() const { return join_algorithm == JoinAlgorithm::PREFER_PARTIAL_MERGE; }
     bool forceMergeJoin() const { return join_algorithm == JoinAlgorithm::PARTIAL_MERGE; }
     bool forceHashJoin() const
@@ -155,8 +209,21 @@ public:
     bool enablePartialMergeJoinOptimizations() const { return partial_merge_join_optimizations; }
     bool needStreamWithNonJoinedRows() const;
 
+    bool oneDisjunct() const;
+
+    JoinOnClause & getOnlyClause() { assertHasOneOnExpr(); return clauses[0]; }
+    const JoinOnClause & getOnlyClause() const { assertHasOneOnExpr(); return clauses[0]; }
+
+    std::vector<JoinOnClause> & getClauses() { return clauses; }
+    const std::vector<JoinOnClause> & getClauses() const { return clauses; }
+
+    Names getAllNames(JoinTableSide side) const;
+
     void resetCollected();
     void addUsingKey(const ASTPtr & ast);
+
+    void addDisjunct();
+
     void addOnKeys(ASTPtr & left_table_ast, ASTPtr & right_table_ast);
 
     /* Conditions for left/right table from JOIN ON section.
@@ -173,8 +240,6 @@ public:
      *     doesn't supported yet, it can be added later.
      */
     void addJoinCondition(const ASTPtr & ast, bool is_left);
-    ASTPtr joinConditionColumn(JoinTableSide side) const;
-    std::pair<String, String> joinConditionColumnNames() const;
 
     bool hasUsing() const { return table_join.using_expression_list != nullptr; }
     bool hasOn() const { return table_join.on_expression != nullptr; }
@@ -190,22 +255,13 @@ public:
     bool rightBecomeNullable(const DataTypePtr & column_type) const;
     void addJoinedColumn(const NameAndTypePair & joined_column);
 
-    void addJoinedColumnsAndCorrectTypes(NamesAndTypesList & names_and_types, bool correct_nullability = true) const;
-    void addJoinedColumnsAndCorrectTypes(ColumnsWithTypeAndName & columns, bool correct_nullability = true) const;
-
-    /// Calculates common supertypes for corresponding join key columns.
-    bool inferJoinKeyCommonType(const NamesAndTypesList & left, const NamesAndTypesList & right);
+    void addJoinedColumnsAndCorrectTypes(NamesAndTypesList & left_columns, bool correct_nullability);
 
     /// Calculate converting actions, rename key columns in required
     /// For `USING` join we will convert key columns inplace and affect into types in the result table
     /// For `JOIN ON` we will create new columns with converted keys to join by.
-    bool applyJoinKeyConvert(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns);
-
-    bool needConvert() const { return !left_type_map.empty(); }
-
-    /// Key columns should be converted before join.
-    ActionsDAGPtr leftConvertingActions() const { return left_converting_actions; }
-    ActionsDAGPtr rightConvertingActions() const { return right_converting_actions; }
+    std::pair<ActionsDAGPtr, ActionsDAGPtr>
+    createConvertingActions(const ColumnsWithTypeAndName & left_sample_columns, const ColumnsWithTypeAndName & right_sample_columns);
 
     void setAsofInequality(ASOF::Inequality inequality) { asof_inequality = inequality; }
     ASOF::Inequality getAsofInequality() { return asof_inequality; }
@@ -213,9 +269,8 @@ public:
     ASTPtr leftKeysList() const;
     ASTPtr rightKeysList() const; /// For ON syntax only
 
-    const Names & keyNamesLeft() const { return key_names_left; }
-    const Names & keyNamesRight() const { return key_names_right; }
     const NamesAndTypesList & columnsFromJoinedTable() const { return columns_from_joined_table; }
+
     Names columnsAddedByJoin() const
     {
         Names res;
@@ -225,11 +280,22 @@ public:
     }
 
     /// StorageJoin overrides key names (cause of different names qualification)
-    void setRightKeys(const Names & keys) { key_names_right = keys; }
+    void setRightKeys(const Names & keys) { getOnlyClause().key_names_right = keys; }
 
     Block getRequiredRightKeys(const Block & right_table_keys, std::vector<String> & keys_sources) const;
 
     String renamedRightColumnName(const String & name) const;
+    std::unordered_map<String, String> leftToRightKeyRemap() const;
+
+    void setStorageJoin(std::shared_ptr<StorageJoin> storage);
+    void setStorageJoin(std::shared_ptr<StorageDictionary> storage);
+
+    std::shared_ptr<StorageJoin> getStorageJoin() { return right_storage_join; }
+
+    bool tryInitDictJoin(const Block & sample_block, ContextPtr context);
+
+    bool isSpecialStorage() const { return right_storage_dictionary || right_storage_join; }
+    const DictionaryReader * getDictionaryReader() const { return dictionary_reader.get(); }
 };
 
 }
diff --git a/src/Interpreters/TablesStatus.cpp b/src/Interpreters/TablesStatus.cpp
index 64851f1cb27..5d94624be85 100644
--- a/src/Interpreters/TablesStatus.cpp
+++ b/src/Interpreters/TablesStatus.cpp
@@ -3,6 +3,7 @@
 #include <IO/WriteBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <Core/ProtocolDefines.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/TablesStatus.h b/src/Interpreters/TablesStatus.h
index 85290f69c87..2323e751fc9 100644
--- a/src/Interpreters/TablesStatus.h
+++ b/src/Interpreters/TablesStatus.h
@@ -3,7 +3,7 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/QualifiedTableName.h>
 
 namespace DB
diff --git a/src/Interpreters/TextLog.cpp b/src/Interpreters/TextLog.cpp
index baf98b6771d..51ffbdd66ee 100644
--- a/src/Interpreters/TextLog.cpp
+++ b/src/Interpreters/TextLog.cpp
@@ -26,7 +26,8 @@ NamesAndTypesList TextLogElement::getNamesAndTypes()
                 {"Notice",         static_cast<Int8>(Message::PRIO_NOTICE)},
                 {"Information",    static_cast<Int8>(Message::PRIO_INFORMATION)},
                 {"Debug",          static_cast<Int8>(Message::PRIO_DEBUG)},
-                {"Trace",          static_cast<Int8>(Message::PRIO_TRACE)}
+                {"Trace",          static_cast<Int8>(Message::PRIO_TRACE)},
+                {"Test",           static_cast<Int8>(Message::PRIO_TEST)},
         });
 
     return
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 8590b3c94f3..fff803fa559 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -1,15 +1,21 @@
+#include <mutex>
 #include <Common/ThreadStatus.h>
 
+#include <Processors/Transforms/buildPushingToViewsChain.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/ProcessList.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
+#include <Interpreters/ProcessList.h>
 #include <Interpreters/QueryThreadLog.h>
+#include <Interpreters/QueryViewsLog.h>
+#include <Parsers/formatAST.h>
 #include <Common/CurrentThread.h>
 #include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
 #include <Common/QueryProfiler.h>
+#include <Common/SensitiveDataMasker.h>
 #include <Common/ThreadProfileEvents.h>
 #include <Common/TraceCollector.h>
-#include <common/errnoToString.h>
+#include <base/errnoToString.h>
 
 #if defined(OS_LINUX)
 #   include <Common/hasLinuxCapability.h>
@@ -18,6 +24,14 @@
 #   include <sys/resource.h>
 #endif
 
+namespace ProfileEvents
+{
+extern const Event SelectedRows;
+extern const Event SelectedBytes;
+extern const Event InsertedRows;
+extern const Event InsertedBytes;
+}
+
 
 /// Implement some methods of ThreadStatus and CurrentThread here to avoid extra linking dependencies in clickhouse_common_io
 /// TODO It doesn't make sense.
@@ -110,10 +124,12 @@ void ThreadStatus::setupState(const ThreadGroupStatusPtr & thread_group_)
 
         /// NOTE: thread may be attached multiple times if it is reused from a thread pool.
         thread_group->thread_ids.emplace_back(thread_id);
+        thread_group->threads.insert(this);
 
         logs_queue_ptr = thread_group->logs_queue_ptr;
         fatal_error_callback = thread_group->fatal_error_callback;
         query_context = thread_group->query_context;
+        profile_queue_ptr = thread_group->profile_queue_ptr;
 
         if (global_context.expired())
             global_context = thread_group->global_context;
@@ -287,8 +303,18 @@ void ThreadStatus::finalizePerformanceCounters()
     }
 }
 
+void ThreadStatus::resetPerformanceCountersLastUsage()
+{
+    *last_rusage = RUsageCounters::current();
+    if (taskstats)
+        taskstats->reset();
+}
+
 void ThreadStatus::initQueryProfiler()
 {
+    if (!query_profiled_enabled)
+        return;
+
     /// query profilers are useless without trace collector
     auto global_context_ptr = global_context.lock();
     if (!global_context_ptr || !global_context_ptr->hasTraceCollector())
@@ -305,7 +331,7 @@ void ThreadStatus::initQueryProfiler()
                 /* period */ static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
 
         if (settings.query_profiler_cpu_time_period_ns > 0)
-            query_profiler_cpu = std::make_unique<QueryProfilerCpu>(thread_id,
+            query_profiler_cpu = std::make_unique<QueryProfilerCPU>(thread_id,
                 /* period */ static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
     }
     catch (...)
@@ -374,6 +400,10 @@ void ThreadStatus::detachQuery(bool exit_if_already_detached, bool thread_exits)
     finalizePerformanceCounters();
 
     /// Detach from thread group
+    {
+        std::lock_guard guard(thread_group->mutex);
+        thread_group->threads.erase(this);
+    }
     performance_counters.setParent(&ProfileEvents::global_counters);
     memory_tracker.reset();
 
@@ -448,13 +478,71 @@ void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String
         if (query_context_ptr->getSettingsRef().log_profile_events != 0)
         {
             /// NOTE: Here we are in the same thread, so we can make memcpy()
-            elem.profile_counters = std::make_shared<ProfileEvents::Counters>(performance_counters.getPartiallyAtomicSnapshot());
+            elem.profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(performance_counters.getPartiallyAtomicSnapshot());
         }
     }
 
     thread_log.add(elem);
 }
 
+static String getCleanQueryAst(const ASTPtr q, ContextPtr context)
+{
+    String res = serializeAST(*q, true);
+    if (auto * masker = SensitiveDataMasker::getInstance())
+        masker->wipeSensitiveData(res);
+
+    res = res.substr(0, context->getSettingsRef().log_queries_cut_to_length);
+
+    return res;
+}
+
+void ThreadStatus::logToQueryViewsLog(const ViewRuntimeData & vinfo)
+{
+    auto query_context_ptr = query_context.lock();
+    if (!query_context_ptr)
+        return;
+    auto views_log = query_context_ptr->getQueryViewsLog();
+    if (!views_log)
+        return;
+
+    QueryViewsLogElement element;
+
+    element.event_time = time_in_seconds(vinfo.runtime_stats->event_time);
+    element.event_time_microseconds = time_in_microseconds(vinfo.runtime_stats->event_time);
+    element.view_duration_ms = vinfo.runtime_stats->elapsed_ms;
+
+    element.initial_query_id = query_id;
+    element.view_name = vinfo.table_id.getFullTableName();
+    element.view_uuid = vinfo.table_id.uuid;
+    element.view_type = vinfo.runtime_stats->type;
+    if (vinfo.query)
+        element.view_query = getCleanQueryAst(vinfo.query, query_context_ptr);
+    element.view_target = vinfo.runtime_stats->target_name;
+
+    auto events = std::make_shared<ProfileEvents::Counters::Snapshot>(performance_counters.getPartiallyAtomicSnapshot());
+    element.read_rows = progress_in.read_rows.load(std::memory_order_relaxed);
+    element.read_bytes = progress_in.read_bytes.load(std::memory_order_relaxed);
+    element.written_rows = (*events)[ProfileEvents::InsertedRows];
+    element.written_bytes = (*events)[ProfileEvents::InsertedBytes];
+    element.peak_memory_usage = memory_tracker.getPeak() > 0 ? memory_tracker.getPeak() : 0;
+    if (query_context_ptr->getSettingsRef().log_profile_events != 0)
+    {
+        element.profile_counters = events;
+    }
+
+    element.status = vinfo.runtime_stats->event_status;
+    element.exception_code = 0;
+    if (vinfo.exception)
+    {
+        element.exception_code = getExceptionErrorCode(vinfo.exception);
+        element.exception = getExceptionMessage(vinfo.exception, false);
+        if (query_context_ptr->getSettingsRef().calculate_text_stack_trace)
+            element.stack_trace = getExceptionStackTraceString(vinfo.exception);
+    }
+
+    views_log->add(element);
+}
+
 void CurrentThread::initializeQuery()
 {
     if (unlikely(!current_thread))
diff --git a/src/Interpreters/TraceLog.cpp b/src/Interpreters/TraceLog.cpp
index dac27aebe58..c16a73e75dc 100644
--- a/src/Interpreters/TraceLog.cpp
+++ b/src/Interpreters/TraceLog.cpp
@@ -19,6 +19,7 @@ const TraceDataType::Values TraceLogElement::trace_values =
     {"CPU", static_cast<UInt8>(TraceType::CPU)},
     {"Memory", static_cast<UInt8>(TraceType::Memory)},
     {"MemorySample", static_cast<UInt8>(TraceType::MemorySample)},
+    {"MemoryPeak", static_cast<UInt8>(TraceType::MemoryPeak)},
 };
 
 NamesAndTypesList TraceLogElement::getNamesAndTypes()
diff --git a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
index bf3bbf22b8c..2d1b6b3f239 100644
--- a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
+++ b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
@@ -334,7 +334,7 @@ void RestoreQualifiedNamesMatcher::Data::changeTable(ASTIdentifier & identifier)
     {
         case IdentifierSemantic::ColumnMatch::AliasedTableName:
         case IdentifierSemantic::ColumnMatch::TableName:
-        case IdentifierSemantic::ColumnMatch::DbAndTable:
+        case IdentifierSemantic::ColumnMatch::DBAndTable:
             IdentifierSemantic::setColumnLongName(identifier, remote_table);
             break;
         default:
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index c1a265d9a06..e811299b327 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -14,10 +14,10 @@
 #include <Interpreters/RewriteCountVariantsVisitor.h>
 #include <Interpreters/MonotonicityCheckVisitor.h>
 #include <Interpreters/ConvertStringsToEnumVisitor.h>
-#include <Interpreters/PredicateExpressionsOptimizer.h>
 #include <Interpreters/RewriteFunctionToSubcolumnVisitor.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
+#include <Interpreters/GatherFunctionQuantileVisitor.h>
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
@@ -39,6 +39,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int UNKNOWN_TYPE_OF_AST_NODE;
 }
 
 namespace
@@ -66,34 +67,22 @@ const std::unordered_set<String> possibly_injective_function_names
   * Instead, leave `GROUP BY const`.
   * Next, see deleting the constants in the analyzeAggregation method.
   */
-void appendUnusedGroupByColumn(ASTSelectQuery * select_query, const NameSet & source_columns)
+void appendUnusedGroupByColumn(ASTSelectQuery * select_query)
 {
     /// You must insert a constant that is not the name of the column in the table. Such a case is rare, but it happens.
-    UInt64 unused_column = 0;
-    String unused_column_name = toString(unused_column);
-
-    while (source_columns.count(unused_column_name))
-    {
-        ++unused_column;
-        unused_column_name = toString(unused_column);
-    }
-
+    /// Also start unused_column integer must not intersect with ([1, source_columns.size()])
+    /// might be in positional GROUP BY.
     select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, std::make_shared<ASTExpressionList>());
-    select_query->groupBy()->children.emplace_back(std::make_shared<ASTLiteral>(UInt64(unused_column)));
+    select_query->groupBy()->children.emplace_back(std::make_shared<ASTLiteral>(Int64(-1)));
 }
 
 /// Eliminates injective function calls and constant expressions from group by statement.
-void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_columns, ContextPtr context)
+void optimizeGroupBy(ASTSelectQuery * select_query, ContextPtr context)
 {
     const FunctionFactory & function_factory = FunctionFactory::instance();
 
     if (!select_query->groupBy())
-    {
-        // If there is a HAVING clause without GROUP BY, make sure we have some aggregation happen.
-        if (select_query->having())
-            appendUnusedGroupByColumn(select_query, source_columns);
         return;
-    }
 
     const auto is_literal = [] (const ASTPtr & ast) -> bool
     {
@@ -111,6 +100,8 @@ void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_colum
         group_exprs.pop_back();
     };
 
+    const auto & settings = context->getSettingsRef();
+
     /// iterate over each GROUP BY expression, eliminate injective function calls and literals
     for (size_t i = 0; i < group_exprs.size();)
     {
@@ -166,7 +157,22 @@ void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_colum
         }
         else if (is_literal(group_exprs[i]))
         {
-            remove_expr_at_index(i);
+            bool keep_position = false;
+            if (settings.enable_positional_arguments)
+            {
+                const auto & value = group_exprs[i]->as<ASTLiteral>()->value;
+                if (value.getType() == Field::Types::UInt64)
+                {
+                    auto pos = value.get<UInt64>();
+                    if (pos > 0 && pos <= select_query->children.size())
+                        keep_position = true;
+                }
+            }
+
+            if (keep_position)
+                ++i;
+            else
+                remove_expr_at_index(i);
         }
         else
         {
@@ -176,7 +182,7 @@ void optimizeGroupBy(ASTSelectQuery * select_query, const NameSet & source_colum
     }
 
     if (group_exprs.empty())
-        appendUnusedGroupByColumn(select_query, source_columns);
+        appendUnusedGroupByColumn(select_query);
 }
 
 struct GroupByKeysInfo
@@ -263,7 +269,8 @@ void optimizeDuplicatesInOrderBy(const ASTSelectQuery * select_query)
         String name = elem->children.front()->getColumnName();
         const auto & order_by_elem = elem->as<ASTOrderByElement &>();
 
-        if (elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
+        if (order_by_elem.with_fill /// Always keep elements WITH FILL as they affects other.
+            || elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
             unique_elems.emplace_back(elem);
     }
 
@@ -406,6 +413,17 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     if (!order_by)
         return;
 
+    for (const auto & child : order_by->children)
+    {
+        auto * order_by_element = child->as<ASTOrderByElement>();
+
+        if (!order_by_element || order_by_element->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (order_by_element->with_fill)
+            return;
+    }
+
     std::unordered_set<String> group_by_hashes;
     if (auto group_by = select_query->groupBy())
     {
@@ -421,6 +439,7 @@ void optimizeMonotonousFunctionsInOrderBy(ASTSelectQuery * select_query, Context
     for (size_t i = 0; i < order_by->children.size(); ++i)
     {
         auto * order_by_element = order_by->children[i]->as<ASTOrderByElement>();
+
         auto & ast_func = order_by_element->children[0];
         if (!ast_func->as<ASTFunction>())
             continue;
@@ -456,6 +475,17 @@ void optimizeRedundantFunctionsInOrderBy(const ASTSelectQuery * select_query, Co
     if (!order_by)
         return;
 
+    for (const auto & child : order_by->children)
+    {
+        auto * order_by_element = child->as<ASTOrderByElement>();
+
+        if (!order_by_element || order_by_element->children.empty())
+            throw Exception("Bad ORDER BY expression AST", ErrorCodes::UNKNOWN_TYPE_OF_AST_NODE);
+
+        if (order_by_element->with_fill)
+            return;
+    }
+
     std::unordered_set<String> prev_keys;
     ASTs modified;
     modified.reserve(order_by->children.size());
@@ -587,6 +617,59 @@ void optimizeFunctionsToSubcolumns(ASTPtr & query, const StorageMetadataPtr & me
     RewriteFunctionToSubcolumnVisitor(data).visit(query);
 }
 
+std::shared_ptr<ASTFunction> getQuantileFuseCandidate(const String & func_name, std::vector<ASTPtr *> & functions)
+{
+    if (functions.size() < 2)
+        return nullptr;
+
+    const auto & common_arguments = (*functions[0])->as<ASTFunction>()->arguments->children;
+    auto func_base = makeASTFunction(GatherFunctionQuantileData::getFusedName(func_name));
+    func_base->arguments->children = common_arguments;
+    func_base->parameters = std::make_shared<ASTExpressionList>();
+
+    for (const auto * ast : functions)
+    {
+        assert(ast && *ast);
+        const auto * func = (*ast)->as<ASTFunction>();
+        assert(func && func->parameters->as<ASTExpressionList>());
+        const ASTs & parameters = func->parameters->as<ASTExpressionList &>().children;
+        if (parameters.size() != 1)
+            return nullptr; /// query is illegal, give up
+        func_base->parameters->children.push_back(parameters[0]);
+    }
+    return func_base;
+}
+
+/// Rewrites multi quantile()() functions with the same arguments to quantiles()()[]
+/// eg:SELECT quantile(0.5)(x), quantile(0.9)(x), quantile(0.95)(x) FROM...
+///    rewrite to : SELECT quantiles(0.5, 0.9, 0.95)(x)[1], quantiles(0.5, 0.9, 0.95)(x)[2], quantiles(0.5, 0.9, 0.95)(x)[3] FROM ...
+void optimizeFuseQuantileFunctions(ASTPtr & query)
+{
+    GatherFunctionQuantileVisitor::Data data{};
+    GatherFunctionQuantileVisitor(data).visit(query);
+    for (auto & candidate : data.fuse_quantile)
+    {
+        String func_name = candidate.first;
+        auto & args_to_functions = candidate.second;
+
+        /// Try to fuse multiply `quantile*` Function to plural
+        for (auto it : args_to_functions.arg_map_function)
+        {
+            std::vector<ASTPtr *> & functions = it.second;
+            auto func_base = getQuantileFuseCandidate(func_name, functions);
+            if (!func_base)
+                continue;
+            for (size_t i = 0; i < functions.size(); ++i)
+            {
+                std::shared_ptr<ASTFunction> ast_new = makeASTFunction("arrayElement", func_base, std::make_shared<ASTLiteral>(i + 1));
+                if (const auto & alias = (*functions[i])->tryGetAlias(); !alias.empty())
+                    ast_new->setAlias(alias);
+                *functions[i] = ast_new;
+            }
+        }
+    }
+}
+
 }
 
 void TreeOptimizer::optimizeIf(ASTPtr & query, Aliases & aliases, bool if_chain_to_multiif)
@@ -617,11 +700,8 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
     if (settings.optimize_arithmetic_operations_in_aggregate_functions)
         optimizeAggregationFunctions(query);
 
-    /// Push the predicate expression down to the subqueries.
-    result.rewrite_subqueries = PredicateExpressionsOptimizer(context, tables_with_columns, settings).optimize(*select_query);
-
     /// GROUP BY injective function elimination.
-    optimizeGroupBy(select_query, result.source_columns_set, context);
+    optimizeGroupBy(select_query, context);
 
     /// GROUP BY functions of other keys elimination.
     if (settings.optimize_group_by_function_keys)
@@ -684,6 +764,9 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
 
     /// Remove duplicated columns from USING(...).
     optimizeUsing(select_query);
+
+    if (settings.optimize_syntax_fuse_functions)
+        optimizeFuseQuantileFunctions(query);
 }
 
 }
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index cc345004f6f..e0968b7fce4 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -1,6 +1,8 @@
 #include <Core/Settings.h>
 #include <Core/NamesAndTypes.h>
 
+#include <Common/checkStackSize.h>
+
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/LogicalExpressionsOptimizer.h>
 #include <Interpreters/QueryAliasesVisitor.h>
@@ -14,11 +16,13 @@
 #include <Interpreters/CollectJoinOnKeysVisitor.h>
 #include <Interpreters/RequiredSourceColumnsVisitor.h>
 #include <Interpreters/GetAggregatesVisitor.h>
+#include <Interpreters/UserDefinedSQLFunctionVisitor.h>
 #include <Interpreters/TableJoin.h>
 #include <Interpreters/ExpressionActions.h> /// getSmallestColumn()
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/TreeOptimizer.h>
 #include <Interpreters/replaceAliasColumnsInQuery.h>
+#include <Interpreters/PredicateExpressionsOptimizer.h>
 
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
@@ -247,6 +251,61 @@ using CustomizeAggregateFunctionsOrNullVisitor = InDepthNodeVisitor<OneTypeMatch
 using CustomizeAggregateFunctionsMoveOrNullVisitor = InDepthNodeVisitor<OneTypeMatcher<CustomizeAggregateFunctionsMoveSuffixData>, true>;
 using FuseSumCountAggregatesVisitor = InDepthNodeVisitor<OneTypeMatcher<FuseSumCountAggregatesVisitorData>, true>;
 
+
+struct ExistsExpressionData
+{
+    using TypeToVisit = ASTFunction;
+
+    static void visit(ASTFunction & func, ASTPtr)
+    {
+        bool exists_expression = func.name == "exists"
+            && func.arguments && func.arguments->children.size() == 1
+            && typeid_cast<const ASTSubquery *>(func.arguments->children[0].get());
+
+        if (!exists_expression)
+            return;
+
+        /// EXISTS(subquery) --> 1 IN (SELECT 1 FROM subquery LIMIT 1)
+
+        auto subquery_node = func.arguments->children[0];
+        auto table_expression = std::make_shared<ASTTableExpression>();
+        table_expression->subquery = std::move(subquery_node);
+        table_expression->children.push_back(table_expression->subquery);
+
+        auto tables_in_select_element = std::make_shared<ASTTablesInSelectQueryElement>();
+        tables_in_select_element->table_expression = std::move(table_expression);
+        tables_in_select_element->children.push_back(tables_in_select_element->table_expression);
+
+        auto tables_in_select = std::make_shared<ASTTablesInSelectQuery>();
+        tables_in_select->children.push_back(std::move(tables_in_select_element));
+
+        auto select_expr_list = std::make_shared<ASTExpressionList>();
+        select_expr_list->children.push_back(std::make_shared<ASTLiteral>(1u));
+
+        auto select_query = std::make_shared<ASTSelectQuery>();
+        select_query->children.push_back(select_expr_list);
+
+        select_query->setExpression(ASTSelectQuery::Expression::SELECT, select_expr_list);
+        select_query->setExpression(ASTSelectQuery::Expression::TABLES, tables_in_select);
+
+        ASTPtr limit_length_ast = std::make_shared<ASTLiteral>(Field(UInt64(1)));
+        select_query->setExpression(ASTSelectQuery::Expression::LIMIT_LENGTH, std::move(limit_length_ast));
+
+        auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
+        select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
+        select_with_union_query->list_of_selects->children.push_back(std::move(select_query));
+        select_with_union_query->children.push_back(select_with_union_query->list_of_selects);
+
+        auto new_subquery = std::make_shared<ASTSubquery>();
+        new_subquery->children.push_back(select_with_union_query);
+
+        auto function = makeASTFunction("in", std::make_shared<ASTLiteral>(1u), new_subquery);
+        func = *function;
+    }
+};
+
+using ExistsExpressionVisitor = InDepthNodeVisitor<OneTypeMatcher<ExistsExpressionData>, false>;
+
 /// Translate qualified names such as db.table.column, table.column, table_alias.column to names' normal form.
 /// Expand asterisks and qualified asterisks with column names.
 /// There would be columns in normal form & column aliases after translation. Column & column alias would be normalized in QueryNormalizer.
@@ -421,46 +480,44 @@ void executeScalarSubqueries(ASTPtr & query, ContextPtr context, size_t subquery
 void getArrayJoinedColumns(ASTPtr & query, TreeRewriterResult & result, const ASTSelectQuery * select_query,
                            const NamesAndTypesList & source_columns, const NameSet & source_columns_set)
 {
-    if (ASTPtr array_join_expression_list = select_query->arrayJoinExpressionList())
+    if (!select_query->arrayJoinExpressionList().first)
+        return;
+
+    ArrayJoinedColumnsVisitor::Data visitor_data{
+        result.aliases, result.array_join_name_to_alias, result.array_join_alias_to_name, result.array_join_result_to_source};
+    ArrayJoinedColumnsVisitor(visitor_data).visit(query);
+
+    /// If the result of ARRAY JOIN is not used, it is necessary to ARRAY-JOIN any column,
+    /// to get the correct number of rows.
+    if (result.array_join_result_to_source.empty())
     {
-        ArrayJoinedColumnsVisitor::Data visitor_data{result.aliases,
-                                                    result.array_join_name_to_alias,
-                                                    result.array_join_alias_to_name,
-                                                    result.array_join_result_to_source};
-        ArrayJoinedColumnsVisitor(visitor_data).visit(query);
+        if (select_query->arrayJoinExpressionList().first->children.empty())
+            throw DB::Exception("ARRAY JOIN requires an argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        /// If the result of ARRAY JOIN is not used, it is necessary to ARRAY-JOIN any column,
-        /// to get the correct number of rows.
-        if (result.array_join_result_to_source.empty())
+        ASTPtr expr = select_query->arrayJoinExpressionList().first->children.at(0);
+        String source_name = expr->getColumnName();
+        String result_name = expr->getAliasOrColumnName();
+
+        /// This is an array.
+        if (!expr->as<ASTIdentifier>() || source_columns_set.count(source_name))
         {
-            if (select_query->arrayJoinExpressionList()->children.empty())
-                throw DB::Exception("ARRAY JOIN requires an argument", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-            ASTPtr expr = select_query->arrayJoinExpressionList()->children.at(0);
-            String source_name = expr->getColumnName();
-            String result_name = expr->getAliasOrColumnName();
-
-            /// This is an array.
-            if (!expr->as<ASTIdentifier>() || source_columns_set.count(source_name))
+            result.array_join_result_to_source[result_name] = source_name;
+        }
+        else /// This is a nested table.
+        {
+            bool found = false;
+            for (const auto & column : source_columns)
             {
-                result.array_join_result_to_source[result_name] = source_name;
-            }
-            else /// This is a nested table.
-            {
-                bool found = false;
-                for (const auto & column : source_columns)
+                auto split = Nested::splitName(column.name);
+                if (split.first == source_name && !split.second.empty())
                 {
-                    auto split = Nested::splitName(column.name);
-                    if (split.first == source_name && !split.second.empty())
-                    {
-                        result.array_join_result_to_source[Nested::concatenateName(result_name, split.second)] = column.name;
-                        found = true;
-                        break;
-                    }
+                    result.array_join_result_to_source[Nested::concatenateName(result_name, split.second)] = column.name;
+                    found = true;
+                    break;
                 }
-                if (!found)
-                    throw Exception("No columns in nested table " + source_name, ErrorCodes::EMPTY_NESTED_TABLE);
             }
+            if (!found)
+                throw Exception("No columns in nested table " + source_name, ErrorCodes::EMPTY_NESTED_TABLE);
         }
     }
 }
@@ -516,30 +573,55 @@ void collectJoinedColumns(TableJoin & analyzed_join, const ASTTableJoin & table_
     if (table_join.using_expression_list)
     {
         const auto & keys = table_join.using_expression_list->as<ASTExpressionList &>();
+
+        analyzed_join.addDisjunct();
         for (const auto & key : keys.children)
             analyzed_join.addUsingKey(key);
-
-        /// `USING` semantic allows to have columns with changed types in result table.
-        /// `JOIN ON` should preserve types from original table
-        /// We can infer common type on syntax stage for `USING` because join is performed only by columns (not expressions)
-        /// We need to know  changed types in result tables because some analysis (e.g. analyzeAggregation) performed before join
-        /// For `JOIN ON expr1 == expr2` we will infer common type later in ExpressionAnalyzer, when types of expression will be known
-        analyzed_join.inferJoinKeyCommonType(tables[0].columns, tables[1].columns);
     }
     else if (table_join.on_expression)
     {
         bool is_asof = (table_join.strictness == ASTTableJoin::Strictness::Asof);
 
         CollectJoinOnKeysVisitor::Data data{analyzed_join, tables[0], tables[1], aliases, is_asof};
-        CollectJoinOnKeysVisitor(data).visit(table_join.on_expression);
-        if (analyzed_join.keyNamesLeft().empty())
+        if (auto * or_func = table_join.on_expression->as<ASTFunction>(); or_func && or_func->name == "or")
         {
-            throw Exception("Cannot get JOIN keys from JOIN ON section: " + queryToString(table_join.on_expression),
-                            ErrorCodes::INVALID_JOIN_ON_EXPRESSION);
+            for (auto & disjunct : or_func->arguments->children)
+            {
+                analyzed_join.addDisjunct();
+                CollectJoinOnKeysVisitor(data).visit(disjunct);
+            }
+            assert(analyzed_join.getClauses().size() == or_func->arguments->children.size());
+        }
+        else
+        {
+            analyzed_join.addDisjunct();
+            CollectJoinOnKeysVisitor(data).visit(table_join.on_expression);
+            assert(analyzed_join.oneDisjunct());
+        }
+
+        if (analyzed_join.getClauses().empty())
+                throw DB::Exception(ErrorCodes::INVALID_JOIN_ON_EXPRESSION,
+                                    "Cannot get JOIN keys from JOIN ON section: '{}'",
+                                    queryToString(table_join.on_expression));
+
+        for (const auto & onexpr : analyzed_join.getClauses())
+        {
+            if (onexpr.key_names_left.empty())
+                throw DB::Exception(ErrorCodes::INVALID_JOIN_ON_EXPRESSION,
+                                    "Cannot get JOIN keys from JOIN ON section: '{}'",
+                                    queryToString(table_join.on_expression));
         }
 
         if (is_asof)
+        {
+            if (!analyzed_join.oneDisjunct())
+                throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "ASOF join doesn't support multiple ORs for keys in JOIN ON section");
             data.asofToJoinKeys();
+        }
+
+        if (!analyzed_join.oneDisjunct() && !analyzed_join.forceHashJoin())
+            throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "Only `hash` join supports multiple ORs for keys in JOIN ON section");
+
     }
 }
 
@@ -609,6 +691,27 @@ std::vector<const ASTFunction *> getWindowFunctions(ASTPtr & query, const ASTSel
     return data.window_functions;
 }
 
+class MarkTupleLiteralsAsLegacyData
+{
+public:
+    using TypeToVisit = ASTLiteral;
+
+    static void visit(ASTLiteral & literal, ASTPtr &)
+    {
+        if (literal.value.getType() == Field::Types::Tuple)
+            literal.use_legacy_column_name_of_tuple = true;
+    }
+};
+
+using MarkTupleLiteralsAsLegacyMatcher = OneTypeMatcher<MarkTupleLiteralsAsLegacyData>;
+using MarkTupleLiteralsAsLegacyVisitor = InDepthNodeVisitor<MarkTupleLiteralsAsLegacyMatcher, true>;
+
+void markTupleLiteralsAsLegacy(ASTPtr & query)
+{
+    MarkTupleLiteralsAsLegacyVisitor::Data data;
+    MarkTupleLiteralsAsLegacyVisitor(data).visit(query);
+}
+
 }
 
 TreeRewriterResult::TreeRewriterResult(
@@ -851,6 +954,10 @@ void TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
     }
 
     required_source_columns.swap(source_columns);
+    for (const auto & column : required_source_columns)
+    {
+        source_column_names.insert(column.name);
+    }
 }
 
 NameSet TreeRewriterResult::getArrayJoinSourceNameSet() const
@@ -927,7 +1034,15 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     /// Executing scalar subqueries - replacing them with constant values.
     executeScalarSubqueries(query, getContext(), subquery_depth, result.scalars, select_options.only_analyze);
 
-    TreeOptimizer::apply(query, result, tables_with_columns, getContext());
+    if (settings.legacy_column_name_of_tuple_literal)
+        markTupleLiteralsAsLegacy(query);
+
+    /// Push the predicate expression down to subqueries. The optimization should be applied to both initial and secondary queries.
+    result.rewrite_subqueries = PredicateExpressionsOptimizer(getContext(), tables_with_columns, settings).optimize(*select_query);
+
+    /// Only apply AST optimization for initial queries.
+    if (getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        TreeOptimizer::apply(query, result, tables_with_columns, getContext());
 
     /// array_join_alias_to_name, array_join_result_to_source.
     getArrayJoinedColumns(query, result, select_query, result.source_columns, source_columns_set);
@@ -935,16 +1050,9 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     setJoinStrictness(
         *select_query, settings.join_default_strictness, settings.any_join_distinct_right_table_keys, result.analyzed_join->table_join);
 
-    if (const auto * join_ast = select_query->join(); join_ast && tables_with_columns.size() >= 2)
-    {
-        auto & table_join_ast = join_ast->table_join->as<ASTTableJoin &>();
-        if (table_join_ast.using_expression_list && result.metadata_snapshot)
-            replaceAliasColumnsInQuery(table_join_ast.using_expression_list, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext());
-        if (table_join_ast.on_expression && result.metadata_snapshot)
-            replaceAliasColumnsInQuery(table_join_ast.on_expression, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext());
-
-        collectJoinedColumns(*result.analyzed_join, table_join_ast, tables_with_columns, result.aliases);
-    }
+    auto * table_join_ast = select_query->join() ? select_query->join()->table_join->as<ASTTableJoin>() : nullptr;
+    if (table_join_ast && tables_with_columns.size() >= 2)
+        collectJoinedColumns(*result.analyzed_join, *table_join_ast, tables_with_columns, result.aliases);
 
     result.aggregates = getAggregates(query, *select_query);
     result.window_function_asts = getWindowFunctions(query, *select_query);
@@ -952,10 +1060,22 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     result.required_source_columns_before_expanding_alias_columns = result.required_source_columns.getNames();
 
     /// rewrite filters for select query, must go after getArrayJoinedColumns
-    if (settings.optimize_respect_aliases && result.metadata_snapshot)
+    bool is_initiator = getContext()->getClientInfo().distributed_depth == 0;
+    if (settings.optimize_respect_aliases && result.metadata_snapshot && is_initiator)
     {
+        std::unordered_set<IAST *> excluded_nodes;
+        {
+            /// Do not replace ALIASed columns in JOIN ON/USING sections
+            if (table_join_ast && table_join_ast->on_expression)
+                excluded_nodes.insert(table_join_ast->on_expression.get());
+            if (table_join_ast && table_join_ast->using_expression_list)
+                excluded_nodes.insert(table_join_ast->using_expression_list.get());
+        }
+
+        bool is_changed = replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(),
+                                                     result.array_join_result_to_source, getContext(), excluded_nodes);
         /// If query is changed, we need to redo some work to correct name resolution.
-        if (replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext()))
+        if (is_changed)
         {
             result.aggregates = getAggregates(query, *select_query);
             result.window_function_asts = getWindowFunctions(query, *select_query);
@@ -980,7 +1100,8 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     ConstStoragePtr storage,
     const StorageMetadataPtr & metadata_snapshot,
     bool allow_aggregations,
-    bool allow_self_aliases) const
+    bool allow_self_aliases,
+    bool execute_scalar_subqueries) const
 {
     if (query->as<ASTSelectQuery>())
         throw Exception("Not select analyze for select asts.", ErrorCodes::LOGICAL_ERROR);
@@ -992,7 +1113,10 @@ TreeRewriterResultPtr TreeRewriter::analyze(
     normalize(query, result.aliases, result.source_columns_set, false, settings, allow_self_aliases);
 
     /// Executing scalar subqueries. Column defaults could be a scalar subquery.
-    executeScalarSubqueries(query, getContext(), 0, result.scalars, false);
+    executeScalarSubqueries(query, getContext(), 0, result.scalars, !execute_scalar_subqueries);
+
+    if (settings.legacy_column_name_of_tuple_literal)
+        markTupleLiteralsAsLegacy(query);
 
     TreeOptimizer::optimizeIf(query, result.aliases, settings.optimize_if_chain_to_multiif);
 
@@ -1017,6 +1141,9 @@ TreeRewriterResultPtr TreeRewriter::analyze(
 void TreeRewriter::normalize(
     ASTPtr & query, Aliases & aliases, const NameSet & source_columns_set, bool ignore_alias, const Settings & settings, bool allow_self_aliases)
 {
+    UserDefinedSQLFunctionVisitor::Data data_user_defined_functions_visitor;
+    UserDefinedSQLFunctionVisitor(data_user_defined_functions_visitor).visit(query);
+
     CustomizeCountDistinctVisitor::Data data_count_distinct{settings.count_distinct_implementation};
     CustomizeCountDistinctVisitor(data_count_distinct).visit(query);
 
@@ -1026,6 +1153,9 @@ void TreeRewriter::normalize(
     CustomizeIfDistinctVisitor::Data data_distinct_if{"DistinctIf"};
     CustomizeIfDistinctVisitor(data_distinct_if).visit(query);
 
+    ExistsExpressionVisitor::Data exists;
+    ExistsExpressionVisitor(exists).visit(query);
+
     if (settings.transform_null_in)
     {
         CustomizeInVisitor::Data data_null_in{"nullIn"};
@@ -1045,7 +1175,7 @@ void TreeRewriter::normalize(
     // if we have at least two different functions. E.g. we will replace sum(x)
     // and count(x) with sumCount(x).1 and sumCount(x).2, and sumCount() will
     // be calculated only once because of CSE.
-    if (settings.optimize_fuse_sum_count_avg)
+    if (settings.optimize_fuse_sum_count_avg || settings.optimize_syntax_fuse_functions)
     {
         FuseSumCountAggregatesVisitor::Data data;
         FuseSumCountAggregatesVisitor(data).visit(query);
diff --git a/src/Interpreters/TreeRewriter.h b/src/Interpreters/TreeRewriter.h
index 0dca00c285e..52c62cc4cec 100644
--- a/src/Interpreters/TreeRewriter.h
+++ b/src/Interpreters/TreeRewriter.h
@@ -73,7 +73,7 @@ struct TreeRewriterResult
     /// Results of scalar sub queries
     Scalars scalars;
 
-    TreeRewriterResult(
+    explicit TreeRewriterResult(
         const NamesAndTypesList & source_columns_,
         ConstStoragePtr storage_ = {},
         const StorageMetadataPtr & metadata_snapshot_ = {},
@@ -84,7 +84,6 @@ struct TreeRewriterResult
     Names requiredSourceColumns() const { return required_source_columns.getNames(); }
     const Names & requiredSourceColumnsForAccessCheck() const { return required_source_columns_before_expanding_alias_columns; }
     NameSet getArrayJoinSourceNameSet() const;
-    Names getExpandedAliases() const { return {expanded_aliases.begin(), expanded_aliases.end()}; }
     const Scalars & getScalars() const { return scalars; }
 };
 
@@ -111,7 +110,8 @@ public:
         ConstStoragePtr storage = {},
         const StorageMetadataPtr & metadata_snapshot = {},
         bool allow_aggregations = false,
-        bool allow_self_aliases = true) const;
+        bool allow_self_aliases = true,
+        bool execute_scalar_subqueries = true) const;
 
     /// Analyze and rewrite select query
     TreeRewriterResultPtr analyzeSelect(
diff --git a/src/Interpreters/UserDefinedExecutableFunction.cpp b/src/Interpreters/UserDefinedExecutableFunction.cpp
new file mode 100644
index 00000000000..d57978d0fd6
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunction.cpp
@@ -0,0 +1,26 @@
+#include "UserDefinedExecutableFunction.h"
+
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+
+#include <Processors/Sources/ShellCommandSource.h>
+#include <Formats/formatBlock.h>
+
+
+namespace DB
+{
+
+UserDefinedExecutableFunction::UserDefinedExecutableFunction(
+    const UserDefinedExecutableFunctionConfiguration & configuration_,
+    const ExternalLoadableLifetime & lifetime_,
+    std::shared_ptr<ProcessPool> process_pool_)
+    : configuration(configuration_)
+    , lifetime(lifetime_)
+    , process_pool(process_pool_)
+{
+    if (!process_pool && configuration.type == UserDefinedExecutableFunctionType::executable_pool)
+        process_pool = std::make_shared<ProcessPool>(configuration.pool_size == 0 ? std::numeric_limits<int>::max() : configuration.pool_size);
+}
+
+};
diff --git a/src/Interpreters/UserDefinedExecutableFunction.h b/src/Interpreters/UserDefinedExecutableFunction.h
new file mode 100644
index 00000000000..1cb1de47578
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunction.h
@@ -0,0 +1,99 @@
+#pragma once
+
+#include <string>
+
+#include <DataTypes/IDataType.h>
+#include <Processors/Sources/ShellCommandSource.h>
+#include <Interpreters/IExternalLoadable.h>
+
+
+namespace DB
+{
+
+enum class UserDefinedExecutableFunctionType
+{
+    executable,
+    executable_pool
+};
+
+struct UserDefinedExecutableFunctionConfiguration
+{
+    UserDefinedExecutableFunctionType type = UserDefinedExecutableFunctionType::executable;
+    std::string name;
+    std::string script_path;
+    std::string format;
+    std::vector<DataTypePtr> argument_types;
+    DataTypePtr result_type;
+    /// Pool settings
+    size_t pool_size = 0;
+    size_t command_termination_timeout = 0;
+    size_t max_command_execution_time = 0;
+    /// Send number_of_rows\n before sending chunk to process
+    bool send_chunk_header = false;
+};
+
+class UserDefinedExecutableFunction final : public IExternalLoadable
+{
+public:
+
+    UserDefinedExecutableFunction(
+        const UserDefinedExecutableFunctionConfiguration & configuration_,
+        const ExternalLoadableLifetime & lifetime_,
+        std::shared_ptr<ProcessPool> process_pool_ = nullptr);
+
+    const ExternalLoadableLifetime & getLifetime() const override
+    {
+        return lifetime;
+    }
+
+    const std::string & getLoadableName() const override
+    {
+        return configuration.name;
+    }
+
+    bool supportUpdates() const override
+    {
+        return true;
+    }
+
+    bool isModified() const override
+    {
+        return true;
+    }
+
+    std::shared_ptr<const IExternalLoadable> clone() const override
+    {
+        return std::make_shared<UserDefinedExecutableFunction>(configuration, lifetime, process_pool);
+    }
+
+    const UserDefinedExecutableFunctionConfiguration & getConfiguration() const
+    {
+        return configuration;
+    }
+
+    std::shared_ptr<ProcessPool> getProcessPool() const
+    {
+        return process_pool;
+    }
+
+    std::shared_ptr<UserDefinedExecutableFunction> shared_from_this()
+    {
+        return std::static_pointer_cast<UserDefinedExecutableFunction>(IExternalLoadable::shared_from_this());
+    }
+
+    std::shared_ptr<const UserDefinedExecutableFunction> shared_from_this() const
+    {
+        return std::static_pointer_cast<const UserDefinedExecutableFunction>(IExternalLoadable::shared_from_this());
+    }
+
+private:
+    UserDefinedExecutableFunction(const UserDefinedExecutableFunctionConfiguration & configuration_,
+        std::shared_ptr<ProcessPool> process_pool_,
+        const ExternalLoadableLifetime & lifetime_);
+
+    UserDefinedExecutableFunctionConfiguration configuration;
+    ExternalLoadableLifetime lifetime;
+    std::shared_ptr<ProcessPool> process_pool;
+};
+
+}
diff --git a/src/Interpreters/UserDefinedExecutableFunctionFactory.cpp b/src/Interpreters/UserDefinedExecutableFunctionFactory.cpp
new file mode 100644
index 00000000000..4cb3e034b01
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunctionFactory.cpp
@@ -0,0 +1,232 @@
+#include "UserDefinedExecutableFunctionFactory.h"
+
+#include <IO/WriteHelpers.h>
+
+#include <Processors/Sources/ShellCommandSource.h>
+#include <Formats/formatBlock.h>
+
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Interpreters/ExternalUserDefinedExecutableFunctionsLoader.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/castColumn.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+class UserDefinedFunction final : public IFunction
+{
+public:
+
+    explicit UserDefinedFunction(
+        ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr executable_function_,
+        ContextPtr context_)
+        : executable_function(std::move(executable_function_))
+        , context(context_)
+    {
+    }
+
+    String getName() const override { return executable_function->getConfiguration().name; }
+
+    bool isVariadic() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+    size_t getNumberOfArguments() const override { return executable_function->getConfiguration().argument_types.size(); }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForNulls() const override { return true; }
+    bool isDeterministic() const override { return false; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes &) const override
+    {
+        const auto & configuration = executable_function->getConfiguration();
+        return configuration.result_type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        const auto & configuration = executable_function->getConfiguration();
+        auto arguments_copy = arguments;
+
+        for (size_t i = 0; i < arguments.size(); ++i)
+        {
+            auto & column_with_type = arguments_copy[i];
+            column_with_type.column = column_with_type.column->convertToFullColumnIfConst();
+
+            const auto & argument_type = configuration.argument_types[i];
+            if (areTypesEqual(arguments_copy[i].type, argument_type))
+                continue;
+
+            ColumnWithTypeAndName column_to_cast = {column_with_type.column, column_with_type.type, column_with_type.name};
+            column_with_type.column = castColumnAccurate(column_to_cast, argument_type);
+            column_with_type.type = argument_type;
+
+            column_with_type = column_to_cast;
+        }
+
+        std::unique_ptr<ShellCommand> process = getProcess();
+
+        ColumnWithTypeAndName result(result_type, "result");
+        Block result_block({result});
+
+        Block arguments_block(arguments_copy);
+        auto * process_in = &process->in;
+
+        auto process_pool = executable_function->getProcessPool();
+        bool is_executable_pool_function = (process_pool != nullptr);
+
+        ShellCommandSourceConfiguration shell_command_source_configuration;
+
+        if (is_executable_pool_function)
+        {
+            shell_command_source_configuration.read_fixed_number_of_rows = true;
+            shell_command_source_configuration.number_of_rows_to_read = input_rows_count;
+        }
+
+        ShellCommandSource::SendDataTask task = {[process_in, arguments_block, &configuration, is_executable_pool_function, this]()
+        {
+            auto & out = *process_in;
+
+            if (configuration.send_chunk_header)
+            {
+                writeText(arguments_block.rows(), out);
+                writeChar('\n', out);
+            }
+
+            auto output_format = context->getOutputFormat(configuration.format, out, arguments_block.cloneEmpty());
+            formatBlock(output_format, arguments_block);
+            if (!is_executable_pool_function)
+                out.close();
+        }};
+        std::vector<ShellCommandSource::SendDataTask> tasks = {std::move(task)};
+
+        Pipe pipe(std::make_unique<ShellCommandSource>(
+            context,
+            configuration.format,
+            result_block.cloneEmpty(),
+            std::move(process),
+            std::move(tasks),
+            shell_command_source_configuration,
+            process_pool));
+
+        QueryPipeline pipeline(std::move(pipe));
+
+        PullingPipelineExecutor executor(pipeline);
+
+        auto result_column = result_type->createColumn();
+        result_column->reserve(input_rows_count);
+
+        Block block;
+        while (executor.pull(block))
+        {
+            const auto & result_column_to_add = *block.safeGetByPosition(0).column;
+            result_column->insertRangeFrom(result_column_to_add, 0, result_column_to_add.size());
+        }
+
+        size_t result_column_size = result_column->size();
+        if (result_column_size != input_rows_count)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Function {} wrong result rows count expected {} actual {}",
+                getName(),
+                input_rows_count,
+                result_column_size);
+
+        return result_column;
+    }
+
+private:
+
+    std::unique_ptr<ShellCommand> getProcess() const
+    {
+        auto process_pool = executable_function->getProcessPool();
+        auto executable_function_configuration = executable_function->getConfiguration();
+
+        std::unique_ptr<ShellCommand> process;
+        bool is_executable_pool_function = (process_pool != nullptr);
+        if (is_executable_pool_function)
+        {
+            bool result = process_pool->tryBorrowObject(process, [&]()
+            {
+                ShellCommand::Config process_config(executable_function_configuration.script_path);
+                process_config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, executable_function_configuration.command_termination_timeout };
+                auto shell_command = ShellCommand::execute(process_config);
+                return shell_command;
+            }, executable_function_configuration.max_command_execution_time * 1000);
+
+            if (!result)
+                throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
+                    "Could not get process from pool, max command execution timeout exceeded {} seconds",
+                    executable_function_configuration.max_command_execution_time);
+        }
+        else
+        {
+            process = ShellCommand::execute(executable_function_configuration.script_path);
+        }
+
+        return process;
+    }
+
+    ExternalUserDefinedExecutableFunctionsLoader::UserDefinedExecutableFunctionPtr executable_function;
+    ContextPtr context;
+};
+
+UserDefinedExecutableFunctionFactory & UserDefinedExecutableFunctionFactory::instance()
+{
+    static UserDefinedExecutableFunctionFactory result;
+    return result;
+}
+
+FunctionOverloadResolverPtr UserDefinedExecutableFunctionFactory::get(const String & function_name, ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto executable_function = std::static_pointer_cast<const UserDefinedExecutableFunction>(loader.load(function_name));
+    auto function = std::make_shared<UserDefinedFunction>(std::move(executable_function), std::move(context));
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::move(function));
+}
+
+FunctionOverloadResolverPtr UserDefinedExecutableFunctionFactory::tryGet(const String & function_name, ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto load_result = loader.getLoadResult(function_name);
+
+    if (load_result.object)
+    {
+        auto executable_function = std::static_pointer_cast<const UserDefinedExecutableFunction>(load_result.object);
+        auto function = std::make_shared<UserDefinedFunction>(std::move(executable_function), std::move(context));
+        return std::make_unique<FunctionToOverloadResolverAdaptor>(std::move(function));
+    }
+
+    return nullptr;
+}
+
+bool UserDefinedExecutableFunctionFactory::has(const String & function_name, ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto load_result = loader.getLoadResult(function_name);
+
+    bool result = load_result.object != nullptr;
+    return result;
+}
+
+std::vector<String> UserDefinedExecutableFunctionFactory::getRegisteredNames(ContextPtr context)
+{
+    const auto & loader = context->getExternalUserDefinedExecutableFunctionsLoader();
+    auto loaded_objects = loader.getLoadedObjects();
+
+    std::vector<std::string> registered_names;
+    registered_names.reserve(loaded_objects.size());
+
+    for (auto & loaded_object : loaded_objects)
+        registered_names.emplace_back(loaded_object->getLoadableName());
+
+    return registered_names;
+}
+
+}
diff --git a/src/Interpreters/UserDefinedExecutableFunctionFactory.h b/src/Interpreters/UserDefinedExecutableFunctionFactory.h
new file mode 100644
index 00000000000..989db4c481b
--- /dev/null
+++ b/src/Interpreters/UserDefinedExecutableFunctionFactory.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include <Common/NamePrompter.h>
+#include <Interpreters/Context_fwd.h>
+#include <Functions/IFunction.h>
+
+
+namespace DB
+{
+
+class UserDefinedExecutableFunctionFactory
+{
+public:
+    using Creator = std::function<FunctionOverloadResolverPtr(ContextPtr)>;
+
+    static UserDefinedExecutableFunctionFactory & instance();
+
+    static FunctionOverloadResolverPtr get(const String & function_name, ContextPtr context);
+
+    static FunctionOverloadResolverPtr tryGet(const String & function_name, ContextPtr context);
+
+    static bool has(const String & function_name, ContextPtr context);
+
+    static std::vector<String> getRegisteredNames(ContextPtr context);
+
+};
+
+}
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.cpp b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
new file mode 100644
index 00000000000..afe51de99a4
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.cpp
@@ -0,0 +1,163 @@
+#include "UserDefinedSQLFunctionFactory.h"
+
+#include <Common/quoteString.h>
+
+#include <Functions/FunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Interpreters/UserDefinedSQLObjectsLoader.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
+#include <Interpreters/Context.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int FUNCTION_ALREADY_EXISTS;
+    extern const int UNKNOWN_FUNCTION;
+    extern const int CANNOT_DROP_FUNCTION;
+}
+
+UserDefinedSQLFunctionFactory & UserDefinedSQLFunctionFactory::instance()
+{
+    static UserDefinedSQLFunctionFactory result;
+    return result;
+}
+
+void UserDefinedSQLFunctionFactory::registerFunction(ContextPtr context, const String & function_name, ASTPtr create_function_query, bool replace, bool if_not_exists, bool persist)
+{
+    if (FunctionFactory::instance().hasNameOrAlias(function_name))
+    {
+        if (if_not_exists)
+            return;
+
+        throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The function '{}' already exists", function_name);
+    }
+
+    if (AggregateFunctionFactory::instance().hasNameOrAlias(function_name))
+    {
+        if (if_not_exists)
+            return;
+
+        throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The aggregate function '{}' already exists", function_name);
+    }
+
+    if (UserDefinedExecutableFunctionFactory::instance().has(function_name, context))
+    {
+        if (if_not_exists)
+            return;
+
+        throw Exception(ErrorCodes::CANNOT_DROP_FUNCTION, "User defined executable function '{}'", function_name);
+    }
+
+    std::lock_guard lock(mutex);
+
+    auto [it, inserted] = function_name_to_create_query.emplace(function_name, create_function_query);
+
+    if (!inserted)
+    {
+        if (if_not_exists)
+            return;
+
+        if (replace)
+            it->second = create_function_query;
+        else
+            throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS,
+                "The function name '{}' is not unique",
+                function_name);
+    }
+
+    if (persist)
+    {
+        try
+        {
+            UserDefinedSQLObjectsLoader::instance().storeObject(context, UserDefinedSQLObjectType::Function, function_name, *create_function_query, replace);
+        }
+        catch (Exception & exception)
+        {
+            function_name_to_create_query.erase(it);
+            exception.addMessage(fmt::format("while storing user defined function {} on disk", backQuote(function_name)));
+            throw;
+        }
+    }
+}
+
+void UserDefinedSQLFunctionFactory::unregisterFunction(ContextPtr context, const String & function_name, bool if_exists)
+{
+    if (FunctionFactory::instance().hasNameOrAlias(function_name) ||
+        AggregateFunctionFactory::instance().hasNameOrAlias(function_name))
+        throw Exception(ErrorCodes::CANNOT_DROP_FUNCTION, "Cannot drop system function '{}'", function_name);
+
+    if (UserDefinedExecutableFunctionFactory::instance().has(function_name, context))
+        throw Exception(ErrorCodes::CANNOT_DROP_FUNCTION, "Cannot drop user defined executable function '{}'", function_name);
+
+    std::lock_guard lock(mutex);
+
+    auto it = function_name_to_create_query.find(function_name);
+    if (it == function_name_to_create_query.end())
+    {
+        if (if_exists)
+            return;
+
+        throw Exception(ErrorCodes::UNKNOWN_FUNCTION,
+            "The function name '{}' is not registered",
+            function_name);
+    }
+
+    try
+    {
+        UserDefinedSQLObjectsLoader::instance().removeObject(context, UserDefinedSQLObjectType::Function, function_name);
+    }
+    catch (Exception & exception)
+    {
+        exception.addMessage(fmt::format("while removing user defined function {} from disk", backQuote(function_name)));
+        throw;
+    }
+
+    function_name_to_create_query.erase(it);
+}
+
+ASTPtr UserDefinedSQLFunctionFactory::get(const String & function_name) const
+{
+    std::lock_guard lock(mutex);
+
+    auto it = function_name_to_create_query.find(function_name);
+    if (it == function_name_to_create_query.end())
+        throw Exception(ErrorCodes::UNKNOWN_FUNCTION,
+            "The function name '{}' is not registered",
+            function_name);
+
+    return it->second;
+}
+
+ASTPtr UserDefinedSQLFunctionFactory::tryGet(const std::string & function_name) const
+{
+    std::lock_guard lock(mutex);
+
+    auto it = function_name_to_create_query.find(function_name);
+    if (it == function_name_to_create_query.end())
+        return nullptr;
+
+    return it->second;
+}
+
+bool UserDefinedSQLFunctionFactory::has(const String & function_name) const
+{
+    return tryGet(function_name) != nullptr;
+}
+
+std::vector<std::string> UserDefinedSQLFunctionFactory::getAllRegisteredNames() const
+{
+    std::vector<std::string> registered_names;
+
+    std::lock_guard lock(mutex);
+    registered_names.reserve(function_name_to_create_query.size());
+
+    for (const auto & [name, _] : function_name_to_create_query)
+        registered_names.emplace_back(name);
+
+    return registered_names;
+}
+
+}
diff --git a/src/Interpreters/UserDefinedSQLFunctionFactory.h b/src/Interpreters/UserDefinedSQLFunctionFactory.h
new file mode 100644
index 00000000000..63bf5d73c15
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLFunctionFactory.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <unordered_map>
+#include <mutex>
+
+#include <Common/NamePrompter.h>
+
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Interpreters/Context_fwd.h>
+
+
+namespace DB
+{
+
+/// Factory for SQLUserDefinedFunctions
+class UserDefinedSQLFunctionFactory : public IHints<1, UserDefinedSQLFunctionFactory>
+{
+public:
+    static UserDefinedSQLFunctionFactory & instance();
+
+    /** Register function for function_name in factory for specified create_function_query.
+      * If function exists and if_not_exists = false and replace = false throws exception.
+      * If replace = true and sql user defined function with function_name already exists replace it with create_function_query.
+      * If persist = true persist function on disk.
+      */
+    void registerFunction(ContextPtr context, const String & function_name, ASTPtr create_function_query, bool replace, bool if_not_exists, bool persist);
+
+    /** Unregister function for function_name.
+      * If if_exists = true then do not throw exception if function is not registered.
+      * If if_exists = false then throw exception if function is not registered.
+      */
+    void unregisterFunction(ContextPtr context, const String & function_name, bool if_exists);
+
+    /// Get function create query for function_name. If no function registered with function_name throws exception.
+    ASTPtr get(const String & function_name) const;
+
+    /// Get function create query for function_name. If no function registered with function_name return nullptr.
+    ASTPtr tryGet(const String & function_name) const;
+
+    /// Check if function with function_name registered.
+    bool has(const String & function_name) const;
+
+    /// Get all user defined functions registered names.
+    std::vector<String> getAllRegisteredNames() const override;
+
+private:
+    std::unordered_map<String, ASTPtr> function_name_to_create_query;
+    mutable std::mutex mutex;
+};
+
+}
diff --git a/src/Interpreters/UserDefinedSQLFunctionVisitor.cpp b/src/Interpreters/UserDefinedSQLFunctionVisitor.cpp
new file mode 100644
index 00000000000..d9ac53097ab
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLFunctionVisitor.cpp
@@ -0,0 +1,115 @@
+#include "UserDefinedSQLFunctionVisitor.h"
+
+#include <unordered_map>
+#include <stack>
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+}
+
+void UserDefinedSQLFunctionMatcher::visit(ASTPtr & ast, Data & data)
+{
+    auto * function = ast->as<ASTFunction>();
+    if (!function)
+        return;
+
+    auto result = tryToReplaceFunction(*function);
+
+    if (result)
+    {
+        ast = result;
+        visit(ast, data);
+    }
+}
+
+bool UserDefinedSQLFunctionMatcher::needChildVisit(const ASTPtr &, const ASTPtr &)
+{
+    return true;
+}
+
+ASTPtr UserDefinedSQLFunctionMatcher::tryToReplaceFunction(const ASTFunction & function)
+{
+    auto user_defined_function = UserDefinedSQLFunctionFactory::instance().tryGet(function.name);
+    if (!user_defined_function)
+        return nullptr;
+
+    const auto & function_arguments_list = function.children.at(0)->as<ASTExpressionList>();
+    auto & function_arguments = function_arguments_list->children;
+
+    const auto & create_function_query = user_defined_function->as<ASTCreateFunctionQuery>();
+    auto & function_core_expression = create_function_query->function_core->children.at(0);
+
+    const auto & identifiers_expression_list = function_core_expression->children.at(0)->children.at(0)->as<ASTExpressionList>();
+    const auto & identifiers_raw = identifiers_expression_list->children;
+
+    if (function_arguments.size() != identifiers_raw.size())
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Function {} expects {} arguments actual arguments {}",
+            create_function_query->function_name,
+            identifiers_raw.size(),
+            function_arguments.size());
+
+    std::unordered_map<std::string, ASTPtr> identifier_name_to_function_argument;
+
+    for (size_t parameter_index = 0; parameter_index < identifiers_raw.size(); ++parameter_index)
+    {
+        const auto & identifier = identifiers_raw[parameter_index]->as<ASTIdentifier>();
+        const auto & function_argument = function_arguments[parameter_index];
+        const auto & identifier_name = identifier->name();
+
+        identifier_name_to_function_argument.emplace(identifier_name, function_argument);
+    }
+
+    auto function_body_to_update = function_core_expression->children.at(1)->clone();
+
+    std::stack<ASTPtr> ast_nodes_to_update;
+    ast_nodes_to_update.push(function_body_to_update);
+
+    while (!ast_nodes_to_update.empty())
+    {
+        auto ast_node_to_update = ast_nodes_to_update.top();
+        ast_nodes_to_update.pop();
+
+        for (auto & child : ast_node_to_update->children)
+        {
+            auto identifier_name_opt = tryGetIdentifierName(child);
+            if (identifier_name_opt)
+            {
+                auto function_argument_it = identifier_name_to_function_argument.find(*identifier_name_opt);
+
+                if (function_argument_it == identifier_name_to_function_argument.end())
+                    continue;
+
+                auto child_alias = child->tryGetAlias();
+                child = function_argument_it->second->clone();
+
+                if (!child_alias.empty())
+                    child->setAlias(child_alias);
+
+                continue;
+            }
+
+            ast_nodes_to_update.push(child);
+        }
+    }
+
+    auto function_alias = function.tryGetAlias();
+
+    if (!function_alias.empty())
+        function_body_to_update->setAlias(function_alias);
+
+    return function_body_to_update;
+}
+
+}
diff --git a/src/Interpreters/UserDefinedSQLFunctionVisitor.h b/src/Interpreters/UserDefinedSQLFunctionVisitor.h
new file mode 100644
index 00000000000..46f95f29ab9
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLFunctionVisitor.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <Interpreters/Aliases.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTFunction;
+
+/** Visits ASTFunction nodes and if it is used defined function replace it with function body.
+  * Example:
+  *
+  * CREATE FUNCTION test_function AS a -> a + 1;
+  *
+  * Before applying visitor:
+  * SELECT test_function(number) FROM system.numbers LIMIT 10;
+  *
+  * After applying visitor:
+  * SELECT number + 1 FROM system.numbers LIMIT 10;
+  */
+class UserDefinedSQLFunctionMatcher
+{
+public:
+    using Visitor = InDepthNodeVisitor<UserDefinedSQLFunctionMatcher, true>;
+
+    struct Data
+    {
+    };
+
+    static void visit(ASTPtr & ast, Data & data);
+    static bool needChildVisit(const ASTPtr & node, const ASTPtr & child);
+
+private:
+    static void visit(ASTFunction & func, const Data & data);
+
+    static ASTPtr tryToReplaceFunction(const ASTFunction & function);
+
+};
+
+/// Visits AST nodes and collect their aliases in one map (with links to source nodes).
+using UserDefinedSQLFunctionVisitor = UserDefinedSQLFunctionMatcher::Visitor;
+
+}
diff --git a/src/Interpreters/UserDefinedSQLObjectsLoader.cpp b/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
new file mode 100644
index 00000000000..a71f1f0799c
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLObjectsLoader.cpp
@@ -0,0 +1,179 @@
+#include "UserDefinedSQLObjectsLoader.h"
+
+#include <filesystem>
+
+#include <Common/escapeForFileName.h>
+#include <Common/quoteString.h>
+#include <Common/StringUtils/StringUtils.h>
+
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterCreateFunctionQuery.h>
+
+#include <Parsers/parseQuery.h>
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ParserCreateFunctionQuery.h>
+
+#include <Poco/DirectoryIterator.h>
+#include <Poco/Logger.h>
+#include <base/logger_useful.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int OBJECT_ALREADY_STORED_ON_DISK;
+    extern const int OBJECT_WAS_NOT_STORED_ON_DISK;
+}
+
+UserDefinedSQLObjectsLoader & UserDefinedSQLObjectsLoader::instance()
+{
+    static UserDefinedSQLObjectsLoader ret;
+    return ret;
+}
+
+UserDefinedSQLObjectsLoader::UserDefinedSQLObjectsLoader()
+    : log(&Poco::Logger::get("UserDefinedSQLObjectsLoader"))
+{}
+
+void UserDefinedSQLObjectsLoader::loadUserDefinedObject(ContextPtr context, UserDefinedSQLObjectType object_type, const std::string_view & name, const String & path)
+{
+    auto name_ref = StringRef(name.data(), name.size());
+    LOG_DEBUG(log, "Loading user defined object {} from file {}", backQuote(name_ref), path);
+
+    /// There is .sql file with user defined object creation statement.
+    ReadBufferFromFile in(path);
+
+    String object_create_query;
+    readStringUntilEOF(object_create_query, in);
+
+    try
+    {
+        switch (object_type)
+        {
+            case UserDefinedSQLObjectType::Function:
+            {
+                ParserCreateFunctionQuery parser;
+                ASTPtr ast = parseQuery(
+                    parser,
+                    object_create_query.data(),
+                    object_create_query.data() + object_create_query.size(),
+                    "in file " + path,
+                    0,
+                    context->getSettingsRef().max_parser_depth);
+
+                InterpreterCreateFunctionQuery interpreter(ast, context, false /*persist_function*/);
+                interpreter.execute();
+            }
+        }
+    }
+    catch (Exception & e)
+    {
+        e.addMessage(fmt::format("while loading user defined objects {} from path {}", backQuote(name_ref), path));
+        throw;
+    }
+}
+
+void UserDefinedSQLObjectsLoader::loadObjects(ContextPtr context)
+{
+    if (unlikely(!enable_persistence))
+        return;
+
+    LOG_DEBUG(log, "loading user defined objects");
+
+    String dir_path = context->getPath() + "user_defined/";
+    Poco::DirectoryIterator dir_end;
+    for (Poco::DirectoryIterator it(dir_path); it != dir_end; ++it)
+    {
+        if (it->isLink())
+            continue;
+
+        const auto & file_name = it.name();
+
+        /// For '.svn', '.gitignore' directory and similar.
+        if (file_name.at(0) == '.')
+            continue;
+
+        if (!it->isDirectory() && endsWith(file_name, ".sql"))
+        {
+            std::string_view object_name = file_name;
+            object_name.remove_suffix(strlen(".sql"));
+            object_name.remove_prefix(strlen("function_"));
+            loadUserDefinedObject(context, UserDefinedSQLObjectType::Function, object_name, dir_path + it.name());
+        }
+    }
+}
+
+void UserDefinedSQLObjectsLoader::storeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name, const IAST & ast, bool replace)
+{
+    if (unlikely(!enable_persistence))
+        return;
+
+    String dir_path = context->getPath() + "user_defined/";
+    String file_path;
+
+    switch (object_type)
+    {
+        case UserDefinedSQLObjectType::Function:
+        {
+            file_path = dir_path + "function_" + escapeForFileName(object_name) + ".sql";
+        }
+    }
+
+    if (!replace && std::filesystem::exists(file_path))
+        throw Exception(ErrorCodes::OBJECT_ALREADY_STORED_ON_DISK, "User defined object {} already stored on disk", backQuote(file_path));
+
+    LOG_DEBUG(log, "Storing object {} to file {}", backQuote(object_name), file_path);
+
+    WriteBufferFromOwnString create_statement_buf;
+    formatAST(ast, create_statement_buf, false);
+    writeChar('\n', create_statement_buf);
+    String create_statement = create_statement_buf.str();
+
+    WriteBufferFromFile out(file_path, create_statement.size());
+    writeString(create_statement, out);
+    out.next();
+    if (context->getSettingsRef().fsync_metadata)
+        out.sync();
+    out.close();
+
+    LOG_DEBUG(log, "Stored object {}", backQuote(object_name));
+}
+
+void UserDefinedSQLObjectsLoader::removeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name)
+{
+    if (unlikely(!enable_persistence))
+        return;
+
+    String dir_path = context->getPath() + "user_defined/";
+    LOG_DEBUG(log, "Removing file for user defined object {} from {}", backQuote(object_name), dir_path);
+
+    std::filesystem::path file_path;
+
+    switch (object_type)
+    {
+        case UserDefinedSQLObjectType::Function:
+        {
+            file_path = dir_path + "function_" + escapeForFileName(object_name) + ".sql";
+        }
+    }
+
+    if (!std::filesystem::exists(file_path))
+        throw Exception(ErrorCodes::OBJECT_WAS_NOT_STORED_ON_DISK, "User defined object {} was not stored on disk", backQuote(file_path.string()));
+
+    std::filesystem::remove(file_path);
+}
+
+void UserDefinedSQLObjectsLoader::enable(bool enable_persistence_)
+{
+    enable_persistence = enable_persistence_;
+}
+
+}
diff --git a/src/Interpreters/UserDefinedSQLObjectsLoader.h b/src/Interpreters/UserDefinedSQLObjectsLoader.h
new file mode 100644
index 00000000000..2e747f67a8d
--- /dev/null
+++ b/src/Interpreters/UserDefinedSQLObjectsLoader.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Interpreters/Context_fwd.h>
+#include <Parsers/IAST.h>
+
+#include <boost/noncopyable.hpp>
+
+
+namespace DB
+{
+
+enum class UserDefinedSQLObjectType
+{
+    Function
+};
+
+class UserDefinedSQLObjectsLoader : private boost::noncopyable
+{
+public:
+    static UserDefinedSQLObjectsLoader & instance();
+    UserDefinedSQLObjectsLoader();
+
+    void loadObjects(ContextPtr context);
+    void storeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name, const IAST & ast, bool replace);
+    void removeObject(ContextPtr context, UserDefinedSQLObjectType object_type, const String & object_name);
+
+    /// For ClickHouse local if path is not set we can disable loader.
+    void enable(bool enable_persistence);
+
+private:
+
+    void loadUserDefinedObject(ContextPtr context, UserDefinedSQLObjectType object_type, const std::string_view & object_name, const String & file_path);
+    Poco::Logger * log;
+    bool enable_persistence = true;
+};
+
+}
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index 32129072972..4661a148d70 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -51,7 +51,7 @@ std::string WindowFrame::toString() const
 
 void WindowFrame::toString(WriteBuffer & buf) const
 {
-    buf << toString(type) << " BETWEEN ";
+    buf << type << " BETWEEN ";
     if (begin_type == BoundaryType::Current)
     {
         buf << "CURRENT ROW";
@@ -101,9 +101,9 @@ void WindowFrame::checkValid() const
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Frame start offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
-                toString(type),
+                type,
                 applyVisitor(FieldVisitorToString(), begin_offset),
-                Field::Types::toString(begin_offset.getType()));
+                begin_offset.getType());
         }
 
         if (end_type == BoundaryType::Offset
@@ -114,9 +114,9 @@ void WindowFrame::checkValid() const
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Frame end offset for '{}' frame must be a nonnegative 32-bit integer, '{}' of type '{}' given",
-                toString(type),
+                type,
                 applyVisitor(FieldVisitorToString(), end_offset),
-                Field::Types::toString(end_offset.getType()));
+                end_offset.getType());
         }
     }
 
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index 4cb478bae85..bb0130b4d4e 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -73,40 +73,6 @@ struct WindowFrame
             && other.end_preceding == end_preceding
             ;
     }
-
-    static std::string toString(FrameType type)
-    {
-        switch (type)
-        {
-            case FrameType::Rows:
-                return "ROWS";
-            case FrameType::Groups:
-                return "GROUPS";
-            case FrameType::Range:
-                return "RANGE";
-        }
-
-        // Somehow GCC 10 doesn't understand that the above switch is exhaustive.
-        assert(false);
-        return "<unknown frame>";
-    }
-
-    static std::string toString(BoundaryType type)
-    {
-        switch (type)
-        {
-            case BoundaryType::Unbounded:
-                return "UNBOUNDED";
-            case BoundaryType::Offset:
-                return "OFFSET";
-            case BoundaryType::Current:
-                return "CURRENT ROW";
-        }
-
-        // Somehow GCC 10 doesn't understand that the above switch is exhaustive.
-        assert(false);
-        return "<unknown frame boundary>";
-    }
 };
 
 struct WindowDescription
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index bc187876d24..fdcbe430834 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -19,6 +19,41 @@
 namespace DB
 {
 
+
+DataTypePtr getCoordinationErrorCodesEnumType()
+{
+    return std::make_shared<DataTypeEnum8>(
+        DataTypeEnum8::Values
+            {
+                {"ZOK",                         static_cast<Int8>(Coordination::Error::ZOK)},
+
+                {"ZSYSTEMERROR",                static_cast<Int8>(Coordination::Error::ZSYSTEMERROR)},
+                {"ZRUNTIMEINCONSISTENCY",       static_cast<Int8>(Coordination::Error::ZRUNTIMEINCONSISTENCY)},
+                {"ZDATAINCONSISTENCY",          static_cast<Int8>(Coordination::Error::ZDATAINCONSISTENCY)},
+                {"ZCONNECTIONLOSS",             static_cast<Int8>(Coordination::Error::ZCONNECTIONLOSS)},
+                {"ZMARSHALLINGERROR",           static_cast<Int8>(Coordination::Error::ZMARSHALLINGERROR)},
+                {"ZUNIMPLEMENTED",              static_cast<Int8>(Coordination::Error::ZUNIMPLEMENTED)},
+                {"ZOPERATIONTIMEOUT",           static_cast<Int8>(Coordination::Error::ZOPERATIONTIMEOUT)},
+                {"ZBADARGUMENTS",               static_cast<Int8>(Coordination::Error::ZBADARGUMENTS)},
+                {"ZINVALIDSTATE",               static_cast<Int8>(Coordination::Error::ZINVALIDSTATE)},
+
+                {"ZAPIERROR",                   static_cast<Int8>(Coordination::Error::ZAPIERROR)},
+                {"ZNONODE",                     static_cast<Int8>(Coordination::Error::ZNONODE)},
+                {"ZNOAUTH",                     static_cast<Int8>(Coordination::Error::ZNOAUTH)},
+                {"ZBADVERSION",                 static_cast<Int8>(Coordination::Error::ZBADVERSION)},
+                {"ZNOCHILDRENFOREPHEMERALS",    static_cast<Int8>(Coordination::Error::ZNOCHILDRENFOREPHEMERALS)},
+                {"ZNODEEXISTS",                 static_cast<Int8>(Coordination::Error::ZNODEEXISTS)},
+                {"ZNOTEMPTY",                   static_cast<Int8>(Coordination::Error::ZNOTEMPTY)},
+                {"ZSESSIONEXPIRED",             static_cast<Int8>(Coordination::Error::ZSESSIONEXPIRED)},
+                {"ZINVALIDCALLBACK",            static_cast<Int8>(Coordination::Error::ZINVALIDCALLBACK)},
+                {"ZINVALIDACL",                 static_cast<Int8>(Coordination::Error::ZINVALIDACL)},
+                {"ZAUTHFAILED",                 static_cast<Int8>(Coordination::Error::ZAUTHFAILED)},
+                {"ZCLOSING",                    static_cast<Int8>(Coordination::Error::ZCLOSING)},
+                {"ZNOTHING",                    static_cast<Int8>(Coordination::Error::ZNOTHING)},
+                {"ZSESSIONMOVED",               static_cast<Int8>(Coordination::Error::ZSESSIONMOVED)},
+            });
+}
+
 NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
 {
     auto type_enum = std::make_shared<DataTypeEnum8>(
@@ -52,36 +87,7 @@ NamesAndTypesList ZooKeeperLogElement::getNamesAndTypes()
                 {"SessionID",           static_cast<Int16>(Coordination::OpNum::SessionID)},
             });
 
-    auto error_enum = std::make_shared<DataTypeEnum8>(
-        DataTypeEnum8::Values
-            {
-                {"ZOK",                         static_cast<Int8>(Coordination::Error::ZOK)},
-
-                {"ZSYSTEMERROR",                static_cast<Int8>(Coordination::Error::ZSYSTEMERROR)},
-                {"ZRUNTIMEINCONSISTENCY",       static_cast<Int8>(Coordination::Error::ZRUNTIMEINCONSISTENCY)},
-                {"ZDATAINCONSISTENCY",          static_cast<Int8>(Coordination::Error::ZDATAINCONSISTENCY)},
-                {"ZCONNECTIONLOSS",             static_cast<Int8>(Coordination::Error::ZCONNECTIONLOSS)},
-                {"ZMARSHALLINGERROR",           static_cast<Int8>(Coordination::Error::ZMARSHALLINGERROR)},
-                {"ZUNIMPLEMENTED",              static_cast<Int8>(Coordination::Error::ZUNIMPLEMENTED)},
-                {"ZOPERATIONTIMEOUT",           static_cast<Int8>(Coordination::Error::ZOPERATIONTIMEOUT)},
-                {"ZBADARGUMENTS",               static_cast<Int8>(Coordination::Error::ZBADARGUMENTS)},
-                {"ZINVALIDSTATE",               static_cast<Int8>(Coordination::Error::ZINVALIDSTATE)},
-
-                {"ZAPIERROR",                   static_cast<Int8>(Coordination::Error::ZAPIERROR)},
-                {"ZNONODE",                     static_cast<Int8>(Coordination::Error::ZNONODE)},
-                {"ZNOAUTH",                     static_cast<Int8>(Coordination::Error::ZNOAUTH)},
-                {"ZBADVERSION",                 static_cast<Int8>(Coordination::Error::ZBADVERSION)},
-                {"ZNOCHILDRENFOREPHEMERALS",    static_cast<Int8>(Coordination::Error::ZNOCHILDRENFOREPHEMERALS)},
-                {"ZNODEEXISTS",                 static_cast<Int8>(Coordination::Error::ZNODEEXISTS)},
-                {"ZNOTEMPTY",                   static_cast<Int8>(Coordination::Error::ZNOTEMPTY)},
-                {"ZSESSIONEXPIRED",             static_cast<Int8>(Coordination::Error::ZSESSIONEXPIRED)},
-                {"ZINVALIDCALLBACK",            static_cast<Int8>(Coordination::Error::ZINVALIDCALLBACK)},
-                {"ZINVALIDACL",                 static_cast<Int8>(Coordination::Error::ZINVALIDACL)},
-                {"ZAUTHFAILED",                 static_cast<Int8>(Coordination::Error::ZAUTHFAILED)},
-                {"ZCLOSING",                    static_cast<Int8>(Coordination::Error::ZCLOSING)},
-                {"ZNOTHING",                    static_cast<Int8>(Coordination::Error::ZNOTHING)},
-                {"ZSESSIONMOVED",               static_cast<Int8>(Coordination::Error::ZSESSIONMOVED)},
-            });
+    auto error_enum = getCoordinationErrorCodesEnumType();
 
     auto watch_type_enum = std::make_shared<DataTypeEnum8>(
         DataTypeEnum8::Values
@@ -158,7 +164,7 @@ void ZooKeeperLogElement::appendToBlock(MutableColumns & columns) const
     auto event_time_seconds = event_time / 1000000;
     columns[i++]->insert(DateLUT::instance().toDayNum(event_time_seconds).toUnderType());
     columns[i++]->insert(event_time);
-    columns[i++]->insert(IPv6ToBinary(address.host()).data());
+    columns[i++]->insertData(IPv6ToBinary(address.host()).data(), 16);
     columns[i++]->insert(address.port());
     columns[i++]->insert(session_id);
 
diff --git a/src/Interpreters/ZooKeeperLog.h b/src/Interpreters/ZooKeeperLog.h
index d3ef68625af..d721081fdae 100644
--- a/src/Interpreters/ZooKeeperLog.h
+++ b/src/Interpreters/ZooKeeperLog.h
@@ -73,4 +73,6 @@ class ZooKeeperLog : public SystemLog<ZooKeeperLogElement>
     using SystemLog<ZooKeeperLogElement>::SystemLog;
 };
 
+DataTypePtr getCoordinationErrorCodesEnumType();
+
 }
diff --git a/src/Interpreters/addTypeConversionToAST.cpp b/src/Interpreters/addTypeConversionToAST.cpp
index ba67ec762a9..2f766880253 100644
--- a/src/Interpreters/addTypeConversionToAST.cpp
+++ b/src/Interpreters/addTypeConversionToAST.cpp
@@ -20,7 +20,7 @@ namespace ErrorCodes
 
 ASTPtr addTypeConversionToAST(ASTPtr && ast, const String & type_name)
 {
-    auto func = makeASTFunction("CAST", ast, std::make_shared<ASTLiteral>(type_name));
+    auto func = makeASTFunction("_CAST", ast, std::make_shared<ASTLiteral>(type_name));
 
     if (ASTWithAlias * ast_with_alias = dynamic_cast<ASTWithAlias *>(ast.get()))
     {
diff --git a/src/Interpreters/addTypeConversionToAST.h b/src/Interpreters/addTypeConversionToAST.h
index eb391b2c749..36167a6b0c3 100644
--- a/src/Interpreters/addTypeConversionToAST.h
+++ b/src/Interpreters/addTypeConversionToAST.h
@@ -2,7 +2,7 @@
 
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Interpreters/castColumn.cpp b/src/Interpreters/castColumn.cpp
index 181cca1e017..dc9882b84b0 100644
--- a/src/Interpreters/castColumn.cpp
+++ b/src/Interpreters/castColumn.cpp
@@ -1,6 +1,7 @@
 #include <Interpreters/castColumn.h>
 
 #include <Functions/FunctionsConversion.h>
+#include <Functions/CastOverloadResolver.h>
 
 namespace DB
 {
@@ -8,7 +9,7 @@ namespace DB
 template <CastType cast_type = CastType::nonAccurate>
 static ColumnPtr castColumn(const ColumnWithTypeAndName & arg, const DataTypePtr & type)
 {
-    if (arg.type->equals(*type))
+    if (arg.type->equals(*type) && cast_type != CastType::accurateOrNull)
         return arg.column;
 
     ColumnsWithTypeAndName arguments
@@ -21,7 +22,7 @@ static ColumnPtr castColumn(const ColumnWithTypeAndName & arg, const DataTypePtr
         }
     };
 
-    FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<cast_type>::createImpl(false);
+    FunctionOverloadResolverPtr func_builder_cast = CastInternalOverloadResolver<cast_type>::createImpl();
 
     auto func_cast = func_builder_cast->build(arguments);
 
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index be0a10cf2e7..a91cb1fbeb2 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -22,7 +22,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/NaNUtils.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
 
@@ -75,8 +75,8 @@ static Field convertNumericType(const Field & from, const IDataType & type)
     if (from.getType() == Field::Types::Int256)
         return convertNumericTypeImpl<Int256, To>(from);
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(from.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), from.getType());
 }
 
 
@@ -134,8 +134,8 @@ static Field convertDecimalType(const Field & from, const To & type)
     if (from.getType() == Field::Types::Decimal128)
         return convertDecimalToDecimalType<Decimal128>(from, type);
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(from.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), from.getType());
 }
 
 
@@ -203,6 +203,12 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             return src;
         }
 
+        if (which_type.isDate32() && src.getType() == Field::Types::Int64)
+        {
+            /// We don't need any conversion Int64 is under type of Date32
+            return src;
+        }
+
         if (which_type.isDateTime64() && src.getType() == Field::Types::Decimal64)
         {
             /// Already in needed type.
@@ -210,7 +216,7 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         }
 
         if (which_type.isDateTime64()
-            && (which_from_type.isNativeInt() || which_from_type.isNativeUInt() || which_from_type.isDate() || which_from_type.isDateTime() || which_from_type.isDateTime64()))
+            && (which_from_type.isNativeInt() || which_from_type.isNativeUInt() || which_from_type.isDate() || which_from_type.isDate32() || which_from_type.isDateTime() || which_from_type.isDateTime64()))
         {
             const auto scale = static_cast<const DataTypeDateTime64 &>(type).getScale();
             const auto decimal_value = DecimalUtils::decimalFromComponents<DateTime64>(src.reinterpret<Int64>(), 0, scale);
@@ -346,8 +352,9 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
     else if (const DataTypeAggregateFunction * agg_func_type = typeid_cast<const DataTypeAggregateFunction *>(&type))
     {
         if (src.getType() != Field::Types::AggregateFunctionState)
-            throw Exception(String("Cannot convert ") + src.getTypeName() + " to " + agg_func_type->getName(),
-                    ErrorCodes::TYPE_MISMATCH);
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "Cannot convert {} to {}",
+                src.getTypeName(), agg_func_type->getName());
 
         const auto & name = src.get<AggregateFunctionStateData>().name;
         if (agg_func_type->getName() != name)
@@ -387,8 +394,8 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
         return convertFieldToType(parsed, type, from_type_hint);
     }
 
-    throw Exception("Type mismatch in IN or VALUES section. Expected: " + type.getName() + ". Got: "
-        + Field::Types::toString(src.getType()), ErrorCodes::TYPE_MISMATCH);
+    throw Exception(ErrorCodes::TYPE_MISMATCH, "Type mismatch in IN or VALUES section. Expected: {}. Got: {}",
+        type.getName(), src.getType());
 }
 
 }
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index f814e1d8c02..ae304906476 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -18,6 +18,7 @@
 #include <Interpreters/FunctionNameNormalizer.h>
 #include <Interpreters/ReplaceQueryParameterVisitor.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <unordered_map>
 
 namespace DB
 {
@@ -39,7 +40,7 @@ std::pair<Field, std::shared_ptr<const IDataType>> evaluateConstantExpression(co
     if (context->getSettingsRef().normalize_function_names)
         FunctionNameNormalizer().visit(ast.get());
 
-    String name = ast->getColumnName(context->getSettingsRef());
+    String name = ast->getColumnName();
     auto syntax_result = TreeRewriter(context).analyze(ast, source_columns);
     ExpressionActionsPtr expr_for_constant_folding = ExpressionAnalyzer(ast, syntax_result, context).getConstActions();
 
@@ -103,23 +104,6 @@ ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, ContextPtr
     return res;
 }
 
-std::tuple<bool, ASTPtr> evaluateDatabaseNameForMergeEngine(const ASTPtr & node, ContextPtr context)
-{
-    if (const auto * func = node->as<ASTFunction>(); func && func->name == "REGEXP")
-    {
-        if (func->arguments->children.size() != 1)
-            throw Exception("Arguments for REGEXP in Merge ENGINE should be 1", ErrorCodes::BAD_ARGUMENTS);
-
-        auto * literal = func->arguments->children[0]->as<ASTLiteral>();
-        if (!literal || literal->value.safeGet<String>().empty())
-            throw Exception("Argument for REGEXP in Merge ENGINE should be a non empty String Literal", ErrorCodes::BAD_ARGUMENTS);
-
-        return std::tuple{true, func->arguments->children[0]};
-    }
-
-    auto ast = evaluateConstantExpressionForDatabaseName(node, context);
-    return std::tuple{false, ast};
-}
 
 namespace
 {
@@ -213,7 +197,7 @@ namespace
 
             Disjunction result;
 
-            auto add_dnf = [&](const auto &dnf)
+            auto add_dnf = [&](const auto & dnf)
             {
                 if (dnf.size() > limit)
                 {
@@ -338,6 +322,7 @@ std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & nod
 
     if (const auto * fn = node->as<ASTFunction>())
     {
+        std::unordered_map<std::string, bool> always_false_map;
         const auto dnf = analyzeFunction(fn, target_expr, limit);
 
         if (dnf.empty() || !limit)
@@ -368,7 +353,41 @@ std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & nod
 
         for (const auto & conjunct : dnf)
         {
-            Block block(conjunct);
+            Block block;
+
+            for (const auto & elem : conjunct)
+            {
+                if (!block.has(elem.name))
+                {
+                    block.insert(elem);
+                }
+                else
+                {
+                    /// Conjunction of condition on column equality to distinct values can never be satisfied.
+
+                    const ColumnWithTypeAndName & prev = block.getByName(elem.name);
+
+                    if (isColumnConst(*prev.column) && isColumnConst(*elem.column))
+                    {
+                        Field prev_value = assert_cast<const ColumnConst &>(*prev.column).getField();
+                        Field curr_value = assert_cast<const ColumnConst &>(*elem.column).getField();
+
+                        if (!always_false_map.count(elem.name))
+                        {
+                            always_false_map[elem.name] = prev_value != curr_value;
+                        }
+                        else
+                        {
+                            auto & always_false = always_false_map[elem.name];
+                            /// If at least one of conjunct is not always false, we should preserve this.
+                            if (always_false)
+                            {
+                                always_false = prev_value != curr_value;
+                            }
+                        }
+                    }
+                }
+            }
 
             // Block should contain all required columns from `target_expr`
             if (!has_required_columns(block))
@@ -393,6 +412,11 @@ std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & nod
                 return {};
             }
         }
+
+        bool any_always_false = std::any_of(always_false_map.begin(), always_false_map.end(), [](const auto & v) { return v.second; });
+        if (any_always_false)
+            return Blocks{};
+
     }
     else if (const auto * literal = node->as<ASTLiteral>())
     {
diff --git a/src/Interpreters/evaluateConstantExpression.h b/src/Interpreters/evaluateConstantExpression.h
index 3b817080fe0..b95982f5b99 100644
--- a/src/Interpreters/evaluateConstantExpression.h
+++ b/src/Interpreters/evaluateConstantExpression.h
@@ -53,6 +53,4 @@ ASTPtr evaluateConstantExpressionForDatabaseName(const ASTPtr & node, ContextPtr
   */
 std::optional<Blocks> evaluateExpressionOverConstantCondition(const ASTPtr & node, const ExpressionActionsPtr & target_expr, size_t & limit);
 
-// Evaluate database name or regexp for StorageMerge and TableFunction merge
-std::tuple<bool, ASTPtr> evaluateDatabaseNameForMergeEngine(const ASTPtr & node, ContextPtr context);
 }
diff --git a/src/Interpreters/examples/hash_map.cpp b/src/Interpreters/examples/hash_map.cpp
index b678f334f84..fe2cbda019d 100644
--- a/src/Interpreters/examples/hash_map.cpp
+++ b/src/Interpreters/examples/hash_map.cpp
@@ -11,7 +11,7 @@
 /*
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 */
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/HashMap.h>
diff --git a/src/Interpreters/examples/hash_map3.cpp b/src/Interpreters/examples/hash_map3.cpp
index 132e6fe9e87..a8673e06e9b 100644
--- a/src/Interpreters/examples/hash_map3.cpp
+++ b/src/Interpreters/examples/hash_map3.cpp
@@ -10,12 +10,12 @@
 
 #include <utility>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 #include <IO/ReadHelpers.h>
 
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 #include <Common/HashTable/HashMap.h>
 
diff --git a/src/Interpreters/examples/hash_map_lookup.cpp b/src/Interpreters/examples/hash_map_lookup.cpp
index 39c43023b20..fd6b231cf73 100644
--- a/src/Interpreters/examples/hash_map_lookup.cpp
+++ b/src/Interpreters/examples/hash_map_lookup.cpp
@@ -8,7 +8,7 @@
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
 #include <Compression/CompressedReadBuffer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/AggregationCommon.h>
diff --git a/src/Interpreters/examples/hash_map_string.cpp b/src/Interpreters/examples/hash_map_string.cpp
index c51d1a6db01..54915ee7c10 100644
--- a/src/Interpreters/examples/hash_map_string.cpp
+++ b/src/Interpreters/examples/hash_map_string.cpp
@@ -12,11 +12,11 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/hash_map_string_2.cpp b/src/Interpreters/examples/hash_map_string_2.cpp
index a75978c9e13..67a1b5c5e75 100644
--- a/src/Interpreters/examples/hash_map_string_2.cpp
+++ b/src/Interpreters/examples/hash_map_string_2.cpp
@@ -7,11 +7,11 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
@@ -659,9 +659,10 @@ int main(int argc, char ** argv)
     if (!m || m == 100) bench<StringRef_CompareAlwaysTrue>          (data, "StringRef_CompareAlwaysTrue");
     if (!m || m == 101) bench<StringRef_CompareAlmostAlwaysTrue>    (data, "StringRef_CompareAlmostAlwaysTrue");
 
+    if (!m || m == 111) bench<StringRef>                            (data, "StringRef");
+
     /// 10 > 8, 9
     /// 1, 2, 5 - bad
 
-
     return 0;
 }
diff --git a/src/Interpreters/examples/hash_map_string_3.cpp b/src/Interpreters/examples/hash_map_string_3.cpp
index d0bf9093374..447be2dc51b 100644
--- a/src/Interpreters/examples/hash_map_string_3.cpp
+++ b/src/Interpreters/examples/hash_map_string_3.cpp
@@ -10,11 +10,11 @@
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/hash_map_string_small.cpp b/src/Interpreters/examples/hash_map_string_small.cpp
index fe81c120d90..4a96f717bf7 100644
--- a/src/Interpreters/examples/hash_map_string_small.cpp
+++ b/src/Interpreters/examples/hash_map_string_small.cpp
@@ -12,11 +12,11 @@
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
diff --git a/src/Interpreters/examples/jit_example.cpp b/src/Interpreters/examples/jit_example.cpp
index 3fa2a901eac..d4613b7fad7 100644
--- a/src/Interpreters/examples/jit_example.cpp
+++ b/src/Interpreters/examples/jit_example.cpp
@@ -1,8 +1,6 @@
 #include <iostream>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_EMBEDDED_COMPILER
 
diff --git a/src/Interpreters/examples/string_hash_map.cpp b/src/Interpreters/examples/string_hash_map.cpp
index 3420918887c..15df8c399de 100644
--- a/src/Interpreters/examples/string_hash_map.cpp
+++ b/src/Interpreters/examples/string_hash_map.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/AggregationCommon.h>
@@ -10,7 +10,7 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/HashTable/StringHashMap.h>
 #include <Common/Stopwatch.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 /**
 
diff --git a/src/Interpreters/examples/string_hash_set.cpp b/src/Interpreters/examples/string_hash_set.cpp
index d9d6453da34..355789e97ec 100644
--- a/src/Interpreters/examples/string_hash_set.cpp
+++ b/src/Interpreters/examples/string_hash_set.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <Compression/CompressedReadBuffer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/AggregationCommon.h>
@@ -10,7 +10,7 @@
 #include <Common/HashTable/HashTableKeyHolder.h>
 #include <Common/HashTable/StringHashSet.h>
 #include <Common/Stopwatch.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 /// NOTE: see string_hash_map.cpp for usage example
 
diff --git a/src/Interpreters/examples/two_level_hash_map.cpp b/src/Interpreters/examples/two_level_hash_map.cpp
index 33fd5ee8305..530c5b8263a 100644
--- a/src/Interpreters/examples/two_level_hash_map.cpp
+++ b/src/Interpreters/examples/two_level_hash_map.cpp
@@ -12,7 +12,7 @@
 #include <Common/Stopwatch.h>
 #include <AggregateFunctions/UniquesHashSet.h>
 
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Common/HashTable/TwoLevelHashTable.h>
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 180a4f9af3e..c3b8cc5c677 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -15,6 +15,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Processors/Sinks/EmptySink.h>
+#include <QueryPipeline/Pipe.h>
 #include <filesystem>
 
 
@@ -151,7 +152,7 @@ BlockIO executeDDLQueryOnCluster(const ASTPtr & query_ptr_, ContextPtr context,
         }
     }
 
-    AddDefaultDatabaseVisitor visitor(current_database, !use_local_default_database);
+    AddDefaultDatabaseVisitor visitor(context, current_database, !use_local_default_database);
     visitor.visitDDL(query_ptr);
 
     /// Check access rights, assume that all servers have the same users config
@@ -212,11 +213,11 @@ BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & en
     if (context->getSettingsRef().distributed_ddl_task_timeout == 0)
         return io;
 
-    ProcessorPtr processor = std::make_shared<DDLQueryStatusSource>(node_path, entry, context, hosts_to_wait);
-    io.pipeline.init(Pipe{processor});
+    auto source = std::make_shared<DDLQueryStatusSource>(node_path, entry, context, hosts_to_wait);
+    io.pipeline = QueryPipeline(std::move(source));
 
     if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
-        io.pipeline.setSinks([](const Block & header, QueryPipeline::StreamType){ return std::make_shared<EmptySink>(header); });
+        io.pipeline.complete(std::make_shared<EmptySink>(io.pipeline.getHeader()));
 
     return io;
 }
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index f430c2364b2..e7ec52d03cb 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -1,10 +1,9 @@
 #pragma once
 
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
-#include <DataStreams/IBlockInputStream.h>
 
 
 namespace zkutil
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index a6e50f54a9e..f401f708ab1 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -3,16 +3,15 @@
 #include <Common/typeid_cast.h>
 #include <Common/ThreadProfileEvents.h>
 
+#include <Interpreters/AsynchronousInsertQueue.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromVector.h>
 #include <IO/LimitReadBuffer.h>
 #include <IO/copyData.h>
 
-#include <DataStreams/BlockIO.h>
-#include <DataStreams/copyData.h>
-#include <DataStreams/IBlockInputStream.h>
-#include <Processors/Transforms/getSourceFromFromASTInsertQuery.h>
-#include <DataStreams/CountingBlockOutputStream.h>
+#include <QueryPipeline/BlockIO.h>
+#include <Processors/Transforms/CountingTransform.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
 
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTInsertQuery.h>
@@ -46,14 +45,19 @@
 #include <Interpreters/ReplaceQueryParameterVisitor.h>
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/executeQuery.h>
+#include <Interpreters/SelectIntersectExceptQueryVisitor.h>
 #include <Common/ProfileEvents.h>
 
 #include <Common/SensitiveDataMasker.h>
+#include <IO/CompressionMethod.h>
 
 #include <Processors/Transforms/LimitsCheckingTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
-#include <Processors/Sources/SinkToOutputStream.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Sources/WaitForAsyncInsertSource.h>
+
+#include <random>
 
 
 namespace ProfileEvents
@@ -74,6 +78,8 @@ namespace ErrorCodes
 {
     extern const int INTO_OUTFILE_NOT_ALLOWED;
     extern const int QUERY_WAS_CANCELLED;
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -264,7 +270,11 @@ static void onExceptionBeforeStart(const String & query_for_logging, ContextPtr
 
     // Try log query_kind if ast is valid
     if (ast)
+    {
         elem.query_kind = ast->getQueryKindString();
+        if (settings.log_formatted_queries)
+            elem.formatted_query = queryToString(ast);
+    }
 
     // We don't calculate databases, tables and columns when the query isn't able to start
 
@@ -337,20 +347,35 @@ static void onExceptionBeforeStart(const String & query_for_logging, ContextPtr
 
 static void setQuerySpecificSettings(ASTPtr & ast, ContextMutablePtr context)
 {
-    if (auto * ast_insert_into = dynamic_cast<ASTInsertQuery *>(ast.get()))
+    if (auto * ast_insert_into = ast->as<ASTInsertQuery>())
     {
         if (ast_insert_into->watch)
             context->setSetting("output_format_enable_streaming", 1);
     }
 }
 
+static void applySettingsFromSelectWithUnion(const ASTSelectWithUnionQuery & select_with_union, ContextMutablePtr context)
+{
+    const ASTs & children = select_with_union.list_of_selects->children;
+    if (children.empty())
+        return;
+
+    // We might have an arbitrarily complex UNION tree, so just give
+    // up if the last first-order child is not a plain SELECT.
+    // It is flattened later, when we process UNION ALL/DISTINCT.
+    const auto * last_select = children.back()->as<ASTSelectQuery>();
+    if (last_select && last_select->settings())
+    {
+        InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
+    }
+}
+
 static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     const char * begin,
     const char * end,
     ContextMutablePtr context,
     bool internal,
     QueryProcessingStage::Enum stage,
-    bool has_query_tail,
     ReadBuffer * istr)
 {
     const auto current_time = std::chrono::system_clock::now();
@@ -368,10 +393,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         client_info.initial_query_start_time_microseconds = time_in_microseconds(current_time);
     }
 
-#if !defined(ARCADIA_BUILD)
     assert(internal || CurrentThread::get().getQueryContext());
     assert(internal || CurrentThread::get().getQueryContext()->getCurrentQueryId() == CurrentThread::getQueryId());
-#endif
 
     const Settings & settings = context->getSettingsRef();
 
@@ -400,17 +423,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
         else if (const auto * select_with_union_query = ast->as<ASTSelectWithUnionQuery>())
         {
-            if (!select_with_union_query->list_of_selects->children.empty())
-            {
-                // We might have an arbitrarily complex UNION tree, so just give
-                // up if the last first-order child is not a plain SELECT.
-                // It is flattened later, when we process UNION ALL/DISTINCT.
-                const auto * last_select = select_with_union_query->list_of_selects->children.back()->as<ASTSelectQuery>();
-                if (last_select && last_select->settings())
-                {
-                    InterpreterSetQuery(last_select->settings(), context).executeForCurrentContext();
-                }
-            }
+            applySettingsFromSelectWithUnion(*select_with_union_query, context);
         }
         else if (const auto * query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
         {
@@ -424,15 +437,27 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             query_table = query_with_table_output->table;
         }
 
+        if (auto * create_query = ast->as<ASTCreateQuery>())
+        {
+            if (create_query->select)
+            {
+                applySettingsFromSelectWithUnion(create_query->select->as<ASTSelectWithUnionQuery &>(), context);
+            }
+        }
+
         auto * insert_query = ast->as<ASTInsertQuery>();
 
         if (insert_query && insert_query->settings_ast)
             InterpreterSetQuery(insert_query->settings_ast, context).executeForCurrentContext();
 
-        if (insert_query && insert_query->data)
+        if (insert_query)
         {
-            query_end = insert_query->data;
-            insert_query->has_tail = has_query_tail;
+            if (insert_query->data)
+                query_end = insert_query->data;
+            else
+                query_end = end;
+
+            insert_query->tail = istr;
         }
         else
         {
@@ -457,6 +482,18 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
     setQuerySpecificSettings(ast, context);
 
+    /// There is an option of probabilistic logging of queries.
+    /// If it is used - do the random sampling and "collapse" the settings.
+    /// It allows to consistently log queries with all the subqueries in distributed query processing
+    /// (subqueries on remote nodes will receive these "collapsed" settings)
+    if (!internal && settings.log_queries && settings.log_queries_probability < 1.0)
+    {
+        std::bernoulli_distribution should_write_log{settings.log_queries_probability};
+
+        context->setSetting("log_queries", should_write_log(thread_local_rng));
+        context->setSetting("log_queries_probability", 1.0);
+    }
+
     /// Copy query into string. It will be written to log and presented in processlist. If an INSERT query, string will not include data to insertion.
     String query(begin, query_end);
     BlockIO res;
@@ -473,8 +510,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             query = serializeAST(*ast);
         }
 
-        /// MUST goes before any modification (except for prepared statements,
-        /// since it substitute parameters and w/o them query does not contains
+        /// MUST go before any modification (except for prepared statements,
+        /// since it substitute parameters and w/o them query does not contain
         /// parameters), to keep query as-is in query_log and server log.
         query_for_logging = prepareQueryForLogging(query, context);
         logQuery(query_for_logging, context, internal);
@@ -485,9 +522,16 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             ApplyWithGlobalVisitor().visit(ast);
         }
 
-        /// Normalize SelectWithUnionQuery
-        NormalizeSelectWithUnionQueryVisitor::Data data{context->getSettingsRef().union_default_mode};
-        NormalizeSelectWithUnionQueryVisitor{data}.visit(ast);
+        {
+            SelectIntersectExceptQueryVisitor::Data data;
+            SelectIntersectExceptQueryVisitor{data}.visit(ast);
+        }
+
+        {
+            /// Normalize SelectWithUnionQuery
+            NormalizeSelectWithUnionQueryVisitor::Data data{context->getSettingsRef().union_default_mode};
+            NormalizeSelectWithUnionQueryVisitor{data}.visit(ast);
+        }
 
         /// Check the limits.
         checkASTSizeLimits(*ast, settings);
@@ -505,6 +549,11 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         context->initializeExternalTablesIfSet();
 
         auto * insert_query = ast->as<ASTInsertQuery>();
+
+        if (insert_query && insert_query->table_id)
+            /// Resolve database before trying to use async insert feature - to properly hash the query.
+            insert_query->table_id = context->resolveStorageID(insert_query->table_id);
+
         if (insert_query && insert_query->select)
         {
             /// Prepare Input storage before executing interpreter if we already got a buffer with data.
@@ -517,8 +566,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     StoragePtr storage = context->executeTableFunction(input_function);
                     auto & input_storage = dynamic_cast<StorageInput &>(*storage);
                     auto input_metadata_snapshot = input_storage.getInMemoryMetadataPtr();
-                    auto pipe = getSourceFromFromASTInsertQuery(
-                        ast, istr, input_metadata_snapshot->getSampleBlock(), context, input_function);
+                    auto pipe = getSourceFromASTInsertQuery(
+                        ast, true, input_metadata_snapshot->getSampleBlock(), context, input_function);
                     input_storage.setPipe(std::move(pipe));
                 }
             }
@@ -527,6 +576,27 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// reset Input callbacks if query is not INSERT SELECT
             context->resetInputCallbacks();
 
+        auto * queue = context->getAsynchronousInsertQueue();
+        const bool async_insert = queue
+            && insert_query && !insert_query->select
+            && insert_query->hasInlinedData() && settings.async_insert;
+
+        if (async_insert)
+        {
+            queue->push(ast, context);
+
+            BlockIO io;
+            if (settings.wait_for_async_insert)
+            {
+                auto timeout = settings.wait_for_async_insert_timeout.totalMilliseconds();
+                auto query_id = context->getCurrentQueryId();
+                auto source = std::make_shared<WaitForAsyncInsertSource>(query_id, timeout, *queue);
+                io.pipeline = QueryPipeline(Pipe(std::move(source)));
+            }
+
+            return std::make_tuple(ast, std::move(io));
+        }
+
         auto interpreter = InterpreterFactory::get(ast, context, SelectQueryOptions(stage).setInternal(internal));
 
         std::shared_ptr<const EnabledQuota> quota;
@@ -561,7 +631,6 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         }
 
         QueryPipeline & pipeline = res.pipeline;
-        bool use_processors = pipeline.initialized();
 
         if (const auto * insert_interpreter = typeid_cast<const InterpreterInsertQuery *>(&*interpreter))
         {
@@ -577,54 +646,23 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             if ((*process_list_entry)->isKilled())
                 throw Exception("Query '" + (*process_list_entry)->getInfo().client_info.current_query_id + "' is killed in pending state",
                     ErrorCodes::QUERY_WAS_CANCELLED);
-            else if (!use_processors)
-                (*process_list_entry)->setQueryStreams(res);
         }
 
         /// Hold element of process list till end of query execution.
         res.process_list_entry = process_list_entry;
 
-        if (use_processors)
+        if (pipeline.pulling() || pipeline.completed())
         {
             /// Limits on the result, the quota on the result, and also callback for progress.
             /// Limits apply only to the final result.
             pipeline.setProgressCallback(context->getProgressCallback());
             pipeline.setProcessListElement(context->getProcessListElement());
-            if (stage == QueryProcessingStage::Complete && !pipeline.isCompleted())
-            {
-                pipeline.resize(1);
-                pipeline.addSimpleTransform([&](const Block & header)
-                {
-                    auto transform = std::make_shared<LimitsCheckingTransform>(header, limits);
-                    transform->setQuota(quota);
-                    return transform;
-                });
-            }
+            if (stage == QueryProcessingStage::Complete && pipeline.pulling())
+                pipeline.setLimitsAndQuota(limits, quota);
         }
-        else
+        else if (pipeline.pushing())
         {
-            /// Limits on the result, the quota on the result, and also callback for progress.
-            /// Limits apply only to the final result.
-            if (res.in)
-            {
-                res.in->setProgressCallback(context->getProgressCallback());
-                res.in->setProcessListElement(context->getProcessListElement());
-                if (stage == QueryProcessingStage::Complete)
-                {
-                    if (!interpreter->ignoreQuota())
-                        res.in->setQuota(quota);
-                    if (!interpreter->ignoreLimits())
-                        res.in->setLimits(limits);
-                }
-            }
-
-            if (res.out)
-            {
-                if (auto * stream = dynamic_cast<CountingBlockOutputStream *>(res.out.get()))
-                {
-                    stream->setProcessListElement(context->getProcessListElement());
-                }
-            }
+            pipeline.setProcessListElement(context->getProcessListElement());
         }
 
         /// Everything related to query log.
@@ -640,6 +678,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
 
             elem.current_database = context->getCurrentDatabase();
             elem.query = query_for_logging;
+            if (settings.log_formatted_queries)
+                elem.formatted_query = queryToString(ast);
             elem.normalized_query_hash = normalizedQueryHash<false>(query_for_logging);
 
             elem.client_info = client_info;
@@ -649,13 +689,15 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             /// Log into system table start of query execution, if need.
             if (log_queries)
             {
-                if (use_processors)
+                /// This check is not obvious, but without it 01220_scalar_optimization_in_alter fails.
+                if (pipeline.initialized())
                 {
                     const auto & info = context->getQueryAccessInfo();
                     elem.query_databases = info.databases;
                     elem.query_tables = info.tables;
                     elem.query_columns = info.columns;
                     elem.query_projections = info.projections;
+                    elem.query_views = info.views;
                 }
 
                 interpreter->extendQueryLogElem(elem, ast, context, query_database, query_table);
@@ -701,6 +743,15 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 element.thread_ids = std::move(info.thread_ids);
                 element.profile_counters = std::move(info.profile_counters);
 
+                /// We need to refresh the access info since dependent views might have added extra information, either during
+                /// creation of the view (PushingToViewsBlockOutputStream) or while executing its internal SELECT
+                const auto & access_info = context_ptr->getQueryAccessInfo();
+                element.query_databases.insert(access_info.databases.begin(), access_info.databases.end());
+                element.query_tables.insert(access_info.tables.begin(), access_info.tables.end());
+                element.query_columns.insert(access_info.columns.begin(), access_info.columns.end());
+                element.query_projections.insert(access_info.projections.begin(), access_info.projections.end());
+                element.query_views.insert(access_info.views.begin(), access_info.views.end());
+
                 const auto & factories_info = context_ptr->getQueryFactoriesInfo();
                 element.used_aggregate_functions = factories_info.aggregate_functions;
                 element.used_aggregate_function_combinators = factories_info.aggregate_function_combinators;
@@ -718,9 +769,10 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                  log_queries,
                  log_queries_min_type = settings.log_queries_min_type,
                  log_queries_min_query_duration_ms = settings.log_queries_min_query_duration_ms.totalMilliseconds(),
-                 status_info_to_query_log
+                 status_info_to_query_log,
+                 pulling_pipeline = pipeline.pulling()
             ]
-                (IBlockInputStream * stream_in, IBlockOutputStream * stream_out, QueryPipeline * query_pipeline) mutable
+                (QueryPipeline & query_pipeline) mutable
             {
                 QueryStatus * process_list_elem = context->getProcessListElement();
 
@@ -748,30 +800,15 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                 if (progress_callback)
                     progress_callback(Progress(WriteProgress(info.written_rows, info.written_bytes)));
 
-                if (stream_in)
+                if (pulling_pipeline)
                 {
-                    const BlockStreamProfileInfo & stream_in_info = stream_in->getProfileInfo();
-
-                    /// NOTE: INSERT SELECT query contains zero metrics
-                    elem.result_rows = stream_in_info.rows;
-                    elem.result_bytes = stream_in_info.bytes;
+                    query_pipeline.tryGetResultRowsAndBytes(elem.result_rows, elem.result_bytes);
                 }
-                else if (stream_out) /// will be used only for ordinary INSERT queries
+                else /// will be used only for ordinary INSERT queries
                 {
-                    if (const auto * counting_stream = dynamic_cast<const CountingBlockOutputStream *>(stream_out))
-                    {
-                        /// NOTE: Redundancy. The same values could be extracted from process_list_elem->progress_out.query_settings = process_list_elem->progress_in
-                        elem.result_rows = counting_stream->getProgress().read_rows;
-                        elem.result_bytes = counting_stream->getProgress().read_bytes;
-                    }
-                }
-                else if (query_pipeline)
-                {
-                    if (const auto * output_format = query_pipeline->getOutputFormat())
-                    {
-                        elem.result_rows = output_format->getResultRows();
-                        elem.result_bytes = output_format->getResultBytes();
-                    }
+                    auto progress_out = process_list_elem->getProgressOut();
+                    elem.result_rows = progress_out.read_rows;
+                    elem.result_bytes = progress_out.read_bytes;
                 }
 
                 if (elem.read_rows != 0)
@@ -901,13 +938,11 @@ BlockIO executeQuery(
     const String & query,
     ContextMutablePtr context,
     bool internal,
-    QueryProcessingStage::Enum stage,
-    bool may_have_embedded_data)
+    QueryProcessingStage::Enum stage)
 {
     ASTPtr ast;
     BlockIO streams;
-    std::tie(ast, streams) = executeQueryImpl(query.data(), query.data() + query.size(), context,
-        internal, stage, !may_have_embedded_data, nullptr);
+    std::tie(ast, streams) = executeQueryImpl(query.data(), query.data() + query.size(), context, internal, stage, nullptr);
 
     if (const auto * ast_query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get()))
     {
@@ -923,19 +958,16 @@ BlockIO executeQuery(
 }
 
 BlockIO executeQuery(
+    bool allow_processors,
     const String & query,
     ContextMutablePtr context,
     bool internal,
-    QueryProcessingStage::Enum stage,
-    bool may_have_embedded_data,
-    bool allow_processors)
+    QueryProcessingStage::Enum stage)
 {
-    BlockIO res = executeQuery(query, context, internal, stage, may_have_embedded_data);
+    if (!allow_processors)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Flag allow_processors is deprecated for executeQuery");
 
-    if (!allow_processors && res.pipeline.initialized())
-        res.in = res.getInputStream();
-
-    return res;
+    return executeQuery(query, context, internal, stage);
 }
 
 
@@ -944,33 +976,28 @@ void executeQuery(
     WriteBuffer & ostr,
     bool allow_into_outfile,
     ContextMutablePtr context,
-    std::function<void(const String &, const String &, const String &, const String &)> set_result_details,
-    const std::optional<FormatSettings> & output_format_settings,
-    std::function<void()> before_finalize_callback)
+    SetResultDetailsFunc set_result_details,
+    const std::optional<FormatSettings> & output_format_settings)
 {
     PODArray<char> parse_buf;
     const char * begin;
     const char * end;
 
-    /// If 'istr' is empty now, fetch next data into buffer.
-    if (!istr.hasPendingData())
-        istr.next();
+    istr.nextIfAtEnd();
 
     size_t max_query_size = context->getSettingsRef().max_query_size;
 
-    bool may_have_tail;
     if (istr.buffer().end() - istr.position() > static_cast<ssize_t>(max_query_size))
     {
         /// If remaining buffer space in 'istr' is enough to parse query up to 'max_query_size' bytes, then parse inplace.
         begin = istr.position();
         end = istr.buffer().end();
         istr.position() += end - begin;
-        /// Actually we don't know will query has additional data or not.
-        /// But we can't check istr.eof(), because begin and end pointers will become invalid
-        may_have_tail = true;
     }
     else
     {
+        /// FIXME: this is an extra copy not required for async insertion.
+
         /// If not - copy enough data into 'parse_buf'.
         WriteBufferFromVector<PODArray<char>> out(parse_buf);
         LimitReadBuffer limit(istr, max_query_size + 1, false);
@@ -979,69 +1006,67 @@ void executeQuery(
 
         begin = parse_buf.data();
         end = begin + parse_buf.size();
-        /// Can check stream for eof, because we have copied data
-        may_have_tail = !istr.eof();
     }
 
     ASTPtr ast;
     BlockIO streams;
 
-    std::tie(ast, streams) = executeQueryImpl(begin, end, context, false, QueryProcessingStage::Complete, may_have_tail, &istr);
-
+    std::tie(ast, streams) = executeQueryImpl(begin, end, context, false, QueryProcessingStage::Complete, &istr);
     auto & pipeline = streams.pipeline;
 
+    std::unique_ptr<WriteBuffer> compressed_buffer;
     try
     {
-        if (streams.out)
+        if (pipeline.pushing())
         {
-            auto pipe = getSourceFromFromASTInsertQuery(ast, &istr, streams.out->getHeader(), context, nullptr);
-
-            pipeline.init(std::move(pipe));
-            pipeline.resize(1);
-            pipeline.setSinks([&](const Block &, Pipe::StreamType)
-            {
-                return std::make_shared<SinkToOutputStream>(streams.out);
-            });
-
-            auto executor = pipeline.execute();
-            executor->execute(pipeline.getNumThreads());
+            auto pipe = getSourceFromASTInsertQuery(ast, true, pipeline.getHeader(), context, nullptr);
+            pipeline.complete(std::move(pipe));
         }
-        else if (streams.in)
+        else if (pipeline.pulling())
         {
-            const auto * ast_query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get());
+            const ASTQueryWithOutput * ast_query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get());
 
             WriteBuffer * out_buf = &ostr;
-            std::unique_ptr<WriteBuffer> compressed_buffer;
             if (ast_query_with_output && ast_query_with_output->out_file)
             {
                 if (!allow_into_outfile)
                     throw Exception("INTO OUTFILE is not allowed", ErrorCodes::INTO_OUTFILE_NOT_ALLOWED);
 
-                const auto & out_file = ast_query_with_output->out_file->as<ASTLiteral &>().value.safeGet<std::string>();
+                const auto & out_file = typeid_cast<const ASTLiteral &>(*ast_query_with_output->out_file).value.safeGet<std::string>();
+
+                std::string compression_method;
+                if (ast_query_with_output->compression)
+                {
+                    const auto & compression_method_node = ast_query_with_output->compression->as<ASTLiteral &>();
+                    compression_method = compression_method_node.value.safeGet<std::string>();
+                }
+
                 compressed_buffer = wrapWriteBufferWithCompressionMethod(
                     std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
-                    chooseCompressionMethod(out_file, ""),
+                    chooseCompressionMethod(out_file, compression_method),
                     /* compression level = */ 3
                 );
             }
 
             String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
-                ? getIdentifierName(ast_query_with_output->format)
-                : context->getDefaultFormat();
+                                    ? getIdentifierName(ast_query_with_output->format)
+                                    : context->getDefaultFormat();
 
-            auto out = FormatFactory::instance().getOutputStreamParallelIfPossible(
+            auto out = FormatFactory::instance().getOutputFormatParallelIfPossible(
                 format_name,
                 compressed_buffer ? *compressed_buffer : *out_buf,
-                streams.in->getHeader(),
+                materializeBlock(pipeline.getHeader()),
                 context,
                 {},
                 output_format_settings);
 
+            out->setAutoFlush();
+
             /// Save previous progress callback if any. TODO Do it more conveniently.
             auto previous_progress_callback = context->getProgressCallback();
 
             /// NOTE Progress callback takes shared ownership of 'out'.
-            streams.in->setProgressCallback([out, previous_progress_callback] (const Progress & progress)
+            pipeline.setProgressCallback([out, previous_progress_callback] (const Progress & progress)
             {
                 if (previous_progress_callback)
                     previous_progress_callback(progress);
@@ -1052,76 +1077,21 @@ void executeQuery(
                 set_result_details(
                     context->getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
 
-            copyData(*streams.in, *out, [](){ return false; }, [&out](const Block &) { out->flush(); });
+            pipeline.complete(std::move(out));
         }
-        else if (pipeline.initialized())
+        else
         {
-            const ASTQueryWithOutput * ast_query_with_output = dynamic_cast<const ASTQueryWithOutput *>(ast.get());
+            pipeline.setProgressCallback(context->getProgressCallback());
+        }
 
-            WriteBuffer * out_buf = &ostr;
-            std::unique_ptr<WriteBuffer> compressed_buffer;
-            if (ast_query_with_output && ast_query_with_output->out_file)
-            {
-                if (!allow_into_outfile)
-                    throw Exception("INTO OUTFILE is not allowed", ErrorCodes::INTO_OUTFILE_NOT_ALLOWED);
-
-                const auto & out_file = typeid_cast<const ASTLiteral &>(*ast_query_with_output->out_file).value.safeGet<std::string>();
-                compressed_buffer = wrapWriteBufferWithCompressionMethod(
-                    std::make_unique<WriteBufferFromFile>(out_file, DBMS_DEFAULT_BUFFER_SIZE, O_WRONLY | O_EXCL | O_CREAT),
-                    chooseCompressionMethod(out_file, ""),
-                    /* compression level = */ 3
-                );
-            }
-
-            String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
-                                 ? getIdentifierName(ast_query_with_output->format)
-                                 : context->getDefaultFormat();
-
-            if (!pipeline.isCompleted())
-            {
-                pipeline.addSimpleTransform([](const Block & header)
-                {
-                    return std::make_shared<MaterializingTransform>(header);
-                });
-
-                auto out = FormatFactory::instance().getOutputFormatParallelIfPossible(
-                    format_name,
-                    compressed_buffer ? *compressed_buffer : *out_buf,
-                    pipeline.getHeader(),
-                    context,
-                    {},
-                    output_format_settings);
-
-                out->setAutoFlush();
-
-                /// Save previous progress callback if any. TODO Do it more conveniently.
-                auto previous_progress_callback = context->getProgressCallback();
-
-                /// NOTE Progress callback takes shared ownership of 'out'.
-                pipeline.setProgressCallback([out, previous_progress_callback] (const Progress & progress)
-                {
-                    if (previous_progress_callback)
-                        previous_progress_callback(progress);
-                    out->onProgress(progress);
-                });
-
-                out->setBeforeFinalizeCallback(before_finalize_callback);
-
-                if (set_result_details)
-                    set_result_details(
-                        context->getClientInfo().current_query_id, out->getContentType(), format_name, DateLUT::instance().getTimeZone());
-
-                pipeline.setOutputFormat(std::move(out));
-            }
-            else
-            {
-                pipeline.setProgressCallback(context->getProgressCallback());
-            }
-
-            {
-                auto executor = pipeline.execute();
-                executor->execute(pipeline.getNumThreads());
-            }
+        if (pipeline.initialized())
+        {
+            CompletedPipelineExecutor executor(pipeline);
+            executor.execute();
+        }
+        else
+        {
+            /// It's possible to have queries without input and output.
         }
     }
     catch (...)
@@ -1133,4 +1103,27 @@ void executeQuery(
     streams.onFinish();
 }
 
+void executeTrivialBlockIO(BlockIO & streams, ContextPtr context)
+{
+    try
+    {
+        if (!streams.pipeline.initialized())
+            return;
+
+        if (!streams.pipeline.completed())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Query pipeline requires output, but no output buffer provided, it's a bug");
+
+        streams.pipeline.setProgressCallback(context->getProgressCallback());
+        CompletedPipelineExecutor executor(streams.pipeline);
+        executor.execute();
+    }
+    catch (...)
+    {
+        streams.onException();
+        throw;
+    }
+
+    streams.onFinish();
+}
+
 }
diff --git a/src/Interpreters/executeQuery.h b/src/Interpreters/executeQuery.h
index 179016e8523..9c561d8b88c 100644
--- a/src/Interpreters/executeQuery.h
+++ b/src/Interpreters/executeQuery.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <Core/QueryProcessingStage.h>
-#include <DataStreams/BlockIO.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/BlockIO.h>
+#include <Interpreters/Context_fwd.h>
+#include <Formats/FormatSettings.h>
 
 namespace DB
 {
@@ -10,6 +11,7 @@ namespace DB
 class ReadBuffer;
 class WriteBuffer;
 
+using SetResultDetailsFunc = std::function<void(const String &, const String &, const String &, const String &)>;
 
 /// Parse and execute a query.
 void executeQuery(
@@ -17,9 +19,8 @@ void executeQuery(
     WriteBuffer & ostr,                 /// Where to write query output to.
     bool allow_into_outfile,            /// If true and the query contains INTO OUTFILE section, redirect output to that file.
     ContextMutablePtr context,          /// DB, tables, data types, storage engines, functions, aggregate functions...
-    std::function<void(const String &, const String &, const String &, const String &)> set_result_details, /// If a non-empty callback is passed, it will be called with the query id, the content-type, the format, and the timezone.
-    const std::optional<FormatSettings> & output_format_settings = std::nullopt, /// Format settings for output format, will be calculated from the context if not set.
-    std::function<void()> before_finalize_callback = {} /// Will be set in output format to be called before finalize.
+    SetResultDetailsFunc set_result_details, /// If a non-empty callback is passed, it will be called with the query id, the content-type, the format, and the timezone.
+    const std::optional<FormatSettings> & output_format_settings = std::nullopt /// Format settings for output format, will be calculated from the context if not set.
 );
 
 
@@ -41,18 +42,20 @@ BlockIO executeQuery(
     const String & query,     /// Query text without INSERT data. The latter must be written to BlockIO::out.
     ContextMutablePtr context,       /// DB, tables, data types, storage engines, functions, aggregate functions...
     bool internal = false,    /// If true, this query is caused by another query and thus needn't be registered in the ProcessList.
-    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete,    /// To which stage the query must be executed.
-    bool may_have_embedded_data = false /// If insert query may have embedded data
+    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete    /// To which stage the query must be executed.
 );
 
 /// Old interface with allow_processors flag. For compatibility.
 BlockIO executeQuery(
+    bool allow_processors,  /// If can use processors pipeline
     const String & query,
     ContextMutablePtr context,
-    bool internal,
-    QueryProcessingStage::Enum stage,
-    bool may_have_embedded_data,
-    bool allow_processors /// If can use processors pipeline
+    bool internal = false,
+    QueryProcessingStage::Enum stage = QueryProcessingStage::Complete
 );
 
+/// Executes BlockIO returned from executeQuery(...)
+/// if built pipeline does not require any input and does not produce any output.
+void executeTrivialBlockIO(BlockIO & streams, ContextPtr context);
+
 }
diff --git a/src/Interpreters/fuzzers/CMakeLists.txt b/src/Interpreters/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..f8d4cf224db
--- /dev/null
+++ b/src/Interpreters/fuzzers/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_executable(execute_query_fuzzer execute_query_fuzzer.cpp)
+target_link_libraries(execute_query_fuzzer PRIVATE
+    dbms
+    clickhouse_functions
+    clickhouse_table_functions
+    clickhouse_aggregate_functions
+    clickhouse_dictionaries
+    clickhouse_dictionaries_embedded
+    ${LIB_FUZZING_ENGINE})
diff --git a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
new file mode 100644
index 00000000000..f843c4880df
--- /dev/null
+++ b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
@@ -0,0 +1,56 @@
+#include <iostream>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/Context.h>
+#include "Processors/Executors/PullingPipelineExecutor.h"
+
+#include <Functions/registerFunctions.h>
+#include <AggregateFunctions/registerAggregateFunctions.h>
+#include <TableFunctions/registerTableFunctions.h>
+#include <Storages/registerStorages.h>
+#include <Dictionaries/registerDictionaries.h>
+#include <Disks/registerDisks.h>
+#include <Formats/registerFormats.h>
+
+using namespace DB;
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
+try
+{
+    std::string input = std::string(reinterpret_cast<const char*>(data), size);
+
+    static SharedContextHolder shared_context;
+    static ContextMutablePtr context;
+
+    auto initialize = [&]() mutable
+    {
+        shared_context = Context::createShared();
+        context = Context::createGlobal(shared_context.get());
+        context->makeGlobalContext();
+        context->setApplicationType(Context::ApplicationType::LOCAL);
+
+        registerFunctions();
+        registerAggregateFunctions();
+        registerTableFunctions();
+        registerStorages();
+        registerDictionaries();
+        registerDisks();
+        registerFormats();
+
+        return true;
+    };
+
+    static bool initialized = initialize();
+    (void) initialized;
+
+    auto io = DB::executeQuery(input, context, true, QueryProcessingStage::Complete);
+
+    PullingPipelineExecutor executor(io.pipeline);
+    Block res;
+    while (!res && executor.pull(res));
+
+    return 0;
+}
+catch (...)
+{
+    return 1;
+}
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index 19837cc05d9..1510b477725 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -3,8 +3,8 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Storages/IStorage.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
 namespace DB
 {
@@ -120,9 +120,9 @@ Block getHeaderForProcessingStage(
             TreeRewriterResult new_rewriter_result = *query_info.syntax_analyzer_result;
             removeJoin(*query->as<ASTSelectQuery>(), new_rewriter_result, context);
 
-            auto stream = std::make_shared<OneBlockInputStream>(
-                    metadata_snapshot->getSampleBlockForColumns(column_names, storage.getVirtuals(), storage.getStorageID()));
-            return InterpreterSelectQuery(query, context, stream, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+            auto pipe = Pipe(std::make_shared<SourceFromSingleChunk>(
+                    metadata_snapshot->getSampleBlockForColumns(column_names, storage.getVirtuals(), storage.getStorageID())));
+            return InterpreterSelectQuery(query, context, std::move(pipe), SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
         }
     }
     throw Exception("Logical Error: unknown processed stage.", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index 26cf6912bc7..2841abe757e 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -52,7 +52,7 @@ void addDefaultRequiredExpressionsRecursively(
         RequiredSourceColumnsVisitor(columns_context).visit(column_default_expr);
         NameSet required_columns_names = columns_context.requiredColumns();
 
-        auto expr = makeASTFunction("CAST", column_default_expr, std::make_shared<ASTLiteral>(columns.get(required_column_name).type->getName()));
+        auto expr = makeASTFunction("_CAST", column_default_expr, std::make_shared<ASTLiteral>(columns.get(required_column_name).type->getName()));
 
         if (is_column_in_query && convert_null_to_default)
             expr = makeASTFunction("ifNull", std::make_shared<ASTIdentifier>(required_column_name), std::move(expr));
@@ -61,10 +61,31 @@ void addDefaultRequiredExpressionsRecursively(
         added_columns.emplace(required_column_name);
 
         for (const auto & next_required_column_name : required_columns_names)
-            addDefaultRequiredExpressionsRecursively(block, next_required_column_name, required_column_type, columns, default_expr_list_accum, added_columns, null_as_default);
+        {
+            /// Required columns of the default expression should not be converted to NULL,
+            /// since this map value to default and MATERIALIZED values will not work.
+            ///
+            /// Consider the following structure:
+            /// - A Nullable(Int64)
+            /// - X Int64 materialized coalesce(A, -1)
+            ///
+            /// With recursive_null_as_default=true you will get:
+            ///
+            ///     _CAST(coalesce(A, -1), 'Int64') AS X, NULL AS A
+            ///
+            /// And this will ignore default expression.
+            bool recursive_null_as_default = false;
+            addDefaultRequiredExpressionsRecursively(block,
+                next_required_column_name, required_column_type,
+                columns, default_expr_list_accum, added_columns,
+                recursive_null_as_default);
+        }
     }
-    else
+    else if (columns.has(required_column_name))
     {
+        /// In case of dictGet function we allow to use it with identifier dictGet(identifier, 'column_name', key_expression)
+        /// and this identifier will be in required columns. If such column is not in ColumnsDescription we ignore it.
+
         /// This column is required, but doesn't have default expression, so lets use "default default"
         auto column = columns.get(required_column_name);
         auto default_value = column.type->getDefault();
@@ -101,7 +122,7 @@ ASTPtr convertRequiredExpressions(Block & block, const NamesAndTypesList & requi
             continue;
 
         auto cast_func = makeASTFunction(
-            "CAST", std::make_shared<ASTIdentifier>(required_column.name), std::make_shared<ASTLiteral>(required_column.type->getName()));
+            "_CAST", std::make_shared<ASTIdentifier>(required_column.name), std::make_shared<ASTLiteral>(required_column.type->getName()));
 
         conversion_expr_list->children.emplace_back(setAlias(cast_func, required_column.name));
 
diff --git a/src/Interpreters/joinDispatch.h b/src/Interpreters/joinDispatch.h
index cac3fcd1e9a..a9de8206b65 100644
--- a/src/Interpreters/joinDispatch.h
+++ b/src/Interpreters/joinDispatch.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <array>
-#include <common/constexpr_helpers.h>
+#include <base/constexpr_helpers.h>
 
 #include <Interpreters/HashJoin.h>
 
@@ -100,4 +100,35 @@ inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness stric
     });
 }
 
+/// Call function on specified join map
+template <typename MapsVariant, typename Func>
+inline bool joinDispatch(ASTTableJoin::Kind kind, ASTTableJoin::Strictness strictness, std::vector<const MapsVariant *> & mapsv, Func && func)
+{
+    return static_for<0, KINDS.size() * STRICTNESSES.size()>([&](auto ij)
+    {
+        // NOTE: Avoid using nested static loop as GCC and CLANG have bugs in different ways
+        // See https://stackoverflow.com/questions/44386415/gcc-and-clang-disagree-about-c17-constexpr-lambda-captures
+        constexpr auto i = ij / STRICTNESSES.size();
+        constexpr auto j = ij % STRICTNESSES.size();
+        if (kind == KINDS[i] && strictness == STRICTNESSES[j])
+        {
+            using MapType = typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map;
+            std::vector<const MapType *> v;
+            for (const auto & el : mapsv)
+            {
+                v.push_back(&std::get<MapType>(*el));
+            }
+
+            func(
+                std::integral_constant<ASTTableJoin::Kind, KINDS[i]>(),
+                std::integral_constant<ASTTableJoin::Strictness, STRICTNESSES[j]>(),
+                v
+                /*std::get<typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map>(maps)*/);
+            return true;
+        }
+        return false;
+    });
+}
+
+
 }
diff --git a/src/Interpreters/join_common.cpp b/src/Interpreters/join_common.cpp
index 9d6abda42ed..bf5d30437ec 100644
--- a/src/Interpreters/join_common.cpp
+++ b/src/Interpreters/join_common.cpp
@@ -2,20 +2,17 @@
 
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnNullable.h>
-
-#include <DataStreams/materializeBlock.h>
+#include <Columns/ColumnConst.h>
 
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/getLeastSupertype.h>
 
 #include <IO/WriteHelpers.h>
 
 #include <Interpreters/ActionsDAG.h>
 #include <Interpreters/TableJoin.h>
 
-#include <common/logger_useful.h>
 namespace DB
 {
 
@@ -29,15 +26,30 @@ namespace ErrorCodes
 namespace
 {
 
-void changeNullability(MutableColumnPtr & mutable_column)
+void insertFromNullableOrDefault(MutableColumnPtr & dst, const ColumnNullable * nullable_col)
 {
-    ColumnPtr column = std::move(mutable_column);
-    if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*column))
-        column = nullable->getNestedColumnPtr();
+    const auto & nested = nullable_col->getNestedColumn();
+    const auto & nullmap = nullable_col->getNullMapColumn().getData();
+    if (auto * lc = typeid_cast<ColumnLowCardinality *>(dst.get()); lc && !nested.lowCardinality())
+    {
+        for (size_t i = 0; i < nullable_col->size(); ++i)
+        {
+            if (nullmap[i])
+                lc->insertDefault();
+            else
+                lc->insertRangeFromFullColumn(nested, i, 1);
+        }
+    }
     else
-        column = makeNullable(column);
-
-    mutable_column = IColumn::mutate(std::move(column));
+    {
+        for (size_t i = 0; i < nullable_col->size(); ++i)
+        {
+            if (nullmap[i])
+                dst->insertDefault();
+            else
+                dst->insertFrom(nested, i);
+        }
+    }
 }
 
 ColumnPtr changeLowCardinality(const ColumnPtr & column, const ColumnPtr & dst_sample)
@@ -45,13 +57,34 @@ ColumnPtr changeLowCardinality(const ColumnPtr & column, const ColumnPtr & dst_s
     if (dst_sample->lowCardinality())
     {
         MutableColumnPtr lc = dst_sample->cloneEmpty();
-        typeid_cast<ColumnLowCardinality &>(*lc).insertRangeFromFullColumn(*column, 0, column->size());
+        if (const auto * nullable_col = typeid_cast<const ColumnNullable *>(column.get()))
+            insertFromNullableOrDefault(lc, nullable_col);
+        else
+            typeid_cast<ColumnLowCardinality &>(*lc).insertRangeFromFullColumn(*column, 0, column->size());
         return lc;
     }
 
     return column->convertToFullColumnIfLowCardinality();
 }
 
+struct LowcardAndNull
+{
+    bool is_lowcard;
+    bool is_nullable;
+};
+
+LowcardAndNull getLowcardAndNullability(const ColumnPtr & col)
+{
+    if (col->lowCardinality())
+    {
+        /// Currently only `LowCardinality(Nullable(T))` is possible, but not `Nullable(LowCardinality(T))`
+        assert(!col->canBeInsideNullable());
+        const auto * col_as_lc = assert_cast<const ColumnLowCardinality *>(col.get());
+        return {true, col_as_lc->nestedIsNullable()};
+    }
+    return {false, col->isNullable()};
+}
+
 }
 
 namespace JoinCommon
@@ -91,35 +124,64 @@ DataTypePtr convertTypeToNullable(const DataTypePtr & type)
         if (dict_type->canBeInsideNullable())
             return std::make_shared<DataTypeLowCardinality>(makeNullable(dict_type));
     }
-    return makeNullable(type);
+
+    if (type->canBeInsideNullable())
+        return makeNullable(type);
+
+    return type;
 }
 
-void convertColumnToNullable(ColumnWithTypeAndName & column, bool remove_low_card)
+/// Convert column to nullable. If column LowCardinality or Const, convert nested column.
+/// Returns nullptr if conversion cannot be performed.
+static ColumnPtr tryConvertColumnToNullable(const ColumnPtr & col)
 {
-    if (remove_low_card && column.type->lowCardinality())
+    if (isColumnNullable(*col) || col->canBeInsideNullable())
+        return makeNullable(col);
+
+    if (col->lowCardinality())
     {
-        column.column = recursiveRemoveLowCardinality(column.column);
-        column.type = recursiveRemoveLowCardinality(column.type);
+        auto mut_col = IColumn::mutate(std::move(col));
+        ColumnLowCardinality * col_lc = assert_cast<ColumnLowCardinality *>(mut_col.get());
+        if (col_lc->nestedIsNullable())
+        {
+            return mut_col;
+        }
+        else if (col_lc->nestedCanBeInsideNullable())
+        {
+            col_lc->nestedToNullable();
+            return mut_col;
+        }
+    }
+    else if (const ColumnConst * col_const = checkAndGetColumn<ColumnConst>(*col))
+    {
+        const auto & nested = col_const->getDataColumnPtr();
+        if (nested->isNullable() || nested->canBeInsideNullable())
+        {
+            return makeNullable(col);
+        }
+        else if (nested->lowCardinality())
+        {
+            ColumnPtr nested_nullable = tryConvertColumnToNullable(nested);
+            if (nested_nullable)
+                return ColumnConst::create(nested_nullable, col_const->size());
+        }
+    }
+    return nullptr;
+}
+
+void convertColumnToNullable(ColumnWithTypeAndName & column)
+{
+    if (!column.column)
+    {
+        column.type = convertTypeToNullable(column.type);
+        return;
     }
 
-    if (column.type->isNullable() || !canBecomeNullable(column.type))
-        return;
-
-    column.type = convertTypeToNullable(column.type);
-
-    if (column.column)
+    ColumnPtr nullable_column = tryConvertColumnToNullable(column.column);
+    if (nullable_column)
     {
-        if (column.column->lowCardinality())
-        {
-            /// Convert nested to nullable, not LowCardinality itself
-            auto mut_col = IColumn::mutate(std::move(column.column));
-            ColumnLowCardinality * col_as_lc = assert_cast<ColumnLowCardinality *>(mut_col.get());
-            if (!col_as_lc->nestedIsNullable())
-                col_as_lc->nestedToNullable();
-            column.column = std::move(mut_col);
-        }
-        else
-            column.column = makeNullable(column.column);
+        column.type = convertTypeToNullable(column.type);
+        column.column = std::move(nullable_column);
     }
 }
 
@@ -129,6 +191,16 @@ void convertColumnsToNullable(Block & block, size_t starting_pos)
         convertColumnToNullable(block.getByPosition(i));
 }
 
+void convertColumnsToNullable(MutableColumns & mutable_columns, size_t starting_pos)
+{
+    for (size_t i = starting_pos; i < mutable_columns.size(); ++i)
+    {
+        ColumnPtr column = std::move(mutable_columns[i]);
+        column = makeNullable(column);
+        mutable_columns[i] = IColumn::mutate(std::move(column));
+    }
+}
+
 /// @warning It assumes that every NULL has default value in nested column (or it does not matter)
 void removeColumnNullability(ColumnWithTypeAndName & column)
 {
@@ -146,20 +218,18 @@ void removeColumnNullability(ColumnWithTypeAndName & column)
                 col_as_lc->nestedRemoveNullable();
             column.column = std::move(mut_col);
         }
-
-        return;
     }
-
-    if (!column.type->isNullable())
-        return;
-
-    column.type = static_cast<const DataTypeNullable &>(*column.type).getNestedType();
-    if (column.column)
+    else
     {
-        const auto * nullable_column = checkAndGetColumn<ColumnNullable>(*column.column);
-        ColumnPtr nested_column = nullable_column->getNestedColumnPtr();
-        MutableColumnPtr mutable_column = IColumn::mutate(std::move(nested_column));
-        column.column = std::move(mutable_column);
+        column.type = removeNullable(column.type);
+
+        if (column.column && column.column->isNullable())
+        {
+            const auto * nullable_col = checkAndGetColumn<ColumnNullable>(*column.column);
+            MutableColumnPtr mutable_column = nullable_col->getNestedColumn().cloneEmpty();
+            insertFromNullableOrDefault(mutable_column, nullable_col);
+            column.column = std::move(mutable_column);
+        }
     }
 }
 
@@ -228,6 +298,21 @@ ColumnRawPtrs materializeColumnsInplace(Block & block, const Names & names)
     return ptrs;
 }
 
+ColumnRawPtrMap materializeColumnsInplaceMap(Block & block, const Names & names)
+{
+    ColumnRawPtrMap ptrs;
+    ptrs.reserve(names.size());
+
+    for (const auto & column_name : names)
+    {
+        auto & column = block.getByName(column_name).column;
+        column = recursiveRemoveLowCardinality(column->convertToFullColumnIfConst());
+        ptrs[column_name] = column.get();
+    }
+
+    return ptrs;
+}
+
 ColumnPtr materializeColumn(const Block & block, const String & column_name)
 {
     const auto & src_column = block.getByName(column_name).column;
@@ -279,8 +364,16 @@ void removeLowCardinalityInplace(Block & block, const Names & names, bool change
     }
 }
 
-void restoreLowCardinalityInplace(Block & block)
+void restoreLowCardinalityInplace(Block & block, const Names & lowcard_keys)
 {
+    for (const auto & column_name : lowcard_keys)
+    {
+        if (!block.has(column_name))
+            continue;
+        if (auto & col = block.getByName(column_name); !col.type->lowCardinality())
+            JoinCommon::changeLowCardinalityInplace(col);
+    }
+
     for (size_t i = 0; i < block.columns(); ++i)
     {
         auto & col = block.getByPosition(i);
@@ -328,7 +421,7 @@ void checkTypesOfKeys(const Block & block_left, const Names & key_names_left,
 void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const String & condition_name_left,
                       const Block & block_right, const Names & key_names_right, const String & condition_name_right)
 {
-    checkTypesOfKeys(block_left, key_names_left,block_right,key_names_right);
+    checkTypesOfKeys(block_left, key_names_left, block_right, key_names_right);
     checkTypesOfMasks(block_left, condition_name_left, block_right, condition_name_right);
 }
 
@@ -449,49 +542,22 @@ void splitAdditionalColumns(const Names & key_names, const Block & sample_block,
 
 }
 
-
-NotJoined::NotJoined(const TableJoin & table_join, const Block & saved_block_sample_, const Block & right_sample_block,
-                     const Block & result_sample_block_, const Names & key_names_left_, const Names & key_names_right_)
-    : saved_block_sample(saved_block_sample_)
+NotJoinedBlocks::NotJoinedBlocks(std::unique_ptr<RightColumnsFiller> filler_,
+                     const Block & result_sample_block_,
+                     size_t left_columns_count,
+                     const LeftToRightKeyRemap & left_to_right_key_remap)
+    : filler(std::move(filler_))
+    , saved_block_sample(filler->getEmptyBlock())
     , result_sample_block(materializeBlock(result_sample_block_))
-    , key_names_left(key_names_left_.empty() ? table_join.keyNamesLeft() : key_names_left_)
-    , key_names_right(key_names_right_.empty() ? table_join.keyNamesRight() : key_names_right_)
 {
-    std::vector<String> tmp;
-    Block right_table_keys;
-    Block sample_block_with_columns_to_add;
-
-    JoinCommon::splitAdditionalColumns(key_names_right, right_sample_block, right_table_keys,
-                                       sample_block_with_columns_to_add);
-    Block required_right_keys = table_join.getRequiredRightKeys(right_table_keys, tmp);
-
-    std::unordered_map<size_t, size_t> left_to_right_key_remap;
-
-    if (table_join.hasUsing())
-    {
-        for (size_t i = 0; i < key_names_left.size(); ++i)
-        {
-            const String & left_key_name = key_names_left[i];
-            const String & right_key_name = key_names_right[i];
-
-            size_t left_key_pos = result_sample_block.getPositionByName(left_key_name);
-            size_t right_key_pos = saved_block_sample.getPositionByName(right_key_name);
-
-            if (!required_right_keys.has(right_key_name))
-                left_to_right_key_remap[left_key_pos] = right_key_pos;
-        }
-    }
-
-    /// result_sample_block: left_sample_block + left expressions, right not key columns, required right keys
-    size_t left_columns_count = result_sample_block.columns() -
-        sample_block_with_columns_to_add.columns() - required_right_keys.columns();
-
     for (size_t left_pos = 0; left_pos < left_columns_count; ++left_pos)
     {
-        /// We need right 'x' for 'RIGHT JOIN ... USING(x)'.
-        if (left_to_right_key_remap.count(left_pos))
+        /// We need right 'x' for 'RIGHT JOIN ... USING(x)'
+        auto left_name = result_sample_block.getByPosition(left_pos).name;
+        const auto & right_key = left_to_right_key_remap.find(left_name);
+        if (right_key != left_to_right_key_remap.end())
         {
-            size_t right_key_pos = left_to_right_key_remap[left_pos];
+            size_t right_key_pos = saved_block_sample.getPositionByName(right_key->second);
             setRightIndex(right_key_pos, left_pos);
         }
         else
@@ -521,9 +587,9 @@ NotJoined::NotJoined(const TableJoin & table_join, const Block & saved_block_sam
                         ErrorCodes::LOGICAL_ERROR);
 }
 
-void NotJoined::setRightIndex(size_t right_pos, size_t result_position)
+void NotJoinedBlocks::setRightIndex(size_t right_pos, size_t result_position)
 {
-    if (!column_indices_right.count(right_pos))
+    if (!column_indices_right.contains(right_pos))
     {
         column_indices_right[right_pos] = result_position;
         extractColumnChanges(right_pos, result_position);
@@ -532,37 +598,47 @@ void NotJoined::setRightIndex(size_t right_pos, size_t result_position)
         same_result_keys[result_position] = column_indices_right[right_pos];
 }
 
-void NotJoined::extractColumnChanges(size_t right_pos, size_t result_pos)
+void NotJoinedBlocks::extractColumnChanges(size_t right_pos, size_t result_pos)
 {
-    const auto & src = saved_block_sample.getByPosition(right_pos).column;
-    const auto & dst = result_sample_block.getByPosition(result_pos).column;
+    auto src_props = getLowcardAndNullability(saved_block_sample.getByPosition(right_pos).column);
+    auto dst_props = getLowcardAndNullability(result_sample_block.getByPosition(result_pos).column);
 
-    if (!src->isNullable() && dst->isNullable())
-        right_nullability_adds.push_back(right_pos);
+    if (src_props.is_nullable != dst_props.is_nullable)
+        right_nullability_changes.push_back({result_pos, dst_props.is_nullable});
 
-    if (src->isNullable() && !dst->isNullable())
-        right_nullability_removes.push_back(right_pos);
-
-    ColumnPtr src_not_null = JoinCommon::emptyNotNullableClone(src);
-    ColumnPtr dst_not_null = JoinCommon::emptyNotNullableClone(dst);
-
-    if (src_not_null->lowCardinality() != dst_not_null->lowCardinality())
-        right_lowcard_changes.push_back({right_pos, dst_not_null});
+    if (src_props.is_lowcard != dst_props.is_lowcard)
+        right_lowcard_changes.push_back({result_pos, dst_props.is_lowcard});
 }
 
-void NotJoined::correctLowcardAndNullability(MutableColumns & columns_right)
+void NotJoinedBlocks::correctLowcardAndNullability(Block & block)
 {
-    for (size_t pos : right_nullability_removes)
-        changeNullability(columns_right[pos]);
+    for (auto & [pos, added] : right_nullability_changes)
+    {
+        auto & col = block.getByPosition(pos);
+        if (added)
+            JoinCommon::convertColumnToNullable(col);
+        else
+            JoinCommon::removeColumnNullability(col);
+    }
 
-    for (auto & [pos, dst_sample] : right_lowcard_changes)
-        columns_right[pos] = changeLowCardinality(std::move(columns_right[pos]), dst_sample)->assumeMutable();
-
-    for (size_t pos : right_nullability_adds)
-        changeNullability(columns_right[pos]);
+    for (auto & [pos, added] : right_lowcard_changes)
+    {
+        auto & col = block.getByPosition(pos);
+        if (added)
+        {
+            if (!col.type->lowCardinality())
+                col.type = std::make_shared<DataTypeLowCardinality>(col.type);
+            col.column = changeLowCardinality(col.column, col.type->createColumn());
+        }
+        else
+        {
+            col.column = recursiveRemoveLowCardinality(col.column);
+            col.type = recursiveRemoveLowCardinality(col.type);
+        }
+    }
 }
 
-void NotJoined::addLeftColumns(Block & block, size_t rows_added) const
+void NotJoinedBlocks::addLeftColumns(Block & block, size_t rows_added) const
 {
     for (size_t pos : column_indices_left)
     {
@@ -574,22 +650,17 @@ void NotJoined::addLeftColumns(Block & block, size_t rows_added) const
     }
 }
 
-void NotJoined::addRightColumns(Block & block, MutableColumns & columns_right) const
+void NotJoinedBlocks::addRightColumns(Block & block, MutableColumns & columns_right) const
 {
     for (const auto & pr : column_indices_right)
     {
         auto & right_column = columns_right[pr.first];
         auto & result_column = block.getByPosition(pr.second).column;
-#ifndef NDEBUG
-        if (result_column->getName() != right_column->getName())
-            throw Exception("Wrong columns assign in RIGHT|FULL JOIN: " + result_column->getName() +
-                            " " + right_column->getName(), ErrorCodes::LOGICAL_ERROR);
-#endif
         result_column = std::move(right_column);
     }
 }
 
-void NotJoined::copySameKeys(Block & block) const
+void NotJoinedBlocks::copySameKeys(Block & block) const
 {
     for (const auto & pr : same_result_keys)
     {
@@ -599,4 +670,26 @@ void NotJoined::copySameKeys(Block & block) const
     }
 }
 
+Block NotJoinedBlocks::read()
+{
+    Block result_block = result_sample_block.cloneEmpty();
+    {
+        Block right_block = filler->getEmptyBlock();
+        MutableColumns columns_right = right_block.cloneEmptyColumns();
+        size_t rows_added = filler->fillColumns(columns_right);
+        if (rows_added == 0)
+            return {};
+
+        addLeftColumns(result_block, rows_added);
+        addRightColumns(result_block, columns_right);
+    }
+    copySameKeys(result_block);
+    correctLowcardAndNullability(result_block);
+
+#ifndef NDEBUG
+    assertBlocksHaveEqualStructure(result_block, result_sample_block, "NotJoinedBlocks");
+#endif
+    return result_block;
+}
+
 }
diff --git a/src/Interpreters/join_common.h b/src/Interpreters/join_common.h
index 8862116d1fa..32264d57d33 100644
--- a/src/Interpreters/join_common.h
+++ b/src/Interpreters/join_common.h
@@ -12,25 +12,29 @@ namespace DB
 struct ColumnWithTypeAndName;
 class TableJoin;
 class IColumn;
+
 using ColumnRawPtrs = std::vector<const IColumn *>;
+using ColumnRawPtrMap = std::unordered_map<String, const IColumn *>;
 using UInt8ColumnDataPtr = const ColumnUInt8::Container *;
 
 namespace JoinCommon
 {
 bool canBecomeNullable(const DataTypePtr & type);
 DataTypePtr convertTypeToNullable(const DataTypePtr & type);
-void convertColumnToNullable(ColumnWithTypeAndName & column, bool remove_low_card = false);
+void convertColumnToNullable(ColumnWithTypeAndName & column);
 void convertColumnsToNullable(Block & block, size_t starting_pos = 0);
+void convertColumnsToNullable(MutableColumns & mutable_columns, size_t starting_pos = 0);
 void removeColumnNullability(ColumnWithTypeAndName & column);
 void changeColumnRepresentation(const ColumnPtr & src_column, ColumnPtr & dst_column);
 ColumnPtr emptyNotNullableClone(const ColumnPtr & column);
 ColumnPtr materializeColumn(const Block & block, const String & name);
 Columns materializeColumns(const Block & block, const Names & names);
 ColumnRawPtrs materializeColumnsInplace(Block & block, const Names & names);
+ColumnRawPtrMap materializeColumnsInplaceMap(Block & block, const Names & names);
 ColumnRawPtrs getRawPointers(const Columns & columns);
 void removeLowCardinalityInplace(Block & block);
 void removeLowCardinalityInplace(Block & block, const Names & names, bool change_type = true);
-void restoreLowCardinalityInplace(Block & block);
+void restoreLowCardinalityInplace(Block & block, const Names & lowcard_keys);
 
 ColumnRawPtrs extractKeysForJoin(const Block & block_keys, const Names & key_names_right);
 
@@ -64,41 +68,58 @@ void changeLowCardinalityInplace(ColumnWithTypeAndName & column);
 }
 
 /// Creates result from right table data in RIGHT and FULL JOIN when keys are not present in left table.
-class NotJoined
+class NotJoinedBlocks final
 {
 public:
-    NotJoined(const TableJoin & table_join, const Block & saved_block_sample_, const Block & right_sample_block,
-              const Block & result_sample_block_, const Names & key_names_left_ = {}, const Names & key_names_right_ = {});
+    using LeftToRightKeyRemap = std::unordered_map<String, String>;
 
-    void correctLowcardAndNullability(MutableColumns & columns_right);
+    /// Returns non joined columns from right part of join
+    class RightColumnsFiller
+    {
+    public:
+        /// Create empty block for right part
+        virtual Block getEmptyBlock() = 0;
+        /// Fill columns from right part of join with not joined rows
+        virtual size_t fillColumns(MutableColumns & columns_right) = 0;
+
+        virtual ~RightColumnsFiller() = default;
+    };
+
+    NotJoinedBlocks(std::unique_ptr<RightColumnsFiller> filler_,
+              const Block & result_sample_block_,
+              size_t left_columns_count,
+              const LeftToRightKeyRemap & left_to_right_key_remap);
+
+    Block read();
+
+private:
+    void extractColumnChanges(size_t right_pos, size_t result_pos);
+    void correctLowcardAndNullability(Block & block);
     void addLeftColumns(Block & block, size_t rows_added) const;
     void addRightColumns(Block & block, MutableColumns & columns_right) const;
     void copySameKeys(Block & block) const;
 
-protected:
+    std::unique_ptr<RightColumnsFiller> filler;
+
+    /// Right block saved in Join
     Block saved_block_sample;
+
+    /// Output of join
     Block result_sample_block;
 
-    Names key_names_left;
-    Names key_names_right;
-
-    ~NotJoined() = default;
-
-private:
     /// Indices of columns in result_sample_block that should be generated
     std::vector<size_t> column_indices_left;
     /// Indices of columns that come from the right-side table: right_pos -> result_pos
     std::unordered_map<size_t, size_t> column_indices_right;
-    ///
+
     std::unordered_map<size_t, size_t> same_result_keys;
-    /// Which right columns (saved in parent) need nullability change before placing them in result block
-    std::vector<size_t> right_nullability_adds;
-    std::vector<size_t> right_nullability_removes;
-    /// Which right columns (saved in parent) need LowCardinality change before placing them in result block
-    std::vector<std::pair<size_t, ColumnPtr>> right_lowcard_changes;
+
+    /// Which right columns (saved in parent) need Nullability/LowCardinality change
+    ///  before placing them in result block
+    std::vector<std::pair<size_t, bool>> right_nullability_changes;
+    std::vector<std::pair<size_t, bool>> right_lowcard_changes;
 
     void setRightIndex(size_t right_pos, size_t result_position);
-    void extractColumnChanges(size_t right_pos, size_t result_pos);
 };
 
 }
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index 43f9727c355..65b2065b2ad 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -11,6 +11,7 @@
 #include <Interpreters/loadMetadata.h>
 
 #include <Databases/DatabaseOrdinary.h>
+#include <Databases/TablesLoader.h>
 
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
@@ -43,9 +44,16 @@ static void executeCreateQuery(
     interpreter.setInternal(true);
     interpreter.setForceAttach(true);
     interpreter.setForceRestoreData(has_force_restore_data_flag);
+    interpreter.setLoadDatabaseWithoutTables(true);
     interpreter.execute();
 }
 
+static bool isSystemOrInformationSchema(const String & database_name)
+{
+    return database_name == DatabaseCatalog::SYSTEM_DATABASE ||
+           database_name == DatabaseCatalog::INFORMATION_SCHEMA ||
+           database_name == DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE;
+}
 
 static void loadDatabase(
     ContextMutablePtr context,
@@ -64,6 +72,7 @@ static void loadDatabase(
     }
     else if (fs::exists(fs::path(database_path)))
     {
+        /// TODO Remove this code (it's required for compatibility with versions older than 20.7)
         /// Database exists, but .sql file is absent. It's old-style Ordinary database (e.g. system or default)
         database_attach_query = "ATTACH DATABASE " + backQuoteIfNeed(database) + " ENGINE = Ordinary";
     }
@@ -115,7 +124,7 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
             if (fs::path(current_file).extension() == ".sql")
             {
                 String db_name = fs::path(current_file).stem();
-                if (db_name != DatabaseCatalog::SYSTEM_DATABASE)
+                if (!isSystemOrInformationSchema(db_name))
                     databases.emplace(unescapeForFileName(db_name), fs::path(path) / db_name);
             }
 
@@ -141,7 +150,7 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
         if (current_file.at(0) == '.')
             continue;
 
-        if (current_file == DatabaseCatalog::SYSTEM_DATABASE)
+        if (isSystemOrInformationSchema(current_file))
             continue;
 
         databases.emplace(unescapeForFileName(current_file), it->path().string());
@@ -152,10 +161,18 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
     bool create_default_db_if_not_exists = !default_database_name.empty();
     bool metadata_dir_for_default_db_already_exists = databases.count(default_database_name);
     if (create_default_db_if_not_exists && !metadata_dir_for_default_db_already_exists)
-        databases.emplace(default_database_name, path + "/" + escapeForFileName(default_database_name));
+        databases.emplace(default_database_name, std::filesystem::path(path) / escapeForFileName(default_database_name));
 
+    TablesLoader::Databases loaded_databases;
     for (const auto & [name, db_path] : databases)
+    {
         loadDatabase(context, name, db_path, has_force_restore_data_flag);
+        loaded_databases.insert({name, DatabaseCatalog::instance().getDatabase(name)});
+    }
+
+    TablesLoader loader{context, std::move(loaded_databases), has_force_restore_data_flag, /* force_attach */ true};
+    loader.loadTables();
+    loader.startupTables();
 
     if (has_force_restore_data_flag)
     {
@@ -170,25 +187,48 @@ void loadMetadata(ContextMutablePtr context, const String & default_database_nam
     }
 }
 
-
-void loadMetadataSystem(ContextMutablePtr context)
+static void loadSystemDatabaseImpl(ContextMutablePtr context, const String & database_name, const String & default_engine)
 {
-    String path = context->getPath() + "metadata/" + DatabaseCatalog::SYSTEM_DATABASE;
+    String path = context->getPath() + "metadata/" + database_name;
     String metadata_file = path + ".sql";
     if (fs::exists(fs::path(path)) || fs::exists(fs::path(metadata_file)))
     {
         /// 'has_force_restore_data_flag' is true, to not fail on loading query_log table, if it is corrupted.
-        loadDatabase(context, DatabaseCatalog::SYSTEM_DATABASE, path, true);
+        loadDatabase(context, database_name, path, true);
     }
     else
     {
         /// Initialize system database manually
         String database_create_query = "CREATE DATABASE ";
-        database_create_query += DatabaseCatalog::SYSTEM_DATABASE;
-        database_create_query += " ENGINE=Atomic";
-        executeCreateQuery(database_create_query, context, DatabaseCatalog::SYSTEM_DATABASE, "<no file>", true);
+        database_create_query += database_name;
+        database_create_query += " ENGINE=";
+        database_create_query += default_engine;
+        executeCreateQuery(database_create_query, context, database_name, "<no file>", true);
     }
+}
 
+
+void startupSystemTables()
+{
+    ThreadPool pool;
+    DatabaseCatalog::instance().getSystemDatabase()->startupTables(pool, /* force_restore */ true, /* force_attach */ true);
+}
+
+void loadMetadataSystem(ContextMutablePtr context)
+{
+    loadSystemDatabaseImpl(context, DatabaseCatalog::SYSTEM_DATABASE, "Atomic");
+    loadSystemDatabaseImpl(context, DatabaseCatalog::INFORMATION_SCHEMA, "Memory");
+    loadSystemDatabaseImpl(context, DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE, "Memory");
+
+    TablesLoader::Databases databases =
+    {
+        {DatabaseCatalog::SYSTEM_DATABASE, DatabaseCatalog::instance().getSystemDatabase()},
+        {DatabaseCatalog::INFORMATION_SCHEMA, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA)},
+        {DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE, DatabaseCatalog::instance().getDatabase(DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE)},
+    };
+    TablesLoader loader{context, databases, /* force_restore */ true, /* force_attach */ true};
+    loader.loadTables();
+    /// Will startup tables in system database after all databases are loaded.
 }
 
 }
diff --git a/src/Interpreters/loadMetadata.h b/src/Interpreters/loadMetadata.h
index cf038a42855..e918b5f530c 100644
--- a/src/Interpreters/loadMetadata.h
+++ b/src/Interpreters/loadMetadata.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Interpreters/Context_fwd.h>
+#include <Databases/TablesLoader.h>
 
 
 namespace DB
@@ -10,7 +11,12 @@ namespace DB
 /// You should first load system database, then attach system tables that you need into it, then load other databases.
 void loadMetadataSystem(ContextMutablePtr context);
 
-/// Load tables from databases and add them to context. Database 'system' is ignored. Use separate function to load system tables.
+/// Load tables from databases and add them to context. Database 'system' and 'information_schema' is ignored.
+/// Use separate function to load system tables.
 void loadMetadata(ContextMutablePtr context, const String & default_database_name = {});
 
+/// Background operations in system tables may slowdown loading of the rest tables,
+/// so we startup system tables after all databases are loaded.
+void startupSystemTables();
+
 }
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.cpp b/src/Interpreters/replaceAliasColumnsInQuery.cpp
index 604ba3590ae..fc6a97e2039 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.cpp
+++ b/src/Interpreters/replaceAliasColumnsInQuery.cpp
@@ -7,9 +7,13 @@ namespace DB
 {
 
 bool replaceAliasColumnsInQuery(
-    ASTPtr & ast, const ColumnsDescription & columns, const NameToNameMap & array_join_result_to_source, ContextPtr context)
+        ASTPtr & ast,
+        const ColumnsDescription & columns,
+        const NameToNameMap & array_join_result_to_source,
+        ContextPtr context,
+        const std::unordered_set<IAST *> & excluded_nodes)
 {
-    ColumnAliasesVisitor::Data aliases_column_data(columns, array_join_result_to_source, context);
+    ColumnAliasesVisitor::Data aliases_column_data(columns, array_join_result_to_source, context, excluded_nodes);
     ColumnAliasesVisitor aliases_column_visitor(aliases_column_data);
     aliases_column_visitor.visit(ast);
     return aliases_column_data.changed;
diff --git a/src/Interpreters/replaceAliasColumnsInQuery.h b/src/Interpreters/replaceAliasColumnsInQuery.h
index 5d9207ad11b..3c072c1300b 100644
--- a/src/Interpreters/replaceAliasColumnsInQuery.h
+++ b/src/Interpreters/replaceAliasColumnsInQuery.h
@@ -3,7 +3,7 @@
 #include <Core/Names.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
@@ -12,6 +12,10 @@ class ColumnsDescription;
 
 /// Replace storage alias columns in select query if possible. Return true if the query is changed.
 bool replaceAliasColumnsInQuery(
-    ASTPtr & ast, const ColumnsDescription & columns, const NameToNameMap & array_join_result_to_source, ContextPtr context);
+        ASTPtr & ast,
+        const ColumnsDescription & columns,
+        const NameToNameMap & array_join_result_to_source,
+        ContextPtr context,
+        const std::unordered_set<IAST *> & excluded_nodes = {});
 
 }
diff --git a/src/Interpreters/ya.make b/src/Interpreters/ya.make
deleted file mode 100644
index 462c778bf3d..00000000000
--- a/src/Interpreters/ya.make
+++ /dev/null
@@ -1,182 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-PEERDIR(
-    clickhouse/src/Core
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-    ActionLocksManager.cpp
-    ActionsDAG.cpp
-    ActionsVisitor.cpp
-    AggregateDescription.cpp
-    Aggregator.cpp
-    ApplyWithAliasVisitor.cpp
-    ApplyWithGlobalVisitor.cpp
-    ApplyWithSubqueryVisitor.cpp
-    ArithmeticOperationsInAgrFuncOptimize.cpp
-    ArrayJoinAction.cpp
-    AsynchronousMetricLog.cpp
-    AsynchronousMetrics.cpp
-    BloomFilter.cpp
-    CatBoostModel.cpp
-    ClientInfo.cpp
-    Cluster.cpp
-    ClusterProxy/SelectStreamFactory.cpp
-    ClusterProxy/executeQuery.cpp
-    CollectJoinOnKeysVisitor.cpp
-    ColumnAliasesVisitor.cpp
-    Context.cpp
-    ConvertStringsToEnumVisitor.cpp
-    CrashLog.cpp
-    CrossToInnerJoinVisitor.cpp
-    DDLTask.cpp
-    DDLWorker.cpp
-    DNSCacheUpdater.cpp
-    DatabaseAndTableWithAlias.cpp
-    DatabaseCatalog.cpp
-    DictionaryReader.cpp
-    EmbeddedDictionaries.cpp
-    ExecuteScalarSubqueriesVisitor.cpp
-    ExpressionActions.cpp
-    ExpressionActionsSettings.cpp
-    ExpressionAnalyzer.cpp
-    ExternalDictionariesLoader.cpp
-    ExternalLoader.cpp
-    ExternalLoaderDictionaryStorageConfigRepository.cpp
-    ExternalLoaderTempConfigRepository.cpp
-    ExternalLoaderXMLConfigRepository.cpp
-    ExternalModelsLoader.cpp
-    ExtractExpressionInfoVisitor.cpp
-    FillingRow.cpp
-    FunctionNameNormalizer.cpp
-    HashJoin.cpp
-    IExternalLoadable.cpp
-    IInterpreter.cpp
-    IInterpreterUnionOrSelectQuery.cpp
-    IdentifierSemantic.cpp
-    InJoinSubqueriesPreprocessor.cpp
-    InternalTextLogsQueue.cpp
-    InterpreterAlterQuery.cpp
-    InterpreterCheckQuery.cpp
-    InterpreterCreateQuery.cpp
-    InterpreterCreateQuotaQuery.cpp
-    InterpreterCreateRoleQuery.cpp
-    InterpreterCreateRowPolicyQuery.cpp
-    InterpreterCreateSettingsProfileQuery.cpp
-    InterpreterCreateUserQuery.cpp
-    InterpreterDescribeQuery.cpp
-    InterpreterDropAccessEntityQuery.cpp
-    InterpreterDropQuery.cpp
-    InterpreterExistsQuery.cpp
-    InterpreterExplainQuery.cpp
-    InterpreterExternalDDLQuery.cpp
-    InterpreterFactory.cpp
-    InterpreterGrantQuery.cpp
-    InterpreterInsertQuery.cpp
-    InterpreterKillQueryQuery.cpp
-    InterpreterOptimizeQuery.cpp
-    InterpreterRenameQuery.cpp
-    InterpreterSelectQuery.cpp
-    InterpreterSelectWithUnionQuery.cpp
-    InterpreterSetQuery.cpp
-    InterpreterSetRoleQuery.cpp
-    InterpreterShowAccessEntitiesQuery.cpp
-    InterpreterShowAccessQuery.cpp
-    InterpreterShowCreateAccessEntityQuery.cpp
-    InterpreterShowCreateQuery.cpp
-    InterpreterShowGrantsQuery.cpp
-    InterpreterShowPrivilegesQuery.cpp
-    InterpreterShowProcesslistQuery.cpp
-    InterpreterShowTablesQuery.cpp
-    InterpreterSystemQuery.cpp
-    InterpreterUseQuery.cpp
-    InterpreterWatchQuery.cpp
-    InterserverCredentials.cpp
-    JoinSwitcher.cpp
-    JoinToSubqueryTransformVisitor.cpp
-    JoinedTables.cpp
-    Lemmatizers.cpp
-    LogicalExpressionsOptimizer.cpp
-    MarkTableIdentifiersVisitor.cpp
-    MergeJoin.cpp
-    MetricLog.cpp
-    MutationsInterpreter.cpp
-    MySQL/InterpretersMySQLDDLQuery.cpp
-    NormalizeSelectWithUnionQueryVisitor.cpp
-    NullableUtils.cpp
-    OpenTelemetrySpanLog.cpp
-    OptimizeIfChains.cpp
-    OptimizeIfWithConstantConditionVisitor.cpp
-    OptimizeShardingKeyRewriteInVisitor.cpp
-    PartLog.cpp
-    PredicateExpressionsOptimizer.cpp
-    PredicateRewriteVisitor.cpp
-    ProcessList.cpp
-    ProfileEventsExt.cpp
-    QueryAliasesVisitor.cpp
-    QueryLog.cpp
-    QueryNormalizer.cpp
-    QueryParameterVisitor.cpp
-    QueryThreadLog.cpp
-    RemoveInjectiveFunctionsVisitor.cpp
-    RenameColumnVisitor.cpp
-    ReplaceQueryParameterVisitor.cpp
-    RequiredSourceColumnsData.cpp
-    RequiredSourceColumnsVisitor.cpp
-    RewriteAnyFunctionVisitor.cpp
-    RewriteCountVariantsVisitor.cpp
-    RewriteFunctionToSubcolumnVisitor.cpp
-    RewriteSumIfFunctionVisitor.cpp
-    RowRefs.cpp
-    Set.cpp
-    SetVariants.cpp
-    SortedBlocksWriter.cpp
-    StorageID.cpp
-    SubqueryForSet.cpp
-    SynonymsExtensions.cpp
-    SystemLog.cpp
-    TableJoin.cpp
-    TablesStatus.cpp
-    TextLog.cpp
-    ThreadStatusExt.cpp
-    TraceLog.cpp
-    TranslateQualifiedNamesVisitor.cpp
-    TreeOptimizer.cpp
-    TreeRewriter.cpp
-    WindowDescription.cpp
-    ZooKeeperLog.cpp
-    addMissingDefaults.cpp
-    addTypeConversionToAST.cpp
-    castColumn.cpp
-    convertFieldToType.cpp
-    createBlockSelector.cpp
-    evaluateConstantExpression.cpp
-    executeDDLQueryOnCluster.cpp
-    executeQuery.cpp
-    getClusterName.cpp
-    getHeaderForProcessingStage.cpp
-    getTableExpressions.cpp
-    inplaceBlockConversions.cpp
-    interpretSubquery.cpp
-    join_common.cpp
-    loadMetadata.cpp
-    processColumnTransformers.cpp
-    replaceAliasColumnsInQuery.cpp
-    sortBlock.cpp
-
-)
-
-END()
diff --git a/src/Interpreters/ya.make.in b/src/Interpreters/ya.make.in
deleted file mode 100644
index 4481f8c6136..00000000000
--- a/src/Interpreters/ya.make.in
+++ /dev/null
@@ -1,23 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-ADDINCL(
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-PEERDIR(
-    clickhouse/src/Core
-    contrib/libs/libdivide
-    contrib/libs/pdqsort
-)
-
-NO_COMPILER_WARNINGS()
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F JIT | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/NOTICE b/src/NOTICE
index d0d3efe3f8e..c68280b1529 100644
--- a/src/NOTICE
+++ b/src/NOTICE
@@ -18,9 +18,6 @@ Common/UInt128.h
 Core/Block.h
 Core/Defines.h
 Core/Settings.h
-DataStreams/PushingToViewsBlockOutputStream.cpp
-DataStreams/PushingToViewsBlockOutputStream.h
-DataStreams/copyData.cpp
 Databases/DatabasesCommon.cpp
 IO/WriteBufferValidUTF8.cpp
 Interpreters/InterpreterAlterQuery.cpp
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index d4424a60ffc..50c56c9aeff 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -1,12 +1,11 @@
-#include <Parsers/ASTAlterQuery.h>
-#include <IO/Operators.h>
 #include <iomanip>
+#include <IO/Operators.h>
+#include <Parsers/ASTAlterQuery.h>
 #include <Common/quoteString.h>
 
 
 namespace DB
 {
-
 namespace ErrorCodes
 {
     extern const int UNEXPECTED_AST_STRUCTURE;
@@ -67,42 +66,46 @@ ASTPtr ASTAlterCommand::clone() const
         res->rename_to = rename_to->clone();
         res->children.push_back(res->rename_to);
     }
+    if (comment)
+    {
+        res->comment = comment->clone();
+        res->children.push_back(res->comment);
+    }
 
     return res;
 }
 
-void ASTAlterCommand::formatImpl(
-    const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
-
     if (type == ASTAlterCommand::ADD_COLUMN)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ADD COLUMN " << (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "ADD COLUMN " << (if_not_exists ? "IF NOT EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         col_decl->formatImpl(settings, state, frame);
 
         if (first)
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " FIRST " << (settings.hilite ? hilite_none : "");
-        else if (column)    /// AFTER
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " FIRST " << (settings.hilite ? hilite_none : "");
+        else if (column) /// AFTER
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " AFTER " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " AFTER " << (settings.hilite ? hilite_none : "");
             column->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::DROP_COLUMN)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << (clear_column ? "CLEAR " : "DROP ") << "COLUMN " << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (clear_column ? "CLEAR " : "DROP ") << "COLUMN "
+                      << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
         column->formatImpl(settings, state, frame);
         if (partition)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " IN PARTITION " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
             partition->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::MODIFY_COLUMN)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY COLUMN " << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY COLUMN " << (if_exists ? "IF EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         col_decl->formatImpl(settings, state, frame);
 
         if (!remove_property.empty())
@@ -112,135 +115,156 @@ void ASTAlterCommand::formatImpl(
         else
         {
             if (first)
-                settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " FIRST " << (settings.hilite ? hilite_none : "");
-            else if (column)    /// AFTER
+                settings.ostr << (settings.hilite ? hilite_keyword : "") << " FIRST " << (settings.hilite ? hilite_none : "");
+            else if (column) /// AFTER
             {
-                settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " AFTER " << (settings.hilite ? hilite_none : "");
+                settings.ostr << (settings.hilite ? hilite_keyword : "") << " AFTER " << (settings.hilite ? hilite_none : "");
                 column->formatImpl(settings, state, frame);
             }
         }
     }
+    else if (type == ASTAlterCommand::MATERIALIZE_COLUMN)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MATERIALIZE COLUMN " << (settings.hilite ? hilite_none : "");
+        column->formatImpl(settings, state, frame);
+        if (partition)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
+            partition->formatImpl(settings, state, frame);
+        }
+    }
     else if (type == ASTAlterCommand::COMMENT_COLUMN)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "COMMENT COLUMN " << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "COMMENT COLUMN " << (if_exists ? "IF EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         column->formatImpl(settings, state, frame);
         settings.ostr << " " << (settings.hilite ? hilite_none : "");
         comment->formatImpl(settings, state, frame);
     }
+    else if (type == ASTAlterCommand::MODIFY_COMMENT)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY COMMENT" << (settings.hilite ? hilite_none : "");
+        settings.ostr << " " << (settings.hilite ? hilite_none : "");
+        comment->formatImpl(settings, state, frame);
+    }
     else if (type == ASTAlterCommand::MODIFY_ORDER_BY)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY ORDER BY " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY ORDER BY " << (settings.hilite ? hilite_none : "");
         order_by->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::MODIFY_SAMPLE_BY)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY SAMPLE BY " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY SAMPLE BY " << (settings.hilite ? hilite_none : "");
         sample_by->formatImpl(settings, state, frame);
     }
+    else if (type == ASTAlterCommand::REMOVE_SAMPLE_BY)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "REMOVE SAMPLE BY" << (settings.hilite ? hilite_none : "");
+    }
     else if (type == ASTAlterCommand::ADD_INDEX)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ADD INDEX " << (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "ADD INDEX " << (if_not_exists ? "IF NOT EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         index_decl->formatImpl(settings, state, frame);
 
         if (first)
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " FIRST " << (settings.hilite ? hilite_none : "");
-        else if (index)    /// AFTER
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " FIRST " << (settings.hilite ? hilite_none : "");
+        else if (index) /// AFTER
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " AFTER " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " AFTER " << (settings.hilite ? hilite_none : "");
             index->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::DROP_INDEX)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << (clear_index ? "CLEAR " : "DROP ") << "INDEX " << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (clear_index ? "CLEAR " : "DROP ") << "INDEX "
+                      << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
         index->formatImpl(settings, state, frame);
         if (partition)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " IN PARTITION " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
             partition->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::MATERIALIZE_INDEX)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << "MATERIALIZE INDEX " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MATERIALIZE INDEX " << (settings.hilite ? hilite_none : "");
         index->formatImpl(settings, state, frame);
         if (partition)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " IN PARTITION " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
             partition->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::ADD_CONSTRAINT)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ADD CONSTRAINT " << (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "ADD CONSTRAINT " << (if_not_exists ? "IF NOT EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         constraint_decl->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::DROP_CONSTRAINT)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << "DROP CONSTRAINT " << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "DROP CONSTRAINT " << (if_exists ? "IF EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         constraint->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::ADD_PROJECTION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ADD PROJECTION " << (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "ADD PROJECTION " << (if_not_exists ? "IF NOT EXISTS " : "")
+                      << (settings.hilite ? hilite_none : "");
         projection_decl->formatImpl(settings, state, frame);
 
         if (first)
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " FIRST " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " FIRST " << (settings.hilite ? hilite_none : "");
         else if (projection)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << " AFTER " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " AFTER " << (settings.hilite ? hilite_none : "");
             projection->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::DROP_PROJECTION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << (clear_projection ? "CLEAR " : "DROP ") << "PROJECTION " << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (clear_projection ? "CLEAR " : "DROP ") << "PROJECTION "
+                      << (if_exists ? "IF EXISTS " : "") << (settings.hilite ? hilite_none : "");
         projection->formatImpl(settings, state, frame);
         if (partition)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str<< " IN PARTITION " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
             partition->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::MATERIALIZE_PROJECTION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << "MATERIALIZE PROJECTION " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MATERIALIZE PROJECTION " << (settings.hilite ? hilite_none : "");
         projection->formatImpl(settings, state, frame);
         if (partition)
         {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str<< " IN PARTITION " << (settings.hilite ? hilite_none : "");
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
             partition->formatImpl(settings, state, frame);
         }
     }
     else if (type == ASTAlterCommand::DROP_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str
-                      << (detach ? "DETACH" : "DROP") << (part ? " PART " : " PARTITION ")
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (detach ? "DETACH" : "DROP") << (part ? " PART " : " PARTITION ")
                       << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::DROP_DETACHED_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "DROP DETACHED" << (part ? " PART " : " PARTITION ")
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "DROP DETACHED" << (part ? " PART " : " PARTITION ")
                       << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::ATTACH_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ATTACH "
-                      << (part ? "PART " : "PARTITION ") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "ATTACH " << (part ? "PART " : "PARTITION ")
+                      << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::MOVE_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MOVE "
-                      << (part ? "PART " : "PARTITION ") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MOVE " << (part ? "PART " : "PARTITION ")
+                      << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
         settings.ostr << " TO ";
         switch (move_destination_type)
@@ -258,8 +282,7 @@ void ASTAlterCommand::formatImpl(
                     settings.ostr << (settings.hilite ? hilite_identifier : "") << backQuoteIfNeed(to_database)
                                   << (settings.hilite ? hilite_none : "") << ".";
                 }
-                settings.ostr << (settings.hilite ? hilite_identifier : "")
-                              << backQuoteIfNeed(to_table)
+                settings.ostr << (settings.hilite ? hilite_identifier : "") << backQuoteIfNeed(to_table)
                               << (settings.hilite ? hilite_none : "");
                 return;
             default:
@@ -272,7 +295,7 @@ void ASTAlterCommand::formatImpl(
     }
     else if (type == ASTAlterCommand::REPLACE_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << (replace ? "REPLACE" : "ATTACH") << " PARTITION "
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (replace ? "REPLACE" : "ATTACH") << " PARTITION "
                       << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "");
@@ -285,57 +308,56 @@ void ASTAlterCommand::formatImpl(
     }
     else if (type == ASTAlterCommand::FETCH_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "FETCH "
-                      << (part ? "PART " : "PARTITION ") << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "FETCH " << (part ? "PART " : "PARTITION ")
+                      << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
-        settings.ostr << (settings.hilite ? hilite_keyword : "")
-                      << " FROM " << (settings.hilite ? hilite_none : "") << DB::quote << from;
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "") << DB::quote << from;
     }
     else if (type == ASTAlterCommand::FREEZE_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "FREEZE PARTITION " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "FREEZE PARTITION " << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
 
         if (!with_name.empty())
         {
-            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "")
-                          << " " << DB::quote << with_name;
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "") << " "
+                          << DB::quote << with_name;
         }
     }
     else if (type == ASTAlterCommand::FREEZE_ALL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "FREEZE";
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "FREEZE";
 
         if (!with_name.empty())
         {
-            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "")
-                          << " " << DB::quote << with_name;
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "") << " "
+                          << DB::quote << with_name;
         }
     }
     else if (type == ASTAlterCommand::UNFREEZE_PARTITION)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "UNFREEZE PARTITION " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "UNFREEZE PARTITION " << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
 
         if (!with_name.empty())
         {
-            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "")
-                          << " " << DB::quote << with_name;
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "") << " "
+                          << DB::quote << with_name;
         }
     }
     else if (type == ASTAlterCommand::UNFREEZE_ALL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "UNFREEZE";
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "UNFREEZE";
 
         if (!with_name.empty())
         {
-            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "")
-                          << " " << DB::quote << with_name;
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "WITH NAME" << (settings.hilite ? hilite_none : "") << " "
+                          << DB::quote << with_name;
         }
     }
     else if (type == ASTAlterCommand::DELETE)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "DELETE" << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "DELETE" << (settings.hilite ? hilite_none : "");
 
         if (partition)
         {
@@ -348,7 +370,7 @@ void ASTAlterCommand::formatImpl(
     }
     else if (type == ASTAlterCommand::UPDATE)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "UPDATE " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "UPDATE " << (settings.hilite ? hilite_none : "");
         update_assignments->formatImpl(settings, state, frame);
 
         if (partition)
@@ -362,17 +384,16 @@ void ASTAlterCommand::formatImpl(
     }
     else if (type == ASTAlterCommand::MODIFY_TTL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY TTL " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY TTL " << (settings.hilite ? hilite_none : "");
         ttl->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::REMOVE_TTL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "REMOVE TTL" << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "REMOVE TTL" << (settings.hilite ? hilite_none : "");
     }
     else if (type == ASTAlterCommand::MATERIALIZE_TTL)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MATERIALIZE TTL"
-                      << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MATERIALIZE TTL" << (settings.hilite ? hilite_none : "");
         if (partition)
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " IN PARTITION " << (settings.hilite ? hilite_none : "");
@@ -381,26 +402,32 @@ void ASTAlterCommand::formatImpl(
     }
     else if (type == ASTAlterCommand::MODIFY_SETTING)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY SETTING " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY SETTING " << (settings.hilite ? hilite_none : "");
         settings_changes->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::RESET_SETTING)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "RESET SETTING " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "RESET SETTING " << (settings.hilite ? hilite_none : "");
         settings_resets->formatImpl(settings, state, frame);
     }
+    else if (type == ASTAlterCommand::MODIFY_DATABASE_SETTING)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY SETTING " << (settings.hilite ? hilite_none : "");
+        settings_changes->formatImpl(settings, state, frame);
+    }
     else if (type == ASTAlterCommand::MODIFY_QUERY)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "MODIFY QUERY " << settings.nl_or_ws << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY QUERY " << settings.nl_or_ws
+                      << (settings.hilite ? hilite_none : "");
         select->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::LIVE_VIEW_REFRESH)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "REFRESH " << (settings.hilite ? hilite_none : "");
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "REFRESH " << (settings.hilite ? hilite_none : "");
     }
     else if (type == ASTAlterCommand::RENAME_COLUMN)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "RENAME COLUMN " << (if_exists ? "IF EXISTS " : "")
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "RENAME COLUMN " << (if_exists ? "IF EXISTS " : "")
                       << (settings.hilite ? hilite_none : "");
         column->formatImpl(settings, state, frame);
 
@@ -439,6 +466,22 @@ bool ASTAlterQuery::isFreezeAlter() const
         || isOneCommandTypeOnly(ASTAlterCommand::UNFREEZE_PARTITION) || isOneCommandTypeOnly(ASTAlterCommand::UNFREEZE_ALL);
 }
 
+bool ASTAlterQuery::isAttachAlter() const
+{
+    return isOneCommandTypeOnly(ASTAlterCommand::ATTACH_PARTITION);
+}
+
+bool ASTAlterQuery::isFetchAlter() const
+{
+    return isOneCommandTypeOnly(ASTAlterCommand::FETCH_PARTITION);
+}
+
+bool ASTAlterQuery::isDropPartitionAlter() const
+{
+    return isOneCommandTypeOnly(ASTAlterCommand::DROP_PARTITION) || isOneCommandTypeOnly(ASTAlterCommand::DROP_DETACHED_PARTITION);
+}
+
+
 /** Get the text that identifies this element. */
 String ASTAlterQuery::getID(char delim) const
 {
@@ -461,11 +504,24 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
     frame.need_parens = false;
 
     std::string indent_str = settings.one_line ? "" : std::string(4u * frame.indent, ' ');
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str;
 
-    if (is_live_view)
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ALTER LIVE VIEW " << (settings.hilite ? hilite_none : "");
-    else
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << "ALTER TABLE " << (settings.hilite ? hilite_none : "");
+    switch (alter_object)
+    {
+        case AlterObjectType::TABLE:
+            settings.ostr << "ALTER TABLE ";
+            break;
+        case AlterObjectType::DATABASE:
+            settings.ostr << "ALTER DATABASE ";
+            break;
+        case AlterObjectType::LIVE_VIEW:
+            settings.ostr << "ALTER LIVE VIEW ";
+            break;
+        default:
+            break;
+    }
+
+    settings.ostr << (settings.hilite ? hilite_none : "");
 
     if (!table.empty())
     {
@@ -476,13 +532,17 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
         }
         settings.ostr << indent_str << backQuoteIfNeed(table);
     }
+    else if (alter_object == AlterObjectType::DATABASE && !database.empty())
+    {
+        settings.ostr << indent_str << backQuoteIfNeed(database);
+    }
+
     formatOnCluster(settings);
-    settings.ostr << settings.nl_or_ws;
 
     FormatStateStacked frame_nested = frame;
     frame_nested.need_parens = false;
-    ++frame_nested.indent;
-    static_cast<IAST *>(command_list)->formatImpl(settings, state, frame_nested);
+    frame_nested.expression_list_always_start_on_new_line = true;
+    static_cast<ASTExpressionList *>(command_list)->formatImplMultiline(settings, state, frame_nested);
 }
 
 }
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index 0fd6d2805ea..b0980c20f5e 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -31,6 +31,8 @@ public:
         MODIFY_COLUMN,
         COMMENT_COLUMN,
         RENAME_COLUMN,
+        MATERIALIZE_COLUMN,
+
         MODIFY_ORDER_BY,
         MODIFY_SAMPLE_BY,
         MODIFY_TTL,
@@ -39,6 +41,7 @@ public:
         RESET_SETTING,
         MODIFY_QUERY,
         REMOVE_TTL,
+        REMOVE_SAMPLE_BY,
 
         ADD_INDEX,
         DROP_INDEX,
@@ -68,6 +71,10 @@ public:
         NO_TYPE,
 
         LIVE_VIEW_REFRESH,
+
+        MODIFY_DATABASE_SETTING,
+
+        MODIFY_COMMENT,
     };
 
     Type type = NO_TYPE;
@@ -208,7 +215,15 @@ protected:
 class ASTAlterQuery : public ASTQueryWithTableAndOutput, public ASTQueryWithOnCluster
 {
 public:
-    bool is_live_view{false}; /// true for ALTER LIVE VIEW
+    enum class AlterObjectType
+    {
+        TABLE,
+        DATABASE,
+        LIVE_VIEW,
+        UNKNOWN,
+    };
+
+    AlterObjectType alter_object = AlterObjectType::UNKNOWN;
 
     ASTExpressionList * command_list = nullptr;
 
@@ -216,6 +231,12 @@ public:
 
     bool isFreezeAlter() const;
 
+    bool isAttachAlter() const;
+
+    bool isFetchAlter() const;
+
+    bool isDropPartitionAlter() const;
+
     String getID(char) const override;
 
     ASTPtr clone() const override;
diff --git a/src/Parsers/ASTBackupQuery.cpp b/src/Parsers/ASTBackupQuery.cpp
new file mode 100644
index 00000000000..e3a6287c72a
--- /dev/null
+++ b/src/Parsers/ASTBackupQuery.cpp
@@ -0,0 +1,130 @@
+#include <Parsers/ASTBackupQuery.h>
+#include <IO/Operators.h>
+#include <Common/quoteString.h>
+
+
+namespace DB
+{
+namespace
+{
+    using Kind = ASTBackupQuery::Kind;
+    using Element = ASTBackupQuery::Element;
+    using ElementType = ASTBackupQuery::ElementType;
+
+    void formatName(const DatabaseAndTableName & name, ElementType type, const IAST::FormatSettings & format)
+    {
+        switch (type)
+        {
+            case ElementType::TABLE: [[fallthrough]];
+            case ElementType::DICTIONARY:
+            {
+                format.ostr << " ";
+                if (!name.first.empty())
+                    format.ostr << backQuoteIfNeed(name.first) << ".";
+                format.ostr << backQuoteIfNeed(name.second);
+                break;
+            }
+            case ElementType::DATABASE:
+            {
+                format.ostr << " " << backQuoteIfNeed(name.first);
+                break;
+            }
+            case ElementType::TEMPORARY_TABLE:
+            {
+                format.ostr << " " << backQuoteIfNeed(name.second);
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    void formatPartitions(const ASTs & partitions, const IAST::FormatSettings & format)
+    {
+        if (partitions.empty())
+            return;
+        format.ostr << (format.hilite ? IAST::hilite_keyword : "") << " " << ((partitions.size() == 1) ? "PARTITION" : "PARTITIONS") << " "
+                    << (format.hilite ? IAST::hilite_none : "");
+        bool need_comma = false;
+        for (const auto & partition : partitions)
+        {
+            if (std::exchange(need_comma, true))
+                format.ostr << ",";
+            format.ostr << " ";
+            partition->format(format);
+        }
+    }
+
+    void formatElement(const Element & element, Kind kind, const IAST::FormatSettings & format)
+    {
+        format.ostr << (format.hilite ? IAST::hilite_keyword : "") << " ";
+        switch (element.type)
+        {
+            case ElementType::TABLE: format.ostr << "TABLE"; break;
+            case ElementType::DICTIONARY: format.ostr << "DICTIONARY"; break;
+            case ElementType::DATABASE: format.ostr << "DATABASE"; break;
+            case ElementType::ALL_DATABASES: format.ostr << "ALL DATABASES"; break;
+            case ElementType::TEMPORARY_TABLE: format.ostr << "TEMPORARY TABLE"; break;
+            case ElementType::ALL_TEMPORARY_TABLES: format.ostr << "ALL TEMPORARY TABLES"; break;
+            case ElementType::EVERYTHING: format.ostr << "EVERYTHING"; break;
+        }
+        format.ostr << (format.hilite ? IAST::hilite_none : "");
+
+        formatName(element.name, element.type, format);
+
+        bool under_another_name = !element.new_name.first.empty() || !element.new_name.second.empty();
+        if (under_another_name)
+        {
+            format.ostr << (format.hilite ? IAST::hilite_keyword : "") << " " << ((kind == Kind::BACKUP) ? "AS" : "INTO")
+                        << (format.hilite ? IAST::hilite_none : "");
+            formatName(element.new_name, element.type, format);
+        }
+
+        formatPartitions(element.partitions, format);
+    }
+
+    void formatElements(const std::vector<Element> & elements, Kind kind, const IAST::FormatSettings & format)
+    {
+        bool need_comma = false;
+        for (const auto & element : elements)
+        {
+            if (std::exchange(need_comma, true))
+                format.ostr << ",";
+            formatElement(element, kind, format);
+        }
+    }
+
+    void formatSettings(const IAST & settings, const IAST::FormatSettings & format)
+    {
+        format.ostr << (format.hilite ? IAST::hilite_keyword : "") << " SETTINGS " << (format.hilite ? IAST::hilite_none : "");
+        settings.format(format);
+    }
+}
+
+String ASTBackupQuery::getID(char) const
+{
+    return (kind == Kind::BACKUP) ? "BackupQuery" : "RestoreQuery";
+}
+
+
+ASTPtr ASTBackupQuery::clone() const
+{
+    return std::make_shared<ASTBackupQuery>(*this);
+}
+
+
+void ASTBackupQuery::formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const
+{
+    format.ostr << (format.hilite ? hilite_keyword : "") << ((kind == Kind::BACKUP) ? "BACKUP" : "RESTORE")
+                << (format.hilite ? hilite_none : "");
+
+    formatElements(elements, kind, format);
+
+    if (settings)
+        formatSettings(*settings, format);
+
+    format.ostr << (format.hilite ? hilite_keyword : "") << ((kind == Kind::BACKUP) ? " TO" : " FROM") << (format.hilite ? hilite_none : "");
+    format.ostr << " " << quoteString(backup_name);
+}
+
+}
diff --git a/src/Parsers/ASTBackupQuery.h b/src/Parsers/ASTBackupQuery.h
new file mode 100644
index 00000000000..8bcef0c804d
--- /dev/null
+++ b/src/Parsers/ASTBackupQuery.h
@@ -0,0 +1,87 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+
+
+namespace DB
+{
+using Strings = std::vector<String>;
+using DatabaseAndTableName = std::pair<String, String>;
+
+
+/** BACKUP { TABLE [db.]table_name [AS [db.]table_name_in_backup] [PARTITION[S] partition_expr [,...]] |
+  *          DICTIONARY [db.]dictionary_name [AS [db.]dictionary_name_in_backup] |
+  *          DATABASE database_name [AS database_name_in_backup] |
+  *          ALL DATABASES |
+  *          TEMPORARY TABLE table_name [AS table_name_in_backup]
+  *          ALL TEMPORARY TABLES |
+  *          EVERYTHING } [,...]
+  *        TO 'backup_name'
+  *        SETTINGS base_backup='base_backup_name'
+  *
+  * RESTORE { TABLE [db.]table_name_in_backup [INTO [db.]table_name] [PARTITION[S] partition_expr [,...]] |
+  *           DICTIONARY [db.]dictionary_name_in_backup [INTO [db.]dictionary_name] |
+  *           DATABASE database_name_in_backup [INTO database_name] |
+  *           ALL DATABASES |
+  *           TEMPORARY TABLE table_name_in_backup [INTO table_name] |
+  *           ALL TEMPORARY TABLES |
+  *           EVERYTHING } [,...]
+  *         FROM 'backup_name'
+  *
+  * Notes:
+  * RESTORE doesn't drop any data, it either creates a table or appends an existing table with restored data.
+  * This behaviour can cause data duplication.
+  * If appending isn't possible because the existing table has incompatible format then RESTORE will throw an exception.
+  *
+  * The "UNDER NAME" clause is useful to backup or restore under another name.
+  * For the BACKUP command this clause allows to set the name which an object will have inside the backup.
+  * And for the RESTORE command this clause allows to set the name which an object will have after RESTORE has finished.
+  *
+  * "ALL DATABASES" means all databases except the system database and the internal database containing temporary tables.
+  * "EVERYTHING" works exactly as "ALL DATABASES, ALL TEMPORARY TABLES"
+  *
+  * The "WITH BASE" clause allows to set a base backup. Only differences made after the base backup will be
+  * included in a newly created backup, so this option allows to make an incremental backup.
+  */
+class ASTBackupQuery : public IAST
+{
+public:
+    enum Kind
+    {
+        BACKUP,
+        RESTORE,
+    };
+    Kind kind = Kind::BACKUP;
+
+    enum ElementType
+    {
+        TABLE,
+        DICTIONARY,
+        DATABASE,
+        ALL_DATABASES,
+        TEMPORARY_TABLE,
+        ALL_TEMPORARY_TABLES,
+        EVERYTHING,
+    };
+
+    struct Element
+    {
+        ElementType type;
+        DatabaseAndTableName name;
+        DatabaseAndTableName new_name;
+        ASTs partitions;
+        std::set<String> except_list;
+    };
+
+    using Elements = std::vector<Element>;
+    Elements elements;
+
+    String backup_name;
+
+    ASTPtr settings;
+
+    String getID(char) const override;
+    ASTPtr clone() const override;
+    void formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const override;
+};
+}
diff --git a/src/Parsers/ASTColumnsTransformers.cpp b/src/Parsers/ASTColumnsTransformers.cpp
index 359efbd03aa..451ecf0d4dd 100644
--- a/src/Parsers/ASTColumnsTransformers.cpp
+++ b/src/Parsers/ASTColumnsTransformers.cpp
@@ -7,6 +7,7 @@
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
 #include <re2/re2.h>
+#include <stack>
 
 
 namespace DB
@@ -40,10 +41,18 @@ void ASTColumnsApplyTransformer::formatImpl(const FormatSettings & settings, For
 
     if (!column_name_prefix.empty())
         settings.ostr << "(";
-    settings.ostr << func_name;
 
-    if (parameters)
-        parameters->formatImpl(settings, state, frame);
+    if (lambda)
+    {
+        lambda->formatImpl(settings, state, frame);
+    }
+    else
+    {
+        settings.ostr << func_name;
+
+        if (parameters)
+            parameters->formatImpl(settings, state, frame);
+    }
 
     if (!column_name_prefix.empty())
         settings.ostr << ", '" << column_name_prefix << "')";
@@ -64,9 +73,33 @@ void ASTColumnsApplyTransformer::transform(ASTs & nodes) const
             else
                 name = column->getColumnName();
         }
-        auto function = makeASTFunction(func_name, column);
-        function->parameters = parameters;
-        column = function;
+        if (lambda)
+        {
+            auto body = lambda->as<const ASTFunction &>().arguments->children.at(1)->clone();
+            std::stack<ASTPtr> stack;
+            stack.push(body);
+            while (!stack.empty())
+            {
+                auto ast = stack.top();
+                stack.pop();
+                for (auto & child : ast->children)
+                {
+                    if (auto arg_name = tryGetIdentifierName(child); arg_name && arg_name == lambda_arg)
+                    {
+                        child = column->clone();
+                        continue;
+                    }
+                    stack.push(child);
+                }
+            }
+            column = body;
+        }
+        else
+        {
+            auto function = makeASTFunction(func_name, column);
+            function->parameters = parameters;
+            column = function;
+        }
         if (!column_name_prefix.empty())
             column->setAlias(column_name_prefix + name);
     }
diff --git a/src/Parsers/ASTColumnsTransformers.h b/src/Parsers/ASTColumnsTransformers.h
index 49d29222f02..1064beb44bd 100644
--- a/src/Parsers/ASTColumnsTransformers.h
+++ b/src/Parsers/ASTColumnsTransformers.h
@@ -25,13 +25,22 @@ public:
         auto res = std::make_shared<ASTColumnsApplyTransformer>(*this);
         if (parameters)
             res->parameters = parameters->clone();
+        if (lambda)
+            res->lambda = lambda->clone();
         return res;
     }
     void transform(ASTs & nodes) const override;
+
+    // Case 1  APPLY (quantile(0.9))
     String func_name;
-    String column_name_prefix;
     ASTPtr parameters;
 
+    // Case 2 APPLY (x -> quantile(0.9)(x))
+    ASTPtr lambda;
+    String lambda_arg;
+
+    String column_name_prefix;
+
 protected:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
 };
diff --git a/src/Parsers/ASTCreateFunctionQuery.cpp b/src/Parsers/ASTCreateFunctionQuery.cpp
new file mode 100644
index 00000000000..9209b1f1869
--- /dev/null
+++ b/src/Parsers/ASTCreateFunctionQuery.cpp
@@ -0,0 +1,38 @@
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+
+
+namespace DB
+{
+
+ASTPtr ASTCreateFunctionQuery::clone() const
+{
+    return std::make_shared<ASTCreateFunctionQuery>(*this);
+}
+
+void ASTCreateFunctionQuery::formatImpl(const IAST::FormatSettings & settings, IAST::FormatState & state, IAST::FormatStateStacked frame) const
+{
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "CREATE ";
+
+    if (or_replace)
+        settings.ostr << "OR REPLACE ";
+
+    settings.ostr << "FUNCTION ";
+
+    if (if_not_exists)
+        settings.ostr << "IF NOT EXISTS ";
+
+    settings.ostr << (settings.hilite ? hilite_none : "");
+
+    settings.ostr << (settings.hilite ? hilite_identifier : "") << backQuoteIfNeed(function_name) << (settings.hilite ? hilite_none : "");
+
+    formatOnCluster(settings);
+
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS " << (settings.hilite ? hilite_none : "");
+    function_core->formatImpl(settings, state, frame);
+}
+
+}
diff --git a/src/Parsers/ASTCreateFunctionQuery.h b/src/Parsers/ASTCreateFunctionQuery.h
new file mode 100644
index 00000000000..fccc1837135
--- /dev/null
+++ b/src/Parsers/ASTCreateFunctionQuery.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOnCluster.h>
+
+
+namespace DB
+{
+
+class ASTCreateFunctionQuery : public IAST, public ASTQueryWithOnCluster
+{
+public:
+    String function_name;
+    ASTPtr function_core;
+
+    bool or_replace = false;
+    bool if_not_exists = false;
+
+    String getID(char) const override { return "CreateFunctionQuery"; }
+
+    ASTPtr clone() const override;
+
+    void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+
+    ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTCreateFunctionQuery>(clone()); }
+};
+
+}
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index be973a988bd..2c048886247 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -32,9 +32,6 @@ ASTPtr ASTStorage::clone() const
     if (settings)
         res->set(res->settings, settings->clone());
 
-    if (comment)
-        res->set(res->comment, comment->clone());
-
     return res;
 }
 
@@ -75,12 +72,6 @@ void ASTStorage::formatImpl(const FormatSettings & s, FormatState & state, Forma
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << "SETTINGS " << (s.hilite ? hilite_none : "");
         settings->formatImpl(s, state, frame);
     }
-    if (comment)
-    {
-        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << "COMMENT " << (s.hilite ? hilite_none : "");
-        comment->formatImpl(s, state, frame);
-    }
-
 }
 
 
@@ -217,6 +208,9 @@ ASTPtr ASTCreateQuery::clone() const
         res->set(res->dictionary, dictionary->clone());
     }
 
+    if (comment)
+        res->set(res->comment, comment->clone());
+
     cloneOutputOptions(*res);
 
     return res;
@@ -245,6 +239,12 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
         if (storage)
             storage->formatImpl(settings, state, frame);
 
+        if (comment)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << settings.nl_or_ws << "COMMENT " << (settings.hilite ? hilite_none : "");
+            comment->formatImpl(settings, state, frame);
+        }
+
         return;
     }
 
@@ -405,6 +405,12 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH " << (settings.hilite ? hilite_none : "");
         tables->formatImpl(settings, state, frame);
     }
+
+    if (comment)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << settings.nl_or_ws << "COMMENT " << (settings.hilite ? hilite_none : "");
+        comment->formatImpl(settings, state, frame);
+    }
 }
 
 }
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index e4f2b628886..51c4ac15e67 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -23,7 +23,6 @@ public:
     IAST * order_by = nullptr;
     IAST * sample_by = nullptr;
     IAST * ttl_table = nullptr;
-    IAST * comment = nullptr;
     ASTSetQuery * settings = nullptr;
 
 
@@ -75,6 +74,7 @@ public:
     String as_table;
     ASTPtr as_table_function;
     ASTSelectWithUnionQuery * select = nullptr;
+    IAST * comment = nullptr;
 
     bool is_dictionary{false}; /// CREATE DICTIONARY
     ASTExpressionList * dictionary_attributes_list = nullptr; /// attributes of
diff --git a/src/Parsers/ASTCreateQuotaQuery.cpp b/src/Parsers/ASTCreateQuotaQuery.cpp
index d967498e573..135b25c5bdb 100644
--- a/src/Parsers/ASTCreateQuotaQuery.cpp
+++ b/src/Parsers/ASTCreateQuotaQuery.cpp
@@ -2,7 +2,7 @@
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Common/quoteString.h>
 #include <Common/IntervalKind.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <IO/Operators.h>
 
 
diff --git a/src/Parsers/ASTCreateRowPolicyQuery.cpp b/src/Parsers/ASTCreateRowPolicyQuery.cpp
index 2f3d96dbf69..6aac008e0be 100644
--- a/src/Parsers/ASTCreateRowPolicyQuery.cpp
+++ b/src/Parsers/ASTCreateRowPolicyQuery.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Parsers/formatAST.h>
 #include <Common/quoteString.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm/transform.hpp>
 #include <IO/Operators.h>
 
diff --git a/src/Parsers/ASTDatabaseOrNone.cpp b/src/Parsers/ASTDatabaseOrNone.cpp
index f93322ef00c..0a0c800ff36 100644
--- a/src/Parsers/ASTDatabaseOrNone.cpp
+++ b/src/Parsers/ASTDatabaseOrNone.cpp
@@ -1,4 +1,5 @@
 #include <Parsers/ASTDatabaseOrNone.h>
+#include <Common/quoteString.h>
 #include <IO/Operators.h>
 
 namespace DB
@@ -10,7 +11,7 @@ void ASTDatabaseOrNone::formatImpl(const FormatSettings & settings, FormatState
         settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << "NONE" << (settings.hilite ? IAST::hilite_none : "");
         return;
     }
-    settings.ostr << database_name;
+    settings.ostr << backQuoteIfNeed(database_name);
 }
 
 }
diff --git a/src/Parsers/ASTDropFunctionQuery.cpp b/src/Parsers/ASTDropFunctionQuery.cpp
new file mode 100644
index 00000000000..3409d699042
--- /dev/null
+++ b/src/Parsers/ASTDropFunctionQuery.cpp
@@ -0,0 +1,25 @@
+#include <Parsers/ASTDropFunctionQuery.h>
+#include <Common/quoteString.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+
+ASTPtr ASTDropFunctionQuery::clone() const
+{
+    return std::make_shared<ASTDropFunctionQuery>(*this);
+}
+
+void ASTDropFunctionQuery::formatImpl(const IAST::FormatSettings & settings, IAST::FormatState &, IAST::FormatStateStacked) const
+{
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "DROP FUNCTION ";
+
+    if (if_exists)
+        settings.ostr << "IF EXISTS ";
+
+    settings.ostr << (settings.hilite ? hilite_none : "");
+    settings.ostr << (settings.hilite ? hilite_identifier : "") << backQuoteIfNeed(function_name) << (settings.hilite ? hilite_none : "");
+    formatOnCluster(settings);
+}
+
+}
diff --git a/src/Parsers/ASTDropFunctionQuery.h b/src/Parsers/ASTDropFunctionQuery.h
new file mode 100644
index 00000000000..c9f673578a9
--- /dev/null
+++ b/src/Parsers/ASTDropFunctionQuery.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOnCluster.h>
+
+
+namespace DB
+{
+
+class ASTDropFunctionQuery : public IAST, public ASTQueryWithOnCluster
+{
+public:
+    String function_name;
+
+    bool if_exists = false;
+
+    String getID(char) const override { return "DropFunctionQuery"; }
+
+    ASTPtr clone() const override;
+
+    void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+
+    ASTPtr getRewrittenASTWithoutOnCluster(const std::string &) const override { return removeOnCluster<ASTDropFunctionQuery>(clone()); }
+};
+
+}
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index daae3e76aa1..e1a62dc9dce 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -4,6 +4,7 @@
 #include <Common/FieldVisitorToString.h>
 #include <Common/SipHash.h>
 #include <Common/typeid_cast.h>
+#include <DataTypes/IDataType.h>
 #include <DataTypes/NumberTraits.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
@@ -13,6 +14,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTWithAlias.h>
+#include <Parsers/queryToString.h>
 
 
 namespace DB
@@ -21,19 +23,10 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNEXPECTED_EXPRESSION;
+    extern const int UNEXPECTED_AST_STRUCTURE;
 }
 
 void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr) const
-{
-    appendColumnNameImpl(ostr, nullptr);
-}
-
-void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr, const Settings & settings) const
-{
-    appendColumnNameImpl(ostr, &settings);
-}
-
-void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr, const Settings * settings) const
 {
     if (name == "view")
         throw Exception("Table function view cannot be used as an expression", ErrorCodes::UNEXPECTED_EXPRESSION);
@@ -48,10 +41,7 @@ void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr, const Settings * sett
             if (it != parameters->children.begin())
                 writeCString(", ", ostr);
 
-            if (settings)
-                (*it)->appendColumnName(ostr, *settings);
-            else
-                (*it)->appendColumnName(ostr);
+            (*it)->appendColumnName(ostr);
         }
         writeChar(')', ostr);
     }
@@ -64,10 +54,7 @@ void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr, const Settings * sett
             if (it != arguments->children.begin())
                 writeCString(", ", ostr);
 
-            if (settings)
-                (*it)->appendColumnName(ostr, *settings);
-            else
-                (*it)->appendColumnName(ostr);
+            (*it)->appendColumnName(ostr);
         }
     }
 
@@ -231,16 +218,19 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
         settings.ostr << nl_or_nothing << indent_str << ")";
         return;
     }
+
     /// Should this function to be written as operator?
     bool written = false;
+
     if (arguments && !parameters)
     {
+        /// Unary prefix operators.
         if (arguments->children.size() == 1)
         {
             const char * operators[] =
             {
-                "negate", "-",
-                "not", "NOT ",
+                "negate",      "-",
+                "not",         "NOT ",
                 nullptr
             };
 
@@ -254,8 +244,11 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                 const auto * literal = arguments->children[0]->as<ASTLiteral>();
                 const auto * function = arguments->children[0]->as<ASTFunction>();
                 bool negate = name == "negate";
+                bool is_tuple = literal && literal->value.getType() == Field::Types::Tuple;
+                // do not add parentheses for tuple literal, otherwise extra parens will be added `-((3, 7, 3), 1)` -> `-(((3, 7, 3), 1))`
+                bool literal_need_parens = literal && !is_tuple;
                 // negate always requires parentheses, otherwise -(-1) will be printed as --1
-                bool negate_need_parens = negate && (literal || (function && function->name == "negate"));
+                bool negate_need_parens = negate && (literal_need_parens || (function && function->name == "negate"));
                 // We don't need parentheses around a single literal.
                 bool need_parens = !literal && frame.need_parens && !negate_need_parens;
 
@@ -284,6 +277,36 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
             }
         }
 
+        /// Unary postfix operators.
+        if (!written && arguments->children.size() == 1)
+        {
+            const char * operators[] =
+            {
+                "isNull",          " IS NULL",
+                "isNotNull",       " IS NOT NULL",
+                nullptr
+            };
+
+            for (const char ** func = operators; *func; func += 2)
+            {
+                if (strcasecmp(name.c_str(), func[0]) != 0)
+                {
+                    continue;
+                }
+
+                if (frame.need_parens)
+                    settings.ostr << '(';
+                arguments->formatImpl(settings, state, nested_need_parens);
+                settings.ostr << (settings.hilite ? hilite_operator : "") << func[1] << (settings.hilite ? hilite_none : "");
+                if (frame.need_parens)
+                    settings.ostr << ')';
+
+                written = true;
+
+                break;
+            }
+        }
+
         /** need_parens - do we need parentheses around the expression with the operator.
           * They are needed only if this expression is included in another expression with the operator.
           */
@@ -421,6 +444,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
             if (!written && 0 == strcmp(name.c_str(), "lambda"))
             {
+                /// Special case: zero elements tuple in lhs of lambda is printed as ().
                 /// Special case: one-element tuple in lhs of lambda is printed as its element.
 
                 if (frame.need_parens)
@@ -430,9 +454,12 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                 if (first_arg_func
                     && first_arg_func->name == "tuple"
                     && first_arg_func->arguments
-                    && first_arg_func->arguments->children.size() == 1)
+                    && (first_arg_func->arguments->children.size() == 1 || first_arg_func->arguments->children.empty()))
                 {
-                    first_arg_func->arguments->children[0]->formatImpl(settings, state, nested_need_parens);
+                    if (first_arg_func->arguments->children.size() == 1)
+                        first_arg_func->arguments->children[0]->formatImpl(settings, state, nested_need_parens);
+                    else
+                        settings.ostr << "()";
                 }
                 else
                     arguments->children[0]->formatImpl(settings, state, nested_need_parens);
@@ -573,4 +600,33 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
     }
 }
 
+String getFunctionName(const IAST * ast)
+{
+    String res;
+    if (tryGetFunctionNameInto(ast, res))
+        return res;
+    throw Exception(ast ? queryToString(*ast) + " is not an function" : "AST node is nullptr", ErrorCodes::UNEXPECTED_AST_STRUCTURE);
+}
+
+std::optional<String> tryGetFunctionName(const IAST * ast)
+{
+    String res;
+    if (tryGetFunctionNameInto(ast, res))
+        return res;
+    return {};
+}
+
+bool tryGetFunctionNameInto(const IAST * ast, String & name)
+{
+    if (ast)
+    {
+        if (const auto * node = ast->as<ASTFunction>())
+        {
+            name = node->name;
+            return true;
+        }
+    }
+    return false;
+}
+
 }
diff --git a/src/Parsers/ASTFunction.h b/src/Parsers/ASTFunction.h
index 8e657afbf6e..ec49ee180ba 100644
--- a/src/Parsers/ASTFunction.h
+++ b/src/Parsers/ASTFunction.h
@@ -54,10 +54,6 @@ public:
 protected:
     void formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
     void appendColumnNameImpl(WriteBuffer & ostr) const override;
-    void appendColumnNameImpl(WriteBuffer & ostr, const Settings & settings) const override;
-
-private:
-    void appendColumnNameImpl(WriteBuffer & ostr, const Settings * settings) const;
 };
 
 
@@ -75,4 +71,14 @@ std::shared_ptr<ASTFunction> makeASTFunction(const String & name, Args &&... arg
     return function;
 }
 
+/// ASTFunction Helpers: hide casts and semantic.
+
+String getFunctionName(const IAST * ast);
+std::optional<String> tryGetFunctionName(const IAST * ast);
+bool tryGetFunctionNameInto(const IAST * ast, String & name);
+
+inline String getFunctionName(const ASTPtr & ast) { return getFunctionName(ast.get()); }
+inline std::optional<String> tryGetFunctionName(const ASTPtr & ast) { return tryGetFunctionName(ast.get()); }
+inline bool tryGetFunctionNameInto(const ASTPtr & ast, String & name) { return tryGetFunctionNameInto(ast.get(), name); }
+
 }
diff --git a/src/Parsers/ASTFunctionWithKeyValueArguments.h b/src/Parsers/ASTFunctionWithKeyValueArguments.h
index f5eaa33bfc7..5820e8564ac 100644
--- a/src/Parsers/ASTFunctionWithKeyValueArguments.h
+++ b/src/Parsers/ASTFunctionWithKeyValueArguments.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Parsers/ASTHelpers.h b/src/Parsers/ASTHelpers.h
new file mode 100644
index 00000000000..086b361bf85
--- /dev/null
+++ b/src/Parsers/ASTHelpers.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <Parsers/ASTFunction.h>
+
+
+namespace DB
+{
+
+static inline bool isFunctionCast(const ASTFunction * function)
+{
+    if (function)
+        return function->name == "CAST" || function->name == "_CAST";
+    return false;
+}
+
+
+}
diff --git a/src/Parsers/ASTInsertQuery.cpp b/src/Parsers/ASTInsertQuery.cpp
index 8bfd3ccf1f2..3c8c31b85dd 100644
--- a/src/Parsers/ASTInsertQuery.cpp
+++ b/src/Parsers/ASTInsertQuery.cpp
@@ -1,6 +1,7 @@
 #include <iomanip>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
 #include <Common/quoteString.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
@@ -24,6 +25,11 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << "FUNCTION ";
         table_function->formatImpl(settings, state, frame);
+        if (partition_by)
+        {
+            settings.ostr << " PARTITION BY ";
+            partition_by->formatImpl(settings, state, frame);
+        }
     }
     else
         settings.ostr << (settings.hilite ? hilite_none : "")
@@ -48,11 +54,17 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
     }
     else
     {
+        if (infile)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM INFILE " << (settings.hilite ? hilite_none : "") << infile->as<ASTLiteral &>().value.safeGet<std::string>();
+            if (compression)
+                settings.ostr << (settings.hilite ? hilite_keyword : "") << " COMPRESSION " << (settings.hilite ? hilite_none : "") << compression->as<ASTLiteral &>().value.safeGet<std::string>();
+        }
         if (!format.empty())
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " FORMAT " << (settings.hilite ? hilite_none : "") << format;
         }
-        else
+        else if (!infile)
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " VALUES" << (settings.hilite ? hilite_none : "");
         }
@@ -65,6 +77,15 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
     }
 }
 
+void ASTInsertQuery::updateTreeHashImpl(SipHash & hash_state) const
+{
+    hash_state.update(table_id.database_name);
+    hash_state.update(table_id.table_name);
+    hash_state.update(table_id.uuid);
+    hash_state.update(format);
+    IAST::updateTreeHashImpl(hash_state);
+}
+
 
 static void tryFindInputFunctionImpl(const ASTPtr & ast, ASTPtr & input_function)
 {
diff --git a/src/Parsers/ASTInsertQuery.h b/src/Parsers/ASTInsertQuery.h
index a454f46c3f1..81925ec2e66 100644
--- a/src/Parsers/ASTInsertQuery.h
+++ b/src/Parsers/ASTInsertQuery.h
@@ -1,31 +1,37 @@
 #pragma once
 
-#include <Parsers/IAST.h>
 #include <Interpreters/StorageID.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
 
+class ReadBuffer;
 
-/** INSERT query
-  */
+/// INSERT query
 class ASTInsertQuery : public IAST
 {
 public:
     StorageID table_id = StorageID::createEmpty();
     ASTPtr columns;
     String format;
-    ASTPtr select;
-    ASTPtr watch;
     ASTPtr table_function;
+    ASTPtr partition_by;
     ASTPtr settings_ast;
 
-    /// Data to insert
+    ASTPtr select;
+    ASTPtr watch;
+    ASTPtr infile;
+    ASTPtr compression;
+
+    /// Data inlined into query
     const char * data = nullptr;
     const char * end = nullptr;
 
-    /// Query has additional data, which will be sent later
-    bool has_tail = false;
+    /// Data from buffer to insert after inlined one - may be nullptr.
+    ReadBuffer * tail = nullptr;
+
+    bool hasInlinedData() const { return data || tail; }
 
     /// Try to find table function input() in SELECT part
     void tryFindInputFunction(ASTPtr & input_function) const;
@@ -42,6 +48,7 @@ public:
         if (select) { res->select = select->clone(); res->children.push_back(res->select); }
         if (watch) { res->watch = watch->clone(); res->children.push_back(res->watch); }
         if (table_function) { res->table_function = table_function->clone(); res->children.push_back(res->table_function); }
+        if (partition_by) { res->partition_by = partition_by->clone(); res->children.push_back(res->partition_by); }
         if (settings_ast) { res->settings_ast = settings_ast->clone(); res->children.push_back(res->settings_ast); }
 
         return res;
@@ -51,6 +58,7 @@ public:
 
 protected:
     void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+    void updateTreeHashImpl(SipHash & hash_state) const override;
 };
 
 }
diff --git a/src/Parsers/ASTKillQueryQuery.cpp b/src/Parsers/ASTKillQueryQuery.cpp
index 72bdd7d6b0b..71c3011dd2c 100644
--- a/src/Parsers/ASTKillQueryQuery.cpp
+++ b/src/Parsers/ASTKillQueryQuery.cpp
@@ -11,8 +11,20 @@ String ASTKillQueryQuery::getID(char delim) const
 
 void ASTKillQueryQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    settings.ostr << (settings.hilite ? hilite_keyword : "") << "KILL "
-        << (type == Type::Query ? "QUERY" : "MUTATION");
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "KILL ";
+
+    switch (type)
+    {
+        case Type::Query:
+            settings.ostr << "QUERY";
+            break;
+        case Type::Mutation:
+            settings.ostr << "MUTATION";
+            break;
+        case Type::PartMoveToShard:
+            settings.ostr << "PART_MOVE_TO_SHARD";
+            break;
+    }
 
     formatOnCluster(settings);
 
diff --git a/src/Parsers/ASTKillQueryQuery.h b/src/Parsers/ASTKillQueryQuery.h
index c1b3956962f..6ff12bcba93 100644
--- a/src/Parsers/ASTKillQueryQuery.h
+++ b/src/Parsers/ASTKillQueryQuery.h
@@ -13,6 +13,7 @@ public:
     {
         Query,      /// KILL QUERY
         Mutation,   /// KILL MUTATION
+        PartMoveToShard, /// KILL PART_MOVE_TO_SHARD
     };
 
     Type type = Type::Query;
diff --git a/src/Parsers/ASTLiteral.cpp b/src/Parsers/ASTLiteral.cpp
index c456cb3e933..93d490bc645 100644
--- a/src/Parsers/ASTLiteral.cpp
+++ b/src/Parsers/ASTLiteral.cpp
@@ -50,16 +50,14 @@ String FieldVisitorToColumnName::operator() (const Tuple & x) const
 
 }
 
-void ASTLiteral::appendColumnNameImpl(WriteBuffer & ostr, const Settings & settings) const
-{
-    if (settings.legacy_column_name_of_tuple_literal)
-        appendColumnNameImplLegacy(ostr);
-    else
-        appendColumnNameImpl(ostr);
-}
-
 void ASTLiteral::appendColumnNameImpl(WriteBuffer & ostr) const
 {
+    if (use_legacy_column_name_of_tuple)
+    {
+        appendColumnNameImplLegacy(ostr);
+        return;
+    }
+
     /// 100 - just arbitrary value.
     constexpr auto min_elements_for_hashing = 100;
 
diff --git a/src/Parsers/ASTLiteral.h b/src/Parsers/ASTLiteral.h
index c17310f719b..856bed61979 100644
--- a/src/Parsers/ASTLiteral.h
+++ b/src/Parsers/ASTLiteral.h
@@ -33,6 +33,10 @@ public:
      */
     String unique_column_name;
 
+    /// For compatibility reasons in distributed queries,
+    /// we may need to use legacy column name for tuple literal.
+    bool use_legacy_column_name_of_tuple = false;
+
     /** Get the text that identifies this element. */
     String getID(char delim) const override { return "Literal" + (delim + applyVisitor(FieldVisitorDump(), value)); }
 
@@ -44,7 +48,6 @@ protected:
     void formatImplWithoutAlias(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
 
     void appendColumnNameImpl(WriteBuffer & ostr) const override;
-    void appendColumnNameImpl(WriteBuffer & ostr, const Settings & settings) const override;
 
 private:
     /// Legacy version of 'appendColumnNameImpl'. It differs only with tuple literals.
diff --git a/src/Parsers/ASTPartition.h b/src/Parsers/ASTPartition.h
index 8a837a10451..c513eb7328e 100644
--- a/src/Parsers/ASTPartition.h
+++ b/src/Parsers/ASTPartition.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 
 
 namespace DB
diff --git a/src/Parsers/ASTQueryWithOutput.h b/src/Parsers/ASTQueryWithOutput.h
index 92f9331f259..10852467a76 100644
--- a/src/Parsers/ASTQueryWithOutput.h
+++ b/src/Parsers/ASTQueryWithOutput.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IAST.h>
 #include <IO/Operators.h>
+#include "Parsers/IAST_fwd.h"
 
 
 namespace DB
@@ -16,6 +17,7 @@ public:
     ASTPtr out_file;
     ASTPtr format;
     ASTPtr settings_ast;
+    ASTPtr compression;
 
     void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const final;
 
diff --git a/src/Parsers/ASTRenameQuery.h b/src/Parsers/ASTRenameQuery.h
index 5739e7839d3..4940bf42a3a 100644
--- a/src/Parsers/ASTRenameQuery.h
+++ b/src/Parsers/ASTRenameQuery.h
@@ -34,6 +34,9 @@ public:
     bool database{false};   /// For RENAME DATABASE
     bool dictionary{false};   /// For RENAME DICTIONARY
 
+    /// Special flag for CREATE OR REPLACE. Do not throw if the second table does not exist.
+    bool rename_if_cannot_exchange{false};
+
     /** Get the text that identifies this element. */
     String getID(char) const override { return "Rename"; }
 
diff --git a/src/Parsers/ASTSelectIntersectExceptQuery.cpp b/src/Parsers/ASTSelectIntersectExceptQuery.cpp
new file mode 100644
index 00000000000..3b9cb0a2c16
--- /dev/null
+++ b/src/Parsers/ASTSelectIntersectExceptQuery.cpp
@@ -0,0 +1,41 @@
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+
+
+namespace DB
+{
+
+ASTPtr ASTSelectIntersectExceptQuery::clone() const
+{
+    auto res = std::make_shared<ASTSelectIntersectExceptQuery>(*this);
+
+    res->children.clear();
+    for (const auto & child : children)
+        res->children.push_back(child->clone());
+
+    res->final_operator = final_operator;
+
+    cloneOutputOptions(*res);
+    return res;
+}
+
+void ASTSelectIntersectExceptQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
+
+    for (ASTs::const_iterator it = children.begin(); it != children.end(); ++it)
+    {
+        if (it != children.begin())
+        {
+            settings.ostr << settings.nl_or_ws << indent_str << (settings.hilite ? hilite_keyword : "")
+                          << (final_operator == Operator::INTERSECT ? "INTERSECT" : "EXCEPT")
+                          << (settings.hilite ? hilite_none : "")
+                          << settings.nl_or_ws;
+        }
+
+        (*it)->formatImpl(settings, state, frame);
+    }
+}
+
+}
diff --git a/src/Parsers/ASTSelectIntersectExceptQuery.h b/src/Parsers/ASTSelectIntersectExceptQuery.h
new file mode 100644
index 00000000000..97a8296ce2c
--- /dev/null
+++ b/src/Parsers/ASTSelectIntersectExceptQuery.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <Parsers/ASTQueryWithOutput.h>
+
+
+namespace DB
+{
+
+class ASTSelectIntersectExceptQuery : public ASTQueryWithOutput
+{
+public:
+    String getID(char) const override { return "SelectIntersectExceptQuery"; }
+
+    ASTPtr clone() const override;
+
+    void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+    const char * getQueryKindString() const override { return "SelectIntersectExcept"; }
+
+    enum class Operator
+    {
+        UNKNOWN,
+        INTERSECT,
+        EXCEPT
+    };
+
+    /// Final operator after applying visitor.
+    Operator final_operator = Operator::UNKNOWN;
+};
+
+}
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 7699d380623..1c5a4310f1b 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -319,24 +319,16 @@ bool ASTSelectQuery::withFill() const
 }
 
 
-ASTPtr ASTSelectQuery::arrayJoinExpressionList(bool & is_left) const
+std::pair<ASTPtr, bool> ASTSelectQuery::arrayJoinExpressionList() const
 {
     const ASTArrayJoin * array_join = getFirstArrayJoin(*this);
     if (!array_join)
         return {};
 
-    is_left = (array_join->kind == ASTArrayJoin::Kind::Left);
-    return array_join->expression_list;
+    bool is_left = (array_join->kind == ASTArrayJoin::Kind::Left);
+    return {array_join->expression_list, is_left};
 }
 
-
-ASTPtr ASTSelectQuery::arrayJoinExpressionList() const
-{
-    bool is_left;
-    return arrayJoinExpressionList(is_left);
-}
-
-
 const ASTTablesInSelectQueryElement * ASTSelectQuery::join() const
 {
     return getFirstTableJoin(*this);
diff --git a/src/Parsers/ASTSelectQuery.h b/src/Parsers/ASTSelectQuery.h
index 12817199d13..2b004e9e040 100644
--- a/src/Parsers/ASTSelectQuery.h
+++ b/src/Parsers/ASTSelectQuery.h
@@ -35,6 +35,44 @@ public:
         SETTINGS
     };
 
+    static String expressionToString(Expression expr)
+    {
+        switch (expr)
+        {
+            case Expression::WITH:
+                return "WITH";
+            case Expression::SELECT:
+                return "SELECT";
+            case Expression::TABLES:
+                return "TABLES";
+            case Expression::PREWHERE:
+                return "PREWHERE";
+            case Expression::WHERE:
+                return "WHERE";
+            case Expression::GROUP_BY:
+                return "GROUP BY";
+            case Expression::HAVING:
+                return "HAVING";
+            case Expression::WINDOW:
+                return "WINDOW";
+            case Expression::ORDER_BY:
+                return "ORDER BY";
+            case Expression::LIMIT_BY_OFFSET:
+                return "LIMIT BY OFFSET";
+            case Expression::LIMIT_BY_LENGTH:
+                return "LIMIT BY LENGTH";
+            case Expression::LIMIT_BY:
+                return "LIMIT BY";
+            case Expression::LIMIT_OFFSET:
+                return "LIMIT OFFSET";
+            case Expression::LIMIT_LENGTH:
+                return "LIMIT LENGTH";
+            case Expression::SETTINGS:
+                return "SETTINGS";
+        }
+        return "";
+    }
+
     /** Get the text that identifies this element. */
     String getID(char) const override { return "SelectQuery"; }
 
@@ -85,8 +123,8 @@ public:
     /// Compatibility with old parser of tables list. TODO remove
     ASTPtr sampleSize() const;
     ASTPtr sampleOffset() const;
-    ASTPtr arrayJoinExpressionList(bool & is_left) const;
-    ASTPtr arrayJoinExpressionList() const;
+    std::pair<ASTPtr, bool> arrayJoinExpressionList() const;
+
     const ASTTablesInSelectQueryElement * join() const;
     bool final() const;
     bool withFill() const;
diff --git a/src/Parsers/ASTSelectWithUnionQuery.cpp b/src/Parsers/ASTSelectWithUnionQuery.cpp
index fa7359574f8..a0b213f528f 100644
--- a/src/Parsers/ASTSelectWithUnionQuery.cpp
+++ b/src/Parsers/ASTSelectWithUnionQuery.cpp
@@ -20,6 +20,7 @@ ASTPtr ASTSelectWithUnionQuery::clone() const
     res->union_mode = union_mode;
 
     res->list_of_modes = list_of_modes;
+    res->set_of_modes = set_of_modes;
 
     cloneOutputOptions(*res);
     return res;
@@ -32,18 +33,21 @@ void ASTSelectWithUnionQuery::formatQueryImpl(const FormatSettings & settings, F
 
     auto mode_to_str = [&](auto mode)
     {
-        if (mode == Mode::Unspecified)
-            return "";
-        else if (mode == Mode::ALL)
-            return " ALL";
-        else
-            return " DISTINCT";
+        if (mode == Mode::ALL)
+            return "UNION ALL";
+        else if (mode == Mode::DISTINCT)
+            return "UNION DISTINCT";
+        else if (mode == Mode::INTERSECT)
+            return "INTERSECT";
+        else if (mode == Mode::EXCEPT)
+            return "EXCEPT";
+        return "";
     };
 
     for (ASTs::const_iterator it = list_of_selects->children.begin(); it != list_of_selects->children.end(); ++it)
     {
         if (it != list_of_selects->children.begin())
-            settings.ostr << settings.nl_or_ws << indent_str << (settings.hilite ? hilite_keyword : "") << "UNION"
+            settings.ostr << settings.nl_or_ws << indent_str << (settings.hilite ? hilite_keyword : "")
                           << mode_to_str((is_normalized) ? union_mode : list_of_modes[it - list_of_selects->children.begin() - 1])
                           << (settings.hilite ? hilite_none : "");
 
@@ -71,4 +75,10 @@ void ASTSelectWithUnionQuery::formatQueryImpl(const FormatSettings & settings, F
     }
 }
 
+
+bool ASTSelectWithUnionQuery::hasNonDefaultUnionMode() const
+{
+    return set_of_modes.contains(Mode::DISTINCT) || set_of_modes.contains(Mode::INTERSECT) || set_of_modes.contains(Mode::EXCEPT);
+}
+
 }
diff --git a/src/Parsers/ASTSelectWithUnionQuery.h b/src/Parsers/ASTSelectWithUnionQuery.h
index 0465bdac3a6..66143bfef97 100644
--- a/src/Parsers/ASTSelectWithUnionQuery.h
+++ b/src/Parsers/ASTSelectWithUnionQuery.h
@@ -14,6 +14,7 @@ public:
     String getID(char) const override { return "SelectWithUnionQuery"; }
 
     ASTPtr clone() const override;
+
     void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
 
     const char * getQueryKindString() const override { return "Select"; }
@@ -22,10 +23,13 @@ public:
     {
         Unspecified,
         ALL,
-        DISTINCT
+        DISTINCT,
+        EXCEPT,
+        INTERSECT
     };
 
     using UnionModes = std::vector<Mode>;
+    using UnionModesSet = std::unordered_set<Mode>;
 
     Mode union_mode;
 
@@ -34,6 +38,11 @@ public:
     bool is_normalized = false;
 
     ASTPtr list_of_selects;
+
+    UnionModesSet set_of_modes;
+
+    /// Consider any mode other than ALL as non-default.
+    bool hasNonDefaultUnionMode() const;
 };
 
 }
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index 5d01e124b0e..ba8e49b98ca 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -3,106 +3,41 @@
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
 
+#include <magic_enum.hpp>
 
 namespace DB
 {
 
-
-namespace ErrorCodes
+namespace
 {
-    extern const int LOGICAL_ERROR;
-}
-
-
-const char * ASTSystemQuery::typeToString(Type type)
-{
-    switch (type)
+    std::vector<std::string> getTypeIndexToTypeName()
     {
-        case Type::SHUTDOWN:
-            return "SHUTDOWN";
-        case Type::KILL:
-            return "KILL";
-        case Type::SUSPEND:
-            return "SUSPEND";
-        case Type::DROP_DNS_CACHE:
-            return "DROP DNS CACHE";
-        case Type::DROP_MARK_CACHE:
-            return "DROP MARK CACHE";
-        case Type::DROP_UNCOMPRESSED_CACHE:
-            return "DROP UNCOMPRESSED CACHE";
-        case Type::DROP_MMAP_CACHE:
-            return "DROP MMAP CACHE";
-#if USE_EMBEDDED_COMPILER
-        case Type::DROP_COMPILED_EXPRESSION_CACHE:
-            return "DROP COMPILED EXPRESSION CACHE";
-#endif
-        case Type::STOP_LISTEN_QUERIES:
-            return "STOP LISTEN QUERIES";
-        case Type::START_LISTEN_QUERIES:
-            return "START LISTEN QUERIES";
-        case Type::RESTART_REPLICAS:
-            return "RESTART REPLICAS";
-        case Type::RESTART_REPLICA:
-            return "RESTART REPLICA";
-        case Type::RESTORE_REPLICA:
-            return "RESTORE REPLICA";
-        case Type::DROP_REPLICA:
-            return "DROP REPLICA";
-        case Type::SYNC_REPLICA:
-            return "SYNC REPLICA";
-        case Type::FLUSH_DISTRIBUTED:
-            return "FLUSH DISTRIBUTED";
-        case Type::RELOAD_DICTIONARY:
-            return "RELOAD DICTIONARY";
-        case Type::RELOAD_DICTIONARIES:
-            return "RELOAD DICTIONARIES";
-        case Type::RELOAD_MODEL:
-            return "RELOAD MODEL";
-        case Type::RELOAD_MODELS:
-            return "RELOAD MODELS";
-        case Type::RELOAD_EMBEDDED_DICTIONARIES:
-            return "RELOAD EMBEDDED DICTIONARIES";
-        case Type::RELOAD_CONFIG:
-            return "RELOAD CONFIG";
-        case Type::RELOAD_SYMBOLS:
-            return "RELOAD SYMBOLS";
-        case Type::STOP_MERGES:
-            return "STOP MERGES";
-        case Type::START_MERGES:
-            return "START MERGES";
-        case Type::STOP_TTL_MERGES:
-            return "STOP TTL MERGES";
-        case Type::START_TTL_MERGES:
-            return "START TTL MERGES";
-        case Type::STOP_MOVES:
-            return "STOP MOVES";
-        case Type::START_MOVES:
-            return "START MOVES";
-        case Type::STOP_FETCHES:
-            return "STOP FETCHES";
-        case Type::START_FETCHES:
-            return "START FETCHES";
-        case Type::STOP_REPLICATED_SENDS:
-            return "STOP REPLICATED SENDS";
-        case Type::START_REPLICATED_SENDS:
-            return "START REPLICATED SENDS";
-        case Type::STOP_REPLICATION_QUEUES:
-            return "STOP REPLICATION QUEUES";
-        case Type::START_REPLICATION_QUEUES:
-            return "START REPLICATION QUEUES";
-        case Type::STOP_DISTRIBUTED_SENDS:
-            return "STOP DISTRIBUTED SENDS";
-        case Type::START_DISTRIBUTED_SENDS:
-            return "START DISTRIBUTED SENDS";
-        case Type::FLUSH_LOGS:
-            return "FLUSH LOGS";
-        case Type::RESTART_DISK:
-            return "RESTART DISK";
-        default:
-            throw Exception("Unknown SYSTEM query command", ErrorCodes::LOGICAL_ERROR);
+        constexpr std::size_t types_size = magic_enum::enum_count<ASTSystemQuery::Type>();
+
+        std::vector<std::string> type_index_to_type_name;
+        type_index_to_type_name.resize(types_size);
+
+        auto entries = magic_enum::enum_entries<ASTSystemQuery::Type>();
+        for (const auto & [entry, str] : entries)
+        {
+            auto str_copy = String(str);
+            std::replace(str_copy.begin(), str_copy.end(), '_', ' ');
+            type_index_to_type_name[static_cast<UInt64>(entry)] = std::move(str_copy);
+        }
+
+        return type_index_to_type_name;
     }
 }
 
+const char * ASTSystemQuery::typeToString(Type type)
+{
+    /** During parsing if SystemQuery is not parsed properly it is added to Expected variants as description check IParser.h.
+      * Description string must be statically allocated.
+      */
+    static std::vector<std::string> type_index_to_type_name = getTypeIndexToTypeName();
+    const auto & type_name = type_index_to_type_name[static_cast<UInt64>(type)];
+    return type_name.data();
+}
 
 void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index fa7b6ece59a..419c22dd0d5 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -3,9 +3,7 @@
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/IAST.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 
 namespace DB
@@ -15,7 +13,7 @@ class ASTSystemQuery : public IAST, public ASTQueryWithOnCluster
 {
 public:
 
-    enum class Type
+    enum class Type : UInt64
     {
         UNKNOWN,
         SHUTDOWN,
@@ -24,6 +22,8 @@ public:
         DROP_DNS_CACHE,
         DROP_MARK_CACHE,
         DROP_UNCOMPRESSED_CACHE,
+        DROP_INDEX_MARK_CACHE,
+        DROP_INDEX_UNCOMPRESSED_CACHE,
         DROP_MMAP_CACHE,
 #if USE_EMBEDDED_COMPILER
         DROP_COMPILED_EXPRESSION_CACHE,
@@ -39,6 +39,8 @@ public:
         RELOAD_DICTIONARIES,
         RELOAD_MODEL,
         RELOAD_MODELS,
+        RELOAD_FUNCTION,
+        RELOAD_FUNCTIONS,
         RELOAD_EMBEDDED_DICTIONARIES,
         RELOAD_CONFIG,
         RELOAD_SYMBOLS,
@@ -59,6 +61,8 @@ public:
         FLUSH_DISTRIBUTED,
         STOP_DISTRIBUTED_SENDS,
         START_DISTRIBUTED_SENDS,
+        START_THREAD_FUZZER,
+        STOP_THREAD_FUZZER,
         END
     };
 
@@ -67,6 +71,7 @@ public:
     Type type = Type::UNKNOWN;
 
     String target_model;
+    String target_function;
     String database;
     String table;
     String replica;
diff --git a/src/Parsers/ASTTablesInSelectQuery.h b/src/Parsers/ASTTablesInSelectQuery.h
index 8b489974804..500337936d1 100644
--- a/src/Parsers/ASTTablesInSelectQuery.h
+++ b/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Parsers/IAST.h>
+#include <base/EnumReflection.h>
 
 
 namespace DB
@@ -116,8 +117,7 @@ inline bool isLeft(ASTTableJoin::Kind kind)         { return kind == ASTTableJoi
 inline bool isRight(ASTTableJoin::Kind kind)        { return kind == ASTTableJoin::Kind::Right; }
 inline bool isInner(ASTTableJoin::Kind kind)        { return kind == ASTTableJoin::Kind::Inner; }
 inline bool isFull(ASTTableJoin::Kind kind)         { return kind == ASTTableJoin::Kind::Full; }
-inline bool isCross(ASTTableJoin::Kind kind)        { return kind == ASTTableJoin::Kind::Cross; }
-inline bool isComma(ASTTableJoin::Kind kind)        { return kind == ASTTableJoin::Kind::Comma; }
+inline bool isCrossOrComma(ASTTableJoin::Kind kind) { return kind == ASTTableJoin::Kind::Comma || kind == ASTTableJoin::Kind::Cross; }
 inline bool isRightOrFull(ASTTableJoin::Kind kind)  { return kind == ASTTableJoin::Kind::Right || kind == ASTTableJoin::Kind::Full; }
 inline bool isLeftOrFull(ASTTableJoin::Kind kind)   { return kind == ASTTableJoin::Kind::Left  || kind == ASTTableJoin::Kind::Full; }
 inline bool isInnerOrRight(ASTTableJoin::Kind kind) { return kind == ASTTableJoin::Kind::Inner || kind == ASTTableJoin::Kind::Right; }
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index 613dbcc392b..29e42de3ce0 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -98,7 +98,7 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
             settings.ostr << " ";
         }
 
-        settings.ostr << WindowFrame::toString(frame_type) << " BETWEEN ";
+        settings.ostr << frame_type << " BETWEEN ";
         if (frame_begin_type == WindowFrame::BoundaryType::Current)
         {
             settings.ostr << "CURRENT ROW";
diff --git a/src/Parsers/ASTWithAlias.cpp b/src/Parsers/ASTWithAlias.cpp
index 0f5b86763e0..88f6568a719 100644
--- a/src/Parsers/ASTWithAlias.cpp
+++ b/src/Parsers/ASTWithAlias.cpp
@@ -48,14 +48,6 @@ void ASTWithAlias::appendColumnName(WriteBuffer & ostr) const
         appendColumnNameImpl(ostr);
 }
 
-void ASTWithAlias::appendColumnName(WriteBuffer & ostr, const Settings & settings) const
-{
-    if (prefer_alias_to_column_name && !alias.empty())
-        writeString(alias, ostr);
-    else
-        appendColumnNameImpl(ostr, settings);
-}
-
 void ASTWithAlias::appendColumnNameWithoutAlias(WriteBuffer & ostr) const
 {
     appendColumnNameImpl(ostr);
diff --git a/src/Parsers/ASTWithAlias.h b/src/Parsers/ASTWithAlias.h
index 249be17b74c..ea4419402b0 100644
--- a/src/Parsers/ASTWithAlias.h
+++ b/src/Parsers/ASTWithAlias.h
@@ -21,10 +21,8 @@ public:
     using IAST::IAST;
 
     void appendColumnName(WriteBuffer & ostr) const final;
-    void appendColumnName(WriteBuffer & ostr, const Settings & settings) const final;
     void appendColumnNameWithoutAlias(WriteBuffer & ostr) const final;
     String getAliasOrColumnName() const override { return alias.empty() ? getColumnName() : alias; }
-    String getAliasOrColumnName(const Settings & settings) const override { return alias.empty() ? getColumnName(settings) : alias; }
     String tryGetAlias() const override { return alias; }
     void setAlias(const String & to) override { alias = to; }
 
@@ -35,7 +33,6 @@ public:
 
 protected:
     virtual void appendColumnNameImpl(WriteBuffer & ostr) const = 0;
-    virtual void appendColumnNameImpl(WriteBuffer & ostr, const Settings &) const { appendColumnNameImpl(ostr); }
 };
 
 /// helper for setting aliases and chaining result to other functions
diff --git a/src/Parsers/CMakeLists.txt b/src/Parsers/CMakeLists.txt
index 5aaa5c32f92..a20dd3567a9 100644
--- a/src/Parsers/CMakeLists.txt
+++ b/src/Parsers/CMakeLists.txt
@@ -12,3 +12,7 @@ endif ()
 if(ENABLE_EXAMPLES)
     add_subdirectory(examples)
 endif()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/Parsers/CommonParsers.cpp b/src/Parsers/CommonParsers.cpp
index d7a9ed60ac3..bffba4aa773 100644
--- a/src/Parsers/CommonParsers.cpp
+++ b/src/Parsers/CommonParsers.cpp
@@ -1,52 +1,24 @@
-#include <Common/StringUtils/StringUtils.h>
 #include <Parsers/CommonParsers.h>
-#include <common/find_symbols.h>
-#include <IO/Operators.h>
-
-#include <string.h>        /// strncmp, strncasecmp
-
+#include <base/find_symbols.h>
 
 namespace DB
 {
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-
-ParserKeyword::ParserKeyword(const char * s_) : s(s_)
-{
-}
-
-
-const char * ParserKeyword::getName() const
-{
-    return s;
-}
-
-
-bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
+bool ParserKeyword::parseImpl(Pos & pos, [[maybe_unused]] ASTPtr & node, Expected & expected)
 {
     if (pos->type != TokenType::BareWord)
         return false;
 
-    const char * current_word = s;
-
-    size_t s_length = strlen(s);
-    if (!s_length)
-        throw Exception("Logical error: keyword cannot be empty string", ErrorCodes::LOGICAL_ERROR);
-
-    const char * s_end = s + s_length;
+    const char * current_word = s.begin();
 
     while (true)
     {
         expected.add(pos, current_word);
+
         if (pos->type != TokenType::BareWord)
             return false;
 
-        const char * next_whitespace = find_first_symbols<' ', '\0'>(current_word, s_end);
-        size_t word_length = next_whitespace - current_word;
+        const char * const next_whitespace = find_first_symbols<' ', '\0'>(current_word, s.end());
+        const size_t word_length = next_whitespace - current_word;
 
         if (word_length != pos->size())
             return false;
@@ -64,5 +36,4 @@ bool ParserKeyword::parseImpl(Pos & pos, ASTPtr & /*node*/, Expected & expected)
 
     return true;
 }
-
 }
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index 85b5217b617..9ac58f2f2ed 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -13,13 +13,14 @@ namespace DB
 class ParserKeyword : public IParserBase
 {
 private:
-    const char * s;
+    std::string_view s;
 
 public:
-    ParserKeyword(const char * s_);
+    //NOLINTNEXTLINE Want to be able to init ParserKeyword("literal")
+    constexpr ParserKeyword(std::string_view s_): s(s_) { assert(!s.empty()); }
 
 protected:
-    const char * getName() const override;
+    constexpr const char * getName() const override { return s.data(); }
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
diff --git a/src/Parsers/DumpASTNode.h b/src/Parsers/DumpASTNode.h
index 27ea3b50d62..e1071f02dd3 100644
--- a/src/Parsers/DumpASTNode.h
+++ b/src/Parsers/DumpASTNode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Util/Application.h>
 #include <IO/Operators.h>
 
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index ca563ddea41..e16a7605afc 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -3,10 +3,10 @@
 
 #include <Poco/String.h>
 
-#include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromMemory.h>
-#include <Common/typeid_cast.h>
+#include <IO/ReadHelpers.h>
 #include <Parsers/DumpASTNode.h>
+#include <Common/typeid_cast.h>
 
 #include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTColumnsTransformers.h>
@@ -103,26 +103,34 @@ bool ParserParenthesisExpression::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
     const auto & expr_list = contents_node->as<ASTExpressionList &>();
 
-    /// empty expression in parentheses is not allowed
+    /// Empty expression in parentheses is not allowed.
     if (expr_list.children.empty())
     {
         expected.add(pos, "non-empty parenthesized list of expressions");
         return false;
     }
 
+    /// Special case for one-element tuple.
     if (expr_list.children.size() == 1 && is_elem)
     {
-        node = expr_list.children.front();
-    }
-    else
-    {
-        auto function_node = std::make_shared<ASTFunction>();
-        function_node->name = "tuple";
-        function_node->arguments = contents_node;
-        function_node->children.push_back(contents_node);
-        node = function_node;
+        auto * ast_literal = expr_list.children.front()->as<ASTLiteral>();
+        /// But only if its argument is not tuple,
+        /// since otherwise it will do incorrect transformation:
+        ///
+        ///     (foo,bar) IN (('foo','bar')) -> (foo,bar) IN ('foo','bar')
+        if (!(ast_literal && ast_literal->value.getType() == Field::Types::Tuple))
+        {
+            node = expr_list.children.front();
+            return true;
+        }
     }
 
+    auto function_node = std::make_shared<ASTFunction>();
+    function_node->name = "tuple";
+    function_node->arguments = contents_node;
+    function_node->children.push_back(contents_node);
+    node = function_node;
+
     return true;
 }
 
@@ -268,7 +276,6 @@ bool ParserCompoundIdentifier::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
     return true;
 }
 
-
 bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserIdentifier id_parser;
@@ -276,6 +283,7 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword all("ALL");
     ParserExpressionList contents(false, is_table_function);
     ParserSelectWithUnionQuery select;
+    ParserKeyword filter("FILTER");
     ParserKeyword over("OVER");
 
     bool has_all = false;
@@ -440,16 +448,27 @@ bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         function_node->children.push_back(function_node->parameters);
     }
 
-    if (over.ignore(pos, expected))
+    if (filter.ignore(pos, expected))
     {
-        function_node->is_window_function = true;
-
         // We are slightly breaking the parser interface by parsing the window
         // definition into an existing ASTFunction. Normally it would take a
         // reference to ASTPtr and assign it the new node. We only have a pointer
         // of a different type, hence this workaround with a temporary pointer.
         ASTPtr function_node_as_iast = function_node;
 
+        ParserFilterClause filter_parser;
+        if (!filter_parser.parse(pos, function_node_as_iast, expected))
+        {
+            return false;
+        }
+    }
+
+    if (over.ignore(pos, expected))
+    {
+        function_node->is_window_function = true;
+
+        ASTPtr function_node_as_iast = function_node;
+
         ParserWindowReference window_reference;
         if (!window_reference.parse(pos, function_node_as_iast, expected))
         {
@@ -504,6 +523,40 @@ bool ParserTableFunctionView::parseImpl(Pos & pos, ASTPtr & node, Expected & exp
     return true;
 }
 
+bool ParserFilterClause::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    assert(node);
+    ASTFunction & function = dynamic_cast<ASTFunction &>(*node);
+
+    ParserToken parser_opening_bracket(TokenType::OpeningRoundBracket);
+    if (!parser_opening_bracket.ignore(pos, expected))
+    {
+        return false;
+    }
+
+    ParserKeyword parser_where("WHERE");
+    if (!parser_where.ignore(pos, expected))
+    {
+        return false;
+    }
+    ParserExpressionList parser_condition(false);
+    ASTPtr condition;
+    if (!parser_condition.parse(pos, condition, expected) || condition->children.size() != 1)
+    {
+        return false;
+    }
+
+    ParserToken parser_closing_bracket(TokenType::ClosingRoundBracket);
+    if (!parser_closing_bracket.ignore(pos, expected))
+    {
+        return false;
+    }
+
+    function.name += "If";
+    function.arguments->children.push_back(condition->children[0]);
+    return true;
+}
+
 bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     assert(node);
@@ -850,15 +903,24 @@ static bool isOneOf(TokenType token)
     return ((token == tokens) || ...);
 }
 
-
 bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    /// Parse numbers (including decimals), strings and arrays of them.
+    /// Parse numbers (including decimals), strings, arrays and tuples of them.
 
     const char * data_begin = pos->begin;
     const char * data_end = pos->end;
     bool is_string_literal = pos->type == TokenType::StringLiteral;
-    if (pos->type == TokenType::Number || is_string_literal)
+
+    if (pos->type == TokenType::Minus)
+    {
+        ++pos;
+        if (pos->type != TokenType::Number)
+            return false;
+
+        data_end = pos->end;
+        ++pos;
+    }
+    else if (pos->type == TokenType::Number || is_string_literal)
     {
         ++pos;
     }
@@ -876,7 +938,7 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (pos->type == TokenType::ClosingSquareBracket)
             {
-                if (isOneOf<TokenType::Comma, TokenType::OpeningRoundBracket>(last_token))
+                if (isOneOf<TokenType::Comma, TokenType::OpeningRoundBracket, TokenType::Minus>(last_token))
                     return false;
                 if (stack.empty() || stack.back() != TokenType::OpeningSquareBracket)
                     return false;
@@ -884,7 +946,7 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (pos->type == TokenType::ClosingRoundBracket)
             {
-                if (isOneOf<TokenType::Comma, TokenType::OpeningSquareBracket>(last_token))
+                if (isOneOf<TokenType::Comma, TokenType::OpeningSquareBracket, TokenType::Minus>(last_token))
                     return false;
                 if (stack.empty() || stack.back() != TokenType::OpeningRoundBracket)
                     return false;
@@ -892,10 +954,15 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (pos->type == TokenType::Comma)
             {
-                if (isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma>(last_token))
+                if (isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma, TokenType::Minus>(last_token))
                     return false;
             }
-            else if (isOneOf<TokenType::Number, TokenType::StringLiteral>(pos->type))
+            else if (pos->type == TokenType::Number)
+            {
+                if (!isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma, TokenType::Minus>(last_token))
+                    return false;
+            }
+            else if (isOneOf<TokenType::StringLiteral, TokenType::Minus>(pos->type))
             {
                 if (!isOneOf<TokenType::OpeningSquareBracket, TokenType::OpeningRoundBracket, TokenType::Comma>(last_token))
                     return false;
@@ -915,6 +982,8 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         if (!stack.empty())
             return false;
     }
+    else
+        return false;
 
     ASTPtr type_ast;
     if (ParserToken(TokenType::DoubleColon).ignore(pos, expected)
@@ -1455,6 +1524,25 @@ bool ParserNull::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         return false;
 }
 
+static bool parseNumber(char * buffer, size_t size, bool negative, int base, Field & res)
+{
+    errno = 0;    /// Functions strto* don't clear errno.
+
+    char * pos_integer = buffer;
+    UInt64 uint_value = std::strtoull(buffer, &pos_integer, base);
+
+    if (pos_integer == buffer + size && errno != ERANGE && (!negative || uint_value <= (1ULL << 63)))
+    {
+        if (negative)
+            res = static_cast<Int64>(-uint_value);
+        else
+            res = uint_value;
+
+        return true;
+    }
+
+    return false;
+}
 
 bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
@@ -1495,6 +1583,22 @@ bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     Float64 float_value = std::strtod(buf, &pos_double);
     if (pos_double != buf + pos->size() || errno == ERANGE)
     {
+        /// Try to parse number as binary literal representation. Example: 0b0001.
+        if (pos->size() > 2 && buf[0] == '0' && buf[1] == 'b')
+        {
+            char * buf_skip_prefix = buf + 2;
+
+            if (parseNumber(buf_skip_prefix, pos->size() - 2, negative, 2, res))
+            {
+                auto literal = std::make_shared<ASTLiteral>(res);
+                literal->begin = literal_begin;
+                literal->end = ++pos;
+                node = literal;
+
+                return true;
+            }
+        }
+
         expected.add(pos, "number");
         return false;
     }
@@ -1509,22 +1613,13 @@ bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     /// try to use more exact type: UInt64
 
-    char * pos_integer = buf;
-
-    errno = 0;
-    UInt64 uint_value = std::strtoull(buf, &pos_integer, 0);
-    if (pos_integer == pos_double && errno != ERANGE && (!negative || uint_value <= (1ULL << 63)))
-    {
-        if (negative)
-            res = static_cast<Int64>(-uint_value);
-        else
-            res = uint_value;
-    }
+    parseNumber(buf, pos->size(), negative, 0, res);
 
     auto literal = std::make_shared<ASTLiteral>(res);
     literal->begin = literal_begin;
     literal->end = ++pos;
     node = literal;
+
     return true;
 }
 
@@ -1713,6 +1808,8 @@ const char * ParserAlias::restricted_keywords[] =
     "WHERE",
     "WINDOW",
     "WITH",
+    "INTERSECT",
+    "EXCEPT",
     nullptr
 };
 
@@ -1809,20 +1906,47 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
             with_open_round_bracket = true;
         }
 
+        ASTPtr lambda;
+        String lambda_arg;
         ASTPtr func_name;
-        if (!ParserIdentifier().parse(pos, func_name, expected))
-            return false;
-
         ASTPtr expr_list_args;
-        if (pos->type == TokenType::OpeningRoundBracket)
+        auto opos = pos;
+        if (ParserLambdaExpression().parse(pos, lambda, expected))
         {
-            ++pos;
-            if (!ParserExpressionList(false).parse(pos, expr_list_args, expected))
+            if (const auto * func = lambda->as<ASTFunction>(); func && func->name == "lambda")
+            {
+                const auto * lambda_args_tuple = func->arguments->children.at(0)->as<ASTFunction>();
+                const ASTs & lambda_arg_asts = lambda_args_tuple->arguments->children;
+                if (lambda_arg_asts.size() != 1)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "APPLY column transformer can only accept lambda with one argument");
+
+                if (auto opt_arg_name = tryGetIdentifierName(lambda_arg_asts[0]); opt_arg_name)
+                    lambda_arg = *opt_arg_name;
+                else
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "lambda argument declarations must be identifiers");
+            }
+            else
+            {
+                lambda = nullptr;
+                pos = opos;
+            }
+        }
+
+        if (!lambda)
+        {
+            if (!ParserIdentifier().parse(pos, func_name, expected))
                 return false;
 
-            if (pos->type != TokenType::ClosingRoundBracket)
-                return false;
-            ++pos;
+            if (pos->type == TokenType::OpeningRoundBracket)
+            {
+                ++pos;
+                if (!ParserExpressionList(false).parse(pos, expr_list_args, expected))
+                    return false;
+
+                if (pos->type != TokenType::ClosingRoundBracket)
+                    return false;
+                ++pos;
+            }
         }
 
         String column_name_prefix;
@@ -1846,8 +1970,16 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         }
 
         auto res = std::make_shared<ASTColumnsApplyTransformer>();
-        res->func_name = getIdentifierName(func_name);
-        res->parameters = expr_list_args;
+        if (lambda)
+        {
+            res->lambda = lambda;
+            res->lambda_arg = lambda_arg;
+        }
+        else
+        {
+            res->func_name = getIdentifierName(func_name);
+            res->parameters = expr_list_args;
+        }
         res->column_name_prefix = column_name_prefix;
         node = std::move(res);
         return true;
@@ -2090,6 +2222,16 @@ bool ParserMySQLGlobalVariable::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     return true;
 }
 
+bool ParserExistsExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    if (ParserKeyword("EXISTS").ignore(pos, expected) && ParserSubquery().parse(pos, node, expected))
+    {
+        node = makeASTFunction("exists", node);
+        return true;
+    }
+    return false;
+}
+
 
 bool ParserExpressionElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
@@ -2113,6 +2255,7 @@ bool ParserExpressionElement::parseImpl(Pos & pos, ASTPtr & node, Expected & exp
         || ParserFunction().parse(pos, node, expected)
         || ParserQualifiedAsterisk().parse(pos, node, expected)
         || ParserAsterisk().parse(pos, node, expected)
+        || ParserExistsExpression().parse(pos, node, expected)
         || ParserCompoundIdentifier(false, true).parse(pos, node, expected)
         || ParserSubstitution().parse(pos, node, expected)
         || ParserMySQLGlobalVariable().parse(pos, node, expected);
diff --git a/src/Parsers/ExpressionElementParsers.h b/src/Parsers/ExpressionElementParsers.h
index c4ddb056a4d..91f1730f93d 100644
--- a/src/Parsers/ExpressionElementParsers.h
+++ b/src/Parsers/ExpressionElementParsers.h
@@ -171,6 +171,13 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+// Allows to make queries like SELECT SUM(<expr>) FILTER(WHERE <cond>) FROM ...
+class ParserFilterClause : public IParserBase
+{
+    const char * getName() const override { return "filter"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
 // Window reference (the thing that goes after OVER) for window function.
 // Can be either window name or window definition.
 class ParserWindowReference : public IParserBase
@@ -318,6 +325,17 @@ protected:
 };
 
 
+/**
+  * Parse query with EXISTS expression.
+  */
+class ParserExistsExpression : public IParserBase
+{
+protected:
+    const char * getName() const override { return "exists expression"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+
 /** An array or tuple of literals.
   * Arrays can also be parsed as an application of [] operator and tuples as an application of 'tuple' function.
   * But parsing the whole array/tuple as a whole constant seriously speeds up the analysis of expressions in the case of very large collection.
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index 5047ce39d47..3aa5c82884b 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -1,17 +1,21 @@
 #include <Parsers/ExpressionListParsers.h>
 
+#include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTFunctionWithKeyValueArguments.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseIntervalKind.h>
+#include <Parsers/ParserUnionQueryElement.h>
 #include <Common/StringUtils/StringUtils.h>
 
 
 namespace DB
 {
 
-
 const char * ParserMultiplicativeExpression::operators[] =
 {
     "*",     "multiply",
@@ -108,12 +112,18 @@ bool ParserList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 bool ParserUnionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    ParserUnionQueryElement elem_parser;
+    ParserKeyword s_union_parser("UNION");
+    ParserKeyword s_all_parser("ALL");
+    ParserKeyword s_distinct_parser("DISTINCT");
+    ParserKeyword s_except_parser("EXCEPT");
+    ParserKeyword s_intersect_parser("INTERSECT");
     ASTs elements;
 
     auto parse_element = [&]
     {
         ASTPtr element;
-        if (!elem_parser->parse(pos, element, expected))
+        if (!elem_parser.parse(pos, element, expected))
             return false;
 
         elements.push_back(element);
@@ -123,21 +133,33 @@ bool ParserUnionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     /// Parse UNION type
     auto parse_separator = [&]
     {
-        if (s_union_parser->ignore(pos, expected))
+        if (s_union_parser.ignore(pos, expected))
         {
             // SELECT ... UNION ALL SELECT ...
-            if (s_all_parser->check(pos, expected))
+            if (s_all_parser.check(pos, expected))
             {
                 union_modes.push_back(ASTSelectWithUnionQuery::Mode::ALL);
             }
             // SELECT ... UNION DISTINCT SELECT ...
-            else if (s_distinct_parser->check(pos, expected))
+            else if (s_distinct_parser.check(pos, expected))
             {
                 union_modes.push_back(ASTSelectWithUnionQuery::Mode::DISTINCT);
             }
             // SELECT ... UNION SELECT ...
             else
+            {
                 union_modes.push_back(ASTSelectWithUnionQuery::Mode::Unspecified);
+            }
+            return true;
+        }
+        else if (s_except_parser.check(pos, expected))
+        {
+            union_modes.push_back(ASTSelectWithUnionQuery::Mode::EXCEPT);
+            return true;
+        }
+        else if (s_intersect_parser.check(pos, expected))
+        {
+            union_modes.push_back(ASTSelectWithUnionQuery::Mode::INTERSECT);
             return true;
         }
         return false;
@@ -169,6 +191,91 @@ static bool parseOperator(IParser::Pos & pos, const char * op, Expected & expect
     }
 }
 
+enum class SubqueryFunctionType
+{
+    NONE,
+    ANY,
+    ALL
+};
+
+static bool modifyAST(ASTPtr ast, SubqueryFunctionType type)
+{
+    /* Rewrite in AST:
+     *  = ANY --> IN
+     * != ALL --> NOT IN
+     *  = ALL --> IN (SELECT singleValueOrNull(*) FROM subquery)
+     * != ANY --> NOT IN (SELECT singleValueOrNull(*) FROM subquery)
+    **/
+
+    auto * function = assert_cast<ASTFunction *>(ast.get());
+    String operator_name = function->name;
+
+    auto function_equals = operator_name == "equals";
+    auto function_not_equals = operator_name == "notEquals";
+
+    String aggregate_function_name;
+    if (function_equals || function_not_equals)
+    {
+        if (operator_name == "notEquals")
+            function->name = "notIn";
+        else
+            function->name = "in";
+
+        if ((type == SubqueryFunctionType::ANY && function_equals)
+            || (type == SubqueryFunctionType::ALL && function_not_equals))
+        {
+            return true;
+        }
+
+        aggregate_function_name = "singleValueOrNull";
+    }
+    else if (operator_name == "greaterOrEquals" || operator_name == "greater")
+    {
+        aggregate_function_name = (type == SubqueryFunctionType::ANY ? "min" : "max");
+    }
+    else if (operator_name == "lessOrEquals" || operator_name == "less")
+    {
+        aggregate_function_name = (type == SubqueryFunctionType::ANY ? "max" : "min");
+    }
+    else
+        return false;
+
+    /// subquery --> (SELECT aggregate_function(*) FROM subquery)
+    auto aggregate_function = makeASTFunction(aggregate_function_name, std::make_shared<ASTAsterisk>());
+    auto subquery_node = function->children[0]->children[1];
+
+    auto table_expression = std::make_shared<ASTTableExpression>();
+    table_expression->subquery = std::move(subquery_node);
+    table_expression->children.push_back(table_expression->subquery);
+
+    auto tables_in_select_element = std::make_shared<ASTTablesInSelectQueryElement>();
+    tables_in_select_element->table_expression = std::move(table_expression);
+    tables_in_select_element->children.push_back(tables_in_select_element->table_expression);
+
+    auto tables_in_select = std::make_shared<ASTTablesInSelectQuery>();
+    tables_in_select->children.push_back(std::move(tables_in_select_element));
+
+    auto select_exp_list = std::make_shared<ASTExpressionList>();
+    select_exp_list->children.push_back(aggregate_function);
+
+    auto select_query = std::make_shared<ASTSelectQuery>();
+    select_query->children.push_back(select_exp_list);
+    select_query->children.push_back(tables_in_select);
+
+    select_query->setExpression(ASTSelectQuery::Expression::SELECT, select_exp_list);
+    select_query->setExpression(ASTSelectQuery::Expression::TABLES, tables_in_select);
+
+    auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
+    select_with_union_query->list_of_selects = std::make_shared<ASTExpressionList>();
+    select_with_union_query->list_of_selects->children.push_back(std::move(select_query));
+    select_with_union_query->children.push_back(select_with_union_query->list_of_selects);
+
+    auto new_subquery = std::make_shared<ASTSubquery>();
+    new_subquery->children.push_back(select_with_union_query);
+    ast->children[0]->children.back() = std::move(new_subquery);
+
+    return true;
+}
 
 bool ParserLeftAssociativeBinaryOperatorList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
@@ -213,7 +320,15 @@ bool ParserLeftAssociativeBinaryOperatorList::parseImpl(Pos & pos, ASTPtr & node
             auto exp_list = std::make_shared<ASTExpressionList>();
 
             ASTPtr elem;
-            if (!(remaining_elem_parser ? remaining_elem_parser : first_elem_parser)->parse(pos, elem, expected))
+            SubqueryFunctionType subquery_function_type = SubqueryFunctionType::NONE;
+            if (allow_any_all_operators && ParserKeyword("ANY").ignore(pos, expected))
+                subquery_function_type = SubqueryFunctionType::ANY;
+            else if (allow_any_all_operators && ParserKeyword("ALL").ignore(pos, expected))
+                subquery_function_type = SubqueryFunctionType::ALL;
+            else if (!(remaining_elem_parser ? remaining_elem_parser : first_elem_parser)->parse(pos, elem, expected))
+                return false;
+
+            if (subquery_function_type != SubqueryFunctionType::NONE && !ParserSubquery().parse(pos, elem, expected))
                 return false;
 
             /// the first argument of the function is the previous element, the second is the next one
@@ -224,6 +339,9 @@ bool ParserLeftAssociativeBinaryOperatorList::parseImpl(Pos & pos, ASTPtr & node
             exp_list->children.push_back(node);
             exp_list->children.push_back(elem);
 
+            if (allow_any_all_operators && subquery_function_type != SubqueryFunctionType::NONE && !modifyAST(function, subquery_function_type))
+                return false;
+
             /** special exception for the access operator to the element of the array `x[y]`, which
               * contains the infix part '[' and the suffix ''] '(specified as' [')
               */
@@ -546,10 +664,12 @@ bool ParserUnaryExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
     if (pos->type == TokenType::Minus)
     {
-        ParserLiteral lit_p;
         Pos begin = pos;
+        if (ParserCastOperator().parse(pos, node, expected))
+            return true;
 
-        if (lit_p.parse(pos, node, expected))
+        pos = begin;
+        if (ParserLiteral().parse(pos, node, expected))
             return true;
 
         pos = begin;
@@ -855,4 +975,3 @@ bool ParserKeyValuePairsList::parseImpl(Pos & pos, ASTPtr & node, Expected & exp
 }
 
 }
-
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index bd4763297d4..17deec4e9e4 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -79,14 +79,6 @@ private:
 class ParserUnionList : public IParserBase
 {
 public:
-    ParserUnionList(ParserPtr && elem_parser_, ParserPtr && s_union_parser_, ParserPtr && s_all_parser_, ParserPtr && s_distinct_parser_)
-        : elem_parser(std::move(elem_parser_))
-        , s_union_parser(std::move(s_union_parser_))
-        , s_all_parser(std::move(s_all_parser_))
-        , s_distinct_parser(std::move(s_distinct_parser_))
-    {
-    }
-
     template <typename ElemFunc, typename SepFunc>
     static bool parseUtil(Pos & pos, const ElemFunc & parse_element, const SepFunc & parse_separator)
     {
@@ -116,10 +108,6 @@ protected:
     const char * getName() const override { return "list of union elements"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 private:
-    ParserPtr elem_parser;
-    ParserPtr s_union_parser;
-    ParserPtr s_all_parser;
-    ParserPtr s_distinct_parser;
     ASTSelectWithUnionQuery::UnionModes union_modes;
 };
 
@@ -133,6 +121,8 @@ private:
     Operators_t overlapping_operators_to_skip = { (const char *[]){ nullptr } };
     ParserPtr first_elem_parser;
     ParserPtr remaining_elem_parser;
+    /// =, !=, <, > ALL (subquery) / ANY (subquery)
+    bool allow_any_all_operators = false;
 
 public:
     /** `operators_` - allowed operators and their corresponding functions
@@ -142,8 +132,10 @@ public:
     {
     }
 
-    ParserLeftAssociativeBinaryOperatorList(Operators_t operators_, Operators_t overlapping_operators_to_skip_, ParserPtr && first_elem_parser_)
-        : operators(operators_), overlapping_operators_to_skip(overlapping_operators_to_skip_), first_elem_parser(std::move(first_elem_parser_))
+    ParserLeftAssociativeBinaryOperatorList(Operators_t operators_,
+            Operators_t overlapping_operators_to_skip_, ParserPtr && first_elem_parser_, bool allow_any_all_operators_ = false)
+        : operators(operators_), overlapping_operators_to_skip(overlapping_operators_to_skip_),
+          first_elem_parser(std::move(first_elem_parser_)), allow_any_all_operators(allow_any_all_operators_)
     {
     }
 
@@ -353,7 +345,8 @@ class ParserComparisonExpression : public IParserBase
 private:
     static const char * operators[];
     static const char * overlapping_operators_to_skip[];
-    ParserLeftAssociativeBinaryOperatorList operator_parser {operators, overlapping_operators_to_skip, std::make_unique<ParserBetweenExpression>()};
+    ParserLeftAssociativeBinaryOperatorList operator_parser {operators,
+        overlapping_operators_to_skip, std::make_unique<ParserBetweenExpression>(), true};
 
 protected:
     const char * getName() const  override{ return "comparison expression"; }
@@ -364,7 +357,6 @@ protected:
     }
 };
 
-
 /** Parser for nullity checking with IS (NOT) NULL.
   */
 class ParserNullityChecking : public IParserBase
diff --git a/src/Parsers/IAST.cpp b/src/Parsers/IAST.cpp
index 0f38fcf98dd..9a8838956f9 100644
--- a/src/Parsers/IAST.cpp
+++ b/src/Parsers/IAST.cpp
@@ -14,6 +14,7 @@ namespace ErrorCodes
     extern const int TOO_DEEP_AST;
     extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_ELEMENT_IN_AST;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -47,6 +48,23 @@ size_t IAST::checkSize(size_t max_size) const
     return res;
 }
 
+void IAST::reset(IAST *& field)
+{
+    if (field == nullptr)
+        return;
+
+    const auto child = std::find_if(children.begin(), children.end(), [field](const auto & p)
+    {
+       return p.get() == field;
+    });
+
+    if (child == children.end())
+        throw Exception("AST subtree not found in children", ErrorCodes::LOGICAL_ERROR);
+
+    children.erase(child);
+    field = nullptr;
+}
+
 
 IAST::Hash IAST::getTreeHash() const
 {
@@ -109,14 +127,6 @@ String IAST::getColumnName() const
 }
 
 
-String IAST::getColumnName(const Settings & settings) const
-{
-    WriteBufferFromOwnString write_buffer;
-    appendColumnName(write_buffer, settings);
-    return write_buffer.str();
-}
-
-
 String IAST::getColumnNameWithoutAlias() const
 {
     WriteBufferFromOwnString write_buffer;
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index 94a7b1a52ab..1c9c81ad378 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Common/Exception.h>
@@ -42,7 +42,6 @@ public:
 
     /** Get the canonical name of the column if the element is a column */
     String getColumnName() const;
-    String getColumnName(const Settings & settings) const;
 
     /** Same as the above but ensure no alias names are used. This is for index analysis */
     String getColumnNameWithoutAlias() const;
@@ -52,8 +51,6 @@ public:
         throw Exception("Trying to get name of not a column: " + getID(), ErrorCodes::LOGICAL_ERROR);
     }
 
-    virtual void appendColumnName(WriteBuffer & ostr, const Settings &) const { appendColumnName(ostr); }
-
     virtual void appendColumnNameWithoutAlias(WriteBuffer &) const
     {
         throw Exception("Trying to get name of not a column: " + getID(), ErrorCodes::LOGICAL_ERROR);
@@ -61,7 +58,6 @@ public:
 
     /** Get the alias, if any, or the canonical name of the column, if it is not. */
     virtual String getAliasOrColumnName() const { return getColumnName(); }
-    virtual String getAliasOrColumnName(const Settings & settings) const { return getColumnName(settings); }
 
     /** Get the alias, if any, or an empty string if it does not exist, or if the element does not support aliases. */
     virtual String tryGetAlias() const { return String(); }
@@ -161,6 +157,8 @@ public:
             set(field, child);
     }
 
+    void reset(IAST *& field);
+
     /// Convert to a string.
 
     /// Format settings.
diff --git a/src/Parsers/IParser.h b/src/Parsers/IParser.h
index bf9fcb407ee..08c3f86538d 100644
--- a/src/Parsers/IParser.h
+++ b/src/Parsers/IParser.h
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include <Core/Defines.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/IAST.h>
 #include <Parsers/TokenIterator.h>
diff --git a/src/Parsers/Lexer.cpp b/src/Parsers/Lexer.cpp
index 24390773d18..3ac9d417b46 100644
--- a/src/Parsers/Lexer.cpp
+++ b/src/Parsers/Lexer.cpp
@@ -1,6 +1,6 @@
 #include <Parsers/Lexer.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 
 namespace DB
 {
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index b282f276762..1ea64d94fe7 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -28,6 +28,8 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_modify_column("MODIFY COLUMN");
     ParserKeyword s_rename_column("RENAME COLUMN");
     ParserKeyword s_comment_column("COMMENT COLUMN");
+    ParserKeyword s_materialize_column("MATERIALIZE COLUMN");
+
     ParserKeyword s_modify_order_by("MODIFY ORDER BY");
     ParserKeyword s_modify_sample_by("MODIFY SAMPLE BY");
     ParserKeyword s_modify_ttl("MODIFY TTL");
@@ -48,6 +50,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_drop_projection("DROP PROJECTION");
     ParserKeyword s_clear_projection("CLEAR PROJECTION");
     ParserKeyword s_materialize_projection("MATERIALIZE PROJECTION");
+    ParserKeyword s_modify_comment("MODIFY COMMENT");
 
     ParserKeyword s_add("ADD");
     ParserKeyword s_drop("DROP");
@@ -101,6 +104,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserKeyword s_ttl("TTL");
 
     ParserKeyword s_remove_ttl("REMOVE TTL");
+    ParserKeyword s_remove_sample_by("REMOVE SAMPLE BY");
 
     ParserCompoundIdentifier parser_name;
     ParserStringLiteral parser_string_literal;
@@ -123,494 +127,42 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserSelectWithUnionQuery select_p;
     ParserTTLExpressionList parser_ttl_list;
 
-    if (is_live_view)
+    switch (alter_object)
     {
-        if (s_refresh.ignore(pos, expected))
+        case ASTAlterQuery::AlterObjectType::LIVE_VIEW:
         {
-            command->type = ASTAlterCommand::LIVE_VIEW_REFRESH;
-        }
-        else
-            return false;
-    }
-    else
-    {
-        if (s_add_column.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_col_decl.parse(pos, command->col_decl, expected))
-                return false;
-
-            if (s_first.ignore(pos, expected))
-                command->first = true;
-            else if (s_after.ignore(pos, expected))
+            if (s_refresh.ignore(pos, expected))
             {
-                if (!parser_name.parse(pos, command->column, expected))
-                    return false;
-            }
-
-            command->type = ASTAlterCommand::ADD_COLUMN;
-        }
-        else if (s_rename_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            if (!s_to.ignore(pos, expected))
-                return false;
-
-            if (!parser_name.parse(pos, command->rename_to, expected))
-                return false;
-
-            command->type = ASTAlterCommand::RENAME_COLUMN;
-        }
-        else if (s_drop_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-        }
-        else if (s_drop_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-            command->part = true;
-        }
-        else if (s_drop_detached_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
-        }
-        else if (s_drop_detached_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
-            command->part = true;
-        }
-        else if (s_drop_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_COLUMN;
-            command->detach = false;
-        }
-        else if (s_clear_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_COLUMN;
-            command->clear_column = true;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_add_index.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_idx_decl.parse(pos, command->index_decl, expected))
-                return false;
-
-            if (s_first.ignore(pos, expected))
-                command->first = true;
-            else if (s_after.ignore(pos, expected))
-            {
-                if (!parser_name.parse(pos, command->index, expected))
-                    return false;
-            }
-
-            command->type = ASTAlterCommand::ADD_INDEX;
-        }
-        else if (s_drop_index.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->index, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_INDEX;
-            command->detach = false;
-        }
-        else if (s_clear_index.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->index, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_INDEX;
-            command->clear_index = true;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_materialize_index.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->index, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MATERIALIZE_INDEX;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_add_projection.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_projection_decl.parse(pos, command->projection_decl, expected))
-                return false;
-
-            if (s_first.ignore(pos, expected))
-                command->first = true;
-            else if (s_after.ignore(pos, expected))
-            {
-                if (!parser_name.parse(pos, command->projection, expected))
-                    return false;
-            }
-
-            command->type = ASTAlterCommand::ADD_PROJECTION;
-        }
-        else if (s_drop_projection.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->projection, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PROJECTION;
-            command->detach = false;
-        }
-        else if (s_clear_projection.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->projection, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PROJECTION;
-            command->clear_projection = true;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_materialize_projection.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->projection, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MATERIALIZE_PROJECTION;
-            command->detach = false;
-
-            if (s_in_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-            }
-        }
-        else if (s_move_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MOVE_PARTITION;
-            command->part = true;
-
-            if (s_to_disk.ignore(pos))
-                command->move_destination_type = DataDestinationType::DISK;
-            else if (s_to_volume.ignore(pos))
-                command->move_destination_type = DataDestinationType::VOLUME;
-            else if (s_to_table.ignore(pos))
-            {
-                if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
-                    return false;
-                command->move_destination_type = DataDestinationType::TABLE;
-            }
-            else if (s_to_shard.ignore(pos))
-            {
-                command->move_destination_type = DataDestinationType::SHARD;
+                command->type = ASTAlterCommand::LIVE_VIEW_REFRESH;
             }
             else
                 return false;
-
-            if (command->move_destination_type != DataDestinationType::TABLE)
-            {
-                ASTPtr ast_space_name;
-                if (!parser_string_literal.parse(pos, ast_space_name, expected))
-                    return false;
-
-                command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
-            }
+            break;
         }
-        else if (s_move_partition.ignore(pos, expected))
+        case ASTAlterQuery::AlterObjectType::DATABASE:
         {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::MOVE_PARTITION;
-
-            if (s_to_disk.ignore(pos))
-                command->move_destination_type = DataDestinationType::DISK;
-            else if (s_to_volume.ignore(pos))
-                command->move_destination_type = DataDestinationType::VOLUME;
-            else if (s_to_table.ignore(pos))
+            if (s_modify_setting.ignore(pos, expected))
             {
-                if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                if (!parser_settings.parse(pos, command->settings_changes, expected))
                     return false;
-                command->move_destination_type = DataDestinationType::TABLE;
+                command->type = ASTAlterCommand::MODIFY_DATABASE_SETTING;
             }
             else
                 return false;
-
-            if (command->move_destination_type != DataDestinationType::TABLE)
+            break;
+        }
+        default:
+            break;
+        case ASTAlterQuery::AlterObjectType::TABLE:
+        {
+            if (s_add_column.ignore(pos, expected))
             {
-                ASTPtr ast_space_name;
-                if (!parser_string_literal.parse(pos, ast_space_name, expected))
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
+
+                if (!parser_col_decl.parse(pos, command->col_decl, expected))
                     return false;
 
-                command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
-            }
-        }
-        else if (s_add_constraint.ignore(pos, expected))
-        {
-            if (s_if_not_exists.ignore(pos, expected))
-                command->if_not_exists = true;
-
-            if (!parser_constraint_decl.parse(pos, command->constraint_decl, expected))
-                return false;
-
-            command->type = ASTAlterCommand::ADD_CONSTRAINT;
-        }
-        else if (s_drop_constraint.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_name.parse(pos, command->constraint, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_CONSTRAINT;
-            command->detach = false;
-        }
-        else if (s_detach_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-            command->detach = true;
-        }
-        else if (s_detach_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DROP_PARTITION;
-            command->part = true;
-            command->detach = true;
-        }
-        else if (s_attach_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            if (s_from.ignore(pos))
-            {
-                if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
-                    return false;
-
-                command->replace = false;
-                command->type = ASTAlterCommand::REPLACE_PARTITION;
-            }
-            else
-            {
-                command->type = ASTAlterCommand::ATTACH_PARTITION;
-            }
-        }
-        else if (s_replace_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            if (!s_from.ignore(pos, expected))
-                return false;
-
-            if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
-                return false;
-
-            command->replace = true;
-            command->type = ASTAlterCommand::REPLACE_PARTITION;
-        }
-        else if (s_attach_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            command->part = true;
-            command->type = ASTAlterCommand::ATTACH_PARTITION;
-        }
-        else if (s_fetch_partition.ignore(pos, expected))
-        {
-            if (!parser_partition.parse(pos, command->partition, expected))
-                return false;
-
-            if (!s_from.ignore(pos, expected))
-                return false;
-
-            ASTPtr ast_from;
-            if (!parser_string_literal.parse(pos, ast_from, expected))
-                return false;
-
-            command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
-            command->type = ASTAlterCommand::FETCH_PARTITION;
-        }
-        else if (s_fetch_part.ignore(pos, expected))
-        {
-            if (!parser_string_literal.parse(pos, command->partition, expected))
-                return false;
-
-            if (!s_from.ignore(pos, expected))
-                return false;
-
-            ASTPtr ast_from;
-            if (!parser_string_literal.parse(pos, ast_from, expected))
-                return false;
-            command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
-            command->part = true;
-            command->type = ASTAlterCommand::FETCH_PARTITION;
-        }
-        else if (s_freeze.ignore(pos, expected))
-        {
-            if (s_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-
-                command->type = ASTAlterCommand::FREEZE_PARTITION;
-            }
-            else
-            {
-                command->type = ASTAlterCommand::FREEZE_ALL;
-            }
-
-            /// WITH NAME 'name' - place local backup to directory with specified name
-            if (s_with.ignore(pos, expected))
-            {
-                if (!s_name.ignore(pos, expected))
-                    return false;
-
-                ASTPtr ast_with_name;
-                if (!parser_string_literal.parse(pos, ast_with_name, expected))
-                    return false;
-
-                command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
-            }
-        }
-        else if (s_unfreeze.ignore(pos, expected))
-        {
-            if (s_partition.ignore(pos, expected))
-            {
-                if (!parser_partition.parse(pos, command->partition, expected))
-                    return false;
-
-                command->type = ASTAlterCommand::UNFREEZE_PARTITION;
-            }
-            else
-            {
-                command->type = ASTAlterCommand::UNFREEZE_ALL;
-            }
-
-            /// WITH NAME 'name' - remove local backup to directory with specified name
-            if (s_with.ignore(pos, expected))
-            {
-                if (!s_name.ignore(pos, expected))
-                    return false;
-
-                ASTPtr ast_with_name;
-                if (!parser_string_literal.parse(pos, ast_with_name, expected))
-                    return false;
-
-                command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else if (s_modify_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
-
-            if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
-                return false;
-
-            if (s_remove.ignore(pos, expected))
-            {
-                if (s_default.ignore(pos, expected))
-                    command->remove_property = "DEFAULT";
-                else if (s_materialized.ignore(pos, expected))
-                    command->remove_property = "MATERIALIZED";
-                else if (s_alias.ignore(pos, expected))
-                    command->remove_property = "ALIAS";
-                else if (s_comment.ignore(pos, expected))
-                    command->remove_property = "COMMENT";
-                else if (s_codec.ignore(pos, expected))
-                    command->remove_property = "CODEC";
-                else if (s_ttl.ignore(pos, expected))
-                    command->remove_property = "TTL";
-                else
-                    return false;
-            }
-            else
-            {
                 if (s_first.ignore(pos, expected))
                     command->first = true;
                 else if (s_after.ignore(pos, expected))
@@ -618,111 +170,606 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                     if (!parser_name.parse(pos, command->column, expected))
                         return false;
                 }
+
+                command->type = ASTAlterCommand::ADD_COLUMN;
             }
-            command->type = ASTAlterCommand::MODIFY_COLUMN;
-        }
-        else if (s_modify_order_by.ignore(pos, expected))
-        {
-            if (!parser_exp_elem.parse(pos, command->order_by, expected))
-                return false;
+            else if (s_rename_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
 
-            command->type = ASTAlterCommand::MODIFY_ORDER_BY;
-        }
-        else if (s_modify_sample_by.ignore(pos, expected))
-        {
-            if (!parser_exp_elem.parse(pos, command->sample_by, expected))
-                return false;
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
 
-            command->type = ASTAlterCommand::MODIFY_SAMPLE_BY;
-        }
-        else if (s_delete.ignore(pos, expected))
-        {
-            if (s_in_partition.ignore(pos, expected))
+                if (!s_to.ignore(pos, expected))
+                    return false;
+
+                if (!parser_name.parse(pos, command->rename_to, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::RENAME_COLUMN;
+            }
+            else if (s_materialize_column.ignore(pos, expected))
+            {
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MATERIALIZE_COLUMN;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_drop_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command->partition, expected))
                     return false;
+
+                command->type = ASTAlterCommand::DROP_PARTITION;
             }
+            else if (s_drop_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
 
-            if (!s_where.ignore(pos, expected))
-                return false;
-
-            if (!parser_exp_elem.parse(pos, command->predicate, expected))
-                return false;
-
-            command->type = ASTAlterCommand::DELETE;
-        }
-        else if (s_update.ignore(pos, expected))
-        {
-            if (!parser_assignment_list.parse(pos, command->update_assignments, expected))
-                return false;
-
-            if (s_in_partition.ignore(pos, expected))
+                command->type = ASTAlterCommand::DROP_PARTITION;
+                command->part = true;
+            }
+            else if (s_drop_detached_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command->partition, expected))
                     return false;
+
+                command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
             }
+            else if (s_drop_detached_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
 
-            if (!s_where.ignore(pos, expected))
-                return false;
+                command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
+                command->part = true;
+            }
+            else if (s_drop_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
 
-            if (!parser_exp_elem.parse(pos, command->predicate, expected))
-                return false;
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
 
-            command->type = ASTAlterCommand::UPDATE;
-        }
-        else if (s_comment_column.ignore(pos, expected))
-        {
-            if (s_if_exists.ignore(pos, expected))
-                command->if_exists = true;
+                command->type = ASTAlterCommand::DROP_COLUMN;
+                command->detach = false;
+            }
+            else if (s_clear_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
 
-            if (!parser_name.parse(pos, command->column, expected))
-                return false;
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
 
-            if (!parser_string_literal.parse(pos, command->comment, expected))
-                return false;
+                command->type = ASTAlterCommand::DROP_COLUMN;
+                command->clear_column = true;
+                command->detach = false;
 
-            command->type = ASTAlterCommand::COMMENT_COLUMN;
-        }
-        else if (s_modify_ttl.ignore(pos, expected))
-        {
-            if (!parser_ttl_list.parse(pos, command->ttl, expected))
-                return false;
-            command->type = ASTAlterCommand::MODIFY_TTL;
-        }
-        else if (s_remove_ttl.ignore(pos, expected))
-        {
-            command->type = ASTAlterCommand::REMOVE_TTL;
-        }
-        else if (s_materialize_ttl.ignore(pos, expected))
-        {
-            command->type = ASTAlterCommand::MATERIALIZE_TTL;
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_add_index.ignore(pos, expected))
+            {
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
 
-            if (s_in_partition.ignore(pos, expected))
+                if (!parser_idx_decl.parse(pos, command->index_decl, expected))
+                    return false;
+
+                if (s_first.ignore(pos, expected))
+                    command->first = true;
+                else if (s_after.ignore(pos, expected))
+                {
+                    if (!parser_name.parse(pos, command->index, expected))
+                        return false;
+                }
+
+                command->type = ASTAlterCommand::ADD_INDEX;
+            }
+            else if (s_drop_index.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->index, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_INDEX;
+                command->detach = false;
+            }
+            else if (s_clear_index.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->index, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_INDEX;
+                command->clear_index = true;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_materialize_index.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->index, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MATERIALIZE_INDEX;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_add_projection.ignore(pos, expected))
+            {
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
+
+                if (!parser_projection_decl.parse(pos, command->projection_decl, expected))
+                    return false;
+
+                if (s_first.ignore(pos, expected))
+                    command->first = true;
+                else if (s_after.ignore(pos, expected))
+                {
+                    if (!parser_name.parse(pos, command->projection, expected))
+                        return false;
+                }
+
+                command->type = ASTAlterCommand::ADD_PROJECTION;
+            }
+            else if (s_drop_projection.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->projection, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PROJECTION;
+                command->detach = false;
+            }
+            else if (s_clear_projection.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->projection, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PROJECTION;
+                command->clear_projection = true;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_materialize_projection.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->projection, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MATERIALIZE_PROJECTION;
+                command->detach = false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_move_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MOVE_PARTITION;
+                command->part = true;
+
+                if (s_to_disk.ignore(pos))
+                    command->move_destination_type = DataDestinationType::DISK;
+                else if (s_to_volume.ignore(pos))
+                    command->move_destination_type = DataDestinationType::VOLUME;
+                else if (s_to_table.ignore(pos))
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                        return false;
+                    command->move_destination_type = DataDestinationType::TABLE;
+                }
+                else if (s_to_shard.ignore(pos))
+                {
+                    command->move_destination_type = DataDestinationType::SHARD;
+                }
+                else
+                    return false;
+
+                if (command->move_destination_type != DataDestinationType::TABLE)
+                {
+                    ASTPtr ast_space_name;
+                    if (!parser_string_literal.parse(pos, ast_space_name, expected))
+                        return false;
+
+                    command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
+                }
+            }
+            else if (s_move_partition.ignore(pos, expected))
             {
                 if (!parser_partition.parse(pos, command->partition, expected))
                     return false;
+
+                command->type = ASTAlterCommand::MOVE_PARTITION;
+
+                if (s_to_disk.ignore(pos))
+                    command->move_destination_type = DataDestinationType::DISK;
+                else if (s_to_volume.ignore(pos))
+                    command->move_destination_type = DataDestinationType::VOLUME;
+                else if (s_to_table.ignore(pos))
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->to_database, command->to_table))
+                        return false;
+                    command->move_destination_type = DataDestinationType::TABLE;
+                }
+                else
+                    return false;
+
+                if (command->move_destination_type != DataDestinationType::TABLE)
+                {
+                    ASTPtr ast_space_name;
+                    if (!parser_string_literal.parse(pos, ast_space_name, expected))
+                        return false;
+
+                    command->move_destination_name = ast_space_name->as<ASTLiteral &>().value.get<const String &>();
+                }
             }
-        }
-        else if (s_modify_setting.ignore(pos, expected))
-        {
-            if (!parser_settings.parse(pos, command->settings_changes, expected))
+            else if (s_add_constraint.ignore(pos, expected))
+            {
+                if (s_if_not_exists.ignore(pos, expected))
+                    command->if_not_exists = true;
+
+                if (!parser_constraint_decl.parse(pos, command->constraint_decl, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::ADD_CONSTRAINT;
+            }
+            else if (s_drop_constraint.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->constraint, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_CONSTRAINT;
+                command->detach = false;
+            }
+            else if (s_detach_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PARTITION;
+                command->detach = true;
+            }
+            else if (s_detach_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DROP_PARTITION;
+                command->part = true;
+                command->detach = true;
+            }
+            else if (s_attach_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                if (s_from.ignore(pos))
+                {
+                    if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
+                        return false;
+
+                    command->replace = false;
+                    command->type = ASTAlterCommand::REPLACE_PARTITION;
+                }
+                else
+                {
+                    command->type = ASTAlterCommand::ATTACH_PARTITION;
+                }
+            }
+            else if (s_replace_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                if (!s_from.ignore(pos, expected))
+                    return false;
+
+                if (!parseDatabaseAndTableName(pos, expected, command->from_database, command->from_table))
+                    return false;
+
+                command->replace = true;
+                command->type = ASTAlterCommand::REPLACE_PARTITION;
+            }
+            else if (s_attach_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                command->part = true;
+                command->type = ASTAlterCommand::ATTACH_PARTITION;
+            }
+            else if (s_fetch_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command->partition, expected))
+                    return false;
+
+                if (!s_from.ignore(pos, expected))
+                    return false;
+
+                ASTPtr ast_from;
+                if (!parser_string_literal.parse(pos, ast_from, expected))
+                    return false;
+
+                command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
+                command->type = ASTAlterCommand::FETCH_PARTITION;
+            }
+            else if (s_fetch_part.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->partition, expected))
+                    return false;
+
+                if (!s_from.ignore(pos, expected))
+                    return false;
+
+                ASTPtr ast_from;
+                if (!parser_string_literal.parse(pos, ast_from, expected))
+                    return false;
+                command->from = ast_from->as<ASTLiteral &>().value.get<const String &>();
+                command->part = true;
+                command->type = ASTAlterCommand::FETCH_PARTITION;
+            }
+            else if (s_freeze.ignore(pos, expected))
+            {
+                if (s_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+
+                    command->type = ASTAlterCommand::FREEZE_PARTITION;
+                }
+                else
+                {
+                    command->type = ASTAlterCommand::FREEZE_ALL;
+                }
+
+                /// WITH NAME 'name' - place local backup to directory with specified name
+                if (s_with.ignore(pos, expected))
+                {
+                    if (!s_name.ignore(pos, expected))
+                        return false;
+
+                    ASTPtr ast_with_name;
+                    if (!parser_string_literal.parse(pos, ast_with_name, expected))
+                        return false;
+
+                    command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
+                }
+            }
+            else if (s_unfreeze.ignore(pos, expected))
+            {
+                if (s_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+
+                    command->type = ASTAlterCommand::UNFREEZE_PARTITION;
+                }
+                else
+                {
+                    command->type = ASTAlterCommand::UNFREEZE_ALL;
+                }
+
+                /// WITH NAME 'name' - remove local backup to directory with specified name
+                if (s_with.ignore(pos, expected))
+                {
+                    if (!s_name.ignore(pos, expected))
+                        return false;
+
+                    ASTPtr ast_with_name;
+                    if (!parser_string_literal.parse(pos, ast_with_name, expected))
+                        return false;
+
+                    command->with_name = ast_with_name->as<ASTLiteral &>().value.get<const String &>();
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (s_modify_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
+                    return false;
+
+                if (s_remove.ignore(pos, expected))
+                {
+                    if (s_default.ignore(pos, expected))
+                        command->remove_property = "DEFAULT";
+                    else if (s_materialized.ignore(pos, expected))
+                        command->remove_property = "MATERIALIZED";
+                    else if (s_alias.ignore(pos, expected))
+                        command->remove_property = "ALIAS";
+                    else if (s_comment.ignore(pos, expected))
+                        command->remove_property = "COMMENT";
+                    else if (s_codec.ignore(pos, expected))
+                        command->remove_property = "CODEC";
+                    else if (s_ttl.ignore(pos, expected))
+                        command->remove_property = "TTL";
+                    else
+                        return false;
+                }
+                else
+                {
+                    if (s_first.ignore(pos, expected))
+                        command->first = true;
+                    else if (s_after.ignore(pos, expected))
+                    {
+                        if (!parser_name.parse(pos, command->column, expected))
+                            return false;
+                    }
+                }
+                command->type = ASTAlterCommand::MODIFY_COLUMN;
+            }
+            else if (s_modify_order_by.ignore(pos, expected))
+            {
+                if (!parser_exp_elem.parse(pos, command->order_by, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MODIFY_ORDER_BY;
+            }
+            else if (s_modify_sample_by.ignore(pos, expected))
+            {
+                if (!parser_exp_elem.parse(pos, command->sample_by, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MODIFY_SAMPLE_BY;
+            }
+            else if (s_remove_sample_by.ignore(pos, expected))
+            {
+                command->type = ASTAlterCommand::REMOVE_SAMPLE_BY;
+            }
+            else if (s_delete.ignore(pos, expected))
+            {
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+
+                if (!s_where.ignore(pos, expected))
+                    return false;
+
+                if (!parser_exp_elem.parse(pos, command->predicate, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::DELETE;
+            }
+            else if (s_update.ignore(pos, expected))
+            {
+                if (!parser_assignment_list.parse(pos, command->update_assignments, expected))
+                    return false;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+
+                if (!s_where.ignore(pos, expected))
+                    return false;
+
+                if (!parser_exp_elem.parse(pos, command->predicate, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::UPDATE;
+            }
+            else if (s_comment_column.ignore(pos, expected))
+            {
+                if (s_if_exists.ignore(pos, expected))
+                    command->if_exists = true;
+
+                if (!parser_name.parse(pos, command->column, expected))
+                    return false;
+
+                if (!parser_string_literal.parse(pos, command->comment, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::COMMENT_COLUMN;
+            }
+            else if (s_modify_ttl.ignore(pos, expected))
+            {
+                if (!parser_ttl_list.parse(pos, command->ttl, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_TTL;
+            }
+            else if (s_remove_ttl.ignore(pos, expected))
+            {
+                command->type = ASTAlterCommand::REMOVE_TTL;
+            }
+            else if (s_materialize_ttl.ignore(pos, expected))
+            {
+                command->type = ASTAlterCommand::MATERIALIZE_TTL;
+
+                if (s_in_partition.ignore(pos, expected))
+                {
+                    if (!parser_partition.parse(pos, command->partition, expected))
+                        return false;
+                }
+            }
+            else if (s_modify_setting.ignore(pos, expected))
+            {
+                if (!parser_settings.parse(pos, command->settings_changes, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_SETTING;
+            }
+            else if (s_reset_setting.ignore(pos, expected))
+            {
+                if (!parser_reset_setting.parse(pos, command->settings_resets, expected))
+                    return false;
+                command->type = ASTAlterCommand::RESET_SETTING;
+            }
+            else if (s_modify_query.ignore(pos, expected))
+            {
+                if (!select_p.parse(pos, command->select, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_QUERY;
+            }
+            else if (s_modify_comment.ignore(pos, expected))
+            {
+                if (!parser_string_literal.parse(pos, command->comment, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::MODIFY_COMMENT;
+            }
+            else
                 return false;
-            command->type = ASTAlterCommand::MODIFY_SETTING;
         }
-        else if (s_reset_setting.ignore(pos, expected))
-        {
-            if (!parser_reset_setting.parse(pos, command->settings_resets, expected))
-                return false;
-            command->type = ASTAlterCommand::RESET_SETTING;
-        }
-        else if (s_modify_query.ignore(pos, expected))
-        {
-            if (!select_p.parse(pos, command->select, expected))
-                return false;
-            command->type = ASTAlterCommand::MODIFY_QUERY;
-        }
-        else
-            return false;
     }
 
     if (command->col_decl)
@@ -770,7 +817,7 @@ bool ParserAlterCommandList::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     node = command_list;
 
     ParserToken s_comma(TokenType::Comma);
-    ParserAlterCommand p_command(is_live_view);
+    ParserAlterCommand p_command(alter_object);
 
     do
     {
@@ -793,37 +840,51 @@ bool ParserAlterQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     ParserKeyword s_alter_table("ALTER TABLE");
     ParserKeyword s_alter_live_view("ALTER LIVE VIEW");
+    ParserKeyword s_alter_database("ALTER DATABASE");
 
-    bool is_live_view = false;
+    ASTAlterQuery::AlterObjectType alter_object_type;
 
-    if (!s_alter_table.ignore(pos, expected))
+    if (s_alter_table.ignore(pos, expected))
     {
-        if (!s_alter_live_view.ignore(pos, expected))
-            return false;
-        else
-            is_live_view = true;
+        alter_object_type = ASTAlterQuery::AlterObjectType::TABLE;
     }
-
-    if (is_live_view)
-        query->is_live_view = true;
-
-    if (!parseDatabaseAndTableName(pos, expected, query->database, query->table))
+    else if (s_alter_live_view.ignore(pos, expected))
+    {
+        alter_object_type = ASTAlterQuery::AlterObjectType::LIVE_VIEW;
+    }
+    else if (s_alter_database.ignore(pos, expected))
+    {
+        alter_object_type = ASTAlterQuery::AlterObjectType::DATABASE;
+    }
+    else
         return false;
 
-    String cluster_str;
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (alter_object_type == ASTAlterQuery::AlterObjectType::DATABASE)
     {
-        if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+        if (!parseDatabase(pos, expected, query->database))
             return false;
     }
-    query->cluster = cluster_str;
+    else
+    {
+        if (!parseDatabaseAndTableName(pos, expected, query->database, query->table))
+            return false;
 
-    ParserAlterCommandList p_command_list(is_live_view);
+        String cluster_str;
+        if (ParserKeyword{"ON"}.ignore(pos, expected))
+        {
+            if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+                return false;
+        }
+        query->cluster = cluster_str;
+    }
+
+    ParserAlterCommandList p_command_list(alter_object_type);
     ASTPtr command_list;
     if (!p_command_list.parse(pos, command_list, expected))
         return false;
 
     query->set(query->command_list, command_list);
+    query->alter_object = alter_object_type;
 
     return true;
 }
diff --git a/src/Parsers/ParserAlterQuery.h b/src/Parsers/ParserAlterQuery.h
index 2e54c4ddbaf..b0029ff88fd 100644
--- a/src/Parsers/ParserAlterQuery.h
+++ b/src/Parsers/ParserAlterQuery.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IParserBase.h>
 #include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTAlterQuery.h>
 
 namespace DB
 {
@@ -17,6 +18,7 @@ namespace DB
   *     [MODIFY SETTING setting_name=setting_value, ...]
   *     [RESET SETTING setting_name, ...]
   *     [COMMENT COLUMN [IF EXISTS] col_name string]
+  *     [MODIFY COMMENT string]
   *     [DROP|DETACH|ATTACH PARTITION|PART partition, ...]
   *     [FETCH PARTITION partition FROM ...]
   *     [FREEZE [PARTITION] [WITH NAME name]]
@@ -45,9 +47,10 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 
 public:
-    bool is_live_view;
+    ASTAlterQuery::AlterObjectType alter_object;
 
-    ParserAlterCommandList(bool is_live_view_ = false) : is_live_view(is_live_view_) {}
+    ParserAlterCommandList(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
+        : alter_object(alter_object_) {}
 };
 
 
@@ -58,9 +61,10 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 
 public:
-    bool is_live_view;
+    ASTAlterQuery::AlterObjectType alter_object;
 
-    ParserAlterCommand(bool is_live_view_ = false) : is_live_view(is_live_view_) {}
+    ParserAlterCommand(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
+        : alter_object(alter_object_) {}
 };
 
 
diff --git a/src/Parsers/ParserBackupQuery.cpp b/src/Parsers/ParserBackupQuery.cpp
new file mode 100644
index 00000000000..f9a54f053af
--- /dev/null
+++ b/src/Parsers/ParserBackupQuery.cpp
@@ -0,0 +1,204 @@
+#include <Parsers/ParserBackupQuery.h>
+#include <Parsers/ASTBackupQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserPartition.h>
+#include <Parsers/ParserSetQuery.h>
+#include <Parsers/parseDatabaseAndTableName.h>
+
+
+namespace DB
+{
+
+namespace
+{
+    using Kind = ASTBackupQuery::Kind;
+    using Element = ASTBackupQuery::Element;
+    using ElementType = ASTBackupQuery::ElementType;
+
+    bool parseName(IParser::Pos & pos, Expected & expected, ElementType type, DatabaseAndTableName & name)
+    {
+        switch (type)
+        {
+            case ElementType::TABLE: [[fallthrough]];
+            case ElementType::DICTIONARY:
+            {
+                return parseDatabaseAndTableName(pos, expected, name.first, name.second);
+            }
+
+            case ElementType::DATABASE:
+            {
+                ASTPtr ast;
+                if (!ParserIdentifier{}.parse(pos, ast, expected))
+                    return false;
+                name.first = getIdentifierName(ast);
+                name.second.clear();
+                return true;
+            }
+
+            case ElementType::TEMPORARY_TABLE:
+            {
+                ASTPtr ast;
+                if (!ParserIdentifier{}.parse(pos, ast, expected))
+                    return false;
+                name.second = getIdentifierName(ast);
+                name.first.clear();
+                return true;
+            }
+
+            default:
+                return true;
+        }
+    }
+
+    bool parsePartitions(IParser::Pos & pos, Expected & expected, ASTs & partitions)
+    {
+        if (!ParserKeyword{"PARTITION"}.ignore(pos, expected) && !ParserKeyword{"PARTITIONS"}.ignore(pos, expected))
+            return false;
+
+        ASTs result;
+        auto parse_list_element = [&]
+        {
+            ASTPtr ast;
+            if (!ParserPartition{}.parse(pos, ast, expected))
+                return false;
+            result.emplace_back(ast);
+            return true;
+        };
+        if (!ParserList::parseUtil(pos, expected, parse_list_element, false))
+            return false;
+
+        partitions = std::move(result);
+        return true;
+    }
+
+    bool parseElement(IParser::Pos & pos, Expected & expected, Element & entry)
+    {
+        return IParserBase::wrapParseImpl(pos, [&]
+        {
+            ElementType type;
+            if (ParserKeyword{"TABLE"}.ignore(pos, expected))
+                type = ElementType::TABLE;
+            else if (ParserKeyword{"DICTIONARY"}.ignore(pos, expected))
+                type = ElementType::DICTIONARY;
+            else if (ParserKeyword{"DATABASE"}.ignore(pos, expected))
+                type = ElementType::DATABASE;
+            else if (ParserKeyword{"ALL DATABASES"}.ignore(pos, expected))
+                type = ElementType::ALL_DATABASES;
+            else if (ParserKeyword{"TEMPORARY TABLE"}.ignore(pos, expected))
+                type = ElementType::TEMPORARY_TABLE;
+            else if (ParserKeyword{"ALL TEMPORARY TABLES"}.ignore(pos, expected))
+                type = ElementType::ALL_TEMPORARY_TABLES;
+            else if (ParserKeyword{"EVERYTHING"}.ignore(pos, expected))
+                type = ElementType::EVERYTHING;
+            else
+                return false;
+
+            DatabaseAndTableName name;
+            if (!parseName(pos, expected, type, name))
+                return false;
+
+            ASTs partitions;
+            if (type == ElementType::TABLE)
+                parsePartitions(pos, expected, partitions);
+
+            DatabaseAndTableName new_name;
+            if (ParserKeyword{"AS"}.ignore(pos, expected) || ParserKeyword{"INTO"}.ignore(pos, expected))
+            {
+                if (!parseName(pos, expected, type, new_name))
+                    return false;
+            }
+
+            if ((type == ElementType::TABLE) && partitions.empty())
+                parsePartitions(pos, expected, partitions);
+
+            entry.type = type;
+            entry.name = std::move(name);
+            entry.new_name = std::move(new_name);
+            entry.partitions = std::move(partitions);
+            return true;
+        });
+    }
+
+    bool parseElements(IParser::Pos & pos, Expected & expected, std::vector<Element> & elements)
+    {
+        return IParserBase::wrapParseImpl(pos, [&]
+        {
+            std::vector<Element> result;
+
+            auto parse_element = [&]
+            {
+                Element element;
+                if (parseElement(pos, expected, element))
+                {
+                    result.emplace_back(std::move(element));
+                    return true;
+                }
+                return false;
+            };
+
+            if (!ParserList::parseUtil(pos, expected, parse_element, false))
+                return false;
+
+            elements = std::move(result);
+            return true;
+        });
+    }
+
+    bool parseSettings(IParser::Pos & pos, Expected & expected, ASTPtr & settings)
+    {
+        return IParserBase::wrapParseImpl(pos, [&]
+        {
+            if (!ParserKeyword{"SETTINGS"}.ignore(pos, expected))
+                return false;
+
+            ASTPtr result;
+            if (!ParserSetQuery{true}.parse(pos, result, expected))
+                return false;
+
+            settings = std::move(result);
+            return true;
+        });
+    }
+}
+
+
+bool ParserBackupQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    Kind kind;
+    if (ParserKeyword{"BACKUP"}.ignore(pos, expected))
+        kind = Kind::BACKUP;
+    else if (ParserKeyword{"RESTORE"}.ignore(pos, expected))
+        kind = Kind::RESTORE;
+    else
+        return false;
+
+    std::vector<Element> elements;
+    if (!parseElements(pos, expected, elements))
+        return false;
+
+    if (!ParserKeyword{(kind == Kind::BACKUP) ? "TO" : "FROM"}.ignore(pos, expected))
+        return false;
+    ASTPtr ast;
+    if (!ParserStringLiteral{}.parse(pos, ast, expected))
+        return false;
+    String backup_name = ast->as<ASTLiteral &>().value.safeGet<String>();
+
+    ASTPtr settings;
+    parseSettings(pos, expected, settings);
+
+    auto query = std::make_shared<ASTBackupQuery>();
+    node = query;
+
+    query->kind = kind;
+    query->elements = std::move(elements);
+    query->backup_name = std::move(backup_name);
+    query->settings = std::move(settings);
+
+    return true;
+}
+
+}
diff --git a/src/Parsers/ParserBackupQuery.h b/src/Parsers/ParserBackupQuery.h
new file mode 100644
index 00000000000..45a551cfd00
--- /dev/null
+++ b/src/Parsers/ParserBackupQuery.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <Parsers/IParserBase.h>
+
+
+namespace DB
+{
+/** Parses queries like
+  * BACKUP { TABLE [db.]table_name [AS [db.]table_name_in_backup] [PARTITION[S] partition_expr [,...]] |
+  *          DICTIONARY [db.]dictionary_name [AS [db.]dictionary_name_in_backup] |
+  *          DATABASE database_name [AS database_name_in_backup] |
+  *          ALL DATABASES |
+  *          TEMPORARY TABLE table_name [AS table_name_in_backup]
+  *          ALL TEMPORARY TABLES |
+  *          EVERYTHING } [,...]
+  *        TO 'backup_name'
+  *        [SETTINGS base_backup = 'base_backup_name']
+  *
+  * RESTORE { TABLE [db.]table_name_in_backup [INTO [db.]table_name] [PARTITION[S] partition_expr [,...]] |
+  *           DICTIONARY [db.]dictionary_name_in_backup [INTO [db.]dictionary_name] |
+  *           DATABASE database_name_in_backup [INTO database_name] |
+  *           ALL DATABASES |
+  *           TEMPORARY TABLE table_name_in_backup [INTO table_name] |
+  *           ALL TEMPORARY TABLES |
+  *           EVERYTHING } [,...]
+  *         FROM 'backup_name'
+  */
+class ParserBackupQuery : public IParserBase
+{
+protected:
+    const char * getName() const override { return "BACKUP or RESTORE query"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+}
diff --git a/src/Parsers/ParserCreateFunctionQuery.cpp b/src/Parsers/ParserCreateFunctionQuery.cpp
new file mode 100644
index 00000000000..55e6e2df1d2
--- /dev/null
+++ b/src/Parsers/ParserCreateFunctionQuery.cpp
@@ -0,0 +1,71 @@
+#include <Parsers/ParserCreateFunctionQuery.h>
+
+#include <Parsers/ASTCreateFunctionQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+
+
+namespace DB
+{
+
+bool ParserCreateFunctionQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserKeyword s_create("CREATE");
+    ParserKeyword s_function("FUNCTION");
+    ParserKeyword s_or_replace("OR REPLACE");
+    ParserKeyword s_if_not_exists("IF NOT EXISTS");
+    ParserKeyword s_on("ON");
+    ParserIdentifier function_name_p;
+    ParserKeyword s_as("AS");
+    ParserLambdaExpression lambda_p;
+
+    ASTPtr function_name;
+    ASTPtr function_core;
+
+    String cluster_str;
+    bool or_replace = false;
+    bool if_not_exists = false;
+
+    if (!s_create.ignore(pos, expected))
+        return false;
+
+    if (s_or_replace.ignore(pos, expected))
+        or_replace = true;
+
+    if (!s_function.ignore(pos, expected))
+        return false;
+
+    if (!or_replace && s_if_not_exists.ignore(pos, expected))
+        if_not_exists = true;
+
+    if (!function_name_p.parse(pos, function_name, expected))
+        return false;
+
+    if (s_on.ignore(pos, expected))
+    {
+        if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+            return false;
+    }
+
+    if (!s_as.ignore(pos, expected))
+        return false;
+
+    if (!lambda_p.parse(pos, function_core, expected))
+        return false;
+
+    auto create_function_query = std::make_shared<ASTCreateFunctionQuery>();
+    node = create_function_query;
+
+    create_function_query->function_name = function_name->as<ASTIdentifier &>().name();
+    create_function_query->function_core = function_core;
+    create_function_query->or_replace = or_replace;
+    create_function_query->if_not_exists = if_not_exists;
+    create_function_query->cluster = std::move(cluster_str);
+
+    return true;
+}
+
+}
diff --git a/src/Parsers/ParserCreateFunctionQuery.h b/src/Parsers/ParserCreateFunctionQuery.h
new file mode 100644
index 00000000000..aac643b995d
--- /dev/null
+++ b/src/Parsers/ParserCreateFunctionQuery.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "IParserBase.h"
+
+namespace DB
+{
+
+/// CREATE FUNCTION test AS x -> x || '1'
+class ParserCreateFunctionQuery : public IParserBase
+{
+protected:
+    const char * getName() const override { return "CREATE FUNCTION query"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+
+}
diff --git a/src/Parsers/ParserCreateQuery.cpp b/src/Parsers/ParserCreateQuery.cpp
index d4525883e36..af2966948fb 100644
--- a/src/Parsers/ParserCreateQuery.cpp
+++ b/src/Parsers/ParserCreateQuery.cpp
@@ -26,6 +26,20 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+namespace
+{
+ASTPtr parseComment(IParser::Pos & pos, Expected & expected)
+{
+    ParserKeyword s_comment("COMMENT");
+    ParserStringLiteral string_literal_parser;
+    ASTPtr comment;
+
+    s_comment.ignore(pos, expected) && string_literal_parser.parse(pos, comment, expected);
+
+    return comment;
+}
+}
+
 bool ParserNestedTable::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserToken open(TokenType::OpeningRoundBracket);
@@ -314,7 +328,6 @@ bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword s_sample_by("SAMPLE BY");
     ParserKeyword s_ttl("TTL");
     ParserKeyword s_settings("SETTINGS");
-    ParserKeyword s_comment("COMMENT");
 
     ParserIdentifierWithOptionalParameters ident_with_optional_params_p;
     ParserExpression expression_p;
@@ -329,7 +342,6 @@ bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ASTPtr sample_by;
     ASTPtr ttl_table;
     ASTPtr settings;
-    ASTPtr comment_expression;
 
     if (!s_engine.ignore(pos, expected))
         return false;
@@ -387,13 +399,6 @@ bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
                 return false;
         }
 
-        if (s_comment.ignore(pos, expected))
-        {
-            /// should be followed by a string literal
-            if (!string_literal_parser.parse(pos, comment_expression, expected))
-                return false;
-        }
-
         break;
     }
 
@@ -407,8 +412,6 @@ bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     storage->set(storage->settings, settings);
 
-    storage->set(storage->comment, comment_expression);
-
     node = storage;
     return true;
 }
@@ -481,7 +484,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
     if (attach && s_from.ignore(pos, expected))
     {
-        ParserLiteral from_path_p;
+        ParserStringLiteral from_path_p;
         if (!from_path_p.parse(pos, from_path, expected))
             return false;
     }
@@ -568,7 +571,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
             }
         }
     }
-
+    auto comment = parseComment(pos, expected);
 
     auto query = std::make_shared<ASTCreateQuery>();
     node = query;
@@ -590,6 +593,9 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     query->set(query->columns_list, columns_list);
     query->set(query->storage, storage);
 
+    if (comment)
+        query->set(query->comment, comment);
+
     if (query->storage && query->columns_list && query->columns_list->primary_key)
     {
         if (query->storage->primary_key)
@@ -803,7 +809,7 @@ bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     }
 
     storage_p.parse(pos, storage, expected);
-
+    auto comment = parseComment(pos, expected);
 
     auto query = std::make_shared<ASTCreateQuery>();
     node = query;
@@ -816,6 +822,8 @@ bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     query->cluster = cluster_str;
 
     query->set(query->storage, storage);
+    if (comment)
+        query->set(query->comment, comment);
 
     return true;
 }
@@ -896,7 +904,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
     if (ParserKeyword{"TO INNER UUID"}.ignore(pos, expected))
     {
-        ParserLiteral literal_p;
+        ParserStringLiteral literal_p;
         if (!literal_p.parse(pos, to_inner_uuid, expected))
             return false;
     }
@@ -934,6 +942,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     if (!select_p.parse(pos, select, expected))
         return false;
 
+    auto comment = parseComment(pos, expected);
 
     auto query = std::make_shared<ASTCreateQuery>();
     node = query;
@@ -958,6 +967,8 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
     query->set(query->columns_list, columns_list);
     query->set(query->storage, storage);
+    if (comment)
+        query->set(query->comment, comment);
 
     tryGetIdentifierNameInto(as_database, query->as_database);
     tryGetIdentifierNameInto(as_table, query->as_table);
@@ -1039,6 +1050,8 @@ bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, E
             return false;
     }
 
+    auto comment = parseComment(pos, expected);
+
     auto query = std::make_shared<ASTCreateQuery>();
     node = query;
     query->is_dictionary = true;
@@ -1056,6 +1069,9 @@ bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, E
     query->set(query->dictionary, dictionary);
     query->cluster = cluster_str;
 
+    if (comment)
+        query->set(query->comment, comment);
+
     return true;
 }
 
diff --git a/src/Parsers/ParserCreateQuotaQuery.cpp b/src/Parsers/ParserCreateQuotaQuery.cpp
index 084c9f32690..682b345b937 100644
--- a/src/Parsers/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/ParserCreateQuotaQuery.cpp
@@ -10,7 +10,7 @@
 #include <Parsers/ASTRolesOrUsersSet.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Common/FieldVisitorConvertToNumber.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 
diff --git a/src/Parsers/ParserCreateRowPolicyQuery.cpp b/src/Parsers/ParserCreateRowPolicyQuery.cpp
index 37c2aed7830..d4d3db3f846 100644
--- a/src/Parsers/ParserCreateRowPolicyQuery.cpp
+++ b/src/Parsers/ParserCreateRowPolicyQuery.cpp
@@ -10,7 +10,7 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ASTLiteral.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
diff --git a/src/Parsers/ParserCreateUserQuery.cpp b/src/Parsers/ParserCreateUserQuery.cpp
index 72246a27f80..7cada4b8ee8 100644
--- a/src/Parsers/ParserCreateUserQuery.cpp
+++ b/src/Parsers/ParserCreateUserQuery.cpp
@@ -13,7 +13,7 @@
 #include <Parsers/ASTSettingsProfileElement.h>
 #include <Parsers/ParserSettingsProfileElement.h>
 #include <Parsers/ParserDatabaseOrNone.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
diff --git a/src/Parsers/ParserDropAccessEntityQuery.cpp b/src/Parsers/ParserDropAccessEntityQuery.cpp
index d59b68ba5ad..14ef35e232c 100644
--- a/src/Parsers/ParserDropAccessEntityQuery.cpp
+++ b/src/Parsers/ParserDropAccessEntityQuery.cpp
@@ -5,7 +5,7 @@
 #include <Parsers/ASTRowPolicyName.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Parsers/parseUserName.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Parsers/ParserDropFunctionQuery.cpp b/src/Parsers/ParserDropFunctionQuery.cpp
new file mode 100644
index 00000000000..3f35124f9ab
--- /dev/null
+++ b/src/Parsers/ParserDropFunctionQuery.cpp
@@ -0,0 +1,52 @@
+#include <Parsers/ASTDropFunctionQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ParserDropFunctionQuery.h>
+
+namespace DB
+{
+
+bool ParserDropFunctionQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserKeyword s_drop("DROP");
+    ParserKeyword s_function("FUNCTION");
+    ParserKeyword s_if_exists("IF EXISTS");
+    ParserKeyword s_on("ON");
+    ParserIdentifier function_name_p;
+
+    String cluster_str;
+    bool if_exists = false;
+
+    ASTPtr function_name;
+
+    if (!s_drop.ignore(pos, expected))
+        return false;
+
+    if (!s_function.ignore(pos, expected))
+        return false;
+
+    if (s_if_exists.ignore(pos, expected))
+        if_exists = true;
+
+    if (!function_name_p.parse(pos, function_name, expected))
+        return false;
+
+    if (s_on.ignore(pos, expected))
+    {
+        if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+            return false;
+    }
+
+    auto drop_function_query = std::make_shared<ASTDropFunctionQuery>();
+    drop_function_query->if_exists = if_exists;
+    drop_function_query->cluster = std::move(cluster_str);
+
+    node = drop_function_query;
+
+    drop_function_query->function_name = function_name->as<ASTIdentifier &>().name();
+
+    return true;
+}
+
+}
diff --git a/src/Parsers/ParserDropFunctionQuery.h b/src/Parsers/ParserDropFunctionQuery.h
new file mode 100644
index 00000000000..03602c7ae96
--- /dev/null
+++ b/src/Parsers/ParserDropFunctionQuery.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "IParserBase.h"
+
+namespace DB
+{
+/// DROP FUNCTION function1
+class ParserDropFunctionQuery : public IParserBase
+{
+protected:
+    const char * getName() const override { return "DROP FUNCTION query"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
+}
diff --git a/src/Parsers/ParserExplainQuery.cpp b/src/Parsers/ParserExplainQuery.cpp
index b4ba0523239..ffaab0f2b6d 100644
--- a/src/Parsers/ParserExplainQuery.cpp
+++ b/src/Parsers/ParserExplainQuery.cpp
@@ -4,6 +4,7 @@
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserSelectWithUnionQuery.h>
+#include <Parsers/ParserInsertQuery.h>
 #include <Parsers/ParserSetQuery.h>
 #include <Parsers/ParserQuery.h>
 
@@ -54,6 +55,7 @@ bool ParserExplainQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
     ParserCreateTableQuery create_p;
     ParserSelectWithUnionQuery select_p;
+    ParserInsertQuery insert_p(end);
     ASTPtr query;
     if (kind == ASTExplainQuery::ExplainKind::ParsedAST)
     {
@@ -64,7 +66,8 @@ bool ParserExplainQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             return false;
     }
     else if (select_p.parse(pos, query, expected) ||
-        create_p.parse(pos, query, expected))
+        create_p.parse(pos, query, expected) ||
+        insert_p.parse(pos, query, expected))
         explain_query->setExplainedQuery(std::move(query));
     else
         return false;
diff --git a/src/Parsers/ParserExternalDDLQuery.cpp b/src/Parsers/ParserExternalDDLQuery.cpp
index b6ada39a800..c64c50cd99f 100644
--- a/src/Parsers/ParserExternalDDLQuery.cpp
+++ b/src/Parsers/ParserExternalDDLQuery.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <Parsers/ASTExternalDDLQuery.h>
 #include <Parsers/CommonParsers.h>
diff --git a/src/Parsers/ParserInsertQuery.cpp b/src/Parsers/ParserInsertQuery.cpp
index 1f987edf13f..1bc552af384 100644
--- a/src/Parsers/ParserInsertQuery.cpp
+++ b/src/Parsers/ParserInsertQuery.cpp
@@ -11,6 +11,7 @@
 #include <Parsers/ParserSetQuery.h>
 #include <Parsers/InsertQuerySettingsPushDownVisitor.h>
 #include <Common/typeid_cast.h>
+#include "Parsers/IAST_fwd.h"
 
 
 namespace DB
@@ -24,7 +25,10 @@ namespace ErrorCodes
 
 bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    /// Create parsers
     ParserKeyword s_insert_into("INSERT INTO");
+    ParserKeyword s_from_infile("FROM INFILE");
+    ParserKeyword s_compression("COMPRESSION");
     ParserKeyword s_table("TABLE");
     ParserKeyword s_function("FUNCTION");
     ParserToken s_dot(TokenType::Dot);
@@ -33,39 +37,64 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserKeyword s_settings("SETTINGS");
     ParserKeyword s_select("SELECT");
     ParserKeyword s_watch("WATCH");
+    ParserKeyword s_partition_by("PARTITION BY");
     ParserKeyword s_with("WITH");
     ParserToken s_lparen(TokenType::OpeningRoundBracket);
     ParserToken s_rparen(TokenType::ClosingRoundBracket);
     ParserIdentifier name_p;
     ParserList columns_p(std::make_unique<ParserInsertElement>(), std::make_unique<ParserToken>(TokenType::Comma), false);
     ParserFunction table_function_p{false};
+    ParserStringLiteral infile_name_p;
+    ParserExpressionWithOptionalAlias exp_elem_p(false);
 
+    /// create ASTPtr variables (result of parsing will be put in them).
+    /// They will be used to initialize ASTInsertQuery's fields.
     ASTPtr database;
     ASTPtr table;
+    ASTPtr infile;
     ASTPtr columns;
     ASTPtr format;
     ASTPtr select;
     ASTPtr watch;
     ASTPtr table_function;
     ASTPtr settings_ast;
+    ASTPtr partition_by_expr;
+    ASTPtr compression;
+
     /// Insertion data
     const char * data = nullptr;
 
+    /// Check for key words `INSERT INTO`. If it isn't found, the query can't be parsed as insert query.
     if (!s_insert_into.ignore(pos, expected))
         return false;
 
+    /// try to find 'TABLE'
     s_table.ignore(pos, expected);
 
+    /// Search for 'FUNCTION'. If this key word is in query, read fields for insertion into 'TABLE FUNCTION'.
+    /// Word table is optional for table functions. (for example, s3 table function)
+    /// Otherwise fill 'TABLE' fields.
     if (s_function.ignore(pos, expected))
     {
+        /// Read function name
         if (!table_function_p.parse(pos, table_function, expected))
             return false;
+
+        /// Support insertion values with partition by.
+        if (s_partition_by.ignore(pos, expected))
+        {
+            if (!exp_elem_p.parse(pos, partition_by_expr, expected))
+                return false;
+        }
     }
     else
     {
+        /// Read one word. It can be table or database name.
         if (!name_p.parse(pos, table, expected))
             return false;
 
+        /// If there is a dot, previous name was database name,
+        /// so read table name after dot.
         if (s_dot.ignore(pos, expected))
         {
             database = table;
@@ -84,20 +113,45 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             return false;
     }
 
-    Pos before_values = pos;
-
-    /// VALUES or FORMAT or SELECT
-    if (s_values.ignore(pos, expected))
+    /// Check if file is a source of data.
+    if (s_from_infile.ignore(pos, expected))
     {
+        /// Read its name to process it later
+        if (!infile_name_p.parse(pos, infile, expected))
+            return false;
+
+        /// Check for 'COMPRESSION' parameter (optional)
+        if (s_compression.ignore(pos, expected))
+        {
+            /// Read compression name. Create parser for this purpose.
+            ParserStringLiteral compression_p;
+            if (!compression_p.parse(pos, compression, expected))
+                return false;
+        }
+    }
+
+    Pos before_values = pos;
+    String format_str;
+
+    /// VALUES or FROM INFILE or FORMAT or SELECT
+    if (!infile && s_values.ignore(pos, expected))
+    {
+        /// If VALUES is defined in query, everything except setting will be parsed as data
         data = pos->begin;
+        format_str = "Values";
     }
     else if (s_format.ignore(pos, expected))
     {
+        /// If FORMAT is defined, read format name
         if (!name_p.parse(pos, format, expected))
             return false;
+
+        tryGetIdentifierNameInto(format, format_str);
     }
     else if (s_select.ignore(pos, expected) || s_with.ignore(pos,expected))
     {
+        /// If SELECT is defined, return to position before select and parse
+        /// rest of query as SELECT query.
         pos = before_values;
         ParserSelectWithUnionQuery select_p;
         select_p.parse(pos, select, expected);
@@ -105,9 +159,13 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         /// FORMAT section is expected if we have input() in SELECT part
         if (s_format.ignore(pos, expected) && !name_p.parse(pos, format, expected))
             return false;
+
+        tryGetIdentifierNameInto(format, format_str);
     }
     else if (s_watch.ignore(pos, expected))
     {
+        /// If WATCH is defined, return to position before WATCH and parse
+        /// rest of query as WATCH query.
         pos = before_values;
         ParserWatchQuery watch_p;
         watch_p.parse(pos, watch, expected);
@@ -118,11 +176,14 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     }
     else
     {
+        /// If all previous conditions were false, query is incorrect
         return false;
     }
 
+    /// Read SETTINGS if they are defined
     if (s_settings.ignore(pos, expected))
     {
+        /// Settings are written like SET query, so parse them with ParserSetQuery
         ParserSetQuery parser_settings(true);
         if (!parser_settings.parse(pos, settings_ast, expected))
             return false;
@@ -135,13 +196,14 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         InsertQuerySettingsPushDownVisitor(visitor_data).visit(select);
     }
 
-
-    if (format)
+    /// In case of defined format, data follows it.
+    if (format && !infile)
     {
         Pos last_token = pos;
         --last_token;
         data = last_token->end;
 
+        /// If format name is followed by ';' (end of query symbol) there is no data to insert.
         if (data < end && *data == ';')
             throw Exception("You have excessive ';' symbol before data for INSERT.\n"
                                     "Example:\n\n"
@@ -164,12 +226,21 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             ++data;
     }
 
+    /// Create query and fill its fields.
     auto query = std::make_shared<ASTInsertQuery>();
     node = query;
 
+    if (infile)
+    {
+        query->infile = infile;
+        if (compression)
+            query->compression = compression;
+    }
+
     if (table_function)
     {
         query->table_function = table_function;
+        query->partition_by = partition_by_expr;
     }
     else
     {
@@ -177,9 +248,8 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         tryGetIdentifierNameInto(table, query->table_id.table_name);
     }
 
-    tryGetIdentifierNameInto(format, query->format);
-
     query->columns = columns;
+    query->format = std::move(format_str);
     query->select = select;
     query->watch = watch;
     query->settings_ast = settings_ast;
diff --git a/src/Parsers/ParserKillQueryQuery.cpp b/src/Parsers/ParserKillQueryQuery.cpp
index a195a778ed2..bc895406c9f 100644
--- a/src/Parsers/ParserKillQueryQuery.cpp
+++ b/src/Parsers/ParserKillQueryQuery.cpp
@@ -17,6 +17,7 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
     ParserKeyword p_kill{"KILL"};
     ParserKeyword p_query{"QUERY"};
     ParserKeyword p_mutation{"MUTATION"};
+    ParserKeyword p_part_move_to_shard{"PART_MOVE_TO_SHARD"};
     ParserKeyword p_on{"ON"};
     ParserKeyword p_test{"TEST"};
     ParserKeyword p_sync{"SYNC"};
@@ -31,6 +32,8 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
         query->type = ASTKillQueryQuery::Type::Query;
     else if (p_mutation.ignore(pos, expected))
         query->type = ASTKillQueryQuery::Type::Mutation;
+    else if (p_part_move_to_shard.ignore(pos, expected))
+        query->type = ASTKillQueryQuery::Type::PartMoveToShard;
     else
         return false;
 
diff --git a/src/Parsers/ParserQuery.cpp b/src/Parsers/ParserQuery.cpp
index 4550bdc8a75..345013b6475 100644
--- a/src/Parsers/ParserQuery.cpp
+++ b/src/Parsers/ParserQuery.cpp
@@ -1,4 +1,6 @@
 #include <Parsers/ParserAlterQuery.h>
+#include <Parsers/ParserCreateFunctionQuery.h>
+#include <Parsers/ParserBackupQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserCreateQuotaQuery.h>
 #include <Parsers/ParserCreateRoleQuery.h>
@@ -6,6 +8,7 @@
 #include <Parsers/ParserCreateSettingsProfileQuery.h>
 #include <Parsers/ParserCreateUserQuery.h>
 #include <Parsers/ParserDropAccessEntityQuery.h>
+#include <Parsers/ParserDropFunctionQuery.h>
 #include <Parsers/ParserDropQuery.h>
 #include <Parsers/ParserGrantQuery.h>
 #include <Parsers/ParserInsertQuery.h>
@@ -36,10 +39,13 @@ bool ParserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserCreateQuotaQuery create_quota_p;
     ParserCreateRowPolicyQuery create_row_policy_p;
     ParserCreateSettingsProfileQuery create_settings_profile_p;
+    ParserCreateFunctionQuery create_function_p;
+    ParserDropFunctionQuery drop_function_p;
     ParserDropAccessEntityQuery drop_access_entity_p;
     ParserGrantQuery grant_p;
     ParserSetRoleQuery set_role_p;
     ParserExternalDDLQuery external_ddl_p;
+    ParserBackupQuery backup_p;
 
     bool res = query_with_output_p.parse(pos, node, expected)
         || insert_p.parse(pos, node, expected)
@@ -52,9 +58,12 @@ bool ParserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         || create_quota_p.parse(pos, node, expected)
         || create_row_policy_p.parse(pos, node, expected)
         || create_settings_profile_p.parse(pos, node, expected)
+        || create_function_p.parse(pos, node, expected)
+        || drop_function_p.parse(pos, node, expected)
         || drop_access_entity_p.parse(pos, node, expected)
         || grant_p.parse(pos, node, expected)
-        || external_ddl_p.parse(pos, node, expected);
+        || external_ddl_p.parse(pos, node, expected)
+        || backup_p.parse(pos, node, expected);
 
     return res;
 }
diff --git a/src/Parsers/ParserQueryWithOutput.cpp b/src/Parsers/ParserQueryWithOutput.cpp
index d5aa1e47533..4309063a736 100644
--- a/src/Parsers/ParserQueryWithOutput.cpp
+++ b/src/Parsers/ParserQueryWithOutput.cpp
@@ -1,28 +1,29 @@
-#include <Parsers/ParserQueryWithOutput.h>
-#include <Parsers/ParserShowTablesQuery.h>
-#include <Parsers/ParserSelectWithUnionQuery.h>
-#include <Parsers/ParserTablePropertiesQuery.h>
-#include <Parsers/ParserDescribeTableQuery.h>
-#include <Parsers/ParserShowProcesslistQuery.h>
-#include <Parsers/ParserCheckQuery.h>
-#include <Parsers/ParserCreateQuery.h>
-#include <Parsers/ParserRenameQuery.h>
-#include <Parsers/ParserAlterQuery.h>
-#include <Parsers/ParserDropQuery.h>
-#include <Parsers/ParserKillQueryQuery.h>
-#include <Parsers/ParserOptimizeQuery.h>
-#include <Parsers/ParserWatchQuery.h>
-#include <Parsers/ParserSetQuery.h>
 #include <Parsers/ASTExplainQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSetQuery.h>
+#include <Parsers/ParserAlterQuery.h>
+#include <Parsers/ParserCheckQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ParserDescribeTableQuery.h>
+#include <Parsers/ParserDropQuery.h>
+#include <Parsers/ParserExplainQuery.h>
+#include <Parsers/ParserKillQueryQuery.h>
+#include <Parsers/ParserOptimizeQuery.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserRenameQuery.h>
+#include <Parsers/ParserSelectWithUnionQuery.h>
+#include <Parsers/ParserSetQuery.h>
 #include <Parsers/ParserShowAccessEntitiesQuery.h>
 #include <Parsers/ParserShowAccessQuery.h>
 #include <Parsers/ParserShowCreateAccessEntityQuery.h>
 #include <Parsers/ParserShowGrantsQuery.h>
 #include <Parsers/ParserShowPrivilegesQuery.h>
-#include <Parsers/ParserExplainQuery.h>
+#include <Parsers/ParserShowProcesslistQuery.h>
+#include <Parsers/ParserShowTablesQuery.h>
+#include <Parsers/ParserTablePropertiesQuery.h>
+#include <Parsers/ParserWatchQuery.h>
 #include <Parsers/QueryWithOutputSettingsPushDownVisitor.h>
+#include "Common/Exception.h"
 
 
 namespace DB
@@ -86,6 +87,14 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         if (!out_file_p.parse(pos, query_with_output.out_file, expected))
             return false;
 
+        ParserKeyword s_compression_method("COMPRESSION");
+        if (s_compression_method.ignore(pos, expected))
+        {
+            ParserStringLiteral compression;
+            if (!compression.parse(pos, query_with_output.compression, expected))
+                return false;
+        }
+
         query_with_output.children.push_back(query_with_output.out_file);
     }
 
diff --git a/src/Parsers/ParserSelectWithUnionQuery.cpp b/src/Parsers/ParserSelectWithUnionQuery.cpp
index 87e2dab1a47..532a9e20735 100644
--- a/src/Parsers/ParserSelectWithUnionQuery.cpp
+++ b/src/Parsers/ParserSelectWithUnionQuery.cpp
@@ -10,12 +10,7 @@ namespace DB
 bool ParserSelectWithUnionQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ASTPtr list_node;
-
-    ParserUnionList parser(
-        std::make_unique<ParserUnionQueryElement>(),
-        std::make_unique<ParserKeyword>("UNION"),
-        std::make_unique<ParserKeyword>("ALL"),
-        std::make_unique<ParserKeyword>("DISTINCT"));
+    ParserUnionList parser;
 
     if (!parser.parse(pos, list_node, expected))
         return false;
diff --git a/src/Parsers/ParserShowAccessEntitiesQuery.cpp b/src/Parsers/ParserShowAccessEntitiesQuery.cpp
index 4e934327a14..96a275902fb 100644
--- a/src/Parsers/ParserShowAccessEntitiesQuery.cpp
+++ b/src/Parsers/ParserShowAccessEntitiesQuery.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/CommonParsers.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Parsers/ParserShowCreateAccessEntityQuery.cpp b/src/Parsers/ParserShowCreateAccessEntityQuery.cpp
index 05b6b333d6a..86ee64ab778 100644
--- a/src/Parsers/ParserShowCreateAccessEntityQuery.cpp
+++ b/src/Parsers/ParserShowCreateAccessEntityQuery.cpp
@@ -6,7 +6,7 @@
 #include <Parsers/ASTRowPolicyName.h>
 #include <Parsers/parseUserName.h>
 #include <Parsers/parseDatabaseAndTableName.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <assert.h>
 
 
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index 66bd39e0202..b861cbd2a5a 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -6,6 +6,8 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 
+#include <magic_enum.hpp>
+#include <base/EnumReflection.h>
 
 namespace ErrorCodes
 {
@@ -67,13 +69,14 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
     auto res = std::make_shared<ASTSystemQuery>();
 
     bool found = false;
-    for (int i = static_cast<int>(Type::UNKNOWN) + 1; i < static_cast<int>(Type::END); ++i)
+
+    for (const auto & type : magic_enum::enum_values<Type>())
     {
-        Type t = static_cast<Type>(i);
-        if (ParserKeyword{ASTSystemQuery::typeToString(t)}.ignore(pos, expected))
+        if (ParserKeyword{ASTSystemQuery::typeToString(type)}.ignore(pos, expected))
         {
-            res->type = t;
+            res->type = type;
             found = true;
+            break;
         }
     }
 
@@ -117,6 +120,35 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
 
             break;
         }
+        case Type::RELOAD_FUNCTION:
+        {
+            String cluster_str;
+            if (ParserKeyword{"ON"}.ignore(pos, expected))
+            {
+                if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+                    return false;
+            }
+            res->cluster = cluster_str;
+            ASTPtr ast;
+            if (ParserStringLiteral{}.parse(pos, ast, expected))
+            {
+                res->target_function = ast->as<ASTLiteral &>().value.safeGet<String>();
+            }
+            else
+            {
+                ParserIdentifier function_parser;
+                ASTPtr function;
+                String target_function;
+
+                if (!function_parser.parse(pos, function, expected))
+                    return false;
+
+                if (!tryGetIdentifierNameInto(function, res->target_function))
+                    return false;
+            }
+
+            break;
+        }
         case Type::DROP_REPLICA:
         {
             ASTPtr ast;
diff --git a/src/Parsers/StringRange.h b/src/Parsers/StringRange.h
index 1fc285a562e..3c5959fd0a3 100644
--- a/src/Parsers/StringRange.h
+++ b/src/Parsers/StringRange.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/TokenIterator.h>
 #include <map>
 #include <memory>
diff --git a/src/Parsers/examples/CMakeLists.txt b/src/Parsers/examples/CMakeLists.txt
index 3ff40b3cc3b..3e1d6ae559f 100644
--- a/src/Parsers/examples/CMakeLists.txt
+++ b/src/Parsers/examples/CMakeLists.txt
@@ -8,14 +8,3 @@ target_link_libraries(select_parser PRIVATE clickhouse_parsers)
 
 add_executable(create_parser create_parser.cpp ${SRCS})
 target_link_libraries(create_parser PRIVATE clickhouse_parsers)
-
-if (ENABLE_FUZZING)
-    add_executable(lexer_fuzzer lexer_fuzzer.cpp ${SRCS})
-    target_link_libraries(lexer_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
-
-    add_executable(select_parser_fuzzer select_parser_fuzzer.cpp ${SRCS})
-    target_link_libraries(select_parser_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
-
-    add_executable(create_parser_fuzzer create_parser_fuzzer.cpp ${SRCS})
-    target_link_libraries(create_parser_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
-endif ()
diff --git a/src/Parsers/examples/lexer.cpp b/src/Parsers/examples/lexer.cpp
index d54267c135e..9de2ad2eb72 100644
--- a/src/Parsers/examples/lexer.cpp
+++ b/src/Parsers/examples/lexer.cpp
@@ -1,6 +1,6 @@
 #include <map>
 #include <Parsers/Lexer.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Parsers/formatSettingName.cpp b/src/Parsers/formatSettingName.cpp
index 351a1eb8ade..efbfffddd7b 100644
--- a/src/Parsers/formatSettingName.cpp
+++ b/src/Parsers/formatSettingName.cpp
@@ -1,7 +1,7 @@
 #include <Parsers/formatSettingName.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/quoteString.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/Operators.h>
 
 
diff --git a/src/Parsers/formatSettingName.h b/src/Parsers/formatSettingName.h
index ba819ee2b4c..ac7610bfe8d 100644
--- a/src/Parsers/formatSettingName.h
+++ b/src/Parsers/formatSettingName.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iosfwd>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Parsers/fuzzers/CMakeLists.txt b/src/Parsers/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..bb52101c847
--- /dev/null
+++ b/src/Parsers/fuzzers/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_executable(lexer_fuzzer lexer_fuzzer.cpp ${SRCS})
+target_link_libraries(lexer_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
+
+add_executable(select_parser_fuzzer select_parser_fuzzer.cpp ${SRCS})
+target_link_libraries(select_parser_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
+
+add_executable(create_parser_fuzzer create_parser_fuzzer.cpp ${SRCS})
+target_link_libraries(create_parser_fuzzer PRIVATE clickhouse_parsers ${LIB_FUZZING_ENGINE})
+
+add_subdirectory(codegen_fuzzer)
+
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt b/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
new file mode 100644
index 00000000000..d5e6c944852
--- /dev/null
+++ b/src/Parsers/fuzzers/codegen_fuzzer/CMakeLists.txt
@@ -0,0 +1,48 @@
+find_package(Protobuf REQUIRED)
+
+set (CURRENT_DIR_IN_SOURCES "${ClickHouse_SOURCE_DIR}/src/Parsers/fuzzers/codegen_fuzzer")
+set (CURRENT_DIR_IN_BINARY "${ClickHouse_BINARY_DIR}/src/Parsers/fuzzers/codegen_fuzzer")
+
+# Copy scripts and template file to build directory to generate .proto and .cpp file from them
+configure_file(
+    "${CURRENT_DIR_IN_SOURCES}/gen.py"
+    "${CURRENT_DIR_IN_BINARY}/gen.py"
+    COPYONLY)
+configure_file(
+    "${CURRENT_DIR_IN_SOURCES}/update.sh"
+    "${CURRENT_DIR_IN_BINARY}/update.sh"
+    COPYONLY)
+
+configure_file(
+    "${CURRENT_DIR_IN_SOURCES}/clickhouse-template.g"
+    "${CURRENT_DIR_IN_BINARY}/clickhouse-template.g"
+    COPYONLY)
+
+# Note that it depends on all.dict file!
+add_custom_command(
+    OUTPUT
+        "${CURRENT_DIR_IN_BINARY}/clickhouse.g"
+    COMMAND ./update.sh "${ClickHouse_SOURCE_DIR}/tests/fuzz/all.dict"
+)
+
+add_custom_command(
+    OUTPUT
+        "${CURRENT_DIR_IN_BINARY}/out.cpp"
+        "${CURRENT_DIR_IN_BINARY}/out.proto"
+    COMMAND python3 gen.py clickhouse.g out.cpp out.proto
+    DEPENDS "${CURRENT_DIR_IN_BINARY}/clickhouse.g"
+)
+
+PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS "${CURRENT_DIR_IN_BINARY}/out.proto")
+set(FUZZER_SRCS codegen_select_fuzzer.cpp "${CURRENT_DIR_IN_BINARY}/out.cpp" ${PROTO_SRCS} ${PROTO_HDRS})
+
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+
+add_executable(codegen_select_fuzzer ${FUZZER_SRCS})
+
+set_source_files_properties("${PROTO_SRCS}" "out.cpp" PROPERTIES COMPILE_FLAGS "-Wno-reserved-identifier")
+
+target_include_directories(codegen_select_fuzzer BEFORE PRIVATE "${Protobuf_INCLUDE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
+target_include_directories(codegen_select_fuzzer BEFORE PRIVATE "${LibProtobufMutator_SOURCE_DIR}")
+target_include_directories(codegen_select_fuzzer BEFORE PRIVATE "${LibProtobufMutator_SOURCE_DIR}/src")
+target_link_libraries(codegen_select_fuzzer PRIVATE protobuf-mutator ${Protobuf_LIBRARY} ${Protobuf_PROTOC_LIBRARY} dbms ${LIB_FUZZING_ENGINE})
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/clickhouse-template.g b/src/Parsers/fuzzers/codegen_fuzzer/clickhouse-template.g
new file mode 100644
index 00000000000..79fd775b1da
--- /dev/null
+++ b/src/Parsers/fuzzers/codegen_fuzzer/clickhouse-template.g
@@ -0,0 +1,121 @@
+" ";
+" ";
+" ";
+";";
+
+
+"(" $1 ")";
+"(" $1 ", " $2 ")";
+"(" $1 ", " $2 ", " $3 ")";
+
+$1 ", " $2 ;
+$1 ", " $2 ", " $3 ;
+$1 ", " $2 ", " $3 ", " $4 ;
+$1 ", " $2 ", " $3 ", " $4 ", " $5 ;
+
+"[" $1 ", " $2 "]";
+"[" $1 ", " $2 ", " $3 "]";
+"[" $1 ", " $2 ", " $3 ", " $4 "]";
+"[" $1 ", " $2 ", " $3 ", " $4 ", " $5 "]";
+
+$0 "(" $1 ")";
+$0 "(" $1 ", " $2 ")";
+$0 "(" $1 ", " $2 ", " $3 ")";
+
+$1 " as " $2 ;
+
+
+// TODO: add more clickhouse specific stuff
+"SELECT " $1 " FROM " $2 " WHERE " $3 ;
+"SELECT " $1 " FROM " $2 " GROUP BY " $3 ;
+"SELECT " $1 " FROM " $2 " SORT BY " $3 ;
+"SELECT " $1 " FROM " $2 " LIMIT " $3 ;
+"SELECT " $1 " FROM " $2 " JOIN " $3 ;
+"SELECT " $1 " FROM " $2 " ARRAY JOIN " $3 ;
+"SELECT " $1 " FROM " $2 " JOIN " $3 " ON " $4 ;
+"SELECT " $1 " FROM " $2 " JOIN " $3 " USING " $5 ;
+"SELECT " $1 " INTO OUTFILE " $2 ;
+
+"WITH " $1 " AS " $2 ;
+
+"{" $1 ":" $2 "}";
+"[" $1 "," $2 "]";
+"[]";
+
+
+" x ";
+"x";
+" `x` ";
+"`x`";
+
+" \"value\" ";
+"\"value\"";
+" 0 ";
+"0";
+"1";
+"2";
+"123123123123123123";
+"182374019873401982734091873420923123123123123123";
+"1e-1";
+"1.1";
+"\"\"";
+" '../../../../../../../../../etc/passwd' ";
+
+"/";
+"=";
+"==";
+"!=";
+"<>";
+"<";
+"<=";
+">";
+">=";
+"<<";
+"|<<";
+"&";
+"|";
+"||";
+"<|";
+"|>";
+"+";
+"-";
+"~";
+"*";
+"/";
+"\\";
+"%";
+"";
+".";
+",";
+",";
+",";
+",";
+",";
+",";
+"(";
+")";
+"(";
+")";
+"(";
+")";
+"(";
+")";
+"(";
+")";
+"(";
+")";
+"?";
+":";
+"@";
+"@@";
+"$";
+"\"";
+"`";
+"{";
+"}";
+"^";
+"::";
+"->";
+"]";
+"[";
+
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp b/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
new file mode 100644
index 00000000000..9310d7d59f7
--- /dev/null
+++ b/src/Parsers/fuzzers/codegen_fuzzer/codegen_select_fuzzer.cpp
@@ -0,0 +1,40 @@
+
+#include <iostream>
+#include <string>
+
+#include <IO/WriteBufferFromOStream.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
+
+#include <libfuzzer/libfuzzer_macro.h>
+
+#include "out.pb.h"
+
+void GenerateSentence(const Sentence&, std::string &, int);
+
+
+DEFINE_BINARY_PROTO_FUZZER(const Sentence& main)
+{
+    static std::string input;
+    input.reserve(4096);
+
+    GenerateSentence(main, input, 0);
+    if (input.size())
+    {
+        std::cout << input << std::endl;
+
+        DB::ParserQueryWithOutput parser(input.data() + input.size());
+        try
+        {
+            DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+
+            DB::WriteBufferFromOStream out(std::cerr, 4096);
+            DB::formatAST(*ast, out);
+            std::cerr << std::endl;
+        }
+        catch (...) {}
+
+        input.clear();
+    }
+}
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/gen.py b/src/Parsers/fuzzers/codegen_fuzzer/gen.py
new file mode 100644
index 00000000000..95936247489
--- /dev/null
+++ b/src/Parsers/fuzzers/codegen_fuzzer/gen.py
@@ -0,0 +1,248 @@
+#!/usr/bin/env python3
+
+import sys
+import string
+
+
+TOKEN_TEXT = 1
+TOKEN_VAR = 2
+
+TOKEN_COLON = ':'
+TOKEN_SEMI = ';'
+TOKEN_OR = '|'
+TOKEN_QUESTIONMARK = '?'
+TOKEN_ROUND_BRACKET_OPEN = '('
+TOKEN_ROUND_BRACKET_CLOSE = ')'
+TOKEN_ASTERISK = '*'
+TOKEN_SLASH = '/'
+
+
+
+
+class TextValue:
+    def __init__(self, t):
+        self.t = t
+        self.slug = None
+
+    def get_slug(self):
+        if self.slug is not None:
+            return self.slug
+        slug = ''
+        for c in self.t:
+            slug += c if c in string.ascii_letters else '_'
+        self.slug = slug
+        return slug
+
+    def get_name(self):
+        return f"TextValue_{self.get_slug()}"
+
+    def __repr__(self):
+        return f"TextValue(\"{self.t}\")"
+
+
+class Var:
+    def __init__(self, id_):
+       self.id_ = id_
+
+    def __repr__(self):
+        return f"Var({self.id_})"
+
+
+class Parser:
+    def __init__(self):
+        self.chains = []
+        self.text = None
+        self.col = 0
+        self.line = 1
+        self.t = None
+        self.var_id = -1
+        self.cur_tok = None
+        self.includes = []
+
+        self.proto = ''
+        self.cpp = ''
+
+    def parse_file(self, filename):
+        with open(filename) as f:
+            self.text = f.read()
+
+        while self.parse_statement() is not None:
+            pass
+
+    def add_include(self, filename):
+        self.includes.append(filename)
+
+    def get_next_token(self):
+        self.skip_ws()
+
+        if not len(self.text):
+            return None
+
+        if self.text[0] == '"':
+            return self.parse_txt_value()
+
+        if self.text[0] == '$':
+            return self.parse_var_value()
+
+        c, self.text = self.text[0], self.text[1:]
+        self.cur_tok = c
+        return c
+
+    def parse_var_value(self):
+        i = self.text.find(' ')
+
+        id_, self.text = self.text[1:i], self.text[i+1:]
+        self.var_id = int(id_)
+        self.cur_tok = TOKEN_VAR
+        return TOKEN_VAR
+
+    def parse_txt_value(self):
+        if self.text[0] != '"':
+            raise Exception("parse_txt_value: expected quote at the start")
+
+        self.t = ''
+        self.text = self.text[1:]
+
+        while self.text[0] != '"':
+            if self.text[0] == '\\':
+                if self.text[1] == 'x':
+                    self.t += self.text[:4]
+                    self.text = self.text[4:]
+                elif self.text[1] in 'nt\\"':
+                    self.t += self.text[:2]
+                    self.text = self.text[2:]
+                else:
+                    raise Exception(f"parse_txt_value: unknown symbol {self.text[0]}")
+            else:
+                c, self.text = self.text[0], self.text[1:]
+                self.t += c
+
+        self.text = self.text[1:]
+        self.cur_tok = TOKEN_TEXT
+        return TOKEN_TEXT
+
+    def skip_ws(self):
+        while self.text and self.text[0] in string.whitespace:
+            if self.text[0] == '\n':
+                self.line += 1
+                self.col = 0
+            self.text = self.text[1:]
+            self.col += 1
+        if not self.text:
+            return None
+        return True
+
+    def skip_line(self):
+        self.line += 1
+        index = self.text.find('\n')
+        self.text = self.text[index:]
+
+
+    def parse_statement(self):
+        if self.skip_ws() is None:
+            return None
+
+        self.get_next_token()
+        if self.cur_tok == TOKEN_SLASH:
+            self.skip_line()
+            return TOKEN_SLASH
+
+        chain = []
+        while self.cur_tok != TOKEN_SEMI:
+            if self.cur_tok == TOKEN_TEXT:
+                chain.append(TextValue(self.t))
+            elif self.cur_tok == TOKEN_VAR:
+                chain.append(Var(self.var_id))
+            else:
+                self.fatal_parsing_error(f"unexpected token {self.cur_tok}")
+            self.get_next_token()
+
+        if not chain:
+            self.fatal_parsing_error("empty chains are not allowed")
+        self.chains.append(chain)
+        return True
+
+    def generate(self):
+        self.proto = 'syntax = "proto3";\n\n'
+        self.cpp = '#include <iostream>\n#include <string>\n#include <vector>\n\n#include <libfuzzer/libfuzzer_macro.h>\n\n'
+
+        for incl_file in self.includes:
+            self.cpp += f'#include "{incl_file}"\n'
+        self.cpp += '\n'
+
+        self.proto += 'message Word {\n'
+        self.proto += '\tenum Value {\n'
+
+        self.cpp += 'void GenerateWord(const Word&, std::string&, int);\n\n'
+
+        self.cpp += 'void GenerateSentence(const Sentence& stc, std::string &s, int depth) {\n'
+        self.cpp += '\tfor (int i = 0; i < stc.words_size(); i++ ) {\n'
+        self.cpp += '\t\tGenerateWord(stc.words(i), s, ++depth);\n'
+        self.cpp += '\t}\n'
+        self.cpp += '}\n'
+
+        self.cpp += 'void GenerateWord(const Word& word, std::string &s, int depth) {\n'
+
+        self.cpp += '\tif (depth > 5) return;\n\n'
+        self.cpp += '\tswitch (word.value()) {\n'
+
+        for idx, chain in enumerate(self.chains):
+            self.proto += f'\t\tvalue_{idx} = {idx};\n'
+
+            self.cpp += f'\t\tcase {idx}: {{\n'
+            num_var = 0
+            for item in chain:
+                if isinstance(item, TextValue):
+                    self.cpp += f'\t\t\ts += "{item.t}";\n'
+                elif isinstance(item, Var):
+                    self.cpp += f'\t\t\tif (word.inner().words_size() > {num_var})\t\t\t\tGenerateWord(word.inner().words({num_var}), s, ++depth);\n'
+                    num_var += 1
+                else:
+                    raise Exception("unknown token met during generation")
+            self.cpp += '\t\t\tbreak;\n\t\t}\n'
+        self.cpp += '\t\tdefault: break;\n'
+
+        self.cpp += '\t}\n'
+
+        self.proto += '\t}\n'
+        self.proto += '\tValue value = 1;\n'
+        self.proto += '\tSentence inner = 2;\n'
+        self.proto += '}\nmessage Sentence {\n\trepeated Word words = 1;\n}'
+
+        self.cpp += '}\n'
+        return self.cpp, self.proto
+
+    def fatal_parsing_error(self, msg):
+        print(f"Line: {self.line}, Col: {self.col}")
+        raise Exception(f"fatal error during parsing. {msg}")
+
+
+def main(args):
+    input_file, outfile_cpp, outfile_proto = args
+
+    if not outfile_proto.endswith('.proto'):
+        raise Exception("outfile_proto (argv[3]) should end with `.proto`")
+
+    include_filename = outfile_proto[:-6] + ".pb.h"
+
+    p = Parser()
+    p.add_include(include_filename)
+    p.parse_file(input_file)
+
+    cpp, proto = p.generate()
+
+    proto = proto.replace('\t', ' ' * 4)
+    cpp = cpp.replace('\t', ' ' * 4)
+
+    with open(outfile_cpp, 'w') as f:
+        f.write(cpp)
+
+    with open(outfile_proto, 'w') as f:
+        f.write(proto)
+
+
+if __name__ == '__main__':
+    if len(sys.argv) < 3:
+        print(f"Usage {sys.argv[0]} <input_file> <outfile.cpp> <outfile.proto>")
+        sys.exit(1)
+    main(sys.argv[1:])
diff --git a/src/Parsers/fuzzers/codegen_fuzzer/update.sh b/src/Parsers/fuzzers/codegen_fuzzer/update.sh
new file mode 100755
index 00000000000..daee56dcea1
--- /dev/null
+++ b/src/Parsers/fuzzers/codegen_fuzzer/update.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+
+_main() {
+    local dict_filename="${1}"
+    if [[ $# -ne 1 ]]; 
+    then 
+        echo "Usage: $0 <dict_filename>"; 
+        exit 1;
+    fi
+
+    if [[ ! -f $dict_filename ]];
+    then
+        echo "File $dict_filename doesn't exist";
+        exit 1
+    fi
+
+    cat clickhouse-template.g > clickhouse.g
+    
+    while read line;
+    do
+        [[ -z "$line" ]] && continue
+        echo $line | sed -e '/^#/d' -e 's/"\(.*\)"/" \1 ";/g'
+    done < $dict_filename >> clickhouse.g
+}
+
+_main "$@"
+
+# Sample run: ./update.sh ${CLICKHOUSE_SOURCE_DIR}/tests/fuzz/all.dict
+# then run `python ./gen.py clickhouse.g out.cpp out.proto` to generate new files with tokens. Rebuild fuzzer
diff --git a/src/Parsers/examples/create_parser_fuzzer.cpp b/src/Parsers/fuzzers/create_parser_fuzzer.cpp
similarity index 77%
rename from src/Parsers/examples/create_parser_fuzzer.cpp
rename to src/Parsers/fuzzers/create_parser_fuzzer.cpp
index 169f7b765b7..032d9ca3ffe 100644
--- a/src/Parsers/examples/create_parser_fuzzer.cpp
+++ b/src/Parsers/fuzzers/create_parser_fuzzer.cpp
@@ -13,9 +13,12 @@ try
     std::string input = std::string(reinterpret_cast<const char*>(data), size);
 
     DB::ParserCreateQuery parser;
-    DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 1000);
 
-    DB::formatAST(*ast, std::cerr);
+    DB::WriteBufferFromOwnString wb;
+    DB::formatAST(*ast, wb);
+
+    std::cerr << wb.str() << std::endl;
 
     return 0;
 }
diff --git a/src/Parsers/examples/lexer_fuzzer.cpp b/src/Parsers/fuzzers/lexer_fuzzer.cpp
similarity index 95%
rename from src/Parsers/examples/lexer_fuzzer.cpp
rename to src/Parsers/fuzzers/lexer_fuzzer.cpp
index 8b0a7da238b..d7dd2cfe970 100644
--- a/src/Parsers/examples/lexer_fuzzer.cpp
+++ b/src/Parsers/fuzzers/lexer_fuzzer.cpp
@@ -1,6 +1,6 @@
 #include <map>
 #include <Parsers/Lexer.h>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/src/Parsers/examples/select_parser_fuzzer.cpp b/src/Parsers/fuzzers/select_parser_fuzzer.cpp
similarity index 77%
rename from src/Parsers/examples/select_parser_fuzzer.cpp
rename to src/Parsers/fuzzers/select_parser_fuzzer.cpp
index 4848b285c07..caa6c586cd6 100644
--- a/src/Parsers/examples/select_parser_fuzzer.cpp
+++ b/src/Parsers/fuzzers/select_parser_fuzzer.cpp
@@ -12,9 +12,12 @@ try
     std::string input = std::string(reinterpret_cast<const char*>(data), size);
 
     DB::ParserQueryWithOutput parser(input.data() + input.size());
-    DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 1000);
 
-    DB::formatAST(*ast, std::cerr);
+    DB::WriteBufferFromOwnString wb;
+    DB::formatAST(*ast, wb);
+
+    std::cerr << wb.str() << std::endl;
 
     return 0;
 }
diff --git a/src/Parsers/getInsertQuery.cpp b/src/Parsers/getInsertQuery.cpp
new file mode 100644
index 00000000000..6f52056dfe2
--- /dev/null
+++ b/src/Parsers/getInsertQuery.cpp
@@ -0,0 +1,28 @@
+#include <Parsers/getInsertQuery.h>
+
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTExpressionList.h>
+#include <IO/WriteBufferFromString.h>
+
+
+namespace DB
+{
+std::string getInsertQuery(const std::string & db_name, const std::string & table_name, const ColumnsWithTypeAndName & columns, IdentifierQuotingStyle quoting)
+{
+    ASTInsertQuery query;
+    query.table_id.database_name = db_name;
+    query.table_id.table_name = table_name;
+    query.columns = std::make_shared<ASTExpressionList>(',');
+    query.children.push_back(query.columns);
+    for (const auto & column : columns)
+        query.columns->children.emplace_back(std::make_shared<ASTIdentifier>(column.name));
+
+    WriteBufferFromOwnString buf;
+    IAST::FormatSettings settings(buf, true);
+    settings.always_quote_identifiers = true;
+    settings.identifier_quoting_style = quoting;
+    query.IAST::format(settings);
+    return buf.str();
+}
+}
diff --git a/src/Parsers/getInsertQuery.h b/src/Parsers/getInsertQuery.h
new file mode 100644
index 00000000000..0bcb5e3660b
--- /dev/null
+++ b/src/Parsers/getInsertQuery.h
@@ -0,0 +1,8 @@
+#pragma once
+#include <Core/ColumnsWithTypeAndName.h>
+#include <Parsers/IdentifierQuotingStyle.h>
+
+namespace DB
+{
+std::string getInsertQuery(const std::string & db_name, const std::string & table_name, const ColumnsWithTypeAndName & columns, IdentifierQuotingStyle quoting);
+}
diff --git a/src/Parsers/obfuscateQueries.cpp b/src/Parsers/obfuscateQueries.cpp
index eb0bf5281c9..c0b57d9b1f5 100644
--- a/src/Parsers/obfuscateQueries.cpp
+++ b/src/Parsers/obfuscateQueries.cpp
@@ -38,7 +38,8 @@ const std::unordered_set<std::string_view> keywords
     "IN",           "KILL",     "QUERY",  "SYNC",      "ASYNC",    "TEST",        "BETWEEN",  "TRUNCATE",    "USER",    "ROLE",
     "PROFILE",      "QUOTA",    "POLICY", "ROW",       "GRANT",    "REVOKE",      "OPTION",   "ADMIN",       "EXCEPT",  "REPLACE",
     "IDENTIFIED",   "HOST",     "NAME",   "READONLY",  "WRITABLE", "PERMISSIVE",  "FOR",      "RESTRICTIVE", "RANDOMIZED",
-    "INTERVAL",     "LIMITS",   "ONLY",   "TRACKING",  "IP",       "REGEXP",      "ILIKE",    "DICTIONARY"
+    "INTERVAL",     "LIMITS",   "ONLY",   "TRACKING",  "IP",       "REGEXP",      "ILIKE",    "DICTIONARY",  "OFFSET",
+    "TRIM", "LTRIM", "RTRIM", "BOTH", "LEADING", "TRAILING"
 };
 
 const std::unordered_set<std::string_view> keep_words
@@ -906,7 +907,13 @@ void obfuscateQueries(
 
             /// Write quotes and the obfuscated content inside.
             result.write(*token.begin);
-            obfuscateIdentifier({token.begin + 1, token.size() - 2}, result, obfuscate_map, used_nouns, hash_func);
+
+            /// If it is long, just replace it with hash. Long identifiers in queries are usually auto-generated.
+            if (token.size() > 32)
+                writeIntText(sipHash64(token.begin + 1, token.size() - 2), result);
+            else
+                obfuscateIdentifier({token.begin + 1, token.size() - 2}, result, obfuscate_map, used_nouns, hash_func);
+
             result.write(token.end[-1]);
         }
         else if (token.type == TokenType::Number)
diff --git a/src/Parsers/parseDatabaseAndTableName.cpp b/src/Parsers/parseDatabaseAndTableName.cpp
index 13429df5b4d..c071f1b6eb4 100644
--- a/src/Parsers/parseDatabaseAndTableName.cpp
+++ b/src/Parsers/parseDatabaseAndTableName.cpp
@@ -42,6 +42,22 @@ bool parseDatabaseAndTableName(IParser::Pos & pos, Expected & expected, String &
 }
 
 
+bool parseDatabase(IParser::Pos & pos, Expected & expected, String & database_str)
+{
+    ParserToken s_dot(TokenType::Dot);
+    ParserIdentifier identifier_parser;
+
+    ASTPtr database;
+    database_str = "";
+
+    if (!identifier_parser.parse(pos, database, expected))
+        return false;
+
+    tryGetIdentifierNameInto(database, database_str);
+    return true;
+}
+
+
 bool parseDatabaseAndTableNameOrAsterisks(IParser::Pos & pos, Expected & expected, String & database, bool & any_database, String & table, bool & any_table)
 {
     return IParserBase::wrapParseImpl(pos, [&]
diff --git a/src/Parsers/parseDatabaseAndTableName.h b/src/Parsers/parseDatabaseAndTableName.h
index e4699c8ad91..dc435ca047e 100644
--- a/src/Parsers/parseDatabaseAndTableName.h
+++ b/src/Parsers/parseDatabaseAndTableName.h
@@ -10,4 +10,6 @@ bool parseDatabaseAndTableName(IParser::Pos & pos, Expected & expected, String &
 /// Parses [db.]name or [db.]* or [*.]*
 bool parseDatabaseAndTableNameOrAsterisks(IParser::Pos & pos, Expected & expected, String & database, bool & any_database, String & table, bool & any_table);
 
+bool parseDatabase(IParser::Pos & pos, Expected & expected, String & database_str);
+
 }
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index aeb57b7f9b6..ed09d648477 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -8,7 +8,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
 #include <Common/UTF8Helpers.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
@@ -195,7 +195,7 @@ std::string getLexicalErrorMessage(
     out << getErrorTokenDescription(last_token.type);
     if (last_token.size())
     {
-       out << ": '" << StringRef{last_token.begin, last_token.size()} << "'";
+       out << ": '" << std::string_view{last_token.begin, last_token.size()} << "'";
     }
 
     return out.str();
diff --git a/src/Parsers/queryNormalization.h b/src/Parsers/queryNormalization.h
index e5b1724ccfa..23bd79c0313 100644
--- a/src/Parsers/queryNormalization.h
+++ b/src/Parsers/queryNormalization.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <Core/Defines.h>
 #include <Parsers/Lexer.h>
diff --git a/src/Parsers/tests/gtest_Parser.cpp b/src/Parsers/tests/gtest_Parser.cpp
index 9a5a99f8f5a..5ebea834a91 100644
--- a/src/Parsers/tests/gtest_Parser.cpp
+++ b/src/Parsers/tests/gtest_Parser.cpp
@@ -1,4 +1,6 @@
 #include <Parsers/ParserOptimizeQuery.h>
+#include <Parsers/ParserAlterQuery.h>
+#include <Parsers/ParserCreateQuery.h>
 
 #include <Parsers/ParserQueryWithOutput.h>
 #include <Parsers/parseQuery.h>
@@ -17,22 +19,27 @@ using namespace std::literals;
 
 struct ParserTestCase
 {
-    std::shared_ptr<IParser> parser;
     const std::string_view input_text;
     const char * expected_ast = nullptr;
 };
 
-std::ostream & operator<<(std::ostream & ostr, const ParserTestCase & test_case)
+std::ostream & operator<<(std::ostream & ostr, const std::shared_ptr<IParser> parser)
 {
-    return ostr << "parser: " << test_case.parser->getName() << ", input: " << test_case.input_text;
+    return ostr << "Praser: " << parser->getName();
 }
 
-class ParserTest : public ::testing::TestWithParam<ParserTestCase>
+std::ostream & operator<<(std::ostream & ostr, const ParserTestCase & test_case)
+{
+    return ostr << "ParserTestCase input: " << test_case.input_text;
+}
+
+class ParserTest : public ::testing::TestWithParam<std::tuple<std::shared_ptr<IParser>, ParserTestCase>>
 {};
 
 TEST_P(ParserTest, parseQuery)
 {
-    const auto & [parser, input_text, expected_ast] = GetParam();
+    const auto & parser = std::get<0>(GetParam());
+    const auto & [input_text, expected_ast] = std::get<1>(GetParam());
 
     ASSERT_NE(nullptr, parser);
 
@@ -49,86 +56,117 @@ TEST_P(ParserTest, parseQuery)
 }
 
 
-INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery, ParserTest, ::testing::Values(
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('a, b')",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('a, b')"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]')",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]')"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT b",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT b"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT (a, b)",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT (a, b)"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY a, b, c",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY a, b, c"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY *",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY *"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT a",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT a"
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT (a, b)",
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT (a, b)"
-    }
-));
+INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery, ParserTest,
+    ::testing::Combine(
+        ::testing::Values(std::make_shared<ParserOptimizeQuery>()),
+        ::testing::ValuesIn(std::initializer_list<ParserTestCase>
+        {
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('a, b')",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('a, b')"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]')",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]')"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT b",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT b"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT (a, b)",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') EXCEPT (a, b)"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY a, b, c",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY a, b, c"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY *",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY *"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT a",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT a"
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT (a, b)",
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY * EXCEPT (a, b)"
+            }
+        }
+)));
 
-INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery_FAIL, ParserTest, ::testing::Values(
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY",
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') APPLY(x)",
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') REPLACE(y)",
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY * APPLY(x)",
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY * REPLACE(y)",
-    },
-    ParserTestCase
-    {
-        std::make_shared<ParserOptimizeQuery>(),
-        "OPTIMIZE TABLE table_name DEDUPLICATE BY db.a, db.b, db.c",
-    }
-));
+INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery_FAIL, ParserTest,
+    ::testing::Combine(
+        ::testing::Values(std::make_shared<ParserAlterCommand>()),
+        ::testing::ValuesIn(std::initializer_list<ParserTestCase>
+        {
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY",
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') APPLY(x)",
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY COLUMNS('[a]') REPLACE(y)",
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY * APPLY(x)",
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY * REPLACE(y)",
+            },
+            {
+                "OPTIMIZE TABLE table_name DEDUPLICATE BY db.a, db.b, db.c",
+            }
+        }
+)));
+
+
+INSTANTIATE_TEST_SUITE_P(ParserAlterCommand_MODIFY_COMMENT, ParserTest,
+    ::testing::Combine(
+        ::testing::Values(std::make_shared<ParserAlterCommand>()),
+        ::testing::ValuesIn(std::initializer_list<ParserTestCase>
+        {
+            {
+                // Empty comment value
+                "MODIFY COMMENT ''",
+                "MODIFY COMMENT ''",
+            },
+            {
+                // Non-empty comment value
+                "MODIFY COMMENT 'some comment value'",
+                "MODIFY COMMENT 'some comment value'",
+            }
+        }
+)));
+
+
+INSTANTIATE_TEST_SUITE_P(ParserCreateQuery_DICTIONARY_WITH_COMMENT, ParserTest,
+    ::testing::Combine(
+        ::testing::Values(std::make_shared<ParserAlterCommand>()),
+        ::testing::ValuesIn(std::initializer_list<ParserTestCase>{
+        {
+            R"sql(CREATE DICTIONARY 2024_dictionary_with_comment
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'source_table'))
+LAYOUT(FLAT())
+LIFETIME(MIN 0 MAX 1000)
+COMMENT 'Test dictionary with comment';
+)sql",
+        R"sql(CREATE DICTIONARY `2024_dictionary_with_comment`
+(
+    `id` UInt64,
+    `value` String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'source_table'))
+LIFETIME(MIN 0 MAX 1000)
+LAYOUT(FLAT())
+COMMENT 'Test dictionary with comment')sql"
+    }}
+)));
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index b051cedfb23..967f6848404 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -1,4 +1,4 @@
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ParserCreateQuery.h>
diff --git a/src/Parsers/ya.make b/src/Parsers/ya.make
deleted file mode 100644
index 62e0c2b3225..00000000000
--- a/src/Parsers/ya.make
+++ /dev/null
@@ -1,151 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    ASTAlterQuery.cpp
-    ASTAsterisk.cpp
-    ASTColumnDeclaration.cpp
-    ASTColumnsMatcher.cpp
-    ASTColumnsTransformers.cpp
-    ASTConstraintDeclaration.cpp
-    ASTCreateQuery.cpp
-    ASTCreateQuotaQuery.cpp
-    ASTCreateRoleQuery.cpp
-    ASTCreateRowPolicyQuery.cpp
-    ASTCreateSettingsProfileQuery.cpp
-    ASTCreateUserQuery.cpp
-    ASTDictionary.cpp
-    ASTDictionaryAttributeDeclaration.cpp
-    ASTDropAccessEntityQuery.cpp
-    ASTDropQuery.cpp
-    ASTExpressionList.cpp
-    ASTFunction.cpp
-    ASTFunctionWithKeyValueArguments.cpp
-    ASTGrantQuery.cpp
-    ASTIdentifier.cpp
-    ASTIndexDeclaration.cpp
-    ASTInsertQuery.cpp
-    ASTKillQueryQuery.cpp
-    ASTLiteral.cpp
-    ASTNameTypePair.cpp
-    ASTOptimizeQuery.cpp
-    ASTOrderByElement.cpp
-    ASTPartition.cpp
-    ASTProjectionDeclaration.cpp
-    ASTProjectionSelectQuery.cpp
-    ASTQualifiedAsterisk.cpp
-    ASTQueryParameter.cpp
-    ASTQueryWithOnCluster.cpp
-    ASTQueryWithOutput.cpp
-    ASTQueryWithTableAndOutput.cpp
-    ASTRolesOrUsersSet.cpp
-    ASTRowPolicyName.cpp
-    ASTSampleRatio.cpp
-    ASTSelectQuery.cpp
-    ASTSelectWithUnionQuery.cpp
-    ASTSetQuery.cpp
-    ASTSetRoleQuery.cpp
-    ASTSettingsProfileElement.cpp
-    ASTShowAccessEntitiesQuery.cpp
-    ASTShowCreateAccessEntityQuery.cpp
-    ASTShowGrantsQuery.cpp
-    ASTShowTablesQuery.cpp
-    ASTSubquery.cpp
-    ASTSystemQuery.cpp
-    ASTTTLElement.cpp
-    ASTTablesInSelectQuery.cpp
-    ASTUserNameWithHost.cpp
-    ASTWindowDefinition.cpp
-    ASTWithAlias.cpp
-    ASTWithElement.cpp
-    CommonParsers.cpp
-    ExpressionElementParsers.cpp
-    ExpressionListParsers.cpp
-    IAST.cpp
-    IParserBase.cpp
-    InsertQuerySettingsPushDownVisitor.cpp
-    Lexer.cpp
-    MySQL/ASTAlterCommand.cpp
-    MySQL/ASTAlterQuery.cpp
-    MySQL/ASTCreateDefines.cpp
-    MySQL/ASTCreateQuery.cpp
-    MySQL/ASTDeclareColumn.cpp
-    MySQL/ASTDeclareConstraint.cpp
-    MySQL/ASTDeclareIndex.cpp
-    MySQL/ASTDeclareOption.cpp
-    MySQL/ASTDeclarePartition.cpp
-    MySQL/ASTDeclarePartitionOptions.cpp
-    MySQL/ASTDeclareReference.cpp
-    MySQL/ASTDeclareSubPartition.cpp
-    MySQL/ASTDeclareTableOptions.cpp
-    ParserAlterQuery.cpp
-    ParserCase.cpp
-    ParserCheckQuery.cpp
-    ParserCreateQuery.cpp
-    ParserCreateQuotaQuery.cpp
-    ParserCreateRoleQuery.cpp
-    ParserCreateRowPolicyQuery.cpp
-    ParserCreateSettingsProfileQuery.cpp
-    ParserCreateUserQuery.cpp
-    ParserDataType.cpp
-    ParserDescribeTableQuery.cpp
-    ParserDictionary.cpp
-    ParserDictionaryAttributeDeclaration.cpp
-    ParserDropAccessEntityQuery.cpp
-    ParserDropQuery.cpp
-    ParserExplainQuery.cpp
-    ParserExternalDDLQuery.cpp
-    ParserGrantQuery.cpp
-    ParserInsertQuery.cpp
-    ParserKillQueryQuery.cpp
-    ParserOptimizeQuery.cpp
-    ParserPartition.cpp
-    ParserProjectionSelectQuery.cpp
-    ParserQuery.cpp
-    ParserQueryWithOutput.cpp
-    ParserRenameQuery.cpp
-    ParserRolesOrUsersSet.cpp
-    ParserRowPolicyName.cpp
-    ParserSampleRatio.cpp
-    ParserSelectQuery.cpp
-    ParserSelectWithUnionQuery.cpp
-    ParserSetQuery.cpp
-    ParserSetRoleQuery.cpp
-    ParserSettingsProfileElement.cpp
-    ParserShowAccessEntitiesQuery.cpp
-    ParserShowCreateAccessEntityQuery.cpp
-    ParserShowGrantsQuery.cpp
-    ParserShowPrivilegesQuery.cpp
-    ParserShowTablesQuery.cpp
-    ParserSystemQuery.cpp
-    ParserTablePropertiesQuery.cpp
-    ParserTablesInSelectQuery.cpp
-    ParserUnionQueryElement.cpp
-    ParserUseQuery.cpp
-    ParserUserNameWithHost.cpp
-    ParserWatchQuery.cpp
-    ParserWithElement.cpp
-    QueryWithOutputSettingsPushDownVisitor.cpp
-    TokenIterator.cpp
-    formatAST.cpp
-    formatSettingName.cpp
-    iostream_debug_helpers.cpp
-    makeASTForLogicalFunction.cpp
-    obfuscateQueries.cpp
-    parseDatabaseAndTableName.cpp
-    parseIdentifierOrStringLiteral.cpp
-    parseIntervalKind.cpp
-    parseQuery.cpp
-    parseUserName.cpp
-    queryToString.cpp
-
-)
-
-END()
diff --git a/src/Parsers/ya.make.in b/src/Parsers/ya.make.in
deleted file mode 100644
index 168fe7ceb34..00000000000
--- a/src/Parsers/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F New | grep -v -F tests | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Processors/Chunk.cpp b/src/Processors/Chunk.cpp
index 4800bfca2ce..d904f3755bc 100644
--- a/src/Processors/Chunk.cpp
+++ b/src/Processors/Chunk.cpp
@@ -104,7 +104,9 @@ Columns Chunk::detachColumns()
 
 void Chunk::addColumn(ColumnPtr column)
 {
-    if (column->size() != num_rows)
+    if (empty())
+        num_rows = column->size();
+    else if (column->size() != num_rows)
         throw Exception("Invalid number of rows in Chunk column " + column->getName()+ ": expected " +
                         toString(num_rows) + ", got " + toString(column->size()), ErrorCodes::LOGICAL_ERROR);
 
diff --git a/src/Processors/Chunk.h b/src/Processors/Chunk.h
index bb8266d6e27..011d719d094 100644
--- a/src/Processors/Chunk.h
+++ b/src/Processors/Chunk.h
@@ -82,6 +82,7 @@ public:
     MutableColumns cloneEmptyColumns() const;
 
     const ChunkInfoPtr & getChunkInfo() const { return chunk_info; }
+    bool hasChunkInfo() const { return chunk_info != nullptr; }
     void setChunkInfo(ChunkInfoPtr chunk_info_) { chunk_info = std::move(chunk_info_); }
 
     UInt64 getNumRows() const { return num_rows; }
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.cpp b/src/Processors/Executors/CompletedPipelineExecutor.cpp
new file mode 100644
index 00000000000..a4e3dea89fa
--- /dev/null
+++ b/src/Processors/Executors/CompletedPipelineExecutor.cpp
@@ -0,0 +1,115 @@
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Executors/PipelineExecutor.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Common/setThreadName.h>
+#include <base/scope_guard_safe.h>
+#include <iostream>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+struct CompletedPipelineExecutor::Data
+{
+    PipelineExecutorPtr executor;
+    std::exception_ptr exception;
+    std::atomic_bool is_finished = false;
+    std::atomic_bool has_exception = false;
+    ThreadFromGlobalPool thread;
+    Poco::Event finish_event;
+
+    ~Data()
+    {
+        if (thread.joinable())
+            thread.join();
+    }
+};
+
+static void threadFunction(CompletedPipelineExecutor::Data & data, ThreadGroupStatusPtr thread_group, size_t num_threads)
+{
+    setThreadName("QueryPipelineEx");
+
+    try
+    {
+        if (thread_group)
+            CurrentThread::attachTo(thread_group);
+
+        SCOPE_EXIT_SAFE(
+            if (thread_group)
+                CurrentThread::detachQueryIfNotDetached();
+        );
+
+        data.executor->execute(num_threads);
+    }
+    catch (...)
+    {
+        data.exception = std::current_exception();
+        data.has_exception = true;
+    }
+
+    data.is_finished = true;
+    data.finish_event.set();
+}
+
+CompletedPipelineExecutor::CompletedPipelineExecutor(QueryPipeline & pipeline_) : pipeline(pipeline_)
+{
+    if (!pipeline.completed())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for CompletedPipelineExecutor must be completed");
+}
+
+void CompletedPipelineExecutor::setCancelCallback(std::function<bool()> is_cancelled, size_t interactive_timeout_ms_)
+{
+    is_cancelled_callback = is_cancelled;
+    interactive_timeout_ms = interactive_timeout_ms_;
+}
+
+void CompletedPipelineExecutor::execute()
+{
+    PipelineExecutor executor(pipeline.processors, pipeline.process_list_element);
+
+    if (interactive_timeout_ms)
+    {
+        data = std::make_unique<Data>();
+        data->executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
+
+        auto func = [&, thread_group = CurrentThread::getGroup()]()
+        {
+            threadFunction(*data, thread_group, pipeline.getNumThreads());
+        };
+
+        data->thread = ThreadFromGlobalPool(std::move(func));
+
+        while (!data->is_finished)
+        {
+            if (data->finish_event.tryWait(interactive_timeout_ms))
+                break;
+
+            if (is_cancelled_callback())
+                data->executor->cancel();
+        }
+
+        if (data->has_exception)
+            std::rethrow_exception(data->exception);
+    }
+    else
+        executor.execute(pipeline.getNumThreads());
+}
+
+CompletedPipelineExecutor::~CompletedPipelineExecutor()
+{
+    try
+    {
+        if (data && data->executor)
+            data->executor->cancel();
+    }
+    catch (...)
+    {
+        tryLogCurrentException("PullingAsyncPipelineExecutor");
+    }
+}
+
+}
diff --git a/src/Processors/Executors/CompletedPipelineExecutor.h b/src/Processors/Executors/CompletedPipelineExecutor.h
new file mode 100644
index 00000000000..e616cd6a2b7
--- /dev/null
+++ b/src/Processors/Executors/CompletedPipelineExecutor.h
@@ -0,0 +1,33 @@
+#pragma once
+#include <functional>
+#include <memory>
+
+namespace DB
+{
+
+class QueryPipeline;
+
+/// Executor for completed QueryPipeline.
+/// Allows to specify a callback which checks if execution should be cancelled.
+/// If callback is specified, runs execution in a separate thread.
+class CompletedPipelineExecutor
+{
+public:
+    explicit CompletedPipelineExecutor(QueryPipeline & pipeline_);
+    ~CompletedPipelineExecutor();
+
+    /// This callback will be called each interactive_timeout_ms (if it is not 0).
+    /// If returns true, query would be cancelled.
+    void setCancelCallback(std::function<bool()> is_cancelled, size_t interactive_timeout_ms_);
+
+    void execute();
+    struct Data;
+
+private:
+    QueryPipeline & pipeline;
+    std::function<bool()> is_cancelled_callback;
+    size_t interactive_timeout_ms = 0;
+    std::unique_ptr<Data> data;
+};
+
+}
diff --git a/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp b/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp
deleted file mode 100644
index 736ad1ecefe..00000000000
--- a/src/Processors/Executors/PipelineExecutingBlockInputStream.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
-#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/QueryPipeline.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-PipelineExecutingBlockInputStream::PipelineExecutingBlockInputStream(QueryPipeline pipeline_)
-    : pipeline(std::make_unique<QueryPipeline>(std::move(pipeline_)))
-{
-}
-
-PipelineExecutingBlockInputStream::~PipelineExecutingBlockInputStream() = default;
-
-Block PipelineExecutingBlockInputStream::getHeader() const
-{
-    if (executor)
-        return executor->getHeader();
-
-    if (async_executor)
-        return async_executor->getHeader();
-
-    return pipeline->getHeader();
-}
-
-void PipelineExecutingBlockInputStream::createExecutor()
-{
-    if (pipeline->getNumThreads() > 1)
-        async_executor = std::make_unique<PullingAsyncPipelineExecutor>(*pipeline);
-    else
-        executor = std::make_unique<PullingPipelineExecutor>(*pipeline);
-
-    is_execution_started = true;
-}
-
-void PipelineExecutingBlockInputStream::readPrefixImpl()
-{
-    createExecutor();
-}
-
-Block PipelineExecutingBlockInputStream::readImpl()
-{
-    if (!is_execution_started)
-        createExecutor();
-
-    Block block;
-    bool can_continue = true;
-    while (can_continue)
-    {
-        if (executor)
-            can_continue = executor->pull(block);
-        else
-            can_continue = async_executor->pull(block);
-
-        if (block)
-            return block;
-    }
-
-    totals = executor ? executor->getTotalsBlock()
-                      : async_executor->getTotalsBlock();
-
-    extremes = executor ? executor->getExtremesBlock()
-                        : async_executor->getExtremesBlock();
-
-    return {};
-}
-
-inline static void throwIfExecutionStarted(bool is_execution_started, const char * method)
-{
-    if (is_execution_started)
-        throw Exception(String("Cannot call ") + method +
-                        " for PipelineExecutingBlockInputStream because execution was started",
-                        ErrorCodes::LOGICAL_ERROR);
-}
-
-void PipelineExecutingBlockInputStream::cancel(bool kill)
-{
-    IBlockInputStream::cancel(kill);
-
-    if (is_execution_started)
-    {
-        executor ? executor->cancel()
-                 : async_executor->cancel();
-    }
-}
-
-void PipelineExecutingBlockInputStream::setProgressCallback(const ProgressCallback & callback)
-{
-    throwIfExecutionStarted(is_execution_started, "setProgressCallback");
-    pipeline->setProgressCallback(callback);
-}
-
-void PipelineExecutingBlockInputStream::setProcessListElement(QueryStatus * elem)
-{
-    throwIfExecutionStarted(is_execution_started, "setProcessListElement");
-    IBlockInputStream::setProcessListElement(elem);
-    pipeline->setProcessListElement(elem);
-}
-
-void PipelineExecutingBlockInputStream::setLimits(const StreamLocalLimits & limits_)
-{
-    throwIfExecutionStarted(is_execution_started, "setLimits");
-
-    if (limits_.mode == LimitsMode::LIMITS_TOTAL)
-        throw Exception("Total limits are not supported by PipelineExecutingBlockInputStream",
-                        ErrorCodes::LOGICAL_ERROR);
-
-    /// Local limits may be checked by IBlockInputStream itself.
-    IBlockInputStream::setLimits(limits_);
-}
-
-void PipelineExecutingBlockInputStream::setQuota(const std::shared_ptr<const EnabledQuota> &)
-{
-    throw Exception("Quota is not supported by PipelineExecutingBlockInputStream",
-                    ErrorCodes::LOGICAL_ERROR);
-}
-
-}
diff --git a/src/Processors/Executors/PipelineExecutingBlockInputStream.h b/src/Processors/Executors/PipelineExecutingBlockInputStream.h
deleted file mode 100644
index 68497938ad4..00000000000
--- a/src/Processors/Executors/PipelineExecutingBlockInputStream.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-#include <DataStreams/IBlockInputStream.h>
-
-namespace DB
-{
-
-class QueryPipeline;
-class PullingAsyncPipelineExecutor;
-class PullingPipelineExecutor;
-
-/// Implement IBlockInputStream from QueryPipeline.
-/// It's a temporary wrapper.
-class PipelineExecutingBlockInputStream : public IBlockInputStream
-{
-public:
-    explicit PipelineExecutingBlockInputStream(QueryPipeline pipeline_);
-    ~PipelineExecutingBlockInputStream() override;
-
-    String getName() const override { return "PipelineExecuting"; }
-    Block getHeader() const override;
-
-    void cancel(bool kill) override;
-
-    /// Implement IBlockInputStream methods via QueryPipeline.
-    void setProgressCallback(const ProgressCallback & callback) final;
-    void setProcessListElement(QueryStatus * elem) final;
-    void setLimits(const StreamLocalLimits & limits_) final;
-    void setQuota(const std::shared_ptr<const EnabledQuota> & quota_) final;
-
-protected:
-    void readPrefixImpl() override;
-    Block readImpl() override;
-
-private:
-    std::unique_ptr<QueryPipeline> pipeline;
-    /// One of executors is used.
-    std::unique_ptr<PullingPipelineExecutor> executor; /// for single thread.
-    std::unique_ptr<PullingAsyncPipelineExecutor> async_executor; /// for many threads.
-    bool is_execution_started = false;
-
-    void createExecutor();
-};
-
-}
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index b91c1caa4a5..ec07cee8738 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -5,11 +5,11 @@
 #include <Common/setThreadName.h>
 #include <Common/MemoryTracker.h>
 #include <Processors/Executors/PipelineExecutor.h>
-#include <Processors/printPipeline.h>
+#include <QueryPipeline/printPipeline.h>
 #include <Processors/ISource.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 #ifndef NDEBUG
     #include <Common/Stopwatch.h>
@@ -429,12 +429,14 @@ void PipelineExecutor::execute(size_t num_threads)
 
 bool PipelineExecutor::executeStep(std::atomic_bool * yield_flag)
 {
-    if (finished)
-        return false;
-
     if (!is_execution_initialized)
+    {
         initializeExecution(1);
 
+        if (yield_flag && *yield_flag)
+            return true;
+    }
+
     executeStepImpl(0, 1, yield_flag);
 
     if (!finished)
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index 0652d81addc..a68d56bf499 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -7,7 +7,7 @@
 #include <Processors/Executors/ExecutingGraph.h>
 #include <Common/ThreadPool.h>
 #include <Common/EventCounter.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <queue>
 #include <stack>
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
index 8ecbe75af3a..fdddfdef2a4 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
@@ -2,14 +2,20 @@
 #include <Processors/Executors/PipelineExecutor.h>
 #include <Processors/Formats/LazyOutputFormat.h>
 #include <Processors/Transforms/AggregatingTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <Processors/Sources/NullSource.h>
+#include <QueryPipeline/QueryPipeline.h>
 
 #include <Common/setThreadName.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 struct PullingAsyncPipelineExecutor::Data
 {
     PipelineExecutorPtr executor;
@@ -38,11 +44,11 @@ struct PullingAsyncPipelineExecutor::Data
 
 PullingAsyncPipelineExecutor::PullingAsyncPipelineExecutor(QueryPipeline & pipeline_) : pipeline(pipeline_)
 {
-    if (!pipeline.isCompleted())
-    {
-        lazy_format = std::make_shared<LazyOutputFormat>(pipeline.getHeader());
-        pipeline.setOutputFormat(lazy_format);
-    }
+    if (!pipeline.pulling())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for PullingAsyncPipelineExecutor must be pulling");
+
+    lazy_format = std::make_shared<LazyOutputFormat>(pipeline.output->getHeader());
+    pipeline.complete(lazy_format);
 }
 
 PullingAsyncPipelineExecutor::~PullingAsyncPipelineExecutor()
@@ -59,8 +65,7 @@ PullingAsyncPipelineExecutor::~PullingAsyncPipelineExecutor()
 
 const Block & PullingAsyncPipelineExecutor::getHeader() const
 {
-    return lazy_format ? lazy_format->getPort(IOutputFormat::PortKind::Main).getHeader()
-                       : pipeline.getHeader(); /// Empty.
+    return lazy_format->getPort(IOutputFormat::PortKind::Main).getHeader();
 }
 
 static void threadFunction(PullingAsyncPipelineExecutor::Data & data, ThreadGroupStatusPtr thread_group, size_t num_threads)
@@ -99,7 +104,7 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds)
     if (!data)
     {
         data = std::make_unique<Data>();
-        data->executor = pipeline.execute();
+        data->executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
         data->lazy_format = lazy_format.get();
 
         auto func = [&, thread_group = CurrentThread::getGroup()]()
@@ -220,12 +225,12 @@ Block PullingAsyncPipelineExecutor::getExtremesBlock()
     return header.cloneWithColumns(extremes.detachColumns());
 }
 
-BlockStreamProfileInfo & PullingAsyncPipelineExecutor::getProfileInfo()
+ProfileInfo & PullingAsyncPipelineExecutor::getProfileInfo()
 {
     if (lazy_format)
         return lazy_format->getProfileInfo();
 
-    static BlockStreamProfileInfo profile_info;
+    static ProfileInfo profile_info;
     static std::once_flag flag;
     /// Calculate rows before limit here to avoid race.
     std::call_once(flag, []() { profile_info.getRowsBeforeLimit(); });
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.h b/src/Processors/Executors/PullingAsyncPipelineExecutor.h
index 2ce75aecab7..7e45246ffd6 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.h
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.h
@@ -8,7 +8,7 @@ class QueryPipeline;
 class Block;
 class Chunk;
 class LazyOutputFormat;
-struct BlockStreamProfileInfo;
+struct ProfileInfo;
 
 /// Asynchronous pulling executor for QueryPipeline.
 /// Always creates extra thread. If query is executed in single thread, use PullingPipelineExecutor.
@@ -44,7 +44,7 @@ public:
     Block getExtremesBlock();
 
     /// Get query profile info.
-    BlockStreamProfileInfo & getProfileInfo();
+    ProfileInfo & getProfileInfo();
 
     /// Internal executor data.
     struct Data;
diff --git a/src/Processors/Executors/PullingPipelineExecutor.cpp b/src/Processors/Executors/PullingPipelineExecutor.cpp
index dc59e0a2f5a..a9c73b9f8fb 100644
--- a/src/Processors/Executors/PullingPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingPipelineExecutor.cpp
@@ -1,15 +1,25 @@
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Executors/PipelineExecutor.h>
 #include <Processors/Formats/PullingOutputFormat.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipeline.h>
 #include <Processors/Transforms/AggregatingTransform.h>
+#include <Processors/Sources/NullSource.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 PullingPipelineExecutor::PullingPipelineExecutor(QueryPipeline & pipeline_) : pipeline(pipeline_)
 {
-    pulling_format = std::make_shared<PullingOutputFormat>(pipeline.getHeader(), has_data_flag);
-    pipeline.setOutputFormat(pulling_format);
+    if (!pipeline.pulling())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for PullingPipelineExecutor must be pulling");
+
+    pulling_format = std::make_shared<PullingOutputFormat>(pipeline.output->getHeader(), has_data_flag);
+    pipeline.complete(pulling_format);
 }
 
 PullingPipelineExecutor::~PullingPipelineExecutor()
@@ -32,7 +42,7 @@ const Block & PullingPipelineExecutor::getHeader() const
 bool PullingPipelineExecutor::pull(Chunk & chunk)
 {
     if (!executor)
-        executor = pipeline.execute();
+        executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
 
     if (!executor->executeStep(&has_data_flag))
         return false;
@@ -108,7 +118,7 @@ Block PullingPipelineExecutor::getExtremesBlock()
     return header.cloneWithColumns(extremes.detachColumns());
 }
 
-BlockStreamProfileInfo & PullingPipelineExecutor::getProfileInfo()
+ProfileInfo & PullingPipelineExecutor::getProfileInfo()
 {
     return pulling_format->getProfileInfo();
 }
diff --git a/src/Processors/Executors/PullingPipelineExecutor.h b/src/Processors/Executors/PullingPipelineExecutor.h
index 878d66bd3d4..e05f4f3738d 100644
--- a/src/Processors/Executors/PullingPipelineExecutor.h
+++ b/src/Processors/Executors/PullingPipelineExecutor.h
@@ -10,7 +10,7 @@ class Chunk;
 class QueryPipeline;
 class PipelineExecutor;
 class PullingOutputFormat;
-struct BlockStreamProfileInfo;
+struct ProfileInfo;
 
 using PipelineExecutorPtr = std::shared_ptr<PipelineExecutor>;
 
@@ -46,7 +46,7 @@ public:
     Block getExtremesBlock();
 
     /// Get query profile info.
-    BlockStreamProfileInfo & getProfileInfo();
+    ProfileInfo & getProfileInfo();
 
 private:
     std::atomic_bool has_data_flag = false;
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
new file mode 100644
index 00000000000..0b6d5334716
--- /dev/null
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
@@ -0,0 +1,221 @@
+#include <Processors/Executors/PushingAsyncPipelineExecutor.h>
+#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/ISource.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <iostream>
+
+#include <Common/setThreadName.h>
+#include <base/scope_guard_safe.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class PushingAsyncSource : public ISource
+{
+public:
+    explicit PushingAsyncSource(const Block & header)
+        : ISource(header)
+    {}
+
+    String getName() const override { return "PushingAsyncSource"; }
+
+    bool setData(Chunk chunk)
+    {
+        std::unique_lock lock(mutex);
+        condvar.wait(lock, [this] { return !has_data || is_finished; });
+
+        if (is_finished)
+            return false;
+
+        data.swap(chunk);
+        has_data = true;
+        condvar.notify_one();
+
+        return true;
+    }
+
+    void finish()
+    {
+        std::unique_lock lock(mutex);
+        is_finished = true;
+        condvar.notify_all();
+    }
+
+protected:
+
+    Chunk generate() override
+    {
+        std::unique_lock lock(mutex);
+        condvar.wait(lock, [this] { return has_data || is_finished; });
+
+        Chunk res;
+
+        res.swap(data);
+        has_data = false;
+        condvar.notify_one();
+
+        return res;
+    }
+
+private:
+    Chunk data;
+    bool has_data = false;
+    bool is_finished = false;
+    std::mutex mutex;
+    std::condition_variable condvar;
+};
+
+struct PushingAsyncPipelineExecutor::Data
+{
+    PipelineExecutorPtr executor;
+    std::exception_ptr exception;
+    PushingAsyncSource * source = nullptr;
+    std::atomic_bool is_finished = false;
+    std::atomic_bool has_exception = false;
+    ThreadFromGlobalPool thread;
+    Poco::Event finish_event;
+
+    ~Data()
+    {
+        if (thread.joinable())
+            thread.join();
+    }
+
+    void rethrowExceptionIfHas()
+    {
+        if (has_exception)
+        {
+            has_exception = false;
+            std::rethrow_exception(std::move(exception));
+        }
+    }
+};
+
+static void threadFunction(PushingAsyncPipelineExecutor::Data & data, ThreadGroupStatusPtr thread_group, size_t num_threads)
+{
+    setThreadName("QueryPipelineEx");
+
+    try
+    {
+        if (thread_group)
+            CurrentThread::attachTo(thread_group);
+
+        SCOPE_EXIT_SAFE(
+            if (thread_group)
+                CurrentThread::detachQueryIfNotDetached();
+        );
+
+        data.executor->execute(num_threads);
+    }
+    catch (...)
+    {
+        data.exception = std::current_exception();
+        data.has_exception = true;
+
+        /// Finish source in case of exception. Otherwise thread.join() may hung.
+        if (data.source)
+            data.source->finish();
+    }
+
+    data.is_finished = true;
+    data.finish_event.set();
+}
+
+
+PushingAsyncPipelineExecutor::PushingAsyncPipelineExecutor(QueryPipeline & pipeline_) : pipeline(pipeline_)
+{
+    if (!pipeline.pushing())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for PushingPipelineExecutor must be pushing");
+
+    pushing_source = std::make_shared<PushingAsyncSource>(pipeline.input->getHeader());
+    connect(pushing_source->getPort(), *pipeline.input);
+    pipeline.processors.emplace_back(pushing_source);
+}
+
+PushingAsyncPipelineExecutor::~PushingAsyncPipelineExecutor()
+{
+    try
+    {
+        finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException("PushingAsyncPipelineExecutor");
+    }
+}
+
+const Block & PushingAsyncPipelineExecutor::getHeader() const
+{
+    return pushing_source->getPort().getHeader();
+}
+
+
+void PushingAsyncPipelineExecutor::start()
+{
+    if (started)
+        return;
+
+    started = true;
+
+    data = std::make_unique<Data>();
+    data->executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
+    data->source = pushing_source.get();
+
+    auto func = [&, thread_group = CurrentThread::getGroup()]()
+    {
+        threadFunction(*data, thread_group, pipeline.getNumThreads());
+    };
+
+    data->thread = ThreadFromGlobalPool(std::move(func));
+}
+
+void PushingAsyncPipelineExecutor::push(Chunk chunk)
+{
+    if (!started)
+        start();
+
+    bool is_pushed = pushing_source->setData(std::move(chunk));
+    data->rethrowExceptionIfHas();
+
+    if (!is_pushed)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
+}
+
+void PushingAsyncPipelineExecutor::push(Block block)
+{
+    push(Chunk(block.getColumns(), block.rows()));
+}
+
+void PushingAsyncPipelineExecutor::finish()
+{
+    if (finished)
+        return;
+    finished = true;
+
+    pushing_source->finish();
+
+    /// Join thread here to wait for possible exception.
+    if (data && data->thread.joinable())
+        data->thread.join();
+
+    /// Rethrow exception to not swallow it in destructor.
+    if (data)
+        data->rethrowExceptionIfHas();
+}
+
+void PushingAsyncPipelineExecutor::cancel()
+{
+    /// Cancel execution if it wasn't finished.
+    if (data && !data->is_finished && data->executor)
+        data->executor->cancel();
+
+    finish();
+}
+
+}
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.h b/src/Processors/Executors/PushingAsyncPipelineExecutor.h
new file mode 100644
index 00000000000..4b4b83a90b5
--- /dev/null
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.h
@@ -0,0 +1,60 @@
+#pragma once
+#include <memory>
+#include <atomic>
+#include <vector>
+
+namespace DB
+{
+
+class Block;
+class Chunk;
+class QueryPipeline;
+class PushingAsyncSource;
+
+class PipelineExecutor;
+using PipelineExecutorPtr = std::shared_ptr<PipelineExecutor>;
+
+class IProcessor;
+using ProcessorPtr = std::shared_ptr<IProcessor>;
+using Processors = std::vector<ProcessorPtr>;
+
+/// Pushing executor for Chain of processors using several background threads.
+/// Typical usage is:
+///
+/// PushingAsyncPipelineExecutor executor(chain);
+/// executor.start();
+/// while (auto chunk = ...)
+///     executor.push(std::move(chunk));
+/// executor.finish();
+class PushingAsyncPipelineExecutor
+{
+public:
+    explicit PushingAsyncPipelineExecutor(QueryPipeline & pipeline_);
+    ~PushingAsyncPipelineExecutor();
+
+    /// Get structure of returned block or chunk.
+    const Block & getHeader() const;
+
+    void start();
+
+    void push(Chunk chunk);
+    void push(Block block);
+
+    void finish();
+
+    /// Stop execution. It is not necessary, but helps to stop execution before executor is destroyed.
+    void cancel();
+
+    struct Data;
+
+private:
+    QueryPipeline & pipeline;
+    std::shared_ptr<PushingAsyncSource> pushing_source;
+
+    bool started = false;
+    bool finished = false;
+
+    std::unique_ptr<Data> data;
+};
+
+}
diff --git a/src/Processors/Executors/PushingPipelineExecutor.cpp b/src/Processors/Executors/PushingPipelineExecutor.cpp
new file mode 100644
index 00000000000..c1e851e3425
--- /dev/null
+++ b/src/Processors/Executors/PushingPipelineExecutor.cpp
@@ -0,0 +1,132 @@
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Executors/PipelineExecutor.h>
+#include <Processors/ISource.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <iostream>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class PushingSource : public ISource
+{
+public:
+    explicit PushingSource(const Block & header, std::atomic_bool & need_data_flag_)
+        : ISource(header)
+        , need_data_flag(need_data_flag_)
+    {}
+
+    String getName() const override { return "PushingSource"; }
+
+    void setData(Chunk chunk)
+    {
+        need_data_flag = false;
+        data = std::move(chunk);
+    }
+
+protected:
+
+    Status prepare() override
+    {
+        auto status = ISource::prepare();
+        if (status == Status::Ready)
+            need_data_flag = true;
+
+        return status;
+    }
+
+    Chunk generate() override
+    {
+        return std::move(data);
+    }
+
+private:
+    Chunk data;
+    std::atomic_bool & need_data_flag;
+};
+
+
+PushingPipelineExecutor::PushingPipelineExecutor(QueryPipeline & pipeline_) : pipeline(pipeline_)
+{
+    if (!pipeline.pushing())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline for PushingPipelineExecutor must be pushing");
+
+    pushing_source = std::make_shared<PushingSource>(pipeline.input->getHeader(), need_data_flag);
+    connect(pushing_source->getPort(), *pipeline.input);
+    pipeline.processors.emplace_back(pushing_source);
+}
+
+PushingPipelineExecutor::~PushingPipelineExecutor()
+{
+    try
+    {
+        finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException("PushingPipelineExecutor");
+    }
+}
+
+const Block & PushingPipelineExecutor::getHeader() const
+{
+    return pushing_source->getPort().getHeader();
+}
+
+
+void PushingPipelineExecutor::start()
+{
+    if (started)
+        return;
+
+    started = true;
+    executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
+
+    if (!executor->executeStep(&need_data_flag))
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
+}
+
+void PushingPipelineExecutor::push(Chunk chunk)
+{
+    if (!started)
+        start();
+
+    pushing_source->setData(std::move(chunk));
+
+    if (!executor->executeStep(&need_data_flag))
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Pipeline for PushingPipelineExecutor was finished before all data was inserted");
+}
+
+void PushingPipelineExecutor::push(Block block)
+{
+    push(Chunk(block.getColumns(), block.rows()));
+}
+
+void PushingPipelineExecutor::finish()
+{
+    if (finished)
+        return;
+    finished = true;
+
+    if (executor)
+        executor->executeStep();
+}
+
+void PushingPipelineExecutor::cancel()
+{
+    /// Cancel execution if it wasn't finished.
+    if (executor && !finished)
+    {
+        finished = true;
+        executor->cancel();
+    }
+}
+
+}
diff --git a/src/Processors/Executors/PushingPipelineExecutor.h b/src/Processors/Executors/PushingPipelineExecutor.h
new file mode 100644
index 00000000000..b047e62415a
--- /dev/null
+++ b/src/Processors/Executors/PushingPipelineExecutor.h
@@ -0,0 +1,58 @@
+#pragma once
+#include <memory>
+#include <atomic>
+#include <vector>
+
+namespace DB
+{
+
+class Block;
+class Chunk;
+class QueryPipeline;
+class PushingSource;
+
+class PipelineExecutor;
+using PipelineExecutorPtr = std::shared_ptr<PipelineExecutor>;
+
+class IProcessor;
+using ProcessorPtr = std::shared_ptr<IProcessor>;
+using Processors = std::vector<ProcessorPtr>;
+
+/// Pushing executor for Chain of processors. Always executed in single thread.
+/// Typical usage is:
+///
+/// PushingPipelineExecutor executor(chain);
+/// executor.start();
+/// while (auto chunk = ...)
+///     executor.push(std::move(chunk));
+/// executor.finish();
+class PushingPipelineExecutor
+{
+public:
+    explicit PushingPipelineExecutor(QueryPipeline & pipeline_);
+    ~PushingPipelineExecutor();
+
+    /// Get structure of returned block or chunk.
+    const Block & getHeader() const;
+
+    void start();
+
+    void push(Chunk chunk);
+    void push(Block block);
+
+    void finish();
+
+    /// Stop execution. It is not necessary, but helps to stop execution before executor is destroyed.
+    void cancel();
+
+private:
+    QueryPipeline & pipeline;
+    std::atomic_bool need_data_flag = false;
+    std::shared_ptr<PushingSource> pushing_source;
+
+    PipelineExecutorPtr executor;
+    bool started = false;
+    bool finished = false;
+};
+
+}
diff --git a/src/Processors/Executors/StreamingFormatExecutor.cpp b/src/Processors/Executors/StreamingFormatExecutor.cpp
new file mode 100644
index 00000000000..c1d10cabdcb
--- /dev/null
+++ b/src/Processors/Executors/StreamingFormatExecutor.cpp
@@ -0,0 +1,91 @@
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+#include <iostream>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+StreamingFormatExecutor::StreamingFormatExecutor(
+    const Block & header_,
+    InputFormatPtr format_,
+    ErrorCallback on_error_,
+    SimpleTransformPtr adding_defaults_transform_)
+    : header(header_)
+    , format(std::move(format_))
+    , on_error(std::move(on_error_))
+    , adding_defaults_transform(std::move(adding_defaults_transform_))
+    , port(format->getPort().getHeader(), format.get())
+    , result_columns(header.cloneEmptyColumns())
+{
+    connect(format->getPort(), port);
+}
+
+MutableColumns StreamingFormatExecutor::getResultColumns()
+{
+    auto ret_columns = header.cloneEmptyColumns();
+    std::swap(ret_columns, result_columns);
+    return ret_columns;
+}
+
+size_t StreamingFormatExecutor::execute(ReadBuffer & buffer)
+{
+    format->setReadBuffer(buffer);
+    return execute();
+}
+
+size_t StreamingFormatExecutor::execute()
+{
+    try
+    {
+        size_t new_rows = 0;
+        port.setNeeded();
+        while (true)
+        {
+            auto status = format->prepare();
+
+            switch (status)
+            {
+                case IProcessor::Status::Ready:
+                    format->work();
+                    break;
+
+                case IProcessor::Status::Finished:
+                    format->resetParser();
+                    return new_rows;
+
+                case IProcessor::Status::PortFull:
+                {
+                    auto chunk = port.pull();
+                    if (adding_defaults_transform)
+                        adding_defaults_transform->transform(chunk);
+
+                    auto chunk_rows = chunk.getNumRows();
+                    new_rows += chunk_rows;
+
+                    auto columns = chunk.detachColumns();
+
+                    for (size_t i = 0, s = columns.size(); i < s; ++i)
+                        result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
+
+                    break;
+                }
+                case IProcessor::Status::NeedData:
+                case IProcessor::Status::Async:
+                case IProcessor::Status::ExpandPipeline:
+                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
+            }
+        }
+    }
+    catch (Exception & e)
+    {
+        format->resetParser();
+        return on_error(result_columns, e);
+    }
+}
+
+}
diff --git a/src/Processors/Executors/StreamingFormatExecutor.h b/src/Processors/Executors/StreamingFormatExecutor.h
new file mode 100644
index 00000000000..b84364dcca0
--- /dev/null
+++ b/src/Processors/Executors/StreamingFormatExecutor.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/ISimpleTransform.h>
+
+namespace DB
+{
+
+using SimpleTransformPtr = std::shared_ptr<ISimpleTransform>;
+
+/// Receives format and allows to execute
+/// it multiple times for streaming processing of data.
+class StreamingFormatExecutor
+{
+public:
+    /// Callback is called, when exception is thrown in `execute` method.
+    /// It provides currently accumulated columns to make a rollback, for example,
+    /// and exception to rethrow it or add context to it.
+    /// Should return number of new rows, which are added in callback
+    /// to result columns in comparison to previous call of `execute`.
+    using ErrorCallback = std::function<size_t(const MutableColumns &, Exception &)>;
+
+    StreamingFormatExecutor(
+        const Block & header_,
+        InputFormatPtr format_,
+        ErrorCallback on_error_ = [](const MutableColumns &, Exception &) -> size_t { throw; },
+        SimpleTransformPtr adding_defaults_transform_ = nullptr);
+
+    /// Returns numbers of new read rows.
+    size_t execute();
+
+    /// Execute with provided read buffer.
+    size_t execute(ReadBuffer & buffer);
+
+    /// Releases currently accumulated columns.
+    MutableColumns getResultColumns();
+
+private:
+    const Block header;
+    const InputFormatPtr format;
+    const ErrorCallback on_error;
+    const SimpleTransformPtr adding_defaults_transform;
+
+    InputPort port;
+    MutableColumns result_columns;
+};
+
+}
diff --git a/src/Processors/Formats/IInputFormat.cpp b/src/Processors/Formats/IInputFormat.cpp
index 5594e04dc74..674a4affc46 100644
--- a/src/Processors/Formats/IInputFormat.cpp
+++ b/src/Processors/Formats/IInputFormat.cpp
@@ -6,14 +6,14 @@ namespace DB
 {
 
 IInputFormat::IInputFormat(Block header, ReadBuffer & in_)
-    : ISource(std::move(header)), in(in_)
+    : ISource(std::move(header)), in(&in_)
 {
     column_mapping = std::make_shared<ColumnMapping>();
 }
 
 void IInputFormat::resetParser()
 {
-    in.ignoreAll();
+    in->ignoreAll();
     // those are protected attributes from ISource (I didn't want to propagate resetParser up there)
     finished = false;
     got_exception = false;
@@ -21,4 +21,9 @@ void IInputFormat::resetParser()
     getPort().getInputPort().reopen();
 }
 
+void IInputFormat::setReadBuffer(ReadBuffer & in_)
+{
+    in = &in_;
+}
+
 }
diff --git a/src/Processors/Formats/IInputFormat.h b/src/Processors/Formats/IInputFormat.h
index 59d33e3295e..8f5992efb1b 100644
--- a/src/Processors/Formats/IInputFormat.h
+++ b/src/Processors/Formats/IInputFormat.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <Processors/ISource.h>
-
-#include <memory>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
@@ -31,8 +30,6 @@ struct ColumnMapping
 
 using ColumnMappingPtr = std::shared_ptr<ColumnMapping>;
 
-class ReadBuffer;
-
 /** Input format is a source, that reads data from ReadBuffer.
   */
 class IInputFormat : public ISource
@@ -43,7 +40,7 @@ protected:
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wattributes"
 
-    ReadBuffer & in [[maybe_unused]];
+    ReadBuffer * in [[maybe_unused]];
 
 #pragma GCC diagnostic pop
 
@@ -58,6 +55,8 @@ public:
      */
     virtual void resetParser();
 
+    virtual void setReadBuffer(ReadBuffer & in_);
+
     virtual const BlockMissingValues & getMissingValues() const
     {
         static const BlockMissingValues none;
@@ -84,4 +83,6 @@ private:
     std::vector<std::unique_ptr<ReadBuffer>> owned_buffers;
 };
 
+using InputFormatPtr = std::shared_ptr<IInputFormat>;
+
 }
diff --git a/src/Processors/Formats/IOutputFormat.cpp b/src/Processors/Formats/IOutputFormat.cpp
index 7d82c267f36..0f94622b7c6 100644
--- a/src/Processors/Formats/IOutputFormat.cpp
+++ b/src/Processors/Formats/IOutputFormat.cpp
@@ -76,9 +76,6 @@ void IOutputFormat::work()
         if (rows_before_limit_counter && rows_before_limit_counter->hasAppliedLimit())
             setRowsBeforeLimit(rows_before_limit_counter->get());
 
-        if (before_finalize_callback)
-            before_finalize_callback();
-
         finalize();
         finalized = true;
         return;
diff --git a/src/Processors/Formats/IOutputFormat.h b/src/Processors/Formats/IOutputFormat.h
index 4d86d18f70e..ba4dcee6f70 100644
--- a/src/Processors/Formats/IOutputFormat.h
+++ b/src/Processors/Formats/IOutputFormat.h
@@ -67,21 +67,21 @@ public:
     /// Passed value are delta, that must be summarized.
     virtual void onProgress(const Progress & /*progress*/) {}
 
-    /// Set callback, which will be called before call to finalize().
-    void setBeforeFinalizeCallback(std::function<void()> callback) { before_finalize_callback = callback; }
-
     /// Content-Type to set when sending HTTP response.
     virtual std::string getContentType() const { return "text/plain; charset=UTF-8"; }
 
     InputPort & getPort(PortKind kind) { return *std::next(inputs.begin(), kind); }
 
-    /// Compatible to IBlockOutputStream interface
+    /// Compatibility with old interface.
+    /// TODO: separate formats and processors.
 
     void write(const Block & block);
 
     virtual void doWritePrefix() {}
     virtual void doWriteSuffix() { finalize(); }
 
+    virtual bool expectMaterializedColumns() const { return true; }
+
     void setTotals(const Block & totals) { consumeTotals(Chunk(totals.getColumns(), totals.rows())); }
     void setExtremes(const Block & extremes) { consumeExtremes(Chunk(extremes.getColumns(), extremes.rows())); }
 
@@ -94,7 +94,5 @@ private:
     size_t result_bytes = 0;
 
     bool prefix_written = false;
-
-    std::function<void()> before_finalize_callback;
 };
 }
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 52e64a9d90d..92f313d110d 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Formats/IRowInputFormat.h>
 #include <IO/WriteHelpers.h>    // toString
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Processors/Formats/IRowInputFormat.h b/src/Processors/Formats/IRowInputFormat.h
index 2ca182b7ffe..87caadd93da 100644
--- a/src/Processors/Formats/IRowInputFormat.h
+++ b/src/Processors/Formats/IRowInputFormat.h
@@ -3,10 +3,10 @@
 #include <string>
 #include <Columns/IColumn.h>
 #include <Processors/Formats/IInputFormat.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Poco/Timespan.h>
-#include <Common/Stopwatch.h>
 
+class Stopwatch;
 
 namespace DB
 {
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
index 269faac5258..8d86e896a1a 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
@@ -22,8 +22,8 @@ namespace ErrorCodes
     extern const int CANNOT_READ_ALL_DATA;
 }
 
-ArrowBlockInputFormat::ArrowBlockInputFormat(ReadBuffer & in_, const Block & header_, bool stream_)
-    : IInputFormat(header_, in_), stream{stream_}
+ArrowBlockInputFormat::ArrowBlockInputFormat(ReadBuffer & in_, const Block & header_, bool stream_, const FormatSettings & format_settings_)
+    : IInputFormat(header_, in_), stream{stream_}, format_settings(format_settings_)
 {
 }
 
@@ -85,7 +85,7 @@ void ArrowBlockInputFormat::prepareReader()
 
     if (stream)
     {
-        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(std::make_unique<ArrowInputStreamFromReadBuffer>(in));
+        auto stream_reader_status = arrow::ipc::RecordBatchStreamReader::Open(std::make_unique<ArrowInputStreamFromReadBuffer>(*in));
         if (!stream_reader_status.ok())
             throw Exception(ErrorCodes::UNKNOWN_EXCEPTION,
                 "Error while opening a table: {}", stream_reader_status.status().ToString());
@@ -94,7 +94,7 @@ void ArrowBlockInputFormat::prepareReader()
     }
     else
     {
-        auto file_reader_status = arrow::ipc::RecordBatchFileReader::Open(asArrowFile(in));
+        auto file_reader_status = arrow::ipc::RecordBatchFileReader::Open(asArrowFile(*in));
         if (!file_reader_status.ok())
             throw Exception(ErrorCodes::UNKNOWN_EXCEPTION,
                 "Error while opening a table: {}", file_reader_status.status().ToString());
@@ -102,7 +102,7 @@ void ArrowBlockInputFormat::prepareReader()
         schema = file_reader->schema();
     }
 
-    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(getPort().getHeader(), std::move(schema), "Arrow");
+    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(getPort().getHeader(), "Arrow", format_settings.arrow.import_nested);
 
     if (stream)
         record_batch_total = -1;
@@ -112,26 +112,26 @@ void ArrowBlockInputFormat::prepareReader()
     record_batch_current = 0;
 }
 
-void registerInputFormatProcessorArrow(FormatFactory & factory)
+void registerInputFormatArrow(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor(
+    factory.registerInputFormat(
         "Arrow",
         [](ReadBuffer & buf,
            const Block & sample,
            const RowInputFormatParams & /* params */,
-           const FormatSettings & /* format_settings */)
+           const FormatSettings & format_settings)
         {
-            return std::make_shared<ArrowBlockInputFormat>(buf, sample, false);
+            return std::make_shared<ArrowBlockInputFormat>(buf, sample, false, format_settings);
         });
     factory.markFormatAsColumnOriented("Arrow");
-    factory.registerInputFormatProcessor(
+    factory.registerInputFormat(
         "ArrowStream",
         [](ReadBuffer & buf,
            const Block & sample,
            const RowInputFormatParams & /* params */,
-           const FormatSettings & /* format_settings */)
+           const FormatSettings & format_settings)
         {
-            return std::make_shared<ArrowBlockInputFormat>(buf, sample, true);
+            return std::make_shared<ArrowBlockInputFormat>(buf, sample, true, format_settings);
         });
 }
 
@@ -141,7 +141,7 @@ void registerInputFormatProcessorArrow(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerInputFormatProcessorArrow(FormatFactory &)
+void registerInputFormatArrow(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.h b/src/Processors/Formats/Impl/ArrowBlockInputFormat.h
index 9f458dece7f..1136937e65b 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.h
@@ -1,11 +1,10 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_ARROW
 
 #include <Processors/Formats/IInputFormat.h>
+#include <Formats/FormatSettings.h>
 
 namespace arrow { class RecordBatchReader; }
 namespace arrow::ipc { class RecordBatchFileReader; }
@@ -19,7 +18,7 @@ class ArrowColumnToCHColumn;
 class ArrowBlockInputFormat : public IInputFormat
 {
 public:
-    ArrowBlockInputFormat(ReadBuffer & in_, const Block & header_, bool stream_);
+    ArrowBlockInputFormat(ReadBuffer & in_, const Block & header_, bool stream_, const FormatSettings & format_settings_);
 
     void resetParser() override;
 
@@ -41,6 +40,8 @@ private:
     int record_batch_total = 0;
     int record_batch_current = 0;
 
+    const FormatSettings format_settings;
+
     void prepareReader();
 };
 
diff --git a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
index 8f43d03de38..4404749adb6 100644
--- a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
@@ -82,9 +82,9 @@ void ArrowBlockOutputFormat::prepareWriter(const std::shared_ptr<arrow::Schema>
     writer = *writer_status;
 }
 
-void registerOutputFormatProcessorArrow(FormatFactory & factory)
+void registerOutputFormatArrow(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor(
+    factory.registerOutputFormat(
         "Arrow",
         [](WriteBuffer & buf,
            const Block & sample,
@@ -94,7 +94,7 @@ void registerOutputFormatProcessorArrow(FormatFactory & factory)
             return std::make_shared<ArrowBlockOutputFormat>(buf, sample, false, format_settings);
         });
 
-    factory.registerOutputFormatProcessor(
+    factory.registerOutputFormat(
         "ArrowStream",
         [](WriteBuffer & buf,
            const Block & sample,
@@ -112,7 +112,7 @@ void registerOutputFormatProcessorArrow(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerOutputFormatProcessorArrow(FormatFactory &)
+void registerOutputFormatArrow(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.h b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.h
index 44d46e97d2a..154292d838f 100644
--- a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.h
@@ -1,7 +1,5 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_ARROW
 
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index 243f3da5903..f98e45a4e49 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -1,3 +1,7 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include "ArrowBufferedStreams.h"
 
 #if USE_ARROW || USE_ORC || USE_PARQUET
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.h b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
index a49936f326c..a91274e5ad1 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.h
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.h
@@ -1,7 +1,5 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_ARROW || USE_ORC || USE_PARQUET
 
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index 84c56f0f2b7..3dada0d62be 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -10,10 +10,12 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDate.h>
-#include <common/DateLUTImpl.h>
-#include <common/types.h>
-#include <Core/Block.h>
+#include <DataTypes/NestedUtils.h>
+#include <base/DateLUTImpl.h>
+#include <base/types.h>
 #include <Processors/Chunk.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnNullable.h>
@@ -22,17 +24,19 @@
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnUnique.h>
 #include <Columns/ColumnMap.h>
+#include <Columns/ColumnsNumber.h>
 #include <Interpreters/castColumn.h>
+#include <Common/quoteString.h>
 #include <algorithm>
+#include <arrow/builder.h>
 #include <arrow/array.h>
 
 
+/// UINT16 and UINT32 are processed separately, see comments in readColumnFromArrowColumn.
 #define FOR_ARROW_NUMERIC_TYPES(M) \
         M(arrow::Type::UINT8, DB::UInt8) \
         M(arrow::Type::INT8, DB::Int8) \
-        M(arrow::Type::UINT16, DB::UInt16) \
         M(arrow::Type::INT16, DB::Int16) \
-        M(arrow::Type::UINT32, DB::UInt32) \
         M(arrow::Type::INT32, DB::Int32) \
         M(arrow::Type::UINT64, DB::UInt64) \
         M(arrow::Type::INT64, DB::Int64) \
@@ -50,7 +54,6 @@
         M(arrow::Type::UINT64, DB::UInt64) \
         M(arrow::Type::INT64, DB::UInt64)
 
-
 namespace DB
 {
 
@@ -58,47 +61,19 @@ namespace ErrorCodes
 {
     extern const int UNKNOWN_TYPE;
     extern const int VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE;
-    extern const int CANNOT_CONVERT_TYPE;
-    extern const int CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN;
     extern const int THERE_IS_NO_COLUMN;
     extern const int BAD_ARGUMENTS;
+    extern const int UNKNOWN_EXCEPTION;
 }
 
-static const std::initializer_list<std::pair<arrow::Type::type, const char *>> arrow_type_to_internal_type =
-{
-        {arrow::Type::UINT8, "UInt8"},
-        {arrow::Type::INT8, "Int8"},
-        {arrow::Type::UINT16, "UInt16"},
-        {arrow::Type::INT16, "Int16"},
-        {arrow::Type::UINT32, "UInt32"},
-        {arrow::Type::INT32, "Int32"},
-        {arrow::Type::UINT64, "UInt64"},
-        {arrow::Type::INT64, "Int64"},
-        {arrow::Type::HALF_FLOAT, "Float32"},
-        {arrow::Type::FLOAT, "Float32"},
-        {arrow::Type::DOUBLE, "Float64"},
-
-        {arrow::Type::BOOL, "UInt8"},
-        {arrow::Type::DATE32, "Date"},
-        {arrow::Type::DATE32, "Date32"},
-        {arrow::Type::DATE64, "DateTime"},
-        {arrow::Type::TIMESTAMP, "DateTime"},
-
-        {arrow::Type::STRING, "String"},
-        {arrow::Type::BINARY, "String"},
-
-        // TODO: add other types that are convertible to internal ones:
-        // 0. ENUM?
-        // 1. UUID -> String
-        // 2. JSON -> String
-        // Full list of types: contrib/arrow/cpp/src/arrow/type.h
-};
 
 /// Inserts numeric data right into internal column data to reduce an overhead
 template <typename NumericType, typename VectorType = ColumnVector<NumericType>>
-static void fillColumnWithNumericData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithNumericData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    auto & column_data = static_cast<VectorType &>(internal_column).getData();
+    auto internal_type = std::make_shared<DataTypeNumber<NumericType>>();
+    auto internal_column = internal_type->createColumn();
+    auto & column_data = static_cast<VectorType &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -110,15 +85,18 @@ static void fillColumnWithNumericData(std::shared_ptr<arrow::ChunkedArray> & arr
         const auto * raw_data = reinterpret_cast<const NumericType *>(buffer->data());
         column_data.insert_assume_reserved(raw_data, raw_data + chunk->length());
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
 /// Inserts chars and offsets right into internal column data to reduce an overhead.
 /// Internal offsets are shifted by one to the right in comparison with Arrow ones. So the last offset should map to the end of all chars.
 /// Also internal strings are null terminated.
-static void fillColumnWithStringData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    PaddedPODArray<UInt8> & column_chars_t = assert_cast<ColumnString &>(internal_column).getChars();
-    PaddedPODArray<UInt64> & column_offsets = assert_cast<ColumnString &>(internal_column).getOffsets();
+    auto internal_type = std::make_shared<DataTypeString>();
+    auto internal_column = internal_type->createColumn();
+    PaddedPODArray<UInt8> & column_chars_t = assert_cast<ColumnString &>(*internal_column).getChars();
+    PaddedPODArray<UInt64> & column_offsets = assert_cast<ColumnString &>(*internal_column).getOffsets();
 
     size_t chars_t_size = 0;
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -154,11 +132,14 @@ static void fillColumnWithStringData(std::shared_ptr<arrow::ChunkedArray> & arro
             column_offsets.emplace_back(column_chars_t.size());
         }
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
-static void fillColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    auto & column_data = assert_cast<ColumnVector<UInt8> &>(internal_column).getData();
+    auto internal_type = std::make_shared<DataTypeUInt8>();
+    auto internal_column = internal_type->createColumn();
+    auto & column_data = assert_cast<ColumnVector<UInt8> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -170,35 +151,14 @@ static void fillColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arr
         for (size_t bool_i = 0; bool_i != static_cast<size_t>(chunk.length()); ++bool_i)
             column_data.emplace_back(chunk.Value(bool_i));
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
-/// Arrow stores Parquet::DATE in Int32, while ClickHouse stores Date in UInt16. Therefore, it should be checked before saving
-static void fillColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    PaddedPODArray<UInt16> & column_data = assert_cast<ColumnVector<UInt16> &>(internal_column).getData();
-    column_data.reserve(arrow_column->length());
-
-    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
-    {
-        arrow::Date32Array & chunk = dynamic_cast<arrow::Date32Array &>(*(arrow_column->chunk(chunk_i)));
-
-        for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
-        {
-            UInt32 days_num = static_cast<UInt32>(chunk.Value(value_i));
-
-            if (days_num > DATE_LUT_MAX_DAY_NUM)
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE,
-                    "Input value {} of a column '{}' is greater than max allowed Date value, which is {}",
-                    days_num, internal_column.getName(), DATE_LUT_MAX_DAY_NUM);
-
-            column_data.emplace_back(days_num);
-        }
-    }
-}
-
-static void fillDate32ColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
-{
-    PaddedPODArray<Int32> & column_data = assert_cast<ColumnVector<Int32> &>(internal_column).getData();
+    auto internal_type = std::make_shared<DataTypeDate32>();
+    auto internal_column = internal_type->createColumn();
+    PaddedPODArray<Int32> & column_data = assert_cast<ColumnVector<Int32> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -209,18 +169,21 @@ static void fillDate32ColumnWithDate32Data(std::shared_ptr<arrow::ChunkedArray>
         {
             Int32 days_num = static_cast<Int32>(chunk.Value(value_i));
             if (days_num > DATE_LUT_MAX_EXTEND_DAY_NUM)
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE,
-                    "Input value {} of a column '{}' is greater than max allowed Date value, which is {}", days_num, internal_column.getName(), DATE_LUT_MAX_DAY_NUM);
+                throw Exception{ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE,
+                        "Input value {} of a column \"{}\" is greater than max allowed Date value, which is {}", days_num, column_name, DATE_LUT_MAX_DAY_NUM};
 
             column_data.emplace_back(days_num);
         }
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
 /// Arrow stores Parquet::DATETIME in Int64, while ClickHouse stores DateTime in UInt32. Therefore, it should be checked before saving
-static void fillColumnWithDate64Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithDate64Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    auto & column_data = assert_cast<ColumnVector<UInt32> &>(internal_column).getData();
+    auto internal_type = std::make_shared<DataTypeDateTime>();
+    auto internal_column = internal_type->createColumn();
+    auto & column_data = assert_cast<ColumnVector<UInt32> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -232,11 +195,14 @@ static void fillColumnWithDate64Data(std::shared_ptr<arrow::ChunkedArray> & arro
             column_data.emplace_back(timestamp);
         }
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
-static void fillColumnWithTimestampData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithTimestampData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    auto & column_data = assert_cast<ColumnVector<UInt32> &>(internal_column).getData();
+    auto internal_type = std::make_shared<DataTypeUInt32>();
+    auto internal_column = internal_type->createColumn();
+    auto & column_data = assert_cast<ColumnVector<UInt32> &>(*internal_column).getData();
     column_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -268,29 +234,35 @@ static void fillColumnWithTimestampData(std::shared_ptr<arrow::ChunkedArray> & a
             column_data.emplace_back(timestamp);
         }
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
 template <typename DecimalType, typename DecimalArray>
-static void fillColumnWithDecimalData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & internal_column)
+static ColumnWithTypeAndName readColumnWithDecimalData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
-    auto & column = assert_cast<ColumnDecimal<DecimalType> &>(internal_column);
+    const auto * arrow_decimal_type = static_cast<arrow::DecimalType *>(arrow_column->type().get());
+    auto internal_type = std::make_shared<DataTypeDecimal<DecimalType>>(arrow_decimal_type->precision(), arrow_decimal_type->scale());
+    auto internal_column = internal_type->createColumn();
+    auto & column = assert_cast<ColumnDecimal<DecimalType> &>(*internal_column);
     auto & column_data = column.getData();
     column_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
     {
-        auto & chunk = static_cast<DecimalArray &>(*(arrow_column->chunk(chunk_i)));
+        auto & chunk = dynamic_cast<DecimalArray &>(*(arrow_column->chunk(chunk_i)));
         for (size_t value_i = 0, length = static_cast<size_t>(chunk.length()); value_i < length; ++value_i)
         {
             column_data.emplace_back(chunk.IsNull(value_i) ? DecimalType(0) : *reinterpret_cast<const DecimalType *>(chunk.Value(value_i))); // TODO: copy column
         }
     }
+    return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
 /// Creates a null bytemap from arrow's null bitmap
-static void fillByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & bytemap)
+static ColumnPtr readByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
-    PaddedPODArray<UInt8> & bytemap_data = assert_cast<ColumnVector<UInt8> &>(bytemap).getData();
+    auto nullmap_column = ColumnUInt8::create();
+    PaddedPODArray<UInt8> & bytemap_data = assert_cast<ColumnVector<UInt8> &>(*nullmap_column).getData();
     bytemap_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0; chunk_i != static_cast<size_t>(arrow_column->num_chunks()); ++chunk_i)
@@ -300,11 +272,13 @@ static void fillByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & ar
         for (size_t value_i = 0; value_i != static_cast<size_t>(chunk->length()); ++value_i)
             bytemap_data.emplace_back(chunk->IsNull(value_i));
     }
+    return nullmap_column;
 }
 
-static void fillOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column, IColumn & offsets)
+static ColumnPtr readOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
-    ColumnArray::Offsets & offsets_data = assert_cast<ColumnVector<UInt64> &>(offsets).getData();
+    auto offsets_column = ColumnUInt64::create();
+    ColumnArray::Offsets & offsets_data = assert_cast<ColumnVector<UInt64> &>(*offsets_column).getData();
     offsets_data.reserve(arrow_column->length());
 
     for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
@@ -316,18 +290,18 @@ static void fillOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedArray>
         for (int64_t i = 1; i < arrow_offsets.length(); ++i)
             offsets_data.emplace_back(start + arrow_offsets.Value(i));
     }
+    return offsets_column;
 }
-static ColumnPtr createAndFillColumnWithIndexesData(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
+
+static ColumnPtr readColumnWithIndexesData(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
     switch (arrow_column->type()->id())
     {
 #    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
-        case ARROW_NUMERIC_TYPE: \
-        { \
-                auto column = DataTypeNumber<CPP_NUMERIC_TYPE>().createColumn(); \
-                fillColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, *column); \
-                return column; \
-        }
+            case ARROW_NUMERIC_TYPE: \
+            { \
+                    return readColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, "").column; \
+            }
         FOR_ARROW_INDEXES_TYPES(DISPATCH)
 #    undef DISPATCH
         default:
@@ -335,32 +309,34 @@ static ColumnPtr createAndFillColumnWithIndexesData(std::shared_ptr<arrow::Chunk
     }
 }
 
-static void readColumnFromArrowColumn(
+static std::shared_ptr<arrow::ChunkedArray> getNestedArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
+{
+    arrow::ArrayVector array_vector;
+    array_vector.reserve(arrow_column->num_chunks());
+    for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
+    {
+        arrow::ListArray & list_chunk = dynamic_cast<arrow::ListArray &>(*(arrow_column->chunk(chunk_i)));
+        std::shared_ptr<arrow::Array> chunk = list_chunk.values();
+        array_vector.emplace_back(std::move(chunk));
+    }
+    return std::make_shared<arrow::ChunkedArray>(array_vector);
+}
+
+static ColumnWithTypeAndName readColumnFromArrowColumn(
     std::shared_ptr<arrow::ChunkedArray> & arrow_column,
-    IColumn & internal_column,
     const std::string & column_name,
     const std::string & format_name,
     bool is_nullable,
-    std::unordered_map<String, ColumnPtr> dictionary_values)
+    std::unordered_map<String, std::shared_ptr<ColumnWithTypeAndName>> & dictionary_values)
 {
-    if (internal_column.isNullable())
-    {
-        ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(internal_column);
-        readColumnFromArrowColumn(
-            arrow_column, column_nullable.getNestedColumn(), column_name, format_name, true, dictionary_values);
-        fillByteMapFromArrowColumn(arrow_column, column_nullable.getNullMapColumn());
-        return;
-    }
-
-    /// TODO: check if a column is const?
     if (!is_nullable && arrow_column->null_count() && arrow_column->type()->id() != arrow::Type::LIST
         && arrow_column->type()->id() != arrow::Type::MAP && arrow_column->type()->id() != arrow::Type::STRUCT)
     {
-        throw Exception
-            {
-                ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN,
-                "Can not insert NULL data into non-nullable column \"{}\".", column_name
-            };
+        auto nested_column = readColumnFromArrowColumn(arrow_column, column_name, format_name, true, dictionary_values);
+        auto nullmap_column = readByteMapFromArrowColumn(arrow_column);
+        auto nullable_type = std::make_shared<DataTypeNullable>(std::move(nested_column.type));
+        auto nullable_column = ColumnNullable::create(std::move(nested_column.column), std::move(nullmap_column));
+        return {std::move(nullable_column), std::move(nullable_type), column_name};
     }
 
     switch (arrow_column->type()->id())
@@ -368,87 +344,87 @@ static void readColumnFromArrowColumn(
         case arrow::Type::STRING:
         case arrow::Type::BINARY:
             //case arrow::Type::FIXED_SIZE_BINARY:
-            fillColumnWithStringData(arrow_column, internal_column);
-            break;
+            return readColumnWithStringData(arrow_column, column_name);
         case arrow::Type::BOOL:
-            fillColumnWithBooleanData(arrow_column, internal_column);
-            break;
+            return readColumnWithBooleanData(arrow_column, column_name);
         case arrow::Type::DATE32:
-            if (WhichDataType(internal_column.getDataType()).isUInt16())
-            {
-                fillColumnWithDate32Data(arrow_column, internal_column);
-            }
-            else
-            {
-                fillDate32ColumnWithDate32Data(arrow_column, internal_column);
-            }
-            break;
+            return readColumnWithDate32Data(arrow_column, column_name);
         case arrow::Type::DATE64:
-            fillColumnWithDate64Data(arrow_column, internal_column);
-            break;
+            return readColumnWithDate64Data(arrow_column, column_name);
+        // ClickHouse writes Date as arrow UINT16 and DateTime as arrow UINT32,
+        // so, read UINT16 as Date and UINT32 as DateTime to perform correct conversion
+        // between Date and DateTime further.
+        case arrow::Type::UINT16:
+        {
+            auto column = readColumnWithNumericData<UInt16>(arrow_column, column_name);
+            column.type = std::make_shared<DataTypeDate>();
+            return column;
+        }
+        case arrow::Type::UINT32:
+        {
+            auto column = readColumnWithNumericData<UInt32>(arrow_column, column_name);
+            column.type = std::make_shared<DataTypeDateTime>();
+            return column;
+        }
         case arrow::Type::TIMESTAMP:
-            fillColumnWithTimestampData(arrow_column, internal_column);
-            break;
-#if defined(ARCADIA_BUILD)
-        case arrow::Type::DECIMAL:
-            fillColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, internal_column /*, internal_nested_type*/);
-            break;
-#else
+            return readColumnWithTimestampData(arrow_column, column_name);
         case arrow::Type::DECIMAL128:
-            fillColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, internal_column /*, internal_nested_type*/);
-            break;
+            return readColumnWithDecimalData<Decimal128, arrow::Decimal128Array>(arrow_column, column_name);
         case arrow::Type::DECIMAL256:
-            fillColumnWithDecimalData<Decimal256, arrow::Decimal256Array>(arrow_column, internal_column /*, internal_nested_type*/);
-            break;
-#endif
-        case arrow::Type::MAP: [[fallthrough]];
+            return readColumnWithDecimalData<Decimal256, arrow::Decimal256Array>(arrow_column, column_name);
+        case arrow::Type::MAP:
+        {
+            auto arrow_nested_column = getNestedArrowColumn(arrow_column);
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_values);
+            auto offsets_column = readOffsetsFromArrowListColumn(arrow_column);
+
+            const auto * tuple_column = assert_cast<const ColumnTuple *>(nested_column.column.get());
+            const auto * tuple_type = assert_cast<const DataTypeTuple *>(nested_column.type.get());
+            auto map_column = ColumnMap::create(std::move(tuple_column->getColumnPtr(0)), std::move(tuple_column->getColumnPtr(1)), std::move(offsets_column));
+            auto map_type = std::make_shared<DataTypeMap>(tuple_type->getElements()[0], tuple_type->getElements()[1]);
+            return {std::move(map_column), std::move(map_type), column_name};
+        }
         case arrow::Type::LIST:
         {
-            arrow::ArrayVector array_vector;
-            array_vector.reserve(arrow_column->num_chunks());
-            for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
-            {
-                arrow::ListArray & list_chunk = dynamic_cast<arrow::ListArray &>(*(arrow_column->chunk(chunk_i)));
-                std::shared_ptr<arrow::Array> chunk = list_chunk.values();
-                array_vector.emplace_back(std::move(chunk));
-            }
-            auto arrow_nested_column = std::make_shared<arrow::ChunkedArray>(array_vector);
-
-            ColumnArray & column_array = arrow_column->type()->id() == arrow::Type::MAP
-                ? assert_cast<ColumnMap &>(internal_column).getNestedColumn()
-                : assert_cast<ColumnArray &>(internal_column);
-
-            readColumnFromArrowColumn(
-                arrow_nested_column, column_array.getData(), column_name, format_name, false, dictionary_values);
-
-            fillOffsetsFromArrowListColumn(arrow_column, column_array.getOffsetsColumn());
-            break;
+            auto arrow_nested_column = getNestedArrowColumn(arrow_column);
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column, column_name, format_name, false, dictionary_values);
+            auto offsets_column = readOffsetsFromArrowListColumn(arrow_column);
+            auto array_column = ColumnArray::create(std::move(nested_column.column), std::move(offsets_column));
+            auto array_type = std::make_shared<DataTypeArray>(nested_column.type);
+            return {std::move(array_column), std::move(array_type), column_name};
         }
         case arrow::Type::STRUCT:
         {
-            ColumnTuple & column_tuple = assert_cast<ColumnTuple &>(internal_column);
-            int fields_count = column_tuple.tupleSize();
-            std::vector<arrow::ArrayVector> nested_arrow_columns(fields_count);
+            auto arrow_type = arrow_column->type();
+            auto * arrow_struct_type = assert_cast<arrow::StructType *>(arrow_type.get());
+            std::vector<arrow::ArrayVector> nested_arrow_columns(arrow_struct_type->num_fields());
             for (size_t chunk_i = 0, num_chunks = static_cast<size_t>(arrow_column->num_chunks()); chunk_i < num_chunks; ++chunk_i)
             {
                 arrow::StructArray & struct_chunk = dynamic_cast<arrow::StructArray &>(*(arrow_column->chunk(chunk_i)));
-                for (int i = 0; i < fields_count; ++i)
+                for (int i = 0; i < arrow_struct_type->num_fields(); ++i)
                     nested_arrow_columns[i].emplace_back(struct_chunk.field(i));
             }
 
-            for (int i = 0; i != fields_count; ++i)
+            Columns tuple_elements;
+            DataTypes tuple_types;
+            std::vector<String> tuple_names;
+
+            for (int i = 0; i != arrow_struct_type->num_fields(); ++i)
             {
                 auto nested_arrow_column = std::make_shared<arrow::ChunkedArray>(nested_arrow_columns[i]);
-                readColumnFromArrowColumn(
-                    nested_arrow_column, column_tuple.getColumn(i), column_name, format_name, false, dictionary_values);
+                auto element = readColumnFromArrowColumn(nested_arrow_column, arrow_struct_type->field(i)->name(), format_name, false, dictionary_values);
+                tuple_elements.emplace_back(std::move(element.column));
+                tuple_types.emplace_back(std::move(element.type));
+                tuple_names.emplace_back(std::move(element.name));
             }
-            break;
+
+            auto tuple_column = ColumnTuple::create(std::move(tuple_elements));
+            auto tuple_type = std::make_shared<DataTypeTuple>(std::move(tuple_types), std::move(tuple_names));
+            return {std::move(tuple_column), std::move(tuple_type), column_name};
         }
         case arrow::Type::DICTIONARY:
         {
-            ColumnLowCardinality & column_lc = assert_cast<ColumnLowCardinality &>(internal_column);
             auto & dict_values = dictionary_values[column_name];
-
             /// Load dictionary values only once and reuse it.
             if (!dict_values)
             {
@@ -459,14 +435,14 @@ static void readColumnFromArrowColumn(
                     dict_array.emplace_back(dict_chunk.dictionary());
                 }
                 auto arrow_dict_column = std::make_shared<arrow::ChunkedArray>(dict_array);
+                auto dict_column = readColumnFromArrowColumn(arrow_dict_column, column_name, format_name, false, dictionary_values);
 
-                auto dict_column = IColumn::mutate(column_lc.getDictionaryPtr());
-                auto * uniq_column = static_cast<IColumnUnique *>(dict_column.get());
-                auto values_column = uniq_column->getNestedColumn()->cloneEmpty();
-                readColumnFromArrowColumn(
-                    arrow_dict_column, *values_column, column_name, format_name, false, dictionary_values);
-                uniq_column->uniqueInsertRangeFrom(*values_column, 0, values_column->size());
-                dict_values = std::move(dict_column);
+                /// We should convert read column to ColumnUnique.
+                auto tmp_lc_column = DataTypeLowCardinality(dict_column.type).createColumn();
+                auto tmp_dict_column = IColumn::mutate(assert_cast<ColumnLowCardinality *>(tmp_lc_column.get())->getDictionaryPtr());
+                static_cast<IColumnUnique *>(tmp_dict_column.get())->uniqueInsertRangeFrom(*dict_column.column, 0, dict_column.column->size());
+                dict_column.column = std::move(tmp_dict_column);
+                dict_values = std::make_shared<ColumnWithTypeAndName>(std::move(dict_column));
             }
 
             arrow::ArrayVector indexes_array;
@@ -477,17 +453,14 @@ static void readColumnFromArrowColumn(
             }
 
             auto arrow_indexes_column = std::make_shared<arrow::ChunkedArray>(indexes_array);
-            auto indexes_column = createAndFillColumnWithIndexesData(arrow_indexes_column);
-
-            auto new_column_lc = ColumnLowCardinality::create(dict_values, std::move(indexes_column));
-            column_lc = std::move(*new_column_lc);
-            break;
+            auto indexes_column = readColumnWithIndexesData(arrow_indexes_column);
+            auto lc_column = ColumnLowCardinality::create(dict_values->column, std::move(indexes_column));
+            auto lc_type = std::make_shared<DataTypeLowCardinality>(dict_values->type);
+            return {std::move(lc_column), std::move(lc_type), column_name};
         }
 #    define DISPATCH(ARROW_NUMERIC_TYPE, CPP_NUMERIC_TYPE) \
-    case ARROW_NUMERIC_TYPE: \
-        fillColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, internal_column); \
-        break;
-
+        case ARROW_NUMERIC_TYPE: \
+            return readColumnWithNumericData<CPP_NUMERIC_TYPE>(arrow_column, column_name);
         FOR_ARROW_NUMERIC_TYPES(DISPATCH)
 #    undef DISPATCH
             // TODO: support TIMESTAMP_MICROS and TIMESTAMP_MILLIS with truncated micro- and milliseconds?
@@ -495,144 +468,52 @@ static void readColumnFromArrowColumn(
             // TODO: read UUID as a string?
         default:
             throw Exception(ErrorCodes::UNKNOWN_TYPE,
-                "Unsupported {} type '{}' of an input column '{}'.", format_name, arrow_column->type()->name(), column_name);
+                    "Unsupported {} type '{}' of an input column '{}'.", format_name, arrow_column->type()->name(), column_name);
     }
 }
 
-static DataTypePtr getInternalType(
-    std::shared_ptr<arrow::DataType> arrow_type,
-    const DataTypePtr & column_type,
-    const std::string & column_name,
-    const std::string & format_name)
+
+// Creating CH header by arrow schema. Will be useful in task about inserting
+// data from file without knowing table structure.
+
+static void checkStatus(const arrow::Status & status, const String & column_name, const String & format_name)
 {
-    if (column_type->isNullable())
-    {
-        DataTypePtr nested_type = assert_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
-        return makeNullable(getInternalType(arrow_type, nested_type, column_name, format_name));
-    }
-
-#if defined(ARCADIA_BUILD)
-    if (arrow_type->id() == arrow::Type::DECIMAL)
-    {
-        const auto & decimal_type = dynamic_cast<const arrow::DecimalType &>(*arrow_type);
-        return std::make_shared<DataTypeDecimal<Decimal128>>(decimal_type.precision(), decimal_type.scale());
-    }
-#else
-    if (arrow_type->id() == arrow::Type::DECIMAL128)
-    {
-        const auto & decimal_type = dynamic_cast<const arrow::DecimalType &>(*arrow_type);
-        return std::make_shared<DataTypeDecimal<Decimal128>>(decimal_type.precision(), decimal_type.scale());
-    }
-
-    if (arrow_type->id() == arrow::Type::DECIMAL256)
-    {
-        const auto & decimal_type = dynamic_cast<const arrow::DecimalType &>(*arrow_type);
-        return std::make_shared<DataTypeDecimal<Decimal256>>(decimal_type.precision(), decimal_type.scale());
-    }
-#endif
-
-    if (arrow_type->id() == arrow::Type::LIST)
-    {
-        const auto & list_type = dynamic_cast<const arrow::ListType &>(*arrow_type);
-        auto list_nested_type = list_type.value_type();
-
-        const DataTypeArray * array_type = typeid_cast<const DataTypeArray *>(column_type.get());
-        if (!array_type)
-            throw Exception{ErrorCodes::CANNOT_CONVERT_TYPE,
-                "Cannot convert arrow LIST type to a not Array ClickHouse type {}.", column_type->getName()};
-
-        return std::make_shared<DataTypeArray>(getInternalType(list_nested_type, array_type->getNestedType(), column_name, format_name));
-    }
-
-    if (arrow_type->id() == arrow::Type::STRUCT)
-    {
-        const auto & struct_type = dynamic_cast<const arrow::StructType &>(*arrow_type);
-        const DataTypeTuple * tuple_type = typeid_cast<const DataTypeTuple *>(column_type.get());
-        if (!tuple_type)
-            throw Exception{ErrorCodes::CANNOT_CONVERT_TYPE,
-                "Cannot convert arrow STRUCT type to a not Tuple ClickHouse type {}.", column_type->getName()};
-
-        const DataTypes & tuple_nested_types = tuple_type->getElements();
-        int internal_fields_num = tuple_nested_types.size();
-        /// If internal column has less elements then arrow struct, we will select only first internal_fields_num columns.
-        if (internal_fields_num > struct_type.num_fields())
-            throw Exception(
-                    ErrorCodes::CANNOT_CONVERT_TYPE,
-                    "Cannot convert arrow STRUCT with {} fields to a ClickHouse Tuple with {} elements: {}.",
-                    struct_type.num_fields(),
-                    internal_fields_num,
-                    column_type->getName());
-
-        DataTypes nested_types;
-        for (int i = 0; i < internal_fields_num; ++i)
-            nested_types.push_back(getInternalType(struct_type.field(i)->type(), tuple_nested_types[i], column_name, format_name));
-
-        return std::make_shared<DataTypeTuple>(std::move(nested_types));
-    }
-
-    if (arrow_type->id() == arrow::Type::DICTIONARY)
-    {
-        const auto & arrow_dict_type = dynamic_cast<const arrow::DictionaryType &>(*arrow_type);
-        const auto * lc_type = typeid_cast<const DataTypeLowCardinality *>(column_type.get());
-        /// We allow to insert arrow dictionary into a non-LowCardinality column.
-        const auto & dict_type = lc_type ? lc_type->getDictionaryType() : column_type;
-        return std::make_shared<DataTypeLowCardinality>(getInternalType(arrow_dict_type.value_type(), dict_type, column_name, format_name));
-    }
-
-    if (arrow_type->id() == arrow::Type::MAP)
-    {
-        const auto & arrow_map_type = typeid_cast<const arrow::MapType &>(*arrow_type);
-        const auto * map_type = typeid_cast<const DataTypeMap *>(column_type.get());
-        if (!map_type)
-            throw Exception{ErrorCodes::CANNOT_CONVERT_TYPE, "Cannot convert arrow MAP type to a not Map ClickHouse type {}.", column_type->getName()};
-
-        return std::make_shared<DataTypeMap>(
-            getInternalType(arrow_map_type.key_type(), map_type->getKeyType(), column_name, format_name),
-            getInternalType(arrow_map_type.item_type(), map_type->getValueType(), column_name, format_name));
-    }
-
-    if (arrow_type->id() == arrow::Type::UINT16
-        && (isDate(column_type) || isDateTime(column_type) || isDate32(column_type) || isDateTime64(column_type)))
-    {
-        /// Read UInt16 as Date. It will allow correct conversion to DateTime further.
-        return std::make_shared<DataTypeDate>();
-    }
-
-    auto filter = [=](auto && elem)
-    {
-        auto which = WhichDataType(column_type);
-        if (arrow_type->id() == arrow::Type::DATE32 && which.isDateOrDate32())
-        {
-            return (strcmp(elem.second, "Date") == 0 && which.isDate())
-                || (strcmp(elem.second, "Date32") == 0 && which.isDate32());
-        }
-        else
-        {
-            return elem.first == arrow_type->id();
-        }
-    };
-    if (const auto * internal_type_it = std::find_if(arrow_type_to_internal_type.begin(), arrow_type_to_internal_type.end(), filter);
-        internal_type_it != arrow_type_to_internal_type.end())
-    {
-        return DataTypeFactory::instance().get(internal_type_it->second);
-    }
-
-    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
-        "The type '{}' of an input column '{}' is not supported for conversion from {} data format.",
-        arrow_type->name(), column_name, format_name);
+    if (!status.ok())
+        throw Exception{ErrorCodes::UNKNOWN_EXCEPTION, "Error with a {} column '{}': {}.", format_name, column_name, status.ToString()};
 }
 
-ArrowColumnToCHColumn::ArrowColumnToCHColumn(const Block & header_, std::shared_ptr<arrow::Schema> schema_, const std::string & format_name_)
-    : header(header_), format_name(format_name_)
+static Block arrowSchemaToCHHeader(const arrow::Schema & schema, const std::string & format_name)
 {
-    for (const auto & field : schema_->fields())
+    ColumnsWithTypeAndName sample_columns;
+    for (const auto & field : schema.fields())
     {
-        if (header.has(field->name()))
-        {
-            const auto column_type = recursiveRemoveLowCardinality(header.getByName(field->name()).type);
-            name_to_internal_type[field->name()] = getInternalType(field->type(), column_type, field->name(), format_name);
-        }
+        /// Create empty arrow column by it's type and convert it to ClickHouse column.
+        arrow::MemoryPool* pool = arrow::default_memory_pool();
+        std::unique_ptr<arrow::ArrayBuilder> array_builder;
+        arrow::Status status = MakeBuilder(pool, field->type(), &array_builder);
+        checkStatus(status, field->name(), format_name);
+        std::shared_ptr<arrow::Array> arrow_array;
+        status = array_builder->Finish(&arrow_array);
+        checkStatus(status, field->name(), format_name);
+        arrow::ArrayVector array_vector = {arrow_array};
+        auto arrow_column = std::make_shared<arrow::ChunkedArray>(array_vector);
+        std::unordered_map<std::string, std::shared_ptr<ColumnWithTypeAndName>> dict_values;
+        ColumnWithTypeAndName sample_column = readColumnFromArrowColumn(arrow_column, field->name(), format_name, false, dict_values);
+        sample_columns.emplace_back(std::move(sample_column));
     }
+    return Block(std::move(sample_columns));
+}
+
+ArrowColumnToCHColumn::ArrowColumnToCHColumn(
+    const arrow::Schema & schema, const std::string & format_name_, bool import_nested_)
+    : header(arrowSchemaToCHHeader(schema, format_name_)), format_name(format_name_), import_nested(import_nested_)
+{
+}
+
+ArrowColumnToCHColumn::ArrowColumnToCHColumn(
+    const Block & header_, const std::string & format_name_, bool import_nested_)
+    : header(header_), format_name(format_name_), import_nested(import_nested_)
+{
 }
 
 void ArrowColumnToCHColumn::arrowTableToCHChunk(Chunk & res, std::shared_ptr<arrow::Table> & table)
@@ -645,33 +526,60 @@ void ArrowColumnToCHColumn::arrowTableToCHChunk(Chunk & res, std::shared_ptr<arr
     using NameToColumnPtr = std::unordered_map<std::string, std::shared_ptr<arrow::ChunkedArray>>;
 
     NameToColumnPtr name_to_column_ptr;
-    for (const auto & column_name : table->ColumnNames())
+    for (const auto& column_name : table->ColumnNames())
     {
         std::shared_ptr<arrow::ChunkedArray> arrow_column = table->GetColumnByName(column_name);
         name_to_column_ptr[column_name] = arrow_column;
     }
 
+    std::unordered_map<String, BlockPtr> nested_tables;
     for (size_t column_i = 0, columns = header.columns(); column_i < columns; ++column_i)
     {
         const ColumnWithTypeAndName & header_column = header.getByPosition(column_i);
 
-        if (name_to_column_ptr.find(header_column.name) == name_to_column_ptr.end())
+        bool read_from_nested = false;
+        String nested_table_name = Nested::extractTableName(header_column.name);
+        if (!name_to_column_ptr.contains(header_column.name))
+        {
+            /// Check if it's a column from nested table.
+            if (import_nested && name_to_column_ptr.contains(nested_table_name))
+            {
+                if (!nested_tables.contains(nested_table_name))
+                {
+                    std::shared_ptr<arrow::ChunkedArray> arrow_column = name_to_column_ptr[nested_table_name];
+                    ColumnsWithTypeAndName cols = {readColumnFromArrowColumn(arrow_column, nested_table_name, format_name, false, dictionary_values)};
+                    Block block(cols);
+                    nested_tables[nested_table_name] = std::make_shared<Block>(Nested::flatten(block));
+                }
+
+                read_from_nested = nested_tables[nested_table_name]->has(header_column.name);
+            }
+
+
             // TODO: What if some columns were not presented? Insert NULLs? What if a column is not nullable?
-            throw Exception(ErrorCodes::THERE_IS_NO_COLUMN,
-                "Column '{}' is not presented in input data.", header_column.name);
+            if (!read_from_nested)
+                throw Exception{ErrorCodes::THERE_IS_NO_COLUMN, "Column '{}' is not presented in input data.", header_column.name};
+        }
 
         std::shared_ptr<arrow::ChunkedArray> arrow_column = name_to_column_ptr[header_column.name];
 
-        DataTypePtr & internal_type = name_to_internal_type[header_column.name];
-        MutableColumnPtr read_column = internal_type->createColumn();
-        readColumnFromArrowColumn(arrow_column, *read_column, header_column.name, format_name, false, dictionary_values);
-
         ColumnWithTypeAndName column;
-        column.name = header_column.name;
-        column.type = internal_type;
-        column.column = std::move(read_column);
+        if (read_from_nested)
+            column = nested_tables[nested_table_name]->getByName(header_column.name);
+        else
+            column = readColumnFromArrowColumn(arrow_column, header_column.name, format_name, false, dictionary_values);
+
+        try
+        {
+            column.column = castColumn(column, header_column.type);
+        }
+        catch (Exception & e)
+        {
+            e.addMessage(fmt::format("while converting column {} from type {} to type {}",
+                backQuote(header_column.name), column.type->getName(), header_column.type->getName()));
+            throw;
+        }
 
-        column.column = castColumn(column, header_column.type);
         column.type = header_column.type;
         num_rows = column.column->size();
         columns_list.push_back(std::move(column.column));
@@ -681,5 +589,5 @@ void ArrowColumnToCHColumn::arrowTableToCHChunk(Chunk & res, std::shared_ptr<arr
 }
 
 }
-
 #endif
+
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
index 7f38dc7a31c..5c495901517 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_ARROW || USE_ORC || USE_PARQUET
 
 #include <DataTypes/IDataType.h>
+#include <Core/ColumnWithTypeAndName.h>
+#include <Core/Block.h>
 #include <arrow/table.h>
 
 
@@ -19,19 +19,23 @@ class Chunk;
 class ArrowColumnToCHColumn
 {
 public:
-    ArrowColumnToCHColumn(const Block & header_, std::shared_ptr<arrow::Schema> schema_, const std::string & format_name_);
+    ArrowColumnToCHColumn(const Block & header_, const std::string & format_name_, bool import_nested_);
+
+    /// Constructor that create header by arrow schema. It will be useful for inserting
+    /// data from file without knowing table structure.
+    ArrowColumnToCHColumn(const arrow::Schema & schema, const std::string & format_name, bool import_nested_);
 
     void arrowTableToCHChunk(Chunk & res, std::shared_ptr<arrow::Table> & table);
 
 private:
-    const Block & header;
-    std::unordered_map<std::string, DataTypePtr> name_to_internal_type;
+    const Block header;
     const std::string format_name;
+    bool import_nested;
 
     /// Map {column name : dictionary column}.
     /// To avoid converting dictionary from Arrow Dictionary
     /// to LowCardinality every chunk we save it and reuse.
-    std::unordered_map<std::string, ColumnPtr> dictionary_values;
+    std::unordered_map<std::string, std::shared_ptr<ColumnWithTypeAndName>> dictionary_values;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index cd576916364..1f806d47c45 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -35,6 +35,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnLowCardinality.h>
 
 #include <avro/Compiler.hh>
 #include <avro/DataFile.hh>
@@ -178,7 +179,20 @@ static std::string nodeName(avro::NodePtr node)
 
 AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(avro::NodePtr root_node, DataTypePtr target_type)
 {
-    const WhichDataType target = removeLowCardinality(target_type);
+    if (target_type->lowCardinality())
+    {
+        const auto * lc_type = assert_cast<const DataTypeLowCardinality *>(target_type.get());
+        auto dict_deserialize = createDeserializeFn(root_node, lc_type->getDictionaryType());
+        return [dict_deserialize](IColumn & column, avro::Decoder & decoder)
+        {
+            auto & lc_column = assert_cast<ColumnLowCardinality &>(column);
+            auto tmp_column = lc_column.getDictionary().getNestedColumn()->cloneEmpty();
+            dict_deserialize(*tmp_column, decoder);
+            lc_column.insertFromFullColumn(*tmp_column, 0);
+        };
+    }
+
+    const WhichDataType target = WhichDataType(target_type);
 
     switch (root_node->type())
     {
@@ -599,7 +613,7 @@ AvroRowInputFormat::AvroRowInputFormat(const Block & header_, ReadBuffer & in_,
 
 void AvroRowInputFormat::readPrefix()
 {
-    file_reader_ptr = std::make_unique<avro::DataFileReaderBase>(std::make_unique<InputStreamReadBufferAdapter>(in));
+    file_reader_ptr = std::make_unique<avro::DataFileReaderBase>(std::make_unique<InputStreamReadBufferAdapter>(*in));
     deserializer_ptr = std::make_unique<AvroDeserializer>(output.getHeader(), file_reader_ptr->dataSchema(), allow_missing_fields);
     file_reader_ptr->init();
 }
@@ -748,7 +762,7 @@ AvroConfluentRowInputFormat::AvroConfluentRowInputFormat(
     const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
     : IRowInputFormat(header_, in_, params_)
     , schema_registry(getConfluentSchemaRegistry(format_settings_))
-    , input_stream(std::make_unique<InputStreamReadBufferAdapter>(in))
+    , input_stream(std::make_unique<InputStreamReadBufferAdapter>(*in))
     , decoder(avro::binaryDecoder())
     , format_settings(format_settings_)
 
@@ -758,16 +772,16 @@ AvroConfluentRowInputFormat::AvroConfluentRowInputFormat(
 
 bool AvroConfluentRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
     {
         return false;
     }
     // skip tombstone records (kafka messages with null value)
-    if (in.available() == 0)
+    if (in->available() == 0)
     {
         return false;
     }
-    SchemaId schema_id = readConfluentSchemaId(in);
+    SchemaId schema_id = readConfluentSchemaId(*in);
     const auto & deserializer = getOrCreateDeserializer(schema_id);
     deserializer.deserializeRow(columns, *decoder, ext);
     decoder->drain();
@@ -777,7 +791,7 @@ bool AvroConfluentRowInputFormat::readRow(MutableColumns & columns, RowReadExten
 void AvroConfluentRowInputFormat::syncAfterError()
 {
     // skip until the end of current kafka message
-    in.tryIgnore(in.available());
+    in->tryIgnore(in->available());
 }
 
 const AvroDeserializer & AvroConfluentRowInputFormat::getOrCreateDeserializer(SchemaId schema_id)
@@ -792,9 +806,9 @@ const AvroDeserializer & AvroConfluentRowInputFormat::getOrCreateDeserializer(Sc
     return it->second;
 }
 
-void registerInputFormatProcessorAvro(FormatFactory & factory)
+void registerInputFormatAvro(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("Avro", [](
+    factory.registerInputFormat("Avro", [](
         ReadBuffer & buf,
         const Block & sample,
         const RowInputFormatParams & params,
@@ -803,7 +817,7 @@ void registerInputFormatProcessorAvro(FormatFactory & factory)
         return std::make_shared<AvroRowInputFormat>(sample, buf, params, settings);
     });
 
-    factory.registerInputFormatProcessor("AvroConfluent",[](
+    factory.registerInputFormat("AvroConfluent",[](
         ReadBuffer & buf,
         const Block & sample,
         const RowInputFormatParams & params,
@@ -820,7 +834,7 @@ void registerInputFormatProcessorAvro(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerInputFormatProcessorAvro(FormatFactory &)
+void registerInputFormatAvro(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
index 24b231e9ea8..74eeee74475 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
@@ -413,9 +413,9 @@ void AvroRowOutputFormat::writeSuffix()
     file_writer.close();
 }
 
-void registerOutputFormatProcessorAvro(FormatFactory & factory)
+void registerOutputFormatAvro(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("Avro", [](
+    factory.registerOutputFormat("Avro", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
@@ -432,7 +432,7 @@ void registerOutputFormatProcessorAvro(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerOutputFormatProcessorAvro(FormatFactory &)
+void registerOutputFormatAvro(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
index 2d820a5985f..c122b9eea1a 100644
--- a/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowInputFormat.cpp
@@ -15,12 +15,12 @@ BinaryRowInputFormat::BinaryRowInputFormat(ReadBuffer & in_, Block header, Param
 
 bool BinaryRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     size_t num_columns = columns.size();
     for (size_t i = 0; i < num_columns; ++i)
-        serializations[i]->deserializeBinary(*columns[i], in);
+        serializations[i]->deserializeBinary(*columns[i], *in);
 
     return true;
 }
@@ -35,14 +35,14 @@ void BinaryRowInputFormat::readPrefix()
 
     if (with_names || with_types)
     {
-        readVarUInt(columns, in);
+        readVarUInt(columns, *in);
     }
 
     if (with_names)
     {
         for (size_t i = 0; i < columns; ++i)
         {
-            readStringBinary(tmp, in);
+            readStringBinary(tmp, *in);
         }
     }
 
@@ -50,15 +50,15 @@ void BinaryRowInputFormat::readPrefix()
     {
         for (size_t i = 0; i < columns; ++i)
         {
-            readStringBinary(tmp, in);
+            readStringBinary(tmp, *in);
         }
     }
 }
 
 
-void registerInputFormatProcessorRowBinary(FormatFactory & factory)
+void registerInputFormatRowBinary(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("RowBinary", [](
+    factory.registerInputFormat("RowBinary", [](
         ReadBuffer & buf,
         const Block & sample,
         const IRowInputFormat::Params & params,
@@ -67,7 +67,7 @@ void registerInputFormatProcessorRowBinary(FormatFactory & factory)
         return std::make_shared<BinaryRowInputFormat>(buf, sample, params, false, false);
     });
 
-    factory.registerInputFormatProcessor("RowBinaryWithNamesAndTypes", [](
+    factory.registerInputFormat("RowBinaryWithNamesAndTypes", [](
         ReadBuffer & buf,
         const Block & sample,
         const IRowInputFormat::Params & params,
diff --git a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
index 424eb375fa3..dbaee68453e 100644
--- a/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/BinaryRowOutputFormat.cpp
@@ -47,9 +47,9 @@ void BinaryRowOutputFormat::writeField(const IColumn & column, const ISerializat
 }
 
 
-void registerOutputFormatProcessorRowBinary(FormatFactory & factory)
+void registerOutputFormatRowBinary(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("RowBinary", [](
+    factory.registerOutputFormat("RowBinary", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
@@ -58,7 +58,7 @@ void registerOutputFormatProcessorRowBinary(FormatFactory & factory)
         return std::make_shared<BinaryRowOutputFormat>(buf, sample, false, false, params);
     });
 
-    factory.registerOutputFormatProcessor("RowBinaryWithNamesAndTypes", [](
+    factory.registerOutputFormat("RowBinaryWithNamesAndTypes", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 42aa9e6ddc7..014715ba9ee 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -45,8 +45,8 @@
         M(UINT64, arrow::UInt64Type) \
         M(INT64, arrow::Int64Type) \
         M(FLOAT, arrow::FloatType) \
-        M(DOUBLE, arrow::DoubleType)  \
-        M(STRING, arrow::StringType)
+        M(DOUBLE, arrow::DoubleType) \
+        M(BINARY, arrow::BinaryType)
 
 namespace DB
 {
@@ -72,6 +72,7 @@ namespace DB
 
         {"Date", arrow::uint16()},      /// uint16 is used instead of date32, because Apache Arrow cannot correctly serialize Date32Array.
         {"DateTime", arrow::uint32()},  /// uint32 is used instead of date64, because we don't need milliseconds.
+        {"Date32", arrow::date32()},
 
         {"String", arrow::binary()},
         {"FixedString", arrow::binary()},
@@ -295,6 +296,7 @@ namespace DB
         FOR_ARROW_TYPES(DISPATCH)
 #undef DISPATCH
 
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot fill arrow array with {} data.", column_type->getName());
     }
 
     template <typename ColumnType>
@@ -334,7 +336,6 @@ namespace DB
         size_t end)
     {
         const PaddedPODArray<UInt16> & internal_data = assert_cast<const ColumnVector<UInt16> &>(*write_column).getData();
-        //arrow::Date32Builder date_builder;
         arrow::UInt16Builder & builder = assert_cast<arrow::UInt16Builder &>(*array_builder);
         arrow::Status status;
 
@@ -343,7 +344,6 @@ namespace DB
             if (null_bytemap && (*null_bytemap)[value_i])
                 status = builder.AppendNull();
             else
-                /// Implicitly converts UInt16 to Int32
                 status = builder.Append(internal_data[value_i]);
             checkStatus(status, write_column->getName(), format_name);
         }
@@ -372,6 +372,28 @@ namespace DB
         }
     }
 
+    static void fillArrowArrayWithDate32ColumnData(
+        ColumnPtr write_column,
+        const PaddedPODArray<UInt8> * null_bytemap,
+        const String & format_name,
+        arrow::ArrayBuilder* array_builder,
+        size_t start,
+        size_t end)
+    {
+        const PaddedPODArray<Int32> & internal_data = assert_cast<const ColumnVector<Int32> &>(*write_column).getData();
+        arrow::Date32Builder & builder = assert_cast<arrow::Date32Builder &>(*array_builder);
+        arrow::Status status;
+
+        for (size_t value_i = start; value_i < end; ++value_i)
+        {
+            if (null_bytemap && (*null_bytemap)[value_i])
+                status = builder.AppendNull();
+            else
+                status = builder.Append(internal_data[value_i]);
+            checkStatus(status, write_column->getName(), format_name);
+        }
+    }
+
     static void fillArrowArray(
         const String & column_name,
         ColumnPtr & column,
@@ -410,6 +432,10 @@ namespace DB
         {
             fillArrowArrayWithDateTimeColumnData(column, null_bytemap, format_name, array_builder, start, end);
         }
+        else if (isDate32(column_type))
+        {
+            fillArrowArrayWithDate32ColumnData(column, null_bytemap, format_name, array_builder, start, end);
+        }
         else if (isArray(column_type))
         {
             fillArrowArrayWithArrayColumnData<arrow::ListBuilder>(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, dictionary_values);
@@ -442,13 +468,11 @@ namespace DB
                     fillArrowArrayWithDecimalColumnData<ToDataType, Int128, arrow::Decimal128, arrow::Decimal128Builder>(column, null_bytemap, array_builder, format_name, start, end);
                     return true;
                 }
-#if !defined(ARCADIA_BUILD)
                 if constexpr (std::is_same_v<ToDataType,DataTypeDecimal<Decimal256>>)
                 {
                     fillArrowArrayWithDecimalColumnData<ToDataType, Int256, arrow::Decimal256, arrow::Decimal256Builder>(column, null_bytemap, array_builder, format_name, start, end);
                     return true;
                 }
-#endif
 
                 return false;
             };
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
index c0885d3778c..1fb2a8af65e 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
@@ -1,8 +1,5 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
-
+#include "config_formats.h"
 
 #if USE_ARROW || USE_PARQUET
 
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index 93c39995e34..4beb260b64a 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -1,4 +1,5 @@
 #include <IO/ReadHelpers.h>
+#include <IO/BufferWithOwnMemory.h>
 #include <IO/Operators.h>
 
 #include <Formats/verbosePrintString.h>
@@ -160,7 +161,7 @@ void CSVRowInputFormat::readPrefix()
 {
     /// In this format, we assume, that if first string field contain BOM as value, it will be written in quotes,
     ///  so BOM at beginning of stream cannot be confused with BOM in first string value, and it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 
     size_t num_columns = data_types.size();
     const auto & header = getPort().getHeader();
@@ -179,15 +180,15 @@ void CSVRowInputFormat::readPrefix()
             do
             {
                 String column_name;
-                skipWhitespacesAndTabs(in);
-                readCSVString(column_name, in, format_settings.csv);
-                skipWhitespacesAndTabs(in);
+                skipWhitespacesAndTabs(*in);
+                readCSVString(column_name, *in, format_settings.csv);
+                skipWhitespacesAndTabs(*in);
 
                 addInputColumn(column_name);
             }
-            while (checkChar(format_settings.csv.delimiter, in));
+            while (checkChar(format_settings.csv.delimiter, *in));
 
-            skipDelimiter(in, format_settings.csv.delimiter, true);
+            skipDelimiter(*in, format_settings.csv.delimiter, true);
 
             for (auto read_column : column_mapping->read_columns)
             {
@@ -202,7 +203,7 @@ void CSVRowInputFormat::readPrefix()
         }
         else
         {
-            skipRow(in, format_settings.csv, num_columns);
+            skipRow(*in, format_settings.csv, num_columns);
             setupAllColumnsByTableSchema();
         }
     }
@@ -213,7 +214,7 @@ void CSVRowInputFormat::readPrefix()
 
 bool CSVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     updateDiagnosticInfo();
@@ -232,22 +233,22 @@ bool CSVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext
 
         if (table_column)
         {
-            skipWhitespacesAndTabs(in);
+            skipWhitespacesAndTabs(*in);
             ext.read_columns[*table_column] = readField(*columns[*table_column], data_types[*table_column],
                 serializations[*table_column], is_last_file_column);
 
             if (!ext.read_columns[*table_column])
                 have_default_columns = true;
-            skipWhitespacesAndTabs(in);
+            skipWhitespacesAndTabs(*in);
         }
         else
         {
             /// We never read this column from the file, just skip it.
             String tmp;
-            readCSVString(tmp, in, format_settings.csv);
+            readCSVString(tmp, *in, format_settings.csv);
         }
 
-        skipDelimiter(in, delimiter, is_last_file_column);
+        skipDelimiter(*in, delimiter, is_last_file_column);
     }
 
     if (have_default_columns)
@@ -277,13 +278,13 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
 
     for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
-        if (file_column == 0 && in.eof())
+        if (file_column == 0 && in->eof())
         {
             out << "<End of stream>\n";
             return false;
         }
 
-        skipWhitespacesAndTabs(in);
+        skipWhitespacesAndTabs(*in);
         if (column_mapping->column_indexes_for_input_fields[file_column].has_value())
         {
             const auto & header = getPort().getHeader();
@@ -300,53 +301,53 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
             if (!deserializeFieldAndPrintDiagnosticInfo(skipped_column_str, skipped_column_type, *skipped_column, out, file_column))
                 return false;
         }
-        skipWhitespacesAndTabs(in);
+        skipWhitespacesAndTabs(*in);
 
         /// Delimiters
         if (file_column + 1 == column_mapping->column_indexes_for_input_fields.size())
         {
-            if (in.eof())
+            if (in->eof())
                 return false;
 
             /// we support the extra delimiter at the end of the line
-            if (*in.position() == delimiter)
+            if (*in->position() == delimiter)
             {
-                ++in.position();
-                if (in.eof())
+                ++in->position();
+                if (in->eof())
                     break;
             }
 
-            if (!in.eof() && *in.position() != '\n' && *in.position() != '\r')
+            if (!in->eof() && *in->position() != '\n' && *in->position() != '\r')
             {
                 out << "ERROR: There is no line feed. ";
-                verbosePrintString(in.position(), in.position() + 1, out);
+                verbosePrintString(in->position(), in->position() + 1, out);
                 out << " found instead.\n"
                        " It's like your file has more columns than expected.\n"
-                       "And if your file have right number of columns, maybe it have unquoted string value with comma.\n";
+                       "And if your file has the right number of columns, maybe it has an unquoted string value with a comma.\n";
 
                 return false;
             }
 
-            skipEndOfLine(in);
+            skipEndOfLine(*in);
         }
         else
         {
             try
             {
-                assertChar(delimiter, in);
+                assertChar(delimiter, *in);
             }
             catch (const DB::Exception &)
             {
-                if (*in.position() == '\n' || *in.position() == '\r')
+                if (*in->position() == '\n' || *in->position() == '\r')
                 {
                     out << "ERROR: Line feed found where delimiter (" << delimiter << ") is expected."
                            " It's like your file has less columns than expected.\n"
-                           "And if your file have right number of columns, maybe it have unescaped quotes in values.\n";
+                           "And if your file has the right number of columns, maybe it has unescaped quotes in values.\n";
                 }
                 else
                 {
                     out << "ERROR: There is no delimiter (" << delimiter << "). ";
-                    verbosePrintString(in.position(), in.position() + 1, out);
+                    verbosePrintString(in->position(), in->position() + 1, out);
                     out << " found instead.\n";
                 }
                 return false;
@@ -360,7 +361,7 @@ bool CSVRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns & columns,
 
 void CSVRowInputFormat::syncAfterError()
 {
-    skipToNextLineOrEOF(in);
+    skipToNextLineOrEOF(*in);
 }
 
 void CSVRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn & column, size_t file_column)
@@ -374,15 +375,15 @@ void CSVRowInputFormat::tryDeserializeField(const DataTypePtr & type, IColumn &
     else
     {
         String tmp;
-        readCSVString(tmp, in, format_settings.csv);
+        readCSVString(tmp, *in, format_settings.csv);
     }
 }
 
 bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, const SerializationPtr & serialization, bool is_last_file_column)
 {
-    const bool at_delimiter = !in.eof() && *in.position() == format_settings.csv.delimiter;
+    const bool at_delimiter = !in->eof() && *in->position() == format_settings.csv.delimiter;
     const bool at_last_column_line_end = is_last_file_column
-                                         && (in.eof() || *in.position() == '\n' || *in.position() == '\r');
+                                         && (in->eof() || *in->position() == '\n' || *in->position() == '\r');
 
     /// Note: Tuples are serialized in CSV as separate columns, but with empty_as_default or null_as_default
     /// only one empty or NULL column will be expected
@@ -401,12 +402,12 @@ bool CSVRowInputFormat::readField(IColumn & column, const DataTypePtr & type, co
     else if (format_settings.null_as_default && !type->isNullable())
     {
         /// If value is null but type is not nullable then use default value instead.
-        return SerializationNullable::deserializeTextCSVImpl(column, in, format_settings, serialization);
+        return SerializationNullable::deserializeTextCSVImpl(column, *in, format_settings, serialization);
     }
     else
     {
         /// Read the column normally.
-        serialization->deserializeTextCSV(column, in, format_settings);
+        serialization->deserializeTextCSV(column, *in, format_settings);
         return true;
     }
 }
@@ -420,11 +421,11 @@ void CSVRowInputFormat::resetParser()
 }
 
 
-void registerInputFormatProcessorCSV(FormatFactory & factory)
+void registerInputFormatCSV(FormatFactory & factory)
 {
     for (bool with_names : {false, true})
     {
-        factory.registerInputFormatProcessor(with_names ? "CSVWithNames" : "CSV", [=](
+        factory.registerInputFormat(with_names ? "CSVWithNames" : "CSV", [=](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
diff --git a/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp b/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp
index b9945ddec15..14d0e519c0c 100644
--- a/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowOutputFormat.cpp
@@ -70,11 +70,11 @@ void CSVRowOutputFormat::writeBeforeExtremes()
 }
 
 
-void registerOutputFormatProcessorCSV(FormatFactory & factory)
+void registerOutputFormatCSV(FormatFactory & factory)
 {
     for (bool with_names : {false, true})
     {
-        factory.registerOutputFormatProcessor(with_names ? "CSVWithNames" : "CSV", [=](
+        factory.registerOutputFormat(with_names ? "CSVWithNames" : "CSV", [=](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
index 44e6ec02903..4d000bb1f35 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.cpp
@@ -1,7 +1,6 @@
 #include "CapnProtoRowInputFormat.h"
 #if USE_CAPNP
 
-#include <Core/Field.h>
 #include <IO/ReadBuffer.h>
 #include <Interpreters/Context.h>
 #include <Formats/FormatFactory.h>
@@ -9,204 +8,46 @@
 #include <capnp/serialize.h>
 #include <capnp/dynamic.h>
 #include <capnp/common.h>
-#include <common/logger_useful.h>
-#include <common/find_symbols.h>
 
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnDecimal.h>
+
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int BAD_TYPE_OF_FIELD;
-    extern const int THERE_IS_NO_COLUMN;
     extern const int LOGICAL_ERROR;
 }
 
-static CapnProtoRowInputFormat::NestedField split(const Block & header, size_t i)
-{
-    CapnProtoRowInputFormat::NestedField field = {{}, i};
-
-    // Remove leading dot in field definition, e.g. ".msg" -> "msg"
-    String name(header.safeGetByPosition(i).name);
-    if (!name.empty() && name[0] == '.')
-        name.erase(0, 1);
-
-    splitInto<'.', '_'>(field.tokens, name);
-    return field;
-}
-
-
-static Field convertNodeToField(const capnp::DynamicValue::Reader & value)
-{
-    switch (value.getType())
-    {
-        case capnp::DynamicValue::UNKNOWN:
-            throw Exception("Unknown field type", ErrorCodes::BAD_TYPE_OF_FIELD);
-        case capnp::DynamicValue::VOID:
-            return Field();
-        case capnp::DynamicValue::BOOL:
-            return value.as<bool>() ? 1u : 0u;
-        case capnp::DynamicValue::INT:
-            return value.as<int64_t>();
-        case capnp::DynamicValue::UINT:
-            return value.as<uint64_t>();
-        case capnp::DynamicValue::FLOAT:
-            return value.as<double>();
-        case capnp::DynamicValue::TEXT:
-        {
-            auto arr = value.as<capnp::Text>();
-            return String(arr.begin(), arr.size());
-        }
-        case capnp::DynamicValue::DATA:
-        {
-            auto arr = value.as<capnp::Data>().asChars();
-            return String(arr.begin(), arr.size());
-        }
-        case capnp::DynamicValue::LIST:
-        {
-            auto list_value = value.as<capnp::DynamicList>();
-            Array res(list_value.size());
-            for (auto i : kj::indices(list_value))
-                res[i] = convertNodeToField(list_value[i]);
-
-            return res;
-        }
-        case capnp::DynamicValue::ENUM:
-            return value.as<capnp::DynamicEnum>().getRaw();
-        case capnp::DynamicValue::STRUCT:
-        {
-            auto struct_value = value.as<capnp::DynamicStruct>();
-            const auto & fields = struct_value.getSchema().getFields();
-
-            Tuple tuple(fields.size());
-            for (auto i : kj::indices(fields))
-                tuple[i] = convertNodeToField(struct_value.get(fields[i]));
-
-            return tuple;
-        }
-        case capnp::DynamicValue::CAPABILITY:
-            throw Exception("CAPABILITY type not supported", ErrorCodes::BAD_TYPE_OF_FIELD);
-        case capnp::DynamicValue::ANY_POINTER:
-            throw Exception("ANY_POINTER type not supported", ErrorCodes::BAD_TYPE_OF_FIELD);
-    }
-    return Field();
-}
-
-static capnp::StructSchema::Field getFieldOrThrow(capnp::StructSchema node, const std::string & field)
-{
-    KJ_IF_MAYBE(child, node.findFieldByName(field))
-        return *child;
-    else
-        throw Exception("Field " + field + " doesn't exist in schema " + node.getShortDisplayName().cStr(), ErrorCodes::THERE_IS_NO_COLUMN);
-}
-
-
-void CapnProtoRowInputFormat::createActions(const NestedFieldList & sorted_fields, capnp::StructSchema reader)
-{
-    /// Columns in a table can map to fields in Cap'n'Proto or to structs.
-
-    /// Store common parents and their tokens in order to backtrack.
-    std::vector<capnp::StructSchema::Field> parents;
-    std::vector<std::string> parent_tokens;
-
-    capnp::StructSchema cur_reader = reader;
-
-    for (const auto & field : sorted_fields)
-    {
-        if (field.tokens.empty())
-            throw Exception("Logical error in CapnProtoRowInputFormat", ErrorCodes::LOGICAL_ERROR);
-
-        // Backtrack to common parent
-        while (field.tokens.size() < parent_tokens.size() + 1
-            || !std::equal(parent_tokens.begin(), parent_tokens.end(), field.tokens.begin()))
-        {
-            actions.push_back({Action::POP});
-            parents.pop_back();
-            parent_tokens.pop_back();
-
-            if (parents.empty())
-            {
-                cur_reader = reader;
-                break;
-            }
-            else
-                cur_reader = parents.back().getType().asStruct();
-        }
-
-        // Go forward
-        while (parent_tokens.size() + 1 < field.tokens.size())
-        {
-            const auto & token = field.tokens[parents.size()];
-            auto node = getFieldOrThrow(cur_reader, token);
-            if (node.getType().isStruct())
-            {
-                // Descend to field structure
-                parents.emplace_back(node);
-                parent_tokens.emplace_back(token);
-                cur_reader = node.getType().asStruct();
-                actions.push_back({Action::PUSH, node});
-            }
-            else if (node.getType().isList())
-            {
-                break; // Collect list
-            }
-            else
-                throw Exception("Field " + token + " is neither Struct nor List", ErrorCodes::BAD_TYPE_OF_FIELD);
-        }
-
-        // Read field from the structure
-        auto node = getFieldOrThrow(cur_reader, field.tokens[parents.size()]);
-        if (node.getType().isList() && !actions.empty() && actions.back().field == node)
-        {
-            // The field list here flattens Nested elements into multiple arrays
-            // In order to map Nested types in Cap'nProto back, they need to be collected
-            // Since the field names are sorted, the order of field positions must be preserved
-            // For example, if the fields are { b @0 :Text, a @1 :Text }, the `a` would come first
-            // even though it's position is second.
-            auto & columns = actions.back().columns;
-            auto it = std::upper_bound(columns.cbegin(), columns.cend(), field.pos);
-            columns.insert(it, field.pos);
-        }
-        else
-        {
-            actions.push_back({Action::READ, node, {field.pos}});
-        }
-    }
-}
-
-CapnProtoRowInputFormat::CapnProtoRowInputFormat(ReadBuffer & in_, Block header, Params params_, const FormatSchemaInfo & info)
-    : IRowInputFormat(std::move(header), in_, std::move(params_)), parser(std::make_shared<SchemaParser>())
+CapnProtoRowInputFormat::CapnProtoRowInputFormat(ReadBuffer & in_, Block header, Params params_, const FormatSchemaInfo & info, const FormatSettings & format_settings_)
+    : IRowInputFormat(std::move(header), in_, std::move(params_))
+    , parser(std::make_shared<CapnProtoSchemaParser>())
+    , format_settings(format_settings_)
+    , column_types(getPort().getHeader().getDataTypes())
+    , column_names(getPort().getHeader().getNames())
 {
     // Parse the schema and fetch the root object
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-    auto schema = parser->impl.parseDiskFile(info.schemaPath(), info.absoluteSchemaPath(), {});
-#pragma GCC diagnostic pop
-
-    root = schema.getNested(info.messageName()).asStruct();
-
-    /**
-     * The schema typically consists of fields in various nested structures.
-     * Here we gather the list of fields and sort them in a way so that fields in the same structure are adjacent,
-     * and the nesting level doesn't decrease to make traversal easier.
-     */
-    const auto & sample = getPort().getHeader();
-    NestedFieldList list;
-    size_t num_columns = sample.columns();
-    for (size_t i = 0; i < num_columns; ++i)
-        list.push_back(split(sample, i));
-
-    // Order list first by value of strings then by length of string vector.
-    std::sort(list.begin(), list.end(), [](const NestedField & a, const NestedField & b) { return a.tokens < b.tokens; });
-    createActions(list, root);
+    root = parser->getMessageSchema(info);
+    checkCapnProtoSchemaStructure(root, getPort().getHeader(), format_settings.capn_proto.enum_comparing_mode);
 }
 
 kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 {
     uint32_t segment_count;
-    in.readStrict(reinterpret_cast<char*>(&segment_count), sizeof(uint32_t));
+    in->readStrict(reinterpret_cast<char*>(&segment_count), sizeof(uint32_t));
 
     // one for segmentCount and one because segmentCount starts from 0
     const auto prefix_size = (2 + segment_count) * sizeof(uint32_t);
@@ -217,7 +58,7 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 
     // read size of each segment
     for (size_t i = 0; i <= segment_count; ++i)
-        in.readStrict(prefix_chars.begin() + ((i + 1) * sizeof(uint32_t)), sizeof(uint32_t));
+        in->readStrict(prefix_chars.begin() + ((i + 1) * sizeof(uint32_t)), sizeof(uint32_t));
 
     // calculate size of message
     const auto expected_words = capnp::expectedSizeInWordsFromPrefix(prefix);
@@ -228,14 +69,199 @@ kj::Array<capnp::word> CapnProtoRowInputFormat::readMessage()
 
     // read full message
     ::memcpy(msg_chars.begin(), prefix_chars.begin(), prefix_size);
-    in.readStrict(msg_chars.begin() + prefix_size, data_size);
+    in->readStrict(msg_chars.begin() + prefix_size, data_size);
 
     return msg;
 }
 
+static void insertSignedInteger(IColumn & column, const DataTypePtr & column_type, Int64 value)
+{
+    switch (column_type->getTypeId())
+    {
+        case TypeIndex::Int8:
+            assert_cast<ColumnInt8 &>(column).insertValue(value);
+            break;
+        case TypeIndex::Int16:
+            assert_cast<ColumnInt16 &>(column).insertValue(value);
+            break;
+        case TypeIndex::Int32:
+            assert_cast<ColumnInt32 &>(column).insertValue(value);
+            break;
+        case TypeIndex::Int64:
+            assert_cast<ColumnInt64 &>(column).insertValue(value);
+            break;
+        case TypeIndex::DateTime64:
+            assert_cast<ColumnDecimal<DateTime64> &>(column).insertValue(value);
+            break;
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column type is not a signed integer.");
+    }
+}
+
+static void insertUnsignedInteger(IColumn & column, const DataTypePtr & column_type, UInt64 value)
+{
+    switch (column_type->getTypeId())
+    {
+        case TypeIndex::UInt8:
+            assert_cast<ColumnUInt8 &>(column).insertValue(value);
+            break;
+        case TypeIndex::Date: [[fallthrough]];
+        case TypeIndex::UInt16:
+            assert_cast<ColumnUInt16 &>(column).insertValue(value);
+            break;
+        case TypeIndex::DateTime: [[fallthrough]];
+        case TypeIndex::UInt32:
+            assert_cast<ColumnUInt32 &>(column).insertValue(value);
+            break;
+        case TypeIndex::UInt64:
+            assert_cast<ColumnUInt64 &>(column).insertValue(value);
+            break;
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column type is not an unsigned integer.");
+    }
+}
+
+static void insertFloat(IColumn & column, const DataTypePtr & column_type, Float64 value)
+{
+    switch (column_type->getTypeId())
+    {
+        case TypeIndex::Float32:
+            assert_cast<ColumnFloat32 &>(column).insertValue(value);
+            break;
+        case TypeIndex::Float64:
+            assert_cast<ColumnFloat64 &>(column).insertValue(value);
+            break;
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column type is not a float.");
+    }
+}
+
+template <typename Value>
+static void insertString(IColumn & column, Value value)
+{
+    column.insertData(reinterpret_cast<const char *>(value.begin()), value.size());
+}
+
+template <typename ValueType>
+static void insertEnum(IColumn & column, const DataTypePtr & column_type, const capnp::DynamicEnum & enum_value, FormatSettings::EnumComparingMode enum_comparing_mode)
+{
+    auto enumerant = *kj::_::readMaybe(enum_value.getEnumerant());
+    auto enum_type = assert_cast<const DataTypeEnum<ValueType> *>(column_type.get());
+    DataTypePtr nested_type = std::make_shared<DataTypeNumber<ValueType>>();
+    switch (enum_comparing_mode)
+    {
+        case FormatSettings::EnumComparingMode::BY_VALUES:
+            insertSignedInteger(column, nested_type, Int64(enumerant.getOrdinal()));
+            return;
+        case FormatSettings::EnumComparingMode::BY_NAMES:
+            insertSignedInteger(column, nested_type, Int64(enum_type->getValue(String(enumerant.getProto().getName()))));
+            return;
+        case FormatSettings::EnumComparingMode::BY_NAMES_CASE_INSENSITIVE:
+        {
+            /// Find the same enum name case insensitive.
+            String enum_name = enumerant.getProto().getName();
+            for (auto & name : enum_type->getAllRegisteredNames())
+            {
+                if (compareEnumNames(name, enum_name, enum_comparing_mode))
+                {
+                    insertSignedInteger(column, nested_type, Int64(enum_type->getValue(name)));
+                    break;
+                }
+            }
+        }
+    }
+}
+
+static void insertValue(IColumn & column, const DataTypePtr & column_type, const capnp::DynamicValue::Reader & value, FormatSettings::EnumComparingMode enum_comparing_mode)
+{
+    if (column_type->lowCardinality())
+    {
+        auto & lc_column = assert_cast<ColumnLowCardinality &>(column);
+        auto tmp_column = lc_column.getDictionary().getNestedColumn()->cloneEmpty();
+        auto dict_type = assert_cast<const DataTypeLowCardinality *>(column_type.get())->getDictionaryType();
+        insertValue(*tmp_column, dict_type, value, enum_comparing_mode);
+        lc_column.insertFromFullColumn(*tmp_column, 0);
+        return;
+    }
+
+    switch (value.getType())
+    {
+        case capnp::DynamicValue::Type::INT:
+            insertSignedInteger(column, column_type, value.as<Int64>());
+            break;
+        case capnp::DynamicValue::Type::UINT:
+            insertUnsignedInteger(column, column_type, value.as<UInt64>());
+            break;
+        case capnp::DynamicValue::Type::FLOAT:
+            insertFloat(column, column_type, value.as<Float64>());
+            break;
+        case capnp::DynamicValue::Type::BOOL:
+            insertUnsignedInteger(column, column_type, UInt64(value.as<bool>()));
+            break;
+        case capnp::DynamicValue::Type::DATA:
+            insertString(column, value.as<capnp::Data>());
+            break;
+        case capnp::DynamicValue::Type::TEXT:
+            insertString(column, value.as<capnp::Text>());
+            break;
+        case capnp::DynamicValue::Type::ENUM:
+            if (column_type->getTypeId() == TypeIndex::Enum8)
+                insertEnum<Int8>(column, column_type, value.as<capnp::DynamicEnum>(), enum_comparing_mode);
+            else
+                insertEnum<Int16>(column, column_type, value.as<capnp::DynamicEnum>(), enum_comparing_mode);
+            break;
+        case capnp::DynamicValue::LIST:
+        {
+            auto list_value = value.as<capnp::DynamicList>();
+            auto & column_array = assert_cast<ColumnArray &>(column);
+            auto & offsets = column_array.getOffsets();
+            offsets.push_back(offsets.back() + list_value.size());
+
+            auto & nested_column = column_array.getData();
+            auto nested_type = assert_cast<const DataTypeArray *>(column_type.get())->getNestedType();
+            for (const auto & nested_value : list_value)
+                insertValue(nested_column, nested_type, nested_value, enum_comparing_mode);
+            break;
+        }
+        case capnp::DynamicValue::Type::STRUCT:
+        {
+            auto struct_value = value.as<capnp::DynamicStruct>();
+            if (column_type->isNullable())
+            {
+                auto & nullable_column = assert_cast<ColumnNullable &>(column);
+                auto field = *kj::_::readMaybe(struct_value.which());
+                if (field.getType().isVoid())
+                    nullable_column.insertDefault();
+                else
+                {
+                    auto & nested_column = nullable_column.getNestedColumn();
+                    auto nested_type = assert_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
+                    auto nested_value = struct_value.get(field);
+                    insertValue(nested_column, nested_type, nested_value, enum_comparing_mode);
+                    nullable_column.getNullMapData().push_back(0);
+                }
+            }
+            else
+            {
+                auto & tuple_column = assert_cast<ColumnTuple &>(column);
+                const auto * tuple_type = assert_cast<const DataTypeTuple *>(column_type.get());
+                for (size_t i = 0; i != tuple_column.tupleSize(); ++i)
+                    insertValue(
+                        tuple_column.getColumn(i),
+                        tuple_type->getElements()[i],
+                        struct_value.get(tuple_type->getElementNames()[i]),
+                        enum_comparing_mode);
+            }
+            break;
+        }
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected CapnProto value type.");
+    }
+}
+
 bool CapnProtoRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     auto array = readMessage();
@@ -245,65 +271,25 @@ bool CapnProtoRowInputFormat::readRow(MutableColumns & columns, RowReadExtension
 #else
     capnp::FlatArrayMessageReader msg(array);
 #endif
-    std::vector<capnp::DynamicStruct::Reader> stack;
-    stack.push_back(msg.getRoot<capnp::DynamicStruct>(root));
 
-    for (auto action : actions)
+    auto root_reader = msg.getRoot<capnp::DynamicStruct>(root);
+    for (size_t i = 0; i != columns.size(); ++i)
     {
-        switch (action.type)
-        {
-            case Action::READ:
-            {
-                Field value = convertNodeToField(stack.back().get(action.field));
-                if (action.columns.size() > 1)
-                {
-                    // Nested columns must be flattened into several arrays
-                    // e.g. Array(Tuple(x ..., y ...)) -> Array(x ...), Array(y ...)
-                    const auto & collected = DB::get<const Array &>(value);
-                    size_t size = collected.size();
-                    // The flattened array contains an array of a part of the nested tuple
-                    Array flattened(size);
-                    for (size_t column_index = 0; column_index < action.columns.size(); ++column_index)
-                    {
-                        // Populate array with a single tuple elements
-                        for (size_t off = 0; off < size; ++off)
-                        {
-                            const auto & tuple = DB::get<const Tuple &>(collected[off]);
-                            flattened[off] = tuple[column_index];
-                        }
-                        auto & col = columns[action.columns[column_index]];
-                        col->insert(flattened);
-                    }
-                }
-                else
-                {
-                    auto & col = columns[action.columns[0]];
-                    col->insert(value);
-                }
-
-                break;
-            }
-            case Action::POP:
-                stack.pop_back();
-                break;
-            case Action::PUSH:
-                stack.push_back(stack.back().get(action.field).as<capnp::DynamicStruct>());
-                break;
-        }
+        auto value = getReaderByColumnName(root_reader, column_names[i]);
+        insertValue(*columns[i], column_types[i], value, format_settings.capn_proto.enum_comparing_mode);
     }
 
     return true;
 }
 
-void registerInputFormatProcessorCapnProto(FormatFactory & factory)
+void registerInputFormatCapnProto(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor(
+    factory.registerInputFormat(
         "CapnProto",
         [](ReadBuffer & buf, const Block & sample, IRowInputFormat::Params params, const FormatSettings & settings)
         {
             return std::make_shared<CapnProtoRowInputFormat>(buf, sample, std::move(params),
-                       FormatSchemaInfo(settings.schema.format_schema, "CapnProto", true,
-                                        settings.schema.is_server, settings.schema.format_schema_path));
+                       FormatSchemaInfo(settings, "CapnProto", true), settings);
         });
 }
 
@@ -314,7 +300,7 @@ void registerInputFormatProcessorCapnProto(FormatFactory & factory)
 namespace DB
 {
     class FormatFactory;
-    void registerInputFormatProcessorCapnProto(FormatFactory &) {}
+    void registerInputFormatCapnProto(FormatFactory &) {}
 }
 
 #endif // USE_CAPNP
diff --git a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h
index 0957cd1d681..fc30cf11237 100644
--- a/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CapnProtoRowInputFormat.h
@@ -4,8 +4,8 @@
 #if USE_CAPNP
 
 #include <Core/Block.h>
+#include <Formats/CapnProtoUtils.h>
 #include <Processors/Formats/IRowInputFormat.h>
-#include <capnp/schema-parser.h>
 
 namespace DB
 {
@@ -22,18 +22,7 @@ class ReadBuffer;
 class CapnProtoRowInputFormat : public IRowInputFormat
 {
 public:
-    struct NestedField
-    {
-        std::vector<std::string> tokens;
-        size_t pos;
-    };
-    using NestedFieldList = std::vector<NestedField>;
-
-    /** schema_dir  - base path for schema files
-      * schema_file - location of the capnproto schema, e.g. "schema.capnp"
-      * root_object - name to the root object, e.g. "Message"
-      */
-    CapnProtoRowInputFormat(ReadBuffer & in_, Block header, Params params_, const FormatSchemaInfo & info);
+    CapnProtoRowInputFormat(ReadBuffer & in_, Block header, Params params_, const FormatSchemaInfo & info, const FormatSettings & format_settings_);
 
     String getName() const override { return "CapnProtoRowInputFormat"; }
 
@@ -42,34 +31,11 @@ public:
 private:
     kj::Array<capnp::word> readMessage();
 
-    // Build a traversal plan from a sorted list of fields
-    void createActions(const NestedFieldList & sorted_fields, capnp::StructSchema reader);
-
-    /* Action for state machine for traversing nested structures. */
-    using BlockPositionList = std::vector<size_t>;
-    struct Action
-    {
-        enum Type { POP, PUSH, READ };
-        Type type{};
-        capnp::StructSchema::Field field{};
-        BlockPositionList columns{};
-    };
-
-    // Wrapper for classes that could throw in destructor
-    // https://github.com/capnproto/capnproto/issues/553
-    template <typename T>
-    struct DestructorCatcher
-    {
-        T impl;
-        template <typename ... Arg>
-        DestructorCatcher(Arg && ... args) : impl(kj::fwd<Arg>(args)...) {}
-        ~DestructorCatcher() noexcept try { } catch (...) { return; }
-    };
-    using SchemaParser = DestructorCatcher<capnp::SchemaParser>;
-
-    std::shared_ptr<SchemaParser> parser;
+    std::shared_ptr<CapnProtoSchemaParser> parser;
     capnp::StructSchema root;
-    std::vector<Action> actions;
+    const FormatSettings format_settings;
+    DataTypes column_types;
+    Names column_names;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
new file mode 100644
index 00000000000..58f88c5c7cf
--- /dev/null
+++ b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.cpp
@@ -0,0 +1,268 @@
+#include <Processors/Formats/Impl/CapnProtoRowOutputFormat.h>
+#if USE_CAPNP
+
+#include <Formats/CapnProtoUtils.h>
+#include <Formats/FormatSettings.h>
+#include <IO/WriteBuffer.h>
+#include <capnp/dynamic.h>
+#include <capnp/serialize-packed.h>
+
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnDecimal.h>
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+CapnProtoOutputStream::CapnProtoOutputStream(WriteBuffer & out_) : out(out_)
+{
+}
+
+void CapnProtoOutputStream::write(const void * buffer, size_t size)
+{
+    out.write(reinterpret_cast<const char *>(buffer), size);
+}
+
+CapnProtoRowOutputFormat::CapnProtoRowOutputFormat(
+    WriteBuffer & out_,
+    const Block & header_,
+    const RowOutputFormatParams & params_,
+    const FormatSchemaInfo & info,
+    const FormatSettings & format_settings_)
+    : IRowOutputFormat(header_, out_, params_), column_names(header_.getNames()), column_types(header_.getDataTypes()), output_stream(std::make_unique<CapnProtoOutputStream>(out_)), format_settings(format_settings_)
+{
+    schema = schema_parser.getMessageSchema(info);
+    checkCapnProtoSchemaStructure(schema, getPort(PortKind::Main).getHeader(), format_settings.capn_proto.enum_comparing_mode);
+}
+
+template <typename EnumValue>
+static capnp::DynamicEnum getDynamicEnum(
+    const ColumnPtr & column,
+    const DataTypePtr & data_type,
+    size_t row_num,
+    const capnp::EnumSchema & enum_schema,
+    FormatSettings::EnumComparingMode mode)
+{
+    const auto * enum_data_type = assert_cast<const DataTypeEnum<EnumValue> *>(data_type.get());
+    EnumValue enum_value = column->getInt(row_num);
+    if (mode == FormatSettings::EnumComparingMode::BY_VALUES)
+        return capnp::DynamicEnum(enum_schema, enum_value);
+
+    auto enum_name = enum_data_type->getNameForValue(enum_value);
+    for (const auto enumerant : enum_schema.getEnumerants())
+    {
+        if (compareEnumNames(String(enum_name), enumerant.getProto().getName(), mode))
+            return capnp::DynamicEnum(enumerant);
+    }
+
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot convert CLickHouse Enum value to CapnProto Enum");
+}
+
+static capnp::DynamicValue::Builder initStructFieldBuilder(const ColumnPtr & column, size_t row_num, capnp::DynamicStruct::Builder & struct_builder, capnp::StructSchema::Field field)
+{
+    if (const auto * array_column = checkAndGetColumn<ColumnArray>(*column))
+    {
+        size_t size = array_column->getOffsets()[row_num] - array_column->getOffsets()[row_num - 1];
+        return struct_builder.init(field, size);
+    }
+
+    if (field.getType().isStruct())
+        return struct_builder.init(field);
+
+    return struct_builder.get(field);
+}
+
+static std::optional<capnp::DynamicValue::Reader> convertToDynamicValue(
+    const ColumnPtr & column,
+    const DataTypePtr & data_type,
+    size_t row_num,
+    capnp::DynamicValue::Builder builder,
+    FormatSettings::EnumComparingMode enum_comparing_mode,
+    std::vector<std::unique_ptr<String>> & temporary_text_data_storage)
+{
+    /// Here we don't do any types validation, because we did it in CapnProtoRowOutputFormat constructor.
+
+    if (data_type->lowCardinality())
+    {
+        const auto * lc_column = assert_cast<const ColumnLowCardinality *>(column.get());
+        const auto & dict_type = assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType();
+        size_t index = lc_column->getIndexAt(row_num);
+        return convertToDynamicValue(lc_column->getDictionary().getNestedColumn(), dict_type, index, builder, enum_comparing_mode, temporary_text_data_storage);
+    }
+
+    switch (builder.getType())
+    {
+        case capnp::DynamicValue::Type::INT:
+            /// We allow output DateTime64 as Int64.
+            if (WhichDataType(data_type).isDateTime64())
+                return capnp::DynamicValue::Reader(assert_cast<const ColumnDecimal<DateTime64> *>(column.get())->getElement(row_num));
+            return capnp::DynamicValue::Reader(column->getInt(row_num));
+        case capnp::DynamicValue::Type::UINT:
+            return capnp::DynamicValue::Reader(column->getUInt(row_num));
+        case capnp::DynamicValue::Type::BOOL:
+            return capnp::DynamicValue::Reader(column->getBool(row_num));
+        case capnp::DynamicValue::Type::FLOAT:
+            return capnp::DynamicValue::Reader(column->getFloat64(row_num));
+        case capnp::DynamicValue::Type::ENUM:
+        {
+            auto enum_schema = builder.as<capnp::DynamicEnum>().getSchema();
+            if (data_type->getTypeId() == TypeIndex::Enum8)
+                return capnp::DynamicValue::Reader(
+                    getDynamicEnum<Int8>(column, data_type, row_num, enum_schema, enum_comparing_mode));
+            return capnp::DynamicValue::Reader(
+                    getDynamicEnum<Int16>(column, data_type, row_num, enum_schema, enum_comparing_mode));
+        }
+        case capnp::DynamicValue::Type::DATA:
+        {
+            auto data = column->getDataAt(row_num);
+            return capnp::DynamicValue::Reader(capnp::Data::Reader(reinterpret_cast<const kj::byte *>(data.data), data.size));
+        }
+        case capnp::DynamicValue::Type::TEXT:
+        {
+            /// In TEXT type data should be null-terminated, but ClickHouse String data could not be.
+            /// To make data null-terminated we should copy it to temporary String object, but
+            /// capnp::Text::Reader works only with pointer to the data and it's size, so we should
+            /// guarantee that new String object life time is longer than capnp::Text::Reader life time.
+            /// To do this we store new String object in a temporary storage, passed in this function
+            /// by reference. We use unique_ptr<String> instead of just String to avoid pointers
+            /// invalidation on vector reallocation.
+            temporary_text_data_storage.push_back(std::make_unique<String>(column->getDataAt(row_num)));
+            auto & data = temporary_text_data_storage.back();
+            return capnp::DynamicValue::Reader(capnp::Text::Reader(data->data(), data->size()));
+        }
+        case capnp::DynamicValue::Type::STRUCT:
+        {
+            auto struct_builder = builder.as<capnp::DynamicStruct>();
+            auto nested_struct_schema = struct_builder.getSchema();
+            /// Struct can be represent Tuple or Naullable (named union with two fields)
+            if (data_type->isNullable())
+            {
+                const auto * nullable_type = assert_cast<const DataTypeNullable *>(data_type.get());
+                const auto * nullable_column = assert_cast<const ColumnNullable *>(column.get());
+                auto fields = nested_struct_schema.getUnionFields();
+                if (nullable_column->isNullAt(row_num))
+                {
+                    auto null_field = fields[0].getType().isVoid() ? fields[0] : fields[1];
+                    struct_builder.set(null_field, capnp::Void());
+                }
+                else
+                {
+                    auto value_field = fields[0].getType().isVoid() ? fields[1] : fields[0];
+                    struct_builder.clear(value_field);
+                    const auto & nested_column = nullable_column->getNestedColumnPtr();
+                    auto value_builder = initStructFieldBuilder(nested_column, row_num, struct_builder, value_field);
+                    auto value = convertToDynamicValue(nested_column, nullable_type->getNestedType(), row_num, value_builder, enum_comparing_mode, temporary_text_data_storage);
+                    if (value)
+                        struct_builder.set(value_field, std::move(*value));
+                }
+            }
+            else
+            {
+                const auto * tuple_data_type = assert_cast<const DataTypeTuple *>(data_type.get());
+                auto nested_types = tuple_data_type->getElements();
+                const auto & nested_columns = assert_cast<const ColumnTuple *>(column.get())->getColumns();
+                for (const auto & name : tuple_data_type->getElementNames())
+                {
+                    auto pos = tuple_data_type->getPositionByName(name);
+                    auto field_builder
+                        = initStructFieldBuilder(nested_columns[pos], row_num, struct_builder, nested_struct_schema.getFieldByName(name));
+                    auto value = convertToDynamicValue(nested_columns[pos], nested_types[pos], row_num, field_builder, enum_comparing_mode, temporary_text_data_storage);
+                    if (value)
+                        struct_builder.set(name, std::move(*value));
+                }
+            }
+            return std::nullopt;
+        }
+        case capnp::DynamicValue::Type::LIST:
+        {
+            auto list_builder = builder.as<capnp::DynamicList>();
+            const auto * array_column = assert_cast<const ColumnArray *>(column.get());
+            const auto & nested_column = array_column->getDataPtr();
+            const auto & nested_type = assert_cast<const DataTypeArray *>(data_type.get())->getNestedType();
+            const auto & offsets = array_column->getOffsets();
+            auto offset = offsets[row_num - 1];
+            size_t size = offsets[row_num] - offset;
+
+            const auto * nested_array_column = checkAndGetColumn<ColumnArray>(*nested_column);
+            for (size_t i = 0; i != size; ++i)
+            {
+                capnp::DynamicValue::Builder value_builder;
+                /// For nested arrays we need to initialize nested list builder.
+                if (nested_array_column)
+                {
+                    const auto & nested_offset = nested_array_column->getOffsets();
+                    size_t nested_array_size = nested_offset[offset + i] - nested_offset[offset + i - 1];
+                    value_builder = list_builder.init(i, nested_array_size);
+                }
+                else
+                    value_builder = list_builder[i];
+
+                auto value = convertToDynamicValue(nested_column, nested_type, offset + i, value_builder, enum_comparing_mode, temporary_text_data_storage);
+                if (value)
+                    list_builder.set(i, std::move(*value));
+            }
+            return std::nullopt;
+        }
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected CapnProto type.");
+    }
+}
+
+void CapnProtoRowOutputFormat::write(const Columns & columns, size_t row_num)
+{
+    capnp::MallocMessageBuilder message;
+    /// Temporary storage for data that will be outputted in fields with CapnProto type TEXT.
+    /// See comment in convertToDynamicValue() for more details.
+    std::vector<std::unique_ptr<String>> temporary_text_data_storage;
+    capnp::DynamicStruct::Builder root = message.initRoot<capnp::DynamicStruct>(schema);
+    for (size_t i = 0; i != columns.size(); ++i)
+    {
+        auto [struct_builder, field] = getStructBuilderAndFieldByColumnName(root, column_names[i]);
+        auto field_builder = initStructFieldBuilder(columns[i], row_num, struct_builder, field);
+        auto value = convertToDynamicValue(columns[i], column_types[i], row_num, field_builder, format_settings.capn_proto.enum_comparing_mode, temporary_text_data_storage);
+        if (value)
+            struct_builder.set(field, *value);
+    }
+
+    capnp::writeMessage(*output_stream, message);
+}
+
+void registerOutputFormatCapnProto(FormatFactory & factory)
+{
+    factory.registerOutputFormat("CapnProto", [](
+        WriteBuffer & buf,
+        const Block & sample,
+        const RowOutputFormatParams & params,
+        const FormatSettings & format_settings)
+    {
+        return std::make_shared<CapnProtoRowOutputFormat>(buf, sample, params, FormatSchemaInfo(format_settings, "CapnProto", true), format_settings);
+    });
+}
+
+}
+
+#else
+
+namespace DB
+{
+class FormatFactory;
+void registerOutputFormatCapnProto(FormatFactory &) {}
+}
+
+#endif // USE_CAPNP
diff --git a/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.h b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.h
new file mode 100644
index 00000000000..0f321071d62
--- /dev/null
+++ b/src/Processors/Formats/Impl/CapnProtoRowOutputFormat.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include "config_formats.h"
+#if USE_CAPNP
+
+#include <Processors/Formats/IRowOutputFormat.h>
+#include <Formats/FormatSchemaInfo.h>
+#include <Formats/CapnProtoUtils.h>
+#include <capnp/schema.h>
+#include <capnp/dynamic.h>
+#include <kj/io.h>
+
+namespace DB
+{
+class CapnProtoOutputStream : public kj::OutputStream
+{
+public:
+    CapnProtoOutputStream(WriteBuffer & out_);
+
+    void write(const void * buffer, size_t size) override;
+
+private:
+    WriteBuffer & out;
+};
+
+class CapnProtoRowOutputFormat : public IRowOutputFormat
+{
+public:
+    CapnProtoRowOutputFormat(
+        WriteBuffer & out_,
+        const Block & header_,
+        const RowOutputFormatParams & params_,
+        const FormatSchemaInfo & info,
+        const FormatSettings & format_settings_);
+
+    String getName() const override { return "CapnProtoRowOutputFormat"; }
+
+    void write(const Columns & columns, size_t row_num) override;
+
+    void writeField(const IColumn &, const ISerialization &, size_t) override { }
+
+private:
+    Names column_names;
+    DataTypes column_types;
+    capnp::StructSchema schema;
+    std::unique_ptr<CapnProtoOutputStream> output_stream;
+    const FormatSettings format_settings;
+    CapnProtoSchemaParser schema_parser;
+};
+
+}
+
+#endif // USE_CAPNP
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index cc9ae5e65bb..2120c00b3b5 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -276,8 +276,9 @@ private:
             info.type = std::make_shared<DataTypeMap>(nested_types);
         }
         else
-            throw Exception(String("Unexpected literal type ") + info.literal->value.getTypeName() + ". It's a bug",
-                            ErrorCodes::LOGICAL_ERROR);
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Unexpected literal type {}",
+                info.literal->value.getTypeName());
 
         /// Allow literal to be NULL, if result column has nullable type or if function never returns NULL
         if (info.force_nullable && info.type->canBeInsideNullable())
@@ -632,19 +633,23 @@ ColumnPtr ConstantExpressionTemplate::evaluateAll(BlockMissingValues & nulls, si
 void ConstantExpressionTemplate::TemplateStructure::addNodesToCastResult(const IDataType & result_column_type, ASTPtr & expr, bool null_as_default)
 {
     /// Replace "expr" with "CAST(expr, 'TypeName')"
-    /// or with "(CAST(assumeNotNull(expr as _expression), 'TypeName'), isNull(_expression))" if null_as_default is true
+    /// or with "(if(isNull(_dummy_0 AS _expression), defaultValueOfTypeName('TypeName'), _CAST(_expression, 'TypeName')), isNull(_expression))" if null_as_default is true
     if (null_as_default)
     {
         expr->setAlias("_expression");
-        expr = makeASTFunction("assumeNotNull", std::move(expr));
-    }
 
-    expr = makeASTFunction("CAST", std::move(expr), std::make_shared<ASTLiteral>(result_column_type.getName()));
-
-    if (null_as_default)
-    {
         auto is_null = makeASTFunction("isNull", std::make_shared<ASTIdentifier>("_expression"));
-        expr = makeASTFunction("tuple", std::move(expr), std::move(is_null));
+        is_null->setAlias("_is_expression_nullable");
+
+        auto default_value = makeASTFunction("defaultValueOfTypeName", std::make_shared<ASTLiteral>(result_column_type.getName()));
+        auto cast = makeASTFunction("_CAST", std::move(expr), std::make_shared<ASTLiteral>(result_column_type.getName()));
+
+        auto cond = makeASTFunction("if", std::move(is_null), std::move(default_value), std::move(cast));
+        expr = makeASTFunction("tuple", std::move(cond), std::make_shared<ASTIdentifier>("_is_expression_nullable"));
+    }
+    else
+    {
+        expr = makeASTFunction("_CAST", std::move(expr), std::make_shared<ASTLiteral>(result_column_type.getName()));
     }
 }
 
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
index bc57803152f..5b32bf94c4d 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.cpp
@@ -2,7 +2,7 @@
 #include <Formats/JSONEachRowUtils.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
@@ -15,7 +15,7 @@ namespace ErrorCodes
 }
 
 JSONAsStringRowInputFormat::JSONAsStringRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_) :
-    IRowInputFormat(header_, in_, std::move(params_)), buf(in)
+    IRowInputFormat(header_, in_, std::move(params_)), buf(*in)
 {
     if (header_.columns() > 1)
         throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -34,6 +34,35 @@ void JSONAsStringRowInputFormat::resetParser()
     buf.reset();
 }
 
+void JSONAsStringRowInputFormat::readPrefix()
+{
+    /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
+    skipBOMIfExists(buf);
+
+    skipWhitespaceIfAny(buf);
+    if (!buf.eof() && *buf.position() == '[')
+    {
+        ++buf.position();
+        data_in_square_brackets = true;
+    }
+}
+
+void JSONAsStringRowInputFormat::readSuffix()
+{
+    skipWhitespaceIfAny(buf);
+    if (data_in_square_brackets)
+    {
+        assertChar(']', buf);
+        skipWhitespaceIfAny(buf);
+    }
+    if (!buf.eof() && *buf.position() == ';')
+    {
+        ++buf.position();
+        skipWhitespaceIfAny(buf);
+    }
+    assertEOF(buf);
+}
+
 void JSONAsStringRowInputFormat::readJSONObject(IColumn & column)
 {
     PeekableReadBufferCheckpoint checkpoint{buf};
@@ -113,7 +142,23 @@ void JSONAsStringRowInputFormat::readJSONObject(IColumn & column)
 
 bool JSONAsStringRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
+    if (!allow_new_rows)
+        return false;
+
     skipWhitespaceIfAny(buf);
+    if (!buf.eof())
+    {
+        if (!data_in_square_brackets && *buf.position() == ';')
+        {
+            /// ';' means the end of query, but it cannot be before ']'.
+            return allow_new_rows = false;
+        }
+        else if (data_in_square_brackets && *buf.position() == ']')
+        {
+            /// ']' means the end of query.
+            return allow_new_rows = false;
+        }
+    }
 
     if (!buf.eof())
         readJSONObject(*columns[0]);
@@ -126,9 +171,9 @@ bool JSONAsStringRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
     return !buf.eof();
 }
 
-void registerInputFormatProcessorJSONAsString(FormatFactory & factory)
+void registerInputFormatJSONAsString(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("JSONAsString", [](
+    factory.registerInputFormat("JSONAsString", [](
             ReadBuffer & buf,
             const Block & sample,
             const RowInputFormatParams & params,
@@ -143,4 +188,9 @@ void registerFileSegmentationEngineJSONAsString(FormatFactory & factory)
     factory.registerFileSegmentationEngine("JSONAsString", &fileSegmentationEngineJSONEachRowImpl);
 }
 
+void registerNonTrivialPrefixAndSuffixCheckerJSONAsString(FormatFactory & factory)
+{
+    factory.registerNonTrivialPrefixAndSuffixChecker("JSONAsString", nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl);
+}
+
 }
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
index c15a769343c..c70d9efb178 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
@@ -22,10 +22,17 @@ public:
     String getName() const override { return "JSONAsStringRowInputFormat"; }
     void resetParser() override;
 
+    void readPrefix() override;
+    void readSuffix() override;
+
 private:
     void readJSONObject(IColumn & column);
 
     PeekableReadBuffer buf;
+
+    /// This flag is needed to know if data is in square brackets.
+    bool data_in_square_brackets = false;
+    bool allow_new_rows = true;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 682a4fbf69a..962e9d6e5ac 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -49,33 +49,33 @@ void JSONCompactEachRowRowInputFormat::resetParser()
 void JSONCompactEachRowRowInputFormat::readPrefix()
 {
     /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 
     if (with_names)
     {
         size_t num_columns = getPort().getHeader().columns();
         read_columns.assign(num_columns, false);
 
-        assertChar('[', in);
+        assertChar('[', *in);
         do
         {
-            skipWhitespaceIfAny(in);
+            skipWhitespaceIfAny(*in);
             String column_name;
-            readJSONString(column_name, in);
+            readJSONString(column_name, *in);
             addInputColumn(column_name);
-            skipWhitespaceIfAny(in);
+            skipWhitespaceIfAny(*in);
         }
-        while (checkChar(',', in));
-        assertChar(']', in);
+        while (checkChar(',', *in));
+        assertChar(']', *in);
         skipEndOfLine();
 
         /// Type checking
-        assertChar('[', in);
+        assertChar('[', *in);
         for (size_t i = 0; i < column_indexes_for_input_fields.size(); ++i)
         {
-            skipWhitespaceIfAny(in);
+            skipWhitespaceIfAny(*in);
             String data_type;
-            readJSONString(data_type, in);
+            readJSONString(data_type, *in);
 
             if (column_indexes_for_input_fields[i] &&
                 data_types[*column_indexes_for_input_fields[i]]->getName() != data_type)
@@ -89,10 +89,10 @@ void JSONCompactEachRowRowInputFormat::readPrefix()
             }
 
             if (i != column_indexes_for_input_fields.size() - 1)
-                assertChar(',', in);
-            skipWhitespaceIfAny(in);
+                assertChar(',', *in);
+            skipWhitespaceIfAny(*in);
         }
-        assertChar(']', in);
+        assertChar(']', *in);
     }
     else
     {
@@ -149,14 +149,14 @@ bool JSONCompactEachRowRowInputFormat::readRow(DB::MutableColumns &columns, DB::
 {
     skipEndOfLine();
 
-    if (in.eof())
+    if (in->eof())
         return false;
 
     size_t num_columns = columns.size();
 
     read_columns.assign(num_columns, false);
 
-    assertChar('[', in);
+    assertChar('[', *in);
     for (size_t file_column = 0; file_column < column_indexes_for_input_fields.size(); ++file_column)
     {
         const auto & table_column = column_indexes_for_input_fields[file_column];
@@ -166,19 +166,19 @@ bool JSONCompactEachRowRowInputFormat::readRow(DB::MutableColumns &columns, DB::
         }
         else
         {
-            skipJSONField(in, StringRef(names_of_columns[file_column]));
+            skipJSONField(*in, StringRef(names_of_columns[file_column]));
         }
 
-        skipWhitespaceIfAny(in);
-        if (in.eof())
+        skipWhitespaceIfAny(*in);
+        if (in->eof())
             throw ParsingException("Unexpected end of stream while parsing JSONCompactEachRow format", ErrorCodes::CANNOT_READ_ALL_DATA);
         if (file_column + 1 != column_indexes_for_input_fields.size())
         {
-            assertChar(',', in);
-            skipWhitespaceIfAny(in);
+            assertChar(',', *in);
+            skipWhitespaceIfAny(*in);
         }
     }
-    assertChar(']', in);
+    assertChar(']', *in);
 
     for (const auto & name : not_seen_columns)
         columns[name]->insertDefault();
@@ -189,11 +189,11 @@ bool JSONCompactEachRowRowInputFormat::readRow(DB::MutableColumns &columns, DB::
 
 void JSONCompactEachRowRowInputFormat::skipEndOfLine()
 {
-    skipWhitespaceIfAny(in);
-    if (!in.eof() && (*in.position() == ',' || *in.position() == ';'))
-        ++in.position();
+    skipWhitespaceIfAny(*in);
+    if (!in->eof() && (*in->position() == ',' || *in->position() == ';'))
+        ++in->position();
 
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
 }
 
 void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns & columns)
@@ -207,7 +207,7 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
         if (yield_strings)
         {
             String str;
-            readJSONString(str, in);
+            readJSONString(str, *in);
 
             ReadBufferFromString buf(str);
 
@@ -219,9 +219,9 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
         else
         {
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], in, format_settings, serialization);
+                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], *in, format_settings, serialization);
             else
-                serialization->deserializeTextJSON(*columns[index], in, format_settings);
+                serialization->deserializeTextJSON(*columns[index], *in, format_settings);
         }
     }
     catch (Exception & e)
@@ -233,12 +233,12 @@ void JSONCompactEachRowRowInputFormat::readField(size_t index, MutableColumns &
 
 void JSONCompactEachRowRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
-void registerInputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
+void registerInputFormatJSONCompactEachRow(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("JSONCompactEachRow", [](
+    factory.registerInputFormat("JSONCompactEachRow", [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
@@ -247,7 +247,7 @@ void registerInputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
         return std::make_shared<JSONCompactEachRowRowInputFormat>(buf, sample, std::move(params), settings, false, false);
     });
 
-    factory.registerInputFormatProcessor("JSONCompactEachRowWithNamesAndTypes", [](
+    factory.registerInputFormat("JSONCompactEachRowWithNamesAndTypes", [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
@@ -256,7 +256,7 @@ void registerInputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
         return std::make_shared<JSONCompactEachRowRowInputFormat>(buf, sample, std::move(params), settings, true, false);
     });
 
-    factory.registerInputFormatProcessor("JSONCompactStringsEachRow", [](
+    factory.registerInputFormat("JSONCompactStringsEachRow", [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
@@ -265,7 +265,7 @@ void registerInputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
         return std::make_shared<JSONCompactEachRowRowInputFormat>(buf, sample, std::move(params), settings, false, true);
     });
 
-    factory.registerInputFormatProcessor("JSONCompactStringsEachRowWithNamesAndTypes", [](
+    factory.registerInputFormat("JSONCompactStringsEachRowWithNamesAndTypes", [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
index a3055873c01..1ce4277023d 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
@@ -98,9 +98,9 @@ void JSONCompactEachRowRowOutputFormat::consumeTotals(DB::Chunk chunk)
         IRowOutputFormat::consumeTotals(std::move(chunk));
 }
 
-void registerOutputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
+void registerOutputFormatJSONCompactEachRow(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("JSONCompactEachRow", [](
+    factory.registerOutputFormat("JSONCompactEachRow", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -110,7 +110,7 @@ void registerOutputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
     });
     factory.markOutputFormatSupportsParallelFormatting("JSONCompactEachRow");
 
-    factory.registerOutputFormatProcessor("JSONCompactEachRowWithNamesAndTypes", [](
+    factory.registerOutputFormat("JSONCompactEachRowWithNamesAndTypes", [](
             WriteBuffer &buf,
             const Block &sample,
             const RowOutputFormatParams & params,
@@ -120,7 +120,7 @@ void registerOutputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
     });
     factory.markOutputFormatSupportsParallelFormatting("JSONCompactEachRowWithNamesAndTypes");
 
-    factory.registerOutputFormatProcessor("JSONCompactStringsEachRow", [](
+    factory.registerOutputFormat("JSONCompactStringsEachRow", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -130,7 +130,7 @@ void registerOutputFormatProcessorJSONCompactEachRow(FormatFactory & factory)
     });
     factory.markOutputFormatSupportsParallelFormatting("JSONCompactStringsEachRow");
 
-    factory.registerOutputFormatProcessor("JSONCompactStringsEachRowWithNamesAndTypes", [](
+    factory.registerOutputFormat("JSONCompactStringsEachRowWithNamesAndTypes", [](
             WriteBuffer &buf,
             const Block &sample,
             const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
index cefaded6912..f4887b66968 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactRowOutputFormat.cpp
@@ -88,9 +88,9 @@ void JSONCompactRowOutputFormat::writeExtremesElement(const char * title, const
     writeChar(']', *ostr);
 }
 
-void registerOutputFormatProcessorJSONCompact(FormatFactory & factory)
+void registerOutputFormatJSONCompact(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("JSONCompact", [](
+    factory.registerOutputFormat("JSONCompact", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
@@ -99,7 +99,7 @@ void registerOutputFormatProcessorJSONCompact(FormatFactory & factory)
         return std::make_shared<JSONCompactRowOutputFormat>(buf, sample, params, format_settings, false);
     });
 
-    factory.registerOutputFormatProcessor("JSONCompactStrings", [](
+    factory.registerOutputFormat("JSONCompactStrings", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index e0f6514295b..d04ba2a49e4 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -128,7 +128,7 @@ void JSONEachRowRowInputFormat::skipUnknownField(const StringRef & name_ref)
     if (!format_settings.skip_unknown_fields)
         throw Exception("Unknown field found while parsing JSONEachRow format: " + name_ref.toString(), ErrorCodes::INCORRECT_DATA);
 
-    skipJSONField(in, name_ref);
+    skipJSONField(*in, name_ref);
 }
 
 void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns)
@@ -145,7 +145,7 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
         if (yield_strings)
         {
             String str;
-            readJSONString(str, in);
+            readJSONString(str, *in);
 
             ReadBufferFromString buf(str);
 
@@ -157,9 +157,9 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
         else
         {
             if (format_settings.null_as_default && !type->isNullable())
-                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], in, format_settings, serialization);
+                read_columns[index] = SerializationNullable::deserializeTextJSONImpl(*columns[index], *in, format_settings, serialization);
             else
-                serialization->deserializeTextJSON(*columns[index], in, format_settings);
+                serialization->deserializeTextJSON(*columns[index], *in, format_settings);
         }
     }
     catch (Exception & e)
@@ -171,31 +171,31 @@ void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns
 
 inline bool JSONEachRowRowInputFormat::advanceToNextKey(size_t key_index)
 {
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
 
-    if (in.eof())
+    if (in->eof())
         throw ParsingException("Unexpected end of stream while parsing JSONEachRow format", ErrorCodes::CANNOT_READ_ALL_DATA);
-    else if (*in.position() == '}')
+    else if (*in->position() == '}')
     {
-        ++in.position();
+        ++in->position();
         return false;
     }
 
     if (key_index > 0)
     {
-        assertChar(',', in);
-        skipWhitespaceIfAny(in);
+        assertChar(',', *in);
+        skipWhitespaceIfAny(*in);
     }
     return true;
 }
 
 void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
 {
-    assertChar('{', in);
+    assertChar('{', *in);
 
     for (size_t key_index = 0; advanceToNextKey(key_index); ++key_index)
     {
-        StringRef name_ref = readColumnName(in);
+        StringRef name_ref = readColumnName(*in);
         const size_t column_index = columnIndex(name_ref, key_index);
 
         if (unlikely(ssize_t(column_index) < 0))
@@ -207,7 +207,7 @@ void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
             current_column_name.assign(name_ref.data, name_ref.size);
             name_ref = StringRef(current_column_name);
 
-            skipColonDelimeter(in);
+            skipColonDelimeter(*in);
 
             if (column_index == UNKNOWN_FIELD)
                 skipUnknownField(name_ref);
@@ -218,7 +218,7 @@ void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
         }
         else
         {
-            skipColonDelimeter(in);
+            skipColonDelimeter(*in);
             readField(column_index, columns);
         }
     }
@@ -238,7 +238,7 @@ bool JSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
 {
     if (!allow_new_rows)
         return false;
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
 
     /// We consume , or \n before scanning a new row, instead scanning to next row at the end.
     /// The reason is that if we want an exact number of rows read with LIMIT x
@@ -247,25 +247,25 @@ bool JSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
 
     /// Semicolon is added for convenience as it could be used at end of INSERT query.
     bool is_first_row = getCurrentUnitNumber() == 0 && getTotalRows() == 1;
-    if (!in.eof())
+    if (!in->eof())
     {
         /// There may be optional ',' (but not before the first row)
-        if (!is_first_row && *in.position() == ',')
-            ++in.position();
-        else if (!data_in_square_brackets && *in.position() == ';')
+        if (!is_first_row && *in->position() == ',')
+            ++in->position();
+        else if (!data_in_square_brackets && *in->position() == ';')
         {
             /// ';' means the end of query (but it cannot be before ']')
             return allow_new_rows = false;
         }
-        else if (data_in_square_brackets && *in.position() == ']')
+        else if (data_in_square_brackets && *in->position() == ']')
         {
             /// ']' means the end of query
             return allow_new_rows = false;
         }
     }
 
-    skipWhitespaceIfAny(in);
-    if (in.eof())
+    skipWhitespaceIfAny(*in);
+    if (in->eof())
         return false;
 
     size_t num_columns = columns.size();
@@ -290,7 +290,7 @@ bool JSONEachRowRowInputFormat::readRow(MutableColumns & columns, RowReadExtensi
 
 void JSONEachRowRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 void JSONEachRowRowInputFormat::resetParser()
@@ -305,36 +305,36 @@ void JSONEachRowRowInputFormat::resetParser()
 void JSONEachRowRowInputFormat::readPrefix()
 {
     /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 
-    skipWhitespaceIfAny(in);
-    if (!in.eof() && *in.position() == '[')
+    skipWhitespaceIfAny(*in);
+    if (!in->eof() && *in->position() == '[')
     {
-        ++in.position();
+        ++in->position();
         data_in_square_brackets = true;
     }
 }
 
 void JSONEachRowRowInputFormat::readSuffix()
 {
-    skipWhitespaceIfAny(in);
+    skipWhitespaceIfAny(*in);
     if (data_in_square_brackets)
     {
-        assertChar(']', in);
-        skipWhitespaceIfAny(in);
+        assertChar(']', *in);
+        skipWhitespaceIfAny(*in);
     }
-    if (!in.eof() && *in.position() == ';')
+    if (!in->eof() && *in->position() == ';')
     {
-        ++in.position();
-        skipWhitespaceIfAny(in);
+        ++in->position();
+        skipWhitespaceIfAny(*in);
     }
-    assertEOF(in);
+    assertEOF(*in);
 }
 
 
-void registerInputFormatProcessorJSONEachRow(FormatFactory & factory)
+void registerInputFormatJSONEachRow(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("JSONEachRow", [](
+    factory.registerInputFormat("JSONEachRow", [](
         ReadBuffer & buf,
         const Block & sample,
         IRowInputFormat::Params params,
@@ -343,7 +343,7 @@ void registerInputFormatProcessorJSONEachRow(FormatFactory & factory)
         return std::make_shared<JSONEachRowRowInputFormat>(buf, sample, std::move(params), settings, false);
     });
 
-    factory.registerInputFormatProcessor("JSONStringsEachRow", [](
+    factory.registerInputFormat("JSONStringsEachRow", [](
         ReadBuffer & buf,
         const Block & sample,
         IRowInputFormat::Params params,
@@ -359,4 +359,10 @@ void registerFileSegmentationEngineJSONEachRow(FormatFactory & factory)
     factory.registerFileSegmentationEngine("JSONStringsEachRow", &fileSegmentationEngineJSONEachRowImpl);
 }
 
+void registerNonTrivialPrefixAndSuffixCheckerJSONEachRow(FormatFactory & factory)
+{
+    factory.registerNonTrivialPrefixAndSuffixChecker("JSONEachRow", nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl);
+    factory.registerNonTrivialPrefixAndSuffixChecker("JSONStringsEachRow", nonTrivialPrefixAndSuffixCheckerJSONEachRowImpl);
+}
+
 }
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
index a69499de813..0a07da1858b 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowOutputFormat.cpp
@@ -125,9 +125,9 @@ void JSONEachRowRowOutputFormat::writeSuffix()
 }
 
 
-void registerOutputFormatProcessorJSONEachRow(FormatFactory & factory)
+void registerOutputFormatJSONEachRow(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("JSONEachRow", [](
+    factory.registerOutputFormat("JSONEachRow", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
@@ -140,7 +140,7 @@ void registerOutputFormatProcessorJSONEachRow(FormatFactory & factory)
     });
     factory.markOutputFormatSupportsParallelFormatting("JSONEachRow");
 
-    factory.registerOutputFormatProcessor("JSONStringsEachRow", [](
+    factory.registerOutputFormat("JSONStringsEachRow", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/JSONEachRowWithProgressRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowWithProgressRowOutputFormat.cpp
index 4612ce99f05..b9660a5bc00 100644
--- a/src/Processors/Formats/Impl/JSONEachRowWithProgressRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowWithProgressRowOutputFormat.cpp
@@ -28,9 +28,9 @@ void JSONEachRowWithProgressRowOutputFormat::onProgress(const Progress & value)
 }
 
 
-void registerOutputFormatProcessorJSONEachRowWithProgress(FormatFactory & factory)
+void registerOutputFormatJSONEachRowWithProgress(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("JSONEachRowWithProgress", [](
+    factory.registerOutputFormat("JSONEachRowWithProgress", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -42,7 +42,7 @@ void registerOutputFormatProcessorJSONEachRowWithProgress(FormatFactory & factor
             sample, params, settings);
     });
 
-    factory.registerOutputFormatProcessor("JSONStringsEachRowWithProgress", [](
+    factory.registerOutputFormat("JSONStringsEachRowWithProgress", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
index 38c6eefac1c..28d774fea74 100644
--- a/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONRowOutputFormat.cpp
@@ -266,9 +266,9 @@ void JSONRowOutputFormat::onProgress(const Progress & value)
 }
 
 
-void registerOutputFormatProcessorJSON(FormatFactory & factory)
+void registerOutputFormatJSON(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("JSON", [](
+    factory.registerOutputFormat("JSON", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
@@ -277,7 +277,7 @@ void registerOutputFormatProcessorJSON(FormatFactory & factory)
         return std::make_shared<JSONRowOutputFormat>(buf, sample, params, format_settings, false);
     });
 
-    factory.registerOutputFormatProcessor("JSONStrings", [](
+    factory.registerOutputFormat("JSONStrings", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
index 01c2c8cd614..1a05f61d36b 100644
--- a/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/LineAsStringRowInputFormat.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Formats/Impl/LineAsStringRowInputFormat.h>
 #include <Formats/JSONEachRowUtils.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
@@ -29,13 +29,13 @@ void LineAsStringRowInputFormat::readLineObject(IColumn & column)
 {
     DB::Memory<> object;
 
-    char * pos = in.position();
+    char * pos = in->position();
     bool need_more_data = true;
 
-    while (loadAtPosition(in, object, pos) && need_more_data)
+    while (loadAtPosition(*in, object, pos) && need_more_data)
     {
-        pos = find_first_symbols<'\n'>(pos, in.buffer().end());
-        if (pos == in.buffer().end())
+        pos = find_first_symbols<'\n'>(pos, in->buffer().end());
+        if (pos == in->buffer().end())
             continue;
 
         if (*pos == '\n')
@@ -44,8 +44,8 @@ void LineAsStringRowInputFormat::readLineObject(IColumn & column)
         ++pos;
     }
 
-    saveUpToPosition(in, object, pos);
-    loadAtPosition(in, object, pos);
+    saveUpToPosition(*in, object, pos);
+    loadAtPosition(*in, object, pos);
 
     /// Last character is always \n.
     column.insertData(object.data(), object.size() - 1);
@@ -53,7 +53,7 @@ void LineAsStringRowInputFormat::readLineObject(IColumn & column)
 
 bool LineAsStringRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     readLineObject(*columns[0]);
@@ -61,9 +61,9 @@ bool LineAsStringRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
     return true;
 }
 
-void registerInputFormatProcessorLineAsString(FormatFactory & factory)
+void registerInputFormatLineAsString(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("LineAsString", [](
+    factory.registerInputFormat("LineAsString", [](
             ReadBuffer & buf,
             const Block & sample,
             const RowInputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
index ebf0384445c..40fe5a77d62 100644
--- a/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MarkdownRowOutputFormat.cpp
@@ -55,9 +55,9 @@ void MarkdownRowOutputFormat::writeField(const IColumn & column, const ISerializ
     serialization.serializeTextEscaped(column, row_num, out, format_settings);
 }
 
-void registerOutputFormatProcessorMarkdown(FormatFactory & factory)
+void registerOutputFormatMarkdown(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("Markdown", [](
+    factory.registerOutputFormat("Markdown", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
index 6eb9d1d037c..86540be17b9 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.cpp
@@ -7,15 +7,17 @@
 #include <IO/ReadHelpers.h>
 
 #include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Columns/ColumnArray.h>
-#include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnLowCardinality.h>
 
 namespace DB
 {
@@ -27,7 +29,7 @@ namespace ErrorCodes
 }
 
 MsgPackRowInputFormat::MsgPackRowInputFormat(const Block & header_, ReadBuffer & in_, Params params_)
-    : IRowInputFormat(header_, in_, std::move(params_)), buf(in), parser(visitor), data_types(header_.getDataTypes())  {}
+    : IRowInputFormat(header_, in_, std::move(params_)), buf(*in), parser(visitor), data_types(header_.getDataTypes())  {}
 
 void MsgPackRowInputFormat::resetParser()
 {
@@ -50,95 +52,213 @@ void MsgPackVisitor::reset()
     info_stack = {};
 }
 
-void MsgPackVisitor::insert_integer(UInt64 value) // NOLINT
+template <typename InsertFunc>
+static bool checkAndInsertNullable(IColumn & column, DataTypePtr type, InsertFunc insert_func)
 {
-    Info & info = info_stack.top();
-    switch (info.type->getTypeId())
+    if (type->isNullable())
+    {
+        auto & nullable_column = assert_cast<ColumnNullable &>(column);
+        auto & nested_column = nullable_column.getNestedColumn();
+        const auto & nested_type = assert_cast<const DataTypeNullable *>(type.get())->getNestedType();
+        insert_func(nested_column, nested_type);
+        nullable_column.getNullMapColumn().insertValue(0);
+        return true;
+    }
+
+    return false;
+}
+
+template <typename InsertFunc>
+static bool checkAndInsertLowCardinality(IColumn & column, DataTypePtr type, InsertFunc insert_func)
+{
+    if (type->lowCardinality())
+    {
+        auto & lc_column = assert_cast<ColumnLowCardinality &>(column);
+        auto tmp_column = lc_column.getDictionary().getNestedColumn()->cloneEmpty();
+        auto dict_type = assert_cast<const DataTypeLowCardinality *>(type.get())->getDictionaryType();
+        insert_func(*tmp_column, dict_type);
+        lc_column.insertFromFullColumn(*tmp_column, 0);
+        return true;
+    }
+    return false;
+}
+
+static void insertInteger(IColumn & column, DataTypePtr type, UInt64 value)
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertInteger(column_, type_, value);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    switch (type->getTypeId())
     {
         case TypeIndex::UInt8:
         {
-            assert_cast<ColumnUInt8 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt8 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Date: [[fallthrough]];
         case TypeIndex::UInt16:
         {
-            assert_cast<ColumnUInt16 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt16 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::DateTime: [[fallthrough]];
         case TypeIndex::UInt32:
         {
-            assert_cast<ColumnUInt32 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt32 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::UInt64:
         {
-            assert_cast<ColumnUInt64 &>(info.column).insertValue(value);
+            assert_cast<ColumnUInt64 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int8:
         {
-            assert_cast<ColumnInt8 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt8 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int16:
         {
-            assert_cast<ColumnInt16 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt16 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int32:
         {
-            assert_cast<ColumnInt32 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt32 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::Int64:
         {
-            assert_cast<ColumnInt64 &>(info.column).insertValue(value);
+            assert_cast<ColumnInt64 &>(column).insertValue(value);
             break;
         }
         case TypeIndex::DateTime64:
         {
-            assert_cast<DataTypeDateTime64::ColumnType &>(info.column).insertValue(value);
+            assert_cast<DataTypeDateTime64::ColumnType &>(column).insertValue(value);
             break;
         }
         default:
-            throw Exception("Type " + info.type->getName() + " is not supported for MsgPack input format", ErrorCodes::ILLEGAL_COLUMN);
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack integer into column with type {}.", type->getName());
     }
 }
 
+static void insertString(IColumn & column, DataTypePtr type, const char * value, size_t size)
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertString(column_, type_, value, size);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!isStringOrFixedString(type))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack string into column with type {}.", type->getName());
+
+    column.insertData(value, size);
+}
+
+static void insertFloat32(IColumn & column, DataTypePtr type, Float32 value) // NOLINT
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertFloat32(column_, type_, value);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!WhichDataType(type).isFloat32())
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack float32 into column with type {}.", type->getName());
+
+    assert_cast<ColumnFloat32 &>(column).insertValue(value);
+}
+
+static void insertFloat64(IColumn & column, DataTypePtr type, Float64 value) // NOLINT
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertFloat64(column_, type_, value);
+    };
+
+    if (checkAndInsertNullable(column, type, insert_func) || checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!WhichDataType(type).isFloat64())
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack float64 into column with type {}.", type->getName());
+
+    assert_cast<ColumnFloat64 &>(column).insertValue(value);
+}
+
+static void insertNull(IColumn & column, DataTypePtr type)
+{
+    auto insert_func = [&](IColumn & column_, DataTypePtr type_)
+    {
+        insertNull(column_, type_);
+    };
+
+    /// LowCardinality(Nullable(...))
+    if (checkAndInsertLowCardinality(column, type, insert_func))
+        return;
+
+    if (!type->isNullable())
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack null into non-nullable column with type {}.", type->getName());
+
+    assert_cast<ColumnNullable &>(column).insertDefault();
+}
+
 bool MsgPackVisitor::visit_positive_integer(UInt64 value) // NOLINT
 {
-    insert_integer(value);
+    insertInteger(info_stack.top().column, info_stack.top().type, value);
     return true;
 }
 
 bool MsgPackVisitor::visit_negative_integer(Int64 value) // NOLINT
 {
-    insert_integer(value);
+    insertInteger(info_stack.top().column, info_stack.top().type, value);
     return true;
 }
 
-bool MsgPackVisitor::visit_str(const char* value, size_t size) // NOLINT
+bool MsgPackVisitor::visit_str(const char * value, size_t size) // NOLINT
 {
-    info_stack.top().column.insertData(value, size);
+    insertString(info_stack.top().column, info_stack.top().type, value, size);
+    return true;
+}
+
+bool MsgPackVisitor::visit_bin(const char * value, size_t size) // NOLINT
+{
+    insertString(info_stack.top().column, info_stack.top().type, value, size);
     return true;
 }
 
 bool MsgPackVisitor::visit_float32(Float32 value) // NOLINT
 {
-    assert_cast<ColumnFloat32 &>(info_stack.top().column).insertValue(value);
+    insertFloat32(info_stack.top().column, info_stack.top().type, value);
     return true;
 }
 
 bool MsgPackVisitor::visit_float64(Float64 value) // NOLINT
 {
-    assert_cast<ColumnFloat64 &>(info_stack.top().column).insertValue(value);
+    insertFloat64(info_stack.top().column, info_stack.top().type, value);
+    return true;
+}
+
+bool MsgPackVisitor::visit_boolean(bool value)
+{
+    insertInteger(info_stack.top().column, info_stack.top().type, UInt64(value));
     return true;
 }
 
 bool MsgPackVisitor::start_array(size_t size) // NOLINT
 {
+    if (!isArray(info_stack.top().type))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack array into column with type {}.", info_stack.top().type->getName());
+
     auto nested_type = assert_cast<const DataTypeArray &>(*info_stack.top().type).getNestedType();
     ColumnArray & column_array = assert_cast<ColumnArray &>(info_stack.top().column);
     ColumnArray::Offsets & offsets = column_array.getOffsets();
@@ -154,6 +274,50 @@ bool MsgPackVisitor::end_array() // NOLINT
     return true;
 }
 
+bool MsgPackVisitor::start_map(uint32_t size) // NOLINT
+{
+    if (!isMap(info_stack.top().type))
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert MessagePack map into column with type {}.", info_stack.top().type->getName());
+    ColumnArray & column_array = assert_cast<ColumnMap &>(info_stack.top().column).getNestedColumn();
+    ColumnArray::Offsets & offsets = column_array.getOffsets();
+    offsets.push_back(offsets.back() + size);
+    return true;
+}
+
+bool MsgPackVisitor::start_map_key() // NOLINT
+{
+    auto key_column = assert_cast<ColumnMap &>(info_stack.top().column).getNestedData().getColumns()[0];
+    auto key_type = assert_cast<const DataTypeMap &>(*info_stack.top().type).getKeyType();
+    info_stack.push(Info{*key_column, key_type});
+    return true;
+}
+
+bool MsgPackVisitor::end_map_key() // NOLINT
+{
+    info_stack.pop();
+    return true;
+}
+
+bool MsgPackVisitor::start_map_value() // NOLINT
+{
+    auto value_column = assert_cast<ColumnMap &>(info_stack.top().column).getNestedData().getColumns()[1];
+    auto value_type = assert_cast<const DataTypeMap &>(*info_stack.top().type).getValueType();
+    info_stack.push(Info{*value_column, value_type});
+    return true;
+}
+
+bool MsgPackVisitor::end_map_value() // NOLINT
+{
+    info_stack.pop();
+    return true;
+}
+
+bool MsgPackVisitor::visit_nil()
+{
+    insertNull(info_stack.top().column, info_stack.top().type);
+    return true;
+}
+
 void MsgPackVisitor::parse_error(size_t, size_t) // NOLINT
 {
     throw Exception("Error occurred while parsing msgpack data.", ErrorCodes::INCORRECT_DATA);
@@ -199,9 +363,9 @@ bool MsgPackRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &
     return true;
 }
 
-void registerInputFormatProcessorMsgPack(FormatFactory & factory)
+void registerInputFormatMsgPack(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("MsgPack", [](
+    factory.registerInputFormat("MsgPack", [](
             ReadBuffer & buf,
             const Block & sample,
             const RowInputFormatParams & params,
@@ -218,7 +382,7 @@ void registerInputFormatProcessorMsgPack(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerInputFormatProcessorMsgPack(FormatFactory &)
+void registerInputFormatMsgPack(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
index ac44772929a..fa5c2e74584 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#    include "config_core.h"
-#endif
-
+#include "config_formats.h"
+#include "config_core.h"
 
 #if USE_MSGPACK
 
@@ -33,22 +30,27 @@ public:
     bool visit_negative_integer(Int64 value);
     bool visit_float32(Float32 value);
     bool visit_float64(Float64 value);
-    bool visit_str(const char* value, size_t size);
+    bool visit_str(const char * value, size_t size);
+    bool visit_bin(const char * value, size_t size);
+    bool visit_boolean(bool value);
     bool start_array(size_t size);
     bool end_array();
+    bool visit_nil();
+    bool start_map(uint32_t size);
+    bool start_map_key();
+    bool end_map_key();
+    bool start_map_value();
+    bool end_map_value();
 
     /// This function will be called if error occurs in parsing
     [[noreturn]] void parse_error(size_t parsed_offset, size_t error_offset);
 
     /// Update info_stack
     void set_info(IColumn & column, DataTypePtr type);
-
-    void insert_integer(UInt64 value);
-
     void reset();
 
 private:
-    /// Stack is needed to process nested arrays
+    /// Stack is needed to process arrays and maps
     std::stack<Info> info_stack;
 };
 
diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
index bb20d3d9899..bbc7b005fd8 100644
--- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.cpp
@@ -6,15 +6,18 @@
 #include <Common/assert_cast.h>
 
 #include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnLowCardinality.h>
 
 namespace DB
 {
@@ -91,15 +94,15 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
         case TypeIndex::String:
         {
             const StringRef & string = assert_cast<const ColumnString &>(column).getDataAt(row_num);
-            packer.pack_str(string.size);
-            packer.pack_str_body(string.data, string.size);
+            packer.pack_bin(string.size);
+            packer.pack_bin_body(string.data, string.size);
             return;
         }
         case TypeIndex::FixedString:
         {
             const StringRef & string = assert_cast<const ColumnFixedString &>(column).getDataAt(row_num);
-            packer.pack_str(string.size);
-            packer.pack_str_body(string.data, string.size);
+            packer.pack_bin(string.size);
+            packer.pack_bin_body(string.data, string.size);
             return;
         }
         case TypeIndex::Array:
@@ -132,6 +135,35 @@ void MsgPackRowOutputFormat::serializeField(const IColumn & column, DataTypePtr
             packer.pack_nil();
             return;
         }
+        case TypeIndex::Map:
+        {
+            const auto & map_column = assert_cast<const ColumnMap &>(column);
+            const auto & nested_column = map_column.getNestedColumn();
+            const auto & key_value_columns = map_column.getNestedData().getColumns();
+            const auto & key_column = key_value_columns[0];
+            const auto & value_column = key_value_columns[1];
+
+            const auto & map_type = assert_cast<const DataTypeMap &>(*data_type);
+            const auto & offsets = nested_column.getOffsets();
+            size_t offset = offsets[row_num - 1];
+            size_t size = offsets[row_num] - offset;
+            packer.pack_map(size);
+            for (size_t i = 0; i < size; ++i)
+            {
+                serializeField(*key_column, map_type.getKeyType(), offset + i);
+                serializeField(*value_column, map_type.getValueType(), offset + i);
+            }
+            return;
+        }
+        case TypeIndex::LowCardinality:
+        {
+            const auto & lc_column = assert_cast<const ColumnLowCardinality &>(column);
+            auto dict_type = assert_cast<const DataTypeLowCardinality *>(data_type.get())->getDictionaryType();
+            auto dict_column = lc_column.getDictionary().getNestedColumn();
+            size_t index = lc_column.getIndexAt(row_num);
+            serializeField(*dict_column, dict_type, index);
+            return;
+        }
         default:
             break;
     }
@@ -148,10 +180,10 @@ void MsgPackRowOutputFormat::write(const Columns & columns, size_t row_num)
 }
 
 
-void registerOutputFormatProcessorMsgPack(FormatFactory & factory)
+void registerOutputFormatMsgPack(FormatFactory & factory)
 {
 
-    factory.registerOutputFormatProcessor("MsgPack", [](
+    factory.registerOutputFormat("MsgPack", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -168,7 +200,7 @@ void registerOutputFormatProcessorMsgPack(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerOutputFormatProcessorMsgPack(FormatFactory &)
+void registerOutputFormatMsgPack(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h
index 9c66bb9d207..2766eb144e4 100644
--- a/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/MsgPackRowOutputFormat.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#    include "config_core.h"
-#endif
+#include "config_formats.h"
+#include "config_core.h"
 
 #if USE_MSGPACK
 
diff --git a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
index 6fdcc544a18..0b366244611 100644
--- a/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLOutputFormat.cpp
@@ -64,7 +64,6 @@ void MySQLOutputFormat::initialize()
     }
 }
 
-
 void MySQLOutputFormat::consume(Chunk chunk)
 {
     initialize();
@@ -106,9 +105,9 @@ void MySQLOutputFormat::flush()
     packet_endpoint->out->next();
 }
 
-void registerOutputFormatProcessorMySQLWire(FormatFactory & factory)
+void registerOutputFormatMySQLWire(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor(
+    factory.registerOutputFormat(
         "MySQLWire",
         [](WriteBuffer & buf,
            const Block & sample,
diff --git a/src/Processors/Formats/Impl/NativeFormat.cpp b/src/Processors/Formats/Impl/NativeFormat.cpp
new file mode 100644
index 00000000000..07cf4670981
--- /dev/null
+++ b/src/Processors/Formats/Impl/NativeFormat.cpp
@@ -0,0 +1,109 @@
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
+#include <Formats/FormatFactory.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Transforms/AggregatingTransform.h>
+
+
+namespace DB
+{
+
+
+class NativeInputFormat final : public IInputFormat
+{
+public:
+    NativeInputFormat(ReadBuffer & buf, const Block & header)
+        : IInputFormat(header, buf)
+        , reader(buf, header, 0) {}
+
+    String getName() const override { return "Native"; }
+
+    void resetParser() override
+    {
+        IInputFormat::resetParser();
+        reader.resetParser();
+    }
+
+    Chunk generate() override
+    {
+        auto block = reader.read();
+        if (!block)
+            return {};
+
+        assertBlocksHaveEqualStructure(getPort().getHeader(), block, getName());
+        block.checkNumberOfRows();
+
+        size_t num_rows = block.rows();
+        return Chunk(block.getColumns(), num_rows);
+    }
+
+private:
+    NativeReader reader;
+};
+
+class NativeOutputFormat final : public IOutputFormat
+{
+public:
+    NativeOutputFormat(WriteBuffer & buf, const Block & header)
+        : IOutputFormat(header, buf)
+        , writer(buf, 0, header)
+    {
+    }
+
+    String getName() const override { return "Native"; }
+
+    std::string getContentType() const override
+    {
+        return writer.getContentType();
+    }
+
+protected:
+    void consume(Chunk chunk) override
+    {
+        if (chunk)
+        {
+            auto block = getPort(PortKind::Main).getHeader();
+
+            // const auto & info = chunk.getChunkInfo();
+            // const auto * agg_info = typeid_cast<const AggregatedChunkInfo *>(info.get());
+            // if (agg_info)
+            // {
+            //     block.info.bucket_num = agg_info->bucket_num;
+            //     block.info.is_overflows = agg_info->is_overflows;
+            // }
+
+            block.setColumns(chunk.detachColumns());
+            writer.write(block);
+        }
+    }
+
+private:
+    NativeWriter writer;
+};
+
+void registerInputFormatNative(FormatFactory & factory)
+{
+    factory.registerInputFormat("Native", [](
+        ReadBuffer & buf,
+        const Block & sample,
+        const RowInputFormatParams &,
+        const FormatSettings &)
+    {
+        return std::make_shared<NativeInputFormat>(buf, sample);
+    });
+}
+
+void registerOutputFormatNative(FormatFactory & factory)
+{
+    factory.registerOutputFormat("Native", [](
+        WriteBuffer & buf,
+        const Block & sample,
+        const RowOutputFormatParams &,
+        const FormatSettings &)
+    {
+        return std::make_shared<NativeOutputFormat>(buf, sample);
+    });
+}
+
+}
diff --git a/src/Processors/Formats/Impl/NativeFormat.h b/src/Processors/Formats/Impl/NativeFormat.h
deleted file mode 100644
index 664252c268b..00000000000
--- a/src/Processors/Formats/Impl/NativeFormat.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#pragma once
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <Formats/FormatFactory.h>
-#include <Processors/Formats/IInputFormat.h>
-#include <Processors/Formats/IOutputFormat.h>
-
-
-namespace DB
-{
-
-class NativeInputFormatFromNativeBlockInputStream : public IInputFormat
-{
-public:
-    NativeInputFormatFromNativeBlockInputStream(const Block & header, ReadBuffer & in_)
-        : IInputFormat(header, in_)
-        , stream(std::make_shared<NativeBlockInputStream>(in, header, 0))
-    {
-    }
-
-    String getName() const override { return "NativeInputFormatFromNativeBlockInputStream"; }
-
-protected:
-    void resetParser() override
-    {
-        IInputFormat::resetParser();
-        stream->resetParser();
-        read_prefix = false;
-        read_suffix = false;
-    }
-
-
-    Chunk generate() override
-    {
-        /// TODO: do something with totals and extremes.
-
-        if (!read_prefix)
-        {
-            stream->readPrefix();
-            read_prefix = true;
-        }
-
-        auto block = stream->read();
-        if (!block)
-        {
-            if (!read_suffix)
-            {
-                stream->readSuffix();
-                read_suffix = true;
-            }
-
-            return Chunk();
-        }
-
-        assertBlocksHaveEqualStructure(getPort().getHeader(), block, getName());
-        block.checkNumberOfRows();
-
-        UInt64 num_rows = block.rows();
-        return Chunk(block.getColumns(), num_rows);
-    }
-
-private:
-    std::shared_ptr<NativeBlockInputStream> stream;
-    bool read_prefix = false;
-    bool read_suffix = false;
-};
-
-
-class NativeOutputFormatFromNativeBlockOutputStream : public IOutputFormat
-{
-public:
-    NativeOutputFormatFromNativeBlockOutputStream(const Block & header, WriteBuffer & out_)
-            : IOutputFormat(header, out_)
-            , stream(std::make_shared<NativeBlockOutputStream>(out, 0, header))
-    {
-    }
-
-    String getName() const override { return "NativeOutputFormatFromNativeBlockOutputStream"; }
-
-    void setRowsBeforeLimit(size_t rows_before_limit) override
-    {
-        stream->setRowsBeforeLimit(rows_before_limit);
-    }
-
-    void onProgress(const Progress & progress) override
-    {
-        stream->onProgress(progress);
-    }
-
-    std::string getContentType() const override
-    {
-        return stream->getContentType();
-    }
-
-protected:
-    void consume(Chunk chunk) override
-    {
-        writePrefixIfNot();
-
-        if (chunk)
-        {
-
-            auto block = getPort(PortKind::Main).getHeader();
-            block.setColumns(chunk.detachColumns());
-            stream->write(block);
-        }
-    }
-
-    void consumeTotals(Chunk chunk) override
-    {
-        writePrefixIfNot();
-
-        auto block = getPort(PortKind::Totals).getHeader();
-        block.setColumns(chunk.detachColumns());
-        stream->setTotals(block);
-    }
-
-    void consumeExtremes(Chunk chunk) override
-    {
-        writePrefixIfNot();
-
-        auto block = getPort(PortKind::Extremes).getHeader();
-        block.setColumns(chunk.detachColumns());
-        stream->setExtremes(block);
-    }
-
-    void finalize() override
-    {
-        writePrefixIfNot();
-        writeSuffixIfNot();
-    }
-
-private:
-    std::shared_ptr<NativeBlockOutputStream> stream;
-    bool prefix_written = false;
-    bool suffix_written = false;
-
-    void writePrefixIfNot()
-    {
-        if (!prefix_written)
-            stream->writePrefix();
-
-        prefix_written = true;
-    }
-
-    void writeSuffixIfNot()
-    {
-        if (!suffix_written)
-            stream->writeSuffix();
-
-        suffix_written = true;
-    }
-};
-
-void registerInputFormatProcessorNative(FormatFactory & factory)
-{
-    factory.registerInputFormatProcessor("Native", [](
-        ReadBuffer & buf,
-        const Block & sample,
-        const RowInputFormatParams &,
-        const FormatSettings &)
-    {
-        return std::make_shared<NativeInputFormatFromNativeBlockInputStream>(sample, buf);
-    });
-}
-
-void registerOutputFormatProcessorNative(FormatFactory & factory)
-{
-    factory.registerOutputFormatProcessor("Native", [](
-        WriteBuffer & buf,
-        const Block & sample,
-        const RowOutputFormatParams &,
-        const FormatSettings &)
-    {
-        return std::make_shared<NativeOutputFormatFromNativeBlockOutputStream>(sample, buf);
-    });
-}
-
-}
diff --git a/src/Processors/Formats/Impl/NullFormat.cpp b/src/Processors/Formats/Impl/NullFormat.cpp
index fda79d6981a..6c457c71d14 100644
--- a/src/Processors/Formats/Impl/NullFormat.cpp
+++ b/src/Processors/Formats/Impl/NullFormat.cpp
@@ -1,30 +1,22 @@
-#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Formats/Impl/NullFormat.h>
 #include <Formats/FormatFactory.h>
+#include <IO/WriteBuffer.h>
 
 
 namespace DB
 {
 
-class NullOutputFormat : public IOutputFormat
+WriteBuffer NullOutputFormat::empty_buffer(nullptr, 0);
+
+void registerOutputFormatNull(FormatFactory & factory)
 {
-public:
-    NullOutputFormat(const Block & header, WriteBuffer & out_) : IOutputFormat(header, out_) {}
-
-    String getName() const override { return "NullOutputFormat"; }
-
-protected:
-    void consume(Chunk) override {}
-};
-
-void registerOutputFormatProcessorNull(FormatFactory & factory)
-{
-    factory.registerOutputFormatProcessor("Null", [](
-        WriteBuffer & buf,
+    factory.registerOutputFormat("Null", [](
+        WriteBuffer &,
         const Block & sample,
         const RowOutputFormatParams &,
         const FormatSettings &)
     {
-        return std::make_shared<NullOutputFormat>(sample, buf);
+        return std::make_shared<NullOutputFormat>(sample);
     });
 }
 
diff --git a/src/Processors/Formats/Impl/NullFormat.h b/src/Processors/Formats/Impl/NullFormat.h
new file mode 100644
index 00000000000..7aa9102790f
--- /dev/null
+++ b/src/Processors/Formats/Impl/NullFormat.h
@@ -0,0 +1,21 @@
+#pragma once
+#include <Processors/Formats/IOutputFormat.h>
+
+namespace DB
+{
+
+class NullOutputFormat final : public IOutputFormat
+{
+public:
+    explicit NullOutputFormat(const Block & header) : IOutputFormat(header, empty_buffer) {}
+
+    String getName() const override { return "Null"; }
+
+protected:
+    void consume(Chunk) override {}
+
+private:
+    static WriteBuffer empty_buffer;
+};
+
+}
diff --git a/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp b/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
index 7a14966e220..0e486715c98 100644
--- a/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
@@ -110,9 +110,9 @@ void ODBCDriver2BlockOutputFormat::writePrefix()
 }
 
 
-void registerOutputFormatProcessorODBCDriver2(FormatFactory & factory)
+void registerOutputFormatODBCDriver2(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor(
+    factory.registerOutputFormat(
         "ODBCDriver2", [](WriteBuffer & buf, const Block & sample, const RowOutputFormatParams &, const FormatSettings & format_settings)
         {
             return std::make_shared<ODBCDriver2BlockOutputFormat>(buf, sample, format_settings);
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index 6ee247413e9..d9866edbccf 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -9,6 +9,7 @@
 #include <arrow/io/memory.h>
 #include "ArrowBufferedStreams.h"
 #include "ArrowColumnToCHColumn.h"
+#include <DataTypes/NestedUtils.h>
 
 namespace DB
 {
@@ -26,7 +27,8 @@ namespace ErrorCodes
             throw Exception(_s.ToString(), ErrorCodes::BAD_ARGUMENTS); \
     } while (false)
 
-ORCBlockInputFormat::ORCBlockInputFormat(ReadBuffer & in_, Block header_) : IInputFormat(std::move(header_), in_)
+ORCBlockInputFormat::ORCBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_)
+    : IInputFormat(std::move(header_), in_), format_settings(format_settings_)
 {
 }
 
@@ -91,14 +93,18 @@ static size_t countIndicesForType(std::shared_ptr<arrow::DataType> type)
 
 void ORCBlockInputFormat::prepareReader()
 {
-    THROW_ARROW_NOT_OK(arrow::adapters::orc::ORCFileReader::Open(asArrowFile(in), arrow::default_memory_pool(), &file_reader));
+    THROW_ARROW_NOT_OK(arrow::adapters::orc::ORCFileReader::Open(asArrowFile(*in), arrow::default_memory_pool(), &file_reader));
     stripe_total = file_reader->NumberOfStripes();
     stripe_current = 0;
 
     std::shared_ptr<arrow::Schema> schema;
     THROW_ARROW_NOT_OK(file_reader->ReadSchema(&schema));
 
-    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(getPort().getHeader(), schema, "ORC");
+    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(getPort().getHeader(), "ORC", format_settings.orc.import_nested);
+
+    std::unordered_set<String> nested_table_names;
+    if (format_settings.orc.import_nested)
+        nested_table_names = Nested::getAllTableNames(getPort().getHeader());
 
     /// In ReadStripe column indices should be started from 1,
     /// because 0 indicates to select all columns.
@@ -108,7 +114,8 @@ void ORCBlockInputFormat::prepareReader()
         /// LIST type require 2 indices, STRUCT - the number of elements + 1,
         /// so we should recursively count the number of indices we need for this type.
         int indexes_count = countIndicesForType(schema->field(i)->type());
-        if (getPort().getHeader().has(schema->field(i)->name()))
+        const auto & name = schema->field(i)->name();
+        if (getPort().getHeader().has(name) || nested_table_names.contains(name))
         {
             for (int j = 0; j != indexes_count; ++j)
                 include_indices.push_back(index + j);
@@ -117,16 +124,16 @@ void ORCBlockInputFormat::prepareReader()
     }
 }
 
-void registerInputFormatProcessorORC(FormatFactory &factory)
+void registerInputFormatORC(FormatFactory &factory)
 {
-    factory.registerInputFormatProcessor(
+    factory.registerInputFormat(
             "ORC",
             [](ReadBuffer &buf,
                 const Block &sample,
                 const RowInputFormatParams &,
-                const FormatSettings & /* settings */)
+                const FormatSettings & settings)
             {
-                return std::make_shared<ORCBlockInputFormat>(buf, sample);
+                return std::make_shared<ORCBlockInputFormat>(buf, sample, settings);
             });
     factory.markFormatAsColumnOriented("ORC");
 }
@@ -137,7 +144,7 @@ void registerInputFormatProcessorORC(FormatFactory &factory)
 namespace DB
 {
     class FormatFactory;
-    void registerInputFormatProcessorORC(FormatFactory &)
+    void registerInputFormatORC(FormatFactory &)
     {
     }
 }
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.h b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
index f27685a9884..254d0554cb2 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.h
@@ -3,6 +3,7 @@
 #if USE_ORC
 
 #include <Processors/Formats/IInputFormat.h>
+#include <Formats/FormatSettings.h>
 
 namespace arrow::adapters::orc { class ORCFileReader; }
 
@@ -14,7 +15,7 @@ class ArrowColumnToCHColumn;
 class ORCBlockInputFormat : public IInputFormat
 {
 public:
-    ORCBlockInputFormat(ReadBuffer & in_, Block header_);
+    ORCBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_);
 
     String getName() const override { return "ORCBlockInputFormat"; }
 
@@ -38,6 +39,8 @@ private:
     // indices of columns to read from ORC file
     std::vector<int> include_indices;
 
+    const FormatSettings format_settings;
+
     void prepareReader();
 };
 
diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
index a5143792e7d..0a1eb9c6836 100644
--- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.cpp
@@ -20,6 +20,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 namespace DB
 {
@@ -48,8 +49,10 @@ void ORCOutputStream::write(const void* buf, size_t length)
 }
 
 ORCBlockOutputFormat::ORCBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_)
-    : IOutputFormat(header_, out_), format_settings{format_settings_}, output_stream(out_), data_types(header_.getDataTypes())
+    : IOutputFormat(header_, out_), format_settings{format_settings_}, output_stream(out_)
 {
+    for (const auto & type : header_.getDataTypes())
+        data_types.push_back(recursiveRemoveLowCardinality(type));
 }
 
 ORC_UNIQUE_PTR<orc::Type> ORCBlockOutputFormat::getORCType(const DataTypePtr & type, const std::string & column_name)
@@ -482,10 +485,12 @@ void ORCBlockOutputFormat::consume(Chunk chunk)
     /// The size of the batch must be no less than total amount of array elements.
     ORC_UNIQUE_PTR<orc::ColumnVectorBatch> batch = writer->createRowBatch(getMaxColumnSize(chunk));
     orc::StructVectorBatch & root = dynamic_cast<orc::StructVectorBatch &>(*batch);
+    auto columns = chunk.detachColumns();
+    for (auto & column : columns)
+        column = recursiveRemoveLowCardinality(column);
+
     for (size_t i = 0; i != columns_num; ++i)
-    {
-        writeColumn(*root.fields[i], *chunk.getColumns()[i], data_types[i], nullptr);
-    }
+        writeColumn(*root.fields[i], *columns[i], data_types[i], nullptr);
     root.numElements = rows_num;
     writer->add(*batch);
 }
@@ -505,13 +510,13 @@ void ORCBlockOutputFormat::prepareWriter()
     options.setCompression(orc::CompressionKind::CompressionKind_NONE);
     size_t columns_count = header.columns();
     for (size_t i = 0; i != columns_count; ++i)
-        schema->addStructField(header.safeGetByPosition(i).name, getORCType(data_types[i], header.safeGetByPosition(i).name));
+        schema->addStructField(header.safeGetByPosition(i).name, getORCType(recursiveRemoveLowCardinality(data_types[i]), header.safeGetByPosition(i).name));
     writer = orc::createWriter(*schema, &output_stream, options);
 }
 
-void registerOutputFormatProcessorORC(FormatFactory & factory)
+void registerOutputFormatORC(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("ORC", [](
+    factory.registerOutputFormat("ORC", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams &,
@@ -528,7 +533,7 @@ void registerOutputFormatProcessorORC(FormatFactory & factory)
 namespace DB
 {
     class FormatFactory;
-    void registerOutputFormatProcessorORC(FormatFactory &)
+    void registerOutputFormatORC(FormatFactory &)
     {
     }
 }
diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.h b/src/Processors/Formats/Impl/ORCBlockOutputFormat.h
index 557bf6cc07a..c131d724450 100644
--- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_formats.h"
-#endif
 
 #if USE_ORC
 #include <IO/WriteBuffer.h>
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index e7a6435981b..65f4a329505 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -4,7 +4,7 @@
 
 #include <Common/Arena.h>
 #include <Common/ThreadPool.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 #include "IO/WriteBufferFromString.h"
 #include <Formats/FormatFactory.h>
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 2971dbe8b5a..4be91299bdb 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -2,7 +2,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 
 namespace DB
 {
@@ -26,8 +26,7 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
 
             {
                 std::unique_lock<std::mutex> lock(mutex);
-                segmentator_condvar.wait(lock,
-                                         [&]{ return unit.status == READY_TO_INSERT || parsing_finished; });
+                segmentator_condvar.wait(lock, [&] { return unit.status == READY_TO_INSERT || parsing_finished; });
             }
 
             if (parsing_finished)
@@ -38,7 +37,7 @@ void ParallelParsingInputFormat::segmentatorThreadFunction(ThreadGroupStatusPtr
             // Segmentating the original input.
             unit.segment.resize(0);
 
-            auto [have_more_data, currently_read_rows] = file_segmentation_engine(in, unit.segment, min_chunk_bytes);
+            auto [have_more_data, currently_read_rows] = file_segmentation_engine(*in, unit.segment, min_chunk_bytes);
 
             unit.offset = successfully_read_rows_count;
             successfully_read_rows_count += currently_read_rows;
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index 5cf83bd3bb3..3355b7334dc 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -9,7 +9,7 @@
 #include <IO/ReadBuffer.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/Event.h>
 
 
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index 07a0e15cb6b..51be1f13997 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -11,8 +11,10 @@
 #include <parquet/file_reader.h>
 #include "ArrowBufferedStreams.h"
 #include "ArrowColumnToCHColumn.h"
+#include <DataTypes/NestedUtils.h>
+
+#include <base/logger_useful.h>
 
-#include <common/logger_useful.h>
 
 namespace DB
 {
@@ -30,8 +32,8 @@ namespace ErrorCodes
             throw Exception(_s.ToString(), ErrorCodes::BAD_ARGUMENTS); \
     } while (false)
 
-ParquetBlockInputFormat::ParquetBlockInputFormat(ReadBuffer & in_, Block header_)
-    : IInputFormat(std::move(header_), in_)
+ParquetBlockInputFormat::ParquetBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_)
+    : IInputFormat(std::move(header_), in_), format_settings(format_settings_)
 {
 }
 
@@ -91,14 +93,18 @@ static size_t countIndicesForType(std::shared_ptr<arrow::DataType> type)
 
 void ParquetBlockInputFormat::prepareReader()
 {
-    THROW_ARROW_NOT_OK(parquet::arrow::OpenFile(asArrowFile(in), arrow::default_memory_pool(), &file_reader));
+    THROW_ARROW_NOT_OK(parquet::arrow::OpenFile(asArrowFile(*in), arrow::default_memory_pool(), &file_reader));
     row_group_total = file_reader->num_row_groups();
     row_group_current = 0;
 
     std::shared_ptr<arrow::Schema> schema;
     THROW_ARROW_NOT_OK(file_reader->GetSchema(&schema));
 
-    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(getPort().getHeader(), schema, "Parquet");
+    arrow_column_to_ch_column = std::make_unique<ArrowColumnToCHColumn>(getPort().getHeader(), "Parquet", format_settings.parquet.import_nested);
+
+    std::unordered_set<String> nested_table_names;
+    if (format_settings.parquet.import_nested)
+        nested_table_names = Nested::getAllTableNames(getPort().getHeader());
 
     int index = 0;
     for (int i = 0; i < schema->num_fields(); ++i)
@@ -107,7 +113,8 @@ void ParquetBlockInputFormat::prepareReader()
         /// nested elements, so we should recursively
         /// count the number of indices we need for this type.
         int indexes_count = countIndicesForType(schema->field(i)->type());
-        if (getPort().getHeader().has(schema->field(i)->name()))
+        const auto & name = schema->field(i)->name();
+        if (getPort().getHeader().has(name) || nested_table_names.contains(name))
         {
             for (int j = 0; j != indexes_count; ++j)
                 column_indices.push_back(index + j);
@@ -116,16 +123,16 @@ void ParquetBlockInputFormat::prepareReader()
     }
 }
 
-void registerInputFormatProcessorParquet(FormatFactory &factory)
+void registerInputFormatParquet(FormatFactory &factory)
 {
-    factory.registerInputFormatProcessor(
+    factory.registerInputFormat(
             "Parquet",
             [](ReadBuffer &buf,
                 const Block &sample,
                 const RowInputFormatParams &,
-                const FormatSettings & /* settings */)
+                const FormatSettings & settings)
             {
-                return std::make_shared<ParquetBlockInputFormat>(buf, sample);
+                return std::make_shared<ParquetBlockInputFormat>(buf, sample, settings);
             });
     factory.markFormatAsColumnOriented("Parquet");
 }
@@ -137,7 +144,7 @@ void registerInputFormatProcessorParquet(FormatFactory &factory)
 namespace DB
 {
 class FormatFactory;
-void registerInputFormatProcessorParquet(FormatFactory &)
+void registerInputFormatParquet(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
index b68f97c005a..bae380f2c80 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h
@@ -1,9 +1,9 @@
 #pragma once
-
 #include "config_formats.h"
 #if USE_PARQUET
 
 #include <Processors/Formats/IInputFormat.h>
+#include <Formats/FormatSettings.h>
 
 namespace parquet::arrow { class FileReader; }
 
@@ -17,7 +17,7 @@ class ArrowColumnToCHColumn;
 class ParquetBlockInputFormat : public IInputFormat
 {
 public:
-    ParquetBlockInputFormat(ReadBuffer & in_, Block header_);
+    ParquetBlockInputFormat(ReadBuffer & in_, Block header_, const FormatSettings & format_settings_);
 
     void resetParser() override;
 
@@ -36,6 +36,7 @@ private:
     std::vector<int> column_indices;
     std::unique_ptr<ArrowColumnToCHColumn> arrow_column_to_ch_column;
     int row_group_current = 0;
+    const FormatSettings format_settings;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
index c3771c7b552..416d1b80988 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
@@ -74,9 +74,9 @@ void ParquetBlockOutputFormat::finalize()
         throw Exception{"Error while closing a table: " + status.ToString(), ErrorCodes::UNKNOWN_EXCEPTION};
 }
 
-void registerOutputFormatProcessorParquet(FormatFactory & factory)
+void registerOutputFormatParquet(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor(
+    factory.registerOutputFormat(
         "Parquet",
         [](WriteBuffer & buf,
            const Block & sample,
@@ -94,7 +94,7 @@ void registerOutputFormatProcessorParquet(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerOutputFormatProcessorParquet(FormatFactory &)
+void registerOutputFormatParquet(FormatFactory &)
 {
 }
 }
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
index 8114d1ab494..80d11b540b1 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
@@ -1,6 +1,6 @@
 #pragma once
-
 #include "config_formats.h"
+
 #if USE_PARQUET
 #    include <Processors/Formats/IOutputFormat.h>
 #    include <Formats/FormatSettings.h>
diff --git a/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp b/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp
index 8c4da279fc5..a5f92e41da4 100644
--- a/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PostgreSQLOutputFormat.cpp
@@ -68,9 +68,9 @@ void PostgreSQLOutputFormat::flush()
     message_transport.flush();
 }
 
-void registerOutputFormatProcessorPostgreSQLWire(FormatFactory & factory)
+void registerOutputFormatPostgreSQLWire(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor(
+    factory.registerOutputFormat(
         "PostgreSQLWire",
         [](WriteBuffer & buf,
            const Block & sample,
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 8e178b6629e..2bae0c6bd63 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -407,9 +407,9 @@ void PrettyBlockOutputFormat::finalize()
 }
 
 
-void registerOutputFormatProcessorPretty(FormatFactory & factory)
+void registerOutputFormatPretty(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("Pretty", [](
+    factory.registerOutputFormat("Pretty", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams &,
@@ -418,7 +418,7 @@ void registerOutputFormatProcessorPretty(FormatFactory & factory)
         return std::make_shared<PrettyBlockOutputFormat>(buf, sample, format_settings);
     });
 
-    factory.registerOutputFormatProcessor("PrettyNoEscapes", [](
+    factory.registerOutputFormat("PrettyNoEscapes", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams &,
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
index c4902ea4c26..9ae7ccbd240 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
@@ -255,11 +255,11 @@ void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind po
 }
 
 
-void registerOutputFormatProcessorPrettyCompact(FormatFactory & factory)
+void registerOutputFormatPrettyCompact(FormatFactory & factory)
 {
     for (const auto & [name, mono_block] : {std::make_pair("PrettyCompact", false), std::make_pair("PrettyCompactMonoBlock", true)})
     {
-        factory.registerOutputFormatProcessor(name, [mono_block = mono_block](
+        factory.registerOutputFormat(name, [mono_block = mono_block](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams &,
@@ -269,7 +269,7 @@ void registerOutputFormatProcessorPrettyCompact(FormatFactory & factory)
         });
     }
 
-    factory.registerOutputFormatProcessor("PrettyCompactNoEscapes", [](
+    factory.registerOutputFormat("PrettyCompactNoEscapes", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams &,
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index fa987c6b949..d317a21b769 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -113,9 +113,9 @@ void PrettySpaceBlockOutputFormat::writeSuffix()
 }
 
 
-void registerOutputFormatProcessorPrettySpace(FormatFactory & factory)
+void registerOutputFormatPrettySpace(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("PrettySpace", [](
+    factory.registerOutputFormat("PrettySpace", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams &,
@@ -124,7 +124,7 @@ void registerOutputFormatProcessorPrettySpace(FormatFactory & factory)
         return std::make_shared<PrettySpaceBlockOutputFormat>(buf, sample, format_settings);
     });
 
-    factory.registerOutputFormatProcessor("PrettySpaceNoEscapes", [](
+    factory.registerOutputFormat("PrettySpaceNoEscapes", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams &,
diff --git a/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp b/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
index 978dcb268b4..df7b7102739 100644
--- a/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ProtobufRowInputFormat.cpp
@@ -8,7 +8,7 @@
 #   include <Formats/ProtobufSchemas.h>
 #   include <Formats/ProtobufSerializer.h>
 #   include <Interpreters/Context.h>
-#   include <common/range.h>
+#   include <base/range.h>
 
 
 namespace DB
@@ -56,19 +56,18 @@ void ProtobufRowInputFormat::syncAfterError()
     reader->endMessage(true);
 }
 
-void registerInputFormatProcessorProtobuf(FormatFactory & factory)
+void registerInputFormatProtobuf(FormatFactory & factory)
 {
     for (bool with_length_delimiter : {false, true})
     {
-        factory.registerInputFormatProcessor(with_length_delimiter ? "Protobuf" : "ProtobufSingle", [with_length_delimiter](
+        factory.registerInputFormat(with_length_delimiter ? "Protobuf" : "ProtobufSingle", [with_length_delimiter](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
             const FormatSettings & settings)
         {
             return std::make_shared<ProtobufRowInputFormat>(buf, sample, std::move(params),
-                FormatSchemaInfo(settings.schema.format_schema, "Protobuf", true,
-                                settings.schema.is_server, settings.schema.format_schema_path),
+                FormatSchemaInfo(settings, "Protobuf", true),
                 with_length_delimiter);
         });
     }
@@ -81,7 +80,7 @@ void registerInputFormatProcessorProtobuf(FormatFactory & factory)
 namespace DB
 {
 class FormatFactory;
-void registerInputFormatProcessorProtobuf(FormatFactory &) {}
+void registerInputFormatProtobuf(FormatFactory &) {}
 }
 
 #endif
diff --git a/src/Processors/Formats/Impl/ProtobufRowInputFormat.h b/src/Processors/Formats/Impl/ProtobufRowInputFormat.h
index b2eabd4f37c..553a2dfd7f0 100644
--- a/src/Processors/Formats/Impl/ProtobufRowInputFormat.h
+++ b/src/Processors/Formats/Impl/ProtobufRowInputFormat.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_PROTOBUF
 #    include <Processors/Formats/IRowInputFormat.h>
diff --git a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp
index d3b9a0124c1..29cd9be79bc 100644
--- a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.cpp
@@ -51,11 +51,11 @@ void ProtobufRowOutputFormat::write(const Columns & columns, size_t row_num)
 }
 
 
-void registerOutputFormatProcessorProtobuf(FormatFactory & factory)
+void registerOutputFormatProtobuf(FormatFactory & factory)
 {
     for (bool with_length_delimiter : {false, true})
     {
-        factory.registerOutputFormatProcessor(
+        factory.registerOutputFormat(
             with_length_delimiter ? "Protobuf" : "ProtobufSingle",
             [with_length_delimiter](WriteBuffer & buf,
                const Block & header,
@@ -64,9 +64,7 @@ void registerOutputFormatProcessorProtobuf(FormatFactory & factory)
             {
                 return std::make_shared<ProtobufRowOutputFormat>(
                     buf, header, params,
-                    FormatSchemaInfo(settings.schema.format_schema, "Protobuf",
-                        true, settings.schema.is_server,
-                        settings.schema.format_schema_path),
+                    FormatSchemaInfo(settings, "Protobuf", true),
                     settings,
                     with_length_delimiter);
             });
@@ -80,7 +78,7 @@ void registerOutputFormatProcessorProtobuf(FormatFactory & factory)
 namespace DB
 {
     class FormatFactory;
-    void registerOutputFormatProcessorProtobuf(FormatFactory &) {}
+    void registerOutputFormatProtobuf(FormatFactory &) {}
 }
 
 #endif
diff --git a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h
index 54324490a3b..5323aa56323 100644
--- a/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/ProtobufRowOutputFormat.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_formats.h"
-#endif
+#include "config_formats.h"
 
 #if USE_PROTOBUF
 #    include <Core/Block.h>
diff --git a/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp b/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp
index bd9eaada05e..34424fffd34 100644
--- a/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RawBLOBRowInputFormat.cpp
@@ -29,19 +29,19 @@ RawBLOBRowInputFormat::RawBLOBRowInputFormat(const Block & header_, ReadBuffer &
 
 bool RawBLOBRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     /// One excessive copy.
     String blob;
-    readStringUntilEOF(blob, in);
+    readStringUntilEOF(blob, *in);
     columns.at(0)->insertData(blob.data(), blob.size());
     return false;
 }
 
-void registerInputFormatProcessorRawBLOB(FormatFactory & factory)
+void registerInputFormatRawBLOB(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("RawBLOB", [](
+    factory.registerInputFormat("RawBLOB", [](
             ReadBuffer & buf,
             const Block & sample,
             const RowInputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp
index 49f1159d48d..9a38a11f6f0 100644
--- a/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/RawBLOBRowOutputFormat.cpp
@@ -22,9 +22,9 @@ void RawBLOBRowOutputFormat::writeField(const IColumn & column, const ISerializa
 }
 
 
-void registerOutputFormatProcessorRawBLOB(FormatFactory & factory)
+void registerOutputFormatRawBLOB(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("RawBLOB", [](
+    factory.registerOutputFormat("RawBLOB", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
index 555c79f8064..8cb0fce609e 100644
--- a/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/RegexpRowInputFormat.cpp
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Processors/Formats/Impl/RegexpRowInputFormat.h>
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <IO/ReadHelpers.h>
@@ -163,9 +163,9 @@ bool RegexpRowInputFormat::readRow(MutableColumns & columns, RowReadExtension &
     return true;
 }
 
-void registerInputFormatProcessorRegexp(FormatFactory & factory)
+void registerInputFormatRegexp(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("Regexp", [](
+    factory.registerInputFormat("Regexp", [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
index ee6fce83358..331d6e435d1 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
@@ -30,7 +30,7 @@ void TSKVRowInputFormat::readPrefix()
 {
     /// In this format, we assume that column name cannot contain BOM,
     ///  so BOM at beginning of stream cannot be confused with name of field, and it is safe to skip it.
-    skipBOMIfExists(in);
+    skipBOMIfExists(*in);
 }
 
 
@@ -95,7 +95,7 @@ static bool readName(ReadBuffer & buf, StringRef & ref, String & tmp)
 
 bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     const auto & header = getPort().getHeader();
@@ -105,17 +105,17 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
     read_columns.assign(num_columns, false);
     seen_columns.assign(num_columns, false);
 
-    if (unlikely(*in.position() == '\n'))
+    if (unlikely(*in->position() == '\n'))
     {
         /// An empty string. It is permissible, but it is unclear why.
-        ++in.position();
+        ++in->position();
     }
     else
     {
         while (true)
         {
             StringRef name_ref;
-            bool has_value = readName(in, name_ref, name_buf);
+            bool has_value = readName(*in, name_ref, name_buf);
             ssize_t index = -1;
 
             if (has_value)
@@ -131,7 +131,7 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
 
                     /// If the key is not found, skip the value.
                     NullOutput sink;
-                    readEscapedStringInto(sink, in);
+                    readEscapedStringInto(sink, *in);
                 }
                 else
                 {
@@ -144,9 +144,9 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
                     const auto & type = getPort().getHeader().getByPosition(index).type;
                     const auto & serialization = serializations[index];
                     if (format_settings.null_as_default && !type->isNullable())
-                        read_columns[index] = SerializationNullable::deserializeTextEscapedImpl(*columns[index], in, format_settings, serialization);
+                        read_columns[index] = SerializationNullable::deserializeTextEscapedImpl(*columns[index], *in, format_settings, serialization);
                     else
-                        serialization->deserializeTextEscaped(*columns[index], in, format_settings);
+                        serialization->deserializeTextEscaped(*columns[index], *in, format_settings);
                 }
             }
             else
@@ -156,18 +156,18 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
                     throw Exception("Found field without value while parsing TSKV format: " + name_ref.toString(), ErrorCodes::INCORRECT_DATA);
             }
 
-            if (in.eof())
+            if (in->eof())
             {
                 throw ParsingException("Unexpected end of stream after field in TSKV format: " + name_ref.toString(), ErrorCodes::CANNOT_READ_ALL_DATA);
             }
-            else if (*in.position() == '\t')
+            else if (*in->position() == '\t')
             {
-                ++in.position();
+                ++in->position();
                 continue;
             }
-            else if (*in.position() == '\n')
+            else if (*in->position() == '\n')
             {
-                ++in.position();
+                ++in->position();
                 break;
             }
             else
@@ -198,7 +198,7 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
 
 void TSKVRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 
@@ -210,9 +210,9 @@ void TSKVRowInputFormat::resetParser()
     name_buf.clear();
 }
 
-void registerInputFormatProcessorTSKV(FormatFactory & factory)
+void registerInputFormatTSKV(FormatFactory & factory)
 {
-    factory.registerInputFormatProcessor("TSKV", [](
+    factory.registerInputFormat("TSKV", [](
         ReadBuffer & buf,
         const Block & sample,
         IRowInputFormat::Params params,
diff --git a/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp
index 627ae67fa31..6161303d23a 100644
--- a/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowOutputFormat.cpp
@@ -39,9 +39,9 @@ void TSKVRowOutputFormat::writeRowEndDelimiter()
 }
 
 
-void registerOutputFormatProcessorTSKV(FormatFactory & factory)
+void registerOutputFormatTSKV(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("TSKV", [](
+    factory.registerOutputFormat("TSKV", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
index 07c8edf9e6e..3e12388bede 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRawRowInputFormat.h
@@ -35,15 +35,15 @@ public:
     {
         String tmp;
 
-        while (!in.eof())
+        while (!in->eof())
         {
-            char * pos = find_first_symbols<'\n', '\t'>(in.position(), in.buffer().end());
+            char * pos = find_first_symbols<'\n', '\t'>(in->position(), in->buffer().end());
 
-            tmp.append(in.position(), pos - in.position());
-            in.position() = pos;
+            tmp.append(in->position(), pos - in->position());
+            in->position() = pos;
 
-            if (pos == in.buffer().end())
-                in.next();
+            if (pos == in->buffer().end())
+                in->next();
             else
                 break;
         }
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
index f89b76342a4..c1cf0a904ea 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
@@ -1,5 +1,6 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/BufferWithOwnMemory.h>
 #include <IO/Operators.h>
 
 #include <Processors/Formats/Impl/TabSeparatedRowInputFormat.h>
@@ -36,7 +37,7 @@ static void skipTSVRow(ReadBuffer & in, const size_t num_columns)
   */
 static void checkForCarriageReturn(ReadBuffer & in)
 {
-    if (in.position()[0] == '\r' || (in.position() != in.buffer().begin() && in.position()[-1] == '\r'))
+    if (!in.eof() && (in.position()[0] == '\r' || (in.position() != in.buffer().begin() && in.position()[-1] == '\r')))
         throw Exception("\nYou have carriage return (\\r, 0x0D, ASCII 13) at end of first row."
             "\nIt's like your input data has DOS/Windows style line separators, that are illegal in TabSeparated format."
             " You must transform your file to Unix format."
@@ -134,7 +135,7 @@ void TabSeparatedRowInputFormat::readPrefix()
         /// In this format, we assume that column name or type cannot contain BOM,
         ///  so, if format has header,
         ///  then BOM at beginning of stream cannot be confused with name or type of field, and it is safe to skip it.
-        skipBOMIfExists(in);
+        skipBOMIfExists(*in);
     }
 
     /// This is a bit of abstraction leakage, but we have almost the same code in other places.
@@ -146,12 +147,12 @@ void TabSeparatedRowInputFormat::readPrefix()
             String column_name;
             for (;;)
             {
-                readEscapedString(column_name, in);
-                if (!checkChar('\t', in))
+                readEscapedString(column_name, *in);
+                if (!checkChar('\t', *in))
                 {
                     /// Check last column for \r before adding it, otherwise an error will be:
                     ///     "Unknown field found in TSV header"
-                    checkForCarriageReturn(in);
+                    checkForCarriageReturn(*in);
                     addInputColumn(column_name);
                     break;
                 }
@@ -160,15 +161,15 @@ void TabSeparatedRowInputFormat::readPrefix()
             }
 
 
-            if (!in.eof())
+            if (!in->eof())
             {
-                assertChar('\n', in);
+                assertChar('\n', *in);
             }
         }
         else
         {
             setupAllColumnsByTableSchema();
-            skipTSVRow(in, column_mapping->column_indexes_for_input_fields.size());
+            skipTSVRow(*in, column_mapping->column_indexes_for_input_fields.size());
         }
     }
     else if (!column_mapping->is_set)
@@ -176,14 +177,14 @@ void TabSeparatedRowInputFormat::readPrefix()
 
     if (with_types)
     {
-        skipTSVRow(in, column_mapping->column_indexes_for_input_fields.size());
+        skipTSVRow(*in, column_mapping->column_indexes_for_input_fields.size());
     }
 }
 
 
 bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ext)
 {
-    if (in.eof())
+    if (in->eof())
         return false;
 
     updateDiagnosticInfo();
@@ -201,20 +202,20 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
         else
         {
             NullOutput null_sink;
-            readEscapedStringInto(null_sink, in);
+            readEscapedStringInto(null_sink, *in);
         }
 
         /// skip separators
         if (file_column + 1 < column_mapping->column_indexes_for_input_fields.size())
         {
-            assertChar('\t', in);
+            assertChar('\t', *in);
         }
-        else if (!in.eof())
+        else if (!in->eof())
         {
             if (unlikely(row_num == 1))
-                checkForCarriageReturn(in);
+                checkForCarriageReturn(*in);
 
-            assertChar('\n', in);
+            assertChar('\n', *in);
         }
     }
 
@@ -227,8 +228,8 @@ bool TabSeparatedRowInputFormat::readRow(MutableColumns & columns, RowReadExtens
 bool TabSeparatedRowInputFormat::readField(IColumn & column, const DataTypePtr & type,
     const SerializationPtr & serialization, bool is_last_file_column)
 {
-    const bool at_delimiter = !is_last_file_column && !in.eof() && *in.position() == '\t';
-    const bool at_last_column_line_end = is_last_file_column && (in.eof() || *in.position() == '\n');
+    const bool at_delimiter = !is_last_file_column && !in->eof() && *in->position() == '\t';
+    const bool at_last_column_line_end = is_last_file_column && (in->eof() || *in->position() == '\n');
 
     if (format_settings.tsv.empty_as_default && (at_delimiter || at_last_column_line_end))
     {
@@ -236,9 +237,9 @@ bool TabSeparatedRowInputFormat::readField(IColumn & column, const DataTypePtr &
         return false;
     }
     else if (format_settings.null_as_default && !type->isNullable())
-        return SerializationNullable::deserializeTextEscapedImpl(column, in, format_settings, serialization);
+        return SerializationNullable::deserializeTextEscapedImpl(column, *in, format_settings, serialization);
 
-    serialization->deserializeTextEscaped(column, in, format_settings);
+    serialization->deserializeTextEscaped(column, *in, format_settings);
     return true;
 }
 
@@ -246,7 +247,7 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
 {
     for (size_t file_column = 0; file_column < column_mapping->column_indexes_for_input_fields.size(); ++file_column)
     {
-        if (file_column == 0 && in.eof())
+        if (file_column == 0 && in->eof())
         {
             out << "<End of stream>\n";
             return false;
@@ -272,21 +273,21 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
         /// Delimiters
         if (file_column + 1 == column_mapping->column_indexes_for_input_fields.size())
         {
-            if (!in.eof())
+            if (!in->eof())
             {
                 try
                 {
-                    assertChar('\n', in);
+                    assertChar('\n', *in);
                 }
                 catch (const DB::Exception &)
                 {
-                    if (*in.position() == '\t')
+                    if (*in->position() == '\t')
                     {
                         out << "ERROR: Tab found where line feed is expected."
                                " It's like your file has more columns than expected.\n"
-                               "And if your file have right number of columns, maybe it have unescaped tab in value.\n";
+                               "And if your file has the right number of columns, maybe it has an unescaped tab in a value.\n";
                     }
-                    else if (*in.position() == '\r')
+                    else if (*in->position() == '\r')
                     {
                         out << "ERROR: Carriage return found where line feed is expected."
                                " It's like your file has DOS/Windows style line separators, that is illegal in TabSeparated format.\n";
@@ -294,7 +295,7 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
                     else
                     {
                         out << "ERROR: There is no line feed. ";
-                        verbosePrintString(in.position(), in.position() + 1, out);
+                        verbosePrintString(in->position(), in->position() + 1, out);
                         out << " found instead.\n";
                     }
                     return false;
@@ -305,25 +306,25 @@ bool TabSeparatedRowInputFormat::parseRowAndPrintDiagnosticInfo(MutableColumns &
         {
             try
             {
-                assertChar('\t', in);
+                assertChar('\t', *in);
             }
             catch (const DB::Exception &)
             {
-                if (*in.position() == '\n')
+                if (*in->position() == '\n')
                 {
                     out << "ERROR: Line feed found where tab is expected."
                            " It's like your file has less columns than expected.\n"
-                           "And if your file have right number of columns, "
-                           "maybe it have unescaped backslash in value before tab, which cause tab has escaped.\n";
+                           "And if your file has the right number of columns, "
+                           "maybe it has an unescaped backslash in value before tab, which causes the tab to be escaped.\n";
                 }
-                else if (*in.position() == '\r')
+                else if (*in->position() == '\r')
                 {
                     out << "ERROR: Carriage return found where tab is expected.\n";
                 }
                 else
                 {
                     out << "ERROR: There is no tab. ";
-                    verbosePrintString(in.position(), in.position() + 1, out);
+                    verbosePrintString(in->position(), in->position() + 1, out);
                     out << " found instead.\n";
                 }
                 return false;
@@ -342,19 +343,19 @@ void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, I
         bool can_be_parsed_as_null = removeLowCardinality(type)->isNullable();
 
         // check null value for type is not nullable. don't cross buffer bound for simplicity, so maybe missing some case
-        if (!can_be_parsed_as_null && !in.eof())
+        if (!can_be_parsed_as_null && !in->eof())
         {
-            if (*in.position() == '\\' && in.available() >= 2)
+            if (*in->position() == '\\' && in->available() >= 2)
             {
-                ++in.position();
-                if (*in.position() == 'N')
+                ++in->position();
+                if (*in->position() == 'N')
                 {
-                    ++in.position();
+                    ++in->position();
                     throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected NULL value of not Nullable type {}", type->getName());
                 }
                 else
                 {
-                    --in.position();
+                    --in->position();
                 }
             }
         }
@@ -365,13 +366,13 @@ void TabSeparatedRowInputFormat::tryDeserializeField(const DataTypePtr & type, I
     else
     {
         NullOutput null_sink;
-        readEscapedStringInto(null_sink, in);
+        readEscapedStringInto(null_sink, *in);
     }
 }
 
 void TabSeparatedRowInputFormat::syncAfterError()
 {
-    skipToUnescapedNextLineOrEOF(in);
+    skipToUnescapedNextLineOrEOF(*in);
 }
 
 void TabSeparatedRowInputFormat::resetParser()
@@ -383,11 +384,11 @@ void TabSeparatedRowInputFormat::resetParser()
     columns_to_fill_with_default_values.clear();
 }
 
-void registerInputFormatProcessorTabSeparated(FormatFactory & factory)
+void registerInputFormatTabSeparated(FormatFactory & factory)
 {
     for (const auto * name : {"TabSeparated", "TSV"})
     {
-        factory.registerInputFormatProcessor(name, [](
+        factory.registerInputFormat(name, [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
@@ -399,7 +400,7 @@ void registerInputFormatProcessorTabSeparated(FormatFactory & factory)
 
     for (const auto * name : {"TabSeparatedRaw", "TSVRaw"})
     {
-        factory.registerInputFormatProcessor(name, [](
+        factory.registerInputFormat(name, [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
@@ -411,7 +412,7 @@ void registerInputFormatProcessorTabSeparated(FormatFactory & factory)
 
     for (const auto * name : {"TabSeparatedWithNames", "TSVWithNames"})
     {
-        factory.registerInputFormatProcessor(name, [](
+        factory.registerInputFormat(name, [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
@@ -423,7 +424,7 @@ void registerInputFormatProcessorTabSeparated(FormatFactory & factory)
 
     for (const auto * name : {"TabSeparatedWithNamesAndTypes", "TSVWithNamesAndTypes"})
     {
-        factory.registerInputFormatProcessor(name, [](
+        factory.registerInputFormat(name, [](
             ReadBuffer & buf,
             const Block & sample,
             IRowInputFormat::Params params,
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp
index 3e99264785e..71d5bdba355 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.cpp
@@ -73,11 +73,11 @@ void TabSeparatedRowOutputFormat::writeBeforeExtremes()
 }
 
 
-void registerOutputFormatProcessorTabSeparated(FormatFactory & factory)
+void registerOutputFormatTabSeparated(FormatFactory & factory)
 {
     for (const auto * name : {"TabSeparated", "TSV"})
     {
-        factory.registerOutputFormatProcessor(name, [](
+        factory.registerOutputFormat(name, [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -90,7 +90,7 @@ void registerOutputFormatProcessorTabSeparated(FormatFactory & factory)
 
     for (const auto * name : {"TabSeparatedRaw", "TSVRaw"})
     {
-        factory.registerOutputFormatProcessor(name, [](
+        factory.registerOutputFormat(name, [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -103,7 +103,7 @@ void registerOutputFormatProcessorTabSeparated(FormatFactory & factory)
 
     for (const auto * name : {"TabSeparatedWithNames", "TSVWithNames"})
     {
-        factory.registerOutputFormatProcessor(name, [](
+        factory.registerOutputFormat(name, [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
@@ -116,7 +116,7 @@ void registerOutputFormatProcessorTabSeparated(FormatFactory & factory)
 
     for (const auto * name : {"TabSeparatedWithNamesAndTypes", "TSVWithNamesAndTypes"})
     {
-        factory.registerOutputFormatProcessor(name, [](
+        factory.registerOutputFormat(name, [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
index d65f6dd9e38..ed98ab372b6 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
@@ -227,9 +227,9 @@ void TemplateBlockOutputFormat::finalize()
 }
 
 
-void registerOutputFormatProcessorTemplate(FormatFactory & factory)
+void registerOutputFormatTemplate(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("Template", [](
+    factory.registerOutputFormat("Template", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams &,
@@ -267,7 +267,7 @@ void registerOutputFormatProcessorTemplate(FormatFactory & factory)
         return std::make_shared<TemplateBlockOutputFormat>(sample, buf, settings, resultset_format, row_format, settings.template_settings.row_between_delimiter);
     });
 
-    factory.registerOutputFormatProcessor("CustomSeparated", [](
+    factory.registerOutputFormat("CustomSeparated", [](
             WriteBuffer & buf,
             const Block & sample,
             const RowOutputFormatParams &,
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index 0e5a962a037..021b2532b39 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -503,11 +503,11 @@ void TemplateRowInputFormat::resetParser()
     buf.reset();
 }
 
-void registerInputFormatProcessorTemplate(FormatFactory & factory)
+void registerInputFormatTemplate(FormatFactory & factory)
 {
     for (bool ignore_spaces : {false, true})
     {
-        factory.registerInputFormatProcessor(ignore_spaces ? "TemplateIgnoreSpaces" : "Template", [=](
+        factory.registerInputFormat(ignore_spaces ? "TemplateIgnoreSpaces" : "Template", [=](
                 ReadBuffer & buf,
                 const Block & sample,
                 IRowInputFormat::Params params,
@@ -551,7 +551,7 @@ void registerInputFormatProcessorTemplate(FormatFactory & factory)
 
     for (bool ignore_spaces : {false, true})
     {
-        factory.registerInputFormatProcessor(ignore_spaces ? "CustomSeparatedIgnoreSpaces" : "CustomSeparated", [=](
+        factory.registerInputFormat(ignore_spaces ? "CustomSeparatedIgnoreSpaces" : "CustomSeparated", [=](
                 ReadBuffer & buf,
                 const Block & sample,
                 IRowInputFormat::Params params,
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index 1eb64682fae..c15d0d608ee 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -7,7 +7,7 @@
 #include <Processors/Formats/Impl/ValuesBlockInputFormat.h>
 #include <Formats/FormatFactory.h>
 #include <Core/Block.h>
-#include <common/find_symbols.h>
+#include <base/find_symbols.h>
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <Parsers/ASTLiteral.h>
@@ -32,13 +32,25 @@ namespace ErrorCodes
 }
 
 
-ValuesBlockInputFormat::ValuesBlockInputFormat(ReadBuffer & in_, const Block & header_, const RowInputFormatParams & params_,
-                                               const FormatSettings & format_settings_)
-        : IInputFormat(header_, buf), buf(in_), params(params_),
-          format_settings(format_settings_), num_columns(header_.columns()),
-          parser_type_for_column(num_columns, ParserType::Streaming),
-          attempts_to_deduce_template(num_columns), attempts_to_deduce_template_cached(num_columns),
-          rows_parsed_using_template(num_columns), templates(num_columns), types(header_.getDataTypes())
+ValuesBlockInputFormat::ValuesBlockInputFormat(
+    ReadBuffer & in_,
+    const Block & header_,
+    const RowInputFormatParams & params_,
+    const FormatSettings & format_settings_)
+    : ValuesBlockInputFormat(std::make_unique<PeekableReadBuffer>(in_), header_, params_, format_settings_)
+{
+}
+
+ValuesBlockInputFormat::ValuesBlockInputFormat(
+    std::unique_ptr<PeekableReadBuffer> buf_,
+    const Block & header_,
+    const RowInputFormatParams & params_,
+    const FormatSettings & format_settings_)
+    : IInputFormat(header_, *buf_), buf(std::move(buf_)),
+        params(params_), format_settings(format_settings_), num_columns(header_.columns()),
+        parser_type_for_column(num_columns, ParserType::Streaming),
+        attempts_to_deduce_template(num_columns), attempts_to_deduce_template_cached(num_columns),
+        rows_parsed_using_template(num_columns), templates(num_columns), types(header_.getDataTypes())
 {
     serializations.resize(types.size());
     for (size_t i = 0; i < types.size(); ++i)
@@ -58,8 +70,8 @@ Chunk ValuesBlockInputFormat::generate()
     {
         try
         {
-            skipWhitespaceIfAny(buf);
-            if (buf.eof() || *buf.position() == ';')
+            skipWhitespaceIfAny(*buf);
+            if (buf->eof() || *buf->position() == ';')
                 break;
             readRow(columns, rows_in_block);
         }
@@ -99,12 +111,12 @@ Chunk ValuesBlockInputFormat::generate()
 
 void ValuesBlockInputFormat::readRow(MutableColumns & columns, size_t row_num)
 {
-    assertChar('(', buf);
+    assertChar('(', *buf);
 
     for (size_t column_idx = 0; column_idx < num_columns; ++column_idx)
     {
-        skipWhitespaceIfAny(buf);
-        PeekableReadBufferCheckpoint checkpoint{buf};
+        skipWhitespaceIfAny(*buf);
+        PeekableReadBufferCheckpoint checkpoint{*buf};
         bool read;
 
         /// Parse value using fast streaming parser for literals and slow SQL parser for expressions.
@@ -123,9 +135,9 @@ void ValuesBlockInputFormat::readRow(MutableColumns & columns, size_t row_num)
         /// If read is true, value still may be missing. Bit mask for these values will be copied from ConstantExpressionTemplate later.
     }
 
-    skipWhitespaceIfAny(buf);
-    if (!buf.eof() && *buf.position() == ',')
-        ++buf.position();
+    skipWhitespaceIfAny(*buf);
+    if (!buf->eof() && *buf->position() == ',')
+        ++buf->position();
 
     ++total_rows;
 }
@@ -134,7 +146,7 @@ bool ValuesBlockInputFormat::tryParseExpressionUsingTemplate(MutableColumnPtr &
 {
     /// Try to parse expression using template if one was successfully deduced while parsing the first row
     auto settings = context->getSettingsRef();
-    if (templates[column_idx]->parseExpression(buf, format_settings, settings))
+    if (templates[column_idx]->parseExpression(*buf, format_settings, settings))
     {
         ++rows_parsed_using_template[column_idx];
         return true;
@@ -154,7 +166,7 @@ bool ValuesBlockInputFormat::tryParseExpressionUsingTemplate(MutableColumnPtr &
     }
     /// Do not use this template anymore
     templates[column_idx].reset();
-    buf.rollbackToCheckpoint();
+    buf->rollbackToCheckpoint();
 
     /// It will deduce new template or fallback to slow SQL parser
     return parseExpression(*column, column_idx);
@@ -169,13 +181,13 @@ bool ValuesBlockInputFormat::tryReadValue(IColumn & column, size_t column_idx)
         const auto & type = types[column_idx];
         const auto & serialization = serializations[column_idx];
         if (format_settings.null_as_default && !type->isNullable())
-            read = SerializationNullable::deserializeTextQuotedImpl(column, buf, format_settings, serialization);
+            read = SerializationNullable::deserializeTextQuotedImpl(column, *buf, format_settings, serialization);
         else
-            serialization->deserializeTextQuoted(column, buf, format_settings);
+            serialization->deserializeTextQuoted(column, *buf, format_settings);
 
         rollback_on_exception = true;
 
-        skipWhitespaceIfAny(buf);
+        skipWhitespaceIfAny(*buf);
         assertDelimiterAfterValue(column_idx);
         return read;
     }
@@ -190,7 +202,7 @@ bool ValuesBlockInputFormat::tryReadValue(IColumn & column, size_t column_idx)
 
         /// Switch to SQL parser and don't try to use streaming parser for complex expressions
         /// Note: Throwing exceptions for each expression may be very slow because of stacktraces
-        buf.rollbackToCheckpoint();
+        buf->rollbackToCheckpoint();
         return parseExpression(column, column_idx);
     }
 }
@@ -284,11 +296,11 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
 
     /// We need continuous memory containing the expression to use Lexer
     skipToNextRow(0, 1);
-    buf.makeContinuousMemoryFromCheckpointToPos();
-    buf.rollbackToCheckpoint();
+    buf->makeContinuousMemoryFromCheckpointToPos();
+    buf->rollbackToCheckpoint();
 
     Expected expected;
-    Tokens tokens(buf.position(), buf.buffer().end());
+    Tokens tokens(buf->position(), buf->buffer().end());
     IParser::Pos token_iterator(tokens, settings.max_parser_depth);
     ASTPtr ast;
 
@@ -302,7 +314,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
 
     if (!parsed)
         throw Exception("Cannot parse expression of type " + type.getName() + " here: "
-                        + String(buf.position(), std::min(SHOW_CHARS_ON_SYNTAX_ERROR, buf.buffer().end() - buf.position())),
+                        + String(buf->position(), std::min(SHOW_CHARS_ON_SYNTAX_ERROR, buf->buffer().end() - buf->position())),
                         ErrorCodes::SYNTAX_ERROR);
     ++token_iterator;
 
@@ -316,9 +328,9 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
         try
         {
             const auto & serialization = serializations[column_idx];
-            serialization->deserializeTextQuoted(column, buf, format_settings);
+            serialization->deserializeTextQuoted(column, *buf, format_settings);
             rollback_on_exception = true;
-            skipWhitespaceIfAny(buf);
+            skipWhitespaceIfAny(*buf);
             if (checkDelimiterAfterValue(column_idx))
                 ok = true;
         }
@@ -366,8 +378,8 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
             else
                 ++attempts_to_deduce_template[column_idx];
 
-            buf.rollbackToCheckpoint();
-            if (templates[column_idx]->parseExpression(buf, format_settings, settings))
+            buf->rollbackToCheckpoint();
+            if (templates[column_idx]->parseExpression(*buf, format_settings, settings))
             {
                 ++rows_parsed_using_template[column_idx];
                 parser_type_for_column[column_idx] = ParserType::BatchTemplate;
@@ -384,9 +396,9 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
                 std::rethrow_exception(exception);
             else
             {
-                buf.rollbackToCheckpoint();
-                size_t len = const_cast<char *>(token_iterator->begin) - buf.position();
-                throw Exception("Cannot deduce template of expression: " + std::string(buf.position(), len), ErrorCodes::SYNTAX_ERROR);
+                buf->rollbackToCheckpoint();
+                size_t len = const_cast<char *>(token_iterator->begin) - buf->position();
+                throw Exception("Cannot deduce template of expression: " + std::string(buf->position(), len), ErrorCodes::SYNTAX_ERROR);
             }
         }
         /// Continue parsing without template
@@ -397,7 +409,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
         throw Exception("Interpreting expressions is disabled", ErrorCodes::SUPPORT_IS_DISABLED);
 
     /// Try to evaluate single expression if other parsers don't work
-    buf.position() = const_cast<char *>(token_iterator->begin);
+    buf->position() = const_cast<char *>(token_iterator->begin);
 
     std::pair<Field, DataTypePtr> value_raw = evaluateConstantExpression(ast, context);
 
@@ -416,10 +428,10 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
             type.insertDefaultInto(column);
             return false;
         }
-        buf.rollbackToCheckpoint();
+        buf->rollbackToCheckpoint();
         throw Exception{"Cannot insert NULL value into a column of type '" + type.getName() + "'"
                         + " at: " +
-                        String(buf.position(), std::min(SHOW_CHARS_ON_SYNTAX_ERROR, buf.buffer().end() - buf.position())),
+                        String(buf->position(), std::min(SHOW_CHARS_ON_SYNTAX_ERROR, buf->buffer().end() - buf->position())),
                         ErrorCodes::TYPE_MISMATCH};
     }
 
@@ -430,61 +442,61 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
 /// Can be used in fileSegmentationEngine for parallel parsing of Values
 bool ValuesBlockInputFormat::skipToNextRow(size_t min_chunk_bytes, int balance)
 {
-    skipWhitespaceIfAny(buf);
-    if (buf.eof() || *buf.position() == ';')
+    skipWhitespaceIfAny(*buf);
+    if (buf->eof() || *buf->position() == ';')
         return false;
     bool quoted = false;
 
-    size_t chunk_begin_buf_count = buf.count();
-    while (!buf.eof() && (balance || buf.count() - chunk_begin_buf_count < min_chunk_bytes))
+    size_t chunk_begin_buf_count = buf->count();
+    while (!buf->eof() && (balance || buf->count() - chunk_begin_buf_count < min_chunk_bytes))
     {
-        buf.position() = find_first_symbols<'\\', '\'', ')', '('>(buf.position(), buf.buffer().end());
-        if (buf.position() == buf.buffer().end())
+        buf->position() = find_first_symbols<'\\', '\'', ')', '('>(buf->position(), buf->buffer().end());
+        if (buf->position() == buf->buffer().end())
             continue;
-        if (*buf.position() == '\\')
+        if (*buf->position() == '\\')
         {
-            ++buf.position();
-            if (!buf.eof())
-                ++buf.position();
+            ++buf->position();
+            if (!buf->eof())
+                ++buf->position();
         }
-        else if (*buf.position() == '\'')
+        else if (*buf->position() == '\'')
         {
             quoted ^= true;
-            ++buf.position();
+            ++buf->position();
         }
-        else if (*buf.position() == ')')
+        else if (*buf->position() == ')')
         {
-            ++buf.position();
+            ++buf->position();
             if (!quoted)
                 --balance;
         }
-        else if (*buf.position() == '(')
+        else if (*buf->position() == '(')
         {
-            ++buf.position();
+            ++buf->position();
             if (!quoted)
                 ++balance;
         }
     }
 
-    if (!buf.eof() && *buf.position() == ',')
-        ++buf.position();
+    if (!buf->eof() && *buf->position() == ',')
+        ++buf->position();
     return true;
 }
 
 void ValuesBlockInputFormat::assertDelimiterAfterValue(size_t column_idx)
 {
     if (unlikely(!checkDelimiterAfterValue(column_idx)))
-        throwAtAssertionFailed((column_idx + 1 == num_columns) ? ")" : ",", buf);
+        throwAtAssertionFailed((column_idx + 1 == num_columns) ? ")" : ",", *buf);
 }
 
 bool ValuesBlockInputFormat::checkDelimiterAfterValue(size_t column_idx)
 {
-    skipWhitespaceIfAny(buf);
+    skipWhitespaceIfAny(*buf);
 
     if (likely(column_idx + 1 != num_columns))
-        return checkChar(',', buf);
+        return checkChar(',', *buf);
     else
-        return checkChar(')', buf);
+        return checkChar(')', *buf);
 }
 
 bool ValuesBlockInputFormat::shouldDeduceNewTemplate(size_t column_idx)
@@ -516,21 +528,21 @@ bool ValuesBlockInputFormat::shouldDeduceNewTemplate(size_t column_idx)
 void ValuesBlockInputFormat::readPrefix()
 {
     /// In this format, BOM at beginning of stream cannot be confused with value, so it is safe to skip it.
-    skipBOMIfExists(buf);
+    skipBOMIfExists(*buf);
 }
 
 void ValuesBlockInputFormat::readSuffix()
 {
-    if (!buf.eof() && *buf.position() == ';')
+    if (!buf->eof() && *buf->position() == ';')
     {
-        ++buf.position();
-        skipWhitespaceIfAny(buf);
-        if (buf.hasUnreadData())
+        ++buf->position();
+        skipWhitespaceIfAny(*buf);
+        if (buf->hasUnreadData())
             throw Exception("Cannot read data after semicolon", ErrorCodes::CANNOT_READ_ALL_DATA);
         return;
     }
 
-    if (buf.hasUnreadData())
+    if (buf->hasUnreadData())
         throw Exception("Unread data in PeekableReadBuffer will be lost. Most likely it's a bug.", ErrorCodes::LOGICAL_ERROR);
 }
 
@@ -539,13 +551,19 @@ void ValuesBlockInputFormat::resetParser()
     IInputFormat::resetParser();
     // I'm not resetting parser modes here.
     // There is a good chance that all messages have the same format.
-    buf.reset();
+    buf->reset();
     total_rows = 0;
 }
 
-void registerInputFormatProcessorValues(FormatFactory & factory)
+void ValuesBlockInputFormat::setReadBuffer(ReadBuffer & in_)
 {
-    factory.registerInputFormatProcessor("Values", [](
+    buf = std::make_unique<PeekableReadBuffer>(in_);
+    IInputFormat::setReadBuffer(*buf);
+}
+
+void registerInputFormatValues(FormatFactory & factory)
+{
+    factory.registerInputFormat("Values", [](
         ReadBuffer & buf,
         const Block & header,
         const RowInputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index b1e44f5d104..5bbd4bea5ba 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -32,6 +32,7 @@ public:
     String getName() const override { return "ValuesBlockInputFormat"; }
 
     void resetParser() override;
+    void setReadBuffer(ReadBuffer & in_) override;
 
     /// TODO: remove context somehow.
     void setContext(ContextPtr context_) { context = Context::createCopy(context_); }
@@ -39,6 +40,9 @@ public:
     const BlockMissingValues & getMissingValues() const override { return block_missing_values; }
 
 private:
+    ValuesBlockInputFormat(std::unique_ptr<PeekableReadBuffer> buf_, const Block & header_, const RowInputFormatParams & params_,
+                           const FormatSettings & format_settings_);
+
     enum class ParserType
     {
         Streaming,
@@ -66,7 +70,7 @@ private:
 
     bool skipToNextRow(size_t min_chunk_bytes = 0, int balance = 0);
 
-    PeekableReadBuffer buf;
+    std::unique_ptr<PeekableReadBuffer> buf;
 
     const RowInputFormatParams params;
 
diff --git a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
index e0152a7ffee..f63483c1f90 100644
--- a/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesRowOutputFormat.cpp
@@ -41,9 +41,9 @@ void ValuesRowOutputFormat::writeRowBetweenDelimiter()
 }
 
 
-void registerOutputFormatProcessorValues(FormatFactory & factory)
+void registerOutputFormatValues(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("Values", [](
+    factory.registerOutputFormat("Values", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
index c6f37d270b0..c30cb2ccbbb 100644
--- a/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/VerticalRowOutputFormat.cpp
@@ -161,9 +161,9 @@ void VerticalRowOutputFormat::writeSpecialRow(const Columns & columns, size_t ro
     }
 }
 
-void registerOutputFormatProcessorVertical(FormatFactory & factory)
+void registerOutputFormatVertical(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("Vertical", [](
+    factory.registerOutputFormat("Vertical", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
index 893c4e229c7..8ddc2ca4bbe 100644
--- a/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/XMLRowOutputFormat.cpp
@@ -240,9 +240,9 @@ void XMLRowOutputFormat::writeStatistics()
 }
 
 
-void registerOutputFormatProcessorXML(FormatFactory & factory)
+void registerOutputFormatXML(FormatFactory & factory)
 {
-    factory.registerOutputFormatProcessor("XML", [](
+    factory.registerOutputFormat("XML", [](
         WriteBuffer & buf,
         const Block & sample,
         const RowOutputFormatParams & params,
diff --git a/src/Processors/Formats/InputStreamFromInputFormat.h b/src/Processors/Formats/InputStreamFromInputFormat.h
deleted file mode 100644
index 4369287d39e..00000000000
--- a/src/Processors/Formats/InputStreamFromInputFormat.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-#include <DataStreams/IBlockInputStream.h>
-#include <Processors/Formats/IInputFormat.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-class IInputFormat;
-using InputFormatPtr = std::shared_ptr<IInputFormat>;
-
-class InputStreamFromInputFormat : public IBlockInputStream
-{
-public:
-    explicit InputStreamFromInputFormat(InputFormatPtr input_format_)
-        : input_format(std::move(input_format_))
-        , port(input_format->getPort().getHeader(), input_format.get())
-    {
-        connect(input_format->getPort(), port);
-        port.setNeeded();
-    }
-
-    String getName() const override { return input_format->getName(); }
-    Block getHeader() const override { return input_format->getPort().getHeader(); }
-
-    void cancel(bool kill) override
-    {
-        input_format->cancel();
-        IBlockInputStream::cancel(kill);
-    }
-
-    const BlockMissingValues & getMissingValues() const override { return input_format->getMissingValues(); }
-
-protected:
-
-    Block readImpl() override
-    {
-        while (true)
-        {
-            auto status = input_format->prepare();
-
-            switch (status)
-            {
-                case IProcessor::Status::Ready:
-                    input_format->work();
-                    break;
-
-                case IProcessor::Status::Finished:
-                    return {};
-
-                case IProcessor::Status::PortFull:
-                    return input_format->getPort().getHeader().cloneWithColumns(port.pull().detachColumns());
-
-                case IProcessor::Status::NeedData:
-                case IProcessor::Status::Async:
-                case IProcessor::Status::ExpandPipeline:
-                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
-            }
-        }
-    }
-
-private:
-    InputFormatPtr input_format;
-    InputPort port;
-};
-
-}
diff --git a/src/Processors/Formats/LazyOutputFormat.cpp b/src/Processors/Formats/LazyOutputFormat.cpp
index 0663ff28f84..792d805eac3 100644
--- a/src/Processors/Formats/LazyOutputFormat.cpp
+++ b/src/Processors/Formats/LazyOutputFormat.cpp
@@ -9,11 +9,8 @@ WriteBuffer LazyOutputFormat::out(nullptr, 0);
 
 Chunk LazyOutputFormat::getChunk(UInt64 milliseconds)
 {
-    if (finished_processing)
-    {
-        if (queue.empty())
-            return {};
-    }
+    if (isFinished())
+        return {};
 
     Chunk chunk;
     if (milliseconds)
@@ -22,7 +19,10 @@ Chunk LazyOutputFormat::getChunk(UInt64 milliseconds)
             return {};
     }
     else
-        queue.pop(chunk);
+    {
+        if (!queue.pop(chunk))
+            return {};
+    }
 
     if (chunk)
         info.update(chunk.getNumRows(), chunk.allocatedBytes());
diff --git a/src/Processors/Formats/LazyOutputFormat.h b/src/Processors/Formats/LazyOutputFormat.h
index c6be0adb347..123d393a871 100644
--- a/src/Processors/Formats/LazyOutputFormat.h
+++ b/src/Processors/Formats/LazyOutputFormat.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Processors/Formats/IOutputFormat.h>
 #include <Common/ConcurrentBoundedQueue.h>
-#include <DataStreams/BlockStreamProfileInfo.h>
+#include <QueryPipeline/ProfileInfo.h>
 #include <IO/WriteBuffer.h>
 
 namespace DB
@@ -15,7 +15,7 @@ class LazyOutputFormat : public IOutputFormat
 
 public:
     explicit LazyOutputFormat(const Block & header)
-        : IOutputFormat(header, out), queue(2), finished_processing(false) {}
+        : IOutputFormat(header, out), queue(2) {}
 
     String getName() const override { return "LazyOutputFormat"; }
 
@@ -23,32 +23,28 @@ public:
     Chunk getTotals();
     Chunk getExtremes();
 
-    bool isFinished() { return finished_processing && queue.size() == 0; }
+    bool isFinished() { return queue.isFinishedAndEmpty(); }
 
-    BlockStreamProfileInfo & getProfileInfo() { return info; }
+    ProfileInfo & getProfileInfo() { return info; }
 
     void setRowsBeforeLimit(size_t rows_before_limit) override;
 
     void onCancel() override
     {
-        finished_processing = true;
-        /// Clear queue in case if somebody is waiting lazy_format to push.
-        queue.clear();
+        queue.clearAndFinish();
     }
 
     void finalize() override
     {
-        finished_processing = true;
-
-        /// In case we are waiting for result.
-        queue.emplace(Chunk());
+        queue.finish();
     }
 
+    bool expectMaterializedColumns() const override { return false; }
+
 protected:
     void consume(Chunk chunk) override
     {
-        if (!finished_processing)
-            queue.emplace(std::move(chunk));
+        (void)(queue.emplace(std::move(chunk)));
     }
 
     void consumeTotals(Chunk chunk) override { totals = std::move(chunk); }
@@ -63,9 +59,7 @@ private:
     /// Is not used.
     static WriteBuffer out;
 
-    BlockStreamProfileInfo info;
-
-    std::atomic<bool> finished_processing;
+    ProfileInfo info;
 };
 
 }
diff --git a/src/Processors/Formats/OutputStreamToOutputFormat.cpp b/src/Processors/Formats/OutputStreamToOutputFormat.cpp
deleted file mode 100644
index 5d4e7832327..00000000000
--- a/src/Processors/Formats/OutputStreamToOutputFormat.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <Processors/Formats/OutputStreamToOutputFormat.h>
-#include <Processors/Formats/IOutputFormat.h>
-
-namespace DB
-{
-
-Block OutputStreamToOutputFormat::getHeader() const
-{
-    return output_format->getPort(IOutputFormat::PortKind::Main).getHeader();
-}
-
-void OutputStreamToOutputFormat::write(const Block & block)
-{
-    output_format->write(block);
-}
-
-void OutputStreamToOutputFormat::writePrefix() { output_format->doWritePrefix(); }
-void OutputStreamToOutputFormat::writeSuffix() { output_format->doWriteSuffix(); }
-
-void OutputStreamToOutputFormat::flush() { output_format->flush(); }
-
-void OutputStreamToOutputFormat::setRowsBeforeLimit(size_t rows_before_limit)
-{
-    output_format->setRowsBeforeLimit(rows_before_limit);
-}
-
-void OutputStreamToOutputFormat::setTotals(const Block & totals)
-{
-    if (totals)
-        output_format->setTotals(totals);
-}
-
-void OutputStreamToOutputFormat::setExtremes(const Block & extremes)
-{
-    if (extremes)
-        output_format->setExtremes(extremes);
-}
-
-void OutputStreamToOutputFormat::onProgress(const Progress & progress) { output_format->onProgress(progress); }
-
-std::string OutputStreamToOutputFormat::getContentType() const { return output_format->getContentType(); }
-
-}
diff --git a/src/Processors/Formats/OutputStreamToOutputFormat.h b/src/Processors/Formats/OutputStreamToOutputFormat.h
deleted file mode 100644
index a85de12b49d..00000000000
--- a/src/Processors/Formats/OutputStreamToOutputFormat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-#include <DataStreams/IBlockOutputStream.h>
-
-namespace DB
-{
-
-
-class IOutputFormat;
-
-using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
-
-/// Wrapper. Implements IBlockOutputStream interface using IOutputFormat object.
-class OutputStreamToOutputFormat : public IBlockOutputStream
-{
-public:
-    explicit OutputStreamToOutputFormat(OutputFormatPtr output_format_) : output_format(std::move(output_format_)) {}
-
-    Block getHeader() const override;
-
-    void write(const Block & block) override;
-
-    void writePrefix() override;
-    void writeSuffix() override;
-
-    void flush() override;
-
-    void setRowsBeforeLimit(size_t rows_before_limit) override;
-    void setTotals(const Block & totals) override;
-    void setExtremes(const Block & extremes) override;
-
-    void onProgress(const Progress & progress) override;
-
-    std::string getContentType() const override;
-
-private:
-    OutputFormatPtr output_format;
-};
-
-}
diff --git a/src/Processors/Formats/PullingOutputFormat.h b/src/Processors/Formats/PullingOutputFormat.h
index 0864b5a02ef..a231b7679f3 100644
--- a/src/Processors/Formats/PullingOutputFormat.h
+++ b/src/Processors/Formats/PullingOutputFormat.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/Formats/IOutputFormat.h>
-#include <DataStreams/BlockStreamProfileInfo.h>
+#include <QueryPipeline/ProfileInfo.h>
 
 namespace DB
 {
@@ -20,10 +20,12 @@ public:
     Chunk getTotals();
     Chunk getExtremes();
 
-    BlockStreamProfileInfo & getProfileInfo() { return info; }
+    ProfileInfo & getProfileInfo() { return info; }
 
     void setRowsBeforeLimit(size_t rows_before_limit) override;
 
+    bool expectMaterializedColumns() const override { return false; }
+
 protected:
     void consume(Chunk chunk) override;
     void consumeTotals(Chunk chunk) override { totals = std::move(chunk); }
@@ -36,7 +38,7 @@ private:
 
     std::atomic_bool & has_data_flag;
 
-    BlockStreamProfileInfo info;
+    ProfileInfo info;
 
     /// Is not used.
     static WriteBuffer out;
diff --git a/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp b/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
index 4dddc9fff9b..f4568830720 100644
--- a/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
+++ b/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
@@ -29,15 +29,15 @@ void RowInputFormatWithDiagnosticInfo::updateDiagnosticInfo()
     ++row_num;
 
     bytes_read_at_start_of_buffer_on_prev_row = bytes_read_at_start_of_buffer_on_current_row;
-    bytes_read_at_start_of_buffer_on_current_row = in.count() - in.offset();
+    bytes_read_at_start_of_buffer_on_current_row = in->count() - in->offset();
 
     offset_of_prev_row = offset_of_current_row;
-    offset_of_current_row = in.offset();
+    offset_of_current_row = in->offset();
 }
 
 String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
 {
-    if (in.eof())
+    if (in->eof())
         return "Buffer has gone, cannot extract information about what has been parsed.";
 
     WriteBufferFromOwnString out;
@@ -46,7 +46,7 @@ String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
     MutableColumns columns = header.cloneEmptyColumns();
 
     /// It is possible to display detailed diagnostics only if the last and next to last rows are still in the read buffer.
-    size_t bytes_read_at_start_of_buffer = in.count() - in.offset();
+    size_t bytes_read_at_start_of_buffer = in->count() - in->offset();
     if (bytes_read_at_start_of_buffer != bytes_read_at_start_of_buffer_on_prev_row)
     {
         out << "Could not print diagnostic info because two last rows aren't in buffer (rare case)\n";
@@ -65,9 +65,9 @@ String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
 
     /// Roll back the cursor to the beginning of the previous or current row and parse all over again. But now we derive detailed information.
 
-    if (offset_of_prev_row <= in.buffer().size())
+    if (offset_of_prev_row <= in->buffer().size())
     {
-        in.position() = in.buffer().begin() + offset_of_prev_row;
+        in->position() = in->buffer().begin() + offset_of_prev_row;
 
         out << "\nRow " << (row_num - 1) << ":\n";
         if (!parseRowAndPrintDiagnosticInfo(columns, out))
@@ -75,13 +75,13 @@ String RowInputFormatWithDiagnosticInfo::getDiagnosticInfo()
     }
     else
     {
-        if (in.buffer().size() < offset_of_current_row)
+        if (in->buffer().size() < offset_of_current_row)
         {
             out << "Could not print diagnostic info because parsing of data hasn't started.\n";
             return out.str();
         }
 
-        in.position() = in.buffer().begin() + offset_of_current_row;
+        in->position() = in->buffer().begin() + offset_of_current_row;
     }
 
     out << "\nRow " << row_num << ":\n";
@@ -101,7 +101,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
         << "name: " << alignedName(col_name, max_length_of_column_name)
         << "type: " << alignedName(type->getName(), max_length_of_data_type_name);
 
-    auto * prev_position = in.position();
+    auto * prev_position = in->position();
     std::exception_ptr exception;
 
     try
@@ -112,7 +112,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
     {
         exception = std::current_exception();
     }
-    auto * curr_position = in.position();
+    auto * curr_position = in->position();
 
     if (curr_position < prev_position)
         throw Exception("Logical error: parsing is non-deterministic.", ErrorCodes::LOGICAL_ERROR);
@@ -123,7 +123,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
         if (curr_position == prev_position)
         {
             out << "ERROR: text ";
-            verbosePrintString(prev_position, std::min(prev_position + 10, in.buffer().end()), out);
+            verbosePrintString(prev_position, std::min(prev_position + 10, in->buffer().end()), out);
             out << " is not like " << type->getName() << "\n";
             return false;
         }
@@ -152,7 +152,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
         if (isGarbageAfterField(file_column, curr_position))
         {
             out << "ERROR: garbage after " << type->getName() << ": ";
-            verbosePrintString(curr_position, std::min(curr_position + 10, in.buffer().end()), out);
+            verbosePrintString(curr_position, std::min(curr_position + 10, in->buffer().end()), out);
             out << "\n";
 
             if (type->getName() == "DateTime")
diff --git a/src/Processors/IAccumulatingTransform.cpp b/src/Processors/IAccumulatingTransform.cpp
index 64bdbe2410f..35b45543151 100644
--- a/src/Processors/IAccumulatingTransform.cpp
+++ b/src/Processors/IAccumulatingTransform.cpp
@@ -1,5 +1,5 @@
 #include <Processors/IAccumulatingTransform.h>
-
+#include <iostream>
 
 namespace DB
 {
diff --git a/src/Processors/ISimpleTransform.h b/src/Processors/ISimpleTransform.h
index ee92b574d7c..7c08a4c707e 100644
--- a/src/Processors/ISimpleTransform.h
+++ b/src/Processors/ISimpleTransform.h
@@ -32,11 +32,6 @@ protected:
     /// This allows to escape caching chunks in input port, which can lead to uneven data distribution.
     bool set_input_not_needed_after_read = true;
 
-    virtual void transform(Chunk &)
-    {
-        throw Exception("Method transform is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
-    }
-
     virtual void transform(Chunk & input_chunk, Chunk & output_chunk)
     {
         transform(input_chunk);
@@ -49,6 +44,11 @@ protected:
 public:
     ISimpleTransform(Block input_header_, Block output_header_, bool skip_empty_chunks_);
 
+    virtual void transform(Chunk &)
+    {
+        throw Exception("Method transform is not implemented for " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     Status prepare() override;
     void work() override;
 
diff --git a/src/Processors/Merges/AggregatingSortedTransform.h b/src/Processors/Merges/AggregatingSortedTransform.h
index e8bf90c2b31..b0cdf4c8a3c 100644
--- a/src/Processors/Merges/AggregatingSortedTransform.h
+++ b/src/Processors/Merges/AggregatingSortedTransform.h
@@ -16,7 +16,7 @@ public:
         const Block & header, size_t num_inputs,
         SortDescription description_, size_t max_block_size)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             std::move(description_),
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
index 2d873aa6bc6..592562c47b9 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
@@ -6,7 +6,7 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 /// Maximum number of messages about incorrect data in the log.
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
index 18ebaad5596..f457af05bd5 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 namespace Poco
 {
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
index eaffe394ee4..fdea3c23dc2 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
@@ -1,16 +1,24 @@
 #include <Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h>
+#include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <Processors/Transforms/AggregatingTransform.h>
+#include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <Core/SortCursor.h>
 
-#include <common/range.h>
+#include <base/range.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 FinishAggregatingInOrderAlgorithm::State::State(
-    const Chunk & chunk, const SortDescription & desc)
-    : num_rows(chunk.getNumRows())
-    , all_columns(chunk.getColumns())
+    const Chunk & chunk, const SortDescription & desc, Int64 total_bytes_)
+    : all_columns(chunk.getColumns())
+    , num_rows(chunk.getNumRows())
+    , total_bytes(total_bytes_)
 {
     if (!chunk)
         return;
@@ -25,12 +33,14 @@ FinishAggregatingInOrderAlgorithm::FinishAggregatingInOrderAlgorithm(
     size_t num_inputs_,
     AggregatingTransformParamsPtr params_,
     SortDescription description_,
-    size_t max_block_size_)
+    size_t max_block_size_,
+    size_t max_block_bytes_)
     : header(header_)
     , num_inputs(num_inputs_)
     , params(params_)
     , description(std::move(description_))
     , max_block_size(max_block_size_)
+    , max_block_bytes(max_block_bytes_)
 {
     /// Replace column names in description to positions.
     for (auto & column_description : description)
@@ -46,14 +56,25 @@ FinishAggregatingInOrderAlgorithm::FinishAggregatingInOrderAlgorithm(
 void FinishAggregatingInOrderAlgorithm::initialize(Inputs inputs)
 {
     current_inputs = std::move(inputs);
-    states.reserve(num_inputs);
+    states.resize(num_inputs);
     for (size_t i = 0; i < num_inputs; ++i)
-        states.emplace_back(current_inputs[i].chunk, description);
+        consume(current_inputs[i], i);
 }
 
 void FinishAggregatingInOrderAlgorithm::consume(Input & input, size_t source_num)
 {
-    states[source_num] = State{input.chunk, description};
+    if (!input.chunk.hasRows())
+        return;
+
+    const auto & info = input.chunk.getChunkInfo();
+    if (!info)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Chunk info was not set for chunk in FinishAggregatingInOrderAlgorithm");
+
+    const auto * arenas_info = typeid_cast<const ChunkInfoWithAllocatedBytes *>(info.get());
+    if (!arenas_info)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Chunk should have ChunkInfoWithAllocatedBytes in FinishAggregatingInOrderAlgorithm");
+
+    states[source_num] = State{input.chunk, description, arenas_info->allocated_bytes};
 }
 
 IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
@@ -81,7 +102,7 @@ IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
     }
 
     if (!best_input)
-        return Status{aggregate(), true};
+        return Status(prepareToMerge(), true);
 
     /// Chunk at best_input will be aggregated entirely.
     auto & best_state = states[*best_input];
@@ -110,19 +131,24 @@ IMergingAlgorithm::Status FinishAggregatingInOrderAlgorithm::merge()
     Status status(inputs_to_update.back());
     inputs_to_update.pop_back();
 
-    /// Do not merge blocks, if there are too few rows.
-    if (accumulated_rows >= max_block_size)
-        status.chunk = aggregate();
+    /// Do not merge blocks, if there are too few rows or bytes.
+    if (accumulated_rows >= max_block_size || accumulated_bytes >= max_block_bytes)
+        status.chunk = prepareToMerge();
 
     return status;
 }
 
-Chunk FinishAggregatingInOrderAlgorithm::aggregate()
+Chunk FinishAggregatingInOrderAlgorithm::prepareToMerge()
 {
-    auto aggregated = params->aggregator.mergeBlocks(blocks, false);
-    blocks.clear();
     accumulated_rows = 0;
-    return {aggregated.getColumns(), aggregated.rows()};
+    accumulated_bytes = 0;
+
+    auto info = std::make_shared<ChunksToMerge>();
+    info->chunks = std::make_unique<Chunks>(std::move(chunks));
+
+    Chunk chunk;
+    chunk.setChunkInfo(std::move(info));
+    return chunk;
 }
 
 void FinishAggregatingInOrderAlgorithm::addToAggregation()
@@ -133,22 +159,28 @@ void FinishAggregatingInOrderAlgorithm::addToAggregation()
         if (!state.isValid() || state.current_row == state.to_row)
             continue;
 
-        if (state.to_row - state.current_row == state.num_rows)
+        size_t current_rows = state.to_row - state.current_row;
+        if (current_rows == state.num_rows)
         {
-            blocks.emplace_back(header.cloneWithColumns(state.all_columns));
+            chunks.emplace_back(state.all_columns, current_rows);
         }
         else
         {
             Columns new_columns;
             new_columns.reserve(state.all_columns.size());
             for (const auto & column : state.all_columns)
-                new_columns.emplace_back(column->cut(state.current_row, state.to_row - state.current_row));
+                new_columns.emplace_back(column->cut(state.current_row, current_rows));
 
-            blocks.emplace_back(header.cloneWithColumns(new_columns));
+            chunks.emplace_back(std::move(new_columns), current_rows);
         }
 
+        chunks.back().setChunkInfo(std::make_shared<AggregatedChunkInfo>());
         states[i].current_row = states[i].to_row;
-        accumulated_rows += blocks.back().rows();
+
+        /// We assume that sizes in bytes of rows are almost the same.
+        accumulated_bytes += states[i].total_bytes * (static_cast<double>(current_rows) / states[i].num_rows);
+        accumulated_rows += current_rows;
+
 
         if (!states[i].isValid())
             inputs_to_update.push_back(i);
diff --git a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
index 119aefb0ab0..f3a1bd40635 100644
--- a/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/FinishAggregatingInOrderAlgorithm.h
@@ -4,6 +4,7 @@
 #include <Processors/Merges/Algorithms/MergedData.h>
 #include <Core/SortDescription.h>
 #include <Core/Block.h>
+#include <Common/ThreadPool.h>
 
 namespace DB
 {
@@ -15,20 +16,23 @@ using AggregatingTransformParamsPtr = std::shared_ptr<AggregatingTransformParams
  * The second step of aggregation in order of sorting key.
  * The transform receives k inputs with partially aggregated data,
  * sorted by group by key (prefix of sorting key).
+ *
  * Then it merges aggregated data from inputs by the following algorithm:
  *  - At each step find the smallest value X of the sorting key among last rows of current blocks of inputs.
  *    Since the data is sorted in order of sorting key and has no duplicates in single input stream (because of aggregation),
  *    X will never appear later in any of input streams.
- *  - Aggregate all rows in current blocks of inputs up to the upper_bound of X using
- *    regular hash table algorithm (Aggregator::mergeBlock).
+ *  - Add to current group all rows from current blocks of inputs up to the upper_bound of X.
+ *  - Pass current group to the next step (MergingAggregatedBucketTransform), which do actual
+ *    merge of aggregated data in parallel by regular hash table algorithm (Aggregator::mergeBlock).
+ *
  * The hash table at one step will contain all keys <= X from all blocks.
  * There is another, simpler algorithm (AggregatingSortedAlgorithm), that merges
  * and aggregates sorted data for one key at a time, using one aggregation state.
- * It is a simple k-way merge algorithm and it makes O(n*log(k)) comparisons,
- * where * n -- number of rows, k -- number of parts. In comparison, this algorithm
- * makes about * O(n + k * log(n)) operations, n -- for hash table, k * log(n)
- * -- for finding positions in blocks. It is better than O(n*log(k)), when k is not
- * too big and not too small (about 100-1000).
+ * It is a simple k-way merge algorithm and it makes O(n * log(k)) comparisons,
+ * where n -- number of rows, k -- number of parts. In comparison, this algorithm
+ * makes about * O(n + k * log(n)) operations, n -- for hash table,
+ * k * log(n) -- for finding positions in blocks. It is better than O(n*log(k)),
+ * when k is not too big and not too small (about 100-1000).
  */
 class FinishAggregatingInOrderAlgorithm final : public IMergingAlgorithm
 {
@@ -38,29 +42,36 @@ public:
         size_t num_inputs_,
         AggregatingTransformParamsPtr params_,
         SortDescription description_,
-        size_t max_block_size_);
+        size_t max_block_size_,
+        size_t max_block_bytes_);
 
     void initialize(Inputs inputs) override;
     void consume(Input & input, size_t source_num) override;
     Status merge() override;
 
 private:
-    Chunk aggregate();
+    Chunk prepareToMerge();
     void addToAggregation();
 
     struct State
     {
-        size_t num_rows;
         Columns all_columns;
         ColumnRawPtrs sorting_columns;
 
+        size_t num_rows = 0;
+
         /// Number of row starting from which need to aggregate.
         size_t current_row = 0;
 
         /// Number of row up to which need to aggregate (not included).
         size_t to_row = 0;
 
-        State(const Chunk & chunk, const SortDescription & description);
+        /// Number of bytes in all columns + number of bytes in arena, related to current chunk.
+        size_t total_bytes = 0;
+
+        State(const Chunk & chunk, const SortDescription & description, Int64 total_bytes_);
+        State() = default;
+
         bool isValid() const { return current_row < num_rows; }
     };
 
@@ -69,12 +80,16 @@ private:
     AggregatingTransformParamsPtr params;
     SortDescription description;
     size_t max_block_size;
+    size_t max_block_bytes;
 
     Inputs current_inputs;
+
     std::vector<State> states;
     std::vector<size_t> inputs_to_update;
-    BlocksList blocks;
+
+    std::vector<Chunk> chunks;
     size_t accumulated_rows = 0;
+    size_t accumulated_bytes = 0;
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
index 7795292f922..328c34823a0 100644
--- a/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
@@ -1,7 +1,7 @@
 #include <Processors/Merges/Algorithms/GraphiteRollupSortedAlgorithm.h>
 #include <AggregateFunctions/IAggregateFunction.h>
-#include <common/DateLUTImpl.h>
-#include <common/DateLUT.h>
+#include <base/DateLUTImpl.h>
+#include <base/DateLUT.h>
 #include <DataTypes/DataTypeDateTime.h>
 
 
diff --git a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
index 511bd9dd74f..6b2f0f571a1 100644
--- a/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/MergingSortedAlgorithm.cpp
@@ -1,5 +1,5 @@
 #include <Processors/Merges/Algorithms/MergingSortedAlgorithm.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBuffer.h>
 
 namespace DB
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
index 7a193470f89..ca3bbd9d757 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 namespace Poco
 {
diff --git a/src/Processors/Merges/Algorithms/RowRef.h b/src/Processors/Merges/Algorithms/RowRef.h
index e4610c88581..88a69f5e9e9 100644
--- a/src/Processors/Merges/Algorithms/RowRef.h
+++ b/src/Processors/Merges/Algorithms/RowRef.h
@@ -4,7 +4,7 @@
 #include <Columns/IColumn.h>
 #include <Core/SortCursor.h>
 #include <Common/StackTrace.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
diff --git a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
index 6e859d86020..2226762d541 100644
--- a/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/VersionedCollapsingAlgorithm.h
@@ -2,7 +2,7 @@
 #include <Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
 #include <Processors/Merges/Algorithms/FixedSizeDequeWithGaps.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <queue>
 
 namespace DB
diff --git a/src/Processors/Merges/CollapsingSortedTransform.h b/src/Processors/Merges/CollapsingSortedTransform.h
index 87c466f31e8..a37e1c8402f 100644
--- a/src/Processors/Merges/CollapsingSortedTransform.h
+++ b/src/Processors/Merges/CollapsingSortedTransform.h
@@ -20,7 +20,7 @@ public:
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             std::move(description_),
diff --git a/src/Processors/Merges/FinishAggregatingInOrderTransform.h b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
index 6d5e334311f..ecc88899e88 100644
--- a/src/Processors/Merges/FinishAggregatingInOrderTransform.h
+++ b/src/Processors/Merges/FinishAggregatingInOrderTransform.h
@@ -17,14 +17,16 @@ public:
         size_t num_inputs,
         AggregatingTransformParamsPtr params,
         SortDescription description,
-        size_t max_block_size)
+        size_t max_block_size,
+        size_t max_block_bytes)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, {}, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             params,
             std::move(description),
-            max_block_size)
+            max_block_size,
+            max_block_bytes)
     {
     }
 
diff --git a/src/Processors/Merges/GraphiteRollupSortedTransform.h b/src/Processors/Merges/GraphiteRollupSortedTransform.h
index 46272f00eed..e6307c629ea 100644
--- a/src/Processors/Merges/GraphiteRollupSortedTransform.h
+++ b/src/Processors/Merges/GraphiteRollupSortedTransform.h
@@ -15,7 +15,7 @@ public:
         SortDescription description_, size_t max_block_size,
         Graphite::Params params_, time_t time_of_merge_)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             std::move(description_),
diff --git a/src/Processors/Merges/IMergingTransform.cpp b/src/Processors/Merges/IMergingTransform.cpp
index cba78390c97..cdb18f07e4d 100644
--- a/src/Processors/Merges/IMergingTransform.cpp
+++ b/src/Processors/Merges/IMergingTransform.cpp
@@ -15,10 +15,10 @@ IMergingTransformBase::IMergingTransformBase(
     const Block & input_header,
     const Block & output_header,
     bool have_all_inputs_,
-    bool has_limit_below_one_block_)
+    UInt64 limit_hint_)
     : IProcessor(InputPorts(num_inputs, input_header), {output_header})
     , have_all_inputs(have_all_inputs_)
-    , has_limit_below_one_block(has_limit_below_one_block_)
+    , limit_hint(limit_hint_)
 {
 }
 
@@ -79,7 +79,10 @@ IProcessor::Status IMergingTransformBase::prepareInitializeInputs()
         /// setNotNeeded after reading first chunk, because in optimismtic case
         /// (e.g. with optimized 'ORDER BY primary_key LIMIT n' and small 'n')
         /// we won't have to read any chunks anymore;
-        auto chunk = input.pull(has_limit_below_one_block);
+        auto chunk = input.pull(limit_hint != 0);
+        if (limit_hint && chunk.getNumRows() < limit_hint)
+            input.setNeeded();
+
         if (!chunk.hasRows())
         {
             if (!input.isFinished())
@@ -132,7 +135,7 @@ IProcessor::Status IMergingTransformBase::prepare()
     bool is_port_full = !output.canPush();
 
     /// Push if has data.
-    if (state.output_chunk && !is_port_full)
+    if ((state.output_chunk || state.output_chunk.hasChunkInfo()) && !is_port_full)
         output.push(std::move(state.output_chunk));
 
     if (!is_initialized)
diff --git a/src/Processors/Merges/IMergingTransform.h b/src/Processors/Merges/IMergingTransform.h
index 8b0a44ae025..ea6f6aed37f 100644
--- a/src/Processors/Merges/IMergingTransform.h
+++ b/src/Processors/Merges/IMergingTransform.h
@@ -17,7 +17,7 @@ public:
         const Block & input_header,
         const Block & output_header,
         bool have_all_inputs_,
-        bool has_limit_below_one_block_);
+        UInt64 limit_hint_);
 
     OutputPort & getOutputPort() { return outputs.front(); }
 
@@ -67,7 +67,7 @@ private:
     std::vector<InputState> input_states;
     std::atomic<bool> have_all_inputs;
     bool is_initialized = false;
-    bool has_limit_below_one_block = false;
+    UInt64 limit_hint = 0;
 
     IProcessor::Status prepareInitializeInputs();
 };
@@ -83,9 +83,9 @@ public:
         const Block & input_header,
         const Block & output_header,
         bool have_all_inputs_,
-        bool has_limit_below_one_block_,
+        UInt64 limit_hint_,
         Args && ... args)
-        : IMergingTransformBase(num_inputs, input_header, output_header, have_all_inputs_, has_limit_below_one_block_)
+        : IMergingTransformBase(num_inputs, input_header, output_header, have_all_inputs_, limit_hint_)
         , algorithm(std::forward<Args>(args) ...)
     {
     }
@@ -107,7 +107,7 @@ public:
 
         IMergingAlgorithm::Status status = algorithm.merge();
 
-        if (status.chunk && status.chunk.hasRows())
+        if ((status.chunk && status.chunk.hasRows()) || status.chunk.hasChunkInfo())
         {
             // std::cerr << "Got chunk with " << status.chunk.getNumRows() << " rows" << std::endl;
             state.output_chunk = std::move(status.chunk);
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index 92fafa4242c..ec864b561e9 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -1,8 +1,8 @@
 #include <Processors/Merges/MergingSortedTransform.h>
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBuffer.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
@@ -13,13 +13,12 @@ MergingSortedTransform::MergingSortedTransform(
     SortDescription  description_,
     size_t max_block_size,
     UInt64 limit_,
-    bool has_limit_below_one_block_,
     WriteBuffer * out_row_sources_buf_,
     bool quiet_,
     bool use_average_block_sizes,
     bool have_all_inputs_)
     : IMergingTransform(
-        num_inputs, header, header, have_all_inputs_, has_limit_below_one_block_,
+        num_inputs, header, header, have_all_inputs_, limit_,
         header,
         num_inputs,
         std::move(description_),
diff --git a/src/Processors/Merges/MergingSortedTransform.h b/src/Processors/Merges/MergingSortedTransform.h
index 1fa9b1275bd..93bd36d8aec 100644
--- a/src/Processors/Merges/MergingSortedTransform.h
+++ b/src/Processors/Merges/MergingSortedTransform.h
@@ -17,7 +17,6 @@ public:
         SortDescription description,
         size_t max_block_size,
         UInt64 limit_ = 0,
-        bool has_limit_below_one_block_ = false,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool quiet_ = false,
         bool use_average_block_sizes = false,
diff --git a/src/Processors/Merges/ReplacingSortedTransform.h b/src/Processors/Merges/ReplacingSortedTransform.h
index e760cdf0d2b..dfb386684fc 100644
--- a/src/Processors/Merges/ReplacingSortedTransform.h
+++ b/src/Processors/Merges/ReplacingSortedTransform.h
@@ -18,7 +18,7 @@ public:
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             std::move(description_),
diff --git a/src/Processors/Merges/SummingSortedTransform.h b/src/Processors/Merges/SummingSortedTransform.h
index 0287caed5aa..0530ac2e96b 100644
--- a/src/Processors/Merges/SummingSortedTransform.h
+++ b/src/Processors/Merges/SummingSortedTransform.h
@@ -19,7 +19,7 @@ public:
         const Names & partition_key_columns,
         size_t max_block_size)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             std::move(description_),
diff --git a/src/Processors/Merges/VersionedCollapsingTransform.h b/src/Processors/Merges/VersionedCollapsingTransform.h
index f260e20f1da..5eced1cb58d 100644
--- a/src/Processors/Merges/VersionedCollapsingTransform.h
+++ b/src/Processors/Merges/VersionedCollapsingTransform.h
@@ -19,7 +19,7 @@ public:
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false)
         : IMergingTransform(
-            num_inputs, header, header, /*have_all_inputs_=*/ true, /*has_limit_below_one_block_=*/ false,
+            num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
             header,
             num_inputs,
             std::move(description_),
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index 772390acb32..0b48a38e7db 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -1,7 +1,8 @@
 #include <Processors/QueryPlan/AggregatingStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
+#include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <Processors/Merges/AggregatingSortedTransform.h>
 #include <Processors/Merges/FinishAggregatingInOrderTransform.h>
 
@@ -29,6 +30,7 @@ AggregatingStep::AggregatingStep(
     Aggregator::Params params_,
     bool final_,
     size_t max_block_size_,
+    size_t aggregation_in_order_max_block_bytes_,
     size_t merge_threads_,
     size_t temporary_data_merge_threads_,
     bool storage_has_evenly_distributed_read_,
@@ -38,6 +40,7 @@ AggregatingStep::AggregatingStep(
     , params(std::move(params_))
     , final(std::move(final_))
     , max_block_size(max_block_size_)
+    , aggregation_in_order_max_block_bytes(aggregation_in_order_max_block_bytes_)
     , merge_threads(merge_threads_)
     , temporary_data_merge_threads(temporary_data_merge_threads_)
     , storage_has_evenly_distributed_read(storage_has_evenly_distributed_read_)
@@ -46,7 +49,7 @@ AggregatingStep::AggregatingStep(
 {
 }
 
-void AggregatingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     QueryPipelineProcessorsCollector collector(pipeline, this);
 
@@ -78,49 +81,65 @@ void AggregatingStep::transformPipeline(QueryPipeline & pipeline, const BuildQue
         {
             if (pipeline.getNumStreams() > 1)
             {
+                /** The pipeline is the following:
+                 *
+                 * --> AggregatingInOrder                                                  --> MergingAggregatedBucket
+                 * --> AggregatingInOrder --> FinishAggregatingInOrder --> ResizeProcessor --> MergingAggregatedBucket
+                 * --> AggregatingInOrder                                                  --> MergingAggregatedBucket
+                 */
+
                 auto many_data = std::make_shared<ManyAggregatedData>(pipeline.getNumStreams());
                 size_t counter = 0;
                 pipeline.addSimpleTransform([&](const Block & header)
                 {
-                    return std::make_shared<AggregatingInOrderTransform>(header, transform_params, group_by_sort_description, max_block_size, many_data, counter++);
+                    /// We want to merge aggregated data in batches of size
+                    /// not greater than 'aggregation_in_order_max_block_bytes'.
+                    /// So, we reduce 'max_bytes' value for aggregation in 'merge_threads' times.
+                    return std::make_shared<AggregatingInOrderTransform>(
+                        header, transform_params, group_by_sort_description,
+                        max_block_size, aggregation_in_order_max_block_bytes / merge_threads,
+                        many_data, counter++);
                 });
 
                 aggregating_in_order = collector.detachProcessors(0);
 
-                for (auto & column_description : group_by_sort_description)
-                {
-                    if (!column_description.column_name.empty())
-                    {
-                        column_description.column_number = pipeline.getHeader().getPositionByName(column_description.column_name);
-                        column_description.column_name.clear();
-                    }
-                }
-
                 auto transform = std::make_shared<FinishAggregatingInOrderTransform>(
                     pipeline.getHeader(),
                     pipeline.getNumStreams(),
                     transform_params,
                     group_by_sort_description,
-                    max_block_size);
+                    max_block_size,
+                    aggregation_in_order_max_block_bytes);
 
                 pipeline.addTransform(std::move(transform));
+
+                /// Do merge of aggregated data in parallel.
+                pipeline.resize(merge_threads);
+
+                pipeline.addSimpleTransform([&](const Block &)
+                {
+                    return std::make_shared<MergingAggregatedBucketTransform>(transform_params);
+                });
+
                 aggregating_sorted = collector.detachProcessors(1);
             }
             else
             {
                 pipeline.addSimpleTransform([&](const Block & header)
                 {
-                    return std::make_shared<AggregatingInOrderTransform>(header, transform_params, group_by_sort_description, max_block_size);
+                    return std::make_shared<AggregatingInOrderTransform>(
+                        header, transform_params, group_by_sort_description,
+                        max_block_size, aggregation_in_order_max_block_bytes);
+                });
+
+                pipeline.addSimpleTransform([&](const Block & header)
+                {
+                    return std::make_shared<FinalizeAggregatedTransform>(header, transform_params);
                 });
 
                 aggregating_in_order = collector.detachProcessors(0);
             }
 
-            pipeline.addSimpleTransform([&](const Block & header)
-            {
-                return std::make_shared<FinalizingSimpleTransform>(header, transform_params);
-            });
-
             finalizing = collector.detachProcessors(2);
             return;
         }
diff --git a/src/Processors/QueryPlan/AggregatingStep.h b/src/Processors/QueryPlan/AggregatingStep.h
index 696aabd4de7..154ff0abc0a 100644
--- a/src/Processors/QueryPlan/AggregatingStep.h
+++ b/src/Processors/QueryPlan/AggregatingStep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Interpreters/Aggregator.h>
 
@@ -19,6 +19,7 @@ public:
         Aggregator::Params params_,
         bool final_,
         size_t max_block_size_,
+        size_t aggregation_in_order_max_block_bytes_,
         size_t merge_threads_,
         size_t temporary_data_merge_threads_,
         bool storage_has_evenly_distributed_read_,
@@ -27,7 +28,7 @@ public:
 
     String getName() const override { return "Aggregating"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
 
@@ -40,6 +41,7 @@ private:
     Aggregator::Params params;
     bool final;
     size_t max_block_size;
+    size_t aggregation_in_order_max_block_bytes;
     size_t merge_threads;
     size_t temporary_data_merge_threads;
 
@@ -57,4 +59,3 @@ private:
 };
 
 }
-
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.cpp b/src/Processors/QueryPlan/ArrayJoinStep.cpp
index fa9ea298319..3ca5b9109e6 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.cpp
+++ b/src/Processors/QueryPlan/ArrayJoinStep.cpp
@@ -1,7 +1,7 @@
 #include <Processors/QueryPlan/ArrayJoinStep.h>
 #include <Processors/Transforms/ArrayJoinTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Interpreters/ArrayJoinAction.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
@@ -46,11 +46,11 @@ void ArrayJoinStep::updateInputStream(DataStream input_stream, Block result_head
     res_header = std::move(result_header);
 }
 
-void ArrayJoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
+void ArrayJoinStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type)
     {
-        bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
+        bool on_totals = stream_type == QueryPipelineBuilder::StreamType::Totals;
         return std::make_shared<ArrayJoinTransform>(header, array_join, on_totals);
     });
 
diff --git a/src/Processors/QueryPlan/ArrayJoinStep.h b/src/Processors/QueryPlan/ArrayJoinStep.h
index b3e08c2023c..83df4d021e8 100644
--- a/src/Processors/QueryPlan/ArrayJoinStep.h
+++ b/src/Processors/QueryPlan/ArrayJoinStep.h
@@ -13,7 +13,7 @@ public:
     explicit ArrayJoinStep(const DataStream & input_stream_, ArrayJoinActionPtr array_join_);
     String getName() const override { return "ArrayJoin"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 811e5885219..45c3719ebca 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -1,5 +1,6 @@
 #include <Processors/QueryPlan/CreatingSetsStep.h>
-#include <Processors/QueryPipeline.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/CreatingSetsTransform.h>
 #include <IO/Operators.h>
 #include <Interpreters/ExpressionActions.h>
@@ -43,7 +44,7 @@ CreatingSetStep::CreatingSetStep(
 {
 }
 
-void CreatingSetStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void CreatingSetStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.addCreatingSetsTransform(getOutputStream().header, std::move(subquery_for_set), network_transfer_limits, getContext());
 }
@@ -84,7 +85,7 @@ CreatingSetsStep::CreatingSetsStep(DataStreams input_streams_)
                             input_streams[i].header.dumpStructure());
 }
 
-QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
+QueryPipelineBuilderPtr CreatingSetsStep::updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &)
 {
     if (pipelines.empty())
         throw Exception("CreatingSetsStep cannot be created with no inputs", ErrorCodes::LOGICAL_ERROR);
@@ -95,11 +96,11 @@ QueryPipelinePtr CreatingSetsStep::updatePipeline(QueryPipelines pipelines, cons
 
     pipelines.erase(pipelines.begin());
 
-    QueryPipeline delayed_pipeline;
+    QueryPipelineBuilder delayed_pipeline;
     if (pipelines.size() > 1)
     {
         QueryPipelineProcessorsCollector collector(delayed_pipeline, this);
-        delayed_pipeline = QueryPipeline::unitePipelines(std::move(pipelines));
+        delayed_pipeline = QueryPipelineBuilder::unitePipelines(std::move(pipelines));
         processors = collector.detachProcessors();
     }
     else
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index fa6d34ef667..e20c28e10f4 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Interpreters/SubqueryForSet.h>
 #include <Interpreters/Context_fwd.h>
 
@@ -21,7 +21,7 @@ public:
 
     String getName() const override { return "CreatingSet"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
@@ -39,7 +39,7 @@ public:
 
     String getName() const override { return "CreatingSets"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 1a3016b7106..23c5115ec68 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/CubeStep.h>
 #include <Processors/Transforms/CubeTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -30,13 +30,13 @@ CubeStep::CubeStep(const DataStream & input_stream_, AggregatingTransformParamsP
         output_stream->distinct_columns.insert(params->params.src_header.getByPosition(key).name);
 }
 
-void CubeStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void CubeStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.resize(1);
 
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
-        if (stream_type == QueryPipeline::StreamType::Totals)
+        if (stream_type == QueryPipelineBuilder::StreamType::Totals)
             return nullptr;
 
         return std::make_shared<CubeTransform>(header, std::move(params));
diff --git a/src/Processors/QueryPlan/CubeStep.h b/src/Processors/QueryPlan/CubeStep.h
index 0e06ffc598a..1079bed5398 100644
--- a/src/Processors/QueryPlan/CubeStep.h
+++ b/src/Processors/QueryPlan/CubeStep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Interpreters/Aggregator.h>
 
 namespace DB
@@ -17,7 +17,7 @@ public:
 
     String getName() const override { return "Cube"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     const Aggregator::Params & getParams() const;
 private:
diff --git a/src/Processors/QueryPlan/DistinctStep.cpp b/src/Processors/QueryPlan/DistinctStep.cpp
index 5edd2f52f47..5aeb33fdc7b 100644
--- a/src/Processors/QueryPlan/DistinctStep.cpp
+++ b/src/Processors/QueryPlan/DistinctStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/DistinctStep.h>
 #include <Processors/Transforms/DistinctTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
 
@@ -63,7 +63,7 @@ DistinctStep::DistinctStep(
     }
 }
 
-void DistinctStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void DistinctStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     if (checkColumnsAlreadyDistinct(columns, input_streams.front().distinct_columns))
         return;
@@ -71,9 +71,9 @@ void DistinctStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryP
     if (!pre_distinct)
         pipeline.resize(1);
 
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
-        if (stream_type != QueryPipeline::StreamType::Main)
+        if (stream_type != QueryPipelineBuilder::StreamType::Main)
             return nullptr;
 
         return std::make_shared<DistinctTransform>(header, set_size_limits, limit_hint, columns);
diff --git a/src/Processors/QueryPlan/DistinctStep.h b/src/Processors/QueryPlan/DistinctStep.h
index 815601d6253..a48a779425d 100644
--- a/src/Processors/QueryPlan/DistinctStep.h
+++ b/src/Processors/QueryPlan/DistinctStep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "Distinct"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/ExpressionStep.cpp b/src/Processors/QueryPlan/ExpressionStep.cpp
index 656dcd46fe9..33d2ad6e1cf 100644
--- a/src/Processors/QueryPlan/ExpressionStep.cpp
+++ b/src/Processors/QueryPlan/ExpressionStep.cpp
@@ -1,10 +1,9 @@
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Interpreters/JoinSwitcher.h>
 
 #include <Common/JSONBuilder.h>
@@ -52,7 +51,7 @@ void ExpressionStep::updateInputStream(DataStream input_stream, bool keep_header
     input_streams.emplace_back(std::move(input_stream));
 }
 
-void ExpressionStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
+void ExpressionStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
     auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
 
diff --git a/src/Processors/QueryPlan/ExpressionStep.h b/src/Processors/QueryPlan/ExpressionStep.h
index 43272e19536..94c2ba21bc1 100644
--- a/src/Processors/QueryPlan/ExpressionStep.h
+++ b/src/Processors/QueryPlan/ExpressionStep.h
@@ -18,7 +18,7 @@ public:
     explicit ExpressionStep(const DataStream & input_stream_, ActionsDAGPtr actions_dag_);
     String getName() const override { return "Expression"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void updateInputStream(DataStream input_stream, bool keep_header);
 
diff --git a/src/Processors/QueryPlan/ExtremesStep.cpp b/src/Processors/QueryPlan/ExtremesStep.cpp
index d3ec403f37e..4524b9883d6 100644
--- a/src/Processors/QueryPlan/ExtremesStep.cpp
+++ b/src/Processors/QueryPlan/ExtremesStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/ExtremesStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -25,7 +25,7 @@ ExtremesStep::ExtremesStep(const DataStream & input_stream_)
 {
 }
 
-void ExtremesStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void ExtremesStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.addExtremesTransform();
 }
diff --git a/src/Processors/QueryPlan/ExtremesStep.h b/src/Processors/QueryPlan/ExtremesStep.h
index 960b046b955..7898796306c 100644
--- a/src/Processors/QueryPlan/ExtremesStep.h
+++ b/src/Processors/QueryPlan/ExtremesStep.h
@@ -11,7 +11,7 @@ public:
 
     String getName() const override { return "Extremes"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 };
 
 }
diff --git a/src/Processors/QueryPlan/FillingStep.cpp b/src/Processors/QueryPlan/FillingStep.cpp
index ba3588efa72..223892aa528 100644
--- a/src/Processors/QueryPlan/FillingStep.cpp
+++ b/src/Processors/QueryPlan/FillingStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/FillingStep.h>
 #include <Processors/Transforms/FillingTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
 
@@ -36,11 +36,11 @@ FillingStep::FillingStep(const DataStream & input_stream_, SortDescription sort_
         throw Exception("FillingStep expects single input", ErrorCodes::LOGICAL_ERROR);
 }
 
-void FillingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void FillingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
-        bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
+        bool on_totals = stream_type == QueryPipelineBuilder::StreamType::Totals;
         return std::make_shared<FillingTransform>(header, sort_description, on_totals);
     });
 }
diff --git a/src/Processors/QueryPlan/FillingStep.h b/src/Processors/QueryPlan/FillingStep.h
index f4c6782e9df..6a5bca1890d 100644
--- a/src/Processors/QueryPlan/FillingStep.h
+++ b/src/Processors/QueryPlan/FillingStep.h
@@ -13,7 +13,7 @@ public:
 
     String getName() const override { return "Filling"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/FilterStep.cpp b/src/Processors/QueryPlan/FilterStep.cpp
index 15fd5c7b673..df75c37dc97 100644
--- a/src/Processors/QueryPlan/FilterStep.cpp
+++ b/src/Processors/QueryPlan/FilterStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/FilterStep.h>
 #include <Processors/Transforms/FilterTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
@@ -65,13 +65,13 @@ void FilterStep::updateInputStream(DataStream input_stream, bool keep_header)
     input_streams.emplace_back(std::move(input_stream));
 }
 
-void FilterStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
+void FilterStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
     auto expression = std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings());
 
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type)
     {
-        bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
+        bool on_totals = stream_type == QueryPipelineBuilder::StreamType::Totals;
         return std::make_shared<FilterTransform>(header, expression, filter_column_name, remove_filter_column, on_totals);
     });
 
diff --git a/src/Processors/QueryPlan/FilterStep.h b/src/Processors/QueryPlan/FilterStep.h
index d01d128a08c..7ac5bc036e0 100644
--- a/src/Processors/QueryPlan/FilterStep.h
+++ b/src/Processors/QueryPlan/FilterStep.h
@@ -18,7 +18,7 @@ public:
         bool remove_filter_column_);
 
     String getName() const override { return "Filter"; }
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void updateInputStream(DataStream input_stream, bool keep_header);
 
diff --git a/src/Processors/QueryPlan/FinishSortingStep.cpp b/src/Processors/QueryPlan/FinishSortingStep.cpp
deleted file mode 100644
index 718eeb96cd8..00000000000
--- a/src/Processors/QueryPlan/FinishSortingStep.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include <Processors/QueryPlan/FinishSortingStep.h>
-#include <Processors/Transforms/DistinctTransform.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Merges/MergingSortedTransform.h>
-#include <Processors/Transforms/PartialSortingTransform.h>
-#include <Processors/Transforms/FinishSortingTransform.h>
-#include <IO/Operators.h>
-#include <Common/JSONBuilder.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits(size_t limit)
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = true,
-            .preserves_number_of_streams = false,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = limit == 0,
-        }
-    };
-}
-
-FinishSortingStep::FinishSortingStep(
-    const DataStream & input_stream_,
-    SortDescription prefix_description_,
-    SortDescription result_description_,
-    size_t max_block_size_,
-    UInt64 limit_,
-    bool has_filtration_)
-    : ITransformingStep(input_stream_, input_stream_.header, getTraits(limit_))
-    , prefix_description(std::move(prefix_description_))
-    , result_description(std::move(result_description_))
-    , max_block_size(max_block_size_)
-    , limit(limit_)
-    , has_filtration(has_filtration_)
-{
-    /// TODO: check input_stream is sorted by prefix_description.
-    output_stream->sort_description = result_description;
-    output_stream->sort_mode = DataStream::SortMode::Stream;
-}
-
-void FinishSortingStep::updateLimit(size_t limit_)
-{
-    if (limit_ && (limit == 0 || limit_ < limit))
-    {
-        limit = limit_;
-        transform_traits.preserves_number_of_rows = false;
-    }
-}
-
-void FinishSortingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    bool need_finish_sorting = (prefix_description.size() < result_description.size());
-    if (pipeline.getNumStreams() > 1)
-    {
-        UInt64 limit_for_merging = (need_finish_sorting ? 0 : limit);
-        bool has_limit_below_one_block = !has_filtration && limit_for_merging && limit_for_merging < max_block_size;
-        auto transform = std::make_shared<MergingSortedTransform>(
-                pipeline.getHeader(),
-                pipeline.getNumStreams(),
-                prefix_description,
-                max_block_size,
-                limit_for_merging,
-                has_limit_below_one_block);
-
-        pipeline.addTransform(std::move(transform));
-    }
-
-    if (need_finish_sorting)
-    {
-        pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
-        {
-            if (stream_type != QueryPipeline::StreamType::Main)
-                return nullptr;
-
-            return std::make_shared<PartialSortingTransform>(header, result_description, limit);
-        });
-
-        /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
-        pipeline.addSimpleTransform([&](const Block & header) -> ProcessorPtr
-        {
-            return std::make_shared<FinishSortingTransform>(
-                header, prefix_description, result_description, max_block_size, limit);
-        });
-    }
-}
-
-void FinishSortingStep::describeActions(FormatSettings & settings) const
-{
-    String prefix(settings.offset, ' ');
-
-    settings.out << prefix << "Prefix sort description: ";
-    dumpSortDescription(prefix_description, input_streams.front().header, settings.out);
-    settings.out << '\n';
-
-    settings.out << prefix << "Result sort description: ";
-    dumpSortDescription(result_description, input_streams.front().header, settings.out);
-    settings.out << '\n';
-
-    if (limit)
-        settings.out << prefix << "Limit " << limit << '\n';
-}
-
-void FinishSortingStep::describeActions(JSONBuilder::JSONMap & map) const
-{
-    map.add("Prefix Sort Description", explainSortDescription(prefix_description, input_streams.front().header));
-    map.add("Result Sort Description", explainSortDescription(result_description, input_streams.front().header));
-
-    if (limit)
-        map.add("Limit", limit);
-}
-
-}
diff --git a/src/Processors/QueryPlan/FinishSortingStep.h b/src/Processors/QueryPlan/FinishSortingStep.h
deleted file mode 100644
index 5ea3a6d91b5..00000000000
--- a/src/Processors/QueryPlan/FinishSortingStep.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <Core/SortDescription.h>
-
-namespace DB
-{
-
-/// Finish sorting of pre-sorted data. See FinishSortingTransform.
-class FinishSortingStep : public ITransformingStep
-{
-public:
-    FinishSortingStep(
-        const DataStream & input_stream_,
-        SortDescription prefix_description_,
-        SortDescription result_description_,
-        size_t max_block_size_,
-        UInt64 limit_,
-        bool has_filtration_);
-
-    String getName() const override { return "FinishSorting"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-    void describeActions(JSONBuilder::JSONMap & map) const override;
-    void describeActions(FormatSettings & settings) const override;
-
-    /// Add limit or change it to lower value.
-    void updateLimit(size_t limit_);
-
-private:
-    SortDescription prefix_description;
-    SortDescription result_description;
-    size_t max_block_size;
-    UInt64 limit;
-    bool has_filtration;
-};
-
-}
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index 9ff2b22e5b8..17bf6a4054e 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -8,9 +8,9 @@ namespace JSONBuilder { class JSONMap; }
 namespace DB
 {
 
-class QueryPipeline;
-using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
-using QueryPipelines = std::vector<QueryPipelinePtr>;
+class QueryPipelineBuilder;
+using QueryPipelineBuilderPtr = std::unique_ptr<QueryPipelineBuilder>;
+using QueryPipelineBuilders = std::vector<QueryPipelineBuilderPtr>;
 
 class IProcessor;
 using ProcessorPtr = std::shared_ptr<IProcessor>;
@@ -80,7 +80,7 @@ public:
     ///   * header from each pipeline is the same as header from corresponding input_streams
     /// Result pipeline must contain any number of streams with compatible output header is hasOutputStream(),
     ///   or pipeline should be completed otherwise.
-    virtual QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) = 0;
+    virtual QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & settings) = 0;
 
     const DataStreams & getInputStreams() const { return input_streams; }
 
diff --git a/src/Processors/QueryPlan/ISourceStep.cpp b/src/Processors/QueryPlan/ISourceStep.cpp
index ec82e42fa34..0644d9b44eb 100644
--- a/src/Processors/QueryPlan/ISourceStep.cpp
+++ b/src/Processors/QueryPlan/ISourceStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/ISourceStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -9,9 +9,9 @@ ISourceStep::ISourceStep(DataStream output_stream_)
     output_stream = std::move(output_stream_);
 }
 
-QueryPipelinePtr ISourceStep::updatePipeline(QueryPipelines, const BuildQueryPipelineSettings & settings)
+QueryPipelineBuilderPtr ISourceStep::updatePipeline(QueryPipelineBuilders, const BuildQueryPipelineSettings & settings)
 {
-    auto pipeline = std::make_unique<QueryPipeline>();
+    auto pipeline = std::make_unique<QueryPipelineBuilder>();
     QueryPipelineProcessorsCollector collector(*pipeline, this);
     initializePipeline(*pipeline, settings);
     auto added_processors = collector.detachProcessors();
diff --git a/src/Processors/QueryPlan/ISourceStep.h b/src/Processors/QueryPlan/ISourceStep.h
index fbef0fcce38..08c939b626d 100644
--- a/src/Processors/QueryPlan/ISourceStep.h
+++ b/src/Processors/QueryPlan/ISourceStep.h
@@ -10,9 +10,9 @@ class ISourceStep : public IQueryPlanStep
 public:
     explicit ISourceStep(DataStream output_stream_);
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) override;
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & settings) override;
 
-    virtual void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) = 0;
+    virtual void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) = 0;
 
     void describePipeline(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/ITransformingStep.cpp b/src/Processors/QueryPlan/ITransformingStep.cpp
index e71afd94c46..629fb89be1e 100644
--- a/src/Processors/QueryPlan/ITransformingStep.cpp
+++ b/src/Processors/QueryPlan/ITransformingStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -36,7 +36,7 @@ DataStream ITransformingStep::createOutputStream(
 }
 
 
-QueryPipelinePtr ITransformingStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings)
+QueryPipelineBuilderPtr ITransformingStep::updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & settings)
 {
     if (collect_processors)
     {
diff --git a/src/Processors/QueryPlan/ITransformingStep.h b/src/Processors/QueryPlan/ITransformingStep.h
index 9abe025729d..d87ca05d4bc 100644
--- a/src/Processors/QueryPlan/ITransformingStep.h
+++ b/src/Processors/QueryPlan/ITransformingStep.h
@@ -48,9 +48,9 @@ public:
 
     ITransformingStep(DataStream input_stream, Block output_header, Traits traits, bool collect_processors_ = true);
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings & settings) override;
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & settings) override;
 
-    virtual void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) = 0;
+    virtual void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) = 0;
 
     const TransformTraits & getTransformTraits() const { return transform_traits; }
     const DataStreamTraits & getDataStreamTraits() const { return data_stream_traits; }
diff --git a/src/Processors/QueryPlan/IntersectOrExceptStep.cpp b/src/Processors/QueryPlan/IntersectOrExceptStep.cpp
new file mode 100644
index 00000000000..c031303cc7f
--- /dev/null
+++ b/src/Processors/QueryPlan/IntersectOrExceptStep.cpp
@@ -0,0 +1,87 @@
+#include <Processors/QueryPlan/IntersectOrExceptStep.h>
+
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Sources/NullSource.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/IntersectOrExceptTransform.h>
+#include <Processors/ResizeProcessor.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+static Block checkHeaders(const DataStreams & input_streams_)
+{
+    if (input_streams_.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot perform intersect/except on empty set of query plan steps");
+
+    Block res = input_streams_.front().header;
+    for (const auto & stream : input_streams_)
+        assertBlocksHaveEqualStructure(stream.header, res, "IntersectOrExceptStep");
+
+    return res;
+}
+
+IntersectOrExceptStep::IntersectOrExceptStep(
+    DataStreams input_streams_ , Operator operator_ , size_t max_threads_)
+    : header(checkHeaders(input_streams_))
+    , current_operator(operator_)
+    , max_threads(max_threads_)
+{
+    input_streams = std::move(input_streams_);
+    output_stream = DataStream{.header = header};
+}
+
+QueryPipelineBuilderPtr IntersectOrExceptStep::updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &)
+{
+    auto pipeline = std::make_unique<QueryPipelineBuilder>();
+    QueryPipelineProcessorsCollector collector(*pipeline, this);
+
+    if (pipelines.empty())
+    {
+        pipeline->init(Pipe(std::make_shared<NullSource>(output_stream->header)));
+        processors = collector.detachProcessors();
+        return pipeline;
+    }
+
+    for (auto & cur_pipeline : pipelines)
+    {
+        /// Just in case.
+        if (!isCompatibleHeader(cur_pipeline->getHeader(), getOutputStream().header))
+        {
+            auto converting_dag = ActionsDAG::makeConvertingActions(
+                cur_pipeline->getHeader().getColumnsWithTypeAndName(),
+                getOutputStream().header.getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name);
+
+            auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
+            cur_pipeline->addSimpleTransform([&](const Block & cur_header)
+            {
+                return std::make_shared<ExpressionTransform>(cur_header, converting_actions);
+            });
+        }
+
+        /// For the case of union.
+        cur_pipeline->addTransform(std::make_shared<ResizeProcessor>(header, cur_pipeline->getNumStreams(), 1));
+    }
+
+    *pipeline = QueryPipelineBuilder::unitePipelines(std::move(pipelines), max_threads);
+    pipeline->addTransform(std::make_shared<IntersectOrExceptTransform>(header, current_operator));
+
+    processors = collector.detachProcessors();
+    return pipeline;
+}
+
+void IntersectOrExceptStep::describePipeline(FormatSettings & settings) const
+{
+    IQueryPlanStep::describePipeline(processors, settings);
+}
+
+}
diff --git a/src/Processors/QueryPlan/IntersectOrExceptStep.h b/src/Processors/QueryPlan/IntersectOrExceptStep.h
new file mode 100644
index 00000000000..b2738cb297f
--- /dev/null
+++ b/src/Processors/QueryPlan/IntersectOrExceptStep.h
@@ -0,0 +1,30 @@
+#pragma once
+#include <Processors/QueryPlan/IQueryPlanStep.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
+
+
+namespace DB
+{
+
+class IntersectOrExceptStep : public IQueryPlanStep
+{
+using Operator = ASTSelectIntersectExceptQuery::Operator;
+
+public:
+    /// max_threads is used to limit the number of threads for result pipeline.
+    IntersectOrExceptStep(DataStreams input_streams_, Operator operator_, size_t max_threads_ = 0);
+
+    String getName() const override { return "IntersectOrExcept"; }
+
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings & settings) override;
+
+    void describePipeline(FormatSettings & settings) const override;
+
+private:
+    Block header;
+    Operator current_operator;
+    size_t max_threads;
+    Processors processors;
+};
+
+}
diff --git a/src/Processors/QueryPlan/JoinStep.cpp b/src/Processors/QueryPlan/JoinStep.cpp
index 736d7eb37c1..494a2a6aa0e 100644
--- a/src/Processors/QueryPlan/JoinStep.cpp
+++ b/src/Processors/QueryPlan/JoinStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/JoinStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/IJoin.h>
 
@@ -26,12 +26,12 @@ JoinStep::JoinStep(
     };
 }
 
-QueryPipelinePtr JoinStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
+QueryPipelineBuilderPtr JoinStep::updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &)
 {
     if (pipelines.size() != 2)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "JoinStep expect two input steps");
 
-    return QueryPipeline::joinPipelines(std::move(pipelines[0]), std::move(pipelines[1]), join, max_block_size, &processors);
+    return QueryPipelineBuilder::joinPipelines(std::move(pipelines[0]), std::move(pipelines[1]), join, max_block_size, &processors);
 }
 
 void JoinStep::describePipeline(FormatSettings & settings) const
@@ -67,7 +67,7 @@ FilledJoinStep::FilledJoinStep(const DataStream & input_stream_, JoinPtr join_,
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FilledJoinStep expects Join to be filled");
 }
 
-void FilledJoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void FilledJoinStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     bool default_totals = false;
     if (!pipeline.hasTotals() && join->getTotals())
@@ -78,9 +78,9 @@ void FilledJoinStep::transformPipeline(QueryPipeline & pipeline, const BuildQuer
 
     auto finish_counter = std::make_shared<JoiningTransform::FinishCounter>(pipeline.getNumStreams());
 
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type)
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type)
     {
-        bool on_totals = stream_type == QueryPipeline::StreamType::Totals;
+        bool on_totals = stream_type == QueryPipelineBuilder::StreamType::Totals;
         auto counter = on_totals ? nullptr : finish_counter;
         return std::make_shared<JoiningTransform>(header, join, max_block_size, on_totals, default_totals, counter);
     });
diff --git a/src/Processors/QueryPlan/JoinStep.h b/src/Processors/QueryPlan/JoinStep.h
index 6430f7cbd59..71537f29a8e 100644
--- a/src/Processors/QueryPlan/JoinStep.h
+++ b/src/Processors/QueryPlan/JoinStep.h
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "Join"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
@@ -40,7 +40,7 @@ public:
     FilledJoinStep(const DataStream & input_stream_, JoinPtr join_, size_t max_block_size_);
 
     String getName() const override { return "FilledJoin"; }
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     JoinPtr join;
diff --git a/src/Processors/QueryPlan/LimitByStep.cpp b/src/Processors/QueryPlan/LimitByStep.cpp
index 8ded0784b41..39086e995fc 100644
--- a/src/Processors/QueryPlan/LimitByStep.cpp
+++ b/src/Processors/QueryPlan/LimitByStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/LimitByStep.h>
 #include <Processors/Transforms/LimitByTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
 
@@ -34,13 +34,13 @@ LimitByStep::LimitByStep(
 }
 
 
-void LimitByStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void LimitByStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.resize(1);
 
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
-        if (stream_type != QueryPipeline::StreamType::Main)
+        if (stream_type != QueryPipelineBuilder::StreamType::Main)
             return nullptr;
 
         return std::make_shared<LimitByTransform>(header, group_length, group_offset, columns);
diff --git a/src/Processors/QueryPlan/LimitByStep.h b/src/Processors/QueryPlan/LimitByStep.h
index 1b574cd02a1..eb91be8a814 100644
--- a/src/Processors/QueryPlan/LimitByStep.h
+++ b/src/Processors/QueryPlan/LimitByStep.h
@@ -14,7 +14,7 @@ public:
 
     String getName() const override { return "LimitBy"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/LimitStep.cpp b/src/Processors/QueryPlan/LimitStep.cpp
index 5f5a0bd0d64..aff7472e4aa 100644
--- a/src/Processors/QueryPlan/LimitStep.cpp
+++ b/src/Processors/QueryPlan/LimitStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/LimitStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/LimitTransform.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
@@ -40,10 +40,10 @@ void LimitStep::updateInputStream(DataStream input_stream)
 {
     input_streams.clear();
     input_streams.emplace_back(std::move(input_stream));
-    output_stream = createOutputStream(input_streams.front(), output_stream->header, getDataStreamTraits());
+    output_stream = createOutputStream(input_streams.front(), input_streams.front().header, getDataStreamTraits());
 }
 
-void LimitStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void LimitStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     auto transform = std::make_shared<LimitTransform>(
         pipeline.getHeader(), limit, offset, pipeline.getNumStreams(), always_read_till_end, with_ties, description);
diff --git a/src/Processors/QueryPlan/LimitStep.h b/src/Processors/QueryPlan/LimitStep.h
index 772ba0722a7..f5bceeb29c7 100644
--- a/src/Processors/QueryPlan/LimitStep.h
+++ b/src/Processors/QueryPlan/LimitStep.h
@@ -18,7 +18,7 @@ public:
 
     String getName() const override { return "Limit"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/MergeSortingStep.cpp b/src/Processors/QueryPlan/MergeSortingStep.cpp
deleted file mode 100644
index c9e141281f4..00000000000
--- a/src/Processors/QueryPlan/MergeSortingStep.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include <Processors/QueryPlan/MergeSortingStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/MergeSortingTransform.h>
-#include <IO/Operators.h>
-#include <Common/JSONBuilder.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits(size_t limit)
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = limit == 0,
-        }
-    };
-}
-
-MergeSortingStep::MergeSortingStep(
-    const DataStream & input_stream,
-    const SortDescription & description_,
-    size_t max_merged_block_size_,
-    UInt64 limit_,
-    size_t max_bytes_before_remerge_,
-    double remerge_lowered_memory_bytes_ratio_,
-    size_t max_bytes_before_external_sort_,
-    VolumePtr tmp_volume_,
-    size_t min_free_disk_space_)
-    : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
-    , description(description_)
-    , max_merged_block_size(max_merged_block_size_)
-    , limit(limit_)
-    , max_bytes_before_remerge(max_bytes_before_remerge_)
-    , remerge_lowered_memory_bytes_ratio(remerge_lowered_memory_bytes_ratio_)
-    , max_bytes_before_external_sort(max_bytes_before_external_sort_), tmp_volume(tmp_volume_)
-    , min_free_disk_space(min_free_disk_space_)
-{
-    /// TODO: check input_stream is partially sorted by the same description.
-    output_stream->sort_description = description;
-    output_stream->sort_mode = input_stream.has_single_port ? DataStream::SortMode::Stream
-                                                            : DataStream::SortMode::Port;
-}
-
-void MergeSortingStep::updateLimit(size_t limit_)
-{
-    if (limit_ && (limit == 0 || limit_ < limit))
-    {
-        limit = limit_;
-        transform_traits.preserves_number_of_rows = false;
-    }
-}
-
-void MergeSortingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
-    {
-        if (stream_type == QueryPipeline::StreamType::Totals)
-            return nullptr;
-
-        return std::make_shared<MergeSortingTransform>(
-                header, description, max_merged_block_size, limit,
-                max_bytes_before_remerge / pipeline.getNumStreams(),
-                remerge_lowered_memory_bytes_ratio,
-                max_bytes_before_external_sort,
-                tmp_volume,
-                min_free_disk_space);
-    });
-}
-
-void MergeSortingStep::describeActions(FormatSettings & settings) const
-{
-    String prefix(settings.offset, ' ');
-    settings.out << prefix << "Sort description: ";
-    dumpSortDescription(description, input_streams.front().header, settings.out);
-    settings.out << '\n';
-
-    if (limit)
-        settings.out << prefix << "Limit " << limit << '\n';
-}
-
-void MergeSortingStep::describeActions(JSONBuilder::JSONMap & map) const
-{
-    map.add("Sort Description", explainSortDescription(description, input_streams.front().header));
-
-    if (limit)
-        map.add("Limit", limit);
-}
-
-}
diff --git a/src/Processors/QueryPlan/MergeSortingStep.h b/src/Processors/QueryPlan/MergeSortingStep.h
deleted file mode 100644
index dcecdffd122..00000000000
--- a/src/Processors/QueryPlan/MergeSortingStep.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <Core/SortDescription.h>
-#include <DataStreams/SizeLimits.h>
-#include <Disks/IVolume.h>
-
-namespace DB
-{
-
-/// Sorts stream of data. See MergeSortingTransform.
-class MergeSortingStep : public ITransformingStep
-{
-public:
-    explicit MergeSortingStep(
-            const DataStream & input_stream,
-            const SortDescription & description_,
-            size_t max_merged_block_size_,
-            UInt64 limit_,
-            size_t max_bytes_before_remerge_,
-            double remerge_lowered_memory_bytes_ratio_,
-            size_t max_bytes_before_external_sort_,
-            VolumePtr tmp_volume_,
-            size_t min_free_disk_space_);
-
-    String getName() const override { return "MergeSorting"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-    void describeActions(JSONBuilder::JSONMap & map) const override;
-    void describeActions(FormatSettings & settings) const override;
-
-    /// Add limit or change it to lower value.
-    void updateLimit(size_t limit_);
-
-private:
-    SortDescription description;
-    size_t max_merged_block_size;
-    UInt64 limit;
-
-    size_t max_bytes_before_remerge;
-    double remerge_lowered_memory_bytes_ratio;
-    size_t max_bytes_before_external_sort;
-    VolumePtr tmp_volume;
-    size_t min_free_disk_space;
-};
-
-}
-
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.cpp b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
index 71efb37b363..8dfb9f9c923 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.cpp
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/MergingAggregatedStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <Processors/Transforms/MergingAggregatedTransform.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
@@ -40,7 +40,7 @@ MergingAggregatedStep::MergingAggregatedStep(
         output_stream->distinct_columns.insert(params->params.intermediate_header.getByPosition(key).name);
 }
 
-void MergingAggregatedStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void MergingAggregatedStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     if (!memory_efficient_aggregation)
     {
diff --git a/src/Processors/QueryPlan/MergingAggregatedStep.h b/src/Processors/QueryPlan/MergingAggregatedStep.h
index 2e94d536a8c..eeead41b5f9 100644
--- a/src/Processors/QueryPlan/MergingAggregatedStep.h
+++ b/src/Processors/QueryPlan/MergingAggregatedStep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
@@ -21,7 +21,7 @@ public:
 
     String getName() const override { return "MergingAggregated"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/MergingSortedStep.cpp b/src/Processors/QueryPlan/MergingSortedStep.cpp
deleted file mode 100644
index 7e866f4ccd2..00000000000
--- a/src/Processors/QueryPlan/MergingSortedStep.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include <Processors/QueryPlan/MergingSortedStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Merges/MergingSortedTransform.h>
-#include <IO/Operators.h>
-#include <Common/JSONBuilder.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits(size_t limit)
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = true,
-            .preserves_number_of_streams = false,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = limit == 0,
-        }
-    };
-}
-
-MergingSortedStep::MergingSortedStep(
-    const DataStream & input_stream,
-    SortDescription sort_description_,
-    size_t max_block_size_,
-    UInt64 limit_)
-    : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
-    , sort_description(std::move(sort_description_))
-    , max_block_size(max_block_size_)
-    , limit(limit_)
-{
-    /// TODO: check input_stream is partially sorted (each port) by the same description.
-    output_stream->sort_description = sort_description;
-    output_stream->sort_mode = DataStream::SortMode::Stream;
-}
-
-void MergingSortedStep::updateLimit(size_t limit_)
-{
-    if (limit_ && (limit == 0 || limit_ < limit))
-    {
-        limit = limit_;
-        transform_traits.preserves_number_of_rows = false;
-    }
-}
-
-void MergingSortedStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    /// If there are several streams, then we merge them into one
-    if (pipeline.getNumStreams() > 1)
-    {
-
-        auto transform = std::make_shared<MergingSortedTransform>(
-                pipeline.getHeader(),
-                pipeline.getNumStreams(),
-                sort_description,
-                max_block_size, limit);
-
-        pipeline.addTransform(std::move(transform));
-    }
-}
-
-void MergingSortedStep::describeActions(FormatSettings & settings) const
-{
-    String prefix(settings.offset, ' ');
-    settings.out << prefix << "Sort description: ";
-    dumpSortDescription(sort_description, input_streams.front().header, settings.out);
-    settings.out << '\n';
-
-    if (limit)
-        settings.out << prefix << "Limit " << limit << '\n';
-}
-
-void MergingSortedStep::describeActions(JSONBuilder::JSONMap & map) const
-{
-    map.add("Sort Description", explainSortDescription(sort_description, input_streams.front().header));
-
-    if (limit)
-        map.add("Limit", limit);
-}
-
-}
diff --git a/src/Processors/QueryPlan/MergingSortedStep.h b/src/Processors/QueryPlan/MergingSortedStep.h
deleted file mode 100644
index 4f82e3830d0..00000000000
--- a/src/Processors/QueryPlan/MergingSortedStep.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <Core/SortDescription.h>
-#include <DataStreams/SizeLimits.h>
-#include <Disks/IVolume.h>
-
-namespace DB
-{
-
-/// Merge streams of data into single sorted stream.
-class MergingSortedStep : public ITransformingStep
-{
-public:
-    explicit MergingSortedStep(
-        const DataStream & input_stream,
-        SortDescription sort_description_,
-        size_t max_block_size_,
-        UInt64 limit_ = 0);
-
-    String getName() const override { return "MergingSorted"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-    void describeActions(JSONBuilder::JSONMap & map) const override;
-    void describeActions(FormatSettings & settings) const override;
-
-    /// Add limit or change it to lower value.
-    void updateLimit(size_t limit_);
-
-private:
-    SortDescription sort_description;
-    size_t max_block_size;
-    UInt64 limit;
-};
-
-}
-
-
diff --git a/src/Processors/QueryPlan/OffsetStep.cpp b/src/Processors/QueryPlan/OffsetStep.cpp
index 34ddb687ddd..e0c70ba2f28 100644
--- a/src/Processors/QueryPlan/OffsetStep.cpp
+++ b/src/Processors/QueryPlan/OffsetStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/OffsetStep.h>
 #include <Processors/OffsetTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
 
@@ -29,7 +29,7 @@ OffsetStep::OffsetStep(const DataStream & input_stream_, size_t offset_)
 {
 }
 
-void OffsetStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void OffsetStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     auto transform = std::make_shared<OffsetTransform>(
             pipeline.getHeader(), offset, pipeline.getNumStreams());
diff --git a/src/Processors/QueryPlan/OffsetStep.h b/src/Processors/QueryPlan/OffsetStep.h
index a10fcc7baec..f16559bcfad 100644
--- a/src/Processors/QueryPlan/OffsetStep.h
+++ b/src/Processors/QueryPlan/OffsetStep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
@@ -13,7 +13,7 @@ public:
 
     String getName() const override { return "Offset"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index e1fac21d5c1..e81cec723a1 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -7,10 +7,7 @@
 #include <Processors/QueryPlan/ArrayJoinStep.h>
 #include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <Processors/QueryPlan/CubeStep.h>
-#include <Processors/QueryPlan/FinishSortingStep.h>
-#include <Processors/QueryPlan/MergeSortingStep.h>
-#include <Processors/QueryPlan/MergingSortedStep.h>
-#include <Processors/QueryPlan/PartialSortingStep.h>
+#include <Processors/QueryPlan/SortingStep.h>
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/QueryPlan/DistinctStep.h>
 #include <Processors/QueryPlan/UnionStep.h>
@@ -197,12 +194,13 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
         /// Push down is for left table only. We need to update JoinStep for push down into right.
         /// Only inner and left join are supported. Other types may generate default values for left table keys.
         /// So, if we push down a condition like `key != 0`, not all rows may be filtered.
-        if (table_join.kind() == ASTTableJoin::Kind::Inner || table_join.kind() == ASTTableJoin::Kind::Left)
+        if (table_join.oneDisjunct() && (table_join.kind() == ASTTableJoin::Kind::Inner || table_join.kind() == ASTTableJoin::Kind::Left))
         {
             const auto & left_header = join->getInputStreams().front().header;
             const auto & res_header = join->getOutputStream().header;
             Names allowed_keys;
-            for (const auto & name : table_join.keyNamesLeft())
+            const auto & key_names_left = table_join.getOnlyClause().key_names_left;
+            for (const auto & name : key_names_left)
             {
                 /// Skip key if it is renamed.
                 /// I don't know if it is possible. Just in case.
@@ -236,10 +234,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
     // {
     // }
 
-    if (typeid_cast<PartialSortingStep *>(child.get())
-        || typeid_cast<MergeSortingStep *>(child.get())
-        || typeid_cast<MergingSortedStep *>(child.get())
-        || typeid_cast<FinishSortingStep *>(child.get()))
+    if (typeid_cast<SortingStep *>(child.get()))
     {
         Names allowed_inputs = child->getOutputStream().header.getNames();
         if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_inputs))
diff --git a/src/Processors/QueryPlan/Optimizations/limitPushDown.cpp b/src/Processors/QueryPlan/Optimizations/limitPushDown.cpp
index 01af6a2bbde..eb65f49103b 100644
--- a/src/Processors/QueryPlan/Optimizations/limitPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/limitPushDown.cpp
@@ -2,10 +2,7 @@
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Processors/QueryPlan/LimitStep.h>
 #include <Processors/QueryPlan/TotalsHavingStep.h>
-#include <Processors/QueryPlan/MergingSortedStep.h>
-#include <Processors/QueryPlan/FinishSortingStep.h>
-#include <Processors/QueryPlan/MergeSortingStep.h>
-#include <Processors/QueryPlan/PartialSortingStep.h>
+#include <Processors/QueryPlan/SortingStep.h>
 #include <Common/typeid_cast.h>
 
 namespace DB::QueryPlanOptimizations
@@ -21,32 +18,15 @@ static bool tryUpdateLimitForSortingSteps(QueryPlan::Node * node, size_t limit)
     QueryPlan::Node * child = nullptr;
     bool updated = false;
 
-    if (auto * merging_sorted = typeid_cast<MergingSortedStep *>(step.get()))
+    if (auto * sorting = typeid_cast<SortingStep *>(step.get()))
     {
         /// TODO: remove LimitStep here.
-        merging_sorted->updateLimit(limit);
+        sorting->updateLimit(limit);
         updated = true;
         child = node->children.front();
     }
-    else if (auto * finish_sorting = typeid_cast<FinishSortingStep *>(step.get()))
-    {
-        /// TODO: remove LimitStep here.
-        finish_sorting->updateLimit(limit);
-        updated = true;
-    }
-    else if (auto * merge_sorting = typeid_cast<MergeSortingStep *>(step.get()))
-    {
-        merge_sorting->updateLimit(limit);
-        updated = true;
-        child = node->children.front();
-    }
-    else if (auto * partial_sorting = typeid_cast<PartialSortingStep *>(step.get()))
-    {
-        partial_sorting->updateLimit(limit);
-        updated = true;
-    }
 
-    /// We often have chain PartialSorting -> MergeSorting -> MergingSorted
+    /// In case we have several sorting steps.
     /// Try update limit for them also if possible.
     if (child)
         tryUpdateLimitForSortingSteps(child, limit);
diff --git a/src/Processors/QueryPlan/PartialSortingStep.cpp b/src/Processors/QueryPlan/PartialSortingStep.cpp
deleted file mode 100644
index d713a63028a..00000000000
--- a/src/Processors/QueryPlan/PartialSortingStep.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <Processors/QueryPlan/PartialSortingStep.h>
-#include <Processors/QueryPipeline.h>
-#include <Processors/Transforms/PartialSortingTransform.h>
-#include <Processors/Transforms/LimitsCheckingTransform.h>
-#include <IO/Operators.h>
-#include <Common/JSONBuilder.h>
-
-namespace DB
-{
-
-static ITransformingStep::Traits getTraits(size_t limit)
-{
-    return ITransformingStep::Traits
-    {
-        {
-            .preserves_distinct_columns = true,
-            .returns_single_stream = false,
-            .preserves_number_of_streams = true,
-            .preserves_sorting = false,
-        },
-        {
-            .preserves_number_of_rows = limit == 0,
-        }
-    };
-}
-
-PartialSortingStep::PartialSortingStep(
-    const DataStream & input_stream,
-    SortDescription sort_description_,
-    UInt64 limit_,
-    SizeLimits size_limits_)
-    : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
-    , sort_description(std::move(sort_description_))
-    , limit(limit_)
-    , size_limits(size_limits_)
-{
-    output_stream->sort_description = sort_description;
-    output_stream->sort_mode = DataStream::SortMode::Chunk;
-}
-
-void PartialSortingStep::updateLimit(size_t limit_)
-{
-    if (limit_ && (limit == 0 || limit_ < limit))
-    {
-        limit = limit_;
-        transform_traits.preserves_number_of_rows = false;
-    }
-}
-
-void PartialSortingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
-{
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
-    {
-        if (stream_type != QueryPipeline::StreamType::Main)
-            return nullptr;
-
-        return std::make_shared<PartialSortingTransform>(header, sort_description, limit);
-    });
-
-    StreamLocalLimits limits;
-    limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
-    limits.size_limits = size_limits;
-
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
-    {
-        if (stream_type != QueryPipeline::StreamType::Main)
-            return nullptr;
-
-        auto transform = std::make_shared<LimitsCheckingTransform>(header, limits);
-        return transform;
-    });
-}
-
-void PartialSortingStep::describeActions(FormatSettings & settings) const
-{
-    String prefix(settings.offset, ' ');
-    settings.out << prefix << "Sort description: ";
-    dumpSortDescription(sort_description, input_streams.front().header, settings.out);
-    settings.out << '\n';
-
-    if (limit)
-        settings.out << prefix << "Limit " << limit << '\n';
-}
-
-void PartialSortingStep::describeActions(JSONBuilder::JSONMap & map) const
-{
-    map.add("Sort Description", explainSortDescription(sort_description, input_streams.front().header));
-
-    if (limit)
-        map.add("Limit", limit);
-}
-
-}
diff --git a/src/Processors/QueryPlan/PartialSortingStep.h b/src/Processors/QueryPlan/PartialSortingStep.h
deleted file mode 100644
index aeca42f7096..00000000000
--- a/src/Processors/QueryPlan/PartialSortingStep.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-#include <Processors/QueryPlan/ITransformingStep.h>
-#include <Core/SortDescription.h>
-#include <DataStreams/SizeLimits.h>
-
-namespace DB
-{
-
-/// Sort separate chunks of data.
-class PartialSortingStep : public ITransformingStep
-{
-public:
-    explicit PartialSortingStep(
-            const DataStream & input_stream,
-            SortDescription sort_description_,
-            UInt64 limit_,
-            SizeLimits size_limits_);
-
-    String getName() const override { return "PartialSorting"; }
-
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
-
-    void describeActions(JSONBuilder::JSONMap & map) const override;
-    void describeActions(FormatSettings & settings) const override;
-
-    /// Add limit or change it to lower value.
-    void updateLimit(size_t limit_);
-
-private:
-    SortDescription sort_description;
-    UInt64 limit;
-    SizeLimits size_limits;
-};
-
-}
diff --git a/src/Processors/QueryPlan/QueryIdHolder.cpp b/src/Processors/QueryPlan/QueryIdHolder.cpp
index 87f6f892cd1..6ff238e017c 100644
--- a/src/Processors/QueryPlan/QueryIdHolder.cpp
+++ b/src/Processors/QueryPlan/QueryIdHolder.cpp
@@ -3,6 +3,7 @@
 
 namespace DB
 {
+
 QueryIdHolder::QueryIdHolder(const String & query_id_, const MergeTreeData & data_) : query_id(query_id_), data(data_)
 {
 }
diff --git a/src/Processors/QueryPlan/QueryIdHolder.h b/src/Processors/QueryPlan/QueryIdHolder.h
index ed8f9ec1d6b..1e1ee1af0a1 100644
--- a/src/Processors/QueryPlan/QueryIdHolder.h
+++ b/src/Processors/QueryPlan/QueryIdHolder.h
@@ -2,13 +2,16 @@
 
 #include <string>
 
+#include <boost/noncopyable.hpp>
+
 namespace DB
 {
+
 class MergeTreeData;
 
 /// Holds the current query id and do something meaningful in destructor.
 /// Currently it's used for cleaning query id in the MergeTreeData query set.
-struct QueryIdHolder
+struct QueryIdHolder : private boost::noncopyable
 {
     QueryIdHolder(const std::string & query_id_, const MergeTreeData & data_);
 
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index bc3b8458531..f319e562bfb 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <IO/WriteBuffer.h>
 #include <IO/Operators.h>
 #include <Interpreters/ActionsDAG.h>
@@ -134,7 +134,7 @@ void QueryPlan::addStep(QueryPlanStepPtr step)
                     " input expected", ErrorCodes::LOGICAL_ERROR);
 }
 
-QueryPipelinePtr QueryPlan::buildQueryPipeline(
+QueryPipelineBuilderPtr QueryPlan::buildQueryPipeline(
     const QueryPlanOptimizationSettings & optimization_settings,
     const BuildQueryPipelineSettings & build_pipeline_settings)
 {
@@ -144,10 +144,10 @@ QueryPipelinePtr QueryPlan::buildQueryPipeline(
     struct Frame
     {
         Node * node = {};
-        QueryPipelines pipelines = {};
+        QueryPipelineBuilders pipelines = {};
     };
 
-    QueryPipelinePtr last_pipeline;
+    QueryPipelineBuilderPtr last_pipeline;
 
     std::stack<Frame> stack;
     stack.push(Frame{.node = root});
@@ -193,10 +193,10 @@ Pipe QueryPlan::convertToPipe(
     if (isCompleted())
         throw Exception("Cannot convert completed QueryPlan to Pipe", ErrorCodes::LOGICAL_ERROR);
 
-    return QueryPipeline::getPipe(std::move(*buildQueryPipeline(optimization_settings, build_pipeline_settings)));
+    return QueryPipelineBuilder::getPipe(std::move(*buildQueryPipeline(optimization_settings, build_pipeline_settings)));
 }
 
-void QueryPlan::addInterpreterContext(std::shared_ptr<Context> context)
+void QueryPlan::addInterpreterContext(ContextPtr context)
 {
     interpreter_context.emplace_back(std::move(context));
 }
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index 95034d34c9c..4e342d746d1 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -17,8 +17,8 @@ class DataStream;
 class IQueryPlanStep;
 using QueryPlanStepPtr = std::unique_ptr<IQueryPlanStep>;
 
-class QueryPipeline;
-using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
+class QueryPipelineBuilder;
+using QueryPipelineBuilderPtr = std::unique_ptr<QueryPipelineBuilder>;
 
 class WriteBuffer;
 
@@ -56,7 +56,7 @@ public:
 
     void optimize(const QueryPlanOptimizationSettings & optimization_settings);
 
-    QueryPipelinePtr buildQueryPipeline(
+    QueryPipelineBuilderPtr buildQueryPipeline(
         const QueryPlanOptimizationSettings & optimization_settings,
         const BuildQueryPipelineSettings & build_pipeline_settings);
 
@@ -93,7 +93,7 @@ public:
     void setMaxThreads(size_t max_threads_) { max_threads = max_threads_; }
     size_t getMaxThreads() const { return max_threads; }
 
-    void addInterpreterContext(std::shared_ptr<Context> context);
+    void addInterpreterContext(ContextPtr context);
 
     /// Tree node. Step and it's children.
     struct Node
@@ -113,7 +113,7 @@ private:
 
     /// Those fields are passed to QueryPipeline.
     size_t max_threads = 0;
-    std::vector<std::shared_ptr<Context>> interpreter_context;
+    std::vector<ContextPtr> interpreter_context;
 };
 
 std::string debugExplainStep(const IQueryPlanStep & step);
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index f8c12449c7e..519de724f9e 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/ConcatProcessor.h>
 #include <Processors/Transforms/ReverseTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -9,6 +9,7 @@
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Merges/AggregatingSortedTransform.h>
 #include <Processors/Merges/CollapsingSortedTransform.h>
+#include <Processors/Merges/GraphiteRollupSortedTransform.h>
 #include <Processors/Merges/MergingSortedTransform.h>
 #include <Processors/Merges/ReplacingSortedTransform.h>
 #include <Processors/Merges/SummingSortedTransform.h>
@@ -21,7 +22,7 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/JSONBuilder.h>
 
 namespace ProfileEvents
@@ -40,26 +41,12 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-struct ReadFromMergeTree::AnalysisResult
-{
-    RangesInDataParts parts_with_ranges;
-    MergeTreeDataSelectSamplingData sampling;
-    IndexStats index_stats;
-    Names column_names_to_read;
-    ReadFromMergeTree::ReadType read_type = ReadFromMergeTree::ReadType::Default;
-    UInt64 selected_rows = 0;
-    UInt64 selected_marks = 0;
-    UInt64 selected_parts = 0;
-};
-
 static MergeTreeReaderSettings getMergeTreeReaderSettings(const ContextPtr & context)
 {
     const auto & settings = context->getSettingsRef();
-    return {
-        .min_bytes_to_use_direct_io = settings.min_bytes_to_use_direct_io,
-        .min_bytes_to_use_mmap_io = settings.min_bytes_to_use_mmap_io,
-        .mmap_cache = context->getMMappedFileCache(),
-        .max_read_buffer_size = settings.max_read_buffer_size,
+    return
+    {
+        .read_settings = context->getReadSettings(),
         .save_marks_in_cache = true,
         .checksum_on_read = settings.checksum_on_read,
     };
@@ -84,7 +71,8 @@ ReadFromMergeTree::ReadFromMergeTree(
     size_t num_streams_,
     bool sample_factor_column_queried_,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
-    Poco::Logger * log_)
+    Poco::Logger * log_,
+    MergeTreeDataSelectAnalysisResultPtr analyzed_result_ptr_)
     : ISourceStep(DataStream{.header = MergeTreeBaseSelectProcessor::transformHeader(
         metadata_snapshot_->getSampleBlockForColumns(real_column_names_, data_.getVirtuals(), data_.getStorageID()),
         getPrewhereInfo(query_info_),
@@ -108,6 +96,7 @@ ReadFromMergeTree::ReadFromMergeTree(
     , sample_factor_column_queried(sample_factor_column_queried_)
     , max_block_numbers_to_read(std::move(max_block_numbers_to_read_))
     , log(log_)
+    , analyzed_result_ptr(analyzed_result_ptr_)
 {
     if (sample_factor_column_queried)
     {
@@ -146,7 +135,6 @@ Pipe ReadFromMergeTree::readFromPool(
         data,
         metadata_snapshot,
         prewhere_info,
-        true,
         required_columns,
         backoff_settings,
         settings.preferred_block_size_bytes,
@@ -185,7 +173,7 @@ ProcessorPtr ReadFromMergeTree::createSource(
     return std::make_shared<TSource>(
             data, metadata_snapshot, part.data_part, max_block_size, preferred_block_size_bytes,
             preferred_max_column_in_block_size_bytes, required_columns, part.ranges, use_uncompressed_cache, prewhere_info,
-            actions_settings, true, reader_settings, virt_column_names, part.part_index_in_query, has_limit_below_one_block);
+            actions_settings, reader_settings, virt_column_names, part.part_index_in_query, has_limit_below_one_block);
 }
 
 Pipe ReadFromMergeTree::readInOrder(
@@ -497,8 +485,7 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
                         pipe.getHeader(),
                         pipe.numOutputPorts(),
                         sort_description,
-                        max_block_size,
-                        0, true);
+                        max_block_size);
 
                 pipe.addTransform(std::move(transform));
             }
@@ -519,38 +506,39 @@ static void addMergingFinal(
     const auto & header = pipe.getHeader();
     size_t num_outputs = pipe.numOutputPorts();
 
+    auto now = time(nullptr);
+
     auto get_merging_processor = [&]() -> MergingTransformPtr
     {
         switch (merging_params.mode)
         {
             case MergeTreeData::MergingParams::Ordinary:
-            {
                 return std::make_shared<MergingSortedTransform>(header, num_outputs,
-                           sort_description, max_block_size);
-            }
+                            sort_description, max_block_size);
 
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedTransform>(header, num_outputs,
-                           sort_description, merging_params.sign_column, true, max_block_size);
+                            sort_description, merging_params.sign_column, true, max_block_size);
 
             case MergeTreeData::MergingParams::Summing:
                 return std::make_shared<SummingSortedTransform>(header, num_outputs,
-                           sort_description, merging_params.columns_to_sum, partition_key_columns, max_block_size);
+                            sort_description, merging_params.columns_to_sum, partition_key_columns, max_block_size);
 
             case MergeTreeData::MergingParams::Aggregating:
                 return std::make_shared<AggregatingSortedTransform>(header, num_outputs,
-                           sort_description, max_block_size);
+                            sort_description, max_block_size);
 
             case MergeTreeData::MergingParams::Replacing:
                 return std::make_shared<ReplacingSortedTransform>(header, num_outputs,
-                           sort_description, merging_params.version_column, max_block_size);
+                            sort_description, merging_params.version_column, max_block_size);
 
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 return std::make_shared<VersionedCollapsingTransform>(header, num_outputs,
-                           sort_description, merging_params.sign_column, max_block_size);
+                            sort_description, merging_params.sign_column, max_block_size);
 
             case MergeTreeData::MergingParams::Graphite:
-                throw Exception("GraphiteMergeTree doesn't support FINAL", ErrorCodes::LOGICAL_ERROR);
+                return std::make_shared<GraphiteRollupSortedTransform>(header, num_outputs,
+                            sort_description, max_block_size, merging_params.graphite_params, now);
         }
 
         __builtin_unreachable();
@@ -661,7 +649,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
     /// If do_not_merge_across_partitions_select_final is true and num_streams > 1
     /// we will store lonely parts with level > 0 to use parallel select on them.
     std::vector<RangesInDataPart> lonely_parts;
-    size_t total_rows_in_lonely_parts = 0;
     size_t sum_marks_in_lonely_parts = 0;
 
     for (size_t range_index = 0; range_index < parts_to_merge_ranges.size() - 1; ++range_index)
@@ -679,7 +666,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
                 std::distance(parts_to_merge_ranges[range_index], parts_to_merge_ranges[range_index + 1]) == 1 &&
                 parts_to_merge_ranges[range_index]->data_part->info.level > 0)
             {
-                total_rows_in_lonely_parts += parts_to_merge_ranges[range_index]->getRowsCount();
                 sum_marks_in_lonely_parts += parts_to_merge_ranges[range_index]->getMarksCount();
                 lonely_parts.push_back(std::move(*parts_to_merge_ranges[range_index]));
                 continue;
@@ -779,7 +765,34 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
     return Pipe::unitePipes(std::move(partition_pipes));
 }
 
-ReadFromMergeTree::AnalysisResult ReadFromMergeTree::selectRangesToRead(MergeTreeData::DataPartsVector parts) const
+MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(MergeTreeData::DataPartsVector parts) const
+{
+    return selectRangesToRead(
+        std::move(parts),
+        metadata_snapshot_base,
+        metadata_snapshot,
+        query_info,
+        context,
+        requested_num_streams,
+        max_block_numbers_to_read,
+        data,
+        real_column_names,
+        sample_factor_column_queried,
+        log);
+}
+
+MergeTreeDataSelectAnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
+    MergeTreeData::DataPartsVector parts,
+    const StorageMetadataPtr & metadata_snapshot_base,
+    const StorageMetadataPtr & metadata_snapshot,
+    const SelectQueryInfo & query_info,
+    ContextPtr context,
+    unsigned num_streams,
+    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
+    const MergeTreeData & data,
+    const Names & real_column_names,
+    bool sample_factor_column_queried,
+    Poco::Logger * log)
 {
     AnalysisResult result;
     const auto & settings = context->getSettingsRef();
@@ -788,7 +801,7 @@ ReadFromMergeTree::AnalysisResult ReadFromMergeTree::selectRangesToRead(MergeTre
 
     auto part_values = MergeTreeDataSelectExecutor::filterPartsByVirtualColumns(data, parts, query_info.query, context);
     if (part_values && part_values->empty())
-        return result;
+        return std::make_shared<MergeTreeDataSelectAnalysisResult>(MergeTreeDataSelectAnalysisResult{.result = std::move(result)});
 
     result.column_names_to_read = real_column_names;
 
@@ -808,44 +821,66 @@ ReadFromMergeTree::AnalysisResult ReadFromMergeTree::selectRangesToRead(MergeTre
 
     if (settings.force_primary_key && key_condition.alwaysUnknownOrTrue())
     {
-        throw Exception(
-            ErrorCodes::INDEX_NOT_USED,
-            "Primary key ({}) is not used and setting 'force_primary_key' is set.",
-            fmt::join(primary_key_columns, ", "));
+        return std::make_shared<MergeTreeDataSelectAnalysisResult>(MergeTreeDataSelectAnalysisResult{
+            .result = std::make_exception_ptr(Exception(
+                ErrorCodes::INDEX_NOT_USED,
+                "Primary key ({}) is not used and setting 'force_primary_key' is set",
+                fmt::join(primary_key_columns, ", ")))});
     }
     LOG_DEBUG(log, "Key condition: {}", key_condition.toString());
 
     const auto & select = query_info.query->as<ASTSelectQuery &>();
 
-    MergeTreeDataSelectExecutor::filterPartsByPartition(
-        parts, part_values, metadata_snapshot_base, data, query_info, context,
-        max_block_numbers_to_read.get(), log, result.index_stats);
-
-    result.sampling = MergeTreeDataSelectExecutor::getSampling(
-        select, metadata_snapshot->getColumns().getAllPhysical(), parts, key_condition,
-        data, metadata_snapshot, context, sample_factor_column_queried, log);
-
-    if (result.sampling.read_nothing)
-        return result;
-
     size_t total_marks_pk = 0;
-    for (const auto & part : parts)
-        total_marks_pk += part->index_granularity.getMarksCountWithoutFinal();
+    size_t parts_before_pk = 0;
+    try
+    {
+        MergeTreeDataSelectExecutor::filterPartsByPartition(
+            parts,
+            part_values,
+            metadata_snapshot_base,
+            data,
+            query_info,
+            context,
+            max_block_numbers_to_read.get(),
+            log,
+            result.index_stats);
 
-    size_t parts_before_pk = parts.size();
+        result.sampling = MergeTreeDataSelectExecutor::getSampling(
+            select,
+            metadata_snapshot->getColumns().getAllPhysical(),
+            parts,
+            key_condition,
+            data,
+            metadata_snapshot,
+            context,
+            sample_factor_column_queried,
+            log);
 
-    result.parts_with_ranges = MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
-        std::move(parts),
-        metadata_snapshot,
-        query_info,
-        context,
-        key_condition,
-        reader_settings,
-        log,
-        requested_num_streams,
-        result.index_stats,
-        true /* use_skip_indexes */,
-        true /* check_limits */);
+        if (result.sampling.read_nothing)
+            return std::make_shared<MergeTreeDataSelectAnalysisResult>(MergeTreeDataSelectAnalysisResult{.result = std::move(result)});
+
+        for (const auto & part : parts)
+            total_marks_pk += part->index_granularity.getMarksCountWithoutFinal();
+        parts_before_pk = parts.size();
+
+        auto reader_settings = getMergeTreeReaderSettings(context);
+        result.parts_with_ranges = MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
+            std::move(parts),
+            metadata_snapshot,
+            query_info,
+            context,
+            key_condition,
+            reader_settings,
+            log,
+            num_streams,
+            result.index_stats,
+            context->getSettings().use_skip_indexes);
+    }
+    catch (...)
+    {
+        return std::make_shared<MergeTreeDataSelectAnalysisResult>(MergeTreeDataSelectAnalysisResult{.result = std::current_exception()});
+    }
 
     size_t sum_marks_pk = total_marks_pk;
     for (const auto & stat : result.index_stats)
@@ -862,23 +897,15 @@ ReadFromMergeTree::AnalysisResult ReadFromMergeTree::selectRangesToRead(MergeTre
         sum_marks += part.getMarksCount();
         sum_rows += part.getRowsCount();
     }
-    result.selected_parts = result.parts_with_ranges.size();
-    result.selected_marks = sum_marks;
-    result.selected_rows  = sum_rows;
-    LOG_DEBUG(
-        log,
-        "Selected {}/{} parts by partition key, {} parts by primary key, {}/{} marks by primary key, {} marks to read from {} ranges",
-        parts_before_pk,
-        total_parts,
-        result.parts_with_ranges.size(),
-        sum_marks_pk,
-        total_marks_pk,
-        sum_marks,
-        sum_ranges);
 
-    ProfileEvents::increment(ProfileEvents::SelectedParts, result.parts_with_ranges.size());
-    ProfileEvents::increment(ProfileEvents::SelectedRanges, sum_ranges);
-    ProfileEvents::increment(ProfileEvents::SelectedMarks, sum_marks);
+    result.total_parts = total_parts;
+    result.parts_before_pk = parts_before_pk;
+    result.selected_parts = result.parts_with_ranges.size();
+    result.selected_ranges = sum_ranges;
+    result.selected_marks = sum_marks;
+    result.selected_marks_pk = sum_marks_pk;
+    result.total_marks_pk = total_marks_pk;
+    result.selected_rows = sum_rows;
 
     const auto & input_order_info = query_info.input_order_info
         ? query_info.input_order_info
@@ -888,13 +915,37 @@ ReadFromMergeTree::AnalysisResult ReadFromMergeTree::selectRangesToRead(MergeTre
         result.read_type = (input_order_info->direction > 0) ? ReadType::InOrder
                                                              : ReadType::InReverseOrder;
 
-    return result;
+    return std::make_shared<MergeTreeDataSelectAnalysisResult>(MergeTreeDataSelectAnalysisResult{.result = std::move(result)});
 }
 
-void ReadFromMergeTree::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+ReadFromMergeTree::AnalysisResult ReadFromMergeTree::getAnalysisResult() const
 {
-    auto result = selectRangesToRead(prepared_parts);
-    auto query_id_holder = MergeTreeDataSelectExecutor::checkLimits(data, result.parts_with_ranges, context);
+    auto result_ptr = analyzed_result_ptr ? analyzed_result_ptr : selectRangesToRead(prepared_parts);
+    if (std::holds_alternative<std::exception_ptr>(result_ptr->result))
+        std::rethrow_exception(std::move(std::get<std::exception_ptr>(result_ptr->result)));
+
+    return std::get<ReadFromMergeTree::AnalysisResult>(result_ptr->result);
+}
+
+void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto result = getAnalysisResult();
+    LOG_DEBUG(
+        log,
+        "Selected {}/{} parts by partition key, {} parts by primary key, {}/{} marks by primary key, {} marks to read from {} ranges",
+        result.parts_before_pk,
+        result.total_parts,
+        result.selected_parts,
+        result.selected_marks_pk,
+        result.total_marks_pk,
+        result.selected_marks,
+        result.selected_ranges);
+
+    ProfileEvents::increment(ProfileEvents::SelectedParts, result.selected_parts);
+    ProfileEvents::increment(ProfileEvents::SelectedRanges, result.selected_ranges);
+    ProfileEvents::increment(ProfileEvents::SelectedMarks, result.selected_marks);
+
+    auto query_id_holder = MergeTreeDataSelectExecutor::checkLimits(data, result, context);
 
     if (result.parts_with_ranges.empty())
     {
@@ -992,17 +1043,14 @@ void ReadFromMergeTree::initializePipeline(QueryPipeline & pipeline, const Build
         });
     }
 
-    Block cur_header = result_projection ? result_projection->getResultColumns()
-                                         : pipe.getHeader();
+    Block cur_header = pipe.getHeader();
 
-    auto append_actions = [&result_projection, &cur_header](ActionsDAGPtr actions)
+    auto append_actions = [&result_projection](ActionsDAGPtr actions)
     {
         if (!result_projection)
             result_projection = std::move(actions);
         else
             result_projection = ActionsDAG::merge(std::move(*result_projection), std::move(*actions));
-
-        cur_header = result_projection->getResultColumns();
     };
 
     /// By the way, if a distributed query or query to a Merge table is made, then the `_sample_factor` column can have different values.
@@ -1017,6 +1065,9 @@ void ReadFromMergeTree::initializePipeline(QueryPipeline & pipeline, const Build
         append_actions(std::move(adding_column));
     }
 
+    if (result_projection)
+        cur_header = result_projection->updateHeader(cur_header);
+
     /// Extra columns may be returned (for example, if sampling is used).
     /// Convert pipe to step header structure.
     if (!isCompatibleHeader(cur_header, getOutputStream().header))
@@ -1084,7 +1135,7 @@ static const char * readTypeToString(ReadFromMergeTree::ReadType type)
 
 void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
 {
-    auto result = selectRangesToRead(prepared_parts);
+    auto result = getAnalysisResult();
     std::string prefix(format_settings.offset, format_settings.indent_char);
     format_settings.out << prefix << "ReadType: " << readTypeToString(result.read_type) << '\n';
 
@@ -1097,7 +1148,7 @@ void ReadFromMergeTree::describeActions(FormatSettings & format_settings) const
 
 void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
 {
-    auto result = selectRangesToRead(prepared_parts);
+    auto result = getAnalysisResult();
     map.add("Read Type", readTypeToString(result.read_type));
     if (!result.index_stats.empty())
     {
@@ -1108,7 +1159,7 @@ void ReadFromMergeTree::describeActions(JSONBuilder::JSONMap & map) const
 
 void ReadFromMergeTree::describeIndexes(FormatSettings & format_settings) const
 {
-    auto result = selectRangesToRead(prepared_parts);
+    auto result = getAnalysisResult();
     auto index_stats = std::move(result.index_stats);
 
     std::string prefix(format_settings.offset, format_settings.indent_char);
@@ -1160,7 +1211,7 @@ void ReadFromMergeTree::describeIndexes(FormatSettings & format_settings) const
 
 void ReadFromMergeTree::describeIndexes(JSONBuilder::JSONMap & map) const
 {
-    auto result = selectRangesToRead(prepared_parts);
+    auto result = getAnalysisResult();
     auto index_stats = std::move(result.index_stats);
 
     if (!index_stats.empty())
@@ -1215,4 +1266,20 @@ void ReadFromMergeTree::describeIndexes(JSONBuilder::JSONMap & map) const
     }
 }
 
+bool MergeTreeDataSelectAnalysisResult::error() const
+{
+    return std::holds_alternative<std::exception_ptr>(result);
+}
+
+size_t MergeTreeDataSelectAnalysisResult::marks() const
+{
+    if (std::holds_alternative<std::exception_ptr>(result))
+        std::rethrow_exception(std::move(std::get<std::exception_ptr>(result)));
+
+    const auto & index_stats = std::get<ReadFromMergeTree::AnalysisResult>(result).index_stats;
+    if (index_stats.empty())
+        return 0;
+    return index_stats.back().num_granules_after;
+}
+
 }
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index e83746c3ff0..46b62467ae0 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -9,6 +9,18 @@ using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
 
 class Pipe;
 
+struct MergeTreeDataSelectSamplingData
+{
+    bool use_sampling = false;
+    bool read_nothing = false;
+    Float64 used_sample_factor = 1.0;
+    std::shared_ptr<ASTFunction> filter_function;
+    ActionsDAGPtr filter_expression;
+};
+
+struct MergeTreeDataSelectAnalysisResult;
+using MergeTreeDataSelectAnalysisResultPtr = std::shared_ptr<MergeTreeDataSelectAnalysisResult>;
+
 /// This step is created to read from MergeTree* table.
 /// For now, it takes a list of parts and creates source from it.
 class ReadFromMergeTree final : public ISourceStep
@@ -54,6 +66,23 @@ public:
         InReverseOrder,
     };
 
+    struct AnalysisResult
+    {
+        RangesInDataParts parts_with_ranges;
+        MergeTreeDataSelectSamplingData sampling;
+        IndexStats index_stats;
+        Names column_names_to_read;
+        ReadFromMergeTree::ReadType read_type = ReadFromMergeTree::ReadType::Default;
+        UInt64 total_parts = 0;
+        UInt64 parts_before_pk = 0;
+        UInt64 selected_parts = 0;
+        UInt64 selected_ranges = 0;
+        UInt64 selected_marks = 0;
+        UInt64 selected_marks_pk = 0;
+        UInt64 total_marks_pk = 0;
+        UInt64 selected_rows = 0;
+    };
+
     ReadFromMergeTree(
         MergeTreeData::DataPartsVector parts_,
         Names real_column_names_,
@@ -67,12 +96,13 @@ public:
         size_t num_streams_,
         bool sample_factor_column_queried_,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
-        Poco::Logger * log_
+        Poco::Logger * log_,
+        MergeTreeDataSelectAnalysisResultPtr analyzed_result_ptr_
     );
 
     String getName() const override { return "ReadFromMergeTree"; }
 
-    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(FormatSettings & format_settings) const override;
     void describeIndexes(FormatSettings & format_settings) const override;
@@ -84,6 +114,20 @@ public:
     UInt64 getSelectedParts() const { return selected_parts; }
     UInt64 getSelectedRows() const { return selected_rows; }
     UInt64 getSelectedMarks() const { return selected_marks; }
+
+    static MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(
+        MergeTreeData::DataPartsVector parts,
+        const StorageMetadataPtr & metadata_snapshot_base,
+        const StorageMetadataPtr & metadata_snapshot,
+        const SelectQueryInfo & query_info,
+        ContextPtr context,
+        unsigned num_streams,
+        std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
+        const MergeTreeData & data,
+        const Names & real_column_names,
+        bool sample_factor_column_queried,
+        Poco::Logger * log);
+
 private:
     const MergeTreeReaderSettings reader_settings;
 
@@ -137,8 +181,17 @@ private:
         const Names & column_names,
         ActionsDAGPtr & out_projection);
 
-    struct AnalysisResult;
-    AnalysisResult selectRangesToRead(MergeTreeData::DataPartsVector parts) const;
+    MergeTreeDataSelectAnalysisResultPtr selectRangesToRead(MergeTreeData::DataPartsVector parts) const;
+    ReadFromMergeTree::AnalysisResult getAnalysisResult() const;
+    MergeTreeDataSelectAnalysisResultPtr analyzed_result_ptr;
+};
+
+struct MergeTreeDataSelectAnalysisResult
+{
+    std::variant<std::exception_ptr, ReadFromMergeTree::AnalysisResult> result;
+
+    bool error() const;
+    size_t marks() const;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
index 0d1a0fdc619..fc8136177cf 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -11,7 +11,7 @@ ReadFromPreparedSource::ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<const
 {
 }
 
-void ReadFromPreparedSource::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void ReadFromPreparedSource::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     for (const auto & processor : pipe.getProcessors())
         processors.emplace_back(processor);
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.h b/src/Processors/QueryPlan/ReadFromPreparedSource.h
index 0d4e9653806..bb6e814ad9f 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.h
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ISourceStep.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 namespace DB
 {
@@ -9,15 +9,15 @@ namespace DB
 class ReadFromPreparedSource : public ISourceStep
 {
 public:
-    explicit ReadFromPreparedSource(Pipe pipe_, std::shared_ptr<const Context> context_ = nullptr);
+    explicit ReadFromPreparedSource(Pipe pipe_, ContextPtr context_ = nullptr);
 
     String getName() const override { return "ReadFromPreparedSource"; }
 
-    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     Pipe pipe;
-    std::shared_ptr<const Context> context;
+    ContextPtr context;
 };
 
 class ReadFromStorageStep : public ReadFromPreparedSource
diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index 506ef795473..399e7d01839 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -1,7 +1,8 @@
 #include <Processors/QueryPlan/ReadFromRemote.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <DataStreams/RemoteQueryExecutor.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <Parsers/ASTSelectQuery.h>
 #include <Parsers/formatAST.h>
 #include <Processors/Sources/RemoteSource.h>
@@ -163,7 +164,7 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::IStreamFacto
         if (try_results.empty() || local_delay < max_remote_delay)
         {
             auto plan = createLocalPlan(query, header, context, stage, shard_num, shard_count);
-            return QueryPipeline::getPipe(std::move(*plan->buildQueryPipeline(
+            return QueryPipelineBuilder::getPipe(std::move(*plan->buildQueryPipeline(
                 QueryPlanOptimizationSettings::fromContext(context),
                 BuildQueryPipelineSettings::fromContext(context))));
         }
@@ -219,7 +220,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::IStreamFactory::
     addConvertingActions(pipes.back(), output_stream->header);
 }
 
-void ReadFromRemote::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void ReadFromRemote::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     Pipes pipes;
     for (const auto & shard : shards)
diff --git a/src/Processors/QueryPlan/ReadFromRemote.h b/src/Processors/QueryPlan/ReadFromRemote.h
index ba0060d5470..f963164dd3f 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.h
+++ b/src/Processors/QueryPlan/ReadFromRemote.h
@@ -34,7 +34,7 @@ public:
 
     String getName() const override { return "ReadFromRemote"; }
 
-    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     ClusterProxy::IStreamFactory::Shards shards;
diff --git a/src/Processors/QueryPlan/ReadNothingStep.cpp b/src/Processors/QueryPlan/ReadNothingStep.cpp
index c0c97e5d523..253f3a5b980 100644
--- a/src/Processors/QueryPlan/ReadNothingStep.cpp
+++ b/src/Processors/QueryPlan/ReadNothingStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/ReadNothingStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Sources/NullSource.h>
 
 namespace DB
@@ -10,7 +10,7 @@ ReadNothingStep::ReadNothingStep(Block output_header)
 {
 }
 
-void ReadNothingStep::initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void ReadNothingStep::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.init(Pipe(std::make_shared<NullSource>(getOutputStream().header)));
 }
diff --git a/src/Processors/QueryPlan/ReadNothingStep.h b/src/Processors/QueryPlan/ReadNothingStep.h
index 4c5b4adb7ce..dad554e3d15 100644
--- a/src/Processors/QueryPlan/ReadNothingStep.h
+++ b/src/Processors/QueryPlan/ReadNothingStep.h
@@ -12,7 +12,7 @@ public:
 
     String getName() const override { return "ReadNothing"; }
 
-    void initializePipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 };
 
 }
diff --git a/src/Processors/QueryPlan/RollupStep.cpp b/src/Processors/QueryPlan/RollupStep.cpp
index 45573b352d6..acaeb2bc9a7 100644
--- a/src/Processors/QueryPlan/RollupStep.cpp
+++ b/src/Processors/QueryPlan/RollupStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/RollupStep.h>
 #include <Processors/Transforms/RollupTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -30,13 +30,13 @@ RollupStep::RollupStep(const DataStream & input_stream_, AggregatingTransformPar
         output_stream->distinct_columns.insert(params->params.src_header.getByPosition(key).name);
 }
 
-void RollupStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void RollupStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     pipeline.resize(1);
 
-    pipeline.addSimpleTransform([&](const Block & header, QueryPipeline::StreamType stream_type) -> ProcessorPtr
+    pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
     {
-        if (stream_type == QueryPipeline::StreamType::Totals)
+        if (stream_type == QueryPipelineBuilder::StreamType::Totals)
             return nullptr;
 
         return std::make_shared<RollupTransform>(header, std::move(params));
diff --git a/src/Processors/QueryPlan/RollupStep.h b/src/Processors/QueryPlan/RollupStep.h
index 21faf539990..7cd71fecdc1 100644
--- a/src/Processors/QueryPlan/RollupStep.h
+++ b/src/Processors/QueryPlan/RollupStep.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/QueryPlan/ITransformingStep.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
@@ -16,7 +16,7 @@ public:
 
     String getName() const override { return "Rollup"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     AggregatingTransformParamsPtr params;
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
index 734e6db318d..4ca3d0ebf54 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.cpp
@@ -1,5 +1,5 @@
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/IStorage.h>
 
 namespace DB
@@ -39,7 +39,7 @@ SettingQuotaAndLimitsStep::SettingQuotaAndLimitsStep(
 {
 }
 
-void SettingQuotaAndLimitsStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void SettingQuotaAndLimitsStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     /// Table lock is stored inside pipeline here.
     pipeline.setLimits(limits);
diff --git a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
index 3c73c208b70..a8d1eef4b08 100644
--- a/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
+++ b/src/Processors/QueryPlan/SettingQuotaAndLimitsStep.h
@@ -3,7 +3,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Processors/QueryPlan/ITransformingStep.h>
 #include <Storages/TableLockHolder.h>
-#include <DataStreams/StreamLocalLimits.h>
+#include <QueryPipeline/StreamLocalLimits.h>
 
 namespace DB
 {
@@ -32,7 +32,7 @@ public:
 
     String getName() const override { return "SettingQuotaAndLimits"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
 private:
     ContextPtr context;
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
new file mode 100644
index 00000000000..32b314b1c50
--- /dev/null
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -0,0 +1,241 @@
+#include <Processors/QueryPlan/SortingStep.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Transforms/MergeSortingTransform.h>
+#include <Processors/Transforms/PartialSortingTransform.h>
+#include <Processors/Transforms/FinishSortingTransform.h>
+#include <Processors/Merges/MergingSortedTransform.h>
+#include <Processors/Transforms/LimitsCheckingTransform.h>
+#include <IO/Operators.h>
+#include <Common/JSONBuilder.h>
+
+namespace DB
+{
+
+static ITransformingStep::Traits getTraits(size_t limit)
+{
+    return ITransformingStep::Traits
+    {
+        {
+            .preserves_distinct_columns = true,
+            .returns_single_stream = true,
+            .preserves_number_of_streams = false,
+            .preserves_sorting = false,
+        },
+        {
+            .preserves_number_of_rows = limit == 0,
+        }
+    };
+}
+
+SortingStep::SortingStep(
+    const DataStream & input_stream,
+    const SortDescription & description_,
+    size_t max_block_size_,
+    UInt64 limit_,
+    SizeLimits size_limits_,
+    size_t max_bytes_before_remerge_,
+    double remerge_lowered_memory_bytes_ratio_,
+    size_t max_bytes_before_external_sort_,
+    VolumePtr tmp_volume_,
+    size_t min_free_disk_space_)
+    : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
+    , type(Type::Full)
+    , result_description(description_)
+    , max_block_size(max_block_size_)
+    , limit(limit_)
+    , size_limits(size_limits_)
+    , max_bytes_before_remerge(max_bytes_before_remerge_)
+    , remerge_lowered_memory_bytes_ratio(remerge_lowered_memory_bytes_ratio_)
+    , max_bytes_before_external_sort(max_bytes_before_external_sort_), tmp_volume(tmp_volume_)
+    , min_free_disk_space(min_free_disk_space_)
+{
+    /// TODO: check input_stream is partially sorted by the same description.
+    output_stream->sort_description = result_description;
+    output_stream->sort_mode = DataStream::SortMode::Stream;
+}
+
+SortingStep::SortingStep(
+    const DataStream & input_stream_,
+    SortDescription prefix_description_,
+    SortDescription result_description_,
+    size_t max_block_size_,
+    UInt64 limit_)
+    : ITransformingStep(input_stream_, input_stream_.header, getTraits(limit_))
+    , type(Type::FinishSorting)
+    , prefix_description(std::move(prefix_description_))
+    , result_description(std::move(result_description_))
+    , max_block_size(max_block_size_)
+    , limit(limit_)
+{
+    /// TODO: check input_stream is sorted by prefix_description.
+    output_stream->sort_description = result_description;
+    output_stream->sort_mode = DataStream::SortMode::Stream;
+}
+
+SortingStep::SortingStep(
+    const DataStream & input_stream,
+    SortDescription sort_description_,
+    size_t max_block_size_,
+    UInt64 limit_)
+    : ITransformingStep(input_stream, input_stream.header, getTraits(limit_))
+    , type(Type::MergingSorted)
+    , result_description(std::move(sort_description_))
+    , max_block_size(max_block_size_)
+    , limit(limit_)
+{
+    /// TODO: check input_stream is partially sorted (each port) by the same description.
+    output_stream->sort_description = result_description;
+    output_stream->sort_mode = DataStream::SortMode::Stream;
+}
+
+void SortingStep::updateLimit(size_t limit_)
+{
+    if (limit_ && (limit == 0 || limit_ < limit))
+    {
+        limit = limit_;
+        transform_traits.preserves_number_of_rows = false;
+    }
+}
+
+void SortingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    if (type == Type::FinishSorting)
+    {
+        bool need_finish_sorting = (prefix_description.size() < result_description.size());
+        if (pipeline.getNumStreams() > 1)
+        {
+            UInt64 limit_for_merging = (need_finish_sorting ? 0 : limit);
+            auto transform = std::make_shared<MergingSortedTransform>(
+                    pipeline.getHeader(),
+                    pipeline.getNumStreams(),
+                    prefix_description,
+                    max_block_size,
+                    limit_for_merging);
+
+            pipeline.addTransform(std::move(transform));
+        }
+
+        if (need_finish_sorting)
+        {
+            pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+            {
+                if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                    return nullptr;
+
+                return std::make_shared<PartialSortingTransform>(header, result_description, limit);
+            });
+
+            /// NOTE limits are not applied to the size of temporary sets in FinishSortingTransform
+            pipeline.addSimpleTransform([&](const Block & header) -> ProcessorPtr
+            {
+                return std::make_shared<FinishSortingTransform>(
+                    header, prefix_description, result_description, max_block_size, limit);
+            });
+        }
+    }
+    else if (type == Type::Full)
+    {
+        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+        {
+            if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                return nullptr;
+
+            return std::make_shared<PartialSortingTransform>(header, result_description, limit);
+        });
+
+        StreamLocalLimits limits;
+        limits.mode = LimitsMode::LIMITS_CURRENT; //-V1048
+        limits.size_limits = size_limits;
+
+        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+        {
+            if (stream_type != QueryPipelineBuilder::StreamType::Main)
+                return nullptr;
+
+            auto transform = std::make_shared<LimitsCheckingTransform>(header, limits);
+            return transform;
+        });
+
+        pipeline.addSimpleTransform([&](const Block & header, QueryPipelineBuilder::StreamType stream_type) -> ProcessorPtr
+        {
+            if (stream_type == QueryPipelineBuilder::StreamType::Totals)
+                return nullptr;
+
+            return std::make_shared<MergeSortingTransform>(
+                    header, result_description, max_block_size, limit,
+                    max_bytes_before_remerge / pipeline.getNumStreams(),
+                    remerge_lowered_memory_bytes_ratio,
+                    max_bytes_before_external_sort,
+                    tmp_volume,
+                    min_free_disk_space);
+        });
+
+        /// If there are several streams, then we merge them into one
+        if (pipeline.getNumStreams() > 1)
+        {
+
+            auto transform = std::make_shared<MergingSortedTransform>(
+                    pipeline.getHeader(),
+                    pipeline.getNumStreams(),
+                    result_description,
+                    max_block_size, limit);
+
+            pipeline.addTransform(std::move(transform));
+        }
+    }
+    else if (type == Type::MergingSorted)
+    {        /// If there are several streams, then we merge them into one
+        if (pipeline.getNumStreams() > 1)
+        {
+
+            auto transform = std::make_shared<MergingSortedTransform>(
+                    pipeline.getHeader(),
+                    pipeline.getNumStreams(),
+                    result_description,
+                    max_block_size, limit);
+
+            pipeline.addTransform(std::move(transform));
+        }
+    }
+}
+
+void SortingStep::describeActions(FormatSettings & settings) const
+{
+    String prefix(settings.offset, ' ');
+
+    if (!prefix_description.empty())
+    {
+        settings.out << prefix << "Prefix sort description: ";
+        dumpSortDescription(prefix_description, input_streams.front().header, settings.out);
+        settings.out << '\n';
+
+        settings.out << prefix << "Result sort description: ";
+        dumpSortDescription(result_description, input_streams.front().header, settings.out);
+        settings.out << '\n';
+    }
+    else
+    {
+        settings.out << prefix << "Sort description: ";
+        dumpSortDescription(result_description, input_streams.front().header, settings.out);
+        settings.out << '\n';
+    }
+
+    if (limit)
+        settings.out << prefix << "Limit " << limit << '\n';
+}
+
+void SortingStep::describeActions(JSONBuilder::JSONMap & map) const
+{
+    if (!prefix_description.empty())
+    {
+        map.add("Prefix Sort Description", explainSortDescription(prefix_description, input_streams.front().header));
+        map.add("Result Sort Description", explainSortDescription(result_description, input_streams.front().header));
+    }
+    else
+        map.add("Sort Description", explainSortDescription(result_description, input_streams.front().header));
+
+    if (limit)
+        map.add("Limit", limit);
+}
+
+}
diff --git a/src/Processors/QueryPlan/SortingStep.h b/src/Processors/QueryPlan/SortingStep.h
new file mode 100644
index 00000000000..8e253e71f44
--- /dev/null
+++ b/src/Processors/QueryPlan/SortingStep.h
@@ -0,0 +1,76 @@
+#pragma once
+#include <Processors/QueryPlan/ITransformingStep.h>
+#include <Core/SortDescription.h>
+#include <QueryPipeline/SizeLimits.h>
+#include <Disks/IVolume.h>
+
+namespace DB
+{
+
+/// Sort data stream
+class SortingStep : public ITransformingStep
+{
+public:
+    /// Full
+    SortingStep(
+        const DataStream & input_stream,
+        const SortDescription & description_,
+        size_t max_block_size_,
+        UInt64 limit_,
+        SizeLimits size_limits_,
+        size_t max_bytes_before_remerge_,
+        double remerge_lowered_memory_bytes_ratio_,
+        size_t max_bytes_before_external_sort_,
+        VolumePtr tmp_volume_,
+        size_t min_free_disk_space_);
+
+    /// FinishSorting
+    SortingStep(
+        const DataStream & input_stream_,
+        SortDescription prefix_description_,
+        SortDescription result_description_,
+        size_t max_block_size_,
+        UInt64 limit_);
+
+    /// MergingSorted
+    SortingStep(
+        const DataStream & input_stream,
+        SortDescription sort_description_,
+        size_t max_block_size_,
+        UInt64 limit_ = 0);
+
+    String getName() const override { return "Sorting"; }
+
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+
+    void describeActions(JSONBuilder::JSONMap & map) const override;
+    void describeActions(FormatSettings & settings) const override;
+
+    /// Add limit or change it to lower value.
+    void updateLimit(size_t limit_);
+
+private:
+
+    enum class Type
+    {
+        Full,
+        FinishSorting,
+        MergingSorted,
+    };
+
+    Type type;
+
+    SortDescription prefix_description;
+    SortDescription result_description;
+    size_t max_block_size;
+    UInt64 limit;
+    SizeLimits size_limits;
+
+    size_t max_bytes_before_remerge = 0;
+    double remerge_lowered_memory_bytes_ratio = 0;
+    size_t max_bytes_before_external_sort = 0;
+    VolumePtr tmp_volume;
+    size_t min_free_disk_space = 0;
+};
+
+}
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.cpp b/src/Processors/QueryPlan/TotalsHavingStep.cpp
index db82538d5a0..be2cd2348a4 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.cpp
+++ b/src/Processors/QueryPlan/TotalsHavingStep.cpp
@@ -1,6 +1,6 @@
 #include <Processors/QueryPlan/TotalsHavingStep.h>
 #include <Processors/Transforms/DistinctTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Transforms/TotalsHavingTransform.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
@@ -30,6 +30,7 @@ TotalsHavingStep::TotalsHavingStep(
     bool overflow_row_,
     const ActionsDAGPtr & actions_dag_,
     const std::string & filter_column_,
+    bool remove_filter_,
     TotalsMode totals_mode_,
     double auto_include_threshold_,
     bool final_)
@@ -38,18 +39,21 @@ TotalsHavingStep::TotalsHavingStep(
             TotalsHavingTransform::transformHeader(
                     input_stream_.header,
                     actions_dag_.get(),
+                    filter_column_,
+                    remove_filter_,
                     final_),
             getTraits(!filter_column_.empty()))
     , overflow_row(overflow_row_)
     , actions_dag(actions_dag_)
     , filter_column_name(filter_column_)
+    , remove_filter(remove_filter_)
     , totals_mode(totals_mode_)
     , auto_include_threshold(auto_include_threshold_)
     , final(final_)
 {
 }
 
-void TotalsHavingStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings)
+void TotalsHavingStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings)
 {
     auto expression_actions = actions_dag ? std::make_shared<ExpressionActions>(actions_dag, settings.getActionsSettings()) : nullptr;
 
@@ -58,6 +62,7 @@ void TotalsHavingStep::transformPipeline(QueryPipeline & pipeline, const BuildQu
         overflow_row,
         expression_actions,
         filter_column_name,
+        remove_filter,
         totals_mode,
         auto_include_threshold,
         final);
@@ -85,7 +90,10 @@ static String totalsModeToString(TotalsMode totals_mode, double auto_include_thr
 void TotalsHavingStep::describeActions(FormatSettings & settings) const
 {
     String prefix(settings.offset, ' ');
-    settings.out << prefix << "Filter column: " << filter_column_name << '\n';
+    settings.out << prefix << "Filter column: " << filter_column_name;
+    if (remove_filter)
+        settings.out << " (removed)";
+    settings.out << '\n';
     settings.out << prefix << "Mode: " << totalsModeToString(totals_mode, auto_include_threshold) << '\n';
 
     if (actions_dag)
diff --git a/src/Processors/QueryPlan/TotalsHavingStep.h b/src/Processors/QueryPlan/TotalsHavingStep.h
index bc053c96970..b51b332761d 100644
--- a/src/Processors/QueryPlan/TotalsHavingStep.h
+++ b/src/Processors/QueryPlan/TotalsHavingStep.h
@@ -18,13 +18,14 @@ public:
             bool overflow_row_,
             const ActionsDAGPtr & actions_dag_,
             const std::string & filter_column_,
+            bool remove_filter_,
             TotalsMode totals_mode_,
             double auto_include_threshold_,
             bool final_);
 
     String getName() const override { return "TotalsHaving"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings & settings) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
@@ -35,10 +36,10 @@ private:
     bool overflow_row;
     ActionsDAGPtr actions_dag;
     String filter_column_name;
+    bool remove_filter;
     TotalsMode totals_mode;
     double auto_include_threshold;
     bool final;
 };
 
 }
-
diff --git a/src/Processors/QueryPlan/UnionStep.cpp b/src/Processors/QueryPlan/UnionStep.cpp
index 418e9b4e2e7..5d40a9e241e 100644
--- a/src/Processors/QueryPlan/UnionStep.cpp
+++ b/src/Processors/QueryPlan/UnionStep.cpp
@@ -1,9 +1,9 @@
 #include <Processors/QueryPlan/UnionStep.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Interpreters/ExpressionActions.h>
-#include <common/defines.h>
+#include <base/defines.h>
 
 namespace DB
 {
@@ -37,9 +37,9 @@ UnionStep::UnionStep(DataStreams input_streams_, size_t max_threads_)
         output_stream = DataStream{.header = header};
 }
 
-QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &)
+QueryPipelineBuilderPtr UnionStep::updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &)
 {
-    auto pipeline = std::make_unique<QueryPipeline>();
+    auto pipeline = std::make_unique<QueryPipelineBuilder>();
     QueryPipelineProcessorsCollector collector(*pipeline, this);
 
     if (pipelines.empty())
@@ -71,7 +71,7 @@ QueryPipelinePtr UnionStep::updatePipeline(QueryPipelines pipelines, const Build
         }
     }
 
-    *pipeline = QueryPipeline::unitePipelines(std::move(pipelines), max_threads);
+    *pipeline = QueryPipelineBuilder::unitePipelines(std::move(pipelines), max_threads);
 
     processors = collector.detachProcessors();
     return pipeline;
diff --git a/src/Processors/QueryPlan/UnionStep.h b/src/Processors/QueryPlan/UnionStep.h
index 81bd033d045..c23223bc6fa 100644
--- a/src/Processors/QueryPlan/UnionStep.h
+++ b/src/Processors/QueryPlan/UnionStep.h
@@ -13,7 +13,7 @@ public:
 
     String getName() const override { return "Union"; }
 
-    QueryPipelinePtr updatePipeline(QueryPipelines pipelines, const BuildQueryPipelineSettings &) override;
+    QueryPipelineBuilderPtr updatePipeline(QueryPipelineBuilders pipelines, const BuildQueryPipelineSettings &) override;
 
     void describePipeline(FormatSettings & settings) const override;
 
diff --git a/src/Processors/QueryPlan/WindowStep.cpp b/src/Processors/QueryPlan/WindowStep.cpp
index 29f2999ec83..cd4bb5f6730 100644
--- a/src/Processors/QueryPlan/WindowStep.cpp
+++ b/src/Processors/QueryPlan/WindowStep.cpp
@@ -2,7 +2,7 @@
 
 #include <Processors/Transforms/WindowTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Interpreters/ExpressionActions.h>
 #include <IO/Operators.h>
 #include <Common/JSONBuilder.h>
@@ -63,7 +63,7 @@ WindowStep::WindowStep(const DataStream & input_stream_,
 
 }
 
-void WindowStep::transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &)
+void WindowStep::transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     // This resize is needed for cases such as `over ()` when we don't have a
     // sort node, and the input might have multiple streams. The sort node would
diff --git a/src/Processors/QueryPlan/WindowStep.h b/src/Processors/QueryPlan/WindowStep.h
index b5018b1d5a7..a65b157f481 100644
--- a/src/Processors/QueryPlan/WindowStep.h
+++ b/src/Processors/QueryPlan/WindowStep.h
@@ -20,7 +20,7 @@ public:
 
     String getName() const override { return "Window"; }
 
-    void transformPipeline(QueryPipeline & pipeline, const BuildQueryPipelineSettings &) override;
+    void transformPipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeActions(FormatSettings & settings) const override;
diff --git a/src/Processors/Sinks/RemoteSink.h b/src/Processors/Sinks/RemoteSink.h
new file mode 100644
index 00000000000..30cf958c072
--- /dev/null
+++ b/src/Processors/Sinks/RemoteSink.h
@@ -0,0 +1,27 @@
+#pragma once
+#include <Processors/Sinks/SinkToStorage.h>
+#include <QueryPipeline/RemoteInserter.h>
+
+namespace DB
+{
+
+class RemoteSink final : public RemoteInserter, public SinkToStorage
+{
+public:
+    explicit RemoteSink(
+        Connection & connection_,
+        const ConnectionTimeouts & timeouts,
+        const String & query_,
+        const Settings & settings_,
+        const ClientInfo & client_info_)
+      : RemoteInserter(connection_, timeouts, query_, settings_, client_info_)
+      , SinkToStorage(RemoteInserter::getHeader())
+    {
+    }
+
+    String getName() const override { return "RemoteSink"; }
+    void consume (Chunk chunk) override { write(RemoteInserter::getHeader().cloneWithColumns(chunk.detachColumns())); }
+    void onFinish() override { RemoteInserter::onFinish(); }
+};
+
+}
diff --git a/src/Processors/Sinks/SinkToStorage.cpp b/src/Processors/Sinks/SinkToStorage.cpp
new file mode 100644
index 00000000000..9ec0939f3a8
--- /dev/null
+++ b/src/Processors/Sinks/SinkToStorage.cpp
@@ -0,0 +1,23 @@
+#include <Processors/Sinks/SinkToStorage.h>
+#include <DataTypes/NestedUtils.h>
+
+namespace DB
+{
+
+SinkToStorage::SinkToStorage(const Block & header) : ExceptionKeepingTransform(header, header, false) {}
+
+void SinkToStorage::transform(Chunk & chunk)
+{
+    /** Throw an exception if the sizes of arrays - elements of nested data structures doesn't match.
+      * We have to make this assertion before writing to table, because storage engine may assume that they have equal sizes.
+      * NOTE It'd better to do this check in serialization of nested structures (in place when this assumption is required),
+      * but currently we don't have methods for serialization of nested structures "as a whole".
+      */
+    Nested::validateArraySizes(getHeader().cloneWithColumns(chunk.getColumns()));
+
+    consume(chunk.clone());
+    if (lastBlockIsDuplicate())
+        chunk.clear();
+}
+
+}
diff --git a/src/Processors/Sinks/SinkToStorage.h b/src/Processors/Sinks/SinkToStorage.h
index c57adef568f..76920777bdc 100644
--- a/src/Processors/Sinks/SinkToStorage.h
+++ b/src/Processors/Sinks/SinkToStorage.h
@@ -1,21 +1,27 @@
 #pragma once
-#include <Processors/ISink.h>
 #include <Storages/TableLockHolder.h>
+#include <Processors/Transforms/ExceptionKeepingTransform.h>
 
 namespace DB
 {
 
-/// Sink which is returned from Storage::read.
-/// The same as ISink, but also can hold table lock.
-class SinkToStorage : public ISink
+/// Sink which is returned from Storage::write.
+class SinkToStorage : public ExceptionKeepingTransform
 {
 public:
-    using ISink::ISink;
+    explicit SinkToStorage(const Block & header);
 
+    const Block & getHeader() const { return inputs.front().getHeader(); }
     void addTableLock(const TableLockHolder & lock) { table_locks.push_back(lock); }
 
+protected:
+    virtual void consume(Chunk chunk) = 0;
+    virtual bool lastBlockIsDuplicate() const { return false; }
+
 private:
     std::vector<TableLockHolder> table_locks;
+
+    void transform(Chunk & chunk) override;
 };
 
 using SinkToStoragePtr = std::shared_ptr<SinkToStorage>;
diff --git a/src/Processors/Sources/DelayedSource.h b/src/Processors/Sources/DelayedSource.h
index 7c2b104b61e..3d17c13ad4c 100644
--- a/src/Processors/Sources/DelayedSource.h
+++ b/src/Processors/Sources/DelayedSource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Processors/IProcessor.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 namespace DB
 {
diff --git a/src/Formats/MySQLBlockInputStream.cpp b/src/Processors/Sources/MySQLSource.cpp
similarity index 90%
rename from src/Formats/MySQLBlockInputStream.cpp
rename to src/Processors/Sources/MySQLSource.cpp
index 79ebeacfad5..8e9cdcfda48 100644
--- a/src/Formats/MySQLBlockInputStream.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_MYSQL
 #include <vector>
@@ -17,9 +15,9 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
-#include <common/logger_useful.h>
-#include "MySQLBlockInputStream.h"
+#include <base/range.h>
+#include <base/logger_useful.h>
+#include <Processors/Sources/MySQLSource.h>
 
 
 namespace DB
@@ -40,7 +38,7 @@ StreamSettings::StreamSettings(const Settings & settings, bool auto_close_, bool
 {
 }
 
-MySQLBlockInputStream::Connection::Connection(
+MySQLSource::Connection::Connection(
     const mysqlxx::PoolWithFailover::Entry & entry_,
     const std::string & query_str)
     : entry(entry_)
@@ -50,12 +48,13 @@ MySQLBlockInputStream::Connection::Connection(
 }
 
 /// Used in MaterializedMySQL and in doInvalidateQuery for dictionary source.
-MySQLBlockInputStream::MySQLBlockInputStream(
+MySQLSource::MySQLSource(
     const mysqlxx::PoolWithFailover::Entry & entry,
     const std::string & query_str,
     const Block & sample_block,
     const StreamSettings & settings_)
-    : log(&Poco::Logger::get("MySQLBlockInputStream"))
+    : SourceWithProgress(sample_block.cloneEmpty())
+    , log(&Poco::Logger::get("MySQLBlockInputStream"))
     , connection{std::make_unique<Connection>(entry, query_str)}
     , settings{std::make_unique<StreamSettings>(settings_)}
 {
@@ -64,26 +63,27 @@ MySQLBlockInputStream::MySQLBlockInputStream(
 }
 
 /// For descendant MySQLWithFailoverBlockInputStream
-    MySQLBlockInputStream::MySQLBlockInputStream(const Block &sample_block_, const StreamSettings & settings_)
-    : log(&Poco::Logger::get("MySQLBlockInputStream"))
+MySQLSource::MySQLSource(const Block &sample_block_, const StreamSettings & settings_)
+    : SourceWithProgress(sample_block_.cloneEmpty())
+    , log(&Poco::Logger::get("MySQLBlockInputStream"))
     , settings(std::make_unique<StreamSettings>(settings_))
 {
     description.init(sample_block_);
 }
 
 /// Used by MySQL storage / table function and dictionary source.
-MySQLWithFailoverBlockInputStream::MySQLWithFailoverBlockInputStream(
+MySQLWithFailoverSource::MySQLWithFailoverSource(
     mysqlxx::PoolWithFailoverPtr pool_,
     const std::string & query_str_,
     const Block & sample_block_,
     const StreamSettings & settings_)
-: MySQLBlockInputStream(sample_block_, settings_)
-, pool(pool_)
-, query_str(query_str_)
+    : MySQLSource(sample_block_, settings_)
+    , pool(pool_)
+    , query_str(query_str_)
 {
 }
 
-void MySQLWithFailoverBlockInputStream::readPrefix()
+void MySQLWithFailoverSource::onStart()
 {
     size_t count_connect_attempts = 0;
 
@@ -98,18 +98,30 @@ void MySQLWithFailoverBlockInputStream::readPrefix()
         catch (const mysqlxx::ConnectionLost & ecl)  /// There are two retriable failures: CR_SERVER_GONE_ERROR, CR_SERVER_LOST
         {
             LOG_WARNING(log, "Failed connection ({}/{}). Trying to reconnect... (Info: {})", count_connect_attempts, settings->default_num_tries_on_connection_loss, ecl.displayText());
-        }
 
-        if (++count_connect_attempts > settings->default_num_tries_on_connection_loss)
-        {
-            LOG_ERROR(log, "Failed to create connection to MySQL. ({}/{})", count_connect_attempts, settings->default_num_tries_on_connection_loss);
-            throw;
+            if (++count_connect_attempts > settings->default_num_tries_on_connection_loss)
+            {
+                LOG_ERROR(log, "Failed to create connection to MySQL. ({}/{})", count_connect_attempts, settings->default_num_tries_on_connection_loss);
+                throw;
+            }
         }
     }
 
     initPositionMappingFromQueryResultStructure();
 }
 
+Chunk MySQLWithFailoverSource::generate()
+{
+    if (!is_initialized)
+    {
+        onStart();
+        is_initialized = true;
+    }
+
+    return MySQLSource::generate();
+}
+
+
 namespace
 {
     using ValueType = ExternalResultDescription::ValueType;
@@ -213,7 +225,7 @@ namespace
 }
 
 
-Block MySQLBlockInputStream::readImpl()
+Chunk MySQLSource::generate()
 {
     auto row = connection->result.fetch();
     if (!row)
@@ -272,10 +284,10 @@ Block MySQLBlockInputStream::readImpl()
 
         row = connection->result.fetch();
     }
-    return description.sample_block.cloneWithColumns(std::move(columns));
+    return Chunk(std::move(columns), num_rows);
 }
 
-void MySQLBlockInputStream::initPositionMappingFromQueryResultStructure()
+void MySQLSource::initPositionMappingFromQueryResultStructure()
 {
     position_mapping.resize(description.sample_block.columns());
 
diff --git a/src/Formats/MySQLBlockInputStream.h b/src/Processors/Sources/MySQLSource.h
similarity index 77%
rename from src/Formats/MySQLBlockInputStream.h
rename to src/Processors/Sources/MySQLSource.h
index 12deb9c3146..5938cb4b57f 100644
--- a/src/Formats/MySQLBlockInputStream.h
+++ b/src/Processors/Sources/MySQLSource.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <Core/Block.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <mysqlxx/PoolWithFailover.h>
 #include <mysqlxx/Query.h>
 #include <Core/ExternalResultDescription.h>
@@ -25,10 +25,10 @@ struct StreamSettings
 };
 
 /// Allows processing results of a MySQL query as a sequence of Blocks, simplifies chaining
-class MySQLBlockInputStream : public IBlockInputStream
+class MySQLSource : public SourceWithProgress
 {
 public:
-    MySQLBlockInputStream(
+    MySQLSource(
         const mysqlxx::PoolWithFailover::Entry & entry,
         const std::string & query_str,
         const Block & sample_block,
@@ -36,11 +36,9 @@ public:
 
     String getName() const override { return "MySQL"; }
 
-    Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
 protected:
-    MySQLBlockInputStream(const Block & sample_block_, const StreamSettings & settings);
-    Block readImpl() override;
+    MySQLSource(const Block & sample_block_, const StreamSettings & settings);
+    Chunk generate() override;
     void initPositionMappingFromQueryResultStructure();
 
     struct Connection
@@ -60,24 +58,27 @@ protected:
     ExternalResultDescription description;
 };
 
-/// Like MySQLBlockInputStream, but allocates connection only when reading is starting.
+/// Like MySQLSource, but allocates connection only when reading is starting.
 /// It allows to create a lot of stream objects without occupation of all connection pool.
 /// Also makes attempts to reconnect in case of connection failures.
-class MySQLWithFailoverBlockInputStream final : public MySQLBlockInputStream
+class MySQLWithFailoverSource final : public MySQLSource
 {
 public:
 
-    MySQLWithFailoverBlockInputStream(
+    MySQLWithFailoverSource(
         mysqlxx::PoolWithFailoverPtr pool_,
         const std::string & query_str_,
         const Block & sample_block_,
         const StreamSettings & settings_);
 
+    Chunk generate() override;
+
 private:
-    void readPrefix() override;
+    void onStart();
 
     mysqlxx::PoolWithFailoverPtr pool;
     std::string query_str;
+    bool is_initialized = false;
 };
 
 }
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index bf3ef32214d..99ba459cf2c 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -1,6 +1,6 @@
 #include <Processors/Sources/RemoteSource.h>
-#include <DataStreams/RemoteQueryExecutor.h>
-#include <DataStreams/RemoteQueryExecutorReadContext.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+#include <QueryPipeline/RemoteQueryExecutorReadContext.h>
 #include <Processors/Transforms/AggregatingTransform.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
 
@@ -56,7 +56,7 @@ std::optional<Chunk> RemoteSource::tryGenerate()
         query_executor->setProgressCallback([this](const Progress & value) { progress(value); });
 
         /// Get rows_before_limit result for remote query from ProfileInfo packet.
-        query_executor->setProfileInfoCallback([this](const BlockStreamProfileInfo & info)
+        query_executor->setProfileInfoCallback([this](const ProfileInfo & info)
         {
             if (rows_before_limit && info.hasAppliedLimit())
                 rows_before_limit->set(info.getRowsBeforeLimit());
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index 2109cb5eba4..23c3ddec401 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -2,7 +2,7 @@
 
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/RowsBeforeLimitCounter.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <atomic>
 
 namespace DB
diff --git a/src/DataStreams/SQLiteBlockInputStream.cpp b/src/Processors/Sources/SQLiteSource.cpp
similarity index 73%
rename from src/DataStreams/SQLiteBlockInputStream.cpp
rename to src/Processors/Sources/SQLiteSource.cpp
index da7645d968d..7ebc2b93165 100644
--- a/src/DataStreams/SQLiteBlockInputStream.cpp
+++ b/src/Processors/Sources/SQLiteSource.cpp
@@ -1,8 +1,8 @@
-#include "SQLiteBlockInputStream.h"
+#include "SQLiteSource.h"
 
 #if USE_SQLITE
-#include <common/range.h>
-#include <common/logger_useful.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
 #include <Common/assert_cast.h>
 
 #include <Columns/ColumnArray.h>
@@ -22,21 +22,18 @@ namespace ErrorCodes
     extern const int SQLITE_ENGINE_ERROR;
 }
 
-SQLiteBlockInputStream::SQLiteBlockInputStream(
-            SQLitePtr sqlite_db_,
-            const String & query_str_,
-            const Block & sample_block,
-            const UInt64 max_block_size_)
-    : query_str(query_str_)
+SQLiteSource::SQLiteSource(
+    SQLitePtr sqlite_db_,
+    const String & query_str_,
+    const Block & sample_block,
+    const UInt64 max_block_size_)
+    : SourceWithProgress(sample_block.cloneEmpty())
+    , query_str(query_str_)
     , max_block_size(max_block_size_)
     , sqlite_db(std::move(sqlite_db_))
 {
     description.init(sample_block);
-}
 
-
-void SQLiteBlockInputStream::readPrefix()
-{
     sqlite3_stmt * compiled_stmt = nullptr;
     int status = sqlite3_prepare_v2(sqlite_db.get(), query_str.c_str(), query_str.size() + 1, &compiled_stmt, nullptr);
 
@@ -48,11 +45,10 @@ void SQLiteBlockInputStream::readPrefix()
     compiled_statement = std::unique_ptr<sqlite3_stmt, StatementDeleter>(compiled_stmt, StatementDeleter());
 }
 
-
-Block SQLiteBlockInputStream::readImpl()
+Chunk SQLiteSource::generate()
 {
     if (!compiled_statement)
-        return Block();
+        return {};
 
     MutableColumns columns = description.sample_block.cloneEmptyColumns();
     size_t num_rows = 0;
@@ -73,30 +69,30 @@ Block SQLiteBlockInputStream::readImpl()
         else if (status != SQLITE_ROW)
         {
             throw Exception(ErrorCodes::SQLITE_ENGINE_ERROR,
-                            "Expected SQLITE_ROW status, but got status {}. Error: {}, Message: {}",
-                            status, sqlite3_errstr(status), sqlite3_errmsg(sqlite_db.get()));
+                "Expected SQLITE_ROW status, but got status {}. Error: {}, Message: {}",
+                status, sqlite3_errstr(status), sqlite3_errmsg(sqlite_db.get()));
         }
 
         int column_count = sqlite3_column_count(compiled_statement.get());
-        for (const auto idx : collections::range(0, column_count))
-        {
-            const auto & sample = description.sample_block.getByPosition(idx);
 
-            if (sqlite3_column_type(compiled_statement.get(), idx) == SQLITE_NULL)
+        for (int column_index = 0; column_index < column_count; ++column_index)
+        {
+            if (sqlite3_column_type(compiled_statement.get(), column_index) == SQLITE_NULL)
             {
-                insertDefaultSQLiteValue(*columns[idx], *sample.column);
+                columns[column_index]->insertDefault();
                 continue;
             }
 
-            if (description.types[idx].second)
+            auto & [type, is_nullable] = description.types[column_index];
+            if (is_nullable)
             {
-                ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[idx]);
-                insertValue(column_nullable.getNestedColumn(), description.types[idx].first, idx);
+                ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[column_index]);
+                insertValue(column_nullable.getNestedColumn(), type, column_index);
                 column_nullable.getNullMapData().emplace_back(0);
             }
             else
             {
-                insertValue(*columns[idx], description.types[idx].first, idx);
+                insertValue(*columns[column_index], type, column_index);
             }
         }
 
@@ -104,18 +100,16 @@ Block SQLiteBlockInputStream::readImpl()
             break;
     }
 
-    return description.sample_block.cloneWithColumns(std::move(columns));
-}
-
-
-void SQLiteBlockInputStream::readSuffix()
-{
-    if (compiled_statement)
+    if (num_rows == 0)
+    {
         compiled_statement.reset();
+        return {};
+    }
+
+    return Chunk(std::move(columns), num_rows);
 }
 
-
-void SQLiteBlockInputStream::insertValue(IColumn & column, const ExternalResultDescription::ValueType type, size_t idx)
+void SQLiteSource::insertValue(IColumn & column, ExternalResultDescription::ValueType type, size_t idx)
 {
     switch (type)
     {
diff --git a/src/DataStreams/SQLiteBlockInputStream.h b/src/Processors/Sources/SQLiteSource.h
similarity index 55%
rename from src/DataStreams/SQLiteBlockInputStream.h
rename to src/Processors/Sources/SQLiteSource.h
index 35fc4801b4b..28106062fb5 100644
--- a/src/DataStreams/SQLiteBlockInputStream.h
+++ b/src/Processors/Sources/SQLiteSource.h
@@ -1,37 +1,31 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_SQLITE
 #include <Core/ExternalResultDescription.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 
-#include <sqlite3.h>  // Y_IGNORE
+#include <sqlite3.h>
 
 
 namespace DB
 {
-class SQLiteBlockInputStream : public IBlockInputStream
+
+class SQLiteSource : public SourceWithProgress
 {
+
 using SQLitePtr = std::shared_ptr<sqlite3>;
 
 public:
-    SQLiteBlockInputStream(SQLitePtr sqlite_db_,
+    SQLiteSource(SQLitePtr sqlite_db_,
                            const String & query_str_,
                            const Block & sample_block,
                            UInt64 max_block_size_);
 
     String getName() const override { return "SQLite"; }
 
-    Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
 private:
-    void insertDefaultSQLiteValue(IColumn & column, const IColumn & sample_column)
-    {
-        column.insertFrom(sample_column, 0);
-    }
 
     using ValueType = ExternalResultDescription::ValueType;
 
@@ -40,19 +34,14 @@ private:
         void operator()(sqlite3_stmt * stmt) { sqlite3_finalize(stmt); }
     };
 
-    void readPrefix() override;
+    Chunk generate() override;
 
-    Block readImpl() override;
-
-    void readSuffix() override;
-
-    void insertValue(IColumn & column, const ExternalResultDescription::ValueType type, size_t idx);
+    void insertValue(IColumn & column, ExternalResultDescription::ValueType type, size_t idx);
 
     String query_str;
     UInt64 max_block_size;
 
     ExternalResultDescription description;
-
     SQLitePtr sqlite_db;
     std::unique_ptr<sqlite3_stmt, StatementDeleter> compiled_statement;
 };
diff --git a/src/Processors/Sources/ShellCommandSource.h b/src/Processors/Sources/ShellCommandSource.h
new file mode 100644
index 00000000000..4974c33f290
--- /dev/null
+++ b/src/Processors/Sources/ShellCommandSource.h
@@ -0,0 +1,184 @@
+#pragma once
+
+#include <memory>
+
+#include <base/logger_useful.h>
+#include <base/BorrowedObjectPool.h>
+
+#include <Common/ShellCommand.h>
+#include <Common/ThreadPool.h>
+
+#include <IO/ReadHelpers.h>
+#include <Processors/ISimpleTransform.h>
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+
+
+namespace DB
+{
+
+/** A stream, that get child process and sends data using tasks in background threads.
+  * For each send data task background thread is created. Send data task must send data to process input pipes.
+  * ShellCommandPoolSource receives data from process stdout.
+  *
+  * If process_pool is passed in constructor then after source is destroyed process is returned to pool.
+  */
+
+using ProcessPool = BorrowedObjectPool<std::unique_ptr<ShellCommand>>;
+
+struct ShellCommandSourceConfiguration
+{
+    /// Read fixed number of rows from command output
+    bool read_fixed_number_of_rows = false;
+    /// Valid only if read_fixed_number_of_rows = true
+    bool read_number_of_rows_from_process_output = false;
+    /// Valid only if read_fixed_number_of_rows = true
+    size_t number_of_rows_to_read = 0;
+    /// Max block size
+    size_t max_block_size = DBMS_DEFAULT_BUFFER_SIZE;
+};
+
+class ShellCommandSource final : public SourceWithProgress
+{
+public:
+
+    using SendDataTask = std::function<void(void)>;
+
+    ShellCommandSource(
+        ContextPtr context,
+        const std::string & format,
+        const Block & sample_block,
+        std::unique_ptr<ShellCommand> && command_,
+        std::vector<SendDataTask> && send_data_tasks = {},
+        const ShellCommandSourceConfiguration & configuration_ = {},
+        std::shared_ptr<ProcessPool> process_pool_ = nullptr)
+        : SourceWithProgress(sample_block)
+        , command(std::move(command_))
+        , configuration(configuration_)
+        , process_pool(process_pool_)
+    {
+        for (auto && send_data_task : send_data_tasks)
+        {
+            send_data_threads.emplace_back([task = std::move(send_data_task), this]()
+            {
+                try
+                {
+                    task();
+                }
+                catch (...)
+                {
+                    std::lock_guard<std::mutex> lock(send_data_lock);
+                    exception_during_send_data = std::current_exception();
+                }
+            });
+        }
+
+        size_t max_block_size = configuration.max_block_size;
+
+        if (configuration.read_fixed_number_of_rows)
+        {
+            /** Currently parallel parsing input format cannot read exactly max_block_size rows from input,
+              * so it will be blocked on ReadBufferFromFileDescriptor because this file descriptor represent pipe that does not have eof.
+              */
+            auto context_for_reading = Context::createCopy(context);
+            context_for_reading->setSetting("input_format_parallel_parsing", false);
+            context = context_for_reading;
+
+            if (configuration.read_number_of_rows_from_process_output)
+            {
+                readText(configuration.number_of_rows_to_read, command->out);
+                char dummy;
+                readChar(dummy, command->out);
+            }
+
+            max_block_size = configuration.number_of_rows_to_read;
+        }
+
+        pipeline = QueryPipeline(Pipe(context->getInputFormat(format, command->out, sample_block, max_block_size)));
+        executor = std::make_unique<PullingPipelineExecutor>(pipeline);
+    }
+
+    ~ShellCommandSource() override
+    {
+        for (auto & thread : send_data_threads)
+            if (thread.joinable())
+                thread.join();
+
+        if (command && process_pool)
+            process_pool->returnObject(std::move(command));
+    }
+
+protected:
+
+    Chunk generate() override
+    {
+        rethrowExceptionDuringSendDataIfNeeded();
+
+        if (configuration.read_fixed_number_of_rows && configuration.number_of_rows_to_read == current_read_rows)
+            return {};
+
+        Chunk chunk;
+
+        try
+        {
+            if (!executor->pull(chunk))
+                return {};
+
+            current_read_rows += chunk.getNumRows();
+        }
+        catch (...)
+        {
+            command = nullptr;
+            throw;
+        }
+
+        return chunk;
+    }
+
+    Status prepare() override
+    {
+        auto status = SourceWithProgress::prepare();
+
+        if (status == Status::Finished)
+        {
+            for (auto & thread : send_data_threads)
+                if (thread.joinable())
+                    thread.join();
+
+            rethrowExceptionDuringSendDataIfNeeded();
+        }
+
+        return status;
+    }
+
+    String getName() const override { return "ShellCommandSource"; }
+
+private:
+
+    void rethrowExceptionDuringSendDataIfNeeded()
+    {
+        std::lock_guard<std::mutex> lock(send_data_lock);
+        if (exception_during_send_data)
+        {
+            command = nullptr;
+            std::rethrow_exception(exception_during_send_data);
+        }
+    }
+
+    std::unique_ptr<ShellCommand> command;
+    ShellCommandSourceConfiguration configuration;
+
+    size_t current_read_rows = 0;
+
+    std::shared_ptr<ProcessPool> process_pool;
+
+    QueryPipeline pipeline;
+    std::unique_ptr<PullingPipelineExecutor> executor;
+
+    std::vector<ThreadFromGlobalPool> send_data_threads;
+    std::mutex send_data_lock;
+    std::exception_ptr exception_during_send_data;
+};
+}
diff --git a/src/Processors/Sources/SinkToOutputStream.cpp b/src/Processors/Sources/SinkToOutputStream.cpp
deleted file mode 100644
index 7612ba10fb3..00000000000
--- a/src/Processors/Sources/SinkToOutputStream.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <Processors/Sources/SinkToOutputStream.h>
-#include <DataStreams/IBlockOutputStream.h>
-
-
-namespace DB
-{
-
-SinkToOutputStream::SinkToOutputStream(BlockOutputStreamPtr stream_)
-    : ISink(stream_->getHeader())
-    , stream(std::move(stream_))
-{
-    stream->writePrefix();
-}
-
-void SinkToOutputStream::consume(Chunk chunk)
-{
-    stream->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
-}
-
-void SinkToOutputStream::onFinish()
-{
-    stream->writeSuffix();
-}
-
-}
diff --git a/src/Processors/Sources/SinkToOutputStream.h b/src/Processors/Sources/SinkToOutputStream.h
deleted file mode 100644
index 5362608551f..00000000000
--- a/src/Processors/Sources/SinkToOutputStream.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-#include <Processors/ISink.h>
-
-namespace DB
-{
-
-class IBlockOutputStream;
-using BlockOutputStreamPtr = std::shared_ptr<IBlockOutputStream>;
-
-/// Sink which writes data to IBlockOutputStream.
-/// It's a temporary wrapper.
-class SinkToOutputStream : public ISink
-{
-public:
-    explicit SinkToOutputStream(BlockOutputStreamPtr stream);
-
-    String getName() const override { return "SinkToOutputStream"; }
-
-protected:
-    void consume(Chunk chunk) override;
-    void onFinish() override;
-
-private:
-    BlockOutputStreamPtr stream;
-};
-
-}
diff --git a/src/Processors/Sources/SourceFromInputStream.cpp b/src/Processors/Sources/SourceFromInputStream.cpp
deleted file mode 100644
index 7c88c6dfbeb..00000000000
--- a/src/Processors/Sources/SourceFromInputStream.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Processors/Transforms/AggregatingTransform.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
-#include <DataStreams/RemoteBlockInputStream.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-SourceFromInputStream::SourceFromInputStream(BlockInputStreamPtr stream_, bool force_add_aggregating_info_)
-    : ISourceWithProgress(stream_->getHeader())
-    , force_add_aggregating_info(force_add_aggregating_info_)
-    , stream(std::move(stream_))
-{
-    init();
-}
-
-void SourceFromInputStream::init()
-{
-    const auto & sample = getPort().getHeader();
-    for (auto & type : sample.getDataTypes())
-        if (typeid_cast<const DataTypeAggregateFunction *>(type.get()))
-            has_aggregate_functions = true;
-}
-
-void SourceFromInputStream::addTotalsPort()
-{
-    if (totals_port)
-        throw Exception("Totals port was already added for SourceFromInputStream.", ErrorCodes::LOGICAL_ERROR);
-
-    outputs.emplace_back(outputs.front().getHeader(), this);
-    totals_port = &outputs.back();
-}
-
-void SourceFromInputStream::addExtremesPort()
-{
-    if (extremes_port)
-        throw Exception("Extremes port was already added for SourceFromInputStream.", ErrorCodes::LOGICAL_ERROR);
-
-    outputs.emplace_back(outputs.front().getHeader(), this);
-    extremes_port = &outputs.back();
-}
-
-IProcessor::Status SourceFromInputStream::prepare()
-{
-    auto status = ISource::prepare();
-
-    if (status == Status::Finished)
-    {
-        is_generating_finished = true;
-
-        /// Read postfix and get totals if needed.
-        if (!is_stream_finished && !isCancelled())
-            return Status::Ready;
-
-        if (totals_port && !totals_port->isFinished())
-        {
-            if (has_totals)
-            {
-                if (!totals_port->canPush())
-                    return Status::PortFull;
-
-                totals_port->push(std::move(totals));
-                has_totals = false;
-            }
-
-            totals_port->finish();
-        }
-
-        if (extremes_port && !extremes_port->isFinished())
-        {
-            if (has_extremes)
-            {
-                if (!extremes_port->canPush())
-                    return Status::PortFull;
-
-                extremes_port->push(std::move(extremes));
-                has_extremes = false;
-            }
-
-            extremes_port->finish();
-        }
-    }
-
-    return status;
-}
-
-void SourceFromInputStream::work()
-{
-    if (!is_generating_finished)
-    {
-        try
-        {
-            ISource::work();
-        }
-        catch (...)
-        {
-            /// Won't read suffix in case of exception.
-            is_stream_finished = true;
-            throw;
-        }
-
-        return;
-    }
-
-    if (is_stream_finished)
-        return;
-
-    /// Don't cancel for RemoteBlockInputStream (otherwise readSuffix can stack)
-    if (!typeid_cast<const RemoteBlockInputStream *>(stream.get()))
-        stream->cancel(false);
-
-    if (rows_before_limit)
-    {
-        const auto & info = stream->getProfileInfo();
-        if (info.hasAppliedLimit())
-            rows_before_limit->add(info.getRowsBeforeLimit());
-    }
-
-    stream->readSuffix();
-
-    if (auto totals_block = stream->getTotals())
-    {
-        totals.setColumns(totals_block.getColumns(), 1);
-        has_totals = true;
-    }
-
-    is_stream_finished = true;
-}
-
-Chunk SourceFromInputStream::generate()
-{
-    if (is_stream_finished)
-        return {};
-
-    if (!is_stream_started)
-    {
-        stream->readPrefix();
-        is_stream_started = true;
-    }
-
-    auto block = stream->read();
-    if (!block && !isCancelled())
-    {
-        if (rows_before_limit)
-        {
-            const auto & info = stream->getProfileInfo();
-            if (info.hasAppliedLimit())
-                rows_before_limit->add(info.getRowsBeforeLimit());
-        }
-
-        stream->readSuffix();
-
-        if (auto totals_block = stream->getTotals())
-        {
-            if (totals_block.rows() > 0) /// Sometimes we can get empty totals. Skip it.
-            {
-                totals.setColumns(totals_block.getColumns(), totals_block.rows());
-                has_totals = true;
-            }
-        }
-
-        if (auto extremes_block = stream->getExtremes())
-        {
-            if (extremes_block.rows() > 0) /// Sometimes we can get empty extremes. Skip it.
-            {
-                extremes.setColumns(extremes_block.getColumns(), extremes_block.rows());
-                has_extremes = true;
-            }
-        }
-
-        is_stream_finished = true;
-        return {};
-    }
-
-    if (isCancelled())
-        return {};
-
-#ifndef NDEBUG
-    assertBlocksHaveEqualStructure(getPort().getHeader(), block, "SourceFromInputStream");
-#endif
-
-    UInt64 num_rows = block.rows();
-    Chunk chunk(block.getColumns(), num_rows);
-
-    if (force_add_aggregating_info || has_aggregate_functions)
-    {
-        auto info = std::make_shared<AggregatedChunkInfo>();
-        info->bucket_num = block.info.bucket_num;
-        info->is_overflows = block.info.is_overflows;
-        chunk.setChunkInfo(std::move(info));
-    }
-
-    return chunk;
-}
-
-}
diff --git a/src/Processors/Sources/SourceFromInputStream.h b/src/Processors/Sources/SourceFromInputStream.h
deleted file mode 100644
index 9649385909c..00000000000
--- a/src/Processors/Sources/SourceFromInputStream.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#pragma once
-
-#include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/RowsBeforeLimitCounter.h>
-#include <DataStreams/IBlockInputStream.h>
-
-
-namespace DB
-{
-
-class IBlockInputStream;
-using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
-
-/// Wrapper for IBlockInputStream which implements ISourceWithProgress.
-class SourceFromInputStream : public ISourceWithProgress
-{
-public:
-    /// If force_add_aggregating_info is enabled, AggregatedChunkInfo (with bucket number and is_overflows flag) will be added to result chunk.
-    explicit SourceFromInputStream(BlockInputStreamPtr stream_, bool force_add_aggregating_info_ = false);
-    String getName() const override { return "SourceFromInputStream"; }
-
-    Status prepare() override;
-    void work() override;
-
-    Chunk generate() override;
-
-    BlockInputStreamPtr & getStream() { return stream; }
-
-    void addTotalsPort();
-    void addExtremesPort();
-
-    OutputPort * getTotalsPort() const { return totals_port; }
-    OutputPort * getExtremesPort() const { return extremes_port; }
-
-    void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) { rows_before_limit.swap(counter); }
-
-    /// Implementation for methods from ISourceWithProgress.
-    void setLimits(const StreamLocalLimits & limits_) final { stream->setLimits(limits_); }
-    void setLeafLimits(const SizeLimits &) final { }
-    void setQuota(const std::shared_ptr<const EnabledQuota> & quota_) final { stream->setQuota(quota_); }
-    void setProcessListElement(QueryStatus * elem) final { stream->setProcessListElement(elem); }
-    void setProgressCallback(const ProgressCallback & callback) final { stream->setProgressCallback(callback); }
-    void addTotalRowsApprox(size_t value) final { stream->addTotalRowsApprox(value); }
-
-    /// Stop reading from stream if output port is finished.
-    void onUpdatePorts() override
-    {
-        if (getPort().isFinished())
-            cancel();
-    }
-
-protected:
-    void onCancel() override { stream->cancel(false); }
-
-private:
-    bool has_aggregate_functions = false;
-    bool force_add_aggregating_info = false;
-    BlockInputStreamPtr stream;
-
-    RowsBeforeLimitCounterPtr rows_before_limit;
-
-    Chunk totals;
-    OutputPort * totals_port = nullptr;
-    bool has_totals = false;
-
-    Chunk extremes;
-    OutputPort * extremes_port = nullptr;
-    bool has_extremes = false;
-
-    bool is_generating_finished = false;
-    bool is_stream_finished = false;
-    bool is_stream_started = false;
-
-    void init();
-};
-
-}
diff --git a/src/Processors/Sources/SourceFromSingleChunk.cpp b/src/Processors/Sources/SourceFromSingleChunk.cpp
new file mode 100644
index 00000000000..776ed98599f
--- /dev/null
+++ b/src/Processors/Sources/SourceFromSingleChunk.cpp
@@ -0,0 +1,26 @@
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <Processors/Transforms/AggregatingTransform.h>
+
+namespace DB
+{
+
+SourceFromSingleChunk::SourceFromSingleChunk(Block header, Chunk chunk_) : SourceWithProgress(std::move(header)), chunk(std::move(chunk_)) {}
+SourceFromSingleChunk::SourceFromSingleChunk(Block data) : SourceWithProgress(data.cloneEmpty()), chunk(data.getColumns(), data.rows())
+{
+    const auto & sample = getPort().getHeader();
+    bool has_aggregate_functions = false;
+    for (auto & type : sample.getDataTypes())
+        if (typeid_cast<const DataTypeAggregateFunction *>(type.get()))
+            has_aggregate_functions = true;
+
+    if (has_aggregate_functions)
+    {
+        auto info = std::make_shared<AggregatedChunkInfo>();
+        info->bucket_num = data.info.bucket_num;
+        info->is_overflows = data.info.is_overflows;
+        chunk.setChunkInfo(std::move(info));
+    }
+}
+
+}
diff --git a/src/Processors/Sources/SourceFromSingleChunk.h b/src/Processors/Sources/SourceFromSingleChunk.h
index d304bdbab93..e06387b556f 100644
--- a/src/Processors/Sources/SourceFromSingleChunk.h
+++ b/src/Processors/Sources/SourceFromSingleChunk.h
@@ -8,7 +8,8 @@ namespace DB
 class SourceFromSingleChunk : public SourceWithProgress
 {
 public:
-    explicit SourceFromSingleChunk(Block header, Chunk chunk_) : SourceWithProgress(std::move(header)), chunk(std::move(chunk_)) {}
+    explicit SourceFromSingleChunk(Block header, Chunk chunk_);
+    explicit SourceFromSingleChunk(Block data);
     String getName() const override { return "SourceFromSingleChunk"; }
 
 protected:
diff --git a/src/Processors/Sources/SourceWithProgress.cpp b/src/Processors/Sources/SourceWithProgress.cpp
index 66168e7d73a..0ebdd968997 100644
--- a/src/Processors/Sources/SourceWithProgress.cpp
+++ b/src/Processors/Sources/SourceWithProgress.cpp
@@ -47,9 +47,14 @@ void SourceWithProgress::setProcessListElement(QueryStatus * elem)
     }
 }
 
+bool SourceWithProgress::checkTimeLimit() const
+{
+    return limits.speed_limits.checkTimeLimit(total_stopwatch, limits.timeout_overflow_mode);
+}
+
 void SourceWithProgress::work()
 {
-    if (!limits.speed_limits.checkTimeLimit(total_stopwatch.elapsed(), limits.timeout_overflow_mode))
+    if (!checkTimeLimit())
     {
         cancel();
     }
@@ -64,8 +69,7 @@ void SourceWithProgress::work()
     }
 }
 
-/// Aggregated copy-paste from IBlockInputStream::progressImpl.
-/// Most of this must be done in PipelineExecutor outside. Now it's done for compatibility with IBlockInputStream.
+/// TODO: Most of this must be done in PipelineExecutor outside.
 void SourceWithProgress::progress(const Progress & value)
 {
     was_progress_called = true;
@@ -130,14 +134,12 @@ void SourceWithProgress::progress(const Progress & value)
 
         if (last_profile_events_update_time + profile_events_update_period_microseconds < total_elapsed_microseconds)
         {
-            /// Should be done in PipelineExecutor.
-            /// It is here for compatibility with IBlockInputsStream.
+            /// TODO: Should be done in PipelineExecutor.
             CurrentThread::updatePerformanceCounters();
             last_profile_events_update_time = total_elapsed_microseconds;
         }
 
-        /// Should be done in PipelineExecutor.
-        /// It is here for compatibility with IBlockInputsStream.
+        /// TODO: Should be done in PipelineExecutor.
         limits.speed_limits.throttle(progress.read_rows, progress.read_bytes, total_rows, total_elapsed_microseconds);
 
         if (quota && limits.mode == LimitsMode::LIMITS_TOTAL)
diff --git a/src/Processors/Sources/SourceWithProgress.h b/src/Processors/Sources/SourceWithProgress.h
index 49728be01e3..912a548f977 100644
--- a/src/Processors/Sources/SourceWithProgress.h
+++ b/src/Processors/Sources/SourceWithProgress.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Processors/ISource.h>
 #include <Common/Stopwatch.h>
-#include <DataStreams/StreamLocalLimits.h>
+#include <QueryPipeline/StreamLocalLimits.h>
 #include <IO/Progress.h>
 
 
@@ -65,6 +65,8 @@ protected:
 
     void work() override;
 
+    bool checkTimeLimit() const;
+
 private:
     StreamLocalLimits limits;
     SizeLimits leaf_limits;
diff --git a/src/Processors/Sources/TemporaryFileLazySource.cpp b/src/Processors/Sources/TemporaryFileLazySource.cpp
new file mode 100644
index 00000000000..0382229a7c0
--- /dev/null
+++ b/src/Processors/Sources/TemporaryFileLazySource.cpp
@@ -0,0 +1,32 @@
+#include <Processors/Sources/TemporaryFileLazySource.h>
+#include <Formats/TemporaryFileStream.h>
+
+namespace DB
+{
+
+TemporaryFileLazySource::~TemporaryFileLazySource() = default;
+
+TemporaryFileLazySource::TemporaryFileLazySource(const std::string & path_, const Block & header_)
+    : ISource(header_)
+    , path(path_)
+    , done(false)
+{}
+
+Chunk TemporaryFileLazySource::generate()
+{
+    if (done)
+        return {};
+
+    if (!stream)
+        stream = std::make_unique<TemporaryFileStream>(path, header);
+
+    auto block = stream->block_in->read();
+    if (!block)
+    {
+        done = true;
+        stream.reset();
+    }
+    return Chunk(block.getColumns(), block.rows());
+}
+
+}
diff --git a/src/Processors/Sources/TemporaryFileLazySource.h b/src/Processors/Sources/TemporaryFileLazySource.h
new file mode 100644
index 00000000000..b2e9d5d5500
--- /dev/null
+++ b/src/Processors/Sources/TemporaryFileLazySource.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Processors/ISource.h>
+
+namespace DB
+{
+
+struct TemporaryFileStream;
+
+class TemporaryFileLazySource : public ISource
+{
+public:
+    TemporaryFileLazySource(const std::string & path_, const Block & header_);
+    ~TemporaryFileLazySource() override;
+    String getName() const override { return "TemporaryFileLazySource"; }
+
+protected:
+    Chunk generate() override;
+
+private:
+    const std::string path;
+    Block header;
+    bool done;
+
+    std::unique_ptr<TemporaryFileStream> stream;
+};
+
+}
diff --git a/src/Processors/Sources/WaitForAsyncInsertSource.h b/src/Processors/Sources/WaitForAsyncInsertSource.h
new file mode 100644
index 00000000000..40871a59125
--- /dev/null
+++ b/src/Processors/Sources/WaitForAsyncInsertSource.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <Processors/ISource.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
+
+namespace DB
+{
+
+/// Source, that allow to wait until processing of
+/// asynchronous insert for specified query_id will be finished.
+class WaitForAsyncInsertSource : public ISource, WithContext
+{
+public:
+    WaitForAsyncInsertSource(
+        const String & query_id_, size_t timeout_ms_, AsynchronousInsertQueue & queue_)
+        : ISource(Block())
+        , query_id(query_id_)
+        , timeout_ms(timeout_ms_)
+        , queue(queue_)
+    {
+    }
+
+    String getName() const override { return "WaitForAsyncInsert"; }
+
+protected:
+    Chunk generate() override
+    {
+        queue.waitForProcessingQuery(query_id, std::chrono::milliseconds(timeout_ms));
+        return Chunk();
+    }
+
+private:
+    String query_id;
+    size_t timeout_ms;
+    AsynchronousInsertQueue & queue;
+};
+
+}
diff --git a/src/DataStreams/ITTLAlgorithm.cpp b/src/Processors/TTL/ITTLAlgorithm.cpp
similarity index 98%
rename from src/DataStreams/ITTLAlgorithm.cpp
rename to src/Processors/TTL/ITTLAlgorithm.cpp
index 7513e0c6ce0..489941950b5 100644
--- a/src/DataStreams/ITTLAlgorithm.cpp
+++ b/src/Processors/TTL/ITTLAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/ITTLAlgorithm.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnConst.h>
 
diff --git a/src/DataStreams/ITTLAlgorithm.h b/src/Processors/TTL/ITTLAlgorithm.h
similarity index 98%
rename from src/DataStreams/ITTLAlgorithm.h
rename to src/Processors/TTL/ITTLAlgorithm.h
index d87d43d8c0c..d219f9f7ad3 100644
--- a/src/DataStreams/ITTLAlgorithm.h
+++ b/src/Processors/TTL/ITTLAlgorithm.h
@@ -3,7 +3,7 @@
 #include <Storages/TTLDescription.h>
 #include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
diff --git a/src/DataStreams/TTLAggregationAlgorithm.cpp b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
similarity index 99%
rename from src/DataStreams/TTLAggregationAlgorithm.cpp
rename to src/Processors/TTL/TTLAggregationAlgorithm.cpp
index d012464ea14..5581892f16f 100644
--- a/src/DataStreams/TTLAggregationAlgorithm.cpp
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/TTLAggregationAlgorithm.h>
+#include <Processors/TTL/TTLAggregationAlgorithm.h>
 
 namespace DB
 {
diff --git a/src/DataStreams/TTLAggregationAlgorithm.h b/src/Processors/TTL/TTLAggregationAlgorithm.h
similarity index 96%
rename from src/DataStreams/TTLAggregationAlgorithm.h
rename to src/Processors/TTL/TTLAggregationAlgorithm.h
index c2f40bab6b9..0e4bf092ed6 100644
--- a/src/DataStreams/TTLAggregationAlgorithm.h
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/ITTLAlgorithm.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
 #include <Interpreters/Aggregator.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 
diff --git a/src/DataStreams/TTLColumnAlgorithm.cpp b/src/Processors/TTL/TTLColumnAlgorithm.cpp
similarity index 92%
rename from src/DataStreams/TTLColumnAlgorithm.cpp
rename to src/Processors/TTL/TTLColumnAlgorithm.cpp
index 1318ea382db..7cef77c185c 100644
--- a/src/DataStreams/TTLColumnAlgorithm.cpp
+++ b/src/Processors/TTL/TTLColumnAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/TTLColumnAlgorithm.h>
+#include <Processors/TTL/TTLColumnAlgorithm.h>
 
 namespace DB
 {
@@ -10,11 +10,13 @@ TTLColumnAlgorithm::TTLColumnAlgorithm(
     bool force_,
     const String & column_name_,
     const ExpressionActionsPtr & default_expression_,
-    const String & default_column_name_)
+    const String & default_column_name_,
+    bool is_compact_part_)
     : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
     , column_name(column_name_)
     , default_expression(default_expression_)
     , default_column_name(default_column_name_)
+    , is_compact_part(is_compact_part_)
 {
     if (!isMinTTLExpired())
     {
@@ -40,7 +42,7 @@ void TTLColumnAlgorithm::execute(Block & block)
         return;
 
     /// Later drop full column
-    if (isMaxTTLExpired())
+    if (isMaxTTLExpired() && !is_compact_part)
         return;
 
     auto default_column = executeExpressionAndGetColumn(default_expression, block, default_column_name);
diff --git a/src/DataStreams/TTLColumnAlgorithm.h b/src/Processors/TTL/TTLColumnAlgorithm.h
similarity index 84%
rename from src/DataStreams/TTLColumnAlgorithm.h
rename to src/Processors/TTL/TTLColumnAlgorithm.h
index e09dd663af0..30de77dcc2a 100644
--- a/src/DataStreams/TTLColumnAlgorithm.h
+++ b/src/Processors/TTL/TTLColumnAlgorithm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/ITTLAlgorithm.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
 
 namespace DB
 {
@@ -17,7 +17,9 @@ public:
         bool force_,
         const String & column_name_,
         const ExpressionActionsPtr & default_expression_,
-        const String & default_column_name_);
+        const String & default_column_name_,
+        bool is_compact_part_
+    );
 
     void execute(Block & block) override;
     void finalize(const MutableDataPartPtr & data_part) const override;
@@ -28,6 +30,7 @@ private:
     const String default_column_name;
 
     bool is_fully_empty = true;
+    bool is_compact_part;
 };
 
 }
diff --git a/src/DataStreams/TTLDeleteAlgorithm.cpp b/src/Processors/TTL/TTLDeleteAlgorithm.cpp
similarity index 97%
rename from src/DataStreams/TTLDeleteAlgorithm.cpp
rename to src/Processors/TTL/TTLDeleteAlgorithm.cpp
index ea7a0b235ec..eec6b21f949 100644
--- a/src/DataStreams/TTLDeleteAlgorithm.cpp
+++ b/src/Processors/TTL/TTLDeleteAlgorithm.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/TTLDeleteAlgorithm.h>
+#include <Processors/TTL/TTLDeleteAlgorithm.h>
 
 namespace DB
 {
diff --git a/src/DataStreams/TTLDeleteAlgorithm.h b/src/Processors/TTL/TTLDeleteAlgorithm.h
similarity index 92%
rename from src/DataStreams/TTLDeleteAlgorithm.h
rename to src/Processors/TTL/TTLDeleteAlgorithm.h
index 8ab3f8b63e8..292a29bfa27 100644
--- a/src/DataStreams/TTLDeleteAlgorithm.h
+++ b/src/Processors/TTL/TTLDeleteAlgorithm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/ITTLAlgorithm.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
 
 namespace DB
 {
diff --git a/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp b/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp
new file mode 100644
index 00000000000..eba364aa2b8
--- /dev/null
+++ b/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp
@@ -0,0 +1,65 @@
+#include <Processors/TTL/TTLUpdateInfoAlgorithm.h>
+
+namespace DB
+{
+
+TTLUpdateInfoAlgorithm::TTLUpdateInfoAlgorithm(
+    const TTLDescription & description_,
+    const TTLUpdateField ttl_update_field_,
+    const String ttl_update_key_,
+    const TTLInfo & old_ttl_info_,
+    time_t current_time_,
+    bool force_)
+    : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
+    , ttl_update_field(ttl_update_field_)
+    , ttl_update_key(ttl_update_key_)
+{
+}
+
+void TTLUpdateInfoAlgorithm::execute(Block & block)
+{
+    if (!block)
+        return;
+
+    auto ttl_column = executeExpressionAndGetColumn(description.expression, block, description.result_column);
+    for (size_t i = 0; i < block.rows(); ++i)
+    {
+        UInt32 cur_ttl = ITTLAlgorithm::getTimestampByIndex(ttl_column.get(), i);
+        new_ttl_info.update(cur_ttl);
+    }
+}
+
+void TTLUpdateInfoAlgorithm::finalize(const MutableDataPartPtr & data_part) const
+{
+    if (ttl_update_field == TTLUpdateField::RECOMPRESSION_TTL)
+    {
+        data_part->ttl_infos.recompression_ttl[ttl_update_key] = new_ttl_info;
+    }
+    else if (ttl_update_field == TTLUpdateField::MOVES_TTL)
+    {
+        data_part->ttl_infos.moves_ttl[ttl_update_key] = new_ttl_info;
+    }
+    else if (ttl_update_field == TTLUpdateField::GROUP_BY_TTL)
+    {
+        data_part->ttl_infos.group_by_ttl[ttl_update_key] = new_ttl_info;
+        data_part->ttl_infos.updatePartMinMaxTTL(new_ttl_info.min, new_ttl_info.max);
+    }
+    else if (ttl_update_field == TTLUpdateField::ROWS_WHERE_TTL)
+    {
+        data_part->ttl_infos.rows_where_ttl[ttl_update_key] = new_ttl_info;
+        data_part->ttl_infos.updatePartMinMaxTTL(new_ttl_info.min, new_ttl_info.max);
+    }
+    else if (ttl_update_field == TTLUpdateField::TABLE_TTL)
+    {
+        data_part->ttl_infos.table_ttl = new_ttl_info;
+        data_part->ttl_infos.updatePartMinMaxTTL(new_ttl_info.min, new_ttl_info.max);
+    }
+    else if (ttl_update_field == TTLUpdateField::COLUMNS_TTL)
+    {
+        data_part->ttl_infos.columns_ttl[ttl_update_key] = new_ttl_info;
+        data_part->ttl_infos.updatePartMinMaxTTL(new_ttl_info.min, new_ttl_info.max);
+    }
+
+}
+
+}
diff --git a/src/Processors/TTL/TTLUpdateInfoAlgorithm.h b/src/Processors/TTL/TTLUpdateInfoAlgorithm.h
new file mode 100644
index 00000000000..45eecbde3d0
--- /dev/null
+++ b/src/Processors/TTL/TTLUpdateInfoAlgorithm.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Processors/TTL/ITTLAlgorithm.h>
+
+namespace DB
+{
+
+enum class TTLUpdateField
+{
+    COLUMNS_TTL,
+    TABLE_TTL,
+    ROWS_WHERE_TTL,
+    MOVES_TTL,
+    RECOMPRESSION_TTL,
+    GROUP_BY_TTL,
+};
+
+/// Calculates new ttl_info and does nothing with data.
+class TTLUpdateInfoAlgorithm : public ITTLAlgorithm
+{
+public:
+    TTLUpdateInfoAlgorithm(
+        const TTLDescription & description_,
+        const TTLUpdateField ttl_update_field_,
+        const String ttl_update_key_,
+        const TTLInfo & old_ttl_info_,
+        time_t current_time_, bool force_
+    );
+
+    void execute(Block & block) override;
+    void finalize(const MutableDataPartPtr & data_part) const override;
+
+private:
+    const TTLUpdateField ttl_update_field;
+    const String ttl_update_key;
+};
+
+
+}
diff --git a/src/Processors/Transforms/AddingDefaultsTransform.cpp b/src/Processors/Transforms/AddingDefaultsTransform.cpp
index c92d4d7a456..01048354b82 100644
--- a/src/Processors/Transforms/AddingDefaultsTransform.cpp
+++ b/src/Processors/Transforms/AddingDefaultsTransform.cpp
@@ -64,7 +64,7 @@ static void mixNumberColumns(
         if constexpr (!std::is_same_v<DataType, DataTypeString> && !std::is_same_v<DataType, DataTypeFixedString>)
         {
             using FieldType = typename DataType::FieldType;
-            using ColVecType = std::conditional_t<IsDecimalNumber<FieldType>, ColumnDecimal<FieldType>, ColumnVector<FieldType>>;
+            using ColVecType = ColumnVectorOrDecimal<FieldType>;
 
             auto col_read = typeid_cast<ColVecType *>(column_mixed.get());
             if (!col_read)
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index 243b20edb1f..3602b7f7d03 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -1,31 +1,30 @@
 #include <Processors/Transforms/AggregatingInOrderTransform.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Core/SortCursor.h>
-#include <common/range.h>
+#include <base/range.h>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-
 AggregatingInOrderTransform::AggregatingInOrderTransform(
-    Block header, AggregatingTransformParamsPtr params_,
-    const SortDescription & group_by_description_, size_t res_block_size_)
-    : AggregatingInOrderTransform(std::move(header), std::move(params_)
-    , group_by_description_, res_block_size_, std::make_unique<ManyAggregatedData>(1), 0)
+    Block header,
+    AggregatingTransformParamsPtr params_,
+    const SortDescription & group_by_description_,
+    size_t max_block_size_, size_t max_block_bytes_)
+    : AggregatingInOrderTransform(std::move(header), std::move(params_),
+        group_by_description_, max_block_size_, max_block_bytes_,
+        std::make_unique<ManyAggregatedData>(1), 0)
 {
 }
 
 AggregatingInOrderTransform::AggregatingInOrderTransform(
     Block header, AggregatingTransformParamsPtr params_,
-    const SortDescription & group_by_description_, size_t res_block_size_,
+    const SortDescription & group_by_description_,
+    size_t max_block_size_, size_t max_block_bytes_,
     ManyAggregatedDataPtr many_data_, size_t current_variant)
     : IProcessor({std::move(header)}, {params_->getCustomHeader(false)})
-    , res_block_size(res_block_size_)
+    , max_block_size(max_block_size_)
+    , max_block_bytes(max_block_bytes_)
     , params(std::move(params_))
     , group_by_description(group_by_description_)
     , aggregate_columns(params->params.aggregates_size)
@@ -48,8 +47,18 @@ AggregatingInOrderTransform::AggregatingInOrderTransform(
 
 AggregatingInOrderTransform::~AggregatingInOrderTransform() = default;
 
+static Int64 getCurrentMemoryUsage()
+{
+    Int64 current_memory_usage = 0;
+    if (auto * memory_tracker = CurrentThread::getMemoryTracker())
+        current_memory_usage = memory_tracker->get();
+    return current_memory_usage;
+}
+
 void AggregatingInOrderTransform::consume(Chunk chunk)
 {
+    Int64 initial_memory_usage = getCurrentMemoryUsage();
+
     size_t rows = chunk.getNumRows();
     if (rows == 0)
         return;
@@ -77,6 +86,7 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
 
     size_t key_end = 0;
     size_t key_begin = 0;
+
     /// If we don't have a block we create it and fill with first key
     if (!cur_block_size)
     {
@@ -94,6 +104,7 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         ++cur_block_size;
     }
 
+    Int64 current_memory_usage = 0;
 
     /// Will split block into segments with the same key
     while (key_end != rows)
@@ -112,44 +123,18 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         if (key_begin != key_end)
             params->aggregator.executeOnIntervalWithoutKeyImpl(variants.without_key, key_begin, key_end, aggregate_function_instructions.data(), variants.aggregates_pool);
 
+        current_memory_usage = getCurrentMemoryUsage() - initial_memory_usage;
+
         /// We finalize last key aggregation state if a new key found.
         if (key_end != rows)
         {
             params->aggregator.addSingleKeyToAggregateColumns(variants, res_aggregate_columns);
 
-            /// If res_block_size is reached we have to stop consuming and generate the block. Save the extra rows into new chunk.
-            if (cur_block_size == res_block_size)
+            /// If max_block_size is reached we have to stop consuming and generate the block. Save the extra rows into new chunk.
+            if (cur_block_size >= max_block_size || cur_block_bytes + current_memory_usage >= max_block_bytes)
             {
-                Columns source_columns = chunk.detachColumns();
-
-                for (auto & source_column : source_columns)
-                    source_column = source_column->cut(key_end, rows - key_end);
-
-                current_chunk = Chunk(source_columns, rows - key_end);
-                src_rows -= current_chunk.getNumRows();
-                block_end_reached = true;
-                need_generate = true;
-                cur_block_size = 0;
-
-                variants.without_key = nullptr;
-
-                /// Arenas cannot be destroyed here, since later, in FinalizingSimpleTransform
-                /// there will be finalizeChunk(), but even after
-                /// finalizeChunk() we cannot destroy arena, since some memory
-                /// from Arena still in use, so we attach it to the Chunk to
-                /// remove it once it will be consumed.
-                if (params->final)
-                {
-                    if (variants.aggregates_pools.size() != 1)
-                        throw Exception("Too much arenas", ErrorCodes::LOGICAL_ERROR);
-
-                    Arenas arenas(1, std::make_shared<Arena>());
-                    std::swap(variants.aggregates_pools, arenas);
-                    variants.aggregates_pool = variants.aggregates_pools.at(0).get();
-
-                    chunk.setChunkInfo(std::make_shared<AggregatedArenasChunkInfo>(std::move(arenas)));
-                }
-
+                cur_block_bytes += current_memory_usage;
+                finalizeCurrentChunk(std::move(chunk), key_end);
                 return;
             }
 
@@ -161,9 +146,25 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
         key_begin = key_end;
     }
 
+    cur_block_bytes += current_memory_usage;
     block_end_reached = false;
 }
 
+void AggregatingInOrderTransform::finalizeCurrentChunk(Chunk chunk, size_t key_end)
+{
+    size_t rows = chunk.getNumRows();
+    Columns source_columns = chunk.detachColumns();
+
+    for (auto & source_column : source_columns)
+        source_column = source_column->cut(key_end, rows - key_end);
+
+    current_chunk = Chunk(source_columns, rows - key_end);
+    src_rows -= current_chunk.getNumRows();
+
+    block_end_reached = true;
+    need_generate = true;
+    variants.without_key = nullptr;
+}
 
 void AggregatingInOrderTransform::work()
 {
@@ -218,6 +219,7 @@ IProcessor::Status AggregatingInOrderTransform::prepare()
                 src_rows, res_rows, formatReadableSizeWithBinarySuffix(src_bytes));
             return Status::Finished;
         }
+
         if (input.isFinished())
         {
             is_consume_finished = true;
@@ -245,14 +247,24 @@ void AggregatingInOrderTransform::generate()
     Block res = res_header.cloneEmpty();
 
     for (size_t i = 0; i < res_key_columns.size(); ++i)
-    {
         res.getByPosition(i).column = std::move(res_key_columns[i]);
-    }
+
     for (size_t i = 0; i < res_aggregate_columns.size(); ++i)
-    {
         res.getByPosition(i + res_key_columns.size()).column = std::move(res_aggregate_columns[i]);
-    }
+
     to_push_chunk = convertToChunk(res);
+
+    /// Clear arenas to allow to free them, when chunk will reach the end of pipeline.
+    /// It's safe clear them here, because columns with aggregate functions already holds them.
+    variants.aggregates_pools = { std::make_shared<Arena>() };
+    variants.aggregates_pool = variants.aggregates_pools.at(0).get();
+
+    /// Pass info about used memory by aggregate functions further.
+    to_push_chunk.setChunkInfo(std::make_shared<ChunkInfoWithAllocatedBytes>(cur_block_bytes));
+
+    cur_block_bytes = 0;
+    cur_block_size = 0;
+
     res_rows += to_push_chunk.getNumRows();
     need_generate = false;
 }
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.h b/src/Processors/Transforms/AggregatingInOrderTransform.h
index 10793e885ce..929ab98d6e6 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.h
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.h
@@ -9,16 +9,24 @@
 namespace DB
 {
 
+struct ChunkInfoWithAllocatedBytes : public ChunkInfo
+{
+    ChunkInfoWithAllocatedBytes(Int64 allocated_bytes_)
+        : allocated_bytes(allocated_bytes_) {}
+    Int64 allocated_bytes;
+};
+
 class AggregatingInOrderTransform : public IProcessor
 {
-
 public:
     AggregatingInOrderTransform(Block header, AggregatingTransformParamsPtr params,
-                                const SortDescription & group_by_description, size_t res_block_size,
+                                const SortDescription & group_by_description,
+                                size_t max_block_size_, size_t max_block_bytes_,
                                 ManyAggregatedDataPtr many_data, size_t current_variant);
 
     AggregatingInOrderTransform(Block header, AggregatingTransformParamsPtr params,
-                                const SortDescription & group_by_description, size_t res_block_size);
+                                const SortDescription & group_by_description,
+                                size_t max_block_size_, size_t max_block_bytes_);
 
     ~AggregatingInOrderTransform() override;
 
@@ -32,9 +40,12 @@ public:
 
 private:
     void generate();
+    void finalizeCurrentChunk(Chunk chunk, size_t key_end);
 
-    size_t res_block_size;
+    size_t max_block_size;
+    size_t max_block_bytes;
     size_t cur_block_size = 0;
+    size_t cur_block_bytes = 0;
 
     MutableColumns res_key_columns;
     MutableColumns res_aggregate_columns;
@@ -64,10 +75,10 @@ private:
 };
 
 
-class FinalizingSimpleTransform : public ISimpleTransform
+class FinalizeAggregatedTransform : public ISimpleTransform
 {
 public:
-    FinalizingSimpleTransform(Block header, AggregatingTransformParamsPtr params_)
+    FinalizeAggregatedTransform(Block header, AggregatingTransformParamsPtr params_)
         : ISimpleTransform({std::move(header)}, {params_->getHeader()}, true)
         , params(params_) {}
 
@@ -82,7 +93,7 @@ public:
         }
     }
 
-    String getName() const override { return "FinalizingSimpleTransform"; }
+    String getName() const override { return "FinalizeAggregatedTransform"; }
 
 private:
     AggregatingTransformParamsPtr params;
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index 7802bf6e3bf..8357a997960 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -1,10 +1,10 @@
 #include <Processors/Transforms/AggregatingTransform.h>
 
-#include <DataStreams/NativeBlockInputStream.h>
+#include <Formats/NativeReader.h>
 #include <Processors/ISource.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
-#include <DataStreams/materializeBlock.h>
+#include <Core/ProtocolDefines.h>
 
 namespace ProfileEvents
 {
@@ -55,9 +55,8 @@ namespace
     public:
         SourceFromNativeStream(const Block & header, const std::string & path)
                 : ISource(header), file_in(path), compressed_in(file_in),
-                  block_in(std::make_shared<NativeBlockInputStream>(compressed_in, DBMS_TCP_PROTOCOL_VERSION))
+                  block_in(std::make_unique<NativeReader>(compressed_in, DBMS_TCP_PROTOCOL_VERSION))
         {
-            block_in->readPrefix();
         }
 
         String getName() const override { return "SourceFromNativeStream"; }
@@ -70,7 +69,6 @@ namespace
             auto block = block_in->read();
             if (!block)
             {
-                block_in->readSuffix();
                 block_in.reset();
                 return {};
             }
@@ -81,7 +79,7 @@ namespace
     private:
         ReadBufferFromFile file_in;
         CompressedReadBuffer compressed_in;
-        BlockInputStreamPtr block_in;
+        std::unique_ptr<NativeReader> block_in;
     };
 }
 
@@ -395,9 +393,14 @@ AggregatingTransform::AggregatingTransform(Block header, AggregatingTransformPar
 }
 
 AggregatingTransform::AggregatingTransform(
-    Block header, AggregatingTransformParamsPtr params_, ManyAggregatedDataPtr many_data_,
-    size_t current_variant, size_t max_threads_, size_t temporary_data_merge_threads_)
-    : IProcessor({std::move(header)}, {params_->getHeader()}), params(std::move(params_))
+    Block header,
+    AggregatingTransformParamsPtr params_,
+    ManyAggregatedDataPtr many_data_,
+    size_t current_variant,
+    size_t max_threads_,
+    size_t temporary_data_merge_threads_)
+    : IProcessor({std::move(header)}, {params_->getHeader()})
+    , params(std::move(params_))
     , key_columns(params->params.keys_size)
     , aggregate_columns(params->params.aggregates_size)
     , many_data(std::move(many_data_))
@@ -525,7 +528,7 @@ void AggregatingTransform::consume(Chunk chunk)
     {
         auto block = getInputs().front().getHeader().cloneWithColumns(chunk.detachColumns());
         block = materializeBlock(block);
-        if (!params->aggregator.mergeBlock(block, variants, no_more_keys))
+        if (!params->aggregator.mergeOnBlock(block, variants, no_more_keys))
             is_consume_finished = true;
     }
     else
@@ -547,7 +550,7 @@ void AggregatingTransform::initGenerate()
     if (variants.empty() && params->params.keys_size == 0 && !params->params.empty_result_for_aggregation_by_empty_set)
     {
         if (params->only_merge)
-            params->aggregator.mergeBlock(getInputs().front().getHeader(), variants, no_more_keys);
+            params->aggregator.mergeOnBlock(getInputs().front().getHeader(), variants, no_more_keys);
         else
             params->aggregator.executeOnBlock(getInputs().front().getHeader(), variants, key_columns, aggregate_columns, no_more_keys);
     }
diff --git a/src/Processors/Transforms/AggregatingTransform.h b/src/Processors/Transforms/AggregatingTransform.h
index 9512a7a2811..2a515fdf3be 100644
--- a/src/Processors/Transforms/AggregatingTransform.h
+++ b/src/Processors/Transforms/AggregatingTransform.h
@@ -24,18 +24,38 @@ public:
     Int32 bucket_num = -1;
 };
 
-class IBlockInputStream;
-using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
+using AggregatorList = std::list<Aggregator>;
+using AggregatorListPtr = std::shared_ptr<AggregatorList>;
 
 struct AggregatingTransformParams
 {
     Aggregator::Params params;
-    Aggregator aggregator;
+
+    /// Each params holds a list of aggregators which are used in query. It's needed because we need
+    /// to use a pointer of aggregator to proper destroy complex aggregation states on exception
+    /// (See comments in AggregatedDataVariants). However, this pointer might not be valid because
+    /// we can have two different aggregators at the same time due to mixed pipeline of aggregate
+    /// projections, and one of them might gets destroyed before used.
+    AggregatorListPtr aggregator_list_ptr;
+    Aggregator & aggregator;
     bool final;
     bool only_merge = false;
 
     AggregatingTransformParams(const Aggregator::Params & params_, bool final_)
-        : params(params_), aggregator(params), final(final_) {}
+        : params(params_)
+        , aggregator_list_ptr(std::make_shared<AggregatorList>())
+        , aggregator(*aggregator_list_ptr->emplace(aggregator_list_ptr->end(), params))
+        , final(final_)
+    {
+    }
+
+    AggregatingTransformParams(const Aggregator::Params & params_, const AggregatorListPtr & aggregator_list_ptr_, bool final_)
+        : params(params_)
+        , aggregator_list_ptr(aggregator_list_ptr_)
+        , aggregator(*aggregator_list_ptr->emplace(aggregator_list_ptr->end(), params))
+        , final(final_)
+    {
+    }
 
     Block getHeader() const { return aggregator.getHeader(final); }
 
@@ -82,9 +102,13 @@ public:
     AggregatingTransform(Block header, AggregatingTransformParamsPtr params_);
 
     /// For Parallel aggregating.
-    AggregatingTransform(Block header, AggregatingTransformParamsPtr params_,
-                         ManyAggregatedDataPtr many_data, size_t current_variant,
-                         size_t max_threads, size_t temporary_data_merge_threads);
+    AggregatingTransform(
+        Block header,
+        AggregatingTransformParamsPtr params_,
+        ManyAggregatedDataPtr many_data,
+        size_t current_variant,
+        size_t max_threads,
+        size_t temporary_data_merge_threads);
     ~AggregatingTransform() override;
 
     String getName() const override { return "AggregatingTransform"; }
diff --git a/src/DataStreams/CheckConstraintsBlockOutputStream.cpp b/src/Processors/Transforms/CheckConstraintsTransform.cpp
similarity index 76%
rename from src/DataStreams/CheckConstraintsBlockOutputStream.cpp
rename to src/Processors/Transforms/CheckConstraintsTransform.cpp
index fbf4a777032..ef165502bed 100644
--- a/src/DataStreams/CheckConstraintsBlockOutputStream.cpp
+++ b/src/Processors/Transforms/CheckConstraintsTransform.cpp
@@ -1,15 +1,15 @@
-#include <Common/assert_cast.h>
-#include <Common/quoteString.h>
-#include <Common/FieldVisitorToString.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <Columns/ColumnsCommon.h>
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
-#include <DataStreams/CheckConstraintsBlockOutputStream.h>
-#include <Parsers/formatAST.h>
+#include <Columns/ColumnsCommon.h>
+#include <Columns/ColumnsNumber.h>
+#include <Processors/Transforms/CheckConstraintsTransform.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Parsers/formatAST.h>
+#include <Common/FieldVisitorToString.h>
+#include <Common/assert_cast.h>
+#include <Common/quoteString.h>
 
 
 namespace DB
@@ -22,26 +22,24 @@ namespace ErrorCodes
 }
 
 
-CheckConstraintsBlockOutputStream::CheckConstraintsBlockOutputStream(
+CheckConstraintsTransform::CheckConstraintsTransform(
     const StorageID & table_id_,
-    const BlockOutputStreamPtr & output_,
-    const Block & header_,
+    const Block & header,
     const ConstraintsDescription & constraints_,
     ContextPtr context_)
-    : table_id(table_id_),
-    output(output_),
-    header(header_),
-    constraints(constraints_),
-    expressions(constraints_.getExpressions(context_, header.getNamesAndTypesList()))
+    : ExceptionKeepingTransform(header, header)
+    , table_id(table_id_)
+    , constraints(constraints_)
+    , expressions(constraints_.getExpressions(context_, header.getNamesAndTypesList()))
 {
 }
 
 
-void CheckConstraintsBlockOutputStream::write(const Block & block)
+void CheckConstraintsTransform::transform(Chunk & chunk)
 {
-    if (block.rows() > 0)
+    if (chunk.getNumRows() > 0)
     {
-        Block block_to_calculate = block;
+        Block block_to_calculate = getInputPort().getHeader().cloneWithColumns(chunk.getColumns());
         for (size_t i = 0; i < expressions.size(); ++i)
         {
             auto constraint_expr = expressions[i];
@@ -65,8 +63,8 @@ void CheckConstraintsBlockOutputStream::write(const Block & block)
 
                 /// Check if constraint value is nullable
                 const auto & null_map = column_nullable->getNullMapColumn();
-                const PaddedPODArray<UInt8> & data = null_map.getData();
-                bool null_map_contains_null = !memoryIsZero(data.raw_data(), data.size() * sizeof(UInt8));
+                const PaddedPODArray<UInt8> & null_map_data = null_map.getData();
+                bool null_map_contains_null = !memoryIsZero(null_map_data.raw_data(), null_map_data.size() * sizeof(UInt8));
 
                 if (null_map_contains_null)
                     throw Exception(
@@ -82,15 +80,15 @@ void CheckConstraintsBlockOutputStream::write(const Block & block)
 
             const ColumnUInt8 & res_column_uint8 = assert_cast<const ColumnUInt8 &>(*result_column);
 
-            const UInt8 * data = res_column_uint8.getData().data();
+            const UInt8 * res_data = res_column_uint8.getData().data();
             size_t size = res_column_uint8.size();
 
             /// Is violated.
-            if (!memoryIsByte(data, size, 1))
+            if (!memoryIsByte(res_data, size, 1))
             {
                 size_t row_idx = 0;
                 for (; row_idx < size; ++row_idx)
-                    if (data[row_idx] != 1)
+                    if (res_data[row_idx] != 1)
                         break;
 
                 Names related_columns = constraint_expr->getRequiredColumns();
@@ -101,7 +99,7 @@ void CheckConstraintsBlockOutputStream::write(const Block & block)
                 column_values_msg.reserve(approx_bytes_for_col * related_columns.size());
                 for (const auto & name : related_columns)
                 {
-                    const IColumn & column = *block.getByName(name).column;
+                    const IColumn & column = *chunk.getColumns()[getInputPort().getHeader().getPositionByName(name)];
                     assert(row_idx < column.size());
 
                     if (!first)
@@ -124,23 +122,7 @@ void CheckConstraintsBlockOutputStream::write(const Block & block)
         }
     }
 
-    output->write(block);
-    rows_written += block.rows();
-}
-
-void CheckConstraintsBlockOutputStream::flush()
-{
-    output->flush();
-}
-
-void CheckConstraintsBlockOutputStream::writePrefix()
-{
-    output->writePrefix();
-}
-
-void CheckConstraintsBlockOutputStream::writeSuffix()
-{
-    output->writeSuffix();
+    rows_written += chunk.getNumRows();
 }
 
 }
diff --git a/src/DataStreams/CheckConstraintsBlockOutputStream.h b/src/Processors/Transforms/CheckConstraintsTransform.h
similarity index 54%
rename from src/DataStreams/CheckConstraintsBlockOutputStream.h
rename to src/Processors/Transforms/CheckConstraintsTransform.h
index 0f115550eb8..13569bac0de 100644
--- a/src/DataStreams/CheckConstraintsBlockOutputStream.h
+++ b/src/Processors/Transforms/CheckConstraintsTransform.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/IBlockOutputStream.h>
+#include <Processors/Transforms/ExceptionKeepingTransform.h>
 #include <Storages/ConstraintsDescription.h>
 #include <Interpreters/StorageID.h>
 
@@ -12,28 +12,21 @@ namespace DB
   * Otherwise just pass block to output unchanged.
   */
 
-class CheckConstraintsBlockOutputStream : public IBlockOutputStream
+class CheckConstraintsTransform final : public ExceptionKeepingTransform
 {
 public:
-    CheckConstraintsBlockOutputStream(
+    CheckConstraintsTransform(
             const StorageID & table_,
-            const BlockOutputStreamPtr & output_,
-            const Block & header_,
+            const Block & header,
             const ConstraintsDescription & constraints_,
             ContextPtr context_);
 
-    Block getHeader() const override { return header; }
-    void write(const Block & block) override;
+    String getName() const override { return "CheckConstraintsTransform"; }
 
-    void flush() override;
-
-    void writePrefix() override;
-    void writeSuffix() override;
+    void transform(Chunk & chunk) override;
 
 private:
     StorageID table_id;
-    BlockOutputStreamPtr output;
-    Block header;
     const ConstraintsDescription constraints;
     const ConstraintsExpressions expressions;
     size_t rows_written = 0;
diff --git a/src/Processors/Transforms/ColumnGathererTransform.cpp b/src/Processors/Transforms/ColumnGathererTransform.cpp
new file mode 100644
index 00000000000..d0cb4975290
--- /dev/null
+++ b/src/Processors/Transforms/ColumnGathererTransform.cpp
@@ -0,0 +1,167 @@
+#include <Processors/Transforms/ColumnGathererTransform.h>
+#include <base/logger_useful.h>
+#include <Common/typeid_cast.h>
+#include <Common/formatReadable.h>
+#include <IO/WriteHelpers.h>
+#include <iomanip>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INCORRECT_NUMBER_OF_COLUMNS;
+    extern const int EMPTY_DATA_PASSED;
+    extern const int RECEIVED_EMPTY_DATA;
+}
+
+ColumnGathererStream::ColumnGathererStream(
+    size_t num_inputs, ReadBuffer & row_sources_buf_, size_t block_preferred_size_)
+    : sources(num_inputs), row_sources_buf(row_sources_buf_)
+    , block_preferred_size(block_preferred_size_)
+{
+    if (num_inputs == 0)
+        throw Exception("There are no streams to gather", ErrorCodes::EMPTY_DATA_PASSED);
+}
+
+void ColumnGathererStream::initialize(Inputs inputs)
+{
+    for (size_t i = 0; i < inputs.size(); ++i)
+    {
+        if (inputs[i].chunk)
+        {
+            sources[i].update(inputs[i].chunk.detachColumns().at(0));
+            if (!result_column)
+                result_column = sources[i].column->cloneEmpty();
+        }
+    }
+}
+
+IMergingAlgorithm::Status ColumnGathererStream::merge()
+{
+    /// Nothing to read after initialize.
+    if (!result_column)
+        return Status(Chunk(), true);
+
+    if (source_to_fully_copy) /// Was set on a previous iteration
+    {
+        Chunk res;
+        res.addColumn(source_to_fully_copy->column);
+        merged_rows += source_to_fully_copy->size;
+        source_to_fully_copy->pos = source_to_fully_copy->size;
+        source_to_fully_copy = nullptr;
+        return Status(std::move(res));
+    }
+
+    /// Special case: single source and there are no skipped rows
+    /// Note: looks like this should never happen because row_sources_buf cannot just skip row info.
+    if (sources.size() == 1 && row_sources_buf.eof())
+    {
+        if (sources.front().pos < sources.front().size)
+        {
+            next_required_source = 0;
+            Chunk res;
+            merged_rows += sources.front().column->size();
+            merged_bytes += sources.front().column->allocatedBytes();
+            res.addColumn(std::move(sources.front().column));
+            sources.front().pos = sources.front().size = 0;
+            return Status(std::move(res));
+        }
+
+        if (next_required_source == -1)
+            return Status(Chunk(), true);
+
+        next_required_source = 0;
+        return Status(next_required_source);
+    }
+
+    if (next_required_source != -1 && sources[next_required_source].size == 0)
+        throw Exception("Cannot fetch required block. Source " + toString(next_required_source), ErrorCodes::RECEIVED_EMPTY_DATA);
+
+    /// Surprisingly this call may directly change some internal state of ColumnGathererStream.
+    /// output_column. See ColumnGathererStream::gather.
+    result_column->gather(*this);
+
+    if (next_required_source != -1)
+        return Status(next_required_source);
+
+    if (source_to_fully_copy && result_column->empty())
+    {
+        Chunk res;
+        merged_rows += source_to_fully_copy->column->size();
+        merged_bytes += source_to_fully_copy->column->allocatedBytes();
+        res.addColumn(source_to_fully_copy->column);
+        source_to_fully_copy->pos = source_to_fully_copy->size;
+        source_to_fully_copy = nullptr;
+        return Status(std::move(res));
+    }
+
+    auto col = result_column->cloneEmpty();
+    result_column.swap(col);
+
+    Chunk res;
+    merged_rows += col->size();
+    merged_bytes += col->allocatedBytes();
+    res.addColumn(std::move(col));
+    return Status(std::move(res), row_sources_buf.eof() && !source_to_fully_copy);
+}
+
+
+void ColumnGathererStream::consume(Input & input, size_t source_num)
+{
+    auto & source = sources[source_num];
+    if (input.chunk)
+        source.update(input.chunk.getColumns().at(0));
+
+    if (0 == source.size)
+    {
+        throw Exception("Fetched block is empty. Source " + toString(source_num),
+                        ErrorCodes::RECEIVED_EMPTY_DATA);
+    }
+}
+
+ColumnGathererTransform::ColumnGathererTransform(
+    const Block & header,
+    size_t num_inputs,
+    ReadBuffer & row_sources_buf_,
+    size_t block_preferred_size_)
+    : IMergingTransform<ColumnGathererStream>(
+        num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0,
+        num_inputs, row_sources_buf_, block_preferred_size_)
+    , log(&Poco::Logger::get("ColumnGathererStream"))
+{
+    if (header.columns() != 1)
+        throw Exception(
+            "Header should have 1 column, but contains " + toString(header.columns()),
+            ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS);
+}
+
+void ColumnGathererTransform::work()
+{
+    Stopwatch stopwatch;
+    IMergingTransform<ColumnGathererStream>::work();
+    elapsed_ns += stopwatch.elapsedNanoseconds();
+}
+
+void ColumnGathererTransform::onFinish()
+{
+    auto merged_rows = algorithm.getMergedRows();
+    auto merged_bytes = algorithm.getMergedRows();
+    /// Don't print info for small parts (< 10M rows)
+    if (merged_rows < 10000000)
+        return;
+
+    double seconds = static_cast<double>(elapsed_ns) / 1000000000ULL;
+    const auto & column_name = getOutputPort().getHeader().getByPosition(0).name;
+
+    if (!seconds)
+        LOG_DEBUG(log, "Gathered column {} ({} bytes/elem.) in 0 sec.",
+            column_name, static_cast<double>(merged_bytes) / merged_rows);
+    else
+        LOG_DEBUG(log, "Gathered column {} ({} bytes/elem.) in {} sec., {} rows/sec., {}/sec.",
+            column_name, static_cast<double>(merged_bytes) / merged_rows, seconds,
+            merged_rows / seconds, ReadableSize(merged_bytes / seconds));
+}
+
+}
diff --git a/src/DataStreams/ColumnGathererStream.h b/src/Processors/Transforms/ColumnGathererTransform.h
similarity index 68%
rename from src/DataStreams/ColumnGathererStream.h
rename to src/Processors/Transforms/ColumnGathererTransform.h
index 05665ab3f42..2d013e596ce 100644
--- a/src/DataStreams/ColumnGathererStream.h
+++ b/src/Processors/Transforms/ColumnGathererTransform.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <DataStreams/IBlockInputStream.h>
 #include <IO/ReadBuffer.h>
 #include <Common/PODArray.h>
+#include <Processors/Merges/Algorithms/IMergingAlgorithm.h>
+#include <Processors/Merges/IMergingTransform.h>
 
 
 namespace Poco { class Logger; }
@@ -53,77 +54,91 @@ using MergedRowSources = PODArray<RowSourcePart>;
   * Stream mask maps row number to index of source stream.
   * Streams should contain exactly one column.
   */
-class ColumnGathererStream : public IBlockInputStream
+class ColumnGathererStream final : public IMergingAlgorithm
 {
 public:
-    ColumnGathererStream(
-        const String & column_name_, const BlockInputStreams & source_streams, ReadBuffer & row_sources_buf_,
-        size_t block_preferred_size_ = DEFAULT_BLOCK_SIZE);
+    ColumnGathererStream(size_t num_inputs, ReadBuffer & row_sources_buf_, size_t block_preferred_size_ = DEFAULT_BLOCK_SIZE);
 
-    String getName() const override { return "ColumnGatherer"; }
-
-    Block readImpl() override;
-
-    void readSuffixImpl() override;
-
-    Block getHeader() const override { return children.at(0)->getHeader(); }
+    void initialize(Inputs inputs) override;
+    void consume(Input & input, size_t source_num) override;
+    Status merge() override;
 
     /// for use in implementations of IColumn::gather()
     template <typename Column>
     void gather(Column & column_res);
 
+    UInt64 getMergedRows() const { return merged_rows; }
+    UInt64 getMergedBytes() const { return merged_bytes; }
+
 private:
     /// Cache required fields
     struct Source
     {
-        const IColumn * column = nullptr;
+        ColumnPtr column;
         size_t pos = 0;
         size_t size = 0;
-        Block block;
 
-        void update(const String & name)
+        void update(ColumnPtr column_)
         {
-            column = block.getByName(name).column.get();
-            size = block.rows();
+            column = std::move(column_);
+            size = column->size();
             pos = 0;
         }
     };
 
-    void fetchNewBlock(Source & source, size_t source_num);
-
-    String column_name;
-    ColumnWithTypeAndName column;
+    MutableColumnPtr result_column;
 
     std::vector<Source> sources;
     ReadBuffer & row_sources_buf;
 
-    size_t block_preferred_size;
+    const size_t block_preferred_size;
 
     Source * source_to_fully_copy = nullptr;
-    Block output_block;
+
+    ssize_t next_required_source = -1;
+    size_t cur_block_preferred_size = 0;
+
+    UInt64 merged_rows = 0;
+    UInt64 merged_bytes = 0;
+};
+
+class ColumnGathererTransform final : public IMergingTransform<ColumnGathererStream>
+{
+public:
+    ColumnGathererTransform(
+        const Block & header,
+        size_t num_inputs,
+        ReadBuffer & row_sources_buf_,
+        size_t block_preferred_size_ = DEFAULT_BLOCK_SIZE);
+
+    String getName() const override { return "ColumnGathererTransform"; }
+
+    void work() override;
+
+protected:
+    void onFinish() override;
+    UInt64 elapsed_ns = 0;
 
     Poco::Logger * log;
 };
 
+
 template <typename Column>
 void ColumnGathererStream::gather(Column & column_res)
 {
-    if (source_to_fully_copy) /// Was set on a previous iteration
-    {
-        output_block.getByPosition(0).column = source_to_fully_copy->block.getByName(column_name).column;
-        source_to_fully_copy->pos = source_to_fully_copy->size;
-        source_to_fully_copy = nullptr;
-        return;
-    }
-
     row_sources_buf.nextIfAtEnd();
     RowSourcePart * row_source_pos = reinterpret_cast<RowSourcePart *>(row_sources_buf.position());
     RowSourcePart * row_sources_end = reinterpret_cast<RowSourcePart *>(row_sources_buf.buffer().end());
 
-    size_t cur_block_preferred_size = std::min(static_cast<size_t>(row_sources_end - row_source_pos), block_preferred_size);
-    column_res.reserve(cur_block_preferred_size);
+    if (next_required_source == -1)
+    {
+        /// Start new column.
+        cur_block_preferred_size = std::min(static_cast<size_t>(row_sources_end - row_source_pos), block_preferred_size);
+        column_res.reserve(cur_block_preferred_size);
+    }
 
-    size_t cur_size = 0;
+    size_t cur_size = column_res.size();
+    next_required_source = -1;
 
     while (row_source_pos < row_sources_end && cur_size < cur_block_preferred_size)
     {
@@ -131,13 +146,15 @@ void ColumnGathererStream::gather(Column & column_res)
         size_t source_num = row_source.getSourceNum();
         Source & source = sources[source_num];
         bool source_skip = row_source.getSkipFlag();
-        ++row_source_pos;
 
         if (source.pos >= source.size) /// Fetch new block from source_num part
         {
-            fetchNewBlock(source, source_num);
+            next_required_source = source_num;
+            return;
         }
 
+        ++row_source_pos;
+
         /// Consecutive optimization. TODO: precompute lengths
         size_t len = 1;
         size_t max_len = std::min(static_cast<size_t>(row_sources_end - row_source_pos), source.size - source.pos); // interval should be in the same block
@@ -156,14 +173,7 @@ void ColumnGathererStream::gather(Column & column_res)
             {
                 /// If current block already contains data, return it.
                 /// Whole column from current source will be returned on next read() iteration.
-                if (cur_size > 0)
-                {
-                    source_to_fully_copy = &source;
-                    return;
-                }
-
-                output_block.getByPosition(0).column = source.block.getByName(column_name).column;
-                source.pos += len;
+                source_to_fully_copy = &source;
                 return;
             }
             else if (len == 1)
diff --git a/src/Processors/Transforms/CountingTransform.cpp b/src/Processors/Transforms/CountingTransform.cpp
new file mode 100644
index 00000000000..fd9b80e4673
--- /dev/null
+++ b/src/Processors/Transforms/CountingTransform.cpp
@@ -0,0 +1,41 @@
+#include <iostream>
+#include <Processors/Transforms/CountingTransform.h>
+#include <Common/ProfileEvents.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event InsertedRows;
+    extern const Event InsertedBytes;
+}
+
+
+namespace DB
+{
+
+void CountingTransform::transform(Chunk & chunk)
+{
+    Progress local_progress(chunk.getNumRows(), chunk.bytes(), 0);
+    progress.incrementPiecewiseAtomically(local_progress);
+
+    //std::cerr << "============ counting adding progress for " << static_cast<const void *>(thread_status) << ' ' << chunk.getNumRows() << " rows\n";
+
+    if (thread_status)
+    {
+        thread_status->performance_counters.increment(ProfileEvents::InsertedRows, local_progress.read_rows);
+        thread_status->performance_counters.increment(ProfileEvents::InsertedBytes, local_progress.read_bytes);
+    }
+    else
+    {
+        ProfileEvents::increment(ProfileEvents::InsertedRows, local_progress.read_rows);
+        ProfileEvents::increment(ProfileEvents::InsertedBytes, local_progress.read_bytes);
+    }
+
+    if (process_elem)
+        process_elem->updateProgressOut(local_progress);
+
+    if (progress_callback)
+        progress_callback(local_progress);
+}
+
+}
diff --git a/src/Processors/Transforms/CountingTransform.h b/src/Processors/Transforms/CountingTransform.h
new file mode 100644
index 00000000000..9d0ccf11ace
--- /dev/null
+++ b/src/Processors/Transforms/CountingTransform.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <Processors/Transforms/ExceptionKeepingTransform.h>
+#include <Interpreters/ProcessList.h>
+
+
+namespace DB
+{
+
+
+/// Proxy class which counts number of written block, rows, bytes
+class CountingTransform final : public ExceptionKeepingTransform
+{
+public:
+    explicit CountingTransform(const Block & header, ThreadStatus * thread_status_ = nullptr)
+        : ExceptionKeepingTransform(header, header), thread_status(thread_status_) {}
+
+    String getName() const override { return "CountingTransform"; }
+
+    void setProgressCallback(const ProgressCallback & callback)
+    {
+        progress_callback = callback;
+    }
+
+    void setProcessListElement(QueryStatus * elem)
+    {
+        process_elem = elem;
+    }
+
+    const Progress & getProgress() const
+    {
+        return progress;
+    }
+
+    void transform(Chunk & chunk) override;
+
+protected:
+    Progress progress;
+    ProgressCallback progress_callback;
+    QueryStatus * process_elem = nullptr;
+    ThreadStatus * thread_status = nullptr;
+};
+
+}
diff --git a/src/Processors/Transforms/CreatingSetsTransform.cpp b/src/Processors/Transforms/CreatingSetsTransform.cpp
index 6f69765ee23..fb3c8d6a87b 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.cpp
+++ b/src/Processors/Transforms/CreatingSetsTransform.cpp
@@ -1,14 +1,12 @@
 #include <Processors/Transforms/CreatingSetsTransform.h>
-#include <DataStreams/PushingToSinkBlockOutputStream.h>
-
-#include <DataStreams/IBlockOutputStream.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Sinks/SinkToStorage.h>
 
 #include <Interpreters/Set.h>
 #include <Interpreters/IJoin.h>
 #include <Storages/IStorage.h>
 
 #include <iomanip>
-#include <DataStreams/materializeBlock.h>
 
 
 namespace DB
@@ -20,6 +18,7 @@ namespace ErrorCodes
     extern const int SET_SIZE_LIMIT_EXCEEDED;
 }
 
+CreatingSetsTransform::~CreatingSetsTransform() = default;
 
 CreatingSetsTransform::CreatingSetsTransform(
     Block in_header_,
@@ -50,7 +49,8 @@ void CreatingSetsTransform::startSubquery()
         LOG_TRACE(log, "Filling temporary table.");
 
     if (subquery.table)
-        table_out = std::make_shared<PushingToSinkBlockOutputStream>(subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), getContext()));
+        /// TODO: make via port
+        table_out = QueryPipeline(subquery.table->write({}, subquery.table->getInMemoryMetadataPtr(), getContext()));
 
     done_with_set = !subquery.set;
     done_with_table = !subquery.table;
@@ -58,8 +58,11 @@ void CreatingSetsTransform::startSubquery()
     if (done_with_set /*&& done_with_join*/ && done_with_table)
         throw Exception("Logical error: nothing to do with subquery", ErrorCodes::LOGICAL_ERROR);
 
-    if (table_out)
-        table_out->writePrefix();
+    if (table_out.initialized())
+    {
+        executor = std::make_unique<PushingPipelineExecutor>(table_out);
+        executor->start();
+    }
 }
 
 void CreatingSetsTransform::finishSubquery()
@@ -84,7 +87,7 @@ void CreatingSetsTransform::init()
     is_initialized = true;
 
     if (subquery.set)
-        subquery.set->setHeader(getInputPort().getHeader());
+        subquery.set->setHeader(getInputPort().getHeader().getColumnsWithTypeAndName());
 
     watch.restart();
     startSubquery();
@@ -97,14 +100,14 @@ void CreatingSetsTransform::consume(Chunk chunk)
 
     if (!done_with_set)
     {
-        if (!subquery.set->insertFromBlock(block))
+        if (!subquery.set->insertFromBlock(block.getColumnsWithTypeAndName()))
             done_with_set = true;
     }
 
     if (!done_with_table)
     {
         block = materializeBlock(block);
-        table_out->write(block);
+        executor->push(block);
 
         rows_to_transfer += block.rows();
         bytes_to_transfer += block.bytes();
@@ -123,8 +126,12 @@ Chunk CreatingSetsTransform::generate()
     if (subquery.set)
         subquery.set->finishInsert();
 
-    if (table_out)
-        table_out->writeSuffix();
+    if (table_out.initialized())
+    {
+        executor->finish();
+        executor.reset();
+        table_out.reset();
+    }
 
     finishSubquery();
     return {};
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index a847582a988..839ab0cac88 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <DataStreams/SizeLimits.h>
-#include <DataStreams/IBlockStream_fwd.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/SubqueryForSet.h>
 #include <Processors/IAccumulatingTransform.h>
+#include <QueryPipeline/Chain.h>
+#include <QueryPipeline/QueryPipeline.h>
 #include <Common/Stopwatch.h>
 
 #include <Poco/Logger.h>
@@ -16,6 +17,8 @@ class QueryStatus;
 struct Progress;
 using ProgressCallback = std::function<void(const Progress & progress)>;
 
+class PushingPipelineExecutor;
+
 /// This processor creates set during execution.
 /// Don't return any data. Sets are created when Finish status is returned.
 /// In general, several work() methods need to be called to finish.
@@ -30,6 +33,8 @@ public:
         SizeLimits network_transfer_limits_,
         ContextPtr context_);
 
+    ~CreatingSetsTransform() override;
+
     String getName() const override { return "CreatingSetsTransform"; }
 
     void work() override;
@@ -39,7 +44,8 @@ public:
 private:
     SubqueryForSet subquery;
 
-    BlockOutputStreamPtr table_out;
+    std::unique_ptr<PushingPipelineExecutor> executor;
+    QueryPipeline table_out;
     UInt64 read_rows = 0;
     Stopwatch watch;
 
diff --git a/src/DataStreams/DistinctSortedBlockInputStream.cpp b/src/Processors/Transforms/DistinctSortedTransform.cpp
similarity index 65%
rename from src/DataStreams/DistinctSortedBlockInputStream.cpp
rename to src/Processors/Transforms/DistinctSortedTransform.cpp
index eab706924c1..01cef654388 100644
--- a/src/DataStreams/DistinctSortedBlockInputStream.cpp
+++ b/src/Processors/Transforms/DistinctSortedTransform.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/DistinctSortedBlockInputStream.h>
+#include <Processors/Transforms/DistinctSortedTransform.h>
 
 namespace DB
 {
@@ -8,40 +8,28 @@ namespace ErrorCodes
     extern const int SET_SIZE_LIMIT_EXCEEDED;
 }
 
-DistinctSortedBlockInputStream::DistinctSortedBlockInputStream(
-    const BlockInputStreamPtr & input, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns)
-    : description(std::move(sort_description))
+DistinctSortedTransform::DistinctSortedTransform(
+    const Block & header, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns)
+    : ISimpleTransform(header, header, true)
+    , description(std::move(sort_description))
     , columns_names(columns)
     , limit_hint(limit_hint_)
     , set_size_limits(set_size_limits_)
 {
-    children.push_back(input);
 }
 
-Block DistinctSortedBlockInputStream::readImpl()
+void DistinctSortedTransform::transform(Chunk & chunk)
 {
-    /// Execute until end of stream or until
-    /// a block with some new records will be gotten.
-    for (;;)
-    {
-        /// Stop reading if we already reached the limit.
-        if (limit_hint && data.getTotalRowCount() >= limit_hint)
-            return Block();
-
-        Block block = children.back()->read();
-        if (!block)
-            return Block();
-
-        const ColumnRawPtrs column_ptrs(getKeyColumns(block));
+        const ColumnRawPtrs column_ptrs(getKeyColumns(chunk));
         if (column_ptrs.empty())
-            return block;
+            return;
 
-        const ColumnRawPtrs clearing_hint_columns(getClearingColumns(block, column_ptrs));
+        const ColumnRawPtrs clearing_hint_columns(getClearingColumns(chunk, column_ptrs));
 
         if (data.type == ClearableSetVariants::Type::EMPTY)
             data.init(ClearableSetVariants::chooseMethod(column_ptrs, key_sizes));
 
-        const size_t rows = block.rows();
+        const size_t rows = chunk.getNumRows();
         IColumn::Filter filter(rows);
 
         bool has_new_data = false;
@@ -59,25 +47,36 @@ Block DistinctSortedBlockInputStream::readImpl()
 
         /// Just go to the next block if there isn't any new record in the current one.
         if (!has_new_data)
-            continue;
+        {
+            chunk.clear();
+            return;
+        }
 
         if (!set_size_limits.check(data.getTotalRowCount(), data.getTotalByteCount(), "DISTINCT", ErrorCodes::SET_SIZE_LIMIT_EXCEEDED))
-            return {};
+        {
+            stopReading();
+            chunk.clear();
+            return;
+        }
 
-        prev_block.block = block;
-        prev_block.clearing_hint_columns = std::move(clearing_hint_columns);
+        /// Stop reading if we already reached the limit.
+        if (limit_hint && data.getTotalRowCount() >= limit_hint)
+            stopReading();
 
-        size_t all_columns = block.columns();
+        prev_chunk.chunk = std::move(chunk);
+        prev_chunk.clearing_hint_columns = std::move(clearing_hint_columns);
+
+        size_t all_columns = prev_chunk.chunk.getNumColumns();
+        Chunk res_chunk;
         for (size_t i = 0; i < all_columns; ++i)
-            block.safeGetByPosition(i).column = block.safeGetByPosition(i).column->filter(filter, -1);
+            res_chunk.addColumn(prev_chunk.chunk.getColumns().at(i)->filter(filter, -1));
 
-        return block;
-    }
+        chunk = std::move(res_chunk);
 }
 
 
 template <typename Method>
-bool DistinctSortedBlockInputStream::buildFilter(
+bool DistinctSortedTransform::buildFilter(
     Method & method,
     const ColumnRawPtrs & columns,
     const ColumnRawPtrs & clearing_hint_columns,
@@ -90,8 +89,8 @@ bool DistinctSortedBlockInputStream::buildFilter(
     /// Compare last row of previous block and first row of current block,
     /// If rows not equal, we can clear HashSet,
     /// If clearing_hint_columns is empty, we CAN'T clear HashSet.
-    if (!clearing_hint_columns.empty() && !prev_block.clearing_hint_columns.empty()
-        && !rowsEqual(clearing_hint_columns, 0, prev_block.clearing_hint_columns, prev_block.block.rows() - 1))
+    if (!clearing_hint_columns.empty() && !prev_chunk.clearing_hint_columns.empty()
+        && !rowsEqual(clearing_hint_columns, 0, prev_chunk.clearing_hint_columns, prev_chunk.chunk.getNumRows() - 1))
     {
         method.data.clear();
     }
@@ -117,18 +116,20 @@ bool DistinctSortedBlockInputStream::buildFilter(
     return has_new_data;
 }
 
-ColumnRawPtrs DistinctSortedBlockInputStream::getKeyColumns(const Block & block) const
+ColumnRawPtrs DistinctSortedTransform::getKeyColumns(const Chunk & chunk) const
 {
-    size_t columns = columns_names.empty() ? block.columns() : columns_names.size();
+    size_t columns = columns_names.empty() ? chunk.getNumColumns() : columns_names.size();
 
     ColumnRawPtrs column_ptrs;
     column_ptrs.reserve(columns);
 
     for (size_t i = 0; i < columns; ++i)
     {
-        const auto & column = columns_names.empty()
-            ? block.safeGetByPosition(i).column
-            : block.getByName(columns_names[i]).column;
+        auto pos = i;
+        if (!columns_names.empty())
+            pos = input.getHeader().getPositionByName(columns_names[i]);
+
+        const auto & column = chunk.getColumns()[pos];
 
         /// Ignore all constant columns.
         if (!isColumnConst(*column))
@@ -138,13 +139,13 @@ ColumnRawPtrs DistinctSortedBlockInputStream::getKeyColumns(const Block & block)
     return column_ptrs;
 }
 
-ColumnRawPtrs DistinctSortedBlockInputStream::getClearingColumns(const Block & block, const ColumnRawPtrs & key_columns) const
+ColumnRawPtrs DistinctSortedTransform::getClearingColumns(const Chunk & chunk, const ColumnRawPtrs & key_columns) const
 {
     ColumnRawPtrs clearing_hint_columns;
     clearing_hint_columns.reserve(description.size());
     for (const auto & sort_column_description : description)
     {
-        const auto * sort_column_ptr = block.safeGetByPosition(sort_column_description.column_number).column.get();
+        const auto * sort_column_ptr = chunk.getColumns().at(sort_column_description.column_number).get();
         const auto it = std::find(key_columns.cbegin(), key_columns.cend(), sort_column_ptr);
         if (it != key_columns.cend()) /// if found in key_columns
             clearing_hint_columns.emplace_back(sort_column_ptr);
@@ -154,7 +155,7 @@ ColumnRawPtrs DistinctSortedBlockInputStream::getClearingColumns(const Block & b
     return clearing_hint_columns;
 }
 
-bool DistinctSortedBlockInputStream::rowsEqual(const ColumnRawPtrs & lhs, size_t n, const ColumnRawPtrs & rhs, size_t m)
+bool DistinctSortedTransform::rowsEqual(const ColumnRawPtrs & lhs, size_t n, const ColumnRawPtrs & rhs, size_t m)
 {
     for (size_t column_index = 0, num_columns = lhs.size(); column_index < num_columns; ++column_index)
     {
diff --git a/src/DataStreams/DistinctSortedBlockInputStream.h b/src/Processors/Transforms/DistinctSortedTransform.h
similarity index 70%
rename from src/DataStreams/DistinctSortedBlockInputStream.h
rename to src/Processors/Transforms/DistinctSortedTransform.h
index 146c9326e5d..ddac6c18a64 100644
--- a/src/DataStreams/DistinctSortedBlockInputStream.h
+++ b/src/Processors/Transforms/DistinctSortedTransform.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/ISimpleTransform.h>
 #include <Interpreters/SetVariants.h>
 #include <Core/SortDescription.h>
 
@@ -18,24 +18,22 @@ namespace DB
   * set limit_hint to non zero value. So we stop emitting new rows after
   * count of already emitted rows will reach the limit_hint.
   */
-class DistinctSortedBlockInputStream : public IBlockInputStream
+class DistinctSortedTransform : public ISimpleTransform
 {
 public:
     /// Empty columns_ means all columns.
-    DistinctSortedBlockInputStream(const BlockInputStreamPtr & input, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns);
+    DistinctSortedTransform(const Block & header, SortDescription sort_description, const SizeLimits & set_size_limits_, UInt64 limit_hint_, const Names & columns);
 
-    String getName() const override { return "DistinctSorted"; }
-
-    Block getHeader() const override { return children.at(0)->getHeader(); }
+    String getName() const override { return "DistinctSortedTransform"; }
 
 protected:
-    Block readImpl() override;
+    void transform(Chunk & chunk) override;
 
 private:
-    ColumnRawPtrs getKeyColumns(const Block & block) const;
+    ColumnRawPtrs getKeyColumns(const Chunk & chunk) const;
     /// When clearing_columns changed, we can clean HashSet to memory optimization
     /// clearing_columns is a left-prefix of SortDescription exists in key_columns
-    ColumnRawPtrs getClearingColumns(const Block & block, const ColumnRawPtrs & key_columns) const;
+    ColumnRawPtrs getClearingColumns(const Chunk & chunk, const ColumnRawPtrs & key_columns) const;
     static bool rowsEqual(const ColumnRawPtrs & lhs, size_t n, const ColumnRawPtrs & rhs, size_t m);
 
     /// return true if has new data
@@ -50,12 +48,12 @@ private:
 
     SortDescription description;
 
-    struct PreviousBlock
+    struct PreviousChunk
     {
-        Block block;
+        Chunk chunk;
         ColumnRawPtrs clearing_hint_columns;
     };
-    PreviousBlock prev_block;
+    PreviousChunk prev_chunk;
 
     Names columns_names;
     ClearableSetVariants data;
diff --git a/src/Processors/Transforms/DistinctTransform.h b/src/Processors/Transforms/DistinctTransform.h
index 236f9026c63..d80fdb5bc22 100644
--- a/src/Processors/Transforms/DistinctTransform.h
+++ b/src/Processors/Transforms/DistinctTransform.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Processors/ISimpleTransform.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Core/ColumnNumbers.h>
 #include <Interpreters/SetVariants.h>
 
diff --git a/src/Processors/Transforms/ExceptionKeepingTransform.cpp b/src/Processors/Transforms/ExceptionKeepingTransform.cpp
new file mode 100644
index 00000000000..5c968471e1b
--- /dev/null
+++ b/src/Processors/Transforms/ExceptionKeepingTransform.cpp
@@ -0,0 +1,164 @@
+#include <Processors/Transforms/ExceptionKeepingTransform.h>
+#include <Common/ThreadStatus.h>
+#include <Common/Stopwatch.h>
+#include <base/scope_guard.h>
+#include <iostream>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+ExceptionKeepingTransform::ExceptionKeepingTransform(const Block & in_header, const Block & out_header, bool ignore_on_start_and_finish_)
+    : IProcessor({in_header}, {out_header})
+    , input(inputs.front()), output(outputs.front())
+    , ignore_on_start_and_finish(ignore_on_start_and_finish_)
+{
+}
+
+IProcessor::Status ExceptionKeepingTransform::prepare()
+{
+    if (!ignore_on_start_and_finish && !was_on_start_called)
+        return Status::Ready;
+
+    /// Check can output.
+
+    if (output.isFinished())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Output port is finished for {}", getName());
+
+    if (!output.canPush())
+    {
+        input.setNotNeeded();
+        return Status::PortFull;
+    }
+
+    /// Output if has data.
+    if (ready_output)
+    {
+        output.pushData(std::move(data));
+        ready_output = false;
+        return Status::PortFull;
+    }
+
+    if (!ready_input)
+    {
+        if (input.isFinished())
+        {
+            if (!ignore_on_start_and_finish && !was_on_finish_called && !has_exception)
+                return Status::Ready;
+
+            output.finish();
+            return Status::Finished;
+        }
+
+        input.setNeeded();
+
+        if (!input.hasData())
+            return Status::NeedData;
+
+        data = input.pullData(true);
+
+        if (data.exception)
+        {
+            has_exception = true;
+            output.pushData(std::move(data));
+            return Status::PortFull;
+        }
+
+        if (has_exception)
+            /// In case of exception, just drop all other data.
+            /// If transform is stateful, it's state may be broken after exception from transform()
+            data.chunk.clear();
+        else
+            ready_input = true;
+    }
+
+    return Status::Ready;
+}
+
+static std::exception_ptr runStep(std::function<void()> step, ThreadStatus * thread_status, std::atomic_uint64_t * elapsed_ms)
+{
+    std::exception_ptr res;
+    std::optional<Stopwatch> watch;
+
+    auto * original_thread = current_thread;
+    SCOPE_EXIT({ current_thread = original_thread; });
+
+    if (thread_status)
+    {
+        /// Change thread context to store individual metrics. Once the work in done, go back to the original thread
+        thread_status->resetPerformanceCountersLastUsage();
+        current_thread = thread_status;
+    }
+
+    if (elapsed_ms)
+        watch.emplace();
+
+    try
+    {
+        step();
+    }
+    catch (...)
+    {
+        res = std::current_exception();
+    }
+
+    if (thread_status)
+        thread_status->updatePerformanceCounters();
+
+    if (elapsed_ms && watch)
+        *elapsed_ms += watch->elapsedMilliseconds();
+
+    return res;
+}
+
+void ExceptionKeepingTransform::work()
+{
+    if (!ignore_on_start_and_finish && !was_on_start_called)
+    {
+        was_on_start_called = true;
+
+        if (auto exception = runStep([this] { onStart(); }, thread_status, elapsed_counter_ms))
+        {
+            has_exception = true;
+            ready_output = true;
+            data.exception = std::move(exception);
+        }
+    }
+    else if (ready_input)
+    {
+        ready_input = false;
+
+        if (auto exception = runStep([this] { transform(data.chunk); }, thread_status, elapsed_counter_ms))
+        {
+            has_exception = true;
+            data.chunk.clear();
+            data.exception = std::move(exception);
+        }
+
+        if (data.chunk || data.exception)
+            ready_output = true;
+    }
+    else if (!ignore_on_start_and_finish && !was_on_finish_called)
+    {
+        was_on_finish_called = true;
+
+        if (auto exception = runStep([this] { onFinish(); }, thread_status, elapsed_counter_ms))
+        {
+            has_exception = true;
+            ready_output = true;
+            data.exception = std::move(exception);
+        }
+    }
+}
+
+void ExceptionKeepingTransform::setRuntimeData(ThreadStatus * thread_status_, std::atomic_uint64_t * elapsed_counter_ms_)
+{
+    thread_status = thread_status_;
+    elapsed_counter_ms = elapsed_counter_ms_;
+}
+
+}
diff --git a/src/Processors/Transforms/ExceptionKeepingTransform.h b/src/Processors/Transforms/ExceptionKeepingTransform.h
new file mode 100644
index 00000000000..867f13bf53a
--- /dev/null
+++ b/src/Processors/Transforms/ExceptionKeepingTransform.h
@@ -0,0 +1,60 @@
+#pragma once
+#include <Processors/IProcessor.h>
+
+namespace DB
+{
+
+
+class ThreadStatus;
+
+/// Has one input and one output.
+/// Works similarly to ISimpleTransform, but with much care about exceptions.
+///
+/// If input contain exception, this exception is pushed directly to output port.
+/// If input contain data chunk, transform() is called for it.
+/// When transform throws exception itself, data chunk is replaced by caught exception.
+/// Transformed chunk or newly caught exception is pushed to output.
+///
+/// There may be any number of exceptions read from input, transform keeps the order.
+/// It is expected that output port won't be closed from the other side before all data is processed.
+///
+/// Method onStart() is called before reading any data.
+/// Method onFinish() is called after all data from input is processed, if no exception happened.
+/// In case of exception, it is additionally pushed into pipeline.
+class ExceptionKeepingTransform : public IProcessor
+{
+protected:
+    InputPort & input;
+    OutputPort & output;
+    Port::Data data;
+
+    bool ready_input = false;
+    bool ready_output = false;
+    bool has_exception = false;
+
+    const bool ignore_on_start_and_finish = true;
+    bool was_on_start_called = false;
+    bool was_on_finish_called = false;
+
+//protected:
+    virtual void transform(Chunk & chunk) = 0;
+    virtual void onStart() {}
+    virtual void onFinish() {}
+
+public:
+    ExceptionKeepingTransform(const Block & in_header, const Block & out_header, bool ignore_on_start_and_finish_ = true);
+
+    Status prepare() override;
+    void work() override;
+
+    InputPort & getInputPort() { return input; }
+    OutputPort & getOutputPort() { return output; }
+
+    void setRuntimeData(ThreadStatus * thread_status_, std::atomic_uint64_t * elapsed_counter_ms_);
+
+private:
+    ThreadStatus * thread_status = nullptr;
+    std::atomic_uint64_t * elapsed_counter_ms = nullptr;
+};
+
+}
diff --git a/src/Processors/Transforms/ExpressionTransform.cpp b/src/Processors/Transforms/ExpressionTransform.cpp
index efdff086efa..ca788f1dd9f 100644
--- a/src/Processors/Transforms/ExpressionTransform.cpp
+++ b/src/Processors/Transforms/ExpressionTransform.cpp
@@ -25,4 +25,20 @@ void ExpressionTransform::transform(Chunk & chunk)
     chunk.setColumns(block.getColumns(), num_rows);
 }
 
+ConvertingTransform::ConvertingTransform(const Block & header_, ExpressionActionsPtr expression_)
+    : ExceptionKeepingTransform(header_, ExpressionTransform::transformHeader(header_, expression_->getActionsDAG()))
+    , expression(std::move(expression_))
+{
+}
+
+void ConvertingTransform::transform(Chunk & chunk)
+{
+    size_t num_rows = chunk.getNumRows();
+    auto block = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
+
+    expression->execute(block, num_rows);
+
+    chunk.setColumns(block.getColumns(), num_rows);
+}
+
 }
diff --git a/src/Processors/Transforms/ExpressionTransform.h b/src/Processors/Transforms/ExpressionTransform.h
index d4cc1c8f78a..a76dc733e14 100644
--- a/src/Processors/Transforms/ExpressionTransform.h
+++ b/src/Processors/Transforms/ExpressionTransform.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <Processors/Transforms/ExceptionKeepingTransform.h>
 #include <Processors/ISimpleTransform.h>
 
 namespace DB
@@ -14,7 +15,7 @@ class ActionsDAG;
   * For example: hits * 2 + 3, url LIKE '%yandex%'
   * The expression processes each row independently of the others.
   */
-class ExpressionTransform : public ISimpleTransform
+class ExpressionTransform final : public ISimpleTransform
 {
 public:
     ExpressionTransform(
@@ -32,4 +33,20 @@ private:
     ExpressionActionsPtr expression;
 };
 
+class ConvertingTransform final : public ExceptionKeepingTransform
+{
+public:
+    ConvertingTransform(
+            const Block & header_,
+            ExpressionActionsPtr expression_);
+
+    String getName() const override { return "ConvertingTransform"; }
+
+protected:
+    void transform(Chunk & chunk) override;
+
+private:
+    ExpressionActionsPtr expression;
+};
+
 }
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index 831130d06d1..3ff89c302ff 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -81,7 +81,7 @@ FillingTransform::FillingTransform(
     };
 
     std::vector<bool> is_fill_column(header_.columns());
-    for (size_t i = 0; i < sort_description.size(); ++i)
+    for (size_t i = 0, size = sort_description.size(); i < size; ++i)
     {
         size_t block_position = header_.getPositionByName(sort_description[i].column_name);
         is_fill_column[block_position] = true;
@@ -103,6 +103,11 @@ FillingTransform::FillingTransform(
         }
     }
 
+    std::set<size_t> unique_positions;
+    for (auto pos : fill_column_positions)
+        if (!unique_positions.insert(pos).second)
+            throw Exception("Multiple WITH FILL for identical expressions is not supported in ORDER BY", ErrorCodes::INVALID_WITH_FILL_EXPRESSION);
+
     for (size_t i = 0; i < header_.columns(); ++i)
         if (!is_fill_column[i])
             other_column_positions.push_back(i);
@@ -114,7 +119,7 @@ IProcessor::Status FillingTransform::prepare()
     {
         should_insert_first = next_row < filling_row;
 
-        for (size_t i = 0; i < filling_row.size(); ++i)
+        for (size_t i = 0, size = filling_row.size(); i < size; ++i)
             next_row[i] = filling_row.getFillDescription(i).fill_to;
 
         if (filling_row < next_row)
@@ -227,9 +232,9 @@ void FillingTransform::setResultColumns(Chunk & chunk, MutableColumns & fill_col
     /// fill_columns always non-empty.
     size_t num_rows = fill_columns[0]->size();
 
-    for (size_t i = 0; i < fill_columns.size(); ++i)
+    for (size_t i = 0, size = fill_columns.size(); i < size; ++i)
         result_columns[fill_column_positions[i]] = std::move(fill_columns[i]);
-    for (size_t i = 0; i < other_columns.size(); ++i)
+    for (size_t i = 0, size = other_columns.size(); i < size; ++i)
         result_columns[other_column_positions[i]] = std::move(other_columns[i]);
 
     chunk.setColumns(std::move(result_columns), num_rows);
diff --git a/src/Processors/Transforms/IntersectOrExceptTransform.cpp b/src/Processors/Transforms/IntersectOrExceptTransform.cpp
new file mode 100644
index 00000000000..3e39123ae4b
--- /dev/null
+++ b/src/Processors/Transforms/IntersectOrExceptTransform.cpp
@@ -0,0 +1,197 @@
+#include <Processors/Transforms/IntersectOrExceptTransform.h>
+
+
+namespace DB
+{
+
+/// After visitor is applied, ASTSelectIntersectExcept always has two child nodes.
+IntersectOrExceptTransform::IntersectOrExceptTransform(const Block & header_, Operator operator_)
+    : IProcessor(InputPorts(2, header_), {header_})
+    , current_operator(operator_)
+{
+    const Names & columns = header_.getNames();
+    size_t num_columns = columns.empty() ? header_.columns() : columns.size();
+
+    key_columns_pos.reserve(columns.size());
+    for (size_t i = 0; i < num_columns; ++i)
+    {
+        auto pos = columns.empty() ? i : header_.getPositionByName(columns[i]);
+        key_columns_pos.emplace_back(pos);
+    }
+}
+
+
+IntersectOrExceptTransform::Status IntersectOrExceptTransform::prepare()
+{
+    auto & output = outputs.front();
+
+    if (output.isFinished())
+    {
+        for (auto & in : inputs)
+            in.close();
+
+        return Status::Finished;
+    }
+
+    if (!output.canPush())
+    {
+        for (auto & input : inputs)
+            input.setNotNeeded();
+
+        return Status::PortFull;
+    }
+
+    if (current_output_chunk)
+    {
+        output.push(std::move(current_output_chunk));
+    }
+
+    if (finished_second_input)
+    {
+        if (inputs.front().isFinished())
+        {
+            output.finish();
+            return Status::Finished;
+        }
+    }
+    else if (inputs.back().isFinished())
+    {
+        finished_second_input = true;
+    }
+
+    if (!has_input)
+    {
+        InputPort & input = finished_second_input ? inputs.front() : inputs.back();
+
+        input.setNeeded();
+        if (!input.hasData())
+            return Status::NeedData;
+
+        current_input_chunk = input.pull();
+        has_input = true;
+    }
+
+    return Status::Ready;
+}
+
+
+void IntersectOrExceptTransform::work()
+{
+    if (!finished_second_input)
+    {
+        accumulate(std::move(current_input_chunk));
+    }
+    else
+    {
+        filter(current_input_chunk);
+        current_output_chunk = std::move(current_input_chunk);
+    }
+
+    has_input = false;
+}
+
+
+template <typename Method>
+void IntersectOrExceptTransform::addToSet(Method & method, const ColumnRawPtrs & columns, size_t rows, SetVariants & variants) const
+{
+    typename Method::State state(columns, key_sizes, nullptr);
+
+    for (size_t i = 0; i < rows; ++i)
+        state.emplaceKey(method.data, i, variants.string_pool);
+}
+
+
+template <typename Method>
+size_t IntersectOrExceptTransform::buildFilter(
+    Method & method, const ColumnRawPtrs & columns, IColumn::Filter & filter, size_t rows, SetVariants & variants) const
+{
+    typename Method::State state(columns, key_sizes, nullptr);
+    size_t new_rows_num = 0;
+
+    for (size_t i = 0; i < rows; ++i)
+    {
+        auto find_result = state.findKey(method.data, i, variants.string_pool);
+        filter[i] = current_operator == ASTSelectIntersectExceptQuery::Operator::EXCEPT ? !find_result.isFound() : find_result.isFound();
+        if (filter[i])
+            ++new_rows_num;
+    }
+    return new_rows_num;
+}
+
+
+void IntersectOrExceptTransform::accumulate(Chunk chunk)
+{
+    auto num_rows = chunk.getNumRows();
+    auto columns = chunk.detachColumns();
+
+    ColumnRawPtrs column_ptrs;
+    column_ptrs.reserve(key_columns_pos.size());
+
+    for (auto pos : key_columns_pos)
+        column_ptrs.emplace_back(columns[pos].get());
+
+    if (!data)
+        data.emplace();
+
+    if (data->empty())
+        data->init(SetVariants::chooseMethod(column_ptrs, key_sizes));
+
+    auto & data_set = *data;
+    switch (data->type)
+    {
+        case SetVariants::Type::EMPTY:
+            break;
+#define M(NAME) \
+    case SetVariants::Type::NAME: \
+        addToSet(*data_set.NAME, column_ptrs, num_rows, data_set); \
+        break;
+            APPLY_FOR_SET_VARIANTS(M)
+#undef M
+    }
+}
+
+
+void IntersectOrExceptTransform::filter(Chunk & chunk)
+{
+    auto num_rows = chunk.getNumRows();
+    auto columns = chunk.detachColumns();
+
+    ColumnRawPtrs column_ptrs;
+    column_ptrs.reserve(key_columns_pos.size());
+
+    for (auto pos : key_columns_pos)
+        column_ptrs.emplace_back(columns[pos].get());
+
+    if (!data)
+        data.emplace();
+
+    if (data->empty())
+        data->init(SetVariants::chooseMethod(column_ptrs, key_sizes));
+
+    size_t new_rows_num = 0;
+
+    IColumn::Filter filter(num_rows);
+    auto & data_set = *data;
+
+    switch (data->type)
+    {
+        case SetVariants::Type::EMPTY:
+            break;
+#define M(NAME) \
+    case SetVariants::Type::NAME: \
+        new_rows_num = buildFilter(*data_set.NAME, column_ptrs, filter, num_rows, data_set); \
+        break;
+            APPLY_FOR_SET_VARIANTS(M)
+#undef M
+    }
+
+    if (!new_rows_num)
+        return;
+
+    for (auto & column : columns)
+        column = column->filter(filter, -1);
+
+    chunk.setColumns(std::move(columns), new_rows_num);
+}
+
+}
diff --git a/src/Processors/Transforms/IntersectOrExceptTransform.h b/src/Processors/Transforms/IntersectOrExceptTransform.h
new file mode 100644
index 00000000000..e200bfd6cc5
--- /dev/null
+++ b/src/Processors/Transforms/IntersectOrExceptTransform.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Processors/IProcessor.h>
+#include <Interpreters/SetVariants.h>
+#include <Core/ColumnNumbers.h>
+#include <Parsers/ASTSelectIntersectExceptQuery.h>
+
+
+namespace DB
+{
+
+class IntersectOrExceptTransform : public IProcessor
+{
+using Operator = ASTSelectIntersectExceptQuery::Operator;
+
+public:
+    IntersectOrExceptTransform(const Block & header_, Operator operator_);
+
+    String getName() const override { return "IntersectOrExcept"; }
+
+protected:
+    Status prepare() override;
+
+    void work() override;
+
+private:
+    Operator current_operator;
+
+    ColumnNumbers key_columns_pos;
+    std::optional<SetVariants> data;
+    Sizes key_sizes;
+
+    Chunk current_input_chunk;
+    Chunk current_output_chunk;
+
+    bool finished_second_input = false;
+    bool has_input = false;
+
+    void accumulate(Chunk chunk);
+
+    void filter(Chunk & chunk);
+
+    template <typename Method>
+    void addToSet(Method & method, const ColumnRawPtrs & key_columns, size_t rows, SetVariants & variants) const;
+
+    template <typename Method>
+    size_t buildFilter(Method & method, const ColumnRawPtrs & columns,
+        IColumn::Filter & filter, size_t rows, SetVariants & variants) const;
+};
+
+}
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index e402fd788bc..29ef4509359 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -1,9 +1,8 @@
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/join_common.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataStreams/IBlockInputStream.h>
 
+#include <base/logger_useful.h>
 
 namespace DB
 {
@@ -15,8 +14,11 @@ namespace ErrorCodes
 
 Block JoiningTransform::transformHeader(Block header, const JoinPtr & join)
 {
+    LOG_DEBUG(&Poco::Logger::get("JoiningTransform"), "Before join block: '{}'", header.dumpStructure());
+    join->checkTypesOfKeys(header);
     ExtraBlockPtr tmp;
     join->joinBlock(header, tmp);
+    LOG_DEBUG(&Poco::Logger::get("JoiningTransform"), "After join block: '{}'", header.dumpStructure());
     return header;
 }
 
@@ -114,7 +116,7 @@ void JoiningTransform::work()
     }
     else
     {
-        if (!non_joined_stream)
+        if (!non_joined_blocks)
         {
             if (!finish_counter || !finish_counter->isLast())
             {
@@ -122,15 +124,16 @@ void JoiningTransform::work()
                 return;
             }
 
-            non_joined_stream = join->createStreamWithNonJoinedRows(outputs.front().getHeader(), max_block_size);
-            if (!non_joined_stream)
+            non_joined_blocks = join->getNonJoinedBlocks(
+                inputs.front().getHeader(), outputs.front().getHeader(), max_block_size);
+            if (!non_joined_blocks)
             {
                 process_non_joined = false;
                 return;
             }
         }
 
-        auto block = non_joined_stream->read();
+        Block block = non_joined_blocks->read();
         if (!block)
         {
             process_non_joined = false;
diff --git a/src/Processors/Transforms/JoiningTransform.h b/src/Processors/Transforms/JoiningTransform.h
index 98038946f3b..96c4032dabc 100644
--- a/src/Processors/Transforms/JoiningTransform.h
+++ b/src/Processors/Transforms/JoiningTransform.h
@@ -8,8 +8,7 @@ namespace DB
 class IJoin;
 using JoinPtr = std::shared_ptr<IJoin>;
 
-class IBlockInputStream;
-using BlockInputStreamPtr = std::shared_ptr<IBlockInputStream>;
+class NotJoinedBlocks;
 
 /// Join rows to chunk form left table.
 /// This transform usually has two input ports and one output.
@@ -76,7 +75,7 @@ private:
     ExtraBlockPtr not_processed;
 
     FinishCounterPtr finish_counter;
-    BlockInputStreamPtr non_joined_stream;
+    std::shared_ptr<NotJoinedBlocks> non_joined_blocks;
     size_t max_block_size;
 
     Block readExecute(Chunk & chunk);
diff --git a/src/Processors/Transforms/LimitsCheckingTransform.cpp b/src/Processors/Transforms/LimitsCheckingTransform.cpp
index 9e021e8e59d..64b6b64ccd9 100644
--- a/src/Processors/Transforms/LimitsCheckingTransform.cpp
+++ b/src/Processors/Transforms/LimitsCheckingTransform.cpp
@@ -32,7 +32,7 @@ void LimitsCheckingTransform::transform(Chunk & chunk)
         info.started = true;
     }
 
-    if (!limits.speed_limits.checkTimeLimit(info.total_stopwatch.elapsed(), limits.timeout_overflow_mode))
+    if (!limits.speed_limits.checkTimeLimit(info.total_stopwatch, limits.timeout_overflow_mode))
     {
         stopReading();
         return;
diff --git a/src/Processors/Transforms/LimitsCheckingTransform.h b/src/Processors/Transforms/LimitsCheckingTransform.h
index 9de5cbf5125..50891ece654 100644
--- a/src/Processors/Transforms/LimitsCheckingTransform.h
+++ b/src/Processors/Transforms/LimitsCheckingTransform.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <Processors/ISimpleTransform.h>
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Poco/Timespan.h>
 #include <Interpreters/ProcessList.h>
 
-#include <DataStreams/StreamLocalLimits.h>
+#include <QueryPipeline/StreamLocalLimits.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/MaterializingTransform.cpp b/src/Processors/Transforms/MaterializingTransform.cpp
index f13d5376ebe..abf416e8047 100644
--- a/src/Processors/Transforms/MaterializingTransform.cpp
+++ b/src/Processors/Transforms/MaterializingTransform.cpp
@@ -1,5 +1,4 @@
 #include <Processors/Transforms/MaterializingTransform.h>
-#include <DataStreams/materializeBlock.h>
 
 namespace DB
 {
diff --git a/src/Processors/Transforms/MergeSortingTransform.cpp b/src/Processors/Transforms/MergeSortingTransform.cpp
index ca78a29071e..73817d7de4a 100644
--- a/src/Processors/Transforms/MergeSortingTransform.cpp
+++ b/src/Processors/Transforms/MergeSortingTransform.cpp
@@ -6,8 +6,8 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 #include <Disks/IVolume.h>
 
 
@@ -33,11 +33,10 @@ public:
     BufferingToFileTransform(const Block & header, Poco::Logger * log_, std::string path_)
         : IAccumulatingTransform(header, header), log(log_)
         , path(std::move(path_)), file_buf_out(path), compressed_buf_out(file_buf_out)
-        , out_stream(std::make_shared<NativeBlockOutputStream>(compressed_buf_out, 0, header))
+        , out_stream(std::make_unique<NativeWriter>(compressed_buf_out, 0, header))
     {
         LOG_INFO(log, "Sorting and writing part of data into temporary file {}", path);
         ProfileEvents::increment(ProfileEvents::ExternalSortWritePart);
-        out_stream->writePrefix();
     }
 
     String getName() const override { return "BufferingToFileTransform"; }
@@ -51,7 +50,6 @@ public:
     {
         if (out_stream)
         {
-            out_stream->writeSuffix();
             compressed_buf_out.next();
             file_buf_out.next();
             LOG_INFO(log, "Done writing part of data into temporary file {}", path);
@@ -60,7 +58,7 @@ public:
 
             file_in = std::make_unique<ReadBufferFromFile>(path);
             compressed_in = std::make_unique<CompressedReadBuffer>(*file_in);
-            block_in = std::make_shared<NativeBlockInputStream>(*compressed_in, getOutputPort().getHeader(), 0);
+            block_in = std::make_unique<NativeReader>(*compressed_in, getOutputPort().getHeader(), 0);
         }
 
         if (!block_in)
@@ -69,7 +67,6 @@ public:
         auto block = block_in->read();
         if (!block)
         {
-            block_in->readSuffix();
             block_in.reset();
             return {};
         }
@@ -83,11 +80,11 @@ private:
     std::string path;
     WriteBufferFromFile file_buf_out;
     CompressedWriteBuffer compressed_buf_out;
-    BlockOutputStreamPtr out_stream;
+    std::unique_ptr<NativeWriter> out_stream;
 
     std::unique_ptr<ReadBufferFromFile> file_in;
     std::unique_ptr<CompressedReadBuffer> compressed_in;
-    BlockInputStreamPtr block_in;
+    std::unique_ptr<NativeReader> block_in;
 };
 
 MergeSortingTransform::MergeSortingTransform(
@@ -200,7 +197,6 @@ void MergeSortingTransform::consume(Chunk chunk)
                     description,
                     max_merged_block_size,
                     limit,
-                    false,
                     nullptr,
                     quiet,
                     use_average_block_sizes,
diff --git a/src/Processors/Transforms/MergeSortingTransform.h b/src/Processors/Transforms/MergeSortingTransform.h
index c9ab804cdc8..f16bebc2f46 100644
--- a/src/Processors/Transforms/MergeSortingTransform.h
+++ b/src/Processors/Transforms/MergeSortingTransform.h
@@ -3,7 +3,7 @@
 #include <Processors/Transforms/SortingTransform.h>
 #include <Core/SortDescription.h>
 #include <Common/filesystemHelpers.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
index df2ea4b03f0..e1fa965f025 100644
--- a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
@@ -3,7 +3,7 @@
 #include <Interpreters/Aggregator.h>
 #include <Processors/ISimpleTransform.h>
 #include <Processors/ResizeProcessor.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 namespace DB
 {
@@ -12,13 +12,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-struct ChunksToMerge : public ChunkInfo
-{
-    std::unique_ptr<Chunks> chunks;
-    Int32 bucket_num = -1;
-    bool is_overflows = false;
-};
-
 GroupingAggregatedTransform::GroupingAggregatedTransform(
     const Block & header_, size_t num_inputs_, AggregatingTransformParamsPtr params_)
     : IProcessor(InputPorts(num_inputs_, header_), { Block() })
diff --git a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h
index 4367f6fec32..b4a62f8a13e 100644
--- a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h
+++ b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h
@@ -137,6 +137,13 @@ private:
     void addChunk(Chunk chunk, size_t from_input);
 };
 
+struct ChunksToMerge : public ChunkInfo
+{
+    std::unique_ptr<Chunks> chunks;
+    Int32 bucket_num = -1;
+    bool is_overflows = false;
+};
+
 class Pipe;
 
 /// Adds processors to pipe which performs memory efficient merging of partially aggregated data from several sources.
diff --git a/src/DataStreams/MongoDBBlockInputStream.cpp b/src/Processors/Transforms/MongoDBSource.cpp
similarity index 97%
rename from src/DataStreams/MongoDBBlockInputStream.cpp
rename to src/Processors/Transforms/MongoDBSource.cpp
index d583cb0d5b4..30ad9746520 100644
--- a/src/DataStreams/MongoDBBlockInputStream.cpp
+++ b/src/Processors/Transforms/MongoDBSource.cpp
@@ -1,7 +1,9 @@
+#include "MongoDBSource.h"
+
 #include <string>
 #include <vector>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Poco/MongoDB/Connection.h>
 #include <Poco/MongoDB/Cursor.h>
 #include <Poco/MongoDB/Element.h>
@@ -14,8 +16,7 @@
 #include <IO/ReadHelpers.h>
 #include <Common/assert_cast.h>
 #include <Common/quoteString.h>
-#include <common/range.h>
-#include <DataStreams/MongoDBBlockInputStream.h>
+#include <base/range.h>
 #include <Poco/URI.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Version.h>
@@ -150,13 +151,14 @@ std::unique_ptr<Poco::MongoDB::Cursor> createCursor(const std::string & database
     return cursor;
 }
 
-MongoDBBlockInputStream::MongoDBBlockInputStream(
+MongoDBSource::MongoDBSource(
     std::shared_ptr<Poco::MongoDB::Connection> & connection_,
     std::unique_ptr<Poco::MongoDB::Cursor> cursor_,
     const Block & sample_block,
     UInt64 max_block_size_,
     bool strict_check_names_)
-    : connection(connection_)
+    : SourceWithProgress(sample_block.cloneEmpty())
+    , connection(connection_)
     , cursor{std::move(cursor_)}
     , max_block_size{max_block_size_}
     , strict_check_names{strict_check_names_}
@@ -165,7 +167,7 @@ MongoDBBlockInputStream::MongoDBBlockInputStream(
 }
 
 
-MongoDBBlockInputStream::~MongoDBBlockInputStream() = default;
+MongoDBSource::~MongoDBSource() = default;
 
 
 namespace
@@ -307,7 +309,7 @@ namespace
 }
 
 
-Block MongoDBBlockInputStream::readImpl()
+Chunk MongoDBSource::generate()
 {
     if (all_read)
         return {};
@@ -362,7 +364,7 @@ Block MongoDBBlockInputStream::readImpl()
     if (num_rows == 0)
         return {};
 
-    return description.sample_block.cloneWithColumns(std::move(columns));
+    return Chunk(std::move(columns), num_rows);
 }
 
 }
diff --git a/src/DataStreams/MongoDBBlockInputStream.h b/src/Processors/Transforms/MongoDBSource.h
similarity index 80%
rename from src/DataStreams/MongoDBBlockInputStream.h
rename to src/Processors/Transforms/MongoDBSource.h
index e1cbf9d570c..2e8858932f4 100644
--- a/src/DataStreams/MongoDBBlockInputStream.h
+++ b/src/Processors/Transforms/MongoDBSource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Core/ExternalResultDescription.h>
 
 
@@ -22,24 +22,22 @@ void authenticate(Poco::MongoDB::Connection & connection, const std::string & da
 std::unique_ptr<Poco::MongoDB::Cursor> createCursor(const std::string & database, const std::string & collection, const Block & sample_block_to_select);
 
 /// Converts MongoDB Cursor to a stream of Blocks
-class MongoDBBlockInputStream final : public IBlockInputStream
+class MongoDBSource final : public SourceWithProgress
 {
 public:
-    MongoDBBlockInputStream(
+    MongoDBSource(
         std::shared_ptr<Poco::MongoDB::Connection> & connection_,
         std::unique_ptr<Poco::MongoDB::Cursor> cursor_,
         const Block & sample_block,
         UInt64 max_block_size_,
         bool strict_check_names_ = false);
 
-    ~MongoDBBlockInputStream() override;
+    ~MongoDBSource() override;
 
     String getName() const override { return "MongoDB"; }
 
-    Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
 private:
-    Block readImpl() override;
+    Chunk generate() override;
 
     std::shared_ptr<Poco::MongoDB::Connection> connection;
     std::unique_ptr<Poco::MongoDB::Cursor> cursor;
diff --git a/src/DataStreams/PostgreSQLBlockInputStream.cpp b/src/Processors/Transforms/PostgreSQLSource.cpp
similarity index 78%
rename from src/DataStreams/PostgreSQLBlockInputStream.cpp
rename to src/Processors/Transforms/PostgreSQLSource.cpp
index 3956ce16afa..ac8408d8338 100644
--- a/src/DataStreams/PostgreSQLBlockInputStream.cpp
+++ b/src/Processors/Transforms/PostgreSQLSource.cpp
@@ -1,4 +1,4 @@
-#include "PostgreSQLBlockInputStream.h"
+#include "PostgreSQLSource.h"
 
 #if USE_LIBPQXX
 #include <Columns/ColumnNullable.h>
@@ -15,8 +15,8 @@
 #include <IO/WriteHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <Common/assert_cast.h>
-#include <common/range.h>
-#include <common/logger_useful.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -24,12 +24,13 @@ namespace DB
 
 
 template<typename T>
-PostgreSQLBlockInputStream<T>::PostgreSQLBlockInputStream(
+PostgreSQLSource<T>::PostgreSQLSource(
     postgres::ConnectionHolderPtr connection_holder_,
     const std::string & query_str_,
     const Block & sample_block,
     const UInt64 max_block_size_)
-    : query_str(query_str_)
+    : SourceWithProgress(sample_block.cloneEmpty())
+    , query_str(query_str_)
     , max_block_size(max_block_size_)
     , connection_holder(std::move(connection_holder_))
 {
@@ -38,13 +39,14 @@ PostgreSQLBlockInputStream<T>::PostgreSQLBlockInputStream(
 
 
 template<typename T>
-PostgreSQLBlockInputStream<T>::PostgreSQLBlockInputStream(
+PostgreSQLSource<T>::PostgreSQLSource(
     std::shared_ptr<T> tx_,
     const std::string & query_str_,
     const Block & sample_block,
     const UInt64 max_block_size_,
     bool auto_commit_)
-    : query_str(query_str_)
+    : SourceWithProgress(sample_block.cloneEmpty())
+    , query_str(query_str_)
     , tx(std::move(tx_))
     , max_block_size(max_block_size_)
     , auto_commit(auto_commit_)
@@ -54,7 +56,7 @@ PostgreSQLBlockInputStream<T>::PostgreSQLBlockInputStream(
 
 
 template<typename T>
-void PostgreSQLBlockInputStream<T>::init(const Block & sample_block)
+void PostgreSQLSource<T>::init(const Block & sample_block)
 {
     description.init(sample_block);
 
@@ -69,19 +71,36 @@ void PostgreSQLBlockInputStream<T>::init(const Block & sample_block)
 
 
 template<typename T>
-void PostgreSQLBlockInputStream<T>::readPrefix()
+void PostgreSQLSource<T>::onStart()
 {
-    tx = std::make_shared<T>(connection_holder->get());
+    if (!tx)
+        tx = std::make_shared<T>(connection_holder->get());
+
     stream = std::make_unique<pqxx::stream_from>(*tx, pqxx::from_query, std::string_view(query_str));
 }
 
+template<typename T>
+IProcessor::Status PostgreSQLSource<T>::prepare()
+{
+    if (!started)
+    {
+        onStart();
+        started = true;
+    }
+
+    auto status = SourceWithProgress::prepare();
+    if (status == Status::Finished)
+        onFinish();
+
+    return status;
+}
 
 template<typename T>
-Block PostgreSQLBlockInputStream<T>::readImpl()
+Chunk PostgreSQLSource<T>::generate()
 {
     /// Check if pqxx::stream_from is finished
     if (!stream || !(*stream))
-        return Block();
+        return {};
 
     MutableColumns columns = description.sample_block.cloneEmptyColumns();
     size_t num_rows = 0;
@@ -129,12 +148,12 @@ Block PostgreSQLBlockInputStream<T>::readImpl()
             break;
     }
 
-    return description.sample_block.cloneWithColumns(std::move(columns));
+    return Chunk(std::move(columns), num_rows);
 }
 
 
 template<typename T>
-void PostgreSQLBlockInputStream<T>::readSuffix()
+void PostgreSQLSource<T>::onFinish()
 {
     if (stream)
     {
@@ -146,10 +165,10 @@ void PostgreSQLBlockInputStream<T>::readSuffix()
 }
 
 template
-class PostgreSQLBlockInputStream<pqxx::ReplicationTransaction>;
+class PostgreSQLSource<pqxx::ReplicationTransaction>;
 
 template
-class PostgreSQLBlockInputStream<pqxx::ReadTransaction>;
+class PostgreSQLSource<pqxx::ReadTransaction>;
 
 }
 
diff --git a/src/DataStreams/PostgreSQLBlockInputStream.h b/src/Processors/Transforms/PostgreSQLSource.h
similarity index 58%
rename from src/DataStreams/PostgreSQLBlockInputStream.h
rename to src/Processors/Transforms/PostgreSQLSource.h
index 31bff0789bb..c7e55c09c32 100644
--- a/src/DataStreams/PostgreSQLBlockInputStream.h
+++ b/src/Processors/Transforms/PostgreSQLSource.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 #include <Core/Block.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Core/ExternalResultDescription.h>
 #include <Core/Field.h>
 #include <Core/PostgreSQL/insertPostgreSQLValue.h>
@@ -18,23 +16,20 @@ namespace DB
 {
 
 template <typename T = pqxx::ReadTransaction>
-class PostgreSQLBlockInputStream : public IBlockInputStream
+class PostgreSQLSource : public SourceWithProgress
 {
 
 public:
-    PostgreSQLBlockInputStream(
+    PostgreSQLSource(
         postgres::ConnectionHolderPtr connection_holder_,
         const String & query_str_,
         const Block & sample_block,
         const UInt64 max_block_size_);
 
     String getName() const override { return "PostgreSQL"; }
-    Block getHeader() const override { return description.sample_block.cloneEmpty(); }
-
-    void readPrefix() override;
 
 protected:
-    PostgreSQLBlockInputStream(
+    PostgreSQLSource(
         std::shared_ptr<T> tx_,
         const std::string & query_str_,
         const Block & sample_block,
@@ -45,40 +40,40 @@ protected:
     std::shared_ptr<T> tx;
     std::unique_ptr<pqxx::stream_from> stream;
 
-private:
-    Block readImpl() override;
-    void readSuffix() override;
+    Status prepare() override;
 
+    void onStart();
+    Chunk generate() override;
+    void onFinish();
+
+private:
     void init(const Block & sample_block);
 
     const UInt64 max_block_size;
     bool auto_commit = true;
     ExternalResultDescription description;
 
+    bool started = false;
+
     postgres::ConnectionHolderPtr connection_holder;
 
     std::unordered_map<size_t, PostgreSQLArrayInfo> array_info;
 };
 
 
-/// Passes transaction object into PostgreSQLBlockInputStream and does not close transaction after read is finished.
+/// Passes transaction object into PostgreSQLSource and does not close transaction after read is finished.
 template <typename T>
-class PostgreSQLTransactionBlockInputStream : public PostgreSQLBlockInputStream<T>
+class PostgreSQLTransactionSource : public PostgreSQLSource<T>
 {
 public:
-    using Base = PostgreSQLBlockInputStream<T>;
+    using Base = PostgreSQLSource<T>;
 
-    PostgreSQLTransactionBlockInputStream(
+    PostgreSQLTransactionSource(
         std::shared_ptr<T> tx_,
         const std::string & query_str_,
         const Block & sample_block_,
         const UInt64 max_block_size_)
-        : PostgreSQLBlockInputStream<T>(tx_, query_str_, sample_block_, max_block_size_, false) {}
-
-    void readPrefix() override
-    {
-        Base::stream = std::make_unique<pqxx::stream_from>(*Base::tx, pqxx::from_query, std::string_view(Base::query_str));
-    }
+        : PostgreSQLSource<T>(tx_, query_str_, sample_block_, max_block_size_, false) {}
 };
 
 }
diff --git a/src/Processors/Transforms/SortingTransform.cpp b/src/Processors/Transforms/SortingTransform.cpp
index 11f23530c9e..eeb576731ab 100644
--- a/src/Processors/Transforms/SortingTransform.cpp
+++ b/src/Processors/Transforms/SortingTransform.cpp
@@ -9,8 +9,8 @@
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 
 
 namespace ProfileEvents
diff --git a/src/Processors/Transforms/SquashingChunksTransform.cpp b/src/Processors/Transforms/SquashingChunksTransform.cpp
new file mode 100644
index 00000000000..f5aef01463a
--- /dev/null
+++ b/src/Processors/Transforms/SquashingChunksTransform.cpp
@@ -0,0 +1,45 @@
+#include <Processors/Transforms/SquashingChunksTransform.h>
+#include <iostream>
+
+namespace DB
+{
+
+SquashingChunksTransform::SquashingChunksTransform(
+    const Block & header, size_t min_block_size_rows, size_t min_block_size_bytes, bool reserve_memory)
+    : ExceptionKeepingTransform(header, header, false)
+    , squashing(min_block_size_rows, min_block_size_bytes, reserve_memory)
+{
+}
+
+void SquashingChunksTransform::transform(Chunk & chunk)
+{
+    if (auto block = squashing.add(getInputPort().getHeader().cloneWithColumns(chunk.detachColumns())))
+    {
+        chunk.setColumns(block.getColumns(), block.rows());
+    }
+}
+
+void SquashingChunksTransform::onFinish()
+{
+    auto block = squashing.add({});
+    finish_chunk.setColumns(block.getColumns(), block.rows());
+}
+
+void SquashingChunksTransform::work()
+{
+    if (has_exception)
+    {
+        data.chunk.clear();
+        ready_input = false;
+        return;
+    }
+
+    ExceptionKeepingTransform::work();
+    if (finish_chunk)
+    {
+        data.chunk = std::move(finish_chunk);
+        ready_output = true;
+    }
+}
+
+}
diff --git a/src/Processors/Transforms/SquashingChunksTransform.h b/src/Processors/Transforms/SquashingChunksTransform.h
new file mode 100644
index 00000000000..bf4a051891b
--- /dev/null
+++ b/src/Processors/Transforms/SquashingChunksTransform.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <Processors/Sinks/SinkToStorage.h>
+#include <Interpreters/SquashingTransform.h>
+
+namespace DB
+{
+
+class SquashingChunksTransform : public ExceptionKeepingTransform
+{
+public:
+    explicit SquashingChunksTransform(
+        const Block & header, size_t min_block_size_rows, size_t min_block_size_bytes, bool reserve_memory = false);
+
+    String getName() const override { return "SquashingTransform"; }
+
+    void work() override;
+
+protected:
+    void transform(Chunk & chunk) override;
+    void onFinish() override;
+
+
+private:
+    SquashingTransform squashing;
+    Chunk finish_chunk;
+};
+
+}
diff --git a/src/Processors/Transforms/TTLCalcTransform.cpp b/src/Processors/Transforms/TTLCalcTransform.cpp
new file mode 100644
index 00000000000..31fb61239ef
--- /dev/null
+++ b/src/Processors/Transforms/TTLCalcTransform.cpp
@@ -0,0 +1,101 @@
+#include <Processors/Transforms/TTLCalcTransform.h>
+#include <Processors/TTL/TTLUpdateInfoAlgorithm.h>
+
+namespace DB
+{
+
+TTLCalcTransform::TTLCalcTransform(
+    const Block & header_,
+    const MergeTreeData & storage_,
+    const StorageMetadataPtr & metadata_snapshot_,
+    const MergeTreeData::MutableDataPartPtr & data_part_,
+    time_t current_time_,
+    bool force_)
+    : IAccumulatingTransform(header_, header_)
+    , data_part(data_part_)
+    , log(&Poco::Logger::get(storage_.getLogName() + " (TTLCalcTransform)"))
+{
+    auto old_ttl_infos = data_part->ttl_infos;
+
+    if (metadata_snapshot_->hasRowsTTL())
+    {
+        const auto & rows_ttl = metadata_snapshot_->getRowsTTL();
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            rows_ttl, TTLUpdateField::TABLE_TTL, rows_ttl.result_column, old_ttl_infos.table_ttl, current_time_, force_));
+    }
+
+    for (const auto & where_ttl : metadata_snapshot_->getRowsWhereTTLs())
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            where_ttl, TTLUpdateField::ROWS_WHERE_TTL, where_ttl.result_column, old_ttl_infos.rows_where_ttl[where_ttl.result_column], current_time_, force_));
+
+    for (const auto & group_by_ttl : metadata_snapshot_->getGroupByTTLs())
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            group_by_ttl, TTLUpdateField::GROUP_BY_TTL, group_by_ttl.result_column, old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_));
+
+    if (metadata_snapshot_->hasAnyColumnTTL())
+    {
+        for (const auto & [name, description] : metadata_snapshot_->getColumnTTLs())
+        {
+            algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+                description, TTLUpdateField::COLUMNS_TTL, name, old_ttl_infos.columns_ttl[name], current_time_, force_));
+        }
+    }
+
+    for (const auto & move_ttl : metadata_snapshot_->getMoveTTLs())
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            move_ttl, TTLUpdateField::MOVES_TTL, move_ttl.result_column, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
+
+    for (const auto & recompression_ttl : metadata_snapshot_->getRecompressionTTLs())
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            recompression_ttl, TTLUpdateField::RECOMPRESSION_TTL, recompression_ttl.result_column, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
+}
+
+void TTLCalcTransform::consume(Chunk chunk)
+{
+    auto block = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
+    for (const auto & algorithm : algorithms)
+        algorithm->execute(block);
+
+    if (!block)
+        return;
+
+    Chunk res;
+    for (const auto & col : getOutputPort().getHeader())
+        res.addColumn(block.getByName(col.name).column);
+
+    setReadyChunk(std::move(res));
+}
+
+Chunk TTLCalcTransform::generate()
+{
+    Block block;
+    for (const auto & algorithm : algorithms)
+        algorithm->execute(block);
+
+    if (!block)
+        return {};
+
+    Chunk res;
+    for (const auto & col : getOutputPort().getHeader())
+        res.addColumn(block.getByName(col.name).column);
+
+    return res;
+}
+
+void TTLCalcTransform::finalize()
+{
+    data_part->ttl_infos = {};
+    for (const auto & algorithm : algorithms)
+        algorithm->finalize(data_part);
+}
+
+IProcessor::Status TTLCalcTransform::prepare()
+{
+    auto status = IAccumulatingTransform::prepare();
+    if (status == Status::Finished)
+        finalize();
+
+    return status;
+}
+
+}
diff --git a/src/Processors/Transforms/TTLCalcTransform.h b/src/Processors/Transforms/TTLCalcTransform.h
new file mode 100644
index 00000000000..14592c07155
--- /dev/null
+++ b/src/Processors/Transforms/TTLCalcTransform.h
@@ -0,0 +1,44 @@
+#pragma once
+#include <Processors/IAccumulatingTransform.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Core/Block.h>
+#include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
+
+#include <base/DateLUT.h>
+
+namespace DB
+{
+
+class TTLCalcTransform : public IAccumulatingTransform
+{
+public:
+    TTLCalcTransform(
+        const Block & header_,
+        const MergeTreeData & storage_,
+        const StorageMetadataPtr & metadata_snapshot_,
+        const MergeTreeData::MutableDataPartPtr & data_part_,
+        time_t current_time,
+        bool force_
+    );
+
+    String getName() const override { return "TTL_CALC"; }
+    Status prepare() override;
+
+protected:
+    void consume(Chunk chunk) override;
+    Chunk generate() override;
+
+    /// Finalizes ttl infos and updates data part
+    void finalize();
+
+private:
+    std::vector<TTLAlgorithmPtr> algorithms;
+
+    /// ttl_infos and empty_columns are updating while reading
+    const MergeTreeData::MutableDataPartPtr & data_part;
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/DataStreams/TTLBlockInputStream.cpp b/src/Processors/Transforms/TTLTransform.cpp
similarity index 66%
rename from src/DataStreams/TTLBlockInputStream.cpp
rename to src/Processors/Transforms/TTLTransform.cpp
index 8b31da6d2f1..a515a50fafb 100644
--- a/src/DataStreams/TTLBlockInputStream.cpp
+++ b/src/Processors/Transforms/TTLTransform.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/TTLBlockInputStream.h>
+#include <Processors/Transforms/TTLTransform.h>
 #include <DataTypes/DataTypeDate.h>
 #include <Interpreters/inplaceBlockConversions.h>
 #include <Interpreters/TreeRewriter.h>
@@ -8,26 +8,25 @@
 #include <Storages/TTLMode.h>
 #include <Interpreters/Context.h>
 
-#include <DataStreams/TTLDeleteAlgorithm.h>
-#include <DataStreams/TTLColumnAlgorithm.h>
-#include <DataStreams/TTLAggregationAlgorithm.h>
-#include <DataStreams/TTLUpdateInfoAlgorithm.h>
+#include <Processors/TTL/TTLDeleteAlgorithm.h>
+#include <Processors/TTL/TTLColumnAlgorithm.h>
+#include <Processors/TTL/TTLAggregationAlgorithm.h>
+#include <Processors/TTL/TTLUpdateInfoAlgorithm.h>
 
 namespace DB
 {
 
-TTLBlockInputStream::TTLBlockInputStream(
-    const BlockInputStreamPtr & input_,
+TTLTransform::TTLTransform(
+    const Block & header_,
     const MergeTreeData & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const MergeTreeData::MutableDataPartPtr & data_part_,
     time_t current_time_,
     bool force_)
-    : data_part(data_part_)
-    , log(&Poco::Logger::get(storage_.getLogName() + " (TTLBlockInputStream)"))
+    : IAccumulatingTransform(header_, header_)
+    , data_part(data_part_)
+    , log(&Poco::Logger::get(storage_.getLogName() + " (TTLTransform)"))
 {
-    children.push_back(input_);
-    header = children.at(0)->getHeader();
     auto old_ttl_infos = data_part->ttl_infos;
 
     if (metadata_snapshot_->hasRowsTTL())
@@ -50,7 +49,7 @@ TTLBlockInputStream::TTLBlockInputStream(
 
     for (const auto & group_by_ttl : metadata_snapshot_->getGroupByTTLs())
         algorithms.emplace_back(std::make_unique<TTLAggregationAlgorithm>(
-            group_by_ttl, old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_, header, storage_));
+            group_by_ttl, old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_, getInputPort().getHeader(), storage_));
 
     if (metadata_snapshot_->hasAnyColumnTTL())
     {
@@ -76,17 +75,17 @@ TTLBlockInputStream::TTLBlockInputStream(
 
             algorithms.emplace_back(std::make_unique<TTLColumnAlgorithm>(
                 description, old_ttl_infos.columns_ttl[name], current_time_,
-                force_, name, default_expression, default_column_name));
+                force_, name, default_expression, default_column_name, isCompactPart(data_part)));
         }
     }
 
     for (const auto & move_ttl : metadata_snapshot_->getMoveTTLs())
-        algorithms.emplace_back(std::make_unique<TTLMoveAlgorithm>(
-            move_ttl, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            move_ttl, TTLUpdateField::MOVES_TTL, move_ttl.result_column, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
 
     for (const auto & recompression_ttl : metadata_snapshot_->getRecompressionTTLs())
-        algorithms.emplace_back(std::make_unique<TTLRecompressionAlgorithm>(
-            recompression_ttl, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
+        algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
+            recompression_ttl, TTLUpdateField::RECOMPRESSION_TTL, recompression_ttl.result_column, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
 }
 
 Block reorderColumns(Block block, const Block & header)
@@ -98,22 +97,40 @@ Block reorderColumns(Block block, const Block & header)
     return res;
 }
 
-Block TTLBlockInputStream::readImpl()
+void TTLTransform::consume(Chunk chunk)
 {
     if (all_data_dropped)
-        return {};
+    {
+        finishConsume();
+        return;
+    }
+
+    auto block = getInputPort().getHeader().cloneWithColumns(chunk.detachColumns());
 
-    auto block = children.at(0)->read();
     for (const auto & algorithm : algorithms)
         algorithm->execute(block);
 
     if (!block)
-        return block;
+        return;
 
-    return reorderColumns(std::move(block), header);
+    size_t num_rows = block.rows();
+    setReadyChunk(Chunk(reorderColumns(std::move(block), getOutputPort().getHeader()).getColumns(), num_rows));
 }
 
-void TTLBlockInputStream::readSuffixImpl()
+Chunk TTLTransform::generate()
+{
+    Block block;
+    for (const auto & algorithm : algorithms)
+        algorithm->execute(block);
+
+    if (!block)
+        return {};
+
+    size_t num_rows = block.rows();
+    return Chunk(reorderColumns(std::move(block), getOutputPort().getHeader()).getColumns(), num_rows);
+}
+
+void TTLTransform::finalize()
 {
     data_part->ttl_infos = {};
     for (const auto & algorithm : algorithms)
@@ -126,4 +143,13 @@ void TTLBlockInputStream::readSuffixImpl()
     }
 }
 
+IProcessor::Status TTLTransform::prepare()
+{
+    auto status = IAccumulatingTransform::prepare();
+    if (status == Status::Finished)
+        finalize();
+
+    return status;
+}
+
 }
diff --git a/src/DataStreams/TTLBlockInputStream.h b/src/Processors/Transforms/TTLTransform.h
similarity index 67%
rename from src/DataStreams/TTLBlockInputStream.h
rename to src/Processors/Transforms/TTLTransform.h
index da86b8d5710..9207c68448b 100644
--- a/src/DataStreams/TTLBlockInputStream.h
+++ b/src/Processors/Transforms/TTLTransform.h
@@ -1,22 +1,22 @@
 #pragma once
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/IAccumulatingTransform.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Core/Block.h>
 #include <Storages/MergeTree/MergeTreeDataPartTTLInfo.h>
-#include <DataStreams/ITTLAlgorithm.h>
-#include <DataStreams/TTLDeleteAlgorithm.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
+#include <Processors/TTL/TTLDeleteAlgorithm.h>
 
-#include <common/DateLUT.h>
+#include <base/DateLUT.h>
 
 namespace DB
 {
 
-class TTLBlockInputStream : public IBlockInputStream
+class TTLTransform : public IAccumulatingTransform
 {
 public:
-    TTLBlockInputStream(
-        const BlockInputStreamPtr & input_,
+    TTLTransform(
+        const Block & header_,
         const MergeTreeData & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         const MergeTreeData::MutableDataPartPtr & data_part_,
@@ -25,13 +25,15 @@ public:
     );
 
     String getName() const override { return "TTL"; }
-    Block getHeader() const override { return header; }
+
+    Status prepare() override;
 
 protected:
-    Block readImpl() override;
+    void consume(Chunk chunk) override;
+    Chunk generate() override;
 
     /// Finalizes ttl infos and updates data part
-    void readSuffixImpl() override;
+    void finalize();
 
 private:
     std::vector<TTLAlgorithmPtr> algorithms;
@@ -41,7 +43,6 @@ private:
     /// ttl_infos and empty_columns are updating while reading
     const MergeTreeData::MutableDataPartPtr & data_part;
     Poco::Logger * log;
-    Block header;
 };
 
 }
diff --git a/src/Processors/Transforms/TotalsHavingTransform.cpp b/src/Processors/Transforms/TotalsHavingTransform.cpp
index 9724d332f15..0b7797da24f 100644
--- a/src/Processors/Transforms/TotalsHavingTransform.cpp
+++ b/src/Processors/Transforms/TotalsHavingTransform.cpp
@@ -3,9 +3,10 @@
 
 #include <Columns/ColumnAggregateFunction.h>
 #include <Columns/FilterDescription.h>
+#include <Columns/ColumnsCommon.h>
 
 #include <Common/typeid_cast.h>
-#include <DataStreams/finalizeBlock.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 #include <Interpreters/ExpressionActions.h>
 
 namespace DB
@@ -28,13 +29,41 @@ void finalizeChunk(Chunk & chunk)
     chunk.setColumns(std::move(columns), num_rows);
 }
 
-Block TotalsHavingTransform::transformHeader(Block block, const ActionsDAG * expression, bool final)
+void finalizeBlock(Block & block)
+{
+    for (size_t i = 0; i < block.columns(); ++i)
+    {
+        ColumnWithTypeAndName & current = block.getByPosition(i);
+        const DataTypeAggregateFunction * unfinalized_type = typeid_cast<const DataTypeAggregateFunction *>(current.type.get());
+
+        if (unfinalized_type)
+        {
+            current.type = unfinalized_type->getReturnType();
+            if (current.column)
+            {
+                auto mut_column = IColumn::mutate(std::move(current.column));
+                current.column = ColumnAggregateFunction::convertToValues(std::move(mut_column));
+            }
+        }
+    }
+}
+
+Block TotalsHavingTransform::transformHeader(
+    Block block,
+    const ActionsDAG * expression,
+    const std::string & filter_column_name,
+    bool remove_filter,
+    bool final)
 {
     if (final)
         finalizeBlock(block);
 
     if (expression)
+    {
         block = expression->updateHeader(std::move(block));
+        if (remove_filter)
+            block.erase(filter_column_name);
+    }
 
     return block;
 }
@@ -44,20 +73,19 @@ TotalsHavingTransform::TotalsHavingTransform(
     bool overflow_row_,
     const ExpressionActionsPtr & expression_,
     const std::string & filter_column_,
+    bool remove_filter_,
     TotalsMode totals_mode_,
     double auto_include_threshold_,
     bool final_)
-    : ISimpleTransform(header, transformHeader(header, expression_  ? &expression_->getActionsDAG() : nullptr, final_), true)
+    : ISimpleTransform(header, transformHeader(header, expression_  ? &expression_->getActionsDAG() : nullptr, filter_column_, remove_filter_, final_), true)
     , overflow_row(overflow_row_)
     , expression(expression_)
     , filter_column_name(filter_column_)
+    , remove_filter(remove_filter_)
     , totals_mode(totals_mode_)
     , auto_include_threshold(auto_include_threshold_)
     , final(final_)
 {
-    if (!filter_column_name.empty())
-        filter_column_pos = outputs.front().getHeader().getPositionByName(filter_column_name);
-
     finalized_header = getInputPort().getHeader();
     finalizeBlock(finalized_header);
 
@@ -67,10 +95,17 @@ TotalsHavingTransform::TotalsHavingTransform(
         auto totals_header = finalized_header;
         size_t num_rows = totals_header.rows();
         expression->execute(totals_header, num_rows);
+        filter_column_pos = totals_header.getPositionByName(filter_column_name);
+        if (remove_filter)
+            totals_header.erase(filter_column_name);
         outputs.emplace_back(totals_header, this);
     }
     else
+    {
+        if (!filter_column_name.empty())
+            filter_column_pos = finalized_header.getPositionByName(filter_column_name);
         outputs.emplace_back(finalized_header, this);
+    }
 
     /// Initialize current totals with initial state.
     current_totals.reserve(header.columns());
@@ -167,9 +202,11 @@ void TotalsHavingTransform::transform(Chunk & chunk)
         }
 
         expression->execute(finalized_block, num_rows);
+        ColumnPtr filter_column_ptr = finalized_block.getByPosition(filter_column_pos).column;
+        if (remove_filter)
+            finalized_block.erase(filter_column_name);
         auto columns = finalized_block.getColumns();
 
-        ColumnPtr filter_column_ptr = columns[filter_column_pos];
         ConstantFilterDescription const_filter_description(*filter_column_ptr);
 
         if (const_filter_description.always_true)
@@ -207,7 +244,7 @@ void TotalsHavingTransform::transform(Chunk & chunk)
             }
         }
 
-        num_rows = columns.front()->size();
+        num_rows = columns.empty() ? countBytesInFilter(*filter_description.data) : columns.front()->size();
         chunk.setColumns(std::move(columns), num_rows);
     }
 
@@ -270,6 +307,8 @@ void TotalsHavingTransform::prepareTotals()
         size_t num_rows = totals.getNumRows();
         auto block = finalized_header.cloneWithColumns(totals.detachColumns());
         expression->execute(block, num_rows);
+        if (remove_filter)
+            block.erase(filter_column_name);
         /// Note: after expression totals may have several rows if `arrayJoin` was used in expression.
         totals = Chunk(block.getColumns(), num_rows);
     }
diff --git a/src/Processors/Transforms/TotalsHavingTransform.h b/src/Processors/Transforms/TotalsHavingTransform.h
index d42543d311a..03635054c65 100644
--- a/src/Processors/Transforms/TotalsHavingTransform.h
+++ b/src/Processors/Transforms/TotalsHavingTransform.h
@@ -28,6 +28,7 @@ public:
         bool overflow_row_,
         const ExpressionActionsPtr & expression_,
         const std::string & filter_column_,
+        bool remove_filter_,
         TotalsMode totals_mode_,
         double auto_include_threshold_,
         bool final_);
@@ -39,7 +40,7 @@ public:
     Status prepare() override;
     void work() override;
 
-    static Block transformHeader(Block block, const ActionsDAG * expression, bool final);
+    static Block transformHeader(Block block, const ActionsDAG * expression, const std::string & filter_column_name, bool remove_filter, bool final);
 
 protected:
     void transform(Chunk & chunk) override;
@@ -55,6 +56,7 @@ private:
     bool overflow_row;
     ExpressionActionsPtr expression;
     String filter_column_name;
+    bool remove_filter;
     TotalsMode totals_mode;
     double auto_include_threshold;
     bool final;
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 3ab1a23537b..5616d6cb088 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -3,7 +3,7 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <Common/Arena.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <common/arithmeticOverflow.h>
+#include <base/arithmeticOverflow.h>
 #include <Columns/ColumnConst.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/getLeastSupertype.h>
@@ -423,7 +423,7 @@ void WindowTransform::advancePartitionEnd()
     assert(!partition_ended && partition_end == blocksEnd());
 }
 
-auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) const
+auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const
 {
     RowNumber x = _x;
 
@@ -461,9 +461,9 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
             assertValid(x);
             assert(offset <= 0);
 
-            // abs(offset) is less than INT_MAX, as checked in the parser, so
+            // abs(offset) is less than INT64_MAX, as checked in the parser, so
             // this negation should always work.
-            assert(offset >= -INT_MAX);
+            assert(offset >= -INT64_MAX);
             if (x.row >= static_cast<uint64_t>(-offset))
             {
                 x.row -= -offset;
@@ -493,7 +493,7 @@ auto WindowTransform::moveRowNumberNoCheck(const RowNumber & _x, int offset) con
     return std::tuple{x, offset};
 }
 
-auto WindowTransform::moveRowNumber(const RowNumber & _x, int offset) const
+auto WindowTransform::moveRowNumber(const RowNumber & _x, int64_t offset) const
 {
     auto [x, o] = moveRowNumberNoCheck(_x, offset);
 
@@ -617,8 +617,8 @@ void WindowTransform::advanceFrameStart()
                 default:
                     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "Frame start type '{}' for frame '{}' is not implemented",
-                        WindowFrame::toString(window_description.frame.begin_type),
-                        WindowFrame::toString(window_description.frame.type));
+                        window_description.frame.begin_type,
+                        window_description.frame.type);
             }
             break;
     }
@@ -849,7 +849,7 @@ void WindowTransform::advanceFrameEnd()
                 default:
                     throw Exception(ErrorCodes::NOT_IMPLEMENTED,
                         "The frame end type '{}' is not implemented",
-                        WindowFrame::toString(window_description.frame.end_type));
+                        window_description.frame.end_type);
             }
             break;
     }
@@ -1166,6 +1166,23 @@ void WindowTransform::appendChunk(Chunk & chunk)
             // Write out the aggregation results.
             writeOutCurrentRow();
 
+            if (isCancelled())
+            {
+                // Good time to check if the query is cancelled. Checking once
+                // per block might not be enough in severe quadratic cases.
+                // Just leave the work halfway through and return, the 'prepare'
+                // method will figure out what to do. Note that this doesn't
+                // handle 'max_execution_time' and other limits, because these
+                // limits are only updated between blocks. Eventually we should
+                // start updating them in background and canceling the processor,
+                // like we do for Ctrl+C handling.
+                //
+                // This class is final, so the check should hopefully be
+                // devirtualized and become a single never-taken branch that is
+                // basically free.
+                return;
+            }
+
             // Move to the next row. The frame will have to be recalculated.
             // The peer group start is updated at the beginning of the loop,
             // because current_row might now be past-the-end.
@@ -1255,10 +1272,12 @@ IProcessor::Status WindowTransform::prepare()
 //        next_output_block_number, first_not_ready_row, first_block_number,
 //        blocks.size());
 
-    if (output.isFinished())
+    if (output.isFinished() || isCancelled())
     {
         // The consumer asked us not to continue (or we decided it ourselves),
-        // so we abort.
+        // so we abort. Not sure what the difference between the two conditions
+        // is, but it seemed that output.isFinished() is not enough to cancel on
+        // Ctrl+C. Test manually if you change it.
         input.close();
         return Status::Finished;
     }
@@ -1595,17 +1614,13 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
             offset = (*current_block.input_columns[
                     workspace.argument_column_indices[1]])[
                         transform->current_row.row].get<Int64>();
+
+            /// Either overflow or really negative value, both is not acceptable.
             if (offset < 0)
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "The offset for function {} must be nonnegative, {} given",
-                    getName(), offset);
-            }
-            if (offset > INT_MAX)
-            {
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "The offset for function {} must be less than {}, {} given",
-                    getName(), INT_MAX, offset);
+                    "The offset for function {} must be in (0, {}], {} given",
+                    getName(), INT64_MAX, offset);
             }
         }
 
@@ -1643,73 +1658,6 @@ struct WindowFunctionLagLeadInFrame final : public WindowFunction
     }
 };
 
-struct WindowFunctionNthValue final : public WindowFunction
-{
-    WindowFunctionNthValue(const std::string & name_,
-    const DataTypes & argument_types_, const Array & parameters_)
-    : WindowFunction(name_, argument_types_, parameters_)
-    {
-        if (!parameters.empty())
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Function {} cannot be parameterized", name_);
-        }
-
-        if (argument_types.size() != 2)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Function '{}' accepts 2 arguments, {} given",
-                name_, argument_types.size());
-        }
-    }
-
-    DataTypePtr getReturnType() const override
-    { return argument_types[0]; }
-
-    bool allocatesMemoryInArena() const override { return false; }
-
-    void windowInsertResultInto(const WindowTransform * transform,
-        size_t function_index) override
-    {
-        const auto & current_block = transform->blockAt(transform->current_row);
-        IColumn & to = *(current_block.output_columns[function_index]);
-        const auto & workspace = transform->workspaces[function_index];
-
-        int64_t offset = (*current_block.input_columns[
-                workspace.argument_column_indices[1]])[
-            transform->current_row.row].get<Int64>() - 1;
-
-        if (offset < 0)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The offset for function {} must be non-negative, {} given",
-                getName(), offset);
-        }
-
-        if (offset > INT_MAX)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "The offset for function {} must be less than {}, {} given",
-                getName(), INT_MAX, offset);
-        }
-
-        const auto [target_row, offset_left] = transform->moveRowNumber(transform->frame_start, offset);
-        if (offset_left != 0
-            || target_row < transform->frame_start
-            || transform->frame_end <= target_row)
-        {
-            // Offset is outside the frame.
-            to.insertDefault();
-        }
-        else
-        {
-            // Offset is inside the frame.
-            to.insertFrom(*transform->blockAt(target_row).input_columns[
-                    workspace.argument_column_indices[0]],
-               target_row.row);
-        }
-    }
-};
 
 void registerWindowFunctions(AggregateFunctionFactory & factory)
 {
@@ -1745,21 +1693,21 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
         {
             return std::make_shared<WindowFunctionRank>(name, argument_types,
                 parameters);
-        }, properties});
+        }, properties}, AggregateFunctionFactory::CaseInsensitive);
 
     factory.registerFunction("dense_rank", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionDenseRank>(name, argument_types,
                 parameters);
-        }, properties});
+        }, properties}, AggregateFunctionFactory::CaseInsensitive);
 
     factory.registerFunction("row_number", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
         {
             return std::make_shared<WindowFunctionRowNumber>(name, argument_types,
                 parameters);
-        }, properties});
+        }, properties}, AggregateFunctionFactory::CaseInsensitive);
 
     factory.registerFunction("lagInFrame", {[](const std::string & name,
             const DataTypes & argument_types, const Array & parameters, const Settings *)
@@ -1774,13 +1722,6 @@ void registerWindowFunctions(AggregateFunctionFactory & factory)
             return std::make_shared<WindowFunctionLagLeadInFrame<true>>(
                 name, argument_types, parameters);
         }, properties});
-
-    factory.registerFunction("nth_value", {[](const std::string & name,
-            const DataTypes & argument_types, const Array & parameters, const Settings *)
-        {
-            return std::make_shared<WindowFunctionNthValue>(
-                name, argument_types, parameters);
-        }, properties});
 }
 
 }
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index d7211f9edd7..650a0b5a4d3 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -80,8 +80,10 @@ struct RowNumber
  * the order of input data. This property also trivially holds for the ROWS and
  * GROUPS frames. For the RANGE frame, the proof requires the additional fact
  * that the ranges are specified in terms of (the single) ORDER BY column.
+ *
+ * `final` is so that the isCancelled() is devirtualized, we call it every row.
  */
-class WindowTransform : public IProcessor /* public ISimpleTransform */
+class WindowTransform final : public IProcessor
 {
 public:
     WindowTransform(
@@ -216,8 +218,8 @@ public:
 #endif
     }
 
-    auto moveRowNumber(const RowNumber & _x, int offset) const;
-    auto moveRowNumberNoCheck(const RowNumber & _x, int offset) const;
+    auto moveRowNumber(const RowNumber & _x, int64_t offset) const;
+    auto moveRowNumberNoCheck(const RowNumber & _x, int64_t offset) const;
 
     void assertValid(const RowNumber & x) const
     {
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
new file mode 100644
index 00000000000..e5abc3bd416
--- /dev/null
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -0,0 +1,679 @@
+#include <Processors/Transforms/buildPushingToViewsChain.h>
+#include <DataTypes/NestedUtils.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Processors/Transforms/SquashingChunksTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Storages/LiveView/StorageLiveView.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
+#include <Storages/StorageMaterializedView.h>
+#include <Storages/StorageValues.h>
+#include <Common/CurrentThread.h>
+#include <Common/MemoryTracker.h>
+#include <Common/ThreadProfileEvents.h>
+#include <Common/ThreadStatus.h>
+#include <Common/checkStackSize.h>
+#include <base/scope_guard.h>
+#include <base/logger_useful.h>
+
+#include <atomic>
+#include <chrono>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+struct ViewsData
+{
+    /// Separate information for every view.
+    std::list<ViewRuntimeData> views;
+    /// Some common info about source storage.
+    ContextPtr context;
+    StorageID source_storage_id;
+    StorageMetadataPtr source_metadata_snapshot;
+    StoragePtr source_storage;
+    /// This value is actually only for logs.
+    size_t max_threads = 1;
+
+    /// In case of exception happened while inserting into main table, it is pushed to pipeline.
+    /// Remember the first one, we should keep them after view processing.
+    std::atomic_bool has_exception = false;
+    std::exception_ptr first_exception;
+
+    ViewsData(ContextPtr context_, StorageID source_storage_id_, StorageMetadataPtr source_metadata_snapshot_ , StoragePtr source_storage_)
+        : context(std::move(context_))
+        , source_storage_id(std::move(source_storage_id_))
+        , source_metadata_snapshot(std::move(source_metadata_snapshot_))
+        , source_storage(std::move(source_storage_))
+    {
+    }
+};
+
+using ViewsDataPtr = std::shared_ptr<ViewsData>;
+
+/// Copies data inserted into table for every dependent table.
+class CopyingDataToViewsTransform final : public IProcessor
+{
+public:
+    CopyingDataToViewsTransform(const Block & header, ViewsDataPtr data);
+
+    String getName() const override { return "CopyingDataToViewsTransform"; }
+    Status prepare() override;
+    InputPort & getInputPort() { return input; }
+
+private:
+    InputPort & input;
+    ViewsDataPtr views_data;
+};
+
+/// For source chunk, execute view query over it.
+class ExecutingInnerQueryFromViewTransform final : public ExceptionKeepingTransform
+{
+public:
+    ExecutingInnerQueryFromViewTransform(const Block & header, ViewRuntimeData & view_, ViewsDataPtr views_data_);
+
+    String getName() const override { return "ExecutingInnerQueryFromView"; }
+
+protected:
+    void transform(Chunk & chunk) override;
+
+private:
+    ViewsDataPtr views_data;
+    ViewRuntimeData & view;
+};
+
+/// Insert into LiveView.
+class PushingToLiveViewSink final : public SinkToStorage
+{
+public:
+    PushingToLiveViewSink(const Block & header, StorageLiveView & live_view_, StoragePtr storage_holder_, ContextPtr context_);
+    String getName() const override { return "PushingToLiveViewSink"; }
+    void consume(Chunk chunk) override;
+
+private:
+    StorageLiveView & live_view;
+    StoragePtr storage_holder;
+    ContextPtr context;
+};
+
+/// For every view, collect exception.
+/// Has single output with empty header.
+/// If any exception happen before view processing, pass it.
+/// Othervise return any exception from any view.
+class FinalizingViewsTransform final : public IProcessor
+{
+    struct ExceptionStatus
+    {
+        std::exception_ptr exception;
+        bool is_first = false;
+    };
+
+    static InputPorts initPorts(std::vector<Block> headers);
+
+public:
+    FinalizingViewsTransform(std::vector<Block> headers, ViewsDataPtr data);
+
+    String getName() const override { return "FinalizingViewsTransform"; }
+    Status prepare() override;
+    void work() override;
+
+private:
+    OutputPort & output;
+    ViewsDataPtr views_data;
+    std::vector<ExceptionStatus> statuses;
+    std::exception_ptr any_exception;
+};
+
+
+Chain buildPushingToViewsChain(
+    const StoragePtr & storage,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    const ASTPtr & query_ptr,
+    bool no_destination,
+    ThreadStatus * thread_status,
+    std::atomic_uint64_t * elapsed_counter_ms,
+    const Block & live_view_header)
+{
+    checkStackSize();
+    Chain result_chain;
+
+    /// If we don't write directly to the destination
+    /// then expect that we're inserting with precalculated virtual columns
+    auto storage_header = no_destination ? metadata_snapshot->getSampleBlockWithVirtuals(storage->getVirtuals())
+                                         : metadata_snapshot->getSampleBlock();
+
+    /** TODO This is a very important line. At any insertion into the table one of streams should own lock.
+      * Although now any insertion into the table is done via PushingToViewsBlockOutputStream,
+      *  but it's clear that here is not the best place for this functionality.
+      */
+    result_chain.addTableLock(storage->lockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout));
+
+    /// If the "root" table deduplicates blocks, there are no need to make deduplication for children
+    /// Moreover, deduplication for AggregatingMergeTree children could produce false positives due to low size of inserting blocks
+    bool disable_deduplication_for_children = false;
+    if (!context->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
+        disable_deduplication_for_children = !no_destination && storage->supportsDeduplication();
+
+    auto table_id = storage->getStorageID();
+    Dependencies dependencies = DatabaseCatalog::instance().getDependencies(table_id);
+
+    /// We need special context for materialized views insertions
+    ContextMutablePtr select_context;
+    ContextMutablePtr insert_context;
+    ViewsDataPtr views_data;
+    if (!dependencies.empty())
+    {
+        select_context = Context::createCopy(context);
+        insert_context = Context::createCopy(context);
+
+        const auto & insert_settings = insert_context->getSettingsRef();
+
+        // Do not deduplicate insertions into MV if the main insertion is Ok
+        if (disable_deduplication_for_children)
+            insert_context->setSetting("insert_deduplicate", Field{false});
+
+        // Separate min_insert_block_size_rows/min_insert_block_size_bytes for children
+        if (insert_settings.min_insert_block_size_rows_for_materialized_views)
+            insert_context->setSetting("min_insert_block_size_rows", insert_settings.min_insert_block_size_rows_for_materialized_views.value);
+        if (insert_settings.min_insert_block_size_bytes_for_materialized_views)
+            insert_context->setSetting("min_insert_block_size_bytes", insert_settings.min_insert_block_size_bytes_for_materialized_views.value);
+
+        views_data = std::make_shared<ViewsData>(select_context, table_id, metadata_snapshot, storage);
+    }
+
+    std::vector<Chain> chains;
+
+    for (const auto & database_table : dependencies)
+    {
+        auto dependent_table = DatabaseCatalog::instance().getTable(database_table, context);
+        auto dependent_metadata_snapshot = dependent_table->getInMemoryMetadataPtr();
+
+        ASTPtr query;
+        Chain out;
+
+        /// If the materialized view is executed outside of a query, for example as a result of SYSTEM FLUSH LOGS or
+        /// SYSTEM FLUSH DISTRIBUTED ..., we can't attach to any thread group and we won't log, so there is no point on collecting metrics
+        std::unique_ptr<ThreadStatus> view_thread_status_ptr = nullptr;
+
+        ThreadGroupStatusPtr running_group = current_thread && current_thread->getThreadGroup()
+            ? current_thread->getThreadGroup()
+            : MainThreadStatus::getInstance().getThreadGroup();
+        if (running_group)
+        {
+            /// We are creating a ThreadStatus per view to store its metrics individually
+            /// Since calling ThreadStatus() changes current_thread we save it and restore it after the calls
+            /// Later on, before doing any task related to a view, we'll switch to its ThreadStatus, do the work,
+            /// and switch back to the original thread_status.
+            auto * original_thread = current_thread;
+            SCOPE_EXIT({ current_thread = original_thread; });
+
+            view_thread_status_ptr = std::make_unique<ThreadStatus>();
+            /// Disable query profiler for this ThreadStatus since the running (main query) thread should already have one
+            /// If we didn't disable it, then we could end up with N + 1 (N = number of dependencies) profilers which means
+            /// N times more interruptions
+            view_thread_status_ptr->disableProfiling();
+            view_thread_status_ptr->attachQuery(running_group);
+        }
+
+        auto runtime_stats = std::make_unique<QueryViewsLogElement::ViewRuntimeStats>();
+        runtime_stats->target_name = database_table.getFullTableName();
+        runtime_stats->thread_status = std::move(view_thread_status_ptr);
+        runtime_stats->event_time = std::chrono::system_clock::now();
+        runtime_stats->event_status = QueryViewsLogElement::ViewStatus::EXCEPTION_BEFORE_START;
+
+        auto & type = runtime_stats->type;
+        auto & target_name = runtime_stats->target_name;
+        auto * view_thread_status = runtime_stats->thread_status.get();
+        auto * view_counter_ms = &runtime_stats->elapsed_ms;
+
+        if (auto * materialized_view = dynamic_cast<StorageMaterializedView *>(dependent_table.get()))
+        {
+            type = QueryViewsLogElement::ViewType::MATERIALIZED;
+            result_chain.addTableLock(materialized_view->lockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout));
+
+            StoragePtr inner_table = materialized_view->getTargetTable();
+            auto inner_table_id = inner_table->getStorageID();
+            auto inner_metadata_snapshot = inner_table->getInMemoryMetadataPtr();
+            query = dependent_metadata_snapshot->getSelectQuery().inner_query;
+            target_name = inner_table_id.getFullTableName();
+
+            /// Get list of columns we get from select query.
+            auto header = InterpreterSelectQuery(query, select_context, SelectQueryOptions().analyze())
+                .getSampleBlock();
+
+            /// Insert only columns returned by select.
+            Names insert_columns;
+            const auto & inner_table_columns = inner_metadata_snapshot->getColumns();
+            for (const auto & column : header)
+            {
+                /// But skip columns which storage doesn't have.
+                if (inner_table_columns.hasPhysical(column.name))
+                    insert_columns.emplace_back(column.name);
+            }
+
+            InterpreterInsertQuery interpreter(nullptr, insert_context, false, false, false);
+            out = interpreter.buildChain(inner_table, inner_metadata_snapshot, insert_columns, view_thread_status, view_counter_ms);
+            out.addStorageHolder(dependent_table);
+            out.addStorageHolder(inner_table);
+        }
+        else if (auto * live_view = dynamic_cast<StorageLiveView *>(dependent_table.get()))
+        {
+            runtime_stats->type = QueryViewsLogElement::ViewType::LIVE;
+            query = live_view->getInnerQuery(); // Used only to log in system.query_views_log
+            out = buildPushingToViewsChain(
+                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr(), true, view_thread_status, view_counter_ms, storage_header);
+        }
+        else
+            out = buildPushingToViewsChain(
+                dependent_table, dependent_metadata_snapshot, insert_context, ASTPtr(), false, view_thread_status, view_counter_ms);
+
+        views_data->views.emplace_back(ViewRuntimeData{ //-V614
+            std::move(query),
+            out.getInputHeader(),
+            database_table,
+            nullptr,
+            std::move(runtime_stats)});
+
+        if (type == QueryViewsLogElement::ViewType::MATERIALIZED)
+        {
+            auto executing_inner_query = std::make_shared<ExecutingInnerQueryFromViewTransform>(
+                storage_header, views_data->views.back(), views_data);
+            executing_inner_query->setRuntimeData(view_thread_status, elapsed_counter_ms);
+
+            out.addSource(std::move(executing_inner_query));
+        }
+
+        chains.emplace_back(std::move(out));
+
+        /// Add the view to the query access info so it can appear in system.query_log
+        if (!no_destination)
+        {
+            context->getQueryContext()->addQueryAccessInfo(
+                backQuoteIfNeed(database_table.getDatabaseName()), views_data->views.back().runtime_stats->target_name, {}, "", database_table.getFullTableName());
+        }
+    }
+
+    if (views_data)
+    {
+        size_t num_views = views_data->views.size();
+        const Settings & settings = context->getSettingsRef();
+        if (settings.parallel_view_processing)
+            views_data->max_threads = settings.max_threads ? std::min(static_cast<size_t>(settings.max_threads), num_views) : num_views;
+
+        std::vector<Block> headers;
+        headers.reserve(num_views);
+        for (const auto & chain : chains)
+            headers.push_back(chain.getOutputHeader());
+
+        auto copying_data = std::make_shared<CopyingDataToViewsTransform>(storage_header, views_data);
+        auto finalizing_views = std::make_shared<FinalizingViewsTransform>(std::move(headers), views_data);
+        auto out = copying_data->getOutputs().begin();
+        auto in = finalizing_views->getInputs().begin();
+
+        size_t max_parallel_streams = 0;
+
+        std::list<ProcessorPtr> processors;
+
+        for (auto & chain : chains)
+        {
+            max_parallel_streams += std::max<size_t>(chain.getNumThreads(), 1);
+            result_chain.attachResources(chain.detachResources());
+            connect(*out, chain.getInputPort());
+            connect(chain.getOutputPort(), *in);
+            ++in;
+            ++out;
+            processors.splice(processors.end(), Chain::getProcessors(std::move(chain)));
+        }
+
+        processors.emplace_front(std::move(copying_data));
+        processors.emplace_back(std::move(finalizing_views));
+        result_chain = Chain(std::move(processors));
+        result_chain.setNumThreads(max_parallel_streams);
+    }
+
+    if (auto * live_view = dynamic_cast<StorageLiveView *>(storage.get()))
+    {
+        auto sink = std::make_shared<PushingToLiveViewSink>(live_view_header, *live_view, storage, context);
+        sink->setRuntimeData(thread_status, elapsed_counter_ms);
+        result_chain.addSource(std::move(sink));
+    }
+    /// Do not push to destination table if the flag is set
+    else if (!no_destination)
+    {
+        auto sink = storage->write(query_ptr, metadata_snapshot, context);
+        metadata_snapshot->check(sink->getHeader().getColumnsWithTypeAndName());
+        sink->setRuntimeData(thread_status, elapsed_counter_ms);
+        result_chain.addSource(std::move(sink));
+    }
+
+    /// TODO: add pushing to live view
+    if (result_chain.empty())
+        result_chain.addSink(std::make_shared<NullSinkToStorage>(storage_header));
+
+    return result_chain;
+}
+
+static void process(Block & block, ViewRuntimeData & view, const ViewsData & views_data)
+{
+    const auto & context = views_data.context;
+
+    /// We create a table with the same name as original table and the same alias columns,
+    ///  but it will contain single block (that is INSERT-ed into main table).
+    /// InterpreterSelectQuery will do processing of alias columns.
+    auto local_context = Context::createCopy(context);
+    local_context->addViewSource(StorageValues::create(
+        views_data.source_storage_id,
+        views_data.source_metadata_snapshot->getColumns(),
+        block,
+        views_data.source_storage->getVirtuals()));
+
+    /// We need keep InterpreterSelectQuery, until the processing will be finished, since:
+    ///
+    /// - We copy Context inside InterpreterSelectQuery to support
+    ///   modification of context (Settings) for subqueries
+    /// - InterpreterSelectQuery lives shorter than query pipeline.
+    ///   It's used just to build the query pipeline and no longer needed
+    /// - ExpressionAnalyzer and then, Functions, that created in InterpreterSelectQuery,
+    ///   **can** take a reference to Context from InterpreterSelectQuery
+    ///   (the problem raises only when function uses context from the
+    ///    execute*() method, like FunctionDictGet do)
+    /// - These objects live inside query pipeline (DataStreams) and the reference become dangling.
+    InterpreterSelectQuery select(view.query, local_context, SelectQueryOptions());
+
+    auto pipeline = select.buildQueryPipeline();
+    pipeline.resize(1);
+
+    /// Squashing is needed here because the materialized view query can generate a lot of blocks
+    /// even when only one block is inserted into the parent table (e.g. if the query is a GROUP BY
+    /// and two-level aggregation is triggered).
+    pipeline.addTransform(std::make_shared<SquashingChunksTransform>(
+        pipeline.getHeader(),
+        context->getSettingsRef().min_insert_block_size_rows,
+        context->getSettingsRef().min_insert_block_size_bytes));
+
+    auto converting = ActionsDAG::makeConvertingActions(
+        pipeline.getHeader().getColumnsWithTypeAndName(),
+        view.sample_block.getColumnsWithTypeAndName(),
+        ActionsDAG::MatchColumnsMode::Name);
+
+    pipeline.addTransform(std::make_shared<ExpressionTransform>(
+        pipeline.getHeader(),
+        std::make_shared<ExpressionActions>(std::move(converting))));
+
+    pipeline.setProgressCallback([context](const Progress & progress)
+    {
+        CurrentThread::updateProgressIn(progress);
+        if (auto callback = context->getProgressCallback())
+            callback(progress);
+    });
+
+    auto query_pipeline = QueryPipelineBuilder::getPipeline(std::move(pipeline));
+    PullingPipelineExecutor executor(query_pipeline);
+    if (!executor.pull(block))
+    {
+        block.clear();
+        return;
+    }
+
+    if (executor.pull(block))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Single chunk is expected from view inner query {}", view.query);
+}
+
+static void logQueryViews(std::list<ViewRuntimeData> & views, ContextPtr context)
+{
+    const auto & settings = context->getSettingsRef();
+    const UInt64 min_query_duration = settings.log_queries_min_query_duration_ms.totalMilliseconds();
+    const QueryViewsLogElement::ViewStatus min_status = settings.log_queries_min_type;
+    if (views.empty() || !settings.log_queries || !settings.log_query_views)
+        return;
+
+    for (auto & view : views)
+    {
+        const auto & stats = *view.runtime_stats;
+        if ((min_query_duration && stats.elapsed_ms <= min_query_duration) || (stats.event_status < min_status))
+            continue;
+
+        try
+        {
+            if (stats.thread_status)
+                stats.thread_status->logToQueryViewsLog(view);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+
+CopyingDataToViewsTransform::CopyingDataToViewsTransform(const Block & header, ViewsDataPtr data)
+    : IProcessor({header}, OutputPorts(data->views.size(), header))
+    , input(inputs.front())
+    , views_data(std::move(data))
+{
+    if (views_data->views.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "CopyingDataToViewsTransform cannot have zero outputs");
+}
+
+IProcessor::Status CopyingDataToViewsTransform::prepare()
+{
+    bool all_can_push = true;
+    for (auto & output : outputs)
+    {
+        if (output.isFinished())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot push data to view because output port is finished");
+
+        if (!output.canPush())
+            all_can_push = false;
+    }
+
+    if (!all_can_push)
+        return Status::PortFull;
+
+    if (input.isFinished())
+    {
+        for (auto & output : outputs)
+            output.finish();
+
+        return Status::Finished;
+    }
+
+    input.setNeeded();
+    if (!input.hasData())
+        return Status::NeedData;
+
+    auto data = input.pullData();
+    if (data.exception)
+    {
+        if (!views_data->has_exception)
+        {
+            views_data->first_exception = data.exception;
+            views_data->has_exception = true;
+        }
+
+        for (auto & output : outputs)
+            output.pushException(data.exception);
+    }
+    else
+    {
+        for (auto & output : outputs)
+            output.push(data.chunk.clone());
+    }
+
+    return Status::PortFull;
+}
+
+
+ExecutingInnerQueryFromViewTransform::ExecutingInnerQueryFromViewTransform(
+    const Block & header,
+    ViewRuntimeData & view_,
+    std::shared_ptr<ViewsData> views_data_)
+    : ExceptionKeepingTransform(header, view_.sample_block)
+    , views_data(std::move(views_data_))
+    , view(view_)
+{
+}
+
+void ExecutingInnerQueryFromViewTransform::transform(Chunk & chunk)
+{
+    auto block = getInputPort().getHeader().cloneWithColumns(chunk.getColumns());
+    process(block, view, *views_data);
+    chunk.setColumns(block.getColumns(), block.rows());
+}
+
+
+PushingToLiveViewSink::PushingToLiveViewSink(const Block & header, StorageLiveView & live_view_, StoragePtr storage_holder_, ContextPtr context_)
+    : SinkToStorage(header)
+    , live_view(live_view_)
+    , storage_holder(std::move(storage_holder_))
+    , context(std::move(context_))
+{
+}
+
+void PushingToLiveViewSink::consume(Chunk chunk)
+{
+    Progress local_progress(chunk.getNumRows(), chunk.bytes(), 0);
+    StorageLiveView::writeIntoLiveView(live_view, getHeader().cloneWithColumns(chunk.detachColumns()), context);
+    CurrentThread::updateProgressIn(local_progress);
+}
+
+
+FinalizingViewsTransform::FinalizingViewsTransform(std::vector<Block> headers, ViewsDataPtr data)
+    : IProcessor(initPorts(std::move(headers)), {Block()})
+    , output(outputs.front())
+    , views_data(std::move(data))
+{
+    statuses.resize(views_data->views.size());
+}
+
+InputPorts FinalizingViewsTransform::initPorts(std::vector<Block> headers)
+{
+    InputPorts res;
+    for (auto & header : headers)
+        res.emplace_back(std::move(header));
+
+    return res;
+}
+
+IProcessor::Status FinalizingViewsTransform::prepare()
+{
+    if (output.isFinished())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot finalize views because output port is finished");
+
+    if (!output.canPush())
+        return Status::PortFull;
+
+    size_t num_finished = 0;
+    size_t pos = 0;
+    for (auto & input : inputs)
+    {
+        auto i = pos;
+        ++pos;
+
+        if (input.isFinished())
+        {
+            ++num_finished;
+            continue;
+        }
+
+        input.setNeeded();
+        if (input.hasData())
+        {
+            auto data = input.pullData();
+            //std::cerr << "********** FinalizingViewsTransform got input " << i << " has exc " << bool(data.exception) << std::endl;
+            if (data.exception)
+            {
+                if (views_data->has_exception && views_data->first_exception == data.exception)
+                    statuses[i].is_first = true;
+                else
+                    statuses[i].exception = data.exception;
+
+                if (i == 0 && statuses[0].is_first)
+                {
+                    output.pushData(std::move(data));
+                    return Status::PortFull;
+                }
+            }
+
+            if (input.isFinished())
+                ++num_finished;
+        }
+    }
+
+    if (num_finished == inputs.size())
+    {
+        if (!statuses.empty())
+            return Status::Ready;
+
+        if (any_exception)
+            output.pushException(std::move(any_exception));
+
+        output.finish();
+        return Status::Finished;
+    }
+
+    return Status::NeedData;
+}
+
+static std::exception_ptr addStorageToException(std::exception_ptr ptr, const StorageID & storage)
+{
+    try
+    {
+        std::rethrow_exception(std::move(ptr));
+    }
+    catch (DB::Exception & exception)
+    {
+        exception.addMessage("while pushing to view {}", storage.getNameForLogs());
+        return std::current_exception();
+    }
+    catch (...)
+    {
+        return std::current_exception();
+    }
+
+    __builtin_unreachable();
+}
+
+void FinalizingViewsTransform::work()
+{
+    size_t i = 0;
+    for (auto & view : views_data->views)
+    {
+        auto & status = statuses[i];
+        ++i;
+
+        if (status.exception)
+        {
+            if (!any_exception)
+                any_exception = status.exception;
+
+            view.setException(addStorageToException(std::move(status.exception), view.table_id));
+        }
+        else
+        {
+            view.runtime_stats->setStatus(QueryViewsLogElement::ViewStatus::QUERY_FINISH);
+
+            LOG_TRACE(
+                &Poco::Logger::get("PushingToViews"),
+                "Pushing ({}) from {} to {} took {} ms.",
+                views_data->max_threads <= 1 ? "sequentially" : ("parallel " + std::to_string(views_data->max_threads)),
+                views_data->source_storage_id.getNameForLogs(),
+                view.table_id.getNameForLogs(),
+                view.runtime_stats->elapsed_ms);
+        }
+    }
+
+    logQueryViews(views_data->views, views_data->context);
+
+    statuses.clear();
+}
+
+}
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.h b/src/Processors/Transforms/buildPushingToViewsChain.h
new file mode 100644
index 00000000000..260fdfb3a19
--- /dev/null
+++ b/src/Processors/Transforms/buildPushingToViewsChain.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <Interpreters/QueryViewsLog.h>
+#include <Parsers/IAST_fwd.h>
+#include <QueryPipeline/Chain.h>
+#include <Processors/ISimpleTransform.h>
+#include <Storages/IStorage.h>
+#include <Processors/Sinks/SinkToStorage.h>
+#include <Common/Stopwatch.h>
+
+namespace Poco
+{
+class Logger;
+}
+
+namespace DB
+{
+
+struct ViewRuntimeData
+{
+    /// A query we should run over inserted block befire pushing into inner storage.
+    const ASTPtr query;
+    /// This structure is expected by inner storage. Will convert query result to it.
+    Block sample_block;
+    /// Inner storage id.
+    StorageID table_id;
+
+    /// In case of exception at any step (e.g. query execution or insertion into inner table)
+    /// exception is stored here (will be stored in query views log).
+    std::exception_ptr exception;
+    /// Info which is needed for query views log.
+    std::unique_ptr<QueryViewsLogElement::ViewRuntimeStats> runtime_stats;
+
+    void setException(std::exception_ptr e)
+    {
+        exception = e;
+        runtime_stats->setStatus(QueryViewsLogElement::ViewStatus::EXCEPTION_WHILE_PROCESSING);
+    }
+};
+
+/** Writes data to the specified table and to all dependent materialized views.
+  */
+Chain buildPushingToViewsChain(
+    const StoragePtr & storage,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    const ASTPtr & query_ptr,
+    /// It is true when we should not insert into table, but only to views.
+    /// Used e.g. for kafka. We should try to remove it somehow.
+    bool no_destination,
+    /// We could specify separate thread_status for each view.
+    /// Needed mainly to collect counters separately. Should be improved.
+    ThreadStatus * thread_status,
+    /// Counter to measure time spent separately per view. Should be improved.
+    std::atomic_uint64_t * elapsed_counter_ms,
+    /// LiveView executes query itself, it needs source block structure.
+    const Block & live_view_header = {});
+
+}
diff --git a/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
new file mode 100644
index 00000000000..64c8a01bb9c
--- /dev/null
+++ b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
@@ -0,0 +1,136 @@
+#include <Parsers/ASTInsertQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSetQuery.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/EmptyReadBuffer.h>
+#include <QueryPipeline/BlockIO.h>
+#include <Processors/Transforms/getSourceFromASTInsertQuery.h>
+#include <Processors/Transforms/AddingDefaultsTransform.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/IStorage.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Formats/IInputFormat.h>
+#include "IO/CompressionMethod.h"
+#include "Parsers/ASTLiteral.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int INVALID_USAGE_OF_INPUT;
+    extern const int UNKNOWN_TYPE_OF_QUERY;
+}
+
+InputFormatPtr getInputFormatFromASTInsertQuery(
+    const ASTPtr & ast,
+    bool with_buffers,
+    const Block & header,
+    ContextPtr context,
+    const ASTPtr & input_function)
+{
+    /// get ast query
+    const auto * ast_insert_query = ast->as<ASTInsertQuery>();
+
+    if (!ast_insert_query)
+        throw Exception("Logical error: query requires data to insert, but it is not INSERT query", ErrorCodes::LOGICAL_ERROR);
+
+    if (ast_insert_query->infile && context->getApplicationType() == Context::ApplicationType::SERVER)
+        throw Exception("Query has infile and was send directly to server", ErrorCodes::UNKNOWN_TYPE_OF_QUERY);
+
+    if (ast_insert_query->format.empty())
+    {
+        if (input_function)
+            throw Exception("FORMAT must be specified for function input()", ErrorCodes::INVALID_USAGE_OF_INPUT);
+        else
+            throw Exception("Logical error: INSERT query requires format to be set", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    /// Data could be in parsed (ast_insert_query.data) and in not parsed yet (input_buffer_tail_part) part of query.
+    auto input_buffer_ast_part = std::make_unique<ReadBufferFromMemory>(
+        ast_insert_query->data, ast_insert_query->data ? ast_insert_query->end - ast_insert_query->data : 0);
+
+    std::unique_ptr<ReadBuffer> input_buffer = with_buffers
+        ? getReadBufferFromASTInsertQuery(ast)
+        : std::make_unique<EmptyReadBuffer>();
+
+    /// Create a source from input buffer using format from query
+    auto source = context->getInputFormat(ast_insert_query->format, *input_buffer, header, context->getSettings().max_insert_block_size);
+    source->addBuffer(std::move(input_buffer));
+    return source;
+}
+
+Pipe getSourceFromASTInsertQuery(
+    const ASTPtr & ast,
+    bool with_buffers,
+    const Block & header,
+    ContextPtr context,
+    const ASTPtr & input_function)
+{
+    auto source = getInputFormatFromASTInsertQuery(ast, with_buffers, header, context, input_function);
+    Pipe pipe(source);
+
+    const auto * ast_insert_query = ast->as<ASTInsertQuery>();
+    if (context->getSettingsRef().input_format_defaults_for_omitted_fields && ast_insert_query->table_id && !input_function)
+    {
+        StoragePtr storage = DatabaseCatalog::instance().getTable(ast_insert_query->table_id, context);
+        auto metadata_snapshot = storage->getInMemoryMetadataPtr();
+        const auto & columns = metadata_snapshot->getColumns();
+        if (columns.hasDefaults())
+        {
+            pipe.addSimpleTransform([&](const Block & cur_header)
+            {
+                return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *source, context);
+            });
+        }
+    }
+
+    return pipe;
+}
+
+std::unique_ptr<ReadBuffer> getReadBufferFromASTInsertQuery(const ASTPtr & ast)
+{
+    const auto * insert_query = ast->as<ASTInsertQuery>();
+    if (!insert_query)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: query requires data to insert, but it is not INSERT query");
+
+    if (insert_query->infile)
+    {
+        /// Data can be from infile
+        const auto & in_file_node = insert_query->infile->as<ASTLiteral &>();
+        const auto in_file = in_file_node.value.safeGet<std::string>();
+
+        /// It can be compressed and compression method maybe specified in query
+        std::string compression_method;
+        if (insert_query->compression)
+        {
+            const auto & compression_method_node = insert_query->compression->as<ASTLiteral &>();
+            compression_method = compression_method_node.value.safeGet<std::string>();
+        }
+
+        /// Otherwise, it will be detected from file name automatically (by chooseCompressionMethod)
+        /// Buffer for reading from file is created and wrapped with appropriate compression method
+        return wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromFile>(in_file), chooseCompressionMethod(in_file, compression_method));
+    }
+
+    std::vector<std::unique_ptr<ReadBuffer>> buffers;
+    if (insert_query->data)
+    {
+        /// Data could be in parsed (ast_insert_query.data) and in not parsed yet (input_buffer_tail_part) part of query.
+        auto ast_buffer = std::make_unique<ReadBufferFromMemory>(
+            insert_query->data, insert_query->end - insert_query->data);
+
+        buffers.emplace_back(std::move(ast_buffer));
+    }
+
+    if (insert_query->tail)
+        buffers.emplace_back(wrapReadBufferReference(*insert_query->tail));
+
+    return std::make_unique<ConcatReadBuffer>(std::move(buffers));
+}
+
+}
diff --git a/src/Processors/Transforms/getSourceFromASTInsertQuery.h b/src/Processors/Transforms/getSourceFromASTInsertQuery.h
new file mode 100644
index 00000000000..4a5ed952efc
--- /dev/null
+++ b/src/Processors/Transforms/getSourceFromASTInsertQuery.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Parsers/IAST.h>
+#include <Interpreters/Context_fwd.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <cstddef>
+#include <memory>
+
+
+namespace DB
+{
+
+class Pipe;
+
+/// Prepares a input format, which produce data containing in INSERT query.
+InputFormatPtr getInputFormatFromASTInsertQuery(
+        const ASTPtr & ast,
+        bool with_buffers,
+        const Block & header,
+        ContextPtr context,
+        const ASTPtr & input_function);
+
+/// Prepares a pipe which produce data containing in INSERT query.
+Pipe getSourceFromASTInsertQuery(
+        const ASTPtr & ast,
+        bool with_buffers,
+        const Block & header,
+        ContextPtr context,
+        const ASTPtr & input_function);
+
+class ReadBuffer;
+
+/// Prepares a read buffer, that allows to read inlined data
+/// from ASTInsertQuert directly, and from tail buffer, if it exists.
+std::unique_ptr<ReadBuffer> getReadBufferFromASTInsertQuery(const ASTPtr & ast);
+
+}
diff --git a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.cpp b/src/Processors/Transforms/getSourceFromFromASTInsertQuery.cpp
deleted file mode 100644
index 8d8a4761657..00000000000
--- a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <Parsers/ASTInsertQuery.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/InterpreterSetQuery.h>
-#include <Formats/FormatFactory.h>
-#include <IO/ConcatReadBuffer.h>
-#include <IO/ReadBufferFromMemory.h>
-#include <DataStreams/BlockIO.h>
-#include <Processors/Transforms/getSourceFromFromASTInsertQuery.h>
-#include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <Storages/ColumnsDescription.h>
-#include <Storages/IStorage.h>
-#include <Processors/Pipe.h>
-#include <Processors/Formats/IInputFormat.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-    extern const int INVALID_USAGE_OF_INPUT;
-}
-
-
-Pipe getSourceFromFromASTInsertQuery(
-    const ASTPtr & ast,
-    ReadBuffer * input_buffer_tail_part,
-    const Block & header,
-    ContextPtr context,
-    const ASTPtr & input_function)
-{
-    const auto * ast_insert_query = ast->as<ASTInsertQuery>();
-
-    if (!ast_insert_query)
-        throw Exception("Logical error: query requires data to insert, but it is not INSERT query", ErrorCodes::LOGICAL_ERROR);
-
-    String format = ast_insert_query->format;
-    if (format.empty())
-    {
-        if (input_function)
-            throw Exception("FORMAT must be specified for function input()", ErrorCodes::INVALID_USAGE_OF_INPUT);
-        format = "Values";
-    }
-
-    /// Data could be in parsed (ast_insert_query.data) and in not parsed yet (input_buffer_tail_part) part of query.
-
-    auto input_buffer_ast_part = std::make_unique<ReadBufferFromMemory>(
-        ast_insert_query->data, ast_insert_query->data ? ast_insert_query->end - ast_insert_query->data : 0);
-
-    ConcatReadBuffer::ReadBuffers buffers;
-    if (ast_insert_query->data)
-        buffers.push_back(input_buffer_ast_part.get());
-
-    if (input_buffer_tail_part)
-        buffers.push_back(input_buffer_tail_part);
-
-    /** NOTE Must not read from 'input_buffer_tail_part' before read all between 'ast_insert_query.data' and 'ast_insert_query.end'.
-        * - because 'query.data' could refer to memory piece, used as buffer for 'input_buffer_tail_part'.
-        */
-
-    auto input_buffer_contacenated = std::make_unique<ConcatReadBuffer>(buffers);
-
-    auto source = FormatFactory::instance().getInput(format, *input_buffer_contacenated, header, context, context->getSettings().max_insert_block_size);
-    Pipe pipe(source);
-
-    if (context->getSettingsRef().input_format_defaults_for_omitted_fields && ast_insert_query->table_id && !input_function)
-    {
-        StoragePtr storage = DatabaseCatalog::instance().getTable(ast_insert_query->table_id, context);
-        auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-        const auto & columns = metadata_snapshot->getColumns();
-        if (columns.hasDefaults())
-        {
-            pipe.addSimpleTransform([&](const Block & cur_header)
-            {
-                return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *source, context);
-            });
-        }
-    }
-
-    source->addBuffer(std::move(input_buffer_ast_part));
-    source->addBuffer(std::move(input_buffer_contacenated));
-
-    return pipe;
-}
-
-}
diff --git a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.h b/src/Processors/Transforms/getSourceFromFromASTInsertQuery.h
deleted file mode 100644
index 3c00bd47ea0..00000000000
--- a/src/Processors/Transforms/getSourceFromFromASTInsertQuery.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <Parsers/IAST.h>
-#include <Interpreters/Context_fwd.h>
-#include <cstddef>
-#include <memory>
-
-
-namespace DB
-{
-
-/** Prepares a pipe which produce data containing in INSERT query
-  * Head of inserting data could be stored in INSERT ast directly
-  * Remaining (tail) data could be stored in input_buffer_tail_part
-  */
-
-class Pipe;
-
-Pipe getSourceFromFromASTInsertQuery(
-        const ASTPtr & ast,
-        ReadBuffer * input_buffer_tail_part,
-        const Block & header,
-        ContextPtr context,
-        const ASTPtr & input_function);
-
-}
diff --git a/src/Processors/ya.make b/src/Processors/ya.make
deleted file mode 100644
index 4b95484a828..00000000000
--- a/src/Processors/ya.make
+++ /dev/null
@@ -1,186 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/msgpack
-    contrib/libs/protobuf
-    contrib/libs/arrow
-)
-
-ADDINCL(
-    contrib/libs/arrow/src
-)
-
-CFLAGS(-DUSE_ARROW=1)
-
-SRCS(
-    Chunk.cpp
-    ConcatProcessor.cpp
-    DelayedPortsProcessor.cpp
-    Executors/ExecutingGraph.cpp
-    Executors/PipelineExecutingBlockInputStream.cpp
-    Executors/PipelineExecutor.cpp
-    Executors/PollingQueue.cpp
-    Executors/PullingAsyncPipelineExecutor.cpp
-    Executors/PullingPipelineExecutor.cpp
-    ForkProcessor.cpp
-    Formats/IInputFormat.cpp
-    Formats/IOutputFormat.cpp
-    Formats/IRowInputFormat.cpp
-    Formats/IRowOutputFormat.cpp
-    Formats/Impl/ArrowBlockInputFormat.cpp
-    Formats/Impl/ArrowBlockOutputFormat.cpp
-    Formats/Impl/ArrowBufferedStreams.cpp
-    Formats/Impl/ArrowColumnToCHColumn.cpp
-    Formats/Impl/CHColumnToArrowColumn.cpp
-    Formats/Impl/BinaryRowInputFormat.cpp
-    Formats/Impl/BinaryRowOutputFormat.cpp
-    Formats/Impl/CSVRowInputFormat.cpp
-    Formats/Impl/CSVRowOutputFormat.cpp
-    Formats/Impl/ConstantExpressionTemplate.cpp
-    Formats/Impl/JSONAsStringRowInputFormat.cpp
-    Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
-    Formats/Impl/JSONCompactEachRowRowOutputFormat.cpp
-    Formats/Impl/JSONCompactRowOutputFormat.cpp
-    Formats/Impl/JSONEachRowRowInputFormat.cpp
-    Formats/Impl/JSONEachRowRowOutputFormat.cpp
-    Formats/Impl/JSONEachRowWithProgressRowOutputFormat.cpp
-    Formats/Impl/JSONRowOutputFormat.cpp
-    Formats/Impl/LineAsStringRowInputFormat.cpp
-    Formats/Impl/MarkdownRowOutputFormat.cpp
-    Formats/Impl/MsgPackRowInputFormat.cpp
-    Formats/Impl/MsgPackRowOutputFormat.cpp
-    Formats/Impl/MySQLOutputFormat.cpp
-    Formats/Impl/NullFormat.cpp
-    Formats/Impl/ODBCDriver2BlockOutputFormat.cpp
-    Formats/Impl/ParallelFormattingOutputFormat.cpp
-    Formats/Impl/ParallelParsingInputFormat.cpp
-    Formats/Impl/PostgreSQLOutputFormat.cpp
-    Formats/Impl/PrettyBlockOutputFormat.cpp
-    Formats/Impl/PrettyCompactBlockOutputFormat.cpp
-    Formats/Impl/PrettySpaceBlockOutputFormat.cpp
-    Formats/Impl/ProtobufRowInputFormat.cpp
-    Formats/Impl/ProtobufRowOutputFormat.cpp
-    Formats/Impl/RawBLOBRowInputFormat.cpp
-    Formats/Impl/RawBLOBRowOutputFormat.cpp
-    Formats/Impl/RegexpRowInputFormat.cpp
-    Formats/Impl/TSKVRowInputFormat.cpp
-    Formats/Impl/TSKVRowOutputFormat.cpp
-    Formats/Impl/TabSeparatedRowInputFormat.cpp
-    Formats/Impl/TabSeparatedRowOutputFormat.cpp
-    Formats/Impl/TemplateBlockOutputFormat.cpp
-    Formats/Impl/TemplateRowInputFormat.cpp
-    Formats/Impl/ValuesBlockInputFormat.cpp
-    Formats/Impl/ValuesRowOutputFormat.cpp
-    Formats/Impl/VerticalRowOutputFormat.cpp
-    Formats/Impl/XMLRowOutputFormat.cpp
-    Formats/LazyOutputFormat.cpp
-    Formats/OutputStreamToOutputFormat.cpp
-    Formats/PullingOutputFormat.cpp
-    Formats/RowInputFormatWithDiagnosticInfo.cpp
-    IAccumulatingTransform.cpp
-    IInflatingTransform.cpp
-    IProcessor.cpp
-    ISimpleTransform.cpp
-    ISink.cpp
-    ISource.cpp
-    LimitTransform.cpp
-    Merges/Algorithms/AggregatingSortedAlgorithm.cpp
-    Merges/Algorithms/CollapsingSortedAlgorithm.cpp
-    Merges/Algorithms/FinishAggregatingInOrderAlgorithm.cpp
-    Merges/Algorithms/GraphiteRollupSortedAlgorithm.cpp
-    Merges/Algorithms/IMergingAlgorithmWithDelayedChunk.cpp
-    Merges/Algorithms/IMergingAlgorithmWithSharedChunks.cpp
-    Merges/Algorithms/MergingSortedAlgorithm.cpp
-    Merges/Algorithms/ReplacingSortedAlgorithm.cpp
-    Merges/Algorithms/SummingSortedAlgorithm.cpp
-    Merges/Algorithms/VersionedCollapsingAlgorithm.cpp
-    Merges/IMergingTransform.cpp
-    Merges/MergingSortedTransform.cpp
-    OffsetTransform.cpp
-    Pipe.cpp
-    Port.cpp
-    QueryPipeline.cpp
-    QueryPlan/AggregatingStep.cpp
-    QueryPlan/ArrayJoinStep.cpp
-    QueryPlan/BuildQueryPipelineSettings.cpp
-    QueryPlan/CreatingSetsStep.cpp
-    QueryPlan/CubeStep.cpp
-    QueryPlan/DistinctStep.cpp
-    QueryPlan/ExpressionStep.cpp
-    QueryPlan/ExtremesStep.cpp
-    QueryPlan/FillingStep.cpp
-    QueryPlan/FilterStep.cpp
-    QueryPlan/FinishSortingStep.cpp
-    QueryPlan/IQueryPlanStep.cpp
-    QueryPlan/ISourceStep.cpp
-    QueryPlan/ITransformingStep.cpp
-    QueryPlan/JoinStep.cpp
-    QueryPlan/LimitByStep.cpp
-    QueryPlan/LimitStep.cpp
-    QueryPlan/MergeSortingStep.cpp
-    QueryPlan/MergingAggregatedStep.cpp
-    QueryPlan/MergingSortedStep.cpp
-    QueryPlan/OffsetStep.cpp
-    QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
-    QueryPlan/Optimizations/filterPushDown.cpp
-    QueryPlan/Optimizations/liftUpArrayJoin.cpp
-    QueryPlan/Optimizations/limitPushDown.cpp
-    QueryPlan/Optimizations/mergeExpressions.cpp
-    QueryPlan/Optimizations/optimizeTree.cpp
-    QueryPlan/Optimizations/splitFilter.cpp
-    QueryPlan/PartialSortingStep.cpp
-    QueryPlan/QueryIdHolder.cpp
-    QueryPlan/QueryPlan.cpp
-    QueryPlan/ReadFromMergeTree.cpp
-    QueryPlan/ReadFromPreparedSource.cpp
-    QueryPlan/ReadFromRemote.cpp
-    QueryPlan/ReadNothingStep.cpp
-    QueryPlan/RollupStep.cpp
-    QueryPlan/SettingQuotaAndLimitsStep.cpp
-    QueryPlan/TotalsHavingStep.cpp
-    QueryPlan/UnionStep.cpp
-    QueryPlan/WindowStep.cpp
-    ResizeProcessor.cpp
-    Sources/DelayedSource.cpp
-    Sources/RemoteSource.cpp
-    Sources/SinkToOutputStream.cpp
-    Sources/SourceFromInputStream.cpp
-    Sources/SourceWithProgress.cpp
-    Transforms/AddingDefaultsTransform.cpp
-    Transforms/AddingSelectorTransform.cpp
-    Transforms/AggregatingInOrderTransform.cpp
-    Transforms/AggregatingTransform.cpp
-    Transforms/ArrayJoinTransform.cpp
-    Transforms/CheckSortedTransform.cpp
-    Transforms/CopyTransform.cpp
-    Transforms/CreatingSetsTransform.cpp
-    Transforms/CubeTransform.cpp
-    Transforms/DistinctTransform.cpp
-    Transforms/ExpressionTransform.cpp
-    Transforms/ExtremesTransform.cpp
-    Transforms/FillingTransform.cpp
-    Transforms/FilterTransform.cpp
-    Transforms/FinishSortingTransform.cpp
-    Transforms/JoiningTransform.cpp
-    Transforms/LimitByTransform.cpp
-    Transforms/LimitsCheckingTransform.cpp
-    Transforms/MaterializingTransform.cpp
-    Transforms/MergeSortingTransform.cpp
-    Transforms/MergingAggregatedMemoryEfficientTransform.cpp
-    Transforms/MergingAggregatedTransform.cpp
-    Transforms/PartialSortingTransform.cpp
-    Transforms/ReverseTransform.cpp
-    Transforms/RollupTransform.cpp
-    Transforms/SortingTransform.cpp
-    Transforms/TotalsHavingTransform.cpp
-    Transforms/WindowTransform.cpp
-    Transforms/getSourceFromFromASTInsertQuery.cpp
-    printPipeline.cpp
-
-)
-
-END()
diff --git a/src/Processors/ya.make.in b/src/Processors/ya.make.in
deleted file mode 100644
index 06230b96be8..00000000000
--- a/src/Processors/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/msgpack
-    contrib/libs/protobuf
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -P 'Arrow|Avro|ORC|Parquet|CapnProto' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/DataStreams/BlockIO.cpp b/src/QueryPipeline/BlockIO.cpp
similarity index 59%
rename from src/DataStreams/BlockIO.cpp
rename to src/QueryPipeline/BlockIO.cpp
index 3bbef4471db..671ba6e4c39 100644
--- a/src/DataStreams/BlockIO.cpp
+++ b/src/QueryPipeline/BlockIO.cpp
@@ -1,30 +1,9 @@
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Interpreters/ProcessList.h>
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-BlockInputStreamPtr BlockIO::getInputStream()
-{
-    if (out)
-        throw Exception("Cannot get input stream from BlockIO because output stream is not empty",
-                        ErrorCodes::LOGICAL_ERROR);
-
-    if (in)
-        return in;
-
-    if (pipeline.initialized())
-        return std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
-
-    throw Exception("Cannot get input stream from BlockIO because query pipeline was not initialized",
-                    ErrorCodes::LOGICAL_ERROR);
-}
 
 void BlockIO::reset()
 {
@@ -38,10 +17,6 @@ void BlockIO::reset()
       */
     /// TODO simplify it all
 
-    out.reset();
-    in.reset();
-    if (process_list_entry)
-        process_list_entry->get().releaseQueryStreams();
     pipeline.reset();
     process_list_entry.reset();
 
@@ -57,8 +32,6 @@ BlockIO & BlockIO::operator= (BlockIO && rhs)
     reset();
 
     process_list_entry      = std::move(rhs.process_list_entry);
-    in                      = std::move(rhs.in);
-    out                     = std::move(rhs.out);
     pipeline                = std::move(rhs.pipeline);
 
     finish_callback         = std::move(rhs.finish_callback);
diff --git a/src/DataStreams/BlockIO.h b/src/QueryPipeline/BlockIO.h
similarity index 55%
rename from src/DataStreams/BlockIO.h
rename to src/QueryPipeline/BlockIO.h
index 31a0e1020d2..0f05beca4a8 100644
--- a/src/DataStreams/BlockIO.h
+++ b/src/QueryPipeline/BlockIO.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <DataStreams/IBlockStream_fwd.h>
-
 #include <functional>
-
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipeline.h>
 
 
 namespace DB
@@ -25,14 +22,11 @@ struct BlockIO
 
     std::shared_ptr<ProcessListEntry> process_list_entry;
 
-    BlockOutputStreamPtr out;
-    BlockInputStreamPtr in;
-
     QueryPipeline pipeline;
 
     /// Callbacks for query logging could be set here.
-    std::function<void(IBlockInputStream *, IBlockOutputStream *, QueryPipeline *)>    finish_callback;
-    std::function<void()>                                                              exception_callback;
+    std::function<void(QueryPipeline &)> finish_callback;
+    std::function<void()> exception_callback;
 
     /// When it is true, don't bother sending any non-empty blocks to the out stream
     bool null_format = false;
@@ -42,11 +36,7 @@ struct BlockIO
     {
         if (finish_callback)
         {
-            QueryPipeline * pipeline_ptr = nullptr;
-            if (pipeline.initialized())
-                pipeline_ptr = &pipeline;
-
-            finish_callback(in.get(), out.get(), pipeline_ptr);
+            finish_callback(pipeline);
         }
     }
 
@@ -56,9 +46,6 @@ struct BlockIO
             exception_callback();
     }
 
-    /// Returns in or converts pipeline to stream. Throws if out is not empty.
-    BlockInputStreamPtr getInputStream();
-
 private:
     void reset();
 };
diff --git a/src/DataStreams/CMakeLists.txt b/src/QueryPipeline/CMakeLists.txt
similarity index 100%
rename from src/DataStreams/CMakeLists.txt
rename to src/QueryPipeline/CMakeLists.txt
diff --git a/src/QueryPipeline/Chain.cpp b/src/QueryPipeline/Chain.cpp
new file mode 100644
index 00000000000..ca7b0b80692
--- /dev/null
+++ b/src/QueryPipeline/Chain.cpp
@@ -0,0 +1,126 @@
+#include <IO/WriteHelpers.h>
+#include <QueryPipeline/Chain.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+static void checkSingleInput(const IProcessor & transform)
+{
+    if (transform.getInputs().size() != 1)
+        throw Exception("Transform for chain should have single input, "
+                        "but " + transform.getName() + " has " +
+                        toString(transform.getInputs().size()) + " inputs.", ErrorCodes::LOGICAL_ERROR);
+
+    if (transform.getInputs().front().isConnected())
+        throw Exception("Transform for chain has connected input.", ErrorCodes::LOGICAL_ERROR);
+}
+
+static void checkSingleOutput(const IProcessor & transform)
+{
+    if (transform.getOutputs().size() != 1)
+        throw Exception("Transform for chain should have single output, "
+                        "but " + transform.getName() + " has " +
+                        toString(transform.getOutputs().size()) + " outputs.", ErrorCodes::LOGICAL_ERROR);
+
+    if (transform.getOutputs().front().isConnected())
+        throw Exception("Transform for chain has connected input.", ErrorCodes::LOGICAL_ERROR);
+}
+
+static void checkTransform(const IProcessor & transform)
+{
+    checkSingleInput(transform);
+    checkSingleOutput(transform);
+}
+
+static void checkInitialized(const std::list<ProcessorPtr> & processors)
+{
+    if (processors.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Drain is not initialized");
+}
+
+Chain::Chain(ProcessorPtr processor)
+{
+    checkTransform(*processor);
+    processors.emplace_back(std::move(processor));
+}
+
+Chain::Chain(std::list<ProcessorPtr> processors_) : processors(std::move(processors_))
+{
+    if (processors.empty())
+        return;
+
+    checkSingleInput(*processors.front());
+    checkSingleOutput(*processors.back());
+
+    for (const auto & processor : processors)
+    {
+        for (const auto & input : processor->getInputs())
+            if (&input != &getInputPort() && !input.isConnected())
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Cannot initialize chain because there is a not connected input for {}",
+                                processor->getName());
+
+        for (const auto & output : processor->getOutputs())
+            if (&output != &getOutputPort() && !output.isConnected())
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Cannot initialize chain because there is a not connected output for {}",
+                                processor->getName());
+    }
+}
+
+void Chain::addSource(ProcessorPtr processor)
+{
+    checkTransform(*processor);
+
+    if (!processors.empty())
+        connect(processor->getOutputs().front(), getInputPort());
+
+    processors.emplace_front(std::move(processor));
+}
+
+void Chain::addSink(ProcessorPtr processor)
+{
+    checkTransform(*processor);
+
+    if (!processors.empty())
+        connect(getOutputPort(), processor->getInputs().front());
+
+    processors.emplace_front(std::move(processor));
+}
+
+IProcessor & Chain::getSource()
+{
+    checkInitialized(processors);
+    return *processors.front();
+}
+
+IProcessor & Chain::getSink()
+{
+    checkInitialized(processors);
+    return *processors.back();
+}
+
+InputPort & Chain::getInputPort() const
+{
+    checkInitialized(processors);
+    return processors.front()->getInputs().front();
+}
+
+OutputPort & Chain::getOutputPort() const
+{
+    checkInitialized(processors);
+    return processors.back()->getOutputs().front();
+}
+
+void Chain::reset()
+{
+    Chain to_remove = std::move(*this);
+    *this = Chain();
+}
+
+}
diff --git a/src/QueryPipeline/Chain.h b/src/QueryPipeline/Chain.h
new file mode 100644
index 00000000000..c5fdc34cecf
--- /dev/null
+++ b/src/QueryPipeline/Chain.h
@@ -0,0 +1,59 @@
+#pragma once
+
+#include <Processors/IProcessor.h>
+#include <QueryPipeline/PipelineResourcesHolder.h>
+
+namespace DB
+{
+
+class Chain
+{
+public:
+    Chain() = default;
+    Chain(Chain &&) = default;
+    Chain(const Chain &) = delete;
+
+    Chain & operator=(Chain &&) = default;
+    Chain & operator=(const Chain &) = delete;
+
+    explicit Chain(ProcessorPtr processor);
+    explicit Chain(std::list<ProcessorPtr> processors);
+
+    bool empty() const { return processors.empty(); }
+
+    size_t getNumThreads() const { return num_threads; }
+    void setNumThreads(size_t num_threads_) { num_threads = num_threads_; }
+
+    void addSource(ProcessorPtr processor);
+    void addSink(ProcessorPtr processor);
+
+    IProcessor & getSource();
+    IProcessor & getSink();
+
+    InputPort & getInputPort() const;
+    OutputPort & getOutputPort() const;
+
+    const Block & getInputHeader() const { return getInputPort().getHeader(); }
+    const Block & getOutputHeader() const { return getOutputPort().getHeader(); }
+
+    const std::list<ProcessorPtr> & getProcessors() const { return processors; }
+    static std::list<ProcessorPtr> getProcessors(Chain chain) { return std::move(chain.processors); }
+
+    void addTableLock(TableLockHolder lock) { holder.table_locks.emplace_back(std::move(lock)); }
+    void addStorageHolder(StoragePtr storage) { holder.storage_holders.emplace_back(std::move(storage)); }
+    void attachResources(PipelineResourcesHolder holder_) { holder = std::move(holder_); }
+    PipelineResourcesHolder detachResources() { return std::move(holder); }
+
+    void reset();
+
+private:
+    PipelineResourcesHolder holder;
+
+    /// -> source -> transform -> ... -> transform -> sink ->
+    ///  ^        ->           ->     ->           ->       ^
+    ///  input port                               output port
+    std::list<ProcessorPtr> processors;
+    size_t num_threads = 0;
+};
+
+}
diff --git a/src/DataStreams/ConnectionCollector.cpp b/src/QueryPipeline/ConnectionCollector.cpp
similarity index 95%
rename from src/DataStreams/ConnectionCollector.cpp
rename to src/QueryPipeline/ConnectionCollector.cpp
index 3a411fd2e33..a6a0afb68d3 100644
--- a/src/DataStreams/ConnectionCollector.cpp
+++ b/src/QueryPipeline/ConnectionCollector.cpp
@@ -1,9 +1,10 @@
-#include <DataStreams/ConnectionCollector.h>
+#include <QueryPipeline/ConnectionCollector.h>
 
 #include <Core/BackgroundSchedulePool.h>
 #include <Interpreters/Context.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include "Core/Protocol.h"
+#include <base/logger_useful.h>
 
 namespace CurrentMetrics
 {
@@ -81,6 +82,7 @@ void ConnectionCollector::drainConnections(IConnections & connections) noexcept
         {
             case Protocol::Server::EndOfStream:
             case Protocol::Server::Log:
+            case Protocol::Server::ProfileEvents:
                 break;
 
             case Protocol::Server::Exception:
diff --git a/src/DataStreams/ConnectionCollector.h b/src/QueryPipeline/ConnectionCollector.h
similarity index 100%
rename from src/DataStreams/ConnectionCollector.h
rename to src/QueryPipeline/ConnectionCollector.h
diff --git a/src/DataStreams/ExecutionSpeedLimits.cpp b/src/QueryPipeline/ExecutionSpeedLimits.cpp
similarity index 91%
rename from src/DataStreams/ExecutionSpeedLimits.cpp
rename to src/QueryPipeline/ExecutionSpeedLimits.cpp
index 6cc1b9006bf..2738903cedb 100644
--- a/src/DataStreams/ExecutionSpeedLimits.cpp
+++ b/src/QueryPipeline/ExecutionSpeedLimits.cpp
@@ -1,9 +1,10 @@
-#include <DataStreams/ExecutionSpeedLimits.h>
+#include <QueryPipeline/ExecutionSpeedLimits.h>
 
 #include <Common/ProfileEvents.h>
 #include <Common/CurrentThread.h>
 #include <IO/WriteHelpers.h>
-#include <common/sleep.h>
+#include <Common/Stopwatch.h>
+#include <base/sleep.h>
 
 namespace ProfileEvents
 {
@@ -104,14 +105,18 @@ static bool handleOverflowMode(OverflowMode mode, const String & message, int co
     }
 }
 
-bool ExecutionSpeedLimits::checkTimeLimit(UInt64 elapsed_ns, OverflowMode overflow_mode) const
+bool ExecutionSpeedLimits::checkTimeLimit(const Stopwatch & stopwatch, OverflowMode overflow_mode) const
 {
-    if (max_execution_time != 0
-        && elapsed_ns > static_cast<UInt64>(max_execution_time.totalMicroseconds()) * 1000)
-        return handleOverflowMode(overflow_mode,
+    if (max_execution_time != 0)
+    {
+        auto elapsed_ns = stopwatch.elapsed();
+
+        if (elapsed_ns > static_cast<UInt64>(max_execution_time.totalMicroseconds()) * 1000)
+            return handleOverflowMode(overflow_mode,
                                   "Timeout exceeded: elapsed " + toString(static_cast<double>(elapsed_ns) / 1000000000ULL)
                                   + " seconds, maximum: " + toString(max_execution_time.totalMicroseconds() / 1000000.0),
                                   ErrorCodes::TIMEOUT_EXCEEDED);
+    }
 
     return true;
 }
diff --git a/src/DataStreams/ExecutionSpeedLimits.h b/src/QueryPipeline/ExecutionSpeedLimits.h
similarity index 80%
rename from src/DataStreams/ExecutionSpeedLimits.h
rename to src/QueryPipeline/ExecutionSpeedLimits.h
index 9ab58e12cf4..63658462c9f 100644
--- a/src/DataStreams/ExecutionSpeedLimits.h
+++ b/src/QueryPipeline/ExecutionSpeedLimits.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <Poco/Timespan.h>
-#include <common/types.h>
-#include <DataStreams/SizeLimits.h>
+#include <base/types.h>
+#include <QueryPipeline/SizeLimits.h>
+
+class Stopwatch;
 
 namespace DB
 {
@@ -25,7 +27,7 @@ public:
     /// Pause execution in case if speed limits were exceeded.
     void throttle(size_t read_rows, size_t read_bytes, size_t total_rows_to_read, UInt64 total_elapsed_microseconds) const;
 
-    bool checkTimeLimit(UInt64 elapsed_ns, OverflowMode overflow_mode) const;
+    bool checkTimeLimit(const Stopwatch & stopwatch, OverflowMode overflow_mode) const;
 };
 
 }
diff --git a/src/Processors/Pipe.cpp b/src/QueryPipeline/Pipe.cpp
similarity index 94%
rename from src/Processors/Pipe.cpp
rename to src/QueryPipeline/Pipe.cpp
index e0da79f148d..6cef7cc28bd 100644
--- a/src/Processors/Pipe.cpp
+++ b/src/QueryPipeline/Pipe.cpp
@@ -1,6 +1,5 @@
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <IO/WriteHelpers.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/ResizeProcessor.h>
 #include <Processors/ConcatProcessor.h>
 #include <Processors/LimitTransform.h>
@@ -9,6 +8,8 @@
 #include <Processors/Transforms/ExtremesTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
 #include <Processors/Sources/NullSource.h>
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Columns/ColumnConst.h>
 
 namespace DB
@@ -98,18 +99,14 @@ static OutputPort * uniteTotals(const OutputPortRawPtrs & ports, const Block & h
     return totals_port;
 }
 
-Pipe::Holder & Pipe::Holder::operator=(Holder && rhs)
+void Pipe::addQueryPlan(std::unique_ptr<QueryPlan> plan)
 {
-    table_locks.insert(table_locks.end(), rhs.table_locks.begin(), rhs.table_locks.end());
-    storage_holders.insert(storage_holders.end(), rhs.storage_holders.begin(), rhs.storage_holders.end());
-    interpreter_context.insert(interpreter_context.end(),
-                               rhs.interpreter_context.begin(), rhs.interpreter_context.end());
-    for (auto & plan : rhs.query_plans)
-        query_plans.emplace_back(std::move(plan));
+    holder.query_plans.emplace_back(std::move(plan));
+}
 
-    query_id_holder = std::move(rhs.query_id_holder);
-
-    return *this;
+PipelineResourcesHolder Pipe::detachResources()
+{
+    return std::move(holder);
 }
 
 Pipe::Pipe(ProcessorPtr source, OutputPort * output, OutputPort * totals, OutputPort * extremes)
@@ -167,13 +164,7 @@ Pipe::Pipe(ProcessorPtr source, OutputPort * output, OutputPort * totals, Output
 
 Pipe::Pipe(ProcessorPtr source)
 {
-    if (auto * source_from_input_stream = typeid_cast<SourceFromInputStream *>(source.get()))
-    {
-        /// Special case for SourceFromInputStream. Will remove it later.
-        totals_port = source_from_input_stream->getTotalsPort();
-        extremes_port = source_from_input_stream->getExtremesPort();
-    }
-    else if (source->getOutputs().size() != 1)
+    if (source->getOutputs().size() != 1)
         checkSource(*source);
 
     if (collected_processors)
@@ -667,6 +658,47 @@ void Pipe::addSimpleTransform(const ProcessorGetter & getter)
     addSimpleTransform([&](const Block & stream_header, StreamType) { return getter(stream_header); });
 }
 
+void Pipe::addChains(std::vector<Chain> chains)
+{
+    if (output_ports.size() != chains.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot add chains to Pipe because "
+                        "number of output ports ({}) is not equal to the number of chains ({})",
+                        output_ports.size(), chains.size());
+
+    dropTotals();
+    dropExtremes();
+
+    size_t max_parallel_streams_for_chains = 0;
+
+    Block new_header;
+    for (size_t i = 0; i < output_ports.size(); ++i)
+    {
+        max_parallel_streams_for_chains += std::max<size_t>(chains[i].getNumThreads(), 1);
+
+        if (i == 0)
+            new_header = chains[i].getOutputHeader();
+        else
+            assertBlocksHaveEqualStructure(new_header, chains[i].getOutputHeader(), "QueryPipeline");
+
+        connect(*output_ports[i], chains[i].getInputPort());
+        output_ports[i] = &chains[i].getOutputPort();
+
+        holder = chains[i].detachResources();
+        auto added_processors = Chain::getProcessors(std::move(chains[i]));
+        for (auto & transform : added_processors)
+        {
+            if (collected_processors)
+                collected_processors->emplace_back(transform);
+
+            processors.emplace_back(std::move(transform));
+        }
+    }
+
+    header = std::move(new_header);
+    max_parallel_streams = std::max(max_parallel_streams, max_parallel_streams_for_chains);
+}
+
 void Pipe::resize(size_t num_streams, bool force, bool strict)
 {
     if (output_ports.empty())
@@ -739,7 +771,7 @@ void Pipe::setOutputFormat(ProcessorPtr output)
     auto * format = dynamic_cast<IOutputFormat * >(output.get());
 
     if (!format)
-        throw Exception("IOutputFormat processor expected for QueryPipeline::setOutputFormat.",
+        throw Exception("IOutputFormat processor expected for QueryPipelineBuilder::setOutputFormat.",
                         ErrorCodes::LOGICAL_ERROR);
 
     auto & main = format->getPort(IOutputFormat::PortKind::Main);
diff --git a/src/Processors/Pipe.h b/src/QueryPipeline/Pipe.h
similarity index 84%
rename from src/Processors/Pipe.h
rename to src/QueryPipeline/Pipe.h
index dc3be3289fc..0af02a5e662 100644
--- a/src/Processors/Pipe.h
+++ b/src/QueryPipeline/Pipe.h
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <Processors/IProcessor.h>
-#include <Processors/QueryPlan/QueryIdHolder.h>
-#include <Processors/QueryPlan/QueryPlan.h>
+#include <QueryPipeline/PipelineResourcesHolder.h>
+#include <QueryPipeline/Chain.h>
 #include <Access/EnabledQuota.h>
-#include <DataStreams/SizeLimits.h>
-#include <Storages/TableLockHolder.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
@@ -15,11 +14,6 @@ struct StreamLocalLimits;
 class Pipe;
 using Pipes = std::vector<Pipe>;
 
-class QueryPipeline;
-
-class IStorage;
-using StoragePtr = std::shared_ptr<IStorage>;
-
 using OutputPortRawPtrs = std::vector<OutputPort *>;
 
 /// Pipe is a set of processors which represents the part of pipeline.
@@ -86,6 +80,9 @@ public:
     void addSimpleTransform(const ProcessorGetter & getter);
     void addSimpleTransform(const ProcessorGetterWithStreamKind & getter);
 
+    /// Add chain to every output port.
+    void addChains(std::vector<Chain> chains);
+
     /// Changes the number of output ports if needed. Adds ResizeTransform.
     void resize(size_t num_streams, bool force = false, bool strict = false);
 
@@ -114,29 +111,13 @@ public:
     void addStorageHolder(StoragePtr storage) { holder.storage_holders.emplace_back(std::move(storage)); }
     void addQueryIdHolder(std::shared_ptr<QueryIdHolder> query_id_holder) { holder.query_id_holder = std::move(query_id_holder); }
     /// For queries with nested interpreters (i.e. StorageDistributed)
-    void addQueryPlan(std::unique_ptr<QueryPlan> plan) { holder.query_plans.emplace_back(std::move(plan)); }
+    void addQueryPlan(std::unique_ptr<QueryPlan> plan);
+
+    PipelineResourcesHolder detachResources();
 
 private:
     /// Destruction order: processors, header, locks, temporary storages, local contexts
-
-    struct Holder
-    {
-        Holder() = default;
-        Holder(Holder &&) = default;
-        /// Custom mode assignment does not destroy data from lhs. It appends data from rhs to lhs.
-        Holder& operator=(Holder &&);
-
-        /// Some processors may implicitly use Context or temporary Storage created by Interpreter.
-        /// But lifetime of Streams is not nested in lifetime of Interpreters, so we have to store it here,
-        /// because QueryPipeline is alive until query is finished.
-        std::vector<std::shared_ptr<const Context>> interpreter_context;
-        std::vector<StoragePtr> storage_holders;
-        std::vector<TableLockHolder> table_locks;
-        std::vector<std::unique_ptr<QueryPlan>> query_plans;
-        std::shared_ptr<QueryIdHolder> query_id_holder;
-    };
-
-    Holder holder;
+    PipelineResourcesHolder holder;
 
     /// Header is common for all output below.
     Block header;
@@ -162,6 +143,7 @@ private:
     void setSinks(const Pipe::ProcessorGetterWithStreamKind & getter);
     void setOutputFormat(ProcessorPtr output);
 
+    friend class QueryPipelineBuilder;
     friend class QueryPipeline;
 };
 
diff --git a/src/QueryPipeline/PipelineResourcesHolder.cpp b/src/QueryPipeline/PipelineResourcesHolder.cpp
new file mode 100644
index 00000000000..a4b85ed662b
--- /dev/null
+++ b/src/QueryPipeline/PipelineResourcesHolder.cpp
@@ -0,0 +1,25 @@
+#include <QueryPipeline/PipelineResourcesHolder.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+
+namespace DB
+{
+
+PipelineResourcesHolder::PipelineResourcesHolder() = default;
+PipelineResourcesHolder::PipelineResourcesHolder(PipelineResourcesHolder &&) = default;
+PipelineResourcesHolder::~PipelineResourcesHolder() = default;
+
+PipelineResourcesHolder & PipelineResourcesHolder::operator=(PipelineResourcesHolder && rhs)
+{
+    table_locks.insert(table_locks.end(), rhs.table_locks.begin(), rhs.table_locks.end());
+    storage_holders.insert(storage_holders.end(), rhs.storage_holders.begin(), rhs.storage_holders.end());
+    interpreter_context.insert(interpreter_context.end(),
+                               rhs.interpreter_context.begin(), rhs.interpreter_context.end());
+    for (auto & plan : rhs.query_plans)
+        query_plans.emplace_back(std::move(plan));
+
+    query_id_holder = std::move(rhs.query_id_holder);
+
+    return *this;
+}
+
+}
diff --git a/src/QueryPipeline/PipelineResourcesHolder.h b/src/QueryPipeline/PipelineResourcesHolder.h
new file mode 100644
index 00000000000..9fb1438424a
--- /dev/null
+++ b/src/QueryPipeline/PipelineResourcesHolder.h
@@ -0,0 +1,34 @@
+#pragma once
+#include <Storages/TableLockHolder.h>
+#include <Processors/QueryPlan/QueryIdHolder.h>
+
+namespace DB
+{
+
+class QueryPipelineBuilder;
+
+class IStorage;
+using StoragePtr = std::shared_ptr<IStorage>;
+
+class QueryPlan;
+class Context;
+
+struct PipelineResourcesHolder
+{
+    PipelineResourcesHolder();
+    PipelineResourcesHolder(PipelineResourcesHolder &&);
+    ~PipelineResourcesHolder();
+    /// Custom mode assignment does not destroy data from lhs. It appends data from rhs to lhs.
+    PipelineResourcesHolder& operator=(PipelineResourcesHolder &&);
+
+    /// Some processors may implicitly use Context or temporary Storage created by Interpreter.
+    /// But lifetime of Streams is not nested in lifetime of Interpreters, so we have to store it here,
+    /// because QueryPipeline is alive until query is finished.
+    std::vector<std::shared_ptr<const Context>> interpreter_context;
+    std::vector<StoragePtr> storage_holders;
+    std::vector<TableLockHolder> table_locks;
+    std::vector<std::unique_ptr<QueryPlan>> query_plans;
+    std::shared_ptr<QueryIdHolder> query_id_holder;
+};
+
+}
diff --git a/src/QueryPipeline/ProfileInfo.cpp b/src/QueryPipeline/ProfileInfo.cpp
new file mode 100644
index 00000000000..ee0ff8c69bf
--- /dev/null
+++ b/src/QueryPipeline/ProfileInfo.cpp
@@ -0,0 +1,73 @@
+#include <QueryPipeline/ProfileInfo.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+
+#include <Core/Block.h>
+
+namespace DB
+{
+
+void ProfileInfo::read(ReadBuffer & in)
+{
+    readVarUInt(rows, in);
+    readVarUInt(blocks, in);
+    readVarUInt(bytes, in);
+    readBinary(applied_limit, in);
+    readVarUInt(rows_before_limit, in);
+    readBinary(calculated_rows_before_limit, in);
+}
+
+
+void ProfileInfo::write(WriteBuffer & out) const
+{
+    writeVarUInt(rows, out);
+    writeVarUInt(blocks, out);
+    writeVarUInt(bytes, out);
+    writeBinary(hasAppliedLimit(), out);
+    writeVarUInt(getRowsBeforeLimit(), out);
+    writeBinary(calculated_rows_before_limit, out);
+}
+
+
+void ProfileInfo::setFrom(const ProfileInfo & rhs, bool skip_block_size_info)
+{
+    if (!skip_block_size_info)
+    {
+        rows = rhs.rows;
+        blocks = rhs.blocks;
+        bytes = rhs.bytes;
+    }
+    applied_limit = rhs.applied_limit;
+    rows_before_limit = rhs.rows_before_limit;
+    calculated_rows_before_limit = rhs.calculated_rows_before_limit;
+}
+
+
+size_t ProfileInfo::getRowsBeforeLimit() const
+{
+    calculated_rows_before_limit = true;
+    return rows_before_limit;
+}
+
+
+bool ProfileInfo::hasAppliedLimit() const
+{
+    calculated_rows_before_limit = true;
+    return applied_limit;
+}
+
+
+void ProfileInfo::update(Block & block)
+{
+    update(block.rows(), block.bytes());
+}
+
+void ProfileInfo::update(size_t num_rows, size_t num_bytes)
+{
+    ++blocks;
+    rows += num_rows;
+    bytes += num_bytes;
+}
+
+}
diff --git a/src/DataStreams/BlockStreamProfileInfo.h b/src/QueryPipeline/ProfileInfo.h
similarity index 71%
rename from src/DataStreams/BlockStreamProfileInfo.h
rename to src/QueryPipeline/ProfileInfo.h
index d068db89641..0a5800cd409 100644
--- a/src/DataStreams/BlockStreamProfileInfo.h
+++ b/src/QueryPipeline/ProfileInfo.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <common/types.h>
-#include <DataStreams/IBlockStream_fwd.h>
+#include <base/types.h>
 #include <Common/Stopwatch.h>
 
 #include <vector>
@@ -13,12 +12,9 @@ class Block;
 class ReadBuffer;
 class WriteBuffer;
 
-/// Information for profiling. See IBlockInputStream.h
-struct BlockStreamProfileInfo
+/// Information for profiling. See SourceWithProgress.h
+struct ProfileInfo
 {
-    /// Info about stream object this profile info refers to.
-    IBlockInputStream * parent = nullptr;
-
     bool started = false;
     Stopwatch total_stopwatch {CLOCK_MONOTONIC_COARSE};    /// Time with waiting time
 
@@ -26,10 +22,7 @@ struct BlockStreamProfileInfo
     size_t blocks = 0;
     size_t bytes = 0;
 
-    using BlockStreamProfileInfos = std::vector<const BlockStreamProfileInfo *>;
-
-    /// Collect BlockStreamProfileInfo for the nearest sources in the tree named `name`. Example; collect all info for PartialSorting streams.
-    void collectInfosForStreamsWithName(const char * name, BlockStreamProfileInfos & res) const;
+    using ProfileInfos = std::vector<const ProfileInfo *>;
 
     /** Get the number of rows if there were no LIMIT.
       * If there is no LIMIT, 0 is returned.
@@ -49,7 +42,7 @@ struct BlockStreamProfileInfo
 
     /// Sets main fields from other object (see methods above).
     /// If skip_block_size_info if true, then rows, bytes and block fields are ignored.
-    void setFrom(const BlockStreamProfileInfo & rhs, bool skip_block_size_info);
+    void setFrom(const ProfileInfo & rhs, bool skip_block_size_info);
 
     /// Only for Processors.
     void setRowsBeforeLimit(size_t rows_before_limit_)
@@ -59,8 +52,6 @@ struct BlockStreamProfileInfo
     }
 
 private:
-    void calculateRowsBeforeLimit() const;
-
     /// For these fields we make accessors, because they must be calculated beforehand.
     mutable bool applied_limit = false;                    /// Whether LIMIT was applied
     mutable size_t rows_before_limit = 0;
diff --git a/src/QueryPipeline/QueryPipeline.cpp b/src/QueryPipeline/QueryPipeline.cpp
new file mode 100644
index 00000000000..ce1c9473f60
--- /dev/null
+++ b/src/QueryPipeline/QueryPipeline.cpp
@@ -0,0 +1,537 @@
+#include <queue>
+#include <QueryPipeline/Chain.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/IProcessor.h>
+#include <Processors/LimitTransform.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/Sinks/EmptySink.h>
+#include <Processors/Sinks/NullSink.h>
+#include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/Sources/NullSource.h>
+#include <Processors/Sources/RemoteSource.h>
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Processors/Transforms/CountingTransform.h>
+#include <Processors/Transforms/LimitsCheckingTransform.h>
+#include <Processors/Transforms/MaterializingTransform.h>
+#include <Processors/Transforms/PartialSortingTransform.h>
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+QueryPipeline::QueryPipeline() = default;
+QueryPipeline::QueryPipeline(QueryPipeline &&) = default;
+QueryPipeline & QueryPipeline::operator=(QueryPipeline &&) = default;
+QueryPipeline::~QueryPipeline() = default;
+
+static void checkInput(const InputPort & input, const ProcessorPtr & processor)
+{
+    if (!input.isConnected())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create QueryPipeline because {} has not connected input",
+            processor->getName());
+}
+
+static void checkOutput(const OutputPort & output, const ProcessorPtr & processor)
+{
+    if (!output.isConnected())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create QueryPipeline because {} has not connected output",
+            processor->getName());
+}
+
+static void checkPulling(
+    Processors & processors,
+    OutputPort * output,
+    OutputPort * totals,
+    OutputPort * extremes)
+{
+    if (!output || output->isConnected())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pulling QueryPipeline because its output port is connected or null");
+
+    if (totals && totals->isConnected())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pulling QueryPipeline because its totals port is connected");
+
+    if (extremes && extremes->isConnected())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pulling QueryPipeline because its extremes port is connected");
+
+    bool found_output = false;
+    bool found_totals = false;
+    bool found_extremes = false;
+    for (const auto & processor : processors)
+    {
+        for (const auto & in : processor->getInputs())
+            checkInput(in, processor);
+
+        for (const auto & out : processor->getOutputs())
+        {
+            if (&out == output)
+                found_output = true;
+            else if (totals && &out == totals)
+                found_totals = true;
+            else if (extremes && &out == extremes)
+                found_extremes = true;
+            else
+                checkOutput(out, processor);
+        }
+    }
+
+    if (!found_output)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pulling QueryPipeline because its output port does not belong to any processor");
+    if (totals && !found_totals)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pulling QueryPipeline because its totals port does not belong to any processor");
+    if (extremes && !found_extremes)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pulling QueryPipeline because its extremes port does not belong to any processor");
+}
+
+static void checkCompleted(Processors & processors)
+{
+    for (const auto & processor : processors)
+    {
+        for (const auto & in : processor->getInputs())
+            checkInput(in, processor);
+
+        for (const auto & out : processor->getOutputs())
+            checkOutput(out, processor);
+    }
+}
+
+static void initRowsBeforeLimit(IOutputFormat * output_format)
+{
+    RowsBeforeLimitCounterPtr rows_before_limit_at_least;
+
+    /// TODO: add setRowsBeforeLimitCounter as virtual method to IProcessor.
+    std::vector<LimitTransform *> limits;
+    std::vector<RemoteSource *> remote_sources;
+
+    std::unordered_set<IProcessor *> visited;
+
+    struct QueuedEntry
+    {
+        IProcessor * processor;
+        bool visited_limit;
+    };
+
+    std::queue<QueuedEntry> queue;
+
+    queue.push({ output_format, false });
+    visited.emplace(output_format);
+
+    while (!queue.empty())
+    {
+        auto * processor = queue.front().processor;
+        auto visited_limit = queue.front().visited_limit;
+        queue.pop();
+
+        if (!visited_limit)
+        {
+            if (auto * limit = typeid_cast<LimitTransform *>(processor))
+            {
+                visited_limit = true;
+                limits.emplace_back(limit);
+            }
+
+            if (auto * source = typeid_cast<RemoteSource *>(processor))
+                remote_sources.emplace_back(source);
+        }
+        else if (auto * sorting = typeid_cast<PartialSortingTransform *>(processor))
+        {
+            if (!rows_before_limit_at_least)
+                rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
+
+            sorting->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+
+            /// Don't go to children. Take rows_before_limit from last PartialSortingTransform.
+            continue;
+        }
+
+        /// Skip totals and extremes port for output format.
+        if (auto * format = dynamic_cast<IOutputFormat *>(processor))
+        {
+            auto * child_processor = &format->getPort(IOutputFormat::PortKind::Main).getOutputPort().getProcessor();
+            if (visited.emplace(child_processor).second)
+                queue.push({ child_processor, visited_limit });
+
+            continue;
+        }
+
+        for (auto & child_port : processor->getInputs())
+        {
+            auto * child_processor = &child_port.getOutputPort().getProcessor();
+            if (visited.emplace(child_processor).second)
+                queue.push({ child_processor, visited_limit });
+        }
+    }
+
+    if (!rows_before_limit_at_least && (!limits.empty() || !remote_sources.empty()))
+    {
+        rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
+
+        for (auto & limit : limits)
+            limit->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+
+        for (auto & source : remote_sources)
+            source->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+    }
+
+    /// If there is a limit, then enable rows_before_limit_at_least
+    /// It is needed when zero rows is read, but we still want rows_before_limit_at_least in result.
+    if (!limits.empty())
+        rows_before_limit_at_least->add(0);
+
+    if (rows_before_limit_at_least)
+        output_format->setRowsBeforeLimitCounter(rows_before_limit_at_least);
+}
+
+
+QueryPipeline::QueryPipeline(
+    PipelineResourcesHolder resources_,
+    Processors processors_)
+    : resources(std::move(resources_))
+    , processors(std::move(processors_))
+{
+    checkCompleted(processors);
+}
+
+QueryPipeline::QueryPipeline(
+    PipelineResourcesHolder resources_,
+    Processors processors_,
+    InputPort * input_)
+    : resources(std::move(resources_))
+    , processors(std::move(processors_))
+    , input(input_)
+{
+    if (!input || input->isConnected())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pushing QueryPipeline because its input port is connected or null");
+
+    bool found_input = false;
+    for (const auto & processor : processors)
+    {
+        for (const auto & in : processor->getInputs())
+        {
+            if (&in == input)
+                found_input = true;
+            else
+                checkInput(in, processor);
+        }
+
+        for (const auto & out : processor->getOutputs())
+            checkOutput(out, processor);
+    }
+
+    if (!found_input)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot create pushing QueryPipeline because its input port does not belong to any processor");
+}
+
+QueryPipeline::QueryPipeline(std::shared_ptr<ISource> source) : QueryPipeline(Pipe(std::move(source))) {}
+
+QueryPipeline::QueryPipeline(
+    PipelineResourcesHolder resources_,
+    Processors processors_,
+    OutputPort * output_,
+    OutputPort * totals_,
+    OutputPort * extremes_)
+    : resources(std::move(resources_))
+    , processors(std::move(processors_))
+    , output(output_)
+    , totals(totals_)
+    , extremes(extremes_)
+{
+    checkPulling(processors, output, totals, extremes);
+}
+
+QueryPipeline::QueryPipeline(Pipe pipe)
+{
+    resources = std::move(pipe.holder);
+
+    if (pipe.numOutputPorts() > 0)
+    {
+        pipe.resize(1);
+        output = pipe.getOutputPort(0);
+        totals = pipe.getTotalsPort();
+        extremes = pipe.getExtremesPort();
+
+        processors = std::move(pipe.processors);
+        checkPulling(processors, output, totals, extremes);
+    }
+    else
+    {
+        processors = std::move(pipe.processors);
+        checkCompleted(processors);
+    }
+}
+
+QueryPipeline::QueryPipeline(Chain chain)
+    : resources(chain.detachResources())
+    , input(&chain.getInputPort())
+    , num_threads(chain.getNumThreads())
+{
+    processors.reserve(chain.getProcessors().size() + 1);
+    for (auto processor : chain.getProcessors())
+        processors.emplace_back(std::move(processor));
+
+    auto sink = std::make_shared<EmptySink>(chain.getOutputPort().getHeader());
+    connect(chain.getOutputPort(), sink->getPort());
+    processors.emplace_back(std::move(sink));
+
+    input = &chain.getInputPort();
+}
+
+QueryPipeline::QueryPipeline(std::shared_ptr<IOutputFormat> format)
+{
+    auto & format_main = format->getPort(IOutputFormat::PortKind::Main);
+    auto & format_totals = format->getPort(IOutputFormat::PortKind::Totals);
+    auto & format_extremes = format->getPort(IOutputFormat::PortKind::Extremes);
+
+    if (!totals)
+    {
+        auto source = std::make_shared<NullSource>(format_totals.getHeader());
+        totals = &source->getPort();
+        processors.emplace_back(std::move(source));
+    }
+
+    if (!extremes)
+    {
+        auto source = std::make_shared<NullSource>(format_extremes.getHeader());
+        extremes = &source->getPort();
+        processors.emplace_back(std::move(source));
+    }
+
+    connect(*totals, format_totals);
+    connect(*extremes, format_extremes);
+
+    input = &format_main;
+    totals = nullptr;
+    extremes = nullptr;
+
+    output_format = format.get();
+
+    processors.emplace_back(std::move(format));
+}
+
+static void drop(OutputPort *& port, Processors & processors)
+{
+    if (!port)
+        return;
+
+    auto null_sink = std::make_shared<NullSink>(port->getHeader());
+    connect(*port, null_sink->getPort());
+
+    processors.emplace_back(std::move(null_sink));
+    port = nullptr;
+}
+
+QueryPipeline::QueryPipeline(std::shared_ptr<SinkToStorage> sink) : QueryPipeline(Chain(std::move(sink))) {}
+
+void QueryPipeline::complete(std::shared_ptr<ISink> sink)
+{
+    if (!pulling())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline must be pulling to be completed with chain");
+
+    drop(totals, processors);
+    drop(extremes, processors);
+
+    connect(*output, sink->getPort());
+    processors.emplace_back(std::move(sink));
+    output = nullptr;
+}
+
+void QueryPipeline::complete(Chain chain)
+{
+    if (!pulling())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline must be pulling to be completed with chain");
+
+    resources = chain.detachResources();
+
+    drop(totals, processors);
+    drop(extremes, processors);
+
+    processors.reserve(processors.size() + chain.getProcessors().size() + 1);
+    for (auto processor : chain.getProcessors())
+        processors.emplace_back(std::move(processor));
+
+    auto sink = std::make_shared<EmptySink>(chain.getOutputPort().getHeader());
+    connect(*output, chain.getInputPort());
+    connect(chain.getOutputPort(), sink->getPort());
+    processors.emplace_back(std::move(sink));
+    output = nullptr;
+}
+
+void QueryPipeline::complete(std::shared_ptr<SinkToStorage> sink)
+{
+    complete(Chain(std::move(sink)));
+}
+
+void QueryPipeline::complete(Pipe pipe)
+{
+    if (!pushing())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline must be pushing to be completed with pipe");
+
+    pipe.resize(1);
+    resources = pipe.detachResources();
+    pipe.dropExtremes();
+    pipe.dropTotals();
+    connect(*pipe.getOutputPort(0), *input);
+    input = nullptr;
+
+    auto pipe_processors = Pipe::detachProcessors(std::move(pipe));
+    processors.insert(processors.end(), pipe_processors.begin(), pipe_processors.end());
+}
+
+static void addMaterializing(OutputPort *& output, Processors & processors)
+{
+    if (!output)
+        return;
+
+    auto materializing = std::make_shared<MaterializingTransform>(output->getHeader());
+    connect(*output, materializing->getInputPort());
+    output = &materializing->getOutputPort();
+    processors.emplace_back(std::move(materializing));
+}
+
+void QueryPipeline::complete(std::shared_ptr<IOutputFormat> format)
+{
+    if (!pulling())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Pipeline must be pulling to be completed with output format");
+
+    if (format->expectMaterializedColumns())
+    {
+        addMaterializing(output, processors);
+        addMaterializing(totals, processors);
+        addMaterializing(extremes, processors);
+    }
+
+    auto & format_main = format->getPort(IOutputFormat::PortKind::Main);
+    auto & format_totals = format->getPort(IOutputFormat::PortKind::Totals);
+    auto & format_extremes = format->getPort(IOutputFormat::PortKind::Extremes);
+
+    if (!totals)
+    {
+        auto source = std::make_shared<NullSource>(format_totals.getHeader());
+        totals = &source->getPort();
+        processors.emplace_back(std::move(source));
+    }
+
+    if (!extremes)
+    {
+        auto source = std::make_shared<NullSource>(format_extremes.getHeader());
+        extremes = &source->getPort();
+        processors.emplace_back(std::move(source));
+    }
+
+    connect(*output, format_main);
+    connect(*totals, format_totals);
+    connect(*extremes, format_extremes);
+
+    output = nullptr;
+    totals = nullptr;
+    extremes = nullptr;
+
+    initRowsBeforeLimit(format.get());
+    output_format = format.get();
+
+    processors.emplace_back(std::move(format));
+}
+
+Block QueryPipeline::getHeader() const
+{
+    if (input)
+        return input->getHeader();
+    else if (output)
+        return output->getHeader();
+    else
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Header is available only for pushing or pulling QueryPipeline");
+}
+
+void QueryPipeline::setProgressCallback(const ProgressCallback & callback)
+{
+    for (auto & processor : processors)
+    {
+        if (auto * source = dynamic_cast<ISourceWithProgress *>(processor.get()))
+            source->setProgressCallback(callback);
+    }
+}
+
+void QueryPipeline::setProcessListElement(QueryStatus * elem)
+{
+    process_list_element = elem;
+
+    if (pulling() || completed())
+    {
+        for (auto & processor : processors)
+        {
+            if (auto * source = dynamic_cast<ISourceWithProgress *>(processor.get()))
+                source->setProcessListElement(elem);
+        }
+    }
+    else if (pushing())
+    {
+        if (auto * counting = dynamic_cast<CountingTransform *>(&input->getProcessor()))
+        {
+            counting->setProcessListElement(elem);
+        }
+    }
+}
+
+
+void QueryPipeline::setLimitsAndQuota(const StreamLocalLimits & limits, std::shared_ptr<const EnabledQuota> quota)
+{
+    if (!pulling())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "It is possible to set limits and quota only to pulling QueryPipeline");
+
+    auto transform = std::make_shared<LimitsCheckingTransform>(output->getHeader(), limits);
+    transform->setQuota(quota);
+    connect(*output, transform->getInputPort());
+    output = &transform->getOutputPort();
+    processors.emplace_back(std::move(transform));
+}
+
+
+bool QueryPipeline::tryGetResultRowsAndBytes(UInt64 & result_rows, UInt64 & result_bytes) const
+{
+    if (!output_format)
+        return false;
+
+    result_rows = output_format->getResultRows();
+    result_bytes = output_format->getResultBytes();
+    return true;
+}
+
+void QueryPipeline::addStorageHolder(StoragePtr storage)
+{
+    resources.storage_holders.emplace_back(std::move(storage));
+}
+
+void QueryPipeline::reset()
+{
+    QueryPipeline to_remove = std::move(*this);
+    *this = QueryPipeline();
+}
+
+}
diff --git a/src/QueryPipeline/QueryPipeline.h b/src/QueryPipeline/QueryPipeline.h
new file mode 100644
index 00000000000..beb46361f95
--- /dev/null
+++ b/src/QueryPipeline/QueryPipeline.h
@@ -0,0 +1,128 @@
+#pragma once
+#include <QueryPipeline/PipelineResourcesHolder.h>
+#include <functional>
+
+namespace DB
+{
+
+class InputPort;
+class OutputPort;
+
+class IProcessor;
+using ProcessorPtr = std::shared_ptr<IProcessor>;
+using Processors = std::vector<ProcessorPtr>;
+
+class QueryStatus;
+
+struct Progress;
+using ProgressCallback = std::function<void(const Progress & progress)>;
+
+struct StreamLocalLimits;
+class EnabledQuota;
+
+class Block;
+class Pipe;
+class Chain;
+class IOutputFormat;
+class SinkToStorage;
+class ISource;
+class ISink;
+
+class QueryPipeline
+{
+public:
+    QueryPipeline();
+    QueryPipeline(QueryPipeline &&);
+    QueryPipeline(const QueryPipeline &) = delete;
+
+    QueryPipeline & operator=(QueryPipeline &&);
+    QueryPipeline & operator=(const QueryPipeline &) = delete;
+
+    ~QueryPipeline();
+
+    /// pulling
+    explicit QueryPipeline(Pipe pipe);
+    explicit QueryPipeline(std::shared_ptr<ISource> source);
+    /// pushing
+    explicit QueryPipeline(Chain chain);
+    explicit QueryPipeline(std::shared_ptr<SinkToStorage> sink);
+    explicit QueryPipeline(std::shared_ptr<IOutputFormat> format);
+
+    /// completed
+    QueryPipeline(
+        PipelineResourcesHolder resources_,
+        Processors processors_);
+
+    /// pushing
+    QueryPipeline(
+        PipelineResourcesHolder resources_,
+        Processors processors_,
+        InputPort * input_);
+
+    /// pulling
+    QueryPipeline(
+        PipelineResourcesHolder resources_,
+        Processors processors_,
+        OutputPort * output_,
+        OutputPort * totals_ = nullptr,
+        OutputPort * extremes_ = nullptr);
+
+    bool initialized() const { return !processors.empty(); }
+    /// When initialized, exactly one of the following is true.
+    /// Use PullingPipelineExecutor or PullingAsyncPipelineExecutor.
+    bool pulling() const { return output != nullptr; }
+    /// Use PushingPipelineExecutor or PushingAsyncPipelineExecutor.
+    bool pushing() const { return input != nullptr; }
+    /// Use PipelineExecutor. Call execute() to build one.
+    bool completed() const { return initialized() && !pulling() && !pushing(); }
+
+    /// Only for pushing.
+    void complete(Pipe pipe);
+    /// Only for pulling.
+    void complete(std::shared_ptr<IOutputFormat> format);
+    void complete(Chain chain);
+    void complete(std::shared_ptr<SinkToStorage> sink);
+    void complete(std::shared_ptr<ISink> sink);
+
+    /// Only for pushing and pulling.
+    Block getHeader() const;
+
+    size_t getNumThreads() const { return num_threads; }
+    void setNumThreads(size_t num_threads_) { num_threads = num_threads_; }
+
+    void setProcessListElement(QueryStatus * elem);
+    void setProgressCallback(const ProgressCallback & callback);
+    void setLimitsAndQuota(const StreamLocalLimits & limits, std::shared_ptr<const EnabledQuota> quota);
+    bool tryGetResultRowsAndBytes(UInt64 & result_rows, UInt64 & result_bytes) const;
+
+    void addStorageHolder(StoragePtr storage);
+
+    const Processors & getProcessors() const { return processors; }
+
+    void reset();
+
+private:
+    PipelineResourcesHolder resources;
+    Processors processors;
+
+    InputPort * input = nullptr;
+
+    OutputPort * output = nullptr;
+    OutputPort * totals = nullptr;
+    OutputPort * extremes = nullptr;
+
+    QueryStatus * process_list_element = nullptr;
+
+    IOutputFormat * output_format = nullptr;
+
+    size_t num_threads = 0;
+
+    friend class PushingPipelineExecutor;
+    friend class PullingPipelineExecutor;
+    friend class PushingAsyncPipelineExecutor;
+    friend class PullingAsyncPipelineExecutor;
+    friend class CompletedPipelineExecutor;
+    friend class QueryPipelineBuilder;
+};
+
+}
diff --git a/src/Processors/QueryPipeline.cpp b/src/QueryPipeline/QueryPipelineBuilder.cpp
similarity index 80%
rename from src/Processors/QueryPipeline.cpp
rename to src/QueryPipeline/QueryPipelineBuilder.cpp
index 2b882ee93ab..40c64046560 100644
--- a/src/Processors/QueryPipeline.cpp
+++ b/src/QueryPipeline/QueryPipelineBuilder.cpp
@@ -1,4 +1,4 @@
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 #include <Processors/ResizeProcessor.h>
 #include <Processors/LimitTransform.h>
@@ -9,7 +9,6 @@
 #include <Processors/Transforms/MergingAggregatedMemoryEfficientTransform.h>
 #include <Processors/Transforms/JoiningTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Executors/PipelineExecutor.h>
 #include <Processors/Transforms/PartialSortingTransform.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
@@ -21,6 +20,7 @@
 #include <Processors/DelayedPortsProcessor.h>
 #include <Processors/RowsBeforeLimitCounter.h>
 #include <Processors/Sources/RemoteSource.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 
 namespace DB
 {
@@ -29,13 +29,18 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void QueryPipeline::checkInitialized()
+void QueryPipelineBuilder::addQueryPlan(std::unique_ptr<QueryPlan> plan)
+{
+    pipe.addQueryPlan(std::move(plan));
+}
+
+void QueryPipelineBuilder::checkInitialized()
 {
     if (!initialized())
         throw Exception("QueryPipeline wasn't initialized.", ErrorCodes::LOGICAL_ERROR);
 }
 
-void QueryPipeline::checkInitializedAndNotCompleted()
+void QueryPipelineBuilder::checkInitializedAndNotCompleted()
 {
     checkInitialized();
 
@@ -62,7 +67,7 @@ static void checkSource(const ProcessorPtr & source, bool can_have_totals)
                         toString(source->getOutputs().size()) + " outputs.", ErrorCodes::LOGICAL_ERROR);
 }
 
-void QueryPipeline::init(Pipe pipe_)
+void QueryPipelineBuilder::init(Pipe pipe_)
 {
     if (initialized())
         throw Exception("Pipeline has already been initialized.", ErrorCodes::LOGICAL_ERROR);
@@ -73,49 +78,90 @@ void QueryPipeline::init(Pipe pipe_)
     pipe = std::move(pipe_);
 }
 
-void QueryPipeline::reset()
+void QueryPipelineBuilder::init(QueryPipeline pipeline)
+{
+    if (initialized())
+        throw Exception("Pipeline has already been initialized.", ErrorCodes::LOGICAL_ERROR);
+
+    if (pipeline.pushing())
+        throw Exception("Can't initialize pushing pipeline.", ErrorCodes::LOGICAL_ERROR);
+
+    pipe.holder = std::move(pipeline.resources);
+    pipe.processors = std::move(pipeline.processors);
+    if (pipeline.output)
+    {
+        pipe.output_ports = {pipeline.output};
+        pipe.header = pipeline.output->getHeader();
+    }
+    else
+    {
+        pipe.output_ports.clear();
+        pipe.header = {};
+    }
+
+    pipe.totals_port = pipeline.totals;
+    pipe.extremes_port = pipeline.extremes;
+    pipe.max_parallel_streams = pipeline.num_threads;
+}
+
+void QueryPipelineBuilder::reset()
 {
     Pipe pipe_to_destroy(std::move(pipe));
-    *this = QueryPipeline();
+    *this = QueryPipelineBuilder();
 }
 
-void QueryPipeline::addSimpleTransform(const Pipe::ProcessorGetter & getter)
+void QueryPipelineBuilder::addSimpleTransform(const Pipe::ProcessorGetter & getter)
 {
     checkInitializedAndNotCompleted();
     pipe.addSimpleTransform(getter);
 }
 
-void QueryPipeline::addSimpleTransform(const Pipe::ProcessorGetterWithStreamKind & getter)
+void QueryPipelineBuilder::addSimpleTransform(const Pipe::ProcessorGetterWithStreamKind & getter)
 {
     checkInitializedAndNotCompleted();
     pipe.addSimpleTransform(getter);
 }
 
-void QueryPipeline::addTransform(ProcessorPtr transform)
+void QueryPipelineBuilder::addTransform(ProcessorPtr transform)
 {
     checkInitializedAndNotCompleted();
     pipe.addTransform(std::move(transform));
 }
 
-void QueryPipeline::addTransform(ProcessorPtr transform, InputPort * totals, InputPort * extremes)
+void QueryPipelineBuilder::addTransform(ProcessorPtr transform, InputPort * totals, InputPort * extremes)
 {
     checkInitializedAndNotCompleted();
     pipe.addTransform(std::move(transform), totals, extremes);
 }
 
-void QueryPipeline::transform(const Transformer & transformer)
+void QueryPipelineBuilder::addChains(std::vector<Chain> chains)
+{
+    checkInitializedAndNotCompleted();
+    pipe.addChains(std::move(chains));
+}
+
+void QueryPipelineBuilder::addChain(Chain chain)
+{
+    checkInitializedAndNotCompleted();
+    std::vector<Chain> chains;
+    chains.emplace_back(std::move(chain));
+    pipe.resize(1);
+    pipe.addChains(std::move(chains));
+}
+
+void QueryPipelineBuilder::transform(const Transformer & transformer)
 {
     checkInitializedAndNotCompleted();
     pipe.transform(transformer);
 }
 
-void QueryPipeline::setSinks(const Pipe::ProcessorGetterWithStreamKind & getter)
+void QueryPipelineBuilder::setSinks(const Pipe::ProcessorGetterWithStreamKind & getter)
 {
     checkInitializedAndNotCompleted();
     pipe.setSinks(getter);
 }
 
-void QueryPipeline::addDelayedStream(ProcessorPtr source)
+void QueryPipelineBuilder::addDelayedStream(ProcessorPtr source)
 {
     checkInitializedAndNotCompleted();
 
@@ -129,18 +175,18 @@ void QueryPipeline::addDelayedStream(ProcessorPtr source)
     addTransform(std::move(processor));
 }
 
-void QueryPipeline::addMergingAggregatedMemoryEfficientTransform(AggregatingTransformParamsPtr params, size_t num_merging_processors)
+void QueryPipelineBuilder::addMergingAggregatedMemoryEfficientTransform(AggregatingTransformParamsPtr params, size_t num_merging_processors)
 {
     DB::addMergingAggregatedMemoryEfficientTransform(pipe, std::move(params), num_merging_processors);
 }
 
-void QueryPipeline::resize(size_t num_streams, bool force, bool strict)
+void QueryPipelineBuilder::resize(size_t num_streams, bool force, bool strict)
 {
     checkInitializedAndNotCompleted();
     pipe.resize(num_streams, force, strict);
 }
 
-void QueryPipeline::addTotalsHavingTransform(ProcessorPtr transform)
+void QueryPipelineBuilder::addTotalsHavingTransform(ProcessorPtr transform)
 {
     checkInitializedAndNotCompleted();
 
@@ -157,7 +203,7 @@ void QueryPipeline::addTotalsHavingTransform(ProcessorPtr transform)
     pipe.addTransform(std::move(transform), totals_port, nullptr);
 }
 
-void QueryPipeline::addDefaultTotals()
+void QueryPipelineBuilder::addDefaultTotals()
 {
     checkInitializedAndNotCompleted();
 
@@ -179,13 +225,13 @@ void QueryPipeline::addDefaultTotals()
     pipe.addTotalsSource(std::move(source));
 }
 
-void QueryPipeline::dropTotalsAndExtremes()
+void QueryPipelineBuilder::dropTotalsAndExtremes()
 {
     pipe.dropTotals();
     pipe.dropExtremes();
 }
 
-void QueryPipeline::addExtremesTransform()
+void QueryPipelineBuilder::addExtremesTransform()
 {
     checkInitializedAndNotCompleted();
 
@@ -201,7 +247,7 @@ void QueryPipeline::addExtremesTransform()
     pipe.addTransform(std::move(transform), nullptr, port);
 }
 
-void QueryPipeline::setOutputFormat(ProcessorPtr output)
+void QueryPipelineBuilder::setOutputFormat(ProcessorPtr output)
 {
     checkInitializedAndNotCompleted();
 
@@ -216,8 +262,8 @@ void QueryPipeline::setOutputFormat(ProcessorPtr output)
     initRowsBeforeLimit();
 }
 
-QueryPipeline QueryPipeline::unitePipelines(
-    std::vector<std::unique_ptr<QueryPipeline>> pipelines,
+QueryPipelineBuilder QueryPipelineBuilder::unitePipelines(
+    std::vector<std::unique_ptr<QueryPipelineBuilder>> pipelines,
     size_t max_threads_limit,
     Processors * collected_processors)
 {
@@ -250,7 +296,7 @@ QueryPipeline QueryPipeline::unitePipelines(
             max_threads_limit = pipeline.max_threads;
     }
 
-    QueryPipeline pipeline;
+    QueryPipelineBuilder pipeline;
     pipeline.init(Pipe::unitePipes(std::move(pipes), collected_processors, false));
 
     if (will_limit_max_threads)
@@ -262,9 +308,9 @@ QueryPipeline QueryPipeline::unitePipelines(
     return pipeline;
 }
 
-std::unique_ptr<QueryPipeline> QueryPipeline::joinPipelines(
-    std::unique_ptr<QueryPipeline> left,
-    std::unique_ptr<QueryPipeline> right,
+std::unique_ptr<QueryPipelineBuilder> QueryPipelineBuilder::joinPipelines(
+    std::unique_ptr<QueryPipelineBuilder> left,
+    std::unique_ptr<QueryPipelineBuilder> right,
     JoinPtr join,
     size_t max_block_size,
     Processors * collected_processors)
@@ -354,7 +400,7 @@ std::unique_ptr<QueryPipeline> QueryPipeline::joinPipelines(
     return left;
 }
 
-void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context)
+void QueryPipelineBuilder::addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context)
 {
     resize(1);
 
@@ -373,7 +419,7 @@ void QueryPipeline::addCreatingSetsTransform(const Block & res_header, SubqueryF
     pipe.addTransform(std::move(transform), totals_port, nullptr);
 }
 
-void QueryPipeline::addPipelineBefore(QueryPipeline pipeline)
+void QueryPipelineBuilder::addPipelineBefore(QueryPipelineBuilder pipeline)
 {
     checkInitializedAndNotCompleted();
     if (pipeline.getHeader())
@@ -388,14 +434,14 @@ void QueryPipeline::addPipelineBefore(QueryPipeline pipeline)
 
     Pipes pipes;
     pipes.emplace_back(std::move(pipe));
-    pipes.emplace_back(QueryPipeline::getPipe(std::move(pipeline)));
+    pipes.emplace_back(QueryPipelineBuilder::getPipe(std::move(pipeline)));
     pipe = Pipe::unitePipes(std::move(pipes), collected_processors, true);
 
     auto processor = std::make_shared<DelayedPortsProcessor>(getHeader(), pipe.numOutputPorts(), delayed_streams, true);
     addTransform(std::move(processor));
 }
 
-void QueryPipeline::setProgressCallback(const ProgressCallback & callback)
+void QueryPipelineBuilder::setProgressCallback(const ProgressCallback & callback)
 {
     for (auto & processor : pipe.processors)
     {
@@ -404,7 +450,7 @@ void QueryPipeline::setProgressCallback(const ProgressCallback & callback)
     }
 }
 
-void QueryPipeline::setProcessListElement(QueryStatus * elem)
+void QueryPipelineBuilder::setProcessListElement(QueryStatus * elem)
 {
     process_list_element = elem;
 
@@ -415,13 +461,12 @@ void QueryPipeline::setProcessListElement(QueryStatus * elem)
     }
 }
 
-void QueryPipeline::initRowsBeforeLimit()
+void QueryPipelineBuilder::initRowsBeforeLimit()
 {
     RowsBeforeLimitCounterPtr rows_before_limit_at_least;
 
     /// TODO: add setRowsBeforeLimitCounter as virtual method to IProcessor.
     std::vector<LimitTransform *> limits;
-    std::vector<SourceFromInputStream *> sources;
     std::vector<RemoteSource *> remote_sources;
 
     std::unordered_set<IProcessor *> visited;
@@ -451,9 +496,6 @@ void QueryPipeline::initRowsBeforeLimit()
                 limits.emplace_back(limit);
             }
 
-            if (auto * source = typeid_cast<SourceFromInputStream *>(processor))
-                sources.emplace_back(source);
-
             if (auto * source = typeid_cast<RemoteSource *>(processor))
                 remote_sources.emplace_back(source);
         }
@@ -486,16 +528,13 @@ void QueryPipeline::initRowsBeforeLimit()
         }
     }
 
-    if (!rows_before_limit_at_least && (!limits.empty() || !sources.empty() || !remote_sources.empty()))
+    if (!rows_before_limit_at_least && (!limits.empty() || !remote_sources.empty()))
     {
         rows_before_limit_at_least = std::make_shared<RowsBeforeLimitCounter>();
 
         for (auto & limit : limits)
             limit->setRowsBeforeLimitCounter(rows_before_limit_at_least);
 
-        for (auto & source : sources)
-            source->setRowsBeforeLimitCounter(rows_before_limit_at_least);
-
         for (auto & source : remote_sources)
             source->setRowsBeforeLimitCounter(rows_before_limit_at_least);
     }
@@ -509,7 +548,7 @@ void QueryPipeline::initRowsBeforeLimit()
         output_format->setRowsBeforeLimitCounter(rows_before_limit_at_least);
 }
 
-PipelineExecutorPtr QueryPipeline::execute()
+PipelineExecutorPtr QueryPipelineBuilder::execute()
 {
     if (!isCompleted())
         throw Exception("Cannot execute pipeline because it is not completed.", ErrorCodes::LOGICAL_ERROR);
@@ -517,13 +556,20 @@ PipelineExecutorPtr QueryPipeline::execute()
     return std::make_shared<PipelineExecutor>(pipe.processors, process_list_element);
 }
 
-void QueryPipeline::setCollectedProcessors(Processors * processors)
+QueryPipeline QueryPipelineBuilder::getPipeline(QueryPipelineBuilder builder)
+{
+    QueryPipeline res(std::move(builder.pipe));
+    res.setNumThreads(builder.getNumThreads());
+    return res;
+}
+
+void QueryPipelineBuilder::setCollectedProcessors(Processors * processors)
 {
     pipe.collected_processors = processors;
 }
 
 
-QueryPipelineProcessorsCollector::QueryPipelineProcessorsCollector(QueryPipeline & pipeline_, IQueryPlanStep * step_)
+QueryPipelineProcessorsCollector::QueryPipelineProcessorsCollector(QueryPipelineBuilder & pipeline_, IQueryPlanStep * step_)
     : pipeline(pipeline_), step(step_)
 {
     pipeline.setCollectedProcessors(&processors);
diff --git a/src/Processors/QueryPipeline.h b/src/QueryPipeline/QueryPipelineBuilder.h
similarity index 82%
rename from src/Processors/QueryPipeline.h
rename to src/QueryPipeline/QueryPipelineBuilder.h
index 358d31a6dff..12f74805173 100644
--- a/src/Processors/QueryPipeline.h
+++ b/src/QueryPipeline/QueryPipelineBuilder.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DataStreams/IBlockOutputStream.h>
 #include <Processors/Executors/PipelineExecutor.h>
 #include <Processors/IProcessor.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipeline.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
 
@@ -29,18 +29,19 @@ struct ExpressionActionsSettings;
 class IJoin;
 using JoinPtr = std::shared_ptr<IJoin>;
 
-class QueryPipeline
+class QueryPipelineBuilder
 {
 public:
-    QueryPipeline() = default;
-    ~QueryPipeline() = default;
-    QueryPipeline(QueryPipeline &&) = default;
-    QueryPipeline(const QueryPipeline &) = delete;
-    QueryPipeline & operator= (QueryPipeline && rhs) = default;
-    QueryPipeline & operator= (const QueryPipeline & rhs) = delete;
+    QueryPipelineBuilder() = default;
+    ~QueryPipelineBuilder() = default;
+    QueryPipelineBuilder(QueryPipelineBuilder &&) = default;
+    QueryPipelineBuilder(const QueryPipelineBuilder &) = delete;
+    QueryPipelineBuilder & operator= (QueryPipelineBuilder && rhs) = default;
+    QueryPipelineBuilder & operator= (const QueryPipelineBuilder & rhs) = delete;
 
     /// All pipes must have same header.
     void init(Pipe pipe);
+    void init(QueryPipeline pipeline);
     /// Clear and release all resources.
     void reset();
 
@@ -56,6 +57,9 @@ public:
     void addTransform(ProcessorPtr transform);
     void addTransform(ProcessorPtr transform, InputPort * totals, InputPort * extremes);
 
+    void addChains(std::vector<Chain> chains);
+    void addChain(Chain chain);
+
     using Transformer = std::function<Processors(OutputPortRawPtrs ports)>;
     /// Transform pipeline in general way.
     void transform(const Transformer & transformer);
@@ -88,16 +92,16 @@ public:
 
     /// Unite several pipelines together. Result pipeline would have common_header structure.
     /// If collector is used, it will collect only newly-added processors, but not processors from pipelines.
-    static QueryPipeline unitePipelines(
-            std::vector<std::unique_ptr<QueryPipeline>> pipelines,
+    static QueryPipelineBuilder unitePipelines(
+            std::vector<std::unique_ptr<QueryPipelineBuilder>> pipelines,
             size_t max_threads_limit = 0,
             Processors * collected_processors = nullptr);
 
     /// Join two pipelines together using JoinPtr.
     /// If collector is used, it will collect only newly-added processors, but not processors from pipelines.
-    static std::unique_ptr<QueryPipeline> joinPipelines(
-        std::unique_ptr<QueryPipeline> left,
-        std::unique_ptr<QueryPipeline> right,
+    static std::unique_ptr<QueryPipelineBuilder> joinPipelines(
+        std::unique_ptr<QueryPipelineBuilder> left,
+        std::unique_ptr<QueryPipelineBuilder> right,
         JoinPtr join,
         size_t max_block_size,
         Processors * collected_processors = nullptr);
@@ -105,7 +109,7 @@ public:
     /// Add other pipeline and execute it before current one.
     /// Pipeline must have empty header, it should not generate any chunk.
     /// This is used for CreatingSets.
-    void addPipelineBefore(QueryPipeline pipeline);
+    void addPipelineBefore(QueryPipelineBuilder pipeline);
 
     void addCreatingSetsTransform(const Block & res_header, SubqueryForSet subquery_for_set, const SizeLimits & limits, ContextPtr context);
 
@@ -120,12 +124,11 @@ public:
     void addTableLock(TableLockHolder lock) { pipe.addTableLock(std::move(lock)); }
     void addInterpreterContext(std::shared_ptr<const Context> context) { pipe.addInterpreterContext(std::move(context)); }
     void addStorageHolder(StoragePtr storage) { pipe.addStorageHolder(std::move(storage)); }
-    void addQueryPlan(std::unique_ptr<QueryPlan> plan) { pipe.addQueryPlan(std::move(plan)); }
+    void addQueryPlan(std::unique_ptr<QueryPlan> plan);
     void setLimits(const StreamLocalLimits & limits) { pipe.setLimits(limits); }
     void setLeafLimits(const SizeLimits & limits) { pipe.setLeafLimits(limits); }
     void setQuota(const std::shared_ptr<const EnabledQuota> & quota) { pipe.setQuota(quota); }
 
-    /// For compatibility with IBlockInputStream.
     void setProgressCallback(const ProgressCallback & callback);
     void setProcessListElement(QueryStatus * elem);
 
@@ -151,7 +154,8 @@ public:
     }
 
     /// Convert query pipeline to pipe.
-    static Pipe getPipe(QueryPipeline pipeline) { return std::move(pipeline.pipe); }
+    static Pipe getPipe(QueryPipelineBuilder pipeline) { return std::move(pipeline.pipe); }
+    static QueryPipeline getPipeline(QueryPipelineBuilder builder);
 
 private:
 
@@ -179,13 +183,13 @@ private:
 class QueryPipelineProcessorsCollector
 {
 public:
-    explicit QueryPipelineProcessorsCollector(QueryPipeline & pipeline_, IQueryPlanStep * step_ = nullptr);
+    explicit QueryPipelineProcessorsCollector(QueryPipelineBuilder & pipeline_, IQueryPlanStep * step_ = nullptr);
     ~QueryPipelineProcessorsCollector();
 
     Processors detachProcessors(size_t group = 0);
 
 private:
-    QueryPipeline & pipeline;
+    QueryPipelineBuilder & pipeline;
     IQueryPlanStep * step;
     Processors processors;
 };
diff --git a/src/DataStreams/RemoteBlockOutputStream.cpp b/src/QueryPipeline/RemoteInserter.cpp
similarity index 77%
rename from src/DataStreams/RemoteBlockOutputStream.cpp
rename to src/QueryPipeline/RemoteInserter.cpp
index 976c4671652..c34c625dc6d 100644
--- a/src/DataStreams/RemoteBlockOutputStream.cpp
+++ b/src/QueryPipeline/RemoteInserter.cpp
@@ -1,7 +1,7 @@
-#include <DataStreams/RemoteBlockOutputStream.h>
+#include <QueryPipeline/RemoteInserter.h>
 
 #include <Client/Connection.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Common/NetException.h>
 #include <Common/CurrentThread.h>
@@ -18,11 +18,12 @@ namespace ErrorCodes
 }
 
 
-RemoteBlockOutputStream::RemoteBlockOutputStream(Connection & connection_,
-                                                 const ConnectionTimeouts & timeouts,
-                                                 const String & query_,
-                                                 const Settings & settings_,
-                                                 const ClientInfo & client_info_)
+RemoteInserter::RemoteInserter(
+    Connection & connection_,
+    const ConnectionTimeouts & timeouts,
+    const String & query_,
+    const Settings & settings_,
+    const ClientInfo & client_info_)
     : connection(connection_), query(query_)
 {
     ClientInfo modified_client_info = client_info_;
@@ -36,7 +37,7 @@ RemoteBlockOutputStream::RemoteBlockOutputStream(Connection & connection_,
     /** Send query and receive "header", that describes table structure.
       * Header is needed to know, what structure is required for blocks to be passed to 'write' method.
       */
-    connection.sendQuery(timeouts, query, "", QueryProcessingStage::Complete, &settings_, &modified_client_info);
+    connection.sendQuery(timeouts, query, "", QueryProcessingStage::Complete, &settings_, &modified_client_info, false);
 
     while (true)
     {
@@ -70,19 +71,16 @@ RemoteBlockOutputStream::RemoteBlockOutputStream(Connection & connection_,
 }
 
 
-void RemoteBlockOutputStream::write(const Block & block)
+void RemoteInserter::write(Block block)
 {
-    if (header)
-        assertBlocksHaveEqualStructure(block, header, "RemoteBlockOutputStream");
-
     try
     {
-        connection.sendData(block);
+        connection.sendData(block, /* name */"", /* scalar */false);
     }
     catch (const NetException &)
     {
         /// Try to get more detailed exception from server
-        auto packet_type = connection.checkPacket();
+        auto packet_type = connection.checkPacket(/* timeout_microseconds */0);
         if (packet_type && *packet_type == Protocol::Server::Exception)
         {
             Packet packet = connection.receivePacket();
@@ -94,17 +92,17 @@ void RemoteBlockOutputStream::write(const Block & block)
 }
 
 
-void RemoteBlockOutputStream::writePrepared(ReadBuffer & input, size_t size)
+void RemoteInserter::writePrepared(ReadBuffer & buf, size_t size)
 {
     /// We cannot use 'header'. Input must contain block with proper structure.
-    connection.sendPreparedData(input, size);
+    connection.sendPreparedData(buf, size);
 }
 
 
-void RemoteBlockOutputStream::writeSuffix()
+void RemoteInserter::onFinish()
 {
     /// Empty block means end of data.
-    connection.sendData(Block());
+    connection.sendData(Block(), /* name */"", /* scalar */false);
 
     /// Wait for EndOfStream or Exception packet, skip Log packets.
     while (true)
@@ -127,7 +125,7 @@ void RemoteBlockOutputStream::writeSuffix()
     finished = true;
 }
 
-RemoteBlockOutputStream::~RemoteBlockOutputStream()
+RemoteInserter::~RemoteInserter()
 {
     /// If interrupted in the middle of the loop of communication with the server, then interrupt the connection,
     ///  to not leave the connection in unsynchronized state.
diff --git a/src/QueryPipeline/RemoteInserter.h b/src/QueryPipeline/RemoteInserter.h
new file mode 100644
index 00000000000..0688b555825
--- /dev/null
+++ b/src/QueryPipeline/RemoteInserter.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <Core/Block.h>
+#include <Common/Throttler.h>
+#include <IO/ConnectionTimeouts.h>
+#include <Interpreters/ClientInfo.h>
+
+
+namespace DB
+{
+
+class Connection;
+class ReadBuffer;
+struct Settings;
+
+
+/** Allow to execute INSERT query on remote server and send data for it.
+  */
+class RemoteInserter
+{
+public:
+    RemoteInserter(
+        Connection & connection_,
+        const ConnectionTimeouts & timeouts,
+        const String & query_,
+        const Settings & settings_,
+        const ClientInfo & client_info_);
+
+    void write(Block block);
+    void onFinish();
+
+    /// Send pre-serialized and possibly pre-compressed block of data, that will be read from 'input'.
+    void writePrepared(ReadBuffer & buf, size_t size = 0);
+
+    ~RemoteInserter();
+
+    const Block & getHeader() const { return header; }
+
+private:
+    Connection & connection;
+    String query;
+    Block header;
+    bool finished = false;
+};
+
+}
diff --git a/src/DataStreams/RemoteQueryExecutor.cpp b/src/QueryPipeline/RemoteQueryExecutor.cpp
similarity index 91%
rename from src/DataStreams/RemoteQueryExecutor.cpp
rename to src/QueryPipeline/RemoteQueryExecutor.cpp
index 21e874691c1..b01ed7ba9a2 100644
--- a/src/DataStreams/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -1,10 +1,13 @@
-#include <DataStreams/ConnectionCollector.h>
-#include <DataStreams/RemoteQueryExecutor.h>
-#include <DataStreams/RemoteQueryExecutorReadContext.h>
+#include <Common/ConcurrentBoundedQueue.h>
+
+#include <QueryPipeline/ConnectionCollector.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
+#include <QueryPipeline/RemoteQueryExecutorReadContext.h>
 
 #include <Columns/ColumnConst.h>
 #include <Common/CurrentThread.h>
-#include <Processors/Pipe.h>
+#include "Core/Protocol.h"
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
@@ -13,15 +16,15 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <IO/ConnectionTimeoutsContext.h>
-#include <Common/FiberStack.h>
 #include <Client/MultiplexedConnections.h>
 #include <Client/HedgedConnections.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 
+
 namespace CurrentMetrics
 {
-extern const Metric SyncDrainedConnections;
-extern const Metric ActiveSyncDrainedConnections;
+    extern const Metric SyncDrainedConnections;
+    extern const Metric ActiveSyncDrainedConnections;
 }
 
 namespace DB
@@ -32,6 +35,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_PACKET_FROM_SERVER;
     extern const int DUPLICATED_PART_UUIDS;
+    extern const int SYSTEM_ERROR;
 }
 
 RemoteQueryExecutor::RemoteQueryExecutor(
@@ -208,6 +212,12 @@ void RemoteQueryExecutor::sendQuery()
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
     ClientInfo modified_client_info = context->getClientInfo();
     modified_client_info.query_kind = ClientInfo::QueryKind::SECONDARY_QUERY;
+    /// Set initial_query_id to query_id for the clickhouse-benchmark.
+    ///
+    /// (since first query of clickhouse-benchmark will be issued as SECONDARY_QUERY,
+    ///  due to it executes queries via RemoteBlockInputStream)
+    if (modified_client_info.initial_query_id.empty())
+        modified_client_info.initial_query_id = query_id;
     if (CurrentThread::isInitialized())
     {
         modified_client_info.client_trace_context = CurrentThread::get().thread_trace_context;
@@ -384,6 +394,13 @@ std::optional<Block> RemoteQueryExecutor::processPacket(Packet packet)
                 log_queue->pushBlock(std::move(packet.block));
             break;
 
+        case Protocol::Server::ProfileEvents:
+            /// Pass profile events from remote server to client
+            if (auto profile_queue = CurrentThread::getInternalProfileEventsQueue())
+                if (!profile_queue->emplace(std::move(packet.block)))
+                    throw Exception(ErrorCodes::SYSTEM_ERROR, "Could not push into profile queue");
+            break;
+
         default:
             got_unknown_packet_from_replica = true;
             throw Exception(ErrorCodes::UNKNOWN_PACKET_FROM_SERVER, "Unknown packet {} from one of the following replicas: {}",
@@ -526,7 +543,18 @@ void RemoteQueryExecutor::tryCancel(const char * reason, std::unique_ptr<ReadCon
     was_cancelled = true;
 
     if (read_context && *read_context)
+    {
+        /// The timer should be set for query cancellation to avoid query cancellation hung.
+        ///
+        /// Since in case the remote server will abnormally terminated, neither
+        /// FIN nor RST packet will be sent, and the initiator will not know that
+        /// the connection died (unless tcp_keep_alive_timeout > 0).
+        ///
+        /// Also note that it is possible to get this situation even when
+        /// enough data already had been read.
+        (*read_context)->setTimer();
         (*read_context)->cancel();
+    }
 
     connections->sendCancel();
 
diff --git a/src/DataStreams/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
similarity index 98%
rename from src/DataStreams/RemoteQueryExecutor.h
rename to src/QueryPipeline/RemoteQueryExecutor.h
index 3df17fab3fc..b7a2509ea97 100644
--- a/src/DataStreams/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -6,10 +6,10 @@
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/StorageID.h>
-#include <Common/FiberStack.h>
 #include <Common/TimerDescriptor.h>
 #include <variant>
 
+
 namespace DB
 {
 
@@ -21,8 +21,8 @@ using ThrottlerPtr = std::shared_ptr<Throttler>;
 struct Progress;
 using ProgressCallback = std::function<void(const Progress & progress)>;
 
-struct BlockStreamProfileInfo;
-using ProfileInfoCallback = std::function<void(const BlockStreamProfileInfo & info)>;
+struct ProfileInfo;
+using ProfileInfoCallback = std::function<void(const ProfileInfo & info)>;
 
 class RemoteQueryExecutorReadContext;
 
diff --git a/src/DataStreams/RemoteQueryExecutorReadContext.cpp b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
similarity index 96%
rename from src/DataStreams/RemoteQueryExecutorReadContext.cpp
rename to src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
index c1f415bb597..5f7b5e24967 100644
--- a/src/DataStreams/RemoteQueryExecutorReadContext.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.cpp
@@ -1,6 +1,6 @@
 #if defined(OS_LINUX)
 
-#include <DataStreams/RemoteQueryExecutorReadContext.h>
+#include <QueryPipeline/RemoteQueryExecutorReadContext.h>
 #include <Common/Exception.h>
 #include <Common/NetException.h>
 #include <Client/IConnections.h>
@@ -100,7 +100,7 @@ void RemoteQueryExecutorReadContext::setConnectionFD(int fd, Poco::Timespan time
     connection_fd = fd;
     epoll.add(connection_fd);
 
-    receive_timeout = timeout;
+    receive_timeout_usec = timeout.totalMicroseconds();
     connection_fd_description = fd_description;
 }
 
@@ -157,8 +157,8 @@ void RemoteQueryExecutorReadContext::setTimer() const
     /// Did not get packet yet. Init timeout for the next async reading.
     timer.reset();
 
-    if (receive_timeout.totalMicroseconds())
-        timer.setRelative(receive_timeout);
+    if (receive_timeout_usec)
+        timer.setRelative(receive_timeout_usec);
 }
 
 bool RemoteQueryExecutorReadContext::resumeRoutine()
diff --git a/src/DataStreams/RemoteQueryExecutorReadContext.h b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
similarity index 91%
rename from src/DataStreams/RemoteQueryExecutorReadContext.h
rename to src/QueryPipeline/RemoteQueryExecutorReadContext.h
index 5c56bb73dd6..91e34dbb82c 100644
--- a/src/DataStreams/RemoteQueryExecutorReadContext.h
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
@@ -34,7 +34,8 @@ public:
     /// This mutex for fiber is needed because fiber could be destroyed in cancel method from another thread.
     std::mutex fiber_lock;
 
-    Poco::Timespan receive_timeout;
+    /// atomic is required due to data-race between setConnectionFD() and setTimer() from the cancellation path.
+    std::atomic<uint64_t> receive_timeout_usec = 0;
     IConnections & connections;
     Poco::Net::Socket * last_used_socket = nullptr;
 
@@ -75,6 +76,7 @@ class RemoteQueryExecutorReadContext
 {
 public:
     void cancel() {}
+    void setTimer() {}
 };
 
 }
diff --git a/src/DataStreams/SizeLimits.cpp b/src/QueryPipeline/SizeLimits.cpp
similarity index 97%
rename from src/DataStreams/SizeLimits.cpp
rename to src/QueryPipeline/SizeLimits.cpp
index 06dde923e55..90005902f67 100644
--- a/src/DataStreams/SizeLimits.cpp
+++ b/src/QueryPipeline/SizeLimits.cpp
@@ -1,4 +1,4 @@
-#include <DataStreams/SizeLimits.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Common/formatReadable.h>
 #include <Common/Exception.h>
 #include <string>
diff --git a/src/DataStreams/SizeLimits.h b/src/QueryPipeline/SizeLimits.h
similarity index 97%
rename from src/DataStreams/SizeLimits.h
rename to src/QueryPipeline/SizeLimits.h
index 48fd2b9343f..ce7e1795475 100644
--- a/src/DataStreams/SizeLimits.h
+++ b/src/QueryPipeline/SizeLimits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/DataStreams/StreamLocalLimits.h b/src/QueryPipeline/StreamLocalLimits.h
similarity index 91%
rename from src/DataStreams/StreamLocalLimits.h
rename to src/QueryPipeline/StreamLocalLimits.h
index efda6a941cc..7f49a5d0b07 100644
--- a/src/DataStreams/StreamLocalLimits.h
+++ b/src/QueryPipeline/StreamLocalLimits.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <DataStreams/SizeLimits.h>
-#include <DataStreams/ExecutionSpeedLimits.h>
+#include <QueryPipeline/SizeLimits.h>
+#include <QueryPipeline/ExecutionSpeedLimits.h>
 
 namespace DB
 {
diff --git a/tests/queries/0_stateless/00763_lock_buffer.reference b/src/QueryPipeline/examples/CMakeLists.txt
similarity index 100%
rename from tests/queries/0_stateless/00763_lock_buffer.reference
rename to src/QueryPipeline/examples/CMakeLists.txt
diff --git a/src/DataStreams/narrowBlockInputStreams.cpp b/src/QueryPipeline/narrowBlockInputStreams.cpp
similarity index 97%
rename from src/DataStreams/narrowBlockInputStreams.cpp
rename to src/QueryPipeline/narrowBlockInputStreams.cpp
index 17e44e38293..19bebe4a0bf 100644
--- a/src/DataStreams/narrowBlockInputStreams.cpp
+++ b/src/QueryPipeline/narrowBlockInputStreams.cpp
@@ -1,7 +1,7 @@
 #include <random>
 #include <Common/thread_local_rng.h>
 #include <Processors/ConcatProcessor.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include "narrowBlockInputStreams.h"
 
 
diff --git a/src/DataStreams/narrowBlockInputStreams.h b/src/QueryPipeline/narrowBlockInputStreams.h
similarity index 100%
rename from src/DataStreams/narrowBlockInputStreams.h
rename to src/QueryPipeline/narrowBlockInputStreams.h
diff --git a/src/Processors/printPipeline.cpp b/src/QueryPipeline/printPipeline.cpp
similarity index 99%
rename from src/Processors/printPipeline.cpp
rename to src/QueryPipeline/printPipeline.cpp
index cbf8cb3a77d..40c88502ed0 100644
--- a/src/Processors/printPipeline.cpp
+++ b/src/QueryPipeline/printPipeline.cpp
@@ -1,4 +1,4 @@
-#include <Processors/printPipeline.h>
+#include <QueryPipeline/printPipeline.h>
 #include <Processors/QueryPlan/IQueryPlanStep.h>
 #include <set>
 #include <map>
diff --git a/src/Processors/printPipeline.h b/src/QueryPipeline/printPipeline.h
similarity index 100%
rename from src/Processors/printPipeline.h
rename to src/QueryPipeline/printPipeline.h
diff --git a/src/DataStreams/tests/gtest_blocks_size_merging_streams.cpp b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
similarity index 81%
rename from src/DataStreams/tests/gtest_blocks_size_merging_streams.cpp
rename to src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
index aa4c717a28b..fb10601216e 100644
--- a/src/DataStreams/tests/gtest_blocks_size_merging_streams.cpp
+++ b/src/QueryPipeline/tests/gtest_blocks_size_merging_streams.cpp
@@ -4,10 +4,10 @@
 #include <Processors/Sources/BlocksListSource.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Merges/MergingSortedTransform.h>
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
-#include <Processors/QueryPipeline.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <QueryPipeline/QueryPipeline.h>
 
 using namespace DB;
 
@@ -83,21 +83,23 @@ TEST(MergingSortedTest, SimpleBlockSizeTest)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-            DEFAULT_MERGE_BLOCK_SIZE, 0, false, nullptr, false, true);
+            DEFAULT_MERGE_BLOCK_SIZE, 0, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
-    pipeline.setMaxThreads(1);
-    auto stream = std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
+    QueryPipeline pipeline(std::move(pipe));
+    PullingPipelineExecutor executor(pipeline);
 
     size_t total_rows = 0;
-    auto block1 = stream->read();
-    auto block2 = stream->read();
-    auto block3 = stream->read();
+    Block block1;
+    Block block2;
+    Block block3;
+    executor.pull(block1);
+    executor.pull(block2);
+    executor.pull(block3);
 
-    EXPECT_EQ(stream->read(), Block());
+    Block tmp_block;
+    ASSERT_FALSE(executor.pull(tmp_block));
 
     for (const auto & block : {block1, block2, block3})
         total_rows += block.rows();
@@ -128,20 +130,22 @@ TEST(MergingSortedTest, MoreInterestingBlockSizes)
     EXPECT_EQ(pipe.numOutputPorts(), 3);
 
     auto transform = std::make_shared<MergingSortedTransform>(pipe.getHeader(), pipe.numOutputPorts(), sort_description,
-            DEFAULT_MERGE_BLOCK_SIZE, 0, false, nullptr, false, true);
+            DEFAULT_MERGE_BLOCK_SIZE, 0, nullptr, false, true);
 
     pipe.addTransform(std::move(transform));
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
-    pipeline.setMaxThreads(1);
-    auto stream = std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
+    QueryPipeline pipeline(std::move(pipe));
+    PullingPipelineExecutor executor(pipeline);
 
-    auto block1 = stream->read();
-    auto block2 = stream->read();
-    auto block3 = stream->read();
+    Block block1;
+    Block block2;
+    Block block3;
+    executor.pull(block1);
+    executor.pull(block2);
+    executor.pull(block3);
 
-    EXPECT_EQ(stream->read(), Block());
+    Block tmp_block;
+    ASSERT_FALSE(executor.pull(tmp_block));
 
     EXPECT_EQ(block1.rows(), (1000 + 1500 + 1400) / 3);
     EXPECT_EQ(block2.rows(), (1000 + 1500 + 1400) / 3);
diff --git a/src/DataStreams/tests/gtest_check_sorted_stream.cpp b/src/QueryPipeline/tests/gtest_check_sorted_stream.cpp
similarity index 94%
rename from src/DataStreams/tests/gtest_check_sorted_stream.cpp
rename to src/QueryPipeline/tests/gtest_check_sorted_stream.cpp
index 2788c44389b..751f7ef8635 100644
--- a/src/DataStreams/tests/gtest_check_sorted_stream.cpp
+++ b/src/QueryPipeline/tests/gtest_check_sorted_stream.cpp
@@ -5,7 +5,8 @@
 #include <Processors/Sources/BlocksListSource.h>
 #include <Processors/Transforms/CheckSortedTransform.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <QueryPipeline/Pipe.h>
 #include <DataTypes/DataTypesNumber.h>
 
 
@@ -97,8 +98,7 @@ TEST(CheckSortedBlockInputStream, CheckGoodCase)
         return std::make_shared<CheckSortedTransform>(header, sort_description);
     });
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
+    QueryPipeline pipeline(std::move(pipe));
 
     PullingPipelineExecutor executor(pipeline);
 
@@ -125,8 +125,7 @@ TEST(CheckSortedBlockInputStream, CheckBadLastRow)
         return std::make_shared<CheckSortedTransform>(header, sort_description);
     });
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
+    QueryPipeline pipeline(std::move(pipe));
 
     PullingPipelineExecutor executor(pipeline);
 
@@ -150,8 +149,7 @@ TEST(CheckSortedBlockInputStream, CheckUnsortedBlock1)
         return std::make_shared<CheckSortedTransform>(header, sort_description);
     });
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
+    QueryPipeline pipeline(std::move(pipe));
 
     PullingPipelineExecutor executor(pipeline);
 
@@ -172,8 +170,7 @@ TEST(CheckSortedBlockInputStream, CheckUnsortedBlock2)
         return std::make_shared<CheckSortedTransform>(header, sort_description);
     });
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
+    QueryPipeline pipeline(std::move(pipe));
 
     PullingPipelineExecutor executor(pipeline);
 
@@ -194,8 +191,7 @@ TEST(CheckSortedBlockInputStream, CheckUnsortedBlock3)
         return std::make_shared<CheckSortedTransform>(header, sort_description);
     });
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
+    QueryPipeline pipeline(std::move(pipe));
 
     PullingPipelineExecutor executor(pipeline);
 
@@ -218,8 +214,7 @@ TEST(CheckSortedBlockInputStream, CheckEqualBlock)
         return std::make_shared<CheckSortedTransform>(header, sort_description);
     });
 
-    QueryPipeline pipeline;
-    pipeline.init(std::move(pipe));
+    QueryPipeline pipeline(std::move(pipe));
 
     PullingPipelineExecutor executor(pipeline);
 
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index b90b0c33f17..ba2644e0fba 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -1,4 +1,6 @@
 #include "GRPCServer.h"
+#include <limits>
+#include <memory>
 #if USE_GRPC
 
 #include <Columns/ColumnString.h>
@@ -6,13 +8,14 @@
 #include <Common/CurrentThread.h>
 #include <Common/SettingsChanges.h>
 #include <Common/setThreadName.h>
+#include <Common/Stopwatch.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <DataStreams/AsynchronousBlockInputStream.h>
-#include <DataStreams/PushingToSinkBlockOutputStream.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <QueryPipeline/ProfileInfo.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Interpreters/executeQuery.h>
+#include <Interpreters/Session.h>
 #include <IO/ConcatReadBuffer.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -23,15 +26,19 @@
 #include <Parsers/ParserQuery.h>
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Formats/IInputFormat.h>
-#include <Processors/QueryPipeline.h>
-#include <Formats/FormatFactory.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/Sinks/EmptySink.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Server/IServer.h>
 #include <Storages/IStorage.h>
 #include <Poco/FileStream.h>
 #include <Poco/StreamCopier.h>
 #include <Poco/Util/LayeredConfiguration.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <grpc++/security/server_credentials.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
@@ -54,7 +61,6 @@ namespace ErrorCodes
     extern const int NETWORK_ERROR;
     extern const int NO_DATA_TO_INSERT;
     extern const int SUPPORT_IS_DISABLED;
-    extern const int UNKNOWN_DATABASE;
 }
 
 namespace
@@ -120,6 +126,33 @@ namespace
             throw Exception("Unknown compression level: '" + str + "'", ErrorCodes::INVALID_CONFIG_PARAMETER);
     }
 
+    grpc_compression_algorithm convertCompressionAlgorithm(const ::clickhouse::grpc::CompressionAlgorithm & algorithm)
+    {
+        if (algorithm == ::clickhouse::grpc::NO_COMPRESSION)
+            return GRPC_COMPRESS_NONE;
+        else if (algorithm == ::clickhouse::grpc::DEFLATE)
+            return GRPC_COMPRESS_DEFLATE;
+        else if (algorithm == ::clickhouse::grpc::GZIP)
+            return GRPC_COMPRESS_GZIP;
+        else if (algorithm == ::clickhouse::grpc::STREAM_GZIP)
+            return GRPC_COMPRESS_STREAM_GZIP;
+        else
+            throw Exception("Unknown compression algorithm: '" + ::clickhouse::grpc::CompressionAlgorithm_Name(algorithm) + "'", ErrorCodes::INVALID_GRPC_QUERY_INFO);
+    }
+
+    grpc_compression_level convertCompressionLevel(const ::clickhouse::grpc::CompressionLevel & level)
+    {
+        if (level == ::clickhouse::grpc::COMPRESSION_NONE)
+            return GRPC_COMPRESS_LEVEL_NONE;
+        else if (level == ::clickhouse::grpc::COMPRESSION_LOW)
+            return GRPC_COMPRESS_LEVEL_LOW;
+        else if (level == ::clickhouse::grpc::COMPRESSION_MEDIUM)
+            return GRPC_COMPRESS_LEVEL_MED;
+        else if (level == ::clickhouse::grpc::COMPRESSION_HIGH)
+            return GRPC_COMPRESS_LEVEL_HIGH;
+        else
+            throw Exception("Unknown compression level: '" + ::clickhouse::grpc::CompressionLevel_Name(level) + "'", ErrorCodes::INVALID_GRPC_QUERY_INFO);
+    }
 
     /// Gets file's contents as a string, throws an exception if failed.
     String readFile(const String & filepath)
@@ -242,7 +275,22 @@ namespace
         virtual void write(const GRPCResult & result, const CompletionCallback & callback) = 0;
         virtual void writeAndFinish(const GRPCResult & result, const grpc::Status & status, const CompletionCallback & callback) = 0;
 
-        Poco::Net::SocketAddress getClientAddress() const { String peer = grpc_context.peer(); return Poco::Net::SocketAddress{peer.substr(peer.find(':') + 1)}; }
+        Poco::Net::SocketAddress getClientAddress() const
+        {
+            String peer = grpc_context.peer();
+            return Poco::Net::SocketAddress{peer.substr(peer.find(':') + 1)};
+        }
+
+        void setResultCompression(grpc_compression_algorithm algorithm, grpc_compression_level level)
+        {
+            grpc_context.set_compression_algorithm(algorithm);
+            grpc_context.set_compression_level(level);
+        }
+
+        void setResultCompression(const ::clickhouse::grpc::Compression & compression)
+        {
+            setResultCompression(convertCompressionAlgorithm(compression.algorithm()), convertCompressionLevel(compression.level()));
+        }
 
     protected:
         CompletionCallback * getCallbackPtr(const CompletionCallback & callback)
@@ -535,11 +583,11 @@ namespace
         void createExternalTables();
 
         void generateOutput();
-        void generateOutputWithProcessors();
 
         void finishQuery();
         void onException(const Exception & exception);
         void onFatalError();
+        void releaseQueryIDAndSessionID();
         void close();
 
         void readQueryInfo();
@@ -549,7 +597,7 @@ namespace
         void addProgressToResult();
         void addTotalsToResult(const Block & totals);
         void addExtremesToResult(const Block & extremes);
-        void addProfileInfoToResult(const BlockStreamProfileInfo & info);
+        void addProfileInfoToResult(const ProfileInfo & info);
         void addLogsToResult();
         void sendResult();
         void throwIfFailedToSendResult();
@@ -560,7 +608,7 @@ namespace
         IServer & iserver;
         Poco::Logger * log = nullptr;
 
-        std::shared_ptr<NamedSession> session;
+        std::optional<Session> session;
         ContextMutablePtr query_context;
         std::optional<CurrentThread::QueryScope> query_scope;
         String query_text;
@@ -589,7 +637,7 @@ namespace
         std::optional<WriteBufferFromString> write_buffer;
         std::unique_ptr<QueryPipeline> pipeline;
         std::unique_ptr<PullingPipelineExecutor> pipeline_executor;
-        BlockOutputStreamPtr block_output_stream;
+        std::shared_ptr<IOutputFormat> output_format_processor;
         bool need_input_data_from_insert_query = true;
         bool need_input_data_from_query_info = true;
         bool need_input_data_delimiter = false;
@@ -689,34 +737,20 @@ namespace
             password = "";
         }
 
-        /// Create context.
-        query_context = Context::createCopy(iserver.context());
-
         /// Authentication.
-        query_context->setUser(user, password, user_address);
-        query_context->setCurrentQueryId(query_info.query_id());
-        if (!quota_key.empty())
-            query_context->setQuotaKey(quota_key);
+        session.emplace(iserver.context(), ClientInfo::Interface::GRPC);
+        session->authenticate(user, password, user_address);
+        session->getClientInfo().quota_key = quota_key;
 
         /// The user could specify session identifier and session timeout.
         /// It allows to modify settings, create temporary tables and reuse them in subsequent requests.
         if (!query_info.session_id().empty())
         {
-            session = query_context->acquireNamedSession(
+            session->makeSessionContext(
                 query_info.session_id(), getSessionTimeout(query_info, iserver.config()), query_info.session_check());
-            query_context = Context::createCopy(session->context);
-            query_context->setSessionContext(session->context);
         }
 
-        query_scope.emplace(query_context);
-
-        /// Set client info.
-        ClientInfo & client_info = query_context->getClientInfo();
-        client_info.query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
-        client_info.interface = ClientInfo::Interface::GRPC;
-        client_info.initial_user = client_info.current_user;
-        client_info.initial_query_id = client_info.current_query_id;
-        client_info.initial_address = client_info.current_address;
+        query_context = session->makeQueryContext();
 
         /// Prepare settings.
         SettingsChanges settings_changes;
@@ -726,11 +760,14 @@ namespace
         }
         query_context->checkSettingsConstraints(settings_changes);
         query_context->applySettingsChanges(settings_changes);
-        const Settings & settings = query_context->getSettingsRef();
+
+        query_context->setCurrentQueryId(query_info.query_id());
+        query_scope.emplace(query_context);
 
         /// Prepare for sending exceptions and logs.
-        send_exception_with_stacktrace = query_context->getSettingsRef().calculate_text_stack_trace;
-        const auto client_logs_level = query_context->getSettingsRef().send_logs_level;
+        const Settings & settings = query_context->getSettingsRef();
+        send_exception_with_stacktrace = settings.calculate_text_stack_trace;
+        const auto client_logs_level = settings.send_logs_level;
         if (client_logs_level != LogsLevel::none)
         {
             logs_queue = std::make_shared<InternalTextLogsQueue>();
@@ -741,14 +778,14 @@ namespace
 
         /// Set the current database if specified.
         if (!query_info.database().empty())
-        {
-            if (!DatabaseCatalog::instance().isDatabaseExist(query_info.database()))
-                throw Exception("Database " + query_info.database() + " doesn't exist", ErrorCodes::UNKNOWN_DATABASE);
             query_context->setCurrentDatabase(query_info.database());
-        }
+
+        /// Apply compression settings for this call.
+        if (query_info.has_result_compression())
+            responder->setResultCompression(query_info.result_compression());
 
         /// The interactive delay will be used to show progress.
-        interactive_delay = query_context->getSettingsRef().interactive_delay;
+        interactive_delay = settings.interactive_delay;
         query_context->setProgressCallback([this](const Progress & value) { return progress.incrementPiecewiseAtomically(value); });
 
         /// Parse the query.
@@ -814,12 +851,12 @@ namespace
             query_end = insert_query->data;
         }
         String query(begin, query_end);
-        io = ::DB::executeQuery(query, query_context, false, QueryProcessingStage::Complete, true, true);
+        io = ::DB::executeQuery(true, query, query_context);
     }
 
     void Call::processInput()
     {
-        if (!io.out)
+        if (!io.pipeline.pushing())
             return;
 
         bool has_data_to_insert = (insert_query && insert_query->data)
@@ -834,18 +871,19 @@ namespace
 
         /// This is significant, because parallel parsing may be used.
         /// So we mustn't touch the input stream from other thread.
-        initializeBlockInputStream(io.out->getHeader());
+        initializeBlockInputStream(io.pipeline.getHeader());
 
-        io.out->writePrefix();
+        PushingPipelineExecutor executor(io.pipeline);
+        executor.start();
 
         Block block;
         while (pipeline_executor->pull(block))
         {
             if (block)
-                io.out->write(block);
+                executor.push(block);
         }
 
-        io.out->writeSuffix();
+        executor.finish();
     }
 
     void Call::initializeBlockInputStream(const Block & header)
@@ -908,10 +946,10 @@ namespace
         });
 
         assert(!pipeline);
-        pipeline = std::make_unique<QueryPipeline>();
-        auto source = FormatFactory::instance().getInput(
-            input_format, *read_buffer, header, query_context, query_context->getSettings().max_insert_block_size);
-        pipeline->init(Pipe(source));
+        auto source = query_context->getInputFormat(
+            input_format, *read_buffer, header, query_context->getSettings().max_insert_block_size);
+        QueryPipelineBuilder builder;
+        builder.init(Pipe(source));
 
         /// Add default values if necessary.
         if (ast)
@@ -925,7 +963,7 @@ namespace
                     const auto & columns = storage->getInMemoryMetadataPtr()->getColumns();
                     if (!columns.empty())
                     {
-                        pipeline->addSimpleTransform([&](const Block & cur_header)
+                        builder.addSimpleTransform([&](const Block & cur_header)
                         {
                             return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *source, query_context);
                         });
@@ -934,6 +972,7 @@ namespace
             }
         }
 
+        pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
         pipeline_executor = std::make_unique<PullingPipelineExecutor>(*pipeline);
     }
 
@@ -977,7 +1016,7 @@ namespace
                 {
                     /// The data will be written directly to the table.
                     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-                    auto out_stream = std::make_shared<PushingToSinkBlockOutputStream>(storage->write(ASTPtr(), metadata_snapshot, query_context));
+                    auto sink = storage->write(ASTPtr(), metadata_snapshot, query_context);
                     ReadBufferFromMemory data(external_table.data().data(), external_table.data().size());
                     String format = external_table.format();
                     if (format.empty())
@@ -994,14 +1033,20 @@ namespace
                         external_table_context->checkSettingsConstraints(settings_changes);
                         external_table_context->applySettingsChanges(settings_changes);
                     }
-                    auto in_stream = external_table_context->getInputFormat(
-                        format, data, metadata_snapshot->getSampleBlock(), external_table_context->getSettings().max_insert_block_size);
-                    in_stream->readPrefix();
-                    out_stream->writePrefix();
-                    while (auto block = in_stream->read())
-                        out_stream->write(block);
-                    in_stream->readSuffix();
-                    out_stream->writeSuffix();
+                    auto in = external_table_context->getInputFormat(
+                        format, data, metadata_snapshot->getSampleBlock(),
+                        external_table_context->getSettings().max_insert_block_size);
+
+                    QueryPipelineBuilder cur_pipeline;
+                    cur_pipeline.init(Pipe(std::move(in)));
+                    cur_pipeline.addTransform(std::move(sink));
+                    cur_pipeline.setSinks([&](const Block & header, Pipe::StreamType)
+                    {
+                        return std::make_shared<EmptySink>(header);
+                    });
+
+                    auto executor = cur_pipeline.execute();
+                    executor->execute(1);
                 }
             }
 
@@ -1036,145 +1081,95 @@ namespace
 
     void Call::generateOutput()
     {
-        if (io.pipeline.initialized())
-        {
-            generateOutputWithProcessors();
-            return;
-        }
-
-        if (!io.in)
+        if (!io.pipeline.initialized() || io.pipeline.pushing())
             return;
 
-        AsynchronousBlockInputStream async_in(io.in);
+        Block header;
+        if (io.pipeline.pulling())
+            header = io.pipeline.getHeader();
+
         write_buffer.emplace(*result.mutable_output());
-        block_output_stream = query_context->getOutputStream(output_format, *write_buffer, async_in.getHeader());
+        output_format_processor = query_context->getOutputFormat(output_format, *write_buffer, header);
+        output_format_processor->doWritePrefix();
         Stopwatch after_send_progress;
 
         /// Unless the input() function is used we are not going to receive input data anymore.
         if (!input_function_is_used)
             check_query_info_contains_cancel_only = true;
 
-        auto check_for_cancel = [&]
+        if (io.pipeline.pulling())
         {
-            if (isQueryCancelled())
+            auto executor = std::make_shared<PullingAsyncPipelineExecutor>(io.pipeline);
+            auto check_for_cancel = [&]
             {
-                async_in.cancel(false);
-                return false;
-            }
-            return true;
-        };
+                if (isQueryCancelled())
+                {
+                    executor->cancel();
+                    return false;
+                }
+                return true;
+            };
 
-        async_in.readPrefix();
-        block_output_stream->writePrefix();
-
-        while (check_for_cancel())
-        {
             Block block;
-            if (async_in.poll(interactive_delay / 1000))
+            while (check_for_cancel())
             {
-                block = async_in.read();
-                if (!block)
+                if (!executor->pull(block, interactive_delay / 1000))
+                    break;
+
+                throwIfFailedToSendResult();
+                if (!check_for_cancel())
+                    break;
+
+                if (block && !io.null_format)
+                    output_format_processor->write(materializeBlock(block));
+
+                if (after_send_progress.elapsedMicroseconds() >= interactive_delay)
+                {
+                    addProgressToResult();
+                    after_send_progress.restart();
+                }
+
+                addLogsToResult();
+
+                bool has_output = write_buffer->offset();
+                if (has_output || result.has_progress() || result.logs_size())
+                    sendResult();
+
+                throwIfFailedToSendResult();
+                if (!check_for_cancel())
                     break;
             }
 
-            throwIfFailedToSendResult();
-            if (!check_for_cancel())
-                break;
-
-            if (block && !io.null_format)
-                block_output_stream->write(block);
-
-            if (after_send_progress.elapsedMicroseconds() >= interactive_delay)
+            if (!isQueryCancelled())
             {
+                addTotalsToResult(executor->getTotalsBlock());
+                addExtremesToResult(executor->getExtremesBlock());
+                addProfileInfoToResult(executor->getProfileInfo());
+            }
+        }
+        else
+        {
+            auto executor = std::make_shared<CompletedPipelineExecutor>(io.pipeline);
+            auto callback = [&]() -> bool
+            {
+
+                throwIfFailedToSendResult();
                 addProgressToResult();
-                after_send_progress.restart();
-            }
+                addLogsToResult();
 
-            addLogsToResult();
+                bool has_output = write_buffer->offset();
+                if (has_output || result.has_progress() || result.logs_size())
+                    sendResult();
 
-            bool has_output = write_buffer->offset();
-            if (has_output || result.has_progress() || result.logs_size())
-                sendResult();
+                throwIfFailedToSendResult();
 
-            throwIfFailedToSendResult();
-            if (!check_for_cancel())
-                break;
+                return isQueryCancelled();
+            };
+            executor->setCancelCallback(std::move(callback), interactive_delay / 1000);
+            executor->execute();
         }
 
-        async_in.readSuffix();
-        block_output_stream->writeSuffix();
-
-        if (!isQueryCancelled())
-        {
-            addTotalsToResult(io.in->getTotals());
-            addExtremesToResult(io.in->getExtremes());
-            addProfileInfoToResult(io.in->getProfileInfo());
-        }
-    }
-
-    void Call::generateOutputWithProcessors()
-    {
-        if (!io.pipeline.initialized())
-            return;
-
-        auto executor = std::make_shared<PullingAsyncPipelineExecutor>(io.pipeline);
-        write_buffer.emplace(*result.mutable_output());
-        block_output_stream = query_context->getOutputStream(output_format, *write_buffer, executor->getHeader());
-        block_output_stream->writePrefix();
-        Stopwatch after_send_progress;
-
-        /// Unless the input() function is used we are not going to receive input data anymore.
-        if (!input_function_is_used)
-            check_query_info_contains_cancel_only = true;
-
-        auto check_for_cancel = [&]
-        {
-            if (isQueryCancelled())
-            {
-                executor->cancel();
-                return false;
-            }
-            return true;
-        };
-
-        Block block;
-        while (check_for_cancel())
-        {
-            if (!executor->pull(block, interactive_delay / 1000))
-                break;
-
-            throwIfFailedToSendResult();
-            if (!check_for_cancel())
-                break;
-
-            if (block && !io.null_format)
-                block_output_stream->write(block);
-
-            if (after_send_progress.elapsedMicroseconds() >= interactive_delay)
-            {
-                addProgressToResult();
-                after_send_progress.restart();
-            }
-
-            addLogsToResult();
-
-            bool has_output = write_buffer->offset();
-            if (has_output || result.has_progress() || result.logs_size())
-                sendResult();
-
-            throwIfFailedToSendResult();
-            if (!check_for_cancel())
-                break;
-        }
-
-        block_output_stream->writeSuffix();
-
-        if (!isQueryCancelled())
-        {
-            addTotalsToResult(executor->getTotalsBlock());
-            addExtremesToResult(executor->getExtremesBlock());
-            addProfileInfoToResult(executor->getProfileInfo());
-        }
+        output_format_processor->doWriteSuffix();
     }
 
     void Call::finishQuery()
@@ -1184,6 +1179,7 @@ namespace
         addProgressToResult();
         query_scope->logPeakMemoryUsage();
         addLogsToResult();
+        releaseQueryIDAndSessionID();
         sendResult();
         close();
 
@@ -1214,6 +1210,8 @@ namespace
                 LOG_WARNING(log, "Couldn't send logs to client");
             }
 
+            releaseQueryIDAndSessionID();
+
             try
             {
                 sendException(exception);
@@ -1233,7 +1231,7 @@ namespace
         {
             try
             {
-                finalize = true;
+                result.mutable_exception()->set_name("FatalError");
                 addLogsToResult();
                 sendResult();
             }
@@ -1243,19 +1241,28 @@ namespace
         }
     }
 
+    void Call::releaseQueryIDAndSessionID()
+    {
+        /// releaseQueryIDAndSessionID() should be called before sending the final result to the client
+        /// because the client may decide to send another query with the same query ID or session ID
+        /// immediately after it receives our final result, and it's prohibited to have
+        /// two queries executed at the same time with the same query ID or session ID.
+        io.process_list_entry.reset();
+        if (session)
+            session->releaseSessionID();
+    }
+
     void Call::close()
     {
         responder.reset();
         pipeline_executor.reset();
         pipeline.reset();
-        block_output_stream.reset();
+        output_format_processor.reset();
         read_buffer.reset();
         write_buffer.reset();
         io = {};
         query_scope.reset();
         query_context.reset();
-        if (session)
-            session->release();
         session.reset();
     }
 
@@ -1372,10 +1379,10 @@ namespace
             return;
 
         WriteBufferFromString buf{*result.mutable_totals()};
-        auto stream = query_context->getOutputStream(output_format, buf, totals);
-        stream->writePrefix();
-        stream->write(totals);
-        stream->writeSuffix();
+        auto format = query_context->getOutputFormat(output_format, buf, totals);
+        format->doWritePrefix();
+        format->write(materializeBlock(totals));
+        format->doWriteSuffix();
     }
 
     void Call::addExtremesToResult(const Block & extremes)
@@ -1384,13 +1391,13 @@ namespace
             return;
 
         WriteBufferFromString buf{*result.mutable_extremes()};
-        auto stream = query_context->getOutputStream(output_format, buf, extremes);
-        stream->writePrefix();
-        stream->write(extremes);
-        stream->writeSuffix();
+        auto format = query_context->getOutputFormat(output_format, buf, extremes);
+        format->doWritePrefix();
+        format->write(materializeBlock(extremes));
+        format->doWriteSuffix();
     }
 
-    void Call::addProfileInfoToResult(const BlockStreamProfileInfo & info)
+    void Call::addProfileInfoToResult(const ProfileInfo & info)
     {
         auto & stats = *result.mutable_stats();
         stats.set_rows(info.rows);
diff --git a/src/Server/GRPCServer.h b/src/Server/GRPCServer.h
index ef86b902b5a..25c3813c11d 100644
--- a/src/Server/GRPCServer.h
+++ b/src/Server/GRPCServer.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_GRPC
 #include <Poco/Net/SocketAddress.h>
diff --git a/src/Server/HTTP/HTTPServer.h b/src/Server/HTTP/HTTPServer.h
index d95bdff0baa..3518fd66d20 100644
--- a/src/Server/HTTP/HTTPServer.h
+++ b/src/Server/HTTP/HTTPServer.h
@@ -5,7 +5,7 @@
 #include <Poco/Net/HTTPServerParams.h>
 #include <Poco/Net/TCPServer.h>
 
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Server/HTTP/HTTPServerConnection.cpp b/src/Server/HTTP/HTTPServerConnection.cpp
index 19985949005..de81da20ead 100644
--- a/src/Server/HTTP/HTTPServerConnection.cpp
+++ b/src/Server/HTTP/HTTPServerConnection.cpp
@@ -31,6 +31,16 @@ void HTTPServerConnection::run()
                 HTTPServerRequest request(context, response, session);
 
                 Poco::Timestamp now;
+
+                if (request.isSecure())
+                {
+                    size_t hsts_max_age = context->getSettings().hsts_max_age.value;
+
+                    if (hsts_max_age > 0)
+                        response.add("Strict-Transport-Security", "max-age=" + std::to_string(hsts_max_age));
+
+                }
+
                 response.setDate(now);
                 response.setVersion(request.getVersion());
                 response.setKeepAlive(params->getKeepAlive() && request.getKeepAlive() && session.canKeepAlive());
diff --git a/src/Server/HTTP/HTTPServerRequest.cpp b/src/Server/HTTP/HTTPServerRequest.cpp
index 788c13557f3..f9ef14765c9 100644
--- a/src/Server/HTTP/HTTPServerRequest.cpp
+++ b/src/Server/HTTP/HTTPServerRequest.cpp
@@ -26,6 +26,7 @@ HTTPServerRequest::HTTPServerRequest(ContextPtr context, HTTPServerResponse & re
     /// Now that we know socket is still connected, obtain addresses
     client_address = session.clientAddress();
     server_address = session.serverAddress();
+    secure = session.socket().secure();
 
     auto receive_timeout = context->getSettingsRef().http_receive_timeout;
     auto send_timeout = context->getSettingsRef().http_send_timeout;
diff --git a/src/Server/HTTP/HTTPServerRequest.h b/src/Server/HTTP/HTTPServerRequest.h
index 9e33e78a424..33463177743 100644
--- a/src/Server/HTTP/HTTPServerRequest.h
+++ b/src/Server/HTTP/HTTPServerRequest.h
@@ -30,6 +30,8 @@ public:
 
     bool checkPeerConnected() const;
 
+    bool isSecure() const { return secure; }
+
     /// Returns the client's address.
     const Poco::Net::SocketAddress & clientAddress() const { return client_address; }
 
@@ -54,6 +56,8 @@ private:
     Poco::Net::SocketAddress client_address;
     Poco::Net::SocketAddress server_address;
 
+    bool secure;
+
     void readRequest(ReadBuffer & in);
 };
 
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
index a4fe3649e6f..8d51b30138c 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
@@ -8,9 +8,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/MemoryTracker.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #include <Poco/Version.h>
 
@@ -87,9 +85,14 @@ void WriteBufferFromHTTPServerResponse::finishSendHeaders()
 
 void WriteBufferFromHTTPServerResponse::nextImpl()
 {
+    if (!initialized)
     {
         std::lock_guard lock(mutex);
 
+        /// Initialize as early as possible since if the code throws,
+        /// next() should not be called anymore.
+        initialized = true;
+
         startSendHeaders();
 
         if (!out && !is_http_method_head)
@@ -174,6 +177,8 @@ void WriteBufferFromHTTPServerResponse::finalize()
         if (out)
             out->finalize();
         out.reset();
+        /// Catch write-after-finalize bugs.
+        set(nullptr, 0);
     }
     catch (...)
     {
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
index b4ff454195f..665c2daebbd 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.h
@@ -46,6 +46,7 @@ private:
     std::shared_ptr<std::ostream> response_header_ostr;
 
     std::unique_ptr<WriteBuffer> out;
+    bool initialized = false;
 
     bool headers_started_sending = false;
     bool headers_finished_sending = false;    /// If true, you could not add any headers.
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index 8e0bed4b4c2..b2a00055532 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -13,7 +13,6 @@
 #include <IO/ReadBufferFromIStream.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromFile.h>
-#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteBufferFromTemporaryFile.h>
 #include <IO/WriteHelpers.h>
@@ -21,20 +20,22 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/QueryParameterVisitor.h>
 #include <Interpreters/executeQuery.h>
+#include <Interpreters/Session.h>
 #include <Server/HTTPHandlerFactory.h>
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Server/IServer.h>
+#include <base/logger_useful.h>
 #include <Common/SettingsChanges.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
-#include <common/getFQDNOrHostName.h>
-#include <common/scope_guard.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <base/getFQDNOrHostName.h>
+#include <base/scope_guard.h>
+#include <Server/HTTP/HTTPResponse.h>
+
+#include <Common/config.h>
 
 #include <Poco/Base64Decoder.h>
 #include <Poco/Base64Encoder.h>
@@ -107,6 +108,45 @@ namespace ErrorCodes
     extern const int HTTP_LENGTH_REQUIRED;
 }
 
+namespace
+{
+bool tryAddHeadersFromConfig(HTTPServerResponse & response, const Poco::Util::LayeredConfiguration & config)
+{
+    if (config.has("http_options_response"))
+    {
+        Strings config_keys;
+        config.keys("http_options_response", config_keys);
+        for (const std::string & config_key : config_keys)
+        {
+            if (config_key == "header" || config_key.starts_with("header["))
+            {
+                /// If there is empty header name, it will not be processed and message about it will be in logs
+                if (config.getString("http_options_response." + config_key + ".name", "").empty())
+                    LOG_WARNING(&Poco::Logger::get("processOptionsRequest"), "Empty header was found in config. It will not be processed.");
+                else
+                    response.add(config.getString("http_options_response." + config_key + ".name", ""),
+                                    config.getString("http_options_response." + config_key + ".value", ""));
+
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
+/// Process options request. Useful for CORS.
+void processOptionsRequest(HTTPServerResponse & response, const Poco::Util::LayeredConfiguration & config)
+{
+    /// If can add some headers from config
+    if (tryAddHeadersFromConfig(response, config))
+    {
+        response.setKeepAlive(false);
+        response.setStatusAndReason(HTTPResponse::HTTP_NO_CONTENT);
+        response.send();
+    }
+}
+}
+
 static String base64Decode(const String & encoded)
 {
     String decoded;
@@ -224,8 +264,7 @@ static std::chrono::steady_clock::duration parseSessionTimeout(
 void HTTPHandler::pushDelayedResults(Output & used_output)
 {
     std::vector<WriteBufferPtr> write_buffers;
-    std::vector<ReadBufferPtr> read_buffers;
-    std::vector<ReadBuffer *> read_buffers_raw_ptr;
+    ConcatReadBuffer::Buffers read_buffers;
 
     auto * cascade_buffer = typeid_cast<CascadeWriteBuffer *>(used_output.out_maybe_delayed_and_compressed.get());
     if (!cascade_buffer)
@@ -245,14 +284,13 @@ void HTTPHandler::pushDelayedResults(Output & used_output)
             && (write_buf_concrete = dynamic_cast<IReadableWriteBuffer *>(write_buf.get()))
             && (reread_buf = write_buf_concrete->tryGetReadBuffer()))
         {
-            read_buffers.emplace_back(reread_buf);
-            read_buffers_raw_ptr.emplace_back(reread_buf.get());
+            read_buffers.emplace_back(wrapReadBufferPointer(reread_buf));
         }
     }
 
-    if (!read_buffers_raw_ptr.empty())
+    if (!read_buffers.empty())
     {
-        ConcatReadBuffer concat_read_buffer(read_buffers_raw_ptr);
+        ConcatReadBuffer concat_read_buffer(std::move(read_buffers));
         copyData(concat_read_buffer, *used_output.out_maybe_compressed);
     }
 }
@@ -261,6 +299,7 @@ void HTTPHandler::pushDelayedResults(Output & used_output)
 HTTPHandler::HTTPHandler(IServer & server_, const std::string & name)
     : server(server_)
     , log(&Poco::Logger::get(name))
+    , default_settings(server.context()->getSettingsRef())
 {
     server_display_name = server.config().getString("display_name", getFQDNOrHostName());
 }
@@ -268,14 +307,10 @@ HTTPHandler::HTTPHandler(IServer & server_, const std::string & name)
 
 /// We need d-tor to be present in this translation unit to make it play well with some
 /// forward decls in the header. Other than that, the default d-tor would be OK.
-HTTPHandler::~HTTPHandler()
-{
-    (void)this;
-}
+HTTPHandler::~HTTPHandler() = default;
 
 
 bool HTTPHandler::authenticateUser(
-    ContextMutablePtr context,
     HTTPServerRequest & request,
     HTMLForm & params,
     HTTPServerResponse & response)
@@ -352,7 +387,7 @@ bool HTTPHandler::authenticateUser(
     else
     {
         if (!request_credentials)
-            request_credentials = request_context->makeGSSAcceptorContext();
+            request_credentials = server.context()->makeGSSAcceptorContext();
 
         auto * gss_acceptor_context = dynamic_cast<GSSAcceptorContext *>(request_credentials.get());
         if (!gss_acceptor_context)
@@ -378,10 +413,7 @@ bool HTTPHandler::authenticateUser(
     }
 
     /// Set client info. It will be used for quota accounting parameters in 'setUser' method.
-
-    ClientInfo & client_info = context->getClientInfo();
-    client_info.query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
-    client_info.interface = ClientInfo::Interface::HTTP;
+    ClientInfo & client_info = session->getClientInfo();
 
     ClientInfo::HTTPMethod http_method = ClientInfo::HTTPMethod::UNKNOWN;
     if (request.getMethod() == HTTPServerRequest::HTTP_GET)
@@ -393,10 +425,11 @@ bool HTTPHandler::authenticateUser(
     client_info.http_user_agent = request.get("User-Agent", "");
     client_info.http_referer = request.get("Referer", "");
     client_info.forwarded_for = request.get("X-Forwarded-For", "");
+    client_info.quota_key = quota_key;
 
     try
     {
-        context->setUser(*request_credentials, request.clientAddress());
+        session->authenticate(*request_credentials, request.clientAddress());
     }
     catch (const Authentication::Require<BasicCredentials> & required_credentials)
     {
@@ -413,7 +446,7 @@ bool HTTPHandler::authenticateUser(
     }
     catch (const Authentication::Require<GSSAcceptorContext> & required_credentials)
     {
-        request_credentials = request_context->makeGSSAcceptorContext();
+        request_credentials = server.context()->makeGSSAcceptorContext();
 
         if (required_credentials.getRealm().empty())
             response.set("WWW-Authenticate", "Negotiate");
@@ -426,20 +459,11 @@ bool HTTPHandler::authenticateUser(
     }
 
     request_credentials.reset();
-
-    if (!quota_key.empty())
-        context->setQuotaKey(quota_key);
-
-    /// Query sent through HTTP interface is initial.
-    client_info.initial_user = client_info.current_user;
-    client_info.initial_address = client_info.current_address;
-
     return true;
 }
 
 
 void HTTPHandler::processQuery(
-    ContextMutablePtr context,
     HTTPServerRequest & request,
     HTMLForm & params,
     HTTPServerResponse & response,
@@ -450,13 +474,11 @@ void HTTPHandler::processQuery(
 
     LOG_TRACE(log, "Request URI: {}", request.getURI());
 
-    if (!authenticateUser(context, request, params, response))
+    if (!authenticateUser(request, params, response))
         return; // '401 Unauthorized' response with 'Negotiate' has been sent at this point.
 
     /// The user could specify session identifier and session timeout.
     /// It allows to modify settings, create temporary tables and reuse them in subsequent requests.
-
-    std::shared_ptr<NamedSession> session;
     String session_id;
     std::chrono::steady_clock::duration session_timeout;
     bool session_is_set = params.has("session_id");
@@ -467,43 +489,26 @@ void HTTPHandler::processQuery(
         session_id = params.get("session_id");
         session_timeout = parseSessionTimeout(config, params);
         std::string session_check = params.get("session_check", "");
-
-        session = context->acquireNamedSession(session_id, session_timeout, session_check == "1");
-
-        context->copyFrom(session->context);  /// FIXME: maybe move this part to HandleRequest(), copyFrom() is used only here.
-        context->setSessionContext(session->context);
+        session->makeSessionContext(session_id, session_timeout, session_check == "1");
     }
 
-    SCOPE_EXIT({
-        if (session)
-            session->release();
-    });
-
     // Parse the OpenTelemetry traceparent header.
-    // Disable in Arcadia -- it interferes with the
-    // test_clickhouse.TestTracing.test_tracing_via_http_proxy[traceparent] test.
-#if !defined(ARCADIA_BUILD)
+    ClientInfo client_info = session->getClientInfo();
     if (request.has("traceparent"))
     {
         std::string opentelemetry_traceparent = request.get("traceparent");
         std::string error;
-        if (!context->getClientInfo().client_trace_context.parseTraceparentHeader(
+        if (!client_info.client_trace_context.parseTraceparentHeader(
             opentelemetry_traceparent, error))
         {
             throw Exception(ErrorCodes::BAD_REQUEST_PARAMETER,
                 "Failed to parse OpenTelemetry traceparent header '{}': {}",
                 opentelemetry_traceparent, error);
         }
-
-        context->getClientInfo().client_trace_context.tracestate = request.get("tracestate", "");
+        client_info.client_trace_context.tracestate = request.get("tracestate", "");
     }
-#endif
 
-    // Set the query id supplied by the user, if any, and also update the OpenTelemetry fields.
-    context->setCurrentQueryId(params.get("query_id", request.get("X-ClickHouse-Query-Id", "")));
-
-    ClientInfo & client_info = context->getClientInfo();
-    client_info.initial_query_id = client_info.current_query_id;
+    auto context = session->makeQueryContext(std::move(client_info));
 
     /// The client can pass a HTTP header indicating supported compression method (gzip or deflate).
     String http_response_compression_methods = request.get("Accept-Encoding", "");
@@ -568,7 +573,7 @@ void HTTPHandler::processQuery(
 
         if (buffer_until_eof)
         {
-            const std::string tmp_path(context->getTemporaryVolume()->getDisk()->getPath());
+            const std::string tmp_path(server.context()->getTemporaryVolume()->getDisk()->getPath());
             const std::string tmp_path_template(tmp_path + "http_buffers/");
 
             auto create_tmp_disk_buffer = [tmp_path_template] (const WriteBufferPtr &)
@@ -714,6 +719,9 @@ void HTTPHandler::processQuery(
     context->checkSettingsConstraints(settings_changes);
     context->applySettingsChanges(settings_changes);
 
+    // Set the query id supplied by the user, if any, and also update the OpenTelemetry fields.
+    context->setCurrentQueryId(params.get("query_id", request.get("X-ClickHouse-Query-Id", "")));
+
     const auto & query = getQuery(request, params, context);
     std::unique_ptr<ReadBuffer> in_param = std::make_unique<ReadBufferFromString>(query);
     in = has_external_data ? std::move(in_param) : std::make_unique<ConcatReadBuffer>(*in_param, *in_post_maybe_compressed);
@@ -731,11 +739,18 @@ void HTTPHandler::processQuery(
     if (in_post_compressed && settings.http_native_compression_disable_checksumming_on_decompress)
         static_cast<CompressedReadBuffer &>(*in_post_maybe_compressed).disableChecksumming();
 
-    /// Add CORS header if 'add_http_cors_header' setting is turned on and the client passed
-    /// Origin header.
-    used_output.out->addHeaderCORS(settings.add_http_cors_header && !request.get("Origin", "").empty());
+    /// Add CORS header if 'add_http_cors_header' setting is turned on send * in Access-Control-Allow-Origin,
+    /// or if config has http_options_response, which means that there
+    /// are some headers to be sent, and the client passed Origin header.
+    if (!request.get("Origin", "").empty())
+    {
+        if (config.has("http_options_response"))
+            tryAddHeadersFromConfig(response, config);
+        else if (settings.add_http_cors_header)
+            used_output.out->addHeaderCORS(true);
+    }
 
-    auto append_callback = [context] (ProgressCallback callback)
+    auto append_callback = [context = context] (ProgressCallback callback)
     {
         auto prev = context->getProgressCallback();
 
@@ -754,7 +769,7 @@ void HTTPHandler::processQuery(
 
     if (settings.readonly > 0 && settings.cancel_http_readonly_queries_on_client_close)
     {
-        append_callback([context, &request](const Progress &)
+        append_callback([context = context, &request](const Progress &)
         {
             /// Assume that at the point this method is called no one is reading data from the socket any more:
             /// should be true for read-only queries.
@@ -783,78 +798,85 @@ void HTTPHandler::processQuery(
         pushDelayedResults(used_output);
     }
 
-    /// Send HTTP headers with code 200 if no exception happened and the data is still not sent to
-    /// the client.
-    used_output.out->finalize();
+    /// Send HTTP headers with code 200 if no exception happened and the data is still not sent to the client.
+    used_output.finalize();
 }
 
 void HTTPHandler::trySendExceptionToClient(
     const std::string & s, int exception_code, HTTPServerRequest & request, HTTPServerResponse & response, Output & used_output)
+try
 {
+    response.set("X-ClickHouse-Exception-Code", toString<int>(exception_code));
+
+    /// FIXME: make sure that no one else is reading from the same stream at the moment.
+
+    /// If HTTP method is POST and Keep-Alive is turned on, we should read the whole request body
+    /// to avoid reading part of the current request body in the next request.
+    if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST
+        && response.getKeepAlive()
+        && exception_code != ErrorCodes::HTTP_LENGTH_REQUIRED
+        && !request.getStream().eof())
+    {
+        request.getStream().ignoreAll();
+    }
+
+    if (exception_code == ErrorCodes::REQUIRED_PASSWORD)
+    {
+        response.requireAuthentication("ClickHouse server HTTP API");
+    }
+    else
+    {
+        response.setStatusAndReason(exceptionCodeToHTTPStatus(exception_code));
+    }
+
+    if (!response.sent() && !used_output.out_maybe_compressed)
+    {
+        /// If nothing was sent yet and we don't even know if we must compress the response.
+        *response.send() << s << std::endl;
+    }
+    else if (used_output.out_maybe_compressed)
+    {
+        /// Destroy CascadeBuffer to actualize buffers' positions and reset extra references
+        if (used_output.hasDelayed())
+            used_output.out_maybe_delayed_and_compressed.reset();
+
+        /// Send the error message into already used (and possibly compressed) stream.
+        /// Note that the error message will possibly be sent after some data.
+        /// Also HTTP code 200 could have already been sent.
+
+        /// If buffer has data, and that data wasn't sent yet, then no need to send that data
+        bool data_sent = used_output.out->count() != used_output.out->offset();
+
+        if (!data_sent)
+        {
+            used_output.out_maybe_compressed->position() = used_output.out_maybe_compressed->buffer().begin();
+            used_output.out->position() = used_output.out->buffer().begin();
+        }
+
+        writeString(s, *used_output.out_maybe_compressed);
+        writeChar('\n', *used_output.out_maybe_compressed);
+
+        used_output.out_maybe_compressed->next();
+    }
+    else
+    {
+        assert(false);
+        __builtin_unreachable();
+    }
+
+    used_output.finalize();
+}
+catch (...)
+{
+    tryLogCurrentException(log, "Cannot send exception to client");
+
     try
     {
-        response.set("X-ClickHouse-Exception-Code", toString<int>(exception_code));
-
-        /// FIXME: make sure that no one else is reading from the same stream at the moment.
-
-        /// If HTTP method is POST and Keep-Alive is turned on, we should read the whole request body
-        /// to avoid reading part of the current request body in the next request.
-        if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST
-            && response.getKeepAlive()
-            && exception_code != ErrorCodes::HTTP_LENGTH_REQUIRED
-            && !request.getStream().eof())
-        {
-            request.getStream().ignoreAll();
-        }
-
-        if (exception_code == ErrorCodes::REQUIRED_PASSWORD)
-        {
-            response.requireAuthentication("ClickHouse server HTTP API");
-        }
-        else
-        {
-            response.setStatusAndReason(exceptionCodeToHTTPStatus(exception_code));
-        }
-
-        if (!response.sent() && !used_output.out_maybe_compressed)
-        {
-            /// If nothing was sent yet and we don't even know if we must compress the response.
-            *response.send() << s << std::endl;
-        }
-        else if (used_output.out_maybe_compressed)
-        {
-            /// Destroy CascadeBuffer to actualize buffers' positions and reset extra references
-            if (used_output.hasDelayed())
-                used_output.out_maybe_delayed_and_compressed.reset();
-
-            /// Send the error message into already used (and possibly compressed) stream.
-            /// Note that the error message will possibly be sent after some data.
-            /// Also HTTP code 200 could have already been sent.
-
-            /// If buffer has data, and that data wasn't sent yet, then no need to send that data
-            bool data_sent = used_output.out->count() != used_output.out->offset();
-
-            if (!data_sent)
-            {
-                used_output.out_maybe_compressed->position() = used_output.out_maybe_compressed->buffer().begin();
-                used_output.out->position() = used_output.out->buffer().begin();
-            }
-
-            writeString(s, *used_output.out_maybe_compressed);
-            writeChar('\n', *used_output.out_maybe_compressed);
-
-            used_output.out_maybe_compressed->next();
-            used_output.out->finalize();
-        }
-        else
-        {
-            assert(false);
-            __builtin_unreachable();
-        }
+        used_output.finalize();
     }
     catch (...)
     {
-        tryLogCurrentException(log, "Cannot send exception to client");
+        tryLogCurrentException(log, "Cannot flush data to client (after sending exception)");
     }
 }
 
@@ -864,23 +886,10 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
     setThreadName("HTTPHandler");
     ThreadStatus thread_status;
 
-    SCOPE_EXIT({
-        // If there is no request_credentials instance waiting for the next round, then the request is processed,
-        // so no need to preserve request_context either.
-        // Needs to be performed with respect to the other destructors in the scope though.
-        if (!request_credentials)
-            request_context.reset();
-    });
-
-    if (!request_context)
-    {
-        // Context should be initialized before anything, for correct memory accounting.
-        request_context = Context::createCopy(server.context());
-        request_credentials.reset();
-    }
-
-    /// Cannot be set here, since query_id is unknown.
+    session = std::make_unique<Session>(server.context(), ClientInfo::Interface::HTTP);
+    SCOPE_EXIT({ session.reset(); });
     std::optional<CurrentThread::QueryScope> query_scope;
+
     Output used_output;
 
     /// In case of exception, send stack trace to client.
@@ -888,13 +897,18 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
 
     try
     {
+        if (request.getMethod() == HTTPServerRequest::HTTP_OPTIONS)
+        {
+            processOptionsRequest(response, server.config());
+            return;
+        }
         response.setContentType("text/plain; charset=UTF-8");
         response.set("X-ClickHouse-Server-Display-Name", server_display_name);
         /// For keep-alive to work.
         if (request.getVersion() == HTTPServerRequest::HTTP_1_1)
             response.setChunkedTransferEncoding(true);
 
-        HTMLForm params(request_context->getSettingsRef(), request);
+        HTMLForm params(default_settings, request);
         with_stacktrace = params.getParsed<bool>("stacktrace", false);
 
         /// FIXME: maybe this check is already unnecessary.
@@ -906,7 +920,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
                 ErrorCodes::HTTP_LENGTH_REQUIRED);
         }
 
-        processQuery(request_context, request, params, response, used_output, query_scope);
+        processQuery(request, params, response, used_output, query_scope);
         LOG_DEBUG(log, (request_credentials ? "Authentication in progress..." : "Done processing query"));
     }
     catch (...)
@@ -926,8 +940,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         trySendExceptionToClient(exception_message, exception_code, request, response, used_output);
     }
 
-    if (used_output.out)
-        used_output.out->finalize();
+    used_output.finalize();
 }
 
 DynamicQueryHandler::DynamicQueryHandler(IServer & server_, const std::string & param_name_)
@@ -944,7 +957,9 @@ bool DynamicQueryHandler::customizeQueryParam(ContextMutablePtr context, const s
     {
         /// Save name and values of substitution in dictionary.
         const String parameter_name = key.substr(strlen("param_"));
-        context->setQueryParameter(parameter_name, value);
+
+        if (!context->getQueryParameters().contains(parameter_name))
+            context->setQueryParameter(parameter_name, value);
         return true;
     }
 
@@ -970,8 +985,16 @@ std::string DynamicQueryHandler::getQuery(HTTPServerRequest & request, HTMLForm
     std::string full_query;
     /// Params are of both form params POST and uri (GET params)
     for (const auto & it : params)
+    {
         if (it.first == param_name)
+        {
             full_query += it.second;
+        }
+        else
+        {
+            customizeQueryParam(context, it.first, it.second);
+        }
+    }
 
     return full_query;
 }
diff --git a/src/Server/HTTPHandler.h b/src/Server/HTTPHandler.h
index 2149a7ca55c..57e24138d86 100644
--- a/src/Server/HTTPHandler.h
+++ b/src/Server/HTTPHandler.h
@@ -3,6 +3,7 @@
 #include <Core/Names.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
+#include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/CurrentThread.h>
 
@@ -18,8 +19,10 @@ namespace Poco { class Logger; }
 namespace DB
 {
 
+class Session;
 class Credentials;
 class IServer;
+struct Settings;
 class WriteBufferFromHTTPServerResponse;
 
 using CompiledRegexPtr = std::shared_ptr<const re2::RE2>;
@@ -61,6 +64,16 @@ private:
         {
             return out_maybe_delayed_and_compressed != out_maybe_compressed;
         }
+
+        inline void finalize() const
+        {
+            if (out_maybe_delayed_and_compressed)
+                out_maybe_delayed_and_compressed->finalize();
+            if (out_maybe_compressed)
+                out_maybe_compressed->finalize();
+            if (out)
+                out->finalize();
+        }
     };
 
     IServer & server;
@@ -71,25 +84,30 @@ private:
 
     CurrentMetrics::Increment metric_increment{CurrentMetrics::HTTPConnection};
 
-    // The request_context and the request_credentials instances may outlive a single request/response loop.
+    /// Reference to the immutable settings in the global context.
+    /// Those settings are used only to extract a http request's parameters.
+    /// See settings http_max_fields, http_max_field_name_size, http_max_field_value_size in HTMLForm.
+    const Settings & default_settings;
+
+    // session is reset at the end of each request/response.
+    std::unique_ptr<Session> session;
+
+    // The request_credential instance may outlive a single request/response loop.
     // This happens only when the authentication mechanism requires more than a single request/response exchange (e.g., SPNEGO).
-    ContextMutablePtr request_context;
     std::unique_ptr<Credentials> request_credentials;
 
     // Returns true when the user successfully authenticated,
-    //  the request_context instance will be configured accordingly, and the request_credentials instance will be dropped.
+    //  the session instance will be configured accordingly, and the request_credentials instance will be dropped.
     // Returns false when the user is not authenticated yet, and the 'Negotiate' response is sent,
-    //  the request_context and request_credentials instances are preserved.
+    //  the session and request_credentials instances are preserved.
     // Throws an exception if authentication failed.
     bool authenticateUser(
-        ContextMutablePtr context,
         HTTPServerRequest & request,
         HTMLForm & params,
         HTTPServerResponse & response);
 
     /// Also initializes 'used_output'.
     void processQuery(
-        ContextMutablePtr context,
         HTTPServerRequest & request,
         HTMLForm & params,
         HTTPServerResponse & response,
diff --git a/src/Server/HTTPHandlerFactory.cpp b/src/Server/HTTPHandlerFactory.cpp
index 1e3d02b85ab..526b86a5c28 100644
--- a/src/Server/HTTPHandlerFactory.cpp
+++ b/src/Server/HTTPHandlerFactory.cpp
@@ -123,7 +123,7 @@ static inline HTTPRequestHandlerFactoryPtr createInterserverHTTPHandlerFactory(I
     addCommonDefaultHandlersFactory(*factory, server);
 
     auto main_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<InterserverIOHTTPHandler>>(server);
-    main_handler->allowPostAndGetParamsRequest();
+    main_handler->allowPostAndGetParamsAndOptionsRequest();
     factory->addHandler(main_handler);
 
     return factory;
@@ -180,7 +180,7 @@ void addDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer
     addCommonDefaultHandlersFactory(factory, server);
 
     auto query_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<DynamicQueryHandler>>(server, "query");
-    query_handler->allowPostAndGetParamsRequest();
+    query_handler->allowPostAndGetParamsAndOptionsRequest();
     factory.addHandler(query_handler);
 
     /// We check that prometheus handler will be served on current (default) port.
diff --git a/src/Server/HTTPHandlerFactory.h b/src/Server/HTTPHandlerFactory.h
index 6297f988eaa..ef16806dfdc 100644
--- a/src/Server/HTTPHandlerFactory.h
+++ b/src/Server/HTTPHandlerFactory.h
@@ -5,7 +5,7 @@
 #include <Server/HTTP/HTTPRequestHandlerFactory.h>
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Util/LayeredConfiguration.h>
 
@@ -103,12 +103,15 @@ public:
         });
     }
 
-    /// Handle POST or GET with params
-    void allowPostAndGetParamsRequest()
+    /// Handle Post request or (Get or Head) with params or OPTIONS requests
+    void allowPostAndGetParamsAndOptionsRequest()
     {
         addFilter([](const auto & request)
         {
-            return request.getURI().find('?') != std::string::npos
+            return (request.getURI().find('?') != std::string::npos
+                && (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET
+                || request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD))
+                || request.getMethod() == Poco::Net::HTTPRequest::HTTP_OPTIONS
                 || request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST;
         });
     }
diff --git a/src/Server/HTTPHandlerRequestFilter.h b/src/Server/HTTPHandlerRequestFilter.h
index f0474e8b953..078dcb04595 100644
--- a/src/Server/HTTPHandlerRequestFilter.h
+++ b/src/Server/HTTPHandlerRequestFilter.h
@@ -3,8 +3,8 @@
 #include <Server/HTTP/HTTPServerRequest.h>
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <common/StringRef.h>
-#include <common/find_symbols.h>
+#include <base/StringRef.h>
+#include <base/find_symbols.h>
 
 #include <re2/re2.h>
 #include <re2/stringpiece.h>
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index d76361e856e..082f7cc2e33 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -9,7 +9,7 @@
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <Common/setThreadName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/Util/LayeredConfiguration.h>
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 2d5f41fe666..71099c23655 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -11,7 +11,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/NetException.h>
 #include <Common/setThreadName.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <chrono>
 #include <Common/PipeFDs.h>
 #include <Poco/Util/AbstractConfiguration.h>
@@ -192,13 +192,13 @@ struct SocketInterruptablePollWrapper
 KeeperTCPHandler::KeeperTCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
-    , log(&Poco::Logger::get("NuKeeperTCPHandler"))
+    , log(&Poco::Logger::get("KeeperTCPHandler"))
     , global_context(Context::createCopy(server.context()))
-    , keeper_dispatcher(global_context->getKeeperStorageDispatcher())
-    , operation_timeout(0, global_context->getConfigRef().getUInt("test_keeper_server.operation_timeout_ms", Coordination::DEFAULT_OPERATION_TIMEOUT_MS) * 1000)
-    , session_timeout(0, global_context->getConfigRef().getUInt("test_keeper_server.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
+    , keeper_dispatcher(global_context->getKeeperDispatcher())
+    , operation_timeout(0, global_context->getConfigRef().getUInt("keeper_server.operation_timeout_ms", Coordination::DEFAULT_OPERATION_TIMEOUT_MS) * 1000)
+    , session_timeout(0, global_context->getConfigRef().getUInt("keeper_server.session_timeout_ms", Coordination::DEFAULT_SESSION_TIMEOUT_MS) * 1000)
     , poll_wrapper(std::make_unique<SocketInterruptablePollWrapper>(socket_))
-    , responses(std::make_unique<ThreadSafeResponseQueue>())
+    , responses(std::make_unique<ThreadSafeResponseQueue>(std::numeric_limits<size_t>::max()))
 {
 }
 
@@ -286,7 +286,7 @@ void KeeperTCPHandler::runImpl()
         return;
     }
 
-    if (keeper_dispatcher->hasLeader())
+    if (keeper_dispatcher->checkInit() && keeper_dispatcher->hasLeader())
     {
         try
         {
@@ -306,7 +306,8 @@ void KeeperTCPHandler::runImpl()
     }
     else
     {
-        LOG_WARNING(log, "Ignoring user request, because no alive leader exist");
+        String reason = keeper_dispatcher->checkInit() ? "server is not initialized yet" : "no alive leader exists";
+        LOG_WARNING(log, "Ignoring user request, because {}", reason);
         sendHandshake(false);
         return;
     }
@@ -314,7 +315,12 @@ void KeeperTCPHandler::runImpl()
     auto response_fd = poll_wrapper->getResponseFD();
     auto response_callback = [this, response_fd] (const Coordination::ZooKeeperResponsePtr & response)
     {
-        responses->push(response);
+        if (!responses->push(response))
+            throw Exception(ErrorCodes::SYSTEM_ERROR,
+                "Could not push response with xid {} and zxid {}",
+                response->xid,
+                response->zxid);
+
         UInt8 single_byte = 1;
         [[maybe_unused]] int result = write(response_fd, &single_byte, sizeof(single_byte));
     };
diff --git a/src/Server/KeeperTCPHandler.h b/src/Server/KeeperTCPHandler.h
index 76371ed1a0c..9983749f145 100644
--- a/src/Server/KeeperTCPHandler.h
+++ b/src/Server/KeeperTCPHandler.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#    include "config_core.h"
-#endif
+#include <Common/config.h>
+#include "config_core.h"
 
 #if USE_NURAFT
 
@@ -13,10 +11,10 @@
 #include <Interpreters/Context.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
-#include <Coordination/KeeperStorageDispatcher.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Coordination/KeeperDispatcher.h>
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/ReadBufferFromPocoSocket.h>
-#include <Coordination/ThreadSafeQueue.h>
 #include <unordered_map>
 
 namespace DB
@@ -25,7 +23,7 @@ namespace DB
 struct SocketInterruptablePollWrapper;
 using SocketInterruptablePollWrapperPtr = std::unique_ptr<SocketInterruptablePollWrapper>;
 
-using ThreadSafeResponseQueue = ThreadSafeQueue<Coordination::ZooKeeperResponsePtr>;
+using ThreadSafeResponseQueue = ConcurrentBoundedQueue<Coordination::ZooKeeperResponsePtr>;
 
 using ThreadSafeResponseQueuePtr = std::unique_ptr<ThreadSafeResponseQueue>;
 
@@ -38,7 +36,7 @@ private:
     IServer & server;
     Poco::Logger * log;
     ContextPtr global_context;
-    std::shared_ptr<KeeperStorageDispatcher> keeper_dispatcher;
+    std::shared_ptr<KeeperDispatcher> keeper_dispatcher;
     Poco::Timespan operation_timeout;
     Poco::Timespan session_timeout;
     int64_t session_id{-1};
diff --git a/src/Server/KeeperTCPHandlerFactory.h b/src/Server/KeeperTCPHandlerFactory.h
index 132a8b96c23..82ce56804d8 100644
--- a/src/Server/KeeperTCPHandlerFactory.h
+++ b/src/Server/KeeperTCPHandlerFactory.h
@@ -3,7 +3,7 @@
 #include <Server/KeeperTCPHandler.h>
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Net/NetException.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Server/IServer.h>
 #include <string>
 
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index 375f248d939..2ba5359ca31 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -1,16 +1,13 @@
 #include "MySQLHandler.h"
 
 #include <limits>
-#include <common/scope_guard.h>
-#include <Columns/ColumnVector.h>
 #include <Common/NetException.h>
 #include <Common/OpenSSLHelpers.h>
-#include <Core/MySQL/Authentication.h>
 #include <Core/MySQL/PacketsGeneric.h>
 #include <Core/MySQL/PacketsConnection.h>
 #include <Core/MySQL/PacketsProtocolText.h>
 #include <Core/NamesAndTypes.h>
-#include <DataStreams/copyData.h>
+#include <Interpreters/Session.h>
 #include <Interpreters/executeQuery.h>
 #include <IO/copyData.h>
 #include <IO/LimitReadBuffer.h>
@@ -20,18 +17,13 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <Storages/IStorage.h>
-#include <boost/algorithm/string/replace.hpp>
 #include <regex>
-#include <Access/User.h>
-#include <Access/AccessControlManager.h>
 #include <Common/setThreadName.h>
+#include <Core/MySQL/Authentication.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 #if USE_SSL
-#    include <Poco/Crypto/CipherFactory.h>
 #    include <Poco/Crypto/RSAKey.h>
 #    include <Poco/Net/SSLManager.h>
 #    include <Poco/Net/SecureStreamSocket.h>
@@ -57,6 +49,7 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
     extern const int MYSQL_CLIENT_INSUFFICIENT_CAPABILITIES;
     extern const int SUPPORT_IS_DISABLED;
+    extern const int UNSUPPORTED_METHOD;
 }
 
 
@@ -74,7 +67,6 @@ MySQLHandler::MySQLHandler(IServer & server_, const Poco::Net::StreamSocket & so
     , server(server_)
     , log(&Poco::Logger::get("MySQLHandler"))
     , connection_id(connection_id_)
-    , connection_context(Context::createCopy(server.context()))
     , auth_plugin(new MySQLProtocol::Authentication::Native41())
 {
     server_capabilities = CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH | CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_WITH_DB | CLIENT_DEPRECATE_EOF;
@@ -91,11 +83,11 @@ void MySQLHandler::run()
 {
     setThreadName("MySQLHandler");
     ThreadStatus thread_status;
-    connection_context->makeSessionContext();
-    connection_context->getClientInfo().interface = ClientInfo::Interface::MYSQL;
-    connection_context->setDefaultFormat("MySQLWire");
-    connection_context->getClientInfo().connection_id = connection_id;
-    connection_context->getClientInfo().query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
+
+    session = std::make_unique<Session>(server.context(), ClientInfo::Interface::MYSQL);
+    SCOPE_EXIT({ session.reset(); });
+
+    session->getClientInfo().connection_id = connection_id;
 
     in = std::make_shared<ReadBufferFromPocoSocket>(socket());
     out = std::make_shared<WriteBufferFromPocoSocket>(socket());
@@ -129,14 +121,12 @@ void MySQLHandler::run()
 
         authenticate(handshake_response.username, handshake_response.auth_plugin_name, handshake_response.auth_response);
 
-        connection_context->getClientInfo().initial_user = handshake_response.username;
-
         try
         {
+            session->makeSessionContext();
+            session->sessionContext()->setDefaultFormat("MySQLWire");
             if (!handshake_response.database.empty())
-                connection_context->setCurrentDatabase(handshake_response.database);
-            connection_context->setCurrentQueryId(Poco::format("mysql:%lu", connection_id));
-
+                session->sessionContext()->setCurrentDatabase(handshake_response.database);
         }
         catch (const Exception & exc)
         {
@@ -253,15 +243,13 @@ void MySQLHandler::authenticate(const String & user_name, const String & auth_pl
     try
     {
         // For compatibility with JavaScript MySQL client, Native41 authentication plugin is used when possible (if password is specified using double SHA1). Otherwise SHA256 plugin is used.
-        auto user = connection_context->getAccessControlManager().read<User>(user_name);
-        const DB::Authentication::Type user_auth_type = user->authentication.getType();
-        if (user_auth_type == DB::Authentication::SHA256_PASSWORD)
+        if (session->getAuthenticationTypeOrLogInFailure(user_name) == DB::Authentication::SHA256_PASSWORD)
         {
             authPluginSSL();
         }
 
         std::optional<String> auth_response = auth_plugin_name == auth_plugin->getName() ? std::make_optional<String>(initial_auth_response) : std::nullopt;
-        auth_plugin->authenticate(user_name, auth_response, connection_context, packet_endpoint, secure_connection, socket().peerAddress());
+        auth_plugin->authenticate(user_name, *session, auth_response, packet_endpoint, secure_connection, socket().peerAddress());
     }
     catch (const Exception & exc)
     {
@@ -277,7 +265,7 @@ void MySQLHandler::comInitDB(ReadBuffer & payload)
     String database;
     readStringUntilEOF(database, payload);
     LOG_DEBUG(log, "Setting current database to {}", database);
-    connection_context->setCurrentDatabase(database);
+    session->sessionContext()->setCurrentDatabase(database);
     packet_endpoint->sendPacket(OKPacket(0, client_capabilities, 0, 0, 1), true);
 }
 
@@ -285,8 +273,9 @@ void MySQLHandler::comFieldList(ReadBuffer & payload)
 {
     ComFieldList packet;
     packet.readPayloadWithUnpacked(payload);
-    String database = connection_context->getCurrentDatabase();
-    StoragePtr table_ptr = DatabaseCatalog::instance().getTable({database, packet.table}, connection_context);
+    const auto session_context = session->sessionContext();
+    String database = session_context->getCurrentDatabase();
+    StoragePtr table_ptr = DatabaseCatalog::instance().getTable({database, packet.table}, session_context);
     auto metadata_snapshot = table_ptr->getInMemoryMetadataPtr();
     for (const NameAndTypePair & column : metadata_snapshot->getColumns().getAll())
     {
@@ -333,7 +322,9 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
 
         ReadBufferFromString replacement(replacement_query);
 
-        auto query_context = Context::createCopy(connection_context);
+        auto query_context = session->makeQueryContext();
+        query_context->setCurrentQueryId(Poco::format("mysql:%lu", connection_id));
+        CurrentThread::QueryScope query_scope{query_context};
 
         std::atomic<size_t> affected_rows {0};
         auto prev = query_context->getProgressCallback();
@@ -345,15 +336,15 @@ void MySQLHandler::comQuery(ReadBuffer & payload)
             affected_rows += progress.written_rows;
         });
 
-        CurrentThread::QueryScope query_scope{query_context};
-
         FormatSettings format_settings;
         format_settings.mysql_wire.client_capabilities = client_capabilities;
         format_settings.mysql_wire.max_packet_size = max_packet_size;
         format_settings.mysql_wire.sequence_id = &sequence_id;
 
-        auto set_result_details = [&with_output](const String &, const String &, const String &, const String &)
+        auto set_result_details = [&with_output](const String &, const String &, const String &format, const String &)
         {
+            if (format != "MySQLWire")
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "MySQL protocol does not support custom output formats");
             with_output = true;
         };
 
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 96467797105..7ef212bf36e 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/Net/TCPServerConnection.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/CurrentMetrics.h>
 #include <Core/MySQL/Authentication.h>
 #include <Core/MySQL/PacketsGeneric.h>
@@ -9,14 +9,14 @@
 #include <Core/MySQL/PacketsProtocolText.h>
 #include "IServer.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #    include <Poco/Net/SecureStreamSocket.h>
 #endif
 
+#include <memory>
+
 namespace CurrentMetrics
 {
     extern const Metric MySQLConnection;
@@ -61,7 +61,7 @@ protected:
     uint8_t sequence_id = 0;
 
     MySQLProtocol::PacketEndpointPtr packet_endpoint;
-    ContextMutablePtr connection_context;
+    std::unique_ptr<Session> session;
 
     using ReplacementFn = std::function<String(const String & query)>;
     using Replacements = std::unordered_map<std::string, ReplacementFn>;
diff --git a/src/Server/MySQLHandlerFactory.cpp b/src/Server/MySQLHandlerFactory.cpp
index 46db9c8c328..7a0bfd8ab09 100644
--- a/src/Server/MySQLHandlerFactory.cpp
+++ b/src/Server/MySQLHandlerFactory.cpp
@@ -2,8 +2,8 @@
 #include <Common/OpenSSLHelpers.h>
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Util/Application.h>
-#include <common/logger_useful.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/scope_guard.h>
 #include <Server/MySQLHandler.h>
 
 #if USE_SSL
diff --git a/src/Server/MySQLHandlerFactory.h b/src/Server/MySQLHandlerFactory.h
index df7bd794b16..106fdfdf341 100644
--- a/src/Server/MySQLHandlerFactory.h
+++ b/src/Server/MySQLHandlerFactory.h
@@ -5,9 +5,7 @@
 #include <memory>
 #include <Server/IServer.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #if USE_SSL
 #    include <openssl/rsa.h>
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index 1e98ed2e134..fee4ace3452 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -2,15 +2,15 @@
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromPocoSocket.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/executeQuery.h>
 #include "PostgreSQLHandler.h"
 #include <Parsers/parseQuery.h>
 #include <Common/setThreadName.h>
+#include <base/scope_guard.h>
 #include <random>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
 #if USE_SSL
 #   include <Poco/Net/SecureStreamSocket.h>
@@ -33,7 +33,6 @@ PostgreSQLHandler::PostgreSQLHandler(
     std::vector<std::shared_ptr<PostgreSQLProtocol::PGAuthentication::AuthenticationMethod>> & auth_methods_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
-    , connection_context(Context::createCopy(server.context()))
     , ssl_enabled(ssl_enabled_)
     , connection_id(connection_id_)
     , authentication_manager(auth_methods_)
@@ -52,10 +51,9 @@ void PostgreSQLHandler::run()
 {
     setThreadName("PostgresHandler");
     ThreadStatus thread_status;
-    connection_context->makeSessionContext();
-    connection_context->getClientInfo().interface = ClientInfo::Interface::POSTGRESQL;
-    connection_context->setDefaultFormat("PostgreSQLWire");
-    connection_context->getClientInfo().query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
+
+    session = std::make_unique<Session>(server.context(), ClientInfo::Interface::POSTGRESQL);
+    SCOPE_EXIT({ session.reset(); });
 
     try
     {
@@ -123,18 +121,15 @@ bool PostgreSQLHandler::startup()
     }
 
     std::unique_ptr<PostgreSQLProtocol::Messaging::StartupMessage> start_up_msg = receiveStartupMessage(payload_size);
-    authentication_manager.authenticate(start_up_msg->user, connection_context, *message_transport, socket().peerAddress());
-
-    std::random_device rd;
-    std::mt19937 gen(rd());
-    std::uniform_int_distribution<Int32> dis(0, INT32_MAX);
-    secret_key = dis(gen);
+    const auto & user_name = start_up_msg->user;
+    authentication_manager.authenticate(user_name, *session, *message_transport, socket().peerAddress());
 
     try
     {
+        session->makeSessionContext();
+        session->sessionContext()->setDefaultFormat("PostgreSQLWire");
         if (!start_up_msg->database.empty())
-            connection_context->setCurrentDatabase(start_up_msg->database);
-        connection_context->setCurrentQueryId(Poco::format("postgres:%d:%d", connection_id, secret_key));
+            session->sessionContext()->setCurrentDatabase(start_up_msg->database);
     }
     catch (const Exception & exc)
     {
@@ -214,16 +209,15 @@ void PostgreSQLHandler::sendParameterStatusData(PostgreSQLProtocol::Messaging::S
 
 void PostgreSQLHandler::cancelRequest()
 {
-    connection_context->setCurrentQueryId("");
-    connection_context->setDefaultFormat("Null");
-
     std::unique_ptr<PostgreSQLProtocol::Messaging::CancelRequest> msg =
         message_transport->receiveWithPayloadSize<PostgreSQLProtocol::Messaging::CancelRequest>(8);
 
     String query = Poco::format("KILL QUERY WHERE query_id = 'postgres:%d:%d'", msg->process_id, msg->secret_key);
     ReadBufferFromString replacement(query);
 
-    executeQuery(replacement, *out, true, connection_context, {});
+    auto query_context = session->makeQueryContext();
+    query_context->setCurrentQueryId("");
+    executeQuery(replacement, *out, true, query_context, {});
 }
 
 inline std::unique_ptr<PostgreSQLProtocol::Messaging::StartupMessage> PostgreSQLHandler::receiveStartupMessage(int payload_size)
@@ -269,18 +263,25 @@ void PostgreSQLHandler::processQuery()
             return;
         }
 
-        const auto & settings = connection_context->getSettingsRef();
+        const auto & settings = session->sessionContext()->getSettingsRef();
         std::vector<String> queries;
         auto parse_res = splitMultipartQuery(query->query, queries, settings.max_query_size, settings.max_parser_depth);
         if (!parse_res.second)
             throw Exception("Cannot parse and execute the following part of query: " + String(parse_res.first), ErrorCodes::SYNTAX_ERROR);
 
+        std::random_device rd;
+        std::mt19937 gen(rd());
+        std::uniform_int_distribution<Int32> dis(0, INT32_MAX);
+
         for (const auto & spl_query : queries)
         {
-            /// FIXME why do we execute all queries in a single connection context?
-            CurrentThread::QueryScope query_scope{connection_context};
+            secret_key = dis(gen);
+            auto query_context = session->makeQueryContext();
+            query_context->setCurrentQueryId(Poco::format("postgres:%d:%d", connection_id, secret_key));
+
+            CurrentThread::QueryScope query_scope{query_context};
             ReadBufferFromString read_buf(spl_query);
-            executeQuery(read_buf, *out, false, connection_context, {});
+            executeQuery(read_buf, *out, false, query_context, {});
 
             PostgreSQLProtocol::Messaging::CommandComplete::Command command =
                 PostgreSQLProtocol::Messaging::CommandComplete::classifyQuery(spl_query);
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index 9aaad1d7aa7..ca74b78a109 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/src/Server/PostgreSQLHandler.h
@@ -3,7 +3,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Core/PostgreSQLProtocol.h>
 #include <Poco/Net/TCPServerConnection.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "IServer.h"
 
 #if USE_SSL
@@ -18,6 +18,8 @@ namespace CurrentMetrics
 namespace DB
 {
 
+class Session;
+
 /** PostgreSQL wire protocol implementation.
  * For more info see https://www.postgresql.org/docs/current/protocol.html
  */
@@ -37,7 +39,7 @@ private:
     Poco::Logger * log = &Poco::Logger::get("PostgreSQLHandler");
 
     IServer & server;
-    ContextMutablePtr connection_context;
+    std::unique_ptr<Session> session;
     bool ssl_enabled = false;
     Int32 connection_id = 0;
     Int32 secret_key = 0;
diff --git a/src/Server/ProtocolServerAdapter.h b/src/Server/ProtocolServerAdapter.h
index 2e3d67d081f..04c46b53356 100644
--- a/src/Server/ProtocolServerAdapter.h
+++ b/src/Server/ProtocolServerAdapter.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #include <memory>
 #include <string>
diff --git a/src/Server/StaticRequestHandler.h b/src/Server/StaticRequestHandler.h
index 56c7f5a6d44..df9374d4409 100644
--- a/src/Server/StaticRequestHandler.h
+++ b/src/Server/StaticRequestHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Server/HTTP/HTTPRequestHandler.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index 269c33d952e..3c36321b936 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -1,5 +1,12 @@
+#include <algorithm>
 #include <iomanip>
-#include <common/scope_guard.h>
+#include <iterator>
+#include <memory>
+#include <mutex>
+#include <vector>
+#include <string.h>
+#include <base/types.h>
+#include <base/scope_guard.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Common/CurrentThread.h>
@@ -16,32 +23,42 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <IO/copyData.h>
-#include <DataStreams/AsynchronousBlockInputStream.h>
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <DataStreams/PushingToSinkBlockOutputStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/TablesStatus.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Interpreters/OpenTelemetrySpanLog.h>
+#include <Interpreters/Session.h>
+#include <Interpreters/ProfileEventsExt.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
 #include <Storages/StorageS3Cluster.h>
 #include <Core/ExternalTable.h>
+#include <Access/Credentials.h>
 #include <Storages/ColumnDefault.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <Compression/CompressionFactory.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
+#include <Common/CurrentMetrics.h>
+#include <fmt/format.h>
 
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Executors/PushingAsyncPipelineExecutor.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Sinks/SinkToStorage.h>
 
 #include "Core/Protocol.h"
 #include "TCPHandler.h"
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config_version.h>
-#endif
+#include <Common/config_version.h>
 
+namespace CurrentMetrics
+{
+    extern const Metric QueryThread;
+}
 
 namespace DB
 {
@@ -51,7 +68,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int ATTEMPT_TO_READ_AFTER_EOF;
     extern const int CLIENT_HAS_CONNECTED_TO_WRONG_PORT;
-    extern const int UNKNOWN_DATABASE;
     extern const int UNKNOWN_EXCEPTION;
     extern const int UNKNOWN_PACKET_FROM_CLIENT;
     extern const int POCO_EXCEPTION;
@@ -66,11 +82,10 @@ TCPHandler::TCPHandler(IServer & server_, const Poco::Net::StreamSocket & socket
     , server(server_)
     , parse_proxy_protocol(parse_proxy_protocol_)
     , log(&Poco::Logger::get("TCPHandler"))
-    , connection_context(Context::createCopy(server.context()))
-    , query_context(Context::createCopy(server.context()))
     , server_display_name(std::move(server_display_name_))
 {
 }
+
 TCPHandler::~TCPHandler()
 {
     try
@@ -90,16 +105,11 @@ void TCPHandler::runImpl()
     setThreadName("TCPHandler");
     ThreadStatus thread_status;
 
-    connection_context = Context::createCopy(server.context());
-    connection_context->makeSessionContext();
+    session = std::make_unique<Session>(server.context(), ClientInfo::Interface::TCP);
+    extractConnectionSettingsFromContext(server.context());
 
-    /// These timeouts can be changed after receiving query.
-
-    auto global_receive_timeout = connection_context->getSettingsRef().receive_timeout;
-    auto global_send_timeout = connection_context->getSettingsRef().send_timeout;
-
-    socket().setReceiveTimeout(global_receive_timeout);
-    socket().setSendTimeout(global_send_timeout);
+    socket().setReceiveTimeout(receive_timeout);
+    socket().setSendTimeout(send_timeout);
     socket().setNoDelay(true);
 
     in = std::make_shared<ReadBufferFromPocoSocket>(socket());
@@ -119,6 +129,20 @@ void TCPHandler::runImpl()
     try
     {
         receiveHello();
+        sendHello();
+
+        if (!is_interserver_mode) /// In interserver mode queries are executed without a session context.
+        {
+            session->makeSessionContext();
+
+            /// If session created, then settings in session context has been updated.
+            /// So it's better to update the connection settings for flexibility.
+            extractConnectionSettingsFromContext(session->sessionContext());
+
+            /// When connecting, the default database could be specified.
+            if (!default_database.empty())
+                session->sessionContext()->setCurrentDatabase(default_database);
+        }
     }
     catch (const Exception & e) /// Typical for an incorrect username, password, or address.
     {
@@ -137,35 +161,13 @@ void TCPHandler::runImpl()
         try
         {
             /// We try to send error information to the client.
-            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
+            sendException(e, send_exception_with_stack_trace);
         }
         catch (...) {}
 
         throw;
     }
 
-    /// When connecting, the default database can be specified.
-    if (!default_database.empty())
-    {
-        if (!DatabaseCatalog::instance().isDatabaseExist(default_database))
-        {
-            Exception e("Database " + backQuote(default_database) + " doesn't exist", ErrorCodes::UNKNOWN_DATABASE);
-            LOG_ERROR(log, getExceptionMessage(e, true));
-            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
-            return;
-        }
-
-        connection_context->setCurrentDatabase(default_database);
-    }
-
-    Settings connection_settings = connection_context->getSettings();
-    UInt64 idle_connection_timeout = connection_settings.idle_connection_timeout;
-    UInt64 poll_interval = connection_settings.poll_interval;
-
-    sendHello();
-
-    connection_context->setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
-
     while (true)
     {
         /// We are waiting for a packet from the client. Thus, every `poll_interval` seconds check whether we need to shut down.
@@ -186,9 +188,6 @@ void TCPHandler::runImpl()
         if (server.isCancelled() || in->eof())
             break;
 
-        /// Set context of request.
-        query_context = Context::createCopy(connection_context);
-
         Stopwatch watch;
         state.reset();
 
@@ -201,8 +200,6 @@ void TCPHandler::runImpl()
         std::optional<DB::Exception> exception;
         bool network_error = false;
 
-        bool send_exception_with_stack_trace = true;
-
         try
         {
             /// If a user passed query-local timeouts, reset socket to initial state at the end of the query
@@ -215,23 +212,24 @@ void TCPHandler::runImpl()
             if (!receivePacket())
                 continue;
 
-            /** If Query received, then settings in query_context has been updated
-             *  So, update some other connection settings, for flexibility.
-             */
-            {
-                const Settings & settings = query_context->getSettingsRef();
-                idle_connection_timeout = settings.idle_connection_timeout;
-                poll_interval = settings.poll_interval;
-            }
-
             /** If part_uuids got received in previous packet, trying to read again.
               */
-            if (state.empty() && state.part_uuids && !receivePacket())
+            if (state.empty() && state.part_uuids_to_ignore && !receivePacket())
                 continue;
 
             query_scope.emplace(query_context);
 
-            send_exception_with_stack_trace = query_context->getSettingsRef().calculate_text_stack_trace;
+            /// If query received, then settings in query_context has been updated.
+            /// So it's better to update the connection settings for flexibility.
+            extractConnectionSettingsFromContext(query_context);
+
+            /// Sync timeouts on client and server during current query to avoid dangling queries on server
+            /// NOTE: We use send_timeout for the receive timeout and vice versa (change arguments ordering in TimeoutSetter),
+            ///  because send_timeout is client-side setting which has opposite meaning on the server side.
+            /// NOTE: these settings are applied only for current connection (not for distributed tables' connections)
+            state.timeout_setter = std::make_unique<TimeoutSetter>(socket(), receive_timeout, send_timeout);
+
+            std::mutex fatal_error_mutex;
 
             /// Should we send internal logs to client?
             const auto client_logs_level = query_context->getSettingsRef().send_logs_level;
@@ -241,23 +239,30 @@ void TCPHandler::runImpl()
                 state.logs_queue = std::make_shared<InternalTextLogsQueue>();
                 state.logs_queue->max_priority = Poco::Logger::parseLevel(client_logs_level.toString());
                 CurrentThread::attachInternalTextLogsQueue(state.logs_queue, client_logs_level);
-                CurrentThread::setFatalErrorCallback([this]{ sendLogs(); });
+                CurrentThread::setFatalErrorCallback([this, &fatal_error_mutex]
+                {
+                    std::lock_guard lock(fatal_error_mutex);
+                    sendLogs();
+                });
+            }
+            if (client_tcp_protocol_version >= DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS)
+            {
+                state.profile_queue = std::make_shared<InternalProfileEventsQueue>(std::numeric_limits<int>::max());
+                CurrentThread::attachInternalProfileEventsQueue(state.profile_queue);
             }
 
-            query_context->setExternalTablesInitializer([&connection_settings, this] (ContextPtr context)
+            query_context->setExternalTablesInitializer([this] (ContextPtr context)
             {
                 if (context != query_context)
                     throw Exception("Unexpected context in external tables initializer", ErrorCodes::LOGICAL_ERROR);
 
                 /// Get blocks of temporary tables
-                readData(connection_settings);
+                readData();
 
                 /// Reset the input stream, as we received an empty block while receiving external table data.
                 /// So, the stream has been marked as cancelled and we can't read from it anymore.
                 state.block_in.reset();
                 state.maybe_compressed_in.reset(); /// For more accurate accounting by MemoryTracker.
-
-                state.temporary_tables_read = true;
             });
 
             /// Send structure of columns to client for function input()
@@ -281,15 +286,12 @@ void TCPHandler::runImpl()
                 sendData(state.input_header);
             });
 
-            query_context->setInputBlocksReaderCallback([&connection_settings, this] (ContextPtr context) -> Block
+            query_context->setInputBlocksReaderCallback([this] (ContextPtr context) -> Block
             {
                 if (context != query_context)
                     throw Exception("Unexpected context in InputBlocksReader", ErrorCodes::LOGICAL_ERROR);
 
-                size_t poll_interval_ms;
-                int receive_timeout;
-                std::tie(poll_interval_ms, receive_timeout) = getReadTimeouts(connection_settings);
-                if (!readDataNext(poll_interval_ms, receive_timeout))
+                if (!readDataNext())
                 {
                     state.block_in.reset();
                     state.maybe_compressed_in.reset();
@@ -308,30 +310,45 @@ void TCPHandler::runImpl()
                 return receiveReadTaskResponseAssumeLocked();
             });
 
-            bool may_have_embedded_data = client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_CLIENT_SUPPORT_EMBEDDED_DATA;
             /// Processing Query
-            state.io = executeQuery(state.query, query_context, false, state.stage, may_have_embedded_data);
-
-            unknown_packet_in_send_data = query_context->getSettingsRef().unknown_packet_in_send_data;
+            state.io = executeQuery(state.query, query_context, false, state.stage);
 
             after_check_cancelled.restart();
             after_send_progress.restart();
 
-            if (state.io.out)
+            if (state.io.pipeline.pushing())
+            /// FIXME: check explicitly that insert query suggests to receive data via native protocol,
             {
                 state.need_receive_data_for_insert = true;
-                processInsertQuery(connection_settings);
+                processInsertQuery();
             }
-            else if (state.need_receive_data_for_input) // It implies pipeline execution
+            else if (state.io.pipeline.pulling())
             {
-                /// It is special case for input(), all works for reading data from client will be done in callbacks.
-                auto executor = state.io.pipeline.execute();
-                executor->execute(state.io.pipeline.getNumThreads());
-            }
-            else if (state.io.pipeline.initialized())
                 processOrdinaryQueryWithProcessors();
-            else if (state.io.in)
-                processOrdinaryQuery();
+            }
+            else if (state.io.pipeline.completed())
+            {
+                CompletedPipelineExecutor executor(state.io.pipeline);
+                /// Should not check for cancel in case of input.
+                if (!state.need_receive_data_for_input)
+                {
+                    auto callback = [this, &fatal_error_mutex]()
+                    {
+                        std::lock_guard lock(fatal_error_mutex);
+
+                        if (isQueryCancelled())
+                            return true;
+
+                        sendProgress();
+                        sendLogs();
+
+                        return false;
+                    };
+
+                    executor.setCancelCallback(callback, interactive_delay / 1000);
+                }
+                executor.execute();
+            }
 
             state.io.onFinish();
 
@@ -436,16 +453,17 @@ void TCPHandler::runImpl()
 
         try
         {
-            if (exception && !state.temporary_tables_read)
-                query_context->initializeExternalTablesIfSet();
+            /// A query packet is always followed by one or more data packets.
+            /// If some of those data packets are left, try to skip them.
+            if (exception && !state.empty() && !state.read_all_data)
+                skipData();
         }
         catch (...)
         {
             network_error = true;
-            LOG_WARNING(log, "Can't read external tables after query failure.");
+            LOG_WARNING(log, "Can't skip data packets after query failure.");
         }
 
-
         try
         {
             /// QueryState should be cleared before QueryScope, since otherwise
@@ -476,180 +494,150 @@ void TCPHandler::runImpl()
 }
 
 
-bool TCPHandler::readDataNext(size_t poll_interval, time_t receive_timeout)
+void TCPHandler::extractConnectionSettingsFromContext(const ContextPtr & context)
+{
+    const auto & settings = context->getSettingsRef();
+    send_exception_with_stack_trace = settings.calculate_text_stack_trace;
+    send_timeout = settings.send_timeout;
+    receive_timeout = settings.receive_timeout;
+    poll_interval = settings.poll_interval;
+    idle_connection_timeout = settings.idle_connection_timeout;
+    interactive_delay = settings.interactive_delay;
+    sleep_in_send_tables_status = settings.sleep_in_send_tables_status_ms;
+    unknown_packet_in_send_data = settings.unknown_packet_in_send_data;
+    sleep_in_receive_cancel = settings.sleep_in_receive_cancel_ms;
+}
+
+
+bool TCPHandler::readDataNext()
 {
     Stopwatch watch(CLOCK_MONOTONIC_COARSE);
 
+    /// Poll interval should not be greater than receive_timeout
+    constexpr UInt64 min_timeout_ms = 5000; // 5 ms
+    UInt64 timeout_ms = std::max(min_timeout_ms, std::min(poll_interval * 1000000, static_cast<UInt64>(receive_timeout.totalMicroseconds())));
+    bool read_ok = false;
+
     /// We are waiting for a packet from the client. Thus, every `POLL_INTERVAL` seconds check whether we need to shut down.
     while (true)
     {
-        if (static_cast<ReadBufferFromPocoSocket &>(*in).poll(poll_interval))
+        if (static_cast<ReadBufferFromPocoSocket &>(*in).poll(timeout_ms))
+        {
+            /// If client disconnected.
+            if (in->eof())
+            {
+                LOG_INFO(log, "Client has dropped the connection, cancel the query.");
+                state.is_connection_closed = true;
+                break;
+            }
+
+            /// We accept and process data.
+            read_ok = receivePacket();
             break;
+        }
 
         /// Do we need to shut down?
         if (server.isCancelled())
-            return false;
+            break;
 
         /** Have we waited for data for too long?
          *  If we periodically poll, the receive_timeout of the socket itself does not work.
          *  Therefore, an additional check is added.
          */
         Float64 elapsed = watch.elapsedSeconds();
-        if (elapsed > static_cast<Float64>(receive_timeout))
+        if (elapsed > static_cast<Float64>(receive_timeout.totalSeconds()))
         {
             throw Exception(ErrorCodes::SOCKET_TIMEOUT,
                             "Timeout exceeded while receiving data from client. Waited for {} seconds, timeout is {} seconds.",
-                            static_cast<size_t>(elapsed), receive_timeout);
+                            static_cast<size_t>(elapsed), receive_timeout.totalSeconds());
         }
     }
 
-    /// If client disconnected.
-    if (in->eof())
-    {
-        LOG_INFO(log, "Client has dropped the connection, cancel the query.");
-        state.is_connection_closed = true;
-        return false;
-    }
+    if (read_ok)
+        sendLogs();
+    else
+        state.read_all_data = true;
 
-    /// We accept and process data. And if they are over, then we leave.
-    if (!receivePacket())
-        return false;
-
-    sendLogs();
-    return true;
+    return read_ok;
 }
 
 
-std::tuple<size_t, int> TCPHandler::getReadTimeouts(const Settings & connection_settings)
+void TCPHandler::readData()
 {
-    const auto receive_timeout = query_context->getSettingsRef().receive_timeout.value;
-
-    /// Poll interval should not be greater than receive_timeout
-    const size_t default_poll_interval = connection_settings.poll_interval * 1000000;
-    size_t current_poll_interval = static_cast<size_t>(receive_timeout.totalMicroseconds());
-    constexpr size_t min_poll_interval = 5000; // 5 ms
-    size_t poll_interval = std::max(min_poll_interval, std::min(default_poll_interval, current_poll_interval));
-
-    return std::make_tuple(poll_interval, receive_timeout.totalSeconds());
-}
-
-
-void TCPHandler::readData(const Settings & connection_settings)
-{
-    auto [poll_interval, receive_timeout] = getReadTimeouts(connection_settings);
     sendLogs();
 
-    while (readDataNext(poll_interval, receive_timeout))
+    while (readDataNext())
         ;
 }
 
 
-void TCPHandler::processInsertQuery(const Settings & connection_settings)
+void TCPHandler::skipData()
 {
-    /** Made above the rest of the lines, so that in case of `writePrefix` function throws an exception,
-      *  client receive exception before sending data.
-      */
-    state.io.out->writePrefix();
+    state.skipping_data = true;
+    SCOPE_EXIT({ state.skipping_data = false; });
 
-    /// Send ColumnsDescription for insertion table
-    if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_COLUMN_DEFAULTS_METADATA)
-    {
-        const auto & table_id = query_context->getInsertionTable();
-        if (query_context->getSettingsRef().input_format_defaults_for_omitted_fields)
-        {
-            if (!table_id.empty())
-            {
-                auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, query_context);
-                sendTableColumns(storage_ptr->getInMemoryMetadataPtr()->getColumns());
-            }
-        }
-    }
-
-    /// Send block to the client - table structure.
-    sendData(state.io.out->getHeader());
-
-    try
-    {
-        readData(connection_settings);
-    }
-    catch (...)
-    {
-        /// To avoid flushing from the destructor, that may lead to uncaught exception.
-        state.io.out->writeSuffix();
-        throw;
-    }
-    state.io.out->writeSuffix();
+    while (readDataNext())
+        ;
 }
 
 
-void TCPHandler::processOrdinaryQuery()
+void TCPHandler::processInsertQuery()
 {
-    OpenTelemetrySpanHolder span(__PRETTY_FUNCTION__);
+    size_t num_threads = state.io.pipeline.getNumThreads();
 
-    /// Pull query execution result, if exists, and send it to network.
-    if (state.io.in)
+    auto send_table_columns = [&]()
     {
-
-        if (query_context->getSettingsRef().allow_experimental_query_deduplication)
-            sendPartUUIDs();
-
-        /// This allows the client to prepare output format
-        if (Block header = state.io.in->getHeader())
-            sendData(header);
-
-        /// Use of async mode here enables reporting progress and monitoring client cancelling the query
-        AsynchronousBlockInputStream async_in(state.io.in);
-
-        async_in.readPrefix();
-        while (true)
+        /// Send ColumnsDescription for insertion table
+        if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_COLUMN_DEFAULTS_METADATA)
         {
-            if (isQueryCancelled())
+            const auto & table_id = query_context->getInsertionTable();
+            if (query_context->getSettingsRef().input_format_defaults_for_omitted_fields)
             {
-                async_in.cancel(false);
-                break;
-            }
-
-            if (after_send_progress.elapsed() / 1000 >= query_context->getSettingsRef().interactive_delay)
-            {
-                /// Some time passed.
-                after_send_progress.restart();
-                sendProgress();
-            }
-
-            sendLogs();
-
-            if (async_in.poll(query_context->getSettingsRef().interactive_delay / 1000))
-            {
-                const auto block = async_in.read();
-                if (!block)
-                    break;
-
-                if (!state.io.null_format)
-                    sendData(block);
+                if (!table_id.empty())
+                {
+                    auto storage_ptr = DatabaseCatalog::instance().getTable(table_id, query_context);
+                    sendTableColumns(storage_ptr->getInMemoryMetadataPtr()->getColumns());
+                }
             }
         }
-        async_in.readSuffix();
+    };
 
-        /** When the data has run out, we send the profiling data and totals up to the terminating empty block,
-          * so that this information can be used in the suffix output of stream.
-          * If the request has been interrupted, then sendTotals and other methods should not be called,
-          * because we have not read all the data.
-          */
-        if (!isQueryCancelled())
-        {
-            sendTotals(state.io.in->getTotals());
-            sendExtremes(state.io.in->getExtremes());
-            sendProfileInfo(state.io.in->getProfileInfo());
-            sendProgress();
-        }
+    if (num_threads > 1)
+    {
+        PushingAsyncPipelineExecutor executor(state.io.pipeline);
+        /** Made above the rest of the lines, so that in case of `writePrefix` function throws an exception,
+        *  client receive exception before sending data.
+        */
+        executor.start();
 
-        if (state.is_connection_closed)
-            return;
+        send_table_columns();
 
-        sendData({});
+        /// Send block to the client - table structure.
+        sendData(executor.getHeader());
+
+        sendLogs();
+
+        while (readDataNext())
+            executor.push(std::move(state.block_for_insert));
+
+        executor.finish();
     }
+    else
+    {
+        PushingPipelineExecutor executor(state.io.pipeline);
+        executor.start();
 
-    sendProgress();
+        send_table_columns();
+
+        sendData(executor.getHeader());
+
+        sendLogs();
+
+        while (readDataNext())
+            executor.push(std::move(state.block_for_insert));
+
+        executor.finish();
+    }
 }
 
 
@@ -673,7 +661,7 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
         CurrentMetrics::Increment query_thread_metric_increment{CurrentMetrics::QueryThread};
 
         Block block;
-        while (executor.pull(block, query_context->getSettingsRef().interactive_delay / 1000))
+        while (executor.pull(block, interactive_delay / 1000))
         {
             std::lock_guard lock(task_callback_mutex);
 
@@ -684,11 +672,12 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
                 break;
             }
 
-            if (after_send_progress.elapsed() / 1000 >= query_context->getSettingsRef().interactive_delay)
+            if (after_send_progress.elapsed() / 1000 >= interactive_delay)
             {
                 /// Some time passed and there is a progress.
                 after_send_progress.restart();
                 sendProgress();
+                sendProfileEvents();
             }
 
             sendLogs();
@@ -714,6 +703,7 @@ void TCPHandler::processOrdinaryQueryWithProcessors()
             sendProfileInfo(executor.getProfileInfo());
             sendProgress();
             sendLogs();
+            sendProfileEvents();
         }
 
         if (state.is_connection_closed)
@@ -731,11 +721,13 @@ void TCPHandler::processTablesStatusRequest()
     TablesStatusRequest request;
     request.read(*in, client_tcp_protocol_version);
 
+    ContextPtr context_to_resolve_table_names = session->sessionContext() ? session->sessionContext() : server.context();
+
     TablesStatusResponse response;
     for (const QualifiedTableName & table_name: request.tables)
     {
-        auto resolved_id = connection_context->tryResolveStorageID({table_name.database, table_name.table});
-        StoragePtr table = DatabaseCatalog::instance().tryGetTable(resolved_id, connection_context);
+        auto resolved_id = context_to_resolve_table_names->tryResolveStorageID({table_name.database, table_name.table});
+        StoragePtr table = DatabaseCatalog::instance().tryGetTable(resolved_id, context_to_resolve_table_names);
         if (!table)
             continue;
 
@@ -755,11 +747,10 @@ void TCPHandler::processTablesStatusRequest()
     writeVarUInt(Protocol::Server::TablesStatusResponse, *out);
 
     /// For testing hedged requests
-    const Settings & settings = query_context->getSettingsRef();
-    if (settings.sleep_in_send_tables_status_ms.totalMilliseconds())
+    if (sleep_in_send_tables_status.totalMilliseconds())
     {
         out->next();
-        std::chrono::milliseconds ms(settings.sleep_in_send_tables_status_ms.totalMilliseconds());
+        std::chrono::milliseconds ms(sleep_in_send_tables_status.totalMilliseconds());
         std::this_thread::sleep_for(ms);
     }
 
@@ -795,7 +786,7 @@ void TCPHandler::sendReadTaskRequestAssumeLocked()
     out->next();
 }
 
-void TCPHandler::sendProfileInfo(const BlockStreamProfileInfo & info)
+void TCPHandler::sendProfileInfo(const ProfileInfo & info)
 {
     writeVarUInt(Protocol::Server::ProfileInfo, *out);
     info.write(*out);
@@ -835,6 +826,160 @@ void TCPHandler::sendExtremes(const Block & extremes)
 }
 
 
+namespace
+{
+    using namespace ProfileEvents;
+
+    constexpr size_t NAME_COLUMN_INDEX  = 4;
+    constexpr size_t VALUE_COLUMN_INDEX = 5;
+
+    struct ProfileEventsSnapshot
+    {
+        UInt64 thread_id;
+        ProfileEvents::Counters::Snapshot counters;
+        Int64 memory_usage;
+        time_t current_time;
+    };
+
+    /*
+     * Add records about provided non-zero ProfileEvents::Counters.
+     */
+    void dumpProfileEvents(
+        ProfileEventsSnapshot const & snapshot,
+        MutableColumns & columns,
+        String const & host_name)
+    {
+        size_t rows = 0;
+        auto & name_column = columns[NAME_COLUMN_INDEX];
+        auto & value_column = columns[VALUE_COLUMN_INDEX];
+        for (ProfileEvents::Event event = 0; event < ProfileEvents::Counters::num_counters; ++event)
+        {
+            UInt64 value = snapshot.counters[event];
+
+            if (value == 0)
+                continue;
+
+            const char * desc = ProfileEvents::getName(event);
+            name_column->insertData(desc, strlen(desc));
+            value_column->insert(value);
+            rows++;
+        }
+
+        // Fill the rest of the columns with data
+        for (size_t row = 0; row < rows; ++row)
+        {
+            size_t i = 0;
+            columns[i++]->insertData(host_name.data(), host_name.size());
+            columns[i++]->insert(UInt64(snapshot.current_time));
+            columns[i++]->insert(UInt64{snapshot.thread_id});
+            columns[i++]->insert(ProfileEvents::Type::INCREMENT);
+        }
+    }
+
+    void dumpMemoryTracker(
+        ProfileEventsSnapshot const & snapshot,
+        MutableColumns & columns,
+        String const & host_name)
+    {
+        {
+            size_t i = 0;
+            columns[i++]->insertData(host_name.data(), host_name.size());
+            columns[i++]->insert(UInt64(snapshot.current_time));
+            columns[i++]->insert(UInt64{snapshot.thread_id});
+            columns[i++]->insert(ProfileEvents::Type::GAUGE);
+
+            columns[i++]->insertData(MemoryTracker::USAGE_EVENT_NAME, strlen(MemoryTracker::USAGE_EVENT_NAME));
+            columns[i++]->insert(snapshot.memory_usage);
+        }
+    }
+}
+
+
+void TCPHandler::sendProfileEvents()
+{
+    if (client_tcp_protocol_version < DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS)
+        return;
+
+    NamesAndTypesList column_names_and_types = {
+        { "host_name",    std::make_shared<DataTypeString>()   },
+        { "current_time", std::make_shared<DataTypeDateTime>() },
+        { "thread_id",    std::make_shared<DataTypeUInt64>()   },
+        { "type",         ProfileEvents::TypeEnum              },
+        { "name",         std::make_shared<DataTypeString>()   },
+        { "value",        std::make_shared<DataTypeUInt64>()   },
+    };
+
+    ColumnsWithTypeAndName temp_columns;
+    for (auto const & name_and_type : column_names_and_types)
+        temp_columns.emplace_back(name_and_type.type, name_and_type.name);
+
+    Block block(std::move(temp_columns));
+
+    MutableColumns columns = block.mutateColumns();
+    auto thread_group = CurrentThread::getGroup();
+    auto const current_thread_id = CurrentThread::get().thread_id;
+    std::vector<ProfileEventsSnapshot> snapshots;
+    ProfileEventsSnapshot group_snapshot;
+    {
+        std::lock_guard guard(thread_group->mutex);
+        snapshots.reserve(thread_group->threads.size());
+        for (auto * thread : thread_group->threads)
+        {
+            auto const thread_id = thread->thread_id;
+            if (thread_id == current_thread_id)
+                continue;
+            auto current_time = time(nullptr);
+            auto counters = thread->performance_counters.getPartiallyAtomicSnapshot();
+            auto memory_usage = thread->memory_tracker.get();
+            snapshots.push_back(ProfileEventsSnapshot{
+                thread_id,
+                std::move(counters),
+                memory_usage,
+                current_time
+            });
+        }
+
+        group_snapshot.thread_id    = 0;
+        group_snapshot.current_time = time(nullptr);
+        group_snapshot.memory_usage = thread_group->memory_tracker.get();
+        group_snapshot.counters     = thread_group->performance_counters.getPartiallyAtomicSnapshot();
+    }
+
+    for (auto & snapshot : snapshots)
+    {
+        dumpProfileEvents(snapshot, columns, server_display_name);
+        dumpMemoryTracker(snapshot, columns, server_display_name);
+    }
+    dumpProfileEvents(group_snapshot, columns, server_display_name);
+    dumpMemoryTracker(group_snapshot, columns, server_display_name);
+
+    MutableColumns logs_columns;
+    Block curr_block;
+    size_t rows = 0;
+
+    for (; state.profile_queue->tryPop(curr_block); ++rows)
+    {
+        auto curr_columns = curr_block.getColumns();
+        for (size_t j = 0; j < curr_columns.size(); ++j)
+            columns[j]->insertRangeFrom(*curr_columns[j], 0, curr_columns[j]->size());
+    }
+
+    bool empty = columns[0]->empty();
+    if (!empty)
+    {
+        block.setColumns(std::move(columns));
+
+        initProfileEventsBlockOutput(block);
+
+        writeVarUInt(Protocol::Server::ProfileEvents, *out);
+        writeStringBinary("", *out);
+
+        state.profile_events_block_out->write(block);
+        out->next();
+    }
+}
+
+
 bool TCPHandler::receiveProxyHeader()
 {
     if (in->eof())
@@ -902,11 +1047,34 @@ bool TCPHandler::receiveProxyHeader()
     }
 
     LOG_TRACE(log, "Forwarded client address from PROXY header: {}", forwarded_address);
-    connection_context->getClientInfo().forwarded_for = forwarded_address;
+    session->getClientInfo().forwarded_for = forwarded_address;
     return true;
 }
 
 
+namespace
+{
+
+std::string formatHTTPErrorResponseWhenUserIsConnectedToWrongPort(const Poco::Util::AbstractConfiguration& config)
+{
+    std::string result = fmt::format(
+        "HTTP/1.0 400 Bad Request\r\n\r\n"
+        "Port {} is for clickhouse-client program\r\n",
+        config.getString("tcp_port"));
+
+    if (config.has("http_port"))
+    {
+        result += fmt::format(
+            "You must use port {} for HTTP.\r\n",
+            config.getString("http_port"));
+    }
+
+    return result;
+}
+
+}
+
+
 void TCPHandler::receiveHello()
 {
     /// Receive `hello` packet.
@@ -922,11 +1090,7 @@ void TCPHandler::receiveHello()
           */
         if (packet_type == 'G' || packet_type == 'P')
         {
-            writeString("HTTP/1.0 400 Bad Request\r\n\r\n"
-                "Port " + server.config().getString("tcp_port") + " is for clickhouse-client program.\r\n"
-                "You must use port " + server.config().getString("http_port") + " for HTTP.\r\n",
-                *out);
-
+            writeString(formatHTTPErrorResponseWhenUserIsConnectedToWrongPort(server.config()), *out);
             throw Exception("Client has connected to wrong port", ErrorCodes::CLIENT_HAS_CONNECTED_TO_WRONG_PORT);
         }
         else
@@ -953,14 +1117,27 @@ void TCPHandler::receiveHello()
         (!user.empty() ? ", user: " + user : "")
     );
 
-    if (user != USER_INTERSERVER_MARKER)
-    {
-        connection_context->setUser(user, password, socket().peerAddress());
-    }
-    else
+    auto & client_info = session->getClientInfo();
+    client_info.client_name = client_name;
+    client_info.client_version_major = client_version_major;
+    client_info.client_version_minor = client_version_minor;
+    client_info.client_version_patch = client_version_patch;
+    client_info.client_tcp_protocol_version = client_tcp_protocol_version;
+
+    client_info.connection_client_version_major = client_version_major;
+    client_info.connection_client_version_minor = client_version_minor;
+    client_info.connection_client_version_patch = client_version_patch;
+    client_info.connection_tcp_protocol_version = client_tcp_protocol_version;
+
+    is_interserver_mode = (user == USER_INTERSERVER_MARKER);
+    if (is_interserver_mode)
     {
+        client_info.interface = ClientInfo::Interface::TCP_INTERSERVER;
         receiveClusterNameAndSalt();
+        return;
     }
+
+    session->authenticate(user, password, socket().peerAddress());
 }
 
 
@@ -1007,8 +1184,11 @@ bool TCPHandler::receivePacket()
     {
         case Protocol::Client::IgnoredPartUUIDs:
             /// Part uuids packet if any comes before query.
+            if (!state.empty() || state.part_uuids_to_ignore)
+                receiveUnexpectedIgnoredPartUUIDs();
             receiveIgnoredPartUUIDs();
             return true;
+
         case Protocol::Client::Query:
             if (!state.empty())
                 receiveUnexpectedQuery();
@@ -1017,8 +1197,10 @@ bool TCPHandler::receivePacket()
 
         case Protocol::Client::Data:
         case Protocol::Client::Scalar:
+            if (state.skipping_data)
+                return receiveUnexpectedData(false);
             if (state.empty())
-                receiveUnexpectedData();
+                receiveUnexpectedData(true);
             return receiveData(packet_type == Protocol::Client::Scalar);
 
         case Protocol::Client::Ping:
@@ -1029,10 +1211,9 @@ bool TCPHandler::receivePacket()
         case Protocol::Client::Cancel:
         {
             /// For testing connection collector.
-            const Settings & settings = query_context->getSettingsRef();
-            if (settings.sleep_in_receive_cancel_ms.totalMilliseconds())
+            if (sleep_in_receive_cancel.totalMilliseconds())
             {
-                std::chrono::milliseconds ms(settings.sleep_in_receive_cancel_ms.totalMilliseconds());
+                std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
                 std::this_thread::sleep_for(ms);
             }
 
@@ -1054,14 +1235,18 @@ bool TCPHandler::receivePacket()
     }
 }
 
+
 void TCPHandler::receiveIgnoredPartUUIDs()
 {
-    state.part_uuids = true;
-    std::vector<UUID> uuids;
-    readVectorBinary(uuids, *in);
+    readVectorBinary(state.part_uuids_to_ignore.emplace(), *in);
+}
 
-    if (!uuids.empty())
-        query_context->getIgnoredPartUUIDs()->add(uuids);
+
+void TCPHandler::receiveUnexpectedIgnoredPartUUIDs()
+{
+    std::vector<UUID> skip_part_uuids;
+    readVectorBinary(skip_part_uuids, *in);
+    throw NetException("Unexpected packet IgnoredPartUUIDs received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
 }
 
 
@@ -1075,10 +1260,9 @@ String TCPHandler::receiveReadTaskResponseAssumeLocked()
         {
             state.is_cancelled = true;
             /// For testing connection collector.
-            const Settings & settings = query_context->getSettingsRef();
-            if (settings.sleep_in_receive_cancel_ms.totalMilliseconds())
+            if (sleep_in_receive_cancel.totalMilliseconds())
             {
-                std::chrono::milliseconds ms(settings.sleep_in_receive_cancel_ms.totalMilliseconds());
+                std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
                 std::this_thread::sleep_for(ms);
             }
             return {};
@@ -1109,14 +1293,14 @@ void TCPHandler::receiveClusterNameAndSalt()
         if (salt.empty())
             throw NetException("Empty salt is not allowed", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
 
-        cluster_secret = query_context->getCluster(cluster)->getSecret();
+        cluster_secret = server.context()->getCluster(cluster)->getSecret();
     }
     catch (const Exception & e)
     {
         try
         {
             /// We try to send error information to the client.
-            sendException(e, connection_context->getSettingsRef().calculate_text_stack_trace);
+            sendException(e, send_exception_with_stack_trace);
         }
         catch (...) {}
 
@@ -1132,24 +1316,21 @@ void TCPHandler::receiveQuery()
     state.is_empty = false;
     readStringBinary(state.query_id, *in);
 
-    /// Client info
-    ClientInfo & client_info = query_context->getClientInfo();
-    if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_CLIENT_INFO)
-        client_info.read(*in, client_tcp_protocol_version);
-
-    /// For better support of old clients, that does not send ClientInfo.
-    if (client_info.query_kind == ClientInfo::QueryKind::NO_QUERY)
+    /// In interserer mode,
+    /// initial_user can be empty in case of Distributed INSERT via Buffer/Kafka,
+    /// (i.e. when the INSERT is done with the global context w/o user),
+    /// so it is better to reset session to avoid using old user.
+    if (is_interserver_mode)
     {
-        client_info.query_kind = ClientInfo::QueryKind::INITIAL_QUERY;
-        client_info.client_name = client_name;
-        client_info.client_version_major = client_version_major;
-        client_info.client_version_minor = client_version_minor;
-        client_info.client_version_patch = client_version_patch;
-        client_info.client_tcp_protocol_version = client_tcp_protocol_version;
+        ClientInfo original_session_client_info = session->getClientInfo();
+        session = std::make_unique<Session>(server.context(), ClientInfo::Interface::TCP_INTERSERVER);
+        session->getClientInfo() = original_session_client_info;
     }
 
-    /// Set fields, that are known apriori.
-    client_info.interface = ClientInfo::Interface::TCP;
+    /// Read client info.
+    ClientInfo client_info = session->getClientInfo();
+    if (client_tcp_protocol_version >= DBMS_MIN_REVISION_WITH_CLIENT_INFO)
+        client_info.read(*in, client_tcp_protocol_version);
 
     /// Per query settings are also passed via TCP.
     /// We need to check them before applying due to they can violate the settings constraints.
@@ -1171,12 +1352,11 @@ void TCPHandler::receiveQuery()
 
     readVarUInt(compression, *in);
     state.compression = static_cast<Protocol::Compression>(compression);
+    last_block_in.compression = state.compression;
 
     readStringBinary(state.query, *in);
 
-    /// It is OK to check only when query != INITIAL_QUERY,
-    /// since only in that case the actions will be done.
-    if (!cluster.empty() && client_info.query_kind != ClientInfo::QueryKind::INITIAL_QUERY)
+    if (is_interserver_mode)
     {
 #if USE_SSL
         std::string data(salt);
@@ -1194,30 +1374,39 @@ void TCPHandler::receiveQuery()
             throw NetException("Hash mismatch", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
         /// TODO: change error code?
 
-        /// initial_user can be empty in case of Distributed INSERT via Buffer/Kafka,
-        /// i.e. when the INSERT is done with the global context (w/o user).
-        if (!client_info.initial_user.empty())
+        if (client_info.initial_user.empty())
         {
-            query_context->setUserWithoutCheckingPassword(client_info.initial_user, client_info.initial_address);
-            LOG_DEBUG(log, "User (initial): {}", query_context->getUserName());
+            LOG_DEBUG(log, "User (no user, interserver mode)");
+        }
+        else
+        {
+            LOG_DEBUG(log, "User (initial, interserver mode): {}", client_info.initial_user);
+            session->authenticate(AlwaysAllowCredentials{client_info.initial_user}, client_info.initial_address);
         }
-        /// No need to update connection_context, since it does not requires user (it will not be used for query execution)
 #else
         throw Exception(
             "Inter-server secret support is disabled, because ClickHouse was built without SSL library",
             ErrorCodes::SUPPORT_IS_DISABLED);
 #endif
     }
-    else
-    {
-        query_context->setInitialRowPolicy();
-    }
+
+    query_context = session->makeQueryContext(std::move(client_info));
+
+    /// Sets the default database if it wasn't set earlier for the session context.
+    if (!default_database.empty() && !session->sessionContext())
+        query_context->setCurrentDatabase(default_database);
+
+    if (state.part_uuids_to_ignore)
+        query_context->getIgnoredPartUUIDs()->add(*state.part_uuids_to_ignore);
+
+    query_context->setProgressCallback([this] (const Progress & value) { return this->updateProgress(value); });
 
     ///
     /// Settings
     ///
     auto settings_changes = passed_settings.changes();
-    if (client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+    auto query_kind = query_context->getClientInfo().query_kind;
+    if (query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
     {
         /// Throw an exception if the passed settings violate the constraints.
         query_context->checkSettingsConstraints(settings_changes);
@@ -1229,40 +1418,24 @@ void TCPHandler::receiveQuery()
     }
     query_context->applySettingsChanges(settings_changes);
 
+    /// Use the received query id, or generate a random default. It is convenient
+    /// to also generate the default OpenTelemetry trace id at the same time, and
+    /// set the trace parent.
+    /// Notes:
+    /// 1) ClientInfo might contain upstream trace id, so we decide whether to use
+    /// the default ids after we have received the ClientInfo.
+    /// 2) There is the opentelemetry_start_trace_probability setting that
+    /// controls when we start a new trace. It can be changed via Native protocol,
+    /// so we have to apply the changes first.
+    query_context->setCurrentQueryId(state.query_id);
+
     /// Disable function name normalization when it's a secondary query, because queries are either
     /// already normalized on initiator node, or not normalized and should remain unnormalized for
     /// compatibility.
-    if (client_info.query_kind == ClientInfo::QueryKind::SECONDARY_QUERY)
+    if (query_kind == ClientInfo::QueryKind::SECONDARY_QUERY)
     {
-        query_context->setSetting("normalize_function_names", Field(0));
+        query_context->setSetting("normalize_function_names", false);
     }
-
-    // Use the received query id, or generate a random default. It is convenient
-    // to also generate the default OpenTelemetry trace id at the same time, and
-    // set the trace parent.
-    // Why is this done here and not earlier:
-    // 1) ClientInfo might contain upstream trace id, so we decide whether to use
-    // the default ids after we have received the ClientInfo.
-    // 2) There is the opentelemetry_start_trace_probability setting that
-    // controls when we start a new trace. It can be changed via Native protocol,
-    // so we have to apply the changes first.
-    query_context->setCurrentQueryId(state.query_id);
-
-    // Set parameters of initial query.
-    if (client_info.query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
-    {
-        /// 'Current' fields was set at receiveHello.
-        client_info.initial_user = client_info.current_user;
-        client_info.initial_query_id = client_info.current_query_id;
-        client_info.initial_address = client_info.current_address;
-    }
-
-    /// Sync timeouts on client and server during current query to avoid dangling queries on server
-    /// NOTE: We use settings.send_timeout for the receive timeout and vice versa (change arguments ordering in TimeoutSetter),
-    ///  because settings.send_timeout is client-side setting which has opposite meaning on the server side.
-    /// NOTE: these settings are applied only for current connection (not for distributed tables' connections)
-    const Settings & settings = query_context->getSettingsRef();
-    state.timeout_setter = std::make_unique<TimeoutSetter>(socket(), settings.receive_timeout, settings.send_timeout);
 }
 
 void TCPHandler::receiveUnexpectedQuery()
@@ -1287,7 +1460,10 @@ void TCPHandler::receiveUnexpectedQuery()
         readStringBinary(skip_hash, *in, 32);
 
     readVarUInt(skip_uint_64, *in);
+
     readVarUInt(skip_uint_64, *in);
+    last_block_in.compression = static_cast<Protocol::Compression>(skip_uint_64);
+
     readStringBinary(skip_string, *in);
 
     throw NetException("Unexpected packet Query received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
@@ -1304,73 +1480,78 @@ bool TCPHandler::receiveData(bool scalar)
     /// Read one block from the network and write it down
     Block block = state.block_in->read();
 
-    if (block)
+    if (!block)
     {
-        if (scalar)
-        {
-            /// Scalar value
-            query_context->addScalar(temporary_id.table_name, block);
-        }
-        else if (!state.need_receive_data_for_insert && !state.need_receive_data_for_input)
-        {
-            /// Data for external tables
+        state.read_all_data = true;
+        return false;
+    }
 
-            auto resolved = query_context->tryResolveStorageID(temporary_id, Context::ResolveExternal);
-            StoragePtr storage;
-            /// If such a table does not exist, create it.
-            if (resolved)
-            {
-                storage = DatabaseCatalog::instance().getTable(resolved, query_context);
-            }
-            else
-            {
-                NamesAndTypesList columns = block.getNamesAndTypesList();
-                auto temporary_table = TemporaryTableHolder(query_context, ColumnsDescription{columns}, {});
-                storage = temporary_table.getTable();
-                query_context->addExternalTable(temporary_id.table_name, std::move(temporary_table));
-            }
-            auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-            /// The data will be written directly to the table.
-            auto temporary_table_out = std::make_shared<PushingToSinkBlockOutputStream>(storage->write(ASTPtr(), metadata_snapshot, query_context));
-            temporary_table_out->write(block);
-            temporary_table_out->writeSuffix();
+    if (scalar)
+    {
+        /// Scalar value
+        query_context->addScalar(temporary_id.table_name, block);
+    }
+    else if (!state.need_receive_data_for_insert && !state.need_receive_data_for_input)
+    {
+        /// Data for external tables
 
-        }
-        else if (state.need_receive_data_for_input)
+        auto resolved = query_context->tryResolveStorageID(temporary_id, Context::ResolveExternal);
+        StoragePtr storage;
+        /// If such a table does not exist, create it.
+        if (resolved)
         {
-            /// 'input' table function.
-            state.block_for_input = block;
+            storage = DatabaseCatalog::instance().getTable(resolved, query_context);
         }
         else
         {
-            /// INSERT query.
-            state.io.out->write(block);
+            NamesAndTypesList columns = block.getNamesAndTypesList();
+            auto temporary_table = TemporaryTableHolder(query_context, ColumnsDescription{columns}, {});
+            storage = temporary_table.getTable();
+            query_context->addExternalTable(temporary_id.table_name, std::move(temporary_table));
         }
-        return true;
+        auto metadata_snapshot = storage->getInMemoryMetadataPtr();
+        /// The data will be written directly to the table.
+        QueryPipeline temporary_table_out(storage->write(ASTPtr(), metadata_snapshot, query_context));
+        PushingPipelineExecutor executor(temporary_table_out);
+        executor.start();
+        executor.push(block);
+        executor.finish();
+    }
+    else if (state.need_receive_data_for_input)
+    {
+        /// 'input' table function.
+        state.block_for_input = block;
     }
     else
-        return false;
+    {
+        /// INSERT query.
+        state.block_for_insert = block;
+    }
+    return true;
 }
 
-void TCPHandler::receiveUnexpectedData()
+
+bool TCPHandler::receiveUnexpectedData(bool throw_exception)
 {
     String skip_external_table_name;
     readStringBinary(skip_external_table_name, *in);
 
     std::shared_ptr<ReadBuffer> maybe_compressed_in;
-
     if (last_block_in.compression == Protocol::Compression::Enable)
         maybe_compressed_in = std::make_shared<CompressedReadBuffer>(*in, /* allow_different_codecs */ true);
     else
         maybe_compressed_in = in;
 
-    auto skip_block_in = std::make_shared<NativeBlockInputStream>(
-            *maybe_compressed_in,
-            last_block_in.header,
-            client_tcp_protocol_version);
+    auto skip_block_in = std::make_shared<NativeReader>(*maybe_compressed_in, client_tcp_protocol_version);
+    bool read_ok = skip_block_in->read();
 
-    skip_block_in->read();
-    throw NetException("Unexpected packet Data received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
+    if (!read_ok)
+        state.read_all_data = true;
+
+    if (throw_exception)
+        throw NetException("Unexpected packet Data received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
+
+    return read_ok;
 }
 
 void TCPHandler::initBlockInput()
@@ -1386,15 +1567,12 @@ void TCPHandler::initBlockInput()
             state.maybe_compressed_in = in;
 
         Block header;
-        if (state.io.out)
-            header = state.io.out->getHeader();
+        if (state.io.pipeline.pushing())
+            header = state.io.pipeline.getHeader();
         else if (state.need_receive_data_for_input)
             header = state.input_header;
 
-        last_block_in.header = header;
-        last_block_in.compression = state.compression;
-
-        state.block_in = std::make_shared<NativeBlockInputStream>(
+        state.block_in = std::make_unique<NativeReader>(
             *state.maybe_compressed_in,
             header,
             client_tcp_protocol_version);
@@ -1406,10 +1584,9 @@ void TCPHandler::initBlockOutput(const Block & block)
 {
     if (!state.block_out)
     {
+        const Settings & query_settings = query_context->getSettingsRef();
         if (!state.maybe_compressed_out)
         {
-            const Settings & query_settings = query_context->getSettingsRef();
-
             std::string method = Poco::toUpper(query_settings.network_compression_method.toString());
             std::optional<int> level;
             if (method == "ZSTD")
@@ -1426,11 +1603,11 @@ void TCPHandler::initBlockOutput(const Block & block)
                 state.maybe_compressed_out = out;
         }
 
-        state.block_out = std::make_shared<NativeBlockOutputStream>(
+        state.block_out = std::make_unique<NativeWriter>(
             *state.maybe_compressed_out,
             client_tcp_protocol_version,
             block.cloneEmpty(),
-            !connection_context->getSettingsRef().low_cardinality_allow_in_native_format);
+            !query_settings.low_cardinality_allow_in_native_format);
     }
 }
 
@@ -1439,11 +1616,26 @@ void TCPHandler::initLogsBlockOutput(const Block & block)
     if (!state.logs_block_out)
     {
         /// Use uncompressed stream since log blocks usually contain only one row
-        state.logs_block_out = std::make_shared<NativeBlockOutputStream>(
+        const Settings & query_settings = query_context->getSettingsRef();
+        state.logs_block_out = std::make_unique<NativeWriter>(
             *out,
             client_tcp_protocol_version,
             block.cloneEmpty(),
-            !connection_context->getSettingsRef().low_cardinality_allow_in_native_format);
+            !query_settings.low_cardinality_allow_in_native_format);
+    }
+}
+
+
+void TCPHandler::initProfileEventsBlockOutput(const Block & block)
+{
+    if (!state.profile_events_block_out)
+    {
+        const Settings & query_settings = query_context->getSettingsRef();
+        state.profile_events_block_out = std::make_unique<NativeWriter>(
+            *out,
+            client_tcp_protocol_version,
+            block.cloneEmpty(),
+            !query_settings.low_cardinality_allow_in_native_format);
     }
 }
 
@@ -1453,7 +1645,7 @@ bool TCPHandler::isQueryCancelled()
     if (state.is_cancelled || state.sent_all_data)
         return true;
 
-    if (after_check_cancelled.elapsed() / 1000 < query_context->getSettingsRef().interactive_delay)
+    if (after_check_cancelled.elapsed() / 1000 < interactive_delay)
         return false;
 
     after_check_cancelled.restart();
@@ -1481,10 +1673,9 @@ bool TCPHandler::isQueryCancelled()
                 state.is_cancelled = true;
                 /// For testing connection collector.
                 {
-                    const Settings & settings = query_context->getSettingsRef();
-                    if (settings.sleep_in_receive_cancel_ms.totalMilliseconds())
+                    if (sleep_in_receive_cancel.totalMilliseconds())
                     {
-                        std::chrono::milliseconds ms(settings.sleep_in_receive_cancel_ms.totalMilliseconds());
+                        std::chrono::milliseconds ms(sleep_in_receive_cancel.totalMilliseconds());
                         std::this_thread::sleep_for(ms);
                     }
                 }
@@ -1522,11 +1713,10 @@ void TCPHandler::sendData(const Block & block)
         writeStringBinary("", *out);
 
         /// For testing hedged requests
-        const Settings & settings = query_context->getSettingsRef();
-        if (block.rows() > 0 && settings.sleep_in_send_data_ms.totalMilliseconds())
+        if (block.rows() > 0 && query_context->getSettingsRef().sleep_in_send_data_ms.totalMilliseconds())
         {
             out->next();
-            std::chrono::milliseconds ms(settings.sleep_in_send_data_ms.totalMilliseconds());
+            std::chrono::milliseconds ms(query_context->getSettingsRef().sleep_in_send_data_ms.totalMilliseconds());
             std::this_thread::sleep_for(ms);
         }
 
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index 086c1f7d5e5..73fc88526a9 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -2,16 +2,17 @@
 
 #include <Poco/Net/TCPServerConnection.h>
 
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Stopwatch.h>
 #include <Core/Protocol.h>
 #include <Core/QueryProcessingStage.h>
 #include <IO/Progress.h>
 #include <IO/TimeoutSetter.h>
-#include <DataStreams/BlockIO.h>
+#include <QueryPipeline/BlockIO.h>
 #include <Interpreters/InternalTextLogsQueue.h>
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
+#include <Formats/NativeReader.h>
 
 #include "IServer.h"
 
@@ -26,7 +27,10 @@ namespace Poco { class Logger; }
 namespace DB
 {
 
+class Session;
+struct Settings;
 class ColumnsDescription;
+struct ProfileInfo;
 
 /// State of query processing.
 struct QueryState
@@ -41,15 +45,19 @@ struct QueryState
     /// destroyed after input/output blocks, because they may contain other
     /// threads that use this queue.
     InternalTextLogsQueuePtr logs_queue;
-    BlockOutputStreamPtr logs_block_out;
+    std::unique_ptr<NativeWriter> logs_block_out;
+
+    InternalProfileEventsQueuePtr profile_queue;
+    std::unique_ptr<NativeWriter> profile_events_block_out;
 
     /// From where to read data for INSERT.
     std::shared_ptr<ReadBuffer> maybe_compressed_in;
-    BlockInputStreamPtr block_in;
+    std::unique_ptr<NativeReader> block_in;
 
     /// Where to write result data.
     std::shared_ptr<WriteBuffer> maybe_compressed_out;
-    BlockOutputStreamPtr block_out;
+    std::unique_ptr<NativeWriter> block_out;
+    Block block_for_insert;
 
     /// Query text.
     String query;
@@ -65,11 +73,11 @@ struct QueryState
     bool sent_all_data = false;
     /// Request requires data from the client (INSERT, but not INSERT SELECT).
     bool need_receive_data_for_insert = false;
-    /// Temporary tables read
-    bool temporary_tables_read = false;
+    /// Data was read.
+    bool read_all_data = false;
 
     /// A state got uuids to exclude from a query
-    bool part_uuids = false;
+    std::optional<std::vector<UUID>> part_uuids_to_ignore;
 
     /// Request requires data from client for function input()
     bool need_receive_data_for_input = false;
@@ -78,6 +86,9 @@ struct QueryState
     /// sample block from StorageInput
     Block input_header;
 
+    /// If true, the data packets will be skipped instead of reading. Used to recover after errors.
+    bool skipping_data = false;
+
     /// To output progress, the difference after the previous sending of progress.
     Progress progress;
 
@@ -99,7 +110,6 @@ struct QueryState
 struct LastBlockInputParameters
 {
     Protocol::Compression compression = Protocol::Compression::Disable;
-    Block header;
 };
 
 class TCPHandler : public Poco::Net::TCPServerConnection
@@ -132,10 +142,19 @@ private:
     UInt64 client_version_patch = 0;
     UInt64 client_tcp_protocol_version = 0;
 
-    ContextMutablePtr connection_context;
-    ContextMutablePtr query_context;
+    /// Connection settings, which are extracted from a context.
+    bool send_exception_with_stack_trace = true;
+    Poco::Timespan send_timeout = DBMS_DEFAULT_SEND_TIMEOUT_SEC;
+    Poco::Timespan receive_timeout = DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC;
+    UInt64 poll_interval = DBMS_DEFAULT_POLL_INTERVAL;
+    UInt64 idle_connection_timeout = 3600;
+    UInt64 interactive_delay = 100000;
+    Poco::Timespan sleep_in_send_tables_status;
+    UInt64 unknown_packet_in_send_data = 0;
+    Poco::Timespan sleep_in_receive_cancel;
 
-    size_t unknown_packet_in_send_data = 0;
+    std::unique_ptr<Session> session;
+    ContextMutablePtr query_context;
 
     /// Streams for reading/writing from/to client connection socket.
     std::shared_ptr<ReadBuffer> in;
@@ -148,6 +167,7 @@ private:
     String default_database;
 
     /// For inter-server secret (remote_server.*.secret)
+    bool is_interserver_mode = false;
     String salt;
     String cluster;
     String cluster_secret;
@@ -167,6 +187,8 @@ private:
 
     void runImpl();
 
+    void extractConnectionSettingsFromContext(const ContextPtr & context);
+
     bool receiveProxyHeader();
     void receiveHello();
     bool receivePacket();
@@ -174,18 +196,19 @@ private:
     void receiveIgnoredPartUUIDs();
     String receiveReadTaskResponseAssumeLocked();
     bool receiveData(bool scalar);
-    bool readDataNext(size_t poll_interval, time_t receive_timeout);
-    void readData(const Settings & connection_settings);
+    bool readDataNext();
+    void readData();
+    void skipData();
     void receiveClusterNameAndSalt();
-    std::tuple<size_t, int> getReadTimeouts(const Settings & connection_settings);
 
-    [[noreturn]] void receiveUnexpectedData();
+    bool receiveUnexpectedData(bool throw_exception = true);
     [[noreturn]] void receiveUnexpectedQuery();
+    [[noreturn]] void receiveUnexpectedIgnoredPartUUIDs();
     [[noreturn]] void receiveUnexpectedHello();
     [[noreturn]] void receiveUnexpectedTablesStatusRequest();
 
     /// Process INSERT query
-    void processInsertQuery(const Settings & connection_settings);
+    void processInsertQuery();
 
     /// Process a request that does not require the receiving of data blocks from the client
     void processOrdinaryQuery();
@@ -204,14 +227,16 @@ private:
     void sendEndOfStream();
     void sendPartUUIDs();
     void sendReadTaskRequestAssumeLocked();
-    void sendProfileInfo(const BlockStreamProfileInfo & info);
+    void sendProfileInfo(const ProfileInfo & info);
     void sendTotals(const Block & totals);
     void sendExtremes(const Block & extremes);
+    void sendProfileEvents();
 
     /// Creates state.block_in/block_out for blocks read/write, depending on whether compression is enabled.
     void initBlockInput();
     void initBlockOutput(const Block & block);
     void initLogsBlockOutput(const Block & block);
+    void initProfileEventsBlockOutput(const Block & block);
 
     bool isQueryCancelled();
 
diff --git a/src/Server/TCPHandlerFactory.h b/src/Server/TCPHandlerFactory.h
index fb50333193c..e610bea330c 100644
--- a/src/Server/TCPHandlerFactory.h
+++ b/src/Server/TCPHandlerFactory.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Net/TCPServerConnectionFactory.h>
 #include <Poco/Net/NetException.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Server/IServer.h>
 #include <Server/TCPHandler.h>
 
diff --git a/src/Server/WebUIRequestHandler.cpp b/src/Server/WebUIRequestHandler.cpp
index fb8ff71611e..1dcad049f49 100644
--- a/src/Server/WebUIRequestHandler.cpp
+++ b/src/Server/WebUIRequestHandler.cpp
@@ -6,7 +6,7 @@
 #include <Poco/Util/LayeredConfiguration.h>
 
 #include <IO/HTTPCommon.h>
-#include <common/getResource.h>
+#include <base/getResource.h>
 
 
 namespace DB
diff --git a/src/Server/grpc_protos/clickhouse_grpc.proto b/src/Server/grpc_protos/clickhouse_grpc.proto
index 2f25973297c..c6cafaf6e40 100644
--- a/src/Server/grpc_protos/clickhouse_grpc.proto
+++ b/src/Server/grpc_protos/clickhouse_grpc.proto
@@ -32,7 +32,7 @@ message ExternalTable {
    // Data to insert to the external table.
    // If a method with streaming input (i.e. ExecuteQueryWithStreamInput() or ExecuteQueryWithStreamIO()) is used,
    // then data for insertion to the same external table can be split between multiple QueryInfos.
-   string data = 3;
+   bytes data = 3;
 
    // Format of the data to insert to the external table.
    string format = 4;
@@ -41,6 +41,25 @@ message ExternalTable {
    map<string, string> settings = 5;
 }
 
+enum CompressionAlgorithm {
+   NO_COMPRESSION = 0;
+   DEFLATE = 1;
+   GZIP = 2;
+   STREAM_GZIP = 3;
+}
+
+enum CompressionLevel {
+   COMPRESSION_NONE = 0;
+   COMPRESSION_LOW = 1;
+   COMPRESSION_MEDIUM = 2;
+   COMPRESSION_HIGH = 3;
+}
+
+message Compression {
+   CompressionAlgorithm algorithm = 1;
+   CompressionLevel level = 2;
+}
+
 // Information about a query which a client sends to a ClickHouse server.
 // The first QueryInfo can set any of the following fields. Extra QueryInfos only add extra data.
 // In extra QueryInfos only `input_data`, `external_tables`, `next_query_info` and `cancel` fields can be set.
@@ -53,10 +72,10 @@ message QueryInfo {
    string database = 4;
 
    // Input data, used both as data for INSERT query and as data for the input() function.
-   string input_data = 5;
+   bytes input_data = 5;
 
    // Delimiter for input_data, inserted between input_data from adjacent QueryInfos.
-   string input_data_delimiter = 6;
+   bytes input_data_delimiter = 6;
 
    // Default output format. If not specified, 'TabSeparated' is used.
    string output_format = 7;
@@ -78,6 +97,10 @@ message QueryInfo {
    // If true there will be at least one more QueryInfo in the input stream.
    // `next_query_info` is allowed to be set only if a method with streaming input (i.e. ExecuteQueryWithStreamInput() or ExecuteQueryWithStreamIO()) is used.
    bool next_query_info = 16;
+
+   /// Controls how a ClickHouse server will compress query execution results before sending back to the client.
+   /// If not set the compression settings from the configuration file will be used.
+   Compression result_compression = 17;
 }
 
 enum LogsLevel {
@@ -128,9 +151,9 @@ message Exception {
 // Result of execution of a query which is sent back by the ClickHouse server to the client.
 message Result {
    // Output of the query, represented in the `output_format` or in a format specified in `query`.
-   string output = 1;
-   string totals = 2;
-   string extremes = 3;
+   bytes output = 1;
+   bytes totals = 2;
+   bytes extremes = 3;
 
    repeated LogEntry logs = 4;
    Progress progress = 5;
diff --git a/src/Server/ya.make b/src/Server/ya.make
deleted file mode 100644
index 6a6a442fce8..00000000000
--- a/src/Server/ya.make
+++ /dev/null
@@ -1,41 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Util
-)
-
-
-SRCS(
-    GRPCServer.cpp
-    HTTP/HTMLForm.cpp
-    HTTP/HTTPServer.cpp
-    HTTP/HTTPServerConnection.cpp
-    HTTP/HTTPServerConnectionFactory.cpp
-    HTTP/HTTPServerRequest.cpp
-    HTTP/HTTPServerResponse.cpp
-    HTTP/ReadHeaders.cpp
-    HTTP/WriteBufferFromHTTPServerResponse.cpp
-    HTTPHandler.cpp
-    HTTPHandlerFactory.cpp
-    InterserverIOHTTPHandler.cpp
-    KeeperTCPHandler.cpp
-    MySQLHandler.cpp
-    MySQLHandlerFactory.cpp
-    NotFoundHandler.cpp
-    PostgreSQLHandler.cpp
-    PostgreSQLHandlerFactory.cpp
-    PrometheusMetricsWriter.cpp
-    PrometheusRequestHandler.cpp
-    ProtocolServerAdapter.cpp
-    ReplicasStatusHandler.cpp
-    StaticRequestHandler.cpp
-    TCPHandler.cpp
-    WebUIRequestHandler.cpp
-
-)
-
-END()
diff --git a/src/Server/ya.make.in b/src/Server/ya.make.in
deleted file mode 100644
index fd1b414edf5..00000000000
--- a/src/Server/ya.make.in
+++ /dev/null
@@ -1,15 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/poco/Util
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 1bb8e6bb9b0..c5101f162ee 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -180,6 +180,15 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.if_exists = command_ast->if_exists;
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::MODIFY_COMMENT)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.type = COMMENT_TABLE;
+        const auto & ast_comment = command_ast->comment->as<ASTLiteral &>();
+        command.comment = ast_comment.value.get<String>();
+        return command;
+    }
     else if (command_ast->type == ASTAlterCommand::MODIFY_ORDER_BY)
     {
         AlterCommand command;
@@ -196,6 +205,13 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.sample_by = command_ast->sample_by;
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::REMOVE_SAMPLE_BY)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.type = AlterCommand::REMOVE_SAMPLE_BY;
+        return command;
+    }
     else if (command_ast->type == ASTAlterCommand::ADD_INDEX)
     {
         AlterCommand command;
@@ -312,6 +328,14 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.settings_changes = command_ast->settings_changes->as<ASTSetQuery &>().changes;
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::MODIFY_DATABASE_SETTING)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.type = AlterCommand::MODIFY_DATABASE_SETTING;
+        command.settings_changes = command_ast->settings_changes->as<ASTSetQuery &>().changes;
+        return command;
+    }
     else if (command_ast->type == ASTAlterCommand::RESET_SETTING)
     {
         AlterCommand command;
@@ -446,11 +470,19 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
     {
         metadata.sampling_key.recalculateWithNewAST(sample_by, metadata.columns, context);
     }
+    else if (type == REMOVE_SAMPLE_BY)
+    {
+        metadata.sampling_key = {};
+    }
     else if (type == COMMENT_COLUMN)
     {
         metadata.columns.modify(column_name,
             [&](ColumnDescription & column) { column.comment = *comment; });
     }
+    else if (type == COMMENT_TABLE)
+    {
+        metadata.comment = *comment;
+    }
     else if (type == ADD_INDEX)
     {
         if (std::any_of(
@@ -679,6 +711,9 @@ bool isMetadataOnlyConversion(const IDataType * from, const IDataType * to)
 
     while (true)
     {
+        if (from->equals(*to))
+            return true;
+
         auto it_range = ALLOWED_CONVERSIONS.equal_range(typeid(*from));
         for (auto it = it_range.first; it != it_range.second; ++it)
         {
@@ -697,9 +732,9 @@ bool isMetadataOnlyConversion(const IDataType * from, const IDataType * to)
 
         const auto * nullable_from = typeid_cast<const DataTypeNullable *>(from);
         const auto * nullable_to = typeid_cast<const DataTypeNullable *>(to);
-        if (nullable_from && nullable_to)
+        if (nullable_to)
         {
-            from = nullable_from->getNestedType().get();
+            from = nullable_from ? nullable_from->getNestedType().get() : from;
             to = nullable_to->getNestedType().get();
             continue;
         }
@@ -721,7 +756,7 @@ bool AlterCommand::isRequireMutationStage(const StorageInMemoryMetadata & metada
         return false;
 
     /// We remove properties on metadata level
-    if (isRemovingProperty() || type == REMOVE_TTL)
+    if (isRemovingProperty() || type == REMOVE_TTL || type == REMOVE_SAMPLE_BY)
         return false;
 
     if (type == DROP_COLUMN || type == DROP_INDEX || type == DROP_PROJECTION || type == RENAME_COLUMN)
@@ -740,7 +775,7 @@ bool AlterCommand::isRequireMutationStage(const StorageInMemoryMetadata & metada
 
 bool AlterCommand::isCommentAlter() const
 {
-    if (type == COMMENT_COLUMN)
+    if (type == COMMENT_COLUMN || type == COMMENT_TABLE)
     {
         return true;
     }
@@ -840,52 +875,6 @@ std::optional<MutationCommand> AlterCommand::tryConvertToMutationCommand(Storage
 }
 
 
-String alterTypeToString(const AlterCommand::Type type)
-{
-    switch (type)
-    {
-    case AlterCommand::Type::ADD_COLUMN:
-        return "ADD COLUMN";
-    case AlterCommand::Type::ADD_CONSTRAINT:
-        return "ADD CONSTRAINT";
-    case AlterCommand::Type::ADD_INDEX:
-        return "ADD INDEX";
-    case AlterCommand::Type::ADD_PROJECTION:
-        return "ADD PROJECTION";
-    case AlterCommand::Type::COMMENT_COLUMN:
-        return "COMMENT COLUMN";
-    case AlterCommand::Type::DROP_COLUMN:
-        return "DROP COLUMN";
-    case AlterCommand::Type::DROP_CONSTRAINT:
-        return "DROP CONSTRAINT";
-    case AlterCommand::Type::DROP_INDEX:
-        return "DROP INDEX";
-    case AlterCommand::Type::DROP_PROJECTION:
-        return "DROP PROJECTION";
-    case AlterCommand::Type::MODIFY_COLUMN:
-        return "MODIFY COLUMN";
-    case AlterCommand::Type::MODIFY_ORDER_BY:
-        return "MODIFY ORDER BY";
-    case AlterCommand::Type::MODIFY_SAMPLE_BY:
-        return "MODIFY SAMPLE BY";
-    case AlterCommand::Type::MODIFY_TTL:
-        return "MODIFY TTL";
-    case AlterCommand::Type::MODIFY_SETTING:
-        return "MODIFY SETTING";
-    case AlterCommand::Type::RESET_SETTING:
-        return "RESET SETTING";
-    case AlterCommand::Type::MODIFY_QUERY:
-        return "MODIFY QUERY";
-    case AlterCommand::Type::RENAME_COLUMN:
-        return "RENAME COLUMN";
-    case AlterCommand::Type::REMOVE_TTL:
-        return "REMOVE TTL";
-    default:
-        throw Exception("Uninitialized ALTER command", ErrorCodes::LOGICAL_ERROR);
-    }
-
-}
-
 void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     if (!prepared)
@@ -1004,6 +993,7 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
     prepared = true;
 }
 
+
 void AlterCommands::validate(const StorageInMemoryMetadata & metadata, ContextPtr context) const
 {
     auto all_columns = metadata.columns;
@@ -1229,6 +1219,10 @@ void AlterCommands::validate(const StorageInMemoryMetadata & metadata, ContextPt
         {
             throw Exception{"Table doesn't have any table TTL expression, cannot remove", ErrorCodes::BAD_ARGUMENTS};
         }
+        else if (command.type == AlterCommand::REMOVE_SAMPLE_BY && !metadata.hasSamplingKey())
+        {
+            throw Exception{"Table doesn't have SAMPLE BY, cannot remove", ErrorCodes::BAD_ARGUMENTS};
+        }
 
         /// Collect default expressions for MODIFY and ADD comands
         if (command.type == AlterCommand::MODIFY_COLUMN || command.type == AlterCommand::ADD_COLUMN)
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index 60f4ad7d552..dce6b496741 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -13,6 +13,8 @@ namespace DB
 {
 
 class ASTAlterCommand;
+class IDatabase;
+using DatabasePtr = std::shared_ptr<IDatabase>;
 
 /// Operation from the ALTER query (except for manipulation with PART/PARTITION).
 /// Adding Nested columns is not expanded to add individual columns.
@@ -42,6 +44,9 @@ struct AlterCommand
         MODIFY_QUERY,
         RENAME_COLUMN,
         REMOVE_TTL,
+        MODIFY_DATABASE_SETTING,
+        COMMENT_TABLE,
+        REMOVE_SAMPLE_BY,
     };
 
     /// Which property user wants to remove from column
@@ -72,7 +77,7 @@ struct AlterCommand
     ColumnDefaultKind default_kind{};
     ASTPtr default_expression{};
 
-    /// For COMMENT column
+    /// For COMMENT column or table
     std::optional<String> comment;
 
     /// For ADD or MODIFY - after which column to add a new one. If an empty string, add to the end.
@@ -168,9 +173,6 @@ struct AlterCommand
     std::optional<MutationCommand> tryConvertToMutationCommand(StorageInMemoryMetadata & metadata, ContextPtr context) const;
 };
 
-/// Return string representation of AlterCommand::Type
-String alterTypeToString(const AlterCommand::Type type);
-
 class Context;
 
 /// Vector of AlterCommand with several additional functions
diff --git a/src/Storages/CMakeLists.txt b/src/Storages/CMakeLists.txt
index ff22e9fa9e1..6d4f18d34b1 100644
--- a/src/Storages/CMakeLists.txt
+++ b/src/Storages/CMakeLists.txt
@@ -1,6 +1,10 @@
 add_subdirectory(MergeTree)
 add_subdirectory(System)
 
-if(ENABLE_EXAMPLES)
+if (ENABLE_EXAMPLES)
     add_subdirectory(examples)
 endif()
+
+if (ENABLE_FUZZING)
+    add_subdirectory(fuzzers)
+endif()
diff --git a/src/Storages/CheckResults.h b/src/Storages/CheckResults.h
index 8fa0bb910d3..b342b014fa4 100644
--- a/src/Storages/CheckResults.h
+++ b/src/Storages/CheckResults.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <vector>
 
 namespace DB
diff --git a/src/Storages/ColumnDependency.h b/src/Storages/ColumnDependency.h
index 79bdaa06efa..6c3c96ec62a 100644
--- a/src/Storages/ColumnDependency.h
+++ b/src/Storages/ColumnDependency.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/SipHash.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <unordered_set>
 
 namespace DB
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index c05441148df..568257b4fd7 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -29,6 +29,7 @@
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/ExpressionActions.h>
+#include <Interpreters/FunctionNameNormalizer.h>
 
 
 namespace DB
@@ -201,6 +202,12 @@ void ColumnsDescription::add(ColumnDescription column, const String & after_colu
         throw Exception("Cannot add column " + column.name + ": column with this name already exists",
             ErrorCodes::ILLEGAL_COLUMN);
 
+    /// Normalize ASTs to be compatible with InterpreterCreateQuery.
+    if (column.default_desc.expression)
+        FunctionNameNormalizer::visit(column.default_desc.expression.get());
+    if (column.ttl)
+        FunctionNameNormalizer::visit(column.ttl.get());
+
     auto insert_it = columns.cend();
 
     if (first)
diff --git a/src/Storages/Distributed/Defines.h b/src/Storages/Distributed/Defines.h
new file mode 100644
index 00000000000..ed2089534d3
--- /dev/null
+++ b/src/Storages/Distributed/Defines.h
@@ -0,0 +1,5 @@
+#pragma once
+
+/// Marks that extra information is sent to a shard. It could be any magic numbers.
+#define DBMS_DISTRIBUTED_SIGNATURE_HEADER 0xCAFEDACEull
+#define DBMS_DISTRIBUTED_SIGNATURE_HEADER_OLD_FORMAT 0xCAFECABEull
diff --git a/src/Storages/Distributed/DirectoryMonitor.cpp b/src/Storages/Distributed/DirectoryMonitor.cpp
index c674a705de1..254d82520dc 100644
--- a/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -1,7 +1,5 @@
-#include <DataStreams/RemoteBlockOutputStream.h>
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/ConvertingBlockInputStream.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <QueryPipeline/RemoteInserter.h>
+#include <Formats/NativeReader.h>
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Common/escapeForFileName.h>
 #include <Common/CurrentMetrics.h>
@@ -12,10 +10,11 @@
 #include <Common/ActionBlocker.h>
 #include <Common/formatReadable.h>
 #include <Common/Stopwatch.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/Cluster.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
+#include <Storages/Distributed/Defines.h>
 #include <Storages/StorageDistributed.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromString.h>
@@ -190,7 +189,7 @@ namespace
 
             if (header_buf.hasPendingData())
             {
-                NativeBlockInputStream header_block_in(header_buf, DBMS_TCP_PROTOCOL_VERSION);
+                NativeReader header_block_in(header_buf, DBMS_TCP_PROTOCOL_VERSION);
                 distributed_header.block_header = header_block_in.read();
                 if (!distributed_header.block_header)
                     throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read header from the {} batch", in.getFileName());
@@ -266,28 +265,27 @@ namespace
         return nullptr;
     }
 
-    void writeAndConvert(RemoteBlockOutputStream & remote, ReadBufferFromFile & in)
+    void writeAndConvert(RemoteInserter & remote, ReadBufferFromFile & in)
     {
         CompressedReadBuffer decompressing_in(in);
-        NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
-        block_in.readPrefix();
+        NativeReader block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
 
         while (Block block = block_in.read())
         {
-            ConvertingBlockInputStream convert(
-                std::make_shared<OneBlockInputStream>(block),
-                remote.getHeader(),
-                ConvertingBlockInputStream::MatchColumnsMode::Name);
-            auto adopted_block = convert.read();
-            remote.write(adopted_block);
-        }
+            auto converting_dag = ActionsDAG::makeConvertingActions(
+                block.cloneEmpty().getColumnsWithTypeAndName(),
+                remote.getHeader().getColumnsWithTypeAndName(),
+                ActionsDAG::MatchColumnsMode::Name);
 
-        block_in.readSuffix();
+            auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
+            converting_actions->execute(block);
+            remote.write(block);
+        }
     }
 
     void writeRemoteConvert(
         const DistributedHeader & distributed_header,
-        RemoteBlockOutputStream & remote,
+        RemoteInserter & remote,
         bool compression_expected,
         ReadBufferFromFile & in,
         Poco::Logger * log)
@@ -619,14 +617,13 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
             formatReadableSizeWithBinarySuffix(distributed_header.bytes));
 
         auto connection = pool->get(timeouts, &distributed_header.insert_settings);
-        RemoteBlockOutputStream remote{*connection, timeouts,
+        RemoteInserter remote{*connection, timeouts,
             distributed_header.insert_query,
             distributed_header.insert_settings,
             distributed_header.client_info};
-        remote.writePrefix();
         bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
         writeRemoteConvert(distributed_header, remote, compression_expected, in, log);
-        remote.writeSuffix();
+        remote.onFinish();
     }
     catch (Exception & e)
     {
@@ -833,7 +830,7 @@ struct StorageDistributedDirectoryMonitor::Batch
 private:
     void sendBatch(Connection & connection, const ConnectionTimeouts & timeouts)
     {
-        std::unique_ptr<RemoteBlockOutputStream> remote;
+        std::unique_ptr<RemoteInserter> remote;
 
         for (UInt64 file_idx : file_indices)
         {
@@ -847,18 +844,17 @@ private:
 
             if (!remote)
             {
-                remote = std::make_unique<RemoteBlockOutputStream>(connection, timeouts,
+                remote = std::make_unique<RemoteInserter>(connection, timeouts,
                     distributed_header.insert_query,
                     distributed_header.insert_settings,
                     distributed_header.client_info);
-                remote->writePrefix();
             }
             bool compression_expected = connection.getCompression() == Protocol::Compression::Enable;
             writeRemoteConvert(distributed_header, *remote, compression_expected, in, parent.log);
         }
 
         if (remote)
-            remote->writeSuffix();
+            remote->onFinish();
     }
 
     void sendSeparateFiles(Connection & connection, const ConnectionTimeouts & timeouts)
@@ -880,14 +876,13 @@ private:
                 ReadBufferFromFile in(file_path->second);
                 const auto & distributed_header = readDistributedHeader(in, parent.log);
 
-                RemoteBlockOutputStream remote(connection, timeouts,
+                RemoteInserter remote(connection, timeouts,
                     distributed_header.insert_query,
                     distributed_header.insert_settings,
                     distributed_header.client_info);
-                remote.writePrefix();
                 bool compression_expected = connection.getCompression() == Protocol::Compression::Enable;
                 writeRemoteConvert(distributed_header, remote, compression_expected, in, parent.log);
-                remote.writeSuffix();
+                remote.onFinish();
             }
             catch (Exception & e)
             {
@@ -911,7 +906,7 @@ public:
     {
         std::unique_ptr<ReadBufferFromFile> in;
         std::unique_ptr<CompressedReadBuffer> decompressing_in;
-        std::unique_ptr<NativeBlockInputStream> block_in;
+        std::unique_ptr<NativeReader> block_in;
 
         Poco::Logger * log = nullptr;
 
@@ -921,12 +916,11 @@ public:
         {
             in = std::make_unique<ReadBufferFromFile>(file_name);
             decompressing_in = std::make_unique<CompressedReadBuffer>(*in);
-            block_in = std::make_unique<NativeBlockInputStream>(*decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
+            block_in = std::make_unique<NativeReader>(*decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
             log = &Poco::Logger::get("DirectoryMonitorSource");
 
             readDistributedHeader(*in, log);
 
-            block_in->readPrefix();
             first_block = block_in->read();
         }
 
@@ -959,10 +953,7 @@ protected:
 
         auto block = data.block_in->read();
         if (!block)
-        {
-            data.block_in->readSuffix();
             return {};
-        }
 
         size_t num_rows = block.rows();
         return Chunk(block.getColumns(), num_rows);
@@ -972,7 +963,7 @@ private:
     Data data;
 };
 
-ProcessorPtr StorageDistributedDirectoryMonitor::createSourceFromFile(const String & file_name)
+std::shared_ptr<ISource> StorageDistributedDirectoryMonitor::createSourceFromFile(const String & file_name)
 {
     return std::make_shared<DirectoryMonitorSource>(file_name);
 }
@@ -1050,8 +1041,7 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
                 LOG_DEBUG(log, "Processing batch {} with old format (no header/rows)", in.getFileName());
 
                 CompressedReadBuffer decompressing_in(in);
-                NativeBlockInputStream block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
-                block_in.readPrefix();
+                NativeReader block_in(decompressing_in, DBMS_TCP_PROTOCOL_VERSION);
 
                 while (Block block = block_in.read())
                 {
@@ -1061,7 +1051,6 @@ void StorageDistributedDirectoryMonitor::processFilesWithBatching(const std::map
                     if (!header)
                         header = block.cloneEmpty();
                 }
-                block_in.readSuffix();
             }
         }
         catch (const Exception & e)
diff --git a/src/Storages/Distributed/DirectoryMonitor.h b/src/Storages/Distributed/DirectoryMonitor.h
index cd1d25179f3..307b57a5668 100644
--- a/src/Storages/Distributed/DirectoryMonitor.h
+++ b/src/Storages/Distributed/DirectoryMonitor.h
@@ -24,6 +24,8 @@ class BackgroundSchedulePool;
 class IProcessor;
 using ProcessorPtr = std::shared_ptr<IProcessor>;
 
+class ISource;
+
 /** Details of StorageDistributed.
   * This type is not designed for standalone use.
   */
@@ -48,7 +50,7 @@ public:
 
     void shutdownAndDropAllData();
 
-    static ProcessorPtr createSourceFromFile(const String & file_name);
+    static std::shared_ptr<ISource> createSourceFromFile(const String & file_name);
 
     /// For scheduling via DistributedBlockOutputStream
     bool addAndSchedule(size_t file_size, size_t ms);
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index ec3f82d914c..cf349d1f8cf 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -1,8 +1,11 @@
 #include <Storages/Distributed/DistributedSink.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
+#include <Storages/Distributed/Defines.h>
 #include <Storages/StorageDistributed.h>
 #include <Disks/StoragePolicy.h>
 
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTInsertQuery.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/queryToString.h>
 
@@ -11,10 +14,9 @@
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/ConnectionTimeoutsContext.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <DataStreams/RemoteBlockOutputStream.h>
-#include <DataStreams/ConvertingBlockInputStream.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <Formats/NativeWriter.h>
+#include <Processors/Sinks/RemoteSink.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/Context.h>
@@ -29,9 +31,9 @@
 #include <Common/escapeForFileName.h>
 #include <Common/CurrentThread.h>
 #include <Common/createHardLink.h>
-#include <common/logger_useful.h>
-#include <common/range.h>
-#include <common/scope_guard.h>
+#include <base/logger_useful.h>
+#include <base/range.h>
+#include <base/scope_guard.h>
 
 #include <future>
 #include <condition_variable>
@@ -70,19 +72,37 @@ static Block adoptBlock(const Block & header, const Block & block, Poco::Logger
         "Structure does not match (remote: {}, local: {}), implicit conversion will be done.",
         header.dumpStructure(), block.dumpStructure());
 
-    ConvertingBlockInputStream convert(
-        std::make_shared<OneBlockInputStream>(block),
-        header,
-        ConvertingBlockInputStream::MatchColumnsMode::Name);
-    return convert.read();
+    auto converting_dag = ActionsDAG::makeConvertingActions(
+        block.cloneEmpty().getColumnsWithTypeAndName(),
+        header.getColumnsWithTypeAndName(),
+        ActionsDAG::MatchColumnsMode::Name);
+
+    auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
+    Block converted = block;
+    converting_actions->execute(converted);
+
+    return converted;
 }
 
 
-static void writeBlockConvert(const BlockOutputStreamPtr & out, const Block & block, size_t repeats, Poco::Logger * log)
+static void writeBlockConvert(PushingPipelineExecutor & executor, const Block & block, size_t repeats, Poco::Logger * log)
 {
-    Block adopted_block = adoptBlock(out->getHeader(), block, log);
+    Block adopted_block = adoptBlock(executor.getHeader(), block, log);
     for (size_t i = 0; i < repeats; ++i)
-        out->write(adopted_block);
+        executor.push(adopted_block);
+}
+
+
+static ASTPtr createInsertToRemoteTableQuery(const std::string & database, const std::string & table, const Names & column_names)
+{
+    auto query = std::make_shared<ASTInsertQuery>();
+    query->table_id = StorageID(database, table);
+    auto columns = std::make_shared<ASTExpressionList>();
+    query->columns = columns;
+    query->children.push_back(columns);
+    for (const auto & column_name : column_names)
+        columns->children.push_back(std::make_shared<ASTIdentifier>(column_name));
+    return query;
 }
 
 
@@ -90,22 +110,23 @@ DistributedSink::DistributedSink(
     ContextPtr context_,
     StorageDistributed & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const ASTPtr & query_ast_,
     const ClusterPtr & cluster_,
     bool insert_sync_,
     UInt64 insert_timeout_,
-    StorageID main_table_)
+    StorageID main_table_,
+    const Names & columns_to_send_)
     : SinkToStorage(metadata_snapshot_->getSampleBlock())
     , context(Context::createCopy(context_))
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
-    , query_ast(query_ast_)
-    , query_string(queryToString(query_ast_))
+    , query_ast(createInsertToRemoteTableQuery(main_table_.database_name, main_table_.table_name, columns_to_send_))
+    , query_string(queryToString(query_ast))
     , cluster(cluster_)
     , insert_sync(insert_sync_)
     , allow_materialized(context->getSettingsRef().insert_allow_materialized_columns)
     , insert_timeout(insert_timeout_)
     , main_table(main_table_)
+    , columns_to_send(columns_to_send_.begin(), columns_to_send_.end())
     , log(&Poco::Logger::get("DistributedBlockOutputStream"))
 {
     const auto & settings = context->getSettingsRef();
@@ -124,22 +145,7 @@ void DistributedSink::consume(Chunk chunk)
         is_first_chunk = false;
     }
 
-    auto ordinary_block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
-
-    if (!allow_materialized)
-    {
-        /* They are added by the AddingDefaultBlockOutputStream, and we will get
-         * different number of columns eventually */
-        for (const auto & col : metadata_snapshot->getColumns().getMaterialized())
-        {
-            if (ordinary_block.has(col.name))
-            {
-                ordinary_block.erase(col.name);
-                LOG_DEBUG(log, "{}: column {} will be removed, because it is MATERIALIZED",
-                    storage.getStorageID().getNameForLogs(), col.name);
-            }
-        }
-    }
+    auto ordinary_block = getHeader().cloneWithColumns(chunk.detachColumns());
 
     if (insert_sync)
         writeSync(ordinary_block);
@@ -147,6 +153,19 @@ void DistributedSink::consume(Chunk chunk)
         writeAsync(ordinary_block);
 }
 
+
+Block DistributedSink::removeSuperfluousColumns(Block block) const
+{
+    for (size_t i = block.columns(); i;)
+    {
+        --i;
+        if (!columns_to_send.contains(block.getByPosition(i).name))
+            block.erase(i);
+    }
+    return block;
+}
+
+
 void DistributedSink::writeAsync(const Block & block)
 {
     if (random_shard_insert)
@@ -322,7 +341,7 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
 
         if (!job.is_local_job || !settings.prefer_localhost_replica)
         {
-            if (!job.stream)
+            if (!job.executor)
             {
                 auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(settings);
                 if (shard_info.hasInternalReplication())
@@ -354,19 +373,20 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
                 if (throttler)
                     job.connection_entry->setThrottler(throttler);
 
-                job.stream = std::make_shared<RemoteBlockOutputStream>(
-                    *job.connection_entry, timeouts, query_string, settings, context->getClientInfo());
-                job.stream->writePrefix();
+                job.pipeline = QueryPipeline(std::make_shared<RemoteSink>(
+                    *job.connection_entry, timeouts, query_string, settings, context->getClientInfo()));
+                job.executor = std::make_unique<PushingPipelineExecutor>(job.pipeline);
+                job.executor->start();
             }
 
             CurrentMetrics::Increment metric_increment{CurrentMetrics::DistributedSend};
 
-            Block adopted_shard_block = adoptBlock(job.stream->getHeader(), shard_block, log);
-            job.stream->write(adopted_shard_block);
+            Block adopted_shard_block = adoptBlock(job.executor->getHeader(), shard_block, log);
+            job.executor->push(adopted_shard_block);
         }
         else // local
         {
-            if (!job.stream)
+            if (!job.executor)
             {
                 /// Forward user settings
                 job.local_context = Context::createCopy(context);
@@ -382,11 +402,12 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
                 InterpreterInsertQuery interp(copy_query_ast, job.local_context, allow_materialized);
                 auto block_io = interp.execute();
 
-                job.stream = block_io.out;
-                job.stream->writePrefix();
+                job.pipeline = std::move(block_io.pipeline);
+                job.executor = std::make_unique<PushingPipelineExecutor>(job.pipeline);
+                job.executor->start();
             }
 
-            writeBlockConvert(job.stream, shard_block, shard_info.getLocalNodeCount(), log);
+            writeBlockConvert(*job.executor, shard_block, shard_info.getLocalNodeCount(), log);
         }
 
         job.blocks_written += 1;
@@ -399,6 +420,8 @@ void DistributedSink::writeSync(const Block & block)
 {
     const Settings & settings = context->getSettingsRef();
     const auto & shards_info = cluster->getShardsInfo();
+    Block block_to_send = removeSuperfluousColumns(block);
+
     size_t start = 0;
     size_t end = shards_info.size();
 
@@ -411,7 +434,7 @@ void DistributedSink::writeSync(const Block & block)
     if (!pool)
     {
         /// Deferred initialization. Only for sync insertion.
-        initWritingJobs(block, start, end);
+        initWritingJobs(block_to_send, start, end);
 
         size_t jobs_count = random_shard_insert ? 1 : (remote_jobs_count + local_jobs_count);
         size_t max_threads = std::min<size_t>(settings.max_distributed_connections, jobs_count);
@@ -456,7 +479,7 @@ void DistributedSink::writeSync(const Block & block)
         finished_jobs_count = 0;
         for (size_t shard_index : collections::range(start, end))
             for (JobReplica & job : per_shard_jobs[shard_index].replicas_jobs)
-                pool->scheduleOrThrowOnError(runWritingJob(job, block, num_shards));
+                pool->scheduleOrThrowOnError(runWritingJob(job, block_to_send, num_shards));
     }
     catch (...)
     {
@@ -498,11 +521,11 @@ void DistributedSink::onFinish()
             {
                 for (JobReplica & job : shard_jobs.replicas_jobs)
                 {
-                    if (job.stream)
+                    if (job.executor)
                     {
                         pool->scheduleOrThrowOnError([&job]()
                         {
-                            job.stream->writeSuffix();
+                            job.executor->finish();
                         });
                     }
                 }
@@ -581,12 +604,13 @@ void DistributedSink::writeAsyncImpl(const Block & block, size_t shard_id)
 {
     const auto & shard_info = cluster->getShardsInfo()[shard_id];
     const auto & settings = context->getSettingsRef();
+    Block block_to_send = removeSuperfluousColumns(block);
 
     if (shard_info.hasInternalReplication())
     {
         if (shard_info.isLocal() && settings.prefer_localhost_replica)
             /// Prefer insert into current instance directly
-            writeToLocal(block, shard_info.getLocalNodeCount());
+            writeToLocal(block_to_send, shard_info.getLocalNodeCount());
         else
         {
             const auto & path = shard_info.insertPathForInternalReplication(
@@ -594,13 +618,13 @@ void DistributedSink::writeAsyncImpl(const Block & block, size_t shard_id)
                 settings.use_compact_format_in_distributed_parts_names);
             if (path.empty())
                 throw Exception("Directory name for async inserts is empty", ErrorCodes::LOGICAL_ERROR);
-            writeToShard(block, {path});
+            writeToShard(block_to_send, {path});
         }
     }
     else
     {
         if (shard_info.isLocal() && settings.prefer_localhost_replica)
-            writeToLocal(block, shard_info.getLocalNodeCount());
+            writeToLocal(block_to_send, shard_info.getLocalNodeCount());
 
         std::vector<std::string> dir_names;
         for (const auto & address : cluster->getShardsAddresses()[shard_id])
@@ -608,7 +632,7 @@ void DistributedSink::writeAsyncImpl(const Block & block, size_t shard_id)
                 dir_names.push_back(address.toFullString(settings.use_compact_format_in_distributed_parts_names));
 
         if (!dir_names.empty())
-            writeToShard(block, dir_names);
+            writeToShard(block_to_send, dir_names);
     }
 }
 
@@ -618,10 +642,11 @@ void DistributedSink::writeToLocal(const Block & block, size_t repeats)
     InterpreterInsertQuery interp(query_ast, context, allow_materialized);
 
     auto block_io = interp.execute();
+    PushingPipelineExecutor executor(block_io.pipeline);
 
-    block_io.out->writePrefix();
-    writeBlockConvert(block_io.out, block, repeats, log);
-    block_io.out->writeSuffix();
+    executor.start();
+    writeBlockConvert(executor, block, repeats, log);
+    executor.finish();
 }
 
 
@@ -682,7 +707,7 @@ void DistributedSink::writeToShard(const Block & block, const std::vector<std::s
 
             WriteBufferFromFile out{first_file_tmp_path};
             CompressedWriteBuffer compress{out, compression_codec};
-            NativeBlockOutputStream stream{compress, DBMS_TCP_PROTOCOL_VERSION, block.cloneEmpty()};
+            NativeWriter stream{compress, DBMS_TCP_PROTOCOL_VERSION, block.cloneEmpty()};
 
             /// Prepare the header.
             /// See also readDistributedHeader() in DirectoryMonitor (for reading side)
@@ -700,7 +725,7 @@ void DistributedSink::writeToShard(const Block & block, const std::vector<std::s
             /// Write block header separately in the batch header.
             /// It is required for checking does conversion is required or not.
             {
-                NativeBlockOutputStream header_stream{header_buf, DBMS_TCP_PROTOCOL_VERSION, block.cloneEmpty()};
+                NativeWriter header_stream{header_buf, DBMS_TCP_PROTOCOL_VERSION, block.cloneEmpty()};
                 header_stream.write(block.cloneEmpty());
             }
 
@@ -714,9 +739,7 @@ void DistributedSink::writeToShard(const Block & block, const std::vector<std::s
             writeStringBinary(header, out);
             writePODBinary(CityHash_v1_0_2::CityHash128(header.data, header.size), out);
 
-            stream.writePrefix();
             stream.write(block);
-            stream.writeSuffix();
 
             out.finalize();
             if (fsync)
diff --git a/src/Storages/Distributed/DistributedSink.h b/src/Storages/Distributed/DistributedSink.h
index af04f8c8aac..668cec22e8b 100644
--- a/src/Storages/Distributed/DistributedSink.h
+++ b/src/Storages/Distributed/DistributedSink.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/formatAST.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <QueryPipeline/QueryPipeline.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Core/Block.h>
 #include <Common/PODArray.h>
@@ -24,6 +25,7 @@ namespace DB
 
 class Context;
 class StorageDistributed;
+class PushingPipelineExecutor;
 
 /** If insert_sync_ is true, the write is synchronous. Uses insert_timeout_ if it is not zero.
  *  Otherwise, the write is asynchronous - the data is first written to the local filesystem, and then sent to the remote servers.
@@ -41,11 +43,11 @@ public:
         ContextPtr context_,
         StorageDistributed & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const ASTPtr & query_ast_,
         const ClusterPtr & cluster_,
         bool insert_sync_,
         UInt64 insert_timeout_,
-        StorageID main_table_);
+        StorageID main_table_,
+        const Names & columns_to_send_);
 
     String getName() const override { return "DistributedSink"; }
     void consume(Chunk chunk) override;
@@ -63,6 +65,9 @@ private:
 
     void writeAsyncImpl(const Block & block, size_t shard_id = 0);
 
+    /// Removes columns which should not be sent to shards.
+    Block removeSuperfluousColumns(Block block) const;
+
     /// Increments finished_writings_count after each repeat.
     void writeToLocal(const Block & block, size_t repeats);
 
@@ -82,7 +87,9 @@ private:
     /// Returns the number of blocks was written for each cluster node. Uses during exception handling.
     std::string getCurrentStateDescription();
 
+    /// Context used for writing to remote tables.
     ContextMutablePtr context;
+
     StorageDistributed & storage;
     StorageMetadataPtr metadata_snapshot;
     ASTPtr query_ast;
@@ -100,6 +107,7 @@ private:
     /// Sync-related stuff
     UInt64 insert_timeout; // in seconds
     StorageID main_table;
+    NameSet columns_to_send;
     Stopwatch watch;
     Stopwatch watch_current_block;
     std::optional<ThreadPool> pool;
@@ -119,7 +127,8 @@ private:
 
         ConnectionPool::Entry connection_entry;
         ContextPtr local_context;
-        BlockOutputStreamPtr stream;
+        QueryPipeline pipeline;
+        std::unique_ptr<PushingPipelineExecutor> executor;
 
         UInt64 blocks_written = 0;
         UInt64 rows_written = 0;
diff --git a/src/Storages/ExecutableSettings.cpp b/src/Storages/ExecutableSettings.cpp
new file mode 100644
index 00000000000..136357eb6f8
--- /dev/null
+++ b/src/Storages/ExecutableSettings.cpp
@@ -0,0 +1,42 @@
+#include "ExecutableSettings.h"
+
+#include <Common/Exception.h>
+
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTFunction.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_SETTING;
+}
+
+IMPLEMENT_SETTINGS_TRAITS(ExecutableSettingsTraits, LIST_OF_EXECUTABLE_SETTINGS);
+
+void ExecutableSettings::loadFromQuery(ASTStorage & storage_def)
+{
+    if (storage_def.settings)
+    {
+        try
+        {
+            applyChanges(storage_def.settings->changes);
+        }
+        catch (Exception & e)
+        {
+            if (e.code() == ErrorCodes::UNKNOWN_SETTING)
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
+        }
+    }
+    else
+    {
+        auto settings_ast = std::make_shared<ASTSetQuery>();
+        settings_ast->is_standalone = false;
+        storage_def.set(storage_def.settings, settings_ast);
+    }
+}
+
+}
diff --git a/src/Storages/ExecutableSettings.h b/src/Storages/ExecutableSettings.h
new file mode 100644
index 00000000000..9c0cfc05fa5
--- /dev/null
+++ b/src/Storages/ExecutableSettings.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Core/Defines.h>
+#include <Core/BaseSettings.h>
+
+namespace DB
+{
+
+class ASTStorage;
+
+#define LIST_OF_EXECUTABLE_SETTINGS(M) \
+    M(UInt64, send_chunk_header, false, "Send number_of_rows\n before sending chunk to process", 0) \
+    M(UInt64, pool_size, 16, "Processes pool size. If size == 0, then there is no size restrictions", 0) \
+    M(UInt64, max_command_execution_time, 10, "Max command execution time in seconds.", 0) \
+    M(UInt64, command_termination_timeout, 10, "Command termination timeout in seconds.", 0) \
+
+DECLARE_SETTINGS_TRAITS(ExecutableSettingsTraits, LIST_OF_EXECUTABLE_SETTINGS)
+
+/// Settings for ExecutablePool engine.
+struct ExecutableSettings : public BaseSettings<ExecutableSettingsTraits>
+{
+    void loadFromQuery(ASTStorage & storage_def);
+};
+
+}
diff --git a/src/Storages/ExternalDataSourceConfiguration.cpp b/src/Storages/ExternalDataSourceConfiguration.cpp
new file mode 100644
index 00000000000..71be37e4b5b
--- /dev/null
+++ b/src/Storages/ExternalDataSourceConfiguration.cpp
@@ -0,0 +1,347 @@
+#include "ExternalDataSourceConfiguration.h"
+
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <IO/WriteBufferFromString.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+String ExternalDataSourceConfiguration::toString() const
+{
+    WriteBufferFromOwnString configuration_info;
+    configuration_info << "username: " << username << "\t";
+    if (addresses.empty())
+    {
+        configuration_info << "host: " << host << "\t";
+        configuration_info << "port: " << port << "\t";
+    }
+    else
+    {
+        for (const auto & [replica_host, replica_port] : addresses)
+        {
+            configuration_info << "host: " << replica_host << "\t";
+            configuration_info << "port: " << replica_port << "\t";
+        }
+    }
+    return configuration_info.str();
+}
+
+
+void ExternalDataSourceConfiguration::set(const ExternalDataSourceConfiguration & conf)
+{
+    host = conf.host;
+    port = conf.port;
+    username = conf.username;
+    password = conf.password;
+    database = conf.database;
+    table = conf.table;
+    schema = conf.schema;
+    addresses_expr = conf.addresses_expr;
+}
+
+
+std::optional<ExternalDataSourceConfig> getExternalDataSourceConfiguration(const ASTs & args, ContextPtr context, bool is_database_engine, bool throw_on_no_collection)
+{
+    if (args.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
+
+    ExternalDataSourceConfiguration configuration;
+    StorageSpecificArgs non_common_args;
+
+    if (const auto * collection = typeid_cast<const ASTIdentifier *>(args[0].get()))
+    {
+        const auto & config = context->getConfigRef();
+        const auto & config_prefix = fmt::format("named_collections.{}", collection->name());
+
+        if (!config.has(config_prefix))
+        {
+            /// For table function remote we do not throw on no collection, because then we consider first arg
+            /// as cluster definition from config.
+            if (!throw_on_no_collection)
+                return std::nullopt;
+
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection->name());
+        }
+
+        configuration.host = config.getString(config_prefix + ".host", "");
+        configuration.port = config.getInt(config_prefix + ".port", 0);
+        configuration.username = config.getString(config_prefix + ".user", "");
+        configuration.password = config.getString(config_prefix + ".password", "");
+        configuration.database = config.getString(config_prefix + ".database", "");
+        configuration.table = config.getString(config_prefix + ".table", "");
+        configuration.schema = config.getString(config_prefix + ".schema", "");
+        configuration.addresses_expr = config.getString(config_prefix + ".addresses_expr", "");
+
+        if (!configuration.addresses_expr.empty() && !configuration.host.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot have `addresses_expr` and `host`, `port` in configuration at the same time");
+
+        if ((args.size() == 1) && ((configuration.addresses_expr.empty() && (configuration.host.empty() || configuration.port == 0))
+            || configuration.database.empty() || (configuration.table.empty() && !is_database_engine)))
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Named collection of connection parameters is missing some of the parameters and no key-value arguments are added");
+        }
+
+        /// Check key-value arguments.
+        for (size_t i = 1; i < args.size(); ++i)
+        {
+            if (const auto * ast_function = typeid_cast<const ASTFunction *>(args[i].get()))
+            {
+                const auto * args_expr = assert_cast<const ASTExpressionList *>(ast_function->arguments.get());
+                auto function_args = args_expr->children;
+                if (function_args.size() != 2)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+
+                auto arg_name = function_args[0]->as<ASTIdentifier>()->name();
+                if (function_args[1]->as<ASTFunction>())
+                {
+                    non_common_args.emplace_back(std::make_pair(arg_name, function_args[1]));
+                    continue;
+                }
+
+                auto arg_value_ast = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context);
+                auto * arg_value_literal = arg_value_ast->as<ASTLiteral>();
+                if (arg_value_literal)
+                {
+                    auto arg_value = arg_value_literal->value;
+                    if (arg_name == "host")
+                        configuration.host = arg_value.safeGet<String>();
+                    else if (arg_name == "port")
+                        configuration.port = arg_value.safeGet<UInt64>();
+                    else if (arg_name == "user")
+                        configuration.username = arg_value.safeGet<String>();
+                    else if (arg_name == "password")
+                        configuration.password = arg_value.safeGet<String>();
+                    else if (arg_name == "database")
+                        configuration.database = arg_value.safeGet<String>();
+                    else if (arg_name == "table")
+                        configuration.table = arg_value.safeGet<String>();
+                    else if (arg_name == "schema")
+                        configuration.schema = arg_value.safeGet<String>();
+                    else if (arg_name == "addresses_expr")
+                        configuration.addresses_expr = arg_value.safeGet<String>();
+                    else
+                        non_common_args.emplace_back(std::make_pair(arg_name, arg_value_ast));
+                }
+                else
+                {
+                    non_common_args.emplace_back(std::make_pair(arg_name, arg_value_ast));
+                }
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+            }
+        }
+
+        ExternalDataSourceConfig source_config{ .configuration = configuration, .specific_args = non_common_args };
+        return source_config;
+    }
+    return std::nullopt;
+}
+
+
+std::optional<ExternalDataSourceConfiguration> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context)
+{
+    ExternalDataSourceConfiguration configuration;
+
+    auto collection_name = dict_config.getString(dict_config_prefix + ".name", "");
+    if (!collection_name.empty())
+    {
+        const auto & config = context->getConfigRef();
+        const auto & config_prefix = fmt::format("named_collections.{}", collection_name);
+
+        if (!config.has(config_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection_name);
+
+        configuration.host = dict_config.getString(dict_config_prefix + ".host", config.getString(config_prefix + ".host", ""));
+        configuration.port = dict_config.getInt(dict_config_prefix + ".port", config.getUInt(config_prefix + ".port", 0));
+        configuration.username = dict_config.getString(dict_config_prefix + ".user", config.getString(config_prefix + ".user", ""));
+        configuration.password = dict_config.getString(dict_config_prefix + ".password", config.getString(config_prefix + ".password", ""));
+        configuration.database = dict_config.getString(dict_config_prefix + ".db", config.getString(config_prefix + ".database", ""));
+        configuration.table = dict_config.getString(dict_config_prefix + ".table", config.getString(config_prefix + ".table", ""));
+        configuration.schema = dict_config.getString(dict_config_prefix + ".schema", config.getString(config_prefix + ".schema", ""));
+
+        if (configuration.host.empty() || configuration.port == 0 || configuration.username.empty() || configuration.password.empty()
+            || configuration.database.empty() || configuration.table.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Named collection of connection parameters is missing some of the parameters and dictionary parameters are added");
+        }
+        return configuration;
+    }
+    return std::nullopt;
+}
+
+
+ExternalDataSourcesByPriority getExternalDataSourceConfigurationByPriority(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context)
+{
+    ExternalDataSourceConfiguration common_configuration;
+
+    auto named_collection = getExternalDataSourceConfiguration(dict_config, dict_config_prefix, context);
+    if (named_collection)
+    {
+        common_configuration = *named_collection;
+    }
+    else
+    {
+        common_configuration.host = dict_config.getString(dict_config_prefix + ".host", "");
+        common_configuration.port = dict_config.getUInt(dict_config_prefix + ".port", 0);
+        common_configuration.username = dict_config.getString(dict_config_prefix + ".user", "");
+        common_configuration.password = dict_config.getString(dict_config_prefix + ".password", "");
+        common_configuration.database = dict_config.getString(dict_config_prefix + ".db", "");
+        common_configuration.table = dict_config.getString(fmt::format("{}.table", dict_config_prefix), "");
+        common_configuration.schema = dict_config.getString(fmt::format("{}.schema", dict_config_prefix), "");
+    }
+
+    ExternalDataSourcesByPriority configuration
+    {
+        .database = common_configuration.database,
+        .table = common_configuration.table,
+        .schema = common_configuration.schema,
+        .replicas_configurations = {}
+    };
+
+    if (dict_config.has(dict_config_prefix + ".replica"))
+    {
+        Poco::Util::AbstractConfiguration::Keys config_keys;
+        dict_config.keys(dict_config_prefix, config_keys);
+
+        for (const auto & config_key : config_keys)
+        {
+            if (config_key.starts_with("replica"))
+            {
+                ExternalDataSourceConfiguration replica_configuration(common_configuration);
+                String replica_name = dict_config_prefix + "." + config_key;
+                size_t priority = dict_config.getInt(replica_name + ".priority", 0);
+
+                replica_configuration.host = dict_config.getString(replica_name + ".host", common_configuration.host);
+                replica_configuration.port = dict_config.getUInt(replica_name + ".port", common_configuration.port);
+                replica_configuration.username = dict_config.getString(replica_name + ".user", common_configuration.username);
+                replica_configuration.password = dict_config.getString(replica_name + ".password", common_configuration.password);
+
+                if (replica_configuration.host.empty() || replica_configuration.port == 0
+                    || replica_configuration.username.empty() || replica_configuration.password.empty())
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Named collection of connection parameters is missing some of the parameters and no other dictionary parameters are added");
+                }
+
+                configuration.replicas_configurations[priority].emplace_back(replica_configuration);
+            }
+        }
+    }
+    else
+    {
+        configuration.replicas_configurations[0].emplace_back(common_configuration);
+    }
+
+    return configuration;
+}
+
+
+void URLBasedDataSourceConfiguration::set(const URLBasedDataSourceConfiguration & conf)
+{
+    url = conf.url;
+    format = conf.format;
+    compression_method = conf.compression_method;
+    structure = conf.structure;
+}
+
+
+std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(const ASTs & args, ContextPtr context)
+{
+    if (args.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
+
+    URLBasedDataSourceConfiguration configuration;
+    StorageSpecificArgs non_common_args;
+
+    if (const auto * collection = typeid_cast<const ASTIdentifier *>(args[0].get()))
+    {
+        const auto & config = context->getConfigRef();
+        auto config_prefix = fmt::format("named_collections.{}", collection->name());
+
+        if (!config.has(config_prefix))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", collection->name());
+
+        Poco::Util::AbstractConfiguration::Keys keys;
+        config.keys(config_prefix, keys);
+        for (const auto & key : keys)
+        {
+            if (key == "url")
+            {
+                configuration.url = config.getString(config_prefix + ".url", "");
+            }
+            else if (key == "headers")
+            {
+                Poco::Util::AbstractConfiguration::Keys header_keys;
+                config.keys(config_prefix + ".headers", header_keys);
+                for (const auto & header : header_keys)
+                {
+                    const auto header_prefix = config_prefix + ".headers." + header;
+                    configuration.headers.emplace_back(std::make_pair(config.getString(header_prefix + ".name"), config.getString(header_prefix + ".value")));
+                }
+            }
+            else
+            {
+                auto value = config.getString(config_prefix + '.' + key);
+                non_common_args.emplace_back(std::make_pair(key, std::make_shared<ASTLiteral>(value)));
+            }
+        }
+
+        /// Check key-value arguments.
+        for (size_t i = 1; i < args.size(); ++i)
+        {
+            if (const auto * ast_function = typeid_cast<const ASTFunction *>(args[i].get()))
+            {
+                const auto * args_expr = assert_cast<const ASTExpressionList *>(ast_function->arguments.get());
+                auto function_args = args_expr->children;
+                if (function_args.size() != 2)
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+
+                auto arg_name = function_args[0]->as<ASTIdentifier>()->name();
+                auto arg_value_ast = evaluateConstantExpressionOrIdentifierAsLiteral(function_args[1], context);
+                auto arg_value = arg_value_ast->as<ASTLiteral>()->value;
+
+                if (arg_name == "url")
+                    configuration.url = arg_value.safeGet<String>();
+                else if (arg_name == "format")
+                    configuration.format = arg_value.safeGet<String>();
+                else if (arg_name == "compression_method")
+                    configuration.compression_method = arg_value.safeGet<String>();
+                else if (arg_name == "structure")
+                    configuration.structure = arg_value.safeGet<String>();
+                else
+                    non_common_args.emplace_back(std::make_pair(arg_name, arg_value_ast));
+            }
+            else
+            {
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected key-value defined argument");
+            }
+        }
+
+        if (configuration.url.empty() || configuration.format.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Storage requires {}", configuration.url.empty() ? "url" : "format");
+
+        URLBasedDataSourceConfig source_config{ .configuration = configuration, .specific_args = non_common_args };
+        return source_config;
+    }
+    return std::nullopt;
+}
+
+}
diff --git a/src/Storages/ExternalDataSourceConfiguration.h b/src/Storages/ExternalDataSourceConfiguration.h
new file mode 100644
index 00000000000..e3b589b1bb4
--- /dev/null
+++ b/src/Storages/ExternalDataSourceConfiguration.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include <Parsers/ASTIdentifier.h>
+#include <Interpreters/Context.h>
+#include <Poco/Util/AbstractConfiguration.h>
+
+
+namespace DB
+{
+
+struct ExternalDataSourceConfiguration
+{
+    String host;
+    UInt16 port = 0;
+    String username;
+    String password;
+    String database;
+    String table;
+    String schema;
+
+    std::vector<std::pair<String, UInt16>> addresses; /// Failover replicas.
+    String addresses_expr;
+
+    String toString() const;
+
+    void set(const ExternalDataSourceConfiguration & conf);
+};
+
+
+struct StoragePostgreSQLConfiguration : ExternalDataSourceConfiguration
+{
+    String on_conflict;
+};
+
+
+struct StorageMySQLConfiguration : ExternalDataSourceConfiguration
+{
+    bool replace_query = false;
+    String on_duplicate_clause;
+};
+
+struct StorageMongoDBConfiguration : ExternalDataSourceConfiguration
+{
+    String collection;
+    String options;
+};
+
+
+using StorageSpecificArgs = std::vector<std::pair<String, ASTPtr>>;
+
+struct ExternalDataSourceConfig
+{
+    ExternalDataSourceConfiguration configuration;
+    StorageSpecificArgs specific_args;
+};
+
+/* If there is a storage engine's configuration specified in the named_collections,
+ * this function returns valid for usage ExternalDataSourceConfiguration struct
+ * otherwise std::nullopt is returned.
+ *
+ * If any configuration options are provided as key-value engine arguments, they will override
+ * configuration values, i.e. ENGINE = PostgreSQL(postgresql_configuration, database = 'postgres_database');
+ *
+ * Any key-value engine argument except common (`host`, `port`, `username`, `password`, `database`)
+ * is returned in EngineArgs struct.
+ */
+std::optional<ExternalDataSourceConfig> getExternalDataSourceConfiguration(const ASTs & args, ContextPtr context, bool is_database_engine = false, bool throw_on_no_collection = true);
+
+std::optional<ExternalDataSourceConfiguration> getExternalDataSourceConfiguration(
+    const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context);
+
+
+/// Highest priority is 0, the bigger the number in map, the less the priority.
+using ExternalDataSourcesConfigurationByPriority = std::map<size_t, std::vector<ExternalDataSourceConfiguration>>;
+
+struct ExternalDataSourcesByPriority
+{
+    String database;
+    String table;
+    String schema;
+    ExternalDataSourcesConfigurationByPriority replicas_configurations;
+};
+
+ExternalDataSourcesByPriority
+getExternalDataSourceConfigurationByPriority(const Poco::Util::AbstractConfiguration & dict_config, const String & dict_config_prefix, ContextPtr context);
+
+
+struct URLBasedDataSourceConfiguration
+{
+    String url;
+    String format;
+    String compression_method = "auto";
+    String structure;
+
+    std::vector<std::pair<String, Field>> headers;
+
+    void set(const URLBasedDataSourceConfiguration & conf);
+};
+
+struct StorageS3Configuration : URLBasedDataSourceConfiguration
+{
+    String access_key_id;
+    String secret_access_key;
+};
+
+struct URLBasedDataSourceConfig
+{
+    URLBasedDataSourceConfiguration configuration;
+    StorageSpecificArgs specific_args;
+};
+
+std::optional<URLBasedDataSourceConfig> getURLBasedDataSourceConfiguration(const ASTs & args, ContextPtr context);
+
+}
diff --git a/src/Storages/FileLog/Buffer_fwd.h b/src/Storages/FileLog/Buffer_fwd.h
new file mode 100644
index 00000000000..ec644aa7d36
--- /dev/null
+++ b/src/Storages/FileLog/Buffer_fwd.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <memory>
+
+namespace DB
+{
+class ReadBufferFromFileLog;
+
+using ReadBufferFromFileLogPtr = std::shared_ptr<ReadBufferFromFileLog>;
+}
diff --git a/src/Storages/FileLog/DirectoryWatcherBase.cpp b/src/Storages/FileLog/DirectoryWatcherBase.cpp
new file mode 100644
index 00000000000..37a82ad4ee3
--- /dev/null
+++ b/src/Storages/FileLog/DirectoryWatcherBase.cpp
@@ -0,0 +1,147 @@
+#include <Interpreters/Context.h>
+#include <Storages/FileLog/DirectoryWatcherBase.h>
+#include <Storages/FileLog/FileLogDirectoryWatcher.h>
+#include <Storages/FileLog/StorageFileLog.h>
+
+#include <filesystem>
+#include <unistd.h>
+#include <sys/inotify.h>
+#include <sys/poll.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int FILE_DOESNT_EXIST;
+    extern const int BAD_FILE_TYPE;
+    extern const int IO_SETUP_ERROR;
+}
+
+static constexpr int buffer_size = 4096;
+
+DirectoryWatcherBase::DirectoryWatcherBase(
+    FileLogDirectoryWatcher & owner_, const std::string & path_, ContextPtr context_, int event_mask_)
+    : WithContext(context_)
+    , owner(owner_)
+    , path(path_)
+    , event_mask(event_mask_)
+    , milliseconds_to_wait(owner.storage.getFileLogSettings()->poll_directory_watch_events_backoff_init.totalMilliseconds())
+{
+    if (!std::filesystem::exists(path))
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Path {} does not exist", path);
+
+    if (!std::filesystem::is_directory(path))
+        throw Exception(ErrorCodes::BAD_FILE_TYPE, "Path {} is not a directory", path);
+
+    fd = inotify_init();
+    if (fd == -1)
+        throw Exception("Cannot initialize inotify", ErrorCodes::IO_SETUP_ERROR);
+
+    watch_task = getContext()->getSchedulePool().createTask("directory_watch", [this] { watchFunc(); });
+    start();
+}
+
+void DirectoryWatcherBase::watchFunc()
+{
+    int mask = 0;
+    if (eventMask() & DirectoryWatcherBase::DW_ITEM_ADDED)
+        mask |= IN_CREATE;
+    if (eventMask() & DirectoryWatcherBase::DW_ITEM_REMOVED)
+        mask |= IN_DELETE;
+    if (eventMask() & DirectoryWatcherBase::DW_ITEM_MODIFIED)
+        mask |= IN_MODIFY;
+    if (eventMask() & DirectoryWatcherBase::DW_ITEM_MOVED_FROM)
+        mask |= IN_MOVED_FROM;
+    if (eventMask() & DirectoryWatcherBase::DW_ITEM_MOVED_TO)
+        mask |= IN_MOVED_TO;
+
+    int wd = inotify_add_watch(fd, path.c_str(), mask);
+    if (wd == -1)
+    {
+        owner.onError(Exception(ErrorCodes::IO_SETUP_ERROR, "Watch directory {} failed", path));
+    }
+
+    std::string buffer;
+    buffer.resize(buffer_size);
+    pollfd pfd;
+    pfd.fd = fd;
+    pfd.events = POLLIN;
+    while (!stopped)
+    {
+        const auto & settings = owner.storage.getFileLogSettings();
+        if (poll(&pfd, 1, milliseconds_to_wait) > 0 && pfd.revents & POLLIN)
+        {
+            milliseconds_to_wait = settings->poll_directory_watch_events_backoff_init.totalMilliseconds();
+            int n = read(fd, buffer.data(), buffer.size());
+            int i = 0;
+            if (n > 0)
+            {
+                while (n > 0)
+                {
+                    struct inotify_event * p_event = reinterpret_cast<struct inotify_event *>(buffer.data() + i);
+
+                    if (p_event->len > 0)
+                    {
+                        if ((p_event->mask & IN_CREATE) && (eventMask() & DirectoryWatcherBase::DW_ITEM_ADDED))
+                        {
+                            DirectoryWatcherBase::DirectoryEvent ev(p_event->name, DirectoryWatcherBase::DW_ITEM_ADDED);
+                            owner.onItemAdded(ev);
+                        }
+                        if ((p_event->mask & IN_DELETE) && (eventMask() & DirectoryWatcherBase::DW_ITEM_REMOVED))
+                        {
+                            DirectoryWatcherBase::DirectoryEvent ev(p_event->name, DirectoryWatcherBase::DW_ITEM_REMOVED);
+                            owner.onItemRemoved(ev);
+                        }
+                        if ((p_event->mask & IN_MODIFY) && (eventMask() & DirectoryWatcherBase::DW_ITEM_MODIFIED))
+                        {
+                            DirectoryWatcherBase::DirectoryEvent ev(p_event->name, DirectoryWatcherBase::DW_ITEM_MODIFIED);
+                            owner.onItemModified(ev);
+                        }
+                        if ((p_event->mask & IN_MOVED_FROM) && (eventMask() & DirectoryWatcherBase::DW_ITEM_MOVED_FROM))
+                        {
+                            DirectoryWatcherBase::DirectoryEvent ev(p_event->name, DirectoryWatcherBase::DW_ITEM_MOVED_FROM);
+                            owner.onItemMovedFrom(ev);
+                        }
+                        if ((p_event->mask & IN_MOVED_TO) && (eventMask() & DirectoryWatcherBase::DW_ITEM_MOVED_TO))
+                        {
+                            DirectoryWatcherBase::DirectoryEvent ev(p_event->name, DirectoryWatcherBase::DW_ITEM_MOVED_TO);
+                            owner.onItemMovedTo(ev);
+                        }
+                    }
+
+                    i += sizeof(inotify_event) + p_event->len;
+                    n -= sizeof(inotify_event) + p_event->len;
+                }
+            }
+
+            /// Wake up reader thread
+            owner.storage.wakeUp();
+        }
+        else
+        {
+            if (milliseconds_to_wait < static_cast<uint64_t>(settings->poll_directory_watch_events_backoff_max.totalMilliseconds()))
+                milliseconds_to_wait *= settings->poll_directory_watch_events_backoff_factor.value;
+        }
+    }
+}
+
+DirectoryWatcherBase::~DirectoryWatcherBase()
+{
+    stop();
+    close(fd);
+}
+
+void DirectoryWatcherBase::start()
+{
+    if (watch_task)
+        watch_task->activateAndSchedule();
+}
+
+void DirectoryWatcherBase::stop()
+{
+    stopped = true;
+    if (watch_task)
+        watch_task->deactivate();
+}
+
+}
diff --git a/src/Storages/FileLog/DirectoryWatcherBase.h b/src/Storages/FileLog/DirectoryWatcherBase.h
new file mode 100644
index 00000000000..a640f686c8a
--- /dev/null
+++ b/src/Storages/FileLog/DirectoryWatcherBase.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <Core/BackgroundSchedulePool.h>
+
+#include <atomic>
+#include <memory>
+#include <string>
+
+namespace DB
+{
+class FileLogDirectoryWatcher;
+
+class DirectoryWatcherBase : WithContext
+{
+    /// Most of code in this class is copy from the Poco project:
+    /// https://github.com/ClickHouse-Extras/poco/blob/clickhouse/Foundation/src/DirectoryWatcher.cpp
+    /// This class is used to get notifications about changes
+    /// to the filesystem, more precisely, to a specific
+    /// directory. Changes to a directory are reported via
+    /// events.
+    ///
+    /// A thread will be created that watches the specified
+    /// directory for changes. Events are reported in the context
+    /// of this thread.
+    ///
+    /// Note that changes to files in subdirectories of the watched
+    /// directory are not reported. Separate DirectoryWatcher objects
+    /// must be created for these directories if they should be watched.
+public:
+    enum DirectoryEventType
+    {
+        DW_ITEM_ADDED = 1,
+        /// A new item has been created and added to the directory.
+
+        DW_ITEM_REMOVED = 2,
+        /// An item has been removed from the directory.
+
+        DW_ITEM_MODIFIED = 4,
+        /// An item has been modified.
+
+        DW_ITEM_MOVED_FROM = 8,
+        /// An item has been renamed or moved. This event delivers the old name.
+
+        DW_ITEM_MOVED_TO = 16
+        /// An item has been renamed or moved. This event delivers the new name.
+    };
+
+    enum DirectoryEventMask
+    {
+        /// Enables all event types.
+        DW_FILTER_ENABLE_ALL = 31,
+
+        /// Disables all event types.
+        DW_FILTER_DISABLE_ALL = 0
+    };
+
+    struct DirectoryEvent
+    {
+        DirectoryEvent(const std::string & f, DirectoryEventType ev) : path(f), event(ev) { }
+
+        /// The directory or file that has been changed.
+        const std::string path;
+        /// The kind of event.
+        DirectoryEventType event;
+    };
+
+
+    DirectoryWatcherBase() = delete;
+    DirectoryWatcherBase(const DirectoryWatcherBase &) = delete;
+    DirectoryWatcherBase & operator=(const DirectoryWatcherBase &) = delete;
+
+    /// Creates a DirectoryWatcher for the directory given in path.
+    /// To enable only specific events, an eventMask can be specified by
+    /// OR-ing the desired event IDs (e.g., DW_ITEM_ADDED | DW_ITEM_MODIFIED).
+    explicit DirectoryWatcherBase(
+        FileLogDirectoryWatcher & owner_, const std::string & path_, ContextPtr context_, int event_mask_ = DW_FILTER_ENABLE_ALL);
+
+    ~DirectoryWatcherBase();
+
+    /// Returns the value of the eventMask passed to the constructor.
+    int eventMask() const { return event_mask; }
+
+    /// Returns the directory being watched.
+    const std::string & directory() const;
+
+    void watchFunc();
+
+protected:
+    void start();
+    void stop();
+
+private:
+    FileLogDirectoryWatcher & owner;
+
+    using TaskThread = BackgroundSchedulePool::TaskHolder;
+    TaskThread watch_task;
+
+    std::atomic<bool> stopped{false};
+
+
+    const std::string path;
+    int event_mask;
+    uint64_t milliseconds_to_wait;
+
+    int fd;
+};
+
+}
diff --git a/src/Storages/FileLog/FileLogDirectoryWatcher.cpp b/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
new file mode 100644
index 00000000000..192721f9f3c
--- /dev/null
+++ b/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
@@ -0,0 +1,139 @@
+#include <Storages/FileLog/FileLogDirectoryWatcher.h>
+
+namespace DB
+{
+FileLogDirectoryWatcher::FileLogDirectoryWatcher(const std::string & path_, StorageFileLog & storage_, ContextPtr context_)
+    : path(path_)
+    , storage(storage_)
+    , log(&Poco::Logger::get("FileLogDirectoryWatcher(" + path + ")"))
+    , dw(std::make_unique<DirectoryWatcherBase>(*this, path, context_))
+{
+}
+
+FileLogDirectoryWatcher::Events FileLogDirectoryWatcher::getEventsAndReset()
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    Events res;
+    res.swap(events);
+    return res;
+}
+
+FileLogDirectoryWatcher::Error FileLogDirectoryWatcher::getErrorAndReset()
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    Error old_error = error;
+    error = {};
+    return old_error;
+}
+
+const std::string & FileLogDirectoryWatcher::getPath() const
+{
+    return path;
+}
+
+void FileLogDirectoryWatcher::onItemAdded(DirectoryWatcherBase::DirectoryEvent ev)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+
+    EventInfo info{ev.event, "onItemAdded"};
+    std::string event_path = ev.path;
+
+    if (auto it = events.find(event_path); it != events.end())
+    {
+        it->second.file_events.emplace_back(info);
+    }
+    else
+    {
+        events.emplace(event_path, FileEvents{.file_events = std::vector<EventInfo>{info}});
+    }
+}
+
+
+void FileLogDirectoryWatcher::onItemRemoved(DirectoryWatcherBase::DirectoryEvent ev)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+
+    EventInfo info{ev.event, "onItemRemoved"};
+    std::string event_path = ev.path;
+
+    if (auto it = events.find(event_path); it != events.end())
+    {
+        it->second.file_events.emplace_back(info);
+    }
+    else
+    {
+        events.emplace(event_path, FileEvents{.file_events = std::vector<EventInfo>{info}});
+    }
+}
+
+/// Optimize for MODIFY event, during a streamToViews period, since the log files
+/// are append only, there are may a lots of MODIFY events produced for one file.
+/// For example, appending 10000 logs into one file will result in 10000 MODIFY event.
+/// So, if we record all of these events, it will use a lot of memory, and then we
+/// need to handle it one by one in StorageFileLog::updateFileInfos, this is unnecessary
+/// because it is equal to just record and handle one MODIY event
+void FileLogDirectoryWatcher::onItemModified(DirectoryWatcherBase::DirectoryEvent ev)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+
+    auto event_path = ev.path;
+    EventInfo info{ev.event, "onItemModified"};
+    if (auto it = events.find(event_path); it != events.end())
+    {
+        /// Already have MODIFY event for this file
+        if (it->second.received_modification_event)
+            return;
+        else
+        {
+            it->second.received_modification_event = true;
+            it->second.file_events.emplace_back(info);
+        }
+    }
+    else
+    {
+        events.emplace(event_path, FileEvents{.received_modification_event = true, .file_events = std::vector<EventInfo>{info}});
+    }
+}
+
+void FileLogDirectoryWatcher::onItemMovedFrom(DirectoryWatcherBase::DirectoryEvent ev)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+
+    EventInfo info{ev.event, "onItemMovedFrom"};
+    std::string event_path = ev.path;
+
+    if (auto it = events.find(event_path); it != events.end())
+    {
+        it->second.file_events.emplace_back(info);
+    }
+    else
+    {
+        events.emplace(event_path, FileEvents{.file_events = std::vector<EventInfo>{info}});
+    }
+}
+
+void FileLogDirectoryWatcher::onItemMovedTo(DirectoryWatcherBase::DirectoryEvent ev)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+
+    EventInfo info{ev.event, "onItemMovedTo"};
+    std::string event_path = ev.path;
+
+    if (auto it = events.find(event_path); it != events.end())
+    {
+        it->second.file_events.emplace_back(info);
+    }
+    else
+    {
+        events.emplace(event_path, FileEvents{.file_events = std::vector<EventInfo>{info}});
+    }
+}
+
+void FileLogDirectoryWatcher::onError(Exception e)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    LOG_ERROR(log, "Error happened during watching directory: {}", error.error_msg);
+    error.has_error = true;
+    error.error_msg = e.message();
+}
+}
diff --git a/src/Storages/FileLog/FileLogDirectoryWatcher.h b/src/Storages/FileLog/FileLogDirectoryWatcher.h
new file mode 100644
index 00000000000..0b0c86397aa
--- /dev/null
+++ b/src/Storages/FileLog/FileLogDirectoryWatcher.h
@@ -0,0 +1,77 @@
+#pragma once
+
+#include <Storages/FileLog/DirectoryWatcherBase.h>
+
+#include <base/logger_useful.h>
+
+#include <memory>
+#include <mutex>
+
+namespace DB
+{
+class StorageFileLog;
+
+class FileLogDirectoryWatcher
+{
+public:
+    struct EventInfo
+    {
+        DirectoryWatcherBase::DirectoryEventType type;
+        std::string callback;
+    };
+
+    struct FileEvents
+    {
+        bool received_modification_event = false;
+        std::vector<EventInfo> file_events;
+    };
+
+    using Events = std::unordered_map<std::string, FileEvents>;
+
+    struct Error
+    {
+        bool has_error = false;
+        std::string error_msg = {};
+    };
+
+    FileLogDirectoryWatcher(const std::string & path_, StorageFileLog & storage_, ContextPtr context_);
+    ~FileLogDirectoryWatcher() = default;
+
+    Events getEventsAndReset();
+
+    Error getErrorAndReset();
+
+    const std::string & getPath() const;
+
+private:
+    friend class DirectoryWatcherBase;
+    /// Here must pass by value, otherwise will lead to stack-use-of-scope
+    void onItemAdded(DirectoryWatcherBase::DirectoryEvent ev);
+    void onItemRemoved(DirectoryWatcherBase::DirectoryEvent ev);
+    void onItemModified(DirectoryWatcherBase::DirectoryEvent ev);
+    void onItemMovedFrom(DirectoryWatcherBase::DirectoryEvent ev);
+    void onItemMovedTo(DirectoryWatcherBase::DirectoryEvent ev);
+    void onError(Exception);
+
+    const std::string path;
+
+    StorageFileLog & storage;
+
+    /// Note, in order to avoid data race found by fuzzer, put events before dw,
+    /// such that when this class destruction, dw will be destructed before events.
+    /// The data race is because dw create a separate thread to monitor file events
+    /// and put into events, then if we destruct events first, the monitor thread still
+    /// running, it may access events during events destruction, leads to data race.
+    /// And we should put other members before dw as well, because all of them can be
+    /// accessed in thread created by dw.
+    Events events;
+
+    Poco::Logger * log;
+
+    std::mutex mutex;
+
+    Error error;
+
+    std::unique_ptr<DirectoryWatcherBase> dw;
+};
+}
diff --git a/src/Storages/FileLog/FileLogSettings.cpp b/src/Storages/FileLog/FileLogSettings.cpp
new file mode 100644
index 00000000000..2cd42c35870
--- /dev/null
+++ b/src/Storages/FileLog/FileLogSettings.cpp
@@ -0,0 +1,41 @@
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Storages/FileLog/FileLogSettings.h>
+#include <Common/Exception.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_SETTING;
+}
+
+IMPLEMENT_SETTINGS_TRAITS(FileLogSettingsTraits, LIST_OF_FILELOG_SETTINGS)
+
+void FileLogSettings::loadFromQuery(ASTStorage & storage_def)
+{
+    if (storage_def.settings)
+    {
+        try
+        {
+            applyChanges(storage_def.settings->changes);
+        }
+        catch (Exception & e)
+        {
+            if (e.code() == ErrorCodes::UNKNOWN_SETTING)
+                e.addMessage("for storage " + storage_def.engine->name);
+            throw;
+        }
+    }
+    else
+    {
+        auto settings_ast = std::make_shared<ASTSetQuery>();
+        settings_ast->is_standalone = false;
+        storage_def.set(storage_def.settings, settings_ast);
+    }
+}
+
+}
diff --git a/src/Storages/FileLog/FileLogSettings.h b/src/Storages/FileLog/FileLogSettings.h
new file mode 100644
index 00000000000..d14120d0ba0
--- /dev/null
+++ b/src/Storages/FileLog/FileLogSettings.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Core/BaseSettings.h>
+#include <Core/Settings.h>
+
+
+namespace DB
+{
+class ASTStorage;
+
+
+#define FILELOG_RELATED_SETTINGS(M) \
+    /* default is stream_poll_timeout_ms */ \
+    M(Milliseconds, poll_timeout_ms, 0, "Timeout for single poll from StorageFileLog.", 0) \
+    M(UInt64, poll_max_batch_size, 0, "Maximum amount of messages to be polled in a single StorageFileLog poll.", 0) \
+    M(UInt64, max_block_size, 0, "Number of row collected by poll(s) for flushing data from StorageFileLog.", 0) \
+    M(UInt64, max_threads, 8, "Number of max threads to parse files, default is 8", 0) \
+    M(Milliseconds, poll_directory_watch_events_backoff_init, 500, "The initial sleep value for watch directory thread.", 0) \
+    M(Milliseconds, poll_directory_watch_events_backoff_max, 32000, "The max sleep value for watch directory thread.", 0) \
+    M(UInt64, poll_directory_watch_events_backoff_factor, 2, "The speed of backoff, exponential by default", 0)
+
+#define LIST_OF_FILELOG_SETTINGS(M) \
+    FILELOG_RELATED_SETTINGS(M) \
+    FORMAT_FACTORY_SETTINGS(M)
+
+DECLARE_SETTINGS_TRAITS(FileLogSettingsTraits, LIST_OF_FILELOG_SETTINGS)
+
+
+/** Settings for the FileLog engine.
+  * Could be loaded from a CREATE TABLE query (SETTINGS clause).
+  */
+struct FileLogSettings : public BaseSettings<FileLogSettingsTraits>
+{
+    void loadFromQuery(ASTStorage & storage_def);
+};
+
+}
diff --git a/src/Storages/FileLog/FileLogSource.cpp b/src/Storages/FileLog/FileLogSource.cpp
new file mode 100644
index 00000000000..a8da34f3204
--- /dev/null
+++ b/src/Storages/FileLog/FileLogSource.cpp
@@ -0,0 +1,143 @@
+#include <Formats/FormatFactory.h>
+#include <Interpreters/Context.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <Storages/FileLog/FileLogSource.h>
+#include <Storages/FileLog/ReadBufferFromFileLog.h>
+#include <Common/Stopwatch.h>
+#include <base/logger_useful.h>
+
+namespace DB
+{
+static constexpr auto MAX_FAILED_POLL_ATTEMPTS = 10;
+
+FileLogSource::FileLogSource(
+    StorageFileLog & storage_,
+    const StorageMetadataPtr & metadata_snapshot_,
+    const ContextPtr & context_,
+    const Names & columns,
+    size_t max_block_size_,
+    size_t poll_time_out_,
+    size_t stream_number_,
+    size_t max_streams_number_)
+    : SourceWithProgress(metadata_snapshot_->getSampleBlockForColumns(columns, storage_.getVirtuals(), storage_.getStorageID()))
+    , storage(storage_)
+    , metadata_snapshot(metadata_snapshot_)
+    , context(context_)
+    , column_names(columns)
+    , max_block_size(max_block_size_)
+    , poll_time_out(poll_time_out_)
+    , stream_number(stream_number_)
+    , max_streams_number(max_streams_number_)
+    , non_virtual_header(metadata_snapshot_->getSampleBlockNonMaterialized())
+    , virtual_header(
+          metadata_snapshot->getSampleBlockForColumns(storage.getVirtualColumnNames(), storage.getVirtuals(), storage.getStorageID()))
+{
+    buffer = std::make_unique<ReadBufferFromFileLog>(storage, max_block_size, poll_time_out, context, stream_number_, max_streams_number_);
+
+    const auto & file_infos = storage.getFileInfos();
+
+    size_t files_per_stream = file_infos.file_names.size() / max_streams_number;
+    start = stream_number * files_per_stream;
+    end = stream_number == max_streams_number - 1 ? file_infos.file_names.size() : (stream_number + 1) * files_per_stream;
+
+    storage.increaseStreams();
+}
+
+FileLogSource::~FileLogSource()
+{
+    try
+    {
+        if (!finished)
+            onFinish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+    storage.reduceStreams();
+}
+
+void FileLogSource::onFinish()
+{
+    storage.closeFilesAndStoreMeta(start, end);
+    finished = true;
+}
+
+Chunk FileLogSource::generate()
+{
+    /// Store metas of last written chunk into disk
+    storage.storeMetas(start, end);
+
+    if (!buffer || buffer->noRecords())
+    {
+        /// There is no onFinish for ISource, we call it
+        /// when no records return to close files
+        onFinish();
+        return {};
+    }
+
+    MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
+
+    auto input_format
+        = FormatFactory::instance().getInputFormat(storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
+
+    StreamingFormatExecutor executor(non_virtual_header, input_format);
+
+    size_t total_rows = 0;
+    size_t failed_poll_attempts = 0;
+
+    Stopwatch watch;
+    while (true)
+    {
+        size_t new_rows = 0;
+        if (buffer->poll())
+            new_rows = executor.execute();
+
+        if (new_rows)
+        {
+            auto file_name = buffer->getFileName();
+            auto offset = buffer->getOffset();
+            for (size_t i = 0; i < new_rows; ++i)
+            {
+                virtual_columns[0]->insert(file_name);
+                virtual_columns[1]->insert(offset);
+            }
+            total_rows = total_rows + new_rows;
+        }
+        else /// poll succeed, but parse failed
+        {
+            ++failed_poll_attempts;
+        }
+
+        if (!buffer->hasMorePolledRecords()
+            && ((total_rows >= max_block_size) || watch.elapsedMilliseconds() > poll_time_out
+                || failed_poll_attempts >= MAX_FAILED_POLL_ATTEMPTS))
+        {
+            break;
+        }
+    }
+
+    if (total_rows == 0)
+    {
+        onFinish();
+        return {};
+    }
+
+    auto result_block = non_virtual_header.cloneWithColumns(executor.getResultColumns());
+    auto virtual_block = virtual_header.cloneWithColumns(std::move(virtual_columns));
+
+    for (const auto & column : virtual_block.getColumnsWithTypeAndName())
+        result_block.insert(column);
+
+    auto converting_dag = ActionsDAG::makeConvertingActions(
+        result_block.cloneEmpty().getColumnsWithTypeAndName(),
+        getPort().getHeader().getColumnsWithTypeAndName(),
+        ActionsDAG::MatchColumnsMode::Name);
+
+    auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
+    converting_actions->execute(result_block);
+
+    return Chunk(result_block.getColumns(), result_block.rows());
+}
+
+}
diff --git a/src/Storages/FileLog/FileLogSource.h b/src/Storages/FileLog/FileLogSource.h
new file mode 100644
index 00000000000..c9fd1cc5a79
--- /dev/null
+++ b/src/Storages/FileLog/FileLogSource.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Storages/FileLog/ReadBufferFromFileLog.h>
+#include <Storages/FileLog/StorageFileLog.h>
+
+namespace Poco
+{
+    class Logger;
+}
+namespace DB
+{
+class FileLogSource : public SourceWithProgress
+{
+public:
+    FileLogSource(
+        StorageFileLog & storage_,
+        const StorageMetadataPtr & metadata_snapshot_,
+        const ContextPtr & context_,
+        const Names & columns,
+        size_t max_block_size_,
+        size_t poll_time_out_,
+        size_t stream_number_,
+        size_t max_streams_number_);
+
+    String getName() const override { return "FileLog"; }
+
+    bool noRecords() { return !buffer || buffer->noRecords(); }
+
+    void onFinish();
+
+    virtual ~FileLogSource() override;
+
+protected:
+    Chunk generate() override;
+
+private:
+    StorageFileLog & storage;
+    StorageMetadataPtr metadata_snapshot;
+    ContextPtr context;
+    Names column_names;
+    UInt64 max_block_size;
+
+    size_t poll_time_out;
+
+    size_t stream_number;
+    size_t max_streams_number;
+
+    std::unique_ptr<ReadBufferFromFileLog> buffer;
+
+    Block non_virtual_header;
+    Block virtual_header;
+
+    /// The start pos and end pos of files responsible by this stream,
+    /// does not include end
+    size_t start;
+    size_t end;
+};
+
+}
diff --git a/src/Storages/FileLog/ReadBufferFromFileLog.cpp b/src/Storages/FileLog/ReadBufferFromFileLog.cpp
new file mode 100644
index 00000000000..86caac57a53
--- /dev/null
+++ b/src/Storages/FileLog/ReadBufferFromFileLog.cpp
@@ -0,0 +1,175 @@
+#include <Interpreters/Context.h>
+#include <Storages/FileLog/ReadBufferFromFileLog.h>
+#include <Common/Stopwatch.h>
+
+#include <base/logger_useful.h>
+
+#include <algorithm>
+#include <filesystem>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int CANNOT_READ_ALL_DATA;
+}
+
+ReadBufferFromFileLog::ReadBufferFromFileLog(
+    StorageFileLog & storage_,
+    size_t max_batch_size,
+    size_t poll_timeout_,
+    ContextPtr context_,
+    size_t stream_number_,
+    size_t max_streams_number_)
+    : ReadBuffer(nullptr, 0)
+    , log(&Poco::Logger::get("ReadBufferFromFileLog " + toString(stream_number_)))
+    , storage(storage_)
+    , batch_size(max_batch_size)
+    , poll_timeout(poll_timeout_)
+    , context(context_)
+    , stream_number(stream_number_)
+    , max_streams_number(max_streams_number_)
+{
+    current = records.begin();
+    allowed = false;
+}
+
+bool ReadBufferFromFileLog::poll()
+{
+    if (hasMorePolledRecords())
+    {
+        allowed = true;
+        return true;
+    }
+
+    auto new_records = pollBatch(batch_size);
+    if (new_records.empty())
+    {
+        buffer_status = BufferStatus::NO_RECORD_RETURNED;
+        LOG_TRACE(log, "No new records to read");
+        return false;
+    }
+    else
+    {
+        records = std::move(new_records);
+        current = records.begin();
+
+        LOG_TRACE(log, "Polled batch of {} records. ", records.size());
+
+        buffer_status = BufferStatus::POLLED_OK;
+        allowed = true;
+        return true;
+    }
+}
+
+ReadBufferFromFileLog::Records ReadBufferFromFileLog::pollBatch(size_t batch_size_)
+{
+    Records new_records;
+    new_records.reserve(batch_size_);
+
+    readNewRecords(new_records, batch_size);
+    if (new_records.size() == batch_size_ || stream_out)
+        return new_records;
+
+    Stopwatch watch;
+    while (watch.elapsedMilliseconds() < poll_timeout && new_records.size() != batch_size_)
+    {
+        readNewRecords(new_records, batch_size);
+        /// All ifstrem reach end, no need to wait for timeout,
+        /// since file status can not be updated during a streamToViews
+        if (stream_out)
+            break;
+    }
+
+    return new_records;
+}
+
+void ReadBufferFromFileLog::readNewRecords(ReadBufferFromFileLog::Records & new_records, size_t batch_size_)
+{
+    size_t need_records_size = batch_size_ - new_records.size();
+    size_t read_records_size = 0;
+
+    auto & file_infos = storage.getFileInfos();
+
+    size_t files_per_stream = file_infos.file_names.size() / max_streams_number;
+    size_t start = stream_number * files_per_stream;
+    size_t end = stream_number == max_streams_number - 1 ? file_infos.file_names.size() : (stream_number + 1) * files_per_stream;
+
+    for (size_t i = start; i < end; ++i)
+    {
+        const auto & file_name = file_infos.file_names[i];
+
+        auto & file_ctx = StorageFileLog::findInMap(file_infos.context_by_name, file_name);
+        if (file_ctx.status == StorageFileLog::FileStatus::NO_CHANGE)
+            continue;
+
+        auto & file_meta = StorageFileLog::findInMap(file_infos.meta_by_inode, file_ctx.inode);
+
+        if (!file_ctx.reader)
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Ifstream for file {} is not initialized", file_meta.file_name);
+
+        auto & reader = file_ctx.reader.value();
+        StorageFileLog::assertStreamGood(reader);
+
+        Record record;
+        while (read_records_size < need_records_size)
+        {
+            /// Need to get offset before reading record from stream
+            auto offset = reader.tellg();
+            if (static_cast<UInt64>(offset) >= file_meta.last_open_end)
+                break;
+            record.offset = offset;
+            StorageFileLog::assertStreamGood(reader);
+
+            record.file_name = file_name;
+
+
+            std::getline(reader, record.data);
+            StorageFileLog::assertStreamGood(reader);
+
+            new_records.emplace_back(record);
+            ++read_records_size;
+        }
+
+        UInt64 current_position = reader.tellg();
+        StorageFileLog::assertStreamGood(reader);
+
+        file_meta.last_writen_position = current_position;
+
+        /// stream reach to end
+        if (current_position == file_meta.last_open_end)
+        {
+            file_ctx.status = StorageFileLog::FileStatus::NO_CHANGE;
+        }
+
+        /// All ifstream reach end
+        if (i == end - 1 && (file_ctx.status == StorageFileLog::FileStatus::NO_CHANGE))
+        {
+            stream_out = true;
+        }
+
+        if (read_records_size == need_records_size)
+        {
+            break;
+        }
+    }
+}
+
+bool ReadBufferFromFileLog::nextImpl()
+{
+    if (!allowed || !hasMorePolledRecords())
+        return false;
+
+    auto * new_position = const_cast<char *>(current->data.data());
+    BufferBase::set(new_position, current->data.size(), 0);
+    allowed = false;
+
+    current_file = current->file_name;
+    current_offset = current->offset;
+
+    ++current;
+
+    return true;
+}
+
+}
diff --git a/src/Storages/FileLog/ReadBufferFromFileLog.h b/src/Storages/FileLog/ReadBufferFromFileLog.h
new file mode 100644
index 00000000000..d581ead951e
--- /dev/null
+++ b/src/Storages/FileLog/ReadBufferFromFileLog.h
@@ -0,0 +1,91 @@
+#pragma once
+
+#include <Core/BackgroundSchedulePool.h>
+#include <IO/ReadBuffer.h>
+#include <Storages/FileLog/StorageFileLog.h>
+
+#include <fstream>
+#include <mutex>
+
+namespace Poco
+{
+    class Logger;
+}
+
+namespace DB
+{
+class ReadBufferFromFileLog : public ReadBuffer
+{
+public:
+    ReadBufferFromFileLog(
+        StorageFileLog & storage_,
+        size_t max_batch_size,
+        size_t poll_timeout_,
+        ContextPtr context_,
+        size_t stream_number_,
+        size_t max_streams_number_);
+
+    ~ReadBufferFromFileLog() override = default;
+
+    auto pollTimeout() const { return poll_timeout; }
+
+    bool hasMorePolledRecords() const { return current != records.end(); }
+
+    bool poll();
+
+    bool noRecords() { return buffer_status == BufferStatus::NO_RECORD_RETURNED; }
+
+    auto getFileName() const { return current_file; }
+    auto getOffset() const { return current_offset; }
+
+private:
+    enum class BufferStatus
+    {
+        INIT,
+        NO_RECORD_RETURNED,
+        POLLED_OK,
+    };
+
+    BufferStatus buffer_status = BufferStatus::INIT;
+
+    Poco::Logger * log;
+
+    StorageFileLog & storage;
+
+    bool stream_out = false;
+
+    size_t batch_size;
+    size_t poll_timeout;
+
+    ContextPtr context;
+
+    size_t stream_number;
+    size_t max_streams_number;
+
+    bool allowed = true;
+
+    using RecordData = std::string;
+    struct Record
+    {
+        RecordData data;
+        std::string file_name;
+        /// Offset is the start of a row, which is needed for virtual columns.
+        UInt64 offset;
+    };
+    using Records = std::vector<Record>;
+
+    Records records;
+    Records::const_iterator current;
+
+    String current_file;
+    UInt64 current_offset = 0;
+
+    using TaskThread = BackgroundSchedulePool::TaskHolder;
+
+    Records pollBatch(size_t batch_size_);
+
+    void readNewRecords(Records & new_records, size_t batch_size_);
+
+    bool nextImpl() override;
+};
+}
diff --git a/src/Storages/FileLog/StorageFileLog.cpp b/src/Storages/FileLog/StorageFileLog.cpp
new file mode 100644
index 00000000000..d9b08762d28
--- /dev/null
+++ b/src/Storages/FileLog/StorageFileLog.cpp
@@ -0,0 +1,973 @@
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteIntText.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <QueryPipeline/Pipe.h>
+#include <Storages/FileLog/FileLogSource.h>
+#include <Storages/FileLog/ReadBufferFromFileLog.h>
+#include <Storages/FileLog/StorageFileLog.h>
+#include <Storages/StorageFactory.h>
+#include <Storages/StorageMaterializedView.h>
+#include <base/logger_useful.h>
+#include <Common/Exception.h>
+#include <Common/Macros.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
+
+#include <sys/stat.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+    extern const int CANNOT_STAT;
+    extern const int BAD_FILE_TYPE;
+    extern const int CANNOT_READ_ALL_DATA;
+    extern const int LOGICAL_ERROR;
+    extern const int TABLE_METADATA_ALREADY_EXISTS;
+    extern const int CANNOT_SELECT;
+    extern const int QUERY_NOT_ALLOWED;
+}
+
+namespace
+{
+    const auto MAX_THREAD_WORK_DURATION_MS = 60000;
+}
+
+StorageFileLog::StorageFileLog(
+    const StorageID & table_id_,
+    ContextPtr context_,
+    const ColumnsDescription & columns_,
+    const String & path_,
+    const String & format_name_,
+    std::unique_ptr<FileLogSettings> settings,
+    const String & comment,
+    bool attach)
+    : IStorage(table_id_)
+    , WithContext(context_->getGlobalContext())
+    , filelog_settings(std::move(settings))
+    , path(path_)
+    , format_name(format_name_)
+    , log(&Poco::Logger::get("StorageFileLog (" + table_id_.table_name + ")"))
+    , milliseconds_to_wait(filelog_settings->poll_directory_watch_events_backoff_init.totalMilliseconds())
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    storage_metadata.setComment(comment);
+    setInMemoryMetadata(storage_metadata);
+
+    try
+    {
+        loadMetaFiles(attach);
+        loadFiles();
+
+        assert(file_infos.file_names.size() == file_infos.meta_by_inode.size());
+        assert(file_infos.file_names.size() == file_infos.context_by_name.size());
+
+        if (path_is_directory)
+            directory_watch = std::make_unique<FileLogDirectoryWatcher>(root_data_path, *this, getContext());
+
+        auto thread = getContext()->getSchedulePool().createTask(log->name(), [this] { threadFunc(); });
+        task = std::make_shared<TaskContext>(std::move(thread));
+    }
+    catch (...)
+    {
+        if (!attach)
+            throw;
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void StorageFileLog::loadMetaFiles(bool attach)
+{
+    const auto & storage = getStorageID();
+    root_meta_path
+        = std::filesystem::path(getContext()->getPath()) / ".filelog_storage_metadata" / storage.getDatabaseName() / storage.getTableName();
+
+    /// Attach table
+    if (attach)
+    {
+        /// Meta file may lost, log and create directory
+        if (!std::filesystem::exists(root_meta_path))
+        {
+            /// Create root_meta_path directory when store meta data
+            LOG_ERROR(log, "Metadata files of table {} are lost.", getStorageID().getTableName());
+        }
+        /// Load all meta info to file_infos;
+        deserialize();
+    }
+    /// Create table, just create meta data directory
+    else
+    {
+        if (std::filesystem::exists(root_meta_path))
+        {
+            throw Exception(
+                ErrorCodes::TABLE_METADATA_ALREADY_EXISTS,
+                "Metadata files already exist by path: {}, remove them manually if it is intended",
+                root_meta_path);
+        }
+        std::filesystem::create_directories(root_meta_path);
+    }
+}
+
+void StorageFileLog::loadFiles()
+{
+    if (!fileOrSymlinkPathStartsWith(path, getContext()->getUserFilesPath()))
+    {
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS, "The absolute data path should be inside `user_files_path`({})", getContext()->getUserFilesPath());
+    }
+
+    auto absolute_path = std::filesystem::absolute(path);
+    absolute_path = absolute_path.lexically_normal(); /// Normalize path.
+
+    if (std::filesystem::is_regular_file(absolute_path))
+    {
+        path_is_directory = false;
+        root_data_path = absolute_path.parent_path();
+
+        file_infos.file_names.push_back(absolute_path.filename());
+    }
+    else if (std::filesystem::is_directory(absolute_path))
+    {
+        root_data_path = absolute_path;
+        /// Just consider file with depth 1
+        for (const auto & dir_entry : std::filesystem::directory_iterator{absolute_path})
+        {
+            if (dir_entry.is_regular_file())
+            {
+                file_infos.file_names.push_back(dir_entry.path().filename());
+            }
+        }
+    }
+    else
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "The path {} neither a regular file, nor a directory", absolute_path.c_str());
+    }
+
+    /// Get files inode
+    for (const auto & file : file_infos.file_names)
+    {
+        auto inode = getInode(getFullDataPath(file));
+        file_infos.context_by_name.emplace(file, FileContext{.inode = inode});
+    }
+
+    /// Update file meta or create file meta
+    for (const auto & [file, ctx] : file_infos.context_by_name)
+    {
+        if (auto it = file_infos.meta_by_inode.find(ctx.inode); it != file_infos.meta_by_inode.end())
+        {
+            /// data file have been renamed, need update meta file's name
+            if (it->second.file_name != file)
+            {
+                std::filesystem::rename(getFullMetaPath(it->second.file_name), getFullMetaPath(file));
+                it->second.file_name = file;
+            }
+        }
+        /// New file
+        else
+        {
+            FileMeta meta{file, 0, 0};
+            file_infos.meta_by_inode.emplace(ctx.inode, meta);
+        }
+    }
+
+    /// Clear unneeded meta file, because data files may be deleted
+    if (file_infos.meta_by_inode.size() > file_infos.context_by_name.size())
+    {
+        InodeToFileMeta valid_metas;
+        valid_metas.reserve(file_infos.context_by_name.size());
+        for (const auto & [inode, meta] : file_infos.meta_by_inode)
+        {
+            /// Note, here we need to use inode to judge does the meta file is valid.
+            /// In the case that when a file deleted, then we create new file with the
+            /// same name, it will have different inode number with stored meta file,
+            /// so the stored meta file is invalid
+            if (auto it = file_infos.context_by_name.find(meta.file_name);
+                it != file_infos.context_by_name.end() && it->second.inode == inode)
+                valid_metas.emplace(inode, meta);
+            /// Delete meta file from filesystem
+            else
+                std::filesystem::remove(getFullMetaPath(meta.file_name));
+        }
+        file_infos.meta_by_inode.swap(valid_metas);
+    }
+}
+
+void StorageFileLog::serialize() const
+{
+    if (!std::filesystem::exists(root_meta_path))
+    {
+        std::filesystem::create_directories(root_meta_path);
+    }
+    for (const auto & [inode, meta] : file_infos.meta_by_inode)
+    {
+        auto full_name = getFullMetaPath(meta.file_name);
+        if (!std::filesystem::exists(full_name))
+        {
+            FS::createFile(full_name);
+        }
+        else
+        {
+            checkOffsetIsValid(full_name, meta.last_writen_position);
+        }
+        WriteBufferFromFile out(full_name);
+        writeIntText(inode, out);
+        writeChar('\n', out);
+        writeIntText(meta.last_writen_position, out);
+    }
+}
+
+void StorageFileLog::serialize(UInt64 inode, const FileMeta & file_meta) const
+{
+    if (!std::filesystem::exists(root_meta_path))
+    {
+        std::filesystem::create_directories(root_meta_path);
+    }
+    auto full_name = getFullMetaPath(file_meta.file_name);
+    if (!std::filesystem::exists(full_name))
+    {
+        FS::createFile(full_name);
+    }
+    else
+    {
+        checkOffsetIsValid(full_name, file_meta.last_writen_position);
+    }
+    WriteBufferFromFile out(full_name);
+    writeIntText(inode, out);
+    writeChar('\n', out);
+    writeIntText(file_meta.last_writen_position, out);
+}
+
+void StorageFileLog::deserialize()
+{
+    if (!std::filesystem::exists(root_meta_path))
+        return;
+    /// In case of single file (not a watched directory),
+    /// iterated directory always has one file inside.
+    for (const auto & dir_entry : std::filesystem::directory_iterator{root_meta_path})
+    {
+        if (!dir_entry.is_regular_file())
+        {
+            throw Exception(
+                ErrorCodes::BAD_FILE_TYPE,
+                "The file {} under {} is not a regular file when deserializing meta files",
+                dir_entry.path().c_str(),
+                root_meta_path);
+        }
+
+        ReadBufferFromFile in(dir_entry.path().c_str());
+        FileMeta meta;
+        UInt64 inode, last_written_pos;
+
+        if (!tryReadIntText(inode, in))
+        {
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Read meta file {} failed", dir_entry.path().c_str());
+        }
+        assertChar('\n', in);
+        if (!tryReadIntText(last_written_pos, in))
+        {
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Read meta file {} failed", dir_entry.path().c_str());
+        }
+
+        meta.file_name = dir_entry.path().filename();
+        meta.last_writen_position = last_written_pos;
+
+        file_infos.meta_by_inode.emplace(inode, meta);
+    }
+}
+
+UInt64 StorageFileLog::getInode(const String & file_name)
+{
+    struct stat file_stat;
+    if (stat(file_name.c_str(), &file_stat))
+    {
+        throw Exception(ErrorCodes::CANNOT_STAT, "Can not get stat info of file {}", file_name);
+    }
+    return file_stat.st_ino;
+}
+
+Pipe StorageFileLog::read(
+    const Names & column_names,
+    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & /* query_info */,
+    ContextPtr local_context,
+    QueryProcessingStage::Enum /* processed_stage */,
+    size_t /* max_block_size */,
+    unsigned /* num_streams */)
+{
+    /// If there are MVs depended on this table, we just forbid reading
+    if (has_dependent_mv)
+    {
+        throw Exception(
+            ErrorCodes::QUERY_NOT_ALLOWED,
+            "Can not make `SELECT` query from table {}, because it has attached dependencies. Remove dependent materialized views if "
+            "needed",
+            getStorageID().getTableName());
+    }
+
+    std::lock_guard<std::mutex> lock(file_infos_mutex);
+    if (running_streams)
+    {
+        throw Exception("Another select query is running on this table, need to wait it finish.", ErrorCodes::CANNOT_SELECT);
+    }
+
+    updateFileInfos();
+
+    /// No files to parse
+    if (file_infos.file_names.empty())
+    {
+        LOG_WARNING(log, "There is a idle table named {}, no files need to parse.", getName());
+        return Pipe{};
+    }
+
+    auto modified_context = Context::createCopy(local_context);
+
+    auto max_streams_number = std::min<UInt64>(filelog_settings->max_threads, file_infos.file_names.size());
+
+    /// Each stream responsible for closing it's files and store meta
+    openFilesAndSetPos();
+
+    Pipes pipes;
+    pipes.reserve(max_streams_number);
+    for (size_t stream_number = 0; stream_number < max_streams_number; ++stream_number)
+    {
+        pipes.emplace_back(std::make_shared<FileLogSource>(
+            *this,
+            metadata_snapshot,
+            modified_context,
+            column_names,
+            getMaxBlockSize(),
+            getPollTimeoutMillisecond(),
+            stream_number,
+            max_streams_number));
+    }
+
+    return Pipe::unitePipes(std::move(pipes));
+}
+
+void StorageFileLog::increaseStreams()
+{
+    running_streams += 1;
+}
+
+void StorageFileLog::reduceStreams()
+{
+    running_streams -= 1;
+}
+
+void StorageFileLog::drop()
+{
+    try
+    {
+        if (std::filesystem::exists(root_meta_path))
+            std::filesystem::remove_all(root_meta_path);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void StorageFileLog::startup()
+{
+    try
+    {
+        if (task)
+        {
+            task->holder->activateAndSchedule();
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void StorageFileLog::shutdown()
+{
+    try
+    {
+        if (task)
+        {
+            task->stream_cancelled = true;
+
+            /// Reader thread may wait for wake up
+            wakeUp();
+
+            LOG_TRACE(log, "Waiting for cleanup");
+            task->holder->deactivate();
+        }
+        /// If no reading call and threadFunc, the log files will never
+        /// be opened, also just leave the work of close files and
+        /// store meta to streams. because if we close files in here,
+        /// may result in data race with unfinishing reading pipeline
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+        task->holder->deactivate();
+    }
+}
+
+void StorageFileLog::assertStreamGood(const std::ifstream & reader)
+{
+    if (!reader.good())
+    {
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Stream is in bad state");
+    }
+}
+
+void StorageFileLog::openFilesAndSetPos()
+{
+    for (const auto & file : file_infos.file_names)
+    {
+        auto & file_ctx = findInMap(file_infos.context_by_name, file);
+        if (file_ctx.status != FileStatus::NO_CHANGE)
+        {
+            file_ctx.reader.emplace(getFullDataPath(file));
+            auto & reader = file_ctx.reader.value();
+            assertStreamGood(reader);
+
+            reader.seekg(0, reader.end);
+            assertStreamGood(reader);
+
+            auto file_end = reader.tellg();
+            assertStreamGood(reader);
+
+            auto & meta = findInMap(file_infos.meta_by_inode, file_ctx.inode);
+            if (meta.last_writen_position > static_cast<UInt64>(file_end))
+            {
+                throw Exception(
+                    ErrorCodes::CANNOT_READ_ALL_DATA,
+                    "Last saved offsset for File {} is bigger than file size ({} > {})",
+                    file,
+                    meta.last_writen_position,
+                    file_end);
+            }
+            /// update file end at the moment, used in ReadBuffer and serialize
+            meta.last_open_end = file_end;
+
+            reader.seekg(meta.last_writen_position);
+            assertStreamGood(reader);
+        }
+    }
+    serialize();
+}
+
+void StorageFileLog::closeFilesAndStoreMeta(size_t start, size_t end)
+{
+    assert(start >= 0);
+    assert(start < end);
+    assert(end <= file_infos.file_names.size());
+
+    for (size_t i = start; i < end; ++i)
+    {
+        auto & file_ctx = findInMap(file_infos.context_by_name, file_infos.file_names[i]);
+
+        if (file_ctx.reader)
+        {
+            if (file_ctx.reader->is_open())
+                file_ctx.reader->close();
+        }
+
+        auto & meta = findInMap(file_infos.meta_by_inode, file_ctx.inode);
+        serialize(file_ctx.inode, meta);
+    }
+}
+
+void StorageFileLog::storeMetas(size_t start, size_t end)
+{
+    assert(start >= 0);
+    assert(start < end);
+    assert(end <= file_infos.file_names.size());
+
+    for (size_t i = start; i < end; ++i)
+    {
+        auto & file_ctx = findInMap(file_infos.context_by_name, file_infos.file_names[i]);
+
+        auto & meta = findInMap(file_infos.meta_by_inode, file_ctx.inode);
+        serialize(file_ctx.inode, meta);
+    }
+}
+
+void StorageFileLog::checkOffsetIsValid(const String & full_name, UInt64 offset)
+{
+    ReadBufferFromFile in(full_name);
+    UInt64 _, last_written_pos;
+
+    if (!tryReadIntText(_, in))
+    {
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Read meta file {} failed", full_name);
+    }
+    assertChar('\n', in);
+    if (!tryReadIntText(last_written_pos, in))
+    {
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Read meta file {} failed", full_name);
+    }
+    if (last_written_pos > offset)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR, "Last stored last_written_pos in meta file {} is bigger than current last_written_pos", full_name);
+}
+
+size_t StorageFileLog::getMaxBlockSize() const
+{
+    return filelog_settings->max_block_size.changed ? filelog_settings->max_block_size.value
+                                                    : getContext()->getSettingsRef().max_insert_block_size.value;
+}
+
+size_t StorageFileLog::getPollMaxBatchSize() const
+{
+    size_t batch_size = filelog_settings->poll_max_batch_size.changed ? filelog_settings->poll_max_batch_size.value
+                                                                      : getContext()->getSettingsRef().max_block_size.value;
+    return std::min(batch_size, getMaxBlockSize());
+}
+
+size_t StorageFileLog::getPollTimeoutMillisecond() const
+{
+    return filelog_settings->poll_timeout_ms.changed ? filelog_settings->poll_timeout_ms.totalMilliseconds()
+                                                     : getContext()->getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
+}
+
+bool StorageFileLog::checkDependencies(const StorageID & table_id)
+{
+    // Check if all dependencies are attached
+    auto dependencies = DatabaseCatalog::instance().getDependencies(table_id);
+    if (dependencies.empty())
+        return true;
+
+    for (const auto & storage : dependencies)
+    {
+        auto table = DatabaseCatalog::instance().tryGetTable(storage, getContext());
+        if (!table)
+            return false;
+
+        // If it materialized view, check it's target table
+        auto * materialized_view = dynamic_cast<StorageMaterializedView *>(table.get());
+        if (materialized_view && !materialized_view->tryGetTargetTable())
+            return false;
+
+        // Check all its dependencies
+        if (!checkDependencies(storage))
+            return false;
+    }
+
+    return true;
+}
+
+size_t StorageFileLog::getTableDependentCount() const
+{
+    auto table_id = getStorageID();
+    // Check if at least one direct dependency is attached
+    return DatabaseCatalog::instance().getDependencies(table_id).size();
+}
+
+void StorageFileLog::threadFunc()
+{
+    bool reschedule = false;
+    try
+    {
+        auto table_id = getStorageID();
+
+        auto dependencies_count = getTableDependentCount();
+
+        if (dependencies_count)
+        {
+            has_dependent_mv = true;
+            auto start_time = std::chrono::steady_clock::now();
+
+            // Keep streaming as long as there are attached views and streaming is not cancelled
+            while (!task->stream_cancelled)
+            {
+                if (!checkDependencies(table_id))
+                {
+                    /// For this case, we can not wait for watch thread to wake up
+                    reschedule = true;
+                    break;
+                }
+
+                LOG_DEBUG(log, "Started streaming to {} attached views", dependencies_count);
+
+                if (streamToViews())
+                {
+                    LOG_TRACE(log, "Stream stalled. Reschedule.");
+                    if (milliseconds_to_wait
+                        < static_cast<uint64_t>(filelog_settings->poll_directory_watch_events_backoff_max.totalMilliseconds()))
+                        milliseconds_to_wait *= filelog_settings->poll_directory_watch_events_backoff_factor.value;
+                    break;
+                }
+                else
+                {
+                    milliseconds_to_wait = filelog_settings->poll_directory_watch_events_backoff_init.totalMilliseconds();
+                }
+
+                auto ts = std::chrono::steady_clock::now();
+                auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(ts-start_time);
+                if (duration.count() > MAX_THREAD_WORK_DURATION_MS)
+                {
+                    LOG_TRACE(log, "Thread work duration limit exceeded. Reschedule.");
+                    reschedule = true;
+                    break;
+                }
+            }
+        }
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+    // Wait for attached views
+    if (!task->stream_cancelled)
+    {
+        if (path_is_directory)
+        {
+            if (!getTableDependentCount() || reschedule)
+                task->holder->scheduleAfter(milliseconds_to_wait);
+            else
+            {
+                std::unique_lock<std::mutex> lock(mutex);
+                /// Waiting for watch directory thread to wake up
+                cv.wait(lock, [this] { return has_new_events; });
+                has_new_events = false;
+
+                if (task->stream_cancelled)
+                    return;
+                task->holder->schedule();
+            }
+        }
+        else
+            task->holder->scheduleAfter(milliseconds_to_wait);
+    }
+}
+
+bool StorageFileLog::streamToViews()
+{
+    std::lock_guard<std::mutex> lock(file_infos_mutex);
+    if (running_streams)
+    {
+        LOG_INFO(log, "Another select query is running on this table, need to wait it finish.");
+        return true;
+    }
+
+    Stopwatch watch;
+
+    auto table_id = getStorageID();
+    auto table = DatabaseCatalog::instance().getTable(table_id, getContext());
+    if (!table)
+        throw Exception("Engine table " + table_id.getNameForLogs() + " doesn't exist", ErrorCodes::LOGICAL_ERROR);
+    auto metadata_snapshot = getInMemoryMetadataPtr();
+
+    auto max_streams_number = std::min<UInt64>(filelog_settings->max_threads.value, file_infos.file_names.size());
+    /// No files to parse
+    if (max_streams_number == 0)
+    {
+        LOG_INFO(log, "There is a idle table named {}, no files need to parse.", getName());
+        return updateFileInfos();
+    }
+
+    // Create an INSERT query for streaming data
+    auto insert = std::make_shared<ASTInsertQuery>();
+    insert->table_id = table_id;
+
+    auto new_context = Context::createCopy(getContext());
+
+    InterpreterInsertQuery interpreter(insert, new_context, false, true, true);
+    auto block_io = interpreter.execute();
+
+    /// Each stream responsible for closing it's files and store meta
+    openFilesAndSetPos();
+
+    Pipes pipes;
+    pipes.reserve(max_streams_number);
+    for (size_t stream_number = 0; stream_number < max_streams_number; ++stream_number)
+    {
+        pipes.emplace_back(std::make_shared<FileLogSource>(
+            *this,
+            metadata_snapshot,
+            new_context,
+            block_io.pipeline.getHeader().getNames(),
+            getPollMaxBatchSize(),
+            getPollTimeoutMillisecond(),
+            stream_number,
+            max_streams_number));
+    }
+
+    auto input= Pipe::unitePipes(std::move(pipes));
+
+    assertBlocksHaveEqualStructure(input.getHeader(), block_io.pipeline.getHeader(), "StorageFileLog streamToViews");
+
+    size_t rows = 0;
+    {
+        block_io.pipeline.complete(std::move(input));
+        block_io.pipeline.setProgressCallback([&](const Progress & progress) { rows += progress.read_rows.load(); });
+        CompletedPipelineExecutor executor(block_io.pipeline);
+        executor.execute();
+    }
+
+    UInt64 milliseconds = watch.elapsedMilliseconds();
+    LOG_DEBUG(log, "Pushing {} rows to {} took {} ms.", rows, table_id.getNameForLogs(), milliseconds);
+
+    return updateFileInfos();
+}
+
+void StorageFileLog::wakeUp()
+{
+    std::unique_lock<std::mutex> lock(mutex);
+    has_new_events = true;
+    lock.unlock();
+    cv.notify_one();
+}
+
+void registerStorageFileLog(StorageFactory & factory)
+{
+    auto creator_fn = [](const StorageFactory::Arguments & args)
+    {
+        ASTs & engine_args = args.engine_args;
+        size_t args_count = engine_args.size();
+
+        bool has_settings = args.storage_def->settings;
+
+        auto filelog_settings = std::make_unique<FileLogSettings>();
+        if (has_settings)
+        {
+            filelog_settings->loadFromQuery(*args.storage_def);
+        }
+
+        auto physical_cpu_cores = getNumberOfPhysicalCPUCores();
+        auto num_threads = filelog_settings->max_threads.value;
+
+        if (num_threads > physical_cpu_cores)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Number of threads to parse files can not be bigger than {}", physical_cpu_cores);
+        }
+        else if (num_threads < 1)
+        {
+            throw Exception("Number of threads to parse files can not be lower than 1", ErrorCodes::BAD_ARGUMENTS);
+        }
+
+        if (filelog_settings->max_block_size.changed && filelog_settings->max_block_size.value < 1)
+        {
+            throw Exception("filelog_max_block_size can not be lower than 1", ErrorCodes::BAD_ARGUMENTS);
+        }
+
+        if (filelog_settings->poll_max_batch_size.changed && filelog_settings->poll_max_batch_size.value < 1)
+        {
+            throw Exception("filelog_poll_max_batch_size can not be lower than 1", ErrorCodes::BAD_ARGUMENTS);
+        }
+
+        size_t init_sleep_time = filelog_settings->poll_directory_watch_events_backoff_init.totalMilliseconds();
+        size_t max_sleep_time = filelog_settings->poll_directory_watch_events_backoff_max.totalMilliseconds();
+        if (init_sleep_time > max_sleep_time)
+        {
+            throw Exception(
+                "poll_directory_watch_events_backoff_init can not be greater than poll_directory_watch_events_backoff_max",
+                ErrorCodes::BAD_ARGUMENTS);
+        }
+
+        if (filelog_settings->poll_directory_watch_events_backoff_factor.changed
+            && !filelog_settings->poll_directory_watch_events_backoff_factor.value)
+            throw Exception("poll_directory_watch_events_backoff_factor can not be 0", ErrorCodes::BAD_ARGUMENTS);
+
+        if (args_count != 2)
+            throw Exception(
+                "Arguments size of StorageFileLog should be 2, path and format name", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        auto path_ast = evaluateConstantExpressionAsLiteral(engine_args[0], args.getContext());
+        auto format_ast = evaluateConstantExpressionAsLiteral(engine_args[1], args.getContext());
+
+        auto path = path_ast->as<ASTLiteral &>().value.safeGet<String>();
+        auto format = format_ast->as<ASTLiteral &>().value.safeGet<String>();
+
+        return StorageFileLog::create(
+            args.table_id,
+            args.getContext(),
+            args.columns,
+            path,
+            format,
+            std::move(filelog_settings),
+            args.comment,
+            args.attach);
+    };
+
+    factory.registerStorage(
+        "FileLog",
+        creator_fn,
+        StorageFactory::StorageFeatures{
+            .supports_settings = true,
+        });
+}
+
+bool StorageFileLog::updateFileInfos()
+{
+    if (!directory_watch)
+    {
+        /// For table just watch one file, we can not use directory monitor to watch it
+        if (!path_is_directory)
+        {
+            assert(file_infos.file_names.size() == file_infos.meta_by_inode.size());
+            assert(file_infos.file_names.size() == file_infos.context_by_name.size());
+            assert(file_infos.file_names.size() == 1);
+
+            if (auto it = file_infos.context_by_name.find(file_infos.file_names[0]); it != file_infos.context_by_name.end())
+            {
+                it->second.status = FileStatus::UPDATED;
+                return true;
+            }
+        }
+        return false;
+    }
+    /// Do not need to hold file_status lock, since it will be holded
+    /// by caller when call this function
+    auto error = directory_watch->getErrorAndReset();
+    if (error.has_error)
+        LOG_ERROR(log, "Error happened during watching directory {}: {}", directory_watch->getPath(), error.error_msg);
+
+    /// These file infos should always have same size(one for one) before update and after update
+    assert(file_infos.file_names.size() == file_infos.meta_by_inode.size());
+    assert(file_infos.file_names.size() == file_infos.context_by_name.size());
+
+    auto events = directory_watch->getEventsAndReset();
+
+    for (const auto & [file_name, event_infos] : events)
+    {
+        String file_path = getFullDataPath(file_name);
+        for (const auto & event_info : event_infos.file_events)
+        {
+            switch (event_info.type)
+            {
+                case DirectoryWatcherBase::DW_ITEM_ADDED:
+                {
+                    LOG_TRACE(log, "New event {} watched, file_name: {}", event_info.callback, file_name);
+                    /// Check if it is a regular file, and new file may be renamed or removed
+                    if (std::filesystem::is_regular_file(file_path))
+                    {
+                        auto inode = getInode(file_path);
+
+                        file_infos.file_names.push_back(file_name);
+
+                        if (auto it = file_infos.meta_by_inode.find(inode); it != file_infos.meta_by_inode.end())
+                            it->second = FileMeta{.file_name = file_name};
+                        else
+                            file_infos.meta_by_inode.emplace(inode, FileMeta{.file_name = file_name});
+
+                        if (auto it = file_infos.context_by_name.find(file_name); it != file_infos.context_by_name.end())
+                            it->second = FileContext{.status = FileStatus::OPEN, .inode = inode};
+                        else
+                            file_infos.context_by_name.emplace(file_name, FileContext{.inode = inode});
+                    }
+                    break;
+                }
+
+                case DirectoryWatcherBase::DW_ITEM_MODIFIED:
+                {
+                    LOG_TRACE(log, "New event {} watched, file_name: {}", event_info.callback, file_name);
+                    /// When new file added and appended, it has two event: DW_ITEM_ADDED
+                    /// and DW_ITEM_MODIFIED, since the order of these two events in the
+                    /// sequence is uncentain, so we may can not find it in file_infos, just
+                    /// skip it, the file info will be handled in DW_ITEM_ADDED case.
+                    if (auto it = file_infos.context_by_name.find(file_name); it != file_infos.context_by_name.end())
+                        it->second.status = FileStatus::UPDATED;
+                    break;
+                }
+
+                case DirectoryWatcherBase::DW_ITEM_REMOVED:
+                case DirectoryWatcherBase::DW_ITEM_MOVED_FROM:
+                {
+                    LOG_TRACE(log, "New event {} watched, file_name: {}", event_info.callback, file_name);
+                    if (auto it = file_infos.context_by_name.find(file_name); it != file_infos.context_by_name.end())
+                        it->second.status = FileStatus::REMOVED;
+                    break;
+                }
+                case DirectoryWatcherBase::DW_ITEM_MOVED_TO:
+                {
+                    LOG_TRACE(log, "New event {} watched, file_name: {}", event_info.callback, file_name);
+
+                    /// Similar to DW_ITEM_ADDED, but if it removed from an old file
+                    /// should obtain old meta file and rename meta file
+                    if (std::filesystem::is_regular_file(file_path))
+                    {
+                        file_infos.file_names.push_back(file_name);
+                        auto inode = getInode(file_path);
+
+                        if (auto it = file_infos.context_by_name.find(file_name); it != file_infos.context_by_name.end())
+                            it->second = FileContext{.inode = inode};
+                        else
+                            file_infos.context_by_name.emplace(file_name, FileContext{.inode = inode});
+
+                        /// File has been renamed, we should also rename meta file
+                        if (auto it = file_infos.meta_by_inode.find(inode); it != file_infos.meta_by_inode.end())
+                        {
+                            auto old_name = it->second.file_name;
+                            it->second.file_name = file_name;
+                            if (std::filesystem::exists(getFullMetaPath(old_name)))
+                                std::filesystem::rename(getFullMetaPath(old_name), getFullMetaPath(file_name));
+                        }
+                        /// May move from other place, adding new meta info
+                        else
+                            file_infos.meta_by_inode.emplace(inode, FileMeta{.file_name = file_name});
+                    }
+                }
+            }
+        }
+    }
+    std::vector<String> valid_files;
+
+    /// Remove file infos with REMOVE status
+    for (const auto & file_name : file_infos.file_names)
+    {
+        if (auto it = file_infos.context_by_name.find(file_name); it != file_infos.context_by_name.end())
+        {
+            if (it->second.status == FileStatus::REMOVED)
+            {
+                /// We need to check that this inode does not hold by other file(mv),
+                /// otherwise, we can not destroy it.
+                auto inode = it->second.inode;
+                /// If it's now hold by other file, than the file_name should has
+                /// been changed during updating file_infos
+                if (auto meta = file_infos.meta_by_inode.find(inode);
+                    meta != file_infos.meta_by_inode.end() && meta->second.file_name == file_name)
+                    file_infos.meta_by_inode.erase(meta);
+
+                if (std::filesystem::exists(getFullMetaPath(file_name)))
+                    std::filesystem::remove(getFullMetaPath(file_name));
+                file_infos.context_by_name.erase(it);
+            }
+            else
+            {
+                valid_files.push_back(file_name);
+            }
+        }
+    }
+    file_infos.file_names.swap(valid_files);
+
+    /// These file infos should always have same size(one for one)
+    assert(file_infos.file_names.size() == file_infos.meta_by_inode.size());
+    assert(file_infos.file_names.size() == file_infos.context_by_name.size());
+
+    return events.empty() || file_infos.file_names.empty();
+}
+
+NamesAndTypesList StorageFileLog::getVirtuals() const
+{
+    return NamesAndTypesList{{"_filename", std::make_shared<DataTypeString>()}, {"_offset", std::make_shared<DataTypeUInt64>()}};
+}
+
+Names StorageFileLog::getVirtualColumnNames()
+{
+    return {"_filename", "_offset"};
+}
+}
diff --git a/src/Storages/FileLog/StorageFileLog.h b/src/Storages/FileLog/StorageFileLog.h
new file mode 100644
index 00000000000..e1d95ae736f
--- /dev/null
+++ b/src/Storages/FileLog/StorageFileLog.h
@@ -0,0 +1,215 @@
+#pragma once
+
+#include <Storages/FileLog/Buffer_fwd.h>
+#include <Storages/FileLog/FileLogDirectoryWatcher.h>
+#include <Storages/FileLog/FileLogSettings.h>
+
+#include <Core/BackgroundSchedulePool.h>
+#include <Storages/IStorage.h>
+#include <Common/SettingsChanges.h>
+
+#include <base/shared_ptr_helper.h>
+
+#include <atomic>
+#include <condition_variable>
+#include <filesystem>
+#include <fstream>
+#include <mutex>
+#include <optional>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+class FileLogDirectoryWatcher;
+
+class StorageFileLog final : public shared_ptr_helper<StorageFileLog>, public IStorage, WithContext
+{
+    friend struct shared_ptr_helper<StorageFileLog>;
+
+public:
+
+    using Files = std::vector<String>;
+
+    std::string getName() const override { return "FileLog"; }
+
+    bool noPushingToViews() const override { return true; }
+
+    void startup() override;
+    void shutdown() override;
+
+    Pipe read(
+        const Names & column_names,
+        const StorageMetadataPtr & /*metadata_snapshot*/,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t max_block_size,
+        unsigned num_streams) override;
+
+    void drop() override;
+
+    /// We need to call drop() immediately to remove meta data directory,
+    /// otherwise, if another filelog table with same name created before
+    /// the table be dropped finally, then its meta data directory will
+    /// be deleted by this table drop finally
+    bool dropTableImmediately() override { return true; }
+
+    const auto & getFormatName() const { return format_name; }
+
+    enum class FileStatus
+    {
+        OPEN, /// first time open file after table start up
+        NO_CHANGE,
+        UPDATED,
+        REMOVED,
+    };
+
+    struct FileContext
+    {
+        FileStatus status = FileStatus::OPEN;
+        UInt64 inode{};
+        std::optional<std::ifstream> reader = std::nullopt;
+    };
+
+    struct FileMeta
+    {
+        String file_name;
+        UInt64 last_writen_position = 0;
+        UInt64 last_open_end = 0;
+    };
+
+    using InodeToFileMeta = std::unordered_map<UInt64, FileMeta>;
+    using FileNameToContext = std::unordered_map<String, FileContext>;
+
+    struct FileInfos
+    {
+        InodeToFileMeta meta_by_inode;
+        FileNameToContext context_by_name;
+        /// file names without path
+        Names file_names;
+    };
+
+    auto & getFileInfos() { return file_infos; }
+
+    String getFullMetaPath(const String & file_name) const { return std::filesystem::path(root_meta_path) / file_name; }
+    String getFullDataPath(const String & file_name) const { return std::filesystem::path(root_data_path) / file_name; }
+
+    NamesAndTypesList getVirtuals() const override;
+
+    static Names getVirtualColumnNames();
+
+    static UInt64 getInode(const String & file_name);
+
+    void openFilesAndSetPos();
+
+    /// Used in FileLogSource when finish generating all blocks.
+    /// Each stream responsible for close its files and store meta.
+    void closeFilesAndStoreMeta(size_t start, size_t end);
+
+    /// Used in FileLogSource after generating every block
+    void storeMetas(size_t start, size_t end);
+
+    static void assertStreamGood(const std::ifstream & reader);
+
+    template <typename K, typename V>
+    static V & findInMap(std::unordered_map<K, V> & map, const K & key)
+    {
+        if (auto it = map.find(key); it != map.end())
+            return it->second;
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "The key {} doesn't exist.", key);
+    }
+
+    void increaseStreams();
+    void reduceStreams();
+
+    void wakeUp();
+
+    const auto & getFileLogSettings() const { return filelog_settings; }
+
+protected:
+    StorageFileLog(
+        const StorageID & table_id_,
+        ContextPtr context_,
+        const ColumnsDescription & columns_,
+        const String & path_,
+        const String & format_name_,
+        std::unique_ptr<FileLogSettings> settings,
+        const String & comment,
+        bool attach);
+
+private:
+    std::unique_ptr<FileLogSettings> filelog_settings;
+
+    const String path;
+    bool path_is_directory = true;
+
+    /// If path argument of the table is a regular file, it equals to user_files_path
+    /// otherwise, it equals to user_files_path/ + path_argument/, e.g. path
+    String root_data_path;
+    String root_meta_path;
+
+    FileInfos file_infos;
+
+    const String format_name;
+    Poco::Logger * log;
+
+    uint64_t milliseconds_to_wait;
+
+    /// In order to avoid data race, using a naive trick to forbid execute two select
+    /// simultaneously, although read is not useful in this engine. Using an atomic
+    /// variable to records current unfinishing streams, then if have unfinishing streams,
+    /// later select should forbid to execute.
+    std::atomic<int> running_streams = 0;
+
+    std::mutex mutex;
+    bool has_new_events = false;
+    std::condition_variable cv;
+
+    bool has_dependent_mv = false;
+
+    std::mutex file_infos_mutex;
+
+    struct TaskContext
+    {
+        BackgroundSchedulePool::TaskHolder holder;
+        std::atomic<bool> stream_cancelled {false};
+        explicit TaskContext(BackgroundSchedulePool::TaskHolder&& task_) : holder(std::move(task_))
+        {
+        }
+    };
+    std::shared_ptr<TaskContext> task;
+
+    std::unique_ptr<FileLogDirectoryWatcher> directory_watch = nullptr;
+
+    void loadFiles();
+
+    void loadMetaFiles(bool attach);
+
+    void threadFunc();
+
+    size_t getPollMaxBatchSize() const;
+    size_t getMaxBlockSize() const;
+    size_t getPollTimeoutMillisecond() const;
+
+    bool streamToViews();
+    bool checkDependencies(const StorageID & table_id);
+
+    bool updateFileInfos();
+
+    size_t getTableDependentCount() const;
+
+    /// Used in shutdown()
+    void serialize() const;
+    /// Used in FileSource closeFileAndStoreMeta(file_name);
+    void serialize(UInt64 inode, const FileMeta & file_meta) const;
+
+    void deserialize();
+    static void checkOffsetIsValid(const String & full_name, UInt64 offset);
+};
+
+}
diff --git a/src/Storages/HDFS/HDFSCommon.cpp b/src/Storages/HDFS/HDFSCommon.cpp
index d7e57a0f9eb..25c454e7500 100644
--- a/src/Storages/HDFS/HDFSCommon.cpp
+++ b/src/Storages/HDFS/HDFSCommon.cpp
@@ -7,7 +7,7 @@
 #include <Common/Exception.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -123,6 +123,12 @@ HDFSBuilderWrapper createHDFSBuilder(const String & uri_str, const Poco::Util::A
     if (host.empty())
         throw Exception("Illegal HDFS URI: " + uri.toString(), ErrorCodes::BAD_ARGUMENTS);
 
+    // Shall set env LIBHDFS3_CONF *before* HDFSBuilderWrapper construction.
+    const String & libhdfs3_conf = config.getString(HDFSBuilderWrapper::CONFIG_PREFIX + ".libhdfs3_conf", "");
+    if (!libhdfs3_conf.empty())
+    {
+        setenv("LIBHDFS3_CONF", libhdfs3_conf.c_str(), 1);
+    }
     HDFSBuilderWrapper builder;
     if (builder.get() == nullptr)
         throw Exception("Unable to create builder to connect to HDFS: " +
diff --git a/src/Storages/HDFS/HDFSCommon.h b/src/Storages/HDFS/HDFSCommon.h
index 5c70a8997c3..877bf7dd74f 100644
--- a/src/Storages/HDFS/HDFSCommon.h
+++ b/src/Storages/HDFS/HDFSCommon.h
@@ -1,16 +1,14 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_HDFS
 #include <memory>
 #include <type_traits>
 #include <vector>
 
-#include <hdfs/hdfs.h> // Y_IGNORE
-#include <common/types.h>
+#include <hdfs/hdfs.h>
+#include <base/types.h>
 #include <mutex>
 
 #include <Interpreters/Context.h>
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
index d241bd07294..2fc72c58b64 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
@@ -15,6 +15,7 @@ namespace ErrorCodes
     extern const int CANNOT_OPEN_FILE;
     extern const int CANNOT_SEEK_THROUGH_FILE;
     extern const int SEEK_POSITION_OUT_OF_BOUND;
+    extern const int LOGICAL_ERROR;
 }
 
 ReadBufferFromHDFS::~ReadBufferFromHDFS() = default;
@@ -33,16 +34,18 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<S
 
     off_t offset = 0;
     bool initialized = false;
+    off_t read_until_position = 0;
 
     explicit ReadBufferFromHDFSImpl(
         const std::string & hdfs_uri_,
         const std::string & hdfs_file_path_,
         const Poco::Util::AbstractConfiguration & config_,
-        size_t buf_size_)
+        size_t buf_size_, size_t read_until_position_)
         : BufferWithOwnMemory<SeekableReadBuffer>(buf_size_)
         , hdfs_uri(hdfs_uri_)
         , hdfs_file_path(hdfs_file_path_)
         , builder(createHDFSBuilder(hdfs_uri_, config_))
+        , read_until_position(read_until_position_)
     {
         std::lock_guard lock(hdfs_init_mutex);
 
@@ -79,16 +82,37 @@ struct ReadBufferFromHDFS::ReadBufferFromHDFSImpl : public BufferWithOwnMemory<S
             initialized = true;
         }
 
-        int bytes_read = hdfsRead(fs.get(), fin, internal_buffer.begin(), internal_buffer.size());
+        size_t num_bytes_to_read;
+        if (read_until_position)
+        {
+            if (read_until_position == offset)
+                return false;
+
+            if (read_until_position < offset)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, read_until_position - 1);
+
+            num_bytes_to_read = read_until_position - offset;
+        }
+        else
+        {
+            num_bytes_to_read = internal_buffer.size();
+        }
+
+        int bytes_read = hdfsRead(fs.get(), fin, internal_buffer.begin(), num_bytes_to_read);
         if (bytes_read < 0)
             throw Exception(ErrorCodes::NETWORK_ERROR,
                 "Fail to read from HDFS: {}, file path: {}. Error: {}",
                 hdfs_uri, hdfs_file_path, std::string(hdfsGetLastError()));
 
-        working_buffer.resize(bytes_read);
-        offset += bytes_read;
+        if (bytes_read)
+        {
+            working_buffer = internal_buffer;
+            working_buffer.resize(bytes_read);
+            offset += bytes_read;
+            return true;
+        }
 
-        return bytes_read;
+        return false;
     }
 
     off_t seek(off_t offset_, int whence) override
@@ -120,25 +144,22 @@ ReadBufferFromHDFS::ReadBufferFromHDFS(
         const String & hdfs_uri_,
         const String & hdfs_file_path_,
         const Poco::Util::AbstractConfiguration & config_,
-        size_t buf_size_)
+        size_t buf_size_, size_t read_until_position_)
     : SeekableReadBuffer(nullptr, 0)
-    , impl(std::make_unique<ReadBufferFromHDFSImpl>(hdfs_uri_, hdfs_file_path_, config_, buf_size_))
+    , impl(std::make_unique<ReadBufferFromHDFSImpl>(hdfs_uri_, hdfs_file_path_, config_, buf_size_, read_until_position_))
 {
 }
 
 
 bool ReadBufferFromHDFS::nextImpl()
 {
+    impl->position() = impl->buffer().begin() + offset();
     auto result = impl->next();
 
     if (result)
-    {
-        working_buffer = internal_buffer = impl->buffer();
-        pos = working_buffer.begin();
-    }
-    else
-        return false;
-    return true;
+        BufferBase::set(impl->buffer().begin(), impl->buffer().size(), impl->offset); /// use the buffer returned by `impl`
+
+    return result;
 }
 
 
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.h b/src/Storages/HDFS/ReadBufferFromHDFS.h
index b06e0376fcd..6c112ac5bb4 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.h
@@ -7,8 +7,8 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <string>
 #include <memory>
-#include <hdfs/hdfs.h> // Y_IGNORE
-#include <common/types.h>
+#include <hdfs/hdfs.h>
+#include <base/types.h>
 #include <Interpreters/Context.h>
 #include <IO/SeekableReadBuffer.h>
 
@@ -25,7 +25,9 @@ struct ReadBufferFromHDFSImpl;
 
 public:
     ReadBufferFromHDFS(const String & hdfs_uri_, const String & hdfs_file_path_,
-        const Poco::Util::AbstractConfiguration & config_, size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE);
+                       const Poco::Util::AbstractConfiguration & config_,
+                       size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE,
+                       size_t read_until_position_ = 0);
 
     ~ReadBufferFromHDFS() override;
 
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index 9600eb975b4..6e81f5577ab 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -13,17 +13,19 @@
 #include <IO/WriteHelpers.h>
 #include <Storages/HDFS/HDFSCommon.h>
 #include <Formats/FormatFactory.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Formats/IOutputFormat.h>
 #include <DataTypes/DataTypeString.h>
 #include <Processors/Sinks/SinkToStorage.h>
-#include <DataStreams/OwningBlockInputStream.h>
 #include <Common/parseGlobs.h>
 #include <Poco/URI.h>
 #include <re2/re2.h>
 #include <re2/stringpiece.h>
 #include <hdfs/hdfs.h>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <QueryPipeline/Pipe.h>
 #include <filesystem>
 
 
@@ -123,13 +125,14 @@ public:
 
                 auto compression = chooseCompressionMethod(path, compression_method);
                 read_buf = wrapReadBufferWithCompressionMethod(std::make_unique<ReadBufferFromHDFS>(uri, path, getContext()->getGlobalContext()->getConfigRef()), compression);
-                auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, getContext(), max_block_size);
+                auto input_format = getContext()->getInputFormat(format, *read_buf, sample_block, max_block_size);
+                pipeline = QueryPipeline(std::move(input_format));
 
-                reader = std::make_shared<InputStreamFromInputFormat>(input_format);
-                reader->readPrefix();
+                reader = std::make_unique<PullingPipelineExecutor>(pipeline);
             }
 
-            if (auto res = reader->read())
+            Block res;
+            if (reader->pull(res))
             {
                 Columns columns = res.getColumns();
                 UInt64 num_rows = res.rows();
@@ -153,15 +156,16 @@ public:
                 return Chunk(std::move(columns), num_rows);
             }
 
-            reader->readSuffix();
             reader.reset();
+            pipeline.reset();
             read_buf.reset();
         }
     }
 
 private:
     std::unique_ptr<ReadBuffer> read_buf;
-    BlockInputStreamPtr reader;
+    QueryPipeline pipeline;
+    std::unique_ptr<PullingPipelineExecutor> reader;
     SourcesInfoPtr source_info;
     String uri;
     String format;
@@ -183,7 +187,7 @@ public:
         : SinkToStorage(sample_block)
     {
         write_buf = wrapWriteBufferWithCompressionMethod(std::make_unique<WriteBufferFromHDFS>(uri, context->getGlobalContext()->getConfigRef()), compression_method, 3);
-        writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, *write_buf, sample_block, context);
+        writer = FormatFactory::instance().getOutputFormatParallelIfPossible(format, *write_buf, sample_block, context);
     }
 
     String getName() const override { return "HDFSSink"; }
@@ -192,17 +196,17 @@ public:
     {
         if (is_first_chunk)
         {
-            writer->writePrefix();
+            writer->doWritePrefix();
             is_first_chunk = false;
         }
-        writer->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+        writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
     void onFinish() override
     {
         try
         {
-            writer->writeSuffix();
+            writer->doWriteSuffix();
             writer->flush();
             write_buf->sync();
             write_buf->finalize();
@@ -216,7 +220,7 @@ public:
 
 private:
     std::unique_ptr<WriteBuffer> write_buf;
-    BlockOutputStreamPtr writer;
+    OutputFormatPtr writer;
     bool is_first_chunk = true;
 };
 
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index 268f2205b97..9020a091782 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -1,15 +1,13 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_HDFS
 
 #include <Storages/IStorage.h>
 #include <Poco/URI.h>
-#include <common/logger_useful.h>
-#include <common/shared_ptr_helper.h>
+#include <base/logger_useful.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.h b/src/Storages/HDFS/WriteBufferFromHDFS.h
index 9dc74e69d40..e9ee2fc2d51 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.h
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.h
@@ -19,7 +19,7 @@ class WriteBufferFromHDFS final : public BufferWithOwnMemory<WriteBuffer>
 
 public:
     WriteBufferFromHDFS(
-        const std::string & hdfs_name_,
+        const String & hdfs_name_,
         const Poco::Util::AbstractConfiguration & config_,
         size_t buf_size_ = DBMS_DEFAULT_BUFFER_SIZE,
         int flags = O_WRONLY);
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 0e9f82a9802..dd851f19906 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -9,8 +9,9 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSetQuery.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Storages/AlterCommands.h>
 
 
@@ -59,27 +60,31 @@ TableLockHolder IStorage::lockForShare(const String & query_id, const std::chron
     return result;
 }
 
-TableLockHolder IStorage::lockForAlter(const String & query_id, const std::chrono::milliseconds & acquire_timeout)
+IStorage::AlterLockHolder IStorage::lockForAlter(const std::chrono::milliseconds & acquire_timeout)
 {
-    TableLockHolder result = tryLockTimed(alter_lock, RWLockImpl::Write, query_id, acquire_timeout);
+    AlterLockHolder lock{alter_lock, std::defer_lock};
+
+    if (!lock.try_lock_for(acquire_timeout))
+        throw Exception(ErrorCodes::DEADLOCK_AVOIDED,
+                        "Locking attempt for ALTER on \"{}\" has timed out! ({} ms) "
+                        "Possible deadlock avoided. Client should retry.",
+                        getStorageID().getFullTableName(), std::to_string(acquire_timeout.count()));
 
     if (is_dropped)
         throw Exception("Table is dropped", ErrorCodes::TABLE_IS_DROPPED);
 
-    return result;
+    return lock;
 }
 
 
 TableExclusiveLockHolder IStorage::lockExclusively(const String & query_id, const std::chrono::milliseconds & acquire_timeout)
 {
     TableExclusiveLockHolder result;
-    result.alter_lock = tryLockTimed(alter_lock, RWLockImpl::Write, query_id, acquire_timeout);
+    result.drop_lock = tryLockTimed(drop_lock, RWLockImpl::Write, query_id, acquire_timeout);
 
     if (is_dropped)
         throw Exception("Table is dropped", ErrorCodes::TABLE_IS_DROPPED);
 
-    result.drop_lock = tryLockTimed(drop_lock, RWLockImpl::Write, query_id, acquire_timeout);
-
     return result;
 }
 
@@ -125,7 +130,7 @@ Pipe IStorage::alterPartition(
     throw Exception("Partition operations are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
 }
 
-void IStorage::alter(const AlterCommands & params, ContextPtr context, TableLockHolder &)
+void IStorage::alter(const AlterCommands & params, ContextPtr context, AlterLockHolder &)
 {
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -140,9 +145,8 @@ void IStorage::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /
     for (const auto & command : commands)
     {
         if (!command.isCommentAlter())
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
     }
 }
 
@@ -201,6 +205,29 @@ NameDependencies IStorage::getDependentViewsByColumn(ContextPtr context) const
     return name_deps;
 }
 
+bool IStorage::isStaticStorage() const
+{
+    auto storage_policy = getStoragePolicy();
+    if (storage_policy)
+    {
+        for (const auto & disk : storage_policy->getDisks())
+            if (!disk->isReadOnly())
+                return false;
+        return true;
+    }
+    return false;
+}
+
+BackupEntries IStorage::backup(const ASTs &, ContextPtr) const
+{
+    throw Exception("Table engine " + getName() + " doesn't support backups", ErrorCodes::NOT_IMPLEMENTED);
+}
+
+RestoreDataTasks IStorage::restoreFromBackup(const BackupPtr &, const String &, const ASTs &, ContextMutablePtr)
+{
+    throw Exception("Table engine " + getName() + " doesn't support restoring", ErrorCodes::NOT_IMPLEMENTED);
+}
+
 std::string PrewhereInfo::dump() const
 {
     WriteBufferFromOwnString ss;
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 2180f92df98..6c4bb44b63b 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -2,12 +2,11 @@
 
 #include <Core/Names.h>
 #include <Core/QueryProcessingStage.h>
-#include <DataStreams/IBlockStream_fwd.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/CancellationCode.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/CheckResults.h>
 #include <Storages/ColumnDependency.h>
 #include <Storages/IStorage_fwd.h>
@@ -54,8 +53,8 @@ using QueryPlanPtr = std::unique_ptr<QueryPlan>;
 class SinkToStorage;
 using SinkToStoragePtr = std::shared_ptr<SinkToStorage>;
 
-class QueryPipeline;
-using QueryPipelinePtr = std::unique_ptr<QueryPipeline>;
+class QueryPipelineBuilder;
+using QueryPipelineBuilderPtr = std::unique_ptr<QueryPipelineBuilder>;
 
 class IStoragePolicy;
 using StoragePolicyPtr = std::shared_ptr<const IStoragePolicy>;
@@ -65,6 +64,13 @@ class EnabledQuota;
 struct SelectQueryInfo;
 
 using NameDependencies = std::unordered_map<String, std::vector<String>>;
+using DatabaseAndTableName = std::pair<String, String>;
+
+class IBackup;
+using BackupPtr = std::shared_ptr<const IBackup>;
+class IBackupEntry;
+using BackupEntries = std::vector<std::pair<String, std::unique_ptr<IBackupEntry>>>;
+using RestoreDataTasks = std::vector<std::function<void()>>;
 
 struct ColumnSize
 {
@@ -80,6 +86,8 @@ struct ColumnSize
     }
 };
 
+using IndexSize = ColumnSize;
+
 /** Storage. Describes the table. Responsible for
   * - storage of the table data;
   * - the definition in which files (or not in files) the data is stored;
@@ -120,6 +128,9 @@ public:
     /// Returns true if the storage supports queries with the FINAL section.
     virtual bool supportsFinal() const { return false; }
 
+    /// Returns true if the storage supports insert queries with the PARTITION BY section.
+    virtual bool supportsPartitionBy() const { return false; }
+
     /// Returns true if the storage supports queries with the PREWHERE section.
     virtual bool supportsPrewhere() const { return false; }
 
@@ -153,6 +164,11 @@ public:
     using ColumnSizeByName = std::unordered_map<std::string, ColumnSize>;
     virtual ColumnSizeByName getColumnSizes() const { return {}; }
 
+    /// Optional size information of each secondary index.
+    /// Valid only for MergeTree family.
+    using IndexSizeByName = std::unordered_map<std::string, IndexSize>;
+    virtual IndexSizeByName getSecondaryIndexSizes() const { return {}; }
+
     /// Get mutable version (snapshot) of storage metadata. Metadata object is
     /// multiversion, so it can be concurrently changed, but returned copy can be
     /// used without any locks.
@@ -188,6 +204,12 @@ public:
 
     NameDependencies getDependentViewsByColumn(ContextPtr context) const;
 
+    /// Prepares entries to backup data of the storage.
+    virtual BackupEntries backup(const ASTs & partitions, ContextPtr context) const;
+
+    /// Extract data from the backup and put it to the storage.
+    virtual RestoreDataTasks restoreFromBackup(const BackupPtr & backup, const String & data_path_in_backup, const ASTs & partitions, ContextMutablePtr context);
+
 protected:
     /// Returns whether the column is virtual - by default all columns are real.
     /// Initially reserved virtual column name may be shadowed by real column.
@@ -203,6 +225,7 @@ private:
     /// without locks.
     MultiVersionStorageMetadataPtr metadata;
 
+protected:
     RWLockImpl::LockHolder tryLockTimed(
         const RWLock & rwlock, RWLockImpl::Type type, const String & query_id, const std::chrono::milliseconds & acquire_timeout) const;
 
@@ -215,7 +238,8 @@ public:
 
     /// Lock table for alter. This lock must be acuqired in ALTER queries to be
     /// sure, that we execute only one simultaneous alter. Doesn't affect share lock.
-    TableLockHolder lockForAlter(const String & query_id, const std::chrono::milliseconds & acquire_timeout);
+    using AlterLockHolder = std::unique_lock<std::timed_mutex>;
+    AlterLockHolder lockForAlter(const std::chrono::milliseconds & acquire_timeout);
 
     /// Lock table exclusively. This lock must be acquired if you want to be
     /// sure, that no other thread (SELECT, merge, ALTER, etc.) doing something
@@ -264,7 +288,7 @@ public:
      *
      * It is guaranteed that the structure of the table will not change over the lifetime of the returned streams (that is, there will not be ALTER, RENAME and DROP).
      */
-    virtual BlockInputStreams watch(
+    virtual Pipe watch(
         const Names & /*column_names*/,
         const SelectQueryInfo & /*query_info*/,
         ContextPtr /*context*/,
@@ -343,7 +367,7 @@ public:
       *
       * Returns query pipeline if distributed writing is possible, and nullptr otherwise.
       */
-    virtual QueryPipelinePtr distributedWrite(
+    virtual QueryPipelineBuilderPtr distributedWrite(
         const ASTInsertQuery & /*query*/,
         ContextPtr /*context*/)
     {
@@ -394,7 +418,7 @@ public:
     /** ALTER tables in the form of column changes that do not affect the change
       * to Storage or its parameters. Executes under alter lock (lockForAlter).
       */
-    virtual void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & alter_lock_holder);
+    virtual void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & alter_lock_holder);
 
     /** Checks that alter commands can be applied to storage. For example, columns can be modified,
       * or primary key can be changes, etc.
@@ -444,6 +468,12 @@ public:
         throw Exception("Mutations are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
     }
 
+    /// Cancel a part move to shard.
+    virtual CancellationCode killPartMoveToShard(const UUID & /*task_uuid*/)
+    {
+        throw Exception("Part moves between shards are not supported by storage " + getName(), ErrorCodes::NOT_IMPLEMENTED);
+    }
+
     /** If the table have to do some complicated work on startup,
       *  that must be postponed after creation of table object
       *  (like launching some background threads),
@@ -523,6 +553,9 @@ public:
     /// Returns storage policy if storage supports it.
     virtual StoragePolicyPtr getStoragePolicy() const { return {}; }
 
+    /// Returns true if all disks of storage are read-only.
+    virtual bool isStaticStorage() const;
+
     /// If it is possible to quickly determine exact number of rows in the table at this moment of time, then return it.
     /// Used for:
     /// - Simple count() optimization
@@ -559,13 +592,14 @@ public:
     /// Does not takes underlying Storage (if any) into account.
     virtual std::optional<UInt64> lifetimeBytes() const { return {}; }
 
+    /// Should table->drop be called at once or with delay (in case of atomic database engine).
+    /// Needed for integration engines, when there must be no delay for calling drop() method.
+    virtual bool dropTableImmediately() { return false; }
+
 private:
-    /// Lock required for alter queries (lockForAlter). Always taken for write
-    /// (actually can be replaced with std::mutex, but for consistency we use
-    /// RWLock). Allows to execute only one simultaneous alter query. Also it
-    /// should be taken by DROP-like queries, to be sure, that all alters are
-    /// finished.
-    mutable RWLock alter_lock = RWLockImpl::create();
+    /// Lock required for alter queries (lockForAlter).
+    /// Allows to execute only one simultaneous alter query.
+    mutable std::timed_mutex alter_lock;
 
     /// Lock required for drop queries. Every thread that want to ensure, that
     /// table is not dropped have to table this lock for read (lockForShare).
diff --git a/src/Storages/IStorage_fwd.h b/src/Storages/IStorage_fwd.h
index 98ae9bea7c2..b9243b029b0 100644
--- a/src/Storages/IStorage_fwd.h
+++ b/src/Storages/IStorage_fwd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <map>
 #include <memory>
diff --git a/src/Storages/IndicesDescription.h b/src/Storages/IndicesDescription.h
index d9c7efdb75c..7071ec89890 100644
--- a/src/Storages/IndicesDescription.h
+++ b/src/Storages/IndicesDescription.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.cpp b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
index c7fe71f42c1..d3c51fef9b7 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.cpp
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.cpp
@@ -1,6 +1,7 @@
 #include <Storages/Kafka/KafkaBlockOutputStream.h>
 
 #include <Formats/FormatFactory.h>
+#include <Processors/Formats/IOutputFormat.h>
 #include <Storages/Kafka/WriteBufferToKafkaProducer.h>
 
 namespace DB
@@ -19,13 +20,13 @@ KafkaSink::KafkaSink(
 
 void KafkaSink::onStart()
 {
-    buffer = storage.createWriteBuffer(getPort().getHeader());
+    buffer = storage.createWriteBuffer(getHeader());
 
     auto format_settings = getFormatSettings(context);
     format_settings.protobuf.allow_multiple_rows_without_delimiter = true;
 
-    child = FormatFactory::instance().getOutputStream(storage.getFormatName(), *buffer,
-        getPort().getHeader(), context,
+    format = FormatFactory::instance().getOutputFormat(storage.getFormatName(), *buffer,
+        getHeader(), context,
         [this](const Columns & columns, size_t row)
         {
             buffer->countRow(columns, row);
@@ -35,13 +36,13 @@ void KafkaSink::onStart()
 
 void KafkaSink::consume(Chunk chunk)
 {
-    child->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+    format->write(getHeader().cloneWithColumns(chunk.detachColumns()));
 }
 
 void KafkaSink::onFinish()
 {
-    if (child)
-        child->writeSuffix();
+    if (format)
+        format->doWriteSuffix();
     //flush();
 
     if (buffer)
diff --git a/src/Storages/Kafka/KafkaBlockOutputStream.h b/src/Storages/Kafka/KafkaBlockOutputStream.h
index 7d65ac99998..8e0801c7b5e 100644
--- a/src/Storages/Kafka/KafkaBlockOutputStream.h
+++ b/src/Storages/Kafka/KafkaBlockOutputStream.h
@@ -6,13 +6,16 @@
 namespace DB
 {
 
+class IOutputFormat;
+using IOutputFormatPtr = std::shared_ptr<IOutputFormat>;
+
 class KafkaSink : public SinkToStorage
 {
 public:
     explicit KafkaSink(
         StorageKafka & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const std::shared_ptr<const Context> & context_);
+        const ContextPtr & context_);
 
     void consume(Chunk chunk) override;
     void onStart() override;
@@ -24,9 +27,9 @@ public:
 private:
     StorageKafka & storage;
     StorageMetadataPtr metadata_snapshot;
-    const std::shared_ptr<const Context> context;
+    const ContextPtr context;
     ProducerBufferPtr buffer;
-    BlockOutputStreamPtr child;
+    IOutputFormatPtr format;
 };
 
 }
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.cpp b/src/Storages/Kafka/KafkaSource.cpp
similarity index 58%
rename from src/Storages/Kafka/KafkaBlockInputStream.cpp
rename to src/Storages/Kafka/KafkaSource.cpp
index 5d9b19b1972..3e24608a180 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.cpp
+++ b/src/Storages/Kafka/KafkaSource.cpp
@@ -1,11 +1,9 @@
-#include <Storages/Kafka/KafkaBlockInputStream.h>
+#include <Storages/Kafka/KafkaSource.h>
 
-#include <DataStreams/ConvertingBlockInputStream.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <Formats/FormatFactory.h>
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
-#include <common/logger_useful.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <base/logger_useful.h>
 #include <Interpreters/Context.h>
 
 namespace DB
@@ -19,15 +17,16 @@ namespace ErrorCodes
 // when selecting from empty topic
 const auto MAX_FAILED_POLL_ATTEMPTS = 10;
 
-KafkaBlockInputStream::KafkaBlockInputStream(
+KafkaSource::KafkaSource(
     StorageKafka & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
-    const std::shared_ptr<Context> & context_,
+    const ContextPtr & context_,
     const Names & columns,
     Poco::Logger * log_,
     size_t max_block_size_,
     bool commit_in_suffix_)
-    : storage(storage_)
+    : SourceWithProgress(metadata_snapshot_->getSampleBlockForColumns(columns, storage_.getVirtuals(), storage_.getStorageID()))
+    , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
     , context(context_)
     , column_names(columns)
@@ -40,7 +39,7 @@ KafkaBlockInputStream::KafkaBlockInputStream(
 {
 }
 
-KafkaBlockInputStream::~KafkaBlockInputStream()
+KafkaSource::~KafkaSource()
 {
     if (!buffer)
         return;
@@ -51,34 +50,28 @@ KafkaBlockInputStream::~KafkaBlockInputStream()
     storage.pushReadBuffer(buffer);
 }
 
-Block KafkaBlockInputStream::getHeader() const
+Chunk KafkaSource::generateImpl()
 {
-    return metadata_snapshot->getSampleBlockForColumns(column_names, storage.getVirtuals(), storage.getStorageID());
-}
-
-void KafkaBlockInputStream::readPrefixImpl()
-{
-    auto timeout = std::chrono::milliseconds(context->getSettingsRef().kafka_max_wait_ms.totalMilliseconds());
-    buffer = storage.popReadBuffer(timeout);
-
     if (!buffer)
-        return;
+    {
+        auto timeout = std::chrono::milliseconds(context->getSettingsRef().kafka_max_wait_ms.totalMilliseconds());
+        buffer = storage.popReadBuffer(timeout);
 
-    buffer->subscribe();
+        if (!buffer)
+            return {};
 
-    broken = true;
-}
+        buffer->subscribe();
 
-Block KafkaBlockInputStream::readImpl()
-{
-    if (!buffer || finished)
-        return Block();
+        broken = true;
+    }
 
-    finished = true;
+    if (is_finished)
+        return {};
+
+    is_finished = true;
     // now it's one-time usage InputStream
     // one block of the needed size (or with desired flush timeout) is formed in one internal iteration
     // otherwise external iteration will reuse that and logic will became even more fuzzy
-    MutableColumns result_columns  = non_virtual_header.cloneEmptyColumns();
     MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
 
     auto put_error_to_stream = handle_error_mode == HandleKafkaErrorMode::STREAM;
@@ -86,92 +79,45 @@ Block KafkaBlockInputStream::readImpl()
     auto input_format = FormatFactory::instance().getInputFormat(
         storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
 
-    InputPort port(input_format->getPort().getHeader(), input_format.get());
-    connect(input_format->getPort(), port);
-    port.setNeeded();
-
     std::optional<std::string> exception_message;
-    auto read_kafka_message = [&]
+    size_t total_rows = 0;
+    size_t failed_poll_attempts = 0;
+
+    auto on_error = [&](const MutableColumns & result_columns, Exception & e)
     {
-        size_t new_rows = 0;
-        while (true)
+        if (put_error_to_stream)
         {
-            auto status = input_format->prepare();
-
-            switch (status)
+            exception_message = e.message();
+            for (const auto & column : result_columns)
             {
-                case IProcessor::Status::Ready:
-                    input_format->work();
-                    break;
+                // read_kafka_message could already push some rows to result_columns
+                // before exception, we need to fix it.
+                auto cur_rows = column->size();
+                if (cur_rows > total_rows)
+                    column->popBack(cur_rows - total_rows);
 
-                case IProcessor::Status::Finished:
-                    input_format->resetParser();
-                    return new_rows;
-
-                case IProcessor::Status::PortFull:
-                {
-                    auto chunk = port.pull();
-
-                    // that was returning bad value before https://github.com/ClickHouse/ClickHouse/pull/8005
-                    // if will be backported should go together with #8005
-                    auto chunk_rows = chunk.getNumRows();
-                    new_rows += chunk_rows;
-
-                    auto columns = chunk.detachColumns();
-                    for (size_t i = 0, s = columns.size(); i < s; ++i)
-                    {
-                        result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
-                    }
-                    break;
-                }
-                case IProcessor::Status::NeedData:
-                case IProcessor::Status::Async:
-                case IProcessor::Status::ExpandPipeline:
-                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
+                // all data columns will get default value in case of error
+                column->insertDefault();
             }
+
+            return 1;
+        }
+        else
+        {
+            e.addMessage("while parsing Kafka message (topic: {}, partition: {}, offset: {})'",
+                buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
+            throw;
         }
     };
 
-    size_t total_rows = 0;
-    size_t failed_poll_attempts = 0;
+    StreamingFormatExecutor executor(non_virtual_header, input_format, std::move(on_error));
 
     while (true)
     {
         size_t new_rows = 0;
         exception_message.reset();
         if (buffer->poll())
-        {
-            try
-            {
-                new_rows = read_kafka_message();
-            }
-            catch (Exception & e)
-            {
-                if (put_error_to_stream)
-                {
-                    input_format->resetParser();
-                    exception_message = e.message();
-                    for (auto & column : result_columns)
-                    {
-                        // read_kafka_message could already push some rows to result_columns
-                        // before exception, we need to fix it.
-                        auto cur_rows = column->size();
-                        if (cur_rows > total_rows)
-                        {
-                            column->popBack(cur_rows - total_rows);
-                        }
-                        // all data columns will get default value in case of error
-                        column->insertDefault();
-                    }
-                    new_rows = 1;
-                }
-                else
-                {
-                    e.addMessage("while parsing Kafka message (topic: {}, partition: {}, offset: {})'", buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
-                    throw;
-                }
-            }
-        }
+            new_rows = executor.execute();
 
         if (new_rows)
         {
@@ -252,7 +198,11 @@ Block KafkaBlockInputStream::readImpl()
         }
         else
         {
-            LOG_WARNING(log, "Parsing of message (topic: {}, partition: {}, offset: {}) return no rows.", buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
+            // We came here in case of tombstone (or sometimes zero-length) messages, and it is not something abnormal
+            // TODO: it seems like in case of put_error_to_stream=true we may need to process those differently
+            // currently we just skip them with note in logs.
+            buffer->storeLastReadMessageOffset();
+            LOG_DEBUG(log, "Parsing of message (topic: {}, partition: {}, offset: {}) return no rows.", buffer->currentTopic(), buffer->currentPartition(), buffer->currentOffset());
         }
 
         if (!buffer->hasMorePolledMessages()
@@ -263,7 +213,7 @@ Block KafkaBlockInputStream::readImpl()
     }
 
     if (buffer->polledDataUnusable() || total_rows == 0)
-        return Block();
+        return {};
 
     /// MATERIALIZED columns can be added here, but I think
     // they are not needed here:
@@ -272,26 +222,33 @@ Block KafkaBlockInputStream::readImpl()
     // i.e. will not be stored anythere
     // If needed any extra columns can be added using DEFAULT they can be added at MV level if needed.
 
-    auto result_block  = non_virtual_header.cloneWithColumns(std::move(result_columns));
+    auto result_block  = non_virtual_header.cloneWithColumns(executor.getResultColumns());
     auto virtual_block = virtual_header.cloneWithColumns(std::move(virtual_columns));
 
     for (const auto & column : virtual_block.getColumnsWithTypeAndName())
         result_block.insert(column);
 
-    return ConvertingBlockInputStream(
-               std::make_shared<OneBlockInputStream>(result_block),
-               getHeader(),
-               ConvertingBlockInputStream::MatchColumnsMode::Name)
-        .read();
+    auto converting_dag = ActionsDAG::makeConvertingActions(
+        result_block.cloneEmpty().getColumnsWithTypeAndName(),
+        getPort().getHeader().getColumnsWithTypeAndName(),
+        ActionsDAG::MatchColumnsMode::Name);
+
+    auto converting_actions = std::make_shared<ExpressionActions>(std::move(converting_dag));
+    converting_actions->execute(result_block);
+
+    return Chunk(result_block.getColumns(), result_block.rows());
 }
 
-void KafkaBlockInputStream::readSuffixImpl()
+Chunk KafkaSource::generate()
 {
-    if (commit_in_suffix)
+    auto chunk = generateImpl();
+    if (!chunk && commit_in_suffix)
         commit();
+
+    return chunk;
 }
 
-void KafkaBlockInputStream::commit()
+void KafkaSource::commit()
 {
     if (!buffer)
         return;
diff --git a/src/Storages/Kafka/KafkaBlockInputStream.h b/src/Storages/Kafka/KafkaSource.h
similarity index 71%
rename from src/Storages/Kafka/KafkaBlockInputStream.h
rename to src/Storages/Kafka/KafkaSource.h
index 98e4b8982e0..1f0cbb355d1 100644
--- a/src/Storages/Kafka/KafkaBlockInputStream.h
+++ b/src/Storages/Kafka/KafkaSource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 
 #include <Storages/Kafka/StorageKafka.h>
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
@@ -13,25 +13,22 @@ namespace Poco
 namespace DB
 {
 
-class KafkaBlockInputStream : public IBlockInputStream
+class KafkaSource : public SourceWithProgress
 {
 public:
-    KafkaBlockInputStream(
+    KafkaSource(
         StorageKafka & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
-        const std::shared_ptr<Context> & context_,
+        const ContextPtr & context_,
         const Names & columns,
         Poco::Logger * log_,
         size_t max_block_size_,
         bool commit_in_suffix = true);
-    ~KafkaBlockInputStream() override;
+    ~KafkaSource() override;
 
     String getName() const override { return storage.getName(); }
-    Block getHeader() const override;
 
-    void readPrefixImpl() override;
-    Block readImpl() override;
-    void readSuffixImpl() override;
+    Chunk generate() override;
 
     void commit();
     bool isStalled() const { return !buffer || buffer->isStalled(); }
@@ -46,12 +43,14 @@ private:
 
     ConsumerBufferPtr buffer;
     bool broken = true;
-    bool finished = false;
+    bool is_finished = false;
     bool commit_in_suffix;
 
     const Block non_virtual_header;
     const Block virtual_header;
     const HandleKafkaErrorMode handle_error_mode;
+
+    Chunk generateImpl();
 };
 
 }
diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp
index bd25607a5f3..a72d7b12a4f 100644
--- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp
+++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.cpp
@@ -1,6 +1,6 @@
 #include <Storages/Kafka/ReadBufferFromKafkaConsumer.h>
 
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <cppkafka/cppkafka.h>
 #include <boost/algorithm/string/join.hpp>
@@ -466,13 +466,19 @@ bool ReadBufferFromKafkaConsumer::nextImpl()
     if (!allowed || !hasMorePolledMessages())
         return false;
 
-    // XXX: very fishy place with const casting.
-    auto * new_position = reinterpret_cast<char *>(const_cast<unsigned char *>(current->get_payload().get_data()));
-    BufferBase::set(new_position, current->get_payload().get_size(), 0);
-    allowed = false;
+    const auto * message_data = current->get_payload().get_data();
+    size_t message_size = current->get_payload().get_size();
 
+    allowed = false;
     ++current;
 
+    /// If message is empty, return end of stream.
+    if (message_data == nullptr)
+        return false;
+
+    /// const_cast is needed, because ReadBuffer works with non-const char *.
+    auto * new_position = reinterpret_cast<char *>(const_cast<unsigned char *>(message_data));
+    BufferBase::set(new_position, message_size, 0);
     return true;
 }
 
diff --git a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
index ef829b86a24..4e9bf2e55c2 100644
--- a/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
+++ b/src/Storages/Kafka/ReadBufferFromKafkaConsumer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 
 #include <cppkafka/cppkafka.h>
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index cba67bc3bcb..39688060b0a 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -1,43 +1,41 @@
 #include <Storages/Kafka/StorageKafka.h>
 #include <Storages/Kafka/parseSyslogLevel.h>
 
-#include <DataStreams/UnionBlockInputStream.h>
-#include <DataStreams/copyData.h>
+#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
-#include <Storages/Kafka/KafkaSettings.h>
-#include <Storages/Kafka/KafkaBlockInputStream.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Storages/Kafka/KafkaBlockOutputStream.h>
+#include <Storages/Kafka/KafkaSettings.h>
+#include <Storages/Kafka/KafkaSource.h>
 #include <Storages/Kafka/WriteBufferToKafkaProducer.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
+#include <librdkafka/rdkafka.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
-#include <Common/formatReadable.h>
 #include <Common/config_version.h>
+#include <Common/formatReadable.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
+#include <Common/quoteString.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
-#include <common/logger_useful.h>
-#include <Common/quoteString.h>
-#include <Common/getNumberOfPhysicalCPUCores.h>
-#include <Interpreters/Context.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <librdkafka/rdkafka.h>
-#include <common/getFQDNOrHostName.h>
+#include <base/getFQDNOrHostName.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -280,8 +278,7 @@ Pipe StorageKafka::read(
         /// Use block size of 1, otherwise LIMIT won't work properly as it will buffer excess messages in the last block
         /// TODO: probably that leads to awful performance.
         /// FIXME: seems that doesn't help with extra reading and committing unprocessed messages.
-        /// TODO: rewrite KafkaBlockInputStream to KafkaSource. Now it is used in other place.
-        pipes.emplace_back(std::make_shared<SourceFromInputStream>(std::make_shared<KafkaBlockInputStream>(*this, metadata_snapshot, modified_context, column_names, log, 1)));
+        pipes.emplace_back(std::make_shared<KafkaSource>(*this, metadata_snapshot, modified_context, column_names, log, 1));
     }
 
     LOG_DEBUG(log, "Starting reading {} streams", pipes.size());
@@ -610,14 +607,17 @@ bool StorageKafka::streamToViews()
     auto block_io = interpreter.execute();
 
     // Create a stream for each consumer and join them in a union stream
-    BlockInputStreams streams;
+    std::vector<std::shared_ptr<KafkaSource>> sources;
+    Pipes pipes;
 
     auto stream_count = thread_per_consumer ? 1 : num_created_consumers;
-    streams.reserve(stream_count);
+    sources.reserve(stream_count);
+    pipes.reserve(stream_count);
     for (size_t i = 0; i < stream_count; ++i)
     {
-        auto stream = std::make_shared<KafkaBlockInputStream>(*this, metadata_snapshot, kafka_context, block_io.out->getHeader().getNames(), log, block_size, false);
-        streams.emplace_back(stream);
+        auto source = std::make_shared<KafkaSource>(*this, metadata_snapshot, kafka_context, block_io.pipeline.getHeader().getNames(), log, block_size, false);
+        sources.emplace_back(source);
+        pipes.emplace_back(source);
 
         // Limit read batch to maximum block size to allow DDL
         StreamLocalLimits limits;
@@ -627,30 +627,27 @@ bool StorageKafka::streamToViews()
                                                  : getContext()->getSettingsRef().stream_flush_interval_ms;
 
         limits.timeout_overflow_mode = OverflowMode::BREAK;
-        stream->setLimits(limits);
+        source->setLimits(limits);
     }
 
-    // Join multiple streams if necessary
-    BlockInputStreamPtr in;
-    if (streams.size() > 1)
-        in = std::make_shared<UnionBlockInputStream>(streams, nullptr, streams.size());
-    else
-        in = streams[0];
+    auto pipe = Pipe::unitePipes(std::move(pipes));
 
     // We can't cancel during copyData, as it's not aware of commits and other kafka-related stuff.
     // It will be cancelled on underlying layer (kafka buffer)
-    std::atomic<bool> stub = {false};
+
     size_t rows = 0;
-    copyData(*in, *block_io.out, [&rows](const Block & block)
     {
-        rows += block.rows();
-    }, &stub);
+        block_io.pipeline.complete(std::move(pipe));
+        block_io.pipeline.setProgressCallback([&](const Progress & progress) { rows += progress.read_rows.load(); });
+        CompletedPipelineExecutor executor(block_io.pipeline);
+        executor.execute();
+    }
 
     bool some_stream_is_stalled = false;
-    for (auto & stream : streams)
+    for (auto & source : sources)
     {
-        some_stream_is_stalled = some_stream_is_stalled || stream->as<KafkaBlockInputStream>()->isStalled();
-        stream->as<KafkaBlockInputStream>()->commit();
+        some_stream_is_stalled = some_stream_is_stalled || source->isStalled();
+        source->commit();
     }
 
     UInt64 milliseconds = watch.elapsedMilliseconds();
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index 2d3abca6059..f056a8aebfc 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -7,7 +7,7 @@
 #include <Common/SettingsChanges.h>
 
 #include <Poco/Semaphore.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <mutex>
 #include <list>
diff --git a/src/Storages/Kafka/WriteBufferToKafkaProducer.cpp b/src/Storages/Kafka/WriteBufferToKafkaProducer.cpp
index dbb18b56769..34ab48e501d 100644
--- a/src/Storages/Kafka/WriteBufferToKafkaProducer.cpp
+++ b/src/Storages/Kafka/WriteBufferToKafkaProducer.cpp
@@ -48,7 +48,7 @@ WriteBufferToKafkaProducer::WriteBufferToKafkaProducer(
 
 WriteBufferToKafkaProducer::~WriteBufferToKafkaProducer()
 {
-    assert(rows == 0 && chunks.empty());
+    assert(rows == 0);
 }
 
 void WriteBufferToKafkaProducer::countRow(const Columns & columns, size_t current_row)
diff --git a/src/Storages/KeyDescription.cpp b/src/Storages/KeyDescription.cpp
index 264a3ab45be..6a2f4bbb055 100644
--- a/src/Storages/KeyDescription.cpp
+++ b/src/Storages/KeyDescription.cpp
@@ -153,4 +153,12 @@ KeyDescription KeyDescription::getSortingKeyFromAST(
     return result;
 }
 
+KeyDescription KeyDescription::buildEmptyKey()
+{
+    KeyDescription result;
+    result.expression_list_ast = std::make_shared<ASTExpressionList>();
+    result.expression = std::make_shared<ExpressionActions>(std::make_shared<ActionsDAG>(), ExpressionActionsSettings{});
+    return result;
+}
+
 }
diff --git a/src/Storages/KeyDescription.h b/src/Storages/KeyDescription.h
index c99c7ebc5c5..81803c3e44b 100644
--- a/src/Storages/KeyDescription.h
+++ b/src/Storages/KeyDescription.h
@@ -50,6 +50,10 @@ struct KeyDescription
         ContextPtr context,
         const std::optional<String> & additional_column);
 
+    /// Build an empty key description. It's different from the default constructor with some
+    /// additional initializations.
+    static KeyDescription buildEmptyKey();
+
     /// Recalculate all expressions and fields for key with new columns without
     /// changes in constant fields. Just wrapper for static methods.
     void recalculateWithNewColumns(
diff --git a/src/Storages/LiveView/LiveViewEventsBlockInputStream.h b/src/Storages/LiveView/LiveViewEventsSource.h
similarity index 89%
rename from src/Storages/LiveView/LiveViewEventsBlockInputStream.h
rename to src/Storages/LiveView/LiveViewEventsSource.h
index dc6848ec20c..77ee06c702c 100644
--- a/src/Storages/LiveView/LiveViewEventsBlockInputStream.h
+++ b/src/Storages/LiveView/LiveViewEventsSource.h
@@ -16,7 +16,7 @@ limitations under the License. */
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Storages/LiveView/StorageLiveView.h>
 
 
@@ -27,7 +27,7 @@ namespace DB
  *  Keeps stream alive by outputting blocks with no rows
  *  based on period specified by the heartbeat interval.
  */
-class LiveViewEventsBlockInputStream : public IBlockInputStream
+class LiveViewEventsSource : public SourceWithProgress
 {
 
 using NonBlockingResult = std::pair<Block, bool>;
@@ -35,13 +35,14 @@ using NonBlockingResult = std::pair<Block, bool>;
 public:
     /// length default -2 because we want LIMIT to specify number of updates so that LIMIT 1 waits for 1 update
     /// and LIMIT 0 just returns data without waiting for any updates
-    LiveViewEventsBlockInputStream(std::shared_ptr<StorageLiveView> storage_,
+    LiveViewEventsSource(std::shared_ptr<StorageLiveView> storage_,
         std::shared_ptr<BlocksPtr> blocks_ptr_,
         std::shared_ptr<BlocksMetadataPtr> blocks_metadata_ptr_,
         std::shared_ptr<bool> active_ptr_,
         const bool has_limit_, const UInt64 limit_,
         const UInt64 heartbeat_interval_sec_)
-        : storage(std::move(storage_)), blocks_ptr(std::move(blocks_ptr_)),
+        : SourceWithProgress({ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), "version")}),
+          storage(std::move(storage_)), blocks_ptr(std::move(blocks_ptr_)),
           blocks_metadata_ptr(std::move(blocks_metadata_ptr_)),
           active_ptr(std::move(active_ptr_)), has_limit(has_limit_),
           limit(limit_),
@@ -51,22 +52,17 @@ public:
         active = active_ptr.lock();
     }
 
-    String getName() const override { return "LiveViewEventsBlockInputStream"; }
+    String getName() const override { return "LiveViewEventsSource"; }
 
-    void cancel(bool kill) override
+    void onCancel() override
     {
-        if (isCancelled() || storage->shutdown_called)
+        if (storage->shutdown_called)
             return;
-        IBlockInputStream::cancel(kill);
+
         std::lock_guard lock(storage->mutex);
         storage->condition.notify_all();
     }
 
-    Block getHeader() const override
-    {
-        return {ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), "version")};
-    }
-
     void refresh()
     {
         if (active && blocks && it == end)
@@ -109,10 +105,11 @@ public:
         return res;
     }
 protected:
-    Block readImpl() override
+    Chunk generate() override
     {
         /// try reading
-        return tryReadImpl(true).first;
+        auto block = tryReadImpl(true).first;
+        return Chunk(block.getColumns(), block.rows());
     }
 
     /** tryRead method attempts to read a block in either blocking
@@ -170,7 +167,7 @@ protected:
                     if (!end_of_blocks)
                     {
                         end_of_blocks = true;
-                        return { getHeader(), true };
+                        return { getPort().getHeader(), true };
                     }
                     while (true)
                     {
@@ -192,7 +189,7 @@ protected:
                         {
                             // repeat the event block as a heartbeat
                             last_event_timestamp_usec = static_cast<UInt64>(timestamp.epochMicroseconds());
-                            return { getHeader(), true };
+                            return { getPort().getHeader(), true };
                         }
                     }
                 }
diff --git a/src/Storages/LiveView/LiveViewBlockOutputStream.h b/src/Storages/LiveView/LiveViewSink.h
similarity index 74%
rename from src/Storages/LiveView/LiveViewBlockOutputStream.h
rename to src/Storages/LiveView/LiveViewSink.h
index 6b8a5a2cb9e..bbb8bf02c45 100644
--- a/src/Storages/LiveView/LiveViewBlockOutputStream.h
+++ b/src/Storages/LiveView/LiveViewSink.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataTypes/DataTypesNumber.h>
-#include <DataStreams/IBlockOutputStream.h>
+#include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/LiveView/StorageLiveView.h>
 #include <Common/hex.h>
 
@@ -9,19 +9,28 @@
 namespace DB
 {
 
-class LiveViewBlockOutputStream : public IBlockOutputStream
+class LiveViewSink : public SinkToStorage
 {
-public:
-    explicit LiveViewBlockOutputStream(StorageLiveView & storage_) : storage(storage_) {}
+    /// _version column is added manually in sink.
+    static Block updateHeader(Block block)
+    {
+        block.erase("_version");
+        return block;
+    }
 
-    void writePrefix() override
+public:
+    explicit LiveViewSink(StorageLiveView & storage_) : SinkToStorage(updateHeader(storage_.getHeader())), storage(storage_) {}
+
+    String getName() const override { return "LiveViewSink"; }
+
+    void onStart() override
     {
         new_blocks = std::make_shared<Blocks>();
         new_blocks_metadata = std::make_shared<BlocksMetadata>();
         new_hash = std::make_shared<SipHash>();
     }
 
-    void writeSuffix() override
+    void onFinish() override
     {
         UInt128 key;
         String key_str;
@@ -65,14 +74,13 @@ public:
         new_hash.reset();
     }
 
-    void write(const Block & block) override
+    void consume(Chunk chunk) override
     {
-        new_blocks->push_back(block);
+        auto block = getHeader().cloneWithColumns(chunk.detachColumns());
         block.updateHash(*new_hash);
+        new_blocks->push_back(std::move(block));
     }
 
-    Block getHeader() const override { return storage.getHeader(); }
-
 private:
     using SipHashPtr = std::shared_ptr<SipHash>;
 
diff --git a/src/Storages/LiveView/LiveViewBlockInputStream.h b/src/Storages/LiveView/LiveViewSource.h
similarity index 88%
rename from src/Storages/LiveView/LiveViewBlockInputStream.h
rename to src/Storages/LiveView/LiveViewSource.h
index 737e76754c5..ec726359581 100644
--- a/src/Storages/LiveView/LiveViewBlockInputStream.h
+++ b/src/Storages/LiveView/LiveViewSource.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <DataStreams/IBlockInputStream.h>
+#include <Storages/LiveView/StorageLiveView.h>
+#include <Processors/Sources/SourceWithProgress.h>
 
 
 namespace DB
@@ -10,19 +11,20 @@ namespace DB
  *  Keeps stream alive by outputting blocks with no rows
  *  based on period specified by the heartbeat interval.
  */
-class LiveViewBlockInputStream : public IBlockInputStream
+class LiveViewSource : public SourceWithProgress
 {
 
 using NonBlockingResult = std::pair<Block, bool>;
 
 public:
-    LiveViewBlockInputStream(std::shared_ptr<StorageLiveView> storage_,
+    LiveViewSource(std::shared_ptr<StorageLiveView> storage_,
         std::shared_ptr<BlocksPtr> blocks_ptr_,
         std::shared_ptr<BlocksMetadataPtr> blocks_metadata_ptr_,
         std::shared_ptr<bool> active_ptr_,
         const bool has_limit_, const UInt64 limit_,
         const UInt64 heartbeat_interval_sec_)
-        : storage(std::move(storage_)), blocks_ptr(std::move(blocks_ptr_)),
+        : SourceWithProgress(storage_->getHeader())
+        , storage(std::move(storage_)), blocks_ptr(std::move(blocks_ptr_)),
           blocks_metadata_ptr(std::move(blocks_metadata_ptr_)),
           active_ptr(std::move(active_ptr_)),
           has_limit(has_limit_), limit(limit_),
@@ -32,19 +34,17 @@ public:
         active = active_ptr.lock();
     }
 
-    String getName() const override { return "LiveViewBlockInputStream"; }
+    String getName() const override { return "LiveViewSource"; }
 
-    void cancel(bool kill) override
+    void onCancel() override
     {
-        if (isCancelled() || storage->shutdown_called)
+        if (storage->shutdown_called)
             return;
-        IBlockInputStream::cancel(kill);
+
         std::lock_guard lock(storage->mutex);
         storage->condition.notify_all();
     }
 
-    Block getHeader() const override { return storage->getHeader(); }
-
     void refresh()
     {
         if (active && blocks && it == end)
@@ -74,10 +74,11 @@ public:
     }
 
 protected:
-    Block readImpl() override
+    Chunk generate() override
     {
         /// try reading
-        return tryReadImpl(true).first;
+        auto block = tryReadImpl(true).first;
+        return Chunk(block.getColumns(), block.rows());
     }
 
     /** tryRead method attempts to read a block in either blocking
@@ -135,7 +136,7 @@ protected:
                     if (!end_of_blocks)
                     {
                         end_of_blocks = true;
-                        return { getHeader(), true };
+                        return { getPort().getHeader(), true };
                     }
                     while (true)
                     {
@@ -144,7 +145,6 @@ protected:
                         /// Or spurious wakeup.
                         bool signaled = std::cv_status::no_timeout == storage->condition.wait_for(lock,
                             std::chrono::microseconds(std::max(UInt64(0), heartbeat_interval_usec - (timestamp_usec - last_event_timestamp_usec))));
-
                         if (isCancelled() || storage->shutdown_called)
                         {
                             return { Block(), true };
@@ -157,7 +157,7 @@ protected:
                         {
                             // heartbeat
                             last_event_timestamp_usec = static_cast<UInt64>(Poco::Timestamp().epochMicroseconds());
-                            return { getHeader(), true };
+                            return { getPort().getHeader(), true };
                         }
                     }
                 }
diff --git a/src/Storages/LiveView/StorageBlocks.h b/src/Storages/LiveView/StorageBlocks.h
index 6cf7ce59fa2..f010ef50ecd 100644
--- a/src/Storages/LiveView/StorageBlocks.h
+++ b/src/Storages/LiveView/StorageBlocks.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index 5f5ce8a4a37..ec748d4d43a 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -15,20 +15,21 @@ limitations under the License. */
 #include <Parsers/ASTLiteral.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterSelectQuery.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Processors/Sources/BlocksSource.h>
-#include <DataStreams/MaterializingBlockInputStream.h>
-#include <DataStreams/SquashingBlockInputStream.h>
-#include <DataStreams/copyData.h>
-#include <common/logger_useful.h>
+#include <Processors/Sinks/EmptySink.h>
+#include <Processors/Transforms/MaterializingTransform.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Transforms/SquashingChunksTransform.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <base/logger_useful.h>
 #include <Common/typeid_cast.h>
 #include <Common/SipHash.h>
 #include <Common/hex.h>
 
 #include <Storages/LiveView/StorageLiveView.h>
-#include <Storages/LiveView/LiveViewBlockInputStream.h>
-#include <Storages/LiveView/LiveViewBlockOutputStream.h>
-#include <Storages/LiveView/LiveViewEventsBlockInputStream.h>
+#include <Storages/LiveView/LiveViewSource.h>
+#include <Storages/LiveView/LiveViewSink.h>
+#include <Storages/LiveView/LiveViewEventsSource.h>
 #include <Storages/LiveView/StorageBlocks.h>
 #include <Storages/LiveView/TemporaryLiveViewCleaner.h>
 
@@ -68,7 +69,7 @@ static StorageID extractDependentTable(ASTPtr & query, ContextPtr context, const
         if (db_and_table->database.empty())
         {
             db_and_table->database = select_database_name;
-            AddDefaultDatabaseVisitor visitor(select_database_name);
+            AddDefaultDatabaseVisitor visitor(context, select_database_name);
             visitor.visit(select_query);
         }
         else
@@ -110,15 +111,24 @@ MergeableBlocksPtr StorageLiveView::collectMergeableBlocks(ContextPtr local_cont
 
     InterpreterSelectQuery interpreter(mergeable_query->clone(), local_context, SelectQueryOptions(QueryProcessingStage::WithMergeableState), Names());
 
-    auto view_mergeable_stream = std::make_shared<MaterializingBlockInputStream>(interpreter.execute().getInputStream());
+    auto builder = interpreter.buildQueryPipeline();
+    builder.addSimpleTransform([&](const Block & cur_header)
+    {
+        return std::make_shared<MaterializingTransform>(cur_header);
+    });
 
-    while (Block this_block = view_mergeable_stream->read())
+    new_mergeable_blocks->sample_block = builder.getHeader();
+
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+    PullingPipelineExecutor executor(pipeline);
+    Block this_block;
+
+    while (executor.pull(this_block))
         base_blocks->push_back(this_block);
 
     new_blocks->push_back(base_blocks);
 
     new_mergeable_blocks->blocks = new_blocks;
-    new_mergeable_blocks->sample_block = view_mergeable_stream->getHeader();
 
     return new_mergeable_blocks;
 }
@@ -133,7 +143,7 @@ Pipes StorageLiveView::blocksToPipes(BlocksPtrs blocks, Block & sample_block)
 }
 
 /// Complete query using input streams from mergeable blocks
-BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
+QueryPipelineBuilder StorageLiveView::completeQuery(Pipes pipes)
 {
     //FIXME it's dangerous to create Context on stack
     auto block_context = Context::createCopy(getContext());
@@ -147,18 +157,25 @@ BlockInputStreamPtr StorageLiveView::completeQuery(Pipes pipes)
             std::move(pipes), QueryProcessingStage::WithMergeableState);
     };
     block_context->addExternalTable(getBlocksTableName(), TemporaryTableHolder(getContext(), creator));
-
     InterpreterSelectQuery select(getInnerBlocksQuery(), block_context, StoragePtr(), nullptr, SelectQueryOptions(QueryProcessingStage::Complete));
-    BlockInputStreamPtr data = std::make_shared<MaterializingBlockInputStream>(select.execute().getInputStream());
+    auto builder = select.buildQueryPipeline();
+    builder.addSimpleTransform([&](const Block & cur_header)
+    {
+        return std::make_shared<MaterializingTransform>(cur_header);
+    });
 
     /// Squashing is needed here because the view query can generate a lot of blocks
     /// even when only one block is inserted into the parent table (e.g. if the query is a GROUP BY
     /// and two-level aggregation is triggered).
-    data = std::make_shared<SquashingBlockInputStream>(
-        data, getContext()->getSettingsRef().min_insert_block_size_rows,
-        getContext()->getSettingsRef().min_insert_block_size_bytes);
+    builder.addSimpleTransform([&](const Block & cur_header)
+    {
+        return std::make_shared<SquashingChunksTransform>(
+            cur_header,
+            getContext()->getSettingsRef().min_insert_block_size_rows,
+            getContext()->getSettingsRef().min_insert_block_size_bytes);
+    });
 
-    return data;
+    return builder;
 }
 
 void StorageLiveView::writeIntoLiveView(
@@ -166,7 +183,7 @@ void StorageLiveView::writeIntoLiveView(
     const Block & block,
     ContextPtr local_context)
 {
-    BlockOutputStreamPtr output = std::make_shared<LiveViewBlockOutputStream>(live_view);
+    auto output = std::make_shared<LiveViewSink>(live_view);
 
     /// Check if live view has any readers if not
     /// just reset blocks to empty and do nothing else
@@ -220,10 +237,17 @@ void StorageLiveView::writeIntoLiveView(
         InterpreterSelectQuery select_block(mergeable_query, local_context, blocks_storage.getTable(), blocks_storage.getTable()->getInMemoryMetadataPtr(),
             QueryProcessingStage::WithMergeableState);
 
-        auto data_mergeable_stream = std::make_shared<MaterializingBlockInputStream>(
-            select_block.execute().getInputStream());
+        auto builder = select_block.buildQueryPipeline();
+        builder.addSimpleTransform([&](const Block & cur_header)
+        {
+            return std::make_shared<MaterializingTransform>(cur_header);
+        });
 
-        while (Block this_block = data_mergeable_stream->read())
+        auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+        PullingPipelineExecutor executor(pipeline);
+        Block this_block;
+
+        while (executor.pull(this_block))
             new_mergeable_blocks->push_back(this_block);
 
         if (new_mergeable_blocks->empty())
@@ -238,8 +262,15 @@ void StorageLiveView::writeIntoLiveView(
         }
     }
 
-    BlockInputStreamPtr data = live_view.completeQuery(std::move(from));
-    copyData(*data, *output);
+    auto pipeline = live_view.completeQuery(std::move(from));
+    pipeline.addChain(Chain(std::move(output)));
+    pipeline.setSinks([&](const Block & cur_header, Pipe::StreamType)
+    {
+        return std::make_shared<EmptySink>(cur_header);
+    });
+
+    auto executor = pipeline.execute();
+    executor->execute(pipeline.getNumThreads());
 }
 
 
@@ -351,9 +382,12 @@ bool StorageLiveView::getNewBlocks()
     /// inserted data to be duplicated
     auto new_mergeable_blocks = collectMergeableBlocks(live_view_context);
     Pipes from = blocksToPipes(new_mergeable_blocks->blocks, new_mergeable_blocks->sample_block);
-    BlockInputStreamPtr data = completeQuery(std::move(from));
+    auto builder = completeQuery(std::move(from));
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
 
-    while (Block block = data->read())
+    PullingPipelineExecutor executor(pipeline);
+    Block block;
+    while (executor.pull(block))
     {
         /// calculate hash before virtual column is added
         block.updateHash(hash);
@@ -521,7 +555,7 @@ Pipe StorageLiveView::read(
     return Pipe(std::make_shared<BlocksSource>(blocks_ptr, getHeader()));
 }
 
-BlockInputStreams StorageLiveView::watch(
+Pipe StorageLiveView::watch(
     const Names & /*column_names*/,
     const SelectQueryInfo & query_info,
     ContextPtr local_context,
@@ -533,7 +567,7 @@ BlockInputStreams StorageLiveView::watch(
 
     bool has_limit = false;
     UInt64 limit = 0;
-    BlockInputStreamPtr reader;
+    Pipe reader;
 
     if (query.limit_length)
     {
@@ -542,15 +576,15 @@ BlockInputStreams StorageLiveView::watch(
     }
 
     if (query.is_watch_events)
-        reader = std::make_shared<LiveViewEventsBlockInputStream>(
+        reader = Pipe(std::make_shared<LiveViewEventsSource>(
             std::static_pointer_cast<StorageLiveView>(shared_from_this()),
             blocks_ptr, blocks_metadata_ptr, active_ptr, has_limit, limit,
-            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds());
+            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds()));
     else
-        reader = std::make_shared<LiveViewBlockInputStream>(
+        reader = Pipe(std::make_shared<LiveViewSource>(
             std::static_pointer_cast<StorageLiveView>(shared_from_this()),
             blocks_ptr, blocks_metadata_ptr, active_ptr, has_limit, limit,
-            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds());
+            local_context->getSettingsRef().live_view_heartbeat_interval.totalSeconds()));
 
     {
         std::lock_guard lock(mutex);
@@ -563,7 +597,7 @@ BlockInputStreams StorageLiveView::watch(
     }
 
     processed_stage = QueryProcessingStage::Complete;
-    return { reader };
+    return reader;
 }
 
 NamesAndTypesList StorageLiveView::getVirtuals() const
diff --git a/src/Storages/LiveView/StorageLiveView.h b/src/Storages/LiveView/StorageLiveView.h
index 23a9c84cb9e..265f5d60ec4 100644
--- a/src/Storages/LiveView/StorageLiveView.h
+++ b/src/Storages/LiveView/StorageLiveView.h
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License. */
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <Core/BackgroundSchedulePool.h>
 
@@ -52,9 +52,9 @@ using Pipes = std::vector<Pipe>;
 class StorageLiveView final : public shared_ptr_helper<StorageLiveView>, public IStorage, WithContext
 {
 friend struct shared_ptr_helper<StorageLiveView>;
-friend class LiveViewBlockInputStream;
-friend class LiveViewEventsBlockInputStream;
-friend class LiveViewBlockOutputStream;
+friend class LiveViewSource;
+friend class LiveViewEventsSource;
+friend class LiveViewSink;
 
 public:
     ~StorageLiveView() override;
@@ -153,7 +153,7 @@ public:
         size_t max_block_size,
         unsigned num_streams) override;
 
-    BlockInputStreams watch(
+    Pipe watch(
         const Names & column_names,
         const SelectQueryInfo & query_info,
         ContextPtr context,
@@ -167,7 +167,7 @@ public:
     /// Collect mergeable blocks and their sample. Must be called holding mutex
     MergeableBlocksPtr collectMergeableBlocks(ContextPtr context);
     /// Complete query using input streams from mergeable blocks
-    BlockInputStreamPtr completeQuery(Pipes pipes);
+    QueryPipelineBuilder completeQuery(Pipes pipes);
 
     void setMergeableBlocks(MergeableBlocksPtr blocks) { mergeable_blocks = blocks; }
     std::shared_ptr<bool> getActivePtr() { return active_ptr; }
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index ccf8a2e606d..06143e954f8 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -6,7 +6,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
 #include <Interpreters/AggregationCommon.h>
-#include <DataStreams/MarkInCompressedFile.h>
+#include <Formats/MarkInCompressedFile.h>
 
 
 namespace ProfileEvents
diff --git a/src/Storages/MergeTree/ActiveDataPartSet.cpp b/src/Storages/MergeTree/ActiveDataPartSet.cpp
index 77fc2c2f0b9..0f6cd8050ca 100644
--- a/src/Storages/MergeTree/ActiveDataPartSet.cpp
+++ b/src/Storages/MergeTree/ActiveDataPartSet.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <Common/Exception.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <algorithm>
 #include <cassert>
 
@@ -42,7 +42,7 @@ bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
         if (!part_info.contains(it->first))
         {
             if (!part_info.isDisjoint(it->first))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects previous part {}. It is a bug.", name, it->first.getPartName());
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects previous part {}. It is a bug or a result of manual intervention in the ZooKeeper data.", name, it->first.getPartName());
             ++it;
             break;
         }
@@ -65,7 +65,7 @@ bool ActiveDataPartSet::add(const String & name, Strings * out_replaced_parts)
     }
 
     if (it != part_info_to_name.end() && !part_info.isDisjoint(it->first))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects next part {}. It is a bug.", name, it->first.getPartName());
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} intersects next part {}. It is a bug or a result of manual intervention in the ZooKeeper data.", name, it->first.getPartName());
 
     part_info_to_name.emplace(part_info, name);
     return true;
diff --git a/src/Storages/MergeTree/ActiveDataPartSet.h b/src/Storages/MergeTree/ActiveDataPartSet.h
index 3d0ac8f949d..0b747ab83b9 100644
--- a/src/Storages/MergeTree/ActiveDataPartSet.h
+++ b/src/Storages/MergeTree/ActiveDataPartSet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/MergeTree/MergeTreePartInfo.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <map>
 #include <vector>
 
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.cpp b/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
new file mode 100644
index 00000000000..f7f02ab40e2
--- /dev/null
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.cpp
@@ -0,0 +1,152 @@
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/randomSeed.h>
+#include <pcg_random.hpp>
+#include <random>
+
+namespace DB
+{
+
+BackgroundJobsAssignee::BackgroundJobsAssignee(MergeTreeData & data_, BackgroundJobsAssignee::Type type_, ContextPtr global_context_)
+    : WithContext(global_context_)
+    , data(data_)
+    , sleep_settings(global_context_->getBackgroundMoveTaskSchedulingSettings())
+    , rng(randomSeed())
+    , type(type_)
+{
+}
+
+void BackgroundJobsAssignee::trigger()
+{
+    std::lock_guard lock(holder_mutex);
+
+    if (!holder)
+        return;
+
+    no_work_done_count = 0;
+    /// We have background jobs, schedule task as soon as possible
+    holder->schedule();
+}
+
+void BackgroundJobsAssignee::postpone()
+{
+    std::lock_guard lock(holder_mutex);
+
+    if (!holder)
+        return;
+
+    auto no_work_done_times = no_work_done_count.fetch_add(1, std::memory_order_relaxed);
+    double random_addition = std::uniform_real_distribution<double>(0, sleep_settings.task_sleep_seconds_when_no_work_random_part)(rng);
+
+    size_t next_time_to_execute = 1000 * (std::min(
+            sleep_settings.task_sleep_seconds_when_no_work_max,
+            sleep_settings.thread_sleep_seconds_if_nothing_to_do * std::pow(sleep_settings.task_sleep_seconds_when_no_work_multiplier, no_work_done_times))
+        + random_addition);
+
+    holder->scheduleAfter(next_time_to_execute, false);
+}
+
+
+void BackgroundJobsAssignee::scheduleMergeMutateTask(ExecutableTaskPtr merge_task)
+{
+    bool res = getContext()->getMergeMutateExecutor()->trySchedule(merge_task);
+    res ? trigger() : postpone();
+}
+
+
+void BackgroundJobsAssignee::scheduleFetchTask(ExecutableTaskPtr fetch_task)
+{
+    bool res = getContext()->getFetchesExecutor()->trySchedule(fetch_task);
+    res ? trigger() : postpone();
+}
+
+
+void BackgroundJobsAssignee::scheduleMoveTask(ExecutableTaskPtr move_task)
+{
+    bool res = getContext()->getMovesExecutor()->trySchedule(move_task);
+    res ? trigger() : postpone();
+}
+
+
+void BackgroundJobsAssignee::scheduleCommonTask(ExecutableTaskPtr common_task)
+{
+    bool res = getContext()->getCommonExecutor()->trySchedule(common_task);
+    res ? trigger() : postpone();
+}
+
+
+String BackgroundJobsAssignee::toString(Type type)
+{
+    switch (type)
+    {
+        case Type::DataProcessing:
+            return "DataProcessing";
+        case Type::Moving:
+            return "Moving";
+    }
+    __builtin_unreachable();
+}
+
+void BackgroundJobsAssignee::start()
+{
+    std::lock_guard lock(holder_mutex);
+    if (!holder)
+        holder = getContext()->getSchedulePool().createTask("BackgroundJobsAssignee:" + toString(type), [this]{ threadFunc(); });
+
+    holder->activateAndSchedule();
+}
+
+void BackgroundJobsAssignee::finish()
+{
+    /// No lock here, because scheduled tasks could call trigger method
+    if (holder)
+    {
+        holder->deactivate();
+
+        auto storage_id = data.getStorageID();
+
+        getContext()->getMovesExecutor()->removeTasksCorrespondingToStorage(storage_id);
+        getContext()->getFetchesExecutor()->removeTasksCorrespondingToStorage(storage_id);
+        getContext()->getMergeMutateExecutor()->removeTasksCorrespondingToStorage(storage_id);
+        getContext()->getCommonExecutor()->removeTasksCorrespondingToStorage(storage_id);
+    }
+}
+
+
+void BackgroundJobsAssignee::threadFunc()
+try
+{
+    bool succeed = false;
+    switch (type)
+    {
+        case Type::DataProcessing:
+            succeed = data.scheduleDataProcessingJob(*this);
+            break;
+        case Type::Moving:
+            succeed = data.scheduleDataMovingJob(*this);
+            break;
+    }
+
+    if (!succeed)
+        postpone();
+}
+catch (...) /// Catch any exception to avoid thread termination.
+{
+    tryLogCurrentException(__PRETTY_FUNCTION__);
+    postpone();
+}
+
+BackgroundJobsAssignee::~BackgroundJobsAssignee()
+{
+    try
+    {
+        finish();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+}
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.h b/src/Storages/MergeTree/BackgroundJobsAssignee.h
new file mode 100644
index 00000000000..b9b6114f121
--- /dev/null
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.h
@@ -0,0 +1,90 @@
+#pragma once
+
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+#include <Common/ThreadPool.h>
+#include <Core/BackgroundSchedulePool.h>
+#include <pcg_random.hpp>
+
+
+namespace DB
+{
+
+/// Settings for background tasks scheduling. Each background assignee has one
+/// BackgroundSchedulingPoolTask and depending on execution result may put this
+/// task to sleep according to settings. Look at scheduleTask function for details.
+struct BackgroundTaskSchedulingSettings
+{
+    double thread_sleep_seconds_random_part = 1.0;
+    double thread_sleep_seconds_if_nothing_to_do = 0.1;
+    double task_sleep_seconds_when_no_work_max = 600;
+    /// For exponential backoff.
+    double task_sleep_seconds_when_no_work_multiplier = 1.1;
+
+    double task_sleep_seconds_when_no_work_random_part = 1.0;
+
+     /// Deprecated settings, don't affect background execution
+    double thread_sleep_seconds = 10;
+    double task_sleep_seconds_when_no_work_min = 10;
+};
+
+class MergeTreeData;
+
+class BackgroundJobsAssignee : public WithContext
+{
+private:
+    MergeTreeData & data;
+
+    /// Settings for execution control of background scheduling task
+    BackgroundTaskSchedulingSettings sleep_settings;
+    /// Useful for random backoff timeouts generation
+    pcg64 rng;
+
+    /// How many times execution of background job failed or we have
+    /// no new jobs.
+    std::atomic<size_t> no_work_done_count{0};
+
+    /// Scheduling task which assign jobs in background pool
+    BackgroundSchedulePool::TaskHolder holder;
+    /// Mutex for thread safety
+    std::mutex holder_mutex;
+
+public:
+    /// In case of ReplicatedMergeTree the first assignee will be responsible for
+    /// polling the replication queue and schedule operations according to the LogEntry type
+    /// e.g. merges, mutations and fetches. The same will be for Plain MergeTree except there is no
+    /// replication queue, so we will just scan parts and decide what to do.
+    /// Moving operations are the same for all types of MergeTree and also have their own timetable.
+    enum class Type
+    {
+        DataProcessing,
+        Moving
+    };
+    Type type{Type::DataProcessing};
+
+    void start();
+    void trigger();
+    void postpone();
+    void finish();
+
+    void scheduleMergeMutateTask(ExecutableTaskPtr merge_task);
+    void scheduleFetchTask(ExecutableTaskPtr fetch_task);
+    void scheduleMoveTask(ExecutableTaskPtr move_task);
+    void scheduleCommonTask(ExecutableTaskPtr common_task);
+
+    /// Just call finish
+    ~BackgroundJobsAssignee();
+
+    BackgroundJobsAssignee(
+        MergeTreeData & data_,
+        Type type,
+        ContextPtr global_context_);
+
+private:
+    static String toString(Type type);
+
+    /// Function that executes in background scheduling pool
+    void threadFunc();
+};
+
+
+}
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp b/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
deleted file mode 100644
index 36803ba5197..00000000000
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/randomSeed.h>
-#include <pcg_random.hpp>
-#include <random>
-
-namespace CurrentMetrics
-{
-    extern const Metric BackgroundPoolTask;
-    extern const Metric BackgroundMovePoolTask;
-    extern const Metric BackgroundFetchesPoolTask;
-}
-
-namespace DB
-{
-
-IBackgroundJobExecutor::IBackgroundJobExecutor(
-        ContextPtr global_context_,
-        const BackgroundTaskSchedulingSettings & sleep_settings_,
-        const std::vector<PoolConfig> & pools_configs_)
-    : WithContext(global_context_)
-    , sleep_settings(sleep_settings_)
-    , rng(randomSeed())
-{
-    for (const auto & pool_config : pools_configs_)
-    {
-        const auto max_pool_size = pool_config.get_max_pool_size();
-        pools.try_emplace(pool_config.pool_type, max_pool_size, 0, max_pool_size, false);
-        pools_configs.emplace(pool_config.pool_type, pool_config);
-    }
-}
-
-double IBackgroundJobExecutor::getSleepRandomAdd()
-{
-    std::lock_guard random_lock(random_mutex);
-    return std::uniform_real_distribution<double>(0, sleep_settings.task_sleep_seconds_when_no_work_random_part)(rng);
-}
-
-void IBackgroundJobExecutor::runTaskWithoutDelay()
-{
-    no_work_done_count = 0;
-    /// We have background jobs, schedule task as soon as possible
-    scheduling_task->schedule();
-}
-
-void IBackgroundJobExecutor::scheduleTask(bool with_backoff)
-{
-    size_t next_time_to_execute;
-    if (with_backoff)
-    {
-        auto no_work_done_times = no_work_done_count.fetch_add(1, std::memory_order_relaxed);
-
-        next_time_to_execute = 1000 * (std::min(
-                sleep_settings.task_sleep_seconds_when_no_work_max,
-                sleep_settings.thread_sleep_seconds_if_nothing_to_do * std::pow(sleep_settings.task_sleep_seconds_when_no_work_multiplier, no_work_done_times))
-            + getSleepRandomAdd());
-    }
-    else
-    {
-        no_work_done_count = 0;
-        next_time_to_execute = 1000 * sleep_settings.thread_sleep_seconds_if_nothing_to_do;
-    }
-
-    scheduling_task->scheduleAfter(next_time_to_execute, false);
-}
-
-namespace
-{
-
-/// Tricky function: we have separate thread pool with max_threads in each background executor for each table
-/// But we want total background threads to be less than max_threads value. So we use global atomic counter (BackgroundMetric)
-/// to limit total number of background threads.
-bool incrementMetricIfLessThanMax(std::atomic<Int64> & atomic_value, Int64 max_value)
-{
-    auto value = atomic_value.load(std::memory_order_relaxed);
-    while (value < max_value)
-    {
-        if (atomic_value.compare_exchange_weak(value, value + 1, std::memory_order_release, std::memory_order_relaxed))
-            return true;
-    }
-    return false;
-}
-
-}
-
-void IBackgroundJobExecutor::execute(JobAndPool job_and_pool)
-try
-{
-    auto & pool_config = pools_configs[job_and_pool.pool_type];
-    const auto max_pool_size = pool_config.get_max_pool_size();
-
-    /// If corresponding pool is not full increment metric and assign new job
-    if (incrementMetricIfLessThanMax(CurrentMetrics::values[pool_config.tasks_metric], max_pool_size))
-    {
-        try /// this try required because we have to manually decrement metric
-        {
-            /// Synchronize pool size, because config could be reloaded
-            pools[job_and_pool.pool_type].setMaxThreads(max_pool_size);
-            pools[job_and_pool.pool_type].setQueueSize(max_pool_size);
-
-            pools[job_and_pool.pool_type].scheduleOrThrowOnError([this, pool_config, job{std::move(job_and_pool.job)}] ()
-            {
-                try /// We don't want exceptions in background pool
-                {
-                    bool job_success = job();
-                    /// Job done, decrement metric and reset no_work counter
-                    CurrentMetrics::values[pool_config.tasks_metric]--;
-
-                    if (job_success)
-                    {
-                        /// Job done, new empty space in pool, schedule background task
-                        runTaskWithoutDelay();
-                    }
-                    else
-                    {
-                        /// Job done, but failed, schedule with backoff
-                        scheduleTask(/* with_backoff = */ true);
-                    }
-
-                }
-                catch (...)
-                {
-                    CurrentMetrics::values[pool_config.tasks_metric]--;
-                    tryLogCurrentException(__PRETTY_FUNCTION__);
-                    scheduleTask(/* with_backoff = */ true);
-                }
-            });
-            /// We've scheduled task in the background pool and when it will finish we will be triggered again. But this task can be
-            /// extremely long and we may have a lot of other small tasks to do, so we schedule ourselves here.
-            runTaskWithoutDelay();
-        }
-        catch (...)
-        {
-            /// With our Pool settings scheduleOrThrowOnError shouldn't throw exceptions, but for safety catch added here
-            CurrentMetrics::values[pool_config.tasks_metric]--;
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-            scheduleTask(/* with_backoff = */ true);
-        }
-    }
-    else /// Pool is full and we have some work to do
-    {
-        scheduleTask(/* with_backoff = */ false);
-    }
-}
-catch (...) /// Exception while we looking for a task, reschedule
-{
-    tryLogCurrentException(__PRETTY_FUNCTION__);
-    scheduleTask(/* with_backoff = */ true);
-}
-
-void IBackgroundJobExecutor::start()
-{
-    std::lock_guard lock(scheduling_task_mutex);
-    if (!scheduling_task)
-    {
-        scheduling_task = getContext()->getSchedulePool().createTask(
-            getBackgroundTaskName(), [this]{ backgroundTaskFunction(); });
-    }
-
-    scheduling_task->activateAndSchedule();
-}
-
-void IBackgroundJobExecutor::finish()
-{
-    std::lock_guard lock(scheduling_task_mutex);
-    if (scheduling_task)
-    {
-        scheduling_task->deactivate();
-        for (auto & [pool_type, pool] : pools)
-            pool.wait();
-    }
-}
-
-void IBackgroundJobExecutor::triggerTask()
-{
-    std::lock_guard lock(scheduling_task_mutex);
-    if (scheduling_task)
-        runTaskWithoutDelay();
-}
-
-void IBackgroundJobExecutor::backgroundTaskFunction()
-{
-    if (!scheduleJob())
-        scheduleTask(/* with_backoff = */ true);
-}
-
-IBackgroundJobExecutor::~IBackgroundJobExecutor()
-{
-    finish();
-}
-
-BackgroundJobsExecutor::BackgroundJobsExecutor(
-       MergeTreeData & data_,
-       ContextPtr global_context_)
-    : IBackgroundJobExecutor(
-        global_context_,
-        global_context_->getBackgroundProcessingTaskSchedulingSettings(),
-        {PoolConfig
-            {
-                .pool_type = PoolType::MERGE_MUTATE,
-                .get_max_pool_size = [global_context_] () { return global_context_->getSettingsRef().background_pool_size; },
-                .tasks_metric = CurrentMetrics::BackgroundPoolTask
-            },
-        PoolConfig
-            {
-                .pool_type = PoolType::FETCH,
-                .get_max_pool_size = [global_context_] () { return global_context_->getSettingsRef().background_fetches_pool_size; },
-                .tasks_metric = CurrentMetrics::BackgroundFetchesPoolTask
-            }
-        })
-    , data(data_)
-{
-}
-
-String BackgroundJobsExecutor::getBackgroundTaskName() const
-{
-    return data.getStorageID().getFullTableName() + " (dataProcessingTask)";
-}
-
-bool BackgroundJobsExecutor::scheduleJob()
-{
-    return data.scheduleDataProcessingJob(*this);
-}
-
-BackgroundMovesExecutor::BackgroundMovesExecutor(
-       MergeTreeData & data_,
-       ContextPtr global_context_)
-    : IBackgroundJobExecutor(
-        global_context_,
-        global_context_->getBackgroundMoveTaskSchedulingSettings(),
-        {PoolConfig
-            {
-                .pool_type = PoolType::MOVE,
-                .get_max_pool_size = [global_context_] () { return global_context_->getSettingsRef().background_move_pool_size; },
-                .tasks_metric = CurrentMetrics::BackgroundMovePoolTask
-            }
-        })
-    , data(data_)
-{
-}
-
-String BackgroundMovesExecutor::getBackgroundTaskName() const
-{
-    return data.getStorageID().getFullTableName() + " (dataMovingTask)";
-}
-
-bool BackgroundMovesExecutor::scheduleJob()
-{
-    return data.scheduleDataMovingJob(*this);
-}
-
-}
diff --git a/src/Storages/MergeTree/BackgroundJobsExecutor.h b/src/Storages/MergeTree/BackgroundJobsExecutor.h
deleted file mode 100644
index 0d9856a2f40..00000000000
--- a/src/Storages/MergeTree/BackgroundJobsExecutor.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#pragma once
-
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Common/ThreadPool.h>
-#include <Core/BackgroundSchedulePool.h>
-#include <pcg_random.hpp>
-
-
-namespace DB
-{
-
-/// Settings for background tasks scheduling. Each background executor has one
-/// BackgroundSchedulingPoolTask and depending on execution result may put this
-/// task to sleep according to settings. Look at scheduleTask function for details.
-struct BackgroundTaskSchedulingSettings
-{
-    double thread_sleep_seconds_random_part = 1.0;
-    double thread_sleep_seconds_if_nothing_to_do = 0.1;
-    double task_sleep_seconds_when_no_work_max = 600;
-    /// For exponential backoff.
-    double task_sleep_seconds_when_no_work_multiplier = 1.1;
-
-    double task_sleep_seconds_when_no_work_random_part = 1.0;
-
-     /// Deprecated settings, don't affect background execution
-    double thread_sleep_seconds = 10;
-    double task_sleep_seconds_when_no_work_min = 10;
-};
-
-/// Pool type where we must execute new job. Each background executor can have several
-/// background pools. When it receives new job it will execute new task in corresponding pool.
-enum class PoolType
-{
-    MERGE_MUTATE,
-    MOVE,
-    FETCH,
-};
-
-using BackgroundJobFunc = std::function<bool()>;
-
-/// Result from background job providers. Function which will be executed in pool and pool type.
-struct JobAndPool
-{
-    BackgroundJobFunc job;
-    PoolType pool_type;
-};
-
-/// Background jobs executor which execute heavy-weight background tasks for MergTree tables, like
-/// background merges, moves, mutations, fetches and so on.
-/// Consists of two important parts:
-/// 1) Task in background scheduling pool which receives new jobs from storages and put them into required pool.
-/// 2) One or more ThreadPool objects, which execute background jobs.
-class IBackgroundJobExecutor : protected WithContext
-{
-protected:
-    /// Configuration for single background ThreadPool
-    struct PoolConfig
-    {
-        /// This pool type
-        PoolType pool_type;
-        /// Max pool size in threads
-        const std::function<size_t()> get_max_pool_size;
-        /// Metric that we have to increment when we execute task in this pool
-        CurrentMetrics::Metric tasks_metric;
-    };
-
-private:
-    /// Name for task in background scheduling pool
-    String task_name;
-    /// Settings for execution control of background scheduling task
-    BackgroundTaskSchedulingSettings sleep_settings;
-    /// Useful for random backoff timeouts generation
-    pcg64 rng;
-
-    /// How many times execution of background job failed or we have
-    /// no new jobs.
-    std::atomic<size_t> no_work_done_count{0};
-
-    /// Pools where we execute background jobs
-    std::unordered_map<PoolType, ThreadPool> pools;
-    /// Configs for background pools
-    std::unordered_map<PoolType, PoolConfig> pools_configs;
-
-    /// Scheduling task which assign jobs in background pool
-    BackgroundSchedulePool::TaskHolder scheduling_task;
-    /// Mutex for thread safety
-    std::mutex scheduling_task_mutex;
-    /// Mutex for pcg random generator thread safety
-    std::mutex random_mutex;
-
-public:
-    /// These three functions are thread safe
-
-    /// Start background task and start to assign jobs
-    void start();
-    /// Schedule background task as soon as possible, even if it sleep at this
-    /// moment for some reason.
-    void triggerTask();
-    /// Finish execution: deactivate background task and wait already scheduled jobs
-    void finish();
-
-    /// Executes job in a nested pool
-    void execute(JobAndPool job_and_pool);
-
-    /// Just call finish
-    virtual ~IBackgroundJobExecutor();
-
-protected:
-    IBackgroundJobExecutor(
-        ContextPtr global_context_,
-        const BackgroundTaskSchedulingSettings & sleep_settings_,
-        const std::vector<PoolConfig> & pools_configs_);
-
-    /// Name for task in background schedule pool
-    virtual String getBackgroundTaskName() const = 0;
-
-    /// Schedules a job in a nested pool in this class.
-    virtual bool scheduleJob() = 0;
-
-private:
-    /// Function that executes in background scheduling pool
-    void backgroundTaskFunction();
-    /// Recalculate timeouts when we have to check for a new job
-    void scheduleTask(bool with_backoff);
-    /// Run background task as fast as possible and reset errors counter
-    void runTaskWithoutDelay();
-    /// Return random add for sleep in case of error
-    double getSleepRandomAdd();
-};
-
-/// Main jobs executor: merges, mutations, fetches and so on
-class BackgroundJobsExecutor final : public IBackgroundJobExecutor
-{
-private:
-    MergeTreeData & data;
-public:
-    BackgroundJobsExecutor(
-        MergeTreeData & data_,
-        ContextPtr global_context_);
-
-protected:
-    String getBackgroundTaskName() const override;
-    bool scheduleJob() override;
-};
-
-/// Move jobs executor, move parts between disks in the background
-/// Does nothing in case of default configuration
-class BackgroundMovesExecutor final : public IBackgroundJobExecutor
-{
-private:
-    MergeTreeData & data;
-public:
-    BackgroundMovesExecutor(
-        MergeTreeData & data_,
-        ContextPtr global_context_);
-
-protected:
-    String getBackgroundTaskName() const override;
-    bool scheduleJob() override;
-};
-
-}
diff --git a/src/Storages/MergeTree/BackgroundProcessList.h b/src/Storages/MergeTree/BackgroundProcessList.h
index b447753ca74..81aded5e45c 100644
--- a/src/Storages/MergeTree/BackgroundProcessList.h
+++ b/src/Storages/MergeTree/BackgroundProcessList.h
@@ -26,6 +26,8 @@ public:
     BackgroundProcessListEntry(const BackgroundProcessListEntry &) = delete;
     BackgroundProcessListEntry & operator=(const BackgroundProcessListEntry &) = delete;
 
+    BackgroundProcessListEntry(BackgroundProcessListEntry &&) = default;
+
     BackgroundProcessListEntry(BackgroundProcessList<ListElement, Info> & list_, const typename container_t::iterator it_, const CurrentMetrics::Metric & metric)
         : list(list_), it{it_}, metric_increment{metric}
     {
@@ -58,7 +60,7 @@ protected:
 
     CurrentMetrics::Metric metric;
 
-    BackgroundProcessList(const CurrentMetrics::Metric & metric_)
+    explicit BackgroundProcessList(const CurrentMetrics::Metric & metric_)
         : metric(metric_)
     {}
 public:
@@ -85,7 +87,7 @@ public:
 
     virtual void onEntryCreate(const Entry & /* entry */) {}
     virtual void onEntryDestroy(const Entry & /* entry */) {}
-    virtual inline ~BackgroundProcessList() {}
+    virtual inline ~BackgroundProcessList() = default;
 };
 
 }
diff --git a/src/Storages/MergeTree/ColumnSizeEstimator.h b/src/Storages/MergeTree/ColumnSizeEstimator.h
new file mode 100644
index 00000000000..61c0ac64dbd
--- /dev/null
+++ b/src/Storages/MergeTree/ColumnSizeEstimator.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "Storages/MergeTree/IMergeTreeDataPart.h"
+
+
+namespace DB
+{
+
+/* Allow to compute more accurate progress statistics */
+class ColumnSizeEstimator
+{
+    using ColumnToSize = MergeTreeDataPartInMemory::ColumnToSize;
+    ColumnToSize map;
+public:
+
+    /// Stores approximate size of columns in bytes
+    /// Exact values are not required since it used for relative values estimation (progress).
+    size_t sum_total = 0;
+    size_t sum_index_columns = 0;
+    size_t sum_ordinary_columns = 0;
+
+    ColumnSizeEstimator(ColumnToSize && map_, const Names & key_columns, const Names & ordinary_columns)
+        : map(std::move(map_))
+    {
+        for (const auto & name : key_columns)
+            if (!map.count(name)) map[name] = 0;
+        for (const auto & name : ordinary_columns)
+            if (!map.count(name)) map[name] = 0;
+
+        for (const auto & name : key_columns)
+            sum_index_columns += map.at(name);
+
+        for (const auto & name : ordinary_columns)
+            sum_ordinary_columns += map.at(name);
+
+        sum_total = std::max(static_cast<decltype(sum_index_columns)>(1), sum_index_columns + sum_ordinary_columns);
+    }
+
+    Float64 columnWeight(const String & column) const
+    {
+        return static_cast<Float64>(map.at(column)) / sum_total;
+    }
+
+    Float64 keyColumnsWeight() const
+    {
+        return static_cast<Float64>(sum_index_columns) / sum_total;
+    }
+};
+}
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index e30da82416d..8960a208680 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/DataPartsExchange.h>
 
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/NativeWriter.h>
 #include <Disks/IDiskRemote.h>
 #include <Disks/SingleDiskVolume.h>
 #include <Disks/createVolume.h>
@@ -14,7 +14,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
 #include <IO/createReadBufferFromFileBase.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <iterator>
 #include <regex>
@@ -57,6 +57,8 @@ constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_DEFAULT_COMPRESSION = 4;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_UUID = 5;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_ZERO_COPY = 6;
 constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION = 7;
+// Reserved for ALTER PRIMARY KEY
+// constexpr auto REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PRIMARY_KEY = 8;
 
 
 std::string getEndpointId(const std::string & node_id)
@@ -110,29 +112,9 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
     /// Validation of the input that may come from malicious replica.
     MergeTreePartInfo::fromPartName(part_name, data.format_version);
 
-    static std::atomic_uint total_sends {0};
-
-    if ((data_settings->replicated_max_parallel_sends
-            && total_sends >= data_settings->replicated_max_parallel_sends)
-        || (data_settings->replicated_max_parallel_sends_for_table
-            && data.current_table_sends >= data_settings->replicated_max_parallel_sends_for_table))
-    {
-        response.setStatus(std::to_string(HTTP_TOO_MANY_REQUESTS));
-        response.setReason("Too many concurrent fetches, try again later");
-        response.set("Retry-After", "10");
-        response.setChunkedTransferEncoding(false);
-        return;
-    }
-
     /// We pretend to work as older server version, to be sure that client will correctly process our version
     response.addCookie({"server_protocol_version", toString(std::min(client_protocol_version, REPLICATION_PROTOCOL_VERSION_WITH_PARTS_PROJECTION))});
 
-    ++total_sends;
-    SCOPE_EXIT({--total_sends;});
-
-    ++data.current_table_sends;
-    SCOPE_EXIT({--data.current_table_sends;});
-
     LOG_TRACE(log, "Sending part {}", part_name);
 
     MergeTreeData::DataPartPtr part;
@@ -181,7 +163,7 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
             client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_ZERO_COPY)
         {
             auto disk = part->volume->getDisk();
-            auto disk_type = DiskType::toString(disk->getType());
+            auto disk_type = toString(disk->getType());
             if (disk->supportZeroCopyReplication() && std::find(capability.begin(), capability.end(), disk_type) != capability.end())
             {
                 /// Send metadata if the receiver's capability covers the source disk type.
@@ -240,7 +222,7 @@ void Service::sendPartFromMemory(
 
         writeStringBinary(name, out);
         projection->checksums.write(out);
-        NativeBlockOutputStream block_out(out, 0, projection_sample_block);
+        NativeWriter block_out(out, 0, projection_sample_block);
         block_out.write(part_in_memory->block);
     }
 
@@ -248,7 +230,7 @@ void Service::sendPartFromMemory(
     if (!part_in_memory)
         throw Exception("Part " + part->name + " is not stored in memory", ErrorCodes::LOGICAL_ERROR);
 
-    NativeBlockOutputStream block_out(out, 0, metadata_snapshot->getSampleBlock());
+    NativeWriter block_out(out, 0, metadata_snapshot->getSampleBlock());
     part->checksums.write(out);
     block_out.write(part_in_memory->block);
 
@@ -362,7 +344,7 @@ void Service::sendPartFromDiskRemoteMeta(const MergeTreeData::DataPartPtr & part
         writeStringBinary(it.first, out);
         writeBinary(file_size, out);
 
-        auto file_in = createReadBufferFromFileBase(metadata_file, 0, 0, 0, nullptr, DBMS_DEFAULT_BUFFER_SIZE);
+        auto file_in = createReadBufferFromFileBase(metadata_file, /* settings= */ {});
         HashingWriteBuffer hashing_out(out);
         copyDataWithThrottler(*file_in, hashing_out, blocker.getCounter(), data.getSendsThrottler());
         if (blocker.isCancelled())
@@ -429,23 +411,20 @@ MergeTreeData::MutableDataPartPtr Fetcher::fetchPart(
     {
         if (!disk)
         {
-            DiskType::Type zero_copy_disk_types[] = {DiskType::Type::S3, DiskType::Type::HDFS};
-            for (auto disk_type: zero_copy_disk_types)
-            {
-                Disks disks = data.getDisksByType(disk_type);
-                if (!disks.empty())
-                {
-                    capability.push_back(DiskType::toString(disk_type));
-                }
-            }
+            Disks disks = data.getDisks();
+            for (const auto & data_disk : disks)
+                if (data_disk->supportZeroCopyReplication())
+                    capability.push_back(toString(data_disk->getType()));
         }
         else if (disk->supportZeroCopyReplication())
         {
-            capability.push_back(DiskType::toString(disk->getType()));
+            capability.push_back(toString(disk->getType()));
         }
     }
     if (!capability.empty())
     {
+        std::sort(capability.begin(), capability.end());
+        capability.erase(std::unique(capability.begin(), capability.end()), capability.end());
         const String & remote_fs_metadata = boost::algorithm::join(capability, ", ");
         uri.addQueryParameter("remote_fs_metadata", remote_fs_metadata);
     }
@@ -590,7 +569,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
         if (!checksums.read(in))
             throw Exception("Cannot deserialize checksums", ErrorCodes::CORRUPTED_DATA);
 
-        NativeBlockInputStream block_in(in, 0);
+        NativeReader block_in(in, 0);
         auto block = block_in.read();
         throttler->add(block.bytes());
 
@@ -601,9 +580,8 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
         new_projection_part->is_temp = false;
         new_projection_part->setColumns(block.getNamesAndTypesList());
         MergeTreePartition partition{};
-        IMergeTreeDataPart::MinMaxIndex minmax_idx{};
         new_projection_part->partition = std::move(partition);
-        new_projection_part->minmax_idx = std::move(minmax_idx);
+        new_projection_part->minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
 
         MergedBlockOutputStream part_out(
             new_projection_part,
@@ -611,7 +589,6 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
             block.getNamesAndTypesList(),
             {},
             CompressionCodecFactory::instance().get("NONE", {}));
-        part_out.writePrefix();
         part_out.write(block);
         part_out.writeSuffixAndFinalizePart(new_projection_part);
         new_projection_part->checksums.checkEqual(checksums, /* have_uncompressed = */ true);
@@ -622,19 +599,18 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
     if (!checksums.read(in))
         throw Exception("Cannot deserialize checksums", ErrorCodes::CORRUPTED_DATA);
 
-    NativeBlockInputStream block_in(in, 0);
+    NativeReader block_in(in, 0);
     auto block = block_in.read();
     throttler->add(block.bytes());
 
     new_data_part->uuid = part_uuid;
     new_data_part->is_temp = true;
     new_data_part->setColumns(block.getNamesAndTypesList());
-    new_data_part->minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    new_data_part->minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
     new_data_part->partition.create(metadata_snapshot, block, 0, context);
 
     MergedBlockOutputStream part_out(
         new_data_part, metadata_snapshot, block.getNamesAndTypesList(), {}, CompressionCodecFactory::instance().get("NONE", {}));
-    part_out.writePrefix();
     part_out.write(block);
     part_out.writeSuffixAndFinalizePart(new_data_part);
     new_data_part->checksums.checkEqual(checksums, /* have_uncompressed = */ true);
@@ -712,7 +688,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     MergeTreeData::DataPart::Checksums & checksums,
     ThrottlerPtr throttler)
 {
-    static const String TMP_PREFIX = "tmp_fetch_";
+    static const String TMP_PREFIX = "tmp-fetch_";
     String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
 
     /// We will remove directory if it's already exists. Make precautions.
@@ -784,7 +760,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDiskRemoteMeta(
     LOG_DEBUG(log, "Downloading Part {} unique id {} metadata onto disk {}.",
         part_name, part_id, disk->getName());
 
-    static const String TMP_PREFIX = "tmp_fetch_";
+    static const String TMP_PREFIX = "tmp-fetch_";
     String tmp_prefix = tmp_prefix_.empty() ? TMP_PREFIX : tmp_prefix_;
 
     String part_relative_path = String(to_detached ? "detached/" : "") + tmp_prefix + part_name;
diff --git a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
index 1f194092f5f..7f7e0e6295e 100644
--- a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
+++ b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
@@ -1,7 +1,7 @@
 #include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
-#include <common/logger_useful.h>
-#include <common/types.h>
+#include <base/logger_useful.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/FutureMergedMutatedPart.cpp b/src/Storages/MergeTree/FutureMergedMutatedPart.cpp
new file mode 100644
index 00000000000..acbdcdcf38a
--- /dev/null
+++ b/src/Storages/MergeTree/FutureMergedMutatedPart.cpp
@@ -0,0 +1,92 @@
+#include "Storages/MergeTree/FutureMergedMutatedPart.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_)
+{
+    if (parts_.empty())
+        return;
+
+    size_t sum_rows = 0;
+    size_t sum_bytes_uncompressed = 0;
+    MergeTreeDataPartType future_part_type = MergeTreeDataPartType::UNKNOWN;
+    for (const auto & part : parts_)
+    {
+        sum_rows += part->rows_count;
+        sum_bytes_uncompressed += part->getTotalColumnsSize().data_uncompressed;
+        future_part_type = std::min(future_part_type, part->getType());
+    }
+
+    auto chosen_type = parts_.front()->storage.choosePartTypeOnDisk(sum_bytes_uncompressed, sum_rows);
+    future_part_type = std::min(future_part_type, chosen_type);
+    assign(std::move(parts_), future_part_type);
+}
+
+void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
+{
+    if (parts_.empty())
+        return;
+
+    for (const MergeTreeData::DataPartPtr & part : parts_)
+    {
+        const MergeTreeData::DataPartPtr & first_part = parts_.front();
+
+        if (part->partition.value != first_part->partition.value)
+            throw Exception(
+                "Attempting to merge parts " + first_part->name + " and " + part->name + " that are in different partitions",
+                ErrorCodes::LOGICAL_ERROR);
+    }
+
+    parts = std::move(parts_);
+
+    UInt32 max_level = 0;
+    Int64 max_mutation = 0;
+    for (const auto & part : parts)
+    {
+        max_level = std::max(max_level, part->info.level);
+        max_mutation = std::max(max_mutation, part->info.mutation);
+    }
+
+    type = future_part_type;
+    part_info.partition_id = parts.front()->info.partition_id;
+    part_info.min_block = parts.front()->info.min_block;
+    part_info.max_block = parts.back()->info.max_block;
+    part_info.level = max_level + 1;
+    part_info.mutation = max_mutation;
+
+    if (parts.front()->storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
+    {
+        DayNum min_date = DayNum(std::numeric_limits<UInt16>::max());
+        DayNum max_date = DayNum(std::numeric_limits<UInt16>::min());
+        for (const auto & part : parts)
+        {
+            /// NOTE: getting min and max dates from part names (instead of part data) because we want
+            /// the merged part name be determined only by source part names.
+            /// It is simpler this way when the real min and max dates for the block range can change
+            /// (e.g. after an ALTER DELETE command).
+            DayNum part_min_date;
+            DayNum part_max_date;
+            MergeTreePartInfo::parseMinMaxDatesFromPartName(part->name, part_min_date, part_max_date);
+            min_date = std::min(min_date, part_min_date);
+            max_date = std::max(max_date, part_max_date);
+        }
+
+        name = part_info.getPartNameV0(min_date, max_date);
+    }
+    else
+        name = part_info.getPartName();
+}
+
+void FutureMergedMutatedPart::updatePath(const MergeTreeData & storage, const IReservation * reservation)
+{
+    path = storage.getFullPathOnDisk(reservation->getDisk()) + name + "/";
+}
+
+}
diff --git a/src/Storages/MergeTree/FutureMergedMutatedPart.h b/src/Storages/MergeTree/FutureMergedMutatedPart.h
new file mode 100644
index 00000000000..9ff39b44c8c
--- /dev/null
+++ b/src/Storages/MergeTree/FutureMergedMutatedPart.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <base/types.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataPartType.h>
+#include <Storages/MergeTree/MergeTreePartInfo.h>
+#include <Storages/MergeTree/MergeType.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+
+
+namespace DB
+{
+
+class MergeTreeData;
+
+/// Auxiliary struct holding metainformation for the future merged or mutated part.
+struct FutureMergedMutatedPart
+{
+    String name;
+    UUID uuid = UUIDHelpers::Nil;
+    String path;
+    MergeTreeDataPartType type;
+    MergeTreePartInfo part_info;
+    MergeTreeData::DataPartsVector parts;
+    MergeType merge_type = MergeType::REGULAR;
+
+    const MergeTreePartition & getPartition() const { return parts.front()->partition; }
+
+    FutureMergedMutatedPart() = default;
+
+    explicit FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_)
+    {
+        assign(std::move(parts_));
+    }
+
+    FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
+    {
+        assign(std::move(parts_), future_part_type);
+    }
+
+    void assign(MergeTreeData::DataPartsVector parts_);
+    void assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type);
+
+    void updatePath(const MergeTreeData & storage, const IReservation * reservation);
+};
+
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+}
diff --git a/src/Storages/MergeTree/IExecutableTask.h b/src/Storages/MergeTree/IExecutableTask.h
new file mode 100644
index 00000000000..00ae60ffe17
--- /dev/null
+++ b/src/Storages/MergeTree/IExecutableTask.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <memory>
+#include <functional>
+
+#include <base/shared_ptr_helper.h>
+#include <Interpreters/StorageID.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+/**
+ * Generic interface for background operations. Simply this is self-made coroutine.
+ * The main method is executeStep, which will return true
+ * if the task wants to execute another 'step' in near future and false otherwise.
+ *
+ * Each storage assigns some operations such as merges, mutations, fetches, etc.
+ * We need to ask a storage or some another entity to try to assign another operation when current operation is completed.
+ *
+ * Each task corresponds to a storage, that's why there is a method getStorageID.
+ * This is needed to correctly shutdown a storage, e.g. we need to wait for all background operations to complete.
+ */
+class IExecutableTask
+{
+public:
+    using TaskResultCallback = std::function<void(bool)>;
+    virtual bool executeStep() = 0;
+    virtual void onCompleted() = 0;
+    virtual StorageID getStorageID() = 0;
+    virtual UInt64 getPriority() = 0;
+    virtual ~IExecutableTask() = default;
+};
+
+using ExecutableTaskPtr = std::shared_ptr<IExecutableTask>;
+
+
+/**
+ * Some background operations won't represent a coroutines (don't want to be executed step-by-step). For this we have this wrapper.
+ */
+class ExecutableLambdaAdapter : public shared_ptr_helper<ExecutableLambdaAdapter>, public IExecutableTask
+{
+public:
+
+    template <typename Job, typename Callback>
+    explicit ExecutableLambdaAdapter(
+        Job && job_to_execute_,
+        Callback && job_result_callback_,
+        StorageID id_)
+        : job_to_execute(job_to_execute_)
+        , job_result_callback(job_result_callback_)
+        , id(id_) {}
+
+    bool executeStep() override
+    {
+        res = job_to_execute();
+        job_to_execute = {};
+        return false;
+    }
+
+    void onCompleted() override { job_result_callback(!res); }
+    StorageID getStorageID() override { return id; }
+    UInt64 getPriority() override
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "getPriority() method is not supported by LambdaAdapter");
+    }
+
+private:
+    bool res = false;
+    std::function<bool()> job_to_execute;
+    IExecutableTask::TaskResultCallback job_result_callback;
+    StorageID id;
+};
+
+
+}
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index ea965f10b23..93149f87f99 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -15,8 +15,8 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <common/JSON.h>
-#include <common/logger_useful.h>
+#include <base/JSON.h>
+#include <base/logger_useful.h>
 #include <Compression/getCompressionCodecForFile.h>
 #include <Parsers/queryToString.h>
 #include <DataTypes/NestedUtils.h>
@@ -56,7 +56,8 @@ namespace ErrorCodes
 
 static std::unique_ptr<ReadBufferFromFileBase> openForReading(const DiskPtr & disk, const String & path)
 {
-    return disk->readFile(path, std::min(size_t(DBMS_DEFAULT_BUFFER_SIZE), disk->getFileSize(path)));
+    size_t file_size = disk->getFileSize(path);
+    return disk->readFile(path, ReadSettings().adjustBufferSize(file_size), file_size);
 }
 
 void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const DiskPtr & disk_, const String & part_path)
@@ -67,6 +68,7 @@ void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const Dis
     auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
     auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
     size_t minmax_idx_size = minmax_column_types.size();
+
     hyperrectangle.reserve(minmax_idx_size);
     for (size_t i = 0; i < minmax_idx_size; ++i)
     {
@@ -81,9 +83,9 @@ void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const Dis
 
         // NULL_LAST
         if (min_val.isNull())
-            min_val = PositiveInfinity();
+            min_val = POSITIVE_INFINITY;
         if (max_val.isNull())
-            max_val = PositiveInfinity();
+            max_val = POSITIVE_INFINITY;
 
         hyperrectangle.emplace_back(min_val, true, max_val, true);
     }
@@ -286,6 +288,8 @@ IMergeTreeDataPart::IMergeTreeDataPart(
         state = State::Committed;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
+
+    minmax_idx = std::make_shared<MinMaxIndex>();
 }
 
 IMergeTreeDataPart::IMergeTreeDataPart(
@@ -309,6 +313,8 @@ IMergeTreeDataPart::IMergeTreeDataPart(
         state = State::Committed;
     incrementStateMetric(state);
     incrementTypeMetric(part_type);
+
+    minmax_idx = std::make_shared<MinMaxIndex>();
 }
 
 IMergeTreeDataPart::~IMergeTreeDataPart()
@@ -359,9 +365,9 @@ IMergeTreeDataPart::State IMergeTreeDataPart::getState() const
 
 std::pair<DayNum, DayNum> IMergeTreeDataPart::getMinMaxDate() const
 {
-    if (storage.minmax_idx_date_column_pos != -1 && minmax_idx.initialized)
+    if (storage.minmax_idx_date_column_pos != -1 && minmax_idx->initialized)
     {
-        const auto & hyperrectangle = minmax_idx.hyperrectangle[storage.minmax_idx_date_column_pos];
+        const auto & hyperrectangle = minmax_idx->hyperrectangle[storage.minmax_idx_date_column_pos];
         return {DayNum(hyperrectangle.left.get<UInt64>()), DayNum(hyperrectangle.right.get<UInt64>())};
     }
     else
@@ -370,9 +376,9 @@ std::pair<DayNum, DayNum> IMergeTreeDataPart::getMinMaxDate() const
 
 std::pair<time_t, time_t> IMergeTreeDataPart::getMinMaxTime() const
 {
-    if (storage.minmax_idx_time_column_pos != -1 && minmax_idx.initialized)
+    if (storage.minmax_idx_time_column_pos != -1 && minmax_idx->initialized)
     {
-        const auto & hyperrectangle = minmax_idx.hyperrectangle[storage.minmax_idx_time_column_pos];
+        const auto & hyperrectangle = minmax_idx->hyperrectangle[storage.minmax_idx_time_column_pos];
 
         /// The case of DateTime
         if (hyperrectangle.left.getType() == Field::Types::UInt64)
@@ -433,9 +439,13 @@ void IMergeTreeDataPart::removeIfNeeded()
                 if (file_name.empty())
                     throw Exception("relative_path " + relative_path + " of part " + name + " is invalid or not set", ErrorCodes::LOGICAL_ERROR);
 
-                if (!startsWith(file_name, "tmp"))
+                if (!startsWith(file_name, "tmp") && !endsWith(file_name, ".tmp_proj"))
                 {
-                    LOG_ERROR(storage.log, "~DataPart() should remove part {} but its name doesn't start with tmp. Too suspicious, keeping the part.", path);
+                    LOG_ERROR(
+                        storage.log,
+                        "~DataPart() should remove part {} but its name doesn't start with \"tmp\" or end with \".tmp_proj\". Too "
+                        "suspicious, keeping the part.",
+                        path);
                     return;
                 }
             }
@@ -479,39 +489,16 @@ UInt64 IMergeTreeDataPart::getIndexSizeInAllocatedBytes() const
     return res;
 }
 
-String IMergeTreeDataPart::stateToString(IMergeTreeDataPart::State state)
-{
-    switch (state)
-    {
-        case State::Temporary:
-            return "Temporary";
-        case State::PreCommitted:
-            return "PreCommitted";
-        case State::Committed:
-            return "Committed";
-        case State::Outdated:
-            return "Outdated";
-        case State::Deleting:
-            return "Deleting";
-        case State::DeleteOnDestroy:
-            return "DeleteOnDestroy";
-    }
-
-    __builtin_unreachable();
-}
-
-String IMergeTreeDataPart::stateString() const
-{
-    return stateToString(state);
-}
-
 void IMergeTreeDataPart::assertState(const std::initializer_list<IMergeTreeDataPart::State> & affordable_states) const
 {
     if (!checkState(affordable_states))
     {
         String states_str;
         for (auto affordable_state : affordable_states)
-            states_str += stateToString(affordable_state) + " ";
+        {
+            states_str += stateString(affordable_state);
+            states_str += ' ';
+        }
 
         throw Exception("Unexpected state of part " + getNameWithState() + ". Expected: " + states_str, ErrorCodes::NOT_FOUND_EXPECTED_DATA_PART);
     }
@@ -601,7 +588,7 @@ void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checks
     loadColumns(require_columns_checksums);
     loadChecksums(require_columns_checksums);
     loadIndexGranularity();
-    calculateColumnsSizesOnDisk();
+    calculateColumnsAndSecondaryIndicesSizesOnDisk();
     loadIndex();     /// Must be called after loadIndexGranularity as it uses the value of `index_granularity`
     loadRowsCount(); /// Must be called after loadIndexGranularity() as it uses the value of `index_granularity`.
     loadPartitionAndMinMaxIndex();
@@ -808,7 +795,7 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
 
         const auto & date_lut = DateLUT::instance();
         partition = MergeTreePartition(date_lut.toNumYYYYMM(min_date));
-        minmax_idx = MinMaxIndex(min_date, max_date);
+        minmax_idx = std::make_shared<MinMaxIndex>(min_date, max_date);
     }
     else
     {
@@ -820,9 +807,9 @@ void IMergeTreeDataPart::loadPartitionAndMinMaxIndex()
         {
             if (parent_part)
                 // projection parts don't have minmax_idx, and it's always initialized
-                minmax_idx.initialized = true;
+                minmax_idx->initialized = true;
             else
-                minmax_idx.load(storage, volume->getDisk(), path);
+                minmax_idx->load(storage, volume->getDisk(), path);
         }
         if (parent_part)
             return;
@@ -1322,6 +1309,9 @@ String IMergeTreeDataPart::getRelativePathForDetachedPart(const String & prefix)
 {
     /// Do not allow underscores in the prefix because they are used as separators.
     assert(prefix.find_first_of('_') == String::npos);
+    assert(prefix.empty() || std::find(DetachedPartInfo::DETACH_REASONS.begin(),
+                                       DetachedPartInfo::DETACH_REASONS.end(),
+                                       prefix) != DetachedPartInfo::DETACH_REASONS.end());
     return "detached/" + getRelativePathForPrefix(prefix);
 }
 
@@ -1434,6 +1424,11 @@ void IMergeTreeDataPart::checkConsistency(bool /* require_part_metadata */) cons
     throw Exception("Method 'checkConsistency' is not implemented for part with type " + getType().toString(), ErrorCodes::NOT_IMPLEMENTED);
 }
 
+void IMergeTreeDataPart::calculateColumnsAndSecondaryIndicesSizesOnDisk()
+{
+    calculateColumnsSizesOnDisk();
+    calculateSecondaryIndicesSizesOnDisk();
+}
 
 void IMergeTreeDataPart::calculateColumnsSizesOnDisk()
 {
@@ -1443,6 +1438,41 @@ void IMergeTreeDataPart::calculateColumnsSizesOnDisk()
     calculateEachColumnSizes(columns_sizes, total_columns_size);
 }
 
+void IMergeTreeDataPart::calculateSecondaryIndicesSizesOnDisk()
+{
+    if (checksums.empty())
+        throw Exception("Cannot calculate secondary indexes sizes when columns or checksums are not initialized", ErrorCodes::LOGICAL_ERROR);
+
+    auto secondary_indices_descriptions = storage.getInMemoryMetadataPtr()->secondary_indices;
+
+    for (auto & index_description : secondary_indices_descriptions)
+    {
+        ColumnSize index_size;
+
+        auto index_ptr = MergeTreeIndexFactory::instance().get(index_description);
+        auto index_name = index_ptr->getFileName();
+        auto index_name_escaped = escapeForFileName(index_name);
+
+        auto index_file_name = index_name_escaped + index_ptr->getSerializedFileExtension();
+        auto index_marks_file_name = index_name_escaped + index_granularity_info.marks_file_extension;
+
+        /// If part does not contain index
+        auto bin_checksum = checksums.files.find(index_file_name);
+        if (bin_checksum != checksums.files.end())
+        {
+            index_size.data_compressed = bin_checksum->second.file_size;
+            index_size.data_uncompressed = bin_checksum->second.uncompressed_size;
+        }
+
+        auto mrk_checksum = checksums.files.find(index_marks_file_name);
+        if (mrk_checksum != checksums.files.end())
+            index_size.marks = mrk_checksum->second.file_size;
+
+        total_secondary_indices_size.add(index_size);
+        secondary_index_sizes[index_description.name] = index_size;
+    }
+}
+
 ColumnSize IMergeTreeDataPart::getColumnSize(const String & column_name, const IDataType & /* type */) const
 {
     /// For some types of parts columns_size maybe not calculated
@@ -1453,6 +1483,15 @@ ColumnSize IMergeTreeDataPart::getColumnSize(const String & column_name, const I
     return ColumnSize{};
 }
 
+IndexSize IMergeTreeDataPart::getSecondaryIndexSize(const String & secondary_index_name) const
+{
+    auto it = secondary_index_sizes.find(secondary_index_name);
+    if (it != secondary_index_sizes.end())
+        return it->second;
+
+    return ColumnSize{};
+}
+
 void IMergeTreeDataPart::accumulateColumnSizes(ColumnToSize & column_to_size) const
 {
     for (const auto & [column_name, size] : columns_sizes)
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 8b7a15e5da0..f0dff289ced 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -1,13 +1,12 @@
 #pragma once
 
 #include <Core/Block.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/MergeTreeIndexGranularityInfo.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
-#include <Storages/MergeTree/MergeTreeProjections.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/MergeTreePartition.h>
 #include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
@@ -17,7 +16,6 @@
 
 #include <shared_mutex>
 
-
 namespace zkutil
 {
     class ZooKeeper;
@@ -57,6 +55,8 @@ public:
     using ColumnSizeByName = std::unordered_map<std::string, ColumnSize>;
     using NameToNumber = std::unordered_map<std::string, size_t>;
 
+    using IndexSizeByName = std::unordered_map<std::string, ColumnSize>;
+
     using Type = MergeTreeDataPartType;
 
 
@@ -97,15 +97,24 @@ public:
 
     virtual bool isStoredOnDisk() const = 0;
 
+    virtual bool isStoredOnRemoteDisk() const = 0;
+
     virtual bool supportsVerticalMerge() const { return false; }
 
     /// NOTE: Returns zeros if column files are not found in checksums.
     /// Otherwise return information about column size on disk.
     ColumnSize getColumnSize(const String & column_name, const IDataType & /* type */) const;
 
+    /// NOTE: Returns zeros if secondary indexes are not found in checksums.
+    /// Otherwise return information about secondary index size on disk.
+    IndexSize getSecondaryIndexSize(const String & secondary_index_name) const;
+
     /// Return information about column size on disk for all columns in part
     ColumnSize getTotalColumnsSize() const { return total_columns_size; }
 
+    /// Return information about secondary indexes size on disk for all indexes in part
+    IndexSize getTotalSeconaryIndicesSize() const { return total_secondary_indices_size; }
+
     virtual String getFileNameForColumn(const NameAndTypePair & column) const = 0;
 
     virtual ~IMergeTreeDataPart();
@@ -177,6 +186,7 @@ public:
 
     /// A directory path (relative to storage's path) where part data is actually stored
     /// Examples: 'detached/tmp_fetch_<name>', 'tmp_<name>', '<name>'
+    /// NOTE: Cannot have trailing slash.
     mutable String relative_path;
     MergeTreeIndexGranularityInfo index_granularity_info;
 
@@ -222,12 +232,6 @@ public:
         DeleteOnDestroy, /// part was moved to another disk and should be deleted in own destructor
     };
 
-    static constexpr auto all_part_states =
-    {
-        State::Temporary, State::PreCommitted, State::Committed, State::Outdated, State::Deleting,
-        State::DeleteOnDestroy
-    };
-
     using TTLInfo = MergeTreeDataPartTTLInfo;
     using TTLInfos = MergeTreeDataPartTTLInfos;
 
@@ -237,14 +241,10 @@ public:
     void setState(State new_state) const;
     State getState() const;
 
-    /// Returns name of state
-    static String stateToString(State state);
-    String stateString() const;
+    static constexpr std::string_view stateString(State state) { return magic_enum::enum_name(state); }
+    constexpr std::string_view stateString() const { return stateString(state); }
 
-    String getNameWithState() const
-    {
-        return name + " (state " + stateString() + ")";
-    }
+    String getNameWithState() const { return fmt::format("{} (state {})", name, stateString()); }
 
     /// Returns true if state of part is one of affordable_states
     bool checkState(const std::initializer_list<State> & affordable_states) const
@@ -300,7 +300,9 @@ public:
         void merge(const MinMaxIndex & other);
     };
 
-    MinMaxIndex minmax_idx;
+    using MinMaxIndexPtr = std::shared_ptr<MinMaxIndex>;
+
+    MinMaxIndexPtr minmax_idx;
 
     Checksums checksums;
 
@@ -351,7 +353,9 @@ public:
 
     /// Calculate the total size of the entire directory with all the files
     static UInt64 calculateTotalSizeOnDisk(const DiskPtr & disk_, const String & from);
-    void calculateColumnsSizesOnDisk();
+
+    /// Calculate column and secondary indices sizes on disk.
+    void calculateColumnsAndSecondaryIndicesSizesOnDisk();
 
     String getRelativePathForPrefix(const String & prefix) const;
 
@@ -406,6 +410,10 @@ protected:
     /// Size for each column, calculated once in calcuateColumnSizesOnDisk
     ColumnSizeByName columns_sizes;
 
+    ColumnSize total_secondary_indices_size;
+
+    IndexSizeByName secondary_index_sizes;
+
     /// Total size on disk, not only columns. May not contain size of
     /// checksums.txt and columns.txt. 0 - if not counted;
     UInt64 bytes_on_disk{0};
@@ -460,6 +468,10 @@ private:
 
     void loadPartitionAndMinMaxIndex();
 
+    void calculateColumnsSizesOnDisk();
+
+    void calculateSecondaryIndicesSizesOnDisk();
+
     /// Load default compression codec from file default_compression_codec.txt
     /// if it not exists tries to deduce codec from compressed column without
     /// any specifial compression.
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
index 83fd9692e49..3d6b12efdf1 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.cpp
@@ -49,7 +49,7 @@ IMergeTreeDataPartWriter::IMergeTreeDataPartWriter(
     , columns_list(columns_list_)
     , settings(settings_)
     , index_granularity(index_granularity_)
-    , with_final_mark(storage.getSettings()->write_final_mark && settings.can_use_adaptive_granularity)
+    , with_final_mark(settings.can_use_adaptive_granularity)
 {
 }
 
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
index 5e12d5da678..d0d3f283478 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPartWriter.h
@@ -5,7 +5,6 @@
 #include <Compression/CompressedWriteBuffer.h>
 #include <IO/HashingWriteBuffer.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Disks/IDisk.h>
 
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index 4efd3d669eb..75eb01ed73c 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -42,15 +42,16 @@ IMergeTreeReader::IMergeTreeReader(
     , all_mark_ranges(all_mark_ranges_)
     , alter_conversions(storage.getAlterConversionsForPart(data_part))
 {
-    if (settings.convert_nested_to_subcolumns)
+    if (isWidePart(data_part))
     {
+        /// For wide parts convert plain arrays of Nested to subcolumns
+        /// to allow to use shared offset column from cache.
         columns = Nested::convertToSubcolumns(columns);
         part_columns = Nested::collect(part_columns);
     }
 
-    columns_from_part.set_empty_key(StringRef());
     for (const auto & column_from_part : part_columns)
-        columns_from_part.emplace(column_from_part.name, &column_from_part.type);
+        columns_from_part[column_from_part.name] = &column_from_part.type;
 }
 
 IMergeTreeReader::~IMergeTreeReader() = default;
@@ -136,10 +137,11 @@ void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_e
 
                 String offsets_name = Nested::extractTableName(name);
                 auto offset_it = offset_columns.find(offsets_name);
-                if (offset_it != offset_columns.end())
+                const auto * array_type = typeid_cast<const DataTypeArray *>(type.get());
+                if (offset_it != offset_columns.end() && array_type)
                 {
+                    const auto & nested_type = array_type->getNestedType();
                     ColumnPtr offsets_column = offset_it->second;
-                    DataTypePtr nested_type = typeid_cast<const DataTypeArray &>(*type).getNestedType();
                     size_t nested_rows = typeid_cast<const ColumnUInt64 &>(*offsets_column).getData().back();
 
                     ColumnPtr nested_column =
@@ -213,7 +215,7 @@ NameAndTypePair IMergeTreeReader::getColumnFromPart(const NameAndTypePair & requ
 {
     auto name_in_storage = required_column.getNameInStorage();
 
-    decltype(columns_from_part.begin()) it;
+    ColumnsFromPart::ConstLookupResult it;
     if (alter_conversions.isColumnRenamed(name_in_storage))
     {
         String old_name = alter_conversions.getColumnOldName(name_in_storage);
@@ -227,7 +229,7 @@ NameAndTypePair IMergeTreeReader::getColumnFromPart(const NameAndTypePair & requ
     if (it == columns_from_part.end())
         return required_column;
 
-    const auto & type = *it->second;
+    const DataTypePtr & type = *it->getMapped();
     if (required_column.isSubcolumn())
     {
         auto subcolumn_name = required_column.getSubcolumnName();
@@ -236,10 +238,10 @@ NameAndTypePair IMergeTreeReader::getColumnFromPart(const NameAndTypePair & requ
         if (!subcolumn_type)
             return required_column;
 
-        return {String(it->first), subcolumn_name, type, subcolumn_type};
+        return {String(it->getKey()), subcolumn_name, type, subcolumn_type};
     }
 
-    return {String(it->first), type};
+    return {String(it->getKey()), type};
 }
 
 void IMergeTreeReader::performRequiredConversions(Columns & res_columns)
diff --git a/src/Storages/MergeTree/IMergeTreeReader.h b/src/Storages/MergeTree/IMergeTreeReader.h
index ab412e48822..28334b9a8bb 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.h
+++ b/src/Storages/MergeTree/IMergeTreeReader.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Core/NamesAndTypes.h>
+#include <Common/HashTable/HashMap.h>
 #include <Storages/MergeTree/MergeTreeReaderStream.h>
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
-#include <sparsehash/dense_hash_map>
 
 namespace DB
 {
@@ -30,8 +30,10 @@ public:
         const ValueSizeMap & avg_value_size_hints_ = ValueSizeMap{});
 
     /// Return the number of rows has been read or zero if there is no columns to read.
-    /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
-    virtual size_t readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns) = 0;
+    /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark.
+    /// current_task_last mark is needed for asynchronous reading (mainly from remote fs).
+    virtual size_t readRows(size_t from_mark, size_t current_task_last_mark,
+                            bool continue_reading, size_t max_rows_to_read, Columns & res_columns) = 0;
 
     virtual bool canReadIncompleteGranules() const = 0;
 
@@ -95,11 +97,8 @@ private:
 
     /// Actual data type of columns in part
 
-#if !defined(ARCADIA_BUILD)
-    google::dense_hash_map<StringRef, const DataTypePtr *, StringRefHash> columns_from_part;
-#else
-    google::sparsehash::dense_hash_map<StringRef, const DataTypePtr *, StringRefHash> columns_from_part;
-#endif
+    using ColumnsFromPart = HashMapWithSavedHash<StringRef, const DataTypePtr *, StringRefHash>;
+    ColumnsFromPart columns_from_part;
 };
 
 }
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
index e334cd486ef..48fd9e583bf 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.cpp
@@ -35,8 +35,7 @@ NameSet IMergedBlockOutputStream::removeEmptyColumnsFromPart(
             [&](const ISerialization::SubstreamPath & substream_path)
             {
                 ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
-            },
-            {});
+            });
     }
 
     NameSet remove_files;
diff --git a/src/Storages/MergeTree/IMergedBlockOutputStream.h b/src/Storages/MergeTree/IMergedBlockOutputStream.h
index b2ad5309017..36fbe76cca2 100644
--- a/src/Storages/MergeTree/IMergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/IMergedBlockOutputStream.h
@@ -2,23 +2,26 @@
 
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/IMergeTreeDataPartWriter.h>
 
 namespace DB
 {
 
-class IMergedBlockOutputStream : public IBlockOutputStream
+class IMergedBlockOutputStream
 {
 public:
     IMergedBlockOutputStream(
         const MergeTreeDataPartPtr & data_part,
         const StorageMetadataPtr & metadata_snapshot_);
 
+    virtual ~IMergedBlockOutputStream() = default;
+
     using WrittenOffsetColumns = std::set<std::string>;
 
-    const MergeTreeIndexGranularity & getIndexGranularity()
+    virtual void write(const Block & block) = 0;
+
+    const MergeTreeIndexGranularity & getIndexGranularity() const
     {
         return writer->getIndexGranularity();
     }
@@ -35,7 +38,6 @@ protected:
         NamesAndTypesList & columns,
         MergeTreeData::DataPart::Checksums & checksums);
 
-protected:
     const MergeTreeData & storage;
     StorageMetadataPtr metadata_snapshot;
 
@@ -45,4 +47,6 @@ protected:
     IMergeTreeDataPart::MergeTreeWriterPtr writer;
 };
 
+using IMergedBlockOutputStreamPtr = std::shared_ptr<IMergedBlockOutputStream>;
+
 }
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index 235cadfba11..d53faf144f9 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -10,6 +10,7 @@
 #include <Interpreters/misc.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsConversion.h>
+#include <Functions/CastOverloadResolver.h>
 #include <Functions/IFunction.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/FieldVisitorToString.h>
@@ -333,7 +334,7 @@ const KeyCondition::AtomMap KeyCondition::atom_map
         {
             out.function = RPNElement::FUNCTION_IS_NULL;
             // When using NULL_LAST, isNull means [+Inf, +Inf]
-            out.range = Range(Field(PositiveInfinity{}));
+            out.range = Range(Field(POSITIVE_INFINITY));
             return true;
         }
     }
@@ -667,44 +668,34 @@ void KeyCondition::traverseAST(const ASTPtr & node, ContextPtr context, Block &
     rpn.emplace_back(std::move(element));
 }
 
-bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
-    const ASTPtr & node,
+
+/** The key functional expression constraint may be inferred from a plain column in the expression.
+  * For example, if the key contains `toStartOfHour(Timestamp)` and query contains `WHERE Timestamp >= now()`,
+  * it can be assumed that if `toStartOfHour()` is monotonic on [now(), inf), the `toStartOfHour(Timestamp) >= toStartOfHour(now())`
+  * condition also holds, so the index may be used to select only parts satisfying this condition.
+  *
+  * To check the assumption, we'd need to assert that the inverse function to this transformation is also monotonic, however the
+  * inversion isn't exported (or even viable for not strictly monotonic functions such as `toStartOfHour()`).
+  * Instead, we can qualify only functions that do not transform the range (for example rounding),
+  * which while not strictly monotonic, are monotonic everywhere on the input range.
+  */
+bool KeyCondition::transformConstantWithValidFunctions(
+    const String & expr_name,
     size_t & out_key_column_num,
     DataTypePtr & out_key_column_type,
     Field & out_value,
-    DataTypePtr & out_type)
+    DataTypePtr & out_type,
+    std::function<bool(IFunctionBase &, const IDataType &)> always_monotonic) const
 {
-    String expr_name = node->getColumnNameWithoutAlias();
-
-    if (array_joined_columns.count(expr_name))
-        return false;
-
-    if (key_subexpr_names.count(expr_name) == 0)
-        return false;
-
-    if (out_value.isNull())
-        return false;
-
     const auto & sample_block = key_expr->getSampleBlock();
-
-    /** The key functional expression constraint may be inferred from a plain column in the expression.
-    * For example, if the key contains `toStartOfHour(Timestamp)` and query contains `WHERE Timestamp >= now()`,
-    * it can be assumed that if `toStartOfHour()` is monotonic on [now(), inf), the `toStartOfHour(Timestamp) >= toStartOfHour(now())`
-    * condition also holds, so the index may be used to select only parts satisfying this condition.
-    *
-    * To check the assumption, we'd need to assert that the inverse function to this transformation is also monotonic, however the
-    * inversion isn't exported (or even viable for not strictly monotonic functions such as `toStartOfHour()`).
-    * Instead, we can qualify only functions that do not transform the range (for example rounding),
-    * which while not strictly monotonic, are monotonic everywhere on the input range.
-    */
-    for (const auto & dag_node : key_expr->getNodes())
+    for (const auto & node : key_expr->getNodes())
     {
-        auto it = key_columns.find(dag_node.result_name);
+        auto it = key_columns.find(node.result_name);
         if (it != key_columns.end())
         {
             std::stack<const ActionsDAG::Node *> chain;
 
-            const auto * cur_node = &dag_node;
+            const auto * cur_node = &node;
             bool is_valid_chain = true;
 
             while (is_valid_chain)
@@ -714,21 +705,25 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
 
                 chain.push(cur_node);
 
-                if (cur_node->type == ActionsDAG::ActionType::FUNCTION && cur_node->children.size() == 1)
+                if (cur_node->type == ActionsDAG::ActionType::FUNCTION && cur_node->children.size() <= 2)
                 {
-                    const auto * next_node = cur_node->children.front();
+                    is_valid_chain = always_monotonic(*cur_node->function_base, *cur_node->result_type);
 
-                    if (!cur_node->function_base->hasInformationAboutMonotonicity())
-                        is_valid_chain = false;
-                    else
+                    const ActionsDAG::Node * next_node = nullptr;
+                    for (const auto * arg : cur_node->children)
                     {
-                        /// Range is irrelevant in this case.
-                        auto monotonicity = cur_node->function_base->getMonotonicityForRange(
-                            *next_node->result_type, Field(), Field());
-                        if (!monotonicity.is_always_monotonic)
+                        if (arg->column && isColumnConst(*arg->column))
+                            continue;
+
+                        if (next_node)
                             is_valid_chain = false;
+
+                        next_node = arg;
                     }
 
+                    if (!next_node)
+                        is_valid_chain = false;
+
                     cur_node = next_node;
                 }
                 else if (cur_node->type == ActionsDAG::ActionType::ALIAS)
@@ -737,7 +732,7 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
                     is_valid_chain = false;
             }
 
-            if (is_valid_chain && !chain.empty())
+            if (is_valid_chain)
             {
                 /// Here we cast constant to the input type.
                 /// It is not clear, why this works in general.
@@ -760,8 +755,30 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
                     if (func->type != ActionsDAG::ActionType::FUNCTION)
                         continue;
 
-                    std::tie(const_value, const_type) =
-                        applyFunctionForFieldOfUnknownType(func->function_base, const_type, const_value);
+                    if (func->children.size() == 1)
+                    {
+                        std::tie(const_value, const_type)
+                            = applyFunctionForFieldOfUnknownType(func->function_base, const_type, const_value);
+                    }
+                    else if (func->children.size() == 2)
+                    {
+                        const auto * left = func->children[0];
+                        const auto * right = func->children[1];
+                        if (left->column && isColumnConst(*left->column))
+                        {
+                            auto left_arg_type = left->result_type;
+                            auto left_arg_value = (*left->column)[0];
+                            std::tie(const_value, const_type) = applyBinaryFunctionForFieldOfUnknownType(
+                                func->function_builder, left_arg_type, left_arg_value, const_type, const_value);
+                        }
+                        else
+                        {
+                            auto right_arg_type = right->result_type;
+                            auto right_arg_value = (*right->column)[0];
+                            std::tie(const_value, const_type) = applyBinaryFunctionForFieldOfUnknownType(
+                                func->function_builder, const_type, const_value, right_arg_type, right_arg_value);
+                        }
+                    }
                 }
 
                 out_key_column_num = it->second;
@@ -772,10 +789,43 @@ bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
             }
         }
     }
-
     return false;
 }
 
+bool KeyCondition::canConstantBeWrappedByMonotonicFunctions(
+    const ASTPtr & node,
+    size_t & out_key_column_num,
+    DataTypePtr & out_key_column_type,
+    Field & out_value,
+    DataTypePtr & out_type)
+{
+    String expr_name = node->getColumnNameWithoutAlias();
+
+    if (array_joined_columns.count(expr_name))
+        return false;
+
+    if (key_subexpr_names.count(expr_name) == 0)
+        return false;
+
+    if (out_value.isNull())
+        return false;
+
+    return transformConstantWithValidFunctions(
+        expr_name, out_key_column_num, out_key_column_type, out_value, out_type, [](IFunctionBase & func, const IDataType & type)
+        {
+            if (!func.hasInformationAboutMonotonicity())
+                return false;
+            else
+            {
+                /// Range is irrelevant in this case.
+                auto monotonicity = func.getMonotonicityForRange(type, Field(), Field());
+                if (!monotonicity.is_always_monotonic)
+                    return false;
+            }
+            return true;
+        });
+}
+
 /// Looking for possible transformation of `column = constant` into `partition_expr = function(constant)`
 bool KeyCondition::canConstantBeWrappedByFunctions(
     const ASTPtr & ast, size_t & out_key_column_num, DataTypePtr & out_key_column_type, Field & out_value, DataTypePtr & out_type)
@@ -804,106 +854,14 @@ bool KeyCondition::canConstantBeWrappedByFunctions(
             return false;
     }
 
-    const auto & sample_block = key_expr->getSampleBlock();
-
     if (out_value.isNull())
         return false;
 
-    for (const auto & node : key_expr->getNodes())
-    {
-        auto it = key_columns.find(node.result_name);
-        if (it != key_columns.end())
+    return transformConstantWithValidFunctions(
+        expr_name, out_key_column_num, out_key_column_type, out_value, out_type, [](IFunctionBase & func, const IDataType &)
         {
-            std::stack<const ActionsDAG::Node *> chain;
-
-            const auto * cur_node = &node;
-            bool is_valid_chain = true;
-
-            while (is_valid_chain)
-            {
-                if (cur_node->result_name == expr_name)
-                    break;
-
-                chain.push(cur_node);
-
-                if (cur_node->type == ActionsDAG::ActionType::FUNCTION && cur_node->children.size() <= 2)
-                {
-                    if (!cur_node->function_base->isDeterministic())
-                        is_valid_chain = false;
-
-                    const ActionsDAG::Node * next_node = nullptr;
-                    for (const auto * arg : cur_node->children)
-                    {
-                        if (arg->column && isColumnConst(*arg->column))
-                            continue;
-
-                        if (next_node)
-                            is_valid_chain = false;
-
-                        next_node = arg;
-                    }
-
-                    if (!next_node)
-                        is_valid_chain = false;
-
-                    cur_node = next_node;
-                }
-                else if (cur_node->type == ActionsDAG::ActionType::ALIAS)
-                    cur_node = cur_node->children.front();
-                else
-                    is_valid_chain = false;
-            }
-
-            if (is_valid_chain)
-            {
-                /// This CAST is the same as in canConstantBeWrappedByMonotonicFunctions (see comment).
-                auto const_type = cur_node->result_type;
-                auto const_column = out_type->createColumnConst(1, out_value);
-                auto const_value = (*castColumn({const_column, out_type, ""}, const_type))[0];
-
-                while (!chain.empty())
-                {
-                    const auto * func = chain.top();
-                    chain.pop();
-
-                    if (func->type != ActionsDAG::ActionType::FUNCTION)
-                        continue;
-
-                    if (func->children.size() == 1)
-                    {
-                        std::tie(const_value, const_type) = applyFunctionForFieldOfUnknownType(func->function_base, const_type, const_value);
-                    }
-                    else if (func->children.size() == 2)
-                    {
-                        const auto * left = func->children[0];
-                        const auto * right = func->children[1];
-                        if (left->column && isColumnConst(*left->column))
-                        {
-                            auto left_arg_type = left->result_type;
-                            auto left_arg_value = (*left->column)[0];
-                            std::tie(const_value, const_type) = applyBinaryFunctionForFieldOfUnknownType(
-                                    func->function_builder, left_arg_type, left_arg_value, const_type, const_value);
-                        }
-                        else
-                        {
-                            auto right_arg_type = right->result_type;
-                            auto right_arg_value = (*right->column)[0];
-                            std::tie(const_value, const_type) = applyBinaryFunctionForFieldOfUnknownType(
-                                    func->function_builder, const_type, const_value, right_arg_type, right_arg_value);
-                        }
-                    }
-                }
-
-                out_key_column_num = it->second;
-                out_key_column_type = sample_block.getByName(it->first).type;
-                out_value = const_value;
-                out_type = const_type;
-                return true;
-            }
-        }
-    }
-
-    return false;
+            return func.isDeterministic();
+        });
 }
 
 bool KeyCondition::tryPrepareSetIndex(
@@ -1055,6 +1013,8 @@ public:
 
     bool hasInformationAboutMonotonicity() const override { return func->hasInformationAboutMonotonicity(); }
 
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override { return func->isSuitableForShortCircuitArgumentsExecution(arguments); }
+
     IFunctionBase::Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
     {
         return func->getMonotonicityForRange(type, left, right);
@@ -1339,35 +1299,49 @@ bool KeyCondition::tryParseAtomFromAST(const ASTPtr & node, ContextPtr context,
                 }
             }
 
+            key_expr_type = recursiveRemoveLowCardinality(key_expr_type);
+            DataTypePtr key_expr_type_not_null;
+            bool key_expr_type_is_nullable = false;
+            if (const auto * nullable_type = typeid_cast<const DataTypeNullable *>(key_expr_type.get()))
+            {
+                key_expr_type_is_nullable = true;
+                key_expr_type_not_null = nullable_type->getNestedType();
+            }
+            else
+                key_expr_type_not_null = key_expr_type;
+
             bool cast_not_needed = is_set_const /// Set args are already casted inside Set::createFromAST
-                || ((isNativeNumber(key_expr_type) || isDateTime(key_expr_type))
+                || ((isNativeNumber(key_expr_type_not_null) || isDateTime(key_expr_type_not_null))
                     && (isNativeNumber(const_type) || isDateTime(const_type))); /// Numbers and DateTime are accurately compared without cast.
 
-            if (!cast_not_needed && !key_expr_type->equals(*const_type))
+            if (!cast_not_needed && !key_expr_type_not_null->equals(*const_type))
             {
                 if (const_value.getType() == Field::Types::String)
                 {
-                    const_value = convertFieldToType(const_value, *key_expr_type);
+                    const_value = convertFieldToType(const_value, *key_expr_type_not_null);
                     if (const_value.isNull())
                         return false;
                     // No need to set is_constant_transformed because we're doing exact conversion
                 }
                 else
                 {
-                    DataTypePtr common_type = getLeastSupertype({key_expr_type, const_type});
+                    DataTypePtr common_type = getLeastSupertype({key_expr_type_not_null, const_type});
                     if (!const_type->equals(*common_type))
                     {
                         castValueToType(common_type, const_value, const_type, node);
 
                         // Need to set is_constant_transformed unless we're doing exact conversion
-                        if (!key_expr_type->equals(*common_type))
+                        if (!key_expr_type_not_null->equals(*common_type))
                             is_constant_transformed = true;
                     }
-                    if (!key_expr_type->equals(*common_type))
+                    if (!key_expr_type_not_null->equals(*common_type))
                     {
+                        auto common_type_maybe_nullable
+                            = key_expr_type_is_nullable ? DataTypePtr(std::make_shared<DataTypeNullable>(common_type)) : common_type;
                         ColumnsWithTypeAndName arguments{
-                            {nullptr, key_expr_type, ""}, {DataTypeString().createColumnConst(1, common_type->getName()), common_type, ""}};
-                        FunctionOverloadResolverPtr func_builder_cast = CastOverloadResolver<CastType::nonAccurate>::createImpl(false);
+                            {nullptr, key_expr_type, ""},
+                            {DataTypeString().createColumnConst(1, common_type_maybe_nullable->getName()), common_type_maybe_nullable, ""}};
+                        FunctionOverloadResolverPtr func_builder_cast = CastInternalOverloadResolver<CastType::nonAccurate>::createImpl();
                         auto func_cast = func_builder_cast->build(arguments);
 
                         /// If we know the given range only contains one value, then we treat all functions as positive monotonic.
@@ -1730,8 +1704,6 @@ KeyCondition::Description KeyCondition::getDescription() const
   *  over at least one hyperrectangle from which this range consists.
   */
 
-FieldRef negativeInfinity(NegativeInfinity{}), positiveInfinity(PositiveInfinity{});
-
 template <typename F>
 static BoolMask forAnyHyperrectangle(
     size_t key_size,
diff --git a/src/Storages/MergeTree/KeyCondition.h b/src/Storages/MergeTree/KeyCondition.h
index edae921bfda..f3b63025c75 100644
--- a/src/Storages/MergeTree/KeyCondition.h
+++ b/src/Storages/MergeTree/KeyCondition.h
@@ -55,8 +55,8 @@ private:
     static bool less(const Field & lhs, const Field & rhs);
 
 public:
-    FieldRef left = NegativeInfinity{};   /// the left border
-    FieldRef right = PositiveInfinity{};  /// the right border
+    FieldRef left = NEGATIVE_INFINITY;   /// the left border
+    FieldRef right = POSITIVE_INFINITY;  /// the right border
     bool left_included = false;           /// includes the left border
     bool right_included = false;          /// includes the right border
 
@@ -185,9 +185,9 @@ public:
     {
         std::swap(left, right);
         if (left.isPositiveInfinity())
-            left = NegativeInfinity{};
+            left = NEGATIVE_INFINITY;
         if (right.isNegativeInfinity())
-            right = PositiveInfinity{};
+            right = POSITIVE_INFINITY;
         std::swap(left_included, right_included);
     }
 
@@ -375,6 +375,14 @@ private:
         DataTypePtr & out_key_column_type,
         std::vector<const ASTFunction *> & out_functions_chain);
 
+    bool transformConstantWithValidFunctions(
+        const String & expr_name,
+        size_t & out_key_column_num,
+        DataTypePtr & out_key_column_type,
+        Field & out_value,
+        DataTypePtr & out_type,
+        std::function<bool(IFunctionBase &, const IDataType &)> always_monotonic) const;
+
     bool canConstantBeWrappedByMonotonicFunctions(
         const ASTPtr & node,
         size_t & out_key_column_num,
diff --git a/src/Storages/MergeTree/LeaderElection.h b/src/Storages/MergeTree/LeaderElection.h
index 2810385e9e5..ccc5fada537 100644
--- a/src/Storages/MergeTree/LeaderElection.h
+++ b/src/Storages/MergeTree/LeaderElection.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 #include <memory>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/ZooKeeper/KeeperException.h>
diff --git a/src/Storages/MergeTree/MarkRange.cpp b/src/Storages/MergeTree/MarkRange.cpp
new file mode 100644
index 00000000000..7f097cd7106
--- /dev/null
+++ b/src/Storages/MergeTree/MarkRange.cpp
@@ -0,0 +1,14 @@
+#include "MarkRange.h"
+
+namespace DB
+{
+
+size_t getLastMark(const MarkRanges & ranges)
+{
+    size_t current_task_last_mark = 0;
+    for (const auto & mark_range : ranges)
+        current_task_last_mark = std::max(current_task_last_mark, mark_range.end);
+    return current_task_last_mark;
+}
+
+}
diff --git a/src/Storages/MergeTree/MarkRange.h b/src/Storages/MergeTree/MarkRange.h
index 8380914a455..b46913db30c 100644
--- a/src/Storages/MergeTree/MarkRange.h
+++ b/src/Storages/MergeTree/MarkRange.h
@@ -8,8 +8,9 @@ namespace DB
 {
 
 
-/** A pair of marks that defines the range of rows in a part. Specifically, the range has the form [begin * index_granularity, end * index_granularity).
-  */
+/** A pair of marks that defines the range of rows in a part. Specifically,
+ * the range has the form [begin * index_granularity, end * index_granularity).
+ */
 struct MarkRange
 {
     size_t begin;
@@ -21,5 +22,8 @@ struct MarkRange
 
 using MarkRanges = std::deque<MarkRange>;
 
+/** Get max range.end from ranges.
+ */
+size_t getLastMark(const MarkRanges & ranges);
 
 }
diff --git a/src/Storages/MergeTree/MergeAlgorithm.h b/src/Storages/MergeTree/MergeAlgorithm.h
index 23d6fc7137e..5f52b5be0fd 100644
--- a/src/Storages/MergeTree/MergeAlgorithm.h
+++ b/src/Storages/MergeTree/MergeAlgorithm.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
new file mode 100644
index 00000000000..d92eaf85f3d
--- /dev/null
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -0,0 +1,289 @@
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
+
+#include <base/logger_useful.h>
+#include <Common/ProfileEvents.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+
+namespace ProfileEvents
+{
+    extern const Event DataAfterMergeDiffersFromReplica;
+    extern const Event ReplicatedPartMerges;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_DATA_PART_NAME;
+    extern const int LOGICAL_ERROR;
+}
+
+
+std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> MergeFromLogEntryTask::prepare()
+{
+    LOG_TRACE(log, "Executing log entry to merge parts {} to {}",
+        fmt::join(entry.source_parts, ", "), entry.new_part_name);
+
+    const auto storage_settings_ptr = storage.getSettings();
+
+    if (storage_settings_ptr->always_fetch_merged_part)
+    {
+        LOG_INFO(log, "Will fetch part {} because setting 'always_fetch_merged_part' is true", entry.new_part_name);
+        return {false, {}};
+    }
+
+    if (entry.merge_type == MergeType::TTL_RECOMPRESS &&
+        (time(nullptr) - entry.create_time) <= storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds() &&
+        entry.source_replica != storage.replica_name)
+    {
+        LOG_INFO(log, "Will try to fetch part {} until '{}' because this part assigned to recompression merge. "
+            "Source replica {} will try to merge this part first", entry.new_part_name,
+            DateLUT::instance().timeToString(entry.create_time + storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds()), entry.source_replica);
+        return {false, {}};
+    }
+
+    /// In some use cases merging can be more expensive than fetching
+    /// and it may be better to spread merges tasks across the replicas
+    /// instead of doing exactly the same merge cluster-wise
+    std::optional<String> replica_to_execute_merge;
+    bool replica_to_execute_merge_picked = false;
+
+    if (storage.merge_strategy_picker.shouldMergeOnSingleReplica(entry))
+    {
+        replica_to_execute_merge = storage.merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+        replica_to_execute_merge_picked = true;
+
+        if (replica_to_execute_merge)
+        {
+            LOG_DEBUG(log,
+                "Prefer fetching part {} from replica {} due to execute_merges_on_single_replica_time_threshold",
+                entry.new_part_name, replica_to_execute_merge.value());
+
+            return {false, {}};
+        }
+    }
+
+
+    for (const String & source_part_name : entry.source_parts)
+    {
+        MergeTreeData::DataPartPtr source_part_or_covering = storage.getActiveContainingPart(source_part_name);
+
+        if (!source_part_or_covering)
+        {
+            /// We do not have one of source parts locally, try to take some already merged part from someone.
+            LOG_DEBUG(log, "Don't have all parts for merge {}; will try to fetch it instead", entry.new_part_name);
+            return {false, {}};
+        }
+
+        if (source_part_or_covering->name != source_part_name)
+        {
+            /// We do not have source part locally, but we have some covering part. Possible options:
+            /// 1. We already have merged part (source_part_or_covering->name == new_part_name)
+            /// 2. We have some larger merged part which covers new_part_name (and therefore it covers source_part_name too)
+            /// 3. We have two intersecting parts, both cover source_part_name. It's logical error.
+            /// TODO Why 1 and 2 can happen? Do we need more assertions here or somewhere else?
+            constexpr const char * message = "Part {} is covered by {} but should be merged into {}. This shouldn't happen often.";
+            LOG_WARNING(log, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
+            if (!source_part_or_covering->info.contains(MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version)))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
+            return {false, {}};
+        }
+
+        parts.push_back(source_part_or_covering);
+    }
+
+    /// All source parts are found locally, we can execute merge
+
+    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr))
+    {
+        /// If entry is old enough, and have enough size, and part are exists in any replica,
+        ///  then prefer fetching of merged part from replica.
+
+        size_t sum_parts_bytes_on_disk = 0;
+        for (const auto & item : parts)
+            sum_parts_bytes_on_disk += item->getBytesOnDisk();
+
+        if (sum_parts_bytes_on_disk >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
+        {
+            String replica = storage.findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
+            if (!replica.empty())
+            {
+                LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
+                return {false, {}};
+            }
+        }
+    }
+
+    /// Start to make the main work
+    size_t estimated_space_for_merge = MergeTreeDataMergerMutator::estimateNeededDiskSpace(parts);
+
+    /// Can throw an exception while reserving space.
+    IMergeTreeDataPart::TTLInfos ttl_infos;
+    size_t max_volume_index = 0;
+    for (auto & part_ptr : parts)
+    {
+        ttl_infos.update(part_ptr->ttl_infos);
+        max_volume_index = std::max(max_volume_index, storage.getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
+    }
+
+    /// It will live until the whole task is being destroyed
+    table_lock_holder = storage.lockForShare(RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
+
+    StorageMetadataPtr metadata_snapshot = storage.getInMemoryMetadataPtr();
+
+    auto future_merged_part = std::make_shared<FutureMergedMutatedPart>(parts, entry.new_part_type);
+    if (future_merged_part->name != entry.new_part_name)
+    {
+        throw Exception("Future merged part name " + backQuote(future_merged_part->name) + " differs from part name in log entry: "
+            + backQuote(entry.new_part_name), ErrorCodes::BAD_DATA_PART_NAME);
+    }
+
+    std::optional<CurrentlySubmergingEmergingTagger> tagger;
+    ReservationSharedPtr reserved_space = storage.balancedReservation(
+        metadata_snapshot,
+        estimated_space_for_merge,
+        max_volume_index,
+        future_merged_part->name,
+        future_merged_part->part_info,
+        future_merged_part->parts,
+        &tagger,
+        &ttl_infos);
+
+    if (!reserved_space)
+        reserved_space = storage.reserveSpacePreferringTTLRules(
+            metadata_snapshot, estimated_space_for_merge, ttl_infos, time(nullptr), max_volume_index);
+
+    future_merged_part->uuid = entry.new_part_uuid;
+    future_merged_part->updatePath(storage, reserved_space.get());
+    future_merged_part->merge_type = entry.merge_type;
+
+    if (storage_settings_ptr->allow_remote_fs_zero_copy_replication)
+    {
+        if (auto disk = reserved_space->getDisk(); disk->getType() == DB::DiskType::S3)
+        {
+            if (storage.merge_strategy_picker.shouldMergeOnSingleReplicaShared(entry))
+            {
+                if (!replica_to_execute_merge_picked)
+                    replica_to_execute_merge = storage.merge_strategy_picker.pickReplicaToExecuteMerge(entry);
+
+                if (replica_to_execute_merge)
+                {
+                    LOG_DEBUG(log,
+                        "Prefer fetching part {} from replica {} due s3_execute_merges_on_single_replica_time_threshold",
+                        entry.new_part_name, replica_to_execute_merge.value());
+                    return {false, {}};
+                }
+            }
+        }
+    }
+
+    /// Account TTL merge
+    if (isTTLMergeType(future_merged_part->merge_type))
+        storage.getContext()->getMergeList().bookMergeWithTTL();
+
+    auto table_id = storage.getStorageID();
+
+    /// Add merge to list
+    const Settings & settings = storage.getContext()->getSettingsRef();
+    merge_mutate_entry = storage.getContext()->getMergeList().insert(
+        storage.getStorageID(),
+        future_merged_part,
+        settings.memory_profiler_step,
+        settings.memory_profiler_sample_probability,
+        settings.max_untracked_memory);
+
+    transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage);
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+
+    merge_task = storage.merger_mutator.mergePartsToTemporaryPart(
+            future_merged_part,
+            metadata_snapshot,
+            merge_mutate_entry.get(),
+            {} /* projection_merge_list_element */,
+            table_lock_holder,
+            entry.create_time,
+            storage.getContext(),
+            reserved_space,
+            entry.deduplicate,
+            entry.deduplicate_by_columns,
+            storage.merging_params);
+
+
+    /// Adjust priority
+    for (auto & item : future_merged_part->parts)
+        priority += item->getBytesOnDisk();
+
+    return {true, [this, stopwatch = *stopwatch_ptr] (const ExecutionStatus & execution_status)
+    {
+        storage.writePartLog(
+            PartLogElement::MERGE_PARTS, execution_status, stopwatch.elapsed(),
+            entry.new_part_name, part, parts, merge_mutate_entry.get());
+    }};
+}
+
+
+bool MergeFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log)
+{
+    part = merge_task->getFuture().get();
+
+    /// Task is not needed
+    merge_task.reset();
+
+    storage.merger_mutator.renameMergedTemporaryPart(part, parts, transaction_ptr.get());
+
+    try
+    {
+        storage.checkPartChecksumsAndCommit(*transaction_ptr, part);
+    }
+    catch (const Exception & e)
+    {
+        if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
+        {
+            transaction_ptr->rollback();
+
+            ProfileEvents::increment(ProfileEvents::DataAfterMergeDiffersFromReplica);
+
+            LOG_ERROR(log,
+                "{}. Data after merge is not byte-identical to data on another replicas. There could be several"
+                " reasons: 1. Using newer version of compression library after server update. 2. Using another"
+                " compression method. 3. Non-deterministic compression algorithm (highly unlikely). 4."
+                " Non-deterministic merge algorithm due to logical error in code. 5. Data corruption in memory due"
+                " to bug in code. 6. Data corruption in memory due to hardware issue. 7. Manual modification of"
+                " source data after server startup. 8. Manual modification of checksums stored in ZooKeeper. 9."
+                " Part format related settings like 'enable_mixed_granularity_parts' are different on different"
+                " replicas. We will download merged part from replica to force byte-identical result.",
+                getCurrentExceptionMessage(false));
+
+            write_part_log(ExecutionStatus::fromCurrentException());
+
+            if (storage.getSettings()->detach_not_byte_identical_parts)
+                storage.forgetPartAndMoveToDetached(std::move(part), "merge-not-byte-identical");
+            else
+                storage.tryRemovePartImmediately(std::move(part));
+
+            /// No need to delete the part from ZK because we can be sure that the commit transaction
+            /// didn't go through.
+
+            return false;
+        }
+
+        throw;
+    }
+
+    /** Removing old parts from ZK and from the disk is delayed - see ReplicatedMergeTreeCleanupThread, clearOldParts.
+     */
+
+    /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
+     * This is not a problem, because in this case the merge will remain in the queue, and we will try again.
+     */
+    storage.merge_selecting_task->schedule();
+    ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
+
+    write_part_log({});
+
+    return true;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.h b/src/Storages/MergeTree/MergeFromLogEntryTask.h
new file mode 100644
index 00000000000..da286b27b20
--- /dev/null
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTask.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
+
+
+namespace DB
+{
+
+class MergeFromLogEntryTask : public shared_ptr_helper<MergeFromLogEntryTask>, public ReplicatedMergeMutateTaskBase
+{
+public:
+    template <class Callback>
+    MergeFromLogEntryTask(ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry_, StorageReplicatedMergeTree & storage_, Callback && task_result_callback_)
+        : ReplicatedMergeMutateTaskBase(&Poco::Logger::get("MergeFromLogEntryTask"), storage_, selected_entry_, task_result_callback_) {}
+
+    UInt64 getPriority() override { return priority; }
+
+protected:
+    /// Both return false if we can't execute merge.
+    std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> prepare() override;
+    bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) override;
+
+    bool executeInnerTask() override
+    {
+        return merge_task->execute();
+    }
+
+private:
+    TableLockHolder table_lock_holder{nullptr};
+
+    MergeTreeData::DataPartsVector parts;
+    MergeTreeData::TransactionUniquePtr transaction_ptr{nullptr};
+
+    StopwatchUniquePtr stopwatch_ptr{nullptr};
+    MergeTreeData::MutableDataPartPtr part;
+
+    UInt64 priority{0};
+
+    MergeTaskPtr merge_task;
+};
+
+
+using MergeFromLogEntryTaskPtr = std::shared_ptr<MergeFromLogEntryTask>;
+
+
+}
diff --git a/src/Storages/MergeTree/MergeList.cpp b/src/Storages/MergeTree/MergeList.cpp
index 24beb0cc06f..366834b8f09 100644
--- a/src/Storages/MergeTree/MergeList.cpp
+++ b/src/Storages/MergeTree/MergeList.cpp
@@ -1,41 +1,19 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Common/CurrentMetrics.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 #include <Common/CurrentThread.h>
 
 
 namespace DB
 {
 
-MergeListElement::MergeListElement(const StorageID & table_id_, const FutureMergedMutatedPart & future_part)
-    : table_id{table_id_}
-    , partition_id{future_part.part_info.partition_id}
-    , result_part_name{future_part.name}
-    , result_part_path{future_part.path}
-    , result_part_info{future_part.part_info}
-    , num_parts{future_part.parts.size()}
-    , thread_id{getThreadId()}
-    , merge_type{future_part.merge_type}
-    , merge_algorithm{MergeAlgorithm::Undecided}
+
+MemoryTrackerThreadSwitcher::MemoryTrackerThreadSwitcher(MergeListEntry & merge_list_entry_)
+    : merge_list_entry(merge_list_entry_)
 {
-    for (const auto & source_part : future_part.parts)
-    {
-        source_part_names.emplace_back(source_part->name);
-        source_part_paths.emplace_back(source_part->getFullPath());
-
-        total_size_bytes_compressed += source_part->getBytesOnDisk();
-        total_size_marks += source_part->getMarksCount();
-        total_rows_count += source_part->index_granularity.getTotalRows();
-    }
-
-    if (!future_part.parts.empty())
-    {
-        source_data_version = future_part.parts[0]->info.getDataVersion();
-        is_mutation = (result_part_info.getDataVersion() != source_data_version);
-    }
-
-    /// Each merge is executed into separate background processing pool thread
+    // Each merge is executed into separate background processing pool thread
     background_thread_memory_tracker = CurrentThread::getMemoryTracker();
     if (background_thread_memory_tracker)
     {
@@ -52,8 +30,74 @@ MergeListElement::MergeListElement(const StorageID & table_id_, const FutureMerg
         }
 
         background_thread_memory_tracker_prev_parent = background_thread_memory_tracker->getParent();
-        background_thread_memory_tracker->setParent(&memory_tracker);
+        background_thread_memory_tracker->setParent(&merge_list_entry->memory_tracker);
     }
+
+    prev_untracked_memory_limit = current_thread->untracked_memory_limit;
+    current_thread->untracked_memory_limit = merge_list_entry->max_untracked_memory;
+
+    /// Avoid accounting memory from another mutation/merge
+    /// (NOTE: consider moving such code to ThreadFromGlobalPool and related places)
+    prev_untracked_memory = current_thread->untracked_memory;
+    current_thread->untracked_memory = merge_list_entry->untracked_memory;
+
+    prev_query_id = current_thread->getQueryId().toString();
+    current_thread->setQueryId(merge_list_entry->query_id);
+}
+
+
+MemoryTrackerThreadSwitcher::~MemoryTrackerThreadSwitcher()
+{
+    // Unplug memory_tracker from current background processing pool thread
+
+    if (background_thread_memory_tracker)
+        background_thread_memory_tracker->setParent(background_thread_memory_tracker_prev_parent);
+
+    current_thread->untracked_memory_limit = prev_untracked_memory_limit;
+
+    merge_list_entry->untracked_memory = current_thread->untracked_memory;
+    current_thread->untracked_memory = prev_untracked_memory;
+
+    current_thread->setQueryId(prev_query_id);
+}
+
+MergeListElement::MergeListElement(
+    const StorageID & table_id_,
+    FutureMergedMutatedPartPtr future_part,
+    UInt64 memory_profiler_step,
+    UInt64 memory_profiler_sample_probability,
+    UInt64 max_untracked_memory_)
+    : table_id{table_id_}
+    , partition_id{future_part->part_info.partition_id}
+    , result_part_name{future_part->name}
+    , result_part_path{future_part->path}
+    , result_part_info{future_part->part_info}
+    , num_parts{future_part->parts.size()}
+    , max_untracked_memory(max_untracked_memory_)
+    , query_id(table_id.getShortName() + "::" + result_part_name)
+    , thread_id{getThreadId()}
+    , merge_type{future_part->merge_type}
+    , merge_algorithm{MergeAlgorithm::Undecided}
+{
+    for (const auto & source_part : future_part->parts)
+    {
+        source_part_names.emplace_back(source_part->name);
+        source_part_paths.emplace_back(source_part->getFullPath());
+
+        total_size_bytes_compressed += source_part->getBytesOnDisk();
+        total_size_marks += source_part->getMarksCount();
+        total_rows_count += source_part->index_granularity.getTotalRows();
+    }
+
+    if (!future_part->parts.empty())
+    {
+        source_data_version = future_part->parts[0]->info.getDataVersion();
+        is_mutation = (result_part_info.getDataVersion() != source_data_version);
+    }
+
+    memory_tracker.setDescription("Mutate/Merge");
+    memory_tracker.setProfilerStep(memory_profiler_step);
+    memory_tracker.setSampleProbability(memory_profiler_sample_probability);
 }
 
 MergeInfo MergeListElement::getInfo() const
@@ -90,11 +134,7 @@ MergeInfo MergeListElement::getInfo() const
     return res;
 }
 
-MergeListElement::~MergeListElement()
-{
-    /// Unplug memory_tracker from current background processing pool thread
-    if (background_thread_memory_tracker)
-        background_thread_memory_tracker->setParent(background_thread_memory_tracker_prev_parent);
-}
+MergeListElement::~MergeListElement() = default;
+
 
 }
diff --git a/src/Storages/MergeTree/MergeList.h b/src/Storages/MergeTree/MergeList.h
index 9762e616e7b..4139e9599aa 100644
--- a/src/Storages/MergeTree/MergeList.h
+++ b/src/Storages/MergeTree/MergeList.h
@@ -53,6 +53,31 @@ struct MergeInfo
 };
 
 struct FutureMergedMutatedPart;
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+struct MergeListElement;
+using MergeListEntry = BackgroundProcessListEntry<MergeListElement, MergeInfo>;
+
+
+/**
+ * Since merge is executed with multiple threads, this class
+ * switches the parent MemoryTracker to account all the memory used.
+ */
+class MemoryTrackerThreadSwitcher : boost::noncopyable
+{
+public:
+    explicit MemoryTrackerThreadSwitcher(MergeListEntry & merge_list_entry_);
+    ~MemoryTrackerThreadSwitcher();
+private:
+    MergeListEntry & merge_list_entry;
+    MemoryTracker * background_thread_memory_tracker;
+    MemoryTracker * background_thread_memory_tracker_prev_parent = nullptr;
+    UInt64 prev_untracked_memory_limit;
+    UInt64 prev_untracked_memory;
+    String prev_query_id;
+};
+
+using MemoryTrackerThreadSwitcherPtr = std::unique_ptr<MemoryTrackerThreadSwitcher>;
 
 struct MergeListElement : boost::noncopyable
 {
@@ -87,23 +112,32 @@ struct MergeListElement : boost::noncopyable
     std::atomic<UInt64> columns_written{};
 
     MemoryTracker memory_tracker{VariableContext::Process};
-    MemoryTracker * background_thread_memory_tracker;
-    MemoryTracker * background_thread_memory_tracker_prev_parent = nullptr;
+    /// Used to adjust ThreadStatus::untracked_memory_limit
+    UInt64 max_untracked_memory;
+    /// Used to avoid losing any allocation context
+    UInt64 untracked_memory = 0;
+    /// Used for identifying mutations/merges in trace_log
+    std::string query_id;
 
     UInt64 thread_id;
     MergeType merge_type;
     /// Detected after merge already started
     std::atomic<MergeAlgorithm> merge_algorithm;
 
-    MergeListElement(const StorageID & table_id_, const FutureMergedMutatedPart & future_part);
+    MergeListElement(
+        const StorageID & table_id_,
+        FutureMergedMutatedPartPtr future_part,
+        UInt64 memory_profiler_step,
+        UInt64 memory_profiler_sample_probability,
+        UInt64 max_untracked_memory_);
 
     MergeInfo getInfo() const;
 
+    MergeListElement * ptr() { return this; }
+
     ~MergeListElement();
 };
 
-using MergeListEntry = BackgroundProcessListEntry<MergeListElement, MergeInfo>;
-
 /** Maintains a list of currently running merges.
   * For implementation of system.merges table.
   */
diff --git a/src/Storages/MergeTree/MergeMutateSelectedEntry.h b/src/Storages/MergeTree/MergeMutateSelectedEntry.h
new file mode 100644
index 00000000000..64136205157
--- /dev/null
+++ b/src/Storages/MergeTree/MergeMutateSelectedEntry.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MutationCommands.h>
+
+namespace DB
+{
+
+class StorageMergeTree;
+
+struct StorageInMemoryMetadata;
+using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
+struct FutureMergedMutatedPart;
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+
+struct CurrentlyMergingPartsTagger
+{
+    FutureMergedMutatedPartPtr future_part;
+    ReservationSharedPtr reserved_space;
+    StorageMergeTree & storage;
+    // Optional tagger to maintain volatile parts for the JBOD balancer
+    std::optional<CurrentlySubmergingEmergingTagger> tagger;
+
+    CurrentlyMergingPartsTagger(
+        FutureMergedMutatedPartPtr future_part_,
+        size_t total_size,
+        StorageMergeTree & storage_,
+        const StorageMetadataPtr & metadata_snapshot,
+        bool is_mutation);
+
+    ~CurrentlyMergingPartsTagger();
+};
+
+using CurrentlyMergingPartsTaggerPtr = std::unique_ptr<CurrentlyMergingPartsTagger>;
+
+struct MergeMutateSelectedEntry
+{
+    FutureMergedMutatedPartPtr future_part;
+    CurrentlyMergingPartsTaggerPtr tagger;
+    MutationCommandsConstPtr commands;
+    MergeMutateSelectedEntry(FutureMergedMutatedPartPtr future_part_, CurrentlyMergingPartsTaggerPtr tagger_, MutationCommandsConstPtr commands_)
+        : future_part(future_part_)
+        , tagger(std::move(tagger_))
+        , commands(commands_)
+    {}
+};
+
+using MergeMutateSelectedEntryPtr = std::shared_ptr<MergeMutateSelectedEntry>;
+
+}
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
new file mode 100644
index 00000000000..1cbf928047c
--- /dev/null
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
@@ -0,0 +1,123 @@
+#include <Storages/MergeTree/MergePlainMergeTreeTask.h>
+
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+StorageID MergePlainMergeTreeTask::getStorageID()
+{
+    return storage.getStorageID();
+}
+
+void MergePlainMergeTreeTask::onCompleted()
+{
+    bool delay = state == State::SUCCESS;
+    task_result_callback(delay);
+}
+
+
+bool MergePlainMergeTreeTask::executeStep()
+{
+    /// Make out memory tracker a parent of current thread memory tracker
+    MemoryTrackerThreadSwitcherPtr switcher;
+    if (merge_list_entry)
+        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(*merge_list_entry);
+
+    switch (state)
+    {
+        case State::NEED_PREPARE :
+        {
+            prepare();
+            state = State::NEED_EXECUTE;
+            return true;
+        }
+        case State::NEED_EXECUTE :
+        {
+            try
+            {
+                if (merge_task->execute())
+                    return true;
+
+                state = State::NEED_FINISH;
+                return true;
+            }
+            catch (...)
+            {
+                write_part_log(ExecutionStatus::fromCurrentException());
+                throw;
+            }
+        }
+        case State::NEED_FINISH :
+        {
+            finish();
+
+            state = State::SUCCESS;
+            return false;
+        }
+        case State::SUCCESS:
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Task with state SUCCESS mustn't be executed again");
+        }
+    }
+    return false;
+}
+
+
+void MergePlainMergeTreeTask::prepare()
+{
+    future_part = merge_mutate_entry->future_part;
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+
+    const Settings & settings = storage.getContext()->getSettingsRef();
+    merge_list_entry = storage.getContext()->getMergeList().insert(
+        storage.getStorageID(),
+        future_part,
+        settings.memory_profiler_step,
+        settings.memory_profiler_sample_probability,
+        settings.max_untracked_memory);
+
+    write_part_log = [this] (const ExecutionStatus & execution_status)
+    {
+        merge_task.reset();
+        storage.writePartLog(
+            PartLogElement::MERGE_PARTS,
+            execution_status,
+            stopwatch_ptr->elapsed(),
+            future_part->name,
+            new_part,
+            future_part->parts,
+            merge_list_entry.get());
+    };
+
+    merge_task = storage.merger_mutator.mergePartsToTemporaryPart(
+            future_part,
+            metadata_snapshot,
+            merge_list_entry.get(),
+            {} /* projection_merge_list_element */,
+            table_lock_holder,
+            time(nullptr),
+            storage.getContext(),
+            merge_mutate_entry->tagger->reserved_space,
+            deduplicate,
+            deduplicate_by_columns,
+            storage.merging_params);
+}
+
+
+void MergePlainMergeTreeTask::finish()
+{
+    new_part = merge_task->getFuture().get();
+    storage.merger_mutator.renameMergedTemporaryPart(new_part, future_part->parts, nullptr);
+    write_part_log({});
+}
+
+}
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.h b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
new file mode 100644
index 00000000000..2c36386d32d
--- /dev/null
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTask.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/MergeTree/MergeMutateSelectedEntry.h>
+
+namespace DB
+{
+
+class StorageMergeTree;
+
+class MergePlainMergeTreeTask : public IExecutableTask
+{
+public:
+    template <class Callback>
+    MergePlainMergeTreeTask(
+        StorageMergeTree & storage_,
+        StorageMetadataPtr metadata_snapshot_,
+        bool deduplicate_,
+        Names deduplicate_by_columns_,
+        MergeMutateSelectedEntryPtr merge_mutate_entry_,
+        TableLockHolder table_lock_holder_,
+        Callback && task_result_callback_)
+        : storage(storage_)
+        , metadata_snapshot(std::move(metadata_snapshot_))
+        , deduplicate(deduplicate_)
+        , deduplicate_by_columns(std::move(deduplicate_by_columns_))
+        , merge_mutate_entry(std::move(merge_mutate_entry_))
+        , table_lock_holder(std::move(table_lock_holder_))
+        , task_result_callback(std::forward<Callback>(task_result_callback_))
+    {
+        for (auto & item : merge_mutate_entry->future_part->parts)
+            priority += item->getBytesOnDisk();
+    }
+
+    bool executeStep() override;
+    void onCompleted() override;
+    StorageID getStorageID() override;
+    UInt64 getPriority() override { return priority; }
+
+private:
+
+    void prepare();
+    void finish();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINISH,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+
+    StorageMergeTree & storage;
+
+    StorageMetadataPtr metadata_snapshot;
+    bool deduplicate;
+    Names deduplicate_by_columns;
+    std::shared_ptr<MergeMutateSelectedEntry> merge_mutate_entry{nullptr};
+    TableLockHolder table_lock_holder;
+    FutureMergedMutatedPartPtr future_part{nullptr};
+    MergeTreeData::MutableDataPartPtr new_part;
+    std::unique_ptr<Stopwatch> stopwatch_ptr{nullptr};
+    using MergeListEntryPtr = std::unique_ptr<MergeListEntry>;
+    MergeListEntryPtr merge_list_entry;
+
+    UInt64 priority{0};
+
+    std::function<void(const ExecutionStatus &)> write_part_log;
+    IExecutableTask::TaskResultCallback task_result_callback;
+    MergeTaskPtr merge_task{nullptr};
+};
+
+
+using MergePlainMergeTreeTaskPtr = std::shared_ptr<MergePlainMergeTreeTask>;
+
+
+[[ maybe_unused ]] static void executeHere(MergePlainMergeTreeTaskPtr task)
+{
+    while (task->executeStep()) {}
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MergeProgress.h b/src/Storages/MergeTree/MergeProgress.h
new file mode 100644
index 00000000000..dd4922051b5
--- /dev/null
+++ b/src/Storages/MergeTree/MergeProgress.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include <base/types.h>
+#include <Common/ProfileEvents.h>
+#include <IO/Progress.h>
+#include <Storages/MergeTree/MergeList.h>
+
+
+namespace ProfileEvents
+{
+    extern const Event MergesTimeMilliseconds;
+    extern const Event MergedUncompressedBytes;
+    extern const Event MergedRows;
+    extern const Event Merge;
+}
+
+namespace DB
+{
+
+/** Progress callback.
+  * What it should update:
+  * - approximate progress
+  * - amount of read rows
+  * - various metrics
+  * - time elapsed for current merge.
+  */
+
+/// Auxiliary struct that for each merge stage stores its current progress.
+/// A stage is: the horizontal stage + a stage for each gathered column (if we are doing a
+/// Vertical merge) or a mutation of a single part. During a single stage all rows are read.
+struct MergeStageProgress
+{
+    explicit MergeStageProgress(Float64 weight_)
+        : is_first(true) , weight(weight_) {}
+
+    MergeStageProgress(Float64 initial_progress_, Float64 weight_)
+        : initial_progress(initial_progress_), is_first(false), weight(weight_) {}
+
+    Float64 initial_progress = 0.0;
+    bool is_first;
+    Float64 weight;
+
+    UInt64 total_rows = 0;
+    UInt64 rows_read = 0;
+};
+
+class MergeProgressCallback
+{
+public:
+    MergeProgressCallback(
+        MergeListElement * merge_list_element_ptr_, UInt64 & watch_prev_elapsed_, MergeStageProgress & stage_)
+        : merge_list_element_ptr(merge_list_element_ptr_)
+        , watch_prev_elapsed(watch_prev_elapsed_)
+        , stage(stage_)
+    {
+        updateWatch();
+    }
+
+    MergeListElement * merge_list_element_ptr;
+    UInt64 & watch_prev_elapsed;
+    MergeStageProgress & stage;
+
+    void updateWatch()
+    {
+        UInt64 watch_curr_elapsed = merge_list_element_ptr->watch.elapsed();
+        ProfileEvents::increment(ProfileEvents::MergesTimeMilliseconds, (watch_curr_elapsed - watch_prev_elapsed) / 1000000);
+        watch_prev_elapsed = watch_curr_elapsed;
+    }
+
+    void operator() (const Progress & value)
+    {
+        ProfileEvents::increment(ProfileEvents::MergedUncompressedBytes, value.read_bytes);
+        if (stage.is_first)
+        {
+            ProfileEvents::increment(ProfileEvents::MergedRows, value.read_rows);
+            ProfileEvents::increment(ProfileEvents::Merge);
+        }
+        updateWatch();
+
+        merge_list_element_ptr->bytes_read_uncompressed += value.read_bytes;
+        if (stage.is_first)
+            merge_list_element_ptr->rows_read += value.read_rows;
+
+        stage.total_rows += value.total_rows_to_read;
+        stage.rows_read += value.read_rows;
+        if (stage.total_rows > 0)
+        {
+            merge_list_element_ptr->progress.store(
+                stage.initial_progress + stage.weight * stage.rows_read / stage.total_rows,
+                std::memory_order_relaxed);
+        }
+    }
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
new file mode 100644
index 00000000000..5cb819c44a4
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -0,0 +1,876 @@
+#include <Storages/MergeTree/MergeTask.h>
+
+#include <memory>
+#include <fmt/format.h>
+
+#include <base/logger_useful.h>
+#include <Common/ActionBlocker.h>
+
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeSequentialSource.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/MaterializingTransform.h>
+#include <Processors/Merges/MergingSortedTransform.h>
+#include <Processors/Merges/CollapsingSortedTransform.h>
+#include <Processors/Merges/SummingSortedTransform.h>
+#include <Processors/Merges/ReplacingSortedTransform.h>
+#include <Processors/Merges/GraphiteRollupSortedTransform.h>
+#include <Processors/Merges/AggregatingSortedTransform.h>
+#include <Processors/Merges/VersionedCollapsingTransform.h>
+#include <Processors/Transforms/TTLTransform.h>
+#include <Processors/Transforms/TTLCalcTransform.h>
+#include <Processors/Transforms/DistinctSortedTransform.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ABORTED;
+    extern const int DIRECTORY_ALREADY_EXISTS;
+    extern const int LOGICAL_ERROR;
+}
+
+
+/// PK columns are sorted and merged, ordinary columns are gathered using info from merge step
+static void extractMergingAndGatheringColumns(
+    const NamesAndTypesList & storage_columns,
+    const ExpressionActionsPtr & sorting_key_expr,
+    const IndicesDescription & indexes,
+    const MergeTreeData::MergingParams & merging_params,
+    NamesAndTypesList & gathering_columns, Names & gathering_column_names,
+    NamesAndTypesList & merging_columns, Names & merging_column_names)
+{
+    Names sort_key_columns_vec = sorting_key_expr->getRequiredColumns();
+    std::set<String> key_columns(sort_key_columns_vec.cbegin(), sort_key_columns_vec.cend());
+    for (const auto & index : indexes)
+    {
+        Names index_columns_vec = index.expression->getRequiredColumns();
+        std::copy(index_columns_vec.cbegin(), index_columns_vec.cend(),
+                  std::inserter(key_columns, key_columns.end()));
+    }
+
+    /// Force sign column for Collapsing mode
+    if (merging_params.mode == MergeTreeData::MergingParams::Collapsing)
+        key_columns.emplace(merging_params.sign_column);
+
+    /// Force version column for Replacing mode
+    if (merging_params.mode == MergeTreeData::MergingParams::Replacing)
+        key_columns.emplace(merging_params.version_column);
+
+    /// Force sign column for VersionedCollapsing mode. Version is already in primary key.
+    if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
+        key_columns.emplace(merging_params.sign_column);
+
+    /// Force to merge at least one column in case of empty key
+    if (key_columns.empty())
+        key_columns.emplace(storage_columns.front().name);
+
+    /// TODO: also force "summing" and "aggregating" columns to make Horizontal merge only for such columns
+
+    for (const auto & column : storage_columns)
+    {
+        if (key_columns.count(column.name))
+        {
+            merging_columns.emplace_back(column);
+            merging_column_names.emplace_back(column.name);
+        }
+        else
+        {
+            gathering_columns.emplace_back(column);
+            gathering_column_names.emplace_back(column.name);
+        }
+    }
+}
+
+
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
+{
+    // projection parts have different prefix and suffix compared to normal parts.
+    // E.g. `proj_a.proj` for a normal projection merge and `proj_a.tmp_proj` for a projection materialization merge.
+    const String local_tmp_prefix = global_ctx->parent_part ? "" : "tmp_merge_";
+    const String local_tmp_suffix = global_ctx->parent_part ? ctx->suffix : "";
+
+    if (global_ctx->merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
+
+    /// We don't want to perform merge assigned with TTL as normal merge, so
+    /// throw exception
+    if (isTTLMergeType(global_ctx->future_part->merge_type) && global_ctx->ttl_merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts with TTL", ErrorCodes::ABORTED);
+
+    LOG_DEBUG(ctx->log, "Merging {} parts: from {} to {} into {}",
+        global_ctx->future_part->parts.size(),
+        global_ctx->future_part->parts.front()->name,
+        global_ctx->future_part->parts.back()->name,
+        global_ctx->future_part->type.toString());
+
+    if (global_ctx->deduplicate)
+    {
+        if (global_ctx->deduplicate_by_columns.empty())
+            LOG_DEBUG(ctx->log, "DEDUPLICATE BY all columns");
+        else
+            LOG_DEBUG(ctx->log, "DEDUPLICATE BY ('{}')", fmt::join(global_ctx->deduplicate_by_columns, "', '"));
+    }
+
+    ctx->disk = global_ctx->space_reservation->getDisk();
+
+    String local_part_path = global_ctx->data->relative_data_path;
+    String local_tmp_part_basename = local_tmp_prefix + global_ctx->future_part->name + (global_ctx->parent_part ? ".proj" : "");
+    String local_new_part_tmp_path = local_part_path + local_tmp_part_basename + "/";
+
+    if (ctx->disk->exists(local_new_part_tmp_path))
+        throw Exception("Directory " + fullPath(ctx->disk, local_new_part_tmp_path) + " already exists", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
+
+    {
+        std::lock_guard lock(global_ctx->mutator->tmp_parts_lock);
+        global_ctx->mutator->tmp_parts.emplace(local_tmp_part_basename);
+    }
+    SCOPE_EXIT(
+        std::lock_guard lock(global_ctx->mutator->tmp_parts_lock);
+        global_ctx->mutator->tmp_parts.erase(local_tmp_part_basename);
+    );
+
+    global_ctx->all_column_names = global_ctx->metadata_snapshot->getColumns().getNamesOfPhysical();
+    global_ctx->storage_columns = global_ctx->metadata_snapshot->getColumns().getAllPhysical();
+
+    extractMergingAndGatheringColumns(
+        global_ctx->storage_columns,
+        global_ctx->metadata_snapshot->getSortingKey().expression,
+        global_ctx->metadata_snapshot->getSecondaryIndices(),
+        ctx->merging_params,
+        global_ctx->gathering_columns,
+        global_ctx->gathering_column_names,
+        global_ctx->merging_columns,
+        global_ctx->merging_column_names);
+
+
+    auto local_single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + global_ctx->future_part->name, ctx->disk, 0);
+    global_ctx->new_data_part = global_ctx->data->createPart(
+        global_ctx->future_part->name,
+        global_ctx->future_part->type,
+        global_ctx->future_part->part_info,
+        local_single_disk_volume,
+        local_tmp_part_basename,
+        global_ctx->parent_part);
+
+    global_ctx->new_data_part->uuid = global_ctx->future_part->uuid;
+    global_ctx->new_data_part->setColumns(global_ctx->storage_columns);
+    global_ctx->new_data_part->partition.assign(global_ctx->future_part->getPartition());
+    global_ctx->new_data_part->is_temp = global_ctx->parent_part == nullptr;
+
+    ctx->need_remove_expired_values = false;
+    ctx->force_ttl = false;
+    for (const auto & part : global_ctx->future_part->parts)
+    {
+        global_ctx->new_data_part->ttl_infos.update(part->ttl_infos);
+        if (global_ctx->metadata_snapshot->hasAnyTTL() && !part->checkAllTTLCalculated(global_ctx->metadata_snapshot))
+        {
+            LOG_INFO(ctx->log, "Some TTL values were not calculated for part {}. Will calculate them forcefully during merge.", part->name);
+            ctx->need_remove_expired_values = true;
+            ctx->force_ttl = true;
+        }
+    }
+
+    const auto & local_part_min_ttl = global_ctx->new_data_part->ttl_infos.part_min_ttl;
+    if (local_part_min_ttl && local_part_min_ttl <= global_ctx->time_of_merge)
+        ctx->need_remove_expired_values = true;
+
+    if (ctx->need_remove_expired_values && global_ctx->ttl_merges_blocker->isCancelled())
+    {
+        LOG_INFO(ctx->log, "Part {} has values with expired TTL, but merges with TTL are cancelled.", global_ctx->new_data_part->name);
+        ctx->need_remove_expired_values = false;
+    }
+
+    ctx->sum_input_rows_upper_bound = global_ctx->merge_list_element_ptr->total_rows_count;
+    ctx->sum_compressed_bytes_upper_bound = global_ctx->merge_list_element_ptr->total_size_bytes_compressed;
+    global_ctx->chosen_merge_algorithm = chooseMergeAlgorithm();
+    global_ctx->merge_list_element_ptr->merge_algorithm.store(global_ctx->chosen_merge_algorithm, std::memory_order_relaxed);
+
+    LOG_DEBUG(ctx->log, "Selected MergeAlgorithm: {}", toString(global_ctx->chosen_merge_algorithm));
+
+    /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
+    /// (which is locked in data.getTotalActiveSizeInBytes())
+    /// (which is locked in shared mode when input streams are created) and when inserting new data
+    /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
+    /// deadlock is impossible.
+    ctx->compression_codec = global_ctx->data->getCompressionCodecForPart(
+        global_ctx->merge_list_element_ptr->total_size_bytes_compressed, global_ctx->new_data_part->ttl_infos, global_ctx->time_of_merge);
+
+    ctx->tmp_disk = global_ctx->context->getTemporaryVolume()->getDisk();
+
+    switch (global_ctx->chosen_merge_algorithm)
+    {
+        case MergeAlgorithm::Horizontal :
+        {
+            global_ctx->merging_columns = global_ctx->storage_columns;
+            global_ctx->merging_column_names = global_ctx->all_column_names;
+            global_ctx->gathering_columns.clear();
+            global_ctx->gathering_column_names.clear();
+            break;
+        }
+        case MergeAlgorithm::Vertical :
+        {
+            ctx->rows_sources_file = createTemporaryFile(ctx->tmp_disk->getPath());
+            ctx->rows_sources_uncompressed_write_buf = ctx->tmp_disk->writeFile(fileName(ctx->rows_sources_file->path()));
+            ctx->rows_sources_write_buf = std::make_unique<CompressedWriteBuffer>(*ctx->rows_sources_uncompressed_write_buf);
+
+            MergeTreeDataPartInMemory::ColumnToSize local_merged_column_to_size;
+            for (const MergeTreeData::DataPartPtr & part : global_ctx->future_part->parts)
+                part->accumulateColumnSizes(local_merged_column_to_size);
+
+            ctx->column_sizes = ColumnSizeEstimator(
+                std::move(local_merged_column_to_size),
+                global_ctx->merging_column_names,
+                global_ctx->gathering_column_names);
+
+            if (global_ctx->data->getSettings()->fsync_part_directory)
+                global_ctx->sync_guard = ctx->disk->getDirectorySyncGuard(local_new_part_tmp_path);
+
+            break;
+        }
+        default :
+            throw Exception("Merge algorithm must be chosen", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    /// If merge is vertical we cannot calculate it
+    ctx->blocks_are_granules_size = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
+
+    /// Merged stream will be created and available as merged_stream variable
+    createMergedStream();
+
+    global_ctx->to = std::make_shared<MergedBlockOutputStream>(
+        global_ctx->new_data_part,
+        global_ctx->metadata_snapshot,
+        global_ctx->merging_columns,
+        MergeTreeIndexFactory::instance().getMany(global_ctx->metadata_snapshot->getSecondaryIndices()),
+        ctx->compression_codec,
+        ctx->blocks_are_granules_size);
+
+    global_ctx->rows_written = 0;
+    ctx->initial_reservation = global_ctx->space_reservation ? global_ctx->space_reservation->getSize() : 0;
+
+    ctx->is_cancelled = [merges_blocker = global_ctx->merges_blocker,
+        ttl_merges_blocker = global_ctx->ttl_merges_blocker,
+        need_remove = ctx->need_remove_expired_values]() -> bool
+    {
+        return merges_blocker->isCancelled() || (need_remove && ttl_merges_blocker->isCancelled());
+    };
+
+    /// This is the end of preparation. Execution will be per block.
+    return false;
+}
+
+
+MergeTask::StageRuntimeContextPtr MergeTask::ExecuteAndFinalizeHorizontalPart::getContextForNextStage()
+{
+    auto new_ctx = std::make_shared<VerticalMergeRuntimeContext>();
+
+    new_ctx->rows_sources_write_buf = std::move(ctx->rows_sources_write_buf);
+    new_ctx->rows_sources_uncompressed_write_buf = std::move(ctx->rows_sources_uncompressed_write_buf);
+    new_ctx->rows_sources_file = std::move(ctx->rows_sources_file);
+    new_ctx->column_sizes = std::move(ctx->column_sizes);
+    new_ctx->compression_codec = std::move(ctx->compression_codec);
+    new_ctx->tmp_disk = std::move(ctx->tmp_disk);
+    new_ctx->it_name_and_type = std::move(ctx->it_name_and_type);
+    new_ctx->column_num_for_vertical_merge = std::move(ctx->column_num_for_vertical_merge);
+    new_ctx->read_with_direct_io = std::move(ctx->read_with_direct_io);
+    new_ctx->need_sync = std::move(ctx->need_sync);
+
+    ctx.reset();
+    return new_ctx;
+}
+
+MergeTask::StageRuntimeContextPtr MergeTask::VerticalMergeStage::getContextForNextStage()
+{
+    auto new_ctx = std::make_shared<MergeProjectionsRuntimeContext>();
+
+    new_ctx->need_sync = std::move(ctx->need_sync);
+
+    ctx.reset();
+    return new_ctx;
+}
+
+
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::execute()
+{
+    assert(subtasks_iterator != subtasks.end());
+    if ((*subtasks_iterator)())
+        return true;
+
+    /// Move to the next subtask in an array of subtasks
+    ++subtasks_iterator;
+    return subtasks_iterator != subtasks.end();
+}
+
+
+bool MergeTask::ExecuteAndFinalizeHorizontalPart::executeImpl()
+{
+    Block block;
+    if (!ctx->is_cancelled() && (global_ctx->merging_executor->pull(block)))
+    {
+        global_ctx->rows_written += block.rows();
+
+        const_cast<MergedBlockOutputStream &>(*global_ctx->to).write(block);
+
+        UInt64 result_rows = 0;
+        UInt64 result_bytes = 0;
+        global_ctx->merged_pipeline.tryGetResultRowsAndBytes(result_rows, result_bytes);
+        global_ctx->merge_list_element_ptr->rows_written = result_rows;
+        global_ctx->merge_list_element_ptr->bytes_written_uncompressed = result_bytes;
+
+        /// Reservation updates is not performed yet, during the merge it may lead to higher free space requirements
+        if (global_ctx->space_reservation && ctx->sum_input_rows_upper_bound)
+        {
+            /// The same progress from merge_entry could be used for both algorithms (it should be more accurate)
+            /// But now we are using inaccurate row-based estimation in Horizontal case for backward compatibility
+            Float64 progress = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Horizontal)
+                ? std::min(1., 1. * global_ctx->rows_written / ctx->sum_input_rows_upper_bound)
+                : std::min(1., global_ctx->merge_list_element_ptr->progress.load(std::memory_order_relaxed));
+
+            global_ctx->space_reservation->update(static_cast<size_t>((1. - progress) * ctx->initial_reservation));
+        }
+
+        /// Need execute again
+        return true;
+    }
+
+    global_ctx->merging_executor.reset();
+    global_ctx->merged_pipeline.reset();
+
+    if (global_ctx->merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
+
+    if (ctx->need_remove_expired_values && global_ctx->ttl_merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts with expired TTL", ErrorCodes::ABORTED);
+
+    const auto data_settings = global_ctx->data->getSettings();
+    const size_t sum_compressed_bytes_upper_bound = global_ctx->merge_list_element_ptr->total_size_bytes_compressed;
+    ctx->need_sync = needSyncPart(ctx->sum_input_rows_upper_bound, sum_compressed_bytes_upper_bound, *data_settings);
+
+    return false;
+}
+
+
+bool MergeTask::VerticalMergeStage::prepareVerticalMergeForAllColumns() const
+{
+     /// No need to execute this part if it is horizontal merge.
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        return false;
+
+    size_t sum_input_rows_exact = global_ctx->merge_list_element_ptr->rows_read;
+    global_ctx->merge_list_element_ptr->columns_written = global_ctx->merging_column_names.size();
+    global_ctx->merge_list_element_ptr->progress.store(ctx->column_sizes->keyColumnsWeight(), std::memory_order_relaxed);
+
+    ctx->rows_sources_write_buf->next();
+    ctx->rows_sources_uncompressed_write_buf->next();
+    /// Ensure data has written to disk.
+    ctx->rows_sources_uncompressed_write_buf->finalize();
+
+    size_t rows_sources_count = ctx->rows_sources_write_buf->count();
+    /// In special case, when there is only one source part, and no rows were skipped, we may have
+    /// skipped writing rows_sources file. Otherwise rows_sources_count must be equal to the total
+    /// number of input rows.
+    if ((rows_sources_count > 0 || global_ctx->future_part->parts.size() > 1) && sum_input_rows_exact != rows_sources_count)
+        throw Exception("Number of rows in source parts (" + toString(sum_input_rows_exact)
+            + ") differs from number of bytes written to rows_sources file (" + toString(rows_sources_count)
+            + "). It is a bug.", ErrorCodes::LOGICAL_ERROR);
+
+    ctx->rows_sources_read_buf = std::make_unique<CompressedReadBufferFromFile>(ctx->tmp_disk->readFile(fileName(ctx->rows_sources_file->path())));
+
+    /// For external cycle
+    global_ctx->gathering_column_names_size = global_ctx->gathering_column_names.size();
+    ctx->column_num_for_vertical_merge = 0;
+    ctx->it_name_and_type = global_ctx->gathering_columns.cbegin();
+
+    return false;
+}
+
+
+void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
+{
+    const String & column_name = ctx->it_name_and_type->name;
+    Names column_names{column_name};
+
+    ctx->progress_before = global_ctx->merge_list_element_ptr->progress.load(std::memory_order_relaxed);
+
+    global_ctx->column_progress = std::make_unique<MergeStageProgress>(ctx->progress_before, ctx->column_sizes->columnWeight(column_name));
+
+    Pipes pipes;
+    for (size_t part_num = 0; part_num < global_ctx->future_part->parts.size(); ++part_num)
+    {
+        auto column_part_source = std::make_shared<MergeTreeSequentialSource>(
+            *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->future_part->parts[part_num], column_names, ctx->read_with_direct_io, true);
+
+        /// Dereference unique_ptr
+        column_part_source->setProgressCallback(
+            MergeProgressCallback(global_ctx->merge_list_element_ptr, global_ctx->watch_prev_elapsed, *global_ctx->column_progress));
+
+        pipes.emplace_back(std::move(column_part_source));
+    }
+
+    auto pipe = Pipe::unitePipes(std::move(pipes));
+
+    ctx->rows_sources_read_buf->seek(0, 0);
+    auto transform = std::make_unique<ColumnGathererTransform>(pipe.getHeader(), pipe.numOutputPorts(), *ctx->rows_sources_read_buf);
+    pipe.addTransform(std::move(transform));
+
+    ctx->column_parts_pipeline = QueryPipeline(std::move(pipe));
+    ctx->executor = std::make_unique<PullingPipelineExecutor>(ctx->column_parts_pipeline);
+
+    ctx->column_to = std::make_unique<MergedColumnOnlyOutputStream>(
+        global_ctx->new_data_part,
+        global_ctx->metadata_snapshot,
+        ctx->executor->getHeader(),
+        ctx->compression_codec,
+        /// we don't need to recalc indices here
+        /// because all of them were already recalculated and written
+        /// as key part of vertical merge
+        std::vector<MergeTreeIndexPtr>{},
+        &global_ctx->written_offset_columns,
+        global_ctx->to->getIndexGranularity());
+
+    ctx->column_elems_written = 0;
+}
+
+
+bool MergeTask::VerticalMergeStage::executeVerticalMergeForOneColumn() const
+{
+    Block block;
+    if (!global_ctx->merges_blocker->isCancelled() && ctx->executor->pull(block))
+    {
+        ctx->column_elems_written += block.rows();
+        ctx->column_to->write(block);
+
+        /// Need execute again
+        return true;
+    }
+    return false;
+}
+
+
+void MergeTask::VerticalMergeStage::finalizeVerticalMergeForOneColumn() const
+{
+    const String & column_name = ctx->it_name_and_type->name;
+    if (global_ctx->merges_blocker->isCancelled())
+        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
+
+    ctx->executor.reset();
+    auto changed_checksums = ctx->column_to->writeSuffixAndGetChecksums(global_ctx->new_data_part, global_ctx->checksums_gathered_columns, ctx->need_sync);
+    global_ctx->checksums_gathered_columns.add(std::move(changed_checksums));
+
+    if (global_ctx->rows_written != ctx->column_elems_written)
+    {
+        throw Exception("Written " + toString(ctx->column_elems_written) + " elements of column " + column_name +
+                        ", but " + toString(global_ctx->rows_written) + " rows of PK columns", ErrorCodes::LOGICAL_ERROR);
+    }
+
+    UInt64 rows = 0;
+    UInt64 bytes = 0;
+    ctx->column_parts_pipeline.tryGetResultRowsAndBytes(rows, bytes);
+
+    /// NOTE: 'progress' is modified by single thread, but it may be concurrently read from MergeListElement::getInfo() (StorageSystemMerges).
+
+    global_ctx->merge_list_element_ptr->columns_written += 1;
+    global_ctx->merge_list_element_ptr->bytes_written_uncompressed += bytes;
+    global_ctx->merge_list_element_ptr->progress.store(ctx->progress_before + ctx->column_sizes->columnWeight(column_name), std::memory_order_relaxed);
+
+    /// This is the external cycle increment.
+    ++ctx->column_num_for_vertical_merge;
+    ++ctx->it_name_and_type;
+}
+
+
+bool MergeTask::VerticalMergeStage::finalizeVerticalMergeForAllColumns() const
+{
+    /// No need to execute this part if it is horizontal merge.
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        return false;
+
+    return false;
+}
+
+
+bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() const
+{
+    for (const auto & part : global_ctx->future_part->parts)
+        global_ctx->new_data_part->minmax_idx->merge(*part->minmax_idx);
+
+    /// Print overall profiling info. NOTE: it may duplicates previous messages
+    {
+        double elapsed_seconds = global_ctx->merge_list_element_ptr->watch.elapsedSeconds();
+        LOG_DEBUG(ctx->log,
+            "Merge sorted {} rows, containing {} columns ({} merged, {} gathered) in {} sec., {} rows/sec., {}/sec.",
+            global_ctx->merge_list_element_ptr->rows_read,
+            global_ctx->all_column_names.size(),
+            global_ctx->merging_column_names.size(),
+            global_ctx->gathering_column_names.size(),
+            elapsed_seconds,
+            global_ctx->merge_list_element_ptr->rows_read / elapsed_seconds,
+            ReadableSize(global_ctx->merge_list_element_ptr->bytes_read_uncompressed / elapsed_seconds));
+    }
+
+
+    const auto & projections = global_ctx->metadata_snapshot->getProjections();
+    // tasks_for_projections.reserve(projections.size());
+
+    for (const auto & projection : projections)
+    {
+        MergeTreeData::DataPartsVector projection_parts;
+        for (const auto & part : global_ctx->future_part->parts)
+        {
+            auto it = part->getProjectionParts().find(projection.name);
+            if (it != part->getProjectionParts().end())
+                projection_parts.push_back(it->second);
+        }
+        if (projection_parts.size() < global_ctx->future_part->parts.size())
+        {
+            LOG_DEBUG(ctx->log, "Projection {} is not merged because some parts don't have it", projection.name);
+            continue;
+        }
+
+        LOG_DEBUG(
+            ctx->log,
+            "Selected {} projection_parts from {} to {}",
+            projection_parts.size(),
+            projection_parts.front()->name,
+            projection_parts.back()->name);
+
+        auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
+        projection_future_part->assign(std::move(projection_parts));
+        projection_future_part->name = projection.name;
+        // TODO (ab): path in future_part is only for merge process introspection, which is not available for merges of projection parts.
+        // Let's comment this out to avoid code inconsistency and add it back after we implement projection merge introspection.
+        // projection_future_part->path = global_ctx->future_part->path + "/" + projection.name + ".proj/";
+        projection_future_part->part_info = {"all", 0, 0, 0};
+
+        MergeTreeData::MergingParams projection_merging_params;
+        projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
+        if (projection.type == ProjectionDescription::Type::Aggregate)
+            projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
+
+        const Settings & settings = global_ctx->context->getSettingsRef();
+
+        ctx->tasks_for_projections.emplace_back(std::make_shared<MergeTask>(
+            projection_future_part,
+            projection.metadata,
+            global_ctx->merge_entry,
+            std::make_unique<MergeListElement>(
+                (*global_ctx->merge_entry)->table_id,
+                projection_future_part,
+                settings.memory_profiler_step,
+                settings.memory_profiler_sample_probability,
+                settings.max_untracked_memory),
+            global_ctx->time_of_merge,
+            global_ctx->context,
+            global_ctx->space_reservation,
+            global_ctx->deduplicate,
+            global_ctx->deduplicate_by_columns,
+            projection_merging_params,
+            global_ctx->new_data_part.get(),
+            ".proj",
+            global_ctx->data,
+            global_ctx->mutator,
+            global_ctx->merges_blocker,
+            global_ctx->ttl_merges_blocker));
+    }
+
+    /// We will iterate through projections and execute them
+    ctx->projections_iterator = ctx->tasks_for_projections.begin();
+
+    return false;
+}
+
+
+bool MergeTask::MergeProjectionsStage::executeProjections() const
+{
+    if (ctx->projections_iterator == ctx->tasks_for_projections.end())
+        return false;
+
+    if ((*ctx->projections_iterator)->execute())
+        return true;
+
+    ++ctx->projections_iterator;
+    return true;
+}
+
+
+bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
+{
+    for (const auto & task : ctx->tasks_for_projections)
+    {
+        auto part = task->getFuture().get();
+        global_ctx->new_data_part->addProjectionPart(part->name, std::move(part));
+    }
+
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        global_ctx->to->writeSuffixAndFinalizePart(global_ctx->new_data_part, ctx->need_sync);
+    else
+        global_ctx->to->writeSuffixAndFinalizePart(
+            global_ctx->new_data_part, ctx->need_sync, &global_ctx->storage_columns, &global_ctx->checksums_gathered_columns);
+
+    global_ctx->promise.set_value(global_ctx->new_data_part);
+
+    return false;
+}
+
+
+bool MergeTask::VerticalMergeStage::execute()
+{
+    assert(subtasks_iterator != subtasks.end());
+    if ((*subtasks_iterator)())
+        return true;
+
+    /// Move to the next subtask in an array of subtasks
+    ++subtasks_iterator;
+    return subtasks_iterator != subtasks.end();
+}
+
+bool MergeTask::MergeProjectionsStage::execute()
+{
+    assert(subtasks_iterator != subtasks.end());
+    if ((*subtasks_iterator)())
+        return true;
+
+    /// Move to the next subtask in an array of subtasks
+    ++subtasks_iterator;
+    return subtasks_iterator != subtasks.end();
+}
+
+
+bool MergeTask::VerticalMergeStage::executeVerticalMergeForAllColumns() const
+{
+    /// No need to execute this part if it is horizontal merge.
+    if (global_ctx->chosen_merge_algorithm != MergeAlgorithm::Vertical)
+        return false;
+
+    /// This is the external cycle condition
+    if (ctx->column_num_for_vertical_merge >= global_ctx->gathering_column_names_size)
+        return false;
+
+    switch (ctx->vertical_merge_one_column_state)
+    {
+        case VerticalMergeRuntimeContext::State::NEED_PREPARE:
+        {
+            prepareVerticalMergeForOneColumn();
+            ctx->vertical_merge_one_column_state = VerticalMergeRuntimeContext::State::NEED_EXECUTE;
+            return true;
+        }
+        case VerticalMergeRuntimeContext::State::NEED_EXECUTE:
+        {
+            if (executeVerticalMergeForOneColumn())
+                return true;
+
+            ctx->vertical_merge_one_column_state = VerticalMergeRuntimeContext::State::NEED_FINISH;
+            return true;
+        }
+        case VerticalMergeRuntimeContext::State::NEED_FINISH:
+        {
+            finalizeVerticalMergeForOneColumn();
+            ctx->vertical_merge_one_column_state = VerticalMergeRuntimeContext::State::NEED_PREPARE;
+            return true;
+        }
+    }
+    return false;
+}
+
+
+bool MergeTask::execute()
+{
+    assert(stages_iterator != stages.end());
+    if ((*stages_iterator)->execute())
+        return true;
+
+    /// Stage is finished, need initialize context for the next stage
+    auto next_stage_context = (*stages_iterator)->getContextForNextStage();
+
+    /// Move to the next stage in an array of stages
+    ++stages_iterator;
+    if (stages_iterator == stages.end())
+        return false;
+
+    (*stages_iterator)->setRuntimeContext(std::move(next_stage_context), global_ctx);
+    return true;
+}
+
+
+void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
+{
+    /** Read from all parts, merge and write into a new one.
+      * In passing, we calculate expression for sorting.
+      */
+    Pipes pipes;
+    global_ctx->watch_prev_elapsed = 0;
+
+    /// We count total amount of bytes in parts
+    /// and use direct_io + aio if there is more than min_merge_bytes_to_use_direct_io
+    ctx->read_with_direct_io = false;
+    const auto data_settings = global_ctx->data->getSettings();
+    if (data_settings->min_merge_bytes_to_use_direct_io != 0)
+    {
+        size_t total_size = 0;
+        for (const auto & part : global_ctx->future_part->parts)
+        {
+            total_size += part->getBytesOnDisk();
+            if (total_size >= data_settings->min_merge_bytes_to_use_direct_io)
+            {
+                LOG_DEBUG(ctx->log, "Will merge parts reading files in O_DIRECT");
+                ctx->read_with_direct_io = true;
+
+                break;
+            }
+        }
+    }
+
+    /// Using unique_ptr, because MergeStageProgress has no default constructor
+    global_ctx->horizontal_stage_progress = std::make_unique<MergeStageProgress>(
+        ctx->column_sizes ? ctx->column_sizes->keyColumnsWeight() : 1.0);
+
+
+    for (const auto & part : global_ctx->future_part->parts)
+    {
+        auto input = std::make_unique<MergeTreeSequentialSource>(
+            *global_ctx->data, global_ctx->metadata_snapshot, part, global_ctx->merging_column_names, ctx->read_with_direct_io, true);
+
+        /// Dereference unique_ptr and pass horizontal_stage_progress by reference
+        input->setProgressCallback(
+            MergeProgressCallback(global_ctx->merge_list_element_ptr, global_ctx->watch_prev_elapsed, *global_ctx->horizontal_stage_progress));
+
+        Pipe pipe(std::move(input));
+
+        if (global_ctx->metadata_snapshot->hasSortingKey())
+        {
+            pipe.addSimpleTransform([this](const Block & header)
+            {
+                return std::make_shared<ExpressionTransform>(header, global_ctx->metadata_snapshot->getSortingKey().expression);
+            });
+        }
+
+        pipes.emplace_back(std::move(pipe));
+    }
+
+
+    Names sort_columns = global_ctx->metadata_snapshot->getSortingKeyColumns();
+    SortDescription sort_description;
+    size_t sort_columns_size = sort_columns.size();
+    sort_description.reserve(sort_columns_size);
+
+    Names partition_key_columns = global_ctx->metadata_snapshot->getPartitionKey().column_names;
+
+    Block header = pipes.at(0).getHeader();
+    for (size_t i = 0; i < sort_columns_size; ++i)
+        sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
+
+    /// The order of the streams is important: when the key is matched, the elements go in the order of the source stream number.
+    /// In the merged part, the lines with the same key must be in the ascending order of the identifier of original part,
+    ///  that is going in insertion order.
+    ProcessorPtr merged_transform;
+
+    /// If merge is vertical we cannot calculate it
+    ctx->blocks_are_granules_size = (global_ctx->chosen_merge_algorithm == MergeAlgorithm::Vertical);
+
+    UInt64 merge_block_size = data_settings->merge_max_block_size;
+
+    switch (ctx->merging_params.mode)
+    {
+        case MergeTreeData::MergingParams::Ordinary:
+            merged_transform = std::make_shared<MergingSortedTransform>(
+                header, pipes.size(), sort_description, merge_block_size, 0, ctx->rows_sources_write_buf.get(), true, ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Collapsing:
+            merged_transform = std::make_shared<CollapsingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.sign_column, false,
+                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Summing:
+            merged_transform = std::make_shared<SummingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.columns_to_sum, partition_key_columns, merge_block_size);
+            break;
+
+        case MergeTreeData::MergingParams::Aggregating:
+            merged_transform = std::make_shared<AggregatingSortedTransform>(header, pipes.size(), sort_description, merge_block_size);
+            break;
+
+        case MergeTreeData::MergingParams::Replacing:
+            merged_transform = std::make_shared<ReplacingSortedTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.version_column,
+                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+
+        case MergeTreeData::MergingParams::Graphite:
+            merged_transform = std::make_shared<GraphiteRollupSortedTransform>(
+                header, pipes.size(), sort_description, merge_block_size,
+                ctx->merging_params.graphite_params, global_ctx->time_of_merge);
+            break;
+
+        case MergeTreeData::MergingParams::VersionedCollapsing:
+            merged_transform = std::make_shared<VersionedCollapsingTransform>(
+                header, pipes.size(), sort_description, ctx->merging_params.sign_column,
+                merge_block_size, ctx->rows_sources_write_buf.get(), ctx->blocks_are_granules_size);
+            break;
+    }
+
+    auto res_pipe = Pipe::unitePipes(std::move(pipes));
+    res_pipe.addTransform(std::move(merged_transform));
+
+    if (global_ctx->deduplicate)
+        res_pipe.addTransform(std::make_shared<DistinctSortedTransform>(
+            res_pipe.getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+
+    if (ctx->need_remove_expired_values)
+        res_pipe.addTransform(std::make_shared<TTLTransform>(
+            res_pipe.getHeader(), *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->new_data_part, global_ctx->time_of_merge, ctx->force_ttl));
+
+    if (global_ctx->metadata_snapshot->hasSecondaryIndices())
+    {
+        const auto & indices = global_ctx->metadata_snapshot->getSecondaryIndices();
+        res_pipe.addTransform(std::make_shared<ExpressionTransform>(
+            res_pipe.getHeader(), indices.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(), global_ctx->data->getContext())));
+        res_pipe.addTransform(std::make_shared<MaterializingTransform>(res_pipe.getHeader()));
+    }
+
+    global_ctx->merged_pipeline = QueryPipeline(std::move(res_pipe));
+    global_ctx->merging_executor = std::make_unique<PullingPipelineExecutor>(global_ctx->merged_pipeline);
+}
+
+
+MergeAlgorithm MergeTask::ExecuteAndFinalizeHorizontalPart::chooseMergeAlgorithm() const
+{
+    const size_t sum_rows_upper_bound = global_ctx->merge_list_element_ptr->total_rows_count;
+    const auto data_settings = global_ctx->data->getSettings();
+
+    if (global_ctx->deduplicate)
+        return MergeAlgorithm::Horizontal;
+    if (data_settings->enable_vertical_merge_algorithm == 0)
+        return MergeAlgorithm::Horizontal;
+    if (ctx->need_remove_expired_values)
+        return MergeAlgorithm::Horizontal;
+
+    for (const auto & part : global_ctx->future_part->parts)
+        if (!part->supportsVerticalMerge())
+            return MergeAlgorithm::Horizontal;
+
+    bool is_supported_storage =
+        ctx->merging_params.mode == MergeTreeData::MergingParams::Ordinary ||
+        ctx->merging_params.mode == MergeTreeData::MergingParams::Collapsing ||
+        ctx->merging_params.mode == MergeTreeData::MergingParams::Replacing ||
+        ctx->merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing;
+
+    bool enough_ordinary_cols = global_ctx->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 = global_ctx->future_part->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;
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
new file mode 100644
index 00000000000..80c8e7165f8
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -0,0 +1,380 @@
+#pragma once
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeProgress.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/IMergedBlockOutputStream.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/ColumnSizeEstimator.h>
+#include <Storages/MergeTree/MergedColumnOnlyOutputStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Compression/CompressedReadBufferFromFile.h>
+
+#include <memory>
+#include <list>
+
+namespace DB
+{
+
+class MergeTask;
+using MergeTaskPtr = std::shared_ptr<MergeTask>;
+
+/**
+ * Overview of the merge algorithm
+ *
+ * Each merge is executed sequentially block by block.
+ * The main idea is to make a merge not a subroutine which is executed
+ * in a thread pool and may occupy a thread for a period of time,
+ * but to make a merge a coroutine which can suspend the execution
+ * in some points and then resume the execution from this point.
+ *
+ * A perfect point where to suspend the execution is after the work over a block is finished.
+ * The task itself will be executed via BackgroundJobExecutor.
+ *
+ * The interface of the task is simple.
+ * The main method is `execute()` which will return true, if the task wants to be executed again and false otherwise.
+ *
+ * With this kind of task we can give a merge a priority.
+ * A priority is simple - the lower the size of the merge, the higher priority.
+ * So, if ClickHouse wants to merge some really big parts into a bigger part,
+ * then it will be executed for a long time, because the result of the merge is not really needed immediately.
+ * It is better to merge small parts as soon as possible.
+*/
+class MergeTask
+{
+public:
+
+    MergeTask(
+        FutureMergedMutatedPartPtr future_part_,
+        StorageMetadataPtr metadata_snapshot_,
+        MergeList::Entry * merge_entry_,
+        std::unique_ptr<MergeListElement> projection_merge_list_element_,
+        time_t time_of_merge_,
+        ContextPtr context_,
+        ReservationSharedPtr space_reservation_,
+        bool deduplicate_,
+        Names deduplicate_by_columns_,
+        MergeTreeData::MergingParams merging_params_,
+        const IMergeTreeDataPart * parent_part_,
+        String suffix_,
+        MergeTreeData * data_,
+        MergeTreeDataMergerMutator * mutator_,
+        ActionBlocker * merges_blocker_,
+        ActionBlocker * ttl_merges_blocker_)
+        {
+            global_ctx = std::make_shared<GlobalRuntimeContext>();
+
+            global_ctx->future_part = std::move(future_part_);
+            global_ctx->metadata_snapshot = std::move(metadata_snapshot_);
+            global_ctx->merge_entry = std::move(merge_entry_);
+            global_ctx->projection_merge_list_element = std::move(projection_merge_list_element_);
+            global_ctx->merge_list_element_ptr
+                = global_ctx->projection_merge_list_element ? global_ctx->projection_merge_list_element.get() : (*global_ctx->merge_entry)->ptr();
+            global_ctx->time_of_merge = std::move(time_of_merge_);
+            global_ctx->context = std::move(context_);
+            global_ctx->space_reservation = std::move(space_reservation_);
+            global_ctx->deduplicate = std::move(deduplicate_);
+            global_ctx->deduplicate_by_columns = std::move(deduplicate_by_columns_);
+            global_ctx->parent_part = std::move(parent_part_);
+            global_ctx->data = std::move(data_);
+            global_ctx->mutator = std::move(mutator_);
+            global_ctx->merges_blocker = std::move(merges_blocker_);
+            global_ctx->ttl_merges_blocker = std::move(ttl_merges_blocker_);
+
+            auto prepare_stage_ctx = std::make_shared<ExecuteAndFinalizeHorizontalPartRuntimeContext>();
+
+            prepare_stage_ctx->suffix = std::move(suffix_);
+            prepare_stage_ctx->merging_params = std::move(merging_params_);
+
+            (*stages.begin())->setRuntimeContext(std::move(prepare_stage_ctx), global_ctx);
+        }
+
+    std::future<MergeTreeData::MutableDataPartPtr> getFuture()
+    {
+        return global_ctx->promise.get_future();
+    }
+
+    bool execute();
+
+private:
+    struct IStage;
+    using StagePtr = std::shared_ptr<IStage>;
+
+    struct IStageRuntimeContext {};
+    using StageRuntimeContextPtr = std::shared_ptr<IStageRuntimeContext>;
+
+    struct IStage
+    {
+        virtual void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) = 0;
+        virtual StageRuntimeContextPtr getContextForNextStage() = 0;
+        virtual bool execute() = 0;
+        virtual ~IStage() = default;
+    };
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct GlobalRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        MergeList::Entry * merge_entry{nullptr};
+        /// If not null, use this instead of the global MergeList::Entry. This is for merging projections.
+        std::unique_ptr<MergeListElement> projection_merge_list_element;
+        MergeListElement * merge_list_element_ptr{nullptr};
+        MergeTreeData * data{nullptr};
+        MergeTreeDataMergerMutator * mutator{nullptr};
+        ActionBlocker * merges_blocker{nullptr};
+        ActionBlocker * ttl_merges_blocker{nullptr};
+        StorageMetadataPtr metadata_snapshot{nullptr};
+        FutureMergedMutatedPartPtr future_part{nullptr};
+        /// This will be either nullptr or new_data_part, so raw pointer is ok.
+        const IMergeTreeDataPart * parent_part{nullptr};
+        ContextPtr context{nullptr};
+        time_t time_of_merge{0};
+        ReservationSharedPtr space_reservation{nullptr};
+        bool deduplicate{false};
+        Names deduplicate_by_columns{};
+
+        NamesAndTypesList gathering_columns{};
+        NamesAndTypesList merging_columns{};
+        Names gathering_column_names{};
+        Names merging_column_names{};
+        NamesAndTypesList storage_columns{};
+        Names all_column_names{};
+        MergeTreeData::DataPart::Checksums checksums_gathered_columns{};
+
+        MergeAlgorithm chosen_merge_algorithm{MergeAlgorithm::Undecided};
+        size_t gathering_column_names_size{0};
+
+        std::unique_ptr<MergeStageProgress> horizontal_stage_progress{nullptr};
+        std::unique_ptr<MergeStageProgress> column_progress{nullptr};
+
+        std::shared_ptr<MergedBlockOutputStream> to{nullptr};
+        QueryPipeline merged_pipeline;
+        std::unique_ptr<PullingPipelineExecutor> merging_executor;
+
+        SyncGuardPtr sync_guard{nullptr};
+        MergeTreeData::MutableDataPartPtr new_data_part{nullptr};
+
+        size_t rows_written{0};
+        UInt64 watch_prev_elapsed{0};
+
+        std::promise<MergeTreeData::MutableDataPartPtr> promise{};
+
+        IMergedBlockOutputStream::WrittenOffsetColumns written_offset_columns{};
+    };
+
+    using GlobalRuntimeContextPtr = std::shared_ptr<GlobalRuntimeContext>;
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct ExecuteAndFinalizeHorizontalPartRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        /// Dependencies
+        String suffix;
+        MergeTreeData::MergingParams merging_params{};
+
+        DiskPtr tmp_disk{nullptr};
+        DiskPtr disk{nullptr};
+        bool need_remove_expired_values{false};
+        bool force_ttl{false};
+        CompressionCodecPtr compression_codec{nullptr};
+        size_t sum_input_rows_upper_bound{0};
+        std::unique_ptr<TemporaryFile> rows_sources_file{nullptr};
+        std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf{nullptr};
+        std::unique_ptr<WriteBuffer> rows_sources_write_buf{nullptr};
+        std::optional<ColumnSizeEstimator> column_sizes{};
+
+        size_t initial_reservation{0};
+        bool read_with_direct_io{false};
+
+        std::function<bool()> is_cancelled{};
+
+        /// Local variables for this stage
+        size_t sum_compressed_bytes_upper_bound{0};
+        bool blocks_are_granules_size{false};
+
+        Poco::Logger * log{&Poco::Logger::get("MergeTask::PrepareStage")};
+
+        /// Dependencies for next stages
+        std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
+        size_t column_num_for_vertical_merge{0};
+        bool need_sync{false};
+    };
+
+    using ExecuteAndFinalizeHorizontalPartRuntimeContextPtr = std::shared_ptr<ExecuteAndFinalizeHorizontalPartRuntimeContext>;
+
+
+    struct ExecuteAndFinalizeHorizontalPart : public IStage
+    {
+        bool execute() override;
+
+        bool prepare();
+        bool executeImpl();
+
+        using ExecuteAndFinalizeHorizontalPartSubtasks = std::array<std::function<bool()>, 2>;
+
+        ExecuteAndFinalizeHorizontalPartSubtasks subtasks
+        {
+            [this] () { return prepare(); },
+            [this] () { return executeImpl(); }
+        };
+
+        ExecuteAndFinalizeHorizontalPartSubtasks::iterator subtasks_iterator = subtasks.begin();
+
+
+        MergeAlgorithm chooseMergeAlgorithm() const;
+        void createMergedStream();
+
+        void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
+        {
+            ctx = static_pointer_cast<ExecuteAndFinalizeHorizontalPartRuntimeContext>(local);
+            global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
+        }
+        StageRuntimeContextPtr getContextForNextStage() override;
+
+        ExecuteAndFinalizeHorizontalPartRuntimeContextPtr ctx;
+        GlobalRuntimeContextPtr global_ctx;
+    };
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct VerticalMergeRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        /// Begin dependencies from previous stage
+        std::unique_ptr<WriteBuffer> rows_sources_write_buf{nullptr};
+        std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf{nullptr};
+        std::unique_ptr<TemporaryFile> rows_sources_file;
+        std::optional<ColumnSizeEstimator> column_sizes;
+        CompressionCodecPtr compression_codec;
+        DiskPtr tmp_disk{nullptr};
+        std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
+        size_t column_num_for_vertical_merge{0};
+        bool read_with_direct_io{false};
+        bool need_sync{false};
+        /// End dependencies from previous stages
+
+        enum class State
+        {
+            NEED_PREPARE,
+            NEED_EXECUTE,
+            NEED_FINISH
+        };
+        State vertical_merge_one_column_state{State::NEED_PREPARE};
+
+        Float64 progress_before = 0;
+        std::unique_ptr<MergedColumnOnlyOutputStream> column_to{nullptr};
+        size_t column_elems_written{0};
+        QueryPipeline column_parts_pipeline;
+        std::unique_ptr<PullingPipelineExecutor> executor;
+        std::unique_ptr<CompressedReadBufferFromFile> rows_sources_read_buf{nullptr};
+    };
+
+    using VerticalMergeRuntimeContextPtr = std::shared_ptr<VerticalMergeRuntimeContext>;
+
+
+    struct VerticalMergeStage : public IStage
+    {
+        bool execute() override;
+        void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
+        {
+            ctx = static_pointer_cast<VerticalMergeRuntimeContext>(local);
+            global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
+        }
+        StageRuntimeContextPtr getContextForNextStage() override;
+
+        bool prepareVerticalMergeForAllColumns() const;
+        bool executeVerticalMergeForAllColumns() const;
+        bool finalizeVerticalMergeForAllColumns() const;
+
+        using VerticalMergeStageSubtasks = std::array<std::function<bool()>, 3>;
+
+        VerticalMergeStageSubtasks subtasks
+        {
+            [this] () { return prepareVerticalMergeForAllColumns(); },
+            [this] () { return executeVerticalMergeForAllColumns(); },
+            [this] () { return finalizeVerticalMergeForAllColumns(); }
+        };
+
+        VerticalMergeStageSubtasks::iterator subtasks_iterator = subtasks.begin();
+
+        void prepareVerticalMergeForOneColumn() const;
+        bool executeVerticalMergeForOneColumn() const;
+        void finalizeVerticalMergeForOneColumn() const;
+
+        VerticalMergeRuntimeContextPtr ctx;
+        GlobalRuntimeContextPtr global_ctx;
+    };
+
+    /// By default this context is uninitialed, but some variables has to be set after construction,
+    /// some variables are used in a process of execution
+    /// Proper initialization is responsibility of the author
+    struct MergeProjectionsRuntimeContext : public IStageRuntimeContext //-V730
+    {
+        /// Only one dependency
+        bool need_sync{false};
+
+        using MergeTasks = std::deque<MergeTaskPtr>;
+        MergeTasks tasks_for_projections;
+        MergeTasks::iterator projections_iterator;
+
+        Poco::Logger * log{&Poco::Logger::get("MergeTask::MergeProjectionsStage")};
+    };
+
+    using MergeProjectionsRuntimeContextPtr = std::shared_ptr<MergeProjectionsRuntimeContext>;
+
+    struct MergeProjectionsStage : public IStage
+    {
+        bool execute() override;
+        void setRuntimeContext(StageRuntimeContextPtr local, StageRuntimeContextPtr global) override
+        {
+            ctx = static_pointer_cast<MergeProjectionsRuntimeContext>(local);
+            global_ctx = static_pointer_cast<GlobalRuntimeContext>(global);
+        }
+        StageRuntimeContextPtr getContextForNextStage() override { return nullptr; }
+
+        bool mergeMinMaxIndexAndPrepareProjections() const;
+        bool executeProjections() const;
+        bool finalizeProjectionsAndWholeMerge() const;
+
+        using MergeProjectionsStageSubtasks = std::array<std::function<bool()>, 3>;
+
+        MergeProjectionsStageSubtasks subtasks
+        {
+            [this] () { return mergeMinMaxIndexAndPrepareProjections(); },
+            [this] () { return executeProjections(); },
+            [this] () { return finalizeProjectionsAndWholeMerge(); }
+        };
+
+        MergeProjectionsStageSubtasks::iterator subtasks_iterator = subtasks.begin();
+
+        MergeProjectionsRuntimeContextPtr ctx;
+        GlobalRuntimeContextPtr global_ctx;
+    };
+
+    GlobalRuntimeContextPtr global_ctx;
+
+    using Stages = std::array<StagePtr, 3>;
+
+    Stages stages
+    {
+        std::make_shared<ExecuteAndFinalizeHorizontalPart>(),
+        std::make_shared<VerticalMergeStage>(),
+        std::make_shared<MergeProjectionsStage>()
+    };
+
+    Stages::iterator stages_iterator = stages.begin();
+
+};
+
+/// FIXME
+[[ maybe_unused]] static MergeTreeData::MutableDataPartPtr executeHere(MergeTaskPtr task)
+{
+    while (task->execute()) {}
+    return task->getFuture().get();
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
new file mode 100644
index 00000000000..797caff8f69
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -0,0 +1,189 @@
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+
+#include <algorithm>
+
+#include <Common/setThreadName.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
+
+namespace DB
+{
+
+template <class Queue>
+void MergeTreeBackgroundExecutor<Queue>::wait()
+{
+    {
+        std::lock_guard lock(mutex);
+        shutdown = true;
+        has_tasks.notify_all();
+    }
+
+    pool.wait();
+}
+
+
+template <class Queue>
+bool MergeTreeBackgroundExecutor<Queue>::trySchedule(ExecutableTaskPtr task)
+{
+    std::lock_guard lock(mutex);
+
+    if (shutdown)
+        return false;
+
+    auto & value = CurrentMetrics::values[metric];
+    if (value.load() >= static_cast<int64_t>(max_tasks_count))
+        return false;
+
+    pending.push(std::make_shared<TaskRuntimeData>(std::move(task), metric));
+
+    has_tasks.notify_one();
+    return true;
+}
+
+
+template <class Queue>
+void MergeTreeBackgroundExecutor<Queue>::removeTasksCorrespondingToStorage(StorageID id)
+{
+    std::vector<TaskRuntimeDataPtr> tasks_to_wait;
+    {
+        std::lock_guard lock(mutex);
+
+        /// Erase storage related tasks from pending and select active tasks to wait for
+        pending.remove(id);
+
+        /// Copy items to wait for their completion
+        std::copy_if(active.begin(), active.end(), std::back_inserter(tasks_to_wait),
+            [&] (auto item) -> bool { return item->task->getStorageID() == id; });
+
+        for (auto & item : tasks_to_wait)
+            item->is_currently_deleting = true;
+    }
+
+    /// Wait for each task to be executed
+    for (auto & item : tasks_to_wait)
+    {
+        item->is_done.wait();
+        item.reset();
+    }
+}
+
+
+template <class Queue>
+void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
+{
+    DENY_ALLOCATIONS_IN_SCOPE;
+
+    /// All operations with queues are considered no to do any allocations
+
+    auto erase_from_active = [this, item]
+    {
+        active.erase(std::remove(active.begin(), active.end(), item), active.end());
+    };
+
+    bool need_execute_again = false;
+
+    try
+    {
+        ALLOW_ALLOCATIONS_IN_SCOPE;
+        need_execute_again = item->task->executeStep();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+
+    if (need_execute_again)
+    {
+        std::lock_guard guard(mutex);
+
+        if (item->is_currently_deleting)
+        {
+            erase_from_active();
+
+            /// This is significant to order the destructors.
+            item->task.reset();
+            item->is_done.set();
+            item = nullptr;
+            return;
+        }
+
+        /// After the `guard` destruction `item` has to be in moved from state
+        /// Not to own the object it points to.
+        /// Otherwise the destruction of the task won't be ordered with the destruction of the
+        /// storage.
+        pending.push(std::move(item));
+        erase_from_active();
+        has_tasks.notify_one();
+        item = nullptr;
+        return;
+    }
+
+
+    {
+        std::lock_guard guard(mutex);
+        erase_from_active();
+        has_tasks.notify_one();
+
+        try
+        {
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            /// In a situation of a lack of memory this method can throw an exception,
+            /// because it may interact somehow with BackgroundSchedulePool, which may allocate memory
+            /// But it is rather safe, because we have try...catch block here, and another one in ThreadPool.
+            item->task->onCompleted();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+
+
+        /// We have to call reset() under a lock, otherwise a race is possible.
+        /// Imagine, that task is finally completed (last execution returned false),
+        /// we removed the task from both queues, but still have pointer.
+        /// The thread that shutdowns storage will scan queues in order to find some tasks to wait for, but will find nothing.
+        /// So, the destructor of a task and the destructor of a storage will be executed concurrently.
+        item->task.reset();
+        item->is_done.set();
+        item = nullptr;
+    }
+}
+
+
+template <class Queue>
+void MergeTreeBackgroundExecutor<Queue>::threadFunction()
+{
+    setThreadName(name.c_str());
+
+    DENY_ALLOCATIONS_IN_SCOPE;
+
+    while (true)
+    {
+        try
+        {
+            TaskRuntimeDataPtr item;
+            {
+                std::unique_lock lock(mutex);
+                has_tasks.wait(lock, [this](){ return !pending.empty() || shutdown; });
+
+                if (shutdown)
+                    break;
+
+                item = std::move(pending.pop());
+                active.push_back(item);
+            }
+
+            routine(std::move(item));
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+
+template class MergeTreeBackgroundExecutor<MergeMutateRuntimeQueue>;
+template class MergeTreeBackgroundExecutor<OrdinaryRuntimeQueue>;
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
new file mode 100644
index 00000000000..c59e53fb20e
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -0,0 +1,210 @@
+#pragma once
+
+#include <deque>
+#include <functional>
+#include <atomic>
+#include <mutex>
+#include <future>
+#include <condition_variable>
+#include <set>
+#include <iostream>
+
+#include <boost/circular_buffer.hpp>
+
+#include <base/shared_ptr_helper.h>
+#include <base/logger_useful.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <Storages/MergeTree/IExecutableTask.h>
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+struct TaskRuntimeData;
+using TaskRuntimeDataPtr = std::shared_ptr<TaskRuntimeData>;
+
+/**
+ * Has RAII class to determine how many tasks are waiting for the execution and executing at the moment.
+ * Also has some flags and primitives to wait for current task to be executed.
+ */
+struct TaskRuntimeData
+{
+    TaskRuntimeData(ExecutableTaskPtr && task_, CurrentMetrics::Metric metric_)
+        : task(std::move(task_))
+        , increment(std::move(metric_))
+    {}
+
+    ExecutableTaskPtr task;
+    CurrentMetrics::Increment increment;
+    std::atomic_bool is_currently_deleting{false};
+    /// Actually autoreset=false is needed only for unit test
+    /// where multiple threads could remove tasks corresponding to the same storage
+    /// This scenario in not possible in reality.
+    Poco::Event is_done{/*autoreset=*/false};
+    /// This is equal to task->getPriority() not to do useless virtual calls in comparator
+    UInt64 priority{0};
+
+    /// By default priority queue will have max element at top
+    static bool comparePtrByPriority(const TaskRuntimeDataPtr & lhs, const TaskRuntimeDataPtr & rhs)
+    {
+        return lhs->priority > rhs->priority;
+    }
+};
+
+
+class OrdinaryRuntimeQueue
+{
+public:
+    TaskRuntimeDataPtr pop()
+    {
+        auto result = std::move(queue.front());
+        queue.pop_front();
+        return result;
+    }
+
+    void push(TaskRuntimeDataPtr item) { queue.push_back(std::move(item));}
+
+    void remove(StorageID id)
+    {
+        auto it = std::remove_if(queue.begin(), queue.end(),
+            [&] (auto item) -> bool { return item->task->getStorageID() == id; });
+        queue.erase(it, queue.end());
+    }
+
+    void setCapacity(size_t count) { queue.set_capacity(count); }
+    bool empty() { return queue.empty(); }
+
+private:
+    boost::circular_buffer<TaskRuntimeDataPtr> queue{0};
+};
+
+/// Uses a heap to pop a task with minimal priority
+class MergeMutateRuntimeQueue
+{
+public:
+    TaskRuntimeDataPtr pop()
+    {
+        std::pop_heap(buffer.begin(), buffer.end(), TaskRuntimeData::comparePtrByPriority);
+        auto result = std::move(buffer.back());
+        buffer.pop_back();
+        return result;
+    }
+
+    void push(TaskRuntimeDataPtr item)
+    {
+        item->priority = item->task->getPriority();
+        buffer.push_back(std::move(item));
+        std::push_heap(buffer.begin(), buffer.end(), TaskRuntimeData::comparePtrByPriority);
+    }
+
+    void remove(StorageID id)
+    {
+        auto it = std::remove_if(buffer.begin(), buffer.end(),
+            [&] (auto item) -> bool { return item->task->getStorageID() == id; });
+        buffer.erase(it, buffer.end());
+
+        std::make_heap(buffer.begin(), buffer.end(), TaskRuntimeData::comparePtrByPriority);
+    }
+
+    void setCapacity(size_t count) { buffer.reserve(count); }
+    bool empty() { return buffer.empty(); }
+
+private:
+    std::vector<TaskRuntimeDataPtr> buffer{};
+};
+
+/**
+ *  Executor for a background MergeTree related operations such as merges, mutations, fetches an so on.
+ *  It can execute only successors of ExecutableTask interface.
+ *  Which is a self-written coroutine. It suspends, when returns true from executeStep() method.
+ *
+ *  There are two queues of a tasks: pending (main queue for all the tasks) and active (currently executing).
+ *  Pending queue is needed since the number of tasks will be more than thread to execute.
+ *  Pending tasks are tasks that successfully scheduled to an executor or tasks that have some extra steps to execute.
+ *  There is an invariant, that task may occur only in one of these queue. It can occur in both queues only in critical sections.
+ *
+ *  Pending:                                              Active:
+ *
+ *  |s| |s| |s| |s| |s| |s| |s| |s| |s| |s|               |s|
+ *  |s| |s| |s| |s| |s| |s| |s| |s| |s|                   |s|
+ *  |s| |s|     |s|     |s| |s|     |s|                   |s|
+ *      |s|             |s| |s|                           |s|
+ *      |s|                 |s|
+ *                          |s|
+ *
+ *  Each task is simply a sequence of steps. Heavier tasks have longer sequences.
+ *  When a step of a task is executed, we move tasks to pending queue. And take another from the queue's head.
+ *  With these architecture all small merges / mutations will be executed faster, than bigger ones.
+ *
+ *  We use boost::circular_buffer as a container for queues not to do any allocations.
+ *
+ *  Another nuisance that we faces with is than background operations always interact with an associated Storage.
+ *  So, when a Storage want to shutdown, it must wait until all its background operaions are finished.
+ */
+template <class Queue>
+class MergeTreeBackgroundExecutor final : public shared_ptr_helper<MergeTreeBackgroundExecutor<Queue>>
+{
+public:
+
+    MergeTreeBackgroundExecutor(
+        String name_,
+        size_t threads_count_,
+        size_t max_tasks_count_,
+        CurrentMetrics::Metric metric_)
+        : name(name_)
+        , threads_count(threads_count_)
+        , max_tasks_count(max_tasks_count_)
+        , metric(metric_)
+    {
+        if (max_tasks_count == 0)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Task count for MergeTreeBackgroundExecutor must not be zero");
+
+        pending.setCapacity(max_tasks_count);
+        active.set_capacity(max_tasks_count);
+
+        pool.setMaxThreads(std::max(1UL, threads_count));
+        pool.setMaxFreeThreads(std::max(1UL, threads_count));
+        pool.setQueueSize(std::max(1UL, threads_count));
+
+        for (size_t number = 0; number < threads_count; ++number)
+            pool.scheduleOrThrowOnError([this] { threadFunction(); });
+    }
+
+    ~MergeTreeBackgroundExecutor()
+    {
+        wait();
+    }
+
+    bool trySchedule(ExecutableTaskPtr task);
+    void removeTasksCorrespondingToStorage(StorageID id);
+    void wait();
+
+private:
+
+    String name;
+    size_t threads_count{0};
+    size_t max_tasks_count{0};
+    CurrentMetrics::Metric metric;
+
+    void routine(TaskRuntimeDataPtr item);
+    void threadFunction();
+
+    /// Initially it will be empty
+    Queue pending{};
+    boost::circular_buffer<TaskRuntimeDataPtr> active{0};
+    std::mutex mutex;
+    std::condition_variable has_tasks;
+    std::atomic_bool shutdown{false};
+    ThreadPool pool;
+};
+
+extern template class MergeTreeBackgroundExecutor<MergeMutateRuntimeQueue>;
+extern template class MergeTreeBackgroundExecutor<OrdinaryRuntimeQueue>;
+
+using MergeMutateBackgroundExecutor = MergeTreeBackgroundExecutor<MergeMutateRuntimeQueue>;
+using OrdinaryBackgroundExecutor = MergeTreeBackgroundExecutor<OrdinaryRuntimeQueue>;
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
index c91d60c5de7..2f46543b03c 100644
--- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
@@ -287,7 +287,7 @@ static void injectVirtualColumnsImpl(
             {
                 ColumnPtr column;
                 if (rows)
-                    column = DataTypeUUID().createColumnConst(rows, task->data_part->uuid)->convertToFullColumnIfConst();
+                    column = DataTypeUUID().createColumnConst(rows, part->uuid)->convertToFullColumnIfConst();
                 else
                     column = DataTypeUUID().createColumn();
 
@@ -306,7 +306,7 @@ static void injectVirtualColumnsImpl(
             else if (virtual_column_name == "_partition_value")
             {
                 if (rows)
-                    inserter.insertPartitionValueColumn(rows, task->data_part->partition.value, partition_value_type, virtual_column_name);
+                    inserter.insertPartitionValueColumn(rows, part->partition.value, partition_value_type, virtual_column_name);
                 else
                     inserter.insertPartitionValueColumn(rows, {}, partition_value_type, virtual_column_name);
             }
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index 93594dd4357..88f3052e833 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -260,8 +260,7 @@ MergeTreeReadTaskColumns getReadTaskColumns(
     const StorageMetadataPtr & metadata_snapshot,
     const MergeTreeData::DataPartPtr & data_part,
     const Names & required_columns,
-    const PrewhereInfoPtr & prewhere_info,
-    bool check_columns)
+    const PrewhereInfoPtr & prewhere_info)
 {
     Names column_names = required_columns;
     Names pre_column_names;
@@ -308,18 +307,9 @@ MergeTreeReadTaskColumns getReadTaskColumns(
 
     MergeTreeReadTaskColumns result;
 
-    if (check_columns)
-    {
-        const auto & columns = metadata_snapshot->getColumns();
-        result.pre_columns = columns.getByNames(ColumnsDescription::All, pre_column_names, true);
-        result.columns = columns.getByNames(ColumnsDescription::All, column_names, true);
-    }
-    else
-    {
-        result.pre_columns = data_part->getColumns().addTypes(pre_column_names);
-        result.columns = data_part->getColumns().addTypes(column_names);
-    }
-
+    auto columns = metadata_snapshot->getColumns();
+    result.pre_columns = columns.getByNames(ColumnsDescription::All, pre_column_names, true);
+    result.columns = columns.getByNames(ColumnsDescription::All, column_names, true);
     result.should_reorder = should_reorder;
 
     return result;
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
index 4c4081bd83b..2dfe6fcf06d 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
@@ -78,8 +78,7 @@ MergeTreeReadTaskColumns getReadTaskColumns(
     const StorageMetadataPtr & metadata_snapshot,
     const MergeTreeData::DataPartPtr & data_part,
     const Names & required_columns,
-    const PrewhereInfoPtr & prewhere_info,
-    bool check_columns);
+    const PrewhereInfoPtr & prewhere_info);
 
 struct MergeTreeBlockSizePredictor
 {
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index 60ff3d094b7..aa3b593bf4f 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1,5 +1,9 @@
+#include <Storages/MergeTree/MergeTreeData.h>
+
+#include <Backups/BackupEntryFromImmutableFile.h>
+#include <Backups/BackupEntryFromSmallFile.h>
+#include <Backups/IBackup.h>
 #include <Compression/CompressedReadBuffer.h>
-#include <DataStreams/copyData.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
@@ -9,7 +13,7 @@
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/NestedUtils.h>
-#include <Formats/FormatFactory.h>
+#include <Disks/TemporaryFileOnDisk.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/ConcatReadBuffer.h>
@@ -30,9 +34,7 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
 #include <Storages/AlterCommands.h>
-#include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
 #include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreeDataPartWide.h>
@@ -51,11 +53,15 @@
 #include <Common/escapeForFileName.h>
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <AggregateFunctions/AggregateFunctionCount.h>
 
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string/join.hpp>
 
-#include <common/scope_guard_safe.h>
+#include <base/insertAtEnd.h>
+#include <base/scope_guard_safe.h>
 
 #include <algorithm>
 #include <iomanip>
@@ -124,10 +130,14 @@ namespace ErrorCodes
     extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
     extern const int SUPPORT_IS_DISABLED;
     extern const int TOO_MANY_SIMULTANEOUS_QUERIES;
+    extern const int INCORRECT_QUERY;
 }
 
 static void checkSampleExpression(const StorageInMemoryMetadata & metadata, bool allow_sampling_expression_not_in_primary_key, bool check_sample_column_is_correct)
 {
+    if (metadata.sampling_key.column_names.empty())
+        throw Exception("There are no columns in sampling expression", ErrorCodes::INCORRECT_QUERY);
+
     const auto & pk_sample_block = metadata.getPrimaryKey().sample_block;
     if (!pk_sample_block.has(metadata.sampling_key.column_names[0]) && !allow_sampling_expression_not_in_primary_key)
         throw Exception("Sampling expression must be present in the primary key", ErrorCodes::BAD_ARGUMENTS);
@@ -192,7 +202,11 @@ MergeTreeData::MergeTreeData(
     , data_parts_by_info(data_parts_indexes.get<TagByInfo>())
     , data_parts_by_state_and_info(data_parts_indexes.get<TagByStateAndInfo>())
     , parts_mover(this)
+    , background_operations_assignee(*this, BackgroundJobsAssignee::Type::DataProcessing, getContext())
+    , background_moves_assignee(*this, BackgroundJobsAssignee::Type::Moving, getContext())
 {
+    context_->getGlobalContext()->initializeBackgroundExecutorsIfNeeded();
+
     const auto settings = getSettings();
     allow_nullable_key = attach || settings->allow_nullable_key;
 
@@ -236,7 +250,7 @@ MergeTreeData::MergeTreeData(
     {
         /// This is for backward compatibility.
         checkSampleExpression(metadata_, attach || settings->compatibility_allow_sampling_expression_not_in_primary_key,
-                              settings->check_sample_column_is_correct);
+                              settings->check_sample_column_is_correct && !attach);
     }
 
     checkTTLExpressions(metadata_, metadata_);
@@ -270,10 +284,13 @@ MergeTreeData::MergeTreeData(
     if (!attach || !version_file_exists)
     {
         format_version = min_format_version;
-        auto buf = version_file.second->writeFile(version_file.first);
-        writeIntText(format_version.toUnderType(), *buf);
-        if (getContext()->getSettingsRef().fsync_metadata)
-            buf->sync();
+        if (!version_file.second->isReadOnly())
+        {
+            auto buf = version_file.second->writeFile(version_file.first);
+            writeIntText(format_version.toUnderType(), *buf);
+            if (getContext()->getSettingsRef().fsync_metadata)
+                buf->sync();
+        }
     }
     else
     {
@@ -297,6 +314,22 @@ MergeTreeData::MergeTreeData(
     if (!canUsePolymorphicParts(*settings, &reason) && !reason.empty())
         LOG_WARNING(log, "{} Settings 'min_rows_for_wide_part', 'min_bytes_for_wide_part', "
             "'min_rows_for_compact_part' and 'min_bytes_for_compact_part' will be ignored.", reason);
+
+    common_assignee_trigger = [this] (bool delay) noexcept
+    {
+        if (delay)
+            background_operations_assignee.postpone();
+        else
+            background_operations_assignee.trigger();
+    };
+
+    moves_assignee_trigger = [this] (bool delay) noexcept
+    {
+        if (delay)
+            background_moves_assignee.postpone();
+        else
+            background_moves_assignee.trigger();
+    };
 }
 
 StoragePolicyPtr MergeTreeData::getStoragePolicy() const
@@ -440,8 +473,6 @@ void MergeTreeData::checkProperties(
 
         for (const auto & projection : new_metadata.projections)
         {
-            MergeTreeProjectionFactory::instance().validate(projection);
-
             if (projections_names.find(projection.name) != projections_names.end())
                 throw Exception(
                         "Projection with name " + backQuote(projection.name) + " already exists",
@@ -750,16 +781,20 @@ DataTypePtr MergeTreeData::getPartitionValueType() const
 }
 
 
-Block MergeTreeData::getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part) const
+Block MergeTreeData::getSampleBlockWithVirtualColumns() const
 {
     DataTypePtr partition_value_type = getPartitionValueType();
-    bool has_partition_value = typeid_cast<const DataTypeTuple *>(partition_value_type.get());
-    Block block{
+    return {
         ColumnWithTypeAndName(ColumnString::create(), std::make_shared<DataTypeString>(), "_part"),
         ColumnWithTypeAndName(ColumnString::create(), std::make_shared<DataTypeString>(), "_partition_id"),
         ColumnWithTypeAndName(ColumnUUID::create(), std::make_shared<DataTypeUUID>(), "_part_uuid"),
         ColumnWithTypeAndName(partition_value_type->createColumn(), partition_value_type, "_partition_value")};
+}
 
+
+Block MergeTreeData::getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part, bool ignore_empty) const
+{
+    auto block = getSampleBlockWithVirtualColumns();
     MutableColumns columns = block.mutateColumns();
 
     auto & part_column = columns[0];
@@ -767,8 +802,11 @@ Block MergeTreeData::getBlockWithVirtualPartColumns(const MergeTreeData::DataPar
     auto & part_uuid_column = columns[2];
     auto & partition_value_column = columns[3];
 
+    bool has_partition_value = typeid_cast<const ColumnTuple *>(partition_value_column.get());
     for (const auto & part_or_projection : parts)
     {
+        if (ignore_empty && part_or_projection->isEmpty())
+            continue;
         const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
         part_column->insert(part->name);
         partition_id_column->insert(part->info.partition_id);
@@ -859,6 +897,261 @@ Int64 MergeTreeData::getMaxBlockNumber() const
     return max_block_num;
 }
 
+void MergeTreeData::loadDataPartsFromDisk(
+    DataPartsVector & broken_parts_to_detach,
+    DataPartsVector & duplicate_parts_to_remove,
+    ThreadPool & pool,
+    size_t num_parts,
+    std::queue<std::vector<std::pair<String, DiskPtr>>> & parts_queue,
+    bool skip_sanity_checks,
+    const MergeTreeSettingsPtr & settings)
+{
+    /// Parallel loading of data parts.
+    pool.setMaxThreads(std::min(size_t(settings->max_part_loading_threads), num_parts));
+    size_t num_threads = pool.getMaxThreads();
+    std::vector<size_t> parts_per_thread(num_threads, num_parts / num_threads);
+    for (size_t i = 0ul; i < num_parts % num_threads; ++i)
+        ++parts_per_thread[i];
+
+    /// Prepare data parts for parallel loading. Threads will focus on given disk first, then steal
+    /// others' tasks when finish current disk part loading process.
+    std::vector<std::vector<std::pair<String, DiskPtr>>> threads_parts(num_threads);
+    std::set<size_t> remaining_thread_parts;
+    std::queue<size_t> threads_queue;
+    for (size_t i = 0; i < num_threads; ++i)
+    {
+        remaining_thread_parts.insert(i);
+        threads_queue.push(i);
+    }
+
+    while (!parts_queue.empty())
+    {
+        assert(!threads_queue.empty());
+        size_t i = threads_queue.front();
+        auto & need_parts = parts_per_thread[i];
+        assert(need_parts > 0);
+        auto & thread_parts = threads_parts[i];
+        auto & current_parts = parts_queue.front();
+        assert(!current_parts.empty());
+        auto parts_to_grab = std::min(need_parts, current_parts.size());
+
+        thread_parts.insert(thread_parts.end(), current_parts.end() - parts_to_grab, current_parts.end());
+        current_parts.resize(current_parts.size() - parts_to_grab);
+        need_parts -= parts_to_grab;
+
+        /// Before processing next thread, change disk if possible.
+        /// Different threads will likely start loading parts from different disk,
+        /// which may improve read parallelism for JBOD.
+
+        /// If current disk still has some parts, push it to the tail.
+        if (!current_parts.empty())
+            parts_queue.push(std::move(current_parts));
+        parts_queue.pop();
+
+        /// If current thread still want some parts, push it to the tail.
+        if (need_parts > 0)
+            threads_queue.push(i);
+        threads_queue.pop();
+    }
+    assert(threads_queue.empty());
+    assert(std::all_of(threads_parts.begin(), threads_parts.end(), [](const std::vector<std::pair<String, DiskPtr>> & parts)
+    {
+        return !parts.empty();
+    }));
+
+    size_t suspicious_broken_parts = 0;
+    size_t suspicious_broken_parts_bytes = 0;
+    std::atomic<bool> has_adaptive_parts = false;
+    std::atomic<bool> has_non_adaptive_parts = false;
+
+    std::mutex mutex;
+    auto load_part = [&](const String & part_name, const DiskPtr & part_disk_ptr)
+    {
+        auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version);
+        if (!part_opt)
+            return;
+        const auto & part_info = *part_opt;
+        auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, part_disk_ptr, 0);
+        auto part = createPart(part_name, part_info, single_disk_volume, part_name);
+        bool broken = false;
+
+        String part_path = fs::path(relative_data_path) / part_name;
+        String marker_path = fs::path(part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
+        if (part_disk_ptr->exists(marker_path))
+        {
+            /// NOTE: getBytesOnDisk() cannot be used here, since it maybe zero of checksums.txt will not exist
+            size_t size_of_part = IMergeTreeDataPart::calculateTotalSizeOnDisk(part->volume->getDisk(), part->getFullRelativePath());
+            LOG_WARNING(log,
+                "Detaching stale part {}{} (size: {}), which should have been deleted after a move. "
+                "That can only happen after unclean restart of ClickHouse after move of a part having an operation blocking that stale copy of part.",
+                getFullPathOnDisk(part_disk_ptr), part_name, formatReadableSizeWithBinarySuffix(size_of_part));
+            std::lock_guard loading_lock(mutex);
+            broken_parts_to_detach.push_back(part);
+            ++suspicious_broken_parts;
+            suspicious_broken_parts_bytes += size_of_part;
+            return;
+        }
+
+        try
+        {
+            part->loadColumnsChecksumsIndexes(require_part_metadata, true);
+        }
+        catch (const Exception & e)
+        {
+            /// Don't count the part as broken if there is not enough memory to load it.
+            /// In fact, there can be many similar situations.
+            /// But it is OK, because there is a safety guard against deleting too many parts.
+            if (isNotEnoughMemoryErrorCode(e.code()))
+                throw;
+
+            broken = true;
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+        catch (...)
+        {
+            broken = true;
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+
+        /// Ignore broken parts that can appear as a result of hard server restart.
+        if (broken)
+        {
+            /// NOTE: getBytesOnDisk() cannot be used here, since it maybe zero of checksums.txt will not exist
+            size_t size_of_part = IMergeTreeDataPart::calculateTotalSizeOnDisk(part->volume->getDisk(), part->getFullRelativePath());
+
+            LOG_ERROR(log,
+                "Detaching broken part {}{} (size: {}). "
+                "If it happened after update, it is likely because of backward incompability. "
+                "You need to resolve this manually",
+                getFullPathOnDisk(part_disk_ptr), part_name, formatReadableSizeWithBinarySuffix(size_of_part));
+            std::lock_guard loading_lock(mutex);
+            broken_parts_to_detach.push_back(part);
+            ++suspicious_broken_parts;
+            suspicious_broken_parts_bytes += size_of_part;
+            return;
+        }
+        if (!part->index_granularity_info.is_adaptive)
+            has_non_adaptive_parts.store(true, std::memory_order_relaxed);
+        else
+            has_adaptive_parts.store(true, std::memory_order_relaxed);
+
+        part->modification_time = part_disk_ptr->getLastModified(fs::path(relative_data_path) / part_name).epochTime();
+        /// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
+        part->setState(DataPartState::Committed);
+
+        std::lock_guard loading_lock(mutex);
+        auto [it, inserted] = data_parts_indexes.insert(part);
+        /// Remove duplicate parts with the same checksum.
+        if (!inserted)
+        {
+            if ((*it)->checksums.getTotalChecksumHex() == part->checksums.getTotalChecksumHex())
+            {
+                LOG_ERROR(log, "Remove duplicate part {}", part->getFullPath());
+                duplicate_parts_to_remove.push_back(part);
+            }
+            else
+                throw Exception("Part " + part->name + " already exists but with different checksums", ErrorCodes::DUPLICATE_DATA_PART);
+        }
+
+        addPartContributionToDataVolume(part);
+    };
+
+    std::mutex part_select_mutex;
+    try
+    {
+        for (size_t thread = 0; thread < num_threads; ++thread)
+        {
+            pool.scheduleOrThrowOnError([&, thread]
+            {
+                while (true)
+                {
+                    std::pair<String, DiskPtr> thread_part;
+                    {
+                        const std::lock_guard lock{part_select_mutex};
+
+                        if (remaining_thread_parts.empty())
+                            return;
+
+                        /// Steal task if nothing to do
+                        auto thread_idx = thread;
+                        if (threads_parts[thread].empty())
+                        {
+                            // Try random steal tasks from the next thread
+                            std::uniform_int_distribution<size_t> distribution(0, remaining_thread_parts.size() - 1);
+                            auto it = remaining_thread_parts.begin();
+                            std::advance(it, distribution(thread_local_rng));
+                            thread_idx = *it;
+                        }
+                        auto & thread_parts = threads_parts[thread_idx];
+                        thread_part = thread_parts.back();
+                        thread_parts.pop_back();
+                        if (thread_parts.empty())
+                            remaining_thread_parts.erase(thread_idx);
+                    }
+                    load_part(thread_part.first, thread_part.second);
+                }
+            });
+        }
+    }
+    catch (...)
+    {
+        /// If this is not done, then in case of an exception, tasks will be destroyed before the threads are completed, and it will be bad.
+        pool.wait();
+        throw;
+    }
+
+    pool.wait();
+
+    if (has_non_adaptive_parts && has_adaptive_parts && !settings->enable_mixed_granularity_parts)
+        throw Exception(
+            "Table contains parts with adaptive and non adaptive marks, but `setting enable_mixed_granularity_parts` is disabled",
+            ErrorCodes::LOGICAL_ERROR);
+
+    has_non_adaptive_index_granularity_parts = has_non_adaptive_parts;
+
+    if (suspicious_broken_parts > settings->max_suspicious_broken_parts && !skip_sanity_checks)
+        throw Exception(ErrorCodes::TOO_MANY_UNEXPECTED_DATA_PARTS,
+            "Suspiciously many ({}) broken parts to remove.",
+            suspicious_broken_parts);
+
+    if (suspicious_broken_parts_bytes > settings->max_suspicious_broken_parts_bytes && !skip_sanity_checks)
+        throw Exception(ErrorCodes::TOO_MANY_UNEXPECTED_DATA_PARTS,
+            "Suspiciously big size ({}) of all broken parts to remove.",
+            formatReadableSizeWithBinarySuffix(suspicious_broken_parts_bytes));
+}
+
+
+void MergeTreeData::loadDataPartsFromWAL(
+    DataPartsVector & /* broken_parts_to_detach */,
+    DataPartsVector & duplicate_parts_to_remove,
+    MutableDataPartsVector & parts_from_wal,
+    DataPartsLock & part_lock)
+{
+    for (auto & part : parts_from_wal)
+    {
+        if (getActiveContainingPart(part->info, DataPartState::Committed, part_lock))
+            continue;
+
+        part->modification_time = time(nullptr);
+        /// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
+        part->setState(DataPartState::Committed);
+
+        auto [it, inserted] = data_parts_indexes.insert(part);
+        if (!inserted)
+        {
+            if ((*it)->checksums.getTotalChecksumHex() == part->checksums.getTotalChecksumHex())
+            {
+                LOG_ERROR(log, "Remove duplicate part {}", part->getFullPath());
+                duplicate_parts_to_remove.push_back(part);
+            }
+            else
+                throw Exception("Part " + part->name + " already exists but with different checksums", ErrorCodes::DUPLICATE_DATA_PART);
+        }
+
+        addPartContributionToDataVolume(part);
+    }
+}
+
 
 void MergeTreeData::loadDataParts(bool skip_sanity_checks)
 {
@@ -866,7 +1159,6 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
     const auto settings = getSettings();
-    std::vector<std::pair<String, DiskPtr>> part_names_with_disks;
     MutableDataPartsVector parts_from_wal;
     Strings part_file_names;
 
@@ -877,6 +1169,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
     {
         /// Check extra parts at different disks, in order to not allow to miss data parts at undefined disks.
         std::unordered_set<String> defined_disk_names;
+
         for (const auto & disk_ptr : disks)
             defined_disk_names.insert(disk_ptr->getName());
 
@@ -886,168 +1179,99 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
             {
                 for (const auto it = disk->iterateDirectory(relative_data_path); it->isValid(); it->next())
                 {
-                    MergeTreePartInfo part_info;
-                    if (MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version))
-                        throw Exception("Part " + backQuote(it->name()) + " was found on disk " + backQuote(disk_name) + " which is not defined in the storage policy", ErrorCodes::UNKNOWN_DISK);
+                    if (MergeTreePartInfo::tryParsePartName(it->name(), format_version))
+                        throw Exception(ErrorCodes::UNKNOWN_DISK,
+                            "Part {} was found on disk {} which is not defined in the storage policy",
+                            backQuote(it->name()), backQuote(disk_name));
                 }
             }
         }
     }
 
-    /// Reversed order to load part from low priority disks firstly.
-    /// Used for keep part on low priority disk if duplication found
-    for (auto disk_it = disks.rbegin(); disk_it != disks.rend(); ++disk_it)
+    /// Collect part names by disk.
+    std::map<String, std::vector<std::pair<String, DiskPtr>>> disk_part_map;
+    std::map<String, MutableDataPartsVector> disk_wal_part_map;
+    ThreadPool pool(disks.size());
+    std::mutex wal_init_lock;
+    for (const auto & disk_ptr : disks)
     {
-        auto disk_ptr = *disk_it;
-        for (auto it = disk_ptr->iterateDirectory(relative_data_path); it->isValid(); it->next())
+        auto & disk_parts = disk_part_map[disk_ptr->getName()];
+        auto & disk_wal_parts = disk_wal_part_map[disk_ptr->getName()];
+
+        pool.scheduleOrThrowOnError([&, disk_ptr]()
         {
-            /// Skip temporary directories, file 'format_version.txt' and directory 'detached'.
-            if (startsWith(it->name(), "tmp") || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME || it->name() == MergeTreeData::DETACHED_DIR_NAME)
-                continue;
-
-            if (!startsWith(it->name(), MergeTreeWriteAheadLog::WAL_FILE_NAME))
-                part_names_with_disks.emplace_back(it->name(), disk_ptr);
-            else if (it->name() == MergeTreeWriteAheadLog::DEFAULT_WAL_FILE_NAME && settings->in_memory_parts_enable_wal)
+            for (auto it = disk_ptr->iterateDirectory(relative_data_path); it->isValid(); it->next())
             {
-                /// Create and correctly initialize global WAL object
-                write_ahead_log = std::make_shared<MergeTreeWriteAheadLog>(*this, disk_ptr, it->name());
-                for (auto && part : write_ahead_log->restore(metadata_snapshot, getContext()))
-                    parts_from_wal.push_back(std::move(part));
+                /// Skip temporary directories, file 'format_version.txt' and directory 'detached'.
+                if (startsWith(it->name(), "tmp") || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME
+                    || it->name() == MergeTreeData::DETACHED_DIR_NAME)
+                    continue;
+
+                if (!startsWith(it->name(), MergeTreeWriteAheadLog::WAL_FILE_NAME))
+                    disk_parts.emplace_back(std::make_pair(it->name(), disk_ptr));
+                else if (it->name() == MergeTreeWriteAheadLog::DEFAULT_WAL_FILE_NAME && settings->in_memory_parts_enable_wal)
+                {
+                    std::unique_lock lock(wal_init_lock);
+                    if (write_ahead_log != nullptr)
+                        throw Exception(
+                            "There are multiple WAL files appeared in current storage policy. You need to resolve this manually",
+                            ErrorCodes::CORRUPTED_DATA);
+
+                    write_ahead_log = std::make_shared<MergeTreeWriteAheadLog>(*this, disk_ptr, it->name());
+                    for (auto && part : write_ahead_log->restore(metadata_snapshot, getContext()))
+                        disk_wal_parts.push_back(std::move(part));
+                }
+                else if (settings->in_memory_parts_enable_wal)
+                {
+                    MergeTreeWriteAheadLog wal(*this, disk_ptr, it->name());
+                    for (auto && part : wal.restore(metadata_snapshot, getContext()))
+                        disk_wal_parts.push_back(std::move(part));
+                }
             }
-            else if (settings->in_memory_parts_enable_wal)
-            {
-                MergeTreeWriteAheadLog wal(*this, disk_ptr, it->name());
-                for (auto && part : wal.restore(metadata_snapshot, getContext()))
-                    parts_from_wal.push_back(std::move(part));
-            }
-        }
-    }
-
-    auto part_lock = lockParts();
-    data_parts_indexes.clear();
-
-    if (part_names_with_disks.empty() && parts_from_wal.empty())
-    {
-        LOG_DEBUG(log, "There are no data parts");
-        return;
-    }
-
-    /// Parallel loading of data parts.
-    size_t num_threads = std::min(size_t(settings->max_part_loading_threads), part_names_with_disks.size());
-
-    std::mutex mutex;
-
-    DataPartsVector broken_parts_to_detach;
-    size_t suspicious_broken_parts = 0;
-
-    std::atomic<bool> has_adaptive_parts = false;
-    std::atomic<bool> has_non_adaptive_parts = false;
-
-    ThreadPool pool(num_threads);
-
-    for (auto & part_names_with_disk : part_names_with_disks)
-    {
-        pool.scheduleOrThrowOnError([&]
-        {
-            const auto & part_name = part_names_with_disk.first;
-            const auto part_disk_ptr = part_names_with_disk.second;
-
-            MergeTreePartInfo part_info;
-            if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-                return;
-
-            auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, part_disk_ptr, 0);
-            auto part = createPart(part_name, part_info, single_disk_volume, part_name);
-            bool broken = false;
-
-            String part_path = fs::path(relative_data_path) / part_name;
-            String marker_path = fs::path(part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME;
-            if (part_disk_ptr->exists(marker_path))
-            {
-                LOG_WARNING(log, "Detaching stale part {}{}, which should have been deleted after a move. That can only happen after unclean restart of ClickHouse after move of a part having an operation blocking that stale copy of part.", getFullPathOnDisk(part_disk_ptr), part_name);
-                std::lock_guard loading_lock(mutex);
-                broken_parts_to_detach.push_back(part);
-                ++suspicious_broken_parts;
-                return;
-            }
-
-            try
-            {
-                part->loadColumnsChecksumsIndexes(require_part_metadata, true);
-            }
-            catch (const Exception & e)
-            {
-                /// Don't count the part as broken if there is not enough memory to load it.
-                /// In fact, there can be many similar situations.
-                /// But it is OK, because there is a safety guard against deleting too many parts.
-                if (isNotEnoughMemoryErrorCode(e.code()))
-                    throw;
-
-                broken = true;
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-            catch (...)
-            {
-                broken = true;
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-
-            /// Ignore broken parts that can appear as a result of hard server restart.
-            if (broken)
-            {
-                LOG_ERROR(log, "Detaching broken part {}{}. If it happened after update, it is likely because of backward incompability. You need to resolve this manually", getFullPathOnDisk(part_disk_ptr), part_name);
-                std::lock_guard loading_lock(mutex);
-                broken_parts_to_detach.push_back(part);
-                ++suspicious_broken_parts;
-
-                return;
-            }
-            if (!part->index_granularity_info.is_adaptive)
-                has_non_adaptive_parts.store(true, std::memory_order_relaxed);
-            else
-                has_adaptive_parts.store(true, std::memory_order_relaxed);
-
-            part->modification_time = part_disk_ptr->getLastModified(fs::path(relative_data_path) / part_name).epochTime();
-            /// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
-            part->setState(DataPartState::Committed);
-
-            std::lock_guard loading_lock(mutex);
-            if (!data_parts_indexes.insert(part).second)
-                throw Exception("Part " + part->name + " already exists", ErrorCodes::DUPLICATE_DATA_PART);
-
-            addPartContributionToDataVolume(part);
         });
     }
 
     pool.wait();
 
-    for (auto & part : parts_from_wal)
+    for (auto & [_, disk_wal_parts] : disk_wal_part_map)
+        parts_from_wal.insert(
+            parts_from_wal.end(), std::make_move_iterator(disk_wal_parts.begin()), std::make_move_iterator(disk_wal_parts.end()));
+
+    size_t num_parts = 0;
+    std::queue<std::vector<std::pair<String, DiskPtr>>> parts_queue;
+    for (auto & [_, disk_parts] : disk_part_map)
     {
-        if (getActiveContainingPart(part->info, DataPartState::Committed, part_lock))
+        if (disk_parts.empty())
             continue;
-
-        part->modification_time = time(nullptr);
-        /// Assume that all parts are Committed, covered parts will be detected and marked as Outdated later
-        part->setState(DataPartState::Committed);
-
-        if (!data_parts_indexes.insert(part).second)
-            throw Exception("Part " + part->name + " already exists", ErrorCodes::DUPLICATE_DATA_PART);
-
-        addPartContributionToDataVolume(part);
+        num_parts += disk_parts.size();
+        parts_queue.push(std::move(disk_parts));
     }
 
-    if (has_non_adaptive_parts && has_adaptive_parts && !settings->enable_mixed_granularity_parts)
-        throw Exception("Table contains parts with adaptive and non adaptive marks, but `setting enable_mixed_granularity_parts` is disabled", ErrorCodes::LOGICAL_ERROR);
+    auto part_lock = lockParts();
+    data_parts_indexes.clear();
 
-    has_non_adaptive_index_granularity_parts = has_non_adaptive_parts;
+    if (num_parts == 0 && parts_from_wal.empty())
+    {
+        LOG_DEBUG(log, "There are no data parts");
+        return;
+    }
 
-    if (suspicious_broken_parts > settings->max_suspicious_broken_parts && !skip_sanity_checks)
-        throw Exception("Suspiciously many (" + toString(suspicious_broken_parts) + ") broken parts to remove.",
-            ErrorCodes::TOO_MANY_UNEXPECTED_DATA_PARTS);
+
+    DataPartsVector broken_parts_to_detach;
+    DataPartsVector duplicate_parts_to_remove;
+
+    if (num_parts > 0)
+        loadDataPartsFromDisk(
+            broken_parts_to_detach, duplicate_parts_to_remove, pool, num_parts, parts_queue, skip_sanity_checks, settings);
+
+    if (!parts_from_wal.empty())
+        loadDataPartsFromWAL(broken_parts_to_detach, duplicate_parts_to_remove, parts_from_wal, part_lock);
 
     for (auto & part : broken_parts_to_detach)
         part->renameToDetached("broken-on-start"); /// detached parts must not have '_' in prefixes
 
+    for (auto & part : duplicate_parts_to_remove)
+        part->remove();
 
     /// Delete from the set of current parts those parts that are covered by another part (those parts that
     /// were merged), but that for some reason are still not deleted from the filesystem.
@@ -1098,7 +1322,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
         }
     }
 
-    calculateColumnSizesImpl();
+    calculateColumnAndSecondaryIndexSizesImpl();
 
 
     LOG_DEBUG(log, "Loaded data parts ({} items)", data_parts_indexes.size());
@@ -1121,7 +1345,7 @@ static bool isOldPartDirectory(const DiskPtr & disk, const String & directory_pa
 }
 
 
-void MergeTreeData::clearOldTemporaryDirectories(size_t custom_directories_lifetime_seconds)
+void MergeTreeData::clearOldTemporaryDirectories(const MergeTreeDataMergerMutator & merger_mutator, size_t custom_directories_lifetime_seconds)
 {
     /// If the method is already called from another thread, then we don't need to do anything.
     std::unique_lock lock(clear_old_temporary_directories_mutex, std::defer_lock);
@@ -1137,35 +1361,44 @@ void MergeTreeData::clearOldTemporaryDirectories(size_t custom_directories_lifet
     {
         for (auto it = disk->iterateDirectory(path); it->isValid(); it->next())
         {
-            if (startsWith(it->name(), "tmp_"))
+            const std::string & basename = it->name();
+            if (!startsWith(basename, "tmp_"))
             {
-                try
+                continue;
+            }
+            const std::string & full_path = fullPath(disk, it->path());
+            if (merger_mutator.hasTemporaryPart(basename))
+            {
+                LOG_WARNING(log, "{} is an active destination for one of merge/mutation (consider increasing temporary_directories_lifetime setting)", full_path);
+                continue;
+            }
+
+            try
+            {
+                if (disk->isDirectory(it->path()) && isOldPartDirectory(disk, it->path(), deadline))
                 {
-                    if (disk->isDirectory(it->path()) && isOldPartDirectory(disk, it->path(), deadline))
-                    {
-                        LOG_WARNING(log, "Removing temporary directory {}", fullPath(disk, it->path()));
-                        disk->removeRecursive(it->path());
-                    }
+                    LOG_WARNING(log, "Removing temporary directory {}", full_path);
+                    disk->removeRecursive(it->path());
                 }
-                /// see getModificationTime()
-                catch (const ErrnoException & e)
+            }
+            /// see getModificationTime()
+            catch (const ErrnoException & e)
+            {
+                if (e.getErrno() == ENOENT)
                 {
-                    if (e.getErrno() == ENOENT)
-                    {
-                        /// If the file is already deleted, do nothing.
-                    }
-                    else
-                        throw;
+                    /// If the file is already deleted, do nothing.
                 }
-                catch (const fs::filesystem_error & e)
+                else
+                    throw;
+            }
+            catch (const fs::filesystem_error & e)
+            {
+                if (e.code() == std::errc::no_such_file_or_directory)
                 {
-                    if (e.code() == std::errc::no_such_file_or_directory)
-                    {
-                        /// If the file is already deleted, do nothing.
-                    }
-                    else
-                        throw;
+                    /// If the file is already deleted, do nothing.
                 }
+                else
+                    throw;
             }
         }
     }
@@ -1237,6 +1470,10 @@ void MergeTreeData::removePartsFinally(const MergeTreeData::DataPartsVector & pa
         /// TODO: use data_parts iterators instead of pointers
         for (const auto & part : parts)
         {
+            /// Temporary does not present in data_parts_by_info.
+            if (part->getState() == DataPartState::Temporary)
+                continue;
+
             auto it = data_parts_by_info.find(part->info);
             if (it == data_parts_by_info.end())
                 throw Exception("Deleting data part " + part->name + " doesn't exist", ErrorCodes::LOGICAL_ERROR);
@@ -1974,7 +2211,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(
 
 void MergeTreeData::changeSettings(
         const ASTPtr & new_settings,
-        TableLockHolder & /* table_lock_holder */)
+        AlterLockHolder & /* table_lock_holder */)
 {
     if (new_settings)
     {
@@ -2279,7 +2516,7 @@ bool MergeTreeData::renameTempPartAndReplace(
         {
             covered_part->remove_time.store(current_time, std::memory_order_relaxed);
             modifyPartState(covered_part, DataPartState::Outdated);
-            removePartContributionToColumnSizes(covered_part);
+            removePartContributionToColumnAndSecondaryIndexSizes(covered_part);
             reduce_bytes += covered_part->getBytesOnDisk();
             reduce_rows += covered_part->rows_count;
             ++reduce_parts;
@@ -2288,7 +2525,7 @@ bool MergeTreeData::renameTempPartAndReplace(
         decreaseDataVolume(reduce_bytes, reduce_rows, reduce_parts);
 
         modifyPartState(part_it, DataPartState::Committed);
-        addPartContributionToColumnSizes(part);
+        addPartContributionToColumnAndSecondaryIndexSizes(part);
         addPartContributionToDataVolume(part);
     }
 
@@ -2331,7 +2568,7 @@ void MergeTreeData::removePartsFromWorkingSet(const MergeTreeData::DataPartsVect
     {
         if (part->getState() == IMergeTreeDataPart::State::Committed)
         {
-            removePartContributionToColumnSizes(part);
+            removePartContributionToColumnAndSecondaryIndexSizes(part);
             removePartContributionToDataVolume(part);
         }
 
@@ -2395,7 +2632,7 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(c
         /// It's a DROP PART and it's already executed by fetching some covering part
         bool is_drop_part = !drop_range.isFakeDropRangePart() && drop_range.min_block;
 
-        if (is_drop_part && (part->info.min_block != drop_range.min_block || part->info.max_block != drop_range.max_block || part->info.getDataVersion() != drop_range.getDataVersion()))
+        if (is_drop_part && (part->info.min_block != drop_range.min_block || part->info.max_block != drop_range.max_block || part->info.getMutationVersion() != drop_range.getMutationVersion()))
         {
             /// Why we check only min and max blocks here without checking merge
             /// level? It's a tricky situation which can happen on a stale
@@ -2412,7 +2649,7 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(c
             /// So here we just check that all_1_3_1 covers blocks from drop
             /// all_2_2_2.
             ///
-            bool is_covered_by_min_max_block = part->info.min_block <= drop_range.min_block && part->info.max_block >= drop_range.max_block && part->info.getDataVersion() >= drop_range.getDataVersion();
+            bool is_covered_by_min_max_block = part->info.min_block <= drop_range.min_block && part->info.max_block >= drop_range.max_block && part->info.getMutationVersion() >= drop_range.getMutationVersion();
             if (is_covered_by_min_max_block)
             {
                 LOG_INFO(log, "Skipping drop range for part {} because covering part {} already exists", drop_range.getPartName(), part->name);
@@ -2455,7 +2692,10 @@ MergeTreeData::DataPartsVector MergeTreeData::removePartsInRangeFromWorkingSet(c
 void MergeTreeData::forgetPartAndMoveToDetached(const MergeTreeData::DataPartPtr & part_to_detach, const String & prefix, bool
 restore_covered)
 {
-    LOG_INFO(log, "Renaming {} to {}{} and forgetting it.", part_to_detach->relative_path, prefix, part_to_detach->name);
+    if (prefix.empty())
+        LOG_INFO(log, "Renaming {} to {} and forgetting it.", part_to_detach->relative_path, part_to_detach->name);
+    else
+        LOG_INFO(log, "Renaming {} to {}_{} and forgetting it.", part_to_detach->relative_path, prefix, part_to_detach->name);
 
     auto lock = lockParts();
 
@@ -2469,7 +2709,7 @@ restore_covered)
     if (part->getState() == DataPartState::Committed)
     {
         removePartContributionToDataVolume(part);
-        removePartContributionToColumnSizes(part);
+        removePartContributionToColumnAndSecondaryIndexSizes(part);
     }
     modifyPartState(it_part, DataPartState::Deleting);
 
@@ -2517,7 +2757,7 @@ restore_covered)
 
                 if ((*it)->getState() != DataPartState::Committed)
                 {
-                    addPartContributionToColumnSizes(*it);
+                    addPartContributionToColumnAndSecondaryIndexSizes(*it);
                     addPartContributionToDataVolume(*it);
                     modifyPartState(it, DataPartState::Committed); // iterator is not invalidated here
                 }
@@ -2548,7 +2788,7 @@ restore_covered)
 
             if ((*it)->getState() != DataPartState::Committed)
             {
-                addPartContributionToColumnSizes(*it);
+                addPartContributionToColumnAndSecondaryIndexSizes(*it);
                 addPartContributionToDataVolume(*it);
                 modifyPartState(it, DataPartState::Committed);
             }
@@ -2581,17 +2821,25 @@ void MergeTreeData::tryRemovePartImmediately(DataPartPtr && part)
 
         LOG_TRACE(log, "Trying to immediately remove part {}", part->getNameWithState());
 
-        auto it = data_parts_by_info.find(part->info);
-        if (it == data_parts_by_info.end() || (*it).get() != part.get())
-            throw Exception("Part " + part->name + " doesn't exist", ErrorCodes::LOGICAL_ERROR);
+        if (part->getState() != DataPartState::Temporary)
+        {
+            auto it = data_parts_by_info.find(part->info);
+            if (it == data_parts_by_info.end() || (*it).get() != part.get())
+                throw Exception("Part " + part->name + " doesn't exist", ErrorCodes::LOGICAL_ERROR);
 
-        part.reset();
+            part.reset();
 
-        if (!((*it)->getState() == DataPartState::Outdated && it->unique()))
-            return;
+            if (!((*it)->getState() == DataPartState::Outdated && it->unique()))
+                return;
 
-        modifyPartState(it, DataPartState::Deleting);
-        part_to_delete = *it;
+            modifyPartState(it, DataPartState::Deleting);
+
+            part_to_delete = *it;
+        }
+        else
+        {
+            part_to_delete = std::move(part);
+        }
     }
 
     try
@@ -2836,7 +3084,7 @@ MergeTreeData::DataPartPtr MergeTreeData::getActiveContainingPart(const String &
     return getActiveContainingPart(part_info);
 }
 
-MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVectorInPartition(MergeTreeData::DataPartState state, const String & partition_id)
+MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVectorInPartition(MergeTreeData::DataPartState state, const String & partition_id) const
 {
     DataPartStateAndPartitionID state_with_partition{state, partition_id};
 
@@ -2846,6 +3094,22 @@ MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVectorInPartition(Merg
         data_parts_by_state_and_info.upper_bound(state_with_partition));
 }
 
+MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVectorInPartitions(MergeTreeData::DataPartState state, const std::unordered_set<String> & partition_ids) const
+{
+    auto lock = lockParts();
+    DataPartsVector res;
+    for (const auto & partition_id : partition_ids)
+    {
+        DataPartStateAndPartitionID state_with_partition{state, partition_id};
+        insertAtEnd(
+            res,
+            DataPartsVector(
+                data_parts_by_state_and_info.lower_bound(state_with_partition),
+                data_parts_by_state_and_info.upper_bound(state_with_partition)));
+    }
+    return res;
+}
+
 MergeTreeData::DataPartPtr MergeTreeData::getPartIfExists(const MergeTreePartInfo & part_info, const MergeTreeData::DataPartStates & valid_states)
 {
     auto lock = lockParts();
@@ -2876,17 +3140,17 @@ static void loadPartAndFixMetadataImpl(MergeTreeData::MutableDataPartPtr part)
     part->modification_time = disk->getLastModified(full_part_path).epochTime();
 }
 
-void MergeTreeData::calculateColumnSizesImpl()
+void MergeTreeData::calculateColumnAndSecondaryIndexSizesImpl()
 {
     column_sizes.clear();
 
     /// Take into account only committed parts
     auto committed_parts_range = getDataPartsStateRange(DataPartState::Committed);
     for (const auto & part : committed_parts_range)
-        addPartContributionToColumnSizes(part);
+        addPartContributionToColumnAndSecondaryIndexSizes(part);
 }
 
-void MergeTreeData::addPartContributionToColumnSizes(const DataPartPtr & part)
+void MergeTreeData::addPartContributionToColumnAndSecondaryIndexSizes(const DataPartPtr & part)
 {
     for (const auto & column : part->getColumns())
     {
@@ -2894,9 +3158,17 @@ void MergeTreeData::addPartContributionToColumnSizes(const DataPartPtr & part)
         ColumnSize part_column_size = part->getColumnSize(column.name, *column.type);
         total_column_size.add(part_column_size);
     }
+
+    auto indexes_descriptions = getInMemoryMetadataPtr()->secondary_indices;
+    for (const auto & index : indexes_descriptions)
+    {
+        IndexSize & total_secondary_index_size = secondary_index_sizes[index.name];
+        IndexSize part_index_size = part->getSecondaryIndexSize(index.name);
+        total_secondary_index_size.add(part_index_size);
+    }
 }
 
-void MergeTreeData::removePartContributionToColumnSizes(const DataPartPtr & part)
+void MergeTreeData::removePartContributionToColumnAndSecondaryIndexSizes(const DataPartPtr & part)
 {
     for (const auto & column : part->getColumns())
     {
@@ -2916,6 +3188,26 @@ void MergeTreeData::removePartContributionToColumnSizes(const DataPartPtr & part
         log_subtract(total_column_size.data_uncompressed, part_column_size.data_uncompressed, ".data_uncompressed");
         log_subtract(total_column_size.marks, part_column_size.marks, ".marks");
     }
+
+    auto indexes_descriptions = getInMemoryMetadataPtr()->secondary_indices;
+    for (const auto & index : indexes_descriptions)
+    {
+        IndexSize & total_secondary_index_size = secondary_index_sizes[index.name];
+        IndexSize part_secondary_index_size = part->getSecondaryIndexSize(index.name);
+
+        auto log_subtract = [&](size_t & from, size_t value, const char * field)
+        {
+            if (value > from)
+                LOG_ERROR(log, "Possibly incorrect index size subtraction: {} - {} = {}, index: {}, field: {}",
+                    from, value, from - value, index.name, field);
+
+            from -= value;
+        };
+
+        log_subtract(total_secondary_index_size.data_compressed, part_secondary_index_size.data_compressed, ".data_compressed");
+        log_subtract(total_secondary_index_size.data_uncompressed, part_secondary_index_size.data_uncompressed, ".data_uncompressed");
+        log_subtract(total_secondary_index_size.marks, part_secondary_index_size.marks, ".marks");
+    }
 }
 
 void MergeTreeData::checkAlterPartitionIsPossible(
@@ -3207,14 +3499,129 @@ Pipe MergeTreeData::alterPartition(
     return {};
 }
 
+
+BackupEntries MergeTreeData::backup(const ASTs & partitions, ContextPtr local_context) const
+{
+    DataPartsVector data_parts;
+    if (partitions.empty())
+        data_parts = getDataPartsVector();
+    else
+        data_parts = getDataPartsVectorInPartitions(MergeTreeDataPartState::Committed, getPartitionIDsFromQuery(partitions, local_context));
+    return backupDataParts(data_parts);
+}
+
+
+BackupEntries MergeTreeData::backupDataParts(const DataPartsVector & data_parts)
+{
+    BackupEntries backup_entries;
+    std::map<DiskPtr, std::shared_ptr<TemporaryFileOnDisk>> temp_dirs;
+
+    for (const auto & part : data_parts)
+    {
+        auto disk = part->volume->getDisk();
+
+        auto temp_dir_it = temp_dirs.find(disk);
+        if (temp_dir_it == temp_dirs.end())
+            temp_dir_it = temp_dirs.emplace(disk, std::make_shared<TemporaryFileOnDisk>(disk, "tmp_backup_")).first;
+        auto temp_dir_owner = temp_dir_it->second;
+        fs::path temp_dir = temp_dir_owner->getPath();
+
+        fs::path part_dir = part->getFullRelativePath();
+        fs::path temp_part_dir = temp_dir / part->relative_path;
+        disk->createDirectories(temp_part_dir);
+
+        for (const auto & [filepath, checksum] : part->checksums.files)
+        {
+            String relative_filepath = fs::path(part->relative_path) / filepath;
+            String hardlink_filepath = temp_part_dir / filepath;
+            disk->createHardLink(part_dir / filepath, hardlink_filepath);
+            UInt128 file_hash{checksum.file_hash.first, checksum.file_hash.second};
+            backup_entries.emplace_back(
+                relative_filepath,
+                std::make_unique<BackupEntryFromImmutableFile>(disk, hardlink_filepath, checksum.file_size, file_hash, temp_dir_owner));
+        }
+
+        for (const auto & filepath : part->getFileNamesWithoutChecksums())
+        {
+            String relative_filepath = fs::path(part->relative_path) / filepath;
+            backup_entries.emplace_back(relative_filepath, std::make_unique<BackupEntryFromSmallFile>(disk, part_dir / filepath));
+        }
+    }
+
+    return backup_entries;
+}
+
+
+RestoreDataTasks MergeTreeData::restoreDataPartsFromBackup(const BackupPtr & backup, const String & data_path_in_backup,
+                                                           const std::unordered_set<String> & partition_ids,
+                                                           SimpleIncrement * increment)
+{
+    RestoreDataTasks restore_tasks;
+
+    Strings part_names = backup->list(data_path_in_backup);
+    for (const String & part_name : part_names)
+    {
+        const auto part_info = MergeTreePartInfo::tryParsePartName(part_name, format_version);
+
+        if (!part_info)
+            continue;
+
+        if (!partition_ids.empty() && !partition_ids.contains(part_info->partition_id))
+            continue;
+
+        UInt64 total_size_of_part = 0;
+        Strings filenames = backup->list(data_path_in_backup + part_name + "/", "");
+        for (const String & filename : filenames)
+            total_size_of_part += backup->getSize(data_path_in_backup + part_name + "/" + filename);
+
+        std::shared_ptr<IReservation> reservation = getStoragePolicy()->reserveAndCheck(total_size_of_part);
+
+        auto restore_task = [this,
+                             backup,
+                             data_path_in_backup,
+                             part_name,
+                             part_info = std::move(part_info),
+                             filenames = std::move(filenames),
+                             reservation,
+                             increment]()
+        {
+            auto disk = reservation->getDisk();
+
+            auto temp_part_dir_owner = std::make_shared<TemporaryFileOnDisk>(disk, relative_data_path + "restoring_" + part_name + "_");
+            String temp_part_dir = temp_part_dir_owner->getPath();
+            disk->createDirectories(temp_part_dir);
+
+            assert(temp_part_dir.starts_with(relative_data_path));
+            String relative_temp_part_dir = temp_part_dir.substr(relative_data_path.size());
+
+            for (const String & filename : filenames)
+            {
+                auto backup_entry = backup->read(data_path_in_backup + part_name + "/" + filename);
+                auto read_buffer = backup_entry->getReadBuffer();
+                auto write_buffer = disk->writeFile(temp_part_dir + "/" + filename);
+                copyData(*read_buffer, *write_buffer);
+            }
+
+            auto single_disk_volume = std::make_shared<SingleDiskVolume>(disk->getName(), disk, 0);
+            auto part = createPart(part_name, *part_info, single_disk_volume, relative_temp_part_dir);
+            part->loadColumnsChecksumsIndexes(false, true);
+            renameTempPartAndAdd(part, increment);
+        };
+
+        restore_tasks.emplace_back(std::move(restore_task));
+    }
+
+    return restore_tasks;
+}
+
+
 String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr local_context) const
 {
     const auto & partition_ast = ast->as<ASTPartition &>();
 
     if (!partition_ast.value)
     {
-        if (!MergeTreePartInfo::validatePartitionID(partition_ast.id, format_version))
-            throw Exception("Invalid partition format: " + partition_ast.id, ErrorCodes::INVALID_PARTITION_VALUE);
+        MergeTreePartInfo::validatePartitionID(partition_ast.id, format_version);
         return partition_ast.id;
     }
 
@@ -3225,10 +3632,7 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
         if (partition_lit && partition_lit->value.getType() == Field::Types::String)
         {
             String partition_id = partition_lit->value.get<String>();
-            if (partition_id.size() != 6 || !std::all_of(partition_id.begin(), partition_id.end(), isNumericASCII))
-                throw Exception(
-                    "Invalid partition format: " + partition_id + ". Partition should consist of 6 digits: YYYYMM",
-                    ErrorCodes::INVALID_PARTITION_VALUE);
+            MergeTreePartInfo::validatePartitionID(partition_id, format_version);
             return partition_id;
         }
     }
@@ -3243,25 +3647,42 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
             ", must be: " + toString(fields_count),
             ErrorCodes::INVALID_PARTITION_VALUE);
 
+    if (auto * f = partition_ast.value->as<ASTFunction>())
+    {
+        assert(f->name == "tuple");
+        if (f->arguments && !f->arguments->as<ASTExpressionList>()->children.empty())
+        {
+            ASTPtr query = partition_ast.value->clone();
+            auto syntax_analyzer_result
+                = TreeRewriter(local_context)
+                      .analyze(query, metadata_snapshot->getPartitionKey().sample_block.getNamesAndTypesList(), {}, {}, false, false);
+            auto actions = ExpressionAnalyzer(query, syntax_analyzer_result, local_context).getActions(true);
+            if (actions->hasArrayJoin())
+                throw Exception("The partition expression cannot contain array joins", ErrorCodes::INVALID_PARTITION_VALUE);
+        }
+    }
+
     const FormatSettings format_settings;
     Row partition_row(fields_count);
 
     if (fields_count)
     {
-        ReadBufferFromMemory left_paren_buf("(", 1);
-        ReadBufferFromMemory fields_buf(partition_ast.fields_str.data(), partition_ast.fields_str.size());
-        ReadBufferFromMemory right_paren_buf(")", 1);
-        ConcatReadBuffer buf({&left_paren_buf, &fields_buf, &right_paren_buf});
+        ConcatReadBuffer buf;
+        buf.appendBuffer(std::make_unique<ReadBufferFromMemory>("(", 1));
+        buf.appendBuffer(std::make_unique<ReadBufferFromMemory>(partition_ast.fields_str.data(), partition_ast.fields_str.size()));
+        buf.appendBuffer(std::make_unique<ReadBufferFromMemory>(")", 1));
 
-        auto input_format = FormatFactory::instance().getInput(
+        auto input_format = local_context->getInputFormat(
             "Values",
             buf,
             metadata_snapshot->getPartitionKey().sample_block,
-            local_context,
             local_context->getSettingsRef().max_block_size);
-        auto input_stream = std::make_shared<InputStreamFromInputFormat>(input_format);
+        QueryPipeline pipeline(std::move(input_format));
+        PullingPipelineExecutor executor(pipeline);
+
+        Block block;
+        executor.pull(block);
 
-        auto block = input_stream->read();
         if (!block || !block.rows())
             throw Exception(
                 "Could not parse partition value: `" + partition_ast.fields_str + "`",
@@ -3291,6 +3712,15 @@ String MergeTreeData::getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr loc
     return partition_id;
 }
 
+std::unordered_set<String> MergeTreeData::getPartitionIDsFromQuery(const ASTs & asts, ContextPtr local_context) const
+{
+    std::unordered_set<String> partition_ids;
+    for (const auto & ast : asts)
+        partition_ids.emplace(getPartitionIDFromQuery(ast, local_context));
+    return partition_ids;
+}
+
+
 MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector(
     const DataPartStates & affordable_states, DataPartStateVector * out_states, bool require_projection_parts) const
 {
@@ -3307,7 +3737,7 @@ MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector(
             {
                 for (const auto & part : range)
                 {
-                    for (const auto & [p_name, projection_part] : part->getProjectionParts())
+                    for (const auto & [_, projection_part] : part->getProjectionParts())
                         res.push_back(projection_part);
                 }
             }
@@ -3387,11 +3817,10 @@ std::vector<DetachedPartInfo> MergeTreeData::getDetachedParts() const
         {
             for (auto it = disk->iterateDirectory(detached_path); it->isValid(); it->next())
             {
-                res.emplace_back();
-                auto & part = res.back();
-
-                DetachedPartInfo::tryParseDetachedPartName(it->name(), part, format_version);
+                auto part = DetachedPartInfo::parseDetachedPartName(it->name(), format_version);
                 part.disk = disk->getName();
+
+                res.push_back(std::move(part));
             }
         }
     }
@@ -3462,7 +3891,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
         validateDetachedPartName(part_id);
         renamed_parts.addPart(part_id, "attaching_" + part_id);
 
-        if (MergeTreePartInfo::tryParsePartName(part_id, nullptr, format_version))
+        if (MergeTreePartInfo::tryParsePartName(part_id, format_version))
             name_to_disk[part_id] = getDiskForPart(part_id, source_dir);
     }
     else
@@ -3478,12 +3907,11 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
             for (auto it = disk->iterateDirectory(relative_data_path + source_dir); it->isValid(); it->next())
             {
                 const String & name = it->name();
-                MergeTreePartInfo part_info;
 
                 // TODO what if name contains "_tryN" suffix?
                 /// Parts with prefix in name (e.g. attaching_1_3_3_0, deleting_1_3_3_0) will be ignored
-                if (!MergeTreePartInfo::tryParsePartName(name, &part_info, format_version)
-                    || part_info.partition_id != partition_id)
+                if (auto part_opt = MergeTreePartInfo::tryParsePartName(name, format_version);
+                    !part_opt || part_opt->partition_id != partition_id)
                 {
                     continue;
                 }
@@ -3812,7 +4240,7 @@ MergeTreeData::DataPartsVector MergeTreeData::Transaction::commit(MergeTreeData:
                     reduce_rows += covered_part->rows_count;
 
                     data.modifyPartState(covered_part, DataPartState::Outdated);
-                    data.removePartContributionToColumnSizes(covered_part);
+                    data.removePartContributionToColumnAndSecondaryIndexSizes(covered_part);
                 }
                 reduce_parts += covered_parts.size();
 
@@ -3821,7 +4249,7 @@ MergeTreeData::DataPartsVector MergeTreeData::Transaction::commit(MergeTreeData:
                 ++add_parts;
 
                 data.modifyPartState(part, DataPartState::Committed);
-                data.addPartContributionToColumnSizes(part);
+                data.addPartContributionToColumnAndSecondaryIndexSizes(part);
             }
         }
         data.decreaseDataVolume(reduce_bytes, reduce_rows, reduce_parts);
@@ -3931,7 +4359,7 @@ static void selectBestProjection(
     if (projection_parts.empty())
         return;
 
-    auto sum_marks = reader.estimateNumMarksToRead(
+    auto projection_result_ptr = reader.estimateNumMarksToRead(
         projection_parts,
         candidate.required_columns,
         metadata_snapshot,
@@ -3941,6 +4369,10 @@ static void selectBestProjection(
         settings.max_threads,
         max_added_blocks);
 
+    if (projection_result_ptr->error())
+        return;
+
+    auto sum_marks = projection_result_ptr->marks();
     if (normal_parts.empty())
     {
         // All parts are projection parts which allows us to use in_order_optimization.
@@ -3949,7 +4381,7 @@ static void selectBestProjection(
     }
     else
     {
-        sum_marks += reader.estimateNumMarksToRead(
+        auto normal_result_ptr = reader.estimateNumMarksToRead(
             normal_parts,
             required_columns,
             metadata_snapshot,
@@ -3958,7 +4390,14 @@ static void selectBestProjection(
             query_context,
             settings.max_threads,
             max_added_blocks);
+
+        if (normal_result_ptr->error())
+            return;
+
+        sum_marks += normal_result_ptr->marks();
+        candidate.merge_tree_normal_select_result_ptr = normal_result_ptr;
     }
+    candidate.merge_tree_projection_select_result_ptr = projection_result_ptr;
 
     // We choose the projection with least sum_marks to read.
     if (sum_marks < min_sum_marks)
@@ -3969,6 +4408,125 @@ static void selectBestProjection(
 }
 
 
+Block MergeTreeData::getMinMaxCountProjectionBlock(
+    const StorageMetadataPtr & metadata_snapshot,
+    const Names & required_columns,
+    const SelectQueryInfo & query_info,
+    const DataPartsVector & parts,
+    DataPartsVector & normal_parts,
+    ContextPtr query_context) const
+{
+    if (!metadata_snapshot->minmax_count_projection)
+        throw Exception(
+            "Cannot find the definition of minmax_count projection but it's used in current query. It's a bug",
+            ErrorCodes::LOGICAL_ERROR);
+
+    auto block = metadata_snapshot->minmax_count_projection->sample_block.cloneEmpty();
+    bool need_primary_key_max_column = false;
+    const auto & primary_key_max_column_name = metadata_snapshot->minmax_count_projection->primary_key_max_column_name;
+    if (!primary_key_max_column_name.empty())
+    {
+        need_primary_key_max_column = std::any_of(
+            required_columns.begin(), required_columns.end(), [&](const auto & name) { return primary_key_max_column_name == name; });
+    }
+
+    auto minmax_count_columns = block.mutateColumns();
+    auto insert = [](ColumnAggregateFunction & column, const Field & value)
+    {
+        auto func = column.getAggregateFunction();
+        Arena & arena = column.createOrGetArena();
+        size_t size_of_state = func->sizeOfData();
+        size_t align_of_state = func->alignOfData();
+        auto * place = arena.alignedAlloc(size_of_state, align_of_state);
+        func->create(place);
+        auto value_column = func->getReturnType()->createColumnConst(1, value)->convertToFullColumnIfConst();
+        const auto * value_column_ptr = value_column.get();
+        func->add(place, &value_column_ptr, 0, &arena);
+        column.insertFrom(place);
+    };
+
+    ASTPtr expression_ast;
+    Block virtual_columns_block = getBlockWithVirtualPartColumns(parts, false /* one_part */, true /* ignore_empty */);
+    if (virtual_columns_block.rows() == 0)
+        return {};
+
+    // Generate valid expressions for filtering
+    VirtualColumnUtils::prepareFilterBlockWithQuery(query_info.query, query_context, virtual_columns_block, expression_ast);
+    if (expression_ast)
+        VirtualColumnUtils::filterBlockWithQuery(query_info.query, virtual_columns_block, query_context, expression_ast);
+
+    size_t rows = virtual_columns_block.rows();
+    const ColumnString & part_name_column = typeid_cast<const ColumnString &>(*virtual_columns_block.getByName("_part").column);
+    size_t part_idx = 0;
+    for (size_t row = 0; row < rows; ++row)
+    {
+        while (parts[part_idx]->name != part_name_column.getDataAt(row))
+            ++part_idx;
+
+        const auto & part = parts[part_idx];
+
+        if (!part->minmax_idx->initialized)
+            throw Exception("Found a non-empty part with uninitialized minmax_idx. It's a bug", ErrorCodes::LOGICAL_ERROR);
+
+        if (need_primary_key_max_column && !part->index_granularity.hasFinalMark())
+        {
+            normal_parts.push_back(part);
+            continue;
+        }
+
+        size_t pos = 0;
+        size_t minmax_idx_size = part->minmax_idx->hyperrectangle.size();
+        for (size_t i = 0; i < minmax_idx_size; ++i)
+        {
+            auto & min_column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns[pos++]);
+            auto & max_column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns[pos++]);
+            const auto & range = part->minmax_idx->hyperrectangle[i];
+            insert(min_column, range.left);
+            insert(max_column, range.right);
+        }
+
+        if (!primary_key_max_column_name.empty())
+        {
+            const auto & primary_key_column = *part->index[0];
+            auto primary_key_column_size = primary_key_column.size();
+            auto & min_column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns[pos++]);
+            auto & max_column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns[pos++]);
+            insert(min_column, primary_key_column[0]);
+            insert(max_column, primary_key_column[primary_key_column_size - 1]);
+        }
+
+        {
+            auto & column = assert_cast<ColumnAggregateFunction &>(*minmax_count_columns.back());
+            auto func = column.getAggregateFunction();
+            Arena & arena = column.createOrGetArena();
+            size_t size_of_state = func->sizeOfData();
+            size_t align_of_state = func->alignOfData();
+            auto * place = arena.alignedAlloc(size_of_state, align_of_state);
+            func->create(place);
+            const AggregateFunctionCount & agg_count = assert_cast<const AggregateFunctionCount &>(*func);
+            agg_count.set(place, part->rows_count);
+            column.insertFrom(place);
+        }
+    }
+    block.setColumns(std::move(minmax_count_columns));
+
+    Block res;
+    for (const auto & name : required_columns)
+    {
+        if (virtual_columns_block.has(name))
+            res.insert(virtual_columns_block.getByName(name));
+        else if (block.has(name))
+            res.insert(block.getByName(name));
+        else
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Cannot find column {} in minmax_count projection but query analysis still selects this projection. It's a bug",
+                name);
+    }
+    return res;
+}
+
+
 bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
     ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot, SelectQueryInfo & query_info) const
 {
@@ -3976,10 +4534,21 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
     if (!settings.allow_experimental_projection_optimization || query_info.ignore_projections || query_info.is_projection_query)
         return false;
 
-    const auto & query_ptr = query_info.query;
+    const auto & query_ptr = query_info.original_query;
 
-    // Currently projections don't support final yet.
-    if (auto * select = query_ptr->as<ASTSelectQuery>(); select && select->final())
+    if (auto * select = query_ptr->as<ASTSelectQuery>(); select)
+    {
+        // Currently projections don't support final yet.
+        if (select->final())
+            return false;
+
+        // Currently projections don't support ARRAY JOIN yet.
+        if (select->arrayJoinExpressionList().first)
+            return false;
+    }
+
+    // Currently projections don't support sampling yet.
+    if (settings.parallel_replicas_count > 1)
         return false;
 
     InterpreterSelectQuery select(
@@ -4025,13 +4594,13 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
             candidate.remove_where_filter = analysis_result.remove_where_filter;
             candidate.before_where = analysis_result.before_where->clone();
 
-            required_columns = candidate.before_where->foldActionsByProjection(
+            auto new_required_columns = candidate.before_where->foldActionsByProjection(
                 required_columns,
                 projection.sample_block_for_keys,
                 candidate.where_column_name);
-
-            if (required_columns.empty())
+            if (new_required_columns.empty() && !required_columns.empty())
                 return false;
+            required_columns = std::move(new_required_columns);
             candidate.before_where->addAggregatesViaProjection(aggregates);
         }
 
@@ -4045,33 +4614,35 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
             for (const auto & column : prewhere_actions->getResultColumns())
                 required_columns.erase(column.name);
 
-            // Prewhere_action should not add missing keys.
-            prewhere_required_columns = prewhere_actions->foldActionsByProjection(
-                prewhere_required_columns, projection.sample_block_for_keys, candidate.prewhere_info->prewhere_column_name, false);
-
-            if (prewhere_required_columns.empty())
-                return false;
-            candidate.prewhere_info->prewhere_actions = prewhere_actions;
+            {
+                // Prewhere_action should not add missing keys.
+                auto new_prewhere_required_columns = prewhere_actions->foldActionsByProjection(
+                        prewhere_required_columns, projection.sample_block_for_keys, candidate.prewhere_info->prewhere_column_name, false);
+                if (new_prewhere_required_columns.empty() && !prewhere_required_columns.empty())
+                    return false;
+                prewhere_required_columns = std::move(new_prewhere_required_columns);
+                candidate.prewhere_info->prewhere_actions = prewhere_actions;
+            }
 
             if (candidate.prewhere_info->row_level_filter)
             {
                 auto row_level_filter_actions = candidate.prewhere_info->row_level_filter->clone();
-                prewhere_required_columns = row_level_filter_actions->foldActionsByProjection(
+                auto new_prewhere_required_columns = row_level_filter_actions->foldActionsByProjection(
                     prewhere_required_columns, projection.sample_block_for_keys, candidate.prewhere_info->row_level_column_name, false);
-
-                if (prewhere_required_columns.empty())
+                if (new_prewhere_required_columns.empty() && !prewhere_required_columns.empty())
                     return false;
+                prewhere_required_columns = std::move(new_prewhere_required_columns);
                 candidate.prewhere_info->row_level_filter = row_level_filter_actions;
             }
 
             if (candidate.prewhere_info->alias_actions)
             {
                 auto alias_actions = candidate.prewhere_info->alias_actions->clone();
-                prewhere_required_columns
+                auto new_prewhere_required_columns
                     = alias_actions->foldActionsByProjection(prewhere_required_columns, projection.sample_block_for_keys, {}, false);
-
-                if (prewhere_required_columns.empty())
+                if (new_prewhere_required_columns.empty() && !prewhere_required_columns.empty())
                     return false;
+                prewhere_required_columns = std::move(new_prewhere_required_columns);
                 candidate.prewhere_info->alias_actions = alias_actions;
             }
             required_columns.insert(prewhere_required_columns.begin(), prewhere_required_columns.end());
@@ -4090,11 +4661,20 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
         return match;
     };
 
-    for (const auto & projection : metadata_snapshot->projections)
+    auto virtual_block = getSampleBlockWithVirtualColumns();
+    auto add_projection_candidate = [&](const ProjectionDescription & projection)
     {
         ProjectionCandidate candidate{};
         candidate.desc = &projection;
 
+        auto sample_block = projection.sample_block;
+        auto sample_block_for_keys = projection.sample_block_for_keys;
+        for (const auto & column : virtual_block)
+        {
+            sample_block.insertUnique(column);
+            sample_block_for_keys.insertUnique(column);
+        }
+
         if (projection.type == ProjectionDescription::Type::Aggregate && analysis_result.need_aggregate && can_use_aggregate_projection)
         {
             bool match = true;
@@ -4102,7 +4682,7 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
             // Let's first check if all aggregates are provided by current projection
             for (const auto & aggregate : select.getQueryAnalyzer()->aggregates())
             {
-                const auto * column = projection.sample_block.findByName(aggregate.column_name);
+                const auto * column = sample_block.findByName(aggregate.column_name);
                 if (column)
                 {
                     aggregates.insert(*column);
@@ -4115,25 +4695,25 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
             }
 
             if (!match)
-                continue;
+                return;
 
             // Check if all aggregation keys can be either provided by some action, or by current
             // projection directly. Reshape the `before_aggregation` action DAG so that it only
-            // needs to provide aggregation keys, and certain children DAG might be substituted by
-            // some keys in projection.
+            // needs to provide aggregation keys, and the DAG of certain child might be substituted
+            // by some keys in projection.
             candidate.before_aggregation = analysis_result.before_aggregation->clone();
-            auto required_columns = candidate.before_aggregation->foldActionsByProjection(keys, projection.sample_block_for_keys);
+            auto required_columns = candidate.before_aggregation->foldActionsByProjection(keys, sample_block_for_keys);
 
             // TODO Let's find out the exact required_columns for keys.
             if (required_columns.empty() && (!keys.empty() && !candidate.before_aggregation->getRequiredColumns().empty()))
-                continue;
+                return;
 
             if (analysis_result.optimize_aggregation_in_order)
             {
                 for (const auto & key : keys)
                 {
                     auto actions_dag = analysis_result.before_aggregation->clone();
-                    actions_dag->foldActionsByProjection({key}, projection.sample_block_for_keys);
+                    actions_dag->foldActionsByProjection({key}, sample_block_for_keys);
                     candidate.group_by_elements_actions.emplace_back(std::make_shared<ExpressionActions>(actions_dag, actions_settings));
                 }
             }
@@ -4142,7 +4722,7 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
             candidate.before_aggregation->reorderAggregationKeysForProjection(key_name_pos_map);
             candidate.before_aggregation->addAggregatesViaProjection(aggregates);
 
-            if (rewrite_before_where(candidate, projection, required_columns, projection.sample_block_for_keys, aggregates))
+            if (rewrite_before_where(candidate, projection, required_columns, sample_block_for_keys, aggregates))
             {
                 candidate.required_columns = {required_columns.begin(), required_columns.end()};
                 for (const auto & aggregate : aggregates)
@@ -4159,30 +4739,108 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
             for (const auto & column : actions->getRequiredColumns())
                 required_columns.insert(column.name);
 
-            if (rewrite_before_where(candidate, projection, required_columns, projection.sample_block, {}))
+            if (rewrite_before_where(candidate, projection, required_columns, sample_block, {}))
             {
                 candidate.required_columns = {required_columns.begin(), required_columns.end()};
                 candidates.push_back(std::move(candidate));
             }
         }
+    };
+
+    ProjectionCandidate * selected_candidate = nullptr;
+    size_t min_sum_marks = std::numeric_limits<size_t>::max();
+    if (metadata_snapshot->minmax_count_projection)
+        add_projection_candidate(*metadata_snapshot->minmax_count_projection);
+    std::optional<ProjectionCandidate> minmax_conut_projection_candidate;
+    if (!candidates.empty())
+    {
+        minmax_conut_projection_candidate.emplace(std::move(candidates.front()));
+        candidates.clear();
+    }
+    MergeTreeDataSelectExecutor reader(*this);
+    std::shared_ptr<PartitionIdToMaxBlock> max_added_blocks;
+    if (settings.select_sequential_consistency)
+    {
+        if (const StorageReplicatedMergeTree * replicated = dynamic_cast<const StorageReplicatedMergeTree *>(this))
+            max_added_blocks = std::make_shared<PartitionIdToMaxBlock>(replicated->getMaxAddedBlocks());
+    }
+    auto parts = getDataPartsVector();
+
+    // If minmax_count_projection is a valid candidate, check its completeness.
+    if (minmax_conut_projection_candidate)
+    {
+        DataPartsVector normal_parts;
+        query_info.minmax_count_projection_block = getMinMaxCountProjectionBlock(
+            metadata_snapshot, minmax_conut_projection_candidate->required_columns, query_info, parts, normal_parts, query_context);
+
+        if (normal_parts.empty())
+        {
+            selected_candidate = &*minmax_conut_projection_candidate;
+            selected_candidate->complete = true;
+            min_sum_marks = query_info.minmax_count_projection_block.rows();
+        }
+        else
+        {
+            if (normal_parts.size() == parts.size())
+            {
+                // minmax_count_projection is useless.
+            }
+            else
+            {
+                auto normal_result_ptr = reader.estimateNumMarksToRead(
+                    normal_parts,
+                    analysis_result.required_columns,
+                    metadata_snapshot,
+                    metadata_snapshot,
+                    query_info,
+                    query_context,
+                    settings.max_threads,
+                    max_added_blocks);
+
+                if (!normal_result_ptr->error())
+                {
+                    selected_candidate = &*minmax_conut_projection_candidate;
+                    selected_candidate->merge_tree_normal_select_result_ptr = normal_result_ptr;
+                    min_sum_marks = query_info.minmax_count_projection_block.rows() + normal_result_ptr->marks();
+                }
+            }
+
+            // We cannot find a complete match of minmax_count_projection, add more projections to check.
+            for (const auto & projection : metadata_snapshot->projections)
+                add_projection_candidate(projection);
+        }
+    }
+    else
+    {
+        for (const auto & projection : metadata_snapshot->projections)
+            add_projection_candidate(projection);
     }
 
     // Let's select the best projection to execute the query.
     if (!candidates.empty())
     {
-        std::shared_ptr<PartitionIdToMaxBlock> max_added_blocks;
-        if (settings.select_sequential_consistency)
+        query_info.merge_tree_select_result_ptr = reader.estimateNumMarksToRead(
+            parts,
+            analysis_result.required_columns,
+            metadata_snapshot,
+            metadata_snapshot,
+            query_info,
+            query_context,
+            settings.max_threads,
+            max_added_blocks);
+
+        if (!query_info.merge_tree_select_result_ptr->error())
         {
-            if (const StorageReplicatedMergeTree * replicated = dynamic_cast<const StorageReplicatedMergeTree *>(this))
-                max_added_blocks = std::make_shared<PartitionIdToMaxBlock>(replicated->getMaxAddedBlocks());
+            // Add 1 to base sum_marks so that we prefer projections even when they have equal number of marks to read.
+            // NOTE: It is not clear if we need it. E.g. projections do not support skip index for now.
+            auto sum_marks = query_info.merge_tree_select_result_ptr->marks() + 1;
+            if (sum_marks < min_sum_marks)
+            {
+                selected_candidate = nullptr;
+                min_sum_marks = sum_marks;
+            }
         }
 
-        auto parts = getDataPartsVector();
-        MergeTreeDataSelectExecutor reader(*this);
-
-        ProjectionCandidate * selected_candidate = nullptr;
-        size_t min_sum_marks = std::numeric_limits<size_t>::max();
-        bool has_ordinary_projection = false;
         /// Favor aggregate projections
         for (auto & candidate : candidates)
         {
@@ -4201,61 +4859,48 @@ bool MergeTreeData::getQueryProcessingStageWithAggregateProjection(
                     selected_candidate,
                     min_sum_marks);
             }
-            else
-                has_ordinary_projection = true;
         }
 
-        /// Select the best normal projection if no aggregate projection is available
-        if (!selected_candidate && has_ordinary_projection)
+        /// Select the best normal projection.
+        for (auto & candidate : candidates)
         {
-            min_sum_marks = reader.estimateNumMarksToRead(
-                parts,
-                analysis_result.required_columns,
-                metadata_snapshot,
-                metadata_snapshot,
-                query_info,
-                query_context,
-                settings.max_threads,
-                max_added_blocks);
-
-            // Add 1 to base sum_marks so that we prefer projections even when they have equal number of marks to read.
-            // NOTE: It is not clear if we need it. E.g. projections do not support skip index for now.
-            min_sum_marks += 1;
-
-            for (auto & candidate : candidates)
+            if (candidate.desc->type == ProjectionDescription::Type::Normal)
             {
-                if (candidate.desc->type == ProjectionDescription::Type::Normal)
-                {
-                    selectBestProjection(
-                        reader,
-                        metadata_snapshot,
-                        query_info,
-                        analysis_result.required_columns,
-                        candidate,
-                        query_context,
-                        max_added_blocks,
-                        settings,
-                        parts,
-                        selected_candidate,
-                        min_sum_marks);
-                }
+                selectBestProjection(
+                    reader,
+                    metadata_snapshot,
+                    query_info,
+                    analysis_result.required_columns,
+                    candidate,
+                    query_context,
+                    max_added_blocks,
+                    settings,
+                    parts,
+                    selected_candidate,
+                    min_sum_marks);
             }
         }
-
-        if (!selected_candidate)
-            return false;
-
-        if (selected_candidate->desc->type == ProjectionDescription::Type::Aggregate)
-        {
-            selected_candidate->aggregation_keys = select.getQueryAnalyzer()->aggregationKeys();
-            selected_candidate->aggregate_descriptions = select.getQueryAnalyzer()->aggregates();
-        }
-
-        query_info.projection = std::move(*selected_candidate);
-
-        return true;
     }
-    return false;
+
+    if (!selected_candidate)
+        return false;
+    else if (min_sum_marks == 0)
+    {
+        /// If selected_projection indicated an empty result set. Remember it in query_info but
+        /// don't use projection to run the query, because projection pipeline with empty result
+        /// set will not work correctly with empty_result_for_aggregation_by_empty_set.
+        query_info.merge_tree_empty_result = true;
+        return false;
+    }
+
+    if (selected_candidate->desc->type == ProjectionDescription::Type::Aggregate)
+    {
+        selected_candidate->aggregation_keys = select.getQueryAnalyzer()->aggregationKeys();
+        selected_candidate->aggregate_descriptions = select.getQueryAnalyzer()->aggregates();
+    }
+
+    query_info.projection = std::move(*selected_candidate);
+    return true;
 }
 
 
@@ -4495,11 +5140,16 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
 
         part->volume->getDisk()->createDirectories(backup_path);
 
+        String src_part_path = part->getFullRelativePath();
         String backup_part_path = fs::path(backup_path) / relative_data_path / part->relative_path;
         if (auto part_in_memory = asInMemoryPart(part))
-            part_in_memory->flushToDisk(fs::path(backup_path) / relative_data_path, part->relative_path, metadata_snapshot);
-        else
-            localBackup(part->volume->getDisk(), part->getFullRelativePath(), backup_part_path);
+        {
+            auto flushed_part_path = part_in_memory->getRelativePathForPrefix("tmp_freeze");
+            part_in_memory->flushToDisk(relative_data_path, flushed_part_path, metadata_snapshot);
+            src_part_path = fs::path(relative_data_path) / flushed_part_path / "";
+        }
+
+        localBackup(part->volume->getDisk(), src_part_path, backup_part_path);
 
         part->volume->getDisk()->removeFileIfExists(fs::path(backup_part_path) / IMergeTreeDataPart::DELETE_ON_DESTROY_MARKER_FILE_NAME);
 
@@ -4686,7 +5336,7 @@ MergeTreeData::CurrentlyMovingPartsTagger::~CurrentlyMovingPartsTagger()
     }
 }
 
-bool MergeTreeData::scheduleDataMovingJob(IBackgroundJobExecutor & executor)
+bool MergeTreeData::scheduleDataMovingJob(BackgroundJobsAssignee & assignee)
 {
     if (parts_mover.moves_blocker.isCancelled())
         return false;
@@ -4695,10 +5345,11 @@ bool MergeTreeData::scheduleDataMovingJob(IBackgroundJobExecutor & executor)
     if (moving_tagger->parts_to_move.empty())
         return false;
 
-    executor.execute({[this, moving_tagger] () mutable
-    {
-        return moveParts(moving_tagger);
-    }, PoolType::MOVE});
+    assignee.scheduleMoveTask(ExecutableLambdaAdapter::create(
+        [this, moving_tagger] () mutable
+        {
+            return moveParts(moving_tagger);
+        }, moves_assignee_trigger, getStorageID()));
     return true;
 }
 
@@ -4928,26 +5579,33 @@ void MergeTreeData::setDataVolume(size_t bytes, size_t rows, size_t parts)
     total_active_size_parts.store(parts, std::memory_order_release);
 }
 
-void MergeTreeData::insertQueryIdOrThrow(const String & query_id, size_t max_queries) const
+bool MergeTreeData::insertQueryIdOrThrow(const String & query_id, size_t max_queries) const
 {
     std::lock_guard lock(query_id_set_mutex);
+    return insertQueryIdOrThrowNoLock(query_id, max_queries, lock);
+}
+
+bool MergeTreeData::insertQueryIdOrThrowNoLock(const String & query_id, size_t max_queries, const std::lock_guard<std::mutex> &) const
+{
     if (query_id_set.find(query_id) != query_id_set.end())
-        return;
+        return false;
     if (query_id_set.size() >= max_queries)
         throw Exception(
             ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES, "Too many simultaneous queries for table {}. Maximum is: {}", log_name, max_queries);
     query_id_set.insert(query_id);
+    return true;
 }
 
 void MergeTreeData::removeQueryId(const String & query_id) const
 {
     std::lock_guard lock(query_id_set_mutex);
+    removeQueryIdNoLock(query_id, lock);
+}
+
+void MergeTreeData::removeQueryIdNoLock(const String & query_id, const std::lock_guard<std::mutex> &) const
+{
     if (query_id_set.find(query_id) == query_id_set.end())
-    {
-        /// Do not throw exception, because this method is used in destructor.
         LOG_WARNING(log, "We have query_id removed but it's not recorded. This is a bug");
-        assert(false);
-    }
     else
         query_id_set.erase(query_id);
 }
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index 02d1f5e264e..22ec7ce6f53 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -3,6 +3,7 @@
 #include <Common/SimpleIncrement.h>
 #include <Common/MultiVersion.h>
 #include <Storages/IStorage.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
@@ -38,6 +39,7 @@ namespace DB
 
 class AlterCommands;
 class MergeTreePartsMover;
+class MergeTreeDataMergerMutator;
 class MutationCommands;
 class Context;
 struct JobAndPool;
@@ -57,7 +59,6 @@ class ExpressionActions;
 using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
 class MergeTreeDeduplicationLog;
-class IBackgroundJobExecutor;
 
 namespace ErrorCodes
 {
@@ -273,6 +274,8 @@ public:
         void clear() { precommitted_parts.clear(); }
     };
 
+    using TransactionUniquePtr = std::unique_ptr<Transaction>;
+
     using PathWithDisk = std::pair<String, DiskPtr>;
 
     struct PartsTemporaryRename : private boost::noncopyable
@@ -362,6 +365,24 @@ public:
                   bool attach,
                   BrokenPartCallback broken_part_callback_ = [](const String &){});
 
+    /// Build a block of minmax and count values of a MergeTree table. These values are extracted
+    /// from minmax_indices, the first expression of primary key, and part rows.
+    ///
+    /// query_info - used to filter unneeded parts
+    ///
+    /// parts - part set to filter
+    ///
+    /// normal_parts - collects parts that don't have all the needed values to form the block.
+    /// Specifically, this is when a part doesn't contain a final mark and the related max value is
+    /// required.
+    Block getMinMaxCountProjectionBlock(
+        const StorageMetadataPtr & metadata_snapshot,
+        const Names & required_columns,
+        const SelectQueryInfo & query_info,
+        const DataPartsVector & parts,
+        DataPartsVector & normal_parts,
+        ContextPtr query_context) const;
+
     bool getQueryProcessingStageWithAggregateProjection(
         ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot, SelectQueryInfo & query_info) const;
 
@@ -385,6 +406,7 @@ public:
             || merging_params.mode == MergingParams::Summing
             || merging_params.mode == MergingParams::Aggregating
             || merging_params.mode == MergingParams::Replacing
+            || merging_params.mode == MergingParams::Graphite
             || merging_params.mode == MergingParams::VersionedCollapsing;
     }
 
@@ -436,7 +458,8 @@ public:
     void swapActivePart(MergeTreeData::DataPartPtr part_copy);
 
     /// Returns all parts in specified partition
-    DataPartsVector getDataPartsVectorInPartition(DataPartState state, const String & partition_id);
+    DataPartsVector getDataPartsVectorInPartition(DataPartState state, const String & partition_id) const;
+    DataPartsVector getDataPartsVectorInPartitions(DataPartState state, const std::unordered_set<String> & partition_ids) const;
 
     /// Returns the part with the given name and state or nullptr if no such part.
     DataPartPtr getPartIfExists(const String & part_name, const DataPartStates & valid_states);
@@ -527,7 +550,7 @@ public:
 
     /// Delete all directories which names begin with "tmp"
     /// Must be called with locked lockForShare() because it's using relative_data_path.
-    void clearOldTemporaryDirectories(size_t custom_directories_lifetime_seconds);
+    void clearOldTemporaryDirectories(const MergeTreeDataMergerMutator & merger_mutator, size_t custom_directories_lifetime_seconds);
 
     void clearEmptyParts();
 
@@ -560,7 +583,7 @@ public:
     /// Change MergeTreeSettings
     void changeSettings(
         const ASTPtr & new_settings,
-        TableLockHolder & table_lock_holder);
+        AlterLockHolder & table_lock_holder);
 
     /// Should be called if part data is suspected to be corrupted.
     void reportBrokenPart(const String & name) const
@@ -606,6 +629,17 @@ public:
         ContextPtr context,
         TableLockHolder & table_lock_holder);
 
+    /// Prepares entries to backup data of the storage.
+    BackupEntries backup(const ASTs & partitions, ContextPtr context) const override;
+    static BackupEntries backupDataParts(const DataPartsVector & data_parts);
+
+    /// Extract data from the backup and put it to the storage.
+    RestoreDataTasks restoreDataPartsFromBackup(
+        const BackupPtr & backup,
+        const String & data_path_in_backup,
+        const std::unordered_set<String> & partition_ids,
+        SimpleIncrement * increment);
+
     /// Moves partition to specified Disk
     void movePartitionToDisk(const ASTPtr & partition, const String & name, bool moving_part, ContextPtr context);
 
@@ -634,8 +668,15 @@ public:
         return column_sizes;
     }
 
+    IndexSizeByName getSecondaryIndexSizes() const override
+    {
+        auto lock = lockParts();
+        return secondary_index_sizes;
+    }
+
     /// For ATTACH/DETACH/DROP PARTITION.
     String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context) const;
+    std::unordered_set<String> getPartitionIDsFromQuery(const ASTs & asts, ContextPtr context) const;
 
     /// Extracts MergeTreeData of other *MergeTree* storage
     ///  and checks that their structure suitable for ALTER TABLE ATTACH PARTITION FROM
@@ -728,7 +769,7 @@ public:
     /// Reserves 0 bytes
     ReservationPtr makeEmptyReservationOnLargestDisk() const { return getStoragePolicy()->makeEmptyReservationOnLargestDisk(); }
 
-    Disks getDisksByType(DiskType::Type type) const { return getStoragePolicy()->getDisksByType(type); }
+    Disks getDisks() const { return getStoragePolicy()->getDisks(); }
 
     /// Return alter conversions for part which must be applied on fly.
     AlterConversions getAlterConversionsForPart(MergeTreeDataPartPtr part) const;
@@ -773,21 +814,26 @@ public:
     /// section from config.xml.
     CompressionCodecPtr getCompressionCodecForPart(size_t part_size_compressed, const IMergeTreeDataPart::TTLInfos & ttl_infos, time_t current_time) const;
 
+    std::lock_guard<std::mutex> getQueryIdSetLock() const { return std::lock_guard<std::mutex>(query_id_set_mutex); }
+
     /// Record current query id where querying the table. Throw if there are already `max_queries` queries accessing the same table.
-    void insertQueryIdOrThrow(const String & query_id, size_t max_queries) const;
+    /// Returns false if the `query_id` already exists in the running set, otherwise return true.
+    bool insertQueryIdOrThrow(const String & query_id, size_t max_queries) const;
+    bool insertQueryIdOrThrowNoLock(const String & query_id, size_t max_queries, const std::lock_guard<std::mutex> &) const;
 
     /// Remove current query id after query finished.
     void removeQueryId(const String & query_id) const;
+    void removeQueryIdNoLock(const String & query_id, const std::lock_guard<std::mutex> &) const;
 
     /// Return the partition expression types as a Tuple type. Return DataTypeUInt8 if partition expression is empty.
     DataTypePtr getPartitionValueType() const;
 
+    /// Construct a sample block of virtual columns.
+    Block getSampleBlockWithVirtualColumns() const;
+
     /// Construct a block consisting only of possible virtual columns for part pruning.
     /// If one_part is true, fill in at most one part.
-    Block getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part) const;
-
-    /// Limiting parallel sends per one table, used in DataPartsExchange
-    std::atomic_uint current_table_sends {0};
+    Block getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part, bool ignore_empty = false) const;
 
     /// For generating names of temporary parts during insertion.
     SimpleIncrement insert_increment;
@@ -808,9 +854,9 @@ public:
     PinnedPartUUIDsPtr getPinnedPartUUIDs() const;
 
     /// Schedules background job to like merge/mutate/fetch an executor
-    virtual bool scheduleDataProcessingJob(IBackgroundJobExecutor & executor) = 0;
+    virtual bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) = 0;
     /// Schedules job to move parts between disks/volumes and so on.
-    bool scheduleDataMovingJob(IBackgroundJobExecutor & executor);
+    bool scheduleDataMovingJob(BackgroundJobsAssignee & assignee);
     bool areBackgroundMovesNeeded() const;
 
     /// Lock part in zookeeper for shared data in several nodes
@@ -840,6 +886,7 @@ protected:
     friend struct ReplicatedMergeTreeTableMetadata;
     friend class StorageReplicatedMergeTree;
     friend class MergeTreeDataWriter;
+    friend class MergeTask;
 
     bool require_part_metadata;
 
@@ -851,6 +898,9 @@ protected:
     /// Current column sizes in compressed and uncompressed form.
     ColumnSizeByName column_sizes;
 
+    /// Current secondary index sizes in compressed and uncompressed form.
+    IndexSizeByName secondary_index_sizes;
+
     /// Engine-specific methods
     BrokenPartCallback broken_part_callback;
 
@@ -904,6 +954,23 @@ protected:
 
     MergeTreePartsMover parts_mover;
 
+    /// Executors are common for both ReplicatedMergeTree and plain MergeTree
+    /// but they are being started and finished in derived classes, so let them be protected.
+    ///
+    /// Why there are two executors, not one? Or an executor for each kind of operation?
+    /// It is historically formed.
+    /// Another explanation is that moving operations are common for Replicated and Plain MergeTree classes.
+    /// Task that schedules this operations is executed with its own timetable and triggered in a specific places in code.
+    /// And for ReplicatedMergeTree we don't have LogEntry type for this operation.
+    BackgroundJobsAssignee background_operations_assignee;
+    BackgroundJobsAssignee background_moves_assignee;
+
+    /// Strongly connected with two fields above.
+    /// Every task that is finished will ask to assign a new one into an executor.
+    /// These callbacks will be passed to the constructor of each task.
+    std::function<void(bool)> common_assignee_trigger;
+    std::function<void(bool)> moves_assignee_trigger;
+
     using DataPartIteratorByInfo = DataPartsIndexes::index<TagByInfo>::type::iterator;
     using DataPartIteratorByStateAndInfo = DataPartsIndexes::index<TagByStateAndInfo>::type::iterator;
 
@@ -966,11 +1033,12 @@ protected:
 
     void checkStoragePolicy(const StoragePolicyPtr & new_storage_policy) const;
 
-    /// Calculates column sizes in compressed form for the current state of data_parts. Call with data_parts mutex locked.
-    void calculateColumnSizesImpl();
-    /// Adds or subtracts the contribution of the part to compressed column sizes.
-    void addPartContributionToColumnSizes(const DataPartPtr & part);
-    void removePartContributionToColumnSizes(const DataPartPtr & part);
+    /// Calculates column and secondary indexes sizes in compressed form for the current state of data_parts. Call with data_parts mutex locked.
+    void calculateColumnAndSecondaryIndexSizesImpl();
+
+    /// Adds or subtracts the contribution of the part to compressed column and secondary indexes sizes.
+    void addPartContributionToColumnAndSecondaryIndexSizes(const DataPartPtr & part);
+    void removePartContributionToColumnAndSecondaryIndexSizes(const DataPartPtr & part);
 
     /// If there is no part in the partition with ID `partition_id`, returns empty ptr. Should be called under the lock.
     DataPartPtr getAnyPartInPartition(const String & partition_id, DataPartsLock & data_parts_lock) const;
@@ -1089,6 +1157,21 @@ private:
 
     /// Returns default settings for storage with possible changes from global config.
     virtual std::unique_ptr<MergeTreeSettings> getDefaultSettings() const = 0;
+
+    void loadDataPartsFromDisk(
+        DataPartsVector & broken_parts_to_detach,
+        DataPartsVector & duplicate_parts_to_remove,
+        ThreadPool & pool,
+        size_t num_parts,
+        std::queue<std::vector<std::pair<String, DiskPtr>>> & parts_queue,
+        bool skip_sanity_checks,
+        const MergeTreeSettingsPtr & settings);
+
+    void loadDataPartsFromWAL(
+        DataPartsVector & broken_parts_to_detach,
+        DataPartsVector & duplicate_parts_to_remove,
+        MutableDataPartsVector & parts_from_wal,
+        DataPartsLock & part_lock);
 };
 
 /// RAII struct to record big parts that are submerging or emerging.
@@ -1109,4 +1192,12 @@ struct CurrentlySubmergingEmergingTagger
     ~CurrentlySubmergingEmergingTagger();
 };
 
+
+/// TODO: move it somewhere
+[[ maybe_unused ]] static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
+{
+    return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
+        || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataFormatVersion.h b/src/Storages/MergeTree/MergeTreeDataFormatVersion.h
index 7b21ac31609..1e21070dd6b 100644
--- a/src/Storages/MergeTree/MergeTreeDataFormatVersion.h
+++ b/src/Storages/MergeTree/MergeTreeDataFormatVersion.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <common/types.h>
-#include <common/strong_typedef.h>
+#include <base/types.h>
+#include <base/strong_typedef.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 6279d2d7d6f..c1637ab538b 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -9,12 +9,15 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
-#include <DataStreams/TTLBlockInputStream.h>
-#include <DataStreams/DistinctSortedBlockInputStream.h>
-#include <DataStreams/ExpressionBlockInputStream.h>
-#include <DataStreams/MaterializingBlockInputStream.h>
-#include <DataStreams/ColumnGathererStream.h>
-#include <DataStreams/SquashingBlockInputStream.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeProgress.h>
+#include <Storages/MergeTree/MergeTask.h>
+
+#include <Processors/Transforms/TTLTransform.h>
+#include <Processors/Transforms/TTLCalcTransform.h>
+#include <Processors/Transforms/DistinctSortedTransform.h>
 #include <Processors/Merges/MergingSortedTransform.h>
 #include <Processors/Merges/CollapsingSortedTransform.h>
 #include <Processors/Merges/SummingSortedTransform.h>
@@ -25,7 +28,6 @@
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/Context.h>
 #include <Common/interpolate.h>
@@ -39,7 +41,6 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
-
 namespace ProfileEvents
 {
     extern const Event MergedRows;
@@ -50,7 +51,7 @@ namespace ProfileEvents
 
 namespace CurrentMetrics
 {
-    extern const Metric BackgroundPoolTask;
+    extern const Metric BackgroundMergesAndMutationsPoolTask;
     extern const Metric PartMutation;
 }
 
@@ -59,9 +60,7 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int DIRECTORY_ALREADY_EXISTS;
     extern const int LOGICAL_ERROR;
-    extern const int ABORTED;
 }
 
 /// Do not start to merge parts, if free space is less than sum size of parts times specified coefficient.
@@ -73,113 +72,34 @@ static const double DISK_USAGE_COEFFICIENT_TO_SELECT = 2;
 ///  because between selecting parts to merge and doing merge, amount of free space could have decreased.
 static const double DISK_USAGE_COEFFICIENT_TO_RESERVE = 1.1;
 
-void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_)
-{
-    if (parts_.empty())
-        return;
-
-    size_t sum_rows = 0;
-    size_t sum_bytes_uncompressed = 0;
-    MergeTreeDataPartType future_part_type = MergeTreeDataPartType::UNKNOWN;
-    for (const auto & part : parts_)
-    {
-        sum_rows += part->rows_count;
-        sum_bytes_uncompressed += part->getTotalColumnsSize().data_uncompressed;
-        future_part_type = std::min(future_part_type, part->getType());
-    }
-
-    auto chosen_type = parts_.front()->storage.choosePartTypeOnDisk(sum_bytes_uncompressed, sum_rows);
-    future_part_type = std::min(future_part_type, chosen_type);
-    assign(std::move(parts_), future_part_type);
-}
-
-void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
-{
-    if (parts_.empty())
-        return;
-
-    for (const MergeTreeData::DataPartPtr & part : parts_)
-    {
-        const MergeTreeData::DataPartPtr & first_part = parts_.front();
-
-        if (part->partition.value != first_part->partition.value)
-            throw Exception(
-                "Attempting to merge parts " + first_part->name + " and " + part->name + " that are in different partitions",
-                ErrorCodes::LOGICAL_ERROR);
-    }
-
-    parts = std::move(parts_);
-
-    UInt32 max_level = 0;
-    Int64 max_mutation = 0;
-    for (const auto & part : parts)
-    {
-        max_level = std::max(max_level, part->info.level);
-        max_mutation = std::max(max_mutation, part->info.mutation);
-    }
-
-    type = future_part_type;
-    part_info.partition_id = parts.front()->info.partition_id;
-    part_info.min_block = parts.front()->info.min_block;
-    part_info.max_block = parts.back()->info.max_block;
-    part_info.level = max_level + 1;
-    part_info.mutation = max_mutation;
-
-    if (parts.front()->storage.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
-    {
-        DayNum min_date = DayNum(std::numeric_limits<UInt16>::max());
-        DayNum max_date = DayNum(std::numeric_limits<UInt16>::min());
-        for (const auto & part : parts)
-        {
-            /// NOTE: getting min and max dates from part names (instead of part data) because we want
-            /// the merged part name be determined only by source part names.
-            /// It is simpler this way when the real min and max dates for the block range can change
-            /// (e.g. after an ALTER DELETE command).
-            DayNum part_min_date;
-            DayNum part_max_date;
-            MergeTreePartInfo::parseMinMaxDatesFromPartName(part->name, part_min_date, part_max_date);
-            min_date = std::min(min_date, part_min_date);
-            max_date = std::max(max_date, part_max_date);
-        }
-
-        name = part_info.getPartNameV0(min_date, max_date);
-    }
-    else
-        name = part_info.getPartName();
-}
-
-void FutureMergedMutatedPart::updatePath(const MergeTreeData & storage, const ReservationPtr & reservation)
-{
-    path = storage.getFullPathOnDisk(reservation->getDisk()) + name + "/";
-}
-
-MergeTreeDataMergerMutator::MergeTreeDataMergerMutator(MergeTreeData & data_, size_t background_pool_size_)
-    : data(data_), background_pool_size(background_pool_size_), log(&Poco::Logger::get(data.getLogName() + " (MergerMutator)"))
+MergeTreeDataMergerMutator::MergeTreeDataMergerMutator(MergeTreeData & data_, size_t max_tasks_count_)
+    : data(data_), max_tasks_count(max_tasks_count_), log(&Poco::Logger::get(data.getLogName() + " (MergerMutator)"))
 {
 }
 
 
 UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge() const
 {
-    size_t busy_threads_in_pool = CurrentMetrics::values[CurrentMetrics::BackgroundPoolTask].load(std::memory_order_relaxed);
+    size_t scheduled_tasks_count = CurrentMetrics::values[CurrentMetrics::BackgroundMergesAndMutationsPoolTask].load(std::memory_order_relaxed);
 
-    return getMaxSourcePartsSizeForMerge(background_pool_size, busy_threads_in_pool);
+    return getMaxSourcePartsSizeForMerge(max_tasks_count, scheduled_tasks_count);
 }
 
 
-UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge(size_t pool_size, size_t pool_used) const
+UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge(size_t max_count, size_t scheduled_tasks_count) const
 {
-    if (pool_used > pool_size)
-        throw Exception("Logical error: invalid arguments passed to getMaxSourcePartsSize: pool_used > pool_size", ErrorCodes::LOGICAL_ERROR);
+    if (scheduled_tasks_count > max_count)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: invalid argument passed to \
+            getMaxSourcePartsSize: scheduled_tasks_count = {} > max_count = {}", scheduled_tasks_count, max_count);
 
-    size_t free_entries = pool_size - pool_used;
+    size_t free_entries = max_count - scheduled_tasks_count;
     const auto data_settings = data.getSettings();
 
     /// Always allow maximum size if one or less pool entries is busy.
     /// One entry is probably the entry where this function is executed.
     /// This will protect from bad settings.
     UInt64 max_size = 0;
-    if (pool_used <= 1 || free_entries >= data_settings->number_of_free_entries_in_pool_to_lower_max_size_of_merge)
+    if (scheduled_tasks_count <= 1 || free_entries >= data_settings->number_of_free_entries_in_pool_to_lower_max_size_of_merge)
         max_size = data_settings->max_bytes_to_merge_at_max_space_in_pool;
     else
         max_size = interpolateExponential(
@@ -194,21 +114,21 @@ UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge(size_t pool_siz
 UInt64 MergeTreeDataMergerMutator::getMaxSourcePartSizeForMutation() const
 {
     const auto data_settings = data.getSettings();
-    size_t busy_threads_in_pool = CurrentMetrics::values[CurrentMetrics::BackgroundPoolTask].load(std::memory_order_relaxed);
+    size_t occupied = CurrentMetrics::values[CurrentMetrics::BackgroundMergesAndMutationsPoolTask].load(std::memory_order_relaxed);
 
     /// DataPart can be store only at one disk. Get maximum reservable free space at all disks.
     UInt64 disk_space = data.getStoragePolicy()->getMaxUnreservedFreeSpace();
 
     /// Allow mutations only if there are enough threads, leave free threads for merges else
-    if (busy_threads_in_pool <= 1
-        || background_pool_size - busy_threads_in_pool >= data_settings->number_of_free_entries_in_pool_to_execute_mutation)
+    if (occupied <= 1
+        || max_tasks_count - occupied >= data_settings->number_of_free_entries_in_pool_to_execute_mutation)
         return static_cast<UInt64>(disk_space / DISK_USAGE_COEFFICIENT_TO_RESERVE);
 
     return 0;
 }
 
 SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
-    FutureMergedMutatedPart & future_part,
+    FutureMergedMutatedPartPtr future_part,
     bool aggressive,
     size_t max_total_size_to_merge,
     const AllowedMergingPredicate & can_merge_callback,
@@ -337,7 +257,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
         parts_to_merge = delete_ttl_selector.select(parts_ranges, max_total_size_to_merge);
         if (!parts_to_merge.empty())
         {
-            future_part.merge_type = MergeType::TTL_DELETE;
+            future_part->merge_type = MergeType::TTL_DELETE;
         }
         else if (metadata_snapshot->hasAnyRecompressionTTL())
         {
@@ -349,7 +269,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
 
             parts_to_merge = recompress_ttl_selector.select(parts_ranges, max_total_size_to_merge);
             if (!parts_to_merge.empty())
-                future_part.merge_type = MergeType::TTL_RECOMPRESS;
+                future_part->merge_type = MergeType::TTL_RECOMPRESS;
         }
     }
 
@@ -386,12 +306,12 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     }
 
     LOG_DEBUG(log, "Selected {} parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
-    future_part.assign(std::move(parts));
+    future_part->assign(std::move(parts));
     return SelectPartsDecision::SELECTED;
 }
 
 SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinPartition(
-    FutureMergedMutatedPart & future_part,
+    FutureMergedMutatedPartPtr future_part,
     UInt64 & available_disk_space,
     const AllowedMergingPredicate & can_merge,
     const String & partition_id,
@@ -403,7 +323,11 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
     MergeTreeData::DataPartsVector parts = selectAllPartsFromPartition(partition_id);
 
     if (parts.empty())
+    {
+        if (out_disable_reason)
+            *out_disable_reason = "There are no parts inside partition";
         return SelectPartsDecision::CANNOT_SELECT;
+    }
 
     if (!final && parts.size() == 1)
     {
@@ -417,6 +341,8 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
     if (final && optimize_skip_merged_partitions && parts.size() == 1 && parts[0]->info.level > 0 &&
         (!metadata_snapshot->hasAnyTTL() || parts[0]->checkAllTTLCalculated(metadata_snapshot)))
     {
+        if (out_disable_reason)
+            *out_disable_reason = "Partition skipped due to optimize_skip_merged_partitions";
         return SelectPartsDecision::NOTHING_TO_MERGE;
     }
 
@@ -463,7 +389,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
     }
 
     LOG_DEBUG(log, "Selected {} parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
-    future_part.assign(std::move(parts));
+    future_part->assign(std::move(parts));
 
     available_disk_space -= required_disk_space;
     return SelectPartsDecision::SELECTED;
@@ -487,964 +413,65 @@ MergeTreeData::DataPartsVector MergeTreeDataMergerMutator::selectAllPartsFromPar
     return parts_from_partition;
 }
 
-
-/// PK columns are sorted and merged, ordinary columns are gathered using info from merge step
-static void extractMergingAndGatheringColumns(
-    const NamesAndTypesList & storage_columns,
-    const ExpressionActionsPtr & sorting_key_expr,
-    const IndicesDescription & indexes,
-    const ProjectionsDescription & projections,
-    const MergeTreeData::MergingParams & merging_params,
-    NamesAndTypesList & gathering_columns, Names & gathering_column_names,
-    NamesAndTypesList & merging_columns, Names & merging_column_names)
-{
-    Names sort_key_columns_vec = sorting_key_expr->getRequiredColumns();
-    std::set<String> key_columns(sort_key_columns_vec.cbegin(), sort_key_columns_vec.cend());
-    for (const auto & index : indexes)
-    {
-        Names index_columns_vec = index.expression->getRequiredColumns();
-        std::copy(index_columns_vec.cbegin(), index_columns_vec.cend(),
-                  std::inserter(key_columns, key_columns.end()));
-    }
-
-    for (const auto & projection : projections)
-    {
-        Names projection_columns_vec = projection.required_columns;
-        std::copy(projection_columns_vec.cbegin(), projection_columns_vec.cend(),
-                  std::inserter(key_columns, key_columns.end()));
-    }
-
-    /// Force sign column for Collapsing mode
-    if (merging_params.mode == MergeTreeData::MergingParams::Collapsing)
-        key_columns.emplace(merging_params.sign_column);
-
-    /// Force version column for Replacing mode
-    if (merging_params.mode == MergeTreeData::MergingParams::Replacing)
-        key_columns.emplace(merging_params.version_column);
-
-    /// Force sign column for VersionedCollapsing mode. Version is already in primary key.
-    if (merging_params.mode == MergeTreeData::MergingParams::VersionedCollapsing)
-        key_columns.emplace(merging_params.sign_column);
-
-    /// Force to merge at least one column in case of empty key
-    if (key_columns.empty())
-        key_columns.emplace(storage_columns.front().name);
-
-    /// TODO: also force "summing" and "aggregating" columns to make Horizontal merge only for such columns
-
-    for (const auto & column : storage_columns)
-    {
-        if (key_columns.count(column.name))
-        {
-            merging_columns.emplace_back(column);
-            merging_column_names.emplace_back(column.name);
-        }
-        else
-        {
-            gathering_columns.emplace_back(column);
-            gathering_column_names.emplace_back(column.name);
-        }
-    }
-}
-
-/* Allow to compute more accurate progress statistics */
-class ColumnSizeEstimator
-{
-    MergeTreeData::DataPart::ColumnToSize map;
-public:
-
-    /// Stores approximate size of columns in bytes
-    /// Exact values are not required since it used for relative values estimation (progress).
-    size_t sum_total = 0;
-    size_t sum_index_columns = 0;
-    size_t sum_ordinary_columns = 0;
-
-    ColumnSizeEstimator(const MergeTreeData::DataPart::ColumnToSize & map_, const Names & key_columns, const Names & ordinary_columns)
-        : map(map_)
-    {
-        for (const auto & name : key_columns)
-            if (!map.count(name)) map[name] = 0;
-        for (const auto & name : ordinary_columns)
-            if (!map.count(name)) map[name] = 0;
-
-        for (const auto & name : key_columns)
-            sum_index_columns += map.at(name);
-
-        for (const auto & name : ordinary_columns)
-            sum_ordinary_columns += map.at(name);
-
-        sum_total = std::max(static_cast<decltype(sum_index_columns)>(1), sum_index_columns + sum_ordinary_columns);
-    }
-
-    Float64 columnWeight(const String & column) const
-    {
-        return static_cast<Float64>(map.at(column)) / sum_total;
-    }
-
-    Float64 keyColumnsWeight() const
-    {
-        return static_cast<Float64>(sum_index_columns) / sum_total;
-    }
-};
-
-/** Progress callback.
-  * What it should update:
-  * - approximate progress
-  * - amount of read rows
-  * - various metrics
-  * - time elapsed for current merge.
-  */
-
-/// Auxiliary struct that for each merge stage stores its current progress.
-/// A stage is: the horizontal stage + a stage for each gathered column (if we are doing a
-/// Vertical merge) or a mutation of a single part. During a single stage all rows are read.
-struct MergeStageProgress
-{
-    explicit MergeStageProgress(Float64 weight_)
-        : is_first(true) , weight(weight_)
-    {
-    }
-
-    MergeStageProgress(Float64 initial_progress_, Float64 weight_)
-        : initial_progress(initial_progress_), is_first(false), weight(weight_)
-    {
-    }
-
-    Float64 initial_progress = 0.0;
-    bool is_first;
-    Float64 weight;
-
-    UInt64 total_rows = 0;
-    UInt64 rows_read = 0;
-};
-
-class MergeProgressCallback
-{
-public:
-    MergeProgressCallback(
-        MergeList::Entry & merge_entry_, UInt64 & watch_prev_elapsed_, MergeStageProgress & stage_)
-        : merge_entry(merge_entry_)
-        , watch_prev_elapsed(watch_prev_elapsed_)
-        , stage(stage_)
-    {
-        updateWatch();
-    }
-
-    MergeList::Entry & merge_entry;
-    UInt64 & watch_prev_elapsed;
-    MergeStageProgress & stage;
-
-    void updateWatch()
-    {
-        UInt64 watch_curr_elapsed = merge_entry->watch.elapsed();
-        ProfileEvents::increment(ProfileEvents::MergesTimeMilliseconds, (watch_curr_elapsed - watch_prev_elapsed) / 1000000);
-        watch_prev_elapsed = watch_curr_elapsed;
-    }
-
-    void operator() (const Progress & value)
-    {
-        ProfileEvents::increment(ProfileEvents::MergedUncompressedBytes, value.read_bytes);
-        if (stage.is_first)
-        {
-            ProfileEvents::increment(ProfileEvents::MergedRows, value.read_rows);
-            ProfileEvents::increment(ProfileEvents::Merge);
-        }
-        updateWatch();
-
-        merge_entry->bytes_read_uncompressed += value.read_bytes;
-        if (stage.is_first)
-            merge_entry->rows_read += value.read_rows;
-
-        stage.total_rows += value.total_rows_to_read;
-        stage.rows_read += value.read_rows;
-        if (stage.total_rows > 0)
-        {
-            merge_entry->progress.store(
-                stage.initial_progress + stage.weight * stage.rows_read / stage.total_rows,
-                std::memory_order_relaxed);
-        }
-    }
-};
-
-static bool needSyncPart(size_t input_rows, size_t input_bytes, const MergeTreeSettings & settings)
-{
-    return ((settings.min_rows_to_fsync_after_merge && input_rows >= settings.min_rows_to_fsync_after_merge)
-        || (settings.min_compressed_bytes_to_fsync_after_merge && input_bytes >= settings.min_compressed_bytes_to_fsync_after_merge));
-}
-
-
 /// parts should be sorted.
-MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTemporaryPart(
-    const FutureMergedMutatedPart & future_part,
+MergeTaskPtr MergeTreeDataMergerMutator::mergePartsToTemporaryPart(
+    FutureMergedMutatedPartPtr future_part,
     const StorageMetadataPtr & metadata_snapshot,
-    MergeList::Entry & merge_entry,
-    TableLockHolder & holder,
+    MergeList::Entry * merge_entry,
+    std::unique_ptr<MergeListElement> projection_merge_list_element,
+    TableLockHolder,
     time_t time_of_merge,
     ContextPtr context,
-    const ReservationPtr & space_reservation,
+    ReservationSharedPtr space_reservation,
     bool deduplicate,
     const Names & deduplicate_by_columns,
     const MergeTreeData::MergingParams & merging_params,
     const IMergeTreeDataPart * parent_part,
-    const String & prefix)
+    const String & suffix)
 {
-    const String tmp_prefix = parent_part ? prefix : "tmp_merge_";
-
-    if (merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
-
-    /// We don't want to perform merge assigned with TTL as normal merge, so
-    /// throw exception
-    if (isTTLMergeType(future_part.merge_type) && ttl_merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts with TTL", ErrorCodes::ABORTED);
-
-    const MergeTreeData::DataPartsVector & parts = future_part.parts;
-
-    LOG_DEBUG(log, "Merging {} parts: from {} to {} into {}", parts.size(), parts.front()->name, parts.back()->name, future_part.type.toString());
-    if (deduplicate)
-    {
-        if (deduplicate_by_columns.empty())
-            LOG_DEBUG(log, "DEDUPLICATE BY all columns");
-        else
-            LOG_DEBUG(log, "DEDUPLICATE BY ('{}')", fmt::join(deduplicate_by_columns, "', '"));
-    }
-
-    auto disk = space_reservation->getDisk();
-    String part_path = data.relative_data_path;
-    String new_part_tmp_path = part_path + tmp_prefix + future_part.name + (parent_part ? ".proj" : "") + "/";
-    if (disk->exists(new_part_tmp_path))
-        throw Exception("Directory " + fullPath(disk, new_part_tmp_path) + " already exists", ErrorCodes::DIRECTORY_ALREADY_EXISTS);
-
-
-    Names all_column_names = metadata_snapshot->getColumns().getNamesOfPhysical();
-    NamesAndTypesList storage_columns = metadata_snapshot->getColumns().getAllPhysical();
-    const auto data_settings = data.getSettings();
-
-    NamesAndTypesList gathering_columns;
-    NamesAndTypesList merging_columns;
-    Names gathering_column_names, merging_column_names;
-    extractMergingAndGatheringColumns(
-        storage_columns,
-        metadata_snapshot->getSortingKey().expression,
-        metadata_snapshot->getSecondaryIndices(),
-        metadata_snapshot->getProjections(),
+    return std::make_shared<MergeTask>(
+        future_part,
+        const_cast<StorageMetadataPtr &>(metadata_snapshot),
+        merge_entry,
+        std::move(projection_merge_list_element),
+        time_of_merge,
+        context,
+        space_reservation,
+        deduplicate,
+        deduplicate_by_columns,
         merging_params,
-        gathering_columns,
-        gathering_column_names,
-        merging_columns,
-        merging_column_names);
-
-    auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + future_part.name, disk, 0);
-    MergeTreeData::MutableDataPartPtr new_data_part = data.createPart(
-        future_part.name,
-        future_part.type,
-        future_part.part_info,
-        single_disk_volume,
-        tmp_prefix + future_part.name + (parent_part ? ".proj" : ""),
-        parent_part);
-
-    new_data_part->uuid = future_part.uuid;
-    new_data_part->setColumns(storage_columns);
-    new_data_part->partition.assign(future_part.getPartition());
-    new_data_part->is_temp = parent_part == nullptr;
-
-    bool need_remove_expired_values = false;
-    bool force_ttl = false;
-    for (const auto & part : parts)
-    {
-        if (metadata_snapshot->hasAnyTTL() && !part->checkAllTTLCalculated(metadata_snapshot))
-        {
-            LOG_INFO(log, "Some TTL values were not calculated for part {}. Will calculate them forcefully during merge.", part->name);
-            need_remove_expired_values = true;
-            force_ttl = true;
-        }
-        else
-        {
-            new_data_part->ttl_infos.update(part->ttl_infos);
-        }
-    }
-
-    const auto & part_min_ttl = new_data_part->ttl_infos.part_min_ttl;
-    if (part_min_ttl && part_min_ttl <= time_of_merge)
-        need_remove_expired_values = true;
-
-    if (need_remove_expired_values && ttl_merges_blocker.isCancelled())
-    {
-        LOG_INFO(log, "Part {} has values with expired TTL, but merges with TTL are cancelled.", new_data_part->name);
-        need_remove_expired_values = false;
-    }
-
-    size_t sum_input_rows_upper_bound = merge_entry->total_rows_count;
-    size_t sum_compressed_bytes_upper_bound = merge_entry->total_size_bytes_compressed;
-    MergeAlgorithm chosen_merge_algorithm = chooseMergeAlgorithm(
-        parts, sum_input_rows_upper_bound, gathering_columns, deduplicate, need_remove_expired_values, merging_params);
-    merge_entry->merge_algorithm.store(chosen_merge_algorithm, std::memory_order_relaxed);
-
-    LOG_DEBUG(log, "Selected MergeAlgorithm: {}", toString(chosen_merge_algorithm));
-
-    /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
-    /// (which is locked in data.getTotalActiveSizeInBytes())
-    /// (which is locked in shared mode when input streams are created) and when inserting new data
-    /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
-    /// deadlock is impossible.
-    auto compression_codec = data.getCompressionCodecForPart(merge_entry->total_size_bytes_compressed, new_data_part->ttl_infos, time_of_merge);
-
-    auto tmp_disk = context->getTemporaryVolume()->getDisk();
-    String rows_sources_file_path;
-    std::unique_ptr<WriteBufferFromFileBase> rows_sources_uncompressed_write_buf;
-    std::unique_ptr<WriteBuffer> rows_sources_write_buf;
-    std::optional<ColumnSizeEstimator> column_sizes;
-
-    SyncGuardPtr sync_guard;
-
-    if (chosen_merge_algorithm == MergeAlgorithm::Vertical)
-    {
-        tmp_disk->createDirectories(new_part_tmp_path);
-        rows_sources_file_path = new_part_tmp_path + "rows_sources";
-        rows_sources_uncompressed_write_buf = tmp_disk->writeFile(rows_sources_file_path);
-        rows_sources_write_buf = std::make_unique<CompressedWriteBuffer>(*rows_sources_uncompressed_write_buf);
-
-        MergeTreeData::DataPart::ColumnToSize merged_column_to_size;
-        for (const MergeTreeData::DataPartPtr & part : parts)
-            part->accumulateColumnSizes(merged_column_to_size);
-
-        column_sizes = ColumnSizeEstimator(merged_column_to_size, merging_column_names, gathering_column_names);
-
-        if (data.getSettings()->fsync_part_directory)
-            sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
-    }
-    else
-    {
-        merging_columns = storage_columns;
-        merging_column_names = all_column_names;
-        gathering_columns.clear();
-        gathering_column_names.clear();
-    }
-
-    /** Read from all parts, merge and write into a new one.
-      * In passing, we calculate expression for sorting.
-      */
-    Pipes pipes;
-    UInt64 watch_prev_elapsed = 0;
-
-    /// We count total amount of bytes in parts
-    /// and use direct_io if there is more than min_merge_bytes_to_use_direct_io
-    bool read_with_direct_io = false;
-    if (data_settings->min_merge_bytes_to_use_direct_io != 0)
-    {
-        size_t total_size = 0;
-        for (const auto & part : parts)
-        {
-            total_size += part->getBytesOnDisk();
-            if (total_size >= data_settings->min_merge_bytes_to_use_direct_io)
-            {
-                LOG_DEBUG(log, "Will merge parts reading files in O_DIRECT");
-                read_with_direct_io = true;
-
-                break;
-            }
-        }
-    }
-
-    MergeStageProgress horizontal_stage_progress(
-        column_sizes ? column_sizes->keyColumnsWeight() : 1.0);
-
-    for (const auto & part : parts)
-    {
-        auto input = std::make_unique<MergeTreeSequentialSource>(
-            data, metadata_snapshot, part, merging_column_names, read_with_direct_io, true);
-
-        input->setProgressCallback(
-            MergeProgressCallback(merge_entry, watch_prev_elapsed, horizontal_stage_progress));
-
-        Pipe pipe(std::move(input));
-
-        if (metadata_snapshot->hasSortingKey())
-        {
-            pipe.addSimpleTransform([&metadata_snapshot](const Block & header)
-            {
-                return std::make_shared<ExpressionTransform>(header, metadata_snapshot->getSortingKey().expression);
-            });
-        }
-
-        pipes.emplace_back(std::move(pipe));
-    }
-
-    Names sort_columns = metadata_snapshot->getSortingKeyColumns();
-    SortDescription sort_description;
-    size_t sort_columns_size = sort_columns.size();
-    sort_description.reserve(sort_columns_size);
-
-    Names partition_key_columns = metadata_snapshot->getPartitionKey().column_names;
-
-    Block header = pipes.at(0).getHeader();
-    for (size_t i = 0; i < sort_columns_size; ++i)
-        sort_description.emplace_back(header.getPositionByName(sort_columns[i]), 1, 1);
-
-    /// The order of the streams is important: when the key is matched, the elements go in the order of the source stream number.
-    /// In the merged part, the lines with the same key must be in the ascending order of the identifier of original part,
-    ///  that is going in insertion order.
-    ProcessorPtr merged_transform;
-
-    /// If merge is vertical we cannot calculate it
-    bool blocks_are_granules_size = (chosen_merge_algorithm == MergeAlgorithm::Vertical);
-
-    UInt64 merge_block_size = data_settings->merge_max_block_size;
-    switch (merging_params.mode)
-    {
-        case MergeTreeData::MergingParams::Ordinary:
-            merged_transform = std::make_unique<MergingSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size, 0, false, rows_sources_write_buf.get(), true, blocks_are_granules_size);
-            break;
-
-        case MergeTreeData::MergingParams::Collapsing:
-            merged_transform = std::make_unique<CollapsingSortedTransform>(
-                header, pipes.size(), sort_description, merging_params.sign_column, false,
-                merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
-            break;
-
-        case MergeTreeData::MergingParams::Summing:
-            merged_transform = std::make_unique<SummingSortedTransform>(
-                header, pipes.size(), sort_description, merging_params.columns_to_sum, partition_key_columns, merge_block_size);
-            break;
-
-        case MergeTreeData::MergingParams::Aggregating:
-            merged_transform = std::make_unique<AggregatingSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size);
-            break;
-
-        case MergeTreeData::MergingParams::Replacing:
-            merged_transform = std::make_unique<ReplacingSortedTransform>(
-                header, pipes.size(), sort_description, merging_params.version_column,
-                merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
-            break;
-
-        case MergeTreeData::MergingParams::Graphite:
-            merged_transform = std::make_unique<GraphiteRollupSortedTransform>(
-                header, pipes.size(), sort_description, merge_block_size,
-                merging_params.graphite_params, time_of_merge);
-            break;
-
-        case MergeTreeData::MergingParams::VersionedCollapsing:
-            merged_transform = std::make_unique<VersionedCollapsingTransform>(
-                header, pipes.size(), sort_description, merging_params.sign_column,
-                merge_block_size, rows_sources_write_buf.get(), blocks_are_granules_size);
-            break;
-    }
-
-    QueryPipeline pipeline;
-    pipeline.init(Pipe::unitePipes(std::move(pipes)));
-    pipeline.addTransform(std::move(merged_transform));
-    pipeline.setMaxThreads(1);
-    BlockInputStreamPtr merged_stream = std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
-
-    if (deduplicate)
-        merged_stream = std::make_shared<DistinctSortedBlockInputStream>(merged_stream, sort_description, SizeLimits(), 0 /*limit_hint*/, deduplicate_by_columns);
-
-    if (need_remove_expired_values)
-    {
-        LOG_DEBUG(log, "Outdated rows found in source parts, TTLs processing enabled for merge");
-        merged_stream = std::make_shared<TTLBlockInputStream>(merged_stream, data, metadata_snapshot, new_data_part, time_of_merge, force_ttl);
-    }
-
-    if (metadata_snapshot->hasSecondaryIndices())
-    {
-        const auto & indices = metadata_snapshot->getSecondaryIndices();
-        merged_stream = std::make_shared<ExpressionBlockInputStream>(
-            merged_stream, indices.getSingleExpressionForIndices(metadata_snapshot->getColumns(), data.getContext()));
-        merged_stream = std::make_shared<MaterializingBlockInputStream>(merged_stream);
-    }
-
-    const auto & index_factory = MergeTreeIndexFactory::instance();
-    MergedBlockOutputStream to{
-        new_data_part,
-        metadata_snapshot,
-        merging_columns,
-        index_factory.getMany(metadata_snapshot->getSecondaryIndices()),
-        compression_codec,
-        blocks_are_granules_size};
-
-    merged_stream->readPrefix();
-    to.writePrefix();
-
-    size_t rows_written = 0;
-    const size_t initial_reservation = space_reservation ? space_reservation->getSize() : 0;
-
-    auto is_cancelled = [&]()
-    {
-        return merges_blocker.isCancelled()
-            || (need_remove_expired_values && ttl_merges_blocker.isCancelled())
-            || merge_entry->is_cancelled.load(std::memory_order_relaxed);
-    };
-
-    Block block;
-    while (!is_cancelled() && (block = merged_stream->read()))
-    {
-        rows_written += block.rows();
-
-        to.write(block);
-
-        merge_entry->rows_written = merged_stream->getProfileInfo().rows;
-        merge_entry->bytes_written_uncompressed = merged_stream->getProfileInfo().bytes;
-
-        /// Reservation updates is not performed yet, during the merge it may lead to higher free space requirements
-        if (space_reservation && sum_input_rows_upper_bound)
-        {
-            /// The same progress from merge_entry could be used for both algorithms (it should be more accurate)
-            /// But now we are using inaccurate row-based estimation in Horizontal case for backward compatibility
-            Float64 progress = (chosen_merge_algorithm == MergeAlgorithm::Horizontal)
-                ? std::min(1., 1. * rows_written / sum_input_rows_upper_bound)
-                : std::min(1., merge_entry->progress.load(std::memory_order_relaxed));
-
-            space_reservation->update(static_cast<size_t>((1. - progress) * initial_reservation));
-        }
-    }
-
-    merged_stream->readSuffix();
-    merged_stream.reset();
-
-    if (merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
-
-    if (need_remove_expired_values && ttl_merges_blocker.isCancelled())
-        throw Exception("Cancelled merging parts with expired TTL", ErrorCodes::ABORTED);
-
-    bool need_sync = needSyncPart(sum_input_rows_upper_bound, sum_compressed_bytes_upper_bound, *data_settings);
-    MergeTreeData::DataPart::Checksums checksums_gathered_columns;
-
-    /// Gather ordinary columns
-    if (chosen_merge_algorithm == MergeAlgorithm::Vertical)
-    {
-        size_t sum_input_rows_exact = merge_entry->rows_read;
-        merge_entry->columns_written = merging_column_names.size();
-        merge_entry->progress.store(column_sizes->keyColumnsWeight(), std::memory_order_relaxed);
-
-        BlockInputStreams column_part_streams(parts.size());
-
-        auto it_name_and_type = gathering_columns.cbegin();
-
-        rows_sources_write_buf->next();
-        rows_sources_uncompressed_write_buf->next();
-        /// Ensure data has written to disk.
-        rows_sources_uncompressed_write_buf->finalize();
-
-        size_t rows_sources_count = rows_sources_write_buf->count();
-        /// In special case, when there is only one source part, and no rows were skipped, we may have
-        /// skipped writing rows_sources file. Otherwise rows_sources_count must be equal to the total
-        /// number of input rows.
-        if ((rows_sources_count > 0 || parts.size() > 1) && sum_input_rows_exact != rows_sources_count)
-            throw Exception("Number of rows in source parts (" + toString(sum_input_rows_exact)
-                + ") differs from number of bytes written to rows_sources file (" + toString(rows_sources_count)
-                + "). It is a bug.", ErrorCodes::LOGICAL_ERROR);
-
-        CompressedReadBufferFromFile rows_sources_read_buf(tmp_disk->readFile(rows_sources_file_path));
-        IMergedBlockOutputStream::WrittenOffsetColumns written_offset_columns;
-
-        for (size_t column_num = 0, gathering_column_names_size = gathering_column_names.size();
-            column_num < gathering_column_names_size;
-            ++column_num, ++it_name_and_type)
-        {
-            const String & column_name = it_name_and_type->name;
-            Names column_names{column_name};
-            Float64 progress_before = merge_entry->progress.load(std::memory_order_relaxed);
-
-            MergeStageProgress column_progress(progress_before, column_sizes->columnWeight(column_name));
-            for (size_t part_num = 0; part_num < parts.size(); ++part_num)
-            {
-                auto column_part_source = std::make_shared<MergeTreeSequentialSource>(
-                    data, metadata_snapshot, parts[part_num], column_names, read_with_direct_io, true);
-
-                column_part_source->setProgressCallback(
-                    MergeProgressCallback(merge_entry, watch_prev_elapsed, column_progress));
-
-                QueryPipeline column_part_pipeline;
-                column_part_pipeline.init(Pipe(std::move(column_part_source)));
-                column_part_pipeline.setMaxThreads(1);
-
-                column_part_streams[part_num] =
-                        std::make_shared<PipelineExecutingBlockInputStream>(std::move(column_part_pipeline));
-            }
-
-            rows_sources_read_buf.seek(0, 0);
-            ColumnGathererStream column_gathered_stream(column_name, column_part_streams, rows_sources_read_buf);
-
-            MergedColumnOnlyOutputStream column_to(
-                new_data_part,
-                metadata_snapshot,
-                column_gathered_stream.getHeader(),
-                compression_codec,
-                /// we don't need to recalc indices here
-                /// because all of them were already recalculated and written
-                /// as key part of vertical merge
-                std::vector<MergeTreeIndexPtr>{},
-                &written_offset_columns,
-                to.getIndexGranularity());
-
-            size_t column_elems_written = 0;
-
-            column_to.writePrefix();
-            while (!merges_blocker.isCancelled() && (block = column_gathered_stream.read()))
-            {
-                column_elems_written += block.rows();
-                column_to.write(block);
-            }
-
-            if (merges_blocker.isCancelled())
-                throw Exception("Cancelled merging parts", ErrorCodes::ABORTED);
-
-            column_gathered_stream.readSuffix();
-            auto changed_checksums = column_to.writeSuffixAndGetChecksums(new_data_part, checksums_gathered_columns, need_sync);
-            checksums_gathered_columns.add(std::move(changed_checksums));
-
-            if (rows_written != column_elems_written)
-            {
-                throw Exception("Written " + toString(column_elems_written) + " elements of column " + column_name +
-                                ", but " + toString(rows_written) + " rows of PK columns", ErrorCodes::LOGICAL_ERROR);
-            }
-
-            /// NOTE: 'progress' is modified by single thread, but it may be concurrently read from MergeListElement::getInfo() (StorageSystemMerges).
-
-            merge_entry->columns_written += 1;
-            merge_entry->bytes_written_uncompressed += column_gathered_stream.getProfileInfo().bytes;
-            merge_entry->progress.store(progress_before + column_sizes->columnWeight(column_name), std::memory_order_relaxed);
-        }
-
-        tmp_disk->removeFile(rows_sources_file_path);
-    }
-
-    for (const auto & part : parts)
-        new_data_part->minmax_idx.merge(part->minmax_idx);
-
-    /// Print overall profiling info. NOTE: it may duplicates previous messages
-    {
-        double elapsed_seconds = merge_entry->watch.elapsedSeconds();
-        LOG_DEBUG(log,
-            "Merge sorted {} rows, containing {} columns ({} merged, {} gathered) in {} sec., {} rows/sec., {}/sec.",
-            merge_entry->rows_read,
-            all_column_names.size(),
-            merging_column_names.size(),
-            gathering_column_names.size(),
-            elapsed_seconds,
-            merge_entry->rows_read / elapsed_seconds,
-            ReadableSize(merge_entry->bytes_read_uncompressed / elapsed_seconds));
-    }
-
-    for (const auto & projection : metadata_snapshot->getProjections())
-    {
-        MergeTreeData::DataPartsVector projection_parts;
-        for (const auto & part : parts)
-        {
-            auto it = part->getProjectionParts().find(projection.name);
-            if (it != part->getProjectionParts().end())
-                projection_parts.push_back(it->second);
-        }
-        if (projection_parts.size() < parts.size())
-        {
-            LOG_DEBUG(log, "Projection {} is not merged because some parts don't have it", projection.name);
-            continue;
-        }
-
-        LOG_DEBUG(
-            log,
-            "Selected {} projection_parts from {} to {}",
-            projection_parts.size(),
-            projection_parts.front()->name,
-            projection_parts.back()->name);
-
-        FutureMergedMutatedPart projection_future_part;
-        projection_future_part.assign(std::move(projection_parts));
-        projection_future_part.name = projection.name;
-        projection_future_part.path = future_part.path + "/" + projection.name + ".proj/";
-        projection_future_part.part_info = {"all", 0, 0, 0};
-
-        MergeTreeData::MergingParams projection_merging_params;
-        projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
-        if (projection.type == ProjectionDescription::Type::Aggregate)
-            projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
-
-        // TODO Should we use a new merge_entry for projection?
-        auto merged_projection_part = mergePartsToTemporaryPart(
-            projection_future_part,
-            projection.metadata,
-            merge_entry,
-            holder,
-            time_of_merge,
-            context,
-            space_reservation,
-            deduplicate,
-            deduplicate_by_columns,
-            projection_merging_params,
-            new_data_part.get());
-        new_data_part->addProjectionPart(projection.name, std::move(merged_projection_part));
-    }
-
-    if (chosen_merge_algorithm != MergeAlgorithm::Vertical)
-        to.writeSuffixAndFinalizePart(new_data_part, need_sync);
-    else
-        to.writeSuffixAndFinalizePart(new_data_part, need_sync, &storage_columns, &checksums_gathered_columns);
-
-    return new_data_part;
+        parent_part,
+        suffix,
+        &data,
+        this,
+        &merges_blocker,
+        &ttl_merges_blocker);
 }
 
 
-MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTemporaryPart(
-    const FutureMergedMutatedPart & future_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const MutationCommands & commands,
-    MergeListEntry & merge_entry,
+MutateTaskPtr MergeTreeDataMergerMutator::mutatePartToTemporaryPart(
+    FutureMergedMutatedPartPtr future_part,
+    StorageMetadataPtr metadata_snapshot,
+    MutationCommandsConstPtr commands,
+    MergeListEntry * merge_entry,
     time_t time_of_mutation,
     ContextPtr context,
-    const ReservationPtr & space_reservation,
+    ReservationSharedPtr space_reservation,
     TableLockHolder & holder)
 {
-    checkOperationIsNotCanceled(merge_entry);
-
-    if (future_part.parts.size() != 1)
-        throw Exception("Trying to mutate " + toString(future_part.parts.size()) + " parts, not one. "
-            "This is a bug.", ErrorCodes::LOGICAL_ERROR);
-
-    CurrentMetrics::Increment num_mutations{CurrentMetrics::PartMutation};
-    const auto & source_part = future_part.parts[0];
-    auto storage_from_source_part = StorageFromMergeTreeDataPart::create(source_part);
-
-    auto context_for_reading = Context::createCopy(context);
-    context_for_reading->setSetting("max_streams_to_max_threads_ratio", 1);
-    context_for_reading->setSetting("max_threads", 1);
-    /// Allow mutations to work when force_index_by_date or force_primary_key is on.
-    context_for_reading->setSetting("force_index_by_date", Field(0));
-    context_for_reading->setSetting("force_primary_key", Field(0));
-
-    MutationCommands commands_for_part;
-    for (const auto & command : commands)
-    {
-        if (command.partition == nullptr || future_part.parts[0]->info.partition_id == data.getPartitionIDFromQuery(
-                command.partition, context_for_reading))
-            commands_for_part.emplace_back(command);
-    }
-
-    if (source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
-        storage_from_source_part, metadata_snapshot, commands_for_part, Context::createCopy(context_for_reading)))
-    {
-        LOG_TRACE(log, "Part {} doesn't change up to mutation version {}", source_part->name, future_part.part_info.mutation);
-        return data.cloneAndLoadDataPartOnSameDisk(source_part, "tmp_clone_", future_part.part_info, metadata_snapshot);
-    }
-    else
-    {
-        LOG_TRACE(log, "Mutating part {} to mutation version {}", source_part->name, future_part.part_info.mutation);
-    }
-
-    BlockInputStreamPtr in = nullptr;
-    Block updated_header;
-    std::unique_ptr<MutationsInterpreter> interpreter;
-
-    const auto data_settings = data.getSettings();
-    MutationCommands for_interpreter;
-    MutationCommands for_file_renames;
-
-    splitMutationCommands(source_part, commands_for_part, for_interpreter, for_file_renames);
-
-    UInt64 watch_prev_elapsed = 0;
-    MergeStageProgress stage_progress(1.0);
-
-    NamesAndTypesList storage_columns = metadata_snapshot->getColumns().getAllPhysical();
-    NameSet materialized_indices;
-    NameSet materialized_projections;
-    MutationsInterpreter::MutationKind::MutationKindEnum mutation_kind
-        = MutationsInterpreter::MutationKind::MutationKindEnum::MUTATE_UNKNOWN;
-
-    if (!for_interpreter.empty())
-    {
-        interpreter = std::make_unique<MutationsInterpreter>(
-            storage_from_source_part, metadata_snapshot, for_interpreter, context_for_reading, true);
-        materialized_indices = interpreter->grabMaterializedIndices();
-        materialized_projections = interpreter->grabMaterializedProjections();
-        mutation_kind = interpreter->getMutationKind();
-        in = interpreter->execute();
-        updated_header = interpreter->getUpdatedHeader();
-        in->setProgressCallback(MergeProgressCallback(merge_entry, watch_prev_elapsed, stage_progress));
-    }
-
-    auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + future_part.name, space_reservation->getDisk(), 0);
-    auto new_data_part = data.createPart(
-        future_part.name, future_part.type, future_part.part_info, single_disk_volume, "tmp_mut_" + future_part.name);
-
-    new_data_part->uuid = future_part.uuid;
-    new_data_part->is_temp = true;
-    new_data_part->ttl_infos = source_part->ttl_infos;
-
-    /// It shouldn't be changed by mutation.
-    new_data_part->index_granularity_info = source_part->index_granularity_info;
-    new_data_part->setColumns(getColumnsForNewDataPart(source_part, updated_header, storage_columns, for_file_renames));
-    new_data_part->partition.assign(source_part->partition);
-
-    auto disk = new_data_part->volume->getDisk();
-    String new_part_tmp_path = new_data_part->getFullRelativePath();
-
-    SyncGuardPtr sync_guard;
-    if (data.getSettings()->fsync_part_directory)
-        sync_guard = disk->getDirectorySyncGuard(new_part_tmp_path);
-
-    /// Don't change granularity type while mutating subset of columns
-    auto mrk_extension = source_part->index_granularity_info.is_adaptive ? getAdaptiveMrkExtension(new_data_part->getType())
-                                                                         : getNonAdaptiveMrkExtension();
-    bool need_sync = needSyncPart(source_part->rows_count, source_part->getBytesOnDisk(), *data_settings);
-    bool need_remove_expired_values = false;
-
-    if (in && shouldExecuteTTL(metadata_snapshot, interpreter->getColumnDependencies(), commands_for_part))
-        need_remove_expired_values = true;
-
-    /// All columns from part are changed and may be some more that were missing before in part
-    /// TODO We can materialize compact part without copying data
-    if (!isWidePart(source_part)
-        || (mutation_kind == MutationsInterpreter::MutationKind::MUTATE_OTHER && interpreter && interpreter->isAffectingAllColumns()))
-    {
-        disk->createDirectories(new_part_tmp_path);
-
-        /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
-        /// (which is locked in data.getTotalActiveSizeInBytes())
-        /// (which is locked in shared mode when input streams are created) and when inserting new data
-        /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
-        /// deadlock is impossible.
-        auto compression_codec = data.getCompressionCodecForPart(source_part->getBytesOnDisk(), source_part->ttl_infos, time_of_mutation);
-
-        auto part_indices = getIndicesForNewDataPart(metadata_snapshot->getSecondaryIndices(), for_file_renames);
-        auto part_projections = getProjectionsForNewDataPart(metadata_snapshot->getProjections(), for_file_renames);
-
-        mutateAllPartColumns(
-            new_data_part,
-            metadata_snapshot,
-            part_indices,
-            part_projections,
-            in,
-            time_of_mutation,
-            compression_codec,
-            merge_entry,
-            need_remove_expired_values,
-            need_sync,
-            space_reservation,
-            holder,
-            context);
-
-        /// no finalization required, because mutateAllPartColumns use
-        /// MergedBlockOutputStream which finilaze all part fields itself
-    }
-    else /// TODO: check that we modify only non-key columns in this case.
-    {
-        /// We will modify only some of the columns. Other columns and key values can be copied as-is.
-        NameSet updated_columns;
-        if (mutation_kind != MutationsInterpreter::MutationKind::MUTATE_INDEX_PROJECTION)
-        {
-            for (const auto & name_type : updated_header.getNamesAndTypesList())
-                updated_columns.emplace(name_type.name);
-        }
-
-        auto indices_to_recalc = getIndicesToRecalculate(
-            in, updated_columns, metadata_snapshot, context, materialized_indices, source_part);
-        auto projections_to_recalc = getProjectionsToRecalculate(
-            updated_columns, metadata_snapshot, materialized_projections, source_part);
-
-        NameSet files_to_skip = collectFilesToSkip(
-            source_part,
-            mutation_kind == MutationsInterpreter::MutationKind::MUTATE_INDEX_PROJECTION ? Block{} : updated_header,
-            indices_to_recalc,
-            mrk_extension,
-            projections_to_recalc);
-        NameToNameVector files_to_rename = collectFilesForRenames(source_part, for_file_renames, mrk_extension);
-
-        if (indices_to_recalc.empty() && projections_to_recalc.empty() && mutation_kind != MutationsInterpreter::MutationKind::MUTATE_OTHER
-            && files_to_rename.empty())
-        {
-            LOG_TRACE(
-                log, "Part {} doesn't change up to mutation version {} (optimized)", source_part->name, future_part.part_info.mutation);
-            return data.cloneAndLoadDataPartOnSameDisk(source_part, "tmp_clone_", future_part.part_info, metadata_snapshot);
-        }
-
-        if (need_remove_expired_values)
-            files_to_skip.insert("ttl.txt");
-
-        disk->createDirectories(new_part_tmp_path);
-
-        /// Create hardlinks for unchanged files
-        for (auto it = disk->iterateDirectory(source_part->getFullRelativePath()); it->isValid(); it->next())
-        {
-            if (files_to_skip.count(it->name()))
-                continue;
-
-            String destination = new_part_tmp_path;
-            String file_name = it->name();
-            auto rename_it = std::find_if(files_to_rename.begin(), files_to_rename.end(), [&file_name](const auto & rename_pair) { return rename_pair.first == file_name; });
-            if (rename_it != files_to_rename.end())
-            {
-                if (rename_it->second.empty())
-                    continue;
-                destination += rename_it->second;
-            }
-            else
-            {
-                destination += it->name();
-            }
-
-            if (!disk->isDirectory(it->path()))
-                disk->createHardLink(it->path(), destination);
-            else if (!startsWith("tmp_", it->name())) // ignore projection tmp merge dir
-            {
-                // it's a projection part directory
-                disk->createDirectories(destination);
-                for (auto p_it = disk->iterateDirectory(it->path()); p_it->isValid(); p_it->next())
-                {
-                    String p_destination = destination + "/";
-                    String p_file_name = p_it->name();
-                    p_destination += p_it->name();
-                    disk->createHardLink(p_it->path(), p_destination);
-                }
-            }
-        }
-
-        merge_entry->columns_written = storage_columns.size() - updated_header.columns();
-
-        new_data_part->checksums = source_part->checksums;
-
-        auto compression_codec = source_part->default_codec;
-
-        if (in)
-        {
-            mutateSomePartColumns(
-                source_part,
-                metadata_snapshot,
-                indices_to_recalc,
-                projections_to_recalc,
-                // If it's an index/projection materialization, we don't write any data columns, thus empty header is used
-                mutation_kind == MutationsInterpreter::MutationKind::MUTATE_INDEX_PROJECTION ? Block{} : updated_header,
-                new_data_part,
-                in,
-                time_of_mutation,
-                compression_codec,
-                merge_entry,
-                need_remove_expired_values,
-                need_sync,
-                space_reservation,
-                holder,
-                context);
-        }
-
-        for (const auto & [rename_from, rename_to] : files_to_rename)
-        {
-            if (rename_to.empty() && new_data_part->checksums.files.count(rename_from))
-            {
-                new_data_part->checksums.files.erase(rename_from);
-            }
-            else if (new_data_part->checksums.files.count(rename_from))
-            {
-                new_data_part->checksums.files[rename_to] = new_data_part->checksums.files[rename_from];
-
-                new_data_part->checksums.files.erase(rename_from);
-            }
-        }
-
-        finalizeMutatedPart(source_part, new_data_part, need_remove_expired_values, compression_codec);
-    }
-
-    return new_data_part;
+    return std::make_shared<MutateTask>(
+        future_part,
+        metadata_snapshot,
+        commands,
+        merge_entry,
+        time_of_mutation,
+        context,
+        space_reservation,
+        holder,
+        data,
+        *this,
+        merges_blocker
+    );
 }
 
 
@@ -1562,6 +589,7 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
         for (const auto & command : commands)
         {
             if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
                 || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
                 || command.type == MutationCommand::Type::MATERIALIZE_TTL
                 || command.type == MutationCommand::Type::DELETE
@@ -1570,6 +598,9 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
                 for_interpreter.push_back(command);
                 for (const auto & [column_name, expr] : command.column_to_update_expression)
                     mutated_columns.emplace(column_name);
+
+                if (command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
+                    mutated_columns.emplace(command.column_name);
             }
             else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
             {
@@ -1607,6 +638,7 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
         for (const auto & command : commands)
         {
             if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
                 || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
                 || command.type == MutationCommand::Type::MATERIALIZE_TTL
                 || command.type == MutationCommand::Type::DELETE
@@ -1641,125 +673,6 @@ void MergeTreeDataMergerMutator::splitMutationCommands(
 }
 
 
-NameToNameVector MergeTreeDataMergerMutator::collectFilesForRenames(
-    MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension)
-{
-    /// Collect counts for shared streams of different columns. As an example, Nested columns have shared stream with array sizes.
-    std::map<String, size_t> stream_counts;
-    for (const NameAndTypePair & column : source_part->getColumns())
-    {
-        auto serialization = source_part->getSerializationForColumn(column);
-        serialization->enumerateStreams(
-            [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
-            },
-            {});
-    }
-
-    NameToNameVector rename_vector;
-    /// Remove old data
-    for (const auto & command : commands_for_removes)
-    {
-        if (command.type == MutationCommand::Type::DROP_INDEX)
-        {
-            if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx"))
-            {
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
-                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
-            }
-        }
-        else if (command.type == MutationCommand::Type::DROP_PROJECTION)
-        {
-            if (source_part->checksums.has(command.column_name + ".proj"))
-                rename_vector.emplace_back(command.column_name + ".proj", "");
-        }
-        else if (command.type == MutationCommand::Type::DROP_COLUMN)
-        {
-            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                String stream_name = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
-                /// Delete files if they are no longer shared with another column.
-                if (--stream_counts[stream_name] == 0)
-                {
-                    rename_vector.emplace_back(stream_name + ".bin", "");
-                    rename_vector.emplace_back(stream_name + mrk_extension, "");
-                }
-            };
-
-            auto column = source_part->getColumns().tryGetByName(command.column_name);
-            if (column)
-            {
-                auto serialization = source_part->getSerializationForColumn(*column);
-                serialization->enumerateStreams(callback);
-            }
-        }
-        else if (command.type == MutationCommand::Type::RENAME_COLUMN)
-        {
-            String escaped_name_from = escapeForFileName(command.column_name);
-            String escaped_name_to = escapeForFileName(command.rename_to);
-
-            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
-            {
-                String stream_from = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
-
-                String stream_to = boost::replace_first_copy(stream_from, escaped_name_from, escaped_name_to);
-
-                if (stream_from != stream_to)
-                {
-                    rename_vector.emplace_back(stream_from + ".bin", stream_to + ".bin");
-                    rename_vector.emplace_back(stream_from + mrk_extension, stream_to + mrk_extension);
-                }
-            };
-
-            auto column = source_part->getColumns().tryGetByName(command.column_name);
-            if (column)
-            {
-                auto serialization = source_part->getSerializationForColumn(*column);
-                serialization->enumerateStreams(callback);
-            }
-        }
-    }
-
-    return rename_vector;
-}
-
-NameSet MergeTreeDataMergerMutator::collectFilesToSkip(
-    const MergeTreeDataPartPtr & source_part,
-    const Block & updated_header,
-    const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-    const String & mrk_extension,
-    const std::set<MergeTreeProjectionPtr> & projections_to_recalc)
-{
-    NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
-
-    /// Skip updated files
-    for (const auto & entry : updated_header)
-    {
-        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
-        {
-            String stream_name = ISerialization::getFileNameForStream({entry.name, entry.type}, substream_path);
-            files_to_skip.insert(stream_name + ".bin");
-            files_to_skip.insert(stream_name + mrk_extension);
-        };
-
-        auto serialization = source_part->getSerializationForColumn({entry.name, entry.type});
-        serialization->enumerateStreams(callback);
-    }
-    for (const auto & index : indices_to_recalc)
-    {
-        files_to_skip.insert(index->getFileName() + ".idx");
-        files_to_skip.insert(index->getFileName() + mrk_extension);
-    }
-    for (const auto & projection : projections_to_recalc)
-    {
-        files_to_skip.insert(projection->getDirectoryName());
-    }
-
-    return files_to_skip;
-}
-
-
 NamesAndTypesList MergeTreeDataMergerMutator::getColumnsForNewDataPart(
     MergeTreeData::DataPartPtr source_part,
     const Block & updated_header,
@@ -1841,499 +754,30 @@ NamesAndTypesList MergeTreeDataMergerMutator::getColumnsForNewDataPart(
     return storage_columns;
 }
 
-MergeTreeIndices MergeTreeDataMergerMutator::getIndicesForNewDataPart(
-    const IndicesDescription & all_indices,
-    const MutationCommands & commands_for_removes)
-{
-    NameSet removed_indices;
-    for (const auto & command : commands_for_removes)
-        if (command.type == MutationCommand::DROP_INDEX)
-            removed_indices.insert(command.column_name);
 
-    MergeTreeIndices new_indices;
-    for (const auto & index : all_indices)
-        if (!removed_indices.count(index.name))
-            new_indices.push_back(MergeTreeIndexFactory::instance().get(index));
-
-    return new_indices;
-}
-
-MergeTreeProjections MergeTreeDataMergerMutator::getProjectionsForNewDataPart(
-    const ProjectionsDescription & all_projections,
-    const MutationCommands & commands_for_removes)
-{
-    NameSet removed_projections;
-    for (const auto & command : commands_for_removes)
-        if (command.type == MutationCommand::DROP_PROJECTION)
-            removed_projections.insert(command.column_name);
-
-    MergeTreeProjections new_projections;
-    for (const auto & projection : all_projections)
-        if (!removed_projections.count(projection.name))
-            new_projections.push_back(MergeTreeProjectionFactory::instance().get(projection));
-
-    return new_projections;
-}
-
-std::set<MergeTreeIndexPtr> MergeTreeDataMergerMutator::getIndicesToRecalculate(
-    BlockInputStreamPtr & input_stream,
-    const NameSet & updated_columns,
-    const StorageMetadataPtr & metadata_snapshot,
-    ContextPtr context,
-    const NameSet & materialized_indices,
-    const MergeTreeData::DataPartPtr & source_part)
-{
-    /// Checks if columns used in skipping indexes modified.
-    const auto & index_factory = MergeTreeIndexFactory::instance();
-    std::set<MergeTreeIndexPtr> indices_to_recalc;
-    ASTPtr indices_recalc_expr_list = std::make_shared<ASTExpressionList>();
-    const auto & indices = metadata_snapshot->getSecondaryIndices();
-
-    for (size_t i = 0; i < indices.size(); ++i)
-    {
-        const auto & index = indices[i];
-
-        // If we ask to materialize and it already exists
-        if (!source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx") && materialized_indices.count(index.name))
-        {
-            if (indices_to_recalc.insert(index_factory.get(index)).second)
-            {
-                ASTPtr expr_list = index.expression_list_ast->clone();
-                for (const auto & expr : expr_list->children)
-                    indices_recalc_expr_list->children.push_back(expr->clone());
-            }
-        }
-        // If some dependent columns gets mutated
-        else
-        {
-            bool mutate = false;
-            const auto & index_cols = index.expression->getRequiredColumns();
-            for (const auto & col : index_cols)
-            {
-                if (updated_columns.count(col))
-                {
-                    mutate = true;
-                    break;
-                }
-            }
-            if (mutate && indices_to_recalc.insert(index_factory.get(index)).second)
-            {
-                ASTPtr expr_list = index.expression_list_ast->clone();
-                for (const auto & expr : expr_list->children)
-                    indices_recalc_expr_list->children.push_back(expr->clone());
-            }
-        }
-    }
-
-    if (!indices_to_recalc.empty() && input_stream)
-    {
-        auto indices_recalc_syntax = TreeRewriter(context).analyze(indices_recalc_expr_list, input_stream->getHeader().getNamesAndTypesList());
-        auto indices_recalc_expr = ExpressionAnalyzer(
-                indices_recalc_expr_list,
-                indices_recalc_syntax, context).getActions(false);
-
-        /// We can update only one column, but some skip idx expression may depend on several
-        /// columns (c1 + c2 * c3). It works because this stream was created with help of
-        /// MutationsInterpreter which knows about skip indices and stream 'in' already has
-        /// all required columns.
-        /// TODO move this logic to single place.
-        input_stream = std::make_shared<MaterializingBlockInputStream>(
-            std::make_shared<ExpressionBlockInputStream>(input_stream, indices_recalc_expr));
-    }
-    return indices_to_recalc;
-}
-
-std::set<MergeTreeProjectionPtr> MergeTreeDataMergerMutator::getProjectionsToRecalculate(
-    const NameSet & updated_columns,
-    const StorageMetadataPtr & metadata_snapshot,
-    const NameSet & materialized_projections,
-    const MergeTreeData::DataPartPtr & source_part)
-{
-    /// Checks if columns used in projections modified.
-    const auto & projection_factory = MergeTreeProjectionFactory::instance();
-    std::set<MergeTreeProjectionPtr> projections_to_recalc;
-    for (const auto & projection : metadata_snapshot->getProjections())
-    {
-        // If we ask to materialize and it doesn't exist
-        if (!source_part->checksums.has(projection.name + ".proj") && materialized_projections.count(projection.name))
-        {
-            projections_to_recalc.insert(projection_factory.get(projection));
-        }
-        else
-        {
-            // If some dependent columns gets mutated
-            bool mutate = false;
-            const auto & projection_cols = projection.required_columns;
-            for (const auto & col : projection_cols)
-            {
-                if (updated_columns.count(col))
-                {
-                    mutate = true;
-                    break;
-                }
-            }
-            if (mutate)
-                projections_to_recalc.insert(projection_factory.get(projection));
-        }
-    }
-    return projections_to_recalc;
-}
-
-bool MergeTreeDataMergerMutator::shouldExecuteTTL(
-    const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies, const MutationCommands & commands)
+ExecuteTTLType MergeTreeDataMergerMutator::shouldExecuteTTL(const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies)
 {
     if (!metadata_snapshot->hasAnyTTL())
-        return false;
+        return ExecuteTTLType::NONE;
 
-    for (const auto & command : commands)
-        if (command.type == MutationCommand::MATERIALIZE_TTL)
-            return true;
+    bool has_ttl_expression = false;
 
     for (const auto & dependency : dependencies)
-        if (dependency.kind == ColumnDependency::TTL_EXPRESSION || dependency.kind == ColumnDependency::TTL_TARGET)
-            return true;
+    {
+        if (dependency.kind == ColumnDependency::TTL_EXPRESSION)
+            has_ttl_expression = true;
 
-    return false;
+        if (dependency.kind == ColumnDependency::TTL_TARGET)
+            return ExecuteTTLType::NORMAL;
+    }
+    return has_ttl_expression ? ExecuteTTLType::RECALCULATE : ExecuteTTLType::NONE;
 }
 
-// 1. get projection pipeline and a sink to write parts
-// 2. build an executor that can write block to the input stream (actually we can write through it to generate as many parts as possible)
-// 3. finalize the pipeline so that all parts are merged into one part
-void MergeTreeDataMergerMutator::writeWithProjections(
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const MergeTreeProjections & projections_to_build,
-    BlockInputStreamPtr mutating_stream,
-    IMergedBlockOutputStream & out,
-    time_t time_of_mutation,
-    MergeListEntry & merge_entry,
-    const ReservationPtr & space_reservation,
-    TableLockHolder & holder,
-    ContextPtr context,
-    IMergeTreeDataPart::MinMaxIndex * minmax_idx)
+
+bool MergeTreeDataMergerMutator::hasTemporaryPart(const std::string & basename) const
 {
-    size_t block_num = 0;
-    std::map<String, MergeTreeData::MutableDataPartsVector> projection_parts;
-    Block block;
-    std::vector<SquashingTransform> projection_squashes;
-    for (size_t i = 0, size = projections_to_build.size(); i < size; ++i)
-    {
-        projection_squashes.emplace_back(65536, 65536 * 256);
-    }
-    while (checkOperationIsNotCanceled(merge_entry) && (block = mutating_stream->read()))
-    {
-        if (minmax_idx)
-            minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
-
-        out.write(block);
-
-        for (size_t i = 0, size = projections_to_build.size(); i < size; ++i)
-        {
-            const auto & projection = projections_to_build[i]->projection;
-            auto in = InterpreterSelectQuery(
-                          projection.query_ast,
-                          context,
-                          Pipe(std::make_shared<SourceFromSingleChunk>(block, Chunk(block.getColumns(), block.rows()))),
-                          SelectQueryOptions{
-                              projection.type == ProjectionDescription::Type::Normal ? QueryProcessingStage::FetchColumns : QueryProcessingStage::WithMergeableState})
-                          .execute()
-                          .getInputStream();
-            in = std::make_shared<SquashingBlockInputStream>(in, block.rows(), std::numeric_limits<UInt64>::max());
-            in->readPrefix();
-            auto & projection_squash = projection_squashes[i];
-            auto projection_block = projection_squash.add(in->read());
-            if (in->read())
-                throw Exception("Projection cannot increase the number of rows in a block", ErrorCodes::LOGICAL_ERROR);
-            in->readSuffix();
-            if (projection_block)
-            {
-                projection_parts[projection.name].emplace_back(
-                    MergeTreeDataWriter::writeTempProjectionPart(data, log, projection_block, projection, new_data_part.get(), ++block_num));
-            }
-        }
-
-        merge_entry->rows_written += block.rows();
-        merge_entry->bytes_written_uncompressed += block.bytes();
-    }
-
-    // Write the last block
-    for (size_t i = 0, size = projections_to_build.size(); i < size; ++i)
-    {
-        const auto & projection = projections_to_build[i]->projection;
-        auto & projection_squash = projection_squashes[i];
-        auto projection_block = projection_squash.add({});
-        if (projection_block)
-        {
-            projection_parts[projection.name].emplace_back(
-                MergeTreeDataWriter::writeTempProjectionPart(data, log, projection_block, projection, new_data_part.get(), ++block_num));
-        }
-    }
-
-    const auto & projections = metadata_snapshot->projections;
-
-    for (auto && [name, parts] : projection_parts)
-    {
-        LOG_DEBUG(log, "Selected {} projection_parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
-
-        const auto & projection = projections.get(name);
-
-        std::map<size_t, MergeTreeData::MutableDataPartsVector> level_parts;
-        size_t current_level = 0;
-        size_t next_level = 1;
-        level_parts[current_level] = std::move(parts);
-        size_t max_parts_to_merge_in_one_level = 10;
-        for (;;)
-        {
-            auto & current_level_parts = level_parts[current_level];
-            auto & next_level_parts = level_parts[next_level];
-
-            MergeTreeData::MutableDataPartsVector selected_parts;
-            while (selected_parts.size() < max_parts_to_merge_in_one_level && !current_level_parts.empty())
-            {
-                selected_parts.push_back(std::move(current_level_parts.back()));
-                current_level_parts.pop_back();
-            }
-
-            if (selected_parts.empty())
-            {
-                if (next_level_parts.empty())
-                {
-                    LOG_WARNING(log, "There is no projection parts merged");
-                    break;
-                }
-                current_level = next_level;
-                ++next_level;
-            }
-            else if (selected_parts.size() == 1)
-            {
-                if (next_level_parts.empty())
-                {
-                    LOG_DEBUG(log, "Merged a projection part in level {}", current_level);
-                    selected_parts[0]->renameTo(projection.name + ".proj", true);
-                    selected_parts[0]->name = projection.name;
-                    selected_parts[0]->is_temp = false;
-                    new_data_part->addProjectionPart(name, std::move(selected_parts[0]));
-                    break;
-                }
-                else
-                {
-                    LOG_DEBUG(log, "Forwarded part {} in level {} to next level", selected_parts[0]->name, current_level);
-                    next_level_parts.push_back(std::move(selected_parts[0]));
-                }
-            }
-            else if (selected_parts.size() > 1)
-            {
-                // Generate a unique part name
-                ++block_num;
-                FutureMergedMutatedPart projection_future_part;
-                MergeTreeData::DataPartsVector const_selected_parts(
-                    std::make_move_iterator(selected_parts.begin()), std::make_move_iterator(selected_parts.end()));
-                projection_future_part.assign(std::move(const_selected_parts));
-                projection_future_part.name = fmt::format("{}_{}", projection.name, ++block_num);
-                projection_future_part.part_info = {"all", 0, 0, 0};
-
-                MergeTreeData::MergingParams projection_merging_params;
-                projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
-                if (projection.type == ProjectionDescription::Type::Aggregate)
-                    projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
-
-                LOG_DEBUG(log, "Merged {} parts in level {} to {}", selected_parts.size(), current_level, projection_future_part.name);
-                next_level_parts.push_back(mergePartsToTemporaryPart(
-                    projection_future_part,
-                    projection.metadata,
-                    merge_entry,
-                    holder,
-                    time_of_mutation,
-                    context,
-                    space_reservation,
-                    false, // TODO Do we need deduplicate for projections
-                    {},
-                    projection_merging_params,
-                    new_data_part.get(),
-                    "tmp_merge_"));
-
-                next_level_parts.back()->is_temp = true;
-            }
-        }
-    }
-}
-
-void MergeTreeDataMergerMutator::mutateAllPartColumns(
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const MergeTreeIndices & skip_indices,
-    const MergeTreeProjections & projections_to_build,
-    BlockInputStreamPtr mutating_stream,
-    time_t time_of_mutation,
-    const CompressionCodecPtr & compression_codec,
-    MergeListEntry & merge_entry,
-    bool need_remove_expired_values,
-    bool need_sync,
-    const ReservationPtr & space_reservation,
-    TableLockHolder & holder,
-    ContextPtr context)
-{
-    if (mutating_stream == nullptr)
-        throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
-
-    if (metadata_snapshot->hasPrimaryKey() || metadata_snapshot->hasSecondaryIndices())
-        mutating_stream = std::make_shared<MaterializingBlockInputStream>(
-            std::make_shared<ExpressionBlockInputStream>(mutating_stream, data.getPrimaryKeyAndSkipIndicesExpression(metadata_snapshot)));
-
-    if (need_remove_expired_values)
-        mutating_stream = std::make_shared<TTLBlockInputStream>(mutating_stream, data, metadata_snapshot, new_data_part, time_of_mutation, true);
-
-    IMergeTreeDataPart::MinMaxIndex minmax_idx;
-
-    MergedBlockOutputStream out{
-        new_data_part,
-        metadata_snapshot,
-        new_data_part->getColumns(),
-        skip_indices,
-        compression_codec};
-
-    mutating_stream->readPrefix();
-    out.writePrefix();
-
-    writeWithProjections(
-        new_data_part,
-        metadata_snapshot,
-        projections_to_build,
-        mutating_stream,
-        out,
-        time_of_mutation,
-        merge_entry,
-        space_reservation,
-        holder,
-        context,
-        &minmax_idx);
-
-    new_data_part->minmax_idx = std::move(minmax_idx);
-    mutating_stream->readSuffix();
-    out.writeSuffixAndFinalizePart(new_data_part, need_sync);
-}
-
-void MergeTreeDataMergerMutator::mutateSomePartColumns(
-    const MergeTreeDataPartPtr & source_part,
-    const StorageMetadataPtr & metadata_snapshot,
-    const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-    const std::set<MergeTreeProjectionPtr> & projections_to_recalc,
-    const Block & mutation_header,
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    BlockInputStreamPtr mutating_stream,
-    time_t time_of_mutation,
-    const CompressionCodecPtr & compression_codec,
-    MergeListEntry & merge_entry,
-    bool need_remove_expired_values,
-    bool need_sync,
-    const ReservationPtr & space_reservation,
-    TableLockHolder & holder,
-    ContextPtr context)
-{
-    if (mutating_stream == nullptr)
-        throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
-
-    if (need_remove_expired_values)
-        mutating_stream = std::make_shared<TTLBlockInputStream>(mutating_stream, data, metadata_snapshot, new_data_part, time_of_mutation, true);
-
-    IMergedBlockOutputStream::WrittenOffsetColumns unused_written_offsets;
-    MergedColumnOnlyOutputStream out(
-        new_data_part,
-        metadata_snapshot,
-        mutation_header,
-        compression_codec,
-        std::vector<MergeTreeIndexPtr>(indices_to_recalc.begin(), indices_to_recalc.end()),
-        nullptr,
-        source_part->index_granularity,
-        &source_part->index_granularity_info
-    );
-
-    mutating_stream->readPrefix();
-    out.writePrefix();
-
-    std::vector<MergeTreeProjectionPtr> projections_to_build(projections_to_recalc.begin(), projections_to_recalc.end());
-    writeWithProjections(
-        new_data_part,
-        metadata_snapshot,
-        projections_to_build,
-        mutating_stream,
-        out,
-        time_of_mutation,
-        merge_entry,
-        space_reservation,
-        holder,
-        context);
-
-    mutating_stream->readSuffix();
-
-    auto changed_checksums = out.writeSuffixAndGetChecksums(new_data_part, new_data_part->checksums, need_sync);
-
-    new_data_part->checksums.add(std::move(changed_checksums));
-}
-
-void MergeTreeDataMergerMutator::finalizeMutatedPart(
-    const MergeTreeDataPartPtr & source_part,
-    MergeTreeData::MutableDataPartPtr new_data_part,
-    bool need_remove_expired_values,
-    const CompressionCodecPtr & codec)
-{
-    auto disk = new_data_part->volume->getDisk();
-
-    if (new_data_part->uuid != UUIDHelpers::Nil)
-    {
-        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
-        HashingWriteBuffer out_hashing(*out);
-        writeUUIDText(new_data_part->uuid, out_hashing);
-        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
-        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
-    }
-
-    if (need_remove_expired_values)
-    {
-        /// Write a file with ttl infos in json format.
-        auto out_ttl = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "ttl.txt", 4096);
-        HashingWriteBuffer out_hashing(*out_ttl);
-        new_data_part->ttl_infos.write(out_hashing);
-        new_data_part->checksums.files["ttl.txt"].file_size = out_hashing.count();
-        new_data_part->checksums.files["ttl.txt"].file_hash = out_hashing.getHash();
-    }
-
-    {
-        /// Write file with checksums.
-        auto out_checksums = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "checksums.txt", 4096);
-        new_data_part->checksums.write(*out_checksums);
-    } /// close fd
-
-    {
-        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096);
-        DB::writeText(queryToString(codec->getFullCodecDesc()), *out);
-    }
-
-    {
-        /// Write a file with a description of columns.
-        auto out_columns = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "columns.txt", 4096);
-        new_data_part->getColumns().writeText(*out_columns);
-    } /// close fd
-
-    new_data_part->rows_count = source_part->rows_count;
-    new_data_part->index_granularity = source_part->index_granularity;
-    new_data_part->index = source_part->index;
-    new_data_part->minmax_idx = source_part->minmax_idx;
-    new_data_part->modification_time = time(nullptr);
-    new_data_part->loadProjections(false, false);
-    new_data_part->setBytesOnDisk(
-        MergeTreeData::DataPart::calculateTotalSizeOnDisk(new_data_part->volume->getDisk(), new_data_part->getFullRelativePath()));
-    new_data_part->default_codec = codec;
-    new_data_part->calculateColumnsSizesOnDisk();
-    new_data_part->storage.lockSharedData(*new_data_part);
-}
-
-bool MergeTreeDataMergerMutator::checkOperationIsNotCanceled(const MergeListEntry & merge_entry) const
-{
-    if (merges_blocker.isCancelled() || merge_entry->is_cancelled)
-        throw Exception("Cancelled mutating parts", ErrorCodes::ABORTED);
-
-    return true;
+    std::lock_guard lock(tmp_parts_lock);
+    return tmp_parts.contains(basename);
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index ca7376d8f3e..e5c8a4d8285 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -1,13 +1,17 @@
 #pragma once
 
+#include <atomic>
+#include <mutex>
+#include <functional>
+
+#include <Common/ActionBlocker.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MutationCommands.h>
-#include <atomic>
-#include <functional>
-#include <Common/ActionBlocker.h>
 #include <Storages/MergeTree/TTLMergeSelector.h>
 #include <Storages/MergeTree/MergeAlgorithm.h>
 #include <Storages/MergeTree/MergeType.h>
+#include <Storages/MergeTree/MergeTask.h>
+#include <Storages/MergeTree/MutateTask.h>
 #include <Storages/MergeTree/IMergedBlockOutputStream.h>
 
 
@@ -23,38 +27,13 @@ enum class SelectPartsDecision
     NOTHING_TO_MERGE = 2,
 };
 
-/// Auxiliary struct holding metainformation for the future merged or mutated part.
-struct FutureMergedMutatedPart
+enum class ExecuteTTLType
 {
-    String name;
-    UUID uuid = UUIDHelpers::Nil;
-    String path;
-    MergeTreeDataPartType type;
-    MergeTreePartInfo part_info;
-    MergeTreeData::DataPartsVector parts;
-    MergeType merge_type = MergeType::REGULAR;
-
-    const MergeTreePartition & getPartition() const { return parts.front()->partition; }
-
-    FutureMergedMutatedPart() = default;
-
-    explicit FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_)
-    {
-        assign(std::move(parts_));
-    }
-
-    FutureMergedMutatedPart(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type)
-    {
-        assign(std::move(parts_), future_part_type);
-    }
-
-    void assign(MergeTreeData::DataPartsVector parts_);
-    void assign(MergeTreeData::DataPartsVector parts_, MergeTreeDataPartType future_part_type);
-
-    void updatePath(const MergeTreeData & storage, const ReservationPtr & reservation);
+    NONE = 0,
+    NORMAL = 1,
+    RECALCULATE= 2,
 };
 
-
 /** Can select parts for background processes and do them.
  * Currently helps with merges, mutations and moves
  */
@@ -63,7 +42,7 @@ class MergeTreeDataMergerMutator
 public:
     using AllowedMergingPredicate = std::function<bool (const MergeTreeData::DataPartPtr &, const MergeTreeData::DataPartPtr &, String *)>;
 
-    MergeTreeDataMergerMutator(MergeTreeData & data_, size_t background_pool_size);
+    MergeTreeDataMergerMutator(MergeTreeData & data_, size_t max_tasks_count_);
 
     /** Get maximum total size of parts to do merge, at current moment of time.
       * It depends on number of free threads in background_pool and amount of free space in disk.
@@ -73,7 +52,7 @@ public:
     /** For explicitly passed size of pool and number of used tasks.
       * This method could be used to calculate threshold depending on number of tasks in replication queue.
       */
-    UInt64 getMaxSourcePartsSizeForMerge(size_t pool_size, size_t pool_used) const;
+    UInt64 getMaxSourcePartsSizeForMerge(size_t max_count, size_t scheduled_tasks_count) const;
 
     /** Get maximum total size of parts to do mutation, at current moment of time.
       * It depends only on amount of free space in disk.
@@ -88,7 +67,7 @@ public:
       *  - A part that already merges with something in one place, you can not start to merge into something else in another place.
       */
     SelectPartsDecision selectPartsToMerge(
-        FutureMergedMutatedPart & future_part,
+        FutureMergedMutatedPartPtr future_part,
         bool aggressive,
         size_t max_total_size_to_merge,
         const AllowedMergingPredicate & can_merge,
@@ -101,7 +80,7 @@ public:
       * and without expired TTL won't be merged with itself.
       */
     SelectPartsDecision selectAllPartsToMergeWithinPartition(
-        FutureMergedMutatedPart & future_part,
+        FutureMergedMutatedPartPtr future_part,
         UInt64 & available_disk_space,
         const AllowedMergingPredicate & can_merge,
         const String & partition_id,
@@ -110,39 +89,37 @@ public:
         String * out_disable_reason = nullptr,
         bool optimize_skip_merged_partitions = false);
 
-    /** Merge the parts.
+    /** Creates a task to merge parts.
       * If `reservation != nullptr`, now and then reduces the size of the reserved space
       *  is approximately proportional to the amount of data already written.
       *
-      * Creates and returns a temporary part.
-      * To end the merge, call the function renameMergedTemporaryPart.
-      *
       * time_of_merge - the time when the merge was assigned.
       * Important when using ReplicatedGraphiteMergeTree to provide the same merge on replicas.
       */
-    MergeTreeData::MutableDataPartPtr mergePartsToTemporaryPart(
-        const FutureMergedMutatedPart & future_part,
+    MergeTaskPtr mergePartsToTemporaryPart(
+        FutureMergedMutatedPartPtr future_part,
         const StorageMetadataPtr & metadata_snapshot,
-        MergeListEntry & merge_entry,
-        TableLockHolder & table_lock_holder,
+        MergeListEntry * merge_entry,
+        std::unique_ptr<MergeListElement> projection_merge_list_element,
+        TableLockHolder table_lock_holder,
         time_t time_of_merge,
         ContextPtr context,
-        const ReservationPtr & space_reservation,
+        ReservationSharedPtr space_reservation,
         bool deduplicate,
         const Names & deduplicate_by_columns,
         const MergeTreeData::MergingParams & merging_params,
         const IMergeTreeDataPart * parent_part = nullptr,
-        const String & prefix = "");
+        const String & suffix = "");
 
     /// Mutate a single data part with the specified commands. Will create and return a temporary part.
-    MergeTreeData::MutableDataPartPtr mutatePartToTemporaryPart(
-        const FutureMergedMutatedPart & future_part,
-        const StorageMetadataPtr & metadata_snapshot,
-        const MutationCommands & commands,
-        MergeListEntry & merge_entry,
+    MutateTaskPtr mutatePartToTemporaryPart(
+        FutureMergedMutatedPartPtr future_part,
+        StorageMetadataPtr metadata_snapshot,
+        MutationCommandsConstPtr commands,
+        MergeListEntry * merge_entry,
         time_t time_of_mutation,
         ContextPtr context,
-        const ReservationPtr & space_reservation,
+        ReservationSharedPtr space_reservation,
         TableLockHolder & table_lock_holder);
 
     MergeTreeData::DataPartPtr renameMergedTemporaryPart(
@@ -159,6 +136,9 @@ private:
       */
     MergeTreeData::DataPartsVector selectAllPartsFromPartition(const String & partition_id);
 
+    friend class MutateTask;
+    friend class MergeTask;
+
     /** Split mutation commands into two parts:
       * First part should be executed by mutations interpreter.
       * Other is just simple drop/renames, so they can be executed without interpreter.
@@ -169,21 +149,6 @@ private:
         MutationCommands & for_interpreter,
         MutationCommands & for_file_renames);
 
-    /// Apply commands to source_part i.e. remove and rename some columns in
-    /// source_part and return set of files, that have to be removed or renamed
-    /// from filesystem and in-memory checksums. Ordered result is important,
-    /// because we can apply renames that affects each other: x -> z, y -> x.
-    static NameToNameVector collectFilesForRenames(MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension);
-
-    /// Files, that we don't need to remove and don't need to hardlink, for example columns.txt and checksums.txt.
-    /// Because we will generate new versions of them after we perform mutation.
-    static NameSet collectFilesToSkip(
-        const MergeTreeDataPartPtr & source_part,
-        const Block & updated_header,
-        const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-        const String & mrk_extension,
-        const std::set<MergeTreeProjectionPtr> & projections_to_recalc);
-
     /// Get the columns list of the resulting part in the same order as storage_columns.
     static NamesAndTypesList getColumnsForNewDataPart(
         MergeTreeData::DataPartPtr source_part,
@@ -191,88 +156,8 @@ private:
         NamesAndTypesList storage_columns,
         const MutationCommands & commands_for_removes);
 
-    /// Get skip indices, that should exists in the resulting data part.
-    static MergeTreeIndices getIndicesForNewDataPart(
-        const IndicesDescription & all_indices,
-        const MutationCommands & commands_for_removes);
-
-    static MergeTreeProjections getProjectionsForNewDataPart(
-        const ProjectionsDescription & all_projections,
-        const MutationCommands & commands_for_removes);
-
-    static bool shouldExecuteTTL(
-        const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies, const MutationCommands & commands);
-
-    /// Return set of indices which should be recalculated during mutation also
-    /// wraps input stream into additional expression stream
-    static std::set<MergeTreeIndexPtr> getIndicesToRecalculate(
-        BlockInputStreamPtr & input_stream,
-        const NameSet & updated_columns,
-        const StorageMetadataPtr & metadata_snapshot,
-        ContextPtr context,
-        const NameSet & materialized_indices,
-        const MergeTreeData::DataPartPtr & source_part);
-
-    static std::set<MergeTreeProjectionPtr> getProjectionsToRecalculate(
-        const NameSet & updated_columns,
-        const StorageMetadataPtr & metadata_snapshot,
-        const NameSet & materialized_projections,
-        const MergeTreeData::DataPartPtr & source_part);
-
-    void writeWithProjections(
-        MergeTreeData::MutableDataPartPtr new_data_part,
-        const StorageMetadataPtr & metadata_snapshot,
-        const MergeTreeProjections & projections_to_build,
-        BlockInputStreamPtr mutating_stream,
-        IMergedBlockOutputStream & out,
-        time_t time_of_mutation,
-        MergeListEntry & merge_entry,
-        const ReservationPtr & space_reservation,
-        TableLockHolder & holder,
-        ContextPtr context,
-        IMergeTreeDataPart::MinMaxIndex * minmax_idx = nullptr);
-
-    /// Override all columns of new part using mutating_stream
-    void mutateAllPartColumns(
-        MergeTreeData::MutableDataPartPtr new_data_part,
-        const StorageMetadataPtr & metadata_snapshot,
-        const MergeTreeIndices & skip_indices,
-        const MergeTreeProjections & projections_to_build,
-        BlockInputStreamPtr mutating_stream,
-        time_t time_of_mutation,
-        const CompressionCodecPtr & compression_codec,
-        MergeListEntry & merge_entry,
-        bool need_remove_expired_values,
-        bool need_sync,
-        const ReservationPtr & space_reservation,
-        TableLockHolder & holder,
-        ContextPtr context);
-
-    /// Mutate some columns of source part with mutation_stream
-    void mutateSomePartColumns(
-        const MergeTreeDataPartPtr & source_part,
-        const StorageMetadataPtr & metadata_snapshot,
-        const std::set<MergeTreeIndexPtr> & indices_to_recalc,
-        const std::set<MergeTreeProjectionPtr> & projections_to_recalc,
-        const Block & mutation_header,
-        MergeTreeData::MutableDataPartPtr new_data_part,
-        BlockInputStreamPtr mutating_stream,
-        time_t time_of_mutation,
-        const CompressionCodecPtr & compression_codec,
-        MergeListEntry & merge_entry,
-        bool need_remove_expired_values,
-        bool need_sync,
-        const ReservationPtr & space_reservation,
-        TableLockHolder & holder,
-        ContextPtr context);
-
-    /// Initialize and write to disk new part fields like checksums, columns,
-    /// etc.
-    static void finalizeMutatedPart(
-        const MergeTreeDataPartPtr & source_part,
-        MergeTreeData::MutableDataPartPtr new_data_part,
-        bool need_remove_expired_values,
-        const CompressionCodecPtr & codec);
+    static ExecuteTTLType shouldExecuteTTL(
+        const StorageMetadataPtr & metadata_snapshot, const ColumnDependencies & dependencies);
 
 public :
     /** Is used to cancel all merges and mutations. On cancel() call all currently running actions will throw exception soon.
@@ -291,12 +176,9 @@ private:
         bool need_remove_expired_values,
         const MergeTreeData::MergingParams & merging_params) const;
 
-    bool checkOperationIsNotCanceled(const MergeListEntry & merge_entry) const;
-
-
 private:
     MergeTreeData & data;
-    const size_t background_pool_size;
+    const size_t max_tasks_count;
 
     Poco::Logger * log;
 
@@ -310,6 +192,26 @@ private:
     ITTLMergeSelector::PartitionIdToTTLs next_recompress_ttl_merge_times_by_partition;
     /// Performing TTL merges independently for each partition guarantees that
     /// there is only a limited number of TTL merges and no partition stores data, that is too stale
+
+public:
+    /// Returns true if passed part name is active.
+    /// (is the destination for one of active mutation/merge).
+    ///
+    /// NOTE: that it accept basename (i.e. dirname), not the path,
+    /// since later requires canonical form.
+    bool hasTemporaryPart(const std::string & basename) const;
+
+private:
+    /// Set of active temporary paths that is used as the destination.
+    /// List of such paths is required to avoid trying to remove them during cleanup.
+    ///
+    /// NOTE: It is pretty short, so use STL is fine.
+    std::unordered_set<std::string> tmp_parts;
+    /// Lock for "tmp_parts".
+    ///
+    /// NOTE: mutable is required to mark hasTemporaryPath() const
+    mutable std::mutex tmp_parts_lock;
+
 };
 
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
index 759e6a79ee4..06f1fb06f25 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
@@ -2,7 +2,7 @@
 #include <map>
 #include <optional>
 #include <city.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
index 7b1641a0537..c4c2e65547b 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
@@ -107,7 +107,7 @@ void MergeTreeDataPartCompact::loadIndexGranularity()
 
     size_t marks_file_size = volume->getDisk()->getFileSize(marks_file_path);
 
-    auto buffer = volume->getDisk()->readFile(marks_file_path, marks_file_size);
+    auto buffer = volume->getDisk()->readFile(marks_file_path, ReadSettings().adjustBufferSize(marks_file_size), marks_file_size);
     while (!buffer->eof())
     {
         /// Skip offsets for columns
@@ -182,6 +182,11 @@ void MergeTreeDataPartCompact::checkConsistency(bool require_part_metadata) cons
     }
 }
 
+bool MergeTreeDataPartCompact::isStoredOnRemoteDisk() const
+{
+    return volume->getDisk()->isRemote();
+}
+
 MergeTreeDataPartCompact::~MergeTreeDataPartCompact()
 {
     removeIfNeeded();
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.h b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
index 2fcc7b7034b..38bfa11652a 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
@@ -56,6 +56,8 @@ public:
 
     bool isStoredOnDisk() const override { return true; }
 
+    bool isStoredOnRemoteDisk() const override;
+
     bool hasColumnFiles(const NameAndTypePair & column) const override;
 
     String getFileNameForColumn(const NameAndTypePair & /* column */) const override { return DATA_FILE_NAME; }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
index e929bfc6862..3a1ea474d74 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
@@ -6,7 +6,7 @@
 #include <DataTypes/NestedUtils.h>
 #include <Interpreters/Context.h>
 #include <Poco/Logger.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
@@ -92,8 +92,42 @@ void MergeTreeDataPartInMemory::flushToDisk(const String & base_path, const Stri
     auto compression_codec = storage.getContext()->chooseCompressionCodec(0, 0);
     auto indices = MergeTreeIndexFactory::instance().getMany(metadata_snapshot->getSecondaryIndices());
     MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, indices, compression_codec);
-    out.writePrefix();
     out.write(block);
+    const auto & projections = metadata_snapshot->getProjections();
+    for (const auto & [projection_name, projection] : projection_parts)
+    {
+        if (projections.has(projection_name))
+        {
+            String projection_destination_path = fs::path(destination_path) / projection_name / ".proj";
+            if (disk->exists(projection_destination_path))
+            {
+                throw Exception(
+                    ErrorCodes::DIRECTORY_ALREADY_EXISTS,
+                    "Could not flush projection part {}. Projection part in {} already exists",
+                    projection_name,
+                    fullPath(disk, projection_destination_path));
+            }
+
+            auto projection_part = asInMemoryPart(projection);
+            auto projection_type = storage.choosePartTypeOnDisk(projection_part->block.bytes(), rows_count);
+            MergeTreePartInfo projection_info("all", 0, 0, 0);
+            auto projection_data_part
+                = storage.createPart(projection_name, projection_type, projection_info, volume, projection_name + ".proj", parent_part);
+            projection_data_part->is_temp = false; // clean up will be done on parent part
+            projection_data_part->setColumns(projection->getColumns());
+
+            disk->createDirectories(projection_destination_path);
+            const auto & desc = projections.get(name);
+            auto projection_compression_codec = storage.getContext()->chooseCompressionCodec(0, 0);
+            auto projection_indices = MergeTreeIndexFactory::instance().getMany(desc.metadata->getSecondaryIndices());
+            MergedBlockOutputStream projection_out(
+                projection_data_part, desc.metadata, projection_part->columns, projection_indices, projection_compression_codec);
+            projection_out.write(projection_part->block);
+            projection_out.writeSuffixAndFinalizePart(projection_data_part);
+            new_data_part->addProjectionPart(projection_name, std::move(projection_data_part));
+        }
+    }
+
     out.writeSuffixAndFinalizePart(new_data_part);
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
index 118340f0233..d1a0344859d 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
@@ -44,6 +44,7 @@ public:
         const MergeTreeIndexGranularity & computed_index_granularity) const override;
 
     bool isStoredOnDisk() const override { return false; }
+    bool isStoredOnRemoteDisk() const override { return false; }
     bool hasColumnFiles(const NameAndTypePair & column) const override { return !!getColumnPosition(column.name); }
     String getFileNameForColumn(const NameAndTypePair & /* column */) const override { return ""; }
     void renameTo(const String & new_relative_path, bool remove_new_dir_if_exists) const override;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp b/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp
index f1beb09c482..98af2aada10 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartTTLInfo.cpp
@@ -4,7 +4,7 @@
 #include <Common/quoteString.h>
 #include <algorithm>
 
-#include <common/JSON.h>
+#include <base/JSON.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.h b/src/Storages/MergeTree/MergeTreeDataPartType.h
index d658fafc510..fecd9d00cdc 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartType.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index 4eebd729dd8..312f5b435d6 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -49,13 +49,10 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartWide::getReader(
     const ValueSizeMap & avg_value_size_hints,
     const ReadBufferFromFileBase::ProfileCallback & profile_callback) const
 {
-    auto new_settings = reader_settings;
-    new_settings.convert_nested_to_subcolumns = true;
-
     auto ptr = std::static_pointer_cast<const MergeTreeDataPartWide>(shared_from_this());
     return std::make_unique<MergeTreeReaderWide>(
         ptr, columns_to_read, metadata_snapshot, uncompressed_cache,
-        mark_cache, mark_ranges, new_settings,
+        mark_cache, mark_ranges, reader_settings,
         avg_value_size_hints, profile_callback);
 }
 
@@ -101,7 +98,7 @@ ColumnSize MergeTreeDataPartWide::getColumnSizeImpl(
         auto mrk_checksum = checksums.files.find(file_name + index_granularity_info.marks_file_extension);
         if (mrk_checksum != checksums.files.end())
             size.marks += mrk_checksum->second.file_size;
-    }, {});
+    });
 
     return size;
 }
@@ -129,7 +126,7 @@ void MergeTreeDataPartWide::loadIndexGranularity()
     }
     else
     {
-        auto buffer = volume->getDisk()->readFile(marks_file_path, marks_file_size);
+        auto buffer = volume->getDisk()->readFile(marks_file_path, ReadSettings().adjustBufferSize(marks_file_size), marks_file_size);
         while (!buffer->eof())
         {
             buffer->seek(sizeof(size_t) * 2, SEEK_CUR); /// skip offset_in_compressed file and offset_in_decompressed_block
@@ -145,6 +142,11 @@ void MergeTreeDataPartWide::loadIndexGranularity()
     index_granularity.setInitialized();
 }
 
+bool MergeTreeDataPartWide::isStoredOnRemoteDisk() const
+{
+    return volume->getDisk()->isRemote();
+}
+
 MergeTreeDataPartWide::~MergeTreeDataPartWide()
 {
     removeIfNeeded();
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.h b/src/Storages/MergeTree/MergeTreeDataPartWide.h
index a43396f8cd5..4796143e11d 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.h
@@ -50,6 +50,8 @@ public:
 
     bool isStoredOnDisk() const override { return true; }
 
+    bool isStoredOnRemoteDisk() const override;
+
     bool supportsVerticalMerge() const override { return true; }
 
     String getFileNameForColumn(const NameAndTypePair & column) const override;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index 23a7b205a1b..5d17d6235e1 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -39,19 +39,21 @@ MergeTreeDataPartWriterCompact::MergeTreeDataPartWriterCompact(
 
 void MergeTreeDataPartWriterCompact::addStreams(const NameAndTypePair & column, const ASTPtr & effective_codec_desc)
 {
-    IDataType::StreamCallbackWithType callback = [&] (const ISerialization::SubstreamPath & substream_path, const IDataType & substream_type)
+    ISerialization::StreamCallback callback = [&](const auto & substream_path)
     {
+        assert(!substream_path.empty());
         String stream_name = ISerialization::getFileNameForStream(column, substream_path);
 
         /// Shared offsets for Nested type.
         if (compressed_streams.count(stream_name))
             return;
 
+        const auto & subtype = substream_path.back().data.type;
         CompressionCodecPtr compression_codec;
 
         /// If we can use special codec than just get it
         if (ISerialization::isSpecialCompressionAllowed(substream_path))
-            compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, &substream_type, default_codec);
+            compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, subtype.get(), default_codec);
         else /// otherwise return only generic codecs and don't use info about data_type
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, nullptr, default_codec, true);
 
@@ -63,7 +65,8 @@ void MergeTreeDataPartWriterCompact::addStreams(const NameAndTypePair & column,
         compressed_streams.emplace(stream_name, stream);
     };
 
-    column.type->enumerateStreams(serializations[column.name], callback);
+    ISerialization::SubstreamPath path;
+    serializations[column.name]->enumerateStreams(path, callback, column.type, nullptr);
 }
 
 namespace
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index 9902add9847..4263640c1e0 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -9,11 +9,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-namespace
-{
-    constexpr auto INDEX_FILE_EXTENSION = ".idx";
-}
-
 void MergeTreeDataPartWriterOnDisk::Stream::finalize()
 {
     compressed.next();
@@ -165,7 +160,7 @@ void MergeTreeDataPartWriterOnDisk::initSkipIndices()
                 std::make_unique<MergeTreeDataPartWriterOnDisk::Stream>(
                         stream_name,
                         data_part->volume->getDisk(),
-                        part_path + stream_name, INDEX_FILE_EXTENSION,
+                        part_path + stream_name, index_helper->getSerializedFileExtension(),
                         part_path + stream_name, marks_file_extension,
                         default_codec, settings.max_compress_block_size));
         skip_indices_aggregators.push_back(index_helper->createIndexAggregator());
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
index d952950e461..e64ba9edec0 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
@@ -6,7 +6,6 @@
 #include <Compression/CompressedWriteBuffer.h>
 #include <IO/HashingWriteBuffer.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Disks/IDisk.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index 8fccfbb1f90..224a197c3c8 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -90,17 +90,20 @@ void MergeTreeDataPartWriterWide::addStreams(
     const NameAndTypePair & column,
     const ASTPtr & effective_codec_desc)
 {
-    IDataType::StreamCallbackWithType callback = [&] (const ISerialization::SubstreamPath & substream_path, const IDataType & substream_type)
+    ISerialization::StreamCallback callback = [&](const auto & substream_path)
     {
+        assert(!substream_path.empty());
         String stream_name = ISerialization::getFileNameForStream(column, substream_path);
         /// Shared offsets for Nested type.
         if (column_streams.count(stream_name))
             return;
 
+        const auto & subtype = substream_path.back().data.type;
         CompressionCodecPtr compression_codec;
+
         /// If we can use special codec then just get it
         if (ISerialization::isSpecialCompressionAllowed(substream_path))
-            compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, &substream_type, default_codec);
+            compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, subtype.get(), default_codec);
         else /// otherwise return only generic codecs and don't use info about the` data_type
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, nullptr, default_codec, true);
 
@@ -113,7 +116,8 @@ void MergeTreeDataPartWriterWide::addStreams(
             settings.max_compress_block_size);
     };
 
-    column.type->enumerateStreams(serializations[column.name], callback);
+    ISerialization::SubstreamPath path;
+    serializations[column.name]->enumerateStreams(path, callback, column.type, nullptr);
 }
 
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 0b5351dcf01..55de92735c3 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -1,5 +1,5 @@
 #include <boost/rational.hpp>   /// For calculations related to sampling coefficients.
-#include <common/scope_guard_safe.h>
+#include <base/scope_guard_safe.h>
 #include <optional>
 #include <unordered_set>
 
@@ -24,6 +24,7 @@
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Processors/QueryPlan/UnionStep.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
 #include <Core/UUID.h>
 #include <DataTypes/DataTypeDate.h>
@@ -132,12 +133,14 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     QueryProcessingStage::Enum processed_stage,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
 {
+    if (query_info.merge_tree_empty_result)
+        return std::make_unique<QueryPlan>();
+
     const auto & settings = context->getSettingsRef();
-    auto parts = data.getDataPartsVector();
     if (!query_info.projection)
     {
         auto plan = readFromParts(
-            parts,
+            query_info.merge_tree_select_result_ptr ? MergeTreeData::DataPartsVector{} : data.getDataPartsVector(),
             column_names_to_return,
             metadata_snapshot,
             metadata_snapshot,
@@ -145,7 +148,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
             context,
             max_block_size,
             num_streams,
-            max_block_numbers_to_read);
+            max_block_numbers_to_read,
+            query_info.merge_tree_select_result_ptr);
 
         if (plan->isInitialized() && settings.allow_experimental_projection_optimization && settings.force_optimize_projection
             && !metadata_snapshot->projections.empty())
@@ -158,31 +162,27 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
 
     LOG_DEBUG(
         log,
-        "Choose {} projection {}",
-        ProjectionDescription::typeToString(query_info.projection->desc->type),
+        "Choose {} {} projection {}",
+        query_info.projection->complete ? "complete" : "incomplete",
+        query_info.projection->desc->type,
         query_info.projection->desc->name);
 
-    MergeTreeData::DataPartsVector projection_parts;
-    MergeTreeData::DataPartsVector normal_parts;
-    for (const auto & part : parts)
-    {
-        const auto & projections = part->getProjectionParts();
-        auto it = projections.find(query_info.projection->desc->name);
-        if (it != projections.end())
-            projection_parts.push_back(it->second);
-        else
-            normal_parts.push_back(part);
-    }
-
     Pipes pipes;
     Pipe projection_pipe;
     Pipe ordinary_pipe;
 
-    if (!projection_parts.empty())
+    auto projection_plan = std::make_unique<QueryPlan>();
+    if (query_info.projection->desc->is_minmax_count_projection)
+    {
+        Pipe pipe(std::make_shared<SourceFromSingleChunk>(query_info.minmax_count_projection_block));
+        auto read_from_pipe = std::make_unique<ReadFromPreparedSource>(std::move(pipe));
+        projection_plan->addStep(std::move(read_from_pipe));
+    }
+    else if (query_info.projection->merge_tree_projection_select_result_ptr)
     {
         LOG_DEBUG(log, "projection required columns: {}", fmt::join(query_info.projection->required_columns, ", "));
-        auto plan = readFromParts(
-            projection_parts,
+        projection_plan = readFromParts(
+            {},
             query_info.projection->required_columns,
             metadata_snapshot,
             query_info.projection->desc->metadata,
@@ -190,41 +190,40 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
             context,
             max_block_size,
             num_streams,
-            max_block_numbers_to_read);
-
-        if (plan)
-        {
-            // If `before_where` is not empty, transform input blocks by adding needed columns
-            // originated from key columns. We already project the block at the end, using
-            // projection_block, so we can just add more columns here without worrying
-            // NOTE: prewhere is executed inside readFromParts
-            if (query_info.projection->before_where)
-            {
-                auto where_step = std::make_unique<FilterStep>(
-                    plan->getCurrentDataStream(),
-                    query_info.projection->before_where,
-                    query_info.projection->where_column_name,
-                    query_info.projection->remove_where_filter);
-
-                where_step->setStepDescription("WHERE");
-                plan->addStep(std::move(where_step));
-            }
-
-            if (query_info.projection->before_aggregation)
-            {
-                auto expression_before_aggregation
-                    = std::make_unique<ExpressionStep>(plan->getCurrentDataStream(), query_info.projection->before_aggregation);
-                expression_before_aggregation->setStepDescription("Before GROUP BY");
-                plan->addStep(std::move(expression_before_aggregation));
-            }
-            projection_pipe = plan->convertToPipe(
-                QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
-        }
+            max_block_numbers_to_read,
+            query_info.projection->merge_tree_projection_select_result_ptr);
     }
 
-    if (!normal_parts.empty())
+    if (projection_plan->isInitialized())
     {
-        auto storage_from_base_parts_of_projection = StorageFromMergeTreeDataPart::create(std::move(normal_parts));
+        if (query_info.projection->before_where)
+        {
+            auto where_step = std::make_unique<FilterStep>(
+                projection_plan->getCurrentDataStream(),
+                query_info.projection->before_where,
+                query_info.projection->where_column_name,
+                query_info.projection->remove_where_filter);
+
+            where_step->setStepDescription("WHERE");
+            projection_plan->addStep(std::move(where_step));
+        }
+
+        if (query_info.projection->before_aggregation)
+        {
+            auto expression_before_aggregation
+                = std::make_unique<ExpressionStep>(projection_plan->getCurrentDataStream(), query_info.projection->before_aggregation);
+            expression_before_aggregation->setStepDescription("Before GROUP BY");
+            projection_plan->addStep(std::move(expression_before_aggregation));
+        }
+
+        projection_pipe = projection_plan->convertToPipe(
+            QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
+    }
+
+    if (query_info.projection->merge_tree_normal_select_result_ptr)
+    {
+        auto storage_from_base_parts_of_projection
+            = StorageFromMergeTreeDataPart::create(data, query_info.projection->merge_tree_normal_select_result_ptr);
         auto interpreter = InterpreterSelectQuery(
             query_info.query,
             context,
@@ -247,7 +246,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
             ordinary_query_plan.addStep(std::move(where_step));
         }
 
-        ordinary_pipe = QueryPipeline::getPipe(interpreter.execute().pipeline);
+        ordinary_pipe = ordinary_query_plan.convertToPipe(
+            QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
     }
 
     if (query_info.projection->desc->type == ProjectionDescription::Type::Aggregate)
@@ -266,6 +266,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
         auto many_data = std::make_shared<ManyAggregatedData>(projection_pipe.numOutputPorts() + ordinary_pipe.numOutputPorts());
         size_t counter = 0;
 
+        AggregatorListPtr aggregator_list_ptr = std::make_shared<AggregatorList>();
+
         // TODO apply in_order_optimization here
         auto build_aggregate_pipe = [&](Pipe & pipe, bool projection)
         {
@@ -305,7 +307,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
                     settings.min_count_to_compile_aggregate_expression,
                     header_before_aggregation); // The source header is also an intermediate header
 
-                transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), query_info.projection->aggregate_final);
+                transform_params = std::make_shared<AggregatingTransformParams>(
+                    std::move(params), aggregator_list_ptr, query_info.projection->aggregate_final);
 
                 /// This part is hacky.
                 /// We want AggregatingTransform to work with aggregate states instead of normal columns.
@@ -335,7 +338,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
                     settings.compile_aggregate_expressions,
                     settings.min_count_to_compile_aggregate_expression);
 
-                transform_params = std::make_shared<AggregatingTransformParams>(std::move(params), query_info.projection->aggregate_final);
+                transform_params = std::make_shared<AggregatingTransformParams>(
+                    std::move(params), aggregator_list_ptr, query_info.projection->aggregate_final);
             }
 
             pipe.resize(pipe.numOutputPorts(), true, true);
@@ -361,11 +365,14 @@ QueryPlanPtr MergeTreeDataSelectExecutor::read(
     pipes.emplace_back(std::move(projection_pipe));
     pipes.emplace_back(std::move(ordinary_pipe));
     auto pipe = Pipe::unitePipes(std::move(pipes));
-    // TODO what if pipe is empty?
-    pipe.resize(1);
-
-    auto step = std::make_unique<ReadFromStorageStep>(std::move(pipe), "MergeTree(with projection)");
     auto plan = std::make_unique<QueryPlan>();
+    if (pipe.empty())
+        return plan;
+
+    pipe.resize(1);
+    auto step = std::make_unique<ReadFromStorageStep>(
+        std::move(pipe),
+        fmt::format("MergeTree(with {} projection {})", query_info.projection->desc->type, query_info.projection->desc->name));
     plan->addStep(std::move(step));
     return plan;
 }
@@ -762,8 +769,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
     Poco::Logger * log,
     size_t num_streams,
     ReadFromMergeTree::IndexStats & index_stats,
-    bool use_skip_indexes,
-    bool check_limits)
+    bool use_skip_indexes)
 {
     RangesInDataParts parts_with_ranges(parts.size());
     const Settings & settings = context->getSettingsRef();
@@ -844,6 +850,9 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
         if (settings.read_overflow_mode_leaf == OverflowMode::THROW && settings.max_rows_to_read_leaf)
             leaf_limits = SizeLimits(settings.max_rows_to_read_leaf, 0, settings.read_overflow_mode_leaf);
 
+        auto mark_cache = context->getIndexMarkCache();
+        auto uncompressed_cache = context->getIndexUncompressedCache();
+
         auto process_part = [&](size_t part_index)
         {
             auto & part = parts[part_index];
@@ -880,6 +889,8 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
                     reader_settings,
                     total_granules,
                     granules_dropped,
+                    mark_cache.get(),
+                    uncompressed_cache.get(),
                     log);
 
                 index_and_condition.total_granules.fetch_add(total_granules, std::memory_order_relaxed);
@@ -891,7 +902,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
 
             if (!ranges.ranges.empty())
             {
-                if (check_limits && (limits.max_rows || leaf_limits.max_rows))
+                if (limits.max_rows || leaf_limits.max_rows)
                 {
                     /// Fail fast if estimated number of rows to read exceeds the limit
                     auto current_rows_estimate = ranges.getRowsCount();
@@ -976,7 +987,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
         index_stats.emplace_back(ReadFromMergeTree::IndexStat{
             .type = ReadFromMergeTree::IndexType::Skip,
             .name = index_name,
-            .description = std::move(description),
+            .description = std::move(description), //-V1030
             .num_parts_after = index_and_condition.total_parts - index_and_condition.parts_dropped,
             .num_granules_after = index_and_condition.total_granules - index_and_condition.granules_dropped});
     }
@@ -986,47 +997,48 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
 
 std::shared_ptr<QueryIdHolder> MergeTreeDataSelectExecutor::checkLimits(
     const MergeTreeData & data,
-    const RangesInDataParts & parts_with_ranges,
+    const ReadFromMergeTree::AnalysisResult & result,
     const ContextPtr & context)
 {
     const auto & settings = context->getSettingsRef();
-    // Check limitations. query_id is used as the quota RAII's resource key.
-    String query_id;
+    const auto data_settings = data.getSettings();
+    auto max_partitions_to_read
+        = settings.max_partitions_to_read.changed ? settings.max_partitions_to_read : data_settings->max_partitions_to_read;
+    if (max_partitions_to_read > 0)
     {
-        const auto data_settings = data.getSettings();
-        auto max_partitions_to_read
-                = settings.max_partitions_to_read.changed ? settings.max_partitions_to_read : data_settings->max_partitions_to_read;
-        if (max_partitions_to_read > 0)
-        {
-            std::set<String> partitions;
-            for (const auto & part_with_ranges : parts_with_ranges)
-                partitions.insert(part_with_ranges.data_part->info.partition_id);
-            if (partitions.size() > size_t(max_partitions_to_read))
-                throw Exception(
-                        ErrorCodes::TOO_MANY_PARTITIONS,
-                        "Too many partitions to read. Current {}, max {}",
-                        partitions.size(),
-                        max_partitions_to_read);
-        }
+        std::set<String> partitions;
+        for (const auto & part_with_ranges : result.parts_with_ranges)
+            partitions.insert(part_with_ranges.data_part->info.partition_id);
+        if (partitions.size() > size_t(max_partitions_to_read))
+            throw Exception(
+                ErrorCodes::TOO_MANY_PARTITIONS,
+                "Too many partitions to read. Current {}, max {}",
+                partitions.size(),
+                max_partitions_to_read);
+    }
 
-        if (data_settings->max_concurrent_queries > 0 && data_settings->min_marks_to_honor_max_concurrent_queries > 0)
+    if (data_settings->max_concurrent_queries > 0 && data_settings->min_marks_to_honor_max_concurrent_queries > 0
+        && result.selected_marks >= data_settings->min_marks_to_honor_max_concurrent_queries)
+    {
+        auto query_id = context->getCurrentQueryId();
+        if (!query_id.empty())
         {
-            size_t sum_marks = 0;
-            for (const auto & part : parts_with_ranges)
-                sum_marks += part.getMarksCount();
-
-            if (sum_marks >= data_settings->min_marks_to_honor_max_concurrent_queries)
+            auto lock = data.getQueryIdSetLock();
+            if (data.insertQueryIdOrThrowNoLock(query_id, data_settings->max_concurrent_queries, lock))
             {
-                query_id = context->getCurrentQueryId();
-                if (!query_id.empty())
-                    data.insertQueryIdOrThrow(query_id, data_settings->max_concurrent_queries);
+                try
+                {
+                    return std::make_shared<QueryIdHolder>(query_id, data);
+                }
+                catch (...)
+                {
+                    /// If we fail to construct the holder, remove query_id explicitly to avoid leak.
+                    data.removeQueryIdNoLock(query_id, lock);
+                    throw;
+                }
             }
         }
     }
-
-    if (!query_id.empty())
-        return std::make_shared<QueryIdHolder>(query_id, data);
-
     return nullptr;
 }
 
@@ -1081,7 +1093,7 @@ static void selectColumnNames(
     }
 }
 
-size_t MergeTreeDataSelectExecutor::estimateNumMarksToRead(
+MergeTreeDataSelectAnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMarksToRead(
     MergeTreeData::DataPartsVector parts,
     const Names & column_names_to_return,
     const StorageMetadataPtr & metadata_snapshot_base,
@@ -1093,7 +1105,8 @@ size_t MergeTreeDataSelectExecutor::estimateNumMarksToRead(
 {
     size_t total_parts = parts.size();
     if (total_parts == 0)
-        return 0;
+        return std::make_shared<MergeTreeDataSelectAnalysisResult>(
+            MergeTreeDataSelectAnalysisResult{.result = ReadFromMergeTree::AnalysisResult()});
 
     Names real_column_names;
     Names virt_column_names;
@@ -1103,63 +1116,18 @@ size_t MergeTreeDataSelectExecutor::estimateNumMarksToRead(
 
     selectColumnNames(column_names_to_return, data, real_column_names, virt_column_names, sample_factor_column_queried);
 
-    auto part_values = filterPartsByVirtualColumns(data, parts, query_info.query, context);
-    if (part_values && part_values->empty())
-        return 0;
-
-    /// If there are only virtual columns in the query, you must request at least one non-virtual one.
-    if (real_column_names.empty())
-    {
-        NamesAndTypesList available_real_columns = metadata_snapshot->getColumns().getAllPhysical();
-        real_column_names.push_back(ExpressionActions::getSmallestColumn(available_real_columns));
-    }
-
-    metadata_snapshot->check(real_column_names, data.getVirtuals(), data.getStorageID());
-
-    const auto & primary_key = metadata_snapshot->getPrimaryKey();
-    Names primary_key_columns = primary_key.column_names;
-    KeyCondition key_condition(query_info, context, primary_key_columns, primary_key.expression);
-
-    if (key_condition.alwaysUnknownOrTrue())
-    {
-        size_t total_marks = 0;
-        for (const auto & part : parts)
-            total_marks += part->index_granularity.getMarksCountWithoutFinal();
-
-        return total_marks;
-    }
-
-    const auto & select = query_info.query->as<ASTSelectQuery &>();
-    ReadFromMergeTree::IndexStats index_stats;
-
-    filterPartsByPartition(
-        parts, part_values, metadata_snapshot_base, data, query_info,
-        context, max_block_numbers_to_read.get(), log, index_stats);
-
-    auto sampling = MergeTreeDataSelectExecutor::getSampling(
-        select, metadata_snapshot->getColumns().getAllPhysical(), parts, key_condition,
-        data, metadata_snapshot, context, sample_factor_column_queried, log);
-
-    if (sampling.read_nothing)
-        return 0;
-
-    /// Do not init. It is not used (cause skip index is ignored)
-    MergeTreeReaderSettings reader_settings;
-
-    auto parts_with_ranges = filterPartsByPrimaryKeyAndSkipIndexes(
+    return ReadFromMergeTree::selectRangesToRead(
         std::move(parts),
+        metadata_snapshot_base,
         metadata_snapshot,
         query_info,
         context,
-        key_condition,
-        reader_settings,
-        log,
         num_streams,
-        index_stats,
-        true /* use_skip_indexes */,
-        false /* check_limits */);
-
-    return index_stats.back().num_granules_after;
+        max_block_numbers_to_read,
+        data,
+        real_column_names,
+        sample_factor_column_queried,
+        log);
 }
 
 QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
@@ -1171,10 +1139,16 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     ContextPtr context,
     const UInt64 max_block_size,
     const unsigned num_streams,
-    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
+    std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
+    MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr) const
 {
-    size_t total_parts = parts.size();
-    if (total_parts == 0)
+    /// If merge_tree_select_result_ptr != nullptr, we use analyzed result so parts will always be empty.
+    if (merge_tree_select_result_ptr)
+    {
+        if (merge_tree_select_result_ptr->marks() == 0)
+            return std::make_unique<QueryPlan>();
+    }
+    else if (parts.empty())
         return std::make_unique<QueryPlan>();
 
     Names real_column_names;
@@ -1186,7 +1160,7 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
     selectColumnNames(column_names_to_return, data, real_column_names, virt_column_names, sample_factor_column_queried);
 
     auto read_from_merge_tree = std::make_unique<ReadFromMergeTree>(
-        parts,
+        std::move(parts),
         real_column_names,
         virt_column_names,
         data,
@@ -1198,7 +1172,8 @@ QueryPlanPtr MergeTreeDataSelectExecutor::readFromParts(
         num_streams,
         sample_factor_column_queried,
         max_block_numbers_to_read,
-        log
+        log,
+        merge_tree_select_result_ptr
     );
 
     QueryPlanPtr plan = std::make_unique<QueryPlan>();
@@ -1299,7 +1274,7 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
             field = {index_columns.get(), row, column};
             // NULL_LAST
             if (field.isNull())
-                field = PositiveInfinity{};
+                field = POSITIVE_INFINITY;
         };
     }
     else
@@ -1309,7 +1284,7 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
             index[column]->get(row, field);
             // NULL_LAST
             if (field.isNull())
-                field = PositiveInfinity{};
+                field = POSITIVE_INFINITY;
         };
     }
 
@@ -1324,7 +1299,7 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
             for (size_t i = 0; i < used_key_size; ++i)
             {
                 create_field_ref(range.begin, i, index_left[i]);
-                index_right[i] = PositiveInfinity{};
+                index_right[i] = POSITIVE_INFINITY;
             }
         }
         else
@@ -1455,11 +1430,14 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
     const MergeTreeReaderSettings & reader_settings,
     size_t & total_granules,
     size_t & granules_dropped,
+    MarkCache * mark_cache,
+    UncompressedCache * uncompressed_cache,
     Poco::Logger * log)
 {
-    if (!part->volume->getDisk()->exists(part->getFullRelativePath() + index_helper->getFileName() + ".idx"))
+    const std::string & path_prefix = part->getFullRelativePath() + index_helper->getFileName();
+    if (!index_helper->getDeserializedFormat(part->volume->getDisk(), path_prefix))
     {
-        LOG_DEBUG(log, "File for index {} does not exist. Skipping it.", backQuote(index_helper->index.name));
+        LOG_DEBUG(log, "File for index {} does not exist ({}.*). Skipping it.", backQuote(index_helper->index.name), path_prefix);
         return ranges;
     }
 
@@ -1479,6 +1457,8 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
         index_helper, part,
         index_marks_count,
         ranges,
+        mark_cache,
+        uncompressed_cache,
         reader_settings);
 
     MarkRanges res;
@@ -1560,7 +1540,7 @@ void MergeTreeDataSelectExecutor::selectPartsToRead(
         counters.num_initial_selected_granules += num_granules;
 
         if (minmax_idx_condition && !minmax_idx_condition->checkInHyperrectangle(
-                part->minmax_idx.hyperrectangle, minmax_columns_types).can_be_true)
+                part->minmax_idx->hyperrectangle, minmax_columns_types).can_be_true)
             continue;
 
         counters.num_parts_after_minmax += 1;
@@ -1630,7 +1610,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
             counters.num_initial_selected_granules += num_granules;
 
             if (minmax_idx_condition
-                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx.hyperrectangle, minmax_columns_types)
+                && !minmax_idx_condition->checkInHyperrectangle(part->minmax_idx->hyperrectangle, minmax_columns_types)
                         .can_be_true)
                 continue;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index de5ca1f0138..04eb75a0dbb 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -13,15 +13,6 @@ namespace DB
 
 class KeyCondition;
 
-struct MergeTreeDataSelectSamplingData
-{
-    bool use_sampling = false;
-    bool read_nothing = false;
-    Float64 used_sample_factor = 1.0;
-    std::shared_ptr<ASTFunction> filter_function;
-    ActionsDAGPtr filter_expression;
-};
-
 using PartitionIdToMaxBlock = std::unordered_map<String, Int64>;
 
 /** Executes SELECT queries on data from the merge tree.
@@ -55,12 +46,13 @@ public:
         ContextPtr context,
         UInt64 max_block_size,
         unsigned num_streams,
-        std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
+        std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr,
+        MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr = nullptr) const;
 
     /// Get an estimation for the number of marks we are going to read.
     /// Reads nothing. Secondary indexes are not used.
     /// This method is used to select best projection for table.
-    size_t estimateNumMarksToRead(
+    MergeTreeDataSelectAnalysisResultPtr estimateNumMarksToRead(
         MergeTreeData::DataPartsVector parts,
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot_base,
@@ -98,6 +90,8 @@ private:
         const MergeTreeReaderSettings & reader_settings,
         size_t & total_granules,
         size_t & granules_dropped,
+        MarkCache * mark_cache,
+        UncompressedCache * uncompressed_cache,
         Poco::Logger * log);
 
     struct PartFilterCounters
@@ -185,8 +179,7 @@ public:
         Poco::Logger * log,
         size_t num_streams,
         ReadFromMergeTree::IndexStats & index_stats,
-        bool use_skip_indexes,
-        bool check_limits);
+        bool use_skip_indexes);
 
     /// Create expression for sampling.
     /// Also, calculate _sample_factor if needed.
@@ -206,7 +199,7 @@ public:
     /// Also, return QueryIdHolder. If not null, we should keep it until query finishes.
     static std::shared_ptr<QueryIdHolder> checkLimits(
         const MergeTreeData & data,
-        const RangesInDataParts & parts_with_ranges,
+        const ReadFromMergeTree::AnalysisResult & result,
         const ContextPtr & context);
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 0b05650b42c..2cf24215d28 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -12,9 +12,7 @@
 #include <DataTypes/DataTypeDate.h>
 #include <IO/WriteHelpers.h>
 #include <Common/typeid_cast.h>
-#include <DataStreams/ITTLAlgorithm.h>
-#include <DataStreams/OneBlockInputStream.h>
-#include <DataStreams/SquashingBlockInputStream.h>
+#include <Processors/TTL/ITTLAlgorithm.h>
 
 #include <Parsers/queryToString.h>
 
@@ -277,8 +275,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
     /// This will generate unique name in scope of current server process.
     Int64 temp_index = data.insert_increment.get();
 
-    IMergeTreeDataPart::MinMaxIndex minmax_idx;
-    minmax_idx.update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    auto minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
+    minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
 
     MergeTreePartition partition(std::move(block_with_partition.partition));
 
@@ -286,8 +284,8 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
     String part_name;
     if (data.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
-        DayNum min_date(minmax_idx.hyperrectangle[data.minmax_idx_date_column_pos].left.get<UInt64>());
-        DayNum max_date(minmax_idx.hyperrectangle[data.minmax_idx_date_column_pos].right.get<UInt64>());
+        DayNum min_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].left.get<UInt64>());
+        DayNum max_date(minmax_idx->hyperrectangle[data.minmax_idx_date_column_pos].right.get<UInt64>());
 
         const auto & date_lut = DateLUT::instance();
 
@@ -386,31 +384,6 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
             sync_guard = disk->getDirectorySyncGuard(full_path);
     }
 
-    if (metadata_snapshot->hasProjections())
-    {
-        for (const auto & projection : metadata_snapshot->getProjections())
-        {
-            auto in = InterpreterSelectQuery(
-                          projection.query_ast,
-                          context,
-                          Pipe(std::make_shared<SourceFromSingleChunk>(block, Chunk(block.getColumns(), block.rows()))),
-                          SelectQueryOptions{
-                              projection.type == ProjectionDescription::Type::Normal ? QueryProcessingStage::FetchColumns : QueryProcessingStage::WithMergeableState})
-                          .execute()
-                          .getInputStream();
-            in = std::make_shared<SquashingBlockInputStream>(in, block.rows(), std::numeric_limits<UInt64>::max());
-            in->readPrefix();
-            auto projection_block = in->read();
-            if (in->read())
-                throw Exception("Projection cannot grow block rows", ErrorCodes::LOGICAL_ERROR);
-            in->readSuffix();
-            if (projection_block.rows())
-            {
-                new_data_part->addProjectionPart(projection.name, writeProjectionPart(projection_block, projection, new_data_part.get()));
-            }
-        }
-    }
-
     if (metadata_snapshot->hasRowsTTL())
         updateTTL(metadata_snapshot->getRowsTTL(), new_data_part->ttl_infos, new_data_part->ttl_infos.table_ttl, block, true);
 
@@ -437,8 +410,15 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
     MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, index_factory.getMany(metadata_snapshot->getSecondaryIndices()), compression_codec);
     bool sync_on_insert = data.getSettings()->fsync_after_insert;
 
-    out.writePrefix();
     out.writeWithPermutation(block, perm_ptr);
+
+    for (const auto & projection : metadata_snapshot->getProjections())
+    {
+        auto projection_block = projection.calculate(block, context);
+        if (projection_block.rows())
+            new_data_part->addProjectionPart(
+                projection.name, writeProjectionPart(data, log, projection_block, projection, new_data_part.get()));
+    }
     out.writeSuffixAndFinalizePart(new_data_part, sync_on_insert);
 
     ProfileEvents::increment(ProfileEvents::MergeTreeDataWriterRows, block.rows());
@@ -449,18 +429,28 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(
 }
 
 MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeProjectionPartImpl(
-    MergeTreeData & data,
+    const String part_name,
+    MergeTreeDataPartType part_type,
+    const String & relative_path,
+    bool is_temp,
+    const IMergeTreeDataPart * parent_part,
+    const MergeTreeData & data,
     Poco::Logger * log,
     Block block,
-    const StorageMetadataPtr & metadata_snapshot,
-    MergeTreeData::MutableDataPartPtr && new_data_part)
+    const StorageMetadataPtr & metadata_snapshot)
 {
+    MergeTreePartInfo new_part_info("all", 0, 0, 0);
+    auto new_data_part = data.createPart(
+        part_name,
+        part_type,
+        new_part_info,
+        parent_part->volume,
+        relative_path,
+        parent_part);
+    new_data_part->is_temp = is_temp;
+
     NamesAndTypesList columns = metadata_snapshot->getColumns().getAllPhysical().filter(block.getNames());
-    MergeTreePartition partition{};
-    IMergeTreeDataPart::MinMaxIndex minmax_idx{};
     new_data_part->setColumns(columns);
-    new_data_part->partition = std::move(partition);
-    new_data_part->minmax_idx = std::move(minmax_idx);
 
     if (new_data_part->isStoredOnDisk())
     {
@@ -515,7 +505,6 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeProjectionPartImpl(
         {},
         compression_codec);
 
-    out.writePrefix();
     out.writeWithPermutation(block, perm_ptr);
     out.writeSuffixAndFinalizePart(new_data_part);
 
@@ -523,27 +512,41 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeProjectionPartImpl(
     ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterUncompressedBytes, block.bytes());
     ProfileEvents::increment(ProfileEvents::MergeTreeDataProjectionWriterCompressedBytes, new_data_part->getBytesOnDisk());
 
-    return std::move(new_data_part);
+    return new_data_part;
 }
 
-MergeTreeData::MutableDataPartPtr
-MergeTreeDataWriter::writeProjectionPart(Block block, const ProjectionDescription & projection, const IMergeTreeDataPart * parent_part)
+MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeProjectionPart(
+    MergeTreeData & data, Poco::Logger * log, Block block, const ProjectionDescription & projection, const IMergeTreeDataPart * parent_part)
 {
-    /// Size of part would not be greater than block.bytes() + epsilon
-    size_t expected_size = block.bytes();
-
-    // just check if there is enough space on parent volume
-    data.reserveSpace(expected_size, parent_part->volume);
-
     String part_name = projection.name;
-    MergeTreePartInfo new_part_info("all", 0, 0, 0);
-    auto new_data_part = data.createPart(
-        part_name, data.choosePartType(expected_size, block.rows()), new_part_info, parent_part->volume, part_name + ".proj", parent_part);
-    new_data_part->is_temp = false; // clean up will be done on parent part
+    MergeTreeDataPartType part_type;
+    if (parent_part->getType() == MergeTreeDataPartType::IN_MEMORY)
+    {
+        part_type = MergeTreeDataPartType::IN_MEMORY;
+    }
+    else
+    {
+        /// Size of part would not be greater than block.bytes() + epsilon
+        size_t expected_size = block.bytes();
+        // just check if there is enough space on parent volume
+        data.reserveSpace(expected_size, parent_part->volume);
+        part_type = data.choosePartTypeOnDisk(expected_size, block.rows());
+    }
 
-    return writeProjectionPartImpl(data, log, block, projection.metadata, std::move(new_data_part));
+    return writeProjectionPartImpl(
+        part_name,
+        part_type,
+        part_name + ".proj" /* relative_path */,
+        false /* is_temp */,
+        parent_part,
+        data,
+        log,
+        block,
+        projection.metadata);
 }
 
+/// This is used for projection materialization process which may contain multiple stages of
+/// projection part merges.
 MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempProjectionPart(
     MergeTreeData & data,
     Poco::Logger * log,
@@ -552,24 +555,50 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempProjectionPart(
     const IMergeTreeDataPart * parent_part,
     size_t block_num)
 {
-    /// Size of part would not be greater than block.bytes() + epsilon
-    size_t expected_size = block.bytes();
-
-    // just check if there is enough space on parent volume
-    data.reserveSpace(expected_size, parent_part->volume);
-
     String part_name = fmt::format("{}_{}", projection.name, block_num);
-    MergeTreePartInfo new_part_info("all", 0, 0, 0);
-    auto new_data_part = data.createPart(
+    MergeTreeDataPartType part_type;
+    if (parent_part->getType() == MergeTreeDataPartType::IN_MEMORY)
+    {
+        part_type = MergeTreeDataPartType::IN_MEMORY;
+    }
+    else
+    {
+        /// Size of part would not be greater than block.bytes() + epsilon
+        size_t expected_size = block.bytes();
+        // just check if there is enough space on parent volume
+        data.reserveSpace(expected_size, parent_part->volume);
+        part_type = data.choosePartTypeOnDisk(expected_size, block.rows());
+    }
+
+    return writeProjectionPartImpl(
         part_name,
-        data.choosePartType(expected_size, block.rows()),
-        new_part_info,
-        parent_part->volume,
-        "tmp_insert_" + part_name + ".proj",
-        parent_part);
-    new_data_part->is_temp = true; // It's part for merge
+        part_type,
+        part_name + ".tmp_proj" /* relative_path */,
+        true /* is_temp */,
+        parent_part,
+        data,
+        log,
+        block,
+        projection.metadata);
+}
 
-    return writeProjectionPartImpl(data, log, block, projection.metadata, std::move(new_data_part));
+MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeInMemoryProjectionPart(
+    const MergeTreeData & data,
+    Poco::Logger * log,
+    Block block,
+    const ProjectionDescription & projection,
+    const IMergeTreeDataPart * parent_part)
+{
+    return writeProjectionPartImpl(
+        projection.name,
+        MergeTreeDataPartType::IN_MEMORY,
+        projection.name + ".proj" /* relative_path */,
+        false /* is_temp */,
+        parent_part,
+        data,
+        log,
+        block,
+        projection.metadata);
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.h b/src/Storages/MergeTree/MergeTreeDataWriter.h
index feb2f1e2b12..006f897c3e2 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.h
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.h
@@ -49,9 +49,15 @@ public:
     MergeTreeData::MutableDataPartPtr
     writeTempPart(BlockWithPartition & block, const StorageMetadataPtr & metadata_snapshot, ContextPtr context);
 
-    MergeTreeData::MutableDataPartPtr writeProjectionPart(
-        Block block, const ProjectionDescription & projection, const IMergeTreeDataPart * parent_part);
+    /// For insertion.
+    static MergeTreeData::MutableDataPartPtr writeProjectionPart(
+        MergeTreeData & data,
+        Poco::Logger * log,
+        Block block,
+        const ProjectionDescription & projection,
+        const IMergeTreeDataPart * parent_part);
 
+    /// For mutation: MATERIALIZE PROJECTION.
     static MergeTreeData::MutableDataPartPtr writeTempProjectionPart(
         MergeTreeData & data,
         Poco::Logger * log,
@@ -60,15 +66,27 @@ public:
         const IMergeTreeDataPart * parent_part,
         size_t block_num);
 
+    /// For WriteAheadLog AddPart.
+    static MergeTreeData::MutableDataPartPtr writeInMemoryProjectionPart(
+        const MergeTreeData & data,
+        Poco::Logger * log,
+        Block block,
+        const ProjectionDescription & projection,
+        const IMergeTreeDataPart * parent_part);
+
     Block mergeBlock(const Block & block, SortDescription sort_description, Names & partition_key_columns, IColumn::Permutation *& permutation);
 
 private:
     static MergeTreeData::MutableDataPartPtr writeProjectionPartImpl(
-        MergeTreeData & data,
+        const String part_name,
+        MergeTreeDataPartType part_type,
+        const String & relative_path,
+        bool is_temp,
+        const IMergeTreeDataPart * parent_part,
+        const MergeTreeData & data,
         Poco::Logger * log,
         Block block,
-        const StorageMetadataPtr & metadata_snapshot,
-        MergeTreeData::MutableDataPartPtr && new_data_part);
+        const StorageMetadataPtr & metadata_snapshot);
 
     MergeTreeData & data;
 
diff --git a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
index 281a76050a2..eda217798b2 100644
--- a/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
+++ b/src/Storages/MergeTree/MergeTreeDeduplicationLog.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Core/Types.h>
-#include <common/StringRef.h>
+#include <base/StringRef.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <map>
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index dd241cfd591..aaa8fae7dba 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -13,15 +13,11 @@ using MMappedFileCachePtr = std::shared_ptr<MMappedFileCache>;
 
 struct MergeTreeReaderSettings
 {
-    size_t min_bytes_to_use_direct_io = 0;
-    size_t min_bytes_to_use_mmap_io = 0;
-    MMappedFileCachePtr mmap_cache;
-    size_t max_read_buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+    /// Common read settings.
+    ReadSettings read_settings;
     /// If save_marks_in_cache is false, then, if marks are not in cache,
     ///  we will load them but won't save in the cache, to avoid evicting other data.
     bool save_marks_in_cache = false;
-    /// Convert old-style nested (single arrays with same prefix, `n.a`, `n.b`...) to subcolumns of data type Nested.
-    bool convert_nested_to_subcolumns = false;
     /// Validate checksums on reading (should be always enabled in production).
     bool checksum_on_read = true;
 };
diff --git a/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
index 90178ec38b9..b19080b5097 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.h>
 
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnFixedString.h>
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
index 83c29c40c3f..950765ed2b9 100644
--- a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -2,8 +2,8 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <common/types.h>
-#include <common/bit_cast.h>
+#include <base/types.h>
+#include <base/bit_cast.h>
 #include <Parsers/ASTLiteral.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -46,20 +46,29 @@ MergeTreeIndexGranulePtr MergeTreeIndexBloomFilter::createIndexGranule() const
 
 bool MergeTreeIndexBloomFilter::mayBenefitFromIndexForIn(const ASTPtr & node) const
 {
-    const String & column_name = node->getColumnName();
+    Names required_columns = index.expression->getRequiredColumns();
+    NameSet required_columns_set(required_columns.begin(), required_columns.end());
 
-    for (const auto & cname : index.column_names)
-        if (column_name == cname)
+    std::vector<ASTPtr> nodes_to_check;
+    nodes_to_check.emplace_back(node);
+
+    while (!nodes_to_check.empty())
+    {
+        auto node_to_check = nodes_to_check.back();
+        nodes_to_check.pop_back();
+
+        const auto & column_name = node_to_check->getColumnName();
+        if (required_columns_set.find(column_name) != required_columns_set.end())
             return true;
 
-    if (const auto * func = typeid_cast<const ASTFunction *>(node.get()))
-    {
-        for (const auto & children : func->arguments->children)
-            if (mayBenefitFromIndexForIn(children))
-                return true;
+        if (const auto * function = typeid_cast<const ASTFunction *>(node_to_check.get()))
+        {
+            auto & function_arguments_children = function->arguments->children;
+            nodes_to_check.insert(nodes_to_check.end(), function_arguments_children.begin(), function_arguments_children.end());
+        }
     }
 
-    return false;
+    return true;
 }
 
 MergeTreeIndexAggregatorPtr MergeTreeIndexBloomFilter::createIndexAggregator() const
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index 6b5a2c6ee17..2057dec957e 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -1,6 +1,7 @@
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnTuple.h>
@@ -51,7 +52,18 @@ ColumnWithTypeAndName getPreparedSetInfo(const SetPtr & prepared_set)
     return {ColumnTuple::create(set_elements), std::make_shared<DataTypeTuple>(prepared_set->getElementsTypes()), "dummy"};
 }
 
-bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr & bloom_filter, size_t hash_functions)
+bool hashMatchesFilter(const BloomFilterPtr& bloom_filter, UInt64 hash, size_t hash_functions)
+{
+    return std::all_of(BloomFilterHash::bf_hash_seed,
+                       BloomFilterHash::bf_hash_seed + hash_functions,
+                       [&](const auto &hash_seed)
+                       {
+                           return bloom_filter->findHashWithSeed(hash,
+                                                                 hash_seed);
+                       });
+}
+
+bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr & bloom_filter, size_t hash_functions, bool match_all)
 {
     const auto * const_column = typeid_cast<const ColumnConst *>(hash_column);
     const auto * non_const_column = typeid_cast<const ColumnUInt64 *>(hash_column);
@@ -61,26 +73,34 @@ bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr &
 
     if (const_column)
     {
-        for (size_t index = 0; index < hash_functions; ++index)
-            if (!bloom_filter->findHashWithSeed(const_column->getValue<UInt64>(), BloomFilterHash::bf_hash_seed[index]))
-                return false;
-        return true;
+        return hashMatchesFilter(bloom_filter,
+                                 const_column->getValue<UInt64>(),
+                                 hash_functions);
+    }
+
+    const ColumnUInt64::Container & hashes = non_const_column->getData();
+
+    if (match_all)
+    {
+        return std::all_of(hashes.begin(),
+                           hashes.end(),
+                           [&](const auto& hash_row)
+                           {
+                               return hashMatchesFilter(bloom_filter,
+                                                        hash_row,
+                                                        hash_functions);
+                           });
     }
     else
     {
-        bool missing_rows = true;
-        const ColumnUInt64::Container & data = non_const_column->getData();
-
-        for (size_t index = 0, size = data.size(); missing_rows && index < size; ++index)
-        {
-            bool match_row = true;
-            for (size_t hash_index = 0; match_row && hash_index < hash_functions; ++hash_index)
-                match_row = bloom_filter->findHashWithSeed(data[index], BloomFilterHash::bf_hash_seed[hash_index]);
-
-            missing_rows = !match_row;
-        }
-
-        return !missing_rows;
+        return std::any_of(hashes.begin(),
+                           hashes.end(),
+                           [&](const auto& hash_row)
+                           {
+                               return hashMatchesFilter(bloom_filter,
+                                                        hash_row,
+                                                        hash_functions);
+                           });
     }
 }
 
@@ -109,6 +129,7 @@ bool MergeTreeIndexConditionBloomFilter::alwaysUnknownOrTrue() const
             || element.function == RPNElement::FUNCTION_NOT_EQUALS
             || element.function == RPNElement::FUNCTION_HAS
             || element.function == RPNElement::FUNCTION_HAS_ANY
+            || element.function == RPNElement::FUNCTION_HAS_ALL
             || element.function == RPNElement::FUNCTION_IN
             || element.function == RPNElement::FUNCTION_NOT_IN
             || element.function == RPNElement::ALWAYS_FALSE)
@@ -156,16 +177,22 @@ bool MergeTreeIndexConditionBloomFilter::mayBeTrueOnGranule(const MergeTreeIndex
             || element.function == RPNElement::FUNCTION_EQUALS
             || element.function == RPNElement::FUNCTION_NOT_EQUALS
             || element.function == RPNElement::FUNCTION_HAS
-            || element.function == RPNElement::FUNCTION_HAS_ANY)
+            || element.function == RPNElement::FUNCTION_HAS_ANY
+            || element.function == RPNElement::FUNCTION_HAS_ALL)
         {
             bool match_rows = true;
+            bool match_all = element.function == RPNElement::FUNCTION_HAS_ALL;
             const auto & predicate = element.predicate;
             for (size_t index = 0; match_rows && index < predicate.size(); ++index)
             {
                 const auto & query_index_hash = predicate[index];
                 const auto & filter = filters[query_index_hash.first];
                 const ColumnPtr & hash_column = query_index_hash.second;
-                match_rows = maybeTrueOnBloomFilter(&*hash_column, filter, hash_functions);
+
+                match_rows = maybeTrueOnBloomFilter(&*hash_column,
+                                                    filter,
+                                                    hash_functions,
+                                                    match_all);
             }
 
             rpn_stack.emplace_back(match_rows, true);
@@ -249,13 +276,21 @@ bool MergeTreeIndexConditionBloomFilter::traverseFunction(const ASTPtr & node, B
 
         if (functionIsInOrGlobalInOperator(function->name))
         {
-            if (const auto & prepared_set = getPreparedSet(arguments[1]))
+            auto prepared_set = getPreparedSet(arguments[1]);
+
+            if (prepared_set)
             {
                 if (traverseASTIn(function->name, arguments[0], prepared_set, out))
                     maybe_useful = true;
             }
         }
-        else if (function->name == "equals" || function->name  == "notEquals" || function->name == "has" || function->name == "indexOf" || function->name == "hasAny")
+        else if (function->name == "equals" ||
+                 function->name == "notEquals" ||
+                 function->name == "has" ||
+                 function->name == "mapContains" ||
+                 function->name == "indexOf" ||
+                 function->name == "hasAny" ||
+                 function->name == "hasAll")
         {
             Field const_value;
             DataTypePtr const_type;
@@ -276,14 +311,22 @@ bool MergeTreeIndexConditionBloomFilter::traverseFunction(const ASTPtr & node, B
 }
 
 bool MergeTreeIndexConditionBloomFilter::traverseASTIn(
-    const String & function_name, const ASTPtr & key_ast, const SetPtr & prepared_set, RPNElement & out)
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const SetPtr & prepared_set,
+    RPNElement & out)
 {
     const auto prepared_info = getPreparedSetInfo(prepared_set);
-    return traverseASTIn(function_name, key_ast, prepared_info.type, prepared_info.column, out);
+    return traverseASTIn(function_name, key_ast, prepared_set, prepared_info.type, prepared_info.column, out);
 }
 
 bool MergeTreeIndexConditionBloomFilter::traverseASTIn(
-    const String & function_name, const ASTPtr & key_ast, const DataTypePtr & type, const ColumnPtr & column, RPNElement & out)
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const SetPtr & prepared_set,
+    const DataTypePtr & type,
+    const ColumnPtr & column,
+    RPNElement & out)
 {
     if (header.has(key_ast->getColumnName()))
     {
@@ -320,10 +363,86 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTIn(
             const auto & sub_data_types = tuple_data_type->getElements();
 
             for (size_t index = 0; index < arguments.size(); ++index)
-                match_with_subtype |= traverseASTIn(function_name, arguments[index], sub_data_types[index], sub_columns[index], out);
+                match_with_subtype |= traverseASTIn(function_name, arguments[index], nullptr, sub_data_types[index], sub_columns[index], out);
 
             return match_with_subtype;
         }
+
+        if (function->name == "arrayElement")
+        {
+            /** Try to parse arrayElement for mapKeys index.
+              * It is important to ignore keys like column_map['Key'] IN ('') because if key does not exists in map
+              * we return default value for arrayElement.
+              *
+              * We cannot skip keys that does not exist in map if comparison is with default type value because
+              * that way we skip necessary granules where map key does not exists.
+              */
+
+            if (!prepared_set)
+                return false;
+
+            auto default_column_to_check = type->createColumnConstWithDefaultValue(1)->convertToFullColumnIfConst();
+            ColumnWithTypeAndName default_column_with_type_to_check { default_column_to_check, type, "" };
+            ColumnsWithTypeAndName default_columns_with_type_to_check = {default_column_with_type_to_check};
+            auto set_contains_default_value_predicate_column = prepared_set->execute(default_columns_with_type_to_check, false /*negative*/);
+            const auto & set_contains_default_value_predicate_column_typed = assert_cast<const ColumnUInt8 &>(*set_contains_default_value_predicate_column);
+            bool set_contain_default_value = set_contains_default_value_predicate_column_typed.getData()[0];
+            if (set_contain_default_value)
+                return false;
+
+            const auto * column_ast_identifier = function->arguments.get()->children[0].get()->as<ASTIdentifier>();
+            if (!column_ast_identifier)
+                return false;
+
+            const auto & col_name = column_ast_identifier->name();
+            auto map_keys_index_column_name = fmt::format("mapKeys({})", col_name);
+            auto map_values_index_column_name = fmt::format("mapValues({})", col_name);
+
+            if (header.has(map_keys_index_column_name))
+            {
+                /// For mapKeys we serialize key argument with bloom filter
+
+                auto & argument = function->arguments.get()->children[1];
+
+                if (const auto * literal = argument->as<ASTLiteral>())
+                {
+                    size_t position = header.getPositionByName(map_keys_index_column_name);
+                    const DataTypePtr & index_type = header.getByPosition(position).type;
+
+                    auto element_key = literal->value;
+                    const DataTypePtr actual_type = BloomFilter::getPrimitiveType(index_type);
+                    out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), element_key)));
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (header.has(map_values_index_column_name))
+            {
+                /// For mapValues we serialize set with bloom filter
+
+                size_t row_size = column->size();
+                size_t position = header.getPositionByName(map_values_index_column_name);
+                const DataTypePtr & index_type = header.getByPosition(position).type;
+                const auto & array_type = assert_cast<const DataTypeArray &>(*index_type);
+                const auto & array_nested_type = array_type.getNestedType();
+                const auto & converted_column = castColumn(ColumnWithTypeAndName{column, type, ""}, array_nested_type);
+                out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithColumn(array_nested_type, converted_column, 0, row_size)));
+            }
+            else
+            {
+                return false;
+            }
+
+            if (function_name == "in"  || function_name == "globalIn")
+                out.function = RPNElement::FUNCTION_IN;
+
+            if (function_name == "notIn"  || function_name == "globalNotIn")
+                out.function = RPNElement::FUNCTION_NOT_IN;
+
+            return true;
+        }
     }
 
     return false;
@@ -388,7 +507,12 @@ static bool indexOfCanUseBloomFilter(const ASTPtr & parent)
 
 
 bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
-    const String & function_name, const ASTPtr & key_ast, const DataTypePtr & value_type, const Field & value_field, RPNElement & out, const ASTPtr & parent)
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const DataTypePtr & value_type,
+    const Field & value_field,
+    RPNElement & out,
+    const ASTPtr & parent)
 {
     if (header.has(key_ast->getColumnName()))
     {
@@ -412,7 +536,7 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
                 out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), converted_field)));
             }
         }
-        else if (function_name == "hasAny")
+        else if (function_name == "hasAny" || function_name == "hasAll")
         {
             if (!array_type)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be an array.", function_name);
@@ -437,7 +561,9 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
                 column = std::move(mutable_column);
             }
 
-            out.function = RPNElement::FUNCTION_HAS_ANY;
+            out.function = function_name == "hasAny" ?
+                RPNElement::FUNCTION_HAS_ANY :
+                RPNElement::FUNCTION_HAS_ALL;
             out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithColumn(actual_type, column, 0, column->size())));
         }
         else
@@ -454,6 +580,33 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
         return true;
     }
 
+    if (function_name == "mapContains" || function_name == "has")
+    {
+        const auto * key_ast_identifier = key_ast.get()->as<const ASTIdentifier>();
+        if (!key_ast_identifier)
+            return false;
+
+        const auto & col_name = key_ast_identifier->name();
+        auto map_keys_index_column_name = fmt::format("mapKeys({})", col_name);
+
+        if (!header.has(map_keys_index_column_name))
+            return false;
+
+        size_t position = header.getPositionByName(map_keys_index_column_name);
+        const DataTypePtr & index_type = header.getByPosition(position).type;
+        const auto * array_type = typeid_cast<const DataTypeArray *>(index_type.get());
+
+        if (!array_type)
+            return false;
+
+        out.function = RPNElement::FUNCTION_HAS;
+        const DataTypePtr actual_type = BloomFilter::getPrimitiveType(array_type->getNestedType());
+        Field converted_field = convertFieldToType(value_field, *actual_type, value_type.get());
+        out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), converted_field)));
+
+        return true;
+    }
+
     if (const auto * function = key_ast->as<ASTFunction>())
     {
         WhichDataType which(value_type);
@@ -475,6 +628,59 @@ bool MergeTreeIndexConditionBloomFilter::traverseASTEquals(
 
             return match_with_subtype;
         }
+
+        if (function->name == "arrayElement" && (function_name == "equals" || function_name == "notEquals"))
+        {
+            /** Try to parse arrayElement for mapKeys index.
+              * It is important to ignore keys like column_map['Key'] = '' because if key does not exists in map
+              * we return default value for arrayElement.
+              *
+              * We cannot skip keys that does not exist in map if comparison is with default type value because
+              * that way we skip necessary granules where map key does not exists.
+              */
+            if (value_field == value_type->getDefault())
+                return false;
+
+            const auto * column_ast_identifier = function->arguments.get()->children[0].get()->as<ASTIdentifier>();
+            if (!column_ast_identifier)
+                return false;
+
+            const auto & col_name = column_ast_identifier->name();
+
+            auto map_keys_index_column_name = fmt::format("mapKeys({})", col_name);
+            auto map_values_index_column_name = fmt::format("mapValues({})", col_name);
+
+            size_t position = 0;
+            Field const_value = value_field;
+
+            if (header.has(map_keys_index_column_name))
+            {
+                position = header.getPositionByName(map_keys_index_column_name);
+
+                auto & argument = function->arguments.get()->children[1];
+
+                if (const auto * literal = argument->as<ASTLiteral>())
+                    const_value = literal->value;
+                else
+                    return false;
+            }
+            else if (header.has(map_values_index_column_name))
+            {
+                position = header.getPositionByName(map_values_index_column_name);
+            }
+            else
+            {
+                return false;
+            }
+
+            out.function = function_name == "equals" ? RPNElement::FUNCTION_EQUALS : RPNElement::FUNCTION_NOT_EQUALS;
+
+            const auto & index_type = header.getByPosition(position).type;
+            const auto actual_type = BloomFilter::getPrimitiveType(index_type);
+            out.predicate.emplace_back(std::make_pair(position, BloomFilterHash::hashWithField(actual_type.get(), const_value)));
+
+            return true;
+        }
     }
 
     return false;
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
index fa48b966a92..5c6559ba298 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
@@ -25,6 +25,7 @@ public:
             FUNCTION_NOT_EQUALS,
             FUNCTION_HAS,
             FUNCTION_HAS_ANY,
+            FUNCTION_HAS_ALL,
             FUNCTION_IN,
             FUNCTION_NOT_IN,
             FUNCTION_UNKNOWN, /// Can take any value.
@@ -69,13 +70,27 @@ private:
 
     bool traverseFunction(const ASTPtr & node, Block & block_with_constants, RPNElement & out, const ASTPtr & parent);
 
-    bool traverseASTIn(const String & function_name, const ASTPtr & key_ast, const SetPtr & prepared_set, RPNElement & out);
+    bool traverseASTIn(
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const SetPtr & prepared_set,
+        RPNElement & out);
 
     bool traverseASTIn(
-        const String & function_name, const ASTPtr & key_ast, const DataTypePtr & type, const ColumnPtr & column, RPNElement & out);
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const SetPtr & prepared_set,
+        const DataTypePtr & type,
+        const ColumnPtr & column,
+        RPNElement & out);
 
     bool traverseASTEquals(
-        const String & function_name, const ASTPtr & key_ast, const DataTypePtr & value_type, const Field & value_field, RPNElement & out, const ASTPtr & parent);
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const DataTypePtr & value_type,
+        const Field & value_field,
+        RPNElement & out,
+        const ASTPtr & parent);
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
index 10136cd1069..a8820b3f6d4 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.cpp
@@ -1,8 +1,7 @@
 #include <Storages/MergeTree/MergeTreeIndexFullText.h>
 
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/UTF8Helpers.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <Interpreters/ExpressionActions.h>
@@ -18,17 +17,6 @@
 
 #include <Poco/Logger.h>
 
-#include <boost/algorithm/string.hpp>
-
-#if defined(__SSE2__)
-#include <immintrin.h>
-
-#if defined(__SSE4_2__)
-#include <nmmintrin.h>
-#endif
-
-#endif
-
 
 namespace DB
 {
@@ -40,52 +28,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-
-/// Adds all tokens from string to bloom filter.
-static void stringToBloomFilter(
-    const String & string, TokenExtractorPtr token_extractor, BloomFilter & bloom_filter)
-{
-    const char * data = string.data();
-    size_t size = string.size();
-
-    size_t cur = 0;
-    size_t token_start = 0;
-    size_t token_len = 0;
-    while (cur < size && token_extractor->nextInField(data, size, &cur, &token_start, &token_len))
-        bloom_filter.add(data + token_start, token_len);
-}
-
-static void columnToBloomFilter(
-    const char * data, size_t size, TokenExtractorPtr token_extractor, BloomFilter & bloom_filter)
-{
-    size_t cur = 0;
-    size_t token_start = 0;
-    size_t token_len = 0;
-    while (cur < size && token_extractor->nextInColumn(data, size, &cur, &token_start, &token_len))
-        bloom_filter.add(data + token_start, token_len);
-}
-
-
-/// Adds all tokens from like pattern string to bloom filter. (Because like pattern can contain `\%` and `\_`.)
-static void likeStringToBloomFilter(
-    const String & data, TokenExtractorPtr token_extractor, BloomFilter & bloom_filter)
-{
-    size_t cur = 0;
-    String token;
-    while (cur < data.size() && token_extractor->nextLike(data, &cur, token))
-        bloom_filter.add(token.c_str(), token.size());
-}
-
-/// Unified condition for equals, startsWith and endsWith
-bool MergeTreeConditionFullText::createFunctionEqualsCondition(
-    RPNElement & out, const Field & value, const BloomFilterParameters & params, TokenExtractorPtr token_extractor)
-{
-    out.function = RPNElement::FUNCTION_EQUALS;
-    out.bloom_filter = std::make_unique<BloomFilter>(params);
-    stringToBloomFilter(value.get<String>(), token_extractor, *out.bloom_filter);
-    return true;
-}
-
 MergeTreeIndexGranuleFullText::MergeTreeIndexGranuleFullText(
     const String & index_name_,
     size_t columns_number,
@@ -101,14 +43,17 @@ MergeTreeIndexGranuleFullText::MergeTreeIndexGranuleFullText(
 void MergeTreeIndexGranuleFullText::serializeBinary(WriteBuffer & ostr) const
 {
     if (empty())
-        throw Exception("Attempt to write empty fulltext index " + backQuote(index_name), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to write empty fulltext index {}.", backQuote(index_name));
 
     for (const auto & bloom_filter : bloom_filters)
         ostr.write(reinterpret_cast<const char *>(bloom_filter.getFilter().data()), params.filter_size);
 }
 
-void MergeTreeIndexGranuleFullText::deserializeBinary(ReadBuffer & istr)
+void MergeTreeIndexGranuleFullText::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version)
 {
+    if (version != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown index version {}.", version);
+
     for (auto & bloom_filter : bloom_filters)
     {
         istr.read(reinterpret_cast<char *>(
@@ -152,18 +97,44 @@ void MergeTreeIndexAggregatorFullText::update(const Block & block, size_t * pos,
 
     for (size_t col = 0; col < index_columns.size(); ++col)
     {
-        const auto & column = block.getByName(index_columns[col]).column;
-        for (size_t i = 0; i < rows_read; ++i)
+        const auto & column_with_type = block.getByName(index_columns[col]);
+        const auto & column = column_with_type.column;
+        size_t current_position = *pos;
+
+        if (isArray(column_with_type.type))
         {
-            auto ref = column->getDataAt(*pos + i);
-            columnToBloomFilter(ref.data, ref.size, token_extractor, granule->bloom_filters[col]);
+            const auto & column_array = assert_cast<const ColumnArray &>(*column);
+            const auto & column_offsets = column_array.getOffsets();
+            const auto & column_key = column_array.getData();
+
+            for (size_t i = 0; i < rows_read; ++i)
+            {
+                size_t element_start_row = column_offsets[current_position - 1];
+                size_t elements_size = column_offsets[current_position] - element_start_row;
+
+                for (size_t row_num = 0; row_num < elements_size; row_num++)
+                {
+                    auto ref = column_key.getDataAt(element_start_row + row_num);
+                    token_extractor->stringPaddedToBloomFilter(ref.data, ref.size, granule->bloom_filters[col]);
+                }
+
+                current_position += 1;
+            }
+        }
+        else
+        {
+            for (size_t i = 0; i < rows_read; ++i)
+            {
+                auto ref = column->getDataAt(current_position + i);
+                token_extractor->stringPaddedToBloomFilter(ref.data, ref.size, granule->bloom_filters[col]);
+            }
         }
     }
+
     granule->has_elems = true;
     *pos += rows_read;
 }
 
-
 MergeTreeConditionFullText::MergeTreeConditionFullText(
     const SelectQueryInfo & query_info,
     ContextPtr context,
@@ -181,7 +152,7 @@ MergeTreeConditionFullText::MergeTreeConditionFullText(
                     query_info, context,
                     [this] (const ASTPtr & node, ContextPtr /* context */, Block & block_with_constants, RPNElement & out) -> bool
                     {
-                        return this->atomFromAST(node, block_with_constants, out);
+                        return this->traverseAtomAST(node, block_with_constants, out);
                     }).extractRPN());
 }
 
@@ -199,6 +170,7 @@ bool MergeTreeConditionFullText::alwaysUnknownOrTrue() const
         }
         else if (element.function == RPNElement::FUNCTION_EQUALS
              || element.function == RPNElement::FUNCTION_NOT_EQUALS
+             || element.function == RPNElement::FUNCTION_HAS
              || element.function == RPNElement::FUNCTION_IN
              || element.function == RPNElement::FUNCTION_NOT_IN
              || element.function == RPNElement::FUNCTION_MULTI_SEARCH
@@ -248,7 +220,8 @@ bool MergeTreeConditionFullText::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
             rpn_stack.emplace_back(true, true);
         }
         else if (element.function == RPNElement::FUNCTION_EQUALS
-             || element.function == RPNElement::FUNCTION_NOT_EQUALS)
+             || element.function == RPNElement::FUNCTION_NOT_EQUALS
+             || element.function == RPNElement::FUNCTION_HAS)
         {
             rpn_stack.emplace_back(granule->bloom_filters[element.key_column].contains(*element.bloom_filter), true);
 
@@ -322,9 +295,9 @@ bool MergeTreeConditionFullText::mayBeTrueOnGranule(MergeTreeIndexGranulePtr idx
     return rpn_stack[0].can_be_true;
 }
 
-bool MergeTreeConditionFullText::getKey(const ASTPtr & node, size_t & key_column_num)
+bool MergeTreeConditionFullText::getKey(const std::string & key_column_name, size_t & key_column_num)
 {
-    auto it = std::find(index_columns.begin(), index_columns.end(), node->getColumnName());
+    auto it = std::find(index_columns.begin(), index_columns.end(), key_column_name);
     if (it == index_columns.end())
         return false;
 
@@ -332,144 +305,261 @@ bool MergeTreeConditionFullText::getKey(const ASTPtr & node, size_t & key_column
     return true;
 }
 
-bool MergeTreeConditionFullText::atomFromAST(
-    const ASTPtr & node, Block & block_with_constants, RPNElement & out)
+bool MergeTreeConditionFullText::traverseAtomAST(const ASTPtr & node, Block & block_with_constants, RPNElement & out)
 {
-    Field const_value;
-    DataTypePtr const_type;
-    if (const auto * func = typeid_cast<const ASTFunction *>(node.get()))
     {
-        const ASTs & args = typeid_cast<const ASTExpressionList &>(*func->arguments).children;
+        Field const_value;
+        DataTypePtr const_type;
 
-        if (args.size() != 2)
-            return false;
-
-        size_t key_arg_pos;           /// Position of argument with key column (non-const argument)
-        size_t key_column_num = -1;   /// Number of a key column (inside key_column_names array)
-        const auto & func_name = func->name;
-
-        if (functionIsInOrGlobalInOperator(func_name) && tryPrepareSetBloomFilter(args, out))
+        if (KeyCondition::getConstant(node, block_with_constants, const_value, const_type))
         {
-            key_arg_pos = 0;
-        }
-        else if (KeyCondition::getConstant(args[1], block_with_constants, const_value, const_type) && getKey(args[0], key_column_num))
-        {
-            key_arg_pos = 0;
-        }
-        else if (KeyCondition::getConstant(args[0], block_with_constants, const_value, const_type) && getKey(args[1], key_column_num))
-        {
-            key_arg_pos = 1;
-        }
-        else
-            return false;
-
-        if (const_type && const_type->getTypeId() != TypeIndex::String
-                       && const_type->getTypeId() != TypeIndex::FixedString
-                       && const_type->getTypeId() != TypeIndex::Array)
-        {
-            return false;
-        }
-
-        if (key_arg_pos == 1 && (func_name != "equals" && func_name != "notEquals"))
-            return false;
-        else if (!token_extractor->supportLike() && (func_name == "like" || func_name == "notLike"))
-            return false;
-
-        if (func_name == "notEquals")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_NOT_EQUALS;
-            out.bloom_filter = std::make_unique<BloomFilter>(params);
-            stringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
-            return true;
-        }
-        else if (func_name == "equals")
-        {
-            out.key_column = key_column_num;
-            return createFunctionEqualsCondition(out, const_value, params, token_extractor);
-        }
-        else if (func_name == "like")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_EQUALS;
-            out.bloom_filter = std::make_unique<BloomFilter>(params);
-            likeStringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
-            return true;
-        }
-        else if (func_name == "notLike")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_NOT_EQUALS;
-            out.bloom_filter = std::make_unique<BloomFilter>(params);
-            likeStringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
-            return true;
-        }
-        else if (func_name == "hasToken")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_EQUALS;
-            out.bloom_filter = std::make_unique<BloomFilter>(params);
-            stringToBloomFilter(const_value.get<String>(), token_extractor, *out.bloom_filter);
-            return true;
-        }
-        else if (func_name == "startsWith")
-        {
-            out.key_column = key_column_num;
-            return createFunctionEqualsCondition(out, const_value, params, token_extractor);
-        }
-        else if (func_name == "endsWith")
-        {
-            out.key_column = key_column_num;
-            return createFunctionEqualsCondition(out, const_value, params, token_extractor);
-        }
-        else if (func_name == "multiSearchAny")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_MULTI_SEARCH;
-
-            /// 2d vector is not needed here but is used because already exists for FUNCTION_IN
-            std::vector<std::vector<BloomFilter>> bloom_filters;
-            bloom_filters.emplace_back();
-            for (const auto & element : const_value.get<Array>())
+            /// Check constant like in KeyCondition
+            if (const_value.getType() == Field::Types::UInt64
+                || const_value.getType() == Field::Types::Int64
+                || const_value.getType() == Field::Types::Float64)
             {
-                if (element.getType() != Field::Types::String)
-                    return false;
+                /// Zero in all types is represented in memory the same way as in UInt64.
+                out.function = const_value.get<UInt64>()
+                            ? RPNElement::ALWAYS_TRUE
+                            : RPNElement::ALWAYS_FALSE;
 
-                bloom_filters.back().emplace_back(params);
-                stringToBloomFilter(element.get<String>(), token_extractor, bloom_filters.back().back());
+                return true;
             }
-            out.set_bloom_filters = std::move(bloom_filters);
-            return true;
         }
-        else if (func_name == "notIn")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_NOT_IN;
-            return true;
-        }
-        else if (func_name == "in")
-        {
-            out.key_column = key_column_num;
-            out.function = RPNElement::FUNCTION_IN;
-            return true;
-        }
-
-        return false;
     }
-    else if (KeyCondition::getConstant(node, block_with_constants, const_value, const_type))
-    {
-        /// Check constant like in KeyCondition
-        if (const_value.getType() == Field::Types::UInt64
-            || const_value.getType() == Field::Types::Int64
-            || const_value.getType() == Field::Types::Float64)
-        {
-            /// Zero in all types is represented in memory the same way as in UInt64.
-            out.function = const_value.get<UInt64>()
-                           ? RPNElement::ALWAYS_TRUE
-                           : RPNElement::ALWAYS_FALSE;
 
-            return true;
+    if (const auto * function = node->as<ASTFunction>())
+    {
+        if (!function->arguments)
+            return false;
+
+        const ASTs & arguments = function->arguments->children;
+
+        if (arguments.size() != 2)
+            return false;
+
+        if (functionIsInOrGlobalInOperator(function->name))
+        {
+            if (tryPrepareSetBloomFilter(arguments, out))
+            {
+                if (function->name == "notIn")
+                {
+                    out.function = RPNElement::FUNCTION_NOT_IN;
+                    return true;
+                }
+                else if (function->name == "in")
+                {
+                    out.function = RPNElement::FUNCTION_IN;
+                    return true;
+                }
+            }
         }
+        else if (function->name == "equals" ||
+                 function->name == "notEquals" ||
+                 function->name == "has" ||
+                 function->name == "mapContains" ||
+                 function->name == "like" ||
+                 function->name == "notLike" ||
+                 function->name == "hasToken" ||
+                 function->name == "startsWith" ||
+                 function->name == "endsWith" ||
+                 function->name == "multiSearchAny")
+        {
+            Field const_value;
+            DataTypePtr const_type;
+            if (KeyCondition::getConstant(arguments[1], block_with_constants, const_value, const_type))
+            {
+                if (traverseASTEquals(function->name, arguments[0], const_type, const_value, out))
+                    return true;
+            }
+            else if (KeyCondition::getConstant(arguments[0], block_with_constants, const_value, const_type) && (function->name == "equals" || function->name == "notEquals"))
+            {
+                if (traverseASTEquals(function->name, arguments[1], const_type, const_value, out))
+                    return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+bool MergeTreeConditionFullText::traverseASTEquals(
+    const String & function_name,
+    const ASTPtr & key_ast,
+    const DataTypePtr & value_type,
+    const Field & value_field,
+    RPNElement & out)
+{
+    auto value_data_type = WhichDataType(value_type);
+    if (!value_data_type.isStringOrFixedString() && !value_data_type.isArray())
+        return false;
+
+    Field const_value = value_field;
+
+    size_t key_column_num = 0;
+    bool key_exists = getKey(key_ast->getColumnName(), key_column_num);
+    bool map_key_exists = getKey(fmt::format("mapKeys({})", key_ast->getColumnName()), key_column_num);
+
+    if (const auto * function = key_ast->as<ASTFunction>())
+    {
+        if (function->name == "arrayElement")
+        {
+            /** Try to parse arrayElement for mapKeys index.
+              * It is important to ignore keys like column_map['Key'] = '' because if key does not exists in map
+              * we return default value for arrayElement.
+              *
+              * We cannot skip keys that does not exist in map if comparison is with default type value because
+              * that way we skip necessary granules where map key does not exists.
+              */
+            if (value_field == value_type->getDefault())
+                return false;
+
+            const auto * column_ast_identifier = function->arguments.get()->children[0].get()->as<ASTIdentifier>();
+            if (!column_ast_identifier)
+                return false;
+
+            const auto & map_column_name = column_ast_identifier->name();
+
+            size_t map_keys_key_column_num = 0;
+            auto map_keys_index_column_name = fmt::format("mapKeys({})", map_column_name);
+            bool map_keys_exists = getKey(map_keys_index_column_name, map_keys_key_column_num);
+
+            size_t map_values_key_column_num = 0;
+            auto map_values_index_column_name = fmt::format("mapValues({})", map_column_name);
+            bool map_values_exists = getKey(map_values_index_column_name, map_values_key_column_num);
+
+            if (map_keys_exists)
+            {
+                auto & argument = function->arguments.get()->children[1];
+
+                if (const auto * literal = argument->as<ASTLiteral>())
+                {
+                    auto element_key = literal->value;
+                    const_value = element_key;
+                    key_column_num = map_keys_key_column_num;
+                    key_exists = true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (map_values_exists)
+            {
+                key_column_num = map_values_key_column_num;
+                key_exists = true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+    }
+
+    if (!key_exists && !map_key_exists)
+        return false;
+
+    if (map_key_exists && (function_name == "has" || function_name == "mapContains"))
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_HAS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "has")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_HAS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+
+    if (function_name == "notEquals")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_NOT_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "equals")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "like")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringLikeToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "notLike")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_NOT_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringLikeToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "hasToken")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "startsWith")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "endsWith")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_EQUALS;
+        out.bloom_filter = std::make_unique<BloomFilter>(params);
+        const auto & value = const_value.get<String>();
+        token_extractor->stringToBloomFilter(value.data(), value.size(), *out.bloom_filter);
+        return true;
+    }
+    else if (function_name == "multiSearchAny")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_MULTI_SEARCH;
+
+        /// 2d vector is not needed here but is used because already exists for FUNCTION_IN
+        std::vector<std::vector<BloomFilter>> bloom_filters;
+        bloom_filters.emplace_back();
+        for (const auto & element : const_value.get<Array>())
+        {
+            if (element.getType() != Field::Types::String)
+                return false;
+
+            bloom_filters.back().emplace_back(params);
+            const auto & value = element.get<String>();
+            token_extractor->stringToBloomFilter(value.data(), value.size(), bloom_filters.back().back());
+        }
+        out.set_bloom_filters = std::move(bloom_filters);
+        return true;
     }
 
     return false;
@@ -492,7 +582,7 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
         for (size_t i = 0; i < tuple_elements.size(); ++i)
         {
             size_t key = 0;
-            if (getKey(tuple_elements[i], key))
+            if (getKey(tuple_elements[i]->getColumnName(), key))
             {
                 key_tuple_mapping.emplace_back(i, key);
                 data_types.push_back(index_data_types[key]);
@@ -502,7 +592,7 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
     else
     {
         size_t key = 0;
-        if (getKey(left_arg, key))
+        if (getKey(left_arg->getColumnName(), key))
         {
             key_tuple_mapping.emplace_back(0, key);
             data_types.push_back(index_data_types[key]);
@@ -545,7 +635,7 @@ bool MergeTreeConditionFullText::tryPrepareSetBloomFilter(
         {
             bloom_filters.back().emplace_back(params);
             auto ref = column->getDataAt(row);
-            columnToBloomFilter(ref.data, ref.size, token_extractor, bloom_filters.back().back());
+            token_extractor->stringPaddedToBloomFilter(ref.data, ref.size, bloom_filters.back().back());
         }
     }
 
@@ -576,230 +666,6 @@ bool MergeTreeIndexFullText::mayBenefitFromIndexForIn(const ASTPtr & node) const
     return std::find(std::cbegin(index.column_names), std::cend(index.column_names), node->getColumnName()) != std::cend(index.column_names);
 }
 
-
-bool NgramTokenExtractor::nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
-{
-    *token_start = *pos;
-    *token_len = 0;
-    size_t code_points = 0;
-    for (; code_points < n && *token_start + *token_len < len; ++code_points)
-    {
-        size_t sz = UTF8::seqLength(static_cast<UInt8>(data[*token_start + *token_len]));
-        *token_len += sz;
-    }
-    *pos += UTF8::seqLength(static_cast<UInt8>(data[*pos]));
-    return code_points == n;
-}
-
-bool NgramTokenExtractor::nextLike(const String & str, size_t * pos, String & token) const
-{
-    token.clear();
-
-    size_t code_points = 0;
-    bool escaped = false;
-    for (size_t i = *pos; i < str.size();)
-    {
-        if (escaped && (str[i] == '%' || str[i] == '_' || str[i] == '\\'))
-        {
-            token += str[i];
-            ++code_points;
-            escaped = false;
-            ++i;
-        }
-        else if (!escaped && (str[i] == '%' || str[i] == '_'))
-        {
-            /// This token is too small, go to the next.
-            token.clear();
-            code_points = 0;
-            escaped = false;
-            *pos = ++i;
-        }
-        else if (!escaped && str[i] == '\\')
-        {
-            escaped = true;
-            ++i;
-        }
-        else
-        {
-            const size_t sz = UTF8::seqLength(static_cast<UInt8>(str[i]));
-            for (size_t j = 0; j < sz; ++j)
-                token += str[i + j];
-            i += sz;
-            ++code_points;
-            escaped = false;
-        }
-
-        if (code_points == n)
-        {
-            *pos += UTF8::seqLength(static_cast<UInt8>(str[*pos]));
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-bool SplitTokenExtractor::nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
-{
-    *token_start = *pos;
-    *token_len = 0;
-
-    while (*pos < len)
-    {
-        if (isASCII(data[*pos]) && !isAlphaNumericASCII(data[*pos]))
-        {
-            /// Finish current token if any
-            if (*token_len > 0)
-                return true;
-            *token_start = ++*pos;
-        }
-        else
-        {
-            /// Note that UTF-8 sequence is completely consisted of non-ASCII bytes.
-            ++*pos;
-            ++*token_len;
-        }
-    }
-
-    return *token_len > 0;
-}
-
-bool SplitTokenExtractor::nextInColumn(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
-{
-    *token_start = *pos;
-    *token_len = 0;
-
-    while (*pos < len)
-    {
-#if defined(__SSE2__) && !defined(MEMORY_SANITIZER) /// We read uninitialized bytes and decide on the calculated mask
-        // NOTE: we assume that `data` string is padded from the right with 15 bytes.
-        const __m128i haystack = _mm_loadu_si128(reinterpret_cast<const __m128i *>(data + *pos));
-        const size_t haystack_length = 16;
-
-#if defined(__SSE4_2__)
-        // With the help of https://www.strchr.com/strcmp_and_strlen_using_sse_4.2
-        const auto alnum_chars_ranges = _mm_set_epi8(0, 0, 0, 0, 0, 0, 0, 0,
-                '\xFF', '\x80', 'z', 'a', 'Z', 'A', '9', '0');
-        // Every bit represents if `haystack` character is in the ranges (1) or not (0)
-        const int result_bitmask = _mm_cvtsi128_si32(_mm_cmpestrm(alnum_chars_ranges, 8, haystack, haystack_length, _SIDD_CMP_RANGES));
-#else
-        // NOTE: -1 and +1 required since SSE2 has no `>=` and `<=` instructions on packed 8-bit integers (epi8).
-        const auto number_begin =      _mm_set1_epi8('0' - 1);
-        const auto number_end =        _mm_set1_epi8('9' + 1);
-        const auto alpha_lower_begin = _mm_set1_epi8('a' - 1);
-        const auto alpha_lower_end =   _mm_set1_epi8('z' + 1);
-        const auto alpha_upper_begin = _mm_set1_epi8('A' - 1);
-        const auto alpha_upper_end =   _mm_set1_epi8('Z' + 1);
-        const auto zero =              _mm_set1_epi8(0);
-
-        // every bit represents if `haystack` character `c` satisfies condition:
-        // (c < 0) || (c > '0' - 1 && c < '9' + 1) || (c > 'a' - 1 && c < 'z' + 1) || (c > 'A' - 1 && c < 'Z' + 1)
-        // < 0 since _mm_cmplt_epi8 threats chars as SIGNED, and so all chars > 0x80 are negative.
-        const int result_bitmask = _mm_movemask_epi8(_mm_or_si128(_mm_or_si128(_mm_or_si128(
-                _mm_cmplt_epi8(haystack, zero),
-                _mm_and_si128(_mm_cmpgt_epi8(haystack, number_begin),      _mm_cmplt_epi8(haystack, number_end))),
-                _mm_and_si128(_mm_cmpgt_epi8(haystack, alpha_lower_begin), _mm_cmplt_epi8(haystack, alpha_lower_end))),
-                _mm_and_si128(_mm_cmpgt_epi8(haystack, alpha_upper_begin), _mm_cmplt_epi8(haystack, alpha_upper_end))));
-#endif
-        if (result_bitmask == 0)
-        {
-            if (*token_len != 0)
-                // end of token started on previous haystack
-                return true;
-
-            *pos += haystack_length;
-            continue;
-        }
-
-        const auto token_start_pos_in_current_haystack = getTrailingZeroBitsUnsafe(result_bitmask);
-        if (*token_len == 0)
-            // new token
-            *token_start = *pos + token_start_pos_in_current_haystack;
-        else if (token_start_pos_in_current_haystack != 0)
-            // end of token starting in one of previous haystacks
-            return true;
-
-        const auto token_bytes_in_current_haystack = getTrailingZeroBitsUnsafe(~(result_bitmask >> token_start_pos_in_current_haystack));
-        *token_len += token_bytes_in_current_haystack;
-
-        *pos += token_start_pos_in_current_haystack + token_bytes_in_current_haystack;
-        if (token_start_pos_in_current_haystack + token_bytes_in_current_haystack == haystack_length)
-            // check if there are leftovers in next `haystack`
-            continue;
-
-        break;
-#else
-        if (isASCII(data[*pos]) && !isAlphaNumericASCII(data[*pos]))
-        {
-            /// Finish current token if any
-            if (*token_len > 0)
-                return true;
-            *token_start = ++*pos;
-        }
-        else
-        {
-            /// Note that UTF-8 sequence is completely consisted of non-ASCII bytes.
-            ++*pos;
-            ++*token_len;
-        }
-#endif
-    }
-
-#if defined(__SSE2__) && !defined(MEMORY_SANITIZER)
-    // Could happen only if string is not padded with zeros, and we accidentally hopped over the end of data.
-    if (*token_start > len)
-        return false;
-    *token_len = std::min(len - *token_start, *token_len);
-#endif
-
-    return *token_len > 0;
-}
-
-bool SplitTokenExtractor::nextLike(const String & str, size_t * pos, String & token) const
-{
-    token.clear();
-    bool bad_token = false; // % or _ before token
-    bool escaped = false;
-    while (*pos < str.size())
-    {
-        if (!escaped && (str[*pos] == '%' || str[*pos] == '_'))
-        {
-            token.clear();
-            bad_token = true;
-            ++*pos;
-        }
-        else if (!escaped && str[*pos] == '\\')
-        {
-            escaped = true;
-            ++*pos;
-        }
-        else if (isASCII(str[*pos]) && !isAlphaNumericASCII(str[*pos]))
-        {
-            if (!bad_token && !token.empty())
-                return true;
-
-            token.clear();
-            bad_token = false;
-            escaped = false;
-            ++*pos;
-        }
-        else
-        {
-            const size_t sz = UTF8::seqLength(static_cast<UInt8>(str[*pos]));
-            for (size_t j = 0; j < sz; ++j)
-            {
-                token += str[*pos];
-                ++*pos;
-            }
-            escaped = false;
-        }
-    }
-
-    return !bad_token && !token.empty();
-}
-
-
 MergeTreeIndexPtr bloomFilterIndexCreator(
     const IndexDescription & index)
 {
@@ -834,10 +700,18 @@ MergeTreeIndexPtr bloomFilterIndexCreator(
 
 void bloomFilterIndexValidator(const IndexDescription & index, bool /*attach*/)
 {
-    for (const auto & data_type : index.data_types)
+    for (const auto & index_data_type : index.data_types)
     {
-        if (data_type->getTypeId() != TypeIndex::String && data_type->getTypeId() != TypeIndex::FixedString)
-            throw Exception("Bloom filter index can be used only with `String` or `FixedString` column.", ErrorCodes::INCORRECT_QUERY);
+        WhichDataType data_type(index_data_type);
+
+        if (data_type.isArray())
+        {
+            const auto & array_type = assert_cast<const DataTypeArray &>(*index_data_type);
+            data_type = WhichDataType(array_type.getNestedType());
+        }
+
+        if (!data_type.isString() && !data_type.isFixedString())
+            throw Exception("Bloom filter index can be used only with `String`, `FixedString` column or Array with `String` or `FixedString` values column.", ErrorCodes::INCORRECT_QUERY);
     }
 
     if (index.type == NgramTokenExtractor::getName())
diff --git a/src/Storages/MergeTree/MergeTreeIndexFullText.h b/src/Storages/MergeTree/MergeTreeIndexFullText.h
index 1385621f97f..1826719df0b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexFullText.h
+++ b/src/Storages/MergeTree/MergeTreeIndexFullText.h
@@ -1,40 +1,16 @@
 #pragma once
 
-#include <Interpreters/BloomFilter.h>
+#include <memory>
+
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/KeyCondition.h>
-
-#include <memory>
+#include <Interpreters/BloomFilter.h>
+#include <Interpreters/ITokenExtractor.h>
 
 
 namespace DB
 {
 
-/// Interface for string parsers.
-struct ITokenExtractor
-{
-    virtual ~ITokenExtractor() = default;
-
-    /// Fast inplace implementation for regular use.
-    /// Gets string (data ptr and len) and start position for extracting next token (state of extractor).
-    /// Returns false if parsing is finished, otherwise returns true.
-    virtual bool nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const = 0;
-
-    /// Optimized version that can assume at least 15 padding bytes after data + len (as our Columns provide).
-    virtual bool nextInColumn(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const
-    {
-        return nextInField(data, len, pos, token_start, token_len);
-    }
-
-    /// Special implementation for creating bloom filter for LIKE function.
-    /// It skips unescaped `%` and `_` and supports escaping symbols, but it is less lightweight.
-    virtual bool nextLike(const String & str, size_t * pos, String & out) const = 0;
-
-    virtual bool supportLike() const = 0;
-};
-
-using TokenExtractorPtr = const ITokenExtractor *;
-
 struct MergeTreeIndexGranuleFullText final : public IMergeTreeIndexGranule
 {
     explicit MergeTreeIndexGranuleFullText(
@@ -45,7 +21,7 @@ struct MergeTreeIndexGranuleFullText final : public IMergeTreeIndexGranule
     ~MergeTreeIndexGranuleFullText() override = default;
 
     void serializeBinary(WriteBuffer & ostr) const override;
-    void deserializeBinary(ReadBuffer & istr) override;
+    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
 
     bool empty() const override { return !has_elems; }
 
@@ -112,6 +88,7 @@ private:
             /// Atoms of a Boolean expression.
             FUNCTION_EQUALS,
             FUNCTION_NOT_EQUALS,
+            FUNCTION_HAS,
             FUNCTION_IN,
             FUNCTION_NOT_IN,
             FUNCTION_MULTI_SEARCH,
@@ -145,9 +122,16 @@ private:
 
     using RPN = std::vector<RPNElement>;
 
-    bool atomFromAST(const ASTPtr & node, Block & block_with_constants, RPNElement & out);
+    bool traverseAtomAST(const ASTPtr & node, Block & block_with_constants, RPNElement & out);
 
-    bool getKey(const ASTPtr & node, size_t & key_column_num);
+    bool traverseASTEquals(
+        const String & function_name,
+        const ASTPtr & key_ast,
+        const DataTypePtr & value_type,
+        const Field & value_field,
+        RPNElement & out);
+
+    bool getKey(const std::string & key_column_name, size_t & key_column_num);
     bool tryPrepareSetBloomFilter(const ASTs & args, RPNElement & out);
 
     static bool createFunctionEqualsCondition(
@@ -162,35 +146,6 @@ private:
     PreparedSets prepared_sets;
 };
 
-
-/// Parser extracting all ngrams from string.
-struct NgramTokenExtractor final : public ITokenExtractor
-{
-    NgramTokenExtractor(size_t n_) : n(n_) {}
-
-    static String getName() { return "ngrambf_v1"; }
-
-    bool nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
-    bool nextLike(const String & str, size_t * pos, String & token) const override;
-
-    bool supportLike() const override { return true; }
-
-    size_t n;
-};
-
-/// Parser extracting tokens (sequences of numbers and ascii letters).
-struct SplitTokenExtractor final : public ITokenExtractor
-{
-    static String getName() { return "tokenbf_v1"; }
-
-    bool nextInField(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
-    bool nextInColumn(const char * data, size_t len, size_t * pos, size_t * token_start, size_t * token_len) const override;
-    bool nextLike(const String & str, size_t * pos, String & token) const override;
-
-    bool supportLike() const override { return true; }
-};
-
-
 class MergeTreeIndexFullText final : public IMergeTreeIndex
 {
 public:
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
index 21a86f9bcea..92e889ec762 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Disks/IDisk.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
index b513437fbe1..9bc00274740 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
@@ -5,7 +5,7 @@
 #include <Columns/ColumnFixedString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Common/HashTable/Hash.h>
-#include <common/bit_cast.h>
+#include <base/bit_cast.h>
 #include <Interpreters/BloomFilterHash.h>
 #include <IO/WriteHelpers.h>
 
@@ -84,10 +84,12 @@ bool MergeTreeIndexGranuleBloomFilter::empty() const
     return !total_rows;
 }
 
-void MergeTreeIndexGranuleBloomFilter::deserializeBinary(ReadBuffer & istr)
+void MergeTreeIndexGranuleBloomFilter::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version)
 {
     if (!empty())
-        throw Exception("Cannot read data to a non-empty bloom filter index.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot read data to a non-empty bloom filter index.");
+    if (version != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown index version {}.", version);
 
     readVarUInt(total_rows, istr);
     for (auto & filter : bloom_filters)
@@ -102,7 +104,7 @@ void MergeTreeIndexGranuleBloomFilter::deserializeBinary(ReadBuffer & istr)
 void MergeTreeIndexGranuleBloomFilter::serializeBinary(WriteBuffer & ostr) const
 {
     if (empty())
-        throw Exception("Attempt to write empty bloom filter index.", ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to write empty bloom filter index.");
 
     static size_t atom_size = 8;
     writeVarUInt(total_rows, ostr);
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
index cdd4b92f80c..82bd91138a7 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
@@ -16,8 +16,7 @@ public:
     bool empty() const override;
 
     void serializeBinary(WriteBuffer & ostr) const override;
-
-    void deserializeBinary(ReadBuffer & istr) override;
+    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
 
     const std::vector<BloomFilterPtr> & getFilters() const { return bloom_filters; }
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index e29a6198252..c065b00fc9a 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -39,12 +39,13 @@ void MergeTreeIndexGranuleMinMax::serializeBinary(WriteBuffer & ostr) const
     {
         const DataTypePtr & type = index_sample_block.getByPosition(i).type;
         auto serialization = type->getDefaultSerialization();
+
         serialization->serializeBinary(hyperrectangle[i].left, ostr);
         serialization->serializeBinary(hyperrectangle[i].right, ostr);
     }
 }
 
-void MergeTreeIndexGranuleMinMax::deserializeBinary(ReadBuffer & istr)
+void MergeTreeIndexGranuleMinMax::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version)
 {
     hyperrectangle.clear();
     Field min_val;
@@ -54,14 +55,54 @@ void MergeTreeIndexGranuleMinMax::deserializeBinary(ReadBuffer & istr)
     {
         const DataTypePtr & type = index_sample_block.getByPosition(i).type;
         auto serialization = type->getDefaultSerialization();
-        serialization->deserializeBinary(min_val, istr);
-        serialization->deserializeBinary(max_val, istr);
 
-        // NULL_LAST
-        if (min_val.isNull())
-            min_val = PositiveInfinity();
-        if (max_val.isNull())
-            max_val = PositiveInfinity();
+        switch (version)
+        {
+            case 1:
+                if (!type->isNullable())
+                {
+                    serialization->deserializeBinary(min_val, istr);
+                    serialization->deserializeBinary(max_val, istr);
+                }
+                else
+                {
+                    /// NOTE: that this serialization differs from
+                    /// IMergeTreeDataPart::MinMaxIndex::load() to preserve
+                    /// backward compatibility.
+                    ///
+                    /// But this is deprecated format, so this is OK.
+
+                    bool is_null;
+                    readBinary(is_null, istr);
+                    if (!is_null)
+                    {
+                        serialization->deserializeBinary(min_val, istr);
+                        serialization->deserializeBinary(max_val, istr);
+                    }
+                    else
+                    {
+                        min_val = Null();
+                        max_val = Null();
+                    }
+                }
+                break;
+
+            /// New format with proper Nullable support for values that includes Null values
+            case 2:
+                serialization->deserializeBinary(min_val, istr);
+                serialization->deserializeBinary(max_val, istr);
+
+                // NULL_LAST
+                if (min_val.isNull())
+                    min_val = POSITIVE_INFINITY;
+                if (max_val.isNull())
+                    max_val = POSITIVE_INFINITY;
+
+                break;
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown index version {}.", version);
+        }
+
         hyperrectangle.emplace_back(min_val, true, max_val, true);
     }
 }
@@ -170,6 +211,15 @@ bool MergeTreeIndexMinMax::mayBenefitFromIndexForIn(const ASTPtr & node) const
     return false;
 }
 
+MergeTreeIndexFormat MergeTreeIndexMinMax::getDeserializedFormat(const DiskPtr disk, const std::string & relative_path_prefix) const
+{
+    if (disk->exists(relative_path_prefix + ".idx2"))
+        return {2, ".idx2"};
+    else if (disk->exists(relative_path_prefix + ".idx"))
+        return {1, ".idx"};
+    return {0 /* unknown */, ""};
+}
+
 MergeTreeIndexPtr minmaxIndexCreator(
     const IndexDescription & index)
 {
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.h b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
index 97b9b874484..0e05e25fb36 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.h
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
@@ -21,7 +21,7 @@ struct MergeTreeIndexGranuleMinMax final : public IMergeTreeIndexGranule
     ~MergeTreeIndexGranuleMinMax() override = default;
 
     void serializeBinary(WriteBuffer & ostr) const override;
-    void deserializeBinary(ReadBuffer & istr) override;
+    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
 
     bool empty() const override { return hyperrectangle.empty(); }
 
@@ -81,6 +81,9 @@ public:
         const SelectQueryInfo & query, ContextPtr context) const override;
 
     bool mayBenefitFromIndexForIn(const ASTPtr & node) const override;
+
+    const char* getSerializedFileExtension() const override { return ".idx2"; }
+    MergeTreeIndexFormat getDeserializedFormat(const DiskPtr disk, const std::string & path_prefix) const override;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexReader.cpp b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
index eaba247009b..03a3b811de6 100644
--- a/src/Storages/MergeTree/MergeTreeIndexReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
@@ -1,33 +1,74 @@
 #include <Storages/MergeTree/MergeTreeIndexReader.h>
 
+namespace
+{
+
+using namespace DB;
+
+std::unique_ptr<MergeTreeReaderStream> makeIndexReader(
+    const std::string & extension,
+    MergeTreeIndexPtr index,
+    MergeTreeData::DataPartPtr part,
+    size_t marks_count,
+    const MarkRanges & all_mark_ranges,
+    MarkCache * mark_cache,
+    UncompressedCache * uncompressed_cache,
+    MergeTreeReaderSettings settings)
+{
+    return std::make_unique<MergeTreeReaderStream>(
+        part->volume->getDisk(),
+        part->getFullRelativePath() + index->getFileName(), extension, marks_count,
+        all_mark_ranges,
+        std::move(settings), mark_cache, uncompressed_cache,
+        part->getFileSizeOrZero(index->getFileName() + extension),
+        &part->index_granularity_info,
+        ReadBufferFromFileBase::ProfileCallback{}, CLOCK_MONOTONIC_COARSE);
+}
+
+}
 
 namespace DB
 {
 
 MergeTreeIndexReader::MergeTreeIndexReader(
-    MergeTreeIndexPtr index_, MergeTreeData::DataPartPtr part_, size_t marks_count_, const MarkRanges & all_mark_ranges_,
+    MergeTreeIndexPtr index_,
+    MergeTreeData::DataPartPtr part_,
+    size_t marks_count_,
+    const MarkRanges & all_mark_ranges_,
+    MarkCache * mark_cache,
+    UncompressedCache * uncompressed_cache,
     MergeTreeReaderSettings settings)
-    : index(index_), stream(
-        part_->volume->getDisk(),
-        part_->getFullRelativePath() + index->getFileName(), ".idx", marks_count_,
-        all_mark_ranges_,
-        std::move(settings), nullptr, nullptr,
-        part_->getFileSizeOrZero(index->getFileName() + ".idx"),
-        &part_->index_granularity_info,
-        ReadBufferFromFileBase::ProfileCallback{}, CLOCK_MONOTONIC_COARSE)
+    : index(index_)
 {
-    stream.seekToStart();
+    const std::string & path_prefix = part_->getFullRelativePath() + index->getFileName();
+    auto index_format = index->getDeserializedFormat(part_->volume->getDisk(), path_prefix);
+
+    stream = makeIndexReader(
+        index_format.extension,
+        index_,
+        part_,
+        marks_count_,
+        all_mark_ranges_,
+        mark_cache,
+        uncompressed_cache,
+        std::move(settings));
+    version = index_format.version;
+
+    stream->adjustForRange(MarkRange(0, getLastMark(all_mark_ranges_)));
+    stream->seekToStart();
 }
 
+MergeTreeIndexReader::~MergeTreeIndexReader() = default;
+
 void MergeTreeIndexReader::seek(size_t mark)
 {
-    stream.seekToMark(mark);
+    stream->seekToMark(mark);
 }
 
 MergeTreeIndexGranulePtr MergeTreeIndexReader::read()
 {
     auto granule = index->createIndexGranule();
-    granule->deserializeBinary(*stream.data_buffer);
+    granule->deserializeBinary(*stream->data_buffer, version);
     return granule;
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexReader.h b/src/Storages/MergeTree/MergeTreeIndexReader.h
index 68d681458be..799dae154bf 100644
--- a/src/Storages/MergeTree/MergeTreeIndexReader.h
+++ b/src/Storages/MergeTree/MergeTreeIndexReader.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <Storages/MergeTree/MergeTreeReaderStream.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreeData.h>
@@ -15,7 +16,10 @@ public:
         MergeTreeData::DataPartPtr part_,
         size_t marks_count_,
         const MarkRanges & all_mark_ranges_,
+        MarkCache * mark_cache,
+        UncompressedCache * uncompressed_cache,
         MergeTreeReaderSettings settings);
+    ~MergeTreeIndexReader();
 
     void seek(size_t mark);
 
@@ -23,7 +27,8 @@ public:
 
 private:
     MergeTreeIndexPtr index;
-    MergeTreeReaderStream stream;
+    std::unique_ptr<MergeTreeReaderStream> stream;
+    uint8_t version = 0;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index 6cee80983d6..60b9ddae329 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -48,8 +48,7 @@ MergeTreeIndexGranuleSet::MergeTreeIndexGranuleSet(
 void MergeTreeIndexGranuleSet::serializeBinary(WriteBuffer & ostr) const
 {
     if (empty())
-        throw Exception(
-            "Attempt to write empty set index " + backQuote(index_name), ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to write empty set index {}.", backQuote(index_name));
 
     const auto & size_type = DataTypePtr(std::make_shared<DataTypeUInt64>());
     auto size_serialization = size_type->getDefaultSerialization();
@@ -80,8 +79,11 @@ void MergeTreeIndexGranuleSet::serializeBinary(WriteBuffer & ostr) const
     }
 }
 
-void MergeTreeIndexGranuleSet::deserializeBinary(ReadBuffer & istr)
+void MergeTreeIndexGranuleSet::deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version)
 {
+    if (version != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown index version {}.", version);
+
     block.clear();
 
     Field field_rows;
@@ -459,7 +461,7 @@ bool MergeTreeIndexConditionSet::checkASTUseless(const ASTPtr & node, bool atomi
                 [this](const auto & arg) { return checkASTUseless(arg, true); });
     }
     else if (const auto * literal = node->as<ASTLiteral>())
-        return !atomic && literal->value.get<bool>();
+        return !atomic && literal->value.safeGet<bool>();
     else if (const auto * identifier = node->as<ASTIdentifier>())
         return key_columns.find(identifier->getColumnName()) == std::end(key_columns);
     else
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.h b/src/Storages/MergeTree/MergeTreeIndexSet.h
index 28afe4f714d..23b336d274b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.h
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.h
@@ -28,7 +28,7 @@ struct MergeTreeIndexGranuleSet final : public IMergeTreeIndexGranule
         MutableColumns && columns_);
 
     void serializeBinary(WriteBuffer & ostr) const override;
-    void deserializeBinary(ReadBuffer & istr) override;
+    void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) override;
 
     size_t size() const { return block.rows(); }
     bool empty() const override { return !size(); }
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index 674daeb480d..557af891b74 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -4,6 +4,7 @@
 #include <unordered_map>
 #include <vector>
 #include <memory>
+#include <utility>
 #include <Core/Block.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
@@ -17,13 +18,37 @@ constexpr auto INDEX_FILE_PREFIX = "skp_idx_";
 namespace DB
 {
 
+using MergeTreeIndexVersion = uint8_t;
+struct MergeTreeIndexFormat
+{
+    MergeTreeIndexVersion version;
+    const char* extension;
+
+    operator bool() const { return version != 0; }
+};
+
 /// Stores some info about a single block of data.
 struct IMergeTreeIndexGranule
 {
     virtual ~IMergeTreeIndexGranule() = default;
 
+    /// Serialize always last version.
     virtual void serializeBinary(WriteBuffer & ostr) const = 0;
-    virtual void deserializeBinary(ReadBuffer & istr) = 0;
+
+    /// Version of the index to deserialize:
+    ///
+    /// - 2 -- minmax index for proper Nullable support,
+    /// - 1 -- everything else.
+    ///
+    /// Implementation is responsible for version check,
+    /// and throw LOGICAL_ERROR in case of unsupported version.
+    ///
+    /// See also:
+    /// - IMergeTreeIndex::getSerializedFileExtension()
+    /// - IMergeTreeIndex::getDeserializedFormat()
+    /// - MergeTreeDataMergerMutator::collectFilesToSkip()
+    /// - MergeTreeDataMergerMutator::collectFilesForRenames()
+    virtual void deserializeBinary(ReadBuffer & istr, MergeTreeIndexVersion version) = 0;
 
     virtual bool empty() const = 0;
 };
@@ -73,9 +98,26 @@ struct IMergeTreeIndex
 
     virtual ~IMergeTreeIndex() = default;
 
-    /// gets filename without extension
+    /// Returns filename without extension.
     String getFileName() const { return INDEX_FILE_PREFIX + index.name; }
 
+    /// Returns extension for serialization.
+    /// Reimplement if you want new index format.
+    ///
+    /// NOTE: In case getSerializedFileExtension() is reimplemented,
+    /// getDeserializedFormat() should be reimplemented too,
+    /// and check all previous extensions too
+    /// (to avoid breaking backward compatibility).
+    virtual const char* getSerializedFileExtension() const { return ".idx"; }
+
+    /// Returns extension for deserialization.
+    ///
+    /// Return pair<extension, version>.
+    virtual MergeTreeIndexFormat getDeserializedFormat(const DiskPtr, const std::string & /* relative_path_prefix */) const
+    {
+        return {1, ".idx"};
+    }
+
     /// Checks whether the column is in data skipping index.
     virtual bool mayBenefitFromIndexForIn(const ASTPtr & node) const = 0;
 
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
index 717179e5f26..446ae9b97a1 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
@@ -63,7 +63,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
     if (!index_granularity_info.is_adaptive)
     {
         /// Read directly to marks.
-        auto buffer = disk->readFile(mrk_path, file_size);
+        auto buffer = disk->readFile(mrk_path, ReadSettings().adjustBufferSize(file_size), file_size);
         buffer->readStrict(reinterpret_cast<char *>(res->data()), file_size);
 
         if (!buffer->eof())
@@ -72,7 +72,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
     }
     else
     {
-        auto buffer = disk->readFile(mrk_path, file_size);
+        auto buffer = disk->readFile(mrk_path, ReadSettings().adjustBufferSize(file_size), file_size);
         size_t i = 0;
         while (!buffer->eof())
         {
diff --git a/src/Storages/MergeTree/MergeTreeMutationEntry.h b/src/Storages/MergeTree/MergeTreeMutationEntry.h
index 278babb67b9..e01ce4320b3 100644
--- a/src/Storages/MergeTree/MergeTreeMutationEntry.h
+++ b/src/Storages/MergeTree/MergeTreeMutationEntry.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MutationCommands.h>
diff --git a/src/Storages/MergeTree/MergeTreeMutationStatus.h b/src/Storages/MergeTree/MergeTreeMutationStatus.h
index 94d9294624f..acda43b9254 100644
--- a/src/Storages/MergeTree/MergeTreeMutationStatus.h
+++ b/src/Storages/MergeTree/MergeTreeMutationStatus.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/Names.h>
 #include <optional>
 #include <map>
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.cpp b/src/Storages/MergeTree/MergeTreePartInfo.cpp
index 24c18843935..7e140ec2375 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreePartInfo.cpp
@@ -9,68 +9,59 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int BAD_DATA_PART_NAME;
+    extern const int INVALID_PARTITION_VALUE;
 }
 
 
 MergeTreePartInfo MergeTreePartInfo::fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version)
 {
-    MergeTreePartInfo part_info;
-    if (!tryParsePartName(part_name, &part_info, format_version))
-        throw Exception("Unexpected part name: " + part_name, ErrorCodes::BAD_DATA_PART_NAME);
-    return part_info;
+    if (auto part_opt = tryParsePartName(part_name, format_version))
+        return *part_opt;
+    else
+        throw Exception(ErrorCodes::BAD_DATA_PART_NAME, "Unexpected part name: {}", part_name);
 }
 
-
-bool MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version)
+void MergeTreePartInfo::validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version)
 {
     if (partition_id.empty())
-        return false;
-
-    ReadBufferFromString in(partition_id);
+        throw Exception(ErrorCodes::INVALID_PARTITION_VALUE, "Partition id is empty");
 
     if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
-        UInt32 min_yyyymmdd = 0;
-        UInt32 max_yyyymmdd = 0;
-        if (!tryReadIntText(min_yyyymmdd, in)
-            || !checkChar('_', in)
-            || !tryReadIntText(max_yyyymmdd, in)
-            || !checkChar('_', in))
-        {
-            return false;
-        }
+        if (partition_id.size() != 6 || !std::all_of(partition_id.begin(), partition_id.end(), isNumericASCII))
+            throw Exception(ErrorCodes::INVALID_PARTITION_VALUE,
+                "Invalid partition format: {}. Partition should consist of 6 digits: YYYYMM",
+                partition_id);
     }
     else
     {
-        while (!in.eof())
-        {
-            char c;
-            readChar(c, in);
-
-            if (c == '_')
-                break;
-        }
+        auto is_valid_char = [](char c) { return c == '-' || isAlphaNumericASCII(c); };
+        if (!std::all_of(partition_id.begin(), partition_id.end(), is_valid_char))
+            throw Exception(ErrorCodes::INVALID_PARTITION_VALUE, "Invalid partition format: {}", partition_id);
     }
 
-    return in.eof();
 }
 
-bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version)
+std::optional<MergeTreePartInfo> MergeTreePartInfo::tryParsePartName(
+    std::string_view part_name, MergeTreeDataFormatVersion format_version)
 {
     ReadBufferFromString in(part_name);
 
     String partition_id;
+
     if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
         UInt32 min_yyyymmdd = 0;
         UInt32 max_yyyymmdd = 0;
+
         if (!tryReadIntText(min_yyyymmdd, in)
             || !checkChar('_', in)
             || !tryReadIntText(max_yyyymmdd, in)
             || !checkChar('_', in))
         {
-            return false;
+            return std::nullopt;
         }
+
         partition_id = toString(min_yyyymmdd / 100);
     }
     else
@@ -88,9 +79,7 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
 
     /// Sanity check
     if (partition_id.empty())
-    {
-        return false;
-    }
+        return std::nullopt;
 
     Int64 min_block_num = 0;
     Int64 max_block_num = 0;
@@ -103,14 +92,12 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
         || !checkChar('_', in)
         || !tryReadIntText(level, in))
     {
-        return false;
+        return std::nullopt;
     }
 
     /// Sanity check
     if (min_block_num > max_block_num)
-    {
-        return false;
-    }
+        return std::nullopt;
 
     if (!in.eof())
     {
@@ -118,29 +105,30 @@ bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePart
             || !tryReadIntText(mutation, in)
             || !in.eof())
         {
-            return false;
+            return std::nullopt;
         }
     }
 
-    if (part_info)
+    MergeTreePartInfo part_info;
+
+    part_info.partition_id = std::move(partition_id);
+    part_info.min_block = min_block_num;
+    part_info.max_block = max_block_num;
+
+    if (level == LEGACY_MAX_LEVEL)
     {
-        part_info->partition_id = std::move(partition_id);
-        part_info->min_block = min_block_num;
-        part_info->max_block = max_block_num;
-        if (level == LEGACY_MAX_LEVEL)
-        {
-            /// We (accidentally) had two different max levels until 21.6 and it might cause logical errors like
-            /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
-            /// So we replace unexpected max level to make contains(...) method and comparison operators work
-            /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
-            part_info->use_leagcy_max_level = true;
-            level = MAX_LEVEL;
-        }
-        part_info->level = level;
-        part_info->mutation = mutation;
+        /// We (accidentally) had two different max levels until 21.6 and it might cause logical errors like
+        /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
+        /// So we replace unexpected max level to make contains(...) method and comparison operators work
+        /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
+        part_info.use_leagcy_max_level = true;
+        level = MAX_LEVEL;
     }
 
-    return true;
+    part_info.level = level;
+    part_info.mutation = mutation;
+
+    return part_info;
 }
 
 
@@ -247,30 +235,75 @@ String MergeTreePartInfo::getPartNameV0(DayNum left_date, DayNum right_date) con
     return wb.str();
 }
 
-bool DetachedPartInfo::tryParseDetachedPartName(const String & dir_name, DetachedPartInfo & part_info,
-                                                MergeTreeDataFormatVersion format_version)
+DetachedPartInfo DetachedPartInfo::parseDetachedPartName(
+    std::string_view dir_name, MergeTreeDataFormatVersion format_version)
 {
+    DetachedPartInfo part_info;
+
     part_info.dir_name = dir_name;
 
-    /// First, try to parse as <part_name>.
-    // TODO what if tryParsePartName will parse prefix as partition_id? It can happen if dir_name doesn't contain mutation number at the end
-    if (MergeTreePartInfo::tryParsePartName(dir_name, &part_info, format_version))
-        return part_info.valid_name = true;
+    /// First, try to find known prefix and parse dir_name as <prefix>_<part_name>.
+    /// Arbitrary strings are not allowed for partition_id, so known_prefix cannot be confused with partition_id.
+    for (std::string_view known_prefix : DETACH_REASONS)
+    {
+        if (dir_name.starts_with(known_prefix)
+            && known_prefix.size() < dir_name.size()
+            && dir_name[known_prefix.size()] == '_')
+        {
+            part_info.prefix = known_prefix;
+
+            const std::string_view part_name = dir_name.substr(known_prefix.size() + 1);
+
+            if (auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+            {
+                part_info.valid_name = true;
+                part_info.addParsedPartInfo(*part_opt);
+            }
+            else
+                part_info.valid_name = false;
+
+            return part_info;
+        }
+    }
+
+    /// Next, try to parse dir_name as <part_name>.
+    if (auto part_opt = MergeTreePartInfo::tryParsePartName(dir_name, format_version))
+    {
+        part_info.valid_name = true;
+        part_info.addParsedPartInfo(*part_opt);
+        return part_info;
+    }
 
     /// Next, as <prefix>_<partname>. Use entire name as prefix if it fails.
     part_info.prefix = dir_name;
-    const auto first_separator = dir_name.find_first_of('_');
+
+    const size_t first_separator = dir_name.find_first_of('_');
+
     if (first_separator == String::npos)
-        return part_info.valid_name = false;
+    {
+        part_info.valid_name = false;
+        return part_info;
+    }
 
-    // TODO what if <prefix> contains '_'?
-    const auto part_name = dir_name.substr(first_separator + 1,
-                                           dir_name.size() - first_separator - 1);
-    if (!MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-        return part_info.valid_name = false;
+    const std::string_view part_name = dir_name.substr(
+        first_separator + 1,
+        dir_name.size() - first_separator - 1);
 
-    part_info.prefix = dir_name.substr(0, first_separator);
-    return part_info.valid_name = true;
+    if (auto part_opt = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+    {
+        part_info.valid_name = true;
+        part_info.prefix = dir_name.substr(0, first_separator);
+        part_info.addParsedPartInfo(*part_opt);
+    }
+    else
+        part_info.valid_name = false;
+
+    return part_info;
 }
 
+void DetachedPartInfo::addParsedPartInfo(const MergeTreePartInfo& part)
+{
+    // Both class are aggregates so it's ok.
+    static_cast<MergeTreePartInfo &>(*this) = part;
+}
 }
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 063f234e50f..b4c5687209b 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -1,9 +1,12 @@
 #pragma once
 
 #include <limits>
+#include <optional>
 #include <tuple>
-#include <common/types.h>
-#include <common/DayNum.h>
+#include <vector>
+#include <array>
+#include <base/types.h>
+#include <base/DayNum.h>
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
 
 
@@ -57,11 +60,22 @@ struct MergeTreePartInfo
     /// True if contains rhs (this part is obtained by merging rhs with some other parts or mutating rhs)
     bool contains(const MergeTreePartInfo & rhs) const
     {
+        /// Containing part may have equal level iff block numbers are equal (unless level is MAX_LEVEL)
+        /// (e.g. all_0_5_2 does not contain all_0_4_2, but all_0_5_3 or all_0_4_2_9 do)
+        bool strictly_contains_block_range = (min_block == rhs.min_block && max_block == rhs.max_block) || level > rhs.level
+            || level == MAX_LEVEL || level == LEGACY_MAX_LEVEL;
         return partition_id == rhs.partition_id        /// Parts for different partitions are not merged
             && min_block <= rhs.min_block
             && max_block >= rhs.max_block
             && level >= rhs.level
-            && mutation >= rhs.mutation;
+            && mutation >= rhs.mutation
+            && strictly_contains_block_range;
+    }
+
+    /// Return part mutation version, if part wasn't mutated return zero
+    Int64 getMutationVersion() const
+    {
+        return mutation ? mutation : 0;
     }
 
     /// True if parts do not intersect in any way.
@@ -87,11 +101,12 @@ struct MergeTreePartInfo
     }
 
     /// Simple sanity check for partition ID. Checking that it's not too long or too short, doesn't contain a lot of '_'.
-    static bool validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version);
+    static void validatePartitionID(const String & partition_id, MergeTreeDataFormatVersion format_version);
 
     static MergeTreePartInfo fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version);  // -V1071
 
-    static bool tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version);
+    static std::optional<MergeTreePartInfo> tryParsePartName(
+        std::string_view part_name, MergeTreeDataFormatVersion format_version);
 
     static void parseMinMaxDatesFromPartName(const String & part_name, DayNum & min_date, DayNum & max_date);
 
@@ -115,7 +130,28 @@ struct DetachedPartInfo : public MergeTreePartInfo
     /// If false, MergeTreePartInfo is in invalid state (directory name was not successfully parsed).
     bool valid_name;
 
-    static bool tryParseDetachedPartName(const String & dir_name, DetachedPartInfo & part_info, MergeTreeDataFormatVersion format_version);
+    static constexpr auto DETACH_REASONS = std::to_array<std::string_view>({
+        "broken",
+        "unexpected",
+        "noquorum",
+        "ignored",
+        "broken-on-start",
+        "clone",
+        "attaching",
+        "deleting",
+        "tmp-fetch",
+        "covered-by-broken",
+    });
+
+    /// NOTE: It may parse part info incorrectly.
+    /// For example, if prefix contains '_' or if DETACH_REASONS doesn't contain prefix.
+    // This method has different semantics with MergeTreePartInfo::tryParsePartName.
+    // Detached parts are always parsed regardless of their validity.
+    // DetachedPartInfo::valid_name field specifies whether parsing was successful or not.
+    static DetachedPartInfo parseDetachedPartName(std::string_view dir_name, MergeTreeDataFormatVersion format_version);
+
+private:
+    void addParsedPartInfo(const MergeTreePartInfo& part);
 };
 
 using DetachedPartsInfo = std::vector<DetachedPartInfo>;
diff --git a/src/Storages/MergeTree/MergeTreePartition.cpp b/src/Storages/MergeTree/MergeTreePartition.cpp
index 0d457971dc6..54011cc0924 100644
--- a/src/Storages/MergeTree/MergeTreePartition.cpp
+++ b/src/Storages/MergeTree/MergeTreePartition.cpp
@@ -43,16 +43,6 @@ namespace
             UInt8 type = Field::Types::Null;
             hash.update(type);
         }
-        void operator() (const NegativeInfinity &) const
-        {
-            UInt8 type = Field::Types::NegativeInfinity;
-            hash.update(type);
-        }
-        void operator() (const PositiveInfinity &) const
-        {
-            UInt8 type = Field::Types::PositiveInfinity;
-            hash.update(type);
-        }
         void operator() (const UInt64 & x) const
         {
             UInt8 type = Field::Types::UInt64;
@@ -171,7 +161,8 @@ namespace
 
 static std::unique_ptr<ReadBufferFromFileBase> openForReading(const DiskPtr & disk, const String & path)
 {
-    return disk->readFile(path, std::min(size_t(DBMS_DEFAULT_BUFFER_SIZE), disk->getFileSize(path)));
+    size_t file_size = disk->getFileSize(path);
+    return disk->readFile(path, ReadSettings().adjustBufferSize(file_size), file_size);
 }
 
 String MergeTreePartition::getID(const MergeTreeData & storage) const
diff --git a/src/Storages/MergeTree/MergeTreePartition.h b/src/Storages/MergeTree/MergeTreePartition.h
index 67e7a246c30..acc565e2ce9 100644
--- a/src/Storages/MergeTree/MergeTreePartition.h
+++ b/src/Storages/MergeTree/MergeTreePartition.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 #include <IO/WriteBuffer.h>
 #include <Storages/KeyDescription.h>
diff --git a/src/Storages/MergeTree/MergeTreeProjections.cpp b/src/Storages/MergeTree/MergeTreeProjections.cpp
deleted file mode 100644
index b20aa07b70c..00000000000
--- a/src/Storages/MergeTree/MergeTreeProjections.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Parsers/ParserCreateQuery.h>
-#include <Parsers/parseQuery.h>
-#include <Storages/MergeTree/MergeTreeProjections.h>
-
-#include <numeric>
-
-#include <boost/algorithm/string.hpp>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-    extern const int INCORRECT_QUERY;
-}
-
-void MergeTreeProjectionFactory::registerCreator(ProjectionDescription::Type projection_type, Creator creator)
-{
-    if (!creators.emplace(projection_type, std::move(creator)).second)
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR,
-            "MergeTreeProjectionFactory: the Projection creator name '{}' is not unique",
-            ProjectionDescription::typeToString(projection_type));
-}
-
-MergeTreeProjectionPtr MergeTreeProjectionFactory::get(const ProjectionDescription & projection) const
-{
-    auto it = creators.find(projection.type);
-    if (it == creators.end())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Projection type {} is not registered",
-                        ProjectionDescription::typeToString(projection.type));
-
-    return it->second(projection);
-}
-
-
-MergeTreeProjections MergeTreeProjectionFactory::getMany(const std::vector<ProjectionDescription> & projections) const
-{
-    MergeTreeProjections result;
-    for (const auto & projection : projections)
-        result.emplace_back(get(projection));
-    return result;
-}
-
-void MergeTreeProjectionFactory::validate(const ProjectionDescription & projection) const
-{
-    if (startsWith(projection.name, "tmp_"))
-        throw Exception("Projection's name cannot start with 'tmp_'", ErrorCodes::INCORRECT_QUERY);
-
-    get(projection);
-}
-
-MergeTreeProjectionPtr normalProjectionCreator(const ProjectionDescription & projection)
-{
-    return std::make_shared<MergeTreeProjectionNormal>(projection);
-}
-
-MergeTreeProjectionPtr aggregateProjectionCreator(const ProjectionDescription & projection)
-{
-    return std::make_shared<MergeTreeProjectionAggregate>(projection);
-}
-
-MergeTreeProjectionFactory::MergeTreeProjectionFactory()
-{
-    registerCreator(ProjectionDescription::Type::Normal, normalProjectionCreator);
-    registerCreator(ProjectionDescription::Type::Aggregate, aggregateProjectionCreator);
-}
-
-MergeTreeProjectionFactory & MergeTreeProjectionFactory::instance()
-{
-    static MergeTreeProjectionFactory instance;
-    return instance;
-}
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeProjections.h b/src/Storages/MergeTree/MergeTreeProjections.h
deleted file mode 100644
index 434e0390845..00000000000
--- a/src/Storages/MergeTree/MergeTreeProjections.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-#include <Core/Block.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <Interpreters/ExpressionActions.h>
-#include <Parsers/ASTProjectionDeclaration.h>
-#include <Storages/MergeTree/MarkRange.h>
-#include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
-#include <Storages/ProjectionsDescription.h>
-#include <Storages/SelectQueryInfo.h>
-#include <Storages/StorageInMemoryMetadata.h>
-
-namespace DB
-{
-/// Condition on the projection.
-class IMergeTreeProjectionCondition
-{
-public:
-    virtual ~IMergeTreeProjectionCondition() = default;
-    /// Checks if this projection is useful for query.
-    virtual bool canHandleQuery() const = 0;
-};
-
-using MergeTreeProjectionConditionPtr = std::shared_ptr<IMergeTreeProjectionCondition>;
-
-struct IMergeTreeProjection
-{
-    IMergeTreeProjection(const ProjectionDescription & projection_) : projection(projection_) { }
-
-    virtual ~IMergeTreeProjection() = default;
-
-    /// gets directory name
-    String getDirectoryName() const { return projection.name + ".proj"; }
-
-    const String & getName() const { return projection.name; }
-
-    Names getColumnsRequiredForProjectionCalc() const { return projection.required_columns; }
-
-    const ProjectionDescription & projection;
-};
-
-using MergeTreeProjectionPtr = std::shared_ptr<const IMergeTreeProjection>;
-using MergeTreeProjections = std::vector<MergeTreeProjectionPtr>;
-
-class MergeTreeProjectionNormal : public IMergeTreeProjection
-{
-public:
-    explicit MergeTreeProjectionNormal(const ProjectionDescription & projection_) : IMergeTreeProjection(projection_) { }
-
-    ~MergeTreeProjectionNormal() override = default;
-};
-
-class MergeTreeProjectionAggregate : public IMergeTreeProjection
-{
-public:
-    explicit MergeTreeProjectionAggregate(const ProjectionDescription & projection_) : IMergeTreeProjection(projection_) { }
-
-    ~MergeTreeProjectionAggregate() override = default;
-};
-
-class MergeTreeProjectionFactory : private boost::noncopyable
-{
-public:
-    static MergeTreeProjectionFactory & instance();
-
-    using Creator = std::function<MergeTreeProjectionPtr(const ProjectionDescription & projection)>;
-
-    void validate(const ProjectionDescription & projection) const;
-
-    MergeTreeProjectionPtr get(const ProjectionDescription & projection) const;
-
-    MergeTreeProjections getMany(const std::vector<ProjectionDescription> & projections) const;
-
-    void registerCreator(ProjectionDescription::Type projection_type, Creator creator);
-
-protected:
-    MergeTreeProjectionFactory();
-
-private:
-    using Creators = std::unordered_map<ProjectionDescription::Type, Creator>;
-    Creators creators;
-};
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index 2347280a4a0..124f13b14a8 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -1,7 +1,8 @@
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Columns/FilterDescription.h>
 #include <Columns/ColumnsCommon.h>
-#include <common/range.h>
+#include <base/range.h>
+#include <Interpreters/castColumn.h>
 #include <DataTypes/DataTypeNothing.h>
 
 #ifdef __SSE2__
@@ -53,9 +54,21 @@ static void filterColumns(Columns & columns, const ColumnPtr & filter)
 }
 
 
+static size_t getLastMark(const MergeTreeRangeReader::ReadResult::RangesInfo & ranges)
+{
+    size_t current_task_last_mark = 0;
+    for (const auto & mark_range : ranges)
+        current_task_last_mark = std::max(current_task_last_mark, mark_range.range.end);
+    return current_task_last_mark;
+}
+
+
 MergeTreeRangeReader::DelayedStream::DelayedStream(
-        size_t from_mark, IMergeTreeReader * merge_tree_reader_)
+    size_t from_mark,
+    size_t current_task_last_mark_,
+    IMergeTreeReader * merge_tree_reader_)
         : current_mark(from_mark), current_offset(0), num_delayed_rows(0)
+        , current_task_last_mark(current_task_last_mark_)
         , merge_tree_reader(merge_tree_reader_)
         , index_granularity(&(merge_tree_reader->data_part->index_granularity))
         , continue_reading(false), is_finished(false)
@@ -72,7 +85,8 @@ size_t MergeTreeRangeReader::DelayedStream::readRows(Columns & columns, size_t n
 {
     if (num_rows)
     {
-        size_t rows_read = merge_tree_reader->readRows(current_mark, continue_reading, num_rows, columns);
+        size_t rows_read = merge_tree_reader->readRows(
+            current_mark, current_task_last_mark, continue_reading, num_rows, columns);
         continue_reading = true;
 
         /// Zero rows_read maybe either because reading has finished
@@ -150,13 +164,13 @@ size_t MergeTreeRangeReader::DelayedStream::finalize(Columns & columns)
 
 
 MergeTreeRangeReader::Stream::Stream(
-        size_t from_mark, size_t to_mark, IMergeTreeReader * merge_tree_reader_)
+        size_t from_mark, size_t to_mark, size_t current_task_last_mark, IMergeTreeReader * merge_tree_reader_)
         : current_mark(from_mark), offset_after_current_mark(0)
         , last_mark(to_mark)
         , merge_tree_reader(merge_tree_reader_)
         , index_granularity(&(merge_tree_reader->data_part->index_granularity))
         , current_mark_index_granularity(index_granularity->getMarkRows(from_mark))
-        , stream(from_mark, merge_tree_reader)
+        , stream(from_mark, current_task_last_mark, merge_tree_reader)
 {
     size_t marks_count = index_granularity->getMarksCount();
     if (from_mark >= marks_count)
@@ -279,9 +293,9 @@ void MergeTreeRangeReader::ReadResult::adjustLastGranule()
         throw Exception("Can't adjust last granule because no granules were added.", ErrorCodes::LOGICAL_ERROR);
 
     if (num_rows_to_subtract > rows_per_granule.back())
-        throw Exception("Can't adjust last granule because it has " + toString(rows_per_granule.back())
-                        + " rows, but try to subtract " + toString(num_rows_to_subtract) + " rows.",
-                        ErrorCodes::LOGICAL_ERROR);
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Can't adjust last granule because it has {} rows, but try to subtract {} rows.",
+                        toString(rows_per_granule.back()), toString(num_rows_to_subtract));
 
     rows_per_granule.back() -= num_rows_to_subtract;
     total_rows_per_granule -= num_rows_to_subtract;
@@ -749,6 +763,8 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::startReadingChain(size_t
     ReadResult result;
     result.columns.resize(merge_tree_reader->getColumns().size());
 
+    size_t current_task_last_mark = getLastMark(ranges);
+
     /// Stream is lazy. result.num_added_rows is the number of rows added to block which is not equal to
     /// result.num_rows_read until call to stream.finalize(). Also result.num_added_rows may be less than
     /// result.num_rows_read if the last granule in range also the last in part (so we have to adjust last granule).
@@ -759,7 +775,7 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::startReadingChain(size_t
             if (stream.isFinished())
             {
                 result.addRows(stream.finalize(result.columns));
-                stream = Stream(ranges.front().begin, ranges.front().end, merge_tree_reader);
+                stream = Stream(ranges.front().begin, ranges.front().end, current_task_last_mark, merge_tree_reader);
                 result.addRange(ranges.front());
                 ranges.pop_front();
             }
@@ -806,6 +822,7 @@ Columns MergeTreeRangeReader::continueReadingChain(ReadResult & result, size_t &
     const auto & rows_per_granule = result.rowsPerGranule();
     const auto & started_ranges = result.startedRanges();
 
+    size_t current_task_last_mark = getLastMark(started_ranges);
     size_t next_range_to_start = 0;
 
     auto size = rows_per_granule.size();
@@ -817,7 +834,7 @@ Columns MergeTreeRangeReader::continueReadingChain(ReadResult & result, size_t &
             num_rows += stream.finalize(columns);
             const auto & range = started_ranges[next_range_to_start].range;
             ++next_range_to_start;
-            stream = Stream(range.begin, range.end, merge_tree_reader);
+            stream = Stream(range.begin, range.end, current_task_last_mark, merge_tree_reader);
         }
 
         bool last = i + 1 == size;
@@ -835,7 +852,7 @@ Columns MergeTreeRangeReader::continueReadingChain(ReadResult & result, size_t &
     return columns;
 }
 
-static void checkCombindeFiltersSize(size_t bytes_in_first_filter, size_t second_filter_size)
+static void checkCombinedFiltersSize(size_t bytes_in_first_filter, size_t second_filter_size)
 {
     if (bytes_in_first_filter != second_filter_size)
         throw Exception(ErrorCodes::LOGICAL_ERROR,
@@ -845,36 +862,42 @@ static void checkCombindeFiltersSize(size_t bytes_in_first_filter, size_t second
 
 static ColumnPtr combineFilters(ColumnPtr first, ColumnPtr second)
 {
-    ConstantFilterDescription firsrt_const_descr(*first);
+    ConstantFilterDescription first_const_descr(*first);
 
-    if (firsrt_const_descr.always_true)
+    if (first_const_descr.always_true)
     {
-        checkCombindeFiltersSize(first->size(), second->size());
+        checkCombinedFiltersSize(first->size(), second->size());
         return second;
     }
 
-    if (firsrt_const_descr.always_false)
+    if (first_const_descr.always_false)
     {
-        checkCombindeFiltersSize(0, second->size());
+        checkCombinedFiltersSize(0, second->size());
         return first;
     }
 
-    auto mut_first = IColumn::mutate(std::move(first));
-    FilterDescription firsrt_descr(*mut_first);
+    FilterDescription first_descr(*first);
 
-    size_t bytes_in_first_filter = countBytesInFilter(*firsrt_descr.data);
-    checkCombindeFiltersSize(bytes_in_first_filter, second->size());
+    size_t bytes_in_first_filter = countBytesInFilter(*first_descr.data);
+    checkCombinedFiltersSize(bytes_in_first_filter, second->size());
 
     ConstantFilterDescription second_const_descr(*second);
 
     if (second_const_descr.always_true)
-        return mut_first;
+        return first;
 
     if (second_const_descr.always_false)
-        return second->cloneResized(mut_first->size());
+        return second->cloneResized(first->size());
 
     FilterDescription second_descr(*second);
-    auto & first_data = const_cast<IColumn::Filter &>(*firsrt_descr.data);
+
+    MutableColumnPtr mut_first;
+    if (first_descr.data_holder)
+        mut_first = IColumn::mutate(std::move(first_descr.data_holder));
+    else
+        mut_first = IColumn::mutate(std::move(first));
+
+    auto & first_data = typeid_cast<ColumnUInt8 *>(mut_first.get())->getData();
     const auto * second_data = second_descr.data->data();
 
     for (auto & val : first_data)
@@ -968,7 +991,6 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
     {
         row_level_filter = combineFilters(std::move(row_level_filter), filter);
         result.setFilter(row_level_filter);
-
     }
     else
         result.setFilter(filter);
@@ -1038,10 +1060,15 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
     /// Filter in WHERE instead
     else
     {
-        result.columns[prewhere_column_pos] = result.getFilterHolder()->convertToFullColumnIfConst();
-        if (getSampleBlock().getByName(prewhere_info->prewhere_column_name).type->isNullable())
-            result.columns[prewhere_column_pos] = makeNullable(std::move(result.columns[prewhere_column_pos]));
-        result.clearFilter(); // Acting as a flag to not filter in PREWHERE
+        if (prewhere_info->remove_prewhere_column)
+            result.columns.erase(result.columns.begin() + prewhere_column_pos);
+        else
+        {
+            auto type = getSampleBlock().getByName(prewhere_info->prewhere_column_name).type;
+            ColumnWithTypeAndName col(result.getFilterHolder()->convertToFullColumnIfConst(), std::make_shared<DataTypeUInt8>(), "");
+            result.columns[prewhere_column_pos] = castColumn(col, type);
+            result.clearFilter(); // Acting as a flag to not filter in PREWHERE
+        }
     }
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.h b/src/Storages/MergeTree/MergeTreeRangeReader.h
index 8cdf485ff1e..c913b476b73 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.h
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Core/Block.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/MergeTree/MarkRange.h>
 
 namespace DB
@@ -62,7 +62,7 @@ public:
     {
     public:
         DelayedStream() = default;
-        DelayedStream(size_t from_mark, IMergeTreeReader * merge_tree_reader);
+        DelayedStream(size_t from_mark, size_t current_task_last_mark_, IMergeTreeReader * merge_tree_reader);
 
         /// Read @num_rows rows from @from_mark starting from @offset row
         /// Returns the number of rows added to block.
@@ -81,6 +81,8 @@ public:
         size_t current_offset = 0;
         /// Num of rows we have to read
         size_t num_delayed_rows = 0;
+        /// Last mark from all ranges of current task.
+        size_t current_task_last_mark = 0;
 
         /// Actual reader of data from disk
         IMergeTreeReader * merge_tree_reader = nullptr;
@@ -99,7 +101,8 @@ public:
     {
     public:
         Stream() = default;
-        Stream(size_t from_mark, size_t to_mark, IMergeTreeReader * merge_tree_reader);
+        Stream(size_t from_mark, size_t to_mark,
+               size_t current_task_last_mark, IMergeTreeReader * merge_tree_reader);
 
         /// Returns the number of rows added to block.
         size_t read(Columns & columns, size_t num_rows, bool skip_remaining_rows_in_current_granule);
@@ -122,6 +125,7 @@ public:
         /// Invariant: offset_after_current_mark + skipped_rows_after_offset < index_granularity
         size_t offset_after_current_mark = 0;
 
+        /// Last mark in current range.
         size_t last_mark = 0;
 
         IMergeTreeReader * merge_tree_reader = nullptr;
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.cpp b/src/Storages/MergeTree/MergeTreeReadPool.cpp
index b18f22c3ab1..09542c30636 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -1,7 +1,7 @@
 #include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <Storages/MergeTree/MergeTreeBaseSelectProcessor.h>
 #include <Common/formatReadable.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace ProfileEvents
@@ -25,7 +25,6 @@ MergeTreeReadPool::MergeTreeReadPool(
     const MergeTreeData & data_,
     const StorageMetadataPtr & metadata_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
-    const bool check_columns_,
     const Names & column_names_,
     const BackoffSettings & backoff_settings_,
     size_t preferred_block_size_bytes_,
@@ -41,7 +40,7 @@ MergeTreeReadPool::MergeTreeReadPool(
     , parts_ranges{std::move(parts_)}
 {
     /// parts don't contain duplicate MergeTreeDataPart's.
-    const auto per_part_sum_marks = fillPerPartInfo(parts_ranges, check_columns_);
+    const auto per_part_sum_marks = fillPerPartInfo(parts_ranges);
     fillPerThreadInfo(threads_, sum_marks_, per_part_sum_marks, parts_ranges, min_marks_for_concurrent_read_);
 }
 
@@ -89,8 +88,11 @@ MergeTreeReadTaskPtr MergeTreeReadPool::getTask(const size_t min_marks_to_read,
     auto & part = parts_with_idx[part_idx];
     auto & marks_in_part = thread_tasks.sum_marks_in_parts.back();
 
-    /// Get whole part to read if it is small enough.
-    auto need_marks = std::min(marks_in_part, min_marks_to_read);
+    size_t need_marks;
+    if (is_part_on_remote_disk[part_idx]) /// For better performance with remote disks
+        need_marks = marks_in_part;
+    else /// Get whole part to read if it is small enough.
+        need_marks = std::min(marks_in_part, min_marks_to_read);
 
     /// Do not leave too little rows in part for next time.
     if (marks_in_part > need_marks &&
@@ -142,30 +144,6 @@ MergeTreeReadTaskPtr MergeTreeReadPool::getTask(const size_t min_marks_to_read,
         prewhere_info && prewhere_info->remove_prewhere_column, per_part_should_reorder[part_idx], std::move(curr_task_size_predictor));
 }
 
-MarkRanges MergeTreeReadPool::getRestMarks(const IMergeTreeDataPart & part, const MarkRange & from) const
-{
-    MarkRanges all_part_ranges;
-
-    /// Inefficient in presence of large number of data parts.
-    for (const auto & part_ranges : parts_ranges)
-    {
-        if (part_ranges.data_part.get() == &part)
-        {
-            all_part_ranges = part_ranges.ranges;
-            break;
-        }
-    }
-    if (all_part_ranges.empty())
-        throw Exception("Trying to read marks range [" + std::to_string(from.begin) + ", " + std::to_string(from.end) + "] from part '"
-            + part.getFullPath() + "' which has no ranges in this query", ErrorCodes::LOGICAL_ERROR);
-
-    auto begin = std::lower_bound(all_part_ranges.begin(), all_part_ranges.end(), from, [] (const auto & f, const auto & s) { return f.begin < s.begin; });
-    if (begin == all_part_ranges.end())
-        begin = std::prev(all_part_ranges.end());
-    begin->begin = from.begin;
-    return MarkRanges(begin, all_part_ranges.end());
-}
-
 Block MergeTreeReadPool::getHeader() const
 {
     return metadata_snapshot->getSampleBlockForColumns(column_names, data.getVirtuals(), data.getStorageID());
@@ -211,15 +189,16 @@ void MergeTreeReadPool::profileFeedback(const ReadBufferFromFileBase::ProfileInf
 }
 
 
-std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(
-    const RangesInDataParts & parts, const bool check_columns)
+std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(const RangesInDataParts & parts)
 {
     std::vector<size_t> per_part_sum_marks;
     Block sample_block = metadata_snapshot->getSampleBlock();
+    is_part_on_remote_disk.resize(parts.size());
 
     for (const auto i : collections::range(0, parts.size()))
     {
         const auto & part = parts[i];
+        is_part_on_remote_disk[i] = part.data_part->isStoredOnRemoteDisk();
 
         /// Read marks for every data part.
         size_t sum_marks = 0;
@@ -228,7 +207,7 @@ std::vector<size_t> MergeTreeReadPool::fillPerPartInfo(
 
         per_part_sum_marks.push_back(sum_marks);
 
-        auto task_columns = getReadTaskColumns(data, metadata_snapshot, part.data_part, column_names, prewhere_info, check_columns);
+        auto task_columns = getReadTaskColumns(data, metadata_snapshot, part.data_part, column_names, prewhere_info);
 
         auto size_predictor = !predict_block_size_bytes ? nullptr
             : MergeTreeBaseSelectProcessor::getSizePredictor(part.data_part, task_columns, sample_block);
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index 9949bdf86f8..aac4d5016a2 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -73,7 +73,7 @@ public:
         const size_t threads_, const size_t sum_marks_, const size_t min_marks_for_concurrent_read_,
         RangesInDataParts && parts_, const MergeTreeData & data_, const StorageMetadataPtr & metadata_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
-        const bool check_columns_, const Names & column_names_,
+        const Names & column_names_,
         const BackoffSettings & backoff_settings_, size_t preferred_block_size_bytes_,
         const bool do_not_steal_tasks_ = false);
 
@@ -85,14 +85,10 @@ public:
       */
     void profileFeedback(const ReadBufferFromFileBase::ProfileInfo info);
 
-    /// This method tells which mark ranges we have to read if we start from @from mark range
-    MarkRanges getRestMarks(const IMergeTreeDataPart & part, const MarkRange & from) const;
-
     Block getHeader() const;
 
 private:
-    std::vector<size_t> fillPerPartInfo(
-        const RangesInDataParts & parts, const bool check_columns);
+    std::vector<size_t> fillPerPartInfo(const RangesInDataParts & parts);
 
     void fillPerThreadInfo(
         const size_t threads, const size_t sum_marks, std::vector<size_t> per_part_sum_marks,
@@ -139,6 +135,8 @@ private:
     mutable std::mutex mutex;
 
     Poco::Logger * log = &Poco::Logger::get("MergeTreeReadPool");
+
+    std::vector<bool> is_part_on_remote_disk;
 };
 
 using MergeTreeReadPoolPtr = std::shared_ptr<MergeTreeReadPool>;
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 783a37cce60..f000b43f61a 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -68,23 +68,19 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
 
         /// Do not use max_read_buffer_size, but try to lower buffer size with maximal size of granule to avoid reading much data.
         auto buffer_size = getReadBufferSize(data_part, marks_loader, column_positions, all_mark_ranges);
-        if (!buffer_size || settings.max_read_buffer_size < buffer_size)
-            buffer_size = settings.max_read_buffer_size;
+        if (buffer_size)
+            settings.read_settings = settings.read_settings.adjustBufferSize(buffer_size);
 
         const String full_data_path = data_part->getFullRelativePath() + MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION;
         if (uncompressed_cache)
         {
             auto buffer = std::make_unique<CachedCompressedReadBuffer>(
                 fullPath(data_part->volume->getDisk(), full_data_path),
-                [this, full_data_path, buffer_size]()
+                [this, full_data_path]()
                 {
                     return data_part->volume->getDisk()->readFile(
                         full_data_path,
-                        buffer_size,
-                        0,
-                        settings.min_bytes_to_use_direct_io,
-                        settings.min_bytes_to_use_mmap_io,
-                        settings.mmap_cache.get());
+                        settings.read_settings);
                 },
                 uncompressed_cache,
                 /* allow_different_codecs = */ true);
@@ -104,11 +100,7 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
                 std::make_unique<CompressedReadBufferFromFile>(
                     data_part->volume->getDisk()->readFile(
                         full_data_path,
-                        buffer_size,
-                        0,
-                        settings.min_bytes_to_use_direct_io,
-                        settings.min_bytes_to_use_mmap_io,
-                        settings.mmap_cache.get()),
+                        settings.read_settings),
                     /* allow_different_codecs = */ true);
 
             if (profile_callback_)
@@ -128,7 +120,8 @@ MergeTreeReaderCompact::MergeTreeReaderCompact(
     }
 }
 
-size_t MergeTreeReaderCompact::readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
+size_t MergeTreeReaderCompact::readRows(
+    size_t from_mark, size_t current_task_last_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
 {
     if (continue_reading)
         from_mark = next_mark;
@@ -164,12 +157,13 @@ size_t MergeTreeReaderCompact::readRows(size_t from_mark, bool continue_reading,
                 auto & column = res_columns[pos];
                 size_t column_size_before_reading = column->size();
 
-                readData(column_from_part, column, from_mark, *column_positions[pos], rows_to_read, read_only_offsets[pos]);
+                readData(column_from_part, column, from_mark, current_task_last_mark, *column_positions[pos], rows_to_read, read_only_offsets[pos]);
 
                 size_t read_rows_in_column = column->size() - column_size_before_reading;
-                if (read_rows_in_column < rows_to_read)
-                    throw Exception("Cannot read all data in MergeTreeReaderCompact. Rows read: " + toString(read_rows_in_column) +
-                        ". Rows expected: " + toString(rows_to_read) + ".", ErrorCodes::CANNOT_READ_ALL_DATA);
+                if (read_rows_in_column != rows_to_read)
+                    throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
+                        "Cannot read all data in MergeTreeReaderCompact. Rows read: {}. Rows expected: {}.",
+                        read_rows_in_column, rows_to_read);
             }
             catch (Exception & e)
             {
@@ -198,7 +192,7 @@ size_t MergeTreeReaderCompact::readRows(size_t from_mark, bool continue_reading,
 
 void MergeTreeReaderCompact::readData(
     const NameAndTypePair & name_and_type, ColumnPtr & column,
-    size_t from_mark, size_t column_position, size_t rows_to_read, bool only_offsets)
+    size_t from_mark, size_t current_task_last_mark, size_t column_position, size_t rows_to_read, bool only_offsets)
 {
     const auto & [name, type] = name_and_type;
 
@@ -210,6 +204,8 @@ void MergeTreeReaderCompact::readData(
         if (only_offsets && (substream_path.size() != 1 || substream_path[0].type != ISerialization::Substream::ArraySizes))
             return nullptr;
 
+        /// For asynchronous reading from remote fs.
+        data_buffer->setReadUntilPosition(marks_loader.getMark(current_task_last_mark).offset_in_compressed_file);
         return data_buffer;
     };
 
@@ -220,13 +216,20 @@ void MergeTreeReaderCompact::readData(
 
     if (name_and_type.isSubcolumn())
     {
-        auto type_in_storage = name_and_type.getTypeInStorage();
+        const auto & type_in_storage = name_and_type.getTypeInStorage();
         ColumnPtr temp_column = type_in_storage->createColumn();
 
         auto serialization = type_in_storage->getDefaultSerialization();
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
         serialization->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, state, nullptr);
-        column = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), *temp_column);
+
+        auto subcolumn = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), temp_column);
+
+        /// TODO: Avoid extra copying.
+        if (column->empty())
+            column = subcolumn;
+        else
+            column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
     }
     else
     {
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.h b/src/Storages/MergeTree/MergeTreeReaderCompact.h
index dbfaa7868fa..350c8427eff 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.h
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.h
@@ -32,7 +32,8 @@ public:
 
     /// Return the number of rows has been read or zero if there is no columns to read.
     /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
-    size_t readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
+    size_t readRows(size_t from_mark, size_t current_task_last_mark,
+                    bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
 
     bool canReadIncompleteGranules() const override { return false; }
 
@@ -57,7 +58,7 @@ private:
     void seekToMark(size_t row_index, size_t column_index);
 
     void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, size_t from_mark,
-        size_t column_position, size_t rows_to_read, bool only_offsets);
+        size_t current_task_last_mark, size_t column_position, size_t rows_to_read, bool only_offsets);
 
     /// Returns maximal value of granule size in compressed file from @mark_ranges.
     /// This value is used as size of read buffer.
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
index cf5c850daa1..8a69183e858 100644
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
@@ -11,7 +11,6 @@ namespace ErrorCodes
 {
     extern const int CANNOT_READ_ALL_DATA;
     extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int LOGICAL_ERROR;
 }
 
 
@@ -38,20 +37,8 @@ MergeTreeReaderInMemory::MergeTreeReaderInMemory(
     }
 }
 
-static ColumnPtr getColumnFromBlock(const Block & block, const NameAndTypePair & name_and_type)
-{
-    auto storage_name = name_and_type.getNameInStorage();
-    if (!block.has(storage_name))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Not found column '{}' in block", storage_name);
-
-    const auto & column = block.getByName(storage_name).column;
-    if (name_and_type.isSubcolumn())
-        return name_and_type.getTypeInStorage()->getSubcolumn(name_and_type.getSubcolumnName(), *column);
-
-    return column;
-}
-
-size_t MergeTreeReaderInMemory::readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
+size_t MergeTreeReaderInMemory::readRows(
+    size_t from_mark, size_t /* current_task_last_mark */, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
 {
     if (!continue_reading)
         total_rows_read = 0;
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.h b/src/Storages/MergeTree/MergeTreeReaderInMemory.h
index 4526b19c4a8..ff6eb92d9c3 100644
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.h
+++ b/src/Storages/MergeTree/MergeTreeReaderInMemory.h
@@ -23,7 +23,8 @@ public:
 
     /// Return the number of rows has been read or zero if there is no columns to read.
     /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
-    size_t readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
+    size_t readRows(size_t from_mark, size_t current_tasl_last_mark,
+                    bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
 
     bool canReadIncompleteGranules() const override { return true; }
 
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index 23e62c29c51..c679d6eb869 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -1,6 +1,7 @@
 #include <Storages/MergeTree/MergeTreeReaderStream.h>
 #include <Compression/CachedCompressedReadBuffer.h>
 
+#include <base/getThreadId.h>
 #include <utility>
 
 
@@ -10,23 +11,28 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ARGUMENT_OUT_OF_BOUND;
+    extern const int CANNOT_READ_ALL_DATA;
 }
 
-
 MergeTreeReaderStream::MergeTreeReaderStream(
         DiskPtr disk_,
         const String & path_prefix_, const String & data_file_extension_, size_t marks_count_,
         const MarkRanges & all_mark_ranges,
         const MergeTreeReaderSettings & settings,
         MarkCache * mark_cache_,
-        UncompressedCache * uncompressed_cache, size_t file_size,
+        UncompressedCache * uncompressed_cache, size_t file_size_,
         const MergeTreeIndexGranularityInfo * index_granularity_info_,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type)
-        : disk(std::move(disk_)), path_prefix(path_prefix_), data_file_extension(data_file_extension_), marks_count(marks_count_)
-        , mark_cache(mark_cache_), save_marks_in_cache(settings.save_marks_in_cache)
-        , index_granularity_info(index_granularity_info_)
-        , marks_loader(disk, mark_cache, index_granularity_info->getMarksFilePath(path_prefix),
-            marks_count, *index_granularity_info, save_marks_in_cache)
+    : disk(std::move(disk_))
+    , path_prefix(path_prefix_)
+    , data_file_extension(data_file_extension_)
+    , marks_count(marks_count_)
+    , file_size(file_size_)
+    , mark_cache(mark_cache_)
+    , save_marks_in_cache(settings.save_marks_in_cache)
+    , index_granularity_info(index_granularity_info_)
+    , marks_loader(disk, mark_cache, index_granularity_info->getMarksFilePath(path_prefix),
+        marks_count, *index_granularity_info, save_marks_in_cache)
 {
     /// Compute the size of the buffer.
     size_t max_mark_range_bytes = 0;
@@ -36,61 +42,38 @@ MergeTreeReaderStream::MergeTreeReaderStream(
     {
         size_t left_mark = mark_range.begin;
         size_t right_mark = mark_range.end;
-
-        /// NOTE: if we are reading the whole file, then right_mark == marks_count
-        /// and we will use max_read_buffer_size for buffer size, thus avoiding the need to load marks.
-
-        /// If the end of range is inside the block, we will need to read it too.
-        if (right_mark < marks_count && marks_loader.getMark(right_mark).offset_in_decompressed_block > 0)
-        {
-            auto indices = collections::range(right_mark, marks_count);
-            auto it = std::upper_bound(indices.begin(), indices.end(), right_mark, [this](size_t i, size_t j)
-            {
-                return marks_loader.getMark(i).offset_in_compressed_file < marks_loader.getMark(j).offset_in_compressed_file;
-            });
-
-            right_mark = (it == indices.end() ? marks_count : *it);
-        }
-
-        size_t mark_range_bytes;
-
-        /// If there are no marks after the end of range, just use file size
-        if (right_mark >= marks_count
-            || (right_mark + 1 == marks_count
-                && marks_loader.getMark(right_mark).offset_in_compressed_file == marks_loader.getMark(mark_range.end).offset_in_compressed_file))
-        {
-            mark_range_bytes = file_size - (left_mark < marks_count ? marks_loader.getMark(left_mark).offset_in_compressed_file : 0);
-        }
-        else
-        {
-            mark_range_bytes = marks_loader.getMark(right_mark).offset_in_compressed_file - marks_loader.getMark(left_mark).offset_in_compressed_file;
-        }
+        auto [right_offset, mark_range_bytes] = getRightOffsetAndBytesRange(left_mark, right_mark);
 
         max_mark_range_bytes = std::max(max_mark_range_bytes, mark_range_bytes);
         sum_mark_range_bytes += mark_range_bytes;
     }
 
+    std::optional<size_t> estimated_sum_mark_range_bytes;
+    if (sum_mark_range_bytes)
+        estimated_sum_mark_range_bytes.emplace(sum_mark_range_bytes);
+
     /// Avoid empty buffer. May happen while reading dictionary for DataTypeLowCardinality.
     /// For example: part has single dictionary and all marks point to the same position.
-    if (max_mark_range_bytes == 0)
-        max_mark_range_bytes = settings.max_read_buffer_size;
+    ReadSettings read_settings = settings.read_settings;
+    read_settings.must_read_until_position = true;
+    if (max_mark_range_bytes != 0)
+        read_settings = read_settings.adjustBufferSize(max_mark_range_bytes);
 
-    size_t buffer_size = std::min(settings.max_read_buffer_size, max_mark_range_bytes);
+    //// Empty buffer does not makes progress.
+    if (!read_settings.local_fs_buffer_size || !read_settings.remote_fs_buffer_size)
+        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read to empty buffer.");
 
     /// Initialize the objects that shall be used to perform read operations.
     if (uncompressed_cache)
     {
         auto buffer = std::make_unique<CachedCompressedReadBuffer>(
             fullPath(disk, path_prefix + data_file_extension),
-            [this, buffer_size, sum_mark_range_bytes, &settings]()
+            [this, estimated_sum_mark_range_bytes, read_settings]()
             {
                 return disk->readFile(
                     path_prefix + data_file_extension,
-                    buffer_size,
-                    sum_mark_range_bytes,
-                    settings.min_bytes_to_use_direct_io,
-                    settings.min_bytes_to_use_mmap_io,
-                    settings.mmap_cache.get());
+                    read_settings,
+                    estimated_sum_mark_range_bytes);
             },
             uncompressed_cache);
 
@@ -108,12 +91,8 @@ MergeTreeReaderStream::MergeTreeReaderStream(
         auto buffer = std::make_unique<CompressedReadBufferFromFile>(
             disk->readFile(
                 path_prefix + data_file_extension,
-                buffer_size,
-                sum_mark_range_bytes,
-                settings.min_bytes_to_use_direct_io,
-                settings.min_bytes_to_use_mmap_io,
-                settings.mmap_cache.get())
-        );
+                read_settings,
+                estimated_sum_mark_range_bytes));
 
         if (profile_callback)
             buffer->setProfileCallback(profile_callback, clock_type);
@@ -127,6 +106,45 @@ MergeTreeReaderStream::MergeTreeReaderStream(
 }
 
 
+std::pair<size_t, size_t> MergeTreeReaderStream::getRightOffsetAndBytesRange(size_t left_mark, size_t right_mark)
+{
+    /// NOTE: if we are reading the whole file, then right_mark == marks_count
+    /// and we will use max_read_buffer_size for buffer size, thus avoiding the need to load marks.
+
+    /// If the end of range is inside the block, we will need to read it too.
+    size_t result_right_mark = right_mark;
+    if (right_mark < marks_count && marks_loader.getMark(right_mark).offset_in_decompressed_block > 0)
+    {
+        auto indices = collections::range(right_mark, marks_count);
+        auto it = std::upper_bound(indices.begin(), indices.end(), right_mark, [this](size_t i, size_t j)
+        {
+            return marks_loader.getMark(i).offset_in_compressed_file < marks_loader.getMark(j).offset_in_compressed_file;
+        });
+
+        result_right_mark = (it == indices.end() ? marks_count : *it);
+    }
+
+    size_t right_offset;
+    size_t mark_range_bytes;
+
+    /// If there are no marks after the end of range, just use file size
+    if (result_right_mark >= marks_count
+        || (result_right_mark + 1 == marks_count
+            && marks_loader.getMark(result_right_mark).offset_in_compressed_file == marks_loader.getMark(right_mark).offset_in_compressed_file))
+    {
+        right_offset = file_size;
+        mark_range_bytes = right_offset - (left_mark < marks_count ? marks_loader.getMark(left_mark).offset_in_compressed_file : 0);
+    }
+    else
+    {
+        right_offset = marks_loader.getMark(result_right_mark).offset_in_compressed_file;
+        mark_range_bytes = right_offset - marks_loader.getMark(left_mark).offset_in_compressed_file;
+    }
+
+    return std::make_pair(right_offset, mark_range_bytes);
+}
+
+
 void MergeTreeReaderStream::seekToMark(size_t index)
 {
     MarkInCompressedFile mark = marks_loader.getMark(index);
@@ -171,4 +189,25 @@ void MergeTreeReaderStream::seekToStart()
     }
 }
 
+
+void MergeTreeReaderStream::adjustForRange(MarkRange range)
+{
+    auto [right_offset, mark_range_bytes] = getRightOffsetAndBytesRange(range.begin, range.end);
+    if (!right_offset)
+    {
+        if (cached_buffer)
+            cached_buffer->setReadUntilEnd();
+        if (non_cached_buffer)
+            non_cached_buffer->setReadUntilEnd();
+    }
+    else if (right_offset > last_right_offset)
+    {
+        last_right_offset = right_offset;
+        if (cached_buffer)
+            cached_buffer->setReadUntilPosition(last_right_offset);
+        if (non_cached_buffer)
+            non_cached_buffer->setReadUntilPosition(last_right_offset);
+    }
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.h b/src/Storages/MergeTree/MergeTreeReaderStream.h
index 32b9c45ccab..601abdc5f1e 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.h
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.h
@@ -23,25 +23,36 @@ public:
         const MarkRanges & all_mark_ranges,
         const MergeTreeReaderSettings & settings_,
         MarkCache * mark_cache, UncompressedCache * uncompressed_cache,
-        size_t file_size, const MergeTreeIndexGranularityInfo * index_granularity_info_,
+        size_t file_size_, const MergeTreeIndexGranularityInfo * index_granularity_info_,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type);
 
     void seekToMark(size_t index);
 
     void seekToStart();
 
+    /**
+     * Does buffer need to know something about mark ranges bounds it is going to read?
+     * (In case of MergeTree* tables). Mostly needed for reading from remote fs.
+     */
+    void adjustForRange(MarkRange range);
+
     ReadBuffer * data_buffer;
 
 private:
+    std::pair<size_t, size_t> getRightOffsetAndBytesRange(size_t left_mark, size_t right_mark);
+
     DiskPtr disk;
     std::string path_prefix;
     std::string data_file_extension;
 
     size_t marks_count;
+    size_t file_size;
 
     MarkCache * mark_cache;
     bool save_marks_in_cache;
 
+    size_t last_right_offset = 0;
+
     const MergeTreeIndexGranularityInfo * index_granularity_info;
 
     std::unique_ptr<CachedCompressedReadBuffer> cached_buffer;
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index f2357a87535..50650ef66e5 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -46,6 +46,7 @@ MergeTreeReaderWide::MergeTreeReaderWide(
 {
     try
     {
+        disk = data_part->volume->getDisk();
         for (const NameAndTypePair & column : columns)
         {
             auto column_from_part = getColumnFromPart(column);
@@ -60,7 +61,8 @@ MergeTreeReaderWide::MergeTreeReaderWide(
 }
 
 
-size_t MergeTreeReaderWide::readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
+size_t MergeTreeReaderWide::readRows(
+    size_t from_mark, size_t current_task_last_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
 {
     size_t read_rows = 0;
     try
@@ -68,13 +70,33 @@ size_t MergeTreeReaderWide::readRows(size_t from_mark, bool continue_reading, si
         size_t num_columns = columns.size();
         checkNumberOfColumns(num_columns);
 
-        /// Pointers to offset columns that are common to the nested data structure columns.
-        /// If append is true, then the value will be equal to nullptr and will be used only to
-        /// check that the offsets column has been already read.
-        OffsetColumns offset_columns;
         std::unordered_map<String, ISerialization::SubstreamsCache> caches;
 
+        std::unordered_set<std::string> prefetched_streams;
+        if (disk->isRemote() ? settings.read_settings.remote_fs_prefetch : settings.read_settings.local_fs_prefetch)
+        {
+            /// Request reading of data in advance,
+            /// so if reading can be asynchronous, it will also be performed in parallel for all columns.
+            auto name_and_type = columns.begin();
+            for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
+            {
+                auto column_from_part = getColumnFromPart(*name_and_type);
+                try
+                {
+                    auto & cache = caches[column_from_part.getNameInStorage()];
+                    prefetch(column_from_part, from_mark, continue_reading, current_task_last_mark, cache, prefetched_streams);
+                }
+                catch (Exception & e)
+                {
+                    /// Better diagnostics.
+                    e.addMessage("(while reading column " + column_from_part.name + ")");
+                    throw;
+                }
+            }
+        }
+
         auto name_and_type = columns.begin();
+
         for (size_t pos = 0; pos < num_columns; ++pos, ++name_and_type)
         {
             auto column_from_part = getColumnFromPart(*name_and_type);
@@ -91,7 +113,9 @@ size_t MergeTreeReaderWide::readRows(size_t from_mark, bool continue_reading, si
                 size_t column_size_before_reading = column->size();
                 auto & cache = caches[column_from_part.getNameInStorage()];
 
-                readData(column_from_part, column, from_mark, continue_reading, max_rows_to_read, cache);
+                readData(
+                    column_from_part, column, from_mark, continue_reading, current_task_last_mark,
+                    max_rows_to_read, cache, /* was_prefetched =*/ !prefetched_streams.empty());
 
                 /// For elements of Nested, column_size_before_reading may be greater than column size
                 ///  if offsets are not empty and were already read, but elements are empty.
@@ -153,7 +177,7 @@ void MergeTreeReaderWide::addStreams(const NameAndTypePair & name_and_type,
             return;
 
         streams.emplace(stream_name, std::make_unique<MergeTreeReaderStream>(
-            data_part->volume->getDisk(), data_part->getFullRelativePath() + stream_name, DATA_FILE_EXTENSION,
+            disk, data_part->getFullRelativePath() + stream_name, DATA_FILE_EXTENSION,
             data_part->getMarksCount(), all_mark_ranges, settings, mark_cache,
             uncompressed_cache, data_part->getFileSizeOrZero(stream_name + DATA_FILE_EXTENSION),
             &data_part->index_granularity_info,
@@ -166,57 +190,97 @@ void MergeTreeReaderWide::addStreams(const NameAndTypePair & name_and_type,
 }
 
 
-void MergeTreeReaderWide::readData(
-    const NameAndTypePair & name_and_type, ColumnPtr & column,
-    size_t from_mark, bool continue_reading, size_t max_rows_to_read,
+static ReadBuffer * getStream(
+    bool seek_to_start,
+    const ISerialization::SubstreamPath & substream_path,
+    MergeTreeReaderWide::FileStreams & streams,
+    const NameAndTypePair & name_and_type,
+    size_t from_mark, bool seek_to_mark,
+    size_t current_task_last_mark,
     ISerialization::SubstreamsCache & cache)
 {
-    auto get_stream_getter = [&](bool stream_for_prefix) -> ISerialization::InputStreamGetter
+    /// If substream have already been read.
+    if (cache.count(ISerialization::getSubcolumnNameForStream(substream_path)))
+        return nullptr;
+
+    String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
+
+    auto it = streams.find(stream_name);
+    if (it == streams.end())
+        return nullptr;
+
+    MergeTreeReaderStream & stream = *it->second;
+    stream.adjustForRange(MarkRange(seek_to_start ? 0 : from_mark, current_task_last_mark));
+
+    if (seek_to_start)
+        stream.seekToStart();
+    else if (seek_to_mark)
+        stream.seekToMark(from_mark);
+
+    return stream.data_buffer;
+}
+
+
+void MergeTreeReaderWide::prefetch(
+    const NameAndTypePair & name_and_type,
+    size_t from_mark,
+    bool continue_reading,
+    size_t current_task_last_mark,
+    ISerialization::SubstreamsCache & cache,
+    std::unordered_set<std::string> & prefetched_streams)
+{
+    const auto & name = name_and_type.name;
+    auto & serialization = serializations[name];
+
+    serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
-        return [&, stream_for_prefix](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer * //-V1047
+        String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
+
+        if (!prefetched_streams.count(stream_name))
         {
-            /// If substream have already been read.
-            if (cache.count(ISerialization::getSubcolumnNameForStream(substream_path)))
-                return nullptr;
+            bool seek_to_mark = !continue_reading;
+            if (ReadBuffer * buf = getStream(false, substream_path, streams, name_and_type, from_mark, seek_to_mark, current_task_last_mark, cache))
+                buf->prefetch();
 
-            String stream_name = ISerialization::getFileNameForStream(name_and_type, substream_path);
+            prefetched_streams.insert(stream_name);
+        }
+    });
+}
 
-            auto it = streams.find(stream_name);
-            if (it == streams.end())
-                return nullptr;
-
-            MergeTreeReaderStream & stream = *it->second;
-
-            if (stream_for_prefix)
-            {
-                stream.seekToStart();
-                continue_reading = false;
-            }
-            else if (!continue_reading)
-                stream.seekToMark(from_mark);
-
-            return stream.data_buffer;
-        };
-    };
 
+void MergeTreeReaderWide::readData(
+    const NameAndTypePair & name_and_type, ColumnPtr & column,
+    size_t from_mark, bool continue_reading, size_t current_task_last_mark,
+    size_t max_rows_to_read, ISerialization::SubstreamsCache & cache, bool was_prefetched)
+{
     double & avg_value_size_hint = avg_value_size_hints[name_and_type.name];
     ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
     deserialize_settings.avg_value_size_hint = avg_value_size_hint;
 
     const auto & name = name_and_type.name;
-    auto serialization = serializations[name];
+    auto & serialization = serializations[name];
 
     if (deserialize_binary_bulk_state_map.count(name) == 0)
     {
-        deserialize_settings.getter = get_stream_getter(true);
+        deserialize_settings.getter = [&](const ISerialization::SubstreamPath & substream_path)
+        {
+            return getStream(/* seek_to_start = */true, substream_path, streams, name_and_type, from_mark, /* seek_to_mark = */false, current_task_last_mark, cache);
+        };
         serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, deserialize_binary_bulk_state_map[name]);
     }
 
-    deserialize_settings.getter = get_stream_getter(false);
+    deserialize_settings.getter = [&](const ISerialization::SubstreamPath & substream_path)
+    {
+        bool seek_to_mark = !was_prefetched && !continue_reading;
+
+        return getStream(
+            /* seek_to_start = */false, substream_path, streams, name_and_type, from_mark,
+            seek_to_mark, current_task_last_mark, cache);
+    };
     deserialize_settings.continuous_reading = continue_reading;
     auto & deserialize_state = deserialize_binary_bulk_state_map[name];
 
-    serializations[name]->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, deserialize_settings, deserialize_state, &cache);
+    serialization->deserializeBinaryBulkWithMultipleStreams(column, max_rows_to_read, deserialize_settings, deserialize_state, &cache);
     IDataType::updateAvgValueSizeHint(*column, avg_value_size_hint);
 }
 
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.h b/src/Storages/MergeTree/MergeTreeReaderWide.h
index 1afbca4bf41..e27dd85643b 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.h
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.h
@@ -28,24 +28,35 @@ public:
 
     /// Return the number of rows has been read or zero if there is no columns to read.
     /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
-    size_t readRows(size_t from_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
+    size_t readRows(size_t from_mark, size_t current_task_last_mark,
+                    bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
 
     bool canReadIncompleteGranules() const override { return true; }
 
-private:
     using FileStreams = std::map<std::string, std::unique_ptr<MergeTreeReaderStream>>;
     using Serializations = std::map<std::string, SerializationPtr>;
 
+private:
     FileStreams streams;
     Serializations serializations;
+    DiskPtr disk;
 
     void addStreams(const NameAndTypePair & name_and_type,
         const ReadBufferFromFileBase::ProfileCallback & profile_callback, clockid_t clock_type);
 
     void readData(
         const NameAndTypePair & name_and_type, ColumnPtr & column,
-        size_t from_mark, bool continue_reading, size_t max_rows_to_read,
-        ISerialization::SubstreamsCache & cache);
+        size_t from_mark, bool continue_reading, size_t current_task_last_mark, size_t max_rows_to_read,
+        ISerialization::SubstreamsCache & cache, bool was_prefetched);
+
+    /// Make next readData more simple by calling 'prefetch' of all related ReadBuffers (column streams).
+    void prefetch(
+        const NameAndTypePair & name_and_type,
+        size_t from_mark,
+        bool continue_reading,
+        size_t current_task_last_mark,
+        ISerialization::SubstreamsCache & cache,
+        std::unordered_set<std::string> & prefetched_streams); /// if stream was already prefetched do nothing
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
index 98077605f89..203ce7a57d2 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
@@ -19,7 +19,6 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
     bool use_uncompressed_cache_,
     const PrewhereInfoPtr & prewhere_info_,
     ExpressionActionsSettings actions_settings,
-    bool check_columns_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & virt_column_names_,
     size_t part_index_in_query_,
@@ -35,7 +34,6 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
     all_mark_ranges(std::move(mark_ranges_)),
     part_index_in_query(part_index_in_query_),
     has_limit_below_one_block(has_limit_below_one_block_),
-    check_columns(check_columns_),
     total_rows(data_part->index_granularity.getRowsCountInRanges(all_mark_ranges))
 {
     addTotalRowsApprox(total_rows);
@@ -46,7 +44,7 @@ void MergeTreeSelectProcessor::initializeReaders()
 {
     task_columns = getReadTaskColumns(
         storage, metadata_snapshot, data_part,
-        required_columns, prewhere_info, check_columns);
+        required_columns, prewhere_info);
 
     /// Will be used to distinguish between PREWHERE and WHERE columns when applying filter
     const auto & column_names = task_columns.columns.getNames();
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.h b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
index ea4cd349cba..f9b19f9f692 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
@@ -28,7 +28,6 @@ public:
         bool use_uncompressed_cache,
         const PrewhereInfoPtr & prewhere_info,
         ExpressionActionsSettings actions_settings,
-        bool check_columns_,
         const MergeTreeReaderSettings & reader_settings,
         const Names & virt_column_names = {},
         size_t part_index_in_query_ = 0,
@@ -66,7 +65,6 @@ protected:
     /// It reduces amount of read data for queries with small LIMIT.
     bool has_limit_below_one_block = false;
 
-    bool check_columns;
     size_t total_rows = 0;
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index c854ca4e305..df8d6a7c127 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -51,11 +51,13 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
         columns_for_reader = data_part->getColumns().addTypes(columns_to_read);
     }
 
+    ReadSettings read_settings;
+    if (read_with_direct_io)
+        read_settings.direct_io_threshold = 1;
+
     MergeTreeReaderSettings reader_settings =
     {
-        /// bytes to use direct IO (this is hack)
-        .min_bytes_to_use_direct_io = read_with_direct_io ? 1UL : std::numeric_limits<size_t>::max(),
-        .max_read_buffer_size = DBMS_DEFAULT_BUFFER_SIZE,
+        .read_settings = read_settings,
         .save_marks_in_cache = false
     };
 
@@ -76,7 +78,8 @@ try
 
         const auto & sample = reader->getColumns();
         Columns columns(sample.size());
-        size_t rows_read = reader->readRows(current_mark, continue_reading, rows_to_read, columns);
+        /// TODO: pass stream size instead of zero?
+        size_t rows_read = reader->readRows(current_mark, 0, continue_reading, rows_to_read, columns);
 
         if (rows_read)
         {
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index dfaaf4a942b..b120c230005 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -75,28 +75,30 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def)
 
 void MergeTreeSettings::sanityCheck(const Settings & query_settings) const
 {
-    if (number_of_free_entries_in_pool_to_execute_mutation > query_settings.background_pool_size)
+    if (number_of_free_entries_in_pool_to_execute_mutation >
+        query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "The value of 'number_of_free_entries_in_pool_to_execute_mutation' setting"
             " ({}) (default values are defined in <merge_tree> section of config.xml"
             " or the value can be specified per table in SETTINGS section of CREATE TABLE query)"
-            " is greater than the value of 'background_pool_size'"
+            " is greater than the value of 'background_pool_size'*'background_merges_mutations_concurrency_ratio'"
             " ({}) (the value is defined in users.xml for default profile)."
             " This indicates incorrect configuration because mutations cannot work with these settings.",
             number_of_free_entries_in_pool_to_execute_mutation,
-            query_settings.background_pool_size);
+            query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio);
     }
 
-    if (number_of_free_entries_in_pool_to_lower_max_size_of_merge > query_settings.background_pool_size)
+    if (number_of_free_entries_in_pool_to_lower_max_size_of_merge >
+        query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "The value of 'number_of_free_entries_in_pool_to_lower_max_size_of_merge' setting"
             " ({}) (default values are defined in <merge_tree> section of config.xml"
             " or the value can be specified per table in SETTINGS section of CREATE TABLE query)"
-            " is greater than the value of 'background_pool_size'"
+            " is greater than the value of 'background_pool_size'*'background_merges_mutations_concurrency_ratio'"
             " ({}) (the value is defined in users.xml for default profile)."
             " This indicates incorrect configuration because the maximum size of merge will be always lowered.",
             number_of_free_entries_in_pool_to_lower_max_size_of_merge,
-            query_settings.background_pool_size);
+            query_settings.background_pool_size * query_settings.background_merges_mutations_concurrency_ratio);
     }
 
     // The min_index_granularity_bytes value is 1024 b and index_granularity_bytes is 10 mb by default.
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index d018059c248..3401eb46e87 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -42,7 +42,7 @@ struct Settings;
     M(UInt64, max_replicated_mutations_in_queue, 8, "How many tasks of mutating parts are allowed simultaneously in ReplicatedMergeTree queue.", 0) \
     M(UInt64, max_replicated_merges_with_ttl_in_queue, 1, "How many tasks of merging parts with TTL are allowed simultaneously in ReplicatedMergeTree queue.", 0) \
     M(UInt64, number_of_free_entries_in_pool_to_lower_max_size_of_merge, 8, "When there is less than specified number of free entries in pool (or replicated queue), start to lower maximum size of merge to process (or to put in queue). This is to allow small merges to process - not filling the pool with long running merges.", 0) \
-    M(UInt64, number_of_free_entries_in_pool_to_execute_mutation, 10, "When there is less than specified number of free entries in pool, do not execute part mutations. This is to leave free threads for regular merges and avoid \"Too many parts\"", 0) \
+    M(UInt64, number_of_free_entries_in_pool_to_execute_mutation, 20, "When there is less than specified number of free entries in pool, do not execute part mutations. This is to leave free threads for regular merges and avoid \"Too many parts\"", 0) \
     M(UInt64, max_number_of_merges_with_ttl_in_pool, 2, "When there is more than specified number of merges with TTL entries in pool, do not assign new merge with TTL. This is to leave free threads for regular merges and avoid \"Too many parts\"", 0) \
     M(Seconds, old_parts_lifetime, 8 * 60, "How many seconds to keep obsolete parts.", 0) \
     M(Seconds, temporary_directories_lifetime, 86400, "How many seconds to keep tmp_-directories. You should not lower this value because merges and mutations may not be able to work with low value of this setting.", 0) \
@@ -77,22 +77,20 @@ struct Settings;
     M(Seconds, execute_merges_on_single_replica_time_threshold, 0, "When greater than zero only a single replica starts the merge immediately, others wait up to that amount of time to download the result instead of doing merges locally. If the chosen replica doesn't finish the merge during that amount of time, fallback to standard behavior happens.", 0) \
     M(Seconds, remote_fs_execute_merges_on_single_replica_time_threshold, 3 * 60 * 60, "When greater than zero only a single replica starts the merge immediatelys when merged part on shared storage and 'allow_remote_fs_zero_copy_replication' is enabled.", 0) \
     M(Seconds, try_fetch_recompressed_part_timeout, 7200, "Recompression works slow in most cases, so we don't start merge with recompression until this timeout and trying to fetch recompressed part from replica which assigned this merge with recompression.", 0) \
-    M(Bool, always_fetch_merged_part, 0, "If true, replica never merge parts and always download merged parts from other replicas.", 0) \
+    M(Bool, always_fetch_merged_part, false, "If true, replica never merge parts and always download merged parts from other replicas.", 0) \
     M(UInt64, max_suspicious_broken_parts, 10, "Max broken parts, if more - deny automatic deletion.", 0) \
+    M(UInt64, max_suspicious_broken_parts_bytes, 1ULL * 1024 * 1024 * 1024, "Max size of all broken parts, if more - deny automatic deletion.", 0) \
     M(UInt64, max_files_to_modify_in_alter_columns, 75, "Not apply ALTER if number of files for modification(deletion, addition) more than this.", 0) \
     M(UInt64, max_files_to_remove_in_alter_columns, 50, "Not apply ALTER, if number of files for deletion more than this.", 0) \
     M(Float, replicated_max_ratio_of_wrong_parts, 0.5, "If ratio of wrong parts to total number of parts is less than this - allow to start.", 0) \
-    M(UInt64, replicated_max_parallel_fetches, 0, "Limit parallel fetches.", 0) \
-    M(UInt64, replicated_max_parallel_fetches_for_table, 0, "Limit parallel fetches for one table.", 0) \
     M(UInt64, replicated_max_parallel_fetches_for_host, DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT, "Limit parallel fetches from endpoint (actually pool size).", 0) \
-    M(UInt64, replicated_max_parallel_sends, 0, "Limit parallel sends.", 0) \
-    M(UInt64, replicated_max_parallel_sends_for_table, 0, "Limit parallel sends for one table.", 0) \
     M(Seconds, replicated_fetches_http_connection_timeout, 0, "HTTP connection timeout for part fetch requests. Inherited from default profile `http_connection_timeout` if not set explicitly.", 0) \
     M(Seconds, replicated_fetches_http_send_timeout, 0, "HTTP send timeout for part fetch requests. Inherited from default profile `http_send_timeout` if not set explicitly.", 0) \
     M(Seconds, replicated_fetches_http_receive_timeout, 0, "HTTP receive timeout for fetch part requests. Inherited from default profile `http_receive_timeout` if not set explicitly.", 0) \
     M(Bool, replicated_can_become_leader, true, "If true, Replicated tables replicas on this node will try to acquire leadership.", 0) \
     M(Seconds, zookeeper_session_expiration_check_period, 60, "ZooKeeper session expiration check period, in seconds.", 0) \
-    M(Bool, detach_old_local_parts_when_cloning_replica, 1, "Do not remove old local parts when repairing lost replica.", 0) \
+    M(Bool, detach_old_local_parts_when_cloning_replica, true, "Do not remove old local parts when repairing lost replica.", 0) \
+    M(Bool, detach_not_byte_identical_parts, false, "Do not remove non byte-idential parts for ReplicatedMergeTree, instead detach them (maybe useful for further analysis).", 0) \
     M(UInt64, max_replicated_fetches_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for replicated fetches. Zero means unlimited.", 0) \
     M(UInt64, max_replicated_sends_network_bandwidth, 0, "The maximum speed of data exchange over the network in bytes per second for replicated sends. Zero means unlimited.", 0) \
     \
@@ -117,14 +115,14 @@ struct Settings;
     M(Int64, merge_with_ttl_timeout, 3600 * 4, "Minimal time in seconds, when merge with delete TTL can be repeated.", 0) \
     M(Int64, merge_with_recompression_ttl_timeout, 3600 * 4, "Minimal time in seconds, when merge with recompression TTL can be repeated.", 0) \
     M(Bool, ttl_only_drop_parts, false, "Only drop altogether the expired parts and not partially prune them.", 0) \
-    M(Bool, write_final_mark, 1, "Write final mark after end of column (0 - disabled, do nothing if index_granularity_bytes=0)", 0) \
-    M(Bool, enable_mixed_granularity_parts, 1, "Enable parts with adaptive and non adaptive granularity", 0) \
+    M(Bool, materialize_ttl_recalculate_only, false, "Only recalculate ttl info when MATERIALIZE TTL", 0) \
+    M(Bool, enable_mixed_granularity_parts, true, "Enable parts with adaptive and non adaptive granularity", 0) \
     M(MaxThreads, max_part_loading_threads, 0, "The number of threads to load data parts at startup.", 0) \
     M(MaxThreads, max_part_removal_threads, 0, "The number of threads for concurrent removal of inactive data parts. One is usually enough, but in 'Google Compute Environment SSD Persistent Disks' file removal (unlink) operation is extraordinarily slow and you probably have to increase this number (recommended is up to 16).", 0) \
     M(UInt64, concurrent_part_removal_threshold, 100, "Activate concurrent part removal (see 'max_part_removal_threads') only if the number of inactive data parts is at least this.", 0) \
     M(String, storage_policy, "default", "Name of storage disk policy", 0) \
     M(Bool, allow_nullable_key, false, "Allow Nullable types as primary keys.", 0) \
-    M(Bool, allow_remote_fs_zero_copy_replication, false, "Allow Zero-copy replication over remote fs", 0) \
+    M(Bool, allow_remote_fs_zero_copy_replication, true, "Allow Zero-copy replication over remote fs", 0) \
     M(Bool, remove_empty_parts, true, "Remove empty parts after they were pruned by TTL, mutation, or collapsing merge algorithm", 0) \
     M(Bool, assign_part_uuids, false, "Generate UUIDs for parts. Before enabling check that all replicas support new format.", 0) \
     M(Int64, max_partitions_to_read, -1, "Limit the max number of partitions that can be accessed in one query. <= 0 means unlimited. This setting is the default that can be overridden by the query-level setting with the same name.", 0) \
@@ -141,6 +139,11 @@ struct Settings;
     M(UInt64, min_relative_delay_to_yield_leadership, 120, "Obsolete setting, does nothing.", 0) \
     M(UInt64, check_delay_period, 60, "Obsolete setting, does nothing.", 0) \
     M(Bool, allow_floating_point_partition_key, false, "Allow floating point as partition key", 0) \
+    M(UInt64, replicated_max_parallel_sends, 0, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, replicated_max_parallel_sends_for_table, 0, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, replicated_max_parallel_fetches, 0, "Obsolete setting, does nothing.", 0) \
+    M(UInt64, replicated_max_parallel_fetches_for_table, 0, "Obsolete setting, does nothing.", 0) \
+    M(Bool, write_final_mark, true, "Obsolete setting, does nothing.", 0)
     /// Settings that should not change after the creation of a table.
 #define APPLY_FOR_IMMUTABLE_MERGE_TREE_SETTINGS(M) \
     M(index_granularity)
@@ -161,7 +164,7 @@ struct MergeTreeSettings : public BaseSettings<MergeTreeSettingsTraits>
     /// We check settings after storage creation
     static bool isReadonlySetting(const String & name)
     {
-        return name == "index_granularity" || name == "index_granularity_bytes" || name == "write_final_mark"
+        return name == "index_granularity" || name == "index_granularity_bytes"
             || name == "enable_mixed_granularity_parts";
     }
 
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 73c753386a4..5e97f80d849 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -17,7 +17,7 @@ void MergeTreeSink::onStart()
 
 void MergeTreeSink::consume(Chunk chunk)
 {
-    auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+    auto block = getHeader().cloneWithColumns(chunk.detachColumns());
 
     auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot, context);
     for (auto & current_block : part_blocks)
@@ -37,7 +37,7 @@ void MergeTreeSink::consume(Chunk chunk)
             PartLog::addNewPart(storage.getContext(), part, watch.elapsed());
 
             /// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
-            storage.background_executor.triggerTask();
+            storage.background_operations_assignee.trigger();
         }
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp
index 4eb6bc4b2e2..6a8ef860c87 100644
--- a/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeThreadSelectProcessor.cpp
@@ -68,18 +68,16 @@ bool MergeTreeThreadSelectProcessor::getNewTask()
 
     if (!reader)
     {
-        auto rest_mark_ranges = pool->getRestMarks(*task->data_part, task->mark_ranges[0]);
-
         if (use_uncompressed_cache)
             owned_uncompressed_cache = storage.getContext()->getUncompressedCache();
         owned_mark_cache = storage.getContext()->getMarkCache();
 
-        reader = task->data_part->getReader(task->columns, metadata_snapshot, rest_mark_ranges,
+        reader = task->data_part->getReader(task->columns, metadata_snapshot, task->mark_ranges,
             owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings,
             IMergeTreeReader::ValueSizeMap{}, profile_callback);
 
         if (prewhere_info)
-            pre_reader = task->data_part->getReader(task->pre_columns, metadata_snapshot, rest_mark_ranges,
+            pre_reader = task->data_part->getReader(task->pre_columns, metadata_snapshot, task->mark_ranges,
                 owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings,
                 IMergeTreeReader::ValueSizeMap{}, profile_callback);
     }
@@ -88,14 +86,13 @@ bool MergeTreeThreadSelectProcessor::getNewTask()
         /// in other case we can reuse readers, anyway they will be "seeked" to required mark
         if (part_name != last_readed_part_name)
         {
-            auto rest_mark_ranges = pool->getRestMarks(*task->data_part, task->mark_ranges[0]);
             /// retain avg_value_size_hints
-            reader = task->data_part->getReader(task->columns, metadata_snapshot, rest_mark_ranges,
+            reader = task->data_part->getReader(task->columns, metadata_snapshot, task->mark_ranges,
                 owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings,
                 reader->getAvgValueSizeHints(), profile_callback);
 
             if (prewhere_info)
-                pre_reader = task->data_part->getReader(task->pre_columns, metadata_snapshot, rest_mark_ranges,
+                pre_reader = task->data_part->getReader(task->pre_columns, metadata_snapshot, task->mark_ranges,
                 owned_uncompressed_cache.get(), owned_mark_cache.get(), reader_settings,
                 reader->getAvgValueSizeHints(), profile_callback);
         }
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index 2da20073427..a32eecd4a49 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -12,7 +12,7 @@
 #include <Interpreters/misc.h>
 #include <Common/typeid_cast.h>
 #include <DataTypes/NestedUtils.h>
-#include <common/map.h>
+#include <base/map.h>
 
 
 namespace DB
@@ -47,8 +47,12 @@ MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
     if (!primary_key.column_names.empty())
         first_primary_key_column = primary_key.column_names[0];
 
-    for (const auto & [_, size] : column_sizes)
-        total_size_of_queried_columns += size;
+    for (const auto & name : queried_columns)
+    {
+        auto it = column_sizes.find(name);
+        if (it != column_sizes.end())
+            total_size_of_queried_columns += it->second;
+    }
 
     determineArrayJoinedNames(query_info.query->as<ASTSelectQuery &>());
     optimize(query_info.query->as<ASTSelectQuery &>());
@@ -115,14 +119,68 @@ static bool isConditionGood(const ASTPtr & condition)
     return false;
 }
 
+static const ASTFunction * getAsTuple(const ASTPtr & node)
+{
+    if (const auto * func = node->as<ASTFunction>(); func && func->name == "tuple")
+        return func;
+    return {};
+};
+
+static bool getAsTupleLiteral(const ASTPtr & node, Tuple & tuple)
+{
+    if (const auto * value_tuple = node->as<ASTLiteral>())
+        return value_tuple && value_tuple->value.tryGet<Tuple>(tuple);
+    return false;
+};
+
+bool MergeTreeWhereOptimizer::tryAnalyzeTuple(Conditions & res, const ASTFunction * func, bool is_final) const
+{
+    if (!func || func->name != "equals" || func->arguments->children.size() != 2)
+        return false;
+
+    Tuple tuple_lit;
+    const ASTFunction * tuple_other = nullptr;
+    if (getAsTupleLiteral(func->arguments->children[0], tuple_lit))
+        tuple_other = getAsTuple(func->arguments->children[1]);
+    else if (getAsTupleLiteral(func->arguments->children[1], tuple_lit))
+        tuple_other = getAsTuple(func->arguments->children[0]);
+
+    if (!tuple_other || tuple_lit.size() != tuple_other->arguments->children.size())
+        return false;
+
+    for (size_t i = 0; i < tuple_lit.size(); ++i)
+    {
+        const auto & child = tuple_other->arguments->children[i];
+        std::shared_ptr<IAST> fetch_sign_column = nullptr;
+        /// tuple in tuple like (a, (b, c)) = (1, (2, 3))
+        if (const auto * child_func = getAsTuple(child))
+            fetch_sign_column = std::make_shared<ASTFunction>(*child_func);
+        else if (const auto * child_ident = child->as<ASTIdentifier>())
+            fetch_sign_column = std::make_shared<ASTIdentifier>(child_ident->name());
+        else
+            return false;
+
+        ASTPtr fetch_sign_value = std::make_shared<ASTLiteral>(tuple_lit.at(i));
+        ASTPtr func_node = makeASTFunction("equals", fetch_sign_column, fetch_sign_value);
+        analyzeImpl(res, func_node, is_final);
+    }
+
+    return true;
+}
 
 void MergeTreeWhereOptimizer::analyzeImpl(Conditions & res, const ASTPtr & node, bool is_final) const
 {
-    if (const auto * func_and = node->as<ASTFunction>(); func_and && func_and->name == "and")
+    const auto * func = node->as<ASTFunction>();
+
+    if (func && func->name == "and")
     {
-        for (const auto & elem : func_and->arguments->children)
+        for (const auto & elem : func->arguments->children)
             analyzeImpl(res, elem, is_final);
     }
+    else if (tryAnalyzeTuple(res, func, is_final))
+    {
+        /// analyzed
+    }
     else
     {
         Condition cond;
@@ -369,7 +427,7 @@ bool MergeTreeWhereOptimizer::cannotBeMoved(const ASTPtr & ptr, bool is_final) c
 
 void MergeTreeWhereOptimizer::determineArrayJoinedNames(ASTSelectQuery & select)
 {
-    auto array_join_expression_list = select.arrayJoinExpressionList();
+    auto [array_join_expression_list, _] = select.arrayJoinExpressionList();
 
     /// much simplified code from ExpressionAnalyzer::getArrayJoinedColumns()
     if (!array_join_expression_list)
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index 0559fdee2ae..4aa7aa532a8 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -70,6 +70,7 @@ private:
 
     using Conditions = std::list<Condition>;
 
+    bool tryAnalyzeTuple(Conditions & res, const ASTFunction * func, bool is_final) const;
     void analyzeImpl(Conditions & res, const ASTPtr & node, bool is_final) const;
 
     /// Transform conjunctions chain in WHERE expression to Conditions list.
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
index 1fcd28b70e3..9323249946a 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
@@ -1,6 +1,7 @@
 #include <Storages/MergeTree/MergeTreeWriteAheadLog.h>
 #include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <IO/MemoryReadWriteBuffer.h>
 #include <IO/ReadHelpers.h>
@@ -31,6 +32,7 @@ MergeTreeWriteAheadLog::MergeTreeWriteAheadLog(
     , name(name_)
     , path(storage.getRelativeDataPath() + name_)
     , pool(storage.getContext()->getSchedulePool())
+    , log(&Poco::Logger::get(storage.getLogName() + " (WriteAheadLog)"))
 {
     init();
     sync_task = pool.createTask("MergeTreeWriteAheadLog::sync", [this]
@@ -55,7 +57,7 @@ void MergeTreeWriteAheadLog::init()
 
     /// Small hack: in NativeBlockOutputStream header is used only in `getHeader` method.
     /// To avoid complex logic of changing it during ALTERs we leave it empty.
-    block_out = std::make_unique<NativeBlockOutputStream>(*out, 0, Block{});
+    block_out = std::make_unique<NativeWriter>(*out, 0, Block{});
     min_block_number = std::numeric_limits<Int64>::max();
     max_block_number = -1;
     bytes_at_last_sync = 0;
@@ -116,8 +118,8 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
     std::unique_lock lock(write_mutex);
 
     MergeTreeData::MutableDataPartsVector parts;
-    auto in = disk->readFile(path, DBMS_DEFAULT_BUFFER_SIZE);
-    NativeBlockInputStream block_in(*in, 0);
+    auto in = disk->readFile(path, {});
+    NativeReader block_in(*in, 0);
     NameSet dropped_parts;
 
     while (!in->eof())
@@ -172,8 +174,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
                 || e.code() == ErrorCodes::BAD_DATA_PART_NAME
                 || e.code() == ErrorCodes::CORRUPTED_DATA)
             {
-                LOG_WARNING(&Poco::Logger::get(storage.getLogName() + " (WriteAheadLog)"),
-                    "WAL file '{}' is broken. {}", path, e.displayText());
+                LOG_WARNING(log, "WAL file '{}' is broken. {}", path, e.displayText());
 
                 /// If file is broken, do not write new parts to it.
                 /// But if it contains any part rotate and save them.
@@ -196,13 +197,21 @@ MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(const Stor
                 {},
                 CompressionCodecFactory::instance().get("NONE", {}));
 
-            part->minmax_idx.update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+            part->minmax_idx->update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
             part->partition.create(metadata_snapshot, block, 0, context);
             if (metadata_snapshot->hasSortingKey())
                 metadata_snapshot->getSortingKey().expression->execute(block);
 
-            part_out.writePrefix();
             part_out.write(block);
+
+            for (const auto & projection : metadata_snapshot->getProjections())
+            {
+                auto projection_block = projection.calculate(block, context);
+                if (projection_block.rows())
+                    part->addProjectionPart(
+                        projection.name,
+                        MergeTreeDataWriter::writeInMemoryProjectionPart(storage, log, projection_block, projection, part.get()));
+            }
             part_out.writeSuffixAndFinalizePart(part);
 
             min_block_number = std::min(min_block_number, part->info.min_block);
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
index e01911aa8b8..4fec5ce46bc 100644
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
+++ b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Disks/IDisk.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
@@ -78,7 +78,7 @@ private:
     String path;
 
     std::unique_ptr<WriteBuffer> out;
-    std::unique_ptr<NativeBlockOutputStream> block_out;
+    std::unique_ptr<NativeWriter> block_out;
 
     Int64 min_block_number = std::numeric_limits<Int64>::max();
     Int64 max_block_number = -1;
@@ -91,6 +91,8 @@ private:
     bool sync_scheduled = false;
 
     mutable std::mutex write_mutex;
+
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeType.h b/src/Storages/MergeTree/MergeType.h
index f7e99f98c8c..53d55dc68a7 100644
--- a/src/Storages/MergeTree/MergeType.h
+++ b/src/Storages/MergeTree/MergeType.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
 
 /// Type of Merge. Used to control amount of different merges during merges
 /// assignment. Also allows to apply special logic during merge process
-/// (mergePartsToTemporaryPart). Stored in FutureMergedMutatedPart and
+/// Stored in FutureMergedMutatedPart and
 /// ReplicatedMergeTreeLogEntry.
 ///
 /// Order is important, don't try to change it.
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 6de01caa833..43146709686 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -8,7 +8,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NOT_IMPLEMENTED;
     extern const int LOGICAL_ERROR;
 }
 
@@ -51,11 +50,6 @@ void MergedBlockOutputStream::writeWithPermutation(const Block & block, const IC
     writeImpl(block, permutation);
 }
 
-void MergedBlockOutputStream::writeSuffix()
-{
-    throw Exception("Method writeSuffix is not supported by MergedBlockOutputStream", ErrorCodes::NOT_IMPLEMENTED);
-}
-
 void MergedBlockOutputStream::writeSuffixAndFinalizePart(
         MergeTreeData::MutableDataPartPtr & new_part,
         bool sync,
@@ -93,7 +87,8 @@ void MergedBlockOutputStream::writeSuffixAndFinalizePart(
     new_part->checksums = checksums;
     new_part->setBytesOnDisk(checksums.getTotalSizeOnDisk());
     new_part->index_granularity = writer->getIndexGranularity();
-    new_part->calculateColumnsSizesOnDisk();
+    new_part->calculateColumnsAndSecondaryIndicesSizesOnDisk();
+
     if (default_codec != nullptr)
         new_part->default_codec = default_codec;
     new_part->storage.lockSharedData(*new_part);
@@ -135,8 +130,8 @@ void MergedBlockOutputStream::finalizePartOnDisk(
         if (storage.format_version >= MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING || isCompactPart(new_part))
         {
             new_part->partition.store(storage, volume->getDisk(), part_path, checksums);
-            if (new_part->minmax_idx.initialized)
-                new_part->minmax_idx.store(storage, volume->getDisk(), part_path, checksums);
+            if (new_part->minmax_idx->initialized)
+                new_part->minmax_idx->store(storage, volume->getDisk(), part_path, checksums);
             else if (rows_count)
                 throw Exception("MinMax index was not initialized for new non-empty part " + new_part->name
                         + ". It is a bug.", ErrorCodes::LOGICAL_ERROR);
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.h b/src/Storages/MergeTree/MergedBlockOutputStream.h
index d04df598218..5965331ee81 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.h
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.h
@@ -21,7 +21,7 @@ public:
         CompressionCodecPtr default_codec_,
         bool blocks_are_granules_size = false);
 
-    Block getHeader() const override { return metadata_snapshot->getSampleBlock(); }
+    Block getHeader() const { return metadata_snapshot->getSampleBlock(); }
 
     /// If the data is pre-sorted.
     void write(const Block & block) override;
@@ -31,9 +31,8 @@ public:
       */
     void writeWithPermutation(const Block & block, const IColumn::Permutation * permutation);
 
-    void writeSuffix() override;
-
-    /// Finilize writing part and fill inner structures
+    /// Finalize writing part and fill inner structures
+    /// If part is new and contains projections, they should be added before invoking this method.
     void writeSuffixAndFinalizePart(
             MergeTreeData::MutableDataPartPtr & new_part,
             bool sync = false,
@@ -52,11 +51,12 @@ private:
             MergeTreeData::DataPart::Checksums & checksums,
             bool sync);
 
-private:
     NamesAndTypesList columns_list;
     IMergeTreeDataPart::MinMaxIndex minmax_idx;
     size_t rows_count = 0;
     CompressionCodecPtr default_codec;
 };
 
+using MergedBlockOutputStreamPtr = std::shared_ptr<MergedBlockOutputStream>;
+
 }
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
index 3638212b320..4b760103750 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.cpp
@@ -53,11 +53,6 @@ void MergedColumnOnlyOutputStream::write(const Block & block)
     writer->write(block, nullptr);
 }
 
-void MergedColumnOnlyOutputStream::writeSuffix()
-{
-    throw Exception("Method writeSuffix is not supported by MergedColumnOnlyOutputStream", ErrorCodes::NOT_IMPLEMENTED);
-}
-
 MergeTreeData::DataPart::Checksums
 MergedColumnOnlyOutputStream::writeSuffixAndGetChecksums(
     MergeTreeData::MutableDataPartPtr & new_part,
diff --git a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h
index 393058dc82e..4b75bc52f72 100644
--- a/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h
+++ b/src/Storages/MergeTree/MergedColumnOnlyOutputStream.h
@@ -23,9 +23,8 @@ public:
         const MergeTreeIndexGranularity & index_granularity = {},
         const MergeTreeIndexGranularityInfo * index_granularity_info_ = nullptr);
 
-    Block getHeader() const override { return header; }
+    Block getHeader() const { return header; }
     void write(const Block & block) override;
-    void writeSuffix() override;
     MergeTreeData::DataPart::Checksums
     writeSuffixAndGetChecksums(MergeTreeData::MutableDataPartPtr & new_part, MergeTreeData::DataPart::Checksums & all_checksums, bool sync = false);
 
@@ -33,5 +32,7 @@ private:
     Block header;
 };
 
+using MergedColumnOnlyOutputStreamPtr = std::shared_ptr<MergedColumnOnlyOutputStream>;
+
 
 }
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
new file mode 100644
index 00000000000..713f6a68612
--- /dev/null
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -0,0 +1,152 @@
+#include <Storages/MergeTree/MutateFromLogEntryTask.h>
+
+#include <base/logger_useful.h>
+#include <Common/ProfileEvents.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+
+namespace ProfileEvents
+{
+    extern const Event DataAfterMutationDiffersFromReplica;
+    extern const Event ReplicatedPartMutations;
+}
+
+namespace DB
+{
+
+std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> MutateFromLogEntryTask::prepare()
+{
+    const String & source_part_name = entry.source_parts.at(0);
+    const auto storage_settings_ptr = storage.getSettings();
+    LOG_TRACE(log, "Executing log entry to mutate part {} to {}", source_part_name, entry.new_part_name);
+
+    MergeTreeData::DataPartPtr source_part = storage.getActiveContainingPart(source_part_name);
+    if (!source_part)
+    {
+        LOG_DEBUG(log, "Source part {} for {} is not ready; will try to fetch it instead", source_part_name, entry.new_part_name);
+        return {false, {}};
+    }
+
+    if (source_part->name != source_part_name)
+    {
+        LOG_WARNING(log, "Part " + source_part_name + " is covered by " + source_part->name
+                    + " but should be mutated to " + entry.new_part_name + ". "
+                    + "Possibly the mutation of this part is not needed and will be skipped. This shouldn't happen often.");
+        return {false, {}};
+    }
+
+    /// TODO - some better heuristic?
+    size_t estimated_space_for_result = MergeTreeDataMergerMutator::estimateNeededDiskSpace({source_part});
+
+    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr)
+        && estimated_space_for_result >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
+    {
+        /// If entry is old enough, and have enough size, and some replica has the desired part,
+        /// then prefer fetching from replica.
+        String replica = storage.findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
+        if (!replica.empty())
+        {
+            LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
+            return {false, {}};
+        }
+    }
+
+    new_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version);
+    commands = MutationCommands::create(storage.queue.getMutationCommands(source_part, new_part_info.mutation));
+
+    /// Once we mutate part, we must reserve space on the same disk, because mutations can possibly create hardlinks.
+    /// Can throw an exception.
+    reserved_space = storage.reserveSpace(estimated_space_for_result, source_part->volume);
+
+    table_lock_holder = storage.lockForShare(
+            RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
+    StorageMetadataPtr metadata_snapshot = storage.getInMemoryMetadataPtr();
+
+    transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage);
+
+    future_mutated_part = std::make_shared<FutureMergedMutatedPart>();
+    future_mutated_part->name = entry.new_part_name;
+    future_mutated_part->uuid = entry.new_part_uuid;
+    future_mutated_part->parts.push_back(source_part);
+    future_mutated_part->part_info = new_part_info;
+    future_mutated_part->updatePath(storage, reserved_space.get());
+    future_mutated_part->type = source_part->getType();
+
+    const Settings & settings = storage.getContext()->getSettingsRef();
+    merge_mutate_entry = storage.getContext()->getMergeList().insert(
+        storage.getStorageID(),
+        future_mutated_part,
+        settings.memory_profiler_step,
+        settings.memory_profiler_sample_probability,
+        settings.max_untracked_memory);
+
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+
+    fake_query_context = Context::createCopy(storage.getContext());
+    fake_query_context->makeQueryContext();
+    fake_query_context->setCurrentQueryId("");
+
+    mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
+            future_mutated_part, metadata_snapshot, commands, merge_mutate_entry.get(),
+            entry.create_time, fake_query_context, reserved_space, table_lock_holder);
+
+    /// Adjust priority
+    for (auto & item : future_mutated_part->parts)
+        priority += item->getBytesOnDisk();
+
+    return {true, [this] (const ExecutionStatus & execution_status)
+    {
+        storage.writePartLog(
+            PartLogElement::MUTATE_PART, execution_status, stopwatch_ptr->elapsed(),
+            entry.new_part_name, new_part, future_mutated_part->parts, merge_mutate_entry.get());
+    }};
+}
+
+
+bool MutateFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log)
+{
+    new_part = mutate_task->getFuture().get();
+
+    storage.renameTempPartAndReplace(new_part, nullptr, transaction_ptr.get());
+
+    try
+    {
+        storage.checkPartChecksumsAndCommit(*transaction_ptr, new_part);
+    }
+    catch (const Exception & e)
+    {
+        if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
+        {
+            transaction_ptr->rollback();
+
+            ProfileEvents::increment(ProfileEvents::DataAfterMutationDiffersFromReplica);
+
+            LOG_ERROR(log, "{}. Data after mutation is not byte-identical to data on another replicas. We will download merged part from replica to force byte-identical result.", getCurrentExceptionMessage(false));
+
+            write_part_log(ExecutionStatus::fromCurrentException());
+
+            if (storage.getSettings()->detach_not_byte_identical_parts)
+                storage.forgetPartAndMoveToDetached(std::move(new_part), "mutate-not-byte-identical");
+            else
+                storage.tryRemovePartImmediately(std::move(new_part));
+
+            /// No need to delete the part from ZK because we can be sure that the commit transaction
+            /// didn't go through.
+
+            return false;
+        }
+
+        throw;
+    }
+
+    /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
+         * This is not a problem, because in this case the entry will remain in the queue, and we will try again.
+         */
+    storage.merge_selecting_task->schedule();
+    ProfileEvents::increment(ProfileEvents::ReplicatedPartMutations);
+    write_part_log({});
+
+    return true;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.h b/src/Storages/MergeTree/MutateFromLogEntryTask.h
new file mode 100644
index 00000000000..5709e7b808a
--- /dev/null
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <base/shared_ptr_helper.h>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MutateTask.h>
+#include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+
+namespace DB
+{
+
+class MutateFromLogEntryTask : public shared_ptr_helper<MutateFromLogEntryTask>, public ReplicatedMergeMutateTaskBase
+{
+public:
+    template <typename Callback>
+    MutateFromLogEntryTask(
+        ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry_,
+        StorageReplicatedMergeTree & storage_,
+        Callback && task_result_callback_)
+        : ReplicatedMergeMutateTaskBase(&Poco::Logger::get("MutateFromLogEntryTask"), storage_, selected_entry_, task_result_callback_) {}
+
+    UInt64 getPriority() override { return priority; }
+
+private:
+    std::pair<bool, ReplicatedMergeMutateTaskBase::PartLogWriter> prepare() override;
+    bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) override;
+
+    bool executeInnerTask() override
+    {
+        return mutate_task->execute();
+    }
+
+    UInt64 priority{0};
+
+    TableLockHolder table_lock_holder{nullptr};
+    ReservationSharedPtr reserved_space{nullptr};
+
+    MergeTreePartInfo new_part_info;
+    MutationCommandsConstPtr commands;
+
+    MergeTreeData::TransactionUniquePtr transaction_ptr{nullptr};
+    StopwatchUniquePtr stopwatch_ptr{nullptr};
+
+    MergeTreeData::MutableDataPartPtr new_part{nullptr};
+    FutureMergedMutatedPartPtr future_mutated_part{nullptr};
+
+    ContextMutablePtr fake_query_context;
+    MutateTaskPtr mutate_task;
+};
+
+
+}
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
new file mode 100644
index 00000000000..6b602484ff3
--- /dev/null
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
@@ -0,0 +1,118 @@
+#include <Storages/MergeTree/MutatePlainMergeTreeTask.h>
+
+#include <Storages/StorageMergeTree.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+
+StorageID MutatePlainMergeTreeTask::getStorageID()
+{
+    return storage.getStorageID();
+}
+
+void MutatePlainMergeTreeTask::onCompleted()
+{
+    bool delay = state == State::SUCCESS;
+    task_result_callback(delay);
+}
+
+
+void MutatePlainMergeTreeTask::prepare()
+{
+    future_part = merge_mutate_entry->future_part;
+
+    const Settings & settings = storage.getContext()->getSettingsRef();
+    merge_list_entry = storage.getContext()->getMergeList().insert(
+        storage.getStorageID(),
+        future_part,
+        settings.memory_profiler_step,
+        settings.memory_profiler_sample_probability,
+        settings.max_untracked_memory);
+
+    stopwatch = std::make_unique<Stopwatch>();
+
+    write_part_log = [this] (const ExecutionStatus & execution_status)
+    {
+        mutate_task.reset();
+        storage.writePartLog(
+            PartLogElement::MUTATE_PART,
+            execution_status,
+            stopwatch->elapsed(),
+            future_part->name,
+            new_part,
+            future_part->parts,
+            merge_list_entry.get());
+    };
+
+    fake_query_context = Context::createCopy(storage.getContext());
+    fake_query_context->makeQueryContext();
+    fake_query_context->setCurrentQueryId("");
+
+    mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
+            future_part, metadata_snapshot, merge_mutate_entry->commands, merge_list_entry.get(),
+            time(nullptr), fake_query_context, merge_mutate_entry->tagger->reserved_space, table_lock_holder);
+}
+
+bool MutatePlainMergeTreeTask::executeStep()
+{
+
+    /// Make out memory tracker a parent of current thread memory tracker
+    MemoryTrackerThreadSwitcherPtr switcher;
+    if (merge_list_entry)
+        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(*merge_list_entry);
+
+    switch (state)
+    {
+        case State::NEED_PREPARE :
+        {
+            prepare();
+            state = State::NEED_EXECUTE;
+            return true;
+        }
+        case State::NEED_EXECUTE :
+        {
+            try
+            {
+                if (mutate_task->execute())
+                    return true;
+
+                new_part = mutate_task->getFuture().get();
+
+                storage.renameTempPartAndReplace(new_part);
+                storage.updateMutationEntriesErrors(future_part, true, "");
+                write_part_log({});
+
+                state = State::NEED_FINISH;
+                return true;
+            }
+            catch (...)
+            {
+                storage.updateMutationEntriesErrors(future_part, false, getCurrentExceptionMessage(false));
+                write_part_log(ExecutionStatus::fromCurrentException());
+                return false;
+            }
+        }
+        case State::NEED_FINISH :
+        {
+            // Nothing to do
+            state = State::SUCCESS;
+            return false;
+        }
+        case State::SUCCESS:
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Task with state SUCCESS mustn't be executed again");
+        }
+    }
+
+    return false;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.h b/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
new file mode 100644
index 00000000000..fb3c8318418
--- /dev/null
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <functional>
+
+#include <Core/Names.h>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MutateTask.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/MergeTree/MergeMutateSelectedEntry.h>
+
+namespace DB
+{
+
+struct StorageInMemoryMetadata;
+using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
+struct FutureMergedMutatedPart;
+using FutureMergedMutatedPartPtr = std::shared_ptr<FutureMergedMutatedPart>;
+
+class StorageMergeTree;
+
+class MutatePlainMergeTreeTask : public IExecutableTask
+{
+public:
+    template <class Callback>
+    MutatePlainMergeTreeTask(
+        StorageMergeTree & storage_,
+        StorageMetadataPtr metadata_snapshot_,
+        MergeMutateSelectedEntryPtr merge_mutate_entry_,
+        TableLockHolder table_lock_holder_,
+        Callback && task_result_callback_)
+        : storage(storage_)
+        , metadata_snapshot(std::move(metadata_snapshot_))
+        , merge_mutate_entry(std::move(merge_mutate_entry_))
+        , table_lock_holder(std::move(table_lock_holder_))
+        , task_result_callback(std::forward<Callback>(task_result_callback_))
+    {
+        for (auto & part : merge_mutate_entry->future_part->parts)
+            priority += part->getBytesOnDisk();
+    }
+
+    bool executeStep() override;
+    void onCompleted() override;
+    StorageID getStorageID() override;
+    UInt64 getPriority() override { return priority; }
+
+private:
+
+    void prepare();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINISH,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+    StorageMergeTree & storage;
+    StorageMetadataPtr metadata_snapshot;
+    MergeMutateSelectedEntryPtr merge_mutate_entry{nullptr};
+    TableLockHolder table_lock_holder;
+    FutureMergedMutatedPartPtr future_part{nullptr};
+    std::unique_ptr<Stopwatch> stopwatch;
+    MergeTreeData::MutableDataPartPtr new_part;
+
+    UInt64 priority{0};
+
+    using MergeListEntryPtr = std::unique_ptr<MergeListEntry>;
+    MergeListEntryPtr merge_list_entry;
+
+    std::function<void(const ExecutionStatus & execution_status)> write_part_log;
+
+    IExecutableTask::TaskResultCallback task_result_callback;
+
+    ContextMutablePtr fake_query_context;
+    MutateTaskPtr mutate_task;
+};
+
+
+}
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
new file mode 100644
index 00000000000..36ce3f25744
--- /dev/null
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -0,0 +1,1367 @@
+#include <Storages/MergeTree/MutateTask.h>
+
+#include <base/logger_useful.h>
+#include <Common/escapeForFileName.h>
+#include <Parsers/queryToString.h>
+#include <Interpreters/SquashingTransform.h>
+#include <Processors/Transforms/TTLTransform.h>
+#include <Processors/Transforms/TTLCalcTransform.h>
+#include <Processors/Transforms/DistinctSortedTransform.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/MaterializingTransform.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MutationCommands.h>
+#include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
+
+namespace CurrentMetrics
+{
+    extern const Metric PartMutation;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ABORTED;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace MutationHelpers
+{
+
+static bool checkOperationIsNotCanceled(ActionBlocker & merges_blocker, MergeListEntry * mutate_entry)
+{
+    if (merges_blocker.isCancelled() || (*mutate_entry)->is_cancelled)
+        throw Exception("Cancelled mutating parts", ErrorCodes::ABORTED);
+
+    return true;
+}
+
+/** Split mutation commands into two parts:
+*   First part should be executed by mutations interpreter.
+*   Other is just simple drop/renames, so they can be executed without interpreter.
+*/
+static void splitMutationCommands(
+    MergeTreeData::DataPartPtr part,
+    const MutationCommands & commands,
+    MutationCommands & for_interpreter,
+    MutationCommands & for_file_renames)
+{
+    ColumnsDescription part_columns(part->getColumns());
+
+    if (!isWidePart(part))
+    {
+        NameSet mutated_columns;
+        for (const auto & command : commands)
+        {
+            if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
+                || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
+                || command.type == MutationCommand::Type::MATERIALIZE_TTL
+                || command.type == MutationCommand::Type::DELETE
+                || command.type == MutationCommand::Type::UPDATE)
+            {
+                for_interpreter.push_back(command);
+                for (const auto & [column_name, expr] : command.column_to_update_expression)
+                    mutated_columns.emplace(column_name);
+
+                if (command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
+                     mutated_columns.emplace(command.column_name);
+            }
+            else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
+            {
+                for_file_renames.push_back(command);
+            }
+            else if (part_columns.has(command.column_name))
+            {
+                if (command.type == MutationCommand::Type::DROP_COLUMN)
+                {
+                    mutated_columns.emplace(command.column_name);
+                }
+                else if (command.type == MutationCommand::Type::RENAME_COLUMN)
+                {
+                    for_interpreter.push_back(
+                    {
+                        .type = MutationCommand::Type::READ_COLUMN,
+                        .column_name = command.rename_to,
+                    });
+                    mutated_columns.emplace(command.column_name);
+                    part_columns.rename(command.column_name, command.rename_to);
+                }
+            }
+        }
+        /// If it's compact part, then we don't need to actually remove files
+        /// from disk we just don't read dropped columns
+        for (const auto & column : part->getColumns())
+        {
+            if (!mutated_columns.count(column.name))
+                for_interpreter.emplace_back(
+                    MutationCommand{.type = MutationCommand::Type::READ_COLUMN, .column_name = column.name, .data_type = column.type});
+        }
+    }
+    else
+    {
+        for (const auto & command : commands)
+        {
+            if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
+                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
+                || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
+                || command.type == MutationCommand::Type::MATERIALIZE_TTL
+                || command.type == MutationCommand::Type::DELETE
+                || command.type == MutationCommand::Type::UPDATE)
+            {
+                for_interpreter.push_back(command);
+            }
+            else if (command.type == MutationCommand::Type::DROP_INDEX || command.type == MutationCommand::Type::DROP_PROJECTION)
+            {
+                for_file_renames.push_back(command);
+            }
+            /// If we don't have this column in source part, than we don't need
+            /// to materialize it
+            else if (part_columns.has(command.column_name))
+            {
+                if (command.type == MutationCommand::Type::READ_COLUMN)
+                {
+                    for_interpreter.push_back(command);
+                }
+                else if (command.type == MutationCommand::Type::RENAME_COLUMN)
+                {
+                    part_columns.rename(command.column_name, command.rename_to);
+                    for_file_renames.push_back(command);
+                }
+                else
+                {
+                    for_file_renames.push_back(command);
+                }
+            }
+        }
+    }
+}
+
+
+/// Get skip indices, that should exists in the resulting data part.
+static MergeTreeIndices getIndicesForNewDataPart(
+    const IndicesDescription & all_indices,
+    const MutationCommands & commands_for_removes)
+{
+    NameSet removed_indices;
+    for (const auto & command : commands_for_removes)
+        if (command.type == MutationCommand::DROP_INDEX)
+            removed_indices.insert(command.column_name);
+
+    MergeTreeIndices new_indices;
+    for (const auto & index : all_indices)
+        if (!removed_indices.count(index.name))
+            new_indices.push_back(MergeTreeIndexFactory::instance().get(index));
+
+    return new_indices;
+}
+
+static std::vector<ProjectionDescriptionRawPtr> getProjectionsForNewDataPart(
+    const ProjectionsDescription & all_projections,
+    const MutationCommands & commands_for_removes)
+{
+    NameSet removed_projections;
+    for (const auto & command : commands_for_removes)
+        if (command.type == MutationCommand::DROP_PROJECTION)
+            removed_projections.insert(command.column_name);
+
+    std::vector<ProjectionDescriptionRawPtr> new_projections;
+    for (const auto & projection : all_projections)
+        if (!removed_projections.count(projection.name))
+            new_projections.push_back(&projection);
+
+    return new_projections;
+}
+
+
+/// Return set of indices which should be recalculated during mutation also
+/// wraps input stream into additional expression stream
+static std::set<MergeTreeIndexPtr> getIndicesToRecalculate(
+    QueryPipeline & pipeline,
+    const NameSet & updated_columns,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    const NameSet & materialized_indices,
+    const MergeTreeData::DataPartPtr & source_part)
+{
+    /// Checks if columns used in skipping indexes modified.
+    const auto & index_factory = MergeTreeIndexFactory::instance();
+    std::set<MergeTreeIndexPtr> indices_to_recalc;
+    ASTPtr indices_recalc_expr_list = std::make_shared<ASTExpressionList>();
+    const auto & indices = metadata_snapshot->getSecondaryIndices();
+
+    for (size_t i = 0; i < indices.size(); ++i)
+    {
+        const auto & index = indices[i];
+
+        bool has_index =
+            source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx") ||
+            source_part->checksums.has(INDEX_FILE_PREFIX + index.name + ".idx2");
+        // If we ask to materialize and it already exists
+        if (!has_index && materialized_indices.count(index.name))
+        {
+            if (indices_to_recalc.insert(index_factory.get(index)).second)
+            {
+                ASTPtr expr_list = index.expression_list_ast->clone();
+                for (const auto & expr : expr_list->children)
+                    indices_recalc_expr_list->children.push_back(expr->clone());
+            }
+        }
+        // If some dependent columns gets mutated
+        else
+        {
+            bool mutate = false;
+            const auto & index_cols = index.expression->getRequiredColumns();
+            for (const auto & col : index_cols)
+            {
+                if (updated_columns.count(col))
+                {
+                    mutate = true;
+                    break;
+                }
+            }
+            if (mutate && indices_to_recalc.insert(index_factory.get(index)).second)
+            {
+                ASTPtr expr_list = index.expression_list_ast->clone();
+                for (const auto & expr : expr_list->children)
+                    indices_recalc_expr_list->children.push_back(expr->clone());
+            }
+        }
+    }
+
+    if (!indices_to_recalc.empty() && pipeline.initialized())
+    {
+        auto indices_recalc_syntax = TreeRewriter(context).analyze(indices_recalc_expr_list, pipeline.getHeader().getNamesAndTypesList());
+        auto indices_recalc_expr = ExpressionAnalyzer(
+                indices_recalc_expr_list,
+                indices_recalc_syntax, context).getActions(false);
+
+        /// We can update only one column, but some skip idx expression may depend on several
+        /// columns (c1 + c2 * c3). It works because this stream was created with help of
+        /// MutationsInterpreter which knows about skip indices and stream 'in' already has
+        /// all required columns.
+        /// TODO move this logic to single place.
+        QueryPipelineBuilder builder;
+        builder.init(std::move(pipeline));
+        builder.addTransform(std::make_shared<ExpressionTransform>(builder.getHeader(), indices_recalc_expr));
+        builder.addTransform(std::make_shared<MaterializingTransform>(builder.getHeader()));
+        pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+    }
+    return indices_to_recalc;
+}
+
+std::set<ProjectionDescriptionRawPtr> getProjectionsToRecalculate(
+    const NameSet & updated_columns,
+    const StorageMetadataPtr & metadata_snapshot,
+    const NameSet & materialized_projections,
+    const MergeTreeData::DataPartPtr & source_part)
+{
+    /// Checks if columns used in projections modified.
+    std::set<ProjectionDescriptionRawPtr> projections_to_recalc;
+    for (const auto & projection : metadata_snapshot->getProjections())
+    {
+        // If we ask to materialize and it doesn't exist
+        if (!source_part->checksums.has(projection.name + ".proj") && materialized_projections.count(projection.name))
+        {
+            projections_to_recalc.insert(&projection);
+        }
+        else
+        {
+            // If some dependent columns gets mutated
+            bool mutate = false;
+            const auto & projection_cols = projection.required_columns;
+            for (const auto & col : projection_cols)
+            {
+                if (updated_columns.count(col))
+                {
+                    mutate = true;
+                    break;
+                }
+            }
+            if (mutate)
+                projections_to_recalc.insert(&projection);
+        }
+    }
+    return projections_to_recalc;
+}
+
+
+/// Files, that we don't need to remove and don't need to hardlink, for example columns.txt and checksums.txt.
+/// Because we will generate new versions of them after we perform mutation.
+NameSet collectFilesToSkip(
+    const MergeTreeDataPartPtr & source_part,
+    const Block & updated_header,
+    const std::set<MergeTreeIndexPtr> & indices_to_recalc,
+    const String & mrk_extension,
+    const std::set<ProjectionDescriptionRawPtr> & projections_to_recalc)
+{
+    NameSet files_to_skip = source_part->getFileNamesWithoutChecksums();
+
+    /// Skip updated files
+    for (const auto & entry : updated_header)
+    {
+        ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+        {
+            String stream_name = ISerialization::getFileNameForStream({entry.name, entry.type}, substream_path);
+            files_to_skip.insert(stream_name + ".bin");
+            files_to_skip.insert(stream_name + mrk_extension);
+        };
+
+        auto serialization = source_part->getSerializationForColumn({entry.name, entry.type});
+        serialization->enumerateStreams(callback);
+    }
+    for (const auto & index : indices_to_recalc)
+    {
+        files_to_skip.insert(index->getFileName() + ".idx");
+        files_to_skip.insert(index->getFileName() + mrk_extension);
+    }
+    for (const auto & projection : projections_to_recalc)
+        files_to_skip.insert(projection->getDirectoryName());
+
+    return files_to_skip;
+}
+
+
+/// Apply commands to source_part i.e. remove and rename some columns in
+/// source_part and return set of files, that have to be removed or renamed
+/// from filesystem and in-memory checksums. Ordered result is important,
+/// because we can apply renames that affects each other: x -> z, y -> x.
+static NameToNameVector collectFilesForRenames(
+    MergeTreeData::DataPartPtr source_part, const MutationCommands & commands_for_removes, const String & mrk_extension)
+{
+    /// Collect counts for shared streams of different columns. As an example, Nested columns have shared stream with array sizes.
+    std::map<String, size_t> stream_counts;
+    for (const auto & column : source_part->getColumns())
+    {
+        auto serialization = source_part->getSerializationForColumn(column);
+        serialization->enumerateStreams(
+            [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                ++stream_counts[ISerialization::getFileNameForStream(column, substream_path)];
+            });
+    }
+
+    NameToNameVector rename_vector;
+    /// Remove old data
+    for (const auto & command : commands_for_removes)
+    {
+        if (command.type == MutationCommand::Type::DROP_INDEX)
+        {
+            if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx2"))
+            {
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx2", "");
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+            }
+            else if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx"))
+            {
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
+                rename_vector.emplace_back(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+            }
+        }
+        else if (command.type == MutationCommand::Type::DROP_PROJECTION)
+        {
+            if (source_part->checksums.has(command.column_name + ".proj"))
+                rename_vector.emplace_back(command.column_name + ".proj", "");
+        }
+        else if (command.type == MutationCommand::Type::DROP_COLUMN)
+        {
+            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                String stream_name = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
+                /// Delete files if they are no longer shared with another column.
+                if (--stream_counts[stream_name] == 0)
+                {
+                    rename_vector.emplace_back(stream_name + ".bin", "");
+                    rename_vector.emplace_back(stream_name + mrk_extension, "");
+                }
+            };
+
+            auto column = source_part->getColumns().tryGetByName(command.column_name);
+            if (column)
+            {
+                auto serialization = source_part->getSerializationForColumn(*column);
+                serialization->enumerateStreams(callback);
+            }
+        }
+        else if (command.type == MutationCommand::Type::RENAME_COLUMN)
+        {
+            String escaped_name_from = escapeForFileName(command.column_name);
+            String escaped_name_to = escapeForFileName(command.rename_to);
+
+            ISerialization::StreamCallback callback = [&](const ISerialization::SubstreamPath & substream_path)
+            {
+                String stream_from = ISerialization::getFileNameForStream({command.column_name, command.data_type}, substream_path);
+
+                String stream_to = boost::replace_first_copy(stream_from, escaped_name_from, escaped_name_to);
+
+                if (stream_from != stream_to)
+                {
+                    rename_vector.emplace_back(stream_from + ".bin", stream_to + ".bin");
+                    rename_vector.emplace_back(stream_from + mrk_extension, stream_to + mrk_extension);
+                }
+            };
+
+            auto column = source_part->getColumns().tryGetByName(command.column_name);
+            if (column)
+            {
+                auto serialization = source_part->getSerializationForColumn(*column);
+                serialization->enumerateStreams(callback);
+            }
+        }
+    }
+
+    return rename_vector;
+}
+
+
+/// Initialize and write to disk new part fields like checksums, columns, etc.
+void finalizeMutatedPart(
+    const MergeTreeDataPartPtr & source_part,
+    MergeTreeData::MutableDataPartPtr new_data_part,
+    ExecuteTTLType execute_ttl_type,
+    const CompressionCodecPtr & codec)
+{
+    auto disk = new_data_part->volume->getDisk();
+
+    if (new_data_part->uuid != UUIDHelpers::Nil)
+    {
+        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::UUID_FILE_NAME, 4096);
+        HashingWriteBuffer out_hashing(*out);
+        writeUUIDText(new_data_part->uuid, out_hashing);
+        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_size = out_hashing.count();
+        new_data_part->checksums.files[IMergeTreeDataPart::UUID_FILE_NAME].file_hash = out_hashing.getHash();
+    }
+
+    if (execute_ttl_type != ExecuteTTLType::NONE)
+    {
+        /// Write a file with ttl infos in json format.
+        auto out_ttl = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "ttl.txt", 4096);
+        HashingWriteBuffer out_hashing(*out_ttl);
+        new_data_part->ttl_infos.write(out_hashing);
+        new_data_part->checksums.files["ttl.txt"].file_size = out_hashing.count();
+        new_data_part->checksums.files["ttl.txt"].file_hash = out_hashing.getHash();
+    }
+
+    {
+        /// Write file with checksums.
+        auto out_checksums = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "checksums.txt", 4096);
+        new_data_part->checksums.write(*out_checksums);
+    } /// close fd
+
+    {
+        auto out = disk->writeFile(new_data_part->getFullRelativePath() + IMergeTreeDataPart::DEFAULT_COMPRESSION_CODEC_FILE_NAME, 4096);
+        DB::writeText(queryToString(codec->getFullCodecDesc()), *out);
+    }
+
+    {
+        /// Write a file with a description of columns.
+        auto out_columns = disk->writeFile(fs::path(new_data_part->getFullRelativePath()) / "columns.txt", 4096);
+        new_data_part->getColumns().writeText(*out_columns);
+    } /// close fd
+
+    new_data_part->rows_count = source_part->rows_count;
+    new_data_part->index_granularity = source_part->index_granularity;
+    new_data_part->index = source_part->index;
+    new_data_part->minmax_idx = source_part->minmax_idx;
+    new_data_part->modification_time = time(nullptr);
+    new_data_part->loadProjections(false, false);
+    new_data_part->setBytesOnDisk(
+        MergeTreeData::DataPart::calculateTotalSizeOnDisk(new_data_part->volume->getDisk(), new_data_part->getFullRelativePath()));
+    new_data_part->default_codec = codec;
+    new_data_part->calculateColumnsAndSecondaryIndicesSizesOnDisk();
+    new_data_part->storage.lockSharedData(*new_data_part);
+}
+
+}
+
+struct MutationContext
+{
+    MergeTreeData * data;
+    MergeTreeDataMergerMutator * mutator;
+    ActionBlocker * merges_blocker;
+    TableLockHolder * holder;
+    MergeListEntry * mutate_entry;
+
+    Poco::Logger * log{&Poco::Logger::get("MutateTask")};
+
+    FutureMergedMutatedPartPtr future_part;
+    MergeTreeData::DataPartPtr source_part;
+
+    StorageMetadataPtr metadata_snapshot;
+    MutationCommandsConstPtr commands;
+    time_t time_of_mutation;
+    ContextPtr context;
+    ReservationSharedPtr space_reservation;
+
+    CompressionCodecPtr compression_codec;
+
+    std::unique_ptr<CurrentMetrics::Increment> num_mutations;
+
+    QueryPipeline mutating_pipeline; // in
+    std::unique_ptr<PullingPipelineExecutor> mutating_executor;
+    Block updated_header;
+
+    std::unique_ptr<MutationsInterpreter> interpreter;
+    UInt64 watch_prev_elapsed{0};
+    std::unique_ptr<MergeStageProgress> stage_progress{nullptr};
+
+    MutationCommands commands_for_part;
+    MutationCommands for_interpreter;
+    MutationCommands for_file_renames;
+
+    NamesAndTypesList storage_columns;
+    NameSet materialized_indices;
+    NameSet materialized_projections;
+    MutationsInterpreter::MutationKind::MutationKindEnum mutation_kind
+        = MutationsInterpreter::MutationKind::MutationKindEnum::MUTATE_UNKNOWN;
+
+    VolumePtr single_disk_volume;
+    MergeTreeData::MutableDataPartPtr new_data_part;
+    DiskPtr disk;
+    String new_part_tmp_path;
+
+    SyncGuardPtr sync_guard;
+    IMergedBlockOutputStreamPtr out{nullptr};
+
+    String mrk_extension;
+
+    std::vector<ProjectionDescriptionRawPtr> projections_to_build;
+    IMergeTreeDataPart::MinMaxIndexPtr minmax_idx{nullptr};
+
+    NameSet updated_columns;
+    std::set<MergeTreeIndexPtr> indices_to_recalc;
+    std::set<ProjectionDescriptionRawPtr> projections_to_recalc;
+    NameSet files_to_skip;
+    NameToNameVector files_to_rename;
+
+    bool need_sync;
+    ExecuteTTLType execute_ttl_type{ExecuteTTLType::NONE};
+};
+
+using MutationContextPtr = std::shared_ptr<MutationContext>;
+
+
+class MergeProjectionPartsTask : public IExecutableTask
+{
+public:
+
+    MergeProjectionPartsTask(
+        String name_,
+        MergeTreeData::MutableDataPartsVector && parts_,
+        const ProjectionDescription & projection_,
+        size_t & block_num_,
+        MutationContextPtr ctx_
+        )
+        : name(std::move(name_))
+        , parts(std::move(parts_))
+        , projection(projection_)
+        , block_num(block_num_)
+        , ctx(ctx_)
+        , log(&Poco::Logger::get("MergeProjectionPartsTask"))
+        {
+            LOG_DEBUG(log, "Selected {} projection_parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
+            level_parts[current_level] = std::move(parts);
+        }
+
+    void onCompleted() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    StorageID getStorageID() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    UInt64 getPriority() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+
+    bool executeStep() override
+    {
+        auto & current_level_parts = level_parts[current_level];
+        auto & next_level_parts = level_parts[next_level];
+
+        MergeTreeData::MutableDataPartsVector selected_parts;
+        while (selected_parts.size() < max_parts_to_merge_in_one_level && !current_level_parts.empty())
+        {
+            selected_parts.push_back(std::move(current_level_parts.back()));
+            current_level_parts.pop_back();
+        }
+
+        if (selected_parts.empty())
+        {
+            if (next_level_parts.empty())
+            {
+                LOG_WARNING(log, "There is no projection parts merged");
+
+                /// Task is finished
+                return false;
+            }
+            current_level = next_level;
+            ++next_level;
+        }
+        else if (selected_parts.size() == 1)
+        {
+            if (next_level_parts.empty())
+            {
+                LOG_DEBUG(log, "Merged a projection part in level {}", current_level);
+                selected_parts[0]->renameTo(projection.name + ".proj", true);
+                selected_parts[0]->name = projection.name;
+                selected_parts[0]->is_temp = false;
+                ctx->new_data_part->addProjectionPart(name, std::move(selected_parts[0]));
+
+                /// Task is finished
+                return false;
+            }
+            else
+            {
+                LOG_DEBUG(log, "Forwarded part {} in level {} to next level", selected_parts[0]->name, current_level);
+                next_level_parts.push_back(std::move(selected_parts[0]));
+            }
+        }
+        else if (selected_parts.size() > 1)
+        {
+            // Generate a unique part name
+            ++block_num;
+            auto projection_future_part = std::make_shared<FutureMergedMutatedPart>();
+            MergeTreeData::DataPartsVector const_selected_parts(
+                std::make_move_iterator(selected_parts.begin()), std::make_move_iterator(selected_parts.end()));
+            projection_future_part->assign(std::move(const_selected_parts));
+            projection_future_part->name = fmt::format("{}_{}", projection.name, ++block_num);
+            projection_future_part->part_info = {"all", 0, 0, 0};
+
+            MergeTreeData::MergingParams projection_merging_params;
+            projection_merging_params.mode = MergeTreeData::MergingParams::Ordinary;
+            if (projection.type == ProjectionDescription::Type::Aggregate)
+                projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
+
+            const Settings & settings = ctx->context->getSettingsRef();
+
+            LOG_DEBUG(log, "Merged {} parts in level {} to {}", selected_parts.size(), current_level, projection_future_part->name);
+            auto tmp_part_merge_task = ctx->mutator->mergePartsToTemporaryPart(
+                projection_future_part,
+                projection.metadata,
+                ctx->mutate_entry,
+                std::make_unique<MergeListElement>(
+                    (*ctx->mutate_entry)->table_id,
+                    projection_future_part,
+                    settings.memory_profiler_step,
+                    settings.memory_profiler_sample_probability,
+                    settings.max_untracked_memory),
+                *ctx->holder,
+                ctx->time_of_mutation,
+                ctx->context,
+                ctx->space_reservation,
+                false, // TODO Do we need deduplicate for projections
+                {},
+                projection_merging_params,
+                ctx->new_data_part.get(),
+                ".tmp_proj");
+
+            next_level_parts.push_back(executeHere(tmp_part_merge_task));
+
+            next_level_parts.back()->is_temp = true;
+        }
+
+        /// Need execute again
+        return true;
+    }
+private:
+    String name;
+    MergeTreeData::MutableDataPartsVector parts;
+    const ProjectionDescription & projection;
+    size_t & block_num;
+    MutationContextPtr ctx;
+
+    Poco::Logger * log;
+
+    std::map<size_t, MergeTreeData::MutableDataPartsVector> level_parts;
+    size_t current_level = 0;
+    size_t next_level = 1;
+
+    /// TODO(nikitamikhaylov): make this constant a setting
+    static constexpr size_t max_parts_to_merge_in_one_level = 10;
+};
+
+
+// This class is responsible for:
+// 1. get projection pipeline and a sink to write parts
+// 2. build an executor that can write block to the input stream (actually we can write through it to generate as many parts as possible)
+// 3. finalize the pipeline so that all parts are merged into one part
+
+// In short it executed a mutation for the part an original part and for its every projection
+
+/**
+ *
+ * An overview of how the process of mutation works for projections:
+ *
+ * The mutation for original parts is executed block by block,
+ * but additionally we execute a SELECT query for each projection over a current block.
+ * And we store results to a map : ProjectionName -> ArrayOfParts.
+ *
+ * Then, we have to merge all parts for each projection. But we will have constraint:
+ * We cannot execute merge on more than 10 parts simulatiously.
+ * So we build a tree of merges. At the beginning all the parts have level 0.
+ * At each step we take not bigger than 10 parts from the same level
+ * and merge it into a bigger part with incremented level.
+ */
+class PartMergerWriter
+{
+public:
+
+    explicit PartMergerWriter(MutationContextPtr ctx_)
+        : ctx(ctx_), projections(ctx->metadata_snapshot->projections)
+    {
+    }
+
+    bool execute()
+    {
+        switch (state)
+        {
+            case State::NEED_PREPARE:
+            {
+                prepare();
+
+                state = State::NEED_MUTATE_ORIGINAL_PART;
+                return true;
+            }
+            case State::NEED_MUTATE_ORIGINAL_PART:
+            {
+                if (mutateOriginalPartAndPrepareProjections())
+                    return true;
+
+                state = State::NEED_MERGE_PROJECTION_PARTS;
+                return true;
+            }
+            case State::NEED_MERGE_PROJECTION_PARTS:
+            {
+                if (iterateThroughAllProjections())
+                    return true;
+
+                state = State::SUCCESS;
+                return true;
+            }
+            case State::SUCCESS:
+            {
+                return false;
+            }
+        }
+        return false;
+    }
+
+private:
+    void prepare();
+    bool mutateOriginalPartAndPrepareProjections();
+    bool iterateThroughAllProjections();
+    void constructTaskForProjectionPartsMerge();
+    void finalize();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_MUTATE_ORIGINAL_PART,
+        NEED_MERGE_PROJECTION_PARTS,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+    MutationContextPtr ctx;
+
+    size_t block_num = 0;
+
+    using ProjectionNameToItsBlocks = std::map<String, MergeTreeData::MutableDataPartsVector>;
+    ProjectionNameToItsBlocks projection_parts;
+    std::move_iterator<ProjectionNameToItsBlocks::iterator> projection_parts_iterator;
+
+    std::vector<SquashingTransform> projection_squashes;
+    const ProjectionsDescription & projections;
+
+    ExecutableTaskPtr merge_projection_parts_task_ptr;
+};
+
+
+void PartMergerWriter::prepare()
+{
+    const auto & settings = ctx->context->getSettingsRef();
+
+    for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
+    {
+        // If the parent part is an in-memory part, squash projection output into one block and
+        // build in-memory projection because we don't support merging into a new in-memory part.
+        // Otherwise we split the materialization into multiple stages similar to the process of
+        // INSERT SELECT query.
+        if (ctx->new_data_part->getType() == MergeTreeDataPartType::IN_MEMORY)
+            projection_squashes.emplace_back(0, 0);
+        else
+            projection_squashes.emplace_back(settings.min_insert_block_size_rows, settings.min_insert_block_size_bytes);
+    }
+}
+
+
+bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
+{
+    Block cur_block;
+    if (MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry) && ctx->mutating_executor->pull(cur_block))
+    {
+        if (ctx->minmax_idx)
+            ctx->minmax_idx->update(cur_block, ctx->data->getMinMaxColumnsNames(ctx->metadata_snapshot->getPartitionKey()));
+
+        ctx->out->write(cur_block);
+
+        for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
+        {
+            const auto & projection = *ctx->projections_to_build[i];
+            auto projection_block = projection_squashes[i].add(projection.calculate(cur_block, ctx->context));
+            if (projection_block)
+                projection_parts[projection.name].emplace_back(MergeTreeDataWriter::writeTempProjectionPart(
+                    *ctx->data, ctx->log, projection_block, projection, ctx->new_data_part.get(), ++block_num));
+        }
+
+        (*ctx->mutate_entry)->rows_written += cur_block.rows();
+        (*ctx->mutate_entry)->bytes_written_uncompressed += cur_block.bytes();
+
+        /// Need execute again
+        return true;
+    }
+
+    // Write the last block
+    for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
+    {
+        const auto & projection = *ctx->projections_to_build[i];
+        auto & projection_squash = projection_squashes[i];
+        auto projection_block = projection_squash.add({});
+        if (projection_block)
+        {
+            projection_parts[projection.name].emplace_back(MergeTreeDataWriter::writeTempProjectionPart(
+                *ctx->data, ctx->log, projection_block, projection, ctx->new_data_part.get(), ++block_num));
+        }
+    }
+
+    projection_parts_iterator = std::make_move_iterator(projection_parts.begin());
+
+    /// Maybe there are no projections ?
+    if (projection_parts_iterator != std::make_move_iterator(projection_parts.end()))
+        constructTaskForProjectionPartsMerge();
+
+    /// Let's move on to the next stage
+    return false;
+}
+
+
+void PartMergerWriter::constructTaskForProjectionPartsMerge()
+{
+    auto && [name, parts] = *projection_parts_iterator;
+    const auto & projection = projections.get(name);
+
+    merge_projection_parts_task_ptr = std::make_unique<MergeProjectionPartsTask>
+    (
+        name,
+        std::move(parts),
+        projection,
+        block_num,
+        ctx
+    );
+}
+
+
+bool PartMergerWriter::iterateThroughAllProjections()
+{
+    /// In case if there are no projections we didn't construct a task
+    if (!merge_projection_parts_task_ptr)
+        return false;
+
+    if (merge_projection_parts_task_ptr->executeStep())
+        return true;
+
+    ++projection_parts_iterator;
+
+    if (projection_parts_iterator == std::make_move_iterator(projection_parts.end()))
+        return false;
+
+    constructTaskForProjectionPartsMerge();
+
+    return true;
+}
+
+class MutateAllPartColumnsTask : public IExecutableTask
+{
+public:
+
+    explicit MutateAllPartColumnsTask(MutationContextPtr ctx_) : ctx(ctx_) {}
+
+    void onCompleted() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    StorageID getStorageID() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    UInt64 getPriority() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+
+    bool executeStep() override
+    {
+        switch (state)
+        {
+            case State::NEED_PREPARE:
+            {
+                prepare();
+
+                state = State::NEED_EXECUTE;
+                return true;
+            }
+            case State::NEED_EXECUTE:
+            {
+                if (part_merger_writer_task->execute())
+                    return true;
+
+                state = State::NEED_FINALIZE;
+                return true;
+            }
+            case State::NEED_FINALIZE:
+            {
+                finalize();
+
+                state = State::SUCCESS;
+                return true;
+            }
+            case State::SUCCESS:
+            {
+                return false;
+            }
+        }
+        return false;
+    }
+
+private:
+
+    void prepare()
+    {
+        ctx->disk->createDirectories(ctx->new_part_tmp_path);
+
+        /// Note: this is done before creating input streams, because otherwise data.data_parts_mutex
+        /// (which is locked in data.getTotalActiveSizeInBytes())
+        /// (which is locked in shared mode when input streams are created) and when inserting new data
+        /// the order is reverse. This annoys TSan even though one lock is locked in shared mode and thus
+        /// deadlock is impossible.
+        ctx->compression_codec = ctx->data->getCompressionCodecForPart(ctx->source_part->getBytesOnDisk(), ctx->source_part->ttl_infos, ctx->time_of_mutation);
+
+        auto skip_part_indices = MutationHelpers::getIndicesForNewDataPart(ctx->metadata_snapshot->getSecondaryIndices(), ctx->for_file_renames);
+        ctx->projections_to_build = MutationHelpers::getProjectionsForNewDataPart(ctx->metadata_snapshot->getProjections(), ctx->for_file_renames);
+
+        if (!ctx->mutating_pipeline.initialized())
+            throw Exception("Cannot mutate part columns with uninitialized mutations stream. It's a bug", ErrorCodes::LOGICAL_ERROR);
+
+        QueryPipelineBuilder builder;
+        builder.init(std::move(ctx->mutating_pipeline));
+
+        if (ctx->metadata_snapshot->hasPrimaryKey() || ctx->metadata_snapshot->hasSecondaryIndices())
+        {
+            builder.addTransform(
+                std::make_shared<ExpressionTransform>(builder.getHeader(), ctx->data->getPrimaryKeyAndSkipIndicesExpression(ctx->metadata_snapshot)));
+
+            builder.addTransform(std::make_shared<MaterializingTransform>(builder.getHeader()));
+        }
+
+        if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
+            builder.addTransform(std::make_shared<TTLTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+
+        if (ctx->execute_ttl_type == ExecuteTTLType::RECALCULATE)
+            builder.addTransform(std::make_shared<TTLCalcTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+
+        ctx->minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
+
+        ctx->out = std::make_shared<MergedBlockOutputStream>(
+            ctx->new_data_part,
+            ctx->metadata_snapshot,
+            ctx->new_data_part->getColumns(),
+            skip_part_indices,
+            ctx->compression_codec);
+
+        ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+        ctx->mutating_executor = std::make_unique<PullingPipelineExecutor>(ctx->mutating_pipeline);
+
+        part_merger_writer_task = std::make_unique<PartMergerWriter>(ctx);
+    }
+
+
+    void finalize()
+    {
+        ctx->new_data_part->minmax_idx = std::move(ctx->minmax_idx);
+        ctx->mutating_executor.reset();
+        ctx->mutating_pipeline.reset();
+
+        static_pointer_cast<MergedBlockOutputStream>(ctx->out)->writeSuffixAndFinalizePart(ctx->new_data_part, ctx->need_sync);
+        ctx->out.reset();
+    }
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINALIZE,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+
+    MutationContextPtr ctx;
+
+    std::unique_ptr<PartMergerWriter> part_merger_writer_task;
+};
+
+class MutateSomePartColumnsTask : public IExecutableTask
+{
+public:
+    explicit MutateSomePartColumnsTask(MutationContextPtr ctx_) : ctx(ctx_) {}
+
+    void onCompleted() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    StorageID getStorageID() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+    UInt64 getPriority() override { throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented"); }
+
+    bool executeStep() override
+    {
+        switch (state)
+        {
+            case State::NEED_PREPARE:
+            {
+                prepare();
+
+                state = State::NEED_EXECUTE;
+                return true;
+            }
+            case State::NEED_EXECUTE:
+            {
+                if (part_merger_writer_task && part_merger_writer_task->execute())
+                    return true;
+
+                state = State::NEED_FINALIZE;
+                return true;
+            }
+            case State::NEED_FINALIZE:
+            {
+                finalize();
+
+                state = State::SUCCESS;
+                return true;
+            }
+            case State::SUCCESS:
+            {
+                return false;
+            }
+        }
+        return false;
+    }
+
+private:
+
+    void prepare()
+    {
+        if (ctx->execute_ttl_type != ExecuteTTLType::NONE)
+            ctx->files_to_skip.insert("ttl.txt");
+
+        ctx->disk->createDirectories(ctx->new_part_tmp_path);
+
+        /// Create hardlinks for unchanged files
+        for (auto it = ctx->disk->iterateDirectory(ctx->source_part->getFullRelativePath()); it->isValid(); it->next())
+        {
+            if (ctx->files_to_skip.count(it->name()))
+                continue;
+
+            String destination = ctx->new_part_tmp_path;
+            String file_name = it->name();
+
+            auto rename_it = std::find_if(ctx->files_to_rename.begin(), ctx->files_to_rename.end(), [&file_name](const auto & rename_pair)
+            {
+                return rename_pair.first == file_name;
+            });
+            if (rename_it != ctx->files_to_rename.end())
+            {
+                if (rename_it->second.empty())
+                    continue;
+                destination += rename_it->second;
+            }
+            else
+            {
+                destination += it->name();
+            }
+
+            if (!ctx->disk->isDirectory(it->path()))
+                ctx->disk->createHardLink(it->path(), destination);
+            else if (!endsWith(".tmp_proj", it->name())) // ignore projection tmp merge dir
+            {
+                // it's a projection part directory
+                ctx->disk->createDirectories(destination);
+                for (auto p_it = ctx->disk->iterateDirectory(it->path()); p_it->isValid(); p_it->next())
+                {
+                    String p_destination = destination + "/";
+                    String p_file_name = p_it->name();
+                    p_destination += p_it->name();
+                    ctx->disk->createHardLink(p_it->path(), p_destination);
+                }
+            }
+        }
+
+        (*ctx->mutate_entry)->columns_written = ctx->storage_columns.size() - ctx->updated_header.columns();
+
+        ctx->new_data_part->checksums = ctx->source_part->checksums;
+
+        ctx->compression_codec = ctx->source_part->default_codec;
+
+        if (ctx->mutating_pipeline.initialized())
+        {
+            QueryPipelineBuilder builder;
+            builder.init(std::move(ctx->mutating_pipeline));
+
+            if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
+                builder.addTransform(std::make_shared<TTLTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+
+            if (ctx->execute_ttl_type == ExecuteTTLType::RECALCULATE)
+                builder.addTransform(std::make_shared<TTLCalcTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+
+            ctx->out = std::make_shared<MergedColumnOnlyOutputStream>(
+                ctx->new_data_part,
+                ctx->metadata_snapshot,
+                ctx->updated_header,
+                ctx->compression_codec,
+                std::vector<MergeTreeIndexPtr>(ctx->indices_to_recalc.begin(), ctx->indices_to_recalc.end()),
+                nullptr,
+                ctx->source_part->index_granularity,
+                &ctx->source_part->index_granularity_info
+            );
+
+            ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+            ctx->mutating_executor = std::make_unique<PullingPipelineExecutor>(ctx->mutating_pipeline);
+
+            ctx->projections_to_build = std::vector<ProjectionDescriptionRawPtr>{ctx->projections_to_recalc.begin(), ctx->projections_to_recalc.end()};
+
+            part_merger_writer_task = std::make_unique<PartMergerWriter>(ctx);
+        }
+    }
+
+
+    void finalize()
+    {
+        if (ctx->mutating_executor)
+        {
+            ctx->mutating_executor.reset();
+            ctx->mutating_pipeline.reset();
+
+            auto changed_checksums =
+                static_pointer_cast<MergedColumnOnlyOutputStream>(ctx->out)->writeSuffixAndGetChecksums(
+                    ctx->new_data_part, ctx->new_data_part->checksums, ctx->need_sync);
+            ctx->new_data_part->checksums.add(std::move(changed_checksums));
+        }
+
+        for (const auto & [rename_from, rename_to] : ctx->files_to_rename)
+        {
+            if (rename_to.empty() && ctx->new_data_part->checksums.files.count(rename_from))
+            {
+                ctx->new_data_part->checksums.files.erase(rename_from);
+            }
+            else if (ctx->new_data_part->checksums.files.count(rename_from))
+            {
+                ctx->new_data_part->checksums.files[rename_to] = ctx->new_data_part->checksums.files[rename_from];
+                ctx->new_data_part->checksums.files.erase(rename_from);
+            }
+        }
+
+        MutationHelpers::finalizeMutatedPart(ctx->source_part, ctx->new_data_part, ctx->execute_ttl_type, ctx->compression_codec);
+    }
+
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE,
+        NEED_FINALIZE,
+
+        SUCCESS
+    };
+
+    State state{State::NEED_PREPARE};
+    MutationContextPtr ctx;
+    MergedColumnOnlyOutputStreamPtr out;
+
+    std::unique_ptr<PartMergerWriter> part_merger_writer_task{nullptr};
+};
+
+
+MutateTask::MutateTask(
+    FutureMergedMutatedPartPtr future_part_,
+    StorageMetadataPtr metadata_snapshot_,
+    MutationCommandsConstPtr commands_,
+    MergeListEntry * mutate_entry_,
+    time_t time_of_mutation_,
+    ContextPtr context_,
+    ReservationSharedPtr space_reservation_,
+    TableLockHolder & table_lock_holder_,
+    MergeTreeData & data_,
+    MergeTreeDataMergerMutator & mutator_,
+    ActionBlocker & merges_blocker_)
+    : ctx(std::make_shared<MutationContext>())
+{
+    ctx->data = &data_;
+    ctx->mutator = &mutator_;
+    ctx->merges_blocker = &merges_blocker_;
+    ctx->holder = &table_lock_holder_;
+    ctx->mutate_entry = mutate_entry_;
+    ctx->commands = commands_;
+    ctx->context = context_;
+    ctx->time_of_mutation = time_of_mutation_;
+    ctx->future_part = future_part_;
+    ctx->metadata_snapshot = metadata_snapshot_;
+    ctx->space_reservation = space_reservation_;
+    ctx->storage_columns = metadata_snapshot_->getColumns().getAllPhysical();
+}
+
+
+bool MutateTask::execute()
+{
+
+    switch (state)
+    {
+        case State::NEED_PREPARE:
+        {
+            if (!prepare())
+                return false;
+
+            state = State::NEED_EXECUTE;
+            return true;
+        }
+        case State::NEED_EXECUTE:
+        {
+            if (task->executeStep())
+                return true;
+
+            promise.set_value(ctx->new_data_part);
+            return false;
+        }
+    }
+    return false;
+}
+
+
+bool MutateTask::prepare()
+{
+    MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry);
+
+    if (ctx->future_part->parts.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to mutate {} parts, not one. "
+            "This is a bug.", toString(ctx->future_part->parts.size()));
+
+    ctx->num_mutations = std::make_unique<CurrentMetrics::Increment>(CurrentMetrics::PartMutation);
+    ctx->source_part = ctx->future_part->parts[0];
+    auto storage_from_source_part = StorageFromMergeTreeDataPart::create(ctx->source_part);
+
+    auto context_for_reading = Context::createCopy(ctx->context);
+    context_for_reading->setSetting("max_streams_to_max_threads_ratio", 1);
+    context_for_reading->setSetting("max_threads", 1);
+    /// Allow mutations to work when force_index_by_date or force_primary_key is on.
+    context_for_reading->setSetting("force_index_by_date", false);
+    context_for_reading->setSetting("force_primary_key", false);
+
+    for (const auto & command : *ctx->commands)
+    {
+        if (command.partition == nullptr || ctx->future_part->parts[0]->info.partition_id == ctx->data->getPartitionIDFromQuery(
+                command.partition, context_for_reading))
+            ctx->commands_for_part.emplace_back(command);
+    }
+
+    if (ctx->source_part->isStoredOnDisk() && !isStorageTouchedByMutations(
+        storage_from_source_part, ctx->metadata_snapshot, ctx->commands_for_part, Context::createCopy(context_for_reading)))
+    {
+        LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {}", ctx->source_part->name, ctx->future_part->part_info.mutation);
+        promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot));
+        return false;
+    }
+    else
+    {
+        LOG_TRACE(ctx->log, "Mutating part {} to mutation version {}", ctx->source_part->name, ctx->future_part->part_info.mutation);
+    }
+
+    MutationHelpers::splitMutationCommands(ctx->source_part, ctx->commands_for_part, ctx->for_interpreter, ctx->for_file_renames);
+
+    ctx->stage_progress = std::make_unique<MergeStageProgress>(1.0);
+
+    if (!ctx->for_interpreter.empty())
+    {
+        ctx->interpreter = std::make_unique<MutationsInterpreter>(
+            storage_from_source_part, ctx->metadata_snapshot, ctx->for_interpreter, context_for_reading, true);
+        ctx->materialized_indices = ctx->interpreter->grabMaterializedIndices();
+        ctx->materialized_projections = ctx->interpreter->grabMaterializedProjections();
+        ctx->mutation_kind = ctx->interpreter->getMutationKind();
+        ctx->mutating_pipeline = ctx->interpreter->execute();
+        ctx->updated_header = ctx->interpreter->getUpdatedHeader();
+        ctx->mutating_pipeline.setProgressCallback(MergeProgressCallback((*ctx->mutate_entry)->ptr(), ctx->watch_prev_elapsed, *ctx->stage_progress));
+    }
+
+    ctx->single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + ctx->future_part->name, ctx->space_reservation->getDisk(), 0);
+    ctx->new_data_part = ctx->data->createPart(
+        ctx->future_part->name, ctx->future_part->type, ctx->future_part->part_info, ctx->single_disk_volume, "tmp_mut_" + ctx->future_part->name);
+
+    ctx->new_data_part->uuid = ctx->future_part->uuid;
+    ctx->new_data_part->is_temp = true;
+    ctx->new_data_part->ttl_infos = ctx->source_part->ttl_infos;
+
+    /// It shouldn't be changed by mutation.
+    ctx->new_data_part->index_granularity_info = ctx->source_part->index_granularity_info;
+    ctx->new_data_part->setColumns(MergeTreeDataMergerMutator::getColumnsForNewDataPart(ctx->source_part, ctx->updated_header, ctx->storage_columns, ctx->for_file_renames));
+    ctx->new_data_part->partition.assign(ctx->source_part->partition);
+
+    ctx->disk = ctx->new_data_part->volume->getDisk();
+    ctx->new_part_tmp_path = ctx->new_data_part->getFullRelativePath();
+
+    if (ctx->data->getSettings()->fsync_part_directory)
+        ctx->sync_guard = ctx->disk->getDirectorySyncGuard(ctx->new_part_tmp_path);
+
+    /// Don't change granularity type while mutating subset of columns
+    ctx->mrk_extension = ctx->source_part->index_granularity_info.is_adaptive ? getAdaptiveMrkExtension(ctx->new_data_part->getType())
+                                                                         : getNonAdaptiveMrkExtension();
+
+    const auto data_settings = ctx->data->  getSettings();
+    ctx->need_sync = needSyncPart(ctx->source_part->rows_count, ctx->source_part->getBytesOnDisk(), *data_settings);
+    ctx->execute_ttl_type = ExecuteTTLType::NONE;
+
+    if (ctx->mutating_pipeline.initialized())
+        ctx->execute_ttl_type = MergeTreeDataMergerMutator::shouldExecuteTTL(ctx->metadata_snapshot, ctx->interpreter->getColumnDependencies());
+
+
+    /// All columns from part are changed and may be some more that were missing before in part
+    /// TODO We can materialize compact part without copying data
+    if (!isWidePart(ctx->source_part)
+        || (ctx->mutation_kind == MutationsInterpreter::MutationKind::MUTATE_OTHER && ctx->interpreter && ctx->interpreter->isAffectingAllColumns()))
+    {
+        task = std::make_unique<MutateAllPartColumnsTask>(ctx);
+    }
+    else /// TODO: check that we modify only non-key columns in this case.
+    {
+
+        /// We will modify only some of the columns. Other columns and key values can be copied as-is.
+        for (const auto & name_type : ctx->updated_header.getNamesAndTypesList())
+            ctx->updated_columns.emplace(name_type.name);
+
+        ctx->indices_to_recalc = MutationHelpers::getIndicesToRecalculate(
+            ctx->mutating_pipeline, ctx->updated_columns, ctx->metadata_snapshot, ctx->context, ctx->materialized_indices, ctx->source_part);
+        ctx->projections_to_recalc = MutationHelpers::getProjectionsToRecalculate(
+            ctx->updated_columns, ctx->metadata_snapshot, ctx->materialized_projections, ctx->source_part);
+
+        ctx->files_to_skip = MutationHelpers::collectFilesToSkip(
+            ctx->source_part,
+            ctx->updated_header,
+            ctx->indices_to_recalc,
+            ctx->mrk_extension,
+            ctx->projections_to_recalc);
+        ctx->files_to_rename = MutationHelpers::collectFilesForRenames(ctx->source_part, ctx->for_file_renames, ctx->mrk_extension);
+
+        if (ctx->indices_to_recalc.empty() &&
+            ctx->projections_to_recalc.empty() &&
+            ctx->mutation_kind != MutationsInterpreter::MutationKind::MUTATE_OTHER
+            && ctx->files_to_rename.empty())
+        {
+            LOG_TRACE(ctx->log, "Part {} doesn't change up to mutation version {} (optimized)", ctx->source_part->name, ctx->future_part->part_info.mutation);
+            promise.set_value(ctx->data->cloneAndLoadDataPartOnSameDisk(ctx->source_part, "tmp_clone_", ctx->future_part->part_info, ctx->metadata_snapshot));
+            return false;
+        }
+
+        task = std::make_unique<MutateSomePartColumnsTask>(ctx);
+    }
+
+    return true;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/MutateTask.h b/src/Storages/MergeTree/MutateTask.h
new file mode 100644
index 00000000000..79c3bff213a
--- /dev/null
+++ b/src/Storages/MergeTree/MutateTask.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeProgress.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/IMergedBlockOutputStream.h>
+#include <Storages/MutationCommands.h>
+#include <Interpreters/MutationsInterpreter.h>
+
+
+namespace DB
+{
+
+
+class MutateTask;
+using MutateTaskPtr = std::shared_ptr<MutateTask>;\
+
+
+class MergeTreeDataMergerMutator;
+
+struct MutationContext;
+
+class MutateTask
+{
+public:
+    MutateTask(
+        FutureMergedMutatedPartPtr future_part_,
+        StorageMetadataPtr metadata_snapshot_,
+        MutationCommandsConstPtr commands_,
+        MergeListEntry * mutate_entry_,
+        time_t time_of_mutation_,
+        ContextPtr context_,
+        ReservationSharedPtr space_reservation_,
+        TableLockHolder & table_lock_holder_,
+        MergeTreeData & data_,
+        MergeTreeDataMergerMutator & mutator_,
+        ActionBlocker & merges_blocker_);
+
+    bool execute();
+
+    std::future<MergeTreeData::MutableDataPartPtr> getFuture()
+    {
+        return promise.get_future();
+    }
+
+private:
+
+    bool prepare();
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE
+    };
+
+    State state{State::NEED_PREPARE};
+
+
+    std::promise<MergeTreeData::MutableDataPartPtr> promise;
+
+    std::shared_ptr<MutationContext> ctx;
+    ExecutableTaskPtr task;
+
+};
+
+[[ maybe_unused]] static MergeTreeData::MutableDataPartPtr executeHere(MutateTaskPtr task)
+{
+    while (task->execute()) {}
+    return task->getFuture().get();
+}
+
+}
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
index 4c187109ac6..b3a17250549 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
@@ -1,13 +1,20 @@
 #include <Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h>
 #include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/StorageReplicatedMergeTree.h>
-#include <boost/range/adaptor/map.hpp>
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
 PartMovesBetweenShardsOrchestrator::PartMovesBetweenShardsOrchestrator(StorageReplicatedMergeTree & storage_)
     : storage(storage_)
     , zookeeper_path(storage.zookeeper_path)
@@ -27,16 +34,17 @@ void PartMovesBetweenShardsOrchestrator::run()
     if (need_stop)
         return;
 
-    auto sleep_ms = 10;
+    /// Don't poll ZooKeeper too often.
+    auto sleep_ms = 3 * 1000;
 
     try
     {
-        fetchStateFromZK();
+        syncStateFromZK();
 
+        /// Schedule for immediate re-execution as likely there is more work
+        /// to be done.
         if (step())
-            fetchStateFromZK();
-        else
-            sleep_ms = 3 * 1000;
+            task->schedule();
     }
     catch (...)
     {
@@ -54,11 +62,11 @@ void PartMovesBetweenShardsOrchestrator::shutdown()
     LOG_TRACE(log, "PartMovesBetweenShardsOrchestrator thread finished");
 }
 
-void PartMovesBetweenShardsOrchestrator::fetchStateFromZK()
+void PartMovesBetweenShardsOrchestrator::syncStateFromZK()
 {
     std::lock_guard lock(state_mutex);
 
-    entries.clear();
+    std::vector<Entry> new_entries;
 
     auto zk = storage.getZooKeeper();
 
@@ -76,8 +84,11 @@ void PartMovesBetweenShardsOrchestrator::fetchStateFromZK()
         e.version = stat.version;
         e.znode_name = task_name;
 
-        entries[task_name] = std::move(e);
+        new_entries.push_back(std::move(e));
     }
+
+    // Replace in-memory state.
+    entries = new_entries;
 }
 
 bool PartMovesBetweenShardsOrchestrator::step()
@@ -93,7 +104,7 @@ bool PartMovesBetweenShardsOrchestrator::step()
     {
         std::lock_guard lock(state_mutex);
 
-        for (auto const & entry : entries | boost::adaptors::map_values)
+        for (auto const & entry : entries)
         {
             if (entry.state.value == EntryState::DONE || entry.state.value == EntryState::CANCELLED)
                 continue;
@@ -128,11 +139,21 @@ bool PartMovesBetweenShardsOrchestrator::step()
         throw;
     }
 
+    LOG_DEBUG(log, "stepEntry on task {} from state {} (rollback: {}), try: {}",
+              entry_to_process->znode_name,
+              entry_to_process->state.toString(),
+              entry_to_process->rollback,
+              entry_to_process->num_tries);
+
     try
     {
         /// Use the same ZooKeeper connection. If we'd lost the lock then connection
         /// will become expired and all consequent operations will fail.
-        stepEntry(entry_to_process.value(), zk);
+        Entry new_entry = stepEntry(entry_to_process.value(), zk);
+        new_entry.last_exception_msg = "";
+        new_entry.num_tries = 0;
+        new_entry.update_time = std::time(nullptr);
+        zk->set(new_entry.znode_path, new_entry.toString(), new_entry.version);
     }
     catch (...)
     {
@@ -140,6 +161,7 @@ bool PartMovesBetweenShardsOrchestrator::step()
 
         Entry entry_copy = entry_to_process.value();
         entry_copy.last_exception_msg = getCurrentExceptionMessage(false);
+        entry_copy.num_tries += 1;
         entry_copy.update_time = std::time(nullptr);
         zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
 
@@ -149,276 +171,537 @@ bool PartMovesBetweenShardsOrchestrator::step()
     return true;
 }
 
-void PartMovesBetweenShardsOrchestrator::stepEntry(const Entry & entry, zkutil::ZooKeeperPtr zk)
+PartMovesBetweenShardsOrchestrator::Entry PartMovesBetweenShardsOrchestrator::stepEntry(Entry entry, zkutil::ZooKeeperPtr zk)
 {
     switch (entry.state.value)
     {
-        case EntryState::DONE:
-            break;
-
+        case EntryState::DONE: [[fallthrough]];
         case EntryState::CANCELLED:
-            break;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Can't stepEntry after terminal state. This is a bug.");
 
         case EntryState::TODO:
         {
-            /// State transition.
-            Entry entry_copy = entry;
-            entry_copy.state = EntryState::SYNC_SOURCE;
-            entry_copy.update_time = std::time(nullptr);
-            zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+            if (entry.rollback)
+            {
+                removePins(entry, zk);
+                entry.state = EntryState::CANCELLED;
+                return entry;
+            }
+            /// The forward transition happens implicitly when task is created by `StorageReplicatedMergeTree::movePartitionToShard`.
+            else
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected entry state ({}) in stepEntry. This is a bug.", entry.state.toString());
         }
-        break;
 
         case EntryState::SYNC_SOURCE:
         {
+            if (entry.rollback)
             {
-                /// Log entry.
-                Coordination::Requests ops;
-                ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
-
-                ReplicatedMergeTreeLogEntryData log_entry;
-                log_entry.type = ReplicatedMergeTreeLogEntryData::SYNC_PINNED_PART_UUIDS;
-                log_entry.create_time = std::time(nullptr);
-                log_entry.source_replica = storage.replica_name;
-                ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));
-                ops.emplace_back(zkutil::makeCreateRequest(
-                    zookeeper_path + "/log/log-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
-
-                Coordination::Responses responses;
-                Coordination::Error rc = zk->tryMulti(ops, responses);
-                zkutil::KeeperMultiException::check(rc, ops, responses);
-
-                String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
-                log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
-
-                /// This wait in background schedule pool is useless. It'd be
-                /// better to have some notification which will call `step`
-                /// function when all replicated will finish. TODO.
-                storage.waitForAllReplicasToProcessLogEntry(log_entry, true);
+                entry.state = EntryState::TODO;
+                return entry;
             }
-
+            else
             {
-                /// State transition.
-                Entry entry_copy = entry;
-                entry_copy.state = EntryState::SYNC_DESTINATION;
-                entry_copy.update_time = std::time(nullptr);
-                zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+                ReplicatedMergeTreeLogEntryData sync_source_log_entry;
+
+                String sync_source_log_entry_barrier_path = fs::path(entry.znode_path) / ("log_" + entry.state.toString());
+                Coordination::Stat sync_source_log_entry_stat;
+                String sync_source_log_entry_str;
+                if (zk->tryGet(sync_source_log_entry_barrier_path, sync_source_log_entry_str, &sync_source_log_entry_stat))
+                {
+                    LOG_DEBUG(log, "Log entry was already created will check the existing one.");
+
+                    sync_source_log_entry = *ReplicatedMergeTreeLogEntry::parse(sync_source_log_entry_str, sync_source_log_entry_stat);
+                }
+                else
+                {
+                    /// Log entry.
+                    Coordination::Requests ops;
+                    ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+
+                    sync_source_log_entry.type = ReplicatedMergeTreeLogEntryData::SYNC_PINNED_PART_UUIDS;
+                    sync_source_log_entry.log_entry_id = sync_source_log_entry_barrier_path;
+                    sync_source_log_entry.create_time = std::time(nullptr);
+                    sync_source_log_entry.source_replica = storage.replica_name;
+
+                    ops.emplace_back(zkutil::makeCreateRequest(sync_source_log_entry_barrier_path, sync_source_log_entry.toString(), -1));
+                    ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));
+                    ops.emplace_back(zkutil::makeCreateRequest(
+                        zookeeper_path + "/log/log-", sync_source_log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+
+                    Coordination::Responses responses;
+                    Coordination::Error rc = zk->tryMulti(ops, responses);
+                    zkutil::KeeperMultiException::check(rc, ops, responses);
+
+                    String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
+                    sync_source_log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+
+                    LOG_DEBUG(log, "Pushed log entry: {}", log_znode_path);
+                }
+
+                Strings unwaited = storage.tryWaitForAllReplicasToProcessLogEntry(zookeeper_path, sync_source_log_entry, 1);
+                if (!unwaited.empty())
+                    throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Some replicas haven't processed event: {}, will retry later.", toString(unwaited));
+
+                entry.state = EntryState::SYNC_DESTINATION;
+                return entry;
             }
         }
-        break;
 
         case EntryState::SYNC_DESTINATION:
         {
+            if (entry.rollback)
             {
-                /// Log entry.
-                Coordination::Requests ops;
-                ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
-
-                ReplicatedMergeTreeLogEntryData log_entry;
-                log_entry.type = ReplicatedMergeTreeLogEntryData::SYNC_PINNED_PART_UUIDS;
-                log_entry.create_time = std::time(nullptr);
-                log_entry.source_replica = storage.replica_name;
-                log_entry.source_shard = zookeeper_path;
-
-                ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
-                ops.emplace_back(zkutil::makeCreateRequest(
-                    entry.to_shard + "/log/log-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
-
-                Coordination::Responses responses;
-                Coordination::Error rc = zk->tryMulti(ops, responses);
-                zkutil::KeeperMultiException::check(rc, ops, responses);
-
-                String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
-                log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
-
-                storage.waitForAllTableReplicasToProcessLogEntry(entry.to_shard, log_entry, true);
-            }
-
-            {
-                /// State transition.
                 Entry entry_copy = entry;
-                entry_copy.state = EntryState::DESTINATION_FETCH;
-                entry_copy.update_time = std::time(nullptr);
-                zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+                entry_copy.state = EntryState::SYNC_SOURCE;
+                return entry_copy;
+            }
+            else
+            {
+                ReplicatedMergeTreeLogEntryData sync_destination_log_entry;
+
+                String sync_destination_log_entry_barrier_path = fs::path(entry.znode_path) / ("log_" + entry.state.toString());
+                Coordination::Stat sync_destination_log_entry_stat;
+                String sync_destination_log_entry_str;
+                if (zk->tryGet(sync_destination_log_entry_barrier_path, sync_destination_log_entry_str, &sync_destination_log_entry_stat))
+                {
+                    LOG_DEBUG(log, "Log entry was already created will check the existing one.");
+
+                    sync_destination_log_entry = *ReplicatedMergeTreeLogEntry::parse(sync_destination_log_entry_str, sync_destination_log_entry_stat);
+                }
+                else
+                {
+                    /// Log entry.
+                    Coordination::Requests ops;
+                    ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+
+                    sync_destination_log_entry.type = ReplicatedMergeTreeLogEntryData::SYNC_PINNED_PART_UUIDS;
+                    sync_destination_log_entry.log_entry_id = sync_destination_log_entry_barrier_path;
+                    sync_destination_log_entry.create_time = std::time(nullptr);
+                    sync_destination_log_entry.source_replica = storage.replica_name;
+                    sync_destination_log_entry.source_shard = zookeeper_path;
+
+                    ops.emplace_back(zkutil::makeCreateRequest(sync_destination_log_entry_barrier_path, sync_destination_log_entry.toString(), -1));
+                    ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
+                    ops.emplace_back(zkutil::makeCreateRequest(
+                        entry.to_shard + "/log/log-", sync_destination_log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+
+                    Coordination::Responses responses;
+                    Coordination::Error rc = zk->tryMulti(ops, responses);
+                    zkutil::KeeperMultiException::check(rc, ops, responses);
+
+                    String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
+                    sync_destination_log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+
+                    LOG_DEBUG(log, "Pushed log entry: {}", log_znode_path);
+                }
+
+                Strings unwaited = storage.tryWaitForAllReplicasToProcessLogEntry(entry.to_shard, sync_destination_log_entry, 1);
+                if (!unwaited.empty())
+                    throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Some replicas haven't processed event: {}, will retry later.", toString(unwaited));
+
+                entry.state = EntryState::DESTINATION_FETCH;
+                return entry;
             }
         }
-        break;
 
         case EntryState::DESTINATION_FETCH:
         {
-            /// Make sure table structure doesn't change when there are part movements in progress.
+
+            if (entry.rollback)
             {
-                Coordination::Requests ops;
-                ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+                // TODO(nv): Do we want to cleanup fetched data on the destination?
+                //   Maybe leave it there and make sure a background cleanup will take
+                //   care of it sometime later.
 
-                /// Log entry.
-                ReplicatedMergeTreeLogEntryData log_entry;
-                log_entry.type = ReplicatedMergeTreeLogEntryData::CLONE_PART_FROM_SHARD;
-                log_entry.create_time = std::time(nullptr);
-                log_entry.new_part_name = entry.part_name;
-                log_entry.source_replica = storage.replica_name;
-                log_entry.source_shard = zookeeper_path;
-                ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
-                ops.emplace_back(zkutil::makeCreateRequest(
-                    entry.to_shard + "/log/log-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
-
-                Coordination::Responses responses;
-                Coordination::Error rc = zk->tryMulti(ops, responses);
-                zkutil::KeeperMultiException::check(rc, ops, responses);
-
-                String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
-                log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
-
-                storage.waitForAllTableReplicasToProcessLogEntry(entry.to_shard, log_entry, true);
+                entry.state = EntryState::SYNC_DESTINATION;
+                return entry;
             }
-
+            else
             {
-                /// State transition.
-                Entry entry_copy = entry;
-                entry_copy.state = EntryState::DESTINATION_ATTACH;
-                entry_copy.update_time = std::time(nullptr);
-                zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+                /// Note: Table structure shouldn't be changed while there are part movements in progress.
+
+                ReplicatedMergeTreeLogEntryData fetch_log_entry;
+
+                String fetch_log_entry_barrier_path = fs::path(entry.znode_path) / ("log_" + entry.state.toString());
+                Coordination::Stat fetch_log_entry_stat;
+                String fetch_log_entry_str;
+                if (zk->tryGet(fetch_log_entry_barrier_path, fetch_log_entry_str, &fetch_log_entry_stat))
+                {
+                    LOG_DEBUG(log, "Log entry was already created will check the existing one.");
+
+                    fetch_log_entry = *ReplicatedMergeTreeLogEntry::parse(fetch_log_entry_str, fetch_log_entry_stat);
+                }
+                else
+                {
+                    Coordination::Requests ops;
+                    ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+
+                    fetch_log_entry.type = ReplicatedMergeTreeLogEntryData::CLONE_PART_FROM_SHARD;
+                    fetch_log_entry.log_entry_id = fetch_log_entry_barrier_path;
+                    fetch_log_entry.create_time = std::time(nullptr);
+                    fetch_log_entry.new_part_name = entry.part_name;
+                    fetch_log_entry.source_replica = storage.replica_name;
+                    fetch_log_entry.source_shard = zookeeper_path;
+                    ops.emplace_back(zkutil::makeCreateRequest(fetch_log_entry_barrier_path, fetch_log_entry.toString(), -1));
+                    ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
+                    ops.emplace_back(zkutil::makeCreateRequest(
+                        entry.to_shard + "/log/log-", fetch_log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+
+                    Coordination::Responses responses;
+                    Coordination::Error rc = zk->tryMulti(ops, responses);
+                    zkutil::KeeperMultiException::check(rc, ops, responses);
+
+                    String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
+                    fetch_log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+
+                    LOG_DEBUG(log, "Pushed log entry: {}", log_znode_path);
+                }
+
+                Strings unwaited = storage.tryWaitForAllReplicasToProcessLogEntry(entry.to_shard, fetch_log_entry, 1);
+                if (!unwaited.empty())
+                    throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Some replicas haven't processed event: {}, will retry later.", toString(unwaited));
+
+                entry.state = EntryState::DESTINATION_ATTACH;
+                return entry;
             }
         }
-        break;
 
         case EntryState::DESTINATION_ATTACH:
         {
-            /// There is a chance that attach on destination will fail and this task will be left in the queue forever.
+            String attach_log_entry_barrier_path = fs::path(entry.znode_path) / ("log_" + entry.state.toString());
+
+            if (entry.rollback)
             {
+                Coordination::Stat attach_log_entry_stat;
+                String attach_log_entry_str;
+                if (!zk->tryGet(attach_log_entry_barrier_path, attach_log_entry_str, &attach_log_entry_stat))
+                {
+                    LOG_DEBUG(log, "Log entry for DESTINATION_ATTACH not found. Not sending DROP_RANGE log entry.");
+
+                    // ATTACH_PART wasn't issued, nothing to revert.
+                    entry.state = EntryState::DESTINATION_FETCH;
+                    return entry;
+                }
+                else
+                {
+                    // Need to remove ATTACH_PART from the queue or drop data.
+                    // Similar to `StorageReplicatedMergeTree::dropPart` w/o extra
+                    // checks as we know drop shall be possible.
+                    ReplicatedMergeTreeLogEntryData attach_rollback_log_entry;
+
+                    String attach_rollback_log_entry_barrier_path = fs::path(entry.znode_path) / ("log_" + entry.state.toString() + "_rollback");
+                    Coordination::Stat attach_rollback_log_entry_stat;
+                    String attach_rollback_log_entry_str;
+                    if (zk->tryGet(attach_rollback_log_entry_barrier_path, attach_rollback_log_entry_str, &attach_rollback_log_entry_stat))
+                    {
+                        LOG_DEBUG(log, "Log entry was already created will check the existing one.");
+
+                        attach_rollback_log_entry = *ReplicatedMergeTreeLogEntry::parse(attach_rollback_log_entry_str, attach_rollback_log_entry_stat);
+                    }
+                    else
+                    {
+                        const auto attach_log_entry = ReplicatedMergeTreeLogEntry::parse(attach_log_entry_str, attach_log_entry_stat);
+
+                        Coordination::Requests ops;
+                        ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+
+                        auto drop_part_info = MergeTreePartInfo::fromPartName(attach_log_entry->new_part_name, storage.format_version);
+
+                        storage.getClearBlocksInPartitionOps(
+                            ops, *zk, drop_part_info.partition_id, drop_part_info.min_block, drop_part_info.max_block);
+                        size_t clear_block_ops_size = ops.size();
+
+                        attach_rollback_log_entry.type = ReplicatedMergeTreeLogEntryData::DROP_RANGE;
+                        attach_rollback_log_entry.log_entry_id = attach_rollback_log_entry_barrier_path;
+                        attach_rollback_log_entry.source_replica = storage.replica_name;
+                        attach_rollback_log_entry.source_shard = zookeeper_path;
+
+                        attach_rollback_log_entry.new_part_name = getPartNamePossiblyFake(storage.format_version, drop_part_info);
+                        attach_rollback_log_entry.create_time = time(nullptr);
+
+                        ops.emplace_back(zkutil::makeCreateRequest(attach_rollback_log_entry_barrier_path, attach_rollback_log_entry.toString(), -1));
+                        ops.emplace_back(zkutil::makeCreateRequest(
+                            entry.to_shard + "/log/log-", attach_rollback_log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+                        ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
+                        Coordination::Responses responses;
+                        Coordination::Error rc = zk->tryMulti(ops, responses);
+                        zkutil::KeeperMultiException::check(rc, ops, responses);
+
+                        String log_znode_path
+                            = dynamic_cast<const Coordination::CreateResponse &>(*responses[clear_block_ops_size]).path_created;
+                        attach_rollback_log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+
+                        LOG_DEBUG(log, "Pushed log entry: {}", log_znode_path);
+                    }
+
+                    Strings unwaited = storage.tryWaitForAllReplicasToProcessLogEntry(entry.to_shard, attach_rollback_log_entry, 1);
+                    if (!unwaited.empty())
+                        throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Some replicas haven't processed event: {}, will retry later.", toString(unwaited));
+
+                    entry.state = EntryState::DESTINATION_FETCH;
+                    return entry;
+                }
+            }
+            else
+            {
+                /// There is a chance that attach on destination will fail and this task will be left in the queue forever.
+
                 Coordination::Requests ops;
                 ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
 
                 auto part = storage.getActiveContainingPart(entry.part_name);
+
                 /// Allocating block number in other replicas zookeeper path
                 /// TODO Maybe we can do better.
-                auto block_number_lock = storage.allocateBlockNumber(part->info.partition_id, zk, "", entry.to_shard);
-                auto block_number = block_number_lock->getNumber();
+                auto block_number_lock = storage.allocateBlockNumber(part->info.partition_id, zk, attach_log_entry_barrier_path, entry.to_shard);
 
-                auto part_info = part->info;
-                part_info.min_block = block_number;
-                part_info.max_block = block_number;
-                part_info.level = 0;
-                part_info.mutation = 0;
-
-                /// Attach log entry (all replicas already fetched part)
                 ReplicatedMergeTreeLogEntryData log_entry;
-                log_entry.type = ReplicatedMergeTreeLogEntryData::ATTACH_PART;
-                log_entry.part_checksum = part->checksums.getTotalChecksumHex();
-                log_entry.create_time = std::time(nullptr);
-                log_entry.new_part_name = part_info.getPartName();
-                ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
-                ops.emplace_back(zkutil::makeCreateRequest(
-                    entry.to_shard + "/log/log-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
 
-                Coordination::Responses responses;
-                Coordination::Error rc = zk->tryMulti(ops, responses);
-                zkutil::KeeperMultiException::check(rc, ops, responses);
+                if (block_number_lock)
+                {
+                    auto block_number = block_number_lock->getNumber();
 
-                String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
-                log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+                    auto part_info = part->info;
+                    part_info.min_block = block_number;
+                    part_info.max_block = block_number;
+                    part_info.level = 0;
+                    part_info.mutation = 0;
 
-                storage.waitForAllTableReplicasToProcessLogEntry(entry.to_shard, log_entry, true);
-            }
+                    /// Attach log entry (all replicas already fetched part)
+                    log_entry.type = ReplicatedMergeTreeLogEntryData::ATTACH_PART;
+                    log_entry.log_entry_id = attach_log_entry_barrier_path;
+                    log_entry.part_checksum = part->checksums.getTotalChecksumHex();
+                    log_entry.create_time = std::time(nullptr);
+                    log_entry.new_part_name = part_info.getPartName();
 
-            {
-                /// State transition.
-                Entry entry_copy = entry;
-                entry_copy.state = EntryState::SOURCE_DROP_PRE_DELAY;
-                entry_copy.update_time = std::time(nullptr);
-                zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+                    ops.emplace_back(zkutil::makeCreateRequest(attach_log_entry_barrier_path, log_entry.toString(), -1));
+                    ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/log", "", -1));
+                    ops.emplace_back(zkutil::makeCreateRequest(
+                        entry.to_shard + "/log/log-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+
+                    Coordination::Responses responses;
+                    Coordination::Error rc = zk->tryMulti(ops, responses);
+                    zkutil::KeeperMultiException::check(rc, ops, responses);
+
+                    String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
+                    log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+
+                    LOG_DEBUG(log, "Pushed log entry: {}", log_znode_path);
+                }
+                else
+                {
+                    LOG_DEBUG(log, "Log entry was already created will check the existing one.");
+
+                    Coordination::Stat stat;
+                    String log_entry_str = zk->get(attach_log_entry_barrier_path, &stat);
+                    log_entry = *ReplicatedMergeTreeLogEntry::parse(log_entry_str, stat);
+                }
+
+                Strings unwaited = storage.tryWaitForAllReplicasToProcessLogEntry(entry.to_shard, log_entry, 1);
+                if (!unwaited.empty())
+                    throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Some replicas haven't processed event: {}, will retry later.", toString(unwaited));
+
+
+                entry.dst_part_name = log_entry.new_part_name;
+                entry.state = EntryState::SOURCE_DROP_PRE_DELAY;
+                return entry;
             }
         }
-        break;
 
         case EntryState::SOURCE_DROP_PRE_DELAY:
         {
-            std::this_thread::sleep_for(std::chrono::seconds(storage.getSettings()->part_moves_between_shards_delay_seconds));
-
-            /// State transition.
-            Entry entry_copy = entry;
-            entry_copy.state = EntryState::SOURCE_DROP;
-            entry_copy.update_time = std::time(nullptr);
-            zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+            if (entry.rollback)
+            {
+                entry.state = EntryState::DESTINATION_ATTACH;
+                return entry;
+            }
+            else
+            {
+                std::this_thread::sleep_for(std::chrono::seconds(storage.getSettings()->part_moves_between_shards_delay_seconds));
+                entry.state = EntryState::SOURCE_DROP;
+                return entry;
+            }
         }
-        break;
 
         case EntryState::SOURCE_DROP:
         {
+            if (entry.rollback)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "It is not possible to rollback from this state. This is a bug.");
+            else
             {
-                ReplicatedMergeTreeLogEntry log_entry;
-                if (storage.dropPartImpl(zk, entry.part_name, log_entry, false, false))
-                    storage.waitForAllReplicasToProcessLogEntry(log_entry, true);
-            }
+                // Can't use dropPartImpl directly as we need additional zk ops to remember the log entry
+                // for subsequent retries.
 
-            {
-                /// State transition.
-                Entry entry_copy = entry;
-                entry_copy.state = EntryState::SOURCE_DROP_POST_DELAY;
-                entry_copy.update_time = std::time(nullptr);
-                zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+                ReplicatedMergeTreeLogEntryData source_drop_log_entry;
+
+                String source_drop_log_entry_barrier_path = fs::path(entry.znode_path) / ("log_" + entry.state.toString());
+                Coordination::Stat source_drop_log_entry_stat;
+                String source_drop_log_entry_str;
+                if (zk->tryGet(source_drop_log_entry_barrier_path, source_drop_log_entry_str, &source_drop_log_entry_stat))
+                {
+                    LOG_DEBUG(log, "Log entry was already created will check the existing one.");
+
+                    source_drop_log_entry = *ReplicatedMergeTreeLogEntry::parse(source_drop_log_entry_str, source_drop_log_entry_stat);
+                }
+                else
+                {
+                    auto source_drop_part_info = MergeTreePartInfo::fromPartName(entry.part_name, storage.format_version);
+
+                    Coordination::Requests ops;
+                    ops.emplace_back(zkutil::makeCheckRequest(entry.znode_path, entry.version));
+
+                    storage.getClearBlocksInPartitionOps(ops, *zk, source_drop_part_info.partition_id, source_drop_part_info.min_block, source_drop_part_info.max_block);
+
+                    source_drop_log_entry.type = ReplicatedMergeTreeLogEntryData::DROP_RANGE;
+                    source_drop_log_entry.log_entry_id = source_drop_log_entry_barrier_path;
+                    source_drop_log_entry.create_time = std::time(nullptr);
+                    source_drop_log_entry.new_part_name = getPartNamePossiblyFake(storage.format_version, source_drop_part_info);
+                    source_drop_log_entry.source_replica = storage.replica_name;
+
+                    ops.emplace_back(zkutil::makeCreateRequest(source_drop_log_entry_barrier_path, source_drop_log_entry.toString(), -1));
+                    ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/log", "", -1));
+                    ops.emplace_back(zkutil::makeCreateRequest(
+                        zookeeper_path + "/log/log-", source_drop_log_entry.toString(), zkutil::CreateMode::PersistentSequential));
+
+                    Coordination::Responses responses;
+                    Coordination::Error rc = zk->tryMulti(ops, responses);
+                    zkutil::KeeperMultiException::check(rc, ops, responses);
+
+                    String log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
+                    source_drop_log_entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
+
+                    LOG_DEBUG(log, "Pushed log entry: {}", log_znode_path);
+                }
+
+                Strings unwaited = storage.tryWaitForAllReplicasToProcessLogEntry(zookeeper_path, source_drop_log_entry, 1);
+                if (!unwaited.empty())
+                    throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Some replicas haven't processed event: {}, will retry later.", toString(unwaited));
+
+                entry.state = EntryState::SOURCE_DROP_POST_DELAY;
+                return entry;
             }
         }
-        break;
 
         case EntryState::SOURCE_DROP_POST_DELAY:
         {
-            std::this_thread::sleep_for(std::chrono::seconds(storage.getSettings()->part_moves_between_shards_delay_seconds));
-
-            /// State transition.
-            Entry entry_copy = entry;
-            entry_copy.state = EntryState::REMOVE_UUID_PIN;
-            entry_copy.update_time = std::time(nullptr);
-            zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
+            if (entry.rollback)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "It is not possible to rollback from this state. This is a bug.");
+            else
+            {
+                std::this_thread::sleep_for(std::chrono::seconds(storage.getSettings()->part_moves_between_shards_delay_seconds));
+                entry.state = EntryState::REMOVE_UUID_PIN;
+                return entry;
+            }
         }
-        break;
 
         case EntryState::REMOVE_UUID_PIN:
         {
+            if (entry.rollback)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "It is not possible to rollback from this state. This is a bug.");
+            else
             {
-                PinnedPartUUIDs src_pins;
-                PinnedPartUUIDs dst_pins;
+                removePins(entry, zk);
 
-                {
-                    String s = zk->get(zookeeper_path + "/pinned_part_uuids", &src_pins.stat);
-                    src_pins.fromString(s);
-                }
-
-                {
-                    String s = zk->get(entry.to_shard + "/pinned_part_uuids", &dst_pins.stat);
-                    dst_pins.fromString(s);
-                }
-
-                src_pins.part_uuids.erase(entry.part_uuid);
-                dst_pins.part_uuids.erase(entry.part_uuid);
-
-                Coordination::Requests ops;
-                ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/pinned_part_uuids", src_pins.toString(), src_pins.stat.version));
-                ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/pinned_part_uuids", dst_pins.toString(), dst_pins.stat.version));
-
-                zk->multi(ops);
+                entry.state = EntryState::DONE;
+                return entry;
             }
-
-            /// State transition.
-            Entry entry_copy = entry;
-            entry_copy.state = EntryState::DONE;
-            entry_copy.update_time = std::time(nullptr);
-            zk->set(entry_copy.znode_path, entry_copy.toString(), entry_copy.version);
         }
-        break;
+    }
+
+    __builtin_unreachable();
+}
+
+void PartMovesBetweenShardsOrchestrator::removePins(const Entry & entry, zkutil::ZooKeeperPtr zk)
+{
+    PinnedPartUUIDs src_pins;
+    PinnedPartUUIDs dst_pins;
+
+    {
+        String s = zk->get(zookeeper_path + "/pinned_part_uuids", &src_pins.stat);
+        src_pins.fromString(s);
+    }
+
+    {
+        String s = zk->get(entry.to_shard + "/pinned_part_uuids", &dst_pins.stat);
+        dst_pins.fromString(s);
+    }
+
+    dst_pins.part_uuids.erase(entry.part_uuid);
+    src_pins.part_uuids.erase(entry.part_uuid);
+
+    Coordination::Requests ops;
+    ops.emplace_back(zkutil::makeSetRequest(zookeeper_path + "/pinned_part_uuids", src_pins.toString(), src_pins.stat.version));
+    ops.emplace_back(zkutil::makeSetRequest(entry.to_shard + "/pinned_part_uuids", dst_pins.toString(), dst_pins.stat.version));
+
+    zk->multi(ops);
+}
+
+CancellationCode PartMovesBetweenShardsOrchestrator::killPartMoveToShard(const UUID & task_uuid)
+{
+    while (true)
+    {
+        auto entry = getEntryByUUID(task_uuid);
+
+        // If the task is in this state or any that follows it is too late to rollback
+        // since we can't be sure if the source data still exists.
+        auto not_possible_to_rollback_after_state = EntryState(EntryState::SOURCE_DROP);
+        if (entry.state.value >= not_possible_to_rollback_after_state.value)
+        {
+            LOG_DEBUG(log, "Can't kill move part between shards entry {} ({}) after state {}. Current state: {}.",
+                      toString(entry.task_uuid), entry.znode_name, not_possible_to_rollback_after_state.toString(), entry.state.toString());
+            return CancellationCode::CancelCannotBeSent;
+        }
+
+        LOG_TRACE(log, "Will try to mark move part between shards entry {} ({}) for rollback.",
+                  toString(entry.task_uuid), entry.znode_name);
+
+        auto zk = storage.getZooKeeper();
+
+        // State transition.
+        entry.rollback = true;
+        entry.update_time = std::time(nullptr);
+        entry.num_tries = 0;
+        entry.last_exception_msg = "";
+
+        auto code = zk->trySet(entry.znode_path, entry.toString(), entry.version);
+        if (code == Coordination::Error::ZOK)
+        {
+            // Orchestrator will process it in background.
+            return CancellationCode::CancelSent;
+        }
+        else if (code == Coordination::Error::ZBADVERSION)
+        {
+            /// Node was updated meanwhile. We must re-read it and repeat all the actions.
+            continue;
+        }
+        else
+            throw Coordination::Exception(code, entry.znode_path);
     }
 }
 
-std::vector<PartMovesBetweenShardsOrchestrator::Entry> PartMovesBetweenShardsOrchestrator::getEntries() const
+std::vector<PartMovesBetweenShardsOrchestrator::Entry> PartMovesBetweenShardsOrchestrator::getEntries()
 {
+    // Force sync. Also catches parsing errors.
+    syncStateFromZK();
+
     std::lock_guard lock(state_mutex);
 
-    std::vector<Entry> res;
+    return entries;
+}
 
-    for (const auto & e : entries)
-        res.push_back(e.second);
+PartMovesBetweenShardsOrchestrator::Entry PartMovesBetweenShardsOrchestrator::getEntryByUUID(const UUID & task_uuid)
+{
+    /// Need latest state in case user tries to kill a move observed on a different replica.
+    syncStateFromZK();
 
-    return res;
+    std::lock_guard lock(state_mutex);
+    for (auto const & entry : entries)
+    {
+        if (entry.task_uuid == task_uuid)
+            return entry;
+    }
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Task with id {} not found", toString(task_uuid));
 }
 
 String PartMovesBetweenShardsOrchestrator::Entry::toString() const
@@ -431,12 +714,19 @@ String PartMovesBetweenShardsOrchestrator::Entry::toString() const
     json.set(JSON_KEY_PART_NAME, part_name);
     json.set(JSON_KEY_PART_UUID, DB::toString(part_uuid));
     json.set(JSON_KEY_TO_SHARD, to_shard);
+    json.set(JSON_KEY_DST_PART_NAME, dst_part_name);
     json.set(JSON_KEY_STATE, state.toString());
+    json.set(JSON_KEY_ROLLBACK, DB::toString(rollback));
     json.set(JSON_KEY_LAST_EX_MSG, last_exception_msg);
+    json.set(JSON_KEY_NUM_TRIES, DB::toString(num_tries));
 
     std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     oss.exceptions(std::ios::failbit);
-    json.stringify(oss);
+
+    // Always escape unicode to make last_exception_msg json safe.
+    // It may contain random binary data when exception is a parsing error
+    // of unexpected contents.
+    Poco::JSON::Stringifier::stringify(json, oss, 0, -1, Poco::JSON_WRAP_STRINGS | Poco::JSON_ESCAPE_UNICODE);
 
     return oss.str();
 }
@@ -452,8 +742,11 @@ void PartMovesBetweenShardsOrchestrator::Entry::fromString(const String & buf)
     part_name = json->getValue<std::string>(JSON_KEY_PART_NAME);
     part_uuid = parseFromString<UUID>(json->getValue<std::string>(JSON_KEY_PART_UUID));
     to_shard = json->getValue<std::string>(JSON_KEY_TO_SHARD);
+    dst_part_name = json->getValue<std::string>(JSON_KEY_DST_PART_NAME);
     state.value = EntryState::fromString(json->getValue<std::string>(JSON_KEY_STATE));
+    rollback = json->getValue<bool>(JSON_KEY_ROLLBACK);
     last_exception_msg = json->getValue<std::string>(JSON_KEY_LAST_EX_MSG);
+    num_tries = json->getValue<UInt64>(JSON_KEY_NUM_TRIES);
 }
 
 }
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
index 9e54ae8a8ed..14ef91c0777 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <vector>
-#include <common/logger_useful.h>
-#include <common/types.h>
+#include <base/logger_useful.h>
+#include <base/types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Core/UUID.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/CancellationCode.h>
 
 namespace DB
 {
@@ -18,14 +19,37 @@ namespace ErrorCodes
 
 class StorageReplicatedMergeTree;
 
-/// Cross shard part movement workflow orchestration.
+/**
+ * Cross shard part movement workflow orchestration.
+ *
+ * TODO(nv):
+ *  * Usage of `format_version` when acting on the behalf of the remote shard.
+ *      There needs to be sort of an API to coordinate with remote replicas.
+ *  * Only one movement at a time can be coordinated. This can easily be fixed
+ *      by cycling through different tasks and checking their status with a
+ *      priority queue and back-off for failing tasks
+ *      `min(backoff * num_tries, max_backoff)`.
+ */
 class PartMovesBetweenShardsOrchestrator
 {
 public:
     struct EntryState
     {
+        // State transitions are linear. When a kill query is issued a rollback
+        // flag is set and transitions order is reversed.
+        //
+        // SOURCE_DROP is a critical state after which rollback is not possible
+        // and we must ensure that the task can always succeed after that.
+        //
+        // Similar for rollback. It should be always possible to rollback before
+        // SOURCE_DROP state and it should terminate.
+        //
+        // Note: This fragile. If you change the states please add entry to
+        // changelog about forward/backward compatibility. Better not to have
+        // any active move tasks while doing upgrade/downgrade operations.
         enum Value
         {
+            CANCELLED,
             TODO,
             SYNC_SOURCE,
             SYNC_DESTINATION,
@@ -36,7 +60,6 @@ public:
             SOURCE_DROP_POST_DELAY,
             REMOVE_UUID_PIN,
             DONE,
-            CANCELLED,
         };
 
         EntryState(): value(TODO) {}
@@ -95,10 +118,14 @@ public:
         String part_name;
         UUID part_uuid;
         String to_shard;
+        String dst_part_name;
 
         EntryState state;
+        bool rollback = false;
 
+        /// Reset on successful transitions.
         String last_exception_msg;
+        UInt64 num_tries = 0;
 
         String znode_name;
 
@@ -120,27 +147,31 @@ private:
     static constexpr auto JSON_KEY_PART_NAME = "part_name";
     static constexpr auto JSON_KEY_PART_UUID = "part_uuid";
     static constexpr auto JSON_KEY_TO_SHARD = "to_shard";
+    static constexpr auto JSON_KEY_DST_PART_NAME = "dst_part_name";
     static constexpr auto JSON_KEY_STATE = "state";
+    static constexpr auto JSON_KEY_ROLLBACK = "rollback";
     static constexpr auto JSON_KEY_LAST_EX_MSG = "last_exception";
+    static constexpr auto JSON_KEY_NUM_TRIES = "num_tries";
 
 public:
-    PartMovesBetweenShardsOrchestrator(StorageReplicatedMergeTree & storage_);
+    explicit PartMovesBetweenShardsOrchestrator(StorageReplicatedMergeTree & storage_);
 
     void start() { task->activateAndSchedule(); }
     void wakeup() { task->schedule(); }
     void shutdown();
 
-    void fetchStateFromZK();
+    CancellationCode killPartMoveToShard(const UUID & task_uuid);
 
-    /// We could have one thread per Entry and worry about concurrency issues.
-    /// Or we could have a single thread trying to run one step at a time.
-    bool step();
-
-    std::vector<Entry> getEntries() const;
+    std::vector<Entry> getEntries();
 
 private:
     void run();
-    void stepEntry(const Entry & entry, zkutil::ZooKeeperPtr zk);
+    bool step();
+    Entry stepEntry(Entry entry, zkutil::ZooKeeperPtr zk);
+
+    Entry getEntryByUUID(const UUID & task_uuid);
+    void removePins(const Entry & entry, zkutil::ZooKeeperPtr zk);
+    void syncStateFromZK();
 
 private:
     StorageReplicatedMergeTree & storage;
@@ -153,7 +184,7 @@ private:
     BackgroundSchedulePool::TaskHolder task;
 
     mutable std::mutex state_mutex;
-    std::map<String, Entry> entries;
+    std::vector<Entry> entries;
 
 public:
     String entries_znode_path;
diff --git a/src/Storages/MergeTree/ReplicatedFetchList.cpp b/src/Storages/MergeTree/ReplicatedFetchList.cpp
index 6d4451ad3e0..7c33e11f9a8 100644
--- a/src/Storages/MergeTree/ReplicatedFetchList.cpp
+++ b/src/Storages/MergeTree/ReplicatedFetchList.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/ReplicatedFetchList.h>
 #include <Common/CurrentMetrics.h>
-#include <common/getThreadId.h>
+#include <base/getThreadId.h>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
new file mode 100644
index 00000000000..5fe7de70a20
--- /dev/null
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
@@ -0,0 +1,241 @@
+#include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
+
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_REPLICA_HAS_PART;
+    extern const int LOGICAL_ERROR;
+    extern const int ABORTED;
+    extern const int PART_IS_TEMPORARILY_LOCKED;
+}
+
+StorageID ReplicatedMergeMutateTaskBase::getStorageID()
+{
+    return storage.getStorageID();
+}
+
+void ReplicatedMergeMutateTaskBase::onCompleted()
+{
+    bool successfully_executed = state == State::SUCCESS;
+    task_result_callback(successfully_executed);
+}
+
+
+bool ReplicatedMergeMutateTaskBase::executeStep()
+{
+    std::exception_ptr saved_exception;
+
+    try
+    {
+        /// We don't have any backoff for failed entries
+        /// we just count amount of tries for each of them.
+
+        try
+        {
+            return executeImpl();
+        }
+        catch (const Exception & e)
+        {
+            if (e.code() == ErrorCodes::NO_REPLICA_HAS_PART)
+            {
+                /// If no one has the right part, probably not all replicas work; We will not write to log with Error level.
+                LOG_INFO(log, e.displayText());
+            }
+            else if (e.code() == ErrorCodes::ABORTED)
+            {
+                /// Interrupted merge or downloading a part is not an error.
+                LOG_INFO(log, e.message());
+            }
+            else if (e.code() == ErrorCodes::PART_IS_TEMPORARILY_LOCKED)
+            {
+                /// Part cannot be added temporarily
+                LOG_INFO(log, e.displayText());
+                storage.cleanup_thread.wakeup();
+            }
+            else
+                tryLogCurrentException(log, __PRETTY_FUNCTION__);
+
+            /** This exception will be written to the queue element, and it can be looked up using `system.replication_queue` table.
+                 * The thread that performs this action will sleep a few seconds after the exception.
+                 * See `queue.processEntry` function.
+                 */
+            throw;
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, __PRETTY_FUNCTION__);
+            throw;
+        }
+
+    }
+    catch (...)
+    {
+        saved_exception = std::current_exception();
+    }
+
+
+    if (saved_exception)
+    {
+        std::lock_guard lock(storage.queue.state_mutex);
+
+        auto & log_entry = selected_entry->log_entry;
+
+        log_entry->exception = saved_exception;
+
+        if (log_entry->type == ReplicatedMergeTreeLogEntryData::MUTATE_PART)
+        {
+            /// Record the exception in the system.mutations table.
+            Int64 result_data_version = MergeTreePartInfo::fromPartName(log_entry->new_part_name, storage.queue.format_version)
+                .getDataVersion();
+            auto source_part_info = MergeTreePartInfo::fromPartName(
+                log_entry->source_parts.at(0), storage.queue.format_version);
+
+            auto in_partition = storage.queue.mutations_by_partition.find(source_part_info.partition_id);
+            if (in_partition != storage.queue.mutations_by_partition.end())
+            {
+                auto mutations_begin_it = in_partition->second.upper_bound(source_part_info.getDataVersion());
+                auto mutations_end_it = in_partition->second.upper_bound(result_data_version);
+                for (auto it = mutations_begin_it; it != mutations_end_it; ++it)
+                {
+                    ReplicatedMergeTreeQueue::MutationStatus & status = *it->second;
+                    status.latest_failed_part = log_entry->source_parts.at(0);
+                    status.latest_failed_part_info = source_part_info;
+                    status.latest_fail_time = time(nullptr);
+                    status.latest_fail_reason = getExceptionMessage(saved_exception, false);
+                }
+            }
+        }
+
+    }
+
+    return false;
+}
+
+
+bool ReplicatedMergeMutateTaskBase::executeImpl()
+{
+    MemoryTrackerThreadSwitcherPtr switcher;
+    if (merge_mutate_entry)
+        switcher = std::make_unique<MemoryTrackerThreadSwitcher>(*merge_mutate_entry);
+
+    auto remove_processed_entry = [&] () -> bool
+    {
+        try
+        {
+            storage.queue.removeProcessedEntry(storage.getZooKeeper(), selected_entry->log_entry);
+            state = State::SUCCESS;
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+
+        return false;
+    };
+
+
+    auto execute_fetch = [&] () -> bool
+    {
+        if (storage.executeFetch(entry))
+            return remove_processed_entry();
+
+        return false;
+    };
+
+
+    switch (state)
+    {
+        case State::NEED_PREPARE :
+        {
+            {
+                auto res = checkExistingPart();
+                /// Depending on condition there is no need to execute a merge
+                if (res == CheckExistingPartResult::PART_EXISTS)
+                    return remove_processed_entry();
+            }
+
+            bool res = false;
+            std::tie(res, part_log_writer) = prepare();
+
+            /// Avoid resheduling, execute fetch here, in the same thread.
+            if (!res)
+                return execute_fetch();
+
+            state = State::NEED_EXECUTE_INNER_MERGE;
+            return true;
+        }
+        case State::NEED_EXECUTE_INNER_MERGE :
+        {
+            try
+            {
+                if (!executeInnerTask())
+                {
+                    state = State::NEED_FINALIZE;
+                    return true;
+                }
+            }
+            catch (...)
+            {
+                if (part_log_writer)
+                    part_log_writer(ExecutionStatus::fromCurrentException());
+                throw;
+            }
+
+            return true;
+        }
+        case State::NEED_FINALIZE :
+        {
+            try
+            {
+                if (!finalize(part_log_writer))
+                    return execute_fetch();
+            }
+            catch (...)
+            {
+                if (part_log_writer)
+                    part_log_writer(ExecutionStatus::fromCurrentException());
+                throw;
+            }
+
+            return remove_processed_entry();
+        }
+        case State::SUCCESS :
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Do not call execute on previously succeeded task");
+        }
+    }
+    return false;
+}
+
+
+ReplicatedMergeMutateTaskBase::CheckExistingPartResult ReplicatedMergeMutateTaskBase::checkExistingPart()
+{
+    /// If we already have this part or a part covering it, we do not need to do anything.
+    /// The part may be still in the PreCommitted -> Committed transition so we first search
+    /// among PreCommitted parts to definitely find the desired part if it exists.
+    MergeTreeData::DataPartPtr existing_part = storage.getPartIfExists(entry.new_part_name, {MergeTreeDataPartState::PreCommitted});
+
+    if (!existing_part)
+        existing_part = storage.getActiveContainingPart(entry.new_part_name);
+
+    /// Even if the part is local, it (in exceptional cases) may not be in ZooKeeper. Let's check that it is there.
+    if (existing_part && storage.getZooKeeper()->exists(fs::path(storage.replica_path) / "parts" / existing_part->name))
+    {
+        LOG_DEBUG(log, "Skipping action for part {} because part {} already exists.", entry.new_part_name, existing_part->name);
+
+        /// We will exit from all the execution process
+        return CheckExistingPartResult::PART_EXISTS;
+    }
+
+
+    return CheckExistingPartResult::OK;
+}
+
+
+}
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
new file mode 100644
index 00000000000..ed529c43a7d
--- /dev/null
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
@@ -0,0 +1,80 @@
+#pragma once
+
+#include <base/logger_useful.h>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+
+namespace DB
+{
+
+class StorageReplicatedMergeTree;
+
+/**
+ * This is used as a base of MergeFromLogEntryTask and MutateFromLogEntryTaskBase
+ */
+class ReplicatedMergeMutateTaskBase : public IExecutableTask
+{
+public:
+    template <class Callback>
+    ReplicatedMergeMutateTaskBase(
+        Poco::Logger * log_,
+        StorageReplicatedMergeTree & storage_,
+        ReplicatedMergeTreeQueue::SelectedEntryPtr & selected_entry_,
+        Callback && task_result_callback_)
+        : selected_entry(selected_entry_)
+        , entry(*selected_entry->log_entry)
+        , log(log_)
+        , storage(storage_)
+        /// This is needed to ask an asssignee to assign a new merge/mutate operation
+        /// It takes bool argument and true means that current task is successfully executed.
+        , task_result_callback(task_result_callback_) {}
+
+    ~ReplicatedMergeMutateTaskBase() override = default;
+    void onCompleted() override;
+    StorageID getStorageID() override;
+    bool executeStep() override;
+
+protected:
+    using PartLogWriter =  std::function<void(const ExecutionStatus &)>;
+
+    virtual std::pair<bool, PartLogWriter> prepare() = 0;
+    virtual bool finalize(ReplicatedMergeMutateTaskBase::PartLogWriter write_part_log) = 0;
+
+    /// Will execute a part of inner MergeTask or MutateTask
+    virtual bool executeInnerTask() = 0;
+
+    /// This is important not to execute the same mutation in parallel
+    /// selected_entry is a RAII class, so the time of living must be the same as for the whole task
+    ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry;
+    ReplicatedMergeTreeLogEntry & entry;
+    MergeList::EntryPtr merge_mutate_entry{nullptr};
+    Poco::Logger * log;
+    StorageReplicatedMergeTree & storage;
+
+private:
+
+    enum class CheckExistingPartResult
+    {
+        PART_EXISTS,
+        OK
+    };
+
+    CheckExistingPartResult checkExistingPart();
+    bool executeImpl() ;
+
+    enum class State
+    {
+        NEED_PREPARE,
+        NEED_EXECUTE_INNER_MERGE,
+        NEED_FINALIZE,
+
+        SUCCESS
+    };
+
+    PartLogWriter part_log_writer{};
+    State state{State::NEED_PREPARE};
+    IExecutableTask::TaskResultCallback task_result_callback;
+};
+
+}
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h b/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
index 8e7ab0c69fe..5382b572b81 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 06856c73888..5731092f2a8 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -62,7 +62,7 @@ void ReplicatedMergeTreeCleanupThread::iterate()
         /// Both use relative_data_path which changes during rename, so we
         /// do it under share lock
         storage.clearOldWriteAheadLogs();
-        storage.clearOldTemporaryDirectories(storage.getSettings()->temporary_directories_lifetime.totalSeconds());
+        storage.clearOldTemporaryDirectories(storage.merger_mutator, storage.getSettings()->temporary_directories_lifetime.totalSeconds());
     }
 
     /// This is loose condition: no problem if we actually had lost leadership at this moment
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
index 939a40db8c8..509b52ec07f 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Common/ZooKeeper/Types.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/randomSeed.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <thread>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index 18e90952721..89515b863ca 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -26,6 +26,7 @@ enum FormatVersion : UInt8
     FORMAT_WITH_DEDUPLICATE = 4,
     FORMAT_WITH_UUID = 5,
     FORMAT_WITH_DEDUPLICATE_BY_COLUMNS = 6,
+    FORMAT_WITH_LOG_ENTRY_ID = 7,
 
     FORMAT_LAST
 };
@@ -43,11 +44,17 @@ void ReplicatedMergeTreeLogEntryData::writeText(WriteBuffer & out) const
     if (new_part_uuid != UUIDHelpers::Nil)
         format_version = std::max<UInt8>(format_version, FORMAT_WITH_UUID);
 
+    if (!log_entry_id.empty())
+        format_version = std::max<UInt8>(format_version, FORMAT_WITH_LOG_ENTRY_ID);
+
     out << "format version: " << format_version << "\n"
         << "create_time: " << LocalDateTime(create_time ? create_time : time(nullptr)) << "\n"
         << "source replica: " << source_replica << '\n'
         << "block_id: " << escape << block_id << '\n';
 
+    if (format_version >= FORMAT_WITH_LOG_ENTRY_ID)
+        out << "log_entry_id: " << escape << log_entry_id << '\n';
+
     switch (type)
     {
         case GET_PART:
@@ -192,6 +199,9 @@ void ReplicatedMergeTreeLogEntryData::readText(ReadBuffer & in)
         in >> "block_id: " >> escape >> block_id >> "\n";
     }
 
+    if (format_version >= FORMAT_WITH_LOG_ENTRY_ID)
+        in >> "log_entry_id: " >> escape >> log_entry_id >> "\n";
+
     in >> type_str >> "\n";
 
     bool trailing_newline_found = false;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index 3752c9deb8f..4d8f319c94a 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -2,7 +2,7 @@
 
 #include <Common/Exception.h>
 #include <Common/ZooKeeper/Types.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Storages/MergeTree/MergeTreeDataPartType.h>
 #include <Storages/MergeTree/MergeType.h>
@@ -77,6 +77,7 @@ struct ReplicatedMergeTreeLogEntryData
     String toString() const;
 
     String znode_name;
+    String log_entry_id;
 
     Type type = EMPTY;
     String source_replica; /// Empty string means that this entry was added to the queue immediately, and not copied from the log.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
index 13e05681fd9..db931e771cf 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
@@ -3,7 +3,7 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 
 
-#include <common/types.h>
+#include <base/types.h>
 #include <optional>
 #include <mutex>
 #include <city.h>
@@ -144,9 +144,14 @@ void ReplicatedMergeTreeMergeStrategyPicker::refreshState()
 
     if (current_replica_index_tmp < 0 || active_replicas_tmp.size() < 2)
     {
-        LOG_WARNING(storage.log, "Can't find current replica in the active replicas list, or too few active replicas to use execute_merges_on_single_replica_time_threshold!");
-        /// we can reset the settings w/o lock (it's atomic)
-        execute_merges_on_single_replica_time_threshold = 0;
+        if (execute_merges_on_single_replica_time_threshold > 0)
+        {
+            LOG_WARNING(storage.log, "Can't find current replica in the active replicas list, or too few active replicas to use 'execute_merges_on_single_replica_time_threshold'");
+            /// we can reset the settings w/o lock (it's atomic)
+            execute_merges_on_single_replica_time_threshold = 0;
+        }
+        /// default value of remote_fs_execute_merges_on_single_replica_time_threshold is not 0
+        /// so we write no warning in log here
         remote_fs_execute_merges_on_single_replica_time_threshold = 0;
         return;
     }
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
index f6a19173f77..ca5ec601a99 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMergeStrategyPicker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <optional>
 #include <mutex>
 #include <vector>
@@ -58,7 +58,6 @@ public:
 
     /// returns the replica name
     /// and it's not current replica should do the merge
-    /// used in shouldExecuteLogEntry and in tryExecuteMerge
     std::optional<String> pickReplicaToExecuteMerge(const ReplicatedMergeTreeLogEntryData & entry);
 
     /// checks (in zookeeper) if the picked replica finished the merge
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
index 6229b13c47f..e1c7bcb9042 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeMutationEntry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Exception.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteHelpers.h>
 #include <Storages/MutationCommands.h>
 #include <map>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index 35a011a4a58..8d3cb146990 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -67,6 +67,29 @@ void ReplicatedMergeTreePartCheckThread::enqueuePart(const String & name, time_t
     task->schedule();
 }
 
+void ReplicatedMergeTreePartCheckThread::cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info)
+{
+    /// Wait for running tasks to finish and temporarily stop checking
+    stop();
+    SCOPE_EXIT({ start(); });
+    {
+        std::lock_guard lock(parts_mutex);
+        for (auto it = parts_queue.begin(); it != parts_queue.end();)
+        {
+            if (drop_range_info.contains(MergeTreePartInfo::fromPartName(it->first, storage.format_version)))
+            {
+                /// Remove part from the queue to avoid part resurrection
+                /// if we will check it and enqueue fetch after DROP/REPLACE execution.
+                parts_set.erase(it->first);
+                it = parts_queue.erase(it);
+            }
+            else
+            {
+                ++it;
+            }
+        }
+    }
+}
 
 size_t ReplicatedMergeTreePartCheckThread::size() const
 {
@@ -111,6 +134,18 @@ ReplicatedMergeTreePartCheckThread::MissingPartSearchResult ReplicatedMergeTreeP
     bool found_part_with_the_same_max_block = false;
 
     Strings replicas = zookeeper->getChildren(storage.zookeeper_path + "/replicas");
+    /// Move our replica to the end of replicas
+    for (auto it = replicas.begin(); it != replicas.end(); ++it)
+    {
+        String replica_path = storage.zookeeper_path + "/replicas/" + *it;
+        if (replica_path == storage.replica_path)
+        {
+            std::iter_swap(it, replicas.rbegin());
+            break;
+        }
+    }
+
+    /// Check all replicas and our replica must be this last one
     for (const String & replica : replicas)
     {
         String replica_path = storage.zookeeper_path + "/replicas/" + replica;
@@ -145,7 +180,8 @@ ReplicatedMergeTreePartCheckThread::MissingPartSearchResult ReplicatedMergeTreeP
 
                 if (found_part_with_the_same_min_block && found_part_with_the_same_max_block)
                 {
-                    LOG_WARNING(log, "Found parts with the same min block and with the same max block as the missing part {}. Hoping that it will eventually appear as a result of a merge.", part_name);
+                    /// FIXME It may never appear
+                    LOG_WARNING(log, "Found parts with the same min block and with the same max block as the missing part {} on replica {}. Hoping that it will eventually appear as a result of a merge.", part_name, replica);
                     return MissingPartSearchResult::FoundAndDontNeedFetch;
                 }
             }
@@ -191,7 +227,7 @@ void ReplicatedMergeTreePartCheckThread::searchForMissingPartAndFetchIfPossible(
     if (missing_part_search_result == MissingPartSearchResult::LostForever)
     {
         auto lost_part_info = MergeTreePartInfo::fromPartName(part_name, storage.format_version);
-        if (lost_part_info.level != 0)
+        if (lost_part_info.level != 0 || lost_part_info.mutation != 0)
         {
             Strings source_parts;
             bool part_in_queue = storage.queue.checkPartInQueueAndGetSourceParts(part_name, source_parts);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
index 8257898fe3f..a8ce4fedd6d 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
@@ -8,8 +8,8 @@
 #include <atomic>
 #include <boost/noncopyable.hpp>
 #include <Poco/Event.h>
-#include <common/types.h>
-#include <common/logger_useful.h>
+#include <base/types.h>
+#include <base/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Storages/CheckResults.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
@@ -71,6 +71,8 @@ public:
     /// Check part by name
     CheckResult checkPart(const String & part_name);
 
+    void cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info);
+
 private:
     void run();
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h b/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
index 7bc2b72d2d5..e3df020a54c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/WriteBuffer.h>
 #include <IO/ReadBuffer.h>
 #include <IO/Operators.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index ea5f7cfc36a..0ff76958ceb 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -23,6 +23,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int UNEXPECTED_NODE_IN_ZOOKEEPER;
     extern const int ABORTED;
+    extern const int READONLY;
 }
 
 
@@ -54,14 +55,40 @@ void ReplicatedMergeTreeQueue::clear()
     mutation_pointer.clear();
 }
 
-void ReplicatedMergeTreeQueue::initialize(const MergeTreeData::DataParts & parts)
+void ReplicatedMergeTreeQueue::setBrokenPartsToEnqueueFetchesOnLoading(Strings && parts_to_fetch)
 {
     std::lock_guard lock(state_mutex);
-    for (const auto & part : parts)
+    /// Can be called only before queue initialization
+    assert(broken_parts_to_enqueue_fetches_on_loading.empty());
+    assert(virtual_parts.size() == 0);
+    broken_parts_to_enqueue_fetches_on_loading = std::move(parts_to_fetch);
+}
+
+void ReplicatedMergeTreeQueue::initialize(zkutil::ZooKeeperPtr zookeeper)
+{
+    std::lock_guard lock(state_mutex);
+
+    LOG_TRACE(log, "Initializing parts in queue");
+
+    /// Get current parts state from zookeeper
+    Strings parts = zookeeper->getChildren(replica_path + "/parts");
+    for (const auto & part_name : parts)
     {
-        current_parts.add(part->name, nullptr);
-        virtual_parts.add(part->name, nullptr);
+        LOG_TEST(log, "Adding part {} to current and virtual parts", part_name);
+        current_parts.add(part_name, nullptr);
+        virtual_parts.add(part_name, nullptr);
     }
+
+    /// Drop parts can negatively affect virtual parts. So when we load parts
+    /// from zookeeper we can break invariant with virtual parts. To fix this we
+    /// have it here.
+    for (const LogEntryPtr & entry : queue)
+    {
+        if (entry->isDropPart(format_version))
+            virtual_parts.removePartAndCoveredParts(*entry->getDropRange(format_version));
+    }
+
+    LOG_TRACE(log, "Queue initialized");
 }
 
 bool ReplicatedMergeTreeQueue::isVirtualPart(const MergeTreeData::DataPartPtr & data_part) const
@@ -143,7 +170,10 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
             updated = true;
         }
 
-        zookeeper->tryGet(fs::path(replica_path) / "mutation_pointer", mutation_pointer);
+        {  /// Mutation pointer is a part of "state" and must be updated with state mutex
+            std::lock_guard lock(state_mutex);
+            zookeeper->tryGet(fs::path(replica_path) / "mutation_pointer", mutation_pointer);
+        }
     }
 
     updateTimesInZooKeeper(zookeeper, min_unprocessed_insert_time_changed, {});
@@ -155,11 +185,35 @@ bool ReplicatedMergeTreeQueue::load(zkutil::ZooKeeperPtr zookeeper)
 }
 
 
+void ReplicatedMergeTreeQueue::createLogEntriesToFetchBrokenParts()
+{
+    Strings broken_parts;
+    {
+        std::lock_guard lock(state_mutex);
+        broken_parts = broken_parts_to_enqueue_fetches_on_loading;
+    }
+
+    /// It will lock state_mutex
+    for (const auto & broken_part_name : broken_parts)
+        storage.removePartAndEnqueueFetch(broken_part_name);
+
+    std::lock_guard lock(state_mutex);
+    /// broken_parts_to_enqueue_fetches_on_loading can be assigned only once on table startup,
+    /// so actually no race conditions are possible
+    assert(broken_parts == broken_parts_to_enqueue_fetches_on_loading);
+    broken_parts_to_enqueue_fetches_on_loading.clear();
+}
+
+
 void ReplicatedMergeTreeQueue::insertUnlocked(
     const LogEntryPtr & entry, std::optional<time_t> & min_unprocessed_insert_time_changed,
     std::lock_guard<std::mutex> & state_lock)
 {
-    for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
+    auto entry_virtual_parts = entry->getVirtualPartNames(format_version);
+
+    LOG_TEST(log, "Insert entry {} to queue with type {} with virtual parts [{}]", entry->znode_name, entry->typeToString(), fmt::join(entry_virtual_parts, ", "));
+
+    for (const String & virtual_part_name : entry_virtual_parts)
     {
         virtual_parts.add(virtual_part_name, nullptr);
         /// Don't add drop range parts to mutations
@@ -178,9 +232,15 @@ void ReplicatedMergeTreeQueue::insertUnlocked(
         drop_ranges.addDropRange(entry);
 
         /// DROP PART remove parts, so we remove it from virtual parts to
-        /// preserve invariant virtual_parts = current_parts + queue
+        /// preserve invariant virtual_parts = current_parts + queue.
+        /// Also remove it from parts_to_do to avoid intersecting parts in parts_to_do
+        /// if fast replica will execute DROP PART and assign a merge that contains dropped blocks.
         if (entry->isDropPart(format_version))
-            virtual_parts.removePartAndCoveredParts(*entry->getDropRange(format_version));
+        {
+            String drop_part_name = *entry->getDropRange(format_version);
+            virtual_parts.removePartAndCoveredParts(drop_part_name);
+            removeCoveredPartsFromMutations(drop_part_name, /*remove_part = */ true, /*remove_covered_parts = */ true);
+        }
 
         queue.push_front(entry);
     }
@@ -223,6 +283,11 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
     std::optional<time_t> & max_processed_insert_time_changed,
     std::unique_lock<std::mutex> & state_lock)
 {
+
+    auto entry_virtual_parts = entry->getVirtualPartNames(format_version);
+    LOG_TEST(log, "Removing {} entry {} from queue with type {} with virtual parts [{}]",
+             is_successful ? "successful" : "unsuccessful",
+             entry->znode_name, entry->typeToString(), fmt::join(entry_virtual_parts, ", "));
     /// Update insert times.
     if (entry->type == LogEntry::GET_PART || entry->type == LogEntry::ATTACH_PART)
     {
@@ -250,6 +315,7 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
     {
         if (!entry->actual_new_part_name.empty())
         {
+            LOG_TEST(log, "Entry {} has actual new part name {}, removing it from mutations", entry->znode_name, entry->actual_new_part_name);
             /// We don't add bigger fetched part to current_parts because we
             /// have an invariant `virtual_parts` = `current_parts` + `queue`.
             ///
@@ -260,7 +326,9 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
             removeCoveredPartsFromMutations(entry->actual_new_part_name, /*remove_part = */ false, /*remove_covered_parts = */ true);
         }
 
-        for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
+        LOG_TEST(log, "Adding parts [{}] to current parts", fmt::join(entry_virtual_parts, ", "));
+
+        for (const String & virtual_part_name : entry_virtual_parts)
         {
             current_parts.add(virtual_part_name, nullptr);
 
@@ -271,14 +339,21 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
 
         if (auto drop_range_part_name = entry->getDropRange(format_version))
         {
+
             MergeTreePartInfo drop_range_info = MergeTreePartInfo::fromPartName(*drop_range_part_name, format_version);
 
             /// DROP PART doesn't have virtual parts so remove from current
             /// parts all covered parts.
             if (entry->isDropPart(format_version))
+            {
+                LOG_TEST(log, "Removing drop part from current and virtual parts {}", *drop_range_part_name);
                 current_parts.removePartAndCoveredParts(*drop_range_part_name);
+            }
             else
+            {
+                LOG_TEST(log, "Removing drop range from current and virtual parts {}", *drop_range_part_name);
                 current_parts.remove(*drop_range_part_name);
+            }
 
             virtual_parts.remove(*drop_range_part_name);
 
@@ -303,7 +378,9 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
             drop_ranges.removeDropRange(entry);
         }
 
-        for (const String & virtual_part_name : entry->getVirtualPartNames(format_version))
+        LOG_TEST(log, "Removing unsuccessful entry {} virtual parts [{}]", entry->znode_name, fmt::join(entry_virtual_parts, ", "));
+
+        for (const String & virtual_part_name : entry_virtual_parts)
         {
             /// This part will never appear, so remove it from virtual parts
             virtual_parts.remove(virtual_part_name);
@@ -320,6 +397,9 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
 void ReplicatedMergeTreeQueue::removeCoveredPartsFromMutations(const String & part_name, bool remove_part, bool remove_covered_parts)
 {
     auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
+
+    LOG_TEST(log, "Removing part {} from mutations (remove_part: {}, remove_covered_parts: {})", part_name, remove_part, remove_covered_parts);
+
     auto in_partition = mutations_by_partition.find(part_info.partition_id);
     if (in_partition == mutations_by_partition.end())
         return;
@@ -357,11 +437,17 @@ void ReplicatedMergeTreeQueue::removeCoveredPartsFromMutations(const String & pa
 
 void ReplicatedMergeTreeQueue::addPartToMutations(const String & part_name)
 {
+
+    LOG_TEST(log, "Adding part {} to mutations", part_name);
+
     auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
 
     /// Do not add special virtual parts to parts_to_do
     if (part_info.isFakeDropRangePart())
+    {
+        LOG_TEST(log, "Part {} is fake drop range part, will not add it to mutations", part_name);
         return;
+    }
 
     auto in_partition = mutations_by_partition.find(part_info.partition_id);
     if (in_partition == mutations_by_partition.end())
@@ -472,9 +558,15 @@ bool ReplicatedMergeTreeQueue::removeFailedQuorumPart(const MergeTreePartInfo &
     return virtual_parts.remove(part_info);
 }
 
-int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper, Coordination::WatchCallback watch_callback)
+int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper, Coordination::WatchCallback watch_callback, PullLogsReason reason)
 {
     std::lock_guard lock(pull_logs_to_queue_mutex);
+    if (storage.is_readonly && reason == SYNC)
+    {
+        throw Exception(ErrorCodes::READONLY, "Cannot SYNC REPLICA, because replica is readonly");
+        /// TODO throw logical error for other reasons (except LOAD)
+    }
+
     if (pull_log_blocker.isCancelled())
         throw Exception("Log pulling is cancelled", ErrorCodes::ABORTED);
 
@@ -617,7 +709,7 @@ int32_t ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper
             }
         }
 
-        storage.background_executor.triggerTask();
+        storage.background_operations_assignee.trigger();
     }
 
     return stat.version;
@@ -706,7 +798,7 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
     }
 
     if (some_active_mutations_were_killed)
-        storage.background_executor.triggerTask();
+        storage.background_operations_assignee.trigger();
 
     if (!entries_to_load.empty())
     {
@@ -714,13 +806,22 @@ void ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, C
 
         std::vector<std::future<Coordination::GetResponse>> futures;
         for (const String & entry : entries_to_load)
-            futures.emplace_back(zookeeper->asyncGet(fs::path(zookeeper_path) / "mutations" / entry));
+            futures.emplace_back(zookeeper->asyncTryGet(fs::path(zookeeper_path) / "mutations" / entry));
 
         std::vector<ReplicatedMergeTreeMutationEntryPtr> new_mutations;
         for (size_t i = 0; i < entries_to_load.size(); ++i)
         {
+            auto maybe_response = futures[i].get();
+            if (maybe_response.error != Coordination::Error::ZOK)
+            {
+                assert(maybe_response.error == Coordination::Error::ZNONODE);
+                /// It's ok if it happened on server startup or table creation and replica loads all mutation entries.
+                /// It's also ok if mutation was killed.
+                LOG_WARNING(log, "Cannot get mutation node {} ({}), probably it was concurrently removed", entries_to_load[i], maybe_response.error);
+                continue;
+            }
             new_mutations.push_back(std::make_shared<ReplicatedMergeTreeMutationEntry>(
-                ReplicatedMergeTreeMutationEntry::parse(futures[i].get().data, entries_to_load[i])));
+                ReplicatedMergeTreeMutationEntry::parse(maybe_response.data, entries_to_load[i])));
         }
 
         bool some_mutations_are_probably_done = false;
@@ -831,7 +932,7 @@ ReplicatedMergeTreeMutationEntryPtr ReplicatedMergeTreeQueue::removeMutation(
     }
 
     if (mutation_was_active)
-        storage.background_executor.triggerTask();
+        storage.background_operations_assignee.trigger();
 
     return entry;
 }
@@ -916,7 +1017,7 @@ bool ReplicatedMergeTreeQueue::checkReplaceRangeCanBeRemoved(const MergeTreePart
 void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
     zkutil::ZooKeeperPtr zookeeper,
     const MergeTreePartInfo & part_info,
-    const ReplicatedMergeTreeLogEntryData & current)
+    const std::optional<ReplicatedMergeTreeLogEntryData> & covering_entry)
 {
     /// TODO is it possible to simplify it?
     Queue to_wait;
@@ -927,19 +1028,22 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
     /// Remove operations with parts, contained in the range to be deleted, from the queue.
     std::unique_lock lock(state_mutex);
 
-    [[maybe_unused]] bool called_from_alter_query_directly = current.replace_range_entry && current.replace_range_entry->columns_version < 0;
-    assert(currently_executing_drop_or_replace_range || called_from_alter_query_directly);
+    [[maybe_unused]] bool called_from_alter_query_directly = covering_entry && covering_entry->replace_range_entry
+        && covering_entry->replace_range_entry->columns_version < 0;
+    [[maybe_unused]] bool called_for_broken_part = !covering_entry;
+    assert(currently_executing_drop_or_replace_range || called_from_alter_query_directly || called_for_broken_part);
 
     for (Queue::iterator it = queue.begin(); it != queue.end();)
     {
         auto type = (*it)->type;
-
         bool is_simple_producing_op = type == LogEntry::GET_PART ||
                                       type == LogEntry::ATTACH_PART ||
                                       type == LogEntry::MERGE_PARTS ||
                                       type == LogEntry::MUTATE_PART;
+
         bool simple_op_covered = is_simple_producing_op && part_info.contains(MergeTreePartInfo::fromPartName((*it)->new_part_name, format_version));
-        if (simple_op_covered || checkReplaceRangeCanBeRemoved(part_info, *it, current))
+        bool replace_range_covered = covering_entry && checkReplaceRangeCanBeRemoved(part_info, *it, *covering_entry);
+        if (simple_op_covered || replace_range_covered)
         {
             if ((*it)->currently_executing)
                 to_wait.push_back(*it);
@@ -969,16 +1073,20 @@ void ReplicatedMergeTreeQueue::removePartProducingOpsInRange(
 }
 
 
-bool ReplicatedMergeTreeQueue::isNotCoveredByFuturePartsImpl(const String & log_entry_name, const String & new_part_name,
+bool ReplicatedMergeTreeQueue::isNotCoveredByFuturePartsImpl(const LogEntry & entry, const String & new_part_name,
                                                              String & out_reason, std::lock_guard<std::mutex> & /* queue_lock */) const
 {
     /// Let's check if the same part is now being created by another action.
-    if (future_parts.count(new_part_name))
+    auto entry_for_same_part_it = future_parts.find(new_part_name);
+    if (entry_for_same_part_it != future_parts.end())
     {
-        const char * format_str = "Not executing log entry {} for part {} "
-                                  "because another log entry for the same part is being processed. This shouldn't happen often.";
-        LOG_INFO(log, format_str, log_entry_name, new_part_name);
-        out_reason = fmt::format(format_str, log_entry_name, new_part_name);
+        const LogEntry & another_entry = *entry_for_same_part_it->second;
+        const char * format_str = "Not executing log entry {} of type {} for part {} "
+                                  "because another log entry {} of type {} for the same part ({}) is being processed. This shouldn't happen often.";
+        LOG_INFO(log, format_str, entry.znode_name, entry.type, entry.new_part_name,
+                 another_entry.znode_name, another_entry.type, another_entry.new_part_name);
+        out_reason = fmt::format(format_str, entry.znode_name, entry.type, entry.new_part_name,
+                                 another_entry.znode_name, another_entry.type, another_entry.new_part_name);
         return false;
 
         /** When the corresponding action is completed, then `isNotCoveredByFuturePart` next time, will succeed,
@@ -1001,8 +1109,8 @@ bool ReplicatedMergeTreeQueue::isNotCoveredByFuturePartsImpl(const String & log_
         {
             const char * format_str = "Not executing log entry {} for part {} "
                                       "because it is covered by part {} that is currently executing.";
-            LOG_TRACE(log, format_str, log_entry_name, new_part_name, future_part_elem.first);
-            out_reason = fmt::format(format_str, log_entry_name, new_part_name, future_part_elem.first);
+            LOG_TRACE(log, format_str, entry.znode_name, new_part_name, future_part_elem.first);
+            out_reason = fmt::format(format_str, entry.znode_name, new_part_name, future_part_elem.first);
             return false;
         }
     }
@@ -1012,14 +1120,30 @@ bool ReplicatedMergeTreeQueue::isNotCoveredByFuturePartsImpl(const String & log_
 
 bool ReplicatedMergeTreeQueue::addFuturePartIfNotCoveredByThem(const String & part_name, LogEntry & entry, String & reject_reason)
 {
+    /// We have found `part_name` on some replica and are going to fetch it instead of covered `entry->new_part_name`.
     std::lock_guard lock(state_mutex);
 
+    if (virtual_parts.getContainingPart(part_name).empty())
+    {
+        /// We should not fetch any parts that absent in our `virtual_parts` set,
+        /// because we do not know about such parts according to our replication queue (we know about them from some side-channel).
+        /// Otherwise, it may break invariants in replication queue reordering, for example:
+        /// 1. Our queue contains GET_PART all_2_2_0, log contains DROP_RANGE all_2_2_0 and MERGE_PARTS all_1_3_1
+        /// 2. We execute GET_PART all_2_2_0, but fetch all_1_3_1 instead
+        ///    (drop_ranges.isAffectedByDropRange(...) is false-negative, because DROP_RANGE all_2_2_0 is not pulled yet).
+        ///    It actually means, that MERGE_PARTS all_1_3_1 is executed too, but it's not even pulled yet.
+        /// 3. Then we pull log, trying to execute DROP_RANGE all_2_2_0
+        ///    and reveal that it was incorrectly reordered with MERGE_PARTS all_1_3_1 (drop range intersects merged part).
+        reject_reason = fmt::format("Log entry for part {} or covering part is not pulled from log to queue yet.", part_name);
+        return false;
+    }
+
     /// FIXME get rid of actual_part_name.
     /// If new covering part jumps over DROP_RANGE we should execute drop range first
     if (drop_ranges.isAffectedByDropRange(part_name, reject_reason))
         return false;
 
-    if (isNotCoveredByFuturePartsImpl(entry.znode_name, part_name, reject_reason, lock))
+    if (isNotCoveredByFuturePartsImpl(entry, part_name, reject_reason, lock))
     {
         CurrentlyExecuting::setActualPartName(entry, part_name, *this);
         return true;
@@ -1040,7 +1164,7 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
     /// some other entry which is currently executing, then we can postpone this entry.
     for (const String & new_part_name : entry.getVirtualPartNames(format_version))
     {
-        if (!isNotCoveredByFuturePartsImpl(entry.znode_name, new_part_name, out_postpone_reason, state_lock))
+        if (!isNotCoveredByFuturePartsImpl(entry, new_part_name, out_postpone_reason, state_lock))
             return false;
     }
 
@@ -1150,16 +1274,10 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
 
         if (!ignore_max_size && sum_parts_size_in_bytes > max_source_parts_size)
         {
-            size_t busy_threads_in_pool = CurrentMetrics::values[CurrentMetrics::BackgroundPoolTask].load(std::memory_order_relaxed);
-            size_t thread_pool_size = data.getContext()->getSettingsRef().background_pool_size;
-            size_t free_threads = thread_pool_size - busy_threads_in_pool;
-            size_t required_threads = data_settings->number_of_free_entries_in_pool_to_execute_mutation;
             out_postpone_reason = fmt::format("Not executing log entry {} of type {} for part {}"
-                " because source parts size ({}) is greater than the current maximum ({})."
-                " {} free of {} threads, required {} free threads.",
+                " because source parts size ({}) is greater than the current maximum ({}).",
                 entry.znode_name, entry.typeToString(), entry.new_part_name,
-                ReadableSize(sum_parts_size_in_bytes), ReadableSize(max_source_parts_size),
-                free_threads, thread_pool_size, required_threads);
+                ReadableSize(sum_parts_size_in_bytes), ReadableSize(max_source_parts_size));
 
             LOG_DEBUG(log, out_postpone_reason);
 
@@ -1219,6 +1337,37 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
             out_postpone_reason = fmt::format(format_str, entry.znode_name, entry.typeToString(), entry.new_part_name);
             return false;
         }
+
+        if (entry.isDropPart(format_version))
+        {
+            /// We should avoid reordering of REPLACE_RANGE and DROP PART (DROP_RANGE),
+            /// because if replace_range_entry->new_part_names contains drop_range_entry->new_part_name
+            /// and we execute DROP PART before REPLACE_RANGE, then DROP PART will be no-op
+            /// (because part is not created yet, so there is nothing to drop;
+            /// DROP_RANGE does not cover all parts of REPLACE_RANGE, so removePartProducingOpsInRange(...) will not remove anything too)
+            /// and part will never be removed. Replicas may diverge due to such reordering.
+            /// We don't need to do anything for other entry types, because removePartProducingOpsInRange(...) will remove them as expected.
+
+            auto drop_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
+            for (const auto & replace_entry : queue)
+            {
+                if (replace_entry->type != LogEntry::REPLACE_RANGE)
+                    continue;
+
+                for (const auto & new_part_name : replace_entry->replace_range_entry->new_part_names)
+                {
+                    auto new_part_info = MergeTreePartInfo::fromPartName(new_part_name, format_version);
+                    if (!new_part_info.isDisjoint(drop_part_info))
+                    {
+                        const char * format_str = "Not executing log entry {} of type {} for part {} "
+                                                  "because it probably depends on {} (REPLACE_RANGE).";
+                        LOG_TRACE(log, format_str, entry.znode_name, entry.typeToString(), entry.new_part_name, replace_entry->znode_name);
+                        out_postpone_reason = fmt::format(format_str, entry.znode_name, entry.typeToString(), entry.new_part_name, replace_entry->znode_name);
+                        return false;
+                    }
+                }
+            }
+        }
     }
 
     return true;
@@ -1378,33 +1527,7 @@ bool ReplicatedMergeTreeQueue::processEntry(
     if (saved_exception)
     {
         std::lock_guard lock(state_mutex);
-
         entry->exception = saved_exception;
-
-        if (entry->type == ReplicatedMergeTreeLogEntryData::MUTATE_PART)
-        {
-            /// Record the exception in the system.mutations table.
-            Int64 result_data_version = MergeTreePartInfo::fromPartName(entry->new_part_name, format_version)
-                .getDataVersion();
-            auto source_part_info = MergeTreePartInfo::fromPartName(
-                entry->source_parts.at(0), format_version);
-
-            auto in_partition = mutations_by_partition.find(source_part_info.partition_id);
-            if (in_partition != mutations_by_partition.end())
-            {
-                auto mutations_begin_it = in_partition->second.upper_bound(source_part_info.getDataVersion());
-                auto mutations_end_it = in_partition->second.upper_bound(result_data_version);
-                for (auto it = mutations_begin_it; it != mutations_end_it; ++it)
-                {
-                    MutationStatus & status = *it->second;
-                    status.latest_failed_part = entry->source_parts.at(0);
-                    status.latest_failed_part_info = source_part_info;
-                    status.latest_fail_time = time(nullptr);
-                    status.latest_fail_reason = getExceptionMessage(saved_exception, false);
-                }
-            }
-        }
-
         return false;
     }
 
@@ -1488,6 +1611,9 @@ MutationCommands ReplicatedMergeTreeQueue::getMutationCommands(
     /// to allow recovering from a mutation that cannot be executed. This way you can delete the mutation entry
     /// from /mutations in ZK and the replicas will simply skip the mutation.
 
+    /// NOTE: However, it's quite dangerous to skip MUTATE_PART. Replicas may diverge if one of them have executed part mutation,
+    /// and then mutation was killed before execution of MUTATE_PART on remaining replicas.
+
     if (part->info.getDataVersion() > desired_mutation_version)
     {
         LOG_WARNING(log, "Data version of part {} is already greater than desired mutation version {}", part->name, desired_mutation_version);
@@ -1815,7 +1941,7 @@ ReplicatedMergeTreeMergePredicate::ReplicatedMergeTreeMergePredicate(
         }
     }
 
-    merges_version = queue_.pullLogsToQueue(zookeeper);
+    merges_version = queue_.pullLogsToQueue(zookeeper, {}, ReplicatedMergeTreeQueue::MERGE_PREDICATE);
 
     {
         /// We avoid returning here a version to be used in a lightweight transaction.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index e49d80fc832..273ac21eebc 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -31,6 +31,8 @@ class ReplicatedMergeTreeQueue
 private:
     friend class CurrentlyExecuting;
     friend class ReplicatedMergeTreeMergePredicate;
+    friend class MergeFromLogEntryTask;
+    friend class ReplicatedMergeMutateTaskBase;
 
     using LogEntry = ReplicatedMergeTreeLogEntry;
     using LogEntryPtr = LogEntry::Ptr;
@@ -154,6 +156,8 @@ private:
     /// We need it because alters have to be executed sequentially (one by one).
     ReplicatedMergeTreeAltersSequence alter_sequence;
 
+    Strings broken_parts_to_enqueue_fetches_on_loading;
+
     /// List of subscribers
     /// A subscriber callback is called when an entry queue is deleted
     mutable std::mutex subscribers_mutex;
@@ -206,7 +210,7 @@ private:
       * Should be called under state_mutex.
       */
     bool isNotCoveredByFuturePartsImpl(
-        const String & log_entry_name,
+        const LogEntry & entry,
         const String & new_part_name, String & out_reason,
         std::lock_guard<std::mutex> & state_lock) const;
 
@@ -277,8 +281,8 @@ public:
     /// Clears queue state
     void clear();
 
-    /// Put a set of (already existing) parts in virtual_parts.
-    void initialize(const MergeTreeData::DataParts & parts);
+    /// Get set of parts from zookeeper
+    void initialize(zkutil::ZooKeeperPtr zookeeper);
 
     /** Inserts an action to the end of the queue.
       * To restore broken parts during operation.
@@ -294,13 +298,22 @@ public:
 
     bool removeFailedQuorumPart(const MergeTreePartInfo & part_info);
 
+    enum PullLogsReason
+    {
+        LOAD,
+        UPDATE,
+        MERGE_PREDICATE,
+        SYNC,
+        OTHER,
+    };
+
     /** Copy the new entries from the shared log to the queue of this replica. Set the log_pointer to the appropriate value.
       * If watch_callback is not empty, will call it when new entries appear in the log.
       * If there were new entries, notifies storage.queue_task_handle.
       * Additionally loads mutations (so that the set of mutations is always more recent than the queue).
       * Return the version of "logs" node (that is updated for every merge/mutation/... added to the log)
       */
-    int32_t pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper, Coordination::WatchCallback watch_callback = {});
+    int32_t pullLogsToQueue(zkutil::ZooKeeperPtr zookeeper, Coordination::WatchCallback watch_callback = {}, PullLogsReason reason = OTHER);
 
     /// Load new mutation entries. If something new is loaded, schedule storage.merge_selecting_task.
     /// If watch_callback is not empty, will call it when new mutations appear in ZK.
@@ -312,8 +325,10 @@ public:
 
     /** Remove the action from the queue with the parts covered by part_name (from ZK and from the RAM).
       * And also wait for the completion of their execution, if they are now being executed.
+      * covering_entry is as an entry that caused removal of entries in range (usually, DROP_RANGE)
       */
-    void removePartProducingOpsInRange(zkutil::ZooKeeperPtr zookeeper, const MergeTreePartInfo & part_info, const ReplicatedMergeTreeLogEntryData & current);
+    void removePartProducingOpsInRange(zkutil::ZooKeeperPtr zookeeper, const MergeTreePartInfo & part_info,
+                                       const std::optional<ReplicatedMergeTreeLogEntryData> & covering_entry);
 
     /** In the case where there are not enough parts to perform the merge in part_name
       * - move actions with merged parts to the end of the queue
@@ -444,6 +459,13 @@ public:
     /// It's needed because queue itself can trigger it's task handler and in
     /// this case race condition is possible.
     QueueLocks lockQueue();
+
+    /// Can be called only on data parts loading.
+    /// We need loaded queue to create GET_PART entry for broken (or missing) part,
+    /// but queue is not loaded yet on data parts loading.
+    void setBrokenPartsToEnqueueFetchesOnLoading(Strings && parts_to_fetch);
+    /// Must be called right after queue loading.
+    void createLogEntriesToFetchBrokenParts();
 };
 
 class ReplicatedMergeTreeMergePredicate
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h
index b624f829644..a0b0d026693 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h
@@ -65,7 +65,7 @@ struct ReplicatedMergeTreeQuorumAddedParts
             added_parts = readV1(in);
     }
 
-    /// Read added bloks when node in ZooKeeper supports only one partition.
+    /// Read added blocks when node in ZooKeeper supports only one partition.
     PartitionIdToPartName readV1(ReadBuffer & in)
     {
         PartitionIdToPartName parts_in_quorum;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
index ee12cabb5aa..f560850a6c6 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <set>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBuffer.h>
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 25f25480549..c29ae873c5c 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -25,6 +25,8 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int REPLICA_IS_ALREADY_ACTIVE;
+    extern const int REPLICA_STATUS_CHANGED;
+
 }
 
 namespace
@@ -55,6 +57,7 @@ void ReplicatedMergeTreeRestartingThread::run()
     if (need_stop)
         return;
 
+    bool reschedule_now = false;
     try
     {
         if (first_time || readonly_mode_was_set || storage.getZooKeeper()->expired())
@@ -131,15 +134,29 @@ void ReplicatedMergeTreeRestartingThread::run()
             first_time = false;
         }
     }
-    catch (...)
+    catch (const Exception & e)
     {
         /// We couldn't activate table let's set it into readonly mode
         setReadonly();
+        partialShutdown();
+        storage.startup_event.set();
+        tryLogCurrentException(log, __PRETTY_FUNCTION__);
+
+        if (e.code() == ErrorCodes::REPLICA_STATUS_CHANGED)
+            reschedule_now = true;
+    }
+    catch (...)
+    {
+        setReadonly();
+        partialShutdown();
         storage.startup_event.set();
         tryLogCurrentException(log, __PRETTY_FUNCTION__);
     }
 
-    task->scheduleAfter(check_period_ms);
+    if (reschedule_now)
+        task->schedule();
+    else
+        task->scheduleAfter(check_period_ms);
 }
 
 
@@ -155,11 +172,25 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
 
         storage.cloneReplicaIfNeeded(zookeeper);
 
-        storage.queue.load(zookeeper);
+        try
+        {
+            storage.queue.initialize(zookeeper);
+
+            storage.queue.load(zookeeper);
+
+            storage.queue.createLogEntriesToFetchBrokenParts();
+
+            /// pullLogsToQueue() after we mark replica 'is_active' (and after we repair if it was lost);
+            /// because cleanup_thread doesn't delete log_pointer of active replicas.
+            storage.queue.pullLogsToQueue(zookeeper, {}, ReplicatedMergeTreeQueue::LOAD);
+        }
+        catch (...)
+        {
+            std::unique_lock lock(storage.last_queue_update_exception_lock);
+            storage.last_queue_update_exception = getCurrentExceptionMessage(false);
+            throw;
+        }
 
-        /// pullLogsToQueue() after we mark replica 'is_active' (and after we repair if it was lost);
-        /// because cleanup_thread doesn't delete log_pointer of active replicas.
-        storage.queue.pullLogsToQueue(zookeeper);
         storage.queue.removeCurrentPartsFromMutations();
         storage.last_queue_update_finish_time.store(time(nullptr));
 
@@ -177,7 +208,7 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
         storage.partial_shutdown_event.reset();
 
         /// Start queue processing
-        storage.background_executor.start();
+        storage.background_operations_assignee.start();
 
         storage.queue_updating_task->activateAndSchedule();
         storage.mutations_updating_task->activateAndSchedule();
@@ -362,7 +393,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown()
         auto fetch_lock = storage.fetcher.blocker.cancel();
         auto merge_lock = storage.merger_mutator.merges_blocker.cancel();
         auto move_lock = storage.parts_mover.moves_blocker.cancel();
-        storage.background_executor.finish();
+        storage.background_operations_assignee.finish();
     }
 
     LOG_TRACE(log, "Threads finished");
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index cb10d628349..bdade4e0bb2 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Poco/Event.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <thread>
 #include <atomic>
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index c81f587cbbc..e3ca902b1bd 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -2,9 +2,9 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeSink.h>
 #include <Interpreters/PartLog.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Common/SipHash.h>
 #include <Common/ZooKeeper/KeeperException.h>
+#include <Core/Block.h>
 #include <IO/Operators.h>
 
 
@@ -118,7 +118,7 @@ void ReplicatedMergeTreeSink::checkQuorumPrecondition(zkutil::ZooKeeperPtr & zoo
 
 void ReplicatedMergeTreeSink::consume(Chunk chunk)
 {
-    auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+    auto block = getHeader().cloneWithColumns(chunk.detachColumns());
 
     last_block_is_duplicate = false;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
index 2a6702736df..7df82fd397e 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
@@ -2,7 +2,7 @@
 
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace Poco { class Logger; }
@@ -44,8 +44,12 @@ public:
     void writeExistingPart(MergeTreeData::MutableDataPartPtr & part);
 
     /// For proper deduplication in MaterializedViews
-    bool lastBlockIsDuplicate() const
+    bool lastBlockIsDuplicate() const override
     {
+        /// If MV is responsible for deduplication, block is not considered duplicating.
+        if (context->getSettingsRef().deduplicate_blocks_in_dependent_materialized_views)
+            return false;
+
         return last_block_is_duplicate;
     }
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index db1c2bc89af..0637a6bb027 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -46,7 +46,15 @@ ReplicatedMergeTreeTableMetadata::ReplicatedMergeTreeTableMetadata(const MergeTr
 
     primary_key = formattedAST(metadata_snapshot->getPrimaryKey().expression_list_ast);
     if (metadata_snapshot->isPrimaryKeyDefined())
-        sorting_key = formattedAST(metadata_snapshot->getSortingKey().expression_list_ast);
+    {
+        /// We don't use preparsed AST `sorting_key.expression_list_ast` because
+        /// it contain version column for VersionedCollapsingMergeTree, which
+        /// is not stored in ZooKeeper for compatibility reasons. So the best
+        /// compatible way is just to convert definition_ast to list and
+        /// serialize it. In all other places key.expression_list_ast should be
+        /// used.
+        sorting_key = formattedAST(extractKeyExpressionList(metadata_snapshot->getSortingKey().definition_ast));
+    }
 
     data_format_version = data.format_version;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
index d7cd215c2db..2f9a9d58834 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.h
@@ -2,7 +2,7 @@
 
 #include <Parsers/IAST.h>
 #include <Storages/MergeTree/MergeTreeDataFormatVersion.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
 namespace DB
diff --git a/src/Storages/MergeTree/SimpleMergeSelector.h b/src/Storages/MergeTree/SimpleMergeSelector.h
index af339dbfa24..3e104d1319a 100644
--- a/src/Storages/MergeTree/SimpleMergeSelector.h
+++ b/src/Storages/MergeTree/SimpleMergeSelector.h
@@ -63,7 +63,7 @@ merge selecting algorithm is applied and the relevant metrics are calculated to
 their sizes, at what time intervals they are inserted;
 
 There is a research thesis dedicated to optimization of merge algorithm:
-https://presentations.clickhouse.tech/hse_2019/merge_algorithm.pptx
+https://presentations.clickhouse.com/hse_2019/merge_algorithm.pptx
 
 This work made attempt to variate the coefficients in SimpleMergeSelector and to solve the optimization task:
 maybe some change in coefficients will give a clear win on all metrics. Surprisingly enough, it has found
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index 15beb94404b..729b545e9a0 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -6,10 +6,10 @@
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Core/Defines.h>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
@@ -31,8 +31,7 @@ public:
         size_t max_block_size,
         unsigned num_streams) override
     {
-        // NOTE: It's used to read normal parts only
-        QueryPlan query_plan = std::move(*MergeTreeDataSelectExecutor(parts.front()->storage)
+        QueryPlan query_plan = std::move(*MergeTreeDataSelectExecutor(storage)
                                               .readFromParts(
                                                   parts,
                                                   column_names,
@@ -41,7 +40,9 @@ public:
                                                   query_info,
                                                   context,
                                                   max_block_size,
-                                                  num_streams));
+                                                  num_streams,
+                                                  nullptr,
+                                                  analysis_result_ptr));
 
         return query_plan.convertToPipe(
             QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
@@ -54,54 +55,58 @@ public:
     bool mayBenefitFromIndexForIn(
         const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override
     {
-        return parts.front()->storage.mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
+        return storage.mayBenefitFromIndexForIn(left_in_operand, query_context, metadata_snapshot);
     }
 
     NamesAndTypesList getVirtuals() const override
     {
-        return parts.front()->storage.getVirtuals();
+        return storage.getVirtuals();
     }
 
     String getPartitionId() const
     {
-        return parts.front()->info.partition_id;
+        return partition_id;
     }
 
     String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context) const
     {
-        return parts.front()->storage.getPartitionIDFromQuery(ast, context);
+        return storage.getPartitionIDFromQuery(ast, context);
+    }
+
+    bool materializeTTLRecalculateOnly() const
+    {
+        return parts.front()->storage.getSettings()->materialize_ttl_recalculate_only;
     }
 
 protected:
+    /// Used in part mutation.
     StorageFromMergeTreeDataPart(const MergeTreeData::DataPartPtr & part_)
         : IStorage(getIDFromPart(part_))
         , parts({part_})
+        , storage(part_->storage)
+        , partition_id(part_->info.partition_id)
     {
-        setInMemoryMetadata(part_->storage.getInMemoryMetadata());
+        setInMemoryMetadata(storage.getInMemoryMetadata());
     }
 
-    StorageFromMergeTreeDataPart(MergeTreeData::DataPartsVector && parts_)
-        : IStorage(getIDFromParts(parts_))
-        , parts(std::move(parts_))
+    /// Used in queries with projection.
+    StorageFromMergeTreeDataPart(const MergeTreeData & storage_, MergeTreeDataSelectAnalysisResultPtr analysis_result_ptr_)
+        : IStorage(storage_.getStorageID()), storage(storage_), analysis_result_ptr(analysis_result_ptr_)
     {
-        setInMemoryMetadata(parts.front()->storage.getInMemoryMetadata());
+        setInMemoryMetadata(storage.getInMemoryMetadata());
     }
 
 private:
     MergeTreeData::DataPartsVector parts;
+    const MergeTreeData & storage;
+    String partition_id;
+    MergeTreeDataSelectAnalysisResultPtr analysis_result_ptr;
 
     static StorageID getIDFromPart(const MergeTreeData::DataPartPtr & part_)
     {
         auto table_id = part_->storage.getStorageID();
         return StorageID(table_id.database_name, table_id.table_name + " (part " + part_->name + ")");
     }
-
-    static StorageID getIDFromParts(const MergeTreeData::DataPartsVector & parts_)
-    {
-        assert(!parts_.empty());
-        auto table_id = parts_.front()->storage.getStorageID();
-        return StorageID(table_id.database_name, table_id.table_name + " (parts)");
-    }
 };
 
 }
diff --git a/src/Storages/MergeTree/TTLMergeSelector.h b/src/Storages/MergeTree/TTLMergeSelector.h
index 710b85b3474..d41ba6f519d 100644
--- a/src/Storages/MergeTree/TTLMergeSelector.h
+++ b/src/Storages/MergeTree/TTLMergeSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Storages/MergeTree/MergeSelector.h>
 #include <Storages/TTLDescription.h>
 
diff --git a/src/Storages/MergeTree/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index 8a234833da7..d312a7f9c3e 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -102,7 +102,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
     /// It also calculates checksum of projections.
     auto checksum_file = [&](const String & file_path, const String & file_name)
     {
-        if (disk->isDirectory(file_path) && endsWith(file_name, ".proj") && !startsWith(file_name, "tmp_")) // ignore projection tmp merge dir
+        if (disk->isDirectory(file_path) && endsWith(file_name, ".proj"))
         {
             auto projection_name = file_name.substr(0, file_name.size() - sizeof(".proj") + 1);
             auto pit = data_part->getProjectionParts().find(projection_name);
@@ -124,7 +124,8 @@ IMergeTreeDataPart::Checksums checkDataPart(
                 auto file_buf = disk->readFile(proj_path);
                 HashingReadBuffer hashing_buf(*file_buf);
                 hashing_buf.ignoreAll();
-                projection_checksums_data.files[MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION] = IMergeTreeDataPart::Checksums::Checksum(hashing_buf.count(), hashing_buf.getHash());
+                projection_checksums_data.files[MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION]
+                    = IMergeTreeDataPart::Checksums::Checksum(hashing_buf.count(), hashing_buf.getHash());
             }
             else
             {
@@ -141,8 +142,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
                         {
                             String projection_file_name = ISerialization::getFileNameForStream(projection_column, substream_path) + ".bin";
                             checksums_data.files[projection_file_name] = checksum_compressed_file(disk, projection_path + projection_file_name);
-                        },
-                        {});
+                        });
                 }
             }
 
@@ -219,7 +219,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
             {
                 String file_name = ISerialization::getFileNameForStream(column, substream_path) + ".bin";
                 checksums_data.files[file_name] = checksum_compressed_file(disk, path + file_name);
-            }, {});
+            });
         }
     }
     else
diff --git a/src/Storages/MergeTree/localBackup.h b/src/Storages/MergeTree/localBackup.h
index 630767c9ec6..066ba8f7489 100644
--- a/src/Storages/MergeTree/localBackup.h
+++ b/src/Storages/MergeTree/localBackup.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 #include <Disks/IDisk.h>
 
 namespace DB
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 910492d2467..982acfe62a4 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -249,9 +249,9 @@ ORDER BY expr
 [TTL expr [DELETE|TO DISK 'xxx'|TO VOLUME 'xxx'], ...]
 [SETTINGS name=value, ...]
 
-See details in documentation: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/. Other engines of the family support different syntax, see details in the corresponding documentation topics.
+See details in documentation: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/. Other engines of the family support different syntax, see details in the corresponding documentation topics.
 
-If you use the Replicated version of engines, see https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/.
+If you use the Replicated version of engines, see https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/.
 )";
 
     return help;
@@ -682,6 +682,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             metadata.primary_key.definition_ast = nullptr;
         }
 
+        auto minmax_columns = metadata.getColumnsRequiredForPartitionKey();
+        auto primary_key_asts = metadata.primary_key.expression_list_ast->children;
+        metadata.minmax_count_projection.emplace(
+            ProjectionDescription::getMinMaxCountProjection(args.columns, minmax_columns, primary_key_asts, args.getContext()));
+
         if (args.storage_def->sample_by)
             metadata.sampling_key = KeyDescription::getKeyFromAST(args.storage_def->sample_by->ptr(), metadata.columns, args.getContext());
 
@@ -732,7 +737,6 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, metadata.columns, args.getContext());
 
-
         ++arg_num;
 
         /// If there is an expression for sampling
@@ -758,6 +762,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         ++arg_num;
 
+        auto minmax_columns = metadata.getColumnsRequiredForPartitionKey();
+        auto primary_key_asts = metadata.primary_key.expression_list_ast->children;
+        metadata.minmax_count_projection.emplace(
+            ProjectionDescription::getMinMaxCountProjection(args.columns, minmax_columns, primary_key_asts, args.getContext()));
+
         const auto * ast = engine_args[arg_num]->as<ASTLiteral>();
         if (ast && ast->value.getType() == Field::Types::UInt64)
             storage_settings->index_granularity = safeGet<UInt64>(ast->value);
diff --git a/src/Storages/MergeTree/tests/gtest_executor.cpp b/src/Storages/MergeTree/tests/gtest_executor.cpp
new file mode 100644
index 00000000000..a208e7dc233
--- /dev/null
+++ b/src/Storages/MergeTree/tests/gtest_executor.cpp
@@ -0,0 +1,153 @@
+#include <gtest/gtest.h>
+
+#include <atomic>
+#include <barrier>
+#include <memory>
+#include <random>
+
+#include <Storages/MergeTree/IExecutableTask.h>
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+
+using namespace DB;
+
+namespace CurrentMetrics
+{
+    extern const Metric BackgroundMergesAndMutationsPoolTask;
+}
+
+std::random_device device;
+
+class FakeExecutableTask : public IExecutableTask
+{
+public:
+    explicit FakeExecutableTask(String name_) : generator(device()), distribution(0, 5), name(name_)
+    {
+    }
+
+    bool executeStep() override
+    {
+        auto sleep_time = distribution(generator);
+        std::this_thread::sleep_for(std::chrono::milliseconds(5 * sleep_time));
+
+        auto choice = distribution(generator);
+        if (choice == 0)
+            throw std::runtime_error("Unlucky...");
+
+        return false;
+    }
+
+    StorageID getStorageID() override
+    {
+        return {"test", name};
+    }
+
+    void onCompleted() override
+    {
+        auto choice = distribution(generator);
+        if (choice == 0)
+            throw std::runtime_error("Unlucky...");
+    }
+
+    UInt64 getPriority() override { return 0; }
+
+private:
+    std::mt19937 generator;
+    std::uniform_int_distribution<> distribution;
+
+    String name;
+    std::function<void()> on_completed;
+};
+
+
+TEST(Executor, RemoveTasks)
+{
+    const size_t tasks_kinds = 25;
+    const size_t batch = 100;
+
+    auto executor = DB::OrdinaryBackgroundExecutor::create
+    (
+        "GTest",
+        tasks_kinds,
+        tasks_kinds * batch,
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+    );
+
+    for (size_t i = 0; i < batch; ++i)
+        for (size_t j = 0; j < tasks_kinds; ++j)
+            ASSERT_TRUE(
+                executor->trySchedule(std::make_shared<FakeExecutableTask>(std::to_string(j)))
+            );
+
+    std::vector<std::thread> threads(batch);
+
+    auto remover_routine = [&] ()
+    {
+        for (size_t j = 0; j < tasks_kinds; ++j)
+            executor->removeTasksCorrespondingToStorage({"test", std::to_string(j)});
+    };
+
+    for (auto & thread : threads)
+        thread = std::thread(remover_routine);
+
+    for (auto & thread : threads)
+        thread.join();
+
+    ASSERT_EQ(CurrentMetrics::values[CurrentMetrics::BackgroundMergesAndMutationsPoolTask], 0);
+
+    executor->wait();
+}
+
+
+TEST(Executor, RemoveTasksStress)
+{
+    const size_t tasks_kinds = 25;
+    const size_t batch = 100;
+    const size_t schedulers_count = 5;
+    const size_t removers_count = 5;
+
+    auto executor = DB::OrdinaryBackgroundExecutor::create
+    (
+        "GTest",
+        tasks_kinds,
+        tasks_kinds * batch * (schedulers_count + removers_count),
+        CurrentMetrics::BackgroundMergesAndMutationsPoolTask
+    );
+
+    std::barrier barrier(schedulers_count + removers_count);
+
+    auto scheduler_routine = [&] ()
+    {
+        barrier.arrive_and_wait();
+        for (size_t i = 0; i < batch; ++i)
+            for (size_t j = 0; j < tasks_kinds; ++j)
+                executor->trySchedule(std::make_shared<FakeExecutableTask>(std::to_string(j)));
+    };
+
+    auto remover_routine = [&] ()
+    {
+        barrier.arrive_and_wait();
+        for (size_t j = 0; j < tasks_kinds; ++j)
+            executor->removeTasksCorrespondingToStorage({"test", std::to_string(j)});
+    };
+
+    std::vector<std::thread> schedulers(schedulers_count);
+    for (auto & scheduler : schedulers)
+        scheduler = std::thread(scheduler_routine);
+
+    std::vector<std::thread> removers(removers_count);
+    for (auto & remover : removers)
+        remover = std::thread(remover_routine);
+
+    for (auto & scheduler : schedulers)
+        scheduler.join();
+
+    for (auto & remover : removers)
+        remover.join();
+
+    for (size_t j = 0; j < tasks_kinds; ++j)
+        executor->removeTasksCorrespondingToStorage({"test", std::to_string(j)});
+
+    ASSERT_EQ(CurrentMetrics::values[CurrentMetrics::BackgroundMergesAndMutationsPoolTask], 0);
+
+    executor->wait();
+}
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index 17112ac469f..2c678574eb6 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -15,7 +15,7 @@
 #include <Core/Defines.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <Parsers/queryToString.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -75,6 +75,15 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.projection_name = command->projection->as<ASTIdentifier &>().name();
         return res;
     }
+    else if (command->type == ASTAlterCommand::MATERIALIZE_COLUMN)
+    {
+        MutationCommand res;
+        res.ast = command->ptr();
+        res.type = MATERIALIZE_COLUMN;
+        res.partition = command->partition;
+        res.column_name = getIdentifierName(command->column);
+        return res;
+    }
     else if (parse_alter_commands && command->type == ASTAlterCommand::MODIFY_COLUMN)
     {
         MutationCommand res;
diff --git a/src/Storages/MutationCommands.h b/src/Storages/MutationCommands.h
index 09808543068..cf1116f547a 100644
--- a/src/Storages/MutationCommands.h
+++ b/src/Storages/MutationCommands.h
@@ -1,14 +1,16 @@
 #pragma once
 
+#include <optional>
+#include <vector>
+#include <memory>
+#include <unordered_map>
+
+#include <base/shared_ptr_helper.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Storages/IStorage_fwd.h>
 #include <DataTypes/IDataType.h>
 #include <Core/Names.h>
 
-#include <optional>
-#include <unordered_map>
-
-
 namespace DB
 {
 
@@ -35,6 +37,7 @@ struct MutationCommand
         DROP_PROJECTION,
         MATERIALIZE_TTL,
         RENAME_COLUMN,
+        MATERIALIZE_COLUMN,
     };
 
     Type type = EMPTY;
@@ -67,7 +70,7 @@ struct MutationCommand
 };
 
 /// Multiple mutation commands, possible from different ALTER queries
-class MutationCommands : public std::vector<MutationCommand>
+class MutationCommands : public shared_ptr_helper<MutationCommands>, public std::vector<MutationCommand>
 {
 public:
     std::shared_ptr<ASTExpressionList> ast() const;
@@ -76,4 +79,6 @@ public:
     void readText(ReadBuffer & in);
 };
 
+using MutationCommandsConstPtr = std::shared_ptr<MutationCommands>;
+
 }
diff --git a/src/Storages/MySQL/MySQLSettings.h b/src/Storages/MySQL/MySQLSettings.h
index da8723c2ea6..872b0607e20 100644
--- a/src/Storages/MySQL/MySQLSettings.h
+++ b/src/Storages/MySQL/MySQLSettings.h
@@ -17,6 +17,7 @@ class ASTStorage;
 #define LIST_OF_MYSQL_SETTINGS(M) \
     M(UInt64, connection_pool_size, 16, "Size of connection pool (if all connections are in use, the query will wait until some connection will be freed).", 0) \
     M(UInt64, connection_max_tries, 3, "Number of retries for pool with failover", 0) \
+    M(UInt64, connection_wait_timeout, 5, "Timeout (in seconds) for waiting for free connection (in case of there is already connection_pool_size active connections), 0 - do not wait.", 0) \
     M(Bool, connection_auto_close, true, "Auto-close connection after query execution, i.e. disable connection reuse.", 0) \
 
 DECLARE_SETTINGS_TRAITS(MySQLSettingsTraits, LIST_OF_MYSQL_SETTINGS)
diff --git a/src/Storages/PartitionCommands.cpp b/src/Storages/PartitionCommands.cpp
index 917ea156ab7..fa36588513b 100644
--- a/src/Storages/PartitionCommands.cpp
+++ b/src/Storages/PartitionCommands.cpp
@@ -6,7 +6,7 @@
 #include <Core/ColumnWithTypeAndName.h>
 #include <DataTypes/DataTypeString.h>
 #include <Processors/Chunk.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 
 
diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h
index 554b86f4e76..9807c90bc23 100644
--- a/src/Storages/PartitionCommands.h
+++ b/src/Storages/PartitionCommands.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Field.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>
 
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
index b43e7656084..947c0bbe932 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
@@ -3,11 +3,12 @@
 #include "StorageMaterializedPostgreSQL.h"
 #include <Columns/ColumnNullable.h>
 #include <Common/hex.h>
-#include <DataStreams/copyData.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Common/SettingsChanges.h>
 
 
 namespace DB
@@ -26,8 +27,9 @@ MaterializedPostgreSQLConsumer::MaterializedPostgreSQLConsumer(
     const std::string & start_lsn,
     const size_t max_block_size_,
     bool allow_automatic_update_,
-    Storages storages_)
-    : log(&Poco::Logger::get("PostgreSQLReaplicaConsumer"))
+    Storages storages_,
+    const String & name_for_logger)
+    : log(&Poco::Logger::get("PostgreSQLReplicaConsumer(" + name_for_logger + ")"))
     , context(context_)
     , replication_slot_name(replication_slot_name_)
     , publication_name(publication_name_)
@@ -270,12 +272,13 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
         case 'I': // Insert
         {
             Int32 relation_id = readInt32(replication_message, pos, size);
+            const auto & table_name = relation_id_to_name[relation_id];
+            assert(!table_name.empty());
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, table_name))
                 return;
 
             Int8 new_tuple = readInt8(replication_message, pos, size);
-            const auto & table_name = relation_id_to_name[relation_id];
             auto buffer = buffers.find(table_name);
             assert(buffer != buffers.end());
 
@@ -287,11 +290,12 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
         case 'U': // Update
         {
             Int32 relation_id = readInt32(replication_message, pos, size);
+            const auto & table_name = relation_id_to_name[relation_id];
+            assert(!table_name.empty());
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, table_name))
                 return;
 
-            const auto & table_name = relation_id_to_name[relation_id];
             auto buffer = buffers.find(table_name);
             assert(buffer != buffers.end());
 
@@ -335,14 +339,15 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
         case 'D': // Delete
         {
             Int32 relation_id = readInt32(replication_message, pos, size);
+            const auto & table_name = relation_id_to_name[relation_id];
+            assert(!table_name.empty());
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, table_name))
                 return;
 
              /// 0 or 1 if replica identity is set to full. For now only default replica identity is supported (with primary keys).
             readInt8(replication_message, pos, size);
 
-            const auto & table_name = relation_id_to_name[relation_id];
             auto buffer = buffers.find(table_name);
             assert(buffer != buffers.end());
             readTupleData(buffer->second, replication_message, pos, size, PostgreSQLQuery::DELETE);
@@ -357,8 +362,6 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
             constexpr size_t transaction_commit_timestamp_len = 8;
             pos += unused_flags_len + commit_lsn_len + transaction_end_lsn_len + transaction_commit_timestamp_len;
 
-            LOG_DEBUG(log, "Current lsn: {} = {}", current_lsn, getLSNValue(current_lsn)); /// Will be removed
-
             final_lsn = current_lsn;
             break;
         }
@@ -371,7 +374,7 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
             readString(replication_message, pos, size, relation_namespace);
             readString(replication_message, pos, size, relation_name);
 
-            if (!isSyncAllowed(relation_id))
+            if (!isSyncAllowed(relation_id, relation_name))
                 return;
 
             if (storages.find(relation_name) == storages.end())
@@ -433,7 +436,7 @@ void MaterializedPostgreSQLConsumer::processReplicationMessage(const char * repl
 
                 if (new_relation_definition)
                 {
-                    current_schema_data.column_identifiers.emplace_back(std::make_tuple(data_type_id, type_modifier));
+                    current_schema_data.column_identifiers.emplace_back(std::make_pair(data_type_id, type_modifier));
                 }
                 else
                 {
@@ -484,11 +487,15 @@ void MaterializedPostgreSQLConsumer::syncTables()
                 insert->columns = buffer.columnsAST;
 
                 InterpreterInsertQuery interpreter(insert, insert_context, true);
-                auto block_io = interpreter.execute();
-                OneBlockInputStream input(result_rows);
+                auto io = interpreter.execute();
+                auto input = std::make_shared<SourceFromSingleChunk>(
+                    result_rows.cloneEmpty(), Chunk(result_rows.getColumns(), result_rows.rows()));
 
-                assertBlocksHaveEqualStructure(input.getHeader(), block_io.out->getHeader(), "postgresql replica table sync");
-                copyData(input, *block_io.out);
+                assertBlocksHaveEqualStructure(input->getPort().getHeader(), io.pipeline.getHeader(), "postgresql replica table sync");
+                io.pipeline.complete(Pipe(std::move(input)));
+
+                CompletedPipelineExecutor executor(io.pipeline);
+                executor.execute();
 
                 buffer.columns = buffer.description.sample_block.cloneEmptyColumns();
             }
@@ -522,15 +529,35 @@ String MaterializedPostgreSQLConsumer::advanceLSN(std::shared_ptr<pqxx::nontrans
 /// Sync for some table might not be allowed if:
 /// 1. Table schema changed and might break synchronization.
 /// 2. There is no storage for this table. (As a result of some exception or incorrect pg_publication)
-bool MaterializedPostgreSQLConsumer::isSyncAllowed(Int32 relation_id)
+/// 3. A new table was added to replication, it was loaded via snapshot, but consumer has not yet
+///    read wal up to the lsn position of snapshot, from which table was loaded.
+bool MaterializedPostgreSQLConsumer::isSyncAllowed(Int32 relation_id, const String & relation_name)
 {
-    auto table_with_lsn = skip_list.find(relation_id);
+    if (deleted_tables.contains(relation_name))
+        return false;
+
+    auto new_table_with_lsn = waiting_list.find(relation_name);
+
+    if (new_table_with_lsn != waiting_list.end())
+    {
+        auto table_start_lsn = new_table_with_lsn->second;
+        assert(!table_start_lsn.empty());
+
+        if (getLSNValue(current_lsn) >= getLSNValue(table_start_lsn))
+        {
+            LOG_TRACE(log, "Synchronization is started for table: {} (start_lsn: {})", relation_name, table_start_lsn);
+            waiting_list.erase(new_table_with_lsn);
+            return true;
+        }
+    }
+
+    auto skipped_table_with_lsn = skip_list.find(relation_id);
 
     /// Table is not present in a skip list - allow synchronization.
-    if (table_with_lsn == skip_list.end())
+    if (skipped_table_with_lsn == skip_list.end())
         return true;
 
-    const auto & table_start_lsn = table_with_lsn->second;
+    const auto & table_start_lsn = skipped_table_with_lsn->second;
 
     /// Table is in a skip list and has not yet received a valid lsn == it has not been reloaded.
     if (table_start_lsn.empty())
@@ -544,7 +571,7 @@ bool MaterializedPostgreSQLConsumer::isSyncAllowed(Int32 relation_id)
         LOG_TRACE(log, "Synchronization is resumed for table: {} (start_lsn: {})",
                 relation_id_to_name[relation_id], table_start_lsn);
 
-        skip_list.erase(table_with_lsn);
+        skip_list.erase(skipped_table_with_lsn);
 
         return true;
     }
@@ -576,6 +603,51 @@ void MaterializedPostgreSQLConsumer::markTableAsSkipped(Int32 relation_id, const
 }
 
 
+void MaterializedPostgreSQLConsumer::addNested(const String & postgres_table_name, StoragePtr nested_storage, const String & table_start_lsn)
+{
+    /// Cache new pointer to replacingMergeTree table.
+    storages.emplace(postgres_table_name, nested_storage);
+
+    /// Add new in-memory buffer.
+    buffers.emplace(postgres_table_name, Buffer(nested_storage));
+
+    /// Replication consumer will read wall and check for currently processed table whether it is allowed to start applying
+    /// changes to this table.
+    waiting_list[postgres_table_name] = table_start_lsn;
+}
+
+
+void MaterializedPostgreSQLConsumer::updateNested(const String & table_name, StoragePtr nested_storage, Int32 table_id, const String & table_start_lsn)
+{
+    /// Cache new pointer to replacingMergeTree table.
+    storages[table_name] = nested_storage;
+
+    /// Create a new empty buffer (with updated metadata), where data is first loaded before syncing into actual table.
+    auto & buffer = buffers.find(table_name)->second;
+    buffer.createEmptyBuffer(nested_storage);
+
+    /// Set start position to valid lsn. Before it was an empty string. Further read for table allowed, if it has a valid lsn.
+    skip_list[table_id] = table_start_lsn;
+}
+
+
+void MaterializedPostgreSQLConsumer::removeNested(const String & postgres_table_name)
+{
+    storages.erase(postgres_table_name);
+    buffers.erase(postgres_table_name);
+    deleted_tables.insert(postgres_table_name);
+}
+
+
+void MaterializedPostgreSQLConsumer::setSetting(const SettingChange & setting)
+{
+    if (setting.name == "materialized_postgresql_max_block_size")
+        max_block_size = setting.value.safeGet<UInt64>();
+    else if (setting.name == "materialized_postgresql_allow_automatic_update")
+        allow_automatic_update = setting.value.safeGet<bool>();
+}
+
+
 /// Read binary changes from replication slot via COPY command (starting from current lsn in a slot).
 bool MaterializedPostgreSQLConsumer::readFromReplicationSlot()
 {
@@ -625,9 +697,8 @@ bool MaterializedPostgreSQLConsumer::readFromReplicationSlot()
         tryLogCurrentException(__PRETTY_FUNCTION__);
         return false;
     }
-    catch (const pqxx::broken_connection & e)
+    catch (const pqxx::broken_connection &)
     {
-        LOG_ERROR(log, "Connection error: {}", e.what());
         connection->tryUpdateConnection();
         return false;
     }
@@ -641,6 +712,7 @@ bool MaterializedPostgreSQLConsumer::readFromReplicationSlot()
         if (error_message.find("out of relcache_callback_list slots") == std::string::npos)
             tryLogCurrentException(__PRETTY_FUNCTION__);
 
+        connection->tryUpdateConnection();
         return false;
     }
     catch (const pqxx::conversion_error & e)
@@ -700,21 +772,10 @@ bool MaterializedPostgreSQLConsumer::consume(std::vector<std::pair<Int32, String
     /// Read up to max_block_size changed (approximately - in same cases might be more).
     /// false: no data was read, reschedule.
     /// true: some data was read, schedule as soon as possible.
-    return readFromReplicationSlot();
+    auto read_next = readFromReplicationSlot();
+    LOG_TRACE(log, "LSN: {}", final_lsn);
+    return read_next;
 }
 
 
-void MaterializedPostgreSQLConsumer::updateNested(const String & table_name, StoragePtr nested_storage, Int32 table_id, const String & table_start_lsn)
-{
-    /// Cache new pointer to replacingMergeTree table.
-    storages[table_name] = nested_storage;
-
-    /// Create a new empty buffer (with updated metadata), where data is first loaded before syncing into actual table.
-    auto & buffer = buffers.find(table_name)->second;
-    buffer.createEmptyBuffer(nested_storage);
-
-    /// Set start position to valid lsn. Before it was an empty string. Further read for table allowed, if it has a valid lsn.
-    skip_list[table_id] = table_start_lsn;
-}
-
 }
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
index 8f3224784f1..ff47866d587 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
@@ -5,14 +5,14 @@
 
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Names.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Storages/IStorage.h>
-#include <DataStreams/OneBlockInputStream.h>
 #include <Parsers/ASTExpressionList.h>
 
 
 namespace DB
 {
+struct SettingChange;
 
 class MaterializedPostgreSQLConsumer
 {
@@ -27,7 +27,8 @@ public:
             const String & start_lsn,
             const size_t max_block_size_,
             bool allow_automatic_update_,
-            Storages storages_);
+            Storages storages_,
+            const String & name_for_logger);
 
     bool consume(std::vector<std::pair<Int32, String>> & skipped_tables);
 
@@ -35,6 +36,12 @@ public:
     /// process if it was skipped due to schema changes.
     void updateNested(const String & table_name, StoragePtr nested_storage, Int32 table_id, const String & table_start_lsn);
 
+    void addNested(const String & postgres_table_name, StoragePtr nested_storage, const String & table_start_lsn);
+
+    void removeNested(const String & postgres_table_name);
+
+    void setSetting(const SettingChange & setting);
+
 private:
     /// Read approximarely up to max_block_size changes from WAL.
     bool readFromReplicationSlot();
@@ -45,7 +52,7 @@ private:
 
     void processReplicationMessage(const char * replication_message, size_t size);
 
-    bool isSyncAllowed(Int32 relation_id);
+    bool isSyncAllowed(Int32 relation_id, const String & relation_name);
 
     struct Buffer
     {
@@ -105,15 +112,18 @@ private:
     /// current_lsn converted from String to Int64 via getLSNValue().
     UInt64 lsn_value;
 
-    const size_t max_block_size;
+    size_t max_block_size;
     bool allow_automatic_update;
 
     String table_to_insert;
 
     /// List of tables which need to be synced after last replication stream.
+    /// Holds `postgres_table_name` set.
     std::unordered_set<std::string> tables_to_sync;
 
+    /// `postgres_table_name` -> ReplacingMergeTree table.
     Storages storages;
+    /// `postgres_table_name` -> In-memory buffer.
     Buffers buffers;
 
     std::unordered_map<Int32, String> relation_id_to_name;
@@ -133,6 +143,7 @@ private:
     /// if relation definition has changed since the last relation definition message.
     std::unordered_map<Int32, SchemaData> schema_data;
 
+    /// `postgres_relation_id` -> `start_lsn`
     /// skip_list contains relation ids for tables on which ddl was performed, which can break synchronization.
     /// This breaking changes are detected in replication stream in according replication message and table is added to skip list.
     /// After it is finished, a temporary replication slot is created with 'export snapshot' option, and start_lsn is returned.
@@ -142,5 +153,16 @@ private:
     /// No needed message, related to reloaded table will be missed, because messages are not consumed in the meantime,
     /// i.e. we will not miss the first start_lsn position for reloaded table.
     std::unordered_map<Int32, String> skip_list;
+
+    /// `postgres_table_name` -> `start_lsn`
+    /// For dynamically added tables. A new table is loaded via snapshot and we get a start lsn position.
+    /// Once consumer reaches this position, it starts applying replication messages to this table.
+    /// Inside replication handler we have to ensure that replication consumer does not read data from wal
+    /// while the process of adding a table to replication is not finished,
+    /// because we might go beyond this start lsn position before consumer knows that a new table was added.
+    std::unordered_map<String, String> waiting_list;
+
+    /// Since replication may be some time behind, we need to ensure that replication messages for deleted tables are ignored.
+    std::unordered_set<String> deleted_tables;
 };
 }
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLSettings.h b/src/Storages/PostgreSQL/MaterializedPostgreSQLSettings.h
index 3bc32a21876..b729515032f 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLSettings.h
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLSettings.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 #include <Core/BaseSettings.h>
@@ -16,7 +14,9 @@ namespace DB
 #define LIST_OF_MATERIALIZED_POSTGRESQL_SETTINGS(M) \
     M(UInt64, materialized_postgresql_max_block_size, 65536, "Number of row collected before flushing data into table.", 0) \
     M(String, materialized_postgresql_tables_list, "", "List of tables for MaterializedPostgreSQL database engine", 0) \
-    M(Bool, materialized_postgresql_allow_automatic_update, 0, "Allow to reload table in the background, when schema changes are detected", 0) \
+    M(Bool, materialized_postgresql_allow_automatic_update, false, "Allow to reload table in the background, when schema changes are detected", 0) \
+    M(String, materialized_postgresql_replication_slot, "", "A user-created replication slot", 0) \
+    M(String, materialized_postgresql_snapshot, "", "User provided snapshot in case he manages replication slots himself", 0) \
 
 DECLARE_SETTINGS_TRAITS(MaterializedPostgreSQLSettingsTraits, LIST_OF_MATERIALIZED_POSTGRESQL_SETTINGS)
 
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
index 4c614d8fd5a..670148e9baa 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
@@ -1,6 +1,7 @@
 #include "PostgreSQLReplicationHandler.h"
 
-#include <DataStreams/PostgreSQLBlockInputStream.h>
+#include <Processors/Transforms/PostgreSQLSource.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
 #include <Interpreters/InterpreterDropQuery.h>
@@ -8,19 +9,20 @@
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Common/setThreadName.h>
 #include <Interpreters/Context.h>
-#include <DataStreams/copyData.h>
+#include <Databases/DatabaseOnDisk.h>
 
 
 namespace DB
 {
 
-static const auto RESCHEDULE_MS = 500;
+static const auto RESCHEDULE_MS = 1000;
 static const auto BACKOFF_TRESHOLD_MS = 10000;
 
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
+    extern const int POSTGRESQL_REPLICATION_INTERNAL_ERROR;
 }
 
 PostgreSQLReplicationHandler::PostgreSQLReplicationHandler(
@@ -30,24 +32,27 @@ PostgreSQLReplicationHandler::PostgreSQLReplicationHandler(
     const postgres::ConnectionInfo & connection_info_,
     ContextPtr context_,
     bool is_attach_,
-    const size_t max_block_size_,
-    bool allow_automatic_update_,
-    bool is_materialized_postgresql_database_,
-    const String tables_list_)
+    const MaterializedPostgreSQLSettings & replication_settings,
+    bool is_materialized_postgresql_database_)
     : log(&Poco::Logger::get("PostgreSQLReplicationHandler"))
     , context(context_)
     , is_attach(is_attach_)
     , remote_database_name(remote_database_name_)
     , current_database_name(current_database_name_)
     , connection_info(connection_info_)
-    , max_block_size(max_block_size_)
-    , allow_automatic_update(allow_automatic_update_)
+    , max_block_size(replication_settings.materialized_postgresql_max_block_size)
+    , allow_automatic_update(replication_settings.materialized_postgresql_allow_automatic_update)
     , is_materialized_postgresql_database(is_materialized_postgresql_database_)
-    , tables_list(tables_list_)
-    , connection(std::make_shared<postgres::Connection>(connection_info_))
+    , tables_list(replication_settings.materialized_postgresql_tables_list)
+    , user_provided_snapshot(replication_settings.materialized_postgresql_snapshot)
     , milliseconds_to_wait(RESCHEDULE_MS)
 {
-    replication_slot = fmt::format("{}_ch_replication_slot", replication_identifier);
+    replication_slot = replication_settings.materialized_postgresql_replication_slot;
+    if (replication_slot.empty())
+    {
+        user_managed_slot = false;
+        replication_slot = fmt::format("{}_ch_replication_slot", replication_identifier);
+    }
     publication_name = fmt::format("{}_ch_publication", replication_identifier);
 
     startup_task = context->getSchedulePool().createTask("PostgreSQLReplicaStartup", [this]{ waitConnectionAndStart(); });
@@ -71,7 +76,8 @@ void PostgreSQLReplicationHandler::waitConnectionAndStart()
 {
     try
     {
-        connection->connect(); /// Will throw pqxx::broken_connection if no connection at the moment
+        postgres::Connection connection(connection_info);
+        connection.connect(); /// Will throw pqxx::broken_connection if no connection at the moment
         startSynchronization(false);
     }
     catch (const pqxx::broken_connection & pqxx_error)
@@ -96,14 +102,9 @@ void PostgreSQLReplicationHandler::shutdown()
 
 void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
 {
-    {
-        pqxx::work tx(connection->getRef());
-        createPublicationIfNeeded(tx);
-        tx.commit();
-    }
-
     postgres::Connection replication_connection(connection_info, /* replication */true);
     pqxx::nontransaction tx(replication_connection.getRef());
+    createPublicationIfNeeded(tx);
 
     /// List of nested tables (table_name -> nested_storage), which is passed to replication consumer.
     std::unordered_map<String, StoragePtr> nested_storages;
@@ -114,18 +115,34 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
     /// 2. if replication slot already exist, start_lsn is read from pg_replication_slots as
     ///    `confirmed_flush_lsn` - the address (LSN) up to which the logical slot's consumer has confirmed receiving data.
     ///    Data older than this is not available anymore.
-    ///    TODO: more tests
     String snapshot_name, start_lsn;
 
+    /// Also lets have a separate non-replication connection, because we need two parallel transactions and
+    /// one connection can have one transaction at a time.
+    auto tmp_connection = std::make_shared<postgres::Connection>(connection_info);
+
     auto initial_sync = [&]()
     {
-        createReplicationSlot(tx, start_lsn, snapshot_name);
+        LOG_TRACE(log, "Starting tables sync load");
+
+        if (user_managed_slot)
+        {
+            if (user_provided_snapshot.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                "Using a user-defined replication slot must be provided with a snapshot from EXPORT SNAPSHOT when the slot is created."
+                                "Pass it to `materialized_postgresql_snapshot` setting");
+            snapshot_name = user_provided_snapshot;
+        }
+        else
+        {
+            createReplicationSlot(tx, start_lsn, snapshot_name);
+        }
 
         for (const auto & [table_name, storage] : materialized_storages)
         {
             try
             {
-                nested_storages[table_name] = loadFromSnapshot(snapshot_name, table_name, storage->as <StorageMaterializedPostgreSQL>());
+                nested_storages[table_name] = loadFromSnapshot(*tmp_connection, snapshot_name, table_name, storage->as<StorageMaterializedPostgreSQL>());
             }
             catch (Exception & e)
             {
@@ -145,12 +162,17 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
     /// Recreation of a replication slot imposes reloading of all tables.
     if (!isReplicationSlotExist(tx, start_lsn, /* temporary */false))
     {
+        if (user_managed_slot)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Having replication slot `{}` from settings, but it does not exist", replication_slot);
+
         initial_sync();
     }
     /// Always drop replication slot if it is CREATE query and not ATTACH.
-    else if (!is_attach || new_publication)
+    else if (!is_attach)
     {
-        dropReplicationSlot(tx);
+        if (!user_managed_slot)
+            dropReplicationSlot(tx);
+
         initial_sync();
     }
     /// Synchronization and initial load already took place - do not create any new tables, just fetch StoragePtr's
@@ -162,6 +184,8 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
             auto * materialized_storage = storage->as <StorageMaterializedPostgreSQL>();
             try
             {
+                /// FIXME: Looks like it is possible we might get here if there is no nested storage or at least nested storage id field might be empty.
+                ///        Caught it somehow when doing something else incorrectly, but do not see any reason how it could happen.
                 /// Try load nested table, set materialized table metadata.
                 nested_storages[table_name] = materialized_storage->prepare();
             }
@@ -185,13 +209,14 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
     /// Handler uses it only for loadFromSnapshot and shutdown methods.
     consumer = std::make_shared<MaterializedPostgreSQLConsumer>(
             context,
-            connection,
+            std::move(tmp_connection),
             replication_slot,
             publication_name,
             start_lsn,
             max_block_size,
             allow_automatic_update,
-            nested_storages);
+            nested_storages,
+            (is_materialized_postgresql_database ? remote_database_name : remote_database_name + '.' + tables_list));
 
     consumer_task->activateAndSchedule();
 
@@ -200,17 +225,28 @@ void PostgreSQLReplicationHandler::startSynchronization(bool throw_on_error)
 }
 
 
-StoragePtr PostgreSQLReplicationHandler::loadFromSnapshot(String & snapshot_name, const String & table_name,
+ASTPtr PostgreSQLReplicationHandler::getCreateNestedTableQuery(StorageMaterializedPostgreSQL * storage, const String & table_name)
+{
+    postgres::Connection connection(connection_info);
+    pqxx::nontransaction tx(connection.getRef());
+    auto table_structure = std::make_unique<PostgreSQLTableStructure>(fetchPostgreSQLTableStructure(tx, table_name, postgres_schema, true, true, true));
+    if (!table_structure)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to get PostgreSQL table structure");
+    return storage->getCreateNestedTableQuery(std::move(table_structure));
+}
+
+
+StoragePtr PostgreSQLReplicationHandler::loadFromSnapshot(postgres::Connection & connection, String & snapshot_name, const String & table_name,
                                                           StorageMaterializedPostgreSQL * materialized_storage)
 {
-    auto tx = std::make_shared<pqxx::ReplicationTransaction>(connection->getRef());
+    auto tx = std::make_shared<pqxx::ReplicationTransaction>(connection.getRef());
 
     std::string query_str = fmt::format("SET TRANSACTION SNAPSHOT '{}'", snapshot_name);
     tx->exec(query_str);
 
     /// Load from snapshot, which will show table state before creation of replication slot.
     /// Already connected to needed database, no need to add it to query.
-    query_str = fmt::format("SELECT * FROM {}", table_name);
+    query_str = fmt::format("SELECT * FROM {}", doubleQuoteString(table_name));
 
     materialized_storage->createNestedIfNeeded(fetchTableStructure(*tx, table_name));
     auto nested_storage = materialized_storage->getNested();
@@ -226,9 +262,12 @@ StoragePtr PostgreSQLReplicationHandler::loadFromSnapshot(String & snapshot_name
     const StorageInMemoryMetadata & storage_metadata = nested_storage->getInMemoryMetadata();
     auto sample_block = storage_metadata.getSampleBlockNonMaterialized();
 
-    PostgreSQLTransactionBlockInputStream<pqxx::ReplicationTransaction> input(tx, query_str, sample_block, DEFAULT_BLOCK_SIZE);
-    assertBlocksHaveEqualStructure(input.getHeader(), block_io.out->getHeader(), "postgresql replica load from snapshot");
-    copyData(input, *block_io.out);
+    auto input = std::make_unique<PostgreSQLTransactionSource<pqxx::ReplicationTransaction>>(tx, query_str, sample_block, DEFAULT_BLOCK_SIZE);
+    assertBlocksHaveEqualStructure(input->getPort().getHeader(), block_io.pipeline.getHeader(), "postgresql replica load from snapshot");
+    block_io.pipeline.complete(Pipe(std::move(input)));
+
+    CompletedPipelineExecutor executor(block_io.pipeline);
+    executor.execute();
 
     nested_storage = materialized_storage->prepare();
     auto nested_table_id = nested_storage->getStorageID();
@@ -280,7 +319,7 @@ void PostgreSQLReplicationHandler::consumerFunc()
 }
 
 
-bool PostgreSQLReplicationHandler::isPublicationExist(pqxx::work & tx)
+bool PostgreSQLReplicationHandler::isPublicationExist(pqxx::nontransaction & tx)
 {
     std::string query_str = fmt::format("SELECT exists (SELECT 1 FROM pg_publication WHERE pubname = '{}')", publication_name);
     pqxx::result result{tx.exec(query_str)};
@@ -289,7 +328,7 @@ bool PostgreSQLReplicationHandler::isPublicationExist(pqxx::work & tx)
 }
 
 
-void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::work & tx)
+void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::nontransaction & tx)
 {
     auto publication_exists = isPublicationExist(tx);
 
@@ -300,7 +339,7 @@ void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::work & tx)
                     "Publication {} already exists, but it is a CREATE query, not ATTACH. Publication will be dropped",
                     publication_name);
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
+        dropPublication(tx);
     }
 
     if (!is_attach || !publication_exists)
@@ -311,7 +350,7 @@ void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::work & tx)
             {
                 if (!tables_list.empty())
                     tables_list += ", ";
-                tables_list += storage_data.first;
+                tables_list += doubleQuoteString(storage_data.first);
             }
         }
 
@@ -324,7 +363,6 @@ void PostgreSQLReplicationHandler::createPublicationIfNeeded(pqxx::work & tx)
         {
             tx.exec(query_str);
             LOG_TRACE(log, "Created publication {} with tables list: {}", publication_name, tables_list);
-            new_publication = true;
         }
         catch (Exception & e)
         {
@@ -366,6 +404,8 @@ bool PostgreSQLReplicationHandler::isReplicationSlotExist(pqxx::nontransaction &
 void PostgreSQLReplicationHandler::createReplicationSlot(
         pqxx::nontransaction & tx, String & start_lsn, String & snapshot_name, bool temporary)
 {
+    assert(temporary || !user_managed_slot);
+
     String query_str, slot_name;
     if (temporary)
         slot_name = replication_slot + "_tmp";
@@ -379,7 +419,7 @@ void PostgreSQLReplicationHandler::createReplicationSlot(
         pqxx::result result{tx.exec(query_str)};
         start_lsn = result[0][1].as<std::string>();
         snapshot_name = result[0][2].as<std::string>();
-        LOG_TRACE(log, "Created replication slot: {}, start lsn: {}", replication_slot, start_lsn);
+        LOG_TRACE(log, "Created replication slot: {}, start lsn: {}, snapshot: {}", replication_slot, start_lsn, snapshot_name);
     }
     catch (Exception & e)
     {
@@ -391,6 +431,8 @@ void PostgreSQLReplicationHandler::createReplicationSlot(
 
 void PostgreSQLReplicationHandler::dropReplicationSlot(pqxx::nontransaction & tx, bool temporary)
 {
+    assert(temporary || !user_managed_slot);
+
     std::string slot_name;
     if (temporary)
         slot_name = replication_slot + "_tmp";
@@ -412,26 +454,54 @@ void PostgreSQLReplicationHandler::dropPublication(pqxx::nontransaction & tx)
 }
 
 
+void PostgreSQLReplicationHandler::addTableToPublication(pqxx::nontransaction & ntx, const String & table_name)
+{
+    std::string query_str = fmt::format("ALTER PUBLICATION {} ADD TABLE ONLY {}", publication_name, doubleQuoteString(table_name));
+    ntx.exec(query_str);
+    LOG_TRACE(log, "Added table `{}` to publication `{}`", table_name, publication_name);
+}
+
+
+void PostgreSQLReplicationHandler::removeTableFromPublication(pqxx::nontransaction & ntx, const String & table_name)
+{
+    std::string query_str = fmt::format("ALTER PUBLICATION {} DROP TABLE ONLY {}", publication_name, doubleQuoteString(table_name));
+    ntx.exec(query_str);
+    LOG_TRACE(log, "Removed table `{}` from publication `{}`", table_name, publication_name);
+}
+
+
+void PostgreSQLReplicationHandler::setSetting(const SettingChange & setting)
+{
+    consumer_task->deactivate();
+    consumer->setSetting(setting);
+    consumer_task->activateAndSchedule();
+}
+
+
 void PostgreSQLReplicationHandler::shutdownFinal()
 {
     try
     {
         shutdown();
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx){ dropPublication(tx); });
+        postgres::Connection connection(connection_info);
+        connection.execWithRetry([&](pqxx::nontransaction & tx){ dropPublication(tx); });
         String last_committed_lsn;
 
-        connection->execWithRetry([&](pqxx::nontransaction & tx)
-        {
-            if (isReplicationSlotExist(tx, last_committed_lsn, /* temporary */false))
-                dropReplicationSlot(tx, /* temporary */false);
-        });
-
-        connection->execWithRetry([&](pqxx::nontransaction & tx)
+        connection.execWithRetry([&](pqxx::nontransaction & tx)
         {
             if (isReplicationSlotExist(tx, last_committed_lsn, /* temporary */true))
                 dropReplicationSlot(tx, /* temporary */true);
         });
+
+        if (user_managed_slot)
+            return;
+
+        connection.execWithRetry([&](pqxx::nontransaction & tx)
+        {
+            if (isReplicationSlotExist(tx, last_committed_lsn, /* temporary */false))
+                dropReplicationSlot(tx, /* temporary */false);
+        });
     }
     catch (Exception & e)
     {
@@ -443,12 +513,17 @@ void PostgreSQLReplicationHandler::shutdownFinal()
 
 
 /// Used by MaterializedPostgreSQL database engine.
-NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection & connection_)
+std::set<String> PostgreSQLReplicationHandler::fetchRequiredTables()
 {
-    pqxx::work tx(connection_.getRef());
-    NameSet result_tables;
+    postgres::Connection connection(connection_info);
+    std::set<String> result_tables;
+    bool publication_exists_before_startup;
+
+    {
+        pqxx::nontransaction tx(connection.getRef());
+        publication_exists_before_startup = isPublicationExist(tx);
+    }
 
-    bool publication_exists_before_startup = isPublicationExist(tx);
     LOG_DEBUG(log, "Publication exists: {}, is attach: {}", publication_exists_before_startup, is_attach);
 
     Strings expected_tables;
@@ -469,7 +544,7 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
                         "Publication {} already exists, but it is a CREATE query, not ATTACH. Publication will be dropped",
                         publication_name);
 
-            connection->execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
+            connection.execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
         }
         else
         {
@@ -479,14 +554,22 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
                             "Publication {} already exists and tables list is empty. Assuming publication is correct.",
                             publication_name);
 
-                result_tables = fetchPostgreSQLTablesList(tx);
+                {
+                    pqxx::nontransaction tx(connection.getRef());
+                    result_tables = fetchPostgreSQLTablesList(tx, postgres_schema);
+                }
             }
             /// Check tables list from publication is the same as expected tables list.
             /// If not - drop publication and return expected tables list.
             else
             {
-                result_tables = fetchTablesFromPublication(tx);
+                {
+                    pqxx::work tx(connection.getRef());
+                    result_tables = fetchTablesFromPublication(tx);
+                }
+
                 NameSet diff;
+                std::sort(expected_tables.begin(), expected_tables.end());
                 std::set_symmetric_difference(expected_tables.begin(), expected_tables.end(),
                                               result_tables.begin(), result_tables.end(),
                                               std::inserter(diff, diff.begin()));
@@ -499,12 +582,30 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
                             diff_tables += ", ";
                         diff_tables += table_name;
                     }
+                    String publication_tables;
+                    for (const auto & table_name : result_tables)
+                    {
+                        if (!publication_tables.empty())
+                            publication_tables += ", ";
+                        publication_tables += table_name;
+                    }
+                    String listed_tables;
+                    for (const auto & table_name : expected_tables)
+                    {
+                        if (!listed_tables.empty())
+                            listed_tables += ", ";
+                        listed_tables += table_name;
+                    }
 
-                    LOG_WARNING(log,
-                                "Publication {} already exists, but specified tables list differs from publication tables list in tables: {}.",
-                                publication_name, diff_tables);
+                    LOG_ERROR(log,
+                              "Publication {} already exists, but specified tables list differs from publication tables list in tables: {}. ",
+                              "Will use tables list from setting. "
+                              "To avoid redundant work, you can try ALTER PUBLICATION query to remove redundant tables. "
+                              "Or you can you ALTER SETTING. "
+                              "\nPublication tables: {}.\nTables list: {}",
+                              publication_name, diff_tables, publication_tables, listed_tables);
 
-                    connection->execWithRetry([&](pqxx::nontransaction & tx_){ dropPublication(tx_); });
+                    return std::set(expected_tables.begin(), expected_tables.end());
                 }
             }
         }
@@ -514,26 +615,28 @@ NameSet PostgreSQLReplicationHandler::fetchRequiredTables(postgres::Connection &
     {
         if (!tables_list.empty())
         {
-            result_tables = NameSet(expected_tables.begin(), expected_tables.end());
+            result_tables = std::set(expected_tables.begin(), expected_tables.end());
         }
         else
         {
             /// Fetch all tables list from database. Publication does not exist yet, which means
             /// that no replication took place. Publication will be created in
             /// startSynchronization method.
-            result_tables = fetchPostgreSQLTablesList(tx);
+            {
+                pqxx::nontransaction tx(connection.getRef());
+                result_tables = fetchPostgreSQLTablesList(tx, postgres_schema);
+            }
         }
     }
 
-    tx.commit();
     return result_tables;
 }
 
 
-NameSet PostgreSQLReplicationHandler::fetchTablesFromPublication(pqxx::work & tx)
+std::set<String> PostgreSQLReplicationHandler::fetchTablesFromPublication(pqxx::work & tx)
 {
     std::string query = fmt::format("SELECT tablename FROM pg_publication_tables WHERE pubname = '{}'", publication_name);
-    std::unordered_set<std::string> tables;
+    std::set<String> tables;
 
     for (auto table_name : tx.stream<std::string>(query))
         tables.insert(std::get<0>(table_name));
@@ -548,7 +651,99 @@ PostgreSQLTableStructurePtr PostgreSQLReplicationHandler::fetchTableStructure(
     if (!is_materialized_postgresql_database)
         return nullptr;
 
-    return std::make_unique<PostgreSQLTableStructure>(fetchPostgreSQLTableStructure(tx, table_name, true, true, true));
+    PostgreSQLTableStructure structure;
+    try
+    {
+        structure = fetchPostgreSQLTableStructure(tx, table_name, postgres_schema, true, true, true);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+    return std::make_unique<PostgreSQLTableStructure>(std::move(structure));
+}
+
+
+void PostgreSQLReplicationHandler::addTableToReplication(StorageMaterializedPostgreSQL * materialized_storage, const String & postgres_table_name)
+{
+    /// Note: we have to ensure that replication consumer task is stopped when we reload table, because otherwise
+    /// it can read wal beyond start lsn position (from which this table is being loaded), which will result in losing data.
+    consumer_task->deactivate();
+    try
+    {
+        LOG_TRACE(log, "Adding table `{}` to replication", postgres_table_name);
+        postgres::Connection replication_connection(connection_info, /* replication */true);
+        String snapshot_name, start_lsn;
+        StoragePtr nested_storage;
+
+        {
+            pqxx::nontransaction tx(replication_connection.getRef());
+            if (isReplicationSlotExist(tx, start_lsn, /* temporary */true))
+                dropReplicationSlot(tx, /* temporary */true);
+            createReplicationSlot(tx, start_lsn, snapshot_name, /* temporary */true);
+
+            /// Protect against deadlock.
+            auto nested = DatabaseCatalog::instance().tryGetTable(materialized_storage->getNestedStorageID(), materialized_storage->getNestedTableContext());
+            if (!nested)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Internal table was not created");
+
+            {
+                postgres::Connection tmp_connection(connection_info);
+                nested_storage = loadFromSnapshot(tmp_connection, snapshot_name, postgres_table_name, materialized_storage);
+            }
+            auto nested_table_id = nested_storage->getStorageID();
+            materialized_storage->setNestedStorageID(nested_table_id);
+            nested_storage = materialized_storage->prepare();
+        }
+
+        {
+            pqxx::nontransaction tx(replication_connection.getRef());
+            addTableToPublication(tx, postgres_table_name);
+        }
+
+        /// Pass storage to consumer and lsn position, from which to start receiving replication messages for this table.
+        consumer->addNested(postgres_table_name, nested_storage, start_lsn);
+        LOG_TRACE(log, "Table `{}` successfully added to replication", postgres_table_name);
+    }
+    catch (...)
+    {
+        consumer_task->activate();
+        consumer_task->scheduleAfter(RESCHEDULE_MS);
+
+        auto error_message = getCurrentExceptionMessage(false);
+        throw Exception(ErrorCodes::POSTGRESQL_REPLICATION_INTERNAL_ERROR,
+                        "Failed to add table `{}` to replication. Info: {}", postgres_table_name, error_message);
+    }
+    consumer_task->activateAndSchedule();
+}
+
+
+void PostgreSQLReplicationHandler::removeTableFromReplication(const String & postgres_table_name)
+{
+    consumer_task->deactivate();
+    try
+    {
+        postgres::Connection replication_connection(connection_info, /* replication */true);
+
+        {
+            pqxx::nontransaction tx(replication_connection.getRef());
+            removeTableFromPublication(tx, postgres_table_name);
+        }
+
+        /// Pass storage to consumer and lsn position, from which to start receiving replication messages for this table.
+        consumer->removeNested(postgres_table_name);
+    }
+    catch (...)
+    {
+        consumer_task->activate();
+        consumer_task->scheduleAfter(RESCHEDULE_MS);
+
+        auto error_message = getCurrentExceptionMessage(false);
+        throw Exception(ErrorCodes::POSTGRESQL_REPLICATION_INTERNAL_ERROR,
+                        "Failed to remove table `{}` from replication. Info: {}", postgres_table_name, error_message);
+    }
+    consumer_task->activateAndSchedule();
 }
 
 
@@ -569,6 +764,7 @@ void PostgreSQLReplicationHandler::reloadFromSnapshot(const std::vector<std::pai
             dropReplicationSlot(tx, /* temporary */true);
 
         createReplicationSlot(tx, start_lsn, snapshot_name, /* temporary */true);
+        postgres::Connection tmp_connection(connection_info);
 
         for (const auto & [relation_id, table_name] : relation_data)
         {
@@ -579,7 +775,7 @@ void PostgreSQLReplicationHandler::reloadFromSnapshot(const std::vector<std::pai
             auto temp_materialized_storage = materialized_storage->createTemporary();
 
             /// This snapshot is valid up to the end of the transaction, which exported it.
-            StoragePtr temp_nested_storage = loadFromSnapshot(snapshot_name, table_name,
+            StoragePtr temp_nested_storage = loadFromSnapshot(tmp_connection, snapshot_name, table_name,
                                                               temp_materialized_storage->as <StorageMaterializedPostgreSQL>());
 
             auto table_id = materialized_storage->getNestedStorageID();
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
index 95ac12b3786..2c4bea21aeb 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
@@ -1,19 +1,17 @@
 #pragma once
 
 #include "MaterializedPostgreSQLConsumer.h"
+#include "MaterializedPostgreSQLSettings.h"
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 #include <Core/PostgreSQL/Utils.h>
+#include <Parsers/ASTCreateQuery.h>
 
 
 namespace DB
 {
 
-/// IDEA: There is ALTER PUBLICATION command to dynamically add and remove tables for replicating (the command is transactional).
-///       (Probably, if in a replication stream comes a relation name, which does not currently
-///       exist in CH, it can be loaded via snapshot while stream is stopped and then comparing wal positions with
-///       current lsn and table start lsn.
-
 class StorageMaterializedPostgreSQL;
+struct SettingChange;
 
 class PostgreSQLReplicationHandler
 {
@@ -25,10 +23,8 @@ public:
             const postgres::ConnectionInfo & connection_info_,
             ContextPtr context_,
             bool is_attach_,
-            const size_t max_block_size_,
-            bool allow_automatic_update_,
-            bool is_materialized_postgresql_database_,
-            const String tables_list = "");
+            const MaterializedPostgreSQLSettings & replication_settings,
+            bool is_materialized_postgresql_database_);
 
     /// Activate task to be run from a separate thread: wait until connection is available and call startReplication().
     void startup();
@@ -43,24 +39,36 @@ public:
     void addStorage(const std::string & table_name, StorageMaterializedPostgreSQL * storage);
 
     /// Fetch list of tables which are going to be replicated. Used for database engine.
-    NameSet fetchRequiredTables(postgres::Connection & connection_);
+    std::set<String> fetchRequiredTables();
 
     /// Start replication setup immediately.
     void startSynchronization(bool throw_on_error);
 
+    ASTPtr getCreateNestedTableQuery(StorageMaterializedPostgreSQL * storage, const String & table_name);
+
+    void addTableToReplication(StorageMaterializedPostgreSQL * storage, const String & postgres_table_name);
+
+    void removeTableFromReplication(const String & postgres_table_name);
+
+    void setSetting(const SettingChange & setting);
+
 private:
     using MaterializedStorages = std::unordered_map<String, StorageMaterializedPostgreSQL *>;
 
     /// Methods to manage Publication.
 
-    bool isPublicationExist(pqxx::work & tx);
+    bool isPublicationExist(pqxx::nontransaction & tx);
 
-    void createPublicationIfNeeded(pqxx::work & tx);
+    void createPublicationIfNeeded(pqxx::nontransaction & tx);
 
-    NameSet fetchTablesFromPublication(pqxx::work & tx);
+    std::set<String> fetchTablesFromPublication(pqxx::work & tx);
 
     void dropPublication(pqxx::nontransaction & ntx);
 
+    void addTableToPublication(pqxx::nontransaction & ntx, const String & table_name);
+
+    void removeTableFromPublication(pqxx::nontransaction & ntx, const String & table_name);
+
     /// Methods to manage Replication Slots.
 
     bool isReplicationSlotExist(pqxx::nontransaction & tx, String & start_lsn, bool temporary = false);
@@ -75,7 +83,7 @@ private:
 
     void consumerFunc();
 
-    StoragePtr loadFromSnapshot(std::string & snapshot_name, const String & table_name, StorageMaterializedPostgreSQL * materialized_storage);
+    StoragePtr loadFromSnapshot(postgres::Connection & connection, std::string & snapshot_name, const String & table_name, StorageMaterializedPostgreSQL * materialized_storage);
 
     void reloadFromSnapshot(const std::vector<std::pair<Int32, String>> & relation_data);
 
@@ -87,9 +95,6 @@ private:
     /// If it is not attach, i.e. a create query, then if publication already exists - always drop it.
     bool is_attach;
 
-    /// If new publication is created at start up - always drop replication slot if it exists.
-    bool new_publication = false;
-
     const String remote_database_name, current_database_name;
 
     /// Connection string and address for logs.
@@ -108,10 +113,10 @@ private:
     /// A coma-separated list of tables, which are going to be replicated for database engine. By default, a whole database is replicated.
     String tables_list;
 
-    String replication_slot, publication_name;
+    bool user_managed_slot = true;
+    String user_provided_snapshot;
 
-    /// Shared between replication_consumer and replication_handler, but never accessed concurrently.
-    std::shared_ptr<postgres::Connection> connection;
+    String replication_slot, publication_name;
 
     /// Replication consumer. Manages decoding of replication stream and syncing into tables.
     std::shared_ptr<MaterializedPostgreSQLConsumer> consumer;
@@ -124,6 +129,8 @@ private:
     MaterializedStorages materialized_storages;
 
     UInt64 milliseconds_to_wait;
+
+    String postgres_schema;
 };
 
 }
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index e24e252bf01..f771b2239ef 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -1,27 +1,26 @@
 #include "StorageMaterializedPostgreSQL.h"
 
 #if USE_LIBPQXX
+#include <base/logger_useful.h>
 #include <Common/Macros.h>
-#include <Core/Settings.h>
 #include <Common/parseAddress.h>
 #include <Common/assert_cast.h>
+#include <Core/Settings.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesDecimal.h>
-#include <DataStreams/ConvertingBlockInputStream.h>
 #include <Formats/FormatFactory.h>
 #include <Formats/FormatSettings.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Storages/StorageFactory.h>
-#include <common/logger_useful.h>
 #include <Storages/ReadFinalForExternalReplicaStorage.h>
+#include <Storages/StoragePostgreSQL.h>
 #include <Core/PostgreSQL/Connection.h>
 
 
@@ -30,7 +29,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
 }
@@ -51,6 +49,7 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
     std::unique_ptr<MaterializedPostgreSQLSettings> replication_settings)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(remote_database_name, remote_table_name_) + ")"))
     , is_materialized_postgresql_database(false)
     , has_nested(false)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
@@ -64,6 +63,8 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
     setInMemoryMetadata(storage_metadata);
 
     String replication_identifier = remote_database_name + "_" + remote_table_name_;
+    replication_settings->materialized_postgresql_tables_list = remote_table_name_;
+
     replication_handler = std::make_unique<PostgreSQLReplicationHandler>(
             replication_identifier,
             remote_database_name,
@@ -71,20 +72,35 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
             connection_info,
             getContext(),
             is_attach,
-            replication_settings->materialized_postgresql_max_block_size.value,
-            /* allow_automatic_update */ false, /* is_materialized_postgresql_database */false);
+            *replication_settings,
+            /* is_materialized_postgresql_database */false);
+
+    if (!is_attach)
+    {
+        replication_handler->addStorage(remote_table_name, this);
+        /// Start synchronization preliminary setup immediately and throw in case of failure.
+        /// It should be guaranteed that if MaterializedPostgreSQL table was created successfully, then
+        /// its nested table was also created.
+        replication_handler->startSynchronization(/* throw_on_error */ true);
+    }
 }
 
 
 /// For the case of MaterializePosgreSQL database engine.
 /// It is used when nested ReplacingMergeeTree table has not yet be created by replication thread.
 /// In this case this storage can't be used for read queries.
-StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(const StorageID & table_id_, ContextPtr context_)
+StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
+        const StorageID & table_id_,
+        ContextPtr context_,
+        const String & postgres_database_name,
+        const String & postgres_table_name)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
     , is_materialized_postgresql_database(true)
     , has_nested(false)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
+    , nested_table_id(table_id_)
 {
 }
 
@@ -92,9 +108,14 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(const StorageID & t
 /// Constructor for MaterializedPostgreSQL table engine - for the case of MaterializePosgreSQL database engine.
 /// It is used when nested ReplacingMergeeTree table has already been created by replication thread.
 /// This storage is ready to handle read queries.
-StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(StoragePtr nested_storage_, ContextPtr context_)
+StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
+        StoragePtr nested_storage_,
+        ContextPtr context_,
+        const String & postgres_database_name,
+        const String & postgres_table_name)
     : IStorage(nested_storage_->getStorageID())
     , WithContext(context_->getGlobalContext())
+    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
     , is_materialized_postgresql_database(true)
     , has_nested(true)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
@@ -120,7 +141,7 @@ StoragePtr StorageMaterializedPostgreSQL::createTemporary() const
     }
 
     auto new_context = Context::createCopy(context);
-    return StorageMaterializedPostgreSQL::create(tmp_table_id, new_context);
+    return StorageMaterializedPostgreSQL::create(tmp_table_id, new_context, "temporary", table_id.table_name);
 }
 
 
@@ -160,9 +181,13 @@ StorageID StorageMaterializedPostgreSQL::getNestedStorageID() const
 
 void StorageMaterializedPostgreSQL::createNestedIfNeeded(PostgreSQLTableStructurePtr table_structure)
 {
+    if (tryGetNested())
+        return;
+
     const auto ast_create = getCreateNestedTableQuery(std::move(table_structure));
     auto table_id = getStorageID();
     auto tmp_nested_table_id = StorageID(table_id.database_name, getNestedTableName());
+    LOG_DEBUG(log, "Creating clickhouse table for postgresql table {}", table_id.getNameForLogs());
 
     try
     {
@@ -201,23 +226,12 @@ StoragePtr StorageMaterializedPostgreSQL::prepare()
 void StorageMaterializedPostgreSQL::startup()
 {
     /// replication_handler != nullptr only in case of single table engine MaterializedPostgreSQL.
-    if (replication_handler)
+    if (replication_handler && is_attach)
     {
         replication_handler->addStorage(remote_table_name, this);
-
-        if (is_attach)
-        {
-            /// In case of attach table use background startup in a separate thread. First wait until connection is reachable,
-            /// then check for nested table -- it should already be created.
-            replication_handler->startup();
-        }
-        else
-        {
-            /// Start synchronization preliminary setup immediately and throw in case of failure.
-            /// It should be guaranteed that if MaterializedPostgreSQL table was created successfully, then
-            /// its nested table was also created.
-            replication_handler->startSynchronization(/* throw_on_error */ true);
-        }
+        /// In case of attach table use background startup in a separate thread. First wait until connection is reachable,
+        /// then check for nested table -- it should already be created.
+        replication_handler->startup();
     }
 }
 
@@ -455,21 +469,6 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
 {
     auto creator_fn = [](const StorageFactory::Arguments & args)
     {
-        ASTs & engine_args = args.engine_args;
-        bool has_settings = args.storage_def->settings;
-        auto postgresql_replication_settings = std::make_unique<MaterializedPostgreSQLSettings>();
-
-        if (has_settings)
-            postgresql_replication_settings->loadFromQuery(*args.storage_def);
-
-        if (engine_args.size() != 5)
-            throw Exception("Storage MaterializedPostgreSQL requires 5 parameters: "
-                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password'",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getContext());
-
         StorageInMemoryMetadata metadata;
         metadata.setColumns(args.columns);
         metadata.setConstraints(args.constraints);
@@ -485,20 +484,19 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
         else
             metadata.primary_key = KeyDescription::getKeyFromAST(args.storage_def->order_by->ptr(), metadata.columns, args.getContext());
 
-        auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 5432);
-        const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-
-        /// No connection is made here, see Storages/PostgreSQL/PostgreSQLConnection.cpp
+        auto configuration = StoragePostgreSQL::getConfiguration(args.engine_args, args.getContext());
         auto connection_info = postgres::formatConnectionString(
-            remote_database,
-            parsed_host_port.first,
-            parsed_host_port.second,
-            engine_args[3]->as<ASTLiteral &>().value.safeGet<String>(),
-            engine_args[4]->as<ASTLiteral &>().value.safeGet<String>());
+            configuration.database, configuration.host, configuration.port,
+            configuration.username, configuration.password);
+
+        bool has_settings = args.storage_def->settings;
+        auto postgresql_replication_settings = std::make_unique<MaterializedPostgreSQLSettings>();
+
+        if (has_settings)
+            postgresql_replication_settings->loadFromQuery(*args.storage_def);
 
         return StorageMaterializedPostgreSQL::create(
-                args.table_id, args.attach, remote_database, remote_table, connection_info,
+                args.table_id, args.attach, configuration.database, configuration.table, connection_info,
                 metadata, args.getContext(),
                 std::move(postgresql_replication_settings));
     };
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
index becb4f6ba10..cebb3b89f8e 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 #include "PostgreSQLReplicationHandler.h"
@@ -17,7 +15,7 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/ExpressionAnalyzer.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <memory>
 
 
@@ -49,7 +47,6 @@ namespace DB
  *
  * All database methods, apart from tryGetTable(), are devoted only to nested table.
  * NOTE: It makes sense to allow rename method for MaterializedPostgreSQL table via database method.
- * TODO: Make sure replication-to-table data channel is done only by relation_id.
  *
  * Also main table has the same InMemoryMetadata as its nested table, so if metadata of nested table changes - main table also has
  * to update its metadata, because all read requests are passed to MaterializedPostgreSQL table and then it redirects read
@@ -57,7 +54,7 @@ namespace DB
  *
  * When there is a need to update table structure, there will be created a new MaterializedPostgreSQL table with its own nested table,
  * it will have updated table schema and all data will be loaded from scratch in the background, while previous table with outadted table
- * structure will still serve read requests. When data is loaded, nested tables will be swapped, metadata of metarialzied table will be
+ * structure will still serve read requests. When data is loaded, nested tables will be swapped, metadata of materialized table will be
  * updated according to nested table.
  *
 **/
@@ -67,9 +64,11 @@ class StorageMaterializedPostgreSQL final : public shared_ptr_helper<StorageMate
     friend struct shared_ptr_helper<StorageMaterializedPostgreSQL>;
 
 public:
-    StorageMaterializedPostgreSQL(const StorageID & table_id_, ContextPtr context_);
+    StorageMaterializedPostgreSQL(const StorageID & table_id_, ContextPtr context_,
+                                const String & postgres_database_name, const String & postgres_table_name);
 
-    StorageMaterializedPostgreSQL(StoragePtr nested_storage_, ContextPtr context_);
+    StorageMaterializedPostgreSQL(StoragePtr nested_storage_, ContextPtr context_,
+                                const String & postgres_database_name, const String & postgres_table_name);
 
     String getName() const override { return "MaterializedPostgreSQL"; }
 
@@ -123,6 +122,8 @@ public:
 
     bool supportsFinal() const override { return true; }
 
+    ASTPtr getCreateNestedTableQuery(PostgreSQLTableStructurePtr table_structure);
+
 protected:
     StorageMaterializedPostgreSQL(
         const StorageID & table_id_,
@@ -140,10 +141,10 @@ private:
 
     ASTPtr getColumnDeclaration(const DataTypePtr & data_type) const;
 
-    ASTPtr getCreateNestedTableQuery(PostgreSQLTableStructurePtr table_structure);
-
     String getNestedTableName() const;
 
+    Poco::Logger * log;
+
     /// Not nullptr only for single MaterializedPostgreSQL storage, because for MaterializedPostgreSQL
     /// database engine there is one replication handler for all tables.
     std::unique_ptr<PostgreSQLReplicationHandler> replication_handler;
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index dd48b23ecc3..e5117a306ee 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -11,8 +11,10 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Parsers/ASTProjectionSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Transforms/SquashingChunksTransform.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 
 
 namespace DB
@@ -23,22 +25,9 @@ namespace ErrorCodes
     extern const int NO_SUCH_PROJECTION_IN_TABLE;
     extern const int ILLEGAL_PROJECTION;
     extern const int NOT_IMPLEMENTED;
+    extern const int LOGICAL_ERROR;
 };
 
-const char * ProjectionDescription::typeToString(Type type)
-{
-    switch (type)
-    {
-        case Type::Normal:
-            return "normal";
-        case Type::Aggregate:
-            return "aggregate";
-    }
-
-    __builtin_unreachable();
-}
-
-
 bool ProjectionDescription::isPrimaryKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node) const
 {
     const String column_name = node->getColumnName();
@@ -66,12 +55,12 @@ ProjectionDescription ProjectionDescription::clone() const
     other.name = name;
     other.type = type;
     other.required_columns = required_columns;
-    other.column_names = column_names;
-    other.data_types = data_types;
     other.sample_block = sample_block;
     other.sample_block_for_keys = sample_block_for_keys;
     other.metadata = metadata;
     other.key_size = key_size;
+    other.is_minmax_count_projection = is_minmax_count_projection;
+    other.primary_key_max_column_name = primary_key_max_column_name;
 
     return other;
 }
@@ -119,31 +108,16 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
     result.required_columns = select.getRequiredColumns();
     result.sample_block = select.getSampleBlock();
 
-    const auto & analysis_result = select.getAnalysisResult();
-    if (analysis_result.need_aggregate)
-    {
-        for (const auto & key : select.getQueryAnalyzer()->aggregationKeys())
-            result.sample_block_for_keys.insert({nullptr, key.type, key.name});
-    }
-
-    for (size_t i = 0; i < result.sample_block.columns(); ++i)
-    {
-        const auto & column_with_type_name = result.sample_block.getByPosition(i);
-
-        if (column_with_type_name.column && isColumnConst(*column_with_type_name.column))
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Projections cannot contain constant columns: {}", column_with_type_name.name);
-
-        result.column_names.emplace_back(column_with_type_name.name);
-        result.data_types.emplace_back(column_with_type_name.type);
-    }
-
     StorageInMemoryMetadata metadata;
-    metadata.setColumns(ColumnsDescription(result.sample_block.getNamesAndTypesList()));
-    metadata.partition_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
+    metadata.partition_key = KeyDescription::buildEmptyKey();
 
     const auto & query_select = result.query_ast->as<const ASTSelectQuery &>();
     if (select.hasAggregation())
     {
+        if (query.orderBy())
+            throw Exception(
+                "When aggregation is used in projection, ORDER BY cannot be specified", ErrorCodes::ILLEGAL_PROJECTION);
+
         result.type = ProjectionDescription::Type::Aggregate;
         if (const auto & group_expression_list = query_select.groupBy())
         {
@@ -164,34 +138,123 @@ ProjectionDescription::getProjectionFromAST(const ASTPtr & definition_ast, const
                 function_node->children.push_back(function_node->arguments);
                 order_expression = function_node;
             }
-            metadata.sorting_key = KeyDescription::getSortingKeyFromAST(order_expression, metadata.columns, query_context, {});
-            metadata.primary_key = KeyDescription::getKeyFromAST(order_expression, metadata.columns, query_context);
+            auto columns_with_state = ColumnsDescription(result.sample_block.getNamesAndTypesList());
+            metadata.sorting_key = KeyDescription::getSortingKeyFromAST(order_expression, columns_with_state, query_context, {});
+            metadata.primary_key = KeyDescription::getKeyFromAST(order_expression, columns_with_state, query_context);
+            metadata.primary_key.definition_ast = nullptr;
         }
         else
         {
-            metadata.sorting_key = KeyDescription::getSortingKeyFromAST({}, metadata.columns, query_context, {});
-            metadata.primary_key = KeyDescription::getKeyFromAST({}, metadata.columns, query_context);
+            metadata.sorting_key = KeyDescription::buildEmptyKey();
+            metadata.primary_key = KeyDescription::buildEmptyKey();
         }
-        if (query.orderBy())
-            throw Exception(
-                "When aggregation is used in projection, ORDER BY cannot be specified", ErrorCodes::ILLEGAL_PROJECTION);
+        for (const auto & key : select.getQueryAnalyzer()->aggregationKeys())
+            result.sample_block_for_keys.insert({nullptr, key.type, key.name});
     }
     else
     {
         result.type = ProjectionDescription::Type::Normal;
-        metadata.sorting_key = KeyDescription::getSortingKeyFromAST(query.orderBy(), metadata.columns, query_context, {});
-        metadata.primary_key = KeyDescription::getKeyFromAST(query.orderBy(), metadata.columns, query_context);
+        metadata.sorting_key = KeyDescription::getSortingKeyFromAST(query.orderBy(), columns, query_context, {});
+        metadata.primary_key = KeyDescription::getKeyFromAST(query.orderBy(), columns, query_context);
+        metadata.primary_key.definition_ast = nullptr;
     }
-    metadata.primary_key.definition_ast = nullptr;
+
+    auto block = result.sample_block;
+    for (const auto & [name, type] : metadata.sorting_key.expression->getRequiredColumnsWithTypes())
+        block.insertUnique({nullptr, type, name});
+    for (const auto & column_with_type_name : block)
+    {
+        if (column_with_type_name.column && isColumnConst(*column_with_type_name.column))
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Projections cannot contain constant columns: {}", column_with_type_name.name);
+    }
+
+    metadata.setColumns(ColumnsDescription(block.getNamesAndTypesList()));
     result.metadata = std::make_shared<StorageInMemoryMetadata>(metadata);
     return result;
 }
 
+ProjectionDescription ProjectionDescription::getMinMaxCountProjection(
+    const ColumnsDescription & columns,
+    const Names & minmax_columns,
+    const ASTs & primary_key_asts,
+    ContextPtr query_context)
+{
+    ProjectionDescription result;
+    result.is_minmax_count_projection = true;
+
+    auto select_query = std::make_shared<ASTProjectionSelectQuery>();
+    ASTPtr select_expression_list = std::make_shared<ASTExpressionList>();
+    for (const auto & column : minmax_columns)
+    {
+        select_expression_list->children.push_back(makeASTFunction("min", std::make_shared<ASTIdentifier>(column)));
+        select_expression_list->children.push_back(makeASTFunction("max", std::make_shared<ASTIdentifier>(column)));
+    }
+    if (!primary_key_asts.empty())
+    {
+        select_expression_list->children.push_back(makeASTFunction("min", primary_key_asts.front()->clone()));
+        select_expression_list->children.push_back(makeASTFunction("max", primary_key_asts.front()->clone()));
+    }
+    select_expression_list->children.push_back(makeASTFunction("count"));
+    select_query->setExpression(ASTProjectionSelectQuery::Expression::SELECT, std::move(select_expression_list));
+
+    result.definition_ast = select_query;
+    result.name = MINMAX_COUNT_PROJECTION_NAME;
+    result.query_ast = select_query->cloneToASTSelect();
+
+    auto external_storage_holder = std::make_shared<TemporaryTableHolder>(query_context, columns, ConstraintsDescription{});
+    StoragePtr storage = external_storage_holder->getTable();
+    InterpreterSelectQuery select(
+        result.query_ast, query_context, storage, {}, SelectQueryOptions{QueryProcessingStage::WithMergeableState}.modify().ignoreAlias());
+    result.required_columns = select.getRequiredColumns();
+    result.sample_block = select.getSampleBlock();
+    /// If we have primary key and it's not in minmax_columns, it will be used as one additional minmax columns.
+    if (!primary_key_asts.empty() && result.sample_block.columns() == 2 * (minmax_columns.size() + 1) + 1)
+    {
+        /// min(p1), max(p1), min(p2), max(p2), ..., min(k1), max(k1), count()
+        ///                                                      ^
+        ///                                                   size - 2
+        result.primary_key_max_column_name = *(result.sample_block.getNames().cend() - 2);
+    }
+    result.type = ProjectionDescription::Type::Aggregate;
+    StorageInMemoryMetadata metadata;
+    metadata.setColumns(ColumnsDescription(result.sample_block.getNamesAndTypesList()));
+    metadata.partition_key = KeyDescription::buildEmptyKey();
+    metadata.sorting_key = KeyDescription::buildEmptyKey();
+    metadata.primary_key = KeyDescription::buildEmptyKey();
+    result.metadata = std::make_shared<StorageInMemoryMetadata>(metadata);
+    return result;
+}
+
+
 void ProjectionDescription::recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr query_context)
 {
     *this = getProjectionFromAST(definition_ast, new_columns, query_context);
 }
 
+
+Block ProjectionDescription::calculate(const Block & block, ContextPtr context) const
+{
+    auto builder = InterpreterSelectQuery(
+                       query_ast,
+                       context,
+                       Pipe(std::make_shared<SourceFromSingleChunk>(block, Chunk(block.getColumns(), block.rows()))),
+                       SelectQueryOptions{
+                           type == ProjectionDescription::Type::Normal ? QueryProcessingStage::FetchColumns
+                                                                       : QueryProcessingStage::WithMergeableState})
+                       .buildQueryPipeline();
+    builder.resize(1);
+    builder.addTransform(std::make_shared<SquashingChunksTransform>(builder.getHeader(), block.rows(), 0));
+
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+    PullingPipelineExecutor executor(pipeline);
+    Block ret;
+    executor.pull(ret);
+    if (executor.pull(ret))
+        throw Exception("Projection cannot increase the number of rows in a block", ErrorCodes::LOGICAL_ERROR);
+    return ret;
+}
+
+
 String ProjectionsDescription::toString() const
 {
     if (empty())
diff --git a/src/Storages/ProjectionsDescription.h b/src/Storages/ProjectionsDescription.h
index fd505c4fe06..7c254182ba4 100644
--- a/src/Storages/ProjectionsDescription.h
+++ b/src/Storages/ProjectionsDescription.h
@@ -28,7 +28,7 @@ struct ProjectionDescription
         Aggregate,
     };
 
-    static const char * typeToString(Type type);
+    static constexpr const char * MINMAX_COUNT_PROJECTION_NAME = "_minmax_count_projection";
 
     /// Definition AST of projection
     ASTPtr definition_ast;
@@ -47,12 +47,6 @@ struct ProjectionDescription
 
     Names getRequiredColumns() const { return required_columns; }
 
-    /// Names of projection columns (not to be confused with required columns)
-    Names column_names;
-
-    /// Data types of projection columns
-    DataTypes data_types;
-
     /// Sample block with projection columns. (NOTE: columns in block are empty, but not nullptr)
     Block sample_block;
 
@@ -62,10 +56,18 @@ struct ProjectionDescription
 
     size_t key_size = 0;
 
+    bool is_minmax_count_projection = false;
+
+    /// If a primary key expression is used in the minmax_count projection, store the name of max expression.
+    String primary_key_max_column_name;
+
     /// Parse projection from definition AST
     static ProjectionDescription
     getProjectionFromAST(const ASTPtr & definition_ast, const ColumnsDescription & columns, ContextPtr query_context);
 
+    static ProjectionDescription getMinMaxCountProjection(
+        const ColumnsDescription & columns, const Names & minmax_columns, const ASTs & primary_key_asts, ContextPtr query_context);
+
     ProjectionDescription() = default;
 
     /// We need custom copy constructors because we don't want
@@ -85,8 +87,14 @@ struct ProjectionDescription
     void recalculateWithNewColumns(const ColumnsDescription & new_columns, ContextPtr query_context);
 
     bool isPrimaryKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node) const;
+
+    Block calculate(const Block & block, ContextPtr context) const;
+
+    String getDirectoryName() const { return name + ".proj"; }
 };
 
+using ProjectionDescriptionRawPtr = const ProjectionDescription *;
+
 /// All projections in storage
 struct ProjectionsDescription
 {
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp b/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
deleted file mode 100644
index 6c3d3a53c21..00000000000
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-#include <Storages/RabbitMQ/RabbitMQBlockInputStream.h>
-
-#include <Formats/FormatFactory.h>
-#include <Interpreters/Context.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
-#include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-namespace DB
-{
-
-RabbitMQBlockInputStream::RabbitMQBlockInputStream(
-    StorageRabbitMQ & storage_,
-    const StorageMetadataPtr & metadata_snapshot_,
-    ContextPtr context_,
-    const Names & columns,
-    size_t max_block_size_,
-    bool ack_in_suffix_)
-    : storage(storage_)
-    , metadata_snapshot(metadata_snapshot_)
-    , context(context_)
-    , column_names(columns)
-    , max_block_size(max_block_size_)
-    , ack_in_suffix(ack_in_suffix_)
-    , non_virtual_header(metadata_snapshot->getSampleBlockNonMaterialized())
-    , sample_block(non_virtual_header)
-    , virtual_header(metadata_snapshot->getSampleBlockForColumns(
-                {"_exchange_name", "_channel_id", "_delivery_tag", "_redelivered", "_message_id", "_timestamp"},
-                storage.getVirtuals(), storage.getStorageID()))
-{
-    for (const auto & column : virtual_header)
-        sample_block.insert(column);
-}
-
-
-RabbitMQBlockInputStream::~RabbitMQBlockInputStream()
-{
-    if (!buffer)
-        return;
-
-    storage.pushReadBuffer(buffer);
-}
-
-
-Block RabbitMQBlockInputStream::getHeader() const
-{
-    return sample_block;
-}
-
-
-void RabbitMQBlockInputStream::readPrefixImpl()
-{
-    auto timeout = std::chrono::milliseconds(context->getSettingsRef().rabbitmq_max_wait_ms.totalMilliseconds());
-    buffer = storage.popReadBuffer(timeout);
-}
-
-
-bool RabbitMQBlockInputStream::needChannelUpdate()
-{
-    if (!buffer)
-        return false;
-
-    return buffer->needChannelUpdate();
-}
-
-
-void RabbitMQBlockInputStream::updateChannel()
-{
-    if (!buffer)
-        return;
-
-    buffer->updateAckTracker();
-
-    if (storage.updateChannel(buffer->getChannel()))
-        buffer->setupChannel();
-}
-
-
-Block RabbitMQBlockInputStream::readImpl()
-{
-    if (!buffer || finished)
-        return Block();
-
-    finished = true;
-
-    MutableColumns result_columns = non_virtual_header.cloneEmptyColumns();
-    MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
-
-    auto input_format = FormatFactory::instance().getInputFormat(
-            storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
-
-    InputPort port(input_format->getPort().getHeader(), input_format.get());
-    connect(input_format->getPort(), port);
-    port.setNeeded();
-
-    auto read_rabbitmq_message = [&]
-    {
-        size_t new_rows = 0;
-
-        while (true)
-        {
-            auto status = input_format->prepare();
-
-            switch (status)
-            {
-                case IProcessor::Status::Ready:
-                    input_format->work();
-                    break;
-
-                case IProcessor::Status::Finished:
-                    input_format->resetParser();
-                    return new_rows;
-
-                case IProcessor::Status::PortFull:
-                {
-                    auto chunk = port.pull();
-
-                    auto chunk_rows = chunk.getNumRows();
-                    new_rows += chunk_rows;
-
-                    auto columns = chunk.detachColumns();
-
-                    for (size_t i = 0, s = columns.size(); i < s; ++i)
-                    {
-                        result_columns[i]->insertRangeFrom(*columns[i], 0, columns[i]->size());
-                    }
-                    break;
-                }
-                case IProcessor::Status::NeedData:
-                case IProcessor::Status::Async:
-                case IProcessor::Status::ExpandPipeline:
-                    throw Exception("Source processor returned status " + IProcessor::statusToName(status), ErrorCodes::LOGICAL_ERROR);
-            }
-        }
-    };
-
-    size_t total_rows = 0;
-
-    while (true)
-    {
-        if (buffer->eof())
-            break;
-
-        auto new_rows = read_rabbitmq_message();
-
-        if (new_rows)
-        {
-            auto exchange_name = storage.getExchange();
-            auto channel_id = buffer->getChannelID();
-            auto delivery_tag = buffer->getDeliveryTag();
-            auto redelivered = buffer->getRedelivered();
-            auto message_id = buffer->getMessageID();
-            auto timestamp = buffer->getTimestamp();
-
-            buffer->updateAckTracker({delivery_tag, channel_id});
-
-            for (size_t i = 0; i < new_rows; ++i)
-            {
-                virtual_columns[0]->insert(exchange_name);
-                virtual_columns[1]->insert(channel_id);
-                virtual_columns[2]->insert(delivery_tag);
-                virtual_columns[3]->insert(redelivered);
-                virtual_columns[4]->insert(message_id);
-                virtual_columns[5]->insert(timestamp);
-            }
-
-            total_rows = total_rows + new_rows;
-        }
-
-        buffer->allowNext();
-
-        if (total_rows >= max_block_size || buffer->queueEmpty() || buffer->isConsumerStopped() || !checkTimeLimit())
-            break;
-    }
-
-    if (total_rows == 0)
-        return Block();
-
-    auto result_block  = non_virtual_header.cloneWithColumns(std::move(result_columns));
-    auto virtual_block = virtual_header.cloneWithColumns(std::move(virtual_columns));
-
-    for (const auto & column : virtual_block.getColumnsWithTypeAndName())
-        result_block.insert(column);
-
-    return result_block;
-}
-
-
-void RabbitMQBlockInputStream::readSuffixImpl()
-{
-    if (ack_in_suffix)
-        sendAck();
-}
-
-bool RabbitMQBlockInputStream::sendAck()
-{
-    if (!buffer)
-        return false;
-
-    if (!buffer->ackMessages())
-        return false;
-
-    return true;
-}
-
-}
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.cpp b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
new file mode 100644
index 00000000000..a29518c8cfe
--- /dev/null
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
@@ -0,0 +1,125 @@
+#include "RabbitMQConnection.h"
+
+#include <base/logger_useful.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+static const auto CONNECT_SLEEP = 200;
+static const auto RETRIES_MAX = 20;
+
+
+RabbitMQConnection::RabbitMQConnection(const RabbitMQConfiguration & configuration_, Poco::Logger * log_)
+    : configuration(configuration_)
+    , log(log_)
+    , event_handler(loop.getLoop(), log)
+{
+}
+
+String RabbitMQConnection::connectionInfoForLog() const
+{
+    return configuration.host + ':' + toString(configuration.port);
+}
+
+bool RabbitMQConnection::isConnected()
+{
+    std::lock_guard lock(mutex);
+    return isConnectedImpl();
+}
+
+bool RabbitMQConnection::connect()
+{
+    std::lock_guard lock(mutex);
+    connectImpl();
+    return isConnectedImpl();
+}
+
+bool RabbitMQConnection::reconnect()
+{
+    std::lock_guard lock(mutex);
+    if (isConnectedImpl())
+        return true;
+
+    disconnectImpl();
+
+    /// This will force immediate closure if not yet closed
+    if (!connection->closed())
+        connection->close(true);
+
+    LOG_DEBUG(log, "Trying to restore connection to {}", connectionInfoForLog());
+    connectImpl();
+
+    return isConnectedImpl();
+}
+
+ChannelPtr RabbitMQConnection::createChannel()
+{
+    std::lock_guard lock(mutex);
+    return std::make_unique<AMQP::TcpChannel>(connection.get());
+}
+
+void RabbitMQConnection::disconnect(bool immediately)
+{
+    std::lock_guard lock(mutex);
+    disconnectImpl(immediately);
+}
+
+void RabbitMQConnection::heartbeat()
+{
+    std::lock_guard lock(mutex);
+    connection->heartbeat();
+}
+
+bool RabbitMQConnection::closed()
+{
+    std::lock_guard lock(mutex);
+    return connection->closed();
+}
+
+bool RabbitMQConnection::isConnectedImpl() const
+{
+    return event_handler.connectionRunning() && connection->usable();
+}
+
+void RabbitMQConnection::connectImpl()
+{
+    if (configuration.connection_string.empty())
+    {
+        LOG_DEBUG(log, "Connecting to: {}:{} (user: {})", configuration.host, configuration.port, configuration.username);
+        AMQP::Login login(configuration.username, configuration.password);
+        AMQP::Address address(configuration.host, configuration.port, login, configuration.vhost, configuration.secure);
+        connection = std::make_unique<AMQP::TcpConnection>(&event_handler, address);
+    }
+    else
+    {
+        AMQP::Address address(configuration.connection_string);
+        connection = std::make_unique<AMQP::TcpConnection>(&event_handler, address);
+    }
+
+    auto cnt_retries = 0;
+    while (true)
+    {
+        event_handler.iterateLoop();
+
+        if (connection->ready() || cnt_retries++ == RETRIES_MAX)
+            break;
+
+        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
+    }
+}
+
+void RabbitMQConnection::disconnectImpl(bool immediately)
+{
+    connection->close(immediately);
+
+    /** Connection is not closed immediately (firstly, all pending operations are completed, and then
+     *  an AMQP closing-handshake is  performed). But cannot open a new connection until previous one is properly closed
+     */
+    size_t cnt_retries = 0;
+    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
+        event_handler.iterateLoop();
+}
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.h b/src/Storages/RabbitMQ/RabbitMQConnection.h
new file mode 100644
index 00000000000..acc3c48f85b
--- /dev/null
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <Storages/RabbitMQ/UVLoop.h>
+#include <Storages/RabbitMQ/RabbitMQHandler.h>
+
+
+namespace DB
+{
+
+struct RabbitMQConfiguration
+{
+    String host;
+    UInt16 port;
+    String username;
+    String password;
+    String vhost;
+
+    bool secure;
+    String connection_string;
+};
+
+class RabbitMQConnection
+{
+public:
+    RabbitMQConnection(const RabbitMQConfiguration & configuration_, Poco::Logger * log_);
+
+    bool isConnected();
+
+    bool connect();
+
+    bool reconnect();
+
+    void disconnect(bool immediately = false);
+
+    void heartbeat();
+
+    bool closed();
+
+    ChannelPtr createChannel();
+
+    /// RabbitMQHandler is thread safe. Any public methods can be called concurrently.
+    RabbitMQHandler & getHandler() { return event_handler; }
+
+    String connectionInfoForLog() const;
+
+private:
+    bool isConnectedImpl() const;
+
+    void connectImpl();
+
+    void disconnectImpl(bool immediately = false);
+
+    RabbitMQConfiguration configuration;
+    Poco::Logger * log;
+
+    UVLoop loop;
+    RabbitMQHandler event_handler;
+
+    std::unique_ptr<AMQP::TcpConnection> connection;
+    std::mutex mutex;
+};
+
+using RabbitMQConnectionPtr = std::unique_ptr<RabbitMQConnection>;
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.cpp b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
index 85d8063a73f..c7548b80c26 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
@@ -1,4 +1,4 @@
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/Exception.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
 
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.h b/src/Storages/RabbitMQ/RabbitMQHandler.h
index 78ccf56dec2..8f355c4a0dc 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.h
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.h
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <amqpcpp.h>
 #include <amqpcpp/linux_tcp.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <amqpcpp/libuv.h>
 
 namespace DB
@@ -17,6 +17,7 @@ namespace Loop
     static const UInt8 STOP = 2;
 }
 
+using ChannelPtr = std::unique_ptr<AMQP::TcpChannel>;
 
 class RabbitMQHandler : public AMQP::LibUvHandler
 {
@@ -40,8 +41,8 @@ public:
 
     void stopLoop();
 
-    bool connectionRunning() { return connection_running.load(); }
-    bool loopRunning() { return loop_running.load(); }
+    bool connectionRunning() const { return connection_running.load(); }
+    bool loopRunning() const { return loop_running.load(); }
 
     void updateLoopState(UInt8 state) { loop_state.store(state); }
     UInt8 getLoopState() { return loop_state.load(); }
@@ -55,4 +56,6 @@ private:
     std::mutex startup_mutex;
 };
 
+using RabbitMQHandlerPtr = std::shared_ptr<RabbitMQHandler>;
+
 }
diff --git a/src/Storages/RabbitMQ/RabbitMQSettings.h b/src/Storages/RabbitMQ/RabbitMQSettings.h
index ff7c79b89c6..01109dda66a 100644
--- a/src/Storages/RabbitMQ/RabbitMQSettings.h
+++ b/src/Storages/RabbitMQ/RabbitMQSettings.h
@@ -20,6 +20,8 @@ namespace DB
     M(UInt64, rabbitmq_num_queues, 1, "The number of queues per consumer.", 0) \
     M(String, rabbitmq_queue_base, "", "Base for queue names to be able to reopen non-empty queues in case of failure.", 0) \
     M(Bool, rabbitmq_persistent, false, "For insert query messages will be made 'persistent', durable.", 0) \
+    M(Bool, rabbitmq_secure, false, "Use SSL connection", 0) \
+    M(String, rabbitmq_address, "", "Address for connection", 0) \
     M(UInt64, rabbitmq_skip_broken_messages, 0, "Skip at least this number of broken messages from RabbitMQ per block", 0) \
     M(UInt64, rabbitmq_max_block_size, 0, "Number of row collected before flushing data from RabbitMQ.", 0) \
     M(Milliseconds, rabbitmq_flush_interval_ms, 0, "Timeout for flushing data from RabbitMQ.", 0) \
diff --git a/src/Storages/RabbitMQ/RabbitMQSink.cpp b/src/Storages/RabbitMQ/RabbitMQSink.cpp
index 9c556ee0832..2b8d5ab3810 100644
--- a/src/Storages/RabbitMQ/RabbitMQSink.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQSink.cpp
@@ -2,7 +2,8 @@
 #include <Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h>
 #include <Storages/RabbitMQ/StorageRabbitMQ.h>
 #include <Formats/FormatFactory.h>
-#include <common/logger_useful.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -31,8 +32,7 @@ void RabbitMQSink::onStart()
     auto format_settings = getFormatSettings(context);
     format_settings.protobuf.allow_multiple_rows_without_delimiter = true;
 
-    child = FormatFactory::instance().getOutputStream(storage.getFormatName(), *buffer,
-        getPort().getHeader(), context,
+    format = FormatFactory::instance().getOutputFormat(storage.getFormatName(), *buffer, getHeader(), context,
         [this](const Columns & /* columns */, size_t /* rows */)
         {
             buffer->countRow();
@@ -43,13 +43,13 @@ void RabbitMQSink::onStart()
 
 void RabbitMQSink::consume(Chunk chunk)
 {
-    child->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+    format->write(getHeader().cloneWithColumns(chunk.detachColumns()));
 }
 
 
 void RabbitMQSink::onFinish()
 {
-    child->writeSuffix();
+    format->doWriteSuffix();
 
     if (buffer)
         buffer->updateMaxWait();
diff --git a/src/Storages/RabbitMQ/RabbitMQSink.h b/src/Storages/RabbitMQ/RabbitMQSink.h
index 6222ccdf2ac..02014a3f89e 100644
--- a/src/Storages/RabbitMQ/RabbitMQSink.h
+++ b/src/Storages/RabbitMQ/RabbitMQSink.h
@@ -7,6 +7,9 @@
 namespace DB
 {
 
+class IOutputFormat;
+using IOutputFormatPtr = std::shared_ptr<IOutputFormat>;
+
 class RabbitMQSink : public SinkToStorage
 {
 
@@ -24,6 +27,6 @@ private:
     StorageMetadataPtr metadata_snapshot;
     ContextPtr context;
     ProducerBufferPtr buffer;
-    BlockOutputStreamPtr child;
+    IOutputFormatPtr format;
 };
 }
diff --git a/src/Storages/RabbitMQ/RabbitMQSource.cpp b/src/Storages/RabbitMQ/RabbitMQSource.cpp
new file mode 100644
index 00000000000..b954ad3ab23
--- /dev/null
+++ b/src/Storages/RabbitMQ/RabbitMQSource.cpp
@@ -0,0 +1,187 @@
+#include <Storages/RabbitMQ/RabbitMQSource.h>
+
+#include <Formats/FormatFactory.h>
+#include <Interpreters/Context.h>
+#include <Processors/Executors/StreamingFormatExecutor.h>
+#include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
+
+namespace DB
+{
+
+static std::pair<Block, Block> getHeaders(StorageRabbitMQ & storage, const StorageMetadataPtr & metadata_snapshot)
+{
+    auto non_virtual_header = metadata_snapshot->getSampleBlockNonMaterialized();
+    auto virtual_header = metadata_snapshot->getSampleBlockForColumns(
+                {"_exchange_name", "_channel_id", "_delivery_tag", "_redelivered", "_message_id", "_timestamp"},
+                storage.getVirtuals(), storage.getStorageID());
+
+    return {non_virtual_header, virtual_header};
+}
+
+static Block getSampleBlock(const Block & non_virtual_header, const Block & virtual_header)
+{
+    auto header = non_virtual_header;
+    for (const auto & column : virtual_header)
+        header.insert(column);
+
+    return header;
+}
+
+RabbitMQSource::RabbitMQSource(
+    StorageRabbitMQ & storage_,
+    const StorageMetadataPtr & metadata_snapshot_,
+    ContextPtr context_,
+    const Names & columns,
+    size_t max_block_size_,
+    bool ack_in_suffix_)
+    : RabbitMQSource(
+        storage_,
+        metadata_snapshot_,
+        getHeaders(storage_, metadata_snapshot_),
+        context_,
+        columns,
+        max_block_size_,
+        ack_in_suffix_)
+{
+}
+
+RabbitMQSource::RabbitMQSource(
+    StorageRabbitMQ & storage_,
+    const StorageMetadataPtr & metadata_snapshot_,
+    std::pair<Block, Block> headers,
+    ContextPtr context_,
+    const Names & columns,
+    size_t max_block_size_,
+    bool ack_in_suffix_)
+    : SourceWithProgress(getSampleBlock(headers.first, headers.second))
+    , storage(storage_)
+    , metadata_snapshot(metadata_snapshot_)
+    , context(context_)
+    , column_names(columns)
+    , max_block_size(max_block_size_)
+    , ack_in_suffix(ack_in_suffix_)
+    , non_virtual_header(std::move(headers.first))
+    , virtual_header(std::move(headers.second))
+{
+}
+
+
+RabbitMQSource::~RabbitMQSource()
+{
+    if (!buffer)
+        return;
+
+    storage.pushReadBuffer(buffer);
+}
+
+
+bool RabbitMQSource::needChannelUpdate()
+{
+    if (!buffer)
+        return false;
+
+    return buffer->needChannelUpdate();
+}
+
+
+void RabbitMQSource::updateChannel()
+{
+    if (!buffer)
+        return;
+
+    buffer->updateAckTracker();
+
+    if (storage.updateChannel(buffer->getChannel()))
+        buffer->setupChannel();
+}
+
+Chunk RabbitMQSource::generate()
+{
+    auto chunk = generateImpl();
+    if (!chunk && ack_in_suffix)
+        sendAck();
+
+    return chunk;
+}
+
+Chunk RabbitMQSource::generateImpl()
+{
+    if (!buffer)
+    {
+        auto timeout = std::chrono::milliseconds(context->getSettingsRef().rabbitmq_max_wait_ms.totalMilliseconds());
+        buffer = storage.popReadBuffer(timeout);
+    }
+
+    if (!buffer || is_finished)
+        return {};
+
+    is_finished = true;
+
+    MutableColumns virtual_columns = virtual_header.cloneEmptyColumns();
+    auto input_format = FormatFactory::instance().getInputFormat(
+            storage.getFormatName(), *buffer, non_virtual_header, context, max_block_size);
+
+    StreamingFormatExecutor executor(non_virtual_header, input_format);
+
+    size_t total_rows = 0;
+
+    while (true)
+    {
+        if (buffer->eof())
+            break;
+
+        auto new_rows = executor.execute();
+
+        if (new_rows)
+        {
+            auto exchange_name = storage.getExchange();
+            auto channel_id = buffer->getChannelID();
+            auto delivery_tag = buffer->getDeliveryTag();
+            auto redelivered = buffer->getRedelivered();
+            auto message_id = buffer->getMessageID();
+            auto timestamp = buffer->getTimestamp();
+
+            buffer->updateAckTracker({delivery_tag, channel_id});
+
+            for (size_t i = 0; i < new_rows; ++i)
+            {
+                virtual_columns[0]->insert(exchange_name);
+                virtual_columns[1]->insert(channel_id);
+                virtual_columns[2]->insert(delivery_tag);
+                virtual_columns[3]->insert(redelivered);
+                virtual_columns[4]->insert(message_id);
+                virtual_columns[5]->insert(timestamp);
+            }
+
+            total_rows = total_rows + new_rows;
+        }
+
+        buffer->allowNext();
+
+        if (total_rows >= max_block_size || buffer->queueEmpty() || buffer->isConsumerStopped() || !checkTimeLimit())
+            break;
+    }
+
+    if (total_rows == 0)
+        return {};
+
+    auto result_columns  = executor.getResultColumns();
+    for (auto & column : virtual_columns)
+        result_columns.push_back(std::move(column));
+
+    return Chunk(std::move(result_columns), total_rows);
+}
+
+
+bool RabbitMQSource::sendAck()
+{
+    if (!buffer)
+        return false;
+
+    if (!buffer->ackMessages())
+        return false;
+
+    return true;
+}
+
+}
diff --git a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h b/src/Storages/RabbitMQ/RabbitMQSource.h
similarity index 65%
rename from src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
rename to src/Storages/RabbitMQ/RabbitMQSource.h
index 5ce1c96bf33..f4f6c72b5c8 100644
--- a/src/Storages/RabbitMQ/RabbitMQBlockInputStream.h
+++ b/src/Storages/RabbitMQ/RabbitMQSource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Sources/SourceWithProgress.h>
 #include <Storages/RabbitMQ/StorageRabbitMQ.h>
 #include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
 
@@ -8,11 +8,11 @@
 namespace DB
 {
 
-class RabbitMQBlockInputStream : public IBlockInputStream
+class RabbitMQSource : public SourceWithProgress
 {
 
 public:
-    RabbitMQBlockInputStream(
+    RabbitMQSource(
             StorageRabbitMQ & storage_,
             const StorageMetadataPtr & metadata_snapshot_,
             ContextPtr context_,
@@ -20,15 +20,12 @@ public:
             size_t max_block_size_,
             bool ack_in_suffix = true);
 
-    ~RabbitMQBlockInputStream() override;
+    ~RabbitMQSource() override;
 
     String getName() const override { return storage.getName(); }
-    Block getHeader() const override;
     ConsumerBufferPtr getBuffer() { return buffer; }
 
-    void readPrefixImpl() override;
-    Block readImpl() override;
-    void readSuffixImpl() override;
+    Chunk generate() override;
 
     bool queueEmpty() const { return !buffer || buffer->queueEmpty(); }
     bool needChannelUpdate();
@@ -43,12 +40,22 @@ private:
     const size_t max_block_size;
     bool ack_in_suffix;
 
-    bool finished = false;
+    bool is_finished = false;
     const Block non_virtual_header;
-    Block sample_block;
     const Block virtual_header;
 
     ConsumerBufferPtr buffer;
+
+    RabbitMQSource(
+        StorageRabbitMQ & storage_,
+        const StorageMetadataPtr & metadata_snapshot_,
+        std::pair<Block, Block> headers,
+        ContextPtr context_,
+        const Names & columns,
+        size_t max_block_size_,
+        bool ack_in_suffix);
+
+    Chunk generateImpl();
 };
 
 }
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
index 195f7b46c37..ac60d748e36 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.cpp
@@ -7,16 +7,21 @@
 #include <Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
 #include <boost/algorithm/string/split.hpp>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include "Poco/Timer.h"
 #include <amqpcpp.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 ReadBufferFromRabbitMQConsumer::ReadBufferFromRabbitMQConsumer(
         ChannelPtr consumer_channel_,
-        HandlerPtr event_handler_,
+        RabbitMQHandler & event_handler_,
         std::vector<String> & queues_,
         size_t channel_id_base_,
         const String & channel_base_,
@@ -35,8 +40,6 @@ ReadBufferFromRabbitMQConsumer::ReadBufferFromRabbitMQConsumer(
         , stopped(stopped_)
         , received(queue_size_)
 {
-    if (consumer_channel)
-        setupChannel();
 }
 
 
@@ -66,9 +69,10 @@ void ReadBufferFromRabbitMQConsumer::subscribe()
                 if (row_delimiter != '\0')
                     message_received += row_delimiter;
 
-                received.push({message_received, message.hasMessageID() ? message.messageID() : "",
+                if (!received.push({message_received, message.hasMessageID() ? message.messageID() : "",
                         message.hasTimestamp() ? message.timestamp() : 0,
-                        redelivered, AckTracker(delivery_tag, channel_id)});
+                        redelivered, AckTracker(delivery_tag, channel_id)}))
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to received queue");
             }
         })
         .onError([&](const char * message)
@@ -122,6 +126,12 @@ void ReadBufferFromRabbitMQConsumer::updateAckTracker(AckTracker record_info)
 
 void ReadBufferFromRabbitMQConsumer::setupChannel()
 {
+    if (!consumer_channel)
+        return;
+
+    /// We mark initialized only once.
+    initialized = true;
+
     wait_subscription.store(true);
 
     consumer_channel->onReady([&]()
@@ -159,7 +169,7 @@ bool ReadBufferFromRabbitMQConsumer::needChannelUpdate()
 
 void ReadBufferFromRabbitMQConsumer::iterateEventLoop()
 {
-    event_handler->iterateLoop();
+    event_handler.iterateLoop();
 }
 
 
diff --git a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
index ccc8e56db5e..55d129856b8 100644
--- a/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
+++ b/src/Storages/RabbitMQ/ReadBufferFromRabbitMQConsumer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Names.h>
-#include <common/types.h>
+#include <base/types.h>
 #include <IO/ReadBuffer.h>
 #include <amqpcpp.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
@@ -15,16 +15,13 @@ namespace Poco
 namespace DB
 {
 
-using ChannelPtr = std::shared_ptr<AMQP::TcpChannel>;
-using HandlerPtr = std::shared_ptr<RabbitMQHandler>;
-
 class ReadBufferFromRabbitMQConsumer : public ReadBuffer
 {
 
 public:
     ReadBufferFromRabbitMQConsumer(
             ChannelPtr consumer_channel_,
-            HandlerPtr event_handler_,
+            RabbitMQHandler & event_handler_,
             std::vector<String> & queues_,
             size_t channel_id_base_,
             const String & channel_base_,
@@ -78,6 +75,12 @@ public:
     auto getMessageID() const { return current.message_id; }
     auto getTimestamp() const { return current.timestamp; }
 
+    void initialize()
+    {
+        if (!initialized)
+            setupChannel();
+    }
+
 private:
     bool nextImpl() override;
 
@@ -85,7 +88,7 @@ private:
     void iterateEventLoop();
 
     ChannelPtr consumer_channel;
-    HandlerPtr event_handler;
+    RabbitMQHandler & event_handler; /// Used concurrently, but is thread safe.
     std::vector<String> queues;
     const String channel_base;
     const size_t channel_id_base;
@@ -102,6 +105,9 @@ private:
 
     AckTracker last_inserted_record_info;
     UInt64 prev_tag = 0, channel_id_counter = 0;
+
+    /// Has initial setup after constructor been made?
+    bool initialized = false;
 };
 
 }
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index 44622f106f4..cf9b557de25 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -1,22 +1,23 @@
-#include <Storages/RabbitMQ/StorageRabbitMQ.h>
-#include <DataStreams/ConvertingBlockInputStream.h>
-#include <DataStreams/UnionBlockInputStream.h>
-#include <DataStreams/copyData.h>
+#include <amqpcpp.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
-#include <Storages/RabbitMQ/RabbitMQBlockInputStream.h>
-#include <Storages/RabbitMQ/RabbitMQSink.h>
-#include <Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <Storages/RabbitMQ/RabbitMQHandler.h>
+#include <Storages/RabbitMQ/RabbitMQSink.h>
+#include <Storages/RabbitMQ/RabbitMQSource.h>
+#include <Storages/RabbitMQ/StorageRabbitMQ.h>
+#include <Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
 #include <boost/algorithm/string/replace.hpp>
@@ -26,19 +27,15 @@
 #include <Common/Exception.h>
 #include <Common/Macros.h>
 #include <Common/config_version.h>
+#include <Common/parseAddress.h>
+#include <Common/quoteString.h>
 #include <Common/setThreadName.h>
 #include <Common/typeid_cast.h>
-#include <common/logger_useful.h>
-#include <Common/quoteString.h>
-#include <Common/parseAddress.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <amqpcpp.h>
+#include <base/logger_useful.h>
 
 namespace DB
 {
 
-static const auto CONNECT_SLEEP = 200;
-static const auto RETRIES_MAX = 20;
 static const uint32_t QUEUE_SIZE = 100000;
 static const auto MAX_FAILED_READ_ATTEMPTS = 10;
 static const auto RESCHEDULE_MS = 500;
@@ -73,37 +70,45 @@ StorageRabbitMQ::StorageRabbitMQ(
         const StorageID & table_id_,
         ContextPtr context_,
         const ColumnsDescription & columns_,
-        std::unique_ptr<RabbitMQSettings> rabbitmq_settings_)
+        std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
+        bool is_attach_)
         : IStorage(table_id_)
         , WithContext(context_->getGlobalContext())
         , rabbitmq_settings(std::move(rabbitmq_settings_))
-        , exchange_name(rabbitmq_settings->rabbitmq_exchange_name.value)
-        , format_name(rabbitmq_settings->rabbitmq_format.value)
-        , exchange_type(defineExchangeType(rabbitmq_settings->rabbitmq_exchange_type.value))
-        , routing_keys(parseSettings(rabbitmq_settings->rabbitmq_routing_key_list.value))
+        , exchange_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_name))
+        , format_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_format))
+        , exchange_type(defineExchangeType(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_exchange_type)))
+        , routing_keys(parseSettings(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_routing_key_list)))
         , row_delimiter(rabbitmq_settings->rabbitmq_row_delimiter.value)
-        , schema_name(rabbitmq_settings->rabbitmq_schema.value)
+        , schema_name(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_schema))
         , num_consumers(rabbitmq_settings->rabbitmq_num_consumers.value)
         , num_queues(rabbitmq_settings->rabbitmq_num_queues.value)
-        , queue_base(rabbitmq_settings->rabbitmq_queue_base.value)
-        , queue_settings_list(parseSettings(rabbitmq_settings->rabbitmq_queue_settings_list.value))
+        , queue_base(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_base))
+        , queue_settings_list(parseSettings(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_queue_settings_list)))
         , persistent(rabbitmq_settings->rabbitmq_persistent.value)
         , use_user_setup(rabbitmq_settings->rabbitmq_queue_consume.value)
         , hash_exchange(num_consumers > 1 || num_queues > 1)
         , log(&Poco::Logger::get("StorageRabbitMQ (" + table_id_.table_name + ")"))
-        , address(rabbitmq_settings->rabbitmq_host_port.value)
-        , parsed_address(parseAddress(address, 5672))
-        , login_password(std::make_pair(
-                    getContext()->getConfigRef().getString("rabbitmq.username"),
-                    getContext()->getConfigRef().getString("rabbitmq.password")))
-        , vhost(getContext()->getConfigRef().getString("rabbitmq.vhost", rabbitmq_settings->rabbitmq_vhost.value))
         , semaphore(0, num_consumers)
         , unique_strbase(getRandomName())
         , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
         , milliseconds_to_wait(RESCHEDULE_MS)
+        , is_attach(is_attach_)
 {
-    event_handler = std::make_shared<RabbitMQHandler>(loop.getLoop(), log);
-    restoreConnection(false);
+    auto parsed_address = parseAddress(getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_host_port), 5672);
+    configuration =
+    {
+        .host = parsed_address.first,
+        .port = parsed_address.second,
+        .username = getContext()->getConfigRef().getString("rabbitmq.username"),
+        .password = getContext()->getConfigRef().getString("rabbitmq.password"),
+        .vhost = getContext()->getConfigRef().getString("rabbitmq.vhost", getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_vhost)),
+        .secure = rabbitmq_settings->rabbitmq_secure.value,
+        .connection_string = getContext()->getMacros()->expand(rabbitmq_settings->rabbitmq_address)
+    };
+
+    if (configuration.secure)
+        SSL_library_init();
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -112,17 +117,6 @@ StorageRabbitMQ::StorageRabbitMQ(
     rabbitmq_context = addSettings(getContext());
     rabbitmq_context->makeQueryContext();
 
-    /// One looping task for all consumers as they share the same connection == the same handler == the same event loop
-    event_handler->updateLoopState(Loop::STOP);
-    looping_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
-    looping_task->deactivate();
-
-    streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
-    streaming_task->deactivate();
-
-    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
-    connection_task->deactivate();
-
     if (queue_base.empty())
     {
         /* Make sure that local exchange name is unique for each table and is not the same as client's exchange name. It also needs to
@@ -147,6 +141,31 @@ StorageRabbitMQ::StorageRabbitMQ(
     }
 
     bridge_exchange = sharding_exchange + "_bridge";
+
+    try
+    {
+        connection = std::make_unique<RabbitMQConnection>(configuration, log);
+        if (connection->connect())
+            initRabbitMQ();
+        else if (!is_attach)
+            throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "Cannot connect to {}", connection->connectionInfoForLog());
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        if (!is_attach)
+            throw;
+    }
+
+    /// One looping task for all consumers as they share the same connection == the same handler == the same event loop
+    looping_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQLoopingTask", [this]{ loopingFunc(); });
+    looping_task->deactivate();
+
+    streaming_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQStreamingTask", [this]{ streamingToViewsFunc(); });
+    streaming_task->deactivate();
+
+    connection_task = getContext()->getMessageBrokerSchedulePool().createTask("RabbitMQConnectionTask", [this]{ connectionFunc(); });
+    connection_task->deactivate();
 }
 
 
@@ -193,10 +212,10 @@ String StorageRabbitMQ::getTableBasedName(String name, const StorageID & table_i
 }
 
 
-std::shared_ptr<Context> StorageRabbitMQ::addSettings(ContextPtr local_context) const
+ContextMutablePtr StorageRabbitMQ::addSettings(ContextPtr local_context) const
 {
     auto modified_context = Context::createCopy(local_context);
-    modified_context->setSetting("input_format_skip_unknown_fields", Field{true});
+    modified_context->setSetting("input_format_skip_unknown_fields", true);
     modified_context->setSetting("input_format_allow_errors_ratio", 0.);
     modified_context->setSetting("input_format_allow_errors_num", rabbitmq_settings->rabbitmq_skip_broken_messages.value);
 
@@ -218,14 +237,19 @@ std::shared_ptr<Context> StorageRabbitMQ::addSettings(ContextPtr local_context)
 
 void StorageRabbitMQ::loopingFunc()
 {
-    if (event_handler->connectionRunning())
-        event_handler->startLoop();
+    if (!rabbit_is_ready)
+        return;
+    if (connection->isConnected())
+        connection->getHandler().startLoop();
 }
 
 
 void StorageRabbitMQ::connectionFunc()
 {
-    if (restoreConnection(true))
+    if (rabbit_is_ready)
+        return;
+
+    if (connection->reconnect())
         initRabbitMQ();
     else
         connection_task->scheduleAfter(RESCHEDULE_MS);
@@ -238,7 +262,9 @@ void StorageRabbitMQ::connectionFunc()
 void StorageRabbitMQ::deactivateTask(BackgroundSchedulePool::TaskHolder & task, bool wait, bool stop_loop)
 {
     if (stop_loop)
-        event_handler->updateLoopState(Loop::STOP);
+    {
+        connection->getHandler().updateLoopState(Loop::STOP);
+    }
 
     std::unique_lock<std::mutex> lock(task_mutex, std::defer_lock);
     if (lock.try_lock())
@@ -264,7 +290,7 @@ size_t StorageRabbitMQ::getMaxBlockSize() const
 
 void StorageRabbitMQ::initRabbitMQ()
 {
-    if (stream_cancelled)
+    if (stream_cancelled || rabbit_is_ready)
         return;
 
     if (use_user_setup)
@@ -274,19 +300,28 @@ void StorageRabbitMQ::initRabbitMQ()
         return;
     }
 
-    AMQP::TcpChannel rabbit_channel(connection.get());
+    try
+    {
+        auto rabbit_channel = connection->createChannel();
 
-    /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
+        /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
 
-    initExchange(rabbit_channel);
-    bindExchange(rabbit_channel);
+        initExchange(*rabbit_channel);
+        bindExchange(*rabbit_channel);
 
-    for (const auto i : collections::range(0, num_queues))
-        bindQueue(i + 1, rabbit_channel);
+        for (const auto i : collections::range(0, num_queues))
+            bindQueue(i + 1, *rabbit_channel);
 
-    LOG_TRACE(log, "RabbitMQ setup completed");
-    rabbit_is_ready = true;
-    rabbit_channel.close();
+        LOG_TRACE(log, "RabbitMQ setup completed");
+        rabbit_is_ready = true;
+        rabbit_channel->close();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        if (!is_attach)
+            throw;
+    }
 }
 
 
@@ -376,7 +411,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
         }
 
         rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_keys[0], bind_headers)
-        .onSuccess([&]() { event_handler->stopLoop(); })
+        .onSuccess([&]() { connection->getHandler().stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -388,7 +423,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
     else if (exchange_type == AMQP::ExchangeType::fanout || exchange_type == AMQP::ExchangeType::consistent_hash)
     {
         rabbit_channel.bindExchange(exchange_name, bridge_exchange, routing_keys[0])
-        .onSuccess([&]() { event_handler->stopLoop(); })
+        .onSuccess([&]() { connection->getHandler().stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -406,7 +441,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
             {
                 ++bound_keys;
                 if (bound_keys == routing_keys.size())
-                    event_handler->stopLoop();
+                    connection->getHandler().stopLoop();
             })
             .onError([&](const char * message)
             {
@@ -418,7 +453,7 @@ void StorageRabbitMQ::bindExchange(AMQP::TcpChannel & rabbit_channel)
         }
     }
 
-    event_handler->startBlockingLoop();
+    connection->getHandler().startBlockingLoop();
 }
 
 
@@ -437,7 +472,7 @@ void StorageRabbitMQ::bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_chann
         * fanout exchange it can be arbitrary
         */
         rabbit_channel.bindQueue(consumer_exchange, queue_name, std::to_string(queue_id))
-        .onSuccess([&] { event_handler->stopLoop(); })
+        .onSuccess([&] { connection->getHandler().stopLoop(); })
         .onError([&](const char * message)
         {
             throw Exception(
@@ -503,57 +538,22 @@ void StorageRabbitMQ::bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_chann
     /// AMQP::autodelete setting is not allowed, because in case of server restart there will be no consumers
     /// and deleting queues should not take place.
     rabbit_channel.declareQueue(queue_name, AMQP::durable, queue_settings).onSuccess(success_callback).onError(error_callback);
-    event_handler->startBlockingLoop();
-}
-
-
-bool StorageRabbitMQ::restoreConnection(bool reconnecting)
-{
-    size_t cnt_retries = 0;
-
-    if (reconnecting)
-    {
-        connection->close(); /// Connection might be unusable, but not closed
-
-        /* Connection is not closed immediately (firstly, all pending operations are completed, and then
-         * an AMQP closing-handshake is  performed). But cannot open a new connection until previous one is properly closed
-         */
-        while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
-            event_handler->iterateLoop();
-
-        /// This will force immediate closure if not yet closed
-        if (!connection->closed())
-            connection->close(true);
-
-        LOG_TRACE(log, "Trying to restore connection to " + address);
-    }
-
-    connection = std::make_unique<AMQP::TcpConnection>(event_handler.get(),
-            AMQP::Address(
-                parsed_address.first, parsed_address.second,
-                AMQP::Login(login_password.first, login_password.second), vhost));
-
-    cnt_retries = 0;
-    while (!connection->ready() && !stream_cancelled && cnt_retries++ != RETRIES_MAX)
-    {
-        event_handler->iterateLoop();
-        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
-    }
-
-    return event_handler->connectionRunning();
+    connection->getHandler().startBlockingLoop();
 }
 
 
 bool StorageRabbitMQ::updateChannel(ChannelPtr & channel)
 {
-    if (event_handler->connectionRunning())
+    try
     {
-        channel = std::make_shared<AMQP::TcpChannel>(connection.get());
-        return true;
+        channel = connection->createChannel();
+        return channel->usable();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        return false;
     }
-
-    channel = nullptr;
-    return false;
 }
 
 
@@ -572,11 +572,11 @@ void StorageRabbitMQ::unbindExchange()
     std::call_once(flag, [&]()
     {
         streaming_task->deactivate();
-        event_handler->updateLoopState(Loop::STOP);
+        connection->getHandler().updateLoopState(Loop::STOP);
         looping_task->deactivate();
 
-        AMQP::TcpChannel rabbit_channel(connection.get());
-        rabbit_channel.removeExchange(bridge_exchange)
+        auto rabbit_channel = connection->createChannel();
+        rabbit_channel->removeExchange(bridge_exchange)
         .onSuccess([&]()
         {
             exchange_removed.store(true);
@@ -588,9 +588,9 @@ void StorageRabbitMQ::unbindExchange()
 
         while (!exchange_removed.load())
         {
-            event_handler->iterateLoop();
+            connection->getHandler().iterateLoop();
         }
-        rabbit_channel.close();
+        rabbit_channel->close();
     });
 }
 
@@ -614,27 +614,37 @@ Pipe StorageRabbitMQ::read(
     auto modified_context = addSettings(local_context);
     auto block_size = getMaxBlockSize();
 
-    if (!event_handler->connectionRunning())
+    if (!connection->isConnected())
     {
-        if (event_handler->loopRunning())
+        if (connection->getHandler().loopRunning())
             deactivateTask(looping_task, false, true);
-        restoreConnection(true);
+        if (!connection->reconnect())
+            throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "No connection to {}", connection->connectionInfoForLog());
     }
 
+    initializeBuffers();
+
     Pipes pipes;
     pipes.reserve(num_created_consumers);
 
     for (size_t i = 0; i < num_created_consumers; ++i)
     {
-        auto rabbit_stream = std::make_shared<RabbitMQBlockInputStream>(
+        auto rabbit_source = std::make_shared<RabbitMQSource>(
                 *this, metadata_snapshot, modified_context, column_names, block_size);
 
-        auto converting_stream = std::make_shared<ConvertingBlockInputStream>(
-            rabbit_stream, sample_block, ConvertingBlockInputStream::MatchColumnsMode::Name);
-        pipes.emplace_back(std::make_shared<SourceFromInputStream>(converting_stream));
+        auto converting_dag = ActionsDAG::makeConvertingActions(
+            rabbit_source->getPort().getHeader().getColumnsWithTypeAndName(),
+            sample_block.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name);
+
+        auto converting = std::make_shared<ExpressionActions>(std::move(converting_dag));
+        auto converting_transform = std::make_shared<ExpressionTransform>(rabbit_source->getPort().getHeader(), std::move(converting));
+
+        pipes.emplace_back(std::move(rabbit_source));
+        pipes.back().addTransform(std::move(converting_transform));
     }
 
-    if (!event_handler->loopRunning() && event_handler->connectionRunning())
+    if (!connection->getHandler().loopRunning() && connection->isConnected())
         looping_task->activateAndSchedule();
 
     LOG_DEBUG(log, "Starting reading {} streams", pipes.size());
@@ -652,16 +662,35 @@ SinkToStoragePtr StorageRabbitMQ::write(const ASTPtr &, const StorageMetadataPtr
 
 void StorageRabbitMQ::startup()
 {
-    if (event_handler->connectionRunning())
-        initRabbitMQ();
-    else
-        connection_task->activateAndSchedule();
+    if (!rabbit_is_ready)
+    {
+        if (connection->isConnected())
+        {
+            try
+            {
+                initRabbitMQ();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log);
+                if (!is_attach)
+                    throw;
+            }
+        }
+        else
+        {
+            connection_task->activateAndSchedule();
+        }
+    }
 
     for (size_t i = 0; i < num_consumers; ++i)
     {
         try
         {
-            pushReadBuffer(createReadBuffer());
+            auto buffer = createReadBuffer();
+            if (rabbit_is_ready)
+                buffer->initialize();
+            pushReadBuffer(std::move(buffer));
             ++num_created_consumers;
         }
         catch (const AMQP::Exception & e)
@@ -671,7 +700,7 @@ void StorageRabbitMQ::startup()
         }
     }
 
-    event_handler->updateLoopState(Loop::RUN);
+    connection->getHandler().updateLoopState(Loop::RUN);
     streaming_task->activateAndSchedule();
 }
 
@@ -689,25 +718,28 @@ void StorageRabbitMQ::shutdown()
     deactivateTask(streaming_task, true, false);
     deactivateTask(looping_task, true, true);
 
-    if (drop_table)
+    /// Just a paranoid try catch, it is not actually needed.
+    try
     {
-        for (auto & buffer : buffers)
-            buffer->closeChannel();
-        cleanupRabbitMQ();
+        if (drop_table)
+        {
+            for (auto & buffer : buffers)
+                buffer->closeChannel();
+
+            cleanupRabbitMQ();
+        }
+
+        /// It is important to close connection here - before removing consumer buffers, because
+        /// it will finish and clean callbacks, which might use those buffers data.
+        connection->disconnect();
+
+        for (size_t i = 0; i < num_created_consumers; ++i)
+            popReadBuffer();
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
     }
-
-    /// It is important to close connection here - before removing consumer buffers, because
-    /// it will finish and clean callbacks, which might use those buffers data.
-    connection->close();
-
-    /// Connection is not closed immediately - it requires the loop to shutdown it properly and to
-    /// finish all callbacks.
-    size_t cnt_retries = 0;
-    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
-        event_handler->iterateLoop();
-
-    for (size_t i = 0; i < num_created_consumers; ++i)
-        popReadBuffer();
 }
 
 
@@ -718,7 +750,8 @@ void StorageRabbitMQ::cleanupRabbitMQ() const
     if (use_user_setup)
         return;
 
-    if (!event_handler->connectionRunning())
+    connection->heartbeat();
+    if (!connection->isConnected())
     {
         String queue_names;
         for (const auto & queue : queues)
@@ -734,27 +767,27 @@ void StorageRabbitMQ::cleanupRabbitMQ() const
         return;
     }
 
-    AMQP::TcpChannel rabbit_channel(connection.get());
+    auto rabbit_channel = connection->createChannel();
     for (const auto & queue : queues)
     {
         /// AMQP::ifunused is needed, because it is possible to share queues between multiple tables and dropping
         /// on of them should not affect others.
         /// AMQP::ifempty is not used on purpose.
 
-        rabbit_channel.removeQueue(queue, AMQP::ifunused)
+        rabbit_channel->removeQueue(queue, AMQP::ifunused)
         .onSuccess([&](uint32_t num_messages)
         {
             LOG_TRACE(log, "Successfully deleted queue {}, messages contained {}", queue, num_messages);
-            event_handler->stopLoop();
+            connection->getHandler().stopLoop();
         })
         .onError([&](const char * message)
         {
             LOG_ERROR(log, "Failed to delete queue {}. Error message: {}", queue, message);
-            event_handler->stopLoop();
+            connection->getHandler().stopLoop();
         });
     }
-    event_handler->startBlockingLoop();
-    rabbit_channel.close();
+    connection->getHandler().startBlockingLoop();
+    rabbit_channel->close();
 
     /// Also there is no need to cleanup exchanges as they were created with AMQP::autodelete option. Once queues
     /// are removed, exchanges will also be cleaned.
@@ -797,12 +830,9 @@ ConsumerBufferPtr StorageRabbitMQ::popReadBuffer(std::chrono::milliseconds timeo
 
 ConsumerBufferPtr StorageRabbitMQ::createReadBuffer()
 {
-    ChannelPtr consumer_channel;
-    if (event_handler->connectionRunning())
-        consumer_channel = std::make_shared<AMQP::TcpChannel>(connection.get());
-
+    ChannelPtr consumer_channel = connection->createChannel();
     return std::make_shared<ReadBufferFromRabbitMQConsumer>(
-        consumer_channel, event_handler, queues, ++consumer_id,
+        std::move(consumer_channel), connection->getHandler(), queues, ++consumer_id,
         unique_strbase, log, row_delimiter, queue_size, stream_cancelled);
 }
 
@@ -810,7 +840,7 @@ ConsumerBufferPtr StorageRabbitMQ::createReadBuffer()
 ProducerBufferPtr StorageRabbitMQ::createWriteBuffer()
 {
     return std::make_shared<WriteBufferToRabbitMQProducer>(
-        parsed_address, getContext(), login_password, vhost, routing_keys, exchange_name, exchange_type,
+        configuration, getContext(), routing_keys, exchange_name, exchange_type,
         producer_id.fetch_add(1), persistent, wait_confirm, log,
         row_delimiter ? std::optional<char>{row_delimiter} : std::nullopt, 1, 1024);
 }
@@ -844,10 +874,24 @@ bool StorageRabbitMQ::checkDependencies(const StorageID & table_id)
 }
 
 
+void StorageRabbitMQ::initializeBuffers()
+{
+    assert(rabbit_is_ready);
+    if (!initialized)
+    {
+        for (const auto & buffer : buffers)
+            buffer->initialize();
+        initialized = true;
+    }
+}
+
+
 void StorageRabbitMQ::streamingToViewsFunc()
 {
-    if (rabbit_is_ready && (event_handler->connectionRunning() || restoreConnection(true)))
+    if (rabbit_is_ready && (connection->isConnected() || connection->reconnect()))
     {
+        initializeBuffers();
+
         try
         {
             auto table_id = getStorageID();
@@ -872,7 +916,7 @@ void StorageRabbitMQ::streamingToViewsFunc()
                         /// Reschedule with backoff.
                         if (milliseconds_to_wait < BACKOFF_TRESHOLD)
                             milliseconds_to_wait *= 2;
-                        event_handler->updateLoopState(Loop::STOP);
+                        connection->getHandler().updateLoopState(Loop::STOP);
                         break;
                     }
                     else
@@ -884,7 +928,7 @@ void StorageRabbitMQ::streamingToViewsFunc()
                     auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time);
                     if (duration.count() > MAX_THREAD_WORK_DURATION_MS)
                     {
-                        event_handler->updateLoopState(Loop::STOP);
+                        connection->getHandler().updateLoopState(Loop::STOP);
                         LOG_TRACE(log, "Reschedule streaming. Thread work duration limit exceeded.");
                         break;
                     }
@@ -918,20 +962,23 @@ bool StorageRabbitMQ::streamToViews()
     auto block_io = interpreter.execute();
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
-    auto column_names = block_io.out->getHeader().getNames();
+    auto column_names = block_io.pipeline.getHeader().getNames();
     auto sample_block = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
 
     auto block_size = getMaxBlockSize();
 
     // Create a stream for each consumer and join them in a union stream
-    BlockInputStreams streams;
-    streams.reserve(num_created_consumers);
+    std::vector<std::shared_ptr<RabbitMQSource>> sources;
+    Pipes pipes;
+    sources.reserve(num_created_consumers);
+    pipes.reserve(num_created_consumers);
 
     for (size_t i = 0; i < num_created_consumers; ++i)
     {
-        auto stream = std::make_shared<RabbitMQBlockInputStream>(
+        auto source = std::make_shared<RabbitMQSource>(
                 *this, metadata_snapshot, rabbitmq_context, column_names, block_size, false);
-        streams.emplace_back(stream);
+        sources.emplace_back(source);
+        pipes.emplace_back(source);
 
         // Limit read batch to maximum block size to allow DDL
         StreamLocalLimits limits;
@@ -942,25 +989,21 @@ bool StorageRabbitMQ::streamToViews()
 
         limits.timeout_overflow_mode = OverflowMode::BREAK;
 
-        stream->setLimits(limits);
+        source->setLimits(limits);
     }
 
-    // Join multiple streams if necessary
-    BlockInputStreamPtr in;
-    if (streams.size() > 1)
-        in = std::make_shared<UnionBlockInputStream>(streams, nullptr, streams.size());
-    else
-        in = streams[0];
+    block_io.pipeline.complete(Pipe::unitePipes(std::move(pipes)));
 
-    std::atomic<bool> stub = {false};
-
-    if (!event_handler->loopRunning())
+    if (!connection->getHandler().loopRunning())
     {
-        event_handler->updateLoopState(Loop::RUN);
+        connection->getHandler().updateLoopState(Loop::RUN);
         looping_task->activateAndSchedule();
     }
 
-    copyData(*in, *block_io.out, &stub);
+    {
+        CompletedPipelineExecutor executor(block_io.pipeline);
+        executor.execute();
+    }
 
     /* Note: sending ack() with loop running in another thread will lead to a lot of data races inside the library, but only in case
      * error occurs or connection is lost while ack is being sent
@@ -968,15 +1011,16 @@ bool StorageRabbitMQ::streamToViews()
     deactivateTask(looping_task, false, true);
     size_t queue_empty = 0;
 
-    if (!event_handler->connectionRunning())
+    if (!connection->isConnected())
     {
         if (stream_cancelled)
             return true;
 
-        if (restoreConnection(true))
+        if (connection->reconnect())
         {
-            for (auto & stream : streams)
-                stream->as<RabbitMQBlockInputStream>()->updateChannel();
+            LOG_DEBUG(log, "Connection restored, updating channels");
+            for (auto & source : sources)
+                source->updateChannel();
         }
         else
         {
@@ -987,14 +1031,14 @@ bool StorageRabbitMQ::streamToViews()
     else
     {
         /// Commit
-        for (auto & stream : streams)
+        for (auto & source : sources)
         {
-            if (stream->as<RabbitMQBlockInputStream>()->queueEmpty())
+            if (source->queueEmpty())
                 ++queue_empty;
 
-            if (stream->as<RabbitMQBlockInputStream>()->needChannelUpdate())
+            if (source->needChannelUpdate())
             {
-                auto buffer = stream->as<RabbitMQBlockInputStream>()->getBuffer();
+                auto buffer = source->getBuffer();
                 if (buffer)
                 {
                     if (buffer->queuesCount() != queues.size())
@@ -1003,7 +1047,10 @@ bool StorageRabbitMQ::streamToViews()
                     buffer->updateAckTracker();
 
                     if (updateChannel(buffer->getChannel()))
+                    {
+                        LOG_TRACE(log, "Connection is active, but channel update is needed");
                         buffer->setupChannel();
+                    }
                 }
             }
 
@@ -1019,15 +1066,15 @@ bool StorageRabbitMQ::streamToViews()
              *    the same channel will also commit all previously not-committed messages. Anyway I do not think that for ack frame this
              *    will ever happen.
              */
-            if (!stream->as<RabbitMQBlockInputStream>()->sendAck())
+            if (!source->sendAck())
             {
                 /// Iterate loop to activate error callbacks if they happened
-                event_handler->iterateLoop();
-                if (!event_handler->connectionRunning())
+                connection->getHandler().iterateLoop();
+                if (!connection->isConnected())
                     break;
             }
 
-            event_handler->iterateLoop();
+            connection->getHandler().iterateLoop();
         }
     }
 
@@ -1040,7 +1087,7 @@ bool StorageRabbitMQ::streamToViews()
     }
     else
     {
-        event_handler->updateLoopState(Loop::RUN);
+        connection->getHandler().updateLoopState(Loop::RUN);
         looping_task->activateAndSchedule();
     }
 
@@ -1053,52 +1100,22 @@ void registerStorageRabbitMQ(StorageFactory & factory)
 {
     auto creator_fn = [](const StorageFactory::Arguments & args)
     {
-        ASTs & engine_args = args.engine_args;
-        size_t args_count = engine_args.size();
-        bool has_settings = args.storage_def->settings;
 
         auto rabbitmq_settings = std::make_unique<RabbitMQSettings>();
-        if (has_settings)
-            rabbitmq_settings->loadFromQuery(*args.storage_def);
+        if (!args.storage_def->settings)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "RabbitMQ engine must have settings");
 
-        // Check arguments and settings
-        #define CHECK_RABBITMQ_STORAGE_ARGUMENT(ARG_NUM, ARG_NAME)                                           \
-            /* One of the three required arguments is not specified */                                       \
-            if (args_count < (ARG_NUM) && (ARG_NUM) <= 2 && !rabbitmq_settings->ARG_NAME.changed)            \
-            {                                                                                                \
-                throw Exception("Required parameter '" #ARG_NAME "' for storage RabbitMQ not specified",     \
-                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);                                           \
-            }                                                                                                \
-            if (args_count >= (ARG_NUM))                                                                     \
-            {                                                                                                \
-                if (rabbitmq_settings->ARG_NAME.changed) /* The same argument is given in two places */      \
-                {                                                                                            \
-                    throw Exception("The argument №" #ARG_NUM " of storage RabbitMQ "                        \
-                        "and the parameter '" #ARG_NAME "' is duplicated", ErrorCodes::BAD_ARGUMENTS);       \
-                }                                                                                            \
-            }
+        rabbitmq_settings->loadFromQuery(*args.storage_def);
 
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(1, rabbitmq_host_port)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(2, rabbitmq_format)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(3, rabbitmq_exchange_name)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(4, rabbitmq_exchange_type)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(5, rabbitmq_routing_key_list)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(6, rabbitmq_row_delimiter)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(7, rabbitmq_schema)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(8, rabbitmq_num_consumers)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(9, rabbitmq_num_queues)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(10, rabbitmq_queue_base)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(11, rabbitmq_persistent)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(12, rabbitmq_skip_broken_messages)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(13, rabbitmq_max_block_size)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(14, rabbitmq_flush_interval_ms)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(15, rabbitmq_vhost)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(16, rabbitmq_queue_settings_list)
-        CHECK_RABBITMQ_STORAGE_ARGUMENT(17, rabbitmq_queue_consume)
+        if (!rabbitmq_settings->rabbitmq_host_port.changed
+           && !rabbitmq_settings->rabbitmq_address.changed)
+                throw Exception("You must specify either `rabbitmq_host_port` or `rabbitmq_address` settings",
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        #undef CHECK_RABBITMQ_STORAGE_ARGUMENT
+        if (!rabbitmq_settings->rabbitmq_format.changed)
+            throw Exception("You must specify `rabbitmq_format` setting", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        return StorageRabbitMQ::create(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings));
+        return StorageRabbitMQ::create(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings), args.attach);
     };
 
     factory.registerStorage("RabbitMQ", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index 1a2445f3690..e9351058e95 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -3,13 +3,12 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Storages/IStorage.h>
 #include <Poco/Semaphore.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <mutex>
 #include <atomic>
 #include <Storages/RabbitMQ/Buffer_fwd.h>
-#include <Storages/RabbitMQ/RabbitMQHandler.h>
 #include <Storages/RabbitMQ/RabbitMQSettings.h>
-#include <Storages/RabbitMQ/UVLoop.h>
+#include <Storages/RabbitMQ/RabbitMQConnection.h>
 #include <Common/thread_local_rng.h>
 #include <amqpcpp/libuv.h>
 #include <uv.h>
@@ -19,8 +18,6 @@
 namespace DB
 {
 
-using ChannelPtr = std::shared_ptr<AMQP::TcpChannel>;
-
 class StorageRabbitMQ final: public shared_ptr_helper<StorageRabbitMQ>, public IStorage, WithContext
 {
     friend struct shared_ptr_helper<StorageRabbitMQ>;
@@ -76,7 +73,8 @@ protected:
             const StorageID & table_id_,
             ContextPtr context_,
             const ColumnsDescription & columns_,
-            std::unique_ptr<RabbitMQSettings> rabbitmq_settings_);
+            std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
+            bool is_attach_);
 
 private:
     ContextMutablePtr rabbitmq_context;
@@ -103,14 +101,9 @@ private:
 
     bool hash_exchange;
     Poco::Logger * log;
-    String address;
-    std::pair<String, UInt16> parsed_address;
-    std::pair<String, String> login_password;
-    String vhost;
 
-    UVLoop loop;
-    std::shared_ptr<RabbitMQHandler> event_handler;
-    std::unique_ptr<AMQP::TcpConnection> connection; /// Connection for all consumers
+    RabbitMQConnectionPtr connection; /// Connection for all consumers
+    RabbitMQConfiguration configuration;
 
     size_t num_created_consumers = 0;
     Poco::Semaphore semaphore;
@@ -141,8 +134,11 @@ private:
     std::atomic<bool> stream_cancelled{false};
     size_t read_attempts = 0;
     mutable bool drop_table = false;
+    bool is_attach;
 
     ConsumerBufferPtr createReadBuffer();
+    void initializeBuffers();
+    bool initialized = false;
 
     /// Functions working in the background
     void streamingToViewsFunc();
@@ -153,7 +149,7 @@ private:
     static AMQP::ExchangeType defineExchangeType(String exchange_type_);
     static String getTableBasedName(String name, const StorageID & table_id);
 
-    std::shared_ptr<Context> addSettings(ContextPtr context) const;
+    ContextMutablePtr addSettings(ContextPtr context) const;
     size_t getMaxBlockSize() const;
     void deactivateTask(BackgroundSchedulePool::TaskHolder & task, bool wait, bool stop_loop);
 
@@ -164,11 +160,10 @@ private:
     void bindExchange(AMQP::TcpChannel & rabbit_channel);
     void bindQueue(size_t queue_id, AMQP::TcpChannel & rabbit_channel);
 
-    bool restoreConnection(bool reconnecting);
     bool streamToViews();
     bool checkDependencies(const StorageID & table_id);
 
-    String getRandomName() const
+    static String getRandomName()
     {
         std::uniform_int_distribution<int> distribution('a', 'z');
         String random_str(32, ' ');
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
index b9af60eb66f..8d891e34a64 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <Interpreters/Context.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <amqpcpp.h>
 #include <uv.h>
 #include <chrono>
@@ -15,21 +15,18 @@
 namespace DB
 {
 
-static const auto CONNECT_SLEEP = 200;
-static const auto RETRIES_MAX = 20;
 static const auto BATCH = 1000;
 static const auto RETURNED_LIMIT = 50000;
 
 namespace ErrorCodes
 {
     extern const int CANNOT_CONNECT_RABBITMQ;
+    extern const int LOGICAL_ERROR;
 }
 
 WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
-        std::pair<String, UInt16> & parsed_address_,
+        const RabbitMQConfiguration & configuration_,
         ContextPtr global_context,
-        const std::pair<String, String> & login_password_,
-        const String & vhost_,
         const Names & routing_keys_,
         const String & exchange_name_,
         const AMQP::ExchangeType exchange_type_,
@@ -41,9 +38,7 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         size_t rows_per_message,
         size_t chunk_size_)
         : WriteBuffer(nullptr, 0)
-        , parsed_address(parsed_address_)
-        , login_password(login_password_)
-        , vhost(vhost_)
+        , connection(configuration_, log_)
         , routing_keys(routing_keys_)
         , exchange_name(exchange_name_)
         , exchange_type(exchange_type_)
@@ -57,20 +52,10 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
         , max_rows(rows_per_message)
         , chunk_size(chunk_size_)
 {
-    event_handler = std::make_unique<RabbitMQHandler>(loop.getLoop(), log);
-
-    if (setupConnection(false))
-    {
+    if (connection.connect())
         setupChannel();
-    }
     else
-    {
-        if (!connection->closed())
-             connection->close(true);
-
-        throw Exception("Cannot connect to RabbitMQ host: " + parsed_address.first + ", port: " + std::to_string(parsed_address.second),
-                ErrorCodes::CANNOT_CONNECT_RABBITMQ);
-    }
+        throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "Cannot connect to RabbitMQ {}", connection.connectionInfoForLog());
 
     writing_task = global_context->getSchedulePool().createTask("RabbitMQWritingTask", [this]{ writingFunc(); });
     writing_task->deactivate();
@@ -92,16 +77,8 @@ WriteBufferToRabbitMQProducer::WriteBufferToRabbitMQProducer(
 WriteBufferToRabbitMQProducer::~WriteBufferToRabbitMQProducer()
 {
     writing_task->deactivate();
-    connection->close();
-
-    size_t cnt_retries = 0;
-    while (!connection->closed() && cnt_retries++ != RETRIES_MAX)
-    {
-        event_handler->iterateLoop();
-        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
-    }
-
-    assert(rows == 0 && chunks.empty());
+    connection.disconnect();
+    assert(rows == 0);
 }
 
 
@@ -126,47 +103,15 @@ void WriteBufferToRabbitMQProducer::countRow()
         reinitializeChunks();
 
         ++payload_counter;
-        payloads.push(std::make_pair(payload_counter, payload));
+        if (!payloads.push(std::make_pair(payload_counter, payload)))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to payloads queue");
     }
 }
 
 
-bool WriteBufferToRabbitMQProducer::setupConnection(bool reconnecting)
-{
-    size_t cnt_retries = 0;
-
-    if (reconnecting)
-    {
-        connection->close();
-
-        while (!connection->closed() && ++cnt_retries != RETRIES_MAX)
-            event_handler->iterateLoop();
-
-        if (!connection->closed())
-            connection->close(true);
-
-        LOG_TRACE(log, "Trying to set up connection");
-    }
-
-    connection = std::make_unique<AMQP::TcpConnection>(event_handler.get(),
-            AMQP::Address(
-                parsed_address.first, parsed_address.second,
-                AMQP::Login(login_password.first, login_password.second), vhost));
-
-    cnt_retries = 0;
-    while (!connection->ready() && ++cnt_retries != RETRIES_MAX)
-    {
-        event_handler->iterateLoop();
-        std::this_thread::sleep_for(std::chrono::milliseconds(CONNECT_SLEEP));
-    }
-
-    return event_handler->connectionRunning();
-}
-
-
 void WriteBufferToRabbitMQProducer::setupChannel()
 {
-    producer_channel = std::make_unique<AMQP::TcpChannel>(connection.get());
+    producer_channel = connection.createChannel();
 
     producer_channel->onError([&](const char * message)
     {
@@ -179,7 +124,8 @@ void WriteBufferToRabbitMQProducer::setupChannel()
          * they are republished because after channel recovery they will acquire new delivery tags, so all previous records become invalid
          */
         for (const auto & record : delivery_record)
-            returned.tryPush(record.second);
+            if (!returned.push(record.second))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to returned queue");
 
         LOG_DEBUG(log, "Producer on channel {} hasn't confirmed {} messages, {} waiting to be published",
                 channel_id, delivery_record.size(), payloads.size());
@@ -227,7 +173,8 @@ void WriteBufferToRabbitMQProducer::removeRecord(UInt64 received_delivery_tag, b
 
         if (republish)
             for (auto record = delivery_record.begin(); record != record_iter; ++record)
-                returned.tryPush(record->second);
+                if (!returned.push(record->second))
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to returned queue");
 
         /// Delete the records even in case when republished because new delivery tags will be assigned by the server.
         delivery_record.erase(delivery_record.begin(), record_iter);
@@ -235,7 +182,8 @@ void WriteBufferToRabbitMQProducer::removeRecord(UInt64 received_delivery_tag, b
     else
     {
         if (republish)
-            returned.tryPush(record_iter->second);
+            if (!returned.push(record_iter->second))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to returned queue");
 
         delivery_record.erase(record_iter);
     }
@@ -251,7 +199,11 @@ void WriteBufferToRabbitMQProducer::publish(ConcurrentBoundedQueue<std::pair<UIn
      */
     while (!messages.empty() && producer_channel->usable() && delivery_record.size() < RETURNED_LIMIT)
     {
-        messages.pop(payload);
+        bool pop_result = messages.pop(payload);
+
+        if (!pop_result)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not pop payload");
+
         AMQP::Envelope envelope(payload.second.data(), payload.second.size());
 
         /// if headers exchange is used, routing keys are added here via headers, if not - it is just empty
@@ -322,8 +274,11 @@ void WriteBufferToRabbitMQProducer::writingFunc()
 
         if (wait_num.load() && delivery_record.empty() && payloads.empty() && returned.empty())
             wait_all = false;
-        else if ((!producer_channel->usable() && event_handler->connectionRunning()) || (!event_handler->connectionRunning() && setupConnection(true)))
-            setupChannel();
+        else if (!producer_channel->usable())
+        {
+            if (connection.reconnect())
+                setupChannel();
+        }
     }
 
     LOG_DEBUG(log, "Producer on channel {} completed", channel_id);
@@ -355,7 +310,7 @@ void WriteBufferToRabbitMQProducer::reinitializeChunks()
 
 void WriteBufferToRabbitMQProducer::iterateEventLoop()
 {
-    event_handler->iterateLoop();
+    connection.getHandler().iterateLoop();
 }
 
 }
diff --git a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
index 452cc38d751..8ed1ea643f3 100644
--- a/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
+++ b/src/Storages/RabbitMQ/WriteBufferToRabbitMQProducer.h
@@ -6,8 +6,7 @@
 #include <mutex>
 #include <atomic>
 #include <amqpcpp.h>
-#include <Storages/RabbitMQ/RabbitMQHandler.h>
-#include <Storages/RabbitMQ/UVLoop.h>
+#include <Storages/RabbitMQ/RabbitMQConnection.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/Names.h>
@@ -19,14 +18,12 @@ class WriteBufferToRabbitMQProducer : public WriteBuffer
 {
 public:
     WriteBufferToRabbitMQProducer(
-            std::pair<String, UInt16> & parsed_address_,
+            const RabbitMQConfiguration & configuration_,
             ContextPtr global_context,
-            const std::pair<String, String> & login_password_,
-            const String & vhost_,
             const Names & routing_keys_,
             const String & exchange_name_,
             const AMQP::ExchangeType exchange_type_,
-            const size_t channel_id_,
+            const size_t channel_id_base_,
             const bool persistent_,
             std::atomic<bool> & wait_confirm_,
             Poco::Logger * log_,
@@ -48,14 +45,12 @@ private:
 
     void iterateEventLoop();
     void writingFunc();
-    bool setupConnection(bool reconnecting);
     void setupChannel();
     void removeRecord(UInt64 received_delivery_tag, bool multiple, bool republish);
     void publish(ConcurrentBoundedQueue<std::pair<UInt64, String>> & message, bool republishing);
 
-    std::pair<String, UInt16> parsed_address;
-    const std::pair<String, String> login_password;
-    const String vhost;
+    RabbitMQConnection connection;
+
     const Names routing_keys;
     const String exchange_name;
     AMQP::ExchangeType exchange_type;
@@ -70,9 +65,6 @@ private:
     AMQP::Table key_arguments;
     BackgroundSchedulePool::TaskHolder writing_task;
 
-    UVLoop loop;
-    std::unique_ptr<RabbitMQHandler> event_handler;
-    std::unique_ptr<AMQP::TcpConnection> connection;
     std::unique_ptr<AMQP::TcpChannel> producer_channel;
     bool producer_ready = false;
 
diff --git a/src/Storages/ReadFinalForExternalReplicaStorage.h b/src/Storages/ReadFinalForExternalReplicaStorage.h
index f09a115919d..979945a38c7 100644
--- a/src/Storages/ReadFinalForExternalReplicaStorage.h
+++ b/src/Storages/ReadFinalForExternalReplicaStorage.h
@@ -1,13 +1,11 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL || USE_LIBPQXX
 
 #include <Storages/StorageProxy.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
diff --git a/src/Storages/ReadInOrderOptimizer.cpp b/src/Storages/ReadInOrderOptimizer.cpp
index 912d284bfc0..bae24f97b28 100644
--- a/src/Storages/ReadInOrderOptimizer.cpp
+++ b/src/Storages/ReadInOrderOptimizer.cpp
@@ -6,8 +6,6 @@
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/TableJoin.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 
 namespace DB
 {
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp b/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
deleted file mode 100644
index 4900e17ad91..00000000000
--- a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <DataStreams/IBlockInputStream.h>
-#include <Interpreters/Context.h>
-#include <IO/ReadBufferFromString.h>
-#include <Storages/RocksDB/StorageEmbeddedRocksDB.h>
-#include <Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h>
-
-#include <rocksdb/db.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ROCKSDB_ERROR;
-}
-
-EmbeddedRocksDBBlockInputStream::EmbeddedRocksDBBlockInputStream(
-            StorageEmbeddedRocksDB & storage_,
-            const StorageMetadataPtr & metadata_snapshot_,
-            size_t max_block_size_)
-            : storage(storage_)
-            , metadata_snapshot(metadata_snapshot_)
-            , max_block_size(max_block_size_)
-{
-    sample_block = metadata_snapshot->getSampleBlock();
-    primary_key_pos = sample_block.getPositionByName(storage.primary_key);
-}
-
-Block EmbeddedRocksDBBlockInputStream::readImpl()
-{
-    if (finished)
-        return {};
-
-    if (!iterator)
-    {
-        iterator = std::unique_ptr<rocksdb::Iterator>(storage.rocksdb_ptr->NewIterator(rocksdb::ReadOptions()));
-        iterator->SeekToFirst();
-    }
-
-    MutableColumns columns = sample_block.cloneEmptyColumns();
-
-    for (size_t rows = 0; iterator->Valid() && rows < max_block_size; ++rows, iterator->Next())
-    {
-        ReadBufferFromString key_buffer(iterator->key());
-        ReadBufferFromString value_buffer(iterator->value());
-
-        size_t idx = 0;
-        for (const auto & elem : sample_block)
-        {
-            auto serialization = elem.type->getDefaultSerialization();
-            serialization->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
-            ++idx;
-        }
-    }
-
-    finished = !iterator->Valid();
-    if (!iterator->status().ok())
-    {
-        throw Exception("Engine " + getName() + " got error while seeking key value data: " + iterator->status().ToString(),
-            ErrorCodes::ROCKSDB_ERROR);
-    }
-    return sample_block.cloneWithColumns(std::move(columns));
-}
-
-}
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h b/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h
deleted file mode 100644
index ddff1fc2e84..00000000000
--- a/src/Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <DataStreams/IBlockInputStream.h>
-
-
-namespace rocksdb
-{
-    class Iterator;
-}
-
-namespace DB
-{
-
-class StorageEmbeddedRocksDB;
-struct StorageInMemoryMetadata;
-using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
-
-class EmbeddedRocksDBBlockInputStream : public IBlockInputStream
-{
-
-public:
-    EmbeddedRocksDBBlockInputStream(
-        StorageEmbeddedRocksDB & storage_, const StorageMetadataPtr & metadata_snapshot_, size_t max_block_size_);
-
-    String getName() const override { return "EmbeddedRocksDB"; }
-    Block getHeader() const override { return sample_block; }
-    Block readImpl() override;
-
-private:
-    StorageEmbeddedRocksDB & storage;
-    StorageMetadataPtr metadata_snapshot;
-    const size_t max_block_size;
-
-    Block sample_block;
-    std::unique_ptr<rocksdb::Iterator> iterator;
-    size_t primary_key_pos;
-    bool finished = false;
-};
-}
diff --git a/src/Storages/RocksDB/EmbeddedRocksDBSink.cpp b/src/Storages/RocksDB/EmbeddedRocksDBSink.cpp
index ddf839b6427..1c918c15775 100644
--- a/src/Storages/RocksDB/EmbeddedRocksDBSink.cpp
+++ b/src/Storages/RocksDB/EmbeddedRocksDBSink.cpp
@@ -20,7 +20,7 @@ EmbeddedRocksDBSink::EmbeddedRocksDBSink(
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
 {
-    for (const auto & elem : getPort().getHeader())
+    for (const auto & elem : getHeader())
     {
         if (elem.name == storage.primary_key)
             break;
@@ -31,7 +31,7 @@ EmbeddedRocksDBSink::EmbeddedRocksDBSink(
 void EmbeddedRocksDBSink::consume(Chunk chunk)
 {
     auto rows = chunk.getNumRows();
-    auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+    auto block = getHeader().cloneWithColumns(chunk.detachColumns());
 
     WriteBufferFromOwnString wb_key;
     WriteBufferFromOwnString wb_value;
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 459c0879cda..18bf0e2c19b 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -1,6 +1,5 @@
 #include <Storages/RocksDB/StorageEmbeddedRocksDB.h>
 #include <Storages/RocksDB/EmbeddedRocksDBSink.h>
-#include <Storages/RocksDB/EmbeddedRocksDBBlockInputStream.h>
 
 #include <DataTypes/DataTypesNumber.h>
 
@@ -18,8 +17,8 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/ReadBufferFromString.h>
 
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Sources/SourceWithProgress.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/Set.h>
@@ -29,13 +28,14 @@
 
 #include <Poco/Logger.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <rocksdb/db.h>
 #include <rocksdb/table.h>
 #include <rocksdb/convenience.h>
 
 #include <filesystem>
+#include <shared_mutex>
 
 
 namespace fs = std::filesystem;
@@ -181,15 +181,15 @@ class EmbeddedRocksDBSource : public SourceWithProgress
 public:
     EmbeddedRocksDBSource(
         const StorageEmbeddedRocksDB & storage_,
-        const StorageMetadataPtr & metadata_snapshot_,
+        const Block & header,
         FieldVectorPtr keys_,
         FieldVector::const_iterator begin_,
         FieldVector::const_iterator end_,
         const size_t max_block_size_)
-        : SourceWithProgress(metadata_snapshot_->getSampleBlock())
+        : SourceWithProgress(header)
         , storage(storage_)
-        , metadata_snapshot(metadata_snapshot_)
-        , keys(std::move(keys_))
+        , primary_key_pos(header.getPositionByName(storage.getPrimaryKey()))
+        , keys(keys_)
         , begin(begin_)
         , end(end_)
         , it(begin)
@@ -197,12 +197,29 @@ public:
     {
     }
 
-    String getName() const override
+    EmbeddedRocksDBSource(
+        const StorageEmbeddedRocksDB & storage_,
+        const Block & header,
+        std::unique_ptr<rocksdb::Iterator> iterator_,
+        const size_t max_block_size_)
+        : SourceWithProgress(header)
+        , storage(storage_)
+        , primary_key_pos(header.getPositionByName(storage.getPrimaryKey()))
+        , iterator(std::move(iterator_))
+        , max_block_size(max_block_size_)
     {
-        return storage.getName();
     }
 
+    String getName() const override { return storage.getName(); }
+
     Chunk generate() override
+    {
+        if (keys)
+            return generateWithKeys();
+        return generateFullScan();
+    }
+
+    Chunk generateWithKeys()
     {
         if (it >= end)
             return {};
@@ -212,16 +229,15 @@ public:
         std::vector<std::string> serialized_keys(num_keys);
         std::vector<rocksdb::Slice> slices_keys(num_keys);
 
-        const auto & sample_block = metadata_snapshot->getSampleBlock();
-        const auto & key_column = sample_block.getByName(storage.primary_key);
-        auto columns = sample_block.cloneEmptyColumns();
-        size_t primary_key_pos = sample_block.getPositionByName(storage.primary_key);
+        const auto & sample_block = getPort().getHeader();
+
+        const auto & key_column_type = sample_block.getByName(storage.getPrimaryKey()).type;
 
         size_t rows_processed = 0;
         while (it < end && rows_processed < max_block_size)
         {
             WriteBufferFromString wb(serialized_keys[rows_processed]);
-            key_column.type->getDefaultSerialization()->serializeBinary(*it, wb);
+            key_column_type->getDefaultSerialization()->serializeBinary(*it, wb);
             wb.finalize();
             slices_keys[rows_processed] = std::move(serialized_keys[rows_processed]);
 
@@ -229,22 +245,16 @@ public:
             ++rows_processed;
         }
 
+        MutableColumns columns = sample_block.cloneEmptyColumns();
         std::vector<String> values;
-        auto statuses = storage.rocksdb_ptr->MultiGet(rocksdb::ReadOptions(), slices_keys, &values);
-
+        auto statuses = storage.multiGet(slices_keys, values);
         for (size_t i = 0; i < statuses.size(); ++i)
         {
             if (statuses[i].ok())
             {
                 ReadBufferFromString key_buffer(slices_keys[i]);
                 ReadBufferFromString value_buffer(values[i]);
-
-                size_t idx = 0;
-                for (const auto & elem : sample_block)
-                {
-                    elem.type->getDefaultSerialization()->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
-                    ++idx;
-                }
+                fillColumns(key_buffer, value_buffer, columns);
             }
         }
 
@@ -252,14 +262,54 @@ public:
         return Chunk(std::move(columns), num_rows);
     }
 
+    Chunk generateFullScan()
+    {
+        if (!iterator->Valid())
+            return {};
+
+        const auto & sample_block = getPort().getHeader();
+        MutableColumns columns = sample_block.cloneEmptyColumns();
+
+        for (size_t rows = 0; iterator->Valid() && rows < max_block_size; ++rows, iterator->Next())
+        {
+            ReadBufferFromString key_buffer(iterator->key());
+            ReadBufferFromString value_buffer(iterator->value());
+            fillColumns(key_buffer, value_buffer, columns);
+        }
+
+        if (!iterator->status().ok())
+        {
+            throw Exception("Engine " + getName() + " got error while seeking key value data: " + iterator->status().ToString(),
+                ErrorCodes::ROCKSDB_ERROR);
+        }
+        Block block = sample_block.cloneWithColumns(std::move(columns));
+        return Chunk(block.getColumns(), block.rows());
+    }
+
+    void fillColumns(ReadBufferFromString & key_buffer, ReadBufferFromString & value_buffer, MutableColumns & columns)
+    {
+        size_t idx = 0;
+        for (const auto & elem : getPort().getHeader())
+        {
+            elem.type->getDefaultSerialization()->deserializeBinary(*columns[idx], idx == primary_key_pos ? key_buffer : value_buffer);
+            ++idx;
+        }
+    }
+
 private:
     const StorageEmbeddedRocksDB & storage;
 
-    const StorageMetadataPtr metadata_snapshot;
-    FieldVectorPtr keys;
+    size_t primary_key_pos;
+
+    /// For key scan
+    FieldVectorPtr keys = nullptr;
     FieldVector::const_iterator begin;
     FieldVector::const_iterator end;
     FieldVector::const_iterator it;
+
+    /// For full scan
+    std::unique_ptr<rocksdb::Iterator> iterator = nullptr;
+
     const size_t max_block_size;
 };
 
@@ -280,18 +330,21 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
     {
         fs::create_directories(rocksdb_dir);
     }
-    initDb();
+    initDB();
 }
 
 void StorageEmbeddedRocksDB::truncate(const ASTPtr &, const StorageMetadataPtr & , ContextPtr, TableExclusiveLockHolder &)
 {
+    std::unique_lock<std::shared_mutex> lock(rocksdb_ptr_mx);
     rocksdb_ptr->Close();
+    rocksdb_ptr = nullptr;
+
     fs::remove_all(rocksdb_dir);
     fs::create_directories(rocksdb_dir);
-    initDb();
+    initDB();
 }
 
-void StorageEmbeddedRocksDB::initDb()
+void StorageEmbeddedRocksDB::initDB()
 {
     rocksdb::Status status;
     rocksdb::Options base;
@@ -376,7 +429,6 @@ void StorageEmbeddedRocksDB::initDb()
     rocksdb_ptr = std::unique_ptr<rocksdb::DB>(db);
 }
 
-
 Pipe StorageEmbeddedRocksDB::read(
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
@@ -391,13 +443,14 @@ Pipe StorageEmbeddedRocksDB::read(
     FieldVectorPtr keys;
     bool all_scan = false;
 
-    auto primary_key_data_type = metadata_snapshot->getSampleBlock().getByName(primary_key).type;
+    Block sample_block = metadata_snapshot->getSampleBlock();
+    auto primary_key_data_type = sample_block.getByName(primary_key).type;
     std::tie(keys, all_scan) = getFilterKeys(primary_key, primary_key_data_type, query_info);
     if (all_scan)
     {
-        auto reader = std::make_shared<EmbeddedRocksDBBlockInputStream>(
-                *this, metadata_snapshot, max_block_size);
-        return Pipe(std::make_shared<SourceFromInputStream>(reader));
+        auto iterator = std::unique_ptr<rocksdb::Iterator>(rocksdb_ptr->NewIterator(rocksdb::ReadOptions()));
+        iterator->SeekToFirst();
+        return Pipe(std::make_shared<EmbeddedRocksDBSource>(*this, sample_block, std::move(iterator), max_block_size));
     }
     else
     {
@@ -421,7 +474,7 @@ Pipe StorageEmbeddedRocksDB::read(
             size_t end = num_keys * (thread_idx + 1) / num_threads;
 
             pipes.emplace_back(std::make_shared<EmbeddedRocksDBSource>(
-                    *this, metadata_snapshot, keys, keys->begin() + begin, keys->begin() + end, max_block_size));
+                    *this, sample_block, keys, keys->begin() + begin, keys->begin() + end, max_block_size));
         }
         return Pipe::unitePipes(std::move(pipes));
     }
@@ -433,7 +486,6 @@ SinkToStoragePtr StorageEmbeddedRocksDB::write(
     return std::make_shared<EmbeddedRocksDBSink>(*this, metadata_snapshot);
 }
 
-
 static StoragePtr create(const StorageFactory::Arguments & args)
 {
     // TODO custom RocksDBSettings, table function
@@ -460,9 +512,20 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
 std::shared_ptr<rocksdb::Statistics> StorageEmbeddedRocksDB::getRocksDBStatistics() const
 {
+    std::shared_lock<std::shared_mutex> lock(rocksdb_ptr_mx);
+    if (!rocksdb_ptr)
+        return nullptr;
     return rocksdb_ptr->GetOptions().statistics;
 }
 
+std::vector<rocksdb::Status> StorageEmbeddedRocksDB::multiGet(const std::vector<rocksdb::Slice> & slices_keys, std::vector<String> & values) const
+{
+    std::shared_lock<std::shared_mutex> lock(rocksdb_ptr_mx);
+    if (!rocksdb_ptr)
+        return {};
+    return rocksdb_ptr->MultiGet(rocksdb::ReadOptions(), slices_keys, &values);
+}
+
 void registerStorageEmbeddedRocksDB(StorageFactory & factory)
 {
     StorageFactory::StorageFeatures features{
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index 3f1b3b49492..d45d3dd320c 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <memory>
-#include <common/shared_ptr_helper.h>
+#include <shared_mutex>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
+#include <rocksdb/status.h>
 
 
 namespace rocksdb
@@ -20,9 +22,7 @@ class Context;
 class StorageEmbeddedRocksDB final : public shared_ptr_helper<StorageEmbeddedRocksDB>, public IStorage, WithContext
 {
     friend struct shared_ptr_helper<StorageEmbeddedRocksDB>;
-    friend class EmbeddedRocksDBSource;
     friend class EmbeddedRocksDBSink;
-    friend class EmbeddedRocksDBBlockInputStream;
 public:
     std::string getName() const override { return "EmbeddedRocksDB"; }
 
@@ -50,6 +50,8 @@ public:
     Strings getDataPaths() const override { return {rocksdb_dir}; }
 
     std::shared_ptr<rocksdb::Statistics> getRocksDBStatistics() const;
+    std::vector<rocksdb::Status> multiGet(const std::vector<rocksdb::Slice> & slices_keys, std::vector<String> & values) const;
+    const String & getPrimaryKey() const { return primary_key; }
 
 protected:
     StorageEmbeddedRocksDB(const StorageID & table_id_,
@@ -63,8 +65,9 @@ private:
     const String primary_key;
     using RocksDBPtr = std::unique_ptr<rocksdb::DB>;
     RocksDBPtr rocksdb_ptr;
+    mutable std::shared_mutex rocksdb_ptr_mx;
     String rocksdb_dir;
 
-    void initDb();
+    void initDB();
 };
 }
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.cpp b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
index 7d31d5ddc21..cbb96ed4001 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
@@ -43,7 +43,8 @@ void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr con
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
-    std::map<String, std::map<String, StoragePtr>> tables;
+    using RocksDBStoragePtr = std::shared_ptr<StorageEmbeddedRocksDB>;
+    std::map<String, std::map<String, RocksDBStoragePtr>> tables;
     for (const auto & db : DatabaseCatalog::instance().getDatabases())
     {
         const bool check_access_for_tables = check_access_for_databases && !access->isGranted(AccessType::SHOW_TABLES, db.first);
@@ -51,18 +52,17 @@ void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr con
         for (auto iterator = db.second->getTablesIterator(context); iterator->isValid(); iterator->next())
         {
             StoragePtr table = iterator->table();
-            if (!table)
+            RocksDBStoragePtr rocksdb_table = table ? std::dynamic_pointer_cast<StorageEmbeddedRocksDB>(table) : nullptr;
+            if (!rocksdb_table)
                 continue;
 
-            if (!dynamic_cast<const StorageEmbeddedRocksDB *>(table.get()))
-                continue;
             if (check_access_for_tables && !access->isGranted(AccessType::SHOW_TABLES, db.first, iterator->name()))
                 continue;
-            tables[db.first][iterator->name()] = table;
+
+            tables[db.first][iterator->name()] = rocksdb_table;
         }
     }
 
-
     MutableColumnPtr col_database_mut = ColumnString::create();
     MutableColumnPtr col_table_mut = ColumnString::create();
 
@@ -101,10 +101,9 @@ void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr con
         String database = (*col_database_to_filter)[i].safeGet<const String &>();
         String table = (*col_table_to_filter)[i].safeGet<const String &>();
 
-        auto & rocksdb_table = dynamic_cast<StorageEmbeddedRocksDB &>(*tables[database][table]);
-        auto statistics = rocksdb_table.getRocksDBStatistics();
+        auto statistics = tables[database][table]->getRocksDBStatistics();
         if (!statistics)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "rocksdb statistics is not enabled");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "RocksDB statistics are not available");
 
         for (auto [tick, name] : rocksdb::TickersNameMap)
         {
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.h b/src/Storages/RocksDB/StorageSystemRocksDB.h
index e94bdb06aee..8394fc3dd3a 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.h
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/SelectQueryDescription.cpp b/src/Storages/SelectQueryDescription.cpp
index 05747a9a260..018a9f0ea98 100644
--- a/src/Storages/SelectQueryDescription.cpp
+++ b/src/Storages/SelectQueryDescription.cpp
@@ -48,7 +48,7 @@ StorageID extractDependentTableFromSelectQuery(ASTSelectQuery & query, ContextPt
 {
     if (add_default_db)
     {
-        AddDefaultDatabaseVisitor visitor(context->getCurrentDatabase(), false, nullptr);
+        AddDefaultDatabaseVisitor visitor(context, context->getCurrentDatabase());
         visitor.visit(query);
     }
 
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index 3b3c0fa1258..fe7b22d331b 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -39,6 +39,9 @@ using ReadInOrderOptimizerPtr = std::shared_ptr<const ReadInOrderOptimizer>;
 class Cluster;
 using ClusterPtr = std::shared_ptr<Cluster>;
 
+struct MergeTreeDataSelectAnalysisResult;
+using MergeTreeDataSelectAnalysisResultPtr = std::shared_ptr<MergeTreeDataSelectAnalysisResult>;
+
 struct PrewhereInfo
 {
     /// Actions which are executed in order to alias columns are used for prewhere actions.
@@ -103,7 +106,7 @@ using ManyExpressionActions = std::vector<ExpressionActionsPtr>;
 // The projection selected to execute current query
 struct ProjectionCandidate
 {
-    const ProjectionDescription * desc{};
+    ProjectionDescriptionRawPtr desc{};
     PrewhereInfoPtr prewhere_info;
     ActionsDAGPtr before_where;
     String where_column_name;
@@ -118,6 +121,8 @@ struct ProjectionCandidate
     ReadInOrderOptimizerPtr order_optimizer;
     InputOrderInfoPtr input_order_info;
     ManyExpressionActions group_by_elements_actions;
+    MergeTreeDataSelectAnalysisResultPtr merge_tree_projection_select_result_ptr;
+    MergeTreeDataSelectAnalysisResultPtr merge_tree_normal_select_result_ptr;
 };
 
 /** Query along with some additional data,
@@ -128,6 +133,7 @@ struct SelectQueryInfo
 {
     ASTPtr query;
     ASTPtr view_query; /// Optimized VIEW query
+    ASTPtr original_query; /// Unmodified query for projection analysis
 
     /// Cluster for the query.
     ClusterPtr cluster;
@@ -158,6 +164,9 @@ struct SelectQueryInfo
     std::optional<ProjectionCandidate> projection;
     bool ignore_projections = false;
     bool is_projection_query = false;
+    bool merge_tree_empty_result = false;
+    Block minmax_count_projection_block;
+    MergeTreeDataSelectAnalysisResultPtr merge_tree_select_result_ptr;
 };
 
 }
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index e9136bb5d05..12eae0e82a2 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -18,19 +18,21 @@
 #include <Common/quoteString.h>
 #include <Common/typeid_cast.h>
 #include <Common/ProfileEvents.h>
-#include <common/logger_useful.h>
-#include <common/getThreadId.h>
-#include <common/range.h>
+#include <base/logger_useful.h>
+#include <base/getThreadId.h>
+#include <base/range.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/Sources/SourceWithProgress.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/UnionStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
 
 
 namespace ProfileEvents
@@ -128,6 +130,8 @@ StorageBuffer::StorageBuffer(
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
+
+    flush_handle = bg_pool.createTask(log->name() + "/Bg", [this]{ backgroundFlush(); });
 }
 
 
@@ -161,13 +165,7 @@ protected:
         columns.reserve(column_names_and_types.size());
 
         for (const auto & elem : column_names_and_types)
-        {
-            const auto & current_column = buffer.data.getByName(elem.getNameInStorage()).column;
-            if (elem.isSubcolumn())
-                columns.emplace_back(elem.getTypeInStorage()->getSubcolumn(elem.getSubcolumnName(), *current_column));
-            else
-                columns.emplace_back(std::move(current_column));
-        }
+            columns.emplace_back(getColumnFromBlock(buffer.data, elem));
 
         UInt64 size = columns.at(0)->size();
         res.setColumns(std::move(columns), size);
@@ -448,7 +446,8 @@ static void appendBlock(const Block & from, Block & to)
     if (!to)
         throw Exception("Cannot append to empty block", ErrorCodes::LOGICAL_ERROR);
 
-    assertBlocksHaveEqualStructure(from, to, "Buffer");
+    if (to.rows())
+        assertBlocksHaveEqualStructure(from, to, "Buffer");
 
     from.checkNumberOfRows();
     to.checkNumberOfRows();
@@ -466,14 +465,21 @@ static void appendBlock(const Block & from, Block & to)
     {
         MemoryTracker::BlockerInThread temporarily_disable_memory_tracker;
 
-        for (size_t column_no = 0, columns = to.columns(); column_no < columns; ++column_no)
+        if (to.rows() == 0)
         {
-            const IColumn & col_from = *from.getByPosition(column_no).column.get();
-            last_col = IColumn::mutate(std::move(to.getByPosition(column_no).column));
+            to = from;
+        }
+        else
+        {
+            for (size_t column_no = 0, columns = to.columns(); column_no < columns; ++column_no)
+            {
+                const IColumn & col_from = *from.getByPosition(column_no).column.get();
+                last_col = IColumn::mutate(std::move(to.getByPosition(column_no).column));
 
-            last_col->insertRangeFrom(col_from, 0, rows);
+                last_col->insertRangeFrom(col_from, 0, rows);
 
-            to.getByPosition(column_no).column = std::move(last_col);
+                to.getByPosition(column_no).column = std::move(last_col);
+            }
         }
     }
     catch (...)
@@ -525,7 +531,7 @@ public:
         , metadata_snapshot(metadata_snapshot_)
     {
         // Check table structure.
-        metadata_snapshot->check(getPort().getHeader(), true);
+        metadata_snapshot->check(getHeader(), true);
     }
 
     String getName() const override { return "BufferSink"; }
@@ -536,7 +542,7 @@ public:
         if (!rows)
             return;
 
-        auto block = getPort().getHeader().cloneWithColumns(chunk.getColumns());
+        auto block = getHeader().cloneWithColumns(chunk.getColumns());
 
         StoragePtr destination;
         if (storage.destination_id)
@@ -671,7 +677,6 @@ void StorageBuffer::startup()
         LOG_WARNING(log, "Storage {} is run with readonly settings, it will not be able to insert data. Set appropriate buffer_profile to fix this.", getName());
     }
 
-    flush_handle = bg_pool.createTask(log->name() + "/Bg", [this]{ backgroundFlush(); });
     flush_handle->activateAndSchedule();
 }
 
@@ -960,9 +965,10 @@ void StorageBuffer::writeBlockToDestination(const Block & block, StoragePtr tabl
     InterpreterInsertQuery interpreter{insert, insert_context, allow_materialized};
 
     auto block_io = interpreter.execute();
-    block_io.out->writePrefix();
-    block_io.out->write(block_to_write);
-    block_io.out->writeSuffix();
+    PushingPipelineExecutor executor(block_io.pipeline);
+    executor.start();
+    executor.push(std::move(block_to_write));
+    executor.finish();
 }
 
 
@@ -1021,11 +1027,13 @@ void StorageBuffer::checkAlterIsPossible(const AlterCommands & commands, Context
     auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
@@ -1058,7 +1066,7 @@ std::optional<UInt64> StorageBuffer::totalBytes(const Settings & /*settings*/) c
     return total_writes.bytes;
 }
 
-void StorageBuffer::alter(const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
+void StorageBuffer::alter(const AlterCommands & params, ContextPtr local_context, AlterLockHolder &)
 {
     auto table_id = getStorageID();
     checkAlterIsPossible(params, local_context);
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index 8749cf47eb9..28f8de5fd88 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -2,9 +2,8 @@
 
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/NamesAndTypes.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Storages/IStorage.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Poco/Event.h>
 
@@ -108,7 +107,7 @@ public:
     void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
     /// The structure of the subordinate table is not checked and does not change.
-    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & table_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index 30a9dad8d91..00c9e655656 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -8,8 +8,7 @@
 #include <Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h>
 #include <Parsers/ASTLiteral.h>
 #include <Common/quoteString.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <IO/Operators.h>
 #include <Dictionaries/getDictionaryConfigurationFromAST.h>
 
@@ -165,13 +164,11 @@ Pipe StorageDictionary::read(
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
-    const unsigned /*threads*/)
+    const unsigned threads)
 {
     auto registered_dictionary_name = location == Location::SameDatabaseAndNameAsDictionary ? getStorageID().getInternalDictionaryName() : dictionary_name;
     auto dictionary = getContext()->getExternalDictionariesLoader().getDictionary(registered_dictionary_name, local_context);
-    auto stream = dictionary->getBlockInputStream(column_names, max_block_size);
-    /// TODO: update dictionary interface for processors.
-    return Pipe(std::make_shared<SourceFromInputStream>(stream));
+    return dictionary->read(column_names, max_block_size, threads);
 }
 
 void StorageDictionary::shutdown()
@@ -195,10 +192,6 @@ void StorageDictionary::startup()
 
 void StorageDictionary::removeDictionaryConfigurationFromRepository()
 {
-    if (remove_repository_callback_executed)
-        return;
-
-    remove_repository_callback_executed = true;
     remove_repository_callback.reset();
 }
 
@@ -219,11 +212,20 @@ void StorageDictionary::renameInMemory(const StorageID & new_table_id)
     auto old_table_id = getStorageID();
     IStorage::renameInMemory(new_table_id);
 
-    if (configuration)
+    bool has_configuration = false;
     {
-        configuration->setString("dictionary.database", new_table_id.database_name);
-        configuration->setString("dictionary.name", new_table_id.table_name);
+        std::lock_guard<std::mutex> lock(dictionary_config_mutex);
 
+        if (configuration)
+        {
+            has_configuration = true;
+            configuration->setString("dictionary.database", new_table_id.database_name);
+            configuration->setString("dictionary.name", new_table_id.table_name);
+        }
+    }
+
+    if (has_configuration)
+    {
         const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
         auto result = external_dictionaries_loader.getLoadResult(old_table_id.getInternalDictionaryName());
 
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index d074dec2c34..7d0af8c0ee3 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <atomic>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Interpreters/IExternalLoaderConfigRepository.h>
@@ -73,7 +73,6 @@ private:
     Poco::Timestamp update_time;
     LoadablesConfigurationPtr configuration;
 
-    std::atomic<bool> remove_repository_callback_executed = false;
     scope_guard remove_repository_callback;
 
     void removeDictionaryConfigurationFromRepository();
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index 5173abeb9f9..2c528a4ebf5 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -4,7 +4,7 @@
 
 #include <Disks/IDisk.h>
 
-#include <DataStreams/RemoteQueryExecutor.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeUUID.h>
@@ -53,12 +53,12 @@
 #include <Interpreters/getTableExpressions.h>
 #include <Functions/IFunction.h>
 
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sources/RemoteSource.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Sinks/EmptySink.h>
 
 #include <Core/Field.h>
@@ -158,23 +158,6 @@ ASTPtr rewriteSelectQuery(const ASTPtr & query, const std::string & database, co
     return modified_query_ast;
 }
 
-/// The columns list in the original INSERT query is incorrect because inserted blocks are transformed
-/// to the form of the sample block of the Distributed table. So we rewrite it and add all columns from
-/// the sample block instead.
-ASTPtr createInsertToRemoteTableQuery(const std::string & database, const std::string & table, const Block & sample_block)
-{
-    auto query = std::make_shared<ASTInsertQuery>();
-    query->table_id = StorageID(database, table);
-
-    auto columns = std::make_shared<ASTExpressionList>();
-    query->columns = columns;
-    query->children.push_back(columns);
-    for (const auto & col : sample_block)
-        columns->children.push_back(std::make_shared<ASTIdentifier>(col.name));
-
-    return query;
-}
-
 /// Calculate maximum number in file names in directory and all subdirectories.
 /// To ensure global order of data blocks yet to be sent across server restarts.
 UInt64 getMaximumFileNumber(const std::string & dir_path)
@@ -284,86 +267,6 @@ void replaceConstantExpressions(
     visitor.visit(node);
 }
 
-/// This is the implementation of optimize_distributed_group_by_sharding_key.
-/// It returns up to which stage the query can be processed on a shard, which
-/// is one of the following:
-/// - QueryProcessingStage::Complete
-/// - QueryProcessingStage::WithMergeableStateAfterAggregation
-/// - QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit
-/// - none (in this case regular WithMergeableState should be used)
-std::optional<QueryProcessingStage::Enum> getOptimizedQueryProcessingStage(const SelectQueryInfo & query_info, bool extremes, const Names & sharding_key_columns)
-{
-    const auto & select = query_info.query->as<ASTSelectQuery &>();
-
-    auto sharding_block_has = [&](const auto & exprs) -> bool
-    {
-        std::unordered_set<std::string> expr_columns;
-        for (auto & expr : exprs)
-        {
-            auto id = expr->template as<ASTIdentifier>();
-            if (!id)
-                continue;
-            expr_columns.emplace(id->name());
-        }
-
-        for (const auto & column : sharding_key_columns)
-        {
-            if (!expr_columns.contains(column))
-                return false;
-        }
-
-        return true;
-    };
-
-    // GROUP BY qualifiers
-    // - TODO: WITH TOTALS can be implemented
-    // - TODO: WITH ROLLUP can be implemented (I guess)
-    if (select.group_by_with_totals || select.group_by_with_rollup || select.group_by_with_cube)
-        return {};
-
-    // Window functions are not supported.
-    if (query_info.has_window)
-        return {};
-
-    // TODO: extremes support can be implemented
-    if (extremes)
-        return {};
-
-    // DISTINCT
-    if (select.distinct)
-    {
-        if (!sharding_block_has(select.select()->children))
-            return {};
-    }
-
-    // GROUP BY
-    const ASTPtr group_by = select.groupBy();
-    if (!group_by)
-    {
-        if (!select.distinct)
-            return {};
-    }
-    else
-    {
-        if (!sharding_block_has(group_by->children))
-            return {};
-    }
-
-    // ORDER BY
-    const ASTPtr order_by = select.orderBy();
-    if (order_by)
-        return QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
-
-    // LIMIT BY
-    // LIMIT
-    // OFFSET
-    if (select.limitBy() || select.limitLength() || select.limitOffset())
-        return QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
-
-    // Only simple SELECT FROM GROUP BY sharding_key can use Complete state.
-    return QueryProcessingStage::Complete;
-}
-
 size_t getClusterQueriedNodes(const Settings & settings, const ClusterPtr & cluster)
 {
     size_t num_local_shards = cluster->getLocalShardCount();
@@ -407,11 +310,13 @@ StorageDistributed::StorageDistributed(
     const String & relative_data_path_,
     const DistributedSettings & distributed_settings_,
     bool attach_,
-    ClusterPtr owned_cluster_)
+    ClusterPtr owned_cluster_,
+    ASTPtr remote_table_function_ptr_)
     : IStorage(id_)
     , WithContext(context_->getGlobalContext())
     , remote_database(remote_database_)
     , remote_table(remote_table_)
+    , remote_table_function_ptr(remote_table_function_ptr_)
     , log(&Poco::Logger::get("StorageDistributed (" + id_.table_name + ")"))
     , owned_cluster(std::move(owned_cluster_))
     , cluster_name(getContext()->getMacros()->expand(cluster_name_))
@@ -443,10 +348,13 @@ StorageDistributed::StorageDistributed(
     }
 
     /// Sanity check. Skip check if the table is already created to allow the server to start.
-    if (!attach_ && !cluster_name.empty())
+    if (!attach_)
     {
-        size_t num_local_shards = getContext()->getCluster(cluster_name)->getLocalShardCount();
-        if (num_local_shards && remote_database == id_.database_name && remote_table == id_.table_name)
+        if (remote_database.empty() && !remote_table_function_ptr && !getCluster()->maybeCrossReplication())
+            LOG_WARNING(log, "Name of remote database is empty. Default database will be used implicitly.");
+
+        size_t num_local_shards = getCluster()->getLocalShardCount();
+        if (num_local_shards && (remote_database.empty() || remote_database == id_.database_name) && remote_table == id_.table_name)
             throw Exception("Distributed table " + id_.table_name + " looks at itself", ErrorCodes::INFINITE_LOOP);
     }
 }
@@ -479,9 +387,9 @@ StorageDistributed::StorageDistributed(
         relative_data_path_,
         distributed_settings_,
         attach,
-        std::move(owned_cluster_))
+        std::move(owned_cluster_),
+        remote_table_function_ptr_)
 {
-    remote_table_function_ptr = std::move(remote_table_function_ptr_);
 }
 
 QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
@@ -495,17 +403,22 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
     ClusterPtr cluster = getCluster();
     query_info.cluster = cluster;
 
+    size_t nodes = getClusterQueriedNodes(settings, cluster);
+
     /// Always calculate optimized cluster here, to avoid conditions during read()
     /// (Anyway it will be calculated in the read())
-    if (getClusterQueriedNodes(settings, cluster) > 1 && settings.optimize_skip_unused_shards)
+    if (nodes > 1 && settings.optimize_skip_unused_shards)
     {
         ClusterPtr optimized_cluster = getOptimizedCluster(local_context, metadata_snapshot, query_info.query);
         if (optimized_cluster)
         {
             LOG_DEBUG(log, "Skipping irrelevant shards - the query will be sent to the following shards of the cluster (shard numbers): {}",
                     makeFormattedListOfShards(optimized_cluster));
+
             cluster = optimized_cluster;
             query_info.optimized_cluster = cluster;
+
+            nodes = getClusterQueriedNodes(settings, cluster);
         }
         else
         {
@@ -527,13 +440,12 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
         {
             /// NOTE: distributed_group_by_no_merge=1 does not respect distributed_push_down_limit
             /// (since in this case queries processed separately and the initiator is just a proxy in this case).
+            if (to_stage != QueryProcessingStage::Complete)
+                throw Exception("Queries with distributed_group_by_no_merge=1 should be processed to Complete stage", ErrorCodes::LOGICAL_ERROR);
             return QueryProcessingStage::Complete;
         }
     }
 
-    if (settings.distributed_push_down_limit)
-        return QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
-
     /// Nested distributed query cannot return Complete stage,
     /// since the parent query need to aggregate the results after.
     if (to_stage == QueryProcessingStage::WithMergeableState)
@@ -541,25 +453,115 @@ QueryProcessingStage::Enum StorageDistributed::getQueryProcessingStage(
 
     /// If there is only one node, the query can be fully processed by the
     /// shard, initiator will work as a proxy only.
-    if (getClusterQueriedNodes(settings, cluster) == 1)
-        return QueryProcessingStage::Complete;
-
-    if (settings.optimize_skip_unused_shards &&
-        settings.optimize_distributed_group_by_sharding_key &&
-        has_sharding_key &&
-        (settings.allow_nondeterministic_optimize_skip_unused_shards || sharding_key_is_deterministic))
+    if (nodes == 1)
     {
-        auto stage = getOptimizedQueryProcessingStage(query_info, settings.extremes, sharding_key_expr->getRequiredColumns());
-        if (stage)
-        {
-            LOG_DEBUG(log, "Force processing stage to {}", QueryProcessingStage::toString(*stage));
-            return *stage;
-        }
+        /// In case the query was processed to
+        /// WithMergeableStateAfterAggregation/WithMergeableStateAfterAggregationAndLimit
+        /// (which are greater the Complete stage)
+        /// we cannot return Complete (will break aliases and similar),
+        /// relevant for Distributed over Distributed
+        return std::max(to_stage, QueryProcessingStage::Complete);
+    }
+    else if (nodes == 0)
+    {
+        /// In case of 0 shards, the query should be processed fully on the initiator,
+        /// since we need to apply aggregations.
+        /// That's why we need to return FetchColumns.
+        return QueryProcessingStage::FetchColumns;
+    }
+
+    auto optimized_stage = getOptimizedQueryProcessingStage(query_info, settings);
+    if (optimized_stage)
+    {
+        if (*optimized_stage == QueryProcessingStage::Complete)
+            return std::min(to_stage, *optimized_stage);
+        return *optimized_stage;
     }
 
     return QueryProcessingStage::WithMergeableState;
 }
 
+std::optional<QueryProcessingStage::Enum> StorageDistributed::getOptimizedQueryProcessingStage(const SelectQueryInfo & query_info, const Settings & settings) const
+{
+    bool optimize_sharding_key_aggregation =
+        settings.optimize_skip_unused_shards &&
+        settings.optimize_distributed_group_by_sharding_key &&
+        has_sharding_key &&
+        (settings.allow_nondeterministic_optimize_skip_unused_shards || sharding_key_is_deterministic);
+
+    QueryProcessingStage::Enum default_stage = QueryProcessingStage::WithMergeableStateAfterAggregation;
+    if (settings.distributed_push_down_limit)
+        default_stage = QueryProcessingStage::WithMergeableStateAfterAggregationAndLimit;
+
+    const auto & select = query_info.query->as<ASTSelectQuery &>();
+
+    auto expr_contains_sharding_key = [&](const auto & exprs) -> bool
+    {
+        std::unordered_set<std::string> expr_columns;
+        for (auto & expr : exprs)
+        {
+            auto id = expr->template as<ASTIdentifier>();
+            if (!id)
+                continue;
+            expr_columns.emplace(id->name());
+        }
+
+        for (const auto & column : sharding_key_expr->getRequiredColumns())
+        {
+            if (!expr_columns.contains(column))
+                return false;
+        }
+
+        return true;
+    };
+
+    // GROUP BY qualifiers
+    // - TODO: WITH TOTALS can be implemented
+    // - TODO: WITH ROLLUP can be implemented (I guess)
+    if (select.group_by_with_totals || select.group_by_with_rollup || select.group_by_with_cube)
+        return {};
+    // Window functions are not supported.
+    if (query_info.has_window)
+        return {};
+    // TODO: extremes support can be implemented
+    if (settings.extremes)
+        return {};
+
+    // DISTINCT
+    if (select.distinct)
+    {
+        if (!optimize_sharding_key_aggregation || !expr_contains_sharding_key(select.select()->children))
+            return {};
+    }
+
+    // GROUP BY
+    const ASTPtr group_by = select.groupBy();
+    if (!query_info.syntax_analyzer_result->aggregates.empty() || group_by)
+    {
+        if (!optimize_sharding_key_aggregation || !group_by || !expr_contains_sharding_key(group_by->children))
+            return {};
+    }
+
+    // LIMIT BY
+    if (const ASTPtr limit_by = select.limitBy())
+    {
+        if (!optimize_sharding_key_aggregation || !expr_contains_sharding_key(limit_by->children))
+            return {};
+    }
+
+    // ORDER BY
+    if (const ASTPtr order_by = select.orderBy())
+        return default_stage;
+
+    // LIMIT
+    // OFFSET
+    if (select.limitLength() || select.limitOffset())
+        return default_stage;
+
+    // Only simple SELECT FROM GROUP BY sharding_key can use Complete state.
+    return QueryProcessingStage::Complete;
+}
+
 Pipe StorageDistributed::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
@@ -662,21 +664,20 @@ SinkToStoragePtr StorageDistributed::write(const ASTPtr &, const StorageMetadata
     bool insert_sync = settings.insert_distributed_sync || settings.insert_shard_id || owned_cluster;
     auto timeout = settings.insert_distributed_timeout;
 
-    Block sample_block;
-    if (!settings.insert_allow_materialized_columns)
-        sample_block = metadata_snapshot->getSampleBlockNonMaterialized();
+    Names columns_to_send;
+    if (settings.insert_allow_materialized_columns)
+        columns_to_send = metadata_snapshot->getSampleBlock().getNames();
     else
-        sample_block = metadata_snapshot->getSampleBlock();
+        columns_to_send = metadata_snapshot->getSampleBlockNonMaterialized().getNames();
 
     /// DistributedBlockOutputStream will not own cluster, but will own ConnectionPools of the cluster
     return std::make_shared<DistributedSink>(
-        local_context, *this, metadata_snapshot,
-        createInsertToRemoteTableQuery(remote_database, remote_table, sample_block),
-        cluster, insert_sync, timeout, StorageID{remote_database, remote_table});
+        local_context, *this, metadata_snapshot, cluster, insert_sync, timeout,
+        StorageID{remote_database, remote_table}, columns_to_send);
 }
 
 
-QueryPipelinePtr StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
+QueryPipelineBuilderPtr StorageDistributed::distributedWrite(const ASTInsertQuery & query, ContextPtr local_context)
 {
     const Settings & settings = local_context->getSettingsRef();
     std::shared_ptr<StorageDistributed> storage_src;
@@ -720,7 +721,7 @@ QueryPipelinePtr StorageDistributed::distributedWrite(const ASTInsertQuery & que
     const auto & cluster = getCluster();
     const auto & shards_info = cluster->getShardsInfo();
 
-    std::vector<std::unique_ptr<QueryPipeline>> pipelines;
+    std::vector<std::unique_ptr<QueryPipelineBuilder>> pipelines;
 
     String new_query_str = queryToString(new_query);
     for (size_t shard_index : collections::range(0, shards_info.size()))
@@ -729,7 +730,8 @@ QueryPipelinePtr StorageDistributed::distributedWrite(const ASTInsertQuery & que
         if (shard_info.isLocal())
         {
             InterpreterInsertQuery interpreter(new_query, local_context);
-            pipelines.emplace_back(std::make_unique<QueryPipeline>(interpreter.execute().pipeline));
+            pipelines.emplace_back(std::make_unique<QueryPipelineBuilder>());
+            pipelines.back()->init(interpreter.execute().pipeline);
         }
         else
         {
@@ -742,16 +744,16 @@ QueryPipelinePtr StorageDistributed::distributedWrite(const ASTInsertQuery & que
             ///  INSERT SELECT query returns empty block
             auto remote_query_executor
                 = std::make_shared<RemoteQueryExecutor>(shard_info.pool, std::move(connections), new_query_str, Block{}, local_context);
-            pipelines.emplace_back(std::make_unique<QueryPipeline>());
+            pipelines.emplace_back(std::make_unique<QueryPipelineBuilder>());
             pipelines.back()->init(Pipe(std::make_shared<RemoteSource>(remote_query_executor, false, settings.async_socket_for_remote)));
-            pipelines.back()->setSinks([](const Block & header, QueryPipeline::StreamType) -> ProcessorPtr
+            pipelines.back()->setSinks([](const Block & header, QueryPipelineBuilder::StreamType) -> ProcessorPtr
             {
                 return std::make_shared<EmptySink>(header);
             });
         }
     }
 
-    return std::make_unique<QueryPipeline>(QueryPipeline::unitePipelines(std::move(pipelines)));
+    return std::make_unique<QueryPipelineBuilder>(QueryPipelineBuilder::unitePipelines(std::move(pipelines)));
 }
 
 
@@ -766,8 +768,9 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, Co
             && command.type != AlterCommand::Type::COMMENT_COLUMN
             && command.type != AlterCommand::Type::RENAME_COLUMN)
 
-            throw Exception("Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
@@ -782,7 +785,7 @@ void StorageDistributed::checkAlterIsPossible(const AlterCommands & commands, Co
     }
 }
 
-void StorageDistributed::alter(const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
+void StorageDistributed::alter(const AlterCommands & params, ContextPtr local_context, AlterLockHolder &)
 {
     auto table_id = getStorageID();
 
@@ -796,9 +799,6 @@ void StorageDistributed::alter(const AlterCommands & params, ContextPtr local_co
 
 void StorageDistributed::startup()
 {
-    if (remote_database.empty() && !remote_table_function_ptr && !getCluster()->maybeCrossReplication())
-        LOG_WARNING(log, "Name of remote database is empty. Default database will be used implicitly.");
-
     if (!storage_policy)
         return;
 
@@ -1139,6 +1139,18 @@ ActionLock StorageDistributed::getActionLock(StorageActionBlockType type)
     return {};
 }
 
+void StorageDistributed::flush()
+{
+    try
+    {
+        flushClusterNodesAllData(getContext());
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Cannot flush");
+    }
+}
+
 void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context)
 {
     /// Sync SYSTEM FLUSH DISTRIBUTED with TRUNCATE
@@ -1304,7 +1316,12 @@ void registerStorageDistributed(StorageFactory & factory)
         String remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
 
         const auto & sharding_key = engine_args.size() >= 4 ? engine_args[3] : nullptr;
-        const auto & storage_policy = engine_args.size() >= 5 ? engine_args[4]->as<ASTLiteral &>().value.safeGet<String>() : "default";
+        String storage_policy = "default";
+        if (engine_args.size() >= 5)
+        {
+            engine_args[4] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[4], local_context);
+            storage_policy = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+        }
 
         /// Check that sharding_key exists in the table and has numeric type.
         if (sharding_key)
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index bf48e814ae2..540ae413f19 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/Distributed/DirectoryMonitor.h>
@@ -9,7 +9,7 @@
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
 #include <Parsers/ASTFunction.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/ActionBlocker.h>
 #include <Interpreters/Cluster.h>
 
@@ -83,7 +83,7 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
-    QueryPipelinePtr distributedWrite(const ASTInsertQuery & query, ContextPtr context) override;
+    QueryPipelineBuilderPtr distributedWrite(const ASTInsertQuery & query, ContextPtr context) override;
 
     /// Removes temporary data in local filesystem.
     void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
@@ -94,13 +94,14 @@ public:
 
     /// in the sub-tables, you need to manually add and delete columns
     /// the structure of the sub-table is not checked
-    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & table_lock_holder) override;
 
     void startup() override;
     void shutdown() override;
+    void flush() override;
     void drop() override;
 
-    bool storesDataOnDisk() const override { return true; }
+    bool storesDataOnDisk() const override { return data_volume != nullptr; }
     Strings getDataPaths() const override;
 
     ActionLock getActionLock(StorageActionBlockType type) override;
@@ -135,7 +136,8 @@ private:
         const String & relative_data_path_,
         const DistributedSettings & distributed_settings_,
         bool attach_,
-        ClusterPtr owned_cluster_ = {});
+        ClusterPtr owned_cluster_ = {},
+        ASTPtr remote_table_function_ptr_ = {});
 
     StorageDistributed(
         const StorageID & id_,
@@ -173,8 +175,27 @@ private:
     /// - optimize_skip_unused_shards
     /// - force_optimize_skip_unused_shards
     ClusterPtr getOptimizedCluster(ContextPtr, const StorageMetadataPtr & metadata_snapshot, const ASTPtr & query_ptr) const;
-    ClusterPtr
-    skipUnusedShards(ClusterPtr cluster, const ASTPtr & query_ptr, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const;
+
+    ClusterPtr skipUnusedShards(
+        ClusterPtr cluster, const ASTPtr & query_ptr, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) const;
+
+    /// This method returns optimal query processing stage.
+    ///
+    /// Here is the list of stages (from the less optimal to more optimal):
+    /// - WithMergeableState
+    /// - WithMergeableStateAfterAggregation
+    /// - WithMergeableStateAfterAggregationAndLimit
+    /// - Complete
+    ///
+    /// Some simple queries w/o GROUP BY/DISTINCT can use more optimal stage.
+    ///
+    /// Also in case of optimize_distributed_group_by_sharding_key=1 the queries
+    /// with GROUP BY/DISTINCT sharding_key can also use more optimal stage.
+    /// (see also optimize_skip_unused_shards/allow_nondeterministic_optimize_skip_unused_shards)
+    ///
+    /// @return QueryProcessingStage or empty std::optoinal
+    /// (in this case regular WithMergeableState should be used)
+    std::optional<QueryProcessingStage::Enum> getOptimizedQueryProcessingStage(const SelectQueryInfo & query_info, const Settings & settings) const;
 
     size_t getRandomShardIndex(const Cluster::ShardsInfo & shards);
 
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
new file mode 100644
index 00000000000..16647d0b60f
--- /dev/null
+++ b/src/Storages/StorageExecutable.cpp
@@ -0,0 +1,296 @@
+#include <Storages/StorageExecutable.h>
+
+#include <filesystem>
+
+#include <Common/ShellCommand.h>
+#include <Common/filesystemHelpers.h>
+
+#include <Core/Block.h>
+
+#include <IO/ReadHelpers.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectWithUnionQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+
+#include <QueryPipeline/Pipe.h>
+#include <Processors/ISimpleTransform.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Storages/StorageFactory.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNSUPPORTED_METHOD;
+    extern const int LOGICAL_ERROR;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int TIMEOUT_EXCEEDED;
+}
+
+StorageExecutable::StorageExecutable(
+    const StorageID & table_id_,
+    const String & script_name_,
+    const std::vector<String> & arguments_,
+    const String & format_,
+    const std::vector<ASTPtr> & input_queries_,
+    const ColumnsDescription & columns,
+    const ConstraintsDescription & constraints)
+    : IStorage(table_id_)
+    , script_name(script_name_)
+    , arguments(arguments_)
+    , format(format_)
+    , input_queries(input_queries_)
+    , log(&Poco::Logger::get("StorageExecutable"))
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns);
+    storage_metadata.setConstraints(constraints);
+    setInMemoryMetadata(storage_metadata);
+}
+
+StorageExecutable::StorageExecutable(
+    const StorageID & table_id_,
+    const String & script_name_,
+    const std::vector<String> & arguments_,
+    const String & format_,
+    const std::vector<ASTPtr> & input_queries_,
+    const ExecutableSettings & settings_,
+    const ColumnsDescription & columns,
+    const ConstraintsDescription & constraints)
+    : IStorage(table_id_)
+    , script_name(script_name_)
+    , arguments(arguments_)
+    , format(format_)
+    , input_queries(input_queries_)
+    , settings(settings_)
+    /// If pool size == 0 then there is no size restrictions. Poco max size of semaphore is integer type.
+    , process_pool(std::make_shared<ProcessPool>(settings.pool_size == 0 ? std::numeric_limits<int>::max() : settings.pool_size))
+    , log(&Poco::Logger::get("StorageExecutablePool"))
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns);
+    storage_metadata.setConstraints(constraints);
+    setInMemoryMetadata(storage_metadata);
+}
+
+class SendingChunkHeaderTransform final : public ISimpleTransform
+{
+public:
+    SendingChunkHeaderTransform(const Block & header, WriteBuffer & buffer_)
+        : ISimpleTransform(header, header, false)
+        , buffer(buffer_)
+    {
+    }
+
+    String getName() const override { return "SendingChunkHeaderTransform"; }
+
+protected:
+
+    void transform(Chunk & chunk) override
+    {
+        writeText(chunk.getNumRows(), buffer);
+        writeChar('\n', buffer);
+    }
+
+private:
+    WriteBuffer & buffer;
+};
+
+Pipe StorageExecutable::read(
+    const Names & /*column_names*/,
+    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & /*query_info*/,
+    ContextPtr context,
+    QueryProcessingStage::Enum /*processed_stage*/,
+    size_t max_block_size,
+    unsigned /*threads*/)
+{
+    auto user_scripts_path = context->getUserScriptsPath();
+    auto script_path = user_scripts_path + '/' + script_name;
+
+    if (!pathStartsWith(script_path, user_scripts_path))
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Executable file {} must be inside user scripts folder {}",
+            script_name,
+            user_scripts_path);
+
+    if (!std::filesystem::exists(std::filesystem::path(script_path)))
+         throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Executable file {} does not exist inside user scripts folder {}",
+            script_name,
+            user_scripts_path);
+
+    std::vector<QueryPipelineBuilder> inputs;
+    inputs.reserve(input_queries.size());
+
+    for (auto & input_query : input_queries)
+    {
+        InterpreterSelectWithUnionQuery interpreter(input_query, context, {});
+        inputs.emplace_back(interpreter.buildQueryPipeline());
+    }
+
+    ShellCommand::Config config(script_path);
+    config.arguments = arguments;
+    for (size_t i = 1; i < inputs.size(); ++i)
+        config.write_fds.emplace_back(i + 2);
+
+    std::unique_ptr<ShellCommand> process;
+
+    bool is_executable_pool = (process_pool != nullptr);
+    if (is_executable_pool)
+    {
+        bool result = process_pool->tryBorrowObject(process, [&config, this]()
+        {
+            config.terminate_in_destructor_strategy = ShellCommand::DestructorStrategy{ true /*terminate_in_destructor*/, settings.command_termination_timeout };
+            auto shell_command = ShellCommand::executeDirect(config);
+            return shell_command;
+        }, settings.max_command_execution_time * 10000);
+
+        if (!result)
+            throw Exception(ErrorCodes::TIMEOUT_EXCEEDED,
+                "Could not get process from pool, max command execution timeout exceeded {} seconds",
+                settings.max_command_execution_time);
+    }
+    else
+    {
+        process = ShellCommand::executeDirect(config);
+    }
+
+    std::vector<ShellCommandSource::SendDataTask> tasks;
+    tasks.reserve(inputs.size());
+
+    for (size_t i = 0; i < inputs.size(); ++i)
+    {
+        WriteBufferFromFile * write_buffer = nullptr;
+
+        if (i == 0)
+        {
+            write_buffer = &process->in;
+        }
+        else
+        {
+            auto descriptor = i + 2;
+            auto it = process->write_fds.find(descriptor);
+            if (it == process->write_fds.end())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Process does not contain descriptor to write {}", descriptor);
+
+            write_buffer = &it->second;
+        }
+
+        inputs[i].resize(1);
+        if (settings.send_chunk_header)
+        {
+            auto transform = std::make_shared<SendingChunkHeaderTransform>(inputs[i].getHeader(), *write_buffer);
+            inputs[i].addTransform(std::move(transform));
+        }
+
+        auto pipeline = std::make_shared<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(inputs[i])));
+
+        auto out = context->getOutputFormat(format, *write_buffer, materializeBlock(pipeline->getHeader()));
+        out->setAutoFlush();
+        pipeline->complete(std::move(out));
+
+        ShellCommandSource::SendDataTask task = [pipeline, write_buffer, is_executable_pool]()
+        {
+            CompletedPipelineExecutor executor(*pipeline);
+            executor.execute();
+
+            if (!is_executable_pool)
+                write_buffer->close();
+        };
+
+        tasks.emplace_back(std::move(task));
+    }
+
+    auto sample_block = metadata_snapshot->getSampleBlock();
+
+    ShellCommandSourceConfiguration configuration;
+    configuration.max_block_size = max_block_size;
+
+    if (is_executable_pool)
+    {
+        configuration.read_fixed_number_of_rows = true;
+        configuration.read_number_of_rows_from_process_output = true;
+    }
+
+    Pipe pipe(std::make_unique<ShellCommandSource>(context, format, std::move(sample_block), std::move(process), std::move(tasks), configuration, process_pool));
+    return pipe;
+}
+
+void registerStorageExecutable(StorageFactory & factory)
+{
+    auto register_storage = [](const StorageFactory::Arguments & args, bool is_executable_pool) -> StoragePtr
+    {
+        auto local_context = args.getLocalContext();
+
+        if (args.engine_args.size() < 2)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "StorageExecutable requires minimum 2 arguments: script_name, format, [input_query...]");
+
+        for (size_t i = 0; i < 2; ++i)
+            args.engine_args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(args.engine_args[i], local_context);
+
+        auto scipt_name_with_arguments_value = args.engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+
+        std::vector<String> script_name_with_arguments;
+        boost::split(script_name_with_arguments, scipt_name_with_arguments_value, [](char c) { return c == ' '; });
+
+        auto script_name = script_name_with_arguments[0];
+        script_name_with_arguments.erase(script_name_with_arguments.begin());
+        auto format = args.engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+
+        std::vector<ASTPtr> input_queries;
+        for (size_t i = 2; i < args.engine_args.size(); ++i)
+        {
+            ASTPtr query = args.engine_args[i]->children.at(0);
+            if (!query->as<ASTSelectWithUnionQuery>())
+                throw Exception(
+                    ErrorCodes::UNSUPPORTED_METHOD, "StorageExecutable argument is invalid input query {}",
+                    query->formatForErrorMessage());
+
+            input_queries.emplace_back(std::move(query));
+        }
+
+        const auto & columns = args.columns;
+        const auto & constraints = args.constraints;
+
+        if (is_executable_pool)
+        {
+            size_t max_command_execution_time = 10;
+
+            size_t max_execution_time_seconds = static_cast<size_t>(args.getContext()->getSettings().max_execution_time.totalSeconds());
+            if (max_execution_time_seconds != 0 && max_command_execution_time > max_execution_time_seconds)
+                max_command_execution_time = max_execution_time_seconds;
+
+            ExecutableSettings pool_settings;
+            pool_settings.max_command_execution_time = max_command_execution_time;
+            if (args.storage_def->settings)
+                pool_settings.loadFromQuery(*args.storage_def);
+
+            return StorageExecutable::create(args.table_id, script_name, script_name_with_arguments, format, input_queries, pool_settings, columns, constraints);
+        }
+        else
+        {
+            return StorageExecutable::create(args.table_id, script_name, script_name_with_arguments, format, input_queries, columns, constraints);
+        }
+    };
+
+    factory.registerStorage("Executable", [&](const StorageFactory::Arguments & args)
+    {
+        return register_storage(args, false /*is_executable_pool*/);
+    });
+
+    factory.registerStorage("ExecutablePool", [&](const StorageFactory::Arguments & args)
+    {
+        return register_storage(args, true /*is_executable_pool*/);
+    });
+}
+
+};
+
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
new file mode 100644
index 00000000000..74df17f1463
--- /dev/null
+++ b/src/Storages/StorageExecutable.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#include <base/logger_useful.h>
+#include <base/shared_ptr_helper.h>
+#include <Storages/IStorage.h>
+#include <Processors/Sources/ShellCommandSource.h>
+#include <Storages/ExecutableSettings.h>
+
+
+namespace DB
+{
+
+/**
+ * This class represents table engine for external executable files.
+ * Executable storage that will start process for read.
+ * ExecutablePool storage maintain pool of processes and take process from pool for read.
+ */
+class StorageExecutable final : public shared_ptr_helper<StorageExecutable>, public IStorage
+{
+    friend struct shared_ptr_helper<StorageExecutable>;
+
+public:
+
+    String getName() const override
+    {
+        if (process_pool)
+            return "ExecutablePool";
+        else
+            return "Executable";
+    }
+
+    Pipe read(
+        const Names & column_names,
+        const StorageMetadataPtr & /*metadata_snapshot*/,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processed_stage,
+        size_t max_block_size,
+        unsigned threads) override;
+
+protected:
+
+    StorageExecutable(
+        const StorageID & table_id,
+        const String & script_name_,
+        const std::vector<String> & arguments_,
+        const String & format_,
+        const std::vector<ASTPtr> & input_queries_,
+        const ColumnsDescription & columns,
+        const ConstraintsDescription & constraints);
+
+    StorageExecutable(
+        const StorageID & table_id,
+        const String & script_name_,
+        const std::vector<String> & arguments_,
+        const String & format_,
+        const std::vector<ASTPtr> & input_queries_,
+        const ExecutableSettings & settings_,
+        const ColumnsDescription & columns,
+        const ConstraintsDescription & constraints);
+
+private:
+    String script_name;
+    std::vector<String> arguments;
+    String format;
+    std::vector<ASTPtr> input_queries;
+    ExecutableSettings settings;
+    std::shared_ptr<ProcessPool> process_pool;
+    Poco::Logger * log;
+};
+
+}
diff --git a/src/Storages/StorageExternalDistributed.cpp b/src/Storages/StorageExternalDistributed.cpp
index 32b9c7e9245..021cd9815d7 100644
--- a/src/Storages/StorageExternalDistributed.cpp
+++ b/src/Storages/StorageExternalDistributed.cpp
@@ -6,16 +6,16 @@
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
-#include <Formats/FormatFactory.h>
 #include <Parsers/ASTLiteral.h>
 #include <Common/parseAddress.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Common/parseRemoteDescription.h>
 #include <Storages/StorageMySQL.h>
 #include <Storages/MySQL/MySQLSettings.h>
 #include <Storages/StoragePostgreSQL.h>
 #include <Storages/StorageURL.h>
-#include <common/logger_useful.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -31,10 +31,7 @@ StorageExternalDistributed::StorageExternalDistributed(
     const StorageID & table_id_,
     ExternalStorageEngine table_engine,
     const String & cluster_description,
-    const String & remote_database,
-    const String & remote_table,
-    const String & username,
-    const String & password,
+    const ExternalDataSourceConfiguration & configuration,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
@@ -66,15 +63,16 @@ StorageExternalDistributed::StorageExternalDistributed(
                 addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 3306);
 
                 mysqlxx::PoolWithFailover pool(
-                    remote_database,
+                    configuration.database,
                     addresses,
-                    username, password);
+                    configuration.username,
+                    configuration.password);
 
                 shard = StorageMySQL::create(
                     table_id_,
                     std::move(pool),
-                    remote_database,
-                    remote_table,
+                    configuration.database,
+                    configuration.table,
                     /* replace_query = */ false,
                     /* on_duplicate_clause = */ "",
                     columns_,
@@ -90,15 +88,16 @@ StorageExternalDistributed::StorageExternalDistributed(
             case ExternalStorageEngine::PostgreSQL:
             {
                 addresses = parseRemoteDescriptionForExternalDatabase(shard_description, max_addresses, 5432);
+                StoragePostgreSQLConfiguration postgres_conf;
+                postgres_conf.set(configuration);
+                postgres_conf.addresses = addresses;
 
                 auto pool = std::make_shared<postgres::PoolWithFailover>(
-                    remote_database,
-                    addresses,
-                    username, password,
+                    postgres_conf,
                     context->getSettingsRef().postgresql_connection_pool_size,
                     context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
-                shard = StoragePostgreSQL::create(table_id_, std::move(pool), remote_table, columns_, constraints_, String{}, context);
+                shard = StoragePostgreSQL::create(table_id_, std::move(pool), configuration.table, columns_, constraints_, String{});
                 break;
             }
 #endif
@@ -113,13 +112,10 @@ StorageExternalDistributed::StorageExternalDistributed(
     }
 
 #else
-    (void)table_engine;
-    (void)remote_database;
-    (void)remote_table;
-    (void)username;
-    (void)password;
-    (void)shards_descriptions;
+    (void)configuration;
+    (void)cluster_description;
     (void)addresses;
+    (void)table_engine;
 #endif
 }
 
@@ -207,64 +203,113 @@ void registerStorageExternalDistributed(StorageFactory & factory)
     factory.registerStorage("ExternalDistributed", [](const StorageFactory::Arguments & args)
     {
         ASTs & engine_args = args.engine_args;
+        if (engine_args.size() < 2)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Engine ExternalDistributed must have at least 2 arguments: engine_name, named_collection and/or description");
 
-        if (engine_args.size() != 6)
-            throw Exception(
-                "Storage MySQLiDistributed requires 5 parameters: ExternalDistributed('engine_name', 'cluster_description', database, table, 'user', 'password').",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
-
-        const String & engine_name = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & addresses_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-
+        auto engine_name = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         StorageExternalDistributed::ExternalStorageEngine table_engine;
         if (engine_name == "URL")
-        {
             table_engine = StorageExternalDistributed::ExternalStorageEngine::URL;
+        else if (engine_name == "MySQL")
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::MySQL;
+        else if (engine_name == "PostgreSQL")
+            table_engine = StorageExternalDistributed::ExternalStorageEngine::PostgreSQL;
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "External storage engine {} is not supported for StorageExternalDistributed. Supported engines are: MySQL, PostgreSQL, URL",
+                engine_name);
+
+        ASTs inner_engine_args(engine_args.begin() + 1, engine_args.end());
+        String cluster_description;
+
+        if (engine_name == "URL")
+        {
+            URLBasedDataSourceConfiguration configuration;
+            if (auto named_collection = getURLBasedDataSourceConfiguration(inner_engine_args, args.getLocalContext()))
+            {
+                auto [common_configuration, storage_specific_args] = named_collection.value();
+                configuration.set(common_configuration);
+
+                for (const auto & [name, value] : storage_specific_args)
+                {
+                    if (name == "description")
+                        cluster_description = value->as<ASTLiteral>()->value.safeGet<String>();
+                    else
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                        "Unknown key-value argument {} for table engine URL", name);
+                }
+
+                if (cluster_description.empty())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Engine ExternalDistribued must have `description` key-value argument or named collection parameter");
+            }
+            else
+            {
+                for (auto & engine_arg : engine_args)
+                    engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+
+                cluster_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.format = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.compression_method = "auto";
+                if (engine_args.size() == 4)
+                    configuration.compression_method = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+            }
 
-            const String & format_name = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-            String compression_method = "auto";
-            if (engine_args.size() == 4)
-                compression_method = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
 
             auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
 
             return StorageExternalDistributed::create(
-                addresses_description,
+                cluster_description,
                 args.table_id,
-                format_name,
+                configuration.format,
                 format_settings,
-                compression_method,
+                configuration.compression_method,
                 args.columns,
                 args.constraints,
                 args.getContext());
         }
         else
         {
-            if (engine_name == "MySQL")
-                table_engine = StorageExternalDistributed::ExternalStorageEngine::MySQL;
-            else if (engine_name == "PostgreSQL")
-                table_engine = StorageExternalDistributed::ExternalStorageEngine::PostgreSQL;
-            else
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                    "External storage engine {} is not supported for StorageExternalDistributed. Supported engines are: MySQL, PostgreSQL, URL",
-                    engine_name);
+            ExternalDataSourceConfiguration configuration;
+            if (auto named_collection = getExternalDataSourceConfiguration(inner_engine_args, args.getLocalContext()))
+            {
+                auto [common_configuration, storage_specific_args] = named_collection.value();
+                configuration.set(common_configuration);
+
+                for (const auto & [name, value] : storage_specific_args)
+                {
+                    if (name == "description")
+                        cluster_description = value->as<ASTLiteral>()->value.safeGet<String>();
+                    else
+                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                        "Unknown key-value argument {} for table function URL", name);
+                }
+
+                if (cluster_description.empty())
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Engine ExternalDistribued must have `description` key-value argument or named collection parameter");
+            }
+            else
+            {
+                if (engine_args.size() != 6)
+                    throw Exception(
+                        "Storage ExternalDistributed requires 5 parameters: "
+                        "ExternalDistributed('engine_name', 'cluster_description', 'database', 'table', 'user', 'password').",
+                        ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+                cluster_description = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.database = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.table = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.username = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+                configuration.password = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+            }
 
-            const String & remote_database = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-            const String & remote_table = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-            const String & username = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-            const String & password = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
 
             return StorageExternalDistributed::create(
                 args.table_id,
                 table_engine,
-                addresses_description,
-                remote_database,
-                remote_table,
-                username,
-                password,
+                cluster_description,
+                configuration,
                 args.columns,
                 args.constraints,
                 args.comment,
diff --git a/src/Storages/StorageExternalDistributed.h b/src/Storages/StorageExternalDistributed.h
index c85276c09dd..33a58d324da 100644
--- a/src/Storages/StorageExternalDistributed.h
+++ b/src/Storages/StorageExternalDistributed.h
@@ -1,21 +1,21 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
 namespace DB
 {
 
+struct ExternalDataSourceConfiguration;
+
 /// Storages MySQL and PostgreSQL use ConnectionPoolWithFailover and support multiple replicas.
 /// This class unites multiple storages with replicas into multiple shards with replicas.
 /// A query to external database is passed to one replica on each shard, the result is united.
 /// Replicas on each shard have the same priority, traversed replicas are moved to the end of the queue.
-/// TODO: try `load_balancing` setting for replicas priorities same way as for table function `remote`
+/// Similar approach is used for URL storage.
 class StorageExternalDistributed final : public shared_ptr_helper<StorageExternalDistributed>, public DB::IStorage
 {
     friend struct shared_ptr_helper<StorageExternalDistributed>;
@@ -44,10 +44,7 @@ protected:
         const StorageID & table_id_,
         ExternalStorageEngine table_engine,
         const String & cluster_description,
-        const String & remote_database_,
-        const String & remote_table_,
-        const String & username,
-        const String & password,
+        const ExternalDataSourceConfiguration & configuration,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index cfa50b95487..ba2ac3f72a3 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -146,8 +146,8 @@ StoragePtr StorageFactory::get(
                     throw Exception("Unknown table engine " + name, ErrorCodes::UNKNOWN_STORAGE);
             }
 
-            if (storage_def->comment)
-                comment = storage_def->comment->as<ASTLiteral &>().value.get<String>();
+            if (query.comment)
+                comment = query.comment->as<ASTLiteral &>().value.get<String>();
 
             auto check_feature = [&](String feature_description, FeatureMatcherFn feature_matcher_fn)
             {
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index cc8e397b668..978d161852b 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -16,13 +16,13 @@
 
 #include <Formats/FormatFactory.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
 #include <Common/parseGlobs.h>
+#include <Common/filesystemHelpers.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageInMemoryMetadata.h>
 
@@ -34,9 +34,10 @@
 #include <filesystem>
 #include <Storages/Distributed/DirectoryMonitor.h>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Formats/IInputFormat.h>
 #include <Processors/Sources/NullSource.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 
 
@@ -49,6 +50,7 @@ namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
+    extern const int CANNOT_FSTAT;
     extern const int CANNOT_TRUNCATE_FILE;
     extern const int DATABASE_ACCESS_DENIED;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
@@ -123,8 +125,8 @@ void checkCreationIsAllowed(ContextPtr context_global, const std::string & db_di
         return;
 
     /// "/dev/null" is allowed for perf testing
-    if (!startsWith(table_path, db_dir_path) && table_path != "/dev/null")
-        throw Exception("File is not inside " + db_dir_path, ErrorCodes::DATABASE_ACCESS_DENIED);
+    if (!fileOrSymlinkPathStartsWith(table_path, db_dir_path) && table_path != "/dev/null")
+        throw Exception(ErrorCodes::DATABASE_ACCESS_DENIED, "File `{}` is not inside `{}`", table_path, db_dir_path);
 
     if (fs::exists(table_path) && fs::is_directory(table_path))
         throw Exception("File must not be a directory", ErrorCodes::INCORRECT_FILE_NAME);
@@ -139,7 +141,10 @@ Strings StorageFile::getPathsList(const String & table_path, const String & user
         fs_table_path = user_files_absolute_path / fs_table_path;
 
     Strings paths;
-    const String path = fs::weakly_canonical(fs_table_path);
+    /// Do not use fs::canonical or fs::weakly_canonical.
+    /// Otherwise it will not allow to work with symlinks in `user_files_path` directory.
+    String path = fs::absolute(fs_table_path);
+    path = fs::path(path).lexically_normal(); /// Normalize path.
     if (path.find_first_of("*?{") == std::string::npos)
     {
         std::error_code error;
@@ -164,6 +169,12 @@ bool StorageFile::isColumnOriented() const
 StorageFile::StorageFile(int table_fd_, CommonArguments args)
     : StorageFile(args)
 {
+    struct stat buf;
+    int res = fstat(table_fd_, &buf);
+    if (-1 == res)
+        throwFromErrno("Cannot execute fstat", res, ErrorCodes::CANNOT_FSTAT);
+    total_bytes_to_read = buf.st_size;
+
     if (args.getContext()->getApplicationType() == Context::ApplicationType::SERVER)
         throw Exception("Using file descriptor as source of storage isn't allowed for server daemons", ErrorCodes::DATABASE_ACCESS_DENIED);
     if (args.format_name == "Distributed")
@@ -208,6 +219,8 @@ StorageFile::StorageFile(const std::string & relative_table_dir_path, CommonArgu
     String table_dir_path = fs::path(base_path) / relative_table_dir_path / "";
     fs::create_directories(table_dir_path);
     paths = {getTablePath(table_dir_path, format_name)};
+    if (fs::exists(paths[0]))
+        total_bytes_to_read = fs::file_size(paths[0]);
 }
 
 StorageFile::StorageFile(CommonArguments args)
@@ -327,8 +340,7 @@ public:
                     /// Special case for distributed format. Defaults are not needed here.
                     if (storage->format_name == "Distributed")
                     {
-                        pipeline = std::make_unique<QueryPipeline>();
-                        pipeline->init(Pipe(StorageDistributedDirectoryMonitor::createSourceFromFile(current_path)));
+                        pipeline = std::make_unique<QueryPipeline>(StorageDistributedDirectoryMonitor::createSourceFromFile(current_path));
                         reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
                         continue;
                     }
@@ -382,20 +394,22 @@ public:
                     return metadata_snapshot->getSampleBlock();
                 };
 
-                auto format = FormatFactory::instance().getInput(
-                    storage->format_name, *read_buf, get_block_for_format(), context, max_block_size, storage->format_settings);
+                auto format = context->getInputFormat(
+                    storage->format_name, *read_buf, get_block_for_format(), max_block_size, storage->format_settings);
 
-                pipeline = std::make_unique<QueryPipeline>();
-                pipeline->init(Pipe(format));
+                QueryPipelineBuilder builder;
+                builder.init(Pipe(format));
 
                 if (columns_description.hasDefaults())
                 {
-                    pipeline->addSimpleTransform([&](const Block & header)
+                    builder.addSimpleTransform([&](const Block & header)
                     {
                         return std::make_shared<AddingDefaultsTransform>(header, columns_description, *format, context);
                     });
                 }
 
+                pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
+
                 reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
             }
 
@@ -468,8 +482,6 @@ Pipe StorageFile::read(
     size_t max_block_size,
     unsigned num_streams)
 {
-    BlockInputStreams blocks_input;
-
     if (use_table_fd)   /// need to call ctr BlockInputStream
         paths = {""};   /// when use fd, paths are empty
     else
@@ -564,7 +576,7 @@ public:
 
         write_buf = wrapWriteBufferWithCompressionMethod(std::move(naked_buffer), compression_method, 3);
 
-        writer = FormatFactory::instance().getOutputStreamParallelIfPossible(storage.format_name,
+        writer = FormatFactory::instance().getOutputFormatParallelIfPossible(storage.format_name,
             *write_buf, metadata_snapshot->getSampleBlock(), context,
             {}, format_settings);
     }
@@ -574,18 +586,18 @@ public:
     void onStart() override
     {
         if (!prefix_written)
-            writer->writePrefix();
+            writer->doWritePrefix();
         prefix_written = true;
     }
 
     void consume(Chunk chunk) override
     {
-        writer->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+        writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
     void onFinish() override
     {
-        writer->writeSuffix();
+        writer->doWriteSuffix();
     }
 
     // void flush() override
@@ -598,7 +610,7 @@ private:
     StorageMetadataPtr metadata_snapshot;
     std::unique_lock<std::shared_timed_mutex> lock;
     std::unique_ptr<WriteBuffer> write_buf;
-    BlockOutputStreamPtr writer;
+    OutputFormatPtr writer;
     bool prefix_written{false};
 };
 
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index b80333e7ba8..09ea44d1405 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <atomic>
 #include <shared_mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageGenerateRandom.cpp b/src/Storages/StorageGenerateRandom.cpp
index abe288bd999..a4dfbfc3f96 100644
--- a/src/Storages/StorageGenerateRandom.cpp
+++ b/src/Storages/StorageGenerateRandom.cpp
@@ -3,7 +3,7 @@
 #include <Storages/StorageGenerateRandom.h>
 #include <Storages/StorageFactory.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Parsers/ASTLiteral.h>
 
 #include <DataTypes/DataTypeTuple.h>
@@ -24,7 +24,7 @@
 
 #include <Common/SipHash.h>
 #include <Common/randomSeed.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 #include <Functions/FunctionFactory.h>
 
diff --git a/src/Storages/StorageGenerateRandom.h b/src/Storages/StorageGenerateRandom.h
index 61fd68cb80c..d11a43b1dd6 100644
--- a/src/Storages/StorageGenerateRandom.h
+++ b/src/Storages/StorageGenerateRandom.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <optional>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index dad83f64c70..dcdf3a097e6 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -1,10 +1,11 @@
 #include <Storages/StorageInMemoryMetadata.h>
 
-#include <sparsehash/dense_hash_map>
-#include <sparsehash/dense_hash_set>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
 #include <Common/quoteString.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Core/ColumnWithTypeAndName.h>
+#include <DataTypes/DataTypeEnum.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
@@ -28,6 +29,8 @@ StorageInMemoryMetadata::StorageInMemoryMetadata(const StorageInMemoryMetadata &
     , secondary_indices(other.secondary_indices)
     , constraints(other.constraints)
     , projections(other.projections.clone())
+    , minmax_count_projection(
+          other.minmax_count_projection ? std::optional<ProjectionDescription>(other.minmax_count_projection->clone()) : std::nullopt)
     , partition_key(other.partition_key)
     , primary_key(other.primary_key)
     , sorting_key(other.sorting_key)
@@ -49,6 +52,10 @@ StorageInMemoryMetadata & StorageInMemoryMetadata::operator=(const StorageInMemo
     secondary_indices = other.secondary_indices;
     constraints = other.constraints;
     projections = other.projections.clone();
+    if (other.minmax_count_projection)
+        minmax_count_projection = other.minmax_count_projection->clone();
+    else
+        minmax_count_projection = std::nullopt;
     partition_key = other.partition_key;
     primary_key = other.primary_key;
     sorting_key = other.sorting_key;
@@ -214,7 +221,7 @@ bool StorageInMemoryMetadata::hasAnyGroupByTTL() const
     return !table_ttl.group_by_ttl.empty();
 }
 
-ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet & updated_columns) const
+ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet & updated_columns, bool include_ttl_target) const
 {
     if (updated_columns.empty())
         return {};
@@ -250,7 +257,7 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet
     if (hasRowsTTL())
     {
         auto rows_expression = getRowsTTL().expression;
-        if (add_dependent_columns(rows_expression, required_ttl_columns))
+        if (add_dependent_columns(rows_expression, required_ttl_columns) && include_ttl_target)
         {
             /// Filter all columns, if rows TTL expression have to be recalculated.
             for (const auto & column : getColumns().getAllPhysical())
@@ -263,13 +270,15 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(const NameSet
 
     for (const auto & [name, entry] : getColumnTTLs())
     {
-        if (add_dependent_columns(entry.expression, required_ttl_columns))
+        if (add_dependent_columns(entry.expression, required_ttl_columns) && include_ttl_target)
             updated_ttl_columns.insert(name);
     }
 
     for (const auto & entry : getMoveTTLs())
         add_dependent_columns(entry.expression, required_ttl_columns);
 
+    //TODO what about rows_where_ttl and group_by_ttl ??
+
     for (const auto & column : indices_columns)
         res.emplace(column, ColumnDependency::SKIP_INDEX);
     for (const auto & column : projections_columns)
@@ -320,18 +329,12 @@ Block StorageInMemoryMetadata::getSampleBlockForColumns(
 {
     Block res;
 
-#if !defined(ARCADIA_BUILD)
-    google::dense_hash_map<StringRef, const DataTypePtr *, StringRefHash> virtuals_map;
-#else
-    google::sparsehash::dense_hash_map<StringRef, const DataTypePtr *, StringRefHash> virtuals_map;
-#endif
-
-    virtuals_map.set_empty_key(StringRef());
+    HashMapWithSavedHash<StringRef, const DataTypePtr *, StringRefHash> virtuals_map;
 
     /// Virtual columns must be appended after ordinary, because user can
     /// override them.
     for (const auto & column : virtuals)
-        virtuals_map.emplace(column.name, &column.type);
+        virtuals_map[column.name] = &column.type;
 
     for (const auto & name : column_names)
     {
@@ -340,9 +343,9 @@ Block StorageInMemoryMetadata::getSampleBlockForColumns(
         {
             res.insert({column->type->createColumn(), column->type, column->name});
         }
-        else if (auto it = virtuals_map.find(name); it != virtuals_map.end())
+        else if (auto * it = virtuals_map.find(name); it != virtuals_map.end())
         {
-            const auto & type = *it->second;
+            const auto & type = *it->getMapped();
             res.insert({type->createColumn(), type, name});
         }
         else
@@ -475,13 +478,8 @@ bool StorageInMemoryMetadata::hasSelectQuery() const
 
 namespace
 {
-#if !defined(ARCADIA_BUILD)
-    using NamesAndTypesMap = google::dense_hash_map<StringRef, const IDataType *, StringRefHash>;
-    using UniqueStrings = google::dense_hash_set<StringRef, StringRefHash>;
-#else
-    using NamesAndTypesMap = google::sparsehash::dense_hash_map<StringRef, const IDataType *, StringRefHash>;
-    using UniqueStrings = google::sparsehash::dense_hash_set<StringRef, StringRefHash>;
-#endif
+    using NamesAndTypesMap = HashMapWithSavedHash<StringRef, const IDataType *, StringRefHash>;
+    using UniqueStrings = HashSetWithSavedHash<StringRef, StringRefHash>;
 
     String listOfColumns(const NamesAndTypesList & available_columns)
     {
@@ -498,7 +496,6 @@ namespace
     NamesAndTypesMap getColumnsMap(const NamesAndTypesList & columns)
     {
         NamesAndTypesMap res;
-        res.set_empty_key(StringRef());
 
         for (const auto & column : columns)
             res.insert({column.name, column.type.get()});
@@ -506,11 +503,21 @@ namespace
         return res;
     }
 
-    UniqueStrings initUniqueStrings()
+    /*
+     * This function checks compatibility of enums. It returns true if:
+     * 1. Both types are enums.
+     * 2. The first type can represent all possible values of the second one.
+     * 3. Both types require the same amount of memory.
+     */
+    bool isCompatibleEnumTypes(const IDataType * lhs, const IDataType * rhs)
     {
-        UniqueStrings strings;
-        strings.set_empty_key(StringRef());
-        return strings;
+        if (IDataTypeEnum const * enum_type = dynamic_cast<IDataTypeEnum const *>(lhs))
+        {
+            if (!enum_type->contains(*rhs))
+                return false;
+            return enum_type->getMaximumSizeOfValueInMemory() == rhs->getMaximumSizeOfValueInMemory();
+        }
+        return false;
     }
 }
 
@@ -524,11 +531,12 @@ void StorageInMemoryMetadata::check(const Names & column_names, const NamesAndTy
     }
 
     const auto virtuals_map = getColumnsMap(virtuals);
-    auto unique_names = initUniqueStrings();
+    UniqueStrings unique_names;
 
     for (const auto & name : column_names)
     {
-        bool has_column = getColumns().hasColumnOrSubcolumn(ColumnsDescription::AllPhysical, name) || virtuals_map.count(name);
+        bool has_column = getColumns().hasColumnOrSubcolumn(ColumnsDescription::AllPhysical, name)
+            || virtuals_map.find(name) != nullptr;
 
         if (!has_column)
         {
@@ -550,23 +558,32 @@ void StorageInMemoryMetadata::check(const NamesAndTypesList & provided_columns)
     const NamesAndTypesList & available_columns = getColumns().getAllPhysical();
     const auto columns_map = getColumnsMap(available_columns);
 
-    auto unique_names = initUniqueStrings();
+    UniqueStrings unique_names;
+
     for (const NameAndTypePair & column : provided_columns)
     {
-        auto it = columns_map.find(column.name);
+        const auto * it = columns_map.find(column.name);
         if (columns_map.end() == it)
             throw Exception(
-                "There is no column with name " + column.name + ". There are columns: " + listOfColumns(available_columns),
-                ErrorCodes::NO_SUCH_COLUMN_IN_TABLE);
+                ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
+                "There is no column with name {}. There are columns: {}",
+                column.name,
+                listOfColumns(available_columns));
 
-        if (!column.type->equals(*it->second))
+        const auto * available_type = it->getMapped();
+        if (!column.type->equals(*available_type) && !isCompatibleEnumTypes(available_type, column.type.get()))
             throw Exception(
-                "Type mismatch for column " + column.name + ". Column has type " + it->second->getName() + ", got type "
-                    + column.type->getName(),
-                ErrorCodes::TYPE_MISMATCH);
+                ErrorCodes::TYPE_MISMATCH,
+                "Type mismatch for column {}. Column has type {}, got type {}",
+                column.name,
+                available_type->getName(),
+                column.type->getName());
 
         if (unique_names.end() != unique_names.find(column.name))
-            throw Exception("Column " + column.name + " queried more than once", ErrorCodes::COLUMN_QUERIED_MORE_THAN_ONCE);
+            throw Exception(ErrorCodes::COLUMN_QUERIED_MORE_THAN_ONCE,
+                "Column {} queried more than once",
+                column.name);
+
         unique_names.insert(column.name);
     }
 }
@@ -582,26 +599,38 @@ void StorageInMemoryMetadata::check(const NamesAndTypesList & provided_columns,
             "Empty list of columns queried. There are columns: " + listOfColumns(available_columns),
             ErrorCodes::EMPTY_LIST_OF_COLUMNS_QUERIED);
 
-    auto unique_names = initUniqueStrings();
+    UniqueStrings unique_names;
+
     for (const String & name : column_names)
     {
-        auto it = provided_columns_map.find(name);
+        const auto * it = provided_columns_map.find(name);
         if (provided_columns_map.end() == it)
             continue;
 
-        auto jt = available_columns_map.find(name);
+        const auto * jt = available_columns_map.find(name);
         if (available_columns_map.end() == jt)
             throw Exception(
-                "There is no column with name " + name + ". There are columns: " + listOfColumns(available_columns),
-                ErrorCodes::NO_SUCH_COLUMN_IN_TABLE);
+                ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
+                "There is no column with name {}. There are columns: {}",
+                name,
+                listOfColumns(available_columns));
 
-        if (!it->second->equals(*jt->second))
+        const auto * provided_column_type = it->getMapped();
+        const auto * available_column_type = jt->getMapped();
+
+        if (!provided_column_type->equals(*available_column_type) && !isCompatibleEnumTypes(available_column_type, provided_column_type))
             throw Exception(
-                "Type mismatch for column " + name + ". Column has type " + jt->second->getName() + ", got type " + it->second->getName(),
-                ErrorCodes::TYPE_MISMATCH);
+                ErrorCodes::TYPE_MISMATCH,
+                "Type mismatch for column {}. Column has type {}, got type {}",
+                name,
+                available_column_type->getName(),
+                provided_column_type->getName());
 
         if (unique_names.end() != unique_names.find(name))
-            throw Exception("Column " + name + " queried more than once", ErrorCodes::COLUMN_QUERIED_MORE_THAN_ONCE);
+            throw Exception(ErrorCodes::COLUMN_QUERIED_MORE_THAN_ONCE,
+                "Column {} queried more than once",
+                name);
+
         unique_names.insert(name);
     }
 }
@@ -622,17 +651,22 @@ void StorageInMemoryMetadata::check(const Block & block, bool need_all) const
 
         names_in_block.insert(column.name);
 
-        auto it = columns_map.find(column.name);
+        const auto * it = columns_map.find(column.name);
         if (columns_map.end() == it)
             throw Exception(
-                "There is no column with name " + column.name + ". There are columns: " + listOfColumns(available_columns),
-                ErrorCodes::NO_SUCH_COLUMN_IN_TABLE);
+                ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
+                "There is no column with name {}. There are columns: {}",
+                column.name,
+                listOfColumns(available_columns));
 
-        if (!column.type->equals(*it->second))
+        const auto * available_type = it->getMapped();
+        if (!column.type->equals(*available_type) && !isCompatibleEnumTypes(available_type, column.type.get()))
             throw Exception(
-                "Type mismatch for column " + column.name + ". Column has type " + it->second->getName() + ", got type "
-                    + column.type->getName(),
-                ErrorCodes::TYPE_MISMATCH);
+                ErrorCodes::TYPE_MISMATCH,
+                "Type mismatch for column {}. Column has type {}, got type {}",
+                column.name,
+                available_type->getName(),
+                column.type->getName());
     }
 
     if (need_all && names_in_block.size() < columns_map.size())
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index d0d60f608d7..a8912d44f2c 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -28,6 +28,8 @@ struct StorageInMemoryMetadata
     ConstraintsDescription constraints;
     /// Table projections. Currently supported for MergeTree only.
     ProjectionsDescription projections;
+    /// Table minmax_count projection. Currently supported for MergeTree only.
+    std::optional<ProjectionDescription> minmax_count_projection;
     /// PARTITION BY expression. Currently supported for MergeTree only.
     KeyDescription partition_key;
     /// PRIMARY KEY expression. If absent, than equal to order_by_ast.
@@ -41,7 +43,7 @@ struct StorageInMemoryMetadata
     TTLColumnsDescription column_ttls_by_name;
     /// TTL expressions for table (Move and Rows)
     TTLTableDescription table_ttl;
-    /// SETTINGS expression. Supported for MergeTree, Buffer and Kafka.
+    /// SETTINGS expression. Supported for MergeTree, Buffer, Kafka, RabbitMQ.
     ASTPtr settings_changes;
     /// SELECT QUERY. Supported for MaterializedView and View (have to support LiveView).
     SelectQueryDescription select;
@@ -107,6 +109,7 @@ struct StorageInMemoryMetadata
     const ConstraintsDescription & getConstraints() const;
 
     const ProjectionsDescription & getProjections() const;
+
     /// Has at least one projection
     bool hasProjections() const;
 
@@ -143,7 +146,7 @@ struct StorageInMemoryMetadata
 
     /// Returns columns, which will be needed to calculate dependencies (skip
     /// indices, TTL expressions) if we update @updated_columns set of columns.
-    ColumnDependencies getColumnDependencies(const NameSet & updated_columns) const;
+    ColumnDependencies getColumnDependencies(const NameSet & updated_columns, bool include_ttl_target) const;
 
     /// Block with ordinary + materialized columns.
     Block getSampleBlock() const;
diff --git a/src/Storages/StorageInput.cpp b/src/Storages/StorageInput.cpp
index d707d7a6cdf..2ed7a77b59d 100644
--- a/src/Storages/StorageInput.cpp
+++ b/src/Storages/StorageInput.cpp
@@ -5,8 +5,7 @@
 
 #include <memory>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
-#include <Processors/Sources/SourceFromInputStream.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageInput.h b/src/Storages/StorageInput.h
index c3c40cab7a5..b28bc143bb0 100644
--- a/src/Storages/StorageInput.h
+++ b/src/Storages/StorageInput.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-#include <common/shared_ptr_helper.h>
-#include <Processors/Pipe.h>
+#include <base/shared_ptr_helper.h>
+#include <QueryPipeline/Pipe.h>
 
 namespace DB
 {
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index 5c5b12c7475..8ac341661bf 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -1,13 +1,13 @@
 #include <Storages/StorageJoin.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageSet.h>
+#include <Storages/TableLockHolder.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/Context.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Core/ColumnNumbers.h>
 #include <DataTypes/NestedUtils.h>
-#include <Disks/IDisk.h>
 #include <Interpreters/joinDispatch.h>
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/TableJoin.h>
@@ -17,7 +17,8 @@
 
 #include <Compression/CompressedWriteBuffer.h>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Poco/String.h> /// toLower
 
 
@@ -67,17 +68,24 @@ StorageJoin::StorageJoin(
     restore();
 }
 
+RWLockImpl::LockHolder StorageJoin::tryLockTimedWithContext(const RWLock & lock, RWLockImpl::Type type, ContextPtr context) const
+{
+    const String query_id = context ? context->getInitialQueryId() : RWLockImpl::NO_QUERY;
+    const std::chrono::milliseconds acquire_timeout
+        = context ? context->getSettingsRef().lock_acquire_timeout : std::chrono::seconds(DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC);
+    return tryLockTimed(lock, type, query_id, acquire_timeout);
+}
+
 SinkToStoragePtr StorageJoin::write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     std::lock_guard mutate_lock(mutate_mutex);
     return StorageSetOrJoinBase::write(query, metadata_snapshot, context);
 }
 
-void StorageJoin::truncate(
-    const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr, TableExclusiveLockHolder&)
+void StorageJoin::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, TableExclusiveLockHolder &)
 {
     std::lock_guard mutate_lock(mutate_mutex);
-    std::unique_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Write, context);
 
     disk->removeRecursive(path);
     disk->createDirectories(path);
@@ -106,7 +114,7 @@ void StorageJoin::mutate(const MutationCommands & commands, ContextPtr context)
 
     auto backup_buf = disk->writeFile(path + tmp_backup_file_name);
     auto compressed_backup_buf = CompressedWriteBuffer(*backup_buf);
-    auto backup_stream = NativeBlockOutputStream(compressed_backup_buf, 0, metadata_snapshot->getSampleBlock());
+    auto backup_stream = NativeWriter(compressed_backup_buf, 0, metadata_snapshot->getSampleBlock());
 
     auto new_data = std::make_shared<HashJoin>(table_join, metadata_snapshot->getSampleBlock().sortColumns(), overwrite);
 
@@ -114,21 +122,20 @@ void StorageJoin::mutate(const MutationCommands & commands, ContextPtr context)
     {
         auto storage_ptr = DatabaseCatalog::instance().getTable(getStorageID(), context);
         auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, context, true);
-        auto in = interpreter->execute();
-        in->readPrefix();
+        auto pipeline = interpreter->execute();
+        PullingPipelineExecutor executor(pipeline);
 
-        while (const Block & block = in->read())
+        Block block;
+        while (executor.pull(block))
         {
             new_data->addJoinedBlock(block, true);
             if (persistent)
                 backup_stream.write(block);
         }
-
-        in->readSuffix();
     }
 
     /// Now acquire exclusive lock and modify storage.
-    std::unique_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Write, context);
 
     join = std::move(new_data);
     increment = 1;
@@ -152,7 +159,7 @@ void StorageJoin::mutate(const MutationCommands & commands, ContextPtr context)
     }
 }
 
-HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join) const
+HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join, ContextPtr context) const
 {
     auto metadata_snapshot = getInMemoryMetadataPtr();
     if (!analyzed_join->sameStrictnessAndKind(strictness, kind))
@@ -171,34 +178,36 @@ HashJoinPtr StorageJoin::getJoinLocked(std::shared_ptr<TableJoin> analyzed_join)
     analyzed_join->setRightKeys(key_names);
 
     HashJoinPtr join_clone = std::make_shared<HashJoin>(analyzed_join, metadata_snapshot->getSampleBlock().sortColumns());
-    join_clone->setLock(rwlock);
+
+    RWLockImpl::LockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Read, context);
+    join_clone->setLock(holder);
     join_clone->reuseJoinedData(*join);
 
     return join_clone;
 }
 
 
-void StorageJoin::insertBlock(const Block & block)
+void StorageJoin::insertBlock(const Block & block, ContextPtr context)
 {
-    std::unique_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Write, context);
     join->addJoinedBlock(block, true);
 }
 
-size_t StorageJoin::getSize() const
+size_t StorageJoin::getSize(ContextPtr context) const
 {
-    std::shared_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Read, context);
     return join->getTotalRowCount();
 }
 
-std::optional<UInt64> StorageJoin::totalRows(const Settings &) const
+std::optional<UInt64> StorageJoin::totalRows(const Settings &settings) const
 {
-    std::shared_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimed(rwlock, RWLockImpl::Read, RWLockImpl::NO_QUERY, settings.lock_acquire_timeout);
     return join->getTotalRowCount();
 }
 
-std::optional<UInt64> StorageJoin::totalBytes(const Settings &) const
+std::optional<UInt64> StorageJoin::totalBytes(const Settings &settings) const
 {
-    std::shared_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimed(rwlock, RWLockImpl::Read, RWLockImpl::NO_QUERY, settings.lock_acquire_timeout);
     return join->getTotalByteCount();
 }
 
@@ -207,9 +216,9 @@ DataTypePtr StorageJoin::joinGetCheckAndGetReturnType(const DataTypes & data_typ
     return join->joinGetCheckAndGetReturnType(data_types, column_name, or_null);
 }
 
-ColumnWithTypeAndName StorageJoin::joinGet(const Block & block, const Block & block_with_columns_to_add) const
+ColumnWithTypeAndName StorageJoin::joinGet(const Block & block, const Block & block_with_columns_to_add, ContextPtr context) const
 {
-    std::shared_lock<std::shared_mutex> lock(rwlock);
+    TableLockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Read, context);
     return join->joinGet(block, block_with_columns_to_add);
 }
 
@@ -370,13 +379,16 @@ size_t rawSize(const StringRef & t)
 class JoinSource : public SourceWithProgress
 {
 public:
-    JoinSource(HashJoinPtr join_, std::shared_mutex & rwlock, UInt64 max_block_size_, Block sample_block_)
+    JoinSource(HashJoinPtr join_, TableLockHolder lock_holder_, UInt64 max_block_size_, Block sample_block_)
         : SourceWithProgress(sample_block_)
         , join(join_)
-        , lock(rwlock)
+        , lock_holder(lock_holder_)
         , max_block_size(max_block_size_)
         , sample_block(std::move(sample_block_))
     {
+        if (!join->getTableJoin().oneDisjunct())
+            throw DB::Exception(ErrorCodes::NOT_IMPLEMENTED, "StorageJoin does not support OR for keys in JOIN ON section");
+
         column_indices.resize(sample_block.columns());
 
         auto & saved_block = join->getJoinedData()->sample_block;
@@ -410,7 +422,7 @@ protected:
             return {};
 
         Chunk chunk;
-        if (!joinDispatch(join->kind, join->strictness, join->data->maps,
+        if (!joinDispatch(join->kind, join->strictness, join->data->maps.front(),
                 [&](auto kind, auto strictness, auto & map) { chunk = createChunk<kind, strictness>(map); }))
             throw Exception("Logical error: unknown JOIN strictness", ErrorCodes::LOGICAL_ERROR);
         return chunk;
@@ -418,7 +430,7 @@ protected:
 
 private:
     HashJoinPtr join;
-    std::shared_lock<std::shared_mutex> lock;
+    TableLockHolder lock_holder;
 
     UInt64 max_block_size;
     Block sample_block;
@@ -568,7 +580,7 @@ Pipe StorageJoin::read(
     const Names & column_names,
     const StorageMetadataPtr & metadata_snapshot,
     SelectQueryInfo & /*query_info*/,
-    ContextPtr /*context*/,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
     unsigned /*num_streams*/)
@@ -576,7 +588,8 @@ Pipe StorageJoin::read(
     metadata_snapshot->check(column_names, getVirtuals(), getStorageID());
 
     Block source_sample_block = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
-    return Pipe(std::make_shared<JoinSource>(join, rwlock, max_block_size, source_sample_block));
+    RWLockImpl::LockHolder holder = tryLockTimedWithContext(rwlock, RWLockImpl::Read, context);
+    return Pipe(std::make_shared<JoinSource>(join, std::move(holder), max_block_size, source_sample_block));
 }
 
 }
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index 6a08773ecc8..1b9d34c46fa 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -1,8 +1,10 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
+#include <Common/RWLock.h>
 #include <Storages/StorageSet.h>
+#include <Storages/TableLockHolder.h>
 #include <Storages/JoinSettings.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
@@ -35,7 +37,7 @@ public:
 
     /// Return instance of HashJoin holding lock that protects from insertions to StorageJoin.
     /// HashJoin relies on structure of hash table that's why we need to return it with locked mutex.
-    HashJoinPtr getJoinLocked(std::shared_ptr<TableJoin> analyzed_join) const;
+    HashJoinPtr getJoinLocked(std::shared_ptr<TableJoin> analyzed_join, ContextPtr context) const;
 
     /// Get result type for function "joinGet(OrNull)"
     DataTypePtr joinGetCheckAndGetReturnType(const DataTypes & data_types, const String & column_name, bool or_null) const;
@@ -43,7 +45,7 @@ public:
     /// Execute function "joinGet(OrNull)" on data block.
     /// Takes rwlock for read to prevent parallel StorageJoin updates during processing data block
     /// (but not during processing whole query, it's safe for joinGet that doesn't involve `used_flags` from HashJoin)
-    ColumnWithTypeAndName joinGet(const Block & block, const Block & block_with_columns_to_add) const;
+    ColumnWithTypeAndName joinGet(const Block & block, const Block & block_with_columns_to_add, ContextPtr context) const;
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr context) override;
 
@@ -73,12 +75,13 @@ private:
 
     /// Protect state for concurrent use in insertFromBlock and joinBlock.
     /// Lock is stored in HashJoin instance during query and blocks concurrent insertions.
-    mutable std::shared_mutex rwlock;
+    mutable RWLock rwlock = RWLockImpl::create();
     mutable std::mutex mutate_mutex;
 
-    void insertBlock(const Block & block) override;
+    void insertBlock(const Block & block, ContextPtr context) override;
     void finishInsert() override {}
-    size_t getSize() const override;
+    size_t getSize(ContextPtr context) const override;
+    RWLockImpl::LockHolder tryLockTimedWithContext(const RWLock & lock, RWLockImpl::Type type, ContextPtr context) const;
 
 protected:
     StorageJoin(
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index 0e156f24cc2..54a8e4cd1ce 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -16,15 +16,14 @@
 
 #include <DataTypes/NestedUtils.h>
 
-#include <DataStreams/IBlockOutputStream.h>
-
 #include <Columns/ColumnArray.h>
 
 #include <Interpreters/Context.h>
 #include <Parsers/ASTLiteral.h>
 #include "StorageLogSettings.h"
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <Processors/Sources/NullSource.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Sinks/SinkToStorage.h>
 
 #include <cassert>
@@ -63,14 +62,14 @@ public:
 
     LogSource(
         size_t block_size_, const NamesAndTypesList & columns_, StorageLog & storage_,
-        size_t mark_number_, size_t rows_limit_, size_t max_read_buffer_size_)
+        size_t mark_number_, size_t rows_limit_, ReadSettings read_settings_)
         : SourceWithProgress(getHeader(columns_)),
         block_size(block_size_),
         columns(columns_),
         storage(storage_),
         mark_number(mark_number_),
         rows_limit(rows_limit_),
-        max_read_buffer_size(max_read_buffer_size_)
+        read_settings(std::move(read_settings_))
     {
     }
 
@@ -86,14 +85,14 @@ private:
     size_t mark_number;     /// from what mark to read data
     size_t rows_limit;      /// The maximum number of rows that can be read
     size_t rows_read = 0;
-    size_t max_read_buffer_size;
+    ReadSettings read_settings;
 
     std::unordered_map<String, SerializationPtr> serializations;
 
     struct Stream
     {
-        Stream(const DiskPtr & disk, const String & data_path, size_t offset, size_t max_read_buffer_size_)
-            : plain(disk->readFile(data_path, std::min(max_read_buffer_size_, disk->getFileSize(data_path))))
+        Stream(const DiskPtr & disk, const String & data_path, size_t offset, ReadSettings read_settings_)
+            : plain(disk->readFile(data_path, read_settings_.adjustBufferSize(disk->getFileSize(data_path))))
             , compressed(*plain)
         {
             if (offset)
@@ -122,9 +121,6 @@ Chunk LogSource::generate()
     if (rows_read == rows_limit)
         return {};
 
-    if (storage.file_checker.empty())
-        return {};
-
     /// How many rows to read for the next block.
     size_t max_rows_to_read = std::min(block_size, rows_limit - rows_read);
     std::unordered_map<String, ISerialization::SubstreamsCache> caches;
@@ -185,10 +181,13 @@ void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & colu
 
             UInt64 offset = 0;
             if (!stream_for_prefix && mark_number)
+            {
+                std::lock_guard marks_lock(file_it->second.marks_mutex);
                 offset = file_it->second.marks[mark_number].offset;
+            }
 
             auto & data_file_path = file_it->second.data_file_path;
-            auto it = streams.try_emplace(stream_name, storage.disk, data_file_path, offset, max_read_buffer_size).first;
+            auto it = streams.try_emplace(stream_name, storage.disk, data_file_path, offset, read_settings).first;
 
             return &it->second.compressed;
         };
@@ -214,8 +213,7 @@ public:
         , storage(storage_)
         , metadata_snapshot(metadata_snapshot_)
         , lock(std::move(lock_))
-        , marks_stream(
-            storage.disk->writeFile(storage.marks_file_path, 4096, WriteMode::Rewrite))
+        , marks_stream(storage.disk->writeFile(storage.marks_file_path, 4096, WriteMode::Append))
     {
         if (!lock)
             throw Exception("Lock timeout exceeded", ErrorCodes::TIMEOUT_EXCEEDED);
@@ -306,7 +304,7 @@ private:
 
 void LogSink::consume(Chunk chunk)
 {
-    auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+    auto block = getHeader().cloneWithColumns(chunk.detachColumns());
     metadata_snapshot->check(block, true);
 
     /// The set of written offset columns so that you do not write shared offsets of columns for nested structures multiple times
@@ -332,7 +330,7 @@ void LogSink::onFinish()
 
     WrittenStreams written_streams;
     ISerialization::SerializeBinaryBulkSettings settings;
-    for (const auto & column : getPort().getHeader())
+    for (const auto & column : getHeader())
     {
         auto it = serialize_states.find(column.name);
         if (it != serialize_states.end())
@@ -407,7 +405,7 @@ void LogSink::writeData(const NameAndTypePair & name_and_type, const IColumn & c
             storage.files[stream_name].data_file_path,
             columns.getCodecOrDefault(name_and_type.name),
             storage.max_compress_block_size);
-    }, settings.path);
+    });
 
     settings.getter = createStreamGetter(name_and_type, written_streams);
 
@@ -428,7 +426,7 @@ void LogSink::writeData(const NameAndTypePair & name_and_type, const IColumn & c
         mark.offset = stream_it->second.plain_offset + stream_it->second.plain->count();
 
         out_marks.emplace_back(file.column_index, mark);
-    }, settings.path);
+    });
 
     serialization->serializeBinaryBulkWithMultipleStreams(column, 0, 0, settings, serialize_states[name]);
 
@@ -442,7 +440,7 @@ void LogSink::writeData(const NameAndTypePair & name_and_type, const IColumn & c
         if (streams.end() == it)
             throw Exception("Logical error: stream was not created when writing data in LogBlockOutputStream", ErrorCodes::LOGICAL_ERROR);
         it->second.compressed.next();
-    }, settings.path);
+    });
 }
 
 
@@ -459,10 +457,15 @@ void LogSink::writeMarks(MarksForColumns && marks)
         writeIntBinary(mark.second.offset, *marks_stream);
 
         size_t column_index = mark.first;
-        storage.files[storage.column_names_by_idx[column_index]].marks.push_back(mark.second);
+
+        auto & file = storage.files[storage.column_names_by_idx[column_index]];
+        std::lock_guard marks_lock(file.marks_mutex);
+        file.marks.push_back(mark.second);
     }
 }
 
+StorageLog::~StorageLog() = default;
+
 StorageLog::StorageLog(
     DiskPtr disk_,
     const String & relative_path_,
@@ -563,7 +566,7 @@ void StorageLog::loadMarks(std::chrono::seconds lock_timeout)
         for (auto & file : files_by_index)
             file->second.marks.reserve(marks_count);
 
-        std::unique_ptr<ReadBuffer> marks_rb = disk->readFile(marks_file_path, 32768);
+        std::unique_ptr<ReadBuffer> marks_rb = disk->readFile(marks_file_path, ReadSettings().adjustBufferSize(32768));
         while (!marks_rb->eof())
         {
             for (auto & file : files_by_index)
@@ -623,13 +626,12 @@ const StorageLog::Marks & StorageLog::getMarksWithRealRowCount(const StorageMeta
       * If this is a data type with multiple stream, get the first stream, that we assume have real row count.
       * (Example: for Array data type, first stream is array sizes; and number of array sizes is the number of arrays).
       */
-    ISerialization::SubstreamPath substream_root_path;
     auto serialization = column.type->getDefaultSerialization();
     serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
     {
         if (filename.empty())
             filename = ISerialization::getFileNameForStream(column, substream_path);
-    }, substream_root_path);
+    });
 
     Files::const_iterator it = files.find(filename);
     if (files.end() == it)
@@ -670,6 +672,9 @@ Pipe StorageLog::read(
     if (!lock)
         throw Exception("Lock timeout exceeded", ErrorCodes::TIMEOUT_EXCEEDED);
 
+    if (file_checker.empty())
+        return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
+
     Pipes pipes;
 
     const Marks & marks = getMarksWithRealRowCount(metadata_snapshot);
@@ -678,7 +683,7 @@ Pipe StorageLog::read(
     if (num_streams > marks_size)
         num_streams = marks_size;
 
-    size_t max_read_buffer_size = context->getSettingsRef().max_read_buffer_size;
+    ReadSettings read_settings = context->getReadSettings();
 
     for (size_t stream = 0; stream < num_streams; ++stream)
     {
@@ -694,7 +699,7 @@ Pipe StorageLog::read(
             *this,
             mark_begin,
             rows_end - rows_begin,
-            max_read_buffer_size));
+            read_settings));
     }
 
     /// No need to hold lock while reading because we read fixed range of data that does not change while appending more data.
@@ -743,9 +748,8 @@ IStorage::ColumnSizeByName StorageLog::getColumnSizes() const
                 size.data_compressed += file_sizes[fileName(it->second.data_file_path)];
         };
 
-        ISerialization::SubstreamPath substream_path;
         auto serialization = column.type->getDefaultSerialization();
-        serialization->enumerateStreams(stream_callback, substream_path);
+        serialization->enumerateStreams(stream_callback);
     }
 
     return column_sizes;
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index 116bdc31520..ada971ecf43 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -2,7 +2,7 @@
 
 #include <map>
 #include <shared_mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Disks/IDisk.h>
 #include <Storages/IStorage.h>
@@ -23,6 +23,7 @@ class StorageLog final : public shared_ptr_helper<StorageLog>, public IStorage
     friend struct shared_ptr_helper<StorageLog>;
 
 public:
+    ~StorageLog() override;
     String getName() const override { return "Log"; }
 
     Pipe read(
@@ -81,6 +82,8 @@ private:
         size_t column_index;
 
         String data_file_path;
+
+        std::mutex marks_mutex;
         Marks marks;
     };
     using Files = std::map<String, ColumnData>; /// file name -> column data
diff --git a/src/Storages/StorageLogSettings.h b/src/Storages/StorageLogSettings.h
index 0918c50aa19..0903c034ec6 100644
--- a/src/Storages/StorageLogSettings.h
+++ b/src/Storages/StorageLogSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Storages/StorageMaterializedMySQL.cpp b/src/Storages/StorageMaterializedMySQL.cpp
index 52f53b9ceee..c214540151a 100644
--- a/src/Storages/StorageMaterializedMySQL.cpp
+++ b/src/Storages/StorageMaterializedMySQL.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 
@@ -18,7 +16,7 @@
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTIdentifier.h>
 
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Transforms/FilterTransform.h>
 
 #include <Databases/MySQL/DatabaseMaterializedMySQL.h>
diff --git a/src/Storages/StorageMaterializedMySQL.h b/src/Storages/StorageMaterializedMySQL.h
index 95ef4ad97fa..8ba98c3000f 100644
--- a/src/Storages/StorageMaterializedMySQL.h
+++ b/src/Storages/StorageMaterializedMySQL.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_MYSQL
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index f72f6fee180..361ff95984f 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -9,10 +9,8 @@
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/getTableExpressions.h>
-#include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
 #include <Access/AccessFlags.h>
-#include <DataStreams/IBlockOutputStream.h>
 
 #include <Storages/AlterCommands.h>
 #include <Storages/StorageFactory.h>
@@ -21,7 +19,7 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
-#include <Processors/Sources/SourceFromInputStream.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -276,7 +274,7 @@ bool StorageMaterializedView::optimize(
 void StorageMaterializedView::alter(
     const AlterCommands & params,
     ContextPtr local_context,
-    TableLockHolder &)
+    AlterLockHolder &)
 {
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
@@ -308,9 +306,8 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
         for (const auto & command : commands)
         {
             if (!command.isCommentAlter() && command.type != AlterCommand::MODIFY_QUERY)
-                throw Exception(
-                    "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                    ErrorCodes::NOT_IMPLEMENTED);
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getName());
         }
     }
     else
@@ -318,9 +315,8 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
         for (const auto & command : commands)
         {
             if (!command.isCommentAlter())
-                throw Exception(
-                    "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                    ErrorCodes::NOT_IMPLEMENTED);
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                    command.type, getName());
         }
     }
 }
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index d282ece7f56..105f3f25533 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
@@ -50,7 +50,7 @@ public:
         const Names & deduplicate_by_columns,
         ContextPtr context) override;
 
-    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & table_lock_holder) override;
 
     void checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const override;
 
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 6823f661984..37cb238ba0f 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -8,8 +8,9 @@
 
 #include <IO/WriteHelpers.h>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 
 
 namespace DB
@@ -61,19 +62,11 @@ protected:
 
         const Block & src = (*data)[current_index];
         Columns columns;
-        columns.reserve(columns.size());
+        columns.reserve(column_names_and_types.size());
 
         /// Add only required columns to `res`.
         for (const auto & elem : column_names_and_types)
-        {
-            auto current_column = src.getByName(elem.getNameInStorage()).column;
-            current_column = current_column->decompress();
-
-            if (elem.isSubcolumn())
-                columns.emplace_back(elem.getTypeInStorage()->getSubcolumn(elem.getSubcolumnName(), *current_column));
-            else
-                columns.emplace_back(std::move(current_column));
-        }
+            columns.emplace_back(getColumnFromBlock(src, elem));
 
         return Chunk(std::move(columns), src.rows());
     }
@@ -115,7 +108,7 @@ public:
 
     void consume(Chunk chunk) override
     {
-        auto block = getPort().getHeader().cloneWithColumns(chunk.getColumns());
+        auto block = getHeader().cloneWithColumns(chunk.getColumns());
         metadata_snapshot->check(block, true);
 
         if (storage.compress)
@@ -271,11 +264,12 @@ void StorageMemory::mutate(const MutationCommands & commands, ContextPtr context
     new_context->setSetting("max_threads", 1);
 
     auto interpreter = std::make_unique<MutationsInterpreter>(storage_ptr, metadata_snapshot, commands, new_context, true);
-    auto in = interpreter->execute();
+    auto pipeline = interpreter->execute();
+    PullingPipelineExecutor executor(pipeline);
 
-    in->readPrefix();
     Blocks out;
-    while (Block block = in->read())
+    Block block;
+    while (executor.pull(block))
     {
         if (compress)
             for (auto & elem : block)
@@ -283,7 +277,6 @@ void StorageMemory::mutate(const MutationCommands & commands, ContextPtr context
 
         out.push_back(block);
     }
-    in->readSuffix();
 
     std::unique_ptr<Blocks> new_data;
 
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index 88539d0e731..063802faf1a 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -4,11 +4,10 @@
 #include <optional>
 #include <mutex>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
-#include <DataStreams/IBlockOutputStream.h>
 
 #include <Common/MultiVersion.h>
 
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 243294351f3..979e027d338 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -1,5 +1,5 @@
-#include <DataStreams/narrowBlockInputStreams.h>
-#include <DataStreams/OneBlockInputStream.h>
+#include <QueryPipeline/narrowBlockInputStreams.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Storages/StorageMerge.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/VirtualColumnUtils.h>
@@ -22,7 +22,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
 #include <Databases/IDatabase.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <algorithm>
 #include <Parsers/queryToString.h>
 #include <Processors/Transforms/MaterializingTransform.h>
@@ -35,6 +35,7 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
     extern const int ILLEGAL_PREWHERE;
@@ -49,7 +50,7 @@ StorageMerge::StorageMerge(
     const String & comment,
     const String & source_database_name_or_regexp_,
     bool database_is_regexp_,
-    const DbToTableSetMap & source_databases_and_tables_,
+    const DBToTableSetMap & source_databases_and_tables_,
     ContextPtr context_)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
@@ -209,7 +210,7 @@ Pipe StorageMerge::read(
       * since there is no certainty that it works when one of table is MergeTree and other is not.
       */
     auto modified_context = Context::createCopy(local_context);
-    modified_context->setSetting("optimize_move_to_prewhere", Field{false});
+    modified_context->setSetting("optimize_move_to_prewhere", false);
 
     /// What will be result structure depending on query processed stage in source tables?
     Block header = getHeaderForProcessingStage(*this, column_names, metadata_snapshot, query_info, local_context, processed_stage);
@@ -338,9 +339,10 @@ Pipe StorageMerge::read(
 
     auto pipe = Pipe::unitePipes(std::move(pipes));
 
-    if (!pipe.empty())
+    if (!pipe.empty() && !query_info.input_order_info)
         // It's possible to have many tables read from merge, resize(num_streams) might open too many files at the same time.
-        // Using narrowPipe instead.
+        // Using narrowPipe instead. But in case of reading in order of primary key, we cannot do it,
+        // because narrowPipe doesn't preserve order.
         narrowPipe(pipe, num_streams);
 
     return pipe;
@@ -379,10 +381,10 @@ Pipe StorageMerge::createSources(
 
     if (!storage)
     {
-        pipe = QueryPipeline::getPipe(InterpreterSelectQuery(
+        pipe = QueryPipelineBuilder::getPipe(InterpreterSelectQuery(
             modified_query_info.query, modified_context,
-            std::make_shared<OneBlockInputStream>(header),
-            SelectQueryOptions(processed_stage).analyze()).execute().pipeline);
+            Pipe(std::make_shared<SourceFromSingleChunk>(header)),
+            SelectQueryOptions(processed_stage).analyze()).buildQueryPipeline());
 
         pipe.addInterpreterContext(modified_context);
         return pipe;
@@ -423,7 +425,7 @@ Pipe StorageMerge::createSources(
         InterpreterSelectQuery interpreter{modified_query_info.query, modified_context, SelectQueryOptions(processed_stage)};
 
 
-        pipe = QueryPipeline::getPipe(interpreter.execute().pipeline);
+        pipe = QueryPipelineBuilder::getPipe(interpreter.buildQueryPipeline());
 
         /** Materialization is needed, since from distributed storage the constants come materialized.
           * If you do not do this, different types (Const and non-Const) columns will be produced in different threads,
@@ -435,11 +437,17 @@ Pipe StorageMerge::createSources(
     if (!pipe.empty())
     {
         if (concat_streams && pipe.numOutputPorts() > 1)
+        {
             // It's possible to have many tables read from merge, resize(1) might open too many files at the same time.
             // Using concat instead.
             pipe.addTransform(std::make_shared<ConcatProcessor>(pipe.getHeader(), pipe.numOutputPorts()));
+        }
 
-        if (has_database_virtual_column)
+        /// Add virtual columns if we don't already have them.
+
+        Block pipe_header = pipe.getHeader();
+
+        if (has_database_virtual_column && !pipe_header.has("_database"))
         {
             ColumnWithTypeAndName column;
             column.name = "_database";
@@ -457,7 +465,7 @@ Pipe StorageMerge::createSources(
             });
         }
 
-        if (has_table_virtual_column)
+        if (has_table_virtual_column && !pipe_header.has("_table"))
         {
             ColumnWithTypeAndName column;
             column.name = "_table";
@@ -566,11 +574,14 @@ DatabaseTablesIteratorPtr StorageMerge::getDatabaseIterator(const String & datab
 {
     auto database = DatabaseCatalog::instance().getDatabase(database_name);
 
-    auto table_name_match = [this, &database_name](const String & table_name_) -> bool {
+    auto table_name_match = [this, database_name](const String & table_name_) -> bool
+    {
         if (source_databases_and_tables)
         {
-            const auto & source_tables = (*source_databases_and_tables).at(database_name);
-            return source_tables.count(table_name_);
+            if (auto it = source_databases_and_tables->find(database_name); it != source_databases_and_tables->end())
+                return it->second.count(table_name_);
+            else
+                return false;
         }
         else
             return source_table_regexp->match(table_name_);
@@ -618,11 +629,13 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextP
     auto name_deps = getDependentViewsByColumn(local_context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::Type::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
@@ -638,7 +651,7 @@ void StorageMerge::checkAlterIsPossible(const AlterCommands & commands, ContextP
 }
 
 void StorageMerge::alter(
-    const AlterCommands & params, ContextPtr local_context, TableLockHolder &)
+    const AlterCommands & params, ContextPtr local_context, AlterLockHolder &)
 {
     auto table_id = getStorageID();
 
@@ -733,6 +746,26 @@ IStorage::ColumnSizeByName StorageMerge::getColumnSizes() const
     return first_materialized_mysql->getColumnSizes();
 }
 
+
+std::tuple<bool /* is_regexp */, ASTPtr> StorageMerge::evaluateDatabaseName(const ASTPtr & node, ContextPtr context_)
+{
+    if (const auto * func = node->as<ASTFunction>(); func && func->name == "REGEXP")
+    {
+        if (func->arguments->children.size() != 1)
+            throw Exception("REGEXP in Merge ENGINE takes only one argument", ErrorCodes::BAD_ARGUMENTS);
+
+        auto * literal = func->arguments->children[0]->as<ASTLiteral>();
+        if (!literal || literal->value.safeGet<String>().empty())
+            throw Exception("Argument for REGEXP in Merge ENGINE should be a non empty String Literal", ErrorCodes::BAD_ARGUMENTS);
+
+        return {true, func->arguments->children[0]};
+    }
+
+    auto ast = evaluateConstantExpressionForDatabaseName(node, context_);
+    return {false, ast};
+}
+
+
 void registerStorageMerge(StorageFactory & factory)
 {
     factory.registerStorage("Merge", [](const StorageFactory::Arguments & args)
@@ -748,10 +781,11 @@ void registerStorageMerge(StorageFactory & factory)
                 " - name of source database and regexp for table names.",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        auto [is_regexp, database_ast] = evaluateDatabaseNameForMergeEngine(engine_args[0], args.getLocalContext());
+        auto [is_regexp, database_ast] = StorageMerge::evaluateDatabaseName(engine_args[0], args.getLocalContext());
 
         if (!is_regexp)
             engine_args[0] = database_ast;
+
         String source_database_name_or_regexp = database_ast->as<ASTLiteral &>().value.safeGet<String>();
 
         engine_args[1] = evaluateConstantExpressionAsLiteral(engine_args[1], args.getLocalContext());
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index 20460e95156..52a91747433 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Common/OptimizedRegularExpression.h>
 #include <Storages/IStorage.h>
@@ -43,17 +43,20 @@ public:
 
     /// you need to add and remove columns in the sub-tables manually
     /// the structure of sub-tables is not checked
-    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & table_lock_holder) override;
 
     bool mayBenefitFromIndexForIn(
         const ASTPtr & left_in_operand, ContextPtr query_context, const StorageMetadataPtr & metadata_snapshot) const override;
 
+    /// Evaluate database name or regexp for StorageMerge and TableFunction merge
+    static std::tuple<bool /* is_regexp */, ASTPtr> evaluateDatabaseName(const ASTPtr & node, ContextPtr context);
+
 private:
-    using DbToTableSetMap = std::map<String, std::set<String>>;
+    using DBToTableSetMap = std::map<String, std::set<String>>;
 
     std::optional<OptimizedRegularExpression> source_database_regexp;
     std::optional<OptimizedRegularExpression> source_table_regexp;
-    std::optional<DbToTableSetMap> source_databases_and_tables;
+    std::optional<DBToTableSetMap> source_databases_and_tables;
 
     String source_database_name_or_regexp;
     bool database_is_regexp = false;
@@ -86,7 +89,7 @@ protected:
         const String & comment,
         const String & source_database_name_or_regexp_,
         bool database_is_regexp_,
-        const DbToTableSetMap & source_databases_and_tables_,
+        const DBToTableSetMap & source_databases_and_tables_,
         ContextPtr context_);
 
     StorageMerge(
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 4f0046eecba..7322d57fed2 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -1,5 +1,7 @@
 #include "StorageMergeTree.h"
 
+#include <optional>
+
 #include <Databases/IDatabase.h>
 #include <Common/escapeForFileName.h>
 #include <Common/typeid_cast.h>
@@ -8,6 +10,7 @@
 #include <Interpreters/PartLog.h>
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/Context.h>
+#include <IO/copyData.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
@@ -20,22 +23,19 @@
 #include <Storages/PartitionCommands.h>
 #include <Storages/MergeTree/MergeTreeSink.h>
 #include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
+#include <Storages/MergeTree/MergePlainMergeTreeTask.h>
 #include <Storages/MergeTree/PartitionPruner.h>
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/checkDataPart.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <optional>
-
-namespace CurrentMetrics
-{
-    extern const Metric BackgroundPoolTask;
-}
 
 namespace DB
 {
 
+
 namespace ErrorCodes
 {
     extern const int NOT_IMPLEMENTED;
@@ -80,10 +80,9 @@ StorageMergeTree::StorageMergeTree(
         attach)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
-    , background_executor(*this, getContext())
-    , background_moves_executor(*this, getContext())
-
+    , merger_mutator(*this,
+        getContext()->getSettingsRef().background_merges_mutations_concurrency_ratio *
+        getContext()->getSettingsRef().background_pool_size)
 {
     loadDataParts(has_force_restore_data_flag);
 
@@ -106,14 +105,19 @@ void StorageMergeTree::startup()
 
     /// Temporary directories contain incomplete results of merges (after forced restart)
     ///  and don't allow to reinitialize them, so delete each of them immediately
-    clearOldTemporaryDirectories(0);
+    clearOldTemporaryDirectories(merger_mutator, 0);
 
     /// NOTE background task will also do the above cleanups periodically.
-    time_after_previous_cleanup.restart();
+    time_after_previous_cleanup_parts.restart();
+    time_after_previous_cleanup_temporary_directories.restart();
+
+    /// Do not schedule any background jobs if current storage has static data files.
+    if (isStaticStorage())
+        return;
 
     try
     {
-        background_executor.start();
+        background_operations_assignee.start();
         startBackgroundMovesIfNeeded();
     }
     catch (...)
@@ -151,8 +155,8 @@ void StorageMergeTree::shutdown()
     merger_mutator.merges_blocker.cancelForever();
     parts_mover.moves_blocker.cancelForever();
 
-    background_executor.finish();
-    background_moves_executor.finish();
+    background_operations_assignee.finish();
+    background_moves_assignee.finish();
 
     try
     {
@@ -240,6 +244,9 @@ void StorageMergeTree::checkTableCanBeDropped() const
 void StorageMergeTree::drop()
 {
     shutdown();
+    /// In case there is read-only disk we cannot allow to call dropAllData(), but dropping tables is allowed.
+    if (isStaticStorage())
+        return;
     dropAllData();
 }
 
@@ -264,7 +271,7 @@ void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, Cont
 void StorageMergeTree::alter(
     const AlterCommands & commands,
     ContextPtr local_context,
-    TableLockHolder & table_lock_holder)
+    AlterLockHolder & table_lock_holder)
 {
     auto table_id = getStorageID();
     auto old_storage_settings = getSettings();
@@ -321,8 +328,8 @@ void StorageMergeTree::alter(
 
 
 /// While exists, marks parts as 'currently_merging_mutating_parts' and reserves free space on filesystem.
-StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
-    FutureMergedMutatedPart & future_part_,
+CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
+    FutureMergedMutatedPartPtr future_part_,
     size_t total_size,
     StorageMergeTree & storage_,
     const StorageMetadataPtr & metadata_snapshot,
@@ -333,12 +340,12 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
 
     /// if we mutate part, than we should reserve space on the same disk, because mutations possible can create hardlinks
     if (is_mutation)
-        reserved_space = storage.tryReserveSpace(total_size, future_part_.parts[0]->volume);
+        reserved_space = storage.tryReserveSpace(total_size, future_part->parts[0]->volume);
     else
     {
         IMergeTreeDataPart::TTLInfos ttl_infos;
         size_t max_volume_index = 0;
-        for (auto & part_ptr : future_part_.parts)
+        for (auto & part_ptr : future_part->parts)
         {
             ttl_infos.update(part_ptr->ttl_infos);
             max_volume_index = std::max(max_volume_index, storage.getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
@@ -348,9 +355,9 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
             metadata_snapshot,
             total_size,
             max_volume_index,
-            future_part.name,
-            future_part.part_info,
-            future_part.parts,
+            future_part->name,
+            future_part->part_info,
+            future_part->parts,
             &tagger,
             &ttl_infos);
 
@@ -362,26 +369,26 @@ StorageMergeTree::CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
     if (!reserved_space)
     {
         if (is_mutation)
-            throw Exception("Not enough space for mutating part '" + future_part.parts[0]->name + "'", ErrorCodes::NOT_ENOUGH_SPACE);
+            throw Exception("Not enough space for mutating part '" + future_part->parts[0]->name + "'", ErrorCodes::NOT_ENOUGH_SPACE);
         else
             throw Exception("Not enough space for merging parts", ErrorCodes::NOT_ENOUGH_SPACE);
     }
 
-    future_part_.updatePath(storage, reserved_space);
+    future_part->updatePath(storage, reserved_space.get());
 
-    for (const auto & part : future_part.parts)
+    for (const auto & part : future_part->parts)
     {
         if (storage.currently_merging_mutating_parts.count(part))
             throw Exception("Tagging already tagged part " + part->name + ". This is a bug.", ErrorCodes::LOGICAL_ERROR);
     }
-    storage.currently_merging_mutating_parts.insert(future_part.parts.begin(), future_part.parts.end());
+    storage.currently_merging_mutating_parts.insert(future_part->parts.begin(), future_part->parts.end());
 }
 
-StorageMergeTree::CurrentlyMergingPartsTagger::~CurrentlyMergingPartsTagger()
+CurrentlyMergingPartsTagger::~CurrentlyMergingPartsTagger()
 {
     std::lock_guard lock(storage.currently_processing_in_background_mutex);
 
-    for (const auto & part : future_part.parts)
+    for (const auto & part : future_part->parts)
     {
         if (!storage.currently_merging_mutating_parts.count(part))
             std::terminate();
@@ -409,17 +416,17 @@ Int64 StorageMergeTree::startMutation(const MutationCommands & commands, String
 
         LOG_INFO(log, "Added mutation: {}", mutation_file_name);
     }
-    background_executor.triggerTask();
+    background_operations_assignee.trigger();
     return version;
 }
 
 
-void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPart result_part, bool is_successful, const String & exception_message)
+void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPartPtr result_part, bool is_successful, const String & exception_message)
 {
     /// Update the information about failed parts in the system.mutations table.
 
-    Int64 sources_data_version = result_part.parts.at(0)->info.getDataVersion();
-    Int64 result_data_version = result_part.part_info.getDataVersion();
+    Int64 sources_data_version = result_part->parts.at(0)->info.getDataVersion();
+    Int64 result_data_version = result_part->part_info.getDataVersion();
     if (sources_data_version != result_data_version)
     {
         std::lock_guard lock(currently_processing_in_background_mutex);
@@ -431,7 +438,7 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPart resul
             MergeTreeMutationEntry & entry = it->second;
             if (is_successful)
             {
-                if (!entry.latest_failed_part.empty() && result_part.part_info.contains(entry.latest_failed_part_info))
+                if (!entry.latest_failed_part.empty() && result_part->part_info.contains(entry.latest_failed_part_info))
                 {
                     entry.latest_failed_part.clear();
                     entry.latest_failed_part_info = MergeTreePartInfo();
@@ -441,8 +448,8 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPart resul
             }
             else
             {
-                entry.latest_failed_part = result_part.parts.at(0)->name;
-                entry.latest_failed_part_info = result_part.parts.at(0)->info;
+                entry.latest_failed_part = result_part->parts.at(0)->name;
+                entry.latest_failed_part_info = result_part->parts.at(0)->info;
                 entry.latest_fail_time = time(nullptr);
                 entry.latest_fail_reason = exception_message;
             }
@@ -635,7 +642,7 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
     }
 
     /// Maybe there is another mutation that was blocked by the killed one. Try to execute it immediately.
-    background_executor.triggerTask();
+    background_operations_assignee.trigger();
 
     return CancellationCode::CancelSent;
 }
@@ -676,7 +683,7 @@ void StorageMergeTree::loadMutations()
         increment.value = std::max(Int64(increment.value.load()), current_mutations_by_version.rbegin()->first);
 }
 
-std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMerge(
+std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMerge(
     const StorageMetadataPtr & metadata_snapshot,
     bool aggressive,
     const String & partition_id,
@@ -689,10 +696,10 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
 {
     auto data_settings = getSettings();
 
-    FutureMergedMutatedPart future_part;
+    auto future_part = std::make_shared<FutureMergedMutatedPart>();
 
     if (storage_settings.get()->assign_part_uuids)
-        future_part.uuid = UUIDHelpers::generateV4();
+        future_part->uuid = UUIDHelpers::generateV4();
 
     /// You must call destructor with unlocked `currently_processing_in_background_mutex`.
     CurrentlyMergingPartsTaggerPtr merging_tagger;
@@ -782,11 +789,11 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
     }
 
     /// Account TTL merge here to avoid exceeding the max_number_of_merges_with_ttl_in_pool limit
-    if (isTTLMergeType(future_part.merge_type))
+    if (isTTLMergeType(future_part->merge_type))
         getContext()->getMergeList().bookMergeWithTTL();
 
-    merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part.parts), *this, metadata_snapshot, false);
-    return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(merging_tagger), MutationCommands{});
+    merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part->parts), *this, metadata_snapshot, false);
+    return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(merging_tagger), MutationCommands::create());
 }
 
 bool StorageMergeTree::merge(
@@ -829,76 +836,33 @@ bool StorageMergeTree::merge(
     if (!merge_mutate_entry)
         return false;
 
-    return mergeSelectedParts(metadata_snapshot, deduplicate, deduplicate_by_columns, *merge_mutate_entry, table_lock_holder);
-}
 
-bool StorageMergeTree::mergeSelectedParts(
-    const StorageMetadataPtr & metadata_snapshot,
-    bool deduplicate,
-    const Names & deduplicate_by_columns,
-    MergeMutateSelectedEntry & merge_mutate_entry,
-    TableLockHolder & table_lock_holder)
-{
-    auto & future_part = merge_mutate_entry.future_part;
-    Stopwatch stopwatch;
-    MutableDataPartPtr new_part;
+    /// Copying a vector of columns `deduplicate bu columns.
+    auto task = std::make_shared<MergePlainMergeTreeTask>(
+        *this, metadata_snapshot, deduplicate, deduplicate_by_columns, merge_mutate_entry, table_lock_holder, [](bool){});
 
-    auto merge_list_entry = getContext()->getMergeList().insert(getStorageID(), future_part);
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MERGE_PARTS,
-            execution_status,
-            stopwatch.elapsed(),
-            future_part.name,
-            new_part,
-            future_part.parts,
-            merge_list_entry.get());
-    };
-
-    try
-    {
-        new_part = merger_mutator.mergePartsToTemporaryPart(
-            future_part,
-            metadata_snapshot,
-            *(merge_list_entry),
-            table_lock_holder,
-            time(nullptr),
-            getContext(),
-            merge_mutate_entry.tagger->reserved_space,
-            deduplicate,
-            deduplicate_by_columns,
-            merging_params);
-
-        merger_mutator.renameMergedTemporaryPart(new_part, future_part.parts, nullptr);
-        write_part_log({});
-    }
-    catch (...)
-    {
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
+    executeHere(task);
 
     return true;
 }
 
+
 bool StorageMergeTree::partIsAssignedToBackgroundOperation(const DataPartPtr & part) const
 {
     std::lock_guard background_processing_lock(currently_processing_in_background_mutex);
     return currently_merging_mutating_parts.count(part);
 }
 
-std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMutate(
+std::shared_ptr<MergeMutateSelectedEntry> StorageMergeTree::selectPartsToMutate(
     const StorageMetadataPtr & metadata_snapshot, String * /* disable_reason */, TableLockHolder & /* table_lock_holder */)
 {
     size_t max_ast_elements = getContext()->getSettingsRef().max_expanded_ast_elements;
 
-    FutureMergedMutatedPart future_part;
+    auto future_part = std::make_shared<FutureMergedMutatedPart>();
     if (storage_settings.get()->assign_part_uuids)
-        future_part.uuid = UUIDHelpers::generateV4();
+        future_part->uuid = UUIDHelpers::generateV4();
 
-    MutationCommands commands;
+    auto commands = MutationCommands::create();
 
     CurrentlyMergingPartsTaggerPtr tagger;
 
@@ -958,83 +922,63 @@ std::shared_ptr<StorageMergeTree::MergeMutateSelectedEntry> StorageMergeTree::se
 
             if (!commands_for_size_validation.empty())
             {
-                MutationsInterpreter interpreter(
-                    shared_from_this(), metadata_snapshot, commands_for_size_validation, getContext(), false);
-                commands_size += interpreter.evaluateCommandsSize();
+                try
+                {
+                    auto fake_query_context = Context::createCopy(getContext());
+                    fake_query_context->makeQueryContext();
+                    fake_query_context->setCurrentQueryId("");
+                    MutationsInterpreter interpreter(
+                        shared_from_this(), metadata_snapshot, commands_for_size_validation, fake_query_context, false);
+                    commands_size += interpreter.evaluateCommandsSize();
+                }
+                catch (...)
+                {
+                    tryLogCurrentException(log);
+                    MergeTreeMutationEntry & entry = it->second;
+                    entry.latest_fail_time = time(nullptr);
+                    entry.latest_fail_reason = getCurrentExceptionMessage(false);
+                    continue;
+                }
             }
 
             if (current_ast_elements + commands_size >= max_ast_elements)
                 break;
 
             current_ast_elements += commands_size;
-            commands.insert(commands.end(), it->second.commands.begin(), it->second.commands.end());
+            commands->insert(commands->end(), it->second.commands.begin(), it->second.commands.end());
         }
 
-        auto new_part_info = part->info;
-        new_part_info.mutation = current_mutations_by_version.rbegin()->first;
+        if (!commands->empty())
+        {
+            auto new_part_info = part->info;
+            new_part_info.mutation = current_mutations_by_version.rbegin()->first;
 
-        future_part.parts.push_back(part);
-        future_part.part_info = new_part_info;
-        future_part.name = part->getNewName(new_part_info);
-        future_part.type = part->getType();
+            future_part->parts.push_back(part);
+            future_part->part_info = new_part_info;
+            future_part->name = part->getNewName(new_part_info);
+            future_part->type = part->getType();
 
-        tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}), *this, metadata_snapshot, true);
-        return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(tagger), commands);
+            tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}), *this, metadata_snapshot, true);
+            return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(tagger), commands);
+        }
     }
+
     return {};
 }
 
-bool StorageMergeTree::mutateSelectedPart(const StorageMetadataPtr & metadata_snapshot, MergeMutateSelectedEntry & merge_mutate_entry, TableLockHolder & table_lock_holder)
-{
-    auto & future_part = merge_mutate_entry.future_part;
-
-    auto merge_list_entry = getContext()->getMergeList().insert(getStorageID(), future_part);
-    Stopwatch stopwatch;
-    MutableDataPartPtr new_part;
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MUTATE_PART,
-            execution_status,
-            stopwatch.elapsed(),
-            future_part.name,
-            new_part,
-            future_part.parts,
-            merge_list_entry.get());
-    };
-
-    try
-    {
-        new_part = merger_mutator.mutatePartToTemporaryPart(
-            future_part, metadata_snapshot, merge_mutate_entry.commands, *(merge_list_entry),
-            time(nullptr), getContext(), merge_mutate_entry.tagger->reserved_space, table_lock_holder);
-
-        renameTempPartAndReplace(new_part);
-
-        updateMutationEntriesErrors(future_part, true, "");
-        write_part_log({});
-    }
-    catch (...)
-    {
-        updateMutationEntriesErrors(future_part, false, getCurrentExceptionMessage(false));
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
-
-    return true;
-}
-
-bool StorageMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & executor) //-V657
+bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) //-V657
 {
     if (shutdown_called)
         return false;
 
+    assert(!isStaticStorage());
+
     auto metadata_snapshot = getInMemoryMetadataPtr();
     std::shared_ptr<MergeMutateSelectedEntry> merge_entry, mutate_entry;
 
     auto share_lock = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
 
+    bool has_mutations = false;
     {
         std::unique_lock lock(currently_processing_in_background_mutex);
         if (merger_mutator.merges_blocker.isCancelled())
@@ -1042,41 +986,62 @@ bool StorageMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & execut
 
         merge_entry = selectPartsToMerge(metadata_snapshot, false, {}, false, nullptr, share_lock, lock);
         if (!merge_entry)
+        {
             mutate_entry = selectPartsToMutate(metadata_snapshot, nullptr, share_lock);
+            has_mutations = !current_mutations_by_version.empty();
+        }
     }
 
     if (merge_entry)
     {
-        executor.execute({[this, metadata_snapshot, merge_entry, share_lock] () mutable
-        {
-            return mergeSelectedParts(metadata_snapshot, false, {}, *merge_entry, share_lock);
-        }, PoolType::MERGE_MUTATE});
+        auto task = std::make_shared<MergePlainMergeTreeTask>(*this, metadata_snapshot, false, Names{}, merge_entry, share_lock, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
         return true;
     }
     if (mutate_entry)
     {
-        executor.execute({[this, metadata_snapshot, merge_entry, mutate_entry, share_lock] () mutable
-        {
-            return mutateSelectedPart(metadata_snapshot, *mutate_entry, share_lock);
-        }, PoolType::MERGE_MUTATE});
+        auto task = std::make_shared<MutatePlainMergeTreeTask>(*this, metadata_snapshot, mutate_entry, share_lock, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
         return true;
     }
-    else if (auto cmp_lock = time_after_previous_cleanup.compareAndRestartDeferred(1))
+    if (has_mutations)
     {
-        executor.execute({[this, share_lock] ()
-        {
-            /// All use relative_data_path which changes during rename
-            /// so execute under share lock.
-            clearOldPartsFromFilesystem();
-            clearOldTemporaryDirectories(getSettings()->temporary_directories_lifetime.totalSeconds());
-            clearOldWriteAheadLogs();
-            clearOldMutations();
-            clearEmptyParts();
-            return true;
-        }, PoolType::MERGE_MUTATE});
-        return true;
+        /// Notify in case of errors if no mutation was successfully selected.
+        /// Otherwise, notification will occur after any of mutations complete.
+        std::lock_guard lock(mutation_wait_mutex);
+        mutation_wait_event.notify_all();
     }
-    return false;
+
+    bool scheduled = false;
+    if (time_after_previous_cleanup_temporary_directories.compareAndRestartDeferred(
+            getContext()->getSettingsRef().merge_tree_clear_old_temporary_directories_interval_seconds))
+    {
+        assignee.scheduleCommonTask(ExecutableLambdaAdapter::create(
+            [this, share_lock] ()
+            {
+                clearOldTemporaryDirectories(merger_mutator, getSettings()->temporary_directories_lifetime.totalSeconds());
+                return true;
+            }, common_assignee_trigger, getStorageID()));
+        scheduled = true;
+    }
+    if (auto lock = time_after_previous_cleanup_parts.compareAndRestartDeferred(
+            getContext()->getSettingsRef().merge_tree_clear_old_parts_interval_seconds))
+    {
+        assignee.scheduleCommonTask(ExecutableLambdaAdapter::create(
+            [this, share_lock] ()
+            {
+                /// All use relative_data_path which changes during rename
+                /// so execute under share lock.
+                clearOldPartsFromFilesystem();
+                clearOldWriteAheadLogs();
+                clearOldMutations();
+                clearEmptyParts();
+                return true;
+            }, common_assignee_trigger, getStorageID()));
+        scheduled = true;
+    }
+
+    return scheduled;
 }
 
 Int64 StorageMergeTree::getCurrentMutationVersion(
@@ -1214,6 +1179,7 @@ bool StorageMergeTree::optimize(
 
 ActionLock StorageMergeTree::stopMergesAndWait()
 {
+    /// TODO allow to stop merges in specific partition only (like it's done in ReplicatedMergeTree)
     std::unique_lock lock(currently_processing_in_background_mutex);
 
     /// Asks to complete merges and does not allow them to start.
@@ -1367,6 +1333,7 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
 {
     auto lock1 = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto lock2 = source_table->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
+    auto merges_blocker = stopMergesAndWait();
     auto source_metadata_snapshot = source_table->getInMemoryMetadataPtr();
     auto my_metadata_snapshot = getInMemoryMetadataPtr();
 
@@ -1440,6 +1407,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
 {
     auto lock1 = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto lock2 = dest_table->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
+    auto merges_blocker = stopMergesAndWait();
 
     auto dest_table_storage = std::dynamic_pointer_cast<StorageMergeTree>(dest_table);
     if (!dest_table_storage)
@@ -1500,7 +1468,6 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
             transaction.commit(&lock);
         }
 
-        clearOldMutations(true);
         clearOldPartsFromFilesystem();
 
         PartLog::addNewParts(getContext(), dst_parts, watch.elapsed());
@@ -1527,9 +1494,9 @@ ActionLock StorageMergeTree::getActionLock(StorageActionBlockType action_type)
 void StorageMergeTree::onActionLockRemove(StorageActionBlockType action_type)
 {
     if (action_type == ActionLocks::PartsMerge ||  action_type == ActionLocks::PartsTTLMerge)
-        background_executor.triggerTask();
+        background_operations_assignee.trigger();
     else if (action_type == ActionLocks::PartsMove)
-        background_moves_executor.triggerTask();
+        background_moves_assignee.trigger();
 }
 
 CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_context)
@@ -1588,6 +1555,12 @@ CheckResults StorageMergeTree::checkData(const ASTPtr & query, ContextPtr local_
 }
 
 
+RestoreDataTasks StorageMergeTree::restoreFromBackup(const BackupPtr & backup, const String & data_path_in_backup, const ASTs & partitions, ContextMutablePtr local_context)
+{
+    return restoreDataPartsFromBackup(backup, data_path_in_backup, getPartitionIDsFromQuery(partitions, local_context), &increment);
+}
+
+
 MutationCommands StorageMergeTree::getFirstAlterMutationCommandsForPart(const DataPartPtr & part) const
 {
     std::lock_guard lock(currently_processing_in_background_mutex);
@@ -1601,7 +1574,7 @@ MutationCommands StorageMergeTree::getFirstAlterMutationCommandsForPart(const Da
 void StorageMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
-        background_moves_executor.start();
+        background_moves_assignee.start();
 }
 
 std::unique_ptr<MergeTreeSettings> StorageMergeTree::getDefaultSettings() const
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index c762fd38ab1..8ed4b707b34 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/Names.h>
 #include <Storages/AlterCommands.h>
@@ -13,10 +13,12 @@
 #include <Storages/MergeTree/MergeTreeMutationEntry.h>
 #include <Storages/MergeTree/MergeTreeMutationStatus.h>
 #include <Storages/MergeTree/MergeTreeDeduplicationLog.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/MergePlainMergeTreeTask.h>
+#include <Storages/MergeTree/MutatePlainMergeTreeTask.h>
 
 #include <Disks/StoragePolicy.h>
 #include <Common/SimpleIncrement.h>
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
 
 
 namespace DB
@@ -84,7 +86,7 @@ public:
     void drop() override;
     void truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &) override;
 
-    void alter(const AlterCommands & commands, ContextPtr context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & commands, ContextPtr context, AlterLockHolder & table_lock_holder) override;
 
     void checkTableCanBeDropped() const override;
 
@@ -94,9 +96,12 @@ public:
 
     CheckResults checkData(const ASTPtr & query, ContextPtr context) override;
 
-    bool scheduleDataProcessingJob(IBackgroundJobExecutor & executor) override;
+    RestoreDataTasks restoreFromBackup(const BackupPtr & backup, const String & data_path_in_backup, const ASTs & partitions, ContextMutablePtr context) override;
+
+    bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
 
     MergeTreeDeduplicationLog * getDeduplicationLog() { return deduplication_log.get(); }
+
 private:
 
     /// Mutex and condvar for synchronous mutations wait
@@ -106,16 +111,16 @@ private:
     MergeTreeDataSelectExecutor reader;
     MergeTreeDataWriter writer;
     MergeTreeDataMergerMutator merger_mutator;
-    BackgroundJobsExecutor background_executor;
-    BackgroundMovesExecutor background_moves_executor;
 
     std::unique_ptr<MergeTreeDeduplicationLog> deduplication_log;
 
     /// For block numbers.
     SimpleIncrement increment;
 
-    /// For clearOldParts, clearOldTemporaryDirectories.
-    AtomicStopwatch time_after_previous_cleanup;
+    /// For clearOldParts
+    AtomicStopwatch time_after_previous_cleanup_parts;
+    /// For clearOldTemporaryDirectories.
+    AtomicStopwatch time_after_previous_cleanup_temporary_directories;
 
     /// Mutex for parts currently processing in background
     /// merging (also with TTL), mutating or moving.
@@ -132,6 +137,7 @@ private:
 
     std::atomic<bool> shutdown_called {false};
 
+private:
     void loadMutations();
 
     /// Load and initialize deduplication logs. Even if deduplication setting
@@ -156,38 +162,8 @@ private:
     /// Wait until mutation with version will finish mutation for all parts
     void waitForMutation(Int64 version, const String & file_name);
 
-    struct CurrentlyMergingPartsTagger
-    {
-        FutureMergedMutatedPart future_part;
-        ReservationPtr reserved_space;
-        StorageMergeTree & storage;
-        // Optional tagger to maintain volatile parts for the JBOD balancer
-        std::optional<CurrentlySubmergingEmergingTagger> tagger;
-
-        CurrentlyMergingPartsTagger(
-            FutureMergedMutatedPart & future_part_,
-            size_t total_size,
-            StorageMergeTree & storage_,
-            const StorageMetadataPtr & metadata_snapshot,
-            bool is_mutation);
-
-        ~CurrentlyMergingPartsTagger();
-    };
-
-    using CurrentlyMergingPartsTaggerPtr = std::unique_ptr<CurrentlyMergingPartsTagger>;
     friend struct CurrentlyMergingPartsTagger;
 
-    struct MergeMutateSelectedEntry
-    {
-        FutureMergedMutatedPart future_part;
-        CurrentlyMergingPartsTaggerPtr tagger;
-        MutationCommands commands;
-        MergeMutateSelectedEntry(const FutureMergedMutatedPart & future_part_, CurrentlyMergingPartsTaggerPtr && tagger_, const MutationCommands & commands_)
-            : future_part(future_part_)
-            , tagger(std::move(tagger_))
-            , commands(commands_)
-        {}
-    };
 
     std::shared_ptr<MergeMutateSelectedEntry> selectPartsToMerge(
         const StorageMetadataPtr & metadata_snapshot,
@@ -200,10 +176,8 @@ private:
         bool optimize_skip_merged_partitions = false,
         SelectPartsDecision * select_decision_out = nullptr);
 
-    bool mergeSelectedParts(const StorageMetadataPtr & metadata_snapshot, bool deduplicate, const Names & deduplicate_by_columns, MergeMutateSelectedEntry & entry, TableLockHolder & table_lock_holder);
 
     std::shared_ptr<MergeMutateSelectedEntry> selectPartsToMutate(const StorageMetadataPtr & metadata_snapshot, String * disable_reason, TableLockHolder & table_lock_holder);
-    bool mutateSelectedPart(const StorageMetadataPtr & metadata_snapshot, MergeMutateSelectedEntry & entry, TableLockHolder & table_lock_holder);
 
     Int64 getCurrentMutationVersion(
         const DataPartPtr & part,
@@ -224,7 +198,7 @@ private:
     /// Update mutation entries after part mutation execution. May reset old
     /// errors if mutation was successful. Otherwise update last_failed* fields
     /// in mutation entries.
-    void updateMutationEntriesErrors(FutureMergedMutatedPart result_part, bool is_successful, const String & exception_message);
+    void updateMutationEntriesErrors(FutureMergedMutatedPartPtr result_part, bool is_successful, const String & exception_message);
 
     /// Return empty optional if mutation was killed. Otherwise return partially
     /// filled mutation status with information about error (latest_fail*) and
@@ -241,6 +215,8 @@ private:
     friend class MergeTreeProjectionBlockOutputStream;
     friend class MergeTreeSink;
     friend class MergeTreeData;
+    friend class MergePlainMergeTreeTask;
+    friend class MutatePlainMergeTreeTask;
 
 
 protected:
diff --git a/src/Storages/StorageMongoDB.cpp b/src/Storages/StorageMongoDB.cpp
index 1fd58a293dc..9b48f3fc3b3 100644
--- a/src/Storages/StorageMongoDB.cpp
+++ b/src/Storages/StorageMongoDB.cpp
@@ -9,13 +9,11 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Common/parseAddress.h>
 #include <IO/Operators.h>
 #include <Parsers/ASTLiteral.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Processors/Pipe.h>
-#include <DataStreams/MongoDBBlockInputStream.h>
+#include <QueryPipeline/Pipe.h>
+#include <Processors/Transforms/MongoDBSource.h>
 
 namespace DB
 {
@@ -24,6 +22,7 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int MONGODB_CANNOT_AUTHENTICATE;
+    extern const int BAD_ARGUMENTS;
 }
 
 StorageMongoDB::StorageMongoDB(
@@ -99,46 +98,75 @@ Pipe StorageMongoDB::read(
         sample_block.insert({ column_data.type, column_data.name });
     }
 
-    return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<MongoDBBlockInputStream>(connection, createCursor(database_name, collection_name, sample_block), sample_block, max_block_size, true)));
+    return Pipe(std::make_shared<MongoDBSource>(connection, createCursor(database_name, collection_name, sample_block), sample_block, max_block_size, true));
 }
 
-void registerStorageMongoDB(StorageFactory & factory)
-{
-    factory.registerStorage("MongoDB", [](const StorageFactory::Arguments & args)
-    {
-        ASTs & engine_args = args.engine_args;
 
+StorageMongoDBConfiguration StorageMongoDB::getConfiguration(ASTs engine_args, ContextPtr context)
+{
+    StorageMongoDBConfiguration configuration;
+    if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "collection")
+                configuration.collection = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else if (arg_name == "options")
+                configuration.options = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected one of:"
+                        "host, port, username, password, database, table, options.", arg_name);
+        }
+    }
+    else
+    {
         if (engine_args.size() < 5 || engine_args.size() > 6)
             throw Exception(
                 "Storage MongoDB requires from 5 to 6 parameters: MongoDB('host:port', database, collection, 'user', 'password' [, 'options']).",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
 
         /// 27017 is the default MongoDB port.
         auto parsed_host_port = parseAddress(engine_args[0]->as<ASTLiteral &>().value.safeGet<String>(), 27017);
 
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & collection = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-
-        String options;
+        configuration.host = parsed_host_port.first;
+        configuration.port = parsed_host_port.second;
+        configuration.database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.collection = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
 
         if (engine_args.size() >= 6)
-            options = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.options = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+
+    }
+
+    return configuration;
+}
+
+
+void registerStorageMongoDB(StorageFactory & factory)
+{
+    factory.registerStorage("MongoDB", [](const StorageFactory::Arguments & args)
+    {
+        auto configuration = StorageMongoDB::getConfiguration(args.engine_args, args.getLocalContext());
 
         return StorageMongoDB::create(
             args.table_id,
-            parsed_host_port.first,
-            parsed_host_port.second,
-            remote_database,
-            collection,
-            username,
-            password,
-            options,
+            configuration.host,
+            configuration.port,
+            configuration.database,
+            configuration.collection,
+            configuration.username,
+            configuration.password,
+            configuration.options,
             args.columns,
             args.constraints,
             args.comment);
diff --git a/src/Storages/StorageMongoDB.h b/src/Storages/StorageMongoDB.h
index 3014b88a9ca..00c6863ab63 100644
--- a/src/Storages/StorageMongoDB.h
+++ b/src/Storages/StorageMongoDB.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 #include <Poco/MongoDB/Connection.h>
 
@@ -42,6 +43,8 @@ public:
         size_t max_block_size,
         unsigned num_streams) override;
 
+    static StorageMongoDBConfiguration getConfiguration(ASTs engine_args, ContextPtr context);
+
 private:
     void connectIfNotConnected();
 
diff --git a/src/Storages/StorageMongoDBSocketFactory.cpp b/src/Storages/StorageMongoDBSocketFactory.cpp
index 9a2b120e9ed..f21e8746eb9 100644
--- a/src/Storages/StorageMongoDBSocketFactory.cpp
+++ b/src/Storages/StorageMongoDBSocketFactory.cpp
@@ -2,9 +2,7 @@
 
 #include <Common/Exception.h>
 
-#if !defined(ARCADIA_BUILD)
-#   include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 #include <Poco/Net/IPAddress.h>
 #include <Poco/Net/SocketAddress.h>
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index 99a930f37c4..0b6095e033b 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -4,23 +4,23 @@
 
 #include <Storages/StorageFactory.h>
 #include <Storages/transformQueryForExternalDatabase.h>
-#include <Formats/MySQLBlockInputStream.h>
+#include <Processors/Sources/MySQLSource.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Core/Settings.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Formats/FormatFactory.h>
+#include <Processors/Formats/IOutputFormat.h>
 #include <Common/parseAddress.h>
 #include <IO/Operators.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <mysqlxx/Transaction.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Sinks/SinkToStorage.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Common/parseRemoteDescription.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
@@ -62,6 +62,7 @@ StorageMySQL::StorageMySQL(
     , on_duplicate_clause{on_duplicate_clause_}
     , mysql_settings(mysql_settings_)
     , pool(std::make_shared<mysqlxx::PoolWithFailover>(pool_))
+    , log(&Poco::Logger::get("StorageMySQL (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -88,6 +89,7 @@ Pipe StorageMySQL::read(
         remote_database_name,
         remote_table_name,
         context_);
+    LOG_TRACE(log, "Query: {}", query);
 
     Block sample_block;
     for (const String & column_name : column_names_)
@@ -104,8 +106,7 @@ Pipe StorageMySQL::read(
 
     StreamSettings mysql_input_stream_settings(context_->getSettingsRef(),
         mysql_settings.connection_auto_close);
-    return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<MySQLWithFailoverBlockInputStream>(pool, query, sample_block, mysql_input_stream_settings)));
+    return Pipe(std::make_shared<MySQLWithFailoverSource>(pool, query, sample_block, mysql_input_stream_settings));
 }
 
 
@@ -133,7 +134,7 @@ public:
 
     void consume(Chunk chunk) override
     {
-        auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+        auto block = getHeader().cloneWithColumns(chunk.detachColumns());
         auto blocks = splitBlocks(block, max_batch_rows);
         mysqlxx::Transaction trans(entry);
         try
@@ -160,7 +161,7 @@ public:
         sqlbuf << backQuoteMySQL(remote_table_name);
         sqlbuf << " (" << dumpNamesWithBackQuote(block) << ") VALUES ";
 
-        auto writer = FormatFactory::instance().getOutputStream("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
+        auto writer = FormatFactory::instance().getOutputFormat("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
         writer->write(block);
 
         if (!storage.on_duplicate_clause.empty())
@@ -235,64 +236,91 @@ SinkToStoragePtr StorageMySQL::write(const ASTPtr & /*query*/, const StorageMeta
         local_context->getSettingsRef().mysql_max_rows_to_insert);
 }
 
-void registerStorageMySQL(StorageFactory & factory)
-{
-    factory.registerStorage("MySQL", [](const StorageFactory::Arguments & args)
-    {
-        ASTs & engine_args = args.engine_args;
 
+StorageMySQLConfiguration StorageMySQL::getConfiguration(ASTs engine_args, ContextPtr context_)
+{
+    StorageMySQLConfiguration configuration;
+
+    if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context_))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+        configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "replace_query")
+                configuration.replace_query = arg_value->as<ASTLiteral>()->value.safeGet<bool>();
+            else if (arg_name == "on_duplicate_clause")
+                configuration.on_duplicate_clause = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected one of:"
+                        "host, port, username, password, database, table, replace_query, on_duplicate_clause.", arg_name);
+        }
+    }
+    else
+    {
         if (engine_args.size() < 5 || engine_args.size() > 7)
             throw Exception(
                 "Storage MySQL requires 5-7 parameters: MySQL('host:port' (or 'addresses_pattern'), database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context_);
 
-        /// 3306 is the default MySQL port.
-        const String & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-        size_t max_addresses = args.getContext()->getSettingsRef().glob_expansion_max_elements;
+        const auto & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t max_addresses = context_->getSettingsRef().glob_expansion_max_elements;
 
-        /// TODO: move some arguments from the arguments to the SETTINGS.
-        MySQLSettings mysql_settings;
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
+        configuration.database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (engine_args.size() >= 6)
+            configuration.replace_query = engine_args[5]->as<ASTLiteral &>().value.safeGet<UInt64>();
+        if (engine_args.size() == 7)
+            configuration.on_duplicate_clause = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    if (configuration.replace_query && !configuration.on_duplicate_clause.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them");
+
+    return configuration;
+}
+
+
+void registerStorageMySQL(StorageFactory & factory)
+{
+    factory.registerStorage("MySQL", [](const StorageFactory::Arguments & args)
+    {
+        auto configuration = StorageMySQL::getConfiguration(args.engine_args, args.getLocalContext());
+
+        MySQLSettings mysql_settings; /// TODO: move some arguments from the arguments to the SETTINGS.
         if (args.storage_def->settings)
-        {
             mysql_settings.loadFromQuery(*args.storage_def);
-        }
 
         if (!mysql_settings.connection_pool_size)
             throw Exception("connection_pool_size cannot be zero.", ErrorCodes::BAD_ARGUMENTS);
 
-        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
-        mysqlxx::PoolWithFailover pool(remote_database, addresses,
-            username, password,
+        mysqlxx::PoolWithFailover pool(
+            configuration.database, configuration.addresses,
+            configuration.username, configuration.password,
             MYSQLXX_POOL_WITH_FAILOVER_DEFAULT_START_CONNECTIONS,
             mysql_settings.connection_pool_size,
-            mysql_settings.connection_max_tries);
-
-        bool replace_query = false;
-        std::string on_duplicate_clause;
-        if (engine_args.size() >= 6)
-            replace_query = engine_args[5]->as<ASTLiteral &>().value.safeGet<UInt64>();
-        if (engine_args.size() == 7)
-            on_duplicate_clause = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
-
-        if (replace_query && !on_duplicate_clause.empty())
-            throw Exception(
-                "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them",
-                ErrorCodes::BAD_ARGUMENTS);
+            mysql_settings.connection_max_tries,
+            mysql_settings.connection_wait_timeout);
 
         return StorageMySQL::create(
             args.table_id,
             std::move(pool),
-            remote_database,
-            remote_table,
-            replace_query,
-            on_duplicate_clause,
+            configuration.database,
+            configuration.table,
+            configuration.replace_query,
+            configuration.on_duplicate_clause,
             args.columns,
             args.constraints,
             args.comment,
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index 70d7a4455b1..cc3673e50ca 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -1,17 +1,20 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_MYSQL
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Storages/IStorage.h>
 #include <Storages/MySQL/MySQLSettings.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <mysqlxx/PoolWithFailover.h>
 
+namespace Poco
+{
+class Logger;
+}
 
 namespace DB
 {
@@ -50,6 +53,8 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    static StorageMySQLConfiguration getConfiguration(ASTs engine_args, ContextPtr context_);
+
 private:
     friend class StorageMySQLSink;
 
@@ -61,6 +66,8 @@ private:
     MySQLSettings mysql_settings;
 
     mysqlxx::PoolWithFailoverPtr pool;
+
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index 85f0daf3fa8..094e345e433 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -41,11 +41,14 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPt
     auto name_deps = getDependentViewsByColumn(context);
     for (const auto & command : commands)
     {
-        if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
-            && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN)
-            throw Exception(
-                "Alter of type '" + alterTypeToString(command.type) + "' is not supported by storage " + getName(),
-                ErrorCodes::NOT_IMPLEMENTED);
+        if (command.type != AlterCommand::Type::ADD_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_COLUMN
+            && command.type != AlterCommand::Type::DROP_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_COLUMN
+            && command.type != AlterCommand::Type::COMMENT_TABLE)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
+                command.type, getName());
+
         if (command.type == AlterCommand::DROP_COLUMN && !command.clear)
         {
             const auto & deps_mv = name_deps[command.column_name];
@@ -61,7 +64,7 @@ void StorageNull::checkAlterIsPossible(const AlterCommands & commands, ContextPt
 }
 
 
-void StorageNull::alter(const AlterCommands & params, ContextPtr context, TableLockHolder &)
+void StorageNull::alter(const AlterCommands & params, ContextPtr context, AlterLockHolder &)
 {
     auto table_id = getStorageID();
 
diff --git a/src/Storages/StorageNull.h b/src/Storages/StorageNull.h
index fda6faffb1e..5fef7f984e4 100644
--- a/src/Storages/StorageNull.h
+++ b/src/Storages/StorageNull.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
-#include <DataStreams/NullBlockOutputStream.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sinks/SinkToStorage.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
@@ -44,7 +43,7 @@ public:
 
     void checkAlterIsPossible(const AlterCommands & commands, ContextPtr context) const override;
 
-    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & table_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override
     {
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index 6072412af35..8327bb92a38 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -1,34 +1,43 @@
 #include "StoragePostgreSQL.h"
 
 #if USE_LIBPQXX
-#include <DataStreams/PostgreSQLBlockInputStream.h>
+#include <Processors/Transforms/PostgreSQLSource.h>
+
+#include <Common/parseAddress.h>
+#include <Common/assert_cast.h>
+#include <Common/parseRemoteDescription.h>
+#include <Core/Settings.h>
+#include <base/logger_useful.h>
 
-#include <Storages/StorageFactory.h>
-#include <Storages/transformQueryForExternalDatabase.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/Context.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeNullable.h>
+
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
-#include <Core/Settings.h>
-#include <Common/parseAddress.h>
-#include <Common/assert_cast.h>
-#include <Parsers/ASTLiteral.h>
 #include <Columns/ColumnNullable.h>
-#include <Formats/FormatFactory.h>
+
 #include <Formats/FormatSettings.h>
-#include <Processors/Sources/SourceFromInputStream.h>
-#include <Common/parseRemoteDescription.h>
-#include <Processors/Pipe.h>
-#include <Processors/Sinks/SinkToStorage.h>
+
 #include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Context.h>
+
+#include <Parsers/getInsertQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+
+#include <Processors/Sinks/SinkToStorage.h>
+
+#include <Storages/StorageFactory.h>
+#include <Storages/transformQueryForExternalDatabase.h>
 
 
 namespace DB
@@ -36,8 +45,9 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int NOT_IMPLEMENTED;
+    extern const int BAD_ARGUMENTS;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
 
 StoragePostgreSQL::StoragePostgreSQL(
@@ -47,13 +57,14 @@ StoragePostgreSQL::StoragePostgreSQL(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    ContextPtr context_,
-    const String & remote_table_schema_)
+    const String & remote_table_schema_,
+    const String & on_conflict_)
     : IStorage(table_id_)
     , remote_table_name(remote_table_name_)
     , remote_table_schema(remote_table_schema_)
-    , global_context(context_)
+    , on_conflict(on_conflict_)
     , pool(std::move(pool_))
+    , log(&Poco::Logger::get("StoragePostgreSQL (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -79,6 +90,7 @@ Pipe StoragePostgreSQL::read(
     String query = transformQueryForExternalDatabase(
         query_info_, metadata_snapshot->getColumns().getOrdinary(),
         IdentifierQuotingStyle::DoubleQuotes, remote_table_schema, remote_table_name, context_);
+    LOG_TRACE(log, "Query: {}", query);
 
     Block sample_block;
     for (const String & column_name : column_names_)
@@ -90,24 +102,28 @@ Pipe StoragePostgreSQL::read(
         sample_block.insert({ column_data.type, column_data.name });
     }
 
-    return Pipe(std::make_shared<SourceFromInputStream>(
-            std::make_shared<PostgreSQLBlockInputStream<>>(pool->get(), query, sample_block, max_block_size_)));
+    return Pipe(std::make_shared<PostgreSQLSource<>>(pool->get(), query, sample_block, max_block_size_));
 }
 
 
 class PostgreSQLSink : public SinkToStorage
 {
+
+using Row = std::vector<std::optional<std::string>>;
+
 public:
     explicit PostgreSQLSink(
         const StorageMetadataPtr & metadata_snapshot_,
         postgres::ConnectionHolderPtr connection_holder_,
         const String & remote_table_name_,
-        const String & remote_table_schema_)
+        const String & remote_table_schema_,
+        const String & on_conflict_)
         : SinkToStorage(metadata_snapshot_->getSampleBlock())
         , metadata_snapshot(metadata_snapshot_)
         , connection_holder(std::move(connection_holder_))
         , remote_table_name(remote_table_name_)
         , remote_table_schema(remote_table_schema_)
+        , on_conflict(on_conflict_)
     {
     }
 
@@ -115,12 +131,21 @@ public:
 
     void consume(Chunk chunk) override
     {
-        auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+        auto block = getHeader().cloneWithColumns(chunk.detachColumns());
         if (!inserter)
-            inserter = std::make_unique<StreamTo>(connection_holder->get(),
-                                                  remote_table_schema.empty() ? pqxx::table_path({remote_table_name})
-                                                                              : pqxx::table_path({remote_table_schema, remote_table_name}),
-                                                  block.getNames());
+        {
+            if (on_conflict.empty())
+            {
+                inserter = std::make_unique<StreamTo>(connection_holder->get(),
+                        remote_table_schema.empty() ? pqxx::table_path({remote_table_name})
+                                                    : pqxx::table_path({remote_table_schema, remote_table_name}), block.getNames());
+            }
+            else
+            {
+                inserter = std::make_unique<PreparedInsert>(connection_holder->get(), remote_table_name,
+                                                            remote_table_schema, block.getColumnsWithTypeAndName(), on_conflict);
+            }
+        }
 
         const auto columns = block.getColumns();
         const size_t num_rows = block.rows(), num_cols = block.columns();
@@ -154,7 +179,7 @@ public:
                 }
             }
 
-            inserter->stream.write_values(row);
+            inserter->insert(row);
         }
     }
 
@@ -271,37 +296,148 @@ public:
     }
 
 private:
-    struct StreamTo
+    struct Inserter
     {
+        pqxx::connection & connection;
         pqxx::work tx;
+
+        explicit Inserter(pqxx::connection & connection_)
+            : connection(connection_)
+            , tx(connection) {}
+
+        virtual ~Inserter() = default;
+
+        virtual void insert(const Row & row) = 0;
+        virtual void complete() = 0;
+    };
+
+    struct StreamTo : Inserter
+    {
         Names columns;
         pqxx::stream_to stream;
 
-        StreamTo(pqxx::connection & connection, pqxx::table_path table_, Names columns_)
-            : tx(connection)
+        StreamTo(pqxx::connection & connection_, pqxx::table_path table_, Names columns_)
+            : Inserter(connection_)
             , columns(std::move(columns_))
             , stream(pqxx::stream_to::raw_table(tx, connection.quote_table(table_), connection.quote_columns(columns)))
         {
         }
 
-        void complete()
+        void complete() override
         {
             stream.complete();
             tx.commit();
         }
+
+        void insert(const Row & row) override
+        {
+            stream.write_values(row);
+        }
+    };
+
+    struct PreparedInsert : Inserter
+    {
+        PreparedInsert(pqxx::connection & connection_, const String & table, const String & schema,
+                       const ColumnsWithTypeAndName & columns, const String & on_conflict_)
+            : Inserter(connection_)
+        {
+            WriteBufferFromOwnString buf;
+            buf << getInsertQuery(schema, table, columns, IdentifierQuotingStyle::DoubleQuotes);
+            buf << " (";
+            for (size_t i = 1; i <= columns.size(); ++i)
+            {
+                if (i > 1)
+                    buf << ", ";
+                buf << "$" << i;
+            }
+            buf << ") ";
+            buf << on_conflict_;
+            connection.prepare("insert", buf.str());
+        }
+
+        void complete() override
+        {
+            connection.unprepare("insert");
+            tx.commit();
+        }
+
+        void insert(const Row & row) override
+        {
+            pqxx::params params;
+            params.reserve(row.size());
+            params.append_multi(row);
+            tx.exec_prepared("insert", params);
+        }
     };
 
     StorageMetadataPtr metadata_snapshot;
     postgres::ConnectionHolderPtr connection_holder;
-    const String remote_table_name, remote_table_schema;
-    std::unique_ptr<StreamTo> inserter;
+    const String remote_db_name, remote_table_name, remote_table_schema, on_conflict;
+
+    std::unique_ptr<Inserter> inserter;
 };
 
 
 SinkToStoragePtr StoragePostgreSQL::write(
         const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /* context */)
 {
-    return std::make_shared<PostgreSQLSink>(metadata_snapshot, pool->get(), remote_table_name, remote_table_schema);
+    return std::make_shared<PostgreSQLSink>(metadata_snapshot, pool->get(), remote_table_name, remote_table_schema, on_conflict);
+}
+
+
+StoragePostgreSQLConfiguration StoragePostgreSQL::getConfiguration(ASTs engine_args, ContextPtr context)
+{
+    StoragePostgreSQLConfiguration configuration;
+    if (auto named_collection = getExternalDataSourceConfiguration(engine_args, context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+
+        configuration.set(common_configuration);
+        configuration.addresses = {std::make_pair(configuration.host, configuration.port)};
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "on_conflict")
+                configuration.on_conflict = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected one of:"
+                        "host, port, username, password, database, table, schema, on_conflict.", arg_name);
+        }
+    }
+    else
+    {
+        if (engine_args.size() < 5 || engine_args.size() > 7)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Storage PostgreSQL requires from 5 to 7 parameters: "
+                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password' [, 'schema', 'ON CONFLICT ...']. Got: {}",
+                            engine_args.size());
+
+        for (auto & engine_arg : engine_args)
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, context);
+
+        const auto & host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
+
+        configuration.addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
+        if (configuration.addresses.size() == 1)
+        {
+            configuration.host = configuration.addresses[0].first;
+            configuration.port = configuration.addresses[0].second;
+        }
+
+        configuration.database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (engine_args.size() >= 6)
+            configuration.schema = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
+        if (engine_args.size() >= 7)
+            configuration.on_conflict = engine_args[6]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    return configuration;
 }
 
 
@@ -309,47 +445,20 @@ void registerStoragePostgreSQL(StorageFactory & factory)
 {
     factory.registerStorage("PostgreSQL", [](const StorageFactory::Arguments & args)
     {
-        ASTs & engine_args = args.engine_args;
-
-        if (engine_args.size() < 5 || engine_args.size() > 6)
-            throw Exception("Storage PostgreSQL requires from 5 to 6 parameters: "
-                            "PostgreSQL('host:port', 'database', 'table', 'username', 'password' [, 'schema']",
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
-
-        auto host_port = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        /// Split into replicas if needed.
-        size_t max_addresses = args.getContext()->getSettingsRef().glob_expansion_max_elements;
-        auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
-
-        const String & remote_database = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & remote_table = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & username = engine_args[3]->as<ASTLiteral &>().value.safeGet<String>();
-        const String & password = engine_args[4]->as<ASTLiteral &>().value.safeGet<String>();
-
-        String remote_table_schema;
-        if (engine_args.size() == 6)
-            remote_table_schema = engine_args[5]->as<ASTLiteral &>().value.safeGet<String>();
-
-        auto pool = std::make_shared<postgres::PoolWithFailover>(
-            remote_database,
-            addresses,
-            username,
-            password,
+        auto configuration = StoragePostgreSQL::getConfiguration(args.engine_args, args.getLocalContext());
+        auto pool = std::make_shared<postgres::PoolWithFailover>(configuration,
             args.getContext()->getSettingsRef().postgresql_connection_pool_size,
             args.getContext()->getSettingsRef().postgresql_connection_pool_wait_timeout);
 
         return StoragePostgreSQL::create(
             args.table_id,
             std::move(pool),
-            remote_table,
+            configuration.table,
             args.columns,
             args.constraints,
             args.comment,
-            args.getContext(),
-            remote_table_schema);
+            configuration.schema,
+            configuration.on_conflict);
     },
     {
         .source_access_type = AccessType::POSTGRES,
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index 064fa481f9d..7d8752c91b9 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -1,21 +1,22 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
+namespace Poco
+{
+class Logger;
+}
 
 namespace DB
 {
 
-
 class StoragePostgreSQL final : public shared_ptr_helper<StoragePostgreSQL>, public IStorage
 {
     friend struct shared_ptr_helper<StoragePostgreSQL>;
@@ -27,8 +28,8 @@ public:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        ContextPtr context_,
-        const std::string & remote_table_schema_ = "");
+        const String & remote_table_schema_ = "",
+        const String & on_conflict = "");
 
     String getName() const override { return "PostgreSQL"; }
 
@@ -43,13 +44,17 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr context) override;
 
+    static StoragePostgreSQLConfiguration getConfiguration(ASTs engine_args, ContextPtr context);
+
 private:
     friend class PostgreSQLBlockOutputStream;
 
     String remote_table_name;
     String remote_table_schema;
-    ContextPtr global_context;
+    String on_conflict;
     postgres::PoolWithFailoverPtr pool;
+
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Storages/StorageProxy.h b/src/Storages/StorageProxy.h
index 521a2b8d642..304f84c02eb 100644
--- a/src/Storages/StorageProxy.h
+++ b/src/Storages/StorageProxy.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/IStorage.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
@@ -40,7 +40,7 @@ public:
         return getNested()->getQueryProcessingStage(context, to_stage, getNested()->getInMemoryMetadataPtr(), info);
     }
 
-    BlockInputStreams watch(
+    Pipe watch(
         const Names & column_names,
         const SelectQueryInfo & query_info,
         ContextPtr context,
@@ -91,7 +91,7 @@ public:
         IStorage::renameInMemory(new_table_id);
     }
 
-    void alter(const AlterCommands & params, ContextPtr context, TableLockHolder & alter_lock_holder) override
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & alter_lock_holder) override
     {
         getNested()->alter(params, context, alter_lock_holder);
         IStorage::setInMemoryMetadata(getNested()->getInMemoryMetadata());
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 150a71a09e5..f4a50f2e553 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -17,6 +17,7 @@
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/MergeTree/PartitionPruner.h>
@@ -27,6 +28,8 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h>
 #include <Storages/MergeTree/ReplicatedMergeTreePartHeader.h>
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
+#include <Storages/MergeTree/MutateFromLogEntryTask.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/MergeTree/MergeTreeReaderCompact.h>
 
@@ -42,6 +45,7 @@
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ASTSetQuery.h>
 
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 
@@ -56,14 +60,12 @@
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/InterserverCredentials.h>
 
-#include <DataStreams/RemoteBlockInputStream.h>
-#include <DataStreams/copyData.h>
 
 #include <Poco/DirectoryIterator.h>
 
-#include <common/range.h>
-#include <common/scope_guard.h>
-#include <common/scope_guard_safe.h>
+#include <base/range.h>
+#include <base/scope_guard.h>
+#include <base/scope_guard_safe.h>
 
 #include <algorithm>
 #include <ctime>
@@ -125,8 +127,6 @@ namespace ErrorCodes
     extern const int PARTITION_DOESNT_EXIST;
     extern const int UNFINISHED;
     extern const int RECEIVED_ERROR_TOO_MANY_REQUESTS;
-    extern const int TOO_MANY_FETCHES;
-    extern const int BAD_DATA_PART_NAME;
     extern const int PART_IS_TEMPORARILY_LOCKED;
     extern const int CANNOT_ASSIGN_OPTIMIZE;
     extern const int KEEPER_EXCEPTION;
@@ -141,6 +141,7 @@ namespace ErrorCodes
     extern const int DUPLICATE_DATA_PART;
     extern const int BAD_ARGUMENTS;
     extern const int CONCURRENT_ACCESS_NOT_SUPPORTED;
+    extern const int CHECKSUM_DOESNT_MATCH;
 }
 
 namespace ActionLocks
@@ -191,43 +192,54 @@ zkutil::ZooKeeperPtr StorageReplicatedMergeTree::getZooKeeper() const
     return res;
 }
 
-static std::string normalizeZooKeeperPath(std::string zookeeper_path)
+static std::string normalizeZooKeeperPath(std::string zookeeper_path, bool check_starts_with_slash, Poco::Logger * log = nullptr)
 {
     if (!zookeeper_path.empty() && zookeeper_path.back() == '/')
         zookeeper_path.resize(zookeeper_path.size() - 1);
     /// If zookeeper chroot prefix is used, path should start with '/', because chroot concatenates without it.
     if (!zookeeper_path.empty() && zookeeper_path.front() != '/')
+    {
+        /// Do not allow this for new tables, print warning for tables created in old versions
+        if (check_starts_with_slash)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "ZooKeeper path must starts with '/', got '{}'", zookeeper_path);
+        if (log)
+            LOG_WARNING(log, "ZooKeeper path ('{}') does not start with '/'. It will not be supported in future releases");
         zookeeper_path = "/" + zookeeper_path;
+    }
 
     return zookeeper_path;
 }
 
 static String extractZooKeeperName(const String & path)
 {
+    static constexpr auto default_zookeeper_name = "default";
     if (path.empty())
-        throw Exception("ZooKeeper path should not be empty", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-    auto pos = path.find(':');
-    if (pos != String::npos)
+        throw Exception("ZooKeeper path should not be empty", ErrorCodes::BAD_ARGUMENTS);
+    if (path[0] == '/')
+        return default_zookeeper_name;
+    auto pos = path.find(":/");
+    if (pos != String::npos && pos < path.find('/'))
     {
         auto zookeeper_name = path.substr(0, pos);
         if (zookeeper_name.empty())
-            throw Exception("Zookeeper path should start with '/' or '<auxiliary_zookeeper_name>:/'", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
+            throw Exception("Zookeeper path should start with '/' or '<auxiliary_zookeeper_name>:/'", ErrorCodes::BAD_ARGUMENTS);
         return zookeeper_name;
     }
-    static constexpr auto default_zookeeper_name = "default";
     return default_zookeeper_name;
 }
 
-static String extractZooKeeperPath(const String & path)
+static String extractZooKeeperPath(const String & path, bool check_starts_with_slash, Poco::Logger * log = nullptr)
 {
     if (path.empty())
-        throw Exception("ZooKeeper path should not be empty", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
-    auto pos = path.find(':');
-    if (pos != String::npos)
+        throw Exception("ZooKeeper path should not be empty", ErrorCodes::BAD_ARGUMENTS);
+    if (path[0] == '/')
+        return normalizeZooKeeperPath(path, check_starts_with_slash, log);
+    auto pos = path.find(":/");
+    if (pos != String::npos && pos < path.find('/'))
     {
-        return normalizeZooKeeperPath(path.substr(pos + 1, String::npos));
+        return normalizeZooKeeperPath(path.substr(pos + 1, String::npos), check_starts_with_slash, log);
     }
-    return normalizeZooKeeperPath(path);
+    return normalizeZooKeeperPath(path, check_starts_with_slash, log);
 }
 
 static MergeTreePartInfo makeDummyDropRangeForMovePartitionOrAttachPartitionFrom(const String & partition_id)
@@ -274,17 +286,17 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
                     attach,
                     [this] (const std::string & name) { enqueuePartForCheck(name); })
     , zookeeper_name(extractZooKeeperName(zookeeper_path_))
-    , zookeeper_path(extractZooKeeperPath(zookeeper_path_))
+    , zookeeper_path(extractZooKeeperPath(zookeeper_path_, /* check_starts_with_slash */ !attach, log))
     , replica_name(replica_name_)
     , replica_path(fs::path(zookeeper_path) / "replicas" / replica_name_)
     , reader(*this)
     , writer(*this)
-    , merger_mutator(*this, getContext()->getSettingsRef().background_pool_size)
+    , merger_mutator(*this,
+        getContext()->getSettingsRef().background_merges_mutations_concurrency_ratio *
+        getContext()->getSettingsRef().background_pool_size)
     , merge_strategy_picker(*this)
     , queue(*this, merge_strategy_picker)
     , fetcher(*this)
-    , background_executor(*this, getContext())
-    , background_moves_executor(*this, getContext())
     , cleanup_thread(*this)
     , part_check_thread(*this)
     , restarting_thread(*this)
@@ -477,7 +489,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         }
         /// Temporary directories contain uninitialized results of Merges or Fetches (after forced restart),
         /// don't allow to reinitialize them, delete each of them immediately.
-        clearOldTemporaryDirectories(0);
+        clearOldTemporaryDirectories(merger_mutator, 0);
         clearOldWriteAheadLogs();
     }
 
@@ -961,7 +973,9 @@ void StorageReplicatedMergeTree::checkTableStructure(const String & zookeeper_pr
     const ColumnsDescription & old_columns = metadata_snapshot->getColumns();
     if (columns_from_zk != old_columns)
     {
-        throw Exception("Table columns structure in ZooKeeper is different from local table structure", ErrorCodes::INCOMPATIBLE_COLUMNS);
+        throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS,
+            "Table columns structure in ZooKeeper is different from local table structure. Local columns:\n"
+            "{}\nZookeeper columns:\n{}", old_columns.toString(), columns_from_zk.toString());
     }
 }
 
@@ -1012,8 +1026,15 @@ void StorageReplicatedMergeTree::setTableStructure(
 
         if (metadata_diff.sampling_expression_changed)
         {
-            auto sample_by_ast = parse_key_expr(metadata_diff.new_sampling_expression);
-            new_metadata.sampling_key.recalculateWithNewAST(sample_by_ast, new_metadata.columns, getContext());
+            if (!metadata_diff.new_sampling_expression.empty())
+            {
+                auto sample_by_ast = parse_key_expr(metadata_diff.new_sampling_expression);
+                new_metadata.sampling_key.recalculateWithNewAST(sample_by_ast, new_metadata.columns, getContext());
+            }
+            else /// SAMPLE BY was removed
+            {
+                new_metadata.sampling_key = {};
+            }
         }
 
         if (metadata_diff.skip_indices_changed)
@@ -1162,10 +1183,8 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
     const UInt64 parts_to_fetch_blocks = std::accumulate(parts_to_fetch.cbegin(), parts_to_fetch.cend(), 0,
         [&](UInt64 acc, const String& part_name)
         {
-            MergeTreePartInfo part_info;
-
-            if (MergeTreePartInfo::tryParsePartName(part_name, &part_info, format_version))
-                return acc + part_info.getBlocksCount();
+            if (const auto part_info = MergeTreePartInfo::tryParsePartName(part_name, format_version))
+                return acc + part_info->getBlocksCount();
 
             LOG_ERROR(log, "Unexpected part name: {}", part_name);
             return acc;
@@ -1209,54 +1228,7 @@ void StorageReplicatedMergeTree::checkParts(bool skip_sanity_checks)
     }
 
     /// Add to the queue jobs to pick up the missing parts from other replicas and remove from ZK the information that we have them.
-    std::vector<std::future<Coordination::ExistsResponse>> exists_futures;
-    exists_futures.reserve(parts_to_fetch.size());
-    for (const String & part_name : parts_to_fetch)
-    {
-        String part_path = fs::path(replica_path) / "parts" / part_name;
-        exists_futures.emplace_back(zookeeper->asyncExists(part_path));
-    }
-
-    std::vector<std::future<Coordination::MultiResponse>> enqueue_futures;
-    enqueue_futures.reserve(parts_to_fetch.size());
-    for (size_t i = 0; i < parts_to_fetch.size(); ++i)
-    {
-        const String & part_name = parts_to_fetch[i];
-
-        Coordination::Requests ops;
-
-        String has_replica = findReplicaHavingPart(part_name, true);
-        if (!has_replica.empty())
-        {
-            LOG_ERROR(log, "Removing locally missing part from ZooKeeper and queueing a fetch: {}", part_name);
-            time_t part_create_time = 0;
-            Coordination::ExistsResponse exists_resp = exists_futures[i].get();
-            if (exists_resp.error == Coordination::Error::ZOK)
-            {
-                part_create_time = exists_resp.stat.ctime / 1000;
-                removePartFromZooKeeper(part_name, ops, exists_resp.stat.numChildren > 0);
-            }
-            LogEntry log_entry;
-            log_entry.type = LogEntry::GET_PART;
-            log_entry.source_replica = "";
-            log_entry.new_part_name = part_name;
-            log_entry.create_time = part_create_time;
-
-            /// We assume that this occurs before the queue is loaded (queue.initialize).
-            ops.emplace_back(zkutil::makeCreateRequest(
-                fs::path(replica_path) / "queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential));
-            enqueue_futures.emplace_back(zookeeper->asyncMulti(ops));
-        }
-        else
-        {
-            LOG_ERROR(log, "Not found active replica having part {}", part_name);
-            enqueuePartForCheck(part_name);
-        }
-
-    }
-
-    for (auto & future : enqueue_futures)
-        future.get();
+    queue.setBrokenPartsToEnqueueFetchesOnLoading(std::move(parts_to_fetch));
 
     /// Remove extra local parts.
     for (const DataPartPtr & part : unexpected_parts)
@@ -1314,32 +1286,35 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
         }
 
         ReplicatedMergeTreePartHeader replica_part_header;
-        if (!part_zk_str.empty())
-            replica_part_header = ReplicatedMergeTreePartHeader::fromString(part_zk_str);
-        else
+        if (part_zk_str.empty())
         {
-            Coordination::Stat columns_stat_before, columns_stat_after;
             String columns_str;
             String checksums_str;
-            /// Let's check that the node's version with the columns did not change while we were reading the checksums.
-            /// This ensures that the columns and the checksum refer to the same
-            if (!zookeeper->tryGet(fs::path(current_part_path) / "columns", columns_str, &columns_stat_before) ||
-                !zookeeper->tryGet(fs::path(current_part_path) / "checksums", checksums_str) ||
-                !zookeeper->exists(fs::path(current_part_path) / "columns", &columns_stat_after) ||
-                columns_stat_before.version != columns_stat_after.version)
+            if (zookeeper->tryGet(fs::path(current_part_path) / "columns", columns_str) &&
+                zookeeper->tryGet(fs::path(current_part_path) / "checksums", checksums_str))
             {
-                LOG_INFO(log, "Not checking checksums of part {} with replica {} because part changed while we were reading its checksums", part_name, replica);
+                replica_part_header = ReplicatedMergeTreePartHeader::fromColumnsAndChecksumsZNodes(columns_str, checksums_str);
+            }
+            else
+            {
+                if (zookeeper->exists(current_part_path))
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} has empty header and does not have columns and checksums. "
+                                                               "Looks like a bug.", current_part_path);
+                LOG_INFO(log, "Not checking checksums of part {} with replica {} because part was removed from ZooKeeper", part_name, replica);
                 continue;
             }
-
-            replica_part_header = ReplicatedMergeTreePartHeader::fromColumnsAndChecksumsZNodes(
-                columns_str, checksums_str);
+        }
+        else
+        {
+            replica_part_header = ReplicatedMergeTreePartHeader::fromString(part_zk_str);
         }
 
         if (replica_part_header.getColumnsHash() != local_part_header.getColumnsHash())
         {
-            LOG_INFO(log, "Not checking checksums of part {} with replica {} because columns are different", part_name, replica);
-            continue;
+            /// Either it's a bug or ZooKeeper contains broken data.
+            /// TODO Fix KILL MUTATION and replace CHECKSUM_DOESNT_MATCH with LOGICAL_ERROR
+            /// (some replicas may skip killed mutation even if it was executed on other replicas)
+            throw Exception(ErrorCodes::CHECKSUM_DOESNT_MATCH, "Part {} from {} has different columns hash", part_name, replica);
         }
 
         replica_part_header.getChecksums().checkEqual(local_part_header.getChecksums(), true);
@@ -1452,13 +1427,12 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
     for (const DiskPtr & disk : getStoragePolicy()->getDisks())
         for (const auto it = disk->iterateDirectory(fs::path(relative_data_path) / "detached/"); it->isValid(); it->next())
         {
-            MergeTreePartInfo part_info;
+            const auto part_info = MergeTreePartInfo::tryParsePartName(it->name(), format_version);
 
-            if (!MergeTreePartInfo::tryParsePartName(it->name(), &part_info, format_version) ||
-                part_info.partition_id != actual_part_info.partition_id)
+            if (!part_info || part_info->partition_id != actual_part_info.partition_id)
                 continue;
 
-            const String part_old_name = part_info.getPartName();
+            const String part_old_name = part_info->getPartName();
             const String part_path = fs::path("detached") / part_old_name;
 
             const VolumePtr volume = std::make_shared<SingleDiskVolume>("volume_" + part_old_name, disk);
@@ -1557,7 +1531,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
         return true;    /// NOTE Deletion from `virtual_parts` is not done, but it is only necessary for merge.
     }
 
-    bool do_fetch = false;
+    // bool do_fetch = false;
 
     switch (entry.type)
     {
@@ -1565,17 +1539,12 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
             /// We surely don't have this part locally as we've checked it before, so download it.
             [[fallthrough]];
         case LogEntry::GET_PART:
-            do_fetch = true;
-            break;
+            return executeFetch(entry);
+            // do_fetch = true;
         case LogEntry::MERGE_PARTS:
-            /// Sometimes it's better to fetch the merged part instead of merging,
-            /// e.g when we don't have all the source parts.
-            do_fetch = !tryExecuteMerge(entry);
-            break;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Merge has to be executed by another function");
         case LogEntry::MUTATE_PART:
-            /// Sometimes it's better to fetch mutated part instead of merging.
-            do_fetch = !tryExecutePartMutation(entry);
-            break;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Mutation has to be executed by another function");
         case LogEntry::ALTER_METADATA:
             return executeMetadataAlter(entry);
         case LogEntry::SYNC_PINNED_PART_UUIDS:
@@ -1588,374 +1557,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(LogEntry & entry)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected log entry type: {}", static_cast<int>(entry.type));
     }
 
-    if (do_fetch)
-        return executeFetch(entry);
-
-    return true;
-}
-
-bool StorageReplicatedMergeTree::tryExecuteMerge(const LogEntry & entry)
-{
-    LOG_TRACE(log, "Executing log entry to merge parts {} to {}",
-        fmt::join(entry.source_parts, ", "), entry.new_part_name);
-
-    const auto storage_settings_ptr = getSettings();
-
-    if (storage_settings_ptr->always_fetch_merged_part)
-    {
-        LOG_INFO(log, "Will fetch part {} because setting 'always_fetch_merged_part' is true", entry.new_part_name);
-        return false;
-    }
-
-    if (entry.merge_type == MergeType::TTL_RECOMPRESS &&
-        (time(nullptr) - entry.create_time) <= storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds() &&
-        entry.source_replica != replica_name)
-    {
-        LOG_INFO(log, "Will try to fetch part {} until '{}' because this part assigned to recompression merge. "
-            "Source replica {} will try to merge this part first", entry.new_part_name,
-            DateLUT::instance().timeToString(entry.create_time + storage_settings_ptr->try_fetch_recompressed_part_timeout.totalSeconds()), entry.source_replica);
-        return false;
-    }
-
-    /// In some use cases merging can be more expensive than fetching
-    /// and it may be better to spread merges tasks across the replicas
-    /// instead of doing exactly the same merge cluster-wise
-    std::optional<String> replica_to_execute_merge;
-    bool replica_to_execute_merge_picked = false;
-
-    if (merge_strategy_picker.shouldMergeOnSingleReplica(entry))
-    {
-        replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
-        replica_to_execute_merge_picked = true;
-
-        if (replica_to_execute_merge)
-        {
-            LOG_DEBUG(log,
-                "Prefer fetching part {} from replica {} due to execute_merges_on_single_replica_time_threshold",
-                entry.new_part_name, replica_to_execute_merge.value());
-
-            return false;
-        }
-    }
-
-    DataPartsVector parts;
-
-    for (const String & source_part_name : entry.source_parts)
-    {
-        DataPartPtr source_part_or_covering = getActiveContainingPart(source_part_name);
-
-        if (!source_part_or_covering)
-        {
-            /// We do not have one of source parts locally, try to take some already merged part from someone.
-            LOG_DEBUG(log, "Don't have all parts for merge {}; will try to fetch it instead", entry.new_part_name);
-            return false;
-        }
-
-        if (source_part_or_covering->name != source_part_name)
-        {
-            /// We do not have source part locally, but we have some covering part. Possible options:
-            /// 1. We already have merged part (source_part_or_covering->name == new_part_name)
-            /// 2. We have some larger merged part which covers new_part_name (and therefore it covers source_part_name too)
-            /// 3. We have two intersecting parts, both cover source_part_name. It's logical error.
-            /// TODO Why 1 and 2 can happen? Do we need more assertions here or somewhere else?
-            constexpr const char * message = "Part {} is covered by {} but should be merged into {}. This shouldn't happen often.";
-            LOG_WARNING(log, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
-            if (!source_part_or_covering->info.contains(MergeTreePartInfo::fromPartName(entry.new_part_name, format_version)))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, message, source_part_name, source_part_or_covering->name, entry.new_part_name);
-            return false;
-        }
-
-        parts.push_back(source_part_or_covering);
-    }
-
-    /// All source parts are found locally, we can execute merge
-
-    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr))
-    {
-        /// If entry is old enough, and have enough size, and part are exists in any replica,
-        ///  then prefer fetching of merged part from replica.
-
-        size_t sum_parts_bytes_on_disk = 0;
-        for (const auto & part : parts)
-            sum_parts_bytes_on_disk += part->getBytesOnDisk();
-
-        if (sum_parts_bytes_on_disk >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
-        {
-            String replica = findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
-            if (!replica.empty())
-            {
-                LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
-                return false;
-            }
-        }
-    }
-
-    /// Start to make the main work
-    size_t estimated_space_for_merge = MergeTreeDataMergerMutator::estimateNeededDiskSpace(parts);
-
-    /// Can throw an exception while reserving space.
-    IMergeTreeDataPart::TTLInfos ttl_infos;
-    size_t max_volume_index = 0;
-    for (auto & part_ptr : parts)
-    {
-        ttl_infos.update(part_ptr->ttl_infos);
-        max_volume_index = std::max(max_volume_index, getStoragePolicy()->getVolumeIndexByDisk(part_ptr->volume->getDisk()));
-    }
-    auto table_lock = lockForShare(RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
-
-    StorageMetadataPtr metadata_snapshot = getInMemoryMetadataPtr();
-    FutureMergedMutatedPart future_merged_part(parts, entry.new_part_type);
-    if (future_merged_part.name != entry.new_part_name)
-    {
-        throw Exception("Future merged part name " + backQuote(future_merged_part.name) + " differs from part name in log entry: "
-            + backQuote(entry.new_part_name), ErrorCodes::BAD_DATA_PART_NAME);
-    }
-
-    std::optional<CurrentlySubmergingEmergingTagger> tagger;
-    ReservationPtr reserved_space = balancedReservation(
-        metadata_snapshot,
-        estimated_space_for_merge,
-        max_volume_index,
-        future_merged_part.name,
-        future_merged_part.part_info,
-        future_merged_part.parts,
-        &tagger,
-        &ttl_infos);
-
-    if (!reserved_space)
-        reserved_space
-            = reserveSpacePreferringTTLRules(metadata_snapshot, estimated_space_for_merge, ttl_infos, time(nullptr), max_volume_index);
-
-    future_merged_part.uuid = entry.new_part_uuid;
-    future_merged_part.updatePath(*this, reserved_space);
-    future_merged_part.merge_type = entry.merge_type;
-
-    if (reserved_space->getDisk()->supportZeroCopyReplication()
-        && storage_settings_ptr->allow_remote_fs_zero_copy_replication
-        && merge_strategy_picker.shouldMergeOnSingleReplicaShared(entry))
-    {
-        if (!replica_to_execute_merge_picked)
-            replica_to_execute_merge = merge_strategy_picker.pickReplicaToExecuteMerge(entry);
-
-        if (replica_to_execute_merge)
-        {
-            LOG_DEBUG(log,
-                "Prefer fetching part {} from replica {} due to remote_fs_execute_merges_on_single_replica_time_threshold",
-                entry.new_part_name, replica_to_execute_merge.value());
-            return false;
-        }
-    }
-
-    /// Account TTL merge
-    if (isTTLMergeType(future_merged_part.merge_type))
-        getContext()->getMergeList().bookMergeWithTTL();
-
-    auto table_id = getStorageID();
-
-    /// Add merge to list
-    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(getStorageID(), future_merged_part);
-
-    Transaction transaction(*this);
-    MutableDataPartPtr part;
-
-    Stopwatch stopwatch;
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MERGE_PARTS, execution_status, stopwatch.elapsed(),
-            entry.new_part_name, part, parts, merge_entry.get());
-    };
-
-    try
-    {
-        part = merger_mutator.mergePartsToTemporaryPart(
-            future_merged_part,
-            metadata_snapshot,
-            *merge_entry,
-            table_lock,
-            entry.create_time,
-            getContext(),
-            reserved_space,
-            entry.deduplicate,
-            entry.deduplicate_by_columns,
-            merging_params);
-
-        merger_mutator.renameMergedTemporaryPart(part, parts, &transaction);
-
-        try
-        {
-            checkPartChecksumsAndCommit(transaction, part);
-        }
-        catch (const Exception & e)
-        {
-            if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
-            {
-                transaction.rollback();
-
-                ProfileEvents::increment(ProfileEvents::DataAfterMergeDiffersFromReplica);
-
-                LOG_ERROR(log,
-                    "{}. Data after merge is not byte-identical to data on another replicas. There could be several"
-                    " reasons: 1. Using newer version of compression library after server update. 2. Using another"
-                    " compression method. 3. Non-deterministic compression algorithm (highly unlikely). 4."
-                    " Non-deterministic merge algorithm due to logical error in code. 5. Data corruption in memory due"
-                    " to bug in code. 6. Data corruption in memory due to hardware issue. 7. Manual modification of"
-                    " source data after server startup. 8. Manual modification of checksums stored in ZooKeeper. 9."
-                    " Part format related settings like 'enable_mixed_granularity_parts' are different on different"
-                    " replicas. We will download merged part from replica to force byte-identical result.",
-                    getCurrentExceptionMessage(false));
-
-                write_part_log(ExecutionStatus::fromCurrentException());
-
-                tryRemovePartImmediately(std::move(part));
-                /// No need to delete the part from ZK because we can be sure that the commit transaction
-                /// didn't go through.
-
-                return false;
-            }
-
-            throw;
-        }
-
-        /** Removing old parts from ZK and from the disk is delayed - see ReplicatedMergeTreeCleanupThread, clearOldParts.
-          */
-
-        /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
-          * This is not a problem, because in this case the merge will remain in the queue, and we will try again.
-          */
-        merge_selecting_task->schedule();
-        ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
-
-        write_part_log({});
-
-        return true;
-    }
-    catch (...)
-    {
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
-}
-
-bool StorageReplicatedMergeTree::tryExecutePartMutation(const StorageReplicatedMergeTree::LogEntry & entry)
-{
-    const String & source_part_name = entry.source_parts.at(0);
-    const auto storage_settings_ptr = getSettings();
-    LOG_TRACE(log, "Executing log entry to mutate part {} to {}", source_part_name, entry.new_part_name);
-
-    DataPartPtr source_part = getActiveContainingPart(source_part_name);
-    if (!source_part)
-    {
-        LOG_DEBUG(log, "Source part {} for {} is not ready; will try to fetch it instead", source_part_name, entry.new_part_name);
-        return false;
-    }
-
-    if (source_part->name != source_part_name)
-    {
-        LOG_WARNING(log, "Part " + source_part_name + " is covered by " + source_part->name
-                    + " but should be mutated to " + entry.new_part_name + ". "
-                    + "Possibly the mutation of this part is not needed and will be skipped. This shouldn't happen often.");
-        return false;
-    }
-
-    /// TODO - some better heuristic?
-    size_t estimated_space_for_result = MergeTreeDataMergerMutator::estimateNeededDiskSpace({source_part});
-
-    if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr)
-        && estimated_space_for_result >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
-    {
-        /// If entry is old enough, and have enough size, and some replica has the desired part,
-        /// then prefer fetching from replica.
-        String replica = findReplicaHavingPart(entry.new_part_name, true);    /// NOTE excessive ZK requests for same data later, may remove.
-        if (!replica.empty())
-        {
-            LOG_DEBUG(log, "Prefer to fetch {} from replica {}", entry.new_part_name, replica);
-            return false;
-        }
-    }
-
-    MergeTreePartInfo new_part_info = MergeTreePartInfo::fromPartName(
-        entry.new_part_name, format_version);
-    MutationCommands commands = queue.getMutationCommands(source_part, new_part_info.mutation);
-
-    /// Once we mutate part, we must reserve space on the same disk, because mutations can possibly create hardlinks.
-    /// Can throw an exception.
-    ReservationPtr reserved_space = reserveSpace(estimated_space_for_result, source_part->volume);
-
-    auto table_lock = lockForShare(
-            RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
-    StorageMetadataPtr metadata_snapshot = getInMemoryMetadataPtr();
-
-    MutableDataPartPtr new_part;
-    Transaction transaction(*this);
-
-    FutureMergedMutatedPart future_mutated_part;
-    future_mutated_part.name = entry.new_part_name;
-    future_mutated_part.uuid = entry.new_part_uuid;
-    future_mutated_part.parts.push_back(source_part);
-    future_mutated_part.part_info = new_part_info;
-    future_mutated_part.updatePath(*this, reserved_space);
-    future_mutated_part.type = source_part->getType();
-
-    MergeList::EntryPtr merge_entry = getContext()->getMergeList().insert(getStorageID(), future_mutated_part);
-
-    Stopwatch stopwatch;
-
-    auto write_part_log = [&] (const ExecutionStatus & execution_status)
-    {
-        writePartLog(
-            PartLogElement::MUTATE_PART, execution_status, stopwatch.elapsed(),
-            entry.new_part_name, new_part, future_mutated_part.parts, merge_entry.get());
-    };
-
-    try
-    {
-        new_part = merger_mutator.mutatePartToTemporaryPart(
-            future_mutated_part, metadata_snapshot, commands, *merge_entry,
-            entry.create_time, getContext(), reserved_space, table_lock);
-        renameTempPartAndReplace(new_part, nullptr, &transaction);
-
-        try
-        {
-            checkPartChecksumsAndCommit(transaction, new_part);
-        }
-        catch (const Exception & e)
-        {
-            if (MergeTreeDataPartChecksums::isBadChecksumsErrorCode(e.code()))
-            {
-                transaction.rollback();
-
-                ProfileEvents::increment(ProfileEvents::DataAfterMutationDiffersFromReplica);
-
-                LOG_ERROR(log, "{}. Data after mutation is not byte-identical to data on another replicas. We will download merged part from replica to force byte-identical result.", getCurrentExceptionMessage(false));
-
-                write_part_log(ExecutionStatus::fromCurrentException());
-
-                tryRemovePartImmediately(std::move(new_part));
-                /// No need to delete the part from ZK because we can be sure that the commit transaction
-                /// didn't go through.
-
-                return false;
-            }
-
-            throw;
-        }
-
-        /** With `ZSESSIONEXPIRED` or `ZOPERATIONTIMEOUT`, we can inadvertently roll back local changes to the parts.
-          * This is not a problem, because in this case the entry will remain in the queue, and we will try again.
-          */
-        merge_selecting_task->schedule();
-        ProfileEvents::increment(ProfileEvents::ReplicatedPartMutations);
-        write_part_log({});
-
-        return true;
-    }
-    catch (...)
-    {
-        write_part_log(ExecutionStatus::fromCurrentException());
-        throw;
-    }
+    // return true;
 }
 
 
@@ -1966,22 +1568,6 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
     const auto storage_settings_ptr = getSettings();
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    if (storage_settings_ptr->replicated_max_parallel_fetches &&
-        total_fetches >= storage_settings_ptr->replicated_max_parallel_fetches)
-        throw Exception(ErrorCodes::TOO_MANY_FETCHES, "Too many total fetches from replicas, maximum: {} ",
-            storage_settings_ptr->replicated_max_parallel_fetches.toString());
-
-    ++total_fetches;
-    SCOPE_EXIT({--total_fetches;});
-
-    if (storage_settings_ptr->replicated_max_parallel_fetches_for_table
-        && current_table_fetches >= storage_settings_ptr->replicated_max_parallel_fetches_for_table)
-        throw Exception(ErrorCodes::TOO_MANY_FETCHES, "Too many fetches from replicas for table, maximum: {}",
-            storage_settings_ptr->replicated_max_parallel_fetches_for_table.toString());
-
-    ++current_table_fetches;
-    SCOPE_EXIT({--current_table_fetches;});
-
     try
     {
         if (replica.empty())
@@ -2137,6 +1723,8 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry)
             if (!parts_for_merge.empty() && replica.empty())
             {
                 LOG_INFO(log, "No active replica has part {}. Will fetch merged part instead.", entry.new_part_name);
+                /// We should enqueue it for check, because merged part may never appear if source part is lost
+                enqueuePartForCheck(entry.new_part_name);
                 return false;
             }
 
@@ -2173,25 +1761,6 @@ bool StorageReplicatedMergeTree::executeFetchShared(
     const auto storage_settings_ptr = getSettings();
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    if (storage_settings_ptr->replicated_max_parallel_fetches && total_fetches >= storage_settings_ptr->replicated_max_parallel_fetches)
-    {
-        throw Exception("Too many total fetches from replicas, maximum: " + storage_settings_ptr->replicated_max_parallel_fetches.toString(),
-            ErrorCodes::TOO_MANY_FETCHES);
-    }
-
-    ++total_fetches;
-    SCOPE_EXIT({--total_fetches;});
-
-    if (storage_settings_ptr->replicated_max_parallel_fetches_for_table
-        && current_table_fetches >= storage_settings_ptr->replicated_max_parallel_fetches_for_table)
-    {
-        throw Exception("Too many fetches from replicas for table, maximum: " + storage_settings_ptr->replicated_max_parallel_fetches_for_table.toString(),
-            ErrorCodes::TOO_MANY_FETCHES);
-    }
-
-    ++current_table_fetches;
-    SCOPE_EXIT({--current_table_fetches;});
-
     try
     {
         if (!fetchExistsPart(new_part_name, metadata_snapshot, fs::path(zookeeper_path) / "replicas" / source_replica, disk, path))
@@ -2211,8 +1780,10 @@ bool StorageReplicatedMergeTree::executeFetchShared(
 
 void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
 {
+    LOG_TRACE(log, "Executing DROP_RANGE {}", entry.new_part_name);
     auto drop_range_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
     getContext()->getMergeList().cancelInPartition(getStorageID(), drop_range_info.partition_id, drop_range_info.max_block);
+    part_check_thread.cancelRemovedPartsCheck(drop_range_info);
     queue.removePartProducingOpsInRange(getZooKeeper(), drop_range_info, entry);
 
     /// Delete the parts contained in the range to be deleted.
@@ -2227,7 +1798,11 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
         auto data_parts_lock = lockParts();
         parts_to_remove = removePartsInRangeFromWorkingSet(drop_range_info, true, data_parts_lock);
         if (parts_to_remove.empty())
+        {
+            if (!drop_range_info.isFakeDropRangePart())
+                LOG_INFO(log, "Log entry {} tried to drop single part {}, but part does not exist", entry.znode_name, entry.new_part_name);
             return;
+        }
     }
 
     if (entry.detach)
@@ -2276,6 +1851,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(const LogEntry & entry)
     if (replace)
     {
         getContext()->getMergeList().cancelInPartition(getStorageID(), drop_range.partition_id, drop_range.max_block);
+        part_check_thread.cancelRemovedPartsCheck(drop_range);
         queue.removePartProducingOpsInRange(getZooKeeper(), drop_range, entry);
     }
     else
@@ -2750,13 +2326,69 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     std::sort(source_queue_names.begin(), source_queue_names.end());
 
-    Strings source_queue;
-    for (const String & entry_name : source_queue_names)
+    struct QueueEntryInfo
     {
-        String entry;
-        if (!zookeeper->tryGet(fs::path(source_path) / "queue" / entry_name, entry))
-            continue;
-        source_queue.push_back(entry);
+        String data = {};
+        Coordination::Stat stat = {};
+        LogEntryPtr parsed_entry = {};
+    };
+
+    /// We got log pointer and list of queue entries of source replica.
+    /// At first we will get queue entries and then we will get list of active parts of source replica
+    /// to enqueue fetches for missing parts. If source replica executes and removes some entry concurrently
+    /// we will see produced part (or covering part) in replicas/source/parts and will enqueue fetch.
+    /// We will try to parse queue entries before copying them
+    /// to avoid creation of excessive and duplicating entries in our queue.
+    /// See also removePartAndEnqueueFetch(...)
+    std::vector<QueueEntryInfo> source_queue;
+    ActiveDataPartSet get_part_set{format_version};
+    ActiveDataPartSet drop_range_set{format_version};
+
+    {
+        std::vector<zkutil::ZooKeeper::FutureGet> queue_get_futures;
+        queue_get_futures.reserve(source_queue_names.size());
+
+        for (const String & entry_name : source_queue_names)
+            queue_get_futures.push_back(zookeeper->asyncTryGet(fs::path(source_path) / "queue" / entry_name));
+
+        source_queue.reserve(source_queue_names.size());
+        for (size_t i = 0; i < source_queue_names.size(); ++i)
+        {
+            auto res = queue_get_futures[i].get();
+            /// It's ok if entry is already executed and removed: we also will get source parts set.
+            if (res.error == Coordination::Error::ZNONODE)
+                continue;
+
+            assert(res.error == Coordination::Error::ZOK);
+            source_queue.emplace_back();
+            auto & info = source_queue.back();
+            info.data = std::move(res.data);
+            info.stat = std::move(res.stat);
+            try
+            {
+                info.parsed_entry = LogEntry::parse(info.data, info.stat);
+            }
+            catch (...)
+            {
+                tryLogCurrentException(log, "Cannot parse source queue entry " + source_queue_names[i]);
+            }
+
+            /// It may be ok if source replica has newer version. We will copy entry as is.
+            if (!info.parsed_entry)
+                continue;
+
+            info.parsed_entry->znode_name = source_queue_names[i];
+
+            if (info.parsed_entry->type == LogEntry::DROP_RANGE)
+                drop_range_set.add(info.parsed_entry->new_part_name);
+
+            if (info.parsed_entry->type == LogEntry::GET_PART)
+            {
+                String maybe_covering_drop_range = drop_range_set.getContainingPart(info.parsed_entry->new_part_name);
+                if (maybe_covering_drop_range.empty())
+                    get_part_set.add(info.parsed_entry->new_part_name);
+            }
+        }
     }
 
     /// We should do it after copying queue, because some ALTER_METADATA entries can be lost otherwise.
@@ -2764,9 +2396,10 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     /// Add to the queue jobs to receive all the active parts that the reference/master replica has.
     Strings source_replica_parts = zookeeper->getChildren(fs::path(source_path) / "parts");
-    ActiveDataPartSet active_parts_set(format_version, source_replica_parts);
+    for (const auto & active_part : source_replica_parts)
+        get_part_set.add(active_part);
 
-    Strings active_parts = active_parts_set.getParts();
+    Strings active_parts = get_part_set.getParts();
 
     /// Remove local parts if source replica does not have them, because such parts will never be fetched by other replicas.
     Strings local_parts_in_zk = zookeeper->getChildren(fs::path(replica_path) / "parts");
@@ -2774,7 +2407,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     for (const auto & part : local_parts_in_zk)
     {
-        if (active_parts_set.getContainingPart(part).empty())
+        if (get_part_set.getContainingPart(part).empty())
         {
             parts_to_remove_from_zk.emplace_back(part);
             LOG_WARNING(log, "Source replica does not have part {}. Removing it from ZooKeeper.", part);
@@ -2788,7 +2421,8 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
         Coordination::Stat is_lost_stat_new;
         zookeeper->get(fs::path(source_path) / "is_lost", &is_lost_stat_new);
         if (is_lost_stat_new.version != source_is_lost_stat.version)
-            throw Exception(ErrorCodes::REPLICA_STATUS_CHANGED, "Cannot clone {}, because it suddenly become lost", source_replica);
+            throw Exception(ErrorCodes::REPLICA_STATUS_CHANGED, "Cannot clone {}, because it suddenly become lost "
+                                                                "or removed broken part from ZooKeeper", source_replica);
     }
 
     tryRemovePartsFromZooKeeperWithRetries(parts_to_remove_from_zk);
@@ -2799,7 +2433,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     for (const auto & part : local_active_parts)
     {
-        if (active_parts_set.getContainingPart(part->name).empty())
+        if (get_part_set.getContainingPart(part->name).empty())
         {
             parts_to_remove_from_working_set.emplace_back(part);
             LOG_WARNING(log, "Source replica does not have part {}. Removing it from working set.", part->name);
@@ -2819,13 +2453,60 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
 
     removePartsFromWorkingSet(parts_to_remove_from_working_set, true);
 
+    std::unordered_set<String> created_get_parts;
+
+    /// Avoid creation of GET_PART entries which covered by another GET_PART or DROP_RANGE
+    /// and creation of multiple entries with the same new_part_name.
+    auto should_ignore_log_entry = [&drop_range_set, &get_part_set, this] (std::unordered_set<String> & created_gets,
+                                                                    const String & part_name, const String & log_msg_context) -> bool
+    {
+        /// We should not create entries covered by DROP_RANGE, because we will remove them anyway (kind of optimization).
+        String covering_drop_range = drop_range_set.getContainingPart(part_name);
+        if (!covering_drop_range.empty())
+        {
+            LOG_TRACE(log, "{} {}: it's covered by DROP_RANGE {}", log_msg_context, part_name, covering_drop_range);
+            return true;
+        }
+
+        /// We should not create entries covered by GET_PART,
+        /// because GET_PART entry has no source parts and we can execute it only by fetching.
+        /// Parts covered by GET_PART are useless and may cause replication to stuck if covered part is lost.
+        String covering_get_part_entry = get_part_set.getContainingPart(part_name);
+
+        if (covering_get_part_entry.empty())
+            return false;
+
+        if (covering_get_part_entry != part_name)
+        {
+            LOG_TRACE(log, "{} {}: it's covered by GET_PART {}", log_msg_context, part_name, covering_get_part_entry);
+            return true;
+        }
+
+        /// NOTE: It does not completely avoids duplication of GET_PART entries,
+        /// because it's possible that source replica has executed some GET_PART after we copied it's queue,
+        /// but before we copied its active parts set. In this case we will GET_PART entry in our queue
+        /// and later will pull the original GET_PART from replication log.
+        /// It should not cause any issues, but it does not allow to get rid of duplicated entries and add an assertion.
+        if (created_gets.count(part_name))
+        {
+            /// NOTE It would be better to copy log entry instead of creating GET_PART
+            /// if there are GET_PART and log entry of other type with the same new_part_name.
+            /// But it's a bit harder to implement, because it requires full-fledged virtual_parts set.
+            LOG_TRACE(log, "{} {}: GET_PART for it is already created", log_msg_context, part_name);
+            return true;
+        }
+
+        return false;
+    };
+
     for (const String & name : active_parts)
     {
+        if (should_ignore_log_entry(created_get_parts, name, "Not fetching"))
+            continue;
+
         LogEntry log_entry;
 
-        if (!are_restoring_replica)
-            log_entry.type = LogEntry::GET_PART;
-        else
+        if (are_restoring_replica)
         {
             LOG_DEBUG(log, "Obtaining checksum for path {}", name);
 
@@ -2850,23 +2531,47 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
             const auto [lo, hi] = desired_checksums.hash_of_all_files;
             log_entry.part_checksum = getHexUIntUppercase(hi) + getHexUIntUppercase(lo);
         }
+        else
+        {
+            log_entry.type = LogEntry::GET_PART;
+        }
 
         log_entry.source_replica = "";
         log_entry.new_part_name = name;
         log_entry.create_time = tryGetPartCreateTime(zookeeper, source_path, name);
 
+        LOG_TEST(log, "Enqueueing {} for fetch", name);
         zookeeper->create(fs::path(replica_path) / "queue/queue-", log_entry.toString(), zkutil::CreateMode::PersistentSequential);
+        created_get_parts.insert(name);
     }
 
-    LOG_DEBUG(log, "Queued {} parts to be fetched", active_parts.size());
+    size_t total_parts_to_fetch = created_get_parts.size();
+    LOG_DEBUG(log, "Queued {} parts to be fetched, {} parts ignored", total_parts_to_fetch, active_parts.size() - total_parts_to_fetch);
 
     /// Add content of the reference/master replica queue to the queue.
-    for (const String & entry : source_queue)
+    size_t total_entries_to_copy = 0;
+    for (const auto & entry_info : source_queue)
     {
-        zookeeper->create(fs::path(replica_path) / "queue/queue-", entry, zkutil::CreateMode::PersistentSequential);
+        assert(!entry_info.data.empty());
+        if (entry_info.parsed_entry && !entry_info.parsed_entry->new_part_name.empty())
+        {
+            const String & part_name = entry_info.parsed_entry->new_part_name;
+            const String & entry_name = entry_info.parsed_entry->znode_name;
+            const auto & entry_type = entry_info.parsed_entry->type;
+
+            if (should_ignore_log_entry(created_get_parts, part_name, fmt::format("Not copying {} {} ", entry_name, entry_type)))
+                continue;
+
+            if (entry_info.parsed_entry->type == LogEntry::GET_PART)
+                created_get_parts.insert(part_name);
+        }
+
+        LOG_TEST(log, "Copying entry {}", entry_info.data);
+        zookeeper->create(fs::path(replica_path) / "queue/queue-", entry_info.data, zkutil::CreateMode::PersistentSequential);
+        ++total_entries_to_copy;
     }
 
-    LOG_DEBUG(log, "Copied {} queue entries", source_queue.size());
+    LOG_DEBUG(log, "Copied {} queue entries, {} entries ignored", total_entries_to_copy, source_queue.size() - total_entries_to_copy);
 }
 
 
@@ -3073,6 +2778,12 @@ void StorageReplicatedMergeTree::cloneReplicaIfNeeded(zkutil::ZooKeeperPtr zooke
     zookeeper->set(fs::path(replica_path) / "is_lost", "0");
 }
 
+String StorageReplicatedMergeTree::getLastQueueUpdateException() const
+{
+    std::unique_lock lock(last_queue_update_exception_lock);
+    return last_queue_update_exception;
+}
+
 
 void StorageReplicatedMergeTree::queueUpdatingTask()
 {
@@ -3083,7 +2794,7 @@ void StorageReplicatedMergeTree::queueUpdatingTask()
     }
     try
     {
-        queue.pullLogsToQueue(getZooKeeper(), queue_updating_task->getWatchCallback());
+        queue.pullLogsToQueue(getZooKeeper(), queue_updating_task->getWatchCallback(), ReplicatedMergeTreeQueue::UPDATE);
         last_queue_update_finish_time.store(time(nullptr));
         queue_update_in_progress = false;
     }
@@ -3091,6 +2802,9 @@ void StorageReplicatedMergeTree::queueUpdatingTask()
     {
         tryLogCurrentException(log, __PRETTY_FUNCTION__);
 
+        std::unique_lock lock(last_queue_update_exception_lock);
+        last_queue_update_exception = getCurrentExceptionMessage(false);
+
         if (e.code == Coordination::Error::ZSESSIONEXPIRED)
         {
             restarting_thread.wakeup();
@@ -3102,6 +2816,10 @@ void StorageReplicatedMergeTree::queueUpdatingTask()
     catch (...)
     {
         tryLogCurrentException(log, __PRETTY_FUNCTION__);
+
+        std::unique_lock lock(last_queue_update_exception_lock);
+        last_queue_update_exception = getCurrentExceptionMessage(false);
+
         queue_updating_task->scheduleAfter(QUEUE_UPDATE_ERROR_SLEEP_MS);
     }
 }
@@ -3146,9 +2864,9 @@ ReplicatedMergeTreeQueue::SelectedEntryPtr StorageReplicatedMergeTree::selectQue
     return selected;
 }
 
+
 bool StorageReplicatedMergeTree::processQueueEntry(ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry)
 {
-
     LogEntryPtr & entry = selected_entry->log_entry;
     return queue.processEntry([this]{ return getZooKeeper(); }, entry, [&](LogEntryPtr & entry_to_process)
     {
@@ -3191,7 +2909,7 @@ bool StorageReplicatedMergeTree::processQueueEntry(ReplicatedMergeTreeQueue::Sel
     });
 }
 
-bool StorageReplicatedMergeTree::scheduleDataProcessingJob(IBackgroundJobExecutor & executor)
+bool StorageReplicatedMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assignee)
 {
     /// If replication queue is stopped exit immediately as we successfully executed the task
     if (queue.actions_blocker.isCancelled())
@@ -3203,21 +2921,37 @@ bool StorageReplicatedMergeTree::scheduleDataProcessingJob(IBackgroundJobExecuto
     if (!selected_entry)
         return false;
 
+    auto job_type = selected_entry->log_entry->type;
+
     /// Depending on entry type execute in fetches (small) pool or big merge_mutate pool
-    if (selected_entry->log_entry->type == LogEntry::GET_PART)
+    if (job_type == LogEntry::GET_PART)
     {
-        executor.execute({[this, selected_entry] () mutable
-        {
-            return processQueueEntry(selected_entry);
-        }, PoolType::FETCH});
+        assignee.scheduleFetchTask(ExecutableLambdaAdapter::create(
+            [this, selected_entry] () mutable
+            {
+                return processQueueEntry(selected_entry);
+            }, common_assignee_trigger, getStorageID()));
+        return true;
+    }
+    else if (job_type == LogEntry::MERGE_PARTS)
+    {
+        auto task = MergeFromLogEntryTask::create(selected_entry, *this, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
+        return true;
+    }
+    else if (job_type == LogEntry::MUTATE_PART)
+    {
+        auto task = MutateFromLogEntryTask::create(selected_entry, *this, common_assignee_trigger);
+        assignee.scheduleMergeMutateTask(task);
         return true;
     }
     else
     {
-        executor.execute({[this, selected_entry] () mutable
-        {
-            return processQueueEntry(selected_entry);
-        }, PoolType::MERGE_MUTATE});
+        assignee.scheduleCommonTask(ExecutableLambdaAdapter::create(
+            [this, selected_entry] () mutable
+            {
+                return processQueueEntry(selected_entry);
+            }, common_assignee_trigger, getStorageID()));
         return true;
     }
 }
@@ -3297,24 +3031,24 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
             bool merge_with_ttl_allowed = merges_and_mutations_queued.merges_with_ttl < storage_settings_ptr->max_replicated_merges_with_ttl_in_queue &&
                 getTotalMergesWithTTLInMergeList() < storage_settings_ptr->max_number_of_merges_with_ttl_in_pool;
 
-            FutureMergedMutatedPart future_merged_part;
+            auto future_merged_part = std::make_shared<FutureMergedMutatedPart>();
             if (storage_settings.get()->assign_part_uuids)
-                future_merged_part.uuid = UUIDHelpers::generateV4();
+                future_merged_part->uuid = UUIDHelpers::generateV4();
 
             if (max_source_parts_size_for_merge > 0 &&
                 merger_mutator.selectPartsToMerge(future_merged_part, false, max_source_parts_size_for_merge, merge_pred, merge_with_ttl_allowed, nullptr) == SelectPartsDecision::SELECTED)
             {
                 create_result = createLogEntryToMergeParts(
                     zookeeper,
-                    future_merged_part.parts,
-                    future_merged_part.name,
-                    future_merged_part.uuid,
-                    future_merged_part.type,
+                    future_merged_part->parts,
+                    future_merged_part->name,
+                    future_merged_part->uuid,
+                    future_merged_part->type,
                     deduplicate,
                     deduplicate_by_columns,
                     nullptr,
                     merge_pred.getVersion(),
-                    future_merged_part.merge_type);
+                    future_merged_part->merge_type);
             }
             /// If there are many mutations in queue, it may happen, that we cannot enqueue enough merges to merge all new parts
             else if (max_source_part_size_for_mutation > 0 && queue.countMutations() > 0
@@ -3333,7 +3067,7 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
 
                     create_result = createLogEntryToMutatePart(
                         *part,
-                        future_merged_part.uuid,
+                        future_merged_part->uuid,
                         desired_mutation_version->first,
                         desired_mutation_version->second,
                         merge_pred.getVersion());
@@ -3574,6 +3308,34 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
 {
     auto zookeeper = getZooKeeper();
 
+    /// We don't know exactly what happened to broken part
+    /// and we are going to remove all covered log entries.
+    /// It's quite dangerous, so clone covered parts to detached.
+    auto broken_part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
+
+    auto partition_range = getDataPartsPartitionRange(broken_part_info.partition_id);
+    for (const auto & part : partition_range)
+    {
+        if (!broken_part_info.contains(part->info))
+            continue;
+
+        /// Broken part itself ether already moved to detached or does not exist.
+        assert(broken_part_info != part->info);
+        part->makeCloneInDetached("covered-by-broken", getInMemoryMetadataPtr());
+    }
+
+    /// It's possible that queue contains entries covered by part_name.
+    /// For example, we had GET_PART all_1_42_5 and MUTATE_PART all_1_42_5_63,
+    /// then all_1_42_5_63 was executed by fetching, but part was written to disk incorrectly.
+    /// In this case we have to remove it as broken and create GET_PART all_1_42_5_63 to fetch it again,
+    /// but GET_PART all_1_42_5 may be still in the queue.
+    /// We should remove all covered entries before creating GET_PART entry, because:
+    ///    1. In the situation described above, we do not know how to merge/mutate all_1_42_5_63 from all_1_42_5,
+    ///       so GET_PART all_1_42_5 (and all source parts) is useless. The only thing we can do is to fetch all_1_42_5_63.
+    ///    2. If all_1_42_5_63 is lost, then replication may stuck waiting for all_1_42_5_63 to appear,
+    ///       because we may have some covered parts (more precisely, parts with the same min and max blocks)
+    queue.removePartProducingOpsInRange(zookeeper, broken_part_info, {});
+
     String part_path = fs::path(replica_path) / "parts" / part_name;
 
     Coordination::Requests ops;
@@ -3582,6 +3344,14 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
     Coordination::Stat stat;
     if (zookeeper->exists(part_path, &stat))
     {
+        /// Update version of /is_lost node to avoid race condition with cloneReplica(...).
+        /// cloneReplica(...) expects that if some entry was executed, then its new_part_name is added to /parts,
+        /// but we are going to remove it from /parts and add to queue again.
+        Coordination::Stat is_lost_stat;
+        String is_lost_value = zookeeper->get(replica_path + "/is_lost", &is_lost_stat);
+        assert(is_lost_value == "0");
+        ops.emplace_back(zkutil::makeSetRequest(replica_path + "/is_lost", is_lost_value, is_lost_stat.version));
+
         part_create_time = stat.ctime / 1000;
         removePartFromZooKeeper(part_name, ops, stat.numChildren > 0);
     }
@@ -4308,8 +4078,6 @@ void StorageReplicatedMergeTree::startup()
 
     try
     {
-        queue.initialize(getDataParts());
-
         InterserverIOEndpointPtr data_parts_exchange_ptr = std::make_shared<DataPartsExchange::Service>(*this);
         [[maybe_unused]] auto prev_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, data_parts_exchange_ptr);
         assert(prev_ptr == nullptr);
@@ -4321,9 +4089,6 @@ void StorageReplicatedMergeTree::startup()
         /// Wait while restarting_thread initializes LeaderElection (and so on) or makes first attempt to do it
         startup_event.wait();
 
-        /// If we don't separate create/start steps, race condition will happen
-        /// between the assignment of queue_task_handle and queueTask that use the queue_task_handle.
-        background_executor.start();
         startBackgroundMovesIfNeeded();
 
         part_moves_between_shards_orchestrator.start();
@@ -4356,7 +4121,7 @@ void StorageReplicatedMergeTree::shutdown()
     parts_mover.moves_blocker.cancelForever();
 
     restarting_thread.shutdown();
-    background_executor.finish();
+    background_operations_assignee.finish();
     part_moves_between_shards_orchestrator.shutdown();
 
     {
@@ -4366,7 +4131,7 @@ void StorageReplicatedMergeTree::shutdown()
         /// MUTATE, etc. query.
         queue.pull_log_blocker.cancelForever();
     }
-    background_moves_executor.finish();
+    background_moves_assignee.finish();
 
     auto data_parts_exchange_ptr = std::atomic_exchange(&data_parts_exchange_endpoint, InterserverIOEndpointPtr{});
     if (data_parts_exchange_ptr)
@@ -4585,145 +4350,123 @@ bool StorageReplicatedMergeTree::optimize(
     if (!is_leader)
         throw Exception("OPTIMIZE cannot be done on this replica because it is not a leader", ErrorCodes::NOT_A_LEADER);
 
-    constexpr size_t max_retries = 10;
+    auto handle_noop = [&] (const String & message)
+    {
+        if (query_context->getSettingsRef().optimize_throw_if_noop)
+            throw Exception(message, ErrorCodes::CANNOT_ASSIGN_OPTIMIZE);
+        return false;
+    };
 
+    auto zookeeper = getZooKeeper();
+    UInt64 disk_space = getStoragePolicy()->getMaxUnreservedFreeSpace();
+    const auto storage_settings_ptr = getSettings();
+    auto metadata_snapshot = getInMemoryMetadataPtr();
     std::vector<ReplicatedMergeTreeLogEntryData> merge_entries;
+
+    auto try_assign_merge = [&](const String & partition_id) -> bool
     {
-        auto zookeeper = getZooKeeper();
-
-        auto handle_noop = [&] (const String & message)
+        constexpr size_t max_retries = 10;
+        size_t try_no = 0;
+        for (; try_no < max_retries; ++try_no)
         {
-            if (query_context->getSettingsRef().optimize_throw_if_noop)
-                throw Exception(message, ErrorCodes::CANNOT_ASSIGN_OPTIMIZE);
-            return false;
-        };
+            /// We must select parts for merge under merge_selecting_mutex because other threads
+            /// (merge_selecting_thread or OPTIMIZE queries) could assign new merges.
+            std::lock_guard merge_selecting_lock(merge_selecting_mutex);
+            ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
 
-        const auto storage_settings_ptr = getSettings();
-        auto metadata_snapshot = getInMemoryMetadataPtr();
+            auto future_merged_part = std::make_shared<FutureMergedMutatedPart>();
+            if (storage_settings.get()->assign_part_uuids)
+                future_merged_part->uuid = UUIDHelpers::generateV4();
 
-        if (!partition && final)
-        {
-            DataPartsVector data_parts = getDataPartsVector();
-            std::unordered_set<String> partition_ids;
+            constexpr const char * unknown_disable_reason = "unknown reason";
+            String disable_reason = unknown_disable_reason;
+            SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
 
-            for (const DataPartPtr & part : data_parts)
-                partition_ids.emplace(part->info.partition_id);
-
-            UInt64 disk_space = getStoragePolicy()->getMaxUnreservedFreeSpace();
-
-            for (const String & partition_id : partition_ids)
+            if (partition_id.empty())
             {
-                size_t try_no = 0;
-                for (; try_no < max_retries; ++try_no)
-                {
-                    /// We must select parts for merge under merge_selecting_mutex because other threads
-                    /// (merge_selecting_thread or OPTIMIZE queries) could assign new merges.
-                    std::lock_guard merge_selecting_lock(merge_selecting_mutex);
-                    ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
-
-                    FutureMergedMutatedPart future_merged_part;
-
-                    if (storage_settings.get()->assign_part_uuids)
-                        future_merged_part.uuid = UUIDHelpers::generateV4();
-
-                    SelectPartsDecision select_decision = merger_mutator.selectAllPartsToMergeWithinPartition(
-                        future_merged_part, disk_space, can_merge, partition_id, true, metadata_snapshot, nullptr, query_context->getSettingsRef().optimize_skip_merged_partitions);
-
-                    if (select_decision != SelectPartsDecision::SELECTED)
-                        break;
-
-                    ReplicatedMergeTreeLogEntryData merge_entry;
-                    CreateMergeEntryResult create_result = createLogEntryToMergeParts(
-                        zookeeper, future_merged_part.parts,
-                        future_merged_part.name, future_merged_part.uuid, future_merged_part.type,
-                        deduplicate, deduplicate_by_columns,
-                        &merge_entry, can_merge.getVersion(), future_merged_part.merge_type);
-
-                    if (create_result == CreateMergeEntryResult::MissingPart)
-                        return handle_noop("Can't create merge queue node in ZooKeeper, because some parts are missing");
-
-                    if (create_result == CreateMergeEntryResult::LogUpdated)
-                        continue;
-
-                    merge_entries.push_back(std::move(merge_entry));
-                    break;
-                }
-                if (try_no == max_retries)
-                    return handle_noop("Can't create merge queue node in ZooKeeper, because log was updated in every of "
-                        + toString(max_retries) + " tries");
+                select_decision = merger_mutator.selectPartsToMerge(
+                    future_merged_part, /* aggressive */ true, storage_settings_ptr->max_bytes_to_merge_at_max_space_in_pool,
+                    can_merge, /* merge_with_ttl_allowed */ false, &disable_reason);
             }
-        }
-        else
-        {
-            size_t try_no = 0;
-            for (; try_no < max_retries; ++try_no)
+            else
             {
-                std::lock_guard merge_selecting_lock(merge_selecting_mutex);
-                ReplicatedMergeTreeMergePredicate can_merge = queue.getMergePredicate(zookeeper);
+                select_decision = merger_mutator.selectAllPartsToMergeWithinPartition(
+                    future_merged_part, disk_space, can_merge, partition_id, final, metadata_snapshot,
+                    &disable_reason, query_context->getSettingsRef().optimize_skip_merged_partitions);
+            }
 
-                FutureMergedMutatedPart future_merged_part;
-                if (storage_settings.get()->assign_part_uuids)
-                    future_merged_part.uuid = UUIDHelpers::generateV4();
+            /// If there is nothing to merge then we treat this merge as successful (needed for optimize final optimization)
+            if (select_decision == SelectPartsDecision::NOTHING_TO_MERGE)
+                return false;
 
-                String disable_reason;
-                SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
+            if (select_decision != SelectPartsDecision::SELECTED)
+            {
+                constexpr const char * message_fmt = "Cannot select parts for optimization: {}";
+                assert(disable_reason != unknown_disable_reason);
+                if (!partition_id.empty())
+                    disable_reason += fmt::format(" (in partition {})", partition_id);
+                String message = fmt::format(message_fmt, disable_reason);
+                LOG_INFO(log, message);
+                return handle_noop(message);
+            }
 
-                if (!partition)
-                {
-                    select_decision = merger_mutator.selectPartsToMerge(
-                        future_merged_part, true, storage_settings_ptr->max_bytes_to_merge_at_max_space_in_pool, can_merge, false, &disable_reason);
-                }
-                else
-                {
-                    UInt64 disk_space = getStoragePolicy()->getMaxUnreservedFreeSpace();
-                    String partition_id = getPartitionIDFromQuery(partition, query_context);
-                    select_decision = merger_mutator.selectAllPartsToMergeWithinPartition(
-                        future_merged_part, disk_space, can_merge, partition_id, final, metadata_snapshot, &disable_reason, query_context->getSettingsRef().optimize_skip_merged_partitions);
-                }
+            ReplicatedMergeTreeLogEntryData merge_entry;
+            CreateMergeEntryResult create_result = createLogEntryToMergeParts(
+                zookeeper, future_merged_part->parts,
+                future_merged_part->name, future_merged_part->uuid, future_merged_part->type,
+                deduplicate, deduplicate_by_columns,
+                &merge_entry, can_merge.getVersion(), future_merged_part->merge_type);
 
-                /// If there is nothing to merge then we treat this merge as successful (needed for optimize final optimization)
-                if (select_decision == SelectPartsDecision::NOTHING_TO_MERGE)
-                    break;
+            if (create_result == CreateMergeEntryResult::MissingPart)
+            {
+                String message = "Can't create merge queue node in ZooKeeper, because some parts are missing";
+                LOG_TRACE(log, message);
+                return handle_noop(message);
+            }
 
-                if (select_decision != SelectPartsDecision::SELECTED)
-                {
-                    constexpr const char * message_fmt = "Cannot select parts for optimization: {}";
-                    if (disable_reason.empty())
-                        disable_reason = "unknown reason";
-                    LOG_INFO(log, message_fmt, disable_reason);
-                    return handle_noop(fmt::format(message_fmt, disable_reason));
-                }
+            if (create_result == CreateMergeEntryResult::LogUpdated)
+                continue;
 
-                ReplicatedMergeTreeLogEntryData merge_entry;
-                CreateMergeEntryResult create_result = createLogEntryToMergeParts(
-                    zookeeper, future_merged_part.parts,
-                    future_merged_part.name, future_merged_part.uuid, future_merged_part.type,
-                    deduplicate, deduplicate_by_columns,
-                    &merge_entry, can_merge.getVersion(), future_merged_part.merge_type);
+            merge_entries.push_back(std::move(merge_entry));
+            return true;
+        }
 
-                if (create_result == CreateMergeEntryResult::MissingPart)
-                    return handle_noop("Can't create merge queue node in ZooKeeper, because some parts are missing");
+        assert(try_no == max_retries);
+        String message = fmt::format("Can't create merge queue node in ZooKeeper, because log was updated in every of {} tries", try_no);
+        LOG_TRACE(log, message);
+        return handle_noop(message);
+    };
 
-                if (create_result == CreateMergeEntryResult::LogUpdated)
-                    continue;
+    bool assigned = false;
+    if (!partition && final)
+    {
+        DataPartsVector data_parts = getDataPartsVector();
+        std::unordered_set<String> partition_ids;
 
-                merge_entries.push_back(std::move(merge_entry));
+        for (const DataPartPtr & part : data_parts)
+            partition_ids.emplace(part->info.partition_id);
+
+        for (const String & partition_id : partition_ids)
+        {
+            assigned = try_assign_merge(partition_id);
+            if (!assigned)
                 break;
-            }
-            if (try_no == max_retries)
-                return handle_noop("Can't create merge queue node in ZooKeeper, because log was updated in every of "
-                    + toString(max_retries) + " tries");
         }
     }
-
-    if (query_context->getSettingsRef().replication_alter_partitions_sync != 0)
+    else
     {
-        /// NOTE Table lock must not be held while waiting. Some combination of R-W-R locks from different threads will yield to deadlock.
-        for (auto & merge_entry : merge_entries)
-            waitForAllReplicasToProcessLogEntry(merge_entry, false);
+        String partition_id;
+        if (partition)
+            partition_id = getPartitionIDFromQuery(partition, query_context);
+        assigned = try_assign_merge(partition_id);
     }
 
-    return true;
+    table_lock.reset();
+
+    for (auto & merge_entry : merge_entries)
+        waitForLogEntryToBeProcessedIfNecessary(merge_entry, query_context);
+
+    return assigned;
 }
 
 bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMergeTree::LogEntry & entry)
@@ -4754,7 +4497,8 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
     zookeeper->multi(requests);
 
     {
-        auto lock = lockForAlter(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
+        auto table_lock_holder = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
+        auto alter_lock_holder = lockForAlter(getSettings()->lock_acquire_timeout_for_background_operations);
         LOG_INFO(log, "Metadata changed in ZooKeeper. Applying changes locally.");
 
         auto metadata_diff = ReplicatedMergeTreeTableMetadata(*this, getInMemoryMetadataPtr()).checkAndFindDiff(metadata_from_entry);
@@ -4826,7 +4570,7 @@ PartitionBlockNumbersHolder StorageReplicatedMergeTree::allocateBlockNumbersInAf
 
 
 void StorageReplicatedMergeTree::alter(
-    const AlterCommands & commands, ContextPtr query_context, TableLockHolder & table_lock_holder)
+    const AlterCommands & commands, ContextPtr query_context, AlterLockHolder & table_lock_holder)
 {
     assertNotReadonly();
 
@@ -5014,7 +4758,8 @@ void StorageReplicatedMergeTree::alter(
         else if (rc == Coordination::Error::ZBADVERSION)
         {
             if (results[0]->error != Coordination::Error::ZOK)
-                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. Cannot alter",
+                throw Exception("Metadata on replica is not up to date with common metadata in Zookeeper. It means that this replica still not applied some of previous alters."
+                                " Probably too many alters executing concurrently (highly not recommended). You can retry this error",
                     ErrorCodes::CANNOT_ASSIGN_ALTER);
 
             /// Cannot retry automatically, because some zookeeper ops were lost on the first attempt. Will retry on DDLWorker-level.
@@ -5030,22 +4775,10 @@ void StorageReplicatedMergeTree::alter(
         }
     }
 
-    table_lock_holder.reset();
+    table_lock_holder.unlock();
 
-    std::vector<String> unwaited;
-    if (query_context->getSettingsRef().replication_alter_partitions_sync == 2)
-    {
-        LOG_DEBUG(log, "Updated shared metadata nodes in ZooKeeper. Waiting for replicas to apply changes.");
-        unwaited = waitForAllReplicasToProcessLogEntry(*alter_entry, false);
-    }
-    else if (query_context->getSettingsRef().replication_alter_partitions_sync == 1)
-    {
-        LOG_DEBUG(log, "Updated shared metadata nodes in ZooKeeper. Waiting for replicas to apply changes.");
-        waitForReplicaToProcessLogEntry(replica_name, *alter_entry);
-    }
-
-    if (!unwaited.empty())
-        throw Exception("Some replicas doesn't finish metadata alter", ErrorCodes::UNFINISHED);
+    LOG_DEBUG(log, "Updated shared metadata nodes in ZooKeeper. Waiting for replicas to apply changes.");
+    waitForLogEntryToBeProcessedIfNecessary(*alter_entry, query_context, "Some replicas doesn't finish metadata alter: ");
 
     if (mutation_znode)
     {
@@ -5057,7 +4790,7 @@ void StorageReplicatedMergeTree::alter(
 
 /// If new version returns ordinary name, else returns part name containing the first and last month of the month
 /// NOTE: use it in pair with getFakePartCoveringAllPartsInPartition(...)
-static String getPartNamePossiblyFake(MergeTreeDataFormatVersion format_version, const MergeTreePartInfo & part_info)
+String getPartNamePossiblyFake(MergeTreeDataFormatVersion format_version, const MergeTreePartInfo & part_info)
 {
     if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
@@ -5132,7 +4865,7 @@ void StorageReplicatedMergeTree::restoreMetadataInZooKeeper()
 
     auto metadata_snapshot = getInMemoryMetadataPtr();
 
-    const DataPartsVector all_parts = getDataPartsVector(IMergeTreeDataPart::all_part_states);
+    const DataPartsVector all_parts = getAllDataPartsVector();
     Strings active_parts_names;
 
     /// Why all parts (not only Committed) are moved to detached/:
@@ -5196,11 +4929,7 @@ void StorageReplicatedMergeTree::dropPart(const String & part_name, bool detach,
 
     dropPartImpl(zookeeper, part_name, entry, detach, /*throw_if_noop=*/ true);
 
-    /// If necessary, wait until the operation is performed on itself or on all replicas.
-    if (query_context->getSettingsRef().replication_alter_partitions_sync == 1)
-        waitForReplicaToProcessLogEntry(replica_name, entry);
-    else if (query_context->getSettingsRef().replication_alter_partitions_sync == 2)
-        waitForAllReplicasToProcessLogEntry(entry);
+    waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
 }
 
 void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool detach, ContextPtr query_context)
@@ -5217,12 +4946,7 @@ void StorageReplicatedMergeTree::dropPartition(const ASTPtr & partition, bool de
 
     if (did_drop)
     {
-        /// If necessary, wait until the operation is performed on itself or on all replicas.
-        if (query_context->getSettingsRef().replication_alter_partitions_sync == 1)
-            waitForReplicaToProcessLogEntry(replica_name, entry);
-        else if (query_context->getSettingsRef().replication_alter_partitions_sync == 2)
-            waitForAllReplicasToProcessLogEntry(entry);
-
+        waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
         cleanLastPartNode(partition_id);
     }
 }
@@ -5241,13 +4965,17 @@ void StorageReplicatedMergeTree::truncate(
 
     Strings partitions = zookeeper->getChildren(fs::path(zookeeper_path) / "block_numbers");
 
+    std::vector<std::unique_ptr<LogEntry>> entries_to_wait;
+    entries_to_wait.reserve(partitions.size());
     for (String & partition_id : partitions)
     {
-        LogEntry entry;
-
-        if (dropAllPartsInPartition(*zookeeper, partition_id, entry, query_context, false))
-            waitForAllReplicasToProcessLogEntry(entry);
+        auto entry = std::make_unique<LogEntry>();
+        if (dropAllPartsInPartition(*zookeeper, partition_id, *entry, query_context, false))
+            entries_to_wait.push_back(std::move(entry));
     }
+
+    for (const auto & entry : entries_to_wait)
+        waitForLogEntryToBeProcessedIfNecessary(*entry, query_context);
 }
 
 
@@ -5405,19 +5133,20 @@ StorageReplicatedMergeTree::allocateBlockNumber(
 }
 
 
-Strings StorageReplicatedMergeTree::waitForAllTableReplicasToProcessLogEntry(
-    const String & table_zookeeper_path, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active)
+Strings StorageReplicatedMergeTree::tryWaitForAllReplicasToProcessLogEntry(
+    const String & table_zookeeper_path, const ReplicatedMergeTreeLogEntryData & entry, Int64 wait_for_inactive_timeout)
 {
     LOG_DEBUG(log, "Waiting for all replicas to process {}", entry.znode_name);
 
     auto zookeeper = getZooKeeper();
     Strings replicas = zookeeper->getChildren(fs::path(table_zookeeper_path) / "replicas");
     Strings unwaited;
+    bool wait_for_inactive = wait_for_inactive_timeout != 0;
     for (const String & replica : replicas)
     {
-        if (wait_for_non_active || zookeeper->exists(fs::path(table_zookeeper_path) / "replicas" / replica / "is_active"))
+        if (wait_for_inactive || zookeeper->exists(fs::path(table_zookeeper_path) / "replicas" / replica / "is_active"))
         {
-            if (!waitForTableReplicaToProcessLogEntry(table_zookeeper_path, replica, entry, wait_for_non_active))
+            if (!tryWaitForReplicaToProcessLogEntry(table_zookeeper_path, replica, entry, wait_for_inactive_timeout))
                 unwaited.push_back(replica);
         }
         else
@@ -5430,16 +5159,38 @@ Strings StorageReplicatedMergeTree::waitForAllTableReplicasToProcessLogEntry(
     return unwaited;
 }
 
-
-Strings StorageReplicatedMergeTree::waitForAllReplicasToProcessLogEntry(
-    const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active)
+void StorageReplicatedMergeTree::waitForAllReplicasToProcessLogEntry(
+    const String & table_zookeeper_path, const ReplicatedMergeTreeLogEntryData & entry, Int64 wait_for_inactive_timeout, const String & error_context)
 {
-    return waitForAllTableReplicasToProcessLogEntry(zookeeper_path, entry, wait_for_non_active);
+    Strings unfinished_replicas = tryWaitForAllReplicasToProcessLogEntry(table_zookeeper_path, entry, wait_for_inactive_timeout);
+    if (unfinished_replicas.empty())
+        return;
+
+    throw Exception(ErrorCodes::UNFINISHED, "{}Timeout exceeded while waiting for replicas {} to process entry {}. "
+                    "Probably some replicas are inactive", error_context, fmt::join(unfinished_replicas, ", "), entry.znode_name);
 }
 
+void StorageReplicatedMergeTree::waitForLogEntryToBeProcessedIfNecessary(const ReplicatedMergeTreeLogEntryData & entry, ContextPtr query_context, const String & error_context)
+{
+    /// If necessary, wait until the operation is performed on itself or on all replicas.
+    Int64 wait_for_inactive_timeout = query_context->getSettingsRef().replication_wait_for_inactive_replica_timeout;
+    if (query_context->getSettingsRef().replication_alter_partitions_sync == 1)
+    {
+        bool finished = tryWaitForReplicaToProcessLogEntry(zookeeper_path, replica_name, entry, wait_for_inactive_timeout);
+        if (!finished)
+        {
+            throw Exception(ErrorCodes::UNFINISHED, "{}Log entry {} is not precessed on local replica, "
+                            "most likely because the replica was shut down.", error_context, entry.znode_name);
+        }
+    }
+    else if (query_context->getSettingsRef().replication_alter_partitions_sync == 2)
+    {
+        waitForAllReplicasToProcessLogEntry(zookeeper_path, entry, wait_for_inactive_timeout, error_context);
+    }
+}
 
-bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
-    const String & table_zookeeper_path, const String & replica, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active)
+bool StorageReplicatedMergeTree::tryWaitForReplicaToProcessLogEntry(
+    const String & table_zookeeper_path, const String & replica, const ReplicatedMergeTreeLogEntryData & entry, Int64 wait_for_inactive_timeout)
 {
     String entry_str = entry.toString();
     String log_node_name;
@@ -5457,17 +5208,26 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
       */
 
     bool waiting_itself = replica == replica_name;
+    /// Do not wait if timeout is zero
+    bool wait_for_inactive = wait_for_inactive_timeout != 0;
+    /// Wait for unlimited time if timeout is negative
+    bool check_timeout = wait_for_inactive_timeout > 0;
+    Stopwatch time_waiting;
 
     const auto & stop_waiting = [&]()
     {
-        bool stop_waiting_itself = waiting_itself && (partial_shutdown_called || is_dropped);
-        bool stop_waiting_non_active = !wait_for_non_active && !getZooKeeper()->exists(fs::path(table_zookeeper_path) / "replicas" / replica / "is_active");
-        return stop_waiting_itself || stop_waiting_non_active;
+        bool stop_waiting_itself = waiting_itself && partial_shutdown_called;
+        bool timeout_exceeded = check_timeout && wait_for_inactive_timeout < time_waiting.elapsedSeconds();
+        bool stop_waiting_inactive = (!wait_for_inactive || timeout_exceeded)
+            && !getZooKeeper()->exists(fs::path(table_zookeeper_path) / "replicas" / replica / "is_active");
+        return is_dropped || stop_waiting_itself || stop_waiting_inactive;
     };
 
     /// Don't recheck ZooKeeper too often
     constexpr auto event_wait_timeout_ms = 3000;
 
+    LOG_DEBUG(log, "Waiting for {} to process log entry", replica);
+
     if (startsWith(entry.znode_name, "log-"))
     {
         /// Take the number from the node name `log-xxxxxxxxxx`.
@@ -5477,25 +5237,98 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
         LOG_DEBUG(log, "Waiting for {} to pull {} to queue", replica, log_node_name);
 
         /// Let's wait until entry gets into the replica queue.
-        while (!stop_waiting())
+        bool pulled_to_queue = false;
+        do
         {
             zkutil::EventPtr event = std::make_shared<Poco::Event>();
 
             String log_pointer = getZooKeeper()->get(fs::path(table_zookeeper_path) / "replicas" / replica / "log_pointer", nullptr, event);
             if (!log_pointer.empty() && parse<UInt64>(log_pointer) > log_index)
+            {
+                pulled_to_queue = true;
                 break;
+            }
 
             /// Wait with timeout because we can be already shut down, but not dropped.
             /// So log_pointer node will exist, but we will never update it because all background threads already stopped.
             /// It can lead to query hung because table drop query can wait for some query (alter, optimize, etc) which called this method,
             /// but the query will never finish because the drop already shut down the table.
-            event->tryWait(event_wait_timeout_ms);
+            if (!stop_waiting())
+                event->tryWait(event_wait_timeout_ms);
+        } while (!stop_waiting());
+
+        if (!pulled_to_queue)
+            return false;
+
+        LOG_DEBUG(log, "Looking for node corresponding to {} in {} queue", log_node_name, replica);
+    }
+    else if (!entry.log_entry_id.empty())
+    {
+        /// First pass, check the table log.
+        /// If found in the log, wait for replica to fetch it to the queue.
+        /// If not found in the log, it is already in the queue.
+        LOG_DEBUG(log, "Looking for log entry with id `{}` in the log", entry.log_entry_id);
+
+        String log_pointer = getZooKeeper()->get(fs::path(table_zookeeper_path) / "replicas" / replica / "log_pointer");
+
+        Strings log_entries = getZooKeeper()->getChildren(fs::path(table_zookeeper_path) / "log");
+        UInt64 log_index = 0;
+        bool found = false;
+
+        for (const String & log_entry_name : log_entries)
+        {
+            log_index = parse<UInt64>(log_entry_name.substr(log_entry_name.size() - 10));
+
+            if (!log_pointer.empty() && log_index < parse<UInt64>(log_pointer))
+                continue;
+
+            String log_entry_str;
+            Coordination::Stat log_entry_stat;
+            bool exists = getZooKeeper()->tryGet(fs::path(table_zookeeper_path) / "log" / log_entry_name, log_entry_str, &log_entry_stat);
+            ReplicatedMergeTreeLogEntryData log_entry = *ReplicatedMergeTreeLogEntry::parse(log_entry_str, log_entry_stat);
+            if (exists && entry.log_entry_id == log_entry.log_entry_id)
+            {
+                LOG_DEBUG(log, "Found log entry with id `{}` in the log", entry.log_entry_id);
+
+                found = true;
+                log_node_name = log_entry_name;
+                break;
+            }
+        }
+
+        if (found)
+        {
+            LOG_DEBUG(log, "Waiting for {} to pull {} to queue", replica, log_node_name);
+
+            /// Let's wait until entry gets into the replica queue.
+            bool pulled_to_queue = false;
+            do
+            {
+                zkutil::EventPtr event = std::make_shared<Poco::Event>();
+
+                log_pointer = getZooKeeper()->get(fs::path(table_zookeeper_path) / "replicas" / replica / "log_pointer", nullptr, event);
+                if (!log_pointer.empty() && parse<UInt64>(log_pointer) > log_index)
+                {
+                    pulled_to_queue = true;
+                    break;
+                }
+
+                /// Wait with timeout because we can be already shut down, but not dropped.
+                /// So log_pointer node will exist, but we will never update it because all background threads already stopped.
+                /// It can lead to query hung because table drop query can wait for some query (alter, optimize, etc) which called this method,
+                /// but the query will never finish because the drop already shut down the table.
+                if (!stop_waiting())
+                    event->tryWait(event_wait_timeout_ms);
+            } while (!stop_waiting());
+
+            if (!pulled_to_queue)
+                return false;
         }
     }
     else
+    {
         throw Exception("Logical error: unexpected name of log node: " + entry.znode_name, ErrorCodes::LOGICAL_ERROR);
-
-    LOG_DEBUG(log, "Looking for node corresponding to {} in {} queue", log_node_name, replica);
+    }
 
     /** Second - find the corresponding entry in the queue of the specified replica.
       * Its number may not match the `log` node. Therefore, we search by comparing the content.
@@ -5507,12 +5340,25 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
     for (const String & entry_name : queue_entries)
     {
         String queue_entry_str;
-        bool exists = getZooKeeper()->tryGet(fs::path(table_zookeeper_path) / "replicas" / replica / "queue" / entry_name, queue_entry_str);
+        Coordination::Stat queue_entry_stat;
+        bool exists = getZooKeeper()->tryGet(fs::path(table_zookeeper_path) / "replicas" / replica / "queue" / entry_name, queue_entry_str, &queue_entry_stat);
         if (exists && queue_entry_str == entry_str)
         {
             queue_entry_to_wait_for = entry_name;
             break;
         }
+        else if (!entry.log_entry_id.empty())
+        {
+            /// Check if the id matches rather than just contents. This entry
+            /// might have been written by different ClickHouse versions and
+            /// it is hard to guarantee same text representation.
+            ReplicatedMergeTreeLogEntryData queue_entry = *ReplicatedMergeTreeLogEntry::parse(queue_entry_str, queue_entry_stat);
+            if (entry.log_entry_id == queue_entry.log_entry_id)
+            {
+                queue_entry_to_wait_for = entry_name;
+                break;
+            }
+        }
     }
 
     /// While looking for the record, it has already been executed and deleted.
@@ -5531,13 +5377,6 @@ bool StorageReplicatedMergeTree::waitForTableReplicaToProcessLogEntry(
 }
 
 
-bool StorageReplicatedMergeTree::waitForReplicaToProcessLogEntry(
-    const String & replica, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active)
-{
-    return waitForTableReplicaToProcessLogEntry(zookeeper_path, replica, entry, wait_for_non_active);
-}
-
-
 void StorageReplicatedMergeTree::getStatus(Status & res, bool with_zk_fields)
 {
     auto zookeeper = tryGetZooKeeper();
@@ -5562,6 +5401,7 @@ void StorageReplicatedMergeTree::getStatus(Status & res, bool with_zk_fields)
     res.log_pointer = 0;
     res.total_replicas = 0;
     res.active_replicas = 0;
+    res.last_queue_update_exception = getLastQueueUpdateException();
 
     if (with_zk_fields && !res.is_session_expired)
     {
@@ -5727,7 +5567,7 @@ void StorageReplicatedMergeTree::fetchPartition(
     info.table_id.uuid = UUIDHelpers::Nil;
     auto expand_from = query_context->getMacros()->expand(from_, info);
     String auxiliary_zookeeper_name = extractZooKeeperName(expand_from);
-    String from = extractZooKeeperPath(expand_from);
+    String from = extractZooKeeperPath(expand_from, /* check_starts_with_slash */ true);
     if (from.empty())
         throw Exception("ZooKeeper path should not be empty", ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT);
 
@@ -5956,7 +5796,7 @@ void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, Conte
     ///
     /// Leader replica records its decisions to the replication log (/log directory in ZK) in the form of
     /// MUTATE_PART entries and all replicas then execute them in the background pool
-    /// (see tryExecutePartMutation() function). When a replica encounters a MUTATE_PART command, it is
+    /// (see MutateTask class). When a replica encounters a MUTATE_PART command, it is
     /// guaranteed that the corresponding mutation entry is already loaded (when we pull entries from
     /// replication log into the replica queue, we also load mutation entries). Note that just as with merges
     /// the replica can decide not to do the mutation locally and fetch the mutated part from another replica
@@ -6040,7 +5880,18 @@ void StorageReplicatedMergeTree::waitMutation(const String & znode_name, size_t
     auto zookeeper = getZooKeeper();
     Strings replicas;
     if (mutations_sync == 2) /// wait for all replicas
+    {
         replicas = zookeeper->getChildren(fs::path(zookeeper_path) / "replicas");
+        /// This replica should be first, to ensure that the mutation will be loaded into memory
+        for (auto it = replicas.begin(); it != replicas.end(); ++it)
+        {
+            if (*it == replica_name)
+            {
+                std::iter_swap(it, replicas.rbegin());
+                break;
+            }
+        }
+    }
     else if (mutations_sync == 1) /// just wait for ourself
         replicas.push_back(replica_name);
 
@@ -6058,7 +5909,7 @@ CancellationCode StorageReplicatedMergeTree::killMutation(const String & mutatio
 
     zkutil::ZooKeeperPtr zookeeper = getZooKeeper();
 
-    LOG_TRACE(log, "Killing mutation {}", mutation_id);
+    LOG_INFO(log, "Killing mutation {}", mutation_id);
 
     auto mutation_entry = queue.removeMutation(zookeeper, mutation_id);
     if (!mutation_entry)
@@ -6311,6 +6162,7 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
 
     String partition_prefix = partition_id + "_";
     zkutil::AsyncResponses<Coordination::GetResponse> get_futures;
+
     for (const String & block_id : blocks)
     {
         if (startsWith(block_id, partition_prefix))
@@ -6329,9 +6181,10 @@ void StorageReplicatedMergeTree::getClearBlocksInPartitionOps(
             continue;
 
         ReadBufferFromString buf(result.data);
-        MergeTreePartInfo part_info;
-        bool parsed = MergeTreePartInfo::tryParsePartName(result.data, &part_info, format_version);
-        if (!parsed || (min_block_num <= part_info.min_block && part_info.max_block <= max_block_num))
+
+        const auto part_info = MergeTreePartInfo::tryParsePartName(result.data, format_version);
+
+        if (!part_info || (min_block_num <= part_info->min_block && part_info->max_block <= max_block_num))
             ops.emplace_back(zkutil::makeRemoveRequest(path, -1));
     }
 }
@@ -6367,17 +6220,18 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     MergeTreeData & src_data = checkStructureAndGetMergeTreeData(source_table, source_metadata_snapshot, metadata_snapshot);
     String partition_id = getPartitionIDFromQuery(partition, query_context);
 
+    /// NOTE: Some covered parts may be missing in src_all_parts if corresponding log entries are not executed yet.
     DataPartsVector src_all_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
     DataPartsVector src_parts;
     MutableDataPartsVector dst_parts;
     Strings block_id_paths;
     Strings part_checksums;
+    auto zookeeper = getZooKeeper();
     std::vector<EphemeralLockInZooKeeper> ephemeral_locks;
 
     LOG_DEBUG(log, "Cloning {} parts", src_all_parts.size());
 
     static const String TMP_PREFIX = "tmp_replace_from_";
-    auto zookeeper = getZooKeeper();
 
     String alter_partition_version_path = zookeeper_path + "/alter_partition_version";
     Coordination::Stat alter_partition_version_stat;
@@ -6494,8 +6348,7 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
 
         delimiting_block_lock->getUnlockOps(ops);
         /// Check and update version to avoid race with DROP_RANGE
-        ops.emplace_back(zkutil::makeCheckRequest(alter_partition_version_path, alter_partition_version_stat.version));
-        ops.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", -1));
+        ops.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", alter_partition_version_stat.version));
         /// Just update version, because merges assignment relies on it
         ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
         ops.emplace_back(zkutil::makeCreateRequest(fs::path(zookeeper_path) / "log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential));
@@ -6545,13 +6398,10 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
     parts_to_remove.clear();
     cleanup_thread.wakeup();
 
-    /// If necessary, wait until the operation is performed on all replicas.
-    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
-    {
-        lock2.reset();
-        lock1.reset();
-        waitForAllReplicasToProcessLogEntry(entry);
-    }
+    lock2.reset();
+    lock1.reset();
+
+    waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
 }
 
 void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr query_context)
@@ -6577,7 +6427,39 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     auto src_data_id = src_data.getStorageID();
     String partition_id = getPartitionIDFromQuery(partition, query_context);
 
-    DataPartsVector src_all_parts = src_data.getDataPartsVectorInPartition(MergeTreeDataPartState::Committed, partition_id);
+    /// A range for log entry to remove parts from the source table (myself).
+    auto zookeeper = getZooKeeper();
+    String alter_partition_version_path = zookeeper_path + "/alter_partition_version";
+    Coordination::Stat alter_partition_version_stat;
+    zookeeper->get(alter_partition_version_path, &alter_partition_version_stat);
+
+    MergeTreePartInfo drop_range;
+    std::optional<EphemeralLockInZooKeeper> delimiting_block_lock;
+    getFakePartCoveringAllPartsInPartition(partition_id, drop_range, delimiting_block_lock, true);
+    String drop_range_fake_part_name = getPartNamePossiblyFake(format_version, drop_range);
+
+    DataPartPtr covering_part;
+    DataPartsVector src_all_parts;
+    {
+        /// NOTE: Some covered parts may be missing in src_all_parts if corresponding log entries are not executed yet.
+        auto parts_lock = src_data.lockParts();
+        src_all_parts = src_data.getActivePartsToReplace(drop_range, drop_range_fake_part_name, covering_part, parts_lock);
+    }
+
+    if (covering_part)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got part {} covering drop range {}, it's a bug",
+                        covering_part->name, drop_range_fake_part_name);
+
+    /// After allocating block number for drop_range we must ensure that it does not intersect block numbers
+    /// allocated by concurrent REPLACE query.
+    /// We could check it in multi-request atomically with creation of DROP_RANGE entry in source table log,
+    /// but it's better to check it here and fail as early as possible (before we have done something to destination table).
+    Coordination::Error version_check_code = zookeeper->trySet(alter_partition_version_path, "", alter_partition_version_stat.version);
+    if (version_check_code != Coordination::Error::ZOK)
+        throw Exception(ErrorCodes::CANNOT_ASSIGN_ALTER, "Cannot DROP PARTITION in {} after copying partition to {}, "
+                        "because another ALTER PARTITION query was concurrently executed",
+                        getStorageID().getFullTableName(), dest_table_storage->getStorageID().getFullTableName());
+
     DataPartsVector src_parts;
     MutableDataPartsVector dst_parts;
     Strings block_id_paths;
@@ -6587,21 +6469,11 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
     LOG_DEBUG(log, "Cloning {} parts", src_all_parts.size());
 
     static const String TMP_PREFIX = "tmp_move_from_";
-    auto zookeeper = getZooKeeper();
-
-    /// A range for log entry to remove parts from the source table (myself).
-
-    MergeTreePartInfo drop_range;
-    std::optional<EphemeralLockInZooKeeper> delimiting_block_lock;
-    getFakePartCoveringAllPartsInPartition(partition_id, drop_range, delimiting_block_lock, true);
-    String drop_range_fake_part_name = getPartNamePossiblyFake(format_version, drop_range);
 
     /// Clone parts into destination table.
-
-    String alter_partition_version_path = dest_table_storage->zookeeper_path + "/alter_partition_version";
-    Coordination::Stat alter_partition_version_stat;
-    zookeeper->get(alter_partition_version_path, &alter_partition_version_stat);
-
+    String dest_alter_partition_version_path = dest_table_storage->zookeeper_path + "/alter_partition_version";
+    Coordination::Stat dest_alter_partition_version_stat;
+    zookeeper->get(dest_alter_partition_version_path, &dest_alter_partition_version_stat);
     for (const auto & src_part : src_all_parts)
     {
         if (!dest_table_storage->canReplacePartition(src_part))
@@ -6682,8 +6554,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
         }
 
         /// Check and update version to avoid race with DROP_RANGE
-        ops.emplace_back(zkutil::makeCheckRequest(alter_partition_version_path, alter_partition_version_stat.version));
-        ops.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", -1));
+        ops.emplace_back(zkutil::makeSetRequest(dest_alter_partition_version_path, "", dest_alter_partition_version_stat.version));
         /// Just update version, because merges assignment relies on it
         ops.emplace_back(zkutil::makeSetRequest(fs::path(dest_table_storage->zookeeper_path) / "log", "", -1));
         ops.emplace_back(zkutil::makeCreateRequest(fs::path(dest_table_storage->zookeeper_path) / "log/log-",
@@ -6729,43 +6600,25 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
 
     parts_to_remove.clear();
     cleanup_thread.wakeup();
+    lock2.reset();
 
-    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
-    {
-        lock2.reset();
-        dest_table_storage->waitForAllReplicasToProcessLogEntry(entry);
-    }
+    dest_table_storage->waitForLogEntryToBeProcessedIfNecessary(entry, query_context);
 
     /// Create DROP_RANGE for the source table
-    alter_partition_version_path = zookeeper_path + "/alter_partition_version";
-    zookeeper->get(alter_partition_version_path, &alter_partition_version_stat);
-
     Coordination::Requests ops_src;
     ops_src.emplace_back(zkutil::makeCreateRequest(
         fs::path(zookeeper_path) / "log/log-", entry_delete.toString(), zkutil::CreateMode::PersistentSequential));
-    /// Check and update version to avoid race with REPLACE_RANGE
-    ops_src.emplace_back(zkutil::makeCheckRequest(alter_partition_version_path, alter_partition_version_stat.version));
-    ops_src.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", -1));
     /// Just update version, because merges assignment relies on it
     ops_src.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
     delimiting_block_lock->getUnlockOps(ops_src);
 
-    Coordination::Error code = zookeeper->tryMulti(ops_src, op_results);
-    if (code == Coordination::Error::ZBADVERSION)
-        throw Exception(ErrorCodes::CANNOT_ASSIGN_ALTER, "Cannot DROP PARTITION in {} after copying partition to {}, "
-                        "because another ALTER PARTITION query was concurrently executed",
-                        getStorageID().getFullTableName(), dest_table_storage->getStorageID().getFullTableName());
-    else
-        zkutil::KeeperMultiException::check(code, ops_src, op_results);
+    op_results = zookeeper->multi(ops_src);
 
     log_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*op_results.front()).path_created;
     entry_delete.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
 
-    if (query_context->getSettingsRef().replication_alter_partitions_sync > 1)
-    {
-        lock1.reset();
-        waitForAllReplicasToProcessLogEntry(entry_delete);
-    }
+    lock1.reset();
+    waitForLogEntryToBeProcessedIfNecessary(entry_delete, query_context);
 
     /// Cleaning possibly stored information about parts from /quorum/last_part node in ZooKeeper.
     cleanLastPartNode(partition_id);
@@ -6779,7 +6632,7 @@ void StorageReplicatedMergeTree::movePartitionToShard(
     if (!move_part)
         throw Exception("MOVE PARTITION TO SHARD is not supported, use MOVE PART instead", ErrorCodes::NOT_IMPLEMENTED);
 
-    if (normalizeZooKeeperPath(zookeeper_path) == normalizeZooKeeperPath(to))
+    if (normalizeZooKeeperPath(zookeeper_path, /* check_starts_with_slash */ true) == normalizeZooKeeperPath(to, /* check_starts_with_slash */ true))
         throw Exception("Source and destination are the same", ErrorCodes::BAD_ARGUMENTS);
 
     auto zookeeper = getZooKeeper();
@@ -6836,6 +6689,7 @@ void StorageReplicatedMergeTree::movePartitionToShard(
     dst_pins.part_uuids.insert(part->uuid);
 
     PartMovesBetweenShardsOrchestrator::Entry part_move_entry;
+    part_move_entry.state = PartMovesBetweenShardsOrchestrator::EntryState::SYNC_SOURCE;
     part_move_entry.create_time = std::time(nullptr);
     part_move_entry.update_time = part_move_entry.create_time;
     part_move_entry.task_uuid = UUIDHelpers::generateV4();
@@ -6859,10 +6713,13 @@ void StorageReplicatedMergeTree::movePartitionToShard(
     String task_znode_path = dynamic_cast<const Coordination::CreateResponse &>(*responses.back()).path_created;
     LOG_DEBUG(log, "Created task for part movement between shards at " + task_znode_path);
 
-    /// Force refresh local state. This will make the task immediately visible in `system.part_moves_between_shards` table.
-    part_moves_between_shards_orchestrator.fetchStateFromZK();
+    /// TODO(nv): Nice to have support for `replication_alter_partitions_sync`.
+    ///     For now use the system.part_moves_between_shards table for status.
+}
 
-    // TODO: Add support for `replication_alter_partitions_sync`.
+CancellationCode StorageReplicatedMergeTree::killPartMoveToShard(const UUID & task_uuid)
+{
+    return part_moves_between_shards_orchestrator.killPartMoveToShard(task_uuid);
 }
 
 void StorageReplicatedMergeTree::getCommitPartOps(
@@ -6954,9 +6811,9 @@ void StorageReplicatedMergeTree::onActionLockRemove(StorageActionBlockType actio
     if (action_type == ActionLocks::PartsMerge || action_type == ActionLocks::PartsTTLMerge
         || action_type == ActionLocks::PartsFetch || action_type == ActionLocks::PartsSend
         || action_type == ActionLocks::ReplicationQueue)
-        background_executor.triggerTask();
+        background_operations_assignee.trigger();
     else if (action_type == ActionLocks::PartsMove)
-        background_moves_executor.triggerTask();
+        background_moves_assignee.trigger();
 }
 
 bool StorageReplicatedMergeTree::waitForShrinkingQueueSize(size_t queue_size, UInt64 max_wait_milliseconds)
@@ -6964,11 +6821,11 @@ bool StorageReplicatedMergeTree::waitForShrinkingQueueSize(size_t queue_size, UI
     Stopwatch watch;
 
     /// Let's fetch new log entries firstly
-    queue.pullLogsToQueue(getZooKeeper());
+    queue.pullLogsToQueue(getZooKeeper(), {}, ReplicatedMergeTreeQueue::SYNC);
 
     /// This is significant, because the execution of this task could be delayed at BackgroundPool.
     /// And we force it to be executed.
-    background_executor.triggerTask();
+    background_operations_assignee.trigger();
 
     Poco::Event target_size_event;
     auto callback = [&target_size_event, queue_size] (size_t new_queue_size)
@@ -7128,8 +6985,7 @@ bool StorageReplicatedMergeTree::dropAllPartsInPartition(
     /// Check and update version to avoid race with REPLACE_RANGE.
     /// Otherwise new parts covered by drop_range_info may appear after execution of current DROP_RANGE entry
     /// as a result of execution of concurrently created REPLACE_RANGE entry.
-    ops.emplace_back(zkutil::makeCheckRequest(alter_partition_version_path, alter_partition_version_stat.version));
-    ops.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", -1));
+    ops.emplace_back(zkutil::makeSetRequest(alter_partition_version_path, "", alter_partition_version_stat.version));
 
     /// Just update version, because merges assignment relies on it
     ops.emplace_back(zkutil::makeSetRequest(fs::path(zookeeper_path) / "log", "", -1));
@@ -7203,7 +7059,7 @@ MutationCommands StorageReplicatedMergeTree::getFirstAlterMutationCommandsForPar
 void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded()
 {
     if (areBackgroundMovesNeeded())
-        background_moves_executor.start();
+        background_moves_assignee.start();
 }
 
 std::unique_ptr<MergeTreeSettings> StorageReplicatedMergeTree::getDefaultSettings() const
@@ -7219,7 +7075,7 @@ void StorageReplicatedMergeTree::lockSharedData(const IMergeTreeDataPart & part)
     DiskPtr disk = part.volume->getDisk();
     if (!disk || !disk->supportZeroCopyReplication())
         return;
-    String zero_copy = fmt::format("zero_copy_{}", DiskType::toString(disk->getType()));
+    String zero_copy = fmt::format("zero_copy_{}", toString(disk->getType()));
 
     zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
     if (!zookeeper)
@@ -7259,7 +7115,7 @@ bool StorageReplicatedMergeTree::unlockSharedData(const IMergeTreeDataPart & par
     DiskPtr disk = part.volume->getDisk();
     if (!disk || !disk->supportZeroCopyReplication())
         return true;
-    String zero_copy = fmt::format("zero_copy_{}", DiskType::toString(disk->getType()));
+    String zero_copy = fmt::format("zero_copy_{}", toString(disk->getType()));
 
     zkutil::ZooKeeperPtr zookeeper = tryGetZooKeeper();
     if (!zookeeper)
@@ -7319,7 +7175,7 @@ bool StorageReplicatedMergeTree::tryToFetchIfShared(
 
 
 String StorageReplicatedMergeTree::getSharedDataReplica(
-    const IMergeTreeDataPart & part, DiskType::Type disk_type) const
+    const IMergeTreeDataPart & part, DiskType disk_type) const
 {
     String best_replica;
 
@@ -7327,7 +7183,7 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     if (!zookeeper)
         return best_replica;
 
-    String zero_copy = fmt::format("zero_copy_{}", DiskType::toString(disk_type));
+    String zero_copy = fmt::format("zero_copy_{}", toString(disk_type));
     String zookeeper_part_node = fs::path(zookeeper_path) / zero_copy / "shared" / part.name;
 
     Strings ids;
@@ -7424,12 +7280,15 @@ bool StorageReplicatedMergeTree::checkIfDetachedPartExists(const String & part_n
 bool StorageReplicatedMergeTree::checkIfDetachedPartitionExists(const String & partition_name)
 {
     fs::directory_iterator dir_end;
+
     for (const std::string & path : getDataPaths())
     {
         for (fs::directory_iterator dir_it{fs::path(path) / "detached/"}; dir_it != dir_end; ++dir_it)
         {
-            MergeTreePartInfo part_info;
-            if (MergeTreePartInfo::tryParsePartName(dir_it->path().filename(), &part_info, format_version) && part_info.partition_id == partition_name)
+            const String file_name = dir_it->path().filename().string();
+            auto part_info = MergeTreePartInfo::tryParsePartName(file_name, format_version);
+
+            if (part_info && part_info->partition_id == partition_name)
                 return true;
         }
     }
@@ -7454,8 +7313,8 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
     ReservationPtr reservation = reserveSpacePreferringTTLRules(metadata_snapshot, 0, move_ttl_infos, time(nullptr), 0, true);
     VolumePtr volume = getStoragePolicy()->getVolume(0);
 
-    IMergeTreeDataPart::MinMaxIndex minmax_idx;
-    minmax_idx.update(block, getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    auto minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
+    minmax_idx->update(block, getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
 
     auto new_data_part = createPart(
         lost_part_name,
@@ -7513,8 +7372,10 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
     MergedBlockOutputStream out(new_data_part, metadata_snapshot, columns, index_factory.getMany(metadata_snapshot->getSecondaryIndices()), compression_codec);
     bool sync_on_insert = settings->fsync_after_insert;
 
-    out.writePrefix();
     out.write(block);
+    /// TODO(ab): What projections should we add to the empty part? How can we make sure that it
+    /// won't block future merges? Perhaps we should also check part emptiness when selecting parts
+    /// to merge.
     out.writeSuffixAndFinalizePart(new_data_part, sync_on_insert);
 
     try
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index 3d2727d7bb9..65daf82a633 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <atomic>
 #include <pcg_random.hpp>
 #include <Storages/IStorage.h>
@@ -21,6 +21,8 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
 #include <Storages/MergeTree/LeaderElection.h>
 #include <Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h>
+#include <Storages/MergeTree/FutureMergedMutatedPart.h>
+#include <Storages/MergeTree/MergeFromLogEntryTask.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/PartLog.h>
@@ -28,8 +30,8 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Throttler.h>
 #include <Core/BackgroundSchedulePool.h>
-#include <Processors/Pipe.h>
-#include <Storages/MergeTree/BackgroundJobsExecutor.h>
+#include <QueryPipeline/Pipe.h>
+#include <Storages/MergeTree/BackgroundJobsAssignee.h>
 
 
 namespace DB
@@ -127,7 +129,7 @@ public:
         const Names & deduplicate_by_columns,
         ContextPtr query_context) override;
 
-    void alter(const AlterCommands & commands, ContextPtr query_context, TableLockHolder & table_lock_holder) override;
+    void alter(const AlterCommands & commands, ContextPtr query_context, AlterLockHolder & table_lock_holder) override;
 
     void mutate(const MutationCommands & commands, ContextPtr context) override;
     void waitMutation(const String & znode_name, size_t mutations_sync) const;
@@ -174,6 +176,7 @@ public:
         UInt64 absolute_delay;
         UInt8 total_replicas;
         UInt8 active_replicas;
+        String last_queue_update_exception;
         /// If the error has happened fetching the info from ZooKeeper, this field will be set.
         String zookeeper_exception;
         std::unordered_map<std::string, bool> replica_is_active;
@@ -217,7 +220,7 @@ public:
                                               const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, Poco::Logger * logger);
 
     /// Schedules job to execute in background pool (merge, mutate, drop range and so on)
-    bool scheduleDataProcessingJob(IBackgroundJobExecutor & executor) override;
+    bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
 
     /// Checks that fetches are not disabled with action blocker and pool for fetches
     /// is not overloaded
@@ -238,7 +241,7 @@ public:
     bool tryToFetchIfShared(const IMergeTreeDataPart & part, const DiskPtr & disk, const String & path) override;
 
     /// Get best replica having this partition on a same type remote disk
-    String getSharedDataReplica(const IMergeTreeDataPart & part, DiskType::Type disk_type) const;
+    String getSharedDataReplica(const IMergeTreeDataPart & part, DiskType disk_type) const;
 
     inline String getReplicaName() const { return replica_name; }
 
@@ -281,6 +284,9 @@ private:
     friend class ReplicatedMergeTreeQueue;
     friend class PartMovesBetweenShardsOrchestrator;
     friend class MergeTreeData;
+    friend class MergeFromLogEntryTask;
+    friend class MutateFromLogEntryTask;
+    friend class ReplicatedMergeMutateTaskBase;
 
     using MergeStrategyPicker = ReplicatedMergeTreeMergeStrategyPicker;
     using LogEntry = ReplicatedMergeTreeLogEntry;
@@ -331,6 +337,10 @@ private:
     std::atomic<time_t> last_queue_update_start_time{0};
     std::atomic<time_t> last_queue_update_finish_time{0};
 
+    mutable std::mutex last_queue_update_exception_lock;
+    String last_queue_update_exception;
+    String getLastQueueUpdateException() const;
+
     DataPartsExchange::Fetcher fetcher;
 
     /// When activated, replica is initialized and startup() method could exit
@@ -342,18 +352,9 @@ private:
     /// Event that is signalled (and is reset) by the restarting_thread when the ZooKeeper session expires.
     Poco::Event partial_shutdown_event {false};     /// Poco::Event::EVENT_MANUALRESET
 
-    /// Limiting parallel fetches per node
-    static inline std::atomic_uint total_fetches {0};
-
-    /// Limiting parallel fetches per one table
-    std::atomic_uint current_table_fetches {0};
-
     int metadata_version = 0;
     /// Threads.
 
-    BackgroundJobsExecutor background_executor;
-    BackgroundMovesExecutor background_moves_executor;
-
     /// A task that keeps track of the updates in the logs of all replicas and loads them into the queue.
     bool queue_update_in_progress = false;
     BackgroundSchedulePool::TaskHolder queue_updating_task;
@@ -474,19 +475,11 @@ private:
 
     void executeDropRange(const LogEntry & entry);
 
-    /// Do the merge or recommend to make the fetch instead of the merge
-    bool tryExecuteMerge(const LogEntry & entry);
-
     /// Execute alter of table metadata. Set replica/metadata and replica/columns
     /// nodes in zookeeper and also changes in memory metadata.
     /// New metadata and columns values stored in entry.
     bool executeMetadataAlter(const LogEntry & entry);
 
-    /// Execute MUTATE_PART entry. Part name and mutation commands
-    /// stored in entry. This function relies on MergerMutator class.
-    bool tryExecutePartMutation(const LogEntry & entry);
-
-
     /// Fetch part from other replica (inserted or merged/mutated)
     /// NOTE: Attention! First of all tries to find covering part on other replica
     /// and set it into entry.actual_new_part_name. After that tries to fetch this new covering part.
@@ -516,6 +509,9 @@ private:
 
     ReplicatedMergeTreeQueue::SelectedEntryPtr selectQueueEntry();
 
+
+    MergeFromLogEntryTaskPtr getTaskToProcessMergeQueueEntry(ReplicatedMergeTreeQueue::SelectedEntryPtr entry);
+
     bool processQueueEntry(ReplicatedMergeTreeQueue::SelectedEntryPtr entry);
 
     /// Postcondition:
@@ -609,7 +605,6 @@ private:
     std::unordered_set<String> currently_fetching_parts;
     std::mutex currently_fetching_parts_mutex;
 
-
     /// With the quorum being tracked, add a replica to the quorum for the part.
     void updateQuorum(const String & part_name, bool is_parallel);
 
@@ -630,22 +625,27 @@ private:
         const String & zookeeper_block_id_path = "", const String & zookeeper_path_prefix = "") const;
 
     /** Wait until all replicas, including this, execute the specified action from the log.
-      * If replicas are added at the same time, it can not wait the added replica .
+      * If replicas are added at the same time, it can not wait the added replica.
+      *
+      * Waits for inactive replicas no more than wait_for_inactive_timeout.
+      * Returns list of inactive replicas that have not executed entry or throws exception.
       *
       * NOTE: This method must be called without table lock held.
       * Because it effectively waits for other thread that usually has to also acquire a lock to proceed and this yields deadlock.
-      * TODO: There are wrong usages of this method that are not fixed yet.
-      *
-      * One method for convenient use on current table, another for waiting on foreign shards.
       */
-    Strings waitForAllTableReplicasToProcessLogEntry(const String & table_zookeeper_path, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active = true);
-    Strings waitForAllReplicasToProcessLogEntry(const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active = true);
+    void waitForAllReplicasToProcessLogEntry(const String & table_zookeeper_path, const ReplicatedMergeTreeLogEntryData & entry,
+                                             Int64 wait_for_inactive_timeout, const String & error_context = {});
+    Strings tryWaitForAllReplicasToProcessLogEntry(const String & table_zookeeper_path, const ReplicatedMergeTreeLogEntryData & entry,
+                                                   Int64 wait_for_inactive_timeout);
 
     /** Wait until the specified replica executes the specified action from the log.
       * NOTE: See comment about locks above.
       */
-    bool waitForTableReplicaToProcessLogEntry(const String & table_zookeeper_path, const String & replica_name, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active = true);
-    bool waitForReplicaToProcessLogEntry(const String & replica_name, const ReplicatedMergeTreeLogEntryData & entry, bool wait_for_non_active = true);
+    bool tryWaitForReplicaToProcessLogEntry(const String & table_zookeeper_path, const String & replica_name,
+                                            const ReplicatedMergeTreeLogEntryData & entry, Int64 wait_for_inactive_timeout = 0);
+
+    /// Depending on settings, do nothing or wait for this replica or all replicas process log entry.
+    void waitForLogEntryToBeProcessedIfNecessary(const ReplicatedMergeTreeLogEntryData & entry, ContextPtr query_context, const String & error_context = {});
 
     /// Throw an exception if the table is readonly.
     void assertNotReadonly() const;
@@ -682,6 +682,7 @@ private:
     void replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr query_context) override;
     void movePartitionToTable(const StoragePtr & dest_table, const ASTPtr & partition, ContextPtr query_context) override;
     void movePartitionToShard(const ASTPtr & partition, bool move_part, const String & to, ContextPtr query_context) override;
+    CancellationCode killPartMoveToShard(const UUID & task_uuid) override;
     void fetchPartition(
         const ASTPtr & partition,
         const StorageMetadataPtr & metadata_snapshot,
@@ -745,6 +746,8 @@ protected:
         bool allow_renaming_);
 };
 
+String getPartNamePossiblyFake(MergeTreeDataFormatVersion format_version, const MergeTreePartInfo & part_info);
+
 
 /** There are three places for each part, where it should be
   * 1. In the RAM, data_parts, all_data_parts.
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index fc3ce3a10ed..5d8645b677d 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -1,16 +1,28 @@
 #include <Common/config.h>
+#include "Parsers/ASTCreateQuery.h"
 
 #if USE_AWS_S3
 
+#include <Columns/ColumnString.h>
+#include <Common/isValidUTF8.h>
+
+#include <Functions/FunctionsConversion.h>
+
 #include <IO/S3Common.h>
+
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/TreeRewriter.h>
+#include <Interpreters/evaluateConstantExpression.h>
+
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTLiteral.h>
+
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageS3.h>
 #include <Storages/StorageS3Settings.h>
 
-#include <Interpreters/Context.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Parsers/ASTLiteral.h>
-
 #include <IO/ReadBufferFromS3.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromS3.h>
@@ -18,11 +30,12 @@
 
 #include <Formats/FormatFactory.h>
 
-#include <DataStreams/IBlockOutputStream.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <DataStreams/narrowBlockInputStreams.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <QueryPipeline/narrowBlockInputStreams.h>
 
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 
 #include <DataTypes/DataTypeString.h>
@@ -39,21 +52,32 @@
 
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Sinks/SinkToStorage.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
 
+#include <boost/algorithm/string.hpp>
+
+
+static const String PARTITION_ID_WILDCARD = "{_partition_id}";
+
 namespace DB
 {
+
 namespace ErrorCodes
 {
+    extern const int CANNOT_PARSE_TEXT;
+    extern const int BAD_ARGUMENTS;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int UNEXPECTED_EXPRESSION;
     extern const int S3_ERROR;
+    extern const int UNEXPECTED_EXPRESSION;
 }
+
+class IOutputFormat;
+using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
+
 class StorageS3Source::DisclosedGlobIterator::Impl
 {
 
@@ -173,6 +197,7 @@ StorageS3Source::StorageS3Source(
     String name_,
     const Block & sample_block_,
     ContextPtr context_,
+    std::optional<FormatSettings> format_settings_,
     const ColumnsDescription & columns_,
     UInt64 max_block_size_,
     UInt64 max_single_read_retries_,
@@ -191,6 +216,7 @@ StorageS3Source::StorageS3Source(
     , compression_hint(compression_hint_)
     , client(client_)
     , sample_block(sample_block_)
+    , format_settings(format_settings_)
     , with_file_column(need_file)
     , with_path_column(need_path)
     , file_iterator(file_iterator_)
@@ -208,20 +234,21 @@ bool StorageS3Source::initialize()
     file_path = fs::path(bucket) / current_key;
 
     read_buf = wrapReadBufferWithCompressionMethod(
-        std::make_unique<ReadBufferFromS3>(client, bucket, current_key, max_single_read_retries, DBMS_DEFAULT_BUFFER_SIZE),
+        std::make_unique<ReadBufferFromS3>(client, bucket, current_key, max_single_read_retries, getContext()->getReadSettings()),
         chooseCompressionMethod(current_key, compression_hint));
-    auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, getContext(), max_block_size);
-    pipeline = std::make_unique<QueryPipeline>();
-    pipeline->init(Pipe(input_format));
+    auto input_format = getContext()->getInputFormat(format, *read_buf, sample_block, max_block_size, format_settings);
+    QueryPipelineBuilder builder;
+    builder.init(Pipe(input_format));
 
     if (columns_desc.hasDefaults())
     {
-        pipeline->addSimpleTransform([&](const Block & header)
+        builder.addSimpleTransform([&](const Block & header)
         {
             return std::make_shared<AddingDefaultsTransform>(header, columns_desc, *input_format, getContext());
         });
     }
 
+    pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
     reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
 
     initialized = false;
@@ -273,6 +300,7 @@ public:
         const String & format,
         const Block & sample_block_,
         ContextPtr context,
+        std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method,
         const std::shared_ptr<Aws::S3::S3Client> & client,
         const String & bucket,
@@ -281,10 +309,11 @@ public:
         size_t max_single_part_upload_size)
         : SinkToStorage(sample_block_)
         , sample_block(sample_block_)
+        , format_settings(format_settings_)
     {
         write_buf = wrapWriteBufferWithCompressionMethod(
             std::make_unique<WriteBufferFromS3>(client, bucket, key, min_upload_part_size, max_single_part_upload_size), compression_method, 3);
-        writer = FormatFactory::instance().getOutputStreamParallelIfPossible(format, *write_buf, sample_block, context);
+        writer = FormatFactory::instance().getOutputFormatParallelIfPossible(format, *write_buf, sample_block, context, {}, format_settings);
     }
 
     String getName() const override { return "StorageS3Sink"; }
@@ -293,22 +322,17 @@ public:
     {
         if (is_first_chunk)
         {
-            writer->writePrefix();
+            writer->doWritePrefix();
             is_first_chunk = false;
         }
-        writer->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+        writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
-    // void flush() override
-    // {
-    //     writer->flush();
-    // }
-
     void onFinish() override
     {
         try
         {
-            writer->writeSuffix();
+            writer->doWriteSuffix();
             writer->flush();
             write_buf->finalize();
         }
@@ -322,12 +346,195 @@ public:
 
 private:
     Block sample_block;
+    std::optional<FormatSettings> format_settings;
     std::unique_ptr<WriteBuffer> write_buf;
-    BlockOutputStreamPtr writer;
+    OutputFormatPtr writer;
     bool is_first_chunk = true;
 };
 
 
+class PartitionedStorageS3Sink : public SinkToStorage
+{
+public:
+    PartitionedStorageS3Sink(
+        const ASTPtr & partition_by,
+        const String & format_,
+        const Block & sample_block_,
+        ContextPtr context_,
+        std::optional<FormatSettings> format_settings_,
+        const CompressionMethod compression_method_,
+        const std::shared_ptr<Aws::S3::S3Client> & client_,
+        const String & bucket_,
+        const String & key_,
+        size_t min_upload_part_size_,
+        size_t max_single_part_upload_size_)
+        : SinkToStorage(sample_block_)
+        , format(format_)
+        , sample_block(sample_block_)
+        , context(context_)
+        , compression_method(compression_method_)
+        , client(client_)
+        , bucket(bucket_)
+        , key(key_)
+        , min_upload_part_size(min_upload_part_size_)
+        , max_single_part_upload_size(max_single_part_upload_size_)
+        , format_settings(format_settings_)
+    {
+        std::vector<ASTPtr> arguments(1, partition_by);
+        ASTPtr partition_by_string = makeASTFunction(FunctionToString::name, std::move(arguments));
+
+        auto syntax_result = TreeRewriter(context).analyze(partition_by_string, sample_block.getNamesAndTypesList());
+        partition_by_expr = ExpressionAnalyzer(partition_by_string, syntax_result, context).getActions(false);
+        partition_by_column_name = partition_by_string->getColumnName();
+    }
+
+    String getName() const override { return "PartitionedStorageS3Sink"; }
+
+    void consume(Chunk chunk) override
+    {
+        const auto & columns = chunk.getColumns();
+
+        Block block_with_partition_by_expr = sample_block.cloneWithoutColumns();
+        block_with_partition_by_expr.setColumns(columns);
+        partition_by_expr->execute(block_with_partition_by_expr);
+
+        const auto * column = block_with_partition_by_expr.getByName(partition_by_column_name).column.get();
+
+        std::unordered_map<String, size_t> sub_chunks_indices;
+        IColumn::Selector selector;
+        for (size_t row = 0; row < chunk.getNumRows(); ++row)
+        {
+            auto value = column->getDataAt(row);
+            auto [it, inserted] = sub_chunks_indices.emplace(value, sub_chunks_indices.size());
+            selector.push_back(it->second);
+        }
+
+        Chunks sub_chunks;
+        sub_chunks.reserve(sub_chunks_indices.size());
+        for (size_t column_index = 0; column_index < columns.size(); ++column_index)
+        {
+            MutableColumns column_sub_chunks = columns[column_index]->scatter(sub_chunks_indices.size(), selector);
+            if (column_index == 0) /// Set sizes for sub-chunks.
+            {
+                for (const auto & column_sub_chunk : column_sub_chunks)
+                {
+                    sub_chunks.emplace_back(Columns(), column_sub_chunk->size());
+                }
+            }
+            for (size_t sub_chunk_index = 0; sub_chunk_index < column_sub_chunks.size(); ++sub_chunk_index)
+            {
+                sub_chunks[sub_chunk_index].addColumn(std::move(column_sub_chunks[sub_chunk_index]));
+            }
+        }
+
+        for (const auto & [partition_id, sub_chunk_index] : sub_chunks_indices)
+        {
+            getSinkForPartition(partition_id)->consume(std::move(sub_chunks[sub_chunk_index]));
+        }
+    }
+
+    void onFinish() override
+    {
+        for (auto & [partition_id, sink] : sinks)
+        {
+            sink->onFinish();
+        }
+    }
+
+private:
+    using SinkPtr = std::shared_ptr<StorageS3Sink>;
+
+    const String format;
+    const Block sample_block;
+    ContextPtr context;
+    const CompressionMethod compression_method;
+    std::shared_ptr<Aws::S3::S3Client> client;
+    const String bucket;
+    const String key;
+    size_t min_upload_part_size;
+    size_t max_single_part_upload_size;
+    std::optional<FormatSettings> format_settings;
+
+    ExpressionActionsPtr partition_by_expr;
+    String partition_by_column_name;
+
+    std::unordered_map<String, SinkPtr> sinks;
+
+    static String replaceWildcards(const String & haystack, const String & partition_id)
+    {
+        return boost::replace_all_copy(haystack, PARTITION_ID_WILDCARD, partition_id);
+    }
+
+    SinkPtr getSinkForPartition(const String & partition_id)
+    {
+        auto it = sinks.find(partition_id);
+        if (it == sinks.end())
+        {
+            auto partition_bucket = replaceWildcards(bucket, partition_id);
+            validateBucket(partition_bucket);
+
+            auto partition_key = replaceWildcards(key, partition_id);
+            validateKey(partition_key);
+
+            std::tie(it, std::ignore) = sinks.emplace(partition_id, std::make_shared<StorageS3Sink>(
+                format,
+                sample_block,
+                context,
+                format_settings,
+                compression_method,
+                client,
+                partition_bucket,
+                partition_key,
+                min_upload_part_size,
+                max_single_part_upload_size
+            ));
+        }
+
+        return it->second;
+    }
+
+    static void validateBucket(const String & str)
+    {
+        S3::URI::validateBucket(str, {});
+
+        if (!DB::UTF8::isValidUTF8(reinterpret_cast<const UInt8 *>(str.data()), str.size()))
+            throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Incorrect non-UTF8 sequence in bucket name");
+
+        validatePartitionKey(str, false);
+    }
+
+    static void validateKey(const String & str)
+    {
+        /// See:
+        /// - https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
+        /// - https://cloud.ibm.com/apidocs/cos/cos-compatibility#putobject
+
+        if (str.empty() || str.size() > 1024)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Incorrect key length (not empty, max 1023 characters), got: {}", str.size());
+
+        if (!DB::UTF8::isValidUTF8(reinterpret_cast<const UInt8 *>(str.data()), str.size()))
+            throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Incorrect non-UTF8 sequence in key");
+
+        validatePartitionKey(str, true);
+    }
+
+    static void validatePartitionKey(const StringRef & str, bool allow_slash)
+    {
+        for (const char * i = str.data; i != str.data + str.size; ++i)
+        {
+            if (static_cast<UInt8>(*i) < 0x20 || *i == '{' || *i == '}' || *i == '*' || *i == '?' || (!allow_slash && *i == '/'))
+            {
+                /// Need to convert to UInt32 because UInt8 can't be passed to format due to "mixing character types is disallowed".
+                UInt32 invalid_char_byte = static_cast<UInt32>(static_cast<UInt8>(*i));
+                throw DB::Exception(
+                    ErrorCodes::CANNOT_PARSE_TEXT, "Illegal character '\\x{:02x}' in partition id starting with '{}'",
+                    invalid_char_byte, StringRef(str.data, i - str.data));
+            }
+        }
+    }
+};
+
+
 StorageS3::StorageS3(
     const S3::URI & uri_,
     const String & access_key_id_,
@@ -342,6 +549,7 @@ StorageS3::StorageS3(
     const ConstraintsDescription & constraints_,
     const String & comment,
     ContextPtr context_,
+    std::optional<FormatSettings> format_settings_,
     const String & compression_method_,
     bool distributed_processing_)
     : IStorage(table_id_)
@@ -353,6 +561,7 @@ StorageS3::StorageS3(
     , compression_method(compression_method_)
     , name(uri_.storage_name)
     , distributed_processing(distributed_processing_)
+    , format_settings(format_settings_)
 {
     context_->getGlobalContext()->getRemoteHostFilter().checkURL(uri_.uri);
     StorageInMemoryMetadata storage_metadata;
@@ -413,6 +622,7 @@ Pipe StorageS3::read(
             getName(),
             metadata_snapshot->getSampleBlock(),
             local_context,
+            format_settings,
             metadata_snapshot->getColumns(),
             max_block_size,
             max_single_read_retries,
@@ -427,19 +637,46 @@ Pipe StorageS3::read(
     return pipe;
 }
 
-SinkToStoragePtr StorageS3::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
+SinkToStoragePtr StorageS3::write(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context)
 {
     updateClientAndAuthSettings(local_context, client_auth);
-    return std::make_shared<StorageS3Sink>(
-        format_name,
-        metadata_snapshot->getSampleBlock(),
-        local_context,
-        chooseCompressionMethod(client_auth.uri.key, compression_method),
-        client_auth.client,
-        client_auth.uri.bucket,
-        client_auth.uri.key,
-        min_upload_part_size,
-        max_single_part_upload_size);
+
+    auto sample_block = metadata_snapshot->getSampleBlock();
+    auto chosen_compression_method = chooseCompressionMethod(client_auth.uri.key, compression_method);
+    bool has_wildcards = client_auth.uri.bucket.find(PARTITION_ID_WILDCARD) != String::npos || client_auth.uri.key.find(PARTITION_ID_WILDCARD) != String::npos;
+    auto insert_query = std::dynamic_pointer_cast<ASTInsertQuery>(query);
+
+    bool is_partitioned_implementation = insert_query && insert_query->partition_by && has_wildcards;
+
+    if (is_partitioned_implementation)
+    {
+        return std::make_shared<PartitionedStorageS3Sink>(
+            insert_query->partition_by,
+            format_name,
+            sample_block,
+            local_context,
+            format_settings,
+            chosen_compression_method,
+            client_auth.client,
+            client_auth.uri.bucket,
+            client_auth.uri.key,
+            min_upload_part_size,
+            max_single_part_upload_size);
+    }
+    else
+    {
+        return std::make_shared<StorageS3Sink>(
+            format_name,
+            sample_block,
+            local_context,
+            format_settings,
+            chosen_compression_method,
+            client_auth.client,
+            client_auth.uri.bucket,
+            client_auth.uri.key,
+            min_upload_part_size,
+            max_single_part_upload_size);
+    }
 }
 
 
@@ -500,56 +737,108 @@ void StorageS3::updateClientAndAuthSettings(ContextPtr ctx, StorageS3::ClientAut
     upd.auth_settings = std::move(settings);
 }
 
-void registerStorageS3Impl(const String & name, StorageFactory & factory)
-{
-    factory.registerStorage(name, [](const StorageFactory::Arguments & args)
-    {
-        ASTs & engine_args = args.engine_args;
 
+StorageS3Configuration StorageS3::getConfiguration(ASTs & engine_args, ContextPtr local_context)
+{
+    StorageS3Configuration configuration;
+
+    if (auto named_collection = getURLBasedDataSourceConfiguration(engine_args, local_context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "access_key_id")
+                configuration.access_key_id = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else if (arg_name == "secret_access_key")
+                configuration.secret_access_key = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Unknown key-value argument `{}` for StorageS3, expected: url, [access_key_id, secret_access_key], name of used format and [compression_method].",
+                    arg_name);
+        }
+    }
+    else
+    {
         if (engine_args.size() < 2 || engine_args.size() > 5)
             throw Exception(
                 "Storage S3 requires 2 to 5 arguments: url, [access_key_id, secret_access_key], name of used format and [compression_method].",
                 ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
         for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, args.getLocalContext());
+            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, local_context);
 
-        String url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        Poco::URI uri (url);
-        S3::URI s3_uri (uri);
-
-        String access_key_id;
-        String secret_access_key;
+        configuration.url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
         if (engine_args.size() >= 4)
         {
-            access_key_id = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-            secret_access_key = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.access_key_id = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.secret_access_key = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
         }
 
-        UInt64 max_single_read_retries = args.getLocalContext()->getSettingsRef().s3_max_single_read_retries;
-        UInt64 min_upload_part_size = args.getLocalContext()->getSettingsRef().s3_min_upload_part_size;
-        UInt64 max_single_part_upload_size = args.getLocalContext()->getSettingsRef().s3_max_single_part_upload_size;
-        UInt64 max_connections = args.getLocalContext()->getSettingsRef().s3_max_connections;
-
-        String compression_method;
-        String format_name;
         if (engine_args.size() == 3 || engine_args.size() == 5)
         {
-            compression_method = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
-            format_name = engine_args[engine_args.size() - 2]->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.compression_method = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.format = engine_args[engine_args.size() - 2]->as<ASTLiteral &>().value.safeGet<String>();
         }
         else
         {
-            compression_method = "auto";
-            format_name = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
+            configuration.compression_method = "auto";
+            configuration.format = engine_args.back()->as<ASTLiteral &>().value.safeGet<String>();
         }
+    }
+
+    return configuration;
+}
+
+
+void registerStorageS3Impl(const String & name, StorageFactory & factory)
+{
+    factory.registerStorage(name, [](const StorageFactory::Arguments & args)
+    {
+        auto & engine_args = args.engine_args;
+        if (engine_args.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "External data source must have arguments");
+
+        auto configuration = StorageS3::getConfiguration(engine_args, args.getLocalContext());
+        // Use format settings from global server context + settings from
+        // the SETTINGS clause of the create query. Settings from current
+        // session and user are ignored.
+        std::optional<FormatSettings> format_settings;
+        if (args.storage_def->settings)
+        {
+            FormatFactorySettings user_format_settings;
+
+            // Apply changed settings from global context, but ignore the
+            // unknown ones, because we only have the format settings here.
+            const auto & changes = args.getContext()->getSettingsRef().changes();
+            for (const auto & change : changes)
+            {
+                if (user_format_settings.has(change.name))
+                    user_format_settings.set(change.name, change.value);
+            }
+
+            // Apply changes from SETTINGS clause, with validation.
+            user_format_settings.applyChanges(args.storage_def->settings->changes);
+            format_settings = getFormatSettings(args.getContext(), user_format_settings);
+        }
+        else
+        {
+            format_settings = getFormatSettings(args.getContext());
+        }
+
+        S3::URI s3_uri(Poco::URI(configuration.url));
+        auto max_single_read_retries = args.getLocalContext()->getSettingsRef().s3_max_single_read_retries;
+        auto min_upload_part_size = args.getLocalContext()->getSettingsRef().s3_min_upload_part_size;
+        auto max_single_part_upload_size = args.getLocalContext()->getSettingsRef().s3_max_single_part_upload_size;
+        auto max_connections = args.getLocalContext()->getSettingsRef().s3_max_connections;
 
         return StorageS3::create(
             s3_uri,
-            access_key_id,
-            secret_access_key,
+            configuration.access_key_id,
+            configuration.secret_access_key,
             args.table_id,
-            format_name,
+            configuration.format,
             max_single_read_retries,
             min_upload_part_size,
             max_single_part_upload_size,
@@ -558,9 +847,11 @@ void registerStorageS3Impl(const String & name, StorageFactory & factory)
             args.constraints,
             args.comment,
             args.getContext(),
-            compression_method);
+            format_settings,
+            configuration.compression_method);
     },
     {
+        .supports_settings = true,
         .source_access_type = AccessType::S3,
     });
 }
@@ -583,6 +874,11 @@ NamesAndTypesList StorageS3::getVirtuals() const
     };
 }
 
+bool StorageS3::supportsPartitionBy() const
+{
+    return true;
+}
+
 }
 
 #endif
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index a0089578947..89bbdda87f9 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -13,11 +13,12 @@
 
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Poco/URI.h>
-#include <common/logger_useful.h>
-#include <common/shared_ptr_helper.h>
+#include <base/logger_useful.h>
+#include <base/shared_ptr_helper.h>
 #include <IO/S3Common.h>
 #include <IO/CompressionMethod.h>
 #include <Interpreters/Context.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 namespace Aws::S3
 {
@@ -54,6 +55,7 @@ public:
         String name_,
         const Block & sample_block,
         ContextPtr context_,
+        std::optional<FormatSettings> format_settings_,
         const ColumnsDescription & columns_,
         UInt64 max_block_size_,
         UInt64 max_single_read_retries_,
@@ -77,6 +79,7 @@ private:
     String compression_hint;
     std::shared_ptr<Aws::S3::S3Client> client;
     Block sample_block;
+    std::optional<FormatSettings> format_settings;
 
 
     std::unique_ptr<ReadBuffer> read_buf;
@@ -113,6 +116,7 @@ public:
         const ConstraintsDescription & constraints_,
         const String & comment,
         ContextPtr context_,
+        std::optional<FormatSettings> format_settings_,
         const String & compression_method_ = "",
         bool distributed_processing_ = false);
 
@@ -136,6 +140,10 @@ public:
 
     NamesAndTypesList getVirtuals() const override;
 
+    bool supportsPartitionBy() const override;
+
+    static StorageS3Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context);
+
 private:
 
     friend class StorageS3Cluster;
@@ -160,6 +168,7 @@ private:
     String compression_method;
     String name;
     const bool distributed_processing;
+    std::optional<FormatSettings> format_settings;
 
     static void updateClientAndAuthSettings(ContextPtr, ClientAuthentication &);
 };
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index ba2ed4c55cd..f49fd35044d 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -1,8 +1,6 @@
 #include "Storages/StorageS3Cluster.h"
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
@@ -11,11 +9,9 @@
 #include "Client/Connection.h"
 #include "Core/QueryProcessingStage.h"
 #include <Core/UUID.h>
-#include "DataStreams/RemoteBlockInputStream.h"
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeString.h>
-#include <IO/ReadBufferFromS3.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromS3.h>
 #include <IO/WriteHelpers.h>
@@ -24,20 +20,17 @@
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/getTableExpressions.h>
-#include <Formats/FormatFactory.h>
-#include <DataStreams/IBlockOutputStream.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
-#include <DataStreams/narrowBlockInputStreams.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
-#include <Processors/Pipe.h>
-#include <Processors/Sources/SourceFromInputStream.h>
+#include <QueryPipeline/narrowBlockInputStreams.h>
+#include <QueryPipeline/Pipe.h>
 #include "Processors/Sources/SourceWithProgress.h"
 #include <Processors/Sources/RemoteSource.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 #include <aws/core/auth/AWSCredentials.h>
 #include <aws/s3/S3Client.h>
@@ -90,7 +83,6 @@ Pipe StorageS3Cluster::read(
     StorageS3::updateClientAndAuthSettings(context, client_auth);
 
     auto cluster = context->getCluster(cluster_name)->getClusterWithReplicasAsShards(context->getSettings());
-    S3::URI s3_uri(Poco::URI{filename});
     StorageS3::updateClientAndAuthSettings(context, client_auth);
 
     auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(*client_auth.client, client_auth.uri);
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index 81d82052d4d..d1e02c5a730 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -1,15 +1,13 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
 #include <memory>
 #include <optional>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include "Client/Connection.h"
 #include <Interpreters/Cluster.h>
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 63f758c816e..ed0fae49d4e 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -5,7 +5,7 @@
 #include <mutex>
 #include <optional>
 #include <vector>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace Poco::Util
 {
diff --git a/src/Storages/StorageSQLite.cpp b/src/Storages/StorageSQLite.cpp
index ba66083fea5..4e2c6cfbe10 100644
--- a/src/Storages/StorageSQLite.cpp
+++ b/src/Storages/StorageSQLite.cpp
@@ -1,17 +1,18 @@
 #include "StorageSQLite.h"
 
 #if USE_SQLITE
-#include <common/range.h>
-#include <DataStreams/SQLiteBlockInputStream.h>
+#include <base/range.h>
+#include <base/logger_useful.h>
+#include <Processors/Sources/SQLiteSource.h>
 #include <Databases/SQLite/SQLiteUtils.h>
 #include <DataTypes/DataTypeString.h>
 #include <Interpreters/Context.h>
 #include <Formats/FormatFactory.h>
+#include <Processors/Formats/IOutputFormat.h>
 #include <IO/Operators.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTLiteral.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/transformQueryForExternalDatabase.h>
@@ -41,6 +42,7 @@ StorageSQLite::StorageSQLite(
     , database_path(database_path_)
     , global_context(context_)
     , sqlite_db(sqlite_db_)
+    , log(&Poco::Logger::get("StorageSQLite (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -70,6 +72,7 @@ Pipe StorageSQLite::read(
         "",
         remote_table_name,
         context_);
+    LOG_TRACE(log, "Query: {}", query);
 
     Block sample_block;
     for (const String & column_name : column_names)
@@ -78,8 +81,7 @@ Pipe StorageSQLite::read(
         sample_block.insert({column_data.type, column_data.name});
     }
 
-    return Pipe(std::make_shared<SourceFromInputStream>(
-                std::make_shared<SQLiteBlockInputStream>(sqlite_db, query, sample_block, max_block_size)));
+    return Pipe(std::make_shared<SQLiteSource>(sqlite_db, query, sample_block, max_block_size));
 }
 
 
@@ -103,7 +105,7 @@ public:
 
     void consume(Chunk chunk) override
     {
-        auto block = getPort().getHeader().cloneWithColumns(chunk.getColumns());
+        auto block = getHeader().cloneWithColumns(chunk.getColumns());
         WriteBufferFromOwnString sqlbuf;
 
         sqlbuf << "INSERT INTO ";
@@ -119,7 +121,7 @@ public:
 
         sqlbuf << ") VALUES ";
 
-        auto writer = FormatFactory::instance().getOutputStream("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
+        auto writer = FormatFactory::instance().getOutputFormat("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
         writer->write(block);
 
         sqlbuf << ";";
diff --git a/src/Storages/StorageSQLite.h b/src/Storages/StorageSQLite.h
index ccb807a4e47..dcc17322a1a 100644
--- a/src/Storages/StorageSQLite.h
+++ b/src/Storages/StorageSQLite.h
@@ -1,15 +1,17 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_SQLITE
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
-#include <sqlite3.h> // Y_IGNORE
+#include <sqlite3.h>
 
+namespace Poco
+{
+class Logger;
+}
 
 namespace DB
 {
@@ -48,6 +50,7 @@ private:
     String database_path;
     ContextPtr global_context;
     SQLitePtr sqlite_db;
+    Poco::Logger * log;
 };
 
 }
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index 67fd89f5098..e234eaf45f7 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -4,16 +4,20 @@
 #include <Compression/CompressedReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
-#include <DataStreams/NativeBlockOutputStream.h>
-#include <DataStreams/NativeBlockInputStream.h>
+#include <Formats/NativeWriter.h>
+#include <Formats/NativeReader.h>
+#include <QueryPipeline/ProfileInfo.h>
 #include <Disks/IDisk.h>
 #include <Common/formatReadable.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Interpreters/Set.h>
 #include <Interpreters/Context.h>
+#include <Processors/Sinks/SinkToStorage.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTLiteral.h>
-#include <Processors/Sinks/SinkToStorage.h>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 
 namespace DB
@@ -31,11 +35,11 @@ namespace ErrorCodes
 }
 
 
-class SetOrJoinSink : public SinkToStorage
+class SetOrJoinSink : public SinkToStorage, WithContext
 {
 public:
     SetOrJoinSink(
-        StorageSetOrJoinBase & table_, const StorageMetadataPtr & metadata_snapshot_,
+        ContextPtr ctx, StorageSetOrJoinBase & table_, const StorageMetadataPtr & metadata_snapshot_,
         const String & backup_path_, const String & backup_tmp_path_,
         const String & backup_file_name_, bool persistent_);
 
@@ -51,12 +55,13 @@ private:
     String backup_file_name;
     std::unique_ptr<WriteBufferFromFileBase> backup_buf;
     CompressedWriteBuffer compressed_backup_buf;
-    NativeBlockOutputStream backup_stream;
+    NativeWriter backup_stream;
     bool persistent;
 };
 
 
 SetOrJoinSink::SetOrJoinSink(
+    ContextPtr ctx,
     StorageSetOrJoinBase & table_,
     const StorageMetadataPtr & metadata_snapshot_,
     const String & backup_path_,
@@ -64,12 +69,13 @@ SetOrJoinSink::SetOrJoinSink(
     const String & backup_file_name_,
     bool persistent_)
     : SinkToStorage(metadata_snapshot_->getSampleBlock())
+    , WithContext(ctx)
     , table(table_)
     , metadata_snapshot(metadata_snapshot_)
     , backup_path(backup_path_)
     , backup_tmp_path(backup_tmp_path_)
     , backup_file_name(backup_file_name_)
-    , backup_buf(table_.disk->writeFile(backup_tmp_path + backup_file_name))
+    , backup_buf(table_.disk->writeFile(fs::path(backup_tmp_path) / backup_file_name))
     , compressed_backup_buf(*backup_buf)
     , backup_stream(compressed_backup_buf, 0, metadata_snapshot->getSampleBlock())
     , persistent(persistent_)
@@ -79,9 +85,9 @@ SetOrJoinSink::SetOrJoinSink(
 void SetOrJoinSink::consume(Chunk chunk)
 {
     /// Sort columns in the block. This is necessary, since Set and Join count on the same column order in different blocks.
-    Block sorted_block = getPort().getHeader().cloneWithColumns(chunk.detachColumns()).sortColumns();
+    Block sorted_block = getHeader().cloneWithColumns(chunk.detachColumns()).sortColumns();
 
-    table.insertBlock(sorted_block);
+    table.insertBlock(sorted_block, getContext());
     if (persistent)
         backup_stream.write(sorted_block);
 }
@@ -96,15 +102,16 @@ void SetOrJoinSink::onFinish()
         backup_buf->next();
         backup_buf->finalize();
 
-        table.disk->replaceFile(backup_tmp_path + backup_file_name, backup_path + backup_file_name);
+        table.disk->replaceFile(fs::path(backup_tmp_path) / backup_file_name, fs::path(backup_path) / backup_file_name);
     }
 }
 
 
-SinkToStoragePtr StorageSetOrJoinBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/)
+SinkToStoragePtr StorageSetOrJoinBase::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr context)
 {
     UInt64 id = ++increment;
-    return std::make_shared<SetOrJoinSink>(*this, metadata_snapshot, path, path + "tmp/", toString(id) + ".bin", persistent);
+    return std::make_shared<SetOrJoinSink>(
+        context, *this, metadata_snapshot, path, fs::path(path) / "tmp/", toString(id) + ".bin", persistent);
 }
 
 
@@ -146,16 +153,16 @@ StorageSet::StorageSet(
 
     Block header = getInMemoryMetadataPtr()->getSampleBlock();
     header = header.sortColumns();
-    set->setHeader(header);
+    set->setHeader(header.getColumnsWithTypeAndName());
 
     restore();
 }
 
 
-void StorageSet::insertBlock(const Block & block) { set->insertFromBlock(block); }
+void StorageSet::insertBlock(const Block & block, ContextPtr) { set->insertFromBlock(block.getColumnsWithTypeAndName()); }
 void StorageSet::finishInsert() { set->finishInsert(); }
 
-size_t StorageSet::getSize() const { return set->getTotalRowCount(); }
+size_t StorageSet::getSize(ContextPtr) const { return set->getTotalRowCount(); }
 std::optional<UInt64> StorageSet::totalRows(const Settings &) const { return set->getTotalRowCount(); }
 std::optional<UInt64> StorageSet::totalBytes(const Settings &) const { return set->getTotalByteCount(); }
 
@@ -163,22 +170,22 @@ void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_sn
 {
     disk->removeRecursive(path);
     disk->createDirectories(path);
-    disk->createDirectories(path + "tmp/");
+    disk->createDirectories(fs::path(path) / "tmp/");
 
     Block header = metadata_snapshot->getSampleBlock();
     header = header.sortColumns();
 
     increment = 0;
     set = std::make_shared<Set>(SizeLimits(), false, true);
-    set->setHeader(header);
+    set->setHeader(header.getColumnsWithTypeAndName());
 }
 
 
 void StorageSetOrJoinBase::restore()
 {
-    if (!disk->exists(path + "tmp/"))
+    if (!disk->exists(fs::path(path) / "tmp/"))
     {
-        disk->createDirectories(path + "tmp/");
+        disk->createDirectories(fs::path(path) / "tmp/");
         return;
     }
 
@@ -207,21 +214,23 @@ void StorageSetOrJoinBase::restore()
 
 void StorageSetOrJoinBase::restoreFromFile(const String & file_path)
 {
+    ContextPtr ctx = nullptr;
     auto backup_buf = disk->readFile(file_path);
     CompressedReadBuffer compressed_backup_buf(*backup_buf);
-    NativeBlockInputStream backup_stream(compressed_backup_buf, 0);
-
-    backup_stream.readPrefix();
+    NativeReader backup_stream(compressed_backup_buf, 0);
 
+    ProfileInfo info;
     while (Block block = backup_stream.read())
-        insertBlock(block);
+    {
+        info.update(block);
+        insertBlock(block, ctx);
+    }
 
     finishInsert();
-    backup_stream.readSuffix();
 
     /// TODO Add speed, compressed bytes, data volume in memory, compression ratio ... Generalize all statistics logging in project.
     LOG_INFO(&Poco::Logger::get("StorageSetOrJoinBase"), "Loaded from backup file {}. {} rows, {}. State has {} unique rows.",
-        file_path, backup_stream.getProfileInfo().rows, ReadableSize(backup_stream.getProfileInfo().bytes), getSize());
+        file_path, info.rows, ReadableSize(info.bytes), getSize(ctx));
 }
 
 
diff --git a/src/Storages/StorageSet.h b/src/Storages/StorageSet.h
index 1166557ec8e..a84bdea1430 100644
--- a/src/Storages/StorageSet.h
+++ b/src/Storages/StorageSet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
@@ -51,10 +51,10 @@ private:
     void restoreFromFile(const String & file_path);
 
     /// Insert the block into the state.
-    virtual void insertBlock(const Block & block) = 0;
+    virtual void insertBlock(const Block & block, ContextPtr context) = 0;
     /// Call after all blocks were inserted.
     virtual void finishInsert() = 0;
-    virtual size_t getSize() const = 0;
+    virtual size_t getSize(ContextPtr context) const = 0;
 };
 
 
@@ -81,9 +81,9 @@ public:
 private:
     SetPtr set;
 
-    void insertBlock(const Block & block) override;
+    void insertBlock(const Block & block, ContextPtr) override;
     void finishInsert() override;
-    size_t getSize() const override;
+    size_t getSize(ContextPtr) const override;
 
 protected:
     StorageSet(
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 6bf91a145ed..50113c391cc 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -14,9 +14,8 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 
-#include <DataStreams/IBlockOutputStream.h>
-#include <DataStreams/NativeBlockInputStream.h>
-#include <DataStreams/NativeBlockOutputStream.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 
 #include <DataTypes/DataTypeFactory.h>
 
@@ -32,7 +31,7 @@
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Sources/NullSource.h>
 #include <Processors/Sinks/SinkToStorage.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 #include <cassert>
 
@@ -78,7 +77,7 @@ public:
         StorageStripeLog & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
         const Names & column_names,
-        size_t max_read_buffer_size_,
+        ReadSettings read_settings_,
         std::shared_ptr<const IndexForNativeFormat> & index_,
         IndexForNativeFormat::Blocks::const_iterator index_begin_,
         IndexForNativeFormat::Blocks::const_iterator index_end_)
@@ -86,7 +85,7 @@ public:
             getHeader(storage_, metadata_snapshot_, column_names, index_begin_, index_end_))
         , storage(storage_)
         , metadata_snapshot(metadata_snapshot_)
-        , max_read_buffer_size(max_read_buffer_size_)
+        , read_settings(std::move(read_settings_))
         , index(index_)
         , index_begin(index_begin_)
         , index_end(index_end_)
@@ -98,9 +97,6 @@ public:
 protected:
     Chunk generate() override
     {
-        if (storage.file_checker.empty())
-            return {};
-
         Block res;
         start();
 
@@ -123,7 +119,7 @@ protected:
 private:
     StorageStripeLog & storage;
     StorageMetadataPtr metadata_snapshot;
-    size_t max_read_buffer_size;
+    ReadSettings read_settings;
 
     std::shared_ptr<const IndexForNativeFormat> index;
     IndexForNativeFormat::Blocks::const_iterator index_begin;
@@ -136,7 +132,7 @@ private:
       */
     bool started = false;
     std::optional<CompressedReadBufferFromFile> data_in;
-    std::optional<NativeBlockInputStream> block_in;
+    std::optional<NativeReader> block_in;
 
     void start()
     {
@@ -145,9 +141,7 @@ private:
             started = true;
 
             String data_file_path = storage.table_path + "data.bin";
-            size_t buffer_size = std::min(max_read_buffer_size, storage.disk->getFileSize(data_file_path));
-
-            data_in.emplace(storage.disk->readFile(data_file_path, buffer_size));
+            data_in.emplace(storage.disk->readFile(data_file_path, read_settings.adjustBufferSize(storage.disk->getFileSize(data_file_path))));
             block_in.emplace(*data_in, 0, index_begin, index_end);
         }
     }
@@ -208,7 +202,7 @@ public:
 
     void consume(Chunk chunk) override
     {
-        block_out.write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+        block_out.write(getHeader().cloneWithColumns(chunk.detachColumns()));
     }
 
     void onFinish() override
@@ -216,7 +210,6 @@ public:
         if (done)
             return;
 
-        block_out.writeSuffix();
         data_out->next();
         data_out_compressed->next();
         data_out_compressed->finalize();
@@ -247,7 +240,7 @@ private:
     String index_out_file;
     std::unique_ptr<WriteBuffer> index_out_compressed;
     std::unique_ptr<CompressedWriteBuffer> index_out;
-    NativeBlockOutputStream block_out;
+    NativeWriter block_out;
 
     bool done = false;
 };
@@ -340,12 +333,14 @@ Pipe StorageStripeLog::read(
     Pipes pipes;
 
     String index_file = table_path + "index.mrk";
-    if (!disk->exists(index_file))
+    if (file_checker.empty() || !disk->exists(index_file))
     {
         return Pipe(std::make_shared<NullSource>(metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID())));
     }
 
-    CompressedReadBufferFromFile index_in(disk->readFile(index_file, 4096));
+    ReadSettings read_settings = context->getReadSettings();
+
+    CompressedReadBufferFromFile index_in(disk->readFile(index_file, read_settings.adjustBufferSize(4096)));
     std::shared_ptr<const IndexForNativeFormat> index{std::make_shared<IndexForNativeFormat>(index_in, column_names_set)};
 
     size_t size = index->blocks.size();
@@ -361,7 +356,7 @@ Pipe StorageStripeLog::read(
         std::advance(end, (stream + 1) * size / num_streams);
 
         pipes.emplace_back(std::make_shared<StripeLogSource>(
-            *this, metadata_snapshot, column_names, context->getSettingsRef().max_read_buffer_size, index, begin, end));
+            *this, metadata_snapshot, column_names, read_settings, index, begin, end));
     }
 
     /// We do not keep read lock directly at the time of reading, because we read ranges of data that do not change.
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index 73d46b1e617..6ca9552cd11 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -3,7 +3,7 @@
 #include <map>
 #include <shared_mutex>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/Defines.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageTableFunction.h b/src/Storages/StorageTableFunction.h
index 75480db7ef3..0b7ab30fa24 100644
--- a/src/Storages/StorageTableFunction.h
+++ b/src/Storages/StorageTableFunction.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <Storages/IStorage.h>
 #include <TableFunctions/ITableFunction.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Storages/StorageProxy.h>
 #include <Common/CurrentThread.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -32,7 +32,7 @@ public:
         setInMemoryMetadata(cached_metadata);
     }
 
-    StoragePtr getNested() const override
+    StoragePtr getNestedImpl() const
     {
         std::lock_guard lock{nested_mutex};
         if (nested)
@@ -46,6 +46,20 @@ public:
         return nested;
     }
 
+    StoragePtr getNested() const override
+    {
+        StoragePtr nested_storage = getNestedImpl();
+        assert(!nested_storage->getStoragePolicy());
+        assert(!nested_storage->storesDataOnDisk());
+        return nested_storage;
+    }
+
+    /// Table functions cannot have storage policy and cannot store data on disk.
+    /// We may check if table is readonly or stores data on disk on DROP TABLE.
+    /// Avoid loading nested table by returning nullptr/false for all table functions.
+    StoragePolicyPtr getStoragePolicy() const override { return nullptr; }
+    bool storesDataOnDisk() const override { return false; }
+
     String getName() const override
     {
         std::lock_guard lock{nested_mutex};
diff --git a/src/Storages/StorageTinyLog.cpp b/src/Storages/StorageTinyLog.cpp
index 53ae74c4e00..8657467226f 100644
--- a/src/Storages/StorageTinyLog.cpp
+++ b/src/Storages/StorageTinyLog.cpp
@@ -36,7 +36,7 @@
 
 #include <Processors/Sources/SourceWithProgress.h>
 #include <Processors/Sinks/SinkToStorage.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 #define DBMS_STORAGE_LOG_DATA_FILE_EXTENSION ".bin"
 
@@ -70,11 +70,11 @@ public:
         size_t block_size_,
         const NamesAndTypesList & columns_,
         StorageTinyLog & storage_,
-        size_t max_read_buffer_size_,
+        ReadSettings read_settings_,
         FileChecker::Map file_sizes_)
         : SourceWithProgress(getHeader(columns_))
         , block_size(block_size_), columns(columns_), storage(storage_)
-        , max_read_buffer_size(max_read_buffer_size_), file_sizes(std::move(file_sizes_))
+        , read_settings(std::move(read_settings_)), file_sizes(std::move(file_sizes_))
     {
     }
 
@@ -88,13 +88,15 @@ private:
     NamesAndTypesList columns;
     StorageTinyLog & storage;
     bool is_finished = false;
-    size_t max_read_buffer_size;
+    ReadSettings read_settings;
     FileChecker::Map file_sizes;
 
     struct Stream
     {
-        Stream(const DiskPtr & disk, const String & data_path, size_t max_read_buffer_size_, size_t file_size)
-            : plain(file_size ? disk->readFile(data_path, std::min(max_read_buffer_size_, file_size)) : std::make_unique<ReadBuffer>(nullptr, 0)),
+        Stream(const DiskPtr & disk, const String & data_path, ReadSettings read_settings_, size_t file_size)
+            : plain(file_size
+                ? disk->readFile(data_path, read_settings_.adjustBufferSize(file_size))
+                : std::make_unique<ReadBuffer>(nullptr, 0)),
             limited(std::make_unique<LimitReadBuffer>(*plain, file_size, false)),
             compressed(*limited)
         {
@@ -178,7 +180,7 @@ void TinyLogSource::readData(const NameAndTypePair & name_and_type,
         {
             String file_path = storage.files[stream_name].data_file_path;
             stream = std::make_unique<Stream>(
-                storage.disk, file_path, max_read_buffer_size, file_sizes[fileName(file_path)]);
+                storage.disk, file_path, read_settings, file_sizes[fileName(file_path)]);
         }
 
         return &stream->compressed;
@@ -332,7 +334,7 @@ void TinyLogSink::onFinish()
 
     WrittenStreams written_streams;
     ISerialization::SerializeBinaryBulkSettings settings;
-    for (const auto & column : getPort().getHeader())
+    for (const auto & column : getHeader())
     {
         auto it = serialize_states.find(column.name);
         if (it != serialize_states.end())
@@ -367,7 +369,7 @@ void TinyLogSink::onFinish()
 
 void TinyLogSink::consume(Chunk chunk)
 {
-    auto block = getPort().getHeader().cloneWithColumns(chunk.detachColumns());
+    auto block = getHeader().cloneWithColumns(chunk.detachColumns());
     metadata_snapshot->check(block, true);
 
     /// The set of written offset columns so that you do not write shared columns for nested structures multiple times
@@ -446,9 +448,8 @@ void StorageTinyLog::addFiles(const NameAndTypePair & column)
         }
     };
 
-    ISerialization::SubstreamPath substream_path;
     auto serialization = type->getDefaultSerialization();
-    serialization->enumerateStreams(stream_callback, substream_path);
+    serialization->enumerateStreams(stream_callback);
 }
 
 
@@ -493,8 +494,6 @@ Pipe StorageTinyLog::read(
 
     // When reading, we lock the entire storage, because we only have one file
     // per column and can't modify it concurrently.
-    const Settings & settings = context->getSettingsRef();
-
     std::shared_lock lock{rwlock, getLockTimeout(context)};
     if (!lock)
         throw Exception("Lock timeout exceeded", ErrorCodes::TIMEOUT_EXCEEDED);
@@ -504,7 +503,7 @@ Pipe StorageTinyLog::read(
         max_block_size,
         Nested::convertToSubcolumns(all_columns),
         *this,
-        settings.max_read_buffer_size,
+        context->getReadSettings(),
         file_checker.getFileSizes()));
 }
 
@@ -544,9 +543,8 @@ IStorage::ColumnSizeByName StorageTinyLog::getColumnSizes() const
                 size.data_compressed += file_sizes[fileName(it->second.data_file_path)];
         };
 
-        ISerialization::SubstreamPath substream_path;
         auto serialization = column.type->getDefaultSerialization();
-        serialization->enumerateStreams(stream_callback, substream_path);
+        serialization->enumerateStreams(stream_callback);
     }
 
     return column_sizes;
diff --git a/src/Storages/StorageTinyLog.h b/src/Storages/StorageTinyLog.h
index ef45e9fb74d..b25b79afe1f 100644
--- a/src/Storages/StorageTinyLog.h
+++ b/src/Storages/StorageTinyLog.h
@@ -2,7 +2,7 @@
 
 #include <map>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 #include <Core/Defines.h>
 #include <Storages/IStorage.h>
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 1aa5ac7f236..4d8f1d8c492 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -6,23 +6,22 @@
 #include <Parsers/ASTLiteral.h>
 
 #include <IO/ReadHelpers.h>
-#include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromHTTP.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ConnectionTimeouts.h>
 #include <IO/ConnectionTimeoutsContext.h>
 
 #include <Formats/FormatFactory.h>
-#include <Processors/Formats/InputStreamFromInputFormat.h>
+#include <Processors/Formats/IOutputFormat.h>
+#include <Processors/Formats/IInputFormat.h>
 
-#include <DataStreams/IBlockOutputStream.h>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 
 #include <Poco/Net/HTTPRequest.h>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <algorithm>
 
 
@@ -32,8 +31,10 @@ namespace ErrorCodes
 {
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int NETWORK_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
+
 IStorageURLBase::IStorageURLBase(
     const Poco::URI & uri_,
     ContextPtr /*context_*/,
@@ -43,8 +44,9 @@ IStorageURLBase::IStorageURLBase(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    const String & compression_method_)
-    : IStorage(table_id_), uri(uri_), compression_method(compression_method_), format_name(format_name_), format_settings(format_settings_)
+    const String & compression_method_,
+    const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_)
+    : IStorage(table_id_), uri(uri_), compression_method(compression_method_), format_name(format_name_), format_settings(format_settings_), headers(headers_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -55,10 +57,36 @@ IStorageURLBase::IStorageURLBase(
 
 namespace
 {
+    ReadWriteBufferFromHTTP::HTTPHeaderEntries getHeaders(
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_)
+    {
+        ReadWriteBufferFromHTTP::HTTPHeaderEntries headers(headers_.begin(), headers_.end());
+        // Propagate OpenTelemetry trace context, if any, downstream.
+        if (CurrentThread::isInitialized())
+        {
+            const auto & thread_trace_context = CurrentThread::get().thread_trace_context;
+            if (thread_trace_context.trace_id != UUID())
+            {
+                headers.emplace_back("traceparent",
+                    thread_trace_context.composeTraceparentHeader());
+
+                if (!thread_trace_context.tracestate.empty())
+                {
+                    headers.emplace_back("tracestate",
+                        thread_trace_context.tracestate);
+                }
+            }
+        }
+        return headers;
+    }
+
     class StorageURLSource : public SourceWithProgress
     {
+    using URIParams = std::vector<std::pair<String, String>>;
+
     public:
-        StorageURLSource(const Poco::URI & uri,
+        StorageURLSource(
+            const std::vector<Poco::URI> & uri_options,
             const std::string & method,
             std::function<void(std::ostream &)> callback,
             const String & format,
@@ -69,51 +97,63 @@ namespace
             const ColumnsDescription & columns,
             UInt64 max_block_size,
             const ConnectionTimeouts & timeouts,
-            const CompressionMethod compression_method)
+            const String & compression_method,
+            const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_ = {},
+            const URIParams & params = {})
             : SourceWithProgress(sample_block), name(std::move(name_))
         {
-            ReadWriteBufferFromHTTP::HTTPHeaderEntries header;
-
-            // Propagate OpenTelemetry trace context, if any, downstream.
-            if (CurrentThread::isInitialized())
+            auto headers = getHeaders(headers_);
+            /// Lazy initialization. We should not perform requests in constructor, because we need to do it in query pipeline.
+            initialize = [=, this]
             {
-                const auto & thread_trace_context = CurrentThread::get().thread_trace_context;
-                if (thread_trace_context.trace_id != UUID())
+                WriteBufferFromOwnString error_message;
+                for (auto option = uri_options.begin(); option < uri_options.end(); ++option)
                 {
-                    header.emplace_back("traceparent",
-                        thread_trace_context.composeTraceparentHeader());
+                    auto request_uri = *option;
+                    for (const auto & [param, value] : params)
+                        request_uri.addQueryParameter(param, value);
 
-                    if (!thread_trace_context.tracestate.empty())
+                    try
                     {
-                        header.emplace_back("tracestate",
-                            thread_trace_context.tracestate);
+                        read_buf = wrapReadBufferWithCompressionMethod(
+                            std::make_unique<ReadWriteBufferFromHTTP>(
+                                request_uri,
+                                method,
+                                callback,
+                                timeouts,
+                                context->getSettingsRef().max_http_get_redirects,
+                                Poco::Net::HTTPBasicCredentials{},
+                                DBMS_DEFAULT_BUFFER_SIZE,
+                                context->getReadSettings(),
+                                headers,
+                                context->getRemoteHostFilter()),
+                            chooseCompressionMethod(request_uri.getPath(), compression_method));
+                    }
+                    catch (...)
+                    {
+                        if (uri_options.size() == 1)
+                            throw;
+
+                        if (option == uri_options.end() - 1)
+                            throw Exception(ErrorCodes::NETWORK_ERROR, "All uri options are unreachable. {}", error_message.str());
+
+                        error_message << option->toString() << " error: " << getCurrentExceptionMessage(false) << "\n";
+                        tryLogCurrentException(__PRETTY_FUNCTION__);
                     }
                 }
-            }
 
-            read_buf = wrapReadBufferWithCompressionMethod(
-                std::make_unique<ReadWriteBufferFromHTTP>(
-                    uri,
-                    method,
-                    std::move(callback),
-                    timeouts,
-                    context->getSettingsRef().max_http_get_redirects,
-                    Poco::Net::HTTPBasicCredentials{},
-                    DBMS_DEFAULT_BUFFER_SIZE,
-                    header,
-                    context->getRemoteHostFilter()),
-                compression_method);
+                auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size, format_settings);
+                QueryPipelineBuilder builder;
+                builder.init(Pipe(input_format));
 
-            auto input_format = FormatFactory::instance().getInput(format, *read_buf, sample_block, context, max_block_size, format_settings);
-            pipeline = std::make_unique<QueryPipeline>();
-            pipeline->init(Pipe(input_format));
+                builder.addSimpleTransform([&](const Block & cur_header)
+                {
+                    return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *input_format, context);
+                });
 
-            pipeline->addSimpleTransform([&](const Block & cur_header)
-            {
-                return std::make_shared<AddingDefaultsTransform>(cur_header, columns, *input_format, context);
-            });
-
-            reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
+                pipeline = std::make_unique<QueryPipeline>(QueryPipelineBuilder::getPipeline(std::move(builder)));
+                reader = std::make_unique<PullingPipelineExecutor>(*pipeline);
+            };
         }
 
         String getName() const override
@@ -123,6 +163,12 @@ namespace
 
         Chunk generate() override
         {
+            if (initialize)
+            {
+                initialize();
+                initialize = {};
+            }
+
             if (!reader)
                 return {};
 
@@ -137,6 +183,8 @@ namespace
         }
 
     private:
+        std::function<void()> initialize;
+
         String name;
         std::unique_ptr<ReadBuffer> read_buf;
         std::unique_ptr<QueryPipeline> pipeline;
@@ -157,7 +205,7 @@ StorageURLSink::StorageURLSink(
     write_buf = wrapWriteBufferWithCompressionMethod(
             std::make_unique<WriteBufferFromHTTP>(uri, Poco::Net::HTTPRequest::HTTP_POST, timeouts),
             compression_method, 3);
-    writer = FormatFactory::instance().getOutputStream(format, *write_buf, sample_block,
+    writer = FormatFactory::instance().getOutputFormat(format, *write_buf, sample_block,
         context, {} /* write callback */, format_settings);
 }
 
@@ -166,16 +214,16 @@ void StorageURLSink::consume(Chunk chunk)
 {
     if (is_first_chunk)
     {
-        writer->writePrefix();
+        writer->doWritePrefix();
         is_first_chunk = false;
     }
 
-    writer->write(getPort().getHeader().cloneWithColumns(chunk.detachColumns()));
+    writer->write(getHeader().cloneWithColumns(chunk.detachColumns()));
 }
 
 void StorageURLSink::onFinish()
 {
-    writer->writeSuffix();
+    writer->doWriteSuffix();
     writer->flush();
     write_buf->finalize();
 }
@@ -218,13 +266,10 @@ Pipe IStorageURLBase::read(
     size_t max_block_size,
     unsigned /*num_streams*/)
 {
-    auto request_uri = uri;
     auto params = getReadURIParams(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size);
-    for (const auto & [param, value] : params)
-        request_uri.addQueryParameter(param, value);
-
+    std::vector<Poco::URI> uri_options{uri};
     return Pipe(std::make_shared<StorageURLSource>(
-        request_uri,
+        uri_options,
         getReadMethod(),
         getReadPOSTDataCallback(
             column_names, metadata_snapshot, query_info,
@@ -237,7 +282,7 @@ Pipe IStorageURLBase::read(
         metadata_snapshot->getColumns(),
         max_block_size,
         ConnectionTimeouts::getHTTPTimeouts(local_context),
-        chooseCompressionMethod(request_uri.getPath(), compression_method)));
+        compression_method, headers, params));
 }
 
 
@@ -251,47 +296,23 @@ Pipe StorageURLWithFailover::read(
     unsigned /*num_streams*/)
 {
     auto params = getReadURIParams(column_names, metadata_snapshot, query_info, local_context, processed_stage, max_block_size);
-    WriteBufferFromOwnString error_message;
-    error_message << "Detailed description:";
-
-    for (const auto & uri_option : uri_options)
-    {
-        auto request_uri = uri_option;
-        for (const auto & [param, value] : params)
-            request_uri.addQueryParameter(param, value);
-        try
-        {
-            /// Check for uri accessibility is done in constructor of ReadWriteBufferFromHTTP while creating StorageURLSource.
-            auto url_source =  std::make_shared<StorageURLSource>(
-                request_uri,
-                getReadMethod(),
-                getReadPOSTDataCallback(
-                    column_names, metadata_snapshot, query_info,
-                    local_context, processed_stage, max_block_size),
-                format_name,
-                format_settings,
-                getName(),
-                getHeaderBlock(column_names, metadata_snapshot),
-                local_context,
-                metadata_snapshot->getColumns(),
-                max_block_size,
-                ConnectionTimeouts::getHTTPTimeouts(local_context),
-                chooseCompressionMethod(request_uri.getPath(), compression_method));
-
-            std::shuffle(uri_options.begin(), uri_options.end(), thread_local_rng);
-
-            return Pipe(url_source);
-        }
-        catch (...)
-        {
-            error_message << " Host: " << uri_option.getHost() << ", post: " << uri_option.getPort() << ", path: " << uri_option.getPath();
-            error_message << ", error: " << getCurrentExceptionMessage(false) << ";";
-
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-
-    throw Exception(ErrorCodes::NETWORK_ERROR, "All uri options are unreachable. {}", error_message.str());
+    auto pipe =  Pipe(std::make_shared<StorageURLSource>(
+        uri_options,
+        getReadMethod(),
+        getReadPOSTDataCallback(
+            column_names, metadata_snapshot, query_info,
+            local_context, processed_stage, max_block_size),
+        format_name,
+        format_settings,
+        getName(),
+        getHeaderBlock(column_names, metadata_snapshot),
+        local_context,
+        metadata_snapshot->getColumns(),
+        max_block_size,
+        ConnectionTimeouts::getHTTPTimeouts(local_context),
+        compression_method, headers, params));
+    std::shuffle(uri_options.begin(), uri_options.end(), thread_local_rng);
+    return pipe;
 }
 
 
@@ -312,8 +333,9 @@ StorageURL::StorageURL(
     const ConstraintsDescription & constraints_,
     const String & comment,
     ContextPtr context_,
-    const String & compression_method_)
-    : IStorageURLBase(uri_, context_, table_id_, format_name_, format_settings_, columns_, constraints_, comment, compression_method_)
+    const String & compression_method_,
+    const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_)
+    : IStorageURLBase(uri_, context_, table_id_, format_name_, format_settings_, columns_, constraints_, comment, compression_method_, headers_)
 {
     context_->getRemoteHostFilter().checkURL(uri);
 }
@@ -375,45 +397,73 @@ FormatSettings StorageURL::getFormatSettingsFromArgs(const StorageFactory::Argum
     return format_settings;
 }
 
+URLBasedDataSourceConfiguration StorageURL::getConfiguration(ASTs & args, ContextPtr local_context)
+{
+    URLBasedDataSourceConfiguration configuration;
+
+    if (auto named_collection = getURLBasedDataSourceConfiguration(args, local_context))
+    {
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
+
+        if (!storage_specific_args.empty())
+        {
+            String illegal_args;
+            for (const auto & arg : storage_specific_args)
+            {
+                if (!illegal_args.empty())
+                    illegal_args += ", ";
+                illegal_args += arg.first;
+            }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown arguments {} for table function URL", illegal_args);
+        }
+    }
+    else
+    {
+        if (args.size() != 2 && args.size() != 3)
+            throw Exception(
+                "Storage URL requires 2 or 3 arguments: url, name of used format and optional compression method.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+
+        for (auto & arg : args)
+            arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, local_context);
+
+        configuration.url = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        configuration.format = args[1]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args.size() == 3)
+            configuration.compression_method = args[2]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    return configuration;
+}
+
 
 void registerStorageURL(StorageFactory & factory)
 {
     factory.registerStorage("URL", [](const StorageFactory::Arguments & args)
     {
         ASTs & engine_args = args.engine_args;
-
-        if (engine_args.size() != 2 && engine_args.size() != 3)
-            throw Exception(
-                "Storage URL requires 2 or 3 arguments: url, name of used format and optional compression method.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-        engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[0], args.getLocalContext());
-
-        const String & url = engine_args[0]->as<ASTLiteral &>().value.safeGet<String>();
-        Poco::URI uri(url);
-
-        engine_args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[1], args.getLocalContext());
-
-        const String & format_name = engine_args[1]->as<ASTLiteral &>().value.safeGet<String>();
-
-        String compression_method = "auto";
-        if (engine_args.size() == 3)
-        {
-            engine_args[2] = evaluateConstantExpressionOrIdentifierAsLiteral(engine_args[2], args.getLocalContext());
-            compression_method = engine_args[2]->as<ASTLiteral &>().value.safeGet<String>();
-        }
-
+        auto configuration = StorageURL::getConfiguration(engine_args, args.getLocalContext());
         auto format_settings = StorageURL::getFormatSettingsFromArgs(args);
+        Poco::URI uri(configuration.url);
+
+        ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
+        for (const auto & [header, value] : configuration.headers)
+        {
+            auto value_literal = value.safeGet<String>();
+            headers.emplace_back(std::make_pair(header, value_literal));
+        }
 
         return StorageURL::create(
             uri,
             args.table_id,
-            format_name,
+            configuration.format,
             format_settings,
             args.columns,
             args.constraints,
             args.comment,
             args.getContext(),
-            compression_method);
+            configuration.compression_method,
+            headers);
     },
     {
         .supports_settings = true,
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 7d61661b68d..1f2cac239e1 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -2,16 +2,21 @@
 
 #include <Storages/IStorage.h>
 #include <Poco/URI.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Formats/FormatSettings.h>
 #include <IO/CompressionMethod.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
 #include <Storages/StorageFactory.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
 {
 
+class IOutputFormat;
+using OutputFormatPtr = std::shared_ptr<IOutputFormat>;
+
 struct ConnectionTimeouts;
 
 /**
@@ -44,7 +49,8 @@ protected:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        const String & compression_method_);
+        const String & compression_method_,
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_ = {});
 
     Poco::URI uri;
     String compression_method;
@@ -54,6 +60,7 @@ protected:
     // For `url` table function, we use settings from current query context.
     // In this case, format_settings is not set.
     std::optional<FormatSettings> format_settings;
+    ReadWriteBufferFromHTTP::HTTPHeaderEntries headers;
 
     virtual std::string getReadMethod() const;
 
@@ -95,7 +102,7 @@ public:
 
 private:
     std::unique_ptr<WriteBuffer> write_buf;
-    BlockOutputStreamPtr writer;
+    OutputFormatPtr writer;
 
     bool is_first_chunk = true;
 };
@@ -113,7 +120,8 @@ public:
         const ConstraintsDescription & constraints_,
         const String & comment,
         ContextPtr context_,
-        const String & compression_method_);
+        const String & compression_method_,
+        const ReadWriteBufferFromHTTP::HTTPHeaderEntries & headers_ = {});
 
     String getName() const override
     {
@@ -126,6 +134,8 @@ public:
     }
 
     static FormatSettings getFormatSettingsFromArgs(const StorageFactory::Arguments & args);
+
+    static URLBasedDataSourceConfiguration getConfiguration(ASTs & args, ContextPtr context);
 };
 
 
@@ -152,6 +162,13 @@ public:
         size_t max_block_size,
         unsigned num_streams) override;
 
+    struct Configuration
+    {
+        String url;
+        String compression_method = "auto";
+        std::vector<std::pair<String, String>> headers;
+    };
+
 private:
     std::vector<Poco::URI> uri_options;
 };
diff --git a/src/Storages/StorageValues.cpp b/src/Storages/StorageValues.cpp
index ace5ca3667c..650782afbba 100644
--- a/src/Storages/StorageValues.cpp
+++ b/src/Storages/StorageValues.cpp
@@ -2,7 +2,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageValues.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageValues.h b/src/Storages/StorageValues.h
index 4d6d168441c..69b2f757046 100644
--- a/src/Storages/StorageValues.h
+++ b/src/Storages/StorageValues.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index 5119c5b121d..9ffea587b97 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -1,6 +1,7 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/Context.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSubquery.h>
@@ -13,8 +14,9 @@
 
 #include <Common/typeid_cast.h>
 
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/Transforms/MaterializingTransform.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/SettingQuotaAndLimitsStep.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -29,6 +31,56 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+namespace
+{
+
+bool isNullableOrLcNullable(DataTypePtr type)
+{
+    if (type->isNullable())
+        return true;
+
+    if (const auto * lc_type = typeid_cast<const DataTypeLowCardinality *>(type.get()))
+        return lc_type->getDictionaryType()->isNullable();
+
+    return false;
+}
+
+/// Returns `true` if there are nullable column in src but corresponding column in dst is not
+bool changedNullabilityOneWay(const Block & src_block, const Block & dst_block)
+{
+    std::unordered_map<String, bool> src_nullable;
+    for (const auto & col : src_block)
+        src_nullable[col.name] = isNullableOrLcNullable(col.type);
+
+    for (const auto & col : dst_block)
+    {
+        if (!isNullableOrLcNullable(col.type) && src_nullable[col.name])
+            return true;
+    }
+    return false;
+}
+
+bool hasJoin(const ASTSelectQuery & select)
+{
+    const auto & tables = select.tables();
+    if (!tables || tables->children.size() < 2)
+        return false;
+
+    const auto & joined_table = tables->children[1]->as<ASTTablesInSelectQueryElement &>();
+    return joined_table.table_join != nullptr;
+}
+
+bool hasJoin(const ASTSelectWithUnionQuery & ast)
+{
+    for (const auto & child : ast.list_of_selects->children)
+    {
+        if (const auto * select = child->as<ASTSelectQuery>(); select && hasJoin(*select))
+            return true;
+    }
+    return false;
+}
+
+}
 
 StorageView::StorageView(
     const StorageID & table_id_,
@@ -86,12 +138,7 @@ void StorageView::read(
         current_inner_query = query_info.view_query->clone();
     }
 
-    auto modified_context = Context::createCopy(context);
-    /// Use settings from global context,
-    /// because difference between settings set on VIEW creation and query execution can break queries
-    modified_context->setSettings(context->getGlobalContext()->getSettingsRef());
-
-    InterpreterSelectWithUnionQuery interpreter(current_inner_query, modified_context, {}, column_names);
+    InterpreterSelectWithUnionQuery interpreter(current_inner_query, context, {}, column_names);
     interpreter.buildQueryPlan(query_plan);
 
     /// It's expected that the columns read from storage are not constant.
@@ -104,10 +151,22 @@ void StorageView::read(
     query_plan.addStep(std::move(materializing));
 
     /// And also convert to expected structure.
-    auto header = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
+    const auto & expected_header = metadata_snapshot->getSampleBlockForColumns(column_names, getVirtuals(), getStorageID());
+    const auto & header = query_plan.getCurrentDataStream().header;
+
+    const auto * select_with_union = current_inner_query->as<ASTSelectWithUnionQuery>();
+    if (select_with_union && hasJoin(*select_with_union) && changedNullabilityOneWay(header, expected_header))
+    {
+        throw DB::Exception(ErrorCodes::INCORRECT_QUERY,
+                            "Query from view {} returned Nullable column having not Nullable type in structure. "
+                            "If query from view has JOIN, it may be cause by different values of 'join_use_nulls' setting. "
+                            "You may explicitly specify 'join_use_nulls' in 'CREATE VIEW' query to avoid this error",
+                            getStorageID().getFullTableName());
+    }
+
     auto convert_actions_dag = ActionsDAG::makeConvertingActions(
-            query_plan.getCurrentDataStream().header.getColumnsWithTypeAndName(),
             header.getColumnsWithTypeAndName(),
+            expected_header.getColumnsWithTypeAndName(),
             ActionsDAG::MatchColumnsMode::Name);
 
     auto converting = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), convert_actions_dag);
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index a59328cd471..5ca23434356 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -4,7 +4,7 @@
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage.h>
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index 123e6cfdec1..a90e21a2edb 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -1,6 +1,5 @@
 #include "StorageXDBC.h"
 
-#include <DataStreams/IBlockOutputStream.h>
 #include <Formats/FormatFactory.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ConnectionTimeoutsContext.h>
@@ -8,11 +7,11 @@
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTLiteral.h>
 #include <Poco/Net/HTTPRequest.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageURL.h>
 #include <Storages/transformQueryForExternalDatabase.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 #include <Common/escapeForFileName.h>
 
 
@@ -46,8 +45,8 @@ StorageXDBC::StorageXDBC(
     , bridge_helper(bridge_helper_)
     , remote_database_name(remote_database_name_)
     , remote_table_name(remote_table_name_)
+    , log(&Poco::Logger::get("Storage" + bridge_helper->getName()))
 {
-    log = &Poco::Logger::get("Storage" + bridge_helper->getName());
     uri = bridge_helper->getMainURI();
 }
 
@@ -81,6 +80,7 @@ std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
         remote_database_name,
         remote_table_name,
         local_context);
+    LOG_TRACE(log, "Query: {}", query);
 
     NamesAndTypesList cols;
     for (const String & name : column_names)
diff --git a/src/Storages/StorageXDBC.h b/src/Storages/StorageXDBC.h
index 1a50f0461e6..89bd7856b06 100644
--- a/src/Storages/StorageXDBC.h
+++ b/src/Storages/StorageXDBC.h
@@ -3,6 +3,10 @@
 #include <Storages/StorageURL.h>
 #include <Bridge/XDBCBridgeHelper.h>
 
+namespace Poco
+{
+class Logger;
+}
 
 namespace DB
 {
diff --git a/src/Storages/System/CMakeLists.txt b/src/Storages/System/CMakeLists.txt
index 7e350932038..2e909c03f5d 100644
--- a/src/Storages/System/CMakeLists.txt
+++ b/src/Storages/System/CMakeLists.txt
@@ -2,6 +2,8 @@
 # You can also regenerate it manually this way:
 # execute_process(COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StorageSystemContributors.sh")
 
+include(${ClickHouse_SOURCE_DIR}/cmake/embed_binary.cmake)
+
 set (CONFIG_BUILD "${CMAKE_CURRENT_BINARY_DIR}/StorageSystemBuildOptions.generated.cpp")
 get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
 get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
@@ -41,7 +43,16 @@ list (APPEND storages_system_sources ${GENERATED_TIMEZONES_SRC})
 # Overlength strings
 set_source_files_properties(${GENERATED_LICENSES_SRC} PROPERTIES COMPILE_FLAGS -w)
 
+clickhouse_embed_binaries(
+        TARGET information_schema_metadata
+        RESOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/InformationSchema/"
+        RESOURCES schemata.sql tables.sql views.sql columns.sql
+)
+
 add_library(clickhouse_storages_system ${storages_system_headers} ${storages_system_sources})
+
+add_dependencies(clickhouse_storages_system information_schema_metadata)
+
 target_link_libraries(clickhouse_storages_system PRIVATE
     dbms
     common
@@ -49,4 +60,5 @@ target_link_libraries(clickhouse_storages_system PRIVATE
     clickhouse_common_zookeeper
     clickhouse_parsers
     Poco::JSON
+    INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:information_schema_metadata> -Wl,${NO_WHOLE_ARCHIVE}"
 )
diff --git a/src/Storages/System/IStorageSystemOneBlock.h b/src/Storages/System/IStorageSystemOneBlock.h
index 37089ac8e3d..9b51bd73903 100644
--- a/src/Storages/System/IStorageSystemOneBlock.h
+++ b/src/Storages/System/IStorageSystemOneBlock.h
@@ -4,9 +4,9 @@
 #include <DataTypes/DataTypeString.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/IStorage.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 namespace DB
 {
@@ -31,12 +31,7 @@ class IStorageSystemOneBlock : public IStorage
 protected:
     virtual void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const = 0;
 
-
 public:
-#if defined(ARCADIA_BUILD)
-    IStorageSystemOneBlock(const String & name_) : IStorageSystemOneBlock(StorageID{"system", name_}) {}
-#endif
-
     IStorageSystemOneBlock(const StorageID & table_id_) : IStorage(table_id_)
     {
         StorageInMemoryMetadata metadata_;
diff --git a/src/Storages/System/InformationSchema/columns.sql b/src/Storages/System/InformationSchema/columns.sql
new file mode 100644
index 00000000000..80cf2f911be
--- /dev/null
+++ b/src/Storages/System/InformationSchema/columns.sql
@@ -0,0 +1,80 @@
+ATTACH VIEW columns
+(
+    `table_catalog` String,
+    `table_schema` String,
+    `table_name` String,
+    `column_name` String,
+    `ordinal_position` UInt64,
+    `column_default` String,
+    `is_nullable` UInt8,
+    `data_type` String,
+    `character_maximum_length` Nullable(UInt64),
+    `character_octet_length` Nullable(UInt64),
+    `numeric_precision` Nullable(UInt64),
+    `numeric_precision_radix` Nullable(UInt64),
+    `numeric_scale` Nullable(UInt64),
+    `datetime_precision` Nullable(UInt64),
+    `character_set_catalog` Nullable(String),
+    `character_set_schema` Nullable(String),
+    `character_set_name` Nullable(String),
+    `collation_catalog` Nullable(String),
+    `collation_schema` Nullable(String),
+    `collation_name` Nullable(String),
+    `domain_catalog` Nullable(String),
+    `domain_schema` Nullable(String),
+    `domain_name` Nullable(String),
+    `column_comment` String,
+    `column_type` String,
+    `TABLE_CATALOG` String ALIAS table_catalog,
+    `TABLE_SCHEMA` String ALIAS table_schema,
+    `TABLE_NAME` String ALIAS table_name,
+    `COLUMN_NAME` String ALIAS column_name,
+    `ORDINAL_POSITION` UInt64 ALIAS ordinal_position,
+    `COLUMN_DEFAULT` String ALIAS column_default,
+    `IS_NULLABLE` UInt8 ALIAS is_nullable,
+    `DATA_TYPE` String ALIAS data_type,
+    `CHARACTER_MAXIMUM_LENGTH` Nullable(UInt64) ALIAS character_maximum_length,
+    `CHARACTER_OCTET_LENGTH` Nullable(UInt64) ALIAS character_octet_length,
+    `NUMERIC_PRECISION` Nullable(UInt64) ALIAS numeric_precision,
+    `NUMERIC_PRECISION_RADIX` Nullable(UInt64) ALIAS numeric_precision_radix,
+    `NUMERIC_SCALE` Nullable(UInt64) ALIAS numeric_scale,
+    `DATETIME_PRECISION` Nullable(UInt64) ALIAS datetime_precision,
+    `CHARACTER_SET_CATALOG` Nullable(String) ALIAS character_set_catalog,
+    `CHARACTER_SET_SCHEMA` Nullable(String) ALIAS character_set_schema,
+    `CHARACTER_SET_NAME` Nullable(String) ALIAS character_set_name,
+    `COLLATION_CATALOG` Nullable(String) ALIAS collation_catalog,
+    `COLLATION_SCHEMA` Nullable(String) ALIAS collation_schema,
+    `COLLATION_NAME` Nullable(String) ALIAS collation_name,
+    `DOMAIN_CATALOG` Nullable(String) ALIAS domain_catalog,
+    `DOMAIN_SCHEMA` Nullable(String) ALIAS domain_schema,
+    `DOMAIN_NAME` Nullable(String) ALIAS domain_name,
+    `COLUMN_COMMENT` String ALIAS column_comment,
+    `COLUMN_TYPE` String ALIAS column_type
+) AS
+SELECT
+    database AS table_catalog,
+    database AS table_schema,
+    table AS table_name,
+    name AS column_name,
+    position AS ordinal_position,
+    default_expression AS column_default,
+    type LIKE 'Nullable(%)' AS is_nullable,
+    type AS data_type,
+    character_octet_length AS character_maximum_length,
+    character_octet_length,
+    numeric_precision,
+    numeric_precision_radix,
+    numeric_scale,
+    datetime_precision,
+    NULL AS character_set_catalog,
+    NULL AS character_set_schema,
+    NULL AS character_set_name,
+    NULL AS collation_catalog,
+    NULL AS collation_schema,
+    NULL AS collation_name,
+    NULL AS domain_catalog,
+    NULL AS domain_schema,
+    NULL AS domain_name,
+    comment AS column_comment,
+    type AS column_type
+FROM system.columns
diff --git a/src/Storages/System/InformationSchema/schemata.sql b/src/Storages/System/InformationSchema/schemata.sql
new file mode 100644
index 00000000000..9686fcbf4fa
--- /dev/null
+++ b/src/Storages/System/InformationSchema/schemata.sql
@@ -0,0 +1,26 @@
+ATTACH VIEW schemata
+(
+    `catalog_name` String,
+    `schema_name` String,
+    `schema_owner` String,
+    `default_character_set_catalog` Nullable(String),
+    `default_character_set_schema` Nullable(String),
+    `default_character_set_name` Nullable(String),
+    `sql_path` Nullable(String),
+    `CATALOG_NAME` String ALIAS catalog_name,
+    `SCHEMA_NAME` String ALIAS schema_name,
+    `SCHEMA_OWNER` String ALIAS schema_owner,
+    `DEFAULT_CHARACTER_SET_CATALOG` Nullable(String) ALIAS default_character_set_catalog,
+    `DEFAULT_CHARACTER_SET_SCHEMA` Nullable(String) ALIAS default_character_set_schema,
+    `DEFAULT_CHARACTER_SET_NAME` Nullable(String) ALIAS default_character_set_name,
+    `SQL_PATH` Nullable(String) ALIAS sql_path
+) AS
+SELECT
+    name AS catalog_name,
+    name AS schema_name,
+    'default' AS schema_owner,
+    NULL AS default_character_set_catalog,
+    NULL AS default_character_set_schema,
+    NULL AS default_character_set_name,
+    NULL AS sql_path
+FROM system.databases
diff --git a/src/Storages/System/InformationSchema/tables.sql b/src/Storages/System/InformationSchema/tables.sql
new file mode 100644
index 00000000000..8eea3713923
--- /dev/null
+++ b/src/Storages/System/InformationSchema/tables.sql
@@ -0,0 +1,17 @@
+ATTACH VIEW tables
+(
+    `table_catalog` String,
+    `table_schema` String,
+    `table_name` String,
+    `table_type` Enum8('BASE TABLE' = 1, 'VIEW' = 2, 'FOREIGN TABLE' = 3, 'LOCAL TEMPORARY' = 4, 'SYSTEM VIEW' = 5),
+    `TABLE_CATALOG` String ALIAS table_catalog,
+    `TABLE_SCHEMA` String ALIAS table_schema,
+    `TABLE_NAME` String ALIAS table_name,
+    `TABLE_TYPE` Enum8('BASE TABLE' = 1, 'VIEW' = 2, 'FOREIGN TABLE' = 3, 'LOCAL TEMPORARY' = 4, 'SYSTEM VIEW' = 5) ALIAS table_type
+) AS
+SELECT
+    database AS table_catalog,
+    database AS table_schema,
+    name AS table_name,
+    multiIf(is_temporary, 4, engine like '%View', 2, engine LIKE 'System%', 5, has_own_data = 0, 3, 1) AS table_type
+FROM system.tables
diff --git a/src/Storages/System/InformationSchema/views.sql b/src/Storages/System/InformationSchema/views.sql
new file mode 100644
index 00000000000..c5ecebfceac
--- /dev/null
+++ b/src/Storages/System/InformationSchema/views.sql
@@ -0,0 +1,36 @@
+ATTACH VIEW views
+(
+    `table_catalog` String,
+    `table_schema` String,
+    `table_name` String,
+    `view_definition` String,
+    `check_option` String,
+    `is_updatable` Enum8('NO' = 0, 'YES' = 1),
+    `is_insertable_into` Enum8('NO' = 0, 'YES' = 1),
+    `is_trigger_updatable` Enum8('NO' = 0, 'YES' = 1),
+    `is_trigger_deletable` Enum8('NO' = 0, 'YES' = 1),
+    `is_trigger_insertable_into` Enum8('NO' = 0, 'YES' = 1),
+    `TABLE_CATALOG` String ALIAS table_catalog,
+    `TABLE_SCHEMA` String ALIAS table_schema,
+    `TABLE_NAME` String ALIAS table_name,
+    `VIEW_DEFINITION` String ALIAS view_definition,
+    `CHECK_OPTION` String ALIAS check_option,
+    `IS_UPDATABLE` Enum8('NO' = 0, 'YES' = 1) ALIAS is_updatable,
+    `IS_INSERTABLE_INTO` Enum8('NO' = 0, 'YES' = 1) ALIAS is_insertable_into,
+    `IS_TRIGGER_UPDATABLE` Enum8('NO' = 0, 'YES' = 1) ALIAS is_trigger_updatable,
+    `IS_TRIGGER_DELETABLE` Enum8('NO' = 0, 'YES' = 1) ALIAS is_trigger_deletable,
+    `IS_TRIGGER_INSERTABLE_INTO` Enum8('NO' = 0, 'YES' = 1) ALIAS is_trigger_insertable_into
+) AS
+SELECT
+    database AS table_catalog,
+    database AS table_schema,
+    name AS table_name,
+    as_select AS view_definition,
+    'NONE' AS check_option,
+    0 AS is_updatable,
+    engine = 'MaterializedView' AS is_insertable_into,
+    0 AS is_trigger_updatable,
+    0 AS is_trigger_deletable,
+    0 AS is_trigger_insertable_into
+FROM system.tables
+WHERE engine LIKE '%View'
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
index 0528dc76ff5..97b84a49cde 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.cpp b/src/Storages/System/StorageSystemAsynchronousInserts.cpp
new file mode 100644
index 00000000000..0fa6c1b653c
--- /dev/null
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.cpp
@@ -0,0 +1,109 @@
+#include <Storages/System/StorageSystemAsynchronousInserts.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/AsynchronousInsertQueue.h>
+#include <Interpreters/Context.h>
+#include <Parsers/queryToString.h>
+#include <Core/DecimalFunctions.h>
+#include <Parsers/ASTInsertQuery.h>
+
+namespace DB
+{
+
+static constexpr auto TIME_SCALE = 6;
+
+NamesAndTypesList StorageSystemAsynchronousInserts::getNamesAndTypes()
+{
+    return
+    {
+        {"query", std::make_shared<DataTypeString>()},
+        {"database", std::make_shared<DataTypeString>()},
+        {"table", std::make_shared<DataTypeString>()},
+        {"format", std::make_shared<DataTypeString>()},
+        {"first_update", std::make_shared<DataTypeDateTime64>(TIME_SCALE)},
+        {"last_update", std::make_shared<DataTypeDateTime64>(TIME_SCALE)},
+        {"total_bytes", std::make_shared<DataTypeUInt64>()},
+        {"entries.query_id", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"entries.bytes", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
+        {"entries.finished", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt8>())},
+        {"entries.exception", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+    };
+}
+
+void StorageSystemAsynchronousInserts::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+{
+    using namespace std::chrono;
+
+    auto * insert_queue = context->getAsynchronousInsertQueue();
+    if (!insert_queue)
+        return;
+
+    auto queue = insert_queue->getQueue();
+    for (const auto & [key, elem] : queue)
+    {
+        std::lock_guard lock(elem->mutex);
+
+        if (!elem->data)
+            continue;
+
+        auto time_in_microseconds = [](const time_point<steady_clock> & timestamp)
+        {
+            auto time_diff = duration_cast<microseconds>(steady_clock::now() - timestamp);
+            auto time_us = (system_clock::now() - time_diff).time_since_epoch().count();
+
+            DecimalUtils::DecimalComponents<DateTime64> components{time_us / 1'000'000, time_us % 1'000'000};
+            return DecimalField(DecimalUtils::decimalFromComponents<DateTime64>(components, TIME_SCALE), TIME_SCALE);
+        };
+
+        const auto & insert_query = key.query->as<const ASTInsertQuery &>();
+        size_t i = 0;
+
+        res_columns[i++]->insert(queryToString(insert_query));
+        res_columns[i++]->insert(insert_query.table_id.getDatabaseName());
+        res_columns[i++]->insert(insert_query.table_id.getTableName());
+        res_columns[i++]->insert(insert_query.format);
+        res_columns[i++]->insert(time_in_microseconds(elem->data->first_update));
+        res_columns[i++]->insert(time_in_microseconds(elem->data->last_update));
+        res_columns[i++]->insert(elem->data->size);
+
+        Array arr_query_id;
+        Array arr_bytes;
+        Array arr_finished;
+        Array arr_exception;
+
+        for (const auto & entry : elem->data->entries)
+        {
+            arr_query_id.push_back(entry->query_id);
+            arr_bytes.push_back(entry->bytes.size());
+            arr_finished.push_back(entry->isFinished());
+
+            if (auto exception = entry->getException())
+            {
+                try
+                {
+                    std::rethrow_exception(exception);
+                }
+                catch (const Exception & e)
+                {
+                    arr_exception.push_back(e.displayText());
+                }
+                catch (...)
+                {
+                    arr_exception.push_back("Unknown exception");
+                }
+            }
+            else
+                arr_exception.push_back("");
+        }
+
+        res_columns[i++]->insert(arr_query_id);
+        res_columns[i++]->insert(arr_bytes);
+        res_columns[i++]->insert(arr_finished);
+        res_columns[i++]->insert(arr_exception);
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.h b/src/Storages/System/StorageSystemAsynchronousInserts.h
new file mode 100644
index 00000000000..79f19ec3d97
--- /dev/null
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <base/shared_ptr_helper.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+namespace DB
+{
+
+/** Implements the system table `asynhronous_inserts`,
+ *  which contains information about pending asynchronous inserts in queue.
+*/
+class StorageSystemAsynchronousInserts final :
+    public shared_ptr_helper<StorageSystemAsynchronousInserts>,
+    public IStorageSystemOneBlock<StorageSystemAsynchronousInserts>
+{
+public:
+    std::string getName() const override { return "AsynchronousInserts"; }
+    static NamesAndTypesList getNamesAndTypes();
+
+protected:
+    friend struct shared_ptr_helper<StorageSystemAsynchronousInserts>;
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.h b/src/Storages/System/StorageSystemAsynchronousMetrics.h
index d28ddc545d9..2efe008ef3a 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.h
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
@@ -25,12 +25,6 @@ private:
     const AsynchronousMetrics & async_metrics;
 
 protected:
-#if defined(ARCADIA_BUILD)
-    StorageSystemAsynchronousMetrics(const String & name_, const AsynchronousMetrics & async_metrics_)
-    : StorageSystemAsynchronousMetrics(StorageID{"system", name_}, async_metrics_)
-    {
-    }
-#endif
     StorageSystemAsynchronousMetrics(const StorageID & table_id_, const AsynchronousMetrics & async_metrics_);
 
     void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
diff --git a/src/Storages/System/StorageSystemBuildOptions.cpp b/src/Storages/System/StorageSystemBuildOptions.cpp
index 01a60a0235c..83cd4b036da 100644
--- a/src/Storages/System/StorageSystemBuildOptions.cpp
+++ b/src/Storages/System/StorageSystemBuildOptions.cpp
@@ -18,15 +18,11 @@ NamesAndTypesList StorageSystemBuildOptions::getNamesAndTypes()
 
 void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
 {
-#if !defined(ARCADIA_BUILD)
     for (auto * it = auto_config_build; *it; it += 2)
     {
         res_columns[0]->insert(it[0]);
         res_columns[1]->insert(it[1]);
     }
-#else
-    UNUSED(res_columns);
-#endif
 }
 
 }
diff --git a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
index 8fe574da643..e087475695c 100644
--- a/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
+++ b/src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
@@ -50,6 +50,8 @@ const char * auto_config_build[]
     "USE_LDAP", "@USE_LDAP@",
     "TZDATA_VERSION", "@TZDATA_VERSION@",
     "USE_KRB5", "@USE_KRB5@",
+    "USE_FILELOG", "@USE_FILELOG@",
+    "USE_BZIP2", "@USE_BZIP2@",
 
     nullptr, nullptr
 };
diff --git a/src/Storages/System/StorageSystemBuildOptions.h b/src/Storages/System/StorageSystemBuildOptions.h
index e0792b64ef6..4ecc1b21426 100644
--- a/src/Storages/System/StorageSystemBuildOptions.h
+++ b/src/Storages/System/StorageSystemBuildOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index c2eb6a5e02d..1e6bfff8a85 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemCollations.h b/src/Storages/System/StorageSystemCollations.h
index 51e0e456586..1a58deba989 100644
--- a/src/Storages/System/StorageSystemCollations.h
+++ b/src/Storages/System/StorageSystemCollations.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index 0058b58f537..cefc5587014 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -5,6 +5,8 @@
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeDateTime64.h>
 #include <Storages/VirtualColumnUtils.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTSelectQuery.h>
@@ -44,6 +46,12 @@ StorageSystemColumns::StorageSystemColumns(const StorageID & table_id_)
         { "is_in_primary_key",   std::make_shared<DataTypeUInt8>() },
         { "is_in_sampling_key",  std::make_shared<DataTypeUInt8>() },
         { "compression_codec",   std::make_shared<DataTypeString>() },
+        { "character_octet_length",     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "numeric_precision",          std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "numeric_precision_radix",    std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "numeric_scale",              std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "datetime_precision",         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+
     }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -218,6 +226,60 @@ protected:
                         res_columns[res_index++]->insertDefault();
                 }
 
+                /// character_octet_length makes sense for FixedString only
+                DataTypePtr not_nullable_type = removeNullable(column.type);
+                if (columns_mask[src_index++])
+                {
+                    if (isFixedString(not_nullable_type))
+                        res_columns[res_index++]->insert(not_nullable_type->getSizeOfValueInMemory());
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// numeric_precision
+                if (columns_mask[src_index++])
+                {
+                    if (isInteger(not_nullable_type))
+                        res_columns[res_index++]->insert(not_nullable_type->getSizeOfValueInMemory() * 8);  /// radix is 2
+                    else if (isDecimal(not_nullable_type))
+                        res_columns[res_index++]->insert(getDecimalPrecision(*not_nullable_type));  /// radix is 10
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// numeric_precision_radix
+                if (columns_mask[src_index++])
+                {
+                    if (isInteger(not_nullable_type))
+                        res_columns[res_index++]->insert(2);
+                    else if (isDecimal(not_nullable_type))
+                        res_columns[res_index++]->insert(10);
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// numeric_scale
+                if (columns_mask[src_index++])
+                {
+                    if (isInteger(not_nullable_type))
+                        res_columns[res_index++]->insert(0);
+                    else if (isDecimal(not_nullable_type))
+                        res_columns[res_index++]->insert(getDecimalScale(*not_nullable_type));
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
+                /// datetime_precision
+                if (columns_mask[src_index++])
+                {
+                    if (isDateTime64(not_nullable_type))
+                        res_columns[res_index++]->insert(assert_cast<const DataTypeDateTime64 &>(*not_nullable_type).getScale());
+                    else if (isDateOrDate32(not_nullable_type) || isDateTime(not_nullable_type) || isDateTime64(not_nullable_type))
+                        res_columns[res_index++]->insert(0);
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
                 ++rows_count;
             }
         }
diff --git a/src/Storages/System/StorageSystemColumns.h b/src/Storages/System/StorageSystemColumns.h
index 015b8627c4b..adcbf384ca7 100644
--- a/src/Storages/System/StorageSystemColumns.h
+++ b/src/Storages/System/StorageSystemColumns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index bed8eadc19c..a097e08871d 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -15,6 +15,7 @@ const char * auto_contributors[] {
     "adevyatova",
     "ageraab",
     "Ahmed Dardery",
+    "Aimiyoo",
     "akazz",
     "Akazz",
     "akonyaev",
@@ -33,6 +34,7 @@ const char * auto_contributors[] {
     "alesapin",
     "Alex",
     "Alexander Avdonkin",
+    "Alexander Bezpiatov",
     "Alexander Burmak",
     "Alexander Ermolaev",
     "Alexander Gololobov",
@@ -43,6 +45,7 @@ const char * auto_contributors[] {
     "Alexander Krasheninnikov",
     "Alexander Kuranoff",
     "Alexander Kuzmenkov",
+    "Alexander Lodin",
     "Alexander Lukin",
     "Alexander Makarov",
     "Alexander Marshalov",
@@ -54,6 +57,7 @@ const char * auto_contributors[] {
     "Alexander Sapin",
     "Alexander Tokmakov",
     "Alexander Tretiakov",
+    "Alexandra",
     "Alexandra Latysheva",
     "Alexandre Snarskii",
     "Alexandr Kondratev",
@@ -63,6 +67,7 @@ const char * auto_contributors[] {
     "Alexei Averchenko",
     "Alexey",
     "Alexey Arno",
+    "Alexey Boykov",
     "Alexey Dushechkin",
     "Alexey Elymanov",
     "Alexey Ilyukhov",
@@ -95,12 +100,14 @@ const char * auto_contributors[] {
     "Anatoly Pugachev",
     "ana-uvarova",
     "AnaUvarova",
+    "Andr0901",
     "Andreas Hunkeler",
     "AndreevDm",
     "Andrei Bodrov",
     "Andrei Chulkov",
     "andrei-karpliuk",
     "Andrei Nekrashevich",
+    "ANDREI STAROVEROV",
     "Andrew Grigorev",
     "Andrew Onyshchuk",
     "andrewsg",
@@ -115,10 +122,12 @@ const char * auto_contributors[] {
     "Andrey Skobtsov",
     "Andrey Urusov",
     "Andrey Z",
+    "Andy Liang",
     "Andy Yang",
     "Anmol Arora",
     "Anna",
     "Anna Shakhova",
+    "anneji-dev",
     "annvsh",
     "anrodigina",
     "Anthony N. Simon",
@@ -140,6 +149,7 @@ const char * auto_contributors[] {
     "aprudaev",
     "Ariel Robaldo",
     "Arsen Hakobyan",
+    "Arslan G",
     "ArtCorp",
     "Artem Andreenko",
     "Artemeey",
@@ -155,6 +165,7 @@ const char * auto_contributors[] {
     "artpaul",
     "Artur",
     "Artur Beglaryan",
+    "Artur Filatenkov",
     "AsiaKorushkina",
     "asiana21",
     "atereh",
@@ -192,11 +203,14 @@ const char * auto_contributors[] {
     "Boris Granveaud",
     "Bowen Masco",
     "bo zeng",
+    "Braulio Valdivielso",
     "Brett Hoerner",
     "BSD_Conqueror",
     "bseng",
     "Bulat Gaifullin",
     "Carbyn",
+    "caspian",
+    "Caspian",
     "cekc",
     "centos7",
     "champtar",
@@ -263,6 +277,7 @@ const char * auto_contributors[] {
     "Dmitrii Raev",
     "dmitriiut",
     "Dmitriy",
+    "Dmitriy Lushnikov",
     "Dmitry",
     "Dmitry Belyavtsev",
     "Dmitry Bilunov",
@@ -281,6 +296,7 @@ const char * auto_contributors[] {
     "Dongdong Yang",
     "DoomzD",
     "Dr. Strange Looker",
+    "DuckSoft",
     "d.v.semenov",
     "eaxdev",
     "eejoin",
@@ -328,6 +344,7 @@ const char * auto_contributors[] {
     "favstovol",
     "FawnD2",
     "FeehanG",
+    "feihengye",
     "felixoid",
     "felixxdu",
     "feng lv",
@@ -335,6 +352,7 @@ const char * auto_contributors[] {
     "fessmage",
     "FgoDt",
     "fibersel",
+    "Filatenkov Artur",
     "filimonov",
     "filipe",
     "Filipe Caixeta",
@@ -361,6 +379,7 @@ const char * auto_contributors[] {
     "George",
     "George3d6",
     "George G",
+    "Georgy Ginzburg",
     "Gervasio Varela",
     "ggerogery",
     "giordyb",
@@ -386,15 +405,18 @@ const char * auto_contributors[] {
     "hchen9",
     "hcz",
     "heng zhao",
+    "hermano",
     "hexiaoting",
     "Hiroaki Nakamura",
     "hotid",
+    "huangzhaowei",
     "HuFuwang",
     "Hui Wang",
     "hustnn",
     "huzhichengdd",
     "ice1x",
     "idfer",
+    "igomac",
     "igor",
     "Igor",
     "Igor Hatarist",
@@ -404,6 +426,7 @@ const char * auto_contributors[] {
     "Igr",
     "Igr Mineev",
     "ikarishinjieva",
+    "Ikko Ashimine",
     "ikopylov",
     "Ildar Musin",
     "Ildus Kurbangaliev",
@@ -437,23 +460,29 @@ const char * auto_contributors[] {
     "Ivan Starkov",
     "ivanzhukov",
     "Ivan Zhukov",
+    "ivoleg",
     "Jack Song",
     "JackyWoo",
     "Jacob Hayes",
     "jakalletti",
+    "Jakub Kuklis",
     "JaosnHsieh",
+    "jasine",
     "Jason",
+    "Jason Keirstead",
     "javartisan",
     "javi",
     "javi santana",
     "Javi Santana",
     "Javi santana bot",
     "Jean Baptiste Favre",
+    "Jeffrey Dang",
     "jennyma",
     "jetgm",
     "Jiading Guo",
     "Jiang Tao",
     "jianmei zhang",
+    "jkuklis",
     "Jochen Schalanda",
     "John",
     "John Hummel",
@@ -467,15 +496,18 @@ const char * auto_contributors[] {
     "Keiji Yoshida",
     "Ken Chen",
     "Kevin Chiang",
+    "Kevin Michel",
     "kevin wan",
     "Kiran",
     "Kirill Danshin",
+    "Kirill Ershov",
     "kirillikoff",
     "Kirill Malev",
     "Kirill Shvakov",
     "kmeaw",
     "Koblikov Mihail",
     "KochetovNicolai",
+    "kolsys",
     "Konstantin Grabar",
     "Konstantin Lebedev",
     "Konstantin Malanchev",
@@ -492,6 +524,7 @@ const char * auto_contributors[] {
     "Kseniia Sumarokova",
     "kshvakov",
     "kssenii",
+    "Ky Li",
     "l",
     "l1tsolaiki",
     "lalex",
@@ -502,6 +535,7 @@ const char * auto_contributors[] {
     "Leopold Schabel",
     "leozhang",
     "Lev Borodin",
+    "levie",
     "levushkin aleksej",
     "levysh",
     "Lewinma",
@@ -509,6 +543,7 @@ const char * auto_contributors[] {
     "libenwang",
     "lichengxiang",
     "linceyou",
+    "listar",
     "litao91",
     "liu-bov",
     "Liu Cong",
@@ -521,6 +556,7 @@ const char * auto_contributors[] {
     "long2ice",
     "Lopatin Konstantin",
     "Loud_Scream",
+    "lthaooo",
     "ltybc-coder",
     "luc1ph3r",
     "Lucid Dreams",
@@ -529,12 +565,14 @@ const char * auto_contributors[] {
     "Lv Feng",
     "M0r64n",
     "madianjun",
+    "MagiaGroz",
     "maiha",
     "Maksim",
     "Maksim Fedotov",
     "Maksim Kita",
     "Maks Skorokhod",
     "malkfilipp",
+    "Malte",
     "manmitya",
     "maqroll",
     "Marat IDRISOV",
@@ -595,6 +633,7 @@ const char * auto_contributors[] {
     "Michal Lisowski",
     "michon470",
     "MicrochipQ",
+    "Miguel Fernández",
     "miha-g",
     "Mihail Fandyushin",
     "Mikahil Nacharov",
@@ -617,10 +656,12 @@ const char * auto_contributors[] {
     "MikuSugar",
     "Milad Arabi",
     "millb",
+    "Misko Lee",
     "mnkonkova",
     "Mohammad Hossein Sekhavat",
     "morty",
     "moscas",
+    "Mostafa Dahab",
     "MovElb",
     "Mr.General",
     "Murat Kabilov",
@@ -634,11 +675,14 @@ const char * auto_contributors[] {
     "nauta",
     "nautaa",
     "Neeke Gao",
+    "neng.liu",
     "Neng Liu",
+    "NengLiu",
     "never lee",
     "NeZeD [Mac Pro]",
     "nicelulu",
     "Nickita",
+    "Nickita Taranov",
     "Nickolay Yastrebov",
     "nickzhwang",
     "Nicolae Vartolomei",
@@ -684,6 +728,9 @@ const char * auto_contributors[] {
     "Olga Khvostikova",
     "olgarev",
     "Olga Revyakina",
+    "OmarBazaraa",
+    "Onehr7",
+    "OnePiece",
     "orantius",
     "Orivej Desh",
     "Oskar Wojciski",
@@ -701,6 +748,7 @@ const char * auto_contributors[] {
     "Pavel Yakunin",
     "Pavlo Bashynskiy",
     "Pawel Rog",
+    "pdv-ru",
     "Peng Jian",
     "Persiyanov Dmitriy Andreevich",
     "Pervakov Grigorii",
@@ -728,6 +776,7 @@ const char * auto_contributors[] {
     "Ramazan Polat",
     "Raúl Marín",
     "Ravengg",
+    "Realist007",
     "redclusive",
     "RedClusive",
     "RegulusZ",
@@ -749,12 +798,15 @@ const char * auto_contributors[] {
     "Roman Peshkurov",
     "Roman Tsisyk",
     "romanzhukov",
+    "Roman Zhukov",
     "root",
     "roverxu",
+    "ruct",
     "Ruslan",
     "Ruslan Savchenko",
     "Russ Frank",
     "Ruzal Ibragimov",
+    "ryzuo",
     "Sabyanin Maxim",
     "SaltTan",
     "Sami Kerola",
@@ -763,6 +815,7 @@ const char * auto_contributors[] {
     "satanson",
     "Saulius Valatka",
     "sdk2",
+    "Sean Haynes",
     "Sébastien Launay",
     "serebrserg",
     "Sergei Bocharov",
@@ -839,12 +892,15 @@ const char * auto_contributors[] {
     "TCeason",
     "Tema Novikov",
     "templarzq",
+    "terrylin",
     "The-Alchemist",
+    "Thomas Berdy",
     "Tiaonmmn",
     "tiger.yan",
     "tison",
     "TiunovNN",
     "Tobias Adamson",
+    "Tobias Lins",
     "Tom Bombadil",
     "topvisor",
     "Tsarkova Anastasia",
@@ -863,6 +919,7 @@ const char * auto_contributors[] {
     "VadimPE",
     "Vadim Plakhtinskiy",
     "Vadim Skipin",
+    "Vadim Volodin",
     "Val",
     "Valera Ryaboshapko",
     "Vasilyev Nikita",
@@ -877,12 +934,15 @@ const char * auto_contributors[] {
     "Veloman Yunkan",
     "Veniamin Gvozdikov",
     "Veselkov Konstantin",
+    "vgocoder",
     "vic",
     "vicdashkov",
+    "vicgao",
     "Victor",
     "Victor Tarnavsky",
     "Viktor Taranenko",
     "vinity",
+    "Vitalii S",
     "Vitaliy Fedorchenko",
     "Vitaliy Karnienko",
     "Vitaliy Kozlovskiy",
@@ -891,12 +951,14 @@ const char * auto_contributors[] {
     "Vitaly",
     "Vitaly Baranov",
     "Vitaly Samigullin",
+    "Vitaly Stoyan",
     "vitstn",
     "vivarum",
     "Vivien Maisonneuve",
     "Vlad Arkhipov",
     "Vladimir",
     "Vladimir Bunchuk",
+    "Vladimir C",
     "Vladimir Ch",
     "Vladimir Chebotarev",
     "vladimir golovchenko",
@@ -925,6 +987,7 @@ const char * auto_contributors[] {
     "wzl",
     "Xianda Ke",
     "Xiang Zhou",
+    "xiedeyantu",
     "xPoSx",
     "Yağızcan Değirmenci",
     "yang",
@@ -938,6 +1001,7 @@ const char * auto_contributors[] {
     "Yiğit Konur",
     "yiguolei",
     "Yingchun Lai",
+    "Yingfan Chen",
     "yingjinghan",
     "ylchou",
     "Y Lu",
@@ -966,6 +1030,8 @@ const char * auto_contributors[] {
     "Zhichang Yu",
     "Zhichun Wu",
     "Zhipeng",
+    "ZhiYong Wang",
+    "zhongyuankai",
     "zhukai",
     "Zijie Lu",
     "zlx19950903",
@@ -994,6 +1060,7 @@ const char * auto_contributors[] {
     "曲正鹏",
     "未来星___费",
     "极客青年",
+    "董海镔",
     "谢磊",
     "贾顺名(Jarvis)",
     "陈小玉",
diff --git a/src/Storages/System/StorageSystemContributors.h b/src/Storages/System/StorageSystemContributors.h
index d25fa7aa933..04a70a840f8 100644
--- a/src/Storages/System/StorageSystemContributors.h
+++ b/src/Storages/System/StorageSystemContributors.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemCurrentRoles.h b/src/Storages/System/StorageSystemCurrentRoles.h
index d3e21290290..4b0547b7f0c 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.h
+++ b/src/Storages/System/StorageSystemCurrentRoles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index 5b9ed938e22..1df8b43515e 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -1,23 +1,14 @@
-#include <algorithm>
-#include <filesystem>
-
-#include "StorageSystemDDLWorkerQueue.h"
-
-#include <Columns/ColumnArray.h>
+#include <Storages/System/StorageSystemDDLWorkerQueue.h>
 #include <Interpreters/DDLTask.h>
-
-#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeEnum.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeMap.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Storages/SelectQueryInfo.h>
+#include <Interpreters/ZooKeeperLog.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-
 #include <Parsers/ASTQueryWithOnCluster.h>
 #include <Parsers/ParserQuery.h>
 #include <Parsers/parseQuery.h>
@@ -25,207 +16,334 @@
 
 namespace fs = std::filesystem;
 
-enum Status
-{
-    ACTIVE,
-    FINISHED,
-    UNKNOWN,
-    ERRORED
-};
 
 namespace DB
 {
-std::vector<std::pair<String, Int8>> getStatusEnumsAndValues()
+
+enum class Status
+{
+    INACTIVE,
+    ACTIVE,
+    FINISHED,
+    REMOVING,
+    UNKNOWN,
+};
+
+using GetResponseFuture = std::future<Coordination::GetResponse>;
+using ListResponseFuture = std::future<Coordination::ListResponse>;
+using GetResponseFutures = std::vector<GetResponseFuture>;
+using ListResponseFutures = std::vector<ListResponseFuture>;
+
+static std::vector<std::pair<String, Int8>> getStatusEnumsAndValues()
 {
     return std::vector<std::pair<String, Int8>>{
-        {"Active", static_cast<Int8>(Status::ACTIVE)},
-        {"Finished", static_cast<Int8>(Status::FINISHED)},
-        {"Unknown", static_cast<Int8>(Status::UNKNOWN)},
-        {"Errored", static_cast<Int8>(Status::ERRORED)},
+        {"Inactive",    static_cast<Int8>(Status::INACTIVE)},
+        {"Active",      static_cast<Int8>(Status::ACTIVE)},
+        {"Finished",    static_cast<Int8>(Status::FINISHED)},
+        {"Removing",    static_cast<Int8>(Status::REMOVING)},
+        {"Unknown",     static_cast<Int8>(Status::UNKNOWN)},
     };
 }
 
-
-std::vector<std::pair<String, Int8>> getZooKeeperErrorEnumsAndValues()
-{
-    return std::vector<std::pair<String, Int8>>{
-        {"ZOK", static_cast<Int8>(Coordination::Error::ZOK)},
-        {"ZSYSTEMERROR", static_cast<Int8>(Coordination::Error::ZSYSTEMERROR)},
-        {"ZRUNTIMEINCONSISTENCY", static_cast<Int8>(Coordination::Error::ZRUNTIMEINCONSISTENCY)},
-        {"ZDATAINCONSISTENCY", static_cast<Int8>(Coordination::Error::ZDATAINCONSISTENCY)},
-        {"ZCONNECTIONLOSS", static_cast<Int8>(Coordination::Error::ZCONNECTIONLOSS)},
-        {"ZMARSHALLINGERROR", static_cast<Int8>(Coordination::Error::ZMARSHALLINGERROR)},
-        {"ZUNIMPLEMENTED", static_cast<Int8>(Coordination::Error::ZUNIMPLEMENTED)},
-        {"ZOPERATIONTIMEOUT", static_cast<Int8>(Coordination::Error::ZOPERATIONTIMEOUT)},
-        {"ZBADARGUMENTS", static_cast<Int8>(Coordination::Error::ZBADARGUMENTS)},
-        {"ZINVALIDSTATE", static_cast<Int8>(Coordination::Error::ZINVALIDSTATE)},
-        {"ZAPIERROR", static_cast<Int8>(Coordination::Error::ZAPIERROR)},
-        {"ZNONODE", static_cast<Int8>(Coordination::Error::ZNONODE)},
-        {"ZNOAUTH", static_cast<Int8>(Coordination::Error::ZNOAUTH)},
-        {"ZBADVERSION", static_cast<Int8>(Coordination::Error::ZBADVERSION)},
-        {"ZNOCHILDRENFOREPHEMERALS", static_cast<Int8>(Coordination::Error::ZNOCHILDRENFOREPHEMERALS)},
-        {"ZNODEEXISTS", static_cast<Int8>(Coordination::Error::ZNODEEXISTS)},
-        {"ZNOTEMPTY", static_cast<Int8>(Coordination::Error::ZNOTEMPTY)},
-        {"ZSESSIONEXPIRED", static_cast<Int8>(Coordination::Error::ZSESSIONEXPIRED)},
-        {"ZINVALIDCALLBACK", static_cast<Int8>(Coordination::Error::ZINVALIDCALLBACK)},
-        {"ZINVALIDACL", static_cast<Int8>(Coordination::Error::ZINVALIDACL)},
-        {"ZAUTHFAILED", static_cast<Int8>(Coordination::Error::ZAUTHFAILED)},
-        {"ZCLOSING", static_cast<Int8>(Coordination::Error::ZCLOSING)},
-        {"ZNOTHING", static_cast<Int8>(Coordination::Error::ZNOTHING)},
-        {"ZSESSIONMOVED", static_cast<Int8>(Coordination::Error::ZSESSIONMOVED)},
-    };
-}
-
-
 NamesAndTypesList StorageSystemDDLWorkerQueue::getNamesAndTypes()
 {
     return {
-        {"entry", std::make_shared<DataTypeString>()},
-        {"host_name", std::make_shared<DataTypeString>()},
-        {"host_address", std::make_shared<DataTypeString>()},
-        {"port", std::make_shared<DataTypeUInt16>()},
-        {"status", std::make_shared<DataTypeEnum8>(getStatusEnumsAndValues())},
-        {"cluster", std::make_shared<DataTypeString>()},
-        {"query", std::make_shared<DataTypeString>()},
-        {"initiator", std::make_shared<DataTypeString>()},
-        {"query_start_time", std::make_shared<DataTypeDateTime>()},
-        {"query_finish_time", std::make_shared<DataTypeDateTime>()},
-        {"query_duration_ms", std::make_shared<DataTypeUInt64>()},
-        {"exception_code", std::make_shared<DataTypeEnum8>(getZooKeeperErrorEnumsAndValues())},
+        {"entry",               std::make_shared<DataTypeString>()},
+        {"entry_version",       std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt8>())},
+        {"initiator_host",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"initiator_port",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt16>())},
+        {"cluster",             std::make_shared<DataTypeString>()},
+        {"query",               std::make_shared<DataTypeString>()},
+        {"settings",            std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>())},
+        {"query_create_time",   std::make_shared<DataTypeDateTime>()},
+
+        {"host",                std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"port",                std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt16>())},
+        {"status",              std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum8>(getStatusEnumsAndValues()))},
+        {"exception_code",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt16>())},
+        {"exception_text",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
+        {"query_finish_time",   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
+        {"query_duration_ms",   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
     };
 }
 
-static String clusterNameFromDDLQuery(ContextPtr context, const DDLLogEntry & entry)
+static String clusterNameFromDDLQuery(ContextPtr context, const DDLTask & task)
 {
-    const char * begin = entry.query.data();
-    const char * end = begin + entry.query.size();
-    ASTPtr query;
-    ASTQueryWithOnCluster * query_on_cluster;
+    const char * begin = task.entry.query.data();
+    const char * end = begin + task.entry.query.size();
     String cluster_name;
     ParserQuery parser_query(end);
-    String description;
-    query = parseQuery(parser_query, begin, end, description, 0, context->getSettingsRef().max_parser_depth);
-    if (query && (query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get())))
+    String description = fmt::format("from {}", task.entry_path);
+    ASTPtr query = parseQuery(parser_query, begin, end, description,
+                              context->getSettingsRef().max_query_size, context->getSettingsRef().max_parser_depth);
+    if (const auto * query_on_cluster = dynamic_cast<const ASTQueryWithOnCluster *>(query.get()))
         cluster_name = query_on_cluster->cluster;
     return cluster_name;
 }
 
+static void fillCommonColumns(MutableColumns & res_columns, size_t & col, const DDLTask & task, const String & cluster_name, UInt64 query_create_time_ms)
+{
+    /// entry
+    res_columns[col++]->insert(task.entry_name);
+
+    /// entry_version
+    res_columns[col++]->insert(task.entry.version);
+
+    if (task.entry.initiator.empty())
+    {
+        /// initiator_host
+        res_columns[col++]->insert(Field{});
+        /// initiator_port
+        res_columns[col++]->insert(Field{});
+    }
+    else
+    {
+        HostID initiator = HostID::fromString(task.entry.initiator);
+        /// initiator_host
+        res_columns[col++]->insert(initiator.host_name);
+        /// initiator_port
+        res_columns[col++]->insert(initiator.port);
+    }
+
+    /// cluster
+    res_columns[col++]->insert(cluster_name);
+
+    /// query
+    res_columns[col++]->insert(task.entry.query);
+
+    Map settings_map;
+    if (task.entry.settings)
+    {
+        for (const auto & change : *task.entry.settings)
+        {
+            Tuple pair;
+            pair.push_back(change.name);
+            pair.push_back(toString(change.value));
+            settings_map.push_back(std::move(pair));
+        }
+    }
+
+    /// settings
+    res_columns[col++]->insert(settings_map);
+
+    res_columns[col++]->insert(static_cast<UInt64>(query_create_time_ms / 1000));
+}
+
+static void repeatValuesInCommonColumns(MutableColumns & res_columns, size_t num_filled_columns)
+{
+    if (res_columns[num_filled_columns - 1]->size() == res_columns[num_filled_columns]->size() + 1)
+    {
+        /// Common columns are already filled
+        return;
+    }
+
+    /// Copy values from previous row
+    assert(res_columns[num_filled_columns - 1]->size() == res_columns[num_filled_columns]->size());
+    for (size_t filled_col = 0; filled_col < num_filled_columns; ++filled_col)
+        res_columns[filled_col]->insert((*res_columns[filled_col])[res_columns[filled_col]->size() - 1]);
+}
+
+static void fillHostnameColumns(MutableColumns & res_columns, size_t & col, const HostID & host_id)
+{
+    /// NOTE host_id.host_name can be a domain name or an IP address
+    /// We could try to resolve domain name or reverse resolve an address and add two separate columns,
+    /// but seems like it's not really needed, so we show host_id.host_name as is.
+
+    /// host
+    res_columns[col++]->insert(host_id.host_name);
+
+    /// port
+    res_columns[col++]->insert(host_id.port);
+}
+
+static void fillStatusColumnsWithNulls(MutableColumns & res_columns, size_t & col, Status status)
+{
+    /// status
+    res_columns[col++]->insert(static_cast<Int8>(status));
+    /// exception_code
+    res_columns[col++]->insert(Field{});
+    /// exception_text
+    res_columns[col++]->insert(Field{});
+    /// query_finish_time
+    res_columns[col++]->insert(Field{});
+    /// query_duration_ms
+    res_columns[col++]->insert(Field{});
+}
+
+static void fillStatusColumns(MutableColumns & res_columns, size_t & col,
+                                GetResponseFuture & finished_data_future,
+                                UInt64 query_create_time_ms)
+{
+    auto maybe_finished_status = finished_data_future.get();
+    if (maybe_finished_status.error == Coordination::Error::ZNONODE)
+        return fillStatusColumnsWithNulls(res_columns, col, Status::REMOVING);
+
+    /// asyncTryGet should throw on other error codes
+    assert(maybe_finished_status.error == Coordination::Error::ZOK);
+
+    /// status
+    res_columns[col++]->insert(static_cast<Int8>(Status::FINISHED));
+
+    auto execution_status = ExecutionStatus::fromText(maybe_finished_status.data);
+    /// exception_code
+    res_columns[col++]->insert(execution_status.code);
+    /// exception_text
+    res_columns[col++]->insert(execution_status.message);
+
+    UInt64 query_finish_time_ms = maybe_finished_status.stat.ctime;
+    /// query_finish_time
+    res_columns[col++]->insert(static_cast<UInt64>(query_finish_time_ms / 1000));
+    /// query_duration_ms
+    res_columns[col++]->insert(static_cast<UInt64>(query_finish_time_ms - query_create_time_ms));
+}
+
+
 void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
-    Coordination::Error zk_exception_code = Coordination::Error::ZOK;
-    String ddl_zookeeper_path = config.getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
-    String ddl_query_path;
+    fs::path ddl_zookeeper_path = context->getConfigRef().getString("distributed_ddl.path", "/clickhouse/task_queue/ddl/");
 
-    // this is equivalent to query zookeeper at the `ddl_zookeeper_path`
-    /* [zk: localhost:2181(CONNECTED) 51] ls /clickhouse/task_queue/ddl
-       [query-0000000000, query-0000000001, query-0000000002, query-0000000003, query-0000000004]
-    */
+    Strings ddl_task_paths = zookeeper->getChildren(ddl_zookeeper_path);
 
-    zkutil::Strings queries;
+    GetResponseFutures ddl_task_futures;
+    ListResponseFutures active_nodes_futures;
+    ListResponseFutures finished_nodes_futures;
 
-    Coordination::Error code = zookeeper->tryGetChildren(ddl_zookeeper_path, queries);
-    // if there is an error here, just register the code.
-    // the queries will be empty and so there will be nothing to fill the table
-    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-        zk_exception_code = code;
-
-    const auto clusters = context->getClusters();
-    for (const auto & name_and_cluster : clusters->getContainer())
+    for (const auto & task_path : ddl_task_paths)
     {
-        const ClusterPtr & cluster = name_and_cluster.second;
-        const auto & shards_info = cluster->getShardsInfo();
-        const auto & addresses_with_failover = cluster->getShardsAddresses();
-        for (size_t shard_index = 0; shard_index < shards_info.size(); ++shard_index)
+        ddl_task_futures.push_back(zookeeper->asyncTryGet(ddl_zookeeper_path / task_path));
+        /// List status dirs. Active host may become finished, so we list active first.
+        active_nodes_futures.push_back(zookeeper->asyncTryGetChildrenNoThrow(ddl_zookeeper_path / task_path / "active"));
+        finished_nodes_futures.push_back(zookeeper->asyncTryGetChildrenNoThrow(ddl_zookeeper_path / task_path / "finished"));
+    }
+
+    for (size_t i = 0; i < ddl_task_paths.size(); ++i)
+    {
+        auto maybe_task = ddl_task_futures[i].get();
+        if (maybe_task.error != Coordination::Error::ZOK)
         {
-            const auto & shard_addresses = addresses_with_failover[shard_index];
-            const auto & shard_info = shards_info[shard_index];
-            const auto pool_status = shard_info.pool->getStatus();
-            for (size_t replica_index = 0; replica_index < shard_addresses.size(); ++replica_index)
+            /// Task is removed
+            assert(maybe_task.error == Coordination::Error::ZNONODE);
+            continue;
+        }
+
+        DDLTask task{ddl_task_paths[i], ddl_zookeeper_path / ddl_task_paths[i]};
+        try
+        {
+            task.entry.parse(maybe_task.data);
+        }
+        catch (Exception & e)
+        {
+            e.addMessage("On parsing DDL entry {}: {}", task.entry_path, maybe_task.data);
+            throw;
+        }
+
+        String cluster_name = clusterNameFromDDLQuery(context, task);
+        UInt64 query_create_time_ms = maybe_task.stat.ctime;
+
+        size_t col = 0;
+        fillCommonColumns(res_columns, col, task, cluster_name, query_create_time_ms);
+
+        /// At first we process finished nodes, to avoid duplication if some host was active
+        /// and suddenly become finished during status dirs listing.
+        /// Then we process active (but not finished) hosts.
+        /// And then we process the rest hosts from task.entry.hosts list.
+        /// NOTE: It's not guaranteed that task.entry.hosts contains all host ids from status dirs.
+        std::unordered_set<String> processed_hosts;
+
+        /// Race condition with DDLWorker::cleanupQueue(...) is possible.
+        /// We may get incorrect list of finished nodes if task is currently removing.
+        /// To avoid showing INACTIVE status for hosts that have actually executed query,
+        /// we will detect if someone is removing task and show special REMOVING status.
+        /// Also we should distinguish it from another case when status dirs are not created yet (extremely rare case).
+        bool is_removing_task = false;
+
+        auto maybe_finished_hosts = finished_nodes_futures[i].get();
+        if (maybe_finished_hosts.error == Coordination::Error::ZOK)
+        {
+            GetResponseFutures finished_status_futures;
+            for (const auto & host_id_str : maybe_finished_hosts.names)
+                finished_status_futures.push_back(zookeeper->asyncTryGet(fs::path(task.entry_path) / "finished" / host_id_str));
+
+            for (size_t host_idx = 0; host_idx < maybe_finished_hosts.names.size(); ++host_idx)
             {
-                /*  Dir contents of every query will be similar to
-                 [zk: localhost:2181(CONNECTED) 53] ls /clickhouse/task_queue/ddl/query-0000000004
-                [active, finished]
-                */
-                std::vector<std::future<Coordination::GetResponse>> futures;
-                futures.reserve(queries.size());
-                for (const String & q : queries)
-                {
-                    futures.push_back(zookeeper->asyncTryGet(fs::path(ddl_zookeeper_path) / q));
-                }
-                for (size_t query_id = 0; query_id < queries.size(); query_id++)
-                {
-                    Int64 query_finish_time = 0;
-                    size_t i = 0;
-                    res_columns[i++]->insert(queries[query_id]); // entry
-                    const auto & address = shard_addresses[replica_index];
-                    res_columns[i++]->insert(address.host_name);
-                    auto resolved = address.getResolvedAddress();
-                    res_columns[i++]->insert(resolved ? resolved->host().toString() : String()); // host_address
-                    res_columns[i++]->insert(address.port);
-                    ddl_query_path = fs::path(ddl_zookeeper_path) / queries[query_id];
-
-                    zkutil::Strings active_nodes;
-                    zkutil::Strings finished_nodes;
-
-                    code = zookeeper->tryGetChildren(fs::path(ddl_query_path) / "active", active_nodes);
-                    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-                        zk_exception_code = code;
-
-                    code = zookeeper->tryGetChildren(fs::path(ddl_query_path) / "finished", finished_nodes);
-                    if (code != Coordination::Error::ZOK && code != Coordination::Error::ZNONODE)
-                        zk_exception_code = code;
-
-                    /* status:
-                 * active: If the hostname:port entry is present under active path.
-                 * finished: If the hostname:port entry is present under the finished path.
-                 * errored: If the hostname:port entry is present under the finished path but the error count is not 0.
-                 * unknown: If the above cases don't hold true, then status is unknown.
-                 */
-                    if (std::find(active_nodes.begin(), active_nodes.end(), address.toString()) != active_nodes.end())
-                    {
-                        res_columns[i++]->insert(static_cast<Int8>(Status::ACTIVE));
-                    }
-                    else if (std::find(finished_nodes.begin(), finished_nodes.end(), address.toString()) != finished_nodes.end())
-                    {
-                        if (pool_status[replica_index].error_count != 0)
-                        {
-                            res_columns[i++]->insert(static_cast<Int8>(Status::ERRORED));
-                        }
-                        else
-                        {
-                            res_columns[i++]->insert(static_cast<Int8>(Status::FINISHED));
-                        }
-                        // regardless of the status finished or errored, the node host_name:port entry was found under the /finished path
-                        // & should be able to get the contents of the znode at /finished path.
-                        auto res_fn = zookeeper->asyncTryGet(fs::path(ddl_query_path) / "finished");
-                        auto stat_fn = res_fn.get().stat;
-                        query_finish_time = stat_fn.mtime;
-                    }
-                    else
-                    {
-                        res_columns[i++]->insert(static_cast<Int8>(Status::UNKNOWN));
-                    }
-
-                    Coordination::GetResponse res;
-                    res = futures[query_id].get();
-
-                    auto query_start_time = res.stat.mtime;
-
-                    DDLLogEntry entry;
-                    entry.parse(res.data);
-                    String cluster_name = clusterNameFromDDLQuery(context, entry);
-
-                    res_columns[i++]->insert(cluster_name);
-                    res_columns[i++]->insert(entry.query);
-                    res_columns[i++]->insert(entry.initiator);
-                    res_columns[i++]->insert(UInt64(query_start_time / 1000));
-                    res_columns[i++]->insert(UInt64(query_finish_time / 1000));
-                    res_columns[i++]->insert(UInt64(query_finish_time - query_start_time));
-                    res_columns[i++]->insert(static_cast<Int8>(zk_exception_code));
-                }
+                const auto & host_id_str = maybe_finished_hosts.names[host_idx];
+                HostID host_id = HostID::fromString(host_id_str);
+                repeatValuesInCommonColumns(res_columns, col);
+                size_t rest_col = col;
+                fillHostnameColumns(res_columns, rest_col, host_id);
+                fillStatusColumns(res_columns, rest_col, finished_status_futures[host_idx], query_create_time_ms);
+                processed_hosts.insert(host_id_str);
             }
         }
+        else if (maybe_finished_hosts.error == Coordination::Error::ZNONODE)
+        {
+            /// Rare case: Either status dirs are not created yet or already removed.
+            /// We can distinguish it by checking if task node exists, because "query-xxx" and "query-xxx/finished"
+            /// are removed in single multi-request
+            is_removing_task = !zookeeper->exists(task.entry_path);
+        }
+        else
+        {
+            throw Coordination::Exception(maybe_finished_hosts.error, fs::path(task.entry_path) / "finished");
+        }
+
+        /// Process active nodes
+        auto maybe_active_hosts = active_nodes_futures[i].get();
+        if (maybe_active_hosts.error == Coordination::Error::ZOK)
+        {
+            for (const auto & host_id_str : maybe_active_hosts.names)
+            {
+                if (processed_hosts.contains(host_id_str))
+                    continue;
+
+                HostID host_id = HostID::fromString(host_id_str);
+                repeatValuesInCommonColumns(res_columns, col);
+                size_t rest_col = col;
+                fillHostnameColumns(res_columns, rest_col, host_id);
+                fillStatusColumnsWithNulls(res_columns, rest_col, Status::ACTIVE);
+                processed_hosts.insert(host_id_str);
+            }
+        }
+        else if (maybe_active_hosts.error == Coordination::Error::ZNONODE)
+        {
+            /// Rare case: Either status dirs are not created yet or task is currently removing.
+            /// When removing a task, at first we remove "query-xxx/active" (not recursively),
+            /// then recursively remove everything except "query-xxx/finished"
+            /// and then remove "query-xxx" and "query-xxx/finished".
+            is_removing_task = is_removing_task ||
+                (zookeeper->exists(fs::path(task.entry_path) / "finished") && !zookeeper->exists(fs::path(task.entry_path) / "active")) ||
+                !zookeeper->exists(task.entry_path);
+        }
+        else
+        {
+            throw Coordination::Exception(maybe_active_hosts.error, fs::path(task.entry_path) / "active");
+        }
+
+        /// Process the rest hosts
+        for (const auto & host_id : task.entry.hosts)
+        {
+            if (processed_hosts.contains(host_id.toString()))
+                continue;
+
+            Status status = is_removing_task ? Status::REMOVING : Status::INACTIVE;
+            repeatValuesInCommonColumns(res_columns, col);
+            size_t rest_col = col;
+            fillHostnameColumns(res_columns, rest_col, host_id);
+            fillStatusColumnsWithNulls(res_columns, rest_col, status);
+            processed_hosts.insert(host_id.toString());
+        }
+
+        if (processed_hosts.empty())
+        {
+            /// We don't know any hosts, just fill the rest columns with nulls.
+            /// host
+            res_columns[col++]->insert(Field{});
+            /// port
+            res_columns[col++]->insert(Field{});
+            fillStatusColumnsWithNulls(res_columns, col, Status::UNKNOWN);
+        }
     }
 }
+
 }
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.h b/src/Storages/System/StorageSystemDDLWorkerQueue.h
index 891ba4db509..50eb2e10c7c 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.h
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.h
@@ -1,12 +1,8 @@
 #pragma once
-
-#include <Poco/Util/Application.h>
-#include <Poco/Util/LayeredConfiguration.h>
-
 #include <Interpreters/DDLWorker.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
-
+#include <base/shared_ptr_helper.h>
+#include <future>
 
 namespace DB
 {
@@ -19,10 +15,9 @@ class StorageSystemDDLWorkerQueue final : public shared_ptr_helper<StorageSystem
                                           public IStorageSystemOneBlock<StorageSystemDDLWorkerQueue>
 {
     friend struct shared_ptr_helper<StorageSystemDDLWorkerQueue>;
-    Poco::Util::LayeredConfiguration & config = Poco::Util::Application::instance().config();
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.cpp b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
index 7a6ce4ec519..d7fc06da953 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.cpp
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
@@ -25,6 +25,9 @@ StorageSystemDataSkippingIndices::StorageSystemDataSkippingIndices(const Storage
             { "type", std::make_shared<DataTypeString>() },
             { "expr", std::make_shared<DataTypeString>() },
             { "granularity", std::make_shared<DataTypeUInt64>() },
+            { "data_compressed_bytes", std::make_shared<DataTypeUInt64>() },
+            { "data_uncompressed_bytes", std::make_shared<DataTypeUInt64>() },
+            { "marks", std::make_shared<DataTypeUInt64>()}
         }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -97,6 +100,7 @@ protected:
                     continue;
                 const auto indices = metadata_snapshot->getSecondaryIndices();
 
+                auto secondary_index_sizes = table->getSecondaryIndexSizes();
                 for (const auto & index : indices)
                 {
                     ++rows_count;
@@ -127,6 +131,21 @@ protected:
                     // 'granularity' column
                     if (column_mask[src_index++])
                         res_columns[res_index++]->insert(index.granularity);
+
+                    auto & secondary_index_size = secondary_index_sizes[index.name];
+
+                    // 'compressed bytes' column
+                    if (column_mask[src_index++])
+                        res_columns[res_index++]->insert(secondary_index_size.data_compressed);
+
+                    // 'uncompressed bytes' column
+
+                    if (column_mask[src_index++])
+                        res_columns[res_index++]->insert(secondary_index_size.data_uncompressed);
+
+                    /// 'marks' column
+                    if (column_mask[src_index++])
+                        res_columns[res_index++]->insert(secondary_index_size.marks);
                 }
             }
         }
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.h b/src/Storages/System/StorageSystemDataSkippingIndices.h
index 8497f16606f..72f66b025cf 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.h
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.h b/src/Storages/System/StorageSystemDataTypeFamilies.h
index 0cc347467c2..2ff04039471 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.h
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemDatabases.cpp b/src/Storages/System/StorageSystemDatabases.cpp
index e09e47d8baf..fb7a1bc59b8 100644
--- a/src/Storages/System/StorageSystemDatabases.cpp
+++ b/src/Storages/System/StorageSystemDatabases.cpp
@@ -17,6 +17,14 @@ NamesAndTypesList StorageSystemDatabases::getNamesAndTypes()
         {"data_path", std::make_shared<DataTypeString>()},
         {"metadata_path", std::make_shared<DataTypeString>()},
         {"uuid", std::make_shared<DataTypeUUID>()},
+        {"comment", std::make_shared<DataTypeString>()}
+    };
+}
+
+NamesAndAliases StorageSystemDatabases::getNamesAndAliases()
+{
+    return {
+        {"database", std::make_shared<DataTypeString>(), "name"}
     };
 }
 
@@ -39,6 +47,7 @@ void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr c
         res_columns[2]->insert(context->getPath() + database->getDataPath());
         res_columns[3]->insert(database->getMetadataPath());
         res_columns[4]->insert(database->getUUID());
+        res_columns[5]->insert(database->getDatabaseComment());
    }
 }
 
diff --git a/src/Storages/System/StorageSystemDatabases.h b/src/Storages/System/StorageSystemDatabases.h
index 3d0ff9da6cd..3de0da126d4 100644
--- a/src/Storages/System/StorageSystemDatabases.h
+++ b/src/Storages/System/StorageSystemDatabases.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
@@ -23,6 +23,8 @@ public:
 
     static NamesAndTypesList getNamesAndTypes();
 
+    static NamesAndAliases getNamesAndAliases();
+
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index 1a9418485e5..068347afa92 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
diff --git a/src/Storages/System/StorageSystemDictionaries.cpp b/src/Storages/System/StorageSystemDictionaries.cpp
index 5a4e54a9e7f..d8f92d38081 100644
--- a/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/src/Storages/System/StorageSystemDictionaries.cpp
@@ -15,7 +15,7 @@
 #include <Columns/ColumnString.h>
 #include <Core/Names.h>
 
-#include <common/map.h>
+#include <base/map.h>
 #include <mutex>
 
 namespace DB
@@ -47,7 +47,8 @@ NamesAndTypesList StorageSystemDictionaries::getNamesAndTypes()
         {"last_successful_update_time", std::make_shared<DataTypeDateTime>()},
         {"loading_duration", std::make_shared<DataTypeFloat32>()},
         //{ "creation_time", std::make_shared<DataTypeDateTime>() },
-        {"last_exception", std::make_shared<DataTypeString>()}
+        {"last_exception", std::make_shared<DataTypeString>()},
+        {"comment", std::make_shared<DataTypeString>()}
     };
 }
 
@@ -140,6 +141,16 @@ void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPt
         else
             res_columns[i++]->insertDefault();
 
+        if (dict_ptr)
+            res_columns[i++]->insert(dict_ptr->getDictionaryComment());
+        else
+        {
+            if (load_result.config && load_result.config->config->has("dictionary.comment"))
+                res_columns[i++]->insert(load_result.config->config->getString("dictionary.comment"));
+            else
+                res_columns[i++]->insertDefault();
+        }
+
         /// Start fill virtual columns
 
         res_columns[i++]->insert(dictionary_structure.getKeyDescription());
diff --git a/src/Storages/System/StorageSystemDictionaries.h b/src/Storages/System/StorageSystemDictionaries.h
index b144445a3b4..f862748789a 100644
--- a/src/Storages/System/StorageSystemDictionaries.h
+++ b/src/Storages/System/StorageSystemDictionaries.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index 5d7628acb2a..749717922da 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -51,7 +51,7 @@ Pipe StorageSystemDisks::read(
         col_free->insert(disk_ptr->getAvailableSpace());
         col_total->insert(disk_ptr->getTotalSpace());
         col_keep->insert(disk_ptr->getKeepingFreeSpace());
-        col_type->insert(DiskType::toString(disk_ptr->getType()));
+        col_type->insert(toString(disk_ptr->getType()));
     }
 
     Columns res_columns;
diff --git a/src/Storages/System/StorageSystemDisks.h b/src/Storages/System/StorageSystemDisks.h
index 1274903ff00..d6908a295d4 100644
--- a/src/Storages/System/StorageSystemDisks.h
+++ b/src/Storages/System/StorageSystemDisks.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemDistributionQueue.h b/src/Storages/System/StorageSystemDistributionQueue.h
index cb2812a5aab..97c327827dc 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.h
+++ b/src/Storages/System/StorageSystemDistributionQueue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemEnabledRoles.h b/src/Storages/System/StorageSystemEnabledRoles.h
index 2c385d40c85..9d78b20109b 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.h
+++ b/src/Storages/System/StorageSystemEnabledRoles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemErrors.h b/src/Storages/System/StorageSystemErrors.h
index 114a138e907..f0ef0f7228a 100644
--- a/src/Storages/System/StorageSystemErrors.h
+++ b/src/Storages/System/StorageSystemErrors.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemEvents.h b/src/Storages/System/StorageSystemEvents.h
index b94833d09e2..e765c60b6fa 100644
--- a/src/Storages/System/StorageSystemEvents.h
+++ b/src/Storages/System/StorageSystemEvents.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemFormats.cpp b/src/Storages/System/StorageSystemFormats.cpp
index 86e0212a523..b35fdd3f85e 100644
--- a/src/Storages/System/StorageSystemFormats.cpp
+++ b/src/Storages/System/StorageSystemFormats.cpp
@@ -21,8 +21,8 @@ void StorageSystemFormats::fillData(MutableColumns & res_columns, ContextPtr, co
     for (const auto & pair : formats)
     {
         const auto & [format_name, creators] = pair;
-        UInt64 has_input_format(creators.input_creator != nullptr || creators.input_processor_creator != nullptr);
-        UInt64 has_output_format(creators.output_creator != nullptr || creators.output_processor_creator != nullptr);
+        UInt64 has_input_format(creators.input_creator != nullptr);
+        UInt64 has_output_format(creators.output_creator != nullptr);
         res_columns[0]->insert(format_name);
         res_columns[1]->insert(has_input_format);
         res_columns[2]->insert(has_output_format);
diff --git a/src/Storages/System/StorageSystemFormats.h b/src/Storages/System/StorageSystemFormats.h
index 0db47496107..5e0dfeeefb9 100644
--- a/src/Storages/System/StorageSystemFormats.h
+++ b/src/Storages/System/StorageSystemFormats.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemFunctions.cpp b/src/Storages/System/StorageSystemFunctions.cpp
index 973bf493cd1..b3f1231bd1a 100644
--- a/src/Storages/System/StorageSystemFunctions.cpp
+++ b/src/Storages/System/StorageSystemFunctions.cpp
@@ -1,29 +1,61 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <Parsers/queryToString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/UserDefinedSQLFunctionFactory.h>
+#include <Interpreters/UserDefinedExecutableFunctionFactory.h>
 #include <Storages/System/StorageSystemFunctions.h>
 
-
 namespace DB
 {
+
+enum class FunctionOrigin : Int8
+{
+    SYSTEM = 0,
+    SQL_USER_DEFINED = 1,
+    EXECUTABLE_USER_DEFINED = 2
+};
+
 namespace
 {
     template <typename Factory>
-    void fillRow(MutableColumns & res_columns, const String & name, UInt64 is_aggregate, const Factory & f)
+    void fillRow(MutableColumns & res_columns, const String & name, UInt64 is_aggregate, const String & create_query, FunctionOrigin function_origin, const Factory & f)
     {
         res_columns[0]->insert(name);
         res_columns[1]->insert(is_aggregate);
-        res_columns[2]->insert(f.isCaseInsensitive(name));
-        if (f.isAlias(name))
-            res_columns[3]->insert(f.aliasTo(name));
-        else
+
+        if constexpr (std::is_same_v<Factory, UserDefinedSQLFunctionFactory> || std::is_same_v<Factory, UserDefinedExecutableFunctionFactory>)
+        {
+            res_columns[2]->insert(false);
             res_columns[3]->insertDefault();
+        }
+        else
+        {
+            res_columns[2]->insert(f.isCaseInsensitive(name));
+            if (f.isAlias(name))
+                res_columns[3]->insert(f.aliasTo(name));
+            else
+                res_columns[3]->insertDefault();
+        }
+
+        res_columns[4]->insert(create_query);
+        res_columns[5]->insert(static_cast<Int8>(function_origin));
     }
 }
 
+std::vector<std::pair<String, Int8>> getOriginEnumsAndValues()
+{
+    return std::vector<std::pair<String, Int8>>{
+        {"System", static_cast<Int8>(FunctionOrigin::SYSTEM)},
+        {"SQLUserDefined", static_cast<Int8>(FunctionOrigin::SQL_USER_DEFINED)},
+        {"ExecutableUserDefined", static_cast<Int8>(FunctionOrigin::EXECUTABLE_USER_DEFINED)}
+    };
+}
+
 NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
 {
     return {
@@ -31,23 +63,40 @@ NamesAndTypesList StorageSystemFunctions::getNamesAndTypes()
         {"is_aggregate", std::make_shared<DataTypeUInt8>()},
         {"case_insensitive", std::make_shared<DataTypeUInt8>()},
         {"alias_to", std::make_shared<DataTypeString>()},
+        {"create_query", std::make_shared<DataTypeString>()},
+        {"origin", std::make_shared<DataTypeEnum8>(getOriginEnumsAndValues())}
     };
 }
 
-void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
 {
     const auto & functions_factory = FunctionFactory::instance();
     const auto & function_names = functions_factory.getAllRegisteredNames();
     for (const auto & function_name : function_names)
     {
-        fillRow(res_columns, function_name, UInt64(0), functions_factory);
+        fillRow(res_columns, function_name, UInt64(0), "", FunctionOrigin::SYSTEM, functions_factory);
     }
 
     const auto & aggregate_functions_factory = AggregateFunctionFactory::instance();
     const auto & aggregate_function_names = aggregate_functions_factory.getAllRegisteredNames();
     for (const auto & function_name : aggregate_function_names)
     {
-        fillRow(res_columns, function_name, UInt64(1), aggregate_functions_factory);
+        fillRow(res_columns, function_name, UInt64(1), "", FunctionOrigin::SYSTEM, aggregate_functions_factory);
+    }
+
+    const auto & user_defined_sql_functions_factory = UserDefinedSQLFunctionFactory::instance();
+    const auto & user_defined_sql_functions_names = user_defined_sql_functions_factory.getAllRegisteredNames();
+    for (const auto & function_name : user_defined_sql_functions_names)
+    {
+        auto create_query = queryToString(user_defined_sql_functions_factory.get(function_name));
+        fillRow(res_columns, function_name, UInt64(0), create_query, FunctionOrigin::SQL_USER_DEFINED, user_defined_sql_functions_factory);
+    }
+
+    const auto & user_defined_executable_functions_factory = UserDefinedExecutableFunctionFactory::instance();
+    const auto & user_defined_executable_functions_names = user_defined_executable_functions_factory.getRegisteredNames(context);
+    for (const auto & function_name : user_defined_executable_functions_names)
+    {
+        fillRow(res_columns, function_name, UInt64(0), "", FunctionOrigin::EXECUTABLE_USER_DEFINED, user_defined_executable_functions_factory);
     }
 }
 }
diff --git a/src/Storages/System/StorageSystemFunctions.h b/src/Storages/System/StorageSystemFunctions.h
index 9781d5a7f12..bdb2c9ca274 100644
--- a/src/Storages/System/StorageSystemFunctions.h
+++ b/src/Storages/System/StorageSystemFunctions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemGrants.h b/src/Storages/System/StorageSystemGrants.h
index b511b4b77cf..0cc6cff3e84 100644
--- a/src/Storages/System/StorageSystemGrants.h
+++ b/src/Storages/System/StorageSystemGrants.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemGraphite.h b/src/Storages/System/StorageSystemGraphite.h
index 80325b0e2cb..6c529558471 100644
--- a/src/Storages/System/StorageSystemGraphite.h
+++ b/src/Storages/System/StorageSystemGraphite.h
@@ -5,7 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemLicenses.h b/src/Storages/System/StorageSystemLicenses.h
index 1dd30fd7cff..0876d01c311 100644
--- a/src/Storages/System/StorageSystemLicenses.h
+++ b/src/Storages/System/StorageSystemLicenses.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemMacros.h b/src/Storages/System/StorageSystemMacros.h
index fec0995b827..90032957c57 100644
--- a/src/Storages/System/StorageSystemMacros.h
+++ b/src/Storages/System/StorageSystemMacros.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <DataTypes/DataTypeString.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.h b/src/Storages/System/StorageSystemMergeTreeSettings.h
index 64aec4634b2..0c9e857b8e6 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.h
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
diff --git a/src/Storages/System/StorageSystemMerges.h b/src/Storages/System/StorageSystemMerges.h
index f88925cda67..48a07620d19 100644
--- a/src/Storages/System/StorageSystemMerges.h
+++ b/src/Storages/System/StorageSystemMerges.h
@@ -3,7 +3,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemMetrics.h b/src/Storages/System/StorageSystemMetrics.h
index b1a8cb52231..107f2c05fb1 100644
--- a/src/Storages/System/StorageSystemMetrics.h
+++ b/src/Storages/System/StorageSystemMetrics.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemModels.h b/src/Storages/System/StorageSystemModels.h
index 3ec279f7f44..491fa63ca5a 100644
--- a/src/Storages/System/StorageSystemModels.h
+++ b/src/Storages/System/StorageSystemModels.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemMutations.h b/src/Storages/System/StorageSystemMutations.h
index 350998c9d9e..f3c77e349b0 100644
--- a/src/Storages/System/StorageSystemMutations.h
+++ b/src/Storages/System/StorageSystemMutations.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemNumbers.cpp b/src/Storages/System/StorageSystemNumbers.cpp
index 3a88cc96639..136c2489be2 100644
--- a/src/Storages/System/StorageSystemNumbers.cpp
+++ b/src/Storages/System/StorageSystemNumbers.cpp
@@ -4,7 +4,7 @@
 #include <Storages/System/StorageSystemNumbers.h>
 
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <Processors/LimitTransform.h>
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index 960c354fda2..da16dc73ca8 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <optional>
 #include <Storages/IStorage.h>
 
diff --git a/src/Storages/System/StorageSystemOne.cpp b/src/Storages/System/StorageSystemOne.cpp
index 7c28f897121..7558ae0ae92 100644
--- a/src/Storages/System/StorageSystemOne.cpp
+++ b/src/Storages/System/StorageSystemOne.cpp
@@ -4,7 +4,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Storages/System/StorageSystemOne.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemOne.h b/src/Storages/System/StorageSystemOne.h
index 71a29847919..3fe0c91113c 100644
--- a/src/Storages/System/StorageSystemOne.h
+++ b/src/Storages/System/StorageSystemOne.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
index 70bc473e241..c397392e9fb 100644
--- a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
@@ -30,10 +30,12 @@ NamesAndTypesList StorageSystemPartMovesBetweenShards::getNamesAndTypes()
         { "part_name",               std::make_shared<DataTypeString>() },
         { "part_uuid",               std::make_shared<DataTypeUUID>() },
         { "to_shard",                std::make_shared<DataTypeString>() },
+        { "dst_part_name",           std::make_shared<DataTypeString>() },
 
         /// Processing status of item.
         { "update_time",             std::make_shared<DataTypeDateTime>() },
         { "state",                   std::make_shared<DataTypeString>() },
+        { "rollback",                std::make_shared<DataTypeUInt8>() },
         { "num_tries",               std::make_shared<DataTypeUInt32>() },
         { "last_exception",          std::make_shared<DataTypeString>() },
     };
@@ -122,11 +124,13 @@ void StorageSystemPartMovesBetweenShards::fillData(MutableColumns & res_columns,
             res_columns[col_num++]->insert(entry.part_name);
             res_columns[col_num++]->insert(entry.part_uuid);
             res_columns[col_num++]->insert(entry.to_shard);
+            res_columns[col_num++]->insert(entry.dst_part_name);
 
             /// Processing status of item.
             res_columns[col_num++]->insert(entry.update_time);
             res_columns[col_num++]->insert(entry.state.toString());
-            res_columns[col_num++]->insert(0);
+            res_columns[col_num++]->insert(entry.rollback);
+            res_columns[col_num++]->insert(entry.num_tries);
             res_columns[col_num++]->insert(entry.last_exception_msg);
         }
     }
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.h b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
index 64344a7a8a1..a73b594f1c8 100644
--- a/src/Storages/System/StorageSystemPartMovesBetweenShards.h
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index 6a643dbe1b9..6826082ef1d 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -30,6 +30,9 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
         {"data_compressed_bytes",                       std::make_shared<DataTypeUInt64>()},
         {"data_uncompressed_bytes",                     std::make_shared<DataTypeUInt64>()},
         {"marks_bytes",                                 std::make_shared<DataTypeUInt64>()},
+        {"secondary_indices_compressed_bytes",          std::make_shared<DataTypeUInt64>()},
+        {"secondary_indices_uncompressed_bytes",        std::make_shared<DataTypeUInt64>()},
+        {"secondary_indices_marks_bytes",               std::make_shared<DataTypeUInt64>()},
         {"modification_time",                           std::make_shared<DataTypeDateTime>()},
         {"remove_time",                                 std::make_shared<DataTypeDateTime>()},
         {"refcount",                                    std::make_shared<DataTypeUInt32>()},
@@ -75,7 +78,9 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
 
         {"rows_where_ttl_info.expression",              std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"rows_where_ttl_info.min",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"rows_where_ttl_info.max",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())}
+        {"rows_where_ttl_info.max",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+
+        {"projections",                                 std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
     }
     )
 {
@@ -96,6 +101,7 @@ void StorageSystemParts::processNextStorage(
         auto part_state = all_parts_state[part_number];
 
         ColumnSize columns_size = part->getTotalColumnsSize();
+        ColumnSize secondary_indexes_size = part->getTotalSeconaryIndicesSize();
 
         size_t src_index = 0, res_index = 0;
         if (columns_mask[src_index++])
@@ -124,6 +130,12 @@ void StorageSystemParts::processNextStorage(
             columns[res_index++]->insert(columns_size.data_uncompressed);
         if (columns_mask[src_index++])
             columns[res_index++]->insert(columns_size.marks);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(secondary_indexes_size.data_compressed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(secondary_indexes_size.data_uncompressed);
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(secondary_indexes_size.marks);
         if (columns_mask[src_index++])
             columns[res_index++]->insert(static_cast<UInt64>(part->modification_time));
 
@@ -253,10 +265,17 @@ void StorageSystemParts::processNextStorage(
         add_ttl_info_map(part->ttl_infos.group_by_ttl);
         add_ttl_info_map(part->ttl_infos.rows_where_ttl);
 
+        Array projections;
+        for (const auto & [name, _] : part->getProjectionParts())
+            projections.push_back(name);
+
+        if (columns_mask[src_index++])
+            columns[res_index++]->insert(projections);
+
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemParts.h b/src/Storages/System/StorageSystemParts.h
index df436f8f972..69e957c5a1e 100644
--- a/src/Storages/System/StorageSystemParts.h
+++ b/src/Storages/System/StorageSystemParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index 86f62e37fad..aec52e6b410 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemPartsColumns.h b/src/Storages/System/StorageSystemPartsColumns.h
index 842b3834561..c3e3eaefcf7 100644
--- a/src/Storages/System/StorageSystemPartsColumns.h
+++ b/src/Storages/System/StorageSystemPartsColumns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemPrivileges.h b/src/Storages/System/StorageSystemPrivileges.h
index a10e768e041..dad12d14ac0 100644
--- a/src/Storages/System/StorageSystemPrivileges.h
+++ b/src/Storages/System/StorageSystemPrivileges.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemProcesses.cpp b/src/Storages/System/StorageSystemProcesses.cpp
index e2685af7718..5e6ba37226c 100644
--- a/src/Storages/System/StorageSystemProcesses.cpp
+++ b/src/Storages/System/StorageSystemProcesses.cpp
@@ -73,7 +73,9 @@ NamesAndAliases StorageSystemProcesses::getNamesAndAliases()
     return
     {
         {"ProfileEvents.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(ProfileEvents)"},
-        {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"}
+        {"ProfileEvents.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())}, "mapValues(ProfileEvents)"},
+        {"Settings.Names", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapKeys(Settings)" },
+        {"Settings.Values", {std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}, "mapValues(Settings)"}
     };
 }
 
diff --git a/src/Storages/System/StorageSystemProcesses.h b/src/Storages/System/StorageSystemProcesses.h
index 9daf079800f..c22b83df6d0 100644
--- a/src/Storages/System/StorageSystemProcesses.h
+++ b/src/Storages/System/StorageSystemProcesses.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 7ae8a91ad60..378437bd4ec 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -282,7 +282,7 @@ void StorageSystemProjectionParts::processNextStorage(
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
-            columns[res_index++]->insert(IMergeTreeDataPart::stateToString(part_state));
+            columns[res_index++]->insert(IMergeTreeDataPart::stateString(part_state));
     }
 }
 
diff --git a/src/Storages/System/StorageSystemProjectionParts.h b/src/Storages/System/StorageSystemProjectionParts.h
index a4197769b0d..a8db87fbba4 100644
--- a/src/Storages/System/StorageSystemProjectionParts.h
+++ b/src/Storages/System/StorageSystemProjectionParts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.h b/src/Storages/System/StorageSystemProjectionPartsColumns.h
index 64ef1e2c286..10e80877285 100644
--- a/src/Storages/System/StorageSystemProjectionPartsColumns.h
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotaLimits.cpp b/src/Storages/System/StorageSystemQuotaLimits.cpp
index 82fdecfdf5b..3b64f72d621 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.cpp
+++ b/src/Storages/System/StorageSystemQuotaLimits.cpp
@@ -9,7 +9,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/Quota.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
diff --git a/src/Storages/System/StorageSystemQuotaLimits.h b/src/Storages/System/StorageSystemQuotaLimits.h
index 7f089fd3945..0fae259f4fc 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.h
+++ b/src/Storages/System/StorageSystemQuotaLimits.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotaUsage.cpp b/src/Storages/System/StorageSystemQuotaUsage.cpp
index 835936036ed..6723037cf3b 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotaUsage.cpp
@@ -10,7 +10,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/QuotaUsage.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemQuotaUsage.h b/src/Storages/System/StorageSystemQuotaUsage.h
index e3c076a0b4c..98fa6692628 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.h
+++ b/src/Storages/System/StorageSystemQuotaUsage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotas.cpp b/src/Storages/System/StorageSystemQuotas.cpp
index dcde4b70179..f5f57b48232 100644
--- a/src/Storages/System/StorageSystemQuotas.cpp
+++ b/src/Storages/System/StorageSystemQuotas.cpp
@@ -12,7 +12,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/Quota.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemQuotas.h b/src/Storages/System/StorageSystemQuotas.h
index 3eac1aaa784..9dac02ccf56 100644
--- a/src/Storages/System/StorageSystemQuotas.h
+++ b/src/Storages/System/StorageSystemQuotas.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemQuotasUsage.h b/src/Storages/System/StorageSystemQuotasUsage.h
index 72a1e9e4233..3f7aa237fe0 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.h
+++ b/src/Storages/System/StorageSystemQuotasUsage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index 5c22d3c2fae..467226c3b7a 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -51,6 +51,7 @@ StorageSystemReplicas::StorageSystemReplicas(const StorageID & table_id_)
         { "absolute_delay",                       std::make_shared<DataTypeUInt64>()   },
         { "total_replicas",                       std::make_shared<DataTypeUInt8>()    },
         { "active_replicas",                      std::make_shared<DataTypeUInt8>()    },
+        { "last_queue_update_exception",          std::make_shared<DataTypeString>()   },
         { "zookeeper_exception",                  std::make_shared<DataTypeString>()   },
         { "replica_is_active",                    std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt8>()) }
     }));
@@ -186,6 +187,7 @@ Pipe StorageSystemReplicas::read(
         res_columns[col_num++]->insert(status.absolute_delay);
         res_columns[col_num++]->insert(status.total_replicas);
         res_columns[col_num++]->insert(status.active_replicas);
+        res_columns[col_num++]->insert(status.last_queue_update_exception);
         res_columns[col_num++]->insert(status.zookeeper_exception);
 
         Map replica_is_active_values;
diff --git a/src/Storages/System/StorageSystemReplicas.h b/src/Storages/System/StorageSystemReplicas.h
index 1454628f363..ca36eef28c1 100644
--- a/src/Storages/System/StorageSystemReplicas.h
+++ b/src/Storages/System/StorageSystemReplicas.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.h b/src/Storages/System/StorageSystemReplicatedFetches.h
index b7336dbf437..ccdf99b9ce1 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.h
+++ b/src/Storages/System/StorageSystemReplicatedFetches.h
@@ -1,7 +1,7 @@
 #pragma once
 
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
@@ -11,7 +11,7 @@ namespace DB
 class Context;
 
 /// system.replicated_fetches table. Takes data from context.getReplicatedFetchList()
-class StorageSystemReplicatedFetches final : public shared_ptr_helper<StorageSystemReplicatedFetches>, public IStorageSystemOneBlock<StorageSystemReplicatedFetches >
+class StorageSystemReplicatedFetches final : public shared_ptr_helper<StorageSystemReplicatedFetches>, public IStorageSystemOneBlock<StorageSystemReplicatedFetches>
 {
     friend struct shared_ptr_helper<StorageSystemReplicatedFetches>;
 public:
diff --git a/src/Storages/System/StorageSystemReplicationQueue.h b/src/Storages/System/StorageSystemReplicationQueue.h
index c6403eb07a1..64466d4c3e0 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.h
+++ b/src/Storages/System/StorageSystemReplicationQueue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemRoleGrants.h b/src/Storages/System/StorageSystemRoleGrants.h
index 4507a8520b0..bd9c1086013 100644
--- a/src/Storages/System/StorageSystemRoleGrants.h
+++ b/src/Storages/System/StorageSystemRoleGrants.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemRoles.h b/src/Storages/System/StorageSystemRoles.h
index e2eda32bf71..ef5a5381ec3 100644
--- a/src/Storages/System/StorageSystemRoles.h
+++ b/src/Storages/System/StorageSystemRoles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemRowPolicies.cpp b/src/Storages/System/StorageSystemRowPolicies.cpp
index a60e26d6f85..3fa62bc784b 100644
--- a/src/Storages/System/StorageSystemRowPolicies.cpp
+++ b/src/Storages/System/StorageSystemRowPolicies.cpp
@@ -13,7 +13,7 @@
 #include <Access/AccessControlManager.h>
 #include <Access/RowPolicy.h>
 #include <Access/AccessFlags.h>
-#include <common/range.h>
+#include <base/range.h>
 #include <boost/range/algorithm_ext/push_back.hpp>
 
 
diff --git a/src/Storages/System/StorageSystemRowPolicies.h b/src/Storages/System/StorageSystemRowPolicies.h
index 637c91d5ded..f310dfe0927 100644
--- a/src/Storages/System/StorageSystemRowPolicies.h
+++ b/src/Storages/System/StorageSystemRowPolicies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemSettings.h b/src/Storages/System/StorageSystemSettings.h
index c76e1609fc2..d323908b7cf 100644
--- a/src/Storages/System/StorageSystemSettings.h
+++ b/src/Storages/System/StorageSystemSettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.h b/src/Storages/System/StorageSystemSettingsProfileElements.h
index ffeda5b7bf3..752cdfbf5dc 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.h
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.h b/src/Storages/System/StorageSystemSettingsProfiles.h
index edbb4084a66..f1fdbe34321 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.h
+++ b/src/Storages/System/StorageSystemSettingsProfiles.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index 7a8ee75803f..26af6488b81 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -6,7 +6,7 @@
 #include <mutex>
 #include <filesystem>
 
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Storages/System/StorageSystemStackTrace.h>
 #include <DataTypes/DataTypeString.h>
@@ -16,8 +16,8 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Common/PipeFDs.h>
 #include <Common/CurrentThread.h>
-#include <common/getThreadId.h>
-#include <common/logger_useful.h>
+#include <base/getThreadId.h>
+#include <base/logger_useful.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemStackTrace.h b/src/Storages/System/StorageSystemStackTrace.h
index bf3de40424c..a5827e32e6f 100644
--- a/src/Storages/System/StorageSystemStackTrace.h
+++ b/src/Storages/System/StorageSystemStackTrace.h
@@ -3,7 +3,7 @@
 #ifdef OS_LINUX /// Because of 'sigqueue' functions and RT signals.
 
 #include <mutex>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 namespace Poco
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 48dfadd2b3c..036e4748e65 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -6,6 +6,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Interpreters/Context.h>
+#include <base/EnumReflection.h>
 
 
 namespace DB
@@ -68,7 +69,7 @@ Pipe StorageSystemStoragePolicies::read(
             for (const auto & disk_ptr : volumes[i]->getDisks())
                 disks.push_back(disk_ptr->getName());
             col_disks->insert(disks);
-            col_volume_type->insert(volumeTypeToString(volumes[i]->getType()));
+            col_volume_type->insert(magic_enum::enum_name(volumes[i]->getType()));
             col_max_part_size->insert(volumes[i]->max_data_part_size);
             col_move_factor->insert(policy_ptr->getMoveFactor());
             col_prefer_not_to_merge->insert(volumes[i]->areMergesAvoided() ? 1 : 0);
diff --git a/src/Storages/System/StorageSystemStoragePolicies.h b/src/Storages/System/StorageSystemStoragePolicies.h
index 25afd4166c8..ad8b507b7c0 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.h
+++ b/src/Storages/System/StorageSystemStoragePolicies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
diff --git a/src/Storages/System/StorageSystemTableEngines.h b/src/Storages/System/StorageSystemTableEngines.h
index 153032fdd51..ac3be81c019 100644
--- a/src/Storages/System/StorageSystemTableEngines.h
+++ b/src/Storages/System/StorageSystemTableEngines.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 namespace DB
 {
diff --git a/src/Storages/System/StorageSystemTableFunctions.h b/src/Storages/System/StorageSystemTableFunctions.h
index de114654a92..882a1254ee0 100644
--- a/src/Storages/System/StorageSystemTableFunctions.h
+++ b/src/Storages/System/StorageSystemTableFunctions.h
@@ -2,7 +2,7 @@
 
 #include <DataTypes/DataTypeString.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 namespace DB
 {
 
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 1d38ca6ebbb..f32a609077f 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -17,7 +17,7 @@
 #include <DataTypes/DataTypeArray.h>
 #include <Disks/IStoragePolicy.h>
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 #include <DataTypes/DataTypeUUID.h>
 
 
@@ -47,6 +47,7 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
         {"dependencies_table", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
         {"create_table_query", std::make_shared<DataTypeString>()},
         {"engine_full", std::make_shared<DataTypeString>()},
+        {"as_select", std::make_shared<DataTypeString>()},
         {"partition_key", std::make_shared<DataTypeString>()},
         {"sorting_key", std::make_shared<DataTypeString>()},
         {"primary_key", std::make_shared<DataTypeString>()},
@@ -57,6 +58,9 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
         {"lifetime_rows", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
         {"lifetime_bytes", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
         {"comment", std::make_shared<DataTypeString>()},
+        {"has_own_data", std::make_shared<DataTypeUInt8>()},
+    }, {
+        {"table", std::make_shared<DataTypeString>(), "name"}
     }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -209,6 +213,10 @@ protected:
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insert(table.second->getName());
 
+                        // as_select
+                        if (columns_mask[src_index++])
+                            res_columns[res_index++]->insertDefault();
+
                         // partition_key
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
@@ -248,6 +256,10 @@ protected:
                         // comment
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
+
+                        // has_own_data
+                        if (columns_mask[src_index++])
+                            res_columns[res_index++]->insertDefault();
                     }
                 }
 
@@ -355,15 +367,15 @@ protected:
                         res_columns[res_index++]->insert(dependencies_table_name_array);
                 }
 
-                if (columns_mask[src_index] || columns_mask[src_index + 1])
+                if (columns_mask[src_index] || columns_mask[src_index + 1] || columns_mask[src_index + 2])
                 {
                     ASTPtr ast = database->tryGetCreateTableQuery(table_name, context);
+                    auto * ast_create = ast ? ast->as<ASTCreateQuery>() : nullptr;
 
-                    if (ast && !context->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
+                    if (ast_create && !context->getSettingsRef().show_table_uuid_in_table_create_query_if_not_nil)
                     {
-                        auto & create = ast->as<ASTCreateQuery &>();
-                        create.uuid = UUIDHelpers::Nil;
-                        create.to_inner_uuid = UUIDHelpers::Nil;
+                        ast_create->uuid = UUIDHelpers::Nil;
+                        ast_create->to_inner_uuid = UUIDHelpers::Nil;
                     }
 
                     if (columns_mask[src_index++])
@@ -373,24 +385,28 @@ protected:
                     {
                         String engine_full;
 
-                        if (ast)
+                        if (ast_create && ast_create->storage)
                         {
-                            const auto & ast_create = ast->as<ASTCreateQuery &>();
-                            if (ast_create.storage)
-                            {
-                                engine_full = queryToString(*ast_create.storage);
+                            engine_full = queryToString(*ast_create->storage);
 
-                                static const char * const extra_head = " ENGINE = ";
-                                if (startsWith(engine_full, extra_head))
-                                    engine_full = engine_full.substr(strlen(extra_head));
-                            }
+                            static const char * const extra_head = " ENGINE = ";
+                            if (startsWith(engine_full, extra_head))
+                                engine_full = engine_full.substr(strlen(extra_head));
                         }
 
                         res_columns[res_index++]->insert(engine_full);
                     }
+
+                    if (columns_mask[src_index++])
+                    {
+                        String as_select;
+                        if (ast_create && ast_create->select)
+                            as_select = queryToString(*ast_create->select);
+                        res_columns[res_index++]->insert(as_select);
+                    }
                 }
                 else
-                    src_index += 2;
+                    src_index += 3;
 
                 StorageMetadataPtr metadata_snapshot;
                 if (table)
@@ -483,6 +499,14 @@ protected:
                     else
                         res_columns[res_index++]->insertDefault();
                 }
+
+                if (columns_mask[src_index++])
+                {
+                    if (table)
+                        res_columns[res_index++]->insert(table->storesDataOnDisk());
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
             }
         }
 
diff --git a/src/Storages/System/StorageSystemTables.h b/src/Storages/System/StorageSystemTables.h
index b196a87b093..6424d623830 100644
--- a/src/Storages/System/StorageSystemTables.h
+++ b/src/Storages/System/StorageSystemTables.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/IStorage.h>
 
 
diff --git a/src/Storages/System/StorageSystemTimeZones.h b/src/Storages/System/StorageSystemTimeZones.h
index 7cc56bbe643..adfae5d760b 100644
--- a/src/Storages/System/StorageSystemTimeZones.h
+++ b/src/Storages/System/StorageSystemTimeZones.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Storages/System/IStorageSystemOneBlock.h>
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemUserDirectories.h b/src/Storages/System/StorageSystemUserDirectories.h
index 38d2ddd9147..905eae7a7b9 100644
--- a/src/Storages/System/StorageSystemUserDirectories.h
+++ b/src/Storages/System/StorageSystemUserDirectories.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemUsers.h b/src/Storages/System/StorageSystemUsers.h
index 886b91d04e9..b72ad612c65 100644
--- a/src/Storages/System/StorageSystemUsers.h
+++ b/src/Storages/System/StorageSystemUsers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/StorageSystemZeros.cpp b/src/Storages/System/StorageSystemZeros.cpp
index d1456d72685..624fc54998c 100644
--- a/src/Storages/System/StorageSystemZeros.cpp
+++ b/src/Storages/System/StorageSystemZeros.cpp
@@ -1,7 +1,7 @@
 #include <Storages/System/StorageSystemZeros.h>
 
 #include <Processors/Sources/SourceWithProgress.h>
-#include <Processors/Pipe.h>
+#include <QueryPipeline/Pipe.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
diff --git a/src/Storages/System/StorageSystemZeros.h b/src/Storages/System/StorageSystemZeros.h
index d33d9b4b099..e40b9c3993a 100644
--- a/src/Storages/System/StorageSystemZeros.h
+++ b/src/Storages/System/StorageSystemZeros.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <optional>
 #include <Storages/IStorage.h>
 
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
index d19aef47616..f2b2102c7ff 100644
--- a/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -15,7 +15,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <Interpreters/Set.h>
 #include <Interpreters/interpretSubquery.h>
-#include <DataStreams/IBlockInputStream.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
 
 
 namespace DB
@@ -94,18 +94,18 @@ static bool extractPathImpl(const IAST & elem, Paths & res, ContextPtr context)
         if (value->as<ASTSubquery>())
         {
             auto interpreter_subquery = interpretSubquery(value, context, {}, {});
-            auto stream = interpreter_subquery->execute().getInputStream();
+            auto pipeline = interpreter_subquery->execute().pipeline;
             SizeLimits limites(context->getSettingsRef().max_rows_in_set, context->getSettingsRef().max_bytes_in_set, OverflowMode::THROW);
             Set set(limites, true, context->getSettingsRef().transform_null_in);
-            set.setHeader(stream->getHeader());
+            set.setHeader(pipeline.getHeader().getColumnsWithTypeAndName());
 
-            stream->readPrefix();
-            while (Block block = stream->read())
+            PullingPipelineExecutor executor(pipeline);
+            Block block;
+            while (executor.pull(block))
             {
-                set.insertFromBlock(block);
+                set.insertFromBlock(block.getColumnsWithTypeAndName());
             }
             set.finishInsert();
-            stream->readSuffix();
 
             set.checkColumnsNumber(1);
             const auto & set_column = *set.getSetElements()[0];
diff --git a/src/Storages/System/StorageSystemZooKeeper.h b/src/Storages/System/StorageSystemZooKeeper.h
index a74fdac12e9..26bcaccba6a 100644
--- a/src/Storages/System/StorageSystemZooKeeper.h
+++ b/src/Storages/System/StorageSystemZooKeeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/shared_ptr_helper.h>
+#include <base/shared_ptr_helper.h>
 #include <Storages/System/IStorageSystemOneBlock.h>
 
 
diff --git a/src/Storages/System/attachInformationSchemaTables.cpp b/src/Storages/System/attachInformationSchemaTables.cpp
new file mode 100644
index 00000000000..cfe5de1dc41
--- /dev/null
+++ b/src/Storages/System/attachInformationSchemaTables.cpp
@@ -0,0 +1,57 @@
+#include <Databases/DatabaseOnDisk.h>
+#include <Storages/System/attachInformationSchemaTables.h>
+#include <Storages/System/attachSystemTablesImpl.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <base/getResource.h>
+
+namespace DB
+{
+
+/// View structures are taken from http://www.contrib.andrew.cmu.edu/~shadow/sql/sql1992.txt
+
+static void createInformationSchemaView(ContextMutablePtr context, IDatabase & database, const String & view_name)
+{
+    try
+    {
+        assert(database.getDatabaseName() == DatabaseCatalog::INFORMATION_SCHEMA ||
+               database.getDatabaseName() == DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE);
+        if (database.getEngineName() != "Memory")
+            return;
+        bool is_uppercase = database.getDatabaseName() == DatabaseCatalog::INFORMATION_SCHEMA_UPPERCASE;
+
+        String metadata_resource_name = view_name + ".sql";
+        auto attach_query = getResource(metadata_resource_name);
+        if (attach_query.empty())
+            return;
+
+        ParserCreateQuery parser;
+        ASTPtr ast = parseQuery(parser, attach_query.data(), attach_query.data() + attach_query.size(),
+                                "Attach query from embedded resource " + metadata_resource_name,
+                                DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+
+        auto & ast_create = ast->as<ASTCreateQuery &>();
+        assert(view_name == ast_create.table);
+        if (is_uppercase)
+            ast_create.table = Poco::toUpper(view_name);
+
+        StoragePtr view = createTableFromAST(ast_create, database.getDatabaseName(),
+                                             database.getTableDataPath(ast_create), context, true).second;
+
+        database.createTable(context, ast_create.table, view, ast);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+}
+
+void attachInformationSchema(ContextMutablePtr context, IDatabase & information_schema_database)
+{
+    createInformationSchemaView(context, information_schema_database, "schemata");
+    createInformationSchemaView(context, information_schema_database, "tables");
+    createInformationSchemaView(context, information_schema_database, "views");
+    createInformationSchemaView(context, information_schema_database, "columns");
+}
+
+}
diff --git a/src/Storages/System/attachInformationSchemaTables.h b/src/Storages/System/attachInformationSchemaTables.h
new file mode 100644
index 00000000000..9bb5623128a
--- /dev/null
+++ b/src/Storages/System/attachInformationSchemaTables.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <Interpreters/Context_fwd.h>
+
+namespace DB
+{
+
+class IDatabase;
+
+void attachInformationSchema(ContextMutablePtr context, IDatabase & information_schema_database);
+
+}
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index 95e86487073..30fe38f4936 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #include <Databases/IDatabase.h>
 #include <Storages/System/attachSystemTables.h>
@@ -21,7 +19,6 @@
 #include <Storages/System/StorageSystemFormats.h>
 #include <Storages/System/StorageSystemFunctions.h>
 #include <Storages/System/StorageSystemGraphite.h>
-
 #include <Storages/System/StorageSystemMacros.h>
 #include <Storages/System/StorageSystemMerges.h>
 #include <Storages/System/StorageSystemReplicatedFetches.h>
@@ -49,15 +46,11 @@
 #include <Storages/System/StorageSystemErrors.h>
 #include <Storages/System/StorageSystemWarnings.h>
 #include <Storages/System/StorageSystemDDLWorkerQueue.h>
-
-#if !defined(ARCADIA_BUILD)
-    #include <Storages/System/StorageSystemLicenses.h>
-    #include <Storages/System/StorageSystemTimeZones.h>
-#endif
+#include <Storages/System/StorageSystemLicenses.h>
+#include <Storages/System/StorageSystemTimeZones.h>
 #include <Storages/System/StorageSystemDisks.h>
 #include <Storages/System/StorageSystemStoragePolicies.h>
 #include <Storages/System/StorageSystemZeros.h>
-
 #include <Storages/System/StorageSystemUsers.h>
 #include <Storages/System/StorageSystemRoles.h>
 #include <Storages/System/StorageSystemGrants.h>
@@ -73,6 +66,7 @@
 #include <Storages/System/StorageSystemQuotasUsage.h>
 #include <Storages/System/StorageSystemUserDirectories.h>
 #include <Storages/System/StorageSystemPrivileges.h>
+#include <Storages/System/StorageSystemAsynchronousInserts.h>
 
 #ifdef OS_LINUX
 #include <Storages/System/StorageSystemStackTrace.h>
@@ -127,10 +121,8 @@ void attachSystemTablesLocal(IDatabase & system_database)
     attach<StorageSystemErrors>(system_database, "errors");
     attach<StorageSystemWarnings>(system_database, "warnings");
     attach<StorageSystemDataSkippingIndices>(system_database, "data_skipping_indices");
-#if !defined(ARCADIA_BUILD)
     attach<StorageSystemLicenses>(system_database, "licenses");
     attach<StorageSystemTimeZones>(system_database, "time_zones");
-#endif
 #ifdef OS_LINUX
     attach<StorageSystemStackTrace>(system_database, "stack_trace");
 #endif
@@ -165,6 +157,7 @@ void attachSystemTablesServer(IDatabase & system_database, bool has_zookeeper)
     attach<StorageSystemMacros>(system_database, "macros");
     attach<StorageSystemReplicatedFetches>(system_database, "replicated_fetches");
     attach<StorageSystemPartMovesBetweenShards>(system_database, "part_moves_between_shards");
+    attach<StorageSystemAsynchronousInserts>(system_database, "asynchronous_inserts");
 
     if (has_zookeeper)
         attach<StorageSystemZooKeeper>(system_database, "zookeeper");
diff --git a/src/Storages/System/attachSystemTablesImpl.h b/src/Storages/System/attachSystemTablesImpl.h
index 78e944f7d27..1fdf677699a 100644
--- a/src/Storages/System/attachSystemTablesImpl.h
+++ b/src/Storages/System/attachSystemTablesImpl.h
@@ -9,6 +9,7 @@ namespace DB
 template<typename StorageT, typename... StorageArgs>
 void attach(IDatabase & system_database, const String & table_name, StorageArgs && ... args)
 {
+    assert(system_database.getDatabaseName() == DatabaseCatalog::SYSTEM_DATABASE);
     if (system_database.getUUID() == UUIDHelpers::Nil)
     {
         /// Attach to Ordinary database
diff --git a/src/Storages/TableLockHolder.h b/src/Storages/TableLockHolder.h
index 6ec06a5e66c..36fda2c69bb 100644
--- a/src/Storages/TableLockHolder.h
+++ b/src/Storages/TableLockHolder.h
@@ -16,8 +16,6 @@ struct TableExclusiveLockHolder
 private:
     friend class IStorage;
 
-    /// Order is important.
-    TableLockHolder alter_lock;
     TableLockHolder drop_lock;
 };
 
diff --git a/src/Storages/examples/CMakeLists.txt b/src/Storages/examples/CMakeLists.txt
index 59d44829363..103972a106f 100644
--- a/src/Storages/examples/CMakeLists.txt
+++ b/src/Storages/examples/CMakeLists.txt
@@ -22,11 +22,3 @@ target_link_libraries (transform_part_zk_nodes
         dbms
         string_utils
 )
-
-if (ENABLE_FUZZING)
-    add_executable (mergetree_checksum_fuzzer mergetree_checksum_fuzzer.cpp)
-    target_link_libraries (mergetree_checksum_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
-
-    add_executable (columns_description_fuzzer columns_description_fuzzer.cpp)
-    target_link_libraries (columns_description_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
-endif ()
diff --git a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
index 0c20d2ed4c8..e2145f5afb0 100644
--- a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
+++ b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
@@ -4,7 +4,7 @@
 #include <Common/Stopwatch.h>
 #include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
 
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <iostream>
 
diff --git a/src/Storages/examples/get_current_inserts_in_replicated.cpp b/src/Storages/examples/get_current_inserts_in_replicated.cpp
index 94e63e49b19..d7dedbcab9c 100644
--- a/src/Storages/examples/get_current_inserts_in_replicated.cpp
+++ b/src/Storages/examples/get_current_inserts_in_replicated.cpp
@@ -4,7 +4,7 @@
 #include <Common/ZooKeeper/ZooKeeper.h>
 #include <Common/Exception.h>
 #include <Common/Stopwatch.h>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <filesystem>
 #include <iostream>
diff --git a/src/Storages/fuzzers/CMakeLists.txt b/src/Storages/fuzzers/CMakeLists.txt
new file mode 100644
index 00000000000..d41e96868ad
--- /dev/null
+++ b/src/Storages/fuzzers/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+add_executable (mergetree_checksum_fuzzer mergetree_checksum_fuzzer.cpp)
+# Look at comment around fuzz_compression target declaration
+target_link_libraries (mergetree_checksum_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
+
+add_executable (columns_description_fuzzer columns_description_fuzzer.cpp)
+target_link_libraries (columns_description_fuzzer PRIVATE dbms ${LIB_FUZZING_ENGINE})
diff --git a/src/Storages/examples/columns_description_fuzzer.cpp b/src/Storages/fuzzers/columns_description_fuzzer.cpp
similarity index 100%
rename from src/Storages/examples/columns_description_fuzzer.cpp
rename to src/Storages/fuzzers/columns_description_fuzzer.cpp
diff --git a/src/Storages/examples/mergetree_checksum_fuzzer.cpp b/src/Storages/fuzzers/mergetree_checksum_fuzzer.cpp
similarity index 100%
rename from src/Storages/examples/mergetree_checksum_fuzzer.cpp
rename to src/Storages/fuzzers/mergetree_checksum_fuzzer.cpp
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index fb828b8f744..532abb8e2f3 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -3,7 +3,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
-#include <DataStreams/RemoteBlockInputStream.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeString.h>
 #include <Columns/ColumnString.h>
@@ -71,17 +71,16 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     };
 
     /// Execute remote query without restrictions (because it's not real user query, but part of implementation)
-    auto input = std::make_shared<RemoteBlockInputStream>(shard_info.pool, query, sample_block, new_context);
-    input->setPoolMode(PoolMode::GET_ONE);
+    RemoteQueryExecutor executor(shard_info.pool, query, sample_block, new_context);
+    executor.setPoolMode(PoolMode::GET_ONE);
     if (!table_func_ptr)
-        input->setMainTable(table_id);
-    input->readPrefix();
+        executor.setMainTable(table_id);
 
     const DataTypeFactory & data_type_factory = DataTypeFactory::instance();
 
     ParserExpression expr_parser;
 
-    while (Block current = input->read())
+    while (Block current = executor.read())
     {
         ColumnPtr name = current.getByName("name").column;
         ColumnPtr type = current.getByName("type").column;
@@ -111,6 +110,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
         }
     }
 
+    executor.finish();
     return res;
 }
 
diff --git a/src/Storages/registerStorages.cpp b/src/Storages/registerStorages.cpp
index 333f35774e2..51286af6697 100644
--- a/src/Storages/registerStorages.cpp
+++ b/src/Storages/registerStorages.cpp
@@ -1,10 +1,8 @@
 #include <Storages/registerStorages.h>
 #include <Storages/StorageFactory.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#    include "config_core.h"
-#endif
+#include <Common/config.h>
+#include "config_core.h"
 
 namespace DB
 {
@@ -27,6 +25,7 @@ void registerStorageView(StorageFactory & factory);
 void registerStorageMaterializedView(StorageFactory & factory);
 void registerStorageLiveView(StorageFactory & factory);
 void registerStorageGenerateRandom(StorageFactory & factory);
+void registerStorageExecutable(StorageFactory & factory);
 
 #if USE_AWS_S3
 void registerStorageS3(StorageFactory & factory);
@@ -67,6 +66,10 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory);
 void registerStorageExternalDistributed(StorageFactory & factory);
 #endif
 
+#if USE_FILELOG
+void registerStorageFileLog(StorageFactory & factory);
+#endif
+
 #if USE_SQLITE
 void registerStorageSQLite(StorageFactory & factory);
 #endif
@@ -94,6 +97,7 @@ void registerStorages()
     registerStorageMaterializedView(factory);
     registerStorageLiveView(factory);
     registerStorageGenerateRandom(factory);
+    registerStorageExecutable(factory);
 
     #if USE_AWS_S3
     registerStorageS3(factory);
@@ -117,7 +121,11 @@ void registerStorages()
     registerStorageKafka(factory);
     #endif
 
-    #if USE_AMQPCPP
+#if USE_FILELOG
+    registerStorageFileLog(factory);
+#endif
+
+#if USE_AMQPCPP
     registerStorageRabbitMQ(factory);
     #endif
 
diff --git a/src/Storages/tests/gtest_SplitTokenExtractor.cpp b/src/Storages/tests/gtest_SplitTokenExtractor.cpp
index ee6a55f50b8..62389639c11 100644
--- a/src/Storages/tests/gtest_SplitTokenExtractor.cpp
+++ b/src/Storages/tests/gtest_SplitTokenExtractor.cpp
@@ -61,12 +61,12 @@ TEST_P(SplitTokenExtractorTest, next)
     for (const auto & expected_token : param.tokens)
     {
         SCOPED_TRACE(++i);
-        ASSERT_TRUE(token_extractor.nextInColumn(data->data(), data->size(), &pos, &token_start, &token_len));
+        ASSERT_TRUE(token_extractor.nextInStringPadded(data->data(), data->size(), &pos, &token_start, &token_len));
 
         EXPECT_EQ(expected_token, std::string_view(data->data() + token_start, token_len))
                 << " token_start:" << token_start << " token_len: " << token_len;
     }
-    ASSERT_FALSE(token_extractor.nextInColumn(data->data(), data->size(), &pos, &token_start, &token_len))
+    ASSERT_FALSE(token_extractor.nextInStringPadded(data->data(), data->size(), &pos, &token_start, &token_len))
             << "\n\t=> \"" << param.source.substr(token_start, token_len) << "\""
             << "\n\t" << token_start << ", " << token_len << ", " << pos << ", " << data->size();
 }
diff --git a/src/Storages/tests/gtest_columns_description_normalize.cpp b/src/Storages/tests/gtest_columns_description_normalize.cpp
new file mode 100644
index 00000000000..d6c5aa8073b
--- /dev/null
+++ b/src/Storages/tests/gtest_columns_description_normalize.cpp
@@ -0,0 +1,25 @@
+#include <Storages/ColumnsDescription.h>
+#include <Common/tests/gtest_global_register.h>
+
+#include <gtest/gtest.h>
+
+using namespace DB;
+
+TEST(ColumnsDescription, Normalize)
+{
+    constexpr auto columns = "columns format version: 1\n"
+                             "3 columns:\n"
+                             "`a` UInt32\n"
+                             "`b` String\tDEFAULT\tIf(a = 0, 'true', 'false')\n"
+                             "`c` String\tDEFAULT\tcAsT(a, 'String')\n";
+
+    constexpr auto columns_normalized = "columns format version: 1\n"
+                                        "3 columns:\n"
+                                        "`a` UInt32\n"
+                                        "`b` String\tDEFAULT\tif(a = 0, 'true', 'false')\n"
+                                        "`c` String\tDEFAULT\tcast(a, 'String')\n";
+
+    tryRegisterFunctions();
+
+    ASSERT_EQ(ColumnsDescription::parse(columns), ColumnsDescription::parse(columns_normalized));
+}
diff --git a/src/Storages/tests/gtest_row_source_bits_test.cpp b/src/Storages/tests/gtest_row_source_bits_test.cpp
index a6d9179c106..c8ea48ff43c 100644
--- a/src/Storages/tests/gtest_row_source_bits_test.cpp
+++ b/src/Storages/tests/gtest_row_source_bits_test.cpp
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <DataStreams/ColumnGathererStream.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 using DB::RowSourcePart;
 
diff --git a/src/Storages/tests/gtest_storage_log.cpp b/src/Storages/tests/gtest_storage_log.cpp
index 16902eafc98..f86295cd06b 100644
--- a/src/Storages/tests/gtest_storage_log.cpp
+++ b/src/Storages/tests/gtest_storage_log.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 
 #include <Columns/ColumnsNumber.h>
-#include <DataStreams/PushingToSinkBlockOutputStream.h>
-#include <DataStreams/copyData.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Disks/tests/gtest_disk.h>
 #include <Formats/FormatFactory.h>
@@ -16,8 +14,12 @@
 #include <Common/tests/gtest_global_register.h>
 
 #include <memory>
-#include <Processors/Executors/PipelineExecutingBlockInputStream.h>
-#include <Processors/QueryPipeline.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/Sinks/SinkToStorage.h>
+#include <QueryPipeline/Chain.h>
+#include <QueryPipeline/QueryPipeline.h>
 
 #if !defined(__clang__)
 #    pragma GCC diagnostic push
@@ -100,9 +102,11 @@ std::string writeData(int rows, DB::StoragePtr & table, const DB::ContextPtr con
         block.insert(column);
     }
 
-    auto out = std::make_shared<PushingToSinkBlockOutputStream>(table->write({}, metadata_snapshot, context));
-    out->write(block);
-    out->writeSuffix();
+    QueryPipeline pipeline(table->write({}, metadata_snapshot, context));
+
+    PushingPipelineExecutor executor(pipeline);
+    executor.push(block);
+    executor.finish();
 
     return data;
 }
@@ -120,26 +124,29 @@ std::string readData(DB::StoragePtr & table, const DB::ContextPtr context)
     QueryProcessingStage::Enum stage = table->getQueryProcessingStage(
         context, QueryProcessingStage::Complete, metadata_snapshot, query_info);
 
-    QueryPipeline pipeline;
-    pipeline.init(table->read(column_names, metadata_snapshot, query_info, context, stage, 8192, 1));
-    BlockInputStreamPtr in = std::make_shared<PipelineExecutingBlockInputStream>(std::move(pipeline));
+    QueryPipeline pipeline(table->read(column_names, metadata_snapshot, query_info, context, stage, 8192, 1));
 
     Block sample;
     {
         ColumnWithTypeAndName col;
         col.type = std::make_shared<DataTypeUInt64>();
+        col.name = "a";
         sample.insert(std::move(col));
     }
 
     tryRegisterFormats();
 
     WriteBufferFromOwnString out_buf;
-    BlockOutputStreamPtr output = FormatFactory::instance().getOutputStream("Values", out_buf, sample, context);
+    auto output = FormatFactory::instance().getOutputFormat("Values", out_buf, sample, context);
+    pipeline.complete(output);
 
-    copyData(*in, *output);
+    Block data;
 
-    output->flush();
+    CompletedPipelineExecutor executor(pipeline);
+    executor.execute();
+    // output->flush();
 
+    out_buf.finalize();
     return out_buf.str();
 }
 
diff --git a/src/Storages/tests/gtest_transform_query_for_external_database.cpp b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
index 1d4cad576fa..ae9ec8745fd 100644
--- a/src/Storages/tests/gtest_transform_query_for_external_database.cpp
+++ b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -104,12 +104,12 @@ static void check(
     SelectQueryInfo query_info;
     SelectQueryOptions select_options;
     query_info.syntax_analyzer_result
-        = TreeRewriter(state.context).analyzeSelect(ast, state.getColumns(), select_options, state.getTables(table_num));
+        = TreeRewriter(state.context).analyzeSelect(ast, DB::TreeRewriterResult(state.getColumns()), select_options, state.getTables(table_num));
     query_info.query = ast;
     std::string transformed_query = transformQueryForExternalDatabase(
         query_info, state.getColumns(), IdentifierQuotingStyle::DoubleQuotes, "test", "table", state.context);
 
-    EXPECT_EQ(transformed_query, expected);
+    EXPECT_EQ(transformed_query, expected) << query;
 }
 
 
@@ -128,6 +128,18 @@ TEST(TransformQueryForExternalDatabase, InWithSingleElement)
           R"(SELECT "column" FROM "test"."table" WHERE "column" NOT IN ('hello', 'world'))");
 }
 
+TEST(TransformQueryForExternalDatabase, InWithMultipleColumns)
+{
+    const State & state = State::instance();
+
+    check(state, 1,
+          "SELECT column FROM test.table WHERE (1,1) IN ((1,1))",
+          R"(SELECT "column" FROM "test"."table" WHERE 1)");
+    check(state, 1,
+          "SELECT field, value FROM test.table WHERE (field, value) IN (('foo', 'bar'))",
+          R"(SELECT "field", "value" FROM "test"."table" WHERE ("field", "value") IN (('foo', 'bar')))");
+}
+
 TEST(TransformQueryForExternalDatabase, InWithTable)
 {
     const State & state = State::instance();
@@ -207,3 +219,52 @@ TEST(TransformQueryForExternalDatabase, ForeignColumnInWhere)
           "WHERE column > 2 AND (apply_id = 1 OR table2.num = 1) AND table2.attr != ''",
           R"(SELECT "column", "apply_id" FROM "test"."table" WHERE ("column" > 2) AND ("apply_id" = 1))");
 }
+
+TEST(TransformQueryForExternalDatabase, NoStrict)
+{
+    const State & state = State::instance();
+
+    check(state, 1,
+          "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)",
+          R"(SELECT "field" FROM "test"."table")");
+}
+
+TEST(TransformQueryForExternalDatabase, Strict)
+{
+    const State & state = State::instance();
+    state.context->setSetting("external_table_strict_query", true);
+
+    check(state, 1,
+          "SELECT field FROM table WHERE field = '1'",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" = '1')");
+    check(state, 1,
+          "SELECT field FROM table WHERE field IN ('1', '2')",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" IN ('1', '2'))");
+    check(state, 1,
+          "SELECT field FROM table WHERE field LIKE '%test%'",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" LIKE '%test%')");
+
+    /// removeUnknownSubexpressionsFromWhere() takes place
+    EXPECT_THROW(check(state, 1, "SELECT field FROM table WHERE field IN (SELECT attr FROM table2)", ""), Exception);
+    /// !isCompatible() takes place
+    EXPECT_THROW(check(state, 1, "SELECT column FROM test.table WHERE left(column, 10) = RIGHT(column, 10) AND SUBSTRING(column FROM 1 FOR 2) = 'Hello'", ""), Exception);
+}
+
+TEST(TransformQueryForExternalDatabase, Null)
+{
+    const State & state = State::instance();
+
+    check(state, 1,
+          "SELECT field FROM table WHERE field IS NULL",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" IS NULL)");
+    check(state, 1,
+          "SELECT field FROM table WHERE field IS NOT NULL",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" IS NOT NULL)");
+
+    check(state, 1,
+          "SELECT field FROM table WHERE isNull(field)",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" IS NULL)");
+    check(state, 1,
+          "SELECT field FROM table WHERE isNotNull(field)",
+          R"(SELECT "field" FROM "test"."table" WHERE "field" IS NOT NULL)");
+}
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 4e299c5a357..4d6c1787a34 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -9,6 +9,7 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/InDepthNodeVisitor.h>
+#include <Interpreters/Context.h>
 #include <IO/WriteBufferFromString.h>
 #include <Storages/transformQueryForExternalDatabase.h>
 #include <Storages/MergeTree/KeyCondition.h>
@@ -20,6 +21,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int INCORRECT_QUERY;
 }
 
 namespace
@@ -105,9 +107,9 @@ void dropAliases(ASTPtr & node)
 }
 
 
-bool isCompatible(const IAST & node)
+bool isCompatible(IAST & node)
 {
-    if (const auto * function = node.as<ASTFunction>())
+    if (auto * function = node.as<ASTFunction>())
     {
         if (function->parameters)   /// Parametric aggregate functions
             return false;
@@ -130,13 +132,21 @@ bool isCompatible(const IAST & node)
             || name == "notLike"
             || name == "in"
             || name == "notIn"
+            || name == "isNull"
+            || name == "isNotNull"
             || name == "tuple"))
             return false;
 
         /// A tuple with zero or one elements is represented by a function tuple(x) and is not compatible,
         /// but a normal tuple with more than one element is represented as a parenthesized expression (x, y) and is perfectly compatible.
-        if (name == "tuple" && function->arguments->children.size() <= 1)
-            return false;
+        /// So to support tuple with zero or one elements we can clear function name to get (x) instead of tuple(x)
+        if (name == "tuple")
+        {
+            if (function->arguments->children.size() <= 1)
+            {
+                function->name.clear();
+            }
+        }
 
         /// If the right hand side of IN is a table identifier (example: x IN table), then it's not compatible.
         if ((name == "in" || name == "notIn")
@@ -242,6 +252,7 @@ String transformQueryForExternalDatabase(
 {
     auto clone_query = query_info.query->clone();
     const Names used_columns = query_info.syntax_analyzer_result->requiredSourceColumns();
+    bool strict = context->getSettingsRef().external_table_strict_query;
 
     auto select = std::make_shared<ASTSelectQuery>();
 
@@ -269,6 +280,10 @@ String transformQueryForExternalDatabase(
         {
             select->setExpression(ASTSelectQuery::Expression::WHERE, std::move(original_where));
         }
+        else if (strict)
+        {
+            throw Exception("Query contains non-compatible expressions (and external_table_strict_query=true)", ErrorCodes::INCORRECT_QUERY);
+        }
         else if (const auto * function = original_where->as<ASTFunction>())
         {
             if (function->name == "and")
@@ -286,6 +301,10 @@ String transformQueryForExternalDatabase(
             }
         }
     }
+    else if (strict && original_where)
+    {
+        throw Exception("Query contains non-compatible expressions (and external_table_strict_query=true)", ErrorCodes::INCORRECT_QUERY);
+    }
 
     ASTPtr select_ptr = select;
     dropAliases(select_ptr);
diff --git a/src/Storages/transformQueryForExternalDatabase.h b/src/Storages/transformQueryForExternalDatabase.h
index 215afab8b30..3756dd97feb 100644
--- a/src/Storages/transformQueryForExternalDatabase.h
+++ b/src/Storages/transformQueryForExternalDatabase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/types.h>
+#include <base/types.h>
 #include <Core/NamesAndTypes.h>
 #include <Parsers/IdentifierQuotingStyle.h>
 #include <Storages/SelectQueryInfo.h>
@@ -22,6 +22,9 @@ class IAST;
   * that contain only compatible expressions.
   *
   * Compatible expressions are comparisons of identifiers, constants, and logical operations on them.
+  *
+  * Throws INCORRECT_QUERY if external_table_strict_query (from context settings)
+  * is set and some expression from WHERE is not compatible.
   */
 String transformQueryForExternalDatabase(
     const SelectQueryInfo & query_info,
diff --git a/src/Storages/ya.make b/src/Storages/ya.make
deleted file mode 100644
index 476449e8e6c..00000000000
--- a/src/Storages/ya.make
+++ /dev/null
@@ -1,228 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/libs/poco/MongoDB
-)
-
-
-SRCS(
-    AlterCommands.cpp
-    ColumnDefault.cpp
-    ColumnsDescription.cpp
-    ConstraintsDescription.cpp
-    Distributed/DirectoryMonitor.cpp
-    Distributed/DistributedSettings.cpp
-    Distributed/DistributedSink.cpp
-    IStorage.cpp
-    IndicesDescription.cpp
-    JoinSettings.cpp
-    KeyDescription.cpp
-    LiveView/StorageLiveView.cpp
-    LiveView/TemporaryLiveViewCleaner.cpp
-    MemorySettings.cpp
-    MergeTree/ActiveDataPartSet.cpp
-    MergeTree/AllMergeSelector.cpp
-    MergeTree/BackgroundJobsExecutor.cpp
-    MergeTree/BoolMask.cpp
-    MergeTree/DataPartsExchange.cpp
-    MergeTree/DropPartsRanges.cpp
-    MergeTree/EphemeralLockInZooKeeper.cpp
-    MergeTree/IMergeTreeDataPart.cpp
-    MergeTree/IMergeTreeDataPartWriter.cpp
-    MergeTree/IMergeTreeReader.cpp
-    MergeTree/IMergedBlockOutputStream.cpp
-    MergeTree/KeyCondition.cpp
-    MergeTree/LevelMergeSelector.cpp
-    MergeTree/MergeAlgorithm.cpp
-    MergeTree/MergeList.cpp
-    MergeTree/MergeTreeBaseSelectProcessor.cpp
-    MergeTree/MergeTreeBlockReadUtils.cpp
-    MergeTree/MergeTreeData.cpp
-    MergeTree/MergeTreeDataMergerMutator.cpp
-    MergeTree/MergeTreeDataPartChecksum.cpp
-    MergeTree/MergeTreeDataPartCompact.cpp
-    MergeTree/MergeTreeDataPartInMemory.cpp
-    MergeTree/MergeTreeDataPartTTLInfo.cpp
-    MergeTree/MergeTreeDataPartType.cpp
-    MergeTree/MergeTreeDataPartUUID.cpp
-    MergeTree/MergeTreeDataPartWide.cpp
-    MergeTree/MergeTreeDataPartWriterCompact.cpp
-    MergeTree/MergeTreeDataPartWriterInMemory.cpp
-    MergeTree/MergeTreeDataPartWriterOnDisk.cpp
-    MergeTree/MergeTreeDataPartWriterWide.cpp
-    MergeTree/MergeTreeDataSelectExecutor.cpp
-    MergeTree/MergeTreeDataWriter.cpp
-    MergeTree/MergeTreeDeduplicationLog.cpp
-    MergeTree/MergeTreeInOrderSelectProcessor.cpp
-    MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
-    MergeTree/MergeTreeIndexBloomFilter.cpp
-    MergeTree/MergeTreeIndexConditionBloomFilter.cpp
-    MergeTree/MergeTreeIndexFullText.cpp
-    MergeTree/MergeTreeIndexGranularity.cpp
-    MergeTree/MergeTreeIndexGranularityInfo.cpp
-    MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
-    MergeTree/MergeTreeIndexMinMax.cpp
-    MergeTree/MergeTreeIndexReader.cpp
-    MergeTree/MergeTreeIndexSet.cpp
-    MergeTree/MergeTreeIndices.cpp
-    MergeTree/MergeTreeMarksLoader.cpp
-    MergeTree/MergeTreeMutationEntry.cpp
-    MergeTree/MergeTreeMutationStatus.cpp
-    MergeTree/MergeTreePartInfo.cpp
-    MergeTree/MergeTreePartition.cpp
-    MergeTree/MergeTreePartsMover.cpp
-    MergeTree/MergeTreeProjections.cpp
-    MergeTree/MergeTreeRangeReader.cpp
-    MergeTree/MergeTreeReadPool.cpp
-    MergeTree/MergeTreeReaderCompact.cpp
-    MergeTree/MergeTreeReaderInMemory.cpp
-    MergeTree/MergeTreeReaderStream.cpp
-    MergeTree/MergeTreeReaderWide.cpp
-    MergeTree/MergeTreeReverseSelectProcessor.cpp
-    MergeTree/MergeTreeSelectProcessor.cpp
-    MergeTree/MergeTreeSequentialSource.cpp
-    MergeTree/MergeTreeSettings.cpp
-    MergeTree/MergeTreeSink.cpp
-    MergeTree/MergeTreeThreadSelectProcessor.cpp
-    MergeTree/MergeTreeWhereOptimizer.cpp
-    MergeTree/MergeTreeWriteAheadLog.cpp
-    MergeTree/MergeType.cpp
-    MergeTree/MergedBlockOutputStream.cpp
-    MergeTree/MergedColumnOnlyOutputStream.cpp
-    MergeTree/PartMovesBetweenShardsOrchestrator.cpp
-    MergeTree/PartitionPruner.cpp
-    MergeTree/PinnedPartUUIDs.cpp
-    MergeTree/ReplicatedFetchList.cpp
-    MergeTree/ReplicatedMergeTreeAddress.cpp
-    MergeTree/ReplicatedMergeTreeAltersSequence.cpp
-    MergeTree/ReplicatedMergeTreeCleanupThread.cpp
-    MergeTree/ReplicatedMergeTreeLogEntry.cpp
-    MergeTree/ReplicatedMergeTreeMergeStrategyPicker.cpp
-    MergeTree/ReplicatedMergeTreeMutationEntry.cpp
-    MergeTree/ReplicatedMergeTreePartCheckThread.cpp
-    MergeTree/ReplicatedMergeTreePartHeader.cpp
-    MergeTree/ReplicatedMergeTreeQueue.cpp
-    MergeTree/ReplicatedMergeTreeRestartingThread.cpp
-    MergeTree/ReplicatedMergeTreeSink.cpp
-    MergeTree/ReplicatedMergeTreeTableMetadata.cpp
-    MergeTree/SimpleMergeSelector.cpp
-    MergeTree/TTLMergeSelector.cpp
-    MergeTree/checkDataPart.cpp
-    MergeTree/localBackup.cpp
-    MergeTree/registerStorageMergeTree.cpp
-    MutationCommands.cpp
-    MySQL/MySQLSettings.cpp
-    PartitionCommands.cpp
-    ProjectionsDescription.cpp
-    ReadFinalForExternalReplicaStorage.cpp
-    ReadInOrderOptimizer.cpp
-    SelectQueryDescription.cpp
-    SetSettings.cpp
-    StorageBuffer.cpp
-    StorageDictionary.cpp
-    StorageDistributed.cpp
-    StorageExternalDistributed.cpp
-    StorageFactory.cpp
-    StorageFile.cpp
-    StorageGenerateRandom.cpp
-    StorageInMemoryMetadata.cpp
-    StorageInput.cpp
-    StorageJoin.cpp
-    StorageLog.cpp
-    StorageLogSettings.cpp
-    StorageMaterializedMySQL.cpp
-    StorageMaterializedView.cpp
-    StorageMemory.cpp
-    StorageMerge.cpp
-    StorageMergeTree.cpp
-    StorageMongoDB.cpp
-    StorageMySQL.cpp
-    StorageNull.cpp
-    StorageReplicatedMergeTree.cpp
-    StorageSQLite.cpp
-    StorageSet.cpp
-    StorageStripeLog.cpp
-    StorageTinyLog.cpp
-    StorageURL.cpp
-    StorageValues.cpp
-    StorageView.cpp
-    StorageXDBC.cpp
-    System/StorageSystemAggregateFunctionCombinators.cpp
-    System/StorageSystemAsynchronousMetrics.cpp
-    System/StorageSystemBuildOptions.cpp
-    System/StorageSystemClusters.cpp
-    System/StorageSystemCollations.cpp
-    System/StorageSystemColumns.cpp
-    System/StorageSystemContributors.cpp
-    System/StorageSystemContributors.generated.cpp
-    System/StorageSystemCurrentRoles.cpp
-    System/StorageSystemDDLWorkerQueue.cpp
-    System/StorageSystemDataSkippingIndices.cpp
-    System/StorageSystemDataTypeFamilies.cpp
-    System/StorageSystemDatabases.cpp
-    System/StorageSystemDetachedParts.cpp
-    System/StorageSystemDictionaries.cpp
-    System/StorageSystemDisks.cpp
-    System/StorageSystemDistributionQueue.cpp
-    System/StorageSystemEnabledRoles.cpp
-    System/StorageSystemErrors.cpp
-    System/StorageSystemEvents.cpp
-    System/StorageSystemFormats.cpp
-    System/StorageSystemFunctions.cpp
-    System/StorageSystemGrants.cpp
-    System/StorageSystemGraphite.cpp
-    System/StorageSystemMacros.cpp
-    System/StorageSystemMergeTreeSettings.cpp
-    System/StorageSystemMerges.cpp
-    System/StorageSystemMetrics.cpp
-    System/StorageSystemModels.cpp
-    System/StorageSystemMutations.cpp
-    System/StorageSystemNumbers.cpp
-    System/StorageSystemOne.cpp
-    System/StorageSystemPartMovesBetweenShards.cpp
-    System/StorageSystemParts.cpp
-    System/StorageSystemPartsBase.cpp
-    System/StorageSystemPartsColumns.cpp
-    System/StorageSystemPrivileges.cpp
-    System/StorageSystemProcesses.cpp
-    System/StorageSystemProjectionParts.cpp
-    System/StorageSystemProjectionPartsColumns.cpp
-    System/StorageSystemQuotaLimits.cpp
-    System/StorageSystemQuotaUsage.cpp
-    System/StorageSystemQuotas.cpp
-    System/StorageSystemQuotasUsage.cpp
-    System/StorageSystemReplicas.cpp
-    System/StorageSystemReplicatedFetches.cpp
-    System/StorageSystemReplicationQueue.cpp
-    System/StorageSystemRoleGrants.cpp
-    System/StorageSystemRoles.cpp
-    System/StorageSystemRowPolicies.cpp
-    System/StorageSystemSettings.cpp
-    System/StorageSystemSettingsProfileElements.cpp
-    System/StorageSystemSettingsProfiles.cpp
-    System/StorageSystemStackTrace.cpp
-    System/StorageSystemStoragePolicies.cpp
-    System/StorageSystemTableEngines.cpp
-    System/StorageSystemTableFunctions.cpp
-    System/StorageSystemTables.cpp
-    System/StorageSystemUserDirectories.cpp
-    System/StorageSystemUsers.cpp
-    System/StorageSystemWarnings.cpp
-    System/StorageSystemZeros.cpp
-    System/StorageSystemZooKeeper.cpp
-    System/attachSystemTables.cpp
-    TTLDescription.cpp
-    VirtualColumnUtils.cpp
-    extractKeyExpressionList.cpp
-    getStructureOfRemoteTable.cpp
-    registerStorages.cpp
-    transformQueryForExternalDatabase.cpp
-
-)
-
-END()
diff --git a/src/Storages/ya.make.in b/src/Storages/ya.make.in
deleted file mode 100644
index f7efe5870d3..00000000000
--- a/src/Storages/ya.make.in
+++ /dev/null
@@ -1,16 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-    contrib/libs/sparsehash
-    contrib/libs/poco/MongoDB
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -F tests | grep -v -F examples | grep -v -P 'Kafka|RabbitMQ|S3|HDFS|Licenses|TimeZones|RocksDB|PostgreSQL' | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/TableFunctions/ITableFunctionFileLike.cpp b/src/TableFunctions/ITableFunctionFileLike.cpp
index 1b96a0fe713..699ad698bd8 100644
--- a/src/TableFunctions/ITableFunctionFileLike.cpp
+++ b/src/TableFunctions/ITableFunctionFileLike.cpp
@@ -14,8 +14,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
 
-#include <DataStreams/IBlockInputStream.h>
-
+#include <Processors/ISource.h>
 
 namespace DB
 {
@@ -85,8 +84,8 @@ ColumnsDescription ITableFunctionFileLike::getActualTableStructure(ContextPtr co
         Strings paths = StorageFile::getPathsList(filename, context->getUserFilesPath(), context, total_bytes_to_read);
         if (paths.empty())
             throw Exception("Cannot get table structure from file, because no files match specified name", ErrorCodes::INCORRECT_FILE_NAME);
-        auto read_stream = StorageDistributedDirectoryMonitor::createSourceFromFile(paths[0]);
-        return ColumnsDescription{read_stream->getOutputs().front().getHeader().getNamesAndTypesList()};
+        auto source = StorageDistributedDirectoryMonitor::createSourceFromFile(paths[0]);
+        return ColumnsDescription{source->getOutputs().front().getHeader().getNamesAndTypesList()};
     }
     return parseColumnsListFromString(structure, context);
 }
diff --git a/src/TableFunctions/ITableFunctionFileLike.h b/src/TableFunctions/ITableFunctionFileLike.h
index 7c96ce610b3..2069f02b0dd 100644
--- a/src/TableFunctions/ITableFunctionFileLike.h
+++ b/src/TableFunctions/ITableFunctionFileLike.h
@@ -12,6 +12,15 @@ class Context;
  */
 class ITableFunctionFileLike : public ITableFunction
 {
+
+protected:
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
+    String filename;
+    String format;
+    String structure;
+    String compression_method = "auto";
+
 private:
     StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
 
@@ -21,13 +30,6 @@ private:
 
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
 
-    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
-
     bool hasStaticStructure() const override { return true; }
-
-    String filename;
-    String format;
-    String structure;
-    String compression_method = "auto";
 };
 }
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index 58d71229b04..d5ad2b73552 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -1,5 +1,5 @@
 #include <type_traits>
-#include <common/scope_guard.h>
+#include <base/scope_guard.h>
 
 #include <Core/Defines.h>
 #include <DataTypes/DataTypeFactory.h>
diff --git a/src/TableFunctions/ITableFunctionXDBC.h b/src/TableFunctions/ITableFunctionXDBC.h
index 4f6656773b1..ddeaeaa9b10 100644
--- a/src/TableFunctions/ITableFunctionXDBC.h
+++ b/src/TableFunctions/ITableFunctionXDBC.h
@@ -5,9 +5,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Bridge/XDBCBridgeHelper.h>
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#endif
+#include <Common/config.h>
 
 namespace DB
 {
diff --git a/src/TableFunctions/TableFunctionDictionary.h b/src/TableFunctions/TableFunctionDictionary.h
index aed435bebfd..cc184a32a17 100644
--- a/src/TableFunctions/TableFunctionDictionary.h
+++ b/src/TableFunctions/TableFunctionDictionary.h
@@ -6,11 +6,7 @@ namespace DB
 {
 class Context;
 
-/* file(path, format, structure) - creates a temporary storage from file
- *
- * The file must be in the clickhouse data directory.
- * The relative path begins with the clickhouse data directory.
- */
+/// dictionary(dictionary_name) - creates a temporary storage from dictionary
 class TableFunctionDictionary final : public ITableFunction
 {
 public:
diff --git a/src/TableFunctions/TableFunctionExecutable.cpp b/src/TableFunctions/TableFunctionExecutable.cpp
new file mode 100644
index 00000000000..7b40e3d09d0
--- /dev/null
+++ b/src/TableFunctions/TableFunctionExecutable.cpp
@@ -0,0 +1,87 @@
+#include <TableFunctions/TableFunctionExecutable.h>
+
+#include <Common/Exception.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/parseColumnsListForTableFunction.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Storages/StorageExecutable.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/interpretSubquery.h>
+#include <boost/algorithm/string.hpp>
+#include "registerTableFunctions.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int UNSUPPORTED_METHOD;
+}
+
+void TableFunctionExecutable::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    const auto * function = ast_function->as<ASTFunction>();
+
+    if (!function->arguments)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Table function '{}' must have arguments",
+            getName());
+
+    auto args = function->arguments->children;
+
+    if (args.size() < 3)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "Table function '{}' requires minimum 3 arguments: script_name, format, structure, [input_query...]",
+            getName());
+
+    for (size_t i = 0; i <= 2; ++i)
+        args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(args[i], context);
+
+    auto scipt_name_with_arguments_value = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+
+    std::vector<String> script_name_with_arguments;
+    boost::split(script_name_with_arguments, scipt_name_with_arguments_value, [](char c){ return c == ' '; });
+
+    script_name = script_name_with_arguments[0];
+    script_name_with_arguments.erase(script_name_with_arguments.begin());
+    arguments = std::move(script_name_with_arguments);
+    format = args[1]->as<ASTLiteral &>().value.safeGet<String>();
+    structure = args[2]->as<ASTLiteral &>().value.safeGet<String>();
+
+    for (size_t i = 3; i < args.size(); ++i)
+    {
+        ASTPtr query = args[i]->children.at(0);
+        if (!query->as<ASTSelectWithUnionQuery>())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Table function '{}' argument is invalid input query {}",
+                getName(),
+                query->formatForErrorMessage());
+
+        input_queries.emplace_back(std::move(query));
+    }
+}
+
+ColumnsDescription TableFunctionExecutable::getActualTableStructure(ContextPtr context) const
+{
+    return parseColumnsListFromString(structure, context);
+}
+
+StoragePtr TableFunctionExecutable::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
+{
+    auto storage_id = StorageID(getDatabaseName(), table_name);
+    auto storage = StorageExecutable::create(storage_id, script_name, arguments, format, input_queries, getActualTableStructure(context), ConstraintsDescription{});
+    storage->startup();
+    return storage;
+}
+
+void registerTableFunctionExecutable(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionExecutable>();
+}
+
+}
diff --git a/src/TableFunctions/TableFunctionExecutable.h b/src/TableFunctions/TableFunctionExecutable.h
new file mode 100644
index 00000000000..128ee8e46fc
--- /dev/null
+++ b/src/TableFunctions/TableFunctionExecutable.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <TableFunctions/ITableFunction.h>
+
+namespace DB
+{
+
+class Context;
+
+/* executable(script_name_optional_arguments, format, structure, input_query) - creates a temporary storage from executable file
+ *
+ *
+ * The file must be in the clickhouse data directory.
+ * The relative path begins with the clickhouse data directory.
+ */
+class TableFunctionExecutable : public ITableFunction
+{
+public:
+    static constexpr auto name = "executable";
+    std::string getName() const override { return name; }
+    bool hasStaticStructure() const override { return true; }
+
+private:
+    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const override;
+    const char * getStorageTypeName() const override { return "Executable"; }
+
+    ColumnsDescription getActualTableStructure(ContextPtr context) const override;
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
+    String script_name;
+    std::vector<String> arguments;
+    String format;
+    String structure;
+    std::vector<ASTPtr> input_queries;
+};
+}
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index f732e160751..dcb91c8cc2e 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -2,7 +2,6 @@
 
 #include "registerTableFunctions.h"
 #include <Access/AccessFlags.h>
-#include <Formats/FormatFactory.h>
 #include <Interpreters/Context.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageFile.h>
diff --git a/src/TableFunctions/TableFunctionMerge.cpp b/src/TableFunctions/TableFunctionMerge.cpp
index 81dde4a12a4..f1ef4262d08 100644
--- a/src/TableFunctions/TableFunctionMerge.cpp
+++ b/src/TableFunctions/TableFunctionMerge.cpp
@@ -52,7 +52,7 @@ void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, ContextPtr
             " - name of source database and regexp for table names.",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-    auto [is_regexp, database_ast] = evaluateDatabaseNameForMergeEngine(args[0], context);
+    auto [is_regexp, database_ast] = StorageMerge::evaluateDatabaseName(args[0], context);
 
     database_is_regexp = is_regexp;
 
@@ -65,7 +65,7 @@ void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, ContextPtr
 }
 
 
-const TableFunctionMerge::DbToTableSetMap & TableFunctionMerge::getSourceDatabasesAndTables(ContextPtr context) const
+const TableFunctionMerge::DBToTableSetMap & TableFunctionMerge::getSourceDatabasesAndTables(ContextPtr context) const
 {
     if (source_databases_and_tables)
         return *source_databases_and_tables;
@@ -88,17 +88,10 @@ const TableFunctionMerge::DbToTableSetMap & TableFunctionMerge::getSourceDatabas
         auto databases = DatabaseCatalog::instance().getDatabases();
 
         for (const auto & db : databases)
-        {
             if (database_re.match(db.first))
-            {
-                auto source_tables = getMatchedTablesWithAccess(db.first, source_table_regexp, context);
+                (*source_databases_and_tables)[db.first] = getMatchedTablesWithAccess(db.first, source_table_regexp, context);
 
-                if (!source_tables.empty())
-                    (*source_databases_and_tables)[db.first] = source_tables;
-            }
-        }
-
-        if ((*source_databases_and_tables).empty())
+        if (source_databases_and_tables->empty())
             throwNoTablesMatchRegexp(source_database_name_or_regexp, source_table_regexp);
     }
 
diff --git a/src/TableFunctions/TableFunctionMerge.h b/src/TableFunctions/TableFunctionMerge.h
index 73b61f8eb79..10221c8c72c 100644
--- a/src/TableFunctions/TableFunctionMerge.h
+++ b/src/TableFunctions/TableFunctionMerge.h
@@ -21,8 +21,8 @@ private:
     const char * getStorageTypeName() const override { return "Merge"; }
 
     using TableSet = std::set<String>;
-    using DbToTableSetMap = std::map<String, TableSet>;
-    const DbToTableSetMap & getSourceDatabasesAndTables(ContextPtr context) const;
+    using DBToTableSetMap = std::map<String, TableSet>;
+    const DBToTableSetMap & getSourceDatabasesAndTables(ContextPtr context) const;
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
     static TableSet getMatchedTablesWithAccess(const String & database_name, const String & table_regexp, const ContextPtr & context);
@@ -30,7 +30,7 @@ private:
     String source_database_name_or_regexp;
     String source_table_regexp;
     bool database_is_regexp = false;
-    mutable std::optional<DbToTableSetMap> source_databases_and_tables;
+    mutable std::optional<DBToTableSetMap> source_databases_and_tables;
 };
 
 
diff --git a/src/TableFunctions/TableFunctionMySQL.cpp b/src/TableFunctions/TableFunctionMySQL.cpp
index f8e0c41634b..b7c6ee8803e 100644
--- a/src/TableFunctions/TableFunctionMySQL.cpp
+++ b/src/TableFunctions/TableFunctionMySQL.cpp
@@ -1,6 +1,4 @@
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_MYSQL
 #include <Core/Defines.h>
@@ -8,7 +6,7 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/convertMySQLDataType.h>
-#include <Formats/MySQLBlockInputStream.h>
+#include <Processors/Sources/MySQLSource.h>
 #include <IO/Operators.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
@@ -34,8 +32,6 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int BAD_ARGUMENTS;
     extern const int UNKNOWN_TABLE;
 }
 
@@ -46,46 +42,19 @@ void TableFunctionMySQL::parseArguments(const ASTPtr & ast_function, ContextPtr
     if (!args_func.arguments)
         throw Exception("Table function 'mysql' must have arguments.", ErrorCodes::LOGICAL_ERROR);
 
-    ASTs & args = args_func.arguments->children;
-
-    if (args.size() < 5 || args.size() > 7)
-        throw Exception("Table function 'mysql' requires 5-7 parameters: MySQL('host:port', database, table, 'user', 'password'[, replace_query, 'on_duplicate_clause']).",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    String host_port = args[0]->as<ASTLiteral &>().value.safeGet<String>();
-    remote_database_name = args[1]->as<ASTLiteral &>().value.safeGet<String>();
-    remote_table_name = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-    user_name = args[3]->as<ASTLiteral &>().value.safeGet<String>();
-    password = args[4]->as<ASTLiteral &>().value.safeGet<String>();
-
-    /// Split into replicas if needed. 3306 is the default MySQL port number
-    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-    auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 3306);
-    pool.emplace(remote_database_name, addresses, user_name, password);
-
-    if (args.size() >= 6)
-        replace_query = args[5]->as<ASTLiteral &>().value.safeGet<UInt64>() > 0;
-    if (args.size() == 7)
-        on_duplicate_clause = args[6]->as<ASTLiteral &>().value.safeGet<String>();
-
-    if (replace_query && !on_duplicate_clause.empty())
-        throw Exception(
-            "Only one of 'replace_query' and 'on_duplicate_clause' can be specified, or none of them",
-            ErrorCodes::BAD_ARGUMENTS);
+    configuration = StorageMySQL::getConfiguration(args_func.arguments->children, context);
+    pool.emplace(configuration->database, configuration->addresses, configuration->username, configuration->password);
 }
 
 ColumnsDescription TableFunctionMySQL::getActualTableStructure(ContextPtr context) const
 {
     const auto & settings = context->getSettingsRef();
-    const auto tables_and_columns = fetchTablesColumnsList(*pool, remote_database_name, {remote_table_name}, settings, settings.mysql_datatypes_support_level);
+    const auto tables_and_columns = fetchTablesColumnsList(*pool, configuration->database, {configuration->table}, settings, settings.mysql_datatypes_support_level);
 
-    const auto columns = tables_and_columns.find(remote_table_name);
+    const auto columns = tables_and_columns.find(configuration->table);
     if (columns == tables_and_columns.end())
-        throw Exception("MySQL table " + (remote_database_name.empty() ? "" : (backQuote(remote_database_name) + "."))
-            + backQuote(remote_table_name) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
+        throw Exception("MySQL table " + (configuration->database.empty() ? "" : (backQuote(configuration->database) + "."))
+            + backQuote(configuration->table) + " doesn't exist.", ErrorCodes::UNKNOWN_TABLE);
 
     return columns->second;
 }
@@ -101,10 +70,10 @@ StoragePtr TableFunctionMySQL::executeImpl(
     auto res = StorageMySQL::create(
         StorageID(getDatabaseName(), table_name),
         std::move(*pool),
-        remote_database_name,
-        remote_table_name,
-        replace_query,
-        on_duplicate_clause,
+        configuration->database,
+        configuration->table,
+        configuration->replace_query,
+        configuration->on_duplicate_clause,
         columns,
         ConstraintsDescription{},
         String{},
diff --git a/src/TableFunctions/TableFunctionMySQL.h b/src/TableFunctions/TableFunctionMySQL.h
index 64c7d56cf2a..876dd43f598 100644
--- a/src/TableFunctions/TableFunctionMySQL.h
+++ b/src/TableFunctions/TableFunctionMySQL.h
@@ -1,10 +1,9 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
-#    include "config_core.h"
-#endif
+#include "config_core.h"
 
 #if USE_MYSQL
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <mysqlxx/Pool.h>
 
 
@@ -30,14 +29,8 @@ private:
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    String remote_database_name;
-    String remote_table_name;
-    String user_name;
-    String password;
-    bool replace_query = false;
-    String on_duplicate_clause;
-
     mutable std::optional<mysqlxx::PoolWithFailover> pool;
+    std::optional<StorageMySQLConfiguration> configuration;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionNumbers.h b/src/TableFunctions/TableFunctionNumbers.h
index 6cee752390e..0a2f3eb863e 100644
--- a/src/TableFunctions/TableFunctionNumbers.h
+++ b/src/TableFunctions/TableFunctionNumbers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <TableFunctions/ITableFunction.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.cpp b/src/TableFunctions/TableFunctionPostgreSQL.cpp
index ceea29b335b..d929c62237c 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.cpp
+++ b/src/TableFunctions/TableFunctionPostgreSQL.cpp
@@ -21,7 +21,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int BAD_ARGUMENTS;
 }
 
@@ -33,12 +32,12 @@ StoragePtr TableFunctionPostgreSQL::executeImpl(const ASTPtr & /*ast_function*/,
     auto result = std::make_shared<StoragePostgreSQL>(
         StorageID(getDatabaseName(), table_name),
         connection_pool,
-        remote_table_name,
+        configuration->table,
         columns,
         ConstraintsDescription{},
         String{},
-        context,
-        remote_table_schema);
+        configuration->schema,
+        configuration->on_conflict);
 
     result->startup();
     return result;
@@ -50,11 +49,10 @@ ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr c
     const bool use_nulls = context->getSettingsRef().external_table_functions_use_nulls;
     auto connection_holder = connection_pool->get();
     auto columns = fetchPostgreSQLTableStructure(
-            connection_holder->get(),
-            remote_table_schema.empty() ? doubleQuoteString(remote_table_name)
-                                        : doubleQuoteString(remote_table_schema) + '.' + doubleQuoteString(remote_table_name),
-            use_nulls).columns;
+            connection_holder->get(), configuration->table, configuration->schema, use_nulls).columns;
 
+    if (!columns)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table structure not returned");
     return ColumnsDescription{*columns};
 }
 
@@ -62,35 +60,13 @@ ColumnsDescription TableFunctionPostgreSQL::getActualTableStructure(ContextPtr c
 void TableFunctionPostgreSQL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto & func_args = ast_function->as<ASTFunction &>();
-
     if (!func_args.arguments)
         throw Exception("Table function 'PostgreSQL' must have arguments.", ErrorCodes::BAD_ARGUMENTS);
 
-    ASTs & args = func_args.arguments->children;
-
-    if (args.size() < 5 || args.size() > 6)
-        throw Exception("Table function 'PostgreSQL' requires from 5 to 6 parameters: "
-                        "PostgreSQL('host:port', 'database', 'table', 'user', 'password', [, 'schema']).",
-            ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    /// Split into replicas if needed. 5432 is a default postgresql port.
-    const auto & host_port = args[0]->as<ASTLiteral &>().value.safeGet<String>();
-    size_t max_addresses = context->getSettingsRef().glob_expansion_max_elements;
-    auto addresses = parseRemoteDescriptionForExternalDatabase(host_port, max_addresses, 5432);
-
-    remote_table_name = args[2]->as<ASTLiteral &>().value.safeGet<String>();
-
-    if (args.size() == 6)
-        remote_table_schema = args[5]->as<ASTLiteral &>().value.safeGet<String>();
-
-    connection_pool = std::make_shared<postgres::PoolWithFailover>(
-        args[1]->as<ASTLiteral &>().value.safeGet<String>(),
-        addresses,
-        args[3]->as<ASTLiteral &>().value.safeGet<String>(),
-        args[4]->as<ASTLiteral &>().value.safeGet<String>());
+    configuration.emplace(StoragePostgreSQL::getConfiguration(func_args.arguments->children, context));
+    connection_pool = std::make_shared<postgres::PoolWithFailover>(*configuration,
+        context->getSettingsRef().postgresql_connection_pool_size,
+        context->getSettingsRef().postgresql_connection_pool_wait_timeout);
 }
 
 
diff --git a/src/TableFunctions/TableFunctionPostgreSQL.h b/src/TableFunctions/TableFunctionPostgreSQL.h
index c31d02fa955..7b33998a967 100644
--- a/src/TableFunctions/TableFunctionPostgreSQL.h
+++ b/src/TableFunctions/TableFunctionPostgreSQL.h
@@ -1,11 +1,10 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_LIBPQXX
 #include <TableFunctions/ITableFunction.h>
 #include <Core/PostgreSQL/PoolWithFailover.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
@@ -27,9 +26,8 @@ private:
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    String connection_str;
-    String remote_table_name, remote_table_schema;
     postgres::PoolWithFailoverPtr connection_pool;
+    std::optional<StoragePostgreSQLConfiguration> configuration;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 08f61a49fa5..ca13b7277ce 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -13,9 +13,10 @@
 #include <Common/typeid_cast.h>
 #include <Common/parseRemoteDescription.h>
 #include <Common/Macros.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Core/Defines.h>
-#include <common/range.h>
+#include <base/range.h>
 #include "registerTableFunctions.h"
 
 
@@ -32,128 +33,171 @@ namespace ErrorCodes
 void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     ASTs & args_func = ast_function->children;
+    ExternalDataSourceConfiguration configuration;
+
+    String cluster_name;
+    String cluster_description;
 
     if (args_func.size() != 1)
         throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     ASTs & args = args_func.at(0)->children;
 
-    const size_t max_args = is_cluster_function ? 4 : 6;
-    if (args.size() < 2 || args.size() > max_args)
-        throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    String cluster_name;
-    String cluster_description;
-    String remote_database;
-    String remote_table;
-    String username;
-    String password;
-
-    size_t arg_num = 0;
-
-    auto get_string_literal = [](const IAST & node, String & res)
+    /**
+     * Number of arguments for remote function is 4.
+     * Number of arguments for cluster function is 6.
+     * For now named collection can be used only for remote as cluster does not require credentials.
+     */
+    size_t max_args = is_cluster_function ? 4 : 6;
+    auto named_collection = getExternalDataSourceConfiguration(args, context, false, false);
+    if (named_collection)
     {
-        const auto * lit = node.as<ASTLiteral>();
-        if (!lit)
-            return false;
+        if (is_cluster_function)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Named collection cannot be used for table function cluster");
 
-        if (lit->value.getType() != Field::Types::String)
-            return false;
+        /**
+         * Common arguments: database, table, username, password, addresses_expr.
+         * Specific args (remote): sharding_key, or database (in case it is not ASTLiteral).
+         * None of the common arguments is empty at this point, it is checked in getExternalDataSourceConfiguration.
+         */
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
 
-        res = safeGet<const String &>(lit->value);
-        return true;
-    };
-
-    if (is_cluster_function)
-    {
-        args[arg_num] = evaluateConstantExpressionOrIdentifierAsLiteral(args[arg_num], context);
-        cluster_name = args[arg_num]->as<ASTLiteral &>().value.safeGet<const String &>();
-    }
-    else
-    {
-        if (!tryGetIdentifierNameInto(args[arg_num], cluster_name))
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
         {
-            if (!get_string_literal(*args[arg_num], cluster_description))
-                throw Exception("Hosts pattern must be string literal (in single quotes).", ErrorCodes::BAD_ARGUMENTS);
+            if (arg_name == "sharding_key")
+            {
+                sharding_key = arg_value;
+            }
+            else if (arg_name == "database")
+            {
+                const auto * function = arg_value->as<ASTFunction>();
+                if (function && TableFunctionFactory::instance().isTableFunctionName(function->name))
+                {
+                    remote_table_function_ptr = arg_value;
+                }
+                else
+                {
+                    auto database_literal = evaluateConstantExpressionOrIdentifierAsLiteral(arg_value, context);
+                    configuration.database = database_literal->as<ASTLiteral>()->value.safeGet<String>();
+                }
+            }
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Unexpected key-value argument."
+                        "Got: {}, but expected: sharding_key", arg_name);
         }
-    }
-    ++arg_num;
-
-    const auto * function = args[arg_num]->as<ASTFunction>();
-
-    if (function && TableFunctionFactory::instance().isTableFunctionName(function->name))
-    {
-        remote_table_function_ptr = args[arg_num];
-        ++arg_num;
+        cluster_description = configuration.addresses_expr;
+        if (cluster_description.empty())
+            cluster_description = configuration.port ? configuration.host + ':' + toString(configuration.port) : configuration.host;
     }
     else
     {
-        args[arg_num] = evaluateConstantExpressionForDatabaseName(args[arg_num], context);
-        remote_database = args[arg_num]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args.size() < 2 || args.size() > max_args)
+            throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-        ++arg_num;
-
-        size_t dot = remote_database.find('.');
-        if (dot != String::npos)
+        size_t arg_num = 0;
+        auto get_string_literal = [](const IAST & node, String & res)
         {
-            /// NOTE Bad - do not support identifiers in backquotes.
-            remote_table = remote_database.substr(dot + 1);
-            remote_database = remote_database.substr(0, dot);
+            const auto * lit = node.as<ASTLiteral>();
+            if (!lit)
+                return false;
+
+            if (lit->value.getType() != Field::Types::String)
+                return false;
+
+            res = safeGet<const String &>(lit->value);
+            return true;
+        };
+
+        if (is_cluster_function)
+        {
+            args[arg_num] = evaluateConstantExpressionOrIdentifierAsLiteral(args[arg_num], context);
+            cluster_name = args[arg_num]->as<ASTLiteral &>().value.safeGet<const String &>();
         }
         else
         {
-            if (arg_num >= args.size())
+            if (!tryGetIdentifierNameInto(args[arg_num], cluster_name))
             {
-                throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+                if (!get_string_literal(*args[arg_num], cluster_description))
+                    throw Exception("Hosts pattern must be string literal (in single quotes).", ErrorCodes::BAD_ARGUMENTS);
             }
-            else
+        }
+
+        ++arg_num;
+        const auto * function = args[arg_num]->as<ASTFunction>();
+        if (function && TableFunctionFactory::instance().isTableFunctionName(function->name))
+        {
+            remote_table_function_ptr = args[arg_num];
+            ++arg_num;
+        }
+        else
+        {
+            args[arg_num] = evaluateConstantExpressionForDatabaseName(args[arg_num], context);
+            configuration.database = args[arg_num]->as<ASTLiteral &>().value.safeGet<String>();
+
+            ++arg_num;
+
+            auto qualified_name = QualifiedTableName::parseFromString(configuration.database);
+            if (qualified_name.database.empty())
             {
-                args[arg_num] = evaluateConstantExpressionOrIdentifierAsLiteral(args[arg_num], context);
-                remote_table = args[arg_num]->as<ASTLiteral &>().value.safeGet<String>();
+                if (arg_num >= args.size())
+                {
+                    throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
+                }
+                else
+                {
+                    std::swap(qualified_name.database, qualified_name.table);
+                    args[arg_num] = evaluateConstantExpressionOrIdentifierAsLiteral(args[arg_num], context);
+                    qualified_name.table = args[arg_num]->as<ASTLiteral &>().value.safeGet<String>();
+                    ++arg_num;
+                }
+            }
+
+            configuration.database = std::move(qualified_name.database);
+            configuration.table = std::move(qualified_name.table);
+
+            /// Cluster function may have sharding key for insert
+            if (is_cluster_function && arg_num < args.size())
+            {
+                sharding_key = args[arg_num];
                 ++arg_num;
             }
         }
-    }
 
-    /// Cluster function may have sharding key for insert
-    if (is_cluster_function && arg_num < args.size())
-    {
-        sharding_key = args[arg_num];
-        ++arg_num;
-    }
+        /// Username and password parameters are prohibited in cluster version of the function
+        if (!is_cluster_function)
+        {
+            if (arg_num < args.size())
+            {
+                if (!get_string_literal(*args[arg_num], configuration.username))
+                {
+                    configuration.username = "default";
+                    sharding_key = args[arg_num];
+                }
+                ++arg_num;
+            }
+
+            if (arg_num < args.size() && !sharding_key)
+            {
+                if (!get_string_literal(*args[arg_num], configuration.password))
+                {
+                    sharding_key = args[arg_num];
+                }
+                ++arg_num;
+            }
+
+            if (arg_num < args.size() && !sharding_key)
+            {
+                sharding_key = args[arg_num];
+                ++arg_num;
+            }
+        }
 
-    /// Username and password parameters are prohibited in cluster version of the function
-    if (!is_cluster_function)
-    {
         if (arg_num < args.size())
-        {
-            if (!get_string_literal(*args[arg_num], username))
-            {
-                username = "default";
-                sharding_key = args[arg_num];
-            }
-            ++arg_num;
-        }
-
-        if (arg_num < args.size() && !sharding_key)
-        {
-            if (!get_string_literal(*args[arg_num], password))
-            {
-                sharding_key = args[arg_num];
-            }
-            ++arg_num;
-        }
-
-        if (arg_num < args.size() && !sharding_key)
-        {
-            sharding_key = args[arg_num];
-            ++arg_num;
-        }
+            throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
     }
 
-    if (arg_num < args.size())
-        throw Exception(help_message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
     if (!cluster_name.empty())
     {
         /// Use an existing cluster from the main config
@@ -199,19 +243,19 @@ void TableFunctionRemote::parseArguments(const ASTPtr & ast_function, ContextPtr
         cluster = std::make_shared<Cluster>(
             context->getSettings(),
             names,
-            username,
-            password,
+            configuration.username,
+            configuration.password,
             (secure ? (maybe_secure_port ? *maybe_secure_port : DBMS_DEFAULT_SECURE_PORT) : context->getTCPPort()),
             treat_local_as_remote,
             treat_local_port_as_remote,
             secure);
     }
 
-    if (!remote_table_function_ptr && remote_table.empty())
+    if (!remote_table_function_ptr && configuration.table.empty())
         throw Exception("The name of remote table cannot be empty", ErrorCodes::BAD_ARGUMENTS);
 
-    remote_table_id.database_name = remote_database;
-    remote_table_id.table_name = remote_table;
+    remote_table_id.database_name = configuration.database;
+    remote_table_id.table_name = configuration.table;
 }
 
 StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns) const
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index 83149445a7d..e26c282c622 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -3,13 +3,13 @@
 #if USE_AWS_S3
 
 #include <IO/S3Common.h>
-#include <Storages/StorageS3.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/Context.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/TableFunctionS3.h>
 #include <TableFunctions/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTLiteral.h>
+#include <Storages/StorageS3.h>
 #include "registerTableFunctions.h"
 
 
@@ -38,51 +38,75 @@ void TableFunctionS3::parseArguments(const ASTPtr & ast_function, ContextPtr con
         throw Exception("Table function '" + getName() + "' must have arguments.", ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
     ASTs & args = args_func.at(0)->children;
+    StorageS3Configuration configuration;
 
-    if (args.size() < 3 || args.size() > 6)
-        throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
-
-    for (auto & arg : args)
-        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
-
-    /// Size -> argument indexes
-    static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+    if (auto named_collection = getURLBasedDataSourceConfiguration(args, context))
     {
-        {3, {{"format", 1}, {"structure", 2}}},
-        {4, {{"format", 1}, {"structure", 2}, {"compression_method", 3}}},
-        {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}}},
-        {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}}}
-    };
+        auto [common_configuration, storage_specific_args] = named_collection.value();
+        configuration.set(common_configuration);
 
-    /// This argument is always the first
-    filename = args[0]->as<ASTLiteral &>().value.safeGet<String>();
+        for (const auto & [arg_name, arg_value] : storage_specific_args)
+        {
+            if (arg_name == "access_key_id")
+                configuration.access_key_id = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else if (arg_name == "secret_access_key")
+                configuration.secret_access_key = arg_value->as<ASTLiteral>()->value.safeGet<String>();
+            else
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                                "Unknown key-value argument `{}` for StorageS3, expected: "
+                                "url, [access_key_id, secret_access_key], name of used format, structure and [compression_method].",
+                                arg_name);
+        }
+    }
+    else
+    {
+        if (args.size() < 3 || args.size() > 6)
+            throw Exception(message, ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-    auto & args_to_idx = size_to_args[args.size()];
+        for (auto & arg : args)
+            arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
-    if (args_to_idx.contains("format"))
-        format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
+        /// Size -> argument indexes
+        static auto size_to_args = std::map<size_t, std::map<String, size_t>>
+        {
+            {3, {{"format", 1}, {"structure", 2}}},
+            {4, {{"format", 1}, {"structure", 2}, {"compression_method", 3}}},
+            {5, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}}},
+            {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}}}
+        };
 
-    if (args_to_idx.contains("structure"))
-        structure = args[args_to_idx["structure"]]->as<ASTLiteral &>().value.safeGet<String>();
+        /// This argument is always the first
+        configuration.url = args[0]->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (args_to_idx.contains("compression_method"))
-        compression_method = args[args_to_idx["compression_method"]]->as<ASTLiteral &>().value.safeGet<String>();
+        auto & args_to_idx = size_to_args[args.size()];
 
-    if (args_to_idx.contains("access_key_id"))
-        access_key_id = args[args_to_idx["access_key_id"]]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args_to_idx.contains("format"))
+            configuration.format = args[args_to_idx["format"]]->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (args_to_idx.contains("secret_access_key"))
-        secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
+        if (args_to_idx.contains("structure"))
+            configuration.structure = args[args_to_idx["structure"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (args_to_idx.contains("compression_method"))
+            configuration.compression_method = args[args_to_idx["compression_method"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (args_to_idx.contains("access_key_id"))
+            configuration.access_key_id = args[args_to_idx["access_key_id"]]->as<ASTLiteral &>().value.safeGet<String>();
+
+        if (args_to_idx.contains("secret_access_key"))
+            configuration.secret_access_key = args[args_to_idx["secret_access_key"]]->as<ASTLiteral &>().value.safeGet<String>();
+    }
+
+    s3_configuration = std::move(configuration);
 }
 
 ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context) const
 {
-    return parseColumnsListFromString(structure, context);
+    return parseColumnsListFromString(s3_configuration->structure, context);
 }
 
 StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/) const
 {
-    Poco::URI uri (filename);
+    Poco::URI uri (s3_configuration->url);
     S3::URI s3_uri (uri);
     UInt64 max_single_read_retries = context->getSettingsRef().s3_max_single_read_retries;
     UInt64 min_upload_part_size = context->getSettingsRef().s3_min_upload_part_size;
@@ -91,10 +115,10 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, Context
 
     StoragePtr storage = StorageS3::create(
         s3_uri,
-        access_key_id,
-        secret_access_key,
+        s3_configuration->access_key_id,
+        s3_configuration->secret_access_key,
         StorageID(getDatabaseName(), table_name),
-        format,
+        s3_configuration->format,
         max_single_read_retries,
         min_upload_part_size,
         max_single_part_upload_size,
@@ -103,7 +127,9 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, Context
         ConstraintsDescription{},
         String{},
         context,
-        compression_method);
+        /// No format_settings for table function S3
+        std::nullopt,
+        s3_configuration->compression_method);
 
     storage->startup();
 
diff --git a/src/TableFunctions/TableFunctionS3.h b/src/TableFunctions/TableFunctionS3.h
index 1835fa3daa9..8d4c1391236 100644
--- a/src/TableFunctions/TableFunctionS3.h
+++ b/src/TableFunctions/TableFunctionS3.h
@@ -5,6 +5,7 @@
 #if USE_AWS_S3
 
 #include <TableFunctions/ITableFunction.h>
+#include <Storages/ExternalDataSourceConfiguration.h>
 
 
 namespace DB
@@ -36,12 +37,7 @@ protected:
     ColumnsDescription getActualTableStructure(ContextPtr context) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    String filename;
-    String format;
-    String structure;
-    String access_key_id;
-    String secret_access_key;
-    String compression_method = "auto";
+    std::optional<StorageS3Configuration> s3_configuration;
 };
 
 class TableFunctionCOS : public TableFunctionS3
diff --git a/src/TableFunctions/TableFunctionS3Cluster.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
index 93f90bca75a..aa3ae20b61d 100644
--- a/src/TableFunctions/TableFunctionS3Cluster.cpp
+++ b/src/TableFunctions/TableFunctionS3Cluster.cpp
@@ -1,13 +1,11 @@
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
 #include <Storages/StorageS3Cluster.h>
 
 #include <DataTypes/DataTypeString.h>
-#include <DataStreams/RemoteBlockInputStream.h>
+#include <QueryPipeline/RemoteQueryExecutor.h>
 #include <IO/S3Common.h>
 #include <Storages/StorageS3.h>
 #include <Interpreters/evaluateConstantExpression.h>
@@ -21,7 +19,6 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/IAST_fwd.h>
-#include <Processors/Sources/SourceFromInputStream.h>
 
 #include "registerTableFunctions.h"
 
@@ -128,6 +125,8 @@ StoragePtr TableFunctionS3Cluster::executeImpl(
             ConstraintsDescription{},
             String{},
             context,
+            // No format_settings for S3Cluster
+            std::nullopt,
             compression_method,
             /*distributed_processing=*/true);
     }
diff --git a/src/TableFunctions/TableFunctionS3Cluster.h b/src/TableFunctions/TableFunctionS3Cluster.h
index 3f2be12497c..cc857725ce6 100644
--- a/src/TableFunctions/TableFunctionS3Cluster.h
+++ b/src/TableFunctions/TableFunctionS3Cluster.h
@@ -1,8 +1,6 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
 #include <Common/config.h>
-#endif
 
 #if USE_AWS_S3
 
diff --git a/src/TableFunctions/TableFunctionSQLite.h b/src/TableFunctions/TableFunctionSQLite.h
index 4649dac016f..e80e04260bc 100644
--- a/src/TableFunctions/TableFunctionSQLite.h
+++ b/src/TableFunctions/TableFunctionSQLite.h
@@ -1,7 +1,5 @@
 #pragma once
-#if !defined(ARCADIA_BUILD)
 #include "config_core.h"
-#endif
 
 #if USE_SQLITE
 #include <TableFunctions/ITableFunction.h>
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index a1fe142bea6..bbaa1b5f048 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -2,8 +2,8 @@
 
 #include "registerTableFunctions.h"
 #include <Access/AccessFlags.h>
-#include <Formats/FormatFactory.h>
 #include <Poco/URI.h>
+#include <Parsers/ASTFunction.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageURL.h>
 #include <TableFunctions/TableFunctionFactory.h>
@@ -12,6 +12,48 @@
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+void TableFunctionURL::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    const auto & func_args = ast_function->as<ASTFunction &>();
+    if (!func_args.arguments)
+        throw Exception("Table function 'URL' must have arguments.", ErrorCodes::BAD_ARGUMENTS);
+
+    URLBasedDataSourceConfiguration configuration;
+    if (auto with_named_collection = getURLBasedDataSourceConfiguration(func_args.arguments->children, context))
+    {
+        auto [common_configuration, storage_specific_args] = with_named_collection.value();
+        configuration.set(common_configuration);
+
+        if (!storage_specific_args.empty())
+        {
+            String illegal_args;
+            for (const auto & arg : storage_specific_args)
+            {
+                if (!illegal_args.empty())
+                    illegal_args += ", ";
+                illegal_args += arg.first;
+            }
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown arguments {} for table function URL", illegal_args);
+        }
+
+        filename = configuration.url;
+        format = configuration.format;
+        structure = configuration.structure;
+        compression_method = configuration.compression_method;
+    }
+    else
+    {
+        ITableFunctionFileLike::parseArguments(ast_function, context);
+    }
+}
+
+
 StoragePtr TableFunctionURL::getStorage(
     const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
     const std::string & table_name, const String & compression_method_) const
diff --git a/src/TableFunctions/TableFunctionURL.h b/src/TableFunctions/TableFunctionURL.h
index fde361e8bbb..c35db9f9c8b 100644
--- a/src/TableFunctions/TableFunctionURL.h
+++ b/src/TableFunctions/TableFunctionURL.h
@@ -19,6 +19,9 @@ public:
         return name;
     }
 
+protected:
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+
 private:
     StoragePtr getStorage(
         const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
diff --git a/src/TableFunctions/TableFunctionView.h b/src/TableFunctions/TableFunctionView.h
index 9ef634746eb..c20b45e7546 100644
--- a/src/TableFunctions/TableFunctionView.h
+++ b/src/TableFunctions/TableFunctionView.h
@@ -2,7 +2,7 @@
 
 #include <TableFunctions/ITableFunction.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <common/types.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/TableFunctions/TableFunctionZeros.h b/src/TableFunctions/TableFunctionZeros.h
index 0407eff2f78..eef1577673e 100644
--- a/src/TableFunctions/TableFunctionZeros.h
+++ b/src/TableFunctions/TableFunctionZeros.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <TableFunctions/ITableFunction.h>
-#include <common/types.h>
+#include <base/types.h>
 
 
 namespace DB
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index 2aee91997b0..b4aab3e5c55 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -13,6 +13,7 @@ void registerTableFunctions()
     registerTableFunctionNumbers(factory);
     registerTableFunctionNull(factory);
     registerTableFunctionZeros(factory);
+    registerTableFunctionExecutable(factory);
     registerTableFunctionFile(factory);
     registerTableFunctionURL(factory);
     registerTableFunctionValues(factory);
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index 6a13c82caba..8dbb5ebb5fa 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -1,9 +1,7 @@
 #pragma once
 
-#if !defined(ARCADIA_BUILD)
-#    include <Common/config.h>
-#    include "config_core.h"
-#endif
+#include <Common/config.h>
+#include "config_core.h"
 
 namespace DB
 {
@@ -13,6 +11,7 @@ void registerTableFunctionRemote(TableFunctionFactory & factory);
 void registerTableFunctionNumbers(TableFunctionFactory & factory);
 void registerTableFunctionNull(TableFunctionFactory & factory);
 void registerTableFunctionZeros(TableFunctionFactory & factory);
+void registerTableFunctionExecutable(TableFunctionFactory & factory);
 void registerTableFunctionFile(TableFunctionFactory & factory);
 void registerTableFunctionURL(TableFunctionFactory & factory);
 void registerTableFunctionValues(TableFunctionFactory & factory);
diff --git a/src/TableFunctions/ya.make b/src/TableFunctions/ya.make
deleted file mode 100644
index e957c923423..00000000000
--- a/src/TableFunctions/ya.make
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it.
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-    ITableFunction.cpp
-    ITableFunctionFileLike.cpp
-    ITableFunctionXDBC.cpp
-    TableFunctionDictionary.cpp
-    TableFunctionFactory.cpp
-    TableFunctionFile.cpp
-    TableFunctionGenerateRandom.cpp
-    TableFunctionInput.cpp
-    TableFunctionMerge.cpp
-    TableFunctionMySQL.cpp
-    TableFunctionNull.cpp
-    TableFunctionNumbers.cpp
-    TableFunctionRemote.cpp
-    TableFunctionSQLite.cpp
-    TableFunctionURL.cpp
-    TableFunctionValues.cpp
-    TableFunctionView.cpp
-    TableFunctionZeros.cpp
-    parseColumnsListForTableFunction.cpp
-    registerTableFunctions.cpp
-
-)
-
-END()
diff --git a/src/TableFunctions/ya.make.in b/src/TableFunctions/ya.make.in
deleted file mode 100644
index 6f351b3f646..00000000000
--- a/src/TableFunctions/ya.make.in
+++ /dev/null
@@ -1,14 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Common
-)
-
-
-SRCS(
-<? find . -name '*.cpp' | grep -v -P 'S3|HDFS|PostgreSQL' | grep -v -F examples | sed 's/^\.\//    /' | sort ?>
-)
-
-END()
diff --git a/src/ya.make b/src/ya.make
deleted file mode 100644
index 6537f67d66f..00000000000
--- a/src/ya.make
+++ /dev/null
@@ -1,31 +0,0 @@
-OWNER(g:clickhouse)
-
-LIBRARY()
-
-PEERDIR(
-    clickhouse/src/Access
-    clickhouse/src/AggregateFunctions
-    clickhouse/src/Bridge
-    clickhouse/src/Client
-    clickhouse/src/Columns
-    clickhouse/src/Common
-    clickhouse/src/Compression
-    clickhouse/src/Coordination
-    clickhouse/src/Core
-    clickhouse/src/Databases
-    clickhouse/src/DataStreams
-    clickhouse/src/DataTypes
-    clickhouse/src/Formats
-    clickhouse/src/Dictionaries
-    clickhouse/src/Disks
-    clickhouse/src/Functions
-    clickhouse/src/Interpreters
-    clickhouse/src/IO
-    clickhouse/src/Parsers
-    clickhouse/src/Processors
-    clickhouse/src/Server
-    clickhouse/src/Storages
-    clickhouse/src/TableFunctions
-)
-
-END()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 132909438da..c9858910837 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,15 +7,19 @@ else ()
     include (${ClickHouse_SOURCE_DIR}/cmake/add_check.cmake)
 endif ()
 
-install (PROGRAMS clickhouse-test DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-install (
-    DIRECTORY queries performance config
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test
-    USE_SOURCE_PERMISSIONS
-    COMPONENT clickhouse
-    PATTERN "CMakeLists.txt" EXCLUDE
-    PATTERN ".gitignore" EXCLUDE
-)
+option (ENABLE_CLICKHOUSE_TEST "Install clickhouse-test script and relevant tests scenarios" ON)
+
+if (ENABLE_CLICKHOUSE_TEST)
+    install (PROGRAMS clickhouse-test DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    install (
+        DIRECTORY queries performance config
+        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test
+        USE_SOURCE_PERMISSIONS
+        COMPONENT clickhouse
+        PATTERN "CMakeLists.txt" EXCLUDE
+        PATTERN ".gitignore" EXCLUDE
+    )
+endif ()
 
 if (ENABLE_TEST_INTEGRATION)
     add_subdirectory (integration)
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
new file mode 100644
index 00000000000..fbb0fc11c74
--- /dev/null
+++ b/tests/ci/build_check.py
@@ -0,0 +1,207 @@
+#!/usr/bin/env python3
+#
+import subprocess
+import logging
+import json
+import os
+import sys
+import time
+from github import Github
+from s3_helper import S3Helper
+from pr_info import PRInfo
+from get_robot_token import get_best_robot_token
+from version_helper import get_version_from_repo, update_version_local
+
+
+def get_build_config(build_check_name, build_number, repo_path):
+    if build_check_name == 'ClickHouse build check (actions)':
+        build_config_name = 'build_config'
+    elif build_check_name == 'ClickHouse special build check (actions)':
+        build_config_name = 'special_build_config'
+    else:
+        raise Exception(f"Unknown build check name {build_check_name}")
+
+    ci_config_path = os.path.join(repo_path, "tests/ci/ci_config.json")
+    with open(ci_config_path, 'r') as ci_config:
+        config_dict = json.load(ci_config)
+        return config_dict[build_config_name][build_number]
+
+
+def _can_export_binaries(build_config):
+    if build_config['package-type'] != 'deb':
+        return False
+    if build_config['bundled'] != "bundled":
+        return False
+    if build_config['splitted'] == 'splitted':
+        return False
+    if build_config['sanitizer'] != '':
+        return True
+    if build_config['build-type'] != '':
+        return True
+    return False
+
+
+def get_packager_cmd(build_config, packager_path, output_path, build_version, image_version, ccache_path):
+    package_type = build_config['package-type']
+    comp = build_config['compiler']
+    cmd = f"cd {packager_path} && ./packager --output-dir={output_path} --package-type={package_type} --compiler={comp}"
+
+    if build_config['build-type']:
+        cmd += ' --build-type={}'.format(build_config['build-type'])
+    if build_config['sanitizer']:
+        cmd += ' --sanitizer={}'.format(build_config['sanitizer'])
+    if build_config['bundled'] == 'unbundled':
+        cmd += ' --unbundled'
+    if build_config['splitted'] == 'splitted':
+        cmd += ' --split-binary'
+    if build_config['tidy'] == 'enable':
+        cmd += ' --clang-tidy'
+
+    cmd += ' --cache=ccache'
+    cmd += ' --ccache_dir={}'.format(ccache_path)
+
+    if 'alien_pkgs' in build_config and build_config['alien_pkgs']:
+        cmd += ' --alien-pkgs'
+
+    cmd += ' --docker-image-version={}'.format(image_version)
+    cmd += ' --version={}'.format(build_version)
+
+    if _can_export_binaries(build_config):
+        cmd += ' --with-binaries=tests'
+
+    return cmd
+
+def get_image_name(build_config):
+    if build_config['bundled'] != 'bundled':
+        return 'clickhouse/unbundled-builder'
+    elif build_config['package-type'] != 'deb':
+        return 'clickhouse/binary-builder'
+    else:
+        return 'clickhouse/deb-builder'
+
+
+def build_clickhouse(packager_cmd, logs_path):
+    build_log_path = os.path.join(logs_path, 'build_log.log')
+    with open(build_log_path, 'w') as log_file:
+        retcode = subprocess.Popen(packager_cmd, shell=True, stderr=log_file, stdout=log_file).wait()
+        if retcode == 0:
+            logging.info("Built successfully")
+        else:
+            logging.info("Build failed")
+    return build_log_path, retcode == 0
+
+def build_config_to_string(build_config):
+    if build_config["package-type"] == "performance":
+        return "performance"
+
+    return "_".join([
+        build_config['compiler'],
+        build_config['build-type'] if build_config['build-type'] else "relwithdebuginfo",
+        build_config['sanitizer'] if build_config['sanitizer'] else "none",
+        build_config['bundled'],
+        build_config['splitted'],
+        "tidy" if build_config['tidy'] == "enable" else "notidy",
+        "with_coverage" if build_config['with_coverage'] else "without_coverage",
+        build_config['package-type'],
+    ])
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    repo_path = os.getenv("REPO_COPY", os.path.abspath("../../"))
+    temp_path = os.getenv("TEMP_PATH", os.path.abspath("."))
+    caches_path = os.getenv("CACHES_PATH", temp_path)
+
+    build_check_name = sys.argv[1]
+    build_number = int(sys.argv[2])
+
+    build_config = get_build_config(build_check_name, build_number, repo_path)
+
+    if not os.path.exists(temp_path):
+        os.makedirs(temp_path)
+
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event)
+
+    logging.info("Repo copy path %s", repo_path)
+
+    gh = Github(get_best_robot_token())
+
+    images_path = os.path.join(os.getenv("IMAGES_PATH", temp_path), 'changed_images.json')
+    image_name = get_image_name(build_config)
+    image_version = 'latest'
+    if os.path.exists(images_path):
+        logging.info("Images file exists")
+        with open(images_path, 'r') as images_fd:
+            images = json.load(images_fd)
+            logging.info("Got images %s", images)
+            if image_name in images:
+                image_version = images[image_name]
+
+    for i in range(10):
+        try:
+            logging.info("Pulling image %s:%s", image_name, image_version)
+            subprocess.check_output(f"docker pull {image_name}:{image_version}", stderr=subprocess.STDOUT, shell=True)
+            break
+        except Exception as ex:
+            time.sleep(i * 3)
+            logging.info("Got execption pulling docker %s", ex)
+    else:
+        raise Exception(f"Cannot pull dockerhub for image docker pull {image_name}:{image_version}")
+
+    version = get_version_from_repo(repo_path)
+    version.tweak_update()
+    update_version_local(repo_path, pr_info.sha, version)
+
+    build_name = build_config_to_string(build_config)
+    logging.info("Build short name %s", build_name)
+    subprocess.check_call(f"echo 'BUILD_NAME=build_urls_{build_name}' >> $GITHUB_ENV", shell=True)
+
+    build_output_path = os.path.join(temp_path, build_name)
+    if not os.path.exists(build_output_path):
+        os.makedirs(build_output_path)
+
+    ccache_path = os.path.join(caches_path, build_name + '_ccache')
+    if not os.path.exists(ccache_path):
+        os.makedirs(ccache_path)
+
+    packager_cmd = get_packager_cmd(build_config, os.path.join(repo_path, "docker/packager"), build_output_path, version.get_version_string(), image_version, ccache_path)
+    logging.info("Going to run packager with %s", packager_cmd)
+
+    build_clickhouse_log = os.path.join(temp_path, "build_log")
+    if not os.path.exists(build_clickhouse_log):
+        os.makedirs(build_clickhouse_log)
+
+    start = time.time()
+    log_path, success = build_clickhouse(packager_cmd, build_clickhouse_log)
+    elapsed = int(time.time() - start)
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {build_output_path}", shell=True)
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {ccache_path}", shell=True)
+    logging.info("Build finished with %s, log path %s", success, log_path)
+
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+    s3_path_prefix = str(pr_info.number) + "/" + pr_info.sha + "/" + build_check_name.lower().replace(' ', '_') + "/" + build_name
+    if os.path.exists(log_path):
+        log_url = s3_helper.upload_build_file_to_s3(log_path, s3_path_prefix + "/" + os.path.basename(log_path))
+        logging.info("Log url %s", log_url)
+    else:
+        logging.info("Build log doesn't exist")
+
+    build_urls = s3_helper.upload_build_folder_to_s3(build_output_path, s3_path_prefix, keep_dirs_in_s3_path=False, upload_symlinks=False)
+    logging.info("Got build URLs %s", build_urls)
+
+    print("::notice ::Build URLs: {}".format('\n'.join(build_urls)))
+
+    result = {
+        "log_url": log_url,
+        "build_urls": build_urls,
+        "build_config": build_config,
+        "elapsed_seconds": elapsed,
+        "status": success,
+    }
+
+    print("::notice ::Log URL: {}".format(log_url))
+
+    with open(os.path.join(temp_path, "build_urls_" + build_name + '.json'), 'w') as build_links:
+        json.dump(result, build_links)
diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
new file mode 100644
index 00000000000..e060ce39a0d
--- /dev/null
+++ b/tests/ci/build_report_check.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+
+import json
+import logging
+import os
+import sys
+from github import Github
+from report import create_build_html_report
+from s3_helper import S3Helper
+from get_robot_token import get_best_robot_token
+from pr_info import PRInfo
+
+class BuildResult():
+    def __init__(self, compiler, build_type, sanitizer, bundled, splitted, status, elapsed_seconds, with_coverage):
+        self.compiler = compiler
+        self.build_type = build_type
+        self.sanitizer = sanitizer
+        self.bundled = bundled
+        self.splitted = splitted
+        self.status = status
+        self.elapsed_seconds = elapsed_seconds
+        self.with_coverage = with_coverage
+
+def group_by_artifacts(build_urls):
+    groups = {'deb': [], 'binary': [], 'tgz': [], 'rpm': [], 'preformance': []}
+    for url in build_urls:
+        if url.endswith('performance.tgz'):
+            groups['performance'].append(url)
+        elif url.endswith('.deb') or url.endswith('.buildinfo') or url.endswith('.changes') or url.endswith('.tar.gz'):
+            groups['deb'].append(url)
+        elif url.endswith('.rpm'):
+            groups['rpm'].append(url)
+        elif url.endswith('.tgz'):
+            groups['tgz'].append(url)
+        else:
+            groups['binary'].append(url)
+    return groups
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+def process_report(build_report):
+    build_config = build_report['build_config']
+    build_result = BuildResult(
+        compiler=build_config['compiler'],
+        build_type=build_config['build-type'],
+        sanitizer=build_config['sanitizer'],
+        bundled=build_config['bundled'],
+        splitted=build_config['splitted'],
+        status="success" if build_report['status'] else "failure",
+        elapsed_seconds=build_report['elapsed_seconds'],
+        with_coverage=False
+    )
+    build_results = []
+    build_urls = []
+    build_logs_urls = []
+    urls_groups = group_by_artifacts(build_report['build_urls'])
+    found_group = False
+    for _, group_urls in urls_groups.items():
+        if group_urls:
+            build_results.append(build_result)
+            build_urls.append(group_urls)
+            build_logs_urls.append(build_report['log_url'])
+            found_group = True
+
+    if not found_group:
+        build_results.append(build_result)
+        build_urls.append([""])
+        build_logs_urls.append(build_report['log_url'])
+
+    return build_results, build_urls, build_logs_urls
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    reports_path = os.getenv("REPORTS_PATH", "./reports")
+    temp_path = os.path.join(os.getenv("TEMP_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]
+
+    build_reports = []
+    for root, dirs, 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)
+                with open(os.path.join(root, f), 'r') as file_handler:
+                    build_report = json.load(file_handler)
+                    build_reports.append(build_report)
+
+
+    build_results = []
+    build_artifacts = []
+    build_logs = []
+
+    for build_report in build_reports:
+        build_result, build_artifacts_url, build_logs_url = process_report(build_report)
+        logging.info("Got %s result for report", len(build_result))
+        build_results += build_result
+        build_artifacts += build_artifacts_url
+        build_logs += build_logs_url
+
+    logging.info("Totally got %s results", len(build_results))
+
+    gh = Github(get_best_robot_token())
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event)
+
+    branch_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
+    branch_name = "master"
+    if pr_info.number != 0:
+        branch_name = "PR #{}".format(pr_info.number)
+        branch_url = "https://github.com/ClickHouse/ClickHouse/pull/" + str(pr_info.number)
+    commit_url = f"https://github.com/ClickHouse/ClickHouse/commit/{pr_info.sha}"
+    task_url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID', '0')}"
+    report = create_build_html_report(
+        build_check_name,
+        build_results,
+        build_logs,
+        build_artifacts,
+        task_url,
+        branch_url,
+        branch_name,
+        commit_url
+    )
+
+    report_path = os.path.join(temp_path, 'report.html')
+    with open(report_path, 'w') as f:
+        f.write(report)
+
+    logging.info("Going to upload prepared report")
+    context_name_for_path = build_check_name.lower().replace(' ', '_')
+    s3_path_prefix = str(pr_info.number) + "/" + pr_info.sha + "/" + context_name_for_path
+
+    url = s3_helper.upload_build_file_to_s3(report_path, s3_path_prefix + "/report.html")
+    logging.info("Report url %s", url)
+
+    total_builds = len(build_results)
+    ok_builds = 0
+    summary_status = "success"
+    for build_result in build_results:
+        if build_result.status == "failure" and summary_status != "error":
+            summary_status = "failure"
+        if build_result.status == "error" or not build_result.status:
+            summary_status = "error"
+
+        if build_result.status == "success":
+            ok_builds += 1
+
+    description = "{}/{} builds are OK".format(ok_builds, total_builds)
+
+    print("::notice ::Report url: {}".format(url))
+
+    commit = get_commit(gh, pr_info.sha)
+    commit.create_status(context=build_check_name, description=description, state=summary_status, target_url=url)
diff --git a/tests/ci/ci_config.json b/tests/ci/ci_config.json
index 52a101728ea..4feae56b93c 100644
--- a/tests/ci/ci_config.json
+++ b/tests/ci/ci_config.json
@@ -1,7 +1,7 @@
 {
     "build_config": [
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -12,7 +12,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "performance",
@@ -22,7 +22,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-10",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -32,7 +32,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "address",
             "package-type": "deb",
@@ -42,7 +42,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "undefined",
             "package-type": "deb",
@@ -52,7 +52,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "thread",
             "package-type": "deb",
@@ -62,7 +62,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "memory",
             "package-type": "deb",
@@ -72,7 +72,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "debug",
             "sanitizer": "",
             "package-type": "deb",
@@ -82,7 +82,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "gcc-10",
+            "compiler": "gcc-11",
             "build-type": "",
             "sanitizer": "",
             "package-type": "deb",
@@ -92,7 +92,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -104,7 +104,7 @@
     ],
     "special_build_config": [
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "debug",
             "sanitizer": "",
             "package-type": "deb",
@@ -114,7 +114,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11",
+            "compiler": "clang-13",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -124,7 +124,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-darwin",
+            "compiler": "clang-13-darwin",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -134,7 +134,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-aarch64",
+            "compiler": "clang-13-aarch64",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -144,7 +144,7 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-freebsd",
+            "compiler": "clang-13-freebsd",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -154,7 +154,17 @@
             "with_coverage": false
         },
         {
-            "compiler": "clang-11-darwin-aarch64",
+            "compiler": "clang-13-darwin-aarch64",
+            "build-type": "",
+            "sanitizer": "",
+            "package-type": "binary",
+            "bundled": "bundled",
+            "splitted": "unsplitted",
+            "tidy": "disable",
+            "with_coverage": false
+        },
+        {
+            "compiler": "clang-13-ppc64le",
             "build-type": "",
             "sanitizer": "",
             "package-type": "binary",
@@ -167,7 +177,7 @@
     "tests_config": {
         "Functional stateful tests (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -179,7 +189,7 @@
         },
         "Functional stateful tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -191,7 +201,7 @@
         },
         "Functional stateful tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -203,7 +213,7 @@
         },
         "Functional stateful tests (ubsan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -215,7 +225,7 @@
         },
         "Functional stateful tests (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -227,7 +237,7 @@
         },
         "Functional stateful tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -239,7 +249,7 @@
         },
         "Functional stateful tests (release, DatabaseOrdinary)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -251,7 +261,7 @@
         },
         "Functional stateful tests (release, DatabaseReplicated)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -263,7 +273,7 @@
         },
         "Functional stateless tests (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -275,7 +285,7 @@
         },
         "Functional stateless tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -287,7 +297,7 @@
         },
         "Functional stateless tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -299,7 +309,7 @@
         },
         "Functional stateless tests (ubsan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -311,7 +321,7 @@
         },
         "Functional stateless tests (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -323,7 +333,7 @@
         },
         "Functional stateless tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -335,7 +345,7 @@
         },
         "Functional stateless tests (pytest)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -347,7 +357,7 @@
         },
         "Functional stateless tests (unbundled)": {
             "required_build_properties": {
-                "compiler": "gcc-10",
+                "compiler": "gcc-11",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -359,7 +369,7 @@
         },
         "Functional stateless tests (release, wide parts enabled)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -371,7 +381,7 @@
         },
         "Functional stateless tests (release, DatabaseOrdinary)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -383,7 +393,7 @@
         },
         "Functional stateless tests (release, DatabaseReplicated)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -395,7 +405,7 @@
         },
         "Stress test (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -407,7 +417,7 @@
         },
         "Stress test (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -419,7 +429,7 @@
         },
         "Stress test (undefined)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -431,7 +441,7 @@
         },
         "Stress test (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -443,7 +453,7 @@
         },
         "Stress test (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -455,7 +465,7 @@
         },
         "Integration tests (asan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -467,7 +477,7 @@
         },
         "Integration tests (thread)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -479,7 +489,7 @@
         },
         "Integration tests (release)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -491,7 +501,7 @@
         },
         "Integration tests (memory)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -503,7 +513,7 @@
         },
         "Integration tests flaky check (asan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -515,7 +525,7 @@
         },
         "Compatibility check": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -527,7 +537,7 @@
         },
         "Split build smoke test": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -539,7 +549,7 @@
         },
         "Testflows check": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -551,7 +561,7 @@
         },
         "Unit tests release gcc": {
             "required_build_properties": {
-                "compiler": "gcc-10",
+                "compiler": "gcc-11",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -563,7 +573,7 @@
         },
         "Unit tests release clang": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -575,7 +585,7 @@
         },
         "Unit tests ASAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -587,7 +597,7 @@
         },
         "Unit tests MSAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -599,7 +609,7 @@
         },
         "Unit tests TSAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -611,7 +621,7 @@
         },
         "Unit tests UBSAN": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -623,7 +633,7 @@
         },
         "AST fuzzer (debug)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "debug",
                 "sanitizer": "none",
@@ -635,7 +645,7 @@
         },
         "AST fuzzer (ASan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -647,7 +657,7 @@
         },
         "AST fuzzer (MSan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "memory",
@@ -659,7 +669,7 @@
         },
         "AST fuzzer (TSan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "thread",
@@ -671,7 +681,7 @@
         },
         "AST fuzzer (UBSan)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "binary",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "undefined",
@@ -683,7 +693,7 @@
         },
         "Release": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "none",
@@ -695,7 +705,7 @@
         },
         "Functional stateless tests flaky check (address)": {
             "required_build_properties": {
-                "compiler": "clang-11",
+                "compiler": "clang-13",
                 "package_type": "deb",
                 "build_type": "relwithdebuginfo",
                 "sanitizer": "address",
@@ -704,6 +714,18 @@
                 "clang-tidy": "disable",
                 "with_coverage": false
             }
+        },
+        "ClickHouse Keeper Jepsen": {
+            "required_build_properties": {
+                "compiler": "clang-13",
+                "package_type": "binary",
+                "build_type": "relwithdebuginfo",
+                "sanitizer": "none",
+                "bundled": "bundled",
+                "splitted": "unsplitted",
+                "clang-tidy": "disable",
+                "with_coverage": false
+            }
         }
     }
 }
diff --git a/tests/ci/compress_files.py b/tests/ci/compress_files.py
new file mode 100644
index 00000000000..f3d2349408f
--- /dev/null
+++ b/tests/ci/compress_files.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+import subprocess
+import logging
+import os
+
+def compress_file_fast(path, archive_path):
+    if os.path.exists('/usr/bin/pigz'):
+        subprocess.check_call("pigz < {} > {}".format(path, archive_path), shell=True)
+    else:
+        subprocess.check_call("gzip < {} > {}".format(path, archive_path), shell=True)
+
+
+def compress_fast(path, archive_path, exclude=None):
+    pigz_part = ''
+    if os.path.exists('/usr/bin/pigz'):
+        logging.info("pigz found, will compress and decompress faster")
+        pigz_part = "--use-compress-program='pigz'"
+    else:
+        pigz_part = '-z'
+        logging.info("no pigz, compressing with default tar")
+
+    if exclude is None:
+        exclude_part = ""
+    elif isinstance(exclude, list):
+        exclude_part = " ".join(["--exclude {}".format(x) for x in exclude])
+    else:
+        exclude_part = "--exclude {}".format(str(exclude))
+
+    fname = os.path.basename(path)
+    if os.path.isfile(path):
+        path = os.path.dirname(path)
+    else:
+        path += "/.."
+    cmd = "tar {} {} -cf {} -C {} {}".format(pigz_part, exclude_part, archive_path, path, fname)
+    logging.debug("compress_fast cmd: %s", cmd)
+    subprocess.check_call(cmd, shell=True)
+
+
+def decompress_fast(archive_path, result_path=None):
+    pigz_part = ''
+    if os.path.exists('/usr/bin/pigz'):
+        logging.info("pigz found, will compress and decompress faster ('%s' -> '%s')", archive_path, result_path)
+        pigz_part = "--use-compress-program='pigz'"
+    else:
+        pigz_part = '-z'
+        logging.info("no pigz, decompressing with default tar ('%s' -> '%s')", archive_path, result_path)
+
+    if result_path is None:
+        subprocess.check_call("tar {} -xf {}".format(pigz_part, archive_path), shell=True)
+    else:
+        subprocess.check_call("tar {} -xf {} -C {}".format(pigz_part, archive_path, result_path), shell=True)
diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
new file mode 100644
index 00000000000..470dcc18233
--- /dev/null
+++ b/tests/ci/docker_images_check.py
@@ -0,0 +1,232 @@
+#!/usr/bin/env python3
+import subprocess
+import logging
+import json
+import os
+import time
+import shutil
+from github import Github
+from report import create_test_html_report
+from s3_helper import S3Helper
+from pr_info import PRInfo
+from get_robot_token import get_best_robot_token, get_parameter_from_ssm
+
+NAME = "Push to Dockerhub (actions)"
+
+def get_changed_docker_images(pr_info, repo_path, image_file_path):
+    images_dict = {}
+    path_to_images_file = os.path.join(repo_path, image_file_path)
+    if os.path.exists(path_to_images_file):
+        with open(path_to_images_file, 'r') as dict_file:
+            images_dict = json.load(dict_file)
+    else:
+        logging.info("Image file %s doesnt exists in repo %s", image_file_path, repo_path)
+
+    dockerhub_repo_name = 'yandex'
+    if not images_dict:
+        return [], dockerhub_repo_name
+
+    files_changed = pr_info.changed_files
+
+    logging.info("Changed files for PR %s @ %s: %s", pr_info.number, pr_info.sha, str(files_changed))
+
+    changed_images = []
+
+    for dockerfile_dir, image_description in images_dict.items():
+        if image_description['name'].startswith('clickhouse/'):
+            dockerhub_repo_name = 'clickhouse'
+
+        for f in files_changed:
+            if f.startswith(dockerfile_dir):
+                logging.info(
+                    "Found changed file '%s' which affects docker image '%s' with path '%s'",
+                    f, image_description['name'], dockerfile_dir)
+                changed_images.append(dockerfile_dir)
+                break
+
+    # The order is important: dependents should go later than bases, so that
+    # they are built with updated base versions.
+    index = 0
+    while index < len(changed_images):
+        image = changed_images[index]
+        for dependent in images_dict[image]['dependent']:
+            logging.info(
+                "Marking docker image '%s' as changed because it depends on changed docker image '%s'",
+                dependent, image)
+            changed_images.append(dependent)
+        index += 1
+        if index > 100:
+            # Sanity check to prevent infinite loop.
+            raise RuntimeError("Too many changed docker images, this is a bug." + str(changed_images))
+
+    # If a dependent image was already in the list because its own files
+    # changed, but then it was added as a dependent of a changed base, we
+    # must remove the earlier entry so that it doesn't go earlier than its
+    # base. This way, the dependent will be rebuilt later than the base, and
+    # will correctly use the updated version of the base.
+    seen = set()
+    no_dups_reversed = []
+    for x in reversed(changed_images):
+        if x not in seen:
+            seen.add(x)
+            no_dups_reversed.append(x)
+
+    result = [(x, images_dict[x]['name']) for x in reversed(no_dups_reversed)]
+    logging.info("Changed docker images for PR %s @ %s: '%s'", pr_info.number, pr_info.sha, result)
+    return result, dockerhub_repo_name
+
+def build_and_push_one_image(path_to_dockerfile_folder, image_name, version_string):
+    logging.info("Building docker image %s with version %s from path %s", image_name, version_string, path_to_dockerfile_folder)
+    build_log = None
+    push_log = None
+    with open('build_log_' + str(image_name).replace('/', '_') + "_" + version_string, 'w') as pl:
+        cmd = "docker build --network=host -t {im}:{ver} {path}".format(im=image_name, ver=version_string, path=path_to_dockerfile_folder)
+        retcode = subprocess.Popen(cmd, shell=True, stderr=pl, stdout=pl).wait()
+        build_log = str(pl.name)
+        if retcode != 0:
+            return False, build_log, None
+
+    with open('tag_log_' + str(image_name).replace('/', '_') + "_" + version_string, 'w') as pl:
+        cmd = "docker build --network=host -t {im} {path}".format(im=image_name, path=path_to_dockerfile_folder)
+        retcode = subprocess.Popen(cmd, shell=True, stderr=pl, stdout=pl).wait()
+        build_log = str(pl.name)
+        if retcode != 0:
+            return False, build_log, None
+
+    logging.info("Pushing image %s to dockerhub", image_name)
+
+    with open('push_log_' + str(image_name).replace('/', '_') + "_" + version_string, 'w') as pl:
+        cmd = "docker push {im}:{ver}".format(im=image_name, ver=version_string)
+        retcode = subprocess.Popen(cmd, shell=True, stderr=pl, stdout=pl).wait()
+        push_log = str(pl.name)
+        if retcode != 0:
+            return False, build_log, push_log
+
+    logging.info("Processing of %s successfully finished", image_name)
+    return True, build_log, push_log
+
+def process_single_image(versions, path_to_dockerfile_folder, image_name):
+    logging.info("Image will be pushed with versions %s", ', '.join(versions))
+    result = []
+    for ver in versions:
+        for i in range(5):
+            success, build_log, push_log = build_and_push_one_image(path_to_dockerfile_folder, image_name, ver)
+            if success:
+                result.append((image_name + ":" + ver, build_log, push_log, 'OK'))
+                break
+            logging.info("Got error will retry %s time and sleep for %s seconds", i, i * 5)
+            time.sleep(i * 5)
+        else:
+            result.append((image_name + ":" + ver, build_log, push_log, 'FAIL'))
+
+    logging.info("Processing finished")
+    return result
+
+
+def process_test_results(s3_client, test_results, s3_path_prefix):
+    overall_status = 'success'
+    processed_test_results = []
+    for image, build_log, push_log, status in test_results:
+        if status != 'OK':
+            overall_status = 'failure'
+        url_part = ''
+        if build_log is not None and os.path.exists(build_log):
+            build_url = s3_client.upload_test_report_to_s3(
+                build_log,
+                s3_path_prefix + "/" + os.path.basename(build_log))
+            url_part += '<a href="{}">build_log</a>'.format(build_url)
+        if push_log is not None and os.path.exists(push_log):
+            push_url = s3_client.upload_test_report_to_s3(
+                push_log,
+                s3_path_prefix + "/" + os.path.basename(push_log))
+            if url_part:
+                url_part += ', '
+            url_part += '<a href="{}">push_log</a>'.format(push_url)
+        if url_part:
+            test_name = image + ' (' + url_part + ')'
+        else:
+            test_name = image
+        processed_test_results.append((test_name, status))
+    return overall_status, processed_test_results
+
+def upload_results(s3_client, pr_number, commit_sha, test_results):
+    s3_path_prefix = f"{pr_number}/{commit_sha}/" + NAME.lower().replace(' ', '_')
+
+    branch_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
+    branch_name = "master"
+    if pr_number != 0:
+        branch_name = "PR #{}".format(pr_number)
+        branch_url = "https://github.com/ClickHouse/ClickHouse/pull/" + str(pr_number)
+    commit_url = f"https://github.com/ClickHouse/ClickHouse/commit/{commit_sha}"
+
+    task_url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+
+    html_report = create_test_html_report(NAME, test_results, "https://hub.docker.com/u/clickhouse", task_url, branch_url, branch_name, commit_url)
+    with open('report.html', 'w') as f:
+        f.write(html_report)
+
+    url = s3_client.upload_test_report_to_s3('report.html', s3_path_prefix + ".html")
+    logging.info("Search result in url %s", url)
+    return url
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    repo_path = os.getenv("GITHUB_WORKSPACE", os.path.abspath("../../"))
+    temp_path = os.path.join(os.getenv("RUNNER_TEMP", os.path.abspath("./temp")), 'docker_images_check')
+    dockerhub_password = get_parameter_from_ssm('dockerhub_robot_password')
+
+    if os.path.exists(temp_path):
+        shutil.rmtree(temp_path)
+
+    if not os.path.exists(temp_path):
+        os.makedirs(temp_path)
+
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event, False, True)
+    changed_images, dockerhub_repo_name = get_changed_docker_images(pr_info, repo_path, "docker/images.json")
+    logging.info("Has changed images %s", ', '.join([str(image[0]) for image in changed_images]))
+    pr_commit_version = str(pr_info.number) + '-' + pr_info.sha
+
+    versions = [str(pr_info.number), pr_commit_version]
+
+    subprocess.check_output("docker login --username 'robotclickhouse' --password '{}'".format(dockerhub_password), shell=True)
+
+    result_images = {}
+    images_processing_result = []
+    for rel_path, image_name in changed_images:
+        full_path = os.path.join(repo_path, rel_path)
+        images_processing_result += process_single_image(versions, full_path, image_name)
+        result_images[image_name] = pr_commit_version
+
+    if changed_images:
+        description = "Updated " + ','.join([im[1] for im in changed_images])
+    else:
+        description = "Nothing to update"
+
+
+    if len(description) >= 140:
+        description = description[:136] + "..."
+
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+
+    s3_path_prefix = str(pr_info.number) + "/" + pr_info.sha + "/" + NAME.lower().replace(' ', '_')
+    status, test_results = process_test_results(s3_helper, images_processing_result, s3_path_prefix)
+
+    url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results)
+
+    gh = Github(get_best_robot_token())
+    commit = get_commit(gh, pr_info.sha)
+    commit.create_status(context=NAME, description=description, state=status, target_url=url)
+
+    with open(os.path.join(temp_path, 'changed_images.json'), 'w') as images_file:
+        json.dump(result_images, images_file)
+
+    print("::notice ::Report url: {}".format(url))
+    print("::set-output name=url_output::\"{}\"".format(url))
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
new file mode 100644
index 00000000000..ae5a18613ee
--- /dev/null
+++ b/tests/ci/fast_test_check.py
@@ -0,0 +1,195 @@
+#!/usr/bin/env python3
+
+import logging
+import subprocess
+import os
+import json
+import time
+import csv
+from github import Github
+from pr_info import PRInfo
+from report import create_test_html_report
+from s3_helper import S3Helper
+from get_robot_token import get_best_robot_token
+
+NAME = 'Fast test (actions)'
+
+def get_fasttest_cmd(workspace, output_path, ccache_path, repo_path, pr_number, commit_sha, image):
+    return f"docker run --cap-add=SYS_PTRACE " \
+        f"-e FASTTEST_WORKSPACE=/fasttest-workspace -e FASTTEST_OUTPUT=/test_output " \
+        f"-e FASTTEST_SOURCE=/ClickHouse --cap-add=SYS_PTRACE " \
+        f"-e PULL_REQUEST_NUMBER={pr_number} -e COMMIT_SHA={commit_sha} -e COPY_CLICKHOUSE_BINARY_TO_OUTPUT=1 " \
+        f"--volume={workspace}:/fasttest-workspace --volume={repo_path}:/ClickHouse --volume={output_path}:/test_output "\
+        f"--volume={ccache_path}:/fasttest-workspace/ccache {image}"
+
+
+def process_results(result_folder):
+    test_results = []
+    additional_files = []
+    # Just upload all files from result_folder.
+    # If task provides processed results, then it's responsible for content of result_folder.
+    if os.path.exists(result_folder):
+        test_files = [f for f in os.listdir(result_folder) if os.path.isfile(os.path.join(result_folder, f))]
+        additional_files = [os.path.join(result_folder, f) for f in test_files]
+
+    status_path = os.path.join(result_folder, "check_status.tsv")
+    logging.info("Found test_results.tsv")
+    status = list(csv.reader(open(status_path, 'r'), delimiter='\t'))
+    if len(status) != 1 or len(status[0]) != 2:
+        return "error", "Invalid check_status.tsv", test_results, additional_files
+    state, description = status[0][0], status[0][1]
+
+    results_path = os.path.join(result_folder, "test_results.tsv")
+    test_results = list(csv.reader(open(results_path, 'r'), delimiter='\t'))
+    if len(test_results) == 0:
+        raise Exception("Empty results")
+
+    return state, description, test_results, additional_files
+
+
+def process_logs(s3_client, additional_logs, s3_path_prefix):
+    additional_urls = []
+    for log_path in additional_logs:
+        if log_path:
+            additional_urls.append(
+                s3_client.upload_test_report_to_s3(
+                    log_path,
+                    s3_path_prefix + "/" + os.path.basename(log_path)))
+
+    return additional_urls
+
+
+def upload_results(s3_client, pr_number, commit_sha, test_results, raw_log, additional_files):
+    additional_files = [raw_log] + additional_files
+    s3_path_prefix = f"{pr_number}/{commit_sha}/fasttest"
+    additional_urls = process_logs(s3_client, additional_files, s3_path_prefix)
+
+    branch_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
+    branch_name = "master"
+    if pr_number != 0:
+        branch_name = "PR #{}".format(pr_number)
+        branch_url = "https://github.com/ClickHouse/ClickHouse/pull/" + str(pr_number)
+    commit_url = f"https://github.com/ClickHouse/ClickHouse/commit/{commit_sha}"
+
+    task_url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+
+    raw_log_url = additional_urls[0]
+    additional_urls.pop(0)
+
+    html_report = create_test_html_report(NAME, test_results, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls, True)
+    with open('report.html', 'w') as f:
+        f.write(html_report)
+
+    url = s3_client.upload_test_report_to_s3('report.html', s3_path_prefix + ".html")
+    logging.info("Search result in url %s", url)
+    return url
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    temp_path = os.getenv("TEMP_PATH", os.path.abspath("."))
+    caches_path = os.getenv("CACHES_PATH", temp_path)
+
+    if not os.path.exists(temp_path):
+        os.makedirs(temp_path)
+
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event)
+
+    gh = Github(get_best_robot_token())
+
+    images_path = os.path.join(temp_path, 'changed_images.json')
+    docker_image = 'clickhouse/fasttest'
+    if os.path.exists(images_path):
+        logging.info("Images file exists")
+        with open(images_path, 'r') as images_fd:
+            images = json.load(images_fd)
+            logging.info("Got images %s", images)
+            if 'clickhouse/fasttest' in images:
+                docker_image += ':' + images['clickhouse/fasttest']
+
+    logging.info("Got docker image %s", docker_image)
+    for i in range(10):
+        try:
+            subprocess.check_output(f"docker pull {docker_image}", shell=True)
+            break
+        except Exception as ex:
+            time.sleep(i * 3)
+            logging.info("Got execption pulling docker %s", ex)
+    else:
+        raise Exception(f"Cannot pull dockerhub for image {docker_image}")
+
+
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+
+    workspace = os.path.join(temp_path, "fasttest-workspace")
+    if not os.path.exists(workspace):
+        os.makedirs(workspace)
+
+    output_path = os.path.join(temp_path, "fasttest-output")
+    if not os.path.exists(output_path):
+        os.makedirs(output_path)
+
+    cache_path = os.path.join(caches_path, "fasttest")
+    if not os.path.exists(cache_path):
+        os.makedirs(cache_path)
+
+    repo_path = os.path.join(temp_path, "fasttest-repo")
+    if not os.path.exists(repo_path):
+        os.makedirs(repo_path)
+
+    run_cmd = get_fasttest_cmd(workspace, output_path, cache_path, repo_path, pr_info.number, pr_info.sha, docker_image)
+    logging.info("Going to run fasttest with cmd %s", run_cmd)
+
+    logs_path = os.path.join(temp_path, "fasttest-logs")
+    if not os.path.exists(logs_path):
+        os.makedirs(logs_path)
+
+    run_log_path = os.path.join(logs_path, 'runlog.log')
+    with open(run_log_path, 'w') as log:
+        retcode = subprocess.Popen(run_cmd, shell=True, stderr=log, stdout=log).wait()
+        if retcode == 0:
+            logging.info("Run successfully")
+        else:
+            logging.info("Run failed")
+
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {cache_path}", shell=True)
+
+    test_output_files = os.listdir(output_path)
+    additional_logs = []
+    for f in test_output_files:
+        additional_logs.append(os.path.join(output_path, f))
+
+    test_log_exists = 'test_log.txt' in test_output_files or 'test_result.txt' in test_output_files
+    test_result_exists = 'test_results.tsv' in test_output_files
+    test_results = []
+    if 'submodule_log.txt' not in test_output_files:
+        description = "Cannot clone repository"
+        state = "failure"
+    elif 'cmake_log.txt' not in test_output_files:
+        description = "Cannot fetch submodules"
+        state = "failure"
+    elif 'build_log.txt' not in test_output_files:
+        description = "Cannot finish cmake"
+        state = "failure"
+    elif 'install_log.txt' not in test_output_files:
+        description = "Cannot build ClickHouse"
+        state = "failure"
+    elif not test_log_exists and not test_result_exists:
+        description = "Cannot install or start ClickHouse"
+        state = "failure"
+    else:
+        state, description, test_results, additional_logs = process_results(output_path)
+
+    report_url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, run_log_path, additional_logs)
+    print("::notice ::Report url: {}".format(report_url))
+    commit = get_commit(gh, pr_info.sha)
+    commit.create_status(context=NAME, description=description, state=state, target_url=report_url)
diff --git a/tests/ci/finish_check.py b/tests/ci/finish_check.py
new file mode 100644
index 00000000000..4833f62443c
--- /dev/null
+++ b/tests/ci/finish_check.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+import logging
+import json
+import os
+from github import Github
+from pr_info import PRInfo
+from get_robot_token import get_best_robot_token
+
+NAME = 'Run Check (actions)'
+
+def filter_statuses(statuses):
+    """
+    Squash statuses to latest state
+    1. context="first", state="success", update_time=1
+    2. context="second", state="success", update_time=2
+    3. context="first", stat="failure", update_time=3
+    =========>
+    1. context="second", state="success"
+    2. context="first", stat="failure"
+    """
+    filt = {}
+    for status in sorted(statuses, key=lambda x: x.updated_at):
+        filt[status.context] = status
+    return filt
+
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event, need_orgs=True)
+    gh = Github(get_best_robot_token())
+    commit = get_commit(gh, pr_info.sha)
+
+    url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+    statuses = filter_statuses(list(commit.get_statuses()))
+    if NAME in statuses and statuses[NAME].state == "pending":
+        commit.create_status(context=NAME, description="All checks finished", state="success", target_url=url)
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
new file mode 100644
index 00000000000..75a0b31a221
--- /dev/null
+++ b/tests/ci/functional_test_check.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env python3
+
+import csv
+import logging
+import subprocess
+import os
+import json
+import time
+import sys
+
+from github import Github
+import requests
+
+from report import create_test_html_report
+from s3_helper import S3Helper
+from get_robot_token import get_best_robot_token
+from pr_info import PRInfo
+
+DOWNLOAD_RETRIES_COUNT = 5
+
+def process_logs(s3_client, additional_logs, s3_path_prefix):
+    additional_urls = []
+    for log_path in additional_logs:
+        if log_path:
+            additional_urls.append(
+                s3_client.upload_test_report_to_s3(
+                    log_path,
+                    s3_path_prefix + "/" + os.path.basename(log_path)))
+
+    return additional_urls
+
+
+def upload_results(s3_client, pr_number, commit_sha, test_results, raw_log, additional_files, check_name):
+    additional_files = [raw_log] + additional_files
+    s3_path_prefix = f"{pr_number}/{commit_sha}/" + check_name.lower().replace(' ', '_').replace('(', '_').replace(')', '_').replace(',', '_')
+    additional_urls = process_logs(s3_client, additional_files, s3_path_prefix)
+
+    branch_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
+    branch_name = "master"
+    if pr_number != 0:
+        branch_name = f"PR #{pr_number}"
+        branch_url = f"https://github.com/ClickHouse/ClickHouse/pull/{pr_number}"
+    commit_url = f"https://github.com/ClickHouse/ClickHouse/commit/{commit_sha}"
+
+    task_url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+
+    raw_log_url = additional_urls[0]
+    additional_urls.pop(0)
+
+    html_report = create_test_html_report(check_name, test_results, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls, True)
+    with open('report.html', 'w', encoding='utf-8') as f:
+        f.write(html_report)
+
+    url = s3_client.upload_test_report_to_s3('report.html', s3_path_prefix + ".html")
+    logging.info("Search result in url %s", url)
+    return url
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+def get_image_name(check_name):
+    if 'stateless' in check_name.lower():
+        return 'clickhouse/stateless-test'
+    if 'stateful' in  check_name.lower():
+        return 'clickhouse/stateful-test'
+    else:
+        raise Exception(f"Cannot deduce image name based on check name {check_name}")
+
+
+def dowload_build_with_progress(url, path):
+    logging.info("Downloading from %s to temp path %s", url, path)
+    for i in range(DOWNLOAD_RETRIES_COUNT):
+        try:
+            with open(path, 'wb') as f:
+                response = requests.get(url, stream=True)
+                response.raise_for_status()
+                total_length = response.headers.get('content-length')
+                if total_length is None or int(total_length) == 0:
+                    logging.info("No content-length, will download file without progress")
+                    f.write(response.content)
+                else:
+                    dl = 0
+                    total_length = int(total_length)
+                    logging.info("Content length is %ld bytes", total_length)
+                    for data in response.iter_content(chunk_size=4096):
+                        dl += len(data)
+                        f.write(data)
+                        if sys.stdout.isatty():
+                            done = int(50 * dl / total_length)
+                            percent = int(100 * float(dl) / total_length)
+                            eq_str = '=' * done
+                            space_str = ' ' * (50 - done)
+                            sys.stdout.write(f"\r[{eq_str}{space_str}] {percent}%")
+                            sys.stdout.flush()
+            break
+        except Exception as ex:
+            sys.stdout.write("\n")
+            time.sleep(3)
+            logging.info("Exception while downloading %s, retry %s", ex, i + 1)
+            if os.path.exists(path):
+                os.remove(path)
+    else:
+        raise Exception(f"Cannot download dataset from {url}, all retries exceeded")
+
+    sys.stdout.write("\n")
+    logging.info("Downloading finished")
+
+
+def download_builds(result_path, build_urls):
+    for url in build_urls:
+        if url.endswith('.deb'):
+            fname = os.path.basename(url)
+            logging.info("Will download %s to %s", fname, result_path)
+            dowload_build_with_progress(url, os.path.join(result_path, fname))
+
+
+def get_build_config(build_number, repo_path):
+    ci_config_path = os.path.join(repo_path, "tests/ci/ci_config.json")
+    with open(ci_config_path, 'r', encoding='utf-8') as ci_config:
+        config_dict = json.load(ci_config)
+        return config_dict['build_config'][build_number]
+
+def get_build_urls(build_config_str, reports_path):
+    for root, _, files in os.walk(reports_path):
+        for f in files:
+            if build_config_str in f :
+                logging.info("Found build report json %s", f)
+                with open(os.path.join(root, f), 'r', encoding='utf-8') as file_handler:
+                    build_report = json.load(file_handler)
+                    return build_report['build_urls']
+    return []
+
+def build_config_to_string(build_config):
+    if build_config["package-type"] == "performance":
+        return "performance"
+
+    return "_".join([
+        build_config['compiler'],
+        build_config['build-type'] if build_config['build-type'] else "relwithdebuginfo",
+        build_config['sanitizer'] if build_config['sanitizer'] else "none",
+        build_config['bundled'],
+        build_config['splitted'],
+        "tidy" if build_config['tidy'] == "enable" else "notidy",
+        "with_coverage" if build_config['with_coverage'] else "without_coverage",
+        build_config['package-type'],
+    ])
+
+def get_run_command(builds_path, result_path, server_log_path, kill_timeout, additional_envs, image):
+    additional_options = ['--hung-check']
+    additional_options.append('--print-time')
+    additional_options_str = '-e ADDITIONAL_OPTIONS="' + ' '.join(additional_options) + '"'
+
+    envs = [f'-e MAX_RUN_TIME={int(0.9 * kill_timeout)}', '-e S3_URL="https://clickhouse-datasets.s3.amazonaws.com"']
+    envs += [f'-e {e}' for e in additional_envs]
+    env_str = ' '.join(envs)
+
+    return f"docker run --volume={builds_path}:/package_folder " \
+        f"--volume={result_path}:/test_output --volume={server_log_path}:/var/log/clickhouse-server " \
+        f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"
+
+
+def process_results(result_folder, server_log_path):
+    test_results = []
+    additional_files = []
+    # Just upload all files from result_folder.
+    # If task provides processed results, then it's responsible for content of result_folder.
+    if os.path.exists(result_folder):
+        test_files = [f for f in os.listdir(result_folder) if os.path.isfile(os.path.join(result_folder, f))]
+        additional_files = [os.path.join(result_folder, f) for f in test_files]
+
+    if os.path.exists(server_log_path):
+        server_log_files = [f for f in os.listdir(server_log_path) if os.path.isfile(os.path.join(server_log_path, f))]
+        additional_files = additional_files + [os.path.join(server_log_path, f) for f in server_log_files]
+
+    status_path = os.path.join(result_folder, "check_status.tsv")
+    logging.info("Found test_results.tsv")
+    with open(status_path, 'r', encoding='utf-8') as status_file:
+        status = list(csv.reader(status_file, delimiter='\t'))
+
+    if len(status) != 1 or len(status[0]) != 2:
+        return "error", "Invalid check_status.tsv", test_results, additional_files
+    state, description = status[0][0], status[0][1]
+
+    results_path = os.path.join(result_folder, "test_results.tsv")
+    with open(results_path, 'r', encoding='utf-8') as results_file:
+        test_results = list(csv.reader(results_file, delimiter='\t'))
+    if len(test_results) == 0:
+        raise Exception("Empty results")
+
+    return state, description, test_results, additional_files
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    temp_path = os.getenv("TEMP_PATH", os.path.abspath("."))
+    repo_path = os.getenv("REPO_COPY", os.path.abspath("../../"))
+    reports_path = os.getenv("REPORTS_PATH", "./reports")
+
+    check_name = sys.argv[1]
+    build_number = int(sys.argv[2])
+    kill_timeout = int(sys.argv[3])
+
+    if not os.path.exists(temp_path):
+        os.makedirs(temp_path)
+
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r', encoding='utf-8') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event)
+
+    gh = Github(get_best_robot_token())
+
+
+    for root, _, files in os.walk(reports_path):
+        for f in files:
+            if f == 'changed_images.json':
+                images_path = os.path.join(root, 'changed_images.json')
+                break
+
+    image_name = get_image_name(check_name)
+
+    docker_image = image_name
+    if images_path and os.path.exists(images_path):
+        logging.info("Images file exists")
+        with open(images_path, 'r', encoding='utf-8') as images_fd:
+            images = json.load(images_fd)
+            logging.info("Got images %s", images)
+            if image_name in images:
+                docker_image += ':' + images[image_name]
+    else:
+        logging.info("Images file not found")
+
+    for i in range(10):
+        try:
+            logging.info("Pulling image %s", docker_image)
+            subprocess.check_output(f"docker pull {docker_image}", stderr=subprocess.STDOUT, shell=True)
+            break
+        except Exception as ex:
+            time.sleep(i * 3)
+            logging.info("Got execption pulling docker %s", ex)
+    else:
+        raise Exception(f"Cannot pull dockerhub for image docker pull {docker_image}")
+
+    build_config = get_build_config(build_number, repo_path)
+    build_config_str = build_config_to_string(build_config)
+    urls = get_build_urls(build_config_str, reports_path)
+    if not urls:
+        raise Exception("No build URLs found")
+
+    packages_path = os.path.join(temp_path, "packages")
+    if not os.path.exists(packages_path):
+        os.makedirs(packages_path)
+
+    server_log_path = os.path.join(temp_path, "server_log")
+    if not os.path.exists(server_log_path):
+        os.makedirs(server_log_path)
+
+    result_path = os.path.join(temp_path, "result_path")
+    if not os.path.exists(result_path):
+        os.makedirs(result_path)
+
+    run_log_path = os.path.join(result_path, "runlog.log")
+
+    download_builds(packages_path, urls)
+    run_command = get_run_command(packages_path, result_path, server_log_path, kill_timeout, [], docker_image)
+    logging.info("Going to run func tests: %s", run_command)
+
+    with open(run_log_path, 'w', encoding='utf-8') as log:
+        with subprocess.Popen(run_command, shell=True, stderr=log, stdout=log) as process:
+            retcode = process.wait()
+            if retcode == 0:
+                logging.info("Run successfully")
+            else:
+                logging.info("Run failed")
+
+    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
+
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+    state, description, test_results, additional_logs = process_results(result_path, server_log_path)
+    report_url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, run_log_path, additional_logs, check_name)
+    print(f"::notice ::Report url: {report_url}")
+    commit = get_commit(gh, pr_info.sha)
+    commit.create_status(context=check_name, description=description, state=state, target_url=report_url)
diff --git a/tests/ci/get_robot_token.py b/tests/ci/get_robot_token.py
new file mode 100644
index 00000000000..db37ee311c5
--- /dev/null
+++ b/tests/ci/get_robot_token.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+import boto3
+from github import Github
+
+def get_parameter_from_ssm(name, decrypt=True, client=None):
+    if not client:
+        client = boto3.client('ssm', region_name='us-east-1')
+    return client.get_parameter(Name=name, WithDecryption=decrypt)['Parameter']['Value']
+
+def get_best_robot_token(token_prefix_env_name="github_robot_token_", total_tokens=4):
+    client = boto3.client('ssm', region_name='us-east-1')
+    tokens = {}
+    for i in range(1, total_tokens + 1):
+        token_name = token_prefix_env_name + str(i)
+        token = get_parameter_from_ssm(token_name, True, client)
+        gh = Github(token)
+        rest, _ = gh.rate_limiting
+        tokens[token] = rest
+
+    return max(tokens.items(), key=lambda x: x[1])[0]
diff --git a/tests/ci/metrics_lambda/Dockerfile b/tests/ci/metrics_lambda/Dockerfile
new file mode 100644
index 00000000000..f53be71a893
--- /dev/null
+++ b/tests/ci/metrics_lambda/Dockerfile
@@ -0,0 +1,13 @@
+FROM public.ecr.aws/lambda/python:3.9
+
+# Copy function code
+COPY app.py ${LAMBDA_TASK_ROOT}
+
+# Install the function's dependencies using file requirements.txt
+# from your project folder.
+
+COPY requirements.txt  .
+RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
+
+# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
+CMD [ "app.handler" ]
diff --git a/tests/ci/metrics_lambda/app.py b/tests/ci/metrics_lambda/app.py
new file mode 100644
index 00000000000..8c7807e99cc
--- /dev/null
+++ b/tests/ci/metrics_lambda/app.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python3
+
+import requests
+import argparse
+import jwt
+import sys
+import json
+import time
+from collections import namedtuple
+
+def get_key_and_app_from_aws():
+    import boto3
+    secret_name = "clickhouse_github_secret_key"
+    session = boto3.session.Session()
+    client = session.client(
+        service_name='secretsmanager',
+    )
+    get_secret_value_response = client.get_secret_value(
+        SecretId=secret_name
+    )
+    data = json.loads(get_secret_value_response['SecretString'])
+    return data['clickhouse-app-key'], int(data['clickhouse-app-id'])
+
+def handler(event, context):
+    private_key, app_id = get_key_and_app_from_aws()
+    main(private_key, app_id, True)
+
+def get_installation_id(jwt_token):
+    headers = {
+        "Authorization": f"Bearer {jwt_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.get("https://api.github.com/app/installations", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data[0]['id']
+
+def get_access_token(jwt_token, installation_id):
+    headers = {
+        "Authorization": f"Bearer {jwt_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.post(f"https://api.github.com/app/installations/{installation_id}/access_tokens", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data['token']
+
+
+RunnerDescription = namedtuple('RunnerDescription', ['id', 'name', 'tags', 'offline', 'busy'])
+
+def list_runners(access_token):
+    headers = {
+        "Authorization": f"token {access_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    response = requests.get("https://api.github.com/orgs/ClickHouse/actions/runners", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    print("Total runners", data['total_count'])
+    runners = data['runners']
+    result = []
+    for runner in runners:
+        tags = [tag['name'] for tag in runner['labels']]
+        desc = RunnerDescription(id=runner['id'], name=runner['name'], tags=tags,
+                                 offline=runner['status']=='offline', busy=runner['busy'])
+        result.append(desc)
+    return result
+
+def group_runners_by_tag(listed_runners):
+    result = {}
+
+    RUNNER_TYPE_LABELS = ['style-checker', 'builder', 'func-tester']
+    for runner in listed_runners:
+        for tag in runner.tags:
+            if tag in RUNNER_TYPE_LABELS:
+                if tag not in result:
+                    result[tag] = []
+                result[tag].append(runner)
+                break
+        else:
+            if 'unlabeled' not in result:
+                result['unlabeled'] = []
+            result['unlabeled'].append(runner)
+    return result
+
+
+def push_metrics_to_cloudwatch(listed_runners, namespace):
+    import boto3
+    client = boto3.client('cloudwatch')
+    metrics_data = []
+    busy_runners = sum(1 for runner in listed_runners if runner.busy)
+    metrics_data.append({
+        'MetricName': 'BusyRunners',
+        'Value': busy_runners,
+        'Unit': 'Count',
+    })
+    total_active_runners = sum(1 for runner in listed_runners if not runner.offline)
+    metrics_data.append({
+        'MetricName': 'ActiveRunners',
+        'Value': total_active_runners,
+        'Unit': 'Count',
+    })
+    total_runners = len(listed_runners)
+    metrics_data.append({
+        'MetricName': 'TotalRunners',
+        'Value': total_runners,
+        'Unit': 'Count',
+    })
+    if total_active_runners == 0:
+        busy_ratio = 100
+    else:
+        busy_ratio = busy_runners / total_active_runners * 100
+
+    metrics_data.append({
+        'MetricName': 'BusyRunnersRatio',
+        'Value': busy_ratio,
+        'Unit': 'Percent',
+    })
+
+    client.put_metric_data(Namespace=namespace, MetricData=metrics_data)
+
+def main(github_secret_key, github_app_id, push_to_cloudwatch):
+    payload = {
+        "iat": int(time.time()) - 60,
+        "exp": int(time.time()) + (10 * 60),
+        "iss": github_app_id,
+    }
+
+    encoded_jwt = jwt.encode(payload, github_secret_key, algorithm="RS256")
+    installation_id = get_installation_id(encoded_jwt)
+    access_token = get_access_token(encoded_jwt, installation_id)
+    runners = list_runners(access_token)
+    grouped_runners = group_runners_by_tag(runners)
+    for group, group_runners in grouped_runners.items():
+        if push_to_cloudwatch:
+            push_metrics_to_cloudwatch(group_runners, 'RunnersMetrics/' + group)
+        else:
+            print(group)
+            for runner in group_runners:
+                print('\t', runner)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Get list of runners and their states')
+    parser.add_argument('-p', '--private-key-path', help='Path to file with private key')
+    parser.add_argument('-k', '--private-key', help='Private key')
+    parser.add_argument('-a', '--app-id', type=int, help='GitHub application ID', required=True)
+    parser.add_argument('--push-to-cloudwatch', action='store_true',  help='Store received token in parameter store')
+
+    args = parser.parse_args()
+
+    if not args.private_key_path and not args.private_key:
+        print("Either --private-key-path or --private-key must be specified", file=sys.stderr)
+
+    if args.private_key_path and args.private_key:
+        print("Either --private-key-path or --private-key must be specified", file=sys.stderr)
+
+    if args.private_key:
+        private_key = args.private_key
+    else:
+        with open(args.private_key_path, 'r') as key_file:
+            private_key = key_file.read()
+
+    main(private_key, args.app_id, args.push_to_cloudwatch)
diff --git a/tests/ci/metrics_lambda/requirements.txt b/tests/ci/metrics_lambda/requirements.txt
new file mode 100644
index 00000000000..c0dcf4a4dde
--- /dev/null
+++ b/tests/ci/metrics_lambda/requirements.txt
@@ -0,0 +1,3 @@
+requests
+PyJWT
+cryptography
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
new file mode 100644
index 00000000000..0b4aeb56699
--- /dev/null
+++ b/tests/ci/pr_info.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+import urllib
+import requests
+from unidiff import PatchSet
+
+
+class PRInfo:
+    def __init__(self, github_event, need_orgs=False, need_changed_files=False):
+        self.number = github_event['number']
+        if 'after' in github_event:
+            self.sha = github_event['after']
+        else:
+            self.sha = github_event['pull_request']['head']['sha']
+
+        self.labels = { l['name'] for l in github_event['pull_request']['labels'] }
+        self.user_login = github_event['pull_request']['user']['login']
+        self.user_orgs = set([])
+        if need_orgs:
+            user_orgs_response = requests.get(github_event['pull_request']['user']['organizations_url'])
+            if user_orgs_response.ok:
+                response_json = user_orgs_response.json()
+                self.user_orgs = set(org['id'] for org in response_json)
+
+        self.changed_files = set([])
+        if need_changed_files:
+            diff_url = github_event['pull_request']['diff_url']
+            diff = urllib.request.urlopen(diff_url)
+            diff_object = PatchSet(diff, diff.headers.get_charsets()[0])
+            self.changed_files = { f.path for f in diff_object }
+
+    def get_dict(self):
+        return {
+            'sha': self.sha,
+            'number': self.number,
+            'labels': self.labels,
+            'user_login': self.user_login,
+            'user_orgs': self.user_orgs,
+        }
+
+
+class FakePRInfo:
+    def __init__(self):
+        self.number = 11111
+        self.sha = "xxxxxxxxxxxxxxxxxx"
diff --git a/tests/ci/pvs_check.py b/tests/ci/pvs_check.py
new file mode 100644
index 00000000000..96dfb01e234
--- /dev/null
+++ b/tests/ci/pvs_check.py
@@ -0,0 +1,143 @@
+#!/usr/bin/env python3
+
+# pylint: disable=line-too-long
+
+import subprocess
+import os
+import json
+import logging
+import sys
+from github import Github
+from report import create_test_html_report
+from s3_helper import S3Helper
+from pr_info import PRInfo
+from get_robot_token import get_best_robot_token, get_parameter_from_ssm
+
+NAME = 'PVS Studio (actions)'
+LICENCE_NAME = 'Free license: ClickHouse, Yandex'
+HTML_REPORT_FOLDER = 'pvs-studio-html-report'
+TXT_REPORT_NAME = 'pvs-studio-task-report.txt'
+
+def process_logs(s3_client, additional_logs, s3_path_prefix):
+    additional_urls = []
+    for log_path in additional_logs:
+        if log_path:
+            additional_urls.append(
+                s3_client.upload_test_report_to_s3(
+                    log_path,
+                    s3_path_prefix + "/" + os.path.basename(log_path)))
+
+    return additional_urls
+
+def _process_txt_report(path):
+    warnings = []
+    errors = []
+    with open(path, 'r') as report_file:
+        for line in report_file:
+            if 'viva64' in line:
+                continue
+
+            if 'warn' in line:
+                warnings.append(':'.join(line.split('\t')[0:2]))
+            elif 'err' in line:
+                errors.append(':'.join(line.split('\t')[0:2]))
+
+    return warnings, errors
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+def upload_results(s3_client, pr_number, commit_sha, test_results, additional_files):
+    s3_path_prefix = str(pr_number) + "/" + commit_sha + "/" + NAME.lower().replace(' ', '_')
+    additional_urls = process_logs(s3_client, additional_files, s3_path_prefix)
+
+    branch_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
+    branch_name = "master"
+    if pr_number != 0:
+        branch_name = "PR #{}".format(pr_number)
+        branch_url = "https://github.com/ClickHouse/ClickHouse/pull/" + str(pr_number)
+    commit_url = f"https://github.com/ClickHouse/ClickHouse/commit/{commit_sha}"
+
+    task_url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+
+    raw_log_url = additional_urls[0]
+    additional_urls.pop(0)
+
+    html_report = create_test_html_report(NAME, test_results, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls)
+    with open('report.html', 'w') as f:
+        f.write(html_report)
+
+    url = s3_client.upload_test_report_to_s3('report.html', s3_path_prefix + ".html")
+    logging.info("Search result in url %s", url)
+    return url
+
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    repo_path = os.path.join(os.getenv("REPO_COPY", os.path.abspath("../../")))
+    temp_path = os.path.join(os.getenv("RUNNER_TEMP", os.path.abspath("./temp")), 'pvs_check')
+
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+    pr_info = PRInfo(event)
+    # this check modify repository so copy it to the temp directory
+    logging.info("Repo copy path %s", repo_path)
+
+    gh = Github(get_best_robot_token())
+
+    images_path = os.path.join(temp_path, 'changed_images.json')
+    docker_image = 'clickhouse/pvs-test'
+    if os.path.exists(images_path):
+        logging.info("Images file exists")
+        with open(images_path, 'r') as images_fd:
+            images = json.load(images_fd)
+            logging.info("Got images %s", images)
+            if 'clickhouse/pvs-test' in images:
+                docker_image += ':' + images['clickhouse/pvs-test']
+
+    logging.info("Got docker image %s", docker_image)
+
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+
+    licence_key = get_parameter_from_ssm('pvs_studio_key')
+    cmd = f"docker run -u $(id -u ${{USER}}):$(id -g ${{USER}}) --volume={repo_path}:/repo_folder --volume={temp_path}:/test_output -e LICENCE_NAME='{LICENCE_NAME}' -e LICENCE_KEY='{licence_key}' {docker_image}"
+    commit = get_commit(gh, pr_info.sha)
+
+    try:
+        subprocess.check_output(cmd, shell=True)
+    except:
+        commit.create_status(context=NAME, description='PVS report failed to build', state='failure', target_url=f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}")
+        sys.exit(1)
+
+    try:
+        s3_path_prefix = str(pr_info.number) + "/" + pr_info.sha + "/" + NAME.lower().replace(' ', '_')
+        html_urls = s3_helper.upload_test_folder_to_s3(os.path.join(temp_path, HTML_REPORT_FOLDER), s3_path_prefix)
+        index_html = None
+
+        for url in html_urls:
+            if 'index.html' in url:
+                index_html = '<a href="{}">HTML report</a>'.format(url)
+                break
+
+        if not index_html:
+            commit.create_status(context=NAME, description='PVS report failed to build', state='failure', target_url=f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}")
+            sys.exit(1)
+
+        txt_report = os.path.join(temp_path, TXT_REPORT_NAME)
+        warnings, errors = _process_txt_report(txt_report)
+        errors = errors + warnings
+
+        status = 'success'
+        test_results = [(index_html, "Look at the report"), ("Errors count not checked", "OK")]
+        description = "Total errors {}".format(len(errors))
+        additional_logs = [txt_report, os.path.join(temp_path, 'pvs-studio.log')]
+        report_url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, additional_logs)
+
+        print("::notice ::Report url: {}".format(report_url))
+        commit = get_commit(gh, pr_info.sha)
+        commit.create_status(context=NAME, description=description, state=status, target_url=report_url)
+    except Exception as ex:
+        print("Got an exception", ex)
+        sys.exit(1)
diff --git a/tests/ci/report.py b/tests/ci/report.py
new file mode 100644
index 00000000000..156e6096605
--- /dev/null
+++ b/tests/ci/report.py
@@ -0,0 +1,324 @@
+# -*- coding: utf-8 -*-
+import os
+import datetime
+
+### FIXME: BEST FRONTEND PRACTICIES BELOW
+
+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; }}
+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; }}
+border: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }}
+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; }}
+.failed-content.open {{}}
+.failed-content {{ display: none; }}
+
+  </style>
+  <title>{title}</title>
+</head>
+<body>
+<div class="main">
+
+<h1>{header}</h1>
+<p class="links">
+<a href="{raw_log_url}">{raw_log_name}</a>
+<a href="{commit_url}">Commit</a>
+{additional_urls}
+<a href="{task_url}">Task (github actions)</a>
+</p>
+{test_part}
+</body>
+<script type="text/javascript">
+    /// Straight from https://stackoverflow.com/questions/14267781/sorting-html-table-with-javascript
+
+    const getCellValue = (tr, idx) => {{
+        var classes = tr.classList;
+        var elem = tr;
+        if (classes.contains("failed-content") || classes.contains("failed-content.open"))
+            elem = tr.previousElementSibling;
+        return elem.children[idx].innerText || elem.children[idx].textContent;
+    }}
+
+    const comparer = (idx, asc) => (a, b) => ((v1, v2) =>
+        v1 !== '' && v2 !== '' && !isNaN(v1) && !isNaN(v2) ? v1 - v2 : v1.toString().localeCompare(v2)
+        )(getCellValue(asc ? a : b, idx), getCellValue(asc ? b : a, idx));
+
+    // do the work...
+    document.querySelectorAll('th').forEach(th => th.addEventListener('click', (() => {{
+        const table = th.closest('table');
+        Array.from(table.querySelectorAll('tr:nth-child(n+2)'))
+            .sort(comparer(Array.from(th.parentNode.children).indexOf(th), this.asc = !this.asc))
+            .forEach(tr => table.appendChild(tr) );
+    }})));
+
+    Array.from(document.getElementsByClassName("failed")).forEach(tr => tr.addEventListener('click', function() {{
+        var content = this.nextElementSibling;
+        content.classList.toggle("failed-content.open");
+        content.classList.toggle("failed-content");
+    }}));
+</script>
+</html>
+"""
+
+HTML_TEST_PART = """
+<table>
+<tr>
+{headers}
+</tr>
+{rows}
+</table>
+"""
+
+BASE_HEADERS = ['Test name', 'Test status']
+
+
+def _format_header(header, branch_name, branch_url=None):
+    result = ' '.join([w.capitalize() for w in header.split(' ')])
+    result = result.replace("Clickhouse", "ClickHouse")
+    result = result.replace("clickhouse", "ClickHouse")
+    if 'ClickHouse' not in result:
+        result = 'ClickHouse ' + result
+    result += ' for '
+    if branch_url:
+        result += '<a href="{url}">{name}</a>'.format(url=branch_url, name=branch_name)
+    else:
+        result += branch_name
+    return result
+
+
+def _get_status_style(status):
+    style = "font-weight: bold;"
+    if status in ('OK', 'success', 'PASSED'):
+        style += 'color: #0A0;'
+    elif status in ('FAIL', 'failure', 'error', 'FAILED', 'Timeout'):
+        style += 'color: #F00;'
+    else:
+        style += 'color: #FFB400;'
+    return style
+
+
+def _get_html_url(url):
+    if isinstance(url, str):
+        return '<a href="{url}">{name}</a>'.format(url=url, name=os.path.basename(url).replace('%2B', '+').replace('%20', ' '))
+    if isinstance(url, tuple):
+        return '<a href="{url}">{name}</a>'.format(url=url[0], name=url[1].replace('%2B', '+').replace('%20', ' '))
+    return ''
+
+
+def create_test_html_report(header, test_result, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls=None, with_raw_logs=False):
+    if additional_urls is None:
+        additional_urls = []
+
+    if test_result:
+        rows_part = ""
+        num_fails = 0
+        has_test_time = False
+        has_test_logs = False
+        for result in test_result:
+            test_name = result[0]
+            test_status = result[1]
+
+            test_logs = None
+            test_time = None
+            if len(result) > 2:
+                test_time = result[2]
+                has_test_time = True
+
+            if len(result) > 3:
+                test_logs = result[3]
+                has_test_logs = True
+
+            row = "<tr>"
+            is_fail = test_status in ('FAIL', 'FLAKY')
+            if is_fail and with_raw_logs and test_logs is not None:
+                row = "<tr class=\"failed\">"
+            row += "<td>" + test_name + "</td>"
+            style = _get_status_style(test_status)
+
+            # Allow to quickly scroll to the first failure.
+            is_fail_id = ""
+            if is_fail:
+                num_fails = num_fails + 1
+                is_fail_id = 'id="fail' + str(num_fails) + '" '
+
+            row += '<td ' + is_fail_id + 'style="{}">'.format(style) + test_status + "</td>"
+
+            if test_time is not None:
+                row += "<td>" + test_time + "</td>"
+
+            if test_logs is not None and not with_raw_logs:
+                test_logs_html = "<br>".join([_get_html_url(url) for url in test_logs])
+                row += "<td>" + test_logs_html + "</td>"
+
+            row += "</tr>"
+            rows_part += row
+            if test_logs is not None and with_raw_logs:
+                row = "<tr class=\"failed-content\">"
+                # TODO: compute colspan too
+                row += "<td colspan=\"3\"><pre>" + test_logs + "</pre></td>"
+                row += "</tr>"
+                rows_part += row
+
+        headers = BASE_HEADERS
+        if has_test_time:
+            headers.append('Test time, sec.')
+        if has_test_logs and not with_raw_logs:
+            headers.append('Logs')
+
+        headers = ''.join(['<th>' + h + '</th>' for h in headers])
+        test_part = HTML_TEST_PART.format(headers=headers, rows=rows_part)
+    else:
+        test_part = ""
+
+    additional_html_urls = ""
+    for url in additional_urls:
+        additional_html_urls += ' ' + _get_html_url(url)
+
+    result = HTML_BASE_TEST_TEMPLATE.format(
+        title=_format_header(header, branch_name),
+        header=_format_header(header, branch_name, branch_url),
+        raw_log_name=os.path.basename(raw_log_url),
+        raw_log_url=raw_log_url,
+        task_url=task_url,
+        test_part=test_part,
+        branch_name=branch_name,
+        commit_url=commit_url,
+        additional_urls=additional_html_urls
+    )
+    return result
+
+
+HTML_BASE_BUILD_TEMPLATE = """
+<!DOCTYPE html>
+<html>
+<head>
+  <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; }}
+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;
+border: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05), 0 8px 25px -5px rgba(0, 0, 0, 0.1); }}
+a {{ color: #06F; text-decoration: none; }}
+a:hover, a:active {{ color: #F40; text-decoration: underline; }}
+table {{ border: 0; }}
+.main {{ margin: auto; }}
+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); }}
+tr:hover td {{filter: brightness(95%);}}
+  </style>
+<title>{title}</title>
+</head>
+<body>
+<div class="main">
+<h1>{header}</h1>
+<table>
+<tr>
+<th>Compiler</th>
+<th>Build type</th>
+<th>Sanitizer</th>
+<th>Bundled</th>
+<th>Splitted</th>
+<th>Status</th>
+<th>Build log</th>
+<th>Build time</th>
+<th class="artifacts">Artifacts</th>
+</tr>
+{rows}
+</table>
+<p class="links">
+<a href="{commit_url}">Commit</a>
+<a href="{task_url}">Task (github actions)</a>
+</p>
+</body>
+</html>
+"""
+
+LINK_TEMPLATE = '<a href="{url}">{text}</a>'
+
+
+def create_build_html_report(header, build_results, build_logs_urls, artifact_urls_list, task_url, branch_url, branch_name, commit_url):
+    rows = ""
+    for (build_result, build_log_url, artifact_urls) in zip(build_results, build_logs_urls, artifact_urls_list):
+        row = "<tr>"
+        row += "<td>{}</td>".format(build_result.compiler)
+        if build_result.build_type:
+            row += "<td>{}</td>".format(build_result.build_type)
+        else:
+            row += "<td>{}</td>".format("relwithdebuginfo")
+        if build_result.sanitizer:
+            row += "<td>{}</td>".format(build_result.sanitizer)
+        else:
+            row += "<td>{}</td>".format("none")
+
+        row += "<td>{}</td>".format(build_result.bundled)
+        row += "<td>{}</td>".format(build_result.splitted)
+
+        if build_result.status:
+            style = _get_status_style(build_result.status)
+            row += '<td style="{}">{}</td>'.format(style, build_result.status)
+        else:
+            style = _get_status_style("error")
+            row += '<td style="{}">{}</td>'.format(style, "error")
+
+        row += '<td><a href="{}">link</a></td>'.format(build_log_url)
+
+        if build_result.elapsed_seconds:
+            delta = datetime.timedelta(seconds=build_result.elapsed_seconds)
+        else:
+            delta = 'unknown'
+
+        row += '<td>{}</td>'.format(str(delta))
+
+        links = ""
+        link_separator = "<br/>"
+        if artifact_urls:
+            for artifact_url in artifact_urls:
+                links += LINK_TEMPLATE.format(text=os.path.basename(artifact_url.replace('%2B', '+').replace('%20', ' ')), url=artifact_url)
+                links += link_separator
+            if links:
+                links = links[:-len(link_separator)]
+            row += "<td>{}</td>".format(links)
+
+        row += "</tr>"
+        rows += row
+    return HTML_BASE_BUILD_TEMPLATE.format(
+        title=_format_header(header, branch_name),
+        header=_format_header(header, branch_name, branch_url),
+        rows=rows,
+        task_url=task_url,
+        branch_name=branch_name,
+        commit_url=commit_url)
diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
new file mode 100644
index 00000000000..2af50c895da
--- /dev/null
+++ b/tests/ci/run_check.py
@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+import os
+import json
+import sys
+import logging
+from github import Github
+from pr_info import PRInfo
+from get_robot_token import get_best_robot_token
+
+NAME = 'Run Check (actions)'
+
+TRUSTED_ORG_IDS = {
+    7409213,   # yandex
+    28471076,  # altinity
+    54801242,  # clickhouse
+}
+
+OK_TEST_LABEL = set(["can be tested", "release", "pr-documentation", "pr-doc-fix"])
+DO_NOT_TEST_LABEL = "do not test"
+
+# Individual trusted contirbutors who are not in any trusted organization.
+# Can be changed in runtime: we will append users that we learned to be in
+# a trusted org, to save GitHub API calls.
+TRUSTED_CONTRIBUTORS = {
+    "achimbab",
+    "adevyatova ",  # DOCSUP
+    "Algunenano",   # Raúl Marín, Tinybird
+    "AnaUvarova",   # DOCSUP
+    "anauvarova",   # technical writer, Yandex
+    "annvsh",       # technical writer, Yandex
+    "atereh",       # DOCSUP
+    "azat",
+    "bharatnc",     # Newbie, but already with many contributions.
+    "bobrik",       # Seasoned contributor, CloundFlare
+    "BohuTANG",
+    "damozhaeva",   # DOCSUP
+    "den-crane",
+    "gyuton",       # DOCSUP
+    "gyuton",       # technical writer, Yandex
+    "hagen1778",    # Roman Khavronenko, seasoned contributor
+    "hczhcz",
+    "hexiaoting",   # Seasoned contributor
+    "ildus",        # adjust, ex-pgpro
+    "javisantana",  # a Spanish ClickHouse enthusiast, ex-Carto
+    "ka1bi4",       # DOCSUP
+    "kirillikoff",  # DOCSUP
+    "kitaisreal",   # Seasoned contributor
+    "kreuzerkrieg",
+    "lehasm",       # DOCSUP
+    "michon470",    # DOCSUP
+    "MyroTk",       # Tester in Altinity
+    "myrrc",        # Michael Kot, Altinity
+    "nikvas0",
+    "nvartolomei",
+    "olgarev",      # DOCSUP
+    "otrazhenia",   # Yandex docs contractor
+    "pdv-ru",       # DOCSUP
+    "podshumok",    # cmake expert from QRator Labs
+    "s-mx",         # Maxim Sabyanin, former employee, present contributor
+    "sevirov",      # technical writer, Yandex
+    "spongedu",     # Seasoned contributor
+    "ucasFL",       # Amos Bird's friend
+    "vdimir",       # Employee
+    "vzakaznikov",
+    "YiuRULE",
+    "zlobober"      # Developer of YT
+}
+
+
+def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
+    if pr_user_login in TRUSTED_CONTRIBUTORS:
+        logging.info("User '%s' is trusted", pr_user_login)
+        return True
+
+    logging.info("User '%s' is not trusted", pr_user_login)
+
+    for org_id in pr_user_orgs:
+        if org_id in TRUSTED_ORG_IDS:
+            logging.info("Org '%s' is trusted; will mark user %s as trusted", org_id, pr_user_login)
+            return True
+        logging.info("Org '%s' is not trusted", org_id)
+
+    return False
+
+# Returns whether we should look into individual checks for this PR. If not, it
+# can be skipped entirely.
+def should_run_checks_for_pr(pr_info):
+    # Consider the labels and whether the user is trusted.
+    force_labels = set(['force tests']).intersection(pr_info.labels)
+    if force_labels:
+        return True, "Labeled '{}'".format(', '.join(force_labels))
+
+    if 'do not test' in pr_info.labels:
+        return False, "Labeled 'do not test'"
+
+    if 'can be tested' not in pr_info.labels and not pr_is_by_trusted_user(pr_info.user_login, pr_info.user_orgs):
+        return False, "Needs 'can be tested' label"
+
+    if 'release' in pr_info.labels or 'pr-backport' in pr_info.labels or 'pr-cherrypick' in pr_info.labels:
+        return False, "Don't try new checks for release/backports/cherry-picks"
+
+    return True, "No special conditions apply"
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+
+    pr_info = PRInfo(event, need_orgs=True)
+    can_run, description = should_run_checks_for_pr(pr_info)
+    gh = Github(get_best_robot_token())
+    commit = get_commit(gh, pr_info.sha)
+    url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+    if not can_run:
+        print("::notice ::Cannot run")
+        commit.create_status(context=NAME, description=description, state="failure", target_url=url)
+        sys.exit(1)
+    else:
+        if 'pr-documentation' in pr_info.labels or 'pr-doc-fix' in pr_info.labels:
+            commit.create_status(context=NAME, description="Skipping checks for documentation", state="success", target_url=url)
+            print("::notice ::Can run, but it's documentation PR, skipping")
+        else:
+            print("::notice ::Can run")
+            commit.create_status(context=NAME, description=description, state="pending", target_url=url)
diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
new file mode 100644
index 00000000000..292aa5c0472
--- /dev/null
+++ b/tests/ci/s3_helper.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+import hashlib
+import logging
+import os
+from multiprocessing.dummy import Pool
+import boto3
+from compress_files import compress_file_fast
+
+def _md5(fname):
+    hash_md5 = hashlib.md5()
+    with open(fname, "rb") as f:
+        for chunk in iter(lambda: f.read(4096), b""):
+            hash_md5.update(chunk)
+    logging.debug("MD5 for %s is %s", fname, hash_md5.hexdigest())
+    return hash_md5.hexdigest()
+
+
+def _flatten_list(lst):
+    result = []
+    for elem in lst:
+        if isinstance(elem, list):
+            result += _flatten_list(elem)
+        else:
+            result.append(elem)
+    return result
+
+
+class S3Helper():
+    def __init__(self, host):
+        self.session = boto3.session.Session(region_name='us-east-1')
+        self.client = self.session.client('s3', endpoint_url=host)
+
+    def _upload_file_to_s3(self, bucket_name, file_path, s3_path):
+        logging.debug("Start uploading %s to bucket=%s path=%s", file_path, bucket_name, s3_path)
+        metadata = {}
+        if os.path.getsize(file_path) < 64 * 1024 * 1024:
+            if s3_path.endswith("txt") or s3_path.endswith("log") or s3_path.endswith("err") or s3_path.endswith("out"):
+                metadata['ContentType'] = "text/plain; charset=utf-8"
+                logging.info("Content type %s for file path %s", "text/plain; charset=utf-8", file_path)
+            elif s3_path.endswith("html"):
+                metadata['ContentType'] = "text/html; charset=utf-8"
+                logging.info("Content type %s for file path %s", "text/html; charset=utf-8", file_path)
+            else:
+                logging.info("No content type provied for %s", file_path)
+        else:
+            if s3_path.endswith("txt") or s3_path.endswith("log") or s3_path.endswith("err") or s3_path.endswith("out"):
+                logging.info("Going to compress file log file %s to %s", file_path, file_path + ".gz")
+                compress_file_fast(file_path, file_path + ".gz")
+                file_path += ".gz"
+                s3_path += ".gz"
+            else:
+                logging.info("Processing file without compression")
+            logging.info("File is too large, do not provide content type")
+
+        self.client.upload_file(file_path, bucket_name, s3_path, ExtraArgs=metadata)
+        logging.info("Upload %s to %s. Meta: %s", file_path, s3_path, metadata)
+        # last two replacements are specifics of AWS urls: https://jamesd3142.wordpress.com/2018/02/28/amazon-s3-and-the-plus-symbol/
+        return "https://s3.amazonaws.com/{bucket}/{path}".format(bucket=bucket_name, path=s3_path).replace('+', '%2B').replace(' ', '%20')
+
+    def upload_test_report_to_s3(self, file_path, s3_path):
+        return self._upload_file_to_s3('clickhouse-test-reports', file_path, s3_path)
+
+    def upload_build_file_to_s3(self, file_path, s3_path):
+        return self._upload_file_to_s3('clickhouse-builds', file_path, s3_path)
+
+    def _upload_folder_to_s3(self, folder_path, s3_folder_path, bucket_name, keep_dirs_in_s3_path, upload_symlinks):
+        logging.info("Upload folder '%s' to bucket=%s of s3 folder '%s'", folder_path, bucket_name, s3_folder_path)
+        if not os.path.exists(folder_path):
+            return []
+        files = os.listdir(folder_path)
+        if not files:
+            return []
+
+        p = Pool(min(len(files), 5))
+
+        def task(file_name):
+            full_fs_path = os.path.join(folder_path, file_name)
+            if keep_dirs_in_s3_path:
+                full_s3_path = s3_folder_path + "/" + os.path.basename(folder_path)
+            else:
+                full_s3_path = s3_folder_path
+
+            if os.path.isdir(full_fs_path):
+                return self._upload_folder_to_s3(full_fs_path, full_s3_path, bucket_name, keep_dirs_in_s3_path, upload_symlinks)
+
+            if os.path.islink(full_fs_path):
+                if upload_symlinks:
+                    return self._upload_file_to_s3(bucket_name, full_fs_path, full_s3_path + "/" + file_name)
+                return []
+
+            return self._upload_file_to_s3(bucket_name, full_fs_path, full_s3_path + "/" + file_name)
+
+        return sorted(_flatten_list(list(p.map(task, files))))
+
+    def upload_build_folder_to_s3(self, folder_path, s3_folder_path, keep_dirs_in_s3_path=True, upload_symlinks=True):
+        return self._upload_folder_to_s3(folder_path, s3_folder_path, 'clickhouse-builds', keep_dirs_in_s3_path, upload_symlinks)
+
+    def upload_test_folder_to_s3(self, folder_path, s3_folder_path):
+        return self._upload_folder_to_s3(folder_path, s3_folder_path, 'clickhouse-test-reports', True, True)
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
new file mode 100644
index 00000000000..a0516623c41
--- /dev/null
+++ b/tests/ci/style_check.py
@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+import logging
+import subprocess
+import os
+import csv
+import time
+import json
+from github import Github
+from report import create_test_html_report
+from s3_helper import S3Helper
+from pr_info import PRInfo
+from get_robot_token import get_best_robot_token
+
+NAME = "Style Check (actions)"
+
+
+def process_logs(s3_client, additional_logs, s3_path_prefix):
+    additional_urls = []
+    for log_path in additional_logs:
+        if log_path:
+            additional_urls.append(
+                s3_client.upload_test_report_to_s3(
+                    log_path,
+                    s3_path_prefix + "/" + os.path.basename(log_path)))
+
+    return additional_urls
+
+
+def process_result(result_folder):
+    test_results = []
+    additional_files = []
+    # Just upload all files from result_folder.
+    # If task provides processed results, then it's responsible for content of result_folder.
+    if os.path.exists(result_folder):
+        test_files = [f for f in os.listdir(result_folder) if os.path.isfile(os.path.join(result_folder, f))]
+        additional_files = [os.path.join(result_folder, f) for f in test_files]
+
+    status_path = os.path.join(result_folder, "check_status.tsv")
+    logging.info("Found test_results.tsv")
+    status = list(csv.reader(open(status_path, 'r'), delimiter='\t'))
+    if len(status) != 1 or len(status[0]) != 2:
+        return "error", "Invalid check_status.tsv", test_results, additional_files
+    state, description = status[0][0], status[0][1]
+
+    try:
+        results_path = os.path.join(result_folder, "test_results.tsv")
+        test_results = list(csv.reader(open(results_path, 'r'), delimiter='\t'))
+        if len(test_results) == 0:
+            raise Exception("Empty results")
+
+        return state, description, test_results, additional_files
+    except Exception:
+        if state == "success":
+            state, description = "error", "Failed to read test_results.tsv"
+        return state, description, test_results, additional_files
+
+def upload_results(s3_client, pr_number, commit_sha, test_results, additional_files):
+    s3_path_prefix = f"{pr_number}/{commit_sha}/style_check"
+    additional_urls = process_logs(s3_client, additional_files, s3_path_prefix)
+
+    branch_url = "https://github.com/ClickHouse/ClickHouse/commits/master"
+    branch_name = "master"
+    if pr_number != 0:
+        branch_name = "PR #{}".format(pr_number)
+        branch_url = "https://github.com/ClickHouse/ClickHouse/pull/" + str(pr_number)
+    commit_url = f"https://github.com/ClickHouse/ClickHouse/commit/{commit_sha}"
+
+    task_url = f"https://github.com/ClickHouse/ClickHouse/actions/runs/{os.getenv('GITHUB_RUN_ID')}"
+
+    raw_log_url = additional_urls[0]
+    additional_urls.pop(0)
+
+    html_report = create_test_html_report(NAME, test_results, raw_log_url, task_url, branch_url, branch_name, commit_url, additional_urls)
+    with open('report.html', 'w') as f:
+        f.write(html_report)
+
+    url = s3_client.upload_test_report_to_s3('report.html', s3_path_prefix + ".html")
+    logging.info("Search result in url %s", url)
+    return url
+
+
+def get_commit(gh, commit_sha):
+    repo = gh.get_repo(os.getenv("GITHUB_REPOSITORY", "ClickHouse/ClickHouse"))
+    commit = repo.get_commit(commit_sha)
+    return commit
+
+if __name__ == "__main__":
+    logging.basicConfig(level=logging.INFO)
+    repo_path = os.path.join(os.getenv("GITHUB_WORKSPACE", os.path.abspath("../../")))
+    temp_path = os.path.join(os.getenv("RUNNER_TEMP", os.path.abspath("./temp")), 'style_check')
+
+    with open(os.getenv('GITHUB_EVENT_PATH'), 'r') as event_file:
+        event = json.load(event_file)
+    pr_info = PRInfo(event)
+
+    if not os.path.exists(temp_path):
+        os.makedirs(temp_path)
+
+    gh = Github(get_best_robot_token())
+
+    images_path = os.path.join(temp_path, 'changed_images.json')
+    docker_image = 'clickhouse/style-test'
+    if os.path.exists(images_path):
+        logging.info("Images file exists")
+        with open(images_path, 'r') as images_fd:
+            images = json.load(images_fd)
+            logging.info("Got images %s", images)
+            if 'clickhouse/style-test' in images:
+                docker_image += ':' + images['clickhouse/style-test']
+
+    logging.info("Got docker image %s", docker_image)
+    for i in range(10):
+        try:
+            subprocess.check_output(f"docker pull {docker_image}", shell=True)
+            break
+        except Exception as ex:
+            time.sleep(i * 3)
+            logging.info("Got execption pulling docker %s", ex)
+    else:
+        raise Exception(f"Cannot pull dockerhub for image {docker_image}")
+
+    s3_helper = S3Helper('https://s3.amazonaws.com')
+
+    subprocess.check_output(f"docker run -u $(id -u ${{USER}}):$(id -g ${{USER}}) --cap-add=SYS_PTRACE --volume={repo_path}:/ClickHouse --volume={temp_path}:/test_output {docker_image}", shell=True)
+    state, description, test_results, additional_files = process_result(temp_path)
+    report_url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, additional_files)
+    print("::notice ::Report url: {}".format(report_url))
+    commit = get_commit(gh, pr_info.sha)
+    commit.create_status(context=NAME, description=description, state=state, target_url=report_url)
diff --git a/tests/ci/termination_lambda/Dockerfile b/tests/ci/termination_lambda/Dockerfile
new file mode 100644
index 00000000000..f53be71a893
--- /dev/null
+++ b/tests/ci/termination_lambda/Dockerfile
@@ -0,0 +1,13 @@
+FROM public.ecr.aws/lambda/python:3.9
+
+# Copy function code
+COPY app.py ${LAMBDA_TASK_ROOT}
+
+# Install the function's dependencies using file requirements.txt
+# from your project folder.
+
+COPY requirements.txt  .
+RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
+
+# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
+CMD [ "app.handler" ]
diff --git a/tests/ci/termination_lambda/app.py b/tests/ci/termination_lambda/app.py
new file mode 100644
index 00000000000..0b39cf73f25
--- /dev/null
+++ b/tests/ci/termination_lambda/app.py
@@ -0,0 +1,275 @@
+#!/usr/bin/env python3
+
+import requests
+import argparse
+import jwt
+import sys
+import json
+import time
+from collections import namedtuple
+
+def get_key_and_app_from_aws():
+    import boto3
+    secret_name = "clickhouse_github_secret_key"
+    session = boto3.session.Session()
+    client = session.client(
+        service_name='secretsmanager',
+    )
+    get_secret_value_response = client.get_secret_value(
+        SecretId=secret_name
+    )
+    data = json.loads(get_secret_value_response['SecretString'])
+    return data['clickhouse-app-key'], int(data['clickhouse-app-id'])
+
+def get_installation_id(jwt_token):
+    headers = {
+        "Authorization": f"Bearer {jwt_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.get("https://api.github.com/app/installations", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data[0]['id']
+
+def get_access_token(jwt_token, installation_id):
+    headers = {
+        "Authorization": f"Bearer {jwt_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.post(f"https://api.github.com/app/installations/{installation_id}/access_tokens", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data['token']
+
+
+RunnerDescription = namedtuple('RunnerDescription', ['id', 'name', 'tags', 'offline', 'busy'])
+
+def list_runners(access_token):
+    headers = {
+        "Authorization": f"token {access_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    response = requests.get("https://api.github.com/orgs/ClickHouse/actions/runners", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    print("Total runners", data['total_count'])
+    runners = data['runners']
+    result = []
+    for runner in runners:
+        tags = [tag['name'] for tag in runner['labels']]
+        desc = RunnerDescription(id=runner['id'], name=runner['name'], tags=tags,
+                                 offline=runner['status']=='offline', busy=runner['busy'])
+        result.append(desc)
+    return result
+
+def push_metrics_to_cloudwatch(listed_runners, namespace):
+    import boto3
+    client = boto3.client('cloudwatch')
+    metrics_data = []
+    busy_runners = sum(1 for runner in listed_runners if runner.busy)
+    metrics_data.append({
+        'MetricName': 'BusyRunners',
+        'Value': busy_runners,
+        'Unit': 'Count',
+    })
+    total_active_runners = sum(1 for runner in listed_runners if not runner.offline)
+    metrics_data.append({
+        'MetricName': 'ActiveRunners',
+        'Value': total_active_runners,
+        'Unit': 'Count',
+    })
+    total_runners = len(listed_runners)
+    metrics_data.append({
+        'MetricName': 'TotalRunners',
+        'Value': total_runners,
+        'Unit': 'Count',
+    })
+    if total_active_runners == 0:
+        busy_ratio = 100
+    else:
+        busy_ratio = busy_runners / total_active_runners * 100
+
+    metrics_data.append({
+        'MetricName': 'BusyRunnersRatio',
+        'Value': busy_ratio,
+        'Unit': 'Percent',
+    })
+
+    client.put_metric_data(Namespace='RunnersMetrics', MetricData=metrics_data)
+
+
+def how_many_instances_to_kill(event_data):
+    data_array = event_data['CapacityToTerminate']
+    to_kill_by_zone = {}
+    for av_zone in data_array:
+        zone_name = av_zone['AvailabilityZone']
+        to_kill = av_zone['Capacity']
+        if zone_name not in to_kill_by_zone:
+            to_kill_by_zone[zone_name] = 0
+
+        to_kill_by_zone[zone_name] += to_kill
+    return to_kill_by_zone
+
+def get_candidates_to_be_killed(event_data):
+    data_array = event_data['Instances']
+    instances_by_zone = {}
+    for instance in data_array:
+        zone_name = instance['AvailabilityZone']
+        instance_id = instance['InstanceId']
+        if zone_name not in instances_by_zone:
+            instances_by_zone[zone_name] = []
+        instances_by_zone[zone_name].append(instance_id)
+
+    return instances_by_zone
+
+def delete_runner(access_token, runner):
+    headers = {
+        "Authorization": f"token {access_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+
+    response = requests.delete(f"https://api.github.com/orgs/ClickHouse/actions/runners/{runner.id}", headers=headers)
+    response.raise_for_status()
+    print(f"Response code deleting {runner.name} is {response.status_code}")
+    return response.status_code == 204
+
+
+def main(github_secret_key, github_app_id, event):
+    print("Got event", json.dumps(event, sort_keys=True, indent=4))
+    to_kill_by_zone = how_many_instances_to_kill(event)
+    instances_by_zone = get_candidates_to_be_killed(event)
+
+    payload = {
+        "iat": int(time.time()) - 60,
+        "exp": int(time.time()) + (10 * 60),
+        "iss": github_app_id,
+    }
+
+    encoded_jwt = jwt.encode(payload, github_secret_key, algorithm="RS256")
+    installation_id = get_installation_id(encoded_jwt)
+    access_token = get_access_token(encoded_jwt, installation_id)
+
+    runners = list_runners(access_token)
+
+    to_delete_runners = []
+    instances_to_kill = []
+    for zone in to_kill_by_zone:
+        num_to_kill = to_kill_by_zone[zone]
+        candidates = instances_by_zone[zone]
+        if num_to_kill > len(candidates):
+            raise Exception(f"Required to kill {num_to_kill}, but have only {len(candidates)} candidates in AV {zone}")
+
+        delete_for_av = []
+        for candidate in candidates:
+            if candidate not in set([runner.name for runner in runners]):
+                print(f"Candidate {candidate} was not in runners list, simply delete it")
+                instances_to_kill.append(candidate)
+
+        for candidate in candidates:
+            if len(delete_for_av) + len(instances_to_kill) == num_to_kill:
+                break
+            if candidate in instances_to_kill:
+                continue
+
+            for runner in runners:
+                if runner.name == candidate:
+                    if not runner.busy:
+                        print(f"Runner {runner.name} is not busy and can be deleted from AV {zone}")
+                        delete_for_av.append(runner)
+                    else:
+                        print(f"Runner {runner.name} is busy, not going to delete it")
+                    break
+
+        if len(delete_for_av) < num_to_kill:
+            print(f"Checked all candidates for av {zone}, get to delete {len(delete_for_av)}, but still cannot get required {num_to_kill}")
+        to_delete_runners += delete_for_av
+
+    print("Got instances to kill: ", ', '.join(instances_to_kill))
+    print("Going to delete runners:", ', '.join([runner.name for runner in to_delete_runners]))
+    for runner in to_delete_runners:
+        if delete_runner(access_token, runner):
+            print(f"Runner {runner.name} successfuly deleted from github")
+            instances_to_kill.append(runner.name)
+        else:
+            print(f"Cannot delete {runner.name} from github")
+
+    ## push metrics
+    #runners = list_runners(access_token)
+    #push_metrics_to_cloudwatch(runners, 'RunnersMetrics')
+
+    response = {
+        "InstanceIDs": instances_to_kill
+    }
+    print(response)
+    return response
+
+def handler(event, context):
+    private_key, app_id = get_key_and_app_from_aws()
+    return main(private_key, app_id, event)
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Get list of runners and their states')
+    parser.add_argument('-p', '--private-key-path', help='Path to file with private key')
+    parser.add_argument('-k', '--private-key', help='Private key')
+    parser.add_argument('-a', '--app-id', type=int, help='GitHub application ID', required=True)
+
+    args = parser.parse_args()
+
+    if not args.private_key_path and not args.private_key:
+        print("Either --private-key-path or --private-key must be specified", file=sys.stderr)
+
+    if args.private_key_path and args.private_key:
+        print("Either --private-key-path or --private-key must be specified", file=sys.stderr)
+
+    if args.private_key:
+        private_key = args.private_key
+    else:
+        with open(args.private_key_path, 'r') as key_file:
+            private_key = key_file.read()
+
+    sample_event = {
+        "AutoScalingGroupARN": "arn:aws:autoscaling:us-east-1:<account-id>:autoScalingGroup:d4738357-2d40-4038-ae7e-b00ae0227003:autoScalingGroupName/my-asg",
+        "AutoScalingGroupName": "my-asg",
+        "CapacityToTerminate": [
+            {
+                "AvailabilityZone": "us-east-1b",
+                "Capacity": 1,
+                "InstanceMarketOption": "OnDemand"
+            },
+            {
+                "AvailabilityZone": "us-east-1c",
+                "Capacity": 2,
+                "InstanceMarketOption": "OnDemand"
+            }
+        ],
+        "Instances": [
+            {
+                "AvailabilityZone": "us-east-1b",
+                "InstanceId": "i-08d0b3c1a137e02a5",
+                "InstanceType": "t2.nano",
+                "InstanceMarketOption": "OnDemand"
+            },
+            {
+                "AvailabilityZone": "us-east-1c",
+                "InstanceId": "ip-172-31-45-253.eu-west-1.compute.internal",
+                "InstanceType": "t2.nano",
+                "InstanceMarketOption": "OnDemand"
+            },
+            {
+                "AvailabilityZone": "us-east-1c",
+                "InstanceId": "ip-172-31-27-227.eu-west-1.compute.internal",
+                "InstanceType": "t2.nano",
+                "InstanceMarketOption": "OnDemand"
+            },
+            {
+                "AvailabilityZone": "us-east-1c",
+                "InstanceId": "ip-172-31-45-253.eu-west-1.compute.internal",
+                "InstanceType": "t2.nano",
+                "InstanceMarketOption": "OnDemand"
+            }
+        ],
+        "Cause": "SCALE_IN"
+    }
+
+    main(private_key, args.app_id, sample_event)
diff --git a/tests/ci/termination_lambda/requirements.txt b/tests/ci/termination_lambda/requirements.txt
new file mode 100644
index 00000000000..c0dcf4a4dde
--- /dev/null
+++ b/tests/ci/termination_lambda/requirements.txt
@@ -0,0 +1,3 @@
+requests
+PyJWT
+cryptography
diff --git a/tests/ci/token_lambda/Dockerfile b/tests/ci/token_lambda/Dockerfile
new file mode 100644
index 00000000000..f53be71a893
--- /dev/null
+++ b/tests/ci/token_lambda/Dockerfile
@@ -0,0 +1,13 @@
+FROM public.ecr.aws/lambda/python:3.9
+
+# Copy function code
+COPY app.py ${LAMBDA_TASK_ROOT}
+
+# Install the function's dependencies using file requirements.txt
+# from your project folder.
+
+COPY requirements.txt  .
+RUN  pip3 install -r requirements.txt --target "${LAMBDA_TASK_ROOT}"
+
+# Set the CMD to your handler (could also be done as a parameter override outside of the Dockerfile)
+CMD [ "app.handler" ]
diff --git a/tests/ci/token_lambda/app.py b/tests/ci/token_lambda/app.py
new file mode 100644
index 00000000000..731d6c040de
--- /dev/null
+++ b/tests/ci/token_lambda/app.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+
+import requests
+import argparse
+import jwt
+import sys
+import json
+import time
+
+def get_installation_id(jwt_token):
+    headers = {
+        "Authorization": f"Bearer {jwt_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.get("https://api.github.com/app/installations", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data[0]['id']
+
+def get_access_token(jwt_token, installation_id):
+    headers = {
+        "Authorization": f"Bearer {jwt_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.post(f"https://api.github.com/app/installations/{installation_id}/access_tokens", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data['token']
+
+def get_runner_registration_token(access_token):
+    headers = {
+        "Authorization": f"token {access_token}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.post("https://api.github.com/orgs/ClickHouse/actions/runners/registration-token", headers=headers)
+    response.raise_for_status()
+    data = response.json()
+    return data['token']
+
+def get_key_and_app_from_aws():
+    import boto3
+    secret_name = "clickhouse_github_secret_key"
+    session = boto3.session.Session()
+    client = session.client(
+        service_name='secretsmanager',
+    )
+    get_secret_value_response = client.get_secret_value(
+        SecretId=secret_name
+    )
+    data = json.loads(get_secret_value_response['SecretString'])
+    return data['clickhouse-app-key'], int(data['clickhouse-app-id'])
+
+
+def main(github_secret_key, github_app_id, push_to_ssm, ssm_parameter_name):
+    payload = {
+        "iat": int(time.time()) - 60,
+        "exp": int(time.time()) + (10 * 60),
+        "iss": github_app_id,
+    }
+
+    encoded_jwt = jwt.encode(payload, github_secret_key, algorithm="RS256")
+    installation_id = get_installation_id(encoded_jwt)
+    access_token = get_access_token(encoded_jwt, installation_id)
+    runner_registration_token = get_runner_registration_token(access_token)
+
+    if push_to_ssm:
+        import boto3
+
+        print("Trying to put params into ssm manager")
+        client = boto3.client('ssm')
+        client.put_parameter(
+            Name=ssm_parameter_name,
+            Value=runner_registration_token,
+            Type='SecureString',
+            Overwrite=True)
+    else:
+        print("Not push token to AWS Parameter Store, just print:", runner_registration_token)
+
+
+def handler(event, context):
+    private_key, app_id = get_key_and_app_from_aws()
+    main(private_key, app_id, True, 'github_runner_registration_token')
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Get new token from github to add runners')
+    parser.add_argument('-p', '--private-key-path', help='Path to file with private key')
+    parser.add_argument('-k', '--private-key', help='Private key')
+    parser.add_argument('-a', '--app-id', type=int, help='GitHub application ID', required=True)
+    parser.add_argument('--push-to-ssm', action='store_true',  help='Store received token in parameter store')
+    parser.add_argument('--ssm-parameter-name', default='github_runner_registration_token',  help='AWS paramater store parameter name')
+
+    args = parser.parse_args()
+
+    if not args.private_key_path and not args.private_key:
+        print("Either --private-key-path or --private-key must be specified", file=sys.stderr)
+
+    if args.private_key_path and args.private_key:
+        print("Either --private-key-path or --private-key must be specified", file=sys.stderr)
+
+    if args.private_key:
+        private_key = args.private_key
+    else:
+        with open(args.private_key_path, 'r') as key_file:
+            private_key = key_file.read()
+
+    main(private_key, args.app_id, args.push_to_ssm, args.ssm_parameter_name)
diff --git a/tests/ci/token_lambda/requirements.txt b/tests/ci/token_lambda/requirements.txt
new file mode 100644
index 00000000000..c0dcf4a4dde
--- /dev/null
+++ b/tests/ci/token_lambda/requirements.txt
@@ -0,0 +1,3 @@
+requests
+PyJWT
+cryptography
diff --git a/tests/ci/version_helper.py b/tests/ci/version_helper.py
new file mode 100644
index 00000000000..dd3845eae66
--- /dev/null
+++ b/tests/ci/version_helper.py
@@ -0,0 +1,139 @@
+#!/usr/bin/env python3
+import os
+import subprocess
+import datetime
+
+FILE_WITH_VERSION_PATH = "cmake/autogenerated_versions.txt"
+CHANGELOG_IN_PATH = "debian/changelog.in"
+CHANGELOG_PATH = "debian/changelog"
+CONTRIBUTORS_SCRIPT_DIR = "src/Storages/System/"
+
+
+class ClickHouseVersion():
+    def __init__(self, major, minor, patch, tweak, revision):
+        self.major = major
+        self.minor = minor
+        self.patch = patch
+        self.tweak = tweak
+        self.revision = revision
+
+    def minor_update(self):
+        return ClickHouseVersion(
+            self.major,
+            self.minor + 1,
+            1,
+            1,
+            self.revision + 1)
+
+    def patch_update(self):
+        return ClickHouseVersion(
+            self.major,
+            self.minor,
+            self.patch + 1,
+            1,
+            self.revision)
+
+    def tweak_update(self):
+        return ClickHouseVersion(
+            self.major,
+            self.minor,
+            self.patch,
+            self.tweak + 1,
+            self.revision)
+
+    def get_version_string(self):
+        return '.'.join([
+            str(self.major),
+            str(self.minor),
+            str(self.patch),
+            str(self.tweak)
+        ])
+
+    def as_tuple(self):
+        return (self.major, self.minor, self.patch, self.tweak)
+
+
+class VersionType():
+    STABLE = "stable"
+    TESTING = "testing"
+
+
+def build_version_description(version, version_type):
+    return "v" + version.get_version_string() + "-" + version_type
+
+
+def _get_version_from_line(line):
+    _, ver_with_bracket = line.strip().split(' ')
+    return ver_with_bracket[:-1]
+
+
+def get_version_from_repo(repo_path):
+    path_to_file = os.path.join(repo_path, FILE_WITH_VERSION_PATH)
+    major = 0
+    minor = 0
+    patch = 0
+    tweak = 0
+    version_revision = 0
+    with open(path_to_file, 'r') as ver_file:
+        for line in ver_file:
+            if "VERSION_MAJOR" in line and "math" not in line and "SET" in line:
+                major = _get_version_from_line(line)
+            elif "VERSION_MINOR" in line and "math" not in line and "SET" in line:
+                minor = _get_version_from_line(line)
+            elif "VERSION_PATCH" in line and "math" not in line and "SET" in line:
+                patch = _get_version_from_line(line)
+            elif "VERSION_REVISION" in line and "math" not in line:
+                version_revision = _get_version_from_line(line)
+    return ClickHouseVersion(major, minor, patch, tweak, version_revision)
+
+
+def _update_cmake_version(repo_path, version, sha, version_type):
+    cmd = """sed -i --follow-symlinks -e "s/SET(VERSION_REVISION [^) ]*/SET(VERSION_REVISION {revision}/g;" \
+            -e "s/SET(VERSION_DESCRIBE [^) ]*/SET(VERSION_DESCRIBE {version_desc}/g;" \
+            -e "s/SET(VERSION_GITHASH [^) ]*/SET(VERSION_GITHASH {sha}/g;" \
+            -e "s/SET(VERSION_MAJOR [^) ]*/SET(VERSION_MAJOR {major}/g;" \
+            -e "s/SET(VERSION_MINOR [^) ]*/SET(VERSION_MINOR {minor}/g;" \
+            -e "s/SET(VERSION_PATCH [^) ]*/SET(VERSION_PATCH {patch}/g;" \
+            -e "s/SET(VERSION_STRING [^) ]*/SET(VERSION_STRING {version_string}/g;" \
+            {path}""".format(
+        revision=version.revision,
+        version_desc=build_version_description(version, version_type),
+        sha=sha,
+        major=version.major,
+        minor=version.minor,
+        patch=version.patch,
+        version_string=version.get_version_string(),
+        path=os.path.join(repo_path, FILE_WITH_VERSION_PATH),
+    )
+    subprocess.check_call(cmd, shell=True)
+
+
+def _update_changelog(repo_path, version):
+    cmd = """sed \
+        -e "s/[@]VERSION_STRING[@]/{version_str}/g" \
+        -e "s/[@]DATE[@]/{date}/g" \
+        -e "s/[@]AUTHOR[@]/clickhouse-release/g" \
+        -e "s/[@]EMAIL[@]/clickhouse-release@yandex-team.ru/g" \
+        < {in_path} > {changelog_path}
+    """.format(
+        version_str=version.get_version_string(),
+        date=datetime.datetime.now().strftime("%a, %d %b %Y %H:%M:%S") + " +0300",
+        in_path=os.path.join(repo_path, CHANGELOG_IN_PATH),
+        changelog_path=os.path.join(repo_path, CHANGELOG_PATH)
+    )
+    subprocess.check_call(cmd, shell=True)
+
+def _update_contributors(repo_path):
+    cmd = "cd {} && ./StorageSystemContributors.sh".format(os.path.join(repo_path, CONTRIBUTORS_SCRIPT_DIR))
+    subprocess.check_call(cmd, shell=True)
+
+def _update_dockerfile(repo_path, version):
+    version_str_for_docker = '.'.join([str(version.major), str(version.minor), str(version.patch), '*'])
+    cmd = "ls -1 {path}/docker/*/Dockerfile | xargs sed -i -r -e 's/ARG version=.+$/ARG version='{ver}'/'".format(path=repo_path, ver=version_str_for_docker)
+    subprocess.check_call(cmd, shell=True)
+
+def update_version_local(repo_path, sha, version, version_type="testing"):
+    _update_contributors(repo_path)
+    _update_cmake_version(repo_path, version, sha, version_type)
+    _update_changelog(repo_path, version)
+    _update_dockerfile(repo_path, version)
diff --git a/tests/ci/worker/init_builder.sh b/tests/ci/worker/init_builder.sh
new file mode 100644
index 00000000000..dc3f777bcca
--- /dev/null
+++ b/tests/ci/worker/init_builder.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "Running init script"
+export DEBIAN_FRONTEND=noninteractive
+export RUNNER_HOME=/home/ubuntu/actions-runner
+
+echo "Receiving token"
+export RUNNER_TOKEN=`/usr/local/bin/aws ssm  get-parameter --name github_runner_registration_token --with-decryption --output text --query Parameter.Value`
+export RUNNER_URL="https://github.com/ClickHouse"
+# Funny fact, but metadata service has fixed IP
+export INSTANCE_ID=`curl -s http://169.254.169.254/latest/meta-data/instance-id`
+
+cd $RUNNER_HOME
+
+echo "Going to configure runner"
+sudo -u ubuntu ./config.sh --url $RUNNER_URL --token $RUNNER_TOKEN --name $INSTANCE_ID --runnergroup Default --labels 'self-hosted,Linux,X64,builder' --work _work
+
+echo "Run"
+sudo -u ubuntu ./run.sh
diff --git a/tests/ci/worker/init_style_checker.sh b/tests/ci/worker/init_style_checker.sh
new file mode 100644
index 00000000000..77cf66b5262
--- /dev/null
+++ b/tests/ci/worker/init_style_checker.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+set -euo pipefail
+
+echo "Running init script"
+export DEBIAN_FRONTEND=noninteractive
+export RUNNER_HOME=/home/ubuntu/actions-runner
+
+echo "Receiving token"
+export RUNNER_TOKEN=`/usr/local/bin/aws ssm  get-parameter --name github_runner_registration_token --with-decryption --output text --query Parameter.Value`
+export RUNNER_URL="https://github.com/ClickHouse"
+# Funny fact, but metadata service has fixed IP
+export INSTANCE_ID=`curl -s http://169.254.169.254/latest/meta-data/instance-id`
+
+cd $RUNNER_HOME
+
+echo "Going to configure runner"
+sudo -u ubuntu ./config.sh --url $RUNNER_URL --token $RUNNER_TOKEN --name $INSTANCE_ID --runnergroup Default --labels 'self-hosted,Linux,X64,style-checker' --work _work
+
+echo "Run"
+sudo -u ubuntu ./run.sh
diff --git a/tests/ci/worker/ubuntu_style_check.sh b/tests/ci/worker/ubuntu_style_check.sh
new file mode 100644
index 00000000000..bf5c6057bed
--- /dev/null
+++ b/tests/ci/worker/ubuntu_style_check.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "Running prepare script"
+export DEBIAN_FRONTEND=noninteractive
+export RUNNER_VERSION=2.283.1
+export RUNNER_HOME=/home/ubuntu/actions-runner
+
+apt-get update
+
+apt-get install --yes --no-install-recommends \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    gnupg \
+    lsb-release \
+    python3-pip \
+    unzip
+
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+
+echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+apt-get update
+
+apt-get install --yes --no-install-recommends docker-ce docker-ce-cli containerd.io
+
+usermod -aG docker ubuntu
+
+# enable ipv6 in containers (fixed-cidr-v6 is some random network mask)
+cat <<EOT > /etc/docker/daemon.json
+{
+  "ipv6": true,
+  "fixed-cidr-v6": "2001:db8:1::/64"
+}
+EOT
+
+systemctl restart docker
+
+pip install boto3 pygithub requests urllib3 unidiff
+
+mkdir -p $RUNNER_HOME && cd $RUNNER_HOME
+
+curl -O -L https://github.com/actions/runner/releases/download/v$RUNNER_VERSION/actions-runner-linux-x64-$RUNNER_VERSION.tar.gz
+
+tar xzf ./actions-runner-linux-x64-$RUNNER_VERSION.tar.gz
+rm -f ./actions-runner-linux-x64-$RUNNER_VERSION.tar.gz
+./bin/installdependencies.sh
+
+chown -R ubuntu:ubuntu $RUNNER_HOME
+
+cd /home/ubuntu
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+unzip awscliv2.zip
+./aws/install
+
+rm -rf /home/ubuntu/awscliv2.zip /home/ubuntu/aws
diff --git a/tests/clickhouse-client.xml b/tests/clickhouse-client.xml
deleted file mode 100644
index b00c16f2c99..00000000000
--- a/tests/clickhouse-client.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<yandex>
-    <insert_format_max_block_size>100000</insert_format_max_block_size>
-</yandex>
\ No newline at end of file
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index d83b3f08c42..aaec4497ef6 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -1,29 +1,37 @@
 #!/usr/bin/env python3
 
+# pylint: disable=too-many-return-statements
+# pylint: disable=global-variable-not-assigned
+
+import enum
 import shutil
 import sys
 import os
 import os.path
 import signal
 import re
-import json
 import copy
 import traceback
+import math
+# Not requests, to avoid requiring extra dependency.
+import http.client
+import urllib.parse
+import json
 
 from argparse import ArgumentParser
-import shlex
+from typing import Tuple, Union, Optional, Dict, Set, List
 import subprocess
 from subprocess import Popen
 from subprocess import PIPE
-from subprocess import CalledProcessError
-from subprocess import TimeoutExpired
 from datetime import datetime
 from time import time, sleep
 from errno import ESRCH
+
 try:
     import termcolor
 except ImportError:
     termcolor = None
+
 import random
 import string
 import multiprocessing
@@ -37,27 +45,76 @@ except ImportError:
     USE_JINJA = False
     print('WARNING: jinja2 not installed! Template tests will be skipped.')
 
-DISTRIBUTED_DDL_TIMEOUT_MSG = "is executing longer than distributed_ddl_task_timeout"
-
 MESSAGES_TO_RETRY = [
-    "DB::Exception: ZooKeeper session has been expired",
-    "DB::Exception: Connection loss",
-    "Coordination::Exception: Session expired",
-    "Coordination::Exception: Connection loss",
-    "Coordination::Exception: Operation timeout",
-    "DB::Exception: Operation timeout",
-    "Operation timed out",
     "ConnectionPoolWithFailover: Connection failed at try",
     "DB::Exception: New table appeared in database being dropped or detached. Try again",
     "is already started to be removing by another replica right now",
-    "Shutdown is called for table", # It happens in SYSTEM SYNC REPLICA query if session with ZooKeeper is being reinitialized.
-    DISTRIBUTED_DDL_TIMEOUT_MSG # FIXME
+    "DB::Exception: Cannot enqueue query",
+    "is executing longer than distributed_ddl_task_timeout" # FIXME
 ]
 
 MAX_RETRIES = 3
 
 TEST_FILE_EXTENSIONS = ['.sql', '.sql.j2', '.sh', '.py', '.expect']
 
+class HTTPError(Exception):
+    def __init__(self, message=None, code=None):
+        self.message = message
+        self.code = code
+        super().__init__(message)
+
+    def __str__(self):
+        return 'Code: {}. {}'.format(self.code, self.message)
+
+# Helpers to execute queries via HTTP interface.
+def clickhouse_execute_http(base_args, query, timeout=30, settings=None, default_format=None):
+    client = http.client.HTTPConnection(
+        host=base_args.tcp_host,
+        port=base_args.http_port,
+        timeout=timeout)
+
+    timeout = int(timeout)
+    params = {
+        'query': query,
+
+        # hung check in stress tests may remove the database,
+        # hence we should use 'system'.
+        'database': 'system',
+
+        'connect_timeout': timeout,
+        'receive_timeout': timeout,
+        'send_timeout': timeout,
+
+        'http_connection_timeout': timeout,
+        'http_receive_timeout': timeout,
+        'http_send_timeout': timeout,
+    }
+    if settings is not None:
+        params.update(settings)
+    if default_format is not None:
+        params['default_format'] = default_format
+
+    client.request('POST', '/?' + base_args.client_options_query_str + urllib.parse.urlencode(params))
+    res = client.getresponse()
+    data = res.read()
+    if res.status != 200:
+        raise HTTPError(data.decode(), res.status)
+
+    return data
+
+def clickhouse_execute(base_args, query, timeout=30, settings=None):
+    return clickhouse_execute_http(base_args, query, timeout, settings).strip()
+
+def clickhouse_execute_json(base_args, query, timeout=30, settings=None):
+    data = clickhouse_execute_http(base_args, query, timeout, settings, 'JSONEachRow')
+    if not data:
+        return None
+    rows = []
+    for row in data.strip().splitlines():
+        rows.append(json.loads(row))
+    return rows
+
+
 class Terminated(KeyboardInterrupt):
     pass
 
@@ -67,281 +124,159 @@ def signal_handler(sig, frame):
 def stop_tests():
     global stop_tests_triggered_lock
     global stop_tests_triggered
+    global restarted_tests
 
     with stop_tests_triggered_lock:
+        print("Stopping tests")
         if not stop_tests_triggered.is_set():
             stop_tests_triggered.set()
 
+            # materialize multiprocessing.Manager().list() object before
+            # sending SIGTERM since this object is a proxy, that requires
+            # communicating with manager thread, but after SIGTERM will be
+            # send, this thread will die, and you will get
+            # ConnectionRefusedError error for any access to "restarted_tests"
+            # variable.
+            restarted_tests = [*restarted_tests]
+
             # send signal to all processes in group to avoid hung check triggering
             # (to avoid terminating clickhouse-test itself, the signal should be ignored)
             signal.signal(signal.SIGTERM, signal.SIG_IGN)
             os.killpg(os.getpgid(os.getpid()), signal.SIGTERM)
             signal.signal(signal.SIGTERM, signal.SIG_DFL)
 
-def json_minify(string):
-    """
-    Removes all js-style comments from json string. Allows to have comments in skip_list.json.
-    The code taken from https://github.com/getify/JSON.minify/tree/python under the MIT license.
-    """
-
-    tokenizer = re.compile(r'"|(/\*)|(\*/)|(//)|\n|\r')
-    end_slashes_re = re.compile(r'(\\)*$')
-
-    in_string = False
-    in_multi = False
-    in_single = False
-
-    new_str = []
-    index = 0
-
-    for match in re.finditer(tokenizer, string):
-        if not (in_multi or in_single):
-            tmp = string[index:match.start()]
-            new_str.append(tmp)
-        else:
-            # Replace comments with white space so that the JSON parser reports
-            # the correct column numbers on parsing errors.
-            new_str.append(' ' * (match.start() - index))
-
-        index = match.end()
-        val = match.group()
-
-        if val == '"' and not (in_multi or in_single):
-            escaped = end_slashes_re.search(string, 0, match.start())
-
-            # start of string or unescaped quote character to end string
-            if not in_string or (escaped is None or len(escaped.group()) % 2 == 0):  # noqa
-                in_string = not in_string
-            index -= 1  # include " character in next catch
-        elif not (in_string or in_multi or in_single):
-            if val == '/*':
-                in_multi = True
-            elif val == '//':
-                in_single = True
-        elif val == '*/' and in_multi and not (in_string or in_single):
-            in_multi = False
-            new_str.append(' ' * len(val))
-        elif val in '\r\n' and not (in_multi or in_string) and in_single:
-            in_single = False
-        elif not in_multi or in_single:  # noqa
-            new_str.append(val)
-
-        if val in '\r\n':
-            new_str.append(val)
-        elif in_multi or in_single:
-            new_str.append(' ' * len(val))
-
-    new_str.append(string[index:])
-    return ''.join(new_str)
-
-
-def remove_control_characters(s):
-    """
-    https://github.com/html5lib/html5lib-python/issues/96#issuecomment-43438438
-    """
-    def str_to_int(s, default, base=10):
-        if int(s, base) < 0x10000:
-            return chr(int(s, base))
-        return default
-    s = re.sub(r"&#(\d+);?", lambda c: str_to_int(c.group(1), c.group(0)), s)
-    s = re.sub(r"&#[xX]([0-9a-fA-F]+);?", lambda c: str_to_int(c.group(1), c.group(0), base=16), s)
-    s = re.sub(r"[\x00-\x08\x0b\x0e-\x1f\x7f]", "", s)
-    return s
 
 def get_db_engine(args, database_name):
     if args.replicated_database:
-        return " ON CLUSTER test_cluster_database_replicated ENGINE=Replicated('/test/clickhouse/db/{}', '{{shard}}', '{{replica}}')".format(database_name)
+        return f" ON CLUSTER test_cluster_database_replicated \
+            ENGINE=Replicated('/test/clickhouse/db/{database_name}', \
+            '{{shard}}', '{{replica}}')"
     if args.db_engine:
         return " ENGINE=" + args.db_engine
     return ""   # Will use default engine
 
-def configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file):
-    testcase_args = copy.deepcopy(args)
 
-    testcase_args.testcase_start_time = datetime.now()
-    testcase_basename = os.path.basename(case_file)
-    testcase_args.testcase_client = f"{testcase_args.client} --log_comment='{testcase_basename}'"
-
-    if testcase_args.database:
-        database = testcase_args.database
-        os.environ.setdefault("CLICKHOUSE_DATABASE", database)
-        os.environ.setdefault("CLICKHOUSE_TMP", suite_tmp_dir)
-
-    else:
-        # If --database is not specified, we will create temporary database with unique name
-        # And we will recreate and drop it for each test
-        def random_str(length=6):
-            alphabet = string.ascii_lowercase + string.digits
-            return ''.join(random.choice(alphabet) for _ in range(length))
-        database = 'test_{suffix}'.format(suffix=random_str())
-
-        with open(stderr_file, 'w') as stderr:
-            client_cmd = testcase_args.testcase_client + " " + get_additional_client_options(args)
-            clickhouse_proc_create = Popen(shlex.split(client_cmd), stdin=PIPE, stdout=PIPE, stderr=stderr, universal_newlines=True)
-            try:
-                clickhouse_proc_create.communicate(("CREATE DATABASE " + database + get_db_engine(testcase_args, database)), timeout=testcase_args.timeout)
-            except TimeoutExpired:
-                total_time = (datetime.now() - testcase_args.testcase_start_time).total_seconds()
-                return clickhouse_proc_create, "", "Timeout creating database {} before test".format(database), total_time
-
-        os.environ["CLICKHOUSE_DATABASE"] = database
-        # Set temporary directory to match the randomly generated database,
-        # because .sh tests also use it for temporary files and we want to avoid
-        # collisions.
-        testcase_args.test_tmp_dir = os.path.join(suite_tmp_dir, database)
-        os.mkdir(testcase_args.test_tmp_dir)
-        os.environ.setdefault("CLICKHOUSE_TMP", testcase_args.test_tmp_dir)
-
-    testcase_args.testcase_database = database
-
-    return testcase_args
-
-def run_single_test(args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file):
-    client = args.testcase_client
-    start_time = args.testcase_start_time
-    database = args.testcase_database
-
-    # This is for .sh tests
-    os.environ["CLICKHOUSE_LOG_COMMENT"] = case_file
-
-    params = {
-        'client': client + ' --database=' + database,
-        'logs_level': server_logs_level,
-        'options': client_options,
-        'test': case_file,
-        'stdout': stdout_file,
-        'stderr': stderr_file,
-    }
-
-    # >> append to stderr (but not stdout since it is not used there),
-    # because there are also output of per test database creation
-    if not args.database:
-        pattern = '{test} > {stdout} 2>> {stderr}'
-    else:
-        pattern = '{test} > {stdout} 2> {stderr}'
-
-    if ext == '.sql':
-        pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} < " + pattern
-
-    command = pattern.format(**params)
-
-    proc = Popen(command, shell=True, env=os.environ)
-
-    while (datetime.now() - start_time).total_seconds() < args.timeout and proc.poll() is None:
-        sleep(0.01)
-
-    need_drop_database = not args.database
-    if need_drop_database and args.no_drop_if_fail:
-        maybe_passed = (proc.returncode == 0) and (proc.stderr is None) and (proc.stdout is None or 'Exception' not in proc.stdout)
-        need_drop_database = not maybe_passed
-
-    if need_drop_database:
-        with open(stderr_file, 'a') as stderr:
-            clickhouse_proc_create = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=stderr, universal_newlines=True)
-        seconds_left = max(args.timeout - (datetime.now() - start_time).total_seconds(), 20)
-        try:
-            drop_database_query = "DROP DATABASE " + database
-            if args.replicated_database:
-                drop_database_query += " ON CLUSTER test_cluster_database_replicated"
-            clickhouse_proc_create.communicate((drop_database_query), timeout=seconds_left)
-        except TimeoutExpired:
-            # kill test process because it can also hung
-            if proc.returncode is None:
-                try:
-                    proc.kill()
-                except OSError as e:
-                    if e.errno != ESRCH:
-                        raise
-
-            total_time = (datetime.now() - start_time).total_seconds()
-            return clickhouse_proc_create, "", "Timeout dropping database {} after test".format(database), total_time
-
-        shutil.rmtree(args.test_tmp_dir)
-
-    total_time = (datetime.now() - start_time).total_seconds()
-
-    # Normalize randomized database names in stdout, stderr files.
-    os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=stdout_file))
-    if args.hide_db_name:
-        os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=stderr_file))
-    if args.replicated_database:
-        os.system("LC_ALL=C sed -i -e 's|/auto_{{shard}}||g' {file}".format(file=stdout_file))
-        os.system("LC_ALL=C sed -i -e 's|auto_{{replica}}||g' {file}".format(file=stdout_file))
-
-    # Normalize hostname in stdout file.
-    os.system("LC_ALL=C sed -i -e 's/{hostname}/localhost/g' {file}".format(hostname=socket.gethostname(), file=stdout_file))
-
-    stdout = open(stdout_file, 'rb').read() if os.path.exists(stdout_file) else b''
-    stdout = str(stdout, errors='replace', encoding='utf-8')
-    stderr = open(stderr_file, 'rb').read() if os.path.exists(stderr_file) else b''
-    stderr = str(stderr, errors='replace', encoding='utf-8')
-
-    return proc, stdout, stderr, total_time
+def get_zookeeper_session_uptime(args):
+    try:
+        if args.replicated_database:
+            return int(clickhouse_execute(args, """
+            SELECT min(materialize(zookeeperSessionUptime()))
+            FROM clusterAllReplicas('test_cluster_database_replicated', system.one)
+            """))
+        else:
+            return int(clickhouse_execute(args, 'SELECT zookeeperSessionUptime()'))
+    except:
+        return None
 
 
-def need_retry(stdout, stderr):
+def need_retry(args, stdout, stderr, total_time):
+    # Sometimes we may get unexpected exception like "Replica is readonly" or "Shutdown is called for table"
+    # instead of "Session expired" or "Connection loss"
+    # Retry if session was expired during test execution
+    session_uptime = get_zookeeper_session_uptime(args)
+    if session_uptime is not None and session_uptime < math.ceil(total_time):
+        return True
     return any(msg in stdout for msg in MESSAGES_TO_RETRY) or any(msg in stderr for msg in MESSAGES_TO_RETRY)
 
 
 def get_processlist(args):
-    try:
-        query = b"SHOW PROCESSLIST FORMAT Vertical"
-        if args.replicated_database:
-            query = b"SELECT materialize((hostName(), tcpPort())) as host, * " \
-                    b"FROM clusterAllReplicas('test_cluster_database_replicated', system.processes) " \
-                    b"WHERE query NOT LIKE '%system.processes%' FORMAT Vertical"
-        clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        (stdout, _) = clickhouse_proc.communicate((query), timeout=20)
-        return False, stdout.decode('utf-8')
-    except Exception as ex:
-        print("Exception", ex)
-        return True, ""
+    if args.replicated_database:
+        return clickhouse_execute_json(args, """
+        SELECT materialize((hostName(), tcpPort())) as host, *
+        FROM clusterAllReplicas('test_cluster_database_replicated', system.processes)
+        WHERE query NOT LIKE '%system.processes%'
+        """)
+    else:
+        return clickhouse_execute_json(args, 'SHOW PROCESSLIST')
 
 
 # collect server stacktraces using gdb
 def get_stacktraces_from_gdb(server_pid):
     try:
-        cmd = "gdb -batch -ex 'thread apply all backtrace' -p {}".format(server_pid)
+        cmd = f"gdb -batch -ex 'thread apply all backtrace' -p {server_pid}"
         return subprocess.check_output(cmd, shell=True).decode('utf-8')
-    except Exception as ex:
-        print("Error occured while receiving stack traces from gdb: {}".format(str(ex)))
+    except Exception as e:
+        print(f"Error occurred while receiving stack traces from gdb: {e}")
         return None
 
 
 # collect server stacktraces from system.stack_trace table
 # it does not work in Sandbox
 def get_stacktraces_from_clickhouse(client, replicated_database=False):
-    try:
-        if replicated_database:
-            return subprocess.check_output("{} --allow_introspection_functions=1 --skip_unavailable_shards=1 --query "
-                "\"SELECT materialize((hostName(), tcpPort())) as host, thread_id, "
-                "arrayStringConcat(arrayMap(x, y -> concat(x, ': ', y), arrayMap(x -> addressToLine(x), trace), "
-                "arrayMap(x -> demangle(addressToSymbol(x)), trace)), '\n') as trace "
-                "FROM clusterAllReplicas('test_cluster_database_replicated', 'system.stack_trace') "
-                "ORDER BY host, thread_id format Vertical\"".format(client), shell=True, stderr=subprocess.STDOUT).decode('utf-8')
+    replicated_msg = \
+        "{} --allow_introspection_functions=1 --skip_unavailable_shards=1 --query \
+        \"SELECT materialize((hostName(), tcpPort())) as host, thread_id, \
+        arrayStringConcat(arrayMap(x, y -> concat(x, ': ', y), \
+        arrayMap(x -> addressToLine(x), trace), \
+        arrayMap(x -> demangle(addressToSymbol(x)), trace)), '\n') as trace \
+        FROM clusterAllReplicas('test_cluster_database_replicated', 'system.stack_trace') \
+        ORDER BY host, thread_id FORMAT Vertical\"".format(client)
 
-        return subprocess.check_output("{} --allow_introspection_functions=1 --query "
-               "\"SELECT arrayStringConcat(arrayMap(x, y -> concat(x, ': ', y), arrayMap(x -> addressToLine(x), trace), "
-               "arrayMap(x -> demangle(addressToSymbol(x)), trace)), '\n') as trace "
-               "FROM system.stack_trace format Vertical\"".format(client), shell=True, stderr=subprocess.STDOUT).decode('utf-8')
-    except Exception as ex:
-        print("Error occured while receiving stack traces from client: {}".format(str(ex)))
+    msg = \
+        "{} --allow_introspection_functions=1 --query \
+        \"SELECT arrayStringConcat(arrayMap(x, y -> concat(x, ': ', y), \
+        arrayMap(x -> addressToLine(x), trace), \
+        arrayMap(x -> demangle(addressToSymbol(x)), trace)), '\n') as trace \
+        FROM system.stack_trace FORMAT Vertical\"".format(client)
+
+    try:
+        return subprocess.check_output(
+            replicated_msg if replicated_database else msg,
+            shell=True, stderr=subprocess.STDOUT).decode('utf-8')
+    except Exception as e:
+        print(f"Error occurred while receiving stack traces from client: {e}")
         return None
 
-def get_server_pid(server_tcp_port):
+
+def print_stacktraces() -> None:
+    server_pid = get_server_pid()
+
+    bt = None
+
+    if server_pid and not args.replicated_database:
+        print("")
+        print(f"Located ClickHouse server process {server_pid} listening at TCP port {args.tcp_port}")
+        print("Collecting stacktraces from all running threads with gdb:")
+
+        bt = get_stacktraces_from_gdb(server_pid)
+
+        if len(bt) < 1000:
+            print("Got suspiciously small stacktraces: ", bt)
+            bt = None
+
+    if bt is None:
+        print("\nCollecting stacktraces from system.stacktraces table:")
+
+        bt = get_stacktraces_from_clickhouse(
+            args.client, args.replicated_database)
+
+    if bt is not None:
+        print(bt)
+        return
+
+    print(colored(
+        f"\nUnable to locate ClickHouse server process listening at TCP port {args.tcp_port}. "
+         "It must have crashed or exited prematurely!",
+        args, "red", attrs=["bold"]))
+
+
+def get_server_pid():
     # lsof does not work in stress tests for some reason
-    cmd_lsof = "lsof -i tcp:{port} -s tcp:LISTEN -Fp | awk '/^p[0-9]+$/{{print substr($0, 2)}}'".format(port=server_tcp_port)
+    cmd_lsof = f"lsof -i tcp:{args.tcp_port} -s tcp:LISTEN -Fp | awk '/^p[0-9]+$/{{print substr($0, 2)}}'"
     cmd_pidof = "pidof -s clickhouse-server"
+
     commands = [cmd_lsof, cmd_pidof]
     output = None
+
     for cmd in commands:
         try:
             output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, universal_newlines=True)
             if output:
                 return int(output)
         except Exception as e:
-            print("Cannot get server pid with {}, got {}: {}".format(cmd, output, e))
-    return None # most likely server dead
+            print(f"Cannot get server pid with {cmd}, got {output}: {e}")
+
+    return None  # most likely server is dead
 
 
 def colored(text, args, color=None, on_color=None, attrs=None):
@@ -351,20 +286,570 @@ def colored(text, args, color=None, on_color=None, attrs=None):
         return text
 
 
-stop_time = None
-exit_code = multiprocessing.Value("i", 0)
-server_died = multiprocessing.Event()
-stop_tests_triggered_lock = multiprocessing.Lock()
-stop_tests_triggered = multiprocessing.Event()
-queue = multiprocessing.Queue(maxsize=1)
-restarted_tests = []  # (test, stderr)
+class TestStatus(enum.Enum):
+    FAIL = "FAIL"
+    UNKNOWN = "UNKNOWN"
+    OK = "OK"
+    SKIPPED = "SKIPPED"
 
-# def run_tests_array(all_tests, suite, suite_dir, suite_tmp_dir, run_total):
+
+class FailureReason(enum.Enum):
+    # FAIL reasons
+    TIMEOUT = "Timeout!"
+    SERVER_DIED = "server died"
+    EXIT_CODE = "return code: "
+    STDERR = "having stderror: "
+    EXCEPTION = "having having exception in stdout: "
+    RESULT_DIFF = "result differs with reference: "
+    TOO_LONG = "Test runs too long (> 60s). Make it faster."
+
+    # SKIPPED reasons
+    DISABLED = "disabled"
+    SKIP = "skip"
+    NO_JINJA = "no jinja"
+    NO_ZOOKEEPER = "no zookeeper"
+    NO_SHARD = "no shard"
+    FAST_ONLY = "running fast tests only"
+    NO_LONG = "not running long tests"
+    REPLICATED_DB = "replicated-database"
+    BUILD = "not running for current build"
+
+    # UNKNOWN reasons
+    NO_REFERENCE = "no reference file"
+    INTERNAL_ERROR = "Test internal error: "
+
+
+class TestResult:
+    def __init__(self, case_name: str, status: TestStatus, reason: Optional[FailureReason], total_time: float, description: str):
+        self.case_name: str = case_name
+        self.status: TestStatus = status
+        self.reason: Optional[FailureReason] = reason
+        self.total_time: float = total_time
+        self.description: str = description
+        self.need_retry: bool = False
+
+    def check_if_need_retry(self, args, stdout, stderr, runs_count):
+        if self.status != TestStatus.FAIL:
+            return
+        if not need_retry(args, stdout, stderr, self.total_time):
+            return
+        if MAX_RETRIES < runs_count:
+            return
+        self.need_retry = True
+
+
+class TestCase:
+    @staticmethod
+    def get_reference_file(suite_dir, name):
+        """
+        Returns reference file name for specified test
+        """
+
+        name = removesuffix(name, ".gen")
+        for ext in ['.reference', '.gen.reference']:
+            reference_file = os.path.join(suite_dir, name) + ext
+            if os.path.isfile(reference_file):
+                return reference_file
+        return None
+
+    @staticmethod
+    def configure_testcase_args(args, case_file, suite_tmp_dir):
+        testcase_args = copy.deepcopy(args)
+
+        testcase_args.testcase_start_time = datetime.now()
+        testcase_basename = os.path.basename(case_file)
+        testcase_args.testcase_client = f"{testcase_args.client} --log_comment='{testcase_basename}'"
+        testcase_args.testcase_basename = testcase_basename
+
+        if testcase_args.database:
+            database = testcase_args.database
+            os.environ.setdefault("CLICKHOUSE_DATABASE", database)
+            os.environ.setdefault("CLICKHOUSE_TMP", suite_tmp_dir)
+        else:
+            # If --database is not specified, we will create temporary database with unique name
+            # And we will recreate and drop it for each test
+            def random_str(length=6):
+                alphabet = string.ascii_lowercase + string.digits
+                return ''.join(random.choice(alphabet) for _ in range(length))
+
+            database = 'test_{suffix}'.format(suffix=random_str())
+
+            clickhouse_execute(args, "CREATE DATABASE " + database + get_db_engine(testcase_args, database), settings={
+                'log_comment': testcase_args.testcase_basename,
+            })
+
+            os.environ["CLICKHOUSE_DATABASE"] = database
+            # Set temporary directory to match the randomly generated database,
+            # because .sh tests also use it for temporary files and we want to avoid
+            # collisions.
+            testcase_args.test_tmp_dir = os.path.join(suite_tmp_dir, database)
+            os.mkdir(testcase_args.test_tmp_dir)
+            os.environ.setdefault("CLICKHOUSE_TMP", testcase_args.test_tmp_dir)
+
+        testcase_args.testcase_database = database
+
+        return testcase_args
+
+    def __init__(self, suite, case: str, args, is_concurrent: bool):
+        self.case: str = case   # case file name
+        self.tags: Set[str] = suite.all_tags[case] if case in suite.all_tags else set()
+
+        self.case_file: str = os.path.join(suite.suite_path, case)
+        (self.name, self.ext) = os.path.splitext(case)
+
+        file_suffix = ('.' + str(os.getpid())) if is_concurrent and args.test_runs > 1 else ''
+        self.reference_file = self.get_reference_file(suite.suite_path, self.name)
+        self.stdout_file = os.path.join(suite.suite_tmp_path, self.name) + file_suffix + '.stdout'
+        self.stderr_file = os.path.join(suite.suite_tmp_path, self.name) + file_suffix + '.stderr'
+
+        self.testcase_args = None
+        self.runs_count = 0
+
+    # should skip test, should increment skipped_total, skip reason
+    def should_skip_test(self, suite) -> Optional[FailureReason]:
+        tags = self.tags
+
+        if tags and ('disabled' in tags) and not args.disabled:
+            return FailureReason.DISABLED
+
+        elif os.path.exists(os.path.join(suite.suite_path, self.name) + '.disabled') and not args.disabled:
+            return FailureReason.DISABLED
+
+        elif args.skip and any(s in self.name for s in args.skip):
+            return FailureReason.SKIP
+
+        elif not USE_JINJA and self.ext.endswith("j2"):
+            return FailureReason.NO_JINJA
+
+        elif tags and (('zookeeper' in tags) or ('replica' in tags)) and not args.zookeeper:
+            return FailureReason.NO_ZOOKEEPER
+
+        elif tags and (('shard' in tags) or ('distributed' in tags) or ('global' in tags)) and not args.shard:
+            return FailureReason.NO_SHARD
+
+        elif tags and ('no-fasttest' in tags) and args.fast_tests_only:
+            return FailureReason.FAST_ONLY
+
+        elif tags and (('long' in tags) or ('deadlock' in tags) or ('race' in tags)) and args.no_long:
+            # Tests for races and deadlocks usually are run in a loop for a significant amount of time
+            return FailureReason.NO_LONG
+
+        elif tags and ('no-replicated-database' in tags) and args.replicated_database:
+            return FailureReason.REPLICATED_DB
+
+        elif tags:
+            for build_flag in args.build_flags:
+                if 'no-' + build_flag in tags:
+                    return FailureReason.BUILD
+
+        return None
+
+    def process_result_impl(self, proc, stdout: str, stderr: str, total_time: float):
+        description = ""
+
+        if proc:
+            if proc.returncode is None:
+                try:
+                    proc.kill()
+                except OSError as e:
+                    if e.errno != ESRCH:
+                        raise
+
+                if stderr:
+                    description += stderr
+                return TestResult(self.name, TestStatus.FAIL, FailureReason.TIMEOUT, total_time, description)
+
+            if proc.returncode != 0:
+                reason = FailureReason.EXIT_CODE
+                description += str(proc.returncode)
+
+                if stderr:
+                    description += "\n"
+                    description += stderr
+
+                # Stop on fatal errors like segmentation fault. They are sent to client via logs.
+                if ' <Fatal> ' in stderr:
+                    reason = FailureReason.SERVER_DIED
+
+                if self.testcase_args.stop \
+                        and ('Connection refused' in stderr or 'Attempt to read after eof' in stderr) \
+                        and 'Received exception from server' not in stderr:
+                    reason = FailureReason.SERVER_DIED
+
+                if os.path.isfile(self.stdout_file):
+                    description += ", result:\n\n"
+                    description += '\n'.join(open(self.stdout_file).read().splitlines()[:100])
+                    description += '\n'
+
+                description += "\nstdout:\n{}\n".format(stdout)
+                return TestResult(self.name, TestStatus.FAIL, reason, total_time, description)
+
+        if stderr:
+            description += "\n{}\n".format('\n'.join(stderr.splitlines()[:100]))
+            description += "\nstdout:\n{}\n".format(stdout)
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.STDERR, total_time, description)
+
+        if 'Exception' in stdout:
+            description += "\n{}\n".format('\n'.join(stdout.splitlines()[:100]))
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.EXCEPTION, total_time, description)
+
+        if '@@SKIP@@' in stdout:
+            skip_reason = stdout.replace('@@SKIP@@', '').rstrip("\n")
+            description += " - "
+            description += skip_reason
+            return TestResult(self.name, TestStatus.SKIPPED, FailureReason.SKIP, total_time, description)
+
+        if self.reference_file is None:
+            return TestResult(self.name, TestStatus.UNKNOWN, FailureReason.NO_REFERENCE, total_time, description)
+
+        result_is_different = subprocess.call(['diff', '-q', self.reference_file, self.stdout_file], stdout=PIPE)
+
+        if result_is_different:
+            diff = Popen(['diff', '-U', str(self.testcase_args.unified), self.reference_file, self.stdout_file], stdout=PIPE,
+                         universal_newlines=True).communicate()[0]
+            description += "\n{}\n".format(diff)
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.RESULT_DIFF, total_time, description)
+
+        if self.testcase_args.test_runs > 1 and total_time > 60 and 'long' not in self.tags:
+            # We're in Flaky Check mode, check the run time as well while we're at it.
+            return TestResult(self.name, TestStatus.FAIL, FailureReason.TOO_LONG, total_time, description)
+
+        if os.path.exists(self.stdout_file):
+            os.remove(self.stdout_file)
+        if os.path.exists(self.stderr_file):
+            os.remove(self.stderr_file)
+
+        return TestResult(self.name, TestStatus.OK, None, total_time, description)
+
+    @staticmethod
+    def print_test_time(test_time) -> str:
+        if args.print_time:
+            return " {0:.2f} sec.".format(test_time)
+        else:
+            return ''
+
+    def process_result(self, result: TestResult, messages):
+        description_full = messages[result.status]
+        description_full += self.print_test_time(result.total_time)
+        if result.reason is not None:
+            description_full += " - "
+            description_full += result.reason.value
+
+        description_full += result.description
+        description_full += "\n"
+
+        if result.status == TestStatus.FAIL:
+            description_full += 'Database: ' + self.testcase_args.testcase_database
+
+        result.description = description_full
+        return result
+
+    @staticmethod
+    def send_test_name_failed(suite: str, case: str) -> bool:
+        pid = os.getpid()
+        clickhouse_execute(args, f"SELECT 'Running test {suite}/{case} from pid={pid}'")
+
+    def run_single_test(self, server_logs_level, client_options):
+        args = self.testcase_args
+        client = args.testcase_client
+        start_time = args.testcase_start_time
+        database = args.testcase_database
+
+        # This is for .sh tests
+        os.environ["CLICKHOUSE_LOG_COMMENT"] = self.case_file
+
+        params = {
+            'client': client + ' --database=' + database,
+            'logs_level': server_logs_level,
+            'options': client_options,
+            'test': self.case_file,
+            'stdout': self.stdout_file,
+            'stderr': self.stderr_file,
+        }
+
+        # >> append to stderr (but not stdout since it is not used there),
+        # because there are also output of per test database creation
+        if not args.database:
+            pattern = '{test} > {stdout} 2> {stderr}'
+        else:
+            pattern = '{test} > {stdout} 2> {stderr}'
+
+        if self.ext == '.sql':
+            pattern = "{client} --send_logs_level={logs_level} --testmode --multiquery {options} < " + pattern
+
+        command = pattern.format(**params)
+
+        proc = Popen(command, shell=True, env=os.environ)
+
+        while (datetime.now() - start_time).total_seconds() < args.timeout and proc.poll() is None:
+            sleep(0.01)
+
+        need_drop_database = not args.database
+        if need_drop_database and args.no_drop_if_fail:
+            maybe_passed = (proc.returncode == 0) and (proc.stderr is None) and (
+                        proc.stdout is None or 'Exception' not in proc.stdout)
+            need_drop_database = not maybe_passed
+
+        if need_drop_database:
+            seconds_left = max(args.timeout - (datetime.now() - start_time).total_seconds(), 20)
+            try:
+                clickhouse_execute(args, "DROP DATABASE " + database, timeout=seconds_left, settings={
+                    'log_comment': args.testcase_basename,
+                })
+            except socket.timeout:
+                total_time = (datetime.now() - start_time).total_seconds()
+                return None, "", f"Timeout dropping database {database} after test", total_time
+            shutil.rmtree(args.test_tmp_dir)
+
+        total_time = (datetime.now() - start_time).total_seconds()
+
+        # Normalize randomized database names in stdout, stderr files.
+        os.system("LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=self.stdout_file))
+        if args.hide_db_name:
+            os.system(
+                "LC_ALL=C sed -i -e 's/{test_db}/default/g' {file}".format(test_db=database, file=self.stderr_file))
+        if args.replicated_database:
+            os.system("LC_ALL=C sed -i -e 's|/auto_{{shard}}||g' {file}".format(file=self.stdout_file))
+            os.system("LC_ALL=C sed -i -e 's|auto_{{replica}}||g' {file}".format(file=self.stdout_file))
+
+        # Normalize hostname in stdout file.
+        os.system("LC_ALL=C sed -i -e 's/{hostname}/localhost/g' {file}".format(hostname=socket.gethostname(),
+                                                                                file=self.stdout_file))
+
+        stdout = open(self.stdout_file, 'rb').read() if os.path.exists(self.stdout_file) else b''
+        stdout = str(stdout, errors='replace', encoding='utf-8')
+        stderr = open(self.stderr_file, 'rb').read() if os.path.exists(self.stderr_file) else b''
+        stderr = str(stderr, errors='replace', encoding='utf-8')
+
+        return proc, stdout, stderr, total_time
+
+    def run(self, args, suite, client_options, server_logs_level):
+        try:
+            skip_reason = self.should_skip_test(suite)
+            if skip_reason is not None:
+                return TestResult(self.name, TestStatus.SKIPPED, skip_reason, 0., "")
+
+            if args.testname:
+                try:
+                    self.send_test_name_failed(suite.suite, self.case)
+                except:
+                    return TestResult(self.name, TestStatus.FAIL, FailureReason.SERVER_DIED, 0.,
+                        "\nServer does not respond to health check\n")
+
+            self.runs_count += 1
+            self.testcase_args = self.configure_testcase_args(args, self.case_file, suite.suite_tmp_path)
+            proc, stdout, stderr, total_time = self.run_single_test(server_logs_level, client_options)
+
+            result = self.process_result_impl(proc, stdout, stderr, total_time)
+            result.check_if_need_retry(args, stdout, stderr, self.runs_count)
+            return result
+        except KeyboardInterrupt as e:
+            raise e
+        except:
+            exc_type, exc_value, tb = sys.exc_info()
+            exc_name = exc_type.__name__
+            traceback_str = "\n".join(traceback.format_tb(tb, 10))
+            description = f"{exc_name}\n{exc_value}\n{traceback_str}"
+            return TestResult(self.name, TestStatus.UNKNOWN, FailureReason.INTERNAL_ERROR, 0., description)
+
+
+class TestSuite:
+    @staticmethod
+    def tests_in_suite_key_func(item: str) -> int:
+        if args.order == 'random':
+            return random.random()
+
+        reverse = 1 if args.order == 'asc' else -1
+
+        if -1 == item.find('_'):
+            return 99998
+
+        prefix, _ = item.split('_', 1)
+
+        try:
+            return reverse * int(prefix)
+        except ValueError:
+            return 99997
+
+    @staticmethod
+    def render_test_template(j2env, suite_dir, test_name):
+        """
+        Render template for test and reference file if needed
+        """
+
+        if j2env is None:
+            return test_name
+
+        test_base_name = removesuffix(test_name, ".sql.j2", ".sql")
+
+        reference_file_name = test_base_name + ".reference.j2"
+        reference_file_path = os.path.join(suite_dir, reference_file_name)
+        if os.path.isfile(reference_file_path):
+            tpl = j2env.get_template(reference_file_name)
+            tpl.stream().dump(os.path.join(suite_dir, test_base_name) + ".gen.reference")
+
+        if test_name.endswith(".sql.j2"):
+            tpl = j2env.get_template(test_name)
+            generated_test_name = test_base_name + ".gen.sql"
+            tpl.stream().dump(os.path.join(suite_dir, generated_test_name))
+            return generated_test_name
+
+        return test_name
+
+    @staticmethod
+    def read_test_tags(suite_dir: str, all_tests: List[str]) -> Dict[str, Set[str]]:
+        def get_comment_sign(filename):
+            if filename.endswith('.sql') or filename.endswith('.sql.j2'):
+                return '--'
+            elif filename.endswith('.sh') or filename.endswith('.py') or filename.endswith('.expect'):
+                return '#'
+            else:
+                raise Exception(f'Unknown file_extension: {filename}')
+
+        def parse_tags_from_line(line, comment_sign):
+            if not line.startswith(comment_sign):
+                return None
+            tags_str = line[len(comment_sign):].lstrip()
+            tags_prefix = "Tags:"
+            if not tags_str.startswith(tags_prefix):
+                return None
+            tags_str = tags_str[len(tags_prefix):]
+            tags = tags_str.split(',')
+            tags = {tag.strip() for tag in tags}
+            return tags
+
+        def is_shebang(line):
+            return line.startswith('#!')
+
+        def load_tags_from_file(filepath):
+            with open(filepath, 'r') as file:
+                try:
+                    line = file.readline()
+                    if is_shebang(line):
+                        line = file.readline()
+                except UnicodeDecodeError:
+                    return []
+            return parse_tags_from_line(line, get_comment_sign(filepath))
+
+        all_tags = {}
+        start_time = datetime.now()
+        for test_name in all_tests:
+            tags = load_tags_from_file(os.path.join(suite_dir, test_name))
+            if tags:
+                all_tags[test_name] = tags
+        elapsed = (datetime.now() - start_time).total_seconds()
+        if elapsed > 1:
+            print(f"Tags for suite {suite_dir} read in {elapsed:.2f} seconds")
+        return all_tags
+
+    def __init__(self, args, suite_path: str, suite_tmp_path: str, suite: str):
+        self.args = args
+        self.suite_path: str = suite_path
+        self.suite_tmp_path: str = suite_tmp_path
+        self.suite: str = suite
+
+        self.all_tests: List[str] = self.get_tests_list(self.tests_in_suite_key_func)
+        self.all_tags: Dict[str, Set[str]] = self.read_test_tags(self.suite_path, self.all_tests)
+
+        self.sequential_tests = []
+        self.parallel_tests = []
+        for test_name in self.all_tests:
+            if self.is_sequential_test(test_name):
+                self.sequential_tests.append(test_name)
+            else:
+                self.parallel_tests.append(test_name)
+
+    def is_sequential_test(self, test_name):
+        if args.sequential:
+            if any(s in test_name for s in args.sequential):
+                return True
+
+        if test_name not in self.all_tags:
+            return False
+
+        return ('no-parallel' in self.all_tags[test_name]) or ('sequential' in self.all_tags[test_name])
+
+    def get_tests_list(self, sort_key):
+        """
+        Return list of tests file names to run
+        """
+
+        all_tests = list(self.get_selected_tests())
+        all_tests = all_tests * self.args.test_runs
+        all_tests.sort(key=sort_key)
+        return all_tests
+
+    def get_selected_tests(self):
+        """
+        Find all files with tests, filter, render templates
+        """
+
+        j2env = jinja2.Environment(
+            loader=jinja2.FileSystemLoader(self.suite_path),
+            keep_trailing_newline=True,
+        ) if USE_JINJA else None
+
+        for test_name in os.listdir(self.suite_path):
+            if not is_test_from_dir(self.suite_path, test_name):
+                continue
+            if self.args.test and not any(re.search(pattern, test_name) for pattern in self.args.test):
+                continue
+            if USE_JINJA and test_name.endswith(".gen.sql"):
+                continue
+            test_name = self.render_test_template(j2env, self.suite_path, test_name)
+            yield test_name
+
+    @staticmethod
+    def readTestSuite(args, suite_dir_name: str):
+        def is_data_present():
+            return int(clickhouse_execute(args, 'EXISTS TABLE test.hits'))
+
+        base_dir = os.path.abspath(args.queries)
+        tmp_dir = os.path.abspath(args.tmp)
+        suite_path = os.path.join(base_dir, suite_dir_name)
+
+        suite_re_obj = re.search('^[0-9]+_(.*)$', suite_dir_name)
+        if not suite_re_obj:  # skip .gitignore and so on
+            return None
+
+        suite_tmp_path = os.path.join(tmp_dir, suite_dir_name)
+        if not os.path.exists(suite_tmp_path):
+            os.makedirs(suite_tmp_path)
+
+        suite = suite_re_obj.group(1)
+
+        if not os.path.isdir(suite_path):
+            return None
+
+        if 'stateful' in suite and not args.no_stateful and not is_data_present():
+            print("Won't run stateful tests because test data wasn't loaded.")
+            return None
+        if 'stateless' in suite and args.no_stateless:
+            print("Won't run stateless tests because they were manually disabled.")
+            return None
+        if 'stateful' in suite and args.no_stateful:
+            print("Won't run stateful tests because they were manually disabled.")
+            return None
+
+        return TestSuite(args, suite_path, suite_tmp_path, suite)
+
+
+stop_time = None
+exit_code = None
+server_died = None
+stop_tests_triggered_lock = None
+stop_tests_triggered = None
+queue = None
+multiprocessing_manager = None
+restarted_tests = None
+
+# def run_tests_array(all_tests: List[str], num_tests: int, test_suite: TestSuite):
 def run_tests_array(all_tests_with_params):
-    all_tests, num_tests, suite, suite_dir, suite_tmp_dir = all_tests_with_params
+    all_tests, num_tests, test_suite = all_tests_with_params
     global stop_time
     global exit_code
     global server_died
+    global restarted_tests
 
     OP_SQUARE_BRACKET = colored("[", args, attrs=['bold'])
     CL_SQUARE_BRACKET = colored("]", args, attrs=['bold'])
@@ -374,10 +859,11 @@ def run_tests_array(all_tests_with_params):
     MSG_OK = OP_SQUARE_BRACKET + colored(" OK ", args, "green", attrs=['bold']) + CL_SQUARE_BRACKET
     MSG_SKIPPED = OP_SQUARE_BRACKET + colored(" SKIPPED ", args, "cyan", attrs=['bold']) + CL_SQUARE_BRACKET
 
+    MESSAGES = {TestStatus.FAIL: MSG_FAIL, TestStatus.UNKNOWN: MSG_UNKNOWN, TestStatus.OK: MSG_OK, TestStatus.SKIPPED: MSG_SKIPPED}
+
     passed_total = 0
     skipped_total = 0
     failures_total = 0
-    failures = 0
     failures_chain = 0
     start_time = datetime.now()
 
@@ -385,19 +871,14 @@ def run_tests_array(all_tests_with_params):
 
     client_options = get_additional_client_options(args)
 
-    def print_test_time(test_time):
-        if args.print_time:
-            return " {0:.2f} sec.".format(test_time)
-        else:
-            return ''
-
     if num_tests > 0:
         about = 'about ' if is_concurrent else ''
-        print(f"\nRunning {about}{num_tests} {suite} tests ({multiprocessing.current_process().name}).\n")
+        proc_name = multiprocessing.current_process().name
+        print(f"\nRunning {about}{num_tests} {test_suite.suite} tests ({proc_name}).\n")
 
     while True:
         if is_concurrent:
-            case = queue.get()
+            case = queue.get(timeout=args.timeout * 1.1)
             if not case:
                 break
         else:
@@ -415,198 +896,56 @@ def run_tests_array(all_tests_with_params):
             stop_tests()
             break
 
-        case_file = os.path.join(suite_dir, case)
-        (name, ext) = os.path.splitext(case)
+        test_case = TestCase(test_suite, case, args, is_concurrent)
 
         try:
-            status = ''
+            description = ''
             if not is_concurrent:
                 sys.stdout.flush()
-                sys.stdout.write("{0:72}".format(removesuffix(name, ".gen", ".sql") + ": "))
+                sys.stdout.write("{0:72}".format(removesuffix(test_case.name, ".gen", ".sql") + ": "))
                 # This flush is needed so you can see the test name of the long
                 # running test before it will finish. But don't do it in parallel
                 # mode, so that the lines don't mix.
                 sys.stdout.flush()
             else:
-                status = "{0:72}".format(removesuffix(name, ".gen", ".sql") + ": ")
+                description = "{0:72}".format(removesuffix(test_case.name, ".gen", ".sql") + ": ")
 
-            if args.skip and any(s in name for s in args.skip):
-                status += MSG_SKIPPED + " - skip\n"
+            while True:
+                test_result = test_case.run(args, test_suite, client_options, server_logs_level)
+                test_result = test_case.process_result(test_result, MESSAGES)
+                if not test_result.need_retry:
+                    break
+                restarted_tests.append(test_result)
+
+            if test_result.status == TestStatus.OK:
+                passed_total += 1
+                failures_chain = 0
+            elif test_result.status == TestStatus.FAIL:
+                failures_total += 1
+                failures_chain += 1
+                if test_result.reason == FailureReason.SERVER_DIED:
+                    server_died.set()
+                    stop_tests()
+
+            elif test_result.status == TestStatus.SKIPPED:
                 skipped_total += 1
-            elif not args.zookeeper and ('zookeeper' in name
-                    or 'replica' in name):
-                status += MSG_SKIPPED + " - no zookeeper\n"
-                skipped_total += 1
-            elif not args.shard and ('shard' in name
-                    or 'distributed' in name
-                    or 'global' in name):
-                status += MSG_SKIPPED + " - no shard\n"
-                skipped_total += 1
-            elif not args.no_long and ('long' in name
-                    # Tests for races and deadlocks usually are runned in loop
-                    #  for significant amount of time
-                    or 'deadlock' in name
-                    or 'race' in name):
-                status += MSG_SKIPPED + " - no long\n"
-                skipped_total += 1
-            elif not USE_JINJA and ext.endswith("j2"):
-                status += MSG_SKIPPED + " - no jinja\n"
-                skipped_total += 1
-            else:
-                disabled_file = os.path.join(suite_dir, name) + '.disabled'
 
-                if os.path.exists(disabled_file) and not args.disabled:
-                    message = open(disabled_file, 'r').read()
-                    status += MSG_SKIPPED + " - " + message + "\n"
-                else:
+            description += test_result.description
 
-                    if args.testname:
-                        clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-                        failed_to_check = False
-                        try:
-                            clickhouse_proc.communicate(("SELECT 'Running test {suite}/{case} from pid={pid}';".format(pid = os.getpid(), case = case, suite = suite)), timeout=20)
-                        except:
-                            failed_to_check = True
+            if description and not description.endswith('\n'):
+                description += '\n'
 
-                        if failed_to_check or clickhouse_proc.returncode != 0:
-                            failures += 1
-                            print("Server does not respond to health check")
-                            server_died.set()
-                            stop_tests()
-                            break
-
-                    file_suffix = ('.' + str(os.getpid())) if is_concurrent and args.test_runs > 1 else ''
-                    reference_file = get_reference_file(suite_dir, name)
-                    stdout_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stdout'
-                    stderr_file = os.path.join(suite_tmp_dir, name) + file_suffix + '.stderr'
-
-                    testcase_args = configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file)
-                    proc, stdout, stderr, total_time = run_single_test(testcase_args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file)
-
-                    if proc.returncode is None:
-                        try:
-                            proc.kill()
-                        except OSError as e:
-                            if e.errno != ESRCH:
-                                raise
-
-                        failures += 1
-                        status += MSG_FAIL
-                        status += print_test_time(total_time)
-                        status += " - Timeout!\n"
-                        if stderr:
-                            status += stderr
-                        status += 'Database: ' + testcase_args.testcase_database
-                    else:
-                        counter = 1
-                        while need_retry(stdout, stderr):
-                            restarted_tests.append((case_file, stderr))
-                            testcase_args = configure_testcase_args(args, case_file, suite_tmp_dir, stderr_file)
-                            proc, stdout, stderr, total_time = run_single_test(testcase_args, ext, server_logs_level, client_options, case_file, stdout_file, stderr_file)
-                            sleep(2**counter)
-                            counter += 1
-                            if MAX_RETRIES < counter:
-                                if args.replicated_database:
-                                    if DISTRIBUTED_DDL_TIMEOUT_MSG in stderr:
-                                        server_died.set()
-                                break
-
-                        if proc.returncode != 0:
-                            failures += 1
-                            failures_chain += 1
-                            status += MSG_FAIL
-                            status += print_test_time(total_time)
-                            status += ' - return code {}\n'.format(proc.returncode)
-
-                            if stderr:
-                                status += stderr
-
-                            # Stop on fatal errors like segmentation fault. They are sent to client via logs.
-                            if ' <Fatal> ' in stderr:
-                                server_died.set()
-
-                            if testcase_args.stop and ('Connection refused' in stderr or 'Attempt to read after eof' in stderr) and not 'Received exception from server' in stderr:
-                                server_died.set()
-
-                            if os.path.isfile(stdout_file):
-                                status += ", result:\n\n"
-                                status += '\n'.join(
-                                    open(stdout_file).read().split('\n')[:100])
-                                status += '\n'
-
-                            status += 'Database: ' + testcase_args.testcase_database
-
-                        elif stderr:
-                            failures += 1
-                            failures_chain += 1
-                            status += MSG_FAIL
-                            status += print_test_time(total_time)
-                            status += " - having stderror:\n{}\n".format(
-                                '\n'.join(stderr.split('\n')[:100]))
-                            status += 'Database: ' + testcase_args.testcase_database
-                        elif 'Exception' in stdout:
-                            failures += 1
-                            failures_chain += 1
-                            status += MSG_FAIL
-                            status += print_test_time(total_time)
-                            status += " - having exception:\n{}\n".format(
-                                '\n'.join(stdout.split('\n')[:100]))
-                            status += 'Database: ' + testcase_args.testcase_database
-                        elif reference_file is None:
-                            status += MSG_UNKNOWN
-                            status += print_test_time(total_time)
-                            status += " - no reference file\n"
-                            status += 'Database: ' + testcase_args.testcase_database
-                        else:
-                            result_is_different = subprocess.call(['diff', '-q', reference_file, stdout_file], stdout=PIPE)
-
-                            if result_is_different:
-                                diff = Popen(['diff', '-U', str(testcase_args.unified), reference_file, stdout_file], stdout=PIPE, universal_newlines=True).communicate()[0]
-                                failures += 1
-                                status += MSG_FAIL
-                                status += print_test_time(total_time)
-                                status += " - result differs with reference:\n{}\n".format(diff)
-                                status += 'Database: ' + testcase_args.testcase_database
-                            else:
-                                if testcase_args.test_runs > 1 and total_time > 60 and 'long' not in name:
-                                    # We're in Flaky Check mode, check the run time as well while we're at it.
-                                    failures += 1
-                                    failures_chain += 1
-                                    status += MSG_FAIL
-                                    status += print_test_time(total_time)
-                                    status += " - Test runs too long (> 60s). Make it faster.\n"
-                                    status += 'Database: ' + testcase_args.testcase_database
-                                else:
-                                    passed_total += 1
-                                    failures_chain = 0
-                                    status += MSG_OK
-                                    status += print_test_time(total_time)
-                                    status += "\n"
-                                    if os.path.exists(stdout_file):
-                                        os.remove(stdout_file)
-                                    if os.path.exists(stderr_file):
-                                        os.remove(stderr_file)
-
-            if status and not status.endswith('\n'):
-                status += '\n'
-
-            sys.stdout.write(status)
+            sys.stdout.write(description)
             sys.stdout.flush()
         except KeyboardInterrupt as e:
             print(colored("Break tests execution", args, "red"))
             stop_tests()
             raise e
-        except:
-            exc_type, exc_value, tb = sys.exc_info()
-            failures += 1
-            print("{0} - Test internal error: {1}\n{2}\n{3}".format(MSG_FAIL, exc_type.__name__, exc_value, "\n".join(traceback.format_tb(tb, 10))))
 
         if failures_chain >= 20:
             stop_tests()
             break
 
-    failures_total = failures_total + failures
-
     if failures_total > 0:
         print(colored(f"\nHaving {failures_total} errors! {passed_total} tests passed."
             f" {skipped_total} tests skipped. {(datetime.now() - start_time).total_seconds():.2f} s elapsed"
@@ -625,124 +964,104 @@ def run_tests_array(all_tests_with_params):
 server_logs_level = "warning"
 
 
-def check_server_started(client, retry_count):
+def check_server_started(args):
     print("Connecting to ClickHouse server...", end='')
-    sys.stdout.flush()
-    while retry_count > 0:
-        clickhouse_proc = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        (stdout, stderr) = clickhouse_proc.communicate(b"SELECT 1")
 
-        if clickhouse_proc.returncode == 0 and stdout.startswith(b"1"):
+    sys.stdout.flush()
+    retry_count = args.server_check_retries
+    while retry_count > 0:
+        try:
+            clickhouse_execute(args, 'SELECT 1')
             print(" OK")
             sys.stdout.flush()
             return True
-
-        if clickhouse_proc.returncode == 210:
-            # Connection refused, retry
-            print('.', end = '')
+        except (ConnectionRefusedError, ConnectionResetError):
+            print('.', end='')
             sys.stdout.flush()
             retry_count -= 1
             sleep(0.5)
             continue
 
-        # Other kind of error, fail.
-        print('')
-        print("Client invocation failed with code ", clickhouse_proc.returncode, ": ")
-        # We can't print this, because for some reason this is python 2,
-        # and args appeared in 3.3. To hell with it.
-        # print(''.join(clickhouse_proc.args))
-        print("stdout: ")
-        print(stdout)
-        print("stderr: ")
-        print(stderr)
-        sys.stdout.flush()
-        return False
-
-    print('')
-    print('All connection tries failed')
+    print('\nAll connection tries failed')
     sys.stdout.flush()
-
     return False
 
 
 class BuildFlags():
-    THREAD = 'thread-sanitizer'
-    ADDRESS = 'address-sanitizer'
-    UNDEFINED = 'ub-sanitizer'
-    MEMORY = 'memory-sanitizer'
-    DEBUG = 'debug-build'
-    UNBUNDLED = 'unbundled-build'
-    RELEASE = 'release-build'
-    DATABASE_ORDINARY = 'database-ordinary'
+    THREAD = 'tsan'
+    ADDRESS = 'asan'
+    UNDEFINED = 'ubsan'
+    MEMORY = 'msan'
+    DEBUG = 'debug'
+    UNBUNDLED = 'unbundled'
+    RELEASE = 'release'
+    ORDINARY_DATABASE = 'ordinary-database'
     POLYMORPHIC_PARTS = 'polymorphic-parts'
-    DATABASE_REPLICATED = 'database-replicated'
 
 
-def collect_build_flags(client):
-    clickhouse_proc = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = clickhouse_proc.communicate(b"SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'")
+def collect_build_flags(args):
     result = []
 
-    if clickhouse_proc.returncode == 0:
-        if b'-fsanitize=thread' in stdout:
-            result.append(BuildFlags.THREAD)
-        elif b'-fsanitize=address' in stdout:
-            result.append(BuildFlags.ADDRESS)
-        elif b'-fsanitize=undefined' in stdout:
-            result.append(BuildFlags.UNDEFINED)
-        elif b'-fsanitize=memory' in stdout:
-            result.append(BuildFlags.MEMORY)
-    else:
-        raise Exception("Cannot get information about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
+    value = clickhouse_execute(args, "SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'")
+    if b'-fsanitize=thread' in value:
+        result.append(BuildFlags.THREAD)
+    elif b'-fsanitize=address' in value:
+        result.append(BuildFlags.ADDRESS)
+    elif b'-fsanitize=undefined' in value:
+        result.append(BuildFlags.UNDEFINED)
+    elif b'-fsanitize=memory' in value:
+        result.append(BuildFlags.MEMORY)
 
-    clickhouse_proc = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = clickhouse_proc.communicate(b"SELECT value FROM system.build_options WHERE name = 'BUILD_TYPE'")
+    value = clickhouse_execute(args, "SELECT value FROM system.build_options WHERE name = 'BUILD_TYPE'")
+    if b'Debug' in value:
+        result.append(BuildFlags.DEBUG)
+    elif b'RelWithDebInfo' in value or b'Release' in value:
+        result.append(BuildFlags.RELEASE)
 
-    if clickhouse_proc.returncode == 0:
-        if b'Debug' in stdout:
-            result.append(BuildFlags.DEBUG)
-        elif b'RelWithDebInfo' in stdout or b'Release' in stdout:
-            result.append(BuildFlags.RELEASE)
-    else:
-        raise Exception("Cannot get information about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
+    value = clickhouse_execute(args, "SELECT value FROM system.build_options WHERE name = 'UNBUNDLED'")
+    if value in (b'ON', b'1'):
+        result.append(BuildFlags.UNBUNDLED)
 
-    clickhouse_proc = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = clickhouse_proc.communicate(b"SELECT value FROM system.build_options WHERE name = 'UNBUNDLED'")
+    value = clickhouse_execute(args, "SELECT value FROM system.settings WHERE name = 'default_database_engine'")
+    if value == b'Ordinary':
+        result.append(BuildFlags.ORDINARY_DATABASE)
 
-    if clickhouse_proc.returncode == 0:
-        if b'ON' in stdout or b'1' in stdout:
-            result.append(BuildFlags.UNBUNDLED)
-    else:
-        raise Exception("Cannot get information about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
-
-    clickhouse_proc = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = clickhouse_proc.communicate(b"SELECT value FROM system.settings WHERE name = 'default_database_engine'")
-
-    if clickhouse_proc.returncode == 0:
-        if b'Ordinary' in stdout:
-            result.append(BuildFlags.DATABASE_ORDINARY)
-    else:
-        raise Exception("Cannot get information about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
-
-    clickhouse_proc = Popen(shlex.split(client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = clickhouse_proc.communicate(b"SELECT value FROM system.merge_tree_settings WHERE name = 'min_bytes_for_wide_part'")
-
-    if clickhouse_proc.returncode == 0:
-        if stdout == b'0\n':
-            result.append(BuildFlags.POLYMORPHIC_PARTS)
-    else:
-        raise Exception("Cannot get inforamtion about build from server errorcode {}, stderr {}".format(clickhouse_proc.returncode, stderr))
+    value = int(clickhouse_execute(args, "SELECT value FROM system.merge_tree_settings WHERE name = 'min_bytes_for_wide_part'"))
+    if value == 0:
+        result.append(BuildFlags.POLYMORPHIC_PARTS)
 
     return result
 
 
-def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, parallel):
-    if jobs > 1 and len(parallel_tests) > 0:
-        print("Found", len(parallel_tests), "parallel tests and", len(sequential_tests), "sequential tests")
+def suite_key_func(item: str) -> Union[int, Tuple[int, str]]:
+    if args.order == 'random':
+        return random.random()
+
+    if -1 == item.find('_'):
+        return 99998, ''
+
+    prefix, suffix = item.split('_', 1)
+
+    try:
+        return int(prefix), suffix
+    except ValueError:
+        return 99997, ''
+
+
+def extract_key(key: str) -> str:
+    return subprocess.getstatusoutput(
+        args.extract_from_config +
+        " --try --config " +
+        args.configserver + key)[1]
+
+
+def do_run_tests(jobs, test_suite: TestSuite, parallel):
+    if jobs > 1 and len(test_suite.parallel_tests) > 0:
+        print("Found", len(test_suite.parallel_tests), "parallel tests and", len(test_suite.sequential_tests), "sequential tests")
         run_n, run_total = parallel.split('/')
         run_n = float(run_n)
         run_total = float(run_total)
-        tests_n = len(parallel_tests)
+        tests_n = len(test_suite.parallel_tests)
         if run_total > tests_n:
             run_total = tests_n
 
@@ -751,29 +1070,29 @@ def do_run_tests(jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_test
         if jobs > run_total:
             run_total = jobs
 
-        batch_size = max(1, len(parallel_tests) // jobs)
+        batch_size = max(1, len(test_suite.parallel_tests) // jobs)
         parallel_tests_array = []
         for _ in range(jobs):
-            parallel_tests_array.append((None, batch_size, suite, suite_dir, suite_tmp_dir))
+            parallel_tests_array.append((None, batch_size, test_suite))
 
         with closing(multiprocessing.Pool(processes=jobs)) as pool:
             pool.map_async(run_tests_array, parallel_tests_array)
 
-            for suit in parallel_tests:
-                queue.put(suit)
+            for suit in test_suite.parallel_tests:
+                queue.put(suit, timeout=args.timeout * 1.1)
 
             for _ in range(jobs):
-                queue.put(None)
+                queue.put(None, timeout=args.timeout * 1.1)
 
             queue.close()
 
         pool.join()
 
-        run_tests_array((sequential_tests, len(sequential_tests), suite, suite_dir, suite_tmp_dir))
-        return len(sequential_tests) + len(parallel_tests)
+        run_tests_array((test_suite.sequential_tests, len(test_suite.sequential_tests), test_suite))
+        return len(test_suite.sequential_tests) + len(test_suite.parallel_tests)
     else:
-        num_tests = len(all_tests)
-        run_tests_array((all_tests, num_tests, suite, suite_dir, suite_tmp_dir))
+        num_tests = len(test_suite.all_tests)
+        run_tests_array((test_suite.all_tests, num_tests, test_suite))
         return num_tests
 
 
@@ -790,7 +1109,7 @@ def removesuffix(text, *suffixes):
     Added in python 3.9
     https://www.python.org/dev/peps/pep-0616/
 
-    This version can work with severtal possible suffixes
+    This version can work with several possible suffixes
     """
     for suffix in suffixes:
         if suffix and text.endswith(suffix):
@@ -798,119 +1117,35 @@ def removesuffix(text, *suffixes):
     return text
 
 
-def render_test_template(j2env, suite_dir, test_name):
-    """
-    Render template for test and reference file if needed
-    """
-
-    if j2env is None:
-        return test_name
-
-    test_base_name = removesuffix(test_name, ".sql.j2", ".sql")
-
-    reference_file_name = test_base_name  + ".reference.j2"
-    reference_file_path = os.path.join(suite_dir, reference_file_name)
-    if os.path.isfile(reference_file_path):
-        tpl = j2env.get_template(reference_file_name)
-        tpl.stream().dump(os.path.join(suite_dir, test_base_name) + ".gen.reference")
-
-    if test_name.endswith(".sql.j2"):
-        tpl = j2env.get_template(test_name)
-        generated_test_name = test_base_name + ".gen.sql"
-        tpl.stream().dump(os.path.join(suite_dir, generated_test_name))
-        return generated_test_name
-
-    return test_name
-
-
-def get_selected_tests(suite_dir, patterns):
-    """
-    Find all files with tests, filter, render templates
-    """
-
-    j2env = jinja2.Environment(
-        loader=jinja2.FileSystemLoader(suite_dir),
-        keep_trailing_newline=True,
-    ) if USE_JINJA else None
-
-    for test_name in os.listdir(suite_dir):
-        if not is_test_from_dir(suite_dir, test_name):
-            continue
-        if patterns and not any(re.search(pattern, test_name) for pattern in patterns):
-            continue
-        if USE_JINJA and test_name.endswith(".gen.sql"):
-            continue
-        test_name = render_test_template(j2env, suite_dir, test_name)
-        yield test_name
-
-
-def get_tests_list(suite_dir, patterns, test_runs, sort_key):
-    """
-    Return list of tests file names to run
-    """
-
-    all_tests = list(get_selected_tests(suite_dir, patterns))
-    all_tests = all_tests * test_runs
-    all_tests.sort(key=sort_key)
-    return all_tests
-
-
-def get_reference_file(suite_dir, name):
-    """
-    Returns reference file name for specified test
-    """
-
-    name = removesuffix(name, ".gen")
-    for ext in ['.reference', '.gen.reference']:
-        reference_file = os.path.join(suite_dir, name) + ext
-        if os.path.isfile(reference_file):
-            return reference_file
-    return None
-
-
 def main(args):
     global server_died
     global stop_time
     global exit_code
     global server_logs_level
+    global restarted_tests
 
-    def is_data_present():
-        clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-        (stdout, stderr) = clickhouse_proc.communicate(b"EXISTS TABLE test.hits")
-        if clickhouse_proc.returncode != 0:
-            raise CalledProcessError(clickhouse_proc.returncode, args.client, stderr)
+    if not check_server_started(args):
+        msg = "Server is not responding. Cannot execute 'SELECT 1' query. \
+            If you are using split build, you have to specify -c option."
+        if args.hung_check:
+            print(msg)
+            pid = get_server_pid()
+            print("Got server pid", pid)
+            print_stacktraces()
+        raise Exception(msg)
 
-        return stdout.startswith(b'1')
-
-    if not check_server_started(args.client, args.server_check_retries):
-        raise Exception(
-            "Server is not responding. Cannot execute 'SELECT 1' query. \
-            Note: if you are using split build, you may have to specify -c option.")
-
-    build_flags = collect_build_flags(args.client)
-    if args.replicated_database:
-        build_flags.append(BuildFlags.DATABASE_REPLICATED)
-
-    if args.use_skip_list:
-        tests_to_skip_from_list = collect_tests_to_skip(args.skip_list_path, build_flags)
-    else:
-        tests_to_skip_from_list = set([])
+    args.build_flags = collect_build_flags(args)
 
     if args.skip:
-        args.skip = set(args.skip) | tests_to_skip_from_list
-    else:
-        args.skip = tests_to_skip_from_list
-
-    if args.use_skip_list and not args.sequential:
-        args.sequential = collect_sequential_list(args.skip_list_path)
+        args.skip = set(args.skip)
 
     base_dir = os.path.abspath(args.queries)
-    tmp_dir = os.path.abspath(args.tmp)
 
     # Keep same default values as in queries/shell_config.sh
     os.environ.setdefault("CLICKHOUSE_BINARY", args.binary)
-    #os.environ.setdefault("CLICKHOUSE_CLIENT", args.client)
+    # os.environ.setdefault("CLICKHOUSE_CLIENT", args.client)
     os.environ.setdefault("CLICKHOUSE_CONFIG", args.configserver)
+
     if args.configclient:
         os.environ.setdefault("CLICKHOUSE_CONFIG_CLIENT", args.configclient)
 
@@ -923,157 +1158,73 @@ def main(args):
         stop_time = time() + args.global_time_limit
 
     if args.zookeeper is None:
-        _, out = subprocess.getstatusoutput(args.extract_from_config + " --try --config " + args.configserver + ' --key zookeeper | grep . | wc -l')
         try:
-            if int(out) > 0:
-                args.zookeeper = True
-            else:
-                args.zookeeper = False
+            args.zookeeper = int(extract_key(" --key zookeeper | grep . | wc -l")) > 0
         except ValueError:
             args.zookeeper = False
 
     if args.shard is None:
-        _, out = subprocess.getstatusoutput(args.extract_from_config + " --try --config " + args.configserver + ' --key listen_host | grep -E "127.0.0.2|::"')
-        if out:
-            args.shard = True
-        else:
-            args.shard = False
+        args.shard = bool(extract_key(' --key listen_host | grep -E "127.0.0.2|::"'))
 
     def create_common_database(args, db_name):
         create_database_retries = 0
         while create_database_retries < MAX_RETRIES:
-            client_cmd = args.client + " " + get_additional_client_options(args)
-            clickhouse_proc_create = Popen(shlex.split(client_cmd), stdin=PIPE, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-            (stdout, stderr) = clickhouse_proc_create.communicate(("CREATE DATABASE IF NOT EXISTS " + db_name + get_db_engine(args, db_name)))
-            if not need_retry(stdout, stderr):
-                break
+            start_time = datetime.now()
+            try:
+                clickhouse_execute(args, "CREATE DATABASE IF NOT EXISTS " + db_name + get_db_engine(args, db_name))
+            except HTTPError as e:
+                total_time = (datetime.now() - start_time).total_seconds()
+                if not need_retry(args, e.message, e.message, total_time):
+                    break
             create_database_retries += 1
 
     if args.database and args.database != "test":
         create_common_database(args, args.database)
+
     create_common_database(args, "test")
 
-    def sute_key_func(item):
-        if args.order == 'random':
-            return random.random()
-
-        if -1 == item.find('_'):
-            return 99998, ''
-
-        prefix, suffix = item.split('_', 1)
-
-        try:
-            return int(prefix), suffix
-        except ValueError:
-            return 99997, ''
-
     total_tests_run = 0
-    for suite in sorted(os.listdir(base_dir), key=sute_key_func):
+
+    for suite in sorted(os.listdir(base_dir), key=suite_key_func):
         if server_died.is_set():
             break
 
-        suite_dir = os.path.join(base_dir, suite)
-        suite_re_obj = re.search('^[0-9]+_(.*)$', suite)
-        if not suite_re_obj: #skip .gitignore and so on
+        test_suite = TestSuite.readTestSuite(args, suite)
+        if test_suite is None:
             continue
 
-        suite_tmp_dir = os.path.join(tmp_dir, suite)
-        if not os.path.exists(suite_tmp_dir):
-            os.makedirs(suite_tmp_dir)
+        total_tests_run += do_run_tests(args.jobs, test_suite, args.parallel)
 
-        suite = suite_re_obj.group(1)
-        if os.path.isdir(suite_dir):
-
-            if 'stateful' in suite and not args.no_stateful and not is_data_present():
-                print("Won't run stateful tests because test data wasn't loaded.")
-                continue
-            if 'stateless' in suite and args.no_stateless:
-                print("Won't run stateless tests because they were manually disabled.")
-                continue
-            if 'stateful' in suite and args.no_stateful:
-                print("Won't run stateful tests because they were manually disabled.")
-                continue
-
-            # Reverse sort order: we want run newest test first.
-            # And not reverse subtests
-            def key_func(item):
-                if args.order == 'random':
-                    return random.random()
-
-                reverse = 1 if args.order == 'asc' else -1
-
-                if -1 == item.find('_'):
-                    return 99998
-
-                prefix, _ = item.split('_', 1)
-
-                try:
-                    return reverse * int(prefix)
-                except ValueError:
-                    return 99997
-
-            all_tests = get_tests_list(suite_dir, args.test, args.test_runs, key_func)
-
-            jobs = args.jobs
-            parallel_tests = []
-            sequential_tests = []
-            for test in all_tests:
-                if any(s in test for s in args.sequential):
-                    sequential_tests.append(test)
-                else:
-                    parallel_tests.append(test)
-
-            total_tests_run += do_run_tests(
-                jobs, suite, suite_dir, suite_tmp_dir, all_tests, parallel_tests, sequential_tests, args.parallel)
+    if server_died.is_set():
+        exit_code.value = 1
 
     if args.hung_check:
 
         # Some queries may execute in background for some time after test was finished. This is normal.
         for _ in range(1, 60):
-            timeout, processlist = get_processlist(args)
-            if timeout or not processlist:
+            processlist = get_processlist(args)
+            if not processlist:
                 break
             sleep(1)
 
-        if timeout or processlist:
-            if processlist:
-                print(colored("\nFound hung queries in processlist:", args, "red", attrs=["bold"]))
-                print(processlist)
-            else:
-                print(colored("Seems like server hung and cannot respond to queries", args, "red", attrs=["bold"]))
-
-            clickhouse_tcp_port = os.getenv("CLICKHOUSE_PORT_TCP", '9000')
-            server_pid = get_server_pid(clickhouse_tcp_port)
-            bt = None
-            if server_pid and not args.replicated_database:
-                print("\nLocated ClickHouse server process {} listening at TCP port {}".format(server_pid, clickhouse_tcp_port))
-                print("\nCollecting stacktraces from all running threads with gdb:")
-                bt = get_stacktraces_from_gdb(server_pid)
-                if len(bt) < 1000:
-                    print("Got suspiciously small stacktraces: ", bt)
-                    bt = None
-            if bt is None:
-                print("\nCollecting stacktraces from system.stacktraces table:")
-                bt = get_stacktraces_from_clickhouse(args.client, args.replicated_database)
-            if bt is None:
-                print(
-                    colored(
-                        "\nUnable to locate ClickHouse server process listening at TCP port {}. "
-                        "It must have crashed or exited prematurely!".format(clickhouse_tcp_port),
-                        args, "red", attrs=["bold"]))
-            else:
-                print(bt)
+        if processlist:
+            print(colored("\nFound hung queries in processlist:", args, "red", attrs=["bold"]))
+            print(json.dumps(processlist, indent=4))
 
+            print_stacktraces()
             exit_code.value = 1
         else:
             print(colored("\nNo queries hung.", args, "green", attrs=["bold"]))
 
     if len(restarted_tests) > 0:
         print("\nSome tests were restarted:\n")
-        for (test_case, stderr) in restarted_tests:
-            print(test_case)
-            print(stderr)
-            print("\n")
+
+        for test_result in restarted_tests:
+            print("\n{0:72}: ".format(test_result.case_name))
+            # replace it with lowercase to avoid parsing retried tests as failed
+            for status in TestStatus:
+                test_result.description = test_result.description.replace(status.value, status.value.lower())
+            print(test_result.description)
 
     if total_tests_run == 0:
         print("No tests were run.")
@@ -1103,49 +1254,23 @@ def find_binary(name):
 def get_additional_client_options(args):
     if args.client_option:
         return ' '.join('--' + option for option in args.client_option)
-
     return ''
 
-
 def get_additional_client_options_url(args):
     if args.client_option:
         return '&'.join(args.client_option)
-
     return ''
 
-
-def collect_tests_to_skip(skip_list_path, build_flags):
-    result = set([])
-    if not os.path.exists(skip_list_path):
-        return result
-
-    with open(skip_list_path, 'r') as skip_list_file:
-        content = skip_list_file.read()
-        # allows to have comments in skip_list.json
-        skip_dict = json.loads(json_minify(content))
-        for build_flag in build_flags:
-            result |= set(skip_dict[build_flag])
-
-    if len(result) > 0:
-        print("Found file with skip-list {}, {} test will be skipped".format(skip_list_path, len(result)))
-
-    return result
-
-
-def collect_sequential_list(skip_list_path):
-    if not os.path.exists(skip_list_path):
-        return set([])
-
-    with open(skip_list_path, 'r') as skip_list_file:
-        content = skip_list_file.read()
-        # allows to have comments in skip_list.json
-        skip_dict = json.loads(json_minify(content))
-        if 'parallel' in skip_dict:
-            return skip_dict['parallel']
-        return set([])
-
-
 if __name__ == '__main__':
+    stop_time = None
+    exit_code = multiprocessing.Value("i", 0)
+    server_died = multiprocessing.Event()
+    stop_tests_triggered_lock = multiprocessing.Lock()
+    stop_tests_triggered = multiprocessing.Event()
+    queue = multiprocessing.Queue(maxsize=1)
+    multiprocessing_manager = multiprocessing.Manager()
+    restarted_tests = multiprocessing_manager.list()
+
     # Move to a new process group and kill it at exit so that we don't have any
     # infinite tests processes left
     # (new process group is required to avoid killing some parent processes)
@@ -1154,7 +1279,7 @@ if __name__ == '__main__':
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGHUP, signal_handler)
 
-    parser=ArgumentParser(description='ClickHouse functional tests')
+    parser = ArgumentParser(description='ClickHouse functional tests')
     parser.add_argument('-q', '--queries', help='Path to queries dir')
     parser.add_argument('--tmp', help='Path to tmp dir')
 
@@ -1166,7 +1291,7 @@ if __name__ == '__main__':
 
     parser.add_argument('--extract_from_config', help='extract-from-config program')
     parser.add_argument('--configclient', help='Client config (if you use not default ports)')
-    parser.add_argument('--configserver', default= '/etc/clickhouse-server/config.xml', help='Preprocessed server config')
+    parser.add_argument('--configserver', default='/etc/clickhouse-server/config.xml', help='Preprocessed server config')
     parser.add_argument('-o', '--output', help='Output xUnit compliant test report directory')
     parser.add_argument('-t', '--timeout', type=int, default=600, help='Timeout for each test case in seconds')
     parser.add_argument('--global_time_limit', type=int, help='Stop if executing more than specified time (after current test finished)')
@@ -1184,29 +1309,30 @@ if __name__ == '__main__':
     parser.add_argument('-j', '--jobs', default=1, nargs='?', type=int, help='Run all tests in parallel')
     parser.add_argument('--test-runs', default=1, nargs='?', type=int, help='Run each test many times (useful for e.g. flaky check)')
     parser.add_argument('-U', '--unified', default=3, type=int, help='output NUM lines of unified context')
-    parser.add_argument('-r', '--server-check-retries', default=30, type=int, help='Num of tries to execute SELECT 1 before tests started')
-    parser.add_argument('--skip-list-path', help="Path to skip-list file")
-    parser.add_argument('--use-skip-list', action='store_true', default=False, help="Use skip list to skip tests if found")
+    parser.add_argument('-r', '--server-check-retries', default=180, type=int, help='Num of tries to execute SELECT 1 before tests started')
     parser.add_argument('--db-engine', help='Database engine name')
     parser.add_argument('--replicated-database', action='store_true', default=False, help='Run tests with Replicated database engine')
+    parser.add_argument('--fast-tests-only', action='store_true', default=False, help='Run only fast tests (the tests without the "no-fasttest" tag)')
     parser.add_argument('--no-stateless', action='store_true', help='Disable all stateless tests')
     parser.add_argument('--no-stateful', action='store_true', help='Disable all stateful tests')
     parser.add_argument('--skip', nargs='+', help="Skip these tests")
     parser.add_argument('--sequential', nargs='+', help="Run these tests sequentially even if --parallel specified")
-    parser.add_argument('--no-long', action='store_false', dest='no_long', help='Do not run long tests')
+    parser.add_argument('--no-long', action='store_true', dest='no_long', help='Do not run long tests')
     parser.add_argument('--client-option', nargs='+', help='Specify additional client argument')
     parser.add_argument('--print-time', action='store_true', dest='print_time', help='Print test time')
-    group=parser.add_mutually_exclusive_group(required=False)
+
+    group = parser.add_mutually_exclusive_group(required=False)
     group.add_argument('--zookeeper', action='store_true', default=None, dest='zookeeper', help='Run zookeeper related tests')
     group.add_argument('--no-zookeeper', action='store_false', default=None, dest='zookeeper', help='Do not run zookeeper related tests')
-    group=parser.add_mutually_exclusive_group(required=False)
+
+    group = parser.add_mutually_exclusive_group(required=False)
     group.add_argument('--shard', action='store_true', default=None, dest='shard', help='Run sharding related tests (required to clickhouse-server listen 127.0.0.2 127.0.0.3)')
     group.add_argument('--no-shard', action='store_false', default=None, dest='shard', help='Do not run shard related tests')
 
     args = parser.parse_args()
 
     if args.queries and not os.path.isdir(args.queries):
-        print("Cannot access the specified directory with queries (" + args.queries + ")", file=sys.stderr)
+        print(f"Cannot access the specified directory with queries ({args.queries})", file=sys.stderr)
         sys.exit(1)
 
     # Autodetect the directory with queries if not specified
@@ -1215,7 +1341,7 @@ if __name__ == '__main__':
 
     if not os.path.isdir(args.queries):
         # If we're running from the repo
-        args.queries = os.path.join(os.path.dirname(os.path.abspath( __file__ )), 'queries')
+        args.queries = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'queries')
 
     if not os.path.isdir(args.queries):
         # Next we're going to try some system directories, don't write 'stdout' files into them.
@@ -1233,12 +1359,6 @@ if __name__ == '__main__':
 
     print("Using queries from '" + args.queries + "' directory")
 
-    if args.skip_list_path is None:
-        args.skip_list_path = os.path.join(args.queries, 'skip_list.json')
-
-    if args.sequential is None:
-        args.sequential = set([])
-
     if args.tmp is None:
         args.tmp = args.queries
     if args.client is None:
@@ -1255,14 +1375,35 @@ if __name__ == '__main__':
             parser.print_help()
             sys.exit(1)
 
-        if args.configclient:
-            args.client += ' --config-file=' + args.configclient
-        if os.getenv("CLICKHOUSE_HOST"):
-            args.client += ' --host=' + os.getenv("CLICKHOUSE_HOST")
-        if os.getenv("CLICKHOUSE_PORT_TCP"):
-            args.client += ' --port=' + os.getenv("CLICKHOUSE_PORT_TCP")
-        if os.getenv("CLICKHOUSE_DATABASE"):
-            args.client += ' --database=' + os.getenv("CLICKHOUSE_DATABASE")
+    if args.configclient:
+        args.client += ' --config-file=' + args.configclient
+
+    tcp_host = os.getenv("CLICKHOUSE_HOST")
+    if tcp_host is not None:
+        args.tcp_host = tcp_host
+        args.client += f' --host={tcp_host}'
+    else:
+        args.tcp_host = 'localhost'
+
+    tcp_port = os.getenv("CLICKHOUSE_PORT_TCP")
+    if tcp_port is not None:
+        args.tcp_port = int(tcp_port)
+        args.client += f" --port={tcp_port}"
+    else:
+        args.tcp_port = 9000
+
+    http_port = os.getenv("CLICKHOUSE_PORT_HTTP")
+    if http_port is not None:
+        args.http_port = int(http_port)
+    else:
+        args.http_port = 8123
+
+    client_database = os.getenv("CLICKHOUSE_DATABASE")
+    if client_database is not None:
+        args.client += f' --database={client_database}'
+        args.client_database = client_database
+    else:
+        args.client_database = 'default'
 
     if args.client_option:
         # Set options for client
@@ -1279,7 +1420,11 @@ if __name__ == '__main__':
         else:
             os.environ['CLICKHOUSE_URL_PARAMS'] = ''
 
-        os.environ['CLICKHOUSE_URL_PARAMS'] += get_additional_client_options_url(args)
+        client_options_query_str = get_additional_client_options_url(args)
+        args.client_options_query_str = client_options_query_str + '&'
+        os.environ['CLICKHOUSE_URL_PARAMS'] += client_options_query_str
+    else:
+        args.client_options_query_str = ''
 
     if args.extract_from_config is None:
         if os.access(args.binary + '-extract-from-config', os.X_OK):
diff --git a/tests/client-test.xml b/tests/client-test.xml
deleted file mode 100644
index ee84d41911f..00000000000
--- a/tests/client-test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- Config for connecting to test server in Arcadia -->
-<yandex>
-    <tcp_port>59000</tcp_port>
-    <tcp_port_secure>59440</tcp_port_secure>
-    <openSSL>
-        <client>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <verificationMode>none</verificationMode>
-            <invalidCertificateHandler>
-                <name>AcceptCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-</yandex>
\ No newline at end of file
diff --git a/tests/config/config.d/CORS.xml b/tests/config/config.d/CORS.xml
new file mode 100644
index 00000000000..b96209866a7
--- /dev/null
+++ b/tests/config/config.d/CORS.xml
@@ -0,0 +1,20 @@
+<clickhouse>
+    <http_options_response>
+        <header>
+            <name>Access-Control-Allow-Origin</name>
+            <value>*</value>
+        </header>
+        <header>
+            <name>Access-Control-Allow-Headers</name>
+            <value>origin, x-requested-with</value>
+        </header>
+        <header>
+            <name>Access-Control-Allow-Methods</name>
+            <value>POST, GET, OPTIONS</value>
+        </header>
+        <header>
+            <name>Access-Control-Max-Age</name>
+            <value>86400</value>
+        </header>
+    </http_options_response>
+</clickhouse>
diff --git a/tests/config/config.d/clusters.xml b/tests/config/config.d/clusters.xml
index 28d3ae03745..8eac6799dae 100644
--- a/tests/config/config.d/clusters.xml
+++ b/tests/config/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_two_shards_different_databases>
              <shard>
@@ -43,4 +43,4 @@
              </shard>
         </test_cluster_two_replicas_different_databases>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/custom_settings_prefixes.xml b/tests/config/config.d/custom_settings_prefixes.xml
index b15b9372bc6..ec66c1a930e 100644
--- a/tests/config/config.d/custom_settings_prefixes.xml
+++ b/tests/config/config.d/custom_settings_prefixes.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Comma-separated list of prefixes for user-defined settings. -->
     <custom_settings_prefixes>custom_</custom_settings_prefixes>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/database_atomic.xml b/tests/config/config.d/database_atomic.xml
index 17b54948396..b3f51d51a79 100644
--- a/tests/config/config.d/database_atomic.xml
+++ b/tests/config/config.d/database_atomic.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <database_atomic_delay_before_drop_table_sec>60</database_atomic_delay_before_drop_table_sec>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
index 9a3b4d68ea6..1ad43b9880a 100644
--- a/tests/config/config.d/database_replicated.xml
+++ b/tests/config/config.d/database_replicated.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
@@ -22,9 +22,9 @@
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
             <heart_beat_interval_ms>1000</heart_beat_interval_ms>
-            <election_timeout_lower_bound_ms>2000</election_timeout_lower_bound_ms>
-            <election_timeout_upper_bound_ms>4000</election_timeout_upper_bound_ms>
-            <raft_logs_level>trace</raft_logs_level>
+            <election_timeout_lower_bound_ms>4000</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>5000</election_timeout_upper_bound_ms>
+            <raft_logs_level>information</raft_logs_level>
             <force_sync>false</force_sync>
             <!-- we want all logs for complex problems investigation -->
             <reserved_log_items>1000000000000000</reserved_log_items>
@@ -79,4 +79,4 @@
     </remote_servers>
 
     <_functional_tests_helper_database_replicated_replace_args_macros>1</_functional_tests_helper_database_replicated_replace_args_macros>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/disks.xml b/tests/config/config.d/disks.xml
index 86f8047b843..8d7d792c9f6 100644
--- a/tests/config/config.d/disks.xml
+++ b/tests/config/config.d/disks.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <disk_memory>
@@ -6,4 +6,4 @@
             </disk_memory>
         </disks>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/encryption.xml b/tests/config/config.d/encryption.xml
index 216021ae744..b7577b28cbe 100644
--- a/tests/config/config.d/encryption.xml
+++ b/tests/config/config.d/encryption.xml
@@ -1,6 +1,10 @@
-<yandex>
-    <encryption>
-        <!-- "Some fixed key that is at least 16 bytes long" in Base64 -->
-        <key_command>echo "U29tZSBmaXhlZCBrZXkgdGhhdCBpcyBhdCBsZWFzdCAxNiBieXRlcyBsb25n"</key_command>
-    </encryption>
-</yandex>
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key_hex>a32902703dab1cedd7ff7287067787ca</key_hex>
+        </aes_128_gcm_siv>
+        <aes_256_gcm_siv>
+            <key_hex>a32902703dab1cedd7ff7287067787caa32902703dab1cedd7ff7287067787ca</key_hex>
+        </aes_256_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/config/config.d/graphite.xml b/tests/config/config.d/graphite.xml
index 9920c8e42cf..660243b3f06 100644
--- a/tests/config/config.d/graphite.xml
+++ b/tests/config/config.d/graphite.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <graphite_rollup>
         <version_column_name>Version</version_column_name>
         <pattern>
@@ -25,4 +25,4 @@
             </retention>
         </default>
     </graphite_rollup>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/keeper_port.xml b/tests/config/config.d/keeper_port.xml
index b21df47bc85..fc6f8240f1e 100644
--- a/tests/config/config.d/keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -7,9 +7,15 @@
             <operation_timeout_ms>10000</operation_timeout_ms>
             <session_timeout_ms>30000</session_timeout_ms>
             <force_sync>false</force_sync>
-            <startup_timeout>60000</startup_timeout>
+            <startup_timeout>240000</startup_timeout>
             <!-- we want all logs for complex problems investigation -->
             <reserved_log_items>1000000000000000</reserved_log_items>
+            <snapshot_distance>10000</snapshot_distance>
+
+            <!-- For instant start in single node configuration -->
+            <heart_beat_interval_ms>0</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>0</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>0</election_timeout_upper_bound_ms>
         </coordination_settings>
 
         <raft_configuration>
@@ -20,4 +26,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/listen.xml b/tests/config/config.d/listen.xml
index 675225f9575..3abb37d5da2 100644
--- a/tests/config/config.d/listen.xml
+++ b/tests/config/config.d/listen.xml
@@ -1 +1 @@
-<yandex><listen_host>::</listen_host></yandex>
+<clickhouse><listen_host>::</listen_host></clickhouse>
diff --git a/tests/config/config.d/logger.xml b/tests/config/config.d/logger.xml
new file mode 100644
index 00000000000..e27c02a7789
--- /dev/null
+++ b/tests/config/config.d/logger.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <logger>
+        <level>test</level>
+    </logger>
+</clickhouse>
diff --git a/tests/config/config.d/logging_no_rotate.xml b/tests/config/config.d/logging_no_rotate.xml
index 2c34585437b..e541c39aff4 100644
--- a/tests/config/config.d/logging_no_rotate.xml
+++ b/tests/config/config.d/logging_no_rotate.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Disable rotation
              https://pocoproject.org/docs/Poco.FileChannel.html
         -->
         <size>never</size>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/macros.xml b/tests/config/config.d/macros.xml
index b17eb40099d..e0952103526 100644
--- a/tests/config/config.d/macros.xml
+++ b/tests/config/config.d/macros.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <macros>
         <test>Hello, world!</test>
         <default_cluster_macro>test_shard_localhost</default_cluster_macro>
@@ -7,4 +7,4 @@
         <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
         <default_name_test>table_{table}</default_name_test>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/max_concurrent_queries.xml b/tests/config/config.d/max_concurrent_queries.xml
index f326c293244..eb8ca96e8ad 100644
--- a/tests/config/config.d/max_concurrent_queries.xml
+++ b/tests/config/config.d/max_concurrent_queries.xml
@@ -1,4 +1,4 @@
 <!-- Ignore limit of concurrent queries in tests -->
-<yandex>
+<clickhouse>
     <max_concurrent_queries>0</max_concurrent_queries>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/merge_tree.xml b/tests/config/config.d/merge_tree.xml
new file mode 100644
index 00000000000..43bdb6aa07b
--- /dev/null
+++ b/tests/config/config.d/merge_tree.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <merge_tree>
+        <number_of_free_entries_in_pool_to_execute_mutation>8</number_of_free_entries_in_pool_to_execute_mutation>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/merge_tree_settings.xml b/tests/config/config.d/merge_tree_settings.xml
new file mode 100644
index 00000000000..f277c18fa3f
--- /dev/null
+++ b/tests/config/config.d/merge_tree_settings.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <merge_tree>
+        <!-- 10 seconds (default is 1 minute) -->
+        <zookeeper_session_expiration_check_period>10</zookeeper_session_expiration_check_period>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/metric_log.xml b/tests/config/config.d/metric_log.xml
index 0ca9f162416..ea829d15975 100644
--- a/tests/config/config.d/metric_log.xml
+++ b/tests/config/config.d/metric_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
         <collect_interval_milliseconds>1000</collect_interval_milliseconds>
     </metric_log>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/named_collection.xml b/tests/config/config.d/named_collection.xml
new file mode 100644
index 00000000000..e48bac7d4ef
--- /dev/null
+++ b/tests/config/config.d/named_collection.xml
@@ -0,0 +1,13 @@
+<clickhouse>
+    <named_collections>
+        <remote1>
+            <host>127.0.0.2</host>
+            <port>9000</port>
+            <table>remote_test</table>
+        </remote1>
+        <remote2>
+            <host>127.0.0.{1,2}</host>
+            <table>remote_test</table>
+        </remote2>
+    </named_collections>
+</clickhouse>
diff --git a/tests/config/config.d/part_log.xml b/tests/config/config.d/part_log.xml
index 6c6fc9c6982..ce9847a49fb 100644
--- a/tests/config/config.d/part_log.xml
+++ b/tests/config/config.d/part_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
 
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/polymorphic_parts.xml b/tests/config/config.d/polymorphic_parts.xml
index 5f06bf532db..e9cf053f1c5 100644
--- a/tests/config/config.d/polymorphic_parts.xml
+++ b/tests/config/config.d/polymorphic_parts.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/query_masking_rules.xml b/tests/config/config.d/query_masking_rules.xml
index 5a854848f3d..690d62b9a2b 100644
--- a/tests/config/config.d/query_masking_rules.xml
+++ b/tests/config/config.d/query_masking_rules.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
     <query_masking_rules>
         <rule>
             <regexp>TOPSECRET.TOPSECRET</regexp>
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/secure_ports.xml b/tests/config/config.d/secure_ports.xml
index e832dce5526..b1b769c041a 100644
--- a/tests/config/config.d/secure_ports.xml
+++ b/tests/config/config.d/secure_ports.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
 
@@ -10,4 +10,4 @@
         </client>
     </openSSL>
 
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/tcp_with_proxy.xml b/tests/config/config.d/tcp_with_proxy.xml
index 19046054c16..733eb2370ca 100644
--- a/tests/config/config.d/tcp_with_proxy.xml
+++ b/tests/config/config.d/tcp_with_proxy.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <tcp_with_proxy_port>9010</tcp_with_proxy_port>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/test_cluster_with_incorrect_pw.xml b/tests/config/config.d/test_cluster_with_incorrect_pw.xml
index 109e35afc37..a5033abf154 100644
--- a/tests/config/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/config/config.d/test_cluster_with_incorrect_pw.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_with_incorrect_pw>
              <shard>
@@ -18,4 +18,4 @@
              </shard>
          </test_cluster_with_incorrect_pw>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/text_log.xml b/tests/config/config.d/text_log.xml
index 3699a23578c..dce4942d952 100644
--- a/tests/config/config.d/text_log.xml
+++ b/tests/config/config.d/text_log.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <text_log>
         <database>system</database>
         <table>text_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </text_log>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/top_level_domains_lists.xml b/tests/config/config.d/top_level_domains_lists.xml
index 7b5e6a5638a..4d7e2af617d 100644
--- a/tests/config/config.d/top_level_domains_lists.xml
+++ b/tests/config/config.d/top_level_domains_lists.xml
@@ -1,5 +1,6 @@
-<yandex>
+<clickhouse>
     <top_level_domains_lists>
         <public_suffix_list>public_suffix_list.dat</public_suffix_list>
+        <no_new_line_list>no_new_line_list.dat</no_new_line_list>
     </top_level_domains_lists>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/top_level_domains_path.xml b/tests/config/config.d/top_level_domains_path.xml
index 0ab836e5818..d5fdeb61502 100644
--- a/tests/config/config.d/top_level_domains_path.xml
+++ b/tests/config/config.d/top_level_domains_path.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <top_level_domains_path replace="replace">/etc/clickhouse-server/top_level_domains/</top_level_domains_path>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/zookeeper.xml b/tests/config/config.d/zookeeper.xml
index 06ed7fcd39f..4fa529a6180 100644
--- a/tests/config/config.d/zookeeper.xml
+++ b/tests/config/config.d/zookeeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/config/config.d/zookeeper_log.xml b/tests/config/config.d/zookeeper_log.xml
index 2ec1f2446ed..a70cbc3ecc2 100644
--- a/tests/config/config.d/zookeeper_log.xml
+++ b/tests/config/config.d/zookeeper_log.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <zookeeper_log>
         <database>system</database>
         <table>zookeeper_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </zookeeper_log>
-</yandex>
+</clickhouse>
diff --git a/tests/config/executable_dictionary.xml b/tests/config/executable_dictionary.xml
index 6089f57a3d7..e2b0bd0663e 100644
--- a/tests/config/executable_dictionary.xml
+++ b/tests/config/executable_dictionary.xml
@@ -123,8 +123,8 @@
 
     <source>
         <executable>
-            <command>printf "1\tValue\n"</command>
-            <format>TabSeparated</format>
+            <format>JSONEachRow</format>
+            <command>cd /; clickhouse-local --input-format JSONEachRow --output-format JSONEachRow --structure 'id UInt64' --query "SELECT id, 'Value' AS value FROM table"</command>
             <implicit_key>false</implicit_key>
         </executable>
     </source>
@@ -156,8 +156,8 @@
 
     <source>
         <executable>
-            <command>echo "Value"</command>
-            <format>TabSeparated</format>
+            <format>JSONEachRow</format>
+            <command>cd /; clickhouse-local --input-format JSONEachRow --output-format JSONEachRow --structure 'id UInt64' --query "SELECT 'Value' AS value FROM table"</command>
             <implicit_key>true</implicit_key>
         </executable>
     </source>
@@ -197,8 +197,8 @@
 
     <source>
         <executable>
-            <command>printf "1\tFirstKey\tValue\n"</command>
-            <format>TabSeparated</format>
+            <format>JSONEachRow</format>
+            <command>cd /; clickhouse-local --input-format JSONEachRow --output-format JSONEachRow --structure 'id UInt64, id_key String' --query "SELECT id, id_key, 'Value' AS value FROM table"</command>
             <implicit_key>false</implicit_key>
         </executable>
     </source>
@@ -238,8 +238,8 @@
 
     <source>
         <executable>
-            <command>echo "Value"</command>
-            <format>TabSeparated</format>
+            <format>JSONEachRow</format>
+            <command>cd /; clickhouse-local --input-format JSONEachRow --output-format JSONEachRow --structure 'id UInt64, id_key String' --query "SELECT 'Value' AS value FROM table"</command>
             <implicit_key>true</implicit_key>
         </executable>
     </source>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 571dff34018..a451c9f3ed1 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -28,20 +28,28 @@ ln -sf $SRC_PATH/config.d/clusters.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/max_concurrent_queries.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/merge_tree_settings.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/keeper_port.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/merge_tree.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/tcp_with_proxy.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_lists.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_path.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/encryption.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/CORS.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/zookeeper_log.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/logger.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/named_collection.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/users.d/log_queries.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/readonly.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/access_management.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/database_atomic_drop_detach_sync.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/opentelemetry.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/remote_queries.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/session_log_test.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/memory_profiler.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/no_fsync_metadata.xml $DEST_SERVER_PATH/users.d/
 
 # FIXME DataPartsExchange may hang for http_send_timeout seconds
 # when nobody is going to read from the other side of socket (due to "Fetching of part was cancelled"),
@@ -53,6 +61,7 @@ ln -sf $SRC_PATH/strings_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/decimals_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/executable_dictionary.xml $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/executable_pool_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/test_function.xml $DEST_SERVER_PATH/
 
 ln -sf $SRC_PATH/top_level_domains $DEST_SERVER_PATH/
 
diff --git a/tests/config/test_function.xml b/tests/config/test_function.xml
new file mode 100644
index 00000000000..2e31c9677ec
--- /dev/null
+++ b/tests/config/test_function.xml
@@ -0,0 +1,16 @@
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function</name>
+        <return_type>UInt64</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>cd /; clickhouse-local --input-format TabSeparated --output-format TabSeparated --structure 'x UInt64, y UInt64' --query "SELECT x + y FROM table"</command>
+        <lifetime>0</lifetime>
+    </function>
+</functions>
diff --git a/tests/config/top_level_domains/no_new_line_list.dat b/tests/config/top_level_domains/no_new_line_list.dat
new file mode 100644
index 00000000000..4d5f9756e55
--- /dev/null
+++ b/tests/config/top_level_domains/no_new_line_list.dat
@@ -0,0 +1 @@
+foo.bar
\ No newline at end of file
diff --git a/tests/config/users.d/access_management.xml b/tests/config/users.d/access_management.xml
index 7e799cb7b10..3399ef5915a 100644
--- a/tests/config/users.d/access_management.xml
+++ b/tests/config/users.d/access_management.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <users>
         <default>
             <access_management>1</access_management>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/database_atomic_drop_detach_sync.xml b/tests/config/users.d/database_atomic_drop_detach_sync.xml
index 4313edf8be1..386fce017b6 100644
--- a/tests/config/users.d/database_atomic_drop_detach_sync.xml
+++ b/tests/config/users.d/database_atomic_drop_detach_sync.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <database_atomic_wait_for_drop_and_detach_synchronously>1</database_atomic_wait_for_drop_and_detach_synchronously>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/database_ordinary.xml b/tests/config/users.d/database_ordinary.xml
index 68f3b044f75..b3b81ee25ff 100644
--- a/tests/config/users.d/database_ordinary.xml
+++ b/tests/config/users.d/database_ordinary.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <default_database_engine>Ordinary</default_database_engine>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/database_replicated.xml b/tests/config/users.d/database_replicated.xml
index b19026e4a54..279591494c1 100644
--- a/tests/config/users.d/database_replicated.xml
+++ b/tests/config/users.d/database_replicated.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_database_replicated>1</allow_experimental_database_replicated>
@@ -9,4 +9,4 @@
             <distributed_ddl_entry_format_version>2</distributed_ddl_entry_format_version>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/log_queries.xml b/tests/config/users.d/log_queries.xml
index 25261072ade..755c5478463 100644
--- a/tests/config/users.d/log_queries.xml
+++ b/tests/config/users.d/log_queries.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/memory_profiler.xml b/tests/config/users.d/memory_profiler.xml
new file mode 100644
index 00000000000..56e9ba28347
--- /dev/null
+++ b/tests/config/users.d/memory_profiler.xml
@@ -0,0 +1,8 @@
+<yandex>
+    <profiles>
+        <default>
+            <max_untracked_memory>1Mi</max_untracked_memory>
+            <memory_profiler_step>1Mi</memory_profiler_step>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/config/users.d/no_fsync_metadata.xml b/tests/config/users.d/no_fsync_metadata.xml
new file mode 100644
index 00000000000..6b9d69927f8
--- /dev/null
+++ b/tests/config/users.d/no_fsync_metadata.xml
@@ -0,0 +1,11 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <!-- Sometimes we see that pretty simple queries like
+                 CREATE DATABASE can take > 30 seconds.
+                 Let's try to disable fsync.
+             -->
+            <fsync_metadata>false</fsync_metadata>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/config/users.d/opentelemetry.xml b/tests/config/users.d/opentelemetry.xml
index e003b51e9b0..7e3f13bb246 100644
--- a/tests/config/users.d/opentelemetry.xml
+++ b/tests/config/users.d/opentelemetry.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <opentelemetry_start_trace_probability>0.1</opentelemetry_start_trace_probability>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/readonly.xml b/tests/config/users.d/readonly.xml
index 64fbaf77464..8e463205348 100644
--- a/tests/config/users.d/readonly.xml
+++ b/tests/config/users.d/readonly.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <!-- Profile that allows only read queries. -->
         <readonly>
@@ -18,4 +18,4 @@
             <quota>default</quota>
         </readonly>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/remote_queries.xml b/tests/config/users.d/remote_queries.xml
index 97060780fa4..8387546f518 100644
--- a/tests/config/users.d/remote_queries.xml
+++ b/tests/config/users.d/remote_queries.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <!-- Avoid "Connection failed at try №1" messages. -->
@@ -10,4 +10,4 @@
                  SYSTEM RELOAD CONFIG can be executed before each test -->
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/config/users.d/session_log_test.xml b/tests/config/users.d/session_log_test.xml
new file mode 100644
index 00000000000..1cd8aadfd09
--- /dev/null
+++ b/tests/config/users.d/session_log_test.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!-- User and profile to be used in sesson_log tests, to make sure that list of user's profiles is logged correctly -->
+<clickhouse>
+    <profiles>
+        <session_log_test_xml_profile>
+            <!--
+            can't be readonly since we need to modify some
+            user settings in queries initiated by test.
+            <readonly>1</readonly>
+            -->
+            <send_logs_level>none</send_logs_level>
+        </session_log_test_xml_profile>
+    </profiles>
+    <roles>
+        <session_log_test_xml_role>
+        </session_log_test_xml_role>
+    </roles>
+
+    <users>
+        <session_log_test_xml_user>
+            <password></password>
+            <networks incl="networks" replace="replace">
+                <ip>::1</ip>
+                <ip>127.0.0.1</ip>
+            </networks>
+            <profile>session_log_test_xml_profile</profile>
+            <quota>default</quota>
+        </session_log_test_xml_user>
+    </users>
+</clickhouse>
diff --git a/tests/config/users.d/timeouts.xml b/tests/config/users.d/timeouts.xml
index 60b24cfdef8..a2d77a4c6e7 100644
--- a/tests/config/users.d/timeouts.xml
+++ b/tests/config/users.d/timeouts.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <!-- Default HTTP timeout is 30 minutes. Set it to 1 minute. -->
@@ -6,6 +6,11 @@
             <http_receive_timeout>60</http_receive_timeout>
             <!-- 1 minute (default is 10 minutes) -->
             <insert_quorum_timeout>60000</insert_quorum_timeout>
+            <!-- 30 seconds (default is 2 minutes) -->
+            <replication_wait_for_inactive_replica_timeout>30</replication_wait_for_inactive_replica_timeout>
+
+            <!-- Increase timeout for async INSERT to avoid flakiness in tests -->
+            <async_insert_busy_timeout_ms>5000</async_insert_busy_timeout_ms>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/decimals_dictionary.xml b/tests/decimals_dictionary.xml
deleted file mode 120000
index 15f5b3800b3..00000000000
--- a/tests/decimals_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/decimals_dictionary.xml
\ No newline at end of file
diff --git a/tests/executable_pool_dictionary.xml b/tests/executable_pool_dictionary.xml
deleted file mode 120000
index 83f18b95f20..00000000000
--- a/tests/executable_pool_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/executable_pool_dictionary.xml
\ No newline at end of file
diff --git a/tests/external_models/catboost/data/build_catboost.sh b/tests/external_models/catboost/data/build_catboost.sh
deleted file mode 100755
index 50a3fb43ef8..00000000000
--- a/tests/external_models/catboost/data/build_catboost.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-cd $DIR
-git clone https://github.com/catboost/catboost.git
-
-
-cd "${DIR}/catboost/catboost/libs/model_interface"
-../../../ya make -r  -o "${DIR}/build/lib" -j4
-cd $DIR
-ln -sf "${DIR}/build/lib/catboost/libs/model_interface/libcatboostmodel.so" libcatboostmodel.so
-
-cd "${DIR}/catboost/catboost/python-package/catboost"
-../../../ya make -r -DUSE_ARCADIA_PYTHON=no -DOS_SDK=local -DPYTHON_CONFIG=python2-config -j4
-cd $DIR
-ln -sf "${DIR}/catboost/catboost/python-package" python-package
diff --git a/tests/external_models/catboost/helpers/client.py b/tests/external_models/catboost/helpers/client.py
deleted file mode 100644
index ecf44a0b65c..00000000000
--- a/tests/external_models/catboost/helpers/client.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import subprocess
-import threading
-import os
-
-
-class ClickHouseClient:
-    def __init__(self, binary_path, port):
-        self.binary_path = binary_path
-        self.port = port
-
-    def query(self, query, timeout=10, pipe=None):
-
-        result = []
-        process = []
-
-        def run(path, port, text, result, in_pipe, process):
-
-            if in_pipe is None:
-                in_pipe = subprocess.PIPE
-
-            pipe = subprocess.Popen([path, 'client', '--port', str(port), '-q', text],
-                                    stdin=in_pipe, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
-            process.append(pipe)
-            stdout_data, stderr_data = pipe.communicate()
-
-            if stderr_data:
-                raise Exception('Error while executing query: {}\nstdout:\n{}\nstderr:\n{}'
-                                .format(text, stdout_data, stderr_data))
-
-            result.append(stdout_data)
-
-        thread = threading.Thread(target=run, args=(self.binary_path, self.port, query, result, pipe, process))
-        thread.start()
-        thread.join(timeout)
-        if thread.isAlive():
-            if len(process):
-                process[0].kill()
-            thread.join()
-            raise Exception('timeout exceed for query: ' + query)
-
-        if len(result):
-            return result[0]
diff --git a/tests/external_models/catboost/helpers/generate.py b/tests/external_models/catboost/helpers/generate.py
deleted file mode 100644
index a7c1f3d9e98..00000000000
--- a/tests/external_models/catboost/helpers/generate.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import numpy as np
-
-
-def generate_uniform_int_column(size, low, high, seed=0):
-    np.random.seed(seed)
-    return np.random.randint(low, high, size)
-
-
-def generate_uniform_float_column(size, low, high, seed=0):
-    np.random.seed(seed)
-    return np.random.random(size) * (high - low) + low
-
-
-def generate_uniform_string_column(size, samples, seed):
-    return np.array(samples)[generate_uniform_int_column(size, 0, len(samples), seed)]
diff --git a/tests/external_models/catboost/helpers/server.py b/tests/external_models/catboost/helpers/server.py
deleted file mode 100644
index 8248b16e6df..00000000000
--- a/tests/external_models/catboost/helpers/server.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import subprocess
-import threading
-import socket
-import time
-
-
-class ClickHouseServer:
-    def __init__(self, binary_path, config_path, stdout_file=None, stderr_file=None, shutdown_timeout=10):
-        self.binary_path = binary_path
-        self.config_path = config_path
-        self.pipe = None
-        self.stdout_file = stdout_file
-        self.stderr_file = stderr_file
-        self.shutdown_timeout = shutdown_timeout
-
-    def start(self):
-        cmd = [self.binary_path, 'server', '--config', self.config_path]
-        out_pipe = None
-        err_pipe = None
-        if self.stdout_file is not None:
-            out_pipe = open(self.stdout_file, 'w')
-        if self.stderr_file is not None:
-            err_pipe = open(self.stderr_file, 'w')
-        self.pipe = subprocess.Popen(cmd, stdout=out_pipe, stderr=err_pipe)
-
-    def wait_for_request(self, port, timeout=1):
-        try:
-            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            # is not working
-            # s.settimeout(timeout)
-
-            step = 0.01
-            for iter in range(int(timeout / step)):
-                if s.connect_ex(('localhost', port)) == 0:
-                    return
-                time.sleep(step)
-
-            s.connect(('localhost', port))
-        except socket.error as socketerror:
-            print("Error: ", socketerror)
-            raise
-
-    def shutdown(self, timeout=10):
-
-        def wait(pipe):
-            pipe.wait()
-
-        if self.pipe is not None:
-            self.pipe.terminate()
-            thread = threading.Thread(target=wait, args=(self.pipe,))
-            thread.start()
-            thread.join(timeout)
-            if thread.isAlive():
-                self.pipe.kill()
-                thread.join()
-
-            if self.pipe.stdout is not None:
-                self.pipe.stdout.close()
-            if self.pipe.stderr is not None:
-                self.pipe.stderr.close()
-
-    def __enter__(self):
-        self.start()
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.shutdown(self.shutdown_timeout)
diff --git a/tests/external_models/catboost/helpers/server_with_models.py b/tests/external_models/catboost/helpers/server_with_models.py
deleted file mode 100644
index e00da7b7027..00000000000
--- a/tests/external_models/catboost/helpers/server_with_models.py
+++ /dev/null
@@ -1,168 +0,0 @@
-from .server import ClickHouseServer
-from .client import ClickHouseClient
-from .table import ClickHouseTable
-import os
-import errno
-from shutil import rmtree
-
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CATBOOST_ROOT = os.path.dirname(SCRIPT_DIR)
-
-CLICKHOUSE_CONFIG = \
-'''
-<yandex>
-    <timezone>Europe/Moscow</timezone>
-    <listen_host>::</listen_host>
-    <path>{path}</path>
-    <tmp_path>{tmp_path}</tmp_path>
-    <models_config>{models_config}</models_config>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <users_config>users.xml</users_config>
-    <tcp_port>{tcp_port}</tcp_port>
-    <catboost_dynamic_library_path>{catboost_dynamic_library_path}</catboost_dynamic_library_path>
-    <logger>
-        <level>trace</level>
-        <log>{path}/clickhouse-server.log</log>
-        <errorlog>{path}/clickhouse-server.err.log</errorlog>
-        <size>never</size>
-        <count>50</count>
-    </logger>
-</yandex>
-'''
-
-CLICKHOUSE_USERS = \
-'''
-<yandex>
-    <profiles>
-        <default>
-        </default>
-	<readonly>
-            <readonly>1</readonly>
-        </readonly>
-    </profiles>
-
-    <users>
-        <readonly>
-            <password></password>
-            <profile>readonly</profile>
-            <quota>default</quota>
-        </readonly>
-
-        <default>
-            <password></password>
-            <profile>default</profile>
-            <quota>default</quota>
-            <networks incl="networks" replace="replace">
-                <ip>::1</ip>
-                <ip>127.0.0.1</ip>
-            </networks>
-
-        </default>
-    </users>
-
-    <quotas>
-        <default>
-        </default>
-    </quotas>
-</yandex>
-'''
-
-CATBOOST_MODEL_CONFIG = \
-'''
-<models>
-    <model>
-        <type>catboost</type>
-        <name>{name}</name>
-        <path>{path}</path>
-        <lifetime>0</lifetime>
-    </model>
-</models>
-'''
-
-
-class ClickHouseServerWithCatboostModels:
-    def __init__(self, name, binary_path, port, shutdown_timeout=10, clean_folder=False):
-        self.models = {}
-        self.name = name
-        self.binary_path = binary_path
-        self.port = port
-        self.shutdown_timeout = shutdown_timeout
-        self.clean_folder = clean_folder
-        self.root = os.path.join(CATBOOST_ROOT, 'data', 'servers')
-        self.config_path = os.path.join(self.root, 'config.xml')
-        self.users_path = os.path.join(self.root, 'users.xml')
-        self.models_dir = os.path.join(self.root, 'models')
-        self.server = None
-
-    def _get_server(self):
-        stdout_file = os.path.join(self.root, 'server_stdout.txt')
-        stderr_file = os.path.join(self.root, 'server_stderr.txt')
-        return ClickHouseServer(self.binary_path, self.config_path, stdout_file, stderr_file, self.shutdown_timeout)
-
-    def add_model(self, model_name, model):
-        self.models[model_name] = model
-
-    def apply_model(self, name, df, cat_feature_names):
-        names = list(df)
-        float_feature_names = tuple(name for name in names if name not in cat_feature_names)
-        with ClickHouseTable(self.server, self.port, name, df) as table:
-            return table.apply_model(name, cat_feature_names, float_feature_names)
-
-    def _create_root(self):
-        try:
-            os.makedirs(self.root)
-        except OSError as exc:  # Python >2.5
-            if exc.errno == errno.EEXIST and os.path.isdir(self.root):
-                pass
-            else:
-                raise
-
-    def _clean_root(self):
-        rmtree(self.root)
-
-    def _save_config(self):
-        params = {
-            'tcp_port': self.port,
-            'path': os.path.join(self.root, 'clickhouse'),
-            'tmp_path': os.path.join(self.root, 'clickhouse', 'tmp'),
-            'models_config': os.path.join(self.models_dir, '*_model.xml'),
-            'catboost_dynamic_library_path': os.path.join(CATBOOST_ROOT, 'data', 'libcatboostmodel.so')
-        }
-        config = CLICKHOUSE_CONFIG.format(**params)
-
-        with open(self.config_path, 'w') as f:
-            f.write(config)
-
-        with open(self.users_path, 'w') as f:
-            f.write(CLICKHOUSE_USERS)
-
-    def _save_models(self):
-        if not os.path.exists(self.models_dir):
-            os.makedirs(self.models_dir)
-
-        for name, model in list(self.models.items()):
-            model_path = os.path.join(self.models_dir, name + '.cbm')
-            config_path = os.path.join(self.models_dir, name + '_model.xml')
-            params = {
-                'name': name,
-                'path': model_path
-            }
-            config = CATBOOST_MODEL_CONFIG.format(**params)
-            with open(config_path, 'w') as f:
-                f.write(config)
-
-            model.save_model(model_path)
-
-    def __enter__(self):
-        self._create_root()
-        self._save_config()
-        self._save_models()
-        self.server = self._get_server().__enter__()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        res = self.server.__exit__(exc_type, exc_val, exc_tb)
-        if self.clean_folder:
-            self._clean_root()
-        return res
-
diff --git a/tests/external_models/catboost/helpers/table.py b/tests/external_models/catboost/helpers/table.py
deleted file mode 100644
index 5f9b828c9f3..00000000000
--- a/tests/external_models/catboost/helpers/table.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from .server import ClickHouseServer
-from .client import ClickHouseClient
-from pandas import DataFrame
-import os
-import threading
-import tempfile
-
-
-class ClickHouseTable:
-    def __init__(self, server, port, table_name, df):
-        self.server = server
-        self.port = port
-        self.table_name = table_name
-        self.df = df
-
-        if not isinstance(self.server, ClickHouseServer):
-            raise Exception('Expected ClickHouseServer, got ' + repr(self.server))
-        if not isinstance(self.df, DataFrame):
-            raise Exception('Expected DataFrame, got ' + repr(self.df))
-
-        self.server.wait_for_request(port)
-        self.client = ClickHouseClient(server.binary_path, port)
-
-    def _convert(self, name):
-        types_map = {
-            'float64': 'Float64',
-            'int64': 'Int64',
-            'float32': 'Float32',
-            'int32': 'Int32'
-        }
-
-        if name in types_map:
-            return types_map[name]
-        return 'String'
-
-    def _create_table_from_df(self):
-        self.client.query('create database if not exists test')
-        self.client.query('drop table if exists test.{}'.format(self.table_name))
-
-        column_types = list(self.df.dtypes)
-        column_names = list(self.df)
-        schema = ', '.join((name + ' ' + self._convert(str(t)) for name, t in zip(column_names, column_types)))
-        print('schema:', schema)
-
-        create_query = 'create table test.{} (date Date DEFAULT today(), {}) engine = MergeTree(date, (date), 8192)'
-        self.client.query(create_query.format(self.table_name, schema))
-
-        insert_query = 'insert into test.{} ({}) format CSV'
-
-        with tempfile.TemporaryFile() as tmp_file:
-            self.df.to_csv(tmp_file, header=False, index=False)
-            tmp_file.seek(0)
-            self.client.query(insert_query.format(self.table_name, ', '.join(column_names)), pipe=tmp_file)
-
-    def apply_model(self, model_name, float_columns, cat_columns):
-        columns = ', '.join(list(float_columns) + list(cat_columns))
-        query = "select modelEvaluate('{}', {}) from test.{} format TSV"
-        result = self.client.query(query.format(model_name, columns, self.table_name))
-
-        def parse_row(row):
-            values = tuple(map(float, list(filter(len, list(map(str.strip, row.replace('(', '').replace(')', '').split(',')))))))
-            return values if len(values) != 1 else values[0]
-
-        return tuple(map(parse_row, list(filter(len, list(map(str.strip, result.split('\n')))))))
-
-    def _drop_table(self):
-        self.client.query('drop table test.{}'.format(self.table_name))
-
-    def __enter__(self):
-        self._create_table_from_df()
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self._drop_table()
diff --git a/tests/external_models/catboost/helpers/train.py b/tests/external_models/catboost/helpers/train.py
deleted file mode 100644
index 34a6f8e958b..00000000000
--- a/tests/external_models/catboost/helpers/train.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import os
-import sys
-from pandas import DataFrame
-
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-CATBOOST_ROOT = os.path.dirname(SCRIPT_DIR)
-CATBOOST_PYTHON_DIR = os.path.join(CATBOOST_ROOT, 'data', 'python-package')
-
-if CATBOOST_PYTHON_DIR not in sys.path:
-    sys.path.append(CATBOOST_PYTHON_DIR)
-
-
-import catboost
-from catboost import CatBoostClassifier
-
-
-def train_catboost_model(df, target, cat_features, params, verbose=True):
-
-    if not isinstance(df, DataFrame):
-        raise Exception('DataFrame object expected, but got ' + repr(df))
-
-    print('features:', df.columns.tolist())
-
-    cat_features_index = list(df.columns.get_loc(feature) for feature in cat_features)
-    print('cat features:', cat_features_index)
-    model = CatBoostClassifier(**params)
-    model.fit(df, target, cat_features=cat_features_index, verbose=verbose)
-    return model
diff --git a/tests/external_models/catboost/pytest.ini b/tests/external_models/catboost/pytest.ini
deleted file mode 100644
index a40472347fb..00000000000
--- a/tests/external_models/catboost/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-python_files = test.py
-norecursedirs=data
diff --git a/tests/external_models/catboost/test_apply_catboost_model/test.py b/tests/external_models/catboost/test_apply_catboost_model/test.py
deleted file mode 100644
index d266393bf48..00000000000
--- a/tests/external_models/catboost/test_apply_catboost_model/test.py
+++ /dev/null
@@ -1,294 +0,0 @@
-from helpers.server_with_models import ClickHouseServerWithCatboostModels
-from helpers.generate import generate_uniform_string_column, generate_uniform_float_column, generate_uniform_int_column
-from helpers.train import train_catboost_model
-import os
-import numpy as np
-from pandas import DataFrame
-
-
-PORT = int(os.environ.get('CLICKHOUSE_TESTS_PORT', '9000'))
-CLICKHOUSE_TESTS_SERVER_BIN_PATH = os.environ.get('CLICKHOUSE_TESTS_SERVER_BIN_PATH', '/usr/bin/clickhouse')
-
-
-def add_noise_to_target(target, seed, threshold=0.05):
-    col = generate_uniform_float_column(len(target), 0., 1., seed + 1) < threshold
-    return target * (1 - col) + (1 - target) * col
-
-
-def check_predictions(test_name, target, pred_python, pred_ch, acc_threshold):
-    ch_class = pred_ch.astype(int)
-    python_class = pred_python.astype(int)
-    if not np.array_equal(ch_class, python_class):
-        raise Exception('Got different results:\npython:\n' + str(python_class) + '\nClickHouse:\n' + str(ch_class))
-
-    acc = 1 - np.sum(np.abs(ch_class - np.array(target))) / (len(target) + .0)
-    assert acc >= acc_threshold
-    print(test_name, 'accuracy: {:.10f}'.format(acc))
-
-
-def test_apply_float_features_only():
-
-    name = 'test_apply_float_features_only'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_float_column(size, 0., 1., seed + 3)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3) or (row['c'] < .4 and row['a'] * row['b'] > 0.1) else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 4,
-        'depth': 2,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, [], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_float_features_with_string_cat_features():
-
-    name = 'test_apply_float_features_with_string_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_string_column(size, ['a', 'b', 'c'], seed + 3),
-            'd': generate_uniform_string_column(size, ['e', 'f', 'g'], seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3 and row['c'] != 'a') \
-                        or (row['a'] * row['b'] > 0.1 and row['c'] != 'b' and row['d'] != 'e') else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 6,
-        'depth': 2,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_float_features_with_int_cat_features():
-
-    name = 'test_apply_float_features_with_int_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_int_column(size, 1, 4, seed + 3),
-            'd': generate_uniform_int_column(size, 1, 4, seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3 and row['c'] != 1) \
-                        or (row['a'] * row['b'] > 0.1 and row['c'] != 2 and row['d'] != 3) else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 6,
-        'depth': 4,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_float_features_with_mixed_cat_features():
-
-    name = 'test_apply_float_features_with_mixed_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_string_column(size, ['a', 'b', 'c'], seed + 3),
-            'd': generate_uniform_int_column(size, 1, 4, seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            return 1 if (row['a'] > .3 and row['b'] > .3 and row['c'] != 'a') \
-                        or (row['a'] * row['b'] > 0.1 and row['c'] != 'b' and row['d'] != 2) else 0
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 6,
-        'depth': 4,
-        'learning_rate': 1,
-        'loss_function': 'Logloss'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = (np.array(server.apply_model(name, test_df, [])) > 0).astype(int)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
-
-
-def test_apply_multiclass():
-
-    name = 'test_apply_float_features_with_mixed_cat_features'
-
-    train_size = 10000
-    test_size = 10000
-
-    def gen_data(size, seed):
-        data = {
-            'a': generate_uniform_float_column(size, 0., 1., seed + 1),
-            'b': generate_uniform_float_column(size, 0., 1., seed + 2),
-            'c': generate_uniform_string_column(size, ['a', 'b', 'c'], seed + 3),
-            'd': generate_uniform_int_column(size, 1, 4, seed + 4)
-        }
-        return DataFrame.from_dict(data)
-
-    def get_target(df):
-        def target_filter(row):
-            if row['a'] > .3 and row['b'] > .3 and row['c'] != 'a':
-                return 0
-            elif row['a'] * row['b'] > 0.1 and row['c'] != 'b' and row['d'] != 2:
-                return 1
-            else:
-                return 2
-
-        return df.apply(target_filter, axis=1).as_matrix()
-
-    train_df = gen_data(train_size, 42)
-    test_df = gen_data(test_size, 43)
-
-    train_target = get_target(train_df)
-    test_target = get_target(test_df)
-
-    print()
-    print('train target', train_target)
-    print('test target', test_target)
-
-    params = {
-        'iterations': 10,
-        'depth': 4,
-        'learning_rate': 1,
-        'loss_function': 'MultiClass'
-    }
-
-    model = train_catboost_model(train_df, train_target, ['c', 'd'], params)
-    pred_python = model.predict(test_df)[:,0].astype(int)
-
-    server = ClickHouseServerWithCatboostModels(name, CLICKHOUSE_TESTS_SERVER_BIN_PATH, PORT)
-    server.add_model(name, model)
-    with server:
-        pred_ch = np.argmax(np.array(server.apply_model(name, test_df, [])), axis=1)
-
-    print('python predictions', pred_python)
-    print('clickhouse predictions', pred_ch)
-
-    check_predictions(name, test_target, pred_python, pred_ch, 0.9)
diff --git a/tests/fuzz/README.md b/tests/fuzz/README.md
new file mode 100644
index 00000000000..440ae1aac1f
--- /dev/null
+++ b/tests/fuzz/README.md
@@ -0,0 +1,14 @@
+The list of funtions generated via following query
+
+```
+    clickhouse-client -q "select concat('\"', name, '\"') from system.functions union all select concat('\"', alias_to, '\"') from system.functions where alias_to != '' " > functions.dict
+```
+
+The list of datatypes generated via following query:
+
+```
+    clickhouse-client -q "select concat('\"', name, '\"') from system.data_type_families union all select concat('\"', alias_to, '\"') from system.data_type_families where alias_to != '' " > datatypes.dict
+```
+
+
+Then merge all dictionaries into one (all.dict)
diff --git a/tests/fuzz/all.dict b/tests/fuzz/all.dict
new file mode 100644
index 00000000000..bf25f1fa484
--- /dev/null
+++ b/tests/fuzz/all.dict
@@ -0,0 +1,1468 @@
+
+"abs"
+"accurate_Cast"
+"accurateCast"
+"accurate_CastOrNull"
+"accurateCastOrNull"
+"acos"
+"acosh"
+"ADD"
+"ADD COLUMN"
+"ADD CONSTRAINT"
+"addDays"
+"addHours"
+"ADD INDEX"
+"addMinutes"
+"addMonths"
+"addQuarters"
+"addressToLine"
+"addressToSymbol"
+"addSeconds"
+"addWeeks"
+"addYears"
+"aes_decrypt_mysql"
+"aes_encrypt_mysql"
+"AFTER"
+"AggregateFunction"
+"aggThrow"
+"ALIAS"
+"ALL"
+"alphaTokens"
+"ALTER"
+"ALTER LIVE VIEW"
+"ALTER TABLE"
+"and"
+"AND"
+"ANTI"
+"any"
+"ANY"
+"anyHeavy"
+"anyLast"
+"appendTrailingCharIfAbsent"
+"argMax"
+"argMin"
+"array"
+"Array"
+"ARRAY"
+"arrayAll"
+"arrayAUC"
+"arrayAvg"
+"arrayCompact"
+"arrayConcat"
+"arrayCount"
+"arrayCumSum"
+"arrayCumSumNonNegative"
+"arrayDifference"
+"arrayDistinct"
+"arrayElement"
+"arrayEnumerate"
+"arrayEnumerateDense"
+"arrayEnumerateDenseRanked"
+"arrayEnumerateUniq"
+"arrayEnumerateUniqRanked"
+"arrayExists"
+"arrayFill"
+"arrayFilter"
+"arrayFirst"
+"arrayFirstIndex"
+"arrayFlatten"
+"arrayIntersect"
+"arrayJoin"
+"ARRAY JOIN"
+"arrayMap"
+"arrayMax"
+"arrayMin"
+"arrayPopBack"
+"arrayPopFront"
+"arrayProduct"
+"arrayPushBack"
+"arrayPushFront"
+"arrayReduce"
+"arrayReduceInRanges"
+"arrayResize"
+"arrayReverse"
+"arrayReverseFill"
+"arrayReverseSort"
+"arrayReverseSplit"
+"arraySlice"
+"arraySort"
+"arraySplit"
+"arrayStringConcat"
+"arraySum"
+"arrayUniq"
+"arrayWithConstant"
+"arrayZip"
+"AS"
+"ASC"
+"ASCENDING"
+"asin"
+"asinh"
+"ASOF"
+"assumeNotNull"
+"AST"
+"ASYNC"
+"atan"
+"atan2"
+"atanh"
+"ATTACH"
+"ATTACH PART"
+"ATTACH PARTITION"
+"avg"
+"avgWeighted"
+"bar"
+"base64Decode"
+"base64Encode"
+"basename"
+"bayesAB"
+"BETWEEN"
+"BIGINT"
+"BIGINT SIGNED"
+"BIGINT UNSIGNED"
+"bin"
+"BINARY"
+"BINARY LARGE OBJECT"
+"BINARY VARYING"
+"bitAnd"
+"BIT_AND"
+"__bitBoolMaskAnd"
+"__bitBoolMaskOr"
+"bitCount"
+"bitHammingDistance"
+"bitmapAnd"
+"bitmapAndCardinality"
+"bitmapAndnot"
+"bitmapAndnotCardinality"
+"bitmapBuild"
+"bitmapCardinality"
+"bitmapContains"
+"bitmapHasAll"
+"bitmapHasAny"
+"bitmapMax"
+"bitmapMin"
+"bitmapOr"
+"bitmapOrCardinality"
+"bitmapSubsetInRange"
+"bitmapSubsetLimit"
+"bitmapToArray"
+"bitmapTransform"
+"bitmapXor"
+"bitmapXorCardinality"
+"bitmaskToArray"
+"bitmaskToList"
+"bitNot"
+"bitOr"
+"BIT_OR"
+"bitPositionsToArray"
+"bitRotateLeft"
+"bitRotateRight"
+"bitShiftLeft"
+"bitShiftRight"
+"__bitSwapLastTwo"
+"bitTest"
+"bitTestAll"
+"bitTestAny"
+"__bitWrapperFunc"
+"bitXor"
+"BIT_XOR"
+"BLOB"
+"blockNumber"
+"blockSerializedSize"
+"blockSize"
+"BOOL"
+"BOOLEAN"
+"BOTH"
+"boundingRatio"
+"buildId"
+"BY"
+"BYTE"
+"BYTEA"
+"byteSize"
+"CASE"
+"caseWithExpr"
+"caseWithExpression"
+"caseWithoutExpr"
+"caseWithoutExpression"
+"_CAST"
+"CAST"
+"categoricalInformationValue"
+"cbrt"
+"ceil"
+"ceiling"
+"char"
+"CHAR"
+"CHARACTER"
+"CHARACTER LARGE OBJECT"
+"CHARACTER_LENGTH"
+"CHARACTER VARYING"
+"CHAR LARGE OBJECT"
+"CHAR_LENGTH"
+"CHAR VARYING"
+"CHECK"
+"CHECK TABLE"
+"cityHash64"
+"CLEAR"
+"CLEAR COLUMN"
+"CLEAR INDEX"
+"CLOB"
+"CLUSTER"
+"coalesce"
+"CODEC"
+"COLLATE"
+"COLUMN"
+"COLUMNS"
+"COMMENT"
+"COMMENT COLUMN"
+"concat"
+"concatAssumeInjective"
+"connection_id"
+"connectionid"
+"connectionId"
+"CONSTRAINT"
+"convertCharset"
+"corr"
+"corrStable"
+"cos"
+"cosh"
+"count"
+"countDigits"
+"countEqual"
+"countMatches"
+"countMatchesCaseInsensitive"
+"countSubstrings"
+"countSubstringsCaseInsensitive"
+"countSubstringsCaseInsensitiveUTF8"
+"covarPop"
+"COVAR_POP"
+"covarPopStable"
+"covarSamp"
+"COVAR_SAMP"
+"covarSampStable"
+"CRC32"
+"CRC32IEEE"
+"CRC64"
+"CREATE"
+"CROSS"
+"CUBE"
+"currentDatabase"
+"currentProfiles"
+"currentRoles"
+"currentUser"
+"cutFragment"
+"cutIPv6"
+"cutQueryString"
+"cutQueryStringAndFragment"
+"cutToFirstSignificantSubdomain"
+"cutToFirstSignificantSubdomainCustom"
+"cutToFirstSignificantSubdomainCustomWithWWW"
+"cutToFirstSignificantSubdomainWithWWW"
+"cutURLParameter"
+"cutWWW"
+"D"
+"DATABASE"
+"DATABASES"
+"Date"
+"DATE"
+"Date32"
+"DATE_ADD"
+"DATEADD"
+"dateDiff"
+"DATE_DIFF"
+"DATEDIFF"
+"dateName"
+"DATE_SUB"
+"DATESUB"
+"DateTime"
+"DateTime32"
+"DateTime64"
+"dateTime64ToSnowflake"
+"dateTimeToSnowflake"
+"date_trunc"
+"dateTrunc"
+"DAY"
+"DAYOFMONTH"
+"DAYOFWEEK"
+"DAYOFYEAR"
+"DD"
+"DEC"
+"Decimal"
+"Decimal128"
+"Decimal256"
+"Decimal32"
+"Decimal64"
+"decodeURLComponent"
+"decodeXMLComponent"
+"decrypt"
+"DEDUPLICATE"
+"DEFAULT"
+"defaultProfiles"
+"defaultRoles"
+"defaultValueOfArgumentType"
+"defaultValueOfTypeName"
+"DELAY"
+"DELETE"
+"DELETE WHERE"
+"deltaSum"
+"deltaSumTimestamp"
+"demangle"
+"dense_rank"
+"DESC"
+"DESCENDING"
+"DESCRIBE"
+"DETACH"
+"DETACH PARTITION"
+"dictGet"
+"dictGetChildren"
+"dictGetDate"
+"dictGetDateOrDefault"
+"dictGetDateTime"
+"dictGetDateTimeOrDefault"
+"dictGetDescendants"
+"dictGetFloat32"
+"dictGetFloat32OrDefault"
+"dictGetFloat64"
+"dictGetFloat64OrDefault"
+"dictGetHierarchy"
+"dictGetInt16"
+"dictGetInt16OrDefault"
+"dictGetInt32"
+"dictGetInt32OrDefault"
+"dictGetInt64"
+"dictGetInt64OrDefault"
+"dictGetInt8"
+"dictGetInt8OrDefault"
+"dictGetOrDefault"
+"dictGetOrNull"
+"dictGetString"
+"dictGetStringOrDefault"
+"dictGetUInt16"
+"dictGetUInt16OrDefault"
+"dictGetUInt32"
+"dictGetUInt32OrDefault"
+"dictGetUInt64"
+"dictGetUInt64OrDefault"
+"dictGetUInt8"
+"dictGetUInt8OrDefault"
+"dictGetUUID"
+"dictGetUUIDOrDefault"
+"dictHas"
+"DICTIONARIES"
+"DICTIONARY"
+"dictIsIn"
+"DISK"
+"DISTINCT"
+"DISTRIBUTED"
+"divide"
+"domain"
+"domainWithoutWWW"
+"DOUBLE"
+"DOUBLE PRECISION"
+"DROP"
+"DROP COLUMN"
+"DROP CONSTRAINT"
+"DROP DETACHED PART"
+"DROP DETACHED PARTITION"
+"DROP INDEX"
+"DROP PARTITION"
+"dumpColumnStructure"
+"e"
+"ELSE"
+"empty"
+"emptyArrayDate"
+"emptyArrayDateTime"
+"emptyArrayFloat32"
+"emptyArrayFloat64"
+"emptyArrayInt16"
+"emptyArrayInt32"
+"emptyArrayInt64"
+"emptyArrayInt8"
+"emptyArrayString"
+"emptyArrayToSingle"
+"emptyArrayUInt16"
+"emptyArrayUInt32"
+"emptyArrayUInt64"
+"emptyArrayUInt8"
+"enabledProfiles"
+"enabledRoles"
+"encodeXMLComponent"
+"encrypt"
+"END"
+"endsWith"
+"ENGINE"
+"entropy"
+"Enum"
+"ENUM"
+"Enum16"
+"Enum8"
+"equals"
+"erf"
+"erfc"
+"errorCodeToName"
+"evalMLMethod"
+"EVENTS"
+"EXCHANGE TABLES"
+"EXISTS"
+"exp"
+"exp10"
+"exp2"
+"EXPLAIN"
+"exponentialMovingAverage"
+"EXPRESSION"
+"extract"
+"EXTRACT"
+"extractAll"
+"extractAllGroups"
+"extractAllGroupsHorizontal"
+"extractAllGroupsVertical"
+"extractGroups"
+"extractTextFromHTML"
+"extractURLParameter"
+"extractURLParameterNames"
+"extractURLParameters"
+"farmFingerprint64"
+"farmHash64"
+"FETCHES"
+"FETCH PART"
+"FETCH PARTITION"
+"file"
+"filesystemAvailable"
+"filesystemCapacity"
+"filesystemFree"
+"FINAL"
+"finalizeAggregation"
+"FIRST"
+"firstSignificantSubdomain"
+"firstSignificantSubdomainCustom"
+"first_value"
+"FIXED"
+"FixedString"
+"flatten"
+"FLOAT"
+"Float32"
+"Float64"
+"floor"
+"FLUSH"
+"FOR"
+"ForEach"
+"format"
+"FORMAT"
+"formatDateTime"
+"formatReadableQuantity"
+"formatReadableSize"
+"formatReadableTimeDelta"
+"formatRow"
+"formatRowNoNewline"
+"FQDN"
+"fragment"
+"FREEZE"
+"FROM"
+"FROM_BASE64"
+"fromModifiedJulianDay"
+"fromModifiedJulianDayOrNull"
+"FROM_UNIXTIME"
+"fromUnixTimestamp"
+"fromUnixTimestamp64Micro"
+"fromUnixTimestamp64Milli"
+"fromUnixTimestamp64Nano"
+"FULL"
+"fullHostName"
+"FUNCTION"
+"fuzzBits"
+"gccMurmurHash"
+"gcd"
+"generateUUIDv4"
+"geoDistance"
+"geohashDecode"
+"geohashEncode"
+"geohashesInBox"
+"geoToH3"
+"geoToS2"
+"getMacro"
+"__getScalar"
+"getServerPort"
+"getSetting"
+"getSizeOfEnumType"
+"GLOBAL"
+"globalIn"
+"globalInIgnoreSet"
+"globalNotIn"
+"globalNotInIgnoreSet"
+"globalNotNullIn"
+"globalNotNullInIgnoreSet"
+"globalNullIn"
+"globalNullInIgnoreSet"
+"globalVariable"
+"GRANULARITY"
+"greatCircleAngle"
+"greatCircleDistance"
+"greater"
+"greaterOrEquals"
+"greatest"
+"GROUP"
+"groupArray"
+"groupArrayInsertAt"
+"groupArrayMovingAvg"
+"groupArrayMovingSum"
+"groupArraySample"
+"groupBitAnd"
+"groupBitmap"
+"groupBitmapAnd"
+"groupBitmapOr"
+"groupBitmapXor"
+"groupBitOr"
+"groupBitXor"
+"GROUP BY"
+"groupUniqArray"
+"h3EdgeAngle"
+"h3EdgeLengthM"
+"h3GetBaseCell"
+"h3GetFaces"
+"h3GetResolution"
+"h3HexAreaM2"
+"h3IndexesAreNeighbors"
+"h3IsPentagon"
+"h3IsResClassIII"
+"h3IsValid"
+"h3kRing"
+"h3ToChildren"
+"h3ToGeo"
+"h3ToGeoBoundary"
+"h3ToParent"
+"h3ToString"
+"halfMD5"
+"has"
+"hasAll"
+"hasAny"
+"hasColumnInTable"
+"hasSubstr"
+"hasThreadFuzzer"
+"hasToken"
+"hasTokenCaseInsensitive"
+"HAVING"
+"hex"
+"HH"
+"HIERARCHICAL"
+"histogram"
+"hiveHash"
+"hostname"
+"hostName"
+"HOUR"
+"hypot"
+"ID"
+"identity"
+"if"
+"IF"
+"IF EXISTS"
+"IF NOT EXISTS"
+"ifNotFinite"
+"ifNull"
+"ignore"
+"ilike"
+"ILIKE"
+"in"
+"IN"
+"INDEX"
+"indexHint"
+"indexOf"
+"INET4"
+"INET6"
+"INET6_ATON"
+"INET6_NTOA"
+"INET_ATON"
+"INET_NTOA"
+"INF"
+"inIgnoreSet"
+"initializeAggregation"
+"initial_query_id"
+"initialQueryID"
+"INJECTIVE"
+"INNER"
+"IN PARTITION"
+"INSERT"
+"INSERT INTO"
+"INT"
+"INT1"
+"Int128"
+"Int16"
+"INT1 SIGNED"
+"INT1 UNSIGNED"
+"Int256"
+"Int32"
+"Int64"
+"Int8"
+"intDiv"
+"intDivOrZero"
+"INTEGER"
+"INTEGER SIGNED"
+"INTEGER UNSIGNED"
+"INTERVAL"
+"IntervalDay"
+"IntervalHour"
+"intervalLengthSum"
+"IntervalMinute"
+"IntervalMonth"
+"IntervalQuarter"
+"IntervalSecond"
+"IntervalWeek"
+"IntervalYear"
+"intExp10"
+"intExp2"
+"intHash32"
+"intHash64"
+"INTO"
+"INTO OUTFILE"
+"INT SIGNED"
+"INT UNSIGNED"
+"IPv4"
+"IPv4CIDRToRange"
+"IPv4NumToString"
+"IPv4NumToStringClassC"
+"IPv4StringToNum"
+"IPv4ToIPv6"
+"IPv6"
+"IPv6CIDRToRange"
+"IPv6NumToString"
+"IPv6StringToNum"
+"IS"
+"isConstant"
+"isDecimalOverflow"
+"isFinite"
+"isInfinite"
+"isIPAddressInRange"
+"isIPv4String"
+"isIPv6String"
+"isNaN"
+"isNotNull"
+"isNull"
+"IS_OBJECT_ID"
+"isValidJSON"
+"isValidUTF8"
+"isZeroOrNull"
+"javaHash"
+"javaHashUTF16LE"
+"JOIN"
+"joinGet"
+"joinGetOrNull"
+"JSON_EXISTS"
+"JSONExtract"
+"JSONExtractArrayRaw"
+"JSONExtractBool"
+"JSONExtractFloat"
+"JSONExtractInt"
+"JSONExtractKeysAndValues"
+"JSONExtractKeysAndValuesRaw"
+"JSONExtractKeys"
+"JSONExtractRaw"
+"JSONExtractString"
+"JSONExtractUInt"
+"JSONHas"
+"JSONKey"
+"JSONLength"
+"JSON_QUERY"
+"JSONType"
+"JSON_VALUE"
+"jumpConsistentHash"
+"KEY"
+# Key words (based on keywords from antlr parser)
+"KILL"
+"kurtPop"
+"kurtSamp"
+"lagInFrame"
+"LAST"
+"last_value"
+"LAYOUT"
+"lcase"
+"lcm"
+"leadInFrame"
+"LEADING"
+"least"
+"LEFT"
+"LEFT ARRAY JOIN"
+"leftPad"
+"leftPadUTF8"
+"lemmatize"
+"length"
+"lengthUTF8"
+"less"
+"lessOrEquals"
+"lgamma"
+"LIFETIME"
+"like"
+"LIKE"
+"LIMIT"
+"LIVE"
+"ln"
+"LOCAL"
+"locate"
+"log"
+"log10"
+"log1p"
+"log2"
+"LOGS"
+"logTrace"
+"LONGBLOB"
+"LONGTEXT"
+"LowCardinality"
+"lowCardinalityIndices"
+"lowCardinalityKeys"
+"lower"
+"lowerUTF8"
+"lpad"
+"LTRIM"
+"M"
+"MACNumToString"
+"MACStringToNum"
+"MACStringToOUI"
+"mannWhitneyUTest"
+"map"
+"Map"
+"mapAdd"
+"mapContains"
+"mapKeys"
+"mapPopulateSeries"
+"mapSubtract"
+"mapValues"
+"match"
+"materialize"
+"MATERIALIZE"
+"MATERIALIZED"
+"MATERIALIZE INDEX"
+"MATERIALIZE TTL"
+"max"
+"MAX"
+"maxIntersections"
+"maxIntersectionsPosition"
+"maxMap"
+"MD4"
+"MD5"
+"median"
+"medianBFloat16"
+"medianBFloat16Weighted"
+"medianDeterministic"
+"medianExact"
+"medianExactHigh"
+"medianExactLow"
+"medianExactWeighted"
+"medianTDigest"
+"medianTDigestWeighted"
+"medianTiming"
+"medianTimingWeighted"
+"MEDIUMBLOB"
+"MEDIUMINT"
+"MEDIUMINT SIGNED"
+"MEDIUMINT UNSIGNED"
+"MEDIUMTEXT"
+"Merge"
+"MERGES"
+"metroHash64"
+"MI"
+"mid"
+"min"
+"MIN"
+"minMap"
+"minus"
+"MINUTE"
+"MM"
+"mod"
+"modelEvaluate"
+"MODIFY"
+"MODIFY COLUMN"
+"MODIFY ORDER BY"
+"MODIFY QUERY"
+"MODIFY SETTING"
+"MODIFY TTL"
+"modulo"
+"moduloLegacy"
+"moduloOrZero"
+"MONTH"
+"MOVE"
+"MOVE PART"
+"MOVE PARTITION"
+"movingXXX"
+"multiFuzzyMatchAllIndices"
+"multiFuzzyMatchAny"
+"multiFuzzyMatchAnyIndex"
+"multiIf"
+"multiMatchAllIndices"
+"multiMatchAny"
+"multiMatchAnyIndex"
+"multiply"
+"MultiPolygon"
+"multiSearchAllPositions"
+"multiSearchAllPositionsCaseInsensitive"
+"multiSearchAllPositionsCaseInsensitiveUTF8"
+"multiSearchAllPositionsUTF8"
+"multiSearchAny"
+"multiSearchAnyCaseInsensitive"
+"multiSearchAnyCaseInsensitiveUTF8"
+"multiSearchAnyUTF8"
+"multiSearchFirstIndex"
+"multiSearchFirstIndexCaseInsensitive"
+"multiSearchFirstIndexCaseInsensitiveUTF8"
+"multiSearchFirstIndexUTF8"
+"multiSearchFirstPosition"
+"multiSearchFirstPositionCaseInsensitive"
+"multiSearchFirstPositionCaseInsensitiveUTF8"
+"multiSearchFirstPositionUTF8"
+"murmurHash2_32"
+"murmurHash2_64"
+"murmurHash3_128"
+"murmurHash3_32"
+"murmurHash3_64"
+"MUTATION"
+"N"
+"NAME"
+"NAN_SQL"
+"NATIONAL CHAR"
+"NATIONAL CHARACTER"
+"NATIONAL CHARACTER LARGE OBJECT"
+"NATIONAL CHARACTER VARYING"
+"NATIONAL CHAR VARYING"
+"NCHAR"
+"NCHAR LARGE OBJECT"
+"NCHAR VARYING"
+"negate"
+"neighbor"
+"Nested"
+"netloc"
+"ngramDistance"
+"ngramDistanceCaseInsensitive"
+"ngramDistanceCaseInsensitiveUTF8"
+"ngramDistanceUTF8"
+"ngramMinHash"
+"ngramMinHashArg"
+"ngramMinHashArgCaseInsensitive"
+"ngramMinHashArgCaseInsensitiveUTF8"
+"ngramMinHashArgUTF8"
+"ngramMinHashCaseInsensitive"
+"ngramMinHashCaseInsensitiveUTF8"
+"ngramMinHashUTF8"
+"ngramSearch"
+"ngramSearchCaseInsensitive"
+"ngramSearchCaseInsensitiveUTF8"
+"ngramSearchUTF8"
+"ngramSimHash"
+"ngramSimHashCaseInsensitive"
+"ngramSimHashCaseInsensitiveUTF8"
+"ngramSimHashUTF8"
+"NO"
+"NO DELAY"
+"NONE"
+"normalizedQueryHash"
+"normalizedQueryHashKeepNames"
+"normalizeQuery"
+"normalizeQueryKeepNames"
+"not"
+"NOT"
+"notEmpty"
+"notEquals"
+"nothing"
+"Nothing"
+"notILike"
+"notIn"
+"notInIgnoreSet"
+"notLike"
+"notNullIn"
+"notNullInIgnoreSet"
+"now"
+"now64"
+"Null"
+"Nullable"
+"nullIf"
+"nullIn"
+"nullInIgnoreSet"
+"NULLS"
+"NULL_SQL"
+"NUMERIC"
+"NVARCHAR"
+"OFFSET"
+"ON"
+"ONLY"
+"OPTIMIZE"
+"OPTIMIZE TABLE"
+"or"
+"OR"
+"ORDER"
+"ORDER BY"
+"OR REPLACE"
+"OUTER"
+"OUTFILE"
+"parseDateTime32BestEffort"
+"parseDateTime32BestEffortOrNull"
+"parseDateTime32BestEffortOrZero"
+"parseDateTime64BestEffort"
+"parseDateTime64BestEffortOrNull"
+"parseDateTime64BestEffortOrZero"
+"parseDateTimeBestEffort"
+"parseDateTimeBestEffortOrNull"
+"parseDateTimeBestEffortOrZero"
+"parseDateTimeBestEffortUS"
+"parseDateTimeBestEffortUSOrNull"
+"parseDateTimeBestEffortUSOrZero"
+"PARTITION"
+"PARTITION BY"
+"partitionId"
+"path"
+"pathFull"
+"pi"
+"plus"
+"Point"
+"pointInEllipses"
+"pointInPolygon"
+"Polygon"
+"polygonAreaCartesian"
+"polygonAreaSpherical"
+"polygonConvexHullCartesian"
+"polygonPerimeterCartesian"
+"polygonPerimeterSpherical"
+"polygonsDistanceCartesian"
+"polygonsDistanceSpherical"
+"polygonsEqualsCartesian"
+"polygonsIntersectionCartesian"
+"polygonsIntersectionSpherical"
+"polygonsSymDifferenceCartesian"
+"polygonsSymDifferenceSpherical"
+"polygonsUnionCartesian"
+"polygonsUnionSpherical"
+"polygonsWithinCartesian"
+"polygonsWithinSpherical"
+"POPULATE"
+"port"
+"position"
+"positionCaseInsensitive"
+"positionCaseInsensitiveUTF8"
+"positionUTF8"
+"pow"
+"power"
+"PREWHERE"
+"PRIMARY"
+"PRIMARY KEY"
+"PROJECTION"
+"protocol"
+"Q"
+"QQ"
+"quantile"
+"quantileBFloat16"
+"quantileBFloat16Weighted"
+"quantileDeterministic"
+"quantileExact"
+"quantileExactExclusive"
+"quantileExactHigh"
+"quantileExactInclusive"
+"quantileExactLow"
+"quantileExactWeighted"
+"quantiles"
+"quantilesBFloat16"
+"quantilesBFloat16Weighted"
+"quantilesDeterministic"
+"quantilesExact"
+"quantilesExactExclusive"
+"quantilesExactHigh"
+"quantilesExactInclusive"
+"quantilesExactLow"
+"quantilesExactWeighted"
+"quantilesTDigest"
+"quantilesTDigestWeighted"
+"quantilesTiming"
+"quantilesTimingWeighted"
+"quantileTDigest"
+"quantileTDigestWeighted"
+"quantileTiming"
+"quantileTimingWeighted"
+"QUARTER"
+"query_id"
+"queryID"
+"queryString"
+"queryStringAndFragment"
+"rand"
+"rand32"
+"rand64"
+"randConstant"
+"randomFixedString"
+"randomPrintableASCII"
+"randomString"
+"randomStringUTF8"
+"range"
+"RANGE"
+"rank"
+"rankCorr"
+"readWKTMultiPolygon"
+"readWKTPoint"
+"readWKTPolygon"
+"readWKTRing"
+"REAL"
+"REFRESH"
+"regexpQuoteMeta"
+"regionHierarchy"
+"regionIn"
+"regionToArea"
+"regionToCity"
+"regionToContinent"
+"regionToCountry"
+"regionToDistrict"
+"regionToName"
+"regionToPopulation"
+"regionToTopContinent"
+"reinterpret"
+"reinterpretAsDate"
+"reinterpretAsDateTime"
+"reinterpretAsFixedString"
+"reinterpretAsFloat32"
+"reinterpretAsFloat64"
+"reinterpretAsInt128"
+"reinterpretAsInt16"
+"reinterpretAsInt256"
+"reinterpretAsInt32"
+"reinterpretAsInt64"
+"reinterpretAsInt8"
+"reinterpretAsString"
+"reinterpretAsUInt128"
+"reinterpretAsUInt16"
+"reinterpretAsUInt256"
+"reinterpretAsUInt32"
+"reinterpretAsUInt64"
+"reinterpretAsUInt8"
+"reinterpretAsUUID"
+"RELOAD"
+"REMOVE"
+"RENAME"
+"RENAME COLUMN"
+"RENAME TABLE"
+"repeat"
+"replace"
+"REPLACE"
+"replaceAll"
+"replaceOne"
+"REPLACE PARTITION"
+"replaceRegexpAll"
+"replaceRegexpOne"
+"REPLICA"
+"replicate"
+"REPLICATED"
+"Resample"
+"RESUME"
+"retention"
+"reverse"
+"reverseUTF8"
+"RIGHT"
+"rightPad"
+"rightPadUTF8"
+"Ring"
+"ROLLUP"
+"round"
+"roundAge"
+"roundBankers"
+"roundDown"
+"roundDuration"
+"roundToExp2"
+"row_number"
+"rowNumberInAllBlocks"
+"rowNumberInBlock"
+"rpad"
+"RTRIM"
+"runningAccumulate"
+"runningConcurrency"
+"runningDifference"
+"runningDifferenceStartingWithFirstValue"
+"S"
+"s2CapContains"
+"s2CapUnion"
+"s2CellsIntersect"
+"s2GetNeighbors"
+"s2RectAdd"
+"s2RectContains"
+"s2RectIntersection"
+"s2RectUnion"
+"s2ToGeo"
+"SAMPLE"
+"SAMPLE BY"
+"SECOND"
+"SELECT"
+"SEMI"
+"SENDS"
+"sequenceCount"
+"sequenceMatch"
+"sequenceNextNode"
+"serverUUID"
+"SET"
+"SETTINGS"
+"SHA1"
+"SHA224"
+"SHA256"
+"SHA384"
+"SHA512"
+"shardCount"
+"shardNum"
+"SHOW"
+"SHOW PROCESSLIST"
+"sigmoid"
+"sign"
+"SimpleAggregateFunction"
+"simpleJSONExtractBool"
+"simpleJSONExtractFloat"
+"simpleJSONExtractInt"
+"simpleJSONExtractRaw"
+"simpleJSONExtractString"
+"simpleJSONExtractUInt"
+"simpleJSONHas"
+"simpleLinearRegression"
+"sin"
+"SINGLE"
+"singleValueOrNull"
+"sinh"
+"sipHash128"
+"sipHash64"
+"skewPop"
+"skewSamp"
+"sleep"
+"sleepEachRow"
+"SMALLINT"
+"SMALLINT SIGNED"
+"SMALLINT UNSIGNED"
+"snowflakeToDateTime"
+"snowflakeToDateTime64"
+"SOURCE"
+"sparkbar"
+"splitByChar"
+"splitByNonAlpha"
+"splitByRegexp"
+"splitByString"
+"splitByWhitespace"
+"SQL_TSI_DAY"
+"SQL_TSI_HOUR"
+"SQL_TSI_MINUTE"
+"SQL_TSI_MONTH"
+"SQL_TSI_QUARTER"
+"SQL_TSI_SECOND"
+"SQL_TSI_WEEK"
+"SQL_TSI_YEAR"
+"sqrt"
+"SS"
+"START"
+"startsWith"
+"State"
+"stddevPop"
+"STDDEV_POP"
+"stddevPopStable"
+"stddevSamp"
+"STDDEV_SAMP"
+"stddevSampStable"
+"stem"
+"STEP"
+"stochasticLinearRegression"
+"stochasticLogisticRegression"
+"STOP"
+"String"
+"stringToH3"
+"studentTTest"
+"subBitmap"
+"substr"
+"substring"
+"SUBSTRING"
+"substringUTF8"
+"subtractDays"
+"subtractHours"
+"subtractMinutes"
+"subtractMonths"
+"subtractQuarters"
+"subtractSeconds"
+"subtractWeeks"
+"subtractYears"
+"sum"
+"sumCount"
+"sumKahan"
+"sumMap"
+"sumMapFiltered"
+"sumMapFilteredWithOverflow"
+"sumMapWithOverflow"
+"sumWithOverflow"
+"SUSPEND"
+"svg"
+"SVG"
+"SYNC"
+"synonyms"
+"SYNTAX"
+"SYSTEM"
+"TABLE"
+"TABLES"
+"tan"
+"tanh"
+"tcpPort"
+"TEMPORARY"
+"TEST"
+"TEXT"
+"tgamma"
+"THEN"
+"throwIf"
+"tid"
+"TIES"
+"TIMEOUT"
+"timeSlot"
+"timeSlots"
+"TIMESTAMP"
+"TIMESTAMP_ADD"
+"TIMESTAMPADD"
+"TIMESTAMP_DIFF"
+"TIMESTAMPDIFF"
+"TIMESTAMP_SUB"
+"TIMESTAMPSUB"
+"timezone"
+"timeZone"
+"timezoneOf"
+"timeZoneOf"
+"timezoneOffset"
+"timeZoneOffset"
+"TINYBLOB"
+"TINYINT"
+"TINYINT SIGNED"
+"TINYINT UNSIGNED"
+"TINYTEXT"
+"TO"
+"TO_BASE64"
+"toColumnTypeName"
+"toDate"
+"toDate32"
+"toDate32OrNull"
+"toDate32OrZero"
+"toDateOrNull"
+"toDateOrZero"
+"toDateTime"
+"toDateTime32"
+"toDateTime64"
+"toDateTime64OrNull"
+"toDateTime64OrZero"
+"toDateTimeOrNull"
+"toDateTimeOrZero"
+"today"
+"toDayOfMonth"
+"toDayOfWeek"
+"toDayOfYear"
+"toDecimal128"
+"toDecimal128OrNull"
+"toDecimal128OrZero"
+"toDecimal256"
+"toDecimal256OrNull"
+"toDecimal256OrZero"
+"toDecimal32"
+"toDecimal32OrNull"
+"toDecimal32OrZero"
+"toDecimal64"
+"toDecimal64OrNull"
+"toDecimal64OrZero"
+"TO DISK"
+"toFixedString"
+"toFloat32"
+"toFloat32OrNull"
+"toFloat32OrZero"
+"toFloat64"
+"toFloat64OrNull"
+"toFloat64OrZero"
+"toHour"
+"toInt128"
+"toInt128OrNull"
+"toInt128OrZero"
+"toInt16"
+"toInt16OrNull"
+"toInt16OrZero"
+"toInt256"
+"toInt256OrNull"
+"toInt256OrZero"
+"toInt32"
+"toInt32OrNull"
+"toInt32OrZero"
+"toInt64"
+"toInt64OrNull"
+"toInt64OrZero"
+"toInt8"
+"toInt8OrNull"
+"toInt8OrZero"
+"toIntervalDay"
+"toIntervalHour"
+"toIntervalMinute"
+"toIntervalMonth"
+"toIntervalQuarter"
+"toIntervalSecond"
+"toIntervalWeek"
+"toIntervalYear"
+"toIPv4"
+"toIPv6"
+"toISOWeek"
+"toISOYear"
+"toJSONString"
+"toLowCardinality"
+"toMinute"
+"toModifiedJulianDay"
+"toModifiedJulianDayOrNull"
+"toMonday"
+"toMonth"
+"toNullable"
+"TOP"
+"topK"
+"topKWeighted"
+"topLevelDomain"
+"toQuarter"
+"toRelativeDayNum"
+"toRelativeHourNum"
+"toRelativeMinuteNum"
+"toRelativeMonthNum"
+"toRelativeQuarterNum"
+"toRelativeSecondNum"
+"toRelativeWeekNum"
+"toRelativeYearNum"
+"toSecond"
+"toStartOfDay"
+"toStartOfFifteenMinutes"
+"toStartOfFiveMinute"
+"toStartOfHour"
+"toStartOfInterval"
+"toStartOfISOYear"
+"toStartOfMinute"
+"toStartOfMonth"
+"toStartOfQuarter"
+"toStartOfSecond"
+"toStartOfTenMinutes"
+"toStartOfWeek"
+"toStartOfYear"
+"toString"
+"toStringCutToZero"
+"TO TABLE"
+"TOTALS"
+"toTime"
+"toTimezone"
+"toTimeZone"
+"toTypeName"
+"toUInt128"
+"toUInt128OrNull"
+"toUInt128OrZero"
+"toUInt16"
+"toUInt16OrNull"
+"toUInt16OrZero"
+"toUInt256"
+"toUInt256OrNull"
+"toUInt256OrZero"
+"toUInt32"
+"toUInt32OrNull"
+"toUInt32OrZero"
+"toUInt64"
+"toUInt64OrNull"
+"toUInt64OrZero"
+"toUInt8"
+"toUInt8OrNull"
+"toUInt8OrZero"
+"toUnixTimestamp"
+"toUnixTimestamp64Micro"
+"toUnixTimestamp64Milli"
+"toUnixTimestamp64Nano"
+"toUUID"
+"toUUIDOrNull"
+"toUUIDOrZero"
+"toValidUTF8"
+"TO VOLUME"
+"toWeek"
+"toYear"
+"toYearWeek"
+"toYYYYMM"
+"toYYYYMMDD"
+"toYYYYMMDDhhmmss"
+"TRAILING"
+"transform"
+"TRIM"
+"trimBoth"
+"trimLeft"
+"trimRight"
+"trunc"
+"truncate"
+"TRUNCATE"
+"tryBase64Decode"
+"TTL"
+"tuple"
+"Tuple"
+"tupleElement"
+"tupleHammingDistance"
+"tupleToNameValuePairs"
+"TYPE"
+"ucase"
+"UInt128"
+"UInt16"
+"UInt256"
+"UInt32"
+"UInt64"
+"UInt8"
+"unbin"
+"unhex"
+"UNION"
+"uniq"
+"uniqCombined"
+"uniqCombined64"
+"uniqExact"
+"uniqHLL12"
+"uniqTheta"
+"uniqUpTo"
+"UPDATE"
+"upper"
+"upperUTF8"
+"uptime"
+"URLHash"
+"URLHierarchy"
+"URLPathHierarchy"
+"USE"
+"user"
+"USING"
+"UUID"
+"UUIDNumToString"
+"UUIDStringToNum"
+"validateNestedArraySizes"
+"VALUES"
+"VARCHAR"
+"VARCHAR2"
+"varPop"
+"VAR_POP"
+"varPopStable"
+"varSamp"
+"VAR_SAMP"
+"varSampStable"
+"version"
+"VIEW"
+"visibleWidth"
+"visitParamExtractBool"
+"visitParamExtractFloat"
+"visitParamExtractInt"
+"visitParamExtractRaw"
+"visitParamExtractString"
+"visitParamExtractUInt"
+"visitParamHas"
+"VOLUME"
+"WATCH"
+"week"
+"WEEK"
+"welchTTest"
+"WHEN"
+"WHERE"
+"windowFunnel"
+"WITH"
+"WITH FILL"
+"WITH TIES"
+"WK"
+"wkt"
+"wordShingleMinHash"
+"wordShingleMinHashArg"
+"wordShingleMinHashArgCaseInsensitive"
+"wordShingleMinHashArgCaseInsensitiveUTF8"
+"wordShingleMinHashArgUTF8"
+"wordShingleMinHashCaseInsensitive"
+"wordShingleMinHashCaseInsensitiveUTF8"
+"wordShingleMinHashUTF8"
+"wordShingleSimHash"
+"wordShingleSimHashCaseInsensitive"
+"wordShingleSimHashCaseInsensitiveUTF8"
+"wordShingleSimHashUTF8"
+"WW"
+"xor"
+"xxHash32"
+"xxHash64"
+"yandexConsistentHash"
+"YEAR"
+"yearweek"
+"yesterday"
+"YY"
+"YYYY"
+"zookeeperSessionUptime"
diff --git a/tests/fuzz/create_parser_fuzzer.options b/tests/fuzz/create_parser_fuzzer.options
index fda41ea5398..cbe915d10fc 100644
--- a/tests/fuzz/create_parser_fuzzer.options
+++ b/tests/fuzz/create_parser_fuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
-dict = ast.dict
+dict = all.dict
+jobs = 8
diff --git a/tests/fuzz/datatypes.dict b/tests/fuzz/datatypes.dict
deleted file mode 100644
index 65141dfaf08..00000000000
--- a/tests/fuzz/datatypes.dict
+++ /dev/null
@@ -1,38 +0,0 @@
-"Nothing"
-"UUID"
-"Enum8"
-"Enum16"
-"Enum"
-"Date"
-"IntervalSecond"
-"IntervalMinute"
-"IntervalHour"
-"IntervalDay"
-"IntervalWeek"
-"IntervalMonth"
-"IntervalQuarter"
-"IntervalYear"
-"AggregateFunction"
-"FixedString"
-"LowCardinality"
-"DateTime"
-"Nullable"
-"String"
-"UInt8"
-"UInt16"
-"UInt32"
-"UInt64"
-"Int8"
-"Int16"
-"Int32"
-"Int64"
-"Float32"
-"Float64"
-"DateTime64"
-"Decimal32"
-"Decimal64"
-"Decimal128"
-"Decimal"
-"Tuple"
-"Nested"
-"Array"
diff --git a/tests/fuzz/dictionaries/datatypes.dict b/tests/fuzz/dictionaries/datatypes.dict
new file mode 100644
index 00000000000..e4983ae5f68
--- /dev/null
+++ b/tests/fuzz/dictionaries/datatypes.dict
@@ -0,0 +1,185 @@
+"Polygon"
+"Ring"
+"Point"
+"SimpleAggregateFunction"
+"MultiPolygon"
+"IPv6"
+"IntervalSecond"
+"IPv4"
+"UInt32"
+"IntervalYear"
+"IntervalQuarter"
+"IntervalMonth"
+"Int64"
+"IntervalDay"
+"IntervalHour"
+"Int16"
+"UInt256"
+"LowCardinality"
+"AggregateFunction"
+"Nothing"
+"Decimal256"
+"Tuple"
+"Array"
+"Enum16"
+"IntervalMinute"
+"FixedString"
+"String"
+"DateTime"
+"Map"
+"UUID"
+"Decimal64"
+"Nullable"
+"Enum"
+"Int32"
+"UInt8"
+"Date"
+"Decimal32"
+"UInt128"
+"Float64"
+"Nested"
+"Int128"
+"Decimal128"
+"Int8"
+"Decimal"
+"Int256"
+"DateTime64"
+"Enum8"
+"DateTime32"
+"Date32"
+"IntervalWeek"
+"UInt64"
+"UInt16"
+"Float32"
+"INET6"
+"INET4"
+"ENUM"
+"BINARY"
+"NATIONAL CHAR VARYING"
+"BINARY VARYING"
+"NCHAR LARGE OBJECT"
+"NATIONAL CHARACTER VARYING"
+"NATIONAL CHARACTER LARGE OBJECT"
+"NATIONAL CHARACTER"
+"NATIONAL CHAR"
+"CHARACTER VARYING"
+"LONGBLOB"
+"MEDIUMTEXT"
+"TEXT"
+"TINYBLOB"
+"VARCHAR2"
+"CHARACTER LARGE OBJECT"
+"DOUBLE PRECISION"
+"LONGTEXT"
+"NVARCHAR"
+"INT1 UNSIGNED"
+"VARCHAR"
+"CHAR VARYING"
+"MEDIUMBLOB"
+"NCHAR"
+"CHAR"
+"SMALLINT UNSIGNED"
+"TIMESTAMP"
+"FIXED"
+"TINYTEXT"
+"NUMERIC"
+"DEC"
+"TINYINT UNSIGNED"
+"INTEGER UNSIGNED"
+"INT UNSIGNED"
+"CLOB"
+"MEDIUMINT UNSIGNED"
+"BOOL"
+"SMALLINT"
+"INTEGER SIGNED"
+"NCHAR VARYING"
+"INT SIGNED"
+"TINYINT SIGNED"
+"BIGINT SIGNED"
+"BINARY LARGE OBJECT"
+"SMALLINT SIGNED"
+"MEDIUMINT"
+"INTEGER"
+"INT1 SIGNED"
+"BIGINT UNSIGNED"
+"BYTEA"
+"INT"
+"SINGLE"
+"FLOAT"
+"MEDIUMINT SIGNED"
+"BOOLEAN"
+"DOUBLE"
+"INT1"
+"CHAR LARGE OBJECT"
+"TINYINT"
+"BIGINT"
+"CHARACTER"
+"BYTE"
+"BLOB"
+"REAL"
+"IPv6"
+"IPv4"
+"Enum"
+"FixedString"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"String"
+"Float64"
+"String"
+"String"
+"UInt8"
+"String"
+"String"
+"String"
+"String"
+"String"
+"UInt16"
+"DateTime"
+"Decimal"
+"String"
+"Decimal"
+"Decimal"
+"UInt8"
+"UInt32"
+"UInt32"
+"String"
+"UInt32"
+"Int8"
+"Int16"
+"Int32"
+"String"
+"Int32"
+"Int8"
+"Int64"
+"String"
+"Int16"
+"Int32"
+"Int32"
+"Int8"
+"UInt64"
+"String"
+"Int32"
+"Float32"
+"Float32"
+"Int32"
+"Int8"
+"Float64"
+"Int8"
+"String"
+"Int8"
+"Int64"
+"String"
+"Int8"
+"String"
+"Float32"
diff --git a/tests/fuzz/dictionaries/functions.dict b/tests/fuzz/dictionaries/functions.dict
new file mode 100644
index 00000000000..722e931dc09
--- /dev/null
+++ b/tests/fuzz/dictionaries/functions.dict
@@ -0,0 +1,1123 @@
+"logTrace"
+"aes_decrypt_mysql"
+"aes_encrypt_mysql"
+"decrypt"
+"encrypt"
+"bayesAB"
+"snowflakeToDateTime64"
+"snowflakeToDateTime"
+"validateNestedArraySizes"
+"wordShingleMinHashArgCaseInsensitiveUTF8"
+"wordShingleMinHashArgUTF8"
+"wordShingleMinHashArgCaseInsensitive"
+"wordShingleMinHashArg"
+"ngramMinHashArgCaseInsensitiveUTF8"
+"ngramMinHashArgUTF8"
+"ngramMinHashArgCaseInsensitive"
+"wordShingleMinHashCaseInsensitiveUTF8"
+"wordShingleMinHashUTF8"
+"ngramMinHashCaseInsensitiveUTF8"
+"ngramMinHashUTF8"
+"ngramMinHashCaseInsensitive"
+"wordShingleSimHashUTF8"
+"ngramSimHashUTF8"
+"ngramSimHashCaseInsensitive"
+"ngramSimHash"
+"toUnixTimestamp64Nano"
+"toUnixTimestamp64Micro"
+"jumpConsistentHash"
+"yandexConsistentHash"
+"addressToSymbol"
+"toJSONString"
+"JSON_VALUE"
+"JSONExtractKeysAndValuesRaw"
+"JSONExtractKeys"
+"JSONExtractString"
+"JSONType"
+"JSONKey"
+"JSONLength"
+"isValidJSON"
+"isZeroOrNull"
+"assumeNotNull"
+"s2CapUnion"
+"s2CapContains"
+"s2CellsIntersect"
+"s2GetNeighbors"
+"s2ToGeo"
+"h3GetFaces"
+"h3IsResClassIII"
+"h3ToString"
+"stringToH3"
+"h3ToParent"
+"h3GetResolution"
+"h3EdgeLengthM"
+"svg"
+"SVG"
+"equals"
+"geohashesInBox"
+"polygonsIntersectionCartesian"
+"polygonPerimeterSpherical"
+"bitHammingDistance"
+"polygonsDistanceSpherical"
+"polygonsSymDifferenceSpherical"
+"polygonAreaSpherical"
+"greatCircleDistance"
+"toInt256"
+"mapKeys"
+"sign"
+"reinterpretAsUInt8"
+"atanh"
+"formatReadableTimeDelta"
+"geohashEncode"
+"atan2"
+"acos"
+"SHA224"
+"visitParamExtractBool"
+"h3kRing"
+"asin"
+"sin"
+"reinterpretAsUInt128"
+"lgamma"
+"log2"
+"geoToH3"
+"toUnixTimestamp64Milli"
+"firstSignificantSubdomainCustom"
+"simpleJSONExtractBool"
+"visitParamExtractFloat"
+"visitParamExtractInt"
+"simpleJSONHas"
+"visitParamHas"
+"sigmoid"
+"cutQueryStringAndFragment"
+"dictGetInt16OrDefault"
+"cutToFirstSignificantSubdomainCustom"
+"URLHierarchy"
+"extractURLParameterNames"
+"toDecimal128OrZero"
+"extractURLParameters"
+"path"
+"pathFull"
+"port"
+"domain"
+"bitTest"
+"ngramSearchCaseInsensitiveUTF8"
+"bitmapMax"
+"ngramDistanceCaseInsensitiveUTF8"
+"ngramDistance"
+"extractAllGroupsHorizontal"
+"extractAllGroupsVertical"
+"multiFuzzyMatchAllIndices"
+"multiFuzzyMatchAnyIndex"
+"multiMatchAnyIndex"
+"replaceRegexpAll"
+"emptyArrayInt16"
+"dictGetOrDefault"
+"replaceOne"
+"emptyArrayInt32"
+"extract"
+"readWKTPolygon"
+"notILike"
+"geohashDecode"
+"toModifiedJulianDay"
+"notLike"
+"countSubstringsCaseInsensitive"
+"IPv4StringToNum"
+"positionUTF8"
+"hasToken"
+"dictGetDate"
+"multiSearchFirstPosition"
+"multiSearchFirstIndexCaseInsensitiveUTF8"
+"atan"
+"rowNumberInAllBlocks"
+"multiSearchFirstIndexCaseInsensitive"
+"multiSearchAnyUTF8"
+"parseDateTime32BestEffortOrZero"
+"blockNumber"
+"cutURLParameter"
+"multiSearchFirstPositionCaseInsensitive"
+"positionCaseInsensitiveUTF8"
+"positionCaseInsensitive"
+"splitByRegexp"
+"toInt256OrZero"
+"pointInPolygon"
+"splitByWhitespace"
+"lemmatize"
+"synonyms"
+"tryBase64Decode"
+"multiSearchAllPositions"
+"FROM_BASE64"
+"replaceRegexpOne"
+"subBitmap"
+"defaultValueOfArgumentType"
+"base64Decode"
+"regionToContinent"
+"ilike"
+"fromModifiedJulianDay"
+"TO_BASE64"
+"dictIsIn"
+"base64Encode"
+"decodeXMLComponent"
+"countMatchesCaseInsensitive"
+"normalizeQuery"
+"erf"
+"trimBoth"
+"fromUnixTimestamp64Nano"
+"lessOrEquals"
+"subtractQuarters"
+"ngramSearch"
+"readWKTRing"
+"trimRight"
+"endsWith"
+"ngramDistanceCaseInsensitive"
+"connectionId"
+"initialQueryID"
+"startsWith"
+"tan"
+"substring"
+"formatRow"
+"dictGetHierarchy"
+"notEmpty"
+"format"
+"murmurHash3_64"
+"reverseUTF8"
+"arrayEnumerateUniqRanked"
+"CRC64"
+"pow"
+"toInt16"
+"reverse"
+"lower"
+"toStartOfDay"
+"caseWithoutExpr"
+"CHAR_LENGTH"
+"lengthUTF8"
+"length"
+"bitTestAny"
+"floor"
+"round"
+"reinterpretAsFixedString"
+"reinterpretAsString"
+"h3ToChildren"
+"emptyArrayToSingle"
+"tgamma"
+"reinterpretAsInt128"
+"visitParamExtractRaw"
+"reinterpretAsInt64"
+"reinterpretAsUInt32"
+"reinterpretAsUInt16"
+"fuzzBits"
+"randomFixedString"
+"tupleHammingDistance"
+"JSONExtractBool"
+"ngramSearchUTF8"
+"generateUUIDv4"
+"multiSearchAllPositionsCaseInsensitive"
+"randConstant"
+"leftPad"
+"convertCharset"
+"extractURLParameter"
+"zookeeperSessionUptime"
+"serverUUID"
+"firstSignificantSubdomain"
+"rand64"
+"JSON_EXISTS"
+"isIPAddressInRange"
+"wordShingleSimHashCaseInsensitive"
+"parseDateTime32BestEffortOrNull"
+"cutToFirstSignificantSubdomainWithWWW"
+"roundToExp2"
+"mapSubtract"
+"partitionId"
+"intExp2"
+"byteSize"
+"errorCodeToName"
+"toDateTime64"
+"yesterday"
+"initializeAggregation"
+"globalVariable"
+"countDigits"
+"toStartOfHour"
+"toWeek"
+"isDecimalOverflow"
+"visitParamExtractString"
+"isConstant"
+"getSetting"
+"shardNum"
+"__getScalar"
+"position"
+"__bitBoolMaskOr"
+"cosh"
+"basename"
+"evalMLMethod"
+"filesystemFree"
+"filesystemCapacity"
+"reinterpretAsDate"
+"filesystemAvailable"
+"joinGet"
+"globalNullInIgnoreSet"
+"globalNotInIgnoreSet"
+"toRelativeDayNum"
+"splitByChar"
+"notInIgnoreSet"
+"globalInIgnoreSet"
+"notNullIn"
+"ngramSearchCaseInsensitive"
+"notIn"
+"trunc"
+"JSONExtractArrayRaw"
+"version"
+"joinGetOrNull"
+"globalIn"
+"toDate32"
+"lowCardinalityIndices"
+"toLowCardinality"
+"runningConcurrency"
+"runningDifferenceStartingWithFirstValue"
+"bitCount"
+"timezoneOf"
+"timezone"
+"uptime"
+"pi"
+"extractTextFromHTML"
+"UUIDStringToNum"
+"roundDown"
+"IPv6NumToString"
+"throwIf"
+"ifNotFinite"
+"FROM_UNIXTIME"
+"isInfinite"
+"arrayProduct"
+"polygonsIntersectionSpherical"
+"toRelativeHourNum"
+"hasColumnInTable"
+"bar"
+"JSONExtractKeysAndValues"
+"replicate"
+"arrayJoin"
+"s2RectUnion"
+"ngramDistanceUTF8"
+"identity"
+"indexHint"
+"ignore"
+"regionHierarchy"
+"toDateTime64OrNull"
+"polygonsWithinCartesian"
+"materialize"
+"sleepEachRow"
+"parseDateTimeBestEffortUSOrNull"
+"neighbor"
+"splitByString"
+"rowNumberInBlock"
+"blockSize"
+"defaultValueOfTypeName"
+"hiveHash"
+"randomStringUTF8"
+"blockSerializedSize"
+"visibleWidth"
+"fullHostName"
+"hostName"
+"arrayFilter"
+"defaultRoles"
+"currentRoles"
+"toUInt64OrZero"
+"dictGetUInt16"
+"DATABASE"
+"toUInt8OrZero"
+"reinterpretAsInt8"
+"not"
+"log1p"
+"and"
+"wordShingleMinHash"
+"arrayDifference"
+"arrayCumSumNonNegative"
+"wordShingleSimHash"
+"arrayCumSum"
+"arraySort"
+"dumpColumnStructure"
+"multiSearchFirstIndex"
+"arrayReverseSplit"
+"ifNull"
+"normalizeQueryKeepNames"
+"xxHash64"
+"in"
+"arrayReverseFill"
+"erfc"
+"cutToFirstSignificantSubdomainCustomWithWWW"
+"arrayFill"
+"substringUTF8"
+"arrayFirst"
+"arrayAvg"
+"cos"
+"arrayMax"
+"toColumnTypeName"
+"arrayMin"
+"toIntervalDay"
+"reinterpretAsFloat32"
+"arrayAll"
+"or"
+"arrayExists"
+"trimLeft"
+"arrayMap"
+"polygonsSymDifferenceCartesian"
+"gccMurmurHash"
+"exp2"
+"polygonPerimeterCartesian"
+"SHA384"
+"murmurHash3_128"
+"polygonConvexHullCartesian"
+"murmurHash3_32"
+"h3GetBaseCell"
+"murmurHash2_64"
+"globalNullIn"
+"javaHashUTF16LE"
+"URLHash"
+"reinterpretAsInt16"
+"regionToCountry"
+"toUUID"
+"intHash32"
+"metroHash64"
+"arrayPushFront"
+"bitmapAndnotCardinality"
+"toFloat32"
+"sipHash64"
+"JSONExtractFloat"
+"SHA512"
+"JSONExtractUInt"
+"arrayReduce"
+"SHA256"
+"array"
+"parseDateTimeBestEffortUSOrZero"
+"toInt32OrNull"
+"MD5"
+"randomString"
+"__bitBoolMaskAnd"
+"hasSubstr"
+"formatReadableQuantity"
+"replaceAll"
+"toIntervalWeek"
+"toRelativeSecondNum"
+"demangle"
+"toNullable"
+"concat"
+"formatReadableSize"
+"shardCount"
+"fromModifiedJulianDayOrNull"
+"toInt128OrZero"
+"bitmaskToList"
+"xor"
+"bitPositionsToArray"
+"empty"
+"ngramMinHashArg"
+"_CAST"
+"dictGetStringOrDefault"
+"arrayZip"
+"dictGetUUIDOrDefault"
+"dictGetFloat64OrDefault"
+"dictGetInt64OrDefault"
+"today"
+"dictGetUInt32OrDefault"
+"countSubstringsCaseInsensitiveUTF8"
+"h3IsPentagon"
+"dictGetUInt16OrDefault"
+"dictGetDescendants"
+"dictGetString"
+"inIgnoreSet"
+"dictGetUUID"
+"arraySlice"
+"reinterpretAsInt32"
+"dictGetFloat64"
+"globalNotNullInIgnoreSet"
+"arrayUniq"
+"polygonAreaCartesian"
+"intDiv"
+"cityHash64"
+"regionToTopContinent"
+"toInt32"
+"e"
+"wordShingleSimHashCaseInsensitiveUTF8"
+"formatRowNoNewline"
+"JSON_QUERY"
+"isIPv4String"
+"UUIDNumToString"
+"modulo"
+"reinterpret"
+"unbin"
+"regionToDistrict"
+"sinh"
+"date_trunc"
+"__bitSwapLastTwo"
+"formatDateTime"
+"dateDiff"
+"tanh"
+"multiSearchAnyCaseInsensitiveUTF8"
+"upperUTF8"
+"bitmaskToArray"
+"arrayAUC"
+"multiMatchAllIndices"
+"hasThreadFuzzer"
+"toDayOfWeek"
+"isFinite"
+"transform"
+"timezoneOffset"
+"toTimezone"
+"cutQueryString"
+"subtractYears"
+"tcpPort"
+"subtractHours"
+"tid"
+"toDateTime64OrZero"
+"subtractSeconds"
+"alphaTokens"
+"negate"
+"modelEvaluate"
+"file"
+"roundAge"
+"MACStringToOUI"
+"addQuarters"
+"arrayResize"
+"addWeeks"
+"HOUR"
+"addHours"
+"visitParamExtractUInt"
+"caseWithExpression"
+"rand"
+"addSeconds"
+"splitByNonAlpha"
+"arrayStringConcat"
+"randomPrintableASCII"
+"h3HexAreaM2"
+"toYYYYMMDDhhmmss"
+"toInt16OrNull"
+"timeSlots"
+"timeSlot"
+"dictGetInt16"
+"queryString"
+"javaHash"
+"acosh"
+"toRelativeMinuteNum"
+"toRelativeYearNum"
+"unhex"
+"toInt8OrNull"
+"regionToPopulation"
+"toStartOfISOYear"
+"getSizeOfEnumType"
+"toStartOfInterval"
+"toYYYYMMDD"
+"multiSearchFirstPositionUTF8"
+"CRC32"
+"toStartOfFifteenMinutes"
+"emptyArrayUInt8"
+"dictGetUInt8"
+"toStartOfFiveMinute"
+"cbrt"
+"toStartOfMinute"
+"dictGet"
+"toStartOfSecond"
+"hasTokenCaseInsensitive"
+"toStartOfYear"
+"farmHash64"
+"toStartOfMonth"
+"queryID"
+"wordShingleMinHashCaseInsensitive"
+"dictGetDateOrDefault"
+"dictGetUInt64OrDefault"
+"arrayElement"
+"sleep"
+"dictHas"
+"enabledProfiles"
+"toDecimal32OrNull"
+"multiFuzzyMatchAny"
+"toStartOfWeek"
+"isValidUTF8"
+"dictGetInt8"
+"dictGetInt32OrDefault"
+"toMonday"
+"multiSearchFirstIndexUTF8"
+"lowCardinalityKeys"
+"halfMD5"
+"domainWithoutWWW"
+"MINUTE"
+"addDays"
+"toMinute"
+"JSONExtractRaw"
+"toUInt16OrNull"
+"bin"
+"toDayOfYear"
+"log"
+"DAYOFMONTH"
+"toUInt32"
+"toDecimal32"
+"s2RectAdd"
+"dictGetFloat32OrDefault"
+"xxHash32"
+"DAY"
+"toISOWeek"
+"ngramMinHash"
+"toMonth"
+"countMatches"
+"toQuarter"
+"toISOYear"
+"YEAR"
+"toIntervalYear"
+"hypot"
+"multiSearchAny"
+"toIntervalQuarter"
+"toSecond"
+"accurate_CastOrNull"
+"reinterpretAsUInt64"
+"defaultProfiles"
+"toIntervalMonth"
+"bitRotateRight"
+"arrayReverseSort"
+"toInt8OrZero"
+"SHA1"
+"multiSearchFirstPositionCaseInsensitiveUTF8"
+"cutFragment"
+"toDecimal256"
+"toIntervalSecond"
+"toUInt256OrZero"
+"toStringCutToZero"
+"normalizedQueryHashKeepNames"
+"coalesce"
+"parseDateTime64BestEffortOrNull"
+"toIntervalHour"
+"bitmapSubsetLimit"
+"parseDateTimeBestEffortOrNull"
+"match"
+"fragment"
+"repeat"
+"parseDateTimeBestEffortOrZero"
+"toDecimal128OrNull"
+"parseDateTimeBestEffort"
+"simpleJSONExtractUInt"
+"multiMatchAny"
+"toDecimal256OrNull"
+"roundDuration"
+"addMinutes"
+"toStartOfQuarter"
+"exp10"
+"regionIn"
+"toDecimal64OrNull"
+"toDateTimeOrNull"
+"simpleJSONExtractFloat"
+"reinterpretAsUUID"
+"dictGetDateTimeOrDefault"
+"greater"
+"toRelativeMonthNum"
+"toDate32OrNull"
+"h3IndexesAreNeighbors"
+"toFloat32OrNull"
+"toInt256OrNull"
+"leftPadUTF8"
+"regionToArea"
+"toInt64OrNull"
+"toModifiedJulianDayOrNull"
+"toUInt64OrNull"
+"polygonsEqualsCartesian"
+"accurateCast"
+"toUInt32OrNull"
+"encodeXMLComponent"
+"toUInt8OrNull"
+"toUUIDOrZero"
+"arrayEnumerateDenseRanked"
+"toYYYYMM"
+"toDecimal256OrZero"
+"fromUnixTimestamp64Milli"
+"CHARACTER_LENGTH"
+"isNull"
+"isNaN"
+"multiSearchAllPositionsCaseInsensitiveUTF8"
+"FQDN"
+"currentProfiles"
+"toDateTime32"
+"arraySplit"
+"toIPv6"
+"toDecimal32OrZero"
+"bitmapCardinality"
+"arrayFlatten"
+"dateName"
+"s2RectIntersection"
+"CAST"
+"caseWithExpr"
+"nullIf"
+"toDateTimeOrZero"
+"bitOr"
+"CRC32IEEE"
+"emptyArrayDate"
+"toUInt128OrZero"
+"toUInt128OrNull"
+"toFloat32OrZero"
+"SECOND"
+"arrayCompact"
+"bitmapMin"
+"toInt16OrZero"
+"reinterpretAsUInt256"
+"dictGetOrNull"
+"map"
+"bitmapHasAny"
+"emptyArrayUInt16"
+"cutIPv6"
+"toUInt32OrZero"
+"toTypeName"
+"polygonsUnionCartesian"
+"char"
+"mapContains"
+"emptyArrayDateTime"
+"toUInt16OrZero"
+"toInt64"
+"wkt"
+"dictGetUInt64"
+"JSONHas"
+"runningDifference"
+"getServerPort"
+"IPv4ToIPv6"
+"__bitWrapperFunc"
+"multiply"
+"accurate_Cast"
+"toDecimal64"
+"toString"
+"arrayIntersect"
+"dictGetUInt8OrDefault"
+"toTime"
+"hasAll"
+"now"
+"parseDateTime64BestEffortOrZero"
+"rightPadUTF8"
+"emptyArrayInt64"
+"simpleJSONExtractInt"
+"toDecimal128"
+"toRelativeWeekNum"
+"toDateOrNull"
+"topLevelDomain"
+"greatest"
+"isIPv6String"
+"toHour"
+"toFixedString"
+"bitmapOrCardinality"
+"toInt128"
+"toDateOrZero"
+"emptyArrayUInt64"
+"toUInt128"
+"isNotNull"
+"toUInt16"
+"MACNumToString"
+"multiSearchAllPositionsUTF8"
+"toUInt8"
+"regionToCity"
+"DAYOFYEAR"
+"simpleJSONExtractRaw"
+"appendTrailingCharIfAbsent"
+"toUInt64"
+"regionToName"
+"IPv4NumToStringClassC"
+"upper"
+"greaterOrEquals"
+"s2RectContains"
+"toDate"
+"regexpQuoteMeta"
+"readWKTMultiPolygon"
+"emptyArrayString"
+"bitmapOr"
+"cutWWW"
+"emptyArrayInt8"
+"less"
+"readWKTPoint"
+"reinterpretAsDateTime"
+"notEquals"
+"geoToS2"
+"nullInIgnoreSet"
+"globalNotNullIn"
+"arrayConcat"
+"mapPopulateSeries"
+"parseDateTimeBestEffortUS"
+"toDayOfMonth"
+"gcd"
+"protocol"
+"currentUser"
+"if"
+"caseWithoutExpression"
+"currentDatabase"
+"log10"
+"moduloOrZero"
+"MD4"
+"toInt64OrZero"
+"arrayWithConstant"
+"IPv4NumToString"
+"dictGetUInt32"
+"multiSearchAnyCaseInsensitive"
+"countSubstrings"
+"reinterpretAsFloat64"
+"plus"
+"dictGetChildren"
+"IPv6CIDRToRange"
+"toIntervalMinute"
+"bitRotateLeft"
+"geoDistance"
+"mapValues"
+"toIPv4"
+"extractGroups"
+"toYearWeek"
+"polygonsDistanceCartesian"
+"lowerUTF8"
+"toUInt256OrNull"
+"IPv4CIDRToRange"
+"MACStringToNum"
+"toFloat64OrNull"
+"sipHash128"
+"toFloat64"
+"arrayPopFront"
+"bitmapAnd"
+"bitmapHasAll"
+"subtractWeeks"
+"arrayFirstIndex"
+"bitmapXorCardinality"
+"bitmapAndnot"
+"asinh"
+"dictGetInt32"
+"toFloat64OrZero"
+"toInt8"
+"polygonsWithinSpherical"
+"bitmapXor"
+"intExp10"
+"dictGetDateTime"
+"h3ToGeoBoundary"
+"decodeURLComponent"
+"bitAnd"
+"toUUIDOrNull"
+"notNullInIgnoreSet"
+"tupleElement"
+"tupleToNameValuePairs"
+"tuple"
+"ceil"
+"DAYOFWEEK"
+"toDateTime"
+"bitNot"
+"rightPad"
+"has"
+"bitmapToArray"
+"arrayCount"
+"arrayDistinct"
+"greatCircleAngle"
+"IPv6StringToNum"
+"dictGetInt64"
+"toUnixTimestamp"
+"getMacro"
+"runningAccumulate"
+"multiIf"
+"abs"
+"toValidUTF8"
+"arrayEnumerateUniq"
+"moduloLegacy"
+"JSONExtractInt"
+"subtractMonths"
+"dateTimeToSnowflake"
+"cutToFirstSignificantSubdomain"
+"roundBankers"
+"toUInt256"
+"arrayEnumerateDense"
+"stem"
+"bitmapAndCardinality"
+"bitTestAll"
+"normalizedQueryHash"
+"toYear"
+"emptyArrayFloat64"
+"bitmapTransform"
+"JSONExtract"
+"bitShiftRight"
+"bitmapContains"
+"sqrt"
+"minus"
+"QUARTER"
+"parseDateTime64BestEffort"
+"h3IsValid"
+"h3EdgeAngle"
+"concatAssumeInjective"
+"emptyArrayUInt32"
+"intHash64"
+"enabledRoles"
+"fromUnixTimestamp64Micro"
+"range"
+"subtractMinutes"
+"farmFingerprint64"
+"arrayReduceInRanges"
+"bitmapBuild"
+"bitmapSubsetInRange"
+"arrayPopBack"
+"h3ToGeo"
+"hex"
+"arrayPushBack"
+"subtractDays"
+"buildId"
+"URLPathHierarchy"
+"addMonths"
+"parseDateTime32BestEffort"
+"indexOf"
+"polygonsUnionSpherical"
+"arraySum"
+"dictGetFloat32"
+"ngramSimHashCaseInsensitiveUTF8"
+"finalizeAggregation"
+"divide"
+"netloc"
+"bitShiftLeft"
+"toInt32OrZero"
+"extractAll"
+"toInt128OrNull"
+"bitXor"
+"lcm"
+"accurateCastOrNull"
+"toDate32OrZero"
+"simpleJSONExtractString"
+"least"
+"nullIn"
+"MONTH"
+"arrayReverse"
+"now64"
+"DATE"
+"addressToLine"
+"globalNotIn"
+"dateTime64ToSnowflake"
+"dictGetInt8OrDefault"
+"exp"
+"toRelativeQuarterNum"
+"arrayEnumerate"
+"mapAdd"
+"murmurHash2_32"
+"toStartOfTenMinutes"
+"intDivOrZero"
+"addYears"
+"queryStringAndFragment"
+"emptyArrayFloat32"
+"countEqual"
+"pointInEllipses"
+"like"
+"toDecimal64OrZero"
+"reinterpretAsInt256"
+"hasAny"
+"ln"
+"replace"
+"rpad"
+"mid"
+"lcase"
+"fromUnixTimestamp"
+"truncate"
+"ceiling"
+"ucase"
+"rand32"
+"power"
+"initial_query_id"
+"timeZone"
+"hostname"
+"yearweek"
+"timeZoneOffset"
+"extractAllGroups"
+"lpad"
+"substr"
+"INET6_NTOA"
+"INET6_ATON"
+"INET_ATON"
+"timeZoneOf"
+"locate"
+"INET_NTOA"
+"connection_id"
+"user"
+"toTimeZone"
+"week"
+"flatten"
+"query_id"
+"dateTrunc"
+"mod"
+"lagInFrame"
+"dense_rank"
+"rank"
+"exponentialMovingAverage"
+"sparkbar"
+"singleValueOrNull"
+"studentTTest"
+"aggThrow"
+"categoricalInformationValue"
+"groupArrayMovingAvg"
+"groupArrayMovingSum"
+"simpleLinearRegression"
+"entropy"
+"quantilesBFloat16"
+"maxIntersectionsPosition"
+"groupBitmapXor"
+"groupBitmap"
+"skewPop"
+"groupBitXor"
+"groupBitOr"
+"groupBitmapAnd"
+"topKWeighted"
+"stochasticLinearRegression"
+"corr"
+"uniqCombined64"
+"intervalLengthSum"
+"uniqCombined"
+"rankCorr"
+"maxMap"
+"minMap"
+"sumMapFiltered"
+"quantileExactWeighted"
+"sumMapFilteredWithOverflow"
+"sumMap"
+"histogram"
+"quantiles"
+"sum"
+"covarPop"
+"row_number"
+"kurtPop"
+"kurtSamp"
+"skewSamp"
+"uniqExact"
+"sumMapWithOverflow"
+"stddevSamp"
+"varPop"
+"corrStable"
+"quantileTimingWeighted"
+"covarPopStable"
+"stddevSampStable"
+"varSamp"
+"topK"
+"last_value"
+"mannWhitneyUTest"
+"maxIntersections"
+"quantilesExact"
+"uniqHLL12"
+"quantileBFloat16"
+"uniq"
+"min"
+"sequenceNextNode"
+"quantilesTimingWeighted"
+"boundingRatio"
+"any"
+"anyLast"
+"deltaSum"
+"retention"
+"sequenceMatch"
+"uniqUpTo"
+"windowFunnel"
+"deltaSumTimestamp"
+"varSampStable"
+"uniqTheta"
+"quantilesExactWeighted"
+"max"
+"quantilesBFloat16Weighted"
+"quantileBFloat16Weighted"
+"sumKahan"
+"quantilesTDigestWeighted"
+"groupBitAnd"
+"quantileTDigest"
+"quantileTDigestWeighted"
+"argMax"
+"quantileDeterministic"
+"quantilesTDigest"
+"stochasticLogisticRegression"
+"argMin"
+"avg"
+"covarSampStable"
+"quantilesTiming"
+"welchTTest"
+"covarSamp"
+"varPopStable"
+"quantileTiming"
+"quantileExactInclusive"
+"quantileExactHigh"
+"groupArraySample"
+"quantilesExactLow"
+"groupBitmapOr"
+"first_value"
+"quantileExactExclusive"
+"quantileExact"
+"sumCount"
+"groupArrayInsertAt"
+"quantilesExactHigh"
+"sumWithOverflow"
+"sequenceCount"
+"quantilesDeterministic"
+"groupUniqArray"
+"groupArray"
+"anyHeavy"
+"stddevPop"
+"quantile"
+"leadInFrame"
+"quantilesExactExclusive"
+"count"
+"quantilesExactInclusive"
+"stddevPopStable"
+"quantileExactLow"
+"avgWeighted"
+"BIT_AND"
+"VAR_SAMP"
+"COVAR_SAMP"
+"VAR_POP"
+"medianTDigest"
+"medianBFloat16"
+"medianTimingWeighted"
+"medianTiming"
+"medianExactHigh"
+"BIT_OR"
+"medianDeterministic"
+"STDDEV_POP"
+"STDDEV_SAMP"
+"medianExactLow"
+"medianTDigestWeighted"
+"medianExact"
+"COVAR_POP"
+"medianBFloat16Weighted"
+"medianExactWeighted"
+"BIT_XOR"
+"median"
+"log"
+"replaceAll"
+"rightPad"
+"substring"
+"lower"
+"FROM_UNIXTIME"
+"trunc"
+"ceil"
+"upper"
+"rand"
+"pow"
+"initialQueryID"
+"timezone"
+"hostName"
+"toYearWeek"
+"timezoneOffset"
+"extractAllGroupsVertical"
+"leftPad"
+"substring"
+"IPv6NumToString"
+"IPv6StringToNum"
+"IPv4StringToNum"
+"timezoneOf"
+"position"
+"IPv4NumToString"
+"connectionid"
+"currentUser"
+"toTimezone"
+"toWeek"
+"arrayFlatten"
+"queryID"
+"date_trunc"
+"modulo"
+"groupBitAnd"
+"varSamp"
+"covarSamp"
+"varPop"
+"quantileTDigest"
+"quantileBFloat16"
+"quantileTimingWeighted"
+"quantileTiming"
+"quantileExactHigh"
+"groupBitOr"
+"quantileDeterministic"
+"stddevPop"
+"stddevSamp"
+"quantileExactLow"
+"quantileTDigestWeighted"
+"quantileExact"
+"covarPop"
+"quantileBFloat16Weighted"
+"quantileExactWeighted"
+"groupBitXor"
+"quantile"
diff --git a/tests/fuzz/dictionaries/key_words.dict b/tests/fuzz/dictionaries/key_words.dict
new file mode 100644
index 00000000000..0db2d159759
--- /dev/null
+++ b/tests/fuzz/dictionaries/key_words.dict
@@ -0,0 +1,183 @@
+# Key words (based on keywords from antlr parser)
+
+"ADD"
+"AFTER"
+"ALIAS"
+"ALL"
+"ALTER"
+"AND"
+"ANTI"
+"ANY"
+"ARRAY"
+"AS"
+"ASCENDING"
+"ASOF"
+"AST"
+"ASYNC"
+"ATTACH"
+"BETWEEN"
+"BOTH"
+"BY"
+"CASE"
+"CAST"
+"CHECK"
+"CLEAR"
+"CLUSTER"
+"CODEC"
+"COLLATE"
+"COLUMN"
+"COMMENT"
+"CONSTRAINT"
+"CREATE"
+"CROSS"
+"CUBE"
+"DATABASE"
+"DATABASES"
+"DATE"
+"DAY"
+"DEDUPLICATE"
+"DEFAULT"
+"DELAY"
+"DELETE"
+"DESC"
+"DESCENDING"
+"DESCRIBE"
+"DETACH"
+"DICTIONARIES"
+"DICTIONARY"
+"DISK"
+"DISTINCT"
+"DISTRIBUTED"
+"DROP"
+"ELSE"
+"END"
+"ENGINE"
+"EVENTS"
+"EXISTS"
+"EXPLAIN"
+"EXPRESSION"
+"EXTRACT"
+"FETCHES"
+"FINAL"
+"FIRST"
+"FLUSH"
+"FOR"
+"FORMAT"
+"FREEZE"
+"FROM"
+"FULL"
+"FUNCTION"
+"GLOBAL"
+"GRANULARITY"
+"GROUP"
+"HAVING"
+"HIERARCHICAL"
+"HOUR"
+"ID"
+"IF"
+"ILIKE"
+"IN"
+"INDEX"
+"INF"
+"INJECTIVE"
+"INNER"
+"INSERT"
+"INTERVAL"
+"INTO"
+"IS"
+"IS_OBJECT_ID"
+"JOIN"
+"KEY"
+"KILL"
+"LAST"
+"LAYOUT"
+"LEADING"
+"LEFT"
+"LIFETIME"
+"LIKE"
+"LIMIT"
+"LIVE"
+"LOCAL"
+"LOGS"
+"MATERIALIZE"
+"MATERIALIZED"
+"MAX"
+"MERGES"
+"MIN"
+"MINUTE"
+"MODIFY"
+"MONTH"
+"MOVE"
+"MUTATION"
+"NAN_SQL"
+"NO"
+"NOT"
+"NULL_SQL"
+"NULLS"
+"OFFSET"
+"ON"
+"OPTIMIZE"
+"OR"
+"ORDER"
+"OUTER"
+"OUTFILE"
+"PARTITION"
+"POPULATE"
+"PREWHERE"
+"PRIMARY"
+"PROJECTION"
+"QUARTER"
+"RANGE"
+"RELOAD"
+"REMOVE"
+"RENAME"
+"REPLACE"
+"REPLICA"
+"REPLICATED"
+"RIGHT"
+"ROLLUP"
+"SAMPLE"
+"SECOND"
+"SELECT"
+"SEMI"
+"SENDS"
+"SET"
+"SETTINGS"
+"SHOW"
+"SOURCE"
+"START"
+"STOP"
+"SUBSTRING"
+"SYNC"
+"SYNTAX"
+"SYSTEM"
+"TABLE"
+"TABLES"
+"TEMPORARY"
+"TEST"
+"THEN"
+"TIES"
+"TIMEOUT"
+"TIMESTAMP"
+"TO"
+"TOP"
+"TOTALS"
+"TRAILING"
+"TRIM"
+"TRUNCATE"
+"TTL"
+"TYPE"
+"UNION"
+"UPDATE"
+"USE"
+"USING"
+"UUID"
+"VALUES"
+"VIEW"
+"VOLUME"
+"WATCH"
+"WEEK"
+"WHEN"
+"WHERE"
+"WITH"
+"YEAR"
diff --git a/tests/fuzz/ast.dict b/tests/fuzz/dictionaries/old.dict
similarity index 100%
rename from tests/fuzz/ast.dict
rename to tests/fuzz/dictionaries/old.dict
diff --git a/tests/fuzz/execute_query_fuzzer.options b/tests/fuzz/execute_query_fuzzer.options
new file mode 100644
index 00000000000..cbe915d10fc
--- /dev/null
+++ b/tests/fuzz/execute_query_fuzzer.options
@@ -0,0 +1,3 @@
+[libfuzzer]
+dict = all.dict
+jobs = 8
diff --git a/tests/fuzz/lexer_fuzzer.options b/tests/fuzz/lexer_fuzzer.options
index fda41ea5398..cbe915d10fc 100644
--- a/tests/fuzz/lexer_fuzzer.options
+++ b/tests/fuzz/lexer_fuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
-dict = ast.dict
+dict = all.dict
+jobs = 8
diff --git a/tests/fuzz/names_and_types_fuzzer.options b/tests/fuzz/names_and_types_fuzzer.options
index a98c23185e1..cbe915d10fc 100644
--- a/tests/fuzz/names_and_types_fuzzer.options
+++ b/tests/fuzz/names_and_types_fuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
-dict = datatypes.dict
+dict = all.dict
+jobs = 8
diff --git a/tests/fuzz/select_parser_fuzzer.options b/tests/fuzz/select_parser_fuzzer.options
index fda41ea5398..cbe915d10fc 100644
--- a/tests/fuzz/select_parser_fuzzer.options
+++ b/tests/fuzz/select_parser_fuzzer.options
@@ -1,2 +1,3 @@
 [libfuzzer]
-dict = ast.dict
+dict = all.dict
+jobs = 8
diff --git a/tests/instructions/easy_tasks_sorted_ru.md b/tests/instructions/easy_tasks_sorted_ru.md
index 2c38dcc2c8f..a98a5766ffe 100644
--- a/tests/instructions/easy_tasks_sorted_ru.md
+++ b/tests/instructions/easy_tasks_sorted_ru.md
@@ -62,9 +62,9 @@ void memoryBitAnd(const char * a, const char * b, char * result, size_t size);
 
 ## + Функции создания и обновления состояния агрегатной функции по одному кортежу аргументов.
 
-В ClickHouse есть понятие - состояние вычисления агрегатной функции. Состояния агрегатных функций можно записывать в таблицы, складывать, финализировать и т. п. https://clickhouse.yandex/docs/ru/data_types/nested_data_structures/aggregatefunction/
+В ClickHouse есть понятие - состояние вычисления агрегатной функции. Состояния агрегатных функций можно записывать в таблицы, складывать, финализировать и т. п. https://clickhouse.com/docs/ru/data_types/nested_data_structures/aggregatefunction/
 
-Получить состояние агрегатной функции можно с помощью комбинатора State: https://clickhouse.yandex/docs/ru/query_language/agg_functions/combinators/#-state Но хотелось бы добавить ещё более простой способ получения состояния агрегатной функции.
+Получить состояние агрегатной функции можно с помощью комбинатора State: https://clickhouse.com/docs/ru/query_language/agg_functions/combinators/#-state Но хотелось бы добавить ещё более простой способ получения состояния агрегатной функции.
 
 Например:
 
@@ -139,7 +139,7 @@ position с конца строки.
 
 ## Возможность использовать ALIAS столбцы при INSERT.
 
-https://clickhouse.yandex/docs/en/query_language/create/#create-table
+https://clickhouse.com/docs/en/query_language/create/#create-table
 
 `INSERT INTO table (column1, column2, ...)`
 
@@ -177,7 +177,7 @@ world │ 123 │
 
 ## Работоспособность внешних данных на время сессии.
 
-https://clickhouse.yandex/docs/en/operations/table_engines/external_data/
+https://clickhouse.com/docs/en/operations/table_engines/external_data/
 
 Не работает, если открыть clickhouse-client в интерактивном режиме и делать несколько запросов.
 
diff --git a/tests/integration/02044_exists_operator.reference b/tests/integration/02044_exists_operator.reference
new file mode 100644
index 00000000000..fa0cdd3e109
--- /dev/null
+++ b/tests/integration/02044_exists_operator.reference
@@ -0,0 +1,17 @@
+-- { echo }
+select exists(select 1);
+1
+select exists(select 1 except select 1);
+0
+select exists(select number from numbers(10) where number > 0);
+1
+select exists(select number from numbers(10) where number < 0);
+0
+select count() from numbers(10) where exists(select 1 except select 1);
+0
+select count() from numbers(10) where exists(select 1 intersect select 1);
+10
+select count() from numbers(10) where exists(select number from numbers(10) where number > 8);
+10
+select count() from numbers(10) where exists(select number from numbers(10) where number > 9);
+0
diff --git a/tests/integration/02044_exists_operator.sql b/tests/integration/02044_exists_operator.sql
new file mode 100644
index 00000000000..bec191ecdaa
--- /dev/null
+++ b/tests/integration/02044_exists_operator.sql
@@ -0,0 +1,11 @@
+-- { echo }
+select exists(select 1);
+select exists(select 1 except select 1);
+select exists(select number from numbers(10) where number > 0);
+select exists(select number from numbers(10) where number < 0);
+
+select count() from numbers(10) where exists(select 1 except select 1);
+select count() from numbers(10) where exists(select 1 intersect select 1);
+
+select count() from numbers(10) where exists(select number from numbers(10) where number > 8);
+select count() from numbers(10) where exists(select number from numbers(10) where number > 9);
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 8c353658705..1b1e7f3e052 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -38,7 +38,7 @@ sudo -H pip install \
     pytest \
     pytest-timeout \
     redis \
-    tzlocal \
+    tzlocal==2.1 \
     urllib3 \
     requests-kerberos \
     dict2xml \
@@ -66,7 +66,7 @@ For tests that use common docker compose files you may need to set up their path
 ### Running with runner script
 
 The only requirement is fresh configured docker and
-docker pull yandex/clickhouse-integration-tests-runner
+docker pull clickhouse/integration-tests-runner
 
 Notes:
 * If you want to run integration tests without `sudo` you have to add your user to docker group `sudo usermod -aG docker $USER`. [More information](https://docs.docker.com/install/linux/linux-postinstall/) about docker configuration.
@@ -122,7 +122,7 @@ You can just open shell inside a container by overwritting the command:
 The main container used for integration tests lives in `docker/test/integration/Dockerfile`. Rebuild it with
 ```
 cd docker/test/integration
-docker build -t yandex/clickhouse-integration-test .
+docker build -t clickhouse/integration-test .
 ```
 
 The helper container used by the `runner` script is in `docker/test/integration/runner/Dockerfile`.
diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
index ecd4cb8d4e7..f17eb84e5f3 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/integration/ci-runner.py
@@ -125,13 +125,13 @@ def clear_ip_tables_and_restart_daemons():
     logging.info("Dump iptables after run %s", subprocess.check_output("iptables -L", shell=True))
     try:
         logging.info("Killing all alive docker containers")
-        subprocess.check_output("docker kill $(docker ps -q)", shell=True)
+        subprocess.check_output("timeout -s 9 10m docker kill $(docker ps -q)", shell=True)
     except subprocess.CalledProcessError as err:
         logging.info("docker kill excepted: " + str(err))
 
     try:
         logging.info("Removing all docker containers")
-        subprocess.check_output("docker rm $(docker ps -a -q) --force", shell=True)
+        subprocess.check_output("timeout -s 9 10m docker rm $(docker ps -a -q) --force", shell=True)
     except subprocess.CalledProcessError as err:
         logging.info("docker rm excepted: " + str(err))
 
@@ -207,11 +207,11 @@ class ClickhouseIntegrationTestsRunner:
 
     @staticmethod
     def get_images_names():
-        return ["yandex/clickhouse-integration-tests-runner", "yandex/clickhouse-mysql-golang-client",
-                "yandex/clickhouse-mysql-java-client", "yandex/clickhouse-mysql-js-client",
-                "yandex/clickhouse-mysql-php-client", "yandex/clickhouse-postgresql-java-client",
-                "yandex/clickhouse-integration-test", "yandex/clickhouse-kerberos-kdc",
-                "yandex/clickhouse-integration-helper", ]
+        return ["clickhouse/integration-tests-runner", "clickhouse/mysql-golang-client",
+                "clickhouse/mysql-java-client", "clickhouse/mysql-js-client",
+                "clickhouse/mysql-php-client", "clickhouse/postgresql-java-client",
+                "clickhouse/integration-test", "clickhouse/kerberos-kdc",
+                "clickhouse/integration-helper", ]
 
 
     def _can_run_with(self, path, opt):
@@ -264,7 +264,7 @@ class ClickhouseIntegrationTestsRunner:
         out_file = "all_tests.txt"
         out_file_full = "all_tests_full.txt"
         cmd = "cd {repo_path}/tests/integration && " \
-            "./runner --tmpfs {image_cmd} ' --setup-plan' " \
+            "timeout -s 9 1h ./runner --tmpfs {image_cmd} ' --setup-plan' " \
             "| tee {out_file_full} | grep '::' | sed 's/ (fixtures used:.*//g' | sed 's/^ *//g' | sed 's/ *$//g' " \
             "| grep -v 'SKIPPED' | sort -u  > {out_file}".format(
                 repo_path=repo_path, image_cmd=image_cmd, out_file=out_file, out_file_full=out_file_full)
@@ -343,7 +343,7 @@ class ClickhouseIntegrationTestsRunner:
         image_cmd = ''
         if self._can_run_with(os.path.join(repo_path, "tests/integration", "runner"), '--docker-image-version'):
             for img in self.get_images_names():
-                if img == "yandex/clickhouse-integration-tests-runner":
+                if img == "clickhouse/integration-tests-runner":
                     runner_version = self.get_single_image_version()
                     logging.info("Can run with custom docker image version %s", runner_version)
                     image_cmd += ' --docker-image-version={} '.format(runner_version)
@@ -376,6 +376,24 @@ class ClickhouseIntegrationTestsRunner:
                 res.add(path)
         return res
 
+    def try_run_test_group(self, repo_path, test_group, tests_in_group, num_tries, num_workers):
+        try:
+            return self.run_test_group(repo_path, test_group, tests_in_group, num_tries, num_workers)
+        except Exception as e:
+            logging.info("Failed to run {}:\n{}".format(str(test_group), str(e)))
+            counters = {
+                "ERROR": [],
+                "PASSED": [],
+                "FAILED": [],
+                "SKIPPED": [],
+                "FLAKY": [],
+            }
+            tests_times = defaultdict(float)
+            for test in tests_in_group:
+                counters["ERROR"].append(test)
+                tests_times[test] = 0
+            return counters, tests_times, []
+
     def run_test_group(self, repo_path, test_group, tests_in_group, num_tries, num_workers):
         counters = {
             "ERROR": [],
@@ -419,7 +437,7 @@ class ClickhouseIntegrationTestsRunner:
 
             test_cmd = ' '.join([test for test in sorted(test_names)])
             parallel_cmd = " --parallel {} ".format(num_workers) if num_workers > 0 else ""
-            cmd = "cd {}/tests/integration && ./runner --tmpfs {} -t {} {} '-rfEp --run-id={} --color=no --durations=0 {}' | tee {}".format(
+            cmd = "cd {}/tests/integration && timeout -s 9 1h ./runner --tmpfs {} -t {} {} '-rfEp --run-id={} --color=no --durations=0 {}' | tee {}".format(
                 repo_path, image_cmd, test_cmd, parallel_cmd, i, _get_deselect_option(self.should_skip_tests()), info_path)
 
             log_basename = test_group_str + "_" + str(i) + ".log"
@@ -507,7 +525,7 @@ class ClickhouseIntegrationTestsRunner:
         for i in range(TRIES_COUNT):
             final_retry += 1
             logging.info("Running tests for the %s time", i)
-            counters, tests_times, log_paths = self.run_test_group(repo_path, "flaky", tests_to_run, 1, 1)
+            counters, tests_times, log_paths = self.try_run_test_group(repo_path, "flaky", tests_to_run, 1, 1)
             logs += log_paths
             if counters["FAILED"]:
                 logging.info("Found failed tests: %s", ' '.join(counters["FAILED"]))
@@ -583,7 +601,7 @@ class ClickhouseIntegrationTestsRunner:
 
         for group, tests in items_to_run:
             logging.info("Running test group %s countaining %s tests", group, len(tests))
-            group_counters, group_test_times, log_paths = self.run_test_group(repo_path, group, tests, MAX_RETRY, NUM_WORKERS)
+            group_counters, group_test_times, log_paths = self.try_run_test_group(repo_path, group, tests, MAX_RETRY, NUM_WORKERS)
             total_tests = 0
             for counter, value in group_counters.items():
                 logging.info("Tests from group %s stats, %s count %s", group, counter, len(value))
diff --git a/tests/integration/helpers/0_common_instance_config.xml b/tests/integration/helpers/0_common_instance_config.xml
index 717f6db7e4b..c848ebdf45c 100644
--- a/tests/integration/helpers/0_common_instance_config.xml
+++ b/tests/integration/helpers/0_common_instance_config.xml
@@ -9,7 +9,7 @@
     <users_config>users.xml</users_config>
 
   <logger>
-        <level>trace</level>
+        <level>test</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
         <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
         <size>1000M</size>
diff --git a/tests/integration/helpers/client.py b/tests/integration/helpers/client.py
index ceebf3c23bf..b0e764bf174 100644
--- a/tests/integration/helpers/client.py
+++ b/tests/integration/helpers/client.py
@@ -16,13 +16,34 @@ class Client:
 
         self.command += ['--host', self.host, '--port', str(self.port), '--stacktrace']
 
-    def query(self, sql, stdin=None, timeout=None, settings=None, user=None, password=None, database=None,
-              ignore_error=False):
-        return self.get_query_request(sql, stdin=stdin, timeout=timeout, settings=settings, user=user,
-                                      password=password, database=database, ignore_error=ignore_error).get_answer()
+    def query(self, sql,
+              stdin=None,
+              timeout=None,
+              settings=None,
+              user=None,
+              password=None,
+              database=None,
+              ignore_error=False,
+              query_id=None):
+        return self.get_query_request(sql,
+                                      stdin=stdin,
+                                      timeout=timeout,
+                                      settings=settings,
+                                      user=user,
+                                      password=password,
+                                      database=database,
+                                      ignore_error=ignore_error,
+                                      query_id=query_id).get_answer()
 
-    def get_query_request(self, sql, stdin=None, timeout=None, settings=None, user=None, password=None, database=None,
-                          ignore_error=False):
+    def get_query_request(self, sql,
+                          stdin=None,
+                          timeout=None,
+                          settings=None,
+                          user=None,
+                          password=None,
+                          database=None,
+                          ignore_error=False,
+                          query_id=None):
         command = self.command[:]
 
         if stdin is None:
@@ -44,6 +65,9 @@ class Client:
         if database is not None:
             command += ['--database', database]
 
+        if query_id is not None:
+            command += ['--query_id', query_id]
+
         return CommandRequest(command, stdin, timeout, ignore_error)
 
     def query_and_get_error(self, sql, stdin=None, timeout=None, settings=None, user=None, password=None,
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index 6fe01b5df03..9d7657d3a83 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -267,6 +267,7 @@ class ClickHouseCluster:
         self.with_redis = False
         self.with_cassandra = False
         self.with_jdbc_bridge = False
+        self.with_nginx = False
 
         self.with_minio = False
         self.minio_dir = os.path.join(self.instances_dir, "minio")
@@ -328,6 +329,11 @@ class ClickHouseCluster:
         self.rabbitmq_dir = p.abspath(p.join(self.instances_dir, "rabbitmq"))
         self.rabbitmq_logs_dir = os.path.join(self.rabbitmq_dir, "logs")
 
+        # available when with_nginx == True
+        self.nginx_host = "nginx"
+        self.nginx_ip = None
+        self.nginx_port = 80
+        self.nginx_id = self.get_instance_docker_id(self.nginx_host)
 
         # available when with_redis == True
         self.redis_host = "redis1"
@@ -474,6 +480,11 @@ class ClickHouseCluster:
             cmd += " client"
         return cmd
 
+    def copy_file_from_container_to_container(self, src_node, src_path, dst_node, dst_path):
+        fname = os.path.basename(src_path)
+        run_and_check([f"docker cp {src_node.docker_id}:{src_path} {self.instances_dir}"], shell=True)
+        run_and_check([f"docker cp {self.instances_dir}/{fname} {dst_node.docker_id}:{dst_path}"], shell=True)
+
     def setup_zookeeper_secure_cmd(self, instance, env_variables, docker_compose_yml_dir):
         logging.debug('Setup ZooKeeper Secure')
         zookeeper_docker_compose_path = p.join(docker_compose_yml_dir, 'docker_compose_zookeeper_secure.yml')
@@ -521,7 +532,7 @@ class ClickHouseCluster:
             binary_path = binary_path[:-len('-server')]
 
         env_variables['keeper_binary'] = binary_path
-        env_variables['image'] = "yandex/clickhouse-integration-test:" + self.docker_base_tag
+        env_variables['image'] = "clickhouse/integration-test:" + self.docker_base_tag
         env_variables['user'] = str(os.getuid())
         env_variables['keeper_fs'] = 'bind'
         for i in range(1, 4):
@@ -731,17 +742,25 @@ class ClickHouseCluster:
                                     '--file', p.join(docker_compose_yml_dir, 'docker_compose_jdbc_bridge.yml')]
         return self.base_jdbc_bridge_cmd
 
+    def setup_nginx_cmd(self, instance, env_variables, docker_compose_yml_dir):
+        self.with_nginx = True
+
+        self.base_cmd.extend(['--file', p.join(docker_compose_yml_dir, 'docker_compose_nginx.yml')])
+        self.base_nginx_cmd = ['docker-compose', '--env-file', instance.env_file, '--project-name', self.project_name,
+                                    '--file', p.join(docker_compose_yml_dir, 'docker_compose_nginx.yml')]
+        return self.base_nginx_cmd
+
     def add_instance(self, name, base_config_dir=None, main_configs=None, user_configs=None, dictionaries=None,
                      macros=None, with_zookeeper=False, with_zookeeper_secure=False,
                      with_mysql_client=False, with_mysql=False, with_mysql8=False, with_mysql_cluster=False,
                      with_kafka=False, with_kerberized_kafka=False, with_rabbitmq=False, clickhouse_path_dir=None,
                      with_odbc_drivers=False, with_postgres=False, with_postgres_cluster=False, with_hdfs=False,
-                     with_kerberized_hdfs=False, with_mongo=False, with_mongo_secure=False,
+                     with_kerberized_hdfs=False, with_mongo=False, with_mongo_secure=False, with_nginx=False,
                      with_redis=False, with_minio=False, with_cassandra=False, with_jdbc_bridge=False,
-                     hostname=None, env_variables=None, image="yandex/clickhouse-integration-test", tag=None,
+                     hostname=None, env_variables=None, image="clickhouse/integration-test", tag=None,
                      stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None,
                      zookeeper_docker_compose_path=None, minio_certs_dir=None, use_keeper=True,
-                     main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True):
+                     main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True, config_root_name="yandex"):
 
         """Add an instance to the cluster.
 
@@ -788,6 +807,7 @@ class ClickHouseCluster:
             with_kafka=with_kafka,
             with_kerberized_kafka=with_kerberized_kafka,
             with_rabbitmq=with_rabbitmq,
+            with_nginx=with_nginx,
             with_kerberized_hdfs=with_kerberized_hdfs,
             with_mongo=with_mongo or with_mongo_secure,
             with_redis=with_redis,
@@ -812,7 +832,8 @@ class ClickHouseCluster:
             main_config_name=main_config_name,
             users_config_name=users_config_name,
             copy_common_configs=copy_common_configs,
-            tmpfs=tmpfs or [])
+            tmpfs=tmpfs or [],
+            config_root_name=config_root_name)
 
         docker_compose_yml_dir = get_docker_compose_path()
 
@@ -868,6 +889,9 @@ class ClickHouseCluster:
         if with_rabbitmq and not self.with_rabbitmq:
             cmds.append(self.setup_rabbitmq_cmd(instance, env_variables, docker_compose_yml_dir))
 
+        if with_nginx and not self.with_nginx:
+            cmds.append(self.setup_nginx_cmd(instance, env_variables, docker_compose_yml_dir))
+
         if with_hdfs and not self.with_hdfs:
             cmds.append(self.setup_hdfs_cmd(instance, env_variables, docker_compose_yml_dir))
 
@@ -1026,7 +1050,7 @@ class ClickHouseCluster:
                 errors += [str(ex)]
                 time.sleep(interval)
 
-        run_and_check(['docker-compose', 'ps', '--services', '--all'])
+        run_and_check(['docker', 'ps', '--all'])
         logging.error("Can't connect to URL:{}".format(errors))
         raise Exception("Cannot wait URL {}(interval={}, timeout={}, attempts={})".format(
             url, interval, timeout, attempts))
@@ -1182,6 +1206,20 @@ class ClickHouseCluster:
             raise Exception("Cannot wait RabbitMQ container")
         return False
 
+    def wait_nginx_to_start(self, timeout=60):
+        self.nginx_ip = self.get_instance_ip(self.nginx_host)
+        start = time.time()
+        while time.time() - start < timeout:
+            try:
+                self.exec_in_container(self.nginx_id, ["curl", "-X", "PUT", "-d", "Test", "http://test.com/test.txt"])
+                res = self.exec_in_container(self.nginx_id, ["curl", "-X", "GET", "http://test.com/test.txt"])
+                assert(res == 'Test')
+                print('nginx static files server is available')
+                return
+            except Exception as ex:
+                print("Can't connect to nginx: " + str(ex))
+                time.sleep(0.5)
+
     def wait_zookeeper_secure_to_start(self, timeout=20):
         logging.debug("Wait ZooKeeper Secure to start")
         start = time.time()
@@ -1222,6 +1260,7 @@ class ClickHouseCluster:
             krb_conf = p.abspath(p.join(self.instances['node1'].path, "secrets/krb_long.conf"))
             self.hdfs_kerberized_ip = self.get_instance_ip(self.hdfs_kerberized_host)
             kdc_ip = self.get_instance_ip('hdfskerberos')
+
             self.hdfs_api = HDFSApi(user="root",
                                     timeout=timeout,
                                     kerberized=True,
@@ -1395,6 +1434,7 @@ class ClickHouseCluster:
                 for dir in self.zookeeper_dirs_to_create:
                     os.makedirs(dir)
                 run_and_check(self.base_zookeeper_cmd + common_opts, env=self.env)
+                self.up_called = True
 
                 self.wait_zookeeper_secure_to_start()
                 for command in self.pre_zookeeper_commands:
@@ -1420,6 +1460,7 @@ class ClickHouseCluster:
                         shutil.copy(os.path.join(HELPERS_DIR, f'keeper_config{i}.xml'), os.path.join(self.keeper_instance_dir_prefix + f"{i}", "config" ))
 
                 run_and_check(self.base_zookeeper_cmd + common_opts, env=self.env)
+                self.up_called = True
 
                 self.wait_zookeeper_to_start()
                 for command in self.pre_zookeeper_commands:
@@ -1437,6 +1478,7 @@ class ClickHouseCluster:
                 os.makedirs(self.mysql_logs_dir)
                 os.chmod(self.mysql_logs_dir, stat.S_IRWXO)
                 subprocess_check_call(self.base_mysql_cmd + common_opts)
+                self.up_called = True
                 self.wait_mysql_to_start()
 
             if self.with_mysql8 and self.base_mysql8_cmd:
@@ -1456,6 +1498,7 @@ class ClickHouseCluster:
                 os.chmod(self.mysql_cluster_logs_dir, stat.S_IRWXO)
 
                 subprocess_check_call(self.base_mysql_cluster_cmd + common_opts)
+                self.up_called = True
                 self.wait_mysql_cluster_to_start()
 
             if self.with_postgres and self.base_postgres_cmd:
@@ -1466,6 +1509,7 @@ class ClickHouseCluster:
                 os.chmod(self.postgres_logs_dir, stat.S_IRWXO)
 
                 subprocess_check_call(self.base_postgres_cmd + common_opts)
+                self.up_called = True
                 self.wait_postgres_to_start()
 
             if self.with_postgres_cluster and self.base_postgres_cluster_cmd:
@@ -1477,17 +1521,20 @@ class ClickHouseCluster:
                 os.makedirs(self.postgres4_logs_dir)
                 os.chmod(self.postgres4_logs_dir, stat.S_IRWXO)
                 subprocess_check_call(self.base_postgres_cluster_cmd + common_opts)
+                self.up_called = True
                 self.wait_postgres_cluster_to_start()
 
             if self.with_kafka and self.base_kafka_cmd:
                 logging.debug('Setup Kafka')
                 subprocess_check_call(self.base_kafka_cmd + common_opts + ['--renew-anon-volumes'])
+                self.up_called = True
                 self.wait_kafka_is_available(self.kafka_docker_id, self.kafka_port)
                 self.wait_schema_registry_to_start()
 
             if self.with_kerberized_kafka and self.base_kerberized_kafka_cmd:
                 logging.debug('Setup kerberized kafka')
                 run_and_check(self.base_kerberized_kafka_cmd + common_opts + ['--renew-anon-volumes'])
+                self.up_called = True
                 self.wait_kafka_is_available(self.kerberized_kafka_docker_id, self.kerberized_kafka_port, 100)
 
             if self.with_rabbitmq and self.base_rabbitmq_cmd:
@@ -1497,6 +1544,7 @@ class ClickHouseCluster:
 
                 for i in range(5):
                     subprocess_check_call(self.base_rabbitmq_cmd + common_opts + ['--renew-anon-volumes'])
+                    self.up_called = True
                     self.rabbitmq_docker_id = self.get_instance_docker_id('rabbitmq1')
                     logging.debug(f"RabbitMQ checking container try: {i}")
                     if self.wait_rabbitmq_to_start(throw=(i==4)):
@@ -1507,6 +1555,7 @@ class ClickHouseCluster:
                 os.makedirs(self.hdfs_logs_dir)
                 os.chmod(self.hdfs_logs_dir, stat.S_IRWXO)
                 subprocess_check_call(self.base_hdfs_cmd + common_opts)
+                self.up_called = True
                 self.make_hdfs_api()
                 self.wait_hdfs_to_start()
 
@@ -1515,17 +1564,27 @@ class ClickHouseCluster:
                 os.makedirs(self.hdfs_kerberized_logs_dir)
                 os.chmod(self.hdfs_kerberized_logs_dir, stat.S_IRWXO)
                 run_and_check(self.base_kerberized_hdfs_cmd + common_opts)
+                self.up_called = True
                 self.make_hdfs_api(kerberized=True)
                 self.wait_hdfs_to_start(check_marker=True)
 
+            if self.with_nginx and self.base_nginx_cmd:
+                logging.debug('Setup nginx')
+                subprocess_check_call(self.base_nginx_cmd + common_opts + ['--renew-anon-volumes'])
+                self.up_called = True
+                self.nginx_docker_id = self.get_instance_docker_id('nginx')
+                self.wait_nginx_to_start()
+
             if self.with_mongo and self.base_mongo_cmd:
                 logging.debug('Setup Mongo')
                 run_and_check(self.base_mongo_cmd + common_opts)
+                self.up_called = True
                 self.wait_mongo_to_start(30, secure=self.with_mongo_secure)
 
             if self.with_redis and self.base_redis_cmd:
                 logging.debug('Setup Redis')
                 subprocess_check_call(self.base_redis_cmd + common_opts)
+                self.up_called = True
                 time.sleep(10)
 
             if self.with_minio and self.base_minio_cmd:
@@ -1540,11 +1599,13 @@ class ClickHouseCluster:
 
                 logging.info("Trying to create Minio instance by command %s", ' '.join(map(str, minio_start_cmd)))
                 run_and_check(minio_start_cmd)
+                self.up_called = True
                 logging.info("Trying to connect to Minio...")
                 self.wait_minio_to_start(secure=self.minio_certs_dir is not None)
 
             if self.with_cassandra and self.base_cassandra_cmd:
                 subprocess_check_call(self.base_cassandra_cmd + ['up', '-d'])
+                self.up_called = True
                 self.wait_cassandra_to_start()
 
             if self.with_jdbc_bridge and self.base_jdbc_bridge_cmd:
@@ -1552,6 +1613,7 @@ class ClickHouseCluster:
                 os.chmod(self.jdbc_driver_logs_dir, stat.S_IRWXO)
 
                 subprocess_check_call(self.base_jdbc_bridge_cmd + ['up', '-d'])
+                self.up_called = True
                 self.jdbc_bridge_ip = self.get_instance_ip(self.jdbc_bridge_host)
                 self.wait_for_url(f"http://{self.jdbc_bridge_ip}:{self.jdbc_bridge_port}/ping")
 
@@ -1584,6 +1646,7 @@ class ClickHouseCluster:
     def shutdown(self, kill=True):
         sanitizer_assert_instance = None
         fatal_log = None
+
         if self.up_called:
             with open(self.docker_logs_path, "w+") as f:
                 try:
@@ -1596,20 +1659,6 @@ class ClickHouseCluster:
                         sanitizer_assert_instance = line.split('|')[0].strip()
                         break
 
-            for name, instance in self.instances.items():
-                try:
-                    if not instance.is_up:
-                        continue
-                    if instance.contains_in_log(SANITIZER_SIGN):
-                        sanitizer_assert_instance = instance.grep_in_log(SANITIZER_SIGN)
-                        logging.ERROR(f"Sanitizer in instance {name} log {sanitizer_assert_instance}")
-
-                    if instance.contains_in_log("Fatal"):
-                        fatal_log = instance.grep_in_log("Fatal")
-                        logging.ERROR(f"Crash in instance {name} fatal log {fatal_log}")
-                except Exception as e:
-                    logging.error(f"Failed to check fails in logs: {e}")
-
             if kill:
                 try:
                     run_and_check(self.base_cmd + ['stop', '--timeout', '20'])
@@ -1618,10 +1667,26 @@ class ClickHouseCluster:
                     logging.debug("Trying to kill forcefully")
                     run_and_check(self.base_cmd + ['kill'])
 
+            # Check server logs for Fatal messages and sanitizer failures.
+            # NOTE: we cannot do this via docker since in case of Fatal message container may already die.
+            for name, instance in self.instances.items():
+                if instance.contains_in_log(SANITIZER_SIGN, from_host=True):
+                    sanitizer_assert_instance = instance.grep_in_log(SANITIZER_SIGN, from_host=True)
+                    logging.error("Sanitizer in instance %s log %s", name, sanitizer_assert_instance)
+
+                if instance.contains_in_log("Fatal", from_host=True):
+                    fatal_log = instance.grep_in_log("Fatal", from_host=True)
+                    if 'Child process was terminated by signal 9 (KILL)' in fatal_log:
+                        fatal_log = None
+                        continue
+                    logging.error("Crash in instance %s fatal log %s", name, fatal_log)
+
             try:
                 subprocess_check_call(self.base_cmd + ['down', '--volumes'])
             except Exception as e:
                 logging.debug("Down + remove orphans failed durung shutdown. {}".format(repr(e)))
+        else:
+            logging.warning("docker-compose up was not called. Trying to export docker.log for running containers")
 
         self.cleanup()
 
@@ -1637,6 +1702,8 @@ class ClickHouseCluster:
         if sanitizer_assert_instance is not None:
             raise Exception(
                 "Sanitizer assert found in {} for instance {}".format(self.docker_logs_path, sanitizer_assert_instance))
+        if fatal_log is not None:
+            raise Exception("Fatal messages found: {}".format(fatal_log))
 
 
     def pause_container(self, instance_name):
@@ -1700,8 +1767,9 @@ CLICKHOUSE_START_COMMAND = "clickhouse server --config-file=/etc/clickhouse-serv
                            " --log-file=/var/log/clickhouse-server/clickhouse-server.log " \
                            " --errorlog-file=/var/log/clickhouse-server/clickhouse-server.err.log"
 
-CLICKHOUSE_STAY_ALIVE_COMMAND = 'bash -c "{} --daemon; tail -f /dev/null"'.format(CLICKHOUSE_START_COMMAND)
+CLICKHOUSE_STAY_ALIVE_COMMAND = 'bash -c "trap \'killall tail\' INT TERM; {} --daemon; coproc tail -f /dev/null; wait $$!"'.format(CLICKHOUSE_START_COMMAND)
 
+# /run/xtables.lock passed inside for correct iptables --wait
 DOCKER_COMPOSE_TEMPLATE = '''
 version: '2.3'
 services:
@@ -1713,6 +1781,7 @@ services:
             - {db_dir}:/var/lib/clickhouse/
             - {logs_dir}:/var/log/clickhouse-server/
             - /etc/passwd:/etc/passwd:ro
+            - /run/xtables.lock:/run/xtables.lock:ro
             {binary_volume}
             {odbc_bridge_volume}
             {library_bridge_volume}
@@ -1752,13 +1821,13 @@ class ClickHouseInstance:
             self, cluster, base_path, name, base_config_dir, custom_main_configs, custom_user_configs,
             custom_dictionaries,
             macros, with_zookeeper, zookeeper_config_path, with_mysql_client,  with_mysql, with_mysql8, with_mysql_cluster, with_kafka, with_kerberized_kafka,
-            with_rabbitmq, with_kerberized_hdfs, with_mongo, with_redis, with_minio, with_jdbc_bridge,
+            with_rabbitmq, with_nginx, with_kerberized_hdfs, with_mongo, with_redis, with_minio, with_jdbc_bridge,
             with_cassandra, server_bin_path, odbc_bridge_bin_path, library_bridge_bin_path, clickhouse_path_dir, with_odbc_drivers, with_postgres, with_postgres_cluster,
             clickhouse_start_command=CLICKHOUSE_START_COMMAND,
             main_config_name="config.xml", users_config_name="users.xml", copy_common_configs=True,
             hostname=None, env_variables=None,
-            image="yandex/clickhouse-integration-test", tag="latest",
-            stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None):
+            image="clickhouse/integration-test", tag="latest",
+            stay_alive=False, ipv4_address=None, ipv6_address=None, with_installed_binary=False, tmpfs=None, config_root_name="yandex"):
 
         self.name = name
         self.base_cmd = cluster.base_cmd
@@ -1790,6 +1859,7 @@ class ClickHouseInstance:
         self.with_kafka = with_kafka
         self.with_kerberized_kafka = with_kerberized_kafka
         self.with_rabbitmq = with_rabbitmq
+        self.with_nginx = with_nginx
         self.with_kerberized_hdfs = with_kerberized_hdfs
         self.with_mongo = with_mongo
         self.with_redis = with_redis
@@ -1830,12 +1900,17 @@ class ClickHouseInstance:
         self.ipv6_address = ipv6_address
         self.with_installed_binary = with_installed_binary
         self.is_up = False
+        self.config_root_name = config_root_name
 
 
     def is_built_with_sanitizer(self, sanitizer_name=''):
         build_opts = self.query("SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'")
         return "-fsanitize={}".format(sanitizer_name) in build_opts
 
+    def is_debug_build(self):
+        build_opts = self.query("SELECT value FROM system.build_options WHERE name = 'CXX_FLAGS'")
+        return 'NDEBUG' not in build_opts
+
     def is_built_with_thread_sanitizer(self):
         return self.is_built_with_sanitizer('thread')
 
@@ -1846,11 +1921,25 @@ class ClickHouseInstance:
         return self.is_built_with_sanitizer('memory')
 
     # Connects to the instance via clickhouse-client, sends a query (1st argument) and returns the answer
-    def query(self, sql, stdin=None, timeout=None, settings=None, user=None, password=None, database=None,
-              ignore_error=False):
-        logging.debug(f"Executing query {sql} on {self.name}")
-        return self.client.query(sql, stdin=stdin, timeout=timeout, settings=settings, user=user, password=password,
-                                 database=database, ignore_error=ignore_error)
+    def query(self, sql,
+              stdin=None,
+              timeout=None,
+              settings=None,
+              user=None,
+              password=None,
+              database=None,
+              ignore_error=False,
+              query_id=None):
+        logging.debug("Executing query %s on %s", sql, self.name)
+        return self.client.query(sql,
+                                 stdin=stdin,
+                                 timeout=timeout,
+                                 settings=settings,
+                                 user=user,
+                                 password=password,
+                                 database=database,
+                                 ignore_error=ignore_error,
+                                 query_id=query_id)
 
     def query_with_retry(self, sql, stdin=None, timeout=None, settings=None, user=None, password=None, database=None,
                          ignore_error=False,
@@ -1948,9 +2037,18 @@ class ClickHouseInstance:
                 return
 
             self.exec_in_container(["bash", "-c", "pkill {} clickhouse".format("-9" if kill else "")], user='root')
-            time.sleep(stop_wait_sec)
-            ps_clickhouse = self.exec_in_container(["bash", "-c", "ps -C clickhouse"], user='root')
-            if ps_clickhouse != "  PID TTY      STAT   TIME COMMAND" :
+
+            sleep_time = 0.1
+            num_steps = int(stop_wait_sec / sleep_time)
+            stopped = False
+            for step in range(num_steps):
+                time.sleep(sleep_time)
+                ps_clickhouse = self.exec_in_container(["bash", "-c", "ps -C clickhouse"], user='root')
+                if ps_clickhouse == "  PID TTY      STAT   TIME COMMAND":
+                    stopped = True
+                    break
+
+            if not stopped:
                 logging.warning(f"Force kill clickhouse in stop_clickhouse. ps:{ps_clickhouse}")
                 self.stop_clickhouse(kill=True)
         except Exception as e:
@@ -1958,12 +2056,31 @@ class ClickHouseInstance:
 
     def start_clickhouse(self, start_wait_sec=30):
         if not self.stay_alive:
-            raise Exception("clickhouse can be started again only with stay_alive=True instance")
+            raise Exception("ClickHouse can be started again only with stay_alive=True instance")
+
+        time_to_sleep = 0.5
+        start_tries = 5
+
+        total_tries = int(start_wait_sec / time_to_sleep)
+        query_tries = int(total_tries / start_tries)
+
+        for i in range(start_tries):
+            # sometimes after SIGKILL (hard reset) server may refuse to start for some time
+            # for different reasons.
+            self.exec_in_container(["bash", "-c", "{} --daemon".format(self.clickhouse_start_command)], user=str(os.getuid()))
+            started = False
+            for _ in range(query_tries):
+                try:
+                    self.query("select 1")
+                    started = True
+                    break
+                except:
+                    time.sleep(time_to_sleep)
+            if started:
+                break
+        else:
+            raise Exception("Cannot start ClickHouse, see additional info in logs")
 
-        self.exec_in_container(["bash", "-c", "{} --daemon".format(self.clickhouse_start_command)], user=str(os.getuid()))
-        # wait start
-        from helpers.test_tools import assert_eq_with_retry
-        assert_eq_with_retry(self, "select 1", "1", retry_count=int(start_wait_sec / 0.5), sleep_time=0.5)
 
     def restart_clickhouse(self, stop_start_wait_sec=30, kill=False):
         self.stop_clickhouse(stop_start_wait_sec, kill)
@@ -1972,21 +2089,33 @@ class ClickHouseInstance:
     def exec_in_container(self, cmd, detach=False, nothrow=False, **kwargs):
         return self.cluster.exec_in_container(self.docker_id, cmd, detach, nothrow, **kwargs)
 
-    def contains_in_log(self, substring):
-        result = self.exec_in_container(
-            ["bash", "-c", '[ -f /var/log/clickhouse-server/clickhouse-server.log ] && grep "{}" /var/log/clickhouse-server/clickhouse-server.log || true'.format(substring)])
+    def contains_in_log(self, substring, from_host=False):
+        if from_host:
+            result = subprocess_check_call(["bash", "-c",
+                f'[ -f {self.logs_dir}/clickhouse-server.log ] && grep -a "{substring}" {self.logs_dir}/clickhouse-server.log || true'
+            ])
+        else:
+            result = self.exec_in_container(["bash", "-c",
+                f'[ -f /var/log/clickhouse-server/clickhouse-server.log ] && grep -a "{substring}" /var/log/clickhouse-server/clickhouse-server.log || true'
+            ])
         return len(result) > 0
 
-    def grep_in_log(self, substring):
-        logging.debug(f"grep in log called {substring}")
-        result = self.exec_in_container(
-            ["bash", "-c", 'grep "{}" /var/log/clickhouse-server/clickhouse-server.log || true'.format(substring)])
-        logging.debug(f"grep result {result}")
+    def grep_in_log(self, substring, from_host=False):
+        logging.debug(f"grep in log called %s", substring)
+        if from_host:
+            result = subprocess_check_call(["bash", "-c",
+                f'grep -a "{substring}" {self.logs_dir}/clickhouse-server.log || true'
+            ])
+        else:
+            result = self.exec_in_container(["bash", "-c",
+                f'grep -a "{substring}" /var/log/clickhouse-server/clickhouse-server.log || true'
+            ])
+        logging.debug("grep result %s", result)
         return result
 
     def count_in_log(self, substring):
         result = self.exec_in_container(
-            ["bash", "-c", 'grep "{}" /var/log/clickhouse-server/clickhouse-server.log | wc -l'.format(substring)])
+            ["bash", "-c", 'grep -a "{}" /var/log/clickhouse-server/clickhouse-server.log | wc -l'.format(substring)])
         return result
 
     def wait_for_log_line(self, regexp, filename='/var/log/clickhouse-server/clickhouse-server.log', timeout=30, repetitions=1, look_behind_lines=100):
@@ -2024,6 +2153,37 @@ class ClickHouseInstance:
                 return None
         return None
 
+    def restart_with_original_version(self, stop_start_wait_sec=300, callback_onstop=None, signal=15):
+        if not self.stay_alive:
+            raise Exception("Cannot restart not stay alive container")
+        self.exec_in_container(["bash", "-c", "pkill -{} clickhouse".format(signal)], user='root')
+        retries = int(stop_start_wait_sec / 0.5)
+        local_counter = 0
+        # wait stop
+        while local_counter < retries:
+            if not self.get_process_pid("clickhouse server"):
+                break
+            time.sleep(0.5)
+            local_counter += 1
+
+        # force kill if server hangs
+        if self.get_process_pid("clickhouse server"):
+            # server can die before kill, so don't throw exception, it's expected
+            self.exec_in_container(["bash", "-c", "pkill -{} clickhouse".format(9)], nothrow=True, user='root')
+
+        if callback_onstop:
+            callback_onstop(self)
+        self.exec_in_container(
+            ["bash", "-c", "cp /usr/share/clickhouse_original /usr/bin/clickhouse && chmod 777 /usr/bin/clickhouse"],
+            user='root')
+        self.exec_in_container(["bash", "-c",
+                                "cp /usr/share/clickhouse-odbc-bridge_fresh /usr/bin/clickhouse-odbc-bridge && chmod 777 /usr/bin/clickhouse"],
+                               user='root')
+        self.exec_in_container(["bash", "-c", "{} --daemon".format(self.clickhouse_start_command)], user=str(os.getuid()))
+
+        # wait start
+        assert_eq_with_retry(self, "select 1", "1", retry_count=retries)
+
     def restart_with_latest_version(self, stop_start_wait_sec=300, callback_onstop=None, signal=15):
         if not self.stay_alive:
             raise Exception("Cannot restart not stay alive container")
@@ -2044,6 +2204,9 @@ class ClickHouseInstance:
 
         if callback_onstop:
             callback_onstop(self)
+        self.exec_in_container(
+            ["bash", "-c", "cp /usr/bin/clickhouse /usr/share/clickhouse_original"],
+            user='root')
         self.exec_in_container(
             ["bash", "-c", "cp /usr/share/clickhouse_fresh /usr/bin/clickhouse && chmod 777 /usr/bin/clickhouse"],
             user='root')
@@ -2124,9 +2287,8 @@ class ClickHouseInstance:
             finally:
                 sock.close()
 
-    @staticmethod
-    def dict_to_xml(dictionary):
-        xml_str = dict2xml(dictionary, wrap="yandex", indent="  ", newlines=True)
+    def dict_to_xml(self, dictionary):
+        xml_str = dict2xml(dictionary, wrap=self.config_root_name, indent="  ", newlines=True)
         return xml_str
 
     @property
@@ -2177,6 +2339,9 @@ class ClickHouseInstance:
     def replace_config(self, path_to_config, replacement):
         self.exec_in_container(["bash", "-c", "echo '{}' > {}".format(replacement, path_to_config)])
 
+    def replace_in_config(self, path_to_config, replace, replacement):
+        self.exec_in_container(["bash", "-c", f"sed -i 's/{replace}/{replacement}/g' {path_to_config}"])
+
     def create_dir(self, destroy_dir=True):
         """Create the instance directory and all the needed files there."""
 
@@ -2195,6 +2360,11 @@ class ClickHouseInstance:
         shutil.copyfile(p.join(self.base_config_dir, self.main_config_name), p.join(instance_config_dir, self.main_config_name))
         shutil.copyfile(p.join(self.base_config_dir, self.users_config_name), p.join(instance_config_dir, self.users_config_name))
 
+        # For old images, keep 'yandex' as root element name.
+        if self.image.startswith('yandex/'):
+            os.system("sed -i 's!<clickhouse>!<yandex>!; s!</clickhouse>!</yandex>!;' '{}'".format(p.join(instance_config_dir, self.main_config_name)))
+            os.system("sed -i 's!<clickhouse>!<yandex>!; s!</clickhouse>!</yandex>!;' '{}'".format(p.join(instance_config_dir, self.users_config_name)))
+
         logging.debug("Create directory for configuration generated in this helper")
         # used by all utils with any config
         conf_d_dir = p.abspath(p.join(instance_config_dir, 'conf.d'))
@@ -2209,15 +2379,25 @@ class ClickHouseInstance:
         dictionaries_dir = p.abspath(p.join(instance_config_dir, 'dictionaries'))
         os.mkdir(dictionaries_dir)
 
+        def write_embedded_config(name, dest_dir, fix_log_level=False):
+            with open(p.join(HELPERS_DIR, name), 'r') as f:
+                data = f.read()
+                data = data.replace('yandex', self.config_root_name)
+                if fix_log_level:
+                    data = data.replace('<level>test</level>', '<level>trace</level>')
+                with open(p.join(dest_dir, name), 'w') as r:
+                    r.write(data)
 
         logging.debug("Copy common configuration from helpers")
         # The file is named with 0_ prefix to be processed before other configuration overloads.
         if self.copy_common_configs:
-            shutil.copy(p.join(HELPERS_DIR, '0_common_instance_config.xml'), self.config_d_dir)
+            need_fix_log_level = self.tag != 'latest'
+            write_embedded_config('0_common_instance_config.xml', self.config_d_dir, need_fix_log_level)
+
+        write_embedded_config('0_common_instance_users.xml', users_d_dir)
 
-        shutil.copy(p.join(HELPERS_DIR, '0_common_instance_users.xml'), users_d_dir)
         if len(self.custom_dictionaries_paths):
-            shutil.copy(p.join(HELPERS_DIR, '0_common_enable_dictionaries.xml'), self.config_d_dir)
+            write_embedded_config('0_common_enable_dictionaries.xml', self.config_d_dir)
 
         logging.debug("Generate and write macros file")
         macros = self.macros.copy()
@@ -2257,6 +2437,7 @@ class ClickHouseInstance:
         logs_dir = p.abspath(p.join(self.path, 'logs'))
         logging.debug(f"Setup logs dir {logs_dir}")
         os.mkdir(logs_dir)
+        self.logs_dir = logs_dir
 
         depends_on = []
 
@@ -2312,6 +2493,8 @@ class ClickHouseInstance:
 
         if self.stay_alive:
             entrypoint_cmd = CLICKHOUSE_STAY_ALIVE_COMMAND.replace("{main_config_file}", self.main_config_name)
+        else:
+            entrypoint_cmd = '[' + ', '.join(map(lambda x: '"' + x + '"', entrypoint_cmd.split())) + ']'
 
         logging.debug("Entrypoint cmd: {}".format(entrypoint_cmd))
 
diff --git a/tests/integration/helpers/dictionary.py b/tests/integration/helpers/dictionary.py
index b32b516d82c..99c4e3a5a5d 100644
--- a/tests/integration/helpers/dictionary.py
+++ b/tests/integration/helpers/dictionary.py
@@ -316,7 +316,7 @@ class Dictionary(object):
         with open(self.config_path, 'w') as result:
             if 'direct' not in self.structure.layout.get_str():
                 result.write('''
-                <yandex>
+                <clickhouse>
                 <dictionary>
                     <lifetime>
                         <min>{min_lifetime}</min>
@@ -328,7 +328,7 @@ class Dictionary(object):
                     {source}
                     </source>
                 </dictionary>
-                </yandex>
+                </clickhouse>
                 '''.format(
                     min_lifetime=self.min_lifetime,
                     max_lifetime=self.max_lifetime,
@@ -338,7 +338,7 @@ class Dictionary(object):
                 ))
             else:
                 result.write('''
-                <yandex>
+                <clickhouse>
                 <dictionary>
                     <name>{name}</name>
                     {structure}
@@ -346,7 +346,7 @@ class Dictionary(object):
                     {source}
                     </source>
                 </dictionary>
-                </yandex>
+                </clickhouse>
                 '''.format(
                     min_lifetime=self.min_lifetime,
                     max_lifetime=self.max_lifetime,
diff --git a/tests/integration/helpers/keeper_config1.xml b/tests/integration/helpers/keeper_config1.xml
index d80f30ebd42..4b7e43fbc2a 100644
--- a/tests/integration/helpers/keeper_config1.xml
+++ b/tests/integration/helpers/keeper_config1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <listen_try>true</listen_try>
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/helpers/keeper_config2.xml b/tests/integration/helpers/keeper_config2.xml
index 8a125cecdb3..e34149469ed 100644
--- a/tests/integration/helpers/keeper_config2.xml
+++ b/tests/integration/helpers/keeper_config2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <listen_try>true</listen_try>
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/helpers/keeper_config3.xml b/tests/integration/helpers/keeper_config3.xml
index 04b41677039..8001cea44d6 100644
--- a/tests/integration/helpers/keeper_config3.xml
+++ b/tests/integration/helpers/keeper_config3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <listen_try>true</listen_try>
     <listen_host>::</listen_host>
     <listen_host>0.0.0.0</listen_host>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/helpers/network.py b/tests/integration/helpers/network.py
index 7d9906ae663..decb406879e 100644
--- a/tests/integration/helpers/network.py
+++ b/tests/integration/helpers/network.py
@@ -195,23 +195,25 @@ class _NetworkManager:
                         print("Error removing network blocade container, will try again", str(ex))
                         time.sleep(i)
 
-            image = subprocess.check_output("docker images -q yandex/clickhouse-integration-helper 2>/dev/null", shell=True)
+            image = subprocess.check_output("docker images -q clickhouse/integration-helper 2>/dev/null", shell=True)
             if not image.strip():
                 print("No network image helper, will try download")
                 # for some reason docker api may hang if image doesn't exist, so we download it
                 # before running
                 for i in range(5):
                     try:
-                        subprocess.check_call("docker pull yandex/clickhouse-integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+                        subprocess.check_call("docker pull clickhouse/integration-helper", shell=True)   # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
                         break
                     except:
                         time.sleep(i)
                 else:
-                    raise Exception("Cannot pull yandex/clickhouse-integration-helper image")
+                    raise Exception("Cannot pull clickhouse/integration-helper image")
 
-            self._container = self._docker_client.containers.run('yandex/clickhouse-integration-helper',
+            self._container = self._docker_client.containers.run('clickhouse/integration-helper',
                                                                  auto_remove=True,
                                                                  command=('sleep %s' % self.container_exit_timeout),
+                                                                 # /run/xtables.lock passed inside for correct iptables --wait
+                                                                 volumes={'/run/xtables.lock': {'bind': '/run/xtables.lock', 'mode': 'ro' }},
                                                                  detach=True, network_mode='host')
             container_id = self._container.id
             self._container_expire_time = time.time() + self.container_expire_timeout
@@ -240,15 +242,27 @@ class _NetworkManager:
 
 # Approximately mesure network I/O speed for interface
 class NetThroughput(object):
-    def __init__(self, node, interface="eth0"):
-        self.interface = interface
+    def __init__(self, node):
         self.node = node
+        # trying to get default interface and check it in /proc/net/dev
+        self.interface = self.node.exec_in_container(["bash", "-c", "awk '{print $1 \" \" $2}' /proc/net/route | grep 00000000 | awk '{print $1}'"]).strip()
+        check = self.node.exec_in_container(["bash", "-c", f'grep "^ *{self.interface}:" /proc/net/dev']).strip()
+        if not check: # if check is not successful just try eth{1-10}
+            for i in range(10):
+                try:
+                    self.interface = self.node.exec_in_container(["bash", "-c", f"awk '{{print $1}}' /proc/net/route | grep 'eth{i}'"]).strip()
+                    break
+                except Exception as ex:
+                    print(f"No interface eth{i}")
+            else:
+                raise Exception("No interface eth{1-10} and default interface not specified in /proc/net/route, maybe some special network configuration")
+
         try:
-            check = subprocess.check_output(f'grep "^ *{self.interface}:" /proc/net/dev', shell=True)
+            check = self.node.exec_in_container(["bash", "-c", f'grep "^ *{self.interface}:" /proc/net/dev']).strip()
             if not check:
                 raise Exception(f"No such interface {self.interface} found in /proc/net/dev")
         except:
-            logging.error("All available interfaces %s", subprocess.check_output("cat /proc/net/dev", shell=True))
+            logging.error("All available interfaces %s", self.node.exec_in_container(["bash", "-c", "cat /proc/net/dev"]))
             raise Exception(f"No such interface {self.interface} found in /proc/net/dev")
 
         self.current_in = self._get_in_bytes()
diff --git a/tests/integration/helpers/zookeeper_config.xml b/tests/integration/helpers/zookeeper_config.xml
index 196dfcca3b9..9f864fef276 100644
--- a/tests/integration/helpers/zookeeper_config.xml
+++ b/tests/integration/helpers/zookeeper_config.xml
@@ -1,17 +1,17 @@
 <yandex>
     <zookeeper>
-	    <node index="1">
-		    <host>zoo1</host>
-		    <port>2181</port>
-	    </node>
-	    <node index="2">
-		    <host>zoo2</host>
-		    <port>2181</port>
-	    </node>
-	    <node index="3">
-		    <host>zoo3</host>
-		    <port>2181</port>
-	    </node>
+        <node index="1">
+            <host>zoo1</host>
+            <port>2181</port>
+        </node>
+        <node index="2">
+            <host>zoo2</host>
+            <port>2181</port>
+        </node>
+        <node index="3">
+            <host>zoo3</host>
+            <port>2181</port>
+        </node>
         <session_timeout_ms>3000</session_timeout_ms>
-	</zookeeper>
+    </zookeeper>
 </yandex>
diff --git a/tests/integration/helpers/zookeeper_secure_config.xml b/tests/integration/helpers/zookeeper_secure_config.xml
index 5dbb91d42c6..b3b20eb3429 100644
--- a/tests/integration/helpers/zookeeper_secure_config.xml
+++ b/tests/integration/helpers/zookeeper_secure_config.xml
@@ -1,17 +1,17 @@
-<yandex>
+<clickhouse>
     <zookeeper>
-	    <node index="1">
-		    <host>zoo1</host>
-		    <port>2281</port>
-	    </node>
-	    <node index="2">
-		    <host>zoo2</host>
-		    <port>2281</port>
-	    </node>
-	    <node index="3">
-		    <host>zoo3</host>
-		    <port>2281</port>
-	    </node>
+        <node index="1">
+            <host>zoo1</host>
+            <port>2281</port>
+        </node>
+        <node index="2">
+            <host>zoo2</host>
+            <port>2281</port>
+        </node>
+        <node index="3">
+            <host>zoo3</host>
+            <port>2281</port>
+        </node>
         <session_timeout_ms>3000</session_timeout_ms>
-	</zookeeper>
-</yandex>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/runner b/tests/integration/runner
index 36cb4f22f9a..10c940afb46 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -19,7 +19,7 @@ CONFIG_DIR_IN_REPO = "programs/server"
 INTERGATION_DIR_IN_REPO = "tests/integration"
 SRC_DIR_IN_REPO = "src"
 
-DIND_INTEGRATION_TESTS_IMAGE_NAME = "yandex/clickhouse-integration-tests-runner"
+DIND_INTEGRATION_TESTS_IMAGE_NAME = "clickhouse/integration-tests-runner"
 
 def check_args_and_update_paths(args):
     if args.clickhouse_root:
@@ -225,19 +225,19 @@ if __name__ == "__main__":
     if args.docker_compose_images_tags is not None:
         for img_tag in args.docker_compose_images_tags:
             [image, tag] = img_tag.split(":")
-            if image == "yandex/clickhouse-mysql-golang-client":
+            if image == "clickhouse/mysql-golang-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_GOLANG_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-java-client":
+            elif image == "clickhouse/mysql-java-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_JAVA_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-js-client":
+            elif image == "clickhouse/mysql-js-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_JS_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-mysql-php-client":
+            elif image == "clickhouse/mysql-php-client":
                 env_tags += "-e {}={} ".format("DOCKER_MYSQL_PHP_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-postgresql-java-client":
+            elif image == "clickhouse/postgresql-java-client":
                 env_tags += "-e {}={} ".format("DOCKER_POSTGRESQL_JAVA_CLIENT_TAG", tag)
-            elif image == "yandex/clickhouse-integration-test":
+            elif image == "clickhouse/integration-test":
                 env_tags += "-e {}={} ".format("DOCKER_BASE_TAG", tag)
-            elif image == "yandex/clickhouse-kerberos-kdc":
+            elif image == "clickhouse/kerberos-kdc":
                 env_tags += "-e {}={}".format("DOCKER_KERBEROS_KDC_TAG", tag)
             else:
                 logging.info("Unknown image %s" % (image))
@@ -276,8 +276,9 @@ if __name__ == "__main__":
         --volume={library_bridge_bin}:/clickhouse-library-bridge --volume={bin}:/clickhouse \
         --volume={base_cfg}:/clickhouse-config --volume={cases_dir}:/ClickHouse/tests/integration \
         --volume={src_dir}/Server/grpc_protos:/ClickHouse/src/Server/grpc_protos \
+        --volume=/run/xtables.lock:/run/xtables.lock:ro \
         {dockerd_internal_volume} -e DOCKER_CLIENT_TIMEOUT=300 -e COMPOSE_HTTP_TIMEOUT=600 \
-        {env_tags} {env_cleanup} -e PYTEST_OPTS='{parallel} {opts} {tests_list}' {img} {command}".format(
+        {env_tags} {env_cleanup} -e PYTEST_OPTS='{parallel} {opts} {tests_list} -vvv' {img} {command}".format(
         net=net,
         tty=tty,
         bin=args.binary,
diff --git a/tests/integration/test_MemoryTracking/configs/asynchronous_metrics_update_period_s.xml b/tests/integration/test_MemoryTracking/configs/asynchronous_metrics_update_period_s.xml
index ed131f41ede..e5050f9dda2 100644
--- a/tests/integration/test_MemoryTracking/configs/asynchronous_metrics_update_period_s.xml
+++ b/tests/integration/test_MemoryTracking/configs/asynchronous_metrics_update_period_s.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- this update period also syncs MemoryTracking with RSS, disable this, by using period = 1 day -->
     <asynchronous_metrics_update_period_s>86400</asynchronous_metrics_update_period_s>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_MemoryTracking/configs/no_system_log.xml b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
index 7e235458d39..bd1b9f9a49e 100644
--- a/tests/integration/test_MemoryTracking/configs/no_system_log.xml
+++ b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
@@ -1,7 +1,17 @@
-<yandex>
-    <metric_log remove="remove"/>
+<clickhouse>
     <query_masking_rules remove="remove"/>
+
     <query_thread_log remove="remove"/>
+    <query_log remove="remove" />
+    <query_views_log remove="remove" />
+    <metric_log remove="remove"/>
     <text_log remove="remove"/>
     <trace_log remove="remove"/>
-</yandex>
+    <asynchronous_metric_log remove="remove" />
+    <session_log remove="remove" />
+    <part_log remove="remove" />
+    <crash_log remove="remove" />
+    <opentelemetry_span_log remove="remove" />
+    <!-- just in case it will be enabled by default -->
+    <zookeeper_log remove="remove" />
+</clickhouse>
diff --git a/tests/integration/test_MemoryTracking/configs/users.d/overrides.xml b/tests/integration/test_MemoryTracking/configs/users.d/overrides.xml
new file mode 100644
index 00000000000..a77fac2669f
--- /dev/null
+++ b/tests/integration/test_MemoryTracking/configs/users.d/overrides.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <query_profiler_real_time_period_ns>0</query_profiler_real_time_period_ns>
+            <query_profiler_cpu_time_period_ns>0</query_profiler_cpu_time_period_ns>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_MemoryTracking/test.py b/tests/integration/test_MemoryTracking/test.py
index 1ee528eaa8d..2ec5b2457af 100644
--- a/tests/integration/test_MemoryTracking/test.py
+++ b/tests/integration/test_MemoryTracking/test.py
@@ -2,6 +2,17 @@
 # pylint: disable=redefined-outer-name
 # pylint: disable=line-too-long
 
+# This test verifies that memory tracking does not have significant drift,
+# in other words, every allocation should be taken into account at the global
+# memory tracker.
+#
+# So we are running some queries with GROUP BY to make some allocations,
+# and after we are checking MemoryTracking metric from system.metrics,
+# and check that it does not changes too frequently.
+#
+# Also note, that syncing MemoryTracking with RSS had been disabled in
+# asynchronous_metrics_update_period_s.xml.
+
 import logging
 import pytest
 from helpers.cluster import ClickHouseCluster
@@ -11,6 +22,8 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance('node', main_configs=[
     'configs/no_system_log.xml',
     'configs/asynchronous_metrics_update_period_s.xml',
+], user_configs=[
+    'configs/users.d/overrides.xml',
 ])
 
 @pytest.fixture(scope='module', autouse=True)
@@ -23,8 +36,6 @@ def start_cluster():
 
 query_settings = {
     'max_threads': 1,
-    'query_profiler_real_time_period_ns': 0,
-    'query_profiler_cpu_time_period_ns': 0,
     'log_queries': 0,
 }
 sample_query = "SELECT groupArray(repeat('a', 1000)) FROM numbers(10000) GROUP BY number%10 FORMAT JSON"
@@ -46,6 +57,8 @@ def get_MemoryTracking():
     return int(http_query("SELECT value FROM system.metrics WHERE metric = 'MemoryTracking'"))
 
 def check_memory(memory):
+    # bytes -> megabytes
+    memory = [*map(lambda x: int(int(x)/1024/1024), memory)]
     # 3 changes to MemoryTracking is minimum, since:
     # - this is not that high to not detect inacuracy
     # - memory can go like X/X+N due to some background allocations
diff --git a/tests/integration/test_access_control_on_cluster/configs/config.d/clusters.xml b/tests/integration/test_access_control_on_cluster/configs/config.d/clusters.xml
index 741f862d162..4d668f591b9 100644
--- a/tests/integration/test_access_control_on_cluster/configs/config.d/clusters.xml
+++ b/tests/integration/test_access_control_on_cluster/configs/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <cluster>
         <shard>
@@ -19,4 +19,4 @@
         </shard>
     </cluster>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/queries/__init__.py b/tests/integration/test_access_for_functions/__init__.py
similarity index 100%
rename from tests/queries/__init__.py
rename to tests/integration/test_access_for_functions/__init__.py
diff --git a/tests/integration/test_access_for_functions/test.py b/tests/integration/test_access_for_functions/test.py
new file mode 100644
index 00000000000..ebd0f6bd907
--- /dev/null
+++ b/tests/integration/test_access_for_functions/test.py
@@ -0,0 +1,39 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+instance = cluster.add_instance('instance')
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def test_access_rights_for_funtion():
+    create_function_query = "CREATE FUNCTION MySum AS (a, b) -> a + b"
+
+    instance.query("CREATE USER A")
+    instance.query("CREATE USER B")
+    assert "it's necessary to have grant CREATE FUNCTION ON *.*" in instance.query_and_get_error(create_function_query, user = 'A')
+
+    instance.query("GRANT CREATE FUNCTION on *.* TO A")
+
+    instance.query(create_function_query, user = 'A')
+    assert instance.query("SELECT MySum(1, 2)") == "3\n"
+
+    assert "it's necessary to have grant DROP FUNCTION ON *.*" in instance.query_and_get_error("DROP FUNCTION MySum", user = 'B')
+
+    instance.query("GRANT DROP FUNCTION ON *.* TO B")
+    instance.query("DROP FUNCTION MySum", user = 'B')
+    assert "Unknown function MySum" in instance.query_and_get_error("SELECT MySum(1, 2)")
+
+    instance.query("REVOKE CREATE FUNCTION ON *.* FROM A")
+    assert "it's necessary to have grant CREATE FUNCTION ON *.*" in instance.query_and_get_error(create_function_query, user = 'A')
+
+    instance.query("DROP USER IF EXISTS A")
+    instance.query("DROP USER IF EXISTS B")
diff --git a/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml b/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml
index cb4f22d2657..1207e2703de 100644
--- a/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml
+++ b/tests/integration/test_allowed_client_hosts/configs/users.d/network.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <!-- List of networks with open access.
@@ -32,4 +32,4 @@
             </networks>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_allowed_url_from_config/configs/config_for_redirect.xml b/tests/integration/test_allowed_url_from_config/configs/config_for_redirect.xml
index eceaf7a7838..34d0b6cd57f 100644
--- a/tests/integration/test_allowed_url_from_config/configs/config_for_redirect.xml
+++ b/tests/integration/test_allowed_url_from_config/configs/config_for_redirect.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <remote_url_allow_hosts>
         <host>hdfs1:50070</host>
     </remote_url_allow_hosts>    
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_allowed_url_from_config/configs/config_for_remote.xml b/tests/integration/test_allowed_url_from_config/configs/config_for_remote.xml
index b6074fc8a2d..d99afe30407 100644
--- a/tests/integration/test_allowed_url_from_config/configs/config_for_remote.xml
+++ b/tests/integration/test_allowed_url_from_config/configs/config_for_remote.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_url_allow_hosts>
         <host>localhost:9000</host>
         <host>localhost:9440</host>
@@ -7,4 +7,4 @@
         <host>example01-02-1</host>
         <host>example01-02-2</host>
     </remote_url_allow_hosts>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_allowed_url_from_config/configs/config_with_hosts.xml b/tests/integration/test_allowed_url_from_config/configs/config_with_hosts.xml
index b35fa733ae6..d4ac4986c22 100644
--- a/tests/integration/test_allowed_url_from_config/configs/config_with_hosts.xml
+++ b/tests/integration/test_allowed_url_from_config/configs/config_with_hosts.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <remote_url_allow_hosts>
         <host>host:80</host>
         <host_regexp>^[a-z]*\.ru$</host_regexp>
     </remote_url_allow_hosts>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_allowed_url_from_config/configs/config_with_only_primary_hosts.xml b/tests/integration/test_allowed_url_from_config/configs/config_with_only_primary_hosts.xml
index a84d864bd0d..57a03003b8a 100644
--- a/tests/integration/test_allowed_url_from_config/configs/config_with_only_primary_hosts.xml
+++ b/tests/integration/test_allowed_url_from_config/configs/config_with_only_primary_hosts.xml
@@ -1,8 +1,8 @@
-<yandex> 
+<clickhouse> 
     <remote_url_allow_hosts>
         <host>host:80</host>
         <host>host:123</host>
         <host>yandex.ru</host>
     </remote_url_allow_hosts>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_allowed_url_from_config/configs/config_with_only_regexp_hosts.xml b/tests/integration/test_allowed_url_from_config/configs/config_with_only_regexp_hosts.xml
index b807672c2c1..70b3ba9525f 100644
--- a/tests/integration/test_allowed_url_from_config/configs/config_with_only_regexp_hosts.xml
+++ b/tests/integration/test_allowed_url_from_config/configs/config_with_only_regexp_hosts.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <remote_url_allow_hosts>
         <host_regexp>^[a-z]*:80$</host_regexp>
         <host_regexp>^[a-z]*\.ru$</host_regexp>
     </remote_url_allow_hosts>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_allowed_url_from_config/configs/config_without_allowed_hosts.xml b/tests/integration/test_allowed_url_from_config/configs/config_without_allowed_hosts.xml
index 1855c56fc03..713ec445461 100644
--- a/tests/integration/test_allowed_url_from_config/configs/config_without_allowed_hosts.xml
+++ b/tests/integration/test_allowed_url_from_config/configs/config_without_allowed_hosts.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <remote_url_allow_hosts>
     </remote_url_allow_hosts> 
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_alter_codec/configs/config.d/cluster.xml b/tests/integration/test_alter_codec/configs/config.d/cluster.xml
index ec7c9b8e4f8..0a790d9b5c6 100644
--- a/tests/integration/test_alter_codec/configs/config.d/cluster.xml
+++ b/tests/integration/test_alter_codec/configs/config.d/cluster.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_alter_codec/configs/logs_config.xml b/tests/integration/test_alter_codec/configs/logs_config.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/integration/test_alter_codec/configs/logs_config.xml
+++ b/tests/integration/test_alter_codec/configs/logs_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_alter_on_mixed_type_cluster/configs/remote_servers.xml b/tests/integration/test_alter_on_mixed_type_cluster/configs/remote_servers.xml
index dc678a44b77..ff6785944ec 100644
--- a/tests/integration/test_alter_on_mixed_type_cluster/configs/remote_servers.xml
+++ b/tests/integration/test_alter_on_mixed_type_cluster/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_mixed>
             <shard>
@@ -25,4 +25,4 @@
             </shard>
         </test_cluster_mixed>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_alter_settings_on_cluster/configs/config.d/clusters.xml b/tests/integration/test_alter_settings_on_cluster/configs/config.d/clusters.xml
index 26c9caa63db..4793ce7afb7 100644
--- a/tests/integration/test_alter_settings_on_cluster/configs/config.d/clusters.xml
+++ b/tests/integration/test_alter_settings_on_cluster/configs/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <cluster>
         <shard>
@@ -14,4 +14,4 @@
         </shard>
     </cluster>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_alter_settings_on_cluster/configs/config.d/distributed_ddl.xml b/tests/integration/test_alter_settings_on_cluster/configs/config.d/distributed_ddl.xml
index 6a88929c8ac..1656b6dbead 100644
--- a/tests/integration/test_alter_settings_on_cluster/configs/config.d/distributed_ddl.xml
+++ b/tests/integration/test_alter_settings_on_cluster/configs/config.d/distributed_ddl.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
 <distributed_ddl>
     <path>/clickhouse/task_queue/ddl</path>
 </distributed_ddl>
-</yandex>
+</clickhouse>
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.reference b/tests/integration/test_alter_update_cast_keep_nullable/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.reference
rename to tests/integration/test_alter_update_cast_keep_nullable/__init__.py
diff --git a/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml b/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml
new file mode 100644
index 00000000000..f38096f37fc
--- /dev/null
+++ b/tests/integration/test_alter_update_cast_keep_nullable/configs/users.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <profiles>
+        <default>
+            <cast_keep_nullable>1</cast_keep_nullable>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_alter_update_cast_keep_nullable/test.py b/tests/integration/test_alter_update_cast_keep_nullable/test.py
new file mode 100644
index 00000000000..497a9e21d94
--- /dev/null
+++ b/tests/integration/test_alter_update_cast_keep_nullable/test.py
@@ -0,0 +1,36 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance('node1', user_configs=['configs/users.xml'], with_zookeeper=True)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+def test_cast_keep_nullable(started_cluster):
+    setting = node1.query("SELECT value FROM system.settings WHERE name='cast_keep_nullable'")
+    assert(setting.strip() == "1")
+
+    result = node1.query("""
+        DROP TABLE IF EXISTS t;
+        CREATE TABLE t (x UInt64) ENGINE = MergeTree ORDER BY tuple();
+        INSERT INTO t SELECT number FROM numbers(10);
+        SELECT * FROM t;
+    """)
+    assert(result.strip() == "0\n1\n2\n3\n4\n5\n6\n7\n8\n9")
+
+    error = node1.query_and_get_error("""
+        SET mutations_sync = 1;
+        ALTER TABLE t UPDATE x = x % 3 = 0 ? NULL : x WHERE x % 2 = 1;　
+    """)
+    assert("DB::Exception: Cannot convert NULL value to non-Nullable type" in error)
+
+    result = node1.query("SELECT * FROM t;")
+    assert(result.strip() == "0\n1\n2\n3\n4\n5\n6\n7\n8\n9")
+
diff --git a/tests/integration/test_async_drain_connection/configs/config.xml b/tests/integration/test_async_drain_connection/configs/config.xml
index 0c42ac84d31..da3c4f171c4 100644
--- a/tests/integration/test_async_drain_connection/configs/config.xml
+++ b/tests/integration/test_async_drain_connection/configs/config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
   <max_concurrent_queries>10000</max_concurrent_queries>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_asynchronous_metric_log_table/configs/asynchronous_metrics_update_period_s.xml b/tests/integration/test_asynchronous_metric_log_table/configs/asynchronous_metrics_update_period_s.xml
index b658b0436b1..47e88730482 100644
--- a/tests/integration/test_asynchronous_metric_log_table/configs/asynchronous_metrics_update_period_s.xml
+++ b/tests/integration/test_asynchronous_metric_log_table/configs/asynchronous_metrics_update_period_s.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <asynchronous_metrics_update_period_s>1</asynchronous_metrics_update_period_s>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_atomic_drop_table/configs/config.d/zookeeper_session_timeout.xml b/tests/integration/test_atomic_drop_table/configs/config.d/zookeeper_session_timeout.xml
index 071725b5391..d870cd4570c 100644
--- a/tests/integration/test_atomic_drop_table/configs/config.d/zookeeper_session_timeout.xml
+++ b/tests/integration/test_atomic_drop_table/configs/config.d/zookeeper_session_timeout.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <!-- Required for correct timing in current test case -->
         <session_timeout_ms replace="1">3000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_atomic_drop_table/configs/remote_servers.xml b/tests/integration/test_atomic_drop_table/configs/remote_servers.xml
index 538aa72d386..3776309941c 100644
--- a/tests/integration/test_atomic_drop_table/configs/remote_servers.xml
+++ b/tests/integration/test_atomic_drop_table/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -11,4 +11,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_attach_without_checksums/test.py b/tests/integration/test_attach_without_checksums/test.py
index 536ab4467ea..ab55c5efb43 100644
--- a/tests/integration/test_attach_without_checksums/test.py
+++ b/tests/integration/test_attach_without_checksums/test.py
@@ -5,7 +5,6 @@ cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance('node1')
 
-
 @pytest.fixture(scope="module")
 def start_cluster():
     try:
@@ -42,3 +41,4 @@ def test_attach_without_checksums(start_cluster):
 
     assert node1.query("SELECT COUNT() FROM test WHERE key % 10 == 0") == "10\n"
     assert node1.query("SELECT COUNT() FROM test") == "100\n"
+    node1.query("DROP TABLE test")
\ No newline at end of file
diff --git a/tests/integration/test_backup_restore/test.py b/tests/integration/test_backup_restore/test.py
index d395b55a2a6..b990cec2364 100644
--- a/tests/integration/test_backup_restore/test.py
+++ b/tests/integration/test_backup_restore/test.py
@@ -33,14 +33,16 @@ def started_cluster():
     finally:
         cluster.shutdown()
 
-
-def copy_backup_to_detached(instance, database, src_table, dst_table):
+def get_last_backup_path(instance, database, table):
     fp_increment = os.path.join(path_to_data, 'shadow/increment.txt')
     increment = instance.exec_in_container(['cat',  fp_increment]).strip()
-    fp_backup = os.path.join(path_to_data, 'shadow', increment, 'data', database, src_table)
+    return os.path.join(path_to_data, 'shadow', increment, 'data', database, table)
+
+def copy_backup_to_detached(instance, database, src_table, dst_table):
+    fp_backup = os.path.join(path_to_data, 'shadow', '*', 'data', database, src_table)
     fp_detached = os.path.join(path_to_data, 'data', database, dst_table, 'detached')
-    logging.debug(f'copy from {fp_backup} to {fp_detached}. increment {fp_increment}')
-    instance.exec_in_container(['cp', '-r', f'{fp_backup}', '-T' , f'{fp_detached}'])
+    logging.debug(f'copy from {fp_backup} to {fp_detached}')
+    instance.exec_in_container(['bash', '-c', f'cp -r {fp_backup} -T {fp_detached}'])
 
 def test_restore(started_cluster):
     instance.query("CREATE TABLE test.tbl1 AS test.tbl")
@@ -137,3 +139,22 @@ def test_replace_partition(started_cluster):
     assert (TSV(res) == expected)
 
     instance.query("DROP TABLE IF EXISTS test.tbl3")
+
+def test_freeze_in_memory(started_cluster):
+    instance.query("CREATE TABLE test.t_in_memory(a UInt32, s String) ENGINE = MergeTree ORDER BY a SETTINGS min_rows_for_compact_part = 1000")
+    instance.query("INSERT INTO test.t_in_memory VALUES (1, 'a')")
+    instance.query("ALTER TABLE test.t_in_memory FREEZE")
+
+    fp_backup = get_last_backup_path(started_cluster.instances['node'], 'test', 't_in_memory')
+    part_path = fp_backup + '/all_1_1_0/'
+
+    assert TSV(instance.query("SELECT part_type, is_frozen FROM system.parts WHERE database = 'test' AND table = 't_in_memory'")) == TSV("InMemory\t1\n")
+    instance.exec_in_container(['test', '-f',  part_path + '/data.bin'])
+    assert instance.exec_in_container(['cat',  part_path + '/count.txt']).strip() == '1'
+
+    instance.query("CREATE TABLE test.t_in_memory_2(a UInt32, s String) ENGINE = MergeTree ORDER BY a")
+    copy_backup_to_detached(started_cluster.instances['node'], 'test', 't_in_memory', 't_in_memory_2')
+
+    instance.query("ALTER TABLE test.t_in_memory_2 ATTACH PARTITION ID 'all'")
+    assert TSV(instance.query("SELECT part_type FROM system.parts WHERE database = 'test' AND table = 't_in_memory_2'")) == TSV("Compact\n")
+    assert TSV(instance.query("SELECT a, s FROM test.t_in_memory_2")) == TSV("1\ta\n")
diff --git a/tests/queries/0_stateless/00988_constraints_replication_zookeeper.reference b/tests/integration/test_backup_restore_new/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/00988_constraints_replication_zookeeper.reference
rename to tests/integration/test_backup_restore_new/__init__.py
diff --git a/tests/integration/test_backup_restore_new/test.py b/tests/integration/test_backup_restore_new/test.py
new file mode 100644
index 00000000000..472ecaf608b
--- /dev/null
+++ b/tests/integration/test_backup_restore_new/test.py
@@ -0,0 +1,120 @@
+import pytest
+import re
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+instance = cluster.add_instance('instance')
+
+
+def create_and_fill_table():
+    instance.query("CREATE DATABASE test")
+    instance.query("CREATE TABLE test.table(x UInt32, y String) ENGINE=MergeTree ORDER BY y PARTITION BY x%10")
+    instance.query("INSERT INTO test.table SELECT number, toString(number) FROM numbers(100)")
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def cleanup_after_test():
+    try:
+        yield
+    finally:
+        instance.query("DROP DATABASE IF EXISTS test")
+
+
+backup_id_counter = 0
+def new_backup_name():
+    global backup_id_counter
+    backup_id_counter += 1
+    return f"test-backup-{backup_id_counter}"
+
+
+def test_restore_table():
+    backup_name = new_backup_name()
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    instance.query(f"BACKUP TABLE test.table TO '{backup_name}'")
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM '{backup_name}'")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_restore_table_into_existing_table():
+    backup_name = new_backup_name()
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    instance.query(f"BACKUP TABLE test.table TO '{backup_name}'")
+
+    instance.query(f"RESTORE TABLE test.table INTO test.table FROM '{backup_name}'")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "200\t9900\n"
+
+    instance.query(f"RESTORE TABLE test.table INTO test.table FROM '{backup_name}'")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "300\t14850\n"
+
+
+def test_restore_table_under_another_name():
+    backup_name = new_backup_name()
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    instance.query(f"BACKUP TABLE test.table TO '{backup_name}'")
+
+    assert instance.query("EXISTS test.table2") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table INTO test.table2 FROM '{backup_name}'")
+    assert instance.query("SELECT count(), sum(x) FROM test.table2") == "100\t4950\n"
+
+
+def test_backup_table_under_another_name():
+    backup_name = new_backup_name()
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    instance.query(f"BACKUP TABLE test.table AS test.table2 TO '{backup_name}'")
+
+    assert instance.query("EXISTS test.table2") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table2 FROM '{backup_name}'")
+    assert instance.query("SELECT count(), sum(x) FROM test.table2") == "100\t4950\n"
+
+
+def test_incremental_backup():
+    backup_name = new_backup_name()
+    incremental_backup_name = new_backup_name()
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+    instance.query(f"BACKUP TABLE test.table TO '{backup_name}'")
+
+    instance.query("INSERT INTO test.table VALUES (65, 'a'), (66, 'b')")
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "102\t5081\n"
+    instance.query(f"BACKUP TABLE test.table TO '{incremental_backup_name}' SETTINGS base_backup = '{backup_name}'")
+
+    instance.query(f"RESTORE TABLE test.table AS test.table2 FROM '{incremental_backup_name}'")
+    assert instance.query("SELECT count(), sum(x) FROM test.table2") == "102\t5081\n"
+
+
+def test_backup_not_found_or_already_exists():
+    backup_name = new_backup_name()
+
+    expected_error = "Backup .* not found"
+    assert re.search(expected_error, instance.query_and_get_error(f"RESTORE TABLE test.table AS test.table2 FROM '{backup_name}'"))
+
+    create_and_fill_table()
+    instance.query(f"BACKUP TABLE test.table TO '{backup_name}'")
+
+    expected_error = "Backup .* already exists"
+    assert re.search(expected_error, instance.query_and_get_error(f"BACKUP TABLE test.table TO '{backup_name}'"))
diff --git a/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml b/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml
index b240c0fcb2a..04d34327fef 100644
--- a/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml
+++ b/tests/integration/test_backward_compatibility/configs/wide_parts_only.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>    
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py b/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
new file mode 100644
index 00000000000..8819be527fd
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
@@ -0,0 +1,61 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True, image='yandex/clickhouse-server', tag='21.3', with_installed_binary=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True, image='yandex/clickhouse-server')
+node3 = cluster.add_instance('node3', with_zookeeper=True, image='yandex/clickhouse-server')
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_two_level_merge(start_cluster):
+    for node in start_cluster.instances.values():
+        node.query(
+            """
+            CREATE TABLE IF NOT EXISTS test_two_level_merge(date Date, zone UInt32, number UInt32)
+            ENGINE = MergeTree() PARTITION BY toUInt64(number / 1000) ORDER BY tuple();
+
+            INSERT INTO
+                test_two_level_merge
+            SELECT
+                toDate('2021-09-28') - number / 1000,
+                249081628,
+                number
+            FROM
+                numbers(15000);
+            """
+        )
+
+    # covers only the keys64 method
+    for node in start_cluster.instances.values():
+        print(node.query(
+            """
+            SELECT
+                throwIf(uniqExact(date) != count(), 'group by is borked')
+            FROM (
+                SELECT
+                    date
+                FROM
+                    remote('node{1,2}', default.test_two_level_merge)
+                WHERE
+                    date BETWEEN toDate('2021-09-20') AND toDate('2021-09-28')
+                    AND zone = 249081628
+                GROUP by date, zone
+            )
+            SETTINGS
+                group_by_two_level_threshold = 1,
+                group_by_two_level_threshold_bytes = 1,
+                max_threads = 2,
+                prefer_localhost_replica = 0
+            """
+        ))
diff --git a/tests/integration/test_backward_compatibility/test_aggregate_function_state_avg.py b/tests/integration/test_backward_compatibility/test_aggregate_function_state_avg.py
index 5ed97e7a9a5..feaf96c439d 100644
--- a/tests/integration/test_backward_compatibility/test_aggregate_function_state_avg.py
+++ b/tests/integration/test_backward_compatibility/test_aggregate_function_state_avg.py
@@ -53,3 +53,9 @@ def test_backward_compatability(start_cluster):
     node1.restart_with_latest_version()
 
     assert (node1.query("SELECT avgMerge(x) FROM state") == '2.5\n')
+
+    node1.query("drop table tab")
+    node1.query("drop table state")
+    node2.query("drop table tab")
+    node3.query("drop table tab")
+    node4.query("drop table tab")
\ No newline at end of file
diff --git a/tests/integration/test_backward_compatibility/test_data_skipping_indices.py b/tests/integration/test_backward_compatibility/test_data_skipping_indices.py
new file mode 100644
index 00000000000..db6a3eb7a08
--- /dev/null
+++ b/tests/integration/test_backward_compatibility/test_data_skipping_indices.py
@@ -0,0 +1,44 @@
+# pylint: disable=line-too-long
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__, name="skipping_indices")
+node = cluster.add_instance('node', image='yandex/clickhouse-server', tag='21.6', stay_alive=True, with_installed_binary=True)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+# TODO: cover other types too, but for this we need to add something like
+# restart_with_tagged_version(), since right now it is not possible to
+# switch to old tagged clickhouse version.
+def test_index(start_cluster):
+    node.query("""
+    CREATE TABLE data
+    (
+        key Int,
+        value Nullable(Int),
+        INDEX value_index value TYPE minmax GRANULARITY 1
+    )
+    ENGINE = MergeTree
+    ORDER BY key;
+
+    INSERT INTO data SELECT number, number FROM numbers(10000);
+
+    SELECT * FROM data WHERE value = 20000 SETTINGS force_data_skipping_indices = 'value_index' SETTINGS force_data_skipping_indices = 'value_index', max_rows_to_read=1;
+    """)
+    node.restart_with_latest_version()
+    node.query("""
+    SELECT * FROM data WHERE value = 20000 SETTINGS force_data_skipping_indices = 'value_index' SETTINGS force_data_skipping_indices = 'value_index', max_rows_to_read=1;
+    DROP TABLE data;
+    """)
\ No newline at end of file
diff --git a/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py b/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py
index 7c20b3c2476..abebaaea8b8 100644
--- a/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py
+++ b/tests/integration/test_backward_compatibility/test_detach_part_wrong_partition_id.py
@@ -30,3 +30,7 @@ def test_detach_part_wrong_partition_id(start_cluster):
 
     num_detached = node_21_6.query("select count() from  system.detached_parts")
     assert num_detached == '1\n'
+
+    node_21_6.restart_with_original_version()
+
+    node_21_6.query("drop table tab SYNC")
diff --git a/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py b/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
index b3f5c68cf68..9a7c7f73eb5 100644
--- a/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
+++ b/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
@@ -27,3 +27,6 @@ def test_select_aggregate_alias_column(start_cluster):
 
     node1.query("select sum(x_alias) from remote('node{1,2}', default, tab)")
     node2.query("select sum(x_alias) from remote('node{1,2}', default, tab)")
+
+    node1.query("drop table tab")
+    node2.query("drop table tab")
\ No newline at end of file
diff --git a/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py b/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
index 463fadc36e8..54dd53c344e 100644
--- a/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
+++ b/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
@@ -29,3 +29,5 @@ def test_backward_compatability(start_cluster):
         "select s, count() from remote('node{1,2}', default, tab) group by s order by toUInt64(s) limit 50")
     print(res)
     assert res == ''.join('{}\t2\n'.format(i) for i in range(50))
+    node1.query("drop table tab")
+    node2.query("drop table tab")
diff --git a/tests/integration/test_block_structure_mismatch/configs/remote_servers.xml b/tests/integration/test_block_structure_mismatch/configs/remote_servers.xml
index 77453b0aa1c..c5a7e8418f5 100644
--- a/tests/integration/test_block_structure_mismatch/configs/remote_servers.xml
+++ b/tests/integration/test_block_structure_mismatch/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <testcluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </testcluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_buffer_profile/configs/buffer_profile.xml b/tests/integration/test_buffer_profile/configs/buffer_profile.xml
index 6ce6de70e63..bee2da87114 100644
--- a/tests/integration/test_buffer_profile/configs/buffer_profile.xml
+++ b/tests/integration/test_buffer_profile/configs/buffer_profile.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <buffer_profile>buffer_profile</buffer_profile>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_buffer_profile/configs/users.d/buffer_profile.xml b/tests/integration/test_buffer_profile/configs/users.d/buffer_profile.xml
index 2edd2b63dc6..b3a3bbc1d83 100644
--- a/tests/integration/test_buffer_profile/configs/users.d/buffer_profile.xml
+++ b/tests/integration/test_buffer_profile/configs/users.d/buffer_profile.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <profiles>
         <buffer_profile>
             <max_partitions_per_insert_block>1</max_partitions_per_insert_block>
         </buffer_profile>
     </profiles>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml b/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml
index 745be7cebe6..7aa06cc99ff 100644
--- a/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml
+++ b/tests/integration/test_catboost_model_config_reload/config/catboost_lib.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_catboost_model_config_reload/config/models_config.xml b/tests/integration/test_catboost_model_config_reload/config/models_config.xml
index 7e62283a83c..3cbf717bb67 100644
--- a/tests/integration/test_catboost_model_config_reload/config/models_config.xml
+++ b/tests/integration/test_catboost_model_config_reload/config/models_config.xml
@@ -1,2 +1,2 @@
-<yandex>
-</yandex>
+<clickhouse>
+</clickhouse>
diff --git a/tests/integration/test_catboost_model_config_reload/test.py b/tests/integration/test_catboost_model_config_reload/test.py
index 27652ba365e..4059e739dc9 100644
--- a/tests/integration/test_catboost_model_config_reload/test.py
+++ b/tests/integration/test_catboost_model_config_reload/test.py
@@ -17,9 +17,9 @@ def copy_file_to_container(local_path, dist_path, container_id):
     os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
 
 
-config = '''<yandex>
+config = '''<clickhouse>
     <models_config>/etc/clickhouse-server/model/{model_config}</models_config>
-</yandex>'''
+</clickhouse>'''
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml b/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml
index eab1458031b..26f5c4d57f6 100644
--- a/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml
+++ b/tests/integration/test_catboost_model_first_evaluate/config/models_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
     <models_config>/etc/clickhouse-server/model/model_config.xml</models_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_catboost_model_reload/config/catboost_lib.xml b/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
index 745be7cebe6..7aa06cc99ff 100644
--- a/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
+++ b/tests/integration/test_catboost_model_reload/config/catboost_lib.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <catboost_dynamic_library_path>/etc/clickhouse-server/model/libcatboostmodel.so</catboost_dynamic_library_path>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_catboost_model_reload/config/models_config.xml b/tests/integration/test_catboost_model_reload/config/models_config.xml
index e84ca8b5285..84378df0e8f 100644
--- a/tests/integration/test_catboost_model_reload/config/models_config.xml
+++ b/tests/integration/test_catboost_model_reload/config/models_config.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <models_config>/etc/clickhouse-server/model/model_config.xml</models_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_all_replicas/configs/remote_servers.xml b/tests/integration/test_cluster_all_replicas/configs/remote_servers.xml
index 68dcfcc1460..8791c5f6ee8 100644
--- a/tests/integration/test_cluster_all_replicas/configs/remote_servers.xml
+++ b/tests/integration/test_cluster_all_replicas/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <two_shards>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </two_shards>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml
index 632ab84d6a2..ebb914f54b0 100644
--- a/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml
+++ b/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <cluster0>
             <shard>
@@ -71,4 +71,4 @@
             </shard>
         </destination_trivial_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml b/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml
index dea9c119f2b..64ee762fc2c 100644
--- a/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml
+++ b/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <source_trivial_cluster>
             <shard>
@@ -18,4 +18,4 @@
             </shard>
         </destination_trivial_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml
index abad0dee450..64fa32335ab 100644
--- a/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml
+++ b/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <path>/clickhouse/task_queue/ddl</path>
     </distributed_ddl>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml b/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml
index 839ef92c6dc..1efc65bdb28 100644
--- a/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml
+++ b/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Query log. Used only for queries with setting log_queries = 1. -->
     <query_log>
         <!-- What table to insert data. If table is not exist, it will be created.
@@ -11,4 +11,4 @@
         <!-- Interval of flushing data. -->
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </query_log>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs/config-copier.xml b/tests/integration/test_cluster_copier/configs/config-copier.xml
index 6db67efed6f..590b1892f8d 100644
--- a/tests/integration/test_cluster_copier/configs/config-copier.xml
+++ b/tests/integration/test_cluster_copier/configs/config-copier.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <level>information</level>
         <log>/var/log/clickhouse-server/copier/log.log</log>
@@ -8,4 +8,4 @@
         <stderr>/var/log/clickhouse-server/copier/stderr.log</stderr>
         <stdout>/var/log/clickhouse-server/copier/stdout.log</stdout>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs/users.xml b/tests/integration/test_cluster_copier/configs/users.xml
index d27ca56eec7..492cf4d7ee6 100644
--- a/tests/integration/test_cluster_copier/configs/users.xml
+++ b/tests/integration/test_cluster_copier/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
@@ -31,4 +31,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml
index 6993a7ad7fd..8105afb155b 100644
--- a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml
+++ b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <events>
              <shard>
@@ -25,4 +25,4 @@
              </shard>
          </events>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml
index 4bff11fb693..4f5a6a6d1f5 100644
--- a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml
+++ b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <path>/clickhouse/task_queue/ddl</path>
     </distributed_ddl>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml b/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml
index ede3dcb1228..fd79d8850d8 100644
--- a/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml
+++ b/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>information</level>
         <log>/var/log/clickhouse-server/copier/log.log</log>
@@ -25,4 +25,4 @@
         </node>
         <session_timeout_ms>2000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/users.xml b/tests/integration/test_cluster_copier/configs_three_nodes/users.xml
index 023598304f2..ce3538a31b8 100644
--- a/tests/integration/test_cluster_copier/configs_three_nodes/users.xml
+++ b/tests/integration/test_cluster_copier/configs_three_nodes/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
@@ -29,4 +29,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml
index fd1321d5218..b46faf9b0b7 100644
--- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml
+++ b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <source>
              <shard>
@@ -20,4 +20,4 @@
              </shard>
         </destination>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml
index 4bff11fb693..4f5a6a6d1f5 100644
--- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml
+++ b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <path>/clickhouse/task_queue/ddl</path>
     </distributed_ddl>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml
index 07b5c577267..8306f40ad6a 100644
--- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml
+++ b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -31,4 +31,4 @@
 
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml b/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml
index 642998c6d87..d65ab52807d 100644
--- a/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml
+++ b/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>information</level>
         <log>/var/log/clickhouse-server/copier/log.log</log>
@@ -17,4 +17,4 @@
         </node>
         <session_timeout_ms>2000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/users.xml b/tests/integration/test_cluster_copier/configs_two_nodes/users.xml
index 023598304f2..ce3538a31b8 100644
--- a/tests/integration/test_cluster_copier/configs_two_nodes/users.xml
+++ b/tests/integration/test_cluster_copier/configs_two_nodes/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
@@ -29,4 +29,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task0_description.xml b/tests/integration/test_cluster_copier/task0_description.xml
index d56053ffd39..9b903444741 100644
--- a/tests/integration/test_cluster_copier/task0_description.xml
+++ b/tests/integration/test_cluster_copier/task0_description.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- How many simualteneous workers are posssible -->
     <max_workers>3</max_workers>
 
@@ -93,4 +93,4 @@
     </cluster1>
     </remote_servers>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_drop_target_partition.xml b/tests/integration/test_cluster_copier/task_drop_target_partition.xml
index 6b2ede19d25..df39009f7f1 100644
--- a/tests/integration/test_cluster_copier/task_drop_target_partition.xml
+++ b/tests/integration/test_cluster_copier/task_drop_target_partition.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <remote_servers>
         <source>
              <shard>
@@ -39,4 +39,4 @@
          <sharding_key>rand()</sharding_key>
      </table_events>
    </tables>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_month_to_week_description.xml b/tests/integration/test_cluster_copier/task_month_to_week_description.xml
index 26dfc7d3e00..6839ba930aa 100644
--- a/tests/integration/test_cluster_copier/task_month_to_week_description.xml
+++ b/tests/integration/test_cluster_copier/task_month_to_week_description.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- How many simualteneous workers are posssible -->
     <max_workers>4</max_workers>
 
@@ -97,4 +97,4 @@
     </cluster1>
     </remote_servers>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_no_arg.xml b/tests/integration/test_cluster_copier/task_no_arg.xml
index a6bd80c8480..262ff073537 100644
--- a/tests/integration/test_cluster_copier/task_no_arg.xml
+++ b/tests/integration/test_cluster_copier/task_no_arg.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>   
        <source_cluster>
           <shard>
@@ -36,4 +36,4 @@
         <sharding_key>rand()</sharding_key>
       </table_crm_fin_account>
     </tables>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_no_index.xml b/tests/integration/test_cluster_copier/task_no_index.xml
index e81743efc2d..9a130957811 100644
--- a/tests/integration/test_cluster_copier/task_no_index.xml
+++ b/tests/integration/test_cluster_copier/task_no_index.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <source_cluster>
             <shard>
@@ -106,4 +106,4 @@
         </table_visits>
     -->
     </tables>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_non_partitioned_table.xml b/tests/integration/test_cluster_copier/task_non_partitioned_table.xml
index 499c54ae46e..d5424b95f45 100644
--- a/tests/integration/test_cluster_copier/task_non_partitioned_table.xml
+++ b/tests/integration/test_cluster_copier/task_non_partitioned_table.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>   
        <source_cluster>
           <shard>
@@ -36,4 +36,4 @@
         <sharding_key>rand()</sharding_key>
       </table_copier_test1>
     </tables>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_self_copy.xml b/tests/integration/test_cluster_copier/task_self_copy.xml
index e0e35ccfe99..4d56369233a 100644
--- a/tests/integration/test_cluster_copier/task_self_copy.xml
+++ b/tests/integration/test_cluster_copier/task_self_copy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port_secure>9440</tcp_port_secure>
     <remote_servers>
         <source_cluster>
@@ -61,4 +61,4 @@
     	    <sharding_key>rand()</sharding_key>
         </table1>
     </tables>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/task_skip_index.xml b/tests/integration/test_cluster_copier/task_skip_index.xml
index 5bc16181323..13e80086ea8 100644
--- a/tests/integration/test_cluster_copier/task_skip_index.xml
+++ b/tests/integration/test_cluster_copier/task_skip_index.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <remote_servers>
         <source>
              <shard>
@@ -37,4 +37,4 @@
          <sharding_key>rand()</sharding_key>
      </table_events>
    </tables>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_taxi_data.xml b/tests/integration/test_cluster_copier/task_taxi_data.xml
index fafffe3ebc9..554621cea21 100644
--- a/tests/integration/test_cluster_copier/task_taxi_data.xml
+++ b/tests/integration/test_cluster_copier/task_taxi_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <remote_servers>
          <events>
              <shard>
@@ -40,4 +40,4 @@
          <sharding_key>sipHash64(id) % 3</sharding_key>
      </table_events>
    </tables>
- </yandex>
\ No newline at end of file
+ </clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/task_test_block_size.xml b/tests/integration/test_cluster_copier/task_test_block_size.xml
index c9c99a083ea..1c7fc5d0363 100644
--- a/tests/integration/test_cluster_copier/task_test_block_size.xml
+++ b/tests/integration/test_cluster_copier/task_test_block_size.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- How many simualteneous workers are posssible -->
     <max_workers>1</max_workers>
 
@@ -99,4 +99,4 @@
     </shard_0_0>
     </remote_servers>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_trivial.xml b/tests/integration/test_cluster_copier/task_trivial.xml
index ddf0d8a52a1..c1531e904c5 100644
--- a/tests/integration/test_cluster_copier/task_trivial.xml
+++ b/tests/integration/test_cluster_copier/task_trivial.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- How many simualteneous workers are posssible -->
     <max_workers>3</max_workers>
 
@@ -61,4 +61,4 @@
         </destination_trivial_cluster>
     </remote_servers>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml b/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml
index 86f383e056e..27a2b084148 100644
--- a/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml
+++ b/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- How many simualteneous workers are posssible -->
     <max_workers>3</max_workers>
 
@@ -61,4 +61,4 @@
         </destination_trivial_cluster>
     </remote_servers>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_ttl_columns.xml b/tests/integration/test_cluster_copier/task_ttl_columns.xml
index 68868877d31..d1fbf5f8be6 100644
--- a/tests/integration/test_cluster_copier/task_ttl_columns.xml
+++ b/tests/integration/test_cluster_copier/task_ttl_columns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <remote_servers>
         <source>
              <shard>
@@ -37,4 +37,4 @@
          <sharding_key>rand()</sharding_key>
      </table_events>
    </tables>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml b/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml
index 051988964d2..63d2865f7f9 100644
--- a/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml
+++ b/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <remote_servers>
         <source>
              <shard>
@@ -37,4 +37,4 @@
          <sharding_key>rand()</sharding_key>
      </table_events>
    </tables>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_with_different_schema.xml b/tests/integration/test_cluster_copier/task_with_different_schema.xml
index 409ca7d2e99..eb5bf7d5945 100644
--- a/tests/integration/test_cluster_copier/task_with_different_schema.xml
+++ b/tests/integration/test_cluster_copier/task_with_different_schema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <remote_servers>
         <source>
              <shard>
@@ -37,4 +37,4 @@
          <sharding_key>rand()</sharding_key>
      </table_events>
    </tables>
- </yandex>
+ </clickhouse>
diff --git a/tests/queries/0_stateless/01516_drop_table_stress.reference b/tests/integration/test_codec_encrypted/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/01516_drop_table_stress.reference
rename to tests/integration/test_codec_encrypted/__init__.py
diff --git a/tests/integration/test_codec_encrypted/test.py b/tests/integration/test_codec_encrypted/test.py
new file mode 100644
index 00000000000..439fcdd8ef8
--- /dev/null
+++ b/tests/integration/test_codec_encrypted/test.py
@@ -0,0 +1,73 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
+from helpers.test_tools import assert_eq_with_retry
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance('node')
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def make_storage_with_key(id):
+        node.exec_in_container(["bash", "-c" , """cat > /etc/clickhouse-server/config.d/storage_keys_config.xml << EOF
+<?xml version="1.0"?>
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key_hex id="0">83e84e9a4eb11535c0670dc62d808ee0</key_hex>
+            <key id="1">abcdefghijklmnop</key>
+            <current_key_id>{cur_id}</current_key_id>
+        </aes_128_gcm_siv>
+        <aes_256_gcm_siv>
+            <key_hex id="0">83e84e9a4eb11535c0670dc62d808ee083e84e9a4eb11535c0670dc62d808ee0</key_hex>
+            <key id="1">abcdefghijklmnopabcdefghijklmnop</key>
+            <current_key_id>{cur_id}</current_key_id>
+        </aes_256_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
+EOF""".format(cur_id=id)])
+        node.query("SYSTEM RELOAD CONFIG")
+
+def test_different_keys(start_cluster):
+    make_storage_with_key(0)
+    node.query("""
+        CREATE TABLE encrypted_test_128 (
+            id Int64,
+            data String Codec(AES_128_GCM_SIV)
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        """)
+
+    node.query("""
+        CREATE TABLE encrypted_test_256 (
+            id Int64,
+            data String Codec(AES_256_GCM_SIV)
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        """)
+    
+    node.query("INSERT INTO encrypted_test_128 VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test_128 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    make_storage_with_key(1)
+    node.query("INSERT INTO encrypted_test_128 VALUES (3,'text'),(4,'text')")
+    select_query = "SELECT * FROM encrypted_test_128 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data'),(3,'text'),(4,'text')"
+
+    node.query("INSERT INTO encrypted_test_256 VALUES (0,'data'),(1,'data')")
+    select_query = "SELECT * FROM encrypted_test_256 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data')"
+
+    make_storage_with_key(1)
+    node.query("INSERT INTO encrypted_test_256 VALUES (3,'text'),(4,'text')")
+    select_query = "SELECT * FROM encrypted_test_256 ORDER BY id FORMAT Values"
+    assert node.query(select_query) == "(0,'data'),(1,'data'),(3,'text'),(4,'text')"
diff --git a/tests/integration/test_concurrent_queries_for_all_users_restriction/configs/user_restrictions.xml b/tests/integration/test_concurrent_queries_for_all_users_restriction/configs/user_restrictions.xml
index 87790f2536c..84cd3f5611f 100644
--- a/tests/integration/test_concurrent_queries_for_all_users_restriction/configs/user_restrictions.xml
+++ b/tests/integration/test_concurrent_queries_for_all_users_restriction/configs/user_restrictions.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -35,4 +35,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_queries_for_user_restriction/configs/user_restrictions.xml b/tests/integration/test_concurrent_queries_for_user_restriction/configs/user_restrictions.xml
index bd91f1d495c..527584de7d2 100644
--- a/tests/integration/test_concurrent_queries_for_user_restriction/configs/user_restrictions.xml
+++ b/tests/integration/test_concurrent_queries_for_user_restriction/configs/user_restrictions.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -35,4 +35,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_ttl_merges/configs/fast_background_pool.xml b/tests/integration/test_concurrent_ttl_merges/configs/fast_background_pool.xml
index e62a0105907..74038c5472f 100644
--- a/tests/integration/test_concurrent_ttl_merges/configs/fast_background_pool.xml
+++ b/tests/integration/test_concurrent_ttl_merges/configs/fast_background_pool.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <background_processing_pool_thread_sleep_seconds>1</background_processing_pool_thread_sleep_seconds>
     <background_processing_pool_thread_sleep_seconds_random_part>0</background_processing_pool_thread_sleep_seconds_random_part>
     <background_processing_pool_thread_sleep_seconds_if_nothing_to_do>0.0</background_processing_pool_thread_sleep_seconds_if_nothing_to_do>
@@ -6,4 +6,4 @@
     <background_processing_pool_task_sleep_seconds_when_no_work_max>1</background_processing_pool_task_sleep_seconds_when_no_work_max>
     <background_processing_pool_task_sleep_seconds_when_no_work_multiplier>1</background_processing_pool_task_sleep_seconds_when_no_work_multiplier>
     <background_processing_pool_task_sleep_seconds_when_no_work_random_part>0</background_processing_pool_task_sleep_seconds_when_no_work_random_part>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_concurrent_ttl_merges/test.py b/tests/integration/test_concurrent_ttl_merges/test.py
index efa93220d55..3e25398d633 100644
--- a/tests/integration/test_concurrent_ttl_merges/test.py
+++ b/tests/integration/test_concurrent_ttl_merges/test.py
@@ -140,7 +140,6 @@ def test_limited_ttl_merges_in_empty_pool_replicated(started_cluster):
 
 def test_limited_ttl_merges_two_replicas(started_cluster):
     # Actually this test quite fast and often we cannot catch any merges.
-    # To check for sure just add some sleeps in mergePartsToTemporaryPart
     node1.query("DROP TABLE IF EXISTS replicated_ttl_2")
     node2.query("DROP TABLE IF EXISTS replicated_ttl_2")
 
diff --git a/tests/integration/test_config_corresponding_root/configs/config.xml b/tests/integration/test_config_corresponding_root/configs/config.xml
index 4e130afa84d..5a0179fa25f 100644
--- a/tests/integration/test_config_corresponding_root/configs/config.xml
+++ b/tests/integration/test_config_corresponding_root/configs/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -155,7 +155,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="clickhouse_remote_servers" >
         <!-- Test only shard config for testing distributed storage -->
@@ -209,20 +209,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper-servers" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -282,7 +282,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -304,17 +304,16 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
-
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -325,7 +324,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -412,4 +411,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_corresponding_root/configs/users.xml b/tests/integration/test_config_corresponding_root/configs/users.xml
index 24b8f628c3a..bffce084828 100644
--- a/tests/integration/test_config_corresponding_root/configs/users.xml
+++ b/tests/integration/test_config_corresponding_root/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -127,4 +127,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_substitutions/configs/config_allow_databases.xml b/tests/integration/test_config_substitutions/configs/config_allow_databases.xml
index 2b2a44f5a4c..98008306787 100644
--- a/tests/integration/test_config_substitutions/configs/config_allow_databases.xml
+++ b/tests/integration/test_config_substitutions/configs/config_allow_databases.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
         <default>
             <password></password>
@@ -17,4 +17,4 @@
             </allow_databases>
         </test_allow>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_substitutions/configs/config_env.xml b/tests/integration/test_config_substitutions/configs/config_env.xml
index 2d63b9c688d..ffa26488874 100644
--- a/tests/integration/test_config_substitutions/configs/config_env.xml
+++ b/tests/integration/test_config_substitutions/configs/config_env.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <profiles>
     <default>
         <max_query_size from_env="MAX_QUERY_SIZE" />
@@ -14,4 +14,4 @@
       <include incl="users_1" />
       <include incl="users_2" />
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_substitutions/configs/config_incl.xml b/tests/integration/test_config_substitutions/configs/config_incl.xml
index 43ec78ff8ef..4cb164feb9d 100644
--- a/tests/integration/test_config_substitutions/configs/config_incl.xml
+++ b/tests/integration/test_config_substitutions/configs/config_incl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <include_from>/etc/clickhouse-server/config.d/include_from_source.xml</include_from>
   <profiles>
     <default>
@@ -15,4 +15,4 @@
       <include incl="users_1" />
       <include incl="users_2" />
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_substitutions/configs/config_include_from_env.xml b/tests/integration/test_config_substitutions/configs/config_include_from_env.xml
index 79b650f3d9e..d3a81d7e4a3 100644
--- a/tests/integration/test_config_substitutions/configs/config_include_from_env.xml
+++ b/tests/integration/test_config_substitutions/configs/config_include_from_env.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <include_from from_env="INCLUDE_FROM_ENV"></include_from>
   <profiles>
     <default>
@@ -14,4 +14,4 @@
 
       <include incl="node_does_not_exist" />
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_substitutions/configs/config_no_substs.xml b/tests/integration/test_config_substitutions/configs/config_no_substs.xml
index ea72e332626..9738f60ffb8 100644
--- a/tests/integration/test_config_substitutions/configs/config_no_substs.xml
+++ b/tests/integration/test_config_substitutions/configs/config_no_substs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <profiles>
     <default>
         <max_query_size>33333</max_query_size>
@@ -11,4 +11,4 @@
           <quota>default</quota>
       </default>
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_substitutions/configs/config_zk.xml b/tests/integration/test_config_substitutions/configs/config_zk.xml
index 9fad5658445..89b194eb458 100644
--- a/tests/integration/test_config_substitutions/configs/config_zk.xml
+++ b/tests/integration/test_config_substitutions/configs/config_zk.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <profiles>
     <default>
         <max_query_size from_zk="/setting/max_query_size" />
@@ -14,4 +14,4 @@
       <include from_zk="/users_from_zk_1" />
       <include from_zk="/users_from_zk_2" />
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/access_control.xml b/tests/integration/test_config_xml_full/configs/config.d/access_control.xml
index 6567c39f171..0fa795e6e49 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/access_control.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/access_control.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
     <user_directories replace="replace">
         <users_xml>
@@ -10,4 +10,4 @@
             <path>access/</path>
         </local_directory>
     </user_directories>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml b/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
index b21df47bc85..cee4d338231 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/keeper_port.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/log_to_console.xml b/tests/integration/test_config_xml_full/configs/config.d/log_to_console.xml
index 227c53647f3..70d2f014380 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/log_to_console.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/log_to_console.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <logger>
         <console>true</console>
         <log remove="remove"/>
         <errorlog remove="remove"/>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/logging_no_rotate.xml b/tests/integration/test_config_xml_full/configs/config.d/logging_no_rotate.xml
index 2c34585437b..e541c39aff4 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/logging_no_rotate.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Disable rotation
              https://pocoproject.org/docs/Poco.FileChannel.html
         -->
         <size>never</size>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/macros.xml b/tests/integration/test_config_xml_full/configs/config.d/macros.xml
index 4902b12bc81..657082fe8ae 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/macros.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/macros.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <macros>
         <test>Hello, world!</test>
         <shard>s1</shard>
@@ -6,4 +6,4 @@
         <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
         <default_name_test>table_{table}</default_name_test>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/metric_log.xml b/tests/integration/test_config_xml_full/configs/config.d/metric_log.xml
index 0ca9f162416..ea829d15975 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/metric_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
         <collect_interval_milliseconds>1000</collect_interval_milliseconds>
     </metric_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/more_clusters.xml b/tests/integration/test_config_xml_full/configs/config.d/more_clusters.xml
index aecbf9e0ba7..ce88408876f 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/more_clusters.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/more_clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
 
         <![CDATA[
@@ -46,4 +46,4 @@
         </two_shards_one_local_one_remote_at_port_9001>
 
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/part_log.xml b/tests/integration/test_config_xml_full/configs/config.d/part_log.xml
index 6c6fc9c6982..ce9847a49fb 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/part_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
 
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/path.xml b/tests/integration/test_config_xml_full/configs/config.d/path.xml
index 466ed0d1663..46af5bfb64b 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/path.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/path.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <path replace="replace">./</path>
     <tmp_path replace="replace">./tmp/</tmp_path>
     <user_files_path replace="replace">./user_files/</user_files_path>
     <format_schema_path replace="replace">./format_schemas/</format_schema_path>
     <access_control_path replace="replace">./access/</access_control_path>
     <top_level_domains_path replace="replace">./top_level_domains/</top_level_domains_path>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml
index 5a854848f3d..690d62b9a2b 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/query_masking_rules.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
     <query_masking_rules>
         <rule>
             <regexp>TOPSECRET.TOPSECRET</regexp>
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/tcp_with_proxy.xml b/tests/integration/test_config_xml_full/configs/config.d/tcp_with_proxy.xml
index 19046054c16..733eb2370ca 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/tcp_with_proxy.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/tcp_with_proxy.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <tcp_with_proxy_port>9010</tcp_with_proxy_port>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/text_log.xml b/tests/integration/test_config_xml_full/configs/config.d/text_log.xml
index 3699a23578c..dce4942d952 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/text_log.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/text_log.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <text_log>
         <database>system</database>
         <table>text_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </text_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.d/zookeeper.xml b/tests/integration/test_config_xml_full/configs/config.d/zookeeper.xml
index 06ed7fcd39f..4fa529a6180 100644
--- a/tests/integration/test_config_xml_full/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/zookeeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml
index a7bb9d49e95..c277ff7341f 100644
--- a/tests/integration/test_config_xml_full/configs/config.xml
+++ b/tests/integration/test_config_xml_full/configs/config.xml
@@ -5,7 +5,7 @@
   You can either move the settings to the right place inside "users.xml" file
    or add <skip_check_for_incorrect_settings>1</skip_check_for_incorrect_settings> here.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels [1]:
 
@@ -544,9 +544,9 @@
         <port>9019</port>
     </jdbc_bridge>
     -->
-  
+
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.tech/docs/en/operations/table_engines/distributed/
+         https://clickhouse.com/docs/en/operations/table_engines/distributed/
       -->
     <remote_servers>
         <!-- Test only shard config for testing distributed storage -->
@@ -676,13 +676,13 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/
+         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
       -->
 
     <!--
@@ -705,7 +705,7 @@
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
       -->
     <!--
     <macros>
@@ -792,7 +792,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr: https://clickhouse.yandex/docs/en/table_engines/mergetree-family/custom_partitioning_key/
+            PARTITION BY expr: https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -801,7 +801,7 @@
         -->
         <partition_by>toYYYYMM(event_date)</partition_by>
         <!--
-            Table TTL specification: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
+            Table TTL specification: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
             Example:
                 event_date + INTERVAL 1 WEEK
                 event_date + INTERVAL 7 DAY DELETE
@@ -838,13 +838,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -915,7 +915,7 @@
     </crash_log>
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -939,7 +939,7 @@
     </top_level_domains_lists>
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
+         https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -1115,4 +1115,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/embedded.xml b/tests/integration/test_config_xml_full/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_xml_full/configs/embedded.xml
+++ b/tests/integration/test_config_xml_full/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml
index b94e95bc043..cfde1b4525d 100644
--- a/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_xml_full/configs/users.d/allow_introspection_functions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/users.d/log_queries.xml b/tests/integration/test_config_xml_full/configs/users.d/log_queries.xml
index 25261072ade..755c5478463 100644
--- a/tests/integration/test_config_xml_full/configs/users.d/log_queries.xml
+++ b/tests/integration/test_config_xml_full/configs/users.d/log_queries.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_full/configs/users.xml b/tests/integration/test_config_xml_full/configs/users.xml
index 829748dafb1..378e4e4c570 100644
--- a/tests/integration/test_config_xml_full/configs/users.xml
+++ b/tests/integration/test_config_xml_full/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -117,4 +117,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml b/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
index d8ead517c86..a83e775e504 100644
--- a/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/access_control.yaml
@@ -2,6 +2,6 @@ user_directories:
   users_xml:
     path: users.xml
   local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
   "@replace": replace
 
diff --git a/tests/integration/test_config_xml_main/configs/config.d/path.yaml b/tests/integration/test_config_xml_main/configs/config.d/path.yaml
index 3e26e8906ee..7fd5b1a0478 100644
--- a/tests/integration/test_config_xml_main/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/path.yaml
@@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
   - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
   - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
   - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
   - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
   - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
   - "@replace": replace
diff --git a/tests/integration/test_config_xml_main/configs/config.xml b/tests/integration/test_config_xml_main/configs/config.xml
index 3b5dab50ffe..a2c69c34e0a 100644
--- a/tests/integration/test_config_xml_main/configs/config.xml
+++ b/tests/integration/test_config_xml_main/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -64,10 +64,10 @@
 
     <mmap_cache_size>1000</mmap_cache_size>
 
-    <path>/var/lib/clickhouse/</path>
+    <path>./</path>
 
-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <tmp_path>./tmp/</tmp_path>
+    <user_files_path>./user_files/</user_files_path>
     <ldap_servers>
     </ldap_servers>
     <user_directories>
@@ -274,4 +274,4 @@
         <anonymize>false</anonymize>
         <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
     </send_crash_reports>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/configs/embedded.xml b/tests/integration/test_config_xml_main/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_xml_main/configs/embedded.xml
+++ b/tests/integration/test_config_xml_main/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/configs/users.xml b/tests/integration/test_config_xml_main/configs/users.xml
index b473413bdfa..ac785c12577 100644
--- a/tests/integration/test_config_xml_main/configs/users.xml
+++ b/tests/integration/test_config_xml_main/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -16,4 +16,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_main/test.py b/tests/integration/test_config_xml_main/test.py
index 052f9adb01f..11efb5e283c 100644
--- a/tests/integration/test_config_xml_main/test.py
+++ b/tests/integration/test_config_xml_main/test.py
@@ -32,7 +32,7 @@ def test_xml_main_conf():
     all_userd = ['configs/users.d/allow_introspection_functions.yaml',
                 'configs/users.d/log_queries.yaml']
 
-    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False)
+    node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False, config_root_name='clickhouse')
 
     try:
         cluster.start()
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
index ce2e23839ef..90a0a0ac3fb 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/access_control.yaml
@@ -2,6 +2,6 @@ user_directories:
   users_xml:
     path: users.yaml
   local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
   "@replace": replace
 
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
index b21df47bc85..cee4d338231 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/keeper_port.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
index 2c34585437b..e541c39aff4 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/logging_no_rotate.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Disable rotation
              https://pocoproject.org/docs/Poco.FileChannel.html
         -->
         <size>never</size>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
index 0ca9f162416..ea829d15975 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/metric_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
         <collect_interval_milliseconds>1000</collect_interval_milliseconds>
     </metric_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
index 6c6fc9c6982..ce9847a49fb 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/part_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
 
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
index 3e26e8906ee..7fd5b1a0478 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/path.yaml
@@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
   - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
   - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
   - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
   - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
   - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
   - "@replace": replace
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
index 5a854848f3d..690d62b9a2b 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/query_masking_rules.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
     <query_masking_rules>
         <rule>
             <regexp>TOPSECRET.TOPSECRET</regexp>
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
index 109e35afc37..a5033abf154 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/test_cluster_with_incorrect_pw.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_with_incorrect_pw>
              <shard>
@@ -18,4 +18,4 @@
              </shard>
          </test_cluster_with_incorrect_pw>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
index 06ed7fcd39f..4fa529a6180 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/zookeeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/config.xml b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
index e6a2b6d5324..660e8d7937d 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -64,10 +64,10 @@
 
     <mmap_cache_size>1000</mmap_cache_size>
 
-    <path>/var/lib/clickhouse/</path>
+    <path>./</path>
 
-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
+    <tmp_path>./tmp/</tmp_path>
+    <user_files_path>./user_files/</user_files_path>
     <ldap_servers>
     </ldap_servers>
     <user_directories>
@@ -274,4 +274,4 @@
         <anonymize>false</anonymize>
         <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
     </send_crash_reports>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
index b94e95bc043..cfde1b4525d 100644
--- a/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/users.d/allow_introspection_functions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_xml_yaml_mix/test.py b/tests/integration/test_config_xml_yaml_mix/test.py
index 90ee8a2dea5..86cd68b3378 100644
--- a/tests/integration/test_config_xml_yaml_mix/test.py
+++ b/tests/integration/test_config_xml_yaml_mix/test.py
@@ -32,7 +32,7 @@ def test_extra_yaml_mix():
                 'configs/users.d/log_queries.yaml']
 
     node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd, with_zookeeper=False,
-    users_config_name="users.yaml", copy_common_configs=False)
+                                users_config_name="users.yaml", copy_common_configs=False, config_root_name="clickhouse")
 
     try:
         cluster.start()
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml b/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
index ce2e23839ef..90a0a0ac3fb 100644
--- a/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/access_control.yaml
@@ -2,6 +2,6 @@ user_directories:
   users_xml:
     path: users.yaml
   local_directory:
-    path: access/
+    path: /var/lib/clickhouse/access/
   "@replace": replace
 
diff --git a/tests/integration/test_config_yaml_full/configs/config.d/path.yaml b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
index 3e26e8906ee..7fd5b1a0478 100644
--- a/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/path.yaml
@@ -1,18 +1,18 @@
 path:
-  - ./
+  - /var/lib/clickhouse
   - "@replace": replace
 tmp_path:
-  - ./tmp/
+  - /var/lib/clickhouse/tmp/
   - "@replace": replace
 user_files_path:
-  - ./user_files/
+  - /var/lib/clickhouse/user_files/
   - "@replace": replace
 format_schema_path:
-  - ./format_schemas/
+  - /var/lib/clickhouse/format_schemas/
   - "@replace": replace
 access_control_path:
-  - ./access/
+  - /var/lib/clickhouse/access/
   - "@replace": replace
 top_level_domains_path:
-  - ./top_level_domains/
+  - /var/lib/clickhouse/top_level_domains/
   - "@replace": replace
diff --git a/tests/integration/test_config_yaml_full/configs/config.yaml b/tests/integration/test_config_yaml_full/configs/config.yaml
index 619a3735269..5958d463d21 100644
--- a/tests/integration/test_config_yaml_full/configs/config.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.yaml
@@ -48,9 +48,9 @@ total_memory_tracker_sample_probability: 0
 uncompressed_cache_size: 8589934592
 mark_cache_size: 5368709120
 mmap_cache_size: 1000
-path: /var/lib/clickhouse/
-tmp_path: /var/lib/clickhouse/tmp/
-user_files_path: /var/lib/clickhouse/user_files/
+path: ./
+tmp_path: ./tmp
+user_files_path: ./user_files/
 ldap_servers: ''
 user_directories:
   users_xml:
diff --git a/tests/integration/test_config_yaml_full/configs/embedded.xml b/tests/integration/test_config_yaml_full/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_yaml_full/configs/embedded.xml
+++ b/tests/integration/test_config_yaml_full/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_full/test.py b/tests/integration/test_config_yaml_full/test.py
index bc4fa40384c..e8bf21754e0 100644
--- a/tests/integration/test_config_yaml_full/test.py
+++ b/tests/integration/test_config_yaml_full/test.py
@@ -31,7 +31,7 @@ def test_yaml_full_conf():
                 'configs/users.d/log_queries.yaml']
 
     node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd,
-                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False)
+                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False, config_root_name="clickhouse")
 
     try:
         cluster.start()
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml b/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
index b61f89bd904..7b2815b5ce9 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/access_control.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
     <user_directories replace="replace">
         <users_xml>
@@ -7,7 +7,7 @@
         </users_xml>
         <local_directory>
             <!-- Path to folder where users created by SQL commands are stored. -->
-            <path>access/</path>
+            <path>/var/lib/clickhouse/access/</path>
         </local_directory>
     </user_directories>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
index b21df47bc85..cee4d338231 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/keeper_port.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml b/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
index 227c53647f3..70d2f014380 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/log_to_console.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <logger>
         <console>true</console>
         <log remove="remove"/>
         <errorlog remove="remove"/>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml b/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
index 2c34585437b..e541c39aff4 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/logging_no_rotate.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <logger>
         <!-- Disable rotation
              https://pocoproject.org/docs/Poco.FileChannel.html
         -->
         <size>never</size>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/macros.xml b/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
index 4902b12bc81..657082fe8ae 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/macros.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <macros>
         <test>Hello, world!</test>
         <shard>s1</shard>
@@ -6,4 +6,4 @@
         <default_path_test>/clickhouse/tables/{database}/{shard}/</default_path_test>
         <default_name_test>table_{table}</default_name_test>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml b/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
index 0ca9f162416..ea829d15975 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/metric_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <metric_log>
         <database>system</database>
         <table>metric_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
         <collect_interval_milliseconds>1000</collect_interval_milliseconds>
     </metric_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml b/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
index aecbf9e0ba7..ce88408876f 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/more_clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
 
         <![CDATA[
@@ -46,4 +46,4 @@
         </two_shards_one_local_one_remote_at_port_9001>
 
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml b/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
index 6c6fc9c6982..ce9847a49fb 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/part_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
 
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/path.xml b/tests/integration/test_config_yaml_main/configs/config.d/path.xml
index 466ed0d1663..25d8f6780d2 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/path.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/path.xml
@@ -1,8 +1,8 @@
-<yandex>
-    <path replace="replace">./</path>
-    <tmp_path replace="replace">./tmp/</tmp_path>
-    <user_files_path replace="replace">./user_files/</user_files_path>
-    <format_schema_path replace="replace">./format_schemas/</format_schema_path>
-    <access_control_path replace="replace">./access/</access_control_path>
-    <top_level_domains_path replace="replace">./top_level_domains/</top_level_domains_path>
-</yandex>
+<clickhouse>
+    <path replace="replace">/var/lib/clickhouse</path>
+    <tmp_path replace="replace">/var/lib/clickhouse/tmp/</tmp_path>
+    <user_files_path replace="replace">/var/lib/clickhouse/user_files/</user_files_path>
+    <format_schema_path replace="replace">/var/lib/clickhouse/format_schemas/</format_schema_path>
+    <access_control_path replace="replace">/var/lib/clickhouse/access/</access_control_path>
+    <top_level_domains_path replace="replace">/var/lib/clickhouse/top_level_domains/</top_level_domains_path>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
index 5a854848f3d..690d62b9a2b 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/query_masking_rules.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!-- Config for test server -->
-<yandex>
+<clickhouse>
     <query_masking_rules>
         <rule>
             <regexp>TOPSECRET.TOPSECRET</regexp>
             <replace>[hidden]</replace>
         </rule>
     </query_masking_rules>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml b/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
index 19046054c16..733eb2370ca 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/tcp_with_proxy.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <tcp_with_proxy_port>9010</tcp_with_proxy_port>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml b/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
index 109e35afc37..a5033abf154 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/test_cluster_with_incorrect_pw.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_with_incorrect_pw>
              <shard>
@@ -18,4 +18,4 @@
              </shard>
          </test_cluster_with_incorrect_pw>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml b/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
index 3699a23578c..dce4942d952 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/text_log.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <text_log>
         <database>system</database>
         <table>text_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </text_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml b/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
index 06ed7fcd39f..4fa529a6180 100644
--- a/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/zookeeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>localhost</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/config.yaml b/tests/integration/test_config_yaml_main/configs/config.yaml
index e5a36b1e49b..65cbb4b3e81 100644
--- a/tests/integration/test_config_yaml_main/configs/config.yaml
+++ b/tests/integration/test_config_yaml_main/configs/config.yaml
@@ -48,9 +48,9 @@ total_memory_tracker_sample_probability: 0
 uncompressed_cache_size: 8589934592
 mark_cache_size: 5368709120
 mmap_cache_size: 1000
-path: /var/lib/clickhouse/
-tmp_path: /var/lib/clickhouse/tmp/
-user_files_path: /var/lib/clickhouse/user_files/
+path: ./
+tmp_path: ./tmp/
+user_files_path: ./user_files/
 ldap_servers: ''
 user_directories:
   users_xml:
diff --git a/tests/integration/test_config_yaml_main/configs/embedded.xml b/tests/integration/test_config_yaml_main/configs/embedded.xml
index a66f57d1eb7..ba0df99dfe0 100644
--- a/tests/integration/test_config_yaml_main/configs/embedded.xml
+++ b/tests/integration/test_config_yaml_main/configs/embedded.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!-- Config that is used when server is run without config file. -->
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -37,4 +37,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
index b94e95bc043..cfde1b4525d 100644
--- a/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_config_yaml_main/configs/users.d/allow_introspection_functions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml b/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
index 25261072ade..755c5478463 100644
--- a/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
+++ b/tests/integration/test_config_yaml_main/configs/users.d/log_queries.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <log_queries>1</log_queries>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_config_yaml_main/test.py b/tests/integration/test_config_yaml_main/test.py
index f4de16c35a2..bb4c8eb8f9f 100644
--- a/tests/integration/test_config_yaml_main/test.py
+++ b/tests/integration/test_config_yaml_main/test.py
@@ -32,7 +32,8 @@ def test_yaml_main_conf():
                 'configs/users.d/log_queries.xml']
 
     node = cluster.add_instance('node', base_config_dir='configs', main_configs=all_confd, user_configs=all_userd,
-    with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml", copy_common_configs=False)
+                                with_zookeeper=False, main_config_name="config.yaml", users_config_name="users.yaml",
+                                copy_common_configs=False, config_root_name="clickhouse")
 
     try:
         cluster.start()
diff --git a/tests/integration/test_consistant_parts_after_move_partition/configs/remote_servers.xml b/tests/integration/test_consistant_parts_after_move_partition/configs/remote_servers.xml
index a6e80ce2b08..3d4ccd584b1 100644
--- a/tests/integration/test_consistant_parts_after_move_partition/configs/remote_servers.xml
+++ b/tests/integration/test_consistant_parts_after_move_partition/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -16,4 +16,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_consistent_parts_after_clone_replica/configs/remote_servers.xml b/tests/integration/test_consistent_parts_after_clone_replica/configs/remote_servers.xml
index a6e80ce2b08..3d4ccd584b1 100644
--- a/tests/integration/test_consistent_parts_after_clone_replica/configs/remote_servers.xml
+++ b/tests/integration/test_consistent_parts_after_clone_replica/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -16,4 +16,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_create_user_and_login/test.py b/tests/integration/test_create_user_and_login/test.py
index d0edde2233b..2ce134fea1a 100644
--- a/tests/integration/test_create_user_and_login/test.py
+++ b/tests/integration/test_create_user_and_login/test.py
@@ -58,13 +58,13 @@ def test_login_as_dropped_user_xml():
         instance.exec_in_container(["bash", "-c" , """
             cat > /etc/clickhouse-server/users.d/user_c.xml << EOF
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <C>
             <no_password/>
         </C>
     </users>
-</yandex>
+</clickhouse>
 EOF"""])
 
         assert_eq_with_retry(instance, "SELECT name FROM system.users WHERE name='C'", "C")
diff --git a/tests/integration/test_cross_replication/configs/remote_servers.xml b/tests/integration/test_cross_replication/configs/remote_servers.xml
index 74d22b8953a..0b45e3b11c7 100644
--- a/tests/integration/test_cross_replication/configs/remote_servers.xml
+++ b/tests/integration/test_cross_replication/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -42,4 +42,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_custom_settings/configs/custom_settings.xml b/tests/integration/test_custom_settings/configs/custom_settings.xml
index d3865b434e6..37b8e43e04a 100644
--- a/tests/integration/test_custom_settings/configs/custom_settings.xml
+++ b/tests/integration/test_custom_settings/configs/custom_settings.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <custom_a>Int64_-5</custom_a>
@@ -7,4 +7,4 @@
             <custom_d>'some text'</custom_d>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_custom_settings/configs/illformed_setting.xml b/tests/integration/test_custom_settings/configs/illformed_setting.xml
index 267978a8af9..6917b748eb2 100644
--- a/tests/integration/test_custom_settings/configs/illformed_setting.xml
+++ b/tests/integration/test_custom_settings/configs/illformed_setting.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <custom_f>1</custom_f>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_ddl_alter_query/configs/remote_servers.xml b/tests/integration/test_ddl_alter_query/configs/remote_servers.xml
index 4c3de4b3905..791af83a2d6 100644
--- a/tests/integration/test_ddl_alter_query/configs/remote_servers.xml
+++ b/tests/integration/test_ddl_alter_query/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -25,4 +25,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_ddl_worker_non_leader/configs/remote_servers.xml b/tests/integration/test_ddl_worker_non_leader/configs/remote_servers.xml
index 64239dfdb6c..ea4769f55e1 100644
--- a/tests/integration/test_ddl_worker_non_leader/configs/remote_servers.xml
+++ b/tests/integration/test_ddl_worker_non_leader/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -14,4 +14,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_default_database_on_cluster/configs/config.d/clusters.xml b/tests/integration/test_default_database_on_cluster/configs/config.d/clusters.xml
index bead63a1641..eb990a6d275 100644
--- a/tests/integration/test_default_database_on_cluster/configs/config.d/clusters.xml
+++ b/tests/integration/test_default_database_on_cluster/configs/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <cluster>
         <shard>
@@ -25,4 +25,4 @@
         </shard>
     </cluster>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_default_database_on_cluster/configs/config.d/distributed_ddl.xml b/tests/integration/test_default_database_on_cluster/configs/config.d/distributed_ddl.xml
index 6a88929c8ac..1656b6dbead 100644
--- a/tests/integration/test_default_database_on_cluster/configs/config.d/distributed_ddl.xml
+++ b/tests/integration/test_default_database_on_cluster/configs/config.d/distributed_ddl.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
 <distributed_ddl>
     <path>/clickhouse/task_queue/ddl</path>
 </distributed_ddl>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_delayed_replica_failover/configs/remote_servers.xml b/tests/integration/test_delayed_replica_failover/configs/remote_servers.xml
index 0df620f5b57..3f4f21dbaa5 100644
--- a/tests/integration/test_delayed_replica_failover/configs/remote_servers.xml
+++ b/tests/integration/test_delayed_replica_failover/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -25,4 +25,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml
index fb8f0e1312e..d078b7d0f6d 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -29,4 +29,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml
index dc9958934d2..8bfe1fff690 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/disable_ssl_verification.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml
index a1518083be3..4030d72e92a 100644
--- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml
+++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <logger>
 	<level>trace</level>
 	<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/complex_key_cache_string.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/complex_key_cache_string.xml
index 0c3ba112215..67585de4cb9 100644
--- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/complex_key_cache_string.xml
+++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/complex_key_cache_string.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>radars</name>
         <source>
@@ -42,4 +42,4 @@
         </layout>
         <lifetime>1</lifetime>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml
index 45d9d5f8e15..08d56b16659 100644
--- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml
+++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/dictionaries/ssd_complex_key_cache_string.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>radars</name>
         <source>
@@ -48,4 +48,4 @@
         </layout>
         <lifetime>1</lifetime>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml b/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml
+++ b/tests/integration/test_dictionaries_complex_key_cache_string/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/macros.xml b/tests/integration/test_dictionaries_config_reload/__init__.py
similarity index 100%
rename from tests/testflows/map_type/configs/clickhouse/config.d/macros.xml
rename to tests/integration/test_dictionaries_config_reload/__init__.py
diff --git a/tests/integration/test_dictionaries_config_reload/config/dictionaries_config.xml b/tests/integration/test_dictionaries_config_reload/config/dictionaries_config.xml
new file mode 100644
index 00000000000..7e62283a83c
--- /dev/null
+++ b/tests/integration/test_dictionaries_config_reload/config/dictionaries_config.xml
@@ -0,0 +1,2 @@
+<yandex>
+</yandex>
diff --git a/tests/integration/test_dictionaries_config_reload/dictionaries/dictionary_config.xml b/tests/integration/test_dictionaries_config_reload/dictionaries/dictionary_config.xml
new file mode 100644
index 00000000000..5d6064c30eb
--- /dev/null
+++ b/tests/integration/test_dictionaries_config_reload/dictionaries/dictionary_config.xml
@@ -0,0 +1,28 @@
+<dictionaries>
+    <dictionary>
+        <name>test_dictionary_1</name>
+
+        <structure>
+            <id>
+                <name>id</name>
+                <type>UInt64</type>
+            </id>
+            <attribute>
+                <name>value_1</name>
+                <type>String</type>
+                <null_value></null_value>
+            </attribute>
+        </structure>
+
+        <source>
+            <clickhouse>
+                <table>dictionary_values</table>
+            </clickhouse>
+        </source>
+
+        <layout>
+            <direct/>
+        </layout>
+
+    </dictionary>
+</dictionaries>
diff --git a/tests/integration/test_dictionaries_config_reload/dictionaries/dictionary_config2.xml b/tests/integration/test_dictionaries_config_reload/dictionaries/dictionary_config2.xml
new file mode 100644
index 00000000000..2f400cba0f7
--- /dev/null
+++ b/tests/integration/test_dictionaries_config_reload/dictionaries/dictionary_config2.xml
@@ -0,0 +1,28 @@
+<dictionaries>
+    <dictionary>
+        <name>test_dictionary_2</name>
+
+        <structure>
+            <id>
+                <name>id</name>
+                <type>UInt64</type>
+            </id>
+            <attribute>
+                <name>value_2</name>
+                <type>String</type>
+                <null_value></null_value>
+            </attribute>
+        </structure>
+
+        <source>
+            <clickhouse>
+                <table>dictionary_values</table>
+            </clickhouse>
+        </source>
+
+        <layout>
+            <direct/>
+        </layout>
+
+    </dictionary>
+</dictionaries>
diff --git a/tests/integration/test_dictionaries_config_reload/test.py b/tests/integration/test_dictionaries_config_reload/test.py
new file mode 100644
index 00000000000..6f6e2488abc
--- /dev/null
+++ b/tests/integration/test_dictionaries_config_reload/test.py
@@ -0,0 +1,65 @@
+import os
+import sys
+import time
+import logging
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True, main_configs=['config/dictionaries_config.xml'])
+
+
+def copy_file_to_container(local_path, dist_path, container_id):
+    os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
+
+
+config = '''<yandex>
+    <dictionaries_config>/etc/clickhouse-server/dictionaries/{dictionaries_config}</dictionaries_config>
+</yandex>'''
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'dictionaries/.'), '/etc/clickhouse-server/dictionaries', node.docker_id)
+
+        node.query("CREATE TABLE dictionary_values (id UInt64, value_1 String, value_2 String) ENGINE=TinyLog;")
+        node.query("INSERT INTO dictionary_values VALUES (0, 'Value_1', 'Value_2')")
+
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def change_config(dictionaries_config):
+    node.replace_config("/etc/clickhouse-server/config.d/dictionaries_config.xml", config.format(dictionaries_config=dictionaries_config))
+    node.query("SYSTEM RELOAD CONFIG;")
+
+
+def test(started_cluster):
+    # Set config with the path to the first dictionary.
+    change_config("dictionary_config.xml")
+
+    time.sleep(10)
+
+    assert node.query("SELECT dictGet('test_dictionary_1', 'value_1', toUInt64(0));") == 'Value_1\n'
+
+    # Change path to the second dictionary in config.
+    change_config("dictionary_config2.xml")
+
+    time.sleep(10)
+
+    # Check that the new dictionary is loaded.
+    assert node.query("SELECT dictGet('test_dictionary_2', 'value_2', toUInt64(0));") == 'Value_2\n'
+
+    # Check that the previous dictionary was unloaded.
+    node.query_and_get_error("SELECT dictGet('test_dictionary_1', 'value', toUInt64(0));")
diff --git a/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml b/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml
index 5e616865fef..031e2257ba0 100644
--- a/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/allow_remote_node.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
 	<remote_url_allow_hosts>
         <host>node1</host>
     </remote_url_allow_hosts>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/config_password.xml b/tests/integration/test_dictionaries_ddl/configs/config_password.xml
index 19a56748612..72cd37d5978 100644
--- a/tests/integration/test_dictionaries_ddl/configs/config_password.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/config_password.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
   <users>
       <default>
           <password>default</password>
       </default>
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/dictionaries/conflict_name_dictionary.xml b/tests/integration/test_dictionaries_ddl/configs/dictionaries/conflict_name_dictionary.xml
index 75e6f8953eb..7b4cf46944e 100644
--- a/tests/integration/test_dictionaries_ddl/configs/dictionaries/conflict_name_dictionary.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/dictionaries/conflict_name_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <dictionary>
     <name>test.conflicting_dictionary</name>
     <source>
@@ -38,4 +38,4 @@
         </attribute>
     </structure>
 </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/dictionaries/dictionary_with_conflict_name.xml b/tests/integration/test_dictionaries_ddl/configs/dictionaries/dictionary_with_conflict_name.xml
index 75e6f8953eb..7b4cf46944e 100644
--- a/tests/integration/test_dictionaries_ddl/configs/dictionaries/dictionary_with_conflict_name.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/dictionaries/dictionary_with_conflict_name.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <dictionary>
     <name>test.conflicting_dictionary</name>
     <source>
@@ -38,4 +38,4 @@
         </attribute>
     </structure>
 </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load.xml b/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load.xml
index d01f7a0155b..949ebd90788 100644
--- a/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionaries_lazy_load>false</dictionaries_lazy_load>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load_dictionary.xml b/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load_dictionary.xml
index d01f7a0155b..949ebd90788 100644
--- a/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load_dictionary.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/dictionaries/lazy_load_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionaries_lazy_load>false</dictionaries_lazy_load>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_dictionaries_ddl/configs/dictionaries/simple_dictionary.xml b/tests/integration/test_dictionaries_ddl/configs/dictionaries/simple_dictionary.xml
index 5032ca4266c..05cc46bc9c4 100644
--- a/tests/integration/test_dictionaries_ddl/configs/dictionaries/simple_dictionary.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/dictionaries/simple_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <dictionary>
    <name>xml_dictionary</name>
    <source>
@@ -38,4 +38,4 @@
         </attribute>
    </structure>
 </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/user_admin.xml b/tests/integration/test_dictionaries_ddl/configs/user_admin.xml
index cb41216f71c..abbca144c35 100644
--- a/tests/integration/test_dictionaries_ddl/configs/user_admin.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/user_admin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 	<users>
         <admin>
             <password></password>
@@ -10,4 +10,4 @@
             <quota>default</quota>
         </admin>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/configs/user_default.xml b/tests/integration/test_dictionaries_ddl/configs/user_default.xml
index 9b9770acc2d..9b01205192b 100644
--- a/tests/integration/test_dictionaries_ddl/configs/user_default.xml
+++ b/tests/integration/test_dictionaries_ddl/configs/user_default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <allow_databases>
@@ -8,4 +8,4 @@
             </allow_databases>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_ddl/test.py b/tests/integration/test_dictionaries_ddl/test.py
index 84374fde246..6cce303781b 100644
--- a/tests/integration/test_dictionaries_ddl/test.py
+++ b/tests/integration/test_dictionaries_ddl/test.py
@@ -67,15 +67,15 @@ def started_cluster():
 ])
 def test_create_and_select_mysql(started_cluster, clickhouse, name, layout):
     mysql_conn = create_mysql_conn("root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port)
-    execute_mysql_query(mysql_conn, "DROP DATABASE IF EXISTS clickhouse")
-    execute_mysql_query(mysql_conn, "CREATE DATABASE clickhouse")
+    execute_mysql_query(mysql_conn, "DROP DATABASE IF EXISTS create_and_select")
+    execute_mysql_query(mysql_conn, "CREATE DATABASE create_and_select")
     execute_mysql_query(mysql_conn,
-                        "CREATE TABLE clickhouse.{} (key_field1 int, key_field2 bigint, value1 text, value2 float, PRIMARY KEY (key_field1, key_field2))".format(
+                        "CREATE TABLE create_and_select.{} (key_field1 int, key_field2 bigint, value1 text, value2 float, PRIMARY KEY (key_field1, key_field2))".format(
                             name))
     values = []
     for i in range(1000):
         values.append('(' + ','.join([str(i), str(i * i), str(i) * 5, str(i * 3.14)]) + ')')
-    execute_mysql_query(mysql_conn, "INSERT INTO clickhouse.{} VALUES ".format(name) + ','.join(values))
+    execute_mysql_query(mysql_conn, "INSERT INTO create_and_select.{} VALUES ".format(name) + ','.join(values))
 
     clickhouse.query("""
     CREATE DICTIONARY default.{} (
@@ -88,7 +88,7 @@ def test_create_and_select_mysql(started_cluster, clickhouse, name, layout):
     SOURCE(MYSQL(
         USER 'root'
         PASSWORD 'clickhouse'
-        DB 'clickhouse'
+        DB 'create_and_select'
         TABLE '{}'
         REPLICA(PRIORITY 1 HOST '127.0.0.1' PORT 3333)
         REPLICA(PRIORITY 2 HOST 'mysql57' PORT 3306)
@@ -110,7 +110,7 @@ def test_create_and_select_mysql(started_cluster, clickhouse, name, layout):
 
     for i in range(1000):
         values.append('(' + ','.join([str(i), str(i * i), str(i) * 3, str(i * 2.718)]) + ')')
-    execute_mysql_query(mysql_conn, "REPLACE INTO clickhouse.{} VALUES ".format(name) + ','.join(values))
+    execute_mysql_query(mysql_conn, "REPLACE INTO create_and_select.{} VALUES ".format(name) + ','.join(values))
 
     clickhouse.query("SYSTEM RELOAD DICTIONARY 'default.{}'".format(name))
 
@@ -127,6 +127,7 @@ def test_create_and_select_mysql(started_cluster, clickhouse, name, layout):
 
     clickhouse.query("select dictGetUInt8('xml_dictionary', 'SomeValue1', toUInt64(17))") == "17\n"
     clickhouse.query("select dictGetString('xml_dictionary', 'SomeValue2', toUInt64(977))") == str(hex(977))[2:] + '\n'
+    clickhouse.query(f"drop dictionary default.{name}")
 
 
 def test_restricted_database(started_cluster):
@@ -188,6 +189,9 @@ def test_restricted_database(started_cluster):
         SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 USER 'default' TABLE 'table_in_restricted_db' DB 'restricted_db'))
         LIFETIME(MIN 1 MAX 10)
         """)
+    for node in [node1, node2]:
+        node.query("DROP TABLE restricted_db.table_in_restricted_db", user="admin")
+        node.query("DROP DATABASE restricted_db", user="admin")
 
 
 def test_conflicting_name(started_cluster):
@@ -225,6 +229,7 @@ def test_http_dictionary_restrictions(started_cluster):
         node3.query("SELECT dictGetString('test.restricted_http_dictionary', 'value', toUInt64(1))")
     except QueryRuntimeException as ex:
         assert 'is not allowed in config.xml' in str(ex)
+    node3.query("DROP DICTIONARY test.restricted_http_dictionary")
 
 
 def test_file_dictionary_restrictions(started_cluster):
@@ -242,14 +247,15 @@ def test_file_dictionary_restrictions(started_cluster):
         node3.query("SELECT dictGetString('test.restricted_file_dictionary', 'value', toUInt64(1))")
     except QueryRuntimeException as ex:
         assert 'is not inside' in str(ex)
+    node3.query("DROP DICTIONARY test.restricted_file_dictionary")
 
 
 def test_dictionary_with_where(started_cluster):
     mysql_conn = create_mysql_conn("root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port)
-    execute_mysql_query(mysql_conn, "CREATE DATABASE IF NOT EXISTS clickhouse")
+    execute_mysql_query(mysql_conn, "CREATE DATABASE IF NOT EXISTS dictionary_with_where")
     execute_mysql_query(mysql_conn,
-                        "CREATE TABLE clickhouse.special_table (key_field1 int, value1 text, PRIMARY KEY (key_field1))")
-    execute_mysql_query(mysql_conn, "INSERT INTO clickhouse.special_table VALUES (1, 'abcabc'), (2, 'qweqwe')")
+                        "CREATE TABLE dictionary_with_where.special_table (key_field1 int, value1 text, PRIMARY KEY (key_field1))")
+    execute_mysql_query(mysql_conn, "INSERT INTO dictionary_with_where.special_table VALUES (1, 'abcabc'), (2, 'qweqwe')")
 
     node1.query("""
     CREATE DICTIONARY default.special_dict (
@@ -260,7 +266,7 @@ def test_dictionary_with_where(started_cluster):
     SOURCE(MYSQL(
         USER 'root'
         PASSWORD 'clickhouse'
-        DB 'clickhouse'
+        DB 'dictionary_with_where'
         TABLE 'special_table'
         REPLICA(PRIORITY 1 HOST 'mysql57' PORT 3306)
         WHERE 'value1 = \\'qweqwe\\' OR value1 = \\'\\\\u3232\\''
@@ -272,6 +278,9 @@ def test_dictionary_with_where(started_cluster):
     node1.query("SYSTEM RELOAD DICTIONARY default.special_dict")
 
     assert node1.query("SELECT dictGetString('default.special_dict', 'value1', toUInt64(2))") == 'qweqwe\n'
+    node1.query("DROP DICTIONARY default.special_dict")
+    execute_mysql_query(mysql_conn, "DROP TABLE dictionary_with_where.special_table")
+    execute_mysql_query(mysql_conn, "DROP DATABASE dictionary_with_where")
 
 
 def test_clickhouse_remote(started_cluster):
diff --git a/tests/integration/test_dictionaries_dependency/configs/disable_lazy_load.xml b/tests/integration/test_dictionaries_dependency/configs/disable_lazy_load.xml
index d01f7a0155b..949ebd90788 100644
--- a/tests/integration/test_dictionaries_dependency/configs/disable_lazy_load.xml
+++ b/tests/integration/test_dictionaries_dependency/configs/disable_lazy_load.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionaries_lazy_load>false</dictionaries_lazy_load>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_dictionaries_dependency/test.py b/tests/integration/test_dictionaries_dependency/test.py
index d615f90dc79..9b1019822e3 100644
--- a/tests/integration/test_dictionaries_dependency/test.py
+++ b/tests/integration/test_dictionaries_dependency/test.py
@@ -36,6 +36,8 @@ def cleanup_after_test():
         yield
     finally:
         for node in nodes:
+            for i in range(4):
+                node.query("DROP DICTIONARY IF EXISTS test.other_{}".format(i))
             node.query("DROP DICTIONARY IF EXISTS test.adict")
             node.query("DROP DICTIONARY IF EXISTS test.zdict")
             node.query("DROP DICTIONARY IF EXISTS atest.dict")
@@ -104,8 +106,11 @@ def test_dependency_via_dictionary_database(node):
         for d_name in d_names:
             assert node.query("SELECT dictGet({}, 'y', toUInt64(5))".format(d_name)) == "6\n"
 
-    check()
+
+    for d_name in d_names:
+        assert node.query("SELECT dictGet({}, 'y', toUInt64(5))".format(d_name)) == "6\n"
 
     # Restart must not break anything.
     node.restart_clickhouse()
-    check()
+    for d_name in d_names:
+        assert node.query_with_retry("SELECT dictGet({}, 'y', toUInt64(5))".format(d_name)) == "6\n"
diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/config.xml b/tests/integration/test_dictionaries_dependency_xml/configs/config.xml
index b60daf72dcf..fa6ef972991 100644
--- a/tests/integration/test_dictionaries_dependency_xml/configs/config.xml
+++ b/tests/integration/test_dictionaries_dependency_xml/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_x.xml b/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_x.xml
index 74936c04db3..31053db22d7 100644
--- a/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_x.xml
+++ b/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_x.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>dep_x</name>
         <source>
@@ -27,4 +27,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_y.xml b/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_y.xml
index ed7f66b1b41..0156a1dd019 100644
--- a/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_y.xml
+++ b/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_y.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
         <dictionary>
        <name>dep_y</name>
        <source>
@@ -37,4 +37,4 @@
            </attribute>
        </structure>
    </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_z.xml b/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_z.xml
index d2d7dff61ad..72cb43caf09 100644
--- a/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_z.xml
+++ b/tests/integration/test_dictionaries_dependency_xml/configs/dictionaries/dep_z.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <dictionary>
        <name>dep_z</name>
        <source>
@@ -33,4 +33,4 @@
            </attribute>
        </structure>
    </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_dependency_xml/configs/users.xml b/tests/integration/test_dictionaries_dependency_xml/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_dependency_xml/configs/users.xml
+++ b/tests/integration/test_dictionaries_dependency_xml/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_dependency_xml/test.py b/tests/integration/test_dictionaries_dependency_xml/test.py
index cfd7d58d574..849fdf57980 100644
--- a/tests/integration/test_dictionaries_dependency_xml/test.py
+++ b/tests/integration/test_dictionaries_dependency_xml/test.py
@@ -6,7 +6,7 @@ DICTIONARY_FILES = ['configs/dictionaries/dep_x.xml', 'configs/dictionaries/dep_
                     'configs/dictionaries/dep_z.xml']
 
 cluster = ClickHouseCluster(__file__)
-instance = cluster.add_instance('instance', dictionaries=DICTIONARY_FILES)
+instance = cluster.add_instance('instance', dictionaries=DICTIONARY_FILES, stay_alive=True)
 
 
 @pytest.fixture(scope="module")
@@ -73,3 +73,45 @@ def test_get_data(started_cluster):
     assert query("SELECT dictGetString('dep_x', 'a', toUInt64(4))") == "ether\n"
     assert query("SELECT dictGetString('dep_y', 'a', toUInt64(4))") == "ether\n"
     assert query("SELECT dictGetString('dep_z', 'a', toUInt64(4))") == "ether\n"
+
+def dependent_tables_assert():
+    res = instance.query("select database || '.' || name from system.tables")
+    assert "system.join" in res
+    assert "default.src" in res
+    assert "dict.dep_y" in res
+    assert "lazy.log" in res
+    assert "test.d" in res
+    assert "default.join" in res
+    assert "a.t" in res
+
+def test_dependent_tables(started_cluster):
+    query = instance.query
+    query("create database lazy engine=Lazy(10)")
+    query("create database a")
+    query("create table lazy.src (n int, m int) engine=Log")
+    query("create dictionary a.d (n int default 0, m int default 42) primary key n "
+          "source(clickhouse(host 'localhost' port tcpPort() user 'default' table 'src' password '' db 'lazy'))"
+          "lifetime(min 1 max 10) layout(flat())")
+    query("create table system.join (n int, m int) engine=Join(any, left, n)")
+    query("insert into system.join values (1, 1)")
+    query("create table src (n int, m default joinGet('system.join', 'm', 1::int),"
+                                   "t default dictGetOrNull('a.d', 'm', toUInt64(3)),"
+                                   "k default dictGet('a.d', 'm', toUInt64(4))) engine=MergeTree order by n")
+    query("create dictionary test.d (n int default 0, m int default 42) primary key n "
+          "source(clickhouse(host 'localhost' port tcpPort() user 'default' table 'src' password '' db 'default'))"
+          "lifetime(min 1 max 10) layout(flat())")
+    query("create table join (n int, m default dictGet('a.d', 'm', toUInt64(3)),"
+                                    "k default dictGet('test.d', 'm', toUInt64(0))) engine=Join(any, left, n)")
+    query("create table lazy.log (n default dictGet(test.d, 'm', toUInt64(0))) engine=Log")
+    query("create table a.t (n default joinGet('system.join', 'm', 1::int),"
+                            "m default dictGet('test.d', 'm', toUInt64(3)),"
+                            "k default joinGet(join, 'm', 1::int)) engine=MergeTree order by n")
+
+    dependent_tables_assert()
+    instance.restart_clickhouse()
+    dependent_tables_assert()
+    query("drop database a")
+    query("drop database lazy")
+    query("drop table src")
+    query("drop table join")
+    query("drop table system.join")
diff --git a/tests/integration/test_dictionaries_mysql/configs/config.xml b/tests/integration/test_dictionaries_mysql/configs/config.xml
index b60daf72dcf..fa6ef972991 100644
--- a/tests/integration/test_dictionaries_mysql/configs/config.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml
index 2242088ebc4..9e149ca8575 100644
--- a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <dictionary>
       <name>dict0</name>
       <source>
@@ -72,4 +72,4 @@
       </structure>
       <lifetime>0</lifetime>
    </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml
index 278fad49d03..7587936ae99 100644
--- a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
       <dictionary>
       <name>dict2</name>
       <source>
@@ -110,4 +110,4 @@
       <lifetime>0</lifetime>
    </dictionary>
    
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_mysql/configs/named_collections.xml b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
new file mode 100644
index 00000000000..e6e8d0c239f
--- /dev/null
+++ b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
@@ -0,0 +1,25 @@
+<clickhouse>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>test</database>
+            <table>test_table</table>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>test</database>
+            <table>test_table</table>
+        </mysql3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_mysql/configs/remote_servers.xml b/tests/integration/test_dictionaries_mysql/configs/remote_servers.xml
index b2b88a6e3c8..c5e0e7ee366 100644
--- a/tests/integration/test_dictionaries_mysql/configs/remote_servers.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -9,4 +9,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_mysql/configs/users.xml b/tests/integration/test_dictionaries_mysql/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_mysql/configs/users.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_mysql/test.py b/tests/integration/test_dictionaries_mysql/test.py
index fe284f71e00..c1819923523 100644
--- a/tests/integration/test_dictionaries_mysql/test.py
+++ b/tests/integration/test_dictionaries_mysql/test.py
@@ -1,4 +1,5 @@
 ## sudo -H pip install PyMySQL
+import warnings
 import pymysql.cursors
 import pytest
 from helpers.cluster import ClickHouseCluster
@@ -6,7 +7,7 @@ import time
 import logging
 
 DICTS = ['configs/dictionaries/mysql_dict1.xml', 'configs/dictionaries/mysql_dict2.xml']
-CONFIG_FILES = ['configs/remote_servers.xml']
+CONFIG_FILES = ['configs/remote_servers.xml', 'configs/named_collections.xml']
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance('instance', main_configs=CONFIG_FILES, with_mysql=True, dictionaries=DICTS)
 
@@ -46,23 +47,163 @@ def started_cluster():
         cluster.shutdown()
 
 
-def test_load_mysql_dictionaries(started_cluster):
-    # Load dictionaries
+def test_mysql_dictionaries_custom_query_full_load(started_cluster):
+    mysql_connection = get_mysql_conn(started_cluster)
+
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table_1 (id Integer, value_1 Text);")
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table_2 (id Integer, value_2 Text);")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table_1 VALUES (1, 'Value_1');")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table_2 VALUES (1, 'Value_2');")
+
     query = instance.query
-    query("SYSTEM RELOAD DICTIONARIES")
+    query("""
+    CREATE DICTIONARY test_dictionary_custom_query
+    (
+        id UInt64,
+        value_1 String,
+        value_2 String
+    )
+    PRIMARY KEY id
+    LAYOUT(FLAT())
+    SOURCE(MYSQL(
+        HOST 'mysql57'
+        PORT 3306
+        USER 'root'
+        PASSWORD 'clickhouse'
+        QUERY $doc$SELECT id, value_1, value_2 FROM test.test_table_1 INNER JOIN test.test_table_2 USING (id);$doc$))
+    LIFETIME(0)
+    """)
 
-    for n in range(0, 5):
-        # Create MySQL tables, fill them and create CH dict tables
-        prepare_mysql_table(started_cluster, 'test', str(n))
+    result = query("SELECT id, value_1, value_2 FROM test_dictionary_custom_query")
 
-    # Check dictionaries are loaded and have correct number of elements
-    for n in range(0, 100):
-        # Force reload of dictionaries (each 10 iteration)
-        if (n % 10) == 0:
-            query("SYSTEM RELOAD DICTIONARIES")
+    assert result == '1\tValue_1\tValue_2\n'
 
-        # Check number of row
-        assert query("SELECT count() FROM `test`.`dict_table_{}`".format('test' + str(n % 5))).rstrip() == '10000'
+    query("DROP DICTIONARY test_dictionary_custom_query;")
+
+    execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_1;")
+    execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_2;")
+
+
+def test_mysql_dictionaries_custom_query_partial_load_simple_key(started_cluster):
+    mysql_connection = get_mysql_conn(started_cluster)
+
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table_1 (id Integer, value_1 Text);")
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table_2 (id Integer, value_2 Text);")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table_1 VALUES (1, 'Value_1');")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table_2 VALUES (1, 'Value_2');")
+
+    query = instance.query
+    query("""
+    CREATE DICTIONARY test_dictionary_custom_query
+    (
+        id UInt64,
+        value_1 String,
+        value_2 String
+    )
+    PRIMARY KEY id
+    LAYOUT(DIRECT())
+    SOURCE(MYSQL(
+        HOST 'mysql57'
+        PORT 3306
+        USER 'root'
+        PASSWORD 'clickhouse'
+        QUERY $doc$SELECT id, value_1, value_2 FROM test.test_table_1 INNER JOIN test.test_table_2 USING (id) WHERE {condition};$doc$))
+    """)
+
+    result = query("SELECT dictGet('test_dictionary_custom_query', ('value_1', 'value_2'), toUInt64(1))")
+
+    assert result == "('Value_1','Value_2')\n"
+
+    query("DROP DICTIONARY test_dictionary_custom_query;")
+
+    execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_1;")
+    execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_2;")
+
+
+def test_mysql_dictionaries_custom_query_partial_load_complex_key(started_cluster):
+    mysql_connection = get_mysql_conn(started_cluster)
+
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table_1 (id Integer, id_key Text, value_1 Text);")
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table_2 (id Integer, id_key Text, value_2 Text);")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table_1 VALUES (1, 'Key', 'Value_1');")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table_2 VALUES (1, 'Key', 'Value_2');")
+
+    query = instance.query
+    query("""
+    CREATE DICTIONARY test_dictionary_custom_query
+    (
+        id UInt64,
+        id_key String,
+        value_1 String,
+        value_2 String
+    )
+    PRIMARY KEY id, id_key
+    LAYOUT(COMPLEX_KEY_DIRECT())
+    SOURCE(MYSQL(
+        HOST 'mysql57'
+        PORT 3306
+        USER 'root'
+        PASSWORD 'clickhouse'
+        QUERY $doc$SELECT id, id_key, value_1, value_2 FROM test.test_table_1 INNER JOIN test.test_table_2 USING (id, id_key) WHERE {condition};$doc$))
+    """)
+
+    result = query("SELECT dictGet('test_dictionary_custom_query', ('value_1', 'value_2'), (toUInt64(1), 'Key'))")
+
+    assert result == "('Value_1','Value_2')\n"
+
+    query("DROP DICTIONARY test_dictionary_custom_query;")
+
+    execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_1;")
+    execute_mysql_query(mysql_connection, "DROP TABLE test.test_table_2;")
+
+
+def test_predefined_connection_configuration(started_cluster):
+    mysql_connection = get_mysql_conn(started_cluster)
+
+    execute_mysql_query(mysql_connection, "DROP TABLE IF EXISTS test.test_table")
+    execute_mysql_query(mysql_connection, "CREATE TABLE IF NOT EXISTS test.test_table (id Integer, value Integer);")
+    execute_mysql_query(mysql_connection, "INSERT INTO test.test_table VALUES (100, 200);")
+
+    instance.query('''
+    DROP DICTIONARY IF EXISTS dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql1))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    assert(int(result) == 200)
+
+    instance.query('''
+    DROP DICTIONARY dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql2))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query_and_get_error("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    instance.query('''
+    DROP DICTIONARY dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME unknown_collection))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query_and_get_error("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+
+    instance.query('''
+    DROP DICTIONARY dict;
+    CREATE DICTIONARY dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(MYSQL(NAME mysql3 PORT 3306))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = instance.query("SELECT dictGetUInt32(dict, 'value', toUInt64(100))")
+    assert(int(result) == 200)
 
 
 def create_mysql_db(mysql_connection, name):
@@ -102,9 +243,17 @@ def get_mysql_conn(started_cluster):
         except Exception as e:
             errors += [str(e)]
             time.sleep(1)
-    
+
     raise Exception("Connection not establised, {}".format(errors))
 
+def execute_mysql_query(connection, query):
+    logging.debug("Execute MySQL query:{}".format(query))
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore")
+        with connection.cursor() as cursor:
+            cursor.execute(query)
+        connection.commit()
+
 def create_mysql_table(conn, table_name):
     with conn.cursor() as cursor:
         cursor.execute(create_table_mysql_template.format(table_name))
diff --git a/tests/integration/test_dictionaries_null_value/configs/config.xml b/tests/integration/test_dictionaries_null_value/configs/config.xml
index 1e4c14585a9..c07d7ad7bff 100644
--- a/tests/integration/test_dictionaries_null_value/configs/config.xml
+++ b/tests/integration/test_dictionaries_null_value/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 	<logger>
 		<level>trace</level>
 		<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_null_value/configs/dictionaries/cache.xml b/tests/integration/test_dictionaries_null_value/configs/dictionaries/cache.xml
index 9a1ae0732db..f04845124b0 100644
--- a/tests/integration/test_dictionaries_null_value/configs/dictionaries/cache.xml
+++ b/tests/integration/test_dictionaries_null_value/configs/dictionaries/cache.xml
@@ -1,4 +1,4 @@
-    <yandex>
+    <clickhouse>
        <dictionary>
             <name>cache</name>
 
@@ -110,4 +110,4 @@
                 </attribute>
             </structure>
         </dictionary>
-    </yandex>
+    </clickhouse>
diff --git a/tests/integration/test_dictionaries_null_value/configs/users.xml b/tests/integration/test_dictionaries_null_value/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_null_value/configs/users.xml
+++ b/tests/integration/test_dictionaries_null_value/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_postgresql/configs/config.xml b/tests/integration/test_dictionaries_postgresql/configs/config.xml
index 77d92134765..48c9dff364a 100644
--- a/tests/integration/test_dictionaries_postgresql/configs/config.xml
+++ b/tests/integration/test_dictionaries_postgresql/configs/config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <dictionaries_config>/etc/clickhouse-server/config.d/postgres_dict.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml b/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml
index 4ee07d0972a..8b69d74b67c 100644
--- a/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml
+++ b/tests/integration/test_dictionaries_postgresql/configs/dictionaries/postgres_dict.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <dictionary>
       <name>dict0</name>
       <source>
@@ -19,10 +19,10 @@
       <structure>
          <id>
             <name>id</name>
-            <type>UInt32</type>
+            <!--<type>UInt32</type>-->
          </id>
          <attribute>
-            <name>id</name>
+            <name>key</name>
             <type>UInt32</type>
             <null_value></null_value>
          </attribute>
@@ -65,10 +65,10 @@
       <structure>
          <id>
             <name>id</name>
-            <type>UInt32</type>
+            <!--<type>UInt32</type>-->
          </id>
          <attribute>
-            <name>id</name>
+            <name>key</name>
             <type>UInt32</type>
             <null_value></null_value>
          </attribute>
@@ -80,4 +80,4 @@
       </structure>
       <lifetime>1</lifetime>
   </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml b/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml
new file mode 100644
index 00000000000..647840848fd
--- /dev/null
+++ b/tests/integration/test_dictionaries_postgresql/configs/named_collections.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+            <schema>test_schema</schema>
+        </postgres2>
+        <postgres3>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres</database>
+            <table>test_table</table>
+        </postgres3>
+        <postgres4>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </postgres4>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_postgresql/test.py b/tests/integration/test_dictionaries_postgresql/test.py
index d35182e15a1..8869e9112d1 100644
--- a/tests/integration/test_dictionaries_postgresql/test.py
+++ b/tests/integration/test_dictionaries_postgresql/test.py
@@ -8,16 +8,16 @@ from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance('node1',
-                             main_configs=['configs/config.xml', 'configs/dictionaries/postgres_dict.xml'],
+                             main_configs=['configs/config.xml', 'configs/dictionaries/postgres_dict.xml', 'configs/named_collections.xml'],
                              with_postgres=True, with_postgres_cluster=True)
 
 postgres_dict_table_template = """
     CREATE TABLE IF NOT EXISTS {} (
-    id Integer NOT NULL, value Integer NOT NULL, PRIMARY KEY (id))
+    id Integer NOT NULL, key Integer NOT NULL, value Integer NOT NULL, PRIMARY KEY (id))
     """
 click_dict_table_template = """
     CREATE TABLE IF NOT EXISTS `test`.`dict_table_{}` (
-        `id` UInt64, `value` UInt32
+        `key` UInt32, `value` UInt32
     ) ENGINE = Dictionary({})
     """
 
@@ -43,7 +43,7 @@ def create_and_fill_postgres_table(cursor, table_name, port, host):
     create_postgres_table(cursor, table_name)
     # Fill postgres table using clickhouse postgres table function and check
     table_func = '''postgresql('{}:{}', 'clickhouse', '{}', 'postgres', 'mysecretpassword')'''.format(host, port, table_name)
-    node1.query('''INSERT INTO TABLE FUNCTION {} SELECT number, number from numbers(10000)
+    node1.query('''INSERT INTO TABLE FUNCTION {} SELECT number, number, number from numbers(10000)
             '''.format(table_func, table_name))
     result = node1.query("SELECT count() FROM {}".format(table_func))
     assert result.rstrip() == '10000'
@@ -82,7 +82,7 @@ def test_load_dictionaries(started_cluster):
 
     node1.query("SYSTEM RELOAD DICTIONARY {}".format(dict_name))
     assert node1.query("SELECT count() FROM `test`.`dict_table_{}`".format(table_name)).rstrip() == '10000'
-    assert node1.query("SELECT dictGetUInt32('{}', 'id', toUInt64(0))".format(dict_name)) == '0\n'
+    assert node1.query("SELECT dictGetUInt32('{}', 'key', toUInt64(0))".format(dict_name)) == '0\n'
     assert node1.query("SELECT dictGetUInt32('{}', 'value', toUInt64(9999))".format(dict_name)) == '9999\n'
 
     cursor.execute("DROP TABLE IF EXISTS {}".format(table_name))
@@ -90,6 +90,121 @@ def test_load_dictionaries(started_cluster):
     node1.query("DROP DICTIONARY IF EXISTS {}".format(dict_name))
 
 
+def test_postgres_dictionaries_custom_query_full_load(started_cluster):
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, database=True, port=started_cluster.postgres_port)
+    cursor = conn.cursor()
+
+    cursor.execute("CREATE TABLE IF NOT EXISTS test_table_1 (id Integer, value_1 Text);")
+    cursor.execute("CREATE TABLE IF NOT EXISTS test_table_2 (id Integer, value_2 Text);")
+    cursor.execute("INSERT INTO test_table_1 VALUES (1, 'Value_1');")
+    cursor.execute("INSERT INTO test_table_2 VALUES (1, 'Value_2');")
+
+    query = node1.query
+    query("""
+    CREATE DICTIONARY test_dictionary_custom_query
+    (
+        id UInt64,
+        value_1 String,
+        value_2 String
+    )
+    PRIMARY KEY id
+    LAYOUT(FLAT())
+    SOURCE(PostgreSQL(
+        DB 'clickhouse'
+        HOST '{}'
+        PORT {}
+        USER 'postgres'
+        PASSWORD 'mysecretpassword'
+        QUERY $doc$SELECT id, value_1, value_2 FROM test_table_1 INNER JOIN test_table_2 USING (id);$doc$))
+    LIFETIME(0)
+    """.format(started_cluster.postgres_ip, started_cluster.postgres_port))
+
+    result = query("SELECT id, value_1, value_2 FROM test_dictionary_custom_query")
+
+    assert result == '1\tValue_1\tValue_2\n'
+
+    query("DROP DICTIONARY test_dictionary_custom_query;")
+
+    cursor.execute("DROP TABLE test_table_2;")
+    cursor.execute("DROP TABLE test_table_1;")
+
+
+def test_postgres_dictionaries_custom_query_partial_load_simple_key(started_cluster):
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, database=True, port=started_cluster.postgres_port)
+    cursor = conn.cursor()
+
+    cursor.execute("CREATE TABLE IF NOT EXISTS test_table_1 (id Integer, value_1 Text);")
+    cursor.execute("CREATE TABLE IF NOT EXISTS test_table_2 (id Integer, value_2 Text);")
+    cursor.execute("INSERT INTO test_table_1 VALUES (1, 'Value_1');")
+    cursor.execute("INSERT INTO test_table_2 VALUES (1, 'Value_2');")
+
+    query = node1.query
+    query("""
+    CREATE DICTIONARY test_dictionary_custom_query
+    (
+        id UInt64,
+        value_1 String,
+        value_2 String
+    )
+    PRIMARY KEY id
+    LAYOUT(DIRECT())
+    SOURCE(PostgreSQL(
+        DB 'clickhouse'
+        HOST '{}'
+        PORT {}
+        USER 'postgres'
+        PASSWORD 'mysecretpassword'
+        QUERY $doc$SELECT id, value_1, value_2 FROM test_table_1 INNER JOIN test_table_2 USING (id) WHERE {{condition}};$doc$))
+    """.format(started_cluster.postgres_ip, started_cluster.postgres_port))
+
+    result = query("SELECT dictGet('test_dictionary_custom_query', ('value_1', 'value_2'), toUInt64(1))")
+
+    assert result == '(\'Value_1\',\'Value_2\')\n'
+
+    query("DROP DICTIONARY test_dictionary_custom_query;")
+
+    cursor.execute("DROP TABLE test_table_2;")
+    cursor.execute("DROP TABLE test_table_1;")
+
+
+def test_postgres_dictionaries_custom_query_partial_load_complex_key(started_cluster):
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, database=True, port=started_cluster.postgres_port)
+    cursor = conn.cursor()
+
+    cursor.execute("CREATE TABLE IF NOT EXISTS test_table_1 (id Integer, key Text, value_1 Text);")
+    cursor.execute("CREATE TABLE IF NOT EXISTS test_table_2 (id Integer, key Text, value_2 Text);")
+    cursor.execute("INSERT INTO test_table_1 VALUES (1, 'Key', 'Value_1');")
+    cursor.execute("INSERT INTO test_table_2 VALUES (1, 'Key', 'Value_2');")
+
+    query = node1.query
+    query("""
+    CREATE DICTIONARY test_dictionary_custom_query
+    (
+        id UInt64,
+        key String,
+        value_1 String,
+        value_2 String
+    )
+    PRIMARY KEY id, key
+    LAYOUT(COMPLEX_KEY_DIRECT())
+    SOURCE(PostgreSQL(
+        DB 'clickhouse'
+        HOST '{}'
+        PORT {}
+        USER 'postgres'
+        PASSWORD 'mysecretpassword'
+        QUERY $doc$SELECT id, key, value_1, value_2 FROM test_table_1 INNER JOIN test_table_2 USING (id, key) WHERE {{condition}};$doc$))
+    """.format(started_cluster.postgres_ip, started_cluster.postgres_port))
+
+    result = query("SELECT dictGet('test_dictionary_custom_query', ('value_1', 'value_2'), (toUInt64(1), 'Key'))")
+
+    assert result == '(\'Value_1\',\'Value_2\')\n'
+
+    query("DROP DICTIONARY test_dictionary_custom_query;")
+
+    cursor.execute("DROP TABLE test_table_2;")
+    cursor.execute("DROP TABLE test_table_1;")
+
 def test_invalidate_query(started_cluster):
     conn = get_postgres_conn(ip=started_cluster.postgres_ip, database=True, port=started_cluster.postgres_port)
     cursor = conn.cursor()
@@ -137,11 +252,11 @@ def test_dictionary_with_replicas(started_cluster):
     create_postgres_table(cursor1, 'test1')
     create_postgres_table(cursor2, 'test1')
 
-    cursor1.execute('INSERT INTO test1 select i, i from generate_series(0, 99) as t(i);');
-    cursor2.execute('INSERT INTO test1 select i, i from generate_series(100, 199) as t(i);');
+    cursor1.execute('INSERT INTO test1 select i, i, i from generate_series(0, 99) as t(i);')
+    cursor2.execute('INSERT INTO test1 select i, i, i from generate_series(100, 199) as t(i);')
 
     create_dict('test1', 1)
-    result = node1.query("SELECT * FROM `test`.`dict_table_test1` ORDER BY id")
+    result = node1.query("SELECT * FROM `test`.`dict_table_test1` ORDER BY key")
 
     # priority 0 - non running port
     assert node1.contains_in_log('PostgreSQLConnectionPool: Connection error*')
@@ -158,7 +273,7 @@ def test_dictionary_with_replicas(started_cluster):
     node1.query("DROP DICTIONARY IF EXISTS dict1")
 
 
-def test_postgres_scema(started_cluster):
+def test_postgres_schema(started_cluster):
     conn = get_postgres_conn(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port, database=True)
     cursor = conn.cursor()
 
@@ -187,6 +302,73 @@ def test_postgres_scema(started_cluster):
     node1.query("DROP DICTIONARY IF EXISTS postgres_dict")
 
 
+def test_predefined_connection_configuration(started_cluster):
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port, database=True)
+    cursor = conn.cursor()
+
+    cursor.execute('DROP TABLE IF EXISTS test_table')
+    cursor.execute('CREATE TABLE test_table (id integer, value integer)')
+    cursor.execute('INSERT INTO test_table SELECT i, i FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres1))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 99)
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema CASCADE')
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (id integer, value integer)')
+    cursor.execute('INSERT INTO test_schema.test_table SELECT i, 100 FROM generate_series(0, 99) as t(i)')
+
+    node1.query('''
+    DROP DICTIONARY postgres_dict;
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres1 SCHEMA test_schema))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 100)
+
+    node1.query('''
+    DROP DICTIONARY postgres_dict;
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres2))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 100)
+
+    node1.query('DROP DICTIONARY postgres_dict')
+    node1.query('''
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres4))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query_and_get_error("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+
+    node1.query('''
+    DROP DICTIONARY postgres_dict;
+    CREATE DICTIONARY postgres_dict (id UInt32, value UInt32)
+    PRIMARY KEY id
+    SOURCE(POSTGRESQL(NAME postgres1 PORT 5432))
+        LIFETIME(MIN 1 MAX 2)
+        LAYOUT(HASHED());
+    ''')
+    result = node1.query("SELECT dictGetUInt32(postgres_dict, 'value', toUInt64(99))")
+    assert(int(result.strip()) == 99)
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_dictionaries_select_all/configs/config.xml b/tests/integration/test_dictionaries_select_all/configs/config.xml
index 1e4c14585a9..c07d7ad7bff 100644
--- a/tests/integration/test_dictionaries_select_all/configs/config.xml
+++ b/tests/integration/test_dictionaries_select_all/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 	<logger>
 		<level>trace</level>
 		<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_select_all/configs/users.xml b/tests/integration/test_dictionaries_select_all/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_select_all/configs/users.xml
+++ b/tests/integration/test_dictionaries_select_all/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_select_all/generate_dictionaries.py b/tests/integration/test_dictionaries_select_all/generate_dictionaries.py
index 109ecea438e..4208615bdc3 100644
--- a/tests/integration/test_dictionaries_select_all/generate_dictionaries.py
+++ b/tests/integration/test_dictionaries_select_all/generate_dictionaries.py
@@ -44,7 +44,7 @@ def generate_structure():
 
 def generate_dictionaries(path, structure):
     dictionary_skeleton = '''
-    <yandex>
+    <clickhouse>
        <dictionary>
            <name>{name}</name>
 
@@ -69,7 +69,7 @@ def generate_dictionaries(path, structure):
                {parent}
            </structure>
        </dictionary>
-    </yandex>'''
+    </clickhouse>'''
     attribute_skeleton = '''
     <attribute>
         <name>%s_</name>
diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/config.xml b/tests/integration/test_dictionaries_update_and_reload/configs/config.xml
index a1cd1e932b6..2e4117ac15b 100644
--- a/tests/integration/test_dictionaries_update_and_reload/configs/config.xml
+++ b/tests/integration/test_dictionaries_update_and_reload/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -26,4 +26,4 @@
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/cache_xypairs.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/cache_xypairs.xml
index 982f77d013c..a9a1ad9f341 100644
--- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/cache_xypairs.xml
+++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/cache_xypairs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 	<dictionary>
 		<name>cache_xypairs</name>
 		<source>
@@ -31,4 +31,4 @@
 			</attribute>
 		</structure>
 	</dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml
index 519a2915a59..c34107e30d9 100644
--- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml
+++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/executable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
   <dictionary>
     <name>executable</name>
     <source>
@@ -16,4 +16,4 @@
       </attribute>
     </structure>
   </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml
index 70d491dc7c1..1679801aed0 100644
--- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml
+++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <dictionary>
       <name>file</name>
       <source>
@@ -50,4 +50,4 @@
         </attribute>
       </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml
index c6814c5fe9c..16b00ecd76a 100644
--- a/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml
+++ b/tests/integration/test_dictionaries_update_and_reload/configs/dictionaries/slow.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
   <dictionary>
     <name>slow</name>
     <source>
@@ -16,4 +16,4 @@
       </attribute>
     </structure>
   </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_and_reload/configs/users.xml b/tests/integration/test_dictionaries_update_and_reload/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_update_and_reload/configs/users.xml
+++ b/tests/integration/test_dictionaries_update_and_reload/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_field/configs/config.xml b/tests/integration/test_dictionaries_update_field/configs/config.xml
index a1518083be3..4030d72e92a 100644
--- a/tests/integration/test_dictionaries_update_field/configs/config.xml
+++ b/tests/integration/test_dictionaries_update_field/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <logger>
 	<level>trace</level>
 	<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_update_field/configs/users.xml b/tests/integration/test_dictionaries_update_field/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionaries_update_field/configs/users.xml
+++ b/tests/integration/test_dictionaries_update_field/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml b/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml
index a1518083be3..4030d72e92a 100644
--- a/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml
+++ b/tests/integration/test_dictionary_allow_read_expired_keys/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 <logger>
 	<level>trace</level>
 	<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_ints_dictionary.xml b/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_ints_dictionary.xml
index e01bcddd19a..221b67ca79c 100644
--- a/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_ints_dictionary.xml
+++ b/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_ints_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <dictionary>
     <name>experimental_dict</name>
     <source>
@@ -70,4 +70,4 @@
         </attribute>
     </structure>
 </dictionary>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_strings_default_settings.xml b/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_strings_default_settings.xml
index 11807bc1ad6..ca6bb1771c1 100644
--- a/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_strings_default_settings.xml
+++ b/tests/integration/test_dictionary_allow_read_expired_keys/configs/dictionaries/cache_strings_default_settings.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <dictionary>
     <name>default_string</name>
     <source>
@@ -32,4 +32,4 @@
         </attribute>
     </structure>
 </dictionary>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml b/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml
+++ b/tests/integration/test_dictionary_allow_read_expired_keys/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_custom_settings/configs/config.xml b/tests/integration/test_dictionary_custom_settings/configs/config.xml
index 1e4c14585a9..c07d7ad7bff 100644
--- a/tests/integration/test_dictionary_custom_settings/configs/config.xml
+++ b/tests/integration/test_dictionary_custom_settings/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 	<logger>
 		<level>trace</level>
 		<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -27,4 +27,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ClickHouseSourceConfig.xml b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ClickHouseSourceConfig.xml
index 2191c8ded8a..5472924ab52 100644
--- a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ClickHouseSourceConfig.xml
+++ b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ClickHouseSourceConfig.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>test_clickhouse</name>
         
@@ -45,4 +45,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ExecutableSourceConfig.xml b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ExecutableSourceConfig.xml
index 4ae582637c1..aef1339bc77 100644
--- a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ExecutableSourceConfig.xml
+++ b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/ExecutableSourceConfig.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>test_executable</name>
         
@@ -42,4 +42,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/FileSourceConfig.xml b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/FileSourceConfig.xml
index 7d2b029415a..63f64848de9 100644
--- a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/FileSourceConfig.xml
+++ b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/FileSourceConfig.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>test_file</name>
         
@@ -42,4 +42,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/HTTPSourceConfig.xml b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/HTTPSourceConfig.xml
index dc03974c4b6..7238b6a3bd4 100644
--- a/tests/integration/test_dictionary_custom_settings/configs/dictionaries/HTTPSourceConfig.xml
+++ b/tests/integration/test_dictionary_custom_settings/configs/dictionaries/HTTPSourceConfig.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>test_http</name>
         <source>
@@ -51,4 +51,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_custom_settings/configs/users.xml b/tests/integration/test_dictionary_custom_settings/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_dictionary_custom_settings/configs/users.xml
+++ b/tests/integration/test_dictionary_custom_settings/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/clusters.xml b/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/clusters.xml
index bead63a1641..eb990a6d275 100644
--- a/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/clusters.xml
+++ b/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <cluster>
         <shard>
@@ -25,4 +25,4 @@
         </shard>
     </cluster>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/ddl.xml b/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/ddl.xml
index 451e407c160..acb20898cd6 100644
--- a/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/ddl.xml
+++ b/tests/integration/test_dictionary_ddl_on_cluster/configs/config.d/ddl.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
 <distributed_ddl>
     <path>/clickhouse/task_queue/ddl</path>
     <max_tasks_in_queue>10</max_tasks_in_queue>
     <task_max_lifetime>3600</task_max_lifetime>
     <cleanup_delay_period>5</cleanup_delay_period>
 </distributed_ddl>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_disabled_mysql_server/configs/remote_servers.xml b/tests/integration/test_disabled_mysql_server/configs/remote_servers.xml
index de8e5865f12..9c7f02c190f 100644
--- a/tests/integration/test_disabled_mysql_server/configs/remote_servers.xml
+++ b/tests/integration/test_disabled_mysql_server/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -9,4 +9,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/macros.xml b/tests/integration/test_disk_over_web_server/__init__.py
similarity index 100%
rename from tests/testflows/window_functions/configs/clickhouse/config.d/macros.xml
rename to tests/integration/test_disk_over_web_server/__init__.py
diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf.xml
new file mode 100644
index 00000000000..7e5c22c6e4d
--- /dev/null
+++ b/tests/integration/test_disk_over_web_server/configs/storage_conf.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <def>
+                <type>local</type>
+                <path>/</path>
+            </def>
+        </disks>
+        <policies>
+            <def>
+                <volumes>
+                    <main>
+                        <disk>def</disk>
+                    </main>
+                </volumes>
+            </def>
+        </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
new file mode 100644
index 00000000000..e08ff555c20
--- /dev/null
+++ b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <web>
+                <type>web</type>
+                <endpoint>http://nginx:80/test1/</endpoint>
+            </web>
+        </disks>
+        <policies>
+            <web>
+                <volumes>
+                    <main>
+                        <disk>web</disk>
+                    </main>
+                </volumes>
+            </web>
+        </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
new file mode 100644
index 00000000000..b8629fdbe9e
--- /dev/null
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -0,0 +1,85 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+uuids = []
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance("node1", main_configs=["configs/storage_conf.xml"], with_nginx=True)
+        cluster.add_instance("node2", main_configs=["configs/storage_conf_web.xml"], with_nginx=True)
+        cluster.add_instance("node3", main_configs=["configs/storage_conf_web.xml"], with_nginx=True)
+        cluster.start()
+
+        node1 = cluster.instances["node1"]
+        expected = ""
+        global uuids
+        for i in range(3):
+            node1.query(""" CREATE TABLE data{} (id Int32) ENGINE = MergeTree() ORDER BY id SETTINGS storage_policy = 'def';""".format(i))
+            node1.query("INSERT INTO data{} SELECT number FROM numbers(500000 * {})".format(i, i + 1))
+            expected = node1.query("SELECT * FROM data{} ORDER BY id".format(i))
+
+            metadata_path = node1.query("SELECT data_paths FROM system.tables WHERE name='data{}'".format(i))
+            metadata_path = metadata_path[metadata_path.find('/'):metadata_path.rfind('/')+1]
+            print(f'Metadata: {metadata_path}')
+
+            node1.exec_in_container(['bash', '-c',
+                                    '/usr/bin/clickhouse static-files-disk-uploader --test-mode --url http://nginx:80/test1 --metadata-path {}'.format(metadata_path)], user='root')
+            parts = metadata_path.split('/')
+            uuids.append(parts[3])
+            print(f'UUID: {parts[3]}')
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_usage(cluster):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node2"]
+    global uuids
+    assert(len(uuids) == 3)
+    for i in range(3):
+        node2.query("""
+            ATTACH TABLE test{} UUID '{}'
+            (id Int32) ENGINE = MergeTree() ORDER BY id
+            SETTINGS storage_policy = 'web';
+        """.format(i, uuids[i], i, i))
+
+        result = node2.query("SELECT count() FROM test{}".format(i))
+        assert(int(result) == 500000 * (i+1))
+
+        result = node2.query("SELECT id FROM test{} WHERE id % 56 = 3 ORDER BY id".format(i))
+        assert(result == node1.query("SELECT id FROM data{} WHERE id % 56 = 3 ORDER BY id".format(i)))
+
+        result = node2.query("SELECT id FROM test{} WHERE id > 789999 AND id < 999999 ORDER BY id".format(i))
+        assert(result == node1.query("SELECT id FROM data{} WHERE id > 789999 AND id < 999999 ORDER BY id".format(i)))
+
+        node2.query("DROP TABLE test{}".format(i))
+        print(f"Ok {i}")
+
+
+def test_incorrect_usage(cluster):
+    node1 = cluster.instances["node1"]
+    node2 = cluster.instances["node3"]
+    global uuids
+    node2.query("""
+        ATTACH TABLE test0 UUID '{}'
+        (id Int32) ENGINE = MergeTree() ORDER BY id
+        SETTINGS storage_policy = 'web';
+    """.format(uuids[0]))
+
+    result = node2.query("SELECT count() FROM test0")
+    assert(int(result) == 500000)
+
+    result = node2.query_and_get_error("ALTER TABLE test0 ADD COLUMN col1 Int32 first")
+    assert("Table is read-only" in result)
+
+    result = node2.query_and_get_error("TRUNCATE TABLE test0")
+    assert("Table is read-only" in result)
+
+    node2.query("DROP TABLE test0")
+
diff --git a/tests/integration/test_disk_types/configs/config.xml b/tests/integration/test_disk_types/configs/config.xml
index 0902130e106..04456ee112b 100644
--- a/tests/integration/test_disk_types/configs/config.xml
+++ b/tests/integration/test_disk_types/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -44,4 +44,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_disk_types/configs/storage.xml b/tests/integration/test_disk_types/configs/storage.xml
index 4d8050c050c..e933c7781ea 100644
--- a/tests/integration/test_disk_types/configs/storage.xml
+++ b/tests/integration/test_disk_types/configs/storage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <disk_s3>
@@ -22,4 +22,4 @@
             </disk_encrypted>
         </disks>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_disk_types/configs/users.xml b/tests/integration/test_disk_types/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_disk_types/configs/users.xml
+++ b/tests/integration/test_disk_types/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_backward_compatability/configs/legacy.xml b/tests/integration/test_distributed_backward_compatability/configs/legacy.xml
index 01bd56de845..5c1985a17a4 100644
--- a/tests/integration/test_distributed_backward_compatability/configs/legacy.xml
+++ b/tests/integration/test_distributed_backward_compatability/configs/legacy.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <legacy_column_name_of_tuple_literal>1</legacy_column_name_of_tuple_literal>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml b/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml
index 88c7117eee1..b353f88f4cd 100644
--- a/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml
+++ b/tests/integration/test_distributed_ddl/configs/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
 
     <!-- Main cluster -->
@@ -90,4 +90,4 @@
     </cluster_no_replicas>
 
 </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs/config.d/ddl.xml b/tests/integration/test_distributed_ddl/configs/config.d/ddl.xml
index c819fc7713a..02708c22026 100644
--- a/tests/integration/test_distributed_ddl/configs/config.d/ddl.xml
+++ b/tests/integration/test_distributed_ddl/configs/config.d/ddl.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <path>/clickhouse/task_queue/ddl</path>
         <max_tasks_in_queue>10</max_tasks_in_queue>
         <task_max_lifetime>3600</task_max_lifetime>
         <cleanup_delay_period>5</cleanup_delay_period>
     </distributed_ddl>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs/config.d/macro.xml b/tests/integration/test_distributed_ddl/configs/config.d/macro.xml
index 2152e3f35bf..a2eb46dba9e 100644
--- a/tests/integration/test_distributed_ddl/configs/config.d/macro.xml
+++ b/tests/integration/test_distributed_ddl/configs/config.d/macro.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
         <macros>
                 <cluster>cluster_no_replicas</cluster>
         </macros>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs/config.d/query_log.xml b/tests/integration/test_distributed_ddl/configs/config.d/query_log.xml
index 839ef92c6dc..1efc65bdb28 100644
--- a/tests/integration/test_distributed_ddl/configs/config.d/query_log.xml
+++ b/tests/integration/test_distributed_ddl/configs/config.d/query_log.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Query log. Used only for queries with setting log_queries = 1. -->
     <query_log>
         <!-- What table to insert data. If table is not exist, it will be created.
@@ -11,4 +11,4 @@
         <!-- Interval of flushing data. -->
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </query_log>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs/config.d/zookeeper_session_timeout.xml b/tests/integration/test_distributed_ddl/configs/config.d/zookeeper_session_timeout.xml
index caa0ff11137..d0ab2994d3a 100644
--- a/tests/integration/test_distributed_ddl/configs/config.d/zookeeper_session_timeout.xml
+++ b/tests/integration/test_distributed_ddl/configs/config.d/zookeeper_session_timeout.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <!-- Required for correct timing in current test case -->
         <session_timeout_ms replace="1">15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs/users.d/query_log.xml b/tests/integration/test_distributed_ddl/configs/users.d/query_log.xml
index 0f389295bec..26db7f54514 100644
--- a/tests/integration/test_distributed_ddl/configs/users.d/query_log.xml
+++ b/tests/integration/test_distributed_ddl/configs/users.d/query_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <profiles>
         <!-- Default profile settings. -->
         <default>
             <log_queries>1</log_queries>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs/users.d/restricted_user.xml b/tests/integration/test_distributed_ddl/configs/users.d/restricted_user.xml
index 5b6084eea7b..196249466a5 100644
--- a/tests/integration/test_distributed_ddl/configs/users.d/restricted_user.xml
+++ b/tests/integration/test_distributed_ddl/configs/users.d/restricted_user.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
     	<restricted_user>
     		<password></password>
@@ -13,4 +13,4 @@
 	        </allow_databases>
     	</restricted_user>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml
index 2aede3ba5bc..6c462ea6087 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <tcp_port_secure>9440</tcp_port_secure>
 <remote_servers>
 
@@ -103,4 +103,4 @@
     </cluster_no_replicas>
 
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/ddl.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/ddl.xml
index c819fc7713a..02708c22026 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/ddl.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/ddl.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <path>/clickhouse/task_queue/ddl</path>
         <max_tasks_in_queue>10</max_tasks_in_queue>
         <task_max_lifetime>3600</task_max_lifetime>
         <cleanup_delay_period>5</cleanup_delay_period>
     </distributed_ddl>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/macro.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/macro.xml
index 2152e3f35bf..a2eb46dba9e 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/macro.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/macro.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
         <macros>
                 <cluster>cluster_no_replicas</cluster>
         </macros>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/query_log.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/query_log.xml
index 839ef92c6dc..1efc65bdb28 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/query_log.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/query_log.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- Query log. Used only for queries with setting log_queries = 1. -->
     <query_log>
         <!-- What table to insert data. If table is not exist, it will be created.
@@ -11,4 +11,4 @@
         <!-- Interval of flushing data. -->
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </query_log>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/ssl_conf.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/ssl_conf.xml
index fe39e3712b8..6234477993a 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/ssl_conf.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/ssl_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
@@ -15,4 +15,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs_secure/config.d/zookeeper_session_timeout.xml b/tests/integration/test_distributed_ddl/configs_secure/config.d/zookeeper_session_timeout.xml
index caa0ff11137..d0ab2994d3a 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/config.d/zookeeper_session_timeout.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/config.d/zookeeper_session_timeout.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <!-- Required for correct timing in current test case -->
         <session_timeout_ms replace="1">15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs_secure/users.d/query_log.xml b/tests/integration/test_distributed_ddl/configs_secure/users.d/query_log.xml
index 0f389295bec..26db7f54514 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/users.d/query_log.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/users.d/query_log.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <profiles>
         <!-- Default profile settings. -->
         <default>
             <log_queries>1</log_queries>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl/configs_secure/users.d/restricted_user.xml b/tests/integration/test_distributed_ddl/configs_secure/users.d/restricted_user.xml
index 5b6084eea7b..196249466a5 100644
--- a/tests/integration/test_distributed_ddl/configs_secure/users.d/restricted_user.xml
+++ b/tests/integration/test_distributed_ddl/configs_secure/users.d/restricted_user.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
     	<restricted_user>
     		<password></password>
@@ -13,4 +13,4 @@
 	        </allow_databases>
     	</restricted_user>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_on_cross_replication/configs/remote_servers.xml b/tests/integration/test_distributed_ddl_on_cross_replication/configs/remote_servers.xml
index 6020f6110df..a7389f1c472 100644
--- a/tests/integration/test_distributed_ddl_on_cross_replication/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_ddl_on_cross_replication/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <cross_3shards_2replicas>
             <shard>
@@ -42,4 +42,4 @@
             </shard>
         </cross_3shards_2replicas>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/ddl.xml b/tests/integration/test_distributed_ddl_parallel/configs/ddl.xml
index b926f99c687..e88c7f516bc 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/ddl.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/ddl.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <pool_size replace="1">2</pool_size>
     </distributed_ddl>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml b/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml
index b926f99c687..e88c7f516bc 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/ddl_a.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <pool_size replace="1">2</pool_size>
     </distributed_ddl>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml b/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml
index 2f038919032..b547845ee23 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/ddl_b.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <distributed_ddl>
         <pool_size replace="1">20</pool_size>
     </distributed_ddl>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/dict.xml b/tests/integration/test_distributed_ddl_parallel/configs/dict.xml
index d94b3f61dd9..580d95c6e5e 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/dict.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/dict.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <dictionary>
         <name>slow_dict_7</name>
         <source>
@@ -47,4 +47,4 @@
         </structure>
         <lifetime>0</lifetime>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml b/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml
index eb0ee60186b..ecc82830822 100644
--- a/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_ddl_parallel/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <cluster_a>
         <shard>
@@ -29,4 +29,4 @@
         </shard>
     </cluster_b>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_password/configs/config.d/clusters.xml b/tests/integration/test_distributed_ddl_password/configs/config.d/clusters.xml
index ffc4baa1199..3e3590fe2b7 100644
--- a/tests/integration/test_distributed_ddl_password/configs/config.d/clusters.xml
+++ b/tests/integration/test_distributed_ddl_password/configs/config.d/clusters.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <awesome_cluster>
         <shard>
@@ -38,4 +38,4 @@
         </shard>
     </simple_cluster>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_ddl_password/configs/users.d/default_with_password.xml b/tests/integration/test_distributed_ddl_password/configs/users.d/default_with_password.xml
index 2220b925840..6ca558a8360 100644
--- a/tests/integration/test_distributed_ddl_password/configs/users.d/default_with_password.xml
+++ b/tests/integration/test_distributed_ddl_password/configs/users.d/default_with_password.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -19,4 +19,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml
index 4e4ccf75323..397e05e7a60 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <!-- always send via network -->
@@ -12,4 +12,4 @@
             <distributed_directory_monitor_max_sleep_time_ms>86400</distributed_directory_monitor_max_sleep_time_ms>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml
index d7c69c4a9ac..2ffd5beaf8d 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/overrides_2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <!-- always send via network -->
@@ -12,4 +12,4 @@
             <distributed_directory_monitor_max_sleep_time_ms>86400</distributed_directory_monitor_max_sleep_time_ms>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/remote_servers.xml b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/remote_servers.xml
index ebce4697529..68b420f36b4 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py
index 9cbf8771ee5..b0b89fde41f 100644
--- a/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py
+++ b/tests/integration/test_distributed_directory_monitor_split_batch_on_failure/test.py
@@ -42,6 +42,7 @@ def test_distributed_directory_monitor_split_batch_on_failure_OFF(started_cluste
             # max_memory_usage is the limit for the batch on the remote node
             # (local query should not be affected since 30MB is enough for 100K rows)
             'max_memory_usage': '30Mi',
+            'max_untracked_memory': '0'
         })
     # "Received from" is mandatory, since the exception should be thrown on the remote node.
     with pytest.raises(QueryRuntimeException, match=r'DB::Exception: Received from.*Memory limit \(for query\) exceeded: .*while pushing to view default\.mv'):
@@ -55,6 +56,7 @@ def test_distributed_directory_monitor_split_batch_on_failure_ON(started_cluster
             # max_memory_usage is the limit for the batch on the remote node
             # (local query should not be affected since 30MB is enough for 100K rows)
             'max_memory_usage': '30Mi',
+            'max_untracked_memory': '0'
         })
     node1.query('system flush distributed dist')
     assert int(node1.query('select count() from dist_data')) == 100000
diff --git a/tests/integration/test_distributed_format/configs/remote_servers.xml b/tests/integration/test_distributed_format/configs/remote_servers.xml
index 87eaea50a8b..cfd66c707f1 100644
--- a/tests/integration/test_distributed_format/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_format/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster_internal_replication>
             <shard>
@@ -17,4 +17,4 @@
             </node>
         </test_cluster_no_internal_replication>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml
index 0ff521ac800..f5888a974f1 100644
--- a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <insecure>
             <node>
@@ -20,7 +20,9 @@
             <node>
                 <host>n2</host>
                 <port>9000</port>
+                <!-- This is required only to -> replace it -> to force cluster reload -> to recreate connections -->
+                <priority>1</priority>
             </node>
         </secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n1.xml b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n1.xml
index 70f8cee679a..3283e577eea 100644
--- a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n1.xml
+++ b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <secure_disagree>
             <secret>bar_n1</secret>
@@ -12,4 +12,4 @@
             </node>
         </secure_disagree>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n2.xml b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n2.xml
index 316e8a49afa..6d17e43bde5 100644
--- a/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n2.xml
+++ b/tests/integration/test_distributed_inter_server_secret/configs/remote_servers_n2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <secure_disagree>
             <secret>bar_n2</secret>
@@ -12,4 +12,4 @@
             </node>
         </secure_disagree>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/configs/users.xml b/tests/integration/test_distributed_inter_server_secret/configs/users.xml
index 1b012bfea9c..d73fbc2183b 100644
--- a/tests/integration/test_distributed_inter_server_secret/configs/users.xml
+++ b/tests/integration/test_distributed_inter_server_secret/configs/users.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
+
+        <ro>
+            <readonly>1</readonly>
+        </ro>
     </profiles>
 
     <users>
@@ -32,10 +36,19 @@
             <profile>default</profile>
             <quota>default</quota>
         </pass>
+
+        <ro>
+            <password></password>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>ro</profile>
+            <quota>default</quota>
+        </ro>
     </users>
 
     <quotas>
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py
index 0e77fc6e162..73d338ba870 100644
--- a/tests/integration/test_distributed_inter_server_secret/test.py
+++ b/tests/integration/test_distributed_inter_server_secret/test.py
@@ -3,6 +3,8 @@
 # pylint: disable=line-too-long
 
 import pytest
+import uuid
+import time
 
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
@@ -27,8 +29,10 @@ users = pytest.mark.parametrize('user,password', [
 def bootstrap():
     for n in list(cluster.instances.values()):
         n.query('DROP TABLE IF EXISTS data')
+        n.query('DROP TABLE IF EXISTS data_from_buffer')
         n.query('DROP TABLE IF EXISTS dist')
         n.query('CREATE TABLE data (key Int) Engine=Memory()')
+        n.query('CREATE TABLE data_from_buffer (key Int) Engine=Memory()')
         n.query("""
         CREATE TABLE dist_insecure AS data
         Engine=Distributed(insecure, currentDatabase(), data, key)
@@ -38,20 +42,24 @@ def bootstrap():
         Engine=Distributed(secure, currentDatabase(), data, key)
         """)
         n.query("""
+        CREATE TABLE dist_secure_from_buffer AS data_from_buffer
+        Engine=Distributed(secure, currentDatabase(), data_from_buffer, key)
+        """)
+        n.query("""
         CREATE TABLE dist_secure_disagree AS data
         Engine=Distributed(secure_disagree, currentDatabase(), data, key)
         """)
         n.query("""
-        CREATE TABLE dist_secure_buffer AS dist_secure
-        Engine=Buffer(currentDatabase(), dist_secure,
+        CREATE TABLE dist_secure_buffer AS dist_secure_from_buffer
+        Engine=Buffer(currentDatabase(), dist_secure_from_buffer,
             /* settings for manual flush only */
-            1,    /* num_layers */
-            10e6, /* min_time, placeholder */
-            10e6, /* max_time, placeholder */
-            0,    /* min_rows   */
-            10e6, /* max_rows   */
-            0,    /* min_bytes  */
-            80e6  /* max_bytes  */
+            1, /* num_layers */
+            0, /* min_time, placeholder */
+            0, /* max_time, placeholder */
+            0, /* min_rows   */
+            0, /* max_rows   */
+            0, /* min_bytes  */
+            0  /* max_bytes  */
         )
         """)
 
@@ -129,17 +137,62 @@ def test_secure_insert_sync():
 #
 # Buffer() flush happens with global context, that does not have user
 # And so Context::user/ClientInfo::current_user/ClientInfo::initial_user will be empty
+#
+# This is the regression test for the subsequent query that it
+# will not use user from the previous query.
+#
+# The test a little bit complex, but I will try to explain:
+# - first, we need to execute query with the readonly user (regualar SELECT),
+#   and then we will execute INSERT, and if the bug is there, then INSERT will
+#   use the user from SELECT and will fail (since you cannot do INSERT with
+#   readonly=1/2)
+#
+# - the trick with generating random priority (via sed) is to avoid reusing
+#   connection from n1 to n2 from another test (and we cannot simply use
+#   another pool after ConnectionPoolFactory had been added [1].
+#
+#     [1]: https://github.com/ClickHouse/ClickHouse/pull/26318
+#
+#   We need at least one change in one of fields of the node/shard definition,
+#   and this "priorirty" for us in this test.
+#
+# - after we will ensure that connection is really established from the context
+#   of SELECT query, and that the connection will not be established from the
+#   context of the INSERT query (but actually it is a no-op since the INSERT
+#   will be done in background, due to insert_distributed_sync=false by
+#   default)
+#
+# - if the bug is there, then FLUSH DISTRIBUTED will fail, because it will go
+#   from n1 to n2 using previous user.
+#
+# I hope that this will clarify something for the reader.
 def test_secure_insert_buffer_async():
-    n1.query("TRUNCATE TABLE data")
-    n1.query('INSERT INTO dist_secure_buffer SELECT * FROM numbers(2)')
-    n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure dist_secure')
-    # no Buffer flush happened
-    assert int(n1.query('SELECT count() FROM dist_secure')) == 0
+    # Change cluster definition so that the SELECT will always creates new connection
+    priority = int(time.time())
+    n1.exec_in_container(['bash', '-c', f'sed -i "s#<priority>.*</priority>#<priority>{priority}</priority>#" /etc/clickhouse-server/config.d/remote_servers.xml'])
+    n1.query('SYSTEM RELOAD CONFIG')
+    # ensure that SELECT creates new connection (we need separate table for
+    # this, so that separate distributed pool will be used)
+    query_id = uuid.uuid4().hex
+    n1.query('SELECT * FROM dist_secure_from_buffer', user='ro', query_id=query_id)
+    assert n1.contains_in_log('{' + query_id + '} <Trace> Connection (n2:9000): Connecting.')
+
+    query_id = uuid.uuid4().hex
+    n1.query('INSERT INTO dist_secure_buffer SELECT * FROM numbers(2)', query_id=query_id)
+    # ensure that INSERT does not creates new connection, so that it will use
+    # previous connection that was instantiated with "ro" user (using
+    # interserver secret)
+    assert not n1.contains_in_log('{' + query_id + '} <Trace> Connection (n2:9000): Connecting.')
+
+    # And before the bug was fixed this query will fail with the following error:
+    #
+    #     Code: 164. DB::Exception: Received from 172.16.2.5:9000. DB::Exception: There was an error on [n1:9000]: Code: 164. DB::Exception: Received from n2:9000. DB::Exception: ro: Cannot execute query in readonly mode. (READONLY)
+    n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure dist_secure_from_buffer')
     n1.query('OPTIMIZE TABLE dist_secure_buffer')
-    # manual flush
-    n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure dist_secure')
-    assert int(n1.query('SELECT count() FROM dist_secure')) == 2
-    n1.query('TRUNCATE TABLE data ON CLUSTER secure')
+    n1.query('SYSTEM FLUSH DISTRIBUTED ON CLUSTER secure dist_secure_from_buffer')
+
+    assert int(n1.query('SELECT count() FROM dist_secure_from_buffer')) == 2
+    n1.query('TRUNCATE TABLE data_from_buffer ON CLUSTER secure')
 
 def test_secure_disagree():
     with pytest.raises(QueryRuntimeException, match='.*Hash mismatch.*'):
@@ -209,5 +262,3 @@ def test_per_user_protocol_settings_secure_cluster(user, password):
         'max_untracked_memory': 0,
     })
     assert int(get_query_setting_on_shard(n1, id_, 'max_memory_usage_for_user')) == int(1e9)
-
-# TODO: check user for INSERT
diff --git a/tests/integration/test_distributed_load_balancing/configs/remote_servers.xml b/tests/integration/test_distributed_load_balancing/configs/remote_servers.xml
index b424e975bfe..73ef49304c9 100644
--- a/tests/integration/test_distributed_load_balancing/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_load_balancing/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicas_cluster>
             <shard>
@@ -75,5 +75,5 @@
             </node>
         </shards_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_distributed_load_balancing/configs/users.xml b/tests/integration/test_distributed_load_balancing/configs/users.xml
index b2dcdbcd8f3..f4c52d0f211 100644
--- a/tests/integration/test_distributed_load_balancing/configs/users.xml
+++ b/tests/integration/test_distributed_load_balancing/configs/users.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <use_hedged_requests>0</use_hedged_requests>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_load_balancing/test.py b/tests/integration/test_distributed_load_balancing/test.py
index d3ac5c132cd..8a1c282eff2 100644
--- a/tests/integration/test_distributed_load_balancing/test.py
+++ b/tests/integration/test_distributed_load_balancing/test.py
@@ -14,7 +14,7 @@ n2 = cluster.add_instance('n2', main_configs=['configs/remote_servers.xml'])
 n3 = cluster.add_instance('n3', main_configs=['configs/remote_servers.xml'])
 
 nodes = len(cluster.instances)
-queries = nodes * 5
+queries = nodes * 10
 
 
 def bootstrap():
@@ -43,21 +43,21 @@ def bootstrap():
             replicas_cluster,
             currentDatabase(),
             data)
-        """.format())
+        """)
         n.query("""
         CREATE TABLE dist_priority AS data
         Engine=Distributed(
             replicas_priority_cluster,
             currentDatabase(),
             data)
-        """.format())
+        """)
         n.query("""
         CREATE TABLE dist_priority_negative AS data
         Engine=Distributed(
             replicas_priority_negative_cluster,
             currentDatabase(),
             data)
-        """.format())
+        """)
 
 
 def make_uuid():
diff --git a/tests/integration/test_distributed_over_distributed/configs/remote_servers.xml b/tests/integration/test_distributed_over_distributed/configs/remote_servers.xml
index ebce4697529..68b420f36b4 100644
--- a/tests/integration/test_distributed_over_distributed/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_over_distributed/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_over_distributed/configs/set_distributed_defaults.xml b/tests/integration/test_distributed_over_distributed/configs/set_distributed_defaults.xml
index 194eb1ebb87..71fc980fb7b 100644
--- a/tests/integration/test_distributed_over_distributed/configs/set_distributed_defaults.xml
+++ b/tests/integration/test_distributed_over_distributed/configs/set_distributed_defaults.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <connections_with_failover_max_tries>3</connections_with_failover_max_tries>
@@ -32,4 +32,4 @@
     </users>
 
     <quotas><default></default></quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml b/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml
index 7d00cebccfc..79e71f1ecf3 100644
--- a/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_queries_stress/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <max_concurrent_queries>1000</max_concurrent_queries>
 
     <remote_servers>
@@ -39,4 +39,4 @@
             </shard>
         </two_shards>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_respect_user_timeouts/configs/config.d/remote_servers.xml b/tests/integration/test_distributed_respect_user_timeouts/configs/config.d/remote_servers.xml
index ebce4697529..68b420f36b4 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/configs/config.d/remote_servers.xml
+++ b/tests/integration/test_distributed_respect_user_timeouts/configs/config.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_respect_user_timeouts/configs/users.d/set_distributed_defaults.xml b/tests/integration/test_distributed_respect_user_timeouts/configs/users.d/set_distributed_defaults.xml
index 194eb1ebb87..71fc980fb7b 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/configs/users.d/set_distributed_defaults.xml
+++ b/tests/integration/test_distributed_respect_user_timeouts/configs/users.d/set_distributed_defaults.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <connections_with_failover_max_tries>3</connections_with_failover_max_tries>
@@ -32,4 +32,4 @@
     </users>
 
     <quotas><default></default></quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/remote_servers.xml b/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/remote_servers.xml
index caafbded647..37bc014743a 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/remote_servers.xml
+++ b/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <tcp_port_secure>9440</tcp_port_secure>
     <remote_servers>
         <test_cluster>
@@ -18,4 +18,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/ssl_conf.xml b/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/ssl_conf.xml
index fe39e3712b8..6234477993a 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/ssl_conf.xml
+++ b/tests/integration/test_distributed_respect_user_timeouts/configs_secure/config.d/ssl_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
@@ -15,4 +15,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_respect_user_timeouts/configs_secure/users.d/set_distributed_defaults.xml b/tests/integration/test_distributed_respect_user_timeouts/configs_secure/users.d/set_distributed_defaults.xml
index 2fa19d41b76..c80f8fc9dfb 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/configs_secure/users.d/set_distributed_defaults.xml
+++ b/tests/integration/test_distributed_respect_user_timeouts/configs_secure/users.d/set_distributed_defaults.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <connections_with_failover_max_tries>3</connections_with_failover_max_tries>
@@ -32,4 +32,4 @@
     </users>
 
     <quotas><default></default></quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_respect_user_timeouts/test.py b/tests/integration/test_distributed_respect_user_timeouts/test.py
index d8eb92d96b5..03c85a82c90 100644
--- a/tests/integration/test_distributed_respect_user_timeouts/test.py
+++ b/tests/integration/test_distributed_respect_user_timeouts/test.py
@@ -3,6 +3,7 @@ import os.path
 import timeit
 
 import pytest
+import logging
 from helpers.cluster import ClickHouseCluster
 from helpers.network import PartitionManager
 from helpers.test_tools import TSV
@@ -11,6 +12,8 @@ cluster = ClickHouseCluster(__file__)
 
 NODES = {'node' + str(i): None for i in (1, 2)}
 
+IS_DEBUG = False
+
 CREATE_TABLES_SQL = '''
 CREATE DATABASE test;
 
@@ -104,6 +107,11 @@ def started_cluster(request):
     try:
         cluster.start()
 
+        if cluster.instances["node1"].is_debug_build():
+            global IS_DEBUG
+            IS_DEBUG = True
+            logging.warning("Debug build is too slow to show difference in timings. We disable checks.")
+
         for node_id, node in list(NODES.items()):
             node.query(CREATE_TABLES_SQL)
             node.query(INSERT_SQL_TEMPLATE.format(node_id=node_id))
@@ -133,8 +141,9 @@ def _check_timeout_and_exception(node, user, query_base, query):
     # And it should timeout no faster than:
     measured_timeout = timeit.default_timer() - start
 
-    assert expected_timeout - measured_timeout <= TIMEOUT_MEASUREMENT_EPS
-    assert measured_timeout - expected_timeout <= TIMEOUT_DIFF_UPPER_BOUND[user][query_base]
+    if not IS_DEBUG:
+        assert expected_timeout - measured_timeout <= TIMEOUT_MEASUREMENT_EPS
+        assert measured_timeout - expected_timeout <= TIMEOUT_DIFF_UPPER_BOUND[user][query_base]
 
     # And exception should reflect connection attempts:
     _check_exception(exception, repeats)
diff --git a/tests/integration/test_distributed_storage_configuration/configs/config.d/storage_configuration.xml b/tests/integration/test_distributed_storage_configuration/configs/config.d/storage_configuration.xml
index f4e59555229..9291587f8c2 100644
--- a/tests/integration/test_distributed_storage_configuration/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_distributed_storage_configuration/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <disk1>
@@ -20,4 +20,4 @@
             </default>
         </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_distributed_system_query/configs/remote_servers.xml b/tests/integration/test_distributed_system_query/configs/remote_servers.xml
index ebce4697529..68b420f36b4 100644
--- a/tests/integration/test_distributed_system_query/configs/remote_servers.xml
+++ b/tests/integration/test_distributed_system_query/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_drop_replica/configs/remote_servers.xml b/tests/integration/test_drop_replica/configs/remote_servers.xml
index 7978f921b2e..b25a0eed7c8 100644
--- a/tests/integration/test_drop_replica/configs/remote_servers.xml
+++ b/tests/integration/test_drop_replica/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -18,4 +18,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_enabling_access_management/configs/users.d/extra_users.xml b/tests/integration/test_enabling_access_management/configs/users.d/extra_users.xml
index 7d87a29a915..0aaf6c0a5f1 100644
--- a/tests/integration/test_enabling_access_management/configs/users.d/extra_users.xml
+++ b/tests/integration/test_enabling_access_management/configs/users.d/extra_users.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
         <readonly>
             <password></password>
@@ -10,4 +10,4 @@
             <profile>default</profile>
         </xyz>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_encrypted_disk/configs/storage.xml b/tests/integration/test_encrypted_disk/configs/storage.xml
index 6a5e016d501..212c1616d6e 100644
--- a/tests/integration/test_encrypted_disk/configs/storage.xml
+++ b/tests/integration/test_encrypted_disk/configs/storage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <disk_s3>
@@ -80,4 +80,4 @@
             </s3_policy>
          </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_encrypted_disk/test.py b/tests/integration/test_encrypted_disk/test.py
index 542980bcaaa..7d94f7ccdc5 100644
--- a/tests/integration/test_encrypted_disk/test.py
+++ b/tests/integration/test_encrypted_disk/test.py
@@ -115,7 +115,7 @@ def test_add_key():
     def make_storage_policy_with_keys(policy_name, keys):
         node.exec_in_container(["bash", "-c" , """cat > /etc/clickhouse-server/config.d/storage_policy_{policy_name}.xml << EOF
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <{policy_name}_disk>
@@ -135,7 +135,7 @@ def test_add_key():
             </{policy_name}>
          </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
 EOF""".format(policy_name=policy_name, keys=keys)])
         node.query("SYSTEM RELOAD CONFIG")
 
diff --git a/tests/integration/test_executable_table_function/__init__.py b/tests/integration/test_executable_table_function/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_executable_table_function/test.py b/tests/integration/test_executable_table_function/test.py
new file mode 100644
index 00000000000..1473212552a
--- /dev/null
+++ b/tests/integration/test_executable_table_function/test.py
@@ -0,0 +1,98 @@
+import os
+import sys
+import time
+
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True, main_configs=[])
+
+
+# Something like https://reviews.llvm.org/D33325
+def skip_test_msan(instance):
+    if instance.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with vfork")
+
+
+def copy_file_to_container(local_path, dist_path, container_id):
+    os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'user_scripts/.'), '/var/lib/clickhouse/user_scripts', node.docker_id)
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def test_executable_function_no_input(started_cluster):
+    skip_test_msan(node)
+    assert node.query("SELECT * FROM executable('test_no_input.sh', 'TabSeparated', 'value UInt64')") == '1\n'
+
+def test_executable_function_input(started_cluster):
+    skip_test_msan(node)
+    assert node.query("SELECT * FROM executable('test_input.sh', 'TabSeparated', 'value String', (SELECT 1))") == 'Key 1\n'
+
+def test_executable_function_input_multiple_pipes(started_cluster):
+    skip_test_msan(node)
+    actual = node.query("SELECT * FROM executable('test_input_multiple_pipes.sh', 'TabSeparated', 'value String', (SELECT 1), (SELECT 2), (SELECT 3))")
+    expected = 'Key from 4 fd 3\nKey from 3 fd 2\nKey from 0 fd 1\n'
+    assert actual == expected
+
+def test_executable_function_argument(started_cluster):
+    skip_test_msan(node)
+    assert node.query("SELECT * FROM executable('test_argument.sh 1', 'TabSeparated', 'value String')") == 'Key 1\n'
+
+def test_executable_storage_no_input(started_cluster):
+    skip_test_msan(node)
+    node.query("DROP TABLE IF EXISTS test_table")
+    node.query("CREATE TABLE test_table (value UInt64) ENGINE=Executable('test_no_input.sh', 'TabSeparated')")
+    assert node.query("SELECT * FROM test_table") == '1\n'
+    node.query("DROP TABLE test_table")
+
+def test_executable_storage_input(started_cluster):
+    skip_test_msan(node)
+    node.query("DROP TABLE IF EXISTS test_table")
+    node.query("CREATE TABLE test_table (value String) ENGINE=Executable('test_no_input.sh', 'TabSeparated', (SELECT 1))")
+    assert node.query("SELECT * FROM test_table") == '1\n'
+    node.query("DROP TABLE test_table")
+
+def test_executable_storage_input_multiple_pipes(started_cluster):
+    skip_test_msan(node)
+    node.query("DROP TABLE IF EXISTS test_table")
+    node.query("CREATE TABLE test_table (value String) ENGINE=Executable('test_input_multiple_pipes.sh', 'TabSeparated', (SELECT 1), (SELECT 2), (SELECT 3))")
+    actual = node.query("SELECT * FROM test_table")
+    expected = 'Key from 4 fd 3\nKey from 3 fd 2\nKey from 0 fd 1\n'
+    assert actual == expected
+    node.query("DROP TABLE test_table")
+
+def test_executable_storage_argument(started_cluster):
+    skip_test_msan(node)
+    node.query("DROP TABLE IF EXISTS test_table")
+    node.query("CREATE TABLE test_table (value String) ENGINE=Executable('test_argument.sh 1', 'TabSeparated')")
+    assert node.query("SELECT * FROM test_table") == 'Key 1\n'
+    node.query("DROP TABLE test_table")
+
+def test_executable_pool_storage(started_cluster):
+    skip_test_msan(node)
+    node.query("DROP TABLE IF EXISTS test_table")
+    node.query("CREATE TABLE test_table (value String) ENGINE=ExecutablePool('test_input_process_pool.sh', 'TabSeparated', (SELECT 1))")
+    assert node.query("SELECT * FROM test_table") == 'Key 1\n'
+    node.query("DROP TABLE test_table")
+
+def test_executable_pool_storage_multiple_pipes(started_cluster):
+    skip_test_msan(node)
+    node.query("DROP TABLE IF EXISTS test_table")
+    node.query("CREATE TABLE test_table (value String) ENGINE=ExecutablePool('test_input_process_pool_multiple_pipes.sh', 'TabSeparated', (SELECT 1), (SELECT 2), (SELECT 3))")
+    assert node.query("SELECT * FROM test_table") == 'Key from 4 fd 3\nKey from 3 fd 2\nKey from 0 fd 1\n'
+    node.query("DROP TABLE test_table")
diff --git a/tests/integration/test_executable_table_function/user_scripts/test_argument.sh b/tests/integration/test_executable_table_function/user_scripts/test_argument.sh
new file mode 100755
index 00000000000..89634031d2b
--- /dev/null
+++ b/tests/integration/test_executable_table_function/user_scripts/test_argument.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "Key $1"
diff --git a/tests/integration/test_executable_table_function/user_scripts/test_input.sh b/tests/integration/test_executable_table_function/user_scripts/test_input.sh
new file mode 100755
index 00000000000..6b492bd980f
--- /dev/null
+++ b/tests/integration/test_executable_table_function/user_scripts/test_input.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+while read read_data; do printf "Key $read_data\n"; done
diff --git a/tests/integration/test_executable_table_function/user_scripts/test_input_multiple_pipes.sh b/tests/integration/test_executable_table_function/user_scripts/test_input_multiple_pipes.sh
new file mode 100755
index 00000000000..1e53e3211dc
--- /dev/null
+++ b/tests/integration/test_executable_table_function/user_scripts/test_input_multiple_pipes.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+while read -t 250 -u 4 read_data; do printf "Key from 4 fd $read_data\n"; done
+while read -t 250 -u 3 read_data; do printf "Key from 3 fd $read_data\n"; done
+while read -t 250 read_data; do printf "Key from 0 fd $read_data\n"; done
diff --git a/tests/integration/test_executable_table_function/user_scripts/test_input_process_pool.sh b/tests/integration/test_executable_table_function/user_scripts/test_input_process_pool.sh
new file mode 100755
index 00000000000..ed40a0d5291
--- /dev/null
+++ b/tests/integration/test_executable_table_function/user_scripts/test_input_process_pool.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+while read read_data; do printf "1\n"; printf "Key $read_data\n"; done
diff --git a/tests/integration/test_executable_table_function/user_scripts/test_input_process_pool_multiple_pipes.sh b/tests/integration/test_executable_table_function/user_scripts/test_input_process_pool_multiple_pipes.sh
new file mode 100755
index 00000000000..4408ccae756
--- /dev/null
+++ b/tests/integration/test_executable_table_function/user_scripts/test_input_process_pool_multiple_pipes.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+read -t 250 -u 4 read_data_from_4_fd;
+read -t 250 -u 3 read_data_from_3_fd;
+read -t 250 read_data_from_0_df;
+
+printf "3\n";
+printf "Key from 4 fd $read_data_from_4_fd\n";
+printf "Key from 3 fd $read_data_from_3_fd\n";
+printf "Key from 0 fd $read_data_from_0_df\n";
diff --git a/tests/integration/test_executable_table_function/user_scripts/test_no_input.sh b/tests/integration/test_executable_table_function/user_scripts/test_no_input.sh
new file mode 100755
index 00000000000..9e8b3be63d6
--- /dev/null
+++ b/tests/integration/test_executable_table_function/user_scripts/test_no_input.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "1"
diff --git a/tests/integration/test_executable_user_defined_functions_config_reload/__init__.py b/tests/integration/test_executable_user_defined_functions_config_reload/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_executable_user_defined_functions_config_reload/config/executable_user_defined_functions_config.xml b/tests/integration/test_executable_user_defined_functions_config_reload/config/executable_user_defined_functions_config.xml
new file mode 100644
index 00000000000..7e62283a83c
--- /dev/null
+++ b/tests/integration/test_executable_user_defined_functions_config_reload/config/executable_user_defined_functions_config.xml
@@ -0,0 +1,2 @@
+<yandex>
+</yandex>
diff --git a/tests/integration/test_executable_user_defined_functions_config_reload/functions/test_function_config.xml b/tests/integration/test_executable_user_defined_functions_config_reload/functions/test_function_config.xml
new file mode 100644
index 00000000000..f2a7d6e67b1
--- /dev/null
+++ b/tests/integration/test_executable_user_defined_functions_config_reload/functions/test_function_config.xml
@@ -0,0 +1,14 @@
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function_1</name>
+        <return_type>String</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>while read read_data; do printf "Key_1 $read_data\n"; done</command>
+        <lifetime>0</lifetime>
+    </function>
+</functions>
+
diff --git a/tests/integration/test_executable_user_defined_functions_config_reload/functions/test_function_config2.xml b/tests/integration/test_executable_user_defined_functions_config_reload/functions/test_function_config2.xml
new file mode 100644
index 00000000000..fe02146a6b8
--- /dev/null
+++ b/tests/integration/test_executable_user_defined_functions_config_reload/functions/test_function_config2.xml
@@ -0,0 +1,14 @@
+<functions>
+    <function>
+        <type>executable</type>
+        <name>test_function_2</name>
+        <return_type>String</return_type>
+        <argument>
+            <type>UInt64</type>
+        </argument>
+        <format>TabSeparated</format>
+        <command>while read read_data; do printf "Key_2 $read_data\n"; done</command>
+        <lifetime>0</lifetime>
+    </function>
+</functions>
+
diff --git a/tests/integration/test_executable_user_defined_functions_config_reload/test.py b/tests/integration/test_executable_user_defined_functions_config_reload/test.py
new file mode 100644
index 00000000000..e5c4f4edb4e
--- /dev/null
+++ b/tests/integration/test_executable_user_defined_functions_config_reload/test.py
@@ -0,0 +1,61 @@
+import os
+import sys
+import time
+import logging
+import pytest
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True, main_configs=['config/executable_user_defined_functions_config.xml'])
+
+
+def copy_file_to_container(local_path, dist_path, container_id):
+    os.system("docker cp {local} {cont_id}:{dist}".format(local=local_path, cont_id=container_id, dist=dist_path))
+
+
+config = '''<yandex>
+    <user_defined_executable_functions_config>/etc/clickhouse-server/functions/{user_defined_executable_functions_config}</user_defined_executable_functions_config>
+</yandex>'''
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        copy_file_to_container(os.path.join(SCRIPT_DIR, 'functions/.'), '/etc/clickhouse-server/functions', node.docker_id)
+        node.restart_clickhouse()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def change_config(user_defined_executable_functions_config):
+    node.replace_config("/etc/clickhouse-server/config.d/executable_user_defined_functions_config.xml", config.format(user_defined_executable_functions_config=user_defined_executable_functions_config))
+    node.query("SYSTEM RELOAD CONFIG;")
+
+
+def test(started_cluster):
+    # Set config with the path to the first executable user defined function.
+    change_config("test_function_config.xml")
+
+    time.sleep(10)
+
+    assert node.query("SELECT test_function_1(toUInt64(1));") == 'Key_1 1\n'
+
+    # Change path to the second executable user defined function in config.
+    change_config("test_function_config2.xml")
+
+    time.sleep(10)
+
+    # Check that the new executable user defined function is loaded.
+    assert node.query("SELECT test_function_2(toUInt64(1))") == 'Key_2 1\n'
+
+    # Check that the previous executable user defined function was unloaded.
+    node.query_and_get_error("SELECT test_function_1(toUInt64(1));")
diff --git a/tests/integration/test_explain_estimates/test.py b/tests/integration/test_explain_estimates/test.py
index a2b65564dbc..7bccfb11a37 100644
--- a/tests/integration/test_explain_estimates/test.py
+++ b/tests/integration/test_explain_estimates/test.py
@@ -14,11 +14,12 @@ def start_cluster():
     finally:
         cluster.shutdown()
 
-
 def test_explain_estimates(start_cluster):
-    node1.query("CREATE TABLE test (i Int64) ENGINE = MergeTree() ORDER BY i SETTINGS index_granularity = 16, write_final_mark = 0")
+    node1.query("CREATE TABLE test (i Int64) ENGINE = MergeTree() ORDER BY i SETTINGS index_granularity = 16")
     node1.query("INSERT INTO test SELECT number FROM numbers(128)")
     node1.query("OPTIMIZE TABLE test")
-    system_parts_result = node1.query("SELECT any(database), any(table), count() as parts, sum(rows) as rows, sum(marks) as marks FROM system.parts WHERE database = 'default' AND table = 'test' and active = 1 GROUP BY (database, table)")
+    # sum(marks) - 1 because EXPLAIN ESIMATES does not include final mark.
+    system_parts_result = node1.query("SELECT any(database), any(table), count() as parts, sum(rows) as rows, sum(marks)-1 as marks FROM system.parts WHERE database = 'default' AND table = 'test' and active = 1 GROUP BY (database, table)")
     explain_estimates_result = node1.query("EXPLAIN ESTIMATE SELECT * FROM test")
     assert(system_parts_result == explain_estimates_result)
+
diff --git a/tests/integration/test_extreme_deduplication/configs/conf.d/merge_tree.xml b/tests/integration/test_extreme_deduplication/configs/conf.d/merge_tree.xml
index f6941123312..d9062e8da20 100644
--- a/tests/integration/test_extreme_deduplication/configs/conf.d/merge_tree.xml
+++ b/tests/integration/test_extreme_deduplication/configs/conf.d/merge_tree.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <replicated_deduplication_window>999999999</replicated_deduplication_window>
         <replicated_deduplication_window_seconds>1</replicated_deduplication_window_seconds>
@@ -6,4 +6,4 @@
         <cleanup_delay_period_random_add>0</cleanup_delay_period_random_add>
         <old_parts_lifetime>1</old_parts_lifetime>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_extreme_deduplication/configs/conf.d/remote_servers.xml b/tests/integration/test_extreme_deduplication/configs/conf.d/remote_servers.xml
index 64239dfdb6c..ea4769f55e1 100644
--- a/tests/integration/test_extreme_deduplication/configs/conf.d/remote_servers.xml
+++ b/tests/integration/test_extreme_deduplication/configs/conf.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -14,4 +14,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/configs/zookeeper_config.xml b/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/configs/zookeeper_config.xml
index b2b0667ebbf..3e8cc741bd5 100644
--- a/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/configs/zookeeper_config.xml
+++ b/tests/integration/test_fetch_partition_from_auxiliary_zookeeper/configs/zookeeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -25,4 +25,4 @@
             </node>
         </zookeeper2>
     </auxiliary_zookeepers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_fetch_partition_should_reset_mutation/configs/zookeeper_config.xml b/tests/integration/test_fetch_partition_should_reset_mutation/configs/zookeeper_config.xml
index 17cbd681c41..18412349228 100644
--- a/tests/integration/test_fetch_partition_should_reset_mutation/configs/zookeeper_config.xml
+++ b/tests/integration/test_fetch_partition_should_reset_mutation/configs/zookeeper_config.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
             <port>2181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_fetch_partition_with_outdated_parts/configs/zookeeper_config.xml b/tests/integration/test_fetch_partition_with_outdated_parts/configs/zookeeper_config.xml
index b2b0667ebbf..3e8cc741bd5 100644
--- a/tests/integration/test_fetch_partition_with_outdated_parts/configs/zookeeper_config.xml
+++ b/tests/integration/test_fetch_partition_with_outdated_parts/configs/zookeeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -25,4 +25,4 @@
             </node>
         </zookeeper2>
     </auxiliary_zookeepers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_force_drop_table/configs/config.xml b/tests/integration/test_force_drop_table/configs/config.xml
index e5f133953a6..0500e2ad554 100644
--- a/tests/integration/test_force_drop_table/configs/config.xml
+++ b/tests/integration/test_force_drop_table/configs/config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <max_table_size_to_drop>1</max_table_size_to_drop>
     <max_partition_size_to_drop>1</max_partition_size_to_drop>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_grant_and_revoke/test.py b/tests/integration/test_grant_and_revoke/test.py
index a63d6f136af..b905e4df219 100644
--- a/tests/integration/test_grant_and_revoke/test.py
+++ b/tests/integration/test_grant_and_revoke/test.py
@@ -151,7 +151,7 @@ def test_grant_all_on_table():
     instance.query("GRANT ALL ON test.table TO A WITH GRANT OPTION")
     instance.query("GRANT ALL ON test.table TO B", user='A')
     assert instance.query(
-        "SHOW GRANTS FOR B") == "GRANT SHOW TABLES, SHOW COLUMNS, SHOW DICTIONARIES, SELECT, INSERT, ALTER, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, DROP TABLE, DROP VIEW, DROP DICTIONARY, TRUNCATE, OPTIMIZE, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON test.table TO B\n"
+        "SHOW GRANTS FOR B") == "GRANT SHOW TABLES, SHOW COLUMNS, SHOW DICTIONARIES, SELECT, INSERT, ALTER TABLE, ALTER VIEW, CREATE TABLE, CREATE VIEW, CREATE DICTIONARY, DROP TABLE, DROP VIEW, DROP DICTIONARY, TRUNCATE, OPTIMIZE, SYSTEM MERGES, SYSTEM TTL MERGES, SYSTEM FETCHES, SYSTEM MOVES, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM DROP REPLICA, SYSTEM SYNC REPLICA, SYSTEM RESTART REPLICA, SYSTEM RESTORE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON test.table TO B\n"
     instance.query("REVOKE ALL ON test.table FROM B", user='A')
     assert instance.query("SHOW GRANTS FOR B") == ""
 
@@ -282,3 +282,36 @@ def test_current_database():
 
     instance.query("CREATE TABLE default.table(x UInt32, y UInt32) ENGINE = MergeTree ORDER BY tuple()")
     assert "Not enough privileges" in instance.query_and_get_error("SELECT * FROM table", user='A')
+
+
+def test_grant_with_replace_option():
+    instance.query("CREATE USER A")
+    instance.query('GRANT SELECT ON test.table TO A')
+    assert instance.query("SHOW GRANTS FOR A") == TSV(["GRANT SELECT ON test.table TO A"])
+
+    instance.query('GRANT INSERT ON test.table TO A WITH REPLACE OPTION')
+    assert instance.query("SHOW GRANTS FOR A") == TSV(["GRANT INSERT ON test.table TO A"])
+
+    instance.query('GRANT NONE ON *.* TO A WITH REPLACE OPTION')
+    assert instance.query("SHOW GRANTS FOR A") == TSV([])
+
+    instance.query('CREATE USER B')
+    instance.query('GRANT SELECT ON test.table TO B')
+    assert instance.query("SHOW GRANTS FOR A") == TSV([])
+    assert instance.query("SHOW GRANTS FOR B") == TSV(["GRANT SELECT ON test.table TO B"])
+
+    expected_error = "it's necessary to have grant INSERT ON test.table WITH GRANT OPTION"
+    assert expected_error in instance.query_and_get_error("GRANT INSERT ON test.table TO B WITH REPLACE OPTION", user='A')
+    assert instance.query("SHOW GRANTS FOR A") == TSV([])
+    assert instance.query("SHOW GRANTS FOR B") == TSV(["GRANT SELECT ON test.table TO B"])
+
+    instance.query("GRANT INSERT ON test.table TO A WITH GRANT OPTION")
+    expected_error = "it's necessary to have grant SELECT ON test.table WITH GRANT OPTION"
+    assert expected_error in instance.query_and_get_error("GRANT INSERT ON test.table TO B WITH REPLACE OPTION", user='A')
+    assert instance.query("SHOW GRANTS FOR A") == TSV(["GRANT INSERT ON test.table TO A WITH GRANT OPTION"])
+    assert instance.query("SHOW GRANTS FOR B") == TSV(["GRANT SELECT ON test.table TO B"])
+
+    instance.query("GRANT SELECT ON test.table TO A WITH GRANT OPTION")
+    instance.query("GRANT INSERT ON test.table TO B WITH REPLACE OPTION", user='A')
+    assert instance.query("SHOW GRANTS FOR A") == TSV(["GRANT SELECT, INSERT ON test.table TO A WITH GRANT OPTION"])
+    assert instance.query("SHOW GRANTS FOR B") == TSV(["GRANT INSERT ON test.table TO B"])
diff --git a/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml b/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml
index f5206c8827a..9373aed9b14 100644
--- a/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml
+++ b/tests/integration/test_graphite_merge_tree/configs/graphite_rollup.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- retention scheme for GraphiteMergeTree engine-->
     <graphite_rollup>
         <path_column_name>metric</path_column_name>
@@ -115,4 +115,4 @@
             </retention>
         </default>
     </graphite_rollup_wrong_age_precision>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_graphite_merge_tree/configs/users.xml b/tests/integration/test_graphite_merge_tree/configs/users.xml
index cdd437797ce..66d0cd7e445 100644
--- a/tests/integration/test_graphite_merge_tree/configs/users.xml
+++ b/tests/integration/test_graphite_merge_tree/configs/users.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <optimize_on_insert>0</optimize_on_insert>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_grpc_protocol/configs/grpc_config.xml b/tests/integration/test_grpc_protocol/configs/grpc_config.xml
index ad941306892..abf729da1c3 100644
--- a/tests/integration/test_grpc_protocol/configs/grpc_config.xml
+++ b/tests/integration/test_grpc_protocol/configs/grpc_config.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <grpc_port>9100</grpc_port>
     <grpc replace="replace">
         <!-- Enable if you want very detailed logs -->
         <verbose_logs>false</verbose_logs>
     </grpc>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_grpc_protocol/test.py b/tests/integration/test_grpc_protocol/test.py
index ee7e94bad1d..7b2cdee8d76 100644
--- a/tests/integration/test_grpc_protocol/test.py
+++ b/tests/integration/test_grpc_protocol/test.py
@@ -6,7 +6,9 @@ import grpc
 from helpers.cluster import ClickHouseCluster, run_and_check
 from threading import Thread
 
+GRPC_PORT = 9100
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+DEFAULT_ENCODING = 'utf-8'
 
 
 # Use grpcio-tools to generate *pb2.py files from *.proto.
@@ -28,11 +30,10 @@ import clickhouse_grpc_pb2_grpc
 config_dir = os.path.join(SCRIPT_DIR, './configs')
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance('node', main_configs=['configs/grpc_config.xml'])
-grpc_port = 9100
 main_channel = None
 
 def create_channel():
-    node_ip_with_grpc_port = cluster.get_instance_ip('node') + ':' + str(grpc_port)
+    node_ip_with_grpc_port = cluster.get_instance_ip('node') + ':' + str(GRPC_PORT)
     channel = grpc.insecure_channel(node_ip_with_grpc_port)
     grpc.channel_ready_future(channel).result(timeout=10)
     global main_channel
@@ -42,20 +43,27 @@ def create_channel():
 
 def query_common(query_text, settings={}, input_data=[], input_data_delimiter='', output_format='TabSeparated', external_tables=[],
                  user_name='', password='', query_id='123', session_id='', stream_output=False, channel=None):
-    if type(input_data) == str:
+    if type(input_data) is not list:
         input_data = [input_data]
+    if type(input_data_delimiter) is str:
+        input_data_delimiter=input_data_delimiter.encode(DEFAULT_ENCODING)
     if not channel:
         channel = main_channel
     stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(channel)
     def query_info():
-        input_data_part = input_data.pop(0) if input_data else ''
-        return clickhouse_grpc_pb2.QueryInfo(query=query_text, settings=settings, input_data=input_data_part, input_data_delimiter=input_data_delimiter,
-                                             output_format=output_format, external_tables=external_tables, user_name=user_name, password=password,
-                                             query_id=query_id, session_id=session_id, next_query_info=bool(input_data))
+        input_data_part = input_data.pop(0) if input_data else b''
+        if type(input_data_part) is str:
+            input_data_part = input_data_part.encode(DEFAULT_ENCODING)
+        return clickhouse_grpc_pb2.QueryInfo(query=query_text, settings=settings, input_data=input_data_part,
+                                             input_data_delimiter=input_data_delimiter, output_format=output_format,
+                                             external_tables=external_tables, user_name=user_name, password=password, query_id=query_id,
+                                             session_id=session_id, next_query_info=bool(input_data))
     def send_query_info():
         yield query_info()
         while input_data:
             input_data_part = input_data.pop(0)
+            if type(input_data_part) is str:
+                input_data_part = input_data_part.encode(DEFAULT_ENCODING)
             yield clickhouse_grpc_pb2.QueryInfo(input_data=input_data_part, next_query_info=bool(input_data))
     stream_input = len(input_data) > 1
     if stream_input and stream_output:
@@ -74,10 +82,10 @@ def query_no_errors(*args, **kwargs):
     return results
 
 def query(*args, **kwargs):
-    output = ""
+    output = b''
     for result in query_no_errors(*args, **kwargs):
         output += result.output
-    return output
+    return output.decode(DEFAULT_ENCODING)
 
 def query_and_get_error(*args, **kwargs):
     results = query_common(*args, **kwargs)
@@ -86,16 +94,16 @@ def query_and_get_error(*args, **kwargs):
     return results[-1].exception
 
 def query_and_get_totals(*args, **kwargs):
-    totals = ""
+    totals = b''
     for result in query_no_errors(*args, **kwargs):
         totals += result.totals
-    return totals
+    return totals.decode(DEFAULT_ENCODING)
 
 def query_and_get_extremes(*args, **kwargs):
-    extremes = ""
+    extremes = b''
     for result in query_no_errors(*args, **kwargs):
         extremes += result.extremes
-    return extremes
+    return extremes.decode(DEFAULT_ENCODING)
 
 def query_and_get_logs(*args, **kwargs):
     logs = ""
@@ -135,6 +143,7 @@ def reset_after_test():
     yield
     node.query_with_retry("DROP TABLE IF EXISTS t")
 
+
 # Actual tests
 
 def test_select_one():
@@ -202,7 +211,7 @@ def test_errors_handling():
     assert "Table default.t already exists" in e.display_text
 
 def test_authentication():
-    query("CREATE USER john IDENTIFIED BY 'qwe123'")
+    query("CREATE USER OR REPLACE john IDENTIFIED BY 'qwe123'")
     assert query("SELECT currentUser()", user_name="john", password="qwe123") == "john\n"
 
 def test_logs():
@@ -270,18 +279,18 @@ def test_input_function():
 
 def test_external_table():
     columns = [clickhouse_grpc_pb2.NameAndType(name='UserID', type='UInt64'), clickhouse_grpc_pb2.NameAndType(name='UserName', type='String')]
-    ext1 = clickhouse_grpc_pb2.ExternalTable(name='ext1', columns=columns, data='1\tAlex\n2\tBen\n3\tCarl\n', format='TabSeparated')
+    ext1 = clickhouse_grpc_pb2.ExternalTable(name='ext1', columns=columns, data=b'1\tAlex\n2\tBen\n3\tCarl\n', format='TabSeparated')
     assert query("SELECT * FROM ext1 ORDER BY UserID", external_tables=[ext1]) == "1\tAlex\n"\
                                                                                   "2\tBen\n"\
                                                                                   "3\tCarl\n"
-    ext2 = clickhouse_grpc_pb2.ExternalTable(name='ext2', columns=columns, data='4,Daniel\n5,Ethan\n', format='CSV')
+    ext2 = clickhouse_grpc_pb2.ExternalTable(name='ext2', columns=columns, data=b'4,Daniel\n5,Ethan\n', format='CSV')
     assert query("SELECT * FROM (SELECT * FROM ext1 UNION ALL SELECT * FROM ext2) ORDER BY UserID", external_tables=[ext1, ext2]) == "1\tAlex\n"\
                                                                                                                                      "2\tBen\n"\
                                                                                                                                      "3\tCarl\n"\
                                                                                                                                      "4\tDaniel\n"\
                                                                                                                                      "5\tEthan\n"
     unnamed_columns = [clickhouse_grpc_pb2.NameAndType(type='UInt64'), clickhouse_grpc_pb2.NameAndType(type='String')]
-    unnamed_table = clickhouse_grpc_pb2.ExternalTable(columns=unnamed_columns, data='6\tGeorge\n7\tFred\n')
+    unnamed_table = clickhouse_grpc_pb2.ExternalTable(columns=unnamed_columns, data=b'6\tGeorge\n7\tFred\n')
     assert query("SELECT * FROM _data ORDER BY _2", external_tables=[unnamed_table]) == "7\tFred\n"\
                                                                                         "6\tGeorge\n"
 
@@ -289,16 +298,16 @@ def test_external_table_streaming():
     columns = [clickhouse_grpc_pb2.NameAndType(name='UserID', type='UInt64'), clickhouse_grpc_pb2.NameAndType(name='UserName', type='String')]
     def send_query_info():
         yield clickhouse_grpc_pb2.QueryInfo(query="SELECT * FROM exts ORDER BY UserID",
-                                            external_tables=[clickhouse_grpc_pb2.ExternalTable(name='exts', columns=columns, data='1\tAlex\n2\tBen\n3\tCarl\n')],
+                                            external_tables=[clickhouse_grpc_pb2.ExternalTable(name='exts', columns=columns, data=b'1\tAlex\n2\tBen\n3\tCarl\n')],
                                             next_query_info=True)
-        yield clickhouse_grpc_pb2.QueryInfo(external_tables=[clickhouse_grpc_pb2.ExternalTable(name='exts', data='4\tDaniel\n5\tEthan\n')])
+        yield clickhouse_grpc_pb2.QueryInfo(external_tables=[clickhouse_grpc_pb2.ExternalTable(name='exts', data=b'4\tDaniel\n5\tEthan\n')])
     stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(main_channel)
     result = stub.ExecuteQueryWithStreamInput(send_query_info())
-    assert result.output == "1\tAlex\n"\
-                            "2\tBen\n"\
-                            "3\tCarl\n"\
-                            "4\tDaniel\n"\
-                            "5\tEthan\n"
+    assert result.output == b'1\tAlex\n'\
+                            b'2\tBen\n'\
+                            b'3\tCarl\n'\
+                            b'4\tDaniel\n'\
+                            b'5\tEthan\n'
 
 def test_simultaneous_queries_same_channel():
     threads=[]
@@ -325,8 +334,8 @@ def test_simultaneous_queries_multiple_channels():
 def test_cancel_while_processing_input():
     query("CREATE TABLE t (a UInt8) ENGINE = Memory")
     def send_query_info():
-        yield clickhouse_grpc_pb2.QueryInfo(query="INSERT INTO t FORMAT TabSeparated", input_data="1\n2\n3\n", next_query_info=True)
-        yield clickhouse_grpc_pb2.QueryInfo(input_data="4\n5\n6\n", next_query_info=True)
+        yield clickhouse_grpc_pb2.QueryInfo(query="INSERT INTO t FORMAT TabSeparated", input_data=b'1\n2\n3\n', next_query_info=True)
+        yield clickhouse_grpc_pb2.QueryInfo(input_data=b'4\n5\n6\n', next_query_info=True)
         yield clickhouse_grpc_pb2.QueryInfo(cancel=True)
     stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(main_channel)
     result = stub.ExecuteQueryWithStreamInput(send_query_info())
@@ -343,7 +352,15 @@ def test_cancel_while_generating_output():
     results = list(stub.ExecuteQueryWithStreamIO(send_query_info()))
     assert len(results) >= 1
     assert results[-1].cancelled == True
-    output = ''
+    output = b''
     for result in results:
         output += result.output
-    assert output == '0\t0\n1\t0\n2\t0\n3\t0\n'
+    assert output == b'0\t0\n1\t0\n2\t0\n3\t0\n'
+
+def test_result_compression():
+    query_info = clickhouse_grpc_pb2.QueryInfo(query="SELECT 0 FROM numbers(1000000)",
+                                               result_compression=clickhouse_grpc_pb2.Compression(algorithm=clickhouse_grpc_pb2.CompressionAlgorithm.GZIP,
+                                                                                                  level=clickhouse_grpc_pb2.CompressionLevel.COMPRESSION_HIGH))
+    stub = clickhouse_grpc_pb2_grpc.ClickHouseStub(main_channel)
+    result = stub.ExecuteQuery(query_info)
+    assert result.output == (b'0\n')*1000000
diff --git a/tests/integration/test_grpc_protocol_ssl/configs/grpc_config.xml b/tests/integration/test_grpc_protocol_ssl/configs/grpc_config.xml
index 79cb4fde6fc..a5d00c740fa 100644
--- a/tests/integration/test_grpc_protocol_ssl/configs/grpc_config.xml
+++ b/tests/integration/test_grpc_protocol_ssl/configs/grpc_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <grpc_port>9100</grpc_port>
     <grpc replace="replace">
         <enable_ssl>true</enable_ssl>
@@ -24,4 +24,4 @@
         <!-- Enable if you want very detailed logs -->
         <verbose_logs>false</verbose_logs>
     </grpc>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_grpc_protocol_ssl/test.py b/tests/integration/test_grpc_protocol_ssl/test.py
index c040ccd041f..1f21fbe5f8a 100644
--- a/tests/integration/test_grpc_protocol_ssl/test.py
+++ b/tests/integration/test_grpc_protocol_ssl/test.py
@@ -4,7 +4,10 @@ import sys
 import grpc
 from helpers.cluster import ClickHouseCluster, run_and_check
 
+GRPC_PORT = 9100
+NODE_IP = '10.5.172.77' # It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+DEFAULT_ENCODING = 'utf-8'
 
 
 # Use grpcio-tools to generate *pb2.py files from *.proto.
@@ -23,12 +26,10 @@ import clickhouse_grpc_pb2_grpc
 
 # Utilities
 
-node_ip = '10.5.172.77' # It's important for the node to work at this IP because 'server-cert.pem' requires that (see server-ext.cnf).
-grpc_port = 9100
-node_ip_with_grpc_port = node_ip + ':' + str(grpc_port)
+node_ip_with_grpc_port = NODE_IP + ':' + str(GRPC_PORT)
 config_dir = os.path.join(SCRIPT_DIR, './configs')
 cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance('node', ipv4_address=node_ip, main_configs=['configs/grpc_config.xml', 'configs/server-key.pem', 'configs/server-cert.pem', 'configs/ca-cert.pem'])
+node = cluster.add_instance('node', ipv4_address=NODE_IP, main_configs=['configs/grpc_config.xml', 'configs/server-key.pem', 'configs/server-cert.pem', 'configs/ca-cert.pem'])
 
 def create_secure_channel():
     ca_cert = open(os.path.join(config_dir, 'ca-cert.pem'), 'rb').read()
@@ -59,7 +60,7 @@ def query(query_text, channel):
     result = stub.ExecuteQuery(query_info)
     if result and result.HasField('exception'):
         raise Exception(result.exception.display_text)
-    return result.output
+    return result.output.decode(DEFAULT_ENCODING)
 
 @pytest.fixture(scope="module", autouse=True)
 def start_cluster():
diff --git a/tests/integration/test_hedged_requests/configs/remote_servers.xml b/tests/integration/test_hedged_requests/configs/remote_servers.xml
index 9d753ca2b6a..3728b0d6c4d 100644
--- a/tests/integration/test_hedged_requests/configs/remote_servers.xml
+++ b/tests/integration/test_hedged_requests/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -18,5 +18,5 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_hedged_requests/configs/users.xml b/tests/integration/test_hedged_requests/configs/users.xml
index ac42155a18a..fa3fc4d0fd5 100644
--- a/tests/integration/test_hedged_requests/configs/users.xml
+++ b/tests/integration/test_hedged_requests/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <load_balancing>in_order</load_balancing>
@@ -9,4 +9,4 @@
             <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_hedged_requests/configs/users1.xml b/tests/integration/test_hedged_requests/configs/users1.xml
index 2a54396feca..3547177eb80 100644
--- a/tests/integration/test_hedged_requests/configs/users1.xml
+++ b/tests/integration/test_hedged_requests/configs/users1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_hedged_requests/test.py b/tests/integration/test_hedged_requests/test.py
index e40b3109c44..b137dadfca9 100644
--- a/tests/integration/test_hedged_requests/test.py
+++ b/tests/integration/test_hedged_requests/test.py
@@ -46,14 +46,14 @@ def started_cluster():
         cluster.shutdown()
 
 
-config = '''<yandex>
+config = '''<clickhouse>
     <profiles>
         <default>
             <sleep_in_send_tables_status_ms>{sleep_in_send_tables_status_ms}</sleep_in_send_tables_status_ms>
             <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
         </default>
     </profiles>
-</yandex>'''
+</clickhouse>'''
 
 
 def check_query(expected_replica, receive_timeout=300):
diff --git a/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml b/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml
index 63767185b34..baa5dc67b95 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -22,5 +22,5 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users.xml b/tests/integration/test_hedged_requests_parallel/configs/users.xml
index 9600c0c7124..d2351c184b2 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/users.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <load_balancing>in_order</load_balancing>
@@ -10,4 +10,4 @@
             <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users1.xml b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
index 2a54396feca..3547177eb80 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/users1.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_hedged_requests_parallel/test.py b/tests/integration/test_hedged_requests_parallel/test.py
index 7abc2eb1d2a..3ea6cf80622 100644
--- a/tests/integration/test_hedged_requests_parallel/test.py
+++ b/tests/integration/test_hedged_requests_parallel/test.py
@@ -45,14 +45,14 @@ def started_cluster():
         cluster.shutdown()
 
 
-config = '''<yandex>
+config = '''<clickhouse>
     <profiles>
         <default>
             <sleep_in_send_tables_status_ms>{sleep_in_send_tables_status_ms}</sleep_in_send_tables_status_ms>
             <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
         </default>
     </profiles>
-</yandex>'''
+</clickhouse>'''
 
 
 QUERY_1 = "SELECT count() FROM distributed"
diff --git a/tests/integration/test_host_ip_change/configs/dns_update_long.xml b/tests/integration/test_host_ip_change/configs/dns_update_long.xml
index 133e3cf725a..dce54bc104f 100644
--- a/tests/integration/test_host_ip_change/configs/dns_update_long.xml
+++ b/tests/integration/test_host_ip_change/configs/dns_update_long.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <dns_cache_update_period>200</dns_cache_update_period>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_host_ip_change/configs/dns_update_short.xml b/tests/integration/test_host_ip_change/configs/dns_update_short.xml
index 3317f709b4a..e0b68e27be0 100644
--- a/tests/integration/test_host_ip_change/configs/dns_update_short.xml
+++ b/tests/integration/test_host_ip_change/configs/dns_update_short.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <dns_cache_update_period>1</dns_cache_update_period>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_host_ip_change/configs/listen_host.xml b/tests/integration/test_host_ip_change/configs/listen_host.xml
index de8c737ff75..f94e5c88568 100644
--- a/tests/integration/test_host_ip_change/configs/listen_host.xml
+++ b/tests/integration/test_host_ip_change/configs/listen_host.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <listen_host>::</listen_host>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_host_ip_change/configs/remote_servers.xml b/tests/integration/test_host_ip_change/configs/remote_servers.xml
index 1b9356d59bd..27682f862a5 100644
--- a/tests/integration/test_host_ip_change/configs/remote_servers.xml
+++ b/tests/integration/test_host_ip_change/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
     	<lost_host_cluster>
     		<shard>
@@ -10,4 +10,4 @@
     		</shard>
     	</lost_host_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_host_ip_change/configs/users_with_hostname.xml b/tests/integration/test_host_ip_change/configs/users_with_hostname.xml
index 42d2da87aef..a534861f235 100644
--- a/tests/integration/test_host_ip_change/configs/users_with_hostname.xml
+++ b/tests/integration/test_host_ip_change/configs/users_with_hostname.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
         <default>
             <networks>
@@ -10,4 +10,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml b/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml
index fd280e05cf4..ae2e5562ff7 100644
--- a/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml
+++ b/tests/integration/test_http_handlers_config/test_defaults_handlers/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
-<yandex>
+<clickhouse>
     <http_server_default_response>Default server response</http_server_default_response>
 
     <http_handlers>
         <defaults/>
     </http_handlers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml b/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml
index 9e0af81ab99..60ae98e177b 100644
--- a/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml
+++ b/tests/integration/test_http_handlers_config/test_dynamic_handler/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<yandex>
+<clickhouse>
     <http_handlers>
         <rule>
             <headers><XXX>xxx</XXX></headers>
@@ -12,4 +12,4 @@
             </handler>
         </rule>
     </http_handlers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml b/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml
index 7ed6d29c613..4aa41a777d4 100644
--- a/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml
+++ b/tests/integration/test_http_handlers_config/test_predefined_handler/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<yandex>
+<clickhouse>
     <http_handlers>
         <rule>
             <methods>GET</methods>
@@ -22,4 +22,4 @@
             </handler>
         </rule>
     </http_handlers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml b/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml
index 8ace97a66dc..3402d9ebf96 100644
--- a/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml
+++ b/tests/integration/test_http_handlers_config/test_prometheus_handler/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<yandex>
+<clickhouse>
     <http_handlers>
         <rule>
             <methods>GET</methods>
@@ -14,4 +14,4 @@
             </handler>
         </rule>
     </http_handlers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml b/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml
index 21f7d3b0fc8..fdfeb981ee3 100644
--- a/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml
+++ b/tests/integration/test_http_handlers_config/test_replicas_status_handler/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<yandex>
+<clickhouse>
     <http_handlers>
         <rule>
             <methods>GET</methods>
@@ -9,4 +9,4 @@
             <handler><type>replicas_status</type></handler>
         </rule>
     </http_handlers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_http_handlers_config/test_static_handler/config.xml b/tests/integration/test_http_handlers_config/test_static_handler/config.xml
index 7938a9fd8f5..48cbdb6c682 100644
--- a/tests/integration/test_http_handlers_config/test_static_handler/config.xml
+++ b/tests/integration/test_http_handlers_config/test_static_handler/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<yandex>
+<clickhouse>
     <test_get_config_static_handler>Test get static handler and config content</test_get_config_static_handler>
 
     <http_handlers>
@@ -49,4 +49,4 @@
         </rule>
 
     </http_handlers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_https_replication/configs/config.xml b/tests/integration/test_https_replication/configs/config.xml
index 35a43b2fc54..4b8a61bc20b 100644
--- a/tests/integration/test_https_replication/configs/config.xml
+++ b/tests/integration/test_https_replication/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -142,7 +142,7 @@
     <!-- <umask>022</umask> -->
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="clickhouse_remote_servers" >
         <!-- Test only shard config for testing distributed storage -->
@@ -168,20 +168,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper-servers" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -241,7 +241,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -265,7 +265,7 @@
 
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -276,7 +276,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -361,4 +361,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_https_replication/configs/no_ssl_conf.xml b/tests/integration/test_https_replication/configs/no_ssl_conf.xml
index db43fd59e99..cd16469232a 100644
--- a/tests/integration/test_https_replication/configs/no_ssl_conf.xml
+++ b/tests/integration/test_https_replication/configs/no_ssl_conf.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <interserver_http_port>9010</interserver_http_port>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_https_replication/configs/remote_servers.xml b/tests/integration/test_https_replication/configs/remote_servers.xml
index ce36da06e9a..ab9124d00ad 100644
--- a/tests/integration/test_https_replication/configs/remote_servers.xml
+++ b/tests/integration/test_https_replication/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -46,4 +46,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_https_replication/configs/ssl_conf.xml b/tests/integration/test_https_replication/configs/ssl_conf.xml
index ad7b874ebd3..6f53f1d4374 100644
--- a/tests/integration/test_https_replication/configs/ssl_conf.xml
+++ b/tests/integration/test_https_replication/configs/ssl_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
@@ -17,4 +17,4 @@
     </openSSL>
     <interserver_https_port>9010</interserver_https_port>
     <interserver_http_port remove="1"/>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_inherit_multiple_profiles/configs/combined_profile.xml b/tests/integration/test_inherit_multiple_profiles/configs/combined_profile.xml
index 4fbb7dcf3ff..4c75e2fcc10 100644
--- a/tests/integration/test_inherit_multiple_profiles/configs/combined_profile.xml
+++ b/tests/integration/test_inherit_multiple_profiles/configs/combined_profile.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <profiles>
     <profile_1>
       <max_parallel_replicas>2</max_parallel_replicas>
@@ -56,4 +56,4 @@
       <profile>combined_profile</profile>
     </test_combined_profile>
   </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/asynchronous_metrics_update_period_s.xml b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/asynchronous_metrics_update_period_s.xml
index ed131f41ede..e5050f9dda2 100644
--- a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/asynchronous_metrics_update_period_s.xml
+++ b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/asynchronous_metrics_update_period_s.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- this update period also syncs MemoryTracking with RSS, disable this, by using period = 1 day -->
     <asynchronous_metrics_update_period_s>86400</asynchronous_metrics_update_period_s>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
index 26cb2bfa782..3e4c885d1f6 100644
--- a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
+++ b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <!-- make it fail earlier -->
     <max_server_memory_usage>3000000000</max_server_memory_usage> <!-- 3GB -->
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py b/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py
index e8866d3a235..bc7f32bf544 100644
--- a/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py
+++ b/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py
@@ -30,7 +30,7 @@ def test_memory_tracking_total():
         CREATE TABLE null (row String) ENGINE=Null;
     ''')
     instance.exec_in_container(['bash', '-c',
-                                'clickhouse client -q "SELECT arrayStringConcat(arrayMap(x->toString(cityHash64(x)), range(1000)), \' \') from numbers(10000)" > data.json'])
+                                'clickhouse local -q "SELECT arrayStringConcat(arrayMap(x->toString(cityHash64(x)), range(1000)), \' \') from numbers(10000)" > data.json'])
     for it in range(0, 20):
         # the problem can be triggered only via HTTP,
         # since clickhouse-client parses the data by itself.
diff --git a/tests/integration/test_insert_distributed_async_extra_dirs/configs/remote_servers.xml b/tests/integration/test_insert_distributed_async_extra_dirs/configs/remote_servers.xml
index 1df72377ce6..6de30d48b8f 100644
--- a/tests/integration/test_insert_distributed_async_extra_dirs/configs/remote_servers.xml
+++ b/tests/integration/test_insert_distributed_async_extra_dirs/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -9,5 +9,5 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_insert_distributed_async_send/configs/remote_servers.xml b/tests/integration/test_insert_distributed_async_send/configs/remote_servers.xml
index 5b7188368f9..12beeabe806 100644
--- a/tests/integration/test_insert_distributed_async_send/configs/remote_servers.xml
+++ b/tests/integration/test_insert_distributed_async_send/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <insert_distributed_async_send_cluster_two_replicas>
             <shard>
@@ -28,5 +28,5 @@
             </shard>
         </insert_distributed_async_send_cluster_two_shards>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_insert_distributed_async_send/configs/remote_servers_split.xml b/tests/integration/test_insert_distributed_async_send/configs/remote_servers_split.xml
index e2757bbc18c..c3701ce6fab 100644
--- a/tests/integration/test_insert_distributed_async_send/configs/remote_servers_split.xml
+++ b/tests/integration/test_insert_distributed_async_send/configs/remote_servers_split.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <insert_distributed_async_send_cluster_two_replicas>
             <shard>
@@ -28,5 +28,5 @@
             </shard>
         </insert_distributed_async_send_cluster_two_shards>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_insert_distributed_async_send/configs/users.d/batch.xml b/tests/integration/test_insert_distributed_async_send/configs/users.d/batch.xml
index 5058ffac147..ec8010f8cdc 100644
--- a/tests/integration/test_insert_distributed_async_send/configs/users.d/batch.xml
+++ b/tests/integration/test_insert_distributed_async_send/configs/users.d/batch.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <distributed_directory_monitor_batch_inserts>1</distributed_directory_monitor_batch_inserts>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_distributed_async_send/configs/users.d/no_batch.xml b/tests/integration/test_insert_distributed_async_send/configs/users.d/no_batch.xml
index 806df109670..b3258c2c3f5 100644
--- a/tests/integration/test_insert_distributed_async_send/configs/users.d/no_batch.xml
+++ b/tests/integration/test_insert_distributed_async_send/configs/users.d/no_batch.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <distributed_directory_monitor_batch_inserts>0</distributed_directory_monitor_batch_inserts>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_distributed_async_send/configs/users.d/split.xml b/tests/integration/test_insert_distributed_async_send/configs/users.d/split.xml
index bf826629685..6e62e513143 100644
--- a/tests/integration/test_insert_distributed_async_send/configs/users.d/split.xml
+++ b/tests/integration/test_insert_distributed_async_send/configs/users.d/split.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <distributed_directory_monitor_split_batch_on_failure>1</distributed_directory_monitor_split_batch_on_failure>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_distributed_load_balancing/configs/remote_servers.xml b/tests/integration/test_insert_distributed_load_balancing/configs/remote_servers.xml
index bfcb1c0977b..ddcde627a31 100644
--- a/tests/integration/test_insert_distributed_load_balancing/configs/remote_servers.xml
+++ b/tests/integration/test_insert_distributed_load_balancing/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <internal_replication>
             <shard>
@@ -28,5 +28,5 @@
             </shard>
         </no_internal_replication>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_insert_into_distributed/configs/enable_distributed_inserts_batching.xml b/tests/integration/test_insert_into_distributed/configs/enable_distributed_inserts_batching.xml
index ec4e190db5f..de0c930b8ab 100644
--- a/tests/integration/test_insert_into_distributed/configs/enable_distributed_inserts_batching.xml
+++ b/tests/integration/test_insert_into_distributed/configs/enable_distributed_inserts_batching.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <distributed_directory_monitor_batch_inserts>1</distributed_directory_monitor_batch_inserts>
             <min_insert_block_size_rows>3</min_insert_block_size_rows>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_into_distributed/configs/forbid_background_merges.xml b/tests/integration/test_insert_into_distributed/configs/forbid_background_merges.xml
index bc2dae31ad6..60b782bb44c 100644
--- a/tests/integration/test_insert_into_distributed/configs/forbid_background_merges.xml
+++ b/tests/integration/test_insert_into_distributed/configs/forbid_background_merges.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <max_bytes_to_merge_at_min_space_in_pool>1</max_bytes_to_merge_at_min_space_in_pool>
         <max_bytes_to_merge_at_max_space_in_pool>2</max_bytes_to_merge_at_max_space_in_pool>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_into_distributed/configs/remote_servers.xml b/tests/integration/test_insert_into_distributed/configs/remote_servers.xml
index 07fd52751b7..8262f02a557 100644
--- a/tests/integration/test_insert_into_distributed/configs/remote_servers.xml
+++ b/tests/integration/test_insert_into_distributed/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -56,4 +56,4 @@
             </shard>
         </shard_with_low_cardinality>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_into_distributed_sync_async/configs/remote_servers.xml b/tests/integration/test_insert_into_distributed_sync_async/configs/remote_servers.xml
index ab0899c0d79..d1357642d30 100644
--- a/tests/integration/test_insert_into_distributed_sync_async/configs/remote_servers.xml
+++ b/tests/integration/test_insert_into_distributed_sync_async/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
 
         <test_cluster>
@@ -25,4 +25,4 @@
         </local_shard_with_internal_replication>
 
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_into_distributed_through_materialized_view/configs/enable_distributed_inserts_batching.xml b/tests/integration/test_insert_into_distributed_through_materialized_view/configs/enable_distributed_inserts_batching.xml
index ec4e190db5f..de0c930b8ab 100644
--- a/tests/integration/test_insert_into_distributed_through_materialized_view/configs/enable_distributed_inserts_batching.xml
+++ b/tests/integration/test_insert_into_distributed_through_materialized_view/configs/enable_distributed_inserts_batching.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <distributed_directory_monitor_batch_inserts>1</distributed_directory_monitor_batch_inserts>
             <min_insert_block_size_rows>3</min_insert_block_size_rows>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_into_distributed_through_materialized_view/configs/forbid_background_merges.xml b/tests/integration/test_insert_into_distributed_through_materialized_view/configs/forbid_background_merges.xml
index bc2dae31ad6..60b782bb44c 100644
--- a/tests/integration/test_insert_into_distributed_through_materialized_view/configs/forbid_background_merges.xml
+++ b/tests/integration/test_insert_into_distributed_through_materialized_view/configs/forbid_background_merges.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <max_bytes_to_merge_at_min_space_in_pool>1</max_bytes_to_merge_at_min_space_in_pool>
         <max_bytes_to_merge_at_max_space_in_pool>2</max_bytes_to_merge_at_max_space_in_pool>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_insert_into_distributed_through_materialized_view/configs/remote_servers.xml b/tests/integration/test_insert_into_distributed_through_materialized_view/configs/remote_servers.xml
index 84b98cc0223..baf4e59950f 100644
--- a/tests/integration/test_insert_into_distributed_through_materialized_view/configs/remote_servers.xml
+++ b/tests/integration/test_insert_into_distributed_through_materialized_view/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -17,4 +17,4 @@
             </shard>
         </test_local_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml b/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml
index 62b0ffacaf0..08a21efad80 100644
--- a/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_jbod_balancer/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <default>
@@ -26,4 +26,4 @@
             </jbod>
         </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml b/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml
index 9c7e8347eae..2cc29c0c76d 100644
--- a/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml
+++ b/tests/integration/test_jdbc_bridge/configs/jdbc_bridge.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <jdbc_bridge>
         <host>bridge1</host>
         <port>9019</port>
     </jdbc_bridge>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_join_set_family_s3/configs/config.xml b/tests/integration/test_join_set_family_s3/configs/config.xml
index 5b9b5b5843a..ca4bdf15b43 100644
--- a/tests/integration/test_join_set_family_s3/configs/config.xml
+++ b/tests/integration/test_join_set_family_s3/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -25,4 +25,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_join_set_family_s3/configs/minio.xml b/tests/integration/test_join_set_family_s3/configs/minio.xml
index 7337be1ad94..8a3222c37a3 100644
--- a/tests/integration/test_join_set_family_s3/configs/minio.xml
+++ b/tests/integration/test_join_set_family_s3/configs/minio.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -11,4 +11,4 @@
             </s3>
         </disks>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_join_set_family_s3/configs/ssl.xml b/tests/integration/test_join_set_family_s3/configs/ssl.xml
index 95cdc918bd0..1200dc8c94b 100644
--- a/tests/integration/test_join_set_family_s3/configs/ssl.xml
+++ b/tests/integration/test_join_set_family_s3/configs/ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_join_set_family_s3/configs/users.xml b/tests/integration/test_join_set_family_s3/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_join_set_family_s3/configs/users.xml
+++ b/tests/integration/test_join_set_family_s3/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_auth/configs/keeper_config.xml b/tests/integration/test_keeper_auth/configs/keeper_config.xml
index bee3ccb0aba..1a01b79cebd 100644
--- a/tests/integration/test_keeper_auth/configs/keeper_config.xml
+++ b/tests/integration/test_keeper_auth/configs/keeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -11,6 +11,10 @@
             <session_timeout_ms>10000</session_timeout_ms>
             <raft_logs_level>trace</raft_logs_level>
             <snapshot_distance>75</snapshot_distance>
+            <!-- For instant start in single node configuration -->
+            <heart_beat_interval_ms>0</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>0</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>0</election_timeout_upper_bound_ms>
         </coordination_settings>
 
         <raft_configuration>
@@ -21,4 +25,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml b/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
index dc8d3a8dfc9..30a56c6e1e1 100644
--- a/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
+++ b/tests/integration/test_keeper_back_to_back/configs/enable_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -10,6 +10,10 @@
             <session_timeout_ms>10000</session_timeout_ms>
             <raft_logs_level>trace</raft_logs_level>
             <force_sync>false</force_sync>
+            <!-- For instant start in single node configuration -->
+            <heart_beat_interval_ms>0</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>0</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>0</election_timeout_upper_bound_ms>
         </coordination_settings>
 
         <raft_configuration>
@@ -20,4 +24,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml b/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml
index 12dc7fd9447..16ba443e5ec 100644
--- a/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml
+++ b/tests/integration/test_keeper_back_to_back/configs/use_keeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
             <node index="1">
             <host>node1</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_back_to_back/test.py b/tests/integration/test_keeper_back_to_back/test.py
index 41c270e05e8..f73b4671798 100644
--- a/tests/integration/test_keeper_back_to_back/test.py
+++ b/tests/integration/test_keeper_back_to_back/test.py
@@ -90,6 +90,46 @@ def test_sequential_nodes(started_cluster):
         genuine_childs = list(sorted(genuine_zk.get_children("/test_sequential_nodes")))
         fake_childs = list(sorted(fake_zk.get_children("/test_sequential_nodes")))
         assert genuine_childs == fake_childs
+
+        genuine_zk.create("/test_sequential_nodes_1")
+        fake_zk.create("/test_sequential_nodes_1")
+
+        genuine_zk.create("/test_sequential_nodes_1/a", sequence=True)
+        fake_zk.create("/test_sequential_nodes_1/a", sequence=True)
+
+        genuine_zk.create("/test_sequential_nodes_1/a0000000002")
+        fake_zk.create("/test_sequential_nodes_1/a0000000002")
+
+        genuine_throw = False
+        fake_throw = False
+        try:
+            genuine_zk.create("/test_sequential_nodes_1/a", sequence=True)
+        except Exception as ex:
+            genuine_throw = True
+
+        try:
+            fake_zk.create("/test_sequential_nodes_1/a", sequence=True)
+        except Exception as ex:
+            fake_throw = True
+
+        assert genuine_throw == True
+        assert fake_throw == True
+
+        genuine_childs_1 = list(sorted(genuine_zk.get_children("/test_sequential_nodes_1")))
+        fake_childs_1 = list(sorted(fake_zk.get_children("/test_sequential_nodes_1")))
+        assert genuine_childs_1 == fake_childs_1
+
+        genuine_zk.create("/test_sequential_nodes_2")
+        fake_zk.create("/test_sequential_nodes_2")
+
+        genuine_zk.create("/test_sequential_nodes_2/node")
+        fake_zk.create("/test_sequential_nodes_2/node")
+        genuine_zk.create("/test_sequential_nodes_2/node", sequence=True)
+        fake_zk.create("/test_sequential_nodes_2/node", sequence=True)
+
+        genuine_childs_2 = list(sorted(genuine_zk.get_children("/test_sequential_nodes_2")))
+        fake_childs_2 = list(sorted(fake_zk.get_children("/test_sequential_nodes_2")))
+        assert genuine_childs_2 == fake_childs_2
     finally:
         for zk in [genuine_zk, fake_zk]:
             stop_zk(zk)
@@ -178,6 +218,10 @@ def test_watchers(started_cluster):
         print("Fake data", fake_data_watch_data)
         assert genuine_data_watch_data == fake_data_watch_data
 
+
+        genuine_zk.create("/test_data_watches/child", b"a")
+        fake_zk.create("/test_data_watches/child", b"a")
+
         genuine_children = None
         def genuine_child_callback(event):
             print("Genuine child watch called")
@@ -193,16 +237,74 @@ def test_watchers(started_cluster):
         genuine_zk.get_children("/test_data_watches", watch=genuine_child_callback)
         fake_zk.get_children("/test_data_watches", watch=fake_child_callback)
 
+        print("Calling non related genuine child")
+        genuine_zk.set("/test_data_watches/child", b"q")
+        genuine_zk.set("/test_data_watches", b"q")
+
+        print("Calling non related fake child")
+        fake_zk.set("/test_data_watches/child", b"q")
+        fake_zk.set("/test_data_watches", b"q")
+
+        time.sleep(3)
+
+        assert genuine_children == None
+        assert fake_children == None
+
         print("Calling genuine child")
-        genuine_zk.create("/test_data_watches/child", b"b")
+        genuine_zk.create("/test_data_watches/child_new", b"b")
         print("Calling fake child")
-        fake_zk.create("/test_data_watches/child", b"b")
+        fake_zk.create("/test_data_watches/child_new", b"b")
 
         time.sleep(3)
 
         print("Genuine children", genuine_children)
         print("Fake children", fake_children)
         assert genuine_children == fake_children
+
+        genuine_children_delete = None
+        def genuine_child_delete_callback(event):
+            print("Genuine child watch called")
+            nonlocal genuine_children_delete
+            genuine_children_delete = event
+
+        fake_children_delete = None
+        def fake_child_delete_callback(event):
+            print("Fake child watch called")
+            nonlocal fake_children_delete
+            fake_children_delete = event
+
+        genuine_child_delete = None
+        def genuine_own_delete_callback(event):
+            print("Genuine child watch called")
+            nonlocal genuine_child_delete
+            genuine_child_delete = event
+
+        fake_child_delete = None
+        def fake_own_delete_callback(event):
+            print("Fake child watch called")
+            nonlocal fake_child_delete
+            fake_child_delete = event
+
+        genuine_zk.get_children("/test_data_watches", watch=genuine_child_delete_callback)
+        fake_zk.get_children("/test_data_watches", watch=fake_child_delete_callback)
+        genuine_zk.get_children("/test_data_watches/child", watch=genuine_own_delete_callback)
+        fake_zk.get_children("/test_data_watches/child", watch=fake_own_delete_callback)
+
+        print("Calling genuine child delete")
+        genuine_zk.delete("/test_data_watches/child")
+        print("Calling fake child delete")
+        fake_zk.delete("/test_data_watches/child")
+
+        time.sleep(3)
+
+        print("Genuine children delete", genuine_children_delete)
+        print("Fake children delete", fake_children_delete)
+        assert genuine_children_delete == fake_children_delete
+
+        print("Genuine child delete", genuine_child_delete)
+        print("Fake child delete", fake_child_delete)
+        assert genuine_child_delete == fake_child_delete
+
     finally:
         for zk in [genuine_zk, fake_zk]:
             stop_zk(zk)
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
index ecbd50c72a6..039d864711c 100644
--- a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -39,4 +39,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
index 53129ae0a75..a3c20e095f3 100644
--- a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -39,4 +39,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
index 4c685764ec0..867c48ba250 100644
--- a/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/enable_secure_keeper3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -39,4 +39,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml b/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
index babc7cf0f18..37eb2624b1b 100644
--- a/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
+++ b/tests/integration/test_keeper_internal_secure/configs/ssl_conf.xml
@@ -1,5 +1,5 @@
 
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
@@ -12,4 +12,4 @@
             <preferServerCiphers>true</preferServerCiphers>
         </server>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
index 5a75bf524ec..9acc30f02fa 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
index 246fb08c9e7..9f8c0806ee0 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
index b5958dd7f41..e0efa3a8d1e 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/enable_keeper3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_blocade_leader/configs/use_keeper.xml b/tests/integration/test_keeper_multinode_blocade_leader/configs/use_keeper.xml
index b6139005d2f..384e984f210 100644
--- a/tests/integration/test_keeper_multinode_blocade_leader/configs/use_keeper.xml
+++ b/tests/integration/test_keeper_multinode_blocade_leader/configs/use_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>node1</host>
@@ -13,4 +13,4 @@
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
index 5a75bf524ec..9acc30f02fa 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
index 246fb08c9e7..9f8c0806ee0 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
index b5958dd7f41..e0efa3a8d1e 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/enable_keeper3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -38,4 +38,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_multinode_simple/configs/use_keeper.xml b/tests/integration/test_keeper_multinode_simple/configs/use_keeper.xml
index b6139005d2f..384e984f210 100644
--- a/tests/integration/test_keeper_multinode_simple/configs/use_keeper.xml
+++ b/tests/integration/test_keeper_multinode_simple/configs/use_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>node1</host>
@@ -13,4 +13,4 @@
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/__init__.py b/tests/integration/test_keeper_nodes_add/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..bd695389fa6
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper1.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
new file mode 100644
index 00000000000..510424715c4
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_1.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
new file mode 100644
index 00000000000..264601d8c98
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_2.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
new file mode 100644
index 00000000000..7f9775939bb
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_three_nodes_3.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
new file mode 100644
index 00000000000..3f6baf1ccc7
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_1.xml
@@ -0,0 +1,27 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
new file mode 100644
index 00000000000..61c9a00ffd6
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/configs/enable_keeper_two_nodes_2.xml
@@ -0,0 +1,27 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_add/test.py b/tests/integration/test_keeper_nodes_add/test.py
new file mode 100644
index 00000000000..ae4a996f6b3
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_add/test.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from multiprocessing.dummy import Pool
+from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
+from kazoo.client import KazooClient, KazooState
+
+cluster = ClickHouseCluster(__file__)
+CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'configs')
+
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=[], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=[], stay_alive=True)
+
+
+def get_fake_zk(node, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(node.name) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def start(node):
+       node.start_clickhouse()
+
+
+def test_nodes_add(started_cluster):
+    zk_conn = get_fake_zk(node1)
+
+    for i in range(100):
+        zk_conn.create("/test_two_" + str(i), b"somedata")
+
+    p = Pool(3)
+    node2.stop_clickhouse()
+    node2.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_two_nodes_2.xml"), "/etc/clickhouse-server/config.d/enable_keeper2.xml")
+    waiter = p.apply_async(start, (node2,))
+    node1.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_two_nodes_1.xml"), "/etc/clickhouse-server/config.d/enable_keeper1.xml")
+    node1.query("SYSTEM RELOAD CONFIG")
+    waiter.wait()
+
+    zk_conn2 = get_fake_zk(node2)
+
+    for i in range(100):
+        assert zk_conn2.exists("/test_two_" + str(i)) is not None
+
+    zk_conn = get_fake_zk(node1)
+
+    for i in range(100):
+        zk_conn.create("/test_three_" + str(i), b"somedata")
+
+    node3.stop_clickhouse()
+
+    node3.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_three_nodes_3.xml"), "/etc/clickhouse-server/config.d/enable_keeper3.xml")
+    waiter = p.apply_async(start, (node3,))
+    node2.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_three_nodes_2.xml"), "/etc/clickhouse-server/config.d/enable_keeper2.xml")
+    node1.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_three_nodes_1.xml"), "/etc/clickhouse-server/config.d/enable_keeper1.xml")
+
+    node1.query("SYSTEM RELOAD CONFIG")
+    node2.query("SYSTEM RELOAD CONFIG")
+
+    waiter.wait()
+    zk_conn3 = get_fake_zk(node3)
+
+    for i in range(100):
+        assert zk_conn3.exists("/test_three_" + str(i)) is not None
diff --git a/tests/integration/test_keeper_nodes_move/__init__.py b/tests/integration/test_keeper_nodes_move/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..a8a1a17b831
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper1.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..7820158680c
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper2.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..cd76b0d216e
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper3.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml
new file mode 100644
index 00000000000..d99502e2959
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_1.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>4</id>
+                <hostname>node4</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml
new file mode 100644
index 00000000000..04d8776782f
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_2.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>4</id>
+                <hostname>node4</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml
new file mode 100644
index 00000000000..10abf71b9f6
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/configs/enable_keeper_node4_4.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>4</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>4</id>
+                <hostname>node4</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_move/test.py b/tests/integration/test_keeper_nodes_move/test.py
new file mode 100644
index 00000000000..e3f1a161b07
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_move/test.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+
+
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from multiprocessing.dummy import Pool
+from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
+from kazoo.client import KazooClient, KazooState
+
+cluster = ClickHouseCluster(__file__)
+CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'configs')
+
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml'], stay_alive=True)
+node4 = cluster.add_instance('node4', stay_alive=True)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def start(node):
+    node.start_clickhouse()
+
+def get_fake_zk(node, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(node.name) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+def test_node_move(started_cluster):
+    zk_conn = get_fake_zk(node1)
+
+    for i in range(100):
+        zk_conn.create("/test_four_" + str(i), b"somedata")
+
+    zk_conn2 = get_fake_zk(node2)
+    zk_conn2.sync("/test_four_0")
+
+    zk_conn3 = get_fake_zk(node3)
+    zk_conn3.sync("/test_four_0")
+
+    for i in range(100):
+        assert zk_conn2.exists("test_four_" + str(i)) is not None
+        assert zk_conn3.exists("test_four_" + str(i)) is not None
+
+    node4.stop_clickhouse()
+    node4.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_node4_4.xml"), "/etc/clickhouse-server/config.d/enable_keeper4.xml")
+    p = Pool(3)
+    waiter = p.apply_async(start, (node4,))
+    node1.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_node4_1.xml"), "/etc/clickhouse-server/config.d/enable_keeper1.xml")
+    node2.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_node4_2.xml"), "/etc/clickhouse-server/config.d/enable_keeper2.xml")
+
+    node1.query("SYSTEM RELOAD CONFIG")
+    node2.query("SYSTEM RELOAD CONFIG")
+
+    waiter.wait()
+
+    zk_conn4 = get_fake_zk(node4)
+    zk_conn4.sync("/test_four_0")
+
+    for i in range(100):
+        assert zk_conn4.exists("/test_four_" + str(i)) is not None
+
+    with pytest.raises(Exception):
+        # Adding and removing nodes is async operation
+        for i in range(10):
+            zk_conn3 = get_fake_zk(node3)
+            zk_conn3.sync("/test_four_0")
+            time.sleep(i)
diff --git a/tests/integration/test_keeper_nodes_remove/__init__.py b/tests/integration/test_keeper_nodes_remove/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..a8a1a17b831
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper1.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..7820158680c
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper2.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..cd76b0d216e
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper3.xml
@@ -0,0 +1,34 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <start_as_follower>true</start_as_follower>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml
new file mode 100644
index 00000000000..3f6baf1ccc7
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_1.xml
@@ -0,0 +1,27 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml
new file mode 100644
index 00000000000..61c9a00ffd6
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_keeper_two_nodes_2.xml
@@ -0,0 +1,27 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml b/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml
new file mode 100644
index 00000000000..bd695389fa6
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/configs/enable_single_keeper1.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_nodes_remove/test.py b/tests/integration/test_keeper_nodes_remove/test.py
new file mode 100644
index 00000000000..6df4ee1c497
--- /dev/null
+++ b/tests/integration/test_keeper_nodes_remove/test.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import os
+from kazoo.client import KazooClient, KazooState
+
+cluster = ClickHouseCluster(__file__)
+CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'configs')
+
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml'], stay_alive=True)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_fake_zk(node, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(node.name) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+def test_nodes_remove(started_cluster):
+    zk_conn = get_fake_zk(node1)
+
+    for i in range(100):
+        zk_conn.create("/test_two_" + str(i), b"somedata")
+
+    zk_conn2 = get_fake_zk(node2)
+    zk_conn2.sync("/test_two_0")
+
+    zk_conn3 = get_fake_zk(node3)
+    zk_conn3.sync("/test_two_0")
+
+    for i in range(100):
+        assert zk_conn2.exists("test_two_" + str(i)) is not None
+        assert zk_conn3.exists("test_two_" + str(i)) is not None
+
+    node2.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_two_nodes_2.xml"), "/etc/clickhouse-server/config.d/enable_keeper2.xml")
+    node1.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_keeper_two_nodes_1.xml"), "/etc/clickhouse-server/config.d/enable_keeper1.xml")
+
+    node1.query("SYSTEM RELOAD CONFIG")
+    node2.query("SYSTEM RELOAD CONFIG")
+
+    zk_conn2 = get_fake_zk(node2)
+
+    for i in range(100):
+        assert zk_conn2.exists("test_two_" + str(i)) is not None
+        zk_conn2.create("/test_two_" + str(100 + i), b"otherdata")
+
+    zk_conn = get_fake_zk(node1)
+    zk_conn.sync("/test_two_0")
+
+    for i in range(100):
+        assert zk_conn.exists("test_two_" + str(i)) is not None
+        assert zk_conn.exists("test_two_" + str(100 + i)) is not None
+
+    with pytest.raises(Exception):
+        zk_conn3 = get_fake_zk(node3)
+        zk_conn3.sync("/test_two_0")
+
+    node3.stop_clickhouse()
+
+    node1.copy_file_to_container(os.path.join(CONFIG_DIR, "enable_single_keeper1.xml"), "/etc/clickhouse-server/config.d/enable_keeper1.xml")
+
+    node1.query("SYSTEM RELOAD CONFIG")
+    zk_conn = get_fake_zk(node1)
+    zk_conn.sync("/test_two_0")
+
+    for i in range(100):
+        assert zk_conn.exists("test_two_" + str(i)) is not None
+        assert zk_conn.exists("test_two_" + str(100 + i)) is not None
+
+    with pytest.raises(Exception):
+        zk_conn2 = get_fake_zk(node2)
+        zk_conn2.sync("/test_two_0")
+
+    node2.stop_clickhouse()
diff --git a/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml b/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
index 13fb98a0e7a..e302b857666 100644
--- a/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
+++ b/tests/integration/test_keeper_persistent_log/configs/enable_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -19,4 +19,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml b/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml
index 2e48e91bca5..14f635fb64b 100644
--- a/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml
+++ b/tests/integration/test_keeper_persistent_log/configs/use_keeper.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <zookeeper>
             <node index="1">
             <host>node</host>
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_persistent_log/test.py b/tests/integration/test_keeper_persistent_log/test.py
index 35f38f3ea1b..eec2d4cbbdc 100644
--- a/tests/integration/test_keeper_persistent_log/test.py
+++ b/tests/integration/test_keeper_persistent_log/test.py
@@ -75,6 +75,60 @@ def test_state_after_restart(started_cluster):
         except:
             pass
 
+def test_state_duplicate_restart(started_cluster):
+    try:
+        node_zk = None
+        node_zk2 = None
+        node_zk3 = None
+        node_zk = get_connection_zk("node")
+
+        node_zk.create("/test_state_duplicated_restart", b"somevalue")
+        strs = []
+        for i in range(100):
+            strs.append(random_string(123).encode())
+            node_zk.create("/test_state_duplicated_restart/node" + str(i), strs[i])
+
+        for i in range(100):
+            if i % 7 == 0:
+                node_zk.delete("/test_state_duplicated_restart/node" + str(i))
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk2 = get_connection_zk("node")
+
+        node_zk2.create("/test_state_duplicated_restart/just_test1")
+        node_zk2.create("/test_state_duplicated_restart/just_test2")
+        node_zk2.create("/test_state_duplicated_restart/just_test3")
+
+        node.restart_clickhouse(kill=True)
+
+        node_zk3 = get_connection_zk("node")
+
+        assert node_zk3.get("/test_state_duplicated_restart")[0] == b"somevalue"
+        for i in range(100):
+            if i % 7 == 0:
+                assert node_zk3.exists("/test_state_duplicated_restart/node" + str(i)) is None
+            else:
+                assert len(node_zk3.get("/test_state_duplicated_restart/node" + str(i))[0]) == 123
+                assert node_zk3.get("/test_state_duplicated_restart/node" + str(i))[0] == strs[i]
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+
+            if node_zk2 is not None:
+                node_zk2.stop()
+                node_zk2.close()
+
+            if node_zk3 is not None:
+                node_zk3.stop()
+                node_zk3.close()
+
+        except:
+            pass
+
+
 
 # http://zookeeper-user.578899.n2.nabble.com/Why-are-ephemeral-nodes-written-to-disk-tp7583403p7583418.html
 def test_ephemeral_after_restart(started_cluster):
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
index 073616695cd..2ee38419581 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -37,4 +37,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
index c94b6c953fd..018fa284896 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -37,4 +37,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
index 10955abab02..77a1d720b69 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/enable_keeper3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -37,4 +37,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml b/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml
index b6139005d2f..384e984f210 100644
--- a/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml
+++ b/tests/integration/test_keeper_persistent_log_multinode/configs/use_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>node1</host>
@@ -13,4 +13,4 @@
             <port>9181</port>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
index 526ff259d40..6e838ed2a96 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -40,4 +40,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
index 0c1d3781c3a..1ff565044e8 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -40,4 +40,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
index b0694540292..8f022c22c3c 100644
--- a/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_restore_from_snapshot/configs/enable_keeper3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -40,4 +40,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
index af815f4a3bc..b8ef730c6ed 100644
--- a/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
+++ b/tests/integration/test_keeper_secure_client/configs/enable_secure_keeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port_secure>10181</tcp_port_secure>
         <server_id>1</server_id>
@@ -21,4 +21,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml b/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
index 7ca51acde22..b8f15c71e1a 100644
--- a/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
+++ b/tests/integration/test_keeper_secure_client/configs/ssl_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
@@ -23,4 +23,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml b/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml
index a0d19300022..8b1af7b7970 100644
--- a/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml
+++ b/tests/integration/test_keeper_secure_client/configs/use_secure_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>node1</host>
@@ -6,4 +6,4 @@
             <secure>1</secure>
         </node>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/__init__.py b/tests/integration/test_keeper_snapshot_small_distance/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml
new file mode 100644
index 00000000000..1e9bea6c606
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config1.xml
@@ -0,0 +1,37 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>75</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml
new file mode 100644
index 00000000000..4fc00055ff1
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config2.xml
@@ -0,0 +1,37 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>75</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml
new file mode 100644
index 00000000000..89134440aa3
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/keeper_config3.xml
@@ -0,0 +1,37 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <snapshot_distance>75</snapshot_distance>
+            <reserved_log_items>5</reserved_log_items>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <priority>2</priority>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+                <priority>1</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/configs/logs_conf.xml b/tests/integration/test_keeper_snapshot_small_distance/configs/logs_conf.xml
new file mode 100644
index 00000000000..57719d453fc
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_small_distance/configs/logs_conf.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/log.log</log>
+        <errorlog>/var/log/clickhouse-server/log.err.log</errorlog>
+        <size>1000M</size>
+        <count>10</count>
+        <stderr>/var/log/clickhouse-server/stderr.log</stderr>
+        <stdout>/var/log/clickhouse-server/stdout.log</stdout>
+    </logger>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshot_small_distance/test.py b/tests/integration/test_keeper_snapshot_small_distance/test.py
new file mode 100644
index 00000000000..4acd76806b4
--- /dev/null
+++ b/tests/integration/test_keeper_snapshot_small_distance/test.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+##!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+from multiprocessing.dummy import Pool
+from kazoo.client import KazooClient, KazooState
+import random
+import string
+import os
+import time
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/keeper_config1.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/keeper_config2.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/keeper_config3.xml'], stay_alive=True)
+
+def start_zookeeper(node):
+    node1.exec_in_container(['bash', '-c', '/opt/zookeeper/bin/zkServer.sh start'])
+
+def stop_zookeeper(node):
+    node.exec_in_container(['bash', '-c', '/opt/zookeeper/bin/zkServer.sh stop'])
+
+def clear_zookeeper(node):
+    node.exec_in_container(['bash', '-c', 'rm -fr /zookeeper/*'])
+
+def restart_and_clear_zookeeper(node):
+    stop_zookeeper(node)
+    clear_zookeeper(node)
+    start_zookeeper(node)
+
+def clear_clickhouse_data(node):
+    node.exec_in_container(['bash', '-c', 'rm -fr /var/lib/clickhouse/coordination/logs/* /var/lib/clickhouse/coordination/snapshots/*'])
+
+def convert_zookeeper_data(node):
+    cmd = '/usr/bin/clickhouse keeper-converter --zookeeper-logs-dir /zookeeper/version-2/ --zookeeper-snapshots-dir  /zookeeper/version-2/ --output-dir /var/lib/clickhouse/coordination/snapshots'
+    node.exec_in_container(['bash', '-c', cmd])
+    return os.path.join('/var/lib/clickhouse/coordination/snapshots', node.exec_in_container(['bash', '-c', 'ls /var/lib/clickhouse/coordination/snapshots']).strip())
+
+def stop_clickhouse(node):
+    node.stop_clickhouse()
+
+def start_clickhouse(node):
+    node.start_clickhouse()
+
+def copy_zookeeper_data(make_zk_snapshots, node):
+    stop_zookeeper(node)
+
+    if make_zk_snapshots: # force zookeeper to create snapshot
+        start_zookeeper(node)
+        stop_zookeeper(node)
+
+    stop_clickhouse(node)
+    clear_clickhouse_data(node)
+    convert_zookeeper_data(node)
+    start_zookeeper(node)
+    start_clickhouse(node)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def get_fake_zk(node, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(node.name) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def get_genuine_zk(node, timeout=30.0):
+    _genuine_zk_instance = KazooClient(hosts=cluster.get_instance_ip(node.name) + ":2181", timeout=timeout)
+    _genuine_zk_instance.start()
+    return _genuine_zk_instance
+
+
+def test_snapshot_and_load(started_cluster):
+    restart_and_clear_zookeeper(node1)
+    genuine_connection = get_genuine_zk(node1)
+    for node in [node1, node2, node3]:
+        print("Stop and clear", node.name, "with dockerid", node.docker_id)
+        stop_clickhouse(node)
+        clear_clickhouse_data(node)
+
+    for i in range(1000):
+        genuine_connection.create("/test" + str(i), b"data")
+
+    print("Data loaded to zookeeper")
+
+    stop_zookeeper(node1)
+    start_zookeeper(node1)
+    stop_zookeeper(node1)
+
+    print("Data copied to node1")
+    resulted_path = convert_zookeeper_data(node1)
+    print("Resulted path", resulted_path)
+    for node in [node2, node3]:
+        print("Copy snapshot from", node1.name, "to", node.name)
+        cluster.copy_file_from_container_to_container(node1, resulted_path, node, '/var/lib/clickhouse/coordination/snapshots')
+
+    print("Starting clickhouses")
+
+    p = Pool(3)
+    result = p.map_async(start_clickhouse, [node1, node2, node3])
+    result.wait()
+
+    print("Loading additional data")
+    fake_zks = [get_fake_zk(node) for node in [node1, node2, node3]]
+    for i in range(1000):
+        fake_zk = random.choice(fake_zks)
+        try:
+            fake_zk.create("/test" + str(i + 1000), b"data")
+        except Exception as ex:
+            print("Got exception:" + str(ex))
+
+    print("Final")
+    fake_zks[0].create("/test10000", b"data")
diff --git a/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml b/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
index 11039882f8c..15db48f4f37 100644
--- a/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
+++ b/tests/integration/test_keeper_snapshots/configs/enable_keeper.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -11,6 +11,11 @@
             <operation_timeout_ms>5000</operation_timeout_ms>
             <session_timeout_ms>10000</session_timeout_ms>
             <raft_logs_level>trace</raft_logs_level>
+
+            <!-- For instant start in single node configuration -->
+            <heart_beat_interval_ms>0</heart_beat_interval_ms>
+            <election_timeout_lower_bound_ms>0</election_timeout_lower_bound_ms>
+            <election_timeout_upper_bound_ms>0</election_timeout_upper_bound_ms>
         </coordination_settings>
 
         <raft_configuration>
@@ -21,4 +26,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
index 6826d762652..759d3e7415b 100644
--- a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper1.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -39,4 +39,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
index 7f9bdde59da..d4b2296d54d 100644
--- a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper2.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>2</server_id>
@@ -39,4 +39,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
index 32e2743e7b8..37fa4e8b3b7 100644
--- a/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
+++ b/tests/integration/test_keeper_snapshots_multinode/configs/enable_keeper3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>3</server_id>
@@ -39,4 +39,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_start/__init__.py b/tests/integration/test_keeper_three_nodes_start/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_start/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..bc62d817074
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper1.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>non_existing_node</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..a6c476fb449
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_start/configs/enable_keeper2.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>non_existing_node</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_start/test.py b/tests/integration/test_keeper_three_nodes_start/test.py
new file mode 100644
index 00000000000..7828f21d0d7
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_start/test.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from multiprocessing.dummy import Pool
+from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
+from kazoo.client import KazooClient, KazooState
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml'], stay_alive=True)
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def test_smoke():
+    try:
+        cluster.start()
+
+        node1_zk = get_fake_zk("node1")
+        node1_zk.create("/test_alive", b"aaaa")
+
+    finally:
+        cluster.shutdown()
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/__init__.py b/tests/integration/test_keeper_three_nodes_two_alive/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_two_alive/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..510424715c4
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper1.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..264601d8c98
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper2.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml
new file mode 100644
index 00000000000..7f9775939bb
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/enable_keeper3.xml
@@ -0,0 +1,32 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>3</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+            </server>
+            <server>
+                <id>3</id>
+                <hostname>node3</hostname>
+                <port>44444</port>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/configs/keeper_conf.xml b/tests/integration/test_keeper_three_nodes_two_alive/configs/keeper_conf.xml
new file mode 100644
index 00000000000..384e984f210
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_two_alive/configs/keeper_conf.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+        <node index="2">
+            <host>node2</host>
+            <port>9181</port>
+        </node>
+        <node index="3">
+            <host>node3</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_keeper_three_nodes_two_alive/test.py b/tests/integration/test_keeper_three_nodes_two_alive/test.py
new file mode 100644
index 00000000000..eb63d28b3e2
--- /dev/null
+++ b/tests/integration/test_keeper_three_nodes_two_alive/test.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from multiprocessing.dummy import Pool
+from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
+from kazoo.client import KazooClient, KazooState
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/keeper_conf.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/keeper_conf.xml'], stay_alive=True)
+node3 = cluster.add_instance('node3', main_configs=['configs/enable_keeper3.xml', 'configs/keeper_conf.xml'], stay_alive=True)
+
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def start(node):
+       node.start_clickhouse()
+
+
+def test_start_offline(started_cluster):
+    p = Pool(3)
+    try:
+        node1_zk = get_fake_zk("node1")
+        node1_zk.create("/test_alive", b"aaaa")
+
+        node1.stop_clickhouse()
+        node2.stop_clickhouse()
+        node3.stop_clickhouse()
+
+        time.sleep(3)
+        p.map(start, [node2, node3])
+
+        assert node2.contains_in_log("Cannot connect to ZooKeeper (or Keeper) before internal Keeper start")
+        assert node3.contains_in_log("Cannot connect to ZooKeeper (or Keeper) before internal Keeper start")
+
+        node2_zk = get_fake_zk("node2")
+        node2_zk.create("/test_dead", b"data")
+    finally:
+        p.map(start, [node1, node2, node3])
+
+
+def test_start_non_existing(started_cluster):
+    p = Pool(3)
+    try:
+        node1.stop_clickhouse()
+        node2.stop_clickhouse()
+        node3.stop_clickhouse()
+
+        node1.replace_in_config('/etc/clickhouse-server/config.d/enable_keeper1.xml', 'node3', 'non_existing_node')
+        node2.replace_in_config('/etc/clickhouse-server/config.d/enable_keeper2.xml', 'node3', 'non_existing_node')
+
+        time.sleep(3)
+        p.map(start, [node2, node1])
+
+        assert node1.contains_in_log("Cannot connect to ZooKeeper (or Keeper) before internal Keeper start")
+        assert node2.contains_in_log("Cannot connect to ZooKeeper (or Keeper) before internal Keeper start")
+
+        node2_zk = get_fake_zk("node2")
+        node2_zk.create("/test_non_exising", b"data")
+    finally:
+        node1.replace_in_config('/etc/clickhouse-server/config.d/enable_keeper1.xml', 'non_existing_node', 'node3')
+        node2.replace_in_config('/etc/clickhouse-server/config.d/enable_keeper2.xml', 'non_existing_node', 'node3')
+        p.map(start, [node1, node2, node3])
+
+def test_restart_third_node(started_cluster):
+    node1_zk = get_fake_zk("node1")
+    node1_zk.create("/test_restart", b"aaaa")
+
+    node3.restart_clickhouse()
+
+    assert node3.contains_in_log("Connected to ZooKeeper (or Keeper) before internal Keeper start")
diff --git a/tests/integration/test_keeper_two_nodes_cluster/__init__.py b/tests/integration/test_keeper_two_nodes_cluster/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_keeper_two_nodes_cluster/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml
new file mode 100644
index 00000000000..70626b33130
--- /dev/null
+++ b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper1.xml
@@ -0,0 +1,33 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>1</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml
new file mode 100644
index 00000000000..96068de33a9
--- /dev/null
+++ b/tests/integration/test_keeper_two_nodes_cluster/configs/enable_keeper2.xml
@@ -0,0 +1,33 @@
+<clickhouse>
+    <keeper_server>
+        <tcp_port>9181</tcp_port>
+        <server_id>2</server_id>
+        <log_storage_path>/var/lib/clickhouse/coordination/log</log_storage_path>
+        <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
+
+        <coordination_settings>
+            <operation_timeout_ms>5000</operation_timeout_ms>
+            <session_timeout_ms>10000</session_timeout_ms>
+            <snapshot_distance>75</snapshot_distance>
+            <raft_logs_level>trace</raft_logs_level>
+        </coordination_settings>
+
+        <raft_configuration>
+            <server>
+                <id>1</id>
+                <hostname>node1</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <priority>3</priority>
+            </server>
+            <server>
+                <id>2</id>
+                <hostname>node2</hostname>
+                <port>44444</port>
+                <can_become_leader>true</can_become_leader>
+                <start_as_follower>true</start_as_follower>
+                <priority>2</priority>
+            </server>
+        </raft_configuration>
+    </keeper_server>
+</clickhouse>
diff --git a/tests/integration/test_keeper_two_nodes_cluster/configs/use_keeper.xml b/tests/integration/test_keeper_two_nodes_cluster/configs/use_keeper.xml
new file mode 100644
index 00000000000..0ec8771fbc1
--- /dev/null
+++ b/tests/integration/test_keeper_two_nodes_cluster/configs/use_keeper.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>node1</host>
+            <port>9181</port>
+        </node>
+        <node index="2">
+            <host>node2</host>
+            <port>9181</port>
+        </node>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_keeper_two_nodes_cluster/test.py b/tests/integration/test_keeper_two_nodes_cluster/test.py
new file mode 100644
index 00000000000..e6e3eb37af2
--- /dev/null
+++ b/tests/integration/test_keeper_two_nodes_cluster/test.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+import random
+import string
+import os
+import time
+from multiprocessing.dummy import Pool
+from helpers.network import PartitionManager
+from helpers.test_tools import assert_eq_with_retry
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', main_configs=['configs/enable_keeper1.xml', 'configs/use_keeper.xml'], stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/enable_keeper2.xml', 'configs/use_keeper.xml'], stay_alive=True)
+
+from kazoo.client import KazooClient, KazooState
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def smaller_exception(ex):
+    return '\n'.join(str(ex).split('\n')[0:2])
+
+def wait_node(node):
+    for _ in range(100):
+        zk = None
+        try:
+            node.query("SELECT * FROM system.zookeeper WHERE path = '/'")
+            zk = get_fake_zk(node.name, timeout=30.0)
+            zk.create("/test", sequence=True)
+            print("node", node.name, "ready")
+            break
+        except Exception as ex:
+            time.sleep(0.2)
+            print("Waiting until", node.name, "will be ready, exception", ex)
+        finally:
+            if zk:
+                zk.stop()
+                zk.close()
+    else:
+        raise Exception("Can't wait node", node.name, "to become ready")
+
+def wait_nodes():
+    for node in [node1, node2]:
+        wait_node(node)
+
+
+def get_fake_zk(nodename, timeout=30.0):
+    _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip(nodename) + ":9181", timeout=timeout)
+    _fake_zk_instance.start()
+    return _fake_zk_instance
+
+def test_read_write_two_nodes(started_cluster):
+    try:
+        wait_nodes()
+        node1_zk = get_fake_zk("node1")
+        node2_zk = get_fake_zk("node2")
+
+        node1_zk.create("/test_read_write_multinode_node1", b"somedata1")
+        node2_zk.create("/test_read_write_multinode_node2", b"somedata2")
+
+        # stale reads are allowed
+        while node1_zk.exists("/test_read_write_multinode_node2") is None:
+            time.sleep(0.1)
+
+        # stale reads are allowed
+        while node2_zk.exists("/test_read_write_multinode_node1") is None:
+            time.sleep(0.1)
+
+        assert node2_zk.get("/test_read_write_multinode_node1")[0] == b"somedata1"
+        assert node1_zk.get("/test_read_write_multinode_node1")[0] == b"somedata1"
+
+        assert node2_zk.get("/test_read_write_multinode_node2")[0] == b"somedata2"
+        assert node1_zk.get("/test_read_write_multinode_node2")[0] == b"somedata2"
+
+    finally:
+        try:
+            for zk_conn in [node1_zk, node2_zk, node3_zk]:
+                zk_conn.stop()
+                zk_conn.close()
+        except:
+            pass
+
+def test_read_write_two_nodes_with_blocade(started_cluster):
+    try:
+        wait_nodes()
+        node1_zk = get_fake_zk("node1", timeout=5.0)
+        node2_zk = get_fake_zk("node2", timeout=5.0)
+
+        print("Blocking nodes")
+        with PartitionManager() as pm:
+            pm.partition_instances(node2, node1)
+
+            # We will respond conection loss but process this query
+            # after blocade will be removed
+            with pytest.raises(Exception):
+                node1_zk.create("/test_read_write_blocked_node1", b"somedata1")
+
+            # This node is not leader and will not process anything
+            with pytest.raises(Exception):
+                node2_zk.create("/test_read_write_blocked_node2", b"somedata2")
+
+
+        print("Nodes unblocked")
+        for i in range(10):
+            try:
+                node1_zk = get_fake_zk("node1")
+                node2_zk = get_fake_zk("node2")
+                break
+            except:
+                time.sleep(0.5)
+
+
+        for i in range(100):
+            try:
+                node1_zk.create("/test_after_block1", b"somedata12")
+                break
+            except:
+                time.sleep(0.1)
+        else:
+            raise Exception("node1 cannot recover after blockade")
+
+        print("Node1 created it's value")
+
+        for i in range(100):
+            try:
+                node2_zk.create("/test_after_block2", b"somedata12")
+                break
+            except:
+                time.sleep(0.1)
+        else:
+            raise Exception("node2 cannot recover after blockade")
+
+        print("Node2 created it's value")
+
+        # stale reads are allowed
+        while node1_zk.exists("/test_after_block2") is None:
+            time.sleep(0.1)
+
+        # stale reads are allowed
+        while node2_zk.exists("/test_after_block1") is None:
+            time.sleep(0.1)
+
+        assert node1_zk.exists("/test_after_block1") is not None
+        assert node1_zk.exists("/test_after_block2") is not None
+        assert node2_zk.exists("/test_after_block1") is not None
+        assert node2_zk.exists("/test_after_block2") is not None
+
+    finally:
+        try:
+            for zk_conn in [node1_zk, node2_zk, node3_zk]:
+                zk_conn.stop()
+                zk_conn.close()
+        except:
+            pass
diff --git a/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml b/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
index ceaca04762e..612cb979bb7 100644
--- a/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
+++ b/tests/integration/test_keeper_zookeeper_converter/configs/keeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
@@ -6,8 +6,8 @@
         <snapshot_storage_path>/var/lib/clickhouse/coordination/snapshots</snapshot_storage_path>
 
         <coordination_settings>
-            <operation_timeout_ms>5000</operation_timeout_ms>
-            <session_timeout_ms>10000</session_timeout_ms>
+            <operation_timeout_ms>30000</operation_timeout_ms>
+            <session_timeout_ms>600000</session_timeout_ms>
             <raft_logs_level>trace</raft_logs_level>
             <snapshot_distance>75</snapshot_distance>
         </coordination_settings>
@@ -20,4 +20,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_zookeeper_converter/configs/logs_conf.xml b/tests/integration/test_keeper_zookeeper_converter/configs/logs_conf.xml
index 318a6bca95d..57719d453fc 100644
--- a/tests/integration/test_keeper_zookeeper_converter/configs/logs_conf.xml
+++ b/tests/integration/test_keeper_zookeeper_converter/configs/logs_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -9,4 +9,4 @@
         <stderr>/var/log/clickhouse-server/stderr.log</stderr>
         <stdout>/var/log/clickhouse-server/stdout.log</stdout>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_keeper_zookeeper_converter/test.py b/tests/integration/test_keeper_zookeeper_converter/test.py
index eac2b4c45c5..6829b4a9000 100644
--- a/tests/integration/test_keeper_zookeeper_converter/test.py
+++ b/tests/integration/test_keeper_zookeeper_converter/test.py
@@ -60,12 +60,12 @@ def started_cluster():
     finally:
         cluster.shutdown()
 
-def get_fake_zk(timeout=30.0):
+def get_fake_zk(timeout=60.0):
     _fake_zk_instance = KazooClient(hosts=cluster.get_instance_ip('node') + ":9181", timeout=timeout)
     _fake_zk_instance.start()
     return _fake_zk_instance
 
-def get_genuine_zk(timeout=30.0):
+def get_genuine_zk(timeout=60.0):
     _genuine_zk_instance = KazooClient(hosts=cluster.get_instance_ip('node') + ":2181", timeout=timeout)
     _genuine_zk_instance.start()
     return _genuine_zk_instance
diff --git a/tests/integration/test_library_bridge/configs/config.d/config.xml b/tests/integration/test_library_bridge/configs/config.d/config.xml
index 7811c1e26b7..a3dfa820411 100644
--- a/tests/integration/test_library_bridge/configs/config.d/config.xml
+++ b/tests/integration/test_library_bridge/configs/config.d/config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionaries_lib_path>/etc/clickhouse-server/config.d/dictionaries_lib</dictionaries_lib_path>
     <logger>
         <level>trace</level>
@@ -13,4 +13,4 @@
         <library_bridge_errlog>/var/log/clickhouse-server/clickhouse-library-bridge.err.log</library_bridge_errlog>
         <library_bridge_level>trace</library_bridge_level>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
index 9be21aea1e3..df0fe2ddf05 100644
--- a/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
+++ b/tests/integration/test_library_bridge/configs/dictionaries/dict1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <dictionary>
         <name>dict1</name>
         <source>
@@ -83,4 +83,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_library_bridge/test.py b/tests/integration/test_library_bridge/test.py
index 607afb6db5f..12a967ebaa4 100644
--- a/tests/integration/test_library_bridge/test.py
+++ b/tests/integration/test_library_bridge/test.py
@@ -44,6 +44,11 @@ def ch_cluster():
                 '/usr/bin/g++ -shared -o /etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so -fPIC /etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.cpp'],
                 user='root')
 
+        instance.exec_in_container(
+                ['bash', '-c',
+                '/usr/bin/g++ -shared -o /dict_lib_copy.so -fPIC /etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.cpp'], user='root')
+        instance.exec_in_container(['bash', '-c', 'ln -s /dict_lib_copy.so /etc/clickhouse-server/config.d/dictionaries_lib/dict_lib_symlink.so'])
+
         yield cluster
 
     finally:
@@ -59,6 +64,7 @@ def test_load_all(ch_cluster):
     if instance.is_built_with_memory_sanitizer():
         pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
 
+    instance.query('DROP DICTIONARY IF EXISTS lib_dict')
     instance.query('''
         CREATE DICTIONARY lib_dict (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
         PRIMARY KEY key
@@ -100,6 +106,7 @@ def test_load_ids(ch_cluster):
     if instance.is_built_with_memory_sanitizer():
         pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
 
+    instance.query('DROP DICTIONARY IF EXISTS lib_dict_c')
     instance.query('''
         CREATE DICTIONARY lib_dict_c (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
         PRIMARY KEY key SOURCE(library(PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib.so'))
@@ -127,6 +134,7 @@ def test_load_keys(ch_cluster):
     if instance.is_built_with_memory_sanitizer():
         pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
 
+    instance.query('DROP DICTIONARY IF EXISTS lib_dict_ckc')
     instance.query('''
         CREATE DICTIONARY lib_dict_ckc (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
         PRIMARY KEY key
@@ -147,6 +155,7 @@ def test_load_all_many_rows(ch_cluster):
         pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
 
     num_rows = [1000, 10000, 100000, 1000000]
+    instance.query('DROP DICTIONARY IF EXISTS lib_dict')
     for num in num_rows:
         instance.query('''
             CREATE DICTIONARY lib_dict (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
@@ -263,6 +272,43 @@ def test_bridge_dies_with_parent(ch_cluster):
     assert clickhouse_pid is None
     assert bridge_pid is None
     instance.start_clickhouse(20)
+    instance.query('DROP DICTIONARY lib_dict_c')
+
+
+def test_path_validation(ch_cluster):
+    if instance.is_built_with_memory_sanitizer():
+        pytest.skip("Memory Sanitizer cannot work with third-party shared libraries")
+
+    instance.query('DROP DICTIONARY IF EXISTS lib_dict_c')
+    instance.query('''
+        CREATE DICTIONARY lib_dict_c (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key SOURCE(library(PATH '/etc/clickhouse-server/config.d/dictionaries_lib/dict_lib_symlink.so'))
+        LAYOUT(CACHE(
+        SIZE_IN_CELLS 10000000
+        BLOCK_SIZE 4096
+        FILE_SIZE 16777216
+        READ_BUFFER_SIZE 1048576
+        MAX_STORED_KEYS 1048576))
+        LIFETIME(2) ;
+    ''')
+
+    result = instance.query('''select dictGet(lib_dict_c, 'value1', toUInt64(1));''')
+    assert(result.strip() == '101')
+
+    instance.query('DROP DICTIONARY IF EXISTS lib_dict_c')
+    instance.query('''
+        CREATE DICTIONARY lib_dict_c (key UInt64, value1 UInt64, value2 UInt64, value3 UInt64)
+        PRIMARY KEY key SOURCE(library(PATH '/etc/clickhouse-server/config.d/dictionaries_lib/../../../../dict_lib_copy.so'))
+        LAYOUT(CACHE(
+        SIZE_IN_CELLS 10000000
+        BLOCK_SIZE 4096
+        FILE_SIZE 16777216
+        READ_BUFFER_SIZE 1048576
+        MAX_STORED_KEYS 1048576))
+        LIFETIME(2) ;
+    ''')
+    result = instance.query_and_get_error('''select dictGet(lib_dict_c, 'value1', toUInt64(1));''')
+    assert('DB::Exception: File path /etc/clickhouse-server/config.d/dictionaries_lib/../../../../dict_lib_copy.so is not inside /etc/clickhouse-server/config.d/dictionaries_lib' in result)
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml b/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
index b5e6bb80891..96301816401 100644
--- a/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
+++ b/tests/integration/test_limited_replicated_fetches/configs/custom_settings.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <background_fetches_pool_size>3</background_fetches_pool_size>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_log_family_hdfs/configs/storage_conf.xml b/tests/integration/test_log_family_hdfs/configs/storage_conf.xml
index 15ff3891474..ffa5d516ae0 100644
--- a/tests/integration/test_log_family_hdfs/configs/storage_conf.xml
+++ b/tests/integration/test_log_family_hdfs/configs/storage_conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <hdfs>
@@ -8,4 +8,4 @@
             </hdfs>
         </disks>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_log_family_hdfs/test.py b/tests/integration/test_log_family_hdfs/test.py
index a38b067358e..7bb9cdfeaf5 100644
--- a/tests/integration/test_log_family_hdfs/test.py
+++ b/tests/integration/test_log_family_hdfs/test.py
@@ -31,10 +31,20 @@ def assert_objects_count(started_cluster, objects_count, path='data/'):
     hdfs_objects = fs.listdir('/clickhouse')
     assert objects_count == len(hdfs_objects)
 
-
+# TinyLog: files: id.bin, sizes.json
+# INSERT overwrites 1 file (`sizes.json`) and appends 1 file (`id.bin`), so
+# files_overhead=1, files_overhead_per_insert=1
+#
+# Log: files: id.bin, __marks.mrk, sizes.json
+# INSERT overwrites 1 file (`sizes.json`), and appends 2 files (`id.bin`, `__marks.mrk`), so
+# files_overhead=1, files_overhead_per_insert=2
+#
+# StripeLog: files: data.bin, index.mrk, sizes.json
+# INSERT overwrites 1 file (`sizes.json`), and appends 2 files (`index.mrk`, `data.bin`), so
+# files_overhead=1, files_overhead_per_insert=2
 @pytest.mark.parametrize(
     "log_engine,files_overhead,files_overhead_per_insert",
-    [("TinyLog", 1, 1), ("Log", 2, 1), ("StripeLog", 1, 2)])
+    [("TinyLog", 1, 1), ("Log", 1, 2), ("StripeLog", 1, 2)])
 def test_log_family_hdfs(started_cluster, log_engine, files_overhead, files_overhead_per_insert):
     node = started_cluster.instances["node"]
 
diff --git a/tests/integration/test_log_family_s3/configs/config.xml b/tests/integration/test_log_family_s3/configs/config.xml
index 5b9b5b5843a..ca4bdf15b43 100644
--- a/tests/integration/test_log_family_s3/configs/config.xml
+++ b/tests/integration/test_log_family_s3/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -25,4 +25,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_log_family_s3/configs/minio.xml b/tests/integration/test_log_family_s3/configs/minio.xml
index 7337be1ad94..8a3222c37a3 100644
--- a/tests/integration/test_log_family_s3/configs/minio.xml
+++ b/tests/integration/test_log_family_s3/configs/minio.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -11,4 +11,4 @@
             </s3>
         </disks>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_log_family_s3/configs/ssl.xml b/tests/integration/test_log_family_s3/configs/ssl.xml
index 95cdc918bd0..1200dc8c94b 100644
--- a/tests/integration/test_log_family_s3/configs/ssl.xml
+++ b/tests/integration/test_log_family_s3/configs/ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_log_family_s3/configs/users.xml b/tests/integration/test_log_family_s3/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_log_family_s3/configs/users.xml
+++ b/tests/integration/test_log_family_s3/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_log_family_s3/test.py b/tests/integration/test_log_family_s3/test.py
index 71d47a8a2e8..8531edd635f 100644
--- a/tests/integration/test_log_family_s3/test.py
+++ b/tests/integration/test_log_family_s3/test.py
@@ -30,10 +30,20 @@ def assert_objects_count(cluster, objects_count, path='data/'):
             logging.info("Existing S3 object: %s", str(object_meta))
         assert objects_count == len(s3_objects)
 
-
+# TinyLog: files: id.bin, sizes.json
+# INSERT overwrites 1 file (`sizes.json`) and appends 1 file (`id.bin`), so
+# files_overhead=1, files_overhead_per_insert=1
+#
+# Log: files: id.bin, __marks.mrk, sizes.json
+# INSERT overwrites 1 file (`sizes.json`), and appends 2 files (`id.bin`, `__marks.mrk`), so
+# files_overhead=1, files_overhead_per_insert=2
+#
+# StripeLog: files: data.bin, index.mrk, sizes.json
+# INSERT overwrites 1 file (`sizes.json`), and appends 2 files (`index.mrk`, `data.bin`), so
+# files_overhead=1, files_overhead_per_insert=2
 @pytest.mark.parametrize(
     "log_engine,files_overhead,files_overhead_per_insert",
-    [("TinyLog", 1, 1), ("Log", 2, 1), ("StripeLog", 1, 2)])
+    [("TinyLog", 1, 1), ("Log", 1, 2), ("StripeLog", 1, 2)])
 def test_log_family_s3(cluster, log_engine, files_overhead, files_overhead_per_insert):
     node = cluster.instances["node"]
 
diff --git a/tests/integration/test_log_levels_update/__init__.py b/tests/integration/test_log_levels_update/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_log_levels_update/configs/log.xml b/tests/integration/test_log_levels_update/configs/log.xml
new file mode 100644
index 00000000000..668a15f6afd
--- /dev/null
+++ b/tests/integration/test_log_levels_update/configs/log.xml
@@ -0,0 +1,6 @@
+<yandex>
+    <logger>
+        <level>trace</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+    </logger>
+</yandex>
\ No newline at end of file
diff --git a/tests/integration/test_log_levels_update/test.py b/tests/integration/test_log_levels_update/test.py
new file mode 100644
index 00000000000..dca660a2982
--- /dev/null
+++ b/tests/integration/test_log_levels_update/test.py
@@ -0,0 +1,50 @@
+import pytest
+import re
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__, name="log_quries_probability")
+node = cluster.add_instance('node', with_zookeeper=False)
+
+config = '''<yandex>
+    <logger>
+        <level>information</level>
+        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
+    </logger>
+</yandex>'''
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_log(node):
+    return node.exec_in_container(["bash", "-c", "cat /var/log/clickhouse-server/clickhouse-server.log"])
+
+def test_log_levels_update(start_cluster):
+    # Make sure that there are enough log messages for the test
+    for i in range(5):
+        node.query("SELECT 1")
+
+    log = get_log(node)
+    assert re.search("(<Trace>|<Debug>)", log)
+
+    node.replace_config("/etc/clickhouse-server/config.d/log.xml", config)
+    node.query("SYSTEM RELOAD CONFIG;")
+    node.exec_in_container(["bash", "-c", "> /var/log/clickhouse-server/clickhouse-server.log"])
+    
+    for i in range(5):
+        node.query("SELECT 1")
+
+    log = get_log(node)
+    assert len(log) > 0
+    assert not re.search("(<Trace>|<Debug>)", log)
+    
+
+
diff --git a/tests/integration/test_log_query_probability/__init__.py b/tests/integration/test_log_query_probability/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_log_query_probability/test.py b/tests/integration/test_log_query_probability/test.py
new file mode 100644
index 00000000000..d1e19974e75
--- /dev/null
+++ b/tests/integration/test_log_query_probability/test.py
@@ -0,0 +1,46 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__, name="log_quries_probability")
+node1 = cluster.add_instance('node1', with_zookeeper=False)
+node2 = cluster.add_instance('node2', with_zookeeper=False)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_log_quries_probability_one(start_cluster):
+    for i in range(100):
+        node1.query("SELECT 12345", settings={"log_queries_probability":0.5})
+
+    node1.query("SYSTEM FLUSH LOGS")
+
+    assert node1.query("SELECT count() < (2 * 100) FROM system.query_log WHERE query LIKE '%12345%' AND query NOT LIKE '%system.query_log%'") == "1\n"
+    assert node1.query("SELECT count() > 0         FROM system.query_log WHERE query LIKE '%12345%' AND query NOT LIKE '%system.query_log%'") == "1\n"
+    assert node1.query("SELECT count() % 2         FROM system.query_log WHERE query LIKE '%12345%' AND query NOT LIKE '%system.query_log%'") == "0\n"
+
+    node1.query("TRUNCATE TABLE system.query_log")
+
+
+def test_log_quries_probability_two(start_cluster):
+    for i in range(100):
+        node1.query("SELECT 12345 FROM remote('node2', system, one)", settings={"log_queries_probability":0.5})
+
+        node1.query("SYSTEM FLUSH LOGS")
+        node2.query("SYSTEM FLUSH LOGS")
+
+        ans1 = node1.query("SELECT count() FROM system.query_log WHERE query LIKE '%12345%' AND query NOT LIKE '%system.query_log%'")
+        ans2 = node2.query("SELECT count() FROM system.query_log WHERE query LIKE '%12345%' AND query NOT LIKE '%system.query_log%'")
+
+        assert ans1 == ans2
+
+        node1.query("TRUNCATE TABLE system.query_log")
+        node2.query("TRUNCATE TABLE system.query_log")
diff --git a/tests/integration/test_logs_level/configs/config_information.xml b/tests/integration/test_logs_level/configs/config_information.xml
index b99f57402fd..9275a468990 100644
--- a/tests/integration/test_logs_level/configs/config_information.xml
+++ b/tests/integration/test_logs_level/configs/config_information.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
 	<logger>
 		<level>information</level>
 		<log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -23,4 +23,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_lost_part_during_startup/__init__.py b/tests/integration/test_lost_part_during_startup/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_lost_part_during_startup/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_lost_part_during_startup/test.py b/tests/integration/test_lost_part_during_startup/test.py
new file mode 100644
index 00000000000..f9d24682354
--- /dev/null
+++ b/tests/integration/test_lost_part_during_startup/test.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+import time
+
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True, stay_alive=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True, stay_alive=True)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+def remove_part_from_disk(node, table, part_name):
+    part_path = node.query(
+        "SELECT path FROM system.parts WHERE table = '{}' and name = '{}'".format(table, part_name)).strip()
+    if not part_path:
+        raise Exception("Part " + part_name + "doesn't exist")
+    node.exec_in_container(['bash', '-c', 'rm -r {p}/*'.format(p=part_path)], privileged=True)
+
+
+def test_lost_part_during_startup(start_cluster):
+    for i, node in enumerate([node1, node2]):
+        node.query(f"CREATE TABLE test_lost (value UInt64) Engine = ReplicatedMergeTree('/clickhouse/test_lost', '{i + 1}') ORDER BY tuple()")
+
+    for i in range(4):
+        node2.query(f"INSERT INTO test_lost VALUES({i})")
+
+    node2.query("OPTIMIZE TABLE test_lost FINAL")
+    node1.query("SYSTEM SYNC REPLICA test_lost")
+
+    assert node2.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4))) + '\n'
+    assert node1.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4))) + '\n'
+
+
+    remove_part_from_disk(node2, "test_lost", "all_0_3_1")
+    remove_part_from_disk(node2, "test_lost", "all_1_1_0")
+    remove_part_from_disk(node2, "test_lost", "all_2_2_0")
+
+    node2.stop_clickhouse()
+    node1.stop_clickhouse()
+    node2.start_clickhouse()
+
+    for i in range(10):
+        try:
+            node2.query("INSERT INTO test_lost VALUES(7)")
+            node2.query("INSERT INTO test_lost VALUES(8)")
+            node2.query("INSERT INTO test_lost VALUES(9)")
+            node2.query("INSERT INTO test_lost VALUES(10)")
+            node2.query("INSERT INTO test_lost VALUES(11)")
+            node2.query("INSERT INTO test_lost VALUES(12)")
+
+            node2.query("OPTIMIZE TABLE test_lost FINAL")
+            break
+        except Exception as ex:
+            print("Exception", ex)
+            time.sleep(0.5)
+
+    node1.start_clickhouse()
+    node2.query("SYSTEM SYNC REPLICA test_lost")
+    node1.query("SYSTEM SYNC REPLICA test_lost")
+
+    assert node2.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4)) + sum(i for i in range(7, 13))) + '\n'
+    assert node1.query("SELECT sum(value) FROM test_lost") == str(sum(i for i in range(4)) + sum(i for i in range(7, 13))) + '\n'
diff --git a/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml b/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml
index 1bd6dc45549..72801915721 100644
--- a/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml
+++ b/tests/integration/test_match_process_uid_against_data_owner/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <log>/var/log/clickhouse-server/log.log</log>
         <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
@@ -14,4 +14,4 @@
 
     <mark_cache_size>5368709120</mark_cache_size>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml b/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml
index 2a54396feca..3547177eb80 100644
--- a/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml
+++ b/tests/integration/test_match_process_uid_against_data_owner/configs/users.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_materialized_mysql_database/configs/users.xml b/tests/integration/test_materialized_mysql_database/configs/users.xml
index 19236f6081b..b5de2b300d3 100644
--- a/tests/integration/test_materialized_mysql_database/configs/users.xml
+++ b/tests/integration/test_materialized_mysql_database/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_database_materialized_mysql>1</allow_experimental_database_materialized_mysql>
@@ -18,4 +18,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_materialized_mysql_database/configs/users_db_atomic.xml b/tests/integration/test_materialized_mysql_database/configs/users_db_atomic.xml
index e2981fd1eef..3cf7285de59 100644
--- a/tests/integration/test_materialized_mysql_database/configs/users_db_atomic.xml
+++ b/tests/integration/test_materialized_mysql_database/configs/users_db_atomic.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_database_materialized_mysql>1</allow_experimental_database_materialized_mysql>
@@ -16,4 +16,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml b/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml
index 0f656f0fbd7..f590ebff6b4 100644
--- a/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml
+++ b/tests/integration/test_materialized_mysql_database/configs/users_disable_bytes_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_database_materialized_mysql>1</allow_experimental_database_materialized_mysql>
@@ -18,4 +18,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml b/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml
index d83ed9e9a58..e0fa0a9097b 100644
--- a/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml
+++ b/tests/integration/test_materialized_mysql_database/configs/users_disable_rows_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_database_materialized_mysql>1</allow_experimental_database_materialized_mysql>
@@ -18,4 +18,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
index 23fa9894a84..5f6daea24ac 100644
--- a/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
+++ b/tests/integration/test_materialized_mysql_database/materialize_with_ddl.py
@@ -980,3 +980,33 @@ def mysql_settings_test(clickhouse_node, mysql_node, service_name):
     clickhouse_node.query("DROP DATABASE test_database")
     mysql_node.query("DROP DATABASE test_database")
 
+def materialized_mysql_large_transaction(clickhouse_node, mysql_node, service_name):
+    mysql_node.query("DROP DATABASE IF EXISTS largetransaction")
+    clickhouse_node.query("DROP DATABASE IF EXISTS largetransaction")
+    mysql_node.query("CREATE DATABASE largetransaction")
+
+    mysql_node.query("CREATE TABLE largetransaction.test_table ("
+                     "`key` INT NOT NULL PRIMARY KEY AUTO_INCREMENT, "
+                     "`value` INT NOT NULL) ENGINE = InnoDB;")
+    num_rows = 200000
+    rows_per_insert = 5000
+    values = ",".join(["(1)" for _ in range(rows_per_insert)])
+    for i in range(num_rows//rows_per_insert):
+        mysql_node.query(f"INSERT INTO largetransaction.test_table (`value`) VALUES {values};")
+
+
+    clickhouse_node.query("CREATE DATABASE largetransaction ENGINE = MaterializedMySQL('{}:3306', 'largetransaction', 'root', 'clickhouse')".format(service_name))
+    check_query(clickhouse_node, "SELECT COUNT() FROM largetransaction.test_table", f"{num_rows}\n")
+
+    mysql_node.query("UPDATE largetransaction.test_table SET value = 2;")
+
+    # Attempt to restart clickhouse after it has started processing
+    # the transaction, but before it has completed it.
+    while int(clickhouse_node.query("SELECT COUNT() FROM largetransaction.test_table WHERE value = 2")) == 0:
+        time.sleep(0.2)
+    clickhouse_node.restart_clickhouse()
+
+    check_query(clickhouse_node, "SELECT COUNT() FROM largetransaction.test_table WHERE value = 2", f"{num_rows}\n")
+
+    clickhouse_node.query("DROP DATABASE largetransaction")
+    mysql_node.query("DROP DATABASE largetransaction")
diff --git a/tests/integration/test_materialized_mysql_database/test.py b/tests/integration/test_materialized_mysql_database/test.py
index 18cb5b3b87c..feade1b60a0 100644
--- a/tests/integration/test_materialized_mysql_database/test.py
+++ b/tests/integration/test_materialized_mysql_database/test.py
@@ -237,3 +237,8 @@ def test_materialize_with_enum(started_cluster, started_mysql_8_0, started_mysql
 def test_mysql_settings(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
     materialize_with_ddl.mysql_settings_test(clickhouse_node, started_mysql_5_7, "mysql57")
     materialize_with_ddl.mysql_settings_test(clickhouse_node, started_mysql_8_0, "mysql80")
+
+@pytest.mark.parametrize(('clickhouse_node'), [pytest.param(node_db_ordinary, id="ordinary"), pytest.param(node_db_atomic, id="atomic")])
+def test_large_transaction(started_cluster, started_mysql_8_0, started_mysql_5_7, clickhouse_node):
+    materialize_with_ddl.materialized_mysql_large_transaction(clickhouse_node, started_mysql_8_0, "mysql80")
+    materialize_with_ddl.materialized_mysql_large_transaction(clickhouse_node, started_mysql_5_7, "mysql57")
diff --git a/tests/integration/test_max_http_connections_for_replication/configs/remote_servers.xml b/tests/integration/test_max_http_connections_for_replication/configs/remote_servers.xml
index e44d4eef3ca..e62425fe1bb 100644
--- a/tests/integration/test_max_http_connections_for_replication/configs/remote_servers.xml
+++ b/tests/integration/test_max_http_connections_for_replication/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -37,4 +37,4 @@
         </test_cluster>
 
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_max_suspicious_broken_parts/__init__.py b/tests/integration/test_max_suspicious_broken_parts/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_max_suspicious_broken_parts/test.py b/tests/integration/test_max_suspicious_broken_parts/test.py
new file mode 100644
index 00000000000..31f53fdbc3c
--- /dev/null
+++ b/tests/integration/test_max_suspicious_broken_parts/test.py
@@ -0,0 +1,121 @@
+# pylint: disable=unused-argument
+# pylint: disable=redefined-outer-name
+# pylint: disable=line-too-long
+
+import pytest
+
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True)
+
+@pytest.fixture(scope='module', autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+def break_part(table, part_name):
+    node.exec_in_container(['bash', '-c', f'rm /var/lib/clickhouse/data/default/{table}/{part_name}/columns.txt'])
+
+def remove_part(table, part_name):
+    node.exec_in_container(['bash', '-c', f'rm -r /var/lib/clickhouse/data/default/{table}/{part_name}'])
+
+def get_count(table):
+    return int(node.query(f'SELECT count() FROM {table}').strip())
+
+def detach_table(table):
+    node.query(f'DETACH TABLE {table}')
+def attach_table(table):
+    node.query(f'ATTACH TABLE {table}')
+
+def check_table(table):
+    rows = 900
+    per_part_rows = 90
+
+    node.query(f'INSERT INTO {table} SELECT * FROM numbers(900)')
+
+    assert get_count(table) == rows
+
+    # break one part, and check that clickhouse will be alive
+    break_part(table, '0_1_1_0')
+    rows -= per_part_rows
+    detach_table(table)
+    attach_table(table)
+    assert get_count(table) == rows
+
+    # break two parts, and check that clickhouse will not start
+    break_part(table, '1_2_2_0')
+    break_part(table, '2_3_3_0')
+    rows -= per_part_rows*2
+    detach_table(table)
+    with pytest.raises(QueryRuntimeException):
+        attach_table(table)
+
+    # now remove one part, and check
+    remove_part(table, '1_2_2_0')
+    attach_table(table)
+    assert get_count(table) == rows
+
+    node.query(f'DROP TABLE {table}')
+
+def test_max_suspicious_broken_parts():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        max_suspicious_broken_parts = 1;
+    """)
+    check_table('test_max_suspicious_broken_parts')
+
+def test_max_suspicious_broken_parts_bytes():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts_bytes (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        max_suspicious_broken_parts = 10,
+        /* one part takes ~751 byte, so we allow failure of one part with these limit */
+        max_suspicious_broken_parts_bytes = 1000;
+    """)
+    check_table('test_max_suspicious_broken_parts_bytes')
+
+def test_max_suspicious_broken_parts__wide():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts__wide (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        min_bytes_for_wide_part = 0,
+        max_suspicious_broken_parts = 1;
+    """)
+    check_table('test_max_suspicious_broken_parts__wide')
+
+def test_max_suspicious_broken_parts_bytes__wide():
+    node.query("""
+    CREATE TABLE test_max_suspicious_broken_parts_bytes__wide (
+        key Int
+    )
+    ENGINE=MergeTree
+    ORDER BY key
+    PARTITION BY key%10
+    SETTINGS
+        min_bytes_for_wide_part = 0,
+        max_suspicious_broken_parts = 10,
+        /* one part takes ~750 byte, so we allow failure of one part with these limit */
+        max_suspicious_broken_parts_bytes = 1000;
+    """)
+    check_table('test_max_suspicious_broken_parts_bytes__wide')
diff --git a/tests/integration/test_merge_table_over_distributed/configs/remote_servers.xml b/tests/integration/test_merge_table_over_distributed/configs/remote_servers.xml
index ebce4697529..68b420f36b4 100644
--- a/tests/integration/test_merge_table_over_distributed/configs/remote_servers.xml
+++ b/tests/integration/test_merge_table_over_distributed/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_empty_parts/configs/cleanup_thread.xml b/tests/integration/test_merge_tree_empty_parts/configs/cleanup_thread.xml
index 943662aad67..3866767f465 100644
--- a/tests/integration/test_merge_tree_empty_parts/configs/cleanup_thread.xml
+++ b/tests/integration/test_merge_tree_empty_parts/configs/cleanup_thread.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <cleanup_delay_period>0</cleanup_delay_period>
         <cleanup_delay_period_random_add>0</cleanup_delay_period_random_add>
     </merge_tree>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_merge_tree_empty_parts/configs/remote_servers.xml b/tests/integration/test_merge_tree_empty_parts/configs/remote_servers.xml
index e7369160a81..92efb18744d 100644
--- a/tests/integration/test_merge_tree_empty_parts/configs/remote_servers.xml
+++ b/tests/integration/test_merge_tree_empty_parts/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -10,4 +10,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_hdfs/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_hdfs/configs/config.d/storage_conf.xml
index d43e18fa99c..7f816724c43 100644
--- a/tests/integration/test_merge_tree_hdfs/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_hdfs/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <hdfs>
@@ -27,4 +27,4 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml b/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml
new file mode 100644
index 00000000000..4449d83779a
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3/configs/config.d/async_read.xml
@@ -0,0 +1,7 @@
+<yandex>
+    <profiles>
+        <default>
+            <remote_filesystem_read_method>read_threadpool</remote_filesystem_read_method>
+        </default>
+    </profiles>
+</yandex>
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/bg_processing_pool_conf.xml b/tests/integration/test_merge_tree_s3/configs/config.d/bg_processing_pool_conf.xml
index a756c4434ea..e45b647fd24 100644
--- a/tests/integration/test_merge_tree_s3/configs/config.d/bg_processing_pool_conf.xml
+++ b/tests/integration/test_merge_tree_s3/configs/config.d/bg_processing_pool_conf.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <background_processing_pool_thread_sleep_seconds>0.5</background_processing_pool_thread_sleep_seconds>
     <background_processing_pool_task_sleep_seconds_when_no_work_min>0.5</background_processing_pool_task_sleep_seconds_when_no_work_min>
     <background_processing_pool_task_sleep_seconds_when_no_work_max>0.5</background_processing_pool_task_sleep_seconds_when_no_work_max>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
index 2d9778af32a..a0fe0a6f609 100644
--- a/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -8,6 +8,13 @@
                 <secret_access_key>minio123</secret_access_key>
                 <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
             </s3>
+            <unstable_s3>
+                <type>s3</type>
+                <endpoint>http://resolver:8081/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <s3_max_single_read_retries>10</s3_max_single_read_retries>
+            </unstable_s3>
             <hdd>
                 <type>local</type>
                 <path>/</path>
@@ -24,10 +31,17 @@
                     </external>
                 </volumes>
             </s3>
+            <unstable_s3>
+                <volumes>
+                    <main>
+                        <disk>unstable_s3</disk>
+                    </main>
+                </volumes>
+            </unstable_s3>
         </policies>
     </storage_configuration>
 
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/configs/config.xml b/tests/integration/test_merge_tree_s3/configs/config.xml
index 24b7344df3a..59829ffdb56 100644
--- a/tests/integration/test_merge_tree_s3/configs/config.xml
+++ b/tests/integration/test_merge_tree_s3/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port>9000</tcp_port>
     <listen_host>127.0.0.1</listen_host>
 
@@ -17,4 +17,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3/s3_mocks/unstable_proxy.py b/tests/integration/test_merge_tree_s3/s3_mocks/unstable_proxy.py
new file mode 100644
index 00000000000..1f8fcc4bbfd
--- /dev/null
+++ b/tests/integration/test_merge_tree_s3/s3_mocks/unstable_proxy.py
@@ -0,0 +1,64 @@
+import http.client
+import http.server
+import random
+import socketserver
+import sys
+import urllib.parse
+
+
+UPSTREAM_HOST = "minio1:9001"
+random.seed("Unstable proxy/1.0")
+
+
+def request(command, url, headers={}, data=None):
+    """ Mini-requests. """
+    class Dummy:
+        pass
+
+    parts = urllib.parse.urlparse(url)
+    c = http.client.HTTPConnection(parts.hostname, parts.port)
+    c.request(command, urllib.parse.urlunparse(parts._replace(scheme='', netloc='')), headers=headers, body=data)
+    r = c.getresponse()
+    result = Dummy()
+    result.status_code = r.status
+    result.headers = r.headers
+    result.content = r.read()
+    return result
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_GET(self):
+        if self.path == "/":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+            self.wfile.write(b"OK")
+        else:
+            self.do_HEAD()
+
+    def do_PUT(self):
+        self.do_HEAD()
+
+    def do_POST(self):
+        self.do_HEAD()
+
+    def do_HEAD(self):
+        content_length = self.headers.get("Content-Length")
+        data = self.rfile.read(int(content_length)) if content_length else None
+        r = request(self.command, f"http://{UPSTREAM_HOST}{self.path}", headers=self.headers, data=data)
+        self.send_response(r.status_code)
+        for k, v in r.headers.items():
+            self.send_header(k, v)
+        self.end_headers()
+        if random.random() < 0.25 and len(r.content) > 1024*1024:
+            r.content = r.content[:len(r.content)//2]
+        self.wfile.write(r.content)
+        self.wfile.close()
+
+
+class ThreadedHTTPServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
+    """Handle requests in a separate thread."""
+
+
+httpd = ThreadedHTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd.serve_forever()
diff --git a/tests/integration/test_merge_tree_s3/test.py b/tests/integration/test_merge_tree_s3/test.py
index 41f59e0cbb4..e99adf01ec5 100644
--- a/tests/integration/test_merge_tree_s3/test.py
+++ b/tests/integration/test_merge_tree_s3/test.py
@@ -28,7 +28,6 @@ class SafeThread(threading.Thread):
         if self.exception:
             raise self.exception
 
-
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 CONFIG_PATH = os.path.join(SCRIPT_DIR, './{}/node/configs/config.d/storage_conf.xml'.format(get_instances_dir()))
 
@@ -51,9 +50,15 @@ def cluster():
                              main_configs=["configs/config.d/storage_conf.xml",
                                            "configs/config.d/bg_processing_pool_conf.xml"],
                              with_minio=True)
+        cluster.add_instance("node_async_read",
+                             main_configs=["configs/config.d/storage_conf.xml",
+                                           "configs/config.d/bg_processing_pool_conf.xml"],
+                             user_configs=["configs/config.d/async_read.xml"],
+                             with_minio=True)
         logging.info("Starting cluster...")
         cluster.start()
         logging.info("Cluster started")
+        run_s3_mocks(cluster)
 
         yield cluster
     finally:
@@ -77,11 +82,16 @@ def generate_values(date_str, count, sign=1):
     return ",".join(["('{}',{},'{}')".format(x, y, z) for x, y, z in data])
 
 
-def create_table(cluster, table_name, additional_settings=None):
-    node = cluster.instances["node"]
+def create_table(node, table_name, **additional_settings):
+    settings = {
+        "storage_policy": "s3",
+        "old_parts_lifetime": 0,
+        "index_granularity": 512
+    }
+    settings.update(additional_settings)
 
-    create_table_statement = """
-        CREATE TABLE {} (
+    create_table_statement = f"""
+        CREATE TABLE {table_name} (
             dt Date,
             id Int64,
             data String,
@@ -89,19 +99,41 @@ def create_table(cluster, table_name, additional_settings=None):
         ) ENGINE=MergeTree()
         PARTITION BY dt
         ORDER BY (dt, id)
-        SETTINGS
-            storage_policy='s3',
-            old_parts_lifetime=0,
-            index_granularity=512
-        """.format(table_name)
-
-    if additional_settings:
-        create_table_statement += ","
-        create_table_statement += additional_settings
+        SETTINGS {",".join((k+"="+repr(v) for k, v in settings.items()))}"""
 
+    node.query(f"DROP TABLE IF EXISTS {table_name}")
     node.query(create_table_statement)
 
 
+def run_s3_mocks(cluster):
+    logging.info("Starting s3 mocks")
+    mocks = (
+        ("unstable_proxy.py", "resolver", "8081"),
+    )
+    for mock_filename, container, port in mocks:
+        container_id = cluster.get_container_id(container)
+        current_dir = os.path.dirname(__file__)
+        cluster.copy_file_to_container(container_id, os.path.join(current_dir, "s3_mocks", mock_filename), mock_filename)
+        cluster.exec_in_container(container_id, ["python", mock_filename, port], detach=True)
+
+    # Wait for S3 mocks to start
+    for mock_filename, container, port in mocks:
+        num_attempts = 100
+        for attempt in range(num_attempts):
+            ping_response = cluster.exec_in_container(cluster.get_container_id(container),
+                                                              ["curl", "-s", f"http://localhost:{port}/"], nothrow=True)
+            if ping_response != "OK":
+                if attempt == num_attempts - 1:
+                    assert ping_response == "OK", f'Expected "OK", but got "{ping_response}"'
+                else:
+                    time.sleep(1)
+            else:
+                logging.debug(f"mock {mock_filename} ({port}) answered {ping_response} on attempt {attempt}")
+                break
+
+    logging.info("S3 mocks started")
+
+
 def wait_for_delete_s3_objects(cluster, expected, timeout=30):
     minio = cluster.minio_client
     while timeout > 0:
@@ -113,9 +145,10 @@ def wait_for_delete_s3_objects(cluster, expected, timeout=30):
 
 
 @pytest.fixture(autouse=True)
-def drop_table(cluster):
+@pytest.mark.parametrize("node_name", ["node", "node_async_read"])
+def drop_table(cluster, node_name):
     yield
-    node = cluster.instances["node"]
+    node = cluster.instances[node_name]
     minio = cluster.minio_client
 
     node.query("DROP TABLE IF EXISTS s3_test NO DELAY")
@@ -129,16 +162,17 @@ def drop_table(cluster):
 
 
 @pytest.mark.parametrize(
-    "min_rows_for_wide_part,files_per_part",
+    "min_rows_for_wide_part,files_per_part,node_name",
     [
-        (0, FILES_OVERHEAD_PER_PART_WIDE),
-        (8192, FILES_OVERHEAD_PER_PART_COMPACT)
+        (0, FILES_OVERHEAD_PER_PART_WIDE, "node"),
+        (8192, FILES_OVERHEAD_PER_PART_COMPACT, "node"),
+        (0, FILES_OVERHEAD_PER_PART_WIDE, "node_async_read"),
+        (8192, FILES_OVERHEAD_PER_PART_COMPACT, "node_async_read")
     ]
 )
-def test_simple_insert_select(cluster, min_rows_for_wide_part, files_per_part):
-    create_table(cluster, "s3_test", additional_settings="min_rows_for_wide_part={}".format(min_rows_for_wide_part))
-
-    node = cluster.instances["node"]
+def test_simple_insert_select(cluster, min_rows_for_wide_part, files_per_part, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test", min_rows_for_wide_part=min_rows_for_wide_part)
     minio = cluster.minio_client
 
     values1 = generate_values('2020-01-03', 4096)
@@ -155,18 +189,20 @@ def test_simple_insert_select(cluster, min_rows_for_wide_part, files_per_part):
 
 
 @pytest.mark.parametrize(
-    "merge_vertical", [False, True]
-)
-def test_insert_same_partition_and_merge(cluster, merge_vertical):
-    settings = None
+    "merge_vertical,node_name", [
+        (True, "node"),
+        (False, "node"),
+        (True, "node_async_read"),
+        (False, "node_async_read")
+])
+def test_insert_same_partition_and_merge(cluster, merge_vertical, node_name):
+    settings = {}
     if merge_vertical:
-        settings = """
-            vertical_merge_algorithm_min_rows_to_activate=0,
-            vertical_merge_algorithm_min_columns_to_activate=0
-        """
-    create_table(cluster, "s3_test", additional_settings=settings)
+        settings['vertical_merge_algorithm_min_rows_to_activate'] = 0
+        settings['vertical_merge_algorithm_min_columns_to_activate'] = 0
 
-    node = cluster.instances["node"]
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test", **settings)
     minio = cluster.minio_client
 
     node.query("SYSTEM STOP MERGES s3_test")
@@ -199,10 +235,10 @@ def test_insert_same_partition_and_merge(cluster, merge_vertical):
     wait_for_delete_s3_objects(cluster, FILES_OVERHEAD_PER_PART_WIDE + FILES_OVERHEAD)
 
 
-def test_alter_table_columns(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node", "node_async_read"])
+def test_alter_table_columns(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
     minio = cluster.minio_client
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
@@ -228,10 +264,10 @@ def test_alter_table_columns(cluster):
     wait_for_delete_s3_objects(cluster, FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE + 2)
 
 
-def test_attach_detach_partition(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node", "node_async_read"])
+def test_attach_detach_partition(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
     minio = cluster.minio_client
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
@@ -260,10 +296,10 @@ def test_attach_detach_partition(cluster):
     assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD
 
 
-def test_move_partition_to_another_disk(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node", "node_async_read"])
+def test_move_partition_to_another_disk(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
     minio = cluster.minio_client
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
@@ -282,10 +318,10 @@ def test_move_partition_to_another_disk(cluster):
         list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 2
 
 
-def test_table_manipulations(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node"])
+def test_table_manipulations(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
     minio = cluster.minio_client
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
@@ -310,10 +346,10 @@ def test_table_manipulations(cluster):
     assert len(list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD
 
 
-def test_move_replace_partition_to_another_table(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node", "node_async_read"])
+def test_move_replace_partition_to_another_table(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
     minio = cluster.minio_client
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
@@ -325,7 +361,7 @@ def test_move_replace_partition_to_another_table(cluster):
     assert len(
         list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD + FILES_OVERHEAD_PER_PART_WIDE * 4
 
-    create_table(cluster, "s3_clone")
+    create_table(node, "s3_clone")
 
     node.query("ALTER TABLE s3_test MOVE PARTITION '2020-01-03' TO TABLE s3_clone")
     node.query("ALTER TABLE s3_test MOVE PARTITION '2020-01-05' TO TABLE s3_clone")
@@ -376,10 +412,10 @@ def test_move_replace_partition_to_another_table(cluster):
         minio.remove_object(cluster.minio_bucket, obj.object_name)
 
 
-def test_freeze_unfreeze(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node"])
+def test_freeze_unfreeze(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
     minio = cluster.minio_client
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-03', 4096)))
@@ -401,9 +437,10 @@ def test_freeze_unfreeze(cluster):
         list(minio.list_objects(cluster.minio_bucket, 'data/'))) == FILES_OVERHEAD
 
 
-def test_s3_disk_apply_new_settings(cluster):
-    create_table(cluster, "s3_test")
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node"])
+def test_s3_disk_apply_new_settings(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
 
     def get_s3_requests():
         node.query("SYSTEM FLUSH LOGS")
@@ -426,10 +463,10 @@ def test_s3_disk_apply_new_settings(cluster):
     assert get_s3_requests() - s3_requests_before == s3_requests_to_write_partition * 3
 
 
-def test_s3_disk_restart_during_load(cluster):
-    create_table(cluster, "s3_test")
-
-    node = cluster.instances["node"]
+@pytest.mark.parametrize("node_name", ["node"])
+def test_s3_disk_restart_during_load(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test")
 
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-04', 1024 * 1024)))
     node.query("INSERT INTO s3_test VALUES {}".format(generate_values('2020-01-05', 1024 * 1024, -1)))
@@ -459,3 +496,13 @@ def test_s3_disk_restart_during_load(cluster):
 
     for thread in threads:
         thread.join()
+
+
+@pytest.mark.parametrize("node_name", ["node", "node_async_read"])
+def test_s3_disk_reads_on_unstable_connection(cluster, node_name):
+    node = cluster.instances[node_name]
+    create_table(node, "s3_test", storage_policy='unstable_s3')
+    node.query("INSERT INTO s3_test SELECT today(), *, toString(*) FROM system.numbers LIMIT 9000000")
+    for i in range(30):
+        print(f"Read sequence {i}")
+        assert node.query("SELECT sum(id) FROM s3_test").splitlines() == ["40499995500000"]
diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.d/instant_moves.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.d/instant_moves.xml
index 7b68c6946ca..8f63b72b2e8 100644
--- a/tests/integration/test_merge_tree_s3_failover/configs/config.d/instant_moves.xml
+++ b/tests/integration/test_merge_tree_s3_failover/configs/config.d/instant_moves.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <background_move_processing_pool_thread_sleep_seconds>0.5</background_move_processing_pool_thread_sleep_seconds>
     <background_move_processing_pool_task_sleep_seconds_when_no_work_max>0.5</background_move_processing_pool_task_sleep_seconds_when_no_work_max>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml
index fb449ee4ad5..7140b923e53 100644
--- a/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml
+++ b/tests/integration/test_merge_tree_s3_failover/configs/config.d/part_log.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml
index bcd5ef97a09..32d78468a71 100644
--- a/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3_failover/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -12,6 +12,15 @@
                 <!-- Avoid extra retries to speed up tests -->
                 <retry_attempts>0</retry_attempts>
             </s3>
+            <s3_retryable>
+                <type>s3</type>
+                <!-- Use custom S3 endpoint -->
+                <endpoint>http://resolver:8080/root/data/</endpoint>
+                <access_key_id>minio</access_key_id>
+                <secret_access_key>minio123</secret_access_key>
+                <!-- ClickHouse starts earlier than custom S3 endpoint. Skip access check to avoid fail on start-up -->
+                <skip_access_check>true</skip_access_check>
+            </s3_retryable>
             <default/>
         </disks>
         <policies>
@@ -32,6 +41,13 @@
                     </external>
                 </volumes>
             </s3_cold>
+            <s3_retryable>
+                <volumes>
+                    <main>
+                        <disk>s3_retryable</disk>
+                    </main>
+                </volumes>
+            </s3_retryable>
         </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.d/users.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.d/users.xml
index 797113053f4..0011583a68c 100644
--- a/tests/integration/test_merge_tree_s3_failover/configs/config.d/users.xml
+++ b/tests/integration/test_merge_tree_s3_failover/configs/config.d/users.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default/>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_failover/configs/config.xml b/tests/integration/test_merge_tree_s3_failover/configs/config.xml
index 24b7344df3a..59829ffdb56 100644
--- a/tests/integration/test_merge_tree_s3_failover/configs/config.xml
+++ b/tests/integration/test_merge_tree_s3_failover/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port>9000</tcp_port>
     <listen_host>127.0.0.1</listen_host>
 
@@ -17,4 +17,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py b/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py
index 1754b1f175c..3f219b6ba57 100644
--- a/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py
+++ b/tests/integration/test_merge_tree_s3_failover/s3_endpoint/endpoint.py
@@ -18,6 +18,16 @@ def fail_request(_request_number):
     return 'OK'
 
 
+@route('/throttle_request/<_request_number>')
+def fail_request(_request_number):
+    request_number = int(_request_number)
+    if request_number > 0:
+        cache['throttle_request_number'] = request_number
+    else:
+        cache.pop('throttle_request_number', None)
+    return 'OK'
+
+
 # Handle for MultipleObjectsDelete.
 @route('/<_bucket>', ['POST'])
 def delete(_bucket):
@@ -37,6 +47,15 @@ def server(_bucket, _path):
             response.content_type = 'text/xml'
             return '<?xml version="1.0" encoding="UTF-8"?><Error><Code>ExpectedError</Code><Message>Expected Error</Message><RequestId>txfbd566d03042474888193-00608d7537</RequestId></Error>'
 
+    if cache.get('throttle_request_number', None):
+        request_number = cache.pop('throttle_request_number') - 1
+        if request_number > 0:
+            cache['throttle_request_number'] = request_number
+        else:
+            response.status = 429
+            response.content_type = 'text/xml'
+            return '<?xml version="1.0" encoding="UTF-8"?><Error><Code>TooManyRequestsException</Code><Message>Please reduce your request rate.</Message><RequestId>txfbd566d03042474888193-00608d7538</RequestId></Error>'
+
     response.set_header("Location", "http://minio1:9001/" + _bucket + '/' + _path)
     response.status = 307
     return 'Redirected'
diff --git a/tests/integration/test_merge_tree_s3_failover/test.py b/tests/integration/test_merge_tree_s3_failover/test.py
index 4dec1bc713f..b6b47417523 100644
--- a/tests/integration/test_merge_tree_s3_failover/test.py
+++ b/tests/integration/test_merge_tree_s3_failover/test.py
@@ -38,6 +38,12 @@ def fail_request(cluster, request):
     assert response == 'OK', 'Expected "OK", but got "{}"'.format(response)
 
 
+def throttle_request(cluster, request):
+    response = cluster.exec_in_container(cluster.get_container_id('resolver'),
+                                         ["curl", "-s", "http://resolver:8080/throttle_request/{}".format(request)])
+    assert response == 'OK', 'Expected "OK", but got "{}"'.format(response)
+
+
 @pytest.fixture(scope="module")
 def cluster():
     try:
@@ -68,17 +74,22 @@ def drop_table(cluster):
 # S3 request will be failed for an appropriate part file write.
 FILES_PER_PART_BASE = 5  # partition.dat, default_compression_codec.txt, count.txt, columns.txt, checksums.txt
 FILES_PER_PART_WIDE = FILES_PER_PART_BASE + 1 + 1 + 3 * 2  # Primary index, MinMax, Mark and data file for column(s)
+
+# In debug build there are additional requests (from MergeTreeDataPartWriterWide.cpp:554 due to additional validation).
+FILES_PER_PART_WIDE_DEBUG = 2  # Additional requests to S3 in debug build
+
 FILES_PER_PART_COMPACT = FILES_PER_PART_BASE + 1 + 1 + 2
+FILES_PER_PART_COMPACT_DEBUG = 0
 
 
 @pytest.mark.parametrize(
-    "min_bytes_for_wide_part,request_count",
+    "min_bytes_for_wide_part,request_count,debug_request_count",
     [
-        (0, FILES_PER_PART_WIDE),
-        (1024 * 1024, FILES_PER_PART_COMPACT)
+        (0, FILES_PER_PART_WIDE, FILES_PER_PART_WIDE_DEBUG),
+        (1024 * 1024, FILES_PER_PART_COMPACT, FILES_PER_PART_COMPACT_DEBUG)
     ]
 )
-def test_write_failover(cluster, min_bytes_for_wide_part, request_count):
+def test_write_failover(cluster, min_bytes_for_wide_part, request_count, debug_request_count):
     node = cluster.instances["node"]
 
     node.query(
@@ -95,17 +106,24 @@ def test_write_failover(cluster, min_bytes_for_wide_part, request_count):
         .format(min_bytes_for_wide_part)
     )
 
-    for request in range(request_count + 1):
+    is_debug_mode = False
+    success_count = 0
+
+    for request in range(request_count + debug_request_count + 1):
         # Fail N-th request to S3.
         fail_request(cluster, request + 1)
 
         data = "('2020-03-01',0,'data'),('2020-03-01',1,'data')"
-        positive = request == request_count
+        positive = request >= (request_count + debug_request_count if is_debug_mode else request_count)
         try:
             node.query("INSERT INTO s3_failover_test VALUES {}".format(data))
-
             assert positive, "Insert query should be failed, request {}".format(request)
+            success_count += 1
         except QueryRuntimeException as e:
+            if not is_debug_mode and positive:
+                is_debug_mode = True
+                positive = False
+
             assert not positive, "Insert query shouldn't be failed, request {}".format(request)
             assert str(e).find("Expected Error") != -1, "Unexpected error {}".format(str(e))
 
@@ -114,7 +132,9 @@ def test_write_failover(cluster, min_bytes_for_wide_part, request_count):
             fail_request(cluster, 0)
 
             assert node.query("CHECK TABLE s3_failover_test") == '1\n'
-            assert node.query("SELECT * FROM s3_failover_test FORMAT Values") == data
+            assert success_count > 1 or node.query("SELECT * FROM s3_failover_test FORMAT Values") == data
+
+    assert success_count == (1 if is_debug_mode else debug_request_count + 1), "Insert query should be successful at least once"
 
 
 # Check that second data part move is ended successfully if first attempt was failed.
@@ -172,3 +192,27 @@ def test_move_failover(cluster):
     # Ensure data is not corrupted.
     assert node.query("CHECK TABLE s3_failover_test") == '1\n'
     assert node.query("SELECT id,data FROM s3_failover_test FORMAT Values") == "(0,'data'),(1,'data')"
+
+
+# Check that throttled request retries and does not cause an error on disk with default `retry_attempts` (>0)
+def test_throttle_retry(cluster):
+    node = cluster.instances["node"]
+
+    node.query(
+        """
+        CREATE TABLE s3_throttle_retry_test (
+            id Int64
+        ) ENGINE=MergeTree()
+        ORDER BY id
+        SETTINGS storage_policy='s3_retryable'
+        """
+    )
+
+    data = "(42)"
+    node.query("INSERT INTO s3_throttle_retry_test VALUES {}".format(data))
+
+    throttle_request(cluster, 1)
+
+    assert node.query("""
+        SELECT * FROM s3_throttle_retry_test
+        """) == '42\n'
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml
index a756c4434ea..e45b647fd24 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/bg_processing_pool_conf.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <background_processing_pool_thread_sleep_seconds>0.5</background_processing_pool_thread_sleep_seconds>
     <background_processing_pool_task_sleep_seconds_when_no_work_min>0.5</background_processing_pool_task_sleep_seconds_when_no_work_min>
     <background_processing_pool_task_sleep_seconds_when_no_work_max>0.5</background_processing_pool_task_sleep_seconds_when_no_work_max>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
index 4808ae4bc4a..dd383c14116 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/clusters.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <node>
             <shard>
@@ -20,4 +20,4 @@
             </shard>
         </node_another_bucket>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml
index 9361a21efca..9dfcf1e2f9b 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -31,4 +31,4 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
index 645d1111ab8..920db2c9edd 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -31,4 +31,4 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml
index 42207674c79..40cdf0f3402 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_another_bucket_path.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -31,4 +31,4 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
index c682ddae785..4f21fa93381 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/storage_conf_not_restorable.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -32,4 +32,4 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml
index 797113053f4..0011583a68c 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.d/users.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default/>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_restore/configs/config.xml b/tests/integration/test_merge_tree_s3_restore/configs/config.xml
index 24b7344df3a..59829ffdb56 100644
--- a/tests/integration/test_merge_tree_s3_restore/configs/config.xml
+++ b/tests/integration/test_merge_tree_s3_restore/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port>9000</tcp_port>
     <listen_host>127.0.0.1</listen_host>
 
@@ -17,4 +17,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml
index afcc8ba5c67..33da9cd1586 100644
--- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml
+++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/query_log.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <query_log>
         <database>system</database>
         <table>query_log</table>
         <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </query_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml
index 95cdc918bd0..1200dc8c94b 100644
--- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml
+++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/ssl_conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/storage_conf.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/storage_conf.xml
index f3b7f959ce9..c8364e48d92 100644
--- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -22,4 +22,4 @@
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/users.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/users.xml
index 797113053f4..0011583a68c 100644
--- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/users.xml
+++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.d/users.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default/>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml b/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml
index 9e7d283d709..ba0f02d1fa7 100644
--- a/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml
+++ b/tests/integration/test_merge_tree_s3_with_cache/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port>9000</tcp_port>
     <listen_host>127.0.0.1</listen_host>
 
@@ -24,4 +24,4 @@
     <mark_cache_size>0</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_multiple_disks/configs/config.d/cluster.xml b/tests/integration/test_multiple_disks/configs/config.d/cluster.xml
index ec7c9b8e4f8..0a790d9b5c6 100644
--- a/tests/integration/test_multiple_disks/configs/config.d/cluster.xml
+++ b/tests/integration/test_multiple_disks/configs/config.d/cluster.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_multiple_disks/configs/config.d/storage_configuration.xml b/tests/integration/test_multiple_disks/configs/config.d/storage_configuration.xml
index 5b916dab984..ef40bfb0a0e 100644
--- a/tests/integration/test_multiple_disks/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_multiple_disks/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -123,4 +123,4 @@
 
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_multiple_disks/configs/logs_config.xml b/tests/integration/test_multiple_disks/configs/logs_config.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/integration/test_multiple_disks/configs/logs_config.xml
+++ b/tests/integration/test_multiple_disks/configs/logs_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_multiple_disks/test.py b/tests/integration/test_multiple_disks/test.py
index 69ce3da17ac..db541edde9c 100644
--- a/tests/integration/test_multiple_disks/test.py
+++ b/tests/integration/test_multiple_disks/test.py
@@ -1265,8 +1265,14 @@ def test_kill_while_insert(start_cluster):
         disks = get_used_disks_for_table(node1, name)
         assert set(disks) == {"jbod1"}
 
+        def ignore_exceptions(f, *args):
+            try:
+                f(*args)
+            except:
+                """(っಠ‿ಠ)っ"""
+
         start_time = time.time()
-        long_select = threading.Thread(target=node1.query, args=("SELECT sleep(3) FROM {name}".format(name=name),))
+        long_select = threading.Thread(target=ignore_exceptions, args=(node1.query, "SELECT sleep(3) FROM {name}".format(name=name)))
         long_select.start()
 
         time.sleep(0.5)
diff --git a/tests/integration/test_mutations_hardlinks/configs/wide_parts_only.xml b/tests/integration/test_mutations_hardlinks/configs/wide_parts_only.xml
index 42e2173f718..10b9edef36d 100644
--- a/tests/integration/test_mutations_hardlinks/configs/wide_parts_only.xml
+++ b/tests/integration/test_mutations_hardlinks/configs/wide_parts_only.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <min_rows_for_wide_part>0</min_rows_for_wide_part>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/cluster.xml b/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/cluster.xml
index ec7c9b8e4f8..0a790d9b5c6 100644
--- a/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/cluster.xml
+++ b/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/cluster.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/logs_config.xml b/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/logs_config.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/logs_config.xml
+++ b/tests/integration/test_mutations_in_partitions_of_merge_tree/configs/logs_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mutations_with_merge_tree/configs/config.xml b/tests/integration/test_mutations_with_merge_tree/configs/config.xml
index 999fb249d33..9183a737238 100644
--- a/tests/integration/test_mutations_with_merge_tree/configs/config.xml
+++ b/tests/integration/test_mutations_with_merge_tree/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <log>/var/log/clickhouse-server/log.log</log>
         <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
@@ -9,4 +9,4 @@
 
     <path>/var/lib/clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mutations_with_merge_tree/configs/users.xml b/tests/integration/test_mutations_with_merge_tree/configs/users.xml
index 47dea62971b..7b28d23746c 100644
--- a/tests/integration/test_mutations_with_merge_tree/configs/users.xml
+++ b/tests/integration/test_mutations_with_merge_tree/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_expanded_ast_elements>500</max_expanded_ast_elements>
@@ -7,4 +7,4 @@
             <force_primary_key>1</force_primary_key>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mysql_database_engine/configs/named_collections.xml b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
new file mode 100644
index 00000000000..fd18dfa6202
--- /dev/null
+++ b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
@@ -0,0 +1,25 @@
+<clickhouse>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>test_database</database>
+            <table>test_table</table>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </mysql3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_mysql_database_engine/configs/remote_servers.xml b/tests/integration/test_mysql_database_engine/configs/remote_servers.xml
index de8e5865f12..9c7f02c190f 100644
--- a/tests/integration/test_mysql_database_engine/configs/remote_servers.xml
+++ b/tests/integration/test_mysql_database_engine/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -9,4 +9,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mysql_database_engine/test.py b/tests/integration/test_mysql_database_engine/test.py
index 8f305fa8463..49206ab1abe 100644
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@@ -8,7 +8,7 @@ from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-clickhouse_node = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml'], with_mysql=True)
+clickhouse_node = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml', 'configs/named_collections.xml'], with_mysql=True)
 
 
 @pytest.fixture(scope="module")
@@ -232,7 +232,7 @@ uint16_values = [0, 1, 65535]
 int8_values = [0, 1, -1, 127, -128]
 uint8_values = [0, 1, 255]
 # string_values = ["'ClickHouse'", 'NULL']
-string_values = ["'ClickHouse'"] 
+string_values = ["'ClickHouse'"]
 
 
 decimal_values = [0, 0.123, 0.4, 5.67, 8.91011, 123456789.123, -0.123, -0.4, -5.67, -8.91011, -123456789.123]
@@ -319,7 +319,8 @@ def test_mysql_types(started_cluster, case_name, mysql_type, expected_ch_type, m
     )
 
     clickhouse_query_settings = dict(
-        mysql_datatypes_support_level=setting_mysql_datatypes_support_level
+        mysql_datatypes_support_level=setting_mysql_datatypes_support_level,
+        output_format_decimal_trailing_zeros=1
     )
 
     def execute_query(node, query, **kwargs):
@@ -403,3 +404,23 @@ def test_mysql_types(started_cluster, case_name, mysql_type, expected_ch_type, m
             execute_query(clickhouse_node,
                           "SELECT value FROM mysql('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
                           settings=clickhouse_query_settings)
+
+
+def test_predefined_connection_configuration(started_cluster):
+    with contextlib.closing(MySQLNodeInstance('root', 'clickhouse', started_cluster.mysql_ip, started_cluster.mysql_port)) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test_database")
+        mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+        mysql_node.query('CREATE TABLE `test_database`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;')
+
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+        clickhouse_node.query("CREATE DATABASE test_database ENGINE = MySQL(mysql1)")
+        clickhouse_node.query("INSERT INTO `test_database`.`test_table` select number from numbers(100)")
+        assert clickhouse_node.query("SELECT count() FROM `test_database`.`test_table`").rstrip() == '100'
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        clickhouse_node.query_and_get_error("CREATE DATABASE test_database ENGINE = MySQL(mysql2)")
+        clickhouse_node.query_and_get_error("CREATE DATABASE test_database ENGINE = MySQL(unknown_collection)")
+        clickhouse_node.query_and_get_error("CREATE DATABASE test_database ENGINE = MySQL(mysql1, 1)")
+
+        clickhouse_node.query("CREATE DATABASE test_database ENGINE = MySQL(mysql1, port=3306)")
+        assert clickhouse_node.query("SELECT count() FROM `test_database`.`test_table`").rstrip() == '100'
diff --git a/tests/integration/test_mysql_protocol/configs/config.xml b/tests/integration/test_mysql_protocol/configs/config.xml
index 86d055b50b5..07f22392939 100644
--- a/tests/integration/test_mysql_protocol/configs/config.xml
+++ b/tests/integration/test_mysql_protocol/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -33,4 +33,4 @@
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mysql_protocol/configs/mysql.xml b/tests/integration/test_mysql_protocol/configs/mysql.xml
index a3ebc6e8576..35731682db2 100644
--- a/tests/integration/test_mysql_protocol/configs/mysql.xml
+++ b/tests/integration/test_mysql_protocol/configs/mysql.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <mysql_port>9001</mysql_port>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mysql_protocol/configs/ssl_conf.xml b/tests/integration/test_mysql_protocol/configs/ssl_conf.xml
index 5938b80ccb8..43b25032059 100644
--- a/tests/integration/test_mysql_protocol/configs/ssl_conf.xml
+++ b/tests/integration/test_mysql_protocol/configs/ssl_conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
     <openSSL>
         <server> <!-- Used for https server AND secure tcp port -->
@@ -15,4 +15,4 @@
             <preferServerCiphers>true</preferServerCiphers>
         </server>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mysql_protocol/configs/users.xml b/tests/integration/test_mysql_protocol/configs/users.xml
index b88dfbada37..9f82953225f 100644
--- a/tests/integration/test_mysql_protocol/configs/users.xml
+++ b/tests/integration/test_mysql_protocol/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -50,4 +50,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_mysql_protocol/golang.reference b/tests/integration/test_mysql_protocol/golang.reference
index 082149b4644..4069b2a086a 100644
--- a/tests/integration/test_mysql_protocol/golang.reference
+++ b/tests/integration/test_mysql_protocol/golang.reference
@@ -1,7 +1,7 @@
 Columns:
 a
 Column types:
-a BIGINT
+a UNSIGNED BIGINT
 Result:
 0
 1
@@ -10,14 +10,15 @@ name
 a
 Column types:
 name CHAR
-a TINYINT
+a UNSIGNED TINYINT
 Result:
 tables 1
+tables 1
 Columns:
 a
 b
 Column types:
 a CHAR
-b TINYINT
+b UNSIGNED TINYINT
 Result:
 тест 1
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 070aa9967fc..0b3f6ea95af 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -407,24 +407,24 @@ def test_php_client(started_cluster, php_container):
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test.php {host} {port} default 123'.format(host=started_cluster.get_instance_ip('node'), port=server_port), demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test_ssl.php {host} {port} default 123'.format(host=started_cluster.get_instance_ip('node'), port=server_port), demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test.php {host} {port} user_with_double_sha1 abacaba'.format(host=started_cluster.get_instance_ip('node'), port=server_port),
         demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
     code, (stdout, stderr) = php_container.exec_run(
         'php -f test_ssl.php {host} {port} user_with_double_sha1 abacaba'.format(host=started_cluster.get_instance_ip('node'), port=server_port),
         demux=True)
     assert code == 0
-    assert stdout.decode() == 'tables\n'
+    assert stdout.decode() == 'tables\ntables\n'
 
 
 def test_mysqljs_client(started_cluster, nodejs_container):
diff --git a/tests/integration/test_nlp/configs/dicts_config.xml b/tests/integration/test_nlp/configs/dicts_config.xml
index 435507ce1d8..8c05ea67e49 100644
--- a/tests/integration/test_nlp/configs/dicts_config.xml
+++ b/tests/integration/test_nlp/configs/dicts_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <synonyms_extensions>
         <extension>
             <name>en</name>
@@ -19,4 +19,4 @@
             <path>/etc/clickhouse-server/dictionaries/lem-en.bin</path>
         </lemmatizer>
     </lemmatizers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_non_default_compression/configs/allow_experimental_codecs.xml b/tests/integration/test_non_default_compression/configs/allow_experimental_codecs.xml
index 2c7de77cd37..eaafa6031fe 100644
--- a/tests/integration/test_non_default_compression/configs/allow_experimental_codecs.xml
+++ b/tests/integration/test_non_default_compression/configs/allow_experimental_codecs.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_codecs>1</allow_experimental_codecs>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_non_default_compression/configs/allow_suspicious_codecs.xml b/tests/integration/test_non_default_compression/configs/allow_suspicious_codecs.xml
index eb75c339e51..1952fb5cb3b 100644
--- a/tests/integration/test_non_default_compression/configs/allow_suspicious_codecs.xml
+++ b/tests/integration/test_non_default_compression/configs/allow_suspicious_codecs.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_suspicious_codecs>1</allow_suspicious_codecs>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_non_default_compression/configs/custom_compression_by_default.xml b/tests/integration/test_non_default_compression/configs/custom_compression_by_default.xml
index 5c0216db3e0..89396bca034 100644
--- a/tests/integration/test_non_default_compression/configs/custom_compression_by_default.xml
+++ b/tests/integration/test_non_default_compression/configs/custom_compression_by_default.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <compression>
         <case>
             <!-- Conditions. All must be satisfied simultaneously. Some conditions may not be specified. -->
@@ -15,4 +15,4 @@
             <level>20</level>
         </case>
     </compression>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_non_default_compression/configs/enable_uncompressed_cache.xml b/tests/integration/test_non_default_compression/configs/enable_uncompressed_cache.xml
index 15ebf6a74de..51050cdd934 100644
--- a/tests/integration/test_non_default_compression/configs/enable_uncompressed_cache.xml
+++ b/tests/integration/test_non_default_compression/configs/enable_uncompressed_cache.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <use_uncompressed_cache>1</use_uncompressed_cache>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_non_default_compression/configs/lz4hc_compression_by_default.xml b/tests/integration/test_non_default_compression/configs/lz4hc_compression_by_default.xml
index d4bc426b1ac..dfd38378503 100644
--- a/tests/integration/test_non_default_compression/configs/lz4hc_compression_by_default.xml
+++ b/tests/integration/test_non_default_compression/configs/lz4hc_compression_by_default.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <compression>
         <case>
             <!-- Conditions. All must be satisfied simultaneously. Some conditions may not be specified. -->
@@ -9,4 +9,4 @@
             <level>10</level>
         </case>
     </compression>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_non_default_compression/configs/zstd_compression_by_default.xml b/tests/integration/test_non_default_compression/configs/zstd_compression_by_default.xml
index 27a55b5cf08..84449132a58 100644
--- a/tests/integration/test_non_default_compression/configs/zstd_compression_by_default.xml
+++ b/tests/integration/test_non_default_compression/configs/zstd_compression_by_default.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <compression>
         <case>
             <!-- Conditions. All must be satisfied simultaneously. Some conditions may not be specified. -->
@@ -9,4 +9,4 @@
             <level>2</level>
         </case>
     </compression>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/config.xml b/tests/integration/test_odbc_interaction/configs/config.xml
index ac85a24152e..e9d426b2f71 100644
--- a/tests/integration/test_odbc_interaction/configs/config.xml
+++ b/tests/integration/test_odbc_interaction/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -33,4 +33,4 @@
     <users_config>users.xml</users_config>
 
     <dictionaries_config>/etc/clickhouse-server/config.d/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/dictionaries/postgres_odbc_hashed_dictionary.xml b/tests/integration/test_odbc_interaction/configs/dictionaries/postgres_odbc_hashed_dictionary.xml
index 6aad3ad9917..bd5852726ac 100644
--- a/tests/integration/test_odbc_interaction/configs/dictionaries/postgres_odbc_hashed_dictionary.xml
+++ b/tests/integration/test_odbc_interaction/configs/dictionaries/postgres_odbc_hashed_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <dictionary>
        <name>postgres_odbc_hashed</name>
        <source>
@@ -18,7 +18,7 @@
 
        <structure>
            <id>
-               <name>column1</name>
+               <name>id</name>
            </id>
 
            <attribute>
@@ -35,4 +35,4 @@
 
        </structure>
    </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_cached_dictionary.xml b/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_cached_dictionary.xml
index 45f3966ee8a..c1c3789bd68 100644
--- a/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_cached_dictionary.xml
+++ b/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_cached_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
    <dictionary>
        <name>sqlite3_odbc_cached</name>
        <source>
@@ -20,7 +20,7 @@
 
        <structure>
            <id>
-               <name>X</name>
+               <name>id</name>
            </id>
 
            <attribute>
@@ -43,4 +43,4 @@
 
        </structure>
    </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_hashed_dictionary.xml b/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_hashed_dictionary.xml
index 18a14b896bd..38e4949153d 100644
--- a/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_hashed_dictionary.xml
+++ b/tests/integration/test_odbc_interaction/configs/dictionaries/sqlite3_odbc_hashed_dictionary.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
         <dictionary>
        <name>sqlite3_odbc_hashed</name>
        <source>
@@ -20,7 +20,7 @@
 
        <structure>
            <id>
-               <name>X</name>
+               <name>id</name>
            </id>
 
            <attribute>
@@ -43,4 +43,4 @@
 
        </structure>
    </dictionary>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/odbc_logging.xml b/tests/integration/test_odbc_interaction/configs/odbc_logging.xml
index 139db0d5c20..ad013cbcdac 100644
--- a/tests/integration/test_odbc_interaction/configs/odbc_logging.xml
+++ b/tests/integration/test_odbc_interaction/configs/odbc_logging.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <odbc_bridge_log>/var/log/clickhouse-server/clickhouse-odbc-bridge.log</odbc_bridge_log>
         <odbc_bridge_errlog>/var/log/clickhouse-server/clickhouse-odbc-bridge.err.log</odbc_bridge_errlog>
@@ -7,4 +7,4 @@
         <odbc_bridge_stderr>/var/log/clickhouse-server/clickhouse-odbc-bridge.stderr</odbc_bridge_stderr>
         <odbc_bridge_level>trace</odbc_bridge_level>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/openssl.xml b/tests/integration/test_odbc_interaction/configs/openssl.xml
index 95cdc918bd0..1200dc8c94b 100644
--- a/tests/integration/test_odbc_interaction/configs/openssl.xml
+++ b/tests/integration/test_odbc_interaction/configs/openssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/configs/users.xml b/tests/integration/test_odbc_interaction/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_odbc_interaction/configs/users.xml
+++ b/tests/integration/test_odbc_interaction/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_odbc_interaction/test.py b/tests/integration/test_odbc_interaction/test.py
index 39a283448f5..4d2f70ad08c 100644
--- a/tests/integration/test_odbc_interaction/test.py
+++ b/tests/integration/test_odbc_interaction/test.py
@@ -99,19 +99,19 @@ def started_cluster():
 
         logging.debug(f"sqlite data received: {sqlite_db}")
         node1.exec_in_container(
-            ["sqlite3", sqlite_db, "CREATE TABLE t1(x INTEGER PRIMARY KEY ASC, y, z);"],
+            ["sqlite3", sqlite_db, "CREATE TABLE t1(id INTEGER PRIMARY KEY ASC, x INTEGER, y, z);"],
             privileged=True, user='root')
         node1.exec_in_container(
-            ["sqlite3", sqlite_db, "CREATE TABLE t2(X INTEGER PRIMARY KEY ASC, Y, Z);"],
+            ["sqlite3", sqlite_db, "CREATE TABLE t2(id INTEGER PRIMARY KEY ASC, X INTEGER, Y, Z);"],
             privileged=True, user='root')
         node1.exec_in_container(
-            ["sqlite3", sqlite_db, "CREATE TABLE t3(X INTEGER PRIMARY KEY ASC, Y, Z);"],
+            ["sqlite3", sqlite_db, "CREATE TABLE t3(id INTEGER PRIMARY KEY ASC, X INTEGER, Y, Z);"],
             privileged=True, user='root')
         node1.exec_in_container(
-            ["sqlite3", sqlite_db, "CREATE TABLE t4(X INTEGER PRIMARY KEY ASC, Y, Z);"],
+            ["sqlite3", sqlite_db, "CREATE TABLE t4(id INTEGER PRIMARY KEY ASC, X INTEGER, Y, Z);"],
             privileged=True, user='root')
         node1.exec_in_container(
-            ["sqlite3", sqlite_db, "CREATE TABLE tf1(x INTEGER PRIMARY KEY ASC, y, z);"],
+            ["sqlite3", sqlite_db, "CREATE TABLE tf1(id INTEGER PRIMARY KEY ASC, x INTEGER, y, z);"],
             privileged=True, user='root')
         logging.debug("sqlite tables created")
         mysql_conn = get_mysql_conn()
@@ -128,7 +128,7 @@ def started_cluster():
 
         cursor = postgres_conn.cursor()
         cursor.execute(
-            "create table if not exists clickhouse.test_table (column1 int primary key, column2 varchar(40) not null)")
+            "create table if not exists clickhouse.test_table (id int primary key, column1 int not null, column2 varchar(40) not null)")
 
         yield cluster
 
@@ -210,9 +210,9 @@ def test_sqlite_simple_select_function_works(started_cluster):
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
 
-    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t1 values(1, 2, 3);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t1 values(1, 1, 2, 3);"],
                             privileged=True, user='root')
-    assert node1.query("select * from odbc('DSN={}', '{}')".format(sqlite_setup["DSN"], 't1')) == "1\t2\t3\n"
+    assert node1.query("select * from odbc('DSN={}', '{}')".format(sqlite_setup["DSN"], 't1')) == "1\t1\t2\t3\n"
 
     assert node1.query("select y from odbc('DSN={}', '{}')".format(sqlite_setup["DSN"], 't1')) == "2\n"
     assert node1.query("select z from odbc('DSN={}', '{}')".format(sqlite_setup["DSN"], 't1')) == "3\n"
@@ -228,10 +228,10 @@ def test_sqlite_table_function(started_cluster):
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
 
-    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO tf1 values(1, 2, 3);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO tf1 values(1, 1, 2, 3);"],
                             privileged=True, user='root')
     node1.query("create table odbc_tf as odbc('DSN={}', '{}')".format(sqlite_setup["DSN"], 'tf1'))
-    assert node1.query("select * from odbc_tf") == "1\t2\t3\n"
+    assert node1.query("select * from odbc_tf") == "1\t1\t2\t3\n"
 
     assert node1.query("select y from odbc_tf") == "2\n"
     assert node1.query("select z from odbc_tf") == "3\n"
@@ -246,7 +246,7 @@ def test_sqlite_simple_select_storage_works(started_cluster):
     sqlite_setup = node1.odbc_drivers["SQLite3"]
     sqlite_db = sqlite_setup["Database"]
 
-    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t4 values(1, 2, 3);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t4 values(1, 1, 2, 3);"],
                             privileged=True, user='root')
     node1.query("create table SqliteODBC (x Int32, y String, z String) engine = ODBC('DSN={}', '', 't4')".format(
         sqlite_setup["DSN"]))
@@ -264,7 +264,7 @@ def test_sqlite_odbc_hashed_dictionary(started_cluster):
     skip_test_msan(node1)
 
     sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
-    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t2 values(1, 2, 3);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t2 values(1, 1, 2, 3);"],
                             privileged=True, user='root')
 
     node1.query("SYSTEM RELOAD DICTIONARY sqlite3_odbc_hashed")
@@ -282,7 +282,7 @@ def test_sqlite_odbc_hashed_dictionary(started_cluster):
         logging.debug("Waiting dictionary to update for the second time")
         time.sleep(0.1)
 
-    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t2 values(200, 2, 7);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t2 values(200, 200, 2, 7);"],
                             privileged=True, user='root')
 
     # No reload because of invalidate query
@@ -299,7 +299,7 @@ def test_sqlite_odbc_hashed_dictionary(started_cluster):
     assert_eq_with_retry(node1, "select dictGetUInt8('sqlite3_odbc_hashed', 'Z', toUInt64(1))", "3")
     assert_eq_with_retry(node1, "select dictGetUInt8('sqlite3_odbc_hashed', 'Z', toUInt64(200))", "1") # still default
 
-    node1.exec_in_container(["sqlite3", sqlite_db, "REPLACE INTO t2 values(1, 2, 5);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "REPLACE INTO t2 values(1, 1, 2, 5);"],
                             privileged=True, user='root')
 
     assert_eq_with_retry(node1, "select dictGetUInt8('sqlite3_odbc_hashed', 'Z', toUInt64(1))", "5")
@@ -310,7 +310,7 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
     skip_test_msan(node1)
 
     sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
-    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t3 values(1, 2, 3);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "INSERT INTO t3 values(1, 1, 2, 3);"],
                             privileged=True, user='root')
 
     assert node1.query("select dictGetUInt8('sqlite3_odbc_cached', 'Z', toUInt64(1))") == "3\n"
@@ -319,12 +319,12 @@ def test_sqlite_odbc_cached_dictionary(started_cluster):
     node1.exec_in_container(["chmod", "a+rw", "/tmp"], privileged=True, user='root')
     node1.exec_in_container(["chmod", "a+rw", sqlite_db], privileged=True, user='root')
 
-    node1.query("insert into table function odbc('DSN={};ReadOnly=0', '', 't3') values (200, 2, 7)".format(
+    node1.query("insert into table function odbc('DSN={};ReadOnly=0', '', 't3') values (200, 200, 2, 7)".format(
         node1.odbc_drivers["SQLite3"]["DSN"]))
 
     assert node1.query("select dictGetUInt8('sqlite3_odbc_cached', 'Z', toUInt64(200))") == "7\n"  # new value
 
-    node1.exec_in_container(["sqlite3", sqlite_db, "REPLACE INTO t3 values(1, 2, 12);"],
+    node1.exec_in_container(["sqlite3", sqlite_db, "REPLACE INTO t3 values(1, 1, 2, 12);"],
                             privileged=True, user='root')
 
     assert_eq_with_retry(node1, "select dictGetUInt8('sqlite3_odbc_cached', 'Z', toUInt64(1))", "12")
@@ -336,7 +336,7 @@ def test_postgres_odbc_hashed_dictionary_with_schema(started_cluster):
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
     cursor.execute("truncate table clickhouse.test_table")
-    cursor.execute("insert into clickhouse.test_table values(1, 'hello'),(2, 'world')")
+    cursor.execute("insert into clickhouse.test_table values(1, 1, 'hello'),(2, 2, 'world')")
     node1.query("SYSTEM RELOAD DICTIONARY postgres_odbc_hashed")
     assert_eq_with_retry(node1, "select dictGetString('postgres_odbc_hashed', 'column2', toUInt64(1))", "hello")
     assert_eq_with_retry(node1, "select dictGetString('postgres_odbc_hashed', 'column2', toUInt64(2))", "world")
@@ -348,7 +348,7 @@ def test_postgres_odbc_hashed_dictionary_no_tty_pipe_overflow(started_cluster):
     conn = get_postgres_conn(started_cluster)
     cursor = conn.cursor()
     cursor.execute("truncate table clickhouse.test_table")
-    cursor.execute("insert into clickhouse.test_table values(3, 'xxx')")
+    cursor.execute("insert into clickhouse.test_table values(3, 3, 'xxx')")
     for i in range(100):
         try:
             node1.query("system reload dictionary postgres_odbc_hashed", timeout=15)
@@ -369,13 +369,13 @@ def test_postgres_insert(started_cluster):
     # reconstruction of connection string.
 
     node1.query(
-        "create table pg_insert (column1 UInt8, column2 String) engine=ODBC('DSN=postgresql_odbc;Servername=postgre-sql.local', 'clickhouse', 'test_table')")
-    node1.query("insert into pg_insert values (1, 'hello'), (2, 'world')")
-    assert node1.query("select * from pg_insert") == '1\thello\n2\tworld\n'
-    node1.query("insert into table function odbc('DSN=postgresql_odbc', 'clickhouse', 'test_table') format CSV 3,test")
+        "create table pg_insert (id UInt64, column1 UInt8, column2 String) engine=ODBC('DSN=postgresql_odbc;Servername=postgre-sql.local', 'clickhouse', 'test_table')")
+    node1.query("insert into pg_insert values (1, 1, 'hello'), (2, 2, 'world')")
+    assert node1.query("select * from pg_insert") == '1\t1\thello\n2\t2\tworld\n'
+    node1.query("insert into table function odbc('DSN=postgresql_odbc', 'clickhouse', 'test_table') format CSV 3,3,test")
     node1.query(
         "insert into table function odbc('DSN=postgresql_odbc;Servername=postgre-sql.local', 'clickhouse', 'test_table')" \
-        " select number, 's' || toString(number) from numbers (4, 7)")
+        " select number, number, 's' || toString(number) from numbers (4, 7)")
     assert node1.query("select sum(column1), count(column1) from pg_insert") == "55\t10\n"
     assert node1.query(
         "select sum(n), count(n) from (select (*,).1 as n from (select * from odbc('DSN=postgresql_odbc', 'clickhouse', 'test_table')))") == "55\t10\n"
@@ -426,19 +426,19 @@ def test_odbc_postgres_date_data_type(started_cluster):
 
     conn = get_postgres_conn(started_cluster);
     cursor = conn.cursor()
-    cursor.execute("CREATE TABLE IF NOT EXISTS clickhouse.test_date (column1 integer, column2 date)")
+    cursor.execute("CREATE TABLE IF NOT EXISTS clickhouse.test_date (id integer, column1 integer, column2 date)")
 
-    cursor.execute("INSERT INTO clickhouse.test_date VALUES (1, '2020-12-01')")
-    cursor.execute("INSERT INTO clickhouse.test_date VALUES (2, '2020-12-02')")
-    cursor.execute("INSERT INTO clickhouse.test_date VALUES (3, '2020-12-03')")
+    cursor.execute("INSERT INTO clickhouse.test_date VALUES (1, 1, '2020-12-01')")
+    cursor.execute("INSERT INTO clickhouse.test_date VALUES (2, 2, '2020-12-02')")
+    cursor.execute("INSERT INTO clickhouse.test_date VALUES (3, 3, '2020-12-03')")
     conn.commit()
 
     node1.query(
         '''
-        CREATE TABLE test_date (column1 UInt64, column2 Date)
+        CREATE TABLE test_date (id UInt64, column1 UInt64, column2 Date)
         ENGINE=ODBC('DSN=postgresql_odbc; Servername=postgre-sql.local', 'clickhouse', 'test_date')''')
 
-    expected = '1\t2020-12-01\n2\t2020-12-02\n3\t2020-12-03\n'
+    expected = '1\t1\t2020-12-01\n2\t2\t2020-12-02\n3\t3\t2020-12-03\n'
     result = node1.query('SELECT * FROM test_date');
     assert(result == expected)
     cursor.execute("DROP TABLE IF EXISTS clickhouse.test_date")
diff --git a/tests/integration/test_on_cluster_timeouts/configs/remote_servers.xml b/tests/integration/test_on_cluster_timeouts/configs/remote_servers.xml
index 4c3de4b3905..791af83a2d6 100644
--- a/tests/integration/test_on_cluster_timeouts/configs/remote_servers.xml
+++ b/tests/integration/test_on_cluster_timeouts/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -25,4 +25,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_on_cluster_timeouts/configs/users_config.xml b/tests/integration/test_on_cluster_timeouts/configs/users_config.xml
index 3a2ad0325f7..76f01279ce4 100644
--- a/tests/integration/test_on_cluster_timeouts/configs/users_config.xml
+++ b/tests/integration/test_on_cluster_timeouts/configs/users_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <mutations_sync>2</mutations_sync>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_log_table/configs/config_with_non_standard_part_log.xml b/tests/integration/test_part_log_table/configs/config_with_non_standard_part_log.xml
index bb8fa5742f3..59cc7099461 100644
--- a/tests/integration/test_part_log_table/configs/config_with_non_standard_part_log.xml
+++ b/tests/integration/test_part_log_table/configs/config_with_non_standard_part_log.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>database_name</database> <!-- ignored -->
         <table>own_part_log</table>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_log_table/configs/config_with_standard_part_log.xml b/tests/integration/test_part_log_table/configs/config_with_standard_part_log.xml
index 1e640a9e0b0..b9843c60f2e 100644
--- a/tests/integration/test_part_log_table/configs/config_with_standard_part_log.xml
+++ b/tests/integration/test_part_log_table/configs/config_with_standard_part_log.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <part_log>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_log_table/configs/config_without_standard_part_log.xml b/tests/integration/test_part_log_table/configs/config_without_standard_part_log.xml
new file mode 100644
index 00000000000..eed7fb3eb6e
--- /dev/null
+++ b/tests/integration/test_part_log_table/configs/config_without_standard_part_log.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <part_log remove="1"/>
+</clickhouse>
diff --git a/tests/integration/test_part_log_table/test.py b/tests/integration/test_part_log_table/test.py
index 63adde432b5..050e8c831c7 100644
--- a/tests/integration/test_part_log_table/test.py
+++ b/tests/integration/test_part_log_table/test.py
@@ -3,7 +3,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance("node1")
+node1 = cluster.add_instance("node1", main_configs=["configs/config_without_standard_part_log.xml"])
 node2 = cluster.add_instance("node2", main_configs=["configs/config_with_standard_part_log.xml"])
 node3 = cluster.add_instance("node3", main_configs=["configs/config_with_non_standard_part_log.xml"])
 
diff --git a/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml b/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml
index 7bf77e26249..cf54b8be04d 100644
--- a/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml
+++ b/tests/integration/test_part_moves_between_shards/configs/merge_tree.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <assign_part_uuids>1</assign_part_uuids>
         <part_moves_between_shards_enable>1</part_moves_between_shards_enable>
         <part_moves_between_shards_delay_seconds>3</part_moves_between_shards_delay_seconds>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml b/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
index 4812d84a918..d0734608aa9 100644
--- a/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
+++ b/tests/integration/test_part_moves_between_shards/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -23,4 +23,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_moves_between_shards/test.py b/tests/integration/test_part_moves_between_shards/test.py
index 00407f95389..ed7640e5f9e 100644
--- a/tests/integration/test_part_moves_between_shards/test.py
+++ b/tests/integration/test_part_moves_between_shards/test.py
@@ -1,32 +1,38 @@
-import random
-import time
-
 import pytest
+import random
+import threading
+import time
 
 from helpers.client import QueryRuntimeException
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
 
+transient_ch_errors = [23, 32, 210]
+
 cluster = ClickHouseCluster(__file__)
 
 s0r0 = cluster.add_instance(
     's0r0',
     main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    stay_alive=True,
     with_zookeeper=True)
 
 s0r1 = cluster.add_instance(
     's0r1',
     main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    stay_alive=True,
     with_zookeeper=True)
 
 s1r0 = cluster.add_instance(
     's1r0',
     main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    stay_alive=True,
     with_zookeeper=True)
 
 s1r1 = cluster.add_instance(
     's1r1',
     main_configs=['configs/remote_servers.xml', 'configs/merge_tree.xml'],
+    stay_alive=True,
     with_zookeeper=True)
 
 
@@ -43,12 +49,14 @@ def test_move(started_cluster):
     for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
         for replica_ix, r in enumerate(rs):
             r.query("""
+            DROP TABLE IF EXISTS test_move;
             CREATE TABLE test_move(v UInt64)
             ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_move', '{}')
             ORDER BY tuple()
-            """.format(shard_ix, replica_ix))
+            """.format(shard_ix, r.name))
 
     s0r0.query("SYSTEM STOP MERGES test_move")
+    s0r1.query("SYSTEM STOP MERGES test_move")
 
     s0r0.query("INSERT INTO test_move VALUES (1)")
     s0r0.query("INSERT INTO test_move VALUES (2)")
@@ -63,14 +71,7 @@ def test_move(started_cluster):
     s0r0.query("SYSTEM START MERGES test_move")
     s0r0.query("OPTIMIZE TABLE test_move FINAL")
 
-    while True:
-        time.sleep(3)
-
-        print(s0r0.query("SELECT * FROM system.part_moves_between_shards"))
-
-        # Eventually.
-        if "DONE" == s0r0.query("SELECT state FROM system.part_moves_between_shards WHERE table = 'test_move'").strip():
-            break
+    wait_for_state("DONE", s0r0, "test_move")
 
     for n in [s0r0, s0r1]:
         assert "1" == n.query("SELECT count() FROM test_move").strip()
@@ -81,14 +82,7 @@ def test_move(started_cluster):
     # Move part back
     s1r0.query("ALTER TABLE test_move MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_0/tables/test_move'")
 
-    while True:
-        time.sleep(3)
-
-        print(s1r0.query("SELECT * FROM system.part_moves_between_shards"))
-
-        # Eventually.
-        if "DONE" == s1r0.query("SELECT state FROM system.part_moves_between_shards WHERE table = 'test_move'").strip():
-            break
+    wait_for_state("DONE", s1r0, "test_move")
 
     for n in [s0r0, s0r1]:
         assert "2" == n.query("SELECT count() FROM test_move").strip()
@@ -101,17 +95,20 @@ def test_deduplication_while_move(started_cluster):
     for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
         for replica_ix, r in enumerate(rs):
             r.query("""
+            DROP TABLE IF EXISTS test_deduplication;
             CREATE TABLE test_deduplication(v UInt64)
             ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_deduplication', '{}')
             ORDER BY tuple()
-            """.format(shard_ix, replica_ix))
+            """.format(shard_ix, r.name))
 
             r.query("""
-            CREATE TABLE t_d AS test_deduplication
+            DROP TABLE IF EXISTS test_deduplication_d;
+            CREATE TABLE test_deduplication_d AS test_deduplication
             ENGINE Distributed('test_cluster', '', test_deduplication)
             """)
 
     s0r0.query("SYSTEM STOP MERGES test_deduplication")
+    s0r1.query("SYSTEM STOP MERGES test_deduplication")
 
     s0r0.query("INSERT INTO test_deduplication VALUES (1)")
     s0r0.query("INSERT INTO test_deduplication VALUES (2)")
@@ -120,7 +117,8 @@ def test_deduplication_while_move(started_cluster):
     assert "2" == s0r0.query("SELECT count() FROM test_deduplication").strip()
     assert "0" == s1r0.query("SELECT count() FROM test_deduplication").strip()
 
-    s0r0.query("ALTER TABLE test_deduplication MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_deduplication'")
+    s0r0.query(
+        "ALTER TABLE test_deduplication MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_deduplication'")
     s0r0.query("SYSTEM START MERGES test_deduplication")
 
     expected = """
@@ -128,32 +126,363 @@ def test_deduplication_while_move(started_cluster):
 2
 """
 
-    # Verify that we get consisntent result at all times while the part is moving from one shard to another.
-    while "DONE" != s0r0.query("SELECT state FROM system.part_moves_between_shards WHERE table = 'test_deduplication' ORDER BY create_time DESC LIMIT 1").strip():
+    def deduplication_invariant_test():
         n = random.choice(list(started_cluster.instances.values()))
+        assert TSV(
+            n.query("SELECT * FROM test_deduplication_d ORDER BY v",
+                    settings={"allow_experimental_query_deduplication": 1})
+        ) == TSV(expected)
 
-        assert TSV(n.query("SELECT * FROM t_d ORDER BY v", settings={
-            "allow_experimental_query_deduplication": 1
-        })) == TSV(expected)
+    deduplication_invariant = ConcurrentInvariant(deduplication_invariant_test)
+    deduplication_invariant.start()
+
+    wait_for_state("DONE", s0r0, "test_deduplication")
+
+    deduplication_invariant.stop_and_assert_no_exception()
+
+
+def test_part_move_step_by_step(started_cluster):
+    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
+        for replica_ix, r in enumerate(rs):
+            r.query("""
+            DROP TABLE IF EXISTS test_part_move_step_by_step;
+            CREATE TABLE test_part_move_step_by_step(v UInt64)
+            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_part_move_step_by_step', '{}')
+            ORDER BY tuple()
+            """.format(shard_ix, r.name))
+
+            r.query("""
+            DROP TABLE IF EXISTS test_part_move_step_by_step_d;
+            CREATE TABLE test_part_move_step_by_step_d AS test_part_move_step_by_step
+            ENGINE Distributed('test_cluster', currentDatabase(), test_part_move_step_by_step)
+            """)
+
+    s0r0.query("SYSTEM STOP MERGES test_part_move_step_by_step")
+    s0r1.query("SYSTEM STOP MERGES test_part_move_step_by_step")
+
+    s0r0.query("INSERT INTO test_part_move_step_by_step VALUES (1)")
+    s0r0.query("INSERT INTO test_part_move_step_by_step VALUES (2)")
+    s0r1.query("SYSTEM SYNC REPLICA test_part_move_step_by_step", timeout=20)
+
+    assert "2" == s0r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
+    assert "0" == s1r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
+
+    expected = """
+1
+2
+"""
+
+    def deduplication_invariant_test():
+        n = random.choice(list(started_cluster.instances.values()))
+        try:
+            assert TSV(
+                n.query("SELECT * FROM test_part_move_step_by_step_d ORDER BY v",
+                        settings={"allow_experimental_query_deduplication": 1})
+            ) == TSV(expected)
+        except QueryRuntimeException as e:
+            # ignore transient errors that are caused by us restarting nodes
+            if e.returncode not in transient_ch_errors:
+                raise e
+
+    deduplication_invariant = ConcurrentInvariant(deduplication_invariant_test)
+    deduplication_invariant.start()
+
+    # Stop a source replica to prevent SYNC_SOURCE succeeding.
+    s0r1.stop_clickhouse()
+
+    s0r0.query(
+        "ALTER TABLE test_part_move_step_by_step MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_part_move_step_by_step'")
+
+    # Should hang on SYNC_SOURCE until all source replicas acknowledge new pinned UUIDs.
+    wait_for_state("SYNC_SOURCE", s0r0, "test_part_move_step_by_step", "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Start all replicas in source shard but stop a replica in destination shard
+    # to prevent SYNC_DESTINATION succeeding.
+    s1r1.stop_clickhouse()
+    s0r1.start_clickhouse()
+
+    # After SYNC_SOURCE step no merges will be assigned.
+    s0r0.query("SYSTEM START MERGES test_part_move_step_by_step; OPTIMIZE TABLE test_part_move_step_by_step;")
+    s0r1.query("SYSTEM START MERGES test_part_move_step_by_step; OPTIMIZE TABLE test_part_move_step_by_step;")
+
+    wait_for_state("SYNC_DESTINATION", s0r0, "test_part_move_step_by_step", "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Start previously stopped replica in destination shard to let SYNC_DESTINATION
+    # succeed.
+    # Stop the other replica in destination shard to prevent DESTINATION_FETCH succeed.
+    s1r0.stop_clickhouse()
+    s1r1.start_clickhouse()
+    wait_for_state("DESTINATION_FETCH", s0r0, "test_part_move_step_by_step", "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Start previously stopped replica in destination shard to let DESTINATION_FETCH
+    # succeed.
+    # Stop the other replica in destination shard to prevent DESTINATION_ATTACH succeed.
+    s1r1.stop_clickhouse()
+    s1r0.start_clickhouse()
+    wait_for_state("DESTINATION_ATTACH", s0r0, "test_part_move_step_by_step", "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Start all replicas in destination shard to let DESTINATION_ATTACH succeed.
+    # Stop a source replica to prevent SOURCE_DROP succeeding.
+    s0r0.stop_clickhouse()
+    s1r1.start_clickhouse()
+    wait_for_state("SOURCE_DROP", s0r1, "test_part_move_step_by_step", "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    s0r0.start_clickhouse()
+    wait_for_state("DONE", s0r1, "test_part_move_step_by_step")
+    deduplication_invariant.assert_no_exception()
+
+    # No hung tasks in replication queue. Would timeout otherwise.
+    for instance in started_cluster.instances.values():
+        instance.query("SYSTEM SYNC REPLICA test_part_move_step_by_step")
+
+    assert "1" == s0r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
+    assert "1" == s1r0.query("SELECT count() FROM test_part_move_step_by_step").strip()
+
+    deduplication_invariant.stop_and_assert_no_exception()
+
+
+def test_part_move_step_by_step_kill(started_cluster):
+    for shard_ix, rs in enumerate([[s0r0, s0r1], [s1r0, s1r1]]):
+        for replica_ix, r in enumerate(rs):
+            r.query("""
+            DROP TABLE IF EXISTS test_part_move_step_by_step_kill;
+            CREATE TABLE test_part_move_step_by_step_kill(v UInt64)
+            ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/test_part_move_step_by_step_kill', '{}')
+            ORDER BY tuple()
+            """.format(shard_ix, r.name))
+
+            r.query("""
+            DROP TABLE IF EXISTS test_part_move_step_by_step_kill_d;
+            CREATE TABLE test_part_move_step_by_step_kill_d AS test_part_move_step_by_step_kill
+            ENGINE Distributed('test_cluster', currentDatabase(), test_part_move_step_by_step_kill)
+            """)
+
+    s0r0.query("SYSTEM STOP MERGES test_part_move_step_by_step_kill")
+    s0r1.query("SYSTEM STOP MERGES test_part_move_step_by_step_kill")
+
+    s0r0.query("INSERT INTO test_part_move_step_by_step_kill VALUES (1)")
+    s0r0.query("INSERT INTO test_part_move_step_by_step_kill VALUES (2)")
+    s0r1.query("SYSTEM SYNC REPLICA test_part_move_step_by_step_kill", timeout=20)
+
+    assert "2" == s0r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
+    assert "0" == s1r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
+
+    expected = """
+1
+2
+"""
+
+    def deduplication_invariant_test():
+        n = random.choice(list(started_cluster.instances.values()))
+        try:
+            assert TSV(
+                n.query("SELECT * FROM test_part_move_step_by_step_kill_d ORDER BY v",
+                        settings={
+                            "allow_experimental_query_deduplication": 1
+                        })
+            ) == TSV(expected)
+        except QueryRuntimeException as e:
+            # ignore transient errors that are caused by us restarting nodes
+            if e.returncode not in transient_ch_errors:
+                raise e
+
+    deduplication_invariant = ConcurrentInvariant(deduplication_invariant_test)
+    deduplication_invariant.start()
+
+    # Stop a source replica to prevent SYNC_SOURCE succeeding.
+    s0r1.stop_clickhouse()
+
+    s0r0.query(
+        "ALTER TABLE test_part_move_step_by_step_kill MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/test_part_move_step_by_step_kill'")
+
+    # Should hang on SYNC_SOURCE until all source replicas acknowledge new pinned UUIDs.
+    wait_for_state("SYNC_SOURCE", s0r0, "test_part_move_step_by_step_kill", "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Start all replicas in source shard but stop a replica in destination shard
+    # to prevent SYNC_DESTINATION succeeding.
+    s1r1.stop_clickhouse()
+    s0r1.start_clickhouse()
+
+    # After SYNC_SOURCE step no merges will be assigned.
+    s0r0.query("SYSTEM START MERGES test_part_move_step_by_step_kill; OPTIMIZE TABLE test_part_move_step_by_step_kill;")
+    s0r1.query("SYSTEM START MERGES test_part_move_step_by_step_kill; OPTIMIZE TABLE test_part_move_step_by_step_kill;")
+
+    wait_for_state("SYNC_DESTINATION", s0r0, "test_part_move_step_by_step_kill",
+                   "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Start previously stopped replica in destination shard to let SYNC_DESTINATION
+    # succeed.
+    # Stop the other replica in destination shard to prevent DESTINATION_FETCH succeed.
+    s1r0.stop_clickhouse()
+    s1r1.start_clickhouse()
+    wait_for_state("DESTINATION_FETCH", s0r0, "test_part_move_step_by_step_kill",
+                   "Some replicas haven\\'t processed event")
+
+    # Start previously stopped replica in destination shard to let DESTINATION_FETCH
+    # succeed.
+    # Stop the other replica in destination shard to prevent DESTINATION_ATTACH succeed.
+    s1r1.stop_clickhouse()
+    s1r0.start_clickhouse()
+    wait_for_state("DESTINATION_ATTACH", s0r0, "test_part_move_step_by_step_kill",
+                   "Some replicas haven\\'t processed event")
+    deduplication_invariant.assert_no_exception()
+
+    # Rollback here.
+    s0r0.query("""
+        KILL PART_MOVE_TO_SHARD
+        WHERE task_uuid = (SELECT task_uuid FROM system.part_moves_between_shards WHERE table = 'test_part_move_step_by_step_kill')
+    """)
+
+    wait_for_state("DESTINATION_ATTACH", s0r0, "test_part_move_step_by_step_kill",
+                   assert_exception_msg="Some replicas haven\\'t processed event",
+                   assert_rollback=True)
+
+    s1r1.start_clickhouse()
+
+    wait_for_state("CANCELLED", s0r0, "test_part_move_step_by_step_kill", assert_rollback=True)
+    deduplication_invariant.assert_no_exception()
+
+    # No hung tasks in replication queue. Would timeout otherwise.
+    for instance in started_cluster.instances.values():
+        instance.query("SYSTEM SYNC REPLICA test_part_move_step_by_step_kill")
+
+    assert "2" == s0r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
+    assert "0" == s1r0.query("SELECT count() FROM test_part_move_step_by_step_kill").strip()
+
+    deduplication_invariant.stop_and_assert_no_exception()
 
 
 def test_move_not_permitted(started_cluster):
+    # Verify that invariants for part compatibility are checked.
+
+    # Tests are executed in order. Make sure cluster is up if previous test
+    # failed.
+    s0r0.start_clickhouse()
+    s1r0.start_clickhouse()
+
     for ix, n in enumerate([s0r0, s1r0]):
-        n.query("DROP TABLE IF EXISTS not_permitted")
         n.query("""
-        CREATE TABLE not_permitted(v_{} UInt64)
-        ENGINE ReplicatedMergeTree('/clickhouse/shard_{}/tables/not_permitted', 'r')
-        ORDER BY tuple()
-        """.format(ix, ix))
+        DROP TABLE IF EXISTS not_permitted_columns;
+        
+        CREATE TABLE not_permitted_columns(v_{ix} UInt64)
+        ENGINE ReplicatedMergeTree('/clickhouse/shard_{ix}/tables/not_permitted_columns', 'r')
+        ORDER BY tuple();
+        """.format(ix=ix))
 
-    s0r0.query("INSERT INTO not_permitted VALUES (1)")
+        partition = "date"
+        if ix > 0:
+            partition = "v"
 
-    with pytest.raises(QueryRuntimeException) as exc:
-        s0r0.query("ALTER TABLE not_permitted MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/not_permitted'")
+        n.query("""
+        DROP TABLE IF EXISTS not_permitted_partition;
+        CREATE TABLE not_permitted_partition(date Date, v UInt64)
+        ENGINE ReplicatedMergeTree('/clickhouse/shard_{ix}/tables/not_permitted_partition', 'r')
+        PARTITION BY ({partition})
+        ORDER BY tuple();
+        """.format(ix=ix, partition=partition))
 
-    assert "DB::Exception: Table columns structure in ZooKeeper is different from local table structure." in str(exc.value)
+    s0r0.query("INSERT INTO not_permitted_columns VALUES (1)")
+    s0r0.query("INSERT INTO not_permitted_partition VALUES ('2021-09-03', 1)")
 
-    with pytest.raises(QueryRuntimeException) as exc:
-        s0r0.query("ALTER TABLE not_permitted MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_0/tables/not_permitted'")
+    with pytest.raises(QueryRuntimeException, match="DB::Exception: Source and destination are the same"):
+        s0r0.query("ALTER TABLE not_permitted_columns MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_0/tables/not_permitted_columns'")
 
-    assert "DB::Exception: Source and destination are the same" in str(exc.value)
+    with pytest.raises(QueryRuntimeException, match="DB::Exception: Table columns structure in ZooKeeper is different from local table structure."):
+        s0r0.query("ALTER TABLE not_permitted_columns MOVE PART 'all_0_0_0' TO SHARD '/clickhouse/shard_1/tables/not_permitted_columns'")
+
+    with pytest.raises(QueryRuntimeException, match="DB::Exception: Existing table metadata in ZooKeeper differs in partition key expression."):
+        s0r0.query("ALTER TABLE not_permitted_partition MOVE PART '20210903_0_0_0' TO SHARD '/clickhouse/shard_1/tables/not_permitted_partition'")
+
+
+def wait_for_state(desired_state, instance, test_table, assert_exception_msg=None, assert_rollback=False):
+    last_debug_print_time = time.time()
+
+    print("Waiting to reach state: {}".format(desired_state))
+    if assert_exception_msg:
+        print("  with exception contents: {}".format(assert_exception_msg))
+    if assert_rollback:
+        print("     and rollback: {}".format(assert_rollback))
+
+    while True:
+        tasks = TSV.toMat(instance.query(
+            "SELECT state, num_tries, last_exception, rollback FROM system.part_moves_between_shards WHERE table = '{}'".format(
+                test_table)))
+        assert len(tasks) == 1, "only one task expected in this test"
+
+        if time.time() - last_debug_print_time > 30:
+            last_debug_print_time = time.time()
+            print("Current state: ", tasks)
+
+        [state, num_tries, last_exception, rollback] = tasks[0]
+
+        if state == desired_state:
+            if assert_exception_msg and int(num_tries) < 3:
+                # Let the task be retried a few times when expecting an exception
+                # to make sure the exception is persistent and the code doesn't
+                # accidentally continue to run when we expect it not to.
+                continue
+
+            if assert_exception_msg:
+                assert assert_exception_msg in last_exception
+
+            if assert_rollback:
+                assert int(rollback) == 1, "rollback bit isn't set"
+
+            break
+        elif state in ["DONE", "CANCELLED"]:
+            raise Exception("Reached terminal state {}, but was waiting for {}".format(state, desired_state))
+
+        time.sleep(0.1)
+
+
+class ConcurrentInvariant:
+    def __init__(self, invariant_test, loop_sleep=0.1):
+        self.invariant_test = invariant_test
+        self.loop_sleep = loop_sleep
+
+        self.started = False
+        self.exiting = False
+        self.exception = None
+        self.thread = threading.Thread(target=self._loop)
+
+    def start(self):
+        if self.started:
+            raise Exception('invariant thread already started')
+
+        self.started = True
+        self.thread.start()
+
+    def stop_and_assert_no_exception(self):
+        self._assert_started()
+
+        self.exiting = True
+        self.thread.join()
+
+        if self.exception:
+            raise self.exception
+
+    def assert_no_exception(self):
+        self._assert_started()
+
+        if self.exception:
+            raise self.exception
+
+    def _loop(self):
+        try:
+            while not self.exiting:
+                self.invariant_test()
+                time.sleep(self.loop_sleep)
+        except Exception as e:
+            self.exiting = True
+            self.exception = e
+
+    def _assert_started(self):
+        if not self.started:
+            raise Exception('invariant thread not started, forgot to call start?')
diff --git a/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml b/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml
index 83d36f33795..ae00a5b9259 100644
--- a/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml
+++ b/tests/integration/test_part_uuid/configs/merge_tree_in_memory.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <min_rows_for_compact_part>1000</min_rows_for_compact_part>
         <min_rows_for_wide_part>1000</min_rows_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_uuid/configs/merge_tree_uuids.xml b/tests/integration/test_part_uuid/configs/merge_tree_uuids.xml
index 8369c916848..6552fd68468 100644
--- a/tests/integration/test_part_uuid/configs/merge_tree_uuids.xml
+++ b/tests/integration/test_part_uuid/configs/merge_tree_uuids.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <assign_part_uuids>1</assign_part_uuids>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_uuid/configs/remote_servers.xml b/tests/integration/test_part_uuid/configs/remote_servers.xml
index ebce4697529..68b420f36b4 100644
--- a/tests/integration/test_part_uuid/configs/remote_servers.xml
+++ b/tests/integration/test_part_uuid/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_part_uuid/test.py b/tests/integration/test_part_uuid/test.py
index 1dfeb17b9b8..0353bf9266d 100644
--- a/tests/integration/test_part_uuid/test.py
+++ b/tests/integration/test_part_uuid/test.py
@@ -93,7 +93,7 @@ def test_part_uuid_wal(started_cluster):
 
     uuids = set()
     for node in [node1, node2]:
-        node.query("SYSTEM SYNC REPLICA t")
+        node.query("SYSTEM SYNC REPLICA t_wal")
         part_initial_uuid = uuid.UUID(node.query("SELECT uuid FROM system.parts WHERE table = 't_wal' AND active ORDER BY name").strip())
         assert "InMemory" == node.query("SELECT part_type FROM system.parts WHERE table = 't_wal' AND active ORDER BY name").strip()
         uuids.add(part_initial_uuid)
diff --git a/tests/integration/test_partition/test.py b/tests/integration/test_partition/test.py
index baac5367c00..b43c85a4d48 100644
--- a/tests/integration/test_partition/test.py
+++ b/tests/integration/test_partition/test.py
@@ -236,3 +236,82 @@ def test_drop_detached_parts(drop_detached_parts_table):
     q("ALTER TABLE test.drop_detached DROP DETACHED PARTITION 1", settings=s)
     detached = q("SElECT name FROM system.detached_parts WHERE table='drop_detached' AND database='test' ORDER BY name")
     assert TSV(detached) == TSV('0_3_3_0\nattaching_0_6_6_0\ndeleting_0_7_7_0')
+
+def test_system_detached_parts(drop_detached_parts_table):
+    q("create table sdp_0 (n int, x int) engine=MergeTree order by n")
+    q("create table sdp_1 (n int, x int) engine=MergeTree order by n partition by x")
+    q("create table sdp_2 (n int, x String) engine=MergeTree order by n partition by x")
+    q("create table sdp_3 (n int, x Enum('broken' = 0, 'all' = 1)) engine=MergeTree order by n partition by x")
+
+    for i in range(0, 4):
+        q("system stop merges sdp_{}".format(i))
+        q("insert into sdp_{} values (0, 0)".format(i))
+        q("insert into sdp_{} values (1, 1)".format(i))
+        for p in q("select distinct partition_id from system.parts where table='sdp_{}'".format(i))[:-1].split('\n'):
+            q("alter table sdp_{} detach partition id '{}'".format(i, p))
+
+    path_to_detached = path_to_data + 'data/default/sdp_{}/detached/{}'
+    for i in range(0, 4):
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'attaching_0_6_6_0')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'deleting_0_7_7_0')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'any_other_name')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'prefix_1_2_2_0_0')])
+
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'ignored_202107_714380_714380_0')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'broken_202107_714380_714380_123')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'clone_all_714380_714380_42')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'clone_all_714380_714380_42_123')])
+        instance.exec_in_container(['mkdir', path_to_detached.format(i, 'broken-on-start_6711e2b2592d86d18fc0f260cf33ef2b_714380_714380_42_123')])
+
+    res = q("select * from system.detached_parts where table like 'sdp_%' order by table, name")
+    assert res == \
+        "default\tsdp_0\tall\tall_1_1_0\tdefault\t\t1\t1\t0\n" \
+        "default\tsdp_0\tall\tall_2_2_0\tdefault\t\t2\t2\t0\n" \
+        "default\tsdp_0\t\\N\tany_other_name\tdefault\t\\N\t\\N\t\\N\t\\N\n" \
+        "default\tsdp_0\t0\tattaching_0_6_6_0\tdefault\tattaching\t6\t6\t0\n" \
+        "default\tsdp_0\t6711e2b2592d86d18fc0f260cf33ef2b\tbroken-on-start_6711e2b2592d86d18fc0f260cf33ef2b_714380_714380_42_123\tdefault\tbroken-on-start\t714380\t714380\t42\n" \
+        "default\tsdp_0\t202107\tbroken_202107_714380_714380_123\tdefault\tbroken\t714380\t714380\t123\n" \
+        "default\tsdp_0\tall\tclone_all_714380_714380_42\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_0\tall\tclone_all_714380_714380_42_123\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_0\t0\tdeleting_0_7_7_0\tdefault\tdeleting\t7\t7\t0\n" \
+        "default\tsdp_0\t202107\tignored_202107_714380_714380_0\tdefault\tignored\t714380\t714380\t0\n" \
+        "default\tsdp_0\t1\tprefix_1_2_2_0_0\tdefault\tprefix\t2\t2\t0\n" \
+        "default\tsdp_1\t0\t0_1_1_0\tdefault\t\t1\t1\t0\n" \
+        "default\tsdp_1\t1\t1_2_2_0\tdefault\t\t2\t2\t0\n" \
+        "default\tsdp_1\t\\N\tany_other_name\tdefault\t\\N\t\\N\t\\N\t\\N\n" \
+        "default\tsdp_1\t0\tattaching_0_6_6_0\tdefault\tattaching\t6\t6\t0\n" \
+        "default\tsdp_1\t6711e2b2592d86d18fc0f260cf33ef2b\tbroken-on-start_6711e2b2592d86d18fc0f260cf33ef2b_714380_714380_42_123\tdefault\tbroken-on-start\t714380\t714380\t42\n" \
+        "default\tsdp_1\t202107\tbroken_202107_714380_714380_123\tdefault\tbroken\t714380\t714380\t123\n" \
+        "default\tsdp_1\tall\tclone_all_714380_714380_42\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_1\tall\tclone_all_714380_714380_42_123\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_1\t0\tdeleting_0_7_7_0\tdefault\tdeleting\t7\t7\t0\n" \
+        "default\tsdp_1\t202107\tignored_202107_714380_714380_0\tdefault\tignored\t714380\t714380\t0\n" \
+        "default\tsdp_1\t1\tprefix_1_2_2_0_0\tdefault\tprefix\t2\t2\t0\n" \
+        "default\tsdp_2\t58ed7160db50ea45e1c6aa694c8cbfd1\t58ed7160db50ea45e1c6aa694c8cbfd1_1_1_0\tdefault\t\t1\t1\t0\n" \
+        "default\tsdp_2\t6711e2b2592d86d18fc0f260cf33ef2b\t6711e2b2592d86d18fc0f260cf33ef2b_2_2_0\tdefault\t\t2\t2\t0\n" \
+        "default\tsdp_2\t\\N\tany_other_name\tdefault\t\\N\t\\N\t\\N\t\\N\n" \
+        "default\tsdp_2\t0\tattaching_0_6_6_0\tdefault\tattaching\t6\t6\t0\n" \
+        "default\tsdp_2\t6711e2b2592d86d18fc0f260cf33ef2b\tbroken-on-start_6711e2b2592d86d18fc0f260cf33ef2b_714380_714380_42_123\tdefault\tbroken-on-start\t714380\t714380\t42\n" \
+        "default\tsdp_2\t202107\tbroken_202107_714380_714380_123\tdefault\tbroken\t714380\t714380\t123\n" \
+        "default\tsdp_2\tall\tclone_all_714380_714380_42\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_2\tall\tclone_all_714380_714380_42_123\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_2\t0\tdeleting_0_7_7_0\tdefault\tdeleting\t7\t7\t0\n" \
+        "default\tsdp_2\t202107\tignored_202107_714380_714380_0\tdefault\tignored\t714380\t714380\t0\n" \
+        "default\tsdp_2\t1\tprefix_1_2_2_0_0\tdefault\tprefix\t2\t2\t0\n" \
+        "default\tsdp_3\t0\t0_1_1_0\tdefault\t\t1\t1\t0\n" \
+        "default\tsdp_3\t1\t1_2_2_0\tdefault\t\t2\t2\t0\n" \
+        "default\tsdp_3\t\\N\tany_other_name\tdefault\t\\N\t\\N\t\\N\t\\N\n" \
+        "default\tsdp_3\t0\tattaching_0_6_6_0\tdefault\tattaching\t6\t6\t0\n" \
+        "default\tsdp_3\t6711e2b2592d86d18fc0f260cf33ef2b\tbroken-on-start_6711e2b2592d86d18fc0f260cf33ef2b_714380_714380_42_123\tdefault\tbroken-on-start\t714380\t714380\t42\n" \
+        "default\tsdp_3\t202107\tbroken_202107_714380_714380_123\tdefault\tbroken\t714380\t714380\t123\n" \
+        "default\tsdp_3\tall\tclone_all_714380_714380_42\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_3\tall\tclone_all_714380_714380_42_123\tdefault\tclone\t714380\t714380\t42\n" \
+        "default\tsdp_3\t0\tdeleting_0_7_7_0\tdefault\tdeleting\t7\t7\t0\n" \
+        "default\tsdp_3\t202107\tignored_202107_714380_714380_0\tdefault\tignored\t714380\t714380\t0\n" \
+        "default\tsdp_3\t1\tprefix_1_2_2_0_0\tdefault\tprefix\t2\t2\t0\n"
+
+    for i in range(0, 4):
+        for p in q("select distinct partition_id from system.detached_parts where table='sdp_{}' and partition_id is not null".format(i))[:-1].split('\n'):
+            q("alter table sdp_{} attach partition id '{}'".format(i, p))
+
+    assert q("select n, x, count() from merge('default', 'sdp_') group by n, x") == "0\t0\t4\n1\t1\t4\n"
diff --git a/tests/integration/test_parts_delete_zookeeper/configs/remote_servers.xml b/tests/integration/test_parts_delete_zookeeper/configs/remote_servers.xml
index 538aa72d386..3776309941c 100644
--- a/tests/integration/test_parts_delete_zookeeper/configs/remote_servers.xml
+++ b/tests/integration/test_parts_delete_zookeeper/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -11,4 +11,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_polymorphic_parts/configs/compact_parts.xml b/tests/integration/test_polymorphic_parts/configs/compact_parts.xml
index 5b3afe65d92..a83b94a2792 100644
--- a/tests/integration/test_polymorphic_parts/configs/compact_parts.xml
+++ b/tests/integration/test_polymorphic_parts/configs/compact_parts.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <min_rows_for_wide_part>512</min_rows_for_wide_part>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_polymorphic_parts/configs/do_not_merge.xml b/tests/integration/test_polymorphic_parts/configs/do_not_merge.xml
index 82aaeb1fbc8..c1442679054 100644
--- a/tests/integration/test_polymorphic_parts/configs/do_not_merge.xml
+++ b/tests/integration/test_polymorphic_parts/configs/do_not_merge.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <max_bytes_to_merge_at_min_space_in_pool>1</max_bytes_to_merge_at_min_space_in_pool>
         <max_bytes_to_merge_at_max_space_in_pool>2</max_bytes_to_merge_at_max_space_in_pool>
         <max_replicated_merges_in_queue>0</max_replicated_merges_in_queue>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_polymorphic_parts/configs/no_leader.xml b/tests/integration/test_polymorphic_parts/configs/no_leader.xml
index 3cc3d787bea..f169abe34ec 100644
--- a/tests/integration/test_polymorphic_parts/configs/no_leader.xml
+++ b/tests/integration/test_polymorphic_parts/configs/no_leader.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <replicated_can_become_leader>0</replicated_can_become_leader>
     </merge_tree>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_polymorphic_parts/configs/users.d/not_optimize_count.xml b/tests/integration/test_polymorphic_parts/configs/users.d/not_optimize_count.xml
index 5a06453b214..7f8036c4f87 100644
--- a/tests/integration/test_polymorphic_parts/configs/users.d/not_optimize_count.xml
+++ b/tests/integration/test_polymorphic_parts/configs/users.d/not_optimize_count.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <optimize_trivial_count_query>0</optimize_trivial_count_query>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_postgresql_database_engine/configs/named_collections.xml b/tests/integration/test_postgresql_database_engine/configs/named_collections.xml
new file mode 100644
index 00000000000..38a42b37443
--- /dev/null
+++ b/tests/integration/test_postgresql_database_engine/configs/named_collections.xml
@@ -0,0 +1,23 @@
+<clickhouse>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres</database>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </postgres2>
+        <postgres3>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres</database>
+        </postgres3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_postgresql_database_engine/test.py b/tests/integration/test_postgresql_database_engine/test.py
index e89f1109c3a..656f655cfb3 100644
--- a/tests/integration/test_postgresql_database_engine/test.py
+++ b/tests/integration/test_postgresql_database_engine/test.py
@@ -7,7 +7,7 @@ from helpers.test_tools import assert_eq_with_retry
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', main_configs=[], with_postgres=True)
+node1 = cluster.add_instance('node1', main_configs=["configs/named_collections.xml"], with_postgres=True)
 
 postgres_table_template = """
     CREATE TABLE IF NOT EXISTS {} (
@@ -151,7 +151,7 @@ def test_postgresql_database_engine_table_cache(started_cluster):
     cursor = conn.cursor()
 
     node1.query(
-        "CREATE DATABASE test_database ENGINE = PostgreSQL('postgres1:5432', 'test_database', 'postgres', 'mysecretpassword', 1)")
+        "CREATE DATABASE test_database ENGINE = PostgreSQL('postgres1:5432', 'test_database', 'postgres', 'mysecretpassword', '', 1)")
 
     create_postgres_table(cursor, 'test_table')
     assert node1.query('DESCRIBE TABLE test_database.test_table').rstrip() == 'id\tInt32\t\t\t\t\t\nvalue\tNullable(Int32)'
@@ -183,6 +183,61 @@ def test_postgresql_database_engine_table_cache(started_cluster):
     assert 'test_database' not in node1.query('SHOW DATABASES')
 
 
+def test_postgresql_database_with_schema(started_cluster):
+    conn = get_postgres_conn(started_cluster, True)
+    cursor = conn.cursor()
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema CASCADE')
+    cursor.execute('DROP SCHEMA IF EXISTS "test.nice.schema" CASCADE')
+
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.table1 (a integer)')
+    cursor.execute('CREATE TABLE test_schema.table2 (a integer)')
+    cursor.execute('CREATE TABLE table3 (a integer)')
+
+    node1.query(
+        "CREATE DATABASE test_database ENGINE = PostgreSQL('postgres1:5432', 'test_database', 'postgres', 'mysecretpassword', 'test_schema')")
+
+    assert(node1.query('SHOW TABLES FROM test_database') == 'table1\ntable2\n')
+
+    node1.query("INSERT INTO test_database.table1 SELECT number from numbers(10000)")
+    assert node1.query("SELECT count() FROM test_database.table1").rstrip() == '10000'
+    node1.query("DETACH TABLE test_database.table1")
+    node1.query("ATTACH TABLE test_database.table1")
+    assert node1.query("SELECT count() FROM test_database.table1").rstrip() == '10000'
+    node1.query("DROP DATABASE test_database")
+
+
+def test_predefined_connection_configuration(started_cluster):
+    cursor = started_cluster.postgres_conn.cursor()
+    cursor.execute(f'DROP TABLE IF EXISTS test_table')
+    cursor.execute(f'CREATE TABLE test_table (a integer PRIMARY KEY, b integer)')
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1)")
+    node1.query("INSERT INTO postgres_database.test_table SELECT number, number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip() == '100')
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema')
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (a integer)')
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1, schema='test_schema')")
+    node1.query("INSERT INTO postgres_database.test_table SELECT number from numbers(200)")
+    assert (node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip() == '200')
+
+    node1.query("DROP DATABASE IF EXISTS postgres_database")
+    node1.query_and_get_error("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres1, 'test_schema')")
+    node1.query_and_get_error("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres2)")
+    node1.query_and_get_error("CREATE DATABASE postgres_database ENGINE = PostgreSQL(unknown_collection)")
+    node1.query("CREATE DATABASE postgres_database ENGINE = PostgreSQL(postgres3, port=5432)")
+    assert (node1.query(f"SELECT count() FROM postgres_database.test_table").rstrip() == '100')
+
+    node1.query("DROP DATABASE postgres_database")
+    cursor.execute(f'DROP TABLE test_table ')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_postgresql_protocol/configs/config.xml b/tests/integration/test_postgresql_protocol/configs/config.xml
index 678b48425b1..1dade9247b3 100644
--- a/tests/integration/test_postgresql_protocol/configs/config.xml
+++ b/tests/integration/test_postgresql_protocol/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
      <logger>
          <level>trace</level>
          <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -32,4 +32,4 @@
      <mark_cache_size>5368709120</mark_cache_size>
      <path>./clickhouse/</path>
      <users_config>users.xml</users_config>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_postgresql_protocol/configs/default_passwd.xml b/tests/integration/test_postgresql_protocol/configs/default_passwd.xml
index 86f5b6657c2..ad56fbfa635 100644
--- a/tests/integration/test_postgresql_protocol/configs/default_passwd.xml
+++ b/tests/integration/test_postgresql_protocol/configs/default_passwd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
     <profiles>
         <default>
         </default>
@@ -10,4 +10,4 @@
              <password>123</password>
          </default>
      </users>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_postgresql_protocol/configs/log.xml b/tests/integration/test_postgresql_protocol/configs/log.xml
index 7f6380b0393..21cd83a1af2 100644
--- a/tests/integration/test_postgresql_protocol/configs/log.xml
+++ b/tests/integration/test_postgresql_protocol/configs/log.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
      <logger>
          <level>trace</level>
          <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -7,4 +7,4 @@
          <size>1000M</size>
          <count>10</count>
      </logger>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_postgresql_protocol/configs/postresql.xml b/tests/integration/test_postgresql_protocol/configs/postresql.xml
index aedfb59bedb..52f8ce9fb89 100644
--- a/tests/integration/test_postgresql_protocol/configs/postresql.xml
+++ b/tests/integration/test_postgresql_protocol/configs/postresql.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
      <postgresql_port>5433</postgresql_port>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml b/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml
index 271cb987218..46a69601de9 100644
--- a/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml
+++ b/tests/integration/test_postgresql_protocol/configs/ssl_conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
      <!-- Used with https_port and tcp_port_secure. Full ssl options list: https://github.com/ClickHouse-Extras/poco/blob/master/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h#L71 -->
      <openSSL>
          <server> <!-- Used for https server AND secure tcp port -->
@@ -15,4 +15,4 @@
              <preferServerCiphers>true</preferServerCiphers>
          </server>
      </openSSL>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_postgresql_protocol/configs/users.xml b/tests/integration/test_postgresql_protocol/configs/users.xml
index 86f5b6657c2..ad56fbfa635 100644
--- a/tests/integration/test_postgresql_protocol/configs/users.xml
+++ b/tests/integration/test_postgresql_protocol/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
- <yandex>
+ <clickhouse>
     <profiles>
         <default>
         </default>
@@ -10,4 +10,4 @@
              <password>123</password>
          </default>
      </users>
- </yandex>
+ </clickhouse>
diff --git a/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml b/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml
index f9d15e572aa..c42a3aba833 100644
--- a/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml
+++ b/tests/integration/test_postgresql_replica_database_engine/configs/log_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/log.log</log>
@@ -8,4 +8,22 @@
         <stderr>/var/log/clickhouse-server/stderr.log</stderr>
         <stdout>/var/log/clickhouse-server/stdout.log</stdout>
     </logger>
-</yandex>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres_database</database>
+            <table>test_table</table>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres_database</database>
+            <table>test_table</table>
+        </postgres2>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_postgresql_replica_database_engine/configs/users.xml b/tests/integration/test_postgresql_replica_database_engine/configs/users.xml
index 1cdece49459..588ebd116c7 100644
--- a/tests/integration/test_postgresql_replica_database_engine/configs/users.xml
+++ b/tests/integration/test_postgresql_replica_database_engine/configs/users.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_experimental_database_materialized_postgresql>1</allow_experimental_database_materialized_postgresql>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_postgresql_replica_database_engine/test.py b/tests/integration/test_postgresql_replica_database_engine/test.py
index ed26ab82bc7..d3ce2295614 100644
--- a/tests/integration/test_postgresql_replica_database_engine/test.py
+++ b/tests/integration/test_postgresql_replica_database_engine/test.py
@@ -19,30 +19,45 @@ instance = cluster.add_instance('instance',
         with_postgres=True, stay_alive=True)
 
 postgres_table_template = """
-    CREATE TABLE IF NOT EXISTS {} (
+    CREATE TABLE IF NOT EXISTS "{}" (
     key Integer NOT NULL, value Integer, PRIMARY KEY(key))
     """
 postgres_table_template_2 = """
-    CREATE TABLE IF NOT EXISTS {} (
+    CREATE TABLE IF NOT EXISTS "{}" (
     key Integer NOT NULL, value1 Integer, value2 Integer, value3 Integer, PRIMARY KEY(key))
     """
 postgres_table_template_3 = """
-    CREATE TABLE IF NOT EXISTS {} (
+    CREATE TABLE IF NOT EXISTS "{}" (
     key1 Integer NOT NULL, value1 Integer, key2 Integer NOT NULL, value2 Integer NOT NULL)
     """
 
-def get_postgres_conn(ip, port, database=False, auto_commit=True, database_name='postgres_database'):
+def get_postgres_conn(ip, port, database=False, auto_commit=True, database_name='postgres_database', replication=False):
     if database == True:
         conn_string = "host={} port={} dbname='{}' user='postgres' password='mysecretpassword'".format(ip, port, database_name)
     else:
         conn_string = "host={} port={} user='postgres' password='mysecretpassword'".format(ip, port)
 
+    if replication:
+        conn_string += " replication='database'"
+
     conn = psycopg2.connect(conn_string)
     if auto_commit:
         conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)
         conn.autocommit = True
     return conn
 
+def create_replication_slot(conn, slot_name='user_slot'):
+    cursor = conn.cursor()
+    cursor.execute('CREATE_REPLICATION_SLOT {} LOGICAL pgoutput EXPORT_SNAPSHOT'.format(slot_name))
+    result = cursor.fetchall()
+    print(result[0][0]) # slot name
+    print(result[0][1]) # start lsn
+    print(result[0][2]) # snapshot
+    return result[0][2]
+
+def drop_replication_slot(conn, slot_name='user_slot'):
+    cursor = conn.cursor()
+    cursor.execute("select pg_drop_replication_slot('{}')".format(slot_name))
 
 def create_postgres_db(cursor, name='postgres_database'):
     cursor.execute("CREATE DATABASE {}".format(name))
@@ -62,7 +77,8 @@ def create_materialized_db(ip, port,
                            materialized_database='test_database',
                            postgres_database='postgres_database',
                            settings=[]):
-    create_query = "CREATE DATABASE {} ENGINE = MaterializedPostgreSQL('{}:{}', '{}', 'postgres', 'mysecretpassword')".format(materialized_database, ip, port, postgres_database)
+    instance.query(f"DROP DATABASE IF EXISTS {materialized_database}")
+    create_query = f"CREATE DATABASE {materialized_database} ENGINE = MaterializedPostgreSQL('{ip}:{port}', '{postgres_database}', 'postgres', 'mysecretpassword')"
     if len(settings) > 0:
         create_query += " SETTINGS "
         for i in range(len(settings)):
@@ -76,8 +92,11 @@ def drop_materialized_db(materialized_database='test_database'):
     instance.query('DROP DATABASE IF EXISTS {}'.format(materialized_database))
     assert materialized_database not in instance.query('SHOW DATABASES')
 
+def drop_postgres_table(cursor, table_name):
+    cursor.execute("""DROP TABLE IF EXISTS "{}" """.format(table_name))
+
 def create_postgres_table(cursor, table_name, replica_identity_full=False, template=postgres_table_template):
-    cursor.execute("DROP TABLE IF EXISTS {}".format(table_name))
+    drop_postgres_table(cursor, table_name)
     cursor.execute(template.format(table_name))
     if replica_identity_full:
         cursor.execute('ALTER TABLE {} REPLICA IDENTITY FULL;'.format(table_name))
@@ -113,6 +132,15 @@ def assert_nested_table_is_created(table_name, materialized_database='test_datab
     assert(table_name in database_tables)
 
 
+@pytest.mark.timeout(320)
+def assert_number_of_columns(expected, table_name, database_name='test_database'):
+    result = instance.query(f"select count() from system.columns where table = '{table_name}' and database = '{database_name}' and not startsWith(name, '_')")
+    while (int(result) != expected):
+        time.sleep(1)
+        result = instance.query(f"select count() from system.columns where table = '{table_name}' and database = '{database_name}' and not startsWith(name, '_')")
+
+
+@pytest.mark.timeout(320)
 def check_tables_are_synchronized(table_name, order_by='key', postgres_database='postgres_database', materialized_database='test_database'):
     assert_nested_table_is_created(table_name, materialized_database)
 
@@ -130,12 +158,10 @@ def check_tables_are_synchronized(table_name, order_by='key', postgres_database=
 def started_cluster():
     try:
         cluster.start()
-        conn = get_postgres_conn(ip=cluster.postgres_ip,
-                                 port=cluster.postgres_port)
+        conn = get_postgres_conn(ip=cluster.postgres_ip, port=cluster.postgres_port)
         cursor = conn.cursor()
         create_postgres_db(cursor, 'postgres_database')
-        create_clickhouse_postgres_db(ip=cluster.postgres_ip,
-                                      port=cluster.postgres_port)
+        create_clickhouse_postgres_db(ip=cluster.postgres_ip, port=cluster.postgres_port)
 
         instance.query("DROP DATABASE IF EXISTS test_database")
         yield cluster
@@ -257,7 +283,7 @@ def test_different_data_types(started_cluster):
 
     check_tables_are_synchronized('test_data_types', 'id');
     result = instance.query('SELECT * FROM test_database.test_data_types ORDER BY id LIMIT 1;')
-    assert(result == '0\t-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12.012345\t2000-05-12\t0.20000\t0.20000\n')
+    assert(result == '0\t-32768\t-2147483648\t-9223372036854775808\t1.12345\t1.123456789\t2147483647\t9223372036854775807\t2000-05-12 12:12:12.012345\t2000-05-12\t0.2\t0.2\n')
 
     for i in range(10):
         col = random.choice(['a', 'b', 'c'])
@@ -462,27 +488,30 @@ def test_table_schema_changes(started_cluster):
 
     expected = instance.query("SELECT key, value1, value3 FROM test_database.postgresql_replica_3 ORDER BY key");
 
-    altered_table = random.randint(0, 4)
-    cursor.execute("ALTER TABLE postgresql_replica_{} DROP COLUMN value2".format(altered_table))
+    altered_idx = random.randint(0, 4)
+    altered_table = f'postgresql_replica_{altered_idx}'
+    cursor.execute(f"ALTER TABLE {altered_table} DROP COLUMN value2")
 
     for i in range(NUM_TABLES):
-        cursor.execute("INSERT INTO postgresql_replica_{} VALUES (50, {}, {})".format(i, i, i))
-        cursor.execute("UPDATE postgresql_replica_{} SET value3 = 12 WHERE key%2=0".format(i))
+        cursor.execute(f"INSERT INTO postgresql_replica_{i} VALUES (50, {i}, {i})")
+        cursor.execute(f"UPDATE {altered_table} SET value3 = 12 WHERE key%2=0")
 
-    assert_nested_table_is_created('postgresql_replica_{}'.format(altered_table))
-    check_tables_are_synchronized('postgresql_replica_{}'.format(altered_table))
+    time.sleep(2)
+    assert_nested_table_is_created(altered_table)
+    assert_number_of_columns(3, altered_table)
+    check_tables_are_synchronized(altered_table)
     print('check1 OK')
 
     for i in range(NUM_TABLES):
         check_tables_are_synchronized('postgresql_replica_{}'.format(i));
 
     for i in range(NUM_TABLES):
-        if i != altered_table:
+        if i != altered_idx:
             instance.query("INSERT INTO postgres_database.postgresql_replica_{} SELECT 51 + number, {}, {}, {} from numbers(49)".format(i, i, i, i))
         else:
             instance.query("INSERT INTO postgres_database.postgresql_replica_{} SELECT 51 + number, {}, {} from numbers(49)".format(i, i, i))
 
-    check_tables_are_synchronized('postgresql_replica_{}'.format(altered_table));
+    check_tables_are_synchronized(altered_table);
     print('check2 OK')
     for i in range(NUM_TABLES):
         check_tables_are_synchronized('postgresql_replica_{}'.format(i));
@@ -628,6 +657,7 @@ def test_virtual_columns(started_cluster):
 
     cursor.execute("ALTER TABLE postgresql_replica_0 ADD COLUMN value2 integer")
     instance.query("INSERT INTO postgres_database.postgresql_replica_0 SELECT number, number, number from numbers(10, 10)")
+    assert_number_of_columns(3, 'postgresql_replica_0')
     check_tables_are_synchronized('postgresql_replica_0');
 
     result = instance.query('SELECT key, value, value2,  _sign, _version FROM test_database.postgresql_replica_0;')
@@ -922,6 +952,203 @@ def test_abrupt_server_restart_while_heavy_replication(started_cluster):
         cursor.execute('drop table if exists postgresql_replica_{};'.format(i))
 
 
+def test_quoting(started_cluster):
+    table_name = 'user'
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip,
+                             port=started_cluster.postgres_port,
+                             database=True)
+    cursor = conn.cursor()
+    create_postgres_table(cursor, table_name);
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(50)".format(table_name))
+    create_materialized_db(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port)
+    check_tables_are_synchronized(table_name);
+    drop_postgres_table(cursor, table_name)
+    drop_materialized_db()
+
+
+def test_user_managed_slots(started_cluster):
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip,
+                             port=started_cluster.postgres_port,
+                             database=True)
+    cursor = conn.cursor()
+    table_name = 'test_table'
+    create_postgres_table(cursor, table_name);
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+
+    slot_name = 'user_slot'
+    replication_connection = get_postgres_conn(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port,
+                                               database=True, replication=True, auto_commit=True)
+    snapshot = create_replication_slot(replication_connection, slot_name=slot_name)
+    create_materialized_db(ip=started_cluster.postgres_ip,
+                           port=started_cluster.postgres_port,
+                           settings=["materialized_postgresql_replication_slot = '{}'".format(slot_name),
+                                     "materialized_postgresql_snapshot = '{}'".format(snapshot)])
+    check_tables_are_synchronized(table_name);
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000, 10000)".format(table_name))
+    check_tables_are_synchronized(table_name);
+    instance.restart_clickhouse()
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(20000, 10000)".format(table_name))
+    check_tables_are_synchronized(table_name);
+    drop_postgres_table(cursor, table_name)
+    drop_materialized_db()
+    drop_replication_slot(replication_connection, slot_name)
+    cursor.execute('DROP TABLE IF EXISTS test_table')
+
+
+def test_add_new_table_to_replication(started_cluster):
+    drop_materialized_db()
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip,
+                             port=started_cluster.postgres_port,
+                             database=True)
+    cursor = conn.cursor()
+    NUM_TABLES = 5
+
+    for i in range(NUM_TABLES):
+        create_postgres_table(cursor, 'postgresql_replica_{}'.format(i));
+        instance.query("INSERT INTO postgres_database.postgresql_replica_{} SELECT number, {} from numbers(10000)".format(i, i))
+
+    create_materialized_db(ip=started_cluster.postgres_ip,
+                           port=started_cluster.postgres_port)
+
+    for i in range(NUM_TABLES):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\n")
+
+    table_name = 'postgresql_replica_5'
+    create_postgres_table(cursor, table_name)
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(") # Check without ip
+    assert(result[-59:] == "\\'postgres_database\\', \\'postgres\\', \\'mysecretpassword\\')\n")
+
+    result = instance.query_and_get_error("ALTER DATABASE test_database MODIFY SETTING materialized_postgresql_tables_list='tabl1'")
+    assert('Changing setting `materialized_postgresql_tables_list` is not allowed' in result)
+
+    result = instance.query_and_get_error("ALTER DATABASE test_database MODIFY SETTING materialized_postgresql_tables='tabl1'")
+    assert('Database engine MaterializedPostgreSQL does not support setting' in result)
+
+    instance.query("ATTACH TABLE test_database.{}".format(table_name));
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\npostgresql_replica_5\n")
+
+    check_tables_are_synchronized(table_name);
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000, 10000)".format(table_name))
+    check_tables_are_synchronized(table_name);
+
+    result = instance.query_and_get_error("ATTACH TABLE test_database.{}".format(table_name));
+    assert('Table test_database.postgresql_replica_5 already exists' in result)
+
+    result = instance.query_and_get_error("ATTACH TABLE test_database.unknown_table");
+    assert('PostgreSQL table unknown_table does not exist' in result)
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-180:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4,postgresql_replica_5\\'\n")
+
+    table_name = 'postgresql_replica_6'
+    create_postgres_table(cursor, table_name)
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+    instance.query("ATTACH TABLE test_database.{}".format(table_name));
+
+    instance.restart_clickhouse()
+
+    table_name = 'postgresql_replica_7'
+    create_postgres_table(cursor, table_name)
+    instance.query("INSERT INTO postgres_database.{} SELECT number, number from numbers(10000)".format(table_name))
+    instance.query("ATTACH TABLE test_database.{}".format(table_name));
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-222:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4,postgresql_replica_5,postgresql_replica_6,postgresql_replica_7\\'\n")
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\npostgresql_replica_5\npostgresql_replica_6\npostgresql_replica_7\n")
+
+    for i in range(NUM_TABLES + 3):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    for i in range(NUM_TABLES + 3):
+        cursor.execute('drop table if exists postgresql_replica_{};'.format(i))
+
+
+def test_remove_table_from_replication(started_cluster):
+    drop_materialized_db()
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip,
+                             port=started_cluster.postgres_port,
+                             database=True)
+    cursor = conn.cursor()
+    NUM_TABLES = 5
+
+    for i in range(NUM_TABLES):
+        create_postgres_table(cursor, 'postgresql_replica_{}'.format(i));
+        instance.query("INSERT INTO postgres_database.postgresql_replica_{} SELECT number, {} from numbers(10000)".format(i, i))
+
+    create_materialized_db(ip=started_cluster.postgres_ip,
+                           port=started_cluster.postgres_port)
+
+    for i in range(NUM_TABLES):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\npostgresql_replica_4\n")
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-59:] == "\\'postgres_database\\', \\'postgres\\', \\'mysecretpassword\\')\n")
+
+    table_name = 'postgresql_replica_4'
+    instance.query('DETACH TABLE test_database.{}'.format(table_name));
+    result = instance.query_and_get_error('SELECT * FROM test_database.{}'.format(table_name))
+    assert("doesn't exist" in result)
+
+    result = instance.query("SHOW TABLES FROM test_database")
+    assert(result == "postgresql_replica_0\npostgresql_replica_1\npostgresql_replica_2\npostgresql_replica_3\n")
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-138:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3\\'\n")
+
+    instance.query('ATTACH TABLE test_database.{}'.format(table_name));
+    check_tables_are_synchronized(table_name);
+
+    for i in range(NUM_TABLES):
+        table_name = 'postgresql_replica_{}'.format(i)
+        check_tables_are_synchronized(table_name);
+
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-159:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_1,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4\\'\n")
+
+    table_name = 'postgresql_replica_1'
+    instance.query('DETACH TABLE test_database.{}'.format(table_name));
+    result = instance.query('SHOW CREATE DATABASE test_database')
+    assert(result[:63] == "CREATE DATABASE test_database\\nENGINE = MaterializedPostgreSQL(")
+    assert(result[-138:] == ")\\nSETTINGS materialized_postgresql_tables_list = \\'postgresql_replica_0,postgresql_replica_2,postgresql_replica_3,postgresql_replica_4\\'\n")
+
+    for i in range(NUM_TABLES):
+        cursor.execute('drop table if exists postgresql_replica_{};'.format(i))
+
+
+def test_predefined_connection_configuration(started_cluster):
+    drop_materialized_db()
+    conn = get_postgres_conn(ip=started_cluster.postgres_ip, port=started_cluster.postgres_port, database=True)
+    cursor = conn.cursor()
+    cursor.execute(f'DROP TABLE IF EXISTS test_table')
+    cursor.execute(f'CREATE TABLE test_table (key integer PRIMARY KEY, value integer)')
+
+    instance.query("CREATE DATABASE test_database ENGINE = MaterializedPostgreSQL(postgres1)")
+    check_tables_are_synchronized("test_table");
+    drop_materialized_db()
+    cursor.execute('DROP TABLE IF EXISTS test_table')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_profile_events_s3/configs/config.d/storage_conf.xml b/tests/integration/test_profile_events_s3/configs/config.d/storage_conf.xml
index b32770095fc..94ac83b32ac 100644
--- a/tests/integration/test_profile_events_s3/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_profile_events_s3/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -18,4 +18,4 @@
             </s3>
         </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_profile_events_s3/configs/config.xml b/tests/integration/test_profile_events_s3/configs/config.xml
index b83cbbac0a7..665e85dfe2f 100644
--- a/tests/integration/test_profile_events_s3/configs/config.xml
+++ b/tests/integration/test_profile_events_s3/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -32,4 +32,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_profile_events_s3/configs/log.xml b/tests/integration/test_profile_events_s3/configs/log.xml
index 0346e43c81d..c58040559d8 100644
--- a/tests/integration/test_profile_events_s3/configs/log.xml
+++ b/tests/integration/test_profile_events_s3/configs/log.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -7,4 +7,4 @@
         <size>1000M</size>
         <count>10</count>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_profile_events_s3/configs/query_log.xml b/tests/integration/test_profile_events_s3/configs/query_log.xml
index afcc8ba5c67..33da9cd1586 100644
--- a/tests/integration/test_profile_events_s3/configs/query_log.xml
+++ b/tests/integration/test_profile_events_s3/configs/query_log.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <query_log>
         <database>system</database>
         <table>query_log</table>
         <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>1000</flush_interval_milliseconds>
     </query_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_profile_events_s3/configs/ssl_conf.xml b/tests/integration/test_profile_events_s3/configs/ssl_conf.xml
index 95cdc918bd0..1200dc8c94b 100644
--- a/tests/integration/test_profile_events_s3/configs/ssl_conf.xml
+++ b/tests/integration/test_profile_events_s3/configs/ssl_conf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_profile_events_s3/configs/users.xml b/tests/integration/test_profile_events_s3/configs/users.xml
index 95c83bf3dfe..4b08a2dc4a4 100644
--- a/tests/integration/test_profile_events_s3/configs/users.xml
+++ b/tests/integration/test_profile_events_s3/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -21,4 +21,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_prometheus_endpoint/configs/prom_conf.xml b/tests/integration/test_prometheus_endpoint/configs/prom_conf.xml
index 6e31324eac2..dde4d3d41c6 100644
--- a/tests/integration/test_prometheus_endpoint/configs/prom_conf.xml
+++ b/tests/integration/test_prometheus_endpoint/configs/prom_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <http_port>8123</http_port>
     <tcp_port>9000</tcp_port>
 
@@ -10,4 +10,4 @@
         <events>true</events>
         <asynchronous_metrics>true</asynchronous_metrics>
     </prometheus>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_query_deduplication/configs/deduplication_settings.xml b/tests/integration/test_query_deduplication/configs/deduplication_settings.xml
index 8369c916848..6552fd68468 100644
--- a/tests/integration/test_query_deduplication/configs/deduplication_settings.xml
+++ b/tests/integration/test_query_deduplication/configs/deduplication_settings.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <assign_part_uuids>1</assign_part_uuids>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_query_deduplication/configs/profiles.xml b/tests/integration/test_query_deduplication/configs/profiles.xml
index 4c15556ab99..d0dc0943202 100644
--- a/tests/integration/test_query_deduplication/configs/profiles.xml
+++ b/tests/integration/test_query_deduplication/configs/profiles.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <experimental_query_deduplication_send_all_part_uuids>1</experimental_query_deduplication_send_all_part_uuids>
         </default>
     </profiles>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_query_deduplication/configs/remote_servers.xml b/tests/integration/test_query_deduplication/configs/remote_servers.xml
index f12558ca529..0caa824c3a1 100644
--- a/tests/integration/test_query_deduplication/configs/remote_servers.xml
+++ b/tests/integration/test_query_deduplication/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -21,4 +21,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quorum_inserts/configs/config.d/remote_servers.xml b/tests/integration/test_quorum_inserts/configs/config.d/remote_servers.xml
index b1cd417f8b9..9b628f87711 100644
--- a/tests/integration/test_quorum_inserts/configs/config.d/remote_servers.xml
+++ b/tests/integration/test_quorum_inserts/configs/config.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 <remote_servers>
     <cluster>
         <shard>
@@ -17,4 +17,4 @@
         </shard>
     </cluster>
 </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quorum_inserts/configs/users.d/settings.xml b/tests/integration/test_quorum_inserts/configs/users.d/settings.xml
index 62d0d1ec39d..234e90689dc 100644
--- a/tests/integration/test_quorum_inserts/configs/users.d/settings.xml
+++ b/tests/integration/test_quorum_inserts/configs/users.d/settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -9,4 +9,4 @@
             <select_sequential_consistency>1</select_sequential_consistency>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/configs/users.d/assign_myquota_to_default_user.xml b/tests/integration/test_quota/configs/users.d/assign_myquota_to_default_user.xml
index 8b98ade8aeb..a91aebf4727 100644
--- a/tests/integration/test_quota/configs/users.d/assign_myquota_to_default_user.xml
+++ b/tests/integration/test_quota/configs/users.d/assign_myquota_to_default_user.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <users>
         <default>
             <quota>myQuota</quota>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/configs/users.d/drop_default_quota.xml b/tests/integration/test_quota/configs/users.d/drop_default_quota.xml
index 5f53ecf5f49..057be493fd3 100644
--- a/tests/integration/test_quota/configs/users.d/drop_default_quota.xml
+++ b/tests/integration/test_quota/configs/users.d/drop_default_quota.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <quotas>
         <default remove="1"/>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/configs/users.d/user_with_no_quota.xml b/tests/integration/test_quota/configs/users.d/user_with_no_quota.xml
index 70f51cfff43..fa671e12b73 100644
--- a/tests/integration/test_quota/configs/users.d/user_with_no_quota.xml
+++ b/tests/integration/test_quota/configs/users.d/user_with_no_quota.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
         <user_with_no_quota>
             <no_password/>
@@ -7,4 +7,4 @@
             </networks>
         </user_with_no_quota>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/no_quotas.xml b/tests/integration/test_quota/no_quotas.xml
index 9aba4ac0914..fddc67fc3f9 100644
--- a/tests/integration/test_quota/no_quotas.xml
+++ b/tests/integration/test_quota/no_quotas.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<yandex>
-</yandex>
+<clickhouse>
+</clickhouse>
diff --git a/tests/integration/test_quota/normal_limits.xml b/tests/integration/test_quota/normal_limits.xml
index e32043ef5ec..b91320d57ba 100644
--- a/tests/integration/test_quota/normal_limits.xml
+++ b/tests/integration/test_quota/normal_limits.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <quotas>
         <myQuota>
             <interval>
@@ -16,4 +16,4 @@
             </interval>
         </myQuota>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/simpliest.xml b/tests/integration/test_quota/simpliest.xml
index 6d51d68d8d9..2095457eba2 100644
--- a/tests/integration/test_quota/simpliest.xml
+++ b/tests/integration/test_quota/simpliest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <quotas>
         <myQuota>
         </myQuota>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/test.py b/tests/integration/test_quota/test.py
index 5f43d581178..4149987996b 100644
--- a/tests/integration/test_quota/test.py
+++ b/tests/integration/test_quota/test.py
@@ -399,9 +399,9 @@ def test_consumption_of_show_tables():
         instance.query("SHOW QUOTA"))
 
 def test_consumption_of_show_databases():
-    assert instance.query("SHOW DATABASES") == "default\nsystem\n"
+    assert instance.query("SHOW DATABASES") == "INFORMATION_SCHEMA\ndefault\ninformation_schema\nsystem\n"
     assert re.match(
-        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t2\\t\\\\N.*",
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t500\\t0\\t500\\t0\\t\\\\N\\t4\\t\\\\N.*",
         instance.query("SHOW QUOTA"))
 
 def test_consumption_of_show_clusters():
diff --git a/tests/integration/test_quota/tiny_limits.xml b/tests/integration/test_quota/tiny_limits.xml
index 4797c360ddd..2dd50eba5b7 100644
--- a/tests/integration/test_quota/tiny_limits.xml
+++ b/tests/integration/test_quota/tiny_limits.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <quotas>
         <myQuota>
             <interval>
@@ -16,4 +16,4 @@
             </interval>
         </myQuota>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/tracking.xml b/tests/integration/test_quota/tracking.xml
index c5e7c993edc..f0fc55f5589 100644
--- a/tests/integration/test_quota/tracking.xml
+++ b/tests/integration/test_quota/tracking.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <quotas>
         <myQuota>
             <interval>
@@ -16,4 +16,4 @@
             </interval>
         </myQuota>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/two_intervals.xml b/tests/integration/test_quota/two_intervals.xml
index d0de605b895..8362413f4d8 100644
--- a/tests/integration/test_quota/two_intervals.xml
+++ b/tests/integration/test_quota/two_intervals.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <quotas>
         <myQuota>
             <interval>
@@ -17,4 +17,4 @@
             </interval2>
         </myQuota>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_quota/two_quotas.xml b/tests/integration/test_quota/two_quotas.xml
index c08cc82aca7..1da0f5831b7 100644
--- a/tests/integration/test_quota/two_quotas.xml
+++ b/tests/integration/test_quota/two_quotas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
    <quotas>
         <myQuota>
             <interval>
@@ -26,4 +26,4 @@
             </interval2>
         </myQuota2>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_random_inserts/configs/conf.d/merge_tree.xml b/tests/integration/test_random_inserts/configs/conf.d/merge_tree.xml
index 02efd126b77..b71482bc870 100644
--- a/tests/integration/test_random_inserts/configs/conf.d/merge_tree.xml
+++ b/tests/integration/test_random_inserts/configs/conf.d/merge_tree.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <replicated_deduplication_window>999999999</replicated_deduplication_window>
         <replicated_deduplication_window_seconds>999999999</replicated_deduplication_window_seconds>
         <cleanup_delay_period>10</cleanup_delay_period>
         <old_parts_lifetime>1</old_parts_lifetime>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_random_inserts/configs/conf.d/remote_servers.xml b/tests/integration/test_random_inserts/configs/conf.d/remote_servers.xml
index 64239dfdb6c..ea4769f55e1 100644
--- a/tests/integration/test_random_inserts/configs/conf.d/remote_servers.xml
+++ b/tests/integration/test_random_inserts/configs/conf.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -14,4 +14,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_read_temporary_tables_on_failure/test.py b/tests/integration/test_read_temporary_tables_on_failure/test.py
index e62c7c9eaec..ae59fb31641 100644
--- a/tests/integration/test_read_temporary_tables_on_failure/test.py
+++ b/tests/integration/test_read_temporary_tables_on_failure/test.py
@@ -24,3 +24,4 @@ def test_different_versions(start_cluster):
         node.query("SELECT 1", settings={'max_concurrent_queries_for_user': 1})
     assert node.contains_in_log('Too many simultaneous queries for user')
     assert not node.contains_in_log('Unknown packet')
+    assert not node.contains_in_log('Unexpected packet')
diff --git a/tests/integration/test_recompression_ttl/configs/background_pool_config.xml b/tests/integration/test_recompression_ttl/configs/background_pool_config.xml
index e62a0105907..74038c5472f 100644
--- a/tests/integration/test_recompression_ttl/configs/background_pool_config.xml
+++ b/tests/integration/test_recompression_ttl/configs/background_pool_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <background_processing_pool_thread_sleep_seconds>1</background_processing_pool_thread_sleep_seconds>
     <background_processing_pool_thread_sleep_seconds_random_part>0</background_processing_pool_thread_sleep_seconds_random_part>
     <background_processing_pool_thread_sleep_seconds_if_nothing_to_do>0.0</background_processing_pool_thread_sleep_seconds_if_nothing_to_do>
@@ -6,4 +6,4 @@
     <background_processing_pool_task_sleep_seconds_when_no_work_max>1</background_processing_pool_task_sleep_seconds_when_no_work_max>
     <background_processing_pool_task_sleep_seconds_when_no_work_multiplier>1</background_processing_pool_task_sleep_seconds_when_no_work_multiplier>
     <background_processing_pool_task_sleep_seconds_when_no_work_random_part>0</background_processing_pool_task_sleep_seconds_when_no_work_random_part>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_redirect_url_storage/configs/named_collections.xml b/tests/integration/test_redirect_url_storage/configs/named_collections.xml
new file mode 100644
index 00000000000..fde247989f8
--- /dev/null
+++ b/tests/integration/test_redirect_url_storage/configs/named_collections.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <named_collections>
+        <url1>
+            <headers>
+                <header>
+                    <name>Range</name>
+                    <value>bytes=0-1</value>
+                </header>
+                <header>
+                    <name>Access-Control-Request-Method</name>
+                    <value>PUT</value>
+                </header>
+            </headers>
+        </url1>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_redirect_url_storage/test.py b/tests/integration/test_redirect_url_storage/test.py
index c99e5182c91..d3808cd890d 100644
--- a/tests/integration/test_redirect_url_storage/test.py
+++ b/tests/integration/test_redirect_url_storage/test.py
@@ -2,7 +2,7 @@ import pytest
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', with_zookeeper=False, with_hdfs=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/named_collections.xml'], with_zookeeper=False, with_hdfs=True)
 
 
 @pytest.fixture(scope="module")
@@ -54,7 +54,7 @@ def test_url_with_globs_and_failover(started_cluster):
 
     result = node1.query(
         "select * from url('http://hdfs1:50075/webhdfs/v1/simple_storage_{0|1|2|3}_{1..3}?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'TSV', 'data String') as data order by data")
-    assert result == "1\n2\n3\n"
+    assert result == "1\n2\n3\n" or result == "4\n5\n6\n"
 
 
 def test_url_with_redirect_not_allowed(started_cluster):
@@ -81,3 +81,17 @@ def test_url_with_redirect_allowed(started_cluster):
     node1.query(
         "create table WebHDFSStorageWithRedirect (id UInt32, name String, weight Float64) ENGINE = URL('http://hdfs1:50070/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'TSV')")
     assert node1.query("SET max_http_get_redirects=1; select * from WebHDFSStorageWithRedirect") == "1\tMark\t72.53\n"
+    node1.query("drop table WebHDFSStorageWithRedirect")
+
+def test_predefined_connection_configuration(started_cluster):
+    hdfs_api = started_cluster.hdfs_api
+
+    hdfs_api.write_data("/simple_storage", "1\tMark\t72.53\n")
+    assert hdfs_api.read_data("/simple_storage") == "1\tMark\t72.53\n"
+
+    node1.query(
+        "create table WebHDFSStorageWithRedirect (id UInt32, name String, weight Float64) ENGINE = URL(url1, url='http://hdfs1:50070/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', format='TSV')")
+    assert node1.query("SET max_http_get_redirects=1; select * from WebHDFSStorageWithRedirect") == "1\tMark\t72.53\n"
+    result = node1.query("SET max_http_get_redirects=1; select * from url(url1, url='http://hdfs1:50070/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', format='TSV', structure='id UInt32, name String, weight Float64')")
+    assert(result == "1\tMark\t72.53\n")
+    node1.query("drop table WebHDFSStorageWithRedirect")
diff --git a/tests/integration/test_relative_filepath/configs/config.xml b/tests/integration/test_relative_filepath/configs/config.xml
index dbc339c4741..19fb49fed3f 100644
--- a/tests/integration/test_relative_filepath/configs/config.xml
+++ b/tests/integration/test_relative_filepath/configs/config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <user_files_path>user_files</user_files_path>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml b/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml
index b5e5495c096..98f07de912d 100644
--- a/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml
+++ b/tests/integration/test_reload_auxiliary_zookeepers/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -28,4 +28,4 @@
 
     <max_table_size_to_drop>1</max_table_size_to_drop>
     <max_partition_size_to_drop>1</max_partition_size_to_drop>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml b/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml
+++ b/tests/integration/test_reload_auxiliary_zookeepers/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_auxiliary_zookeepers/test.py b/tests/integration/test_reload_auxiliary_zookeepers/test.py
index e01331269d0..a52f21b5e02 100644
--- a/tests/integration/test_reload_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_reload_auxiliary_zookeepers/test.py
@@ -31,7 +31,7 @@ def test_reload_auxiliary_zookeepers(start_cluster):
     )
 
     # Add an auxiliary zookeeper
-    new_config = """<yandex>
+    new_config = """<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -59,7 +59,7 @@ def test_reload_auxiliary_zookeepers(start_cluster):
             </node>
         </zookeeper2>
     </auxiliary_zookeepers>
-</yandex>"""
+</clickhouse>"""
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper_config.xml", new_config)
 
     node.query("SYSTEM RELOAD CONFIG")
@@ -72,7 +72,7 @@ def test_reload_auxiliary_zookeepers(start_cluster):
     node.query("ALTER TABLE simple2 ATTACH PARTITION '2020-08-27';")
     assert node.query("SELECT id FROM simple2").strip() == "1"
 
-    new_config = """<yandex>
+    new_config = """<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo2</host>
@@ -80,7 +80,7 @@ def test_reload_auxiliary_zookeepers(start_cluster):
         </node>
         <session_timeout_ms>2000</session_timeout_ms>
     </zookeeper>
-</yandex>"""
+</clickhouse>"""
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper_config.xml", new_config)
     node.query("SYSTEM RELOAD CONFIG")
     time.sleep(5)
diff --git a/tests/integration/test_reload_clusters_config/configs/remote_servers.xml b/tests/integration/test_reload_clusters_config/configs/remote_servers.xml
index b827fce02be..a471b8d7732 100644
--- a/tests/integration/test_reload_clusters_config/configs/remote_servers.xml
+++ b/tests/integration/test_reload_clusters_config/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -27,4 +27,4 @@
             </shard>
         </test_cluster2>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_clusters_config/test.py b/tests/integration/test_reload_clusters_config/test.py
index f1fb0d820d4..048b704034b 100644
--- a/tests/integration/test_reload_clusters_config/test.py
+++ b/tests/integration/test_reload_clusters_config/test.py
@@ -36,7 +36,7 @@ def started_cluster():
 
 
 base_config = '''
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -65,11 +65,11 @@ base_config = '''
             </shard>
         </test_cluster2>
     </remote_servers>
-</yandex>
+</clickhouse>
 '''
 
 test_config1 = '''
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -94,11 +94,11 @@ test_config1 = '''
             </shard>
         </test_cluster2>
     </remote_servers>
-</yandex>
+</clickhouse>
 '''
 
 test_config2 = '''
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -114,11 +114,11 @@ test_config2 = '''
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
 '''
 
 test_config3 = '''
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -156,7 +156,7 @@ test_config3 = '''
             </shard>
         </test_cluster3>
     </remote_servers>
-</yandex>
+</clickhouse>
 '''
 
 
diff --git a/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml b/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml
index b5e5495c096..98f07de912d 100644
--- a/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml
+++ b/tests/integration/test_reload_max_table_size_to_drop/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -28,4 +28,4 @@
 
     <max_table_size_to_drop>1</max_table_size_to_drop>
     <max_partition_size_to_drop>1</max_partition_size_to_drop>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml b/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml
index 03d5e33646f..34849e1187a 100644
--- a/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml
+++ b/tests/integration/test_reload_max_table_size_to_drop/configs/max_table_size_to_drop.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <max_table_size_to_drop>1</max_table_size_to_drop>
     <max_partition_size_to_drop>1</max_partition_size_to_drop>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml b/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml
+++ b/tests/integration/test_reload_max_table_size_to_drop/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_zookeeper/configs/config.xml b/tests/integration/test_reload_zookeeper/configs/config.xml
index b5e5495c096..98f07de912d 100644
--- a/tests/integration/test_reload_zookeeper/configs/config.xml
+++ b/tests/integration/test_reload_zookeeper/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -28,4 +28,4 @@
 
     <max_table_size_to_drop>1</max_table_size_to_drop>
     <max_partition_size_to_drop>1</max_partition_size_to_drop>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_zookeeper/configs/users.xml b/tests/integration/test_reload_zookeeper/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_reload_zookeeper/configs/users.xml
+++ b/tests/integration/test_reload_zookeeper/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reload_zookeeper/configs/zookeeper.xml b/tests/integration/test_reload_zookeeper/configs/zookeeper.xml
index 0cbf9d8e156..87b991f3ab3 100644
--- a/tests/integration/test_reload_zookeeper/configs/zookeeper.xml
+++ b/tests/integration/test_reload_zookeeper/configs/zookeeper.xml
@@ -1,5 +1,5 @@
 
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -15,5 +15,5 @@
         </node>
         <session_timeout_ms>20000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
     
\ No newline at end of file
diff --git a/tests/integration/test_reload_zookeeper/test.py b/tests/integration/test_reload_zookeeper/test.py
index 1fe0ab13a7f..73ef42a86f6 100644
--- a/tests/integration/test_reload_zookeeper/test.py
+++ b/tests/integration/test_reload_zookeeper/test.py
@@ -46,7 +46,7 @@ def test_reload_zookeeper(start_cluster):
 
     ## remove zoo2, zoo3 from configs
     new_config = """
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -54,7 +54,7 @@ def test_reload_zookeeper(start_cluster):
         </node>
         <session_timeout_ms>2000</session_timeout_ms>
     </zookeeper>
-</yandex >
+</clickhouse>
 """
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
     node.query("SYSTEM RELOAD CONFIG")
@@ -79,7 +79,7 @@ def test_reload_zookeeper(start_cluster):
 
     ## set config to zoo2, server will be normal
     new_config = """
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo2</host>
@@ -87,7 +87,7 @@ def test_reload_zookeeper(start_cluster):
         </node>
         <session_timeout_ms>2000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
 """
     node.replace_config("/etc/clickhouse-server/conf.d/zookeeper.xml", new_config)
     node.query("SYSTEM RELOAD CONFIG")
diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml
index 382c2b2dc20..9692bebf0eb 100644
--- a/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml
+++ b/tests/integration/test_reloading_settings_from_users_xml/configs/changed_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles replace="replace">
         <default>
             <max_memory_usage>20000000000</max_memory_usage>
             <load_balancing>nearest_hostname</load_balancing>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml
index 85d1c26659f..0b82d51bdaf 100644
--- a/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml
+++ b/tests/integration/test_reloading_settings_from_users_xml/configs/normal_settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles replace="replace">
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
             <load_balancing>first_or_random</load_balancing>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml
index ff2b40583de..6c80c344af5 100644
--- a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml
+++ b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_enum.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles replace="replace">
         <default>
             <max_memory_usage>20000000000</max_memory_usage>
             <load_balancing>a</load_balancing>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml
index 4ef15ed3680..77947f5eb95 100644
--- a/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml
+++ b/tests/integration/test_reloading_settings_from_users_xml/configs/unexpected_setting_int.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles replace="replace">
         <default>
             <max_memory_usage>a</max_memory_usage>
             <load_balancing>nearest_hostname</load_balancing>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml b/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml
index 9bac09aef18..97190ad1e04 100644
--- a/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml
+++ b/tests/integration/test_reloading_settings_from_users_xml/configs/unknown_setting.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles replace="replace">
         <default>
             <xyz>8</xyz>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_storage_configuration/configs/config.d/cluster.xml b/tests/integration/test_reloading_storage_configuration/configs/config.d/cluster.xml
index ec7c9b8e4f8..0a790d9b5c6 100644
--- a/tests/integration/test_reloading_storage_configuration/configs/config.d/cluster.xml
+++ b/tests/integration/test_reloading_storage_configuration/configs/config.d/cluster.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_reloading_storage_configuration/configs/config.d/storage_configuration.xml b/tests/integration/test_reloading_storage_configuration/configs/config.d/storage_configuration.xml
index 9abbdd26650..156db755d4f 100644
--- a/tests/integration/test_reloading_storage_configuration/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_reloading_storage_configuration/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -110,4 +110,4 @@
 
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_storage_configuration/configs/logs_config.xml b/tests/integration/test_reloading_storage_configuration/configs/logs_config.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/integration/test_reloading_storage_configuration/configs/logs_config.xml
+++ b/tests/integration/test_reloading_storage_configuration/configs/logs_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_reloading_storage_configuration/test.py b/tests/integration/test_reloading_storage_configuration/test.py
index 7fa37d0909c..e9fba6012f7 100644
--- a/tests/integration/test_reloading_storage_configuration/test.py
+++ b/tests/integration/test_reloading_storage_configuration/test.py
@@ -66,7 +66,7 @@ def add_disk(node, name, path, separate_file=False):
             tree = ET.parse(os.path.join(node.config_d_dir, "storage_configuration.xml"))
     except:
         tree = ET.ElementTree(
-            ET.fromstring('<yandex><storage_configuration><disks/><policies/></storage_configuration></yandex>'))
+            ET.fromstring('<clickhouse><storage_configuration><disks/><policies/></storage_configuration></clickhouse>'))
     root = tree.getroot()
     new_disk = ET.Element(name)
     new_path = ET.Element("path")
@@ -90,7 +90,7 @@ def update_disk(node, name, path, keep_free_space_bytes, separate_file=False):
                 os.path.join(node.config_d_dir, "storage_configuration.xml"))
     except:
         tree = ET.ElementTree(
-            ET.fromstring('<yandex><storage_configuration><disks/><policies/></storage_configuration></yandex>'))
+            ET.fromstring('<clickhouse><storage_configuration><disks/><policies/></storage_configuration></clickhouse>'))
 
     root = tree.getroot()
     disk = root.find("storage_configuration").find("disks").find(name)
diff --git a/tests/integration/test_rename_column/configs/config.d/instant_moves.xml b/tests/integration/test_rename_column/configs/config.d/instant_moves.xml
index 7b68c6946ca..8f63b72b2e8 100644
--- a/tests/integration/test_rename_column/configs/config.d/instant_moves.xml
+++ b/tests/integration/test_rename_column/configs/config.d/instant_moves.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <background_move_processing_pool_thread_sleep_seconds>0.5</background_move_processing_pool_thread_sleep_seconds>
     <background_move_processing_pool_task_sleep_seconds_when_no_work_max>0.5</background_move_processing_pool_task_sleep_seconds_when_no_work_max>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_rename_column/configs/config.d/part_log.xml b/tests/integration/test_rename_column/configs/config.d/part_log.xml
index 53ea0a8fc13..fadfab126fc 100644
--- a/tests/integration/test_rename_column/configs/config.d/part_log.xml
+++ b/tests/integration/test_rename_column/configs/config.d/part_log.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <part_log>
         <database>system</database>
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_rename_column/configs/config.d/storage_configuration.xml b/tests/integration/test_rename_column/configs/config.d/storage_configuration.xml
index f1b92ab32a6..da297e40037 100644
--- a/tests/integration/test_rename_column/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_rename_column/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -29,4 +29,4 @@
     <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
 </merge_tree>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_rename_column/configs/config.d/zookeeper_session_timeout.xml b/tests/integration/test_rename_column/configs/config.d/zookeeper_session_timeout.xml
index caa0ff11137..d0ab2994d3a 100644
--- a/tests/integration/test_rename_column/configs/config.d/zookeeper_session_timeout.xml
+++ b/tests/integration/test_rename_column/configs/config.d/zookeeper_session_timeout.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <!-- Required for correct timing in current test case -->
         <session_timeout_ms replace="1">15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_rename_column/configs/remote_servers.xml b/tests/integration/test_rename_column/configs/remote_servers.xml
index 4c3de4b3905..791af83a2d6 100644
--- a/tests/integration/test_rename_column/configs/remote_servers.xml
+++ b/tests/integration/test_rename_column/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -25,4 +25,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_rename_column/test.py b/tests/integration/test_rename_column/test.py
index e3e776a0791..7269ee73d8e 100644
--- a/tests/integration/test_rename_column/test.py
+++ b/tests/integration/test_rename_column/test.py
@@ -379,68 +379,6 @@ def test_rename_with_parallel_slow_insert(started_cluster):
         drop_table(nodes, table_name)
 
 
-def test_rename_with_parallel_slow_select(started_cluster):
-    table_name = "test_rename_with_parallel_slow_select"
-    drop_table(nodes, table_name)
-    try:
-        create_table(nodes, table_name)
-        insert(node1, table_name, 1000)
-
-        p = Pool(15)
-        tasks = []
-
-        tasks.append(p.apply_async(select, (node1, table_name, "num2", "999\n", 1, True, True)))
-        time.sleep(0.5)
-        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2")))
-
-        for task in tasks:
-            task.get(timeout=240)
-
-        insert(node1, table_name, 100, ["num", "foo2"])
-
-        # rename column back to original
-        rename_column(node1, table_name, "foo2", "num2")
-
-        # check that select still works
-        select(node1, table_name, "num2", "1099\n")
-        select(node2, table_name, "num2", "1099\n", poll=30)
-        select(node3, table_name, "num2", "1099\n", poll=30)
-    finally:
-        drop_table(nodes, table_name)
-
-
-def test_rename_with_parallel_moves(started_cluster):
-    table_name = "test_rename_with_parallel_moves"
-    drop_table(nodes, table_name)
-    try:
-        create_table(nodes, table_name, with_storage_policy=True)
-        insert(node1, table_name, 1000)
-
-        p = Pool(15)
-        tasks = []
-
-        tasks.append(p.apply_async(alter_move, (node1, table_name, 20, True)))
-        tasks.append(p.apply_async(alter_move, (node2, table_name, 20, True)))
-        tasks.append(p.apply_async(alter_move, (node3, table_name, 20, True)))
-        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2", 20, True)))
-        tasks.append(p.apply_async(rename_column, (node2, table_name, "foo2", "foo3", 20, True)))
-        tasks.append(p.apply_async(rename_column, (node3, table_name, "num3", "num2", 20, True)))
-
-        for task in tasks:
-            task.get(timeout=240)
-
-        # rename column back to original
-        rename_column(node1, table_name, "foo2", "num2", 1, True)
-        rename_column(node1, table_name, "foo3", "num2", 1, True)
-
-        # check that select still works
-        select(node1, table_name, "num2", "999\n")
-        select(node2, table_name, "num2", "999\n", poll=30)
-        select(node3, table_name, "num2", "999\n", poll=30)
-    finally:
-        drop_table(nodes, table_name)
-
-
 def test_rename_with_parallel_ttl_move(started_cluster):
     table_name = 'test_rename_with_parallel_ttl_move'
     try:
@@ -455,9 +393,9 @@ def test_rename_with_parallel_ttl_move(started_cluster):
         time.sleep(5)
         rename_column(node1, table_name, "time", "time2", 1, False)
         time.sleep(4)
-        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2", 20, True)))
-        tasks.append(p.apply_async(rename_column, (node2, table_name, "foo2", "foo3", 20, True)))
-        tasks.append(p.apply_async(rename_column, (node3, table_name, "num3", "num2", 20, True)))
+        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2", 5, True)))
+        tasks.append(p.apply_async(rename_column, (node2, table_name, "foo2", "foo3", 5, True)))
+        tasks.append(p.apply_async(rename_column, (node3, table_name, "num3", "num2", 5, True)))
 
         for task in tasks:
             task.get(timeout=240)
@@ -493,12 +431,12 @@ def test_rename_with_parallel_ttl_delete(started_cluster):
 
         tasks.append(p.apply_async(insert, (node1, table_name, 10000, ["num", "num2"], 1, False, False, True, 0, True)))
         time.sleep(15)
-        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2", 20, True)))
-        tasks.append(p.apply_async(rename_column, (node2, table_name, "foo2", "foo3", 20, True)))
-        tasks.append(p.apply_async(rename_column, (node3, table_name, "num3", "num2", 20, True)))
-        tasks.append(p.apply_async(merge_parts, (node1, table_name, 20)))
-        tasks.append(p.apply_async(merge_parts, (node2, table_name, 20)))
-        tasks.append(p.apply_async(merge_parts, (node3, table_name, 20)))
+        tasks.append(p.apply_async(rename_column, (node1, table_name, "num2", "foo2", 5, True)))
+        tasks.append(p.apply_async(rename_column, (node2, table_name, "foo2", "foo3", 5, True)))
+        tasks.append(p.apply_async(rename_column, (node3, table_name, "num3", "num2", 5, True)))
+        tasks.append(p.apply_async(merge_parts, (node1, table_name, 3)))
+        tasks.append(p.apply_async(merge_parts, (node2, table_name, 3)))
+        tasks.append(p.apply_async(merge_parts, (node3, table_name, 3)))
 
         for task in tasks:
             task.get(timeout=240)
diff --git a/tests/integration/test_replace_partition/configs/remote_servers.xml b/tests/integration/test_replace_partition/configs/remote_servers.xml
index 732a7228ea4..7593cb3b213 100644
--- a/tests/integration/test_replace_partition/configs/remote_servers.xml
+++ b/tests/integration/test_replace_partition/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -40,4 +40,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replica_can_become_leader/configs/notleader.xml b/tests/integration/test_replica_can_become_leader/configs/notleader.xml
index 2a19ffcc52c..ee08b3a5b29 100644
--- a/tests/integration/test_replica_can_become_leader/configs/notleader.xml
+++ b/tests/integration/test_replica_can_become_leader/configs/notleader.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <replicated_can_become_leader>0</replicated_can_become_leader>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replica_can_become_leader/configs/notleaderignorecase.xml b/tests/integration/test_replica_can_become_leader/configs/notleaderignorecase.xml
index 6cb2f9530ec..bb92ed6811f 100644
--- a/tests/integration/test_replica_can_become_leader/configs/notleaderignorecase.xml
+++ b/tests/integration/test_replica_can_become_leader/configs/notleaderignorecase.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <replicated_can_become_leader>FAlse</replicated_can_become_leader>
     </merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_database/configs/config.xml b/tests/integration/test_replicated_database/configs/config.xml
index d751454437c..9d217943bd7 100644
--- a/tests/integration/test_replicated_database/configs/config.xml
+++ b/tests/integration/test_replicated_database/configs/config.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <database_atomic_delay_before_drop_table_sec>10</database_atomic_delay_before_drop_table_sec>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_database/configs/settings.xml b/tests/integration/test_replicated_database/configs/settings.xml
index 7f45502e20d..5666ffeace8 100644
--- a/tests/integration/test_replicated_database/configs/settings.xml
+++ b/tests/integration/test_replicated_database/configs/settings.xml
@@ -1,6 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
+            <allow_drop_detached>1</allow_drop_detached>
             <allow_experimental_database_replicated>1</allow_experimental_database_replicated>
             <allow_experimental_alter_materialized_view_structure>1</allow_experimental_alter_materialized_view_structure>
         </default>
@@ -10,4 +11,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 4bcad7de16f..fa1e9cf49fa 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -1,3 +1,5 @@
+import os
+import shutil
 import time
 import re
 import pytest
@@ -16,7 +18,7 @@ snapshot_recovering_node = cluster.add_instance('snapshot_recovering_node', main
 
 all_nodes = [main_node, dummy_node, competing_node, snapshotting_node, snapshot_recovering_node]
 
-uuid_regex = re.compile("[0-9a-f]{8}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{4}\-[0-9a-f]{12}")
+uuid_regex = re.compile("[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
 def assert_create_query(nodes, table_name, expected):
     replace_uuid = lambda x: re.sub(uuid_regex, "uuid", x)
     query = "show create table {}".format(table_name)
@@ -100,6 +102,102 @@ def test_simple_alter_table(started_cluster, engine):
     assert_create_query([main_node, dummy_node, competing_node], name, expected)
 
 
+def get_table_uuid(database, name):
+    return main_node.query(f"SELECT uuid FROM system.tables WHERE database = '{database}' and name = '{name}'").strip()
+
+
+@pytest.fixture(scope="module", name="attachable_part")
+def fixture_attachable_part(started_cluster):
+    main_node.query(f"CREATE DATABASE testdb_attach_atomic ENGINE = Atomic")
+    main_node.query(f"CREATE TABLE testdb_attach_atomic.test (CounterID UInt32) ENGINE = MergeTree ORDER BY (CounterID)")
+    main_node.query(f"INSERT INTO testdb_attach_atomic.test VALUES (123)")
+    main_node.query(f"ALTER TABLE testdb_attach_atomic.test FREEZE WITH NAME 'test_attach'")
+    table_uuid = get_table_uuid("testdb_attach_atomic", "test")
+    return os.path.join(main_node.path, f"database/shadow/test_attach/store/{table_uuid[:3]}/{table_uuid}/all_1_1_0")
+
+
+
+@pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
+def test_alter_attach(started_cluster, attachable_part, engine):
+    name  = "alter_attach_test_{}".format(engine)
+    main_node.query(f"CREATE TABLE testdb.{name} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)")
+    table_uuid = get_table_uuid("testdb", name)
+    # Provide and attach a part to the main node
+    shutil.copytree(
+        attachable_part, os.path.join(main_node.path, f"database/store/{table_uuid[:3]}/{table_uuid}/detached/all_1_1_0")
+    )
+    main_node.query(f"ALTER TABLE testdb.{name} ATTACH PART 'all_1_1_0'")
+    # On the main node, data is attached
+    assert main_node.query(f"SELECT CounterID FROM testdb.{name}") == "123\n"
+    # On the other node, data is replicated only if using a Replicated table engine
+    if engine == "ReplicatedMergeTree":
+        assert dummy_node.query(f"SELECT CounterID FROM testdb.{name}") == "123\n"
+    else:
+        assert dummy_node.query(f"SELECT CounterID FROM testdb.{name}") == ""
+
+
+@pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
+def test_alter_drop_part(started_cluster, engine):
+    table = f"alter_drop_{engine}"
+    part_name = "all_0_0_0" if engine == "ReplicatedMergeTree" else "all_1_1_0"
+    main_node.query(f"CREATE TABLE testdb.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)")
+    main_node.query(f"INSERT INTO testdb.{table} VALUES (123)")
+    if engine == "MergeTree":
+        dummy_node.query(f"INSERT INTO testdb.{table} VALUES (456)")
+    main_node.query(f"ALTER TABLE testdb.{table} DROP PART '{part_name}'")
+    assert main_node.query(f"SELECT CounterID FROM testdb.{table}") == ""
+    if engine == "ReplicatedMergeTree":
+        # The DROP operation is still replicated at the table engine level
+        assert dummy_node.query(f"SELECT CounterID FROM testdb.{table}") == ""
+    else:
+        assert dummy_node.query(f"SELECT CounterID FROM testdb.{table}") == "456\n"
+
+
+@pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
+def test_alter_detach_part(started_cluster, engine):
+    table = f"alter_detach_{engine}"
+    part_name = "all_0_0_0" if engine == "ReplicatedMergeTree" else "all_1_1_0"
+    main_node.query(f"CREATE TABLE testdb.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)")
+    main_node.query(f"INSERT INTO testdb.{table} VALUES (123)")
+    if engine == "MergeTree":
+        dummy_node.query(f"INSERT INTO testdb.{table} VALUES (456)")
+    main_node.query(f"ALTER TABLE testdb.{table} DETACH PART '{part_name}'")
+    detached_parts_query = f"SELECT name FROM system.detached_parts WHERE database='testdb' AND table='{table}'"
+    assert main_node.query(detached_parts_query) == f"{part_name}\n"
+    if engine == "ReplicatedMergeTree":
+        # The detach operation is still replicated at the table engine level
+        assert dummy_node.query(detached_parts_query) == f"{part_name}\n"
+    else:
+        assert dummy_node.query(detached_parts_query) == ""
+
+
+@pytest.mark.parametrize("engine", ["MergeTree", "ReplicatedMergeTree"])
+def test_alter_drop_detached_part(started_cluster, engine):
+    table = f"alter_drop_detached_{engine}"
+    part_name = "all_0_0_0" if engine == "ReplicatedMergeTree" else "all_1_1_0"
+    main_node.query(f"CREATE TABLE testdb.{table} (CounterID UInt32) ENGINE = {engine} ORDER BY (CounterID)")
+    main_node.query(f"INSERT INTO testdb.{table} VALUES (123)")
+    main_node.query(f"ALTER TABLE testdb.{table} DETACH PART '{part_name}'")
+    if engine == "MergeTree":
+        dummy_node.query(f"INSERT INTO testdb.{table} VALUES (456)")
+        dummy_node.query(f"ALTER TABLE testdb.{table} DETACH PART '{part_name}'")
+    main_node.query(f"ALTER TABLE testdb.{table} DROP DETACHED PART '{part_name}'")
+    detached_parts_query = f"SELECT name FROM system.detached_parts WHERE database='testdb' AND table='{table}'"
+    assert main_node.query(detached_parts_query) == ""
+    assert dummy_node.query(detached_parts_query) == f"{part_name}\n"
+
+
+def test_alter_fetch(started_cluster):
+    main_node.query("CREATE TABLE testdb.fetch_source (CounterID UInt32) ENGINE = ReplicatedMergeTree ORDER BY (CounterID)")
+    main_node.query("CREATE TABLE testdb.fetch_target (CounterID UInt32) ENGINE = ReplicatedMergeTree ORDER BY (CounterID)")
+    main_node.query("INSERT INTO testdb.fetch_source VALUES (123)")
+    table_uuid = get_table_uuid("testdb", "fetch_source")
+    main_node.query(f"ALTER TABLE testdb.fetch_target FETCH PART 'all_0_0_0' FROM '/clickhouse/tables/{table_uuid}/{{shard}}' ")
+    detached_parts_query = "SELECT name FROM system.detached_parts WHERE database='testdb' AND table='fetch_target'"
+    assert main_node.query(detached_parts_query) == "all_0_0_0\n"
+    assert dummy_node.query(detached_parts_query) == ""
+
+
 def test_alters_from_different_replicas(started_cluster):
     # test_alters_from_different_replicas
     competing_node.query("CREATE DATABASE IF NOT EXISTS testdb ENGINE = Replicated('/clickhouse/databases/test1', 'shard1', 'replica3');")
@@ -305,3 +403,12 @@ def test_startup_without_zk(started_cluster):
 
     main_node.query("EXCHANGE TABLES startup.rmt AND startup.m")
     assert main_node.query("SELECT (*,).1 FROM startup.m") == "42\n"
+
+
+def test_server_uuid(started_cluster):
+    uuid1 = main_node.query("select serverUUID()")
+    uuid2 = dummy_node.query("select serverUUID()")
+    assert uuid1 != uuid2
+    main_node.restart_clickhouse()
+    uuid1_after_restart = main_node.query("select serverUUID()")
+    assert uuid1 == uuid1_after_restart
diff --git a/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
index 566c7c07f5c..c979d76b50c 100644
--- a/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
+++ b/tests/integration/test_replicated_fetches_bandwidth/configs/limit_replication_config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
           <max_replicated_fetches_network_bandwidth_for_server>5242880</max_replicated_fetches_network_bandwidth_for_server>
           <max_replicated_sends_network_bandwidth_for_server>10485760</max_replicated_sends_network_bandwidth_for_server>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_fetches_timeouts/configs/server.xml b/tests/integration/test_replicated_fetches_timeouts/configs/server.xml
index d4b441b91fb..b24d5ff5cf6 100644
--- a/tests/integration/test_replicated_fetches_timeouts/configs/server.xml
+++ b/tests/integration/test_replicated_fetches_timeouts/configs/server.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <background_processing_pool_task_sleep_seconds_when_no_work_max>0.1</background_processing_pool_task_sleep_seconds_when_no_work_max>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_compatibility/__init__.py b/tests/integration/test_replicated_merge_tree_compatibility/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_merge_tree_compatibility/test.py b/tests/integration/test_replicated_merge_tree_compatibility/test.py
new file mode 100644
index 00000000000..b56aa5706c9
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_compatibility/test.py
@@ -0,0 +1,55 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node1 = cluster.add_instance('node1', with_zookeeper=True, image='yandex/clickhouse-server', tag='20.12.4.5', stay_alive=True, with_installed_binary=True)
+node2 = cluster.add_instance('node2', with_zookeeper=True, image='yandex/clickhouse-server', tag='20.12.4.5', stay_alive=True, with_installed_binary=True)
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    except Exception as ex:
+        print(ex)
+
+    finally:
+        cluster.shutdown()
+
+def test_replicated_merge_tree_defaults_compatibility(started_cluster):
+    # This test checks, that result of parsing list of columns with defaults
+    # from 'CREATE/ATTACH' is compatible with parsing from zookeeper metadata on different versions.
+    # We create table and write 'columns' node in zookeeper with old version, than restart with new version
+    # drop and try recreate one replica. During startup of table structure is checked between 'CREATE' query and zookeeper.
+
+    create_query = '''
+        CREATE TABLE test.table
+        (
+            a UInt32,
+            b String DEFAULT If(a = 0, 'true', 'false'),
+            c String DEFAULT Cast(a, 'String')
+        )
+        ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/table', '{replica}')
+        ORDER BY a
+    '''
+
+    for node in (node1, node2):
+        node.query("CREATE DATABASE test ENGINE = Ordinary")
+        node.query(create_query.format(replica=node.name))
+
+    node1.query("DETACH TABLE test.table")
+    node2.query("SYSTEM DROP REPLICA 'node1' FROM TABLE test.table")
+    node1.exec_in_container(["bash", "-c", "rm /var/lib/clickhouse/metadata/test/table.sql"])
+    node1.exec_in_container(["bash", "-c", "rm -r /var/lib/clickhouse/data/test/table"])
+
+    zk = cluster.get_kazoo_client('zoo1')
+    exists_replica_1 = zk.exists("/clickhouse/tables/test/table/replicas/node1")
+    assert exists_replica_1 == None
+
+    node1.restart_with_latest_version()
+    node2.restart_with_latest_version()
+
+    node1.query(create_query.format(replica=1))
+    node1.query("EXISTS TABLE test.table") == "1\n"
diff --git a/tests/integration/test_replicated_merge_tree_config/configs/config.xml b/tests/integration/test_replicated_merge_tree_config/configs/config.xml
index d760d05f1bc..ca8edc41ab6 100644
--- a/tests/integration/test_replicated_merge_tree_config/configs/config.xml
+++ b/tests/integration/test_replicated_merge_tree_config/configs/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <merge_tree>
         <index_granularity>100</index_granularity>
     </merge_tree>
     <replicated_merge_tree>
         <index_granularity>200</index_granularity>
     </replicated_merge_tree>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/__init__.py b/tests/integration/test_replicated_merge_tree_encrypted_disk/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/key_a.xml b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/key_a.xml
new file mode 100644
index 00000000000..9d866c91f54
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/key_a.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_encrypted>
+                <key>aaaaaaaaaaaaaaaa</key>
+            </disk_encrypted>
+        </disks>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/key_b.xml b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/key_b.xml
new file mode 100644
index 00000000000..c34283160a5
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/key_b.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_encrypted>
+                <key>bbbbbbbbbbbbbbbb</key>
+            </disk_encrypted>
+        </disks>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/remote_servers.xml b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/remote_servers.xml
new file mode 100644
index 00000000000..84d16206080
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/remote_servers.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <remote_servers>
+        <cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/storage.xml b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/storage.xml
new file mode 100644
index 00000000000..312a009ed9a
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encrypted_disk/configs/storage.xml
@@ -0,0 +1,25 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk_local>
+                <type>local</type>
+                <path>/disk/</path>
+            </disk_local>
+            <disk_encrypted>
+                <type>encrypted</type>
+                <disk>disk_local</disk>
+                <path>encrypted/</path>
+                <key>0000000000000000</key>
+            </disk_encrypted>
+        </disks>
+        <policies>
+            <encrypted_policy>
+                <volumes>
+                    <main>
+                        <disk>disk_encrypted</disk>
+                    </main>
+                </volumes>
+            </encrypted_policy>
+         </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py b/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py
new file mode 100644
index 00000000000..bc5a419aaf2
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encrypted_disk/test.py
@@ -0,0 +1,87 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry, TSV
+import os
+
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance("node1",
+                            main_configs=["configs/remote_servers.xml", "configs/storage.xml"],
+                            tmpfs=["/disk:size=100M"],
+                            macros={'replica': 'node1'},
+                            with_zookeeper=True)
+
+node2 = cluster.add_instance("node2",
+                            main_configs=["configs/remote_servers.xml", "configs/storage.xml"],
+                            tmpfs=["/disk:size=100M"],
+                            macros={'replica': 'node2'},
+                            with_zookeeper=True)
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield
+    finally:
+        cluster.shutdown()
+
+
+def copy_keys(instance, keys_file_name):
+    instance.copy_file_to_container(os.path.join(SCRIPT_DIR, f"configs/{keys_file_name}.xml"), "/etc/clickhouse-server/config.d/z_keys.xml")
+    instance.query("SYSTEM RELOAD CONFIG")
+
+def create_table():
+    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(
+        """
+        CREATE TABLE tbl ON CLUSTER 'cluster' (
+            id Int64,
+            str String
+        ) ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')
+        ORDER BY id
+        SETTINGS storage_policy='encrypted_policy'
+        """
+    )
+
+def insert_data():
+    node1.query("INSERT INTO tbl VALUES (1, 'str1')")
+    node2.query("INSERT INTO tbl VALUES (1, 'str1')") # Test deduplication
+    node2.query("INSERT INTO tbl VALUES (2, 'str2')")
+
+def optimize_table():
+    node1.query("OPTIMIZE TABLE tbl ON CLUSTER 'cluster' FINAL")
+
+def check_table():
+    expected=[[1, 'str1'], [2, 'str2']]
+    assert node1.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
+    assert node2.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
+    assert node1.query("CHECK TABLE tbl") == "1\n"
+    assert node2.query("CHECK TABLE tbl") == "1\n"
+
+
+# Actual tests:
+
+def test_same_keys():
+    copy_keys(node1, 'key_a')
+    copy_keys(node2, 'key_a')
+    create_table()
+
+    insert_data()
+    check_table()
+
+    optimize_table()
+    check_table()
+
+
+def test_different_keys():
+    copy_keys(node1, 'key_a')
+    copy_keys(node2, 'key_b')
+    create_table()
+
+    insert_data()
+    check_table()
+
+    optimize_table()
+    check_table()
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/__init__.py b/tests/integration/test_replicated_merge_tree_encryption_codec/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/encryption_codec.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/encryption_codec.xml
new file mode 100644
index 00000000000..eb4f8abaa77
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/encryption_codec.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key>0000000000000000</key>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a.xml
new file mode 100644
index 00000000000..a31978e7015
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key>aaaaaaaaaaaaaaaa</key>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_b_current_a.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_b_current_a.xml
new file mode 100644
index 00000000000..01ca9123ccb
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_b_current_a.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key remove="1"/>
+            <key id="0">aaaaaaaaaaaaaaaa</key>
+            <key id="1">bbbbbbbbbbbbbbbb</key>
+            <current_key_id>0</current_key_id>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_b_current_b.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_b_current_b.xml
new file mode 100644
index 00000000000..98cf6ced0c7
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_b_current_b.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key remove="1"/>
+            <key id="0">aaaaaaaaaaaaaaaa</key>
+            <key id="1">bbbbbbbbbbbbbbbb</key>
+            <current_key_id>1</current_key_id>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_nonce_x.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_nonce_x.xml
new file mode 100644
index 00000000000..40c5adab19b
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_nonce_x.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key>aaaaaaaaaaaaaaaa</key>
+            <nonce>xxxxxxxxxxxx</nonce>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_nonce_y.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_nonce_y.xml
new file mode 100644
index 00000000000..eadfb6e6733
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_a_and_nonce_y.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key>aaaaaaaaaaaaaaaa</key>
+            <nonce>yyyyyyyyyyyy</nonce>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_b.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_b.xml
new file mode 100644
index 00000000000..e336324f648
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/key_b.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <encryption_codecs>
+        <aes_128_gcm_siv>
+            <key>bbbbbbbbbbbbbbbb</key>
+        </aes_128_gcm_siv>
+    </encryption_codecs>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/configs/remote_servers.xml b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/remote_servers.xml
new file mode 100644
index 00000000000..84d16206080
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/configs/remote_servers.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <remote_servers>
+        <cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_encryption_codec/test.py b/tests/integration/test_replicated_merge_tree_encryption_codec/test.py
new file mode 100644
index 00000000000..3aec2259703
--- /dev/null
+++ b/tests/integration/test_replicated_merge_tree_encryption_codec/test.py
@@ -0,0 +1,110 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry, TSV
+import os
+
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance("node1",
+                            main_configs=["configs/remote_servers.xml", "configs/encryption_codec.xml"],
+                            macros={'replica': 'node1'},
+                            with_zookeeper=True)
+
+node2 = cluster.add_instance("node2",
+                            main_configs=["configs/remote_servers.xml", "configs/encryption_codec.xml"],
+                            macros={'replica': 'node2'},
+                            with_zookeeper=True)
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield
+    finally:
+        cluster.shutdown()
+
+
+def copy_keys(instance, keys_file_name):
+    instance.copy_file_to_container(os.path.join(SCRIPT_DIR, f"configs/{keys_file_name}.xml"), "/etc/clickhouse-server/config.d/z_keys.xml")
+    instance.query("SYSTEM RELOAD CONFIG")
+
+def create_table():
+    node1.query("DROP TABLE IF EXISTS tbl ON CLUSTER 'cluster' NO DELAY")
+    node1.query(
+        """
+        CREATE TABLE tbl ON CLUSTER 'cluster' (
+            id Int64,
+            str String Codec(AES_128_GCM_SIV)
+        ) ENGINE=ReplicatedMergeTree('/clickhouse/tables/tbl/', '{replica}')
+        ORDER BY id
+        """
+    )
+
+def insert_data():
+    node1.query("INSERT INTO tbl VALUES (1, 'str1')")
+    node2.query("INSERT INTO tbl VALUES (1, 'str1')") # Test deduplication
+    node2.query("INSERT INTO tbl VALUES (2, 'str2')")
+
+def optimize_table():
+    node1.query("OPTIMIZE TABLE tbl ON CLUSTER 'cluster' FINAL")
+
+def check_table():
+    expected=[[1, 'str1'], [2, 'str2']]
+    assert node1.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
+    assert node2.query("SELECT * FROM tbl ORDER BY id") == TSV(expected)
+    assert node1.query("CHECK TABLE tbl") == "1\n"
+    assert node2.query("CHECK TABLE tbl") == "1\n"
+
+
+# Actual tests:
+
+def test_same_keys():
+    copy_keys(node1, 'key_a')
+    copy_keys(node2, 'key_a')
+    create_table()
+
+    insert_data()
+    check_table()
+
+    optimize_table()
+    check_table()
+
+
+def test_different_keys():
+    copy_keys(node1, 'key_a')
+    copy_keys(node2, 'key_b')
+    create_table()
+
+    insert_data()
+    assert "BAD_DECRYPT" in node1.query_and_get_error("SELECT * FROM tbl")
+    assert "BAD_DECRYPT" in node2.query_and_get_error("SELECT * FROM tbl")
+
+    # Hang?
+    #optimize_table()
+    #check_table()
+
+
+def test_different_current_key_ids():
+    copy_keys(node1, 'key_a_and_b_current_a')
+    copy_keys(node2, 'key_a_and_b_current_b')
+    create_table()
+
+    insert_data()
+    check_table()
+
+    optimize_table()
+    check_table()
+
+
+def test_different_nonces():
+    copy_keys(node1, 'key_a_and_nonce_x')
+    copy_keys(node2, 'key_a_and_nonce_y')
+    create_table()
+
+    insert_data()
+    check_table()
+
+    optimize_table()
+    check_table()
diff --git a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
index 46a11a8fe16..55e0988218f 100644
--- a/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_hdfs_zero_copy/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <hdfs1>
@@ -59,7 +59,6 @@
     <merge_tree>
         <min_bytes_for_wide_part>1024000</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
-        <allow_remote_fs_zero_copy_replication>1</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
@@ -83,4 +82,4 @@
         <cluster>test_cluster</cluster>
         <shard>1</shard>
     </macros>
-</yandex>
+</clickhouse>
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 f426c3619a4..f557a69569a 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
@@ -37,6 +37,9 @@ def cluster():
                              with_hdfs=True)
         logging.info("Starting cluster...")
         cluster.start()
+        if cluster.instances["node1"].is_debug_build():
+            # https://github.com/ClickHouse/ClickHouse/issues/27814
+            pytest.skip("libhdfs3 calls rand function which does not pass harmful check in debug build")
         logging.info("Cluster started")
 
         fs = HdfsClient(hosts=cluster.hdfs_ip)
diff --git a/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml
index d22ac8113a8..92706ff445d 100644
--- a/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_s3/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -47,4 +47,4 @@
         <shard>0</shard>
     </macros>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
index 0cf9191c4af..bfd7366b9dc 100644
--- a/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_replicated_merge_tree_s3_zero_copy/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -21,7 +21,6 @@
 
     <merge_tree>
         <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-        <allow_remote_fs_zero_copy_replication>1</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
@@ -47,4 +46,4 @@
         <shard>0</shard>
     </macros>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/remote_servers.xml b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/remote_servers.xml
index 3593cbd7f36..45713eaed59 100644
--- a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/remote_servers.xml
+++ b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/zookeeper_config.xml b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/zookeeper_config.xml
index b2b0667ebbf..3e8cc741bd5 100644
--- a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/zookeeper_config.xml
+++ b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/configs/zookeeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -25,4 +25,4 @@
             </node>
         </zookeeper2>
     </auxiliary_zookeepers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
index a9dcce1b9d4..4644790ff94 100644
--- a/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
+++ b/tests/integration/test_replicated_merge_tree_with_auxiliary_zookeepers/test.py
@@ -101,3 +101,13 @@ def test_drop_replicated_merge_tree_with_auxiliary_zookeeper(started_cluster):
     assert zk.exists('/clickhouse/tables/test/test_auxiliary_zookeeper')
     drop_table([node1, node2], "test_auxiliary_zookeeper")
     assert zk.exists('/clickhouse/tables/test/test_auxiliary_zookeeper') is None
+
+def test_path_ambiguity(started_cluster):
+    drop_table([node1, node2], "test_path_ambiguity1")
+    drop_table([node1, node2], "test_path_ambiguity2")
+    node1.query("create table test_path_ambiguity1 (n int) engine=ReplicatedMergeTree('/test:bad:/path', '1') order by n")
+    assert "Invalid auxiliary ZooKeeper name" in node1.query_and_get_error("create table test_path_ambiguity2 (n int) engine=ReplicatedMergeTree('test:bad:/path', '1') order by n")
+    assert "ZooKeeper path must starts with '/'" in node1.query_and_get_error("create table test_path_ambiguity2 (n int) engine=ReplicatedMergeTree('test/bad:/path', '1') order by n")
+    node1.query("create table test_path_ambiguity2 (n int) engine=ReplicatedMergeTree('zookeeper2:/bad:/path', '1') order by n")
+    drop_table([node1, node2], "test_path_ambiguity1")
+    drop_table([node1, node2], "test_path_ambiguity2")
diff --git a/tests/integration/test_replicated_mutations/configs/merge_tree.xml b/tests/integration/test_replicated_mutations/configs/merge_tree.xml
index 6b08fbc5087..26b697662ad 100644
--- a/tests/integration/test_replicated_mutations/configs/merge_tree.xml
+++ b/tests/integration/test_replicated_mutations/configs/merge_tree.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <max_bytes_to_merge_at_min_space_in_pool>1</max_bytes_to_merge_at_min_space_in_pool>
         <max_bytes_to_merge_at_max_space_in_pool>2</max_bytes_to_merge_at_max_space_in_pool>
     </merge_tree>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_replicated_mutations/configs/merge_tree_max_parts.xml b/tests/integration/test_replicated_mutations/configs/merge_tree_max_parts.xml
index 60047dcab2c..b4c022f7c4c 100644
--- a/tests/integration/test_replicated_mutations/configs/merge_tree_max_parts.xml
+++ b/tests/integration/test_replicated_mutations/configs/merge_tree_max_parts.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <merge_tree>
         <parts_to_delay_insert>50</parts_to_delay_insert>
         <parts_to_throw_insert>50</parts_to_throw_insert>
     </merge_tree>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_replicated_mutations/test.py b/tests/integration/test_replicated_mutations/test.py
index 9c779011c83..5efc022cf36 100644
--- a/tests/integration/test_replicated_mutations/test.py
+++ b/tests/integration/test_replicated_mutations/test.py
@@ -247,5 +247,5 @@ def test_mutations_dont_prevent_merges(started_cluster, nodes):
         logging.debug(node.query(
             "SELECT partition, count(name), sum(active), sum(active*rows) FROM system.parts WHERE table ='test_mutations' GROUP BY partition FORMAT TSVWithNames"))
 
-    assert all_done
+    assert all_done, "All done"
     assert all([str(e).find("Too many parts") < 0 for e in runner.exceptions])
diff --git a/tests/integration/test_replicated_users/__init__.py b/tests/integration/test_replicated_users/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_replicated_users/configs/config.xml b/tests/integration/test_replicated_users/configs/config.xml
new file mode 100644
index 00000000000..6738f8dfa66
--- /dev/null
+++ b/tests/integration/test_replicated_users/configs/config.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <remote_servers>
+        <default>
+            <shard>
+                <internal_replication>true</internal_replication>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </default>
+    </remote_servers>
+    <user_directories replace="replace">
+        <replicated>
+            <zookeeper_path>/clickhouse/access</zookeeper_path>
+        </replicated>
+    </user_directories>
+</clickhouse>
diff --git a/tests/integration/test_replicated_users/test.py b/tests/integration/test_replicated_users/test.py
new file mode 100644
index 00000000000..75bc93921be
--- /dev/null
+++ b/tests/integration/test_replicated_users/test.py
@@ -0,0 +1,73 @@
+import pytest
+
+from dataclasses import dataclass
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance('node1', main_configs=['configs/config.xml'], with_zookeeper=True, stay_alive=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/config.xml'], with_zookeeper=True, stay_alive=True)
+
+all_nodes = [node1, node2]
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@dataclass(frozen=True)
+class Entity:
+    keyword: str
+    name: str
+    options: str = ""
+
+
+entities = [
+    Entity(keyword="USER", name="theuser"),
+    Entity(keyword="ROLE", name="therole"),
+    Entity(keyword="ROW POLICY", name="thepolicy", options=" ON default.t1"),
+    Entity(keyword="QUOTA", name="thequota"),
+    Entity(keyword="SETTINGS PROFILE", name="theprofile")
+]
+
+def get_entity_id(entity):
+    return entity.keyword
+
+
+@pytest.mark.parametrize("entity", entities, ids=get_entity_id)
+def test_create_replicated(started_cluster, entity):
+    node1.query(f"CREATE {entity.keyword} {entity.name} {entity.options}")
+    assert f"cannot insert because {entity.keyword.lower()} `{entity.name}{entity.options}` already exists in replicated" in \
+           node2.query_and_get_error(f"CREATE {entity.keyword} {entity.name} {entity.options}")
+    node1.query(f"DROP {entity.keyword} {entity.name} {entity.options}")
+
+
+@pytest.mark.parametrize("entity", entities, ids=get_entity_id)
+def test_create_and_delete_replicated(started_cluster, entity):
+    node1.query(f"CREATE {entity.keyword} {entity.name} {entity.options}")
+    node2.query(f"DROP {entity.keyword} {entity.name} {entity.options}")
+
+
+@pytest.mark.parametrize("entity", entities, ids=get_entity_id)
+def test_create_replicated_on_cluster(started_cluster, entity):
+    assert f"cannot insert because {entity.keyword.lower()} `{entity.name}{entity.options}` already exists in replicated" in \
+           node1.query_and_get_error(f"CREATE {entity.keyword} {entity.name} ON CLUSTER default {entity.options}")
+    node1.query(f"DROP {entity.keyword} {entity.name} {entity.options}")
+
+
+@pytest.mark.parametrize("entity", entities, ids=get_entity_id)
+def test_create_replicated_if_not_exists_on_cluster(started_cluster, entity):
+    node1.query(f"CREATE {entity.keyword} IF NOT EXISTS {entity.name} ON CLUSTER default {entity.options}")
+    node1.query(f"DROP {entity.keyword} {entity.name} {entity.options}")
+
+
+@pytest.mark.parametrize("entity", entities, ids=get_entity_id)
+def test_rename_replicated(started_cluster, entity):
+    node1.query(f"CREATE {entity.keyword} {entity.name} {entity.options}")
+    node2.query(f"ALTER {entity.keyword} {entity.name} {entity.options} RENAME TO {entity.name}2")
+    node1.query(f"DROP {entity.keyword} {entity.name}2 {entity.options}")
+
diff --git a/tests/integration/test_replication_credentials/configs/credentials1.xml b/tests/integration/test_replication_credentials/configs/credentials1.xml
index 1a5fbd393d5..88a91adccf6 100644
--- a/tests/integration/test_replication_credentials/configs/credentials1.xml
+++ b/tests/integration/test_replication_credentials/configs/credentials1.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <interserver_http_port>9009</interserver_http_port>
     <interserver_http_credentials>
         <user>admin</user>
         <password>222</password>
     </interserver_http_credentials>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replication_credentials/configs/credentials2.xml b/tests/integration/test_replication_credentials/configs/credentials2.xml
index cf846e7a53d..79577a9345d 100644
--- a/tests/integration/test_replication_credentials/configs/credentials2.xml
+++ b/tests/integration/test_replication_credentials/configs/credentials2.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <interserver_http_port>9009</interserver_http_port>
     <interserver_http_credentials>
         <user>root</user>
         <password>111</password>
     </interserver_http_credentials>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replication_credentials/configs/no_credentials.xml b/tests/integration/test_replication_credentials/configs/no_credentials.xml
index 9822058811e..9853111b31a 100644
--- a/tests/integration/test_replication_credentials/configs/no_credentials.xml
+++ b/tests/integration/test_replication_credentials/configs/no_credentials.xml
@@ -1,3 +1,3 @@
-<yandex>
+<clickhouse>
     <interserver_http_port>9009</interserver_http_port>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replication_credentials/configs/remote_servers.xml b/tests/integration/test_replication_credentials/configs/remote_servers.xml
index d8b384a6392..731b7077858 100644
--- a/tests/integration/test_replication_credentials/configs/remote_servers.xml
+++ b/tests/integration/test_replication_credentials/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -55,4 +55,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_replication_credentials/test.py b/tests/integration/test_replication_credentials/test.py
index 9181c515adf..359a8fc4b0d 100644
--- a/tests/integration/test_replication_credentials/test.py
+++ b/tests/integration/test_replication_credentials/test.py
@@ -114,7 +114,7 @@ def test_different_credentials(different_credentials_cluster):
     assert node6.query("SELECT id FROM test_table order by id") == '222\n'
 
     add_old = """
-    <yandex>
+    <clickhouse>
         <interserver_http_port>9009</interserver_http_port>
         <interserver_http_credentials>
             <user>admin</user>
@@ -128,7 +128,7 @@ def test_different_credentials(different_credentials_cluster):
                 <password>333</password>
             </old>
         </interserver_http_credentials>
-    </yandex>
+    </clickhouse>
     """
 
     node5.replace_config("/etc/clickhouse-server/config.d/credentials1.xml", add_old)
@@ -173,14 +173,14 @@ def test_credentials_and_no_credentials(credentials_and_no_credentials_cluster):
     assert node8.query("SELECT id FROM test_table order by id") == '222\n'
 
     allow_empty = """
-    <yandex>
+    <clickhouse>
         <interserver_http_port>9009</interserver_http_port>
         <interserver_http_credentials>
             <user>admin</user>
             <password>222</password>
             <allow_empty>true</allow_empty>
         </interserver_http_credentials>
-    </yandex>
+    </clickhouse>
     """
 
     # change state: Flip node7 to mixed auth/non-auth (allow node8)
diff --git a/tests/integration/test_replication_without_zookeeper/configs/remote_servers.xml b/tests/integration/test_replication_without_zookeeper/configs/remote_servers.xml
index 538aa72d386..3776309941c 100644
--- a/tests/integration/test_replication_without_zookeeper/configs/remote_servers.xml
+++ b/tests/integration/test_replication_without_zookeeper/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -11,4 +11,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_restart_server/__init__.py b/tests/integration/test_restart_server/__init__.py
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_restart_server/test.py b/tests/integration/test_restart_server/test.py
new file mode 100755
index 00000000000..47797f7c4a5
--- /dev/null
+++ b/tests/integration/test_restart_server/test.py
@@ -0,0 +1,22 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance('node', stay_alive=True)
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_drop_memory_database(start_cluster):
+    node.query("CREATE DATABASE test ENGINE Memory")
+    node.query("CREATE TABLE test.test_table(a String) ENGINE Memory")
+    node.query("DROP DATABASE test")
+    node.restart_clickhouse(kill=True)
+    assert node.query("SHOW DATABASES LIKE 'test'").strip() == ""
+
diff --git a/tests/integration/test_restore_replica/configs/remote_servers.xml b/tests/integration/test_restore_replica/configs/remote_servers.xml
index 0709f97551a..76ad3618339 100644
--- a/tests/integration/test_restore_replica/configs/remote_servers.xml
+++ b/tests/integration/test_restore_replica/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -18,4 +18,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_rocksdb_options/configs/rocksdb.xml b/tests/integration/test_rocksdb_options/configs/rocksdb.xml
new file mode 100644
index 00000000000..c0ac49576fc
--- /dev/null
+++ b/tests/integration/test_rocksdb_options/configs/rocksdb.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<clickhouse>
+  <rocksdb>
+    <options>
+        <max_background_jobs>8</max_background_jobs>
+    </options>
+    <column_family_options>
+      <num_levels>2</num_levels>
+    </column_family_options>
+    <tables>
+      <table>
+        <name>test</name>
+        <options>
+          <max_open_files>10000</max_open_files>
+        </options>
+        <column_family_options>
+          <max_bytes_for_level_base>14</max_bytes_for_level_base>
+        </column_family_options>
+      </table>
+    </tables>
+  </rocksdb>
+</clickhouse>
diff --git a/tests/integration/test_rocksdb_options/configs/rocksdb.yml b/tests/integration/test_rocksdb_options/configs/rocksdb.yml
deleted file mode 100644
index 363ead6f318..00000000000
--- a/tests/integration/test_rocksdb_options/configs/rocksdb.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-rocksdb:
-    options:
-        max_background_jobs: 8
-    column_family_options:
-        num_levels: 2
-    tables:
-        - table:
-              name: test
-              options:
-                  max_open_files: 10000
-              column_family_options:
-                  max_bytes_for_level_base: 14
diff --git a/tests/integration/test_rocksdb_options/test.py b/tests/integration/test_rocksdb_options/test.py
index 286528107b8..e8542749d8d 100644
--- a/tests/integration/test_rocksdb_options/test.py
+++ b/tests/integration/test_rocksdb_options/test.py
@@ -9,10 +9,10 @@ from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
 
-node = cluster.add_instance('node', main_configs=['configs/rocksdb.yml'], stay_alive=True)
+node = cluster.add_instance('node', main_configs=['configs/rocksdb.xml'], stay_alive=True)
 
 
-@pytest.fixture(scope='module', autouse=True)
+@pytest.fixture(scope='module')
 def start_cluster():
     try:
         cluster.start()
@@ -20,66 +20,66 @@ def start_cluster():
     finally:
         cluster.shutdown()
 
-def test_valid_options():
+def test_valid_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_invalid_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/max_background_jobs/no_such_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+def test_invalid_options(start_cluster):
+    node.exec_in_container(['bash', '-c', "sed -i 's/max_background_jobs/no_such_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
     with pytest.raises(QueryRuntimeException):
         node.query("""
         CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
         """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_option/max_background_jobs/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_option/max_background_jobs/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
 
-def test_table_valid_options():
+def test_table_valid_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_table_invalid_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/max_open_files/no_such_table_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+def test_table_invalid_options(start_cluster):
+    node.exec_in_container(['bash', '-c', "sed -i 's/max_open_files/no_such_table_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
     with pytest.raises(QueryRuntimeException):
         node.query("""
         CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
         """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_option/max_open_files/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_option/max_open_files/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
 
-def test_valid_column_family_options():
+def test_valid_column_family_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_invalid_column_family_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/num_levels/no_such_column_family_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+def test_invalid_column_family_options(start_cluster):
+    node.exec_in_container(['bash', '-c', "sed -i 's/num_levels/no_such_column_family_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
     with pytest.raises(QueryRuntimeException):
         node.query("""
         CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
         """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_column_family_option/num_levels/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_column_family_option/num_levels/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
 
-def test_table_valid_column_family_options():
+def test_table_valid_column_family_options(start_cluster):
     node.query("""
     CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
     DROP TABLE test;
     """)
 
-def test_table_invalid_column_family_options():
-    node.exec_in_container(['bash', '-c', "sed -i 's/max_bytes_for_level_base/no_such_table_column_family_option/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+def test_table_invalid_column_family_options(start_cluster):
+    node.exec_in_container(['bash', '-c', "sed -i 's/max_bytes_for_level_base/no_such_table_column_family_option/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
     with pytest.raises(QueryRuntimeException):
         node.query("""
         CREATE TABLE test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
         """)
-    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_column_family_option/max_bytes_for_level_base/' /etc/clickhouse-server/config.d/rocksdb.yml"])
+    node.exec_in_container(['bash', '-c', "sed -i 's/no_such_table_column_family_option/max_bytes_for_level_base/g' /etc/clickhouse-server/config.d/rocksdb.xml"])
     node.restart_clickhouse()
diff --git a/tests/integration/test_row_policy/all_rows.xml b/tests/integration/test_row_policy/all_rows.xml
index d00db61482c..948aed1a874 100644
--- a/tests/integration/test_row_policy/all_rows.xml
+++ b/tests/integration/test_row_policy/all_rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <!-- Allows all rows -->
@@ -20,4 +20,4 @@
             </databases>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/configs/config.d/remote_servers.xml b/tests/integration/test_row_policy/configs/config.d/remote_servers.xml
index 395e97b97ac..899d5b87c90 100644
--- a/tests/integration/test_row_policy/configs/config.d/remote_servers.xml
+++ b/tests/integration/test_row_policy/configs/config.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_local_cluster>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </test_local_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/configs/users.d/another_user.xml b/tests/integration/test_row_policy/configs/users.d/another_user.xml
index 89e16e94c83..19249011968 100644
--- a/tests/integration/test_row_policy/configs/users.d/another_user.xml
+++ b/tests/integration/test_row_policy/configs/users.d/another_user.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <optimize_on_insert>0</optimize_on_insert>
@@ -15,4 +15,4 @@
             <quota>default</quota>
         </another>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml b/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml
index 413e64ba3dc..b93613cba09 100644
--- a/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml
+++ b/tests/integration/test_row_policy/configs/users.d/any_join_distinct_right_table_keys.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <any_join_distinct_right_table_keys>1</any_join_distinct_right_table_keys>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/configs/users.xml b/tests/integration/test_row_policy/configs/users.xml
index ce29b7f7308..a583770d1f0 100644
--- a/tests/integration/test_row_policy/configs/users.xml
+++ b/tests/integration/test_row_policy/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <any_join_distinct_right_table_keys>1</any_join_distinct_right_table_keys>
@@ -26,4 +26,4 @@
     <quotas>
         <default/>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/no_filters.xml b/tests/integration/test_row_policy/no_filters.xml
index 9aba4ac0914..fddc67fc3f9 100644
--- a/tests/integration/test_row_policy/no_filters.xml
+++ b/tests/integration/test_row_policy/no_filters.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<yandex>
-</yandex>
+<clickhouse>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/no_rows.xml b/tests/integration/test_row_policy/no_rows.xml
index 904d94b13fb..760203210b2 100644
--- a/tests/integration/test_row_policy/no_rows.xml
+++ b/tests/integration/test_row_policy/no_rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <!-- Allows no rows -->
@@ -20,4 +20,4 @@
             </databases>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/normal_filter2_table2.xml b/tests/integration/test_row_policy/normal_filter2_table2.xml
index aca6bddc334..3eac0403411 100644
--- a/tests/integration/test_row_policy/normal_filter2_table2.xml
+++ b/tests/integration/test_row_policy/normal_filter2_table2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <!-- For testing the table filters -->
@@ -13,4 +13,4 @@
             </databases>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/normal_filters.xml b/tests/integration/test_row_policy/normal_filters.xml
index d6aec3e3a89..6f5cd8701f6 100644
--- a/tests/integration/test_row_policy/normal_filters.xml
+++ b/tests/integration/test_row_policy/normal_filters.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <!-- For testing the table filters -->
@@ -33,4 +33,4 @@
             </databases>
         </another>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_row_policy/tags_with_db_and_table_names.xml b/tests/integration/test_row_policy/tags_with_db_and_table_names.xml
index 8f74cf2b781..992a1e63942 100644
--- a/tests/integration/test_row_policy/tags_with_db_and_table_names.xml
+++ b/tests/integration/test_row_policy/tags_with_db_and_table_names.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <users>
         <default>
             <databases>
@@ -27,4 +27,4 @@
             </databases>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_cluster/configs/cluster.xml b/tests/integration/test_s3_cluster/configs/cluster.xml
index 8334ace15eb..404a15b1273 100644
--- a/tests/integration/test_s3_cluster/configs/cluster.xml
+++ b/tests/integration/test_s3_cluster/configs/cluster.xml
@@ -1,5 +1,5 @@
 
-<yandex>
+<clickhouse>
     <remote_servers>
     <cluster_simple>
         <shard>
@@ -21,4 +21,4 @@
     </cluster_simple>
 
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_s3_with_https/configs/config.d/ssl.xml b/tests/integration/test_s3_with_https/configs/config.d/ssl.xml
index 95cdc918bd0..1200dc8c94b 100644
--- a/tests/integration/test_s3_with_https/configs/config.d/ssl.xml
+++ b/tests/integration/test_s3_with_https/configs/config.d/ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <cacheSessions>true</cacheSessions>
@@ -9,4 +9,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_with_https/configs/config.d/storage_conf.xml b/tests/integration/test_s3_with_https/configs/config.d/storage_conf.xml
index b319b6a0719..5298635cea0 100644
--- a/tests/integration/test_s3_with_https/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_s3_with_https/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3_secure>
@@ -34,4 +34,4 @@
             </s3_secure_with_proxy>
         </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_with_https/configs/config.d/users.xml b/tests/integration/test_s3_with_https/configs/config.d/users.xml
index 797113053f4..0011583a68c 100644
--- a/tests/integration/test_s3_with_https/configs/config.d/users.xml
+++ b/tests/integration/test_s3_with_https/configs/config.d/users.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default/>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_with_https/configs/config.xml b/tests/integration/test_s3_with_https/configs/config.xml
index 24b7344df3a..59829ffdb56 100644
--- a/tests/integration/test_s3_with_https/configs/config.xml
+++ b/tests/integration/test_s3_with_https/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port>9000</tcp_port>
     <listen_host>127.0.0.1</listen_host>
 
@@ -17,4 +17,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_with_proxy/configs/config.d/storage_conf.xml b/tests/integration/test_s3_with_proxy/configs/config.d/storage_conf.xml
index ccae67c7c09..132eac4a2a6 100644
--- a/tests/integration/test_s3_with_proxy/configs/config.d/storage_conf.xml
+++ b/tests/integration/test_s3_with_proxy/configs/config.d/storage_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <s3>
@@ -26,6 +26,7 @@
                         <endpoint>http://resolver:8080/hostname</endpoint>
                         <proxy_scheme>http</proxy_scheme>
                         <proxy_port>80</proxy_port>
+                        <proxy_cache_time>10</proxy_cache_time>
                     </resolver>
                 </proxy>
             </s3_with_resolver>
@@ -47,4 +48,4 @@
             </s3_with_resolver>
         </policies>
     </storage_configuration>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_with_proxy/configs/config.d/users.xml b/tests/integration/test_s3_with_proxy/configs/config.d/users.xml
index 797113053f4..0011583a68c 100644
--- a/tests/integration/test_s3_with_proxy/configs/config.d/users.xml
+++ b/tests/integration/test_s3_with_proxy/configs/config.d/users.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default/>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_with_proxy/configs/config.xml b/tests/integration/test_s3_with_proxy/configs/config.xml
index 24b7344df3a..59829ffdb56 100644
--- a/tests/integration/test_s3_with_proxy/configs/config.xml
+++ b/tests/integration/test_s3_with_proxy/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <tcp_port>9000</tcp_port>
     <listen_host>127.0.0.1</listen_host>
 
@@ -17,4 +17,4 @@
     <mark_cache_size>5368709120</mark_cache_size>
     <path>./clickhouse/</path>
     <users_config>users.xml</users_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
index 89c97aa3360..5d10ac0d959 100644
--- a/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
+++ b/tests/integration/test_s3_zero_copy_replication/configs/config.d/s3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
     <storage_configuration>
         <disks>
@@ -66,7 +66,6 @@
     <merge_tree>
         <min_bytes_for_wide_part>1024</min_bytes_for_wide_part>
         <old_parts_lifetime>1</old_parts_lifetime>
-        <allow_remote_fs_zero_copy_replication>1</allow_remote_fs_zero_copy_replication>
     </merge_tree>
 
     <remote_servers>
@@ -90,4 +89,4 @@
         <cluster>test_cluster</cluster>
     </macros>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml b/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml
index 0c109d6d768..4f8dfa32910 100644
--- a/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml
+++ b/tests/integration/test_secure_socket/configs_secure/config.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <tcp_port_secure>9440</tcp_port_secure>
     <remote_servers>
         <test_cluster>
@@ -11,4 +11,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml b/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml
index fe39e3712b8..6234477993a 100644
--- a/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml
+++ b/tests/integration/test_secure_socket/configs_secure/config.d/ssl_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/config.d/server.crt</certificateFile>
@@ -15,4 +15,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_secure_socket/configs_secure/users.d/users.xml b/tests/integration/test_secure_socket/configs_secure/users.d/users.xml
index 479017f6370..db0dd71de56 100644
--- a/tests/integration/test_secure_socket/configs_secure/users.d/users.xml
+++ b/tests/integration/test_secure_socket/configs_secure/users.d/users.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_secure_socket/test.py b/tests/integration/test_secure_socket/test.py
index 65c789f9d02..c542b855258 100644
--- a/tests/integration/test_secure_socket/test.py
+++ b/tests/integration/test_secure_socket/test.py
@@ -9,13 +9,13 @@ cluster = ClickHouseCluster(__file__)
 
 NODES = {'node' + str(i): None for i in (1, 2)}
 
-config = '''<yandex>
+config = '''<clickhouse>
     <profiles>
         <default>
             <sleep_in_send_data_ms>{sleep_in_send_data_ms}</sleep_in_send_data_ms>
         </default>
     </profiles>
-</yandex>'''
+</clickhouse>'''
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml b/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml
index 10f559b0054..0a3b16dbc84 100644
--- a/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml
+++ b/tests/integration/test_send_crash_reports/configs/config_send_crash_reports.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <send_crash_reports>
         <enabled>true</enabled>
         <debug>true</debug>
         <endpoint>http://6f33034cfe684dd7a3ab9875e57b1c8d@localhost:9500/5226277</endpoint>
     </send_crash_reports>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_send_crash_reports/test.py b/tests/integration/test_send_crash_reports/test.py
index ab52879c7c3..55c63c3fe12 100644
--- a/tests/integration/test_send_crash_reports/test.py
+++ b/tests/integration/test_send_crash_reports/test.py
@@ -1,9 +1,14 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=line-too-long
+# pylint: disable=bare-except
+
 import os
 import time
+import pytest
 
 import helpers.cluster
 import helpers.test_tools
-import pytest
 
 from . import fake_sentry_server
 
@@ -20,7 +25,11 @@ def started_node():
         cluster.start()
         yield node
     finally:
-        cluster.shutdown()
+        # It will print Fatal message after pkill -SEGV, suppress it
+        try:
+            cluster.shutdown()
+        except:
+            pass
 
 
 def test_send_segfault(started_node):
@@ -30,7 +39,7 @@ def test_send_segfault(started_node):
     started_node.copy_file_to_container(os.path.join(SCRIPT_DIR, "fake_sentry_server.py"), "/fake_sentry_server.py")
     started_node.exec_in_container(["bash", "-c", "python3 /fake_sentry_server.py > /fake_sentry_server.log 2>&1"], detach=True, user="root")
     time.sleep(1)
-    started_node.exec_in_container(["bash", "-c", "pkill -11 clickhouse"], user="root")
+    started_node.exec_in_container(["bash", "-c", "pkill -SEGV clickhouse"], user="root")
 
     result = None
     for attempt in range(1, 6):
@@ -38,9 +47,9 @@ def test_send_segfault(started_node):
         result = started_node.exec_in_container(['cat', fake_sentry_server.RESULT_PATH], user='root')
         if result == 'OK':
             break
-        elif result == 'INITIAL_STATE':
+        if result == 'INITIAL_STATE':
             continue
-        elif result:
+        if result:
             assert False, 'Unexpected state: ' + result
 
     assert result == 'OK', 'Crash report not sent'
diff --git a/tests/integration/test_send_request_to_leader_replica/configs/remote_servers.xml b/tests/integration/test_send_request_to_leader_replica/configs/remote_servers.xml
index 149569e4c28..daca375693e 100644
--- a/tests/integration/test_send_request_to_leader_replica/configs/remote_servers.xml
+++ b/tests/integration/test_send_request_to_leader_replica/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -27,4 +27,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_send_request_to_leader_replica/configs/user_good_allowed.xml b/tests/integration/test_send_request_to_leader_replica/configs/user_good_allowed.xml
index e72fb61d2af..541e995398e 100644
--- a/tests/integration/test_send_request_to_leader_replica/configs/user_good_allowed.xml
+++ b/tests/integration/test_send_request_to_leader_replica/configs/user_good_allowed.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -35,4 +35,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_send_request_to_leader_replica/configs/user_good_restricted.xml b/tests/integration/test_send_request_to_leader_replica/configs/user_good_restricted.xml
index ea0714aec11..116207b7341 100644
--- a/tests/integration/test_send_request_to_leader_replica/configs/user_good_restricted.xml
+++ b/tests/integration/test_send_request_to_leader_replica/configs/user_good_restricted.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -49,4 +49,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_settings_constraints/configs/users.xml b/tests/integration/test_settings_constraints/configs/users.xml
index b29b66d827f..2ff02086e3e 100644
--- a/tests/integration/test_settings_constraints/configs/users.xml
+++ b/tests/integration/test_settings_constraints/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -55,4 +55,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_settings_constraints_distributed/configs/config.d/remote_servers.xml b/tests/integration/test_settings_constraints_distributed/configs/config.d/remote_servers.xml
index 2417ad81aec..282703ab691 100644
--- a/tests/integration/test_settings_constraints_distributed/configs/config.d/remote_servers.xml
+++ b/tests/integration/test_settings_constraints_distributed/configs/config.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -17,4 +17,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_settings_constraints_distributed/configs/users.d/allow_introspection_functions.xml b/tests/integration/test_settings_constraints_distributed/configs/users.d/allow_introspection_functions.xml
index ccfdf6a63f6..ec3057c82d7 100644
--- a/tests/integration/test_settings_constraints_distributed/configs/users.d/allow_introspection_functions.xml
+++ b/tests/integration/test_settings_constraints_distributed/configs/users.d/allow_introspection_functions.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <allow_introspection_functions>1</allow_introspection_functions>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_shard_level_const_function/configs/remote_servers.xml b/tests/integration/test_shard_level_const_function/configs/remote_servers.xml
index 68dcfcc1460..8791c5f6ee8 100644
--- a/tests/integration/test_shard_level_const_function/configs/remote_servers.xml
+++ b/tests/integration/test_shard_level_const_function/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <two_shards>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </two_shards>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_sharding_key_from_default_column/__init__.py b/tests/integration/test_sharding_key_from_default_column/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_sharding_key_from_default_column/configs/test_cluster.xml b/tests/integration/test_sharding_key_from_default_column/configs/test_cluster.xml
new file mode 100644
index 00000000000..0437e047fad
--- /dev/null
+++ b/tests/integration/test_sharding_key_from_default_column/configs/test_cluster.xml
@@ -0,0 +1,18 @@
+<yandex>
+<remote_servers>
+    <test_cluster>
+        <shard>
+            <replica>
+                <host>node1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+        <shard>
+            <replica>
+                <host>node2</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </test_cluster>
+</remote_servers>
+</yandex>
diff --git a/tests/integration/test_sharding_key_from_default_column/test.py b/tests/integration/test_sharding_key_from_default_column/test.py
new file mode 100644
index 00000000000..1717a1ee14a
--- /dev/null
+++ b/tests/integration/test_sharding_key_from_default_column/test.py
@@ -0,0 +1,116 @@
+import pytest
+import itertools
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance('node1', main_configs=['configs/test_cluster.xml'], with_zookeeper=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/test_cluster.xml'], with_zookeeper=True)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def cleanup_after_test():
+    try:
+        yield
+    finally:
+        node1.query("DROP TABLE IF EXISTS dist ON CLUSTER 'test_cluster'")
+        node1.query("DROP TABLE IF EXISTS local ON CLUSTER 'test_cluster'")
+
+
+# A default column is used in the sharding key expression.
+def test_default_column():
+    node1.query("CREATE TABLE dist ON CLUSTER 'test_cluster' (x Int32, y Int32 DEFAULT x + 100, z Int32 DEFAULT x + y) ENGINE = Distributed('test_cluster', currentDatabase(), local, y)")
+    node1.query("CREATE TABLE local ON CLUSTER 'test_cluster' (x Int32, y Int32 DEFAULT x + 200, z Int32 DEFAULT x - y) ENGINE = MergeTree() ORDER BY y")
+
+    for insert_sync in [0, 1]:
+        settings = {'insert_distributed_sync': insert_sync}
+        
+        # INSERT INTO TABLE dist (x)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        node1.query("INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings)
+        node1.query("SYSTEM FLUSH DISTRIBUTED dist")
+        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 102, 104], [4, 104, 108]])
+        assert node2.query("SELECT x, y, z FROM local") == TSV([[1, 101, 102], [3, 103, 106]])
+        assert node1.query("SELECT x, y, z FROM dist") == TSV([[2, 102, 104], [4, 104, 108], [1, 101, 102], [3, 103, 106]])
+
+        # INSERT INTO TABLE dist (x, y)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        node1.query("INSERT INTO TABLE dist (x, y) VALUES (1, 11), (2, 22), (3, 33)", settings=settings)
+        node1.query("SYSTEM FLUSH DISTRIBUTED dist")
+        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 22, 24]])
+        assert node2.query("SELECT x, y, z FROM local") == TSV([[1, 11, 12], [3, 33, 36]])
+        assert node1.query("SELECT x, y, z FROM dist") == TSV([[2, 22, 24], [1, 11, 12], [3, 33, 36]])
+
+
+# A materialized column is used in the sharding key expression and `insert_allow_materialized_columns` set to 1.
+def test_materialized_column_allow_insert_materialized():
+    node1.query("CREATE TABLE dist ON CLUSTER 'test_cluster' (x Int32, y Int32 MATERIALIZED x + 100, z Int32 MATERIALIZED x + y) ENGINE = Distributed('test_cluster', currentDatabase(), local, y)")
+    node1.query("CREATE TABLE local ON CLUSTER 'test_cluster' (x Int32, y Int32 MATERIALIZED x + 200, z Int32 MATERIALIZED x - y) ENGINE = MergeTree() ORDER BY y")
+
+    for insert_sync in [0, 1]:
+        settings = {'insert_distributed_sync': insert_sync, 'insert_allow_materialized_columns': 1}
+        
+        # INSERT INTO TABLE dist (x)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        node1.query("INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings)
+        node1.query("SYSTEM FLUSH DISTRIBUTED dist")
+        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 102, 104], [4, 104, 108]])
+        assert node2.query("SELECT x, y, z FROM local") == TSV([[1, 101, 102], [3, 103, 106]])
+        assert node1.query("SELECT x, y, z FROM dist") == TSV([[2, 102, 104], [4, 104, 108], [1, 101, 102], [3, 103, 106]])
+
+        # INSERT INTO TABLE dist (x, y)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        node1.query("INSERT INTO TABLE dist (x, y) VALUES (1, 11), (2, 22), (3, 33)", settings=settings)
+        node1.query("SYSTEM FLUSH DISTRIBUTED dist")
+        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 22, 24]])
+        assert node2.query("SELECT x, y, z FROM local") == TSV([[1, 11, 12], [3, 33, 36]])
+        assert node1.query("SELECT x, y, z FROM dist") == TSV([[2, 22, 24], [1, 11, 12], [3, 33, 36]])
+
+
+# A materialized column is used in the sharding key expression and `insert_allow_materialized_columns` set to 0.
+def test_materialized_column_disallow_insert_materialized():
+    node1.query("CREATE TABLE dist ON CLUSTER 'test_cluster' (x Int32, y Int32 MATERIALIZED x + 100, z Int32 MATERIALIZED x + y) ENGINE = Distributed('test_cluster', currentDatabase(), local, y)")
+    node1.query("CREATE TABLE local ON CLUSTER 'test_cluster' (x Int32, y Int32 MATERIALIZED x + 200, z Int32 MATERIALIZED x - y) ENGINE = MergeTree() ORDER BY y")
+
+    for insert_sync in [0, 1]:
+        settings = {'insert_distributed_sync': insert_sync, 'insert_allow_materialized_columns': 0}
+        
+        # INSERT INTO TABLE dist (x)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        node1.query("INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings)
+        node1.query("SYSTEM FLUSH DISTRIBUTED dist")
+        assert node1.query("SELECT x, y, z FROM local") == TSV([[2, 202, -200], [4, 204, -200]])
+        assert node2.query("SELECT x, y, z FROM local") == TSV([[1, 201, -200], [3, 203, -200]])
+        assert node1.query("SELECT x, y, z FROM dist") == TSV([[2, 202, -200], [4, 204, -200], [1, 201, -200], [3, 203, -200]])
+
+        # INSERT INTO TABLE dist (x, y)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        expected_error = "Cannot insert column y, because it is MATERIALIZED column"
+        assert expected_error in node1.query_and_get_error("INSERT INTO TABLE dist (x, y) VALUES (1, 11), (2, 22), (3, 33)", settings=settings)
+
+
+# Almost the same as the previous test `test_materialized_column_disallow_insert_materialized`, but the sharding key has different values.
+def test_materialized_column_disallow_insert_materialized_different_shards():
+    node1.query("CREATE TABLE dist ON CLUSTER 'test_cluster' (x Int32, y Int32 MATERIALIZED x + 101, z Int32 MATERIALIZED x + y) ENGINE = Distributed('test_cluster', currentDatabase(), local, y)")
+    node1.query("CREATE TABLE local ON CLUSTER 'test_cluster' (x Int32, y Int32 MATERIALIZED x + 200, z Int32 MATERIALIZED x - y) ENGINE = MergeTree() ORDER BY y")
+
+    for insert_sync in [0, 1]:
+        settings = {'insert_distributed_sync': insert_sync, 'insert_allow_materialized_columns': 0}
+        
+        # INSERT INTO TABLE dist (x)
+        node1.query("TRUNCATE TABLE local ON CLUSTER 'test_cluster'")
+        node1.query("INSERT INTO TABLE dist (x) VALUES (1), (2), (3), (4)", settings=settings)
+        node1.query("SYSTEM FLUSH DISTRIBUTED dist")
+        assert node1.query("SELECT x, y, z FROM local") == TSV([[1, 201, -200], [3, 203, -200]])
+        assert node2.query("SELECT x, y, z FROM local") == TSV([[2, 202, -200], [4, 204, -200]])
+        assert node1.query("SELECT x, y, z FROM dist") == TSV([[1, 201, -200], [3, 203, -200], [2, 202, -200], [4, 204, -200]])
diff --git a/tests/integration/test_sql_user_defined_functions_on_cluster/__init__.py b/tests/integration/test_sql_user_defined_functions_on_cluster/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_sql_user_defined_functions_on_cluster/configs/config.d/clusters.xml b/tests/integration/test_sql_user_defined_functions_on_cluster/configs/config.d/clusters.xml
new file mode 100644
index 00000000000..4d668f591b9
--- /dev/null
+++ b/tests/integration/test_sql_user_defined_functions_on_cluster/configs/config.d/clusters.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+<remote_servers>
+    <cluster>
+        <shard>
+            <replica>
+                <host>ch1</host>
+                <port>9000</port>
+            </replica>
+            <replica>
+                <host>ch2</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+        <shard>
+            <replica>
+                <host>ch3</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster>
+</remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_sql_user_defined_functions_on_cluster/test.py b/tests/integration/test_sql_user_defined_functions_on_cluster/test.py
new file mode 100644
index 00000000000..d5c74a99622
--- /dev/null
+++ b/tests/integration/test_sql_user_defined_functions_on_cluster/test.py
@@ -0,0 +1,34 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+ch1 = cluster.add_instance('ch1', main_configs=["configs/config.d/clusters.xml"], with_zookeeper=True)
+ch2 = cluster.add_instance('ch2', main_configs=["configs/config.d/clusters.xml"], with_zookeeper=True)
+ch3 = cluster.add_instance('ch3', main_configs=["configs/config.d/clusters.xml"], with_zookeeper=True)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_sql_user_defined_functions_on_cluster():
+    assert "Unknown function test_function" in ch1.query_and_get_error("SELECT test_function(1);")
+    assert "Unknown function test_function" in ch2.query_and_get_error("SELECT test_function(1);")
+    assert "Unknown function test_function" in ch3.query_and_get_error("SELECT test_function(1);")
+
+    ch1.query_with_retry("CREATE FUNCTION test_function ON CLUSTER 'cluster' AS x -> x + 1;")
+
+    assert ch1.query("SELECT test_function(1);") == "2\n"
+    assert ch2.query("SELECT test_function(1);") == "2\n"
+    assert ch3.query("SELECT test_function(1);") == "2\n"
+
+    ch2.query_with_retry("DROP FUNCTION test_function ON CLUSTER 'cluster'")
+    assert "Unknown function test_function" in ch1.query_and_get_error("SELECT test_function(1);")
+    assert "Unknown function test_function" in ch2.query_and_get_error("SELECT test_function(1);")
+    assert "Unknown function test_function" in ch3.query_and_get_error("SELECT test_function(1);")
diff --git a/tests/integration/test_storage_kafka/configs/kafka.xml b/tests/integration/test_storage_kafka/configs/kafka.xml
index ce1a2f502ad..f05f81f59b7 100644
--- a/tests/integration/test_storage_kafka/configs/kafka.xml
+++ b/tests/integration/test_storage_kafka/configs/kafka.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <kafka>
         <auto_offset_reset>earliest</auto_offset_reset>
         <!-- Debugging of possible issues, like:
@@ -17,4 +17,4 @@
         <!-- default: 10000 -->
         <session_timeout_ms>6000</session_timeout_ms>
     </kafka_consumer_hang>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_kafka/configs/users.xml b/tests/integration/test_storage_kafka/configs/users.xml
index 246e6b069ef..5ddc3c10a68 100644
--- a/tests/integration/test_storage_kafka/configs/users.xml
+++ b/tests/integration/test_storage_kafka/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <!--stream_poll_timeout_ms>1</stream_poll_timeout_ms>
@@ -22,4 +22,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index b9fc0b2272f..6106966e5b7 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -2,19 +2,18 @@ import json
 import os.path as p
 import random
 import socket
-import subprocess
 import threading
 import time
 import logging
 import io
 import string
+import ast
 
 import avro.schema
 import avro.io
 import avro.datafile
 from confluent_kafka.avro.cached_schema_registry_client import CachedSchemaRegistryClient
 from confluent_kafka.avro.serializer.message_serializer import MessageSerializer
-from confluent_kafka import admin
 
 import kafka.errors
 import pytest
@@ -72,6 +71,43 @@ def get_kafka_producer(port, serializer, retries):
 def producer_serializer(x):
     return x.encode() if isinstance(x, str) else x
 
+def kafka_create_topic(admin_client, topic_name, num_partitions=1, replication_factor=1,  max_retries=50, config=None):
+    logging.debug(f"Kafka create topic={topic_name}, num_partitions={num_partitions}, replication_factor={replication_factor}")
+    topics_list = [NewTopic(name=topic_name, num_partitions=num_partitions, replication_factor=replication_factor, topic_configs=config)]
+    retries = 0
+    while True:
+        try:
+            admin_client.create_topics(new_topics=topics_list, validate_only=False)
+            logging.debug("Admin client succeed")
+            return
+        except Exception as e:
+            retries += 1
+            time.sleep(0.5)
+            if retries < max_retries:
+                logging.warning(f"Failed to create topic {e}")
+            else:
+                raise
+
+def kafka_delete_topic(admin_client, topic, max_retries=50):
+    result = admin_client.delete_topics([topic])
+    for (topic, e) in result.topic_error_codes:
+        if e == 0:
+            logging.debug(f"Topic {topic} deleted")
+        else:
+            logging.error(f"Failed to delete topic {topic}: {e}")
+
+    retries = 0
+    while True:
+        topics_listed = admin_client.list_topics()
+        logging.debug(f"TOPICS LISTED: {topics_listed}")
+        if topic not in topics_listed:
+            return
+        else:
+            retries += 1
+            time.sleep(0.5)
+            if retries > max_retries:
+                raise Exception(f"Failed to delete topics {topic}, {result}")
+
 def kafka_produce(kafka_cluster, topic, messages, timestamp=None, retries=15):
     logging.debug("kafka_produce server:{}:{} topic:{}".format("localhost", kafka_cluster.kafka_port, topic))
     producer = get_kafka_producer(kafka_cluster.kafka_port, producer_serializer, retries)
@@ -181,54 +217,6 @@ def avro_confluent_message(schema_registry_client, value):
     })
     return serializer.encode_record_with_schema('test_subject', schema, value)
 
-# Since everything is async and shaky when receiving messages from Kafka,
-# we may want to try and check results multiple times in a loop.
-def kafka_check_result(result, check=False, ref_file='test_kafka_json.reference'):
-    fpath = p.join(p.dirname(__file__), ref_file)
-    with open(fpath) as reference:
-        if check:
-            assert TSV(result) == TSV(reference)
-        else:
-            return TSV(result) == TSV(reference)
-
-def describe_consumer_group(kafka_cluster, name):
-    admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
-    consumer_groups = admin_client.describe_consumer_groups([name])
-    res = []
-    for member in consumer_groups[0].members:
-        member_info = {}
-        member_info['member_id'] = member.member_id
-        member_info['client_id'] = member.client_id
-        member_info['client_host'] = member.client_host
-        member_topics_assignment = []
-        for (topic, partitions) in member.member_assignment.assignment:
-            member_topics_assignment.append({'topic': topic, 'partitions': partitions})
-        member_info['assignment'] = member_topics_assignment
-        res.append(member_info)
-    return res
-
-# Fixtures
-
-@pytest.fixture(scope="module")
-def kafka_cluster():
-    try:
-        global kafka_id
-        cluster.start()
-        kafka_id = instance.cluster.kafka_docker_id
-        print(("kafka_id is {}".format(kafka_id)))
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-@pytest.fixture(autouse=True)
-def kafka_setup_teardown():
-    instance.query('DROP DATABASE IF EXISTS test; CREATE DATABASE test;')
-    wait_kafka_is_available() # ensure kafka is alive
-    kafka_producer_send_heartbeat_msg() # ensure python kafka client is ok
-    # print("kafka is available - running test")
-    yield  # run test
-
 # Tests
 
 def test_kafka_settings_old_syntax(kafka_cluster):
@@ -262,7 +250,7 @@ kafka_topic_old	old
 
     kafka_check_result(result, True)
 
-    members = describe_consumer_group('old')
+    members = describe_consumer_group(kafka_cluster, 'old')
     assert members[0]['client_id'] == 'ClickHouse-instance-test-kafka'
     # text_desc = kafka_cluster.exec_in_container(kafka_cluster.get_container_id('kafka1'),"kafka-consumer-groups --bootstrap-server localhost:9092 --describe --members --group old --verbose"))
 
@@ -302,7 +290,7 @@ def test_kafka_settings_new_syntax(kafka_cluster):
 
     kafka_check_result(result, True)
 
-    members = describe_consumer_group('new')
+    members = describe_consumer_group(kafka_cluster, 'new')
     assert members[0]['client_id'] == 'instance test 1234'
 
 
@@ -310,6 +298,11 @@ def test_kafka_json_as_string(kafka_cluster):
     kafka_produce(kafka_cluster, 'kafka_json_as_string', ['{"t": 123, "e": {"x": "woof"} }', '', '{"t": 124, "e": {"x": "test"} }',
                                            '{"F1":"V1","F2":{"F21":"V21","F22":{},"F23":"V23","F24":"2019-12-24T16:28:04"},"F3":"V3"}'])
 
+    # 'tombstone' record (null value) = marker of deleted record
+    producer = KafkaProducer(bootstrap_servers="localhost:{}".format(cluster.kafka_port), value_serializer=producer_serializer, key_serializer=producer_serializer)
+    producer.send(topic='kafka_json_as_string', key='xxx')
+    producer.flush()
+
     instance.query('''
         CREATE TABLE test.kafka (field String)
             ENGINE = Kafka
@@ -333,6 +326,7 @@ def test_kafka_json_as_string(kafka_cluster):
 
 def test_kafka_formats(kafka_cluster):
     schema_registry_client = CachedSchemaRegistryClient('http://localhost:{}'.format(kafka_cluster.schema_registry_port))
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
     # data was dumped from clickhouse itself in a following manner
     # clickhouse-client --format=Native --query='SELECT toInt64(number) as id, toUInt16( intDiv( id, 65536 ) ) as blockNo, reinterpretAsString(19777) as val1, toFloat32(0.5) as val2, toUInt8(1) as val3 from numbers(100) ORDER BY id' | xxd -ps | tr -d '\n' | sed 's/\(..\)/\\x\1/g'
@@ -650,7 +644,7 @@ def test_kafka_formats(kafka_cluster):
 
     for format_name, format_opts in list(all_formats.items()):
         logging.debug(('Checking {}'.format(format_name)))
-        topic_name = 'format_tests_{}'.format(format_name)
+        topic_name = f'format_tests_{format_name}'
         # shift offsets by 1 if format supports empty value
         offsets = [1, 2, 3] if format_opts.get('supports_empty_value', False) else [0, 1, 2]
         result = instance.query('SELECT * FROM test.kafka_{format_name}_mv;'.format(format_name=format_name))
@@ -674,7 +668,7 @@ def test_kafka_formats(kafka_cluster):
 0	0	AM	0.5	1	{topic_name}	0	{offset_2}
 '''.format(topic_name=topic_name, offset_0=offsets[0], offset_1=offsets[1], offset_2=offsets[2])
         assert TSV(result) == TSV(expected), 'Proper result for format: {}'.format(format_name)
-
+        kafka_delete_topic(admin_client, topic_name)
 
 # Since everything is async and shaky when receiving messages from Kafka,
 # we may want to try and check results multiple times in a loop.
@@ -721,6 +715,8 @@ def describe_consumer_group(kafka_cluster, name):
 def kafka_cluster():
     try:
         cluster.start()
+        kafka_id = instance.cluster.kafka_docker_id
+        print(("kafka_id is {}".format(kafka_id)))
         yield cluster
     finally:
         cluster.shutdown()
@@ -734,82 +730,6 @@ def kafka_setup_teardown():
 
 
 # Tests
-
-def test_kafka_settings_old_syntax(kafka_cluster):
-    assert TSV(instance.query("SELECT * FROM system.macros WHERE macro like 'kafka%' ORDER BY macro",
-                              ignore_error=True)) == TSV('''kafka_broker	kafka1
-kafka_client_id	instance
-kafka_format_json_each_row	JSONEachRow
-kafka_group_name_new	new
-kafka_group_name_old	old
-kafka_topic_new	new
-kafka_topic_old	old
-''')
-
-    instance.query('''
-        CREATE TABLE test.kafka (key UInt64, value UInt64)
-            ENGINE = Kafka('{kafka_broker}:19092', '{kafka_topic_old}', '{kafka_group_name_old}', '{kafka_format_json_each_row}', '\\n');
-        ''')
-
-    # Don't insert malformed messages since old settings syntax
-    # doesn't support skipping of broken messages.
-    messages = []
-    for i in range(50):
-        messages.append(json.dumps({'key': i, 'value': i}))
-    kafka_produce(kafka_cluster, 'old', messages)
-
-    result = ''
-    while True:
-        result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
-        if kafka_check_result(result):
-            break
-
-    kafka_check_result(result, True)
-
-    members = describe_consumer_group(kafka_cluster, 'old')
-    assert members[0]['client_id'] == 'ClickHouse-instance-test-kafka'
-    # text_desc = kafka_cluster.exec_in_container(kafka_cluster.get_container_id('kafka1'),"kafka-consumer-groups --bootstrap-server localhost:{} --describe --members --group old --verbose".format(cluster.kafka_port)))
-
-
-def test_kafka_settings_new_syntax(kafka_cluster):
-    instance.query('''
-        CREATE TABLE test.kafka (key UInt64, value UInt64)
-            ENGINE = Kafka
-            SETTINGS kafka_broker_list = '{kafka_broker}:19092',
-                     kafka_topic_list = '{kafka_topic_new}',
-                     kafka_group_name = '{kafka_group_name_new}',
-                     kafka_format = '{kafka_format_json_each_row}',
-                     kafka_row_delimiter = '\\n',
-                     kafka_client_id = '{kafka_client_id} test 1234',
-                     kafka_skip_broken_messages = 1;
-        ''')
-
-    messages = []
-    for i in range(25):
-        messages.append(json.dumps({'key': i, 'value': i}))
-    kafka_produce(kafka_cluster, 'new', messages)
-
-    # Insert couple of malformed messages.
-    kafka_produce(kafka_cluster, 'new', ['}{very_broken_message,'])
-    kafka_produce(kafka_cluster, 'new', ['}another{very_broken_message,'])
-
-    messages = []
-    for i in range(25, 50):
-        messages.append(json.dumps({'key': i, 'value': i}))
-    kafka_produce(kafka_cluster, 'new', messages)
-
-    result = ''
-    while True:
-        result += instance.query('SELECT * FROM test.kafka', ignore_error=True)
-        if kafka_check_result(result):
-            break
-
-    kafka_check_result(result, True)
-
-    members = describe_consumer_group(kafka_cluster, 'new')
-    assert members[0]['client_id'] == 'instance test 1234'
-
-
 def test_kafka_issue11308(kafka_cluster):
     # Check that matview does respect Kafka SETTINGS
     kafka_produce(kafka_cluster, 'issue11308', ['{"t": 123, "e": {"x": "woof"} }', '{"t": 123, "e": {"x": "woof"} }',
@@ -889,11 +809,10 @@ def test_kafka_issue4116(kafka_cluster):
 def test_kafka_consumer_hang(kafka_cluster):
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-    topic_list = []
-    topic_list.append(NewTopic(name="consumer_hang", num_partitions=8, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "consumer_hang"
+    kafka_create_topic(admin_client, topic_name, num_partitions=8)
 
-    instance.query('''
+    instance.query(f'''
         DROP TABLE IF EXISTS test.kafka;
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
@@ -901,8 +820,8 @@ def test_kafka_consumer_hang(kafka_cluster):
         CREATE TABLE test.kafka (key UInt64, value UInt64)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kafka1:19092',
-                     kafka_topic_list = 'consumer_hang',
-                     kafka_group_name = 'consumer_hang',
+                     kafka_topic_list = '{topic_name}',
+                     kafka_group_name = '{topic_name}',
                      kafka_format = 'JSONEachRow',
                      kafka_num_consumers = 8;
         CREATE TABLE test.view (key UInt64, value UInt64) ENGINE = Memory();
@@ -936,13 +855,28 @@ def test_kafka_consumer_hang(kafka_cluster):
     # 'dr'||'op' to avoid self matching
     assert int(instance.query("select count() from system.processes where position(lower(query),'dr'||'op')>0")) == 0
 
+    # cleanup unread messages so kafka will not wait reading consumers to delete topic
+    instance.query(f'''
+            CREATE TABLE test.kafka (key UInt64)
+            ENGINE = Kafka
+            SETTINGS kafka_broker_list = 'kafka1:19092',
+                     kafka_topic_list = '{topic_name}',
+                     kafka_group_name = '{topic_name}',
+                     kafka_format = 'JSONEachRow',
+                     kafka_num_consumers = 8;
+        ''')
+
+    num_read = int(instance.query('SELECT count() FROM test.kafka'))
+    logging.debug(f"read {num_read} from {topic_name} before delete")
+    instance.query('DROP TABLE test.kafka')
+    kafka_delete_topic(admin_client, topic_name)
+
 
 def test_kafka_consumer_hang2(kafka_cluster):
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-    topic_list = []
-    topic_list.append(NewTopic(name="consumer_hang2", num_partitions=1, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "consumer_hang2"
+    kafka_create_topic(admin_client, topic_name)
 
     instance.query('''
         DROP TABLE IF EXISTS test.kafka;
@@ -982,6 +916,7 @@ def test_kafka_consumer_hang2(kafka_cluster):
     # from a user perspective: we expect no hanging 'drop' queries
     # 'dr'||'op' to avoid self matching
     assert int(instance.query("select count() from system.processes where position(lower(query),'dr'||'op')>0")) == 0
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_kafka_csv_with_delimiter(kafka_cluster):
@@ -1034,21 +969,21 @@ def test_kafka_tsv_with_delimiter(kafka_cluster):
 
 def test_kafka_select_empty(kafka_cluster):
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
-    topic_list = []
-    topic_list.append(NewTopic(name="empty", num_partitions=1, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "empty"
+    kafka_create_topic(admin_client, topic_name)
 
-    instance.query('''
+    instance.query(f'''
         CREATE TABLE test.kafka (key UInt64)
             ENGINE = Kafka
             SETTINGS kafka_broker_list = 'kafka1:19092',
-                     kafka_topic_list = 'empty',
-                     kafka_group_name = 'empty',
+                     kafka_topic_list = '{topic_name}',
+                     kafka_group_name = '{topic_name}',
                      kafka_format = 'TSV',
                      kafka_row_delimiter = '\\n';
         ''')
 
     assert int(instance.query('SELECT count() FROM test.kafka')) == 0
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_kafka_json_without_delimiter(kafka_cluster):
@@ -1227,6 +1162,7 @@ def test_kafka_protobuf_no_delimiter(kafka_cluster):
 
 
 def test_kafka_materialized_view(kafka_cluster):
+
     instance.query('''
         DROP TABLE IF EXISTS test.view;
         DROP TABLE IF EXISTS test.consumer;
@@ -1270,9 +1206,8 @@ def test_kafka_recreate_kafka_table(kafka_cluster):
     # admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-    topic_list = []
-    topic_list.append(NewTopic(name="recreate_kafka_table", num_partitions=6, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "recreate_kafka_table"
+    kafka_create_topic(admin_client, topic_name, num_partitions=6)
 
     instance.query('''
         DROP TABLE IF EXISTS test.view;
@@ -1328,6 +1263,7 @@ def test_kafka_recreate_kafka_table(kafka_cluster):
         DROP TABLE test.consumer;
         DROP TABLE test.view;
     ''')
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_librdkafka_compression(kafka_cluster):
@@ -1370,12 +1306,9 @@ def test_librdkafka_compression(kafka_cluster):
         logging.debug(('Check compression {}'.format(compression_type)))
 
         topic_name = 'test_librdkafka_compression_{}'.format(compression_type)
-        admin_client = admin.AdminClient({'bootstrap.servers': "localhost:{}".format(kafka_cluster.kafka_port)})
+        admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-        topic = admin.NewTopic(topic=topic_name, num_partitions=1, replication_factor=1, config={
-            'compression.type': compression_type,
-        })
-        admin_client.create_topics(new_topics=[topic], validate_only=False)
+        kafka_create_topic(admin_client, topic_name, config={'compression.type': compression_type})
 
         instance.query('''
             CREATE TABLE test.kafka (key UInt64, value String)
@@ -1398,6 +1331,8 @@ def test_librdkafka_compression(kafka_cluster):
 
         instance.query('DROP TABLE test.kafka SYNC')
         instance.query('DROP TABLE test.consumer SYNC')
+        kafka_delete_topic(admin_client, topic_name)
+
 
 def test_kafka_materialized_view_with_subquery(kafka_cluster):
     instance.query('''
@@ -1585,18 +1520,21 @@ def test_kafka_virtual_columns_with_materialized_view(kafka_cluster):
         messages.append(json.dumps({'key': i, 'value': i}))
     kafka_produce(kafka_cluster, 'virt2', messages, 0)
 
-    while True:
-        result = instance.query('SELECT kafka_key, key, topic, value, offset, partition, timestamp FROM test.view')
-        if kafka_check_result(result, False, 'test_kafka_virtual2.reference'):
-            break
+    sql = 'SELECT kafka_key, key, topic, value, offset, partition, timestamp FROM test.view ORDER BY kafka_key'
+    result = instance.query(sql)
+    iterations = 0
+    while not kafka_check_result(result, False, 'test_kafka_virtual2.reference') and iterations < 10:
+        time.sleep(3)
+        iterations += 1
+        result = instance.query(sql)
+
+    kafka_check_result(result, True, 'test_kafka_virtual2.reference')
 
     instance.query('''
         DROP TABLE test.consumer;
         DROP TABLE test.view;
     ''')
 
-    kafka_check_result(result, True, 'test_kafka_virtual2.reference')
-
 
 def test_kafka_insert(kafka_cluster):
     instance.query('''
@@ -1766,11 +1704,9 @@ def test_kafka_commit_on_block_write(kafka_cluster):
 
 def test_kafka_virtual_columns2(kafka_cluster):
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
-    topic_list = []
-    topic_list.append(NewTopic(name="virt2_0", num_partitions=2, replication_factor=1))
-    topic_list.append(NewTopic(name="virt2_1", num_partitions=2, replication_factor=1))
 
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    kafka_create_topic(admin_client, "virt2_0", num_partitions=2)
+    kafka_create_topic(admin_client, "virt2_1", num_partitions=2)
 
     instance.query('''
         CREATE TABLE test.kafka (value UInt64)
@@ -1811,8 +1747,8 @@ def test_kafka_virtual_columns2(kafka_cluster):
 
     members = describe_consumer_group(kafka_cluster, 'virt2')
     # pprint.pprint(members)
-    members[0]['client_id'] = 'ClickHouse-instance-test-kafka-0'
-    members[1]['client_id'] = 'ClickHouse-instance-test-kafka-1'
+    # members[0]['client_id'] = 'ClickHouse-instance-test-kafka-0'
+    # members[1]['client_id'] = 'ClickHouse-instance-test-kafka-1'
 
     result = instance.query("SELECT * FROM test.view ORDER BY value", ignore_error=True)
 
@@ -1829,14 +1765,16 @@ def test_kafka_virtual_columns2(kafka_cluster):
 
     assert TSV(result) == TSV(expected)
 
+    kafka_delete_topic(admin_client, "virt2_0")
+    kafka_delete_topic(admin_client, "virt2_1")
+
 
 def test_kafka_produce_key_timestamp(kafka_cluster):
 
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-    topic_list = []
-    topic_list.append(NewTopic(name="insert3", num_partitions=1, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "insert3"
+    kafka_create_topic(admin_client, topic_name)
 
     instance.query('''
         DROP TABLE IF EXISTS test.view;
@@ -1888,12 +1826,13 @@ def test_kafka_produce_key_timestamp(kafka_cluster):
 
     assert TSV(result) == TSV(expected)
 
+    kafka_delete_topic(admin_client, topic_name)
+
 
 def test_kafka_flush_by_time(kafka_cluster):
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
-    topic_list = []
-    topic_list.append(NewTopic(name="flush_by_time", num_partitions=1, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "flush_by_time"
+    kafka_create_topic(admin_client, topic_name)
 
     instance.query('''
         DROP TABLE IF EXISTS test.view;
@@ -1947,6 +1886,7 @@ def test_kafka_flush_by_time(kafka_cluster):
     ''')
 
     assert TSV(result) == TSV('1	1')
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_kafka_flush_by_block_size(kafka_cluster):
@@ -2006,13 +1946,11 @@ def test_kafka_flush_by_block_size(kafka_cluster):
     assert int(
         result) == 100, 'Messages from kafka should be flushed when block of size kafka_max_block_size is formed!'
 
-
 def test_kafka_lot_of_partitions_partial_commit_of_bulk(kafka_cluster):
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-    topic_list = []
-    topic_list.append(NewTopic(name="topic_with_multiple_partitions2", num_partitions=10, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "topic_with_multiple_partitions2"
+    kafka_create_topic(admin_client, topic_name, num_partitions=10)
 
     instance.query('''
         DROP TABLE IF EXISTS test.view;
@@ -2052,6 +1990,7 @@ def test_kafka_lot_of_partitions_partial_commit_of_bulk(kafka_cluster):
         DROP TABLE test.consumer;
         DROP TABLE test.view;
     ''')
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_kafka_rebalance(kafka_cluster):
@@ -2078,9 +2017,8 @@ def test_kafka_rebalance(kafka_cluster):
     # time.sleep(2)
 
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
-    topic_list = []
-    topic_list.append(NewTopic(name="topic_with_multiple_partitions", num_partitions=11, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "topic_with_multiple_partitions"
+    kafka_create_topic(admin_client, topic_name, num_partitions=11)
 
     cancel = threading.Event()
 
@@ -2184,6 +2122,7 @@ def test_kafka_rebalance(kafka_cluster):
     kafka_thread.join()
 
     assert result == 1, 'Messages from kafka get duplicated!'
+    kafka_delete_topic(admin_client, topic_name)
 
 
 def test_kafka_no_holes_when_write_suffix_failed(kafka_cluster):
@@ -2222,7 +2161,7 @@ def test_kafka_no_holes_when_write_suffix_failed(kafka_cluster):
     # we have 0.25 (sleepEachRow) * 20 ( Rows ) = 5 sec window after "Polled batch of 20 messages"
     # while materialized view is working to inject zookeeper failure
     pm.drop_instance_zk_connections(instance)
-    instance.wait_for_log_line("Error.*(session has been expired|Connection loss).*while write prefix to view")
+    instance.wait_for_log_line("Error.*(session has been expired|Connection loss).*while pushing to view")
     pm.heal_all()
     instance.wait_for_log_line("Committed offset 22")
 
@@ -2759,6 +2698,7 @@ def test_kafka_engine_put_errors_to_stream_with_random_malformed_json(kafka_clus
 def test_kafka_formats_with_broken_message(kafka_cluster):
     # data was dumped from clickhouse itself in a following manner
     # clickhouse-client --format=Native --query='SELECT toInt64(number) as id, toUInt16( intDiv( id, 65536 ) ) as blockNo, reinterpretAsString(19777) as val1, toFloat32(0.5) as val2, toUInt8(1) as val3 from numbers(100) ORDER BY id' | xxd -ps | tr -d '\n' | sed 's/\(..\)/\\x\1/g'
+    admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
     all_formats = {
         ## Text formats ##
@@ -2853,7 +2793,7 @@ def test_kafka_formats_with_broken_message(kafka_cluster):
                 # broken message
                 "(0,'BAD','AM',0.5,1)",
             ],
-            'expected':r'''{"raw_message":"(0,'BAD','AM',0.5,1)","error":"Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero\/NULL instead of throwing exception.: while executing 'FUNCTION CAST(assumeNotNull(_dummy_0) :: 2, 'UInt16' :: 1) -> CAST(assumeNotNull(_dummy_0), 'UInt16') UInt16 : 4'"}''',
+            'expected':r'''{"raw_message":"(0,'BAD','AM',0.5,1)","error":"Cannot parse string 'BAD' as UInt16: syntax error at begin of string. Note: there are toUInt16OrZero and toUInt16OrNull functions, which returns zero\/NULL instead of throwing exception"}''',
             'supports_empty_value': True,
             'printable':True,
         },
@@ -2928,8 +2868,8 @@ def test_kafka_formats_with_broken_message(kafka_cluster):
 
     topic_name_prefix = 'format_tests_4_stream_'
     for format_name, format_opts in list(all_formats.items()):
-        print(('Set up {}'.format(format_name)))
-        topic_name = topic_name_prefix + '{}'.format(format_name)
+        logging.debug(f'Set up {format_name}')
+        topic_name = f"{topic_name_prefix}{format_name}"
         data_sample = format_opts['data_sample']
         data_prefix = []
         raw_message = '_raw_message'
@@ -2969,8 +2909,8 @@ def test_kafka_formats_with_broken_message(kafka_cluster):
                        extra_settings=format_opts.get('extra_settings') or ''))
 
     for format_name, format_opts in list(all_formats.items()):
-        print(('Checking {}'.format(format_name)))
-        topic_name = topic_name_prefix + '{}'.format(format_name)
+        logging.debug('Checking {format_name}')
+        topic_name = f"{topic_name_prefix}{format_name}"
         # shift offsets by 1 if format supports empty value
         offsets = [1, 2, 3] if format_opts.get('supports_empty_value', False) else [0, 1, 2]
         result = instance.query('SELECT * FROM test.kafka_data_{format_name}_mv;'.format(format_name=format_name))
@@ -2995,11 +2935,14 @@ def test_kafka_formats_with_broken_message(kafka_cluster):
 '''.format(topic_name=topic_name, offset_0=offsets[0], offset_1=offsets[1], offset_2=offsets[2])
         # print(('Checking result\n {result} \n expected \n {expected}\n'.format(result=str(result), expected=str(expected))))
         assert TSV(result) == TSV(expected), 'Proper result for format: {}'.format(format_name)
-        errors_result = instance.query('SELECT raw_message, error FROM test.kafka_errors_{format_name}_mv format JSONEachRow'.format(format_name=format_name))
-        errors_expected = format_opts['expected']
+        errors_result = ast.literal_eval(instance.query('SELECT raw_message, error FROM test.kafka_errors_{format_name}_mv format JSONEachRow'.format(format_name=format_name)))
+        errors_expected = ast.literal_eval(format_opts['expected'])
         # print(errors_result.strip())
         # print(errors_expected.strip())
-        assert  errors_result.strip() == errors_expected.strip(), 'Proper errors for format: {}'.format(format_name)
+        assert errors_result['raw_message'] == errors_expected['raw_message'], 'Proper raw_message for format: {}'.format(format_name)
+        # Errors text can change, just checking prefixes
+        assert errors_expected['error'] in errors_result['error'], 'Proper error for format: {}'.format(format_name)
+        kafka_delete_topic(admin_client, topic_name)
 
 def wait_for_new_data(table_name, prev_count = 0, max_retries = 120):
     retries = 0
@@ -3015,14 +2958,12 @@ def wait_for_new_data(table_name, prev_count = 0, max_retries = 120):
                 raise Exception("No new data :(")
 
 def test_kafka_consumer_failover(kafka_cluster):
-
     # for backporting:
     # admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092")
     admin_client = KafkaAdminClient(bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port))
 
-    topic_list = []
-    topic_list.append(NewTopic(name="kafka_consumer_failover", num_partitions=2, replication_factor=1))
-    admin_client.create_topics(new_topics=topic_list, validate_only=False)
+    topic_name = "kafka_consumer_failover"
+    kafka_create_topic(admin_client, topic_name, num_partitions=2)
 
     instance.query('''
         DROP TABLE IF EXISTS test.kafka;
@@ -3133,6 +3074,7 @@ def test_kafka_consumer_failover(kafka_cluster):
     producer.send(topic='kafka_consumer_failover', value=json.dumps({'key':8,'value': 8}), partition=1)
     producer.flush()
     prev_count = wait_for_new_data('test.destination', prev_count)
+    kafka_delete_topic(admin_client, topic_name)
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml b/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml
index 3a93fa603c7..2e9dc6cc06c 100644
--- a/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml
+++ b/tests/integration/test_storage_kerberized_hdfs/configs/hdfs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
   <hdfs>
 		<hadoop_kerberos_keytab>/tmp/keytab/clickhouse.keytab</hadoop_kerberos_keytab>
 		<hadoop_kerberos_principal>root@TEST.CLICKHOUSE.TECH</hadoop_kerberos_principal>
@@ -10,4 +10,4 @@
   <hdfs_dedicatedcachepath>
 		<hadoop_security_kerberos_ticket_cache_path>/tmp/kerb_cache</hadoop_security_kerberos_ticket_cache_path>
   </hdfs_dedicatedcachepath>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh b/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh
index 769056d70b3..687ddd8fb46 100755
--- a/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh
+++ b/tests/integration/test_storage_kerberized_hdfs/hdfs_configs/bootstrap.sh
@@ -207,7 +207,7 @@ EOF
 
 useradd -u 1098 hdfs
 
-# keytool -genkey -alias kerberized_hdfs1.test.clickhouse.tech -keyalg rsa -keysize 1024 -dname "CN=kerberized_hdfs1.test.clickhouse.tech" -keypass masterkey -keystore /usr/local/hadoop/etc/hadoop/conf/hdfs.jks -storepass masterkey
+# keytool -genkey -alias kerberized_hdfs1.test.clickhouse.com -keyalg rsa -keysize 1024 -dname "CN=kerberized_hdfs1.test.clickhouse.com" -keypass masterkey -keystore /usr/local/hadoop/etc/hadoop/conf/hdfs.jks -storepass masterkey
 keytool -genkey -alias kerberizedhdfs1 -keyalg rsa -keysize 1024 -dname "CN=kerberizedhdfs1" -keypass masterkey -keystore /usr/local/hadoop/etc/hadoop/conf/hdfs.jks -storepass masterkey
 
 chmod g+r /usr/local/hadoop/etc/hadoop/conf/hdfs.jks
diff --git a/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh b/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh
index daa060cbe29..0a746eb1a67 100644
--- a/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh
+++ b/tests/integration/test_storage_kerberized_hdfs/kerberos_image_config.sh
@@ -4,7 +4,7 @@
 set -x  #  trace
 
 : "${REALM:=TEST.CLICKHOUSE.TECH}"
-: "${DOMAIN_REALM:=test.clickhouse.tech}"
+: "${DOMAIN_REALM:=test.clickhouse.com}"
 : "${KERB_MASTER_KEY:=masterkey}"
 : "${KERB_ADMIN_USER:=admin}"
 : "${KERB_ADMIN_PASS:=admin}"
diff --git a/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf b/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
index 90ad6b61c93..b43a54b4dc5 100644
--- a/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
+++ b/tests/integration/test_storage_kerberized_hdfs/secrets/krb.conf
@@ -20,5 +20,5 @@
  }
 
 [domain_realm]
- .test.clickhouse.tech = TEST.CLICKHOUSE.TECH
- test.clickhouse.tech = TEST.CLICKHOUSE.TECH
+ .test.clickhouse.com = TEST.CLICKHOUSE.TECH
+ test.clickhouse.com = TEST.CLICKHOUSE.TECH
diff --git a/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf b/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf
index ec1c54240e8..43c009d2e98 100644
--- a/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf
+++ b/tests/integration/test_storage_kerberized_hdfs/secrets/krb_long.conf
@@ -20,5 +20,5 @@
  }
 
 [domain_realm]
- .test.clickhouse.tech = TEST.CLICKHOUSE.TECH
- test.clickhouse.tech = TEST.CLICKHOUSE.TECH
+ .test.clickhouse.com = TEST.CLICKHOUSE.TECH
+ test.clickhouse.com = TEST.CLICKHOUSE.TECH
diff --git a/tests/integration/test_storage_kerberized_kafka/configs/kafka.xml b/tests/integration/test_storage_kerberized_kafka/configs/kafka.xml
index 0302bd78e3f..68eea654f1c 100644
--- a/tests/integration/test_storage_kerberized_kafka/configs/kafka.xml
+++ b/tests/integration/test_storage_kerberized_kafka/configs/kafka.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <kafka>
         <auto_offset_reset>earliest</auto_offset_reset>
         <!-- Debugging of possible issues, like:
@@ -23,4 +23,4 @@
         <!-- default: 10000 -->
         <session_timeout_ms>6000</session_timeout_ms>
     </kafka_consumer_hang>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh b/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh
index dda10d47d94..723868ec68a 100644
--- a/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh
+++ b/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh
@@ -4,7 +4,7 @@
 set -x # trace
 
 : "${REALM:=TEST.CLICKHOUSE.TECH}"
-: "${DOMAIN_REALM:=test.clickhouse.tech}"
+: "${DOMAIN_REALM:=test.clickhouse.com}"
 : "${KERB_MASTER_KEY:=masterkey}"
 : "${KERB_ADMIN_USER:=admin}"
 : "${KERB_ADMIN_PASS:=admin}"
diff --git a/tests/integration/test_storage_kerberized_kafka/test.py b/tests/integration/test_storage_kerberized_kafka/test.py
index 126c52bb1d9..f5fba594022 100644
--- a/tests/integration/test_storage_kerberized_kafka/test.py
+++ b/tests/integration/test_storage_kerberized_kafka/test.py
@@ -55,6 +55,9 @@ def kafka_produce(kafka_cluster, topic, messages, timestamp=None):
 def kafka_cluster():
     try:
         cluster.start()
+        if instance.is_debug_build():
+            # https://github.com/ClickHouse/ClickHouse/issues/27651
+            pytest.skip("librdkafka calls system function for kinit which does not pass harmful check in debug build")
         yield cluster
     finally:
         cluster.shutdown()
diff --git a/tests/integration/test_storage_mongodb/configs/named_collections.xml b/tests/integration/test_storage_mongodb/configs/named_collections.xml
new file mode 100644
index 00000000000..feb6b55af02
--- /dev/null
+++ b/tests/integration/test_storage_mongodb/configs/named_collections.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <named_collections>
+        <mongo1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mongo1</host>
+            <port>27017</port>
+            <database>test</database>
+            <table>simple_table</table>
+        </mongo1>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_mongodb/configs_secure/config.d/ssl_conf.xml b/tests/integration/test_storage_mongodb/configs_secure/config.d/ssl_conf.xml
index e14aac81e17..3efe98e7045 100644
--- a/tests/integration/test_storage_mongodb/configs_secure/config.d/ssl_conf.xml
+++ b/tests/integration/test_storage_mongodb/configs_secure/config.d/ssl_conf.xml
@@ -1,8 +1,8 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <!-- For self-signed certificate -->
             <verificationMode>none</verificationMode>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_mongodb/test.py b/tests/integration/test_storage_mongodb/test.py
index 415f1c1cb33..1a5de353d7d 100644
--- a/tests/integration/test_storage_mongodb/test.py
+++ b/tests/integration/test_storage_mongodb/test.py
@@ -11,7 +11,7 @@ def started_cluster(request):
     try:
         cluster = ClickHouseCluster(__file__)
         node = cluster.add_instance('node',
-                                    main_configs=["configs_secure/config.d/ssl_conf.xml"],
+                                    main_configs=["configs_secure/config.d/ssl_conf.xml", "configs/named_collections.xml"],
                                     with_mongo=True,
                                     with_mongo_secure=request.param)
         cluster.start()
@@ -46,6 +46,8 @@ def test_simple_select(started_cluster):
     assert node.query("SELECT sum(key) FROM simple_mongo_table") == str(sum(range(0, 100))) + '\n'
 
     assert node.query("SELECT data from simple_mongo_table where key = 42") == hex(42 * 42) + '\n'
+    node.query("DROP TABLE simple_mongo_table")
+    simple_mongo_table.drop()
 
 
 @pytest.mark.parametrize('started_cluster', [False], indirect=['started_cluster'])
@@ -67,6 +69,8 @@ def test_complex_data_type(started_cluster):
     assert node.query("SELECT sum(key) FROM incomplete_mongo_table") == str(sum(range(0, 100))) + '\n'
 
     assert node.query("SELECT data from incomplete_mongo_table where key = 42") == hex(42 * 42) + '\n'
+    node.query("DROP TABLE incomplete_mongo_table")
+    incomplete_mongo_table.drop()
 
 
 @pytest.mark.parametrize('started_cluster', [False], indirect=['started_cluster'])
@@ -95,7 +99,9 @@ def test_incorrect_data_type(started_cluster):
 
     with pytest.raises(QueryRuntimeException):
         node.query("SELECT bbbb FROM strange_mongo_table2")
-
+    node.query("DROP TABLE strange_mongo_table")
+    node.query("DROP TABLE strange_mongo_table2")
+    strange_mongo_table.drop()
 
 @pytest.mark.parametrize('started_cluster', [True], indirect=['started_cluster'])
 def test_secure_connection(started_cluster):
@@ -116,3 +122,20 @@ def test_secure_connection(started_cluster):
     assert node.query("SELECT sum(key) FROM simple_mongo_table") == str(sum(range(0, 100))) + '\n'
 
     assert node.query("SELECT data from simple_mongo_table where key = 42") == hex(42 * 42) + '\n'
+    node.query("DROP TABLE simple_mongo_table")
+    simple_mongo_table.drop()
+
+@pytest.mark.parametrize('started_cluster', [False], indirect=['started_cluster'])
+def test_predefined_connection_configuration(started_cluster):
+    mongo_connection = get_mongo_connection(started_cluster)
+    db = mongo_connection['test']
+    db.add_user('root', 'clickhouse')
+    simple_mongo_table = db['simple_table']
+    data = []
+    for i in range(0, 100):
+        data.append({'key': i, 'data': hex(i * i)})
+    simple_mongo_table.insert_many(data)
+
+    node = started_cluster.instances['node']
+    node.query("create table simple_mongo_table(key UInt64, data String) engine = MongoDB(mongo1)")
+    simple_mongo_table.drop()
diff --git a/tests/integration/test_storage_mysql/configs/named_collections.xml b/tests/integration/test_storage_mysql/configs/named_collections.xml
new file mode 100644
index 00000000000..4a97be7bd98
--- /dev/null
+++ b/tests/integration/test_storage_mysql/configs/named_collections.xml
@@ -0,0 +1,25 @@
+<clickhouse>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>clickhouse</database>
+            <table>test_table</table>
+        </mysql3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_mysql/configs/remote_servers.xml b/tests/integration/test_storage_mysql/configs/remote_servers.xml
index de8e5865f12..9c7f02c190f 100644
--- a/tests/integration/test_storage_mysql/configs/remote_servers.xml
+++ b/tests/integration/test_storage_mysql/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -9,4 +9,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_mysql/configs/users.xml b/tests/integration/test_storage_mysql/configs/users.xml
index 27c4d46984e..074bf9f407e 100644
--- a/tests/integration/test_storage_mysql/configs/users.xml
+++ b/tests/integration/test_storage_mysql/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_block_size>2</max_block_size>
@@ -15,4 +15,4 @@
             <profile>default</profile>
         </default>
     </users>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index a044528cacf..c0ba0d8735e 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -3,11 +3,14 @@ from contextlib import contextmanager
 ## sudo -H pip install PyMySQL
 import pymysql.cursors
 import pytest
+import time
+import threading
 from helpers.cluster import ClickHouseCluster
+from helpers.client import QueryRuntimeException
 
 cluster = ClickHouseCluster(__file__)
 
-node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml'], with_mysql=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/remote_servers.xml', 'configs/named_collections.xml'], with_mysql=True)
 node2 = cluster.add_instance('node2', main_configs=['configs/remote_servers.xml'], with_mysql_cluster=True)
 node3 = cluster.add_instance('node3', main_configs=['configs/remote_servers.xml'], user_configs=['configs/users.xml'], with_mysql=True)
 
@@ -243,7 +246,7 @@ def test_mysql_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_replicas
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = MySQL(`mysql{2|3|4}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+        ENGINE = MySQL('mysql{2|3|4}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
 
     # Fill remote tables with different data to be able to check
     nodes = [node1, node2, node2, node2]
@@ -252,13 +255,13 @@ def test_mysql_distributed(started_cluster):
         nodes[i-1].query('''
             CREATE TABLE test_replica{}
             (id UInt32, name String, age UInt32, money UInt32)
-            ENGINE = MySQL(`mysql{}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse');'''.format(i, 57 if i==1 else i))
+            ENGINE = MySQL('mysql{}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse');'''.format(i, 57 if i==1 else i))
         nodes[i-1].query("INSERT INTO test_replica{} (id, name) SELECT number, 'host{}' from numbers(10) ".format(i, i))
 
     # test multiple ports parsing
-    result = node2.query('''SELECT DISTINCT(name) FROM mysql(`mysql{57|2|3}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM mysql('mysql{57|2|3}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
     assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
-    result = node2.query('''SELECT DISTINCT(name) FROM mysql(`mysql57:3306|mysql2:3306|mysql3:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM mysql('mysql57:3306|mysql2:3306|mysql3:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
     assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
 
     # check all replicas are traversed
@@ -276,7 +279,7 @@ def test_mysql_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_shards
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = ExternalDistributed('MySQL', `mysql{57|2}:3306,mysql{3|4}:3306`, 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
+        ENGINE = ExternalDistributed('MySQL', 'mysql{57|2}:3306,mysql{3|4}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); ''')
 
     # Check only one replica in each shard is used
     result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
@@ -319,6 +322,166 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
     conn.close()
 
 
+def test_settings_connection_wait_timeout(started_cluster):
+    table_name = 'test_settings_connection_wait_timeout'
+    node1.query(f'DROP TABLE IF EXISTS {table_name}')
+    wait_timeout = 2
+
+    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    drop_mysql_table(conn, table_name)
+    create_mysql_table(conn, table_name)
+
+    node1.query('''
+        CREATE TABLE {}
+        (
+            id UInt32,
+            name String,
+            age UInt32,
+            money UInt32
+        )
+        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        SETTINGS connection_wait_timeout={}, connection_pool_size=1
+        '''.format(table_name, table_name, wait_timeout)
+    )
+
+    node1.query("INSERT INTO {} (id, name) SELECT number, concat('name_', toString(number)) from numbers(10) ".format(table_name))
+
+    def worker():
+        node1.query("SELECT sleepEachRow(1) FROM {}".format(table_name))
+
+    worker_thread = threading.Thread(target=worker)
+    worker_thread.start()
+
+    # ensure that first query started in worker_thread
+    time.sleep(1)
+
+    started = time.time()
+    with pytest.raises(QueryRuntimeException, match=r"Exception: mysqlxx::Pool is full \(connection_wait_timeout is exceeded\)"):
+        node1.query("SELECT sleepEachRow(1) FROM {}".format(table_name))
+    ended = time.time()
+    assert (ended - started) >= wait_timeout
+
+    worker_thread.join()
+
+    drop_mysql_table(conn, table_name)
+    conn.close()
+
+
+def test_predefined_connection_configuration(started_cluster):
+    conn = get_mysql_conn(started_cluster, started_cluster.mysql_ip)
+    table_name = 'test_table'
+    drop_mysql_table(conn, table_name)
+    create_mysql_table(conn, table_name)
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1);
+    ''')
+    node1.query("INSERT INTO test_table (id, name, money) select number, toString(number), number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1, replace_query=1);
+    ''')
+    node1.query("INSERT INTO test_table (id, name, money) select number, toString(number), number from numbers(100)")
+    node1.query("INSERT INTO test_table (id, name, money) select number, toString(number), number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1, query=1);
+    ''')
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql1, replace_query=1, on_duplicate_clause='kek');
+    ''')
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(fff);
+    ''')
+    node1.query_and_get_error('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql2);
+    ''')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE MySQL(mysql3, port=3306);
+    ''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+
+# Regression for (k, v) IN ((k, v))
+def test_mysql_in(started_cluster):
+    table_name = 'test_mysql_in'
+    node1.query(f'DROP TABLE IF EXISTS {table_name}')
+
+    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    drop_mysql_table(conn, table_name)
+    create_mysql_table(conn, table_name)
+
+    node1.query('''
+        CREATE TABLE {}
+        (
+            id UInt32,
+            name String,
+            age UInt32,
+            money UInt32
+        )
+        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        '''.format(table_name, table_name)
+    )
+
+    node1.query("INSERT INTO {} (id, name) SELECT number, concat('name_', toString(number)) from numbers(10) ".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id) IN (1)".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id) IN (1, 2)".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id, name) IN ((1, 'name_1'))".format(table_name))
+    node1.query("SELECT * FROM {} WHERE (id, name) IN ((1, 'name_1'),(1, 'name_1'))".format(table_name))
+
+    drop_mysql_table(conn, table_name)
+    conn.close()
+
+def test_mysql_null(started_cluster):
+    table_name = 'test_mysql_in'
+    node1.query(f'DROP TABLE IF EXISTS {table_name}')
+
+    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    drop_mysql_table(conn, table_name)
+    with conn.cursor() as cursor:
+        cursor.execute("""
+            CREATE TABLE `clickhouse`.`{}` (
+            `id` int(11) NOT NULL,
+            `money` int NULL default NULL,
+            PRIMARY KEY (`id`)) ENGINE=InnoDB;
+        """.format(table_name))
+
+    node1.query('''
+        CREATE TABLE {}
+        (
+            id UInt32,
+            money Nullable(UInt32)
+        )
+        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        '''.format(table_name, table_name)
+    )
+
+    node1.query("INSERT INTO {} (id, money) SELECT number, if(number%2, NULL, 1) from numbers(10) ".format(table_name))
+
+    assert int(node1.query("SELECT count() FROM {} WHERE money IS NULL SETTINGS external_table_strict_query=1".format(table_name))) == 5
+    assert int(node1.query("SELECT count() FROM {} WHERE money IS NOT NULL SETTINGS external_table_strict_query=1".format(table_name))) == 5
+
+    drop_mysql_table(conn, table_name)
+    conn.close()
+
+
 if __name__ == '__main__':
     with contextmanager(started_cluster)() as cluster:
         for name, instance in list(cluster.instances.items()):
diff --git a/tests/integration/test_storage_postgresql/configs/named_collections.xml b/tests/integration/test_storage_postgresql/configs/named_collections.xml
new file mode 100644
index 00000000000..129225f36b9
--- /dev/null
+++ b/tests/integration/test_storage_postgresql/configs/named_collections.xml
@@ -0,0 +1,33 @@
+<clickhouse>
+    <named_collections>
+        <postgres1>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres</database>
+            <table>test_table</table>
+        </postgres1>
+        <postgres2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </postgres2>
+        <postgres3>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>1111</port>
+            <database>postgres</database>
+            <table>test_table</table>
+        </postgres3>
+        <postgres4>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+            <port>5432</port>
+            <database>postgres</database>
+            <table>test_replicas</table>
+        </postgres4>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_postgresql/test.py b/tests/integration/test_storage_postgresql/test.py
index 28a76631c0f..6f43036e64d 100644
--- a/tests/integration/test_storage_postgresql/test.py
+++ b/tests/integration/test_storage_postgresql/test.py
@@ -5,8 +5,8 @@ from multiprocessing.dummy import Pool
 from helpers.cluster import ClickHouseCluster
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance('node1', with_postgres=True)
-node2 = cluster.add_instance('node2', with_postgres_cluster=True)
+node1 = cluster.add_instance('node1', main_configs=['configs/named_collections.xml'], with_postgres=True)
+node2 = cluster.add_instance('node2', main_configs=['configs/named_collections.xml'], with_postgres_cluster=True)
 
 
 @pytest.fixture(scope="module")
@@ -18,7 +18,6 @@ def started_cluster():
     finally:
         cluster.shutdown()
 
-
 def test_postgres_select_insert(started_cluster):
     cursor = started_cluster.postgres_conn.cursor()
     table_name = 'test_many'
@@ -243,9 +242,9 @@ def test_postgres_distributed(started_cluster):
         cursors[i].execute(f"""INSERT INTO test_replicas select i, 'host{i+1}' from generate_series(0, 99) as t(i);""");
 
     # test multiple ports parsing
-    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres{1|2|3}:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql('postgres{1|2|3}:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
     assert(result == 'host1\n' or result == 'host2\n' or result == 'host3\n')
-    result = node2.query('''SELECT DISTINCT(name) FROM postgresql(`postgres2:5431|postgres3:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+    result = node2.query('''SELECT DISTINCT(name) FROM postgresql('postgres2:5431|postgres3:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
     assert(result == 'host3\n' or result == 'host2\n')
 
     # Create storage with with 3 replicas
@@ -253,7 +252,7 @@ def test_postgres_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_replicas
         (id UInt32, name String)
-        ENGINE = PostgreSQL(`postgres{2|3|4}:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+        ENGINE = PostgreSQL('postgres{2|3|4}:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
 
     # Check all replicas are traversed
     query = "SELECT name FROM ("
@@ -269,12 +268,20 @@ def test_postgres_distributed(started_cluster):
     node2.query('''
         CREATE TABLE test_shards
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = ExternalDistributed('PostgreSQL', `postgres{1|2}:5432,postgres{3|4}:5432`, 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
+        ENGINE = ExternalDistributed('PostgreSQL', 'postgres{1|2}:5432,postgres{3|4}:5432', 'postgres', 'test_replicas', 'postgres', 'mysecretpassword'); ''')
 
     # Check only one replica in each shard is used
     result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
     assert(result == 'host1\nhost3\n')
 
+    node2.query('''
+        CREATE TABLE test_shards2
+        (id UInt32, name String, age UInt32, money UInt32)
+        ENGINE = ExternalDistributed('PostgreSQL', postgres4, description='postgres{1|2}:5432,postgres{3|4}:5432'); ''')
+
+    result = node2.query("SELECT DISTINCT(name) FROM test_shards2 ORDER BY name")
+    assert(result == 'host1\nhost3\n')
+
     # Check all replicas are traversed
     query = "SELECT name FROM ("
     for i in range (3):
@@ -291,7 +298,7 @@ def test_postgres_distributed(started_cluster):
     node2.query('DROP TABLE test_shards')
     node2.query('DROP TABLE test_replicas')
 
-    
+
 def test_datetime_with_timezone(started_cluster):
     cursor = started_cluster.postgres_conn.cursor()
     cursor.execute("DROP TABLE IF EXISTS test_timezone")
@@ -328,6 +335,95 @@ def test_postgres_ndim(started_cluster):
     cursor.execute("DROP TABLE arr1, arr2")
 
 
+def test_postgres_on_conflict(started_cluster):
+    cursor = started_cluster.postgres_conn.cursor()
+    table = 'test_conflict'
+    cursor.execute(f'DROP TABLE IF EXISTS {table}')
+    cursor.execute(f'CREATE TABLE {table} (a integer PRIMARY KEY, b text, c integer)')
+
+    node1.query('''
+        CREATE TABLE test_conflict (a UInt32, b String, c Int32)
+        ENGINE PostgreSQL('postgres1:5432', 'postgres', 'test_conflict', 'postgres', 'mysecretpassword', '', 'ON CONFLICT DO NOTHING');
+    ''')
+    node1.query(f''' INSERT INTO {table} SELECT number, concat('name_', toString(number)), 3 from numbers(100)''')
+    node1.query(f''' INSERT INTO {table} SELECT number, concat('name_', toString(number)), 4 from numbers(100)''')
+
+    check1 = f"SELECT count() FROM {table}"
+    assert (node1.query(check1)).rstrip() == '100'
+
+    table_func = f'''postgresql('{started_cluster.postgres_ip}:{started_cluster.postgres_port}', 'postgres', '{table}', 'postgres', 'mysecretpassword', '', 'ON CONFLICT DO NOTHING')'''
+    node1.query(f'''INSERT INTO TABLE FUNCTION {table_func} SELECT number, concat('name_', toString(number)), 3 from numbers(100)''')
+    node1.query(f'''INSERT INTO TABLE FUNCTION {table_func} SELECT number, concat('name_', toString(number)), 3 from numbers(100)''')
+
+    check1 = f"SELECT count() FROM {table}"
+    assert (node1.query(check1)).rstrip() == '100'
+
+    cursor.execute(f'DROP TABLE {table} ')
+
+
+def test_predefined_connection_configuration(started_cluster):
+    cursor = started_cluster.postgres_conn.cursor()
+    cursor.execute(f'DROP TABLE IF EXISTS test_table')
+    cursor.execute(f'CREATE TABLE test_table (a integer PRIMARY KEY, b integer)')
+
+    node1.query('''
+        DROP TABLE IF EXISTS test_table;
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1);
+    ''')
+    node1.query(f''' INSERT INTO test_table SELECT number, number from numbers(100)''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('''
+        DROP TABLE test_table;
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1, on_conflict='ON CONFLICT DO NOTHING');
+    ''')
+    node1.query(f''' INSERT INTO test_table SELECT number, number from numbers(100)''')
+    node1.query(f''' INSERT INTO test_table SELECT number, number from numbers(100)''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('DROP TABLE test_table;')
+    node1.query_and_get_error('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1, 'ON CONFLICT DO NOTHING');
+    ''')
+    node1.query_and_get_error('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres2);
+    ''')
+    node1.query_and_get_error('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(unknown_collection);
+    ''')
+
+    node1.query('''
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres1, port=5432, database='postgres', table='test_table');
+    ''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    node1.query('''
+        DROP TABLE test_table;
+        CREATE TABLE test_table (a UInt32, b Int32)
+        ENGINE PostgreSQL(postgres3, port=5432);
+    ''')
+    assert (node1.query(f"SELECT count() FROM test_table").rstrip() == '100')
+
+    assert (node1.query(f"SELECT count() FROM postgresql(postgres1)").rstrip() == '100')
+    node1.query("INSERT INTO TABLE FUNCTION postgresql(postgres1, on_conflict='ON CONFLICT DO NOTHING') SELECT number, number from numbers(100)")
+    assert (node1.query(f"SELECT count() FROM postgresql(postgres1)").rstrip() == '100')
+
+    cursor.execute('DROP SCHEMA IF EXISTS test_schema CASCADE')
+    cursor.execute('CREATE SCHEMA test_schema')
+    cursor.execute('CREATE TABLE test_schema.test_table (a integer)')
+    node1.query("INSERT INTO TABLE FUNCTION postgresql(postgres1, schema='test_schema', on_conflict='ON CONFLICT DO NOTHING') SELECT number from numbers(200)")
+    assert (node1.query(f"SELECT count() FROM postgresql(postgres1, schema='test_schema')").rstrip() == '200')
+
+    cursor.execute('DROP SCHEMA test_schema CASCADE')
+    cursor.execute(f'DROP TABLE test_table ')
+
+
 if __name__ == '__main__':
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_postgresql_replica/configs/log_conf.xml b/tests/integration/test_storage_postgresql_replica/configs/log_conf.xml
index f9d15e572aa..27c7107ce5e 100644
--- a/tests/integration/test_storage_postgresql_replica/configs/log_conf.xml
+++ b/tests/integration/test_storage_postgresql_replica/configs/log_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/log.log</log>
@@ -8,4 +8,4 @@
         <stderr>/var/log/clickhouse-server/stderr.log</stderr>
         <stdout>/var/log/clickhouse-server/stdout.log</stdout>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_rabbitmq/configs/macros.xml b/tests/integration/test_storage_rabbitmq/configs/macros.xml
new file mode 100644
index 00000000000..6e9f3390b39
--- /dev/null
+++ b/tests/integration/test_storage_rabbitmq/configs/macros.xml
@@ -0,0 +1,8 @@
+<yandex>
+  <macros>
+    <rabbitmq_host>rabbitmq1</rabbitmq_host>
+    <rabbitmq_port>5672</rabbitmq_port>
+    <rabbitmq_exchange_name>macro</rabbitmq_exchange_name>
+    <rabbitmq_format>JSONEachRow</rabbitmq_format>
+  </macros>
+</yandex>
diff --git a/tests/integration/test_storage_rabbitmq/configs/rabbitmq.xml b/tests/integration/test_storage_rabbitmq/configs/rabbitmq.xml
index 3002b6aa415..0b5411455b4 100644
--- a/tests/integration/test_storage_rabbitmq/configs/rabbitmq.xml
+++ b/tests/integration/test_storage_rabbitmq/configs/rabbitmq.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <rabbitmq>
         <username>root</username>
         <password>clickhouse</password>
     </rabbitmq>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index a8efea1c5d6..36d63588386 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -18,7 +18,7 @@ from . import rabbitmq_pb2
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance('instance',
-                                main_configs=['configs/rabbitmq.xml'],
+                                main_configs=['configs/rabbitmq.xml', 'configs/macros.xml'],
                                 with_rabbitmq=True)
 
 
@@ -65,7 +65,8 @@ def rabbitmq_cluster():
 def rabbitmq_setup_teardown():
     print("RabbitMQ is available - running test")
     yield  # run test
-    instance.query('DROP TABLE IF EXISTS test.rabbitmq')
+    for table_name in ['view', 'consumer', 'rabbitmq']:
+        instance.query(f'DROP TABLE IF EXISTS test.{table_name}')
 
 
 # Tests
@@ -195,8 +196,6 @@ def test_rabbitmq_csv_with_delimiter(rabbitmq_cluster):
 
 def test_rabbitmq_tsv_with_delimiter(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -233,10 +232,39 @@ def test_rabbitmq_tsv_with_delimiter(rabbitmq_cluster):
     rabbitmq_check_result(result, True)
 
 
+def test_rabbitmq_macros(rabbitmq_cluster):
+    instance.query('''
+        CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = '{rabbitmq_host}:{rabbitmq_port}',
+                     rabbitmq_exchange_name = '{rabbitmq_exchange_name}',
+                     rabbitmq_format = '{rabbitmq_format}'
+        ''')
+
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters(rabbitmq_cluster.rabbitmq_ip, rabbitmq_cluster.rabbitmq_port, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+
+    message = ''
+    for i in range(50):
+        message += json.dumps({'key': i, 'value': i}) + '\n'
+    channel.basic_publish(exchange='macro', routing_key='', body=message)
+    
+    connection.close()
+    time.sleep(1)
+
+    result = ''
+    while True:
+        result += instance.query('SELECT * FROM test.rabbitmq ORDER BY key', ignore_error=True)
+        if rabbitmq_check_result(result):
+            break
+
+    rabbitmq_check_result(result, True)
+
+
 def test_rabbitmq_materialized_view(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -266,19 +294,12 @@ def test_rabbitmq_materialized_view(rabbitmq_cluster):
         if (rabbitmq_check_result(result)):
             break
 
-    instance.query('''
-        DROP TABLE test.consumer;
-        DROP TABLE test.view;
-    ''')
-
     connection.close()
     rabbitmq_check_result(result, True)
 
 
 def test_rabbitmq_materialized_view_with_subquery(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -308,11 +329,6 @@ def test_rabbitmq_materialized_view_with_subquery(rabbitmq_cluster):
         if rabbitmq_check_result(result):
             break
 
-    instance.query('''
-        DROP TABLE test.consumer;
-        DROP TABLE test.view;
-    ''')
-
     connection.close()
     rabbitmq_check_result(result, True)
 
@@ -373,8 +389,6 @@ def test_rabbitmq_many_materialized_views(rabbitmq_cluster):
 @pytest.mark.skip(reason="clichouse_path with rabbitmq.proto fails to be exported")
 def test_rabbitmq_protobuf(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value String)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -426,11 +440,6 @@ def test_rabbitmq_protobuf(rabbitmq_cluster):
         if rabbitmq_check_result(result):
             break
 
-    instance.query('''
-        DROP TABLE test.consumer;
-        DROP TABLE test.view;
-    ''')
-
     rabbitmq_check_result(result, True)
 
 
@@ -446,8 +455,6 @@ def test_rabbitmq_big_message(rabbitmq_cluster):
     channel = connection.channel()
 
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value String)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -469,10 +476,6 @@ def test_rabbitmq_big_message(rabbitmq_cluster):
             break
 
     connection.close()
-    instance.query('''
-        DROP TABLE test.consumer;
-        DROP TABLE test.view;
-    ''')
 
     assert int(result) == rabbitmq_messages * batch_messages, 'ClickHouse lost some messages: {}'.format(result)
 
@@ -490,8 +493,6 @@ def test_rabbitmq_sharding_between_queues_publish(rabbitmq_cluster):
                      rabbitmq_num_consumers = 10,
                      rabbitmq_format = 'JSONEachRow',
                      rabbitmq_row_delimiter = '\\n';
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (key UInt64, value UInt64, channel_id String)
             ENGINE = MergeTree
             ORDER BY key
@@ -791,6 +792,7 @@ def test_rabbitmq_many_inserts(rabbitmq_cluster):
 
     while True:
         result = instance.query('SELECT count() FROM test.view_many')
+        print(result, messages_num * threads_num)
         if int(result) == messages_num * threads_num:
             break
         time.sleep(1)
@@ -1366,7 +1368,6 @@ def test_rabbitmq_headers_exchange(rabbitmq_cluster):
 
 def test_rabbitmq_virtual_columns(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
         CREATE TABLE test.rabbitmq_virtuals (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -1427,8 +1428,6 @@ def test_rabbitmq_virtual_columns(rabbitmq_cluster):
 
 def test_rabbitmq_virtual_columns_with_materialized_view(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq_virtuals_mv (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -1574,8 +1573,6 @@ def test_rabbitmq_many_consumers_to_each_queue(rabbitmq_cluster):
 def test_rabbitmq_restore_failed_connection_without_losses_1(rabbitmq_cluster):
     instance.query('''
         DROP TABLE IF EXISTS test.consume;
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree
             ORDER BY key;
@@ -1633,8 +1630,6 @@ def test_rabbitmq_restore_failed_connection_without_losses_1(rabbitmq_cluster):
             break
 
     instance.query('''
-        DROP TABLE test.consumer;
-        DROP TABLE test.view;
         DROP TABLE test.consume;
         DROP TABLE test.producer_reconnect;
     ''')
@@ -1670,10 +1665,7 @@ def test_rabbitmq_restore_failed_connection_without_losses_2(rabbitmq_cluster):
         channel.basic_publish(exchange='consumer_reconnect', routing_key='', body=messages[msg_id],
                               properties=pika.BasicProperties(delivery_mode=2, message_id=str(msg_id)))
     connection.close()
-
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree
             ORDER BY key;
@@ -1682,6 +1674,7 @@ def test_rabbitmq_restore_failed_connection_without_losses_2(rabbitmq_cluster):
     ''')
 
     while int(instance.query('SELECT count() FROM test.view')) == 0:
+        print(3)
         time.sleep(0.1)
 
     kill_rabbitmq(rabbitmq_cluster.rabbitmq_docker_id)
@@ -1711,8 +1704,6 @@ def test_rabbitmq_restore_failed_connection_without_losses_2(rabbitmq_cluster):
 
 def test_rabbitmq_commit_on_block_write(rabbitmq_cluster):
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
@@ -1777,9 +1768,22 @@ def test_rabbitmq_commit_on_block_write(rabbitmq_cluster):
     assert result == 1, 'Messages from RabbitMQ get duplicated!'
 
 
-def test_rabbitmq_no_connection_at_startup(rabbitmq_cluster):
+def test_rabbitmq_no_connection_at_startup_1(rabbitmq_cluster):
     # no connection when table is initialized
     rabbitmq_cluster.pause_container('rabbitmq1')
+    instance.query_and_get_error('''
+        CREATE TABLE test.cs (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
+                     rabbitmq_exchange_name = 'cs',
+                     rabbitmq_format = 'JSONEachRow',
+                     rabbitmq_num_consumers = '5',
+                     rabbitmq_row_delimiter = '\\n';
+    ''')
+    rabbitmq_cluster.unpause_container('rabbitmq1')
+
+
+def test_rabbitmq_no_connection_at_startup_2(rabbitmq_cluster):
     instance.query('''
         CREATE TABLE test.cs (key UInt64, value UInt64)
             ENGINE = RabbitMQ
@@ -1788,18 +1792,16 @@ def test_rabbitmq_no_connection_at_startup(rabbitmq_cluster):
                      rabbitmq_format = 'JSONEachRow',
                      rabbitmq_num_consumers = '5',
                      rabbitmq_row_delimiter = '\\n';
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (key UInt64, value UInt64)
             ENGINE = MergeTree
             ORDER BY key;
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
             SELECT * FROM test.cs;
     ''')
-    time.sleep(5)
+    instance.query("DETACH TABLE test.cs")
+    rabbitmq_cluster.pause_container('rabbitmq1')
+    instance.query("ATTACH TABLE test.cs")
     rabbitmq_cluster.unpause_container('rabbitmq1')
-    # need to make sure rabbit table made all rabbit setup
-    time.sleep(10)
 
     messages_num = 1000
     credentials = pika.PlainCredentials('root', 'clickhouse')
@@ -1853,8 +1855,6 @@ def test_rabbitmq_format_factory_settings(rabbitmq_cluster):
             break;
 
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (
             id String, date DateTime
         ) ENGINE = MergeTree ORDER BY id;
@@ -1956,8 +1956,6 @@ def test_rabbitmq_queue_settings(rabbitmq_cluster):
     connection.close()
 
     instance.query('''
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (key UInt64, value UInt64)
         ENGINE = MergeTree ORDER BY key;
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
@@ -2010,9 +2008,6 @@ def test_rabbitmq_queue_consume(rabbitmq_cluster):
                      rabbitmq_format = 'JSONEachRow',
                      rabbitmq_queue_base = 'rabbit_queue',
                      rabbitmq_queue_consume = 1;
-
-        DROP TABLE IF EXISTS test.view;
-        DROP TABLE IF EXISTS test.consumer;
         CREATE TABLE test.view (key UInt64, value UInt64)
         ENGINE = MergeTree ORDER BY key;
         CREATE MATERIALIZED VIEW test.consumer TO test.view AS
@@ -2032,18 +2027,19 @@ def test_rabbitmq_queue_consume(rabbitmq_cluster):
     instance.query('DROP TABLE test.rabbitmq_queue')
 
 
-def test_rabbitmq_drop_table_with_unfinished_setup(rabbitmq_cluster):
-    rabbitmq_cluster.pause_container('rabbitmq1')
-    instance.query('''
+def test_rabbitmq_bad_args(rabbitmq_cluster):
+    credentials = pika.PlainCredentials('root', 'clickhouse')
+    parameters = pika.ConnectionParameters(rabbitmq_cluster.rabbitmq_ip, rabbitmq_cluster.rabbitmq_port, '/', credentials)
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+    channel.exchange_declare(exchange='f', exchange_type='fanout')
+    instance.query_and_get_error('''
         CREATE TABLE test.drop (key UInt64, value UInt64)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
-                     rabbitmq_exchange_name = 'drop',
+                     rabbitmq_exchange_name = 'f',
                      rabbitmq_format = 'JSONEachRow';
     ''')
-    time.sleep(5)
-    instance.query('DROP TABLE test.drop;')
-    rabbitmq_cluster.unpause_container('rabbitmq1')
 
 
 if __name__ == '__main__':
diff --git a/tests/integration/test_storage_s3/configs/config_for_test_remote_host_filter.xml b/tests/integration/test_storage_s3/configs/config_for_test_remote_host_filter.xml
index 98a9d547705..8366e02acd3 100644
--- a/tests/integration/test_storage_s3/configs/config_for_test_remote_host_filter.xml
+++ b/tests/integration/test_storage_s3/configs/config_for_test_remote_host_filter.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <remote_url_allow_hosts>
         <host_regexp>^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.|$)){4}$</host_regexp>
     </remote_url_allow_hosts>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_s3/configs/defaultS3.xml b/tests/integration/test_storage_s3/configs/defaultS3.xml
index 08fbc4ae131..7dac6d9fbb5 100644
--- a/tests/integration/test_storage_s3/configs/defaultS3.xml
+++ b/tests/integration/test_storage_s3/configs/defaultS3.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <s3>
         <s3_mock>
             <endpoint>http://resolver:8080</endpoint>
@@ -8,4 +8,4 @@
             <endpoint>http://resolver:8080/root-with-auth/restricteddirectory/</endpoint>
         </s3_mock_restricted_directory>
     </s3>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_s3/configs/named_collections.xml b/tests/integration/test_storage_s3/configs/named_collections.xml
new file mode 100644
index 00000000000..0618c5d8b24
--- /dev/null
+++ b/tests/integration/test_storage_s3/configs/named_collections.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <named_collections>
+        <s3_conf1>
+            <url>http://minio1:9001/root/test_table</url>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+        </s3_conf1>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_storage_s3/configs/s3_max_redirects.xml b/tests/integration/test_storage_s3/configs/s3_max_redirects.xml
index 7c5988a6249..49c3781ea7d 100644
--- a/tests/integration/test_storage_s3/configs/s3_max_redirects.xml
+++ b/tests/integration/test_storage_s3/configs/s3_max_redirects.xml
@@ -1,7 +1,7 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <s3_max_redirects>0</s3_max_redirects>
         </default>
     </profiles>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 5908def8297..2f49b462d19 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -87,7 +87,7 @@ def started_cluster():
         cluster = ClickHouseCluster(__file__)
         cluster.add_instance("restricted_dummy", main_configs=["configs/config_for_test_remote_host_filter.xml"],
                              with_minio=True)
-        cluster.add_instance("dummy", with_minio=True, main_configs=["configs/defaultS3.xml"])
+        cluster.add_instance("dummy", with_minio=True, main_configs=["configs/defaultS3.xml", "configs/named_collections.xml"])
         cluster.add_instance("s3_max_redirects", with_minio=True, main_configs=["configs/defaultS3.xml"],
                              user_configs=["configs/s3_max_redirects.xml"])
         logging.info("Starting cluster...")
@@ -146,6 +146,59 @@ def test_put(started_cluster, maybe_auth, positive, compression):
         assert values_csv == get_s3_file_content(started_cluster, bucket, filename)
 
 
+def test_partition_by(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
+    table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
+    partition_by = "column3"
+    values = "(1, 2, 3), (3, 2, 1), (78, 43, 45)"
+    filename = "test_{_partition_id}.csv"
+    put_query = f"""INSERT INTO TABLE FUNCTION
+        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV', '{table_format}')
+        PARTITION BY {partition_by} VALUES {values}"""
+
+    run_query(instance, put_query)
+
+    assert "1,2,3\n" == get_s3_file_content(started_cluster, bucket, "test_3.csv")
+    assert "3,2,1\n" == get_s3_file_content(started_cluster, bucket, "test_1.csv")
+    assert "78,43,45\n" == get_s3_file_content(started_cluster, bucket, "test_45.csv")
+
+
+def test_partition_by_string_column(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
+    table_format = "col_num UInt32, col_str String"
+    partition_by = "col_str"
+    values = "(1, 'foo/bar'), (3, 'йцук'), (78, '你好')"
+    filename = "test_{_partition_id}.csv"
+    put_query = f"""INSERT INTO TABLE FUNCTION
+        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV', '{table_format}')
+        PARTITION BY {partition_by} VALUES {values}"""
+
+    run_query(instance, put_query)
+
+    assert '1,"foo/bar"\n' == get_s3_file_content(started_cluster, bucket, "test_foo/bar.csv")
+    assert '3,"йцук"\n' == get_s3_file_content(started_cluster, bucket, "test_йцук.csv")
+    assert '78,"你好"\n' == get_s3_file_content(started_cluster, bucket, "test_你好.csv")
+
+
+def test_partition_by_const_column(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
+    table_format = "column1 UInt32, column2 UInt32, column3 UInt32"
+    values = "(1, 2, 3), (3, 2, 1), (78, 43, 45)"
+    partition_by = "'88'"
+    values_csv = "1,2,3\n3,2,1\n78,43,45\n"
+    filename = "test_{_partition_id}.csv"
+    put_query = f"""INSERT INTO TABLE FUNCTION
+        s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{filename}', 'CSV', '{table_format}')
+        PARTITION BY {partition_by} VALUES {values}"""
+
+    run_query(instance, put_query)
+
+    assert values_csv == get_s3_file_content(started_cluster, bucket, "test_88.csv")
+
+
 @pytest.mark.parametrize("special", [
     "space",
     "plus"
@@ -326,6 +379,10 @@ def test_put_get_with_globs(started_cluster):
     assert run_query(instance, query).splitlines() == [
         "450\t450\t900\t0.csv\t{bucket}/{max_path}".format(bucket=bucket, max_path=max_path)]
 
+    minio = started_cluster.minio_client
+    for obj in list(minio.list_objects(started_cluster.minio_bucket, prefix='{}/'.format(unique_prefix), recursive=True)):
+        minio.remove_object(started_cluster.minio_bucket, obj.object_name)
+
 
 # Test multipart put.
 @pytest.mark.parametrize("maybe_auth,positive", [
@@ -678,3 +735,18 @@ def test_truncate_table(started_cluster):
     assert(len(list(minio.list_objects(started_cluster.minio_bucket, 'truncate/'))) == 0)
     assert instance.query("SELECT * FROM {}".format(name)) == ""
 
+
+def test_predefined_connection_configuration(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]  # type: ClickHouseInstance
+    name = "test_table"
+
+    instance.query("drop table if exists {}".format(name))
+    instance.query("CREATE TABLE {} (id UInt32) ENGINE = S3(s3_conf1, format='CSV')".format(name))
+
+    instance.query("INSERT INTO {} SELECT number FROM numbers(10)".format(name))
+    result = instance.query("SELECT * FROM {}".format(name))
+    assert result == instance.query("SELECT number FROM numbers(10)")
+
+    result = instance.query("SELECT * FROM s3(s3_conf1, format='CSV', structure='id UInt32')")
+    assert result == instance.query("SELECT number FROM numbers(10)")
diff --git a/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml b/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml
index b4f30a87520..8815dcbaa37 100644
--- a/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml
+++ b/tests/integration/test_system_clusters_actual_information/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -10,5 +10,5 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
 
diff --git a/tests/integration/test_system_ddl_worker_queue/configs/remote_servers.xml b/tests/integration/test_system_ddl_worker_queue/configs/remote_servers.xml
index 4c3de4b3905..791af83a2d6 100644
--- a/tests/integration/test_system_ddl_worker_queue/configs/remote_servers.xml
+++ b/tests/integration/test_system_ddl_worker_queue/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -25,4 +25,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_flush_logs/test.py b/tests/integration/test_system_flush_logs/test.py
index b69105710fb..a4d70339c09 100644
--- a/tests/integration/test_system_flush_logs/test.py
+++ b/tests/integration/test_system_flush_logs/test.py
@@ -10,12 +10,12 @@ node = cluster.add_instance('node_default')
 
 system_logs = [
     # disabled by default
-    ('system.part_log', 0),
     ('system.text_log', 0),
 
     # enabled by default
     ('system.query_log', 1),
     ('system.query_thread_log', 1),
+    ('system.part_log', 1),
     ('system.trace_log', 1),
     ('system.metric_log', 1),
 ]
diff --git a/tests/integration/test_system_merges/configs/config.d/cluster.xml b/tests/integration/test_system_merges/configs/config.d/cluster.xml
index ec7c9b8e4f8..0a790d9b5c6 100644
--- a/tests/integration/test_system_merges/configs/config.d/cluster.xml
+++ b/tests/integration/test_system_merges/configs/config.d/cluster.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_system_merges/configs/logs_config.xml b/tests/integration/test_system_merges/configs/logs_config.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/integration/test_system_merges/configs/logs_config.xml
+++ b/tests/integration/test_system_merges/configs/logs_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_metrics/configs/remote_servers.xml b/tests/integration/test_system_metrics/configs/remote_servers.xml
index a6e80ce2b08..3d4ccd584b1 100644
--- a/tests/integration/test_system_metrics/configs/remote_servers.xml
+++ b/tests/integration/test_system_metrics/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -16,4 +16,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_queries/configs/config.d/clusters_config.xml b/tests/integration/test_system_queries/configs/config.d/clusters_config.xml
index 1353e2f74b5..62bd982b0f3 100644
--- a/tests/integration/test_system_queries/configs/config.d/clusters_config.xml
+++ b/tests/integration/test_system_queries/configs/config.d/clusters_config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
     	<lost_host_cluster>
     		<shard>
@@ -11,4 +11,4 @@
     		</shard>
     	</lost_host_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_queries/configs/config.d/dictionaries_config.xml b/tests/integration/test_system_queries/configs/config.d/dictionaries_config.xml
index b6e52983db2..c7a763eb942 100644
--- a/tests/integration/test_system_queries/configs/config.d/dictionaries_config.xml
+++ b/tests/integration/test_system_queries/configs/config.d/dictionaries_config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <dictionaries_config>/etc/clickhouse-server/dictionaries/*.xml</dictionaries_config>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_queries/configs/config.d/query_log.xml b/tests/integration/test_system_queries/configs/config.d/query_log.xml
index 9f55dcb829e..de7e27921f0 100644
--- a/tests/integration/test_system_queries/configs/config.d/query_log.xml
+++ b/tests/integration/test_system_queries/configs/config.d/query_log.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <query_log>
         <database>system</database>
         <table>query_log</table>
         <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>300</flush_interval_milliseconds>
     </query_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_cache.xml b/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_cache.xml
index 806a59debca..1f038437d21 100644
--- a/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_cache.xml
+++ b/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_cache.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>clickhouse_cache</name>
 
@@ -34,4 +34,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_flat.xml b/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_flat.xml
index e7d32590a39..95ccf123442 100644
--- a/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_flat.xml
+++ b/tests/integration/test_system_queries/configs/dictionaries/dictionary_clickhouse_flat.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <dictionary>
         <name>clickhouse_flat</name>
 
@@ -34,4 +34,4 @@
             </attribute>
         </structure>
     </dictionary>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_system_queries/configs/users.xml b/tests/integration/test_system_queries/configs/users.xml
index 6061af8e33d..7c18d7144a3 100644
--- a/tests/integration/test_system_queries/configs/users.xml
+++ b/tests/integration/test_system_queries/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -20,4 +20,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_system_queries/test.py b/tests/integration/test_system_queries/test.py
index b159e8b4cf3..50f4afd1abe 100644
--- a/tests/integration/test_system_queries/test.py
+++ b/tests/integration/test_system_queries/test.py
@@ -97,7 +97,7 @@ def test_DROP_DNS_CACHE(started_cluster):
 
 
 def test_RELOAD_CONFIG_AND_MACROS(started_cluster):
-    macros = "<yandex><macros><mac>ro</mac></macros></yandex>"
+    macros = "<clickhouse><macros><mac>ro</mac></macros></clickhouse>"
     create_macros = 'echo "{}" > /etc/clickhouse-server/config.d/macros.xml'.format(macros)
 
     instance = cluster.instances['ch1']
diff --git a/tests/integration/test_tcp_handler_http_responses/__init__.py b/tests/integration/test_tcp_handler_http_responses/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_tcp_handler_http_responses/configs/config.d/http-port-31337.xml b/tests/integration/test_tcp_handler_http_responses/configs/config.d/http-port-31337.xml
new file mode 100644
index 00000000000..c3b9be031d7
--- /dev/null
+++ b/tests/integration/test_tcp_handler_http_responses/configs/config.d/http-port-31337.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+  <http_port replace="replace">31337</http_port>
+</clickhouse>
diff --git a/tests/integration/test_tcp_handler_http_responses/configs/config.d/no-http-port.xml b/tests/integration/test_tcp_handler_http_responses/configs/config.d/no-http-port.xml
new file mode 100644
index 00000000000..2af424f0a28
--- /dev/null
+++ b/tests/integration/test_tcp_handler_http_responses/configs/config.d/no-http-port.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <http_port remove="remove"></http_port>
+</clickhouse>
diff --git a/tests/integration/test_tcp_handler_http_responses/test_case.py b/tests/integration/test_tcp_handler_http_responses/test_case.py
new file mode 100644
index 00000000000..38b5ba909a7
--- /dev/null
+++ b/tests/integration/test_tcp_handler_http_responses/test_case.py
@@ -0,0 +1,42 @@
+"""Test HTTP responses given by the TCP Handler."""
+from pathlib import Path
+import pytest
+from helpers.cluster import ClickHouseCluster
+import requests
+
+cluster = ClickHouseCluster(__file__)
+
+node_with_http = cluster.add_instance(
+    'node_with_http',
+    main_configs=["configs/config.d/http-port-31337.xml"]
+)
+HTTP_PORT = 31337
+
+node_without_http = cluster.add_instance(
+    'node_without_http',
+    main_configs=["configs/config.d/no-http-port.xml"]
+)
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+def test_request_to_http_full_instance(start_cluster):
+    response = requests.get(
+        f'http://{node_with_http.ip_address}:9000'
+    )
+    assert response.status_code == 400
+    assert str(HTTP_PORT) in response.text
+
+def test_request_to_http_less_instance(start_cluster):
+    response = requests.post(
+        f'http://{node_without_http.ip_address}:9000'
+    )
+    assert response.status_code == 400
+    assert str(HTTP_PORT) not in response.text
+    assert "8123"         not in response.text
diff --git a/tests/integration/test_text_log_level/configs/config.d/text_log.xml b/tests/integration/test_text_log_level/configs/config.d/text_log.xml
index 3712c5851ae..be3927a14de 100644
--- a/tests/integration/test_text_log_level/configs/config.d/text_log.xml
+++ b/tests/integration/test_text_log_level/configs/config.d/text_log.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <text_log>
         <level>information</level>
     </text_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_timezone_config/configs/config.xml b/tests/integration/test_timezone_config/configs/config.xml
index c601a1d09ef..ec292c9dcb6 100644
--- a/tests/integration/test_timezone_config/configs/config.xml
+++ b/tests/integration/test_timezone_config/configs/config.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <timezone>America/Los_Angeles</timezone>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_tmp_policy/configs/config.d/storage_configuration.xml b/tests/integration/test_tmp_policy/configs/config.d/storage_configuration.xml
index f8574a38208..31a6596d72d 100644
--- a/tests/integration/test_tmp_policy/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_tmp_policy/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <storage_configuration>
         <disks>
             <disk1>
@@ -22,4 +22,4 @@
     </storage_configuration>
 
     <tmp_policy>tmp</tmp_policy>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_ttl_move/configs/config.d/cluster.xml b/tests/integration/test_ttl_move/configs/config.d/cluster.xml
index ec7c9b8e4f8..0a790d9b5c6 100644
--- a/tests/integration/test_ttl_move/configs/config.d/cluster.xml
+++ b/tests/integration/test_ttl_move/configs/config.d/cluster.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -13,4 +13,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_ttl_move/configs/config.d/instant_moves.xml b/tests/integration/test_ttl_move/configs/config.d/instant_moves.xml
index 7b68c6946ca..8f63b72b2e8 100644
--- a/tests/integration/test_ttl_move/configs/config.d/instant_moves.xml
+++ b/tests/integration/test_ttl_move/configs/config.d/instant_moves.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <background_move_processing_pool_thread_sleep_seconds>0.5</background_move_processing_pool_thread_sleep_seconds>
     <background_move_processing_pool_task_sleep_seconds_when_no_work_max>0.5</background_move_processing_pool_task_sleep_seconds_when_no_work_max>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_ttl_move/configs/config.d/storage_configuration.xml b/tests/integration/test_ttl_move/configs/config.d/storage_configuration.xml
index e96bde89ca9..a76e984e4e6 100644
--- a/tests/integration/test_ttl_move/configs/config.d/storage_configuration.xml
+++ b/tests/integration/test_ttl_move/configs/config.d/storage_configuration.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -99,4 +99,4 @@
 
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_ttl_move/configs/logs_config.xml b/tests/integration/test_ttl_move/configs/logs_config.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/integration/test_ttl_move/configs/logs_config.xml
+++ b/tests/integration/test_ttl_move/configs/logs_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_union_header/configs/remote_servers.xml b/tests/integration/test_union_header/configs/remote_servers.xml
index b0bea13abd0..9ce90edb727 100644
--- a/tests/integration/test_union_header/configs/remote_servers.xml
+++ b/tests/integration/test_union_header/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <two_shards>
             <shard>
@@ -15,4 +15,4 @@
             </shard>
         </two_shards>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_defined_object_persistence/__init__.py b/tests/integration/test_user_defined_object_persistence/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_user_defined_object_persistence/test.py b/tests/integration/test_user_defined_object_persistence/test.py
new file mode 100644
index 00000000000..6993bc13615
--- /dev/null
+++ b/tests/integration/test_user_defined_object_persistence/test.py
@@ -0,0 +1,39 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+instance = cluster.add_instance('instance', stay_alive=True)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_persistence():
+    create_function_query1 = "CREATE FUNCTION MySum1 AS (a, b) -> a + b"
+    create_function_query2 = "CREATE FUNCTION MySum2 AS (a, b) -> MySum1(a, b) + b"
+
+    instance.query(create_function_query1)
+    instance.query(create_function_query2)
+    
+    assert instance.query("SELECT MySum1(1,2)") == "3\n"
+    assert instance.query("SELECT MySum2(1,2)") == "5\n"
+
+    instance.restart_clickhouse()
+
+    assert instance.query("SELECT MySum1(1,2)") == "3\n"
+    assert instance.query("SELECT MySum2(1,2)") == "5\n"
+
+    instance.query("DROP FUNCTION MySum2")
+    instance.query("DROP FUNCTION MySum1")
+
+    instance.restart_clickhouse()
+
+    assert "Unknown function MySum1" in instance.query_and_get_error("SELECT MySum1(1, 2)")
+    assert "Unknown function MySum2" in instance.query_and_get_error("SELECT MySum2(1, 2)")
diff --git a/tests/integration/test_user_directories/configs/duplicates.xml b/tests/integration/test_user_directories/configs/duplicates.xml
index 69bb06a112b..8a6e4f8a39c 100644
--- a/tests/integration/test_user_directories/configs/duplicates.xml
+++ b/tests/integration/test_user_directories/configs/duplicates.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <user_directories replace="replace">
         <local_directory>
             <path>/var/lib/clickhouse/access7/</path>
@@ -10,4 +10,4 @@
 
     <users_config>/etc/clickhouse-server/users7.xml</users_config>
     <access_control_path>/var/lib/clickhouse/access7/</access_control_path>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_directories/configs/local_directories.xml b/tests/integration/test_user_directories/configs/local_directories.xml
index 7b9601da982..4516e99427d 100644
--- a/tests/integration/test_user_directories/configs/local_directories.xml
+++ b/tests/integration/test_user_directories/configs/local_directories.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <user_directories replace="replace">
         <users_xml>
             <path>/etc/clickhouse-server/users3.xml</path>
@@ -14,4 +14,4 @@
     </user_directories>
     <users_config remove="remove"/>
     <access_control_path remove="remove"/>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_directories/configs/memory.xml b/tests/integration/test_user_directories/configs/memory.xml
index 78da38ed0bc..438858625a5 100644
--- a/tests/integration/test_user_directories/configs/memory.xml
+++ b/tests/integration/test_user_directories/configs/memory.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <user_directories replace="replace">
         <users_xml>
             <path>/etc/clickhouse-server/users5.xml</path>
@@ -8,4 +8,4 @@
 
     <users_config remove="remove"/>
     <access_control_path remove="remove"/>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_directories/configs/mixed_style.xml b/tests/integration/test_user_directories/configs/mixed_style.xml
index f668140521a..fd1cf4f17d0 100644
--- a/tests/integration/test_user_directories/configs/mixed_style.xml
+++ b/tests/integration/test_user_directories/configs/mixed_style.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <user_directories replace="replace">
         <local_directory>
             <path>/var/lib/clickhouse/access6a/</path>
@@ -8,4 +8,4 @@
 
     <users_config>/etc/clickhouse-server/users6.xml</users_config>
     <access_control_path>/var/lib/clickhouse/access6/</access_control_path>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_directories/configs/old_style.xml b/tests/integration/test_user_directories/configs/old_style.xml
index cc753006b22..18ffa13cb87 100644
--- a/tests/integration/test_user_directories/configs/old_style.xml
+++ b/tests/integration/test_user_directories/configs/old_style.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <users_config>/etc/clickhouse-server/users2.xml</users_config>
     <access_control_path>/var/lib/clickhouse/access2/</access_control_path>
     
     <user_directories remove="remove"/>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_directories/configs/relative_path.xml b/tests/integration/test_user_directories/configs/relative_path.xml
index c4ef3c5fd79..834017e2b81 100644
--- a/tests/integration/test_user_directories/configs/relative_path.xml
+++ b/tests/integration/test_user_directories/configs/relative_path.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <user_directories replace="replace">
         <users_xml>
             <path>users4.xml</path>
@@ -7,4 +7,4 @@
 
     <users_config remove="remove"/>
     <access_control_path remove="remove"/>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_ip_restrictions/configs/config_ipv6.xml b/tests/integration/test_user_ip_restrictions/configs/config_ipv6.xml
index 675225f9575..3abb37d5da2 100644
--- a/tests/integration/test_user_ip_restrictions/configs/config_ipv6.xml
+++ b/tests/integration/test_user_ip_restrictions/configs/config_ipv6.xml
@@ -1 +1 @@
-<yandex><listen_host>::</listen_host></yandex>
+<clickhouse><listen_host>::</listen_host></clickhouse>
diff --git a/tests/integration/test_user_ip_restrictions/configs/users_ipv4.xml b/tests/integration/test_user_ip_restrictions/configs/users_ipv4.xml
index f505af55a31..08a405a4867 100644
--- a/tests/integration/test_user_ip_restrictions/configs/users_ipv4.xml
+++ b/tests/integration/test_user_ip_restrictions/configs/users_ipv4.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -24,4 +24,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_ip_restrictions/configs/users_ipv6.xml b/tests/integration/test_user_ip_restrictions/configs/users_ipv6.xml
index eeacb72fde5..cd93eddf16a 100644
--- a/tests/integration/test_user_ip_restrictions/configs/users_ipv6.xml
+++ b/tests/integration/test_user_ip_restrictions/configs/users_ipv6.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <profiles>
         <default>
             <max_memory_usage>10000000000</max_memory_usage>
@@ -23,4 +23,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_user_zero_database_access/configs/config.xml b/tests/integration/test_user_zero_database_access/configs/config.xml
index 00ca74de8a2..614a5ef574b 100644
--- a/tests/integration/test_user_zero_database_access/configs/config.xml
+++ b/tests/integration/test_user_zero_database_access/configs/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/clickhouse-server.log</log>
@@ -28,4 +28,4 @@
 
     <max_table_size_to_drop>1</max_table_size_to_drop>
     <max_partition_size_to_drop>1</max_partition_size_to_drop>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_user_zero_database_access/configs/users.xml b/tests/integration/test_user_zero_database_access/configs/users.xml
index f800318af16..8c8dfbb5b7e 100644
--- a/tests/integration/test_user_zero_database_access/configs/users.xml
+++ b/tests/integration/test_user_zero_database_access/configs/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <profiles>
         <default>
         </default>
@@ -43,4 +43,4 @@
         <default>
         </default>
     </quotas>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_zookeeper_config/configs/remote_servers.xml b/tests/integration/test_zookeeper_config/configs/remote_servers.xml
index 8e972b31017..63fdcea5dab 100644
--- a/tests/integration/test_zookeeper_config/configs/remote_servers.xml
+++ b/tests/integration/test_zookeeper_config/configs/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -20,4 +20,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_a.xml b/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_a.xml
index 606a1e87763..6c413378524 100644
--- a/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_a.xml
+++ b/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_a.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -15,4 +15,4 @@
         <session_timeout_ms>3000</session_timeout_ms>
         <root>/root_a</root>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_b.xml b/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_b.xml
index 8c934604eee..bc76f2c0790 100644
--- a/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_b.xml
+++ b/tests/integration/test_zookeeper_config/configs/zookeeper_config_root_b.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -15,4 +15,4 @@
         <session_timeout_ms>3000</session_timeout_ms>
         <root>/root_b</root>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_password.xml b/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_password.xml
index 327953062c7..8864897405f 100644
--- a/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_password.xml
+++ b/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_password.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -15,4 +15,4 @@
         <session_timeout_ms>3000</session_timeout_ms>
         <identity>user:password</identity>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_ssl.xml b/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_ssl.xml
index fc03b609146..dc0fe771426 100644
--- a/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_ssl.xml
+++ b/tests/integration/test_zookeeper_config/configs/zookeeper_config_with_ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <zookeeper>
         <node index="1">
             <host>zoo1</host>
@@ -17,4 +17,4 @@
         </node>
         <session_timeout_ms>3000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/configs_secure/conf.d/remote_servers.xml b/tests/integration/test_zookeeper_config/configs_secure/conf.d/remote_servers.xml
index 01865e33a85..548819a8c97 100644
--- a/tests/integration/test_zookeeper_config/configs_secure/conf.d/remote_servers.xml
+++ b/tests/integration/test_zookeeper_config/configs_secure/conf.d/remote_servers.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <remote_servers>
         <test_cluster>
             <shard>
@@ -14,4 +14,4 @@
             </shard>
         </test_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/configs_secure/conf.d/ssl_conf.xml b/tests/integration/test_zookeeper_config/configs_secure/conf.d/ssl_conf.xml
index 50303fb70cc..2b6dd85ba2b 100644
--- a/tests/integration/test_zookeeper_config/configs_secure/conf.d/ssl_conf.xml
+++ b/tests/integration/test_zookeeper_config/configs_secure/conf.d/ssl_conf.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <client>
             <certificateFile>/etc/clickhouse-server/config.d/client.crt</certificateFile>
@@ -13,4 +13,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/integration/test_zookeeper_config/test_secure.py b/tests/integration/test_zookeeper_config/test_secure.py
index f57b8d8a80a..c0b2216d677 100644
--- a/tests/integration/test_zookeeper_config/test_secure.py
+++ b/tests/integration/test_zookeeper_config/test_secure.py
@@ -1,5 +1,3 @@
-
-
 import threading
 import os 
 from tempfile import NamedTemporaryFile
@@ -35,18 +33,21 @@ def started_cluster():
 
 # NOTE this test have to be ported to Keeper
 def test_secure_connection(started_cluster):
-        assert node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'") == '2\n'
-        assert node2.query("SELECT count() FROM system.zookeeper WHERE path = '/'") == '2\n'
+    # no asserts, connection works
+    node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'")
+    node2.query("SELECT count() FROM system.zookeeper WHERE path = '/'")
 
-        kThreadsNumber = 16
-        kIterations = 100
-        threads = []
-        for _ in range(kThreadsNumber):
-            threads.append(threading.Thread(target=(lambda: 
-                [node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'") for _ in range(kIterations)])))
+    threads_number = 16
+    iterations = 100
+    threads = []
 
-        for thread in threads:
-            thread.start()
+    # just checking for race conditions
+    for _ in range(threads_number):
+        threads.append(threading.Thread(target=(lambda:
+            [node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'") for _ in range(iterations)])))
 
-        for thread in threads:
-            thread.join()
+    for thread in threads:
+        thread.start()
+
+    for thread in threads:
+        thread.join()
diff --git a/tests/ints_dictionary.xml b/tests/ints_dictionary.xml
deleted file mode 120000
index 1daa76b8267..00000000000
--- a/tests/ints_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/ints_dictionary.xml
\ No newline at end of file
diff --git a/tests/jepsen.clickhouse-keeper/project.clj b/tests/jepsen.clickhouse-keeper/project.clj
index c38767a767d..a168ef6920d 100644
--- a/tests/jepsen.clickhouse-keeper/project.clj
+++ b/tests/jepsen.clickhouse-keeper/project.clj
@@ -1,7 +1,7 @@
 (defproject jepsen.keeper "0.1.0-SNAPSHOT"
   :injections [(.. System (setProperty "zookeeper.request.timeout" "10000"))]
   :description "A jepsen tests for ClickHouse Keeper"
-  :url "https://clickhouse.tech/"
+  :url "https://clickhouse.com/"
   :license {:name "EPL-2.0"
             :url "https://www.eclipse.org/legal/epl-2.0/"}
   :main jepsen.clickhouse-keeper.main
diff --git a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
index f06d9683990..8c574718d88 100644
--- a/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
+++ b/tests/jepsen.clickhouse-keeper/resources/keeper_config.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <listen_host>::</listen_host>
 
     <logger>
@@ -44,4 +44,4 @@
             </server>
         </raft_configuration>
     </keeper_server>
-</yandex>
+</clickhouse>
diff --git a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
index 30c2c0eaf4f..745d88e97f7 100644
--- a/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
+++ b/tests/jepsen.clickhouse-keeper/src/jepsen/clickhouse_keeper/db.clj
@@ -68,6 +68,7 @@
   (do
     (c/exec :mkdir :-p common-prefix)
     (c/exec :mkdir :-p data-dir)
+    (c/exec :mkdir :-p coordination-data-dir)
     (c/exec :mkdir :-p logs-dir)
     (c/exec :mkdir :-p configs-dir)
     (c/exec :mkdir :-p sub-configs-dir)
diff --git a/tests/perf_drafts/vert_merge/test_merges b/tests/perf_drafts/vert_merge/test_merges
index 848e7cc578c..d177e16fe3e 100755
--- a/tests/perf_drafts/vert_merge/test_merges
+++ b/tests/perf_drafts/vert_merge/test_merges
@@ -27,8 +27,8 @@ function read_src_data {
 }
 
 function set_vertical_alg {
-	echo "<yandex><merge_tree><enable_vertical_merge_algorithm>$1</enable_vertical_merge_algorithm></merge_tree></yandex>" | sudo tee /etc/clickhouse-server/conf.d/enable_vertical_merge_algorithm.xml >/dev/null
-	echo "<yandex><merge_tree><vertical_merge_algorithm_min_rows_to_activate>0</vertical_merge_algorithm_min_rows_to_activate></merge_tree></yandex>" | sudo tee /etc/clickhouse-server/conf.d/vertical_merge_algorithm_min_rows_to_activate.xml >/dev/null
+	echo "<clickhouse><merge_tree><enable_vertical_merge_algorithm>$1</enable_vertical_merge_algorithm></merge_tree></clickhouse>" | sudo tee /etc/clickhouse-server/conf.d/enable_vertical_merge_algorithm.xml >/dev/null
+	echo "<clickhouse><merge_tree><vertical_merge_algorithm_min_rows_to_activate>0</vertical_merge_algorithm_min_rows_to_activate></merge_tree></clickhouse>" | sudo tee /etc/clickhouse-server/conf.d/vertical_merge_algorithm_min_rows_to_activate.xml >/dev/null
 }
 
 function set_and_restart {
diff --git a/tests/performance/aggregation_in_order_2.xml b/tests/performance/aggregation_in_order_2.xml
new file mode 100644
index 00000000000..083a8031d46
--- /dev/null
+++ b/tests/performance/aggregation_in_order_2.xml
@@ -0,0 +1,30 @@
+<test>
+    <settings>
+        <optimize_aggregation_in_order>1</optimize_aggregation_in_order>
+        <max_insert_block_size>10000000</max_insert_block_size>
+        <max_threads>30</max_threads>
+    </settings>
+
+    <substitutions>
+        <substitution>
+            <name>uniqs</name>
+            <values>
+                <value>100</value>
+                <value>10000</value>
+                <value>1000000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <create_query>CREATE TABLE mt_30_parts_{uniqs}_uniqs(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % 30 SETTINGS parts_to_throw_insert=10000, parts_to_delay_insert=10000</create_query>
+    <fill_query>SYSTEM STOP MERGES mt_30_parts_{uniqs}_uniqs</fill_query>
+    <fill_query>INSERT INTO mt_30_parts_{uniqs}_uniqs SELECT number, rand() % {uniqs}, rand() FROM numbers_mt(100000000) SETTINGS max_block_size=10000000</fill_query>
+    <fill_query>SYSTEM START MERGES mt_30_parts_{uniqs}_uniqs</fill_query>
+    <fill_query>OPTIMIZE TABLE mt_30_parts_{uniqs}_uniqs FINAL</fill_query>
+
+    <query>SELECT sum(val2) FROM mt_30_parts_{uniqs}_uniqs GROUP BY val1 FORMAT Null</query>
+    <query>SELECT groupArray(val2) FROM mt_30_parts_{uniqs}_uniqs GROUP BY val1 FORMAT Null</query>
+    <query>SELECT uniqExact(val2) FROM mt_30_parts_{uniqs}_uniqs GROUP BY val1 FORMAT Null</query>
+
+    <drop_query>DROP TABLE IF EXISTS mt_30_parts_{uniqs}_uniqs</drop_query>
+</test>
diff --git a/tests/performance/codec_none.xml b/tests/performance/codec_none.xml
index e6eb9773a66..d86ddb26bc6 100644
--- a/tests/performance/codec_none.xml
+++ b/tests/performance/codec_none.xml
@@ -1,6 +1,6 @@
 <test>
     <preconditions>
-        <table_exists>hits_10m_single</table_exists>
+        <table_exists>test.hits</table_exists>
     </preconditions>
 
     <create_query>CREATE TABLE hits_none (Title String CODEC(NONE)) ENGINE = MergeTree ORDER BY tuple()</create_query>
diff --git a/tests/performance/decimal_format.xml b/tests/performance/decimal_format.xml
new file mode 100644
index 00000000000..6841ea93d12
--- /dev/null
+++ b/tests/performance/decimal_format.xml
@@ -0,0 +1,3 @@
+<test>
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(toString((rand() / 1000000)::Decimal64(6)))</query>
+</test>
diff --git a/tests/performance/flat_dictionary.xml b/tests/performance/flat_dictionary.xml
index 243f90a8e59..8957925ef1a 100644
--- a/tests/performance/flat_dictionary.xml
+++ b/tests/performance/flat_dictionary.xml
@@ -61,15 +61,15 @@
     </query>
 
     <query>
-        SELECT * FROM simple_key_flat_dictionary
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictHas('default.simple_key_flat_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
         FORMAT Null;
     </query>
 
     <query>
-        WITH rand64() % toUInt64(75000000) as key
-        SELECT dictHas('default.simple_key_flat_dictionary', key)
-        FROM system.numbers
-        LIMIT 75000000
+        SELECT * FROM simple_key_flat_dictionary
         FORMAT Null;
     </query>
 
diff --git a/tests/performance/fuse_sumcount.xml b/tests/performance/fuse_sumcount.xml
index b2eb0e678e2..237edb1b970 100644
--- a/tests/performance/fuse_sumcount.xml
+++ b/tests/performance/fuse_sumcount.xml
@@ -6,7 +6,7 @@
          Also test GROUP BY with and without keys, because they might have different
          optimizations. -->
     <settings>
-        <optimize_fuse_sum_count_avg>1</optimize_fuse_sum_count_avg>
+        <optimize_syntax_fuse_functions>1</optimize_syntax_fuse_functions>
     </settings>
 
     <substitutions>
@@ -21,13 +21,13 @@
 
     <query>SELECT sum(number)                             FROM numbers(1000000000) FORMAT Null</query>
     <query>SELECT sum(number), count(number)              FROM numbers(1000000000) FORMAT Null</query>
-    <query>SELECT sum(number), count(number)              FROM numbers(1000000000) SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(1000000000) SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
     <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) FORMAT Null</query>
-    <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(1000000000) SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
 
     <query>SELECT sum(number)                             FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
     <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
-    <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), count(number)              FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
     <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 FORMAT Null</query>
-    <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_fuse_sum_count_avg = 0 FORMAT Null</query>
+    <query>SELECT sum(number), avg(number), count(number) FROM numbers(100000000) GROUP BY intHash32(number) % 1000 SETTINGS optimize_syntax_fuse_functions = 0 FORMAT Null</query>
 </test>
diff --git a/tests/performance/hashed_array_dictionary.xml b/tests/performance/hashed_array_dictionary.xml
new file mode 100644
index 00000000000..80a565e67b0
--- /dev/null
+++ b/tests/performance/hashed_array_dictionary.xml
@@ -0,0 +1,138 @@
+<test>
+    <create_query>
+        CREATE TABLE simple_key_hashed_array_dictionary_source_table
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE TABLE complex_key_hashed_array_dictionary_source_table
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        ) ENGINE = Memory;
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY simple_key_hashed_array_dictionary
+        (
+            id UInt64,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'simple_key_hashed_array_dictionary_source_table'))
+        LAYOUT(HASHED_ARRAY())
+        LIFETIME(MIN 0 MAX 1000);
+    </create_query>
+
+    <create_query>
+        CREATE DICTIONARY complex_key_hashed_array_dictionary
+        (
+            id UInt64,
+            id_key String,
+            value_int UInt64,
+            value_string String,
+            value_decimal Decimal64(8),
+            value_string_nullable Nullable(String)
+        )
+        PRIMARY KEY id, id_key
+        SOURCE(CLICKHOUSE(DB 'default' TABLE 'complex_key_hashed_array_dictionary_source_table'))
+        LAYOUT(COMPLEX_KEY_HASHED_ARRAY())
+        LIFETIME(MIN 0 MAX 1000);
+    </create_query>
+
+    <fill_query>
+        INSERT INTO simple_key_hashed_array_dictionary_source_table
+        SELECT number, number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 5000000;
+    </fill_query>
+
+    <fill_query>
+        INSERT INTO complex_key_hashed_array_dictionary_source_table
+        SELECT number, toString(number), number, toString(number), toDecimal64(number, 8), toString(number)
+        FROM system.numbers
+        LIMIT 5000000;
+    </fill_query>
+
+    <substitutions>
+        <substitution>
+            <name>column_name</name>
+            <values>
+                <value>'value_int'</value>
+                <value>'value_string'</value>
+                <value>'value_decimal'</value>
+                <value>'value_string_nullable'</value>
+            </values>
+        </substitution>
+
+        <substitution>
+            <name>elements_count</name>
+            <values>
+                <value>5000000</value>
+                <value>7500000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictGet('default.simple_key_hashed_array_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH rand64() % toUInt64({elements_count}) as key
+        SELECT dictHas('default.simple_key_hashed_array_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        SELECT * FROM simple_key_hashed_array_dictionary
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
+        SELECT dictGet('default.complex_key_hashed_array_dictionary', {column_name}, key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
+        SELECT dictHas('default.complex_key_hashed_array_dictionary', key)
+        FROM system.numbers
+        LIMIT {elements_count}
+        FORMAT Null;
+    </query>
+
+    <query>
+        SELECT * FROM complex_key_hashed_array_dictionary
+        FORMAT Null;
+    </query>
+
+    <drop_query>DROP TABLE IF EXISTS simple_key_hashed_array_dictionary_source_table;</drop_query>
+    <drop_query>DROP TABLE IF EXISTS complex_key_hashed_array_dictionary_source_table;</drop_query>
+
+    <drop_query>DROP DICTIONARY IF EXISTS simple_key_hashed_array_dictionary;</drop_query>
+    <drop_query>DROP DICTIONARY IF EXISTS complex_key_hashed_array_dictionary;</drop_query>
+
+</test>
diff --git a/tests/performance/hashed_dictionary.xml b/tests/performance/hashed_dictionary.xml
index 91ccc0b1075..cf1cdac6df1 100644
--- a/tests/performance/hashed_dictionary.xml
+++ b/tests/performance/hashed_dictionary.xml
@@ -94,6 +94,7 @@
         LIMIT {elements_count}
         FORMAT Null;
     </query>
+
     <query>
         WITH rand64() % toUInt64({elements_count}) as key
         SELECT dictHas('default.simple_key_hashed_dictionary', key)
@@ -102,6 +103,11 @@
         FORMAT Null;
     </query>
 
+    <query>
+        SELECT * FROM simple_key_hashed_dictionary
+        FORMAT Null;
+    </query>
+
     <query>
         WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
         SELECT dictGet('default.complex_key_hashed_dictionary', {column_name}, key)
@@ -109,6 +115,7 @@
         LIMIT {elements_count}
         FORMAT Null;
     </query>
+
     <query>
         WITH (rand64() % toUInt64({elements_count}), toString(rand64() % toUInt64({elements_count}))) as key
         SELECT dictHas('default.complex_key_hashed_dictionary', key)
@@ -117,6 +124,11 @@
         FORMAT Null;
     </query>
 
+    <query>
+        SELECT * FROM complex_key_hashed_dictionary
+        FORMAT Null;
+    </query>
+
     <drop_query>DROP TABLE IF EXISTS simple_key_hashed_dictionary_source_table;</drop_query>
     <drop_query>DROP TABLE IF EXISTS complex_key_hashed_dictionary_source_table;</drop_query>
 
diff --git a/tests/performance/json_extract_simdjson.xml b/tests/performance/json_extract_simdjson.xml
index 9ec3613d5e8..b22173f9946 100644
--- a/tests/performance/json_extract_simdjson.xml
+++ b/tests/performance/json_extract_simdjson.xml
@@ -24,7 +24,7 @@
     <query>SELECT 'simdjson-4',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractUInt(materialize({json}), 'nparam'))</query>
     <query>SELECT 'simdjson-5',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractFloat(materialize({json}), 'fparam'))</query>
 
-    <query>SELECT 'simdjson-6',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam'))</query>
+    <query>SELECT 'simdjson-6',  count() FROM zeros(1000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam'))</query>
     <query>SELECT 'simdjson-7',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractString(materialize({long_json}), 'sparam', 'nested_1'))</query>
     <query>SELECT 'simdjson-8',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractInt(materialize({long_json}), 'nparam'))</query>
     <query>SELECT 'simdjson-9',  count() FROM zeros(5000000) WHERE NOT ignore(JSONExtractUInt(materialize({long_json}), 'nparam'))</query>
diff --git a/tests/performance/mmap_io.xml b/tests/performance/mmap_io.xml
index b8f3f6e69dd..7dc605f955a 100644
--- a/tests/performance/mmap_io.xml
+++ b/tests/performance/mmap_io.xml
@@ -1,9 +1,10 @@
 <test>
     <preconditions>
-        <table_exists>hits_10m_single</table_exists>
+        <table_exists>test.hits</table_exists>
     </preconditions>
 
     <settings>
+        <local_filesystem_read_method>mmap</local_filesystem_read_method>
         <min_bytes_to_use_mmap_io>1</min_bytes_to_use_mmap_io>
     </settings>
 
diff --git a/tests/performance/nlp.xml b/tests/performance/nlp.xml
index e5006027c59..07eda93c686 100644
--- a/tests/performance/nlp.xml
+++ b/tests/performance/nlp.xml
@@ -8,10 +8,10 @@
     </preconditions>
 
     <create_query>CREATE TABLE hits_100m_words (words Array(String), UserID UInt64) ENGINE Memory</create_query>
-    <create_query>CREATE TABLE hits_100m_words_ws (words Array(String), UserID UInt64) ENGINE Memory</create_query>
+    <fill_query>INSERT INTO hits_100m_words SELECT splitByNonAlpha(SearchPhrase) AS words, UserID FROM hits_100m_single WHERE length(words) > 0</fill_query>
 
-    <query>INSERT INTO hits_100m_words SELECT splitByNonAlpha(SearchPhrase) AS words, UserID FROM hits_100m_single WHERE length(words) > 0</query>
-    <query>INSERT INTO hits_100m_words_ws SELECT splitByWhitespace(SearchPhrase) AS words, UserID FROM hits_100m_single WHERE length(words) > 0</query>
+    <query>SELECT splitByNonAlpha(SearchPhrase) FROM hits_100m_single FORMAT Null</query>
+    <query>SELECT splitByWhitespace(SearchPhrase) FROM hits_100m_single FORMAT Null</query>
 
     <query>SELECT arrayMap(x -> stem('ru', x), words) FROM hits_100m_words FORMAT Null</query>
 
diff --git a/tests/performance/normalize_utf8.xml b/tests/performance/normalize_utf8.xml
new file mode 100644
index 00000000000..de9bd87fdf8
--- /dev/null
+++ b/tests/performance/normalize_utf8.xml
@@ -0,0 +1,15 @@
+<test>
+    <preconditions>
+        <table_exists>hits_10m_single</table_exists>
+    </preconditions>
+
+    <create_query>CREATE TABLE strings (words String) ENGINE Memory</create_query>
+    <fill_query>INSERT INTO strings SELECT SearchPhrase FROM hits_10m_single WHERE length(SearchPhrase) > 0</fill_query>
+
+    <query>SELECT normalizeUTF8NFC(words) FROM strings FORMAT Null</query>
+    <query>SELECT normalizeUTF8NFD(words) FROM strings FORMAT Null</query>
+    <query>SELECT normalizeUTF8NFKC(words) FROM strings FORMAT Null</query>
+    <query>SELECT normalizeUTF8NFKD(words) FROM strings FORMAT Null</query>
+
+    <drop_query>DROP TABLE IF EXISTS strings</drop_query>
+</test>
diff --git a/tests/performance/parallel_mv.xml b/tests/performance/parallel_mv.xml
index 1e9b92c54df..0664602b848 100644
--- a/tests/performance/parallel_mv.xml
+++ b/tests/performance/parallel_mv.xml
@@ -13,6 +13,12 @@
     <create_query>create materialized view mv_4 engine = MergeTree order by tuple() as
         select number, toString(number) from main_table where number % 13 != 4;</create_query>
 
+    <fill_query>SYSTEM STOP MERGES main_table</fill_query>
+    <fill_query>SYSTEM STOP MERGES mt_1</fill_query>
+    <fill_query>SYSTEM STOP MERGES mt_2</fill_query>
+    <fill_query>SYSTEM STOP MERGES mt_3</fill_query>
+    <fill_query>SYSTEM STOP MERGES mt_4</fill_query>
+
     <query>insert into main_table select number from numbers(10000000)</query>
 
     <drop_query>drop table if exists main_table;</drop_query>
diff --git a/tests/performance/read_in_order_many_parts.xml b/tests/performance/read_in_order_many_parts.xml
index ca713935426..065d12fadd2 100644
--- a/tests/performance/read_in_order_many_parts.xml
+++ b/tests/performance/read_in_order_many_parts.xml
@@ -15,17 +15,24 @@
                 <value>1000</value>
             </values>
         </substitution>
+        <substitution>
+            <name>uniqs</name>
+            <values>
+                <value>100</value>
+                <value>10000</value>
+            </values>
+        </substitution>
     </substitutions>
 
-    <create_query>CREATE TABLE mt_{parts}_parts(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % {parts} SETTINGS parts_to_throw_insert=10000, parts_to_delay_insert=10000</create_query>
-    <fill_query>SYSTEM STOP MERGES mt_{parts}_parts</fill_query>
-    <fill_query>INSERT INTO mt_{parts}_parts SELECT number, rand() % 10000, rand() FROM numbers_mt(100000000) SETTINGS max_block_size=10000000</fill_query>
-    <fill_query>SYSTEM START MERGES mt_{parts}_parts</fill_query>
-    <fill_query>OPTIMIZE TABLE mt_{parts}_parts FINAL</fill_query>
+    <create_query>CREATE TABLE mt_{parts}_parts_{uniqs}_uniqs(id UInt32, val1 UInt32, val2 UInt32) ENGINE = MergeTree ORDER BY val1 PARTITION BY id % {parts} SETTINGS parts_to_throw_insert=10000, parts_to_delay_insert=10000</create_query>
+    <fill_query>SYSTEM STOP MERGES mt_{parts}_parts_{uniqs}_uniqs</fill_query>
+    <fill_query>INSERT INTO mt_{parts}_parts_{uniqs}_uniqs SELECT number, rand() % {uniqs}, rand() FROM numbers_mt(100000000) SETTINGS max_block_size=10000000</fill_query>
+    <fill_query>SYSTEM START MERGES mt_{parts}_parts_{uniqs}_uniqs</fill_query>
+    <fill_query>OPTIMIZE TABLE mt_{parts}_parts_{uniqs}_uniqs FINAL</fill_query>
 
-    <query>SELECT val2 FROM mt_{parts}_parts ORDER BY val1 LIMIT 1000000 FORMAT Null</query>
-    <query>SELECT val2 FROM mt_{parts}_parts ORDER BY val1 LIMIT 10000000 FORMAT Null</query>
-    <query>SELECT sum(val2) FROM mt_{parts}_parts GROUP BY val1 FORMAT Null</query>
+    <query>SELECT val2 FROM mt_{parts}_parts_10000_uniqs ORDER BY val1 LIMIT 1000000 FORMAT Null</query>
+    <query>SELECT val2 FROM mt_{parts}_parts_10000_uniqs ORDER BY val1 LIMIT 10000000 FORMAT Null</query>
+    <query>SELECT sum(val2) FROM mt_{parts}_parts_{uniqs}_uniqs GROUP BY val1 FORMAT Null</query>
 
-    <drop_query>DROP TABLE IF EXISTS mt_{parts}_parts</drop_query>
+    <drop_query>DROP TABLE IF EXISTS mt_{parts}_parts_{uniqs}_uniqs</drop_query>
 </test>
diff --git a/tests/performance/sequence_match.xml b/tests/performance/sequence_match.xml
new file mode 100644
index 00000000000..35a2734df60
--- /dev/null
+++ b/tests/performance/sequence_match.xml
@@ -0,0 +1,79 @@
+<test>
+    <preconditions>
+        <table_exists>hits_10m_single</table_exists>
+        <table_exists>test.hits</table_exists>
+    </preconditions>
+
+    <!-- Queries with some matching rows -->
+    <query>
+        SELECT 1 FROM hits_10m_single GROUP BY EventTime HAVING
+        sequenceMatch('(?1)(?t&lt;1)(?2)')(
+        EventTime, Age BETWEEN 20 AND 30, Age BETWEEN 35 AND 50)
+        FORMAT Null
+    </query>
+    <query>
+        SELECT 1 FROM test.hits GROUP BY EventTime HAVING
+        sequenceMatch('(?1)(?t&lt;1)(?2)')(
+        EventTime, Age BETWEEN 20 AND 30, Age BETWEEN 35 AND 50)
+        FORMAT Null
+    </query>
+
+    <!-- Same queries as above, but with all rows matching the last condition -->
+    <query>
+        SELECT 1 FROM hits_10m_single GROUP BY EventTime HAVING
+        sequenceMatch('(?1)(?t&lt;1)(?2)')(
+        EventTime, Age BETWEEN 20 AND 30, Age BETWEEN 35 AND 50, Age >= 0)
+        FORMAT Null
+    </query>
+    <query>
+        SELECT 1 FROM test.hits GROUP BY EventTime HAVING
+        sequenceMatch('(?1)(?t&lt;1)(?2)')(
+        EventTime, Age BETWEEN 20 AND 30, Age BETWEEN 35 AND 50, Age >= 0)
+        FORMAT Null
+    </query>
+
+    <!-- Queries with no rows matching (Age is never negative) -->
+    <query>
+        SELECT 1 FROM hits_10m_single GROUP BY EventTime HAVING
+        sequenceMatch('(?1)(?t&lt;1)(?2)')(
+        EventTime, Age >= 0, Age = -1)
+        FORMAT Null
+    </query>
+    <query>
+        SELECT 1 FROM test.hits GROUP BY EventTime HAVING
+        sequenceMatch('(?1)(?t&lt;1)(?2)')(
+        EventTime, Age >= 0, Age = -1)
+        FORMAT Null
+    </query>
+
+    <!-- Using array conditions in further tests (only available for test.hits) for good diversity of matched rows percentage -->
+
+    <!-- Queries with time constraints -->
+    <query>
+        SELECT 1 FROM test.hits WHERE RefererCategories != [] GROUP BY ClientIP, RequestNum HAVING
+        sequenceMatch('(?1)(?t&gt;1000)(?3)')(
+        EventTime, hasAny(RefererCategories, [9]), hasAny(RefererCategories, [3849, 2, 3, 4, 5, 6, 7]), hasAll(RefererCategories, [1, 9]), hasAny(RefererCategories, [1, 2326, 5496]))
+        FORMAT Null
+    </query>
+    <query>
+        SELECT 1 FROM test.hits WHERE RefererCategories != [] GROUP BY ClientIP, RequestNum HAVING
+        sequenceMatch('(?1)(?t&lt;10000)(?2)')(
+        EventTime, hasAny(RefererCategories, [3849, 2, 3, 4, 5, 6, 7]), hasAny(RefererCategories, [1, 2]))
+        FORMAT Null
+    </query>
+
+    <!-- Queries without time constraints -->
+    <query>
+        SELECT 1 FROM test.hits WHERE RefererCategories != [] GROUP BY ClientIP, RequestNum HAVING
+        sequenceMatch('(?1)(?3)(?1)(?3)')(
+        EventTime, hasAny(RefererCategories, [9]), hasAny(RefererCategories, [3849, 2, 3, 4, 5, 6, 7]), hasAll(RefererCategories, [1, 9]), hasAny(RefererCategories, [1, 2326, 5496]))
+        FORMAT Null
+    </query>
+    <query>
+        SELECT 1 FROM test.hits WHERE RefererCategories != [] GROUP BY ClientIP, RequestNum HAVING
+        sequenceMatch('(?1)(?2)(?1)(?2)(?1)')(
+        EventTime, hasAny(RefererCategories, [3849, 2, 3, 4, 5, 6, 7]), hasAny(RefererCategories, [1, 2]))
+        FORMAT Null
+    </query>
+
+</test>
diff --git a/tests/performance/short_circuit_functions.xml b/tests/performance/short_circuit_functions.xml
new file mode 100644
index 00000000000..eaac76538dc
--- /dev/null
+++ b/tests/performance/short_circuit_functions.xml
@@ -0,0 +1,29 @@
+<test>
+    <query>SELECT if(number % 100, number, isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(10000000) FORMAT Null</query>
+    <query>SELECT multiIf(number % 100, number, isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(10000000) FORMAT Null</query>
+    <query>SELECT and(number % 100 == 0, isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(10000000) FORMAT Null</query>
+    <query>SELECT or(number % 100, isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(10000000) FORMAT Null</query>
+
+    <query>SELECT if(number % 2, isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT and(not isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number + 10), 100)), isValidUTF8(repeat(toString(number + 20), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT isValidUTF8(repeat(toString(number), 100)) or isValidUTF8(repeat(toString(number + 10), 100)) or isValidUTF8(repeat(toString(number + 20), 100))  FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT multiIf(number >= 500000, isValidUTF8(repeat(toString(number), 100)), less(number, 50000), number * 2, isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(1000000) FORMAT Null</query>
+
+    <query short="1">SELECT toTypeName(isValidUTF8(repeat(toString(number), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query short="1">SELECT toColumnTypeName(isValidUTF8(repeat(toString(number), 100))) FROM numbers(1000000) FORMAT Null</query>
+
+    <query>SELECT if(isValidUTF8(repeat(toString(number), 10)), isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT and(isValidUTF8(repeat(toString(number), 10)), not isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT or(not isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT multiIf(isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number + 10), 100))) FROM numbers(1000000) FORMAT Null</query>
+
+    <query>SELECT if(number % 2, isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT multiIf(number % 2, isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number), 100))) FROM numbers(1000000) FORMAT Null</query>
+    <query>SELECT and(isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number), 10)), isValidUTF8(repeat(toString(number), 100))) from numbers(1000000) FORMAT Null</query>
+    <query>SELECT or(not isValidUTF8(repeat(toString(number), 100)), not isValidUTF8(repeat(toString(number), 100)), isValidUTF8(repeat(toString(number), 100))) from numbers(1000000) FORMAT Null</query>
+
+    <query>SELECT if(number % 2, arraySum(bitPositionsToArray(number)), arraySum(bitPositionsToArray(number + 1))) FROM numbers(10000000) FORMAT Null</query>
+    <query>SELECT if(number % 5 == 0, arraySum(bitPositionsToArray(number)), 0) from numbers(10000000) FORMAT Null</query>
+    <query>SELECT if(number % 2, number + intDiv(number, number + 1), 3 + intDiv(number, number + 1)), if(number % 3 = 0, number, 4 + intDiv(number, number + 1)) FROM numbers(10000000) FORMAT Null</query>
+    <query>SELECT if(number % 5 == 0, toInt8OrZero(toString(number)), Null) FROM numbers(100000000) FORMAT Null</query>
+</test>
diff --git a/tests/performance/sum.xml b/tests/performance/sum.xml
index 9bee2a580c3..57b879a360d 100644
--- a/tests/performance/sum.xml
+++ b/tests/performance/sum.xml
@@ -16,4 +16,15 @@
     <query>SELECT sum(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat32(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
+
+    <!-- Create a table with ~20% null values. Make it random so the branch predictor doesn't do all the work -->
+    <create_query>CREATE TABLE nullfloat32 (x Nullable(Float32)) ENGINE = Memory</create_query>
+    <fill_query>INSERT INTO nullfloat32
+                SELECT IF(rand() % 5 == 0, NULL::Nullable(Float32), toFloat32(number)) as x
+                FROM numbers_mt(200000000)
+                SETTINGS max_threads = 8
+    </fill_query>
+    <query short="1">SELECT sum(x) FROM nullfloat32</query>
+    <query short="1">SELECT sum(x::Nullable(Float64)) FROM nullfloat32</query>
+    <drop_query>DROP TABLE IF EXISTS nullfloat32</drop_query>
 </test>
diff --git a/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql b/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
index defbf1aabc9..8bc1c39b574 100644
--- a/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
+++ b/tests/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT (dummy AS x) - 1 FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql b/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
index f9d1380bae4..7f236212a4c 100644
--- a/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
+++ b/tests/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT count() FROM remote('127.0.0.{2,3}', system, one) WHERE arrayExists((x) -> x = 1, [1, 2, 3])
diff --git a/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql b/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
index b7e672a32b6..84956f0d97e 100644
--- a/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
+++ b/tests/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT quantilesTiming(0.1, 0.5, 0.9)(dummy) FROM remote('127.0.0.{2,3}', system, one) GROUP BY 1 WITH TOTALS
diff --git a/tests/queries/0_stateless/00026_shard_something_distributed.sql b/tests/queries/0_stateless/00026_shard_something_distributed.sql
index aff6d02c1ed..23598edb574 100644
--- a/tests/queries/0_stateless/00026_shard_something_distributed.sql
+++ b/tests/queries/0_stateless/00026_shard_something_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT NOT dummy FROM remote('127.0.0.{2,3}', system, one) WHERE NOT dummy
diff --git a/tests/queries/0_stateless/00027_argMinMax.reference b/tests/queries/0_stateless/00027_argMinMax.reference
index 101e8c16044..c92140c0f33 100644
--- a/tests/queries/0_stateless/00027_argMinMax.reference
+++ b/tests/queries/0_stateless/00027_argMinMax.reference
@@ -1,5 +1,5 @@
 0	9
 0	9
 1970-01-01	1970-01-10
-0.00	9.00
+0	9
 4	1
diff --git a/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql b/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
index 64415c3269c..f16679d6dc3 100644
--- a/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
+++ b/tests/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS big_array;
 CREATE TABLE big_array (x Array(UInt8)) ENGINE=TinyLog;
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
diff --git a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
index 3360b8da83d..20be34499d5 100755
--- a/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
+++ b/tests/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00059_shard_global_in.sql b/tests/queries/0_stateless/00059_shard_global_in.sql
index 4da93e0a14a..e9ab21490bf 100644
--- a/tests/queries/0_stateless/00059_shard_global_in.sql
+++ b/tests/queries/0_stateless/00059_shard_global_in.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT number FROM remote('127.0.0.{2,3}', system, numbers) WHERE number GLOBAL IN (SELECT number FROM remote('127.0.0.{2,3}', system, numbers) WHERE number % 2 = 1 LIMIT 10) LIMIT 10;
diff --git a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.reference
similarity index 84%
rename from tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
rename to tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.reference
index cb61ab3e9b9..59e3e1e4a3f 100644
--- a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
+++ b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.reference
@@ -1,22 +1,22 @@
 d	Date					
 k	UInt64					
 i32	Int32					
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	10	42
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\')\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	9	41	1992-01-01 08:00:00
 2015-01-01	10	42	1970-01-01 00:00:00
 d	Date					
@@ -25,14 +25,14 @@ i32	Int32
 dt	DateTime(\'UTC\')					
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']
 2015-01-01	9	41	1992-01-01 08:00:00	[]	[]
 2015-01-01	10	42	1970-01-01 00:00:00	[]	[]
@@ -43,7 +43,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -51,7 +51,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	['2000-01-01','2000-01-01','2000-01-03']
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	['1970-01-01','1970-01-01','1970-01-01']
 2015-01-01	9	41	1992-01-01 08:00:00	[]	[]	[]
@@ -64,7 +64,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 n.d	Array(Date)					
 s	String	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -73,7 +73,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 n.d	Array(Date)					
 s	String	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `n.d` Array(Date),\n    `s` String DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	[10,20,30]	['asd','qwe','qwe']	['2000-01-01','2000-01-01','2000-01-03']	100500
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	['2000-01-01','2000-01-01','2000-01-03']	0
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	['1970-01-01','1970-01-01','1970-01-01']	0
@@ -86,7 +86,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 s	Int64	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -94,7 +94,7 @@ dt	DateTime(\'UTC\')
 n.ui8	Array(UInt8)					
 n.s	Array(String)					
 s	Int64	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` Int64 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	[10,20,30]	['asd','qwe','qwe']	100500
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	0
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	0
@@ -108,7 +108,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
 n.d	Array(Date)					
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -117,7 +117,7 @@ n.ui8	Array(UInt8)
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
 n.d	Array(Date)					
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.ui8` Array(UInt8),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\',\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	[10,20,30]	['asd','qwe','qwe']	100500	['1970-01-01','1970-01-01','1970-01-01']
 2015-01-01	7	39	2014-07-14 13:26:50	[10,20,30]	['120','130','140']	0	['1970-01-01','1970-01-01','1970-01-01']
 2015-01-01	8	40	2012-12-12 12:12:12	[1,2,3]	['12','13','14']	0	['1970-01-01','1970-01-01','1970-01-01']
@@ -129,14 +129,14 @@ i32	Int32
 dt	DateTime(\'UTC\')					
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 n.s	Array(String)					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `n.s` Array(String),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	['asd','qwe','qwe']	100500
 2015-01-01	7	39	2014-07-14 13:26:50	['120','130','140']	0
 2015-01-01	8	40	2012-12-12 12:12:12	['12','13','14']	0
@@ -147,13 +147,13 @@ k	UInt64
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	100500
 2015-01-01	7	39	2014-07-14 13:26:50	0
 2015-01-01	8	40	2012-12-12 12:12:12	0
@@ -166,7 +166,7 @@ dt	DateTime(\'UTC\')
 s	UInt32	DEFAULT	\'0\'			
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
@@ -174,7 +174,7 @@ dt	DateTime(\'UTC\')
 s	UInt32	DEFAULT	\'0\'			
 n.s	Array(String)					
 n.d	Array(Date)					
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\',\n    `n.s` Array(String),\n    `n.d` Array(Date)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	100500	[]	[]
 2015-01-01	7	39	2014-07-14 13:26:50	0	[]	[]
 2015-01-01	8	40	2012-12-12 12:12:12	0	[]	[]
@@ -185,13 +185,13 @@ k	UInt64
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	DateTime(\'UTC\')					
 s	UInt32	DEFAULT	\'0\'			
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` DateTime(\'UTC\'),\n    `s` UInt32 DEFAULT \'0\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15 13:26:50	100500
 2015-01-01	7	39	2014-07-14 13:26:50	0
 2015-01-01	8	40	2012-12-12 12:12:12	0
@@ -202,13 +202,13 @@ k	UInt64
 i32	Int32					
 dt	Date					
 s	DateTime(\'UTC\')	DEFAULT	\'1970-01-01 00:00:00\'			
-CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r1\', d, k, 8192)
+CREATE TABLE default.replicated_alter1\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r1\', d, k, 8192)
 d	Date					
 k	UInt64					
 i32	Int32					
 dt	Date					
 s	DateTime(\'UTC\')	DEFAULT	\'1970-01-01 00:00:00\'			
-CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00062/alter\', \'r2\', d, k, 8192)
+CREATE TABLE default.replicated_alter2\n(\n    `d` Date,\n    `k` UInt64,\n    `i32` Int32,\n    `dt` Date,\n    `s` DateTime(\'UTC\') DEFAULT \'1970-01-01 00:00:00\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00062/alter\', \'r2\', d, k, 8192)
 2015-01-01	6	38	2014-07-15	1970-01-02 03:55:00
 2015-01-01	7	39	2014-07-14	1970-01-01 00:00:00
 2015-01-01	8	40	2012-12-12	1970-01-01 00:00:00
diff --git a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
similarity index 92%
rename from tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
rename to tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
index ac56b3416cd..e8d1a713c21 100644
--- a/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
+++ b/tests/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_alter1;
 DROP TABLE IF EXISTS replicated_alter2;
 
 SET replication_alter_partitions_sync = 2;
 
-CREATE TABLE replicated_alter1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00062/alter', 'r1', d, k, 8192);
-CREATE TABLE replicated_alter2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00062/alter', 'r2', d, k, 8192);
+CREATE TABLE replicated_alter1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00062/alter', 'r1', d, k, 8192);
+CREATE TABLE replicated_alter2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00062/alter', 'r2', d, k, 8192);
 
 INSERT INTO replicated_alter1 VALUES ('2015-01-01', 10, 42);
 
diff --git a/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql b/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
index 2c3f0dfb0e3..9ee5c4d8915 100644
--- a/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
+++ b/tests/queries/0_stateless/00065_shard_float_literals_formatting.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT toTypeName(1.0) FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00067_replicate_segfault.sql b/tests/queries/0_stateless/00067_replicate_segfault.sql
index bf1a756d887..bf4c90d5adf 100644
--- a/tests/queries/0_stateless/00067_replicate_segfault.sql
+++ b/tests/queries/0_stateless/00067_replicate_segfault.sql
@@ -1,2 +1,4 @@
+-- Tags: replica
+
 SELECT arrayFilter(x -> materialize(0), materialize([0])) AS p, arrayAll(y -> arrayExists(x -> y != x, p), p) AS test;
 SELECT arrayFilter(x -> materialize(0), materialize([''])) AS p, arrayAll(y -> arrayExists(x -> y != x, p), p) AS test;
diff --git a/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql b/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
index 351f18ef4bd..5305c0d05fb 100644
--- a/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
+++ b/tests/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT -(-1) FROM remote('127.0.0.{2,3}', system, one)
diff --git a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
index efb7ccf5f71..137dfb5b6f0 100644
--- a/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
+++ b/tests/queries/0_stateless/00080_show_tables_and_system_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_show_tables;
 
 CREATE DATABASE test_show_tables;
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.reference b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
similarity index 96%
rename from tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql
rename to tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
index 998a4517163..3418d093f70 100644
--- a/tests/queries/0_stateless/00083_create_merge_tree_zookeeper.sql
+++ b/tests/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
@@ -1,3 +1,7 @@
+-- Tags: long, zookeeper, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Old syntax is not allowed
+-- Tag no-parallel: leftovers
+
 SET optimize_on_insert = 0;
 
 DROP TABLE IF EXISTS merge_tree;
@@ -56,7 +60,7 @@ CREATE TABLE aggregating_merge_tree_with_sampling
 	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = AggregatingMergeTree(d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
 
 CREATE TABLE replicated_merge_tree
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00083/01/replicated_merge_tree/', 'r1', d, (a, b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00083/01/replicated_merge_tree/', 'r1', d, (a, b), 111);
 CREATE TABLE replicated_collapsing_merge_tree
 	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test_00083/01/replicated_collapsing_merge_tree/', 'r1', d, (a, b), 111, y);
 CREATE TABLE replicated_versioned_collapsing_merge_tree
@@ -69,7 +73,7 @@ CREATE TABLE replicated_aggregating_merge_tree
 	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test_00083/01/replicated_aggregating_merge_tree/', 'r1', d, (a, b), 111);
 
 CREATE TABLE replicated_merge_tree_with_sampling
-	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00083/01/replicated_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
+	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00083/01/replicated_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111);
 CREATE TABLE replicated_collapsing_merge_tree_with_sampling
 	(d Date, a String, b UInt8, x String, y Int8, z UInt32) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/tables/test_00083/01/replicated_collapsing_merge_tree_with_sampling/', 'r1', d, sipHash64(a) + b, (a, sipHash64(a) + b), 111, y);
 CREATE TABLE replicated_versioned_collapsing_merge_tree_with_sampling
diff --git a/tests/queries/0_stateless/00090_union_race_conditions_1.sh b/tests/queries/0_stateless/00090_union_race_conditions_1.sh
index afec8b5bac9..241436369b1 100755
--- a/tests/queries/0_stateless/00090_union_race_conditions_1.sh
+++ b/tests/queries/0_stateless/00090_union_race_conditions_1.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00091_union_race_conditions_2.sh b/tests/queries/0_stateless/00091_union_race_conditions_2.sh
index 78a6cca2b2b..aadbbe8d7d3 100755
--- a/tests/queries/0_stateless/00091_union_race_conditions_2.sh
+++ b/tests/queries/0_stateless/00091_union_race_conditions_2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00092_union_race_conditions_3.sh b/tests/queries/0_stateless/00092_union_race_conditions_3.sh
index 9be2613f70a..a6f8fa5f6ec 100755
--- a/tests/queries/0_stateless/00092_union_race_conditions_3.sh
+++ b/tests/queries/0_stateless/00092_union_race_conditions_3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00093_union_race_conditions_4.sh b/tests/queries/0_stateless/00093_union_race_conditions_4.sh
index ab1a025c5b2..3e3713f4024 100755
--- a/tests/queries/0_stateless/00093_union_race_conditions_4.sh
+++ b/tests/queries/0_stateless/00093_union_race_conditions_4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00094_union_race_conditions_5.sh b/tests/queries/0_stateless/00094_union_race_conditions_5.sh
index b546b6a0092..fcd2b8bebb6 100755
--- a/tests/queries/0_stateless/00094_union_race_conditions_5.sh
+++ b/tests/queries/0_stateless/00094_union_race_conditions_5.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
index b3c0b37e0c0..bcd6cbefaff 100755
--- a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
+++ b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
index 3856da7f214..a2a08105804 100755
--- a/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
+++ b/tests/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00098_shard_i_union_all.sql b/tests/queries/0_stateless/00098_shard_i_union_all.sql
index b02a468bc82..5151f9ad0e5 100644
--- a/tests/queries/0_stateless/00098_shard_i_union_all.sql
+++ b/tests/queries/0_stateless/00098_shard_i_union_all.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS report1;
 DROP TABLE IF EXISTS report2;
 
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 9885c3c6f44..2fd097b9538 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
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00101_0;
 
 USE test_00101_0;
diff --git a/tests/queries/0_stateless/00105_shard_collations.sql b/tests/queries/0_stateless/00105_shard_collations.sql
index a73c441cc19..3a4151eebf8 100644
--- a/tests/queries/0_stateless/00105_shard_collations.sql
+++ b/tests/queries/0_stateless/00105_shard_collations.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-fasttest
+
 SELECT 'Русский (default)';
 SELECT arrayJoin(['а', 'я', 'ё', 'А', 'Я', 'Ё']) AS x ORDER BY x;
 
diff --git a/tests/queries/0_stateless/00108_shard_totals_after_having.sql b/tests/queries/0_stateless/00108_shard_totals_after_having.sql
index 37825b269f7..db0527c27ab 100644
--- a/tests/queries/0_stateless/00108_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00108_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
 
diff --git a/tests/queries/0_stateless/00109_shard_totals_after_having.sql b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
index ae143f594c5..2a616b4a39d 100644
--- a/tests/queries/0_stateless/00109_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00109_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel, no-fasttest
+
 SET max_rows_to_group_by = 100000;
 SET max_block_size = 100001;
 SET group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/00110_external_sort.sql b/tests/queries/0_stateless/00110_external_sort.sql
index e7284796552..dd65c3e9546 100644
--- a/tests/queries/0_stateless/00110_external_sort.sql
+++ b/tests/queries/0_stateless/00110_external_sort.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 300000000;
 SET max_bytes_before_external_sort = 20000000;
 SELECT number FROM (SELECT number FROM system.numbers LIMIT 10000000) ORDER BY number * 1234567890123456789 LIMIT 9999990, 10;
diff --git a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
index 5f5fa5443fd..112f5edae36 100644
--- a/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
+++ b/tests/queries/0_stateless/00111_shard_external_sort_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_memory_usage = 300000000;
 SET max_bytes_before_external_sort = 20000000;
 
diff --git a/tests/queries/0_stateless/00112_shard_totals_after_having.sql b/tests/queries/0_stateless/00112_shard_totals_after_having.sql
index bea0bd36ef2..27952ae28c4 100644
--- a/tests/queries/0_stateless/00112_shard_totals_after_having.sql
+++ b/tests/queries/0_stateless/00112_shard_totals_after_having.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET totals_mode = 'after_having_auto';
 SET max_rows_to_group_by = 100000;
 SET group_by_overflow_mode = 'any';
diff --git a/tests/queries/0_stateless/00113_shard_group_array.sql b/tests/queries/0_stateless/00113_shard_group_array.sql
index b960144ac4e..b589f9ce047 100644
--- a/tests/queries/0_stateless/00113_shard_group_array.sql
+++ b/tests/queries/0_stateless/00113_shard_group_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT intDiv(number, 100) AS k, length(groupArray(number)) FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k WITH TOTALS ORDER BY k LIMIT 10;
 
 SELECT '';
diff --git a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
index 1348989e244..5c3918dea9f 100755
--- a/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
+++ b/tests/queries/0_stateless/00115_shard_in_incomplete_result.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00116_storage_set.sql b/tests/queries/0_stateless/00116_storage_set.sql
index 0eeed7e859a..b06ee254c69 100644
--- a/tests/queries/0_stateless/00116_storage_set.sql
+++ b/tests/queries/0_stateless/00116_storage_set.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS set2;
 
diff --git a/tests/queries/0_stateless/00118_storage_join.sql b/tests/queries/0_stateless/00118_storage_join.sql
index 47896d3316c..a855dcd56d8 100644
--- a/tests/queries/0_stateless/00118_storage_join.sql
+++ b/tests/queries/0_stateless/00118_storage_join.sql
@@ -16,4 +16,6 @@ SELECT k, js1.s, t2.s FROM (SELECT toUInt64(number / 3) AS k, sum(number) as s F
 SELECT k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k;
 SELECT k, t2.k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k;
 
+SELECT k, js1.s, t2.s FROM (SELECT number AS k, number AS s FROM system.numbers LIMIT 10) js1 ANY LEFT JOIN t2 ON js1.k == t2.k OR js1.s == t2.k; -- { serverError 48 }
+
 DROP TABLE t2;
diff --git a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
index 7ccf69e46b2..fd32f3d32d2 100644
--- a/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
+++ b/tests/queries/0_stateless/00121_drop_column_zookeeper.sql
@@ -1,12 +1,15 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS alter_00121;
-CREATE TABLE alter_00121 (d Date, x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_00121/t1', 'r1', d, (d), 8192);
+CREATE TABLE alter_00121 (d Date, x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/alter_00121/t1', 'r1', d, (d), 8192);
 
 INSERT INTO alter_00121 VALUES ('2014-01-01', 1);
 ALTER TABLE alter_00121 DROP COLUMN x;
 
 DROP TABLE alter_00121;
 
-CREATE TABLE alter_00121 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/alter_00121/t2', 'r1', d, (d), 8192);
+CREATE TABLE alter_00121 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/alter_00121/t2', 'r1', d, (d), 8192);
 
 INSERT INTO alter_00121 VALUES ('2014-01-01');
 SELECT * FROM alter_00121 ORDER BY d;
diff --git a/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql b/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
index 396be0683d3..788f16c2202 100644
--- a/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
+++ b/tests/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_distributed_connections = 1;
 SELECT count() + 1 FROM remote('127.0.0.{2,3}', system, one);
diff --git a/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql b/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
index 5352a8eba1a..6bc5fe268d6 100644
--- a/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
+++ b/tests/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, distributed
+
 SET max_parallel_replicas = 2;
 
 DROP TABLE IF EXISTS report;
diff --git a/tests/queries/0_stateless/00132_sets.sql b/tests/queries/0_stateless/00132_sets.sql
index f9cb2fbbd35..1b0a5fd0f64 100644
--- a/tests/queries/0_stateless/00132_sets.sql
+++ b/tests/queries/0_stateless/00132_sets.sql
@@ -7,7 +7,7 @@ SELECT (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, '') IN (1, 2, 3,
 SELECT (number AS n, n + 1, n + 2, n + 3) IN (1, 2, 3, 4) FROM system.numbers LIMIT 3;
 SELECT (number AS n, n + 1, n + 2, n + 3, n - 1) IN (1, 2, 3, 4, 0) FROM system.numbers LIMIT 3;
 SELECT (number AS n, n + 1, toString(n + 2), n + 3, n - 1) IN (1, 2, '3', 4, 0) FROM system.numbers LIMIT 3;
-SELECT number, tuple FROM (SELECT 1 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN (((1, (2, 3)), (4, (5, 6))));
+SELECT number, tuple FROM (SELECT 1 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN ( (/*number*/1, /*tuple*/(2, 3)), (/*number*/4, /*tuple*/(5, 6)) );
 SELECT number, tuple FROM (SELECT 2 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN ((2, (2, 3)));
 SELECT number, tuple FROM (SELECT 3 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN (3, (2, 3));
 SELECT number, tuple FROM (SELECT 4 AS number, (2, 3) AS tuple) WHERE (number, tuple) IN (SELECT 4, (2, 3));
diff --git a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
index 05ebe9d19a8..389a2cd9684 100755
--- a/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
+++ b/tests/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, shard, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql b/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
index 8f98cd6d62a..a9493418e8e 100644
--- a/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
+++ b/tests/queries/0_stateless/00154_shard_distributed_with_distinct.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT DISTINCT number FROM remote('127.0.0.{2,3}', system.numbers) LIMIT 10
diff --git a/tests/queries/0_stateless/00155_long_merges.sh b/tests/queries/0_stateless/00155_long_merges.sh
index c2aafaf0c95..f2d9cd1dade 100755
--- a/tests/queries/0_stateless/00155_long_merges.sh
+++ b/tests/queries/0_stateless/00155_long_merges.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql b/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
index 8d5d297b629..23c157db875 100644
--- a/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
+++ b/tests/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test2_00158;
 DROP TABLE IF EXISTS test2_00158.mt_buffer_00158;
 DROP TABLE IF EXISTS test2_00158.mt_00158;
diff --git a/tests/queries/0_stateless/00162_shard_global_join.sql b/tests/queries/0_stateless/00162_shard_global_join.sql
index af56407e3d5..040eb0e7c03 100644
--- a/tests/queries/0_stateless/00162_shard_global_join.sql
+++ b/tests/queries/0_stateless/00162_shard_global_join.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT toFloat64(dummy + 2) AS n, j1, j2 FROM remote('127.0.0.{2,3}', system.one) jr1 GLOBAL ANY LEFT JOIN (SELECT number / 3 AS n, number AS j1, 'Hello' AS j2 FROM system.numbers LIMIT 10) jr2 USING n LIMIT 10;
diff --git a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
index ab7f347656d..71c570cf762 100644
--- a/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
+++ b/tests/queries/0_stateless/00163_shard_join_with_empty_table.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
 
diff --git a/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql b/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
index 2bd4156a4cb..b28f4e65487 100644
--- a/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
+++ b/tests/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT arrayMap((x, y) -> (x, y), [1, 2, 3], [4, 5, 6]) FROM remote('127.0.0.{2,3}', system.one) ORDER BY rand();
diff --git a/tests/queries/0_stateless/00178_function_replicate.sql b/tests/queries/0_stateless/00178_function_replicate.sql
index 13ce1c24364..832334774ee 100644
--- a/tests/queries/0_stateless/00178_function_replicate.sql
+++ b/tests/queries/0_stateless/00178_function_replicate.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SELECT
     number,
     range(number) AS arr,
diff --git a/tests/queries/0_stateless/00180_attach_materialized_view.sql b/tests/queries/0_stateless/00180_attach_materialized_view.sql
index d674c0bd277..9bebd46da84 100644
--- a/tests/queries/0_stateless/00180_attach_materialized_view.sql
+++ b/tests/queries/0_stateless/00180_attach_materialized_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t_00180;
 DROP TABLE IF EXISTS mv_00180;
 DROP TABLE IF EXISTS `.inner.mv_00180`;
diff --git a/tests/queries/0_stateless/00183_skip_unavailable_shards.sql b/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
index 4aa7cc72605..0f05618e746 100644
--- a/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
+++ b/tests/queries/0_stateless/00183_skip_unavailable_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET send_logs_level = 'fatal';
 SELECT count() FROM remote('{127,1}.0.0.{2,3}', system.one) SETTINGS skip_unavailable_shards = 1;
 SELECT count() FROM remote('{1,127}.0.0.{2,3}', system.one) SETTINGS skip_unavailable_shards = 1;
diff --git a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.reference b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.reference
index b667c57a14c..b2b0b43e490 100644
--- a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.reference
+++ b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.reference
@@ -25,6 +25,8 @@ ORDER BY LIMIT
 LIMIT BY
 0
 1
+0
+1
 LIMIT BY LIMIT
 0
 GROUP BY ORDER BY
diff --git a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
index cce10312e8f..965ce45fb90 100644
--- a/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
+++ b/tests/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'distributed_group_by_no_merge=1';
 SELECT count(), uniq(dummy) FROM remote('127.0.0.{2,3}', system.one) SETTINGS distributed_group_by_no_merge=1;
 SELECT count(), uniq(dummy) FROM remote('127.0.0.{2,3,4,5}', system.one) SETTINGS distributed_group_by_no_merge=1;
diff --git a/tests/queries/0_stateless/00186_very_long_arrays.sh b/tests/queries/0_stateless/00186_very_long_arrays.sh
index 26a4496a85b..739b17ccc99 100755
--- a/tests/queries/0_stateless/00186_very_long_arrays.sh
+++ b/tests/queries/0_stateless/00186_very_long_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00189_time_zones_long.sql b/tests/queries/0_stateless/00189_time_zones_long.sql
index 36c7dfb402a..ecc5f62ed1d 100644
--- a/tests/queries/0_stateless/00189_time_zones_long.sql
+++ b/tests/queries/0_stateless/00189_time_zones_long.sql
@@ -1,3 +1,4 @@
+-- Tags: long
 
 /* timestamp 1419800400 == 2014-12-29 00:00:00 (Europe/Moscow) */
 /* timestamp 1412106600 == 2014-09-30 23:50:00 (Europe/Moscow) */
diff --git a/tests/queries/0_stateless/00193_parallel_replicas.sql b/tests/queries/0_stateless/00193_parallel_replicas.sql
index d1430d74045..6c5b50972cc 100644
--- a/tests/queries/0_stateless/00193_parallel_replicas.sql
+++ b/tests/queries/0_stateless/00193_parallel_replicas.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS parallel_replicas;
 DROP TABLE IF EXISTS parallel_replicas_backup;
 
diff --git a/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql b/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
index fa4a9b97c4d..da21c56056c 100644
--- a/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
+++ b/tests/queries/0_stateless/00195_shard_union_all_and_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT * FROM (SELECT * WHERE dummy GLOBAL IN (SELECT 0));
 SELECT * FROM (SELECT * WHERE dummy GLOBAL IN (SELECT toUInt8(number) FROM system.numbers LIMIT 10));
 SELECT * FROM (SELECT * FROM (SELECT * FROM system.numbers LIMIT 20) WHERE number GLOBAL IN (SELECT number FROM system.numbers LIMIT 10));
diff --git a/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql b/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
index 6452e6b4254..6c3b8b5169b 100644
--- a/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
+++ b/tests/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS numbers_memory;
 CREATE TABLE numbers_memory AS system.numbers ENGINE = Memory;
 INSERT INTO numbers_memory SELECT number FROM system.numbers LIMIT 100;
diff --git a/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql b/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
index 390aac0571b..7c44ac30929 100644
--- a/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
+++ b/tests/queries/0_stateless/00211_shard_query_formatting_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT toUInt64(1) IN (1234567890, 2345678901, 3456789012, 4567890123, 5678901234, 6789012345, 7890123456, 8901234567, 9012345678, 123456789) AS x,
     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,
     x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x,
diff --git a/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
index f1b3c82fec3..2e273cd8056 100644
--- a/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
+++ b/tests/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
@@ -1,3 +1,5 @@
+-- Tags: long, shard
+
 -- uniqHLL12
 
 SELECT 'uniqHLL12';
diff --git a/tests/queries/0_stateless/00213_multiple_global_in.sql b/tests/queries/0_stateless/00213_multiple_global_in.sql
index c79c4ef5e10..0992f666a44 100644
--- a/tests/queries/0_stateless/00213_multiple_global_in.sql
+++ b/tests/queries/0_stateless/00213_multiple_global_in.sql
@@ -1 +1,3 @@
+-- Tags: global
+
 SELECT 1 GLOBAL IN (SELECT 1), 2 GLOBAL IN (SELECT 2) FROM remote('localhost', system.one);
diff --git a/tests/queries/0_stateless/00215_primary_key_order_zookeeper.reference b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00215_primary_key_order_zookeeper.reference
rename to tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
similarity index 71%
rename from tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql
rename to tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
index 8e36cbc85e0..d50f0daeb14 100644
--- a/tests/queries/0_stateless/00215_primary_key_order_zookeeper.sql
+++ b/tests/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
@@ -1,5 +1,8 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS primary_key;
-CREATE TABLE primary_key (d Date DEFAULT today(), x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00215/primary_key', 'r1', d, -x, 1);
+CREATE TABLE primary_key (d Date DEFAULT today(), x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00215/primary_key', 'r1', d, -x, 1);
 
 INSERT INTO primary_key (x) VALUES (1), (2), (3);
 INSERT INTO primary_key (x) VALUES (1), (3), (2);
diff --git a/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql b/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
index 0dd434f0dbf..0ebd60a7f5f 100644
--- a/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
+++ b/tests/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET joined_subquery_requires_alias = 0;
 
 SELECT k, a FROM (SELECT 42 AS k FROM remote('127.0.0.2', system.one)) GLOBAL ALL FULL OUTER JOIN (SELECT 42 AS k, 1 AS a, a) USING k;
diff --git a/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql b/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
index 69fd37f1c2e..80a35a4855a 100644
--- a/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
+++ b/tests/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT x FROM (SELECT count() AS x FROM remote('127.0.0.2', system.one) WITH TOTALS) LIMIT 1;
diff --git a/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql b/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
index 7a25139cdc4..94a70ec1fb1 100644
--- a/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
+++ b/tests/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_block_size = 1000;
 
 DROP TABLE IF EXISTS numbers_10_00223;
diff --git a/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql b/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
index caf5f7aa7f1..f99f712b388 100644
--- a/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
+++ b/tests/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS numbers_100k_log;
 CREATE TABLE numbers_100k_log ENGINE = Log AS SELECT * FROM system.numbers LIMIT 100000;
 
diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.reference b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.reference
rename to tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.reference
diff --git a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
similarity index 81%
rename from tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql
rename to tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
index c14ce53d4a3..0dec3ca05bc 100644
--- a/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql
+++ b/tests/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
@@ -1,5 +1,8 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS deduplication;
-CREATE TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00226/deduplication', 'r1', d, x, 1);
+CREATE TABLE deduplication (d Date DEFAULT '2015-01-01', x Int8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00226/deduplication', 'r1', d, x, 1);
 
 INSERT INTO deduplication (x) VALUES (1);
 INSERT INTO deduplication (x) VALUES (1);
diff --git a/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql b/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
index d1cb28bc97d..dc73655743e 100644
--- a/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
+++ b/tests/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select quantilesDeterministic(0.5, 0.9)(number, number) from (select number from system.numbers limit 101);
 -- test merge does not cause overflow
 select ignore(quantilesDeterministic(0.5, 0.9)(number, number)) from (select number from remote('127.0.0.{2,3}', system, numbers) limit 1000000);
diff --git a/tests/queries/0_stateless/00233_position_function_family.reference b/tests/queries/0_stateless/00233_position_function_family.reference
index 1523094261f..f6cacbc7027 100644
--- a/tests/queries/0_stateless/00233_position_function_family.reference
+++ b/tests/queries/0_stateless/00233_position_function_family.reference
@@ -23796,3 +23796,19 @@
 1
 1
 1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/00233_position_function_family.sql b/tests/queries/0_stateless/00233_position_function_family.sql
index 8e443f5cd10..36f8a5535d9 100644
--- a/tests/queries/0_stateless/00233_position_function_family.sql
+++ b/tests/queries/0_stateless/00233_position_function_family.sql
@@ -483,6 +483,22 @@ select 1 = position('abab', materialize('ab'));
 select 1 = position('abababababababababababab', materialize('abab'));
 select 1 = position('abababababababababababab', materialize('abababababababababa'));
 
+select 0 = multiSearchAny('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchAnyCaseInsensitive('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchAnyCaseInsensitiveUTF8('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchAnyUTF8('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstIndex('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstIndexCaseInsensitive('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstIndexCaseInsensitiveUTF8('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstIndexUTF8('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstPosition('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstPositionCaseInsensitive('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstPositionCaseInsensitiveUTF8('\0', CAST([], 'Array(String)'));
+select 0 = multiSearchFirstPositionUTF8('\0', CAST([], 'Array(String)'));
+select [] = multiSearchAllPositions('\0', CAST([], 'Array(String)'));
+select [] = multiSearchAllPositionsCaseInsensitive('\0', CAST([], 'Array(String)'));
+select [] = multiSearchAllPositionsCaseInsensitiveUTF8('\0', CAST([], 'Array(String)'));
+select [] = multiSearchAllPositionsUTF8('\0', CAST([], 'Array(String)'));
 
 select [2] = multiSearchAllPositions(materialize('abcdefgh'), ['b']);
 select [2] = multiSearchAllPositions(materialize('abcdefgh'), ['bc']);
@@ -1177,7 +1193,6 @@ select 0 = multiSearchAnyCaseInsensitiveUTF8(materialize('ШНвпкфЗвгДж
 select 1 = multiSearchAnyCaseInsensitiveUTF8(materialize('ФРХгаСлчЧОцкШгзмКЗшФфББвЧ'), ['кзШфФб', 'ГАслЧЧОцкшг', 'ФфббВЧ', 'ЦкШ', '', 'АслчЧОЦКШгзМкЗШффбБвч', 'РХгаслЧчОЦКШГз', 'РхгаслчЧОцКШгзМкзшФфБбВ', 'Шг', 'Ф', 'ХГАслчЧоцКШГзМкзш', 'ШгЗмКЗшфФб']) from system.numbers limit 10;
 select 1 = multiSearchAnyCaseInsensitiveUTF8(materialize('ЧдйШкхОлалщНйбССХКаФзОМрКЕЙР'), ['бссХкафзОм', 'ХОЛаЛщнйБссХкаФз', 'лаЛщнйБсСХ', 'ЩнЙбСсхКаФЗО', 'йБСсХКАФЗОмР', 'йшкХолаЛЩНйбсСхК', 'С', '', 'ЙшкхОлалщНЙБсСхКаФзом', 'Йр', 'щнЙБссхКАфзоМрК', 'рКе']) from system.numbers limit 10;
 
-
 select 1 = multiSearchFirstIndex(materialize('alhpvldsiwsydwhfdasqju'), ['sydwh', 'dwh', 'dwhfdasqj', 'w', 'briozrtpq', 'fdasq', 'lnuvpuxdhhuxjbolw', 'vldsiws', 'dasqju', 'uancllygwoifwnnp', 'wfxputfnen', 'hzaclvjumecnmweungz']) from system.numbers limit 10;
 select 0 = multiSearchFirstIndex(materialize('kcwchxxyujbhrxkxgnomg'), ['jmvqipszutxfnhdfaxqwoxcz', 'nrgzkbsakdtdiiyphozjoauyughyvlz', 'qbszx', 'sllthykcnttqecpequommemygee', 'bvsbdiufrrrjxaxzxgbd', 'hdkpcmpdyjildw', 'frxkyukiywngfcxfzwkcun', 'dmvxf', 'esamivybor', 'eoggdynqwlnlxr']) from system.numbers limit 10;
 select 0 = multiSearchFirstIndex(materialize('zggbeilrfpkleafjjldgyfgn'), ['rpypxkpgvljhqthneremvabcd', 'qchzlnsctuwkdxqcrjgihvtfxhqxfqsxm', 'vtozkivjyqcqetmqenuihq', 'fixcvjyzbzejmwdivjf', 'lydoolvnuuamwlnzbyuuwpqqjaxf', 'elkodwthxqpcybwezm', 'wpiju', 'wdzuuwumlqfvga', 'iokphkai', 'wkbwdstplhivjyk', 'wxfbhfturuqoymwklohawgwltptytc', 'jehprkzofqvurepbvuwdqj']) from system.numbers limit 10;
diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.reference b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.reference
rename to tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.sql b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
similarity index 66%
rename from tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.sql
rename to tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
index 95a5c7c97f1..f6eb4b2f8c1 100644
--- a/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.sql
+++ b/tests/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS attach_r1;
 DROP TABLE IF EXISTS attach_r2;
 
-CREATE TABLE attach_r1 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00236/01/attach', 'r1', d, d, 8192);
-CREATE TABLE attach_r2 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00236/01/attach', 'r2', d, d, 8192);
+CREATE TABLE attach_r1 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00236/01/attach', 'r1', d, d, 8192);
+CREATE TABLE attach_r2 (d Date) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00236/01/attach', 'r2', d, d, 8192);
 
 INSERT INTO attach_r1 VALUES ('2014-01-01'), ('2014-02-01'), ('2014-03-01');
 
diff --git a/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql b/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
index 282d5dad627..19105b5b935 100644
--- a/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
+++ b/tests/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS storage;
 CREATE TABLE storage(UserID UInt64) ENGINE=Memory;
 INSERT INTO storage(UserID) values (6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(6460432721393873721)(402895971392036118)(402895971392036118)(402895971392036118);
diff --git a/tests/queries/0_stateless/00255_array_concat_string.reference b/tests/queries/0_stateless/00255_array_concat_string.reference
index 2e336299656..e9fafe93ed1 100644
--- a/tests/queries/0_stateless/00255_array_concat_string.reference
+++ b/tests/queries/0_stateless/00255_array_concat_string.reference
@@ -63,3 +63,9 @@ yandex google test 123  hello world goodbye xyz yandex google test 123  hello wo
 012
 
 0
+hello;world;xyz;def
+
+
+hello;world;xyz;def
+
+
diff --git a/tests/queries/0_stateless/00255_array_concat_string.sql b/tests/queries/0_stateless/00255_array_concat_string.sql
index e6fd34e2dfc..3bdae0821cd 100644
--- a/tests/queries/0_stateless/00255_array_concat_string.sql
+++ b/tests/queries/0_stateless/00255_array_concat_string.sql
@@ -8,3 +8,9 @@ SELECT arrayStringConcat(arrayMap(x -> toString(x), range(number)), '') FROM sys
 SELECT arrayStringConcat(arrayMap(x -> toString(x), range(number)), ',') FROM system.numbers LIMIT 10;
 SELECT arrayStringConcat(arrayMap(x -> transform(x, [0, 1, 2, 3, 4, 5, 6, 7, 8], ['yandex', 'google', 'test', '123', '', 'hello', 'world', 'goodbye', 'xyz'], ''), arrayMap(x -> x % 9, range(number))), ' ') FROM system.numbers LIMIT 20;
 SELECT arrayStringConcat(arrayMap(x -> toString(x), range(number % 4))) FROM system.numbers LIMIT 10;
+SELECT arrayStringConcat([Null, 'hello', Null, 'world', Null, 'xyz', 'def', Null], ';');
+SELECT arrayStringConcat([Null, Null], ';');
+SELECT arrayStringConcat([Null::Nullable(String), Null::Nullable(String)], ';');
+SELECT arrayStringConcat(materialize([Null, 'hello', Null, 'world', Null, 'xyz', 'def', Null]), ';');
+SELECT arrayStringConcat(materialize([Null, Null]), ';');
+SELECT arrayStringConcat(materialize([Null::Nullable(String), Null::Nullable(String)]), ';');
diff --git a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
index 2293b1de490..48336faf382 100644
--- a/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
+++ b/tests/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select 40 as z from (select * from system.numbers limit 3) group by z;
 select 41 as z from remote('127.0.0.{2,3}', system.one) group by z;
 select count(), 42 AS z from remote('127.0.0.{2,3}', system.one) group by z;
diff --git a/tests/queries/0_stateless/00259_hashing_tuples.sql b/tests/queries/0_stateless/00259_hashing_tuples.sql
index eb90ac78e5a..3702dc133b4 100644
--- a/tests/queries/0_stateless/00259_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00259_hashing_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT cityHash64(1, 2, '') AS x1, cityHash64((1, 2), '') AS x2, cityHash64(1, (2, '')) AS x3, cityHash64((1, 2, '')) AS x4;
 SELECT cityHash64(materialize(1), 2, '') AS x1, cityHash64((materialize(1), 2), '') AS x2, cityHash64(materialize(1), (2, '')) AS x3, cityHash64((materialize(1), 2, '')) AS x4;
 SELECT cityHash64(1, materialize(2), '') AS x1, cityHash64((1, materialize(2)), '') AS x2, cityHash64(1, (materialize(2), '')) AS x3, cityHash64((1, materialize(2), '')) AS x4;
diff --git a/tests/queries/0_stateless/00260_like_and_curly_braces.sql b/tests/queries/0_stateless/00260_like_and_curly_braces.sql
index 2d796b22d03..0064deb22db 100644
--- a/tests/queries/0_stateless/00260_like_and_curly_braces.sql
+++ b/tests/queries/0_stateless/00260_like_and_curly_braces.sql
@@ -1,3 +1,5 @@
+-- Tags: race
+
 SELECT 'a}a' AS x, x LIKE (concat('%', x, '%') AS pat), materialize(x) LIKE pat;
 SELECT 'a}a' AS x, x LIKE (concat('%', x) AS pat), materialize(x) LIKE pat;
 SELECT 'a}a' AS x, x LIKE (concat(x, '%') AS pat), materialize(x) LIKE pat;
diff --git a/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql b/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
index f15e1e5090e..37abdc90c87 100644
--- a/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
+++ b/tests/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT 1 GLOBAL IN (SELECT 1) AS s, s FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00274_shard_group_array.sql b/tests/queries/0_stateless/00274_shard_group_array.sql
index 5257836ae5c..c9618962deb 100644
--- a/tests/queries/0_stateless/00274_shard_group_array.sql
+++ b/tests/queries/0_stateless/00274_shard_group_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT length(groupArray(number)), count() FROM (SELECT number FROM system.numbers_mt LIMIT 1000000);
 SELECT groupArray(dummy), count() FROM remote('127.0.0.{2,3}', system.one);
 
diff --git a/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql b/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
index 16d6307ca4c..607b16b48b1 100644
--- a/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
+++ b/tests/queries/0_stateless/00275_shard_quantiles_weighted.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT quantileExactWeighted(0.5)(number, 1) FROM (SELECT number FROM system.numbers LIMIT 1001);
 SELECT quantilesExactWeighted(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(number, 1) FROM (SELECT number FROM system.numbers LIMIT 1001);
 SELECT quantilesExactWeighted(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(number, number) FROM (SELECT number FROM system.numbers LIMIT 1001);
diff --git a/tests/queries/0_stateless/00286_format_long_negative_float.sql b/tests/queries/0_stateless/00286_format_long_negative_float.sql
index e4d7a7085d2..0a93bab1395 100644
--- a/tests/queries/0_stateless/00286_format_long_negative_float.sql
+++ b/tests/queries/0_stateless/00286_format_long_negative_float.sql
@@ -1 +1,3 @@
+-- Tags: long
+
 select reinterpretAsFloat64(unhex('875635ffffffbfbe'))
diff --git a/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql b/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
index f7fd5fb1458..3b65f46533b 100644
--- a/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
+++ b/tests/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS numbers_10_00290;
 SET max_block_size = 1000;
 CREATE TABLE numbers_10_00290 ENGINE = Log AS SELECT * FROM system.numbers LIMIT 10000;
diff --git a/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql b/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
index a8f51a61c12..150e087e0e4 100644
--- a/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
+++ b/tests/queries/0_stateless/00293_shard_max_subquery_depth.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET max_subquery_depth = 3;
 
 SELECT 1 FROM remote('127.0.0.{1,2}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one) WHERE 1 GLOBAL IN (SELECT 1 FROM remote('127.0.0.{2,3}', system.one))));
diff --git a/tests/queries/0_stateless/00294_shard_enums.sql b/tests/queries/0_stateless/00294_shard_enums.sql
index 9dc12aaadf1..414b9cfad03 100644
--- a/tests/queries/0_stateless/00294_shard_enums.sql
+++ b/tests/queries/0_stateless/00294_shard_enums.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set max_threads = 1;
 drop table if exists enums;
 
diff --git a/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql b/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
index 3fb96dae7c0..06cdb0bd86e 100644
--- a/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
+++ b/tests/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SET output_format_write_statistics = 0;
 SELECT arrayJoin(range(100)) AS x FROM remote('127.0.0.2', system.one) WHERE x GLOBAL IN (SELECT toUInt8(arrayJoin(range(100)) + 50)) GROUP BY x ORDER BY x LIMIT 10 FORMAT JSONCompact;
 SELECT arrayJoin(range(100)) AS x FROM remote('127.0.0.{2,3}', system.one) WHERE x GLOBAL IN (SELECT toUInt8(arrayJoin(range(100)) + 50)) GROUP BY x ORDER BY x LIMIT 10 FORMAT JSONCompact;
diff --git a/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled b/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
index 000e768e943..22043c287d2 100644
--- a/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
+++ b/tests/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
@@ -1,3 +1,5 @@
+-- Tags: disabled, zookeeper, no-parallel
+
 DROP TABLE IF EXISTS r1;
 DROP TABLE IF EXISTS r2;
 
diff --git a/tests/queries/0_stateless/00302_http_compression.sh b/tests/queries/0_stateless/00302_http_compression.sh
index cfa9a930f09..69800d6e0bf 100755
--- a/tests/queries/0_stateless/00302_http_compression.sh
+++ b/tests/queries/0_stateless/00302_http_compression.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00305_http_and_readonly.sh b/tests/queries/0_stateless/00305_http_and_readonly.sh
index dd9f116be7a..c630f8c87ee 100755
--- a/tests/queries/0_stateless/00305_http_and_readonly.sh
+++ b/tests/queries/0_stateless/00305_http_and_readonly.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00311_array_primary_key.sql b/tests/queries/0_stateless/00311_array_primary_key.sql
index 0e066c64f89..f6e21beab9b 100644
--- a/tests/queries/0_stateless/00311_array_primary_key.sql
+++ b/tests/queries/0_stateless/00311_array_primary_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS array_pk;
 CREATE TABLE array_pk (key Array(UInt8), s String, n UInt64, d Date MATERIALIZED '2000-01-01') ENGINE = MergeTree(d, (key, s, n), 1);
 
diff --git a/tests/queries/0_stateless/00324_hashing_enums.sql b/tests/queries/0_stateless/00324_hashing_enums.sql
index 6cb834f29bf..9952f94248e 100644
--- a/tests/queries/0_stateless/00324_hashing_enums.sql
+++ b/tests/queries/0_stateless/00324_hashing_enums.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 SELECT cityHash64(*) FROM (SELECT 1 AS x, CAST(x AS Enum8('Hello' = 0, 'World' = 1)) AS y);
 SELECT cityHash64(*) FROM (SELECT 1 AS x, x AS y);
diff --git a/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled b/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
index 6014cb3bb67..124c9d2e496 100644
--- a/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
+++ b/tests/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
@@ -1,3 +1,5 @@
+-- Tags: disabled
+
 DROP TABLE IF EXISTS replacing;
 CREATE TABLE replacing (d Date, k UInt64, s String, v UInt16) ENGINE = ReplacingMergeTree(d, k, 8192, v);
 
diff --git a/tests/queries/0_stateless/00326_long_function_multi_if.sql b/tests/queries/0_stateless/00326_long_function_multi_if.sql
index 3e460511487..0b941f8176c 100644
--- a/tests/queries/0_stateless/00326_long_function_multi_if.sql
+++ b/tests/queries/0_stateless/00326_long_function_multi_if.sql
@@ -1,3 +1,4 @@
+-- Tags: long
 
 SELECT 'Trivial case';
 
diff --git a/tests/queries/0_stateless/00328_long_case_construction.sql b/tests/queries/0_stateless/00328_long_case_construction.sql
index aa653d667f7..b05e388937a 100644
--- a/tests/queries/0_stateless/00328_long_case_construction.sql
+++ b/tests/queries/0_stateless/00328_long_case_construction.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 /* Trivial case */
 
 SELECT CASE WHEN 1 THEN 2 WHEN 3 THEN  4 ELSE 5 END;
diff --git a/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql b/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
index 17400eb6b7a..1cc0938b1be 100644
--- a/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
+++ b/tests/queries/0_stateless/00332_quantile_timing_memory_leak.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 SELECT quantileTiming(number) FROM (SELECT * FROM system.numbers LIMIT 10000);
 SELECT floor(log2(1 + number) / log2(1.5)) AS k, count() AS c, quantileTiming(number % 10000) AS q FROM (SELECT * FROM system.numbers LIMIT 1000000) GROUP BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00336_shard_stack_trace.reference b/tests/queries/0_stateless/00336_shard_stack_trace.reference
index ca4011b20db..a956634eefc 100644
--- a/tests/queries/0_stateless/00336_shard_stack_trace.reference
+++ b/tests/queries/0_stateless/00336_shard_stack_trace.reference
@@ -2,6 +2,6 @@
 1
 Ok
 1
-2
+3
 Ok
-2
+3
diff --git a/tests/queries/0_stateless/00336_shard_stack_trace.sh b/tests/queries/0_stateless/00336_shard_stack_trace.sh
index 19389ec11c1..732a9a210c4 100755
--- a/tests/queries/0_stateless/00336_shard_stack_trace.sh
+++ b/tests/queries/0_stateless/00336_shard_stack_trace.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00337_shard_any_heavy.sql b/tests/queries/0_stateless/00337_shard_any_heavy.sql
index 508db866f86..ff955ab0dee 100644
--- a/tests/queries/0_stateless/00337_shard_any_heavy.sql
+++ b/tests/queries/0_stateless/00337_shard_any_heavy.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SELECT anyHeavy(x) FROM (SELECT intHash64(number) % 100 < 60 ? 999 : number AS x FROM system.numbers LIMIT 100000);
 SELECT anyHeavy(1) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00338_replicate_array_of_strings.sql b/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
index 9ec8981a573..b49dddcdda0 100644
--- a/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
+++ b/tests/queries/0_stateless/00338_replicate_array_of_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS bad_arrays;
 CREATE TABLE bad_arrays (a Array(String), b Array(UInt8)) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00372_cors_header.reference b/tests/queries/0_stateless/00372_cors_header.reference
index e22493782f0..2f1465d1598 100644
--- a/tests/queries/0_stateless/00372_cors_header.reference
+++ b/tests/queries/0_stateless/00372_cors_header.reference
@@ -1,3 +1,3 @@
 1
+1
 0
-0
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 c9c53dedd69..91ca0d7d869 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
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
index d5a66c11d2d..8a310cb8fc9 100644
--- a/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
+++ b/tests/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_str;
 CREATE TABLE group_uniq_str ENGINE = Memory AS SELECT number % 10 as id, toString(intDiv((number%10000), 10)) as v FROM system.numbers LIMIT 10000000;
 
diff --git a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
index fba4ace65ce..abd0e6e6a45 100644
--- a/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
+++ b/tests/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_arr_int;
 CREATE TABLE group_uniq_arr_int ENGINE = Memory AS
 	SELECT g as id, if(c == 0, [v], if(c == 1, emptyArrayInt64(), [v, v])) as v FROM
diff --git a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
index 41ae2507d20..e9cfff211f8 100644
--- a/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
+++ b/tests/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS group_uniq_arr_str;
 CREATE TABLE group_uniq_arr_str ENGINE = Memory AS
     SELECT hex(intHash32(g)) as id, if(c == 0, [hex(v)], if(c == 1, emptyArrayString(), [hex(v), hex(v)])) as v FROM
diff --git a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
index 2d99202a8ac..3a70b64bc86 100644
--- a/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
+++ b/tests/queries/0_stateless/00378_json_quote_64bit_integers.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 SET extremes = 1;
 
diff --git a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
index d24d029c4e7..62f891db33c 100755
--- a/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
+++ b/tests/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
index a09e9a4adb2..d77955a51bc 100755
--- a/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
+++ b/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -49,8 +51,8 @@ ${CLICKHOUSE_LOCAL} --max_rows_in_distinct=33 -q "SELECT name, value FROM system
 ${CLICKHOUSE_LOCAL} -q "SET max_rows_in_distinct=33; SELECT name, value FROM system.settings WHERE name = 'max_rows_in_distinct'"
 ${CLICKHOUSE_LOCAL} --max_bytes_before_external_group_by=1 --max_block_size=10 -q "SELECT sum(ignore(*)) FROM (SELECT number, count() FROM numbers(1000) GROUP BY number)"
 echo
-# Check exta options
-(${CLICKHOUSE_LOCAL} --ignore-error --echo -q "SELECT nothing_to_do();SELECT 42;" 2>/dev/null && echo "Wrong RC") || true
+# Check exta options, we expect zero exit code and no stderr output
+(${CLICKHOUSE_LOCAL} --ignore-error --echo -q "SELECT nothing_to_do();SELECT 42;" 2>/dev/null || echo "Wrong RC")
 echo
 ${CLICKHOUSE_LOCAL} -q "CREATE TABLE sophisticated_default
 (
diff --git a/tests/queries/0_stateless/00386_long_in_pk.sh b/tests/queries/0_stateless/00386_long_in_pk.sh
index 66cc4ccc227..f619b0b8f2c 100755
--- a/tests/queries/0_stateless/00386_long_in_pk.sh
+++ b/tests/queries/0_stateless/00386_long_in_pk.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00387_use_client_time_zone.sh b/tests/queries/0_stateless/00387_use_client_time_zone.sh
index 201277b76d6..2a6d81eebfe 100755
--- a/tests/queries/0_stateless/00387_use_client_time_zone.sh
+++ b/tests/queries/0_stateless/00387_use_client_time_zone.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00400_client_external_options.sh b/tests/queries/0_stateless/00400_client_external_options.sh
index c2c6f44d62e..0adf622587a 100755
--- a/tests/queries/0_stateless/00400_client_external_options.sh
+++ b/tests/queries/0_stateless/00400_client_external_options.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00409_shard_limit_by.sql b/tests/queries/0_stateless/00409_shard_limit_by.sql
index 97748d3e077..0db29982dd1 100644
--- a/tests/queries/0_stateless/00409_shard_limit_by.sql
+++ b/tests/queries/0_stateless/00409_shard_limit_by.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS limit_by;
 CREATE TABLE limit_by (Num UInt32, Name String) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
index 16245c42a7a..f309f6bab1c 100644
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 -- The results are different than in Python. That's why this file is genearated and the reference is edited instead of using the Python script.
 -- Example: in ClickHouse, 9223372036854775808.0 != 9223372036854775808.
 
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
index c2c5491ed90..03a181d17d7 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
index 539bdd297bd..19addc7e4c7 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
index a0e25e8cb0a..e078572438e 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
index b09a05baf69..7e755b80328 100755
--- a/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
+++ b/tests/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
index 6e9814cbca8..6240450fd63 100755
--- a/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
+++ b/tests/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00417_kill_query.sh b/tests/queries/0_stateless/00417_kill_query.sh
index ce4c5851762..28f03fc9c37 100755
--- a/tests/queries/0_stateless/00417_kill_query.sh
+++ b/tests/queries/0_stateless/00417_kill_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00423_storage_log_single_thread.sql b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
index 8eff9323564..5d359c7f94d 100644
--- a/tests/queries/0_stateless/00423_storage_log_single_thread.sql
+++ b/tests/queries/0_stateless/00423_storage_log_single_thread.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS log;
 CREATE TABLE log (s String) ENGINE = Log;
 
diff --git a/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql b/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
index e1b3cd70842..0211c21a5cd 100644
--- a/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
+++ b/tests/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT avg(arrayJoin([NULL]));
 SELECT avg(arrayJoin([NULL, 1]));
 SELECT avg(arrayJoin([NULL, 1, 2]));
diff --git a/tests/queries/0_stateless/00429_long_http_bufferization.sh b/tests/queries/0_stateless/00429_long_http_bufferization.sh
index 394e8e99052..802bdf40768 100755
--- a/tests/queries/0_stateless/00429_long_http_bufferization.sh
+++ b/tests/queries/0_stateless/00429_long_http_bufferization.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/00429_point_in_ellipses.sql b/tests/queries/0_stateless/00429_point_in_ellipses.sql
index 9ded2e0d440..57c7250590a 100644
--- a/tests/queries/0_stateless/00429_point_in_ellipses.sql
+++ b/tests/queries/0_stateless/00429_point_in_ellipses.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 SELECT pointInEllipses(33.3, 55.3, 33.4, 55.1, 1.0, 1.0) AS distance;
 SELECT pointInEllipses(33.3 + v, 55.3 + v, 33.4, 55.1, 1.0, 1.0) AS distance from
 (
diff --git a/tests/queries/0_stateless/00436_convert_charset.sql b/tests/queries/0_stateless/00436_convert_charset.sql
index 1b7baf22450..8ac9193c458 100644
--- a/tests/queries/0_stateless/00436_convert_charset.sql
+++ b/tests/queries/0_stateless/00436_convert_charset.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT
     'абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ' AS orig,
     hex(convertCharset(orig, 'utf-8', 'cp1251') AS cp1251) AS cp1251_hex,
diff --git a/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh b/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh
index 724630057d9..399a4677a44 100755
--- a/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh
+++ b/tests/queries/0_stateless/00443_preferred_block_size_bytes.sh
@@ -42,10 +42,10 @@ popd > /dev/null
 #SCRIPTDIR=`dirname "$SCRIPTPATH"`
 SCRIPTDIR=$SCRIPTPATH
 
-cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=10 -n > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout 2>&1
+cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=10 -n > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
 cmp "$SCRIPTDIR"/00282_merging.reference "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout && echo PASSED || echo FAILED
 
-cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=20 -n > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout 2>&1
+cat "$SCRIPTDIR"/00282_merging.sql | $CLICKHOUSE_CLIENT --preferred_block_size_bytes=20 -n > "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
 cmp "$SCRIPTDIR"/00282_merging.reference "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout && echo PASSED || echo FAILED
 
 rm "${CLICKHOUSE_TMP}"/preferred_block_size_bytes.stdout
diff --git a/tests/queries/0_stateless/00445_join_nullable_keys.reference b/tests/queries/0_stateless/00445_join_nullable_keys.reference
index f7675766dc9..afc8003910c 100644
--- a/tests/queries/0_stateless/00445_join_nullable_keys.reference
+++ b/tests/queries/0_stateless/00445_join_nullable_keys.reference
@@ -22,3 +22,13 @@
 13		13
 14		14
 \N		8
+0	0
+0	2
+0	4
+0	6
+0	8
+1	1
+3	3
+5	5
+7	7
+9	9
diff --git a/tests/queries/0_stateless/00445_join_nullable_keys.sql b/tests/queries/0_stateless/00445_join_nullable_keys.sql
index 2b8f2ca5f44..a0453356e98 100644
--- a/tests/queries/0_stateless/00445_join_nullable_keys.sql
+++ b/tests/queries/0_stateless/00445_join_nullable_keys.sql
@@ -30,3 +30,13 @@ ANY RIGHT JOIN
 (
     SELECT nullIf(number, 8) AS k, toString(number) AS b FROM system.numbers LIMIT 5, 10
 ) js2 USING (k) ORDER BY k;
+
+SELECT k, b
+FROM
+(
+    SELECT number + 1 AS k FROM numbers(10)
+) js1
+RIGHT JOIN
+(
+    SELECT nullIf(number, if(number % 2 == 0, number, 0)) AS k, number AS b FROM numbers(10)
+) js2 USING (k) ORDER BY k, b;
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
index 5c5ecd4564b..a441c9a6761 100755
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.reference b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.reference
rename to tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
similarity index 90%
rename from tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql
rename to tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
index 5d8c4de1c06..c820cce11af 100644
--- a/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SELECT '===Ordinary case===';
 
 SET replication_alter_partitions_sync = 2;
@@ -24,8 +26,8 @@ SELECT '===Replicated case===';
 DROP TABLE IF EXISTS clear_column1;
 DROP TABLE IF EXISTS clear_column2;
 SELECT sleep(1) FORMAT Null;
-CREATE TABLE clear_column1 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column', '1') ORDER BY d PARTITION by toYYYYMM(d) SETTINGS min_bytes_for_wide_part = 0;
-CREATE TABLE clear_column2 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/test_00446/tables/clear_column', '2') ORDER BY d PARTITION by toYYYYMM(d) SETTINGS min_bytes_for_wide_part = 0;
+CREATE TABLE clear_column1 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_00446/tables/clear_column', '1') ORDER BY d PARTITION by toYYYYMM(d) SETTINGS min_bytes_for_wide_part = 0;
+CREATE TABLE clear_column2 (d Date, i Int64) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_00446/tables/clear_column', '2') ORDER BY d PARTITION by toYYYYMM(d) SETTINGS min_bytes_for_wide_part = 0;
 
 INSERT INTO clear_column1 (d) VALUES ('2000-01-01'), ('2000-02-01');
 SYSTEM SYNC REPLICA clear_column2;
diff --git a/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql b/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
index 04bddd71972..082ba1bf178 100644
--- a/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
+++ b/tests/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SELECT x, arrayJoin(x) FROM (SELECT materialize([1, NULL, 2]) AS x);
 SELECT x, arrayJoin(x) FROM (SELECT materialize([(1, 2), (3, 4), (5, 6)]) AS x);
 SELECT x, arrayJoin(x) FROM (SELECT materialize(arrayMap(x -> toFixedString(x, 5), ['Hello', 'world'])) AS x);
diff --git a/tests/queries/0_stateless/00462_json_true_false_literals.sql b/tests/queries/0_stateless/00462_json_true_false_literals.sql
index 740683ad3ce..2c45229fce6 100644
--- a/tests/queries/0_stateless/00462_json_true_false_literals.sql
+++ b/tests/queries/0_stateless/00462_json_true_false_literals.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json;
 CREATE TABLE json (x UInt8, title String) ENGINE = Memory;
 INSERT INTO json FORMAT JSONEachRow {"x": true, "title": "true"}, {"x": false, "title": "false"}, {"x": 0, "title": "0"}, {"x": 1, "title": "1"};
diff --git a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
index d3bdf32db74..e9f486fbb73 100755
--- a/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+++ b/tests/queries/0_stateless/00463_long_sessions_in_http_interface.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh b/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
index 47f5c698d17..c2980810ac5 100755
--- a/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
+++ b/tests/queries/0_stateless/00473_output_format_json_quote_denormals.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql b/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
index 4227190edf4..aac30d45d41 100644
--- a/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
+++ b/tests/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT visitParamExtractString('{"x":"\\uD800\\udf38"}', 'x') AS x, visitParamExtractString('{"x":"Hello \\u2028 World \\u2029 !"}', 'x') AS y FORMAT JSONEachRow;
 SELECT 'Hello' || convertCharset(unhex('2028'), 'utf16be', 'utf8') || 'World' || convertCharset(unhex('2029'), 'utf16be', 'utf8') || '!' AS x, hex(x) AS h FORMAT JSONEachRow;
 SELECT 'Hello' || convertCharset(unhex('2028'), 'utf16be', 'utf8') || 'World' || convertCharset(unhex('2029'), 'utf16be', 'utf8') || '!' AS x, hex(x) AS h FORMAT TSV;
diff --git a/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql b/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
index 0b1c19996bf..117ca802596 100644
--- a/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
+++ b/tests/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT dummy FROM (SELECT dummy, NOT dummy AS x FROM remote('127.0.0.{2,3}', system.one) GROUP BY dummy HAVING x);
diff --git a/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql b/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
index 089be0a3715..4a1ee2d79a2 100644
--- a/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
+++ b/tests/queries/0_stateless/00494_shard_alias_substitution_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested (n Nested(x UInt8)) ENGINE = Memory;
 INSERT INTO nested VALUES ([1, 2]);
diff --git a/tests/queries/0_stateless/00499_json_enum_insert.sql b/tests/queries/0_stateless/00499_json_enum_insert.sql
index d085177a8e3..c4988d08243 100644
--- a/tests/queries/0_stateless/00499_json_enum_insert.sql
+++ b/tests/queries/0_stateless/00499_json_enum_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json;
 CREATE TABLE json (x Enum8('browser' = 1, 'mobile' = 2), y String) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.reference b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.reference
rename to tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
similarity index 83%
rename from tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql
rename to tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
index a2a771e6cc0..8267a451728 100644
--- a/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
@@ -1,11 +1,13 @@
+-- Tags: long, replica
+
 SET replication_alter_partitions_sync = 2;
 
 SELECT '*** Not partitioned ***';
 
 DROP TABLE IF EXISTS not_partitioned_replica1_00502;
 DROP TABLE IF EXISTS not_partitioned_replica2_00502;
-CREATE TABLE not_partitioned_replica1_00502(x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/not_partitioned_00502', '1') ORDER BY x;
-CREATE TABLE not_partitioned_replica2_00502(x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/not_partitioned_00502', '2') ORDER BY x;
+CREATE TABLE not_partitioned_replica1_00502(x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/not_partitioned_00502', '1') ORDER BY x;
+CREATE TABLE not_partitioned_replica2_00502(x UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/not_partitioned_00502', '2') ORDER BY x;
 
 INSERT INTO not_partitioned_replica1_00502 VALUES (1), (2), (3);
 INSERT INTO not_partitioned_replica1_00502 VALUES (4), (5);
@@ -30,8 +32,8 @@ SELECT '*** Partitioned by week ***';
 
 DROP TABLE IF EXISTS partitioned_by_week_replica1;
 DROP TABLE IF EXISTS partitioned_by_week_replica2;
-CREATE TABLE partitioned_by_week_replica1(d Date, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/partitioned_by_week_00502', '1') PARTITION BY toMonday(d) ORDER BY x;
-CREATE TABLE partitioned_by_week_replica2(d Date, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/partitioned_by_week_00502', '2') PARTITION BY toMonday(d) ORDER BY x;
+CREATE TABLE partitioned_by_week_replica1(d Date, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test/partitioned_by_week_00502', '1') PARTITION BY toMonday(d) ORDER BY x;
+CREATE TABLE partitioned_by_week_replica2(d Date, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test/partitioned_by_week_00502', '2') PARTITION BY toMonday(d) ORDER BY x;
 
 -- 2000-01-03 belongs to a different week than 2000-01-01 and 2000-01-02
 INSERT INTO partitioned_by_week_replica1 VALUES ('2000-01-01', 1), ('2000-01-02', 2), ('2000-01-03', 3);
@@ -57,8 +59,8 @@ SELECT '*** Partitioned by a (Date, UInt8) tuple ***';
 
 DROP TABLE IF EXISTS partitioned_by_tuple_replica1_00502;
 DROP TABLE IF EXISTS partitioned_by_tuple_replica2_00502;
-CREATE TABLE partitioned_by_tuple_replica1_00502(d Date, x UInt8, y UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/partitioned_by_tuple_00502', '1') ORDER BY x PARTITION BY (d, x);
-CREATE TABLE partitioned_by_tuple_replica2_00502(d Date, x UInt8, y UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/partitioned_by_tuple_00502', '2') ORDER BY x PARTITION BY (d, x);
+CREATE TABLE partitioned_by_tuple_replica1_00502(d Date, x UInt8, y UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/partitioned_by_tuple_00502', '1') ORDER BY x PARTITION BY (d, x);
+CREATE TABLE partitioned_by_tuple_replica2_00502(d Date, x UInt8, y UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/partitioned_by_tuple_00502', '2') ORDER BY x PARTITION BY (d, x);
 
 INSERT INTO partitioned_by_tuple_replica1_00502 VALUES ('2000-01-01', 1, 1), ('2000-01-01', 2, 2), ('2000-01-02', 1, 3);
 INSERT INTO partitioned_by_tuple_replica1_00502 VALUES ('2000-01-02', 1, 4), ('2000-01-01', 1, 5);
@@ -84,8 +86,8 @@ SELECT '*** Partitioned by String ***';
 
 DROP TABLE IF EXISTS partitioned_by_string_replica1;
 DROP TABLE IF EXISTS partitioned_by_string_replica2;
-CREATE TABLE partitioned_by_string_replica1(s String, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/partitioned_by_string_00502', '1') PARTITION BY s ORDER BY x;
-CREATE TABLE partitioned_by_string_replica2(s String, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/partitioned_by_string_00502', '2') PARTITION BY s ORDER BY x;
+CREATE TABLE partitioned_by_string_replica1(s String, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test/partitioned_by_string_00502', '1') PARTITION BY s ORDER BY x;
+CREATE TABLE partitioned_by_string_replica2(s String, x UInt8) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test/partitioned_by_string_00502', '2') PARTITION BY s ORDER BY x;
 
 INSERT INTO partitioned_by_string_replica1 VALUES ('aaa', 1), ('aaa', 2), ('bbb', 3);
 INSERT INTO partitioned_by_string_replica1 VALUES ('bbb', 4), ('aaa', 5);
@@ -110,8 +112,8 @@ SELECT '*** Table without columns with fixed size ***';
 
 DROP TABLE IF EXISTS without_fixed_size_columns_replica1;
 DROP TABLE IF EXISTS without_fixed_size_columns_replica2;
-CREATE TABLE without_fixed_size_columns_replica1(s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/without_fixed_size_columns_00502', '1') PARTITION BY length(s) ORDER BY s;
-CREATE TABLE without_fixed_size_columns_replica2(s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/test/without_fixed_size_columns_00502', '2') PARTITION BY length(s) ORDER BY s;
+CREATE TABLE without_fixed_size_columns_replica1(s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test/without_fixed_size_columns_00502', '1') PARTITION BY length(s) ORDER BY s;
+CREATE TABLE without_fixed_size_columns_replica2(s String) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test/without_fixed_size_columns_00502', '2') PARTITION BY length(s) ORDER BY s;
 
 INSERT INTO without_fixed_size_columns_replica1 VALUES ('a'), ('aa'), ('b'), ('cc');
 
diff --git a/tests/queries/0_stateless/00502_sum_map.reference b/tests/queries/0_stateless/00502_sum_map.reference
index c38fb2ec7d6..efd5a5534d4 100644
--- a/tests/queries/0_stateless/00502_sum_map.reference
+++ b/tests/queries/0_stateless/00502_sum_map.reference
@@ -22,5 +22,5 @@
 ([1.01],[1])
 (['a','b'],[1,2])
 (['a','ab','abc'],[3,2,1])
-([1,2,3,4,5,6,7,8],[1.00000,2.00000,6.00000,8.00000,10.00000,12.00000,7.00000,8.00000])
-([1,2,3,4,5,6,7,8],[1.00000,2.00000,6.00000,8.00000,10.00000,12.00000,7.00000,8.00000])
+([1,2,3,4,5,6,7,8],[1,2,6,8,10,12,7,8])
+([1,2,3,4,5,6,7,8],[1,2,6,8,10,12,7,8])
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index c1113af761b..4b425f1bc71 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00505_shard_secure.sh b/tests/queries/0_stateless/00505_shard_secure.sh
index 526176f8c39..4676f99c02c 100755
--- a/tests/queries/0_stateless/00505_shard_secure.sh
+++ b/tests/queries/0_stateless/00505_shard_secure.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard, no-unbundled, no-parallel, no-fasttest
 
 # set -x
 
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 4cbeb074bb5..b3009add7e5 100644
--- a/tests/queries/0_stateless/00506_shard_global_in_union.sql
+++ b/tests/queries/0_stateless/00506_shard_global_in_union.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT X FROM (SELECT * FROM (SELECT 1 AS X, 2 AS Y) UNION ALL SELECT 3, 4) ORDER BY X;
 
 DROP TABLE IF EXISTS globalin;
diff --git a/tests/queries/0_stateless/00506_union_distributed.sql b/tests/queries/0_stateless/00506_union_distributed.sql
index 4c5fd9a1743..08282d94d8b 100644
--- a/tests/queries/0_stateless/00506_union_distributed.sql
+++ b/tests/queries/0_stateless/00506_union_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- https://github.com/ClickHouse/ClickHouse/issues/1059
 
 SET insert_distributed_sync = 1;
diff --git a/tests/queries/0_stateless/00508_materialized_view_to.sql b/tests/queries/0_stateless/00508_materialized_view_to.sql
index d330faf4fb7..522ceb40404 100644
--- a/tests/queries/0_stateless/00508_materialized_view_to.sql
+++ b/tests/queries/0_stateless/00508_materialized_view_to.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_00508;
 CREATE DATABASE test_00508;
 
diff --git a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
index ef8655a1861..b24fb090688 100644
--- a/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-parallel
+-- Tag no-parallel: leftovers
+
 SET optimize_on_insert = 0;
 
 SELECT '*** Replicated with sampling ***';
@@ -5,7 +8,7 @@ SELECT '*** Replicated with sampling ***';
 DROP TABLE IF EXISTS replicated_with_sampling;
 
 CREATE TABLE replicated_with_sampling(x UInt8)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00509/replicated_with_sampling', 'r1')
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00509/replicated_with_sampling', 'r1')
     ORDER BY x
     SAMPLE BY x;
 
@@ -72,7 +75,7 @@ SELECT '*** Table definition with SETTINGS ***';
 DROP TABLE IF EXISTS with_settings;
 
 CREATE TABLE with_settings(x UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00509/with_settings', 'r1')
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00509/with_settings', 'r1')
     ORDER BY x
     SETTINGS replicated_can_become_leader = 0;
 
diff --git a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
index 8df012a8588..a702da66eaf 100644
--- a/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
+++ b/tests/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
@@ -1,12 +1,15 @@
+-- Tags: zookeeper, no-ordinary-database, no-parallel
+-- Tag no-parallel: static UUID
+
 DROP TABLE IF EXISTS with_deduplication;
 DROP TABLE IF EXISTS without_deduplication;
 DROP TABLE IF EXISTS with_deduplication_mv;
 DROP TABLE IF EXISTS without_deduplication_mv;
 
 CREATE TABLE with_deduplication(x UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00510/with_deduplication', 'r1') ORDER BY x;
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00510/with_deduplication', 'r1') ORDER BY x;
 CREATE TABLE without_deduplication(x UInt32)
-    ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00510/without_deduplication', 'r1') ORDER BY x SETTINGS replicated_deduplication_window = 0;
+    ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00510/without_deduplication', 'r1') ORDER BY x SETTINGS replicated_deduplication_window = 0;
 
 CREATE MATERIALIZED VIEW with_deduplication_mv UUID '00000510-1000-4000-8000-000000000001'
     ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/tables/test_00510/with_deduplication_mv', 'r1') ORDER BY dummy
diff --git a/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql b/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
index 534b13e14d0..64ceb394b17 100644
--- a/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
+++ b/tests/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists tab;
 create table tab (date Date, val UInt64, val2 UInt8 default 42, val3 UInt8 default val2 + 1, val4 UInt64 alias val) engine = MergeTree(date, (date, val), 8192);
 desc tab;
diff --git a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
index 2a9ebb992a8..6c76adb86d0 100644
--- a/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
@@ -1,6 +1,9 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS deduplication_by_partition;
 CREATE TABLE deduplication_by_partition(d Date, x UInt32) ENGINE =
-    ReplicatedMergeTree('/clickhouse/tables/test_00516/deduplication_by_partition', 'r1', d, x, 8192);
+    ReplicatedMergeTree('/clickhouse/tables/{database}/test_00516/deduplication_by_partition', 'r1', d, x, 8192);
 
 INSERT INTO deduplication_by_partition VALUES ('2000-01-01', 1);
 INSERT INTO deduplication_by_partition VALUES ('2000-01-01', 2), ('2000-01-01', 3);
diff --git a/tests/queries/0_stateless/00531_client_ignore_error.sh b/tests/queries/0_stateless/00531_client_ignore_error.sh
index daf636b0765..d3215e1beac 100755
--- a/tests/queries/0_stateless/00531_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00531_client_ignore_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00534_client_ignore_error.sh b/tests/queries/0_stateless/00534_client_ignore_error.sh
index daf636b0765..d3215e1beac 100755
--- a/tests/queries/0_stateless/00534_client_ignore_error.sh
+++ b/tests/queries/0_stateless/00534_client_ignore_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00534_filimonov.data b/tests/queries/0_stateless/00534_filimonov.data
index ee4d2caa029..827b3ee4fbc 100644
--- a/tests/queries/0_stateless/00534_filimonov.data
+++ b/tests/queries/0_stateless/00534_filimonov.data
@@ -296,8 +296,10 @@ SELECT runningDifference(CAST(NULL AS Nullable(Float64)));
 SELECT runningDifference(CAST(NULL AS Nullable(Date)));
 SELECT runningDifference(CAST(NULL AS Nullable(DateTime)));
 SELECT bitmaskToList(NULL);
+SELECT MD4(NULL);
 SELECT MD5(NULL);
 SELECT SHA256(NULL);
+SELECT SHA384(NULL);
 SELECT asin(NULL);
 SELECT SHA1(NULL);
 SELECT sipHash128(NULL);
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments1.sh b/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
index 2979e18e2a5..d908f1eae7d 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments1.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
index 178c9dd8d94..68cdfd6ce24 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments10.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-parallel
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments11.sh b/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
index 3004c6c84ff..da5ac2768f1 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments11.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments12.sh b/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
index 8e5bd15dc80..ee0acd22dc9 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments12.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments13.sh b/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
index 37f4282ae79..4e0b5bd3012 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments13.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments2.sh b/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
index 9c8eda6fbcb..c60595622cc 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments2.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments3.sh b/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
index 640467e9d00..6a6cb87ab66 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments3.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
index b0381295b39..f484221e151 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments4_long.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: long, no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
index 3e1d4be7af5..5073a6236a3 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments5.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments6.sh b/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
index 53dff77a390..c3fa56a2ee0 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments6.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
index 3625b65c381..6b28630bde1 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments7.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments8.sh b/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
index 35cb25e6f8e..8a192a57635 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments8.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00534_functions_bad_arguments9.sh b/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
index 1756e968271..62360c53a7d 100755
--- a/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
+++ b/tests/queries/0_stateless/00534_functions_bad_arguments9.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-tsan
+# Tag no-tsan: Too long for TSan
+
 # shellcheck disable=SC2016
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
index 31853e92262..38b217308d4 100644
--- a/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
+++ b/tests/queries/0_stateless/00539_functions_for_working_with_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 -- VisitParam with basic type
 SELECT visitParamExtractInt('{"myparam":-1}', 'myparam');
 SELECT visitParamExtractUInt('{"myparam":-1}', 'myparam');
diff --git a/tests/queries/0_stateless/00545_weird_aggregate_functions.sql b/tests/queries/0_stateless/00545_weird_aggregate_functions.sql
index 1f662850d05..c728dfcc534 100644
--- a/tests/queries/0_stateless/00545_weird_aggregate_functions.sql
+++ b/tests/queries/0_stateless/00545_weird_aggregate_functions.sql
@@ -1 +1 @@
-SELECT sumForEachMergeArray(y) FROM (SELECT sumForEachStateForEachIfArrayIfMerge(x) AS y FROM (SELECT sumForEachStateForEachIfArrayIfState([[[1, 2, 3], [4, 5, 6], [7, 8, 9]]], [1], 1) AS x));
+SELECT sumForEachMergeArray(y) FROM (SELECT sumForEachStateForEachIfArrayMerge(x) AS y FROM (SELECT sumForEachStateForEachIfArrayState([[[1, 2, 3], [4, 5, 6], [7, 8, 9]]], [1]) AS x));
diff --git a/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql b/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
index 5157eb7e813..f3dbdf8edcc 100644
--- a/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
+++ b/tests/queries/0_stateless/00546_shard_tuple_element_formatting.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT tupleElement((1, 2), toUInt8(1 + 0)) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00552_or_nullable.sql b/tests/queries/0_stateless/00552_or_nullable.sql
index ebec2db842d..5639a7f65cc 100644
--- a/tests/queries/0_stateless/00552_or_nullable.sql
+++ b/tests/queries/0_stateless/00552_or_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT
     0 OR NULL,
     1 OR NULL,
diff --git a/tests/queries/0_stateless/00561_storage_join.sql b/tests/queries/0_stateless/00561_storage_join.sql
index 01e66d0c380..ad4fab09c20 100644
--- a/tests/queries/0_stateless/00561_storage_join.sql
+++ b/tests/queries/0_stateless/00561_storage_join.sql
@@ -25,24 +25,17 @@ insert into joinbug_join (id, id2, val, val2, created)
 select id, id2, val, val2, created
 from joinbug;
 
-/* expected */
-select *
-from joinbug;
+select * from joinbug;
 
-/* wtf */
 select id, id2, val, val2, created
-from (
-   SELECT toUInt64(arrayJoin(range(50))) AS id2
-) js1
+from ( SELECT toUInt64(arrayJoin(range(50))) AS id2 ) js1
 SEMI LEFT JOIN joinbug_join using id2;
 
-/* type conversion */
-SELECT * FROM
-(
-    SELECT toUInt32(11) AS id2
-) AS js1
-SEMI LEFT JOIN joinbug_join USING (id2);
+-- type conversion
+SELECT * FROM ( SELECT toUInt32(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2);
 
+-- can't convert right side in case on storage join
+SELECT * FROM ( SELECT toInt64(11) AS id2 ) AS js1 SEMI LEFT JOIN joinbug_join USING (id2); -- { serverError 53 }
 
 DROP TABLE joinbug;
 DROP TABLE joinbug_join;
diff --git a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.reference b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.reference
rename to tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
similarity index 88%
rename from tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
rename to tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
index 9c00ee68ba9..fd8a37a15f9 100644
--- a/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
+++ b/tests/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
@@ -1,6 +1,8 @@
+-- Tags: long, zookeeper
+
 -- Check that settings are correctly passed through Distributed table
 DROP TABLE IF EXISTS simple;
-CREATE TABLE simple (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/test_00563/tables/simple', '1') ORDER BY d;
+CREATE TABLE simple (d Int8) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_00563/tables/simple', '1') ORDER BY d;
 
 -- TODO: replace '127.0.0.2' -> '127.0.0.1' after a fix
 INSERT INTO TABLE FUNCTION remote('127.0.0.2', currentDatabase(), 'simple') VALUES (1);
diff --git a/tests/queries/0_stateless/00563_shard_insert_into_remote.sql b/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
index 274dfffa8d6..abc9658fc94 100644
--- a/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
+++ b/tests/queries/0_stateless/00563_shard_insert_into_remote.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists tab;
 create table tab (val UInt8) engine = MergeTree order by val;
 insert into function remote('127.0.0.2', currentDatabase(), tab) values (1);
diff --git a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
index 634b9781c7a..66bbb02183c 100644
--- a/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
+++ b/tests/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set optimize_on_insert = 0;
 
 drop table if exists mult_tab;
diff --git a/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql b/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
index 1ad261de35c..c384ef37fc7 100644
--- a/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
+++ b/tests/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE test_00571;
 
 USE test_00571;
diff --git a/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql b/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
index b7a56676a33..adb569897dc 100644
--- a/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
+++ b/tests/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TEMPORARY TABLE t_00573 (x UInt8);
 
 SET empty_result_for_aggregation_by_empty_set = 0;
diff --git a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
index 94a9d331b6a..42bf37cbda5 100755
--- a/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
+++ b/tests/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00580_consistent_hashing_functions.sql b/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
index 20d1892f192..08e785929c7 100644
--- a/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
+++ b/tests/queries/0_stateless/00580_consistent_hashing_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT jumpConsistentHash(1, 1), jumpConsistentHash(42, 57), jumpConsistentHash(256, 1024), jumpConsistentHash(3735883980, 1), jumpConsistentHash(3735883980, 666), jumpConsistentHash(16045690984833335023, 255);
 SELECT yandexConsistentHash(16045690984833335023, 1), yandexConsistentHash(16045690984833335023, 2), yandexConsistentHash(16045690984833335023, 3), yandexConsistentHash(16045690984833335023, 4), yandexConsistentHash(16045690984833335023, 173), yandexConsistentHash(16045690984833335023, 255);
 SELECT jumpConsistentHash(intHash64(number), 787) FROM system.numbers LIMIT 1000000, 2;
diff --git a/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql b/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
index fdb84ccf00e..b3738fd5a9a 100644
--- a/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
+++ b/tests/queries/0_stateless/00588_shard_distributed_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS mergetree_00588;
 DROP TABLE IF EXISTS distributed_00588;
 
diff --git a/tests/queries/0_stateless/00594_alias_in_distributed.sql b/tests/queries/0_stateless/00594_alias_in_distributed.sql
index 27815f2569b..b75dfdf7967 100644
--- a/tests/queries/0_stateless/00594_alias_in_distributed.sql
+++ b/tests/queries/0_stateless/00594_alias_in_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS alias_local10;
 DROP TABLE IF EXISTS alias10;
 
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.reference b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
index 3eaa1139c5d..f6f1320c2f8 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
@@ -114,7 +114,7 @@ FROM
 (
     SELECT
         1 AS id,
-        identity(CAST(1, \'Nullable(UInt8)\')) AS subquery
+        identity(_CAST(1, \'Nullable(UInt8)\')) AS subquery
     WHERE subquery = 1
 )
 WHERE subquery = 1
diff --git a/tests/queries/0_stateless/00597_push_down_predicate_long.sql b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
index 2e3357241ad..40ea8b48caa 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.sql
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET send_logs_level = 'fatal';
 SET any_join_distinct_right_table_keys = 1;
 SET joined_subquery_requires_alias = 0;
diff --git a/tests/queries/0_stateless/00599_create_view_with_subquery.sql b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
index 9fcc993886b..6d086ed07f5 100644
--- a/tests/queries/0_stateless/00599_create_view_with_subquery.sql
+++ b/tests/queries/0_stateless/00599_create_view_with_subquery.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_00599;
 DROP TABLE IF EXISTS test_view_00599;
 
diff --git a/tests/queries/0_stateless/00600_replace_running_query.sh b/tests/queries/0_stateless/00600_replace_running_query.sh
index 78ea4daf6bb..89c9d1c4279 100755
--- a/tests/queries/0_stateless/00600_replace_running_query.sh
+++ b/tests/queries/0_stateless/00600_replace_running_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/00602_throw_if.sh b/tests/queries/0_stateless/00602_throw_if.sh
index fe8feab0303..1e8850028c4 100755
--- a/tests/queries/0_stateless/00602_throw_if.sh
+++ b/tests/queries/0_stateless/00602_throw_if.sh
@@ -8,5 +8,5 @@ default_exception_message="Value passed to 'throwIf' function is non zero"
 custom_exception_message="Number equals 1000000"
 
 ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000) FROM system.numbers" 2>&1 | grep -cF "$default_exception_message"
-${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -cF "$custom_exception_message"
+${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT throwIf(number = 1000000, '$custom_exception_message') FROM system.numbers" 2>&1 | grep -v '^(query: ' | grep -cF "$custom_exception_message"
 ${CLICKHOUSE_CLIENT} --server_logs_file /dev/null --query="SELECT sum(x = 0) FROM (SELECT throwIf(number = 1000000) AS x FROM numbers(1000000))" 2>&1
diff --git a/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql b/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
index afc5b68bd94..304131d4069 100644
--- a/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
+++ b/tests/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/00604_show_create_database.sql b/tests/queries/0_stateless/00604_show_create_database.sql
index 4f0e8c9f49d..c990e7abed3 100644
--- a/tests/queries/0_stateless/00604_show_create_database.sql
+++ b/tests/queries/0_stateless/00604_show_create_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 create database if not exists test_00604;
 show create database test_00604;
 drop database test_00604;
diff --git a/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql b/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
index ebcfeaaaf8a..26098201081 100644
--- a/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
+++ b/tests/queries/0_stateless/00609_distributed_with_case_when_then.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS mergetree_00609;
 DROP TABLE IF EXISTS distributed_00609;
 
diff --git a/tests/queries/0_stateless/00609_mv_index_in_in.sql b/tests/queries/0_stateless/00609_mv_index_in_in.sql
index 28085194327..002c94dd576 100644
--- a/tests/queries/0_stateless/00609_mv_index_in_in.sql
+++ b/tests/queries/0_stateless/00609_mv_index_in_in.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database
+
 DROP TABLE IF EXISTS test_00609;
 DROP TABLE IF EXISTS test_mv_00609;
 
diff --git a/tests/queries/0_stateless/00612_http_max_query_size.sh b/tests/queries/0_stateless/00612_http_max_query_size.sh
index 0a37d7ec766..cfcae330b85 100755
--- a/tests/queries/0_stateless/00612_http_max_query_size.sh
+++ b/tests/queries/0_stateless/00612_http_max_query_size.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 # shellcheck disable=SC2028
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00612_shard_count.sql b/tests/queries/0_stateless/00612_shard_count.sql
index 2a69e9ed9c8..ee73caf7fc1 100644
--- a/tests/queries/0_stateless/00612_shard_count.sql
+++ b/tests/queries/0_stateless/00612_shard_count.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS count;
 
 CREATE TABLE count (x UInt64) ENGINE = MergeTree ORDER BY tuple();
diff --git a/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql b/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
index dcd227bd2cf..de3000533a1 100644
--- a/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
+++ b/tests/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_execution_time = 1, timeout_overflow_mode = 'break';
 SELECT DISTINCT * FROM remote('127.0.0.{2,3}', system.numbers) WHERE number < 10;
diff --git a/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql b/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
index 6bcb15dfbe0..5d373927714 100644
--- a/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
+++ b/tests/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists tab;
 create table tab (date Date,  time DateTime, data String) ENGINE = MergeTree(date, (time, data), 8192);
 insert into tab values ('2018-01-21','2018-01-21 15:12:13','test');
diff --git a/tests/queries/0_stateless/00619_union_highlite.sql b/tests/queries/0_stateless/00619_union_highlite.sql
index 9a41a132661..4f9ed7c60c9 100644
--- a/tests/queries/0_stateless/00619_union_highlite.sql
+++ b/tests/queries/0_stateless/00619_union_highlite.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS union;
 
 create view union as select 1 as test union all select 2;
diff --git a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
index 715129cc699..c8c181fac62 100644
--- a/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
+++ b/tests/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
@@ -1,3 +1,6 @@
+-- Tags: replica, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 -- The test is mostly outdated as now every replica is leader and can do OPTIMIZE locally.
 
 DROP TABLE IF EXISTS rename1;
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.reference b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.reference
rename to tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
similarity index 76%
rename from tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
rename to tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
index 0f6d51b8716..fab8691556b 100644
--- a/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
+++ b/tests/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
@@ -1,8 +1,11 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_truncate1;
 DROP TABLE IF EXISTS replicated_truncate2;
 
-CREATE TABLE replicated_truncate1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00623/truncate', 'r1', d, k, 8192);
-CREATE TABLE replicated_truncate2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00623/truncate', 'r2', d, k, 8192);
+CREATE TABLE replicated_truncate1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00623/truncate', 'r1', d, k, 8192);
+CREATE TABLE replicated_truncate2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00623/truncate', 'r2', d, k, 8192);
 
 SELECT '======Before Truncate======';
 INSERT INTO replicated_truncate1 VALUES ('2015-01-01', 10, 42);
diff --git a/tests/queries/0_stateless/00623_truncate_table.sql b/tests/queries/0_stateless/00623_truncate_table.sql
index 97f85f920af..80369ff2bbc 100644
--- a/tests/queries/0_stateless/00623_truncate_table.sql
+++ b/tests/queries/0_stateless/00623_truncate_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS truncate_test;
 DROP TABLE IF EXISTS truncate_test_log;
 DROP TABLE IF EXISTS truncate_test_memory;
diff --git a/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh b/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
index 59092ff28f2..7a5886795f9 100755
--- a/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
+++ b/tests/queries/0_stateless/00623_truncate_table_throw_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00625_arrays_in_nested.sql b/tests/queries/0_stateless/00625_arrays_in_nested.sql
index 3b418731c8f..78819ac683f 100644
--- a/tests/queries/0_stateless/00625_arrays_in_nested.sql
+++ b/tests/queries/0_stateless/00625_arrays_in_nested.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS nested;
 CREATE TABLE nested
 (
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table.sql b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
index 7224224334e..958d2184c46 100644
--- a/tests/queries/0_stateless/00626_replace_partition_from_table.sql
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS dst;
 
diff --git a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
index 443f2856c88..d78f93d6bb3 100755
--- a/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 # Because REPLACE PARTITION does not forces immediate removal of replaced data parts from local filesystem
 # (it tries to do it as quick as possible, but it still performed in separate thread asynchronously)
diff --git a/tests/queries/0_stateless/00632_aggregation_window_funnel.reference b/tests/queries/0_stateless/00632_aggregation_window_funnel.reference
index 2c68f277bfa..d586e5a4b67 100644
--- a/tests/queries/0_stateless/00632_aggregation_window_funnel.reference
+++ b/tests/queries/0_stateless/00632_aggregation_window_funnel.reference
@@ -37,6 +37,7 @@
 [5, 2]
 [6, 1]
 [7, 1]
+[1]
 [1, 2]
 [2, 2]
 [3, 0]
diff --git a/tests/queries/0_stateless/00632_aggregation_window_funnel.sql b/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
index aa0dc804238..e548aa4d81d 100644
--- a/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
+++ b/tests/queries/0_stateless/00632_aggregation_window_funnel.sql
@@ -43,7 +43,7 @@ drop table if exists funnel_test_strict;
 create table funnel_test_strict (timestamp UInt32, event UInt32) engine=Memory;
 insert into funnel_test_strict values (00,1000),(10,1001),(20,1002),(30,1003),(40,1004),(50,1005),(51,1005),(60,1006),(70,1007),(80,1008);
 
-select 6 = windowFunnel(10000, 'strict')(timestamp, event = 1000, event = 1001, event = 1002, event = 1003, event = 1004, event = 1005, event = 1006) from funnel_test_strict;
+select 6 = windowFunnel(10000, 'strict_deduplication')(timestamp, event = 1000, event = 1001, event = 1002, event = 1003, event = 1004, event = 1005, event = 1006) from funnel_test_strict;
 select 7 = windowFunnel(10000)(timestamp, event = 1000, event = 1001, event = 1002, event = 1003, event = 1004, event = 1005, event = 1006) from funnel_test_strict;
 
 
@@ -62,11 +62,18 @@ insert into funnel_test_strict_order values (1, 5, 'a') (2, 5, 'a') (3, 5, 'b')
 insert into funnel_test_strict_order values (1, 6, 'c') (2, 6, 'c') (3, 6, 'b') (4, 6, 'b') (5, 6, 'a') (6, 6, 'a');
 select user, windowFunnel(86400)(dt, event='a', event='b', event='c') as s from funnel_test_strict_order group by user order by user format JSONCompactEachRow;
 select user, windowFunnel(86400, 'strict_order')(dt, event='a', event='b', event='c') as s from funnel_test_strict_order group by user order by user format JSONCompactEachRow;
-select user, windowFunnel(86400, 'strict', 'strict_order')(dt, event='a', event='b', event='c') as s from funnel_test_strict_order group by user order by user format JSONCompactEachRow;
+select user, windowFunnel(86400, 'strict_deduplication', 'strict_order')(dt, event='a', event='b', event='c') as s from funnel_test_strict_order group by user order by user format JSONCompactEachRow;
 insert into funnel_test_strict_order values (1, 7, 'a') (2, 7, 'c') (3, 7, 'b');
 select user, windowFunnel(10, 'strict_order')(dt, event = 'a', event = 'b', event = 'c') as s from funnel_test_strict_order where user = 7 group by user format JSONCompactEachRow;
 drop table funnel_test_strict_order;
 
+--https://github.com/ClickHouse/ClickHouse/issues/27469
+drop table if exists strict_BiteTheDDDD;
+create table strict_BiteTheDDDD (ts UInt64, event String) engine = Log();
+insert into strict_BiteTheDDDD values (1,'a') (2,'b') (3,'c') (4,'b') (5,'d');
+select 3 = windowFunnel(86400, 'strict_deduplication')(ts, event='a', event='b', event='c', event='d') from strict_BiteTheDDDD format JSONCompactEachRow;
+drop table strict_BiteTheDDDD;
+
 drop table if exists funnel_test_non_null;
 create table funnel_test_non_null (`dt` DateTime, `u` int, `a` Nullable(String), `b` Nullable(String)) engine = MergeTree() partition by dt order by u;
 insert into funnel_test_non_null values (1, 1, 'a1', 'b1') (2, 1, 'a2', 'b2');
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.reference b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.reference
index 6e0517557ad..34c1c258e4b 100644
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.reference
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.reference
@@ -3,7 +3,9 @@ b	1
 c	1
 
 a	1
+a	2
 b	1
 c	1
+c	2
 
 1
diff --git a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
index def8e8f4cfe..472dad59710 100755
--- a/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+++ b/tests/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -23,7 +25,7 @@ if ${CLICKHOUSE_CLIENT} --query "INSERT INTO root VALUES (2)" 2>/dev/null; then
 fi
 
 echo
-${CLICKHOUSE_CLIENT} --query "SELECT _table, d FROM merge('${CLICKHOUSE_DATABASE}', '^[abc]\$') ORDER BY _table"
+${CLICKHOUSE_CLIENT} --query "SELECT _table, d FROM merge('${CLICKHOUSE_DATABASE}', '^[abc]\$') ORDER BY _table, d"
 
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE root"
 ${CLICKHOUSE_CLIENT} --query "DROP TABLE a"
diff --git a/tests/queries/0_stateless/00634_logging_shard.sh b/tests/queries/0_stateless/00634_logging_shard.sh
index ab210e5a373..579f846fb66 100755
--- a/tests/queries/0_stateless/00634_logging_shard.sh
+++ b/tests/queries/0_stateless/00634_logging_shard.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: shard
+
 set -e
 
 # Get all server logs
diff --git a/tests/queries/0_stateless/00634_rename_view.sql b/tests/queries/0_stateless/00634_rename_view.sql
index a21b68db535..7a1c096daa1 100644
--- a/tests/queries/0_stateless/00634_rename_view.sql
+++ b/tests/queries/0_stateless/00634_rename_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Does not support renaming of multiple tables in single query
 
 DROP TABLE IF EXISTS test1_00634;
 DROP TABLE IF EXISTS test2_00634;
diff --git a/tests/queries/0_stateless/00635_shard_distinct_order_by.sql b/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
index ec0d40952a3..1782db30d4d 100644
--- a/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
+++ b/tests/queries/0_stateless/00635_shard_distinct_order_by.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS data;
 CREATE TABLE data (s String, x Int8, y Int8) ENGINE = MergeTree ORDER BY tuple();
 
diff --git a/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled b/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
index 6d9a87f7235..92e09928026 100755
--- a/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
+++ b/tests/queries/0_stateless/00638_remote_ssrf.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00643_cast_zookeeper.reference b/tests/queries/0_stateless/00643_cast_zookeeper_long.reference
similarity index 79%
rename from tests/queries/0_stateless/00643_cast_zookeeper.reference
rename to tests/queries/0_stateless/00643_cast_zookeeper_long.reference
index 9123463de1a..4eb4a4e0365 100644
--- a/tests/queries/0_stateless/00643_cast_zookeeper.reference
+++ b/tests/queries/0_stateless/00643_cast_zookeeper_long.reference
@@ -3,7 +3,7 @@ CREATE TABLE default.cast1
     `x` UInt8,
     `e` Enum8('hello' = 1, 'world' = 2) DEFAULT CAST(x, 'Enum8(\'hello\' = 1, \'world\' = 2)')
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00643/cast', 'r1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/default/test_00643/cast', 'r1')
 ORDER BY e
 SETTINGS index_granularity = 8192
 x	UInt8					
diff --git a/tests/queries/0_stateless/00643_cast_zookeeper.sql b/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
similarity index 77%
rename from tests/queries/0_stateless/00643_cast_zookeeper.sql
rename to tests/queries/0_stateless/00643_cast_zookeeper_long.sql
index c9760f00ca7..85f87d11a2f 100644
--- a/tests/queries/0_stateless/00643_cast_zookeeper.sql
+++ b/tests/queries/0_stateless/00643_cast_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 
 DROP TABLE IF EXISTS cast1;
@@ -22,7 +24,7 @@ CREATE TABLE cast1
             'world' = 2
         )
     )
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00643/cast', 'r1') ORDER BY e;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00643/cast', 'r1') ORDER BY e;
 
 SHOW CREATE TABLE cast1 FORMAT TSVRaw;
 DESC TABLE cast1;
@@ -30,7 +32,7 @@ DESC TABLE cast1;
 INSERT INTO cast1 (x) VALUES (1);
 SELECT * FROM cast1;
 
-CREATE TABLE cast2 AS cast1 ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00643/cast', 'r2') ORDER BY e;
+CREATE TABLE cast2 AS cast1 ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00643/cast', 'r2') ORDER BY e;
 
 SYSTEM SYNC REPLICA cast2;
 
diff --git a/tests/queries/0_stateless/00646_url_engine.python b/tests/queries/0_stateless/00646_url_engine.python
index be5332d5ca9..85ae3e776ed 100644
--- a/tests/queries/0_stateless/00646_url_engine.python
+++ b/tests/queries/0_stateless/00646_url_engine.python
@@ -12,8 +12,20 @@ import subprocess
 from io import StringIO
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
-def get_local_port(host):
-    with socket.socket() as fd:
+def is_ipv6(host):
+    try:
+        socket.inet_aton(host)
+        return False
+    except:
+        return True
+
+def get_local_port(host, ipv6):
+    if ipv6:
+        family = socket.AF_INET6
+    else:
+        family = socket.AF_INET
+
+    with socket.socket(family) as fd:
         fd.bind((host, 0))
         return fd.getsockname()[1]
 
@@ -28,14 +40,23 @@ CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
 
 # IP-address of this host accessible from the outside world. Get the first one
 HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip().split()[0]
-HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST)
+IS_IPV6 = is_ipv6(HTTP_SERVER_HOST)
+HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST, IS_IPV6)
 
 # IP address and port of the HTTP server started from this script.
 HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
-HTTP_SERVER_URL_STR = 'http://' + ':'.join(str(s) for s in HTTP_SERVER_ADDRESS) + "/"
+if IS_IPV6:
+    HTTP_SERVER_URL_STR = 'http://' + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+else:
+    HTTP_SERVER_URL_STR = 'http://' + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+
 CSV_DATA = os.path.join(tempfile._get_default_tempdir(), next(tempfile._get_candidate_names()))
 
 def get_ch_answer(query):
+    host = CLICKHOUSE_HOST
+    if IS_IPV6:
+        host = f'[{host}]'
+
     url = os.environ.get('CLICKHOUSE_URL', 'http://{host}:{port}'.format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP))
     return urllib.request.urlopen(url, data=query.encode()).read().decode()
 
@@ -95,8 +116,15 @@ class CSVHTTPServer(BaseHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
+
+class HTTPServerV6(HTTPServer):
+    address_family = socket.AF_INET6
+
 def start_server(requests_amount):
-    httpd = HTTPServer(HTTP_SERVER_ADDRESS, CSVHTTPServer)
+    if IS_IPV6:
+        httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, CSVHTTPServer)
+    else:
+        httpd = HTTPServer(HTTP_SERVER_ADDRESS, CSVHTTPServer)
 
     def real_func():
         for i in range(requests_amount):
diff --git a/tests/queries/0_stateless/00646_url_engine.sh b/tests/queries/0_stateless/00646_url_engine.sh
index 357e0d74fd0..9aacbfcfaf0 100755
--- a/tests/queries/0_stateless/00646_url_engine.sh
+++ b/tests/queries/0_stateless/00646_url_engine.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
index fdf6d717fb8..994114c9c50 100755
--- a/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+++ b/tests/queries/0_stateless/00651_default_database_on_client_reconnect.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00652_mergetree_mutations.sh b/tests/queries/0_stateless/00652_mergetree_mutations.sh
index 7c7117d5f75..0cba8b94040 100755
--- a/tests/queries/0_stateless/00652_mergetree_mutations.sh
+++ b/tests/queries/0_stateless/00652_mergetree_mutations.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -43,7 +44,7 @@ wait_for_mutation "mutations" "mutation_7.txt"
 ${CLICKHOUSE_CLIENT} --query="SELECT d, x, s, m FROM mutations ORDER BY d, x"
 # Check the contents of the system.mutations table.
 ${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, block_numbers.partition_id, block_numbers.number, parts_to_do, is_done \
-    FROM system.mutations WHERE table = 'mutations' ORDER BY mutation_id"
+    FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and table = 'mutations' ORDER BY mutation_id"
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE mutations"
 
@@ -71,6 +72,6 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO mutations_cleaner(x) VALUES (4)"
 sleep 0.1
 
 # Check that the first mutation is cleaned
-${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, is_done FROM system.mutations WHERE table = 'mutations_cleaner' ORDER BY mutation_id"
+${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, is_done FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and table = 'mutations_cleaner' ORDER BY mutation_id"
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE mutations_cleaner"
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
index 58295e17790..0ac5a2f748a 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -7,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=./mergetree_mutations.lib
 . "$CURDIR"/mergetree_mutations.lib
 
-${CLICKHOUSE_CLIENT} --multiquery << EOF
+${CLICKHOUSE_CLIENT} --allow_nondeterministic_mutations=1 --multiquery << EOF
 DROP TABLE IF EXISTS mutations_r1;
 DROP TABLE IF EXISTS for_subquery;
 
diff --git a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
index 3ec6e4e3e90..f070e34f2a1 100755
--- a/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+++ b/tests/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database, no-parallel, no-fasttest
+# Tag no-replicated-database: Old syntax is not allowed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -42,7 +44,7 @@ ${CLICKHOUSE_CLIENT} --query "SYSTEM SYNC REPLICA mutations_r2"
 ${CLICKHOUSE_CLIENT} --query="SELECT d, x, s, m FROM mutations_r2 ORDER BY d, x"
 # Check the contents of the system.mutations table.
 ${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, block_numbers.partition_id, block_numbers.number, parts_to_do, is_done \
-    FROM system.mutations WHERE table = 'mutations_r2' ORDER BY mutation_id"
+    FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and table = 'mutations_r2' ORDER BY mutation_id"
 
 
 ${CLICKHOUSE_CLIENT} --query="SELECT '*** Test mutations cleaner ***'"
@@ -61,7 +63,7 @@ ${CLICKHOUSE_CLIENT} --query="CREATE TABLE mutations_cleaner_r2(x UInt32) ENGINE
     cleanup_delay_period_random_add = 0"
 
 # Insert some data
-${CLICKHOUSE_CLIENT} --query="INSERT INTO mutations_cleaner_r1(x) VALUES (1), (2), (3), (4)"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO mutations_cleaner_r1(x) VALUES (1), (2), (3), (4), (5)"
 
 # Add some mutations and wait for their execution
 ${CLICKHOUSE_CLIENT} --query="ALTER TABLE mutations_cleaner_r1 DELETE WHERE x = 1 SETTINGS mutations_sync = 2"
@@ -76,7 +78,7 @@ ${CLICKHOUSE_CLIENT} --query="ALTER TABLE mutations_cleaner_r1 DELETE WHERE x =
 sleep 1.5
 
 # Check that the first mutation is cleaned
-${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, is_done FROM system.mutations WHERE table = 'mutations_cleaner_r2' ORDER BY mutation_id"
+${CLICKHOUSE_CLIENT} --query="SELECT mutation_id, command, is_done FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and table = 'mutations_cleaner_r2' ORDER BY mutation_id"
 
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE mutations_r1"
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE mutations_r2"
diff --git a/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql b/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
index 033202e04aa..030d39f9050 100644
--- a/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
+++ b/tests/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 SET optimize_on_insert = 0;
 
 DROP TABLE IF EXISTS partitioned_by_tuple_replica1_00661;
diff --git a/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql b/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
index 3a74ee16628..99c2e02e248 100644
--- a/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
+++ b/tests/queries/0_stateless/00675_shard_remote_with_table_function.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS remote_test;
 CREATE TABLE remote_test(a1 UInt8) ENGINE=Memory;
 INSERT INTO FUNCTION remote('127.0.0.1', currentDatabase(), remote_test) VALUES(1);
diff --git a/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql b/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
index f6fac23a155..6d45ac47875 100644
--- a/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
+++ b/tests/queries/0_stateless/00677_shard_any_heavy_merge.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 WITH arrayJoin(['hello', 'world']) AS s SELECT count(), arraySort(groupUniqArray(s)), anyHeavy(s) FROM remote('127.0.0.{2,3}', system.one);
diff --git a/tests/queries/0_stateless/00678_shard_funnel_window.sql b/tests/queries/0_stateless/00678_shard_funnel_window.sql
index 29ec94be20b..8ea07a1c4ba 100644
--- a/tests/queries/0_stateless/00678_shard_funnel_window.sql
+++ b/tests/queries/0_stateless/00678_shard_funnel_window.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS remote_test;
 CREATE TABLE remote_test(uid String, its UInt32,  action_code String, day Date) ENGINE = MergeTree(day, (uid, its), 8192);
 INSERT INTO remote_test SELECT toString(number) AS uid, number % 3 AS its, toString(number % 3) AS action_code, '2000-01-01' FROM system.numbers LIMIT 10000;
diff --git a/tests/queries/0_stateless/00682_empty_parts_merge.sh b/tests/queries/0_stateless/00682_empty_parts_merge.sh
index 0213f31ea94..64aa1cc7452 100755
--- a/tests/queries/0_stateless/00682_empty_parts_merge.sh
+++ b/tests/queries/0_stateless/00682_empty_parts_merge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql b/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
index 4ed0468b146..6d64981d228 100644
--- a/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
+++ b/tests/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_json_escape_forward_slashes = 1;
 select '/some/cool/url' as url format JSONEachRow;
 SET output_format_json_escape_forward_slashes = 0;
diff --git a/tests/queries/0_stateless/00686_client_exit_code.sh b/tests/queries/0_stateless/00686_client_exit_code.sh
index eab534dd8d5..9586ddbd0a3 100755
--- a/tests/queries/0_stateless/00686_client_exit_code.sh
+++ b/tests/queries/0_stateless/00686_client_exit_code.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
index 5a169403872..c6f54ea389b 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists lc_dict_reading;
 create table lc_dict_reading (val UInt64, str StringWithDictionary, pat String) engine = MergeTree order by val;
 insert into lc_dict_reading select number, if(number < 8192 * 4, number % 100, number) as s, s from system.numbers limit 1000000;
diff --git a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
index 74788122aee..e62d824e011 100644
--- a/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
+++ b/tests/queries/0_stateless/00688_low_cardinality_serialization.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 select 'NativeBlockInputStream';
 select toTypeName(dict), dict, lowCardinalityIndices(dict), lowCardinalityKeys(dict) from (select '123_' || toLowCardinality(v) as dict from (select arrayJoin(['a', 'bb', '', 'a', 'ccc', 'a', 'bb', '', 'dddd']) as v));
 select '-';
diff --git a/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql b/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
index 1d6abf7b252..0c8e4ae237d 100644
--- a/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
+++ b/tests/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- NOTE: database = currentDatabase() is not mandatory
 
 SELECT avg(blockSize()) <= 10 FROM system.tables SETTINGS max_block_size = 10;
diff --git a/tests/queries/0_stateless/00697_in_subquery_shard.sql b/tests/queries/0_stateless/00697_in_subquery_shard.sql
index 1e32a587fb3..634cfe42248 100644
--- a/tests/queries/0_stateless/00697_in_subquery_shard.sql
+++ b/tests/queries/0_stateless/00697_in_subquery_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT 0 IN 0;
 SELECT 0 IN 1;
 SELECT 0 IN (SELECT 0);
diff --git a/tests/queries/0_stateless/00699_materialized_view_mutations.sh b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
index f55b8ac10ed..f66d079e307 100755
--- a/tests/queries/0_stateless/00699_materialized_view_mutations.sh
+++ b/tests/queries/0_stateless/00699_materialized_view_mutations.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00700_decimal_aggregates.reference b/tests/queries/0_stateless/00700_decimal_aggregates.reference
index 251445675a2..159091d867e 100644
--- a/tests/queries/0_stateless/00700_decimal_aggregates.reference
+++ b/tests/queries/0_stateless/00700_decimal_aggregates.reference
@@ -1,72 +1,72 @@
 101	101	101
-[-50.0000,50.0000]	[-16.66666666,16.66666666]	[-10.00000000,10.00000000]
-0.0000	0.00000000	0.00000000	0.0000	0.00000000	0.00000000
-1275.0000	424.99999983	255.00000000	1275.0000	424.99999983	255.00000000
--1275.0000	-424.99999983	-255.00000000	-1275.0000	-424.99999983	-255.00000000
-101.0000	101.00000000	101.00000000	101.0000	101.00000000	101.00000000
--101.0000	-101.00000000	-101.00000000	-101.0000	-101.00000000	-101.00000000
+[-50,50]	[-16.66666666,16.66666666]	[-10,10]
+0	0	0	0	0	0
+1275	424.99999983	255	1275	424.99999983	255
+-1275	-424.99999983	-255	-1275	-424.99999983	-255
+101	101	101	101	101	101
+-101	-101	-101	-101	-101	-101
 (101,101,101)	(101,101,101)	(101,101,101)	(101,101,101)	(102,100,101)
 5	5	5
 10	10	10
--50.0000	-50.0000	-16.66666666	-16.66666666	-10.00000000	-10.00000000
-1.0000	1.0000	0.33333333	0.33333333	0.20000000	0.20000000
-50.0000	50.0000	16.66666666	16.66666666	10.00000000	10.00000000
--1.0000	-1.0000	-0.33333333	-0.33333333	-0.20000000	-0.20000000
-0.0000	0.00000000	0.00000000	Decimal(38, 8)
--25.5000	-8.49999999	-5.10000000	Decimal(38, 8)
-0.0000	0.00000000	0.00000000
-10.0000	3.33333333	2.00000000
-20.0000	6.66666666	4.00000000
-30.0000	10.00000000	6.00000000
-40.0000	13.33333333	8.00000000
-50.0000	16.66666666	10.00000000
-[-50.0000,-40.0000,-30.0000,-20.0000,-10.0000,0.0000,10.0000,20.0000,30.0000,40.0000,50.0000]
-[-16.66666666,-13.33333333,-10.00000000,-6.66666666,-3.33333333,0.00000000,3.33333333,6.66666666,10.00000000,13.33333333,16.66666666]
-[-10.00000000,-8.00000000,-6.00000000,-4.00000000,-2.00000000,0.00000000,2.00000000,4.00000000,6.00000000,8.00000000,10.00000000]
-0.0000	0.00000000	0.00000000	Decimal(38, 8)
--25.0000	-8.33333333	-5.00000000	Decimal(38, 8)
-0.0000	0.00000000	0.00000000
-10.0000	3.33333333	2.00000000
-20.0000	6.66666666	4.00000000
-30.0000	10.00000000	6.00000000
-40.0000	13.33333333	8.00000000
-50.0000	16.66666666	10.00000000
-[-50.0000,-40.0000,-30.0000,-20.0000,-10.0000,0.0000,10.0000,20.0000,30.0000,40.0000,50.0000]
-[-16.66666666,-13.33333333,-10.00000000,-6.66666666,-3.33333333,0.00000000,3.33333333,6.66666666,10.00000000,13.33333333,16.66666666]
-[-10.00000000,-8.00000000,-6.00000000,-4.00000000,-2.00000000,0.00000000,2.00000000,4.00000000,6.00000000,8.00000000,10.00000000]
-0.0000	0.00000000	0.00000000	Decimal(38, 8)
--26.0000	-8.66666666	-5.20000000	Decimal(38, 8)
-0.0000	0.00000000	0.00000000
-10.0000	3.33333333	2.00000000
-20.0000	6.66666666	4.00000000
-30.0000	10.00000000	6.00000000
-40.0000	13.33333333	8.00000000
-50.0000	16.66666666	10.00000000
-[-50.0000,-40.0000,-30.0000,-20.0000,-10.0000,0.0000,10.0000,20.0000,30.0000,40.0000,50.0000]
-[-16.66666666,-13.33333333,-10.00000000,-6.66666666,-3.33333333,0.00000000,3.33333333,6.66666666,10.00000000,13.33333333,16.66666666]
-[-10.00000000,-8.00000000,-6.00000000,-4.00000000,-2.00000000,0.00000000,2.00000000,4.00000000,6.00000000,8.00000000,10.00000000]
-0.0000	0.00000000	0.00000000	Decimal(38, 8)
--25.0000	-8.33333333	-5.00000000	Decimal(38, 8)
-0.0000	0.00000000	0.00000000
-10.0000	3.33333333	2.00000000
-20.0000	6.66666666	4.00000000
-30.0000	10.00000000	6.00000000
-40.0000	13.33333333	8.00000000
-50.0000	16.66666666	10.00000000
-[-50.0000,-40.0000,-30.0000,-20.0000,-10.0000,0.0000,10.0000,20.0000,30.0000,40.0000,50.0000]
-[-16.66666666,-13.33333333,-10.00000000,-6.66666666,-3.33333333,0.00000000,3.33333333,6.66666666,10.00000000,13.33333333,16.66666666]
-[-10.00000000,-8.00000000,-6.00000000,-4.00000000,-2.00000000,0.00000000,2.00000000,4.00000000,6.00000000,8.00000000,10.00000000]
-0.0000	0.00000000	0.00000000	Decimal(38, 8)
--26.0000	-8.66666666	-5.20000000	Decimal(38, 8)
-0.0000	0.00000000	0.00000000
-10.0000	3.33333333	2.00000000
-20.0000	6.66666666	4.00000000
-30.0000	10.00000000	6.00000000
-40.0000	13.33333333	8.00000000
-50.0000	16.66666666	10.00000000
-[-50.0000,-40.0000,-30.0000,-20.0000,-10.0000,0.0000,10.0000,20.0000,30.0000,40.0000,50.0000]
-[-16.66666666,-13.33333333,-10.00000000,-6.66666666,-3.33333333,0.00000000,3.33333333,6.66666666,10.00000000,13.33333333,16.66666666]
-[-10.00000000,-8.00000000,-6.00000000,-4.00000000,-2.00000000,0.00000000,2.00000000,4.00000000,6.00000000,8.00000000,10.00000000]
+-50	-50	-16.66666666	-16.66666666	-10	-10
+1	1	0.33333333	0.33333333	0.2	0.2
+50	50	16.66666666	16.66666666	10	10
+-1	-1	-0.33333333	-0.33333333	-0.2	-0.2
+0	0	0	Decimal(38, 8)
+-25.5	-8.49999999	-5.1	Decimal(38, 8)
+0	0	0
+10	3.33333333	2
+20	6.66666666	4
+30	10	6
+40	13.33333333	8
+50	16.66666666	10
+[-50,-40,-30,-20,-10,0,10,20,30,40,50]
+[-16.66666666,-13.33333333,-10,-6.66666666,-3.33333333,0,3.33333333,6.66666666,10,13.33333333,16.66666666]
+[-10,-8,-6,-4,-2,0,2,4,6,8,10]
+0	0	0	Decimal(38, 8)
+-25	-8.33333333	-5	Decimal(38, 8)
+0	0	0
+10	3.33333333	2
+20	6.66666666	4
+30	10	6
+40	13.33333333	8
+50	16.66666666	10
+[-50,-40,-30,-20,-10,0,10,20,30,40,50]
+[-16.66666666,-13.33333333,-10,-6.66666666,-3.33333333,0,3.33333333,6.66666666,10,13.33333333,16.66666666]
+[-10,-8,-6,-4,-2,0,2,4,6,8,10]
+0	0	0	Decimal(38, 8)
+-26	-8.66666666	-5.2	Decimal(38, 8)
+0	0	0
+10	3.33333333	2
+20	6.66666666	4
+30	10	6
+40	13.33333333	8
+50	16.66666666	10
+[-50,-40,-30,-20,-10,0,10,20,30,40,50]
+[-16.66666666,-13.33333333,-10,-6.66666666,-3.33333333,0,3.33333333,6.66666666,10,13.33333333,16.66666666]
+[-10,-8,-6,-4,-2,0,2,4,6,8,10]
+0	0	0	Decimal(38, 8)
+-25	-8.33333333	-5	Decimal(38, 8)
+0	0	0
+10	3.33333333	2
+20	6.66666666	4
+30	10	6
+40	13.33333333	8
+50	16.66666666	10
+[-50,-40,-30,-20,-10,0,10,20,30,40,50]
+[-16.66666666,-13.33333333,-10,-6.66666666,-3.33333333,0,3.33333333,6.66666666,10,13.33333333,16.66666666]
+[-10,-8,-6,-4,-2,0,2,4,6,8,10]
+0	0	0	Decimal(38, 8)
+-26	-8.66666666	-5.2	Decimal(38, 8)
+0	0	0
+10	3.33333333	2
+20	6.66666666	4
+30	10	6
+40	13.33333333	8
+50	16.66666666	10
+[-50,-40,-30,-20,-10,0,10,20,30,40,50]
+[-16.66666666,-13.33333333,-10,-6.66666666,-3.33333333,0,3.33333333,6.66666666,10,13.33333333,16.66666666]
+[-10,-8,-6,-4,-2,0,2,4,6,8,10]
 850	94.44444438684269	34	Float64	Float64	Float64
 850	94.4444443868427	34.00000000000001
 858.5	95.38888883071111	34.34	Float64	Float64	Float64
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.reference b/tests/queries/0_stateless/00700_decimal_arithm.reference
index 9de0d4cbf9a..a41ef5b0557 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.reference
+++ b/tests/queries/0_stateless/00700_decimal_arithm.reference
@@ -1,37 +1,37 @@
 84	0	1764	1	1	1
 84	0	1764	1	1	1
 84	0	1764	1	1	1
-84.840	0.000	1799.456400	1.000	1.000	1.000
-84.840000000	0.000000000
-84.840000000000000000	0.000000000000000000	98.044565395307682683126962841158942720	1.000000000000000000	1.000000000000000000	1.000000000000000000
-84.840000000000000000	0.000000000000000000
-84.84	0.00	1799.4564	1.00	1.00	1.00
+84.84	0	1799.4564	1	1	1
+84.84	0
+84.84	0	98.04456539530768268312696284115894272	1	1	1
+84.84	0
+84.84	0	1799.4564	1	1	1
 63	21	-42	882	-882	2	0	2	0
 63	21	-42	882	-882	2	0	2	0
 63	21	-42	882	-882	2	0	2	0
-1.00305798474369219219752355409390731264	-0.16305798474369219219752355409390731264	1.49059173023461586584365185794205286400	-1.38847100762815390390123822295304634368	1.38847100762815390390123822295304634368	0.02000000000000000000000000000000000000	0.00500000000000000000000000000000000000
-63.420	21.420	-41.580	890.820	-890.820	2.020	0.505	2.020	0.505
-63.420000000	21.420000000	-41.580000000	890.820000000	-890.820000000	2.020000000	0.505000000	2.020000000	0.505000000
-63.420000000000000000	21.420000000000000000	-41.580000000000000000	890.820000000000000000	-890.820000000000000000	2.020000000000000000	0.505000000000000000	2.020000000000000000	0.505000000000000000
-63.42	21.42	-41.58	890.82	-890.82	2.02	0.50	2.02	0.50
+1.00305798474369219219752355409390731264	-0.16305798474369219219752355409390731264	1.490591730234615865843651857942052864	-1.38847100762815390390123822295304634368	1.38847100762815390390123822295304634368	0.02	0.005
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2.02	0.505
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2.02	0.505
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2.02	0.505
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.5	2.02	0.5
 63	-21	42	882	-882	0	2	0	2
 63	-21	42	882	-882	0	2	0	2
 63	-21	42	882	-882	0	2	0	2
-1.00305798474369219219752355409390731264	0.16305798474369219219752355409390731264	-1.49059173023461586584365185794205286400	-1.38847100762815390390123822295304634368	1.38847100762815390390123822295304634368	-0.00000000000000000000000000000000000001	0.00000000000000000000000000000000000001
-63.420	-21.420	41.580	890.820	-890.820	0.495	1.980	0.495	1.980
-63.420000000	-21.420000000	41.580000000	890.820000000	-890.820000000
-63.420000000000000000	-21.420000000000000000	41.580000000000000000	890.820000000000000000	-890.820000000000000000	0.495049504950495049	1.980198019801980198	0.495049504950495049	1.980198019801980198
+1.00305798474369219219752355409390731264	0.16305798474369219219752355409390731264	-1.490591730234615865843651857942052864	-1.38847100762815390390123822295304634368	1.38847100762815390390123822295304634368	-0.00000000000000000000000000000000000001	0.00000000000000000000000000000000000001
+63.42	-21.42	41.58	890.82	-890.82	0.495	1.98	0.495	1.98
+63.42	-21.42	41.58	890.82	-890.82
+63.42	-21.42	41.58	890.82	-890.82	0.495049504950495049	1.980198019801980198	0.495049504950495049	1.980198019801980198
 63.42	-21.42	41.58	890.82	-890.82	0.49	1.98	0.49	1.98
--42	42	42	42	0.420000000	0.420000000000000000	0.42000000000000000000000000000000000000	42.420	42.420000000	42.42
-0	0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.000	0.000000000	0.00
-42	-42	-42	-42	-0.420000000	-0.420000000000000000	-0.42000000000000000000000000000000000000	-42.420	-42.420000000	-42.42
-42	42	42	0.420000000	0.420000000000000000	0.42000000000000000000000000000000000000	42.420	42.420000000	42.42
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.000	0.000000000	0.00
-42	42	42	0.420000000	0.420000000000000000	0.42000000000000000000000000000000000000	42.420	42.420000000	42.42
+-42	42	42	42	0.42	0.42	0.42	42.42	42.42	42.42
+0	0	0	0	0	0	0	0	0	0
+42	-42	-42	-42	-0.42	-0.42	-0.42	-42.42	-42.42	-42.42
+42	42	42	0.42	0.42	0.42	42.42	42.42	42.42
+0	0	0	0	0	0	0	0	0
+42	42	42	0.42	0.42	0.42	42.42	42.42	42.42
 1	1
 1	1
 1	0	1	0
 1	0	1	0
-0.0000	\N	\N
-0.00000000	\N	\N
-0.000000000000000000	\N	\N
+0	\N	\N
+0	\N	\N
+0	\N	\N
diff --git a/tests/queries/0_stateless/00700_decimal_array_functions.reference b/tests/queries/0_stateless/00700_decimal_array_functions.reference
index 969a8dd2f18..ae872b7a347 100644
--- a/tests/queries/0_stateless/00700_decimal_array_functions.reference
+++ b/tests/queries/0_stateless/00700_decimal_array_functions.reference
@@ -1,20 +1,20 @@
-[0.0000,1.0000]	Array(Decimal(9, 4))
-[0.00000000,1.00000000]	Array(Decimal(18, 8))
-[0.00000000,1.00000000]	Array(Decimal(38, 8))
+[0,1]	Array(Decimal(9, 4))
+[0,1]	Array(Decimal(18, 8))
+[0,1]	Array(Decimal(38, 8))
 -
-1.0000	Decimal(38, 4)
-1.00000000	Decimal(38, 8)
-1.00000000	Decimal(38, 8)
+1	Decimal(38, 4)
+1	Decimal(38, 8)
+1	Decimal(38, 8)
 -
-[1.0000,2.0000]	Array(Decimal(38, 4))
-[1.00000000,2.00000000]	Array(Decimal(38, 8))
-[1.00000000,2.00000000]	Array(Decimal(38, 8))
+[1,2]	Array(Decimal(38, 4))
+[1,2]	Array(Decimal(38, 8))
+[1,2]	Array(Decimal(38, 8))
 -
-[1.0000,2.0000]	Array(Decimal(38, 4))
-[1.00000000,2.00000000]	Array(Decimal(38, 8))
-[1.00000000,2.00000000]	Array(Decimal(38, 8))
+[1,2]	Array(Decimal(38, 4))
+[1,2]	Array(Decimal(38, 8))
+[1,2]	Array(Decimal(38, 8))
 -
-[1.0000]	Array(Decimal(9, 4))
-[1.00000000]	Array(Decimal(18, 8))
-[1.00000000]	Array(Decimal(38, 8))
+[1]	Array(Decimal(9, 4))
+[1]	Array(Decimal(18, 8))
+[1]	Array(Decimal(38, 8))
 -
diff --git a/tests/queries/0_stateless/00700_decimal_bounds.reference b/tests/queries/0_stateless/00700_decimal_bounds.reference
index 3f25fccc942..86688ea0546 100644
--- a/tests/queries/0_stateless/00700_decimal_bounds.reference
+++ b/tests/queries/0_stateless/00700_decimal_bounds.reference
@@ -1,43 +1,43 @@
--999999999	-999999999999999999	0	-0.999999999	0.000000000000000000	0.00000000000000000000000000000000000000	-9999.99999	0.000000000	0.000000000000000000	0
--900000000	-900000000000000000	-90000000000000000000000000000000000000	-0.000000009	-0.000000000000000009	-0.00000000000000000000000000000000000009	0.00000	0.000000000	0.000000000000000000	0
--1	-1	-1	-0.000000001	0.000000000000000000	0.00000000000000000000000000000000000000	-0.00001	-0.000000001	0.000000000000000000	-1
-0	0	-99999999999999999999999999999999999999	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	-0.999999999999999999	0.00000000000000000000000000000000000000	0.00000	-999999999.999999999	0.000000000000000000	0
-0	0	0	0.000000000	-0.000000000000000001	-0.00000000000000000000000000000000000001	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	-0.99999999999999999999999999999999999999	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	-99999999999999999999.999999999999999999	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	-0.000000000000000001	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000001	0
-0	0	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	99999999999999999999.999999999999999999	0
-0	0	0	0.000000000	0.000000000000000000	0.99999999999999999999999999999999999999	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.000000000000000001	0.00000000000000000000000000000000000001	0.00000	0.000000000	0.000000000000000000	0
-0	0	0	0.000000000	0.999999999999999999	0.00000000000000000000000000000000000000	0.00000	999999999.999999999	0.000000000000000000	0
-0	0	99999999999999999999999999999999999999	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.00000	0.000000000	0.000000000000000000	0
-1	1	1	0.000000001	0.000000000000000000	0.00000000000000000000000000000000000000	0.00001	0.000000001	0.000000000000000000	1
-42	42	0	0.000000000	0.000000000000000000	0.00000000000000000000000000000000000000	0.99999	0.000000000	0.000000000000000000	0
-900000000	900000000000000000	90000000000000000000000000000000000000	0.000000009	0.000000000000000009	0.00000000000000000000000000000000000009	0.00000	0.000000000	0.000000000000000000	0
-999999999	999999999999999999	0	0.999999999	0.000000000000000000	0.00000000000000000000000000000000000000	9999.99999	0.000000000	0.000000000000000000	0
+-999999999	-999999999999999999	0	-0.999999999	0	0	-9999.99999	0	0	0
+-900000000	-900000000000000000	-90000000000000000000000000000000000000	-0.000000009	-0.000000000000000009	-0.00000000000000000000000000000000000009	0	0	0	0
+-1	-1	-1	-0.000000001	0	0	-0.00001	-0.000000001	0	-1
+0	0	-99999999999999999999999999999999999999	0	0	0	0	0	0	0
+0	0	0	0	-0.999999999999999999	0	0	-999999999.999999999	0	0
+0	0	0	0	-0.000000000000000001	-0.00000000000000000000000000000000000001	0	0	0	0
+0	0	0	0	0	-0.99999999999999999999999999999999999999	0	0	0	0
+0	0	0	0	0	0	0	0	-99999999999999999999.999999999999999999	0
+0	0	0	0	0	0	0	0	-0.000000000000000001	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	0.000000000000000001	0
+0	0	0	0	0	0	0	0	99999999999999999999.999999999999999999	0
+0	0	0	0	0	0.99999999999999999999999999999999999999	0	0	0	0
+0	0	0	0	0.000000000000000001	0.00000000000000000000000000000000000001	0	0	0	0
+0	0	0	0	0.999999999999999999	0	0	999999999.999999999	0	0
+0	0	99999999999999999999999999999999999999	0	0	0	0	0	0	0
+1	1	1	0.000000001	0	0	0.00001	0.000000001	0	1
+42	42	0	0	0	0	0.99999	0	0	0
+900000000	900000000000000000	90000000000000000000000000000000000000	0.000000009	0.000000000000000009	0.00000000000000000000000000000000000009	0	0	0	0
+999999999	999999999999999999	0	0.999999999	0	0	9999.99999	0	0	0
diff --git a/tests/queries/0_stateless/00700_decimal_casts.reference b/tests/queries/0_stateless/00700_decimal_casts.reference
index 99d8b949398..9f469f2907e 100644
--- a/tests/queries/0_stateless/00700_decimal_casts.reference
+++ b/tests/queries/0_stateless/00700_decimal_casts.reference
@@ -1,30 +1,30 @@
-1.1	1.10	1.10000000
+1.1	1.1	1.1
 1
-1	1.1	1.10	1.10000000
+1	1.1	1.1	1.1
 0.1	0
 -0.1	0
 0.1	0
 -0.1	0
 0.1	0
 -0.1	0
-0.0000000001	0.000000000
--0.0000000001	0.000000000
-0.0000000000000000001	0.000000000000000000
--0.0000000000000000001	0.000000000000000000
-0.000000000000000000000000000000000000001	0.00000000000000000000000000000000000000
--0.000000000000000000000000000000000000001	0.00000000000000000000000000000000000000
+0.0000000001	0
+-0.0000000001	0
+0.0000000000000000001	0
+-0.0000000000000000001	0
+0.000000000000000000000000000000000000001	0
+-0.000000000000000000000000000000000000001	0
 1e-1	0
 -1e-1	0
 1e-1	0
 -1e-1	0
 1e-1	0
 -1e-1	0
-1e-10	0.000000000
--1e-10	0.000000000
-1e-19	0.000000000000000000
--1e-19	0.000000000000000000
-1e-39	0.00000000000000000000000000000000000000
--1e-39	0.00000000000000000000000000000000000000
+1e-10	0
+-1e-10	0
+1e-19	0
+-1e-19	0
+1e-39	0
+-1e-39	0
 9999999	9999999	-9999999	9999999	-9999999
 999999.9	999999.9	-999999.9	999999.9	-999999.9
 99999.99	99999.99	-99999.99	99999.99	-99999.99
@@ -33,8 +33,8 @@
 99.99999	99.99999	-99.99999	99.99999	-99.99999
 9.999999	9.999999	-9.999999	9.999999	-9.999999
 0.9999999	0.9999999	-0.9999999	0.9999999	-0.9999999
-10	10.00000000	-10.00000000	10.00000000	-10.00000000
-1	1.000000000	-1.000000000	1.000000000	-1.000000000
+10	10	-10	10	-10
+1	1	-1	1	-1
 999999999	999999999	-999999999	999999999	-999999999
 99999999.9	99999999.9	-99999999.9	99999999.9	-99999999.9
 9999999.99	9999999.99	-9999999.99	9999999.99	-9999999.99
@@ -45,111 +45,111 @@
 99.9999999	99.9999999	-99.9999999	99.9999999	-99.9999999
 9.99999999	9.99999998	-9.99999998	9.99999998	-9.99999998
 0.999999999	0.999999999	-0.999999999	0.999999999	-0.999999999
-1000000000	1000000000.000000000	-1000000000.000000000
-100000000	100000000.0000000000	-100000000.0000000000
-10000000	10000000.00000000000	-10000000.00000000000
-1000000	1000000.000000000000	-1000000.000000000000
-100000	100000.0000000000000	-100000.0000000000000
-10000	10000.00000000000000	-10000.00000000000000
-1000	1000.000000000000000	-1000.000000000000000
-100	100.0000000000000000	-100.0000000000000000
-10	10.00000000000000000	-10.00000000000000000
-1	1.000000000000000000	-1.000000000000000000
+1000000000	1000000000	-1000000000
+100000000	100000000	-100000000
+10000000	10000000	-10000000
+1000000	1000000	-1000000
+100000	100000	-100000
+10000	10000	-10000
+1000	1000	-1000
+100	100	-100
+10	10	-10
+1	1	-1
 1000000000000000000	1000000000000000000	-1000000000000000000
-100000000000000000	100000000000000000.0	-100000000000000000.0
-10000000000000000	10000000000000000.00	-10000000000000000.00
-1000000000000000	1000000000000000.000	-1000000000000000.000
-100000000000000	100000000000000.0000	-100000000000000.0000
-10000000000000	10000000000000.00000	-10000000000000.00000
-1000000000000	1000000000000.000000	-1000000000000.000000
-100000000000	100000000000.0000000	-100000000000.0000000
-10000000000	10000000000.00000000	-10000000000.00000000
-1000000000	1000000000.000000000	-1000000000.000000000
-1000000000	1000000000.000000000	-1000000000.000000000
-100000000	100000000.0000000000	-100000000.0000000000
-10000000	10000000.00000000000	-10000000.00000000000
-1000000	1000000.000000000000	-1000000.000000000000
-100000	100000.0000000000000	-100000.0000000000000
-10000	10000.00000000000000	-10000.00000000000000
-1000	1000.000000000000000	-1000.000000000000000
-100	100.0000000000000000	-100.0000000000000000
-10	10.00000000000000000	-10.00000000000000000
-1	1.000000000000000000	-1.000000000000000000
-0.0000	0.00	0.00000000
-1.0000	0.11	0.11000000
-2.0000	0.22	0.22000000
-3.0000	0.33	0.33000000
-4.0000	0.44	0.44000000
-5.0000	0.55	0.55000000
-6.0000	0.66	0.66000000
-7.0000	0.77	0.77000000
-8.0000	0.88	0.88000000
-9.0000	1.00	1.00000000
-0.0000	0.00000000	0.00
-1.0000	0.11110000	0.11
-2.0000	0.22220000	0.22
-3.0000	0.33330000	0.33
-4.0000	0.44440000	0.44
-5.0000	0.55550000	0.55
-6.0000	0.66660000	0.66
-7.0000	0.77770000	0.77
-8.0000	0.88880000	0.88
-9.0000	1.00000000	1.00
-0.00000000	0.0000	0.00
-1.00000000	0.1111	0.11
-2.00000000	0.2222	0.22
-3.00000000	0.3333	0.33
-4.00000000	0.4444	0.44
-5.00000000	0.5555	0.55
-6.00000000	0.6666	0.66
-7.00000000	0.7777	0.77
-8.00000000	0.8888	0.88
-9.00000000	1.0000	1.00
-0.0000	0.00	0.00000000
-1.0000	0.11	0.11000000
-2.0000	0.22	0.22000000
-3.0000	0.33	0.33000000
-4.0000	0.44	0.44000000
-5.0000	0.55	0.55000000
-6.0000	0.66	0.66000000
-7.0000	0.77	0.77000000
-8.0000	0.88	0.88000000
-9.0000	1.00	1.00000000
-0.0000	0.00000000	0.00
-1.0000	0.11110000	0.11
-2.0000	0.22220000	0.22
-3.0000	0.33330000	0.33
-4.0000	0.44440000	0.44
-5.0000	0.55550000	0.55
-6.0000	0.66660000	0.66
-7.0000	0.77770000	0.77
-8.0000	0.88880000	0.88
-9.0000	1.00000000	1.00
-0.00000000	0.0000	0.00
-1.00000000	0.1111	0.11
-2.00000000	0.2222	0.22
-3.00000000	0.3333	0.33
-4.00000000	0.4444	0.44
-5.00000000	0.5555	0.55
-6.00000000	0.6666	0.66
-7.00000000	0.7777	0.77
-8.00000000	0.8888	0.88
-9.00000000	1.0000	1.00
+100000000000000000	100000000000000000	-100000000000000000
+10000000000000000	10000000000000000	-10000000000000000
+1000000000000000	1000000000000000	-1000000000000000
+100000000000000	100000000000000	-100000000000000
+10000000000000	10000000000000	-10000000000000
+1000000000000	1000000000000	-1000000000000
+100000000000	100000000000	-100000000000
+10000000000	10000000000	-10000000000
+1000000000	1000000000	-1000000000
+1000000000	1000000000	-1000000000
+100000000	100000000	-100000000
+10000000	10000000	-10000000
+1000000	1000000	-1000000
+100000	100000	-100000
+10000	10000	-10000
+1000	1000	-1000
+100	100	-100
+10	10	-10
+1	1	-1
+0	0	0
+1	0.11	0.11
+2	0.22	0.22
+3	0.33	0.33
+4	0.44	0.44
+5	0.55	0.55
+6	0.66	0.66
+7	0.77	0.77
+8	0.88	0.88
+9	1	1
+0	0	0
+1	0.1111	0.11
+2	0.2222	0.22
+3	0.3333	0.33
+4	0.4444	0.44
+5	0.5555	0.55
+6	0.6666	0.66
+7	0.7777	0.77
+8	0.8888	0.88
+9	1	1
+0	0	0
+1	0.1111	0.11
+2	0.2222	0.22
+3	0.3333	0.33
+4	0.4444	0.44
+5	0.5555	0.55
+6	0.6666	0.66
+7	0.7777	0.77
+8	0.8888	0.88
+9	1	1
+0	0	0
+1	0.11	0.11
+2	0.22	0.22
+3	0.33	0.33
+4	0.44	0.44
+5	0.55	0.55
+6	0.66	0.66
+7	0.77	0.77
+8	0.88	0.88
+9	1	1
+0	0	0
+1	0.1111	0.11
+2	0.2222	0.22
+3	0.3333	0.33
+4	0.4444	0.44
+5	0.5555	0.55
+6	0.6666	0.66
+7	0.7777	0.77
+8	0.8888	0.88
+9	1	1
+0	0	0
+1	0.1111	0.11
+2	0.2222	0.22
+3	0.3333	0.33
+4	0.4444	0.44
+5	0.5555	0.55
+6	0.6666	0.66
+7	0.7777	0.77
+8	0.8888	0.88
+9	1	1
 99	99	-99	99	-99
 9999	9999	-9999	9999	-9999
 999999999	999999999	-999999999	999999999	-999999999
 999999999	999999999	-999999999	999999999	-999999999
-999999999	999999999.000000000	-999999999.000000000	999999999.00000000000000000000000000000	-999999999.00000000000000000000000000000
-999999999	999999999.000000000	-999999999.000000000	999999999.00000000000000000000000000000	-999999999.00000000000000000000000000000
+999999999	999999999	-999999999	999999999	-999999999
+999999999	999999999	-999999999	999999999	-999999999
+999999999999999999	999999999999999999	-999999999999999999
 999999999999999999	999999999999999999	-999999999999999999
 999999999999999999	999999999999999999	-999999999999999999
-999999999999999999	999999999999999999.00000000000000000000	-999999999999999999.00000000000000000000
 99	99	99
 9999	9999	9999
 999999999	999999999	999999999
 999999999	999999999	999999999
 42.42	42.42	42.42	42.42
-42.42	42.4200000	42.4200000000000000	42.420000000000000000000000000000000000
+42.42	42.42	42.42	42.42
 123456789	123456789123456789
 12345678901234567890123456789012345678
 0.123456789	0.123456789123456789
diff --git a/tests/queries/0_stateless/00700_decimal_casts_2.reference b/tests/queries/0_stateless/00700_decimal_casts_2.reference
index 393baae6c47..ed951e82036 100644
--- a/tests/queries/0_stateless/00700_decimal_casts_2.reference
+++ b/tests/queries/0_stateless/00700_decimal_casts_2.reference
@@ -1,36 +1,36 @@
-1234567890.0000000000000000000000000000	1234567890.00000000000000000000000000000	1234567890.00000000000000000000000000000
+1234567890	1234567890	1234567890
 -126561577.683753853853498429727072845824
-1234567890.00000000	1234567890.000000000	1234567890.000000000
-12345678.0	12345678.00	12345678.00
-9223372036854775807.000000	9223372036854775807	-9223372036854775807
+1234567890	1234567890	1234567890
+12345678	12345678	12345678
+9223372036854775807	9223372036854775807	-9223372036854775807
 9223372036854775800	9223372036854775800	-9223372036854775800
-92233720368547758.00	92233720368547758	-92233720368547758
-2147483647.0000000000	2147483647	-2147483647
-2147483647.00	2147483647	-2147483647
+92233720368547758	92233720368547758	-92233720368547758
+2147483647	2147483647	-2147483647
+2147483647	2147483647	-2147483647
 92233720368547757.99	92233720368547757	-92233720368547757
 2147483640.99	2147483640	-2147483640
--0.90000000	0
--0.90000000	0
--0.90000000	0
--0.8000	0
--0.8000	0
--0.8000	0
--0.70	0
--0.70	0
--0.70	0
--0.600000	0
--0.600000	0
--0.600000	0
+-0.9	0
+-0.9	0
+-0.9	0
+-0.8	0
+-0.8	0
+-0.8	0
+-0.7	0
+-0.7	0
+-0.7	0
+-0.6	0
+-0.6	0
+-0.6	0
+18446744073709551615	18446744073709551615
 18446744073709551615	18446744073709551615
-18446744073709551615.00000000	18446744073709551615
 4294967295	4294967295
-4294967295.0000000000	4294967295
 4294967295	4294967295
-4294967295.0000	4294967295
+4294967295	4294967295
+4294967295	4294967295
+65535	65535
+65535	65535
 65535	65535
-65535.0000000000	65535
 65535	65535
-65535.0000	65535
 2147483647	2147483647
 -2147483647	-2147483647
 2147483647	2147483647
diff --git a/tests/queries/0_stateless/00700_decimal_compare.reference b/tests/queries/0_stateless/00700_decimal_compare.reference
index 2325847045f..6b2787642b7 100644
--- a/tests/queries/0_stateless/00700_decimal_compare.reference
+++ b/tests/queries/0_stateless/00700_decimal_compare.reference
@@ -2,27 +2,27 @@
 1
 -42	-42	1	0	0	0	1	1
 42	42	1	0	0	0	1	1
--42	-42.42000	0	0	1	1	0	1
-42	42.42000	0	1	0	1	1	0
+-42	-42.42	0	0	1	1	0	1
+42	42.42	0	1	0	1	1	0
 1	1	1
 0	0	0
 -42	0	0	0	0
 42	1	1	1	1
 -42	0	0	0	0
 42	1	1	1	1
-0.420000000	0.420000000000000000	0.42000000000000000000000000000000000000
-42.42	42.420000000	42.420000000000000000	42.42
--42.42	-42.420000000	-42.420000000000000000	-42.42
+0.42	0.42	0.42
+42.42	42.42	42.42	42.42
+-42.42	-42.42	-42.42	-42.42
 42	42	42
 42	42	42
 42	42	42
 42	42	42
--42	-42.42000	-42	-42.00000
-42	42.00000	42	42.42000
--42	-42	-42.42000
-0	0	0.00000
-0	0	0.00000
-42	42	42.42000
+-42	-42.42	-42	-42
+42	42	42	42.42
+-42	-42	-42.42
+0	0	0
+0	0	0
+42	42	42.42
 1	0
 1	0
 1	0
@@ -35,5 +35,5 @@
 0	1
 0	1
 0	1
--42	-42	-42	-0.420000000	-0.420000000000000000	-0.42000000000000000000000000000000000000	-42.42000	-42.420000000	-42.420000000000000000	-42.42
-42	42	42	0.420000000	0.420000000000000000	0.42000000000000000000000000000000000000	42.42000	42.420000000	42.420000000000000000	42.42
+-42	-42	-42	-0.42	-0.42	-0.42	-42.42	-42.42	-42.42	-42.42
+42	42	42	0.42	0.42	0.42	42.42	42.42	42.42	42.42
diff --git a/tests/queries/0_stateless/00700_decimal_complex_types.reference b/tests/queries/0_stateless/00700_decimal_complex_types.reference
index 9c7c6fefefd..b5ae11ad5d3 100644
--- a/tests/queries/0_stateless/00700_decimal_complex_types.reference
+++ b/tests/queries/0_stateless/00700_decimal_complex_types.reference
@@ -3,31 +3,31 @@ Array(Decimal(9, 2))	Array(Decimal(18, 2))	Array(Decimal(38, 2))
 Decimal(9, 3)	Decimal(18, 3)	Decimal(38, 3)
 Decimal(9, 2)	Decimal(18, 2)	Decimal(38, 2)
 Tuple(Decimal(9, 1), Decimal(18, 1), Decimal(38, 1))	Decimal(9, 1)	Decimal(18, 1)	Decimal(38, 1)
-0.100
-0.200
-0.300
-0.400
-0.500
-0.600
-0.700
-0.800
-0.900
+0.1
+0.2
+0.3
+0.4
+0.5
+0.6
+0.7
+0.8
+0.9
 (9.1,9.2,9.3)	9.1	9.2	9.3
-[0.100,0.200,0.300]	[0.100,0.200]	[0.200,0.300]	[0.100]	[0.200]
-[0.400,0.500,0.600]	[0.400,0.500]	[0.500,0.600]	[0.400]	[0.500]
-[0.700,0.800,0.900]	[0.700,0.800]	[0.800,0.900]	[0.700]	[0.800]
-[1.10,1.20]	[1.10]	[1.20]	[1.10]	[1.20]
-[2.10,2.20]	[2.10]	[2.20]	[2.10]	[2.20]
-[3.10,3.20]	[3.10]	[3.20]	[3.10]	[3.20]
-[0.100,0.200,0.300,0.000]	[0.000,0.100,0.200,0.300]
-[0.400,0.500,0.600,0.000]	[0.000,0.400,0.500,0.600]
-[0.700,0.800,0.900,0.000]	[0.000,0.700,0.800,0.900]
-[0.100,0.200,0.300,0.000]	Array(Decimal(9, 3))
-[0.400,0.500,0.600,0.000]	Array(Decimal(18, 3))
-[0.700,0.800,0.900,0.000]	Array(Decimal(38, 3))
-[0.0000,0.1000,0.2000,0.3000]	Array(Decimal(9, 4))
-[0.0000,0.4000,0.5000,0.6000]	Array(Decimal(18, 4))
-[0.0000,0.7000,0.8000,0.9000]	Array(Decimal(38, 4))
+[0.1,0.2,0.3]	[0.1,0.2]	[0.2,0.3]	[0.1]	[0.2]
+[0.4,0.5,0.6]	[0.4,0.5]	[0.5,0.6]	[0.4]	[0.5]
+[0.7,0.8,0.9]	[0.7,0.8]	[0.8,0.9]	[0.7]	[0.8]
+[1.1,1.2]	[1.1]	[1.2]	[1.1]	[1.2]
+[2.1,2.2]	[2.1]	[2.2]	[2.1]	[2.2]
+[3.1,3.2]	[3.1]	[3.2]	[3.1]	[3.2]
+[0.1,0.2,0.3,0]	[0,0.1,0.2,0.3]
+[0.4,0.5,0.6,0]	[0,0.4,0.5,0.6]
+[0.7,0.8,0.9,0]	[0,0.7,0.8,0.9]
+[0.1,0.2,0.3,0]	Array(Decimal(9, 3))
+[0.4,0.5,0.6,0]	Array(Decimal(18, 3))
+[0.7,0.8,0.9,0]	Array(Decimal(38, 3))
+[0,0.1,0.2,0.3]	Array(Decimal(9, 4))
+[0,0.4,0.5,0.6]	Array(Decimal(18, 4))
+[0,0.7,0.8,0.9]	Array(Decimal(38, 4))
 3	3	3
 2	2	2
 0	0	0
@@ -66,24 +66,24 @@ Tuple(Decimal(9, 1), Decimal(18, 1), Decimal(38, 1))	Decimal(9, 1)	Decimal(18, 1
 1
 1
 1
-[0.100,0.200,0.300,0.400,0.500,0.600]	Array(Decimal(18, 3))
-[0.100,0.200,0.300,0.700,0.800,0.900]	Array(Decimal(38, 3))
-[0.400,0.500,0.600,0.700,0.800,0.900]	Array(Decimal(38, 3))
-[0.100,0.200,0.300,1.100,1.200]	Array(Decimal(9, 3))
-[0.400,0.500,0.600,2.100,2.200]	Array(Decimal(18, 3))
-[0.700,0.800,0.900,3.100,3.200]	Array(Decimal(38, 3))
-[0.100,0.200,0.300,2.100,2.200]	Array(Decimal(18, 3))
-[0.100,0.200,0.300,3.100,3.200]	Array(Decimal(38, 3))
-[0.400,0.500,0.600,1.100,1.200]	Array(Decimal(18, 3))
-[0.400,0.500,0.600,3.100,3.200]	Array(Decimal(38, 3))
-[0.700,0.800,0.900,1.100,1.200]	Array(Decimal(38, 3))
-[0.700,0.800,0.900,2.100,2.200]	Array(Decimal(38, 3))
+[0.1,0.2,0.3,0.4,0.5,0.6]	Array(Decimal(18, 3))
+[0.1,0.2,0.3,0.7,0.8,0.9]	Array(Decimal(38, 3))
+[0.4,0.5,0.6,0.7,0.8,0.9]	Array(Decimal(38, 3))
+[0.1,0.2,0.3,1.1,1.2]	Array(Decimal(9, 3))
+[0.4,0.5,0.6,2.1,2.2]	Array(Decimal(18, 3))
+[0.7,0.8,0.9,3.1,3.2]	Array(Decimal(38, 3))
+[0.1,0.2,0.3,2.1,2.2]	Array(Decimal(18, 3))
+[0.1,0.2,0.3,3.1,3.2]	Array(Decimal(38, 3))
+[0.4,0.5,0.6,1.1,1.2]	Array(Decimal(18, 3))
+[0.4,0.5,0.6,3.1,3.2]	Array(Decimal(38, 3))
+[0.7,0.8,0.9,1.1,1.2]	Array(Decimal(38, 3))
+[0.7,0.8,0.9,2.1,2.2]	Array(Decimal(38, 3))
 12345.6789	2	2	2
 -12345.6789	2	2	2
 123456789.123456784	2	2	2
 -123456789.123456784	2	2	2
 0.123456789123456784	2	2	2
--0.123456789112345680	2	2	2
+-0.12345678911234568	2	2	2
 Decimal(9, 5)
 Decimal(9, 5)
 Decimal(9, 4)
@@ -114,21 +114,21 @@ Decimal(38, 4)
 Decimal(38, 4)
 Decimal(9, 0)
 Decimal(18, 0)
-32.20000
-32.10000
-64.20000
-32.10000
-128.20000
-32.10000
-32.20000
-64.10000
-64.20000
-64.10000
-128.20000
-64.10000
-32.20000
-128.10000
-64.20000
-128.10000
-128.20000
-128.10000
+32.2
+32.1
+64.2
+32.1
+128.2
+32.1
+32.2
+64.1
+64.2
+64.1
+128.2
+64.1
+32.2
+128.1
+64.2
+128.1
+128.2
+128.1
diff --git a/tests/queries/0_stateless/00700_decimal_defaults.reference b/tests/queries/0_stateless/00700_decimal_defaults.reference
index f3f1fba83e7..04de9ac4c3d 100644
--- a/tests/queries/0_stateless/00700_decimal_defaults.reference
+++ b/tests/queries/0_stateless/00700_decimal_defaults.reference
@@ -4,11 +4,11 @@ c	Decimal(38, 4)	DEFAULT	b / 3
 d	Decimal(9, 4)	MATERIALIZED	a + toDecimal32(\'0.2\', 1)			
 e	Decimal(18, 4)	ALIAS	b * 2			
 f	Decimal(38, 4)	ALIAS	c * 6			
-0.0000	0.0000	0.0000
-1.0000	0.5000	0.1666
-2.0000	1.0000	0.3333
-3.0000	1.5000	0.5000
-0.0000	0.0000	0.0000	0.2000	0.0000	0.0000
-1.0000	0.5000	0.1666	1.2000	1.0000	0.9996
-2.0000	1.0000	0.3333	2.2000	2.0000	1.9998
-3.0000	1.5000	0.5000	3.2000	3.0000	3.0000
+0	0	0
+1	0.5	0.1666
+2	1	0.3333
+3	1.5	0.5
+0	0	0	0.2	0	0
+1	0.5	0.1666	1.2	1	0.9996
+2	1	0.3333	2.2	2	1.9998
+3	1.5	0.5	3.2	3	3
diff --git a/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference b/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference
index b079e91fddc..2c29b72f50c 100644
--- a/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference
+++ b/tests/queries/0_stateless/00700_decimal_empty_aggregates.reference
@@ -1,50 +1,50 @@
 0	0	0
-[0.0000,0.0000]	[0.0000000,0.0000000]	[0.00000000,0.00000000]
-0.0000	0.0000000	0.00000000	0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000	0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000	0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000	0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000	0.0000	0.0000000	0.00000000
+[0,0]	[0,0]	[0,0]
+0	0	0	0	0	0
+0	0	0	0	0	0
+0	0	0	0	0	0
+0	0	0	0	0	0
+0	0	0	0	0	0
 (0,0,0)	(0,0,0)	(0,0,0)	(0,0,0)	(0,0,0)
 0	0	0
 0	0	0
-0.0000	0.0000	0.0000000	0.0000000	0.00000000	0.00000000
-0.0000	0.0000	0.0000000	0.0000000	0.00000000	0.00000000
-0.0000	0.0000	0.0000000	0.0000000	0.00000000	0.00000000
-0.0000	0.0000	0.0000000	0.0000000	0.00000000	0.00000000
-0.0000	0.0000000	0.00000000	Decimal(6, 4)	Decimal(16, 7)	Decimal(20, 8)
-0.0000	0.0000000	0.00000000	Decimal(6, 4)	Decimal(16, 7)	Decimal(20, 8)
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-[0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000]
-[0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000]
-[0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000]
-0.0000	0.0000000	0.00000000	Decimal(20, 8)
-0.0000	0.0000000	0.00000000	Decimal(20, 8)
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-[0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000]
-[0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000]
-[0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000]
-0.0000	0.0000000	0.00000000	Decimal(20, 8)
-0.0000	0.0000000	0.00000000	Decimal(20, 8)
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-0.0000	0.0000000	0.00000000
-[0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000]
-[0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000,0.0000000]
-[0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000]
+0	0	0	0	0	0
+0	0	0	0	0	0
+0	0	0	0	0	0
+0	0	0	0	0	0
+0	0	0	Decimal(6, 4)	Decimal(16, 7)	Decimal(20, 8)
+0	0	0	Decimal(6, 4)	Decimal(16, 7)	Decimal(20, 8)
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+[0,0,0,0,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,0,0]
+0	0	0	Decimal(20, 8)
+0	0	0	Decimal(20, 8)
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+[0,0,0,0,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,0,0]
+0	0	0	Decimal(20, 8)
+0	0	0	Decimal(20, 8)
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+0	0	0
+[0,0,0,0,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,0,0]
 inf	inf	inf	Float64	Float64	Float64
 nan	nan	nan
 nan	nan	nan	Float64	Float64	Float64
diff --git a/tests/queries/0_stateless/00700_decimal_formats.reference b/tests/queries/0_stateless/00700_decimal_formats.reference
index 0bea4ba27be..ff3961780a2 100644
--- a/tests/queries/0_stateless/00700_decimal_formats.reference
+++ b/tests/queries/0_stateless/00700_decimal_formats.reference
@@ -1,42 +1,42 @@
 {"a":0.055,"b":-0.000000005,"c":0.000000000000000005}
-{"a":0.100,"b":-0.100000000,"c":0.100000000000000000}
-{"a":0.200,"b":-0.200000000,"c":0.200000000000000000}
-{"a":0.300,"b":-0.300000000,"c":0.300000000000000000}
-{"a":0.420,"b":-0.420000000,"c":0.420000000000000000}
-{"a":1.000,"b":-1.000000000,"c":1.000000000000000000}
-{"a":1.100,"b":-1.100000000,"c":1.100000000000000000}
-{"a":2.000,"b":-2.000000000,"c":2.000000000000000000}
-{"a":2.200,"b":-2.200000000,"c":2.200000000000000000}
-{"a":3.000,"b":-3.000000000,"c":3.000000000000000000}
-{"a":3.300,"b":-3.300000000,"c":3.300000000000000000}
-{"a":42.000,"b":-42.000000000,"c":42.000000000000000000}
-{"a":42.420,"b":-42.420000000,"c":42.420000000000000000}
-{"a":440000.000,"b":-400000000.000000000,"c":40000000000000000000.000000000000000000}
+{"a":0.1,"b":-0.1,"c":0.1}
+{"a":0.2,"b":-0.2,"c":0.2}
+{"a":0.3,"b":-0.3,"c":0.3}
+{"a":0.42,"b":-0.42,"c":0.42}
+{"a":1,"b":-1,"c":1}
+{"a":1.1,"b":-1.1,"c":1.1}
+{"a":2,"b":-2,"c":2}
+{"a":2.2,"b":-2.2,"c":2.2}
+{"a":3,"b":-3,"c":3}
+{"a":3.3,"b":-3.3,"c":3.3}
+{"a":42,"b":-42,"c":42}
+{"a":42.42,"b":-42.42,"c":42.42}
+{"a":440000,"b":-400000000,"c":40000000000000000000}
 0.055,-0.000000005,0.000000000000000005
-0.100,-0.100000000,0.100000000000000000
-0.200,-0.200000000,0.200000000000000000
-0.300,-0.300000000,0.300000000000000000
-0.420,-0.420000000,0.420000000000000000
-1.000,-1.000000000,1.000000000000000000
-1.100,-1.100000000,1.100000000000000000
-2.000,-2.000000000,2.000000000000000000
-2.200,-2.200000000,2.200000000000000000
-3.000,-3.000000000,3.000000000000000000
-3.300,-3.300000000,3.300000000000000000
-42.000,-42.000000000,42.000000000000000000
-42.420,-42.420000000,42.420000000000000000
-440000.000,-400000000.000000000,40000000000000000000.000000000000000000
+0.1,-0.1,0.1
+0.2,-0.2,0.2
+0.3,-0.3,0.3
+0.42,-0.42,0.42
+1,-1,1
+1.1,-1.1,1.1
+2,-2,2
+2.2,-2.2,2.2
+3,-3,3
+3.3,-3.3,3.3
+42,-42,42
+42.42,-42.42,42.42
+440000,-400000000,40000000000000000000
 0.055	-0.000000005	0.000000000000000005
-0.100	-0.100000000	0.100000000000000000
-0.200	-0.200000000	0.200000000000000000
-0.300	-0.300000000	0.300000000000000000
-0.420	-0.420000000	0.420000000000000000
-1.000	-1.000000000	1.000000000000000000
-1.100	-1.100000000	1.100000000000000000
-2.000	-2.000000000	2.000000000000000000
-2.200	-2.200000000	2.200000000000000000
-3.000	-3.000000000	3.000000000000000000
-3.300	-3.300000000	3.300000000000000000
-42.000	-42.000000000	42.000000000000000000
-42.420	-42.420000000	42.420000000000000000
-440000.000	-400000000.000000000	40000000000000000000.000000000000000000
+0.1	-0.1	0.1
+0.2	-0.2	0.2
+0.3	-0.3	0.3
+0.42	-0.42	0.42
+1	-1	1
+1.1	-1.1	1.1
+2	-2	2
+2.2	-2.2	2.2
+3	-3	3
+3.3	-3.3	3.3
+42	-42	42
+42.42	-42.42	42.42
+440000	-400000000	40000000000000000000
diff --git a/tests/queries/0_stateless/00700_decimal_gathers.reference b/tests/queries/0_stateless/00700_decimal_gathers.reference
index bbfd7388e12..273642d15a8 100644
--- a/tests/queries/0_stateless/00700_decimal_gathers.reference
+++ b/tests/queries/0_stateless/00700_decimal_gathers.reference
@@ -1,13 +1,13 @@
-[2.000]
-[2.0000000000]
-[2.000000000000000000]
-[1.000]
-[1.0000000000]
-[1.000000000000000000]
--
-[2.000]
-[1]
-[2.000000000000000000]
-[1.000]
 [2]
-[1.000000000000000000]
+[2]
+[2]
+[1]
+[1]
+[1]
+-
+[2]
+[1]
+[2]
+[1]
+[2]
+[1]
diff --git a/tests/queries/0_stateless/00700_decimal_in_keys.reference b/tests/queries/0_stateless/00700_decimal_in_keys.reference
index ec11144a206..4b3486b5ce7 100644
--- a/tests/queries/0_stateless/00700_decimal_in_keys.reference
+++ b/tests/queries/0_stateless/00700_decimal_in_keys.reference
@@ -5,25 +5,25 @@
 1
 1
 5
-9.00000000	29.00000000	29.00000000
-8.00000000	28.00000000	28.00000000
-7.00000000	27.00000000	27.00000000
-6.00000000	26.00000000	26.00000000
-9.00000000	19.00000000	19.00000000
-8.00000000	18.00000000	18.00000000
-7.00000000	17.00000000	17.00000000
-6.00000000	16.00000000	16.00000000
-9.00000000	9.00000000	9.00000000
-8.00000000	8.00000000	8.00000000
-7.00000000	7.00000000	7.00000000
-6.00000000	6.00000000	6.00000000
-1.00000000	1.00000000	1.00000000
-3.00000000	3.00000000	3.00000000
-1.00000000	11.00000000	11.00000000
-3.00000000	13.00000000	13.00000000
-1.00000000	21.00000000	21.00000000
-3.00000000	23.00000000	23.00000000
-1.00000000	31.00000000	31.00000000
-3.00000000	33.00000000	33.00000000
-1.00000000	41.00000000	41.00000000
-3.00000000	43.00000000	43.00000000
+9	29	29
+8	28	28
+7	27	27
+6	26	26
+9	19	19
+8	18	18
+7	17	17
+6	16	16
+9	9	9
+8	8	8
+7	7	7
+6	6	6
+1	1	1
+3	3	3
+1	11	11
+3	13	13
+1	21	21
+3	23	23
+1	31	31
+3	33	33
+1	41	41
+3	43	43
diff --git a/tests/queries/0_stateless/00700_decimal_math.reference b/tests/queries/0_stateless/00700_decimal_math.reference
index f58e08dc1fb..eb556ac49b8 100644
--- a/tests/queries/0_stateless/00700_decimal_math.reference
+++ b/tests/queries/0_stateless/00700_decimal_math.reference
@@ -1,30 +1,30 @@
-42.4200	3.7476	42.419154
-42.4200	5.4066	42.417862
-42.4200	1.6275	42.413098
-42.4200	6.513	42.419169
-42.4200	3.4875	42.417263671875
-1.00000	0.8427007929497149	0.15729920705028513
-42.4200	115.60113124678627	1.6029995567009473e50
-0.00	0	1	0
+42.42	3.7476	42.419154
+42.42	5.4066	42.417862
+42.42	1.6275	42.413098
+42.42	6.513	42.419169
+42.42	3.4875	42.417263671875
+1	0.8427007929497149	0.15729920705028513
+42.42	115.60113124678627	1.6029995567009473e50
+0	0	1	0
 3.14159265	0	-1	-0
-1.00	1.5707963267948966	0	0.7853981633974483
-42.4200	3.7476	42.419154
-42.4200	5.4066	42.417862
-42.4200	1.6275	42.413098
-42.4200	6.513	42.419169
-42.4200	3.4875	42.417263671875
-1.00000	0.8427007929497149	0.15729920705028513
-42.4200	115.60113124678627	1.6029995567009473e50
-0.00	0	1	0
+1	1.5707963267948966	0	0.7853981633974483
+42.42	3.7476	42.419154
+42.42	5.4066	42.417862
+42.42	1.6275	42.413098
+42.42	6.513	42.419169
+42.42	3.4875	42.417263671875
+1	0.8427007929497149	0.15729920705028513
+42.42	115.60113124678627	1.6029995567009473e50
+0	0	1	0
 3.14159265358979328	0	-1	-0
-1.00	1.5707963267948966	0	0.7853981633974483
-42.4200	3.7476	42.419154
-42.4200	5.4066	42.417862
-42.4200	1.6275	42.413098
-42.4200	6.513	42.419169
-42.4200	3.4875	42.417263671875
-1.00000	0.8427007929497149	0.15729920705028513
-42.4200	115.60113124678627	1.6029995567009473e50
-0.00	0	1	0
+1	1.5707963267948966	0	0.7853981633974483
+42.42	3.7476	42.419154
+42.42	5.4066	42.417862
+42.42	1.6275	42.413098
+42.42	6.513	42.419169
+42.42	3.4875	42.417263671875
+1	0.8427007929497149	0.15729920705028513
+42.42	115.60113124678627	1.6029995567009473e50
+0	0	1	0
 3.14159265358979	0	-1	-0
-1.00	1.5707963267948966	0	0.7853981633974483
+1	1.5707963267948966	0	0.7853981633974483
diff --git a/tests/queries/0_stateless/00700_decimal_null.reference b/tests/queries/0_stateless/00700_decimal_null.reference
index 250a437a883..e9ddf011260 100644
--- a/tests/queries/0_stateless/00700_decimal_null.reference
+++ b/tests/queries/0_stateless/00700_decimal_null.reference
@@ -17,11 +17,11 @@
 \N
 1
 1
-1.10	1.10000	1.10000	1.1000	1.10000000	1.10000000
-2.20	2.20000	2.20000	2.2000	\N	\N
-3.30	3.30000	3.30000	\N	3.30000000	\N
-4.40	4.40000	4.40000	\N	\N	4.40000000
-5.50	5.50000	5.50000	\N	\N	\N
+1.1	1.1	1.1	1.1	1.1	1.1
+2.2	2.2	2.2	2.2	\N	\N
+3.3	3.3	3.3	\N	3.3	\N
+4.4	4.4	4.4	\N	\N	4.4
+5.5	5.5	5.5	\N	\N	\N
 0	1
 0	1
 0	1
diff --git a/tests/queries/0_stateless/00700_decimal_round.reference b/tests/queries/0_stateless/00700_decimal_round.reference
index 230b6863411..d0f03c07849 100644
--- a/tests/queries/0_stateless/00700_decimal_round.reference
+++ b/tests/queries/0_stateless/00700_decimal_round.reference
@@ -1,75 +1,75 @@
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12345.0000	12345.6000	12345.6700	12345.6780	12345.6789	12345.6789
-12345.6789	12345.0000	12345.6000	12345.6700	12345.6780	12345.6789	12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12345.0000	-12345.6000	-12345.6700	-12345.6780	-12345.6789	-12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12345.0000	-12345.6000	-12345.6700	-12345.6780	-12345.6789	-12345.6789
-12345.6789	12350.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12350.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12350.0000	12400.0000	13000.0000	20000.0000	100000.0000
-12345.6789	12340.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12340.0000	12300.0000	12000.0000	10000.0000	0.0000
--12345.6789	-12350.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12350.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12340.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12350.0000	-12400.0000	-13000.0000	-20000.0000	-100000.0000
--12345.6789	-12340.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12345.0000	12345.6000	12345.6700	12345.6780	12345.6789	12345.6789
-12345.6789	12345.0000	12345.6000	12345.6700	12345.6780	12345.6789	12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12345.0000	-12345.6000	-12345.6700	-12345.6780	-12345.6789	-12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12345.0000	-12345.6000	-12345.6700	-12345.6780	-12345.6789	-12345.6789
-12345.6789	12350.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12350.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12350.0000	12400.0000	13000.0000	20000.0000	100000.0000
-12345.6789	12340.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12340.0000	12300.0000	12000.0000	10000.0000	0.0000
--12345.6789	-12350.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12350.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12340.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12350.0000	-12400.0000	-13000.0000	-20000.0000	-100000.0000
--12345.6789	-12340.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12346.0000	12345.7000	12345.6800	12345.6790	12345.6789	12345.6789
-12345.6789	12345.0000	12345.6000	12345.6700	12345.6780	12345.6789	12345.6789
-12345.6789	12345.0000	12345.6000	12345.6700	12345.6780	12345.6789	12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12345.0000	-12345.6000	-12345.6700	-12345.6780	-12345.6789	-12345.6789
--12345.6789	-12346.0000	-12345.7000	-12345.6800	-12345.6790	-12345.6789	-12345.6789
--12345.6789	-12345.0000	-12345.6000	-12345.6700	-12345.6780	-12345.6789	-12345.6789
-12345.6789	12350.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12350.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12350.0000	12400.0000	13000.0000	20000.0000	100000.0000
-12345.6789	12340.0000	12300.0000	12000.0000	10000.0000	0.0000
-12345.6789	12340.0000	12300.0000	12000.0000	10000.0000	0.0000
--12345.6789	-12350.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12350.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12340.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
--12345.6789	-12350.0000	-12400.0000	-13000.0000	-20000.0000	-100000.0000
--12345.6789	-12340.0000	-12300.0000	-12000.0000	-10000.0000	0.0000
-123456789.123456789	-123456789.123456789	123456789.000000000	-123456789.000000000	123456789.123460000	-123456789.123460000	123500000.000000000	-123500000.000000000
-123456789.123456789	-123456789.123456789	123456789.000000000	-123456789.000000000	123456789.123460000	-123456789.123460000	123500000.000000000	-123500000.000000000
-123456789.123456789	-123456789.123456789	123456790.000000000	-123456789.000000000	123456789.123460000	-123456789.123450000	123500000.000000000	-123400000.000000000
-123456789.123456789	-123456789.123456789	123456789.000000000	-123456790.000000000	123456789.123450000	-123456789.123460000	123400000.000000000	-123500000.000000000
-123456789.123456789	-123456789.123456789	123456789.000000000	-123456789.000000000	123456789.123450000	-123456789.123450000	123400000.000000000	-123400000.000000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456789.000000000	12345678901234567890123456789.123000000	-12345678901234567890123456789.123000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456789.000000000	12345678901234567890123456789.123000000	-12345678901234567890123456789.123000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456790.000000000	-12345678901234567890123456789.000000000	12345678901234567890123456789.124000000	-12345678901234567890123456789.123000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456790.000000000	12345678901234567890123456789.123000000	-12345678901234567890123456789.124000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456789.000000000	12345678901234567890123456789.123000000	-12345678901234567890123456789.123000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456789.000000000	12345678901234567890123457000.000000000	-12345678901234567890123457000.000000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456789.000000000	12345678901234567890123457000.000000000	-12345678901234567890123457000.000000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456790.000000000	-12345678901234567890123456789.000000000	12345678901234567890123457000.000000000	-12345678901234567890123456000.000000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456790.000000000	12345678901234567890123456000.000000000	-12345678901234567890123457000.000000000
-12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789.000000000	-12345678901234567890123456789.000000000	12345678901234567890123456000.000000000	-12345678901234567890123456000.000000000
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12345	12345.6	12345.67	12345.678	12345.6789	12345.6789
+12345.6789	12345	12345.6	12345.67	12345.678	12345.6789	12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12345	-12345.6	-12345.67	-12345.678	-12345.6789	-12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12345	-12345.6	-12345.67	-12345.678	-12345.6789	-12345.6789
+12345.6789	12350	12300	12000	10000	0
+12345.6789	12350	12300	12000	10000	0
+12345.6789	12350	12400	13000	20000	100000
+12345.6789	12340	12300	12000	10000	0
+12345.6789	12340	12300	12000	10000	0
+-12345.6789	-12350	-12300	-12000	-10000	0
+-12345.6789	-12350	-12300	-12000	-10000	0
+-12345.6789	-12340	-12300	-12000	-10000	0
+-12345.6789	-12350	-12400	-13000	-20000	-100000
+-12345.6789	-12340	-12300	-12000	-10000	0
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12345	12345.6	12345.67	12345.678	12345.6789	12345.6789
+12345.6789	12345	12345.6	12345.67	12345.678	12345.6789	12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12345	-12345.6	-12345.67	-12345.678	-12345.6789	-12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12345	-12345.6	-12345.67	-12345.678	-12345.6789	-12345.6789
+12345.6789	12350	12300	12000	10000	0
+12345.6789	12350	12300	12000	10000	0
+12345.6789	12350	12400	13000	20000	100000
+12345.6789	12340	12300	12000	10000	0
+12345.6789	12340	12300	12000	10000	0
+-12345.6789	-12350	-12300	-12000	-10000	0
+-12345.6789	-12350	-12300	-12000	-10000	0
+-12345.6789	-12340	-12300	-12000	-10000	0
+-12345.6789	-12350	-12400	-13000	-20000	-100000
+-12345.6789	-12340	-12300	-12000	-10000	0
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12346	12345.7	12345.68	12345.679	12345.6789	12345.6789
+12345.6789	12345	12345.6	12345.67	12345.678	12345.6789	12345.6789
+12345.6789	12345	12345.6	12345.67	12345.678	12345.6789	12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12345	-12345.6	-12345.67	-12345.678	-12345.6789	-12345.6789
+-12345.6789	-12346	-12345.7	-12345.68	-12345.679	-12345.6789	-12345.6789
+-12345.6789	-12345	-12345.6	-12345.67	-12345.678	-12345.6789	-12345.6789
+12345.6789	12350	12300	12000	10000	0
+12345.6789	12350	12300	12000	10000	0
+12345.6789	12350	12400	13000	20000	100000
+12345.6789	12340	12300	12000	10000	0
+12345.6789	12340	12300	12000	10000	0
+-12345.6789	-12350	-12300	-12000	-10000	0
+-12345.6789	-12350	-12300	-12000	-10000	0
+-12345.6789	-12340	-12300	-12000	-10000	0
+-12345.6789	-12350	-12400	-13000	-20000	-100000
+-12345.6789	-12340	-12300	-12000	-10000	0
+123456789.123456789	-123456789.123456789	123456789	-123456789	123456789.12346	-123456789.12346	123500000	-123500000
+123456789.123456789	-123456789.123456789	123456789	-123456789	123456789.12346	-123456789.12346	123500000	-123500000
+123456789.123456789	-123456789.123456789	123456790	-123456789	123456789.12346	-123456789.12345	123500000	-123400000
+123456789.123456789	-123456789.123456789	123456789	-123456790	123456789.12345	-123456789.12346	123400000	-123500000
+123456789.123456789	-123456789.123456789	123456789	-123456789	123456789.12345	-123456789.12345	123400000	-123400000
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456789	12345678901234567890123456789.123	-12345678901234567890123456789.123
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456789	12345678901234567890123456789.123	-12345678901234567890123456789.123
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456790	-12345678901234567890123456789	12345678901234567890123456789.124	-12345678901234567890123456789.123
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456790	12345678901234567890123456789.123	-12345678901234567890123456789.124
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456789	12345678901234567890123456789.123	-12345678901234567890123456789.123
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456789	12345678901234567890123457000	-12345678901234567890123457000
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456789	12345678901234567890123457000	-12345678901234567890123457000
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456790	-12345678901234567890123456789	12345678901234567890123457000	-12345678901234567890123456000
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456790	12345678901234567890123456000	-12345678901234567890123457000
+12345678901234567890123456789.123456789	-12345678901234567890123456789.123456789	12345678901234567890123456789	-12345678901234567890123456789	12345678901234567890123456000	-12345678901234567890123456000
diff --git a/tests/queries/0_stateless/00700_to_decimal_or_something.reference b/tests/queries/0_stateless/00700_to_decimal_or_something.reference
index 7a6ff87d096..89ded7bd6d4 100644
--- a/tests/queries/0_stateless/00700_to_decimal_or_something.reference
+++ b/tests/queries/0_stateless/00700_to_decimal_or_something.reference
@@ -1,8 +1,8 @@
-1.1	1.10	1.10000000
+1.1	1.1	1.1
 0
 0	0.42
-0	0.420
-0	0.4200
+0	0.42
+0	0.42
 999999999	0
 -999999999	0
 999999999999999999	0
@@ -12,11 +12,11 @@
 -99999999999999999999999999999999999999
 0
 ----
-1.1	1.10	1.10000000
+1.1	1.1	1.1
 \N
 \N	-0.42
-\N	-0.420
-\N	-0.4200
+\N	-0.42
+\N	-0.42
 999999999	\N
 -999999999	\N
 999999999999999999	\N
diff --git a/tests/queries/0_stateless/00701_rollup.sql b/tests/queries/0_stateless/00701_rollup.sql
index fa7f3a21657..3637a5fae2f 100644
--- a/tests/queries/0_stateless/00701_rollup.sql
+++ b/tests/queries/0_stateless/00701_rollup.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS rollup;
 CREATE TABLE rollup(a String, b Int32, s Int32) ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
index 48833d2643c..4637b210194 100755
--- a/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+++ b/tests/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00715_json_each_row_input_nested.sh b/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
index 72e01aef742..c49f50c7bdc 100755
--- a/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
+++ b/tests/queries/0_stateless/00715_json_each_row_input_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00716_allow_ddl.sql b/tests/queries/0_stateless/00716_allow_ddl.sql
index d33d8b7eec5..bc0fa20eb0a 100644
--- a/tests/queries/0_stateless/00716_allow_ddl.sql
+++ b/tests/queries/0_stateless/00716_allow_ddl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_ddl = 0;
 
diff --git a/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql b/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
index d4d260ee92e..96e60c2891d 100644
--- a/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
+++ b/tests/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync = 1;
 set allow_suspicious_low_cardinality_types = 1;
 
diff --git a/tests/queries/0_stateless/00717_merge_and_distributed.sql b/tests/queries/0_stateless/00717_merge_and_distributed.sql
index 35dad18937a..f7b4a2b24d3 100644
--- a/tests/queries/0_stateless/00717_merge_and_distributed.sql
+++ b/tests/queries/0_stateless/00717_merge_and_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS test_local_1;
diff --git a/tests/queries/0_stateless/00719_parallel_ddl_db.sh b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
index 5608a57eecc..31ea1dbbe58 100755
--- a/tests/queries/0_stateless/00719_parallel_ddl_db.sh
+++ b/tests/queries/0_stateless/00719_parallel_ddl_db.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.reference b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.reference
rename to tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
similarity index 79%
rename from tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql
rename to tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
index 498896d31a7..3a387d0a203 100644
--- a/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql
+++ b/tests/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
@@ -1,8 +1,10 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS byte_identical_r1;
 DROP TABLE IF EXISTS byte_identical_r2;
 
-CREATE TABLE byte_identical_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00721/byte_identical', 'r1') ORDER BY x;
-CREATE TABLE byte_identical_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00721/byte_identical', 'r2') ORDER BY x;
+CREATE TABLE byte_identical_r1(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00721/byte_identical', 'r1') ORDER BY x;
+CREATE TABLE byte_identical_r2(x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00721/byte_identical', 'r2') ORDER BY x;
 
 INSERT INTO byte_identical_r1(x) VALUES (1), (2), (3);
 SYSTEM SYNC REPLICA byte_identical_r2;
@@ -12,6 +14,7 @@ SYSTEM SYNC REPLICA byte_identical_r2;
 ALTER TABLE byte_identical_r1 ADD COLUMN y UInt64 DEFAULT rand();
 SYSTEM SYNC REPLICA byte_identical_r1;
 SYSTEM SYNC REPLICA byte_identical_r2;
+SET replication_alter_partitions_sync=2;
 OPTIMIZE TABLE byte_identical_r1 PARTITION tuple() FINAL;
 
 SELECT x, t1.y - t2.y FROM byte_identical_r1 t1 SEMI LEFT JOIN byte_identical_r2 t2 USING x ORDER BY x;
diff --git a/tests/queries/0_stateless/00725_comment_columns.reference b/tests/queries/0_stateless/00725_comment_columns_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00725_comment_columns.reference
rename to tests/queries/0_stateless/00725_comment_columns_long.reference
diff --git a/tests/queries/0_stateless/00725_comment_columns.sql b/tests/queries/0_stateless/00725_comment_columns_long.sql
similarity index 97%
rename from tests/queries/0_stateless/00725_comment_columns.sql
rename to tests/queries/0_stateless/00725_comment_columns_long.sql
index 6fe095d9935..fe4ee48909f 100644
--- a/tests/queries/0_stateless/00725_comment_columns.sql
+++ b/tests/queries/0_stateless/00725_comment_columns_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS check_query_comment_column;
 
 -- Check COMMENT COLUMN and MODIFY COLUMN statements with simple engine
@@ -87,4 +89,4 @@ FORMAT PrettyCompactNoEscapes;
 
 DROP TABLE IF EXISTS check_query_comment_column;
 
--- TODO: add here tests with ReplicatedMergeTree
+-- TODO: add here tests with ReplicatedMergeTree({database})
diff --git a/tests/queries/0_stateless/00725_memory_tracking.sql b/tests/queries/0_stateless/00725_memory_tracking.sql
index 46d7948b1b3..b7356f0a6aa 100644
--- a/tests/queries/0_stateless/00725_memory_tracking.sql
+++ b/tests/queries/0_stateless/00725_memory_tracking.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 SELECT least(value, 0) FROM system.metrics WHERE metric = 'MemoryTracking';
 SELECT length(range(100000000));
 SELECT least(value, 0) FROM system.metrics WHERE metric = 'MemoryTracking';
diff --git a/tests/queries/0_stateless/00725_quantiles_shard.sql b/tests/queries/0_stateless/00725_quantiles_shard.sql
index bb8fcfcd2d9..a3742ce8729 100644
--- a/tests/queries/0_stateless/00725_quantiles_shard.sql
+++ b/tests/queries/0_stateless/00725_quantiles_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT quantiles(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
 SELECT quantilesExact(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
 SELECT quantilesTDigest(0.5, 0.9)(number) FROM remote('127.0.0.{1,2}', numbers(10));
diff --git a/tests/queries/0_stateless/00728_json_each_row_parsing.sh b/tests/queries/0_stateless/00728_json_each_row_parsing.sh
index 6a43fc2d8da..21f6a350fdb 100755
--- a/tests/queries/0_stateless/00728_json_each_row_parsing.sh
+++ b/tests/queries/0_stateless/00728_json_each_row_parsing.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
index e54326cb59f..f9e33645527 100755
--- a/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
+++ b/tests/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00732_base64_functions.sql b/tests/queries/0_stateless/00732_base64_functions.sql
index 0d3b7e43645..3ba4180c20c 100644
--- a/tests/queries/0_stateless/00732_base64_functions.sql
+++ b/tests/queries/0_stateless/00732_base64_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET send_logs_level = 'fatal';
 SELECT base64Encode(val) FROM (select arrayJoin(['', 'f', 'fo', 'foo', 'foob', 'fooba', 'foobar']) val);
 SELECT base64Decode(val) FROM (select arrayJoin(['', 'Zg==', 'Zm8=', 'Zm9v', 'Zm9vYg==', 'Zm9vYmE=', 'Zm9vYmFy']) val);
diff --git a/tests/queries/0_stateless/00732_decimal_summing_merge_tree.reference b/tests/queries/0_stateless/00732_decimal_summing_merge_tree.reference
index 1644f50993c..551ef8f59c5 100644
--- a/tests/queries/0_stateless/00732_decimal_summing_merge_tree.reference
+++ b/tests/queries/0_stateless/00732_decimal_summing_merge_tree.reference
@@ -1,2 +1,2 @@
-2001-01-01	2.0000	0.00000000	-2.0000000000
-2001-01-01	0.0000	1.00000000	0.0000000000
+2001-01-01	2	0	-2
+2001-01-01	0	1	0
diff --git a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
similarity index 71%
rename from tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
index a1fc25fbf0b..bff8c7e73ee 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_have_data', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_have_data', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_have_data', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_have_data', '2') ORDER BY x PARTITION BY y;
 
 INSERT INTO quorum1 VALUES (1, '1990-11-15');
 INSERT INTO quorum1 VALUES (2, '1990-11-15');
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
similarity index 74%
rename from tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
index 914d98ff3f5..a1859220c6c 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost_alive', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost_alive', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_lost_alive', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_lost_alive', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2, insert_quorum_parallel=0;
 SET select_sequential_consistency=1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
similarity index 72%
rename from tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
index 18cad0dda41..61394447c3d 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_lost', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_lost', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_lost', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2, insert_quorum_parallel=0;
 SET select_sequential_consistency=1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
similarity index 69%
rename from tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
index 11c8324ac25..e3e5aa7949f 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_old_data', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum_old_data', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_old_data', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum_old_data', '2') ORDER BY x PARTITION BY y;
 
 INSERT INTO quorum1 VALUES (1, '1990-11-15');
 INSERT INTO quorum1 VALUES (2, '1990-11-15');
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
similarity index 76%
rename from tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
index a4e262ce3c4..4eb263c75c2 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum1', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum1', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum1', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum1', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2, insert_quorum_parallel=0;
 SET select_sequential_consistency=1;
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.reference b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.reference
rename to tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.sql b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
similarity index 65%
rename from tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.sql
rename to tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
index 40c08fd926f..7fb23936819 100644
--- a/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.sql
+++ b/tests/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1;
 DROP TABLE IF EXISTS quorum2;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum2', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00732/quorum2', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum2', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00732/quorum2', '2') ORDER BY x PARTITION BY y;
 
 SET insert_quorum=2, insert_quorum_parallel=0;
 SET select_sequential_consistency=1;
diff --git a/tests/queries/0_stateless/00735_long_conditional.sql b/tests/queries/0_stateless/00735_long_conditional.sql
index a247ce003b3..73febad1310 100644
--- a/tests/queries/0_stateless/00735_long_conditional.sql
+++ b/tests/queries/0_stateless/00735_long_conditional.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET send_logs_level = 'fatal';
 
 SELECT 'value vs value';
diff --git a/tests/queries/0_stateless/00737_decimal_group_by.reference b/tests/queries/0_stateless/00737_decimal_group_by.reference
index 2f838f4bcdd..3e7ca2bf83b 100644
--- a/tests/queries/0_stateless/00737_decimal_group_by.reference
+++ b/tests/queries/0_stateless/00737_decimal_group_by.reference
@@ -1,11 +1,11 @@
-1.10
-2.1000
-3.100000000000
-1.20
-2.2000
-3.200000000000
-1.30
-2.3000
-3.300000000000
-1	1.000000000000000000	10.000000000000000000
-1	1.000000000000000000	10.000000000000000000
+1.1
+2.1
+3.1
+1.2
+2.2
+3.2
+1.3
+2.3
+3.3
+1	1	10
+1	1	10
diff --git a/tests/queries/0_stateless/00738_lock_for_inner_table.sh b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
index d19288f65d8..b28d1b4fa20 100755
--- a/tests/queries/0_stateless/00738_lock_for_inner_table.sh
+++ b/tests/queries/0_stateless/00738_lock_for_inner_table.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-ordinary-database
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -11,10 +13,9 @@ uuid=$(${CLICKHOUSE_CLIENT} --query "SELECT reinterpretAsUUID(currentDatabase())
 
 echo "DROP TABLE IF EXISTS tab_00738 SYNC;
 DROP TABLE IF EXISTS mv SYNC;
--- create table with fsync and 20 partitions for slower INSERT
--- (since increasing number of records will make it significantly slower in debug build, but not in release)
-CREATE TABLE tab_00738(a Int) ENGINE = MergeTree() ORDER BY a PARTITION BY a%20 SETTINGS fsync_after_insert=1;
-CREATE MATERIALIZED VIEW mv UUID '$uuid' ENGINE = Log AS SELECT a FROM tab_00738;" | ${CLICKHOUSE_CLIENT} -n
+CREATE TABLE tab_00738(a Int) ENGINE = MergeTree() ORDER BY a;
+-- The matview will take at least 2 seconds to be finished (10000000 * 0.0000002)
+CREATE MATERIALIZED VIEW mv UUID '$uuid' ENGINE = Log AS SELECT sleepEachRow(0.0000002) FROM tab_00738;" | ${CLICKHOUSE_CLIENT} -n
 
 ${CLICKHOUSE_CLIENT} --query_id insert_$CLICKHOUSE_DATABASE --query "INSERT INTO tab_00738 SELECT number FROM numbers(10000000)" &
 
diff --git a/tests/queries/0_stateless/00740_database_in_nested_view.sql b/tests/queries/0_stateless/00740_database_in_nested_view.sql
index 0106196279f..1890baafaa1 100644
--- a/tests/queries/0_stateless/00740_database_in_nested_view.sql
+++ b/tests/queries/0_stateless/00740_database_in_nested_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE test_00740;
 USE test_00740;
 
diff --git a/tests/queries/0_stateless/00741_client_comment_multiline.sql b/tests/queries/0_stateless/00741_client_comment_multiline.sql
index 9e481efe388..9fe4a4cb4ba 100644
--- a/tests/queries/0_stateless/00741_client_comment_multiline.sql
+++ b/tests/queries/0_stateless/00741_client_comment_multiline.sql
@@ -1,2 +1,4 @@
+-- Tags: no-parallel, no-fasttest
+
 CREATE DATABASE IF NOT EXISTS test_00741; -- foo
 DROP DATABASE test_00741;
diff --git a/tests/queries/0_stateless/00746_hashing_tuples.sql b/tests/queries/0_stateless/00746_hashing_tuples.sql
index d612d207ba3..fe6c7e373b4 100644
--- a/tests/queries/0_stateless/00746_hashing_tuples.sql
+++ b/tests/queries/0_stateless/00746_hashing_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT sipHash64(1, 2, 3);
 SELECT sipHash64(1, 3, 2);
 SELECT sipHash64(('a', [1, 2, 3], 4, (4, ['foo', 'bar'], 1, (1, 2))));
diff --git a/tests/queries/0_stateless/00751_default_databasename_for_view.sql b/tests/queries/0_stateless/00751_default_databasename_for_view.sql
index 5fa43555b2b..9292b612d87 100644
--- a/tests/queries/0_stateless/00751_default_databasename_for_view.sql
+++ b/tests/queries/0_stateless/00751_default_databasename_for_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00751;
 USE test_00751;
 
diff --git a/tests/queries/0_stateless/00751_hashing_ints.sql b/tests/queries/0_stateless/00751_hashing_ints.sql
index be3268da29d..fc1564c0243 100644
--- a/tests/queries/0_stateless/00751_hashing_ints.sql
+++ b/tests/queries/0_stateless/00751_hashing_ints.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT halfMD5(123456);
 SELECT sipHash64(123456);
 SELECT cityHash64(123456);
diff --git a/tests/queries/0_stateless/00753_alter_attach.sql b/tests/queries/0_stateless/00753_alter_attach.sql
index 86388396410..ca43fb3aeae 100644
--- a/tests/queries/0_stateless/00753_alter_attach.sql
+++ b/tests/queries/0_stateless/00753_alter_attach.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS alter_attach;
 CREATE TABLE alter_attach (x UInt64, p UInt8) ENGINE = MergeTree ORDER BY tuple() PARTITION BY p;
 INSERT INTO alter_attach VALUES (1, 1), (2, 1), (3, 1);
diff --git a/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference b/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference
index 74aa60a41f2..9bf0304d7d7 100644
--- a/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference
+++ b/tests/queries/0_stateless/00753_comment_columns_zookeeper.reference
@@ -1,6 +1,6 @@
-CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_00753/comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
+CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00753/comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
 column_name1	UInt8	DEFAULT	1	comment		
 column_name2	UInt8			non default comment		
-CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'another comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'clickhouse/tables/test_00753/comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
+CREATE TABLE default.check_comments\n(\n    `column_name1` UInt8 DEFAULT 1 COMMENT \'another comment\',\n    `column_name2` UInt8 COMMENT \'non default comment\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00753/comments\', \'r1\')\nORDER BY column_name1\nSETTINGS index_granularity = 8192
 column_name1	UInt8	DEFAULT	1	another comment		
 column_name2	UInt8			non default comment		
diff --git a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
index e98630bb00d..6b785d2f399 100644
--- a/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
+++ b/tests/queries/0_stateless/00753_comment_columns_zookeeper.sql
@@ -1,10 +1,12 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS check_comments;
 
 CREATE TABLE check_comments
   (
     column_name1 UInt8 DEFAULT 1 COMMENT 'comment',
     column_name2 UInt8 COMMENT 'non default comment'
-  ) ENGINE = ReplicatedMergeTree('clickhouse/tables/test_00753/comments', 'r1')
+  ) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00753/comments', 'r1')
     ORDER BY column_name1;
 
 SHOW CREATE check_comments;
diff --git a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
index fd9786be011..4cc330c703d 100644
--- a/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
+++ b/tests/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'Check total_bytes/total_rows for Distributed';
 CREATE TABLE check_system_tables_null (key Int) Engine=Null();
 CREATE TABLE check_system_tables AS check_system_tables_null Engine=Distributed(test_shard_localhost, currentDatabase(), check_system_tables_null);
diff --git a/tests/queries/0_stateless/00753_quantile_format.reference b/tests/queries/0_stateless/00753_quantile_format.reference
index d3503745e4b..cd662caf5c7 100644
--- a/tests/queries/0_stateless/00753_quantile_format.reference
+++ b/tests/queries/0_stateless/00753_quantile_format.reference
@@ -16,3 +16,5 @@
 ['2016-06-15 23:00:16']
 2016-04-02 17:23:12
 ['2016-04-02 17:23:12']
+2016-04-02 17:23:12
+['2016-04-02 17:23:12']
diff --git a/tests/queries/0_stateless/00753_quantile_format.sql b/tests/queries/0_stateless/00753_quantile_format.sql
index f72ecc8a49f..8caa3f31368 100644
--- a/tests/queries/0_stateless/00753_quantile_format.sql
+++ b/tests/queries/0_stateless/00753_quantile_format.sql
@@ -30,4 +30,7 @@ SELECT quantilesTDigestWeighted(0.2)(d, 1) FROM datetime;
 SELECT quantileBFloat16(0.2)(d) FROM datetime;
 SELECT quantilesBFloat16(0.2)(d) FROM datetime;
 
+SELECT quantileBFloat16Weighted(0.2)(d, 1) FROM datetime;
+SELECT quantilesBFloat16Weighted(0.2)(d, 1) FROM datetime;
+
 DROP TABLE datetime;
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
index 1037b5a6381..dc54e4630d6 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS check_system_tables;
 
 -- Check MergeTree declaration in new format
diff --git a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
index 4aa7ab8ad64..d7b154bc6ac 100644
--- a/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_column_partitions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- check ALTER MODIFY COLUMN with partitions
 
 SET send_logs_level = 'fatal';
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.reference
similarity index 62%
rename from tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference
rename to tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.reference
index 48fe2d30bf3..a1fecd72e30 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.reference
@@ -9,6 +9,6 @@
 1	2	1	30
 1	2	4	90
 *** Check SHOW CREATE TABLE ***
-CREATE TABLE default.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/test_00754/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, -z)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/default/test_00754/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, -z)\nSETTINGS index_granularity = 8192
 *** Check SHOW CREATE TABLE after offline ALTER ***
-CREATE TABLE default.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `t` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/test_00754/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, t * t)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.summing_r2\n(\n    `x` UInt32,\n    `y` UInt32,\n    `z` UInt32,\n    `t` UInt32,\n    `val` UInt32\n)\nENGINE = ReplicatedSummingMergeTree(\'/clickhouse/tables/default/test_00754/summing\', \'r2\')\nPRIMARY KEY (x, y)\nORDER BY (x, y, t * t)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
similarity index 84%
rename from tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql
rename to tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
index 809adfaa498..8c19e30249f 100644
--- a/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
@@ -1,16 +1,19 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 SET optimize_on_insert = 0;
 
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS old_style;
-CREATE TABLE old_style(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00754/old_style', 'r1', d, x, 8192);
+CREATE TABLE old_style(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00754/old_style', 'r1', d, x, 8192);
 ALTER TABLE old_style ADD COLUMN y UInt32, MODIFY ORDER BY (x, y); -- { serverError 36 }
 DROP TABLE old_style;
 
 DROP TABLE IF EXISTS summing_r1;
 DROP TABLE IF EXISTS summing_r2;
-CREATE TABLE summing_r1(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/test_00754/summing', 'r1') ORDER BY (x, y);
-CREATE TABLE summing_r2(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/test_00754/summing', 'r2') ORDER BY (x, y);
+CREATE TABLE summing_r1(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/{database}/test_00754/summing', 'r1') ORDER BY (x, y);
+CREATE TABLE summing_r2(x UInt32, y UInt32, val UInt32) ENGINE ReplicatedSummingMergeTree('/clickhouse/tables/{database}/test_00754/summing', 'r2') ORDER BY (x, y);
 
 /* Can't add an expression with existing column to ORDER BY. */
 ALTER TABLE summing_r1 MODIFY ORDER BY (x, y, -val); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
index 55b74e055db..09f20284402 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
index ecf75352ca9..035907bddd7 100755
--- a/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
+++ b/tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
index 6a1b367abba..1430d10cdb0 100644
--- a/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
+++ b/tests/queries/0_stateless/00760_insert_json_with_defaults.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET input_format_defaults_for_omitted_fields=1;
 
 DROP TABLE IF EXISTS defaults;
diff --git a/tests/queries/0_stateless/00763_lock_buffer_long.reference b/tests/queries/0_stateless/00763_lock_buffer_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00763_lock_buffer.sh b/tests/queries/0_stateless/00763_lock_buffer_long.sh
similarity index 93%
rename from tests/queries/0_stateless/00763_lock_buffer.sh
rename to tests/queries/0_stateless/00763_lock_buffer_long.sh
index 44660035208..50680724149 100755
--- a/tests/queries/0_stateless/00763_lock_buffer.sh
+++ b/tests/queries/0_stateless/00763_lock_buffer_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -18,7 +20,7 @@ function thread1()
 
 function thread2()
 {
-    seq 1 1000 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473'
+    seq 1 1000 | sed -r -e 's/.+/SELECT count() FROM buffer_00763_2;/' | ${CLICKHOUSE_CLIENT} --multiquery --server_logs_file='/dev/null' --ignore-error 2>&1 | grep -vP '^0$|^10$|^Received exception|^Code: 60|^Code: 218|^Code: 473' | grep -v '(query: '
 }
 
 thread1 &
diff --git a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
index 65dd2474580..9ff759a034c 100755
--- a/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+++ b/tests/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
+
 set -e
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
diff --git a/tests/queries/0_stateless/00800_function_java_hash.sql b/tests/queries/0_stateless/00800_function_java_hash.sql
index 42435ca42e8..ec26895ed60 100644
--- a/tests/queries/0_stateless/00800_function_java_hash.sql
+++ b/tests/queries/0_stateless/00800_function_java_hash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 select javaHash('abc');
 select javaHash('874293087');
 select javaHashUTF16LE(convertCharset('a1가', 'utf-8', 'utf-16le'));
diff --git a/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql b/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
index 196dfd84c7f..600793853ca 100644
--- a/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
+++ b/tests/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET insert_distributed_sync = 1;
 
 DROP TABLE IF EXISTS low_cardinality;
diff --git a/tests/queries/0_stateless/00800_versatile_storage_join.sql b/tests/queries/0_stateless/00800_versatile_storage_join.sql
index b0ec6f69f93..3690ea6bf89 100644
--- a/tests/queries/0_stateless/00800_versatile_storage_join.sql
+++ b/tests/queries/0_stateless/00800_versatile_storage_join.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00800;
 
 USE test_00800;
diff --git a/tests/queries/0_stateless/00803_odbc_driver_2_format.sql b/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
index 58004c04e66..86c3864f359 100644
--- a/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
+++ b/tests/queries/0_stateless/00803_odbc_driver_2_format.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 SELECT 1 AS x, [2, 3] AS y, 'Hello' AS z, NULL AS a FORMAT ODBCDriver2;
 SELECT number % 10 AS k, count() AS c FROM numbers(100) GROUP BY k WITH TOTALS FORMAT ODBCDriver2;
diff --git a/tests/queries/0_stateless/00803_xxhash.sql b/tests/queries/0_stateless/00803_xxhash.sql
index 2e6a1710e3c..f8b2b223a6e 100644
--- a/tests/queries/0_stateless/00803_xxhash.sql
+++ b/tests/queries/0_stateless/00803_xxhash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 SELECT hex(xxHash64('')) = upper('ef46db3751d8e999');
 SELECT hex(xxHash32('')) = upper('02cc5d05');
 
diff --git a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
index 2a1b9e55b9a..9e911262ed7 100644
--- a/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_alter_compression_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS alter_compression_codec;
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codecs.reference b/tests/queries/0_stateless/00804_test_custom_compression_codecs.reference
index 6470739db21..7bd91e5a69b 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codecs.reference
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codecs.reference
@@ -11,7 +11,7 @@
 9175437371954010821
 CREATE TABLE default.compression_codec_multiple_more_types\n(\n    `id` Decimal(38, 13) CODEC(ZSTD(1), LZ4, ZSTD(1), ZSTD(1), Delta(2), Delta(4), Delta(1), LZ4HC(0)),\n    `data` FixedString(12) CODEC(ZSTD(1), ZSTD(1), NONE, NONE, NONE, LZ4HC(0)),\n    `ddd.age` Array(UInt8) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8)),\n    `ddd.Name` Array(String) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1.5555555555555	hello world!	[77]	['John']
-7.1000000000000	xxxxxxxxxxxx	[127]	['Henry']
+7.1	xxxxxxxxxxxx	[127]	['Henry']
 !
 222
 !ZSTD
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
index 87862f46e05..c3573588ae9 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
index fba6a216762..9331e39f8d7 100644
--- a/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
+++ b/tests/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
diff --git a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
index 6da43298347..044d60aeafb 100644
--- a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
+++ b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SET joined_subquery_requires_alias = 0;
 
diff --git a/tests/queries/0_stateless/00805_round_down.reference b/tests/queries/0_stateless/00805_round_down.reference
index 0ed04c7757f..dafbf4255fc 100644
--- a/tests/queries/0_stateless/00805_round_down.reference
+++ b/tests/queries/0_stateless/00805_round_down.reference
@@ -51,33 +51,33 @@
 7	6.25
 8	7.5
 9	8.75
-0.00000	4.00000
-0.01000	4.00000
-0.02000	4.00000
-0.03000	4.00000
-0.04000	4.00000
-0.05000	4.00000
-0.06000	4.00000
-0.07000	4.00000
-0.08000	4.00000
-0.09000	4.00000
-0.00000	0.04000
-0.01000	0.04000
-0.02000	0.04000
-0.03000	0.04000
-0.04000	0.04000
-0.05000	0.05000
-0.06000	0.06000
-0.07000	0.06000
-0.08000	0.06000
-0.09000	0.06000
-0.00000	0.04000
-0.01000	0.04000
-0.02000	0.04000
-0.03000	0.04000
-0.04000	0.04000
-0.05000	0.05000
-0.06000	0.06000
-0.07000	0.06000
-0.08000	0.06000
-0.09000	0.06000
+0	4
+0.01	4
+0.02	4
+0.03	4
+0.04	4
+0.05	4
+0.06	4
+0.07	4
+0.08	4
+0.09	4
+0	0.04
+0.01	0.04
+0.02	0.04
+0.03	0.04
+0.04	0.04
+0.05	0.05
+0.06	0.06
+0.07	0.06
+0.08	0.06
+0.09	0.06
+0	0.04
+0.01	0.04
+0.02	0.04
+0.03	0.04
+0.04	0.04
+0.05	0.05
+0.06	0.06
+0.07	0.06
+0.08	0.06
+0.09	0.06
diff --git a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
index 63897e225ce..5d03823dde3 100644
--- a/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
+++ b/tests/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS part_header_r1;
 DROP TABLE IF EXISTS part_header_r2;
 
diff --git a/tests/queries/0_stateless/00815_left_join_on_stepanel.sql b/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
index 9d2467e3638..13172f8c18d 100644
--- a/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
+++ b/tests/queries/0_stateless/00815_left_join_on_stepanel.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00815;
 USE test_00815;
 
diff --git a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
index b0244991b3c..19d9b006cd7 100755
--- a/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
+++ b/tests/queries/0_stateless/00816_long_concurrent_alter_column.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/00818_alias_bug_4110.reference b/tests/queries/0_stateless/00818_alias_bug_4110.reference
index e6013d269c2..210fc67db66 100644
--- a/tests/queries/0_stateless/00818_alias_bug_4110.reference
+++ b/tests/queries/0_stateless/00818_alias_bug_4110.reference
@@ -4,7 +4,6 @@
 11	12
 12	11
 10	10
-10	11	11
 12	11
 10	12
 11	12
diff --git a/tests/queries/0_stateless/00818_alias_bug_4110.sql b/tests/queries/0_stateless/00818_alias_bug_4110.sql
index 7b2fd5d3864..df7e70cb275 100644
--- a/tests/queries/0_stateless/00818_alias_bug_4110.sql
+++ b/tests/queries/0_stateless/00818_alias_bug_4110.sql
@@ -5,7 +5,7 @@ select s.a + 1 as b, s.a + 2 as a from (select 10 as a) s;
 select s.a + 2 as b, s.a + 1 as a from (select 10 as a) s;
 
 select a, a as a from (select 10 as a);
-select s.a, a, a + 1 as a from (select 10 as a) as s;
+select s.a, a, a + 1 as a from (select 10 as a) as s; -- { serverError 352 }
 select s.a + 2 as b, b - 1 as a from (select 10 as a) s;
 select s.a as a, s.a + 2 as b from (select 10 as a) s;
 select s.a + 1 as a, s.a + 2 as b from (select 10 as a) s;
diff --git a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
index f84c20feaea..39242194486 100644
--- a/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
+++ b/tests/queries/0_stateless/00821_distributed_storage_with_join_on.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- NOTE: database = currentDatabase() is not mandatory
 
 DROP TABLE IF EXISTS table1;
diff --git a/tests/queries/0_stateless/00823_capnproto_input.sh b/tests/queries/0_stateless/00823_capnproto_input.sh
index b86c8882bbd..11417852076 100755
--- a/tests/queries/0_stateless/00823_capnproto_input.sh
+++ b/tests/queries/0_stateless/00823_capnproto_input.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan, no-msan, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
index 762f8a937e4..5c2804bdcae 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_3dim.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
index 243446f9438..bd208195acc 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/9069
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
index 300f82e5ca2..2731e4bcce3 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/7438
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_map.sh b/tests/queries/0_stateless/00825_protobuf_format_map.sh
index 877fe73603e..2a84772bc9f 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_map.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_map.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
index 9d382f8c589..f1567128cf4 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/11117
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
index b33db75b5c9..1b94ebd79f2 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_nested_optional.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # https://github.com/ClickHouse/ClickHouse/issues/6497
 
diff --git a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
index 1e8ef28a48e..a16345c4bb1 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.reference b/tests/queries/0_stateless/00825_protobuf_format_persons.reference
index 711980b3592..897fd9476e9 100644
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.reference
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.reference
@@ -1,6 +1,6 @@
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	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]
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753215,37.622504]	3.14	214.1	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
 c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970682,33.074981]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970682,33.074981]	3.14159265358979	100000000000	800	-3.2	154400000	['pound']	[16]	503	[]
 
 Schema 00825_protobuf_format_persons:Person
 
@@ -150,9 +150,9 @@ nestiness {
 Binary representation is as expected
 
 Roundtrip:
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.1	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
 c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970680,33.074982]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.97068,33.074982]	3.14159265358979	100000000000	800	-3.2	154400000	['pound']	[16]	503	[]
 
 Schema 00825_protobuf_format_persons:AltPerson
 
@@ -264,14 +264,14 @@ nestiness_a_b_c_d: 503
 Binary representation is as expected
 
 Roundtrip:
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	\N	74951234567\0\0	1	2019-01-05 18:45:00	38	capricorn	[]	[255,0,0]		[55.000000,37.000000]	3.140000104904175	214.00	0.1	5.0	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
-c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	\N	\N	0	\N	26	pisces	[]	[100,200,50]		[50.000000,-4.000000]	3.141590118408203	\N	0.007	5.0	-20000000000000	[]	[]	\N	[]
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	\N	442012345678\0	1	2018-12-30 00:00:00	23	leo	[]	[250,244,10]		[68.000000,33.000000]	3.1415927410125732	100000000000.00	800	-3.0	154400000	['pound']	[16]	503	[]
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	\N	74951234567\0\0	1	2019-01-05 18:45:00	38	capricorn	[]	[255,0,0]		[55,37]	3.140000104904175	214	0.1	5	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	\N	\N	0	\N	26	pisces	[]	[100,200,50]		[50,-4]	3.141590118408203	\N	0.007	5	-20000000000000	[]	[]	\N	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	\N	442012345678\0	1	2018-12-30 00:00:00	23	leo	[]	[250,244,10]		[68,33]	3.1415927410125732	100000000000	800	-3	154400000	['pound']	[16]	503	[]
 
 Schema 00825_protobuf_format_persons:StrPerson
 
 Binary representation:
-00000000  a7 02 0a 24 61 37 35 32  32 31 35 38 2d 33 64 34  |...$a7522158-3d4|
+00000000  a6 02 0a 24 61 37 35 32  32 31 35 38 2d 33 64 34  |...$a7522158-3d4|
 00000010  31 2d 34 62 37 37 2d 61  64 36 39 2d 36 63 35 39  |1-4b77-ad69-6c59|
 00000020  38 65 65 35 35 63 34 39  12 04 49 76 61 6e 1a 06  |8ee55c49..Ivan..|
 00000030  50 65 74 72 6f 76 22 04  6d 61 6c 65 2a 0a 31 39  |Petrov".male*.19|
@@ -283,42 +283,42 @@ Binary representation:
 00000090  72 73 6a 03 32 35 35 6a  01 30 6a 01 30 72 06 4d  |rsj.255j.0j.0r.M|
 000000a0  6f 73 63 6f 77 7a 09 35  35 2e 37 35 33 32 31 35  |oscowz.55.753215|
 000000b0  7a 09 33 37 2e 36 32 32  35 30 34 82 01 04 33 2e  |z.37.622504...3.|
-000000c0  31 34 8a 01 06 32 31 34  2e 31 30 92 01 03 30 2e  |14...214.10...0.|
-000000d0  31 9a 01 03 35 2e 38 a2  01 0b 31 37 30 36 30 30  |1...5.8...170600|
-000000e0  30 30 30 30 30 aa 01 2d  0a 05 6d 65 74 65 72 0a  |00000..-..meter.|
-000000f0  0a 63 65 6e 74 69 6d 65  74 65 72 0a 09 6b 69 6c  |.centimeter..kil|
-00000100  6f 6d 65 74 65 72 12 01  31 12 04 30 2e 30 31 12  |ometer..1..0.01.|
-00000110  04 31 30 30 30 b2 01 11  0a 0f 0a 03 35 30 30 12  |.1000.......500.|
-00000120  03 35 30 31 12 03 35 30  32 b4 01 0a 24 63 36 39  |.501..502...$c69|
-00000130  34 61 64 38 61 2d 66 37  31 34 2d 34 65 61 33 2d  |4ad8a-f714-4ea3-|
-00000140  39 30 37 64 2d 66 64 35  34 66 62 32 35 64 39 62  |907d-fd54fb25d9b|
-00000150  35 12 07 4e 61 74 61 6c  69 61 1a 08 53 6f 6b 6f  |5..Natalia..Soko|
-00000160  6c 6f 76 61 22 06 66 65  6d 61 6c 65 2a 0a 31 39  |lova".female*.19|
-00000170  39 32 2d 30 33 2d 30 38  42 01 30 52 02 32 36 5a  |92-03-08B.0R.26Z|
-00000180  06 70 69 73 63 65 73 6a  03 31 30 30 6a 03 32 30  |.piscesj.100j.20|
-00000190  30 6a 02 35 30 72 08 50  6c 79 6d 6f 75 74 68 7a  |0j.50r.Plymouthz|
-000001a0  09 35 30 2e 34 30 33 37  32 34 7a 09 2d 34 2e 31  |.50.403724z.-4.1|
-000001b0  34 32 31 32 33 82 01 07  33 2e 31 34 31 35 39 92  |42123...3.14159.|
-000001c0  01 05 30 2e 30 30 37 9a  01 03 35 2e 34 a2 01 0f  |..0.007...5.4...|
-000001d0  2d 32 30 30 30 30 30 30  30 30 30 30 30 30 30 84  |-20000000000000.|
-000001e0  02 0a 24 61 37 64 61 31  61 61 36 2d 66 34 32 35  |..$a7da1aa6-f425|
-000001f0  2d 34 37 38 39 2d 38 39  34 37 2d 62 30 33 34 37  |-4789-8947-b0347|
-00000200  38 36 65 64 33 37 34 12  06 56 61 73 69 6c 79 1a  |86ed374..Vasily.|
-00000210  07 53 69 64 6f 72 6f 76  22 04 6d 61 6c 65 2a 0a  |.Sidorov".male*.|
-00000220  31 39 39 35 2d 30 37 2d  32 38 3a 0d 2b 34 34 32  |1995-07-28:.+442|
-00000230  30 31 32 33 34 35 36 37  38 42 01 31 4a 13 32 30  |012345678B.1J.20|
-00000240  31 38 2d 31 32 2d 33 30  20 30 30 3a 30 30 3a 30  |18-12-30 00:00:0|
-00000250  30 52 02 32 33 5a 03 6c  65 6f 62 05 53 75 6e 6e  |0R.23Z.leob.Sunn|
-00000260  79 6a 03 32 35 30 6a 03  32 34 34 6a 02 31 30 72  |yj.250j.244j.10r|
-00000270  08 4d 75 72 6d 61 6e 73  6b 7a 09 36 38 2e 39 37  |.Murmanskz.68.97|
-00000280  30 36 38 32 7a 09 33 33  2e 30 37 34 39 38 31 82  |0682z.33.074981.|
-00000290  01 10 33 2e 31 34 31 35  39 32 36 35 33 35 38 39  |..3.141592653589|
-000002a0  37 39 8a 01 0f 31 30 30  30 30 30 30 30 30 30 30  |79...10000000000|
-000002b0  30 2e 30 30 92 01 03 38  30 30 9a 01 04 2d 33 2e  |0.00...800...-3.|
-000002c0  32 a2 01 09 31 35 34 34  30 30 30 30 30 aa 01 0b  |2...154400000...|
-000002d0  0a 05 70 6f 75 6e 64 12  02 31 36 b2 01 07 0a 05  |..pound..16.....|
-000002e0  0a 03 35 30 33                                    |..503|
-000002e5
+000000c0  31 34 8a 01 05 32 31 34  2e 31 92 01 03 30 2e 31  |14...214.1...0.1|
+000000d0  9a 01 03 35 2e 38 a2 01  0b 31 37 30 36 30 30 30  |...5.8...1706000|
+000000e0  30 30 30 30 aa 01 2d 0a  05 6d 65 74 65 72 0a 0a  |0000..-..meter..|
+000000f0  63 65 6e 74 69 6d 65 74  65 72 0a 09 6b 69 6c 6f  |centimeter..kilo|
+00000100  6d 65 74 65 72 12 01 31  12 04 30 2e 30 31 12 04  |meter..1..0.01..|
+00000110  31 30 30 30 b2 01 11 0a  0f 0a 03 35 30 30 12 03  |1000.......500..|
+00000120  35 30 31 12 03 35 30 32  b4 01 0a 24 63 36 39 34  |501..502...$c694|
+00000130  61 64 38 61 2d 66 37 31  34 2d 34 65 61 33 2d 39  |ad8a-f714-4ea3-9|
+00000140  30 37 64 2d 66 64 35 34  66 62 32 35 64 39 62 35  |07d-fd54fb25d9b5|
+00000150  12 07 4e 61 74 61 6c 69  61 1a 08 53 6f 6b 6f 6c  |..Natalia..Sokol|
+00000160  6f 76 61 22 06 66 65 6d  61 6c 65 2a 0a 31 39 39  |ova".female*.199|
+00000170  32 2d 30 33 2d 30 38 42  01 30 52 02 32 36 5a 06  |2-03-08B.0R.26Z.|
+00000180  70 69 73 63 65 73 6a 03  31 30 30 6a 03 32 30 30  |piscesj.100j.200|
+00000190  6a 02 35 30 72 08 50 6c  79 6d 6f 75 74 68 7a 09  |j.50r.Plymouthz.|
+000001a0  35 30 2e 34 30 33 37 32  34 7a 09 2d 34 2e 31 34  |50.403724z.-4.14|
+000001b0  32 31 32 33 82 01 07 33  2e 31 34 31 35 39 92 01  |2123...3.14159..|
+000001c0  05 30 2e 30 30 37 9a 01  03 35 2e 34 a2 01 0f 2d  |.0.007...5.4...-|
+000001d0  32 30 30 30 30 30 30 30  30 30 30 30 30 30 81 02  |20000000000000..|
+000001e0  0a 24 61 37 64 61 31 61  61 36 2d 66 34 32 35 2d  |.$a7da1aa6-f425-|
+000001f0  34 37 38 39 2d 38 39 34  37 2d 62 30 33 34 37 38  |4789-8947-b03478|
+00000200  36 65 64 33 37 34 12 06  56 61 73 69 6c 79 1a 07  |6ed374..Vasily..|
+00000210  53 69 64 6f 72 6f 76 22  04 6d 61 6c 65 2a 0a 31  |Sidorov".male*.1|
+00000220  39 39 35 2d 30 37 2d 32  38 3a 0d 2b 34 34 32 30  |995-07-28:.+4420|
+00000230  31 32 33 34 35 36 37 38  42 01 31 4a 13 32 30 31  |12345678B.1J.201|
+00000240  38 2d 31 32 2d 33 30 20  30 30 3a 30 30 3a 30 30  |8-12-30 00:00:00|
+00000250  52 02 32 33 5a 03 6c 65  6f 62 05 53 75 6e 6e 79  |R.23Z.leob.Sunny|
+00000260  6a 03 32 35 30 6a 03 32  34 34 6a 02 31 30 72 08  |j.250j.244j.10r.|
+00000270  4d 75 72 6d 61 6e 73 6b  7a 09 36 38 2e 39 37 30  |Murmanskz.68.970|
+00000280  36 38 32 7a 09 33 33 2e  30 37 34 39 38 31 82 01  |682z.33.074981..|
+00000290  10 33 2e 31 34 31 35 39  32 36 35 33 35 38 39 37  |.3.1415926535897|
+000002a0  39 8a 01 0c 31 30 30 30  30 30 30 30 30 30 30 30  |9...100000000000|
+000002b0  92 01 03 38 30 30 9a 01  04 2d 33 2e 32 a2 01 09  |...800...-3.2...|
+000002c0  31 35 34 34 30 30 30 30  30 aa 01 0b 0a 05 70 6f  |154400000.....po|
+000002d0  75 6e 64 12 02 31 36 b2  01 07 0a 05 0a 03 35 30  |und..16.......50|
+000002e0  33                                                |3|
+000002e1
 
 MESSAGE #1 AT 0x00000002
 uuid: "a7522158-3d41-4b77-ad69-6c598ee55c49"
@@ -340,7 +340,7 @@ hometown: "Moscow"
 location: "55.753215"
 location: "37.622504"
 pi: "3.14"
-lotteryWin: "214.10"
+lotteryWin: "214.1"
 someRatio: "0.1"
 temperature: "5.8"
 randomBigNumber: "17060000000"
@@ -359,7 +359,7 @@ nestiness_a {
     e: "502"
   }
 }
-MESSAGE #2 AT 0x0000012B
+MESSAGE #2 AT 0x0000012A
 uuid: "c694ad8a-f714-4ea3-907d-fd54fb25d9b5"
 name: "Natalia"
 surname: "Sokolova"
@@ -378,7 +378,7 @@ pi: "3.14159"
 someRatio: "0.007"
 temperature: "5.4"
 randomBigNumber: "-20000000000000"
-MESSAGE #3 AT 0x000001E1
+MESSAGE #3 AT 0x000001E0
 uuid: "a7da1aa6-f425-4789-8947-b034786ed374"
 name: "Vasily"
 surname: "Sidorov"
@@ -397,7 +397,7 @@ hometown: "Murmansk"
 location: "68.970682"
 location: "33.074981"
 pi: "3.14159265358979"
-lotteryWin: "100000000000.00"
+lotteryWin: "100000000000"
 someRatio: "800"
 temperature: "-3.2"
 randomBigNumber: "154400000"
@@ -414,9 +414,9 @@ nestiness_a {
 Binary representation is as expected
 
 Roundtrip:
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	\N	+74951234567\0	1	2019-01-05 18:45:00	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]
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	\N	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753215,37.622504]	3.14	214.1	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
 c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	\N	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	\N	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970682,33.074981]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	\N	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970682,33.074981]	3.14159265358979	100000000000	800	-3.2	154400000	['pound']	[16]	503	[]
 
 Schema 00825_protobuf_format_syntax2:Syntax2Person
 
@@ -564,6 +564,6 @@ Nestiness {
 Binary representation is as expected
 
 Roundtrip:
-a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.10	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
+a7522158-3d41-4b77-ad69-6c598ee55c49	Ivan	Petrov	male	1980-12-29	png	+74951234567\0	1	2019-01-05 18:45:00	38	capricorn	['Yesterday','Flowers']	[255,0,0]	Moscow	[55.753216,37.622504]	3.14	214.1	0.1	5.8	17060000000	['meter','centimeter','kilometer']	[1,0.01,1000]	500	[501,502]
 c694ad8a-f714-4ea3-907d-fd54fb25d9b5	Natalia	Sokolova	female	1992-03-08	jpg	\N	0	\N	26	pisces	[]	[100,200,50]	Plymouth	[50.403724,-4.142123]	3.14159	\N	0.007	5.4	-20000000000000	[]	[]	\N	[]
-a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.970680,33.074982]	3.14159265358979	100000000000.00	800	-3.2	154400000	['pound']	[16]	503	[]
+a7da1aa6-f425-4789-8947-b034786ed374	Vasily	Sidorov	male	1995-07-28	bmp	+442012345678	1	2018-12-30 00:00:00	23	leo	['Sunny']	[250,244,10]	Murmansk	[68.97068,33.074982]	3.14159265358979	100000000000	800	-3.2	154400000	['pound']	[16]	503	[]
diff --git a/tests/queries/0_stateless/00825_protobuf_format_persons.sh b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
index fb099a6479e..bb376e6ed70 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_persons.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_persons.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 # To generate reference file for this test use the following commands:
 # ninja ProtobufDelimitedMessagesSerializer
diff --git a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
index ca915aca944..0cf33c91465 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_squares.sh b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
index d3ff3ad2f4f..cc54a62e07f 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_squares.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_squares.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
index 96664ca7f20..09271e81ab1 100755
--- a/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
+++ b/tests/queries/0_stateless/00825_protobuf_format_table_default.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 SCHEMADIR=$CURDIR/format_schemas
diff --git a/tests/queries/0_stateless/00826_cross_to_inner_join.reference b/tests/queries/0_stateless/00826_cross_to_inner_join.reference
index 973c5b078a3..a47d9a430dc 100644
--- a/tests/queries/0_stateless/00826_cross_to_inner_join.reference
+++ b/tests/queries/0_stateless/00826_cross_to_inner_join.reference
@@ -146,7 +146,7 @@ SELECT
     t2_00826.b
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON b = t2_00826.a
-WHERE (b = t2_00826.a) AND (isNull(t2_00826.b) OR (t2_00826.b > t2_00826.a))
+WHERE (b = t2_00826.a) AND ((t2_00826.b IS NULL) OR (t2_00826.b > t2_00826.a))
 --- do not rewrite alias ---
 SELECT a AS b
 FROM t1_00826
@@ -178,4 +178,4 @@ SELECT
     t2_00826.b
 FROM t1_00826
 ALL INNER JOIN t2_00826 ON a = t2_00826.a
-WHERE (a = t2_00826.a) AND (isNull(t2_00826.b) OR (t2_00826.b < 2))
+WHERE (a = t2_00826.a) AND ((t2_00826.b IS NULL) OR (t2_00826.b < 2))
diff --git a/tests/queries/0_stateless/00829_bitmap_function.reference b/tests/queries/0_stateless/00829_bitmap_function.reference
index 02633af568d..f403907bce4 100644
--- a/tests/queries/0_stateless/00829_bitmap_function.reference
+++ b/tests/queries/0_stateless/00829_bitmap_function.reference
@@ -91,6 +91,14 @@ tag4	[0,1,2,3,4,5,6,7,8,9]	[5,999,2]	[2,888,20]	[0,1,3,4,6,7,8,9,20]
 [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,100,200,500]
 [30,31,32,33,100,200,500]
 [100,200,500]
+[]
+[]
+[1,5,7,9]
+[5,7,9]
+[5,7]
+[0,1,2,3,4,5,6,7,8,9]
+[30,31,32,33,100,200,500]
+[100,200,500]
 0
 0
 0
diff --git a/tests/queries/0_stateless/00829_bitmap_function.sql b/tests/queries/0_stateless/00829_bitmap_function.sql
index b9e9664a56e..fde0176de5b 100644
--- a/tests/queries/0_stateless/00829_bitmap_function.sql
+++ b/tests/queries/0_stateless/00829_bitmap_function.sql
@@ -286,6 +286,25 @@ select bitmapToArray(bitmapSubsetLimit(bitmapBuild([
     0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,
     100,200,500]), toUInt32(100), toUInt16(200)));
 
+-- subBitmap:
+---- Empty
+SELECT bitmapToArray(subBitmap(bitmapBuild(emptyArrayUInt32()), toUInt8(0), toUInt32(10)));
+SELECT bitmapToArray(subBitmap(bitmapBuild(emptyArrayUInt16()), toUInt32(0), toUInt64(10)));
+---- Small
+select bitmapToArray(subBitmap(bitmapBuild([1,5,7,9]), toUInt8(0), toUInt32(4)));
+select bitmapToArray(subBitmap(bitmapBuild([1,5,7,9]), toUInt32(1), toUInt64(4)));
+select bitmapToArray(subBitmap(bitmapBuild([1,5,7,9]), toUInt16(1), toUInt32(2)));
+---- Large
+select bitmapToArray(subBitmap(bitmapBuild([
+    0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,
+    100,200,500]), toUInt32(0), toUInt32(10)));
+select bitmapToArray(subBitmap(bitmapBuild([
+    0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,
+    100,200,500]), toUInt32(30), toUInt32(200)));
+select bitmapToArray(subBitmap(bitmapBuild([
+    0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,
+    100,200,500]), toUInt32(34), toUInt16(3)));
+
 -- bitmapMin:
 ---- Empty
 SELECT bitmapMin(bitmapBuild(emptyArrayUInt8()));
diff --git a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
index 3da40f16786..74b4c4052f8 100755
--- a/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
+++ b/tests/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -6,9 +7,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 ${CLICKHOUSE_CURL} --max-time 1 -sS "${CLICKHOUSE_URL}&query_id=cancel_http_readonly_queries_on_client_close&cancel_http_readonly_queries_on_client_close=1&query=SELECT+count()+FROM+system.numbers" 2>&1 | grep -cF 'curl: (28)'
 
-while true
-do
+i=0 retries=300
+while [[ $i -lt $retries ]]; do
     ${CLICKHOUSE_CURL} -sS --data "SELECT count() FROM system.processes WHERE query_id = 'cancel_http_readonly_queries_on_client_close'" "${CLICKHOUSE_URL}" | grep '0' && break
+    ((++i))
     sleep 0.2
 done
 
diff --git a/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh b/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
index be57757af06..abdc95475c7 100755
--- a/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
+++ b/tests/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation.sh b/tests/queries/0_stateless/00834_kill_mutation.sh
index a17d85cf9a5..623016dfcfb 100755
--- a/tests/queries/0_stateless/00834_kill_mutation.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
index 92ab6814235..caad08dcb9d 100755
--- a/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.reference
similarity index 56%
rename from tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference
rename to tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.reference
index 838bd93ebaf..fbe0e7f564f 100644
--- a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference
+++ b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.reference
@@ -1,5 +1,5 @@
-CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	2
 1	2
@@ -14,8 +14,8 @@ CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    I
 3	2
 19	9
 65	75
-CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx3 u64 - i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 + i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	4
 1	5
@@ -28,10 +28,10 @@ CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    I
 3	2
 19	9
 65	75
-CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter1\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	4
 1	5
@@ -44,14 +44,14 @@ CREATE TABLE default.minmax_idx_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    I
 3	2
 19	9
 65	75
-CREATE TABLE default.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32,\n    INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,\n    INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	3
 1	2
 1	3
-CREATE TABLE default.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
-CREATE TABLE default.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00836/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx2\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter2\', \'r1\')\nORDER BY u64\nSETTINGS index_granularity = 8192
+CREATE TABLE default.minmax_idx2_r\n(\n    `u64` UInt64,\n    `i32` Int32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00836/indices_alter2\', \'r2\')\nORDER BY u64\nSETTINGS index_granularity = 8192
 1	2
 1	3
 1	2
diff --git a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
similarity index 87%
rename from tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql
rename to tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
index e038d2d425e..7ea6c2660ed 100644
--- a/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS minmax_idx;
 DROP TABLE IF EXISTS minmax_idx_r;
 DROP TABLE IF EXISTS minmax_idx2;
@@ -9,14 +11,14 @@ CREATE TABLE minmax_idx
 (
     u64 UInt64,
     i32 Int32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter1', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00836/indices_alter1', 'r1')
 ORDER BY u64;
 
 CREATE TABLE minmax_idx_r
 (
     u64 UInt64,
     i32 Int32
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter1', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00836/indices_alter1', 'r2')
 ORDER BY u64;
 
 INSERT INTO minmax_idx VALUES (1, 2);
@@ -74,7 +76,7 @@ CREATE TABLE minmax_idx2
     i32 Int32,
     INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,
     INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter2', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00836/indices_alter2', 'r1')
 ORDER BY u64;
 
 CREATE TABLE minmax_idx2_r
@@ -83,7 +85,7 @@ CREATE TABLE minmax_idx2_r
     i32 Int32,
     INDEX idx1 u64 + i32 TYPE minmax GRANULARITY 10,
     INDEX idx2 u64 * i32 TYPE minmax GRANULARITY 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00836/indices_alter2', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00836/indices_alter2', 'r2')
 ORDER BY u64;
 
 
diff --git a/tests/queries/0_stateless/00837_minmax_index.reference b/tests/queries/0_stateless/00837_minmax_index.reference
index 0f5a8eb904e..8bde896b02a 100644
--- a/tests/queries/0_stateless/00837_minmax_index.reference
+++ b/tests/queries/0_stateless/00837_minmax_index.reference
@@ -1,6 +1,6 @@
-0	5	4.7	6.50	cba	b	2014-01-04
-1	5	4.7	6.50	cba	b	2014-03-11
-11	5	4.7	6.50	cba	b	2014-06-11
-12	5	4.7	6.50	cba	b	2015-01-01
+0	5	4.7	6.5	cba	b	2014-01-04
+1	5	4.7	6.5	cba	b	2014-03-11
+11	5	4.7	6.5	cba	b	2014-06-11
+12	5	4.7	6.5	cba	b	2015-01-01
 		"rows_read": 4,
 		"rows_read": 2,
diff --git a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.reference b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.reference
deleted file mode 100644
index f5df12ad297..00000000000
--- a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.reference
+++ /dev/null
@@ -1,8 +0,0 @@
-0	5	4.7	6.50	cba	b	2014-01-04
-1	5	4.7	6.50	cba	b	2014-03-11
-12	5	4.7	6.50	cba	b	2014-06-11
-13	5	4.7	6.50	cba	b	2015-01-01
-0	5	4.7	6.50	cba	b	2014-01-04
-1	5	4.7	6.50	cba	b	2014-03-11
-12	5	4.7	6.50	cba	b	2014-06-11
-13	5	4.7	6.50	cba	b	2015-01-01
diff --git a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.reference b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.reference
new file mode 100644
index 00000000000..efae13c2a40
--- /dev/null
+++ b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.reference
@@ -0,0 +1,8 @@
+0	5	4.7	6.5	cba	b	2014-01-04
+1	5	4.7	6.5	cba	b	2014-03-11
+12	5	4.7	6.5	cba	b	2014-06-11
+13	5	4.7	6.5	cba	b	2015-01-01
+0	5	4.7	6.5	cba	b	2014-01-04
+1	5	4.7	6.5	cba	b	2014-03-11
+12	5	4.7	6.5	cba	b	2014-06-11
+13	5	4.7	6.5	cba	b	2015-01-01
diff --git a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
similarity index 92%
rename from tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql
rename to tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
index 2213ccecd4e..a2fe1ebd63a 100644
--- a/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS minmax_idx1;
 DROP TABLE IF EXISTS minmax_idx2;
 
@@ -15,7 +17,7 @@ CREATE TABLE minmax_idx1
       idx_all (i32, i32 + f64, d, s, e, dt) TYPE minmax GRANULARITY 1,
     INDEX
       idx_2 (u64 + toYear(dt), substring(s, 2, 4)) TYPE minmax GRANULARITY 3
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00837/minmax', 'r1')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00837/minmax', 'r1')
 ORDER BY u64
 SETTINGS index_granularity = 2;
 
@@ -32,7 +34,7 @@ CREATE TABLE minmax_idx2
       idx_all (i32, i32 + f64, d, s, e, dt) TYPE minmax GRANULARITY 1,
     INDEX
       idx_2 (u64 + toYear(dt), substring(s, 2, 4)) TYPE minmax GRANULARITY 3
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00837/minmax', 'r2')
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00837/minmax', 'r2')
 ORDER BY u64
 SETTINGS index_granularity = 2;
 
diff --git a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
index 2e070d685a4..da4d3b05987 100755
--- a/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
+++ b/tests/queries/0_stateless/00838_system_tables_drop_table_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 set -e
 
diff --git a/tests/queries/0_stateless/00838_unique_index.reference b/tests/queries/0_stateless/00838_unique_index.reference
index df890188102..7183a3b7370 100644
--- a/tests/queries/0_stateless/00838_unique_index.reference
+++ b/tests/queries/0_stateless/00838_unique_index.reference
@@ -1,24 +1,24 @@
-0	5	4.7	6.50	cba	b	2014-01-04
-1	5	4.7	6.50	cba	b	2014-03-11
-12	5	4.7	6.50	cba	b	2014-06-11
-13	5	4.7	6.50	cba	b	2015-01-01
+0	5	4.7	6.5	cba	b	2014-01-04
+1	5	4.7	6.5	cba	b	2014-03-11
+12	5	4.7	6.5	cba	b	2014-06-11
+13	5	4.7	6.5	cba	b	2015-01-01
 		"rows_read": 4,
-2	2	4.5	2.50	abc	a	2014-01-01
-6	2	4.5	2.50	abc	a	2014-02-11
+2	2	4.5	2.5	abc	a	2014-01-01
+6	2	4.5	2.5	abc	a	2014-02-11
 7	5	6.9	1.57	bac	c	2014-04-11
-8	2	4.5	2.50	abc	a	2014-05-11
+8	2	4.5	2.5	abc	a	2014-05-11
 9	5	6.9	1.57	bac	c	2014-07-11
 5	5	6.9	1.57	bac	c	2014-11-11
-4	2	4.5	2.50	abc	a	2016-01-01
+4	2	4.5	2.5	abc	a	2016-01-01
 3	5	6.9	1.57	bac	c	2017-01-01
 		"rows_read": 8,
 		"rows_read": 2,
-2	2	4.5	2.50	abc	a	2014-01-01
-6	2	4.5	2.50	abc	a	2014-02-11
+2	2	4.5	2.5	abc	a	2014-01-01
+6	2	4.5	2.5	abc	a	2014-02-11
 7	5	6.9	1.57	bac	c	2014-04-11
-8	2	4.5	2.50	abc	a	2014-05-11
+8	2	4.5	2.5	abc	a	2014-05-11
 9	5	6.9	1.57	bac	c	2014-07-11
 5	5	6.9	1.57	bac	c	2014-11-11
-4	2	4.5	2.50	abc	a	2016-01-01
+4	2	4.5	2.5	abc	a	2016-01-01
 3	5	6.9	1.57	bac	c	2017-01-01
 		"rows_read": 8,
diff --git a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
index 448e7ad076c..8807926d9b6 100755
--- a/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
+++ b/tests/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, no-parallel
 
 # NOTE: database = $CLICKHOUSE_DATABASE is unwanted
 
diff --git a/tests/queries/0_stateless/00849_multiple_comma_join_2.reference b/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
index 5709db44eb1..2652a82ab54 100644
--- a/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
+++ b/tests/queries/0_stateless/00849_multiple_comma_join_2.reference
@@ -184,6 +184,14 @@ FROM
 CROSS JOIN t3
 SELECT `--t1.a` AS `t1.a`
 FROM
+(
+    SELECT a AS `--t1.a`
+    FROM t1
+    ALL INNER JOIN t2 USING (a)
+) AS `--.s`
+CROSS JOIN t3
+SELECT `--t1.a` AS `t1.a`
+FROM
 (
     SELECT
         a AS `--t1.a`,
diff --git a/tests/queries/0_stateless/00849_multiple_comma_join_2.sql b/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
index 5203376befd..58535f556d9 100644
--- a/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
+++ b/tests/queries/0_stateless/00849_multiple_comma_join_2.sql
@@ -27,7 +27,7 @@ EXPLAIN SYNTAX SELECT t1.a FROM t1, t2, t3, t4;
 EXPLAIN SYNTAX SELECT t1.a FROM t1 CROSS JOIN t2 CROSS JOIN t3 CROSS JOIN t4;
 
 EXPLAIN SYNTAX SELECT t1.a FROM t1, t2 CROSS JOIN t3;
-EXPLAIN SYNTAX SELECT t1.a FROM t1 JOIN t2 USING a CROSS JOIN t3; -- { serverError 48 }
+EXPLAIN SYNTAX SELECT t1.a FROM t1 JOIN t2 USING a CROSS JOIN t3;
 EXPLAIN SYNTAX SELECT t1.a FROM t1 JOIN t2 ON t1.a = t2.a CROSS JOIN t3;
 
 INSERT INTO t1 values (1,1), (2,2), (3,3), (4,4);
diff --git a/tests/queries/0_stateless/00850_global_join_dups.sql b/tests/queries/0_stateless/00850_global_join_dups.sql
index 5843bf9c227..5a3ab0f1adc 100644
--- a/tests/queries/0_stateless/00850_global_join_dups.sql
+++ b/tests/queries/0_stateless/00850_global_join_dups.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t1_00850;
 DROP TABLE IF EXISTS t2_00850;
diff --git a/tests/queries/0_stateless/00851_http_insert_json_defaults.sh b/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
index 08458822cc0..8838200271f 100755
--- a/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
+++ b/tests/queries/0_stateless/00851_http_insert_json_defaults.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00854_multiple_join_asterisks.reference b/tests/queries/0_stateless/00854_multiple_join_asterisks.reference
index 4500bdba755..99243e57760 100644
--- a/tests/queries/0_stateless/00854_multiple_join_asterisks.reference
+++ b/tests/queries/0_stateless/00854_multiple_join_asterisks.reference
@@ -3,4 +3,5 @@
 0
 0	0
 0	0	0
+0	0	0	0
 0	0	0
diff --git a/tests/queries/0_stateless/00854_multiple_join_asterisks.sql b/tests/queries/0_stateless/00854_multiple_join_asterisks.sql
index c01ea721000..6794f178ff9 100644
--- a/tests/queries/0_stateless/00854_multiple_join_asterisks.sql
+++ b/tests/queries/0_stateless/00854_multiple_join_asterisks.sql
@@ -3,6 +3,7 @@ select * from system.one t1 join system.one t2 on t1.dummy = t2.dummy join syste
 select t1.* from system.one t1 join system.one t2 on t1.dummy = t2.dummy join system.one t3 ON t1.dummy = t3.dummy;
 select t2.*, t3.* from system.one t1 join system.one t2 on t1.dummy = t2.dummy join system.one t3 ON t1.dummy = t3.dummy;
 select t1.dummy, t2.*, t3.dummy from system.one t1 join system.one t2 on t1.dummy = t2.dummy join system.one t3 ON t1.dummy = t3.dummy;
+select t1.dummy, t2.*, t3.dummy from system.one t1 join (select dummy,0 as another_one from system.one) t2 on t1.dummy = t2.dummy OR t1.dummy = t2.another_one join system.one t3 ON t1.dummy = t3.dummy;
 
 select t1.dummy, t2.*, t3.dummy from (select * from system.one) t1
 join system.one t2 on t1.dummy = t2.dummy
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.reference b/tests/queries/0_stateless/00855_join_with_array_join.reference
index 88f9253500c..fe9bd148afd 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.reference
+++ b/tests/queries/0_stateless/00855_join_with_array_join.reference
@@ -4,8 +4,19 @@
 4	0
 5	0
 6	0
+7	1	0
+8	1	0
 -
 1	0	
 2	2	a2
 1	0	
 2	2	a2
+0	0
+0	0
+0	0
+0	0
+0
+0
+0
+0
+0	Int64	Int64
diff --git a/tests/queries/0_stateless/00855_join_with_array_join.sql b/tests/queries/0_stateless/00855_join_with_array_join.sql
index 506d9479110..05180573525 100644
--- a/tests/queries/0_stateless/00855_join_with_array_join.sql
+++ b/tests/queries/0_stateless/00855_join_with_array_join.sql
@@ -3,6 +3,7 @@ SET joined_subquery_requires_alias = 0;
 SELECT ax, c FROM (SELECT [1,2] ax, 0 c) ARRAY JOIN ax JOIN (SELECT 0 c) USING (c);
 SELECT ax, c FROM (SELECT [3,4] ax, 0 c) JOIN (SELECT 0 c) USING (c) ARRAY JOIN ax;
 SELECT ax, c FROM (SELECT [5,6] ax, 0 c) s1 JOIN system.one s2 ON s1.c = s2.dummy ARRAY JOIN ax;
+SELECT ax, c, d FROM (SELECT [7,8] ax, 1 c, 0 d) s1 JOIN system.one s2 ON s1.c = s2.dummy OR s1.d = s2.dummy ARRAY JOIN ax;
 
 
 SELECT ax, c FROM (SELECT [101,102] ax, 0 c) s1
@@ -30,6 +31,21 @@ SELECT did, id, name FROM f LEFT ARRAY JOIN d_ids as did LEFT JOIN d ON d.id = d
 -- name clash, doesn't work yet
 SELECT id, name FROM f LEFT ARRAY JOIN d_ids as id LEFT JOIN d ON d.id = id ORDER BY id; -- { serverError 403 }
 
+SELECT * FROM ( SELECT [dummy, dummy] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN system.one AS y ON x.dummy == y.dummy;
+
+SELECT * FROM ( SELECT [dummy, dummy] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN system.one AS y ON x.dummy + 1 == y.dummy + 1;
+
+SELECT * FROM ( SELECT [dummy, dummy] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN system.one AS y USING dummy;
+
+SELECT * FROM ( SELECT [toUInt32(dummy), toUInt32(dummy)] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN (select toInt32(dummy) as dummy from system.one ) AS y USING dummy;
+
+SELECT dummy > 0, toTypeName(any(dummy)), any(toTypeName(dummy)) 
+FROM ( SELECT [toUInt32(dummy), toUInt32(dummy)] AS dummy FROM system.one ) AS x ARRAY JOIN dummy
+JOIN ( SELECT toInt32(dummy) AS dummy FROM system.one ) AS y USING dummy GROUP BY (dummy > 0);
+
 DROP TABLE IF EXISTS f;
 DROP TABLE IF EXISTS d;
-
diff --git a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
index df964d3a90c..e7f034131a2 100644
--- a/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
+++ b/tests/queries/0_stateless/00857_global_joinsavel_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_00857;
 USE test_00857;
 DROP TABLE IF EXISTS local_table;
diff --git a/tests/queries/0_stateless/00861_decimal_quoted_csv.reference b/tests/queries/0_stateless/00861_decimal_quoted_csv.reference
index 6a219226835..3ff285acef8 100644
--- a/tests/queries/0_stateless/00861_decimal_quoted_csv.reference
+++ b/tests/queries/0_stateless/00861_decimal_quoted_csv.reference
@@ -1,5 +1,5 @@
-1	1.00	1.00	1.00
-2	-1.00	-1.00	-1.00
-3	1.00	1.00	1.00
-4	-0.10	-0.10	-0.10
+1	1	1	1
+2	-1	-1	-1
+3	1	1	1
+4	-0.1	-0.1	-0.1
 5	0.01	0.01	0.01
diff --git a/tests/queries/0_stateless/00862_decimal_in.reference b/tests/queries/0_stateless/00862_decimal_in.reference
index 2e4eb5e6dc7..0cd93f69c38 100644
--- a/tests/queries/0_stateless/00862_decimal_in.reference
+++ b/tests/queries/0_stateless/00862_decimal_in.reference
@@ -1,18 +1,18 @@
-128.00	128.00
-128.00	128.00
-128.00	128.00
-128.00	128.00
-128.00	128.00
-128.00	128.00
-32.00	32.00
-32.00	32.00
-32.00	32.00
-32.00	32.00
-32.00	32.00
-32.00	32.00
-64.00	64.00
-64.00	64.00
-64.00	64.00
-64.00	64.00
-64.00	64.00
-64.00	64.00
+128	128
+128	128
+128	128
+128	128
+128	128
+128	128
+32	32
+32	32
+32	32
+32	32
+32	32
+32	32
+64	64
+64	64
+64	64
+64	64
+64	64
+64	64
diff --git a/tests/queries/0_stateless/00875_join_right_nulls.sql b/tests/queries/0_stateless/00875_join_right_nulls.sql
index 288a3043569..8aa7aee8c15 100644
--- a/tests/queries/0_stateless/00875_join_right_nulls.sql
+++ b/tests/queries/0_stateless/00875_join_right_nulls.sql
@@ -1,12 +1,13 @@
 DROP TABLE IF EXISTS t;
 DROP TABLE IF EXISTS nt;
 
-CREATE TABLE t (x String) ENGINE = Memory;
-CREATE TABLE nt (x Nullable(String)) ENGINE = Memory;
+CREATE TABLE t (x String) ENGINE = Log();
+CREATE TABLE nt (x Nullable(String)) ENGINE = Log();
 
 INSERT INTO t (x) VALUES ('id'), ('1');
 INSERT INTO nt (x) VALUES ('id'), (NULL), ('1');
 
+
 SET join_use_nulls = 1;
 
 SELECT 'on';
diff --git a/tests/queries/0_stateless/00875_join_right_nulls_ors.reference b/tests/queries/0_stateless/00875_join_right_nulls_ors.reference
new file mode 100644
index 00000000000..05febe97d7a
--- /dev/null
+++ b/tests/queries/0_stateless/00875_join_right_nulls_ors.reference
@@ -0,0 +1,27 @@
+on with or
+n rj n	1	1
+n rj n	id	id
+n rj n	\N	\N
+n a rj n	1	1
+n a rj n	id	id
+n a rj n	\N	\N
+n fj n	1	1
+n fj n	id	id
+n fj n	\N	\N
+n fj n	\N	\N
+t rj n	1	1
+t rj n	id	id
+t rj n	\N	\N
+t fj n	1	1
+t fj n	id	id
+t fj n	\N	\N
+n rj t	1	1
+n rj t	id	id
+n a rj t	1	1
+n a rj t	id	id
+n fj t	1	1
+n fj t	id	id
+n fj t	\N	\N
+n fj t	1	1
+n fj t	id	id
+n fj t	\N	\N
diff --git a/tests/queries/0_stateless/00875_join_right_nulls_ors.sql b/tests/queries/0_stateless/00875_join_right_nulls_ors.sql
new file mode 100644
index 00000000000..7f41565fbf7
--- /dev/null
+++ b/tests/queries/0_stateless/00875_join_right_nulls_ors.sql
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS t;
+DROP TABLE IF EXISTS nt;
+DROP TABLE IF EXISTS ntxy;
+
+CREATE TABLE t (x String) ENGINE = Log();
+CREATE TABLE nt (x Nullable(String)) ENGINE = Log();
+CREATE TABLE ntxy (x Nullable(String), y Nullable(String)) ENGINE = Log();
+
+INSERT INTO t (x) VALUES ('id'), ('1');
+INSERT INTO nt (x) VALUES ('id'), (NULL), ('1');
+INSERT INTO ntxy (x, y) VALUES ('id', 'id'), (NULL, NULL), ('1', '1');
+
+
+SET join_use_nulls = 1;
+
+SELECT 'on with or';
+SELECT 'n rj n', t1.x, t2.x FROM nt AS t1 RIGHT JOIN ntxy AS t2 ON t1.x = t2.x OR t1.x = t2.y ORDER BY t1.x;
+SELECT 'n a rj n', t1.x, t2.x FROM nt AS t1 ANY RIGHT JOIN ntxy AS t2 ON t1.x = t2.x OR t1.x = t2.y ORDER BY t1.x;
+SELECT 'n fj n', t1.x, t2.x FROM nt AS t1 FULL JOIN ntxy AS t2 ON t1.x = t2.x OR t1.x = t2.y ORDER BY t1.x;
+
+SELECT 't rj n', t1.x, t2.x FROM t AS t1 RIGHT JOIN ntxy AS t2 ON t1.x = t2.x OR t1.x = t2.y ORDER BY t1.x;
+SELECT 't fj n', t1.x, t2.x FROM t AS t1 FULL JOIN ntxy AS t2 ON t1.x = t2.x OR t1.x = t2.y ORDER BY t1.x;
+
+SELECT 'n rj t', t1.x, t2.x FROM ntxy AS t1 RIGHT JOIN t AS t2 ON t1.x = t2.x OR t1.y = t2.x  ORDER BY t1.x;
+SELECT 'n a rj t', t1.x, t2.x FROM ntxy AS t1 ANY RIGHT JOIN t AS t2 ON t1.x = t2.x OR t1.y = t2.x  ORDER BY t1.x;
+SELECT 'n fj t', t1.x, t2.x FROM ntxy AS t1 FULL JOIN t AS t2 ON t1.x = t2.x OR t2.x = t1.y ORDER BY t1.x;
+SELECT 'n fj t', t1.x, t2.x FROM ntxy AS t1 FULL JOIN t AS t2 ON t2.x = t1.y OR t1.x = t2.x ORDER BY t1.x;
+
+DROP TABLE t;
+DROP TABLE nt;
+DROP TABLE ntxy;
diff --git a/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql b/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
index 111104bb06e..f2dff662d9c 100644
--- a/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
+++ b/tests/queries/0_stateless/00877_memory_limit_for_new_delete.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-asan, no-msan, no-unbundled, no-parallel, no-fasttest
+-- Tag no-msan: memory limits don't work correctly under msan because it replaces malloc/free
+
 SET max_memory_usage = 1000000000;
 
 SELECT sum(ignore(*)) FROM (
diff --git a/tests/queries/0_stateless/00899_long_attach_memory_limit.sql b/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
index 0c8b8874293..aa507cda2ac 100644
--- a/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
+++ b/tests/queries/0_stateless/00899_long_attach_memory_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-debug, no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS index_memory;
 CREATE TABLE index_memory (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS index_granularity = 1;
 INSERT INTO index_memory SELECT * FROM system.numbers LIMIT 5000000;
diff --git a/tests/queries/0_stateless/00900_entropy_shard.sql b/tests/queries/0_stateless/00900_entropy_shard.sql
index 6e343614bd2..10cc5481d47 100644
--- a/tests/queries/0_stateless/00900_entropy_shard.sql
+++ b/tests/queries/0_stateless/00900_entropy_shard.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SELECT round(entropy(number), 6) FROM remote('127.0.0.{1,2}', numbers(256));
 SELECT entropy(rand64()) > 8 FROM remote('127.0.0.{1,2}', numbers(256));
diff --git a/tests/queries/0_stateless/00900_long_parquet.reference b/tests/queries/0_stateless/00900_long_parquet.reference
index d0cb71338af..9ee4fc11a55 100644
--- a/tests/queries/0_stateless/00900_long_parquet.reference
+++ b/tests/queries/0_stateless/00900_long_parquet.reference
@@ -60,17 +60,17 @@ dest from null:
 -108	108	-1016	1116	-1032	1132	-1064	1164	-1.032	-1.064	string-0	fixedstring\0\0\0\0	2001-02-03	2002-02-03 04:05:06
 127	255	32767	65535	2147483647	4294967295	9223372036854775807	9223372036854775807	-1.032	-1.064	string-2	fixedstring-2\0\0	2004-06-07	2004-02-03 04:05:06
 \N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
-1	[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['2000-01-01 00:00:00','2001-01-01 00:00:00','2002-01-01 00:00:00']	[0.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,101001.01]
-1	[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['2000-01-01 00:00:00','2001-01-01 00:00:00','2002-01-01 00:00:00']	[0.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,101001.01]
+1	[1,-2,3]	[1,2,3]	[100,-200,300]	[100,200,300]	[10000000,-20000000,30000000]	[10000000,2000000,3000000]	[100000000000000,-200000000000,3000000000000]	[100000000000000,20000000000000,3000000000000]	['Some string','Some string','Some string']	['0000','1111','2222']	[42.42,424.2,0.4242]	[424242.424242,4242042420.242424,42]	['2000-01-01','2001-01-01','2002-01-01']	['2000-01-01 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	[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]
 2	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
 2	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
-1	[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
-1	[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
+1	[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
+1	[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
 2	[NULL]	[NULL]	[NULL]
 2	[NULL]	[NULL]	[NULL]
 3	[]	[]	[]
 3	[]	[]	[]
 [[[1,2,3],[1,2,3]],[[1,2,3]],[[],[1,2,3]]]	[[['Some string','Some string'],[]],[['Some string']],[[]]]	[[NULL,1,2],[NULL],[1,2],[]]	[['Some string',NULL,'Some string'],[NULL],[]]
 [[[1,2,3],[1,2,3]],[[1,2,3]],[[],[1,2,3]]]	[[['Some string','Some string'],[]],[['Some string']],[[]]]	[[NULL,1,2],[NULL],[1,2],[]]	[['Some string',NULL,'Some string'],[NULL],[]]
-0.1230	0.12312312	0.1231231231230000	0.12312312312312312300000000000000
-0.1230	0.12312312	0.1231231231230000	0.12312312312312312300000000000000
+0.123	0.12312312	0.123123123123	0.123123123123123123
+0.123	0.12312312	0.123123123123	0.123123123123123123
diff --git a/tests/queries/0_stateless/00900_long_parquet.sh b/tests/queries/0_stateless/00900_long_parquet.sh
index e748fbcaf24..629a82f9d71 100755
--- a/tests/queries/0_stateless/00900_long_parquet.sh
+++ b/tests/queries/0_stateless/00900_long_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_decimal.sh b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
index 67561f484bd..013899832d3 100755
--- a/tests/queries/0_stateless/00900_long_parquet_decimal.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_decimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 # set -x
 
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.reference b/tests/queries/0_stateless/00900_long_parquet_load.reference
index e48df50bd98..421def88e41 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.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,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.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,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']	['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]
 === 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
@@ -64,32 +64,32 @@ idx10	['This','is','a','test']
 \n
 
 === Try load data from byte_array_decimal.parquet
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-10.00
-11.00
-12.00
-13.00
-14.00
-15.00
-16.00
-17.00
-18.00
-19.00
-20.00
-21.00
-22.00
-23.00
-24.00
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
 === Try load data from datapage_v2.snappy.parquet
-Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not yet implemented: Unsupported encoding.: While executing ParquetBlockInputFormat: data for INSERT was parsed from stdin. (CANNOT_READ_ALL_DATA)
+Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not yet implemented: Unsupported encoding.: While executing ParquetBlockInputFormat: data for INSERT was parsed from stdin: (in query: INSERT INTO parquet_load FORMAT Parquet). (CANNOT_READ_ALL_DATA)
 
 === Try load data from datatype-date32.parquet
 1925-01-01
@@ -137,135 +137,135 @@ Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not y
 1552
 1552
 === Try load data from fixed_length_decimal.parquet
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-10.00
-11.00
-12.00
-13.00
-14.00
-15.00
-16.00
-17.00
-18.00
-19.00
-20.00
-21.00
-22.00
-23.00
-24.00
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
 === Try load data from fixed_length_decimal_1.parquet
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-10.00
-11.00
-12.00
-13.00
-14.00
-15.00
-16.00
-17.00
-18.00
-19.00
-20.00
-21.00
-22.00
-23.00
-24.00
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
 === Try load data from fixed_length_decimal_legacy.parquet
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-10.00
-11.00
-12.00
-13.00
-14.00
-15.00
-16.00
-17.00
-18.00
-19.00
-20.00
-21.00
-22.00
-23.00
-24.00
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
 === Try load data from hadoop_lz4_compressed.parquet
 1593604800	abc	42
 1593604800	def	7.7
 1593604801	abc	42.125
 1593604801	def	7.7
 === Try load data from int32_decimal.parquet
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-10.00
-11.00
-12.00
-13.00
-14.00
-15.00
-16.00
-17.00
-18.00
-19.00
-20.00
-21.00
-22.00
-23.00
-24.00
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
 === Try load data from int64_decimal.parquet
-1.00
-2.00
-3.00
-4.00
-5.00
-6.00
-7.00
-8.00
-9.00
-10.00
-11.00
-12.00
-13.00
-14.00
-15.00
-16.00
-17.00
-18.00
-19.00
-20.00
-21.00
-22.00
-23.00
-24.00
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
 === Try load data from list_columns.parquet
 [1,2,3]	['abc','efg','hij']
 [NULL,1]	[]
@@ -315,17 +315,17 @@ Code: 33. DB::ParsingEx---tion: Error while reading Parquet data: IOError: Not y
 1593604801	abc	42.125
 1593604801	def	7.7
 === Try load data from nonnullable.impala.parquet
-8	[-1]	[[-1,-2],[]]	{'k1':-1}	[{},{'k1':1},{},{}]	(-1,[-1],([[(-1)]]),{})
+8	[-1]	[[-1,-2],[]]	{'k1':-1}	[{},{'k1':1},{},{}]	(-1,[-1],([[(-1,'nonnullable')]]),{})
 === Try load data from nullable.impala.parquet
-1	[1,2,3]	[[1,2],[3,4]]	{'k1':1,'k2':100}	[{'k1':1}]	(1,[1],([[(10),(-10)],[(11)]]),{'foo':(([1.1]))})
-2	[NULL,1,2,NULL,3,NULL]	[[NULL,1,2,NULL],[3,NULL,4],[],[]]	{'k1':2,'k2':NULL}	[{'k3':NULL,'k1':1},{},{}]	(NULL,[NULL],([[(NULL),(10),(NULL),(-10),(NULL)],[(11),(NULL)],[],[]]),{'g1':(([2.2,NULL])),'g2':(([])),'g3':(([])),'g4':(([])),'g5':(([]))})
+1	[1,2,3]	[[1,2],[3,4]]	{'k1':1,'k2':100}	[{'k1':1}]	(1,[1],([[(10,'aaa'),(-10,'bbb')],[(11,'c')]]),{'foo':(([1.1]))})
+2	[NULL,1,2,NULL,3,NULL]	[[NULL,1,2,NULL],[3,NULL,4],[],[]]	{'k1':2,'k2':NULL}	[{'k3':NULL,'k1':1},{},{}]	(NULL,[NULL],([[(NULL,NULL),(10,'aaa'),(NULL,NULL),(-10,'bbb'),(NULL,NULL)],[(11,'c'),(NULL,NULL)],[],[]]),{'g1':(([2.2,NULL])),'g2':(([])),'g3':(([])),'g4':(([])),'g5':(([]))})
 3	[]	[[]]	{}	[{},{}]	(NULL,[],([]),{})
 4	[]	[]	{}	[]	(NULL,[],([]),{})
 5	[]	[]	{}	[]	(NULL,[],([]),{'foo':(([2.2,3.3]))})
 6	[]	[]	{}	[]	(NULL,[],([]),{})
-7	[]	[[],[5,6]]	{'k1':NULL,'k3':NULL}	[]	(7,[2,3,NULL],([[],[(NULL)],[]]),{})
+7	[]	[[],[5,6]]	{'k1':NULL,'k3':NULL}	[]	(7,[2,3,NULL],([[],[(NULL,NULL)],[]]),{})
 === Try load data from nullable_list.parquet
-[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
+[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
 [NULL]	[NULL]	[NULL]
 []	[]	[]
 === Try load data from nulls.snappy.parquet
diff --git a/tests/queries/0_stateless/00900_long_parquet_load.sh b/tests/queries/0_stateless/00900_long_parquet_load.sh
index 1cfba22587a..41e5359ac9b 100755
--- a/tests/queries/0_stateless/00900_long_parquet_load.sh
+++ b/tests/queries/0_stateless/00900_long_parquet_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-unbundled, no-fasttest
 
 #
 # Load all possible .parquet files found in submodules.
diff --git a/tests/queries/0_stateless/00900_null_array_orc_load.sh b/tests/queries/0_stateless/00900_null_array_orc_load.sh
index a303e50a04a..b651f419b1e 100755
--- a/tests/queries/0_stateless/00900_null_array_orc_load.sh
+++ b/tests/queries/0_stateless/00900_null_array_orc_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrays_load.reference b/tests/queries/0_stateless/00900_orc_arrays_load.reference
index 9b20ef98164..f894669fa0c 100644
--- a/tests/queries/0_stateless/00900_orc_arrays_load.reference
+++ b/tests/queries/0_stateless/00900_orc_arrays_load.reference
@@ -1,4 +1,4 @@
-[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.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,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']	['2000-01-01 00:00:00','2001-01-01 00:00:00','2002-01-01 00:00:00']	[0.20,10.00,4.00]	[4.00,10000.10,10000.10]	[1000000000.00,90.00,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]
 []	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]	[]
diff --git a/tests/queries/0_stateless/00900_orc_arrays_load.sh b/tests/queries/0_stateless/00900_orc_arrays_load.sh
index 410945b31eb..ad014423246 100755
--- a/tests/queries/0_stateless/00900_orc_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
index 913789dedb0..ca32790a696 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.reference b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.reference
new file mode 100644
index 00000000000..22eb936a0e0
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.reference
@@ -0,0 +1,21 @@
+Arrow
+[1,2,3]	['123','456','789']	[9.8,10.12,11.14]
+[4,5,6]	['101112','131415','161718']	[123.8,10.2,11.414]
+[7,8,9]	['101','415','118']	[13.08,1.12,0.414]
+[1,2,3]	['123','456','789']	[9.8,10.12,11.14]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+[4,5,6]	['101112','131415','161718']	[123.8,10.2,11.414]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+[7,8,9]	['101','415','118']	[13.08,1.12,0.414]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+Parquet
+[1,2,3]	['123','456','789']	[9.8,10.12,11.14]
+[4,5,6]	['101112','131415','161718']	[123.8,10.2,11.414]
+[7,8,9]	['101','415','118']	[13.08,1.12,0.414]
+[1,2,3]	['123','456','789']	[9.8,10.12,11.14]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+[4,5,6]	['101112','131415','161718']	[123.8,10.2,11.414]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+[7,8,9]	['101','415','118']	[13.08,1.12,0.414]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+ORC
+[1,2,3]	['123','456','789']	[9.8,10.12,11.14]
+[4,5,6]	['101112','131415','161718']	[123.8,10.2,11.414]
+[7,8,9]	['101','415','118']	[13.08,1.12,0.414]
+[1,2,3]	['123','456','789']	[9.8,10.12,11.14]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+[4,5,6]	['101112','131415','161718']	[123.8,10.2,11.414]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
+[7,8,9]	['101','415','118']	[13.08,1.12,0.414]	[[(1,'123',9.8),(2,'456',10.12),(3,'789',11.14)],[(4,'101112',123.8),(5,'131415',10.2),(6,'161718',11.414)],[(7,'101',13.08),(8,'415',1.12),(9,'118',0.414)]]
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
new file mode 100755
index 00000000000..fc97cc5ef66
--- /dev/null
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS nested_table"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE IF EXISTS nested_nested_table"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE nested_table (table Nested(elem1 Int32, elem2 String, elem3 Float32)) engine=Memory"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE nested_nested_table (table Nested(elem1 Int32, elem2 String, elem3 Float32, nested Nested(elem1 Int32, elem2 String, elem3 Float32))) engine=Memory"
+
+
+formats=('Arrow' 'Parquet' 'ORC')
+format_files=('arrow' 'parquet' 'orc')
+
+for ((i = 0; i < 3; i++)) do
+    echo ${formats[i]}
+
+    ${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE nested_table"
+    cat $CUR_DIR/data_orc_arrow_parquet_nested/nested_table.${format_files[i]} | ${CLICKHOUSE_CLIENT} -q "INSERT INTO nested_table FORMAT ${formats[i]} SETTINGS input_format_${format_files[i]}_import_nested = 1"
+
+    ${CLICKHOUSE_CLIENT} --query="SELECT * FROM nested_table"
+
+
+    ${CLICKHOUSE_CLIENT} --query="TRUNCATE TABLE nested_nested_table"
+    cat $CUR_DIR/data_orc_arrow_parquet_nested/nested_nested_table.${format_files[i]} | ${CLICKHOUSE_CLIENT} -q "INSERT INTO nested_nested_table FORMAT ${formats[i]} SETTINGS input_format_${format_files[i]}_import_nested = 1"
+    
+    ${CLICKHOUSE_CLIENT} --query="SELECT * FROM nested_nested_table"
+
+
+done
+
+${CLICKHOUSE_CLIENT} --query="DROP TABLE nested_table"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE nested_nested_table"
diff --git a/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh b/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
index ff16d3205ad..927e48a9c91 100755
--- a/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
+++ b/tests/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_load.sh b/tests/queries/0_stateless/00900_orc_load.sh
index aae752be3e9..185af8be608 100755
--- a/tests/queries/0_stateless/00900_orc_load.sh
+++ b/tests/queries/0_stateless/00900_orc_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan, no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
index 81d2aeed4bd..e91edd1d956 100755
--- a/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_nested_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference
index 62e95652040..44b19f616d0 100644
--- a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference
+++ b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.reference
@@ -1,6 +1,6 @@
-[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
+[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
 [NULL]	[NULL]	[NULL]
 []	[]	[]
-[1,NULL,2]	[NULL,'Some string',NULL]	[0.00,NULL,42.42]
+[1,NULL,2]	[NULL,'Some string',NULL]	[0,NULL,42.42]
 [NULL]	[NULL]	[NULL]
 []	[]	[]
diff --git a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
index 61829d0709b..3431a606de9 100755
--- a/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
+++ b/tests/queries/0_stateless/00900_orc_nullable_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00908_bloom_filter_index.sh b/tests/queries/0_stateless/00908_bloom_filter_index.sh
index a7631db759c..474a2b739e2 100755
--- a/tests/queries/0_stateless/00908_bloom_filter_index.sh
+++ b/tests/queries/0_stateless/00908_bloom_filter_index.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
+# Tag no-replicated-database: grep -c
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00908_long_http_insert.sh b/tests/queries/0_stateless/00908_long_http_insert.sh
index 5e793410412..ecd1bf37f66 100755
--- a/tests/queries/0_stateless/00908_long_http_insert.sh
+++ b/tests/queries/0_stateless/00908_long_http_insert.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 set -e
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/00910_buffer_prewhere.sql b/tests/queries/0_stateless/00910_buffer_prewhere.sql
index d7d9813c5f5..deda0db85fb 100644
--- a/tests/queries/0_stateless/00910_buffer_prewhere.sql
+++ b/tests/queries/0_stateless/00910_buffer_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_buffer;
 CREATE DATABASE test_buffer;
 CREATE TABLE test_buffer.mt (uid UInt64, ts DateTime, val Float64) ENGINE = MergeTree PARTITION BY toDate(ts) ORDER BY (uid, ts);
diff --git a/tests/queries/0_stateless/00910_client_window_size_detection.sh b/tests/queries/0_stateless/00910_client_window_size_detection.sh
index 47d913de152..7bb70bb378b 100755
--- a/tests/queries/0_stateless/00910_client_window_size_detection.sh
+++ b/tests/queries/0_stateless/00910_client_window_size_detection.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql b/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
index 9a0c5d2f5ee..6dea97d1f27 100644
--- a/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
+++ b/tests/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS union1;
 DROP TABLE IF EXISTS union2;
 CREATE TABLE union1 ( date Date, a Int32, b Int32, c Int32, d Int32) ENGINE = MergeTree(date, (a, date), 8192);
diff --git a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.reference b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.reference
index 232d9aa7974..47e910f691d 100644
--- a/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.reference
+++ b/tests/queries/0_stateless/00910_decimal_group_array_crash_3783.reference
@@ -1,9 +1,9 @@
-[1.00]
-[1.00000]
-[1.0000000000]
-[499500.00]
-[499500.00000]
-[499500.0000000000]
+[1]
+[1]
+[1]
+[499500]
+[499500]
+[499500]
 1545081300	[('ed87e57c-9331-462a-80b4-9f0c005e88c8',0.44)]
-4341757	5657967	2018-11-01 16:47:46	txt	321.380000000000	315.080000000000	0.000000000000	2018-11-02 00:00:00
-4360430	5681495	2018-11-02 09:00:07	txt	274.350000000000	268.970000000000	0.000000000000	2018-11-02 00:00:00
+4341757	5657967	2018-11-01 16:47:46	txt	321.38	315.08	0	2018-11-02 00:00:00
+4360430	5681495	2018-11-02 09:00:07	txt	274.35	268.97	0	2018-11-02 00:00:00
diff --git a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.reference
similarity index 84%
rename from tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference
rename to tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.reference
index 29e7b23d3dd..6b7bddf2ac5 100644
--- a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference
+++ b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.reference
@@ -20,8 +20,8 @@
 274972506.6
 9175437371954010821
 9175437371954010821
-CREATE TABLE default.compression_codec_multiple_more_types_replicated\n(\n    `id` Decimal(38, 13) CODEC(ZSTD(1), LZ4, ZSTD(1), ZSTD(1), Delta(2), Delta(4), Delta(1), LZ4HC(0)),\n    `data` FixedString(12) CODEC(ZSTD(1), ZSTD(1), Delta(1), Delta(1), Delta(1), NONE, NONE, NONE, LZ4HC(0)),\n    `ddd.age` Array(UInt8) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8)),\n    `ddd.Name` Array(String) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8))\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00910/compression_codec_multiple_more_types_replicated\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.compression_codec_multiple_more_types_replicated\n(\n    `id` Decimal(38, 13) CODEC(ZSTD(1), LZ4, ZSTD(1), ZSTD(1), Delta(2), Delta(4), Delta(1), LZ4HC(0)),\n    `data` FixedString(12) CODEC(ZSTD(1), ZSTD(1), Delta(1), Delta(1), Delta(1), NONE, NONE, NONE, LZ4HC(0)),\n    `ddd.age` Array(UInt8) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8)),\n    `ddd.Name` Array(String) CODEC(LZ4, LZ4HC(0), NONE, NONE, NONE, ZSTD(1), Delta(8))\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00910/compression_codec_multiple_more_types_replicated\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1.5555555555555	hello world!	[77]	['John']
-7.1000000000000	xxxxxxxxxxxx	[127]	['Henry']
+7.1	xxxxxxxxxxxx	[127]	['Henry']
 !
 222
diff --git a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
similarity index 87%
rename from tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql
rename to tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
index 52eb1d4e411..369d897fafd 100644
--- a/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 SET send_logs_level = 'fatal';
 SET allow_suspicious_codecs = 1;
 
@@ -11,7 +13,7 @@ CREATE TABLE compression_codec_replicated1(
     somenum Float64 CODEC(ZSTD(2)),
     somestr FixedString(3) CODEC(LZ4HC(7)),
     othernum Int64 CODEC(Delta)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_replicated', '1') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/compression_codec_replicated', '1') ORDER BY tuple();
 
 CREATE TABLE compression_codec_replicated2(
   id UInt64 CODEC(LZ4),
@@ -20,7 +22,7 @@ CREATE TABLE compression_codec_replicated2(
   somenum Float64 CODEC(ZSTD(2)),
   somestr FixedString(3) CODEC(LZ4HC(7)),
   othernum Int64 CODEC(Delta)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_replicated', '2') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/compression_codec_replicated', '2') ORDER BY tuple();
 
 
 INSERT INTO compression_codec_replicated1 VALUES(1, 'hello', toDate('2018-12-14'), 1.1, 'aaa', 5);
@@ -57,14 +59,14 @@ CREATE TABLE compression_codec_multiple_replicated1 (
     data String CODEC(ZSTD(2), NONE, Delta(2), LZ4HC, LZ4, LZ4, Delta(8)),
     ddd Date CODEC(NONE, NONE, NONE, Delta(1), LZ4, ZSTD, LZ4HC, LZ4HC),
     somenum Float64 CODEC(Delta(4), LZ4, LZ4, ZSTD(2), LZ4HC(5), ZSTD(3), ZSTD)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple', '1') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/compression_codec_multiple', '1') ORDER BY tuple();
 
 CREATE TABLE compression_codec_multiple_replicated2 (
     id UInt64 CODEC(LZ4, ZSTD, NONE, LZ4HC, Delta(4)),
     data String CODEC(ZSTD(2), NONE, Delta(2), LZ4HC, LZ4, LZ4, Delta(8)),
     ddd Date CODEC(NONE, NONE, NONE, Delta(1), LZ4, ZSTD, LZ4HC, LZ4HC),
     somenum Float64 CODEC(Delta(4), LZ4, LZ4, ZSTD(2), LZ4HC(5), ZSTD(3), ZSTD)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple', '2') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/compression_codec_multiple', '2') ORDER BY tuple();
 
 
 INSERT INTO compression_codec_multiple_replicated2 VALUES (1, 'world', toDate('2018-10-05'), 1.1), (2, 'hello', toDate('2018-10-01'), 2.2), (3, 'buy', toDate('2018-10-11'), 3.3);
@@ -106,7 +108,7 @@ CREATE TABLE compression_codec_multiple_more_types_replicated (
     id Decimal128(13) CODEC(ZSTD, LZ4, ZSTD, ZSTD, Delta(2), Delta(4), Delta(1), LZ4HC),
     data FixedString(12) CODEC(ZSTD, ZSTD, Delta(1), Delta(1), Delta(1), NONE, NONE, NONE, LZ4HC),
     ddd Nested (age UInt8, Name String) CODEC(LZ4, LZ4HC, NONE, NONE, NONE, ZSTD, Delta(8))
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple_more_types_replicated', '1') ORDER BY tuple();
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/compression_codec_multiple_more_types_replicated', '1') ORDER BY tuple();
 
 SHOW CREATE TABLE compression_codec_multiple_more_types_replicated;
 
@@ -124,7 +126,7 @@ CREATE TABLE compression_codec_multiple_with_key_replicated (
     somedate Date CODEC(ZSTD, ZSTD, ZSTD(12), LZ4HC(12), Delta, Delta),
     id UInt64 CODEC(LZ4, ZSTD, Delta, NONE, LZ4HC, Delta),
     data String CODEC(ZSTD(2), Delta(1), LZ4HC, NONE, LZ4, LZ4)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/compression_codec_multiple_with_key_replicated', '1') PARTITION BY somedate ORDER BY id SETTINGS index_granularity = 2;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/compression_codec_multiple_with_key_replicated', '1') PARTITION BY somedate ORDER BY id SETTINGS index_granularity = 2;
 
 
 INSERT INTO compression_codec_multiple_with_key_replicated VALUES(toDate('2018-10-12'), 100000, 'hello'), (toDate('2018-10-12'), 100002, 'world'), (toDate('2018-10-12'), 1111, '!');
diff --git a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
index 548f26eadd0..ffc1e0906ce 100644
--- a/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
+++ b/tests/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 SET send_logs_level = 'fatal';
 SET replication_alter_partitions_sync = 2;
 
@@ -7,12 +9,12 @@ DROP TABLE IF EXISTS alter_compression_codec2;
 CREATE TABLE alter_compression_codec1 (
     somedate Date CODEC(LZ4),
     id UInt64 CODEC(NONE)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/'||currentDatabase()||'alter_compression_codecs/{shard}', '1_{replica}') PARTITION BY somedate ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/'||currentDatabase()||'alter_compression_codecs/{shard}', '1_{replica}') PARTITION BY somedate ORDER BY id;
 
 CREATE TABLE alter_compression_codec2 (
   somedate Date CODEC(LZ4),
   id UInt64 CODEC(NONE)
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00910/'||currentDatabase()||'alter_compression_codecs/{shard}', '2_{replica}') PARTITION BY somedate ORDER BY id;
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00910/'||currentDatabase()||'alter_compression_codecs/{shard}', '2_{replica}') PARTITION BY somedate ORDER BY id;
 
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 1);
 INSERT INTO alter_compression_codec1 VALUES('2018-01-01', 2);
diff --git a/tests/queries/0_stateless/00911_tautological_compare.sql b/tests/queries/0_stateless/00911_tautological_compare.sql
index bcbbbeb514b..93fd930d4bb 100644
--- a/tests/queries/0_stateless/00911_tautological_compare.sql
+++ b/tests/queries/0_stateless/00911_tautological_compare.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 -- TODO: Tautological optimization breaks JIT expression compilation, because it can return constant result
 -- for non constant columns. And then sample blocks from same ActionsDAGs can be mismatched.
 -- This optimization cannot be performed on AST rewrite level, because we does not have information about types
diff --git a/tests/queries/0_stateless/00914_replicate.sql b/tests/queries/0_stateless/00914_replicate.sql
index 4147df0ad45..0e6ac2bd331 100644
--- a/tests/queries/0_stateless/00914_replicate.sql
+++ b/tests/queries/0_stateless/00914_replicate.sql
@@ -1 +1,3 @@
+-- Tags: replica
+
 SELECT CAST(replicate(['a'], [1]) AS String);
diff --git a/tests/queries/0_stateless/00918_json_functions.reference b/tests/queries/0_stateless/00918_json_functions.reference
index 462449222b3..8e6fc3914e0 100644
--- a/tests/queries/0_stateless/00918_json_functions.reference
+++ b/tests/queries/0_stateless/00918_json_functions.reference
@@ -203,6 +203,11 @@ Friday
 [('a','"hello"'),('b','[-100,200,300]')]
 [('a','"hello"'),('b','[-100,200,300]'),('c','{"d":[121,144]}')]
 [('d','[121,144]')]
+--JSONExtractKeys--
+['a','b']
+[]
+[]
+['d']
 --const/non-const mixed--
 a
 b
diff --git a/tests/queries/0_stateless/00918_json_functions.sql b/tests/queries/0_stateless/00918_json_functions.sql
index f548b9e5e66..87682587c8e 100644
--- a/tests/queries/0_stateless/00918_json_functions.sql
+++ b/tests/queries/0_stateless/00918_json_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT '--allow_simdjson=1--';
 SET allow_simdjson=1;
 
@@ -229,6 +231,12 @@ SELECT JSONExtractKeysAndValuesRaw('{"a": "hello", "b": [-100, 200.0, 300]}');
 SELECT JSONExtractKeysAndValuesRaw('{"a": "hello", "b": [-100, 200.0, 300], "c":{"d":[121,144]}}');
 SELECT JSONExtractKeysAndValuesRaw('{"a": "hello", "b": [-100, 200.0, 300], "c":{"d":[121,144]}}', 'c');
 
+SELECT '--JSONExtractKeys--';
+SELECT JSONExtractKeys('{"a": "hello", "b": [-100, 200.0, 300]}');
+SELECT JSONExtractKeys('{"a": "hello", "b": [-100, 200.0, 300]}', 'b');
+SELECT JSONExtractKeys('{"a": "hello", "b": [-100, 200.0, 300]}', 'a');
+SELECT JSONExtractKeys('{"a": "hello", "b": [-100, 200.0, 300], "c":{"d":[121,144]}}', 'c');
+
 SELECT '--const/non-const mixed--';
 SELECT JSONExtractString('["a", "b", "c", "d", "e"]', idx) FROM (SELECT arrayJoin([1,2,3,4,5]) AS idx);
 SELECT JSONExtractString(json, 's') FROM (SELECT arrayJoin(['{"s":"u"}', '{"s":"v"}']) AS json);
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
index 52a29c19be1..6d2cd0a176b 100755
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL="none"
 # We should have correct env vars from shell_config.sh to run this test
@@ -13,4 +14,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 python3 "${CURDIR}"/00921_datetime64_compatibility_long.python \
     | ${CLICKHOUSE_CLIENT} --ignore-error -T -nm --calculate_text_stack_trace 0 --log-level 'error' 2>&1 \
-    | grep -v 'Received exception .*$' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
+    | grep -v -e 'Received exception .*$' -e '^(query: ' | sed 's/^\(Code: [0-9]\+\).*$/\1/g'
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.reference b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
similarity index 51%
rename from tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql
rename to tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
index e227222a939..dcfeb85da33 100644
--- a/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql
+++ b/tests/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sql
@@ -1,7 +1,10 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS replicated_optimize1;
 DROP TABLE IF EXISTS replicated_optimize2;
-CREATE TABLE replicated_optimize1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00925/optimize', 'r1', d, k, 8192);
-CREATE TABLE replicated_optimize2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_00925/optimize', 'r2', d, k, 8192);
+CREATE TABLE replicated_optimize1 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00925/optimize', 'r1', d, k, 8192);
+CREATE TABLE replicated_optimize2 (d Date, k UInt64, i32 Int32) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_00925/optimize', 'r2', d, k, 8192);
 
 OPTIMIZE TABLE replicated_optimize1 FINAL;
 
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
index 3a176a17f5a..26be1c6ee8a 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
@@ -1,11 +1,11 @@
 4
-4
-8
+5
 8
+9
 -----
 4
-1
+2
 0
 0
 6
-2
+3
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
index 3e002b3899c..1a68af74960 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
@@ -1,66 +1,66 @@
 ----HORIZONTAL MERGE TESTS----
 4
+5
+8
+9
+-----
 4
+3
 8
-8
+5
 -----
 4
 2
 8
-4
------
-4
-1
-8
-2
------
-4
-1
-8
-1
------
-4
-1
-4
-1
-8
-1
-42	42
-100	aaaa
-101	bbbb
-102	cccc
-103	dddd
-2
-----VERTICAL MERGE TESTS----
-4
-4
-8
-8
+3
 -----
 4
 2
 8
-4
------
-4
-1
-8
 2
 -----
 4
-1
+2
+4
+2
 8
 2
------
-4
-1
-4
-1
-8
-1
 42	42
 100	aaaa
 101	bbbb
 102	cccc
 103	dddd
 3
+----VERTICAL MERGE TESTS----
+4
+5
+8
+9
+-----
+4
+3
+8
+5
+-----
+4
+2
+8
+3
+-----
+4
+2
+8
+3
+-----
+4
+2
+4
+2
+8
+2
+42	42
+100	aaaa
+101	bbbb
+102	cccc
+103	dddd
+4
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
index 249c6eebfcf..a29a1bf9d1c 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
 DROP TABLE IF EXISTS zero_rows_per_granule;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
index 3f151abc8fc..ba34cfad299 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 SELECT '----00489----';
 DROP TABLE IF EXISTS pk;
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
index 5d5f3af28ab..b4ef1031186 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
@@ -1,32 +1,32 @@
 4
+5
+8
+9
+-----
 4
+3
 8
-8
+5
 -----
 4
 2
 8
-4
+3
 -----
 4
-1
-8
 2
+8
+3
 -----
 4
-1
-8
 2
------
 4
-1
-4
-1
-8
 2
+8
+3
 42	42
 100	aaaa
 101	bbbb
 102	cccc
 103	dddd
-3
+4
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
index 3542a6acd0a..075548df6c3 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 ----- Group of very similar simple tests ------
 DROP TABLE IF EXISTS zero_rows_per_granule;
 
diff --git a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
index f93aae0225a..9b2c420f3d9 100644
--- a/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
@@ -1,14 +1,14 @@
 4
-4
-8
+5
 8
+9
 -----
 4
-1
-0
-6
 2
------
+0
 6
 3
+-----
+6
+4
 0
diff --git a/tests/queries/0_stateless/00926_geo_to_h3.sql b/tests/queries/0_stateless/00926_geo_to_h3.sql
index a8315eb7ea6..8992f6ce348 100644
--- a/tests/queries/0_stateless/00926_geo_to_h3.sql
+++ b/tests/queries/0_stateless/00926_geo_to_h3.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS table1;
 
 CREATE TABLE table1 (lat Float64, lon Float64, resolution UInt8) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/00926_multimatch.sql b/tests/queries/0_stateless/00926_multimatch.sql
index bf67533bb6c..6a90bfec914 100644
--- a/tests/queries/0_stateless/00926_multimatch.sql
+++ b/tests/queries/0_stateless/00926_multimatch.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 select 0 = multiMatchAny(materialize('mpnsguhwsitzvuleiwebwjfitmsg'), ['wbirxqoabpblrnvvmjizj', 'cfcxhuvrexyzyjsh', 'oldhtubemyuqlqbwvwwkwin', 'bumoozxdkjglzu', 'intxlfohlxmajjomw', 'dxkeghohv', 'arsvmwwkjeopnlwnan', 'ouugllgowpqtaxslcopkytbfhifaxbgt', 'hkedmjlbcrzvryaopjqdjjc', 'tbqkljywstuahzh', 'o', 'wowoclosyfcuwotmvjygzuzhrery', 'vpefjiffkhlggntcu', 'ytdixvasrorhripzfhjdmlhqksmctyycwp']) from system.numbers limit 10;
 select 0 = multiMatchAny(materialize('qjjzqexjpgkglgxpzrbqbnskq'), ['vaiatcjacmlffdzsejpdareqzy', 'xspcfzdufkmecud', 'bcvtbuqtctq', 'nkcopwbfytgemkqcfnnno', 'dylxnzuyhq', 'tno', 'scukuhufly', 'cdyquzuqlptv', 'ohluyfeksyxepezdhqmtfmgkvzsyph', 'ualzwtahvqvtijwp', 'jg', 'gwbawqlngzcknzgtmlj', 'qimvjcgbkkp', 'eaedbcgyrdvv', 'qcwrncjoewwedyyewcdkh', 'uqcvhngoqngmitjfxpznqomertqnqcveoqk', 'ydrgjiankgygpm', 'axepgap']) from system.numbers limit 10;
 select 0 = multiMatchAny(materialize('fdkmtqmxnegwvnjhghjq'), ['vynkybvdmhgeezybbdqfrukibisj', 'knazzamgjjpavwhvdkwigykh', 'peumnifrmdhhmrqqnemw', 'lmsnyvqoisinlaqobxojlwfbi', 'oqwfzs', 'dymudxxeodwjpgbibnkvr', 'vomtfsnizkplgzktqyoiw', 'yoyfuhlpgrzds', 'cefao', 'gi', 'srpgxfjwl', 'etsjusdeiwbfe', 'ikvtzdopxo', 'ljfkavrau', 'soqdhxtenfrkmeic', 'ktprjwfcelzbup', 'pcvuoddqwsaurcqdtjfnczekwni', 'agkqkqxkfbkfgyqliahsljim']) from system.numbers limit 10;
diff --git a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.reference b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.reference
similarity index 91%
rename from tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.reference
rename to tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.reference
index ea48fbf86d7..1df87e72e98 100644
--- a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.reference
+++ b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.reference
@@ -1,56 +1,56 @@
 ----HORIZONTAL MERGE TESTS----
 Replica synced
 4
+5
 4
-4
-4
-4
-4
+5
+5
+5
 Parts optimized
 Replica synced
 8
+9
 8
-8
-8
+9
 -----
 4
-1
+2
 Replica synced
 4
-1
+2
 Table attached
-1
-1
+2
+2
 Parts optimized
 8
 Replica synced
 8
 -----
 4
-1
+2
 Replica synced
 4
-1
+2
 4
-1
+2
 Replica synced
 4
-1
+2
 8
-1
+2
 8
-1
+2
 Parts optimized
 42	42
 100	aaaa
 101	bbbb
 102	cccc
 103	dddd
-2
+3
 Replica synced
 42	42
 100	aaaa
 101	bbbb
 102	cccc
 103	dddd
-2
+3
diff --git a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
similarity index 83%
rename from tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql
rename to tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
index 92b34a243a4..e6ca25a3dd6 100644
--- a/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql
+++ b/tests/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 ----- Group of very similar simple tests ------
 select '----HORIZONTAL MERGE TESTS----';
 DROP TABLE IF EXISTS zero_rows_per_granule1;
@@ -8,14 +10,14 @@ CREATE TABLE zero_rows_per_granule1 (
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/zero_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, min_index_granularity_bytes = 10, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00926/zero_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, min_index_granularity_bytes = 10, write_final_mark = 0;
 
 CREATE TABLE zero_rows_per_granule2 (
   p Date,
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/zero_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, min_index_granularity_bytes = 10, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00926/zero_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 20, min_index_granularity_bytes = 10, write_final_mark = 0;
 
 INSERT INTO zero_rows_per_granule1 (p, k, v1, v2) VALUES ('2018-05-15', 1, 1000, 2000), ('2018-05-16', 2, 3000, 4000), ('2018-05-17', 3, 5000, 6000), ('2018-05-18', 4, 7000, 8000);
 
@@ -68,14 +70,14 @@ CREATE TABLE four_rows_per_granule1 (
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/four_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00926/four_rows_in_granule', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
 
 CREATE TABLE four_rows_per_granule2 (
   p Date,
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/four_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100 ,write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00926/four_rows_in_granule', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100 ,write_final_mark = 0;
 
 INSERT INTO four_rows_per_granule1 (p, k, v1, v2) VALUES ('2018-05-15', 1, 1000, 2000), ('2018-05-16', 2, 3000, 4000), ('2018-05-17', 3, 5000, 6000), ('2018-05-18', 4, 7000, 8000);
 
@@ -135,14 +137,14 @@ CREATE TABLE adaptive_granularity_alter1 (
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/adaptive_granularity_alter', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00926/adaptive_granularity_alter', '1') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
 
 CREATE TABLE adaptive_granularity_alter2 (
   p Date,
   k UInt64,
   v1 UInt64,
   v2 Int64
-) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00926/adaptive_granularity_alter', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
+) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00926/adaptive_granularity_alter', '2') PARTITION BY toYYYYMM(p) ORDER BY k SETTINGS index_granularity_bytes = 110, min_index_granularity_bytes = 100, write_final_mark = 0;
 
 INSERT INTO adaptive_granularity_alter1 (p, k, v1, v2) VALUES ('2018-05-15', 1, 1000, 2000), ('2018-05-16', 2, 3000, 4000), ('2018-05-17', 3, 5000, 6000), ('2018-05-18', 4, 7000, 8000);
 
diff --git a/tests/queries/0_stateless/00927_asof_join_long.sql b/tests/queries/0_stateless/00927_asof_join_long.sql
index eb6eabfa4b9..c03a06d48d4 100644
--- a/tests/queries/0_stateless/00927_asof_join_long.sql
+++ b/tests/queries/0_stateless/00927_asof_join_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS tvs;
 
 CREATE TABLE tvs(k UInt32, t UInt32, tv UInt64) ENGINE = Memory;
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 a34437f66c2..83ee534ff91 100644
--- a/tests/queries/0_stateless/00927_asof_join_other_types.reference
+++ b/tests/queries/0_stateless/00927_asof_join_other_types.reference
@@ -13,15 +13,15 @@
 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	1.00000	1	0
-2	3.00000	3	3
-2	5.00000	5	3
-2	1.00000	1	0
-2	3.00000	3	3
-2	5.00000	5	3
-2	1.00000	1	0
-2	3.00000	3	3
-2	5.00000	5	3
+2	1	1	0
+2	3	3	3
+2	5	5	3
+2	1	1	0
+2	3	3	3
+2	5	5	3
+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
diff --git a/tests/queries/0_stateless/00927_disable_hyperscan.sql b/tests/queries/0_stateless/00927_disable_hyperscan.sql
index 009ed2629a8..9f0f6ca1538 100644
--- a/tests/queries/0_stateless/00927_disable_hyperscan.sql
+++ b/tests/queries/0_stateless/00927_disable_hyperscan.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug
+
 SET allow_hyperscan = 1;
 SELECT multiMatchAny(arrayJoin(['hello', 'world', 'hellllllllo', 'wororld', 'abc']), ['hel+o', 'w(or)*ld']);
 SET allow_hyperscan = 0;
diff --git a/tests/queries/0_stateless/00929_multi_match_edit_distance.sql b/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
index 50f2359a685..176e2a24b28 100644
--- a/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
+++ b/tests/queries/0_stateless/00929_multi_match_edit_distance.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Hyperscan
+
 SET send_logs_level = 'fatal';
 
 select 0 = multiFuzzyMatchAny('abc', 0, ['a1c']) from system.numbers limit 5;
diff --git a/tests/queries/0_stateless/00933_alter_ttl.sql b/tests/queries/0_stateless/00933_alter_ttl.sql
index f3f6858cbb4..4f586bb20fa 100644
--- a/tests/queries/0_stateless/00933_alter_ttl.sql
+++ b/tests/queries/0_stateless/00933_alter_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set send_logs_level = 'fatal';
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/00933_reserved_word.sql b/tests/queries/0_stateless/00933_reserved_word.sql
index 447a618bfc9..3a26bc6ac98 100644
--- a/tests/queries/0_stateless/00933_reserved_word.sql
+++ b/tests/queries/0_stateless/00933_reserved_word.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS reserved_word_table;
 CREATE TABLE reserved_word_table (`index` UInt8) ENGINE = MergeTree ORDER BY `index`;
 
diff --git a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
index 36ac490c80f..df4c5e233e4 100755
--- a/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
+++ b/tests/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
deleted file mode 100644
index e84c3beabee..00000000000
--- a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-200
-400
-CREATE TABLE default.ttl_repl2\n(\n    `d` Date,\n    `x` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_00933/ttl_repl\', \'2\')\nPARTITION BY toDayOfMonth(d)\nORDER BY x\nTTL d + toIntervalDay(1)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.reference b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.reference
new file mode 100644
index 00000000000..3dc07236d2b
--- /dev/null
+++ b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.reference
@@ -0,0 +1,3 @@
+200
+400
+CREATE TABLE default.ttl_repl2\n(\n    `d` Date,\n    `x` UInt32\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_00933/ttl_repl\', \'2\')\nPARTITION BY toDayOfMonth(d)\nORDER BY x\nTTL d + toIntervalDay(1)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
similarity index 86%
rename from tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
rename to tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
index dbbbe887e9f..1728cc7458e 100644
--- a/tests/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
@@ -1,9 +1,11 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS ttl_repl1;
 DROP TABLE IF EXISTS ttl_repl2;
 
-CREATE TABLE ttl_repl1(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00933/ttl_repl', '1')
+CREATE TABLE ttl_repl1(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00933/ttl_repl', '1')
     PARTITION BY toDayOfMonth(d) ORDER BY x TTL d + INTERVAL 1 DAY;
-CREATE TABLE ttl_repl2(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_00933/ttl_repl', '2')
+CREATE TABLE ttl_repl2(d Date, x UInt32) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_00933/ttl_repl', '2')
     PARTITION BY toDayOfMonth(d) ORDER BY x TTL d + INTERVAL 1 DAY;
 
 INSERT INTO TABLE ttl_repl1 VALUES (toDate('2000-10-10 00:00:00'), 100);
diff --git a/tests/queries/0_stateless/00933_ttl_with_default.sql b/tests/queries/0_stateless/00933_ttl_with_default.sql
index e6c0a6e700c..5504e33235c 100644
--- a/tests/queries/0_stateless/00933_ttl_with_default.sql
+++ b/tests/queries/0_stateless/00933_ttl_with_default.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl_00933_2;
 
 create table ttl_00933_2 (d DateTime, a Int default 111 ttl d + interval 1 DAY) engine = MergeTree order by tuple() partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
index 01519f7a598..795f41528b2 100755
--- a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
+++ b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00941_system_columns_race_condition.sh b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
index 1b34abc50d7..69dfb30cd2c 100755
--- a/tests/queries/0_stateless/00941_system_columns_race_condition.sh
+++ b/tests/queries/0_stateless/00941_system_columns_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00950_dict_get.reference b/tests/queries/0_stateless/00950_dict_get.reference
index c1b502bf773..191eb40a889 100644
--- a/tests/queries/0_stateless/00950_dict_get.reference
+++ b/tests/queries/0_stateless/00950_dict_get.reference
@@ -31,18 +31,18 @@ dictGetOrDefault	complex_hashed_strings	0	*	*
 dictGet	complex_cache_strings	1	1	1
 dictGetOrDefault	complex_cache_strings	1	1	1
 dictGetOrDefault	complex_cache_strings	0	*	*
-dictGet	flat_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	flat_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	flat_decimals	0	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
-dictGet	hashed_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	hashed_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	hashed_decimals	0	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
-dictGet	cache_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	cache_decimals	1	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	cache_decimals	0	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
-dictGet	complex_hashed_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	complex_hashed_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	complex_hashed_decimals	(0)	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
-dictGet	complex_cache_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	complex_cache_decimals	(1)	1.0000	1.000000	1.0	(1.0000,1.000000,1.0)
-dictGetOrDefault	complex_cache_decimals	(0)	42.0000	42.000000	42.0	(42.0000,42.000000,42.0)
+dictGet	flat_decimals	1	1	1	1	(1,1,1)
+dictGetOrDefault	flat_decimals	1	1	1	1	(1,1,1)
+dictGetOrDefault	flat_decimals	0	42	42	42	(42,42,42)
+dictGet	hashed_decimals	1	1	1	1	(1,1,1)
+dictGetOrDefault	hashed_decimals	1	1	1	1	(1,1,1)
+dictGetOrDefault	hashed_decimals	0	42	42	42	(42,42,42)
+dictGet	cache_decimals	1	1	1	1	(1,1,1)
+dictGetOrDefault	cache_decimals	1	1	1	1	(1,1,1)
+dictGetOrDefault	cache_decimals	0	42	42	42	(42,42,42)
+dictGet	complex_hashed_decimals	(1)	1	1	1	(1,1,1)
+dictGetOrDefault	complex_hashed_decimals	(1)	1	1	1	(1,1,1)
+dictGetOrDefault	complex_hashed_decimals	(0)	42	42	42	(42,42,42)
+dictGet	complex_cache_decimals	(1)	1	1	1	(1,1,1)
+dictGetOrDefault	complex_cache_decimals	(1)	1	1	1	(1,1,1)
+dictGetOrDefault	complex_cache_decimals	(0)	42	42	42	(42,42,42)
diff --git a/tests/queries/0_stateless/00950_dict_get.sql b/tests/queries/0_stateless/00950_dict_get.sql
index e49e05fbd27..28f517a73cb 100644
--- a/tests/queries/0_stateless/00950_dict_get.sql
+++ b/tests/queries/0_stateless/00950_dict_get.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Must use `system` database and these tables - they're configured in tests/*_dictionary.xml
 use system;
 drop table if exists ints;
diff --git a/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql b/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
index 641e942bb8f..3a9a9154abe 100644
--- a/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
+++ b/tests/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local_00952;
 DROP TABLE IF EXISTS distributed_00952;
 
diff --git a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
index ca3f4efe743..0705c955d60 100755
--- a/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+++ b/tests/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database
+# Tag no-replicated-database: Requires investigation
 
 set -e
 
diff --git a/tests/queries/0_stateless/00954_client_prepared_statements.sh b/tests/queries/0_stateless/00954_client_prepared_statements.sh
index 460b0d44943..7b74d792586 100755
--- a/tests/queries/0_stateless/00954_client_prepared_statements.sh
+++ b/tests/queries/0_stateless/00954_client_prepared_statements.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00955_test_final_mark.sql b/tests/queries/0_stateless/00955_test_final_mark.sql
index e020f10b71a..6615c945ef8 100644
--- a/tests/queries/0_stateless/00955_test_final_mark.sql
+++ b/tests/queries/0_stateless/00955_test_final_mark.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS mt_with_pk;
diff --git a/tests/queries/0_stateless/00955_test_final_mark_use.sh b/tests/queries/0_stateless/00955_test_final_mark_use.sh
index 3c7db3249b3..2c3219fbffd 100755
--- a/tests/queries/0_stateless/00955_test_final_mark_use.sh
+++ b/tests/queries/0_stateless/00955_test_final_mark_use.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00956_sensitive_data_masking.sh b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
index 7462dfd5585..e7179e1e002 100755
--- a/tests/queries/0_stateless/00956_sensitive_data_masking.sh
+++ b/tests/queries/0_stateless/00956_sensitive_data_masking.sh
@@ -37,7 +37,7 @@ echo 3
 # failure at before query start
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET' FROM non_existing_table FORMAT Null" \
-  --log_queries=1 --ignore-error --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 3a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 3b'
@@ -47,7 +47,7 @@ echo 4
 # failure at the end of query
 $CLICKHOUSE_CLIENT \
   --query="SELECT 'find_me_TOPSECRET=TOPSECRET', intDiv( 100, number - 10) FROM numbers(11) FORMAT Null" \
-  --log_queries=1 --ignore-error --max_block_size=2 --multiquery >"$tmp_file" 2>&1
+  --log_queries=1 --ignore-error --max_block_size=2 --multiquery |& grep -v '^(query: ' > "$tmp_file"
 
 grep -F 'find_me_[hidden]' "$tmp_file" >/dev/null || echo 'fail 4a'
 grep -F 'TOPSECRET' "$tmp_file" && echo 'fail 4b'
@@ -57,7 +57,7 @@ echo 5
 rm -f "$tmp_file2" >/dev/null 2>&1
 bash -c "$CLICKHOUSE_CLIENT \
   --query=\"select sleepEachRow(1) from numbers(10) where ignore('find_me_TOPSECRET=TOPSECRET')=0 and ignore('fwerkh_that_magic_string_make_me_unique') = 0 FORMAT Null\" \
-  --log_queries=1 --ignore-error --multiquery >$tmp_file2 2>&1" &
+  --log_queries=1 --ignore-error --multiquery |& grep -v '^(query: ' > $tmp_file2" &
 
 rm -f "$tmp_file" >/dev/null 2>&1
 # check that executing query doesn't expose secrets in processlist
diff --git a/tests/queries/0_stateless/00960_live_view_watch_events_live.py b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
index 780c31f20ca..9327bc59f80 100755
--- a/tests/queries/0_stateless/00960_live_view_watch_events_live.py
+++ b/tests/queries/0_stateless/00960_live_view_watch_events_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00961_temporary_live_view_watch.sql b/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
index c33fa699321..8bf6fa5e07b 100644
--- a/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
+++ b/tests/queries/0_stateless/00961_temporary_live_view_watch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
index 27308548452..5dd357a314a 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
index 76b9980d1f5..95b5530436d 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import time
diff --git a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
index 34d5db676f4..57cb57d03c5 100755
--- a/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
+++ b/tests/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py b/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
index 073c8c88e2b..98d65b47d39 100755
--- a/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
+++ b/tests/queries/0_stateless/00962_temporary_live_view_watch_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
index cfd218d5983..0b6ac65e77c 100755
--- a/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
+++ b/tests/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
index 03b598fe46f..c352004078b 100755
--- a/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
+++ b/tests/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
index 15c4e763634..c1c14e8615b 100755
--- a/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
+++ b/tests/queries/0_stateless/00965_live_view_watch_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
index 7026466fbab..0d82519e4d3 100644
--- a/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
+++ b/tests/queries/0_stateless/00965_shard_unresolvable_addresses.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT count() FROM remote('127.0.0.1,localhos', system.one); -- { serverError 198 }
 SELECT count() FROM remote('127.0.0.1|localhos', system.one);
 
diff --git a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
index 0e7fa55dbae..ca8d6ace69a 100644
--- a/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
+++ b/tests/queries/0_stateless/00966_invalid_json_must_not_parse.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET allow_simdjson=1;
 
 SELECT JSONLength('"HX-=');
diff --git a/tests/queries/0_stateless/00966_live_view_watch_events_http.py b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
index 1c00a5d1236..dcbae5498bf 100755
--- a/tests/queries/0_stateless/00966_live_view_watch_events_http.py
+++ b/tests/queries/0_stateless/00966_live_view_watch_events_http.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql b/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
index 3b562801f92..b59b0b144f0 100644
--- a/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
+++ b/tests/queries/0_stateless/00967_insert_into_distributed_different_types.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync=1;
 
 DROP TABLE IF EXISTS dist_00967;
diff --git a/tests/queries/0_stateless/00967_live_view_watch_http.py b/tests/queries/0_stateless/00967_live_view_watch_http.py
index c41b9f0c861..05d7905e8ed 100755
--- a/tests/queries/0_stateless/00967_live_view_watch_http.py
+++ b/tests/queries/0_stateless/00967_live_view_watch_http.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
index eef27ba4999..77b0f37e10f 100644
--- a/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
+++ b/tests/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
index c890cc28dc6..2d5d5f48b34 100644
--- a/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
+++ b/tests/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
index 76e5cdbe88d..fbd7660bafe 100755
--- a/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
+++ b/tests/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
index 5da36ab2d5f..db5e1698a10 100755
--- a/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
+++ b/tests/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 
diff --git a/tests/queries/0_stateless/00972_live_view_select_1.sql b/tests/queries/0_stateless/00972_live_view_select_1.sql
index 2034d699065..20344466856 100644
--- a/tests/queries/0_stateless/00972_live_view_select_1.sql
+++ b/tests/queries/0_stateless/00972_live_view_select_1.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select.sql b/tests/queries/0_stateless/00973_live_view_select.sql
index f51c2071fc7..0844c730b26 100644
--- a/tests/queries/0_stateless/00973_live_view_select.sql
+++ b/tests/queries/0_stateless/00973_live_view_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
index df3b7cb505a..d0d27464618 100644
--- a/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
+++ b/tests/queries/0_stateless/00973_live_view_select_prewhere.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
index 7ec992e63e7..9d644f245f6 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
index 4045f6c8434..562e6df1bfd 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
index 1c0e779123d..60078ccff30 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
index 75e42f76ac4..700de5955f9 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
index ea70d8f27b7..3a9408a62fa 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
index 10a33a18b61..c0f218edbd8 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
index 9094f923350..2d7da9d6df5 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
index 069889f210e..bdf74949f57 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
index 286d0db6102..a80af3e3337 100644
--- a/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
+++ b/tests/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00974_distributed_join_on.sql b/tests/queries/0_stateless/00974_distributed_join_on.sql
index 355d9f81e82..2138fb0900f 100644
--- a/tests/queries/0_stateless/00974_distributed_join_on.sql
+++ b/tests/queries/0_stateless/00974_distributed_join_on.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS source_table1;
 DROP TABLE IF EXISTS source_table2;
 DROP TABLE IF EXISTS distributed_table1;
diff --git a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
index c4e7829b7dd..09eea37de60 100644
--- a/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
+++ b/tests/queries/0_stateless/00974_live_view_select_with_aggregation.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00974_low_cardinality_cast.sql b/tests/queries/0_stateless/00974_low_cardinality_cast.sql
index e369a8c169e..b52c00513d3 100644
--- a/tests/queries/0_stateless/00974_low_cardinality_cast.sql
+++ b/tests/queries/0_stateless/00974_low_cardinality_cast.sql
@@ -1,3 +1,5 @@
+SET cast_keep_nullable = 0;
+
 SELECT CAST('Hello' AS LowCardinality(Nullable(String)));
 SELECT CAST(Null AS LowCardinality(Nullable(String)));
 SELECT CAST(CAST('Hello' AS LowCardinality(Nullable(String))) AS String);
diff --git a/tests/queries/0_stateless/00974_query_profiler.sql b/tests/queries/0_stateless/00974_query_profiler.sql
index 9bfd44628c9..343a8a4dbf3 100644
--- a/tests/queries/0_stateless/00974_query_profiler.sql
+++ b/tests/queries/0_stateless/00974_query_profiler.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-fasttest
+-- Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
+
 SET allow_introspection_functions = 1;
 
 SET query_profiler_real_time_period_ns = 100000000;
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
index 22c404c7712..5ad4007b873 100755
--- a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, replica
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00975_json_hang.sql b/tests/queries/0_stateless/00975_json_hang.sql
index d60411cb796..71d921f0475 100644
--- a/tests/queries/0_stateless/00975_json_hang.sql
+++ b/tests/queries/0_stateless/00975_json_hang.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DISTINCT JSONExtractRaw(concat('{"x":', rand() % 2 ? 'true' : 'false', '}'), 'x') AS res FROM numbers(1000000) ORDER BY res;
diff --git a/tests/queries/0_stateless/00975_live_view_create.sql b/tests/queries/0_stateless/00975_live_view_create.sql
index aa567f6a07f..1e7eb674bcc 100644
--- a/tests/queries/0_stateless/00975_live_view_create.sql
+++ b/tests/queries/0_stateless/00975_live_view_create.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS mt;
diff --git a/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql b/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
index a35260615c1..15e12c4ce81 100644
--- a/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
+++ b/tests/queries/0_stateless/00975_sample_prewhere_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 create table if not exists sample_prewhere (date Date, id Int32, time Int64) engine = MergeTree partition by date order by (id, time, intHash64(time)) sample by intHash64(time);
 
 insert into sample_prewhere values ('2019-01-01', 2, toDateTime('2019-07-20 00:00:01'));
diff --git a/tests/queries/0_stateless/00975_values_list.reference b/tests/queries/0_stateless/00975_values_list.reference
index f8ada08d130..d0811d264b0 100644
--- a/tests/queries/0_stateless/00975_values_list.reference
+++ b/tests/queries/0_stateless/00975_values_list.reference
@@ -10,5 +10,5 @@ cadabra
 abracadabra
 23	23	23
 24	24	24
-1.6660	a	b
+1.666	a	b
 \N
diff --git a/tests/queries/0_stateless/00976_asof_join_on.sql b/tests/queries/0_stateless/00976_asof_join_on.sql
index ccecc0999c9..8060fb86831 100644
--- a/tests/queries/0_stateless/00976_asof_join_on.sql
+++ b/tests/queries/0_stateless/00976_asof_join_on.sql
@@ -21,5 +21,7 @@ SELECT A.a, A.t, B.b, B.t FROM A ASOF JOIN B ON A.a == B.b AND A.t < B.t ORDER B
 SELECT count() FROM A ASOF JOIN B ON A.a == B.b AND A.t == B.t; -- { serverError 403 }
 SELECT count() FROM A ASOF JOIN B ON A.a == B.b AND A.t != B.t; -- { serverError 403 }
 
+SELECT A.a, A.t, B.b, B.t FROM A ASOF JOIN B ON A.a == B.b AND A.t < B.t OR A.a == B.b + 1 ORDER BY (A.a, A.t); -- { serverError 48 }
+
 DROP TABLE A;
 DROP TABLE B;
diff --git a/tests/queries/0_stateless/00976_live_view_select_version.sql b/tests/queries/0_stateless/00976_live_view_select_version.sql
index e9538b2e592..39ca587a49f 100644
--- a/tests/queries/0_stateless/00976_live_view_select_version.sql
+++ b/tests/queries/0_stateless/00976_live_view_select_version.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql b/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
index 3736be891cd..945292c5432 100644
--- a/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
+++ b/tests/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS han_1;
 CREATE TABLE han_1 (k Int32, date_dt LowCardinality(Nullable(String))) 
 ENGINE = MergeTree() PARTITION BY k ORDER BY k;
diff --git a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
index 60151595983..8473a69aedd 100644
--- a/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
+++ b/tests/queries/0_stateless/00976_ttl_with_old_parts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d) settings remove_empty_parts = 0;
diff --git a/tests/queries/0_stateless/00977_live_view_watch_events.sql b/tests/queries/0_stateless/00977_live_view_watch_events.sql
index 926f6637ec5..3fe395b45fa 100644
--- a/tests/queries/0_stateless/00977_live_view_watch_events.sql
+++ b/tests/queries/0_stateless/00977_live_view_watch_events.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00978_live_view_watch.sql b/tests/queries/0_stateless/00978_live_view_watch.sql
index e2367fc8900..a76b8aef0d0 100644
--- a/tests/queries/0_stateless/00978_live_view_watch.sql
+++ b/tests/queries/0_stateless/00978_live_view_watch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
index 5f5f4d7a960..81e2764d64f 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live.py b/tests/queries/0_stateless/00979_live_view_watch_live.py
index 2fc70352dbf..7bbae932da7 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_live.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
index 54f9ef694d6..f545186d262 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
+++ b/tests/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
index 2918bed82e8..ed2fe61f4b7 100755
--- a/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
+++ b/tests/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import signal
diff --git a/tests/queries/0_stateless/00979_toFloat_monotonicity.reference b/tests/queries/0_stateless/00979_toFloat_monotonicity.reference
index 7d9895ef9f3..b8ec6976930 100644
--- a/tests/queries/0_stateless/00979_toFloat_monotonicity.reference
+++ b/tests/queries/0_stateless/00979_toFloat_monotonicity.reference
@@ -2,5 +2,5 @@
 7777
 7777
 7777
-7777.000
-7777.000
+7777
+7777
diff --git a/tests/queries/0_stateless/00980_alter_settings_race.sh b/tests/queries/0_stateless/00980_alter_settings_race.sh
index 004504b1227..6eb1df8964c 100755
--- a/tests/queries/0_stateless/00980_alter_settings_race.sh
+++ b/tests/queries/0_stateless/00980_alter_settings_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00980_crash_nullable_decimal.reference b/tests/queries/0_stateless/00980_crash_nullable_decimal.reference
index be6e399c4d9..fcb49fa9945 100644
--- a/tests/queries/0_stateless/00980_crash_nullable_decimal.reference
+++ b/tests/queries/0_stateless/00980_crash_nullable_decimal.reference
@@ -1,7 +1,7 @@
-1.00
-1.00
-1.00
-1.00
-1.00
-1.00
-1.00
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/00980_create_temporary_live_view.sql b/tests/queries/0_stateless/00980_create_temporary_live_view.sql
index 2dda5231e73..e01a6d9643e 100644
--- a/tests/queries/0_stateless/00980_create_temporary_live_view.sql
+++ b/tests/queries/0_stateless/00980_create_temporary_live_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/00980_merge_alter_settings.sql b/tests/queries/0_stateless/00980_merge_alter_settings.sql
index 755983ac62b..c0d18f6d453 100644
--- a/tests/queries/0_stateless/00980_merge_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_merge_alter_settings.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS log_for_alter;
 
 CREATE TABLE log_for_alter (
diff --git a/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql b/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
index 06f0dcab55b..786e8c5d7e0 100644
--- a/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
+++ b/tests/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS numbers500k;
 CREATE VIEW numbers500k AS SELECT number FROM system.numbers LIMIT 500000;
 
diff --git a/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql b/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
index cccc4a81038..bdabfc7b5f0 100644
--- a/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
+++ b/tests/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t_distr;
 
diff --git a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
index 25516f577ec..dfb91eb3b0a 100644
--- a/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+++ b/tests/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
@@ -1,3 +1,6 @@
+-- Tags: zookeeper, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS replicated_table_for_alter1;
 DROP TABLE IF EXISTS replicated_table_for_alter2;
 
diff --git a/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql b/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
index 5758f8ab8e5..48d9dedc61c 100644
--- a/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
+++ b/tests/queries/0_stateless/00981_topK_topKWeighted_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS topk;
 
 CREATE TABLE topk (val1 String, val2 UInt32) ENGINE = MergeTree ORDER BY val1;
diff --git a/tests/queries/0_stateless/00984_parser_stack_overflow.sh b/tests/queries/0_stateless/00984_parser_stack_overflow.sh
index 167678db5ec..329e51e774a 100755
--- a/tests/queries/0_stateless/00984_parser_stack_overflow.sh
+++ b/tests/queries/0_stateless/00984_parser_stack_overflow.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-CLICKHOUSE_CURL_TIMEOUT=30
+# Such a huge timeout mostly for debug build.
+CLICKHOUSE_CURL_TIMEOUT=60
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
index d2e2b8f37ef..2749827c880 100644
--- a/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
+++ b/tests/queries/0_stateless/00987_distributed_stack_overflow.sql
@@ -1,11 +1,12 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS distr0;
 DROP TABLE IF EXISTS distr1;
 DROP TABLE IF EXISTS distr2;
 
 CREATE TABLE distr (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr); -- { serverError 269 }
 
-CREATE TABLE distr0 (x UInt8) ENGINE = Distributed(test_shard_localhost, '', distr0);
-SELECT * FROM distr0; -- { serverError 581 }
+CREATE TABLE distr0 (x UInt8) ENGINE = Distributed(test_shard_localhost, '', distr0); -- { serverError 269 }
 
 CREATE TABLE distr1 (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr2);
 CREATE TABLE distr2 (x UInt8) ENGINE = Distributed(test_shard_localhost, currentDatabase(), distr1);
@@ -13,6 +14,5 @@ CREATE TABLE distr2 (x UInt8) ENGINE = Distributed(test_shard_localhost, current
 SELECT * FROM distr1; -- { serverError 581 }
 SELECT * FROM distr2; -- { serverError 581 }
 
-DROP TABLE distr0;
 DROP TABLE distr1;
 DROP TABLE distr2;
diff --git a/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.reference b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
similarity index 85%
rename from tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
rename to tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
index f8895843dd3..0bcde52d3d6 100644
--- a/tests/queries/0_stateless/00988_constraints_replication_zookeeper.sql
+++ b/tests/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS replicated_constraints1;
 DROP TABLE IF EXISTS replicated_constraints2;
 
@@ -6,14 +8,14 @@ CREATE TABLE replicated_constraints1
     a UInt32,
     b UInt32,
     CONSTRAINT a_constraint CHECK a < 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00988/alter_constraints', 'r1') ORDER BY (a);
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00988/alter_constraints', 'r1') ORDER BY (a);
 
 CREATE TABLE replicated_constraints2
 (
     a UInt32,
     b UInt32,
     CONSTRAINT a_constraint CHECK a < 10
-) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00988/alter_constraints', 'r2') ORDER BY (a);
+) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_00988/alter_constraints', 'r2') ORDER BY (a);
 
 INSERT INTO replicated_constraints1 VALUES (1, 2);
 INSERT INTO replicated_constraints2 VALUES (3, 4);
diff --git a/tests/queries/0_stateless/00989_parallel_parts_loading.sql b/tests/queries/0_stateless/00989_parallel_parts_loading.sql
index 0b4c0501669..13cd56e1924 100644
--- a/tests/queries/0_stateless/00989_parallel_parts_loading.sql
+++ b/tests/queries/0_stateless/00989_parallel_parts_loading.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS mt;
 
 CREATE TABLE mt (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS max_part_loading_threads = 16, parts_to_delay_insert = 100000, parts_to_throw_insert = 100000;
diff --git a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
index 0548d24a80b..92cc5b10e6b 100755
--- a/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
+++ b/tests/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
index d441ab94473..abb1a94371d 100755
--- a/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
+++ b/tests/queries/0_stateless/00991_live_view_watch_http.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
index f1b12a319c0..8243c6bde62 100755
--- a/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
+++ b/tests/queries/0_stateless/00991_system_parts_race_condition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 # This test is disabled because it triggers internal assert in Thread Sanitizer.
 # Thread Sanitizer does not support for more than 64 mutexes to be locked in a single thread.
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
index ebe492fafce..97c6c92b999 100755
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
+++ b/tests/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
index 91efff53abe..2e784223186 100755
--- a/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
+++ b/tests/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: disabled, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . $CURDIR/../shell_config.sh
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference
index e69de29bb2d..c3165c3d6ef 100644
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference
@@ -0,0 +1,2 @@
+Replication did not hang: synced all replicas of alter_table
+Consistency: 1
diff --git a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
index 793fc8e9575..aee8a7727e5 100755
--- a/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 set -e
 
 $CLICKHOUSE_CLIENT -n -q "
-    DROP TABLE IF EXISTS alter_table;
-    DROP TABLE IF EXISTS alter_table2;
+    DROP TABLE IF EXISTS alter_table0;
+    DROP TABLE IF EXISTS alter_table1;
 
-    CREATE TABLE alter_table (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
-    CREATE TABLE alter_table2 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0
+    CREATE TABLE alter_table0 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r1') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0;
+    CREATE TABLE alter_table1 (a UInt8, b Int16, c Float32, d String, e Array(UInt8), f Nullable(UUID), g Tuple(UInt8, UInt16)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r2') ORDER BY a PARTITION BY b % 10 SETTINGS old_parts_lifetime = 1, cleanup_delay_period = 1, cleanup_delay_period_random_add = 0
 "
 
 function thread1()
@@ -22,22 +25,22 @@ function thread1()
 
 function thread2()
 {
-    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table ADD COLUMN h String DEFAULT '0'; ALTER TABLE alter_table MODIFY COLUMN h UInt64; ALTER TABLE alter_table DROP COLUMN h;"; done
+    while true; do $CLICKHOUSE_CLIENT -n --query "ALTER TABLE alter_table0 ADD COLUMN h String DEFAULT '0'; ALTER TABLE alter_table0 MODIFY COLUMN h UInt64; ALTER TABLE alter_table0 DROP COLUMN h;"; done
 }
 
 function thread3()
 {
-    while true; do $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"; done
+    while true; do $CLICKHOUSE_CLIENT -q "INSERT INTO alter_table0 SELECT rand(1), rand(2), 1 / rand(3), toString(rand(4)), [rand(5), rand(6)], rand(7) % 2 ? NULL : generateUUIDv4(), (rand(8), rand(9)) FROM numbers(100000)"; done
 }
 
 function thread4()
 {
-    while true; do $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table FINAL"; done
+    while true; do $CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE alter_table0 FINAL"; done
 }
 
 function thread5()
 {
-    while true; do $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table DELETE WHERE cityHash64(a,b,c,d,e,g) % 1048576 < 524288"; done
+    while true; do $CLICKHOUSE_CLIENT -q "ALTER TABLE alter_table0 DELETE WHERE cityHash64(a,b,c,d,e,g) % 1048576 < 524288"; done
 }
 
 # https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
@@ -74,8 +77,9 @@ timeout $TIMEOUT bash -c thread4 2> /dev/null &
 timeout $TIMEOUT bash -c thread5 2> /dev/null &
 
 wait
+check_replication_consistency "alter_table" "count(), sum(a), sum(b), round(sum(c))"
 
-$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table;" &
-$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table2;" &
+$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table0;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
+$CLICKHOUSE_CLIENT -n -q "DROP TABLE alter_table1;" 2> >(grep -F -v 'is already started to be removing by another replica right now') &
 
 wait
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference
index e69de29bb2d..6e705f05f04 100644
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference
@@ -0,0 +1,2 @@
+Replication did not hang: synced all replicas of alter_table_
+Consistency: 1
diff --git a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
index 32fe31f68c6..72d3cbaa2f1 100755
--- a/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 set -e
 
@@ -99,6 +102,8 @@ timeout $TIMEOUT bash -c thread6 2>&1 | grep "was not completely removed from Zo
 
 wait
 
+check_replication_consistency "alter_table_" "count(), sum(a), sum(b), round(sum(c))"
+
 for i in {0..9}; do
     $CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS alter_table_$i" 2>&1 | grep "was not completely removed from ZooKeeper" &
 done
diff --git a/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh b/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
index f20a0d8d3bd..93e0b0bc0cc 100755
--- a/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
+++ b/tests/queries/0_stateless/01000_unneeded_substitutions_client.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
index 5aeea34e7c1..253d06c038c 100755
--- a/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
+++ b/tests/queries/0_stateless/01001_rename_merge_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
index d2766a14c24..b29a42a7356 100755
--- a/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
+++ b/tests/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01003_kill_query_race_condition.sh b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
index 2d21aabf91a..934d18d2670 100755
--- a/tests/queries/0_stateless/01003_kill_query_race_condition.sh
+++ b/tests/queries/0_stateless/01003_kill_query_race_condition.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01004_rename_deadlock.sh b/tests/queries/0_stateless/01004_rename_deadlock.sh
index 2bde9256bba..f0adf136e94 100755
--- a/tests/queries/0_stateless/01004_rename_deadlock.sh
+++ b/tests/queries/0_stateless/01004_rename_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
index 5c2ca22715d..ef352606b69 100755
--- a/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
+++ b/tests/queries/0_stateless/01005_rwr_shard_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, shard
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
index 8936d8da775..9f4b2241732 100755
--- a/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
+++ b/tests/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01009_global_array_join_names.sql b/tests/queries/0_stateless/01009_global_array_join_names.sql
index f3cbd0cf44d..26e7c68ed1b 100644
--- a/tests/queries/0_stateless/01009_global_array_join_names.sql
+++ b/tests/queries/0_stateless/01009_global_array_join_names.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
 
diff --git a/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference b/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference
index 5f51e52afa8..6648a96cbc3 100644
--- a/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference
+++ b/tests/queries/0_stateless/01010_pm_join_all_join_bug.reference
@@ -7,3 +7,4 @@
 1	0	1
 1	1	0
 1	1	1
+-
diff --git a/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql b/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
index ef406108514..18a67f41194 100644
--- a/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
+++ b/tests/queries/0_stateless/01010_pm_join_all_join_bug.sql
@@ -9,4 +9,7 @@ SELECT * FROM ints l LEFT JOIN ints r USING i64 ORDER BY l.i32, r.i32;
 SELECT '-';
 SELECT * FROM ints l INNER JOIN ints r USING i64 ORDER BY l.i32, r.i32;
 
+SELECT '-';
+SELECT count() FROM ( SELECT [1], count(1) ) AS t1 ALL RIGHT JOIN ( SELECT number AS s FROM numbers(2) ) AS t2 USING (s); -- { serverError NOT_FOUND_COLUMN_IN_BLOCK }
+
 DROP TABLE ints;
diff --git a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
index 2c5f0ef6d99..af747c93678 100644
--- a/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
+++ b/tests/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET max_memory_usage = 32000000;
 SET join_on_disk_max_files_to_merge = 4;
 
diff --git a/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql b/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
index b20f86ea7e0..eaee502f0a0 100644
--- a/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
+++ b/tests/queries/0_stateless/01012_serialize_array_memory_usage.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 -- serialization of big arrays shouldn't use too much memory
 set max_memory_usage = 300000000;
 select ignore(x) from (select groupArray(number) x from numbers(3355443)) group by x format Null;
diff --git a/tests/queries/0_stateless/01012_show_tables_limit.sql b/tests/queries/0_stateless/01012_show_tables_limit.sql
index f75ba88cf2b..82cde6917d0 100644
--- a/tests/queries/0_stateless/01012_show_tables_limit.sql
+++ b/tests/queries/0_stateless/01012_show_tables_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_show_limit;
 
 CREATE DATABASE test_show_limit;
diff --git a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
index 89b178a38ea..55bbfb3ff11 100755
--- a/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+++ b/tests/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01014_lazy_database_basic.sh b/tests/queries/0_stateless/01014_lazy_database_basic.sh
index 11d698e764e..496e9754089 100755
--- a/tests/queries/0_stateless/01014_lazy_database_basic.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_basic.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
index 2003effb71b..44a27ea08f4 100755
--- a/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+++ b/tests/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -99,14 +100,12 @@ timeout $TIMEOUT bash -c show_tables_func 2> /dev/null &
 wait
 sleep 1
 
-${CLICKHOUSE_CLIENT} -n -q "
-    DROP TABLE IF EXISTS $CURR_DATABASE.log;
-    DROP TABLE IF EXISTS $CURR_DATABASE.slog;
-    DROP TABLE IF EXISTS $CURR_DATABASE.tlog;
-    DROP TABLE IF EXISTS $CURR_DATABASE.tlog2;
-"
-#    DROP DATABASE $CURR_DATABASE; -- This fails for some reason
+${CLICKHOUSE_CLIENT} -q "ATTACH TABLE $CURR_DATABASE.log;" 2>/dev/null
+${CLICKHOUSE_CLIENT} -q "ATTACH TABLE $CURR_DATABASE.slog;" 2>/dev/null
+${CLICKHOUSE_CLIENT} -q "ATTACH TABLE $CURR_DATABASE.tlog;" 2>/dev/null
+${CLICKHOUSE_CLIENT} -q "ATTACH TABLE $CURR_DATABASE.tlog2;" 2>/dev/null
+
+${CLICKHOUSE_CLIENT} -q "DROP DATABASE $CURR_DATABASE"
 
 echo "Test OK"
 
-# TODO: it doesn't work! $CLICKHOUSE_CLIENT -q "DROP DATABASE $CURR_DATABASE"
diff --git a/tests/queries/0_stateless/01015_attach_part.sql b/tests/queries/0_stateless/01015_attach_part.sql
index 290b5eb967f..6b786bfbab9 100644
--- a/tests/queries/0_stateless/01015_attach_part.sql
+++ b/tests/queries/0_stateless/01015_attach_part.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_01;
 
 CREATE TABLE table_01 (
diff --git a/tests/queries/0_stateless/01015_database_bad_tables.reference b/tests/queries/0_stateless/01015_database_bad_tables.reference
index b69cd02f83d..917f987fda7 100644
--- a/tests/queries/0_stateless/01015_database_bad_tables.reference
+++ b/tests/queries/0_stateless/01015_database_bad_tables.reference
@@ -1,3 +1,5 @@
 1	1
 1	1
 1	1
+1	1
+1	1
diff --git a/tests/queries/0_stateless/01015_database_bad_tables.sh b/tests/queries/0_stateless/01015_database_bad_tables.sh
new file mode 100755
index 00000000000..d1b63cef476
--- /dev/null
+++ b/tests/queries/0_stateless/01015_database_bad_tables.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+db="db_$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS $db;"
+$CLICKHOUSE_CLIENT -q "CREATE DATABASE $db;"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE $db.\`таблица_со_странным_названием\` (a UInt64, b UInt64) ENGINE = Log;"
+$CLICKHOUSE_CLIENT -q "INSERT INTO $db.\`таблица_со_странным_названием\` VALUES (1, 1);"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM $db.\`таблица_со_странным_названием\`;"
+$CLICKHOUSE_CLIENT -q "DETACH DATABASE $db;"
+$CLICKHOUSE_CLIENT -q "ATTACH DATABASE $db;"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM $db.\`таблица_со_странным_названием\`;"
+$CLICKHOUSE_CLIENT -q "DROP TABLE $db.\`таблица_со_странным_названием\`;"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE $db;"
+
+lazy_db="lazy_$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS $lazy_db;"
+$CLICKHOUSE_CLIENT -q "CREATE DATABASE $lazy_db ENGINE = Lazy(1);"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE $lazy_db.\`таблица_со_странным_названием\` (a UInt64, b UInt64) ENGINE = Log;"
+$CLICKHOUSE_CLIENT -q "INSERT INTO $lazy_db.\`таблица_со_странным_названием\` VALUES (1, 1);"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM $lazy_db.\`таблица_со_странным_названием\`;"
+$CLICKHOUSE_CLIENT -q "DETACH DATABASE $lazy_db;"
+$CLICKHOUSE_CLIENT -q "ATTACH DATABASE $lazy_db;"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM $lazy_db.\`таблица_со_странным_названием\`;"
+$CLICKHOUSE_CLIENT -q "DROP TABLE $lazy_db.\`таблица_со_странным_названием\`;"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE $lazy_db;"
+
+$CLICKHOUSE_CLIENT -q "CREATE DATABASE $lazy_db ENGINE = Lazy(10);"
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS $lazy_db.test;"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE IF NOT EXISTS $lazy_db.test (a UInt64, b UInt64) ENGINE = Log;"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE IF NOT EXISTS $lazy_db.test (a UInt64, b UInt64) ENGINE = Log;"
+$CLICKHOUSE_CLIENT -q "INSERT INTO $lazy_db.test VALUES (1, 1);"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM $lazy_db.test;"
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS $lazy_db.test;"
+$CLICKHOUSE_CLIENT -q "DROP DATABASE $lazy_db;"
diff --git a/tests/queries/0_stateless/01015_database_bad_tables.sql b/tests/queries/0_stateless/01015_database_bad_tables.sql
deleted file mode 100644
index 458cc597a67..00000000000
--- a/tests/queries/0_stateless/01015_database_bad_tables.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-DROP DATABASE IF EXISTS testlazy;
-
-CREATE TABLE `таблица_со_странным_названием` (a UInt64, b UInt64) ENGINE = Log;
-INSERT INTO `таблица_со_странным_названием` VALUES (1, 1);
-SELECT * FROM `таблица_со_странным_названием`;
-DROP TABLE `таблица_со_странным_названием`;
-
-CREATE DATABASE testlazy ENGINE = Lazy(1);
-CREATE TABLE testlazy.`таблица_со_странным_названием` (a UInt64, b UInt64) ENGINE = Log;
-INSERT INTO testlazy.`таблица_со_странным_названием` VALUES (1, 1);
-SELECT * FROM testlazy.`таблица_со_странным_названием`;
-DROP TABLE testlazy.`таблица_со_странным_названием`;
-DROP DATABASE testlazy;
-
-CREATE DATABASE testlazy ENGINE = Lazy(10);
-DROP TABLE IF EXISTS testlazy.test;
-CREATE TABLE IF NOT EXISTS testlazy.test (a UInt64, b UInt64) ENGINE = Log;
-CREATE TABLE IF NOT EXISTS testlazy.test (a UInt64, b UInt64) ENGINE = Log;
-INSERT INTO testlazy.test VALUES (1, 1);
-SELECT * FROM testlazy.test;
-DROP TABLE IF EXISTS testlazy.test;
-DROP DATABASE testlazy;
diff --git a/tests/queries/0_stateless/01015_empty_in_inner_right_join.sql.j2 b/tests/queries/0_stateless/01015_empty_in_inner_right_join.sql.j2
index 6c13654598e..cdb9d253b9b 100644
--- a/tests/queries/0_stateless/01015_empty_in_inner_right_join.sql.j2
+++ b/tests/queries/0_stateless/01015_empty_in_inner_right_join.sql.j2
@@ -4,25 +4,25 @@ SET joined_subquery_requires_alias = 0;
 
 SET join_algorithm = '{{ join_algorithm }}';
 
-SELECT 'IN empty set',count() FROM system.numbers WHERE number IN (SELECT toUInt64(1) WHERE 0);
-SELECT 'IN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 WHERE t1.number IN (SELECT toUInt64(1) WHERE 1);
-SELECT 'NOT IN empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number NOT IN (SELECT toUInt64(1) WHERE 0);
+SELECT 'IN empty set', count() FROM system.numbers WHERE number IN (SELECT toUInt64(1) WHERE 0);
+SELECT 'IN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 WHERE t1.number IN (SELECT toUInt64(1) WHERE 1);
+SELECT 'NOT IN empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number NOT IN (SELECT toUInt64(1) WHERE 0);
 
-SELECT 'INNER JOIN empty set',count() FROM system.numbers INNER JOIN (SELECT toUInt64(1) AS x WHERE 0) ON system.numbers.number = x;
-SELECT 'INNER JOIN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 INNER JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x;
+SELECT 'INNER JOIN empty set', count() FROM system.numbers INNER JOIN (SELECT toUInt64(1) AS x WHERE 0) ON system.numbers.number = x;
+SELECT 'INNER JOIN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 INNER JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x;
 
-SELECT 'RIGHT JOIN empty set',count() FROM system.numbers RIGHT JOIN (SELECT toUInt64(1) AS x WHERE 0) ON system.numbers.number = x;
-SELECT 'RIGHT JOIN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 RIGHT JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x;
+SELECT 'RIGHT JOIN empty set', count() FROM system.numbers RIGHT JOIN (SELECT toUInt64(1) AS x WHERE 0) ON system.numbers.number = x;
+SELECT 'RIGHT JOIN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 RIGHT JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x;
 
-SELECT 'LEFT JOIN empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 LEFT JOIN (SELECT toUInt64(1) AS x WHERE 0) ON t1.number = x;
-SELECT 'LEFT JOIN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 LEFT JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x;
+SELECT 'LEFT JOIN empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 LEFT JOIN (SELECT toUInt64(1) AS x WHERE 0) ON t1.number = x;
+SELECT 'LEFT JOIN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 LEFT JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x;
 
-SELECT 'multiple sets IN empty set OR IN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number IN (SELECT toUInt64(1) WHERE 0) OR number IN (SELECT toUInt64(1) WHERE 1);
-SELECT 'multiple sets IN empty set OR NOT IN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number IN (SELECT toUInt64(1) WHERE 0) OR number NOT IN (SELECT toUInt64(1) WHERE 1);
-SELECT 'multiple sets NOT IN empty set AND IN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number NOT IN (SELECT toUInt64(1) WHERE 0) AND number IN (SELECT toUInt64(1) WHERE 1);
-SELECT 'multiple sets INNER JOIN empty set AND IN empty set',count() FROM system.numbers INNER JOIN (SELECT toUInt64(1) AS x WHERE 0) ON system.numbers.number = x WHERE system.numbers.number IN (SELECT toUInt64(1) WHERE 0);
-SELECT 'multiple sets INNER JOIN empty set AND IN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 INNER JOIN (SELECT toUInt64(1) AS x WHERE 0) ON t1.number = x WHERE t1.number IN (SELECT toUInt64(1) WHERE 1);
-SELECT 'multiple sets INNER JOIN non-empty set AND IN non-empty set',count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 INNER JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x WHERE t1.number IN (SELECT toUInt64(1) WHERE 1);
+SELECT 'multiple sets IN empty set OR IN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number IN (SELECT toUInt64(1) WHERE 0) OR number IN (SELECT toUInt64(1) WHERE 1);
+SELECT 'multiple sets IN empty set OR NOT IN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number IN (SELECT toUInt64(1) WHERE 0) OR number NOT IN (SELECT toUInt64(1) WHERE 1);
+SELECT 'multiple sets NOT IN empty set AND IN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) WHERE number NOT IN (SELECT toUInt64(1) WHERE 0) AND number IN (SELECT toUInt64(1) WHERE 1);
+SELECT 'multiple sets INNER JOIN empty set AND IN empty set', count() FROM system.numbers INNER JOIN (SELECT toUInt64(1) AS x WHERE 0) ON system.numbers.number = x WHERE system.numbers.number IN (SELECT toUInt64(1) WHERE 0);
+SELECT 'multiple sets INNER JOIN empty set AND IN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 INNER JOIN (SELECT toUInt64(1) AS x WHERE 0) ON t1.number = x WHERE t1.number IN (SELECT toUInt64(1) WHERE 1);
+SELECT 'multiple sets INNER JOIN non-empty set AND IN non-empty set', count() FROM (SELECT number FROM system.numbers LIMIT 10) t1 INNER JOIN (SELECT toUInt64(1) AS x WHERE 1) ON t1.number = x WHERE t1.number IN (SELECT toUInt64(1) WHERE 1);
 
 SELECT 'IN empty set equals 0', count() FROM numbers(10) WHERE (number IN (SELECT toUInt64(1) WHERE 0)) = 0;
 SELECT 'IN empty set sum if', sum(if(number IN (SELECT toUInt64(1) WHERE 0), 2, 1)) FROM numbers(10);
diff --git a/tests/queries/0_stateless/01016_input_null_as_default.sh b/tests/queries/0_stateless/01016_input_null_as_default.sh
index 137e25b6a12..bfeaca0fcac 100755
--- a/tests/queries/0_stateless/01016_input_null_as_default.sh
+++ b/tests/queries/0_stateless/01016_input_null_as_default.sh
@@ -57,8 +57,8 @@ $CLICKHOUSE_CLIENT --query="TRUNCATE TABLE null_as_default";
 
 echo 'Values'
 echo '(NULL, '\''1'\'', (null), '\''2019-07-22'\'', ([10, 20, 30]), (NuLl)),
-(1, '\''world'\'', (3), '\''2019-07-23'\'', (NULL), (('\''tuple'\'', 3.14))),
-(2, null, (123), null, ([]), (('\''test'\'', 2.71828))),
+(1, '\''world'\'', (3), '\''2019-07-23'\'', (NULL), ('\''tuple'\'', 3.14)),
+(2, null, (123), null, ([]), ('\''test'\'', 2.71828)),
 (3, null, (null), null, (null), (null))' | $CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO null_as_default VALUES";
 $CLICKHOUSE_CLIENT --query="SELECT * FROM null_as_default ORDER BY i";
 $CLICKHOUSE_CLIENT --query="DROP TABLE null_as_default";
diff --git a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
index a10e5fb2788..e09a8493bb8 100755
--- a/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+++ b/tests/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
index 2ad1edae733..d47dc6b8d5f 100644
--- a/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
+++ b/tests/queries/0_stateless/01017_uniqCombined_memory_usage.sql
@@ -1,3 +1,8 @@
+-- Tags: no-tsan, no-asan, no-msan, no-replicated-database
+-- Tag no-tsan: Fine thresholds on memory usage
+-- Tag no-asan: Fine thresholds on memory usage
+-- Tag no-msan: Fine thresholds on memory usage
+
 -- each uniqCombined state should not use > sizeof(HLL) in memory,
 -- sizeof(HLL) is (2^K * 6 / 8)
 -- hence max_memory_usage for 100 rows = (96<<10)*100 = 9830400
diff --git a/tests/queries/0_stateless/01018_Distributed__shard_num.sql b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
index 7d4aaf42473..be2df8b664f 100644
--- a/tests/queries/0_stateless/01018_Distributed__shard_num.sql
+++ b/tests/queries/0_stateless/01018_Distributed__shard_num.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- make the order static
 SET max_threads = 1;
 
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
index 37e9fd774d7..6826ed677db 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-replicated-database: grep -c
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
index 025fe51e2a9..100e79a4546 100755
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
index dd62f1451a8..0c5e0c69ffe 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_create.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict_01018;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
index 229d5d55774..69c8ad2faee 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql b/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
index db3b7f29492..1877c289d3f 100644
--- a/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
+++ b/tests/queries/0_stateless/01018_ddl_dictionaries_special.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql b/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
index fb34beaca2a..a4a06d44e01 100644
--- a/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
+++ b/tests/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01018_empty_aggregation_filling.reference b/tests/queries/0_stateless/01018_empty_aggregation_filling.reference
index 4595c3b9112..c29807a7e15 100644
--- a/tests/queries/0_stateless/01018_empty_aggregation_filling.reference
+++ b/tests/queries/0_stateless/01018_empty_aggregation_filling.reference
@@ -45,7 +45,7 @@ nan
 \N
 0
 \N
-0.00
+0
 \N
 --- Other Types Non-empty ---
 hello
diff --git a/tests/queries/0_stateless/01018_ip_dictionary_long.sql b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
index 2abd51cc9fe..6e0c9c8d416 100644
--- a/tests/queries/0_stateless/01018_ip_dictionary_long.sql
+++ b/tests/queries/0_stateless/01018_ip_dictionary_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
index 5833f2592a2..9fbc3f951fe 100644
--- a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
+++ b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 DROP TABLE IF EXISTS null_;
 DROP TABLE IF EXISTS buffer_;
 DROP TABLE IF EXISTS aggregation_;
diff --git a/tests/queries/0_stateless/01020_function_array_compact.reference b/tests/queries/0_stateless/01020_function_array_compact.reference
index 6627a437251..4a6265b4f55 100644
--- a/tests/queries/0_stateless/01020_function_array_compact.reference
+++ b/tests/queries/0_stateless/01020_function_array_compact.reference
@@ -7,3 +7,5 @@
 [1,2,1]
 [2,1]
 [1,2,3,4,5]
+[0]
+[0]
diff --git a/tests/queries/0_stateless/01020_function_array_compact.sql b/tests/queries/0_stateless/01020_function_array_compact.sql
index eea69dcb6da..d4aaa4d3fca 100644
--- a/tests/queries/0_stateless/01020_function_array_compact.sql
+++ b/tests/queries/0_stateless/01020_function_array_compact.sql
@@ -7,3 +7,5 @@ select arrayCompact([1,1,2]);
 select arrayCompact([1,2,1]);
 select arrayCompact([2,1,1]);
 select arrayCompact([1,2,2,3,3,3,4,4,4,4,5,5,5,5,5]);
+SELECT arrayCompact(x->0, [NULL]);
+SELECT toString(arrayCompact(x->0, [NULL]));
diff --git a/tests/queries/0_stateless/01021_only_tuple_columns.sql b/tests/queries/0_stateless/01021_only_tuple_columns.sql
index 27019a67b98..02db21bc0b2 100644
--- a/tests/queries/0_stateless/01021_only_tuple_columns.sql
+++ b/tests/queries/0_stateless/01021_only_tuple_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE test
 (
     `x` Tuple(UInt64, UInt64)
diff --git a/tests/queries/0_stateless/01023_materialized_view_query_context.sql b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
index 351379d8b14..415690ae1e5 100644
--- a/tests/queries/0_stateless/01023_materialized_view_query_context.sql
+++ b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Create dictionary, since dictGet*() uses DB::Context in executeImpl()
 -- (To cover scope of the Context in DB::PushingToViewsBlockOutputStream::process)
 
diff --git a/tests/queries/0_stateless/01029_early_constant_folding.reference b/tests/queries/0_stateless/01029_early_constant_folding.reference
index 88139b7e2b8..abcb2ddc6a7 100644
--- a/tests/queries/0_stateless/01029_early_constant_folding.reference
+++ b/tests/queries/0_stateless/01029_early_constant_folding.reference
@@ -2,7 +2,7 @@ SELECT 1
 WHERE 0
 SELECT 1
 SELECT 1
-WHERE (1 IN (0, 2)) AND (2 = (identity(CAST(2, \'Nullable(UInt8)\')) AS subquery))
+WHERE (1 IN (0, 2)) AND (2 = (identity(_CAST(2, \'Nullable(UInt8)\')) AS subquery))
 SELECT 1
 WHERE 1 IN ((
     SELECT arrayJoin([1, 2, 3])
diff --git a/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql b/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
index 807889a935a..bfedcc56496 100644
--- a/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
+++ b/tests/queries/0_stateless/01030_storage_hdfs_syntax.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 drop table if exists test_table_hdfs_syntax
 ;
 create table test_table_hdfs_syntax (id UInt32) ENGINE = HDFS('')
diff --git a/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh b/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
index 9bc9028ad1f..8c172049745 100755
--- a/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
+++ b/tests/queries/0_stateless/01031_mutations_interpreter_and_context.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01033_dictionaries_lifetime.sql b/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
index 40482cd9f7b..299931bdeb3 100644
--- a/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
+++ b/tests/queries/0_stateless/01033_dictionaries_lifetime.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS database_for_dict;
diff --git a/tests/queries/0_stateless/01033_quota_dcl.reference b/tests/queries/0_stateless/01033_quota_dcl.reference
index 7478adac441..e732ea2fcd6 100644
--- a/tests/queries/0_stateless/01033_quota_dcl.reference
+++ b/tests/queries/0_stateless/01033_quota_dcl.reference
@@ -1 +1 @@
-CREATE QUOTA default KEYED BY user_name FOR INTERVAL 1 hour TRACKING ONLY TO default, readonly
+CREATE QUOTA default KEYED BY user_name FOR INTERVAL 1 hour TRACKING ONLY TO default, readonly, session_log_test_xml_user
diff --git a/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql b/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
index 7a3d2914111..66c0bb51e8f 100644
--- a/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
+++ b/tests/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS BannerDict;
 
 CREATE TABLE BannerDict (`BannerID` UInt64, `CompaignID` UInt64) ENGINE = ODBC('DSN=pgconn;Database=postgres', bannerdict); -- {serverError 42}
diff --git a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
index af4969d77c8..b8b261aefad 100755
--- a/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql b/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
index e708b6ec317..4eea4fd47c7 100644
--- a/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
+++ b/tests/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, distributed
+
 drop table if exists test_max_parallel_replicas_lr;
 
 -- If you wonder why the table is named with "_lr" suffix in this test.
diff --git a/tests/queries/0_stateless/01034_sample_final_distributed.sql b/tests/queries/0_stateless/01034_sample_final_distributed.sql
index ca03daebe12..b784b35cbb3 100644
--- a/tests/queries/0_stateless/01034_sample_final_distributed.sql
+++ b/tests/queries/0_stateless/01034_sample_final_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists sample_final;
 create table sample_final (CounterID UInt32, EventDate Date, EventTime DateTime, UserID UInt64, Sign Int8) engine = CollapsingMergeTree(Sign) order by (CounterID, EventDate, intHash32(UserID), EventTime) sample by intHash32(UserID);
 insert into sample_final select number / (8192 * 4), toDate('2019-01-01'), toDateTime('2019-01-01 00:00:01') + number, number / (8192 * 2), number % 3 = 1 ? -1 : 1 from numbers(1000000);
diff --git a/tests/queries/0_stateless/01035_avg_weighted_long.sh b/tests/queries/0_stateless/01035_avg_weighted_long.sh
index 30b403e2cc4..138aa03fbb3 100755
--- a/tests/queries/0_stateless/01035_avg_weighted_long.sh
+++ b/tests/queries/0_stateless/01035_avg_weighted_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
index 7c15b795c36..16331a49bc4 100755
--- a/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
index bd01ea704b1..9040d7b3231 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01036;
 CREATE DATABASE dict_db_01036;
 
diff --git a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
index fa0502ac328..bc84bc0687b 100644
--- a/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
+++ b/tests/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS `foo 1234`;
 CREATE DATABASE `foo 1234`;
 
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
index f12f35a6af0..fae263b076f 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
index 876f705703e..ea4389d610c 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
index 64039d8dd1f..be983ec1be4 100755
--- a/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
+++ b/tests/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
index 60c6d55c4f5..703f8824055 100644
--- a/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
+++ b/tests/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 SET check_query_single_value_result = 0;
 SET send_logs_level = 'fatal';
 
@@ -13,7 +15,7 @@ DROP TABLE IF EXISTS mt_without_pk;
 
 DROP TABLE IF EXISTS replicated_mt_without_pk;
 
-CREATE TABLE replicated_mt_without_pk (SomeField1 Int64, SomeField2 Double) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01037/replicated_mt_without_pk', '1') ORDER BY tuple();
+CREATE TABLE replicated_mt_without_pk (SomeField1 Int64, SomeField2 Double) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01037/replicated_mt_without_pk', '1') ORDER BY tuple();
 
 INSERT INTO replicated_mt_without_pk VALUES (1, 2);
 
diff --git a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
index 036eb3db3f3..1e754dce786 100755
--- a/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
+++ b/tests/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
index 66571f456d9..7d6cc5f1bff 100755
--- a/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
+++ b/tests/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql b/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
index 5e30b6b1a9d..03f6f51daca 100644
--- a/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
+++ b/tests/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test_01040;
 DROP TABLE IF EXISTS dist_test_01040;
 
diff --git a/tests/queries/0_stateless/01040_h3_get_resolution.sql b/tests/queries/0_stateless/01040_h3_get_resolution.sql
index 3dc27216333..58c4af184dc 100644
--- a/tests/queries/0_stateless/01040_h3_get_resolution.sql
+++ b/tests/queries/0_stateless/01040_h3_get_resolution.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3GetResolution(581276613233082367);
 SELECT h3GetResolution(621807531097128959);
 SELECT h3GetResolution(644325529233966508);
diff --git a/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql b/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
index 3d6586063e9..6b4335d4464 100644
--- a/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
+++ b/tests/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictdb.table_for_dict;
 DROP DICTIONARY IF EXISTS dictdb.dict_exists;
 DROP DATABASE IF EXISTS dictdb;
diff --git a/tests/queries/0_stateless/01041_h3_is_valid.sql b/tests/queries/0_stateless/01041_h3_is_valid.sql
index 05885561844..f889a294bcc 100644
--- a/tests/queries/0_stateless/01041_h3_is_valid.sql
+++ b/tests/queries/0_stateless/01041_h3_is_valid.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3IsValid(581276613233082367);
 SELECT h3IsValid(621807531097128959);
 SELECT h3IsValid(Cast(0, 'UInt64'));
diff --git a/tests/queries/0_stateless/01042_h3_k_ring.sql b/tests/queries/0_stateless/01042_h3_k_ring.sql
index 35335df7ff2..9e9afae5024 100644
--- a/tests/queries/0_stateless/01042_h3_k_ring.sql
+++ b/tests/queries/0_stateless/01042_h3_k_ring.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT arraySort(h3kRing(581276613233082367, 1));
 SELECT h3kRing(581276613233082367, 0);
 SELECT h3kRing(581276613233082367, -1); -- { serverError 12 }
diff --git a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
index 512d12866c4..f2b30e05040 100755
--- a/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+++ b/tests/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
index 5e150cfed9c..5d629d4e8db 100644
--- a/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
+++ b/tests/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dictdb_01043;
 CREATE DATABASE dictdb_01043;
 
diff --git a/tests/queries/0_stateless/01043_h3_edge_length_m.sql b/tests/queries/0_stateless/01043_h3_edge_length_m.sql
index dbc517baa8b..03a5dbb4424 100644
--- a/tests/queries/0_stateless/01043_h3_edge_length_m.sql
+++ b/tests/queries/0_stateless/01043_h3_edge_length_m.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeLengthM(1);
 SELECT h3EdgeLengthM(4);
diff --git a/tests/queries/0_stateless/01044_h3_edge_angle.sql b/tests/queries/0_stateless/01044_h3_edge_angle.sql
index a22121971f4..bb87ef20fe3 100644
--- a/tests/queries/0_stateless/01044_h3_edge_angle.sql
+++ b/tests/queries/0_stateless/01044_h3_edge_angle.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeAngle(10);
 SELECT h3EdgeLengthM(2) * 180 / pi() / 6371007.180918475 - h3EdgeAngle(2);
diff --git a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
index 0bc2f6f9f13..d41be7482f8 100644
--- a/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
+++ b/tests/queries/0_stateless/01045_dictionaries_restrictions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dictdb_01045;
 
 CREATE DATABASE dictdb_01045;
diff --git a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
index 6510fcf408d..a438cf7badc 100755
--- a/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
+++ b/tests/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql b/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
index 318f48dc833..8822ec37d66 100644
--- a/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
+++ b/tests/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- from https://github.com/ClickHouse/ClickHouse/issues/5142
 
 set insert_distributed_sync = 1;
diff --git a/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql b/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
index 8bfafe8e963..40dde29d8e5 100644
--- a/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
+++ b/tests/queries/0_stateless/01046_trivial_count_query_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test_count;
 
 CREATE TABLE test_count (`pt` Date) ENGINE = MergeTree PARTITION BY pt ORDER BY pt SETTINGS index_granularity = 8192;
diff --git a/tests/queries/0_stateless/01048_exists_query.sql b/tests/queries/0_stateless/01048_exists_query.sql
index 4e642084354..07d3a026c68 100644
--- a/tests/queries/0_stateless/01048_exists_query.sql
+++ b/tests/queries/0_stateless/01048_exists_query.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 EXISTS db_01048.t_01048;
 EXISTS TABLE db_01048.t_01048;
 EXISTS DICTIONARY db_01048.t_01048;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.reference b/tests/queries/0_stateless/01049_join_low_card_bug_long.reference
index 877b4370fce..6d9f36df075 100644
--- a/tests/queries/0_stateless/01049_join_low_card_bug_long.reference
+++ b/tests/queries/0_stateless/01049_join_low_card_bug_long.reference
@@ -1,3 +1,4 @@
+-- join_algorithm = default, join_use_nulls = 0 --
 str	LowCardinality(String)
 	LowCardinality(String)
 str_r	LowCardinality(String)
@@ -98,7 +99,7 @@ LowCardinality(String)	LowCardinality(String)			Nullable(String)	Nullable(String
 LowCardinality(String)	LowCardinality(String)	str	str	Nullable(String)	Nullable(String)	str	str
 LowCardinality(String)	LowCardinality(String)			Nullable(String)	Nullable(String)	str_l	str_l
 LowCardinality(String)	LowCardinality(String)	str_r	str_r	Nullable(String)	Nullable(String)	\N	\N
--- join_use_nulls --
+-- join_algorithm = default, join_use_nulls = 1 --
 str	LowCardinality(Nullable(String))
 \N	LowCardinality(Nullable(String))
 str	LowCardinality(Nullable(String))
@@ -199,6 +200,7 @@ LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	\N	\N	Nullable
 LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	str	str	Nullable(String)	Nullable(String)	str	str
 LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	\N	\N	Nullable(String)	Nullable(String)	str_l	str_l
 LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	str_r	str_r	Nullable(String)	Nullable(String)	\N	\N
+-- join_algorithm = partial_merge, join_use_nulls = 0 --
 str	LowCardinality(String)
 	LowCardinality(String)
 str_r	LowCardinality(String)
@@ -299,7 +301,7 @@ LowCardinality(String)	LowCardinality(String)			Nullable(String)	Nullable(String
 LowCardinality(String)	LowCardinality(String)	str	str	Nullable(String)	Nullable(String)	str	str
 LowCardinality(String)	LowCardinality(String)			Nullable(String)	Nullable(String)	str_l	str_l
 LowCardinality(String)	LowCardinality(String)	str_r	str_r	Nullable(String)	Nullable(String)	\N	\N
--- join_use_nulls --
+-- join_algorithm = partial_merge, join_use_nulls = 1 --
 str	LowCardinality(Nullable(String))
 \N	LowCardinality(Nullable(String))
 str	LowCardinality(Nullable(String))
@@ -400,8 +402,12 @@ LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	\N	\N	Nullable
 LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	str	str	Nullable(String)	Nullable(String)	str	str
 LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	\N	\N	Nullable(String)	Nullable(String)	str_l	str_l
 LowCardinality(Nullable(String))	LowCardinality(Nullable(String))	str_r	str_r	Nullable(String)	Nullable(String)	\N	\N
+--
 	LowCardinality(String)
 str	LowCardinality(String)
 
 
 str
+str	str	LowCardinality(Nullable(String))	LowCardinality(Nullable(String))
+str_r	str_r	LowCardinality(Nullable(String))	LowCardinality(Nullable(String))
+\N	\N	LowCardinality(Nullable(String))	LowCardinality(Nullable(String))
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql
deleted file mode 100644
index e1732824428..00000000000
--- a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql
+++ /dev/null
@@ -1,284 +0,0 @@
-DROP TABLE IF EXISTS l;
-DROP TABLE IF EXISTS r;
-DROP TABLE IF EXISTS nl;
-DROP TABLE IF EXISTS nr;
-DROP TABLE IF EXISTS l_lc;
-DROP TABLE IF EXISTS r_lc;
-
-CREATE TABLE l (x UInt32, lc String) ENGINE = Memory;
-CREATE TABLE r (x UInt32, lc String) ENGINE = Memory;
-CREATE TABLE nl (x Nullable(UInt32), lc Nullable(String)) ENGINE = Memory;
-CREATE TABLE nr (x Nullable(UInt32), lc Nullable(String)) ENGINE = Memory;
-CREATE TABLE l_lc (x UInt32, lc LowCardinality(String)) ENGINE = Memory;
-CREATE TABLE r_lc (x UInt32, lc LowCardinality(String)) ENGINE = Memory;
-
-INSERT INTO r VALUES (0, 'str'),  (1, 'str_r');
-INSERT INTO nr VALUES (0, 'str'),  (1, 'str_r');
-INSERT INTO r_lc VALUES (0, 'str'),  (1, 'str_r');
-
-INSERT INTO l VALUES (0, 'str'), (2, 'str_l');
-INSERT INTO nl VALUES (0, 'str'), (2, 'str_l');
-INSERT INTO l_lc VALUES (0, 'str'), (2, 'str_l');
-
-
-SET join_use_nulls = 0;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SELECT '-- join_use_nulls --';
-
-SET join_use_nulls = 1;
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-set join_algorithm = 'partial_merge';
-
-SET join_use_nulls = 0;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SELECT '-- join_use_nulls --';
-
-SET join_use_nulls = 1;
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
-
---
-
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (lc) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (x) ORDER BY x;
-SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (lc) ORDER BY x;
-
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
-SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
-
-SET join_use_nulls = 0;
-SELECT lc, toTypeName(lc)  FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY l.lc;
-
-SELECT lowCardinalityKeys(lc.lc) FROM r FULL JOIN l_lc as lc USING (lc) ORDER BY lowCardinalityKeys(lc.lc);
-
-DROP TABLE l;
-DROP TABLE r;
-DROP TABLE nl;
-DROP TABLE nr;
-DROP TABLE l_lc;
-DROP TABLE r_lc;
diff --git a/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2 b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
new file mode 100644
index 00000000000..b19addfb6be
--- /dev/null
+++ b/tests/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
@@ -0,0 +1,111 @@
+-- Tags: long
+
+DROP TABLE IF EXISTS l;
+DROP TABLE IF EXISTS r;
+DROP TABLE IF EXISTS nl;
+DROP TABLE IF EXISTS nr;
+DROP TABLE IF EXISTS l_lc;
+DROP TABLE IF EXISTS r_lc;
+
+CREATE TABLE l (x UInt32, lc String) ENGINE = Memory;
+CREATE TABLE r (x UInt32, lc String) ENGINE = Memory;
+CREATE TABLE nl (x Nullable(UInt32), lc Nullable(String)) ENGINE = Memory;
+CREATE TABLE nr (x Nullable(UInt32), lc Nullable(String)) ENGINE = Memory;
+CREATE TABLE l_lc (x UInt32, lc LowCardinality(String)) ENGINE = Memory;
+CREATE TABLE r_lc (x UInt32, lc LowCardinality(String)) ENGINE = Memory;
+
+INSERT INTO r VALUES (0, 'str'),  (1, 'str_r');
+INSERT INTO nr VALUES (0, 'str'),  (1, 'str_r');
+INSERT INTO r_lc VALUES (0, 'str'),  (1, 'str_r');
+
+INSERT INTO l VALUES (0, 'str'), (2, 'str_l');
+INSERT INTO nl VALUES (0, 'str'), (2, 'str_l');
+INSERT INTO l_lc VALUES (0, 'str'), (2, 'str_l');
+
+{% for join_algorithm in [None, 'partial_merge'] -%}
+{% for join_use_nulls in [0, 1] -%}
+
+SELECT '-- join_algorithm = {{ join_algorithm or 'default' }}, join_use_nulls = {{ join_use_nulls }} --';
+
+{% if join_algorithm %}SET join_algorithm = '{{ join_algorithm }}';{% endif -%}
+SET join_use_nulls = {{ join_use_nulls }};
+
+SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
+
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
+
+--
+
+SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
+
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN r USING (lc) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN r USING (lc) ORDER BY x;
+
+--
+
+SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l RIGHT JOIN r USING (lc) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l FULL JOIN r USING (lc) ORDER BY x;
+
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
+
+--
+
+SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc RIGHT JOIN nr USING (lc) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM l_lc FULL JOIN nr USING (lc) ORDER BY x;
+
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM l_lc AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
+
+--
+
+SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM nl RIGHT JOIN r_lc USING (lc) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (x) ORDER BY x;
+SELECT lc, toTypeName(lc) FROM nl FULL JOIN r_lc USING (lc) ORDER BY x;
+
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l RIGHT JOIN r_lc AS r USING (lc) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (x) ORDER BY x;
+SELECT toTypeName(r.lc), toTypeName(materialize(r.lc)), r.lc, materialize(r.lc), toTypeName(l.lc), toTypeName(materialize(l.lc)), l.lc, materialize(l.lc) FROM nl AS l FULL JOIN r_lc AS r USING (lc) ORDER BY x;
+
+{% endfor -%}
+{% endfor -%}
+
+SELECT '--';
+
+SET join_use_nulls = 0;
+SELECT lc, toTypeName(lc)  FROM l_lc AS l RIGHT JOIN r_lc AS r USING (x) ORDER BY l.lc;
+
+SELECT lowCardinalityKeys(lc.lc) FROM r FULL JOIN l_lc as lc USING (lc) ORDER BY lowCardinalityKeys(lc.lc);
+
+SET join_algorithm = 'partial_merge';
+SET join_use_nulls = 1;
+
+SELECT r.lc, materialize(r.lc), toTypeName(r.lc), toTypeName(materialize(r.lc)) FROM l_lc AS l FULL OUTER JOIN r_lc AS r USING (x) ORDER BY r.lc;
+
+DROP TABLE l;
+DROP TABLE r;
+DROP TABLE nl;
+DROP TABLE nr;
+DROP TABLE l_lc;
+DROP TABLE r_lc;
diff --git a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.reference b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.reference
rename to tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.reference
diff --git a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
similarity index 65%
rename from tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql
rename to tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
index c84fb22043f..c77ab50ab8b 100644
--- a/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql
+++ b/tests/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
@@ -1,11 +1,13 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_synchronous_mutations1;
 DROP TABLE IF EXISTS table_for_synchronous_mutations2;
 
 SELECT 'Replicated';
 
-CREATE TABLE table_for_synchronous_mutations1(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01049/table_for_synchronous_mutations', '1') ORDER BY k;
+CREATE TABLE table_for_synchronous_mutations1(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01049/table_for_synchronous_mutations', '1') ORDER BY k;
 
-CREATE TABLE table_for_synchronous_mutations2(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01049/table_for_synchronous_mutations', '2') ORDER BY k;
+CREATE TABLE table_for_synchronous_mutations2(k UInt32, v1 UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01049/table_for_synchronous_mutations', '2') ORDER BY k;
 
 INSERT INTO table_for_synchronous_mutations1 select number, number from numbers(100000);
 
@@ -13,12 +15,12 @@ SYSTEM SYNC REPLICA table_for_synchronous_mutations2;
 
 ALTER TABLE table_for_synchronous_mutations1 UPDATE v1 = v1 + 1 WHERE 1 SETTINGS mutations_sync = 2;
 
-SELECT is_done FROM system.mutations where table = 'table_for_synchronous_mutations1';
+SELECT is_done FROM system.mutations where database = currentDatabase() and table = 'table_for_synchronous_mutations1';
 
 -- Another mutation, just to be sure, that previous finished
 ALTER TABLE table_for_synchronous_mutations1 UPDATE v1 = v1 + 1 WHERE 1 SETTINGS mutations_sync = 2;
 
-SELECT is_done FROM system.mutations where table = 'table_for_synchronous_mutations1';
+SELECT is_done FROM system.mutations where database = currentDatabase() and table = 'table_for_synchronous_mutations1';
 
 DROP TABLE IF EXISTS table_for_synchronous_mutations1;
 DROP TABLE IF EXISTS table_for_synchronous_mutations2;
@@ -33,11 +35,11 @@ INSERT INTO table_for_synchronous_mutations_no_replication select number, number
 
 ALTER TABLE table_for_synchronous_mutations_no_replication UPDATE v1 = v1 + 1 WHERE 1 SETTINGS mutations_sync = 2;
 
-SELECT is_done FROM system.mutations where table = 'table_for_synchronous_mutations_no_replication';
+SELECT is_done FROM system.mutations where database = currentDatabase() and table = 'table_for_synchronous_mutations_no_replication';
 
 -- Another mutation, just to be sure, that previous finished
 ALTER TABLE table_for_synchronous_mutations_no_replication UPDATE v1 = v1 + 1 WHERE 1 SETTINGS mutations_sync = 2;
 
-SELECT is_done FROM system.mutations where table = 'table_for_synchronous_mutations_no_replication';
+SELECT is_done FROM system.mutations where database = currentDatabase() and table = 'table_for_synchronous_mutations_no_replication';
 
 DROP TABLE IF EXISTS table_for_synchronous_mutations_no_replication;
diff --git a/tests/queries/0_stateless/01051_system_stack_trace.sql b/tests/queries/0_stateless/01051_system_stack_trace.sql
index 32d344fce7e..e495e2198ea 100644
--- a/tests/queries/0_stateless/01051_system_stack_trace.sql
+++ b/tests/queries/0_stateless/01051_system_stack_trace.sql
@@ -1,2 +1,4 @@
+-- Tags: race
+
 -- at least this query should be present
 SELECT count() > 0 FROM system.stack_trace WHERE query_id != '';
diff --git a/tests/queries/0_stateless/01053_drop_database_mat_view.sql b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
index 9f7438d594e..67a488f7245 100644
--- a/tests/queries/0_stateless/01053_drop_database_mat_view.sql
+++ b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS some_tests;
 CREATE DATABASE some_tests ENGINE=Ordinary; -- Different inner table name with Atomic
 
diff --git a/tests/queries/0_stateless/01053_ssd_dictionary.sh b/tests/queries/0_stateless/01053_ssd_dictionary.sh
index 9cdd391ec5a..dc5002eaf17 100755
--- a/tests/queries/0_stateless/01053_ssd_dictionary.sh
+++ b/tests/queries/0_stateless/01053_ssd_dictionary.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: this test mistakenly requires acces to /var/lib/clickhouse -- can't run this locally, disabled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
index 235ed7db362..04b1f8b65ce 100755
--- a/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
+++ b/tests/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
index d8d1d61be63..88c59014166 100644
--- a/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
+++ b/tests/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
@@ -1,3 +1,4 @@
+-- Tags: no-parallel
 
 create database if not exists test_01054_overflow;
 drop table if exists test_01054_overflow.ints;
@@ -54,3 +55,4 @@ FROM
 );
 
 DROP TABLE if exists test_01054.ints;
+DROP DATABASE test_01054_overflow;
diff --git a/tests/queries/0_stateless/01055_compact_parts_1.sql b/tests/queries/0_stateless/01055_compact_parts_1.sql
index c2c2ab041e7..9acd2578025 100644
--- a/tests/queries/0_stateless/01055_compact_parts_1.sql
+++ b/tests/queries/0_stateless/01055_compact_parts_1.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists mt_compact;
 drop table if exists mt_compact_2;
 
diff --git a/tests/queries/0_stateless/01055_minmax_index_compact_parts.reference b/tests/queries/0_stateless/01055_minmax_index_compact_parts.reference
index 0f5a8eb904e..8bde896b02a 100644
--- a/tests/queries/0_stateless/01055_minmax_index_compact_parts.reference
+++ b/tests/queries/0_stateless/01055_minmax_index_compact_parts.reference
@@ -1,6 +1,6 @@
-0	5	4.7	6.50	cba	b	2014-01-04
-1	5	4.7	6.50	cba	b	2014-03-11
-11	5	4.7	6.50	cba	b	2014-06-11
-12	5	4.7	6.50	cba	b	2015-01-01
+0	5	4.7	6.5	cba	b	2014-01-04
+1	5	4.7	6.5	cba	b	2014-03-11
+11	5	4.7	6.5	cba	b	2014-06-11
+12	5	4.7	6.5	cba	b	2015-01-01
 		"rows_read": 4,
 		"rows_read": 2,
diff --git a/tests/queries/0_stateless/01056_create_table_as.sql b/tests/queries/0_stateless/01056_create_table_as.sql
index c27f30b61d5..62db8282ac0 100644
--- a/tests/queries/0_stateless/01056_create_table_as.sql
+++ b/tests/queries/0_stateless/01056_create_table_as.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
index 22ab745d7c0..78ee0ace479 100755
--- a/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
+++ b/tests/queries/0_stateless/01057_http_compression_prefer_brotli.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01059_storage_file_brotli.sql b/tests/queries/0_stateless/01059_storage_file_brotli.sql
deleted file mode 100644
index ca20903d5ff..00000000000
--- a/tests/queries/0_stateless/01059_storage_file_brotli.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-DROP TABLE IF EXISTS file;
-CREATE TABLE file (x UInt64) ENGINE = File(TSV, 'data1.tsv.br');
-TRUNCATE TABLE file;
-
-INSERT INTO file SELECT * FROM numbers(1000000);
-SELECT count(), max(x) FROM file;
-
-DROP TABLE file;
-
-CREATE TABLE file (x UInt64) ENGINE = File(TSV, 'data2.tsv.gz');
-TRUNCATE TABLE file;
-
-INSERT INTO file SELECT * FROM numbers(1000000);
-SELECT count(), max(x) FROM file;
-
-DROP TABLE file;
-
-CREATE TABLE file (x UInt64) ENGINE = File(TSV, 'data3.tsv.xz');
-TRUNCATE TABLE file;
-
-INSERT INTO file SELECT * FROM numbers(1000000);
-SELECT count(), max(x) FROM file;
-
-DROP TABLE file;
-
-CREATE TABLE file (x UInt64) ENGINE = File(TSV, 'data4.tsv.zst');
-TRUNCATE TABLE file;
-
-INSERT INTO file SELECT * FROM numbers(1000000);
-SELECT count(), max(x) FROM file;
-
-DROP TABLE file;
-
-SELECT count(), max(x) FROM file('data{1,2,3,4}.tsv.{gz,br,xz,zst}', TSV, 'x UInt64');
-
--- check that they are compressed
-SELECT count() < 1000000, max(x) FROM file('data1.tsv.br', RowBinary, 'x UInt8', 'none');
-SELECT count() < 3000000, max(x) FROM file('data2.tsv.gz', RowBinary, 'x UInt8', 'none');
-SELECT count() < 1000000, max(x) FROM file('data3.tsv.xz', RowBinary, 'x UInt8', 'none');
-SELECT count() < 1000000, max(x) FROM file('data4.tsv.zst', RowBinary, 'x UInt8', 'none');
diff --git a/tests/queries/0_stateless/01059_storage_file_brotli.reference b/tests/queries/0_stateless/01059_storage_file_compression.reference
similarity index 59%
rename from tests/queries/0_stateless/01059_storage_file_brotli.reference
rename to tests/queries/0_stateless/01059_storage_file_compression.reference
index 31fcdce6e12..69516570638 100644
--- a/tests/queries/0_stateless/01059_storage_file_brotli.reference
+++ b/tests/queries/0_stateless/01059_storage_file_compression.reference
@@ -2,7 +2,11 @@
 1000000	999999
 1000000	999999
 1000000	999999
-4000000	999999
+1000000	999999
+1000000	999999
+6000000	999999
+1	255
+1	255
 1	255
 1	255
 1	255
diff --git a/tests/queries/0_stateless/01059_storage_file_compression.sh b/tests/queries/0_stateless/01059_storage_file_compression.sh
new file mode 100755
index 00000000000..fbee5070d8d
--- /dev/null
+++ b/tests/queries/0_stateless/01059_storage_file_compression.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on brotli and bzip2
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+for m in gz br xz zst lz4 bz2
+do
+    ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS file"
+    ${CLICKHOUSE_CLIENT} --query "CREATE TABLE file (x UInt64) ENGINE = File(TSV, '${CLICKHOUSE_DATABASE}/${m}.tsv.${m}')"
+    ${CLICKHOUSE_CLIENT} --query "TRUNCATE TABLE file"
+    ${CLICKHOUSE_CLIENT} --query "INSERT INTO file SELECT * FROM numbers(1000000)"
+    ${CLICKHOUSE_CLIENT} --query "SELECT count(), max(x) FROM file"
+    ${CLICKHOUSE_CLIENT} --query "DROP TABLE file"
+done
+
+${CLICKHOUSE_CLIENT} --query "SELECT count(), max(x) FROM file('${CLICKHOUSE_DATABASE}/{gz,br,xz,zst,lz4,bz2}.tsv.{gz,br,xz,zst,lz4,bz2}', TSV, 'x UInt64')"
+
+for m in gz br xz zst lz4 bz2
+do
+    ${CLICKHOUSE_CLIENT} --query "SELECT count() < 4000000, max(x) FROM file('${CLICKHOUSE_DATABASE}/${m}.tsv.${m}', RowBinary, 'x UInt8', 'none')"
+done
diff --git a/tests/queries/0_stateless/01060_avro.sh b/tests/queries/0_stateless/01060_avro.sh
index e735fadf2be..4fca8c196a2 100755
--- a/tests/queries/0_stateless/01060_avro.sh
+++ b/tests/queries/0_stateless/01060_avro.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-parallel, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql b/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
index 1987fffaa58..bfe928d7003 100644
--- a/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
+++ b/tests/queries/0_stateless/01060_shutdown_table_after_detach.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test Engine = MergeTree ORDER BY number AS SELECT number, toString(rand()) x from numbers(10000000);
 
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.reference b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.reference
rename to tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
similarity index 90%
rename from tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
rename to tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
index b830c549dc3..aba84f43033 100644
--- a/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
+++ b/tests/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+
 DROP TABLE IF EXISTS test_alter_on_mutation;
 
 CREATE TABLE test_alter_on_mutation
@@ -6,7 +9,7 @@ CREATE TABLE test_alter_on_mutation
   key UInt64,
   value String
 )
-ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01062/alter_on_mutation', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01062/alter_on_mutation', '1')
 ORDER BY key PARTITION BY date;
 
 INSERT INTO test_alter_on_mutation select toDate('2020-01-05'), number, toString(number) from system.numbers limit 100;
@@ -58,7 +61,7 @@ DROP TABLE IF EXISTS test_alter_on_mutation;
 
 DROP TABLE IF EXISTS nested_alter;
 
-CREATE TABLE nested_alter (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date), `s` String DEFAULT '0') ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01062/nested_alter', 'r2', d, k, 8192);
+CREATE TABLE nested_alter (`d` Date, `k` UInt64, `i32` Int32, `dt` DateTime, `n.ui8` Array(UInt8), `n.s` Array(String), `n.d` Array(Date), `s` String DEFAULT '0') ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01062/nested_alter', 'r2', d, k, 8192);
 
 INSERT INTO nested_alter VALUES ('2015-01-01', 6,38,'2014-07-15 13:26:50',[10,20,30],['asd','qwe','qwe'],['2000-01-01','2000-01-01','2000-01-03'],'100500');
 
diff --git a/tests/queries/0_stateless/01069_database_memory.sql b/tests/queries/0_stateless/01069_database_memory.sql
index ed006a5ce04..76a98bf544c 100644
--- a/tests/queries/0_stateless/01069_database_memory.sql
+++ b/tests/queries/0_stateless/01069_database_memory.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS memory_01069;
 CREATE DATABASE memory_01069 ENGINE = Memory;
 SHOW CREATE DATABASE memory_01069;
diff --git a/tests/queries/0_stateless/01070_h3_get_base_cell.sql b/tests/queries/0_stateless/01070_h3_get_base_cell.sql
index b06a12daf4a..27a0b1de152 100644
--- a/tests/queries/0_stateless/01070_h3_get_base_cell.sql
+++ b/tests/queries/0_stateless/01070_h3_get_base_cell.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3GetBaseCell(612916788725809151);
diff --git a/tests/queries/0_stateless/01070_h3_hex_area_m2.sql b/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
index b282485da77..9ad8beec99c 100644
--- a/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
+++ b/tests/queries/0_stateless/01070_h3_hex_area_m2.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3HexAreaM2(5);
 SELECT h3HexAreaM2(13);
diff --git a/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql b/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
index 52449654b29..6ef2874a962 100644
--- a/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
+++ b/tests/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3IndexesAreNeighbors(617420388352917503, 617420388352655359);
 SELECT h3IndexesAreNeighbors(617420388351344639, 617420388352655359);
 SELECT h3IndexesAreNeighbors(617420388351344639, 617420388351344639);
diff --git a/tests/queries/0_stateless/01070_h3_to_children.sql b/tests/queries/0_stateless/01070_h3_to_children.sql
index 647d4cef078..75675489e0c 100644
--- a/tests/queries/0_stateless/01070_h3_to_children.sql
+++ b/tests/queries/0_stateless/01070_h3_to_children.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT arraySort(h3ToChildren(599405990164561919, 3));
 
 SELECT arraySort(h3ToChildren(599405990164561919, 6));
diff --git a/tests/queries/0_stateless/01070_h3_to_parent.sql b/tests/queries/0_stateless/01070_h3_to_parent.sql
index 5052f4b7b92..46d354d8537 100644
--- a/tests/queries/0_stateless/01070_h3_to_parent.sql
+++ b/tests/queries/0_stateless/01070_h3_to_parent.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToParent(599405990164561919, 3);
 SELECT h3ToParent(599405990164561919, 0);
diff --git a/tests/queries/0_stateless/01070_h3_to_string.sql b/tests/queries/0_stateless/01070_h3_to_string.sql
index 358c5ae18d2..05aa3c90d23 100644
--- a/tests/queries/0_stateless/01070_h3_to_string.sql
+++ b/tests/queries/0_stateless/01070_h3_to_string.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToString(617420388352917503);
diff --git a/tests/queries/0_stateless/01070_materialize_ttl.sql b/tests/queries/0_stateless/01070_materialize_ttl.sql
index 2521ae35edf..b6a03f2ca10 100644
--- a/tests/queries/0_stateless/01070_materialize_ttl.sql
+++ b/tests/queries/0_stateless/01070_materialize_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d);
diff --git a/tests/queries/0_stateless/01070_modify_ttl.sql b/tests/queries/0_stateless/01070_modify_ttl.sql
index 4e842948afe..0716ccd7043 100644
--- a/tests/queries/0_stateless/01070_modify_ttl.sql
+++ b/tests/queries/0_stateless/01070_modify_ttl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 
 create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d);
@@ -61,7 +63,7 @@ alter table ttl modify column s String ttl i % 3 = 0 ? today() - 10 : toDate('21
 
 select i, s, t from ttl order by i;
 -- MATERIALIZE TTL ran only once
-select count() from system.mutations where table = 'ttl' and is_done;
+select count() from system.mutations where database = currentDatabase() and table = 'ttl' and is_done;
 select '=============';
 
 drop table if exists ttl;
@@ -69,6 +71,6 @@ drop table if exists ttl;
 -- Nothing changed, don't run mutation
 create table ttl (i Int, s String ttl toDate('2000-01-02')) engine = MergeTree order by i;
 alter table ttl modify column s String ttl toDate('2000-01-02');
-select count() from system.mutations where table = 'ttl' and is_done;
+select count() from system.mutations where database = currentDatabase() and table = 'ttl' and is_done;
 
 drop table if exists ttl;
diff --git a/tests/queries/0_stateless/01070_modify_ttl_recalc_only.reference b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.reference
new file mode 100644
index 00000000000..fe9cba71c4c
--- /dev/null
+++ b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.reference
@@ -0,0 +1,68 @@
+2000-10-10	1
+2000-10-10	2
+2100-10-10	3
+2100-10-10	4
+2000-10-11 00:00:00	2000-10-11 00:00:00
+2000-10-11 00:00:00	2000-10-11 00:00:00
+2100-10-11 00:00:00	2100-10-11 00:00:00
+2100-10-11 00:00:00	2100-10-11 00:00:00
+2100-10-10	3
+2100-10-10	4
+=============
+1	a
+2	b
+3	c
+4	d
+2000-01-01 00:00:00	2100-01-01 00:00:00
+1	a
+3	c
+=============
+1	a
+3	c
+2000-01-01 00:00:00	2000-01-01 00:00:00
+=============
+1	a
+2	b
+3	c
+4	d
+1	a
+2	
+3	c
+4	
+=============
+1	a
+2	
+3	c
+4	
+1	
+2	
+3	
+4	
+=============
+1	a
+2	b
+3	c
+4	d
+2000-01-01 00:00:00	2100-01-01 00:00:00
+1	a
+2	b
+4	d
+=============
+1	a
+2	b
+4	d
+1	
+2	
+4	d
+=============
+1	a	aa
+2	b	bb
+3	c	cc
+4	d	dd
+1	a	
+2	b	bb
+3		cc
+4	d	
+1
+=============
+0
diff --git a/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
new file mode 100644
index 00000000000..247e412484f
--- /dev/null
+++ b/tests/queries/0_stateless/01070_modify_ttl_recalc_only.sql
@@ -0,0 +1,109 @@
+-- Tags: no-parallel
+
+set mutations_sync = 2;
+
+drop table if exists ttl;
+
+create table ttl (d Date, a Int) engine = MergeTree order by a partition by toDayOfMonth(d)
+SETTINGS max_number_of_merges_with_ttl_in_pool=0,materialize_ttl_recalculate_only=true;
+
+insert into ttl values (toDateTime('2000-10-10 00:00:00'), 1);
+insert into ttl values (toDateTime('2000-10-10 00:00:00'), 2);
+insert into ttl values (toDateTime('2100-10-10 00:00:00'), 3);
+insert into ttl values (toDateTime('2100-10-10 00:00:00'), 4);
+
+
+alter table ttl modify ttl d + interval 1 day;
+select * from ttl order by a;
+select delete_ttl_info_min, delete_ttl_info_max  from system.parts where database = currentDatabase() and table = 'ttl' and active > 0 order by name asc;
+optimize table ttl final;
+select * from ttl order by a;
+select '=============';
+
+drop table if exists ttl;
+
+create table ttl (i Int, s String) engine = MergeTree order by i
+SETTINGS max_number_of_merges_with_ttl_in_pool=0,materialize_ttl_recalculate_only=true;
+
+insert into ttl values (1, 'a') (2, 'b') (3, 'c') (4, 'd');
+
+alter table ttl modify ttl i % 2 = 0 ? toDate('2000-01-01') : toDate('2100-01-01');
+select * from ttl order by i;
+select delete_ttl_info_min, delete_ttl_info_max  from system.parts where database = currentDatabase() and table = 'ttl' and active > 0;
+optimize table ttl final;
+select * from ttl order by i;
+select '=============';
+
+alter table ttl modify ttl toDate('2000-01-01');
+select * from ttl order by i;
+select delete_ttl_info_min, delete_ttl_info_max  from system.parts where database = currentDatabase() and table = 'ttl' and active > 0;
+optimize table ttl final;
+select * from ttl order by i;
+select '=============';
+
+drop table if exists ttl;
+
+create table ttl (i Int, s String) engine = MergeTree order by i
+SETTINGS max_number_of_merges_with_ttl_in_pool=0,materialize_ttl_recalculate_only=true;
+
+insert into ttl values (1, 'a') (2, 'b') (3, 'c') (4, 'd');
+
+alter table ttl modify column s String ttl i % 2 = 0 ? today() - 10 : toDate('2100-01-01');
+select * from ttl order by i;
+optimize table ttl final;
+select * from ttl order by i;
+select '=============';
+
+alter table ttl modify column s String ttl toDate('2000-01-01');
+select * from ttl order by i;
+optimize table ttl final;
+select * from ttl order by i;
+select '=============';
+
+drop table if exists ttl;
+
+create table ttl (d Date, i Int, s String) engine = MergeTree order by i
+SETTINGS max_number_of_merges_with_ttl_in_pool=0,materialize_ttl_recalculate_only=true;
+
+insert into ttl values (toDate('2000-01-02'), 1, 'a') (toDate('2000-01-03'), 2, 'b') (toDate('2080-01-01'), 3, 'c') (toDate('2080-01-03'), 4, 'd');
+
+alter table ttl modify ttl i % 3 = 0 ? toDate('2000-01-01') : toDate('2100-01-01');
+select i, s from ttl order by i;
+select delete_ttl_info_min, delete_ttl_info_max  from system.parts where database = currentDatabase() and table = 'ttl' and active > 0;
+optimize table ttl final;
+select i, s from ttl order by i;
+select '=============';
+
+alter table ttl modify column s String ttl d + interval 1 month;
+select i, s from ttl order by i;
+optimize table ttl final;
+select i, s from ttl order by i;
+select '=============';
+
+drop table if exists ttl;
+
+create table ttl (i Int, s String, t String) engine = MergeTree order by i
+SETTINGS max_number_of_merges_with_ttl_in_pool=0,materialize_ttl_recalculate_only=true;
+
+insert into ttl values (1, 'a', 'aa') (2, 'b', 'bb') (3, 'c', 'cc') (4, 'd', 'dd');
+
+alter table ttl modify column s String ttl i % 3 = 0 ? today() - 10 : toDate('2100-01-01'),
+                modify column t String ttl i % 3 = 1 ? today() - 10 : toDate('2100-01-01');
+
+select i, s, t from ttl order by i;
+optimize table ttl final;
+select i, s, t from ttl order by i;
+-- MATERIALIZE TTL ran only once
+select count() from system.mutations where database = currentDatabase() and table = 'ttl' and is_done;
+select '=============';
+
+drop table if exists ttl;
+
+-- Nothing changed, don't run mutation
+create table ttl (i Int, s String ttl toDate('2000-01-02')) engine = MergeTree order by i
+SETTINGS max_number_of_merges_with_ttl_in_pool=0,materialize_ttl_recalculate_only=true;
+
+alter table ttl modify column s String ttl toDate('2000-01-02');
+select count() from system.mutations where database = currentDatabase() and table = 'ttl' and is_done;
+
+drop table if exists ttl;
diff --git a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
index 10077a94c9d..6f297e25b95 100644
--- a/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
+++ b/tests/queries/0_stateless/01070_mutations_with_dependencies.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists ttl;
 set mutations_sync = 2;
 
diff --git a/tests/queries/0_stateless/01070_string_to_h3.sql b/tests/queries/0_stateless/01070_string_to_h3.sql
index 47b02d9f88b..db4a45f3d64 100644
--- a/tests/queries/0_stateless/01070_string_to_h3.sql
+++ b/tests/queries/0_stateless/01070_string_to_h3.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT stringToH3('89184926cc3ffff');
diff --git a/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
index 33806cc7416..6a43a750b01 100644
--- a/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_01071;
diff --git a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
index e16b8d67bc7..1caab4ca240 100644
--- a/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
+++ b/tests/queries/0_stateless/01071_live_view_detach_dependency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql b/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
index 4c005f6ba56..bbb607fe89f 100644
--- a/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
+++ b/tests/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE old_syntax_01071_test (date Date, id UInt8) ENGINE = MergeTree(date, id, 8192);
 ALTER TABLE old_syntax_01071_test ADD INDEX  id_minmax id TYPE minmax GRANULARITY 1; -- { serverError 36 }
 CREATE TABLE new_syntax_01071_test (date Date, id UInt8) ENGINE = MergeTree() ORDER BY id;
diff --git a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
index 0e4e031a985..f7ccc309c5a 100644
--- a/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
+++ b/tests/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS json_square_brackets;
 CREATE TABLE json_square_brackets (id UInt32, name String) ENGINE = Memory;
 INSERT INTO json_square_brackets FORMAT JSONEachRow [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
diff --git a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
index e0877d16ca3..ea0da0fe545 100644
--- a/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
+++ b/tests/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-unbundled
+
 drop table if exists data_01072;
 drop table if exists dist_01072;
 
diff --git a/tests/queries/0_stateless/01073_attach_if_not_exists.sql b/tests/queries/0_stateless/01073_attach_if_not_exists.sql
index 8bb52556ccc..8bd356b466c 100644
--- a/tests/queries/0_stateless/01073_attach_if_not_exists.sql
+++ b/tests/queries/0_stateless/01073_attach_if_not_exists.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE TABLE aine (a Int) ENGINE = Log;
 ATTACH TABLE aine; -- { serverError 57 }
 ATTACH TABLE IF NOT EXISTS aine;
diff --git a/tests/queries/0_stateless/01073_show_tables_not_like.sql b/tests/queries/0_stateless/01073_show_tables_not_like.sql
index bdf88449ccb..405a6cb199b 100644
--- a/tests/queries/0_stateless/01073_show_tables_not_like.sql
+++ b/tests/queries/0_stateless/01073_show_tables_not_like.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SHOW TABLES NOT LIKE '%';
 
 DROP DATABASE IF EXISTS test_01073;
diff --git a/tests/queries/0_stateless/01074_h3_range_check.sql b/tests/queries/0_stateless/01074_h3_range_check.sql
index 17b5c5c5b26..42a95229f3f 100644
--- a/tests/queries/0_stateless/01074_h3_range_check.sql
+++ b/tests/queries/0_stateless/01074_h3_range_check.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeLengthM(100); -- { serverError 69 }
 SELECT h3HexAreaM2(100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01075_allowed_client_hosts.sql b/tests/queries/0_stateless/01075_allowed_client_hosts.sql
index 2960a93f0f2..17957c8826b 100644
--- a/tests/queries/0_stateless/01075_allowed_client_hosts.sql
+++ b/tests/queries/0_stateless/01075_allowed_client_hosts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP USER IF EXISTS test_user_01075, test_user_01075_x, test_user_01075_x@localhost, test_user_01075_x@'192.168.23.15';
 
 CREATE USER test_user_01075;
diff --git a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
index 2562e701a25..80821193d38 100755
--- a/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
+++ b/tests/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 # This is a monkey test used to trigger sanitizers.
 
diff --git a/tests/queries/0_stateless/01076_json_each_row_array.sh b/tests/queries/0_stateless/01076_json_each_row_array.sh
index cbbaafacace..ec24741ed16 100755
--- a/tests/queries/0_stateless/01076_json_each_row_array.sh
+++ b/tests/queries/0_stateless/01076_json_each_row_array.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
index efe518046a1..bbc16121cb6 100755
--- a/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
+++ b/tests/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel, no-fasttest
 
 
 # This test checks mutations concurrent execution with concurrent inserts.
diff --git a/tests/queries/0_stateless/01079_alter_default_zookeeper.reference b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.reference
similarity index 54%
rename from tests/queries/0_stateless/01079_alter_default_zookeeper.reference
rename to tests/queries/0_stateless/01079_alter_default_zookeeper_long.reference
index 7dd539b2683..32d31af0058 100644
--- a/tests/queries/0_stateless/01079_alter_default_zookeeper.reference
+++ b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.reference
@@ -1,11 +1,11 @@
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` String DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` String DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 1000
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT \'10\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 1000
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt16 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt64 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt16 DEFAULT 100\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
 10000
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
-CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\',\n    `other_date` String DEFAULT 1\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.alter_default\n(\n    `date` Date,\n    `key` UInt64,\n    `value` UInt8 DEFAULT 10,\n    `better_column` UInt8 DEFAULT \'1\',\n    `other_date` String DEFAULT 1\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01079/alter_default\', \'1\')\nORDER BY key\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01079_alter_default_zookeeper.sql b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
similarity index 92%
rename from tests/queries/0_stateless/01079_alter_default_zookeeper.sql
rename to tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
index 6fa9d2bf4e0..9239d2e9984 100644
--- a/tests/queries/0_stateless/01079_alter_default_zookeeper.sql
+++ b/tests/queries/0_stateless/01079_alter_default_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS alter_default;
 
 CREATE TABLE alter_default
@@ -5,7 +7,7 @@ CREATE TABLE alter_default
   date Date,
   key UInt64
 )
-ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01079/alter_default', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01079/alter_default', '1')
 ORDER BY key;
 
 INSERT INTO alter_default select toDate('2020-01-05'), number from system.numbers limit 100;
diff --git a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
index 6e79be90046..82b8be65af5 100755
--- a/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.reference b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.reference
index af33a5bfc3f..4b640354c1b 100644
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.reference
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.reference
@@ -1,6 +1,8 @@
 Starting alters
 Finishing alters
 Equal number of columns
+Replication did not hang: synced all replicas of concurrent_alter_add_drop_
+Consistency: 1
 0
 0
 0
diff --git a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
index fd0b53cf122..fbeb18251a6 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 REPLICAS=3
 
@@ -101,6 +104,8 @@ while [[ $(timeout 120 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE concurrent_alte
     sleep 1
 done
 
+check_replication_consistency "concurrent_alter_add_drop_" "count(), sum(key), sum(cityHash64(value0))"
+
 for i in $(seq $REPLICAS); do
     $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA concurrent_alter_add_drop_$i"
     $CLICKHOUSE_CLIENT --query "SELECT COUNT() FROM system.mutations WHERE is_done = 0 and table = 'concurrent_alter_add_drop_$i'"
diff --git a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
index 83f3196253a..c95554d26bb 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -103,8 +104,8 @@ done
 for i in $(seq $REPLICAS); do
     $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA concurrent_alter_detach_$i"
     $CLICKHOUSE_CLIENT --query "SELECT SUM(toUInt64(value1)) > $INITIAL_SUM FROM concurrent_alter_detach_$i"
-    $CLICKHOUSE_CLIENT --query "SELECT COUNT() FROM system.mutations WHERE is_done=0 and table = 'concurrent_alter_detach_$i'" # all mutations have to be done
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.mutations WHERE is_done=0 and table = 'concurrent_alter_detach_$i'" # all mutations have to be done
+    $CLICKHOUSE_CLIENT --query "SELECT COUNT() FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and is_done=0 and table = 'concurrent_alter_detach_$i'" # all mutations have to be done
+    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and is_done=0 and table = 'concurrent_alter_detach_$i'" # all mutations have to be done
     $CLICKHOUSE_CLIENT --query "SELECT * FROM system.replication_queue WHERE table = 'concurrent_alter_detach_$i' and (type = 'ALTER_METADATA' or type = 'MUTATE_PART')" # all mutations and alters have to be done
     $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS concurrent_alter_detach_$i"
 done
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
index ff9c6824f00..435b1b1f1ae 100644
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
@@ -5,6 +5,8 @@
 1725
 Starting alters
 Finishing alters
+Replication did not hang: synced all replicas of concurrent_alter_mt_
+Consistency: 1
 1
 0
 1
diff --git a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
index 9cca73b5eef..ba8d89aad3c 100755
--- a/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 REPLICAS=5
 
@@ -112,11 +115,13 @@ while [[ $(timeout 120 ${CLICKHOUSE_CLIENT} --query "ALTER TABLE concurrent_alte
     sleep 1
 done
 
+check_replication_consistency "concurrent_alter_mt_" "count(), sum(key), sum(cityHash64(value1)), sum(cityHash64(value2))"
+
 for i in $(seq $REPLICAS); do
     $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA concurrent_alter_mt_$i"
     $CLICKHOUSE_CLIENT --query "SELECT SUM(toUInt64(value1)) > $INITIAL_SUM FROM concurrent_alter_mt_$i"
-    $CLICKHOUSE_CLIENT --query "SELECT COUNT() FROM system.mutations WHERE is_done=0 and table = 'concurrent_alter_mt_$i'" # all mutations have to be done
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.mutations WHERE is_done=0 and table = 'concurrent_alter_mt_$i'"
+    $CLICKHOUSE_CLIENT --query "SELECT COUNT() FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and is_done=0 and table = 'concurrent_alter_mt_$i'" # all mutations have to be done
+    $CLICKHOUSE_CLIENT --query "SELECT * FROM system.mutations WHERE database = '$CLICKHOUSE_DATABASE' and is_done=0 and table = 'concurrent_alter_mt_$i'"
     $CLICKHOUSE_CLIENT --query "SELECT * FROM system.replication_queue WHERE table = 'concurrent_alter_mt_$i' and (type = 'ALTER_METADATA' or type = 'MUTATE_PART')"
     $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS concurrent_alter_mt_$i"
 done
diff --git a/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql b/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
index 7725cf1890f..1eb6e849851 100644
--- a/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
+++ b/tests/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- TODO: can't just remove default prefix, it breaks the test!
 
 drop database if exists db_01080;
diff --git a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
index 4a3ac513e36..dd39277ee31 100644
--- a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
+++ b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.sql
@@ -1,3 +1,16 @@
+-- Tags: no-parallel, no-fasttest
+
+DROP TABLE IF EXISTS file;
+DROP TABLE IF EXISTS url;
+DROP TABLE IF EXISTS view;
+DROP TABLE IF EXISTS buffer;
+DROP TABLE IF EXISTS merge;
+DROP TABLE IF EXISTS merge_tf;
+DROP TABLE IF EXISTS distributed;
+DROP TABLE IF EXISTS distributed_tf;
+DROP TABLE IF EXISTS rich_syntax;
+DROP DICTIONARY IF EXISTS dict;
+
 CREATE TABLE file (n Int8) ENGINE = File(upper('tsv') || 'WithNames' || 'AndTypes');
 CREATE TABLE buffer (n Int8) ENGINE = Buffer(currentDatabase(), file, 16, 10, 200, 10000, 1000000, 10000000, 1000000000);
 CREATE TABLE merge (n Int8) ENGINE = Merge('', lower('DISTRIBUTED'));
@@ -70,4 +83,15 @@ INSERT INTO buffer VALUES (1);
 SELECT sum(n) from rich_syntax;
 
 -- Clear cache to avoid future errors in the logs
-SYSTEM DROP DNS CACHE
+SYSTEM DROP DNS CACHE;
+
+DROP TABLE file;
+DROP TABLE url;
+DROP TABLE view;
+DROP TABLE buffer;
+DROP TABLE merge;
+DROP TABLE merge_tf;
+DROP TABLE distributed;
+DROP TABLE distributed_tf;
+DROP TABLE rich_syntax;
+DROP DICTIONARY dict;
diff --git a/tests/queries/0_stateless/01084_regexp_empty.sql b/tests/queries/0_stateless/01084_regexp_empty.sql
index 9cb0eb32bc5..3ccd4af80ab 100644
--- a/tests/queries/0_stateless/01084_regexp_empty.sql
+++ b/tests/queries/0_stateless/01084_regexp_empty.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01084;
 CREATE DATABASE test_01084;
 USE test_01084;
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections.sh b/tests/queries/0_stateless/01085_max_distributed_connections.sh
index 1c42cd1a7e0..34862289d1e 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections.sh
@@ -1,21 +1,23 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+i=0 retries=300
 # Sometimes five seconds are not enough due to system overload.
 # But if it can run in less than five seconds at least sometimes - it is enough for the test.
-while true
-do
+while [[ $i -lt $retries ]]; do
     opts=(
-        --max_distributed_connections 9
+        --max_distributed_connections 20
         --max_threads 1
-        --query "SELECT sleepEachRow(1) FROM remote('127.{2..10}', system.one)"
+        --query "SELECT sleepEachRow(1) FROM remote('127.{2..21}', system.one)"
         --format Null
     )
-    # 5 less then 9 seconds (9 streams), but long enough to cover possible load peaks
+    # 10 less then 20 seconds (20 streams), but long enough to cover possible load peaks
     # "$@" left to pass manual options (like --experimental_use_processors 0) during manual testing
 
-    timeout 5s ${CLICKHOUSE_CLIENT} "${opts[@]}" "$@" && break
+    timeout 10s ${CLICKHOUSE_CLIENT} "${opts[@]}" "$@" && break
+    ((++i))
 done
diff --git a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
index 1aa9939407c..0e40918257d 100755
--- a/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
+++ b/tests/queries/0_stateless/01085_max_distributed_connections_http.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -7,9 +8,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # Sometimes 1.8 seconds are not enough due to system overload.
 # But if it can run in less than five seconds at least sometimes - it is enough for the test.
 
-while true
-do
+i=0 retries=100
+while [[ $i -lt $retries ]]; do
     query="SELECT sleepEachRow(1) FROM remote('127.{2,3}', system.one) FORMAT Null"
     # 1.8 less then 2 seconds, but long enough to cover possible load peaks
     timeout 1.8s ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&max_distributed_connections=2&max_threads=1" -d "$query" && break
+    ((++i))
 done
diff --git a/tests/queries/0_stateless/01085_simdjson_uint64.sql b/tests/queries/0_stateless/01085_simdjson_uint64.sql
index dfa367e1238..952bc150dec 100644
--- a/tests/queries/0_stateless/01085_simdjson_uint64.sql
+++ b/tests/queries/0_stateless/01085_simdjson_uint64.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 WITH '{"a": "hello", "b": 12345678901234567890}' AS json
 SELECT JSONExtractRaw(json, 'a');
diff --git a/tests/queries/0_stateless/01086_odbc_roundtrip.sh b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
index 3c9e5c8aba9..cc3d8c53872 100755
--- a/tests/queries/0_stateless/01086_odbc_roundtrip.sh
+++ b/tests/queries/0_stateless/01086_odbc_roundtrip.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-asan, no-msan, no-unbundled, no-fasttest
+# Tag no-msan: can't pass because odbc libraries are not instrumented
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01087_storage_generate.reference b/tests/queries/0_stateless/01087_storage_generate.reference
index 3680d8d943d..78c6784f7d2 100644
--- a/tests/queries/0_stateless/01087_storage_generate.reference
+++ b/tests/queries/0_stateless/01087_storage_generate.reference
@@ -4,7 +4,7 @@
 [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.6900	('2009-06-18 01:53:29.808','bc630f78-7d58-0c46-dd4b-27fc35625e96')
+[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')
@@ -25,23 +25,23 @@
 [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.5050	('2093-09-10 20:39:39.050','9d1025b6-2d0c-1d84-dafd-02668eb29270')
+[-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.6650	('2074-12-30 18:43:40.817','68096065-18c8-8aca-fd21-15330ead669d')
+[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.1670	('2044-11-08 07:52:03.325','13769348-9e58-0e75-3972-8bbadc150715')
+[]	-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.6410	('2050-10-05 06:29:27.154','36e576aa-c77f-994e-1925-4a4c40da3a0f')
+[]	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.7820	('2096-07-03 23:06:30.632','9c1b37d7-4ced-9428-a0ae-34c5436b14c4')
+[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')
@@ -61,10 +61,10 @@
 [-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.2860	('2010-06-02 02:49:03.396','d32b8b61-cc3e-31fa-2a2a-abefa60bfcee')
+[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.3690	('2013-11-05 07:44:45.233','11db26b3-e2b5-b9fa-6b0e-79c43a2e67ab')
+[-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')
@@ -73,13 +73,13 @@
 [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.9630	('2005-10-02 20:34:27.452','04785b75-30e5-af8b-547e-d15bcb7f49fb')
-[43]	-169861.2000	('2006-12-13 09:26:13.923','cb865d38-d961-d7f9-acbb-583b9f31252f')
+[-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.3320	('2100-07-19 15:02:27.109','756bfd26-c4b3-94b8-e991-c7ab7a833b76')
+[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')
@@ -91,13 +91,13 @@
 []	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.6670	('2105-09-23 21:06:17.755','07bb6e47-3234-c268-40d7-332388dc06f8')
+[-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.5590	('2031-11-03 19:47:03.757','914e6166-c96e-e0e4-101a-0bb516cf5a2f')
+[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')
 -
diff --git a/tests/queries/0_stateless/01087_table_function_generate.reference b/tests/queries/0_stateless/01087_table_function_generate.reference
index bf301d34eb3..ea4162e4840 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.reference
+++ b/tests/queries/0_stateless/01087_table_function_generate.reference
@@ -86,7 +86,7 @@ Decimal(9, 4)	Decimal(18, 8)	Decimal(18, 8)
 -18731.5032	81241713112.39967992	-10576027963457111164764.0798899532879521
 65289.5061	-27889310937.24180887	5807515838469365530027.7612329616030438
 -197586.1517	-751754543.85331084	3835903211857734974086.0358362773591932
-183596.0063	8217353434.41964030	13633006218585943284268.9826084812209912
+183596.0063	8217353434.4196403	13633006218585943284268.9826084812209912
 73041.2674	-88881500366.49430454	-148702703925022894263.3187064158377476
 101454.4494	-27768337.71540858	-634829280961262229789.4961995996929358
 -174012.0101	-13636289325.35403038	-3611949395160064991369.2765012316944096
@@ -226,12 +226,12 @@ RL,{Xs\\tw
 [124]	-114719.5228	('2010-11-11 22: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.0200	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
+[-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.0630	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
+[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
diff --git a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.reference b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.reference
rename to tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.reference
diff --git a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
similarity index 52%
rename from tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql
rename to tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
index 5597bf523e4..43ab053655a 100644
--- a/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql
+++ b/tests/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
@@ -1,10 +1,14 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS mutations_and_quorum1;
 DROP TABLE IF EXISTS mutations_and_quorum2;
 
-CREATE TABLE mutations_and_quorum1 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01090/mutations_and_quorum', '1') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
-CREATE TABLE mutations_and_quorum2 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01090/mutations_and_quorum', '2') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
+CREATE TABLE mutations_and_quorum1 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01090/mutations_and_quorum', '1') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
+CREATE TABLE mutations_and_quorum2 (`server_date` Date, `something` String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01090/mutations_and_quorum', '2') PARTITION BY toYYYYMM(server_date) ORDER BY (server_date, something);
 
-SET insert_quorum=2, insert_quorum_parallel=0;
+-- Should not be larger then 600e6 (default timeout in clickhouse-test)
+SET insert_quorum=2, insert_quorum_parallel=0, insert_quorum_timeout=300e3;
 
 INSERT INTO mutations_and_quorum1 VALUES ('2019-01-01', 'test1'), ('2019-02-01', 'test2'), ('2019-03-01', 'test3'), ('2019-04-01', 'test4'), ('2019-05-01', 'test1'), ('2019-06-01', 'test2'), ('2019-07-01', 'test3'), ('2019-08-01', 'test4'), ('2019-09-01', 'test1'), ('2019-10-01', 'test2'), ('2019-11-01', 'test3'), ('2019-12-01', 'test4');
 
@@ -13,7 +17,7 @@ ALTER TABLE mutations_and_quorum1 DELETE WHERE something = 'test1' SETTINGS muta
 SELECT COUNT() FROM mutations_and_quorum1;
 SELECT COUNT() FROM mutations_and_quorum2;
 
-SELECT COUNT() FROM system.mutations WHERE table like 'mutations_and_quorum%' and is_done = 0;
+SELECT COUNT() FROM system.mutations WHERE database = currentDatabase() AND table like 'mutations_and_quorum%' and is_done = 0;
 
 DROP TABLE IF EXISTS mutations_and_quorum1;
 DROP TABLE IF EXISTS mutations_and_quorum2;
diff --git a/tests/queries/0_stateless/01091_insert_with_default_json.sql b/tests/queries/0_stateless/01091_insert_with_default_json.sql
index d8b998cdd5e..40de4eb0637 100644
--- a/tests/queries/0_stateless/01091_insert_with_default_json.sql
+++ b/tests/queries/0_stateless/01091_insert_with_default_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS table_with_complex_default;
 
 CREATE TABLE table_with_complex_default (i Int8, n UInt8 DEFAULT 42, s String DEFAULT concat('test', CAST(n, 'String'))) ENGINE=TinyLog;
diff --git a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
index 010cbc6265a..84e4f7c0edb 100644
--- a/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
+++ b/tests/queries/0_stateless/01091_query_profiler_does_not_hang.sql
@@ -1,2 +1,4 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled
+
 SET query_profiler_cpu_time_period_ns = 1;
 SELECT count() FROM numbers_mt(1000000000);
diff --git a/tests/queries/0_stateless/01092_base64.sql b/tests/queries/0_stateless/01092_base64.sql
index 476edfe31d7..f50cf49d270 100644
--- a/tests/queries/0_stateless/01092_base64.sql
+++ b/tests/queries/0_stateless/01092_base64.sql
@@ -1,2 +1,4 @@
+-- Tags: no-fasttest
+
 -- This query reproduces a bug in TurboBase64 library.
 select distinct base64Encode(materialize('LG Optimus')) from numbers(100);
diff --git a/tests/queries/0_stateless/01092_memory_profiler.reference b/tests/queries/0_stateless/01092_memory_profiler.reference
index 0d66ea1aee9..74240c4b196 100644
--- a/tests/queries/0_stateless/01092_memory_profiler.reference
+++ b/tests/queries/0_stateless/01092_memory_profiler.reference
@@ -1,2 +1,4 @@
 0
 1
+1
+1
diff --git a/tests/queries/0_stateless/01092_memory_profiler.sql b/tests/queries/0_stateless/01092_memory_profiler.sql
index b0bfca8e494..0db88bb14b3 100644
--- a/tests/queries/0_stateless/01092_memory_profiler.sql
+++ b/tests/queries/0_stateless/01092_memory_profiler.sql
@@ -1,6 +1,13 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-parallel, no-fasttest
+
 SET allow_introspection_functions = 1;
 
 SET memory_profiler_step = 1000000;
+SET memory_profiler_sample_probability = 1;
+SET log_queries = 1;
+
 SELECT ignore(groupArray(number), 'test memory profiler') FROM numbers(10000000);
 SYSTEM FLUSH LOGS;
 WITH addressToSymbol(arrayJoin(trace)) AS symbol SELECT count() > 0 FROM system.trace_log t WHERE event_date >= yesterday() AND trace_type = 'Memory' AND query_id = (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND query LIKE '%test memory profiler%' ORDER BY event_time DESC LIMIT 1);
+WITH addressToSymbol(arrayJoin(trace)) AS symbol SELECT count() > 0 FROM system.trace_log t WHERE event_date >= yesterday() AND trace_type = 'MemoryPeak' AND query_id = (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND query LIKE '%test memory profiler%' ORDER BY event_time DESC LIMIT 1);
+WITH addressToSymbol(arrayJoin(trace)) AS symbol SELECT count() > 0 FROM system.trace_log t WHERE event_date >= yesterday() AND trace_type = 'MemorySample' AND query_id = (SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND event_date >= yesterday() AND query LIKE '%test memory profiler%' ORDER BY event_time DESC LIMIT 1);
diff --git a/tests/queries/0_stateless/01095_tpch_like_smoke.reference b/tests/queries/0_stateless/01095_tpch_like_smoke.reference
index 8cdcc2b015f..e7a7544bede 100644
--- a/tests/queries/0_stateless/01095_tpch_like_smoke.reference
+++ b/tests/queries/0_stateless/01095_tpch_like_smoke.reference
@@ -4,7 +4,7 @@
 4	fail: exists
 5
 6
-0.0000
+0
 7
 8
 9
@@ -13,13 +13,13 @@
 12
 13
 14
-0.000000
+0
 15	fail: correlated subquery
 16
 17	fail: correlated subquery
 18
 19
-0.0000
+0
 20	fail: correlated subquery
 21	fail: exists, not exists
 22	fail: not exists
diff --git a/tests/queries/0_stateless/01098_msgpack_format.reference b/tests/queries/0_stateless/01098_msgpack_format.reference
index ad116a5ba91..384852f24a7 100644
--- a/tests/queries/0_stateless/01098_msgpack_format.reference
+++ b/tests/queries/0_stateless/01098_msgpack_format.reference
@@ -11,3 +11,25 @@
 2020-01-01
 2020-01-02
 2020-01-02
+{1:2,2:3}	[{1:[1,2],2:[3,4]},{3:[5,6],4:[7,8]}]
+{1:2,2:3}	[{1:[1,2],2:[3,4]},{3:[5,6],4:[7,8]}]
+42	42	42	['42','42']	['42','42']
+42	\N	\N	[NULL,'42',NULL]	[NULL,'42',NULL]
+42	42	42	['42','42']	['42','42']
+42	\N	\N	[NULL,'42',NULL]	[NULL,'42',NULL]
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
diff --git a/tests/queries/0_stateless/01098_msgpack_format.sh b/tests/queries/0_stateless/01098_msgpack_format.sh
index 3bc60b4a9cb..aa982c5478d 100755
--- a/tests/queries/0_stateless/01098_msgpack_format.sh
+++ b/tests/queries/0_stateless/01098_msgpack_format.sh
@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+
 $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";
@@ -61,3 +66,66 @@ $CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack";
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE msgpack";
 
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS msgpack_map";
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack_map (m Map(UInt64, UInt64), a Array(Map(UInt64, Array(UInt64)))) ENGINE=Memory()";
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_map VALUES ({1 : 2, 2 : 3}, [{1 : [1, 2], 2 : [3, 4]}, {3 : [5, 6], 4 : [7, 8]}])";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_map FORMAT MsgPack" | $CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_map FORMAT MsgPack";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_map";
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE msgpack_map";
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS msgpack_lc_nullable";
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE msgpack_lc_nullable (a LowCardinality(String), b Nullable(String), c LowCardinality(Nullable(String)), d Array(Nullable(String)), e Array(LowCardinality(Nullable(String)))) engine=Memory()";
+
+$CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_lc_nullable VALUES ('42', '42', '42', ['42', '42'], ['42', '42']), ('42', NULL, NULL, [NULL, '42', NULL], [NULL, '42', NULL])";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_lc_nullable FORMAT MsgPack" | $CLICKHOUSE_CLIENT --query="INSERT INTO msgpack_lc_nullable FORMAT MsgPack";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM msgpack_lc_nullable";
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE msgpack_lc_nullable";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT toString(number) FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x UInt64')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Array(UInt32)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Map(UInt64, UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT number FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x String')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Array(UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Map(UInt64, UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT [number, number + 1] FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x String')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x UInt64')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Map(UInt64, UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT map(number, number + 1) FROM  numbers(10) FORMAT MsgPack" > $USER_FILES_PATH/data.msgpack
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Float32')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x String')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x UInt64')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.msgpack', 'MsgPack', 'x Array(UInt64)')" 2>&1 | grep -F -q "ILLEGAL_COLUMN" && echo 'OK' || echo 'FAIL';
+
+
+rm $USER_FILES_PATH/data.msgpack
+
diff --git a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
index 17683852f2b..860529a26e5 100755
--- a/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
+++ b/tests/queries/0_stateless/01098_temporary_and_external_tables.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01099_operators_date_and_timestamp.reference b/tests/queries/0_stateless/01099_operators_date_and_timestamp.reference
index 103053a19f0..0d8a65c3869 100644
--- a/tests/queries/0_stateless/01099_operators_date_and_timestamp.reference
+++ b/tests/queries/0_stateless/01099_operators_date_and_timestamp.reference
@@ -1,13 +1,13 @@
 1	1	1
 1	1	1
 1	1
-2001-09-28
-2001-10-05	Date
+2001-09-29
+2001-10-06	Date
 2001-09-24	Date
-2001-10-05	Date
+2001-10-06	Date
 2001-09-24	Date
-2001-09-28 01:00:00	DateTime
-2001-09-27 23:00:00	DateTime
+2001-09-29 01:00:00	DateTime
+2001-09-28 23:00:00	DateTime
 3	Int32
 2001-09-29 00:00:00
 2001-09-28 00:00:00
diff --git a/tests/queries/0_stateless/01099_operators_date_and_timestamp.sql b/tests/queries/0_stateless/01099_operators_date_and_timestamp.sql
index c630e19490d..8c3068cd36b 100644
--- a/tests/queries/0_stateless/01099_operators_date_and_timestamp.sql
+++ b/tests/queries/0_stateless/01099_operators_date_and_timestamp.sql
@@ -2,13 +2,13 @@ select interval 1 second, interval 1 minute, interval 1 hour;
 select interval 1 day, interval 1 week, interval 1 month;
 select interval 1 quarter, interval 1 year;
 
-select date '2001-09-28';
-select (date '2001-09-28' + interval 7 day) x, toTypeName(x);
+select date '2001-09-29';
+select (date '2001-09-29' + interval 7 day) x, toTypeName(x);
 select (date '2001-10-01' - interval 7 day) x, toTypeName(x);
-select (date '2001-09-28' + 7) x, toTypeName(x);
+select (date '2001-09-29' + 7) x, toTypeName(x);
 select (date '2001-10-01' - 7) x, toTypeName(x);
-select (date '2001-09-28' + interval 1 hour) x, toTypeName(x);
-select (date '2001-09-28' - interval 1 hour) x, toTypeName(x);
+select (date '2001-09-29' + interval 1 hour) x, toTypeName(x);
+select (date '2001-09-29' - interval 1 hour) x, toTypeName(x);
 select (date '2001-10-01' - date '2001-09-28') x, toTypeName(x);
 select timestamp '2001-09-28 01:00:00' + interval 23 hour;
 select timestamp '2001-09-28 23:00:00' - interval 23 hour;
diff --git a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
index 222c05ae827..adfee36fe77 100644
--- a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
+++ b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-unbundled
+
 -- set insert_distributed_sync = 1;  -- see https://github.com/ClickHouse/ClickHouse/issues/18971
 
 DROP TABLE IF EXISTS local_01099_a;
diff --git a/tests/queries/0_stateless/01101_literal_column_clash.reference b/tests/queries/0_stateless/01101_literal_column_clash.reference
index b89f59abb18..8f76d98575c 100644
--- a/tests/queries/0_stateless/01101_literal_column_clash.reference
+++ b/tests/queries/0_stateless/01101_literal_column_clash.reference
@@ -3,7 +3,6 @@
 7	0
 7	1
 xyzabc	2
-1	3
 1	2	0	0
 1	0	0	3
 \N	1	2	\N	0
diff --git a/tests/queries/0_stateless/01101_literal_column_clash.sql b/tests/queries/0_stateless/01101_literal_column_clash.sql
index 4a6064141ea..b9645e3609e 100644
--- a/tests/queries/0_stateless/01101_literal_column_clash.sql
+++ b/tests/queries/0_stateless/01101_literal_column_clash.sql
@@ -7,7 +7,7 @@ join (select '1' as sid) as t2 on t2.sid = cast(t1.iid as String);
 select cast(7 as String), * from (select 3 "'String'");
 select cast(7 as String), * from (select number "'String'" FROM numbers(2));
 SELECT concat('xyz', 'abc'), * FROM (SELECT 2 AS "'xyz'");
-with 3 as "1" select 1, "1";
+with 3 as "1" select 1, "1"; -- { serverError 352 }
 
 -- https://github.com/ClickHouse/ClickHouse/issues/9953
 select 1, * from (select 2 x) a left join (select 1, 3 y) b on y = x;
diff --git a/tests/queries/0_stateless/01102_distributed_local_in_bug.sql b/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
index ea32f6ffc7d..580f519bac2 100644
--- a/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
+++ b/tests/queries/0_stateless/01102_distributed_local_in_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS hits;
 DROP TABLE IF EXISTS visits;
 DROP TABLE IF EXISTS hits_layer;
diff --git a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
index 1039f8f7d97..48eeaf748b7 100755
--- a/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
+++ b/tests/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-fasttest
+# Tag no-fasttest: avoid dependency on qemu -- invonvenient when running locally
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -6,10 +8,15 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # If we run sanitized binary under qemu, it will try to slowly allocate 20 TiB until OOM.
 # Don't even try to do that. This test should be disabled for sanitizer builds.
-${CLICKHOUSE_LOCAL} --query "SELECT max(value LIKE '%sanitize%') FROM system.build_options" | grep -q '1' && echo 'Skip test for sanitizer build' && exit
+${CLICKHOUSE_LOCAL} --query "SELECT max(value LIKE '%sanitize%') FROM system.build_options" | grep -q '1' && echo '@@SKIP@@: Sanitizer build' && exit
 
 command=$(command -v ${CLICKHOUSE_LOCAL})
 
+if ! hash qemu-x86_64-static 2>/dev/null; then
+    echo "@@SKIP@@: No qemu-x86_64-static"
+    exit 0
+fi
+
 function run_with_cpu()
 {
     qemu-x86_64-static -cpu "$@" "$command" --query "SELECT 1" 2>&1 | grep -v -F "warning: TCG doesn't support requested feature" ||:
diff --git a/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql b/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
index 32655420a27..db22d3e4134 100644
--- a/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
+++ b/tests/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 CREATE DATABASE IF NOT EXISTS test_01103;
 USE test_01103;
 
diff --git a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
index 72459e21b69..95f8dfc0377 100755
--- a/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+++ b/tests/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01104_distributed_numbers_test.sql b/tests/queries/0_stateless/01104_distributed_numbers_test.sql
index 101342b4c34..bb2db88f23f 100644
--- a/tests/queries/0_stateless/01104_distributed_numbers_test.sql
+++ b/tests/queries/0_stateless/01104_distributed_numbers_test.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS d_numbers;
 CREATE TABLE d_numbers (number UInt32) ENGINE = Distributed(test_cluster_two_shards, system, numbers, rand());
 
diff --git a/tests/queries/0_stateless/01104_distributed_one_test.sql b/tests/queries/0_stateless/01104_distributed_one_test.sql
index 0ae6a180570..fb2c2774c99 100644
--- a/tests/queries/0_stateless/01104_distributed_one_test.sql
+++ b/tests/queries/0_stateless/01104_distributed_one_test.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS d_one;
 CREATE TABLE d_one (dummy UInt8) ENGINE = Distributed(test_cluster_two_shards, system, one, rand());
 
diff --git a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
index 227c4df6785..300d32f5a0c 100755
--- a/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
+++ b/tests/queries/0_stateless/01107_atomic_db_detach_attach.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
index d564594291a..14ba90d5ec0 100755
--- a/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
+++ b/tests/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock, replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01109_exchange_tables.sql b/tests/queries/0_stateless/01109_exchange_tables.sql
index f2b8e4adb1d..604f1b9f57d 100644
--- a/tests/queries/0_stateless/01109_exchange_tables.sql
+++ b/tests/queries/0_stateless/01109_exchange_tables.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01109;
 CREATE DATABASE test_01109 ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql b/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
index e39afcba742..ed2f61e2627 100644
--- a/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
+++ b/tests/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_for_dict;
 CREATE DATABASE db_for_dict;
 
diff --git a/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql b/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
index 3b6d9310042..65a03993295 100644
--- a/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
+++ b/tests/queries/0_stateless/01113_local_dictionary_type_conversion.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01114_database_atomic.sh b/tests/queries/0_stateless/01114_database_atomic.sh
index 55288e1e3f6..4d77a53cf6a 100755
--- a/tests/queries/0_stateless/01114_database_atomic.sh
+++ b/tests/queries/0_stateless/01114_database_atomic.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql b/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
index af88c5af53a..896cb0ca36d 100644
--- a/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
+++ b/tests/queries/0_stateless/01114_mysql_database_engine_segfault.sql
@@ -1 +1,4 @@
+-- Tags: no-unbundled, no-parallel, no-fasttest
+
+DROP DATABASE IF EXISTS conv_main;
 CREATE DATABASE conv_main ENGINE = MySQL('127.0.0.1:3456', conv_main, 'metrika', 'password'); -- { serverError 501 }
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.reference b/tests/queries/0_stateless/01115_join_with_dictionary.reference
index 77f7ba193c0..326f0c5e14b 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.reference
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.reference
@@ -16,6 +16,12 @@ flat: any left
 2	2	2	2
 3	3	3	3
 4	0		0
+flat: any left + any_join_distinct_right_table_keys
+0	0	0	0
+1	1	1	1
+2	2	2	2
+3	3	3	3
+4	0		0
 flat: semi left
 0	0	0	0
 1	1	1	1
@@ -31,6 +37,11 @@ flat: inner on
 1	1	1	1	1
 2	2	2	2	2
 3	3	3	3	3
+flat: inner or
+0	0	0	0	0
+1000	1	1	1	1
+2	2	2	2	2
+3000	3	3	3	3
 hashed: left on
 0	0	0	0	0
 1	1	1	1	1
diff --git a/tests/queries/0_stateless/01115_join_with_dictionary.sql b/tests/queries/0_stateless/01115_join_with_dictionary.sql
index d2c42bb6f75..5fbfe283fea 100644
--- a/tests/queries/0_stateless/01115_join_with_dictionary.sql
+++ b/tests/queries/0_stateless/01115_join_with_dictionary.sql
@@ -1,10 +1,5 @@
 SET send_logs_level = 'fatal';
 
-DROP DATABASE IF EXISTS db_01115;
-CREATE DATABASE db_01115;
-
-USE db_01115;
-
 DROP DICTIONARY IF EXISTS dict_flat;
 DROP DICTIONARY IF EXISTS dict_hashed;
 DROP DICTIONARY IF EXISTS dict_complex_cache;
@@ -14,19 +9,19 @@ INSERT INTO t1 SELECT number, number, toString(number), number from numbers(4);
 
 CREATE DICTIONARY dict_flat (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' PASSWORD '' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(FLAT());
 
-CREATE DICTIONARY db_01115.dict_hashed (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
+CREATE DICTIONARY dict_hashed (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(HASHED());
 
 CREATE DICTIONARY dict_complex_cache (key UInt64 DEFAULT 0, a UInt8 DEFAULT 42, b String DEFAULT 'x', c Float64 DEFAULT 42.0)
 PRIMARY KEY key, b
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 't1' DB 'db_01115'))
+SOURCE(CLICKHOUSE(TABLE 't1'))
 LIFETIME(MIN 1 MAX 10)
 LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 1));
 
@@ -38,6 +33,8 @@ SELECT 'flat: left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 LEFT JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: any left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key;
+SELECT 'flat: any left + any_join_distinct_right_table_keys'; -- falls back to regular join
+SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat d USING(key) ORDER BY key SETTINGS any_join_distinct_right_table_keys = '1';
 SELECT 'flat: semi left';
 SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 SEMI JOIN dict_flat d USING(key) ORDER BY key;
 SELECT 'flat: anti left';
@@ -46,6 +43,8 @@ SELECT 'flat: inner';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 JOIN dict_flat d USING(key);
 SELECT 'flat: inner on';
 SELECT * FROM (SELECT number AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key ORDER BY k;
+SELECT 'flat: inner or'; -- it's not a join over dictionary, because it doen't suppoert multiple keys, but of falls back to regular join
+SELECT * FROM (SELECT if(number % 2 = 0, number, number * 1000) AS k FROM numbers(100)) s1 JOIN dict_flat d ON k = key OR k == 1000 * key ORDER BY key;
 
 SET join_use_nulls = 1;
 
@@ -102,10 +101,8 @@ SELECT * FROM (SELECT number AS key FROM numbers(5)) s1 ANY LEFT JOIN dict_flat
 SELECT '-';
 SELECT * FROM (SELECT number AS key FROM numbers(2)) s1 RIGHT JOIN dict_flat d ON s1.key = d.key ORDER BY d.key;
 
-
 DROP DICTIONARY dict_flat;
 DROP DICTIONARY dict_hashed;
 DROP DICTIONARY dict_complex_cache;
 
 DROP TABLE t1;
-DROP DATABASE IF EXISTS db_01115;
diff --git a/tests/queries/0_stateless/01120_join_constants.reference b/tests/queries/0_stateless/01120_join_constants.reference
index a16427fbdf7..91838e7a2bb 100644
--- a/tests/queries/0_stateless/01120_join_constants.reference
+++ b/tests/queries/0_stateless/01120_join_constants.reference
@@ -1,2 +1,4 @@
 1	hello	1	world	world	1
 2	hello	0		world	1
+1	321	1	123	123	1
+2	321	0	0	123	1
diff --git a/tests/queries/0_stateless/01120_join_constants.sql b/tests/queries/0_stateless/01120_join_constants.sql
index 443559c3ea1..d6d6a1be43b 100644
--- a/tests/queries/0_stateless/01120_join_constants.sql
+++ b/tests/queries/0_stateless/01120_join_constants.sql
@@ -15,3 +15,21 @@ LEFT JOIN
         arrayJoin([1, 3]) AS k,
         'world'
 ) AS t2 ON t1.k = t2.k;
+
+SELECT
+    t1.*,
+    t2.*,
+    123,
+    isConstant('world')
+FROM
+(
+    SELECT
+        arrayJoin([1, 2]) AS k,
+        321
+) AS t1
+LEFT JOIN
+(
+    SELECT
+        arrayJoin([1, 3]) AS k,
+        123
+) AS t2 ON t1.k = t2.k;
diff --git a/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql b/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
index 471fd7959a9..a324d278c12 100644
--- a/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
+++ b/tests/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql b/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
index 59edd0c37b8..eb5ea091ca3 100644
--- a/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
+++ b/tests/queries/0_stateless/01127_month_partitioning_consistency_select.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS mt;
 CREATE TABLE mt (d Date, x String) ENGINE = MergeTree(d, x, 8192);
 INSERT INTO mt VALUES ('2106-02-07', 'Hello'), ('1970-01-01', 'World');
diff --git a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
index c07d65f114c..aa6f281e0eb 100644
--- a/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
+++ b/tests/queries/0_stateless/01130_in_memory_parts_partitons.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t2(id UInt32, a UInt64, s String)
diff --git a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference
index cf69f1c5896..30cdc08e87d 100644
--- a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference
+++ b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.reference
@@ -1,2 +1,2 @@
 4
-CREATE TABLE default.default_table\n(\n    `id` UInt64,\n    `enum_column` Enum8(\'undefined\' = 0, \'fox\' = 1, \'index\' = 2) DEFAULT \'fox\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01135/default_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.default_table\n(\n    `id` UInt64,\n    `enum_column` Enum8(\'undefined\' = 0, \'fox\' = 1, \'index\' = 2) DEFAULT \'fox\'\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01135/default_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
index 982c72eb333..c370726c72f 100644
--- a/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
+++ b/tests/queries/0_stateless/01135_default_and_alter_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS default_table;
 
 CREATE TABLE default_table
@@ -5,7 +7,7 @@ CREATE TABLE default_table
   id UInt64,
   enum_column Enum8('undefined' = 0, 'fox' = 1, 'index' = 2)
 )
-ENGINE ReplicatedMergeTree('/clickhouse/test_01135/default_table', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/{database}/test_01135/default_table', '1')
 ORDER BY tuple();
 
 INSERT INTO default_table VALUES(1, 'index'), (2, 'fox');
diff --git a/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql b/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
index 67492e7c683..b2f9092150c 100644
--- a/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
+++ b/tests/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS foo_local;
 DROP TABLE IF EXISTS foo_distributed;
 
diff --git a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
index c6bdcb773b2..01efbb7c64b 100644
--- a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
+++ b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
@@ -13,6 +13,8 @@
 0		\N	Nullable(String)
 1	l	\N	Nullable(String)
 -
+0	
+-
 1	l	\N	Nullable(String)
 2	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
@@ -27,3 +29,6 @@
 \N	\N	\N	Nullable(String)
 1	l	\N	Nullable(String)
 \N	\N	\N	Nullable(String)
+-
+\N	\N
+-
diff --git a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
index edaf2870e89..38b72837174 100644
--- a/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
+++ b/tests/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
@@ -27,6 +27,10 @@ SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r U
 
 SELECT '-';
 
+SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc);
+
+SELECT '-';
+
 SET join_use_nulls = 1;
 
 SELECT x, lc, r.lc, toTypeName(r.lc) FROM t AS l LEFT JOIN nr AS r USING (x) ORDER BY x;
@@ -45,6 +49,11 @@ SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l LEFT JOIN nr AS r U
 SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l RIGHT JOIN nr AS r USING (lc) ORDER BY x;
 SELECT x, lc, materialize(r.lc) y, toTypeName(y) FROM t AS l FULL JOIN nr AS r USING (lc) ORDER BY x;
 
+SELECT '-';
+
+SELECT x, lc FROM t AS l RIGHT JOIN nr AS r USING (lc);
+
+SELECT '-';
 
 DROP TABLE t;
 DROP TABLE nr;
diff --git a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
index e13b25d1706..2fef16c4b0a 100644
--- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-replicated-database, no-parallel
+
 DROP TABLE IF EXISTS rmt;
 
 CREATE TABLE rmt (n UInt64, s String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01148/{shard}/{database}/{table}', '{replica}') ORDER BY n;
diff --git a/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql b/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
index ca8f70b3cf4..687c8051eed 100644
--- a/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
+++ b/tests/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 set send_logs_level='error';
 drop table if exists mt;
 drop table if exists rmt sync;
diff --git a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
index 6355f790e23..50e6f91b49b 100755
--- a/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
+++ b/tests/queries/0_stateless/01150_ddl_guard_rwr.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -14,20 +15,20 @@ $CLICKHOUSE_CLIENT --query "CREATE TABLE test_01150.t2 (x UInt64, s Array(Nullab
 
 function thread_detach_attach {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (219)'
+        $CLICKHOUSE_CLIENT --query "DETACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 219' -e '(query: '
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (82)'
+        $CLICKHOUSE_CLIENT --query "ATTACH DATABASE test_01150" 2>&1 | grep -v -F -e 'Received exception from server' -e 'Code: 82' -e '(query: '
         sleep 0.0$RANDOM
     done
 }
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t1 TO test_01150.t2_tmp, test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2 TO test_01150.t1, test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (81|60|57|521)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE test_01150.t2_tmp TO test_01150.t2" 2>&1 | grep -v -F -e 'Received exception from server' -e '(query: ' | grep -v -P 'Code: (81|60|57|521)'
         sleep 0.0$RANDOM
     done
 }
@@ -42,4 +43,4 @@ sleep 1
 
 $CLICKHOUSE_CLIENT --query "DETACH DATABASE IF EXISTS test_01150"
 $CLICKHOUSE_CLIENT --query "ATTACH DATABASE IF NOT EXISTS test_01150"
-$CLICKHOUSE_CLIENT --query "DROP DATABASE test_01150";
+$CLICKHOUSE_CLIENT --query "DROP DATABASE test_01150"
diff --git a/tests/queries/0_stateless/01152_cross_replication.sql b/tests/queries/0_stateless/01152_cross_replication.sql
index 23507c41fd0..60b2c34be07 100644
--- a/tests/queries/0_stateless/01152_cross_replication.sql
+++ b/tests/queries/0_stateless/01152_cross_replication.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, no-parallel
+
 DROP DATABASE IF EXISTS shard_0;
 DROP DATABASE IF EXISTS shard_1;
 SET distributed_ddl_output_mode='none';
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.sql b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
index 86d768d94a7..4f043e11221 100644
--- a/tests/queries/0_stateless/01153_attach_mv_uuid.sql
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.sql
@@ -1,3 +1,5 @@
+-- Tags: no-ordinary-database, no-parallel
+
 DROP TABLE IF EXISTS src;
 DROP TABLE IF EXISTS mv;
 DROP TABLE IF EXISTS ".inner_id.e15f3ab5-6cae-4df3-b879-f40deafd82c2";
diff --git a/tests/queries/0_stateless/01154_move_partition_long.reference b/tests/queries/0_stateless/01154_move_partition_long.reference
index c6d9204ed02..37f0181524e 100644
--- a/tests/queries/0_stateless/01154_move_partition_long.reference
+++ b/tests/queries/0_stateless/01154_move_partition_long.reference
@@ -1 +1,3 @@
-Replication did not hang
+Replication did not hang: synced all replicas of dst_
+Consistency: 1
+Replication did not hang: synced all replicas of src_
diff --git a/tests/queries/0_stateless/01154_move_partition_long.sh b/tests/queries/0_stateless/01154_move_partition_long.sh
index 1b5985b9942..46cbaea5d44 100755
--- a/tests/queries/0_stateless/01154_move_partition_long.sh
+++ b/tests/queries/0_stateless/01154_move_partition_long.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 declare -A engines
 engines[0]="MergeTree"
@@ -116,13 +119,8 @@ timeout $TIMEOUT bash -c optimize_thread &
 timeout $TIMEOUT bash -c drop_part_thread &
 wait
 
-for ((i=0; i<16; i++)) do
-    # The size of log is big, so increase timeout.
-    $CLICKHOUSE_CLIENT --receive_timeout 600 -q "SYSTEM SYNC REPLICA dst_$i" &
-    $CLICKHOUSE_CLIENT --receive_timeout 600 -q "SYSTEM SYNC REPLICA src_$i" 2>/dev/null &
-done
-wait
-echo "Replication did not hang"
+check_replication_consistency "dst_" "count(), sum(p), sum(k), sum(v)"
+try_sync_replicas "src_"
 
 for ((i=0; i<16; i++)) do
     $CLICKHOUSE_CLIENT -q "DROP TABLE dst_$i" 2>&1| grep -Fv "is already started to be removing" &
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
index 882be2702d8..3a67707bdc2 100644
--- a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01155_ordinary;
 DROP DATABASE IF EXISTS test_01155_atomic;
 
diff --git a/tests/queries/0_stateless/01157_replace_table.reference b/tests/queries/0_stateless/01157_replace_table.reference
new file mode 100644
index 00000000000..9fddaf99847
--- /dev/null
+++ b/tests/queries/0_stateless/01157_replace_table.reference
@@ -0,0 +1,20 @@
+test flush on replace
+1	s1
+2	s2
+3	s3
+exception on create and fill
+0
+1	1	s1
+2	2	s2
+3	3	s3
+1	1	s1
+2	2	s2
+3	3	s3
+1	1	s1
+2	2	s2
+3	3	s3
+4	4	s4
+buf
+dist
+join
+t
diff --git a/tests/queries/0_stateless/01157_replace_table.sql b/tests/queries/0_stateless/01157_replace_table.sql
new file mode 100644
index 00000000000..20cae67d8e7
--- /dev/null
+++ b/tests/queries/0_stateless/01157_replace_table.sql
@@ -0,0 +1,53 @@
+-- Tags: no-ordinary-database
+
+drop table if exists t;
+drop table if exists dist;
+drop table if exists buf;
+drop table if exists join;
+
+select 'test flush on replace';
+create table t (n UInt64, s String default 's' || toString(n)) engine=Memory;
+create table dist (n int) engine=Distributed(test_shard_localhost, currentDatabase(), t);
+create table buf (n int) engine=Buffer(currentDatabase(), dist, 1, 10, 100, 10, 100, 1000, 1000);
+
+system stop distributed sends dist;
+insert into buf values (1);
+replace table buf (n int) engine=Distributed(test_shard_localhost, currentDatabase(), dist);
+replace table dist (n int) engine=Buffer(currentDatabase(), t, 1, 10, 100, 10, 100, 1000, 1000);
+
+system stop distributed sends buf;
+insert into buf values (2);
+replace table buf (n int) engine=Buffer(currentDatabase(), dist, 1, 10, 100, 10, 100, 1000, 1000);
+replace table dist (n int) engine=Distributed(test_shard_localhost, currentDatabase(), t);
+
+system stop distributed sends dist;
+insert into buf values (3);
+replace table buf (n int) engine=Null;
+replace table dist (n int) engine=Null;
+
+select * from t order by n;
+
+select 'exception on create and fill';
+-- table is not created if select fails
+create or replace table join engine=Join(ANY, INNER, n) as select * from t where throwIf(n); -- { serverError 395 }
+select count() from system.tables where database=currentDatabase() and name='join';
+
+-- table is created and filled
+create or replace table join engine=Join(ANY, INNER, n) as select * from t;
+select * from numbers(10) as t any join join on t.number=join.n order by n;
+
+-- table is not replaced if select fails
+insert into t(n) values (4);
+replace table join engine=Join(ANY, INNER, n) as select * from t where throwIf(n); -- { serverError 395 }
+select * from numbers(10) as t any join join on t.number=join.n order by n;
+
+-- table is replaced
+replace table join engine=Join(ANY, INNER, n) as select * from t;
+select * from numbers(10) as t any join join on t.number=join.n order by n;
+
+select name from system.tables where database=currentDatabase() order by name;
+
+drop table t;
+drop table dist;
+drop table buf;
+drop table join;
diff --git a/tests/queries/0_stateless/01158_zookeeper_log.reference b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
similarity index 87%
rename from tests/queries/0_stateless/01158_zookeeper_log.reference
rename to tests/queries/0_stateless/01158_zookeeper_log_long.reference
index 35a30ee04e3..44451d82783 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log.reference
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
@@ -1,9 +1,9 @@
 log
-Response	0	Watch	/test/01158/default/rmt/log	0	0	\N	0	0	ZOK	CHILD	CONNECTED		0	0	0	0
-Request	0	Create	/test/01158/default/rmt/log	0	0	\N	0	4	\N	\N	\N		0	0	0	0
-Response	0	Create	/test/01158/default/rmt/log	0	0	\N	0	4	ZOK	\N	\N	/test/01158/default/rmt/log	0	0	0	0
-Request	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	\N	\N	\N		0	0	0	0
-Response	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	ZOK	\N	\N	/test/01158/default/rmt/log/log-0000000000	0	0	0	0
+::1	Response	0	Watch	/test/01158/default/rmt/log	0	0	\N	0	0	ZOK	CHILD	CONNECTED		0	0	0	0
+::1	Request	0	Create	/test/01158/default/rmt/log	0	0	\N	0	4	\N	\N	\N		0	0	0	0
+::1	Response	0	Create	/test/01158/default/rmt/log	0	0	\N	0	4	ZOK	\N	\N	/test/01158/default/rmt/log	0	0	0	0
+::1	Request	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	\N	\N	\N		0	0	0	0
+::1	Response	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	ZOK	\N	\N	/test/01158/default/rmt/log/log-0000000000	0	0	0	0
 parts
 Request	0	Multi		0	0	\N	5	0	\N	\N	\N		0	0	0	0
 Request	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	\N	\N	\N		0	0	0	0
diff --git a/tests/queries/0_stateless/01158_zookeeper_log.sql b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
similarity index 75%
rename from tests/queries/0_stateless/01158_zookeeper_log.sql
rename to tests/queries/0_stateless/01158_zookeeper_log_long.sql
index f3f1980b5a2..61a36df68d8 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log.sql
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
@@ -1,12 +1,17 @@
+-- Tags: long, zookeeper, no-replicated-database, no-polymorphic-parts
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 drop table if exists rmt;
-create table rmt (n int) engine=ReplicatedMergeTree('/test/01158/{database}/rmt', '1') order by n;
+-- cleanup code will perform extra Exists
+-- (so the .reference will not match)
+create table rmt (n int) engine=ReplicatedMergeTree('/test/01158/{database}/rmt', '1') order by n settings cleanup_delay_period=86400, replicated_can_become_leader=0;
 system sync replica rmt;
 insert into rmt values (1);
 insert into rmt values (1);
 system flush logs;
 
 select 'log';
-select type, has_watch, op_num, path, is_ephemeral, is_sequential, version, requests_size, request_idx, error, watch_type,
+select address, type, has_watch, op_num, path, is_ephemeral, is_sequential, version, requests_size, request_idx, error, watch_type,
        watch_state, path_created, stat_version, stat_cversion, stat_dataLength, stat_numChildren
 from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt/log%' and op_num not in (3, 4, 12)
 order by xid, type, request_idx;
diff --git a/tests/queries/0_stateless/01160_table_dependencies.reference b/tests/queries/0_stateless/01160_table_dependencies.reference
new file mode 100644
index 00000000000..a893d4882df
--- /dev/null
+++ b/tests/queries/0_stateless/01160_table_dependencies.reference
@@ -0,0 +1,7 @@
+dict1
+dict2
+dict_src
+join
+mv
+s
+t
diff --git a/tests/queries/0_stateless/01160_table_dependencies.sh b/tests/queries/0_stateless/01160_table_dependencies.sh
new file mode 100755
index 00000000000..05d086ae1a4
--- /dev/null
+++ b/tests/queries/0_stateless/01160_table_dependencies.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT -q "drop table if exists dict_src;"
+$CLICKHOUSE_CLIENT -q "drop dictionary if exists dict1;"
+$CLICKHOUSE_CLIENT -q "drop dictionary if exists dict2;"
+$CLICKHOUSE_CLIENT -q "drop table if exists join;"
+$CLICKHOUSE_CLIENT -q "drop table if exists t;"
+
+$CLICKHOUSE_CLIENT -q "create table dict_src (n int, m int, s String) engine=MergeTree order by n;"
+
+$CLICKHOUSE_CLIENT -q "create dictionary dict1 (n int default 0, m int default 1, s String default 'qqq')
+PRIMARY KEY n
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'dict_src' PASSWORD '' DB '$CLICKHOUSE_DATABASE'))
+LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());"
+
+$CLICKHOUSE_CLIENT -q "create table join(n int, m int default dictGet('$CLICKHOUSE_DATABASE.dict1', 'm', 42::UInt64)) engine=Join(any, left, n);"
+
+$CLICKHOUSE_CLIENT -q "create dictionary dict2 (n int default 0, m int DEFAULT 2, s String default 'asd')
+PRIMARY KEY n
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'join' PASSWORD '' DB '$CLICKHOUSE_DATABASE'))
+LIFETIME(MIN 1 MAX 10) LAYOUT(FLAT());"
+
+$CLICKHOUSE_CLIENT -q "create table s (x default joinGet($CLICKHOUSE_DATABASE.join, 'm', 42::int)) engine=Set"
+
+$CLICKHOUSE_CLIENT -q "create table t (n int, m int default joinGet($CLICKHOUSE_DATABASE.join, 'm', 42::int),
+s String default dictGet($CLICKHOUSE_DATABASE.dict1, 's', 42::UInt64), x default in(1, $CLICKHOUSE_DATABASE.s)) engine=MergeTree order by n;"
+
+$CLICKHOUSE_CLIENT -q "create materialized view mv to s as select n from t where n in (select n from join)"
+
+CLICKHOUSE_CLIENT_DEFAULT_DB=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--database=${CLICKHOUSE_DATABASE}"'/--database=default/g')
+
+for _ in {1..10}; do
+  $CLICKHOUSE_CLIENT_DEFAULT_DB -q "detach database $CLICKHOUSE_DATABASE;"
+  $CLICKHOUSE_CLIENT_DEFAULT_DB -q "attach database $CLICKHOUSE_DATABASE;"
+done
+$CLICKHOUSE_CLIENT -q "show tables from $CLICKHOUSE_DATABASE;"
+
+$CLICKHOUSE_CLIENT -q "drop table dict_src;"
+$CLICKHOUSE_CLIENT -q "drop dictionary dict1;"
+$CLICKHOUSE_CLIENT -q "drop dictionary dict2;"
+$CLICKHOUSE_CLIENT -q "drop table join;"
+$CLICKHOUSE_CLIENT -q "drop table t;"
diff --git a/tests/queries/0_stateless/01161_all_system_tables.reference b/tests/queries/0_stateless/01161_all_system_tables.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01161_all_system_tables.sh b/tests/queries/0_stateless/01161_all_system_tables.sh
new file mode 100755
index 00000000000..9b19cc97d16
--- /dev/null
+++ b/tests/queries/0_stateless/01161_all_system_tables.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+THREADS=8
+RAND=$(($RANDOM))
+LIMIT=10000
+
+function run_selects()
+{
+    thread_num=$1
+    readarray -t tables_arr < <(${CLICKHOUSE_CLIENT} -q "SELECT database || '.' || name FROM system.tables
+    WHERE database in ('system', 'information_schema', 'INFORMATION_SCHEMA') and name!='zookeeper'
+    AND sipHash64(name || toString($RAND)) % $THREADS = $thread_num")
+
+    for t in "${tables_arr[@]}"
+    do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM $t LIMIT $LIMIT FORMAT Null" # Suppress style check: database=$CLICKHOUSE_DATABASEs
+    done
+}
+
+for ((i=0; i<THREADS; i++)) do
+    run_selects "$i" &
+done
+wait
diff --git a/tests/queries/0_stateless/01161_information_schema.reference b/tests/queries/0_stateless/01161_information_schema.reference
new file mode 100644
index 00000000000..3be800888c7
--- /dev/null
+++ b/tests/queries/0_stateless/01161_information_schema.reference
@@ -0,0 +1,27 @@
+columns
+schemata
+tables
+views
+COLUMNS
+SCHEMATA
+TABLES
+VIEWS
+INFORMATION_SCHEMA	INFORMATION_SCHEMA	default	\N	\N	\N	\N
+information_schema	information_schema	default	\N	\N	\N	\N
+default	default	mv	VIEW
+default	default	t	FOREIGN TABLE
+default	default	v	VIEW
+		tmp	LOCAL TEMPORARY
+default	default	mv	SELECT * FROM system.one	NONE	NO	YES	NO	NO	NO
+default	default	v	SELECT n, f FROM default.t	NONE	NO	NO	NO	NO	NO
+default	default	mv	dummy	1		0	UInt8	\N	\N	8	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt8
+default	default	t	n	1		0	UInt64	\N	\N	64	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		UInt64
+default	default	t	f	2		0	Float32	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Float32
+default	default	t	s	3		0	String	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		String
+default	default	t	fs	4		0	FixedString(42)	42	42	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		FixedString(42)
+default	default	t	d	5		0	Decimal(9, 6)	\N	\N	9	10	6	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Decimal(9, 6)
+default	default	v	n	1		1	Nullable(Int32)	\N	\N	32	2	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Nullable(Int32)
+default	default	v	f	2		0	Float64	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N		Float64
+		tmp	d	1		0	Date	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N		Date
+		tmp	dt	2		0	DateTime	\N	\N	\N	\N	\N	0	\N	\N	\N	\N	\N	\N	\N	\N	\N		DateTime
+		tmp	dtms	3		0	DateTime64(3)	\N	\N	\N	\N	\N	3	\N	\N	\N	\N	\N	\N	\N	\N	\N		DateTime64(3)
diff --git a/tests/queries/0_stateless/01161_information_schema.sql b/tests/queries/0_stateless/01161_information_schema.sql
new file mode 100644
index 00000000000..b6b10efb001
--- /dev/null
+++ b/tests/queries/0_stateless/01161_information_schema.sql
@@ -0,0 +1,19 @@
+show tables from information_schema;
+SHOW TABLES FROM INFORMATION_SCHEMA;
+
+create table t (n UInt64, f Float32, s String, fs FixedString(42), d Decimal(9, 6)) engine=Memory;
+create view v (n Nullable(Int32), f Float64) as select n, f from t;
+create materialized view mv engine=Null as select * from system.one;
+create temporary table tmp (d Date, dt DateTime, dtms DateTime64(3));
+
+-- FIXME #28687
+select * from information_schema.schemata where schema_name ilike 'information_schema';
+-- SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
+SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE (table_schema=currentDatabase() OR table_schema='') AND table_name NOT LIKE '%inner%';
+select * from information_schema.views where table_schema=currentDatabase();
+-- SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE (TABLE_SCHEMA=currentDatabase() OR TABLE_SCHEMA='') AND TABLE_NAME NOT LIKE '%inner%';
+SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE (table_schema=currentDatabase() OR table_schema='') AND table_name NOT LIKE '%inner%';
+
+drop table t;
+drop view v;
+drop view mv;
diff --git a/tests/queries/0_stateless/01162_strange_mutations.reference b/tests/queries/0_stateless/01162_strange_mutations.reference
new file mode 100644
index 00000000000..55f17cfe464
--- /dev/null
+++ b/tests/queries/0_stateless/01162_strange_mutations.reference
@@ -0,0 +1,28 @@
+MergeTree
+1
+2
+2
+0
+50	6225	0
+50	6225	1900
+ReplicatedMergeTree
+1
+2
+2
+0
+50	6225	0
+50	6225	1900
+Memory
+1
+2
+2
+0
+50	6225	0
+50	6225	1900
+Join
+1
+2
+2
+0
+50	6225	0
+50	6225	0
diff --git a/tests/queries/0_stateless/01162_strange_mutations.sh b/tests/queries/0_stateless/01162_strange_mutations.sh
new file mode 100755
index 00000000000..fecb1b8d8c0
--- /dev/null
+++ b/tests/queries/0_stateless/01162_strange_mutations.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+declare -a engines=("MergeTree order by n" "ReplicatedMergeTree('/test/01162/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '1') order by n" "Memory" "Join(ALL, FULL, n)")
+
+$CLICKHOUSE_CLIENT -q "CREATE OR REPLACE VIEW t1 AS SELECT number * 10 AS id, number * 100 AS value FROM numbers(20)"
+
+for engine in "${engines[@]}"
+do
+    $CLICKHOUSE_CLIENT -q "drop table if exists t"
+    $CLICKHOUSE_CLIENT -q "create table t (n int) engine=$engine"
+    $CLICKHOUSE_CLIENT -q "select engine from system.tables where database=currentDatabase() and name='t'"
+    $CLICKHOUSE_CLIENT -q "insert into t values (1)"
+    $CLICKHOUSE_CLIENT -q "insert into t values (2)"
+    $CLICKHOUSE_CLIENT -q "select * from t order by n"
+    $CLICKHOUSE_CLIENT --allow_nondeterministic_mutations=1 --mutations_sync=1 -q "alter table t
+    delete where n global in (select * from (select * from t where n global in (1::Int32)))"
+    $CLICKHOUSE_CLIENT -q "select * from t order by n"
+    $CLICKHOUSE_CLIENT --allow_nondeterministic_mutations=1 --mutations_sync=1 -q "alter table t
+    delete where n global in (select t1.n from t as t1 full join t as t2 on t1.n=t2.n where t1.n global in (select 2::Int32))"
+    $CLICKHOUSE_CLIENT -q "select count() from t"
+    $CLICKHOUSE_CLIENT -q "drop table t"
+
+    $CLICKHOUSE_CLIENT -q "drop table if exists test"
+    $CLICKHOUSE_CLIENT -q "CREATE TABLE test ENGINE=$engine AS SELECT number + 100 AS n, 0 AS test FROM numbers(50)"
+    $CLICKHOUSE_CLIENT -q "select count(), sum(n), sum(test) from test"
+    if [[ $engine == *"ReplicatedMergeTree"* ]]; then
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE test
+            UPDATE test = (SELECT groupArray(id) FROM t1 GROUP BY 1)[n - 99] WHERE 1" 2>&1| grep -Fa "DB::Exception: " | grep -Fv "statement with subquery may be nondeterministic"
+        $CLICKHOUSE_CLIENT --allow_nondeterministic_mutations=1 --mutations_sync=1 -q "ALTER TABLE test
+                    UPDATE test = (SELECT groupArray(id) FROM t1 GROUP BY 1)[n - 99] WHERE 1"
+    elif [[ $engine == *"Join"* ]]; then
+        $CLICKHOUSE_CLIENT -q "ALTER TABLE test
+            UPDATE test = (SELECT groupArray(id) FROM t1 GROUP BY 1)[n - 99] WHERE 1" 2>&1| grep -Fa "DB::Exception: " | grep -Fv "Table engine Join supports only DELETE mutations"
+    else
+        $CLICKHOUSE_CLIENT --mutations_sync=1 -q "ALTER TABLE test
+            UPDATE test = (SELECT groupArray(id) FROM t1 GROUP BY 1)[n - 99] WHERE 1"
+    fi
+    $CLICKHOUSE_CLIENT -q "select count(), sum(n), sum(test) from test"
+    $CLICKHOUSE_CLIENT -q "drop table test"
+done
diff --git a/tests/queries/0_stateless/01163_search_case_insensetive_utf8.reference b/tests/queries/0_stateless/01163_search_case_insensetive_utf8.reference
new file mode 100644
index 00000000000..66f4ca4a5a8
--- /dev/null
+++ b/tests/queries/0_stateless/01163_search_case_insensetive_utf8.reference
@@ -0,0 +1,12 @@
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/01163_search_case_insensetive_utf8.sql b/tests/queries/0_stateless/01163_search_case_insensetive_utf8.sql
new file mode 100644
index 00000000000..99bdd38ceae
--- /dev/null
+++ b/tests/queries/0_stateless/01163_search_case_insensetive_utf8.sql
@@ -0,0 +1,12 @@
+SELECT positionCaseInsensitiveUTF8(materialize('сссссс'), 'Ё');
+SELECT countSubstringsCaseInsensitiveUTF8(materialize('сссссс'), 'ё');
+SELECT positionCaseInsensitiveUTF8(materialize('сссссссс'), 'ё');
+SELECT countSubstringsCaseInsensitiveUTF8(materialize('сссссссс'), 'Ё');
+SELECT countSubstringsCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ёёёёёёё');
+SELECT positionCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ёЁёЁёЁё');
+SELECT countSubstringsCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ёЁёЁёЁёЁёЁ');
+SELECT positionCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ЁЁЁЁЁЁЁЁЁЁ');
+SELECT countSubstringsCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ёЁёЁёЁёссс');
+SELECT positionCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ёЁёЁёЁёссс');
+SELECT countSubstringsCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ЁС');
+SELECT positionCaseInsensitiveUTF8(materialize('ссссссссссссссссссс'), 'ёс');
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
index 29f6f801044..bedf9e9a091 100644
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -1,19 +1,24 @@
 none
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)
+(query: create table none on cluster test_shard_localhost (n int) engine=Memory;)
 Received exception from server:
 Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+(query: drop table if exists none on cluster test_unavailable_shard;)
 throw
 localhost	9000	0		0	0
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)
+(query: create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 Received exception from server:
 Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently active), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+(query: drop table if exists throw on cluster test_unavailable_shard;)
 null_status_on_timeout
 localhost	9000	0		0	0
 Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)
+(query: create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
 never_throw
@@ -21,3 +26,20 @@ localhost	9000	0		0	0
 localhost	9000	57	Code: 57. Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	0	0
 localhost	9000	0		1	0
 localhost	1	\N	\N	1	0
+distributed_ddl_queue
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.none ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.none ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.null_status ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.null_status already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.null_status ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	0		1	1
+2	localhost	9000	test_shard_localhost	CREATE TABLE default.never_throw ON CLUSTER test_shard_localhost (`n` int) ENGINE = Memory	1	localhost	9000	Finished	57	Code: 57. DB::Error: Table default.never_throw already exists. (TABLE_ALREADY_EXISTS)	1	1
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	1	Inactive	\N	\N	\N	\N
+2	localhost	9000	test_unavailable_shard	DROP TABLE IF EXISTS default.never_throw ON CLUSTER test_unavailable_shard	1	localhost	9000	Finished	0		1	1
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index 483979d00db..e4a23055ae6 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: long, distributed, no-msan, no-replicated-database
+# Tag no-msan: issue 21600
+# Tag no-replicated-database: ON CLUSTER is not allowed
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -6,6 +9,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+TMP_OUT=$(mktemp "$CURDIR/01175_distributed_ddl_output_mode_long.XXXXXX")
+trap 'rm -f ${TMP_OUT:?}' EXIT
+
+TIMEOUT=300
+MIN_TIMEOUT=1
 
 # We execute a distributed DDL query with timeout 1 to check that one host is unavailable and will time out and other complete successfully.
 # But sometimes one second is not enough even for healthy host to succeed. Repeat the test in this case.
@@ -14,55 +22,72 @@ function run_until_out_contains()
     PATTERN=$1
     shift
 
-    for _ in {1..20}
+    for ((i=MIN_TIMEOUT; i<10; i++))
     do
-        "$@" > "${CLICKHOUSE_TMP}/out" 2>&1
-        if grep -q "$PATTERN" "${CLICKHOUSE_TMP}/out"
+        "$@" --distributed_ddl_task_timeout="$i" > "$TMP_OUT" 2>&1
+        if grep -q "$PATTERN" "$TMP_OUT"
         then
-            cat "${CLICKHOUSE_TMP}/out"
-            break;
+            cat "$TMP_OUT" | sed "s/distributed_ddl_task_timeout (=$i)/distributed_ddl_task_timeout (=$MIN_TIMEOUT)/g"
+            break
         fi
     done
 }
 
+RAND_COMMENT="01175_DDL_$RANDOM"
+LOG_COMMENT="${CLICKHOUSE_LOG_COMMENT}_$RAND_COMMENT"
+
+CLICKHOUSE_CLIENT_WITH_SETTINGS=${CLICKHOUSE_CLIENT/--log_comment=\'${CLICKHOUSE_LOG_COMMENT}\'/--log_comment=\'${LOG_COMMENT}\'}
+CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --output_format_parallel_formatting=0 "
+CLICKHOUSE_CLIENT_WITH_SETTINGS+=" --distributed_ddl_entry_format_version=2 "
+
+CLIENT=${CLICKHOUSE_CLIENT_WITH_SETTINGS}
+CLIENT+=" --distributed_ddl_task_timeout=$TIMEOUT "
 
 $CLICKHOUSE_CLIENT -q "drop table if exists none;"
 $CLICKHOUSE_CLIENT -q "drop table if exists throw;"
 $CLICKHOUSE_CLIENT -q "drop table if exists null_status;"
 $CLICKHOUSE_CLIENT -q "drop table if exists never_throw;"
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=none -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=none -q "select value from system.settings where name='distributed_ddl_output_mode';"
 # Ok
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;"
 # Table exists
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 # Timeout
 
-run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=none -q "drop table if exists none on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
+run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=none -q "drop table if exists none on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
 
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=throw -q "drop table if exists throw on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
+run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=throw -q "drop table if exists throw on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
 
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=null_status_on_timeout -q "select value from system.settings where name='distributed_ddl_output_mode';"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory;"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "create table null_status on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=null_status_on_timeout -q "drop table if exists null_status on cluster test_unavailable_shard;"
+run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=null_status_on_timeout -q "drop table if exists null_status on cluster test_unavailable_shard;"
 
 
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=never_throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;"
-$CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=600 --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
+$CLIENT --distributed_ddl_output_mode=never_throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
+$CLIENT --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;"
+$CLIENT --distributed_ddl_output_mode=never_throw -q "create table never_throw on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT --output_format_parallel_formatting=0 --distributed_ddl_task_timeout=1 --distributed_ddl_output_mode=never_throw -q "drop table if exists never_throw on cluster test_unavailable_shard;"
+run_until_out_contains '9000	0		' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=never_throw -q "drop table if exists never_throw on cluster test_unavailable_shard;"
 
 
 $CLICKHOUSE_CLIENT -q "drop table if exists none;"
 $CLICKHOUSE_CLIENT -q "drop table if exists throw;"
 $CLICKHOUSE_CLIENT -q "drop table if exists null_status;"
 $CLICKHOUSE_CLIENT -q "drop table if exists never_throw;"
+
+$CLICKHOUSE_CLIENT -q "select 'distributed_ddl_queue'"
+$CLICKHOUSE_CLIENT -q "select entry_version, initiator_host, initiator_port, cluster, replaceRegexpOne(query, 'UUID \'[0-9a-f\-]{36}\' ', ''), abs(query_create_time - now()) < 600,
+    host, port, status, exception_code, replace(replaceRegexpOne(exception_text, ' \(version.*', ''), 'Exception', 'Error'), abs(query_finish_time - query_create_time - query_duration_ms/1000) <= 1 , query_duration_ms < 600000
+    from system.distributed_ddl_queue
+    where arrayExists((key, val) -> key='log_comment' and val like '%$RAND_COMMENT%', mapKeys(settings), mapValues(settings))
+    and arrayExists((key, val) -> key='distributed_ddl_task_timeout' and val in ('$TIMEOUT', '$MIN_TIMEOUT'), mapKeys(settings), mapValues(settings))
+    order by entry, host, port, exception_code"
diff --git a/tests/queries/0_stateless/01176_mysql_client_interactive.expect b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
index 2337b7d01fe..37087dd85f7 100755
--- a/tests/queries/0_stateless/01176_mysql_client_interactive.expect
+++ b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
@@ -1,4 +1,6 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
 
 log_user 0
 set timeout 60
@@ -12,7 +14,7 @@ expect_after {
 
 set basedir [file dirname $argv0]
 spawn bash -c "source $basedir/../shell_config.sh ; \$MYSQL_CLIENT_BINARY \$MYSQL_CLIENT_OPT"
-expect "mysql> "
+expect -nocase -re "mysql.*> "
 
 send -- "USE system;\r"
 expect "Database changed"
@@ -34,6 +36,14 @@ expect "ERROR 395 (00000): Code: 395"
 send -- "select * from system.one format TSV;\r"
 expect "ERROR 1 (00000): Code: 1"
 
+send -- "select * from system.one format JSON;\r"
+expect "ERROR 1 (00000): Code: 1"
+
+send -- "select * from system.one format MySQLWire;\r"
+expect "| dummy |"
+expect "|     0 |"
+expect "1 row in set"
+
 send -- "select count(number), sum(number) from numbers(10);\r"
 expect "+---------------+-------------+"
 expect "| count(number) | sum(number) |"
@@ -41,8 +51,7 @@ expect "+---------------+-------------+"
 expect "|            10 |          45 |"
 expect "+---------------+-------------+"
 expect "1 row in set"
-expect "Read 10 rows, 80.00 B"
-expect "mysql> "
+expect -nocase -re "mysql.*> "
 
 send -- "quit;\r"
 expect eof
diff --git a/tests/queries/0_stateless/01178_int_field_to_decimal.reference b/tests/queries/0_stateless/01178_int_field_to_decimal.reference
index 6c256ba2032..80fd8dfc496 100644
--- a/tests/queries/0_stateless/01178_int_field_to_decimal.reference
+++ b/tests/queries/0_stateless/01178_int_field_to_decimal.reference
@@ -1,2 +1,2 @@
-9.00000000
-10.00000000
+9
+10
diff --git a/tests/queries/0_stateless/01180_client_syntax_errors.expect b/tests/queries/0_stateless/01180_client_syntax_errors.expect
index c20982b2991..e4b108fc9a9 100755
--- a/tests/queries/0_stateless/01180_client_syntax_errors.expect
+++ b/tests/queries/0_stateless/01180_client_syntax_errors.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
index 24283a0e8e3..fbb67a268ae 100644
--- a/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
+++ b/tests/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+
 DROP TABLE IF EXISTS test_repl ON CLUSTER test_shard_localhost SYNC;
 CREATE TABLE test_repl ON CLUSTER test_shard_localhost (n UInt64) ENGINE ReplicatedMergeTree('/clickhouse/test_01181/{database}/test_repl','r1') ORDER BY tuple();
 DETACH TABLE test_repl ON CLUSTER test_shard_localhost SYNC;
diff --git a/tests/queries/0_stateless/01182_materialized_view_different_structure.reference b/tests/queries/0_stateless/01182_materialized_view_different_structure.reference
index a1f113394b2..c0201d4a35f 100644
--- a/tests/queries/0_stateless/01182_materialized_view_different_structure.reference
+++ b/tests/queries/0_stateless/01182_materialized_view_different_structure.reference
@@ -1,4 +1,4 @@
-4999950000.000000
+4999950000
 4999950000
 1000	499500	499500	999	0
 1000	124716	499500	255	0
diff --git a/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
index f3b3431dffe..09a43d13a42 100755
--- a/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
+++ b/tests/queries/0_stateless/01184_long_insert_values_huge_strings.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01185_create_or_replace_table.reference b/tests/queries/0_stateless/01185_create_or_replace_table.reference
index 84df5f0f5b5..be187d9dcd4 100644
--- a/tests/queries/0_stateless/01185_create_or_replace_table.reference
+++ b/tests/queries/0_stateless/01185_create_or_replace_table.reference
@@ -1,8 +1,8 @@
 t1
-CREATE TABLE test_01185.t1\n(\n    `n` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY n\nSETTINGS index_granularity = 8192
+CREATE TABLE default.t1\n(\n    `n` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY n\nSETTINGS index_granularity = 8192
 t1
-CREATE TABLE test_01185.t1\n(\n    `n` UInt64,\n    `s` Nullable(String)\n)\nENGINE = MergeTree\nORDER BY n\nSETTINGS index_granularity = 8192
+CREATE TABLE default.t1\n(\n    `n` UInt64,\n    `s` Nullable(String)\n)\nENGINE = MergeTree\nORDER BY n\nSETTINGS index_granularity = 8192
 2	\N
 t1
-CREATE TABLE test_01185.t1\n(\n    `n` UInt64\n)\nENGINE = MergeTree\nORDER BY n\nSETTINGS index_granularity = 8192
+CREATE TABLE default.t1\n(\n    `n` UInt64\n)\nENGINE = MergeTree\nORDER BY n\nSETTINGS index_granularity = 8192
 3
diff --git a/tests/queries/0_stateless/01185_create_or_replace_table.sql b/tests/queries/0_stateless/01185_create_or_replace_table.sql
index fe408cc7ac6..e8845260726 100644
--- a/tests/queries/0_stateless/01185_create_or_replace_table.sql
+++ b/tests/queries/0_stateless/01185_create_or_replace_table.sql
@@ -1,23 +1,24 @@
-drop database if exists test_01185;
-create database test_01185 engine=Atomic;
+-- Tags: no-ordinary-database, no-parallel
 
-replace table test_01185.t1 (n UInt64, s String) engine=MergeTree order by n; -- { serverError 60 }
-show tables from test_01185;
-create or replace table test_01185.t1 (n UInt64, s String) engine=MergeTree order by n;
-show tables from test_01185;
-show create table test_01185.t1;
+drop table if exists t1;
 
-insert into test_01185.t1 values (1, 'test');
-create or replace table test_01185.t1 (n UInt64, s Nullable(String)) engine=MergeTree order by n;
-insert into test_01185.t1 values (2, null);
-show tables from test_01185;
-show create table test_01185.t1;
-select * from test_01185.t1;
+replace table t1 (n UInt64, s String) engine=MergeTree order by n; -- { serverError 60 }
+show tables;
+create or replace table t1 (n UInt64, s String) engine=MergeTree order by n;
+show tables;
+show create table t1;
 
-replace table test_01185.t1 (n UInt64) engine=MergeTree order by n;
-insert into test_01185.t1 values (3);
-show tables from test_01185;
-show create table test_01185.t1;
-select * from test_01185.t1;
+insert into t1 values (1, 'test');
+create or replace table t1 (n UInt64, s Nullable(String)) engine=MergeTree order by n;
+insert into t1 values (2, null);
+show tables;
+show create table t1;
+select * from t1;
 
-drop database test_01185;
+replace table t1 (n UInt64) engine=MergeTree order by n;
+insert into t1 values (3);
+show tables;
+show create table t1;
+select * from t1;
+
+drop table t1;
diff --git a/tests/queries/0_stateless/01186_conversion_to_nullable.reference b/tests/queries/0_stateless/01186_conversion_to_nullable.reference
index 04146644154..7a690240eb5 100644
--- a/tests/queries/0_stateless/01186_conversion_to_nullable.reference
+++ b/tests/queries/0_stateless/01186_conversion_to_nullable.reference
@@ -24,12 +24,12 @@
 946721532
 \N
 \N
-42.00
+42
 \N
 \N
-42.00000000
+42
 \N
-3.14159000
+3.14159
 42
 \N
 test
diff --git a/tests/queries/0_stateless/01188_attach_table_from_path.sql b/tests/queries/0_stateless/01188_attach_table_from_path.sql
index d72daa78f67..9bf401c8ea4 100644
--- a/tests/queries/0_stateless/01188_attach_table_from_path.sql
+++ b/tests/queries/0_stateless/01188_attach_table_from_path.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel
+
 drop table if exists test;
 drop table if exists file;
 drop table if exists mt;
@@ -5,6 +7,7 @@ drop table if exists mt;
 attach table test from 'some/path' (n UInt8) engine=Memory; -- { serverError 48 }
 attach table test from '/etc/passwd' (s String) engine=File(TSVRaw); -- { serverError 481 }
 attach table test from '../../../../../../../../../etc/passwd' (s String) engine=File(TSVRaw); -- { serverError 481 }
+attach table test from 42 (s String) engine=File(TSVRaw); -- { clientError 62 }
 
 insert into table function file('01188_attach/file/data.TSV', 'TSV', 's String, n UInt8') values ('file', 42);
 attach table file from '01188_attach/file' (s String, n UInt8) engine=File(TSV);
diff --git a/tests/queries/0_stateless/01190_full_attach_syntax.sql b/tests/queries/0_stateless/01190_full_attach_syntax.sql
index eb739782e5f..ed05950ff98 100644
--- a/tests/queries/0_stateless/01190_full_attach_syntax.sql
+++ b/tests/queries/0_stateless/01190_full_attach_syntax.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01190;
 CREATE DATABASE test_01190 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01190;
diff --git a/tests/queries/0_stateless/01191_rename_dictionary.sql b/tests/queries/0_stateless/01191_rename_dictionary.sql
index 264c527ccca..7160f327336 100644
--- a/tests/queries/0_stateless/01191_rename_dictionary.sql
+++ b/tests/queries/0_stateless/01191_rename_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01191;
 CREATE DATABASE test_01191 ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
index 58bdfbf71ad..62165467675 100755
--- a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
+++ b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
index a3154a0784d..d7258151897 100755
--- a/tests/queries/0_stateless/01193_metadata_loading.sh
+++ b/tests/queries/0_stateless/01193_metadata_loading.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01196_max_parser_depth.reference b/tests/queries/0_stateless/01196_max_parser_depth.reference
index a72c1b18aa2..072fc270acd 100644
--- a/tests/queries/0_stateless/01196_max_parser_depth.reference
+++ b/tests/queries/0_stateless/01196_max_parser_depth.reference
@@ -1,3 +1,4 @@
 Code: 306
 Code: 306
 Code: 306
+Code: 306
diff --git a/tests/queries/0_stateless/01198_client_quota_key.sh b/tests/queries/0_stateless/01198_client_quota_key.sh
index d9f062f6589..3f5f5df5071 100755
--- a/tests/queries/0_stateless/01198_client_quota_key.sh
+++ b/tests/queries/0_stateless/01198_client_quota_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01200_mutations_memory_consumption.reference b/tests/queries/0_stateless/01200_mutations_memory_consumption.reference
index 98fb6a68656..1bb9c019697 100644
--- a/tests/queries/0_stateless/01200_mutations_memory_consumption.reference
+++ b/tests/queries/0_stateless/01200_mutations_memory_consumption.reference
@@ -1,4 +1,4 @@
-1
-1
-1
-1
+[[1]]
+[[1]]
+[[1]]
+[[1]]
diff --git a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
index 764117586b9..de9c2df7f08 100644
--- a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
+++ b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug, no-parallel, long
+
 DROP TABLE IF EXISTS table_with_single_pk;
 
 CREATE TABLE table_with_single_pk
@@ -6,7 +8,8 @@ CREATE TABLE table_with_single_pk
   value String
 )
 ENGINE = MergeTree
-ORDER BY key;
+ORDER BY key
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_with_single_pk SELECT number, toString(number % 10) FROM numbers(10000000);
 
@@ -15,9 +18,9 @@ ALTER TABLE table_with_single_pk DELETE WHERE key % 77 = 0 SETTINGS mutations_sy
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
 FROM
     system.part_log
 WHERE event_type = 'MutatePart' AND table = 'table_with_single_pk' AND database = currentDatabase();
@@ -34,7 +37,8 @@ CREATE TABLE table_with_multi_pk
   value String
 )
 ENGINE = MergeTree
-ORDER BY (key1, key2, key3);
+ORDER BY (key1, key2, key3)
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_with_multi_pk SELECT number % 32, number, toDateTime('2019-10-01 00:00:00'), toString(number % 10) FROM numbers(10000000);
 
@@ -43,9 +47,9 @@ ALTER TABLE table_with_multi_pk DELETE WHERE key1 % 77 = 0 SETTINGS mutations_sy
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
   FROM
       system.part_log
  WHERE event_type = 'MutatePart' AND table = 'table_with_multi_pk' AND database = currentDatabase();
@@ -64,7 +68,8 @@ CREATE TABLE table_with_function_pk
     value String
   )
 ENGINE = MergeTree
-ORDER BY (cast(value as UInt64), key2);
+ORDER BY (cast(value as UInt64), key2)
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_with_function_pk SELECT number % 32, number, toDateTime('2019-10-01 00:00:00'), toString(number % 10) FROM numbers(10000000);
 
@@ -73,9 +78,9 @@ ALTER TABLE table_with_function_pk DELETE WHERE key1 % 77 = 0 SETTINGS mutations
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
   FROM
       system.part_log
  WHERE event_type = 'MutatePart' AND table = 'table_with_function_pk' AND database = currentDatabase();
@@ -92,7 +97,8 @@ CREATE TABLE table_without_pk
   value String
 )
 ENGINE = MergeTree
-ORDER BY tuple();
+ORDER BY tuple()
+SETTINGS min_compress_block_size=65536, max_compress_block_size=65536;
 
 INSERT INTO table_without_pk SELECT number % 32, number, toDateTime('2019-10-01 00:00:00'), toString(number % 10) FROM numbers(10000000);
 
@@ -101,9 +107,9 @@ ALTER TABLE table_without_pk DELETE WHERE key1 % 77 = 0 SETTINGS mutations_sync
 SYSTEM FLUSH LOGS;
 
 -- Memory usage for all mutations must be almost constant and less than
--- read_bytes.
+-- read_bytes
 SELECT
-  DISTINCT read_bytes >= peak_memory_usage
+  arrayDistinct(groupArray(if (read_bytes >= peak_memory_usage, [1], [read_bytes, peak_memory_usage])))
   FROM
       system.part_log
  WHERE event_type = 'MutatePart' AND table = 'table_without_pk' AND database = currentDatabase();
diff --git a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.reference b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.reference
rename to tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
similarity index 90%
rename from tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql
rename to tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
index 2aa903d99f0..875bd1f96de 100644
--- a/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
@@ -1,9 +1,11 @@
+-- Tags: long, replica
+
 -- Testing basic functionality with compact parts
 set replication_alter_partitions_sync = 2;
 drop table if exists mt_compact;
 
 create table mt_compact(a UInt64, b UInt64 DEFAULT a * a, s String, n Nested(x UInt32, y String), lc LowCardinality(String))
-engine = ReplicatedMergeTree('/clickhouse/test_01201/mt_compact_replicated', '1')
+engine = ReplicatedMergeTree('/clickhouse/{database}/test_01201/mt_compact_replicated', '1')
 order by a partition by a % 10
 settings index_granularity = 8,
 min_rows_for_wide_part = 10;
diff --git a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
index d7e722fc9bc..65adaf3ad71 100644
--- a/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
+++ b/tests/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_02000;
diff --git a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
index b82b132be05..a255c1db30e 100755
--- a/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.reference b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.reference
rename to tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
similarity index 88%
rename from tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql
rename to tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
index 616a213e46c..406507089c3 100644
--- a/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_rename_pk;
 
 CREATE TABLE table_for_rename_pk
@@ -9,7 +11,7 @@ CREATE TABLE table_for_rename_pk
   value1 String,
   value2 String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01213/table_for_rename_pk1', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01213/table_for_rename_pk1', '1')
 PARTITION BY date
 ORDER BY (key1, pow(key2, 2), key3);
 
@@ -37,7 +39,7 @@ CREATE TABLE table_for_rename_with_primary_key
   value2 String,
   INDEX idx (value1) TYPE set(1) GRANULARITY 1
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01213/table_for_rename_pk2', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01213/table_for_rename_pk2', '1')
 PARTITION BY date
 ORDER BY (key1, key2, key3)
 PRIMARY KEY (key1, key2);
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.reference
similarity index 74%
rename from tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference
rename to tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.reference
index da3dad5cb16..2a6b00cdddb 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.reference
@@ -8,10 +8,10 @@ Hello 1
 Word 1
 date1	date2	value1	value2
 2019-10-02	2018-10-02	1	1
-CREATE TABLE default.table_rename_with_ttl\n(\n    `date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_rename_with_ttl\n(\n    `date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
 renamed_date1	date2	value1	value2
 2019-10-02	2018-10-02	1	1
-CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
 renamed_date1	renamed_date2	value1	value2
 2019-10-02	2018-10-02	1	1
-CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `renamed_date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL renamed_date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_rename_with_ttl\n(\n    `renamed_date1` Date,\n    `renamed_date2` Date,\n    `value1` String,\n    `value2` String TTL renamed_date1 + toIntervalMonth(10000)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01213/table_rename_with_ttl\', \'1\')\nORDER BY tuple()\nTTL renamed_date2 + toIntervalMonth(10000)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
similarity index 94%
rename from tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql
rename to tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
index e5701077770..986947d5979 100644
--- a/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql
+++ b/tests/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_rename_with_default;
 
 CREATE TABLE table_rename_with_default
@@ -38,7 +40,7 @@ CREATE TABLE table_rename_with_ttl
   value1 String,
   value2 String TTL date1 + INTERVAL 10000 MONTH
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/test_01213/table_rename_with_ttl', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01213/table_rename_with_ttl', '1')
 ORDER BY tuple()
 TTL date2 + INTERVAL 10000 MONTH;
 
diff --git a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.reference b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.reference
index 4ade9cd9c5d..febec683df9 100644
--- a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.reference
+++ b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.reference
@@ -3,6 +3,11 @@ distributed_group_by_no_merge
 1
 optimize_skip_unused_shards
 1
-optimize_skip_unused_shards lack of WHERE
+optimize_skip_unused_shards lack of WHERE (optimize_distributed_group_by_sharding_key=0)
+0
+1
+optimize_skip_unused_shards lack of WHERE (optimize_distributed_group_by_sharding_key=1)
+0
+1
 0
 1
diff --git a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
index 5b45bea9046..e2de2de07c7 100644
--- a/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
+++ b/tests/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TABLE IF NOT EXISTS local_01213 (id Int) ENGINE = MergeTree ORDER BY tuple();
 CREATE TABLE IF NOT EXISTS dist_01213 AS local_01213 ENGINE = Distributed(test_cluster_two_shards_localhost, currentDatabase(), local_01213, id);
 
@@ -12,8 +14,15 @@ SELECT DISTINCT id FROM dist_01213 WHERE id = 1 SETTINGS distributed_group_by_no
 SELECT 'optimize_skip_unused_shards';
 SELECT DISTINCT id FROM dist_01213 WHERE id = 1 SETTINGS optimize_skip_unused_shards=1;
 -- check that querying all shards is ok
-SELECT 'optimize_skip_unused_shards lack of WHERE';
-SELECT DISTINCT id FROM dist_01213 SETTINGS optimize_skip_unused_shards=1;
+SELECT 'optimize_skip_unused_shards lack of WHERE (optimize_distributed_group_by_sharding_key=0)';
+SELECT DISTINCT id FROM dist_01213 SETTINGS optimize_skip_unused_shards=1, optimize_distributed_group_by_sharding_key=0;
+-- with optimize_distributed_group_by_sharding_key=1 there will be 4 rows,
+-- since DISTINCT will be done on each shard separatelly, and initiator will
+-- not do anything (since we use optimize_skip_unused_shards=1 that must
+-- guarantee that the data had been INSERTed according to sharding key,
+-- which is not our case, since we use one local table).
+SELECT 'optimize_skip_unused_shards lack of WHERE (optimize_distributed_group_by_sharding_key=1)';
+SELECT DISTINCT id FROM dist_01213 SETTINGS optimize_skip_unused_shards=1, optimize_distributed_group_by_sharding_key=1;
 
 DROP TABLE local_01213;
 DROP TABLE dist_01213;
diff --git a/tests/queries/0_stateless/01221_system_settings.reference b/tests/queries/0_stateless/01221_system_settings.reference
index 52e845912cc..108d48d6051 100644
--- a/tests/queries/0_stateless/01221_system_settings.reference
+++ b/tests/queries/0_stateless/01221_system_settings.reference
@@ -1,4 +1,4 @@
 send_timeout	300	0		\N	\N	0	Seconds
-replicated_max_parallel_sends	0	0	Limit parallel sends.	UInt64
+storage_policy	default	0	Name of storage disk policy	String
 1
 1
diff --git a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
index f15ea4a75f4..6f5deb91ee4 100644
--- a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
+++ b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01224;
 DROP DATABASE IF EXISTS dict_db_01224_dictionary;
 CREATE DATABASE dict_db_01224 ENGINE=Ordinary;  -- Different internal dictionary name with Atomic
diff --git a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
index 451f2adbede..513ecbd4ed4 100644
--- a/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
+++ b/tests/queries/0_stateless/01225_drop_dictionary_as_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01225;
 CREATE DATABASE dict_db_01225;
 
diff --git a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
index a49f113ebde..006ff952ee9 100644
--- a/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
+++ b/tests/queries/0_stateless/01225_show_create_table_from_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01225;
 DROP DATABASE IF EXISTS dict_db_01225_dictionary;
 CREATE DATABASE dict_db_01225 ENGINE=Ordinary;    -- Different internal dictionary name with Atomic
diff --git a/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql b/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
index ca9b28a14f4..f75e097430f 100644
--- a/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
+++ b/tests/queries/0_stateless/01226_dist_on_dist_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SELECT 'GLOBAL IN';
 select * from remote('localhost', system.one) where dummy global in (0);
 select * from remote('localhost', system.one) where dummy global in system.one;
diff --git a/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql b/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
index 781e9d6f8f9..d8ff9006185 100644
--- a/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
+++ b/tests/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- Test from the issue https://github.com/ClickHouse/ClickHouse/issues/2610
 drop table if exists data_01227;
 create table data_01227 (key Int) Engine=MergeTree() order by key;
diff --git a/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql b/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
index 80f7625900a..e70652877e0 100644
--- a/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
+++ b/tests/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 set send_logs_level = 'error';
 
 create database if not exists shard_0;
diff --git a/tests/queries/0_stateless/01231_markdown_format.reference b/tests/queries/0_stateless/01231_markdown_format.reference
index 55cf44381ad..9fb9901a053 100644
--- a/tests/queries/0_stateless/01231_markdown_format.reference
+++ b/tests/queries/0_stateless/01231_markdown_format.reference
@@ -1,5 +1,5 @@
 | id | name | array | nullable | low_cardinality | decimal |
 |-:|:-|:-|:-|:-|-:|
-| 1 | name1 | [1,2,3] | Some long string | name1 | 1.110000 |
+| 1 | name1 | [1,2,3] | Some long string | name1 | 1.11 |
 | 2 | name2 | [4,5,60000] | \N | Another long string | 222.222222 |
-| 30000 | One more long string | [7,8,9] | name3 | name3 | 3.330000 |
+| 30000 | One more long string | [7,8,9] | name3 | name3 | 3.33 |
diff --git a/tests/queries/0_stateless/01232_extremes.sql b/tests/queries/0_stateless/01232_extremes.sql
index b0670f731c6..c0a9c8cb6d6 100644
--- a/tests/queries/0_stateless/01232_extremes.sql
+++ b/tests/queries/0_stateless/01232_extremes.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set send_logs_level = 'error';
 set extremes = 1;
 
diff --git a/tests/queries/0_stateless/01232_json_as_string_format.reference b/tests/queries/0_stateless/01232_json_as_string_format.reference
index 19d50bde85a..d644c12bb3f 100644
--- a/tests/queries/0_stateless/01232_json_as_string_format.reference
+++ b/tests/queries/0_stateless/01232_json_as_string_format.reference
@@ -1,3 +1,6 @@
+{\n        "id" : 1,\n        "date" : "01.01.2020",\n        "string" : "123{{{\\"\\\\",\n        "array" : [1, 2, 3],\n        "map": {\n            "a" : 1,\n            "b" : 2,\n            "c" : 3\n        }\n    }
+{\n        "id" : 2,\n        "date" : "01.02.2020",\n        "string" : "{another\\"\n        string}}",\n        "array" : [3, 2, 1],\n        "map" : {\n            "z" : 1,\n            "y" : 2,\n            "x" : 3\n        }\n    }
+{\n        "id" : 3,\n        "date" : "01.03.2020",\n        "string" : "one more string",\n        "array" : [3,1,2],\n        "map" : {\n            "{" : 1,\n            "}}" : 2\n        }\n    }
 {\n    "id" : 1,\n    "date" : "01.01.2020",\n    "string" : "123{{{\\"\\\\",\n    "array" : [1, 2, 3],\n    "map": {\n        "a" : 1,\n        "b" : 2,\n        "c" : 3\n    }\n}
-{\n    "id" : 2,\n    "date" : "01.02.2020",\n    "string" : "{another\\"\n    string}}",\n    "array" : [3, 2, 1],\n    "map" : {\n        "z" : 1,\n        "y" : 2, \n        "x" : 3\n    }\n}
-{\n    "id" : 3, \n    "date" : "01.03.2020", \n    "string" : "one more string", \n    "array" : [3,1,2], \n    "map" : {\n        "{" : 1, \n        "}}" : 2\n    }\n}
+{\n    "id" : 2,\n    "date" : "01.02.2020",\n    "string" : "{another\\"\n    string}}",\n    "array" : [3, 2, 1],\n    "map" : {\n        "z" : 1,\n        "y" : 2,\n        "x" : 3\n    }\n}
+{\n    "id" : 3,\n    "date" : "01.03.2020",\n    "string" : "one more string",\n    "array" : [3,1,2],\n    "map" : {\n        "{" : 1,\n        "}}" : 2\n    }\n}
diff --git a/tests/queries/0_stateless/01232_json_as_string_format.sh b/tests/queries/0_stateless/01232_json_as_string_format.sh
index ed8c5d37cac..667aea7ba78 100755
--- a/tests/queries/0_stateless/01232_json_as_string_format.sh
+++ b/tests/queries/0_stateless/01232_json_as_string_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -28,21 +29,59 @@ echo '
     "array" : [3, 2, 1],
     "map" : {
         "z" : 1,
-        "y" : 2, 
+        "y" : 2,
         "x" : 3
     }
 }
 {
-    "id" : 3, 
-    "date" : "01.03.2020", 
-    "string" : "one more string", 
-    "array" : [3,1,2], 
+    "id" : 3,
+    "date" : "01.03.2020",
+    "string" : "one more string",
+    "array" : [3,1,2],
     "map" : {
-        "{" : 1, 
+        "{" : 1,
         "}}" : 2
     }
 }' | $CLICKHOUSE_CLIENT --query="INSERT INTO json_as_string FORMAT JSONAsString";
 
-$CLICKHOUSE_CLIENT --query="SELECT * FROM json_as_string";
+echo '
+[
+    {
+        "id" : 1,
+        "date" : "01.01.2020",
+        "string" : "123{{{\"\\",
+        "array" : [1, 2, 3],
+        "map": {
+            "a" : 1,
+            "b" : 2,
+            "c" : 3
+        }
+    },
+    {
+        "id" : 2,
+        "date" : "01.02.2020",
+        "string" : "{another\"
+        string}}",
+        "array" : [3, 2, 1],
+        "map" : {
+            "z" : 1,
+            "y" : 2,
+            "x" : 3
+        }
+    }
+    {
+        "id" : 3,
+        "date" : "01.03.2020",
+        "string" : "one more string",
+        "array" : [3,1,2],
+        "map" : {
+            "{" : 1,
+            "}}" : 2
+        }
+    }
+]' | $CLICKHOUSE_CLIENT --query="INSERT INTO json_as_string FORMAT JSONAsString";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM json_as_string ORDER BY field";
 $CLICKHOUSE_CLIENT --query="DROP TABLE json_as_string"
 
diff --git a/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh b/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
index e42e68a6589..4a209f12022 100755
--- a/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
+++ b/tests/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01235_live_view_over_distributed.sql b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
index abc628475db..32ec0a6127f 100644
--- a/tests/queries/0_stateless/01235_live_view_over_distributed.sql
+++ b/tests/queries/0_stateless/01235_live_view_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 set insert_distributed_sync = 1;
 SET allow_experimental_live_view = 1;
 
diff --git a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
index 522fc5dafbe..4aacecc9734 100644
--- a/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
+++ b/tests/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 
 DROP TABLE IF EXISTS lv;
diff --git a/tests/queries/0_stateless/01236_graphite_mt.reference b/tests/queries/0_stateless/01236_graphite_mt.reference
index a30d2495265..0f2e8e81377 100644
--- a/tests/queries/0_stateless/01236_graphite_mt.reference
+++ b/tests/queries/0_stateless/01236_graphite_mt.reference
@@ -342,3 +342,347 @@
 2	sum_2	98950	1	940
 2	sum_2	108950	1	1040
 2	sum_2	70170	1	1140
+1	max_1	9	1	0
+1	max_1	19	1	10
+1	max_1	29	1	20
+1	max_1	39	1	30
+1	max_1	49	1	40
+1	max_1	59	1	50
+1	max_1	69	1	60
+1	max_1	79	1	70
+1	max_1	89	1	80
+1	max_1	99	1	90
+1	max_1	109	1	100
+1	max_1	119	1	110
+1	max_1	129	1	120
+1	max_1	139	1	130
+1	max_1	149	1	140
+1	max_1	159	1	150
+1	max_1	169	1	160
+1	max_1	179	1	170
+1	max_1	189	1	180
+1	max_1	199	1	190
+1	max_1	209	1	200
+1	max_1	219	1	210
+1	max_1	229	1	220
+1	max_1	239	1	230
+1	max_1	249	1	240
+1	max_1	259	1	250
+1	max_1	269	1	260
+1	max_1	279	1	270
+1	max_1	289	1	280
+1	max_1	299	1	290
+1	max_1	39	1	0
+1	max_1	139	1	40
+1	max_1	239	1	140
+1	max_1	339	1	240
+1	max_1	439	1	340
+1	max_1	539	1	440
+1	max_1	639	1	540
+1	max_1	739	1	640
+1	max_1	839	1	740
+1	max_1	939	1	840
+1	max_1	1039	1	940
+1	max_1	1139	1	1040
+1	max_1	1199	1	1140
+1	max_2	9	1	0
+1	max_2	19	1	10
+1	max_2	29	1	20
+1	max_2	39	1	30
+1	max_2	49	1	40
+1	max_2	59	1	50
+1	max_2	69	1	60
+1	max_2	79	1	70
+1	max_2	89	1	80
+1	max_2	99	1	90
+1	max_2	109	1	100
+1	max_2	119	1	110
+1	max_2	129	1	120
+1	max_2	139	1	130
+1	max_2	149	1	140
+1	max_2	159	1	150
+1	max_2	169	1	160
+1	max_2	179	1	170
+1	max_2	189	1	180
+1	max_2	199	1	190
+1	max_2	209	1	200
+1	max_2	219	1	210
+1	max_2	229	1	220
+1	max_2	239	1	230
+1	max_2	249	1	240
+1	max_2	259	1	250
+1	max_2	269	1	260
+1	max_2	279	1	270
+1	max_2	289	1	280
+1	max_2	299	1	290
+1	max_2	39	1	0
+1	max_2	139	1	40
+1	max_2	239	1	140
+1	max_2	339	1	240
+1	max_2	439	1	340
+1	max_2	539	1	440
+1	max_2	639	1	540
+1	max_2	739	1	640
+1	max_2	839	1	740
+1	max_2	939	1	840
+1	max_2	1039	1	940
+1	max_2	1139	1	1040
+1	max_2	1199	1	1140
+1	sum_1	45	1	0
+1	sum_1	145	1	10
+1	sum_1	245	1	20
+1	sum_1	345	1	30
+1	sum_1	445	1	40
+1	sum_1	545	1	50
+1	sum_1	645	1	60
+1	sum_1	745	1	70
+1	sum_1	845	1	80
+1	sum_1	945	1	90
+1	sum_1	1045	1	100
+1	sum_1	1145	1	110
+1	sum_1	1245	1	120
+1	sum_1	1345	1	130
+1	sum_1	1445	1	140
+1	sum_1	1545	1	150
+1	sum_1	1645	1	160
+1	sum_1	1745	1	170
+1	sum_1	1845	1	180
+1	sum_1	1945	1	190
+1	sum_1	2045	1	200
+1	sum_1	2145	1	210
+1	sum_1	2245	1	220
+1	sum_1	2345	1	230
+1	sum_1	2445	1	240
+1	sum_1	2545	1	250
+1	sum_1	2645	1	260
+1	sum_1	2745	1	270
+1	sum_1	2845	1	280
+1	sum_1	2945	1	290
+1	sum_1	780	1	0
+1	sum_1	8950	1	40
+1	sum_1	18950	1	140
+1	sum_1	28950	1	240
+1	sum_1	38950	1	340
+1	sum_1	48950	1	440
+1	sum_1	58950	1	540
+1	sum_1	68950	1	640
+1	sum_1	78950	1	740
+1	sum_1	88950	1	840
+1	sum_1	98950	1	940
+1	sum_1	108950	1	1040
+1	sum_1	70170	1	1140
+1	sum_2	45	1	0
+1	sum_2	145	1	10
+1	sum_2	245	1	20
+1	sum_2	345	1	30
+1	sum_2	445	1	40
+1	sum_2	545	1	50
+1	sum_2	645	1	60
+1	sum_2	745	1	70
+1	sum_2	845	1	80
+1	sum_2	945	1	90
+1	sum_2	1045	1	100
+1	sum_2	1145	1	110
+1	sum_2	1245	1	120
+1	sum_2	1345	1	130
+1	sum_2	1445	1	140
+1	sum_2	1545	1	150
+1	sum_2	1645	1	160
+1	sum_2	1745	1	170
+1	sum_2	1845	1	180
+1	sum_2	1945	1	190
+1	sum_2	2045	1	200
+1	sum_2	2145	1	210
+1	sum_2	2245	1	220
+1	sum_2	2345	1	230
+1	sum_2	2445	1	240
+1	sum_2	2545	1	250
+1	sum_2	2645	1	260
+1	sum_2	2745	1	270
+1	sum_2	2845	1	280
+1	sum_2	2945	1	290
+1	sum_2	780	1	0
+1	sum_2	8950	1	40
+1	sum_2	18950	1	140
+1	sum_2	28950	1	240
+1	sum_2	38950	1	340
+1	sum_2	48950	1	440
+1	sum_2	58950	1	540
+1	sum_2	68950	1	640
+1	sum_2	78950	1	740
+1	sum_2	88950	1	840
+1	sum_2	98950	1	940
+1	sum_2	108950	1	1040
+1	sum_2	70170	1	1140
+2	max_1	9	1	0
+2	max_1	19	1	10
+2	max_1	29	1	20
+2	max_1	39	1	30
+2	max_1	49	1	40
+2	max_1	59	1	50
+2	max_1	69	1	60
+2	max_1	79	1	70
+2	max_1	89	1	80
+2	max_1	99	1	90
+2	max_1	109	1	100
+2	max_1	119	1	110
+2	max_1	129	1	120
+2	max_1	139	1	130
+2	max_1	149	1	140
+2	max_1	159	1	150
+2	max_1	169	1	160
+2	max_1	179	1	170
+2	max_1	189	1	180
+2	max_1	199	1	190
+2	max_1	209	1	200
+2	max_1	219	1	210
+2	max_1	229	1	220
+2	max_1	239	1	230
+2	max_1	249	1	240
+2	max_1	259	1	250
+2	max_1	269	1	260
+2	max_1	279	1	270
+2	max_1	289	1	280
+2	max_1	299	1	290
+2	max_1	39	1	0
+2	max_1	139	1	40
+2	max_1	239	1	140
+2	max_1	339	1	240
+2	max_1	439	1	340
+2	max_1	539	1	440
+2	max_1	639	1	540
+2	max_1	739	1	640
+2	max_1	839	1	740
+2	max_1	939	1	840
+2	max_1	1039	1	940
+2	max_1	1139	1	1040
+2	max_1	1199	1	1140
+2	max_2	9	1	0
+2	max_2	19	1	10
+2	max_2	29	1	20
+2	max_2	39	1	30
+2	max_2	49	1	40
+2	max_2	59	1	50
+2	max_2	69	1	60
+2	max_2	79	1	70
+2	max_2	89	1	80
+2	max_2	99	1	90
+2	max_2	109	1	100
+2	max_2	119	1	110
+2	max_2	129	1	120
+2	max_2	139	1	130
+2	max_2	149	1	140
+2	max_2	159	1	150
+2	max_2	169	1	160
+2	max_2	179	1	170
+2	max_2	189	1	180
+2	max_2	199	1	190
+2	max_2	209	1	200
+2	max_2	219	1	210
+2	max_2	229	1	220
+2	max_2	239	1	230
+2	max_2	249	1	240
+2	max_2	259	1	250
+2	max_2	269	1	260
+2	max_2	279	1	270
+2	max_2	289	1	280
+2	max_2	299	1	290
+2	max_2	39	1	0
+2	max_2	139	1	40
+2	max_2	239	1	140
+2	max_2	339	1	240
+2	max_2	439	1	340
+2	max_2	539	1	440
+2	max_2	639	1	540
+2	max_2	739	1	640
+2	max_2	839	1	740
+2	max_2	939	1	840
+2	max_2	1039	1	940
+2	max_2	1139	1	1040
+2	max_2	1199	1	1140
+2	sum_1	45	1	0
+2	sum_1	145	1	10
+2	sum_1	245	1	20
+2	sum_1	345	1	30
+2	sum_1	445	1	40
+2	sum_1	545	1	50
+2	sum_1	645	1	60
+2	sum_1	745	1	70
+2	sum_1	845	1	80
+2	sum_1	945	1	90
+2	sum_1	1045	1	100
+2	sum_1	1145	1	110
+2	sum_1	1245	1	120
+2	sum_1	1345	1	130
+2	sum_1	1445	1	140
+2	sum_1	1545	1	150
+2	sum_1	1645	1	160
+2	sum_1	1745	1	170
+2	sum_1	1845	1	180
+2	sum_1	1945	1	190
+2	sum_1	2045	1	200
+2	sum_1	2145	1	210
+2	sum_1	2245	1	220
+2	sum_1	2345	1	230
+2	sum_1	2445	1	240
+2	sum_1	2545	1	250
+2	sum_1	2645	1	260
+2	sum_1	2745	1	270
+2	sum_1	2845	1	280
+2	sum_1	2945	1	290
+2	sum_1	780	1	0
+2	sum_1	8950	1	40
+2	sum_1	18950	1	140
+2	sum_1	28950	1	240
+2	sum_1	38950	1	340
+2	sum_1	48950	1	440
+2	sum_1	58950	1	540
+2	sum_1	68950	1	640
+2	sum_1	78950	1	740
+2	sum_1	88950	1	840
+2	sum_1	98950	1	940
+2	sum_1	108950	1	1040
+2	sum_1	70170	1	1140
+2	sum_2	45	1	0
+2	sum_2	145	1	10
+2	sum_2	245	1	20
+2	sum_2	345	1	30
+2	sum_2	445	1	40
+2	sum_2	545	1	50
+2	sum_2	645	1	60
+2	sum_2	745	1	70
+2	sum_2	845	1	80
+2	sum_2	945	1	90
+2	sum_2	1045	1	100
+2	sum_2	1145	1	110
+2	sum_2	1245	1	120
+2	sum_2	1345	1	130
+2	sum_2	1445	1	140
+2	sum_2	1545	1	150
+2	sum_2	1645	1	160
+2	sum_2	1745	1	170
+2	sum_2	1845	1	180
+2	sum_2	1945	1	190
+2	sum_2	2045	1	200
+2	sum_2	2145	1	210
+2	sum_2	2245	1	220
+2	sum_2	2345	1	230
+2	sum_2	2445	1	240
+2	sum_2	2545	1	250
+2	sum_2	2645	1	260
+2	sum_2	2745	1	270
+2	sum_2	2845	1	280
+2	sum_2	2945	1	290
+2	sum_2	780	1	0
+2	sum_2	8950	1	40
+2	sum_2	18950	1	140
+2	sum_2	28950	1	240
+2	sum_2	38950	1	340
+2	sum_2	48950	1	440
+2	sum_2	58950	1	540
+2	sum_2	68950	1	640
+2	sum_2	78950	1	740
+2	sum_2	88950	1	840
+2	sum_2	98950	1	940
+2	sum_2	108950	1	1040
+2	sum_2	70170	1	1140
diff --git a/tests/queries/0_stateless/01236_graphite_mt.sql b/tests/queries/0_stateless/01236_graphite_mt.sql
index 88d2d0ccb63..0ec905fa0a8 100644
--- a/tests/queries/0_stateless/01236_graphite_mt.sql
+++ b/tests/queries/0_stateless/01236_graphite_mt.sql
@@ -1,26 +1,38 @@
+
+-- Use DateTime('UTC') to have a common rollup window
 drop table if exists test_graphite;
-create table test_graphite (key UInt32, Path String, Time DateTime, Value Float64, Version UInt32, col UInt64)
+create table test_graphite (key UInt32, Path String, Time DateTime('UTC'), Value Float64, Version UInt32, col UInt64)
     engine = GraphiteMergeTree('graphite_rollup') order by key settings index_granularity=10;
 
-insert into test_graphite
-select 1, 'sum_1', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 2, 'sum_1', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 1, 'sum_2', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 2, 'sum_2', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 1, 'max_1', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 2, 'max_1', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 1, 'max_2', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300) union all
-select 2, 'max_2', toDateTime(today()) - number * 60 - 30, number, 1, number from numbers(300);
+SET joined_subquery_requires_alias = 0;
 
-insert into test_graphite
-select 1, 'sum_1', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 2, 'sum_1', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 1, 'sum_2', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 2, 'sum_2', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 1, 'max_1', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 2, 'max_1', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 1, 'max_2', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200) union all
-select 2, 'max_2', toDateTime(today() - 3) - number * 60 - 30, number, 1, number from numbers(1200);
+INSERT into test_graphite
+WITH dates AS
+    (
+        SELECT toStartOfDay(toDateTime(now('UTC'), 'UTC')) as today,
+               today - INTERVAL 3 day as older_date
+    )
+    -- Newer than 2 days are kept in windows of 600 seconds
+    select 1 AS key, 'sum_1' AS s, today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 2, 'sum_1', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 1, 'sum_2', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 2, 'sum_2', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 1, 'max_1', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 2, 'max_1', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 1, 'max_2', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+    select 2, 'max_2', today - number * 60 - 30, number, 1, number from dates, numbers(300) union all
+
+    -- Older than 2 days use 6000 second windows
+    select 1 AS key, 'sum_1' AS s, older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 2, 'sum_1', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 1, 'sum_2', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 2, 'sum_2', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 1, 'max_1', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 2, 'max_1', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 1, 'max_2', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200) union all
+    select 2, 'max_2', older_date - number * 60 - 30, number, 1, number from dates, numbers(1200);
+
+select key, Path, Value, Version, col from test_graphite final order by key, Path, Time desc;
 
 optimize table test_graphite final;
 
diff --git a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
index de35b0c6c9d..b7c1c6eea76 100644
--- a/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
+++ b/tests/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-replicated-database, no-parallel, no-fasttest
+
 SET allow_experimental_live_view = 1;
 SET insert_distributed_sync = 1;
 
diff --git a/tests/queries/0_stateless/01238_http_memory_tracking.sh b/tests/queries/0_stateless/01238_http_memory_tracking.sh
index 8c900e4c208..9b0fe875416 100755
--- a/tests/queries/0_stateless/01238_http_memory_tracking.sh
+++ b/tests/queries/0_stateless/01238_http_memory_tracking.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
index 4442b0b6b61..a4a6b87de25 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
@@ -57,7 +57,9 @@ LIMIT
 1	0
 LIMIT OFFSET
 1	1
-OFFSET
+OFFSET distributed_push_down_limit=0
+1	1
+OFFSET distributed_push_down_limit=1
 1	1
 1	0
 1	1
@@ -65,6 +67,8 @@ WHERE LIMIT OFFSET
 1	1
 LIMIT BY 1
 1	0
+1	0
+1	1
 1	1
 GROUP BY (Distributed-over-Distributed)
 4	0
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
index 1dcdd795bc1..134c6763fab 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- TODO: correct testing with real unique shards
 
 set optimize_distributed_group_by_sharding_key=1;
@@ -60,8 +62,10 @@ select 'LIMIT';
 select count(), * from dist_01247 group by number limit 1;
 select 'LIMIT OFFSET';
 select count(), * from dist_01247 group by number limit 1 offset 1;
-select 'OFFSET';
-select count(), * from dist_01247 group by number offset 1;
+select 'OFFSET distributed_push_down_limit=0';
+select count(), * from dist_01247 group by number offset 1 settings distributed_push_down_limit=0;
+select 'OFFSET distributed_push_down_limit=1';
+select count(), * from dist_01247 group by number offset 1 settings distributed_push_down_limit=1;
 -- this will emulate different data on for different shards
 select 'WHERE LIMIT OFFSET';
 select count(), * from dist_01247 where number = _shard_num-1 group by number order by number limit 1 offset 1;
diff --git a/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql b/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
index 030330e4cae..3f7632baf7e 100644
--- a/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
+++ b/tests/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT sum(number) FROM (SELECT * FROM remote('127.0.0.{1,2}', system.numbers) LIMIT 5 SETTINGS distributed_group_by_no_merge = 1);
 SELECT sum(number) FROM (SELECT * FROM remote('127.0.0.{1,2}', system.numbers) LIMIT 5 SETTINGS distributed_group_by_no_merge = 1) with totals;
 
diff --git a/tests/queries/0_stateless/01246_finalize_aggregation_race.sql b/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
index c4946bd9e83..e63f7fb0983 100644
--- a/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
+++ b/tests/queries/0_stateless/01246_finalize_aggregation_race.sql
@@ -1,3 +1,5 @@
+-- Tags: race
+
 drop table if exists test_quantile;
 create table test_quantile (x AggregateFunction(quantileTiming(0.2), UInt64)) engine = Memory;
 insert into test_quantile select medianTimingState(.2)(number) from (select * from numbers(1000) order by number desc);
diff --git a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
index 193d23999be..addff72ce66 100755
--- a/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
+++ b/tests/queries/0_stateless/01246_insert_into_watch_live_view.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Tags: no-replicated-database, no-parallel, no-fasttest
+
 import os
 import sys
 import time
diff --git a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
index 73dc916e463..9fc01b141ea 100644
--- a/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
+++ b/tests/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- TODO: correct testing with real unique shards
 
 set optimize_distributed_group_by_sharding_key=1;
diff --git a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
index 8902b164c09..c2be4d04e5f 100644
--- a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
+++ b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01249;
 CREATE DATABASE test_01249 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01249;
diff --git a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
index 958165805e1..4b59ca4d7bb 100644
--- a/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
+++ b/tests/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict;
 CREATE DATABASE database_for_dict;
 
diff --git a/tests/queries/0_stateless/01254_dict_create_without_db.sql b/tests/queries/0_stateless/01254_dict_create_without_db.sql
index 0c7f3126d98..65a2ab52d23 100644
--- a/tests/queries/0_stateless/01254_dict_create_without_db.sql
+++ b/tests/queries/0_stateless/01254_dict_create_without_db.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01254;
 CREATE DATABASE dict_db_01254;
 USE dict_db_01254;
diff --git a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
index 8fd56f40afe..c11cb64735c 100644
--- a/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
+++ b/tests/queries/0_stateless/01254_dict_load_after_detach_attach.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS dict_db_01254;
 CREATE DATABASE dict_db_01254;
 
diff --git a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
index 35782f1cd02..4ff3b7913f4 100644
--- a/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
+++ b/tests/queries/0_stateless/01257_dictionary_mismatch_types.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_dict_db;
 CREATE DATABASE test_dict_db;
 
diff --git a/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql b/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
index f95d2d87b8e..59cfd85ed60 100644
--- a/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
+++ b/tests/queries/0_stateless/01259_combinator_distinct_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET distributed_aggregation_memory_efficient = 1;
 
 SELECT sum(DISTINCT number % 13) FROM remote('127.0.0.{1,2}', numbers_mt(100000));
diff --git a/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql b/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
index 3c8b4e03507..224aac43a1f 100644
--- a/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
+++ b/tests/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01260_ubsan_decimal_parse.reference b/tests/queries/0_stateless/01260_ubsan_decimal_parse.reference
index 945da8ffd36..573541ac970 100644
--- a/tests/queries/0_stateless/01260_ubsan_decimal_parse.reference
+++ b/tests/queries/0_stateless/01260_ubsan_decimal_parse.reference
@@ -1 +1 @@
-0.000000
+0
diff --git a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.reference b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.reference
rename to tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
similarity index 81%
rename from tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql
rename to tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
index d96085bc086..11d774e36d7 100644
--- a/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql
+++ b/tests/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS test_alter;
 CREATE TABLE test_alter (x Date, s String) ENGINE = MergeTree ORDER BY s PARTITION BY x;
 ALTER TABLE test_alter MODIFY COLUMN s DEFAULT 'Hello';
@@ -8,8 +10,8 @@ DROP TABLE test_alter;
 DROP TABLE IF EXISTS test_alter_r1;
 DROP TABLE IF EXISTS test_alter_r2;
 
-CREATE TABLE test_alter_r1 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01267/alter', 'r1') ORDER BY s PARTITION BY x;
-CREATE TABLE test_alter_r2 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01267/alter', 'r2') ORDER BY s PARTITION BY x;
+CREATE TABLE test_alter_r1 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01267/alter', 'r1') ORDER BY s PARTITION BY x;
+CREATE TABLE test_alter_r2 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01267/alter', 'r2') ORDER BY s PARTITION BY x;
 
 ALTER TABLE test_alter_r1 MODIFY COLUMN s DEFAULT 'Hello' SETTINGS replication_alter_partitions_sync = 2;
 ALTER TABLE test_alter_r2 MODIFY COLUMN x DEFAULT '2000-01-01' SETTINGS replication_alter_partitions_sync = 2;
diff --git a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
index f4f3cbec705..914d24a740a 100644
--- a/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
+++ b/tests/queries/0_stateless/01268_dictionary_direct_layout.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS database_for_dict_01268;
 
 CREATE DATABASE database_for_dict_01268;
diff --git a/tests/queries/0_stateless/01268_shard_avgweighted.sql b/tests/queries/0_stateless/01268_shard_avgweighted.sql
index 3a101ec4754..3ddbf108cea 100644
--- a/tests/queries/0_stateless/01268_shard_avgweighted.sql
+++ b/tests/queries/0_stateless/01268_shard_avgweighted.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 CREATE TABLE dummy(foo Int64) ENGINE = Memory();
 INSERT INTO dummy VALUES (1);
 SELECT avgWeighted(100., .1) FROM remote('127.0.0.{2,3}', currentDatabase(), dummy);
diff --git a/tests/queries/0_stateless/01269_alias_type_differs.sql b/tests/queries/0_stateless/01269_alias_type_differs.sql
index b78e46f62c8..64abcf9e367 100644
--- a/tests/queries/0_stateless/01269_alias_type_differs.sql
+++ b/tests/queries/0_stateless/01269_alias_type_differs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS data_01269;
 CREATE TABLE data_01269
 (
diff --git a/tests/queries/0_stateless/01269_create_with_null.sql b/tests/queries/0_stateless/01269_create_with_null.sql
index faa6b84e9e4..7548070ce4b 100644
--- a/tests/queries/0_stateless/01269_create_with_null.sql
+++ b/tests/queries/0_stateless/01269_create_with_null.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 DROP TABLE IF EXISTS data_null;
 DROP TABLE IF EXISTS set_null;
 DROP TABLE IF EXISTS cannot_be_nullable;
diff --git a/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql b/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
index 1dc322f2113..12056148625 100644
--- a/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
+++ b/tests/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
 set allow_suspicious_low_cardinality_types=1;
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
index ccfa08af7bc..8a9c6fc01e4 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
 
 EXPLAIN SYNTAX SELECT sum(n + 1), sum(1 + n), sum(n - 1), sum(1 - n) FROM (SELECT number n FROM numbers(10));
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference
new file mode 100644
index 00000000000..9e0d871041b
--- /dev/null
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference
@@ -0,0 +1,10 @@
+SELECT min(n AS a) + (1 AS b) AS c
+FROM
+(
+    SELECT number AS n
+    FROM numbers(10)
+    WHERE (1 > 0) AND (n > 0)
+)
+WHERE (a > 0) AND (b > 0)
+HAVING c > 0
+2
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql
new file mode 100644
index 00000000000..73b87817bb3
--- /dev/null
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql
@@ -0,0 +1,4 @@
+set optimize_arithmetic_operations_in_aggregate_functions = 1;
+
+explain syntax select min((n as a) + (1 as b)) c from (select number n from numbers(10)) where a > 0 and b > 0 having c > 0;
+select min((n as a) + (1 as b)) c from (select number n from numbers(10)) where a > 0 and b > 0 having c > 0;
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index 95f9e407f21..d347f149230 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -13,7 +13,9 @@ ALTER DROP COLUMN	['DROP COLUMN']	COLUMN	ALTER COLUMN
 ALTER COMMENT COLUMN	['COMMENT COLUMN']	COLUMN	ALTER COLUMN
 ALTER CLEAR COLUMN	['CLEAR COLUMN']	COLUMN	ALTER COLUMN
 ALTER RENAME COLUMN	['RENAME COLUMN']	COLUMN	ALTER COLUMN
+ALTER MATERIALIZE COLUMN	['MATERIALIZE COLUMN']	COLUMN	ALTER COLUMN
 ALTER COLUMN	[]	\N	ALTER TABLE
+ALTER MODIFY COMMENT	['MODIFY COMMENT']	TABLE	ALTER TABLE
 ALTER ORDER BY	['ALTER MODIFY ORDER BY','MODIFY ORDER BY']	TABLE	ALTER INDEX
 ALTER SAMPLE BY	['ALTER MODIFY SAMPLE BY','MODIFY SAMPLE BY']	TABLE	ALTER INDEX
 ALTER ADD INDEX	['ADD INDEX']	TABLE	ALTER INDEX
@@ -35,7 +37,9 @@ ALTER SETTINGS	['ALTER SETTING','ALTER MODIFY SETTING','MODIFY SETTING','RESET S
 ALTER MOVE PARTITION	['ALTER MOVE PART','MOVE PARTITION','MOVE PART']	TABLE	ALTER TABLE
 ALTER FETCH PARTITION	['ALTER FETCH PART','FETCH PARTITION']	TABLE	ALTER TABLE
 ALTER FREEZE PARTITION	['FREEZE PARTITION','UNFREEZE']	TABLE	ALTER TABLE
+ALTER DATABASE SETTINGS	['ALTER DATABASE SETTING','ALTER MODIFY DATABASE SETTING','MODIFY DATABASE SETTING']	DATABASE	ALTER DATABASE
 ALTER TABLE	[]	\N	ALTER
+ALTER DATABASE	[]	\N	ALTER
 ALTER VIEW REFRESH	['ALTER LIVE VIEW REFRESH','REFRESH VIEW']	VIEW	ALTER VIEW
 ALTER VIEW MODIFY QUERY	['ALTER TABLE MODIFY QUERY']	VIEW	ALTER VIEW
 ALTER VIEW	[]	\N	ALTER
@@ -45,11 +49,13 @@ CREATE TABLE	[]	TABLE	CREATE
 CREATE VIEW	[]	VIEW	CREATE
 CREATE DICTIONARY	[]	DICTIONARY	CREATE
 CREATE TEMPORARY TABLE	[]	GLOBAL	CREATE
+CREATE FUNCTION	[]	DATABASE	CREATE
 CREATE	[]	\N	ALL
 DROP DATABASE	[]	DATABASE	DROP
 DROP TABLE	[]	TABLE	DROP
 DROP VIEW	[]	VIEW	DROP
 DROP DICTIONARY	[]	DICTIONARY	DROP
+DROP FUNCTION	[]	DATABASE	DROP
 DROP	[]	\N	ALL
 TRUNCATE	['TRUNCATE TABLE']	TABLE	ALL
 OPTIMIZE	['OPTIMIZE TABLE']	TABLE	ALL
@@ -89,6 +95,7 @@ SYSTEM RELOAD CONFIG	['RELOAD CONFIG']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD SYMBOLS	['RELOAD SYMBOLS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD DICTIONARY	['SYSTEM RELOAD DICTIONARIES','RELOAD DICTIONARY','RELOAD DICTIONARIES']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD MODEL	['SYSTEM RELOAD MODELS','RELOAD MODEL','RELOAD MODELS']	GLOBAL	SYSTEM RELOAD
+SYSTEM RELOAD FUNCTION	['SYSTEM RELOAD FUNCTIONS','RELOAD FUNCTION','RELOAD FUNCTIONS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD EMBEDDED DICTIONARIES	['RELOAD EMBEDDED DICTIONARIES']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD	[]	\N	SYSTEM
 SYSTEM RESTART DISK	['SYSTEM RESTART DISK']	GLOBAL	SYSTEM
diff --git a/tests/queries/0_stateless/01272_suspicious_codecs.sql b/tests/queries/0_stateless/01272_suspicious_codecs.sql
index 3ec3e480da4..5baa30e3cf4 100644
--- a/tests/queries/0_stateless/01272_suspicious_codecs.sql
+++ b/tests/queries/0_stateless/01272_suspicious_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS codecs;
 
 -- test what should work
diff --git a/tests/queries/0_stateless/01273_arrow.sh b/tests/queries/0_stateless/01273_arrow.sh
index ad8a6f0fdb9..450b677a030 100755
--- a/tests/queries/0_stateless/01273_arrow.sh
+++ b/tests/queries/0_stateless/01273_arrow.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_arrow_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
index bce653376a5..30bcc17c4c1 100755
--- a/tests/queries/0_stateless/01273_arrow_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_decimal.reference b/tests/queries/0_stateless/01273_arrow_decimal.reference
index a512796de07..1358d3fa841 100644
--- a/tests/queries/0_stateless/01273_arrow_decimal.reference
+++ b/tests/queries/0_stateless/01273_arrow_decimal.reference
@@ -1,2 +1,2 @@
-0.1230	0.12312312	0.1231231231230000	0.12312312312312312300000000000000
-0.1230	0.12312312	0.1231231231230000	0.12312312312312312300000000000000
+0.123	0.12312312	0.123123123123	0.123123123123123123
+0.123	0.12312312	0.123123123123	0.123123123123123123
diff --git a/tests/queries/0_stateless/01273_arrow_decimal.sh b/tests/queries/0_stateless/01273_arrow_decimal.sh
index 22496035ea9..c02bf484578 100755
--- a/tests/queries/0_stateless/01273_arrow_decimal.sh
+++ b/tests/queries/0_stateless/01273_arrow_decimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_arrow_dictionaries_load.reference b/tests/queries/0_stateless/01273_arrow_dictionaries_load.reference
index 7321c396a59..99f5e505d82 100644
--- a/tests/queries/0_stateless/01273_arrow_dictionaries_load.reference
+++ b/tests/queries/0_stateless/01273_arrow_dictionaries_load.reference
@@ -1,2 +1,5 @@
 1	['a','b','c']	('z','6')
 2	['d','e']	('x','9')
+1	['a','b','c']	('z','6')
+2	['d','e']	('x','9')
+20000000
diff --git a/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh b/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
index 38e6c2c1b01..2906330c21b 100755
--- a/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_dictionaries_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -20,5 +21,7 @@ ${CLICKHOUSE_CLIENT} --query="SELECT * FROM arrow_dicts FORMAT Arrow SETTINGS ou
 
 cat "${CLICKHOUSE_TMP}"/dicts.arrow | ${CLICKHOUSE_CLIENT} -q "INSERT INTO arrow_dicts FORMAT Arrow"
 
+${CLICKHOUSE_CLIENT} --query="SELECT count() FROM arrow_dicts"
+
 ${CLICKHOUSE_CLIENT} --query="DROP TABLE arrow_dicts"
 
diff --git a/tests/queries/0_stateless/01273_arrow_load.sh b/tests/queries/0_stateless/01273_arrow_load.sh
index bc5588a905b..d5940ed4c8b 100755
--- a/tests/queries/0_stateless/01273_arrow_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
index cd2040260e9..24fc72f3d9a 100755
--- a/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_nested_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
index d780cc6d06a..4de976190fe 100755
--- a/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
+++ b/tests/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01273_arrow_stream.sh b/tests/queries/0_stateless/01273_arrow_stream.sh
index af5931a4bce..a1fa62df7b1 100755
--- a/tests/queries/0_stateless/01273_arrow_stream.sh
+++ b/tests/queries/0_stateless/01273_arrow_stream.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql b/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
index f15d8669388..ce513802e0a 100644
--- a/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
+++ b/tests/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
@@ -1 +1,3 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3EdgeAngle(100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql b/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
index 8799680125f..769514f851a 100644
--- a/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
+++ b/tests/queries/0_stateless/01274_alter_rename_column_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set insert_distributed_sync = 1;
 
 DROP TABLE IF EXISTS visits;
diff --git a/tests/queries/0_stateless/01275_parallel_mv.reference b/tests/queries/0_stateless/01275_parallel_mv.reference
index 898d3f7266e..a5987acafde 100644
--- a/tests/queries/0_stateless/01275_parallel_mv.reference
+++ b/tests/queries/0_stateless/01275_parallel_mv.reference
@@ -1,4 +1,27 @@
+-- { echoOn }
+set parallel_view_processing=1;
+insert into testX select number from numbers(10) settings log_queries=1; -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
+system flush logs;
+select length(thread_ids) from system.query_log where current_database = currentDatabase() and type != 'QueryStart' and query like '%insert into testX %' and Settings['parallel_view_processing'] = '1';
+8
+select count() from testX;
 10
+select count() from testXA;
 10
+select count() from testXB;
 0
+select count() from testXC;
 10
+set parallel_view_processing=0;
+insert into testX select number from numbers(10) settings log_queries=1; -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
+system flush logs;
+select length(thread_ids) from system.query_log where current_database = currentDatabase() and type != 'QueryStart' and query like '%insert into testX %' and Settings['parallel_view_processing'] = '0';
+5
+select count() from testX;
+20
+select count() from testXA;
+20
+select count() from testXB;
+0
+select count() from testXC;
+20
diff --git a/tests/queries/0_stateless/01275_parallel_mv.sql b/tests/queries/0_stateless/01275_parallel_mv.sql
index 5d4dffae50a..32b43ce616f 100644
--- a/tests/queries/0_stateless/01275_parallel_mv.sql
+++ b/tests/queries/0_stateless/01275_parallel_mv.sql
@@ -9,14 +9,28 @@ create materialized view testXA engine=MergeTree order by tuple() as select slee
 create materialized view testXB engine=MergeTree order by tuple() as select sleep(2), throwIf(A=1) from testX;
 create materialized view testXC engine=MergeTree order by tuple() as select sleep(1) from testX;
 
+-- { echoOn }
 set parallel_view_processing=1;
-insert into testX select number from numbers(10); -- {serverError 395}
+insert into testX select number from numbers(10) settings log_queries=1; -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
+system flush logs;
+select length(thread_ids) from system.query_log where current_database = currentDatabase() and type != 'QueryStart' and query like '%insert into testX %' and Settings['parallel_view_processing'] = '1';
 
 select count() from testX;
 select count() from testXA;
 select count() from testXB;
 select count() from testXC;
 
+set parallel_view_processing=0;
+insert into testX select number from numbers(10) settings log_queries=1; -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
+system flush logs;
+select length(thread_ids) from system.query_log where current_database = currentDatabase() and type != 'QueryStart' and query like '%insert into testX %' and Settings['parallel_view_processing'] = '0';
+
+select count() from testX;
+select count() from testXA;
+select count() from testXB;
+select count() from testXC;
+-- { echoOff }
+
 drop table testX;
 drop view testXA;
 drop view testXB;
diff --git a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.reference
similarity index 90%
rename from tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference
rename to tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.reference
index 84ca8273128..382ccb592af 100644
--- a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference
+++ b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.reference
@@ -7,7 +7,7 @@
 2019-10-01	6	6	7	8
 2019-10-02	7	7	8	9
 2019-10-03	8	8	9	10
-CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value4` String,\n    `value5` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value4) < toInt64(value5),\n    CONSTRAINT cs_value2 CHECK toInt64(value5) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01277/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value4` String,\n    `value5` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value4) < toInt64(value5),\n    CONSTRAINT cs_value2 CHECK toInt64(value5) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01277/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 2019-10-01	0	0	1	2
 2019-10-02	1	1	2	3
 2019-10-03	2	2	3	4
@@ -38,7 +38,7 @@ CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n
 2019-10-01	18	18	19	20
 2019-10-02	19	19	20	21
 -- rename columns back --
-CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value1) < toInt64(value2),\n    CONSTRAINT cs_value2 CHECK toInt64(value2) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/test_01277/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_rename1\n(\n    `date` Date,\n    `key` UInt64,\n    `value1` String,\n    `value2` String,\n    `value3` String,\n    CONSTRAINT cs_value1 CHECK toInt64(value1) < toInt64(value2),\n    CONSTRAINT cs_value2 CHECK toInt64(value2) < toInt64(value3)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/test_01277/test_for_rename\', \'1\')\nPARTITION BY date\nORDER BY key\nSETTINGS index_granularity = 8192
 2019-10-01	0	0	1	2
 2019-10-02	1	1	2	3
 2019-10-03	2	2	3	4
diff --git a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
similarity index 94%
rename from tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql
rename to tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
index 28f17dced97..8d8f590540a 100644
--- a/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql
+++ b/tests/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS table_for_rename1;
 
 CREATE TABLE table_for_rename1
@@ -10,7 +12,7 @@ CREATE TABLE table_for_rename1
   CONSTRAINT cs_value1 CHECK toInt64(value1) < toInt64(value2),
   CONSTRAINT cs_value2 CHECK toInt64(value2) < toInt64(value3)
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01277/test_for_rename', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01277/test_for_rename', '1')
 PARTITION BY date
 ORDER BY key;
 
diff --git a/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.reference b/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.reference
index e4872ddeddd..d21c1e74770 100644
--- a/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.reference
+++ b/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.reference
@@ -1,4 +1,8 @@
-0
-0
-800000
-1600000
+Should throw 1
+    KO(241)
+Should throw 2
+    KO(241)
+Should pass 1
+    OK
+Should pass 2
+    OK
diff --git a/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh b/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
index 80af1b2c17f..dde6b8ccadb 100755
--- a/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
+++ b/tests/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
@@ -7,6 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # just in case
 set -o pipefail
 
+# shellcheck disable=SC2120
 function execute()
 {
     ${CLICKHOUSE_CLIENT} -n "$@"
@@ -64,8 +65,7 @@ echo "create table out_01278 as data_01278 Engine=Merge('$CLICKHOUSE_DATABASE',
 #
 function execute_insert()
 {
-    {
-    cat <<EOL
+    ${CLICKHOUSE_CLIENT} --max_memory_usage=$TEST_01278_MEMORY --optimize_trivial_insert_select='false' "$@" -q "
 insert into data_01278 select
     number,
     reinterpretAsString(number), // s1
@@ -76,18 +76,24 @@ insert into data_01278 select
     reinterpretAsString(number), // s6
     reinterpretAsString(number), // s7
     reinterpretAsString(number)  // s8
-from numbers(100000); -- { serverError 241; }
-EOL
-    } | {
-        execute --max_memory_usage=$TEST_01278_MEMORY --optimize_trivial_insert_select='false' "$@"
-    }
-    echo 'select count() from out_01278' | execute
+from numbers(100000); -- { serverError 241; }" > /dev/null 2>&1
+    local ret_code=$?
+    if [[ $ret_code -eq 0 ]];
+    then
+      echo "    OK"
+    else
+      echo "    KO($ret_code)"
+    fi
 }
 
 # fails
+echo "Should throw 1"
 execute_insert --testmode
+echo "Should throw 2"
 execute_insert --testmode --min_insert_block_size_rows=1 --min_insert_block_size_rows_for_materialized_views=$((1<<20))
 
 # passes
+echo "Should pass 1"
 execute_insert --min_insert_block_size_rows=1
+echo "Should pass 2"
 execute_insert --min_insert_block_size_rows_for_materialized_views=1
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 37a8bfcc643..7bd7fb8d74a 100644
--- a/tests/queries/0_stateless/01280_min_map_max_map.reference
+++ b/tests/queries/0_stateless/01280_min_map_max_map.reference
@@ -1,9 +1,9 @@
 ([0,1,2,3,4,5,6,7,8,9,10],[10,1,1,1,1,1,1,1,1,1,1])	Tuple(Array(Int32), Array(UInt64))
 ([1],[-49])
-([1.00],[-49.00])
+([1],[-49])
 ([0,1,2,3,4,5,6,7,8,9,10],[100,91,92,93,94,95,96,97,98,99,1])	Tuple(Array(Int32), Array(UInt64))
 ([1],[50])
-([1.00],[50.00])
+([1],[50])
 (['01234567-89ab-cdef-0123-456789abcdef'],['01111111-89ab-cdef-0123-456789abcdef'])
 (['1'],['1'])
 (['1'],['1'])
diff --git a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
index ff62b70c184..d5cae099f36 100755
--- a/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
+++ b/tests/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -122,3 +123,5 @@ $CLICKHOUSE_CLIENT -n --query="DROP DICTIONARY 01280_db.ssd_dict;
     SELECT arrayJoin([('1', toInt32(3)), ('2', toInt32(-1)), ('', toInt32(0)), ('', toInt32(0)), ('2', toInt32(-1)), ('1', toInt32(3))]) AS keys, dictGetInt32('01280_db.ssd_dict', 'b', keys);
     DROP DICTIONARY IF EXISTS database_for_dict.ssd_dict;
     DROP TABLE IF EXISTS database_for_dict.keys_table;"
+
+$CLICKHOUSE_CLIENT -n --query="DROP DATABASE IF EXISTS 01280_db;"
diff --git a/tests/queries/0_stateless/01280_ttl_where_group_by.sh b/tests/queries/0_stateless/01280_ttl_where_group_by.sh
index c9936ce7afd..aa6b33d5935 100755
--- a/tests/queries/0_stateless/01280_ttl_where_group_by.sh
+++ b/tests/queries/0_stateless/01280_ttl_where_group_by.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql b/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
index b273e065bcc..978b2bfcc10 100644
--- a/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
+++ b/tests/queries/0_stateless/01280_ttl_where_group_by_negative.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by x set y = max(y); -- { serverError 450}
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by b set y = max(y); -- { serverError 450}
 create table ttl_01280_error (a Int, b Int, x Int64, y Int64, d DateTime) engine = MergeTree order by (a, b) ttl d + interval 1 second group by a, b, x set y = max(y); -- { serverError 450}
diff --git a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
index 4667c76cb60..bf201187f45 100755
--- a/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
+++ b/tests/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel, no-fasttest
+# Tag no-fasttest: max_memory_usage_for_user can interfere another queries running concurrently
 
 # Regression for MemoryTracker that had been incorrectly accounted
 # (it was reset before deallocation)
diff --git a/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql b/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
index f5efb2b56d5..3b122fc0228 100644
--- a/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
+++ b/tests/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP TABLE IF EXISTS current_failed_query_metrics;
 DROP TABLE IF EXISTS to_insert;
 
diff --git a/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql b/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
index 36ad7b4506c..e9f2346233f 100644
--- a/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
+++ b/tests/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT 'a\_\c\l\i\c\k\h\o\u\s\e', 'a\\_\\c\\l\\i\\c\\k\\h\\o\\u\\s\\e';
 select 'aXb' like 'a_b', 'aXb' like 'a\_b', 'a_b' like 'a\_b', 'a_b' like 'a\\_b';
 SELECT match('Hello', '\w+'), match('Hello', '\\w+'), match('Hello', '\\\w+'), match('Hello', '\w\+'), match('Hello', 'w+');
diff --git a/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql b/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
index 09c043784bb..969bb0a126c 100644
--- a/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
+++ b/tests/queries/0_stateless/01288_shard_max_network_bandwidth.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- Limit to 10 MB/sec
 SET max_network_bandwidth = 10000000;
 
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 d6617bec5ce..8dcac23550d 100644
--- a/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
+++ b/tests/queries/0_stateless/01290_max_execution_speed_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET max_execution_speed = 1000000;
 SET timeout_before_checking_execution_speed = 0.001;
 SET max_block_size = 100;
diff --git a/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql b/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
index f0992f2e438..267f5585705 100644
--- a/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
+++ b/tests/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS data;
 DROP TABLE IF EXISTS dist;
 
diff --git a/tests/queries/0_stateless/01292_create_user.sql b/tests/queries/0_stateless/01292_create_user.sql
index c8d408147e9..a9582376825 100644
--- a/tests/queries/0_stateless/01292_create_user.sql
+++ b/tests/queries/0_stateless/01292_create_user.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP USER IF EXISTS u1_01292, u2_01292, u3_01292, u4_01292, u5_01292, u6_01292, u7_01292, u8_01292, u9_01292;
 DROP USER IF EXISTS u10_01292, u11_01292, u12_01292, u13_01292, u14_01292, u15_01292, u16_01292;
 DROP USER IF EXISTS u2_01292_renamed;
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
index 5e845754402..14ca38093bf 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
index c68b153d5d3..3abed6cae03 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index 6fcbf194614..aa27ef83f52 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -3,3 +3,5 @@ connect_timeout	Seconds	10
 connect_timeout_with_failover_ms	Milliseconds	2000
 connect_timeout_with_failover_secure_ms	Milliseconds	3000
 max_memory_usage	UInt64	10000000000
+max_untracked_memory	UInt64	1048576
+memory_profiler_step	UInt64	1048576
diff --git a/tests/queries/0_stateless/01293_system_distribution_queue.sql b/tests/queries/0_stateless/01293_system_distribution_queue.sql
index b16433029bf..34158fb081c 100644
--- a/tests/queries/0_stateless/01293_system_distribution_queue.sql
+++ b/tests/queries/0_stateless/01293_system_distribution_queue.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists null_01293;
 drop table if exists dist_01293;
 
diff --git a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
index f5a4a1adac0..3c11dc5f772 100755
--- a/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
+++ b/tests/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -101,14 +102,12 @@ timeout $TIMEOUT bash -c test_func 2> /dev/null &
 wait
 sleep 1
 
-${CLICKHOUSE_CLIENT} -n -q "
-    DROP TABLE IF EXISTS $CURR_DATABASE.log;
-    DROP TABLE IF EXISTS $CURR_DATABASE.slog;
-    DROP TABLE IF EXISTS $CURR_DATABASE.tlog;
-    DROP TABLE IF EXISTS $CURR_DATABASE.tlog2;
-"
+for table in log tlog slog tlog2; do
+    $CLICKHOUSE_CLIENT -q "SYSTEM STOP TTL MERGES $CURR_DATABASE.$table" >& /dev/null
+  ${CLICKHOUSE_CLIENT} -q "ATTACH TABLE $CURR_DATABASE.$table;" 2>/dev/null
+done
+
+${CLICKHOUSE_CLIENT} -q "DROP DATABASE $CURR_DATABASE"
 
-$CLICKHOUSE_CLIENT -q "SYSTEM START TTL MERGES";
 echo "Test OK"
 
-# TODO: doesn't work! $CLICKHOUSE_CLIENT -q "DROP DATABASE $CURR_DATABASE"
diff --git a/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql b/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
index 525974e78ba..5c2636d7a68 100644
--- a/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
+++ b/tests/queries/0_stateless/01294_system_distributed_on_cluster.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 -- just a smoke test
 
 -- quirk for ON CLUSTER does not uses currentDatabase()
@@ -11,11 +13,9 @@ create table db_01294.dist_01294 as system.one engine=Distributed(test_shard_loc
 system flush distributed db_01294.dist_01294;
 system flush distributed on cluster test_shard_localhost db_01294.dist_01294;
 -- stop
-system stop distributed sends;
 system stop distributed sends db_01294.dist_01294;
 system stop distributed sends on cluster test_shard_localhost db_01294.dist_01294;
 -- start
-system start distributed sends;
 system start distributed sends db_01294.dist_01294;
 system start distributed sends on cluster test_shard_localhost db_01294.dist_01294;
 
diff --git a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
index fca570b5651..c1e8068075b 100644
--- a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
+++ b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP ROW POLICY IF EXISTS p1_01296, p2_01296, p3_01296, p4_01296, p5_01296 ON db_01296.table;
 DROP ROW POLICY IF EXISTS p3_01296, p5_01296 ON db_01296.table2;
 DROP DATABASE IF EXISTS db_01296;
diff --git a/tests/queries/0_stateless/01297_alter_distributed.sql b/tests/queries/0_stateless/01297_alter_distributed.sql
index d5359cc5ea8..cec64278d47 100644
--- a/tests/queries/0_stateless/01297_alter_distributed.sql
+++ b/tests/queries/0_stateless/01297_alter_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists merge_distributed;
 drop table if exists merge_distributed1;
 
diff --git a/tests/queries/0_stateless/01297_create_quota.sql b/tests/queries/0_stateless/01297_create_quota.sql
index 7d55b95601f..b30d453257a 100644
--- a/tests/queries/0_stateless/01297_create_quota.sql
+++ b/tests/queries/0_stateless/01297_create_quota.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP QUOTA IF EXISTS q1_01297, q2_01297, q3_01297, q4_01297, q5_01297, q6_01297, q7_01297, q8_01297, q9_01297, q10_01297;
 DROP QUOTA IF EXISTS q11_01297, q12_01297;
 DROP QUOTA IF EXISTS q2_01297_renamed;
diff --git a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
index 7fed383dc38..22d0c91e54d 100755
--- a/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
+++ b/tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: long, no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
@@ -27,7 +28,7 @@ close
 spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT"
 expect ":) "
 send -- "\[A"
-expect "SELECT 'for the history'"
+expect "for the history"
 
 # Will check that Ctrl+C clears current line.
 send -- "\3"
diff --git a/tests/queries/0_stateless/01300_read_wkt.sql b/tests/queries/0_stateless/01300_read_wkt.sql
index 8121bdf6084..1995c5153d7 100644
--- a/tests/queries/0_stateless/01300_read_wkt.sql
+++ b/tests/queries/0_stateless/01300_read_wkt.sql
@@ -1,14 +1,14 @@
-SELECT readWktPoint('POINT(0 0)');
-SELECT readWktPolygon('POLYGON((1 0,10 0,10 10,0 10,1 0))');
-SELECT readWktPolygon('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))');
-SELECT readWktMultiPolygon('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))');
+SELECT readWKTPoint('POINT(0 0)');
+SELECT readWKTPolygon('POLYGON((1 0,10 0,10 10,0 10,1 0))');
+SELECT readWKTPolygon('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))');
+SELECT readWKTMultiPolygon('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))');
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (s String, id Int) engine=Memory();
 INSERT INTO geo VALUES ('POINT(0 0)', 1);
 INSERT INTO geo VALUES ('POINT(1 0)', 2);
 INSERT INTO geo VALUES ('POINT(2 0)', 3);
-SELECT readWktPoint(s) FROM geo ORDER BY id;
+SELECT readWKTPoint(s) FROM geo ORDER BY id;
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (s String, id Int) engine=Memory();
@@ -18,13 +18,13 @@ INSERT INTO geo VALUES ('POLYGON((2 0,10 0,10 10,0 10,2 0))', 3);
 INSERT INTO geo VALUES ('POLYGON((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4))', 4);
 INSERT INTO geo VALUES ('POLYGON((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4))', 5);
 INSERT INTO geo VALUES ('POLYGON((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4 5,4 4))', 6);
-SELECT readWktPolygon(s) FROM geo ORDER BY id;
+SELECT readWKTPolygon(s) FROM geo ORDER BY id;
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (s String, id Int) engine=Memory();
 INSERT INTO geo VALUES ('MULTIPOLYGON(((1 0,10 0,10 10,0 10,1 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))', 1);
 INSERT INTO geo VALUES ('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))', 2);
 INSERT INTO geo VALUES ('MULTIPOLYGON(((2 0,10 0,10 10,0 10,2 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))', 3);
-SELECT readWktMultiPolygon(s) FROM geo ORDER BY id;
+SELECT readWKTMultiPolygon(s) FROM geo ORDER BY id;
 
 DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01300_svg.sql b/tests/queries/0_stateless/01300_svg.sql
index a1deb1745c3..cf794f2190b 100644
--- a/tests/queries/0_stateless/01300_svg.sql
+++ b/tests/queries/0_stateless/01300_svg.sql
@@ -1,50 +1,50 @@
-SELECT svg((0., 0.));
-SELECT svg([(0., 0.), (10, 0), (10, 10), (0, 10)]);
-SELECT svg([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]]);
-SELECT svg([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]]);
-SELECT svg((0., 0.), 'b');
-SELECT svg([(0., 0.), (10, 0), (10, 10), (0, 10)], 'b');
-SELECT svg([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], 'b');
-SELECT svg([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'b');
+SELECT SVG((0., 0.));
+SELECT SVG([(0., 0.), (10, 0), (10, 10), (0, 10)]);
+SELECT SVG([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]]);
+SELECT SVG([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]]);
+SELECT SVG((0., 0.), 'b');
+SELECT SVG([(0., 0.), (10, 0), (10, 10), (0, 10)], 'b');
+SELECT SVG([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], 'b');
+SELECT SVG([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'b');
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (p Tuple(Float64, Float64), s String, id Int) engine=Memory();
 INSERT INTO geo VALUES ((0., 0.), 'b', 1);
 INSERT INTO geo VALUES ((1., 0.), 'c', 2);
 INSERT INTO geo VALUES ((2., 0.), 'd', 3);
-SELECT svg(p) FROM geo ORDER BY id;
-SELECT svg(p, 'b') FROM geo ORDER BY id;
-SELECT svg((0., 0.), s) FROM geo ORDER BY id;
-SELECT svg(p, s) FROM geo ORDER BY id;
+SELECT SVG(p) FROM geo ORDER BY id;
+SELECT SVG(p, 'b') FROM geo ORDER BY id;
+SELECT SVG((0., 0.), s) FROM geo ORDER BY id;
+SELECT SVG(p, s) FROM geo ORDER BY id;
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (p Array(Tuple(Float64, Float64)), s String, id Int) engine=Memory();
 INSERT INTO geo VALUES ([(0., 0.), (10, 0), (10, 10), (0, 10)], 'b', 1);
 INSERT INTO geo VALUES ([(1., 0.), (10, 0), (10, 10), (0, 10)], 'c', 2);
 INSERT INTO geo VALUES ([(2., 0.), (10, 0), (10, 10), (0, 10)], 'd', 3);
-SELECT svg(p) FROM geo ORDER BY id;
-SELECT svg(p, 'b') FROM geo ORDER BY id;
-SELECT svg([(0., 0.), (10, 0), (10, 10), (0, 10)], s) FROM geo ORDER BY id;
-SELECT svg(p, s) FROM geo ORDER BY id;
+SELECT SVG(p) FROM geo ORDER BY id;
+SELECT SVG(p, 'b') FROM geo ORDER BY id;
+SELECT SVG([(0., 0.), (10, 0), (10, 10), (0, 10)], s) FROM geo ORDER BY id;
+SELECT SVG(p, s) FROM geo ORDER BY id;
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (p Array(Array(Tuple(Float64, Float64))), s String, id Int) engine=Memory();
 INSERT INTO geo VALUES ([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 'b', 1);
 INSERT INTO geo VALUES ([[(1., 0.), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 'c', 2);
 INSERT INTO geo VALUES ([[(2., 0.), (10, 0), (10, 10), (0, 10)], [(4, 4), (5, 4), (5, 5), (4, 5)]], 'd', 3);
-SELECT svg(p) FROM geo ORDER BY id;
-SELECT svg(p, 'b') FROM geo ORDER BY id;
-SELECT svg([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], s) FROM geo ORDER BY id;
-SELECT svg(p, s) FROM geo ORDER BY id;
+SELECT SVG(p) FROM geo ORDER BY id;
+SELECT SVG(p, 'b') FROM geo ORDER BY id;
+SELECT SVG([[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], s) FROM geo ORDER BY id;
+SELECT SVG(p, s) FROM geo ORDER BY id;
 
 DROP TABLE IF EXISTS geo;
 CREATE TABLE geo (p Array(Array(Array(Tuple(Float64, Float64)))), s String, id Int) engine=Memory();
 INSERT INTO geo VALUES ([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'b', 1);
 INSERT INTO geo VALUES ([[[(1., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'c', 2);
 INSERT INTO geo VALUES ([[[(2., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], 'd', 3);
-SELECT svg(p) FROM geo ORDER BY id;
-SELECT svg(p, 'b') FROM geo ORDER BY id;
-SELECT svg([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], s) FROM geo ORDER BY id;
-SELECT svg(p, s) FROM geo ORDER BY id;
+SELECT SVG(p) FROM geo ORDER BY id;
+SELECT SVG(p, 'b') FROM geo ORDER BY id;
+SELECT SVG([[[(0., 0.), (10, 0), (10, 10), (0, 10)], [(4., 4.), (5, 4), (5, 5), (4, 5)]], [[(-10., -10.), (-10, -9), (-9, 10)]]], s) FROM geo ORDER BY id;
+SELECT SVG(p, s) FROM geo ORDER BY id;
 
 DROP TABLE geo;
diff --git a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
index 65bf5de8333..010c66b9bb1 100755
--- a/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
index ed8a463cc62..7e10ab475d4 100755
--- a/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
+++ b/tests/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01304_direct_io_long.sh b/tests/queries/0_stateless/01304_direct_io_long.sh
index 7505173ddba..57638a7d0a6 100755
--- a/tests/queries/0_stateless/01304_direct_io_long.sh
+++ b/tests/queries/0_stateless/01304_direct_io_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
index 6248813c9ba..1d2d4516b9c 100755
--- a/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+++ b/tests/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -11,7 +12,7 @@ function thread()
     while true; do
         $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS test_table_$1 SYNC;
             CREATE TABLE test_table_$1 (a UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/alter_table', 'r_$1') ORDER BY tuple();" 2>&1 |
-                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time'
+                grep -vP '(^$)|(^Received exception from server)|(^\d+\. )|because the last replica of the table was dropped right now|is already started to be removing by another replica right now| were removed by another replica|Removing leftovers from table|Another replica was suddenly created|was created by another server at the same moment|was suddenly removed|some other replicas were created at the same time|^\(query: '
     done
 }
 
diff --git a/tests/queries/0_stateless/01306_benchmark_json.sh b/tests/queries/0_stateless/01306_benchmark_json.sh
index fed085abd96..ae361826250 100755
--- a/tests/queries/0_stateless/01306_benchmark_json.sh
+++ b/tests/queries/0_stateless/01306_benchmark_json.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql b/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
index 2daf199f82e..dffcf24684e 100644
--- a/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
+++ b/tests/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 set optimize_duplicate_order_by_and_distinct = 1;
 SET distributed_group_by_no_merge = 0;
 
diff --git a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
index 37ee5bf7ad7..2a41d90cd3a 100755
--- a/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
+++ b/tests/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01307_orc_output_format.reference b/tests/queries/0_stateless/01307_orc_output_format.reference
index da719072eb2..e185c02a3e5 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.0000000100	100000.00000000000001000000	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.1231231230	123123123.12312312312312300000	\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.4200	42.4242424200	424242.42424242424242000000	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.0000000100	100000.00000000000001000000	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.1231231230	123123123.12312312312312300000	\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.4200	42.4242424200	424242.42424242424242000000	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
+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
diff --git a/tests/queries/0_stateless/01307_orc_output_format.sh b/tests/queries/0_stateless/01307_orc_output_format.sh
index b5000bfd3fc..de6984ca74f 100755
--- a/tests/queries/0_stateless/01307_orc_output_format.sh
+++ b/tests/queries/0_stateless/01307_orc_output_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
index f24f62673ac..9d45c0a5add 100755
--- a/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
+++ b/tests/queries/0_stateless/01308_orc_output_format_arrays.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01318_alter_add_constraint_format.reference b/tests/queries/0_stateless/01318_alter_add_constraint_format.reference
index 9f58d161539..7a3b41536e0 100644
--- a/tests/queries/0_stateless/01318_alter_add_constraint_format.reference
+++ b/tests/queries/0_stateless/01318_alter_add_constraint_format.reference
@@ -1 +1,2 @@
-ALTER TABLE replicated_constraints1 ADD CONSTRAINT IF NOT EXISTS b_constraint CHECK b > 10
+ALTER TABLE replicated_constraints1
+    ADD CONSTRAINT IF NOT EXISTS b_constraint CHECK b > 10
diff --git a/tests/queries/0_stateless/01318_decrypt.sql b/tests/queries/0_stateless/01318_decrypt.sql
index b9a20acf4ac..fb0b934d7bf 100644
--- a/tests/queries/0_stateless/01318_decrypt.sql
+++ b/tests/queries/0_stateless/01318_decrypt.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 --- aes_decrypt_mysql(string, key, block_mode[, init_vector, AAD])
 -- The MySQL-compatitable encryption, only ecb, cbc, cfb128 and ofb modes are supported,
 -- just like for MySQL
diff --git a/tests/queries/0_stateless/01318_encrypt.sql b/tests/queries/0_stateless/01318_encrypt.sql
index 0e55a9a2aee..9a5e6fd0ed1 100644
--- a/tests/queries/0_stateless/01318_encrypt.sql
+++ b/tests/queries/0_stateless/01318_encrypt.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 --- aes_encrypt_mysql(string, key, block_mode[, init_vector, AAD])
 -- The MySQL-compatitable encryption, only ecb, cbc, cfb128 and ofb modes are supported,
 -- just like for MySQL
diff --git a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
index 13250e82079..9a4df37d206 100755
--- a/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+++ b/tests/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01318_map_add_map_subtract_on_map_type.reference b/tests/queries/0_stateless/01318_map_add_map_subtract_on_map_type.reference
index 96bafc2c79c..de34b856130 100644
--- a/tests/queries/0_stateless/01318_map_add_map_subtract_on_map_type.reference
+++ b/tests/queries/0_stateless/01318_map_add_map_subtract_on_map_type.reference
@@ -18,38 +18,38 @@
 {1:3,2:2,8:2}
 {1:3,2:2,9:2}
 {1:3,2:2,10:2}
-{1:2,2:2}	Map(UInt8,UInt64)
-{1:2,2:2}	Map(UInt16,UInt64)
-{1:2,2:2}	Map(UInt32,UInt64)
-{1:2,2:2}	Map(UInt64,UInt64)
-{1:2,2:2}	Map(UInt128,UInt128)
-{1:2,2:2}	Map(UInt256,UInt256)
-{1:2,2:2}	Map(Int16,UInt64)
-{1:2,2:2}	Map(Int16,Int64)
-{1:2,2:2}	Map(Int32,Int64)
-{1:2,2:2}	Map(Int64,Int64)
-{1:2,2:2}	Map(Int128,Int128)
-{1:2,2:2}	Map(Int256,Int256)
-{1:3.300000023841858,2:2}	Map(UInt8,Float64)
-{1:3.3000000000000003,2:2}	Map(UInt8,Float64)
+{1:2,2:2}	Map(UInt8, UInt64)
+{1:2,2:2}	Map(UInt16, UInt64)
+{1:2,2:2}	Map(UInt32, UInt64)
+{1:2,2:2}	Map(UInt64, UInt64)
+{1:2,2:2}	Map(UInt128, UInt128)
+{1:2,2:2}	Map(UInt256, UInt256)
+{1:2,2:2}	Map(Int16, UInt64)
+{1:2,2:2}	Map(Int16, Int64)
+{1:2,2:2}	Map(Int32, Int64)
+{1:2,2:2}	Map(Int64, Int64)
+{1:2,2:2}	Map(Int128, Int128)
+{1:2,2:2}	Map(Int256, Int256)
+{1:3.300000023841858,2:2}	Map(UInt8, Float64)
+{1:3.3000000000000003,2:2}	Map(UInt8, Float64)
 {'a':1,'b':2}
 {'a':1,'b':1,'c':1}
 {'a':1,'b':1,'d':1}
-{'a':1,'b':2}	Map(String,UInt64)
-{'a':1,'b':1,'c':1}	Map(String,UInt64)
-{'a':1,'b':1,'d':1}	Map(String,UInt64)
+{'a':1,'b':2}	Map(String, UInt64)
+{'a':1,'b':1,'c':1}	Map(String, UInt64)
+{'a':1,'b':1,'d':1}	Map(String, UInt64)
 {'a':1,'b':2}
 {'a':1,'b':1,'c':1}
 {'a':1,'b':1,'d':1}
-{'a':2}	Map(Enum16(\'a\' = 1, \'b\' = 2),Int64)
-{'b':2}	Map(Enum16(\'a\' = 1, \'b\' = 2),Int64)
-{'a':2}	Map(Enum8(\'a\' = 1, \'b\' = 2),Int64)
-{'b':2}	Map(Enum8(\'a\' = 1, \'b\' = 2),Int64)
-{'00000000-89ab-cdef-0123-456789abcdef':2}	Map(UUID,Int64)
-{'11111111-89ab-cdef-0123-456789abcdef':4}	Map(UUID,Int64)
-{1:0,2:0}	Map(UInt8,UInt64)
-{1:18446744073709551615,2:18446744073709551615}	Map(UInt8,UInt64)
-{1:-1,2:-1}	Map(UInt8,Int64)
-{1:-1.0999999761581423,2:0}	Map(UInt8,Float64)
-{1:-1,2:-1}	Map(UInt8,Int64)
-{1:-2,2:-2,3:1}	Map(UInt8,Int64)
+{'a':2}	Map(Enum16(\'a\' = 1, \'b\' = 2), Int64)
+{'b':2}	Map(Enum16(\'a\' = 1, \'b\' = 2), Int64)
+{'a':2}	Map(Enum8(\'a\' = 1, \'b\' = 2), Int64)
+{'b':2}	Map(Enum8(\'a\' = 1, \'b\' = 2), Int64)
+{'00000000-89ab-cdef-0123-456789abcdef':2}	Map(UUID, Int64)
+{'11111111-89ab-cdef-0123-456789abcdef':4}	Map(UUID, Int64)
+{1:0,2:0}	Map(UInt8, UInt64)
+{1:18446744073709551615,2:18446744073709551615}	Map(UInt8, UInt64)
+{1:-1,2:-1}	Map(UInt8, Int64)
+{1:-1.0999999761581423,2:0}	Map(UInt8, Float64)
+{1:-1,2:-1}	Map(UInt8, Int64)
+{1:-2,2:-2,3:1}	Map(UInt8, Int64)
diff --git a/tests/queries/0_stateless/01319_manual_write_to_replicas.reference b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01319_manual_write_to_replicas.reference
rename to tests/queries/0_stateless/01319_manual_write_to_replicas_long.reference
diff --git a/tests/queries/0_stateless/01319_manual_write_to_replicas.sql b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
similarity index 65%
rename from tests/queries/0_stateless/01319_manual_write_to_replicas.sql
rename to tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
index 5388f0017c0..e0c949b0878 100644
--- a/tests/queries/0_stateless/01319_manual_write_to_replicas.sql
+++ b/tests/queries/0_stateless/01319_manual_write_to_replicas_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS r1;
 DROP TABLE IF EXISTS r2;
 
-CREATE TABLE r1 (x String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/r', 'r1') ORDER BY x;
-CREATE TABLE r2 (x String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/r', 'r2') ORDER BY x;
+CREATE TABLE r1 (x String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/r', 'r1') ORDER BY x;
+CREATE TABLE r2 (x String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/r', 'r2') ORDER BY x;
 
-SYSTEM STOP REPLICATED SENDS;
+SYSTEM STOP REPLICATED SENDS r1;
+SYSTEM STOP REPLICATED SENDS r2;
 
 INSERT INTO r1 VALUES ('Hello, world');
 SELECT * FROM r1;
@@ -14,7 +17,8 @@ SELECT '---';
 SELECT * FROM r1;
 SELECT * FROM r2;
 
-SYSTEM START REPLICATED SENDS;
+SYSTEM START REPLICATED SENDS r1;
+SYSTEM START REPLICATED SENDS r2;
 SYSTEM SYNC REPLICA r1;
 SYSTEM SYNC REPLICA r2;
 
diff --git a/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql b/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
index 4f7d6b81002..f056b87cc8a 100644
--- a/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
+++ b/tests/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists data_01319;
 drop table if exists dist_01319;
 drop table if exists dist_layer_01319;
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index 678a3aa12fe..758ec4825e0 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql b/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
index f827bb733b4..1cb36e1441d 100644
--- a/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
+++ b/tests/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists data_01320;
 drop table if exists dist_01320;
 
diff --git a/tests/queries/0_stateless/01324_if_transform_strings_to_enum.reference b/tests/queries/0_stateless/01324_if_transform_strings_to_enum.reference
index 99298d28bad..994e3f24aaf 100644
--- a/tests/queries/0_stateless/01324_if_transform_strings_to_enum.reference
+++ b/tests/queries/0_stateless/01324_if_transform_strings_to_enum.reference
@@ -8,7 +8,7 @@ yahoo
 other
 other
 other
-SELECT transform(number, [2, 4, 6], CAST([\'google\', \'yandex\', \'yahoo\'], \'Array(Enum8(\\\'google\\\' = 1, \\\'other\\\' = 2, \\\'yahoo\\\' = 3, \\\'yandex\\\' = 4))\'), CAST(\'other\', \'Enum8(\\\'google\\\' = 1, \\\'other\\\' = 2, \\\'yahoo\\\' = 3, \\\'yandex\\\' = 4)\'))
+SELECT transform(number, [2, 4, 6], _CAST([\'google\', \'yandex\', \'yahoo\'], \'Array(Enum8(\\\'google\\\' = 1, \\\'other\\\' = 2, \\\'yahoo\\\' = 3, \\\'yandex\\\' = 4))\'), _CAST(\'other\', \'Enum8(\\\'google\\\' = 1, \\\'other\\\' = 2, \\\'yahoo\\\' = 3, \\\'yandex\\\' = 4)\'))
 FROM system.numbers
 LIMIT 10
 google
diff --git a/tests/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.reference b/tests/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.reference
index 6006f9981b4..5a96c81b0a8 100644
--- a/tests/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.reference
+++ b/tests/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.reference
@@ -1,12 +1,12 @@
-1.10000
+1.1
 1.12345
 1.12345
 1.12345
 1.12345
 1.12345
-12345.10000
-123456789123.10000
-1234567891234.10000
+12345.1
+123456789123.1
+1234567891234.1
 1234567891234.12345
 1.12345
 1.12345
diff --git a/tests/queries/0_stateless/01337_mysql_global_variables.sql b/tests/queries/0_stateless/01337_mysql_global_variables.sql
index b5b982d2852..d76baa85bc5 100644
--- a/tests/queries/0_stateless/01337_mysql_global_variables.sql
+++ b/tests/queries/0_stateless/01337_mysql_global_variables.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-fasttest
+
 SELECT @@test;
 SELECT @@max_allowed_packet FORMAT CSVWithNames;
 SELECT @@MAX_ALLOWED_PACKET FORMAT CSVWithNames;
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter.sh b/tests/queries/0_stateless/01338_long_select_and_alter.sh
index 499b62564bd..2e3080e9cfc 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
index 4aeecc7343d..12bc3b09472 100755
--- a/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
+++ b/tests/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01338_sha256_fixedstring.sql b/tests/queries/0_stateless/01338_sha256_fixedstring.sql
index 8d34e59f344..bf66b03ec55 100644
--- a/tests/queries/0_stateless/01338_sha256_fixedstring.sql
+++ b/tests/queries/0_stateless/01338_sha256_fixedstring.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT hex(SHA256(''));
 SELECT hex(SHA256('abc'));
 
diff --git a/tests/queries/0_stateless/01339_client_unrecognized_option.sh b/tests/queries/0_stateless/01339_client_unrecognized_option.sh
index f590ed3807e..00c153ec915 100755
--- a/tests/queries/0_stateless/01339_client_unrecognized_option.sh
+++ b/tests/queries/0_stateless/01339_client_unrecognized_option.sh
@@ -1,17 +1,18 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT xyzgarbage 2>&1 | grep -q "Code: 552" && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT xyzgarbage 2>&1 | grep -q "BAD_ARGUMENTS" && echo 'OK' || echo 'FAIL'
 
-$CLICKHOUSE_CLIENT -xyzgarbage 2>&1 | grep -q "Bad arguments" && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT -xyzgarbage 2>&1 | grep -q "UNRECOGNIZED_ARGUMENTS" && echo 'OK' || echo 'FAIL'
 
-$CLICKHOUSE_CLIENT --xyzgarbage 2>&1 | grep -q "Bad arguments" && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT --xyzgarbage 2>&1 | grep -q "UNRECOGNIZED_ARGUMENTS" && echo 'OK' || echo 'FAIL'
 
-cat /etc/passwd | sed 's/:/\t/g' | $CLICKHOUSE_CLIENT --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String' xyzgarbage 2>&1 | grep -q "Code: 552" && echo 'OK' || echo 'FAIL'
+cat /etc/passwd | sed 's/:/\t/g' | $CLICKHOUSE_CLIENT --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String' xyzgarbage 2>&1 | grep -q "BAD_ARGUMENTS" && echo 'OK' || echo 'FAIL'
 
-cat /etc/passwd | sed 's/:/\t/g' | $CLICKHOUSE_CLIENT --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external -xyzgarbage --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String' 2>&1 | grep -q "Bad arguments" && echo 'OK' || echo 'FAIL'
+cat /etc/passwd | sed 's/:/\t/g' | $CLICKHOUSE_CLIENT --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external -xyzgarbage --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String' 2>&1 | grep -q "UNRECOGNIZED_ARGUMENTS" && echo 'OK' || echo 'FAIL'
 
-cat /etc/passwd | sed 's/:/\t/g' | $CLICKHOUSE_CLIENT --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external --xyzgarbage --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String' 2>&1 | grep -q "Bad arguments" && echo 'OK' || echo 'FAIL'
+cat /etc/passwd | sed 's/:/\t/g' | $CLICKHOUSE_CLIENT --query="SELECT shell, count() AS c FROM passwd GROUP BY shell ORDER BY c DESC" --external --xyzgarbage --file=- --name=passwd --structure='login String, unused String, uid UInt16, gid UInt16, comment String, home String, shell String' 2>&1 | grep -q "UNRECOGNIZED_ARGUMENTS" && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
index cbcb5c643fe..c8c49ea8c58 100644
--- a/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
+++ b/tests/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS test_01343;
 CREATE TABLE test_01343 (x String) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
 INSERT INTO test_01343 VALUES ('Hello, world');
 
-SET min_bytes_to_use_mmap_io = 1;
+SET local_filesystem_read_method = 'mmap', min_bytes_to_use_mmap_io = 1;
 SELECT * FROM test_01343;
 
 SYSTEM FLUSH LOGS;
diff --git a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
index 3d148527270..7805ecea392 100644
--- a/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
+++ b/tests/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS test_01344;
 CREATE TABLE test_01344 (x String, INDEX idx (x) TYPE set(10) GRANULARITY 1) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
 INSERT INTO test_01344 VALUES ('Hello, world');
 
-SET min_bytes_to_use_mmap_io = 1;
+SET local_filesystem_read_method = 'mmap', min_bytes_to_use_mmap_io = 1;
 SELECT * FROM test_01344 WHERE x = 'Hello, world';
 
 SYSTEM FLUSH LOGS;
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.reference b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.reference
rename to tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
similarity index 91%
rename from tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql
rename to tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
index d185973f564..8bf5d4f2cf8 100644
--- a/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql
+++ b/tests/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
@@ -1,8 +1,10 @@
+-- Tags: long, replica
+
 DROP TABLE IF EXISTS test;
 DROP TABLE IF EXISTS test2;
 
-CREATE TABLE test (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01346/table', 'r1') PARTITION BY x ORDER BY y;
-CREATE TABLE test2 (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/test_01346/table', 'r2') PARTITION BY x ORDER BY y;
+CREATE TABLE test (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01346/table', 'r1') PARTITION BY x ORDER BY y;
+CREATE TABLE test2 (x Enum('hello' = 1, 'world' = 2), y String) ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01346/table', 'r2') PARTITION BY x ORDER BY y;
 INSERT INTO test VALUES ('hello', 'test');
 
 SELECT * FROM test;
diff --git a/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql b/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
index d9b596f3ec3..132bbb74a00 100644
--- a/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
+++ b/tests/queries/0_stateless/01354_order_by_tuple_collate_const.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT number FROM numbers(11) ORDER BY arrayJoin(['а', 'я', '\0�', '', 'Я', '']) ASC, toString(number) ASC, 'y' ASC COLLATE 'el';
diff --git a/tests/queries/0_stateless/01355_alter_column_with_order.sql b/tests/queries/0_stateless/01355_alter_column_with_order.sql
index b3ae8f43042..c0c85e389ea 100644
--- a/tests/queries/0_stateless/01355_alter_column_with_order.sql
+++ b/tests/queries/0_stateless/01355_alter_column_with_order.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS alter_test;
 
 CREATE TABLE alter_test (CounterID UInt32, StartDate Date, UserID UInt32, VisitID UInt32, NestedColumn Nested(A UInt8, S String), ToDrop UInt32) ENGINE = MergeTree(StartDate, intHash32(UserID), (CounterID, StartDate, intHash32(UserID), VisitID), 8192);
diff --git a/tests/queries/0_stateless/01355_ilike.sql b/tests/queries/0_stateless/01355_ilike.sql
index 6f08be2dab2..6bde62bf47e 100644
--- a/tests/queries/0_stateless/01355_ilike.sql
+++ b/tests/queries/0_stateless/01355_ilike.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 SELECT 'Hello' ILIKE '';
 SELECT 'Hello' ILIKE '%';
 SELECT 'Hello' ILIKE '%%';
diff --git a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
index d8249a603ff..0b968440370 100644
--- a/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
+++ b/tests/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS versioned_collapsing_table;
 
 CREATE TABLE versioned_collapsing_table(
diff --git a/tests/queries/0_stateless/01358_lc_parquet.sh b/tests/queries/0_stateless/01358_lc_parquet.sh
index 3c49adc6185..886fe4538d1 100755
--- a/tests/queries/0_stateless/01358_lc_parquet.sh
+++ b/tests/queries/0_stateless/01358_lc_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
index 5f4855c6119..1b22082bd83 100644
--- a/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
+++ b/tests/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS slow_log;
 DROP TABLE IF EXISTS expected_times;
 
diff --git a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
index e0d01d905bb..472106bc4a5 100755
--- a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
+++ b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql b/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql
index 4153dc632f3..55c9d3f63d3 100644
--- a/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql
+++ b/tests/queries/0_stateless/01372_remote_table_function_empty_table.sql
@@ -1,4 +1,4 @@
-SELECT * FROM remote('127..2', 'a.'); -- { serverError 36 }
+SELECT * FROM remote('127..2', 'a.'); -- { serverError 62 }
 
 -- Clear cache to avoid future errors in the logs
 SYSTEM DROP DNS CACHE
diff --git a/tests/queries/0_stateless/01375_compact_parts_codecs.sql b/tests/queries/0_stateless/01375_compact_parts_codecs.sql
index 698f4148a15..35f125515a2 100644
--- a/tests/queries/0_stateless/01375_compact_parts_codecs.sql
+++ b/tests/queries/0_stateless/01375_compact_parts_codecs.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS codecs;
 
 CREATE TABLE codecs (id UInt32, val UInt32, s String) 
diff --git a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
index 56f81eb36ec..258d96829a5 100644
--- a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
+++ b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- https://github.com/ClickHouse/ClickHouse/issues/11469
 SELECT dictGet('default.countryId', 'country', toUInt64(number)) AS country FROM numbers(2) GROUP BY country; -- { serverError 36; }
 
diff --git a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
index 0cd6feb9da1..b6982910ace 100644
--- a/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
+++ b/tests/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_rename_with_ttl;
 
 CREATE TABLE table_rename_with_ttl
@@ -5,7 +7,7 @@ CREATE TABLE table_rename_with_ttl
   date1 Date,
   value1 String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/test/table_rename_with_ttl_01378', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test/table_rename_with_ttl_01378', '1')
 ORDER BY tuple();
 
 INSERT INTO table_rename_with_ttl SELECT toDate('2018-10-01') + number % 3, toString(number) from numbers(9);
diff --git a/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql b/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
index bdfeba665d7..de552b7b27f 100644
--- a/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
+++ b/tests/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 DROP DATABASE IF EXISTS test_01383;
 CREATE DATABASE test_01383;
 
diff --git a/tests/queries/0_stateless/01388_clear_all_columns.sql b/tests/queries/0_stateless/01388_clear_all_columns.sql
index 269c6eee824..c1f59efba83 100644
--- a/tests/queries/0_stateless/01388_clear_all_columns.sql
+++ b/tests/queries/0_stateless/01388_clear_all_columns.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY tuple();
 INSERT INTO test (x) VALUES (1), (2), (3);
diff --git a/tests/queries/0_stateless/01391_join_on_dict_crash.sql b/tests/queries/0_stateless/01391_join_on_dict_crash.sql
index 0f26359796d..ac3ca94ddf6 100644
--- a/tests/queries/0_stateless/01391_join_on_dict_crash.sql
+++ b/tests/queries/0_stateless/01391_join_on_dict_crash.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_01391;
 CREATE DATABASE db_01391;
 USE db_01391;
diff --git a/tests/queries/0_stateless/01392_column_resolve.sql b/tests/queries/0_stateless/01392_column_resolve.sql
index 728ccfd0728..72b6af4576a 100644
--- a/tests/queries/0_stateless/01392_column_resolve.sql
+++ b/tests/queries/0_stateless/01392_column_resolve.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01392;
 CREATE DATABASE test_01392;
 
diff --git a/tests/queries/0_stateless/01393_benchmark_secure_port.sh b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
index 6928041da14..f75577e6ddf 100755
--- a/tests/queries/0_stateless/01393_benchmark_secure_port.sh
+++ b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
index 693580bc270..411705e0469 100755
--- a/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
+++ b/tests/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-debug, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql b/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
index aa8e8be6673..3b53e593095 100644
--- a/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
+++ b/tests/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
@@ -1,3 +1,5 @@
+SET cast_keep_nullable = 0;
+
 -- https://github.com/ClickHouse/ClickHouse/issues/5818#issuecomment-619628445
 SELECT CAST(CAST(NULL AS Nullable(String)) AS Nullable(Enum8('Hello' = 1)));
 SELECT CAST(CAST(NULL AS Nullable(FixedString(1))) AS Nullable(Enum8('Hello' = 1)));
diff --git a/tests/queries/0_stateless/01410_nullable_key_and_index_negate_cond.reference b/tests/queries/0_stateless/01410_nullable_key_and_index_negate_cond.reference
new file mode 100644
index 00000000000..9bd4af1986f
--- /dev/null
+++ b/tests/queries/0_stateless/01410_nullable_key_and_index_negate_cond.reference
@@ -0,0 +1,16 @@
+---Q1---
+s	s	s
+---Q2---
+s	s	s
+---Q3---
+s	s	s
+---Q4---
+s	s	s
+\N	s1	s1
+\N	\N	s2
+---Q5---
+---Q6---
+---Q7---
+---Q8---
+s	s	s
+---Q9---
diff --git a/tests/queries/0_stateless/01410_nullable_key_and_index_negate_cond.sql b/tests/queries/0_stateless/01410_nullable_key_and_index_negate_cond.sql
new file mode 100644
index 00000000000..0a1e3464596
--- /dev/null
+++ b/tests/queries/0_stateless/01410_nullable_key_and_index_negate_cond.sql
@@ -0,0 +1,40 @@
+drop table if exists test_23634;
+
+set force_primary_key=1;
+
+CREATE TABLE test_23634 (id Nullable(String), s Nullable(String), s1 Nullable(String))
+ENGINE = MergeTree() ORDER BY (id,s) SETTINGS allow_nullable_key = 1;
+
+INSERT into test_23634 values ('s','s','s'), (null,'s1','s1'), (null,null,'s2'), (null,null,null);
+
+select '---Q1---';
+select * from test_23634 where id !='';
+
+select '---Q2---';
+select * from test_23634 where id !='' and s != '';
+
+select '---Q3---';
+select * from test_23634 where id !='' and s != '' and s1 != '';
+
+set force_primary_key=0;
+
+select '---Q4---';
+select * from test_23634 where (id, s, s1) != ('', '', '') order by id, s1, s1;
+
+select '---Q5---';
+select * from test_23634 where (id, s, s1) = ('', '', '') order by id, s1, s1;
+
+select '---Q6---';
+select * from test_23634 where (id, s, s1) = ('', '', 's2') order by id, s1, s1;
+
+select '---Q7---';
+select * from test_23634 where (id, s, s1) = ('', 's1', 's1') order by id, s1, s1;
+
+select '---Q8---';
+select * from test_23634 where (id, s, s1) = ('s', 's', 's') order by id, s1, s1;
+
+select '---Q9---';
+select * from test_23634 where (id, s, s1) = (null::Nullable(String), null::Nullable(String), null::Nullable(String)) order by id, s1, s1;
+
+drop table test_23634;
+
diff --git a/tests/queries/0_stateless/01411_bayesian_ab_testing.sql b/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
deleted file mode 100644
index e162c3a8e1a..00000000000
--- a/tests/queries/0_stateless/01411_bayesian_ab_testing.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT count() FROM (SELECT bayesAB('beta', 1, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
-SELECT count() FROM (SELECT bayesAB('gamma', 1, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
-SELECT count() FROM (SELECT bayesAB('beta', 0, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
-SELECT count() FROM (SELECT bayesAB('gamma', 0, ['Control', 'A', 'B'], [3000.0, 3000.0, 2000.0], [1000.0, 1100.0, 800.0]));
diff --git a/tests/queries/0_stateless/01412_cache_dictionary_race.sh b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
index 587cec52932..165a461193d 100755
--- a/tests/queries/0_stateless/01412_cache_dictionary_race.sh
+++ b/tests/queries/0_stateless/01412_cache_dictionary_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01412_group_array_moving_shard.reference b/tests/queries/0_stateless/01412_group_array_moving_shard.reference
index 603951ee3d4..866971435e2 100644
--- a/tests/queries/0_stateless/01412_group_array_moving_shard.reference
+++ b/tests/queries/0_stateless/01412_group_array_moving_shard.reference
@@ -3,20 +3,20 @@
 [-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-18,-19,-20,-21,-22,-23,-24,-25,-26,-27,-28,-29,-30,-31,-32,-33,-34,-35,-36,-37,-38,-39,-40,-41,-42,-43,-44,-45,-46,-47,-48,-49,-50,-51,-52,-53,-54,-55,-56,-57,-58,-59,-60,-61,-62,-63,-64,-65,-66,-67,-68,-69,-70,-71,-72,-73,-74,-75,-76,-77,-78,-79,-80,-81,-82,-83,-84,-85,-86,-87,-88,-89,-90,-91,-92,-93,-94,-95,-96,-97,-98,-99,-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,-110,-111,-112,-113,-114,-115,-116,-117,-118,-119,-120,-121,-122,-123,-124,-125,-126,-127,-128,-129,-130,-131,-132,-133,-134,-135,-136,-137,-138,-139,-140,-141,-142,-143,-144,-145,-146,-147,-148,-149,-150,-151,-152,-153,-154,-155,-156,-157,-158,-159,-160,-161,-162,-163,-164,-165,-166,-167,-168,-169,-170,-171,-172,-173,-174,-175,-176,-177,-178,-179,-180,-181,-182,-183,-184,-185,-186,-187,-188,-189,-190,-191,-192,-193,-194,-195,-196,-197,-198,-199,-200,-201,-202,-203,-204,-205,-206,-207,-208,-209,-210,-211,-212,-213,-214,-215,-216,-217,-218,-219,-220,-221,-222,-223,-224,-225,-226,-227,-228,-229,-230,-231,-232,-233,-234,-235,-236,-237,-238,-239,-240,-241,-242,-243,-244,-245,-246,-247,-248,-249,-250,-251,-252,-253,-254,-255,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256]
 [-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-18,-19,-20,-21,-22,-23,-24,-25,-26,-27,-28,-29,-30,-31,-32,-33,-34,-35,-36,-37,-38,-39,-40,-41,-42,-43,-44,-45,-46,-47,-48,-49,-50,-51,-52,-53,-54,-55,-56,-57,-58,-59,-60,-61,-62,-63,-64,-65,-66,-67,-68,-69,-70,-71,-72,-73,-74,-75,-76,-77,-78,-79,-80,-81,-82,-83,-84,-85,-86,-87,-88,-89,-90,-91,-92,-93,-94,-95,-96,-97,-98,-99,-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,-110,-111,-112,-113,-114,-115,-116,-117,-118,-119,-120,-121,-122,-123,-124,-125,-126,-127,-128,-129,-130,-131,-132,-133,-134,-135,-136,-137,-138,-139,-140,-141,-142,-143,-144,-145,-146,-147,-148,-149,-150,-151,-152,-153,-154,-155,-156,-157,-158,-159,-160,-161,-162,-163,-164,-165,-166,-167,-168,-169,-170,-171,-172,-173,-174,-175,-176,-177,-178,-179,-180,-181,-182,-183,-184,-185,-186,-187,-188,-189,-190,-191,-192,-193,-194,-195,-196,-197,-198,-199,-200,-201,-202,-203,-204,-205,-206,-207,-208,-209,-210,-211,-212,-213,-214,-215,-216,-217,-218,-219,-220,-221,-222,-223,-224,-225,-226,-227,-228,-229,-230,-231,-232,-233,-234,-235,-236,-237,-238,-239,-240,-241,-242,-243,-244,-245,-246,-247,-248,-249,-250,-251,-252,-253,-254,-255,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256]
 [0.00390625,0.0078125,0.01171875,0.015625,0.01953125,0.0234375,0.02734375,0.03125,0.03515625,0.0390625,0.04296875,0.046875,0.05078125,0.0546875,0.05859375,0.0625,0.06640625,0.0703125,0.07421875,0.078125,0.08203125,0.0859375,0.08984375,0.09375,0.09765625,0.1015625,0.10546875,0.109375,0.11328125,0.1171875,0.12109375,0.125,0.12890625,0.1328125,0.13671875,0.140625,0.14453125,0.1484375,0.15234375,0.15625,0.16015625,0.1640625,0.16796875,0.171875,0.17578125,0.1796875,0.18359375,0.1875,0.19140625,0.1953125,0.19921875,0.203125,0.20703125,0.2109375,0.21484375,0.21875,0.22265625,0.2265625,0.23046875,0.234375,0.23828125,0.2421875,0.24609375,0.25,0.25390625,0.2578125,0.26171875,0.265625,0.26953125,0.2734375,0.27734375,0.28125,0.28515625,0.2890625,0.29296875,0.296875,0.30078125,0.3046875,0.30859375,0.3125,0.31640625,0.3203125,0.32421875,0.328125,0.33203125,0.3359375,0.33984375,0.34375,0.34765625,0.3515625,0.35546875,0.359375,0.36328125,0.3671875,0.37109375,0.375,0.37890625,0.3828125,0.38671875,0.390625,0.39453125,0.3984375,0.40234375,0.40625,0.41015625,0.4140625,0.41796875,0.421875,0.42578125,0.4296875,0.43359375,0.4375,0.44140625,0.4453125,0.44921875,0.453125,0.45703125,0.4609375,0.46484375,0.46875,0.47265625,0.4765625,0.48046875,0.484375,0.48828125,0.4921875,0.49609375,0.5,0.50390625,0.5078125,0.51171875,0.515625,0.51953125,0.5234375,0.52734375,0.53125,0.53515625,0.5390625,0.54296875,0.546875,0.55078125,0.5546875,0.55859375,0.5625,0.56640625,0.5703125,0.57421875,0.578125,0.58203125,0.5859375,0.58984375,0.59375,0.59765625,0.6015625,0.60546875,0.609375,0.61328125,0.6171875,0.62109375,0.625,0.62890625,0.6328125,0.63671875,0.640625,0.64453125,0.6484375,0.65234375,0.65625,0.66015625,0.6640625,0.66796875,0.671875,0.67578125,0.6796875,0.68359375,0.6875,0.69140625,0.6953125,0.69921875,0.703125,0.70703125,0.7109375,0.71484375,0.71875,0.72265625,0.7265625,0.73046875,0.734375,0.73828125,0.7421875,0.74609375,0.75,0.75390625,0.7578125,0.76171875,0.765625,0.76953125,0.7734375,0.77734375,0.78125,0.78515625,0.7890625,0.79296875,0.796875,0.80078125,0.8046875,0.80859375,0.8125,0.81640625,0.8203125,0.82421875,0.828125,0.83203125,0.8359375,0.83984375,0.84375,0.84765625,0.8515625,0.85546875,0.859375,0.86328125,0.8671875,0.87109375,0.875,0.87890625,0.8828125,0.88671875,0.890625,0.89453125,0.8984375,0.90234375,0.90625,0.91015625,0.9140625,0.91796875,0.921875,0.92578125,0.9296875,0.93359375,0.9375,0.94140625,0.9453125,0.94921875,0.953125,0.95703125,0.9609375,0.96484375,0.96875,0.97265625,0.9765625,0.98046875,0.984375,0.98828125,0.9921875,0.99609375,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
-[100000000.0,200000000.0,300000000.0,400000000.0,500000000.0,600000000.0,700000000.0,800000000.0,900000000.0,1000000000.0,1100000000.0,1200000000.0,1300000000.0,1400000000.0,1500000000.0,1600000000.0,1700000000.0,1800000000.0,1900000000.0,2000000000.0,2100000000.0,2200000000.0,2300000000.0,2400000000.0,2500000000.0,2600000000.0,2700000000.0,2800000000.0,2900000000.0,3000000000.0,3100000000.0,3200000000.0,3300000000.0,3400000000.0,3500000000.0,3600000000.0,3700000000.0,3800000000.0,3900000000.0,4000000000.0,4100000000.0,4200000000.0,4300000000.0,4400000000.0,4500000000.0,4600000000.0,4700000000.0,4800000000.0,4900000000.0,5000000000.0,5100000000.0,5200000000.0,5300000000.0,5400000000.0,5500000000.0,5600000000.0,5700000000.0,5800000000.0,5900000000.0,6000000000.0,6100000000.0,6200000000.0,6300000000.0,6400000000.0,6500000000.0,6600000000.0,6700000000.0,6800000000.0,6900000000.0,7000000000.0,7100000000.0,7200000000.0,7300000000.0,7400000000.0,7500000000.0,7600000000.0,7700000000.0,7800000000.0,7900000000.0,8000000000.0,8100000000.0,8200000000.0,8300000000.0,8400000000.0,8500000000.0,8600000000.0,8700000000.0,8800000000.0,8900000000.0,9000000000.0,9100000000.0,9200000000.0,9300000000.0,9400000000.0,9500000000.0,9600000000.0,9700000000.0,9800000000.0,9900000000.0,10000000000.0,10100000000.0,10200000000.0,10300000000.0,10400000000.0,10500000000.0,10600000000.0,10700000000.0,10800000000.0,10900000000.0,11000000000.0,11100000000.0,11200000000.0,11300000000.0,11400000000.0,11500000000.0,11600000000.0,11700000000.0,11800000000.0,11900000000.0,12000000000.0,12100000000.0,12200000000.0,12300000000.0,12400000000.0,12500000000.0,12600000000.0,12700000000.0,12800000000.0,12900000000.0,13000000000.0,13100000000.0,13200000000.0,13300000000.0,13400000000.0,13500000000.0,13600000000.0,13700000000.0,13800000000.0,13900000000.0,14000000000.0,14100000000.0,14200000000.0,14300000000.0,14400000000.0,14500000000.0,14600000000.0,14700000000.0,14800000000.0,14900000000.0,15000000000.0,15100000000.0,15200000000.0,15300000000.0,15400000000.0,15500000000.0,15600000000.0,15700000000.0,15800000000.0,15900000000.0,16000000000.0,16100000000.0,16200000000.0,16300000000.0,16400000000.0,16500000000.0,16600000000.0,16700000000.0,16800000000.0,16900000000.0,17000000000.0,17100000000.0,17200000000.0,17300000000.0,17400000000.0,17500000000.0,17600000000.0,17700000000.0,17800000000.0,17900000000.0,18000000000.0,18100000000.0,18200000000.0,18300000000.0,18400000000.0,18500000000.0,18600000000.0,18700000000.0,18800000000.0,18900000000.0,19000000000.0,19100000000.0,19200000000.0,19300000000.0,19400000000.0,19500000000.0,19600000000.0,19700000000.0,19800000000.0,19900000000.0,20000000000.0,20100000000.0,20200000000.0,20300000000.0,20400000000.0,20500000000.0,20600000000.0,20700000000.0,20800000000.0,20900000000.0,21000000000.0,21100000000.0,21200000000.0,21300000000.0,21400000000.0,21500000000.0,21600000000.0,21700000000.0,21800000000.0,21900000000.0,22000000000.0,22100000000.0,22200000000.0,22300000000.0,22400000000.0,22500000000.0,22600000000.0,22700000000.0,22800000000.0,22900000000.0,23000000000.0,23100000000.0,23200000000.0,23300000000.0,23400000000.0,23500000000.0,23600000000.0,23700000000.0,23800000000.0,23900000000.0,24000000000.0,24100000000.0,24200000000.0,24300000000.0,24400000000.0,24500000000.0,24600000000.0,24700000000.0,24800000000.0,24900000000.0,25000000000.0,25100000000.0,25200000000.0,25300000000.0,25400000000.0,25500000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0]
-[-1.0,-2.0,-3.0,-4.0,-5.0,-6.0,-7.0,-8.0,-9.0,-10.0,-11.0,-12.0,-13.0,-14.0,-15.0,-16.0,-17.0,-18.0,-19.0,-20.0,-21.0,-22.0,-23.0,-24.0,-25.0,-26.0,-27.0,-28.0,-29.0,-30.0,-31.0,-32.0,-33.0,-34.0,-35.0,-36.0,-37.0,-38.0,-39.0,-40.0,-41.0,-42.0,-43.0,-44.0,-45.0,-46.0,-47.0,-48.0,-49.0,-50.0,-51.0,-52.0,-53.0,-54.0,-55.0,-56.0,-57.0,-58.0,-59.0,-60.0,-61.0,-62.0,-63.0,-64.0,-65.0,-66.0,-67.0,-68.0,-69.0,-70.0,-71.0,-72.0,-73.0,-74.0,-75.0,-76.0,-77.0,-78.0,-79.0,-80.0,-81.0,-82.0,-83.0,-84.0,-85.0,-86.0,-87.0,-88.0,-89.0,-90.0,-91.0,-92.0,-93.0,-94.0,-95.0,-96.0,-97.0,-98.0,-99.0,-100.0,-101.0,-102.0,-103.0,-104.0,-105.0,-106.0,-107.0,-108.0,-109.0,-110.0,-111.0,-112.0,-113.0,-114.0,-115.0,-116.0,-117.0,-118.0,-119.0,-120.0,-121.0,-122.0,-123.0,-124.0,-125.0,-126.0,-127.0,-128.0,-129.0,-130.0,-131.0,-132.0,-133.0,-134.0,-135.0,-136.0,-137.0,-138.0,-139.0,-140.0,-141.0,-142.0,-143.0,-144.0,-145.0,-146.0,-147.0,-148.0,-149.0,-150.0,-151.0,-152.0,-153.0,-154.0,-155.0,-156.0,-157.0,-158.0,-159.0,-160.0,-161.0,-162.0,-163.0,-164.0,-165.0,-166.0,-167.0,-168.0,-169.0,-170.0,-171.0,-172.0,-173.0,-174.0,-175.0,-176.0,-177.0,-178.0,-179.0,-180.0,-181.0,-182.0,-183.0,-184.0,-185.0,-186.0,-187.0,-188.0,-189.0,-190.0,-191.0,-192.0,-193.0,-194.0,-195.0,-196.0,-197.0,-198.0,-199.0,-200.0,-201.0,-202.0,-203.0,-204.0,-205.0,-206.0,-207.0,-208.0,-209.0,-210.0,-211.0,-212.0,-213.0,-214.0,-215.0,-216.0,-217.0,-218.0,-219.0,-220.0,-221.0,-222.0,-223.0,-224.0,-225.0,-226.0,-227.0,-228.0,-229.0,-230.0,-231.0,-232.0,-233.0,-234.0,-235.0,-236.0,-237.0,-238.0,-239.0,-240.0,-241.0,-242.0,-243.0,-244.0,-245.0,-246.0,-247.0,-248.0,-249.0,-250.0,-251.0,-252.0,-253.0,-254.0,-255.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0,-256.0]
-[0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0,-1.0]
+[100000000,200000000,300000000,400000000,500000000,600000000,700000000,800000000,900000000,1000000000,1100000000,1200000000,1300000000,1400000000,1500000000,1600000000,1700000000,1800000000,1900000000,2000000000,2100000000,2200000000,2300000000,2400000000,2500000000,2600000000,2700000000,2800000000,2900000000,3000000000,3100000000,3200000000,3300000000,3400000000,3500000000,3600000000,3700000000,3800000000,3900000000,4000000000,4100000000,4200000000,4300000000,4400000000,4500000000,4600000000,4700000000,4800000000,4900000000,5000000000,5100000000,5200000000,5300000000,5400000000,5500000000,5600000000,5700000000,5800000000,5900000000,6000000000,6100000000,6200000000,6300000000,6400000000,6500000000,6600000000,6700000000,6800000000,6900000000,7000000000,7100000000,7200000000,7300000000,7400000000,7500000000,7600000000,7700000000,7800000000,7900000000,8000000000,8100000000,8200000000,8300000000,8400000000,8500000000,8600000000,8700000000,8800000000,8900000000,9000000000,9100000000,9200000000,9300000000,9400000000,9500000000,9600000000,9700000000,9800000000,9900000000,10000000000,10100000000,10200000000,10300000000,10400000000,10500000000,10600000000,10700000000,10800000000,10900000000,11000000000,11100000000,11200000000,11300000000,11400000000,11500000000,11600000000,11700000000,11800000000,11900000000,12000000000,12100000000,12200000000,12300000000,12400000000,12500000000,12600000000,12700000000,12800000000,12900000000,13000000000,13100000000,13200000000,13300000000,13400000000,13500000000,13600000000,13700000000,13800000000,13900000000,14000000000,14100000000,14200000000,14300000000,14400000000,14500000000,14600000000,14700000000,14800000000,14900000000,15000000000,15100000000,15200000000,15300000000,15400000000,15500000000,15600000000,15700000000,15800000000,15900000000,16000000000,16100000000,16200000000,16300000000,16400000000,16500000000,16600000000,16700000000,16800000000,16900000000,17000000000,17100000000,17200000000,17300000000,17400000000,17500000000,17600000000,17700000000,17800000000,17900000000,18000000000,18100000000,18200000000,18300000000,18400000000,18500000000,18600000000,18700000000,18800000000,18900000000,19000000000,19100000000,19200000000,19300000000,19400000000,19500000000,19600000000,19700000000,19800000000,19900000000,20000000000,20100000000,20200000000,20300000000,20400000000,20500000000,20600000000,20700000000,20800000000,20900000000,21000000000,21100000000,21200000000,21300000000,21400000000,21500000000,21600000000,21700000000,21800000000,21900000000,22000000000,22100000000,22200000000,22300000000,22400000000,22500000000,22600000000,22700000000,22800000000,22900000000,23000000000,23100000000,23200000000,23300000000,23400000000,23500000000,23600000000,23700000000,23800000000,23900000000,24000000000,24100000000,24200000000,24300000000,24400000000,24500000000,24600000000,24700000000,24800000000,24900000000,25000000000,25100000000,25200000000,25300000000,25400000000,25500000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000]
+[-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11,-12,-13,-14,-15,-16,-17,-18,-19,-20,-21,-22,-23,-24,-25,-26,-27,-28,-29,-30,-31,-32,-33,-34,-35,-36,-37,-38,-39,-40,-41,-42,-43,-44,-45,-46,-47,-48,-49,-50,-51,-52,-53,-54,-55,-56,-57,-58,-59,-60,-61,-62,-63,-64,-65,-66,-67,-68,-69,-70,-71,-72,-73,-74,-75,-76,-77,-78,-79,-80,-81,-82,-83,-84,-85,-86,-87,-88,-89,-90,-91,-92,-93,-94,-95,-96,-97,-98,-99,-100,-101,-102,-103,-104,-105,-106,-107,-108,-109,-110,-111,-112,-113,-114,-115,-116,-117,-118,-119,-120,-121,-122,-123,-124,-125,-126,-127,-128,-129,-130,-131,-132,-133,-134,-135,-136,-137,-138,-139,-140,-141,-142,-143,-144,-145,-146,-147,-148,-149,-150,-151,-152,-153,-154,-155,-156,-157,-158,-159,-160,-161,-162,-163,-164,-165,-166,-167,-168,-169,-170,-171,-172,-173,-174,-175,-176,-177,-178,-179,-180,-181,-182,-183,-184,-185,-186,-187,-188,-189,-190,-191,-192,-193,-194,-195,-196,-197,-198,-199,-200,-201,-202,-203,-204,-205,-206,-207,-208,-209,-210,-211,-212,-213,-214,-215,-216,-217,-218,-219,-220,-221,-222,-223,-224,-225,-226,-227,-228,-229,-230,-231,-232,-233,-234,-235,-236,-237,-238,-239,-240,-241,-242,-243,-244,-245,-246,-247,-248,-249,-250,-251,-252,-253,-254,-255,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256,-256]
+[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.1,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.2,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.3,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.4,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.5,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.6,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.7,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.8,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-0.9,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1]
 [0,1,3,6,10,15,21,28,36,45,55,65,75,85,95,105,115,125,135,145,155,165,175,185,195,205,215,225,235,245,255,265,275,285,295,305,315,325,335,345,355,365,375,385,395,405,415,425,435,445,455,465,475,485,495,505,515,525,535,545,555,565,575,585,595,605,615,625,635,645,655,665,675,685,695,705,715,725,735,745,755,765,775,785,795,805,815,825,835,845,855,865,875,885,895,905,915,925,935,945]
 [1,2,3,4,5,6,7,8,9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10]
 [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200]
 [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256]
 Array(Int64)
-[1.000000000,2.000000000,3.000000000,4.000000000,5.000000000,6.000000000,7.000000000,8.000000000,9.000000000,10.000000000,11.000000000,12.000000000,13.000000000,14.000000000,15.000000000,16.000000000,17.000000000,18.000000000,19.000000000,20.000000000,21.000000000,22.000000000,23.000000000,24.000000000,25.000000000,26.000000000,27.000000000,28.000000000,29.000000000,30.000000000,31.000000000,32.000000000,33.000000000,34.000000000,35.000000000,36.000000000,37.000000000,38.000000000,39.000000000,40.000000000,41.000000000,42.000000000,43.000000000,44.000000000,45.000000000,46.000000000,47.000000000,48.000000000,49.000000000,50.000000000,51.000000000,52.000000000,53.000000000,54.000000000,55.000000000,56.000000000,57.000000000,58.000000000,59.000000000,60.000000000,61.000000000,62.000000000,63.000000000,64.000000000,65.000000000,66.000000000,67.000000000,68.000000000,69.000000000,70.000000000,71.000000000,72.000000000,73.000000000,74.000000000,75.000000000,76.000000000,77.000000000,78.000000000,79.000000000,80.000000000,81.000000000,82.000000000,83.000000000,84.000000000,85.000000000,86.000000000,87.000000000,88.000000000,89.000000000,90.000000000,91.000000000,92.000000000,93.000000000,94.000000000,95.000000000,96.000000000,97.000000000,98.000000000,99.000000000,100.000000000,101.000000000,102.000000000,103.000000000,104.000000000,105.000000000,106.000000000,107.000000000,108.000000000,109.000000000,110.000000000,111.000000000,112.000000000,113.000000000,114.000000000,115.000000000,116.000000000,117.000000000,118.000000000,119.000000000,120.000000000,121.000000000,122.000000000,123.000000000,124.000000000,125.000000000,126.000000000,127.000000000,128.000000000,129.000000000,130.000000000,131.000000000,132.000000000,133.000000000,134.000000000,135.000000000,136.000000000,137.000000000,138.000000000,139.000000000,140.000000000,141.000000000,142.000000000,143.000000000,144.000000000,145.000000000,146.000000000,147.000000000,148.000000000,149.000000000,150.000000000,151.000000000,152.000000000,153.000000000,154.000000000,155.000000000,156.000000000,157.000000000,158.000000000,159.000000000,160.000000000,161.000000000,162.000000000,163.000000000,164.000000000,165.000000000,166.000000000,167.000000000,168.000000000,169.000000000,170.000000000,171.000000000,172.000000000,173.000000000,174.000000000,175.000000000,176.000000000,177.000000000,178.000000000,179.000000000,180.000000000,181.000000000,182.000000000,183.000000000,184.000000000,185.000000000,186.000000000,187.000000000,188.000000000,189.000000000,190.000000000,191.000000000,192.000000000,193.000000000,194.000000000,195.000000000,196.000000000,197.000000000,198.000000000,199.000000000,200.000000000,201.000000000,202.000000000,203.000000000,204.000000000,205.000000000,206.000000000,207.000000000,208.000000000,209.000000000,210.000000000,211.000000000,212.000000000,213.000000000,214.000000000,215.000000000,216.000000000,217.000000000,218.000000000,219.000000000,220.000000000,221.000000000,222.000000000,223.000000000,224.000000000,225.000000000,226.000000000,227.000000000,228.000000000,229.000000000,230.000000000,231.000000000,232.000000000,233.000000000,234.000000000,235.000000000,236.000000000,237.000000000,238.000000000,239.000000000,240.000000000,241.000000000,242.000000000,243.000000000,244.000000000,245.000000000,246.000000000,247.000000000,248.000000000,249.000000000,250.000000000,251.000000000,252.000000000,253.000000000,254.000000000,255.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000,256.000000000]
-[100000000.0,200000000.0,300000000.0,400000000.0,500000000.0,600000000.0,700000000.0,800000000.0,900000000.0,1000000000.0,1100000000.0,1200000000.0,1300000000.0,1400000000.0,1500000000.0,1600000000.0,1700000000.0,1800000000.0,1900000000.0,2000000000.0,2100000000.0,2200000000.0,2300000000.0,2400000000.0,2500000000.0,2600000000.0,2700000000.0,2800000000.0,2900000000.0,3000000000.0,3100000000.0,3200000000.0,3300000000.0,3400000000.0,3500000000.0,3600000000.0,3700000000.0,3800000000.0,3900000000.0,4000000000.0,4100000000.0,4200000000.0,4300000000.0,4400000000.0,4500000000.0,4600000000.0,4700000000.0,4800000000.0,4900000000.0,5000000000.0,5100000000.0,5200000000.0,5300000000.0,5400000000.0,5500000000.0,5600000000.0,5700000000.0,5800000000.0,5900000000.0,6000000000.0,6100000000.0,6200000000.0,6300000000.0,6400000000.0,6500000000.0,6600000000.0,6700000000.0,6800000000.0,6900000000.0,7000000000.0,7100000000.0,7200000000.0,7300000000.0,7400000000.0,7500000000.0,7600000000.0,7700000000.0,7800000000.0,7900000000.0,8000000000.0,8100000000.0,8200000000.0,8300000000.0,8400000000.0,8500000000.0,8600000000.0,8700000000.0,8800000000.0,8900000000.0,9000000000.0,9100000000.0,9200000000.0,9300000000.0,9400000000.0,9500000000.0,9600000000.0,9700000000.0,9800000000.0,9900000000.0,10000000000.0,10100000000.0,10200000000.0,10300000000.0,10400000000.0,10500000000.0,10600000000.0,10700000000.0,10800000000.0,10900000000.0,11000000000.0,11100000000.0,11200000000.0,11300000000.0,11400000000.0,11500000000.0,11600000000.0,11700000000.0,11800000000.0,11900000000.0,12000000000.0,12100000000.0,12200000000.0,12300000000.0,12400000000.0,12500000000.0,12600000000.0,12700000000.0,12800000000.0,12900000000.0,13000000000.0,13100000000.0,13200000000.0,13300000000.0,13400000000.0,13500000000.0,13600000000.0,13700000000.0,13800000000.0,13900000000.0,14000000000.0,14100000000.0,14200000000.0,14300000000.0,14400000000.0,14500000000.0,14600000000.0,14700000000.0,14800000000.0,14900000000.0,15000000000.0,15100000000.0,15200000000.0,15300000000.0,15400000000.0,15500000000.0,15600000000.0,15700000000.0,15800000000.0,15900000000.0,16000000000.0,16100000000.0,16200000000.0,16300000000.0,16400000000.0,16500000000.0,16600000000.0,16700000000.0,16800000000.0,16900000000.0,17000000000.0,17100000000.0,17200000000.0,17300000000.0,17400000000.0,17500000000.0,17600000000.0,17700000000.0,17800000000.0,17900000000.0,18000000000.0,18100000000.0,18200000000.0,18300000000.0,18400000000.0,18500000000.0,18600000000.0,18700000000.0,18800000000.0,18900000000.0,19000000000.0,19100000000.0,19200000000.0,19300000000.0,19400000000.0,19500000000.0,19600000000.0,19700000000.0,19800000000.0,19900000000.0,20000000000.0,20100000000.0,20200000000.0,20300000000.0,20400000000.0,20500000000.0,20600000000.0,20700000000.0,20800000000.0,20900000000.0,21000000000.0,21100000000.0,21200000000.0,21300000000.0,21400000000.0,21500000000.0,21600000000.0,21700000000.0,21800000000.0,21900000000.0,22000000000.0,22100000000.0,22200000000.0,22300000000.0,22400000000.0,22500000000.0,22600000000.0,22700000000.0,22800000000.0,22900000000.0,23000000000.0,23100000000.0,23200000000.0,23300000000.0,23400000000.0,23500000000.0,23600000000.0,23700000000.0,23800000000.0,23900000000.0,24000000000.0,24100000000.0,24200000000.0,24300000000.0,24400000000.0,24500000000.0,24600000000.0,24700000000.0,24800000000.0,24900000000.0,25000000000.0,25100000000.0,25200000000.0,25300000000.0,25400000000.0,25500000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0,25600000000.0]
-[1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0,9.0,10.0,11.0,12.0,13.0,14.0,15.0,16.0,17.0,18.0,19.0,20.0,21.0,22.0,23.0,24.0,25.0,26.0,27.0,28.0,29.0,30.0,31.0,32.0,33.0,34.0,35.0,36.0,37.0,38.0,39.0,40.0,41.0,42.0,43.0,44.0,45.0,46.0,47.0,48.0,49.0,50.0,51.0,52.0,53.0,54.0,55.0,56.0,57.0,58.0,59.0,60.0,61.0,62.0,63.0,64.0,65.0,66.0,67.0,68.0,69.0,70.0,71.0,72.0,73.0,74.0,75.0,76.0,77.0,78.0,79.0,80.0,81.0,82.0,83.0,84.0,85.0,86.0,87.0,88.0,89.0,90.0,91.0,92.0,93.0,94.0,95.0,96.0,97.0,98.0,99.0,100.0,101.0,102.0,103.0,104.0,105.0,106.0,107.0,108.0,109.0,110.0,111.0,112.0,113.0,114.0,115.0,116.0,117.0,118.0,119.0,120.0,121.0,122.0,123.0,124.0,125.0,126.0,127.0,128.0,129.0,130.0,131.0,132.0,133.0,134.0,135.0,136.0,137.0,138.0,139.0,140.0,141.0,142.0,143.0,144.0,145.0,146.0,147.0,148.0,149.0,150.0,151.0,152.0,153.0,154.0,155.0,156.0,157.0,158.0,159.0,160.0,161.0,162.0,163.0,164.0,165.0,166.0,167.0,168.0,169.0,170.0,171.0,172.0,173.0,174.0,175.0,176.0,177.0,178.0,179.0,180.0,181.0,182.0,183.0,184.0,185.0,186.0,187.0,188.0,189.0,190.0,191.0,192.0,193.0,194.0,195.0,196.0,197.0,198.0,199.0,200.0,201.0,202.0,203.0,204.0,205.0,206.0,207.0,208.0,209.0,210.0,211.0,212.0,213.0,214.0,215.0,216.0,217.0,218.0,219.0,220.0,221.0,222.0,223.0,224.0,225.0,226.0,227.0,228.0,229.0,230.0,231.0,232.0,233.0,234.0,235.0,236.0,237.0,238.0,239.0,240.0,241.0,242.0,243.0,244.0,245.0,246.0,247.0,248.0,249.0,250.0,251.0,252.0,253.0,254.0,255.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0,256.0]
+[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256]
+[100000000,200000000,300000000,400000000,500000000,600000000,700000000,800000000,900000000,1000000000,1100000000,1200000000,1300000000,1400000000,1500000000,1600000000,1700000000,1800000000,1900000000,2000000000,2100000000,2200000000,2300000000,2400000000,2500000000,2600000000,2700000000,2800000000,2900000000,3000000000,3100000000,3200000000,3300000000,3400000000,3500000000,3600000000,3700000000,3800000000,3900000000,4000000000,4100000000,4200000000,4300000000,4400000000,4500000000,4600000000,4700000000,4800000000,4900000000,5000000000,5100000000,5200000000,5300000000,5400000000,5500000000,5600000000,5700000000,5800000000,5900000000,6000000000,6100000000,6200000000,6300000000,6400000000,6500000000,6600000000,6700000000,6800000000,6900000000,7000000000,7100000000,7200000000,7300000000,7400000000,7500000000,7600000000,7700000000,7800000000,7900000000,8000000000,8100000000,8200000000,8300000000,8400000000,8500000000,8600000000,8700000000,8800000000,8900000000,9000000000,9100000000,9200000000,9300000000,9400000000,9500000000,9600000000,9700000000,9800000000,9900000000,10000000000,10100000000,10200000000,10300000000,10400000000,10500000000,10600000000,10700000000,10800000000,10900000000,11000000000,11100000000,11200000000,11300000000,11400000000,11500000000,11600000000,11700000000,11800000000,11900000000,12000000000,12100000000,12200000000,12300000000,12400000000,12500000000,12600000000,12700000000,12800000000,12900000000,13000000000,13100000000,13200000000,13300000000,13400000000,13500000000,13600000000,13700000000,13800000000,13900000000,14000000000,14100000000,14200000000,14300000000,14400000000,14500000000,14600000000,14700000000,14800000000,14900000000,15000000000,15100000000,15200000000,15300000000,15400000000,15500000000,15600000000,15700000000,15800000000,15900000000,16000000000,16100000000,16200000000,16300000000,16400000000,16500000000,16600000000,16700000000,16800000000,16900000000,17000000000,17100000000,17200000000,17300000000,17400000000,17500000000,17600000000,17700000000,17800000000,17900000000,18000000000,18100000000,18200000000,18300000000,18400000000,18500000000,18600000000,18700000000,18800000000,18900000000,19000000000,19100000000,19200000000,19300000000,19400000000,19500000000,19600000000,19700000000,19800000000,19900000000,20000000000,20100000000,20200000000,20300000000,20400000000,20500000000,20600000000,20700000000,20800000000,20900000000,21000000000,21100000000,21200000000,21300000000,21400000000,21500000000,21600000000,21700000000,21800000000,21900000000,22000000000,22100000000,22200000000,22300000000,22400000000,22500000000,22600000000,22700000000,22800000000,22900000000,23000000000,23100000000,23200000000,23300000000,23400000000,23500000000,23600000000,23700000000,23800000000,23900000000,24000000000,24100000000,24200000000,24300000000,24400000000,24500000000,24600000000,24700000000,24800000000,24900000000,25000000000,25100000000,25200000000,25300000000,25400000000,25500000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000,25600000000]
+[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256]
 [0.00390625,0.0078125,0.01171875,0.015625,0.01953125,0.0234375,0.02734375,0.03125,0.03515625,0.0390625,0.04296875,0.046875,0.05078125,0.0546875,0.05859375,0.0625,0.06640625,0.0703125,0.07421875,0.078125,0.08203125,0.0859375,0.08984375,0.09375,0.09765625,0.1015625,0.10546875,0.109375,0.11328125,0.1171875,0.12109375,0.125,0.12890625,0.1328125,0.13671875,0.140625,0.14453125,0.1484375,0.15234375,0.15625,0.16015625,0.1640625,0.16796875,0.171875,0.17578125,0.1796875,0.18359375,0.1875,0.19140625,0.1953125,0.19921875,0.203125,0.20703125,0.2109375,0.21484375,0.21875,0.22265625,0.2265625,0.23046875,0.234375,0.23828125,0.2421875,0.24609375,0.25,0.25390625,0.2578125,0.26171875,0.265625,0.26953125,0.2734375,0.27734375,0.28125,0.28515625,0.2890625,0.29296875,0.296875,0.30078125,0.3046875,0.30859375,0.3125,0.31640625,0.3203125,0.32421875,0.328125,0.33203125,0.3359375,0.33984375,0.34375,0.34765625,0.3515625,0.35546875,0.359375,0.36328125,0.3671875,0.37109375,0.375,0.37890625,0.3828125,0.38671875,0.390625,0.39453125,0.3984375,0.40234375,0.40625,0.41015625,0.4140625,0.41796875,0.421875,0.42578125,0.4296875,0.43359375,0.4375,0.44140625,0.4453125,0.44921875,0.453125,0.45703125,0.4609375,0.46484375,0.46875,0.47265625,0.4765625,0.48046875,0.484375,0.48828125,0.4921875,0.49609375,0.5,0.50390625,0.5078125,0.51171875,0.515625,0.51953125,0.5234375,0.52734375,0.53125,0.53515625,0.5390625,0.54296875,0.546875,0.55078125,0.5546875,0.55859375,0.5625,0.56640625,0.5703125,0.57421875,0.578125,0.58203125,0.5859375,0.58984375,0.59375,0.59765625,0.6015625,0.60546875,0.609375,0.61328125,0.6171875,0.62109375,0.625,0.62890625,0.6328125,0.63671875,0.640625,0.64453125,0.6484375,0.65234375,0.65625,0.66015625,0.6640625,0.66796875,0.671875,0.67578125,0.6796875,0.68359375,0.6875,0.69140625,0.6953125,0.69921875,0.703125,0.70703125,0.7109375,0.71484375,0.71875,0.72265625,0.7265625,0.73046875,0.734375,0.73828125,0.7421875,0.74609375,0.75,0.75390625,0.7578125,0.76171875,0.765625,0.76953125,0.7734375,0.77734375,0.78125,0.78515625,0.7890625,0.79296875,0.796875,0.80078125,0.8046875,0.80859375,0.8125,0.81640625,0.8203125,0.82421875,0.828125,0.83203125,0.8359375,0.83984375,0.84375,0.84765625,0.8515625,0.85546875,0.859375,0.86328125,0.8671875,0.87109375,0.875,0.87890625,0.8828125,0.88671875,0.890625,0.89453125,0.8984375,0.90234375,0.90625,0.91015625,0.9140625,0.91796875,0.921875,0.92578125,0.9296875,0.93359375,0.9375,0.94140625,0.9453125,0.94921875,0.953125,0.95703125,0.9609375,0.96484375,0.96875,0.97265625,0.9765625,0.98046875,0.984375,0.98828125,0.9921875,0.99609375,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
 [-0.00390625,-0.0078125,-0.01171875,-0.015625,-0.01953125,-0.0234375,-0.02734375,-0.03125,-0.03515625,-0.0390625,-0.04296875,-0.046875,-0.05078125,-0.0546875,-0.05859375,-0.0625,-0.06640625,-0.0703125,-0.07421875,-0.078125,-0.08203125,-0.0859375,-0.08984375,-0.09375,-0.09765625,-0.1015625,-0.10546875,-0.109375,-0.11328125,-0.1171875,-0.12109375,-0.125,-0.12890625,-0.1328125,-0.13671875,-0.140625,-0.14453125,-0.1484375,-0.15234375,-0.15625,-0.16015625,-0.1640625,-0.16796875,-0.171875,-0.17578125,-0.1796875,-0.18359375,-0.1875,-0.19140625,-0.1953125,-0.19921875,-0.203125,-0.20703125,-0.2109375,-0.21484375,-0.21875,-0.22265625,-0.2265625,-0.23046875,-0.234375,-0.23828125,-0.2421875,-0.24609375,-0.25,-0.25390625,-0.2578125,-0.26171875,-0.265625,-0.26953125,-0.2734375,-0.27734375,-0.28125,-0.28515625,-0.2890625,-0.29296875,-0.296875,-0.30078125,-0.3046875,-0.30859375,-0.3125,-0.31640625,-0.3203125,-0.32421875,-0.328125,-0.33203125,-0.3359375,-0.33984375,-0.34375,-0.34765625,-0.3515625,-0.35546875,-0.359375,-0.36328125,-0.3671875,-0.37109375,-0.375,-0.37890625,-0.3828125,-0.38671875,-0.390625,-0.39453125,-0.3984375,-0.40234375,-0.40625,-0.41015625,-0.4140625,-0.41796875,-0.421875,-0.42578125,-0.4296875,-0.43359375,-0.4375,-0.44140625,-0.4453125,-0.44921875,-0.453125,-0.45703125,-0.4609375,-0.46484375,-0.46875,-0.47265625,-0.4765625,-0.48046875,-0.484375,-0.48828125,-0.4921875,-0.49609375,-0.5,-0.50390625,-0.5078125,-0.51171875,-0.515625,-0.51953125,-0.5234375,-0.52734375,-0.53125,-0.53515625,-0.5390625,-0.54296875,-0.546875,-0.55078125,-0.5546875,-0.55859375,-0.5625,-0.56640625,-0.5703125,-0.57421875,-0.578125,-0.58203125,-0.5859375,-0.58984375,-0.59375,-0.59765625,-0.6015625,-0.60546875,-0.609375,-0.61328125,-0.6171875,-0.62109375,-0.625,-0.62890625,-0.6328125,-0.63671875,-0.640625,-0.64453125,-0.6484375,-0.65234375,-0.65625,-0.66015625,-0.6640625,-0.66796875,-0.671875,-0.67578125,-0.6796875,-0.68359375,-0.6875,-0.69140625,-0.6953125,-0.69921875,-0.703125,-0.70703125,-0.7109375,-0.71484375,-0.71875,-0.72265625,-0.7265625,-0.73046875,-0.734375,-0.73828125,-0.7421875,-0.74609375,-0.75,-0.75390625,-0.7578125,-0.76171875,-0.765625,-0.76953125,-0.7734375,-0.77734375,-0.78125,-0.78515625,-0.7890625,-0.79296875,-0.796875,-0.80078125,-0.8046875,-0.80859375,-0.8125,-0.81640625,-0.8203125,-0.82421875,-0.828125,-0.83203125,-0.8359375,-0.83984375,-0.84375,-0.84765625,-0.8515625,-0.85546875,-0.859375,-0.86328125,-0.8671875,-0.87109375,-0.875,-0.87890625,-0.8828125,-0.88671875,-0.890625,-0.89453125,-0.8984375,-0.90234375,-0.90625,-0.91015625,-0.9140625,-0.91796875,-0.921875,-0.92578125,-0.9296875,-0.93359375,-0.9375,-0.94140625,-0.9453125,-0.94921875,-0.953125,-0.95703125,-0.9609375,-0.96484375,-0.96875,-0.97265625,-0.9765625,-0.98046875,-0.984375,-0.98828125,-0.9921875,-0.99609375,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1]
 [0.0039,0.0078,0.0117,0.0156,0.0195,0.0234,0.0273,0.0312,0.0352,0.0391,0.043,0.0469,0.0508,0.0547,0.0586,0.0625,0.0664,0.0703,0.0742,0.0781,0.082,0.0859,0.0898,0.0938,0.0977,0.1016,0.1055,0.1094,0.1133,0.1172,0.1211,0.125,0.1289,0.1328,0.1367,0.1406,0.1445,0.1484,0.1523,0.1562,0.1602,0.1641,0.168,0.1719,0.1758,0.1797,0.1836,0.1875,0.1914,0.1953,0.1992,0.2031,0.207,0.2109,0.2148,0.2188,0.2227,0.2266,0.2305,0.2344,0.2383,0.2422,0.2461,0.25,0.2539,0.2578,0.2617,0.2656,0.2695,0.2734,0.2773,0.2812,0.2852,0.2891,0.293,0.2969,0.3008,0.3047,0.3086,0.3125,0.3164,0.3203,0.3242,0.3281,0.332,0.3359,0.3398,0.3438,0.3477,0.3516,0.3555,0.3594,0.3633,0.3672,0.3711,0.375,0.3789,0.3828,0.3867,0.3906,0.3945,0.3984,0.4023,0.4062,0.4102,0.4141,0.418,0.4219,0.4258,0.4297,0.4336,0.4375,0.4414,0.4453,0.4492,0.4531,0.457,0.4609,0.4648,0.4688,0.4727,0.4766,0.4805,0.4844,0.4883,0.4922,0.4961,0.5,0.5039,0.5078,0.5117,0.5156,0.5195,0.5234,0.5273,0.5312,0.5352,0.5391,0.543,0.5469,0.5508,0.5547,0.5586,0.5625,0.5664,0.5703,0.5742,0.5781,0.582,0.5859,0.5898,0.5938,0.5977,0.6016,0.6055,0.6094,0.6133,0.6172,0.6211,0.625,0.6289,0.6328,0.6367,0.6406,0.6445,0.6484,0.6523,0.6562,0.6602,0.6641,0.668,0.6719,0.6758,0.6797,0.6836,0.6875,0.6914,0.6953,0.6992,0.7031,0.707,0.7109,0.7148,0.7188,0.7227,0.7266,0.7305,0.7344,0.7383,0.7422,0.7461,0.75,0.7539,0.7578,0.7617,0.7656,0.7695,0.7734,0.7773,0.7812,0.7852,0.7891,0.793,0.7969,0.8008,0.8047,0.8086,0.8125,0.8164,0.8203,0.8242,0.8281,0.832,0.8359,0.8398,0.8438,0.8477,0.8516,0.8555,0.8594,0.8633,0.8672,0.8711,0.875,0.8789,0.8828,0.8867,0.8906,0.8945,0.8984,0.9023,0.9062,0.9102,0.9141,0.918,0.9219,0.9258,0.9297,0.9336,0.9375,0.9414,0.9453,0.9492,0.9531,0.957,0.9609,0.9648,0.9688,0.9727,0.9766,0.9805,0.9844,0.9883,0.9922,0.9961,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
-[0.003906250,0.007812500,0.011718750,0.015625000,0.019531250,0.023437500,0.027343750,0.031250000,0.035156250,0.039062500,0.042968750,0.046875000,0.050781250,0.054687500,0.058593750,0.062500000,0.066406250,0.070312500,0.074218750,0.078125000,0.082031250,0.085937500,0.089843750,0.093750000,0.097656250,0.101562500,0.105468750,0.109375000,0.113281250,0.117187500,0.121093750,0.125000000,0.128906250,0.132812500,0.136718750,0.140625000,0.144531250,0.148437500,0.152343750,0.156250000,0.160156250,0.164062500,0.167968750,0.171875000,0.175781250,0.179687500,0.183593750,0.187500000,0.191406250,0.195312500,0.199218750,0.203125000,0.207031250,0.210937500,0.214843750,0.218750000,0.222656250,0.226562500,0.230468750,0.234375000,0.238281250,0.242187500,0.246093750,0.250000000,0.253906250,0.257812500,0.261718750,0.265625000,0.269531250,0.273437500,0.277343750,0.281250000,0.285156250,0.289062500,0.292968750,0.296875000,0.300781250,0.304687500,0.308593750,0.312500000,0.316406250,0.320312500,0.324218750,0.328125000,0.332031250,0.335937500,0.339843750,0.343750000,0.347656250,0.351562500,0.355468750,0.359375000,0.363281250,0.367187500,0.371093750,0.375000000,0.378906250,0.382812500,0.386718750,0.390625000,0.394531250,0.398437500,0.402343750,0.406250000,0.410156250,0.414062500,0.417968750,0.421875000,0.425781250,0.429687500,0.433593750,0.437500000,0.441406250,0.445312500,0.449218750,0.453125000,0.457031250,0.460937500,0.464843750,0.468750000,0.472656250,0.476562500,0.480468750,0.484375000,0.488281250,0.492187500,0.496093750,0.500000000,0.503906250,0.507812500,0.511718750,0.515625000,0.519531250,0.523437500,0.527343750,0.531250000,0.535156250,0.539062500,0.542968750,0.546875000,0.550781250,0.554687500,0.558593750,0.562500000,0.566406250,0.570312500,0.574218750,0.578125000,0.582031250,0.585937500,0.589843750,0.593750000,0.597656250,0.601562500,0.605468750,0.609375000,0.613281250,0.617187500,0.621093750,0.625000000,0.628906250,0.632812500,0.636718750,0.640625000,0.644531250,0.648437500,0.652343750,0.656250000,0.660156250,0.664062500,0.667968750,0.671875000,0.675781250,0.679687500,0.683593750,0.687500000,0.691406250,0.695312500,0.699218750,0.703125000,0.707031250,0.710937500,0.714843750,0.718750000,0.722656250,0.726562500,0.730468750,0.734375000,0.738281250,0.742187500,0.746093750,0.750000000,0.753906250,0.757812500,0.761718750,0.765625000,0.769531250,0.773437500,0.777343750,0.781250000,0.785156250,0.789062500,0.792968750,0.796875000,0.800781250,0.804687500,0.808593750,0.812500000,0.816406250,0.820312500,0.824218750,0.828125000,0.832031250,0.835937500,0.839843750,0.843750000,0.847656250,0.851562500,0.855468750,0.859375000,0.863281250,0.867187500,0.871093750,0.875000000,0.878906250,0.882812500,0.886718750,0.890625000,0.894531250,0.898437500,0.902343750,0.906250000,0.910156250,0.914062500,0.917968750,0.921875000,0.925781250,0.929687500,0.933593750,0.937500000,0.941406250,0.945312500,0.949218750,0.953125000,0.957031250,0.960937500,0.964843750,0.968750000,0.972656250,0.976562500,0.980468750,0.984375000,0.988281250,0.992187500,0.996093750,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000]
+[0.00390625,0.0078125,0.01171875,0.015625,0.01953125,0.0234375,0.02734375,0.03125,0.03515625,0.0390625,0.04296875,0.046875,0.05078125,0.0546875,0.05859375,0.0625,0.06640625,0.0703125,0.07421875,0.078125,0.08203125,0.0859375,0.08984375,0.09375,0.09765625,0.1015625,0.10546875,0.109375,0.11328125,0.1171875,0.12109375,0.125,0.12890625,0.1328125,0.13671875,0.140625,0.14453125,0.1484375,0.15234375,0.15625,0.16015625,0.1640625,0.16796875,0.171875,0.17578125,0.1796875,0.18359375,0.1875,0.19140625,0.1953125,0.19921875,0.203125,0.20703125,0.2109375,0.21484375,0.21875,0.22265625,0.2265625,0.23046875,0.234375,0.23828125,0.2421875,0.24609375,0.25,0.25390625,0.2578125,0.26171875,0.265625,0.26953125,0.2734375,0.27734375,0.28125,0.28515625,0.2890625,0.29296875,0.296875,0.30078125,0.3046875,0.30859375,0.3125,0.31640625,0.3203125,0.32421875,0.328125,0.33203125,0.3359375,0.33984375,0.34375,0.34765625,0.3515625,0.35546875,0.359375,0.36328125,0.3671875,0.37109375,0.375,0.37890625,0.3828125,0.38671875,0.390625,0.39453125,0.3984375,0.40234375,0.40625,0.41015625,0.4140625,0.41796875,0.421875,0.42578125,0.4296875,0.43359375,0.4375,0.44140625,0.4453125,0.44921875,0.453125,0.45703125,0.4609375,0.46484375,0.46875,0.47265625,0.4765625,0.48046875,0.484375,0.48828125,0.4921875,0.49609375,0.5,0.50390625,0.5078125,0.51171875,0.515625,0.51953125,0.5234375,0.52734375,0.53125,0.53515625,0.5390625,0.54296875,0.546875,0.55078125,0.5546875,0.55859375,0.5625,0.56640625,0.5703125,0.57421875,0.578125,0.58203125,0.5859375,0.58984375,0.59375,0.59765625,0.6015625,0.60546875,0.609375,0.61328125,0.6171875,0.62109375,0.625,0.62890625,0.6328125,0.63671875,0.640625,0.64453125,0.6484375,0.65234375,0.65625,0.66015625,0.6640625,0.66796875,0.671875,0.67578125,0.6796875,0.68359375,0.6875,0.69140625,0.6953125,0.69921875,0.703125,0.70703125,0.7109375,0.71484375,0.71875,0.72265625,0.7265625,0.73046875,0.734375,0.73828125,0.7421875,0.74609375,0.75,0.75390625,0.7578125,0.76171875,0.765625,0.76953125,0.7734375,0.77734375,0.78125,0.78515625,0.7890625,0.79296875,0.796875,0.80078125,0.8046875,0.80859375,0.8125,0.81640625,0.8203125,0.82421875,0.828125,0.83203125,0.8359375,0.83984375,0.84375,0.84765625,0.8515625,0.85546875,0.859375,0.86328125,0.8671875,0.87109375,0.875,0.87890625,0.8828125,0.88671875,0.890625,0.89453125,0.8984375,0.90234375,0.90625,0.91015625,0.9140625,0.91796875,0.921875,0.92578125,0.9296875,0.93359375,0.9375,0.94140625,0.9453125,0.94921875,0.953125,0.95703125,0.9609375,0.96484375,0.96875,0.97265625,0.9765625,0.98046875,0.984375,0.98828125,0.9921875,0.99609375,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
 Array(Decimal(38, 9))
-[0.010000000,0.020000000,0.030000000,0.040000000,0.050000000,0.060000000,0.070000000,0.080000000,0.090000000,0.100000000,0.110000000,0.120000000,0.130000000,0.140000000,0.150000000,0.160000000,0.170000000,0.180000000,0.190000000,0.200000000,0.210000000,0.220000000,0.230000000,0.240000000,0.250000000,0.260000000,0.270000000,0.280000000,0.290000000,0.300000000,0.310000000,0.320000000,0.330000000,0.340000000,0.350000000,0.360000000,0.370000000,0.380000000,0.390000000,0.400000000,0.410000000,0.420000000,0.430000000,0.440000000,0.450000000,0.460000000,0.470000000,0.480000000,0.490000000,0.500000000,0.510000000,0.520000000,0.530000000,0.540000000,0.550000000,0.560000000,0.570000000,0.580000000,0.590000000,0.600000000,0.610000000,0.620000000,0.630000000,0.640000000,0.650000000,0.660000000,0.670000000,0.680000000,0.690000000,0.700000000,0.710000000,0.720000000,0.730000000,0.740000000,0.750000000,0.760000000,0.770000000,0.780000000,0.790000000,0.800000000,0.810000000,0.820000000,0.830000000,0.840000000,0.850000000,0.860000000,0.870000000,0.880000000,0.890000000,0.900000000,0.910000000,0.920000000,0.930000000,0.940000000,0.950000000,0.960000000,0.970000000,0.980000000,0.990000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000,1.000000000]
+[0.01,0.02,0.03,0.04,0.05,0.06,0.07,0.08,0.09,0.1,0.11,0.12,0.13,0.14,0.15,0.16,0.17,0.18,0.19,0.2,0.21,0.22,0.23,0.24,0.25,0.26,0.27,0.28,0.29,0.3,0.31,0.32,0.33,0.34,0.35,0.36,0.37,0.38,0.39,0.4,0.41,0.42,0.43,0.44,0.45,0.46,0.47,0.48,0.49,0.5,0.51,0.52,0.53,0.54,0.55,0.56,0.57,0.58,0.59,0.6,0.61,0.62,0.63,0.64,0.65,0.66,0.67,0.68,0.69,0.7,0.71,0.72,0.73,0.74,0.75,0.76,0.77,0.78,0.79,0.8,0.81,0.82,0.83,0.84,0.85,0.86,0.87,0.88,0.89,0.9,0.91,0.92,0.93,0.94,0.95,0.96,0.97,0.98,0.99,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
diff --git a/tests/queries/0_stateless/01412_group_array_moving_shard.sql b/tests/queries/0_stateless/01412_group_array_moving_shard.sql
index 0fbd10bc01a..25e29409f6d 100644
--- a/tests/queries/0_stateless/01412_group_array_moving_shard.sql
+++ b/tests/queries/0_stateless/01412_group_array_moving_shard.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 SELECT groupArrayMovingSum(10)(1) FROM remote('127.0.0.{1,2}', numbers(100));
 SELECT groupArrayMovingAvg(10)(1) FROM remote('127.0.0.{1,2}', numbers(100));
 
diff --git a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
index 6e1a6e01757..e47a7c4a40c 100755
--- a/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+++ b/tests/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql b/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
index 2ce0575c4ad..6fe7a238e88 100644
--- a/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
+++ b/tests/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t;
 
 SET mutations_sync = 1;
diff --git a/tests/queries/0_stateless/01415_sticking_mutations.sh b/tests/queries/0_stateless/01415_sticking_mutations.sh
index 2e86b6d972d..821c83fe728 100755
--- a/tests/queries/0_stateless/01415_sticking_mutations.sh
+++ b/tests/queries/0_stateless/01415_sticking_mutations.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
index f5389e3e03d..d2032e279ae 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database, no-parallel
+# Tag no-replicated-database: Unsupported type of ALTER query
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
index 16b39db6e84..01678d1b500 100755
--- a/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
+++ b/tests/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database, no-parallel
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.reference b/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.reference
index 7f41fb5addb..cc91b057dc8 100644
--- a/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.reference
+++ b/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.reference
@@ -3,4 +3,4 @@
 1E-7	0
 1e-7	0
 1E-9	0.000000001
-1E-10	0.000000000
+1E-10	0
diff --git a/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql b/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql
index 7d0993c1bfc..1387206b882 100644
--- a/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql
+++ b/tests/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql
@@ -1,4 +1,4 @@
-SELECT '-1E9-1E9-1E9-1E9' AS x, toDecimal32(x, 0); -- { serverError 72 }
+SELECT '-1E9-1E9-1E9-1E9' AS x, toDecimal32(x, 0); -- { serverError 69 }
 SELECT '-1E9' AS x, toDecimal32(x, 0); -- { serverError 69 }
 SELECT '1E-9' AS x, toDecimal32(x, 0);
 SELECT '1E-8' AS x, toDecimal32(x, 0);
diff --git a/tests/queries/0_stateless/01425_default_value_of_type_name.reference b/tests/queries/0_stateless/01425_default_value_of_type_name.reference
index c7dfcb7607d..33ff67f2b23 100644
--- a/tests/queries/0_stateless/01425_default_value_of_type_name.reference
+++ b/tests/queries/0_stateless/01425_default_value_of_type_name.reference
@@ -1 +1 @@
-0		00000000-0000-0000-0000-000000000000	0.0.0.0	::	0.000	('1970-01-01','1970-01-01 00:00:00',[],NULL)
+0		00000000-0000-0000-0000-000000000000	0.0.0.0	::	0	('1970-01-01','1970-01-01 00:00:00',[],NULL)
diff --git a/tests/queries/0_stateless/01428_h3_range_check.sql b/tests/queries/0_stateless/01428_h3_range_check.sql
index 7c7376a90ae..9024108eca9 100644
--- a/tests/queries/0_stateless/01428_h3_range_check.sql
+++ b/tests/queries/0_stateless/01428_h3_range_check.sql
@@ -1,2 +1,4 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3ToChildren(599405990164561919, 100); -- { serverError 69 }
 SELECT h3ToParent(599405990164561919, 100); -- { serverError 69 }
diff --git a/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh b/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
index 5ee8379d431..0f3396fe8cb 100755
--- a/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
+++ b/tests/queries/0_stateless/01429_empty_arrow_and_parquet.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
 
 set -e
 
diff --git a/tests/queries/0_stateless/01429_join_on_error_messages.sql b/tests/queries/0_stateless/01429_join_on_error_messages.sql
index 6e792e90d42..cf9aac0e4da 100644
--- a/tests/queries/0_stateless/01429_join_on_error_messages.sql
+++ b/tests/queries/0_stateless/01429_join_on_error_messages.sql
@@ -4,8 +4,20 @@ SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON (A.a = arrayJoin([1])); -- {
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON equals(a); -- { serverError 62 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON less(a); -- { serverError 62 }
 
-SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b OR a = b; -- { serverError 403 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b AND a > b; -- { serverError 403 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b AND a < b; -- { serverError 403 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b AND a >= b; -- { serverError 403 }
 SELECT 1 FROM (select 1 a) A JOIN (select 1 b) B ON a = b AND a <= b; -- { serverError 403 }
+
+SET join_algorithm = 'partial_merge';
+SELECT 1 FROM (select 1 a) A JOIN (select 1 b, 1 c) B ON a = b OR a = c; -- { serverError 48 }
+-- works for a = b OR a = b because of equivalent disjunct optimization
+
+SET join_algorithm = 'auto';
+SELECT 1 FROM (select 1 a) A JOIN (select 1 b, 1 c) B ON a = b OR a = c; -- { serverError 48 }
+-- works for a = b OR a = b because of equivalent disjunct optimization
+
+SET join_algorithm = 'hash';
+
+-- conditions for different table joined via OR
+SELECT * FROM (SELECT 1 AS a, 1 AS b, 1 AS c) AS t1 INNER JOIN (SELECT 1 AS a, 1 AS b, 1 AS c) AS t2 ON t1.a = t2.a AND (t1.b > 0 OR t2.b > 0); -- { serverError 403 }
diff --git a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper.reference b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01430_modify_sample_by_zookeeper.reference
rename to tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper.sql b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
similarity index 94%
rename from tests/queries/0_stateless/01430_modify_sample_by_zookeeper.sql
rename to tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
index dc7f5017bfd..223c27804df 100644
--- a/tests/queries/0_stateless/01430_modify_sample_by_zookeeper.sql
+++ b/tests/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS modify_sample;
 
 SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
@@ -11,7 +13,7 @@ SELECT count(), min(x), max(x), sum(x), uniqExact(x) FROM modify_sample SAMPLE 0
 ALTER TABLE modify_sample MODIFY SAMPLE BY x;
 SELECT count(), min(x), max(x), sum(x), uniqExact(x) FROM modify_sample SAMPLE 0.1;
 
-CREATE TABLE modify_sample_replicated (d Date DEFAULT '2000-01-01', x UInt8, y UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01430', 'modify_sample') PARTITION BY d ORDER BY (x, y);
+CREATE TABLE modify_sample_replicated (d Date DEFAULT '2000-01-01', x UInt8, y UInt64) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01430', 'modify_sample') PARTITION BY d ORDER BY (x, y);
 
 INSERT INTO modify_sample_replicated (x, y) SELECT toUInt8(number) AS x, toUInt64(number) as y FROM system.numbers LIMIT 256;
 
diff --git a/tests/queries/0_stateless/01440_big_int_exotic_casts.reference b/tests/queries/0_stateless/01440_big_int_exotic_casts.reference
index fb3cdce7ad9..8e02bffb91d 100644
--- a/tests/queries/0_stateless/01440_big_int_exotic_casts.reference
+++ b/tests/queries/0_stateless/01440_big_int_exotic_casts.reference
@@ -1,183 +1,183 @@
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
-1	1.0	1.00	1.000000	1.0000000
-8	8.0	8.00	8.000000	8.0000000
-27	27.0	27.00	27.000000	27.0000000
-64	64.0	64.00	64.000000	64.0000000
-125	125.0	125.00	125.000000	125.0000000
-216	216.0	216.00	216.000000	216.0000000
-343	343.0	343.00	343.000000	343.0000000
-512	512.0	512.00	512.000000	512.0000000
-729	729.0	729.00	729.000000	729.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
-0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
--0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
--0	0.0	0.00	0.000000	0.0000000
--1	-1.0	-1.00	-1.000000	-1.0000000
--4	-4.0	-4.00	-4.000000	-4.0000000
--9	-9.0	-9.00	-9.000000	-9.0000000
--16	-16.0	-16.00	-16.000000	-16.0000000
--25	-25.0	-25.00	-25.000000	-25.0000000
--36	-36.0	-36.00	-36.000000	-36.0000000
--49	-49.0	-49.00	-49.000000	-49.0000000
--64	-64.0	-64.00	-64.000000	-64.0000000
--81	-81.0	-81.00	-81.000000	-81.0000000
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+1	1	1	1	1
+8	8	8	8	8
+27	27	27	27	27
+64	64	64	64	64
+125	125	125	125	125
+216	216	216	216	216
+343	343	343	343	343
+512	512	512	512	512
+729	729	729	729	729
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+-0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
+-0	0	0	0	0
+-1	-1	-1	-1	-1
+-4	-4	-4	-4	-4
+-9	-9	-9	-9	-9
+-16	-16	-16	-16	-16
+-25	-25	-25	-25	-25
+-36	-36	-36	-36	-36
+-49	-49	-49	-49	-49
+-64	-64	-64	-64	-64
+-81	-81	-81	-81	-81
 0	0	0	0
 4294967295	4294967295	4294967295	4294967295
 8589934588	8589934588	8589934588	8589934588
@@ -288,5 +288,5 @@
 -7	0	0	0
 -8	0	0	0
 -9	0	0	0
-2499500025000000	2499500025000000	2499500025000000	2499500025000000.00
-0	0	0	0.00
+2499500025000000	2499500025000000	2499500025000000	2499500025000000
+0	0	0	0
diff --git a/tests/queries/0_stateless/01442_h3kring_range_check.sql b/tests/queries/0_stateless/01442_h3kring_range_check.sql
index e580beb17a3..fa79b308068 100644
--- a/tests/queries/0_stateless/01442_h3kring_range_check.sql
+++ b/tests/queries/0_stateless/01442_h3kring_range_check.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 SELECT h3kRing(581276613233082367, 65535); -- { serverError 12 }
 SELECT h3kRing(581276613233082367, -1); -- { serverError 12 }
 SELECT length(h3kRing(111111111111, 1000));
diff --git a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
index c99069b4aa2..b3f9fbb42dd 100755
--- a/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
+++ b/tests/queries/0_stateless/01442_merge_detach_attach_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01443_merge_truncate_long.sh b/tests/queries/0_stateless/01443_merge_truncate_long.sh
index ffd5f225ffe..40cfd0fc627 100755
--- a/tests/queries/0_stateless/01443_merge_truncate_long.sh
+++ b/tests/queries/0_stateless/01443_merge_truncate_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 set -e
 
diff --git a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
index aba83aac207..eb231e71525 100755
--- a/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
+++ b/tests/queries/0_stateless/01444_create_table_drop_database_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01446_json_strings_each_row.sh b/tests/queries/0_stateless/01446_json_strings_each_row.sh
index a2d98cd7f90..3d19977ec1c 100755
--- a/tests/queries/0_stateless/01446_json_strings_each_row.sh
+++ b/tests/queries/0_stateless/01446_json_strings_each_row.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01447_json_strings.sql b/tests/queries/0_stateless/01447_json_strings.sql
index 45fc4a56d7a..2930879d312 100644
--- a/tests/queries/0_stateless/01447_json_strings.sql
+++ b/tests/queries/0_stateless/01447_json_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 
 SELECT
diff --git a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
index 5a09ca18c33..925faa3a17f 100644
--- a/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
+++ b/tests/queries/0_stateless/01448_json_compact_strings_each_row.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_table;
 DROP TABLE IF EXISTS test_table_2;
 SET input_format_null_as_default = 0;
diff --git a/tests/queries/0_stateless/01449_json_compact_strings.sql b/tests/queries/0_stateless/01449_json_compact_strings.sql
index 5b676e30347..d0a9d72af07 100644
--- a/tests/queries/0_stateless/01449_json_compact_strings.sql
+++ b/tests/queries/0_stateless/01449_json_compact_strings.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SET output_format_write_statistics = 0;
 
 SELECT
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum.reference b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum.reference
rename to tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.reference
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
similarity index 82%
rename from tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum.sql
rename to tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
index 72e588c5c02..0155b83db31 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
@@ -1,11 +1,13 @@
+-- Tags: long, replica, no-replicated-database
+
 SET replication_alter_partitions_sync = 2;
 
 
 DROP TABLE IF EXISTS replica1;
 DROP TABLE IF EXISTS replica2;
 
-CREATE TABLE replica1 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01451/quorum', 'r1') order by tuple() settings max_replicated_merges_in_queue = 0;
-CREATE TABLE replica2 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/01451/quorum', 'r2') order by tuple() settings max_replicated_merges_in_queue = 0;
+CREATE TABLE replica1 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/01451/quorum', 'r1') order by tuple() settings max_replicated_merges_in_queue = 0;
+CREATE TABLE replica2 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test/01451/quorum', 'r2') order by tuple() settings max_replicated_merges_in_queue = 0;
 
 INSERT INTO replica1 VALUES (0);
 
diff --git a/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
index cd8267ce59a..9f9d1db78f1 100644
--- a/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
+++ b/tests/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
@@ -1,10 +1,13 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 SET replication_alter_partitions_sync = 2;
 
 DROP TABLE IF EXISTS replica1;
 DROP TABLE IF EXISTS replica2;
 
-CREATE TABLE replica1 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/'||currentDatabase()||'test/01451/attach', 'r1') order by tuple() settings max_replicated_merges_in_queue = 0;
-CREATE TABLE replica2 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/'||currentDatabase()||'test/01451/attach', 'r2') order by tuple() settings max_replicated_merges_in_queue = 0;
+CREATE TABLE replica1 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/'||currentDatabase()||'test/01451/attach', 'r1') order by tuple() settings max_replicated_merges_in_queue = 0;
+CREATE TABLE replica2 (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/'||currentDatabase()||'test/01451/attach', 'r2') order by tuple() settings max_replicated_merges_in_queue = 0;
 
 INSERT INTO replica1 VALUES (0);
 INSERT INTO replica1 VALUES (1);
diff --git a/tests/queries/0_stateless/01451_wrong_error_long_query.sh b/tests/queries/0_stateless/01451_wrong_error_long_query.sh
index 333dab193cd..948f22d3a9a 100755
--- a/tests/queries/0_stateless/01451_wrong_error_long_query.sh
+++ b/tests/queries/0_stateless/01451_wrong_error_long_query.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
index 49829b288ae..d83343b3cb3 100755
--- a/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
+++ b/tests/queries/0_stateless/01454_storagememory_data_race_challenge.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.sql b/tests/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.sql
index 852660117f5..0e951af73d0 100644
--- a/tests/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.sql
+++ b/tests/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.sql
@@ -1,3 +1,5 @@
+SET cast_keep_nullable = 0;
+
 -- Value nullable
 SELECT anyIf(CAST(number, 'Nullable(UInt8)'), number = 3) AS a, toTypeName(a) FROM numbers(2);
 -- Value and condition nullable
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.reference b/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
index b40e4f87c13..f45f1ab6104 100644
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.reference
@@ -1,8 +1,20 @@
 ===http===
+{"query":"select 1 from remote('127.0.0.2', system, one) format Null\n","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"DESC TABLE system.one","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"DESC TABLE system.one","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"SELECT 1 FROM system.one","status":"QueryFinish","tracestate":"some custom state","sorted_by_start_time":1}
+{"query":"DESC TABLE system.one","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
+{"query":"DESC TABLE system.one","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
+{"query":"SELECT 1 FROM system.one","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
+{"query":"select 1 from remote('127.0.0.2', system, one) format Null\n","query_status":"QueryFinish","tracestate":"some custom state","sorted_by_finish_time":1}
 {"total spans":"4","unique spans":"4","unique non-zero parent spans":"3"}
 {"initial query spans with proper parent":"1"}
 {"unique non-empty tracestate values":"1"}
 ===native===
+{"query":"select * from url('http:\/\/127.0.0.2:8123\/?query=select%201%20format%20Null', CSV, 'a int')","status":"QueryFinish","tracestate":"another custom state","sorted_by_start_time":1}
+{"query":"select 1 format Null\n","status":"QueryFinish","tracestate":"another custom state","sorted_by_start_time":1}
+{"query":"select 1 format Null\n","query_status":"QueryFinish","tracestate":"another custom state","sorted_by_finish_time":1}
+{"query":"select * from url('http:\/\/127.0.0.2:8123\/?query=select%201%20format%20Null', CSV, 'a int')","query_status":"QueryFinish","tracestate":"another custom state","sorted_by_finish_time":1}
 {"total spans":"2","unique spans":"2","unique non-zero parent spans":"2"}
 {"initial query spans with proper parent":"1"}
 {"unique non-empty tracestate values":"1"}
diff --git a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
index 8f034b0bf61..fbbf74bbba2 100755
--- a/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
+++ b/tests/queries/0_stateless/01455_opentelemetry_distributed.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed
+
 set -ue
 
 unset CLICKHOUSE_LOG_COMMENT
@@ -12,6 +14,28 @@ function check_log
 ${CLICKHOUSE_CLIENT} --format=JSONEachRow -nq "
 system flush logs;
 
+-- Show queries sorted by start time.
+select attribute['db.statement'] as query,
+       attribute['clickhouse.query_status'] as status,
+       attribute['clickhouse.tracestate'] as tracestate,
+       1 as sorted_by_start_time
+    from system.opentelemetry_span_log
+    where trace_id = reinterpretAsUUID(reverse(unhex('$trace_id')))
+        and operation_name = 'query'
+    order by start_time_us
+    ;
+
+-- Show queries sorted by finish time.
+select attribute['db.statement'] as query,
+       attribute['clickhouse.query_status'] as query_status,
+       attribute['clickhouse.tracestate'] as tracestate,
+       1 as sorted_by_finish_time
+    from system.opentelemetry_span_log
+    where trace_id = reinterpretAsUUID(reverse(unhex('$trace_id')))
+        and operation_name = 'query'
+    order by finish_time_us
+    ;
+
 -- Check the number of query spans with given trace id, to verify it was
 -- propagated.
 select count(*) "'"'"total spans"'"'",
@@ -89,10 +113,10 @@ check_log
 echo "===sampled==="
 query_id=$(${CLICKHOUSE_CLIENT} -q "select lower(hex(reverse(reinterpretAsString(generateUUIDv4()))))")
 
-for i in {1..200}
+for i in {1..20}
 do
     ${CLICKHOUSE_CLIENT} \
-        --opentelemetry_start_trace_probability=0.1 \
+        --opentelemetry_start_trace_probability=0.5 \
         --query_id "$query_id-$i" \
         --query "select 1 from remote('127.0.0.2', system, one) format Null" \
         &
@@ -108,8 +132,8 @@ wait
 
 ${CLICKHOUSE_CLIENT} -q "system flush logs"
 ${CLICKHOUSE_CLIENT} -q "
-    -- expect 200 * 0.1 = 20 sampled events on average
-    select if(count() > 1 and count() < 50, 'OK', 'Fail')
+    -- expect 20 * 0.5 = 10 sampled events on average
+    select if(2 <= count() and count() <= 18, 'OK', 'Fail')
     from system.opentelemetry_span_log
     where operation_name = 'query'
         and parent_span_id = 0  -- only account for the initial queries
diff --git a/tests/queries/0_stateless/01455_rank_correlation_spearman.sql b/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
index e770b0bb4ff..b792d709bbc 100644
--- a/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
+++ b/tests/queries/0_stateless/01455_rank_correlation_spearman.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_01455_rank_correlation;
 USE db_01455_rank_correlation;
 DROP TABLE IF EXISTS moons;
diff --git a/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql b/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
index d21aa391890..a271295a0cd 100644
--- a/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
+++ b/tests/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- Leaf limits is unreliable w/ prefer_localhost_replica=1.
 -- Since in this case initial query and the query on the local node (to the
 -- underlying table) has the same counters, so if query on the remote node
diff --git a/tests/queries/0_stateless/01455_time_zones.sql b/tests/queries/0_stateless/01455_time_zones.sql
index 4024dbb3348..b04655fb758 100644
--- a/tests/queries/0_stateless/01455_time_zones.sql
+++ b/tests/queries/0_stateless/01455_time_zones.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled
+
 -- There are currently 594 timezones which are used from the binary embedded inside the ClickHouse binary
 -- Refer: contrib/cctz-cmake/CMakeLists.txt for the complete list. The count may change but we expect there will be at least 500 timezones.
 -- SELECT count(*)
diff --git a/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql b/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
index 1470d8c8d4f..ee144264193 100644
--- a/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
+++ b/tests/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SET optimize_move_functions_out_of_any = 1;
 SET optimize_injective_functions_inside_uniq = 1;
 SET optimize_arithmetic_operations_in_aggregate_functions = 1;
diff --git a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
index a2e4804f12e..b7cbfc92c26 100644
--- a/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
+++ b/tests/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS tbl;
 CREATE TABLE tbl(a String, b UInt32, c Float64, d Int64, e UInt8) ENGINE=MergeTree ORDER BY tuple();
 INSERT INTO tbl SELECT number, number * 2, number * 3, number * 4, number * 5 FROM system.numbers LIMIT 10;
diff --git a/tests/queries/0_stateless/01457_create_as_table_function_structure.sql b/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
index 9399f06220b..d7c681dc615 100644
--- a/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
+++ b/tests/queries/0_stateless/01457_create_as_table_function_structure.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01457;
 
 CREATE DATABASE test_01457;
diff --git a/tests/queries/0_stateless/01457_int256_hashing.sql b/tests/queries/0_stateless/01457_int256_hashing.sql
index d6d655e80f3..861e567950a 100644
--- a/tests/queries/0_stateless/01457_int256_hashing.sql
+++ b/tests/queries/0_stateless/01457_int256_hashing.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT toUInt256(123) IN (NULL);
 SELECT toUInt256(123) AS k GROUP BY k;
 SELECT toUInt256(123) AS k FROM system.one INNER JOIN (SELECT toUInt256(123) AS k) t USING k;
diff --git a/tests/queries/0_stateless/01459_decimal_casts.reference b/tests/queries/0_stateless/01459_decimal_casts.reference
index bd635ee0235..b195ff881c0 100644
--- a/tests/queries/0_stateless/01459_decimal_casts.reference
+++ b/tests/queries/0_stateless/01459_decimal_casts.reference
@@ -1,12 +1,12 @@
-0	0.0	0.00000	0.000000	0.0000000
-1	1.0	1.00000	1.000000	1.0000000
-2	2.0	2.00000	2.000000	2.0000000
-3	3.0	3.00000	3.000000	3.0000000
-4	4.0	4.00000	4.000000	4.0000000
-5	5.0	5.00000	5.000000	5.0000000
-6	6.0	6.00000	6.000000	6.0000000
-7	7.0	7.00000	7.000000	7.0000000
-8	8.0	8.00000	8.000000	8.0000000
+0	0	0	0	0
+1	1	1	1	1
+2	2	2	2	2
+3	3	3	3	3
+4	4	4	4	4
+5	5	5	5	5
+6	6	6	6	6
+7	7	7	7	7
+8	8	8	8	8
 9	9	9
 10	10	10
 11	11	11
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
index cf239fd7032..13c772e75d2 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: replica, no-parallel
 
 set -e
 
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
index 8c322798173..6eabc9ae1b5 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: replica, no-replicated-database, no-parallel
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql b/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
index 02e3d3ef73f..9b7a98f30bc 100644
--- a/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
+++ b/tests/queries/0_stateless/01460_DistributedFilesToInsert.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel, no-fasttest
+-- Tag no-fasttest: Look at DistributedFilesToInsert, so cannot run in parallel.
+
 -- otherwise SYSTEM STOP DISTRIBUTED SENDS does not makes any effect (for localhost)
 -- (i.e. no .bin files and hence no sending is required)
 set prefer_localhost_replica=0;
diff --git a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
index 04276087ece..3c855c984b3 100644
--- a/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
+++ b/tests/queries/0_stateless/01463_test_alter_live_view_refresh.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database, no-parallel, no-fasttest
+
 CREATE TABLE test0 (
         c0 UInt64
     ) ENGINE = MergeTree() PARTITION BY c0 ORDER BY c0;
diff --git a/tests/queries/0_stateless/01465_ttl_recompression.sql b/tests/queries/0_stateless/01465_ttl_recompression.sql
index 2388e727722..a73be94f2c9 100644
--- a/tests/queries/0_stateless/01465_ttl_recompression.sql
+++ b/tests/queries/0_stateless/01465_ttl_recompression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS recompression_table;
 
 CREATE TABLE recompression_table
diff --git a/tests/queries/0_stateless/01470_columns_transformers.reference b/tests/queries/0_stateless/01470_columns_transformers.reference
index ae0adb3ba60..8fa86582018 100644
--- a/tests/queries/0_stateless/01470_columns_transformers.reference
+++ b/tests/queries/0_stateless/01470_columns_transformers.reference
@@ -54,8 +54,8 @@ SELECT
     sum(k)
 FROM columns_transformers
 SELECT
-    avg(i + 1 AS i),
-    avg(j + 2 AS j),
+    avg(i) + 1,
+    avg(j) + 2,
     avg(k)
 FROM columns_transformers
 SELECT
diff --git a/tests/queries/0_stateless/01470_columns_transformers2.reference b/tests/queries/0_stateless/01470_columns_transformers2.reference
index 18c0f5c7e89..6d196530135 100644
--- a/tests/queries/0_stateless/01470_columns_transformers2.reference
+++ b/tests/queries/0_stateless/01470_columns_transformers2.reference
@@ -1 +1,4 @@
 100	10	324	120.00 B	8.00 B	23.00 B
+0
+SELECT argMax(number, number)
+FROM numbers(1)
diff --git a/tests/queries/0_stateless/01470_columns_transformers2.sql b/tests/queries/0_stateless/01470_columns_transformers2.sql
index 3691ef1e65d..88513d023c4 100644
--- a/tests/queries/0_stateless/01470_columns_transformers2.sql
+++ b/tests/queries/0_stateless/01470_columns_transformers2.sql
@@ -5,3 +5,6 @@ INSERT INTO columns_transformers VALUES (100, 10, 324, 120, 8, 23);
 SELECT  * EXCEPT 'bytes', COLUMNS('bytes') APPLY formatReadableSize FROM columns_transformers;
 
 DROP TABLE IF EXISTS columns_transformers;
+
+SELECT * APPLY x->argMax(x, number) FROM numbers(1);
+EXPLAIN SYNTAX SELECT * APPLY x->argMax(x, number) FROM numbers(1);
diff --git a/tests/queries/0_stateless/01470_show_databases_like.sql b/tests/queries/0_stateless/01470_show_databases_like.sql
index 46ec8878105..33fee27acdb 100644
--- a/tests/queries/0_stateless/01470_show_databases_like.sql
+++ b/tests/queries/0_stateless/01470_show_databases_like.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create database if not exists test_01470;
 show databases like '%01470';
 drop database test_01470;
diff --git a/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql b/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
index 901c47bc10f..ea8aa1814a3 100644
--- a/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
+++ b/tests/queries/0_stateless/01471_calculate_ttl_during_merge.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_for_ttl;
 
 CREATE TABLE table_for_ttl(
diff --git a/tests/queries/0_stateless/01473_event_time_microseconds.sql b/tests/queries/0_stateless/01473_event_time_microseconds.sql
index 488ee37e6d8..9c6b392a8aa 100644
--- a/tests/queries/0_stateless/01473_event_time_microseconds.sql
+++ b/tests/queries/0_stateless/01473_event_time_microseconds.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
+
 -- This file contains tests for the event_time_microseconds field for various tables.
 -- Note: Only event_time_microseconds for asynchronous_metric_log table is tested via
 -- an integration test as those metrics take 60s by default to be updated.
diff --git a/tests/queries/0_stateless/01474_bad_global_join.sql b/tests/queries/0_stateless/01474_bad_global_join.sql
index cd98c0f60ec..b65b4e804a8 100644
--- a/tests/queries/0_stateless/01474_bad_global_join.sql
+++ b/tests/queries/0_stateless/01474_bad_global_join.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 DROP TABLE IF EXISTS local_table;
 DROP TABLE IF EXISTS dist_table;
 
diff --git a/tests/queries/0_stateless/01474_decimal_scale_bug.reference b/tests/queries/0_stateless/01474_decimal_scale_bug.reference
index 69c14de597f..26c53bc9984 100644
--- a/tests/queries/0_stateless/01474_decimal_scale_bug.reference
+++ b/tests/queries/0_stateless/01474_decimal_scale_bug.reference
@@ -1,18 +1,18 @@
-1.000	Decimal(9, 3)
-1.000	Decimal(9, 3)
-1.0000	Decimal(18, 4)
-1.0000	Decimal(18, 4)
-1.00000	Decimal(38, 5)
-1.00000	Decimal(38, 5)
-1.000	Decimal(18, 3)
-1.000	Decimal(18, 3)
-1.0000	Decimal(18, 4)
-1.0000	Decimal(18, 4)
-1.00000	Decimal(38, 5)
-1.00000	Decimal(38, 5)
-1.000	Decimal(38, 3)
-1.000	Decimal(38, 3)
-1.0000	Decimal(38, 4)
-1.0000	Decimal(38, 4)
-1.00000	Decimal(38, 5)
-1.00000	Decimal(38, 5)
+1	Decimal(9, 3)
+1	Decimal(9, 3)
+1	Decimal(18, 4)
+1	Decimal(18, 4)
+1	Decimal(38, 5)
+1	Decimal(38, 5)
+1	Decimal(18, 3)
+1	Decimal(18, 3)
+1	Decimal(18, 4)
+1	Decimal(18, 4)
+1	Decimal(38, 5)
+1	Decimal(38, 5)
+1	Decimal(38, 3)
+1	Decimal(38, 3)
+1	Decimal(38, 4)
+1	Decimal(38, 4)
+1	Decimal(38, 5)
+1	Decimal(38, 5)
diff --git a/tests/queries/0_stateless/01474_executable_dictionary.sql b/tests/queries/0_stateless/01474_executable_dictionary.sql
index 727cf47f79f..6937a09928e 100644
--- a/tests/queries/0_stateless/01474_executable_dictionary.sql
+++ b/tests/queries/0_stateless/01474_executable_dictionary.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-parallel
+-- Tag no-tsan: informational stderr from sanitizer at start
+
 SELECT number, dictGet('executable_complex', 'a', (number, number)) AS a, dictGet('executable_complex', 'b', (number, number)) AS b FROM numbers(1000000) WHERE number = 999999;
 SELECT number, dictGet('executable_complex_direct', 'a', (number, number)) AS a, dictGet('executable_complex_direct', 'b', (number, number)) AS b FROM numbers(1000000) WHERE number = 999999;
 SELECT number, dictGet('executable_simple', 'a', number) AS a, dictGet('executable_simple', 'b', number) AS b FROM numbers(1000000) WHERE number = 999999;
diff --git a/tests/queries/0_stateless/01480_binary_operator_monotonicity.reference b/tests/queries/0_stateless/01480_binary_operator_monotonicity.reference
index 405d3348775..cd7edf71738 100644
--- a/tests/queries/0_stateless/01480_binary_operator_monotonicity.reference
+++ b/tests/queries/0_stateless/01480_binary_operator_monotonicity.reference
@@ -6,3 +6,4 @@
 0
 0
 0
+40	4
diff --git a/tests/queries/0_stateless/01480_binary_operator_monotonicity.sql b/tests/queries/0_stateless/01480_binary_operator_monotonicity.sql
index 61313de4669..b49e2aa4da5 100644
--- a/tests/queries/0_stateless/01480_binary_operator_monotonicity.sql
+++ b/tests/queries/0_stateless/01480_binary_operator_monotonicity.sql
@@ -43,3 +43,13 @@ DROP TABLE IF EXISTS binary_op_mono5;
 DROP TABLE IF EXISTS binary_op_mono6;
 DROP TABLE IF EXISTS binary_op_mono7;
 DROP TABLE IF EXISTS binary_op_mono8;
+
+drop table if exists x;
+create table x (i int, j int) engine MergeTree order by i / 10 settings index_granularity = 1;
+
+insert into x values (10, 1), (20, 2), (30, 3), (40, 4);
+
+set max_rows_to_read = 3;
+select * from x where i > 30; -- converted to i / 10 >= 3, thus needs to read 3 granules.
+
+drop table x;
diff --git a/tests/queries/0_stateless/01486_json_array_output.sql b/tests/queries/0_stateless/01486_json_array_output.sql
index f8c707d4bee..a9318008874 100644
--- a/tests/queries/0_stateless/01486_json_array_output.sql
+++ b/tests/queries/0_stateless/01486_json_array_output.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 set output_format_json_array_of_rows = 1;
 select number a, number * 2 b from numbers(3) format JSONEachRow;
 select * from numbers(1) format JSONEachRow;
diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
index 39e04804bfb..ccd2c571290 100644
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
+++ b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed, no-parallel
+
 CREATE DATABASE IF NOT EXISTS shard_0;
 CREATE DATABASE IF NOT EXISTS shard_1;
 CREATE DATABASE IF NOT EXISTS main_01487;
diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.reference b/tests/queries/0_stateless/01492_format_readable_quantity.reference
index 3736933b5ee..e58a1954eee 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.reference
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.reference
@@ -43,8 +43,3 @@
 1739.27 quadrillion	1739.27 quadrillion	-2.15 billion
 4727.84 quadrillion	4727.84 quadrillion	-2.15 billion
 12851.60 quadrillion	12851.60 quadrillion	-2.15 billion
-34934.27 quadrillion	0.00	-2.15 billion
-94961.19 quadrillion	0.00	-2.15 billion
-258131.29 quadrillion	0.00	-2.15 billion
-701673.59 quadrillion	0.00	-2.15 billion
-1907346.57 quadrillion	0.00	-2.15 billion
diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.sql b/tests/queries/0_stateless/01492_format_readable_quantity.sql
index c2ebcfc1a97..3931cde49df 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.sql
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.sql
@@ -1,4 +1,4 @@
 WITH round(exp(number), 6) AS x, toUInt64(x) AS y, toInt32(x) AS z
 SELECT formatReadableQuantity(x), formatReadableQuantity(y), formatReadableQuantity(z)
 FROM system.numbers
-LIMIT 50;
+LIMIT 45;
diff --git a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper.reference b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.reference
similarity index 58%
rename from tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper.reference
rename to tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.reference
index 82f6fbd6615..a770460c8b8 100644
--- a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper.reference
+++ b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.reference
@@ -1,4 +1,4 @@
 CREATE TABLE default.no_prop_table\n(\n    `some_column` UInt64\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 CREATE TABLE default.no_prop_table\n(\n    `some_column` UInt64\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_no_prop_table\n(\n    `some_column` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/01493_r_no_prop_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_no_prop_table\n(\n    `some_column` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test/01493_r_no_prop_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_no_prop_table\n(\n    `some_column` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test/01493_r_no_prop_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_no_prop_table\n(\n    `some_column` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test/01493_r_no_prop_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper.sql b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
similarity index 94%
rename from tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper.sql
rename to tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
index aceb4e8140d..e9859d3fe96 100644
--- a/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS no_prop_table;
 
 CREATE TABLE no_prop_table
@@ -29,7 +31,7 @@ CREATE TABLE r_no_prop_table
 (
   some_column UInt64
 )
-ENGINE ReplicatedMergeTree('/clickhouse/test/01493_r_no_prop_table', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/{database}/test/01493_r_no_prop_table', '1')
 ORDER BY tuple();
 
 SHOW CREATE TABLE r_no_prop_table;
diff --git a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.reference b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.reference
index 7cd2c81b460..42f9b24715f 100644
--- a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.reference
+++ b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.reference
@@ -1,21 +1,21 @@
-CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date COMMENT \'Some comment\',\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date COMMENT \'Some comment\',\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date COMMENT \'Some comment\',\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date COMMENT \'Some comment\',\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
 ====== remove column comment ======
-CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String CODEC(ZSTD(10)),\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
 ====== remove column codec ======
-CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64 DEFAULT 42,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
 ====== remove column default ======
 42	str	1
 0	tsr	2
-CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64 TTL column_comment + toIntervalMonth(1)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
 ====== remove column TTL ======
-CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nTTL column_comment + toIntervalMonth(2)\nSETTINGS index_granularity = 8192
 ====== remove table TTL ======
-CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table1\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.r_prop_table2\n(\n    `column_default` UInt64,\n    `column_codec` String,\n    `column_comment` Date,\n    `column_ttl` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/test_01493/r_prop_table\', \'2\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 3
 3
diff --git a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
index b810e2a8737..92e6fce2c93 100644
--- a/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
+++ b/tests/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS r_prop_table1;
 DROP TABLE IF EXISTS r_prop_table2;
 
@@ -10,7 +12,7 @@ CREATE TABLE r_prop_table1
   column_comment Date COMMENT 'Some comment',
   column_ttl UInt64 TTL column_comment + INTERVAL 1 MONTH
 )
-ENGINE ReplicatedMergeTree('/clickhouse/test_01493/r_prop_table', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/{database}/test_01493/r_prop_table', '1')
 ORDER BY tuple()
 TTL column_comment + INTERVAL 2 MONTH;
 
@@ -21,7 +23,7 @@ CREATE TABLE r_prop_table2
   column_comment Date COMMENT 'Some comment',
   column_ttl UInt64 TTL column_comment + INTERVAL 1 MONTH
 )
-ENGINE ReplicatedMergeTree('/clickhouse/test_01493/r_prop_table', '2')
+ENGINE ReplicatedMergeTree('/clickhouse/{database}/test_01493/r_prop_table', '2')
 ORDER BY tuple()
 TTL column_comment + INTERVAL 2 MONTH;
 
diff --git a/tests/queries/0_stateless/01493_storage_set_persistency.sql b/tests/queries/0_stateless/01493_storage_set_persistency.sql
index 9298a24bf73..558e92fbfe9 100644
--- a/tests/queries/0_stateless/01493_storage_set_persistency.sql
+++ b/tests/queries/0_stateless/01493_storage_set_persistency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS set;
 DROP TABLE IF EXISTS number;
 
diff --git a/tests/queries/0_stateless/01494_storage_join_persistency.sql b/tests/queries/0_stateless/01494_storage_join_persistency.sql
index c362a78dccd..9ea7196aa24 100644
--- a/tests/queries/0_stateless/01494_storage_join_persistency.sql
+++ b/tests/queries/0_stateless/01494_storage_join_persistency.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS join;
 
 SELECT '----- Default Settings -----';
diff --git a/tests/queries/0_stateless/01499_json_named_tuples.sql b/tests/queries/0_stateless/01499_json_named_tuples.sql
index 896c3ecb2bb..947455f0320 100644
--- a/tests/queries/0_stateless/01499_json_named_tuples.sql
+++ b/tests/queries/0_stateless/01499_json_named_tuples.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 create table named_tuples engine File(JSONEachRow)
     settings output_format_json_named_tuples_as_objects = 1
     as select cast(tuple(number, number * 2), 'Tuple(a int, b int)') c
diff --git a/tests/queries/0_stateless/01499_log_deadlock.sql b/tests/queries/0_stateless/01499_log_deadlock.sql
index e98b37f2455..f361297e0b8 100644
--- a/tests/queries/0_stateless/01499_log_deadlock.sql
+++ b/tests/queries/0_stateless/01499_log_deadlock.sql
@@ -1,3 +1,5 @@
+-- Tags: deadlock
+
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (x UInt8) ENGINE = TinyLog;
 
diff --git a/tests/queries/0_stateless/01500_StorageFile_write_to_fd.sh b/tests/queries/0_stateless/01500_StorageFile_write_to_fd.sh
index e6fe5d17cd0..1d66f374a20 100755
--- a/tests/queries/0_stateless/01500_StorageFile_write_to_fd.sh
+++ b/tests/queries/0_stateless/01500_StorageFile_write_to_fd.sh
@@ -7,4 +7,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # The following command will execute:
 #     CREATE TABLE table (key UInt32) ENGINE = File(TSV, stdin);
 #     INSERT INTO `table` SELECT key FROM input('key UInt32') FORMAT TSV
-${CLICKHOUSE_LOCAL} -S 'key UInt32' -q "INSERT INTO \`table\` SELECT key FROM input('key UInt32') FORMAT TSV" < /dev/null
+${CLICKHOUSE_LOCAL} -S 'key UInt32' -q "INSERT INTO \`table\` SELECT key FROM input('key UInt32') FORMAT TSV" < /dev/null 2>&1 \
+    | grep -q "No data to insert" || echo "Fail"
diff --git a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.reference b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.reference
index a67d5f46131..f04b50d6489 100644
--- a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.reference
+++ b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.reference
@@ -8,9 +8,9 @@
 [-9223372036854775808,-4,-44,-444,-4444,-44444]
 [111.11,22.543,21.543,13.334,52.001,33.333]
 [222.11,3332154213.4,3111154213.9,3222187213.1,3237554213.5,3222193713.7]
-[333.11000,0.00001,0.00002,0.00003,0.00004,0.00005]
-[444.110000000000000,0.000000000000001,0.000000000000002,0.000000000000003,0.000000000000004,0.000000000000005]
-[555.11000000000000000000000000000000000,0.00000000000000000000000000000000001,0.00000000000000000000000000000000002,0.00000000000000000000000000000000003,0.00000000000000000000000000000000004,0.00000000000000000000000000000000005]
+[333.11,0.00001,0.00002,0.00003,0.00004,0.00005]
+[444.11,0.000000000000001,0.000000000000002,0.000000000000003,0.000000000000004,0.000000000000005]
+[555.11,0.00000000000000000000000000000000001,0.00000000000000000000000000000000002,0.00000000000000000000000000000000003,0.00000000000000000000000000000000004,0.00000000000000000000000000000000005]
 ['hi','clickhouse','hello','dbms','MergeTree','dictionary']
 [55,2,22,222,174,206]
 [65535,3,33,333,3333,33333]
@@ -22,9 +22,9 @@
 [-9223372036854775808,-4,-44,-444,-4444,-44444]
 [111.11,22.543,21.543,13.334,52.001,33.333]
 [222.11,3332154213.4,3111154213.9,3222187213.1,3237554213.5,3222193713.7]
-[333.11000,0.00001,0.00002,0.00003,0.00004,0.00005]
-[444.110000000000000,0.000000000000001,0.000000000000002,0.000000000000003,0.000000000000004,0.000000000000005]
-[555.11000000000000000000000000000000000,0.00000000000000000000000000000000001,0.00000000000000000000000000000000002,0.00000000000000000000000000000000003,0.00000000000000000000000000000000004,0.00000000000000000000000000000000005]
+[333.11,0.00001,0.00002,0.00003,0.00004,0.00005]
+[444.11,0.000000000000001,0.000000000000002,0.000000000000003,0.000000000000004,0.000000000000005]
+[555.11,0.00000000000000000000000000000000001,0.00000000000000000000000000000000002,0.00000000000000000000000000000000003,0.00000000000000000000000000000000004,0.00000000000000000000000000000000005]
 ['hi','clickhouse','hello','dbms','MergeTree','dictionary']
 [0,1,1,1,1,1,0,0,0,0]
 [0,1,1,1,1,1,0,0,0,0]
diff --git a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
index bb9fb0caa6c..9b383399c51 100644
--- a/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
+++ b/tests/queries/0_stateless/01501_cache_dictionary_all_fields.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop database if exists db_01501;
 drop table if exists db_01501.table_cache_dict;
 drop dictionary if exists db_01501.cache_dict;
diff --git a/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh b/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
index 2abb1818529..b84aeb48caa 100755
--- a/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
+++ b/tests/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
index 667a612ff23..b659d550fa4 100755
--- a/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 set -e
 
@@ -25,28 +26,28 @@ function thread_drop {
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: '| grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
diff --git a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
index 9f31fcb6da1..1087a7ed96b 100755
--- a/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
+++ b/tests/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 set -e
 
@@ -18,35 +19,35 @@ function thread_create {
 
 function thread_drop {
     while true; do
-        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS $1" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_rename {
     while true; do
-        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|57)'
+        $CLICKHOUSE_CLIENT --query "RENAME TABLE $1 TO $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|57)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "SELECT * FROM $1 FORMAT Null" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT rand64(1), [toString(rand64(2))] FROM numbers($2)" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
 
 function thread_insert_select {
     while true; do
-        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -F 'Received exception from server' | grep -v -P 'Code: (60|218)'
+        $CLICKHOUSE_CLIENT --query "INSERT INTO $1 SELECT * FROM $2" 2>&1 | grep -v -e 'Received exception from server' -e '^(query: ' | grep -v -P 'Code: (60|218)'
         sleep 0.0$RANDOM
     done
 }
diff --git a/tests/queries/0_stateless/01504_rocksdb.sql b/tests/queries/0_stateless/01504_rocksdb.sql
index 9e30263c6b3..9f9e6c3b1ac 100644
--- a/tests/queries/0_stateless/01504_rocksdb.sql
+++ b/tests/queries/0_stateless/01504_rocksdb.sql
@@ -1,3 +1,7 @@
+-- Tags: no-ordinary-database, no-fasttest
+-- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
+-- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+
 DROP TABLE IF EXISTS 01504_test;
 
 CREATE TABLE 01504_test (key String, value UInt32) Engine=EmbeddedRocksDB; -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql b/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
index 6f62716d312..85c07a95919 100644
--- a/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
+++ b/tests/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS t;
 DROP TABLE IF EXISTS d;
 
diff --git a/tests/queries/0_stateless/01505_log_distributed_deadlock.sql b/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
index 2b0b2b97188..49817dbed32 100644
--- a/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
+++ b/tests/queries/0_stateless/01505_log_distributed_deadlock.sql
@@ -1,3 +1,5 @@
+-- Tags: deadlock, distributed
+
 DROP TABLE IF EXISTS t_local;
 DROP TABLE IF EXISTS t_dist;
 
diff --git a/tests/queries/0_stateless/01506_buffer_table_alter_block_structure_2.reference b/tests/queries/0_stateless/01506_buffer_table_alter_block_structure_2.reference
new file mode 100644
index 00000000000..1f90610041b
--- /dev/null
+++ b/tests/queries/0_stateless/01506_buffer_table_alter_block_structure_2.reference
@@ -0,0 +1,3 @@
+2020-01-01 00:05:00	
+2020-01-01 00:05:00	
+2020-01-01 00:06:00	hello
diff --git a/tests/queries/0_stateless/01506_buffer_table_alter_block_structure_2.sql b/tests/queries/0_stateless/01506_buffer_table_alter_block_structure_2.sql
new file mode 100644
index 00000000000..8862037c82b
--- /dev/null
+++ b/tests/queries/0_stateless/01506_buffer_table_alter_block_structure_2.sql
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS buf_dest;
+DROP TABLE IF EXISTS buf;
+
+CREATE TABLE buf_dest (timestamp DateTime)
+ENGINE = MergeTree PARTITION BY toYYYYMMDD(timestamp)
+ORDER BY (timestamp);
+
+CREATE TABLE buf (timestamp DateTime) Engine = Buffer(currentDatabase(), buf_dest, 16, 0.1, 0.1, 2000000, 20000000, 100000000, 300000000);;
+
+INSERT INTO buf (timestamp) VALUES (toDateTime('2020-01-01 00:05:00'));
+
+--- wait for buffer to flush
+SELECT sleep(1) from numbers(1) settings max_block_size=1 format Null;
+
+ALTER TABLE buf_dest ADD COLUMN s String;
+ALTER TABLE buf ADD COLUMN s String;
+
+SELECT * FROM buf;
+
+INSERT INTO buf (timestamp, s) VALUES (toDateTime('2020-01-01 00:06:00'), 'hello');
+
+SELECT * FROM buf ORDER BY timestamp;
+
+DROP TABLE IF EXISTS buf;
+DROP TABLE IF EXISTS buf_dest;
diff --git a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
index 5b8f0cba639..29593ea4fb5 100755
--- a/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
+++ b/tests/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_PORT_TCP=50111
 CLICKHOUSE_DATABASE=default
@@ -11,7 +12,7 @@ echo "Starting clickhouse-server"
 
 $PORT
 
-$CLICKHOUSE_BINARY-server -- --tcp_port "$CLICKHOUSE_PORT_TCP" > server.log 2>&1 &
+$CLICKHOUSE_BINARY server -- --tcp_port "$CLICKHOUSE_PORT_TCP" --path /tmp/ > server.log 2>&1 &
 PID=$!
 
 function finish {
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.sh b/tests/queries/0_stateless/01508_partition_pruning_long.sh
index 745d08496a7..ddf63bf4808 100755
--- a/tests/queries/0_stateless/01508_partition_pruning_long.sh
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-polymorphic-parts
+# Tag no-polymorphic-parts: bug, shoud be fixed
 
 # Description of test result:
 # Test the correctness of the partition pruning
diff --git a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
index 156deb60ff9..7db9f22951c 100755
--- a/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, zookeeper
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
index 52dea650ebc..e9b7db9d530 100644
--- a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
+++ b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
@@ -1,10 +1,6 @@
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
-100	0	99	4950
+30	0	54	810
+30	0	54	810
+30	0	54	810
+30	0	54	810
+30	0	54	810
+30	0	54	810
diff --git a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
index 187357b94e2..030ae017e71 100755
--- a/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
@@ -6,7 +8,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-NUM_REPLICAS=10
+NUM_REPLICAS=6
 
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT -n -q "
@@ -16,18 +18,19 @@ for i in $(seq 1 $NUM_REPLICAS); do
 done
 
 function thread {
-    while true
-    do
-        $CLICKHOUSE_CLIENT --insert_quorum 5 --insert_quorum_parallel 1 --query "INSERT INTO r$1 SELECT $2" && break
+    i=0 retries=300
+    while [[ $i -lt $retries ]]; do # server can be dead
+        $CLICKHOUSE_CLIENT --insert_quorum 3 --insert_quorum_parallel 1 --query "INSERT INTO r$1 SELECT $2" && break
+        ((++i))
         sleep 0.1
     done
 }
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    for j in {0..9}; do
+    for j in {0..4}; do
         a=$((($i - 1) * 10 + $j))
 
-        # Note: making 100 connections simultaneously is a mini-DoS when server is build with sanitizers and CI environment is overloaded.
+        # Note: making 30 connections simultaneously is a mini-DoS when server is build with sanitizers and CI environment is overloaded.
         # That's why we repeat "socket timeout" errors.
         thread $i $a 2>&1 | grep -v -P 'SOCKET_TIMEOUT|NETWORK_ERROR|^$' &
     done
@@ -43,5 +46,5 @@ for i in $(seq 1 $NUM_REPLICAS); do
 done
 
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS r$i;"
+    $CLICKHOUSE_CLIENT -n -q "DROP TABLE IF EXISTS r$i SYNC;"
 done
diff --git a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
index 78336ea073b..1589f17c752 100755
--- a/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
+++ b/tests/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_dictionary_preallocate.sh b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
index f2bc17d2e90..7b0448bfde8 100755
--- a/tests/queries/0_stateless/01509_dictionary_preallocate.sh
+++ b/tests/queries/0_stateless/01509_dictionary_preallocate.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 # shellcheck disable=SC2031
 # shellcheck disable=SC2030
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
index fbeb65419ce..f3cdb70a074 100755
--- a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
+++ b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database
+# Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
 
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.reference b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.reference
rename to tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.reference
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
similarity index 87%
rename from tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
rename to tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
index 16c4a4df936..2f0c59ab64b 100644
--- a/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
+++ b/tests/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
@@ -1,16 +1,19 @@
+-- Tags: long, replica, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS r1 SYNC;
 DROP TABLE IF EXISTS r2 SYNC;
 
 CREATE TABLE r1 (
     key UInt64, value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01509_parallel_quorum_insert_no_replicas', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/01509_parallel_quorum_insert_no_replicas', '1')
 ORDER BY tuple();
 
 CREATE TABLE r2 (
     key UInt64, value String
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01509_parallel_quorum_insert_no_replicas', '2')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/01509_parallel_quorum_insert_no_replicas', '2')
 ORDER BY tuple();
 
 SET insert_quorum_parallel=1;
diff --git a/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql b/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
index 17a6b8883a4..aff4e100579 100644
--- a/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
+++ b/tests/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_with_version_replicated_1;
 DROP TABLE IF EXISTS table_with_version_replicated_2;
 
diff --git a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
index f33c1534a44..fbdf68e6063 100644
--- a/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
+++ b/tests/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
@@ -1,3 +1,5 @@
-CREATE TABLE mt (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01497/mt')
+-- Tags: replica
+
+CREATE TABLE mt (v UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01497/mt')
     ORDER BY tuple() -- { serverError 36 }
 
diff --git a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.reference b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.reference
rename to tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.sql b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
similarity index 77%
rename from tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.sql
rename to tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
index 0eb9f20ad91..f800ff86aa5 100644
--- a/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.sql
+++ b/tests/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
@@ -1,12 +1,14 @@
+-- Tags: long, zookeeper
+
 SET send_logs_level = 'fatal';
 
 DROP TABLE IF EXISTS quorum1 SYNC;
 DROP TABLE IF EXISTS quorum2 SYNC;
 DROP TABLE IF EXISTS quorum3 SYNC;
 
-CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01513/sequence_consistency', '1') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01513/sequence_consistency', '2') ORDER BY x PARTITION BY y;
-CREATE TABLE quorum3(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/test_01513/sequence_consistency', '3') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum1(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01513/sequence_consistency', '1') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum2(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01513/sequence_consistency', '2') ORDER BY x PARTITION BY y;
+CREATE TABLE quorum3(x UInt32, y Date) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_01513/sequence_consistency', '3') ORDER BY x PARTITION BY y;
 
 INSERT INTO quorum1 VALUES (1, '1990-11-15');
 INSERT INTO quorum1 VALUES (2, '1990-11-15');
diff --git a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
index 87c66609421..cca994e8e4a 100644
--- a/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
+++ b/tests/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists data_01513;
 create table data_01513 (key String) engine=MergeTree() order by key;
 -- 10e3 groups, 1e3 keys each
diff --git a/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh b/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
index 726dcc8ee6d..99025890cb3 100755
--- a/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
+++ b/tests/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
index 8d55a257c47..0b2cb8c64e2 100644
--- a/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
+++ b/tests/queries/0_stateless/01514_input_format_json_enum_as_number.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS table_with_enum_column_for_json_insert;
 
 CREATE TABLE table_with_enum_column_for_json_insert (
diff --git a/tests/queries/0_stateless/01515_logtrace_function.sh b/tests/queries/0_stateless/01515_logtrace_function.sh
index 9953fc2ae2b..131ec0edb9e 100755
--- a/tests/queries/0_stateless/01515_logtrace_function.sh
+++ b/tests/queries/0_stateless/01515_logtrace_function.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
index cd62dfa993d..31151fbc8f4 100644
--- a/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
+++ b/tests/queries/0_stateless/01515_with_global_and_with_propagation.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SET enable_global_with_statement = 1;
 
 with 1 as x select x;
diff --git a/tests/queries/0_stateless/01516_create_table_primary_key.sql b/tests/queries/0_stateless/01516_create_table_primary_key.sql
index c0e9ce4a34d..b3c4acd50ff 100644
--- a/tests/queries/0_stateless/01516_create_table_primary_key.sql
+++ b/tests/queries/0_stateless/01516_create_table_primary_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01516;
 CREATE DATABASE test_01516 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01516;
diff --git a/tests/queries/0_stateless/01516_drop_table_stress.sh b/tests/queries/0_stateless/01516_drop_table_stress.sh
deleted file mode 100755
index d72104c8c7f..00000000000
--- a/tests/queries/0_stateless/01516_drop_table_stress.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-function drop_database()
-{
-    # redirect stderr since it is racy with DROP TABLE
-    # and tries to remove db_01516.data too.
-    ${CLICKHOUSE_CLIENT} -q "DROP DATABASE IF EXISTS db_01516" 2>/dev/null
-}
-
-function drop_table()
-{
-    ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS db_01516.data3;" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
-    ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS db_01516.data1;" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
-    ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS db_01516.data2;" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
-}
-
-function create()
-{
-    ${CLICKHOUSE_CLIENT} -q "CREATE DATABASE IF NOT EXISTS db_01516;"
-    ${CLICKHOUSE_CLIENT} -q "CREATE TABLE IF NOT EXISTS db_01516.data1 Engine=MergeTree() ORDER BY number AS SELECT * FROM numbers(1);" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
-    ${CLICKHOUSE_CLIENT} -q "CREATE TABLE IF NOT EXISTS db_01516.data2 Engine=MergeTree() ORDER BY number AS SELECT * FROM numbers(1);" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
-    ${CLICKHOUSE_CLIENT} -q "CREATE TABLE IF NOT EXISTS db_01516.data3 Engine=MergeTree() ORDER BY number AS SELECT * FROM numbers(1);" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
-}
-
-for _ in {1..100}; do
-    create
-    drop_table &
-    drop_database &
-    wait
-done
diff --git a/tests/queries/0_stateless/01516_drop_table_stress_long.reference b/tests/queries/0_stateless/01516_drop_table_stress_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01516_drop_table_stress_long.sh b/tests/queries/0_stateless/01516_drop_table_stress_long.sh
new file mode 100755
index 00000000000..91818e45775
--- /dev/null
+++ b/tests/queries/0_stateless/01516_drop_table_stress_long.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+export CURR_DATABASE="test_01516_${CLICKHOUSE_DATABASE}"
+
+function drop_database()
+{
+    # redirect stderr since it is racy with DROP TABLE
+    # and tries to remove ${CURR_DATABASE}.data too.
+    ${CLICKHOUSE_CLIENT} -q "DROP DATABASE IF EXISTS ${CURR_DATABASE}" 2>/dev/null
+}
+trap drop_database EXIT
+
+function drop_table()
+{
+    ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ${CURR_DATABASE}.data3;" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
+    ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ${CURR_DATABASE}.data1;" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
+    ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS ${CURR_DATABASE}.data2;" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
+}
+
+function create()
+{
+    ${CLICKHOUSE_CLIENT} -q "CREATE DATABASE IF NOT EXISTS ${CURR_DATABASE};"
+    ${CLICKHOUSE_CLIENT} -q "CREATE TABLE IF NOT EXISTS ${CURR_DATABASE}.data1 Engine=MergeTree() ORDER BY number AS SELECT * FROM numbers(1);" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
+    ${CLICKHOUSE_CLIENT} -q "CREATE TABLE IF NOT EXISTS ${CURR_DATABASE}.data2 Engine=MergeTree() ORDER BY number AS SELECT * FROM numbers(1);" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
+    ${CLICKHOUSE_CLIENT} -q "CREATE TABLE IF NOT EXISTS ${CURR_DATABASE}.data3 Engine=MergeTree() ORDER BY number AS SELECT * FROM numbers(1);" 2>&1 | grep -F "Code: " | grep -Fv "is currently dropped or renamed"
+}
+
+for _ in {1..100}; do
+    create
+    drop_table &
+    drop_database &
+    wait
+done
diff --git a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
index b97480c2911..5e31faa70da 100644
--- a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
+++ b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 --
 -- Atomic no SYNC
 -- (should go first to check that thread for DROP TABLE does not hang)
diff --git a/tests/queries/0_stateless/01517_select_final_distributed.sql b/tests/queries/0_stateless/01517_select_final_distributed.sql
index 1acc4590982..a3d1fcfc185 100644
--- a/tests/queries/0_stateless/01517_select_final_distributed.sql
+++ b/tests/queries/0_stateless/01517_select_final_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS test5346;
 
 CREATE TABLE test5346 (`Id` String, `Timestamp` DateTime, `updated` DateTime) 
diff --git a/tests/queries/0_stateless/01518_nullable_aggregate_states2.reference b/tests/queries/0_stateless/01518_nullable_aggregate_states2.reference
index 7e353902742..4d17e2d1de9 100644
--- a/tests/queries/0_stateless/01518_nullable_aggregate_states2.reference
+++ b/tests/queries/0_stateless/01518_nullable_aggregate_states2.reference
@@ -6,2010 +6,2010 @@
 -3	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -4	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -5	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
-0	102	0	99900	0	300	150	15150	0	300	150	15150	0.00000	300.00000	150	15150.00000	2020-01-01	2020-01-02	2020-01-01 00:00:00	2020-01-02 03:45:00	2020-01-01 00:00:00.000	2020-01-02 03:45:00.000	0	99900	49950	5044950	0	99900	49950	5044950	-32569	32366	4529.009900990099	457430	-127	124	-2.9504950495049505	-298
-1	102	1	9991	0.003	300.003	150.003	15150.3033	0.003	300.003	150.003	15150.30329	0.00300	300.00300	150.003	15150.30300	2020-01-01	2020-01-02	2020-01-01 00:00:01	2020-01-02 03:45:01	2020-01-01 00:00:01.000	2020-01-02 03:45:01.000	1	99901	49951	5045051	1	99901	49951	5045051	-32568	32367	4530.009900990099	457531	-126	125	-1.9504950495049505	-197
+0	102	0	99900	0	300	150	15150	0	300	150	15150	0	300	150	15150	2020-01-01	2020-01-02	2020-01-01 00:00:00	2020-01-02 03:45:00	2020-01-01 00:00:00.000	2020-01-02 03:45:00.000	0	99900	49950	5044950	0	99900	49950	5044950	-32569	32366	4529.009900990099	457430	-127	124	-2.9504950495049505	-298
+1	102	1	9991	0.003	300.003	150.003	15150.3033	0.003	300.003	150.003	15150.30329	0.003	300.003	150.003	15150.303	2020-01-01	2020-01-02	2020-01-01 00:00:01	2020-01-02 03:45:01	2020-01-01 00:00:01.000	2020-01-02 03:45:01.000	1	99901	49951	5045051	1	99901	49951	5045051	-32568	32367	4530.009900990099	457531	-126	125	-1.9504950495049505	-197
 10	102	10	99910	0.03003	300.03003	150.03003	15153.03303	0.03003	300.03003	150.03002	15153.03296	0.03003	300.03003	150.03003	15153.03303	2020-01-01	2020-01-02	2020-01-01 00:00:10	2020-01-02 03:45:10	2020-01-01 00:00:10.000	2020-01-02 03:45:10.000	10	99910	49960	5045960	10	99910	49960	5045960	-32559	32376	4539.009900990099	458440	-128	127	-0.5544554455445545	-56
-100	101	100	99001	0.3003	297.3003	148.8003	14880.03003	0.3003	297.3003	148.80029	14880.02962	0.30030	297.30030	148.8003	14880.03000	2020-01-01	2020-01-02	2020-01-01 00:01:40	2020-01-02 03:30:01	2020-01-01 00:01:40.000	2020-01-02 03:30:01.000	100	99001	49550.5	4955050	100	99001	49550.5	4955050	-32469	32466	4986.02	498602	-127	124	-0.86	-86
-101	101	10091	99002	0.3033	297.3033	148.8033	14880.33033	0.3033	297.3033	148.8033	14880.33035	0.30330	297.30330	148.8033	14880.33000	2020-01-01	2020-01-02	2020-01-01 00:01:41	2020-01-02 03:30:02	2020-01-01 00:01:41.000	2020-01-02 03:30:02.000	101	99002	49551.5	4955150	101	99002	49551.5	4955150	-32468	32467	4987.02	498702	-126	125	0.14	14
-102	101	10092	99003	0.3063	297.3063	148.8063	14880.63063	0.3063	297.3063	148.8063	14880.6305	0.30630	297.30630	148.8063	14880.63000	2020-01-01	2020-01-02	2020-01-01 00:01:42	2020-01-02 03:30:03	2020-01-01 00:01:42.000	2020-01-02 03:30:03.000	102	99003	49552.5	4955250	102	99003	49552.5	4955250	-32467	32468	4988.02	498802	-125	126	1.14	114
-103	101	10093	99004	0.3093	297.3093	148.8093	14880.93093	0.3093	297.3093	148.8093	14880.93085	0.30930	297.30930	148.8093	14880.93000	2020-01-01	2020-01-02	2020-01-01 00:01:43	2020-01-02 03:30:04	2020-01-01 00:01:43.000	2020-01-02 03:30:04.000	103	99004	49553.5	4955350	103	99004	49553.5	4955350	-32466	32469	4989.02	498902	-124	127	2.14	214
-104	101	10094	99005	0.31231	297.31231	148.81231	14881.23123	0.31231	297.31232	148.81231	14881.23144	0.31231	297.31231	148.81231	14881.23100	2020-01-01	2020-01-02	2020-01-01 00:01:44	2020-01-02 03:30:05	2020-01-01 00:01:44.000	2020-01-02 03:30:05.000	104	99005	49554.5	4955450	104	99005	49554.5	4955450	-32465	32470	4990.02	499002	-128	127	0.58	58
-105	101	10095	99006	0.31531	297.31531	148.81531	14881.53153	0.31531	297.3153	148.81531	14881.53174	0.31531	297.31531	148.81531	14881.53100	2020-01-01	2020-01-02	2020-01-01 00:01:45	2020-01-02 03:30:06	2020-01-01 00:01:45.000	2020-01-02 03:30:06.000	105	99006	49555.5	4955550	105	99006	49555.5	4955550	-32464	32471	4991.02	499102	-128	123	-0.98	-98
-106	101	10096	99007	0.31831	297.31831	148.81831	14881.83183	0.31831	297.31833	148.81831	14881.83182	0.31831	297.31831	148.81831	14881.83100	2020-01-01	2020-01-02	2020-01-01 00:01:46	2020-01-02 03:30:07	2020-01-01 00:01:46.000	2020-01-02 03:30:07.000	106	99007	49556.5	4955650	106	99007	49556.5	4955650	-32463	32472	4992.02	499202	-127	124	0.02	2
-107	101	10097	99008	0.32132	297.32132	148.82132	14882.13213	0.32132	297.32132	148.82131	14882.13197	0.32132	297.32132	148.82132	14882.13200	2020-01-01	2020-01-02	2020-01-01 00:01:47	2020-01-02 03:30:08	2020-01-01 00:01:47.000	2020-01-02 03:30:08.000	107	99008	49557.5	4955750	107	99008	49557.5	4955750	-32462	32473	4993.02	499302	-126	125	1.02	102
-108	101	10098	99009	0.32432	297.32432	148.82432	14882.43243	0.32432	297.3243	148.82432	14882.43232	0.32432	297.32432	148.82432	14882.43200	2020-01-01	2020-01-02	2020-01-01 00:01:48	2020-01-02 03:30:09	2020-01-01 00:01:48.000	2020-01-02 03:30:09.000	108	99009	49558.5	4955850	108	99009	49558.5	4955850	-32461	32474	4994.02	499402	-125	126	2.02	202
-109	101	10099	99010	0.32732	297.32732	148.82732	14882.73273	0.32732	297.32733	148.82732	14882.7329	0.32732	297.32732	148.82732	14882.73200	2020-01-01	2020-01-02	2020-01-01 00:01:49	2020-01-02 03:30:10	2020-01-01 00:01:49.000	2020-01-02 03:30:10.000	109	99010	49559.5	4955950	109	99010	49559.5	4955950	-32460	32475	4995.02	499502	-124	127	3.02	302
+100	101	100	99001	0.3003	297.3003	148.8003	14880.03003	0.3003	297.3003	148.80029	14880.02962	0.3003	297.3003	148.8003	14880.03	2020-01-01	2020-01-02	2020-01-01 00:01:40	2020-01-02 03:30:01	2020-01-01 00:01:40.000	2020-01-02 03:30:01.000	100	99001	49550.5	4955050	100	99001	49550.5	4955050	-32469	32466	4986.02	498602	-127	124	-0.86	-86
+101	101	10091	99002	0.3033	297.3033	148.8033	14880.33033	0.3033	297.3033	148.8033	14880.33035	0.3033	297.3033	148.8033	14880.33	2020-01-01	2020-01-02	2020-01-01 00:01:41	2020-01-02 03:30:02	2020-01-01 00:01:41.000	2020-01-02 03:30:02.000	101	99002	49551.5	4955150	101	99002	49551.5	4955150	-32468	32467	4987.02	498702	-126	125	0.14	14
+102	101	10092	99003	0.3063	297.3063	148.8063	14880.63063	0.3063	297.3063	148.8063	14880.6305	0.3063	297.3063	148.8063	14880.63	2020-01-01	2020-01-02	2020-01-01 00:01:42	2020-01-02 03:30:03	2020-01-01 00:01:42.000	2020-01-02 03:30:03.000	102	99003	49552.5	4955250	102	99003	49552.5	4955250	-32467	32468	4988.02	498802	-125	126	1.14	114
+103	101	10093	99004	0.3093	297.3093	148.8093	14880.93093	0.3093	297.3093	148.8093	14880.93085	0.3093	297.3093	148.8093	14880.93	2020-01-01	2020-01-02	2020-01-01 00:01:43	2020-01-02 03:30:04	2020-01-01 00:01:43.000	2020-01-02 03:30:04.000	103	99004	49553.5	4955350	103	99004	49553.5	4955350	-32466	32469	4989.02	498902	-124	127	2.14	214
+104	101	10094	99005	0.31231	297.31231	148.81231	14881.23123	0.31231	297.31232	148.81231	14881.23144	0.31231	297.31231	148.81231	14881.231	2020-01-01	2020-01-02	2020-01-01 00:01:44	2020-01-02 03:30:05	2020-01-01 00:01:44.000	2020-01-02 03:30:05.000	104	99005	49554.5	4955450	104	99005	49554.5	4955450	-32465	32470	4990.02	499002	-128	127	0.58	58
+105	101	10095	99006	0.31531	297.31531	148.81531	14881.53153	0.31531	297.3153	148.81531	14881.53174	0.31531	297.31531	148.81531	14881.531	2020-01-01	2020-01-02	2020-01-01 00:01:45	2020-01-02 03:30:06	2020-01-01 00:01:45.000	2020-01-02 03:30:06.000	105	99006	49555.5	4955550	105	99006	49555.5	4955550	-32464	32471	4991.02	499102	-128	123	-0.98	-98
+106	101	10096	99007	0.31831	297.31831	148.81831	14881.83183	0.31831	297.31833	148.81831	14881.83182	0.31831	297.31831	148.81831	14881.831	2020-01-01	2020-01-02	2020-01-01 00:01:46	2020-01-02 03:30:07	2020-01-01 00:01:46.000	2020-01-02 03:30:07.000	106	99007	49556.5	4955650	106	99007	49556.5	4955650	-32463	32472	4992.02	499202	-127	124	0.02	2
+107	101	10097	99008	0.32132	297.32132	148.82132	14882.13213	0.32132	297.32132	148.82131	14882.13197	0.32132	297.32132	148.82132	14882.132	2020-01-01	2020-01-02	2020-01-01 00:01:47	2020-01-02 03:30:08	2020-01-01 00:01:47.000	2020-01-02 03:30:08.000	107	99008	49557.5	4955750	107	99008	49557.5	4955750	-32462	32473	4993.02	499302	-126	125	1.02	102
+108	101	10098	99009	0.32432	297.32432	148.82432	14882.43243	0.32432	297.3243	148.82432	14882.43232	0.32432	297.32432	148.82432	14882.432	2020-01-01	2020-01-02	2020-01-01 00:01:48	2020-01-02 03:30:09	2020-01-01 00:01:48.000	2020-01-02 03:30:09.000	108	99009	49558.5	4955850	108	99009	49558.5	4955850	-32461	32474	4994.02	499402	-125	126	2.02	202
+109	101	10099	99010	0.32732	297.32732	148.82732	14882.73273	0.32732	297.32733	148.82732	14882.7329	0.32732	297.32732	148.82732	14882.732	2020-01-01	2020-01-02	2020-01-01 00:01:49	2020-01-02 03:30:10	2020-01-01 00:01:49.000	2020-01-02 03:30:10.000	109	99010	49559.5	4955950	109	99010	49559.5	4955950	-32460	32475	4995.02	499502	-124	127	3.02	302
 11	102	10001	99911	0.03303	300.03303	150.03303	15153.33633	0.03303	300.03302	150.03303	15153.33627	0.03303	300.03303	150.03303	15153.33603	2020-01-01	2020-01-02	2020-01-01 00:00:11	2020-01-02 03:45:11	2020-01-01 00:00:11.000	2020-01-02 03:45:11.000	11	99911	49961	5046061	11	99911	49961	5046061	-32558	32377	4540.009900990099	458541	-128	123	-2.089108910891089	-211
-110	101	10100	99011	0.33033	297.33033	148.83033	14883.03303	0.33033	297.33032	148.83033	14883.03321	0.33033	297.33033	148.83033	14883.03300	2020-01-01	2020-01-02	2020-01-01 00:01:50	2020-01-02 03:30:11	2020-01-01 00:01:50.000	2020-01-02 03:30:11.000	110	99011	49560.5	4956050	110	99011	49560.5	4956050	-32459	32476	4996.02	499602	-128	127	1.46	146
-111	101	10101	99012	0.33333	297.33333	148.83333	14883.33333	0.33333	297.33334	148.83333	14883.33329	0.33333	297.33333	148.83333000000002	14883.33300	2020-01-01	2020-01-02	2020-01-01 00:01:51	2020-01-02 03:30:12	2020-01-01 00:01:51.000	2020-01-02 03:30:12.000	111	99012	49561.5	4956150	111	99012	49561.5	4956150	-32458	32477	4997.02	499702	-128	123	-0.1	-10
-112	101	10102	99013	0.33633	297.33633	148.83633	14883.63363	0.33633	297.33633	148.83633	14883.63348	0.33633	297.33633	148.83633	14883.63300	2020-01-01	2020-01-02	2020-01-01 00:01:52	2020-01-02 03:30:13	2020-01-01 00:01:52.000	2020-01-02 03:30:13.000	112	99013	49562.5	4956250	112	99013	49562.5	4956250	-32457	32478	4998.02	499802	-127	124	0.9	90
-113	101	10103	99014	0.33933	297.33933	148.83933	14883.93393	0.33933	297.33932	148.83933	14883.9338	0.33933	297.33933	148.83933000000002	14883.93300	2020-01-01	2020-01-02	2020-01-01 00:01:53	2020-01-02 03:30:14	2020-01-01 00:01:53.000	2020-01-02 03:30:14.000	113	99014	49563.5	4956350	113	99014	49563.5	4956350	-32456	32479	4999.02	499902	-126	125	1.9	190
-114	101	10104	99015	0.34234	297.34234	148.84234	14884.23423	0.34234	297.34235	148.84234	14884.23437	0.34234	297.34234	148.84234	14884.23400	2020-01-01	2020-01-02	2020-01-01 00:01:54	2020-01-02 03:30:15	2020-01-01 00:01:54.000	2020-01-02 03:30:15.000	114	99015	49564.5	4956450	114	99015	49564.5	4956450	-32455	32480	5000.02	500002	-125	126	2.9	290
-115	101	10105	99016	0.34534	297.34534	148.84534	14884.53453	0.34534	297.34534	148.84534	14884.53468	0.34534	297.34534	148.84534	14884.53400	2020-01-01	2020-01-02	2020-01-01 00:01:55	2020-01-02 03:30:16	2020-01-01 00:01:55.000	2020-01-02 03:30:16.000	115	99016	49565.5	4956550	115	99016	49565.5	4956550	-32454	32481	5001.02	500102	-124	127	3.9	390
-116	101	10106	99017	0.34834	297.34834	148.84834	14884.83483	0.34834	297.34836	148.84834	14884.83476	0.34834	297.34834	148.84834	14884.83400	2020-01-01	2020-01-02	2020-01-01 00:01:56	2020-01-02 03:30:17	2020-01-01 00:01:56.000	2020-01-02 03:30:17.000	116	99017	49566.5	4956650	116	99017	49566.5	4956650	-32453	32482	5002.02	500202	-128	127	2.34	234
-117	101	10107	99018	0.35135	297.35135	148.85135	14885.13513	0.35135	297.35135	148.85134	14885.13495	0.35135	297.35135	148.85135	14885.13500	2020-01-01	2020-01-02	2020-01-01 00:01:57	2020-01-02 03:30:18	2020-01-01 00:01:57.000	2020-01-02 03:30:18.000	117	99018	49567.5	4956750	117	99018	49567.5	4956750	-32452	32483	5003.02	500302	-128	123	0.78	78
-118	101	10108	99019	0.35435	297.35435	148.85435	14885.43543	0.35435	297.35434	148.85435	14885.43526	0.35435	297.35435	148.85434999999998	14885.43500	2020-01-01	2020-01-02	2020-01-01 00:01:58	2020-01-02 03:30:19	2020-01-01 00:01:58.000	2020-01-02 03:30:19.000	118	99019	49568.5	4956850	118	99019	49568.5	4956850	-32451	32484	5004.02	500402	-127	124	1.78	178
-119	101	10109	99020	0.35735	297.35735	148.85735	14885.73573	0.35735	297.35736	148.85736	14885.736	0.35735	297.35735	148.85735	14885.73500	2020-01-01	2020-01-02	2020-01-01 00:01:59	2020-01-02 03:30:20	2020-01-01 00:01:59.000	2020-01-02 03:30:20.000	119	99020	49569.5	4956950	119	99020	49569.5	4956950	-32450	32485	5005.02	500502	-126	125	2.78	278
+110	101	10100	99011	0.33033	297.33033	148.83033	14883.03303	0.33033	297.33032	148.83033	14883.03321	0.33033	297.33033	148.83033	14883.033	2020-01-01	2020-01-02	2020-01-01 00:01:50	2020-01-02 03:30:11	2020-01-01 00:01:50.000	2020-01-02 03:30:11.000	110	99011	49560.5	4956050	110	99011	49560.5	4956050	-32459	32476	4996.02	499602	-128	127	1.46	146
+111	101	10101	99012	0.33333	297.33333	148.83333	14883.33333	0.33333	297.33334	148.83333	14883.33329	0.33333	297.33333	148.83333000000002	14883.333	2020-01-01	2020-01-02	2020-01-01 00:01:51	2020-01-02 03:30:12	2020-01-01 00:01:51.000	2020-01-02 03:30:12.000	111	99012	49561.5	4956150	111	99012	49561.5	4956150	-32458	32477	4997.02	499702	-128	123	-0.1	-10
+112	101	10102	99013	0.33633	297.33633	148.83633	14883.63363	0.33633	297.33633	148.83633	14883.63348	0.33633	297.33633	148.83633	14883.633	2020-01-01	2020-01-02	2020-01-01 00:01:52	2020-01-02 03:30:13	2020-01-01 00:01:52.000	2020-01-02 03:30:13.000	112	99013	49562.5	4956250	112	99013	49562.5	4956250	-32457	32478	4998.02	499802	-127	124	0.9	90
+113	101	10103	99014	0.33933	297.33933	148.83933	14883.93393	0.33933	297.33932	148.83933	14883.9338	0.33933	297.33933	148.83933000000002	14883.933	2020-01-01	2020-01-02	2020-01-01 00:01:53	2020-01-02 03:30:14	2020-01-01 00:01:53.000	2020-01-02 03:30:14.000	113	99014	49563.5	4956350	113	99014	49563.5	4956350	-32456	32479	4999.02	499902	-126	125	1.9	190
+114	101	10104	99015	0.34234	297.34234	148.84234	14884.23423	0.34234	297.34235	148.84234	14884.23437	0.34234	297.34234	148.84234	14884.234	2020-01-01	2020-01-02	2020-01-01 00:01:54	2020-01-02 03:30:15	2020-01-01 00:01:54.000	2020-01-02 03:30:15.000	114	99015	49564.5	4956450	114	99015	49564.5	4956450	-32455	32480	5000.02	500002	-125	126	2.9	290
+115	101	10105	99016	0.34534	297.34534	148.84534	14884.53453	0.34534	297.34534	148.84534	14884.53468	0.34534	297.34534	148.84534	14884.534	2020-01-01	2020-01-02	2020-01-01 00:01:55	2020-01-02 03:30:16	2020-01-01 00:01:55.000	2020-01-02 03:30:16.000	115	99016	49565.5	4956550	115	99016	49565.5	4956550	-32454	32481	5001.02	500102	-124	127	3.9	390
+116	101	10106	99017	0.34834	297.34834	148.84834	14884.83483	0.34834	297.34836	148.84834	14884.83476	0.34834	297.34834	148.84834	14884.834	2020-01-01	2020-01-02	2020-01-01 00:01:56	2020-01-02 03:30:17	2020-01-01 00:01:56.000	2020-01-02 03:30:17.000	116	99017	49566.5	4956650	116	99017	49566.5	4956650	-32453	32482	5002.02	500202	-128	127	2.34	234
+117	101	10107	99018	0.35135	297.35135	148.85135	14885.13513	0.35135	297.35135	148.85134	14885.13495	0.35135	297.35135	148.85135	14885.135	2020-01-01	2020-01-02	2020-01-01 00:01:57	2020-01-02 03:30:18	2020-01-01 00:01:57.000	2020-01-02 03:30:18.000	117	99018	49567.5	4956750	117	99018	49567.5	4956750	-32452	32483	5003.02	500302	-128	123	0.78	78
+118	101	10108	99019	0.35435	297.35435	148.85435	14885.43543	0.35435	297.35434	148.85435	14885.43526	0.35435	297.35435	148.85434999999998	14885.435	2020-01-01	2020-01-02	2020-01-01 00:01:58	2020-01-02 03:30:19	2020-01-01 00:01:58.000	2020-01-02 03:30:19.000	118	99019	49568.5	4956850	118	99019	49568.5	4956850	-32451	32484	5004.02	500402	-127	124	1.78	178
+119	101	10109	99020	0.35735	297.35735	148.85735	14885.73573	0.35735	297.35736	148.85736	14885.736	0.35735	297.35735	148.85735	14885.735	2020-01-01	2020-01-02	2020-01-01 00:01:59	2020-01-02 03:30:20	2020-01-01 00:01:59.000	2020-01-02 03:30:20.000	119	99020	49569.5	4956950	119	99020	49569.5	4956950	-32450	32485	5005.02	500502	-126	125	2.78	278
 12	102	10002	99912	0.03603	300.03603	150.03603	15153.63963	0.03603	300.03604	150.03603	15153.6399	0.03603	300.03603	150.03603	15153.63903	2020-01-01	2020-01-02	2020-01-01 00:00:12	2020-01-02 03:45:12	2020-01-01 00:00:12.000	2020-01-02 03:45:12.000	12	99912	49962	5046162	12	99912	49962	5046162	-32557	32378	4541.009900990099	458642	-127	124	-1.0891089108910892	-110
-120	101	10110	99021	0.36036	297.36036	148.86036	14886.03603	0.36036	297.36035	148.86036	14886.03615	0.36036	297.36036	148.86036000000001	14886.03600	2020-01-01	2020-01-02	2020-01-01 00:02:00	2020-01-02 03:30:21	2020-01-01 00:02:00.000	2020-01-02 03:30:21.000	120	99021	49570.5	4957050	120	99021	49570.5	4957050	-32449	32486	5006.02	500602	-125	126	3.78	378
-121	101	10111	99022	0.36336	297.36336	148.86336	14886.33633	0.36336	297.36337	148.86336	14886.33627	0.36336	297.36336	148.86336	14886.33600	2020-01-01	2020-01-02	2020-01-01 00:02:01	2020-01-02 03:30:22	2020-01-01 00:02:01.000	2020-01-02 03:30:22.000	121	99022	49571.5	4957150	121	99022	49571.5	4957150	-32448	32487	5007.02	500702	-124	127	4.78	478
-122	101	10112	99023	0.36636	297.36636	148.86636	14886.63663	0.36636	297.36636	148.86636	14886.63642	0.36636	297.36636	148.86636000000001	14886.63600	2020-01-01	2020-01-02	2020-01-01 00:02:02	2020-01-02 03:30:23	2020-01-01 00:02:02.000	2020-01-02 03:30:23.000	122	99023	49572.5	4957250	122	99023	49572.5	4957250	-32447	32488	5008.02	500802	-128	127	3.22	322
-123	101	10113	99024	0.36936	297.36936	148.86936	14886.93693	0.36936	297.36935	148.86936	14886.93673	0.36936	297.36936	148.86936	14886.93600	2020-01-01	2020-01-02	2020-01-01 00:02:03	2020-01-02 03:30:24	2020-01-01 00:02:03.000	2020-01-02 03:30:24.000	123	99024	49573.5	4957350	123	99024	49573.5	4957350	-32446	32489	5009.02	500902	-128	127	1.66	166
-124	101	10114	99025	0.37237	297.37237	148.87237	14887.23723	0.37237	297.37238	148.87237	14887.23746	0.37237	297.37237	148.87237	14887.23700	2020-01-01	2020-01-02	2020-01-01 00:02:04	2020-01-02 03:30:25	2020-01-01 00:02:04.000	2020-01-02 03:30:25.000	124	99025	49574.5	4957450	124	99025	49574.5	4957450	-32445	32490	5010.02	501002	-128	124	0.1	10
-125	101	10115	99026	0.37537	297.37537	148.87537	14887.53753	0.37537	297.37537	148.87537	14887.53762	0.37537	297.37537	148.87537	14887.53700	2020-01-01	2020-01-02	2020-01-01 00:02:05	2020-01-02 03:30:26	2020-01-01 00:02:05.000	2020-01-02 03:30:26.000	125	99026	49575.5	4957550	125	99026	49575.5	4957550	-32444	32491	5011.02	501102	-127	125	1.1	110
-126	101	10116	99027	0.37837	297.37837	148.87837	14887.83783	0.37837	297.3784	148.87837	14887.83774	0.37837	297.37837	148.87837	14887.83700	2020-01-01	2020-01-02	2020-01-01 00:02:06	2020-01-02 03:30:27	2020-01-01 00:02:06.000	2020-01-02 03:30:27.000	126	99027	49576.5	4957650	126	99027	49576.5	4957650	-32443	32492	5012.02	501202	-126	126	2.1	210
-127	101	10117	99028	0.38138	297.38138	148.88138	14888.13813	0.38138	297.38138	148.88137	14888.13789	0.38138	297.38138	148.88138	14888.13800	2020-01-01	2020-01-02	2020-01-01 00:02:07	2020-01-02 03:30:28	2020-01-01 00:02:07.000	2020-01-02 03:30:28.000	127	99028	49577.5	4957750	127	99028	49577.5	4957750	-32442	32493	5013.02	501302	-125	127	3.1	310
-128	101	10118	99029	0.38438	297.38438	148.88438	14888.43843	0.38438	297.3844	148.88438	14888.43862	0.38438	297.38438	148.88438	14888.43800	2020-01-01	2020-01-02	2020-01-01 00:02:08	2020-01-02 03:30:29	2020-01-01 00:02:08.000	2020-01-02 03:30:29.000	128	99029	49578.5	4957850	128	99029	49578.5	4957850	-32441	32494	5014.02	501402	-128	127	1.54	154
-129	101	10119	99030	0.38738	297.38738	148.88738	14888.73873	0.38738	297.3874	148.88738	14888.73894	0.38738	297.38738	148.88738	14888.73800	2020-01-01	2020-01-02	2020-01-01 00:02:09	2020-01-02 03:30:30	2020-01-01 00:02:09.000	2020-01-02 03:30:30.000	129	99030	49579.5	4957950	129	99030	49579.5	4957950	-32440	32495	5015.02	501502	-128	127	-0.02	-2
+120	101	10110	99021	0.36036	297.36036	148.86036	14886.03603	0.36036	297.36035	148.86036	14886.03615	0.36036	297.36036	148.86036000000001	14886.036	2020-01-01	2020-01-02	2020-01-01 00:02:00	2020-01-02 03:30:21	2020-01-01 00:02:00.000	2020-01-02 03:30:21.000	120	99021	49570.5	4957050	120	99021	49570.5	4957050	-32449	32486	5006.02	500602	-125	126	3.78	378
+121	101	10111	99022	0.36336	297.36336	148.86336	14886.33633	0.36336	297.36337	148.86336	14886.33627	0.36336	297.36336	148.86336	14886.336	2020-01-01	2020-01-02	2020-01-01 00:02:01	2020-01-02 03:30:22	2020-01-01 00:02:01.000	2020-01-02 03:30:22.000	121	99022	49571.5	4957150	121	99022	49571.5	4957150	-32448	32487	5007.02	500702	-124	127	4.78	478
+122	101	10112	99023	0.36636	297.36636	148.86636	14886.63663	0.36636	297.36636	148.86636	14886.63642	0.36636	297.36636	148.86636000000001	14886.636	2020-01-01	2020-01-02	2020-01-01 00:02:02	2020-01-02 03:30:23	2020-01-01 00:02:02.000	2020-01-02 03:30:23.000	122	99023	49572.5	4957250	122	99023	49572.5	4957250	-32447	32488	5008.02	500802	-128	127	3.22	322
+123	101	10113	99024	0.36936	297.36936	148.86936	14886.93693	0.36936	297.36935	148.86936	14886.93673	0.36936	297.36936	148.86936	14886.936	2020-01-01	2020-01-02	2020-01-01 00:02:03	2020-01-02 03:30:24	2020-01-01 00:02:03.000	2020-01-02 03:30:24.000	123	99024	49573.5	4957350	123	99024	49573.5	4957350	-32446	32489	5009.02	500902	-128	127	1.66	166
+124	101	10114	99025	0.37237	297.37237	148.87237	14887.23723	0.37237	297.37238	148.87237	14887.23746	0.37237	297.37237	148.87237	14887.237	2020-01-01	2020-01-02	2020-01-01 00:02:04	2020-01-02 03:30:25	2020-01-01 00:02:04.000	2020-01-02 03:30:25.000	124	99025	49574.5	4957450	124	99025	49574.5	4957450	-32445	32490	5010.02	501002	-128	124	0.1	10
+125	101	10115	99026	0.37537	297.37537	148.87537	14887.53753	0.37537	297.37537	148.87537	14887.53762	0.37537	297.37537	148.87537	14887.537	2020-01-01	2020-01-02	2020-01-01 00:02:05	2020-01-02 03:30:26	2020-01-01 00:02:05.000	2020-01-02 03:30:26.000	125	99026	49575.5	4957550	125	99026	49575.5	4957550	-32444	32491	5011.02	501102	-127	125	1.1	110
+126	101	10116	99027	0.37837	297.37837	148.87837	14887.83783	0.37837	297.3784	148.87837	14887.83774	0.37837	297.37837	148.87837	14887.837	2020-01-01	2020-01-02	2020-01-01 00:02:06	2020-01-02 03:30:27	2020-01-01 00:02:06.000	2020-01-02 03:30:27.000	126	99027	49576.5	4957650	126	99027	49576.5	4957650	-32443	32492	5012.02	501202	-126	126	2.1	210
+127	101	10117	99028	0.38138	297.38138	148.88138	14888.13813	0.38138	297.38138	148.88137	14888.13789	0.38138	297.38138	148.88138	14888.138	2020-01-01	2020-01-02	2020-01-01 00:02:07	2020-01-02 03:30:28	2020-01-01 00:02:07.000	2020-01-02 03:30:28.000	127	99028	49577.5	4957750	127	99028	49577.5	4957750	-32442	32493	5013.02	501302	-125	127	3.1	310
+128	101	10118	99029	0.38438	297.38438	148.88438	14888.43843	0.38438	297.3844	148.88438	14888.43862	0.38438	297.38438	148.88438	14888.438	2020-01-01	2020-01-02	2020-01-01 00:02:08	2020-01-02 03:30:29	2020-01-01 00:02:08.000	2020-01-02 03:30:29.000	128	99029	49578.5	4957850	128	99029	49578.5	4957850	-32441	32494	5014.02	501402	-128	127	1.54	154
+129	101	10119	99030	0.38738	297.38738	148.88738	14888.73873	0.38738	297.3874	148.88738	14888.73894	0.38738	297.38738	148.88738	14888.738	2020-01-01	2020-01-02	2020-01-01 00:02:09	2020-01-02 03:30:30	2020-01-01 00:02:09.000	2020-01-02 03:30:30.000	129	99030	49579.5	4957950	129	99030	49579.5	4957950	-32440	32495	5015.02	501502	-128	127	-0.02	-2
 13	102	10003	99913	0.03903	300.03903	150.03903	15153.94294	0.03903	300.03903	150.03903	15153.94255	0.03903	300.03903	150.03903	15153.94203	2020-01-01	2020-01-02	2020-01-01 00:00:13	2020-01-02 03:45:13	2020-01-01 00:00:13.000	2020-01-02 03:45:13.000	13	99913	49963	5046263	13	99913	49963	5046263	-32556	32379	4542.009900990099	458743	-126	125	-0.0891089108910891	-9
-130	101	10120	99031	0.39039	297.39039	148.89039	14889.03903	0.39039	297.39038	148.89039	14889.03909	0.39039	297.39039	148.89039	14889.03900	2020-01-01	2020-01-02	2020-01-01 00:02:10	2020-01-02 03:30:31	2020-01-01 00:02:10.000	2020-01-02 03:30:31.000	130	99031	49580.5	4958050	130	99031	49580.5	4958050	-32439	32496	5016.02	501602	-128	123	-1.58	-158
-131	101	10121	99032	0.39339	297.39339	148.89339	14889.33933	0.39339	297.3934	148.89339	14889.33921	0.39339	297.39339	148.89339	14889.33900	2020-01-01	2020-01-02	2020-01-01 00:02:11	2020-01-02 03:30:32	2020-01-01 00:02:11.000	2020-01-02 03:30:32.000	131	99032	49581.5	4958150	131	99032	49581.5	4958150	-32438	32497	5017.02	501702	-127	124	-0.58	-58
-132	101	10122	99033	0.39639	297.39639	148.89639	14889.63963	0.39639	297.3964	148.89639	14889.63936	0.39639	297.39639	148.89639	14889.63900	2020-01-01	2020-01-02	2020-01-01 00:02:12	2020-01-02 03:30:33	2020-01-01 00:02:12.000	2020-01-02 03:30:33.000	132	99033	49582.5	4958250	132	99033	49582.5	4958250	-32437	32498	5018.02	501802	-126	125	0.42	42
-133	101	10123	99034	0.39939	297.39939	148.89939	14889.93993	0.39939	297.3994	148.8994	14889.94009	0.39939	297.39939	148.89939	14889.93900	2020-01-01	2020-01-02	2020-01-01 00:02:13	2020-01-02 03:30:34	2020-01-01 00:02:13.000	2020-01-02 03:30:34.000	133	99034	49583.5	4958350	133	99034	49583.5	4958350	-32436	32499	5019.02	501902	-125	126	1.42	142
-134	101	10124	99035	0.4024	297.4024	148.9024	14890.24024	0.4024	297.4024	148.9024	14890.24041	0.40240	297.40240	148.9024	14890.24000	2020-01-01	2020-01-02	2020-01-01 00:02:14	2020-01-02 03:30:35	2020-01-01 00:02:14.000	2020-01-02 03:30:35.000	134	99035	49584.5	4958450	134	99035	49584.5	4958450	-32435	32500	5020.02	502002	-124	127	2.42	242
-135	101	10125	99036	0.4054	297.4054	148.9054	14890.54054	0.4054	297.4054	148.9054	14890.54059	0.40540	297.40540	148.90540000000001	14890.54000	2020-01-01	2020-01-02	2020-01-01 00:02:15	2020-01-02 03:30:36	2020-01-01 00:02:15.000	2020-01-02 03:30:36.000	135	99036	49585.5	4958550	135	99036	49585.5	4958550	-32434	32501	5021.02	502102	-128	127	0.86	86
-136	101	10126	99037	0.4084	297.4084	148.9084	14890.84084	0.4084	297.40842	148.9084	14890.84068	0.40840	297.40840	148.9084	14890.84000	2020-01-01	2020-01-02	2020-01-01 00:02:16	2020-01-02 03:30:37	2020-01-01 00:02:16.000	2020-01-02 03:30:37.000	136	99037	49586.5	4958650	136	99037	49586.5	4958650	-32433	32502	5022.02	502202	-128	123	-0.7	-70
-137	101	10127	99038	0.41141	297.41141	148.91141	14891.14114	0.41141	297.4114	148.9114	14891.14099	0.41141	297.41141	148.91141	14891.14100	2020-01-01	2020-01-02	2020-01-01 00:02:17	2020-01-02 03:30:38	2020-01-01 00:02:17.000	2020-01-02 03:30:38.000	137	99038	49587.5	4958750	137	99038	49587.5	4958750	-32432	32503	5023.02	502302	-127	124	0.3	30
-138	101	10128	99039	0.41441	297.41441	148.91441	14891.44144	0.41441	297.41443	148.91441	14891.44157	0.41441	297.41441	148.91441	14891.44100	2020-01-01	2020-01-02	2020-01-01 00:02:18	2020-01-02 03:30:39	2020-01-01 00:02:18.000	2020-01-02 03:30:39.000	138	99039	49588.5	4958850	138	99039	49588.5	4958850	-32431	32504	5024.02	502402	-126	125	1.3	130
-139	101	10129	99040	0.41741	297.41741	148.91741	14891.74174	0.41741	297.41742	148.91741	14891.74188	0.41741	297.41741	148.91741	14891.74100	2020-01-01	2020-01-02	2020-01-01 00:02:19	2020-01-02 03:30:40	2020-01-01 00:02:19.000	2020-01-02 03:30:40.000	139	99040	49589.5	4958950	139	99040	49589.5	4958950	-32430	32505	5025.02	502502	-125	126	2.3	230
+130	101	10120	99031	0.39039	297.39039	148.89039	14889.03903	0.39039	297.39038	148.89039	14889.03909	0.39039	297.39039	148.89039	14889.039	2020-01-01	2020-01-02	2020-01-01 00:02:10	2020-01-02 03:30:31	2020-01-01 00:02:10.000	2020-01-02 03:30:31.000	130	99031	49580.5	4958050	130	99031	49580.5	4958050	-32439	32496	5016.02	501602	-128	123	-1.58	-158
+131	101	10121	99032	0.39339	297.39339	148.89339	14889.33933	0.39339	297.3934	148.89339	14889.33921	0.39339	297.39339	148.89339	14889.339	2020-01-01	2020-01-02	2020-01-01 00:02:11	2020-01-02 03:30:32	2020-01-01 00:02:11.000	2020-01-02 03:30:32.000	131	99032	49581.5	4958150	131	99032	49581.5	4958150	-32438	32497	5017.02	501702	-127	124	-0.58	-58
+132	101	10122	99033	0.39639	297.39639	148.89639	14889.63963	0.39639	297.3964	148.89639	14889.63936	0.39639	297.39639	148.89639	14889.639	2020-01-01	2020-01-02	2020-01-01 00:02:12	2020-01-02 03:30:33	2020-01-01 00:02:12.000	2020-01-02 03:30:33.000	132	99033	49582.5	4958250	132	99033	49582.5	4958250	-32437	32498	5018.02	501802	-126	125	0.42	42
+133	101	10123	99034	0.39939	297.39939	148.89939	14889.93993	0.39939	297.3994	148.8994	14889.94009	0.39939	297.39939	148.89939	14889.939	2020-01-01	2020-01-02	2020-01-01 00:02:13	2020-01-02 03:30:34	2020-01-01 00:02:13.000	2020-01-02 03:30:34.000	133	99034	49583.5	4958350	133	99034	49583.5	4958350	-32436	32499	5019.02	501902	-125	126	1.42	142
+134	101	10124	99035	0.4024	297.4024	148.9024	14890.24024	0.4024	297.4024	148.9024	14890.24041	0.4024	297.4024	148.9024	14890.24	2020-01-01	2020-01-02	2020-01-01 00:02:14	2020-01-02 03:30:35	2020-01-01 00:02:14.000	2020-01-02 03:30:35.000	134	99035	49584.5	4958450	134	99035	49584.5	4958450	-32435	32500	5020.02	502002	-124	127	2.42	242
+135	101	10125	99036	0.4054	297.4054	148.9054	14890.54054	0.4054	297.4054	148.9054	14890.54059	0.4054	297.4054	148.90540000000001	14890.54	2020-01-01	2020-01-02	2020-01-01 00:02:15	2020-01-02 03:30:36	2020-01-01 00:02:15.000	2020-01-02 03:30:36.000	135	99036	49585.5	4958550	135	99036	49585.5	4958550	-32434	32501	5021.02	502102	-128	127	0.86	86
+136	101	10126	99037	0.4084	297.4084	148.9084	14890.84084	0.4084	297.40842	148.9084	14890.84068	0.4084	297.4084	148.9084	14890.84	2020-01-01	2020-01-02	2020-01-01 00:02:16	2020-01-02 03:30:37	2020-01-01 00:02:16.000	2020-01-02 03:30:37.000	136	99037	49586.5	4958650	136	99037	49586.5	4958650	-32433	32502	5022.02	502202	-128	123	-0.7	-70
+137	101	10127	99038	0.41141	297.41141	148.91141	14891.14114	0.41141	297.4114	148.9114	14891.14099	0.41141	297.41141	148.91141	14891.141	2020-01-01	2020-01-02	2020-01-01 00:02:17	2020-01-02 03:30:38	2020-01-01 00:02:17.000	2020-01-02 03:30:38.000	137	99038	49587.5	4958750	137	99038	49587.5	4958750	-32432	32503	5023.02	502302	-127	124	0.3	30
+138	101	10128	99039	0.41441	297.41441	148.91441	14891.44144	0.41441	297.41443	148.91441	14891.44157	0.41441	297.41441	148.91441	14891.441	2020-01-01	2020-01-02	2020-01-01 00:02:18	2020-01-02 03:30:39	2020-01-01 00:02:18.000	2020-01-02 03:30:39.000	138	99039	49588.5	4958850	138	99039	49588.5	4958850	-32431	32504	5024.02	502402	-126	125	1.3	130
+139	101	10129	99040	0.41741	297.41741	148.91741	14891.74174	0.41741	297.41742	148.91741	14891.74188	0.41741	297.41741	148.91741	14891.741	2020-01-01	2020-01-02	2020-01-01 00:02:19	2020-01-02 03:30:40	2020-01-01 00:02:19.000	2020-01-02 03:30:40.000	139	99040	49589.5	4958950	139	99040	49589.5	4958950	-32430	32505	5025.02	502502	-125	126	2.3	230
 14	102	10004	99914	0.04204	300.04204	150.04204	15154.24624	0.04204	300.04205	150.04204	15154.2463	0.04204	300.04204	150.04204	15154.24604	2020-01-01	2020-01-02	2020-01-01 00:00:14	2020-01-02 03:45:14	2020-01-01 00:00:14.000	2020-01-02 03:45:14.000	14	99914	49964	5046364	14	99914	49964	5046364	-32555	32380	4543.009900990099	458844	-125	126	0.9108910891089109	92
-140	101	10130	99041	0.42042	297.42042	148.92042	14892.04204	0.42042	297.4204	148.92042	14892.04206	0.42042	297.42042	148.92042	14892.04200	2020-01-01	2020-01-02	2020-01-01 00:02:20	2020-01-02 03:30:41	2020-01-01 00:02:20.000	2020-01-02 03:30:41.000	140	99041	49590.5	4959050	140	99041	49590.5	4959050	-32429	32506	5026.02	502602	-124	127	3.3	330
-141	101	10131	99042	0.42342	297.42342	148.92342	14892.34234	0.42342	297.42343	148.92342	14892.34215	0.42342	297.42342	148.92342	14892.34200	2020-01-01	2020-01-02	2020-01-01 00:02:21	2020-01-02 03:30:42	2020-01-01 00:02:21.000	2020-01-02 03:30:42.000	141	99042	49591.5	4959150	141	99042	49591.5	4959150	-32428	32507	5027.02	502702	-128	127	1.74	174
-142	101	10132	99043	0.42642	297.42642	148.92642	14892.64264	0.42642	297.42642	148.92642	14892.64246	0.42642	297.42642	148.92642	14892.64200	2020-01-01	2020-01-02	2020-01-01 00:02:22	2020-01-02 03:30:43	2020-01-01 00:02:22.000	2020-01-02 03:30:43.000	142	99043	49592.5	4959250	142	99043	49592.5	4959250	-32427	32508	5028.02	502802	-128	123	0.18	18
-143	101	10133	99044	0.42942	297.42942	148.92942	14892.94294	0.42942	297.42944	148.92943	14892.94304	0.42942	297.42942	148.92942	14892.94200	2020-01-01	2020-01-02	2020-01-01 00:02:23	2020-01-02 03:30:44	2020-01-01 00:02:23.000	2020-01-02 03:30:44.000	143	99044	49593.5	4959350	143	99044	49593.5	4959350	-32426	32509	5029.02	502902	-127	124	1.18	118
-144	101	10134	99045	0.43243	297.43243	148.93243	14893.24324	0.43243	297.43243	148.93243	14893.24338	0.43243	297.43243	148.93243	14893.24300	2020-01-01	2020-01-02	2020-01-01 00:02:24	2020-01-02 03:30:45	2020-01-01 00:02:24.000	2020-01-02 03:30:45.000	144	99045	49594.5	4959450	144	99045	49594.5	4959450	-32425	32510	5030.02	503002	-126	125	2.18	218
-145	101	10135	99046	0.43543	297.43543	148.93543	14893.54354	0.43543	297.43542	148.93543	14893.54354	0.43543	297.43543	148.93543	14893.54300	2020-01-01	2020-01-02	2020-01-01 00:02:25	2020-01-02 03:30:46	2020-01-01 00:02:25.000	2020-01-02 03:30:46.000	145	99046	49595.5	4959550	145	99046	49595.5	4959550	-32424	32511	5031.02	503102	-125	126	3.18	318
-146	101	10136	99047	0.43843	297.43843	148.93843	14893.84384	0.43843	297.43845	148.93844	14893.84427	0.43843	297.43843	148.93843	14893.84300	2020-01-01	2020-01-02	2020-01-01 00:02:26	2020-01-02 03:30:47	2020-01-01 00:02:26.000	2020-01-02 03:30:47.000	146	99047	49596.5	4959650	146	99047	49596.5	4959650	-32423	32512	5032.02	503202	-124	127	4.18	418
-147	101	10137	99048	0.44144	297.44144	148.94144	14894.14414	0.44144	297.44144	148.94143	14894.14392	0.44144	297.44144	148.94144	14894.14400	2020-01-01	2020-01-02	2020-01-01 00:02:27	2020-01-02 03:30:48	2020-01-01 00:02:27.000	2020-01-02 03:30:48.000	147	99048	49597.5	4959750	147	99048	49597.5	4959750	-32422	32513	5033.02	503302	-128	127	2.62	262
-148	101	10138	99049	0.44444	297.44444	148.94444	14894.44444	0.44444	297.44446	148.94444	14894.4445	0.44444	297.44444	148.94444	14894.44400	2020-01-01	2020-01-02	2020-01-01 00:02:28	2020-01-02 03:30:49	2020-01-01 00:02:28.000	2020-01-02 03:30:49.000	148	99049	49598.5	4959850	148	99049	49598.5	4959850	-32421	32514	5034.02	503402	-128	127	1.06	106
-149	101	10139	99050	0.44744	297.44744	148.94744	14894.74474	0.44744	297.44745	148.94744	14894.74485	0.44744	297.44744	148.94744	14894.74400	2020-01-01	2020-01-02	2020-01-01 00:02:29	2020-01-02 03:30:50	2020-01-01 00:02:29.000	2020-01-02 03:30:50.000	149	99050	49599.5	4959950	149	99050	49599.5	4959950	-32420	32515	5035.02	503502	-128	124	-0.5	-50
+140	101	10130	99041	0.42042	297.42042	148.92042	14892.04204	0.42042	297.4204	148.92042	14892.04206	0.42042	297.42042	148.92042	14892.042	2020-01-01	2020-01-02	2020-01-01 00:02:20	2020-01-02 03:30:41	2020-01-01 00:02:20.000	2020-01-02 03:30:41.000	140	99041	49590.5	4959050	140	99041	49590.5	4959050	-32429	32506	5026.02	502602	-124	127	3.3	330
+141	101	10131	99042	0.42342	297.42342	148.92342	14892.34234	0.42342	297.42343	148.92342	14892.34215	0.42342	297.42342	148.92342	14892.342	2020-01-01	2020-01-02	2020-01-01 00:02:21	2020-01-02 03:30:42	2020-01-01 00:02:21.000	2020-01-02 03:30:42.000	141	99042	49591.5	4959150	141	99042	49591.5	4959150	-32428	32507	5027.02	502702	-128	127	1.74	174
+142	101	10132	99043	0.42642	297.42642	148.92642	14892.64264	0.42642	297.42642	148.92642	14892.64246	0.42642	297.42642	148.92642	14892.642	2020-01-01	2020-01-02	2020-01-01 00:02:22	2020-01-02 03:30:43	2020-01-01 00:02:22.000	2020-01-02 03:30:43.000	142	99043	49592.5	4959250	142	99043	49592.5	4959250	-32427	32508	5028.02	502802	-128	123	0.18	18
+143	101	10133	99044	0.42942	297.42942	148.92942	14892.94294	0.42942	297.42944	148.92943	14892.94304	0.42942	297.42942	148.92942	14892.942	2020-01-01	2020-01-02	2020-01-01 00:02:23	2020-01-02 03:30:44	2020-01-01 00:02:23.000	2020-01-02 03:30:44.000	143	99044	49593.5	4959350	143	99044	49593.5	4959350	-32426	32509	5029.02	502902	-127	124	1.18	118
+144	101	10134	99045	0.43243	297.43243	148.93243	14893.24324	0.43243	297.43243	148.93243	14893.24338	0.43243	297.43243	148.93243	14893.243	2020-01-01	2020-01-02	2020-01-01 00:02:24	2020-01-02 03:30:45	2020-01-01 00:02:24.000	2020-01-02 03:30:45.000	144	99045	49594.5	4959450	144	99045	49594.5	4959450	-32425	32510	5030.02	503002	-126	125	2.18	218
+145	101	10135	99046	0.43543	297.43543	148.93543	14893.54354	0.43543	297.43542	148.93543	14893.54354	0.43543	297.43543	148.93543	14893.543	2020-01-01	2020-01-02	2020-01-01 00:02:25	2020-01-02 03:30:46	2020-01-01 00:02:25.000	2020-01-02 03:30:46.000	145	99046	49595.5	4959550	145	99046	49595.5	4959550	-32424	32511	5031.02	503102	-125	126	3.18	318
+146	101	10136	99047	0.43843	297.43843	148.93843	14893.84384	0.43843	297.43845	148.93844	14893.84427	0.43843	297.43843	148.93843	14893.843	2020-01-01	2020-01-02	2020-01-01 00:02:26	2020-01-02 03:30:47	2020-01-01 00:02:26.000	2020-01-02 03:30:47.000	146	99047	49596.5	4959650	146	99047	49596.5	4959650	-32423	32512	5032.02	503202	-124	127	4.18	418
+147	101	10137	99048	0.44144	297.44144	148.94144	14894.14414	0.44144	297.44144	148.94143	14894.14392	0.44144	297.44144	148.94144	14894.144	2020-01-01	2020-01-02	2020-01-01 00:02:27	2020-01-02 03:30:48	2020-01-01 00:02:27.000	2020-01-02 03:30:48.000	147	99048	49597.5	4959750	147	99048	49597.5	4959750	-32422	32513	5033.02	503302	-128	127	2.62	262
+148	101	10138	99049	0.44444	297.44444	148.94444	14894.44444	0.44444	297.44446	148.94444	14894.4445	0.44444	297.44444	148.94444	14894.444	2020-01-01	2020-01-02	2020-01-01 00:02:28	2020-01-02 03:30:49	2020-01-01 00:02:28.000	2020-01-02 03:30:49.000	148	99049	49598.5	4959850	148	99049	49598.5	4959850	-32421	32514	5034.02	503402	-128	127	1.06	106
+149	101	10139	99050	0.44744	297.44744	148.94744	14894.74474	0.44744	297.44745	148.94744	14894.74485	0.44744	297.44744	148.94744	14894.744	2020-01-01	2020-01-02	2020-01-01 00:02:29	2020-01-02 03:30:50	2020-01-01 00:02:29.000	2020-01-02 03:30:50.000	149	99050	49599.5	4959950	149	99050	49599.5	4959950	-32420	32515	5035.02	503502	-128	124	-0.5	-50
 15	102	10005	99915	0.04504	300.04504	150.04504	15154.54954	0.04504	300.04504	150.04504	15154.54945	0.04504	300.04504	150.04504	15154.54904	2020-01-01	2020-01-02	2020-01-01 00:00:15	2020-01-02 03:45:15	2020-01-01 00:00:15.000	2020-01-02 03:45:15.000	15	99915	49965	5046465	15	99915	49965	5046465	-32554	32381	4544.009900990099	458945	-124	127	1.9108910891089108	193
-150	101	10140	99051	0.45045	297.45045	148.95045	14895.04504	0.45045	297.45044	148.95045	14895.04501	0.45045	297.45045	148.95045	14895.04500	2020-01-01	2020-01-02	2020-01-01 00:02:30	2020-01-02 03:30:51	2020-01-01 00:02:30.000	2020-01-02 03:30:51.000	150	99051	49600.5	4960050	150	99051	49600.5	4960050	-32419	32516	5036.02	503602	-127	125	0.5	50
-151	101	10141	99052	0.45345	297.45345	148.95345	14895.34534	0.45345	297.45346	148.95345	14895.34574	0.45345	297.45345	148.95345	14895.34500	2020-01-01	2020-01-02	2020-01-01 00:02:31	2020-01-02 03:30:52	2020-01-01 00:02:31.000	2020-01-02 03:30:52.000	151	99052	49601.5	4960150	151	99052	49601.5	4960150	-32418	32517	5037.02	503702	-126	126	1.5	150
-152	101	10142	99053	0.45645	297.45645	148.95645	14895.64564	0.45645	297.45645	148.95645	14895.6454	0.45645	297.45645	148.95645000000002	14895.64500	2020-01-01	2020-01-02	2020-01-01 00:02:32	2020-01-02 03:30:53	2020-01-01 00:02:32.000	2020-01-02 03:30:53.000	152	99053	49602.5	4960250	152	99053	49602.5	4960250	-32417	32518	5038.02	503802	-125	127	2.5	250
-153	101	10143	99054	0.45945	297.45945	148.95945	14895.94594	0.45945	297.45947	148.95946	14895.94601	0.45945	297.45945	148.95945	14895.94500	2020-01-01	2020-01-02	2020-01-01 00:02:33	2020-01-02 03:30:54	2020-01-01 00:02:33.000	2020-01-02 03:30:54.000	153	99054	49603.5	4960350	153	99054	49603.5	4960350	-32416	32519	5039.02	503902	-128	127	0.94	94
-154	101	10144	99055	0.46246	297.46246	148.96246	14896.24624	0.46246	297.46246	148.96246	14896.24633	0.46246	297.46246	148.96246	14896.24600	2020-01-01	2020-01-02	2020-01-01 00:02:34	2020-01-02 03:30:55	2020-01-01 00:02:34.000	2020-01-02 03:30:55.000	154	99055	49604.5	4960450	154	99055	49604.5	4960450	-32415	32520	5040.02	504002	-128	127	-0.62	-62
-155	101	10145	99056	0.46546	297.46546	148.96546	14896.54654	0.46546	297.46545	148.96546	14896.54647	0.46546	297.46546	148.96546	14896.54600	2020-01-01	2020-01-02	2020-01-01 00:02:35	2020-01-02 03:30:56	2020-01-01 00:02:35.000	2020-01-02 03:30:56.000	155	99056	49605.5	4960550	155	99056	49605.5	4960550	-32414	32521	5041.02	504102	-128	123	-2.18	-218
-156	101	10146	99057	0.46846	297.46846	148.96846	14896.84684	0.46846	297.46848	148.96847	14896.84721	0.46846	297.46846	148.96846	14896.84600	2020-01-01	2020-01-02	2020-01-01 00:02:36	2020-01-02 03:30:57	2020-01-01 00:02:36.000	2020-01-02 03:30:57.000	156	99057	49606.5	4960650	156	99057	49606.5	4960650	-32413	32522	5042.02	504202	-127	124	-1.18	-118
-157	101	10147	99058	0.47147	297.47147	148.97147	14897.14714	0.47147	297.47147	148.97146	14897.14687	0.47147	297.47147	148.97147	14897.14700	2020-01-01	2020-01-02	2020-01-01 00:02:37	2020-01-02 03:30:58	2020-01-01 00:02:37.000	2020-01-02 03:30:58.000	157	99058	49607.5	4960750	157	99058	49607.5	4960750	-32412	32523	5043.02	504302	-126	125	-0.18	-18
-158	101	10148	99059	0.47447	297.47447	148.97447	14897.44744	0.47447	297.4745	148.97447	14897.44748	0.47447	297.47447	148.97447	14897.44700	2020-01-01	2020-01-02	2020-01-01 00:02:38	2020-01-02 03:30:59	2020-01-01 00:02:38.000	2020-01-02 03:30:59.000	158	99059	49608.5	4960850	158	99059	49608.5	4960850	-32411	32524	5044.02	504402	-125	126	0.82	82
-159	101	10149	99060	0.47747	297.47747	148.97747	14897.74774	0.47747	297.47748	148.97747	14897.74779	0.47747	297.47747	148.97746999999998	14897.74700	2020-01-01	2020-01-02	2020-01-01 00:02:39	2020-01-02 03:31:00	2020-01-01 00:02:39.000	2020-01-02 03:31:00.000	159	99060	49609.5	4960950	159	99060	49609.5	4960950	-32410	32525	5045.02	504502	-124	127	1.82	182
+150	101	10140	99051	0.45045	297.45045	148.95045	14895.04504	0.45045	297.45044	148.95045	14895.04501	0.45045	297.45045	148.95045	14895.045	2020-01-01	2020-01-02	2020-01-01 00:02:30	2020-01-02 03:30:51	2020-01-01 00:02:30.000	2020-01-02 03:30:51.000	150	99051	49600.5	4960050	150	99051	49600.5	4960050	-32419	32516	5036.02	503602	-127	125	0.5	50
+151	101	10141	99052	0.45345	297.45345	148.95345	14895.34534	0.45345	297.45346	148.95345	14895.34574	0.45345	297.45345	148.95345	14895.345	2020-01-01	2020-01-02	2020-01-01 00:02:31	2020-01-02 03:30:52	2020-01-01 00:02:31.000	2020-01-02 03:30:52.000	151	99052	49601.5	4960150	151	99052	49601.5	4960150	-32418	32517	5037.02	503702	-126	126	1.5	150
+152	101	10142	99053	0.45645	297.45645	148.95645	14895.64564	0.45645	297.45645	148.95645	14895.6454	0.45645	297.45645	148.95645000000002	14895.645	2020-01-01	2020-01-02	2020-01-01 00:02:32	2020-01-02 03:30:53	2020-01-01 00:02:32.000	2020-01-02 03:30:53.000	152	99053	49602.5	4960250	152	99053	49602.5	4960250	-32417	32518	5038.02	503802	-125	127	2.5	250
+153	101	10143	99054	0.45945	297.45945	148.95945	14895.94594	0.45945	297.45947	148.95946	14895.94601	0.45945	297.45945	148.95945	14895.945	2020-01-01	2020-01-02	2020-01-01 00:02:33	2020-01-02 03:30:54	2020-01-01 00:02:33.000	2020-01-02 03:30:54.000	153	99054	49603.5	4960350	153	99054	49603.5	4960350	-32416	32519	5039.02	503902	-128	127	0.94	94
+154	101	10144	99055	0.46246	297.46246	148.96246	14896.24624	0.46246	297.46246	148.96246	14896.24633	0.46246	297.46246	148.96246	14896.246	2020-01-01	2020-01-02	2020-01-01 00:02:34	2020-01-02 03:30:55	2020-01-01 00:02:34.000	2020-01-02 03:30:55.000	154	99055	49604.5	4960450	154	99055	49604.5	4960450	-32415	32520	5040.02	504002	-128	127	-0.62	-62
+155	101	10145	99056	0.46546	297.46546	148.96546	14896.54654	0.46546	297.46545	148.96546	14896.54647	0.46546	297.46546	148.96546	14896.546	2020-01-01	2020-01-02	2020-01-01 00:02:35	2020-01-02 03:30:56	2020-01-01 00:02:35.000	2020-01-02 03:30:56.000	155	99056	49605.5	4960550	155	99056	49605.5	4960550	-32414	32521	5041.02	504102	-128	123	-2.18	-218
+156	101	10146	99057	0.46846	297.46846	148.96846	14896.84684	0.46846	297.46848	148.96847	14896.84721	0.46846	297.46846	148.96846	14896.846	2020-01-01	2020-01-02	2020-01-01 00:02:36	2020-01-02 03:30:57	2020-01-01 00:02:36.000	2020-01-02 03:30:57.000	156	99057	49606.5	4960650	156	99057	49606.5	4960650	-32413	32522	5042.02	504202	-127	124	-1.18	-118
+157	101	10147	99058	0.47147	297.47147	148.97147	14897.14714	0.47147	297.47147	148.97146	14897.14687	0.47147	297.47147	148.97147	14897.147	2020-01-01	2020-01-02	2020-01-01 00:02:37	2020-01-02 03:30:58	2020-01-01 00:02:37.000	2020-01-02 03:30:58.000	157	99058	49607.5	4960750	157	99058	49607.5	4960750	-32412	32523	5043.02	504302	-126	125	-0.18	-18
+158	101	10148	99059	0.47447	297.47447	148.97447	14897.44744	0.47447	297.4745	148.97447	14897.44748	0.47447	297.47447	148.97447	14897.447	2020-01-01	2020-01-02	2020-01-01 00:02:38	2020-01-02 03:30:59	2020-01-01 00:02:38.000	2020-01-02 03:30:59.000	158	99059	49608.5	4960850	158	99059	49608.5	4960850	-32411	32524	5044.02	504402	-125	126	0.82	82
+159	101	10149	99060	0.47747	297.47747	148.97747	14897.74774	0.47747	297.47748	148.97747	14897.74779	0.47747	297.47747	148.97746999999998	14897.747	2020-01-01	2020-01-02	2020-01-01 00:02:39	2020-01-02 03:31:00	2020-01-01 00:02:39.000	2020-01-02 03:31:00.000	159	99060	49609.5	4960950	159	99060	49609.5	4960950	-32410	32525	5045.02	504502	-124	127	1.82	182
 16	102	10006	99916	0.04804	300.04804	150.04804	15154.85285	0.04804	300.04803	150.04804	15154.85279	0.04804	300.04804	150.04804	15154.85204	2020-01-01	2020-01-02	2020-01-01 00:00:16	2020-01-02 03:45:16	2020-01-01 00:00:16.000	2020-01-02 03:45:16.000	16	99916	49966	5046566	16	99916	49966	5046566	-32553	32382	4545.009900990099	459046	-128	127	0.37623762376237624	38
-160	101	10150	99061	0.48048	297.48048	148.98048	14898.04804	0.48048	297.48047	148.98048	14898.0481	0.48048	297.48048	148.98048	14898.04800	2020-01-01	2020-01-02	2020-01-01 00:02:40	2020-01-02 03:31:01	2020-01-01 00:02:40.000	2020-01-02 03:31:01.000	160	99061	49610.5	4961050	160	99061	49610.5	4961050	-32409	32526	5046.02	504602	-128	127	0.26	26
-161	101	10151	99062	0.48348	297.48348	148.98348	14898.34834	0.48348	297.4835	148.98348	14898.34868	0.48348	297.48348	148.98348	14898.34800	2020-01-01	2020-01-02	2020-01-01 00:02:41	2020-01-02 03:31:02	2020-01-01 00:02:41.000	2020-01-02 03:31:02.000	161	99062	49611.5	4961150	161	99062	49611.5	4961150	-32408	32527	5047.02	504702	-128	123	-1.3	-130
-162	101	10152	99063	0.48648	297.48648	148.98648	14898.64864	0.48648	297.48648	148.98648	14898.64837	0.48648	297.48648	148.98648	14898.64800	2020-01-01	2020-01-02	2020-01-01 00:02:42	2020-01-02 03:31:03	2020-01-01 00:02:42.000	2020-01-02 03:31:03.000	162	99063	49612.5	4961250	162	99063	49612.5	4961250	-32407	32528	5048.02	504802	-127	124	-0.3	-30
-163	101	10153	99064	0.48948	297.48948	148.98948	14898.94894	0.48948	297.4895	148.98948	14898.94895	0.48948	297.48948	148.98948000000001	14898.94800	2020-01-01	2020-01-02	2020-01-01 00:02:43	2020-01-02 03:31:04	2020-01-01 00:02:43.000	2020-01-02 03:31:04.000	163	99064	49613.5	4961350	163	99064	49613.5	4961350	-32406	32529	5049.02	504902	-126	125	0.7	70
-164	101	10154	99065	0.49249	297.49249	148.99249	14899.24924	0.49249	297.4925	148.99249	14899.24926	0.49249	297.49249	148.99249	14899.24900	2020-01-01	2020-01-02	2020-01-01 00:02:44	2020-01-02 03:31:05	2020-01-01 00:02:44.000	2020-01-02 03:31:05.000	164	99065	49614.5	4961450	164	99065	49614.5	4961450	-32405	32530	5050.02	505002	-125	126	1.7	170
-165	101	10155	99066	0.49549	297.49549	148.99549	14899.54954	0.49549	297.49548	148.99549	14899.54957	0.49549	297.49549	148.99549000000002	14899.54900	2020-01-01	2020-01-02	2020-01-01 00:02:45	2020-01-02 03:31:06	2020-01-01 00:02:45.000	2020-01-02 03:31:06.000	165	99066	49615.5	4961550	165	99066	49615.5	4961550	-32404	32531	5051.02	505102	-124	127	2.7	270
-166	101	10156	99067	0.49849	297.49849	148.99849	14899.84984	0.49849	297.4985	148.9985	14899.85015	0.49849	297.49849	148.99849	14899.84900	2020-01-01	2020-01-02	2020-01-01 00:02:46	2020-01-02 03:31:07	2020-01-01 00:02:46.000	2020-01-02 03:31:07.000	166	99067	49616.5	4961650	166	99067	49616.5	4961650	-32403	32532	5052.02	505202	-128	127	1.14	114
-167	101	10157	99068	0.5015	297.5015	149.0015	14900.15015	0.5015	297.5015	149.00149	14900.14984	0.50150	297.50150	149.0015	14900.15000	2020-01-01	2020-01-02	2020-01-01 00:02:47	2020-01-02 03:31:08	2020-01-01 00:02:47.000	2020-01-02 03:31:08.000	167	99068	49617.5	4961750	167	99068	49617.5	4961750	-32402	32533	5053.02	505302	-128	123	-0.42	-42
-168	101	10158	99069	0.5045	297.5045	149.0045	14900.45045	0.5045	297.50452	149.0045	14900.45042	0.50450	297.50450	149.0045	14900.45000	2020-01-01	2020-01-02	2020-01-01 00:02:48	2020-01-02 03:31:09	2020-01-01 00:02:48.000	2020-01-02 03:31:09.000	168	99069	49618.5	4961850	168	99069	49618.5	4961850	-32401	32534	5054.02	505402	-127	124	0.58	58
-169	101	10159	99070	0.5075	297.5075	149.0075	14900.75075	0.5075	297.5075	149.0075	14900.75073	0.50750	297.50750	149.0075	14900.75000	2020-01-01	2020-01-02	2020-01-01 00:02:49	2020-01-02 03:31:10	2020-01-01 00:02:49.000	2020-01-02 03:31:10.000	169	99070	49619.5	4961950	169	99070	49619.5	4961950	-32400	32535	5055.02	505502	-126	125	1.58	158
+160	101	10150	99061	0.48048	297.48048	148.98048	14898.04804	0.48048	297.48047	148.98048	14898.0481	0.48048	297.48048	148.98048	14898.048	2020-01-01	2020-01-02	2020-01-01 00:02:40	2020-01-02 03:31:01	2020-01-01 00:02:40.000	2020-01-02 03:31:01.000	160	99061	49610.5	4961050	160	99061	49610.5	4961050	-32409	32526	5046.02	504602	-128	127	0.26	26
+161	101	10151	99062	0.48348	297.48348	148.98348	14898.34834	0.48348	297.4835	148.98348	14898.34868	0.48348	297.48348	148.98348	14898.348	2020-01-01	2020-01-02	2020-01-01 00:02:41	2020-01-02 03:31:02	2020-01-01 00:02:41.000	2020-01-02 03:31:02.000	161	99062	49611.5	4961150	161	99062	49611.5	4961150	-32408	32527	5047.02	504702	-128	123	-1.3	-130
+162	101	10152	99063	0.48648	297.48648	148.98648	14898.64864	0.48648	297.48648	148.98648	14898.64837	0.48648	297.48648	148.98648	14898.648	2020-01-01	2020-01-02	2020-01-01 00:02:42	2020-01-02 03:31:03	2020-01-01 00:02:42.000	2020-01-02 03:31:03.000	162	99063	49612.5	4961250	162	99063	49612.5	4961250	-32407	32528	5048.02	504802	-127	124	-0.3	-30
+163	101	10153	99064	0.48948	297.48948	148.98948	14898.94894	0.48948	297.4895	148.98948	14898.94895	0.48948	297.48948	148.98948000000001	14898.948	2020-01-01	2020-01-02	2020-01-01 00:02:43	2020-01-02 03:31:04	2020-01-01 00:02:43.000	2020-01-02 03:31:04.000	163	99064	49613.5	4961350	163	99064	49613.5	4961350	-32406	32529	5049.02	504902	-126	125	0.7	70
+164	101	10154	99065	0.49249	297.49249	148.99249	14899.24924	0.49249	297.4925	148.99249	14899.24926	0.49249	297.49249	148.99249	14899.249	2020-01-01	2020-01-02	2020-01-01 00:02:44	2020-01-02 03:31:05	2020-01-01 00:02:44.000	2020-01-02 03:31:05.000	164	99065	49614.5	4961450	164	99065	49614.5	4961450	-32405	32530	5050.02	505002	-125	126	1.7	170
+165	101	10155	99066	0.49549	297.49549	148.99549	14899.54954	0.49549	297.49548	148.99549	14899.54957	0.49549	297.49549	148.99549000000002	14899.549	2020-01-01	2020-01-02	2020-01-01 00:02:45	2020-01-02 03:31:06	2020-01-01 00:02:45.000	2020-01-02 03:31:06.000	165	99066	49615.5	4961550	165	99066	49615.5	4961550	-32404	32531	5051.02	505102	-124	127	2.7	270
+166	101	10156	99067	0.49849	297.49849	148.99849	14899.84984	0.49849	297.4985	148.9985	14899.85015	0.49849	297.49849	148.99849	14899.849	2020-01-01	2020-01-02	2020-01-01 00:02:46	2020-01-02 03:31:07	2020-01-01 00:02:46.000	2020-01-02 03:31:07.000	166	99067	49616.5	4961650	166	99067	49616.5	4961650	-32403	32532	5052.02	505202	-128	127	1.14	114
+167	101	10157	99068	0.5015	297.5015	149.0015	14900.15015	0.5015	297.5015	149.00149	14900.14984	0.5015	297.5015	149.0015	14900.15	2020-01-01	2020-01-02	2020-01-01 00:02:47	2020-01-02 03:31:08	2020-01-01 00:02:47.000	2020-01-02 03:31:08.000	167	99068	49617.5	4961750	167	99068	49617.5	4961750	-32402	32533	5053.02	505302	-128	123	-0.42	-42
+168	101	10158	99069	0.5045	297.5045	149.0045	14900.45045	0.5045	297.50452	149.0045	14900.45042	0.5045	297.5045	149.0045	14900.45	2020-01-01	2020-01-02	2020-01-01 00:02:48	2020-01-02 03:31:09	2020-01-01 00:02:48.000	2020-01-02 03:31:09.000	168	99069	49618.5	4961850	168	99069	49618.5	4961850	-32401	32534	5054.02	505402	-127	124	0.58	58
+169	101	10159	99070	0.5075	297.5075	149.0075	14900.75075	0.5075	297.5075	149.0075	14900.75073	0.5075	297.5075	149.0075	14900.75	2020-01-01	2020-01-02	2020-01-01 00:02:49	2020-01-02 03:31:10	2020-01-01 00:02:49.000	2020-01-02 03:31:10.000	169	99070	49619.5	4961950	169	99070	49619.5	4961950	-32400	32535	5055.02	505502	-126	125	1.58	158
 17	102	10007	99917	0.05105	300.05105	150.05105	15155.15615	0.05105	300.05106	150.05105	15155.15638	0.05105	300.05105	150.05105	15155.15605	2020-01-01	2020-01-02	2020-01-01 00:00:17	2020-01-02 03:45:17	2020-01-01 00:00:17.000	2020-01-02 03:45:17.000	17	99917	49967	5046667	17	99917	49967	5046667	-32552	32383	4546.009900990099	459147	-128	127	-1.1584158415841583	-117
-170	101	10160	99071	0.51051	297.51051	149.01051	14901.05105	0.51051	297.5105	149.01051	14901.05104	0.51051	297.51051	149.01050999999998	14901.05100	2020-01-01	2020-01-02	2020-01-01 00:02:50	2020-01-02 03:31:11	2020-01-01 00:02:50.000	2020-01-02 03:31:11.000	170	99071	49620.5	4962050	170	99071	49620.5	4962050	-32399	32536	5056.02	505602	-125	126	2.58	258
-171	101	10161	99072	0.51351	297.51351	149.01351	14901.35135	0.51351	297.51352	149.01351	14901.35162	0.51351	297.51351	149.01351	14901.35100	2020-01-01	2020-01-02	2020-01-01 00:02:51	2020-01-02 03:31:12	2020-01-01 00:02:51.000	2020-01-02 03:31:12.000	171	99072	49621.5	4962150	171	99072	49621.5	4962150	-32398	32537	5057.02	505702	-124	127	3.58	358
-172	101	10162	99073	0.51651	297.51651	149.01651	14901.65165	0.51651	297.5165	149.01651	14901.65131	0.51651	297.51651	149.01651	14901.65100	2020-01-01	2020-01-02	2020-01-01 00:02:52	2020-01-02 03:31:13	2020-01-01 00:02:52.000	2020-01-02 03:31:13.000	172	99073	49622.5	4962250	172	99073	49622.5	4962250	-32397	32538	5058.02	505802	-128	127	2.02	202
-173	101	10163	99074	0.51951	297.51951	149.01951	14901.95195	0.51951	297.51953	149.01951	14901.95189	0.51951	297.51951	149.01951	14901.95100	2020-01-01	2020-01-02	2020-01-01 00:02:53	2020-01-02 03:31:14	2020-01-01 00:02:53.000	2020-01-02 03:31:14.000	173	99074	49623.5	4962350	173	99074	49623.5	4962350	-32396	32539	5059.02	505902	-128	127	0.46	46
-174	101	10164	99075	0.52252	297.52252	149.02252	14902.25225	0.52252	297.52252	149.02252	14902.2522	0.52252	297.52252	149.02252000000001	14902.25200	2020-01-01	2020-01-02	2020-01-01 00:02:54	2020-01-02 03:31:15	2020-01-01 00:02:54.000	2020-01-02 03:31:15.000	174	99075	49624.5	4962450	174	99075	49624.5	4962450	-32395	32540	5060.02	506002	-128	124	-1.1	-110
-175	101	10165	99076	0.52552	297.52552	149.02552	14902.55255	0.52552	297.5255	149.02552	14902.55251	0.52552	297.52552	149.02552	14902.55200	2020-01-01	2020-01-02	2020-01-01 00:02:55	2020-01-02 03:31:16	2020-01-01 00:02:55.000	2020-01-02 03:31:16.000	175	99076	49625.5	4962550	175	99076	49625.5	4962550	-32394	32541	5061.02	506102	-127	125	-0.1	-10
-176	101	10166	99077	0.52852	297.52852	149.02852	14902.85285	0.52852	297.52853	149.02853	14902.85312	0.52852	297.52852	149.02852000000001	14902.85200	2020-01-01	2020-01-02	2020-01-01 00:02:56	2020-01-02 03:31:17	2020-01-01 00:02:56.000	2020-01-02 03:31:17.000	176	99077	49626.5	4962650	176	99077	49626.5	4962650	-32393	32542	5062.02	506202	-126	126	0.9	90
-177	101	10167	99078	0.53153	297.53153	149.03153	14903.15315	0.53153	297.53152	149.03152	14903.15278	0.53153	297.53153	149.03153	14903.15300	2020-01-01	2020-01-02	2020-01-01 00:02:57	2020-01-02 03:31:18	2020-01-01 00:02:57.000	2020-01-02 03:31:18.000	177	99078	49627.5	4962750	177	99078	49627.5	4962750	-32392	32543	5063.02	506302	-125	127	1.9	190
-178	101	10168	99079	0.53453	297.53453	149.03453	14903.45345	0.53453	297.53455	149.03453	14903.45352	0.53453	297.53453	149.03453	14903.45300	2020-01-01	2020-01-02	2020-01-01 00:02:58	2020-01-02 03:31:19	2020-01-01 00:02:58.000	2020-01-02 03:31:19.000	178	99079	49628.5	4962850	178	99079	49628.5	4962850	-32391	32544	5064.02	506402	-128	127	0.34	34
-179	101	10169	99080	0.53753	297.53753	149.03753	14903.75375	0.53753	297.53754	149.03753	14903.75366	0.53753	297.53753	149.03753	14903.75300	2020-01-01	2020-01-02	2020-01-01 00:02:59	2020-01-02 03:31:20	2020-01-01 00:02:59.000	2020-01-02 03:31:20.000	179	99080	49629.5	4962950	179	99080	49629.5	4962950	-32390	32545	5065.02	506502	-128	127	-1.22	-122
+170	101	10160	99071	0.51051	297.51051	149.01051	14901.05105	0.51051	297.5105	149.01051	14901.05104	0.51051	297.51051	149.01050999999998	14901.051	2020-01-01	2020-01-02	2020-01-01 00:02:50	2020-01-02 03:31:11	2020-01-01 00:02:50.000	2020-01-02 03:31:11.000	170	99071	49620.5	4962050	170	99071	49620.5	4962050	-32399	32536	5056.02	505602	-125	126	2.58	258
+171	101	10161	99072	0.51351	297.51351	149.01351	14901.35135	0.51351	297.51352	149.01351	14901.35162	0.51351	297.51351	149.01351	14901.351	2020-01-01	2020-01-02	2020-01-01 00:02:51	2020-01-02 03:31:12	2020-01-01 00:02:51.000	2020-01-02 03:31:12.000	171	99072	49621.5	4962150	171	99072	49621.5	4962150	-32398	32537	5057.02	505702	-124	127	3.58	358
+172	101	10162	99073	0.51651	297.51651	149.01651	14901.65165	0.51651	297.5165	149.01651	14901.65131	0.51651	297.51651	149.01651	14901.651	2020-01-01	2020-01-02	2020-01-01 00:02:52	2020-01-02 03:31:13	2020-01-01 00:02:52.000	2020-01-02 03:31:13.000	172	99073	49622.5	4962250	172	99073	49622.5	4962250	-32397	32538	5058.02	505802	-128	127	2.02	202
+173	101	10163	99074	0.51951	297.51951	149.01951	14901.95195	0.51951	297.51953	149.01951	14901.95189	0.51951	297.51951	149.01951	14901.951	2020-01-01	2020-01-02	2020-01-01 00:02:53	2020-01-02 03:31:14	2020-01-01 00:02:53.000	2020-01-02 03:31:14.000	173	99074	49623.5	4962350	173	99074	49623.5	4962350	-32396	32539	5059.02	505902	-128	127	0.46	46
+174	101	10164	99075	0.52252	297.52252	149.02252	14902.25225	0.52252	297.52252	149.02252	14902.2522	0.52252	297.52252	149.02252000000001	14902.252	2020-01-01	2020-01-02	2020-01-01 00:02:54	2020-01-02 03:31:15	2020-01-01 00:02:54.000	2020-01-02 03:31:15.000	174	99075	49624.5	4962450	174	99075	49624.5	4962450	-32395	32540	5060.02	506002	-128	124	-1.1	-110
+175	101	10165	99076	0.52552	297.52552	149.02552	14902.55255	0.52552	297.5255	149.02552	14902.55251	0.52552	297.52552	149.02552	14902.552	2020-01-01	2020-01-02	2020-01-01 00:02:55	2020-01-02 03:31:16	2020-01-01 00:02:55.000	2020-01-02 03:31:16.000	175	99076	49625.5	4962550	175	99076	49625.5	4962550	-32394	32541	5061.02	506102	-127	125	-0.1	-10
+176	101	10166	99077	0.52852	297.52852	149.02852	14902.85285	0.52852	297.52853	149.02853	14902.85312	0.52852	297.52852	149.02852000000001	14902.852	2020-01-01	2020-01-02	2020-01-01 00:02:56	2020-01-02 03:31:17	2020-01-01 00:02:56.000	2020-01-02 03:31:17.000	176	99077	49626.5	4962650	176	99077	49626.5	4962650	-32393	32542	5062.02	506202	-126	126	0.9	90
+177	101	10167	99078	0.53153	297.53153	149.03153	14903.15315	0.53153	297.53152	149.03152	14903.15278	0.53153	297.53153	149.03153	14903.153	2020-01-01	2020-01-02	2020-01-01 00:02:57	2020-01-02 03:31:18	2020-01-01 00:02:57.000	2020-01-02 03:31:18.000	177	99078	49627.5	4962750	177	99078	49627.5	4962750	-32392	32543	5063.02	506302	-125	127	1.9	190
+178	101	10168	99079	0.53453	297.53453	149.03453	14903.45345	0.53453	297.53455	149.03453	14903.45352	0.53453	297.53453	149.03453	14903.453	2020-01-01	2020-01-02	2020-01-01 00:02:58	2020-01-02 03:31:19	2020-01-01 00:02:58.000	2020-01-02 03:31:19.000	178	99079	49628.5	4962850	178	99079	49628.5	4962850	-32391	32544	5064.02	506402	-128	127	0.34	34
+179	101	10169	99080	0.53753	297.53753	149.03753	14903.75375	0.53753	297.53754	149.03753	14903.75366	0.53753	297.53753	149.03753	14903.753	2020-01-01	2020-01-02	2020-01-01 00:02:59	2020-01-02 03:31:20	2020-01-01 00:02:59.000	2020-01-02 03:31:20.000	179	99080	49629.5	4962950	179	99080	49629.5	4962950	-32390	32545	5065.02	506502	-128	127	-1.22	-122
 18	102	10008	99918	0.05405	300.05405	150.05405	15155.45945	0.05405	300.05405	150.05404	15155.45903	0.05405	300.05405	150.05405	15155.45905	2020-01-01	2020-01-02	2020-01-01 00:00:18	2020-01-02 03:45:18	2020-01-01 00:00:18.000	2020-01-02 03:45:18.000	18	99918	49968	5046768	18	99918	49968	5046768	-32551	32384	4547.009900990099	459248	-128	124	-2.6930693069306932	-272
-180	101	10170	99081	0.54054	297.54054	149.04054	14904.05405	0.54054	297.54053	149.04053	14904.05398	0.54054	297.54054	149.04054	14904.05400	2020-01-01	2020-01-02	2020-01-01 00:03:00	2020-01-02 03:31:21	2020-01-01 00:03:00.000	2020-01-02 03:31:21.000	180	99081	49630.5	4963050	180	99081	49630.5	4963050	-32389	32546	5066.02	506602	-128	123	-2.78	-278
-181	101	10171	99082	0.54354	297.54354	149.04354	14904.35435	0.54354	297.54355	149.04354	14904.35459	0.54354	297.54354	149.04354	14904.35400	2020-01-01	2020-01-02	2020-01-01 00:03:01	2020-01-02 03:31:22	2020-01-01 00:03:01.000	2020-01-02 03:31:22.000	181	99082	49631.5	4963150	181	99082	49631.5	4963150	-32388	32547	5067.02	506702	-127	124	-1.78	-178
-182	101	10172	99083	0.54654	297.54654	149.04654	14904.65465	0.54654	297.54654	149.04654	14904.65425	0.54654	297.54654	149.04654	14904.65400	2020-01-01	2020-01-02	2020-01-01 00:03:02	2020-01-02 03:31:23	2020-01-01 00:03:02.000	2020-01-02 03:31:23.000	182	99083	49632.5	4963250	182	99083	49632.5	4963250	-32387	32548	5068.02	506802	-126	125	-0.78	-78
-183	101	10173	99084	0.54954	297.54954	149.04954	14904.95495	0.54954	297.54956	149.04954	14904.95498	0.54954	297.54954	149.04954	14904.95400	2020-01-01	2020-01-02	2020-01-01 00:03:03	2020-01-02 03:31:24	2020-01-01 00:03:03.000	2020-01-02 03:31:24.000	183	99084	49633.5	4963350	183	99084	49633.5	4963350	-32386	32549	5069.02	506902	-125	126	0.22	22
-184	101	10174	99085	0.55255	297.55255	149.05255	14905.25525	0.55255	297.55255	149.05255	14905.25514	0.55255	297.55255	149.05255	14905.25500	2020-01-01	2020-01-02	2020-01-01 00:03:04	2020-01-02 03:31:25	2020-01-01 00:03:04.000	2020-01-02 03:31:25.000	184	99085	49634.5	4963450	184	99085	49634.5	4963450	-32385	32550	5070.02	507002	-124	127	1.22	122
-185	101	10175	99086	0.55555	297.55555	149.05555	14905.55555	0.55555	297.55554	149.05555	14905.55549	0.55555	297.55555	149.05555	14905.55500	2020-01-01	2020-01-02	2020-01-01 00:03:05	2020-01-02 03:31:26	2020-01-01 00:03:05.000	2020-01-02 03:31:26.000	185	99086	49635.5	4963550	185	99086	49635.5	4963550	-32384	32551	5071.02	507102	-128	127	-0.34	-34
-186	101	10176	99087	0.55855	297.55855	149.05855	14905.85585	0.55855	297.55856	149.05856	14905.85607	0.55855	297.55855	149.05855	14905.85500	2020-01-01	2020-01-02	2020-01-01 00:03:06	2020-01-02 03:31:27	2020-01-01 00:03:06.000	2020-01-02 03:31:27.000	186	99087	49636.5	4963650	186	99087	49636.5	4963650	-32383	32552	5072.02	507202	-128	123	-1.9	-190
-187	101	10177	99088	0.56156	297.56156	149.06156	14906.15615	0.56156	297.56155	149.06155	14906.15572	0.56156	297.56156	149.06156000000001	14906.15600	2020-01-01	2020-01-02	2020-01-01 00:03:07	2020-01-02 03:31:28	2020-01-01 00:03:07.000	2020-01-02 03:31:28.000	187	99088	49637.5	4963750	187	99088	49637.5	4963750	-32382	32553	5073.02	507302	-127	124	-0.9	-90
-188	101	10178	99089	0.56456	297.56456	149.06456	14906.45645	0.56456	297.56458	149.06456	14906.45645	0.56456	297.56456	149.06456	14906.45600	2020-01-01	2020-01-02	2020-01-01 00:03:08	2020-01-02 03:31:29	2020-01-01 00:03:08.000	2020-01-02 03:31:29.000	188	99089	49638.5	4963850	188	99089	49638.5	4963850	-32381	32554	5074.02	507402	-126	125	0.1	10
-189	101	10179	99090	0.56756	297.56756	149.06756	14906.75675	0.56756	297.56757	149.06756	14906.75661	0.56756	297.56756	149.06756	14906.75600	2020-01-01	2020-01-02	2020-01-01 00:03:09	2020-01-02 03:31:30	2020-01-01 00:03:09.000	2020-01-02 03:31:30.000	189	99090	49639.5	4963950	189	99090	49639.5	4963950	-32380	32555	5075.02	507502	-125	126	1.1	110
+180	101	10170	99081	0.54054	297.54054	149.04054	14904.05405	0.54054	297.54053	149.04053	14904.05398	0.54054	297.54054	149.04054	14904.054	2020-01-01	2020-01-02	2020-01-01 00:03:00	2020-01-02 03:31:21	2020-01-01 00:03:00.000	2020-01-02 03:31:21.000	180	99081	49630.5	4963050	180	99081	49630.5	4963050	-32389	32546	5066.02	506602	-128	123	-2.78	-278
+181	101	10171	99082	0.54354	297.54354	149.04354	14904.35435	0.54354	297.54355	149.04354	14904.35459	0.54354	297.54354	149.04354	14904.354	2020-01-01	2020-01-02	2020-01-01 00:03:01	2020-01-02 03:31:22	2020-01-01 00:03:01.000	2020-01-02 03:31:22.000	181	99082	49631.5	4963150	181	99082	49631.5	4963150	-32388	32547	5067.02	506702	-127	124	-1.78	-178
+182	101	10172	99083	0.54654	297.54654	149.04654	14904.65465	0.54654	297.54654	149.04654	14904.65425	0.54654	297.54654	149.04654	14904.654	2020-01-01	2020-01-02	2020-01-01 00:03:02	2020-01-02 03:31:23	2020-01-01 00:03:02.000	2020-01-02 03:31:23.000	182	99083	49632.5	4963250	182	99083	49632.5	4963250	-32387	32548	5068.02	506802	-126	125	-0.78	-78
+183	101	10173	99084	0.54954	297.54954	149.04954	14904.95495	0.54954	297.54956	149.04954	14904.95498	0.54954	297.54954	149.04954	14904.954	2020-01-01	2020-01-02	2020-01-01 00:03:03	2020-01-02 03:31:24	2020-01-01 00:03:03.000	2020-01-02 03:31:24.000	183	99084	49633.5	4963350	183	99084	49633.5	4963350	-32386	32549	5069.02	506902	-125	126	0.22	22
+184	101	10174	99085	0.55255	297.55255	149.05255	14905.25525	0.55255	297.55255	149.05255	14905.25514	0.55255	297.55255	149.05255	14905.255	2020-01-01	2020-01-02	2020-01-01 00:03:04	2020-01-02 03:31:25	2020-01-01 00:03:04.000	2020-01-02 03:31:25.000	184	99085	49634.5	4963450	184	99085	49634.5	4963450	-32385	32550	5070.02	507002	-124	127	1.22	122
+185	101	10175	99086	0.55555	297.55555	149.05555	14905.55555	0.55555	297.55554	149.05555	14905.55549	0.55555	297.55555	149.05555	14905.555	2020-01-01	2020-01-02	2020-01-01 00:03:05	2020-01-02 03:31:26	2020-01-01 00:03:05.000	2020-01-02 03:31:26.000	185	99086	49635.5	4963550	185	99086	49635.5	4963550	-32384	32551	5071.02	507102	-128	127	-0.34	-34
+186	101	10176	99087	0.55855	297.55855	149.05855	14905.85585	0.55855	297.55856	149.05856	14905.85607	0.55855	297.55855	149.05855	14905.855	2020-01-01	2020-01-02	2020-01-01 00:03:06	2020-01-02 03:31:27	2020-01-01 00:03:06.000	2020-01-02 03:31:27.000	186	99087	49636.5	4963650	186	99087	49636.5	4963650	-32383	32552	5072.02	507202	-128	123	-1.9	-190
+187	101	10177	99088	0.56156	297.56156	149.06156	14906.15615	0.56156	297.56155	149.06155	14906.15572	0.56156	297.56156	149.06156000000001	14906.156	2020-01-01	2020-01-02	2020-01-01 00:03:07	2020-01-02 03:31:28	2020-01-01 00:03:07.000	2020-01-02 03:31:28.000	187	99088	49637.5	4963750	187	99088	49637.5	4963750	-32382	32553	5073.02	507302	-127	124	-0.9	-90
+188	101	10178	99089	0.56456	297.56456	149.06456	14906.45645	0.56456	297.56458	149.06456	14906.45645	0.56456	297.56456	149.06456	14906.456	2020-01-01	2020-01-02	2020-01-01 00:03:08	2020-01-02 03:31:29	2020-01-01 00:03:08.000	2020-01-02 03:31:29.000	188	99089	49638.5	4963850	188	99089	49638.5	4963850	-32381	32554	5074.02	507402	-126	125	0.1	10
+189	101	10179	99090	0.56756	297.56756	149.06756	14906.75675	0.56756	297.56757	149.06756	14906.75661	0.56756	297.56756	149.06756	14906.756	2020-01-01	2020-01-02	2020-01-01 00:03:09	2020-01-02 03:31:30	2020-01-01 00:03:09.000	2020-01-02 03:31:30.000	189	99090	49639.5	4963950	189	99090	49639.5	4963950	-32380	32555	5075.02	507502	-125	126	1.1	110
 19	102	10009	99919	0.05705	300.05705	150.05705	15155.76276	0.05705	300.05707	150.05705	15155.76279	0.05705	300.05705	150.05705	15155.76205	2020-01-01	2020-01-02	2020-01-01 00:00:19	2020-01-02 03:45:19	2020-01-01 00:00:19.000	2020-01-02 03:45:19.000	19	99919	49969	5046869	19	99919	49969	5046869	-32550	32385	4548.009900990099	459349	-127	125	-1.693069306930693	-171
-190	101	10180	99091	0.57057	297.57057	149.07057	14907.05705	0.57057	297.57056	149.07056	14907.05695	0.57057	297.57057	149.07057	14907.05700	2020-01-01	2020-01-02	2020-01-01 00:03:10	2020-01-02 03:31:31	2020-01-01 00:03:10.000	2020-01-02 03:31:31.000	190	99091	49640.5	4964050	190	99091	49640.5	4964050	-32379	32556	5076.02	507602	-124	127	2.1	210
-191	101	10181	99092	0.57357	297.57357	149.07357	14907.35735	0.57357	297.57358	149.07357	14907.35753	0.57357	297.57357	149.07357	14907.35700	2020-01-01	2020-01-02	2020-01-01 00:03:11	2020-01-02 03:31:32	2020-01-01 00:03:11.000	2020-01-02 03:31:32.000	191	99092	49641.5	4964150	191	99092	49641.5	4964150	-32378	32557	5077.02	507702	-128	127	0.54	54
-192	101	10182	99093	0.57657	297.57657	149.07657	14907.65765	0.57657	297.57657	149.07657	14907.65784	0.57657	297.57657	149.07657	14907.65700	2020-01-01	2020-01-02	2020-01-01 00:03:12	2020-01-02 03:31:33	2020-01-01 00:03:12.000	2020-01-02 03:31:33.000	192	99093	49642.5	4964250	192	99093	49642.5	4964250	-32377	32558	5078.02	507802	-128	123	-1.02	-102
-193	101	10183	99094	0.57957	297.57957	149.07957	14907.95795	0.57957	297.5796	149.07957	14907.95793	0.57957	297.57957	149.07957	14907.95700	2020-01-01	2020-01-02	2020-01-01 00:03:13	2020-01-02 03:31:34	2020-01-01 00:03:13.000	2020-01-02 03:31:34.000	193	99094	49643.5	4964350	193	99094	49643.5	4964350	-32376	32559	5079.02	507902	-127	124	-0.02	-2
-194	101	10184	99095	0.58258	297.58258	149.08258	14908.25825	0.58258	297.58258	149.08258	14908.25811	0.58258	297.58258	149.08258	14908.25800	2020-01-01	2020-01-02	2020-01-01 00:03:14	2020-01-02 03:31:35	2020-01-01 00:03:14.000	2020-01-02 03:31:35.000	194	99095	49644.5	4964450	194	99095	49644.5	4964450	-32375	32560	5080.02	508002	-126	125	0.98	98
-195	101	10185	99096	0.58558	297.58558	149.08558	14908.55855	0.58558	297.58557	149.08558	14908.55842	0.58558	297.58558	149.08558000000002	14908.55800	2020-01-01	2020-01-02	2020-01-01 00:03:15	2020-01-02 03:31:36	2020-01-01 00:03:15.000	2020-01-02 03:31:36.000	195	99096	49645.5	4964550	195	99096	49645.5	4964550	-32374	32561	5081.02	508102	-125	126	1.98	198
-196	101	10186	99097	0.58858	297.58858	149.08858	14908.85885	0.58858	297.5886	149.08859	14908.859	0.58858	297.58858	149.08858	14908.85800	2020-01-01	2020-01-02	2020-01-01 00:03:16	2020-01-02 03:31:37	2020-01-01 00:03:16.000	2020-01-02 03:31:37.000	196	99097	49646.5	4964650	196	99097	49646.5	4964650	-32373	32562	5082.02	508202	-124	127	2.98	298
-197	101	10187	99098	0.59159	297.59159	149.09159	14909.15915	0.59159	297.59158	149.09159	14909.15931	0.59159	297.59159	149.09159	14909.15900	2020-01-01	2020-01-02	2020-01-01 00:03:17	2020-01-02 03:31:38	2020-01-01 00:03:17.000	2020-01-02 03:31:38.000	197	99098	49647.5	4964750	197	99098	49647.5	4964750	-32372	32563	5083.02	508302	-128	127	1.42	142
-198	101	10188	99099	0.59459	297.59459	149.09459	14909.45945	0.59459	297.5946	149.09459	14909.4594	0.59459	297.59459	149.09459	14909.45900	2020-01-01	2020-01-02	2020-01-01 00:03:18	2020-01-02 03:31:39	2020-01-01 00:03:18.000	2020-01-02 03:31:39.000	198	99099	49648.5	4964850	198	99099	49648.5	4964850	-32371	32564	5084.02	508402	-128	127	-0.14	-14
-199	101	10189	99100	0.59759	297.59759	149.09759	14909.75975	0.59759	297.5976	149.09759	14909.75958	0.59759	297.59759	149.09759	14909.75900	2020-01-01	2020-01-02	2020-01-01 00:03:19	2020-01-02 03:31:40	2020-01-01 00:03:19.000	2020-01-02 03:31:40.000	199	99100	49649.5	4964950	199	99100	49649.5	4964950	-32370	32565	5085.02	508502	-128	124	-1.7	-170
-2	102	1001	9992	0.006	300.006	150.006	15150.6066	0.006	300.006	150.006	15150.6069	0.00600	300.00600	150.006	15150.60600	2020-01-01	2020-01-02	2020-01-01 00:00:02	2020-01-02 03:45:02	2020-01-01 00:00:02.000	2020-01-02 03:45:02.000	2	99902	49952	5045152	2	99902	49952	5045152	-32567	32368	4531.009900990099	457632	-125	126	-0.9504950495049505	-96
+190	101	10180	99091	0.57057	297.57057	149.07057	14907.05705	0.57057	297.57056	149.07056	14907.05695	0.57057	297.57057	149.07057	14907.057	2020-01-01	2020-01-02	2020-01-01 00:03:10	2020-01-02 03:31:31	2020-01-01 00:03:10.000	2020-01-02 03:31:31.000	190	99091	49640.5	4964050	190	99091	49640.5	4964050	-32379	32556	5076.02	507602	-124	127	2.1	210
+191	101	10181	99092	0.57357	297.57357	149.07357	14907.35735	0.57357	297.57358	149.07357	14907.35753	0.57357	297.57357	149.07357	14907.357	2020-01-01	2020-01-02	2020-01-01 00:03:11	2020-01-02 03:31:32	2020-01-01 00:03:11.000	2020-01-02 03:31:32.000	191	99092	49641.5	4964150	191	99092	49641.5	4964150	-32378	32557	5077.02	507702	-128	127	0.54	54
+192	101	10182	99093	0.57657	297.57657	149.07657	14907.65765	0.57657	297.57657	149.07657	14907.65784	0.57657	297.57657	149.07657	14907.657	2020-01-01	2020-01-02	2020-01-01 00:03:12	2020-01-02 03:31:33	2020-01-01 00:03:12.000	2020-01-02 03:31:33.000	192	99093	49642.5	4964250	192	99093	49642.5	4964250	-32377	32558	5078.02	507802	-128	123	-1.02	-102
+193	101	10183	99094	0.57957	297.57957	149.07957	14907.95795	0.57957	297.5796	149.07957	14907.95793	0.57957	297.57957	149.07957	14907.957	2020-01-01	2020-01-02	2020-01-01 00:03:13	2020-01-02 03:31:34	2020-01-01 00:03:13.000	2020-01-02 03:31:34.000	193	99094	49643.5	4964350	193	99094	49643.5	4964350	-32376	32559	5079.02	507902	-127	124	-0.02	-2
+194	101	10184	99095	0.58258	297.58258	149.08258	14908.25825	0.58258	297.58258	149.08258	14908.25811	0.58258	297.58258	149.08258	14908.258	2020-01-01	2020-01-02	2020-01-01 00:03:14	2020-01-02 03:31:35	2020-01-01 00:03:14.000	2020-01-02 03:31:35.000	194	99095	49644.5	4964450	194	99095	49644.5	4964450	-32375	32560	5080.02	508002	-126	125	0.98	98
+195	101	10185	99096	0.58558	297.58558	149.08558	14908.55855	0.58558	297.58557	149.08558	14908.55842	0.58558	297.58558	149.08558000000002	14908.558	2020-01-01	2020-01-02	2020-01-01 00:03:15	2020-01-02 03:31:36	2020-01-01 00:03:15.000	2020-01-02 03:31:36.000	195	99096	49645.5	4964550	195	99096	49645.5	4964550	-32374	32561	5081.02	508102	-125	126	1.98	198
+196	101	10186	99097	0.58858	297.58858	149.08858	14908.85885	0.58858	297.5886	149.08859	14908.859	0.58858	297.58858	149.08858	14908.858	2020-01-01	2020-01-02	2020-01-01 00:03:16	2020-01-02 03:31:37	2020-01-01 00:03:16.000	2020-01-02 03:31:37.000	196	99097	49646.5	4964650	196	99097	49646.5	4964650	-32373	32562	5082.02	508202	-124	127	2.98	298
+197	101	10187	99098	0.59159	297.59159	149.09159	14909.15915	0.59159	297.59158	149.09159	14909.15931	0.59159	297.59159	149.09159	14909.159	2020-01-01	2020-01-02	2020-01-01 00:03:17	2020-01-02 03:31:38	2020-01-01 00:03:17.000	2020-01-02 03:31:38.000	197	99098	49647.5	4964750	197	99098	49647.5	4964750	-32372	32563	5083.02	508302	-128	127	1.42	142
+198	101	10188	99099	0.59459	297.59459	149.09459	14909.45945	0.59459	297.5946	149.09459	14909.4594	0.59459	297.59459	149.09459	14909.459	2020-01-01	2020-01-02	2020-01-01 00:03:18	2020-01-02 03:31:39	2020-01-01 00:03:18.000	2020-01-02 03:31:39.000	198	99099	49648.5	4964850	198	99099	49648.5	4964850	-32371	32564	5084.02	508402	-128	127	-0.14	-14
+199	101	10189	99100	0.59759	297.59759	149.09759	14909.75975	0.59759	297.5976	149.09759	14909.75958	0.59759	297.59759	149.09759	14909.759	2020-01-01	2020-01-02	2020-01-01 00:03:19	2020-01-02 03:31:40	2020-01-01 00:03:19.000	2020-01-02 03:31:40.000	199	99100	49649.5	4964950	199	99100	49649.5	4964950	-32370	32565	5085.02	508502	-128	124	-1.7	-170
+2	102	1001	9992	0.006	300.006	150.006	15150.6066	0.006	300.006	150.006	15150.6069	0.006	300.006	150.006	15150.606	2020-01-01	2020-01-02	2020-01-01 00:00:02	2020-01-02 03:45:02	2020-01-01 00:00:02.000	2020-01-02 03:45:02.000	2	99902	49952	5045152	2	99902	49952	5045152	-32567	32368	4531.009900990099	457632	-125	126	-0.9504950495049505	-96
 20	102	10010	99920	0.06006	300.06006	150.06006	15156.06606	0.06006	300.06006	150.06005	15156.06593	0.06006	300.06006	150.06006	15156.06606	2020-01-01	2020-01-02	2020-01-01 00:00:20	2020-01-02 03:45:20	2020-01-01 00:00:20.000	2020-01-02 03:45:20.000	20	99920	49970	5046970	20	99920	49970	5046970	-32549	32386	4549.009900990099	459450	-126	126	-0.693069306930693	-70
-200	101	10190	99101	0.6006	297.6006	149.1006	14910.06006	0.6006	297.6006	149.10059	14910.0599	0.60060	297.60060	149.1006	14910.06000	2020-01-01	2020-01-02	2020-01-01 00:03:20	2020-01-02 03:31:41	2020-01-01 00:03:20.000	2020-01-02 03:31:41.000	200	99101	49650.5	4965050	200	99101	49650.5	4965050	-32369	32566	5086.02	508602	-127	125	-0.7	-70
-201	101	10191	99102	0.6036	297.6036	149.1036	14910.36036	0.6036	297.6036	149.1036	14910.36063	0.60360	297.60360	149.1036	14910.36000	2020-01-01	2020-01-02	2020-01-01 00:03:21	2020-01-02 03:31:42	2020-01-01 00:03:21.000	2020-01-02 03:31:42.000	201	99102	49651.5	4965150	201	99102	49651.5	4965150	-32368	32567	5087.02	508702	-126	126	0.3	30
-202	101	10192	99103	0.6066	297.6066	149.1066	14910.66066	0.6066	297.6066	149.1066	14910.66078	0.60660	297.60660	149.1066	14910.66000	2020-01-01	2020-01-02	2020-01-01 00:03:22	2020-01-02 03:31:43	2020-01-01 00:03:22.000	2020-01-02 03:31:43.000	202	99103	49652.5	4965250	202	99103	49652.5	4965250	-32367	32568	5088.02	508802	-125	127	1.3	130
-203	101	10193	99104	0.6096	297.6096	149.1096	14910.96096	0.6096	297.60962	149.1096	14910.9609	0.60960	297.60960	149.1096	14910.96000	2020-01-01	2020-01-02	2020-01-01 00:03:23	2020-01-02 03:31:44	2020-01-01 00:03:23.000	2020-01-02 03:31:44.000	203	99104	49653.5	4965350	203	99104	49653.5	4965350	-32366	32569	5089.02	508902	-128	127	-0.26	-26
-204	101	10194	99105	0.61261	297.61261	149.11261	14911.26126	0.61261	297.6126	149.11261	14911.26105	0.61261	297.61261	149.11261000000002	14911.26100	2020-01-01	2020-01-02	2020-01-01 00:03:24	2020-01-02 03:31:45	2020-01-01 00:03:24.000	2020-01-02 03:31:45.000	204	99105	49654.5	4965450	204	99105	49654.5	4965450	-32365	32570	5090.02	509002	-128	127	-1.82	-182
-205	101	10195	99106	0.61561	297.61561	149.11561	14911.56156	0.61561	297.6156	149.11561	14911.56137	0.61561	297.61561	149.11561	14911.56100	2020-01-01	2020-01-02	2020-01-01 00:03:25	2020-01-02 03:31:46	2020-01-01 00:03:25.000	2020-01-02 03:31:46.000	205	99106	49655.5	4965550	205	99106	49655.5	4965550	-32364	32571	5091.02	509102	-128	123	-3.38	-338
-206	101	10196	99107	0.61861	297.61861	149.11861	14911.86186	0.61861	297.61862	149.11862	14911.8621	0.61861	297.61861	149.11861000000002	14911.86100	2020-01-01	2020-01-02	2020-01-01 00:03:26	2020-01-02 03:31:47	2020-01-01 00:03:26.000	2020-01-02 03:31:47.000	206	99107	49656.5	4965650	206	99107	49656.5	4965650	-32363	32572	5092.02	509202	-127	124	-2.38	-238
-207	101	10197	99108	0.62162	297.62162	149.12162	14912.16216	0.62162	297.6216	149.12162	14912.16225	0.62162	297.62162	149.12162	14912.16200	2020-01-01	2020-01-02	2020-01-01 00:03:27	2020-01-02 03:31:48	2020-01-01 00:03:27.000	2020-01-02 03:31:48.000	207	99108	49657.5	4965750	207	99108	49657.5	4965750	-32362	32573	5093.02	509302	-126	125	-1.38	-138
-208	101	10198	99109	0.62462	297.62462	149.12462	14912.46246	0.62462	297.62463	149.12462	14912.46237	0.62462	297.62462	149.12462	14912.46200	2020-01-01	2020-01-02	2020-01-01 00:03:28	2020-01-02 03:31:49	2020-01-01 00:03:28.000	2020-01-02 03:31:49.000	208	99109	49658.5	4965850	208	99109	49658.5	4965850	-32361	32574	5094.02	509402	-125	126	-0.38	-38
-209	101	10199	99110	0.62762	297.62762	149.12762	14912.76276	0.62762	297.62762	149.12762	14912.76253	0.62762	297.62762	149.12762	14912.76200	2020-01-01	2020-01-02	2020-01-01 00:03:29	2020-01-02 03:31:50	2020-01-01 00:03:29.000	2020-01-02 03:31:50.000	209	99110	49659.5	4965950	209	99110	49659.5	4965950	-32360	32575	5095.02	509502	-124	127	0.62	62
+200	101	10190	99101	0.6006	297.6006	149.1006	14910.06006	0.6006	297.6006	149.10059	14910.0599	0.6006	297.6006	149.1006	14910.06	2020-01-01	2020-01-02	2020-01-01 00:03:20	2020-01-02 03:31:41	2020-01-01 00:03:20.000	2020-01-02 03:31:41.000	200	99101	49650.5	4965050	200	99101	49650.5	4965050	-32369	32566	5086.02	508602	-127	125	-0.7	-70
+201	101	10191	99102	0.6036	297.6036	149.1036	14910.36036	0.6036	297.6036	149.1036	14910.36063	0.6036	297.6036	149.1036	14910.36	2020-01-01	2020-01-02	2020-01-01 00:03:21	2020-01-02 03:31:42	2020-01-01 00:03:21.000	2020-01-02 03:31:42.000	201	99102	49651.5	4965150	201	99102	49651.5	4965150	-32368	32567	5087.02	508702	-126	126	0.3	30
+202	101	10192	99103	0.6066	297.6066	149.1066	14910.66066	0.6066	297.6066	149.1066	14910.66078	0.6066	297.6066	149.1066	14910.66	2020-01-01	2020-01-02	2020-01-01 00:03:22	2020-01-02 03:31:43	2020-01-01 00:03:22.000	2020-01-02 03:31:43.000	202	99103	49652.5	4965250	202	99103	49652.5	4965250	-32367	32568	5088.02	508802	-125	127	1.3	130
+203	101	10193	99104	0.6096	297.6096	149.1096	14910.96096	0.6096	297.60962	149.1096	14910.9609	0.6096	297.6096	149.1096	14910.96	2020-01-01	2020-01-02	2020-01-01 00:03:23	2020-01-02 03:31:44	2020-01-01 00:03:23.000	2020-01-02 03:31:44.000	203	99104	49653.5	4965350	203	99104	49653.5	4965350	-32366	32569	5089.02	508902	-128	127	-0.26	-26
+204	101	10194	99105	0.61261	297.61261	149.11261	14911.26126	0.61261	297.6126	149.11261	14911.26105	0.61261	297.61261	149.11261000000002	14911.261	2020-01-01	2020-01-02	2020-01-01 00:03:24	2020-01-02 03:31:45	2020-01-01 00:03:24.000	2020-01-02 03:31:45.000	204	99105	49654.5	4965450	204	99105	49654.5	4965450	-32365	32570	5090.02	509002	-128	127	-1.82	-182
+205	101	10195	99106	0.61561	297.61561	149.11561	14911.56156	0.61561	297.6156	149.11561	14911.56137	0.61561	297.61561	149.11561	14911.561	2020-01-01	2020-01-02	2020-01-01 00:03:25	2020-01-02 03:31:46	2020-01-01 00:03:25.000	2020-01-02 03:31:46.000	205	99106	49655.5	4965550	205	99106	49655.5	4965550	-32364	32571	5091.02	509102	-128	123	-3.38	-338
+206	101	10196	99107	0.61861	297.61861	149.11861	14911.86186	0.61861	297.61862	149.11862	14911.8621	0.61861	297.61861	149.11861000000002	14911.861	2020-01-01	2020-01-02	2020-01-01 00:03:26	2020-01-02 03:31:47	2020-01-01 00:03:26.000	2020-01-02 03:31:47.000	206	99107	49656.5	4965650	206	99107	49656.5	4965650	-32363	32572	5092.02	509202	-127	124	-2.38	-238
+207	101	10197	99108	0.62162	297.62162	149.12162	14912.16216	0.62162	297.6216	149.12162	14912.16225	0.62162	297.62162	149.12162	14912.162	2020-01-01	2020-01-02	2020-01-01 00:03:27	2020-01-02 03:31:48	2020-01-01 00:03:27.000	2020-01-02 03:31:48.000	207	99108	49657.5	4965750	207	99108	49657.5	4965750	-32362	32573	5093.02	509302	-126	125	-1.38	-138
+208	101	10198	99109	0.62462	297.62462	149.12462	14912.46246	0.62462	297.62463	149.12462	14912.46237	0.62462	297.62462	149.12462	14912.462	2020-01-01	2020-01-02	2020-01-01 00:03:28	2020-01-02 03:31:49	2020-01-01 00:03:28.000	2020-01-02 03:31:49.000	208	99109	49658.5	4965850	208	99109	49658.5	4965850	-32361	32574	5094.02	509402	-125	126	-0.38	-38
+209	101	10199	99110	0.62762	297.62762	149.12762	14912.76276	0.62762	297.62762	149.12762	14912.76253	0.62762	297.62762	149.12762	14912.762	2020-01-01	2020-01-02	2020-01-01 00:03:29	2020-01-02 03:31:50	2020-01-01 00:03:29.000	2020-01-02 03:31:50.000	209	99110	49659.5	4965950	209	99110	49659.5	4965950	-32360	32575	5095.02	509502	-124	127	0.62	62
 21	102	10011	99921	0.06306	300.06306	150.06306	15156.36936	0.06306	300.06305	150.06306	15156.36927	0.06306	300.06306	150.06306	15156.36906	2020-01-01	2020-01-02	2020-01-01 00:00:21	2020-01-02 03:45:21	2020-01-01 00:00:21.000	2020-01-02 03:45:21.000	21	99921	49971	5047071	21	99921	49971	5047071	-32548	32387	4550.009900990099	459551	-125	127	0.3069306930693069	31
-210	101	10200	99111	0.63063	297.63063	149.13063	14913.06306	0.63063	297.63065	149.13063	14913.06326	0.63063	297.63063	149.13063	14913.06300	2020-01-01	2020-01-02	2020-01-01 00:03:30	2020-01-02 03:31:51	2020-01-01 00:03:30.000	2020-01-02 03:31:51.000	210	99111	49660.5	4966050	210	99111	49660.5	4966050	-32359	32576	5096.02	509602	-128	127	-0.94	-94
-211	101	10201	99112	0.63363	297.63363	149.13363	14913.36336	0.63363	297.63364	149.13363	14913.36357	0.63363	297.63363	149.13362999999998	14913.36300	2020-01-01	2020-01-02	2020-01-01 00:03:31	2020-01-02 03:31:52	2020-01-01 00:03:31.000	2020-01-02 03:31:52.000	211	99112	49661.5	4966150	211	99112	49661.5	4966150	-32358	32577	5097.02	509702	-128	123	-2.5	-250
-212	101	10202	99113	0.63663	297.63663	149.13663	14913.66366	0.63663	297.63663	149.13663	14913.66372	0.63663	297.63663	149.13663	14913.66300	2020-01-01	2020-01-02	2020-01-01 00:03:32	2020-01-02 03:31:53	2020-01-01 00:03:32.000	2020-01-02 03:31:53.000	212	99113	49662.5	4966250	212	99113	49662.5	4966250	-32357	32578	5098.02	509802	-127	124	-1.5	-150
-213	101	10203	99114	0.63963	297.63963	149.13963	14913.96396	0.63963	297.63965	149.13963	14913.96384	0.63963	297.63963	149.13963	14913.96300	2020-01-01	2020-01-02	2020-01-01 00:03:33	2020-01-02 03:31:54	2020-01-01 00:03:33.000	2020-01-02 03:31:54.000	213	99114	49663.5	4966350	213	99114	49663.5	4966350	-32356	32579	5099.02	509902	-126	125	-0.5	-50
-214	101	10204	99115	0.64264	297.64264	149.14264	14914.26426	0.64264	297.64264	149.14263	14914.26399	0.64264	297.64264	149.14264	14914.26400	2020-01-01	2020-01-02	2020-01-01 00:03:34	2020-01-02 03:31:55	2020-01-01 00:03:34.000	2020-01-02 03:31:55.000	214	99115	49664.5	4966450	214	99115	49664.5	4966450	-32355	32580	5100.02	510002	-125	126	0.5	50
-215	101	10205	99116	0.64564	297.64564	149.14564	14914.56456	0.64564	297.64566	149.14564	14914.56473	0.64564	297.64564	149.14564000000001	14914.56400	2020-01-01	2020-01-02	2020-01-01 00:03:35	2020-01-02 03:31:56	2020-01-01 00:03:35.000	2020-01-02 03:31:56.000	215	99116	49665.5	4966550	215	99116	49665.5	4966550	-32354	32581	5101.02	510102	-124	127	1.5	150
-216	101	10206	99117	0.64864	297.64864	149.14864	14914.86486	0.64864	297.64865	149.14865	14914.86504	0.64864	297.64864	149.14864	14914.86400	2020-01-01	2020-01-02	2020-01-01 00:03:36	2020-01-02 03:31:57	2020-01-01 00:03:36.000	2020-01-02 03:31:57.000	216	99117	49666.5	4966650	216	99117	49666.5	4966650	-32353	32582	5102.02	510202	-128	127	-0.06	-6
-217	101	10207	99118	0.65165	297.65165	149.15165	14915.16516	0.65165	297.65164	149.15165	14915.16523	0.65165	297.65165	149.15165000000002	14915.16500	2020-01-01	2020-01-02	2020-01-01 00:03:37	2020-01-02 03:31:58	2020-01-01 00:03:37.000	2020-01-02 03:31:58.000	217	99118	49667.5	4966750	217	99118	49667.5	4966750	-32352	32583	5103.02	510302	-128	123	-1.62	-162
-218	101	10208	99119	0.65465	297.65465	149.15465	14915.46546	0.65465	297.65466	149.15465	14915.46531	0.65465	297.65465	149.15465	14915.46500	2020-01-01	2020-01-02	2020-01-01 00:03:38	2020-01-02 03:31:59	2020-01-01 00:03:38.000	2020-01-02 03:31:59.000	218	99119	49668.5	4966850	218	99119	49668.5	4966850	-32351	32584	5104.02	510402	-127	124	-0.62	-62
-219	101	10209	99120	0.65765	297.65765	149.15765	14915.76576	0.65765	297.65765	149.15765	14915.76562	0.65765	297.65765	149.15765	14915.76500	2020-01-01	2020-01-02	2020-01-01 00:03:39	2020-01-02 03:32:00	2020-01-01 00:03:39.000	2020-01-02 03:32:00.000	219	99120	49669.5	4966950	219	99120	49669.5	4966950	-32350	32585	5105.02	510502	-126	125	0.38	38
+210	101	10200	99111	0.63063	297.63063	149.13063	14913.06306	0.63063	297.63065	149.13063	14913.06326	0.63063	297.63063	149.13063	14913.063	2020-01-01	2020-01-02	2020-01-01 00:03:30	2020-01-02 03:31:51	2020-01-01 00:03:30.000	2020-01-02 03:31:51.000	210	99111	49660.5	4966050	210	99111	49660.5	4966050	-32359	32576	5096.02	509602	-128	127	-0.94	-94
+211	101	10201	99112	0.63363	297.63363	149.13363	14913.36336	0.63363	297.63364	149.13363	14913.36357	0.63363	297.63363	149.13362999999998	14913.363	2020-01-01	2020-01-02	2020-01-01 00:03:31	2020-01-02 03:31:52	2020-01-01 00:03:31.000	2020-01-02 03:31:52.000	211	99112	49661.5	4966150	211	99112	49661.5	4966150	-32358	32577	5097.02	509702	-128	123	-2.5	-250
+212	101	10202	99113	0.63663	297.63663	149.13663	14913.66366	0.63663	297.63663	149.13663	14913.66372	0.63663	297.63663	149.13663	14913.663	2020-01-01	2020-01-02	2020-01-01 00:03:32	2020-01-02 03:31:53	2020-01-01 00:03:32.000	2020-01-02 03:31:53.000	212	99113	49662.5	4966250	212	99113	49662.5	4966250	-32357	32578	5098.02	509802	-127	124	-1.5	-150
+213	101	10203	99114	0.63963	297.63963	149.13963	14913.96396	0.63963	297.63965	149.13963	14913.96384	0.63963	297.63963	149.13963	14913.963	2020-01-01	2020-01-02	2020-01-01 00:03:33	2020-01-02 03:31:54	2020-01-01 00:03:33.000	2020-01-02 03:31:54.000	213	99114	49663.5	4966350	213	99114	49663.5	4966350	-32356	32579	5099.02	509902	-126	125	-0.5	-50
+214	101	10204	99115	0.64264	297.64264	149.14264	14914.26426	0.64264	297.64264	149.14263	14914.26399	0.64264	297.64264	149.14264	14914.264	2020-01-01	2020-01-02	2020-01-01 00:03:34	2020-01-02 03:31:55	2020-01-01 00:03:34.000	2020-01-02 03:31:55.000	214	99115	49664.5	4966450	214	99115	49664.5	4966450	-32355	32580	5100.02	510002	-125	126	0.5	50
+215	101	10205	99116	0.64564	297.64564	149.14564	14914.56456	0.64564	297.64566	149.14564	14914.56473	0.64564	297.64564	149.14564000000001	14914.564	2020-01-01	2020-01-02	2020-01-01 00:03:35	2020-01-02 03:31:56	2020-01-01 00:03:35.000	2020-01-02 03:31:56.000	215	99116	49665.5	4966550	215	99116	49665.5	4966550	-32354	32581	5101.02	510102	-124	127	1.5	150
+216	101	10206	99117	0.64864	297.64864	149.14864	14914.86486	0.64864	297.64865	149.14865	14914.86504	0.64864	297.64864	149.14864	14914.864	2020-01-01	2020-01-02	2020-01-01 00:03:36	2020-01-02 03:31:57	2020-01-01 00:03:36.000	2020-01-02 03:31:57.000	216	99117	49666.5	4966650	216	99117	49666.5	4966650	-32353	32582	5102.02	510202	-128	127	-0.06	-6
+217	101	10207	99118	0.65165	297.65165	149.15165	14915.16516	0.65165	297.65164	149.15165	14915.16523	0.65165	297.65165	149.15165000000002	14915.165	2020-01-01	2020-01-02	2020-01-01 00:03:37	2020-01-02 03:31:58	2020-01-01 00:03:37.000	2020-01-02 03:31:58.000	217	99118	49667.5	4966750	217	99118	49667.5	4966750	-32352	32583	5103.02	510302	-128	123	-1.62	-162
+218	101	10208	99119	0.65465	297.65465	149.15465	14915.46546	0.65465	297.65466	149.15465	14915.46531	0.65465	297.65465	149.15465	14915.465	2020-01-01	2020-01-02	2020-01-01 00:03:38	2020-01-02 03:31:59	2020-01-01 00:03:38.000	2020-01-02 03:31:59.000	218	99119	49668.5	4966850	218	99119	49668.5	4966850	-32351	32584	5104.02	510402	-127	124	-0.62	-62
+219	101	10209	99120	0.65765	297.65765	149.15765	14915.76576	0.65765	297.65765	149.15765	14915.76562	0.65765	297.65765	149.15765	14915.765	2020-01-01	2020-01-02	2020-01-01 00:03:39	2020-01-02 03:32:00	2020-01-01 00:03:39.000	2020-01-02 03:32:00.000	219	99120	49669.5	4966950	219	99120	49669.5	4966950	-32350	32585	5105.02	510502	-126	125	0.38	38
 22	102	10012	99922	0.06606	300.06606	150.06606	15156.67267	0.06606	300.06607	150.06606	15156.67287	0.06606	300.06606	150.06606000000002	15156.67206	2020-01-01	2020-01-02	2020-01-01 00:00:22	2020-01-02 03:45:22	2020-01-01 00:00:22.000	2020-01-02 03:45:22.000	22	99922	49972	5047172	22	99922	49972	5047172	-32547	32388	4551.009900990099	459652	-128	127	-1.2277227722772277	-124
-220	101	10210	99121	0.66066	297.66066	149.16066	14916.06606	0.66066	297.66068	149.16066	14916.06619	0.66066	297.66066	149.16066	14916.06600	2020-01-01	2020-01-02	2020-01-01 00:03:40	2020-01-02 03:32:01	2020-01-01 00:03:40.000	2020-01-02 03:32:01.000	220	99121	49670.5	4967050	220	99121	49670.5	4967050	-32349	32586	5106.02	510602	-125	126	1.38	138
-221	101	10211	99122	0.66366	297.66366	149.16366	14916.36636	0.66366	297.66367	149.16366	14916.36651	0.66366	297.66366	149.16366	14916.36600	2020-01-01	2020-01-02	2020-01-01 00:03:41	2020-01-02 03:32:02	2020-01-01 00:03:41.000	2020-01-02 03:32:02.000	221	99122	49671.5	4967150	221	99122	49671.5	4967150	-32348	32587	5107.02	510702	-124	127	2.38	238
-222	101	10212	99123	0.66666	297.66666	149.16666	14916.66666	0.66666	297.66666	149.16666	14916.6667	0.66666	297.66666	149.16665999999998	14916.66600	2020-01-01	2020-01-02	2020-01-01 00:03:42	2020-01-02 03:32:03	2020-01-01 00:03:42.000	2020-01-02 03:32:03.000	222	99123	49672.5	4967250	222	99123	49672.5	4967250	-32347	32588	5108.02	510802	-128	127	0.82	82
-223	101	10213	99124	0.66966	297.66966	149.16966	14916.96696	0.66966	297.66968	149.16966	14916.96678	0.66966	297.66966	149.16966	14916.96600	2020-01-01	2020-01-02	2020-01-01 00:03:43	2020-01-02 03:32:04	2020-01-01 00:03:43.000	2020-01-02 03:32:04.000	223	99124	49673.5	4967350	223	99124	49673.5	4967350	-32346	32589	5109.02	510902	-128	127	-0.74	-74
-224	101	10214	99125	0.67267	297.67267	149.17267	14917.26726	0.67267	297.67267	149.17267	14917.26709	0.67267	297.67267	149.17267	14917.26700	2020-01-01	2020-01-02	2020-01-01 00:03:44	2020-01-02 03:32:05	2020-01-01 00:03:44.000	2020-01-02 03:32:05.000	224	99125	49674.5	4967450	224	99125	49674.5	4967450	-32345	32590	5110.02	511002	-128	124	-2.3	-230
-225	101	10215	99126	0.67567	297.67567	149.17567	14917.56756	0.67567	297.6757	149.17567	14917.56767	0.67567	297.67567	149.17567	14917.56700	2020-01-01	2020-01-02	2020-01-01 00:03:45	2020-01-02 03:32:06	2020-01-01 00:03:45.000	2020-01-02 03:32:06.000	225	99126	49675.5	4967550	225	99126	49675.5	4967550	-32344	32591	5111.02	511102	-127	125	-1.3	-130
-226	101	10216	99127	0.67867	297.67867	149.17867	14917.86786	0.67867	297.67868	149.17868	14917.86802	0.67867	297.67867	149.17867	14917.86700	2020-01-01	2020-01-02	2020-01-01 00:03:46	2020-01-02 03:32:07	2020-01-01 00:03:46.000	2020-01-02 03:32:07.000	226	99127	49676.5	4967650	226	99127	49676.5	4967650	-32343	32592	5112.02	511202	-126	126	-0.3	-30
-227	101	10217	99128	0.68168	297.68168	149.18168	14918.16816	0.68168	297.68167	149.18168	14918.16817	0.68168	297.68168	149.18168	14918.16800	2020-01-01	2020-01-02	2020-01-01 00:03:47	2020-01-02 03:32:08	2020-01-01 00:03:47.000	2020-01-02 03:32:08.000	227	99128	49677.5	4967750	227	99128	49677.5	4967750	-32342	32593	5113.02	511302	-125	127	0.7	70
-228	101	10218	99129	0.68468	297.68468	149.18468	14918.46846	0.68468	297.6847	149.18468	14918.46825	0.68468	297.68468	149.18468000000001	14918.46800	2020-01-01	2020-01-02	2020-01-01 00:03:48	2020-01-02 03:32:09	2020-01-01 00:03:48.000	2020-01-02 03:32:09.000	228	99129	49678.5	4967850	228	99129	49678.5	4967850	-32341	32594	5114.02	511402	-128	127	-0.86	-86
-229	101	10219	99130	0.68768	297.68768	149.18768	14918.76876	0.68768	297.68768	149.18768	14918.76855	0.68768	297.68768	149.18768	14918.76800	2020-01-01	2020-01-02	2020-01-01 00:03:49	2020-01-02 03:32:10	2020-01-01 00:03:49.000	2020-01-02 03:32:10.000	229	99130	49679.5	4967950	229	99130	49679.5	4967950	-32340	32595	5115.02	511502	-128	127	-2.42	-242
+220	101	10210	99121	0.66066	297.66066	149.16066	14916.06606	0.66066	297.66068	149.16066	14916.06619	0.66066	297.66066	149.16066	14916.066	2020-01-01	2020-01-02	2020-01-01 00:03:40	2020-01-02 03:32:01	2020-01-01 00:03:40.000	2020-01-02 03:32:01.000	220	99121	49670.5	4967050	220	99121	49670.5	4967050	-32349	32586	5106.02	510602	-125	126	1.38	138
+221	101	10211	99122	0.66366	297.66366	149.16366	14916.36636	0.66366	297.66367	149.16366	14916.36651	0.66366	297.66366	149.16366	14916.366	2020-01-01	2020-01-02	2020-01-01 00:03:41	2020-01-02 03:32:02	2020-01-01 00:03:41.000	2020-01-02 03:32:02.000	221	99122	49671.5	4967150	221	99122	49671.5	4967150	-32348	32587	5107.02	510702	-124	127	2.38	238
+222	101	10212	99123	0.66666	297.66666	149.16666	14916.66666	0.66666	297.66666	149.16666	14916.6667	0.66666	297.66666	149.16665999999998	14916.666	2020-01-01	2020-01-02	2020-01-01 00:03:42	2020-01-02 03:32:03	2020-01-01 00:03:42.000	2020-01-02 03:32:03.000	222	99123	49672.5	4967250	222	99123	49672.5	4967250	-32347	32588	5108.02	510802	-128	127	0.82	82
+223	101	10213	99124	0.66966	297.66966	149.16966	14916.96696	0.66966	297.66968	149.16966	14916.96678	0.66966	297.66966	149.16966	14916.966	2020-01-01	2020-01-02	2020-01-01 00:03:43	2020-01-02 03:32:04	2020-01-01 00:03:43.000	2020-01-02 03:32:04.000	223	99124	49673.5	4967350	223	99124	49673.5	4967350	-32346	32589	5109.02	510902	-128	127	-0.74	-74
+224	101	10214	99125	0.67267	297.67267	149.17267	14917.26726	0.67267	297.67267	149.17267	14917.26709	0.67267	297.67267	149.17267	14917.267	2020-01-01	2020-01-02	2020-01-01 00:03:44	2020-01-02 03:32:05	2020-01-01 00:03:44.000	2020-01-02 03:32:05.000	224	99125	49674.5	4967450	224	99125	49674.5	4967450	-32345	32590	5110.02	511002	-128	124	-2.3	-230
+225	101	10215	99126	0.67567	297.67567	149.17567	14917.56756	0.67567	297.6757	149.17567	14917.56767	0.67567	297.67567	149.17567	14917.567	2020-01-01	2020-01-02	2020-01-01 00:03:45	2020-01-02 03:32:06	2020-01-01 00:03:45.000	2020-01-02 03:32:06.000	225	99126	49675.5	4967550	225	99126	49675.5	4967550	-32344	32591	5111.02	511102	-127	125	-1.3	-130
+226	101	10216	99127	0.67867	297.67867	149.17867	14917.86786	0.67867	297.67868	149.17868	14917.86802	0.67867	297.67867	149.17867	14917.867	2020-01-01	2020-01-02	2020-01-01 00:03:46	2020-01-02 03:32:07	2020-01-01 00:03:46.000	2020-01-02 03:32:07.000	226	99127	49676.5	4967650	226	99127	49676.5	4967650	-32343	32592	5112.02	511202	-126	126	-0.3	-30
+227	101	10217	99128	0.68168	297.68168	149.18168	14918.16816	0.68168	297.68167	149.18168	14918.16817	0.68168	297.68168	149.18168	14918.168	2020-01-01	2020-01-02	2020-01-01 00:03:47	2020-01-02 03:32:08	2020-01-01 00:03:47.000	2020-01-02 03:32:08.000	227	99128	49677.5	4967750	227	99128	49677.5	4967750	-32342	32593	5113.02	511302	-125	127	0.7	70
+228	101	10218	99129	0.68468	297.68468	149.18468	14918.46846	0.68468	297.6847	149.18468	14918.46825	0.68468	297.68468	149.18468000000001	14918.468	2020-01-01	2020-01-02	2020-01-01 00:03:48	2020-01-02 03:32:09	2020-01-01 00:03:48.000	2020-01-02 03:32:09.000	228	99129	49678.5	4967850	228	99129	49678.5	4967850	-32341	32594	5114.02	511402	-128	127	-0.86	-86
+229	101	10219	99130	0.68768	297.68768	149.18768	14918.76876	0.68768	297.68768	149.18768	14918.76855	0.68768	297.68768	149.18768	14918.768	2020-01-01	2020-01-02	2020-01-01 00:03:49	2020-01-02 03:32:10	2020-01-01 00:03:49.000	2020-01-02 03:32:10.000	229	99130	49679.5	4967950	229	99130	49679.5	4967950	-32340	32595	5115.02	511502	-128	127	-2.42	-242
 23	102	10013	99923	0.06906	300.06906	150.06906	15156.97597	0.06906	300.06906	150.06907	15156.97617	0.06906	300.06906	150.06906	15156.97506	2020-01-01	2020-01-02	2020-01-01 00:00:23	2020-01-02 03:45:23	2020-01-01 00:00:23.000	2020-01-02 03:45:23.000	23	99923	49973	5047273	23	99923	49973	5047273	-32546	32389	4552.009900990099	459753	-128	127	-2.762376237623762	-279
-230	101	10220	99131	0.69069	297.69069	149.19069	14919.06906	0.69069	297.6907	149.19069	14919.06914	0.69069	297.69069	149.19069	14919.06900	2020-01-01	2020-01-02	2020-01-01 00:03:50	2020-01-02 03:32:11	2020-01-01 00:03:50.000	2020-01-02 03:32:11.000	230	99131	49680.5	4968050	230	99131	49680.5	4968050	-32339	32596	5116.02	511602	-128	123	-3.98	-398
-231	101	10221	99132	0.69369	297.69369	149.19369	14919.36936	0.69369	297.6937	149.19369	14919.36949	0.69369	297.69369	149.19369	14919.36900	2020-01-01	2020-01-02	2020-01-01 00:03:51	2020-01-02 03:32:12	2020-01-01 00:03:51.000	2020-01-02 03:32:12.000	231	99132	49681.5	4968150	231	99132	49681.5	4968150	-32338	32597	5117.02	511702	-127	124	-2.98	-298
-232	101	10222	99133	0.69669	297.69669	149.19669	14919.66966	0.69669	297.6967	149.19669	14919.66964	0.69669	297.69669	149.19669	14919.66900	2020-01-01	2020-01-02	2020-01-01 00:03:52	2020-01-02 03:32:13	2020-01-01 00:03:52.000	2020-01-02 03:32:13.000	232	99133	49682.5	4968250	232	99133	49682.5	4968250	-32337	32598	5118.02	511802	-126	125	-1.98	-198
-233	101	10223	99134	0.69969	297.69969	149.19969	14919.96996	0.69969	297.6997	149.1997	14919.97037	0.69969	297.69969	149.19969	14919.96900	2020-01-01	2020-01-02	2020-01-01 00:03:53	2020-01-02 03:32:14	2020-01-01 00:03:53.000	2020-01-02 03:32:14.000	233	99134	49683.5	4968350	233	99134	49683.5	4968350	-32336	32599	5119.02	511902	-125	126	-0.98	-98
-234	101	10224	99135	0.7027	297.7027	149.2027	14920.27027	0.7027	297.7027	149.2027	14920.27003	0.70270	297.70270	149.2027	14920.27000	2020-01-01	2020-01-02	2020-01-01 00:03:54	2020-01-02 03:32:15	2020-01-01 00:03:54.000	2020-01-02 03:32:15.000	234	99135	49684.5	4968450	234	99135	49684.5	4968450	-32335	32600	5120.02	512002	-124	127	0.02	2
-235	101	10225	99136	0.7057	297.7057	149.2057	14920.57057	0.7057	297.70572	149.2057	14920.57065	0.70570	297.70570	149.2057	14920.57000	2020-01-01	2020-01-02	2020-01-01 00:03:55	2020-01-02 03:32:16	2020-01-01 00:03:55.000	2020-01-02 03:32:16.000	235	99136	49685.5	4968550	235	99136	49685.5	4968550	-32334	32601	5121.02	512102	-128	127	-1.54	-154
-236	101	10226	99137	0.7087	297.7087	149.2087	14920.87087	0.7087	297.7087	149.2087	14920.87095	0.70870	297.70870	149.20870000000002	14920.87000	2020-01-01	2020-01-02	2020-01-01 00:03:56	2020-01-02 03:32:17	2020-01-01 00:03:56.000	2020-01-02 03:32:17.000	236	99137	49686.5	4968650	236	99137	49686.5	4968650	-32333	32602	5122.02	512202	-128	123	-3.1	-310
-237	101	10227	99138	0.71171	297.71171	149.21171	14921.17117	0.71171	297.7117	149.21171	14921.17111	0.71171	297.71171	149.21171	14921.17100	2020-01-01	2020-01-02	2020-01-01 00:03:57	2020-01-02 03:32:18	2020-01-01 00:03:57.000	2020-01-02 03:32:18.000	237	99138	49687.5	4968750	237	99138	49687.5	4968750	-32332	32603	5123.02	512302	-127	124	-2.1	-210
-238	101	10228	99139	0.71471	297.71471	149.21471	14921.47147	0.71471	297.71472	149.21471	14921.47184	0.71471	297.71471	149.21471	14921.47100	2020-01-01	2020-01-02	2020-01-01 00:03:58	2020-01-02 03:32:19	2020-01-01 00:03:58.000	2020-01-02 03:32:19.000	238	99139	49688.5	4968850	238	99139	49688.5	4968850	-32331	32604	5124.02	512402	-126	125	-1.1	-110
-239	101	10229	99140	0.71771	297.71771	149.21771	14921.77177	0.71771	297.7177	149.21771	14921.7715	0.71771	297.71771	149.21771	14921.77100	2020-01-01	2020-01-02	2020-01-01 00:03:59	2020-01-02 03:32:20	2020-01-01 00:03:59.000	2020-01-02 03:32:20.000	239	99140	49689.5	4968950	239	99140	49689.5	4968950	-32330	32605	5125.02	512502	-125	126	-0.1	-10
+230	101	10220	99131	0.69069	297.69069	149.19069	14919.06906	0.69069	297.6907	149.19069	14919.06914	0.69069	297.69069	149.19069	14919.069	2020-01-01	2020-01-02	2020-01-01 00:03:50	2020-01-02 03:32:11	2020-01-01 00:03:50.000	2020-01-02 03:32:11.000	230	99131	49680.5	4968050	230	99131	49680.5	4968050	-32339	32596	5116.02	511602	-128	123	-3.98	-398
+231	101	10221	99132	0.69369	297.69369	149.19369	14919.36936	0.69369	297.6937	149.19369	14919.36949	0.69369	297.69369	149.19369	14919.369	2020-01-01	2020-01-02	2020-01-01 00:03:51	2020-01-02 03:32:12	2020-01-01 00:03:51.000	2020-01-02 03:32:12.000	231	99132	49681.5	4968150	231	99132	49681.5	4968150	-32338	32597	5117.02	511702	-127	124	-2.98	-298
+232	101	10222	99133	0.69669	297.69669	149.19669	14919.66966	0.69669	297.6967	149.19669	14919.66964	0.69669	297.69669	149.19669	14919.669	2020-01-01	2020-01-02	2020-01-01 00:03:52	2020-01-02 03:32:13	2020-01-01 00:03:52.000	2020-01-02 03:32:13.000	232	99133	49682.5	4968250	232	99133	49682.5	4968250	-32337	32598	5118.02	511802	-126	125	-1.98	-198
+233	101	10223	99134	0.69969	297.69969	149.19969	14919.96996	0.69969	297.6997	149.1997	14919.97037	0.69969	297.69969	149.19969	14919.969	2020-01-01	2020-01-02	2020-01-01 00:03:53	2020-01-02 03:32:14	2020-01-01 00:03:53.000	2020-01-02 03:32:14.000	233	99134	49683.5	4968350	233	99134	49683.5	4968350	-32336	32599	5119.02	511902	-125	126	-0.98	-98
+234	101	10224	99135	0.7027	297.7027	149.2027	14920.27027	0.7027	297.7027	149.2027	14920.27003	0.7027	297.7027	149.2027	14920.27	2020-01-01	2020-01-02	2020-01-01 00:03:54	2020-01-02 03:32:15	2020-01-01 00:03:54.000	2020-01-02 03:32:15.000	234	99135	49684.5	4968450	234	99135	49684.5	4968450	-32335	32600	5120.02	512002	-124	127	0.02	2
+235	101	10225	99136	0.7057	297.7057	149.2057	14920.57057	0.7057	297.70572	149.2057	14920.57065	0.7057	297.7057	149.2057	14920.57	2020-01-01	2020-01-02	2020-01-01 00:03:55	2020-01-02 03:32:16	2020-01-01 00:03:55.000	2020-01-02 03:32:16.000	235	99136	49685.5	4968550	235	99136	49685.5	4968550	-32334	32601	5121.02	512102	-128	127	-1.54	-154
+236	101	10226	99137	0.7087	297.7087	149.2087	14920.87087	0.7087	297.7087	149.2087	14920.87095	0.7087	297.7087	149.20870000000002	14920.87	2020-01-01	2020-01-02	2020-01-01 00:03:56	2020-01-02 03:32:17	2020-01-01 00:03:56.000	2020-01-02 03:32:17.000	236	99137	49686.5	4968650	236	99137	49686.5	4968650	-32333	32602	5122.02	512202	-128	123	-3.1	-310
+237	101	10227	99138	0.71171	297.71171	149.21171	14921.17117	0.71171	297.7117	149.21171	14921.17111	0.71171	297.71171	149.21171	14921.171	2020-01-01	2020-01-02	2020-01-01 00:03:57	2020-01-02 03:32:18	2020-01-01 00:03:57.000	2020-01-02 03:32:18.000	237	99138	49687.5	4968750	237	99138	49687.5	4968750	-32332	32603	5123.02	512302	-127	124	-2.1	-210
+238	101	10228	99139	0.71471	297.71471	149.21471	14921.47147	0.71471	297.71472	149.21471	14921.47184	0.71471	297.71471	149.21471	14921.471	2020-01-01	2020-01-02	2020-01-01 00:03:58	2020-01-02 03:32:19	2020-01-01 00:03:58.000	2020-01-02 03:32:19.000	238	99139	49688.5	4968850	238	99139	49688.5	4968850	-32331	32604	5124.02	512402	-126	125	-1.1	-110
+239	101	10229	99140	0.71771	297.71771	149.21771	14921.77177	0.71771	297.7177	149.21771	14921.7715	0.71771	297.71771	149.21771	14921.771	2020-01-01	2020-01-02	2020-01-01 00:03:59	2020-01-02 03:32:20	2020-01-01 00:03:59.000	2020-01-02 03:32:20.000	239	99140	49689.5	4968950	239	99140	49689.5	4968950	-32330	32605	5125.02	512502	-125	126	-0.1	-10
 24	102	10014	99924	0.07207	300.07207	150.07207	15157.27927	0.07207	300.07208	150.07207	15157.27928	0.07207	300.07207	150.07207	15157.27907	2020-01-01	2020-01-02	2020-01-01 00:00:24	2020-01-02 03:45:24	2020-01-01 00:00:24.000	2020-01-02 03:45:24.000	24	99924	49974	5047374	24	99924	49974	5047374	-32545	32390	4553.009900990099	459854	-128	123	-4.297029702970297	-434
-240	101	10230	99141	0.72072	297.72072	149.22072	14922.07207	0.72072	297.72073	149.22072	14922.07211	0.72072	297.72072	149.22072	14922.07200	2020-01-01	2020-01-02	2020-01-01 00:04:00	2020-01-02 03:32:21	2020-01-01 00:04:00.000	2020-01-02 03:32:21.000	240	99141	49690.5	4969050	240	99141	49690.5	4969050	-32329	32606	5126.02	512602	-124	127	0.9	90
-241	101	10231	99142	0.72372	297.72372	149.22372	14922.37237	0.72372	297.72372	149.22372	14922.37243	0.72372	297.72372	149.22372	14922.37200	2020-01-01	2020-01-02	2020-01-01 00:04:01	2020-01-02 03:32:22	2020-01-01 00:04:01.000	2020-01-02 03:32:22.000	241	99142	49691.5	4969150	241	99142	49691.5	4969150	-32328	32607	5127.02	512702	-128	127	-0.66	-66
-242	101	10232	99143	0.72672	297.72672	149.22672	14922.67267	0.72672	297.7267	149.22672	14922.67273	0.72672	297.72672	149.22672	14922.67200	2020-01-01	2020-01-02	2020-01-01 00:04:02	2020-01-02 03:32:23	2020-01-01 00:04:02.000	2020-01-02 03:32:23.000	242	99143	49692.5	4969250	242	99143	49692.5	4969250	-32327	32608	5128.02	512802	-128	123	-2.22	-222
-243	101	10233	99144	0.72972	297.72972	149.22972	14922.97297	0.72972	297.72974	149.22973	14922.97332	0.72972	297.72972	149.22972	14922.97200	2020-01-01	2020-01-02	2020-01-01 00:04:03	2020-01-02 03:32:24	2020-01-01 00:04:03.000	2020-01-02 03:32:24.000	243	99144	49693.5	4969350	243	99144	49693.5	4969350	-32326	32609	5129.02	512902	-127	124	-1.22	-122
-244	101	10234	99145	0.73273	297.73273	149.23273	14923.27327	0.73273	297.73273	149.23272	14923.27297	0.73273	297.73273	149.23273	14923.27300	2020-01-01	2020-01-02	2020-01-01 00:04:04	2020-01-02 03:32:25	2020-01-01 00:04:04.000	2020-01-02 03:32:25.000	244	99145	49694.5	4969450	244	99145	49694.5	4969450	-32325	32610	5130.02	513002	-126	125	-0.22	-22
-245	101	10235	99146	0.73573	297.73573	149.23573	14923.57357	0.73573	297.73575	149.23573	14923.57358	0.73573	297.73573	149.23573	14923.57300	2020-01-01	2020-01-02	2020-01-01 00:04:05	2020-01-02 03:32:26	2020-01-01 00:04:05.000	2020-01-02 03:32:26.000	245	99146	49695.5	4969550	245	99146	49695.5	4969550	-32324	32611	5131.02	513102	-125	126	0.78	78
-246	101	10236	99147	0.73873	297.73873	149.23873	14923.87387	0.73873	297.73874	149.23873	14923.8739	0.73873	297.73873	149.23873	14923.87300	2020-01-01	2020-01-02	2020-01-01 00:04:06	2020-01-02 03:32:27	2020-01-01 00:04:06.000	2020-01-02 03:32:27.000	246	99147	49696.5	4969650	246	99147	49696.5	4969650	-32323	32612	5132.02	513202	-124	127	1.78	178
-247	101	10237	99148	0.74174	297.74174	149.24174	14924.17417	0.74174	297.74173	149.24174	14924.1742	0.74174	297.74174	149.24174000000002	14924.17400	2020-01-01	2020-01-02	2020-01-01 00:04:07	2020-01-02 03:32:28	2020-01-01 00:04:07.000	2020-01-02 03:32:28.000	247	99148	49697.5	4969750	247	99148	49697.5	4969750	-32322	32613	5133.02	513302	-128	127	0.22	22
-248	101	10238	99149	0.74474	297.74474	149.24474	14924.47447	0.74474	297.74475	149.24474	14924.47478	0.74474	297.74474	149.24474	14924.47400	2020-01-01	2020-01-02	2020-01-01 00:04:08	2020-01-02 03:32:29	2020-01-01 00:04:08.000	2020-01-02 03:32:29.000	248	99149	49698.5	4969850	248	99149	49698.5	4969850	-32321	32614	5134.02	513402	-128	127	-1.34	-134
-249	101	10239	99150	0.74774	297.74774	149.24774	14924.77477	0.74774	297.74774	149.24774	14924.77447	0.74774	297.74774	149.24774	14924.77400	2020-01-01	2020-01-02	2020-01-01 00:04:09	2020-01-02 03:32:30	2020-01-01 00:04:09.000	2020-01-02 03:32:30.000	249	99150	49699.5	4969950	249	99150	49699.5	4969950	-32320	32615	5135.02	513502	-128	124	-2.9	-290
+240	101	10230	99141	0.72072	297.72072	149.22072	14922.07207	0.72072	297.72073	149.22072	14922.07211	0.72072	297.72072	149.22072	14922.072	2020-01-01	2020-01-02	2020-01-01 00:04:00	2020-01-02 03:32:21	2020-01-01 00:04:00.000	2020-01-02 03:32:21.000	240	99141	49690.5	4969050	240	99141	49690.5	4969050	-32329	32606	5126.02	512602	-124	127	0.9	90
+241	101	10231	99142	0.72372	297.72372	149.22372	14922.37237	0.72372	297.72372	149.22372	14922.37243	0.72372	297.72372	149.22372	14922.372	2020-01-01	2020-01-02	2020-01-01 00:04:01	2020-01-02 03:32:22	2020-01-01 00:04:01.000	2020-01-02 03:32:22.000	241	99142	49691.5	4969150	241	99142	49691.5	4969150	-32328	32607	5127.02	512702	-128	127	-0.66	-66
+242	101	10232	99143	0.72672	297.72672	149.22672	14922.67267	0.72672	297.7267	149.22672	14922.67273	0.72672	297.72672	149.22672	14922.672	2020-01-01	2020-01-02	2020-01-01 00:04:02	2020-01-02 03:32:23	2020-01-01 00:04:02.000	2020-01-02 03:32:23.000	242	99143	49692.5	4969250	242	99143	49692.5	4969250	-32327	32608	5128.02	512802	-128	123	-2.22	-222
+243	101	10233	99144	0.72972	297.72972	149.22972	14922.97297	0.72972	297.72974	149.22973	14922.97332	0.72972	297.72972	149.22972	14922.972	2020-01-01	2020-01-02	2020-01-01 00:04:03	2020-01-02 03:32:24	2020-01-01 00:04:03.000	2020-01-02 03:32:24.000	243	99144	49693.5	4969350	243	99144	49693.5	4969350	-32326	32609	5129.02	512902	-127	124	-1.22	-122
+244	101	10234	99145	0.73273	297.73273	149.23273	14923.27327	0.73273	297.73273	149.23272	14923.27297	0.73273	297.73273	149.23273	14923.273	2020-01-01	2020-01-02	2020-01-01 00:04:04	2020-01-02 03:32:25	2020-01-01 00:04:04.000	2020-01-02 03:32:25.000	244	99145	49694.5	4969450	244	99145	49694.5	4969450	-32325	32610	5130.02	513002	-126	125	-0.22	-22
+245	101	10235	99146	0.73573	297.73573	149.23573	14923.57357	0.73573	297.73575	149.23573	14923.57358	0.73573	297.73573	149.23573	14923.573	2020-01-01	2020-01-02	2020-01-01 00:04:05	2020-01-02 03:32:26	2020-01-01 00:04:05.000	2020-01-02 03:32:26.000	245	99146	49695.5	4969550	245	99146	49695.5	4969550	-32324	32611	5131.02	513102	-125	126	0.78	78
+246	101	10236	99147	0.73873	297.73873	149.23873	14923.87387	0.73873	297.73874	149.23873	14923.8739	0.73873	297.73873	149.23873	14923.873	2020-01-01	2020-01-02	2020-01-01 00:04:06	2020-01-02 03:32:27	2020-01-01 00:04:06.000	2020-01-02 03:32:27.000	246	99147	49696.5	4969650	246	99147	49696.5	4969650	-32323	32612	5132.02	513202	-124	127	1.78	178
+247	101	10237	99148	0.74174	297.74174	149.24174	14924.17417	0.74174	297.74173	149.24174	14924.1742	0.74174	297.74174	149.24174000000002	14924.174	2020-01-01	2020-01-02	2020-01-01 00:04:07	2020-01-02 03:32:28	2020-01-01 00:04:07.000	2020-01-02 03:32:28.000	247	99148	49697.5	4969750	247	99148	49697.5	4969750	-32322	32613	5133.02	513302	-128	127	0.22	22
+248	101	10238	99149	0.74474	297.74474	149.24474	14924.47447	0.74474	297.74475	149.24474	14924.47478	0.74474	297.74474	149.24474	14924.474	2020-01-01	2020-01-02	2020-01-01 00:04:08	2020-01-02 03:32:29	2020-01-01 00:04:08.000	2020-01-02 03:32:29.000	248	99149	49698.5	4969850	248	99149	49698.5	4969850	-32321	32614	5134.02	513402	-128	127	-1.34	-134
+249	101	10239	99150	0.74774	297.74774	149.24774	14924.77477	0.74774	297.74774	149.24774	14924.77447	0.74774	297.74774	149.24774	14924.774	2020-01-01	2020-01-02	2020-01-01 00:04:09	2020-01-02 03:32:30	2020-01-01 00:04:09.000	2020-01-02 03:32:30.000	249	99150	49699.5	4969950	249	99150	49699.5	4969950	-32320	32615	5135.02	513502	-128	124	-2.9	-290
 25	102	10015	99925	0.07507	300.07507	150.07507	15157.58258	0.07507	300.07507	150.07507	15157.58241	0.07507	300.07507	150.07507	15157.58207	2020-01-01	2020-01-02	2020-01-01 00:00:25	2020-01-02 03:45:25	2020-01-01 00:00:25.000	2020-01-02 03:45:25.000	25	99925	49975	5047475	25	99925	49975	5047475	-32544	32391	4554.009900990099	459955	-127	124	-3.297029702970297	-333
-250	101	10240	99151	0.75075	297.75075	149.25075	14925.07507	0.75075	297.75076	149.25075	14925.07506	0.75075	297.75075	149.25075	14925.07500	2020-01-01	2020-01-02	2020-01-01 00:04:10	2020-01-02 03:32:31	2020-01-01 00:04:10.000	2020-01-02 03:32:31.000	250	99151	49700.5	4970050	250	99151	49700.5	4970050	-32319	32616	5136.02	513602	-127	125	-1.9	-190
-251	101	10241	99152	0.75375	297.75375	149.25375	14925.37537	0.75375	297.75375	149.25375	14925.37536	0.75375	297.75375	149.25375	14925.37500	2020-01-01	2020-01-02	2020-01-01 00:04:11	2020-01-02 03:32:32	2020-01-01 00:04:11.000	2020-01-02 03:32:32.000	251	99152	49701.5	4970150	251	99152	49701.5	4970150	-32318	32617	5137.02	513702	-126	126	-0.9	-90
-252	101	10242	99153	0.75675	297.75675	149.25675	14925.67567	0.75675	297.75674	149.25675	14925.67567	0.75675	297.75675	149.25674999999998	14925.67500	2020-01-01	2020-01-02	2020-01-01 00:04:12	2020-01-02 03:32:33	2020-01-01 00:04:12.000	2020-01-02 03:32:33.000	252	99153	49702.5	4970250	252	99153	49702.5	4970250	-32317	32618	5138.02	513802	-125	127	0.1	10
-253	101	10243	99154	0.75975	297.75975	149.25975	14925.97597	0.75975	297.75977	149.25976	14925.97625	0.75975	297.75975	149.25975	14925.97500	2020-01-01	2020-01-02	2020-01-01 00:04:13	2020-01-02 03:32:34	2020-01-01 00:04:13.000	2020-01-02 03:32:34.000	253	99154	49703.5	4970350	253	99154	49703.5	4970350	-32316	32619	5139.02	513902	-128	127	-1.46	-146
-254	101	10244	99155	0.76276	297.76276	149.26276	14926.27627	0.76276	297.76276	149.26275	14926.27594	0.76276	297.76276	149.26276	14926.27600	2020-01-01	2020-01-02	2020-01-01 00:04:14	2020-01-02 03:32:35	2020-01-01 00:04:14.000	2020-01-02 03:32:35.000	254	99155	49704.5	4970450	254	99155	49704.5	4970450	-32315	32620	5140.02	514002	-128	127	-3.02	-302
-255	101	10245	99156	0.76576	297.76576	149.26576	14926.57657	0.76576	297.76578	149.26576	14926.57652	0.76576	297.76576	149.26576	14926.57600	2020-01-01	2020-01-02	2020-01-01 00:04:15	2020-01-02 03:32:36	2020-01-01 00:04:15.000	2020-01-02 03:32:36.000	255	99156	49705.5	4970550	255	99156	49705.5	4970550	-32314	32621	5141.02	514102	-128	123	-4.58	-458
-256	101	10246	99157	0.76876	297.76876	149.26876	14926.87687	0.76876	297.76877	149.26876	14926.87683	0.76876	297.76876	149.26876000000001	14926.87600	2020-01-01	2020-01-02	2020-01-01 00:04:16	2020-01-02 03:32:37	2020-01-01 00:04:16.000	2020-01-02 03:32:37.000	256	99157	49706.5	4970650	256	99157	49706.5	4970650	-32313	32622	5142.02	514202	-127	124	-3.58	-358
-257	101	10247	99158	0.77177	297.77177	149.27177	14927.17717	0.77177	297.77176	149.27177	14927.17714	0.77177	297.77177	149.27177	14927.17700	2020-01-01	2020-01-02	2020-01-01 00:04:17	2020-01-02 03:32:38	2020-01-01 00:04:17.000	2020-01-02 03:32:38.000	257	99158	49707.5	4970750	257	99158	49707.5	4970750	-32312	32623	5143.02	514302	-126	125	-2.58	-258
-258	101	10248	99159	0.77477	297.77477	149.27477	14927.47747	0.77477	297.77478	149.27477	14927.47776	0.77477	297.77477	149.27477000000002	14927.47700	2020-01-01	2020-01-02	2020-01-01 00:04:18	2020-01-02 03:32:39	2020-01-01 00:04:18.000	2020-01-02 03:32:39.000	258	99159	49708.5	4970850	258	99159	49708.5	4970850	-32311	32624	5144.02	514402	-125	126	-1.58	-158
-259	101	10249	99160	0.77777	297.77777	149.27777	14927.77777	0.77777	297.77777	149.27777	14927.77742	0.77777	297.77777	149.27777	14927.77700	2020-01-01	2020-01-02	2020-01-01 00:04:19	2020-01-02 03:32:40	2020-01-01 00:04:19.000	2020-01-02 03:32:40.000	259	99160	49709.5	4970950	259	99160	49709.5	4970950	-32310	32625	5145.02	514502	-124	127	-0.58	-58
+250	101	10240	99151	0.75075	297.75075	149.25075	14925.07507	0.75075	297.75076	149.25075	14925.07506	0.75075	297.75075	149.25075	14925.075	2020-01-01	2020-01-02	2020-01-01 00:04:10	2020-01-02 03:32:31	2020-01-01 00:04:10.000	2020-01-02 03:32:31.000	250	99151	49700.5	4970050	250	99151	49700.5	4970050	-32319	32616	5136.02	513602	-127	125	-1.9	-190
+251	101	10241	99152	0.75375	297.75375	149.25375	14925.37537	0.75375	297.75375	149.25375	14925.37536	0.75375	297.75375	149.25375	14925.375	2020-01-01	2020-01-02	2020-01-01 00:04:11	2020-01-02 03:32:32	2020-01-01 00:04:11.000	2020-01-02 03:32:32.000	251	99152	49701.5	4970150	251	99152	49701.5	4970150	-32318	32617	5137.02	513702	-126	126	-0.9	-90
+252	101	10242	99153	0.75675	297.75675	149.25675	14925.67567	0.75675	297.75674	149.25675	14925.67567	0.75675	297.75675	149.25674999999998	14925.675	2020-01-01	2020-01-02	2020-01-01 00:04:12	2020-01-02 03:32:33	2020-01-01 00:04:12.000	2020-01-02 03:32:33.000	252	99153	49702.5	4970250	252	99153	49702.5	4970250	-32317	32618	5138.02	513802	-125	127	0.1	10
+253	101	10243	99154	0.75975	297.75975	149.25975	14925.97597	0.75975	297.75977	149.25976	14925.97625	0.75975	297.75975	149.25975	14925.975	2020-01-01	2020-01-02	2020-01-01 00:04:13	2020-01-02 03:32:34	2020-01-01 00:04:13.000	2020-01-02 03:32:34.000	253	99154	49703.5	4970350	253	99154	49703.5	4970350	-32316	32619	5139.02	513902	-128	127	-1.46	-146
+254	101	10244	99155	0.76276	297.76276	149.26276	14926.27627	0.76276	297.76276	149.26275	14926.27594	0.76276	297.76276	149.26276	14926.276	2020-01-01	2020-01-02	2020-01-01 00:04:14	2020-01-02 03:32:35	2020-01-01 00:04:14.000	2020-01-02 03:32:35.000	254	99155	49704.5	4970450	254	99155	49704.5	4970450	-32315	32620	5140.02	514002	-128	127	-3.02	-302
+255	101	10245	99156	0.76576	297.76576	149.26576	14926.57657	0.76576	297.76578	149.26576	14926.57652	0.76576	297.76576	149.26576	14926.576	2020-01-01	2020-01-02	2020-01-01 00:04:15	2020-01-02 03:32:36	2020-01-01 00:04:15.000	2020-01-02 03:32:36.000	255	99156	49705.5	4970550	255	99156	49705.5	4970550	-32314	32621	5141.02	514102	-128	123	-4.58	-458
+256	101	10246	99157	0.76876	297.76876	149.26876	14926.87687	0.76876	297.76877	149.26876	14926.87683	0.76876	297.76876	149.26876000000001	14926.876	2020-01-01	2020-01-02	2020-01-01 00:04:16	2020-01-02 03:32:37	2020-01-01 00:04:16.000	2020-01-02 03:32:37.000	256	99157	49706.5	4970650	256	99157	49706.5	4970650	-32313	32622	5142.02	514202	-127	124	-3.58	-358
+257	101	10247	99158	0.77177	297.77177	149.27177	14927.17717	0.77177	297.77176	149.27177	14927.17714	0.77177	297.77177	149.27177	14927.177	2020-01-01	2020-01-02	2020-01-01 00:04:17	2020-01-02 03:32:38	2020-01-01 00:04:17.000	2020-01-02 03:32:38.000	257	99158	49707.5	4970750	257	99158	49707.5	4970750	-32312	32623	5143.02	514302	-126	125	-2.58	-258
+258	101	10248	99159	0.77477	297.77477	149.27477	14927.47747	0.77477	297.77478	149.27477	14927.47776	0.77477	297.77477	149.27477000000002	14927.477	2020-01-01	2020-01-02	2020-01-01 00:04:18	2020-01-02 03:32:39	2020-01-01 00:04:18.000	2020-01-02 03:32:39.000	258	99159	49708.5	4970850	258	99159	49708.5	4970850	-32311	32624	5144.02	514402	-125	126	-1.58	-158
+259	101	10249	99160	0.77777	297.77777	149.27777	14927.77777	0.77777	297.77777	149.27777	14927.77742	0.77777	297.77777	149.27777	14927.777	2020-01-01	2020-01-02	2020-01-01 00:04:19	2020-01-02 03:32:40	2020-01-01 00:04:19.000	2020-01-02 03:32:40.000	259	99160	49709.5	4970950	259	99160	49709.5	4970950	-32310	32625	5145.02	514502	-124	127	-0.58	-58
 26	102	10016	99926	0.07807	300.07807	150.07807	15157.88588	0.07807	300.07806	150.07807	15157.88575	0.07807	300.07807	150.07807	15157.88507	2020-01-01	2020-01-02	2020-01-01 00:00:26	2020-01-02 03:45:26	2020-01-01 00:00:26.000	2020-01-02 03:45:26.000	26	99926	49976	5047576	26	99926	49976	5047576	-32543	32392	4555.009900990099	460056	-126	125	-2.297029702970297	-232
-260	101	10250	99161	0.78078	297.78078	149.28078	14928.07807	0.78078	297.7808	149.28077	14928.07799	0.78078	297.78078	149.28078	14928.07800	2020-01-01	2020-01-02	2020-01-01 00:04:20	2020-01-02 03:32:41	2020-01-01 00:04:20.000	2020-01-02 03:32:41.000	260	99161	49710.5	4971050	260	99161	49710.5	4971050	-32309	32626	5146.02	514602	-128	127	-2.14	-214
-261	101	10251	99162	0.78378	297.78378	149.28378	14928.37837	0.78378	297.78378	149.28378	14928.3783	0.78378	297.78378	149.28378	14928.37800	2020-01-01	2020-01-02	2020-01-01 00:04:21	2020-01-02 03:32:42	2020-01-01 00:04:21.000	2020-01-02 03:32:42.000	261	99162	49711.5	4971150	261	99162	49711.5	4971150	-32308	32627	5147.02	514702	-128	123	-3.7	-370
-262	101	10252	99163	0.78678	297.78678	149.28678	14928.67867	0.78678	297.78677	149.28678	14928.67861	0.78678	297.78678	149.28678	14928.67800	2020-01-01	2020-01-02	2020-01-01 00:04:22	2020-01-02 03:32:43	2020-01-01 00:04:22.000	2020-01-02 03:32:43.000	262	99163	49712.5	4971250	262	99163	49712.5	4971250	-32307	32628	5148.02	514802	-127	124	-2.7	-270
-263	101	10253	99164	0.78978	297.78978	149.28978	14928.97897	0.78978	297.7898	149.28979	14928.97923	0.78978	297.78978	149.28977999999998	14928.97800	2020-01-01	2020-01-02	2020-01-01 00:04:23	2020-01-02 03:32:44	2020-01-01 00:04:23.000	2020-01-02 03:32:44.000	263	99164	49713.5	4971350	263	99164	49713.5	4971350	-32306	32629	5149.02	514902	-126	125	-1.7	-170
-264	101	10254	99165	0.79279	297.79279	149.29279	14929.27927	0.79279	297.7928	149.29278	14929.27888	0.79279	297.79279	149.29279	14929.27900	2020-01-01	2020-01-02	2020-01-01 00:04:24	2020-01-02 03:32:45	2020-01-01 00:04:24.000	2020-01-02 03:32:45.000	264	99165	49714.5	4971450	264	99165	49714.5	4971450	-32305	32630	5150.02	515002	-125	126	-0.7	-70
-265	101	10255	99166	0.79579	297.79579	149.29579	14929.57957	0.79579	297.7958	149.29579	14929.57962	0.79579	297.79579	149.29579	14929.57900	2020-01-01	2020-01-02	2020-01-01 00:04:25	2020-01-02 03:32:46	2020-01-01 00:04:25.000	2020-01-02 03:32:46.000	265	99166	49715.5	4971550	265	99166	49715.5	4971550	-32304	32631	5151.02	515102	-124	127	0.3	30
-266	101	10256	99167	0.79879	297.79879	149.29879	14929.87987	0.79879	297.7988	149.29879	14929.87977	0.79879	297.79879	149.29879	14929.87900	2020-01-01	2020-01-02	2020-01-01 00:04:26	2020-01-02 03:32:47	2020-01-01 00:04:26.000	2020-01-02 03:32:47.000	266	99167	49716.5	4971650	266	99167	49716.5	4971650	-32303	32632	5152.02	515202	-128	127	-1.26	-126
-267	101	10257	99168	0.8018	297.8018	149.3018	14930.18018	0.8018	297.8018	149.3018	14930.18012	0.80180	297.80180	149.30180000000001	14930.18000	2020-01-01	2020-01-02	2020-01-01 00:04:27	2020-01-02 03:32:48	2020-01-01 00:04:27.000	2020-01-02 03:32:48.000	267	99168	49717.5	4971750	267	99168	49717.5	4971750	-32302	32633	5153.02	515302	-128	123	-2.82	-282
-268	101	10258	99169	0.8048	297.8048	149.3048	14930.48048	0.8048	297.8048	149.3048	14930.4807	0.80480	297.80480	149.3048	14930.48000	2020-01-01	2020-01-02	2020-01-01 00:04:28	2020-01-02 03:32:49	2020-01-01 00:04:28.000	2020-01-02 03:32:49.000	268	99169	49718.5	4971850	268	99169	49718.5	4971850	-32301	32634	5154.02	515402	-127	124	-1.82	-182
-269	101	10259	99170	0.8078	297.8078	149.3078	14930.78078	0.8078	297.8078	149.3078	14930.78035	0.80780	297.80780	149.30780000000001	14930.78000	2020-01-01	2020-01-02	2020-01-01 00:04:29	2020-01-02 03:32:50	2020-01-01 00:04:29.000	2020-01-02 03:32:50.000	269	99170	49719.5	4971950	269	99170	49719.5	4971950	-32300	32635	5155.02	515502	-126	125	-0.82	-82
+260	101	10250	99161	0.78078	297.78078	149.28078	14928.07807	0.78078	297.7808	149.28077	14928.07799	0.78078	297.78078	149.28078	14928.078	2020-01-01	2020-01-02	2020-01-01 00:04:20	2020-01-02 03:32:41	2020-01-01 00:04:20.000	2020-01-02 03:32:41.000	260	99161	49710.5	4971050	260	99161	49710.5	4971050	-32309	32626	5146.02	514602	-128	127	-2.14	-214
+261	101	10251	99162	0.78378	297.78378	149.28378	14928.37837	0.78378	297.78378	149.28378	14928.3783	0.78378	297.78378	149.28378	14928.378	2020-01-01	2020-01-02	2020-01-01 00:04:21	2020-01-02 03:32:42	2020-01-01 00:04:21.000	2020-01-02 03:32:42.000	261	99162	49711.5	4971150	261	99162	49711.5	4971150	-32308	32627	5147.02	514702	-128	123	-3.7	-370
+262	101	10252	99163	0.78678	297.78678	149.28678	14928.67867	0.78678	297.78677	149.28678	14928.67861	0.78678	297.78678	149.28678	14928.678	2020-01-01	2020-01-02	2020-01-01 00:04:22	2020-01-02 03:32:43	2020-01-01 00:04:22.000	2020-01-02 03:32:43.000	262	99163	49712.5	4971250	262	99163	49712.5	4971250	-32307	32628	5148.02	514802	-127	124	-2.7	-270
+263	101	10253	99164	0.78978	297.78978	149.28978	14928.97897	0.78978	297.7898	149.28979	14928.97923	0.78978	297.78978	149.28977999999998	14928.978	2020-01-01	2020-01-02	2020-01-01 00:04:23	2020-01-02 03:32:44	2020-01-01 00:04:23.000	2020-01-02 03:32:44.000	263	99164	49713.5	4971350	263	99164	49713.5	4971350	-32306	32629	5149.02	514902	-126	125	-1.7	-170
+264	101	10254	99165	0.79279	297.79279	149.29279	14929.27927	0.79279	297.7928	149.29278	14929.27888	0.79279	297.79279	149.29279	14929.279	2020-01-01	2020-01-02	2020-01-01 00:04:24	2020-01-02 03:32:45	2020-01-01 00:04:24.000	2020-01-02 03:32:45.000	264	99165	49714.5	4971450	264	99165	49714.5	4971450	-32305	32630	5150.02	515002	-125	126	-0.7	-70
+265	101	10255	99166	0.79579	297.79579	149.29579	14929.57957	0.79579	297.7958	149.29579	14929.57962	0.79579	297.79579	149.29579	14929.579	2020-01-01	2020-01-02	2020-01-01 00:04:25	2020-01-02 03:32:46	2020-01-01 00:04:25.000	2020-01-02 03:32:46.000	265	99166	49715.5	4971550	265	99166	49715.5	4971550	-32304	32631	5151.02	515102	-124	127	0.3	30
+266	101	10256	99167	0.79879	297.79879	149.29879	14929.87987	0.79879	297.7988	149.29879	14929.87977	0.79879	297.79879	149.29879	14929.879	2020-01-01	2020-01-02	2020-01-01 00:04:26	2020-01-02 03:32:47	2020-01-01 00:04:26.000	2020-01-02 03:32:47.000	266	99167	49716.5	4971650	266	99167	49716.5	4971650	-32303	32632	5152.02	515202	-128	127	-1.26	-126
+267	101	10257	99168	0.8018	297.8018	149.3018	14930.18018	0.8018	297.8018	149.3018	14930.18012	0.8018	297.8018	149.30180000000001	14930.18	2020-01-01	2020-01-02	2020-01-01 00:04:27	2020-01-02 03:32:48	2020-01-01 00:04:27.000	2020-01-02 03:32:48.000	267	99168	49717.5	4971750	267	99168	49717.5	4971750	-32302	32633	5153.02	515302	-128	123	-2.82	-282
+268	101	10258	99169	0.8048	297.8048	149.3048	14930.48048	0.8048	297.8048	149.3048	14930.4807	0.8048	297.8048	149.3048	14930.48	2020-01-01	2020-01-02	2020-01-01 00:04:28	2020-01-02 03:32:49	2020-01-01 00:04:28.000	2020-01-02 03:32:49.000	268	99169	49718.5	4971850	268	99169	49718.5	4971850	-32301	32634	5154.02	515402	-127	124	-1.82	-182
+269	101	10259	99170	0.8078	297.8078	149.3078	14930.78078	0.8078	297.8078	149.3078	14930.78035	0.8078	297.8078	149.30780000000001	14930.78	2020-01-01	2020-01-02	2020-01-01 00:04:29	2020-01-02 03:32:50	2020-01-01 00:04:29.000	2020-01-02 03:32:50.000	269	99170	49719.5	4971950	269	99170	49719.5	4971950	-32300	32635	5155.02	515502	-126	125	-0.82	-82
 27	102	10017	99927	0.08108	300.08108	150.08108	15158.18918	0.08108	300.0811	150.08108	15158.18936	0.08108	300.08108	150.08108000000001	15158.18908	2020-01-01	2020-01-02	2020-01-01 00:00:27	2020-01-02 03:45:27	2020-01-01 00:00:27.000	2020-01-02 03:45:27.000	27	99927	49977	5047677	27	99927	49977	5047677	-32542	32393	4556.009900990099	460157	-125	126	-1.297029702970297	-131
-270	101	10260	99171	0.81081	297.81081	149.31081	14931.08108	0.81081	297.81082	149.31081	14931.08109	0.81081	297.81081	149.31081	14931.08100	2020-01-01	2020-01-02	2020-01-01 00:04:30	2020-01-02 03:32:51	2020-01-01 00:04:30.000	2020-01-02 03:32:51.000	270	99171	49720.5	4972050	270	99171	49720.5	4972050	-32299	32636	5156.02	515602	-125	126	0.18	18
-271	101	10261	99172	0.81381	297.81381	149.31381	14931.38138	0.81381	297.8138	149.31381	14931.38124	0.81381	297.81381	149.31381	14931.38100	2020-01-01	2020-01-02	2020-01-01 00:04:31	2020-01-02 03:32:52	2020-01-01 00:04:31.000	2020-01-02 03:32:52.000	271	99172	49721.5	4972150	271	99172	49721.5	4972150	-32298	32637	5157.02	515702	-124	127	1.18	118
-272	101	10262	99173	0.81681	297.81681	149.31681	14931.68168	0.81681	297.8168	149.31681	14931.68159	0.81681	297.81681	149.31681	14931.68100	2020-01-01	2020-01-02	2020-01-01 00:04:32	2020-01-02 03:32:53	2020-01-01 00:04:32.000	2020-01-02 03:32:53.000	272	99173	49722.5	4972250	272	99173	49722.5	4972250	-32297	32638	5158.02	515802	-128	127	-0.38	-38
-273	101	10263	99174	0.81981	297.81981	149.31981	14931.98198	0.81981	297.81982	149.31982	14931.98217	0.81981	297.81981	149.31981	14931.98100	2020-01-01	2020-01-02	2020-01-01 00:04:33	2020-01-02 03:32:54	2020-01-01 00:04:33.000	2020-01-02 03:32:54.000	273	99174	49723.5	4972350	273	99174	49723.5	4972350	-32296	32639	5159.02	515902	-128	127	-1.94	-194
-274	101	10264	99175	0.82282	297.82282	149.32282	14932.28228	0.82282	297.8228	149.32282	14932.28247	0.82282	297.82282	149.32281999999998	14932.28200	2020-01-01	2020-01-02	2020-01-01 00:04:34	2020-01-02 03:32:55	2020-01-01 00:04:34.000	2020-01-02 03:32:55.000	274	99175	49724.5	4972450	274	99175	49724.5	4972450	-32295	32640	5160.02	516002	-128	124	-3.5	-350
-275	101	10265	99176	0.82582	297.82582	149.32582	14932.58258	0.82582	297.82584	149.32582	14932.58256	0.82582	297.82582	149.32582	14932.58200	2020-01-01	2020-01-02	2020-01-01 00:04:35	2020-01-02 03:32:56	2020-01-01 00:04:35.000	2020-01-02 03:32:56.000	275	99176	49725.5	4972550	275	99176	49725.5	4972550	-32294	32641	5161.02	516102	-127	125	-2.5	-250
-276	101	10266	99177	0.82882	297.82882	149.32882	14932.88288	0.82882	297.82883	149.32882	14932.88275	0.82882	297.82882	149.32882	14932.88200	2020-01-01	2020-01-02	2020-01-01 00:04:36	2020-01-02 03:32:57	2020-01-01 00:04:36.000	2020-01-02 03:32:57.000	276	99177	49726.5	4972650	276	99177	49726.5	4972650	-32293	32642	5162.02	516202	-126	126	-1.5	-150
-277	101	10267	99178	0.83183	297.83183	149.33183	14933.18318	0.83183	297.83182	149.33183	14933.18305	0.83183	297.83183	149.33183	14933.18300	2020-01-01	2020-01-02	2020-01-01 00:04:37	2020-01-02 03:32:58	2020-01-01 00:04:37.000	2020-01-02 03:32:58.000	277	99178	49727.5	4972750	277	99178	49727.5	4972750	-32292	32643	5163.02	516302	-125	127	-0.5	-50
-278	101	10268	99179	0.83483	297.83483	149.33483	14933.48348	0.83483	297.83484	149.33483	14933.48364	0.83483	297.83483	149.33483	14933.48300	2020-01-01	2020-01-02	2020-01-01 00:04:38	2020-01-02 03:32:59	2020-01-01 00:04:38.000	2020-01-02 03:32:59.000	278	99179	49728.5	4972850	278	99179	49728.5	4972850	-32291	32644	5164.02	516402	-128	127	-2.06	-206
-279	101	10269	99180	0.83783	297.83783	149.33783	14933.78378	0.83783	297.83783	149.33783	14933.78394	0.83783	297.83783	149.33783	14933.78300	2020-01-01	2020-01-02	2020-01-01 00:04:39	2020-01-02 03:33:00	2020-01-01 00:04:39.000	2020-01-02 03:33:00.000	279	99180	49729.5	4972950	279	99180	49729.5	4972950	-32290	32645	5165.02	516502	-128	127	-3.62	-362
+270	101	10260	99171	0.81081	297.81081	149.31081	14931.08108	0.81081	297.81082	149.31081	14931.08109	0.81081	297.81081	149.31081	14931.081	2020-01-01	2020-01-02	2020-01-01 00:04:30	2020-01-02 03:32:51	2020-01-01 00:04:30.000	2020-01-02 03:32:51.000	270	99171	49720.5	4972050	270	99171	49720.5	4972050	-32299	32636	5156.02	515602	-125	126	0.18	18
+271	101	10261	99172	0.81381	297.81381	149.31381	14931.38138	0.81381	297.8138	149.31381	14931.38124	0.81381	297.81381	149.31381	14931.381	2020-01-01	2020-01-02	2020-01-01 00:04:31	2020-01-02 03:32:52	2020-01-01 00:04:31.000	2020-01-02 03:32:52.000	271	99172	49721.5	4972150	271	99172	49721.5	4972150	-32298	32637	5157.02	515702	-124	127	1.18	118
+272	101	10262	99173	0.81681	297.81681	149.31681	14931.68168	0.81681	297.8168	149.31681	14931.68159	0.81681	297.81681	149.31681	14931.681	2020-01-01	2020-01-02	2020-01-01 00:04:32	2020-01-02 03:32:53	2020-01-01 00:04:32.000	2020-01-02 03:32:53.000	272	99173	49722.5	4972250	272	99173	49722.5	4972250	-32297	32638	5158.02	515802	-128	127	-0.38	-38
+273	101	10263	99174	0.81981	297.81981	149.31981	14931.98198	0.81981	297.81982	149.31982	14931.98217	0.81981	297.81981	149.31981	14931.981	2020-01-01	2020-01-02	2020-01-01 00:04:33	2020-01-02 03:32:54	2020-01-01 00:04:33.000	2020-01-02 03:32:54.000	273	99174	49723.5	4972350	273	99174	49723.5	4972350	-32296	32639	5159.02	515902	-128	127	-1.94	-194
+274	101	10264	99175	0.82282	297.82282	149.32282	14932.28228	0.82282	297.8228	149.32282	14932.28247	0.82282	297.82282	149.32281999999998	14932.282	2020-01-01	2020-01-02	2020-01-01 00:04:34	2020-01-02 03:32:55	2020-01-01 00:04:34.000	2020-01-02 03:32:55.000	274	99175	49724.5	4972450	274	99175	49724.5	4972450	-32295	32640	5160.02	516002	-128	124	-3.5	-350
+275	101	10265	99176	0.82582	297.82582	149.32582	14932.58258	0.82582	297.82584	149.32582	14932.58256	0.82582	297.82582	149.32582	14932.582	2020-01-01	2020-01-02	2020-01-01 00:04:35	2020-01-02 03:32:56	2020-01-01 00:04:35.000	2020-01-02 03:32:56.000	275	99176	49725.5	4972550	275	99176	49725.5	4972550	-32294	32641	5161.02	516102	-127	125	-2.5	-250
+276	101	10266	99177	0.82882	297.82882	149.32882	14932.88288	0.82882	297.82883	149.32882	14932.88275	0.82882	297.82882	149.32882	14932.882	2020-01-01	2020-01-02	2020-01-01 00:04:36	2020-01-02 03:32:57	2020-01-01 00:04:36.000	2020-01-02 03:32:57.000	276	99177	49726.5	4972650	276	99177	49726.5	4972650	-32293	32642	5162.02	516202	-126	126	-1.5	-150
+277	101	10267	99178	0.83183	297.83183	149.33183	14933.18318	0.83183	297.83182	149.33183	14933.18305	0.83183	297.83183	149.33183	14933.183	2020-01-01	2020-01-02	2020-01-01 00:04:37	2020-01-02 03:32:58	2020-01-01 00:04:37.000	2020-01-02 03:32:58.000	277	99178	49727.5	4972750	277	99178	49727.5	4972750	-32292	32643	5163.02	516302	-125	127	-0.5	-50
+278	101	10268	99179	0.83483	297.83483	149.33483	14933.48348	0.83483	297.83484	149.33483	14933.48364	0.83483	297.83483	149.33483	14933.483	2020-01-01	2020-01-02	2020-01-01 00:04:38	2020-01-02 03:32:59	2020-01-01 00:04:38.000	2020-01-02 03:32:59.000	278	99179	49728.5	4972850	278	99179	49728.5	4972850	-32291	32644	5164.02	516402	-128	127	-2.06	-206
+279	101	10269	99180	0.83783	297.83783	149.33783	14933.78378	0.83783	297.83783	149.33783	14933.78394	0.83783	297.83783	149.33783	14933.783	2020-01-01	2020-01-02	2020-01-01 00:04:39	2020-01-02 03:33:00	2020-01-01 00:04:39.000	2020-01-02 03:33:00.000	279	99180	49729.5	4972950	279	99180	49729.5	4972950	-32290	32645	5165.02	516502	-128	127	-3.62	-362
 28	102	10018	99928	0.08408	300.08408	150.08408	15158.49249	0.08408	300.08408	150.08408	15158.49265	0.08408	300.08408	150.08408	15158.49208	2020-01-01	2020-01-02	2020-01-01 00:00:28	2020-01-02 03:45:28	2020-01-01 00:00:28.000	2020-01-02 03:45:28.000	28	99928	49978	5047778	28	99928	49978	5047778	-32541	32394	4557.009900990099	460258	-124	127	-0.297029702970297	-30
-280	101	10270	99181	0.84084	297.84084	149.34084	14934.08408	0.84084	297.84085	149.34084	14934.08403	0.84084	297.84084	149.34084000000001	14934.08400	2020-01-01	2020-01-02	2020-01-01 00:04:40	2020-01-02 03:33:01	2020-01-01 00:04:40.000	2020-01-02 03:33:01.000	280	99181	49730.5	4973050	280	99181	49730.5	4973050	-32289	32646	5166.02	516602	-128	123	-5.18	-518
-281	101	10271	99182	0.84384	297.84384	149.34384	14934.38438	0.84384	297.84384	149.34384	14934.38421	0.84384	297.84384	149.34384	14934.38400	2020-01-01	2020-01-02	2020-01-01 00:04:41	2020-01-02 03:33:02	2020-01-01 00:04:41.000	2020-01-02 03:33:02.000	281	99182	49731.5	4973150	281	99182	49731.5	4973150	-32288	32647	5167.02	516702	-127	124	-4.18	-418
-282	101	10272	99183	0.84684	297.84684	149.34684	14934.68468	0.84684	297.84683	149.34684	14934.68453	0.84684	297.84684	149.34684	14934.68400	2020-01-01	2020-01-02	2020-01-01 00:04:42	2020-01-02 03:33:03	2020-01-01 00:04:42.000	2020-01-02 03:33:03.000	282	99183	49732.5	4973250	282	99183	49732.5	4973250	-32287	32648	5168.02	516802	-126	125	-3.18	-318
-283	101	10273	99184	0.84984	297.84984	149.34984	14934.98498	0.84984	297.84985	149.34985	14934.98526	0.84984	297.84984	149.34984	14934.98400	2020-01-01	2020-01-02	2020-01-01 00:04:43	2020-01-02 03:33:04	2020-01-01 00:04:43.000	2020-01-02 03:33:04.000	283	99184	49733.5	4973350	283	99184	49733.5	4973350	-32286	32649	5169.02	516902	-125	126	-2.18	-218
-284	101	10274	99185	0.85285	297.85285	149.35285	14935.28528	0.85285	297.85284	149.35285	14935.28542	0.85285	297.85285	149.35285	14935.28500	2020-01-01	2020-01-02	2020-01-01 00:04:44	2020-01-02 03:33:05	2020-01-01 00:04:44.000	2020-01-02 03:33:05.000	284	99185	49734.5	4973450	284	99185	49734.5	4973450	-32285	32650	5170.02	517002	-124	127	-1.18	-118
-285	101	10275	99186	0.85585	297.85585	149.35585	14935.58558	0.85585	297.85587	149.35585	14935.5855	0.85585	297.85585	149.35585	14935.58500	2020-01-01	2020-01-02	2020-01-01 00:04:45	2020-01-02 03:33:06	2020-01-01 00:04:45.000	2020-01-02 03:33:06.000	285	99186	49735.5	4973550	285	99186	49735.5	4973550	-32284	32651	5171.02	517102	-128	127	-2.74	-274
-286	101	10276	99187	0.85885	297.85885	149.35885	14935.88588	0.85885	297.85886	149.35885	14935.88568	0.85885	297.85885	149.35885	14935.88500	2020-01-01	2020-01-02	2020-01-01 00:04:46	2020-01-02 03:33:07	2020-01-01 00:04:46.000	2020-01-02 03:33:07.000	286	99187	49736.5	4973650	286	99187	49736.5	4973650	-32283	32652	5172.02	517202	-128	123	-4.3	-430
-287	101	10277	99188	0.86186	297.86186	149.36186	14936.18618	0.86186	297.86185	149.36186	14936.186	0.86186	297.86186	149.36186	14936.18600	2020-01-01	2020-01-02	2020-01-01 00:04:47	2020-01-02 03:33:08	2020-01-01 00:04:47.000	2020-01-02 03:33:08.000	287	99188	49737.5	4973750	287	99188	49737.5	4973750	-32282	32653	5173.02	517302	-127	124	-3.3	-330
-288	101	10278	99189	0.86486	297.86486	149.36486	14936.48648	0.86486	297.86487	149.36486	14936.48673	0.86486	297.86486	149.36486000000002	14936.48600	2020-01-01	2020-01-02	2020-01-01 00:04:48	2020-01-02 03:33:09	2020-01-01 00:04:48.000	2020-01-02 03:33:09.000	288	99189	49738.5	4973850	288	99189	49738.5	4973850	-32281	32654	5174.02	517402	-126	125	-2.3	-230
-289	101	10279	99190	0.86786	297.86786	149.36786	14936.78678	0.86786	297.86786	149.36786	14936.78688	0.86786	297.86786	149.36786	14936.78600	2020-01-01	2020-01-02	2020-01-01 00:04:49	2020-01-02 03:33:10	2020-01-01 00:04:49.000	2020-01-02 03:33:10.000	289	99190	49739.5	4973950	289	99190	49739.5	4973950	-32280	32655	5175.02	517502	-125	126	-1.3	-130
+280	101	10270	99181	0.84084	297.84084	149.34084	14934.08408	0.84084	297.84085	149.34084	14934.08403	0.84084	297.84084	149.34084000000001	14934.084	2020-01-01	2020-01-02	2020-01-01 00:04:40	2020-01-02 03:33:01	2020-01-01 00:04:40.000	2020-01-02 03:33:01.000	280	99181	49730.5	4973050	280	99181	49730.5	4973050	-32289	32646	5166.02	516602	-128	123	-5.18	-518
+281	101	10271	99182	0.84384	297.84384	149.34384	14934.38438	0.84384	297.84384	149.34384	14934.38421	0.84384	297.84384	149.34384	14934.384	2020-01-01	2020-01-02	2020-01-01 00:04:41	2020-01-02 03:33:02	2020-01-01 00:04:41.000	2020-01-02 03:33:02.000	281	99182	49731.5	4973150	281	99182	49731.5	4973150	-32288	32647	5167.02	516702	-127	124	-4.18	-418
+282	101	10272	99183	0.84684	297.84684	149.34684	14934.68468	0.84684	297.84683	149.34684	14934.68453	0.84684	297.84684	149.34684	14934.684	2020-01-01	2020-01-02	2020-01-01 00:04:42	2020-01-02 03:33:03	2020-01-01 00:04:42.000	2020-01-02 03:33:03.000	282	99183	49732.5	4973250	282	99183	49732.5	4973250	-32287	32648	5168.02	516802	-126	125	-3.18	-318
+283	101	10273	99184	0.84984	297.84984	149.34984	14934.98498	0.84984	297.84985	149.34985	14934.98526	0.84984	297.84984	149.34984	14934.984	2020-01-01	2020-01-02	2020-01-01 00:04:43	2020-01-02 03:33:04	2020-01-01 00:04:43.000	2020-01-02 03:33:04.000	283	99184	49733.5	4973350	283	99184	49733.5	4973350	-32286	32649	5169.02	516902	-125	126	-2.18	-218
+284	101	10274	99185	0.85285	297.85285	149.35285	14935.28528	0.85285	297.85284	149.35285	14935.28542	0.85285	297.85285	149.35285	14935.285	2020-01-01	2020-01-02	2020-01-01 00:04:44	2020-01-02 03:33:05	2020-01-01 00:04:44.000	2020-01-02 03:33:05.000	284	99185	49734.5	4973450	284	99185	49734.5	4973450	-32285	32650	5170.02	517002	-124	127	-1.18	-118
+285	101	10275	99186	0.85585	297.85585	149.35585	14935.58558	0.85585	297.85587	149.35585	14935.5855	0.85585	297.85585	149.35585	14935.585	2020-01-01	2020-01-02	2020-01-01 00:04:45	2020-01-02 03:33:06	2020-01-01 00:04:45.000	2020-01-02 03:33:06.000	285	99186	49735.5	4973550	285	99186	49735.5	4973550	-32284	32651	5171.02	517102	-128	127	-2.74	-274
+286	101	10276	99187	0.85885	297.85885	149.35885	14935.88588	0.85885	297.85886	149.35885	14935.88568	0.85885	297.85885	149.35885	14935.885	2020-01-01	2020-01-02	2020-01-01 00:04:46	2020-01-02 03:33:07	2020-01-01 00:04:46.000	2020-01-02 03:33:07.000	286	99187	49736.5	4973650	286	99187	49736.5	4973650	-32283	32652	5172.02	517202	-128	123	-4.3	-430
+287	101	10277	99188	0.86186	297.86186	149.36186	14936.18618	0.86186	297.86185	149.36186	14936.186	0.86186	297.86186	149.36186	14936.186	2020-01-01	2020-01-02	2020-01-01 00:04:47	2020-01-02 03:33:08	2020-01-01 00:04:47.000	2020-01-02 03:33:08.000	287	99188	49737.5	4973750	287	99188	49737.5	4973750	-32282	32653	5173.02	517302	-127	124	-3.3	-330
+288	101	10278	99189	0.86486	297.86486	149.36486	14936.48648	0.86486	297.86487	149.36486	14936.48673	0.86486	297.86486	149.36486000000002	14936.486	2020-01-01	2020-01-02	2020-01-01 00:04:48	2020-01-02 03:33:09	2020-01-01 00:04:48.000	2020-01-02 03:33:09.000	288	99189	49738.5	4973850	288	99189	49738.5	4973850	-32281	32654	5174.02	517402	-126	125	-2.3	-230
+289	101	10279	99190	0.86786	297.86786	149.36786	14936.78678	0.86786	297.86786	149.36786	14936.78688	0.86786	297.86786	149.36786	14936.786	2020-01-01	2020-01-02	2020-01-01 00:04:49	2020-01-02 03:33:10	2020-01-01 00:04:49.000	2020-01-02 03:33:10.000	289	99190	49739.5	4973950	289	99190	49739.5	4973950	-32280	32655	5175.02	517502	-125	126	-1.3	-130
 29	102	10019	99929	0.08708	300.08708	150.08708	15158.79579	0.08708	300.0871	150.08708	15158.79576	0.08708	300.08708	150.08708	15158.79508	2020-01-01	2020-01-02	2020-01-01 00:00:29	2020-01-02 03:45:29	2020-01-01 00:00:29.000	2020-01-02 03:45:29.000	29	99929	49979	5047879	29	99929	49979	5047879	-32540	32395	4558.009900990099	460359	-128	127	-1.8316831683168318	-185
-290	101	10280	99191	0.87087	297.87087	149.37087	14937.08708	0.87087	297.87088	149.37087	14937.087	0.87087	297.87087	149.37087	14937.08700	2020-01-01	2020-01-02	2020-01-01 00:04:50	2020-01-02 03:33:11	2020-01-01 00:04:50.000	2020-01-02 03:33:11.000	290	99191	49740.5	4974050	290	99191	49740.5	4974050	-32279	32656	5176.02	517602	-124	127	-0.3	-30
-291	101	10281	99192	0.87387	297.87387	149.37387	14937.38738	0.87387	297.87387	149.37387	14937.38716	0.87387	297.87387	149.37387	14937.38700	2020-01-01	2020-01-02	2020-01-01 00:04:51	2020-01-02 03:33:12	2020-01-01 00:04:51.000	2020-01-02 03:33:12.000	291	99192	49741.5	4974150	291	99192	49741.5	4974150	-32278	32657	5177.02	517702	-128	127	-1.86	-186
-292	101	10282	99193	0.87687	297.87687	149.37687	14937.68768	0.87687	297.8769	149.37687	14937.68789	0.87687	297.87687	149.37687	14937.68700	2020-01-01	2020-01-02	2020-01-01 00:04:52	2020-01-02 03:33:13	2020-01-01 00:04:52.000	2020-01-02 03:33:13.000	292	99193	49742.5	4974250	292	99193	49742.5	4974250	-32277	32658	5178.02	517802	-128	123	-3.42	-342
-293	101	10283	99194	0.87987	297.87987	149.37987	14937.98798	0.87987	297.87988	149.37988	14937.9882	0.87987	297.87987	149.37986999999998	14937.98700	2020-01-01	2020-01-02	2020-01-01 00:04:53	2020-01-02 03:33:14	2020-01-01 00:04:53.000	2020-01-02 03:33:14.000	293	99194	49743.5	4974350	293	99194	49743.5	4974350	-32276	32659	5179.02	517902	-127	124	-2.42	-242
-294	101	10284	99195	0.88288	297.88288	149.38288	14938.28828	0.88288	297.88287	149.38288	14938.28835	0.88288	297.88288	149.38288	14938.28800	2020-01-01	2020-01-02	2020-01-01 00:04:54	2020-01-02 03:33:15	2020-01-01 00:04:54.000	2020-01-02 03:33:15.000	294	99195	49744.5	4974450	294	99195	49744.5	4974450	-32275	32660	5180.02	518002	-126	125	-1.42	-142
-295	101	10285	99196	0.88588	297.88588	149.38588	14938.58858	0.88588	297.8859	149.38588	14938.58847	0.88588	297.88588	149.38588	14938.58800	2020-01-01	2020-01-02	2020-01-01 00:04:55	2020-01-02 03:33:16	2020-01-01 00:04:55.000	2020-01-02 03:33:16.000	295	99196	49745.5	4974550	295	99196	49745.5	4974550	-32274	32661	5181.02	518102	-125	126	-0.42	-42
-296	101	10286	99197	0.88888	297.88888	149.38888	14938.88888	0.88888	297.8889	149.38888	14938.88863	0.88888	297.88888	149.38888	14938.88800	2020-01-01	2020-01-02	2020-01-01 00:04:56	2020-01-02 03:33:17	2020-01-01 00:04:56.000	2020-01-02 03:33:17.000	296	99197	49746.5	4974650	296	99197	49746.5	4974650	-32273	32662	5182.02	518202	-124	127	0.58	58
-297	101	10287	99198	0.89189	297.89189	149.39189	14939.18918	0.89189	297.8919	149.39189	14939.18936	0.89189	297.89189	149.39189	14939.18900	2020-01-01	2020-01-02	2020-01-01 00:04:57	2020-01-02 03:33:18	2020-01-01 00:04:57.000	2020-01-02 03:33:18.000	297	99198	49747.5	4974750	297	99198	49747.5	4974750	-32272	32663	5183.02	518302	-128	127	-0.98	-98
-298	101	10288	99199	0.89489	297.89489	149.39489	14939.48948	0.89489	297.8949	149.39489	14939.48967	0.89489	297.89489	149.39489	14939.48900	2020-01-01	2020-01-02	2020-01-01 00:04:58	2020-01-02 03:33:19	2020-01-01 00:04:58.000	2020-01-02 03:33:19.000	298	99199	49748.5	4974850	298	99199	49748.5	4974850	-32271	32664	5184.02	518402	-128	127	-2.54	-254
-299	101	10289	99200	0.89789	297.89789	149.39789	14939.78978	0.89789	297.8979	149.39789	14939.78986	0.89789	297.89789	149.39789000000002	14939.78900	2020-01-01	2020-01-02	2020-01-01 00:04:59	2020-01-02 03:33:20	2020-01-01 00:04:59.000	2020-01-02 03:33:20.000	299	99200	49749.5	4974950	299	99200	49749.5	4974950	-32270	32665	5185.02	518502	-128	124	-4.1	-410
-3	102	1002	9993	0.009	300.009	150.009	15150.9099	0.009	300.009	150.009	15150.90958	0.00900	300.00900	150.009	15150.90900	2020-01-01	2020-01-02	2020-01-01 00:00:03	2020-01-02 03:45:03	2020-01-01 00:00:03.000	2020-01-02 03:45:03.000	3	99903	49953	5045253	3	99903	49953	5045253	-32566	32369	4532.009900990099	457733	-124	127	0.04950495049504951	5
+290	101	10280	99191	0.87087	297.87087	149.37087	14937.08708	0.87087	297.87088	149.37087	14937.087	0.87087	297.87087	149.37087	14937.087	2020-01-01	2020-01-02	2020-01-01 00:04:50	2020-01-02 03:33:11	2020-01-01 00:04:50.000	2020-01-02 03:33:11.000	290	99191	49740.5	4974050	290	99191	49740.5	4974050	-32279	32656	5176.02	517602	-124	127	-0.3	-30
+291	101	10281	99192	0.87387	297.87387	149.37387	14937.38738	0.87387	297.87387	149.37387	14937.38716	0.87387	297.87387	149.37387	14937.387	2020-01-01	2020-01-02	2020-01-01 00:04:51	2020-01-02 03:33:12	2020-01-01 00:04:51.000	2020-01-02 03:33:12.000	291	99192	49741.5	4974150	291	99192	49741.5	4974150	-32278	32657	5177.02	517702	-128	127	-1.86	-186
+292	101	10282	99193	0.87687	297.87687	149.37687	14937.68768	0.87687	297.8769	149.37687	14937.68789	0.87687	297.87687	149.37687	14937.687	2020-01-01	2020-01-02	2020-01-01 00:04:52	2020-01-02 03:33:13	2020-01-01 00:04:52.000	2020-01-02 03:33:13.000	292	99193	49742.5	4974250	292	99193	49742.5	4974250	-32277	32658	5178.02	517802	-128	123	-3.42	-342
+293	101	10283	99194	0.87987	297.87987	149.37987	14937.98798	0.87987	297.87988	149.37988	14937.9882	0.87987	297.87987	149.37986999999998	14937.987	2020-01-01	2020-01-02	2020-01-01 00:04:53	2020-01-02 03:33:14	2020-01-01 00:04:53.000	2020-01-02 03:33:14.000	293	99194	49743.5	4974350	293	99194	49743.5	4974350	-32276	32659	5179.02	517902	-127	124	-2.42	-242
+294	101	10284	99195	0.88288	297.88288	149.38288	14938.28828	0.88288	297.88287	149.38288	14938.28835	0.88288	297.88288	149.38288	14938.288	2020-01-01	2020-01-02	2020-01-01 00:04:54	2020-01-02 03:33:15	2020-01-01 00:04:54.000	2020-01-02 03:33:15.000	294	99195	49744.5	4974450	294	99195	49744.5	4974450	-32275	32660	5180.02	518002	-126	125	-1.42	-142
+295	101	10285	99196	0.88588	297.88588	149.38588	14938.58858	0.88588	297.8859	149.38588	14938.58847	0.88588	297.88588	149.38588	14938.588	2020-01-01	2020-01-02	2020-01-01 00:04:55	2020-01-02 03:33:16	2020-01-01 00:04:55.000	2020-01-02 03:33:16.000	295	99196	49745.5	4974550	295	99196	49745.5	4974550	-32274	32661	5181.02	518102	-125	126	-0.42	-42
+296	101	10286	99197	0.88888	297.88888	149.38888	14938.88888	0.88888	297.8889	149.38888	14938.88863	0.88888	297.88888	149.38888	14938.888	2020-01-01	2020-01-02	2020-01-01 00:04:56	2020-01-02 03:33:17	2020-01-01 00:04:56.000	2020-01-02 03:33:17.000	296	99197	49746.5	4974650	296	99197	49746.5	4974650	-32273	32662	5182.02	518202	-124	127	0.58	58
+297	101	10287	99198	0.89189	297.89189	149.39189	14939.18918	0.89189	297.8919	149.39189	14939.18936	0.89189	297.89189	149.39189	14939.189	2020-01-01	2020-01-02	2020-01-01 00:04:57	2020-01-02 03:33:18	2020-01-01 00:04:57.000	2020-01-02 03:33:18.000	297	99198	49747.5	4974750	297	99198	49747.5	4974750	-32272	32663	5183.02	518302	-128	127	-0.98	-98
+298	101	10288	99199	0.89489	297.89489	149.39489	14939.48948	0.89489	297.8949	149.39489	14939.48967	0.89489	297.89489	149.39489	14939.489	2020-01-01	2020-01-02	2020-01-01 00:04:58	2020-01-02 03:33:19	2020-01-01 00:04:58.000	2020-01-02 03:33:19.000	298	99199	49748.5	4974850	298	99199	49748.5	4974850	-32271	32664	5184.02	518402	-128	127	-2.54	-254
+299	101	10289	99200	0.89789	297.89789	149.39789	14939.78978	0.89789	297.8979	149.39789	14939.78986	0.89789	297.89789	149.39789000000002	14939.789	2020-01-01	2020-01-02	2020-01-01 00:04:59	2020-01-02 03:33:20	2020-01-01 00:04:59.000	2020-01-02 03:33:20.000	299	99200	49749.5	4974950	299	99200	49749.5	4974950	-32270	32665	5185.02	518502	-128	124	-4.1	-410
+3	102	1002	9993	0.009	300.009	150.009	15150.9099	0.009	300.009	150.009	15150.90958	0.009	300.009	150.009	15150.909	2020-01-01	2020-01-02	2020-01-01 00:00:03	2020-01-02 03:45:03	2020-01-01 00:00:03.000	2020-01-02 03:45:03.000	3	99903	49953	5045253	3	99903	49953	5045253	-32566	32369	4532.009900990099	457733	-124	127	0.04950495049504951	5
 30	102	10020	99930	0.09009	300.09009	150.09009	15159.09909	0.09009	300.0901	150.09008	15159.09894	0.09009	300.09009	150.09009	15159.09909	2020-01-01	2020-01-02	2020-01-01 00:00:30	2020-01-02 03:45:30	2020-01-01 00:00:30.000	2020-01-02 03:45:30.000	30	99930	49980	5047980	30	99930	49980	5047980	-32539	32396	4559.009900990099	460460	-128	123	-3.366336633663366	-340
-300	101	10290	99201	0.9009	297.9009	149.4009	14940.09009	0.9009	297.9009	149.40089	14940.08995	0.90090	297.90090	149.4009	14940.09000	2020-01-01	2020-01-02	2020-01-01 00:05:00	2020-01-02 03:33:21	2020-01-01 00:05:00.000	2020-01-02 03:33:21.000	300	99201	49750.5	4975050	300	99201	49750.5	4975050	-32269	32666	5186.02	518602	-127	125	-3.1	-310
-301	101	10291	99202	0.9039	297.9039	149.4039	14940.39039	0.9039	297.9039	149.4039	14940.39009	0.90390	297.90390	149.4039	14940.39000	2020-01-01	2020-01-02	2020-01-01 00:05:01	2020-01-02 03:33:22	2020-01-01 00:05:01.000	2020-01-02 03:33:22.000	301	99202	49751.5	4975150	301	99202	49751.5	4975150	-32268	32667	5187.02	518702	-126	126	-2.1	-210
-302	101	10292	99203	0.9069	297.9069	149.4069	14940.69069	0.9069	297.90692	149.4069	14940.69083	0.90690	297.90690	149.4069	14940.69000	2020-01-01	2020-01-02	2020-01-01 00:05:02	2020-01-02 03:33:23	2020-01-01 00:05:02.000	2020-01-02 03:33:23.000	302	99203	49752.5	4975250	302	99203	49752.5	4975250	-32267	32668	5188.02	518802	-125	127	-1.1	-110
-303	101	10293	99204	0.9099	297.9099	149.4099	14940.99099	0.9099	297.9099	149.40991	14940.99114	0.90990	297.90990	149.4099	14940.99000	2020-01-01	2020-01-02	2020-01-01 00:05:03	2020-01-02 03:33:24	2020-01-01 00:05:03.000	2020-01-02 03:33:24.000	303	99204	49753.5	4975350	303	99204	49753.5	4975350	-32266	32669	5189.02	518902	-128	127	-2.66	-266
-304	101	10294	99205	0.91291	297.91291	149.41291	14941.29129	0.91291	297.9129	149.41291	14941.29133	0.91291	297.91291	149.41290999999998	14941.29100	2020-01-01	2020-01-02	2020-01-01 00:05:04	2020-01-02 03:33:25	2020-01-01 00:05:04.000	2020-01-02 03:33:25.000	304	99205	49754.5	4975450	304	99205	49754.5	4975450	-32265	32670	5190.02	519002	-128	127	-4.22	-422
-305	101	10295	99206	0.91591	297.91591	149.41591	14941.59159	0.91591	297.91592	149.41591	14941.59141	0.91591	297.91591	149.41591	14941.59100	2020-01-01	2020-01-02	2020-01-01 00:05:05	2020-01-02 03:33:26	2020-01-01 00:05:05.000	2020-01-02 03:33:26.000	305	99206	49755.5	4975550	305	99206	49755.5	4975550	-32264	32671	5191.02	519102	-128	123	-5.78	-578
-306	101	10296	99207	0.91891	297.91891	149.41891	14941.89189	0.91891	297.9189	149.41891	14941.89172	0.91891	297.91891	149.41890999999998	14941.89100	2020-01-01	2020-01-02	2020-01-01 00:05:06	2020-01-02 03:33:27	2020-01-01 00:05:06.000	2020-01-02 03:33:27.000	306	99207	49756.5	4975650	306	99207	49756.5	4975650	-32263	32672	5192.02	519202	-127	124	-4.78	-478
-307	101	10297	99208	0.92192	297.92192	149.42192	14942.19219	0.92192	297.92194	149.42192	14942.1923	0.92192	297.92192	149.42192	14942.19200	2020-01-01	2020-01-02	2020-01-01 00:05:07	2020-01-02 03:33:28	2020-01-01 00:05:07.000	2020-01-02 03:33:28.000	307	99208	49757.5	4975750	307	99208	49757.5	4975750	-32262	32673	5193.02	519302	-126	125	-3.78	-378
-308	101	10298	99209	0.92492	297.92492	149.42492	14942.49249	0.92492	297.92493	149.42492	14942.49265	0.92492	297.92492	149.42492000000001	14942.49200	2020-01-01	2020-01-02	2020-01-01 00:05:08	2020-01-02 03:33:29	2020-01-01 00:05:08.000	2020-01-02 03:33:29.000	308	99209	49758.5	4975850	308	99209	49758.5	4975850	-32261	32674	5194.02	519402	-125	126	-2.78	-278
-309	101	10299	99210	0.92792	297.92792	149.42792	14942.79279	0.92792	297.92792	149.42792	14942.7928	0.92792	297.92792	149.42792	14942.79200	2020-01-01	2020-01-02	2020-01-01 00:05:09	2020-01-02 03:33:30	2020-01-01 00:05:09.000	2020-01-02 03:33:30.000	309	99210	49759.5	4975950	309	99210	49759.5	4975950	-32260	32675	5195.02	519502	-124	127	-1.78	-178
+300	101	10290	99201	0.9009	297.9009	149.4009	14940.09009	0.9009	297.9009	149.40089	14940.08995	0.9009	297.9009	149.4009	14940.09	2020-01-01	2020-01-02	2020-01-01 00:05:00	2020-01-02 03:33:21	2020-01-01 00:05:00.000	2020-01-02 03:33:21.000	300	99201	49750.5	4975050	300	99201	49750.5	4975050	-32269	32666	5186.02	518602	-127	125	-3.1	-310
+301	101	10291	99202	0.9039	297.9039	149.4039	14940.39039	0.9039	297.9039	149.4039	14940.39009	0.9039	297.9039	149.4039	14940.39	2020-01-01	2020-01-02	2020-01-01 00:05:01	2020-01-02 03:33:22	2020-01-01 00:05:01.000	2020-01-02 03:33:22.000	301	99202	49751.5	4975150	301	99202	49751.5	4975150	-32268	32667	5187.02	518702	-126	126	-2.1	-210
+302	101	10292	99203	0.9069	297.9069	149.4069	14940.69069	0.9069	297.90692	149.4069	14940.69083	0.9069	297.9069	149.4069	14940.69	2020-01-01	2020-01-02	2020-01-01 00:05:02	2020-01-02 03:33:23	2020-01-01 00:05:02.000	2020-01-02 03:33:23.000	302	99203	49752.5	4975250	302	99203	49752.5	4975250	-32267	32668	5188.02	518802	-125	127	-1.1	-110
+303	101	10293	99204	0.9099	297.9099	149.4099	14940.99099	0.9099	297.9099	149.40991	14940.99114	0.9099	297.9099	149.4099	14940.99	2020-01-01	2020-01-02	2020-01-01 00:05:03	2020-01-02 03:33:24	2020-01-01 00:05:03.000	2020-01-02 03:33:24.000	303	99204	49753.5	4975350	303	99204	49753.5	4975350	-32266	32669	5189.02	518902	-128	127	-2.66	-266
+304	101	10294	99205	0.91291	297.91291	149.41291	14941.29129	0.91291	297.9129	149.41291	14941.29133	0.91291	297.91291	149.41290999999998	14941.291	2020-01-01	2020-01-02	2020-01-01 00:05:04	2020-01-02 03:33:25	2020-01-01 00:05:04.000	2020-01-02 03:33:25.000	304	99205	49754.5	4975450	304	99205	49754.5	4975450	-32265	32670	5190.02	519002	-128	127	-4.22	-422
+305	101	10295	99206	0.91591	297.91591	149.41591	14941.59159	0.91591	297.91592	149.41591	14941.59141	0.91591	297.91591	149.41591	14941.591	2020-01-01	2020-01-02	2020-01-01 00:05:05	2020-01-02 03:33:26	2020-01-01 00:05:05.000	2020-01-02 03:33:26.000	305	99206	49755.5	4975550	305	99206	49755.5	4975550	-32264	32671	5191.02	519102	-128	123	-5.78	-578
+306	101	10296	99207	0.91891	297.91891	149.41891	14941.89189	0.91891	297.9189	149.41891	14941.89172	0.91891	297.91891	149.41890999999998	14941.891	2020-01-01	2020-01-02	2020-01-01 00:05:06	2020-01-02 03:33:27	2020-01-01 00:05:06.000	2020-01-02 03:33:27.000	306	99207	49756.5	4975650	306	99207	49756.5	4975650	-32263	32672	5192.02	519202	-127	124	-4.78	-478
+307	101	10297	99208	0.92192	297.92192	149.42192	14942.19219	0.92192	297.92194	149.42192	14942.1923	0.92192	297.92192	149.42192	14942.192	2020-01-01	2020-01-02	2020-01-01 00:05:07	2020-01-02 03:33:28	2020-01-01 00:05:07.000	2020-01-02 03:33:28.000	307	99208	49757.5	4975750	307	99208	49757.5	4975750	-32262	32673	5193.02	519302	-126	125	-3.78	-378
+308	101	10298	99209	0.92492	297.92492	149.42492	14942.49249	0.92492	297.92493	149.42492	14942.49265	0.92492	297.92492	149.42492000000001	14942.492	2020-01-01	2020-01-02	2020-01-01 00:05:08	2020-01-02 03:33:29	2020-01-01 00:05:08.000	2020-01-02 03:33:29.000	308	99209	49758.5	4975850	308	99209	49758.5	4975850	-32261	32674	5194.02	519402	-125	126	-2.78	-278
+309	101	10299	99210	0.92792	297.92792	149.42792	14942.79279	0.92792	297.92792	149.42792	14942.7928	0.92792	297.92792	149.42792	14942.792	2020-01-01	2020-01-02	2020-01-01 00:05:09	2020-01-02 03:33:30	2020-01-01 00:05:09.000	2020-01-02 03:33:30.000	309	99210	49759.5	4975950	309	99210	49759.5	4975950	-32260	32675	5195.02	519502	-124	127	-1.78	-178
 31	102	10021	99931	0.09309	300.09309	150.09309	15159.4024	0.09309	300.09308	150.09309	15159.40224	0.09309	300.09309	150.09309	15159.40209	2020-01-01	2020-01-02	2020-01-01 00:00:31	2020-01-02 03:45:31	2020-01-01 00:00:31.000	2020-01-02 03:45:31.000	31	99931	49981	5048081	31	99931	49981	5048081	-32538	32397	4560.009900990099	460561	-127	124	-2.366336633663366	-239
-310	101	10300	99211	0.93093	297.93093	149.43093	14943.09309	0.93093	297.93094	149.43092	14943.09288	0.93093	297.93093	149.43093000000002	14943.09300	2020-01-01	2020-01-02	2020-01-01 00:05:10	2020-01-02 03:33:31	2020-01-01 00:05:10.000	2020-01-02 03:33:31.000	310	99211	49760.5	4976050	310	99211	49760.5	4976050	-32259	32676	5196.02	519602	-128	127	-3.34	-334
-311	101	10301	99212	0.93393	297.93393	149.43393	14943.39339	0.93393	297.93393	149.43393	14943.39319	0.93393	297.93393	149.43393	14943.39300	2020-01-01	2020-01-02	2020-01-01 00:05:11	2020-01-02 03:33:32	2020-01-01 00:05:11.000	2020-01-02 03:33:32.000	311	99212	49761.5	4976150	311	99212	49761.5	4976150	-32258	32677	5197.02	519702	-128	123	-4.9	-490
-312	101	10302	99213	0.93693	297.93693	149.43693	14943.69369	0.93693	297.93695	149.43693	14943.69377	0.93693	297.93693	149.43693	14943.69300	2020-01-01	2020-01-02	2020-01-01 00:05:12	2020-01-02 03:33:33	2020-01-01 00:05:12.000	2020-01-02 03:33:33.000	312	99213	49762.5	4976250	312	99213	49762.5	4976250	-32257	32678	5198.02	519802	-127	124	-3.9	-390
-313	101	10303	99214	0.93993	297.93993	149.43993	14943.99399	0.93993	297.93994	149.43994	14943.99412	0.93993	297.93993	149.43993	14943.99300	2020-01-01	2020-01-02	2020-01-01 00:05:13	2020-01-02 03:33:34	2020-01-01 00:05:13.000	2020-01-02 03:33:34.000	313	99214	49763.5	4976350	313	99214	49763.5	4976350	-32256	32679	5199.02	519902	-126	125	-2.9	-290
-314	101	10304	99215	0.94294	297.94294	149.44294	14944.29429	0.94294	297.94293	149.44294	14944.29427	0.94294	297.94294	149.44294	14944.29400	2020-01-01	2020-01-02	2020-01-01 00:05:14	2020-01-02 03:33:35	2020-01-01 00:05:14.000	2020-01-02 03:33:35.000	314	99215	49764.5	4976450	314	99215	49764.5	4976450	-32255	32680	5200.02	520002	-125	126	-1.9	-190
-315	101	10305	99216	0.94594	297.94594	149.44594	14944.59459	0.94594	297.94595	149.44595	14944.595	0.94594	297.94594	149.44593999999998	14944.59400	2020-01-01	2020-01-02	2020-01-01 00:05:15	2020-01-02 03:33:36	2020-01-01 00:05:15.000	2020-01-02 03:33:36.000	315	99216	49765.5	4976550	315	99216	49765.5	4976550	-32254	32681	5201.02	520102	-124	127	-0.9	-90
-316	101	10306	99217	0.94894	297.94894	149.44894	14944.89489	0.94894	297.94894	149.44894	14944.89466	0.94894	297.94894	149.44894	14944.89400	2020-01-01	2020-01-02	2020-01-01 00:05:16	2020-01-02 03:33:37	2020-01-01 00:05:16.000	2020-01-02 03:33:37.000	316	99217	49766.5	4976650	316	99217	49766.5	4976650	-32253	32682	5202.02	520202	-128	127	-2.46	-246
-317	101	10307	99218	0.95195	297.95195	149.45195	14945.19519	0.95195	297.95197	149.45195	14945.19524	0.95195	297.95195	149.45195	14945.19500	2020-01-01	2020-01-02	2020-01-01 00:05:17	2020-01-02 03:33:38	2020-01-01 00:05:17.000	2020-01-02 03:33:38.000	317	99218	49767.5	4976750	317	99218	49767.5	4976750	-32252	32683	5203.02	520302	-128	123	-4.02	-402
-318	101	10308	99219	0.95495	297.95495	149.45495	14945.49549	0.95495	297.95496	149.45495	14945.49558	0.95495	297.95495	149.45495	14945.49500	2020-01-01	2020-01-02	2020-01-01 00:05:18	2020-01-02 03:33:39	2020-01-01 00:05:18.000	2020-01-02 03:33:39.000	318	99219	49768.5	4976850	318	99219	49768.5	4976850	-32251	32684	5204.02	520402	-127	124	-3.02	-302
-319	101	10309	99220	0.95795	297.95795	149.45795	14945.79579	0.95795	297.95795	149.45795	14945.79574	0.95795	297.95795	149.45795	14945.79500	2020-01-01	2020-01-02	2020-01-01 00:05:19	2020-01-02 03:33:40	2020-01-01 00:05:19.000	2020-01-02 03:33:40.000	319	99220	49769.5	4976950	319	99220	49769.5	4976950	-32250	32685	5205.02	520502	-126	125	-2.02	-202
+310	101	10300	99211	0.93093	297.93093	149.43093	14943.09309	0.93093	297.93094	149.43092	14943.09288	0.93093	297.93093	149.43093000000002	14943.093	2020-01-01	2020-01-02	2020-01-01 00:05:10	2020-01-02 03:33:31	2020-01-01 00:05:10.000	2020-01-02 03:33:31.000	310	99211	49760.5	4976050	310	99211	49760.5	4976050	-32259	32676	5196.02	519602	-128	127	-3.34	-334
+311	101	10301	99212	0.93393	297.93393	149.43393	14943.39339	0.93393	297.93393	149.43393	14943.39319	0.93393	297.93393	149.43393	14943.393	2020-01-01	2020-01-02	2020-01-01 00:05:11	2020-01-02 03:33:32	2020-01-01 00:05:11.000	2020-01-02 03:33:32.000	311	99212	49761.5	4976150	311	99212	49761.5	4976150	-32258	32677	5197.02	519702	-128	123	-4.9	-490
+312	101	10302	99213	0.93693	297.93693	149.43693	14943.69369	0.93693	297.93695	149.43693	14943.69377	0.93693	297.93693	149.43693	14943.693	2020-01-01	2020-01-02	2020-01-01 00:05:12	2020-01-02 03:33:33	2020-01-01 00:05:12.000	2020-01-02 03:33:33.000	312	99213	49762.5	4976250	312	99213	49762.5	4976250	-32257	32678	5198.02	519802	-127	124	-3.9	-390
+313	101	10303	99214	0.93993	297.93993	149.43993	14943.99399	0.93993	297.93994	149.43994	14943.99412	0.93993	297.93993	149.43993	14943.993	2020-01-01	2020-01-02	2020-01-01 00:05:13	2020-01-02 03:33:34	2020-01-01 00:05:13.000	2020-01-02 03:33:34.000	313	99214	49763.5	4976350	313	99214	49763.5	4976350	-32256	32679	5199.02	519902	-126	125	-2.9	-290
+314	101	10304	99215	0.94294	297.94294	149.44294	14944.29429	0.94294	297.94293	149.44294	14944.29427	0.94294	297.94294	149.44294	14944.294	2020-01-01	2020-01-02	2020-01-01 00:05:14	2020-01-02 03:33:35	2020-01-01 00:05:14.000	2020-01-02 03:33:35.000	314	99215	49764.5	4976450	314	99215	49764.5	4976450	-32255	32680	5200.02	520002	-125	126	-1.9	-190
+315	101	10305	99216	0.94594	297.94594	149.44594	14944.59459	0.94594	297.94595	149.44595	14944.595	0.94594	297.94594	149.44593999999998	14944.594	2020-01-01	2020-01-02	2020-01-01 00:05:15	2020-01-02 03:33:36	2020-01-01 00:05:15.000	2020-01-02 03:33:36.000	315	99216	49765.5	4976550	315	99216	49765.5	4976550	-32254	32681	5201.02	520102	-124	127	-0.9	-90
+316	101	10306	99217	0.94894	297.94894	149.44894	14944.89489	0.94894	297.94894	149.44894	14944.89466	0.94894	297.94894	149.44894	14944.894	2020-01-01	2020-01-02	2020-01-01 00:05:16	2020-01-02 03:33:37	2020-01-01 00:05:16.000	2020-01-02 03:33:37.000	316	99217	49766.5	4976650	316	99217	49766.5	4976650	-32253	32682	5202.02	520202	-128	127	-2.46	-246
+317	101	10307	99218	0.95195	297.95195	149.45195	14945.19519	0.95195	297.95197	149.45195	14945.19524	0.95195	297.95195	149.45195	14945.195	2020-01-01	2020-01-02	2020-01-01 00:05:17	2020-01-02 03:33:38	2020-01-01 00:05:17.000	2020-01-02 03:33:38.000	317	99218	49767.5	4976750	317	99218	49767.5	4976750	-32252	32683	5203.02	520302	-128	123	-4.02	-402
+318	101	10308	99219	0.95495	297.95495	149.45495	14945.49549	0.95495	297.95496	149.45495	14945.49558	0.95495	297.95495	149.45495	14945.495	2020-01-01	2020-01-02	2020-01-01 00:05:18	2020-01-02 03:33:39	2020-01-01 00:05:18.000	2020-01-02 03:33:39.000	318	99219	49768.5	4976850	318	99219	49768.5	4976850	-32251	32684	5204.02	520402	-127	124	-3.02	-302
+319	101	10309	99220	0.95795	297.95795	149.45795	14945.79579	0.95795	297.95795	149.45795	14945.79574	0.95795	297.95795	149.45795	14945.795	2020-01-01	2020-01-02	2020-01-01 00:05:19	2020-01-02 03:33:40	2020-01-01 00:05:19.000	2020-01-02 03:33:40.000	319	99220	49769.5	4976950	319	99220	49769.5	4976950	-32250	32685	5205.02	520502	-126	125	-2.02	-202
 32	102	10022	99932	0.09609	300.09609	150.09609	15159.7057	0.09609	300.0961	150.09609	15159.706	0.09609	300.09609	150.09609	15159.70509	2020-01-01	2020-01-02	2020-01-01 00:00:32	2020-01-02 03:45:32	2020-01-01 00:00:32.000	2020-01-02 03:45:32.000	32	99932	49982	5048182	32	99932	49982	5048182	-32537	32398	4561.009900990099	460662	-126	125	-1.3663366336633664	-138
-320	101	10310	99221	0.96096	297.96096	149.46096	14946.09609	0.96096	297.96097	149.46096	14946.09647	0.96096	297.96096	149.46096	14946.09600	2020-01-01	2020-01-02	2020-01-01 00:05:20	2020-01-02 03:33:41	2020-01-01 00:05:20.000	2020-01-02 03:33:41.000	320	99221	49770.5	4977050	320	99221	49770.5	4977050	-32249	32686	5206.02	520602	-125	126	-1.02	-102
-321	101	10311	99222	0.96396	297.96396	149.46396	14946.39639	0.96396	297.96396	149.46396	14946.39613	0.96396	297.96396	149.46396000000001	14946.39600	2020-01-01	2020-01-02	2020-01-01 00:05:21	2020-01-02 03:33:42	2020-01-01 00:05:21.000	2020-01-02 03:33:42.000	321	99222	49771.5	4977150	321	99222	49771.5	4977150	-32248	32687	5207.02	520702	-124	127	-0.02	-2
-322	101	10312	99223	0.96696	297.96696	149.46696	14946.69669	0.96696	297.96698	149.46696	14946.69674	0.96696	297.96696	149.46696	14946.69600	2020-01-01	2020-01-02	2020-01-01 00:05:22	2020-01-02 03:33:43	2020-01-01 00:05:22.000	2020-01-02 03:33:43.000	322	99223	49772.5	4977250	322	99223	49772.5	4977250	-32247	32688	5208.02	520802	-128	127	-1.58	-158
-323	101	10313	99224	0.96996	297.96996	149.46996	14946.99699	0.96997	297.96997	149.46997	14946.99706	0.96996	297.96996	149.46996	14946.99600	2020-01-01	2020-01-02	2020-01-01 00:05:23	2020-01-02 03:33:44	2020-01-01 00:05:23.000	2020-01-02 03:33:44.000	323	99224	49773.5	4977350	323	99224	49773.5	4977350	-32246	32689	5209.02	520902	-128	123	-3.14	-314
-324	101	10314	99225	0.97297	297.97297	149.47297	14947.29729	0.97297	297.97296	149.47297	14947.29737	0.97297	297.97297	149.47297	14947.29700	2020-01-01	2020-01-02	2020-01-01 00:05:24	2020-01-02 03:33:45	2020-01-01 00:05:24.000	2020-01-02 03:33:45.000	324	99225	49774.5	4977450	324	99225	49774.5	4977450	-32245	32690	5210.02	521002	-127	124	-2.14	-214
-325	101	10315	99226	0.97597	297.97597	149.47597	14947.59759	0.97597	297.97598	149.47597	14947.59794	0.97597	297.97597	149.47597	14947.59700	2020-01-01	2020-01-02	2020-01-01 00:05:25	2020-01-02 03:33:46	2020-01-01 00:05:25.000	2020-01-02 03:33:46.000	325	99226	49775.5	4977550	325	99226	49775.5	4977550	-32244	32691	5211.02	521102	-126	125	-1.14	-114
-326	101	10316	99227	0.97897	297.97897	149.47897	14947.89789	0.97897	297.97897	149.47897	14947.8976	0.97897	297.97897	149.47897	14947.89700	2020-01-01	2020-01-02	2020-01-01 00:05:26	2020-01-02 03:33:47	2020-01-01 00:05:26.000	2020-01-02 03:33:47.000	326	99227	49776.5	4977650	326	99227	49776.5	4977650	-32243	32692	5212.02	521202	-125	126	-0.14	-14
-327	101	10317	99228	0.98198	297.98198	149.48198	14948.19819	0.98198	297.982	149.48198	14948.19821	0.98198	297.98198	149.48198	14948.19800	2020-01-01	2020-01-02	2020-01-01 00:05:27	2020-01-02 03:33:48	2020-01-01 00:05:27.000	2020-01-02 03:33:48.000	327	99228	49777.5	4977750	327	99228	49777.5	4977750	-32242	32693	5213.02	521302	-124	127	0.86	86
-328	101	10318	99229	0.98498	297.98498	149.48498	14948.49849	0.98498	297.985	149.48498	14948.49853	0.98498	297.98498	149.48498	14948.49800	2020-01-01	2020-01-02	2020-01-01 00:05:28	2020-01-02 03:33:49	2020-01-01 00:05:28.000	2020-01-02 03:33:49.000	328	99229	49778.5	4977850	328	99229	49778.5	4977850	-32241	32694	5214.02	521402	-128	127	-0.7	-70
-329	101	10319	99230	0.98798	297.98798	149.48798	14948.79879	0.98798	297.98798	149.48798	14948.79883	0.98798	297.98798	149.48798	14948.79800	2020-01-01	2020-01-02	2020-01-01 00:05:29	2020-01-02 03:33:50	2020-01-01 00:05:29.000	2020-01-02 03:33:50.000	329	99230	49779.5	4977950	329	99230	49779.5	4977950	-32240	32695	5215.02	521502	-128	127	-2.26	-226
+320	101	10310	99221	0.96096	297.96096	149.46096	14946.09609	0.96096	297.96097	149.46096	14946.09647	0.96096	297.96096	149.46096	14946.096	2020-01-01	2020-01-02	2020-01-01 00:05:20	2020-01-02 03:33:41	2020-01-01 00:05:20.000	2020-01-02 03:33:41.000	320	99221	49770.5	4977050	320	99221	49770.5	4977050	-32249	32686	5206.02	520602	-125	126	-1.02	-102
+321	101	10311	99222	0.96396	297.96396	149.46396	14946.39639	0.96396	297.96396	149.46396	14946.39613	0.96396	297.96396	149.46396000000001	14946.396	2020-01-01	2020-01-02	2020-01-01 00:05:21	2020-01-02 03:33:42	2020-01-01 00:05:21.000	2020-01-02 03:33:42.000	321	99222	49771.5	4977150	321	99222	49771.5	4977150	-32248	32687	5207.02	520702	-124	127	-0.02	-2
+322	101	10312	99223	0.96696	297.96696	149.46696	14946.69669	0.96696	297.96698	149.46696	14946.69674	0.96696	297.96696	149.46696	14946.696	2020-01-01	2020-01-02	2020-01-01 00:05:22	2020-01-02 03:33:43	2020-01-01 00:05:22.000	2020-01-02 03:33:43.000	322	99223	49772.5	4977250	322	99223	49772.5	4977250	-32247	32688	5208.02	520802	-128	127	-1.58	-158
+323	101	10313	99224	0.96996	297.96996	149.46996	14946.99699	0.96997	297.96997	149.46997	14946.99706	0.96996	297.96996	149.46996	14946.996	2020-01-01	2020-01-02	2020-01-01 00:05:23	2020-01-02 03:33:44	2020-01-01 00:05:23.000	2020-01-02 03:33:44.000	323	99224	49773.5	4977350	323	99224	49773.5	4977350	-32246	32689	5209.02	520902	-128	123	-3.14	-314
+324	101	10314	99225	0.97297	297.97297	149.47297	14947.29729	0.97297	297.97296	149.47297	14947.29737	0.97297	297.97297	149.47297	14947.297	2020-01-01	2020-01-02	2020-01-01 00:05:24	2020-01-02 03:33:45	2020-01-01 00:05:24.000	2020-01-02 03:33:45.000	324	99225	49774.5	4977450	324	99225	49774.5	4977450	-32245	32690	5210.02	521002	-127	124	-2.14	-214
+325	101	10315	99226	0.97597	297.97597	149.47597	14947.59759	0.97597	297.97598	149.47597	14947.59794	0.97597	297.97597	149.47597	14947.597	2020-01-01	2020-01-02	2020-01-01 00:05:25	2020-01-02 03:33:46	2020-01-01 00:05:25.000	2020-01-02 03:33:46.000	325	99226	49775.5	4977550	325	99226	49775.5	4977550	-32244	32691	5211.02	521102	-126	125	-1.14	-114
+326	101	10316	99227	0.97897	297.97897	149.47897	14947.89789	0.97897	297.97897	149.47897	14947.8976	0.97897	297.97897	149.47897	14947.897	2020-01-01	2020-01-02	2020-01-01 00:05:26	2020-01-02 03:33:47	2020-01-01 00:05:26.000	2020-01-02 03:33:47.000	326	99227	49776.5	4977650	326	99227	49776.5	4977650	-32243	32692	5212.02	521202	-125	126	-0.14	-14
+327	101	10317	99228	0.98198	297.98198	149.48198	14948.19819	0.98198	297.982	149.48198	14948.19821	0.98198	297.98198	149.48198	14948.198	2020-01-01	2020-01-02	2020-01-01 00:05:27	2020-01-02 03:33:48	2020-01-01 00:05:27.000	2020-01-02 03:33:48.000	327	99228	49777.5	4977750	327	99228	49777.5	4977750	-32242	32693	5213.02	521302	-124	127	0.86	86
+328	101	10318	99229	0.98498	297.98498	149.48498	14948.49849	0.98498	297.985	149.48498	14948.49853	0.98498	297.98498	149.48498	14948.498	2020-01-01	2020-01-02	2020-01-01 00:05:28	2020-01-02 03:33:49	2020-01-01 00:05:28.000	2020-01-02 03:33:49.000	328	99229	49778.5	4977850	328	99229	49778.5	4977850	-32241	32694	5214.02	521402	-128	127	-0.7	-70
+329	101	10319	99230	0.98798	297.98798	149.48798	14948.79879	0.98798	297.98798	149.48798	14948.79883	0.98798	297.98798	149.48798	14948.798	2020-01-01	2020-01-02	2020-01-01 00:05:29	2020-01-02 03:33:50	2020-01-01 00:05:29.000	2020-01-02 03:33:50.000	329	99230	49779.5	4977950	329	99230	49779.5	4977950	-32240	32695	5215.02	521502	-128	127	-2.26	-226
 33	102	10023	99933	0.09909	300.09909	150.09909	15160.009	0.09909	300.0991	150.0991	15160.00913	0.09909	300.09909	150.09909	15160.00809	2020-01-01	2020-01-02	2020-01-01 00:00:33	2020-01-02 03:45:33	2020-01-01 00:00:33.000	2020-01-02 03:45:33.000	33	99933	49983	5048283	33	99933	49983	5048283	-32536	32399	4562.009900990099	460763	-125	126	-0.36633663366336633	-37
-330	101	10320	99231	0.99099	297.99099	149.49099	14949.09909	0.99099	297.991	149.49099	14949.09941	0.99099	297.99099	149.49099	14949.09900	2020-01-01	2020-01-02	2020-01-01 00:05:30	2020-01-02 03:33:51	2020-01-01 00:05:30.000	2020-01-02 03:33:51.000	330	99231	49780.5	4978050	330	99231	49780.5	4978050	-32239	32696	5216.02	521602	-128	123	-3.82	-382
-331	101	10321	99232	0.99399	297.99399	149.49399	14949.39939	0.99399	297.994	149.49399	14949.39911	0.99399	297.99399	149.49399	14949.39900	2020-01-01	2020-01-02	2020-01-01 00:05:31	2020-01-02 03:33:52	2020-01-01 00:05:31.000	2020-01-02 03:33:52.000	331	99232	49781.5	4978150	331	99232	49781.5	4978150	-32238	32697	5217.02	521702	-127	124	-2.82	-282
-332	101	10322	99233	0.99699	297.99699	149.49699	14949.69969	0.99699	297.997	149.49699	14949.69969	0.99699	297.99699	149.49699	14949.69900	2020-01-01	2020-01-02	2020-01-01 00:05:32	2020-01-02 03:33:53	2020-01-01 00:05:32.000	2020-01-02 03:33:53.000	332	99233	49782.5	4978250	332	99233	49782.5	4978250	-32237	32698	5218.02	521802	-126	125	-1.82	-182
-333	101	10323	99234	1	298	149.5	14950	1	298	149.5	14950	1.00000	298.00000	149.5	14950.00000	2020-01-01	2020-01-02	2020-01-01 00:05:33	2020-01-02 03:33:54	2020-01-01 00:05:33.000	2020-01-02 03:33:54.000	333	99234	49783.5	4978350	333	99234	49783.5	4978350	-32236	32699	5219.02	521902	-125	126	-0.82	-82
-334	101	10324	99235	1.003	298.003	149.503	14950.3003	1.003	298.003	149.503	14950.30029	1.00300	298.00300	149.503	14950.30000	2020-01-01	2020-01-02	2020-01-01 00:05:34	2020-01-02 03:33:55	2020-01-01 00:05:34.000	2020-01-02 03:33:55.000	334	99235	49784.5	4978450	334	99235	49784.5	4978450	-32235	32700	5220.02	522002	-124	127	0.18	18
-335	101	10325	99236	1.006	298.006	149.506	14950.6006	1.006	298.006	149.506	14950.60088	1.00600	298.00600	149.506	14950.60000	2020-01-01	2020-01-02	2020-01-01 00:05:35	2020-01-02 03:33:56	2020-01-01 00:05:35.000	2020-01-02 03:33:56.000	335	99236	49785.5	4978550	335	99236	49785.5	4978550	-32234	32701	5221.02	522102	-128	127	-1.38	-138
-336	101	10326	99237	1.009	298.009	149.509	14950.9009	1.009	298.009	149.509	14950.90057	1.00900	298.00900	149.509	14950.90000	2020-01-01	2020-01-02	2020-01-01 00:05:36	2020-01-02 03:33:57	2020-01-01 00:05:36.000	2020-01-02 03:33:57.000	336	99237	49786.5	4978650	336	99237	49786.5	4978650	-32233	32702	5222.02	522202	-128	123	-2.94	-294
-337	101	10327	99238	1.01201	298.01201	149.51201	14951.2012	1.01201	298.01202	149.51201	14951.20117	1.01201	298.01201	149.51201	14951.20100	2020-01-01	2020-01-02	2020-01-01 00:05:37	2020-01-02 03:33:58	2020-01-01 00:05:37.000	2020-01-02 03:33:58.000	337	99238	49787.5	4978750	337	99238	49787.5	4978750	-32232	32703	5223.02	522302	-127	124	-1.94	-194
-338	101	10328	99239	1.01501	298.01501	149.51501	14951.5015	1.01501	298.015	149.51501	14951.50146	1.01501	298.01501	149.51501	14951.50100	2020-01-01	2020-01-02	2020-01-01 00:05:38	2020-01-02 03:33:59	2020-01-01 00:05:38.000	2020-01-02 03:33:59.000	338	99239	49788.5	4978850	338	99239	49788.5	4978850	-32231	32704	5224.02	522402	-126	125	-0.94	-94
-339	101	10329	99240	1.01801	298.01801	149.51801	14951.8018	1.01801	298.018	149.51801	14951.80177	1.01801	298.01801	149.51801	14951.80100	2020-01-01	2020-01-02	2020-01-01 00:05:39	2020-01-02 03:34:00	2020-01-01 00:05:39.000	2020-01-02 03:34:00.000	339	99240	49789.5	4978950	339	99240	49789.5	4978950	-32230	32705	5225.02	522502	-125	126	0.06	6
-34	102	10024	99934	0.1021	300.1021	150.1021	15160.31231	0.1021	300.1021	150.1021	15160.31224	0.10210	300.10210	150.10209999999998	15160.31210	2020-01-01	2020-01-02	2020-01-01 00:00:34	2020-01-02 03:45:34	2020-01-01 00:00:34.000	2020-01-02 03:45:34.000	34	99934	49984	5048384	34	99934	49984	5048384	-32535	32400	4563.009900990099	460864	-124	127	0.6336633663366337	64
-340	101	10330	99241	1.02102	298.02102	149.52102	14952.1021	1.02102	298.02103	149.52102	14952.10239	1.02102	298.02102	149.52102000000002	14952.10200	2020-01-01	2020-01-02	2020-01-01 00:05:40	2020-01-02 03:34:01	2020-01-01 00:05:40.000	2020-01-02 03:34:01.000	340	99241	49790.5	4979050	340	99241	49790.5	4979050	-32229	32706	5226.02	522602	-124	127	1.06	106
-341	101	10331	99242	1.02402	298.02402	149.52402	14952.4024	1.02402	298.02402	149.52402	14952.40205	1.02402	298.02402	149.52402	14952.40200	2020-01-01	2020-01-02	2020-01-01 00:05:41	2020-01-02 03:34:02	2020-01-01 00:05:41.000	2020-01-02 03:34:02.000	341	99242	49791.5	4979150	341	99242	49791.5	4979150	-32228	32707	5227.02	522702	-128	127	-0.5	-50
-342	101	10332	99243	1.02702	298.02702	149.52702	14952.7027	1.02702	298.02704	149.52702	14952.70264	1.02702	298.02702	149.52702	14952.70200	2020-01-01	2020-01-02	2020-01-01 00:05:42	2020-01-02 03:34:03	2020-01-01 00:05:42.000	2020-01-02 03:34:03.000	342	99243	49792.5	4979250	342	99243	49792.5	4979250	-32227	32708	5228.02	522802	-128	123	-2.06	-206
-343	101	10333	99244	1.03003	298.03003	149.53003	14953.003	1.03003	298.03003	149.53002	14953.00293	1.03003	298.03003	149.53003	14953.00300	2020-01-01	2020-01-02	2020-01-01 00:05:43	2020-01-02 03:34:04	2020-01-01 00:05:43.000	2020-01-02 03:34:04.000	343	99244	49793.5	4979350	343	99244	49793.5	4979350	-32226	32709	5229.02	522902	-127	124	-1.06	-106
-344	101	10334	99245	1.03303	298.03303	149.53303	14953.3033	1.03303	298.03302	149.53303	14953.30323	1.03303	298.03303	149.53303	14953.30300	2020-01-01	2020-01-02	2020-01-01 00:05:44	2020-01-02 03:34:05	2020-01-01 00:05:44.000	2020-01-02 03:34:05.000	344	99245	49794.5	4979450	344	99245	49794.5	4979450	-32225	32710	5230.02	523002	-126	125	-0.06	-6
-345	101	10335	99246	1.03603	298.03603	149.53603	14953.6036	1.03603	298.03604	149.53603	14953.60386	1.03603	298.03603	149.53602999999998	14953.60300	2020-01-01	2020-01-02	2020-01-01 00:05:45	2020-01-02 03:34:06	2020-01-01 00:05:45.000	2020-01-02 03:34:06.000	345	99246	49795.5	4979550	345	99246	49795.5	4979550	-32224	32711	5231.02	523102	-125	126	0.94	94
-346	101	10336	99247	1.03903	298.03903	149.53903	14953.9039	1.03903	298.03903	149.53903	14953.90352	1.03903	298.03903	149.53903	14953.90300	2020-01-01	2020-01-02	2020-01-01 00:05:46	2020-01-02 03:34:07	2020-01-01 00:05:46.000	2020-01-02 03:34:07.000	346	99247	49796.5	4979650	346	99247	49796.5	4979650	-32223	32712	5232.02	523202	-124	127	1.94	194
-347	101	10337	99248	1.04204	298.04204	149.54204	14954.2042	1.04204	298.04205	149.54204	14954.20427	1.04204	298.04204	149.54204	14954.20400	2020-01-01	2020-01-02	2020-01-01 00:05:47	2020-01-02 03:34:08	2020-01-01 00:05:47.000	2020-01-02 03:34:08.000	347	99248	49797.5	4979750	347	99248	49797.5	4979750	-32222	32713	5233.02	523302	-128	127	0.38	38
-348	101	10338	99249	1.04504	298.04504	149.54504	14954.5045	1.04504	298.04504	149.54504	14954.50441	1.04504	298.04504	149.54504	14954.50400	2020-01-01	2020-01-02	2020-01-01 00:05:48	2020-01-02 03:34:09	2020-01-01 00:05:48.000	2020-01-02 03:34:09.000	348	99249	49798.5	4979850	348	99249	49798.5	4979850	-32221	32714	5234.02	523402	-128	123	-1.18	-118
-349	101	10339	99250	1.04804	298.04804	149.54804	14954.8048	1.04804	298.04803	149.54804	14954.80474	1.04804	298.04804	149.54804000000001	14954.80400	2020-01-01	2020-01-02	2020-01-01 00:05:49	2020-01-02 03:34:10	2020-01-01 00:05:49.000	2020-01-02 03:34:10.000	349	99250	49799.5	4979950	349	99250	49799.5	4979950	-32220	32715	5235.02	523502	-127	124	-0.18	-18
-35	102	10025	99935	0.1051	300.1051	150.1051	15160.61561	0.1051	300.1051	150.1051	15160.61542	0.10510	300.10510	150.10510000000002	15160.61510	2020-01-01	2020-01-02	2020-01-01 00:00:35	2020-01-02 03:45:35	2020-01-01 00:00:35.000	2020-01-02 03:45:35.000	35	99935	49985	5048485	35	99935	49985	5048485	-32534	32401	4564.009900990099	460965	-128	127	-0.900990099009901	-91
-350	101	10340	99251	1.05105	298.05105	149.55105	14955.1051	1.05105	298.05106	149.55105	14955.10532	1.05105	298.05105	149.55105	14955.10500	2020-01-01	2020-01-02	2020-01-01 00:05:50	2020-01-02 03:34:11	2020-01-01 00:05:50.000	2020-01-02 03:34:11.000	350	99251	49800.5	4980050	350	99251	49800.5	4980050	-32219	32716	5236.02	523602	-126	125	0.82	82
-351	101	10341	99252	1.05405	298.05405	149.55405	14955.4054	1.05405	298.05405	149.55404	14955.40499	1.05405	298.05405	149.55405000000002	14955.40500	2020-01-01	2020-01-02	2020-01-01 00:05:51	2020-01-02 03:34:12	2020-01-01 00:05:51.000	2020-01-02 03:34:12.000	351	99252	49801.5	4980150	351	99252	49801.5	4980150	-32218	32717	5237.02	523702	-125	126	1.82	182
-352	101	10342	99253	1.05705	298.05705	149.55705	14955.7057	1.05705	298.05707	149.55705	14955.70574	1.05705	298.05705	149.55705	14955.70500	2020-01-01	2020-01-02	2020-01-01 00:05:52	2020-01-02 03:34:13	2020-01-01 00:05:52.000	2020-01-02 03:34:13.000	352	99253	49802.5	4980250	352	99253	49802.5	4980250	-32217	32718	5238.02	523802	-124	127	2.82	282
-353	101	10343	99254	1.06006	298.06006	149.56006	14956.006	1.06006	298.06006	149.56005	14956.00587	1.06006	298.06006	149.56006	14956.00600	2020-01-01	2020-01-02	2020-01-01 00:05:53	2020-01-02 03:34:14	2020-01-01 00:05:53.000	2020-01-02 03:34:14.000	353	99254	49803.5	4980350	353	99254	49803.5	4980350	-32216	32719	5239.02	523902	-128	127	1.26	126
-354	101	10344	99255	1.06306	298.06306	149.56306	14956.3063	1.06306	298.06305	149.56306	14956.3062	1.06306	298.06306	149.56306	14956.30600	2020-01-01	2020-01-02	2020-01-01 00:05:54	2020-01-02 03:34:15	2020-01-01 00:05:54.000	2020-01-02 03:34:15.000	354	99255	49804.5	4980450	354	99255	49804.5	4980450	-32215	32720	5240.02	524002	-128	127	-0.3	-30
-355	101	10345	99256	1.06606	298.06606	149.56606	14956.6066	1.06606	298.06607	149.56606	14956.6068	1.06606	298.06606	149.56606	14956.60600	2020-01-01	2020-01-02	2020-01-01 00:05:55	2020-01-02 03:34:16	2020-01-01 00:05:55.000	2020-01-02 03:34:16.000	355	99256	49805.5	4980550	355	99256	49805.5	4980550	-32214	32721	5241.02	524102	-128	123	-1.86	-186
-356	101	10346	99257	1.06906	298.06906	149.56906	14956.9069	1.06906	298.06906	149.56907	14956.90709	1.06906	298.06906	149.56906	14956.90600	2020-01-01	2020-01-02	2020-01-01 00:05:56	2020-01-02 03:34:17	2020-01-01 00:05:56.000	2020-01-02 03:34:17.000	356	99257	49806.5	4980650	356	99257	49806.5	4980650	-32213	32722	5242.02	524202	-127	124	-0.86	-86
-357	101	10347	99258	1.07207	298.07207	149.57207	14957.2072	1.07207	298.07208	149.57207	14957.20721	1.07207	298.07207	149.57207	14957.20700	2020-01-01	2020-01-02	2020-01-01 00:05:57	2020-01-02 03:34:18	2020-01-01 00:05:57.000	2020-01-02 03:34:18.000	357	99258	49807.5	4980750	357	99258	49807.5	4980750	-32212	32723	5243.02	524302	-126	125	0.14	14
-358	101	10348	99259	1.07507	298.07507	149.57507	14957.5075	1.07507	298.07507	149.57507	14957.50734	1.07507	298.07507	149.57506999999998	14957.50700	2020-01-01	2020-01-02	2020-01-01 00:05:58	2020-01-02 03:34:19	2020-01-01 00:05:58.000	2020-01-02 03:34:19.000	358	99259	49808.5	4980850	358	99259	49808.5	4980850	-32211	32724	5244.02	524402	-125	126	1.14	114
-359	101	10349	99260	1.07807	298.07807	149.57807	14957.8078	1.07807	298.07806	149.57807	14957.80767	1.07807	298.07807	149.57807	14957.80700	2020-01-01	2020-01-02	2020-01-01 00:05:59	2020-01-02 03:34:20	2020-01-01 00:05:59.000	2020-01-02 03:34:20.000	359	99260	49809.5	4980950	359	99260	49809.5	4980950	-32210	32725	5245.02	524502	-124	127	2.14	214
-36	102	10026	99936	0.1081	300.1081	150.1081	15160.91891	0.1081	300.1081	150.1081	15160.91873	0.10810	300.10810	150.1081	15160.91810	2020-01-01	2020-01-02	2020-01-01 00:00:36	2020-01-02 03:45:36	2020-01-01 00:00:36.000	2020-01-02 03:45:36.000	36	99936	49986	5048586	36	99936	49986	5048586	-32533	32402	4565.009900990099	461066	-128	123	-2.4356435643564356	-246
-360	101	10350	99261	1.08108	298.08108	149.58108	14958.1081	1.08108	298.0811	149.58108	14958.10827	1.08108	298.08108	149.58108000000001	14958.10800	2020-01-01	2020-01-02	2020-01-01 00:06:00	2020-01-02 03:34:21	2020-01-01 00:06:00.000	2020-01-02 03:34:21.000	360	99261	49810.5	4981050	360	99261	49810.5	4981050	-32209	32726	5246.02	524602	-128	127	0.58	58
-361	101	10351	99262	1.08408	298.08408	149.58408	14958.4084	1.08408	298.08408	149.58408	14958.40856	1.08408	298.08408	149.58408	14958.40800	2020-01-01	2020-01-02	2020-01-01 00:06:01	2020-01-02 03:34:22	2020-01-01 00:06:01.000	2020-01-02 03:34:22.000	361	99262	49811.5	4981150	361	99262	49811.5	4981150	-32208	32727	5247.02	524702	-128	123	-0.98	-98
-362	101	10352	99263	1.08708	298.08708	149.58708	14958.7087	1.08708	298.0871	149.58708	14958.70868	1.08708	298.08708	149.58708000000001	14958.70800	2020-01-01	2020-01-02	2020-01-01 00:06:02	2020-01-02 03:34:23	2020-01-01 00:06:02.000	2020-01-02 03:34:23.000	362	99263	49812.5	4981250	362	99263	49812.5	4981250	-32207	32728	5248.02	524802	-127	124	0.02	2
-363	101	10353	99264	1.09009	298.09009	149.59009	14959.009	1.09009	298.0901	149.59008	14959.00884	1.09009	298.09009	149.59009	14959.00900	2020-01-01	2020-01-02	2020-01-01 00:06:03	2020-01-02 03:34:24	2020-01-01 00:06:03.000	2020-01-02 03:34:24.000	363	99264	49813.5	4981350	363	99264	49813.5	4981350	-32206	32729	5249.02	524902	-126	125	1.02	102
-364	101	10354	99265	1.09309	298.09309	149.59309	14959.3093	1.09309	298.09308	149.59309	14959.30915	1.09309	298.09309	149.59309	14959.30900	2020-01-01	2020-01-02	2020-01-01 00:06:04	2020-01-02 03:34:25	2020-01-01 00:06:04.000	2020-01-02 03:34:25.000	364	99265	49814.5	4981450	364	99265	49814.5	4981450	-32205	32730	5250.02	525002	-125	126	2.02	202
-365	101	10355	99266	1.09609	298.09609	149.59609	14959.6096	1.09609	298.0961	149.59609	14959.6099	1.09609	298.09609	149.59609	14959.60900	2020-01-01	2020-01-02	2020-01-01 00:06:05	2020-01-02 03:34:26	2020-01-01 00:06:05.000	2020-01-02 03:34:26.000	365	99266	49815.5	4981550	365	99266	49815.5	4981550	-32204	32731	5251.02	525102	-124	127	3.02	302
-366	101	10356	99267	1.09909	298.09909	149.59909	14959.9099	1.09909	298.0991	149.5991	14959.91003	1.09909	298.09909	149.59909	14959.90900	2020-01-01	2020-01-02	2020-01-01 00:06:06	2020-01-02 03:34:27	2020-01-01 00:06:06.000	2020-01-02 03:34:27.000	366	99267	49816.5	4981650	366	99267	49816.5	4981650	-32203	32732	5252.02	525202	-128	127	1.46	146
-367	101	10357	99268	1.1021	298.1021	149.6021	14960.21021	1.1021	298.1021	149.6021	14960.21015	1.10210	298.10210	149.60209999999998	14960.21000	2020-01-01	2020-01-02	2020-01-01 00:06:07	2020-01-02 03:34:28	2020-01-01 00:06:07.000	2020-01-02 03:34:28.000	367	99268	49817.5	4981750	367	99268	49817.5	4981750	-32202	32733	5253.02	525302	-128	123	-0.1	-10
-368	101	10358	99269	1.1051	298.1051	149.6051	14960.51051	1.1051	298.1051	149.6051	14960.51031	1.10510	298.10510	149.6051	14960.51000	2020-01-01	2020-01-02	2020-01-01 00:06:08	2020-01-02 03:34:29	2020-01-01 00:06:08.000	2020-01-02 03:34:29.000	368	99269	49818.5	4981850	368	99269	49818.5	4981850	-32201	32734	5254.02	525402	-127	124	0.9	90
-369	101	10359	99270	1.1081	298.1081	149.6081	14960.81081	1.1081	298.1081	149.6081	14960.81062	1.10810	298.10810	149.6081	14960.81000	2020-01-01	2020-01-02	2020-01-01 00:06:09	2020-01-02 03:34:30	2020-01-01 00:06:09.000	2020-01-02 03:34:30.000	369	99270	49819.5	4981950	369	99270	49819.5	4981950	-32200	32735	5255.02	525502	-126	125	1.9	190
+330	101	10320	99231	0.99099	297.99099	149.49099	14949.09909	0.99099	297.991	149.49099	14949.09941	0.99099	297.99099	149.49099	14949.099	2020-01-01	2020-01-02	2020-01-01 00:05:30	2020-01-02 03:33:51	2020-01-01 00:05:30.000	2020-01-02 03:33:51.000	330	99231	49780.5	4978050	330	99231	49780.5	4978050	-32239	32696	5216.02	521602	-128	123	-3.82	-382
+331	101	10321	99232	0.99399	297.99399	149.49399	14949.39939	0.99399	297.994	149.49399	14949.39911	0.99399	297.99399	149.49399	14949.399	2020-01-01	2020-01-02	2020-01-01 00:05:31	2020-01-02 03:33:52	2020-01-01 00:05:31.000	2020-01-02 03:33:52.000	331	99232	49781.5	4978150	331	99232	49781.5	4978150	-32238	32697	5217.02	521702	-127	124	-2.82	-282
+332	101	10322	99233	0.99699	297.99699	149.49699	14949.69969	0.99699	297.997	149.49699	14949.69969	0.99699	297.99699	149.49699	14949.699	2020-01-01	2020-01-02	2020-01-01 00:05:32	2020-01-02 03:33:53	2020-01-01 00:05:32.000	2020-01-02 03:33:53.000	332	99233	49782.5	4978250	332	99233	49782.5	4978250	-32237	32698	5218.02	521802	-126	125	-1.82	-182
+333	101	10323	99234	1	298	149.5	14950	1	298	149.5	14950	1	298	149.5	14950	2020-01-01	2020-01-02	2020-01-01 00:05:33	2020-01-02 03:33:54	2020-01-01 00:05:33.000	2020-01-02 03:33:54.000	333	99234	49783.5	4978350	333	99234	49783.5	4978350	-32236	32699	5219.02	521902	-125	126	-0.82	-82
+334	101	10324	99235	1.003	298.003	149.503	14950.3003	1.003	298.003	149.503	14950.30029	1.003	298.003	149.503	14950.3	2020-01-01	2020-01-02	2020-01-01 00:05:34	2020-01-02 03:33:55	2020-01-01 00:05:34.000	2020-01-02 03:33:55.000	334	99235	49784.5	4978450	334	99235	49784.5	4978450	-32235	32700	5220.02	522002	-124	127	0.18	18
+335	101	10325	99236	1.006	298.006	149.506	14950.6006	1.006	298.006	149.506	14950.60088	1.006	298.006	149.506	14950.6	2020-01-01	2020-01-02	2020-01-01 00:05:35	2020-01-02 03:33:56	2020-01-01 00:05:35.000	2020-01-02 03:33:56.000	335	99236	49785.5	4978550	335	99236	49785.5	4978550	-32234	32701	5221.02	522102	-128	127	-1.38	-138
+336	101	10326	99237	1.009	298.009	149.509	14950.9009	1.009	298.009	149.509	14950.90057	1.009	298.009	149.509	14950.9	2020-01-01	2020-01-02	2020-01-01 00:05:36	2020-01-02 03:33:57	2020-01-01 00:05:36.000	2020-01-02 03:33:57.000	336	99237	49786.5	4978650	336	99237	49786.5	4978650	-32233	32702	5222.02	522202	-128	123	-2.94	-294
+337	101	10327	99238	1.01201	298.01201	149.51201	14951.2012	1.01201	298.01202	149.51201	14951.20117	1.01201	298.01201	149.51201	14951.201	2020-01-01	2020-01-02	2020-01-01 00:05:37	2020-01-02 03:33:58	2020-01-01 00:05:37.000	2020-01-02 03:33:58.000	337	99238	49787.5	4978750	337	99238	49787.5	4978750	-32232	32703	5223.02	522302	-127	124	-1.94	-194
+338	101	10328	99239	1.01501	298.01501	149.51501	14951.5015	1.01501	298.015	149.51501	14951.50146	1.01501	298.01501	149.51501	14951.501	2020-01-01	2020-01-02	2020-01-01 00:05:38	2020-01-02 03:33:59	2020-01-01 00:05:38.000	2020-01-02 03:33:59.000	338	99239	49788.5	4978850	338	99239	49788.5	4978850	-32231	32704	5224.02	522402	-126	125	-0.94	-94
+339	101	10329	99240	1.01801	298.01801	149.51801	14951.8018	1.01801	298.018	149.51801	14951.80177	1.01801	298.01801	149.51801	14951.801	2020-01-01	2020-01-02	2020-01-01 00:05:39	2020-01-02 03:34:00	2020-01-01 00:05:39.000	2020-01-02 03:34:00.000	339	99240	49789.5	4978950	339	99240	49789.5	4978950	-32230	32705	5225.02	522502	-125	126	0.06	6
+34	102	10024	99934	0.1021	300.1021	150.1021	15160.31231	0.1021	300.1021	150.1021	15160.31224	0.1021	300.1021	150.10209999999998	15160.3121	2020-01-01	2020-01-02	2020-01-01 00:00:34	2020-01-02 03:45:34	2020-01-01 00:00:34.000	2020-01-02 03:45:34.000	34	99934	49984	5048384	34	99934	49984	5048384	-32535	32400	4563.009900990099	460864	-124	127	0.6336633663366337	64
+340	101	10330	99241	1.02102	298.02102	149.52102	14952.1021	1.02102	298.02103	149.52102	14952.10239	1.02102	298.02102	149.52102000000002	14952.102	2020-01-01	2020-01-02	2020-01-01 00:05:40	2020-01-02 03:34:01	2020-01-01 00:05:40.000	2020-01-02 03:34:01.000	340	99241	49790.5	4979050	340	99241	49790.5	4979050	-32229	32706	5226.02	522602	-124	127	1.06	106
+341	101	10331	99242	1.02402	298.02402	149.52402	14952.4024	1.02402	298.02402	149.52402	14952.40205	1.02402	298.02402	149.52402	14952.402	2020-01-01	2020-01-02	2020-01-01 00:05:41	2020-01-02 03:34:02	2020-01-01 00:05:41.000	2020-01-02 03:34:02.000	341	99242	49791.5	4979150	341	99242	49791.5	4979150	-32228	32707	5227.02	522702	-128	127	-0.5	-50
+342	101	10332	99243	1.02702	298.02702	149.52702	14952.7027	1.02702	298.02704	149.52702	14952.70264	1.02702	298.02702	149.52702	14952.702	2020-01-01	2020-01-02	2020-01-01 00:05:42	2020-01-02 03:34:03	2020-01-01 00:05:42.000	2020-01-02 03:34:03.000	342	99243	49792.5	4979250	342	99243	49792.5	4979250	-32227	32708	5228.02	522802	-128	123	-2.06	-206
+343	101	10333	99244	1.03003	298.03003	149.53003	14953.003	1.03003	298.03003	149.53002	14953.00293	1.03003	298.03003	149.53003	14953.003	2020-01-01	2020-01-02	2020-01-01 00:05:43	2020-01-02 03:34:04	2020-01-01 00:05:43.000	2020-01-02 03:34:04.000	343	99244	49793.5	4979350	343	99244	49793.5	4979350	-32226	32709	5229.02	522902	-127	124	-1.06	-106
+344	101	10334	99245	1.03303	298.03303	149.53303	14953.3033	1.03303	298.03302	149.53303	14953.30323	1.03303	298.03303	149.53303	14953.303	2020-01-01	2020-01-02	2020-01-01 00:05:44	2020-01-02 03:34:05	2020-01-01 00:05:44.000	2020-01-02 03:34:05.000	344	99245	49794.5	4979450	344	99245	49794.5	4979450	-32225	32710	5230.02	523002	-126	125	-0.06	-6
+345	101	10335	99246	1.03603	298.03603	149.53603	14953.6036	1.03603	298.03604	149.53603	14953.60386	1.03603	298.03603	149.53602999999998	14953.603	2020-01-01	2020-01-02	2020-01-01 00:05:45	2020-01-02 03:34:06	2020-01-01 00:05:45.000	2020-01-02 03:34:06.000	345	99246	49795.5	4979550	345	99246	49795.5	4979550	-32224	32711	5231.02	523102	-125	126	0.94	94
+346	101	10336	99247	1.03903	298.03903	149.53903	14953.9039	1.03903	298.03903	149.53903	14953.90352	1.03903	298.03903	149.53903	14953.903	2020-01-01	2020-01-02	2020-01-01 00:05:46	2020-01-02 03:34:07	2020-01-01 00:05:46.000	2020-01-02 03:34:07.000	346	99247	49796.5	4979650	346	99247	49796.5	4979650	-32223	32712	5232.02	523202	-124	127	1.94	194
+347	101	10337	99248	1.04204	298.04204	149.54204	14954.2042	1.04204	298.04205	149.54204	14954.20427	1.04204	298.04204	149.54204	14954.204	2020-01-01	2020-01-02	2020-01-01 00:05:47	2020-01-02 03:34:08	2020-01-01 00:05:47.000	2020-01-02 03:34:08.000	347	99248	49797.5	4979750	347	99248	49797.5	4979750	-32222	32713	5233.02	523302	-128	127	0.38	38
+348	101	10338	99249	1.04504	298.04504	149.54504	14954.5045	1.04504	298.04504	149.54504	14954.50441	1.04504	298.04504	149.54504	14954.504	2020-01-01	2020-01-02	2020-01-01 00:05:48	2020-01-02 03:34:09	2020-01-01 00:05:48.000	2020-01-02 03:34:09.000	348	99249	49798.5	4979850	348	99249	49798.5	4979850	-32221	32714	5234.02	523402	-128	123	-1.18	-118
+349	101	10339	99250	1.04804	298.04804	149.54804	14954.8048	1.04804	298.04803	149.54804	14954.80474	1.04804	298.04804	149.54804000000001	14954.804	2020-01-01	2020-01-02	2020-01-01 00:05:49	2020-01-02 03:34:10	2020-01-01 00:05:49.000	2020-01-02 03:34:10.000	349	99250	49799.5	4979950	349	99250	49799.5	4979950	-32220	32715	5235.02	523502	-127	124	-0.18	-18
+35	102	10025	99935	0.1051	300.1051	150.1051	15160.61561	0.1051	300.1051	150.1051	15160.61542	0.1051	300.1051	150.10510000000002	15160.6151	2020-01-01	2020-01-02	2020-01-01 00:00:35	2020-01-02 03:45:35	2020-01-01 00:00:35.000	2020-01-02 03:45:35.000	35	99935	49985	5048485	35	99935	49985	5048485	-32534	32401	4564.009900990099	460965	-128	127	-0.900990099009901	-91
+350	101	10340	99251	1.05105	298.05105	149.55105	14955.1051	1.05105	298.05106	149.55105	14955.10532	1.05105	298.05105	149.55105	14955.105	2020-01-01	2020-01-02	2020-01-01 00:05:50	2020-01-02 03:34:11	2020-01-01 00:05:50.000	2020-01-02 03:34:11.000	350	99251	49800.5	4980050	350	99251	49800.5	4980050	-32219	32716	5236.02	523602	-126	125	0.82	82
+351	101	10341	99252	1.05405	298.05405	149.55405	14955.4054	1.05405	298.05405	149.55404	14955.40499	1.05405	298.05405	149.55405000000002	14955.405	2020-01-01	2020-01-02	2020-01-01 00:05:51	2020-01-02 03:34:12	2020-01-01 00:05:51.000	2020-01-02 03:34:12.000	351	99252	49801.5	4980150	351	99252	49801.5	4980150	-32218	32717	5237.02	523702	-125	126	1.82	182
+352	101	10342	99253	1.05705	298.05705	149.55705	14955.7057	1.05705	298.05707	149.55705	14955.70574	1.05705	298.05705	149.55705	14955.705	2020-01-01	2020-01-02	2020-01-01 00:05:52	2020-01-02 03:34:13	2020-01-01 00:05:52.000	2020-01-02 03:34:13.000	352	99253	49802.5	4980250	352	99253	49802.5	4980250	-32217	32718	5238.02	523802	-124	127	2.82	282
+353	101	10343	99254	1.06006	298.06006	149.56006	14956.006	1.06006	298.06006	149.56005	14956.00587	1.06006	298.06006	149.56006	14956.006	2020-01-01	2020-01-02	2020-01-01 00:05:53	2020-01-02 03:34:14	2020-01-01 00:05:53.000	2020-01-02 03:34:14.000	353	99254	49803.5	4980350	353	99254	49803.5	4980350	-32216	32719	5239.02	523902	-128	127	1.26	126
+354	101	10344	99255	1.06306	298.06306	149.56306	14956.3063	1.06306	298.06305	149.56306	14956.3062	1.06306	298.06306	149.56306	14956.306	2020-01-01	2020-01-02	2020-01-01 00:05:54	2020-01-02 03:34:15	2020-01-01 00:05:54.000	2020-01-02 03:34:15.000	354	99255	49804.5	4980450	354	99255	49804.5	4980450	-32215	32720	5240.02	524002	-128	127	-0.3	-30
+355	101	10345	99256	1.06606	298.06606	149.56606	14956.6066	1.06606	298.06607	149.56606	14956.6068	1.06606	298.06606	149.56606	14956.606	2020-01-01	2020-01-02	2020-01-01 00:05:55	2020-01-02 03:34:16	2020-01-01 00:05:55.000	2020-01-02 03:34:16.000	355	99256	49805.5	4980550	355	99256	49805.5	4980550	-32214	32721	5241.02	524102	-128	123	-1.86	-186
+356	101	10346	99257	1.06906	298.06906	149.56906	14956.9069	1.06906	298.06906	149.56907	14956.90709	1.06906	298.06906	149.56906	14956.906	2020-01-01	2020-01-02	2020-01-01 00:05:56	2020-01-02 03:34:17	2020-01-01 00:05:56.000	2020-01-02 03:34:17.000	356	99257	49806.5	4980650	356	99257	49806.5	4980650	-32213	32722	5242.02	524202	-127	124	-0.86	-86
+357	101	10347	99258	1.07207	298.07207	149.57207	14957.2072	1.07207	298.07208	149.57207	14957.20721	1.07207	298.07207	149.57207	14957.207	2020-01-01	2020-01-02	2020-01-01 00:05:57	2020-01-02 03:34:18	2020-01-01 00:05:57.000	2020-01-02 03:34:18.000	357	99258	49807.5	4980750	357	99258	49807.5	4980750	-32212	32723	5243.02	524302	-126	125	0.14	14
+358	101	10348	99259	1.07507	298.07507	149.57507	14957.5075	1.07507	298.07507	149.57507	14957.50734	1.07507	298.07507	149.57506999999998	14957.507	2020-01-01	2020-01-02	2020-01-01 00:05:58	2020-01-02 03:34:19	2020-01-01 00:05:58.000	2020-01-02 03:34:19.000	358	99259	49808.5	4980850	358	99259	49808.5	4980850	-32211	32724	5244.02	524402	-125	126	1.14	114
+359	101	10349	99260	1.07807	298.07807	149.57807	14957.8078	1.07807	298.07806	149.57807	14957.80767	1.07807	298.07807	149.57807	14957.807	2020-01-01	2020-01-02	2020-01-01 00:05:59	2020-01-02 03:34:20	2020-01-01 00:05:59.000	2020-01-02 03:34:20.000	359	99260	49809.5	4980950	359	99260	49809.5	4980950	-32210	32725	5245.02	524502	-124	127	2.14	214
+36	102	10026	99936	0.1081	300.1081	150.1081	15160.91891	0.1081	300.1081	150.1081	15160.91873	0.1081	300.1081	150.1081	15160.9181	2020-01-01	2020-01-02	2020-01-01 00:00:36	2020-01-02 03:45:36	2020-01-01 00:00:36.000	2020-01-02 03:45:36.000	36	99936	49986	5048586	36	99936	49986	5048586	-32533	32402	4565.009900990099	461066	-128	123	-2.4356435643564356	-246
+360	101	10350	99261	1.08108	298.08108	149.58108	14958.1081	1.08108	298.0811	149.58108	14958.10827	1.08108	298.08108	149.58108000000001	14958.108	2020-01-01	2020-01-02	2020-01-01 00:06:00	2020-01-02 03:34:21	2020-01-01 00:06:00.000	2020-01-02 03:34:21.000	360	99261	49810.5	4981050	360	99261	49810.5	4981050	-32209	32726	5246.02	524602	-128	127	0.58	58
+361	101	10351	99262	1.08408	298.08408	149.58408	14958.4084	1.08408	298.08408	149.58408	14958.40856	1.08408	298.08408	149.58408	14958.408	2020-01-01	2020-01-02	2020-01-01 00:06:01	2020-01-02 03:34:22	2020-01-01 00:06:01.000	2020-01-02 03:34:22.000	361	99262	49811.5	4981150	361	99262	49811.5	4981150	-32208	32727	5247.02	524702	-128	123	-0.98	-98
+362	101	10352	99263	1.08708	298.08708	149.58708	14958.7087	1.08708	298.0871	149.58708	14958.70868	1.08708	298.08708	149.58708000000001	14958.708	2020-01-01	2020-01-02	2020-01-01 00:06:02	2020-01-02 03:34:23	2020-01-01 00:06:02.000	2020-01-02 03:34:23.000	362	99263	49812.5	4981250	362	99263	49812.5	4981250	-32207	32728	5248.02	524802	-127	124	0.02	2
+363	101	10353	99264	1.09009	298.09009	149.59009	14959.009	1.09009	298.0901	149.59008	14959.00884	1.09009	298.09009	149.59009	14959.009	2020-01-01	2020-01-02	2020-01-01 00:06:03	2020-01-02 03:34:24	2020-01-01 00:06:03.000	2020-01-02 03:34:24.000	363	99264	49813.5	4981350	363	99264	49813.5	4981350	-32206	32729	5249.02	524902	-126	125	1.02	102
+364	101	10354	99265	1.09309	298.09309	149.59309	14959.3093	1.09309	298.09308	149.59309	14959.30915	1.09309	298.09309	149.59309	14959.309	2020-01-01	2020-01-02	2020-01-01 00:06:04	2020-01-02 03:34:25	2020-01-01 00:06:04.000	2020-01-02 03:34:25.000	364	99265	49814.5	4981450	364	99265	49814.5	4981450	-32205	32730	5250.02	525002	-125	126	2.02	202
+365	101	10355	99266	1.09609	298.09609	149.59609	14959.6096	1.09609	298.0961	149.59609	14959.6099	1.09609	298.09609	149.59609	14959.609	2020-01-01	2020-01-02	2020-01-01 00:06:05	2020-01-02 03:34:26	2020-01-01 00:06:05.000	2020-01-02 03:34:26.000	365	99266	49815.5	4981550	365	99266	49815.5	4981550	-32204	32731	5251.02	525102	-124	127	3.02	302
+366	101	10356	99267	1.09909	298.09909	149.59909	14959.9099	1.09909	298.0991	149.5991	14959.91003	1.09909	298.09909	149.59909	14959.909	2020-01-01	2020-01-02	2020-01-01 00:06:06	2020-01-02 03:34:27	2020-01-01 00:06:06.000	2020-01-02 03:34:27.000	366	99267	49816.5	4981650	366	99267	49816.5	4981650	-32203	32732	5252.02	525202	-128	127	1.46	146
+367	101	10357	99268	1.1021	298.1021	149.6021	14960.21021	1.1021	298.1021	149.6021	14960.21015	1.1021	298.1021	149.60209999999998	14960.21	2020-01-01	2020-01-02	2020-01-01 00:06:07	2020-01-02 03:34:28	2020-01-01 00:06:07.000	2020-01-02 03:34:28.000	367	99268	49817.5	4981750	367	99268	49817.5	4981750	-32202	32733	5253.02	525302	-128	123	-0.1	-10
+368	101	10358	99269	1.1051	298.1051	149.6051	14960.51051	1.1051	298.1051	149.6051	14960.51031	1.1051	298.1051	149.6051	14960.51	2020-01-01	2020-01-02	2020-01-01 00:06:08	2020-01-02 03:34:29	2020-01-01 00:06:08.000	2020-01-02 03:34:29.000	368	99269	49818.5	4981850	368	99269	49818.5	4981850	-32201	32734	5254.02	525402	-127	124	0.9	90
+369	101	10359	99270	1.1081	298.1081	149.6081	14960.81081	1.1081	298.1081	149.6081	14960.81062	1.1081	298.1081	149.6081	14960.81	2020-01-01	2020-01-02	2020-01-01 00:06:09	2020-01-02 03:34:30	2020-01-01 00:06:09.000	2020-01-02 03:34:30.000	369	99270	49819.5	4981950	369	99270	49819.5	4981950	-32200	32735	5255.02	525502	-126	125	1.9	190
 37	102	10027	99937	0.11111	300.11111	150.11111	15161.22222	0.11111	300.1111	150.11111	15161.22248	0.11111	300.11111	150.11111	15161.22211	2020-01-01	2020-01-02	2020-01-01 00:00:37	2020-01-02 03:45:37	2020-01-01 00:00:37.000	2020-01-02 03:45:37.000	37	99937	49987	5048687	37	99937	49987	5048687	-32532	32403	4566.009900990099	461167	-127	124	-1.4356435643564356	-145
-370	101	10360	99271	1.11111	298.11111	149.61111	14961.11111	1.11111	298.1111	149.61111	14961.11137	1.11111	298.11111	149.61111	14961.11100	2020-01-01	2020-01-02	2020-01-01 00:06:10	2020-01-02 03:34:31	2020-01-01 00:06:10.000	2020-01-02 03:34:31.000	370	99271	49820.5	4982050	370	99271	49820.5	4982050	-32199	32736	5256.02	525602	-125	126	2.9	290
-371	101	10361	99272	1.11411	298.11411	149.61411	14961.41141	1.11411	298.1141	149.61411	14961.4115	1.11411	298.11411	149.61411	14961.41100	2020-01-01	2020-01-02	2020-01-01 00:06:11	2020-01-02 03:34:32	2020-01-01 00:06:11.000	2020-01-02 03:34:32.000	371	99272	49821.5	4982150	371	99272	49821.5	4982150	-32198	32737	5257.02	525702	-124	127	3.9	390
-372	101	10362	99273	1.11711	298.11711	149.61711	14961.71171	1.11711	298.11713	149.61711	14961.71165	1.11711	298.11711	149.61711	14961.71100	2020-01-01	2020-01-02	2020-01-01 00:06:12	2020-01-02 03:34:33	2020-01-01 00:06:12.000	2020-01-02 03:34:33.000	372	99273	49822.5	4982250	372	99273	49822.5	4982250	-32197	32738	5258.02	525802	-128	127	2.34	234
-373	101	10363	99274	1.12012	298.12012	149.62012	14962.01201	1.12012	298.12012	149.62011	14962.01179	1.12012	298.12012	149.62012000000001	14962.01200	2020-01-01	2020-01-02	2020-01-01 00:06:13	2020-01-02 03:34:34	2020-01-01 00:06:13.000	2020-01-02 03:34:34.000	373	99274	49823.5	4982350	373	99274	49823.5	4982350	-32196	32739	5259.02	525902	-128	123	0.78	78
-374	101	10364	99275	1.12312	298.12312	149.62312	14962.31231	1.12312	298.1231	149.62312	14962.31208	1.12312	298.12312	149.62312	14962.31200	2020-01-01	2020-01-02	2020-01-01 00:06:14	2020-01-02 03:34:35	2020-01-01 00:06:14.000	2020-01-02 03:34:35.000	374	99275	49824.5	4982450	374	99275	49824.5	4982450	-32195	32740	5260.02	526002	-127	124	1.78	178
-375	101	10365	99276	1.12612	298.12612	149.62612	14962.61261	1.12612	298.12613	149.62612	14962.61283	1.12612	298.12612	149.62612	14962.61200	2020-01-01	2020-01-02	2020-01-01 00:06:15	2020-01-02 03:34:36	2020-01-01 00:06:15.000	2020-01-02 03:34:36.000	375	99276	49825.5	4982550	375	99276	49825.5	4982550	-32194	32741	5261.02	526102	-126	125	2.78	278
-376	101	10366	99277	1.12912	298.12912	149.62912	14962.91291	1.12912	298.12912	149.62912	14962.91297	1.12912	298.12912	149.62912	14962.91200	2020-01-01	2020-01-02	2020-01-01 00:06:16	2020-01-02 03:34:37	2020-01-01 00:06:16.000	2020-01-02 03:34:37.000	376	99277	49826.5	4982650	376	99277	49826.5	4982650	-32193	32742	5262.02	526202	-125	126	3.78	378
-377	101	10367	99278	1.13213	298.13213	149.63213	14963.21321	1.13213	298.13214	149.63213	14963.21312	1.13213	298.13213	149.63213	14963.21300	2020-01-01	2020-01-02	2020-01-01 00:06:17	2020-01-02 03:34:38	2020-01-01 00:06:17.000	2020-01-02 03:34:38.000	377	99278	49827.5	4982750	377	99278	49827.5	4982750	-32192	32743	5263.02	526302	-124	127	4.78	478
-378	101	10368	99279	1.13513	298.13513	149.63513	14963.51351	1.13513	298.13513	149.63513	14963.51326	1.13513	298.13513	149.63513	14963.51300	2020-01-01	2020-01-02	2020-01-01 00:06:18	2020-01-02 03:34:39	2020-01-01 00:06:18.000	2020-01-02 03:34:39.000	378	99279	49828.5	4982850	378	99279	49828.5	4982850	-32191	32744	5264.02	526402	-128	127	3.22	322
-379	101	10369	99280	1.13813	298.13813	149.63813	14963.81381	1.13813	298.13815	149.63814	14963.81401	1.13813	298.13813	149.63813	14963.81300	2020-01-01	2020-01-02	2020-01-01 00:06:19	2020-01-02 03:34:40	2020-01-01 00:06:19.000	2020-01-02 03:34:40.000	379	99280	49829.5	4982950	379	99280	49829.5	4982950	-32190	32745	5265.02	526502	-128	127	1.66	166
+370	101	10360	99271	1.11111	298.11111	149.61111	14961.11111	1.11111	298.1111	149.61111	14961.11137	1.11111	298.11111	149.61111	14961.111	2020-01-01	2020-01-02	2020-01-01 00:06:10	2020-01-02 03:34:31	2020-01-01 00:06:10.000	2020-01-02 03:34:31.000	370	99271	49820.5	4982050	370	99271	49820.5	4982050	-32199	32736	5256.02	525602	-125	126	2.9	290
+371	101	10361	99272	1.11411	298.11411	149.61411	14961.41141	1.11411	298.1141	149.61411	14961.4115	1.11411	298.11411	149.61411	14961.411	2020-01-01	2020-01-02	2020-01-01 00:06:11	2020-01-02 03:34:32	2020-01-01 00:06:11.000	2020-01-02 03:34:32.000	371	99272	49821.5	4982150	371	99272	49821.5	4982150	-32198	32737	5257.02	525702	-124	127	3.9	390
+372	101	10362	99273	1.11711	298.11711	149.61711	14961.71171	1.11711	298.11713	149.61711	14961.71165	1.11711	298.11711	149.61711	14961.711	2020-01-01	2020-01-02	2020-01-01 00:06:12	2020-01-02 03:34:33	2020-01-01 00:06:12.000	2020-01-02 03:34:33.000	372	99273	49822.5	4982250	372	99273	49822.5	4982250	-32197	32738	5258.02	525802	-128	127	2.34	234
+373	101	10363	99274	1.12012	298.12012	149.62012	14962.01201	1.12012	298.12012	149.62011	14962.01179	1.12012	298.12012	149.62012000000001	14962.012	2020-01-01	2020-01-02	2020-01-01 00:06:13	2020-01-02 03:34:34	2020-01-01 00:06:13.000	2020-01-02 03:34:34.000	373	99274	49823.5	4982350	373	99274	49823.5	4982350	-32196	32739	5259.02	525902	-128	123	0.78	78
+374	101	10364	99275	1.12312	298.12312	149.62312	14962.31231	1.12312	298.1231	149.62312	14962.31208	1.12312	298.12312	149.62312	14962.312	2020-01-01	2020-01-02	2020-01-01 00:06:14	2020-01-02 03:34:35	2020-01-01 00:06:14.000	2020-01-02 03:34:35.000	374	99275	49824.5	4982450	374	99275	49824.5	4982450	-32195	32740	5260.02	526002	-127	124	1.78	178
+375	101	10365	99276	1.12612	298.12612	149.62612	14962.61261	1.12612	298.12613	149.62612	14962.61283	1.12612	298.12612	149.62612	14962.612	2020-01-01	2020-01-02	2020-01-01 00:06:15	2020-01-02 03:34:36	2020-01-01 00:06:15.000	2020-01-02 03:34:36.000	375	99276	49825.5	4982550	375	99276	49825.5	4982550	-32194	32741	5261.02	526102	-126	125	2.78	278
+376	101	10366	99277	1.12912	298.12912	149.62912	14962.91291	1.12912	298.12912	149.62912	14962.91297	1.12912	298.12912	149.62912	14962.912	2020-01-01	2020-01-02	2020-01-01 00:06:16	2020-01-02 03:34:37	2020-01-01 00:06:16.000	2020-01-02 03:34:37.000	376	99277	49826.5	4982650	376	99277	49826.5	4982650	-32193	32742	5262.02	526202	-125	126	3.78	378
+377	101	10367	99278	1.13213	298.13213	149.63213	14963.21321	1.13213	298.13214	149.63213	14963.21312	1.13213	298.13213	149.63213	14963.213	2020-01-01	2020-01-02	2020-01-01 00:06:17	2020-01-02 03:34:38	2020-01-01 00:06:17.000	2020-01-02 03:34:38.000	377	99278	49827.5	4982750	377	99278	49827.5	4982750	-32192	32743	5263.02	526302	-124	127	4.78	478
+378	101	10368	99279	1.13513	298.13513	149.63513	14963.51351	1.13513	298.13513	149.63513	14963.51326	1.13513	298.13513	149.63513	14963.513	2020-01-01	2020-01-02	2020-01-01 00:06:18	2020-01-02 03:34:39	2020-01-01 00:06:18.000	2020-01-02 03:34:39.000	378	99279	49828.5	4982850	378	99279	49828.5	4982850	-32191	32744	5264.02	526402	-128	127	3.22	322
+379	101	10369	99280	1.13813	298.13813	149.63813	14963.81381	1.13813	298.13815	149.63814	14963.81401	1.13813	298.13813	149.63813	14963.813	2020-01-01	2020-01-02	2020-01-01 00:06:19	2020-01-02 03:34:40	2020-01-01 00:06:19.000	2020-01-02 03:34:40.000	379	99280	49829.5	4982950	379	99280	49829.5	4982950	-32190	32745	5265.02	526502	-128	127	1.66	166
 38	102	10028	99938	0.11411	300.11411	150.11411	15161.52552	0.11411	300.1141	150.11411	15161.52562	0.11411	300.11411	150.11411	15161.52511	2020-01-01	2020-01-02	2020-01-01 00:00:38	2020-01-02 03:45:38	2020-01-01 00:00:38.000	2020-01-02 03:45:38.000	38	99938	49988	5048788	38	99938	49988	5048788	-32531	32404	4567.009900990099	461268	-126	125	-0.43564356435643564	-44
-380	101	10370	99281	1.14114	298.14114	149.64114	14964.11411	1.14114	298.14114	149.64114	14964.11431	1.14114	298.14114	149.64114	14964.11400	2020-01-01	2020-01-02	2020-01-01 00:06:20	2020-01-02 03:34:41	2020-01-01 00:06:20.000	2020-01-02 03:34:41.000	380	99281	49830.5	4983050	380	99281	49830.5	4983050	-32189	32746	5266.02	526602	-128	124	0.1	10
-381	101	10371	99282	1.14414	298.14414	149.64414	14964.41441	1.14414	298.14413	149.64414	14964.41448	1.14414	298.14414	149.64414	14964.41400	2020-01-01	2020-01-02	2020-01-01 00:06:21	2020-01-02 03:34:42	2020-01-01 00:06:21.000	2020-01-02 03:34:42.000	381	99282	49831.5	4983150	381	99282	49831.5	4983150	-32188	32747	5267.02	526702	-127	125	1.1	110
-382	101	10372	99283	1.14714	298.14714	149.64714	14964.71471	1.14714	298.14716	149.64714	14964.71459	1.14714	298.14714	149.64714	14964.71400	2020-01-01	2020-01-02	2020-01-01 00:06:22	2020-01-02 03:34:43	2020-01-01 00:06:22.000	2020-01-02 03:34:43.000	382	99283	49832.5	4983250	382	99283	49832.5	4983250	-32187	32748	5268.02	526802	-126	126	2.1	210
-383	101	10373	99284	1.15015	298.15015	149.65015	14965.01501	1.15015	298.15015	149.65014	14965.01472	1.15015	298.15015	149.65015	14965.01500	2020-01-01	2020-01-02	2020-01-01 00:06:23	2020-01-02 03:34:44	2020-01-01 00:06:23.000	2020-01-02 03:34:44.000	383	99284	49833.5	4983350	383	99284	49833.5	4983350	-32186	32749	5269.02	526902	-125	127	3.1	310
-384	101	10374	99285	1.15315	298.15315	149.65315	14965.31531	1.15315	298.15317	149.65315	14965.31547	1.15315	298.15315	149.65315	14965.31500	2020-01-01	2020-01-02	2020-01-01 00:06:24	2020-01-02 03:34:45	2020-01-01 00:06:24.000	2020-01-02 03:34:45.000	384	99285	49834.5	4983450	384	99285	49834.5	4983450	-32185	32750	5270.02	527002	-128	127	1.54	154
-385	101	10375	99286	1.15615	298.15615	149.65615	14965.61561	1.15615	298.15616	149.65615	14965.61578	1.15615	298.15615	149.65615	14965.61500	2020-01-01	2020-01-02	2020-01-01 00:06:25	2020-01-02 03:34:46	2020-01-01 00:06:25.000	2020-01-02 03:34:46.000	385	99286	49835.5	4983550	385	99286	49835.5	4983550	-32184	32751	5271.02	527102	-128	127	-0.02	-2
-386	101	10376	99287	1.15915	298.15915	149.65915	14965.91591	1.15915	298.15915	149.65915	14965.91594	1.15915	298.15915	149.65915	14965.91500	2020-01-01	2020-01-02	2020-01-01 00:06:26	2020-01-02 03:34:47	2020-01-01 00:06:26.000	2020-01-02 03:34:47.000	386	99287	49836.5	4983650	386	99287	49836.5	4983650	-32183	32752	5272.02	527202	-128	123	-1.58	-158
-387	101	10377	99288	1.16216	298.16216	149.66216	14966.21621	1.16216	298.16217	149.66216	14966.21606	1.16216	298.16216	149.66216	14966.21600	2020-01-01	2020-01-02	2020-01-01 00:06:27	2020-01-02 03:34:48	2020-01-01 00:06:27.000	2020-01-02 03:34:48.000	387	99288	49837.5	4983750	387	99288	49837.5	4983750	-32182	32753	5273.02	527302	-127	124	-0.58	-58
-388	101	10378	99289	1.16516	298.16516	149.66516	14966.51651	1.16516	298.16516	149.66516	14966.51636	1.16516	298.16516	149.66516	14966.51600	2020-01-01	2020-01-02	2020-01-01 00:06:28	2020-01-02 03:34:49	2020-01-01 00:06:28.000	2020-01-02 03:34:49.000	388	99289	49838.5	4983850	388	99289	49838.5	4983850	-32181	32754	5274.02	527402	-126	125	0.42	42
-389	101	10379	99290	1.16816	298.16816	149.66816	14966.81681	1.16816	298.16818	149.66816	14966.81695	1.16816	298.16816	149.66816	14966.81600	2020-01-01	2020-01-02	2020-01-01 00:06:29	2020-01-02 03:34:50	2020-01-01 00:06:29.000	2020-01-02 03:34:50.000	389	99290	49839.5	4983950	389	99290	49839.5	4983950	-32180	32755	5275.02	527502	-125	126	1.42	142
+380	101	10370	99281	1.14114	298.14114	149.64114	14964.11411	1.14114	298.14114	149.64114	14964.11431	1.14114	298.14114	149.64114	14964.114	2020-01-01	2020-01-02	2020-01-01 00:06:20	2020-01-02 03:34:41	2020-01-01 00:06:20.000	2020-01-02 03:34:41.000	380	99281	49830.5	4983050	380	99281	49830.5	4983050	-32189	32746	5266.02	526602	-128	124	0.1	10
+381	101	10371	99282	1.14414	298.14414	149.64414	14964.41441	1.14414	298.14413	149.64414	14964.41448	1.14414	298.14414	149.64414	14964.414	2020-01-01	2020-01-02	2020-01-01 00:06:21	2020-01-02 03:34:42	2020-01-01 00:06:21.000	2020-01-02 03:34:42.000	381	99282	49831.5	4983150	381	99282	49831.5	4983150	-32188	32747	5267.02	526702	-127	125	1.1	110
+382	101	10372	99283	1.14714	298.14714	149.64714	14964.71471	1.14714	298.14716	149.64714	14964.71459	1.14714	298.14714	149.64714	14964.714	2020-01-01	2020-01-02	2020-01-01 00:06:22	2020-01-02 03:34:43	2020-01-01 00:06:22.000	2020-01-02 03:34:43.000	382	99283	49832.5	4983250	382	99283	49832.5	4983250	-32187	32748	5268.02	526802	-126	126	2.1	210
+383	101	10373	99284	1.15015	298.15015	149.65015	14965.01501	1.15015	298.15015	149.65014	14965.01472	1.15015	298.15015	149.65015	14965.015	2020-01-01	2020-01-02	2020-01-01 00:06:23	2020-01-02 03:34:44	2020-01-01 00:06:23.000	2020-01-02 03:34:44.000	383	99284	49833.5	4983350	383	99284	49833.5	4983350	-32186	32749	5269.02	526902	-125	127	3.1	310
+384	101	10374	99285	1.15315	298.15315	149.65315	14965.31531	1.15315	298.15317	149.65315	14965.31547	1.15315	298.15315	149.65315	14965.315	2020-01-01	2020-01-02	2020-01-01 00:06:24	2020-01-02 03:34:45	2020-01-01 00:06:24.000	2020-01-02 03:34:45.000	384	99285	49834.5	4983450	384	99285	49834.5	4983450	-32185	32750	5270.02	527002	-128	127	1.54	154
+385	101	10375	99286	1.15615	298.15615	149.65615	14965.61561	1.15615	298.15616	149.65615	14965.61578	1.15615	298.15615	149.65615	14965.615	2020-01-01	2020-01-02	2020-01-01 00:06:25	2020-01-02 03:34:46	2020-01-01 00:06:25.000	2020-01-02 03:34:46.000	385	99286	49835.5	4983550	385	99286	49835.5	4983550	-32184	32751	5271.02	527102	-128	127	-0.02	-2
+386	101	10376	99287	1.15915	298.15915	149.65915	14965.91591	1.15915	298.15915	149.65915	14965.91594	1.15915	298.15915	149.65915	14965.915	2020-01-01	2020-01-02	2020-01-01 00:06:26	2020-01-02 03:34:47	2020-01-01 00:06:26.000	2020-01-02 03:34:47.000	386	99287	49836.5	4983650	386	99287	49836.5	4983650	-32183	32752	5272.02	527202	-128	123	-1.58	-158
+387	101	10377	99288	1.16216	298.16216	149.66216	14966.21621	1.16216	298.16217	149.66216	14966.21606	1.16216	298.16216	149.66216	14966.216	2020-01-01	2020-01-02	2020-01-01 00:06:27	2020-01-02 03:34:48	2020-01-01 00:06:27.000	2020-01-02 03:34:48.000	387	99288	49837.5	4983750	387	99288	49837.5	4983750	-32182	32753	5273.02	527302	-127	124	-0.58	-58
+388	101	10378	99289	1.16516	298.16516	149.66516	14966.51651	1.16516	298.16516	149.66516	14966.51636	1.16516	298.16516	149.66516	14966.516	2020-01-01	2020-01-02	2020-01-01 00:06:28	2020-01-02 03:34:49	2020-01-01 00:06:28.000	2020-01-02 03:34:49.000	388	99289	49838.5	4983850	388	99289	49838.5	4983850	-32181	32754	5274.02	527402	-126	125	0.42	42
+389	101	10379	99290	1.16816	298.16816	149.66816	14966.81681	1.16816	298.16818	149.66816	14966.81695	1.16816	298.16816	149.66816	14966.816	2020-01-01	2020-01-02	2020-01-01 00:06:29	2020-01-02 03:34:50	2020-01-01 00:06:29.000	2020-01-02 03:34:50.000	389	99290	49839.5	4983950	389	99290	49839.5	4983950	-32180	32755	5275.02	527502	-125	126	1.42	142
 39	102	10029	99939	0.11711	300.11711	150.11711	15161.82882	0.11711	300.11713	150.11711	15161.82876	0.11711	300.11711	150.11711	15161.82811	2020-01-01	2020-01-02	2020-01-01 00:00:39	2020-01-02 03:45:39	2020-01-01 00:00:39.000	2020-01-02 03:45:39.000	39	99939	49989	5048889	39	99939	49989	5048889	-32530	32405	4568.009900990099	461369	-125	126	0.5643564356435643	57
-390	101	10380	99291	1.17117	298.17117	149.67117	14967.11711	1.17117	298.17117	149.67117	14967.11725	1.17117	298.17117	149.67117	14967.11700	2020-01-01	2020-01-02	2020-01-01 00:06:30	2020-01-02 03:34:51	2020-01-01 00:06:30.000	2020-01-02 03:34:51.000	390	99291	49840.5	4984050	390	99291	49840.5	4984050	-32179	32756	5276.02	527602	-124	127	2.42	242
-391	101	10381	99292	1.17417	298.17417	149.67417	14967.41741	1.17417	298.17416	149.67417	14967.41741	1.17417	298.17417	149.67417	14967.41700	2020-01-01	2020-01-02	2020-01-01 00:06:31	2020-01-02 03:34:52	2020-01-01 00:06:31.000	2020-01-02 03:34:52.000	391	99292	49841.5	4984150	391	99292	49841.5	4984150	-32178	32757	5277.02	527702	-128	127	0.86	86
-392	101	10382	99293	1.17717	298.17717	149.67717	14967.71771	1.17717	298.1772	149.67717	14967.71753	1.17717	298.17717	149.67717000000002	14967.71700	2020-01-01	2020-01-02	2020-01-01 00:06:32	2020-01-02 03:34:53	2020-01-01 00:06:32.000	2020-01-02 03:34:53.000	392	99293	49842.5	4984250	392	99293	49842.5	4984250	-32177	32758	5278.02	527802	-128	123	-0.7	-70
-393	101	10383	99294	1.18018	298.18018	149.68018	14968.01801	1.18018	298.18018	149.68017	14968.01782	1.18018	298.18018	149.68018	14968.01800	2020-01-01	2020-01-02	2020-01-01 00:06:33	2020-01-02 03:34:54	2020-01-01 00:06:33.000	2020-01-02 03:34:54.000	393	99294	49843.5	4984350	393	99294	49843.5	4984350	-32176	32759	5279.02	527902	-127	124	0.3	30
-394	101	10384	99295	1.18318	298.18318	149.68318	14968.31831	1.18318	298.1832	149.68318	14968.31842	1.18318	298.18318	149.68318	14968.31800	2020-01-01	2020-01-02	2020-01-01 00:06:34	2020-01-02 03:34:55	2020-01-01 00:06:34.000	2020-01-02 03:34:55.000	394	99295	49844.5	4984450	394	99295	49844.5	4984450	-32175	32760	5280.02	528002	-126	125	1.3	130
-395	101	10385	99296	1.18618	298.18618	149.68618	14968.61861	1.18618	298.1862	149.68618	14968.61875	1.18618	298.18618	149.68618	14968.61800	2020-01-01	2020-01-02	2020-01-01 00:06:35	2020-01-02 03:34:56	2020-01-01 00:06:35.000	2020-01-02 03:34:56.000	395	99296	49845.5	4984550	395	99296	49845.5	4984550	-32174	32761	5281.02	528102	-125	126	2.3	230
-396	101	10386	99297	1.18918	298.18918	149.68918	14968.91891	1.18918	298.18918	149.68918	14968.91889	1.18918	298.18918	149.68918	14968.91800	2020-01-01	2020-01-02	2020-01-01 00:06:36	2020-01-02 03:34:57	2020-01-01 00:06:36.000	2020-01-02 03:34:57.000	396	99297	49846.5	4984650	396	99297	49846.5	4984650	-32173	32762	5282.02	528202	-124	127	3.3	330
-397	101	10387	99298	1.19219	298.19219	149.69219	14969.21921	1.19219	298.1922	149.69219	14969.21964	1.19219	298.19219	149.69218999999998	14969.21900	2020-01-01	2020-01-02	2020-01-01 00:06:37	2020-01-02 03:34:58	2020-01-01 00:06:37.000	2020-01-02 03:34:58.000	397	99298	49847.5	4984750	397	99298	49847.5	4984750	-32172	32763	5283.02	528302	-128	127	1.74	174
-398	101	10388	99299	1.19519	298.19519	149.69519	14969.51951	1.19519	298.1952	149.69519	14969.51929	1.19519	298.19519	149.69519	14969.51900	2020-01-01	2020-01-02	2020-01-01 00:06:38	2020-01-02 03:34:59	2020-01-01 00:06:38.000	2020-01-02 03:34:59.000	398	99299	49848.5	4984850	398	99299	49848.5	4984850	-32171	32764	5284.02	528402	-128	123	0.18	18
-399	101	10389	99300	1.19819	298.19819	149.69819	14969.81981	1.19819	298.1982	149.69819	14969.81989	1.19819	298.19819	149.69818999999998	14969.81900	2020-01-01	2020-01-02	2020-01-01 00:06:39	2020-01-02 03:35:00	2020-01-01 00:06:39.000	2020-01-02 03:35:00.000	399	99300	49849.5	4984950	399	99300	49849.5	4984950	-32170	32765	5285.02	528502	-127	124	1.18	118
+390	101	10380	99291	1.17117	298.17117	149.67117	14967.11711	1.17117	298.17117	149.67117	14967.11725	1.17117	298.17117	149.67117	14967.117	2020-01-01	2020-01-02	2020-01-01 00:06:30	2020-01-02 03:34:51	2020-01-01 00:06:30.000	2020-01-02 03:34:51.000	390	99291	49840.5	4984050	390	99291	49840.5	4984050	-32179	32756	5276.02	527602	-124	127	2.42	242
+391	101	10381	99292	1.17417	298.17417	149.67417	14967.41741	1.17417	298.17416	149.67417	14967.41741	1.17417	298.17417	149.67417	14967.417	2020-01-01	2020-01-02	2020-01-01 00:06:31	2020-01-02 03:34:52	2020-01-01 00:06:31.000	2020-01-02 03:34:52.000	391	99292	49841.5	4984150	391	99292	49841.5	4984150	-32178	32757	5277.02	527702	-128	127	0.86	86
+392	101	10382	99293	1.17717	298.17717	149.67717	14967.71771	1.17717	298.1772	149.67717	14967.71753	1.17717	298.17717	149.67717000000002	14967.717	2020-01-01	2020-01-02	2020-01-01 00:06:32	2020-01-02 03:34:53	2020-01-01 00:06:32.000	2020-01-02 03:34:53.000	392	99293	49842.5	4984250	392	99293	49842.5	4984250	-32177	32758	5278.02	527802	-128	123	-0.7	-70
+393	101	10383	99294	1.18018	298.18018	149.68018	14968.01801	1.18018	298.18018	149.68017	14968.01782	1.18018	298.18018	149.68018	14968.018	2020-01-01	2020-01-02	2020-01-01 00:06:33	2020-01-02 03:34:54	2020-01-01 00:06:33.000	2020-01-02 03:34:54.000	393	99294	49843.5	4984350	393	99294	49843.5	4984350	-32176	32759	5279.02	527902	-127	124	0.3	30
+394	101	10384	99295	1.18318	298.18318	149.68318	14968.31831	1.18318	298.1832	149.68318	14968.31842	1.18318	298.18318	149.68318	14968.318	2020-01-01	2020-01-02	2020-01-01 00:06:34	2020-01-02 03:34:55	2020-01-01 00:06:34.000	2020-01-02 03:34:55.000	394	99295	49844.5	4984450	394	99295	49844.5	4984450	-32175	32760	5280.02	528002	-126	125	1.3	130
+395	101	10385	99296	1.18618	298.18618	149.68618	14968.61861	1.18618	298.1862	149.68618	14968.61875	1.18618	298.18618	149.68618	14968.618	2020-01-01	2020-01-02	2020-01-01 00:06:35	2020-01-02 03:34:56	2020-01-01 00:06:35.000	2020-01-02 03:34:56.000	395	99296	49845.5	4984550	395	99296	49845.5	4984550	-32174	32761	5281.02	528102	-125	126	2.3	230
+396	101	10386	99297	1.18918	298.18918	149.68918	14968.91891	1.18918	298.18918	149.68918	14968.91889	1.18918	298.18918	149.68918	14968.918	2020-01-01	2020-01-02	2020-01-01 00:06:36	2020-01-02 03:34:57	2020-01-01 00:06:36.000	2020-01-02 03:34:57.000	396	99297	49846.5	4984650	396	99297	49846.5	4984650	-32173	32762	5282.02	528202	-124	127	3.3	330
+397	101	10387	99298	1.19219	298.19219	149.69219	14969.21921	1.19219	298.1922	149.69219	14969.21964	1.19219	298.19219	149.69218999999998	14969.219	2020-01-01	2020-01-02	2020-01-01 00:06:37	2020-01-02 03:34:58	2020-01-01 00:06:37.000	2020-01-02 03:34:58.000	397	99298	49847.5	4984750	397	99298	49847.5	4984750	-32172	32763	5283.02	528302	-128	127	1.74	174
+398	101	10388	99299	1.19519	298.19519	149.69519	14969.51951	1.19519	298.1952	149.69519	14969.51929	1.19519	298.19519	149.69519	14969.519	2020-01-01	2020-01-02	2020-01-01 00:06:38	2020-01-02 03:34:59	2020-01-01 00:06:38.000	2020-01-02 03:34:59.000	398	99299	49848.5	4984850	398	99299	49848.5	4984850	-32171	32764	5284.02	528402	-128	123	0.18	18
+399	101	10389	99300	1.19819	298.19819	149.69819	14969.81981	1.19819	298.1982	149.69819	14969.81989	1.19819	298.19819	149.69818999999998	14969.819	2020-01-01	2020-01-02	2020-01-01 00:06:39	2020-01-02 03:35:00	2020-01-01 00:06:39.000	2020-01-02 03:35:00.000	399	99300	49849.5	4984950	399	99300	49849.5	4984950	-32170	32765	5285.02	528502	-127	124	1.18	118
 4	102	1003	9994	0.01201	300.01201	150.01201	15151.21321	0.01201	300.01202	150.01201	15151.21318	0.01201	300.01201	150.01201	15151.21301	2020-01-01	2020-01-02	2020-01-01 00:00:04	2020-01-02 03:45:04	2020-01-01 00:00:04.000	2020-01-02 03:45:04.000	4	99904	49954	5045354	4	99904	49954	5045354	-32565	32370	4533.009900990099	457834	-128	127	-1.4851485148514851	-150
 40	102	10030	99940	0.12012	300.12012	150.12012	15162.13213	0.12012	300.12012	150.12011	15162.13191	0.12012	300.12012	150.12012000000001	15162.13212	2020-01-01	2020-01-02	2020-01-01 00:00:40	2020-01-02 03:45:40	2020-01-01 00:00:40.000	2020-01-02 03:45:40.000	40	99940	49990	5048990	40	99940	49990	5048990	-32529	32406	4569.009900990099	461470	-124	127	1.5643564356435644	158
-400	101	10390	99301	1.2012	298.2012	149.7012	14970.12012	1.2012	298.2012	149.7012	14970.12022	1.20120	298.20120	149.7012	14970.12000	2020-01-01	2020-01-02	2020-01-01 00:06:40	2020-01-02 03:35:01	2020-01-01 00:06:40.000	2020-01-02 03:35:01.000	400	99301	49850.5	4985050	400	99301	49850.5	4985050	-32169	32766	5286.02	528602	-126	125	2.18	218
-401	101	10391	99302	1.2042	298.2042	149.7042	14970.42042	1.2042	298.2042	149.7042	14970.42035	1.20420	298.20420	149.70420000000001	14970.42000	2020-01-01	2020-01-02	2020-01-01 00:06:41	2020-01-02 03:35:02	2020-01-01 00:06:41.000	2020-01-02 03:35:02.000	401	99302	49851.5	4985150	401	99302	49851.5	4985150	-32168	32767	5287.02	528702	-125	126	3.18	318
-402	101	10392	99303	1.2072	298.2072	149.7072	14970.72072	1.2072	298.2072	149.70721	14970.72111	1.20720	298.20720	149.7072	14970.72000	2020-01-01	2020-01-02	2020-01-01 00:06:42	2020-01-02 03:35:03	2020-01-01 00:06:42.000	2020-01-02 03:35:03.000	402	99303	49852.5	4985250	402	99303	49852.5	4985250	-32768	32370	4632.66	463266	-124	127	4.18	418
-403	101	10393	99304	1.21021	298.21021	149.71021	14971.02102	1.21021	298.2102	149.7102	14971.02077	1.21021	298.21021	149.71021000000002	14971.02100	2020-01-01	2020-01-02	2020-01-01 00:06:43	2020-01-02 03:35:04	2020-01-01 00:06:43.000	2020-01-02 03:35:04.000	403	99304	49853.5	4985350	403	99304	49853.5	4985350	-32767	32371	4633.66	463366	-128	127	2.62	262
-404	101	10394	99305	1.21321	298.21321	149.71321	14971.32132	1.21321	298.21323	149.71321	14971.32139	1.21321	298.21321	149.71321	14971.32100	2020-01-01	2020-01-02	2020-01-01 00:06:44	2020-01-02 03:35:05	2020-01-01 00:06:44.000	2020-01-02 03:35:05.000	404	99305	49854.5	4985450	404	99305	49854.5	4985450	-32766	32372	4634.66	463466	-128	127	1.06	106
-405	101	10395	99306	1.21621	298.21621	149.71621	14971.62162	1.21621	298.21622	149.71621	14971.62169	1.21621	298.21621	149.71621	14971.62100	2020-01-01	2020-01-02	2020-01-01 00:06:45	2020-01-02 03:35:06	2020-01-01 00:06:45.000	2020-01-02 03:35:06.000	405	99306	49855.5	4985550	405	99306	49855.5	4985550	-32765	32373	4635.66	463566	-128	124	-0.5	-50
-406	101	10396	99307	1.21921	298.21921	149.71921	14971.92192	1.21921	298.2192	149.71921	14971.92199	1.21921	298.21921	149.71921	14971.92100	2020-01-01	2020-01-02	2020-01-01 00:06:46	2020-01-02 03:35:07	2020-01-01 00:06:46.000	2020-01-02 03:35:07.000	406	99307	49856.5	4985650	406	99307	49856.5	4985650	-32764	32374	4636.66	463666	-127	125	0.5	50
-407	101	10397	99308	1.22222	298.22222	149.72222	14972.22222	1.22222	298.22223	149.72222	14972.22257	1.22222	298.22222	149.72222	14972.22200	2020-01-01	2020-01-02	2020-01-01 00:06:47	2020-01-02 03:35:08	2020-01-01 00:06:47.000	2020-01-02 03:35:08.000	407	99308	49857.5	4985750	407	99308	49857.5	4985750	-32763	32375	4637.66	463766	-126	126	1.5	150
-408	101	10398	99309	1.22522	298.22522	149.72522	14972.52252	1.22522	298.22522	149.72522	14972.52224	1.22522	298.22522	149.72522	14972.52200	2020-01-01	2020-01-02	2020-01-01 00:06:48	2020-01-02 03:35:09	2020-01-01 00:06:48.000	2020-01-02 03:35:09.000	408	99309	49858.5	4985850	408	99309	49858.5	4985850	-32762	32376	4638.66	463866	-125	127	2.5	250
-409	101	10399	99310	1.22822	298.22822	149.72822	14972.82282	1.22822	298.22824	149.72822	14972.82286	1.22822	298.22822	149.72822	14972.82200	2020-01-01	2020-01-02	2020-01-01 00:06:49	2020-01-02 03:35:10	2020-01-01 00:06:49.000	2020-01-02 03:35:10.000	409	99310	49859.5	4985950	409	99310	49859.5	4985950	-32761	32377	4639.66	463966	-128	127	0.94	94
+400	101	10390	99301	1.2012	298.2012	149.7012	14970.12012	1.2012	298.2012	149.7012	14970.12022	1.2012	298.2012	149.7012	14970.12	2020-01-01	2020-01-02	2020-01-01 00:06:40	2020-01-02 03:35:01	2020-01-01 00:06:40.000	2020-01-02 03:35:01.000	400	99301	49850.5	4985050	400	99301	49850.5	4985050	-32169	32766	5286.02	528602	-126	125	2.18	218
+401	101	10391	99302	1.2042	298.2042	149.7042	14970.42042	1.2042	298.2042	149.7042	14970.42035	1.2042	298.2042	149.70420000000001	14970.42	2020-01-01	2020-01-02	2020-01-01 00:06:41	2020-01-02 03:35:02	2020-01-01 00:06:41.000	2020-01-02 03:35:02.000	401	99302	49851.5	4985150	401	99302	49851.5	4985150	-32168	32767	5287.02	528702	-125	126	3.18	318
+402	101	10392	99303	1.2072	298.2072	149.7072	14970.72072	1.2072	298.2072	149.70721	14970.72111	1.2072	298.2072	149.7072	14970.72	2020-01-01	2020-01-02	2020-01-01 00:06:42	2020-01-02 03:35:03	2020-01-01 00:06:42.000	2020-01-02 03:35:03.000	402	99303	49852.5	4985250	402	99303	49852.5	4985250	-32768	32370	4632.66	463266	-124	127	4.18	418
+403	101	10393	99304	1.21021	298.21021	149.71021	14971.02102	1.21021	298.2102	149.7102	14971.02077	1.21021	298.21021	149.71021000000002	14971.021	2020-01-01	2020-01-02	2020-01-01 00:06:43	2020-01-02 03:35:04	2020-01-01 00:06:43.000	2020-01-02 03:35:04.000	403	99304	49853.5	4985350	403	99304	49853.5	4985350	-32767	32371	4633.66	463366	-128	127	2.62	262
+404	101	10394	99305	1.21321	298.21321	149.71321	14971.32132	1.21321	298.21323	149.71321	14971.32139	1.21321	298.21321	149.71321	14971.321	2020-01-01	2020-01-02	2020-01-01 00:06:44	2020-01-02 03:35:05	2020-01-01 00:06:44.000	2020-01-02 03:35:05.000	404	99305	49854.5	4985450	404	99305	49854.5	4985450	-32766	32372	4634.66	463466	-128	127	1.06	106
+405	101	10395	99306	1.21621	298.21621	149.71621	14971.62162	1.21621	298.21622	149.71621	14971.62169	1.21621	298.21621	149.71621	14971.621	2020-01-01	2020-01-02	2020-01-01 00:06:45	2020-01-02 03:35:06	2020-01-01 00:06:45.000	2020-01-02 03:35:06.000	405	99306	49855.5	4985550	405	99306	49855.5	4985550	-32765	32373	4635.66	463566	-128	124	-0.5	-50
+406	101	10396	99307	1.21921	298.21921	149.71921	14971.92192	1.21921	298.2192	149.71921	14971.92199	1.21921	298.21921	149.71921	14971.921	2020-01-01	2020-01-02	2020-01-01 00:06:46	2020-01-02 03:35:07	2020-01-01 00:06:46.000	2020-01-02 03:35:07.000	406	99307	49856.5	4985650	406	99307	49856.5	4985650	-32764	32374	4636.66	463666	-127	125	0.5	50
+407	101	10397	99308	1.22222	298.22222	149.72222	14972.22222	1.22222	298.22223	149.72222	14972.22257	1.22222	298.22222	149.72222	14972.222	2020-01-01	2020-01-02	2020-01-01 00:06:47	2020-01-02 03:35:08	2020-01-01 00:06:47.000	2020-01-02 03:35:08.000	407	99308	49857.5	4985750	407	99308	49857.5	4985750	-32763	32375	4637.66	463766	-126	126	1.5	150
+408	101	10398	99309	1.22522	298.22522	149.72522	14972.52252	1.22522	298.22522	149.72522	14972.52224	1.22522	298.22522	149.72522	14972.522	2020-01-01	2020-01-02	2020-01-01 00:06:48	2020-01-02 03:35:09	2020-01-01 00:06:48.000	2020-01-02 03:35:09.000	408	99309	49858.5	4985850	408	99309	49858.5	4985850	-32762	32376	4638.66	463866	-125	127	2.5	250
+409	101	10399	99310	1.22822	298.22822	149.72822	14972.82282	1.22822	298.22824	149.72822	14972.82286	1.22822	298.22822	149.72822	14972.822	2020-01-01	2020-01-02	2020-01-01 00:06:49	2020-01-02 03:35:10	2020-01-01 00:06:49.000	2020-01-02 03:35:10.000	409	99310	49859.5	4985950	409	99310	49859.5	4985950	-32761	32377	4639.66	463966	-128	127	0.94	94
 41	102	10031	99941	0.12312	300.12312	150.12312	15162.43543	0.12312	300.1231	150.12312	15162.43521	0.12312	300.12312	150.12312	15162.43512	2020-01-01	2020-01-02	2020-01-01 00:00:41	2020-01-02 03:45:41	2020-01-01 00:00:41.000	2020-01-02 03:45:41.000	41	99941	49991	5049091	41	99941	49991	5049091	-32528	32407	4570.009900990099	461571	-128	127	0.0297029702970297	3
-410	101	10400	99311	1.23123	298.23123	149.73123	14973.12312	1.23123	298.23123	149.73123	14973.12316	1.23123	298.23123	149.73122999999998	14973.12300	2020-01-01	2020-01-02	2020-01-01 00:06:50	2020-01-02 03:35:11	2020-01-01 00:06:50.000	2020-01-02 03:35:11.000	410	99311	49860.5	4986050	410	99311	49860.5	4986050	-32760	32378	4640.66	464066	-128	127	-0.62	-62
-411	101	10401	99312	1.23423	298.23423	149.73423	14973.42342	1.23423	298.23422	149.73423	14973.42345	1.23423	298.23423	149.73423	14973.42300	2020-01-01	2020-01-02	2020-01-01 00:06:51	2020-01-02 03:35:12	2020-01-01 00:06:51.000	2020-01-02 03:35:12.000	411	99312	49861.5	4986150	411	99312	49861.5	4986150	-32759	32379	4641.66	464166	-128	123	-2.18	-218
-412	101	10402	99313	1.23723	298.23723	149.73723	14973.72372	1.23723	298.23724	149.73724	14973.72405	1.23723	298.23723	149.73723	14973.72300	2020-01-01	2020-01-02	2020-01-01 00:06:52	2020-01-02 03:35:13	2020-01-01 00:06:52.000	2020-01-02 03:35:13.000	412	99313	49862.5	4986250	412	99313	49862.5	4986250	-32758	32380	4642.66	464266	-127	124	-1.18	-118
-413	101	10403	99314	1.24024	298.24024	149.74024	14974.02402	1.24024	298.24023	149.74023	14974.02374	1.24024	298.24024	149.74024	14974.02400	2020-01-01	2020-01-02	2020-01-01 00:06:53	2020-01-02 03:35:14	2020-01-01 00:06:53.000	2020-01-02 03:35:14.000	413	99314	49863.5	4986350	413	99314	49863.5	4986350	-32757	32381	4643.66	464366	-126	125	-0.18	-18
-414	101	10404	99315	1.24324	298.24324	149.74324	14974.32432	1.24324	298.24326	149.74324	14974.32433	1.24324	298.24324	149.74324000000001	14974.32400	2020-01-01	2020-01-02	2020-01-01 00:06:54	2020-01-02 03:35:15	2020-01-01 00:06:54.000	2020-01-02 03:35:15.000	414	99315	49864.5	4986450	414	99315	49864.5	4986450	-32756	32382	4644.66	464466	-125	126	0.82	82
-415	101	10405	99316	1.24624	298.24624	149.74624	14974.62462	1.24624	298.24625	149.74624	14974.62463	1.24624	298.24624	149.74624	14974.62400	2020-01-01	2020-01-02	2020-01-01 00:06:55	2020-01-02 03:35:16	2020-01-01 00:06:55.000	2020-01-02 03:35:16.000	415	99316	49865.5	4986550	415	99316	49865.5	4986550	-32755	32383	4645.66	464566	-124	127	1.82	182
-416	101	10406	99317	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924000000001	14974.92400	2020-01-01	2020-01-02	2020-01-01 00:06:56	2020-01-02 03:35:17	2020-01-01 00:06:56.000	2020-01-02 03:35:17.000	416	99317	49866.5	4986650	416	99317	49866.5	4986650	-32754	32384	4646.66	464666	-128	127	0.26	26
-417	101	10407	99318	1.25225	298.25225	149.75225	14975.22522	1.25225	298.25226	149.75225	14975.22552	1.25225	298.25225	149.75225	14975.22500	2020-01-01	2020-01-02	2020-01-01 00:06:57	2020-01-02 03:35:18	2020-01-01 00:06:57.000	2020-01-02 03:35:18.000	417	99318	49867.5	4986750	417	99318	49867.5	4986750	-32753	32385	4647.66	464766	-128	123	-1.3	-130
-418	101	10408	99319	1.25525	298.25525	149.75525	14975.52552	1.25525	298.25525	149.75525	14975.52521	1.25525	298.25525	149.75525	14975.52500	2020-01-01	2020-01-02	2020-01-01 00:06:58	2020-01-02 03:35:19	2020-01-01 00:06:58.000	2020-01-02 03:35:19.000	418	99319	49868.5	4986850	418	99319	49868.5	4986850	-32752	32386	4648.66	464866	-127	124	-0.3	-30
-419	101	10409	99320	1.25825	298.25825	149.75825	14975.82582	1.25825	298.25827	149.75825	14975.8258	1.25825	298.25825	149.75825	14975.82500	2020-01-01	2020-01-02	2020-01-01 00:06:59	2020-01-02 03:35:20	2020-01-01 00:06:59.000	2020-01-02 03:35:20.000	419	99320	49869.5	4986950	419	99320	49869.5	4986950	-32751	32387	4649.66	464966	-126	125	0.7	70
+410	101	10400	99311	1.23123	298.23123	149.73123	14973.12312	1.23123	298.23123	149.73123	14973.12316	1.23123	298.23123	149.73122999999998	14973.123	2020-01-01	2020-01-02	2020-01-01 00:06:50	2020-01-02 03:35:11	2020-01-01 00:06:50.000	2020-01-02 03:35:11.000	410	99311	49860.5	4986050	410	99311	49860.5	4986050	-32760	32378	4640.66	464066	-128	127	-0.62	-62
+411	101	10401	99312	1.23423	298.23423	149.73423	14973.42342	1.23423	298.23422	149.73423	14973.42345	1.23423	298.23423	149.73423	14973.423	2020-01-01	2020-01-02	2020-01-01 00:06:51	2020-01-02 03:35:12	2020-01-01 00:06:51.000	2020-01-02 03:35:12.000	411	99312	49861.5	4986150	411	99312	49861.5	4986150	-32759	32379	4641.66	464166	-128	123	-2.18	-218
+412	101	10402	99313	1.23723	298.23723	149.73723	14973.72372	1.23723	298.23724	149.73724	14973.72405	1.23723	298.23723	149.73723	14973.723	2020-01-01	2020-01-02	2020-01-01 00:06:52	2020-01-02 03:35:13	2020-01-01 00:06:52.000	2020-01-02 03:35:13.000	412	99313	49862.5	4986250	412	99313	49862.5	4986250	-32758	32380	4642.66	464266	-127	124	-1.18	-118
+413	101	10403	99314	1.24024	298.24024	149.74024	14974.02402	1.24024	298.24023	149.74023	14974.02374	1.24024	298.24024	149.74024	14974.024	2020-01-01	2020-01-02	2020-01-01 00:06:53	2020-01-02 03:35:14	2020-01-01 00:06:53.000	2020-01-02 03:35:14.000	413	99314	49863.5	4986350	413	99314	49863.5	4986350	-32757	32381	4643.66	464366	-126	125	-0.18	-18
+414	101	10404	99315	1.24324	298.24324	149.74324	14974.32432	1.24324	298.24326	149.74324	14974.32433	1.24324	298.24324	149.74324000000001	14974.324	2020-01-01	2020-01-02	2020-01-01 00:06:54	2020-01-02 03:35:15	2020-01-01 00:06:54.000	2020-01-02 03:35:15.000	414	99315	49864.5	4986450	414	99315	49864.5	4986450	-32756	32382	4644.66	464466	-125	126	0.82	82
+415	101	10405	99316	1.24624	298.24624	149.74624	14974.62462	1.24624	298.24625	149.74624	14974.62463	1.24624	298.24624	149.74624	14974.624	2020-01-01	2020-01-02	2020-01-01 00:06:55	2020-01-02 03:35:16	2020-01-01 00:06:55.000	2020-01-02 03:35:16.000	415	99316	49865.5	4986550	415	99316	49865.5	4986550	-32755	32383	4645.66	464566	-124	127	1.82	182
+416	101	10406	99317	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924000000001	14974.924	2020-01-01	2020-01-02	2020-01-01 00:06:56	2020-01-02 03:35:17	2020-01-01 00:06:56.000	2020-01-02 03:35:17.000	416	99317	49866.5	4986650	416	99317	49866.5	4986650	-32754	32384	4646.66	464666	-128	127	0.26	26
+417	101	10407	99318	1.25225	298.25225	149.75225	14975.22522	1.25225	298.25226	149.75225	14975.22552	1.25225	298.25225	149.75225	14975.225	2020-01-01	2020-01-02	2020-01-01 00:06:57	2020-01-02 03:35:18	2020-01-01 00:06:57.000	2020-01-02 03:35:18.000	417	99318	49867.5	4986750	417	99318	49867.5	4986750	-32753	32385	4647.66	464766	-128	123	-1.3	-130
+418	101	10408	99319	1.25525	298.25525	149.75525	14975.52552	1.25525	298.25525	149.75525	14975.52521	1.25525	298.25525	149.75525	14975.525	2020-01-01	2020-01-02	2020-01-01 00:06:58	2020-01-02 03:35:19	2020-01-01 00:06:58.000	2020-01-02 03:35:19.000	418	99319	49868.5	4986850	418	99319	49868.5	4986850	-32752	32386	4648.66	464866	-127	124	-0.3	-30
+419	101	10409	99320	1.25825	298.25825	149.75825	14975.82582	1.25825	298.25827	149.75825	14975.8258	1.25825	298.25825	149.75825	14975.825	2020-01-01	2020-01-02	2020-01-01 00:06:59	2020-01-02 03:35:20	2020-01-01 00:06:59.000	2020-01-02 03:35:20.000	419	99320	49869.5	4986950	419	99320	49869.5	4986950	-32751	32387	4649.66	464966	-126	125	0.7	70
 42	102	10032	99942	0.12612	300.12612	150.12612	15162.73873	0.12612	300.12613	150.12612	15162.73896	0.12612	300.12612	150.12612	15162.73812	2020-01-01	2020-01-02	2020-01-01 00:00:42	2020-01-02 03:45:42	2020-01-01 00:00:42.000	2020-01-02 03:45:42.000	42	99942	49992	5049192	42	99942	49992	5049192	-32527	32408	4571.009900990099	461672	-128	127	-1.504950495049505	-152
-420	101	10410	99321	1.26126	298.26126	149.76126	14976.12612	1.26126	298.26126	149.76126	14976.12609	1.26126	298.26126	149.76126	14976.12600	2020-01-01	2020-01-02	2020-01-01 00:07:00	2020-01-02 03:35:21	2020-01-01 00:07:00.000	2020-01-02 03:35:21.000	420	99321	49870.5	4987050	420	99321	49870.5	4987050	-32750	32388	4650.66	465066	-125	126	1.7	170
-421	101	10411	99322	1.26426	298.26426	149.76426	14976.42642	1.26426	298.26425	149.76426	14976.4264	1.26426	298.26426	149.76426	14976.42600	2020-01-01	2020-01-02	2020-01-01 00:07:01	2020-01-02 03:35:22	2020-01-01 00:07:01.000	2020-01-02 03:35:22.000	421	99322	49871.5	4987150	421	99322	49871.5	4987150	-32749	32389	4651.66	465166	-124	127	2.7	270
-422	101	10412	99323	1.26726	298.26726	149.76726	14976.72672	1.26726	298.26727	149.76727	14976.72702	1.26726	298.26726	149.76726	14976.72600	2020-01-01	2020-01-02	2020-01-01 00:07:02	2020-01-02 03:35:23	2020-01-01 00:07:02.000	2020-01-02 03:35:23.000	422	99323	49872.5	4987250	422	99323	49872.5	4987250	-32748	32390	4652.66	465266	-128	127	1.14	114
-423	101	10413	99324	1.27027	298.27027	149.77027	14977.02702	1.27027	298.27026	149.77026	14977.02667	1.27027	298.27027	149.77027	14977.02700	2020-01-01	2020-01-02	2020-01-01 00:07:03	2020-01-02 03:35:24	2020-01-01 00:07:03.000	2020-01-02 03:35:24.000	423	99324	49873.5	4987350	423	99324	49873.5	4987350	-32747	32391	4653.66	465366	-128	123	-0.42	-42
-424	101	10414	99325	1.27327	298.27327	149.77327	14977.32732	1.27327	298.2733	149.77327	14977.32727	1.27327	298.27327	149.77327	14977.32700	2020-01-01	2020-01-02	2020-01-01 00:07:04	2020-01-02 03:35:25	2020-01-01 00:07:04.000	2020-01-02 03:35:25.000	424	99325	49874.5	4987450	424	99325	49874.5	4987450	-32746	32392	4654.66	465466	-127	124	0.58	58
-425	101	10415	99326	1.27627	298.27627	149.77627	14977.62762	1.27627	298.27628	149.77627	14977.62756	1.27627	298.27627	149.77627	14977.62700	2020-01-01	2020-01-02	2020-01-01 00:07:05	2020-01-02 03:35:26	2020-01-01 00:07:05.000	2020-01-02 03:35:26.000	425	99326	49875.5	4987550	425	99326	49875.5	4987550	-32745	32393	4655.66	465566	-126	125	1.58	158
-426	101	10416	99327	1.27927	298.27927	149.77927	14977.92792	1.27927	298.27927	149.77927	14977.92787	1.27927	298.27927	149.77927	14977.92700	2020-01-01	2020-01-02	2020-01-01 00:07:06	2020-01-02 03:35:27	2020-01-01 00:07:06.000	2020-01-02 03:35:27.000	426	99327	49876.5	4987650	426	99327	49876.5	4987650	-32744	32394	4656.66	465666	-125	126	2.58	258
-427	101	10417	99328	1.28228	298.28228	149.78228	14978.22822	1.28228	298.2823	149.78228	14978.22849	1.28228	298.28228	149.78228	14978.22800	2020-01-01	2020-01-02	2020-01-01 00:07:07	2020-01-02 03:35:28	2020-01-01 00:07:07.000	2020-01-02 03:35:28.000	427	99328	49877.5	4987750	427	99328	49877.5	4987750	-32743	32395	4657.66	465766	-124	127	3.58	358
-428	101	10418	99329	1.28528	298.28528	149.78528	14978.52852	1.28528	298.28528	149.78528	14978.52815	1.28528	298.28528	149.78528	14978.52800	2020-01-01	2020-01-02	2020-01-01 00:07:08	2020-01-02 03:35:29	2020-01-01 00:07:08.000	2020-01-02 03:35:29.000	428	99329	49878.5	4987850	428	99329	49878.5	4987850	-32742	32396	4658.66	465866	-128	127	2.02	202
-429	101	10419	99330	1.28828	298.28828	149.78828	14978.82882	1.28828	298.2883	149.78828	14978.8289	1.28828	298.28828	149.78828	14978.82800	2020-01-01	2020-01-02	2020-01-01 00:07:09	2020-01-02 03:35:30	2020-01-01 00:07:09.000	2020-01-02 03:35:30.000	429	99330	49879.5	4987950	429	99330	49879.5	4987950	-32741	32397	4659.66	465966	-128	127	0.46	46
+420	101	10410	99321	1.26126	298.26126	149.76126	14976.12612	1.26126	298.26126	149.76126	14976.12609	1.26126	298.26126	149.76126	14976.126	2020-01-01	2020-01-02	2020-01-01 00:07:00	2020-01-02 03:35:21	2020-01-01 00:07:00.000	2020-01-02 03:35:21.000	420	99321	49870.5	4987050	420	99321	49870.5	4987050	-32750	32388	4650.66	465066	-125	126	1.7	170
+421	101	10411	99322	1.26426	298.26426	149.76426	14976.42642	1.26426	298.26425	149.76426	14976.4264	1.26426	298.26426	149.76426	14976.426	2020-01-01	2020-01-02	2020-01-01 00:07:01	2020-01-02 03:35:22	2020-01-01 00:07:01.000	2020-01-02 03:35:22.000	421	99322	49871.5	4987150	421	99322	49871.5	4987150	-32749	32389	4651.66	465166	-124	127	2.7	270
+422	101	10412	99323	1.26726	298.26726	149.76726	14976.72672	1.26726	298.26727	149.76727	14976.72702	1.26726	298.26726	149.76726	14976.726	2020-01-01	2020-01-02	2020-01-01 00:07:02	2020-01-02 03:35:23	2020-01-01 00:07:02.000	2020-01-02 03:35:23.000	422	99323	49872.5	4987250	422	99323	49872.5	4987250	-32748	32390	4652.66	465266	-128	127	1.14	114
+423	101	10413	99324	1.27027	298.27027	149.77027	14977.02702	1.27027	298.27026	149.77026	14977.02667	1.27027	298.27027	149.77027	14977.027	2020-01-01	2020-01-02	2020-01-01 00:07:03	2020-01-02 03:35:24	2020-01-01 00:07:03.000	2020-01-02 03:35:24.000	423	99324	49873.5	4987350	423	99324	49873.5	4987350	-32747	32391	4653.66	465366	-128	123	-0.42	-42
+424	101	10414	99325	1.27327	298.27327	149.77327	14977.32732	1.27327	298.2733	149.77327	14977.32727	1.27327	298.27327	149.77327	14977.327	2020-01-01	2020-01-02	2020-01-01 00:07:04	2020-01-02 03:35:25	2020-01-01 00:07:04.000	2020-01-02 03:35:25.000	424	99325	49874.5	4987450	424	99325	49874.5	4987450	-32746	32392	4654.66	465466	-127	124	0.58	58
+425	101	10415	99326	1.27627	298.27627	149.77627	14977.62762	1.27627	298.27628	149.77627	14977.62756	1.27627	298.27627	149.77627	14977.627	2020-01-01	2020-01-02	2020-01-01 00:07:05	2020-01-02 03:35:26	2020-01-01 00:07:05.000	2020-01-02 03:35:26.000	425	99326	49875.5	4987550	425	99326	49875.5	4987550	-32745	32393	4655.66	465566	-126	125	1.58	158
+426	101	10416	99327	1.27927	298.27927	149.77927	14977.92792	1.27927	298.27927	149.77927	14977.92787	1.27927	298.27927	149.77927	14977.927	2020-01-01	2020-01-02	2020-01-01 00:07:06	2020-01-02 03:35:27	2020-01-01 00:07:06.000	2020-01-02 03:35:27.000	426	99327	49876.5	4987650	426	99327	49876.5	4987650	-32744	32394	4656.66	465666	-125	126	2.58	258
+427	101	10417	99328	1.28228	298.28228	149.78228	14978.22822	1.28228	298.2823	149.78228	14978.22849	1.28228	298.28228	149.78228	14978.228	2020-01-01	2020-01-02	2020-01-01 00:07:07	2020-01-02 03:35:28	2020-01-01 00:07:07.000	2020-01-02 03:35:28.000	427	99328	49877.5	4987750	427	99328	49877.5	4987750	-32743	32395	4657.66	465766	-124	127	3.58	358
+428	101	10418	99329	1.28528	298.28528	149.78528	14978.52852	1.28528	298.28528	149.78528	14978.52815	1.28528	298.28528	149.78528	14978.528	2020-01-01	2020-01-02	2020-01-01 00:07:08	2020-01-02 03:35:29	2020-01-01 00:07:08.000	2020-01-02 03:35:29.000	428	99329	49878.5	4987850	428	99329	49878.5	4987850	-32742	32396	4658.66	465866	-128	127	2.02	202
+429	101	10419	99330	1.28828	298.28828	149.78828	14978.82882	1.28828	298.2883	149.78828	14978.8289	1.28828	298.28828	149.78828	14978.828	2020-01-01	2020-01-02	2020-01-01 00:07:09	2020-01-02 03:35:30	2020-01-01 00:07:09.000	2020-01-02 03:35:30.000	429	99330	49879.5	4987950	429	99330	49879.5	4987950	-32741	32397	4659.66	465966	-128	127	0.46	46
 43	102	10033	99943	0.12912	300.12912	150.12912	15163.04204	0.12912	300.12912	150.12912	15163.04211	0.12912	300.12912	150.12912	15163.04112	2020-01-01	2020-01-02	2020-01-01 00:00:43	2020-01-02 03:45:43	2020-01-01 00:00:43.000	2020-01-02 03:45:43.000	43	99943	49993	5049293	43	99943	49993	5049293	-32526	32409	4572.009900990099	461773	-128	124	-3.0396039603960396	-307
-430	101	10420	99331	1.29129	298.29129	149.79129	14979.12912	1.29129	298.2913	149.79129	14979.12904	1.29129	298.29129	149.79129	14979.12900	2020-01-01	2020-01-02	2020-01-01 00:07:10	2020-01-02 03:35:31	2020-01-01 00:07:10.000	2020-01-02 03:35:31.000	430	99331	49880.5	4988050	430	99331	49880.5	4988050	-32740	32398	4660.66	466066	-128	124	-1.1	-110
-431	101	10421	99332	1.29429	298.29429	149.79429	14979.42942	1.29429	298.29428	149.79429	14979.42933	1.29429	298.29429	149.79429	14979.42900	2020-01-01	2020-01-02	2020-01-01 00:07:11	2020-01-02 03:35:32	2020-01-01 00:07:11.000	2020-01-02 03:35:32.000	431	99332	49881.5	4988150	431	99332	49881.5	4988150	-32739	32399	4661.66	466166	-127	125	-0.1	-10
-432	101	10422	99333	1.29729	298.29729	149.79729	14979.72972	1.29729	298.2973	149.79729	14979.72996	1.29729	298.29729	149.79729	14979.72900	2020-01-01	2020-01-02	2020-01-01 00:07:12	2020-01-02 03:35:33	2020-01-01 00:07:12.000	2020-01-02 03:35:33.000	432	99333	49882.5	4988250	432	99333	49882.5	4988250	-32738	32400	4662.66	466266	-126	126	0.9	90
-433	101	10423	99334	1.3003	298.3003	149.8003	14980.03003	1.3003	298.3003	149.80029	14980.02962	1.30030	298.30030	149.8003	14980.03000	2020-01-01	2020-01-02	2020-01-01 00:07:13	2020-01-02 03:35:34	2020-01-01 00:07:13.000	2020-01-02 03:35:34.000	433	99334	49883.5	4988350	433	99334	49883.5	4988350	-32737	32401	4663.66	466366	-125	127	1.9	190
-434	101	10424	99335	1.3033	298.3033	149.8033	14980.33033	1.3033	298.3033	149.8033	14980.33037	1.30330	298.30330	149.8033	14980.33000	2020-01-01	2020-01-02	2020-01-01 00:07:14	2020-01-02 03:35:35	2020-01-01 00:07:14.000	2020-01-02 03:35:35.000	434	99335	49884.5	4988450	434	99335	49884.5	4988450	-32736	32402	4664.66	466466	-128	127	0.34	34
-435	101	10425	99336	1.3063	298.3063	149.8063	14980.63063	1.3063	298.3063	149.8063	14980.63051	1.30630	298.30630	149.8063	14980.63000	2020-01-01	2020-01-02	2020-01-01 00:07:15	2020-01-02 03:35:36	2020-01-01 00:07:15.000	2020-01-02 03:35:36.000	435	99336	49885.5	4988550	435	99336	49885.5	4988550	-32735	32403	4665.66	466566	-128	127	-1.22	-122
-436	101	10426	99337	1.3093	298.3093	149.8093	14980.93093	1.3093	298.3093	149.8093	14980.93084	1.30930	298.30930	149.8093	14980.93000	2020-01-01	2020-01-02	2020-01-01 00:07:16	2020-01-02 03:35:37	2020-01-01 00:07:16.000	2020-01-02 03:35:37.000	436	99337	49886.5	4988650	436	99337	49886.5	4988650	-32734	32404	4666.66	466666	-128	123	-2.78	-278
-437	101	10427	99338	1.31231	298.31231	149.81231	14981.23123	1.31231	298.31232	149.81231	14981.23143	1.31231	298.31231	149.81231	14981.23100	2020-01-01	2020-01-02	2020-01-01 00:07:17	2020-01-02 03:35:38	2020-01-01 00:07:17.000	2020-01-02 03:35:38.000	437	99338	49887.5	4988750	437	99338	49887.5	4988750	-32733	32405	4667.66	466766	-127	124	-1.78	-178
-438	101	10428	99339	1.31531	298.31531	149.81531	14981.53153	1.31531	298.3153	149.81531	14981.53173	1.31531	298.31531	149.81531	14981.53100	2020-01-01	2020-01-02	2020-01-01 00:07:18	2020-01-02 03:35:39	2020-01-01 00:07:18.000	2020-01-02 03:35:39.000	438	99339	49888.5	4988850	438	99339	49888.5	4988850	-32732	32406	4668.66	466866	-126	125	-0.78	-78
-439	101	10429	99340	1.31831	298.31831	149.81831	14981.83183	1.31831	298.31833	149.81831	14981.83184	1.31831	298.31831	149.81831	14981.83100	2020-01-01	2020-01-02	2020-01-01 00:07:19	2020-01-02 03:35:40	2020-01-01 00:07:19.000	2020-01-02 03:35:40.000	439	99340	49889.5	4988950	439	99340	49889.5	4988950	-32731	32407	4669.66	466966	-125	126	0.22	22
+430	101	10420	99331	1.29129	298.29129	149.79129	14979.12912	1.29129	298.2913	149.79129	14979.12904	1.29129	298.29129	149.79129	14979.129	2020-01-01	2020-01-02	2020-01-01 00:07:10	2020-01-02 03:35:31	2020-01-01 00:07:10.000	2020-01-02 03:35:31.000	430	99331	49880.5	4988050	430	99331	49880.5	4988050	-32740	32398	4660.66	466066	-128	124	-1.1	-110
+431	101	10421	99332	1.29429	298.29429	149.79429	14979.42942	1.29429	298.29428	149.79429	14979.42933	1.29429	298.29429	149.79429	14979.429	2020-01-01	2020-01-02	2020-01-01 00:07:11	2020-01-02 03:35:32	2020-01-01 00:07:11.000	2020-01-02 03:35:32.000	431	99332	49881.5	4988150	431	99332	49881.5	4988150	-32739	32399	4661.66	466166	-127	125	-0.1	-10
+432	101	10422	99333	1.29729	298.29729	149.79729	14979.72972	1.29729	298.2973	149.79729	14979.72996	1.29729	298.29729	149.79729	14979.729	2020-01-01	2020-01-02	2020-01-01 00:07:12	2020-01-02 03:35:33	2020-01-01 00:07:12.000	2020-01-02 03:35:33.000	432	99333	49882.5	4988250	432	99333	49882.5	4988250	-32738	32400	4662.66	466266	-126	126	0.9	90
+433	101	10423	99334	1.3003	298.3003	149.8003	14980.03003	1.3003	298.3003	149.80029	14980.02962	1.3003	298.3003	149.8003	14980.03	2020-01-01	2020-01-02	2020-01-01 00:07:13	2020-01-02 03:35:34	2020-01-01 00:07:13.000	2020-01-02 03:35:34.000	433	99334	49883.5	4988350	433	99334	49883.5	4988350	-32737	32401	4663.66	466366	-125	127	1.9	190
+434	101	10424	99335	1.3033	298.3033	149.8033	14980.33033	1.3033	298.3033	149.8033	14980.33037	1.3033	298.3033	149.8033	14980.33	2020-01-01	2020-01-02	2020-01-01 00:07:14	2020-01-02 03:35:35	2020-01-01 00:07:14.000	2020-01-02 03:35:35.000	434	99335	49884.5	4988450	434	99335	49884.5	4988450	-32736	32402	4664.66	466466	-128	127	0.34	34
+435	101	10425	99336	1.3063	298.3063	149.8063	14980.63063	1.3063	298.3063	149.8063	14980.63051	1.3063	298.3063	149.8063	14980.63	2020-01-01	2020-01-02	2020-01-01 00:07:15	2020-01-02 03:35:36	2020-01-01 00:07:15.000	2020-01-02 03:35:36.000	435	99336	49885.5	4988550	435	99336	49885.5	4988550	-32735	32403	4665.66	466566	-128	127	-1.22	-122
+436	101	10426	99337	1.3093	298.3093	149.8093	14980.93093	1.3093	298.3093	149.8093	14980.93084	1.3093	298.3093	149.8093	14980.93	2020-01-01	2020-01-02	2020-01-01 00:07:16	2020-01-02 03:35:37	2020-01-01 00:07:16.000	2020-01-02 03:35:37.000	436	99337	49886.5	4988650	436	99337	49886.5	4988650	-32734	32404	4666.66	466666	-128	123	-2.78	-278
+437	101	10427	99338	1.31231	298.31231	149.81231	14981.23123	1.31231	298.31232	149.81231	14981.23143	1.31231	298.31231	149.81231	14981.231	2020-01-01	2020-01-02	2020-01-01 00:07:17	2020-01-02 03:35:38	2020-01-01 00:07:17.000	2020-01-02 03:35:38.000	437	99338	49887.5	4988750	437	99338	49887.5	4988750	-32733	32405	4667.66	466766	-127	124	-1.78	-178
+438	101	10428	99339	1.31531	298.31531	149.81531	14981.53153	1.31531	298.3153	149.81531	14981.53173	1.31531	298.31531	149.81531	14981.531	2020-01-01	2020-01-02	2020-01-01 00:07:18	2020-01-02 03:35:39	2020-01-01 00:07:18.000	2020-01-02 03:35:39.000	438	99339	49888.5	4988850	438	99339	49888.5	4988850	-32732	32406	4668.66	466866	-126	125	-0.78	-78
+439	101	10429	99340	1.31831	298.31831	149.81831	14981.83183	1.31831	298.31833	149.81831	14981.83184	1.31831	298.31831	149.81831	14981.831	2020-01-01	2020-01-02	2020-01-01 00:07:19	2020-01-02 03:35:40	2020-01-01 00:07:19.000	2020-01-02 03:35:40.000	439	99340	49889.5	4988950	439	99340	49889.5	4988950	-32731	32407	4669.66	466966	-125	126	0.22	22
 44	102	10034	99944	0.13213	300.13213	150.13213	15163.34534	0.13213	300.13214	150.13213	15163.34525	0.13213	300.13213	150.13213	15163.34513	2020-01-01	2020-01-02	2020-01-01 00:00:44	2020-01-02 03:45:44	2020-01-01 00:00:44.000	2020-01-02 03:45:44.000	44	99944	49994	5049394	44	99944	49994	5049394	-32525	32410	4573.009900990099	461874	-127	125	-2.0396039603960396	-206
-440	101	10430	99341	1.32132	298.32132	149.82132	14982.13213	1.32132	298.32132	149.82131	14982.13197	1.32132	298.32132	149.82132	14982.13200	2020-01-01	2020-01-02	2020-01-01 00:07:20	2020-01-02 03:35:41	2020-01-01 00:07:20.000	2020-01-02 03:35:41.000	440	99341	49890.5	4989050	440	99341	49890.5	4989050	-32730	32408	4670.66	467066	-124	127	1.22	122
-441	101	10431	99342	1.32432	298.32432	149.82432	14982.43243	1.32432	298.3243	149.82432	14982.4323	1.32432	298.32432	149.82432	14982.43200	2020-01-01	2020-01-02	2020-01-01 00:07:21	2020-01-02 03:35:42	2020-01-01 00:07:21.000	2020-01-02 03:35:42.000	441	99342	49891.5	4989150	441	99342	49891.5	4989150	-32729	32409	4671.66	467166	-128	127	-0.34	-34
-442	101	10432	99343	1.32732	298.32732	149.82732	14982.73273	1.32732	298.32733	149.82732	14982.7329	1.32732	298.32732	149.82732	14982.73200	2020-01-01	2020-01-02	2020-01-01 00:07:22	2020-01-02 03:35:43	2020-01-01 00:07:22.000	2020-01-02 03:35:43.000	442	99343	49892.5	4989250	442	99343	49892.5	4989250	-32728	32410	4672.66	467266	-128	123	-1.9	-190
-443	101	10433	99344	1.33033	298.33033	149.83033	14983.03303	1.33033	298.33032	149.83033	14983.03319	1.33033	298.33033	149.83033	14983.03300	2020-01-01	2020-01-02	2020-01-01 00:07:23	2020-01-02 03:35:44	2020-01-01 00:07:23.000	2020-01-02 03:35:44.000	443	99344	49893.5	4989350	443	99344	49893.5	4989350	-32727	32411	4673.66	467366	-127	124	-0.9	-90
-444	101	10434	99345	1.33333	298.33333	149.83333	14983.33333	1.33333	298.33334	149.83333	14983.33331	1.33333	298.33333	149.83333000000002	14983.33300	2020-01-01	2020-01-02	2020-01-01 00:07:24	2020-01-02 03:35:45	2020-01-01 00:07:24.000	2020-01-02 03:35:45.000	444	99345	49894.5	4989450	444	99345	49894.5	4989450	-32726	32412	4674.66	467466	-126	125	0.1	10
-445	101	10435	99346	1.33633	298.33633	149.83633	14983.63363	1.33633	298.33633	149.83633	14983.63348	1.33633	298.33633	149.83633	14983.63300	2020-01-01	2020-01-02	2020-01-01 00:07:25	2020-01-02 03:35:46	2020-01-01 00:07:25.000	2020-01-02 03:35:46.000	445	99346	49895.5	4989550	445	99346	49895.5	4989550	-32725	32413	4675.66	467566	-125	126	1.1	110
-446	101	10436	99347	1.33933	298.33933	149.83933	14983.93393	1.33933	298.33932	149.83933	14983.93378	1.33933	298.33933	149.83933000000002	14983.93300	2020-01-01	2020-01-02	2020-01-01 00:07:26	2020-01-02 03:35:47	2020-01-01 00:07:26.000	2020-01-02 03:35:47.000	446	99347	49896.5	4989650	446	99347	49896.5	4989650	-32724	32414	4676.66	467666	-124	127	2.1	210
-447	101	10437	99348	1.34234	298.34234	149.84234	14984.23423	1.34234	298.34235	149.84234	14984.23437	1.34234	298.34234	149.84234	14984.23400	2020-01-01	2020-01-02	2020-01-01 00:07:27	2020-01-02 03:35:48	2020-01-01 00:07:27.000	2020-01-02 03:35:48.000	447	99348	49897.5	4989750	447	99348	49897.5	4989750	-32723	32415	4677.66	467766	-128	127	0.54	54
-448	101	10438	99349	1.34534	298.34534	149.84534	14984.53453	1.34534	298.34534	149.84534	14984.53466	1.34534	298.34534	149.84534	14984.53400	2020-01-01	2020-01-02	2020-01-01 00:07:28	2020-01-02 03:35:49	2020-01-01 00:07:28.000	2020-01-02 03:35:49.000	448	99349	49898.5	4989850	448	99349	49898.5	4989850	-32722	32416	4678.66	467866	-128	123	-1.02	-102
-449	101	10439	99350	1.34834	298.34834	149.84834	14984.83483	1.34834	298.34836	149.84834	14984.83478	1.34834	298.34834	149.84834	14984.83400	2020-01-01	2020-01-02	2020-01-01 00:07:29	2020-01-02 03:35:50	2020-01-01 00:07:29.000	2020-01-02 03:35:50.000	449	99350	49899.5	4989950	449	99350	49899.5	4989950	-32721	32417	4679.66	467966	-127	124	-0.02	-2
+440	101	10430	99341	1.32132	298.32132	149.82132	14982.13213	1.32132	298.32132	149.82131	14982.13197	1.32132	298.32132	149.82132	14982.132	2020-01-01	2020-01-02	2020-01-01 00:07:20	2020-01-02 03:35:41	2020-01-01 00:07:20.000	2020-01-02 03:35:41.000	440	99341	49890.5	4989050	440	99341	49890.5	4989050	-32730	32408	4670.66	467066	-124	127	1.22	122
+441	101	10431	99342	1.32432	298.32432	149.82432	14982.43243	1.32432	298.3243	149.82432	14982.4323	1.32432	298.32432	149.82432	14982.432	2020-01-01	2020-01-02	2020-01-01 00:07:21	2020-01-02 03:35:42	2020-01-01 00:07:21.000	2020-01-02 03:35:42.000	441	99342	49891.5	4989150	441	99342	49891.5	4989150	-32729	32409	4671.66	467166	-128	127	-0.34	-34
+442	101	10432	99343	1.32732	298.32732	149.82732	14982.73273	1.32732	298.32733	149.82732	14982.7329	1.32732	298.32732	149.82732	14982.732	2020-01-01	2020-01-02	2020-01-01 00:07:22	2020-01-02 03:35:43	2020-01-01 00:07:22.000	2020-01-02 03:35:43.000	442	99343	49892.5	4989250	442	99343	49892.5	4989250	-32728	32410	4672.66	467266	-128	123	-1.9	-190
+443	101	10433	99344	1.33033	298.33033	149.83033	14983.03303	1.33033	298.33032	149.83033	14983.03319	1.33033	298.33033	149.83033	14983.033	2020-01-01	2020-01-02	2020-01-01 00:07:23	2020-01-02 03:35:44	2020-01-01 00:07:23.000	2020-01-02 03:35:44.000	443	99344	49893.5	4989350	443	99344	49893.5	4989350	-32727	32411	4673.66	467366	-127	124	-0.9	-90
+444	101	10434	99345	1.33333	298.33333	149.83333	14983.33333	1.33333	298.33334	149.83333	14983.33331	1.33333	298.33333	149.83333000000002	14983.333	2020-01-01	2020-01-02	2020-01-01 00:07:24	2020-01-02 03:35:45	2020-01-01 00:07:24.000	2020-01-02 03:35:45.000	444	99345	49894.5	4989450	444	99345	49894.5	4989450	-32726	32412	4674.66	467466	-126	125	0.1	10
+445	101	10435	99346	1.33633	298.33633	149.83633	14983.63363	1.33633	298.33633	149.83633	14983.63348	1.33633	298.33633	149.83633	14983.633	2020-01-01	2020-01-02	2020-01-01 00:07:25	2020-01-02 03:35:46	2020-01-01 00:07:25.000	2020-01-02 03:35:46.000	445	99346	49895.5	4989550	445	99346	49895.5	4989550	-32725	32413	4675.66	467566	-125	126	1.1	110
+446	101	10436	99347	1.33933	298.33933	149.83933	14983.93393	1.33933	298.33932	149.83933	14983.93378	1.33933	298.33933	149.83933000000002	14983.933	2020-01-01	2020-01-02	2020-01-01 00:07:26	2020-01-02 03:35:47	2020-01-01 00:07:26.000	2020-01-02 03:35:47.000	446	99347	49896.5	4989650	446	99347	49896.5	4989650	-32724	32414	4676.66	467666	-124	127	2.1	210
+447	101	10437	99348	1.34234	298.34234	149.84234	14984.23423	1.34234	298.34235	149.84234	14984.23437	1.34234	298.34234	149.84234	14984.234	2020-01-01	2020-01-02	2020-01-01 00:07:27	2020-01-02 03:35:48	2020-01-01 00:07:27.000	2020-01-02 03:35:48.000	447	99348	49897.5	4989750	447	99348	49897.5	4989750	-32723	32415	4677.66	467766	-128	127	0.54	54
+448	101	10438	99349	1.34534	298.34534	149.84534	14984.53453	1.34534	298.34534	149.84534	14984.53466	1.34534	298.34534	149.84534	14984.534	2020-01-01	2020-01-02	2020-01-01 00:07:28	2020-01-02 03:35:49	2020-01-01 00:07:28.000	2020-01-02 03:35:49.000	448	99349	49898.5	4989850	448	99349	49898.5	4989850	-32722	32416	4678.66	467866	-128	123	-1.02	-102
+449	101	10439	99350	1.34834	298.34834	149.84834	14984.83483	1.34834	298.34836	149.84834	14984.83478	1.34834	298.34834	149.84834	14984.834	2020-01-01	2020-01-02	2020-01-01 00:07:29	2020-01-02 03:35:50	2020-01-01 00:07:29.000	2020-01-02 03:35:50.000	449	99350	49899.5	4989950	449	99350	49899.5	4989950	-32721	32417	4679.66	467966	-127	124	-0.02	-2
 45	102	10035	99945	0.13513	300.13513	150.13513	15163.64864	0.13513	300.13513	150.13513	15163.64839	0.13513	300.13513	150.13513	15163.64813	2020-01-01	2020-01-02	2020-01-01 00:00:45	2020-01-02 03:45:45	2020-01-01 00:00:45.000	2020-01-02 03:45:45.000	45	99945	49995	5049495	45	99945	49995	5049495	-32524	32411	4574.009900990099	461975	-126	126	-1.0396039603960396	-105
-450	101	10440	99351	1.35135	298.35135	149.85135	14985.13513	1.35135	298.35135	149.85134	14985.13495	1.35135	298.35135	149.85135	14985.13500	2020-01-01	2020-01-02	2020-01-01 00:07:30	2020-01-02 03:35:51	2020-01-01 00:07:30.000	2020-01-02 03:35:51.000	450	99351	49900.5	4990050	450	99351	49900.5	4990050	-32720	32418	4680.66	468066	-126	125	0.98	98
-451	101	10441	99352	1.35435	298.35435	149.85435	14985.43543	1.35435	298.35434	149.85435	14985.43525	1.35435	298.35435	149.85434999999998	14985.43500	2020-01-01	2020-01-02	2020-01-01 00:07:31	2020-01-02 03:35:52	2020-01-01 00:07:31.000	2020-01-02 03:35:52.000	451	99352	49901.5	4990150	451	99352	49901.5	4990150	-32719	32419	4681.66	468166	-125	126	1.98	198
-452	101	10442	99353	1.35735	298.35735	149.85735	14985.73573	1.35735	298.35736	149.85736	14985.736	1.35735	298.35735	149.85735	14985.73500	2020-01-01	2020-01-02	2020-01-01 00:07:32	2020-01-02 03:35:53	2020-01-01 00:07:32.000	2020-01-02 03:35:53.000	452	99353	49902.5	4990250	452	99353	49902.5	4990250	-32718	32420	4682.66	468266	-124	127	2.98	298
-453	101	10443	99354	1.36036	298.36036	149.86036	14986.03603	1.36036	298.36035	149.86036	14986.03614	1.36036	298.36036	149.86036000000001	14986.03600	2020-01-01	2020-01-02	2020-01-01 00:07:33	2020-01-02 03:35:54	2020-01-01 00:07:33.000	2020-01-02 03:35:54.000	453	99354	49903.5	4990350	453	99354	49903.5	4990350	-32717	32421	4683.66	468366	-128	127	1.42	142
-454	101	10444	99355	1.36336	298.36336	149.86336	14986.33633	1.36336	298.36337	149.86336	14986.33629	1.36336	298.36336	149.86336	14986.33600	2020-01-01	2020-01-02	2020-01-01 00:07:34	2020-01-02 03:35:55	2020-01-01 00:07:34.000	2020-01-02 03:35:55.000	454	99355	49904.5	4990450	454	99355	49904.5	4990450	-32716	32422	4684.66	468466	-128	127	-0.14	-14
-455	101	10445	99356	1.36636	298.36636	149.86636	14986.63663	1.36636	298.36636	149.86636	14986.63641	1.36636	298.36636	149.86636000000001	14986.63600	2020-01-01	2020-01-02	2020-01-01 00:07:35	2020-01-02 03:35:56	2020-01-01 00:07:35.000	2020-01-02 03:35:56.000	455	99356	49905.5	4990550	455	99356	49905.5	4990550	-32715	32423	4685.66	468566	-128	124	-1.7	-170
-456	101	10446	99357	1.36936	298.36936	149.86936	14986.93693	1.36936	298.36935	149.86936	14986.93672	1.36936	298.36936	149.86936	14986.93600	2020-01-01	2020-01-02	2020-01-01 00:07:36	2020-01-02 03:35:57	2020-01-01 00:07:36.000	2020-01-02 03:35:57.000	456	99357	49906.5	4990650	456	99357	49906.5	4990650	-32714	32424	4686.66	468666	-127	125	-0.7	-70
-457	101	10447	99358	1.37237	298.37237	149.87237	14987.23723	1.37237	298.37238	149.87237	14987.23747	1.37237	298.37237	149.87237	14987.23700	2020-01-01	2020-01-02	2020-01-01 00:07:37	2020-01-02 03:35:58	2020-01-01 00:07:37.000	2020-01-02 03:35:58.000	457	99358	49907.5	4990750	457	99358	49907.5	4990750	-32713	32425	4687.66	468766	-126	126	0.3	30
-458	101	10448	99359	1.37537	298.37537	149.87537	14987.53753	1.37537	298.37537	149.87537	14987.5376	1.37537	298.37537	149.87537	14987.53700	2020-01-01	2020-01-02	2020-01-01 00:07:38	2020-01-02 03:35:59	2020-01-01 00:07:38.000	2020-01-02 03:35:59.000	458	99359	49908.5	4990850	458	99359	49908.5	4990850	-32712	32426	4688.66	468866	-125	127	1.3	130
-459	101	10449	99360	1.37837	298.37837	149.87837	14987.83783	1.37837	298.3784	149.87837	14987.83775	1.37837	298.37837	149.87837	14987.83700	2020-01-01	2020-01-02	2020-01-01 00:07:39	2020-01-02 03:36:00	2020-01-01 00:07:39.000	2020-01-02 03:36:00.000	459	99360	49909.5	4990950	459	99360	49909.5	4990950	-32711	32427	4689.66	468966	-128	127	-0.26	-26
+450	101	10440	99351	1.35135	298.35135	149.85135	14985.13513	1.35135	298.35135	149.85134	14985.13495	1.35135	298.35135	149.85135	14985.135	2020-01-01	2020-01-02	2020-01-01 00:07:30	2020-01-02 03:35:51	2020-01-01 00:07:30.000	2020-01-02 03:35:51.000	450	99351	49900.5	4990050	450	99351	49900.5	4990050	-32720	32418	4680.66	468066	-126	125	0.98	98
+451	101	10441	99352	1.35435	298.35435	149.85435	14985.43543	1.35435	298.35434	149.85435	14985.43525	1.35435	298.35435	149.85434999999998	14985.435	2020-01-01	2020-01-02	2020-01-01 00:07:31	2020-01-02 03:35:52	2020-01-01 00:07:31.000	2020-01-02 03:35:52.000	451	99352	49901.5	4990150	451	99352	49901.5	4990150	-32719	32419	4681.66	468166	-125	126	1.98	198
+452	101	10442	99353	1.35735	298.35735	149.85735	14985.73573	1.35735	298.35736	149.85736	14985.736	1.35735	298.35735	149.85735	14985.735	2020-01-01	2020-01-02	2020-01-01 00:07:32	2020-01-02 03:35:53	2020-01-01 00:07:32.000	2020-01-02 03:35:53.000	452	99353	49902.5	4990250	452	99353	49902.5	4990250	-32718	32420	4682.66	468266	-124	127	2.98	298
+453	101	10443	99354	1.36036	298.36036	149.86036	14986.03603	1.36036	298.36035	149.86036	14986.03614	1.36036	298.36036	149.86036000000001	14986.036	2020-01-01	2020-01-02	2020-01-01 00:07:33	2020-01-02 03:35:54	2020-01-01 00:07:33.000	2020-01-02 03:35:54.000	453	99354	49903.5	4990350	453	99354	49903.5	4990350	-32717	32421	4683.66	468366	-128	127	1.42	142
+454	101	10444	99355	1.36336	298.36336	149.86336	14986.33633	1.36336	298.36337	149.86336	14986.33629	1.36336	298.36336	149.86336	14986.336	2020-01-01	2020-01-02	2020-01-01 00:07:34	2020-01-02 03:35:55	2020-01-01 00:07:34.000	2020-01-02 03:35:55.000	454	99355	49904.5	4990450	454	99355	49904.5	4990450	-32716	32422	4684.66	468466	-128	127	-0.14	-14
+455	101	10445	99356	1.36636	298.36636	149.86636	14986.63663	1.36636	298.36636	149.86636	14986.63641	1.36636	298.36636	149.86636000000001	14986.636	2020-01-01	2020-01-02	2020-01-01 00:07:35	2020-01-02 03:35:56	2020-01-01 00:07:35.000	2020-01-02 03:35:56.000	455	99356	49905.5	4990550	455	99356	49905.5	4990550	-32715	32423	4685.66	468566	-128	124	-1.7	-170
+456	101	10446	99357	1.36936	298.36936	149.86936	14986.93693	1.36936	298.36935	149.86936	14986.93672	1.36936	298.36936	149.86936	14986.936	2020-01-01	2020-01-02	2020-01-01 00:07:36	2020-01-02 03:35:57	2020-01-01 00:07:36.000	2020-01-02 03:35:57.000	456	99357	49906.5	4990650	456	99357	49906.5	4990650	-32714	32424	4686.66	468666	-127	125	-0.7	-70
+457	101	10447	99358	1.37237	298.37237	149.87237	14987.23723	1.37237	298.37238	149.87237	14987.23747	1.37237	298.37237	149.87237	14987.237	2020-01-01	2020-01-02	2020-01-01 00:07:37	2020-01-02 03:35:58	2020-01-01 00:07:37.000	2020-01-02 03:35:58.000	457	99358	49907.5	4990750	457	99358	49907.5	4990750	-32713	32425	4687.66	468766	-126	126	0.3	30
+458	101	10448	99359	1.37537	298.37537	149.87537	14987.53753	1.37537	298.37537	149.87537	14987.5376	1.37537	298.37537	149.87537	14987.537	2020-01-01	2020-01-02	2020-01-01 00:07:38	2020-01-02 03:35:59	2020-01-01 00:07:38.000	2020-01-02 03:35:59.000	458	99359	49908.5	4990850	458	99359	49908.5	4990850	-32712	32426	4688.66	468866	-125	127	1.3	130
+459	101	10449	99360	1.37837	298.37837	149.87837	14987.83783	1.37837	298.3784	149.87837	14987.83775	1.37837	298.37837	149.87837	14987.837	2020-01-01	2020-01-02	2020-01-01 00:07:39	2020-01-02 03:36:00	2020-01-01 00:07:39.000	2020-01-02 03:36:00.000	459	99360	49909.5	4990950	459	99360	49909.5	4990950	-32711	32427	4689.66	468966	-128	127	-0.26	-26
 46	102	10036	99946	0.13813	300.13813	150.13813	15163.95195	0.13813	300.13815	150.13814	15163.95214	0.13813	300.13813	150.13813	15163.95113	2020-01-01	2020-01-02	2020-01-01 00:00:46	2020-01-02 03:45:46	2020-01-01 00:00:46.000	2020-01-02 03:45:46.000	46	99946	49996	5049596	46	99946	49996	5049596	-32523	32412	4575.009900990099	462076	-125	127	-0.039603960396039604	-4
-460	101	10450	99361	1.38138	298.38138	149.88138	14988.13813	1.38138	298.38138	149.88137	14988.13789	1.38138	298.38138	149.88138	14988.13800	2020-01-01	2020-01-02	2020-01-01 00:07:40	2020-01-02 03:36:01	2020-01-01 00:07:40.000	2020-01-02 03:36:01.000	460	99361	49910.5	4991050	460	99361	49910.5	4991050	-32710	32428	4690.66	469066	-128	127	-1.82	-182
-461	101	10451	99362	1.38438	298.38438	149.88438	14988.43843	1.38438	298.3844	149.88438	14988.43864	1.38438	298.38438	149.88438	14988.43800	2020-01-01	2020-01-02	2020-01-01 00:07:41	2020-01-02 03:36:02	2020-01-01 00:07:41.000	2020-01-02 03:36:02.000	461	99362	49911.5	4991150	461	99362	49911.5	4991150	-32709	32429	4691.66	469166	-128	123	-3.38	-338
-462	101	10452	99363	1.38738	298.38738	149.88738	14988.73873	1.38738	298.3874	149.88738	14988.73894	1.38738	298.38738	149.88738	14988.73800	2020-01-01	2020-01-02	2020-01-01 00:07:42	2020-01-02 03:36:03	2020-01-01 00:07:42.000	2020-01-02 03:36:03.000	462	99363	49912.5	4991250	462	99363	49912.5	4991250	-32708	32430	4692.66	469266	-127	124	-2.38	-238
-463	101	10453	99364	1.39039	298.39039	149.89039	14989.03903	1.39039	298.39038	149.89039	14989.03907	1.39039	298.39039	149.89039	14989.03900	2020-01-01	2020-01-02	2020-01-01 00:07:43	2020-01-02 03:36:04	2020-01-01 00:07:43.000	2020-01-02 03:36:04.000	463	99364	49913.5	4991350	463	99364	49913.5	4991350	-32707	32431	4693.66	469366	-126	125	-1.38	-138
-464	101	10454	99365	1.39339	298.39339	149.89339	14989.33933	1.39339	298.3934	149.89339	14989.33922	1.39339	298.39339	149.89339	14989.33900	2020-01-01	2020-01-02	2020-01-01 00:07:44	2020-01-02 03:36:05	2020-01-01 00:07:44.000	2020-01-02 03:36:05.000	464	99365	49914.5	4991450	464	99365	49914.5	4991450	-32706	32432	4694.66	469466	-125	126	-0.38	-38
-465	101	10455	99366	1.39639	298.39639	149.89639	14989.63963	1.39639	298.3964	149.89639	14989.63936	1.39639	298.39639	149.89639	14989.63900	2020-01-01	2020-01-02	2020-01-01 00:07:45	2020-01-02 03:36:06	2020-01-01 00:07:45.000	2020-01-02 03:36:06.000	465	99366	49915.5	4991550	465	99366	49915.5	4991550	-32705	32433	4695.66	469566	-124	127	0.62	62
-466	101	10456	99367	1.39939	298.39939	149.89939	14989.93993	1.39939	298.3994	149.8994	14989.94011	1.39939	298.39939	149.89939	14989.93900	2020-01-01	2020-01-02	2020-01-01 00:07:46	2020-01-02 03:36:07	2020-01-01 00:07:46.000	2020-01-02 03:36:07.000	466	99367	49916.5	4991650	466	99367	49916.5	4991650	-32704	32434	4696.66	469666	-128	127	-0.94	-94
-467	101	10457	99368	1.4024	298.4024	149.9024	14990.24024	1.4024	298.4024	149.9024	14990.24041	1.40240	298.40240	149.9024	14990.24000	2020-01-01	2020-01-02	2020-01-01 00:07:47	2020-01-02 03:36:08	2020-01-01 00:07:47.000	2020-01-02 03:36:08.000	467	99368	49917.5	4991750	467	99368	49917.5	4991750	-32703	32435	4697.66	469766	-128	123	-2.5	-250
-468	101	10458	99369	1.4054	298.4054	149.9054	14990.54054	1.4054	298.4054	149.9054	14990.54058	1.40540	298.40540	149.90540000000001	14990.54000	2020-01-01	2020-01-02	2020-01-01 00:07:48	2020-01-02 03:36:09	2020-01-01 00:07:48.000	2020-01-02 03:36:09.000	468	99369	49918.5	4991850	468	99369	49918.5	4991850	-32702	32436	4698.66	469866	-127	124	-1.5	-150
-469	101	10459	99370	1.4084	298.4084	149.9084	14990.84084	1.4084	298.40842	149.9084	14990.8407	1.40840	298.40840	149.9084	14990.84000	2020-01-01	2020-01-02	2020-01-01 00:07:49	2020-01-02 03:36:10	2020-01-01 00:07:49.000	2020-01-02 03:36:10.000	469	99370	49919.5	4991950	469	99370	49919.5	4991950	-32701	32437	4699.66	469966	-126	125	-0.5	-50
+460	101	10450	99361	1.38138	298.38138	149.88138	14988.13813	1.38138	298.38138	149.88137	14988.13789	1.38138	298.38138	149.88138	14988.138	2020-01-01	2020-01-02	2020-01-01 00:07:40	2020-01-02 03:36:01	2020-01-01 00:07:40.000	2020-01-02 03:36:01.000	460	99361	49910.5	4991050	460	99361	49910.5	4991050	-32710	32428	4690.66	469066	-128	127	-1.82	-182
+461	101	10451	99362	1.38438	298.38438	149.88438	14988.43843	1.38438	298.3844	149.88438	14988.43864	1.38438	298.38438	149.88438	14988.438	2020-01-01	2020-01-02	2020-01-01 00:07:41	2020-01-02 03:36:02	2020-01-01 00:07:41.000	2020-01-02 03:36:02.000	461	99362	49911.5	4991150	461	99362	49911.5	4991150	-32709	32429	4691.66	469166	-128	123	-3.38	-338
+462	101	10452	99363	1.38738	298.38738	149.88738	14988.73873	1.38738	298.3874	149.88738	14988.73894	1.38738	298.38738	149.88738	14988.738	2020-01-01	2020-01-02	2020-01-01 00:07:42	2020-01-02 03:36:03	2020-01-01 00:07:42.000	2020-01-02 03:36:03.000	462	99363	49912.5	4991250	462	99363	49912.5	4991250	-32708	32430	4692.66	469266	-127	124	-2.38	-238
+463	101	10453	99364	1.39039	298.39039	149.89039	14989.03903	1.39039	298.39038	149.89039	14989.03907	1.39039	298.39039	149.89039	14989.039	2020-01-01	2020-01-02	2020-01-01 00:07:43	2020-01-02 03:36:04	2020-01-01 00:07:43.000	2020-01-02 03:36:04.000	463	99364	49913.5	4991350	463	99364	49913.5	4991350	-32707	32431	4693.66	469366	-126	125	-1.38	-138
+464	101	10454	99365	1.39339	298.39339	149.89339	14989.33933	1.39339	298.3934	149.89339	14989.33922	1.39339	298.39339	149.89339	14989.339	2020-01-01	2020-01-02	2020-01-01 00:07:44	2020-01-02 03:36:05	2020-01-01 00:07:44.000	2020-01-02 03:36:05.000	464	99365	49914.5	4991450	464	99365	49914.5	4991450	-32706	32432	4694.66	469466	-125	126	-0.38	-38
+465	101	10455	99366	1.39639	298.39639	149.89639	14989.63963	1.39639	298.3964	149.89639	14989.63936	1.39639	298.39639	149.89639	14989.639	2020-01-01	2020-01-02	2020-01-01 00:07:45	2020-01-02 03:36:06	2020-01-01 00:07:45.000	2020-01-02 03:36:06.000	465	99366	49915.5	4991550	465	99366	49915.5	4991550	-32705	32433	4695.66	469566	-124	127	0.62	62
+466	101	10456	99367	1.39939	298.39939	149.89939	14989.93993	1.39939	298.3994	149.8994	14989.94011	1.39939	298.39939	149.89939	14989.939	2020-01-01	2020-01-02	2020-01-01 00:07:46	2020-01-02 03:36:07	2020-01-01 00:07:46.000	2020-01-02 03:36:07.000	466	99367	49916.5	4991650	466	99367	49916.5	4991650	-32704	32434	4696.66	469666	-128	127	-0.94	-94
+467	101	10457	99368	1.4024	298.4024	149.9024	14990.24024	1.4024	298.4024	149.9024	14990.24041	1.4024	298.4024	149.9024	14990.24	2020-01-01	2020-01-02	2020-01-01 00:07:47	2020-01-02 03:36:08	2020-01-01 00:07:47.000	2020-01-02 03:36:08.000	467	99368	49917.5	4991750	467	99368	49917.5	4991750	-32703	32435	4697.66	469766	-128	123	-2.5	-250
+468	101	10458	99369	1.4054	298.4054	149.9054	14990.54054	1.4054	298.4054	149.9054	14990.54058	1.4054	298.4054	149.90540000000001	14990.54	2020-01-01	2020-01-02	2020-01-01 00:07:48	2020-01-02 03:36:09	2020-01-01 00:07:48.000	2020-01-02 03:36:09.000	468	99369	49918.5	4991850	468	99369	49918.5	4991850	-32702	32436	4698.66	469866	-127	124	-1.5	-150
+469	101	10459	99370	1.4084	298.4084	149.9084	14990.84084	1.4084	298.40842	149.9084	14990.8407	1.4084	298.4084	149.9084	14990.84	2020-01-01	2020-01-02	2020-01-01 00:07:49	2020-01-02 03:36:10	2020-01-01 00:07:49.000	2020-01-02 03:36:10.000	469	99370	49919.5	4991950	469	99370	49919.5	4991950	-32701	32437	4699.66	469966	-126	125	-0.5	-50
 47	102	10037	99947	0.14114	300.14114	150.14114	15164.25525	0.14114	300.14114	150.14114	15164.25545	0.14114	300.14114	150.14114	15164.25514	2020-01-01	2020-01-02	2020-01-01 00:00:47	2020-01-02 03:45:47	2020-01-01 00:00:47.000	2020-01-02 03:45:47.000	47	99947	49997	5049697	47	99947	49997	5049697	-32522	32413	4576.009900990099	462177	-128	127	-1.5742574257425743	-159
-470	101	10460	99371	1.41141	298.41141	149.91141	14991.14114	1.41141	298.4114	149.9114	14991.14099	1.41141	298.41141	149.91141	14991.14100	2020-01-01	2020-01-02	2020-01-01 00:07:50	2020-01-02 03:36:11	2020-01-01 00:07:50.000	2020-01-02 03:36:11.000	470	99371	49920.5	4992050	470	99371	49920.5	4992050	-32700	32438	4700.66	470066	-125	126	0.5	50
-471	101	10461	99372	1.41441	298.41441	149.91441	14991.44144	1.41441	298.41443	149.91441	14991.44159	1.41441	298.41441	149.91441	14991.44100	2020-01-01	2020-01-02	2020-01-01 00:07:51	2020-01-02 03:36:12	2020-01-01 00:07:51.000	2020-01-02 03:36:12.000	471	99372	49921.5	4992150	471	99372	49921.5	4992150	-32699	32439	4701.66	470166	-124	127	1.5	150
-472	101	10462	99373	1.41741	298.41741	149.91741	14991.74174	1.41741	298.41742	149.91741	14991.74188	1.41741	298.41741	149.91741	14991.74100	2020-01-01	2020-01-02	2020-01-01 00:07:52	2020-01-02 03:36:13	2020-01-01 00:07:52.000	2020-01-02 03:36:13.000	472	99373	49922.5	4992250	472	99373	49922.5	4992250	-32698	32440	4702.66	470266	-128	127	-0.06	-6
-473	101	10463	99374	1.42042	298.42042	149.92042	14992.04204	1.42042	298.4204	149.92042	14992.04204	1.42042	298.42042	149.92042	14992.04200	2020-01-01	2020-01-02	2020-01-01 00:07:53	2020-01-02 03:36:14	2020-01-01 00:07:53.000	2020-01-02 03:36:14.000	473	99374	49923.5	4992350	473	99374	49923.5	4992350	-32697	32441	4703.66	470366	-128	123	-1.62	-162
-474	101	10464	99375	1.42342	298.42342	149.92342	14992.34234	1.42342	298.42343	149.92342	14992.34216	1.42342	298.42342	149.92342	14992.34200	2020-01-01	2020-01-02	2020-01-01 00:07:54	2020-01-02 03:36:15	2020-01-01 00:07:54.000	2020-01-02 03:36:15.000	474	99375	49924.5	4992450	474	99375	49924.5	4992450	-32696	32442	4704.66	470466	-127	124	-0.62	-62
-475	101	10465	99376	1.42642	298.42642	149.92642	14992.64264	1.42642	298.42642	149.92642	14992.64246	1.42642	298.42642	149.92642	14992.64200	2020-01-01	2020-01-02	2020-01-01 00:07:55	2020-01-02 03:36:16	2020-01-01 00:07:55.000	2020-01-02 03:36:16.000	475	99376	49925.5	4992550	475	99376	49925.5	4992550	-32695	32443	4705.66	470566	-126	125	0.38	38
-476	101	10466	99377	1.42942	298.42942	149.92942	14992.94294	1.42942	298.42944	149.92943	14992.94305	1.42942	298.42942	149.92942	14992.94200	2020-01-01	2020-01-02	2020-01-01 00:07:56	2020-01-02 03:36:17	2020-01-01 00:07:56.000	2020-01-02 03:36:17.000	476	99377	49926.5	4992650	476	99377	49926.5	4992650	-32694	32444	4706.66	470666	-125	126	1.38	138
-477	101	10467	99378	1.43243	298.43243	149.93243	14993.24324	1.43243	298.43243	149.93243	14993.24338	1.43243	298.43243	149.93243	14993.24300	2020-01-01	2020-01-02	2020-01-01 00:07:57	2020-01-02 03:36:18	2020-01-01 00:07:57.000	2020-01-02 03:36:18.000	477	99378	49927.5	4992750	477	99378	49927.5	4992750	-32693	32445	4707.66	470766	-124	127	2.38	238
-478	101	10468	99379	1.43543	298.43543	149.93543	14993.54354	1.43543	298.43542	149.93543	14993.54352	1.43543	298.43543	149.93543	14993.54300	2020-01-01	2020-01-02	2020-01-01 00:07:58	2020-01-02 03:36:19	2020-01-01 00:07:58.000	2020-01-02 03:36:19.000	478	99379	49928.5	4992850	478	99379	49928.5	4992850	-32692	32446	4708.66	470866	-128	127	0.82	82
-479	101	10469	99380	1.43843	298.43843	149.93843	14993.84384	1.43843	298.43845	149.93844	14993.84427	1.43843	298.43843	149.93843	14993.84300	2020-01-01	2020-01-02	2020-01-01 00:07:59	2020-01-02 03:36:20	2020-01-01 00:07:59.000	2020-01-02 03:36:20.000	479	99380	49929.5	4992950	479	99380	49929.5	4992950	-32691	32447	4709.66	470966	-128	127	-0.74	-74
+470	101	10460	99371	1.41141	298.41141	149.91141	14991.14114	1.41141	298.4114	149.9114	14991.14099	1.41141	298.41141	149.91141	14991.141	2020-01-01	2020-01-02	2020-01-01 00:07:50	2020-01-02 03:36:11	2020-01-01 00:07:50.000	2020-01-02 03:36:11.000	470	99371	49920.5	4992050	470	99371	49920.5	4992050	-32700	32438	4700.66	470066	-125	126	0.5	50
+471	101	10461	99372	1.41441	298.41441	149.91441	14991.44144	1.41441	298.41443	149.91441	14991.44159	1.41441	298.41441	149.91441	14991.441	2020-01-01	2020-01-02	2020-01-01 00:07:51	2020-01-02 03:36:12	2020-01-01 00:07:51.000	2020-01-02 03:36:12.000	471	99372	49921.5	4992150	471	99372	49921.5	4992150	-32699	32439	4701.66	470166	-124	127	1.5	150
+472	101	10462	99373	1.41741	298.41741	149.91741	14991.74174	1.41741	298.41742	149.91741	14991.74188	1.41741	298.41741	149.91741	14991.741	2020-01-01	2020-01-02	2020-01-01 00:07:52	2020-01-02 03:36:13	2020-01-01 00:07:52.000	2020-01-02 03:36:13.000	472	99373	49922.5	4992250	472	99373	49922.5	4992250	-32698	32440	4702.66	470266	-128	127	-0.06	-6
+473	101	10463	99374	1.42042	298.42042	149.92042	14992.04204	1.42042	298.4204	149.92042	14992.04204	1.42042	298.42042	149.92042	14992.042	2020-01-01	2020-01-02	2020-01-01 00:07:53	2020-01-02 03:36:14	2020-01-01 00:07:53.000	2020-01-02 03:36:14.000	473	99374	49923.5	4992350	473	99374	49923.5	4992350	-32697	32441	4703.66	470366	-128	123	-1.62	-162
+474	101	10464	99375	1.42342	298.42342	149.92342	14992.34234	1.42342	298.42343	149.92342	14992.34216	1.42342	298.42342	149.92342	14992.342	2020-01-01	2020-01-02	2020-01-01 00:07:54	2020-01-02 03:36:15	2020-01-01 00:07:54.000	2020-01-02 03:36:15.000	474	99375	49924.5	4992450	474	99375	49924.5	4992450	-32696	32442	4704.66	470466	-127	124	-0.62	-62
+475	101	10465	99376	1.42642	298.42642	149.92642	14992.64264	1.42642	298.42642	149.92642	14992.64246	1.42642	298.42642	149.92642	14992.642	2020-01-01	2020-01-02	2020-01-01 00:07:55	2020-01-02 03:36:16	2020-01-01 00:07:55.000	2020-01-02 03:36:16.000	475	99376	49925.5	4992550	475	99376	49925.5	4992550	-32695	32443	4705.66	470566	-126	125	0.38	38
+476	101	10466	99377	1.42942	298.42942	149.92942	14992.94294	1.42942	298.42944	149.92943	14992.94305	1.42942	298.42942	149.92942	14992.942	2020-01-01	2020-01-02	2020-01-01 00:07:56	2020-01-02 03:36:17	2020-01-01 00:07:56.000	2020-01-02 03:36:17.000	476	99377	49926.5	4992650	476	99377	49926.5	4992650	-32694	32444	4706.66	470666	-125	126	1.38	138
+477	101	10467	99378	1.43243	298.43243	149.93243	14993.24324	1.43243	298.43243	149.93243	14993.24338	1.43243	298.43243	149.93243	14993.243	2020-01-01	2020-01-02	2020-01-01 00:07:57	2020-01-02 03:36:18	2020-01-01 00:07:57.000	2020-01-02 03:36:18.000	477	99378	49927.5	4992750	477	99378	49927.5	4992750	-32693	32445	4707.66	470766	-124	127	2.38	238
+478	101	10468	99379	1.43543	298.43543	149.93543	14993.54354	1.43543	298.43542	149.93543	14993.54352	1.43543	298.43543	149.93543	14993.543	2020-01-01	2020-01-02	2020-01-01 00:07:58	2020-01-02 03:36:19	2020-01-01 00:07:58.000	2020-01-02 03:36:19.000	478	99379	49928.5	4992850	478	99379	49928.5	4992850	-32692	32446	4708.66	470866	-128	127	0.82	82
+479	101	10469	99380	1.43843	298.43843	149.93843	14993.84384	1.43843	298.43845	149.93844	14993.84427	1.43843	298.43843	149.93843	14993.843	2020-01-01	2020-01-02	2020-01-01 00:07:59	2020-01-02 03:36:20	2020-01-01 00:07:59.000	2020-01-02 03:36:20.000	479	99380	49929.5	4992950	479	99380	49929.5	4992950	-32691	32447	4709.66	470966	-128	127	-0.74	-74
 48	102	10038	99948	0.14414	300.14414	150.14414	15164.55855	0.14414	300.14413	150.14414	15164.55863	0.14414	300.14414	150.14414	15164.55814	2020-01-01	2020-01-02	2020-01-01 00:00:48	2020-01-02 03:45:48	2020-01-01 00:00:48.000	2020-01-02 03:45:48.000	48	99948	49998	5049798	48	99948	49998	5049798	-32521	32414	4577.009900990099	462278	-128	127	-3.108910891089109	-314
-480	101	10470	99381	1.44144	298.44144	149.94144	14994.14414	1.44144	298.44144	149.94143	14994.14392	1.44144	298.44144	149.94144	14994.14400	2020-01-01	2020-01-02	2020-01-01 00:08:00	2020-01-02 03:36:21	2020-01-01 00:08:00.000	2020-01-02 03:36:21.000	480	99381	49930.5	4993050	480	99381	49930.5	4993050	-32690	32448	4710.66	471066	-128	124	-2.3	-230
-481	101	10471	99382	1.44444	298.44444	149.94444	14994.44444	1.44444	298.44446	149.94444	14994.44452	1.44444	298.44444	149.94444	14994.44400	2020-01-01	2020-01-02	2020-01-01 00:08:01	2020-01-02 03:36:22	2020-01-01 00:08:01.000	2020-01-02 03:36:22.000	481	99382	49931.5	4993150	481	99382	49931.5	4993150	-32689	32449	4711.66	471166	-127	125	-1.3	-130
-482	101	10472	99383	1.44744	298.44744	149.94744	14994.74474	1.44744	298.44745	149.94744	14994.74485	1.44744	298.44744	149.94744	14994.74400	2020-01-01	2020-01-02	2020-01-01 00:08:02	2020-01-02 03:36:23	2020-01-01 00:08:02.000	2020-01-02 03:36:23.000	482	99383	49932.5	4993250	482	99383	49932.5	4993250	-32688	32450	4712.66	471266	-126	126	-0.3	-30
-483	101	10473	99384	1.45045	298.45045	149.95045	14995.04504	1.45045	298.45044	149.95044	14995.04499	1.45045	298.45045	149.95045	14995.04500	2020-01-01	2020-01-02	2020-01-01 00:08:03	2020-01-02 03:36:24	2020-01-01 00:08:03.000	2020-01-02 03:36:24.000	483	99384	49933.5	4993350	483	99384	49933.5	4993350	-32687	32451	4713.66	471366	-125	127	0.7	70
-484	101	10474	99385	1.45345	298.45345	149.95345	14995.34534	1.45345	298.45346	149.95345	14995.34574	1.45345	298.45345	149.95345	14995.34500	2020-01-01	2020-01-02	2020-01-01 00:08:04	2020-01-02 03:36:25	2020-01-01 00:08:04.000	2020-01-02 03:36:25.000	484	99385	49934.5	4993450	484	99385	49934.5	4993450	-32686	32452	4714.66	471466	-128	127	-0.86	-86
-485	101	10475	99386	1.45645	298.45645	149.95645	14995.64564	1.45645	298.45645	149.95645	14995.6454	1.45645	298.45645	149.95645000000002	14995.64500	2020-01-01	2020-01-02	2020-01-01 00:08:05	2020-01-02 03:36:26	2020-01-01 00:08:05.000	2020-01-02 03:36:26.000	485	99386	49935.5	4993550	485	99386	49935.5	4993550	-32685	32453	4715.66	471566	-128	127	-2.42	-242
-486	101	10476	99387	1.45945	298.45945	149.95945	14995.94594	1.45945	298.45947	149.95946	14995.94602	1.45945	298.45945	149.95945	14995.94500	2020-01-01	2020-01-02	2020-01-01 00:08:06	2020-01-02 03:36:27	2020-01-01 00:08:06.000	2020-01-02 03:36:27.000	486	99387	49936.5	4993650	486	99387	49936.5	4993650	-32684	32454	4716.66	471666	-128	123	-3.98	-398
-487	101	10477	99388	1.46246	298.46246	149.96246	14996.24624	1.46246	298.46246	149.96246	14996.24633	1.46246	298.46246	149.96246	14996.24600	2020-01-01	2020-01-02	2020-01-01 00:08:07	2020-01-02 03:36:28	2020-01-01 00:08:07.000	2020-01-02 03:36:28.000	487	99388	49937.5	4993750	487	99388	49937.5	4993750	-32683	32455	4717.66	471766	-127	124	-2.98	-298
-488	101	10478	99389	1.46546	298.46546	149.96546	14996.54654	1.46546	298.46545	149.96546	14996.54645	1.46546	298.46546	149.96546	14996.54600	2020-01-01	2020-01-02	2020-01-01 00:08:08	2020-01-02 03:36:29	2020-01-01 00:08:08.000	2020-01-02 03:36:29.000	488	99389	49938.5	4993850	488	99389	49938.5	4993850	-32682	32456	4718.66	471866	-126	125	-1.98	-198
-489	101	10479	99390	1.46846	298.46846	149.96846	14996.84684	1.46846	298.46848	149.96847	14996.84721	1.46846	298.46846	149.96846	14996.84600	2020-01-01	2020-01-02	2020-01-01 00:08:09	2020-01-02 03:36:30	2020-01-01 00:08:09.000	2020-01-02 03:36:30.000	489	99390	49939.5	4993950	489	99390	49939.5	4993950	-32681	32457	4719.66	471966	-125	126	-0.98	-98
+480	101	10470	99381	1.44144	298.44144	149.94144	14994.14414	1.44144	298.44144	149.94143	14994.14392	1.44144	298.44144	149.94144	14994.144	2020-01-01	2020-01-02	2020-01-01 00:08:00	2020-01-02 03:36:21	2020-01-01 00:08:00.000	2020-01-02 03:36:21.000	480	99381	49930.5	4993050	480	99381	49930.5	4993050	-32690	32448	4710.66	471066	-128	124	-2.3	-230
+481	101	10471	99382	1.44444	298.44444	149.94444	14994.44444	1.44444	298.44446	149.94444	14994.44452	1.44444	298.44444	149.94444	14994.444	2020-01-01	2020-01-02	2020-01-01 00:08:01	2020-01-02 03:36:22	2020-01-01 00:08:01.000	2020-01-02 03:36:22.000	481	99382	49931.5	4993150	481	99382	49931.5	4993150	-32689	32449	4711.66	471166	-127	125	-1.3	-130
+482	101	10472	99383	1.44744	298.44744	149.94744	14994.74474	1.44744	298.44745	149.94744	14994.74485	1.44744	298.44744	149.94744	14994.744	2020-01-01	2020-01-02	2020-01-01 00:08:02	2020-01-02 03:36:23	2020-01-01 00:08:02.000	2020-01-02 03:36:23.000	482	99383	49932.5	4993250	482	99383	49932.5	4993250	-32688	32450	4712.66	471266	-126	126	-0.3	-30
+483	101	10473	99384	1.45045	298.45045	149.95045	14995.04504	1.45045	298.45044	149.95044	14995.04499	1.45045	298.45045	149.95045	14995.045	2020-01-01	2020-01-02	2020-01-01 00:08:03	2020-01-02 03:36:24	2020-01-01 00:08:03.000	2020-01-02 03:36:24.000	483	99384	49933.5	4993350	483	99384	49933.5	4993350	-32687	32451	4713.66	471366	-125	127	0.7	70
+484	101	10474	99385	1.45345	298.45345	149.95345	14995.34534	1.45345	298.45346	149.95345	14995.34574	1.45345	298.45345	149.95345	14995.345	2020-01-01	2020-01-02	2020-01-01 00:08:04	2020-01-02 03:36:25	2020-01-01 00:08:04.000	2020-01-02 03:36:25.000	484	99385	49934.5	4993450	484	99385	49934.5	4993450	-32686	32452	4714.66	471466	-128	127	-0.86	-86
+485	101	10475	99386	1.45645	298.45645	149.95645	14995.64564	1.45645	298.45645	149.95645	14995.6454	1.45645	298.45645	149.95645000000002	14995.645	2020-01-01	2020-01-02	2020-01-01 00:08:05	2020-01-02 03:36:26	2020-01-01 00:08:05.000	2020-01-02 03:36:26.000	485	99386	49935.5	4993550	485	99386	49935.5	4993550	-32685	32453	4715.66	471566	-128	127	-2.42	-242
+486	101	10476	99387	1.45945	298.45945	149.95945	14995.94594	1.45945	298.45947	149.95946	14995.94602	1.45945	298.45945	149.95945	14995.945	2020-01-01	2020-01-02	2020-01-01 00:08:06	2020-01-02 03:36:27	2020-01-01 00:08:06.000	2020-01-02 03:36:27.000	486	99387	49936.5	4993650	486	99387	49936.5	4993650	-32684	32454	4716.66	471666	-128	123	-3.98	-398
+487	101	10477	99388	1.46246	298.46246	149.96246	14996.24624	1.46246	298.46246	149.96246	14996.24633	1.46246	298.46246	149.96246	14996.246	2020-01-01	2020-01-02	2020-01-01 00:08:07	2020-01-02 03:36:28	2020-01-01 00:08:07.000	2020-01-02 03:36:28.000	487	99388	49937.5	4993750	487	99388	49937.5	4993750	-32683	32455	4717.66	471766	-127	124	-2.98	-298
+488	101	10478	99389	1.46546	298.46546	149.96546	14996.54654	1.46546	298.46545	149.96546	14996.54645	1.46546	298.46546	149.96546	14996.546	2020-01-01	2020-01-02	2020-01-01 00:08:08	2020-01-02 03:36:29	2020-01-01 00:08:08.000	2020-01-02 03:36:29.000	488	99389	49938.5	4993850	488	99389	49938.5	4993850	-32682	32456	4718.66	471866	-126	125	-1.98	-198
+489	101	10479	99390	1.46846	298.46846	149.96846	14996.84684	1.46846	298.46848	149.96847	14996.84721	1.46846	298.46846	149.96846	14996.846	2020-01-01	2020-01-02	2020-01-01 00:08:09	2020-01-02 03:36:30	2020-01-01 00:08:09.000	2020-01-02 03:36:30.000	489	99390	49939.5	4993950	489	99390	49939.5	4993950	-32681	32457	4719.66	471966	-125	126	-0.98	-98
 49	102	10039	99949	0.14714	300.14714	150.14714	15164.86186	0.14714	300.14716	150.14714	15164.86173	0.14714	300.14714	150.14714	15164.86114	2020-01-01	2020-01-02	2020-01-01 00:00:49	2020-01-02 03:45:49	2020-01-01 00:00:49.000	2020-01-02 03:45:49.000	49	99949	49999	5049899	49	99949	49999	5049899	-32520	32415	4578.009900990099	462379	-128	123	-4.643564356435643	-469
-490	101	10480	99391	1.47147	298.47147	149.97147	14997.14714	1.47147	298.47147	149.97146	14997.14687	1.47147	298.47147	149.97147	14997.14700	2020-01-01	2020-01-02	2020-01-01 00:08:10	2020-01-02 03:36:31	2020-01-01 00:08:10.000	2020-01-02 03:36:31.000	490	99391	49940.5	4994050	490	99391	49940.5	4994050	-32680	32458	4720.66	472066	-124	127	0.02	2
-491	101	10481	99392	1.47447	298.47447	149.97447	14997.44744	1.47447	298.4745	149.97447	14997.44749	1.47447	298.47447	149.97447	14997.44700	2020-01-01	2020-01-02	2020-01-01 00:08:11	2020-01-02 03:36:32	2020-01-01 00:08:11.000	2020-01-02 03:36:32.000	491	99392	49941.5	4994150	491	99392	49941.5	4994150	-32679	32459	4721.66	472166	-128	127	-1.54	-154
-492	101	10482	99393	1.47747	298.47747	149.97747	14997.74774	1.47747	298.47748	149.97747	14997.74779	1.47747	298.47747	149.97746999999998	14997.74700	2020-01-01	2020-01-02	2020-01-01 00:08:12	2020-01-02 03:36:33	2020-01-01 00:08:12.000	2020-01-02 03:36:33.000	492	99393	49942.5	4994250	492	99393	49942.5	4994250	-32678	32460	4722.66	472266	-128	123	-3.1	-310
-493	101	10483	99394	1.48048	298.48048	149.98048	14998.04804	1.48048	298.48047	149.98048	14998.04809	1.48048	298.48048	149.98048	14998.04800	2020-01-01	2020-01-02	2020-01-01 00:08:13	2020-01-02 03:36:34	2020-01-01 00:08:13.000	2020-01-02 03:36:34.000	493	99394	49943.5	4994350	493	99394	49943.5	4994350	-32677	32461	4723.66	472366	-127	124	-2.1	-210
-494	101	10484	99395	1.48348	298.48348	149.98348	14998.34834	1.48348	298.4835	149.98348	14998.34868	1.48348	298.48348	149.98348	14998.34800	2020-01-01	2020-01-02	2020-01-01 00:08:14	2020-01-02 03:36:35	2020-01-01 00:08:14.000	2020-01-02 03:36:35.000	494	99395	49944.5	4994450	494	99395	49944.5	4994450	-32676	32462	4724.66	472466	-126	125	-1.1	-110
-495	100	10485	99396	1.48648	298.48648	149.98648	14998.64864	1.48648	298.48648	149.98648	14998.64837	1.48648	298.48648	149.98648	14998.64800	2020-01-01	2020-01-02	2020-01-01 00:08:15	2020-01-02 03:36:36	2020-01-01 00:08:15.000	2020-01-02 03:36:36.000	495	99396	49945.5	4994550	495	99396	49945.5	4994550	-32675	32463	4725.66	472566	-125	126	-0.1	-10
-496	100	10486	99397	1.48948	298.48948	149.98948	14998.94894	1.48948	298.4895	149.98948	14998.94896	1.48948	298.48948	149.98948000000001	14998.94800	2020-01-01	2020-01-02	2020-01-01 00:08:16	2020-01-02 03:36:37	2020-01-01 00:08:16.000	2020-01-02 03:36:37.000	496	99397	49946.5	4994650	496	99397	49946.5	4994650	-32674	32464	4726.66	472666	-124	127	0.9	90
-497	100	10487	99398	1.49249	298.49249	149.99249	14999.24924	1.49249	298.4925	149.99249	14999.24926	1.49249	298.49249	149.99249	14999.24900	2020-01-01	2020-01-02	2020-01-01 00:08:17	2020-01-02 03:36:38	2020-01-01 00:08:17.000	2020-01-02 03:36:38.000	497	99398	49947.5	4994750	497	99398	49947.5	4994750	-32673	32465	4727.66	472766	-128	127	-0.66	-66
-498	100	10488	99399	1.49549	298.49549	149.99549	14999.54954	1.49549	298.49548	149.99549	14999.54956	1.49549	298.49549	149.99549000000002	14999.54900	2020-01-01	2020-01-02	2020-01-01 00:08:18	2020-01-02 03:36:39	2020-01-01 00:08:18.000	2020-01-02 03:36:39.000	498	99399	49948.5	4994850	498	99399	49948.5	4994850	-32672	32466	4728.66	472866	-128	123	-2.22	-222
-499	100	10489	99400	1.49849	298.49849	149.99849	14999.84984	1.49849	298.4985	149.9985	14999.85015	1.49849	298.49849	149.99849	14999.84900	2020-01-01	2020-01-02	2020-01-01 00:08:19	2020-01-02 03:36:40	2020-01-01 00:08:19.000	2020-01-02 03:36:40.000	499	99400	49949.5	4994950	499	99400	49949.5	4994950	-32671	32467	4729.66	472966	-127	124	-1.22	-122
+490	101	10480	99391	1.47147	298.47147	149.97147	14997.14714	1.47147	298.47147	149.97146	14997.14687	1.47147	298.47147	149.97147	14997.147	2020-01-01	2020-01-02	2020-01-01 00:08:10	2020-01-02 03:36:31	2020-01-01 00:08:10.000	2020-01-02 03:36:31.000	490	99391	49940.5	4994050	490	99391	49940.5	4994050	-32680	32458	4720.66	472066	-124	127	0.02	2
+491	101	10481	99392	1.47447	298.47447	149.97447	14997.44744	1.47447	298.4745	149.97447	14997.44749	1.47447	298.47447	149.97447	14997.447	2020-01-01	2020-01-02	2020-01-01 00:08:11	2020-01-02 03:36:32	2020-01-01 00:08:11.000	2020-01-02 03:36:32.000	491	99392	49941.5	4994150	491	99392	49941.5	4994150	-32679	32459	4721.66	472166	-128	127	-1.54	-154
+492	101	10482	99393	1.47747	298.47747	149.97747	14997.74774	1.47747	298.47748	149.97747	14997.74779	1.47747	298.47747	149.97746999999998	14997.747	2020-01-01	2020-01-02	2020-01-01 00:08:12	2020-01-02 03:36:33	2020-01-01 00:08:12.000	2020-01-02 03:36:33.000	492	99393	49942.5	4994250	492	99393	49942.5	4994250	-32678	32460	4722.66	472266	-128	123	-3.1	-310
+493	101	10483	99394	1.48048	298.48048	149.98048	14998.04804	1.48048	298.48047	149.98048	14998.04809	1.48048	298.48048	149.98048	14998.048	2020-01-01	2020-01-02	2020-01-01 00:08:13	2020-01-02 03:36:34	2020-01-01 00:08:13.000	2020-01-02 03:36:34.000	493	99394	49943.5	4994350	493	99394	49943.5	4994350	-32677	32461	4723.66	472366	-127	124	-2.1	-210
+494	101	10484	99395	1.48348	298.48348	149.98348	14998.34834	1.48348	298.4835	149.98348	14998.34868	1.48348	298.48348	149.98348	14998.348	2020-01-01	2020-01-02	2020-01-01 00:08:14	2020-01-02 03:36:35	2020-01-01 00:08:14.000	2020-01-02 03:36:35.000	494	99395	49944.5	4994450	494	99395	49944.5	4994450	-32676	32462	4724.66	472466	-126	125	-1.1	-110
+495	100	10485	99396	1.48648	298.48648	149.98648	14998.64864	1.48648	298.48648	149.98648	14998.64837	1.48648	298.48648	149.98648	14998.648	2020-01-01	2020-01-02	2020-01-01 00:08:15	2020-01-02 03:36:36	2020-01-01 00:08:15.000	2020-01-02 03:36:36.000	495	99396	49945.5	4994550	495	99396	49945.5	4994550	-32675	32463	4725.66	472566	-125	126	-0.1	-10
+496	100	10486	99397	1.48948	298.48948	149.98948	14998.94894	1.48948	298.4895	149.98948	14998.94896	1.48948	298.48948	149.98948000000001	14998.948	2020-01-01	2020-01-02	2020-01-01 00:08:16	2020-01-02 03:36:37	2020-01-01 00:08:16.000	2020-01-02 03:36:37.000	496	99397	49946.5	4994650	496	99397	49946.5	4994650	-32674	32464	4726.66	472666	-124	127	0.9	90
+497	100	10487	99398	1.49249	298.49249	149.99249	14999.24924	1.49249	298.4925	149.99249	14999.24926	1.49249	298.49249	149.99249	14999.249	2020-01-01	2020-01-02	2020-01-01 00:08:17	2020-01-02 03:36:38	2020-01-01 00:08:17.000	2020-01-02 03:36:38.000	497	99398	49947.5	4994750	497	99398	49947.5	4994750	-32673	32465	4727.66	472766	-128	127	-0.66	-66
+498	100	10488	99399	1.49549	298.49549	149.99549	14999.54954	1.49549	298.49548	149.99549	14999.54956	1.49549	298.49549	149.99549000000002	14999.549	2020-01-01	2020-01-02	2020-01-01 00:08:18	2020-01-02 03:36:39	2020-01-01 00:08:18.000	2020-01-02 03:36:39.000	498	99399	49948.5	4994850	498	99399	49948.5	4994850	-32672	32466	4728.66	472866	-128	123	-2.22	-222
+499	100	10489	99400	1.49849	298.49849	149.99849	14999.84984	1.49849	298.4985	149.9985	14999.85015	1.49849	298.49849	149.99849	14999.849	2020-01-01	2020-01-02	2020-01-01 00:08:19	2020-01-02 03:36:40	2020-01-01 00:08:19.000	2020-01-02 03:36:40.000	499	99400	49949.5	4994950	499	99400	49949.5	4994950	-32671	32467	4729.66	472966	-127	124	-1.22	-122
 5	102	1004	9995	0.01501	300.01501	150.01501	15151.51651	0.01501	300.015	150.01501	15151.51648	0.01501	300.01501	150.01501	15151.51601	2020-01-01	2020-01-02	2020-01-01 00:00:05	2020-01-02 03:45:05	2020-01-01 00:00:05.000	2020-01-02 03:45:05.000	5	99905	49955	5045455	5	99905	49955	5045455	-32564	32371	4534.009900990099	457935	-128	123	-3.01980198019802	-305
 50	102	10040	99950	0.15015	300.15015	150.15015	15165.16516	0.15015	300.15015	150.15014	15165.16487	0.15015	300.15015	150.15015	15165.16515	2020-01-01	2020-01-02	2020-01-01 00:00:50	2020-01-02 03:45:50	2020-01-01 00:00:50.000	2020-01-02 03:45:50.000	50	99950	50000	5050000	50	99950	50000	5050000	-32519	32416	4579.009900990099	462480	-127	124	-3.6435643564356437	-368
-500	100	10490	99401	1.5015	298.5015	150.0015	15000.15015	1.5015	298.5015	150.00149	15000.14984	1.50150	298.50150	150.0015	15000.15000	2020-01-01	2020-01-02	2020-01-01 00:08:20	2020-01-02 03:36:41	2020-01-01 00:08:20.000	2020-01-02 03:36:41.000	500	99401	49950.5	4995050	500	99401	49950.5	4995050	-32670	32468	4730.66	473066	-126	125	-0.22	-22
-501	100	10491	99402	1.5045	298.5045	150.0045	15000.45045	1.5045	298.50452	150.0045	15000.45043	1.50450	298.50450	150.0045	15000.45000	2020-01-01	2020-01-02	2020-01-01 00:08:21	2020-01-02 03:36:42	2020-01-01 00:08:21.000	2020-01-02 03:36:42.000	501	99402	49951.5	4995150	501	99402	49951.5	4995150	-32669	32469	4731.66	473166	-125	126	0.78	78
-502	100	10492	99403	1.5075	298.5075	150.0075	15000.75075	1.5075	298.5075	150.0075	15000.75073	1.50750	298.50750	150.0075	15000.75000	2020-01-01	2020-01-02	2020-01-01 00:08:22	2020-01-02 03:36:43	2020-01-01 00:08:22.000	2020-01-02 03:36:43.000	502	99403	49952.5	4995250	502	99403	49952.5	4995250	-32668	32470	4732.66	473266	-124	127	1.78	178
-503	100	10493	99404	1.51051	298.51051	150.01051	15001.05105	1.51051	298.5105	150.01051	15001.05103	1.51051	298.51051	150.01050999999998	15001.05100	2020-01-01	2020-01-02	2020-01-01 00:08:23	2020-01-02 03:36:44	2020-01-01 00:08:23.000	2020-01-02 03:36:44.000	503	99404	49953.5	4995350	503	99404	49953.5	4995350	-32667	32471	4733.66	473366	-128	127	0.22	22
-504	100	10494	99405	1.51351	298.51351	150.01351	15001.35135	1.51351	298.51352	150.01351	15001.35162	1.51351	298.51351	150.01351	15001.35100	2020-01-01	2020-01-02	2020-01-01 00:08:24	2020-01-02 03:36:45	2020-01-01 00:08:24.000	2020-01-02 03:36:45.000	504	99405	49954.5	4995450	504	99405	49954.5	4995450	-32666	32472	4734.66	473466	-128	127	-1.34	-134
-505	100	10495	99406	1.51651	298.51651	150.01651	15001.65165	1.51651	298.5165	150.01651	15001.65131	1.51651	298.51651	150.01651	15001.65100	2020-01-01	2020-01-02	2020-01-01 00:08:25	2020-01-02 03:36:46	2020-01-01 00:08:25.000	2020-01-02 03:36:46.000	505	99406	49955.5	4995550	505	99406	49955.5	4995550	-32665	32473	4735.66	473566	-128	124	-2.9	-290
-506	100	10496	99407	1.51951	298.51951	150.01951	15001.95195	1.51951	298.51953	150.01951	15001.9519	1.51951	298.51951	150.01951	15001.95100	2020-01-01	2020-01-02	2020-01-01 00:08:26	2020-01-02 03:36:47	2020-01-01 00:08:26.000	2020-01-02 03:36:47.000	506	99407	49956.5	4995650	506	99407	49956.5	4995650	-32664	32474	4736.66	473666	-127	125	-1.9	-190
-507	100	10497	99408	1.52252	298.52252	150.02252	15002.25225	1.52252	298.52252	150.02252	15002.2522	1.52252	298.52252	150.02252000000001	15002.25200	2020-01-01	2020-01-02	2020-01-01 00:08:27	2020-01-02 03:36:48	2020-01-01 00:08:27.000	2020-01-02 03:36:48.000	507	99408	49957.5	4995750	507	99408	49957.5	4995750	-32663	32475	4737.66	473766	-126	126	-0.9	-90
-508	100	10498	99409	1.52552	298.52552	150.02552	15002.55255	1.52552	298.5255	150.02552	15002.5525	1.52552	298.52552	150.02552	15002.55200	2020-01-01	2020-01-02	2020-01-01 00:08:28	2020-01-02 03:36:49	2020-01-01 00:08:28.000	2020-01-02 03:36:49.000	508	99409	49958.5	4995850	508	99409	49958.5	4995850	-32662	32476	4738.66	473866	-125	127	0.1	10
-509	100	10499	99410	1.52852	298.52852	150.02852	15002.85285	1.52852	298.52853	150.02853	15002.85312	1.52852	298.52852	150.02852000000001	15002.85200	2020-01-01	2020-01-02	2020-01-01 00:08:29	2020-01-02 03:36:50	2020-01-01 00:08:29.000	2020-01-02 03:36:50.000	509	99410	49959.5	4995950	509	99410	49959.5	4995950	-32661	32477	4739.66	473966	-128	127	-1.46	-146
+500	100	10490	99401	1.5015	298.5015	150.0015	15000.15015	1.5015	298.5015	150.00149	15000.14984	1.5015	298.5015	150.0015	15000.15	2020-01-01	2020-01-02	2020-01-01 00:08:20	2020-01-02 03:36:41	2020-01-01 00:08:20.000	2020-01-02 03:36:41.000	500	99401	49950.5	4995050	500	99401	49950.5	4995050	-32670	32468	4730.66	473066	-126	125	-0.22	-22
+501	100	10491	99402	1.5045	298.5045	150.0045	15000.45045	1.5045	298.50452	150.0045	15000.45043	1.5045	298.5045	150.0045	15000.45	2020-01-01	2020-01-02	2020-01-01 00:08:21	2020-01-02 03:36:42	2020-01-01 00:08:21.000	2020-01-02 03:36:42.000	501	99402	49951.5	4995150	501	99402	49951.5	4995150	-32669	32469	4731.66	473166	-125	126	0.78	78
+502	100	10492	99403	1.5075	298.5075	150.0075	15000.75075	1.5075	298.5075	150.0075	15000.75073	1.5075	298.5075	150.0075	15000.75	2020-01-01	2020-01-02	2020-01-01 00:08:22	2020-01-02 03:36:43	2020-01-01 00:08:22.000	2020-01-02 03:36:43.000	502	99403	49952.5	4995250	502	99403	49952.5	4995250	-32668	32470	4732.66	473266	-124	127	1.78	178
+503	100	10493	99404	1.51051	298.51051	150.01051	15001.05105	1.51051	298.5105	150.01051	15001.05103	1.51051	298.51051	150.01050999999998	15001.051	2020-01-01	2020-01-02	2020-01-01 00:08:23	2020-01-02 03:36:44	2020-01-01 00:08:23.000	2020-01-02 03:36:44.000	503	99404	49953.5	4995350	503	99404	49953.5	4995350	-32667	32471	4733.66	473366	-128	127	0.22	22
+504	100	10494	99405	1.51351	298.51351	150.01351	15001.35135	1.51351	298.51352	150.01351	15001.35162	1.51351	298.51351	150.01351	15001.351	2020-01-01	2020-01-02	2020-01-01 00:08:24	2020-01-02 03:36:45	2020-01-01 00:08:24.000	2020-01-02 03:36:45.000	504	99405	49954.5	4995450	504	99405	49954.5	4995450	-32666	32472	4734.66	473466	-128	127	-1.34	-134
+505	100	10495	99406	1.51651	298.51651	150.01651	15001.65165	1.51651	298.5165	150.01651	15001.65131	1.51651	298.51651	150.01651	15001.651	2020-01-01	2020-01-02	2020-01-01 00:08:25	2020-01-02 03:36:46	2020-01-01 00:08:25.000	2020-01-02 03:36:46.000	505	99406	49955.5	4995550	505	99406	49955.5	4995550	-32665	32473	4735.66	473566	-128	124	-2.9	-290
+506	100	10496	99407	1.51951	298.51951	150.01951	15001.95195	1.51951	298.51953	150.01951	15001.9519	1.51951	298.51951	150.01951	15001.951	2020-01-01	2020-01-02	2020-01-01 00:08:26	2020-01-02 03:36:47	2020-01-01 00:08:26.000	2020-01-02 03:36:47.000	506	99407	49956.5	4995650	506	99407	49956.5	4995650	-32664	32474	4736.66	473666	-127	125	-1.9	-190
+507	100	10497	99408	1.52252	298.52252	150.02252	15002.25225	1.52252	298.52252	150.02252	15002.2522	1.52252	298.52252	150.02252000000001	15002.252	2020-01-01	2020-01-02	2020-01-01 00:08:27	2020-01-02 03:36:48	2020-01-01 00:08:27.000	2020-01-02 03:36:48.000	507	99408	49957.5	4995750	507	99408	49957.5	4995750	-32663	32475	4737.66	473766	-126	126	-0.9	-90
+508	100	10498	99409	1.52552	298.52552	150.02552	15002.55255	1.52552	298.5255	150.02552	15002.5525	1.52552	298.52552	150.02552	15002.552	2020-01-01	2020-01-02	2020-01-01 00:08:28	2020-01-02 03:36:49	2020-01-01 00:08:28.000	2020-01-02 03:36:49.000	508	99409	49958.5	4995850	508	99409	49958.5	4995850	-32662	32476	4738.66	473866	-125	127	0.1	10
+509	100	10499	99410	1.52852	298.52852	150.02852	15002.85285	1.52852	298.52853	150.02853	15002.85312	1.52852	298.52852	150.02852000000001	15002.852	2020-01-01	2020-01-02	2020-01-01 00:08:29	2020-01-02 03:36:50	2020-01-01 00:08:29.000	2020-01-02 03:36:50.000	509	99410	49959.5	4995950	509	99410	49959.5	4995950	-32661	32477	4739.66	473966	-128	127	-1.46	-146
 51	102	10041	99951	0.15315	300.15315	150.15315	15165.46846	0.15315	300.15317	150.15315	15165.46863	0.15315	300.15315	150.15315	15165.46815	2020-01-01	2020-01-02	2020-01-01 00:00:51	2020-01-02 03:45:51	2020-01-01 00:00:51.000	2020-01-02 03:45:51.000	51	99951	50001	5050101	51	99951	50001	5050101	-32518	32417	4580.009900990099	462581	-126	125	-2.6435643564356437	-267
-510	100	10500	99411	1.53153	298.53153	150.03153	15003.15315	1.53153	298.53152	150.03152	15003.15278	1.53153	298.53153	150.03153	15003.15300	2020-01-01	2020-01-02	2020-01-01 00:08:30	2020-01-02 03:36:51	2020-01-01 00:08:30.000	2020-01-02 03:36:51.000	510	99411	49960.5	4996050	510	99411	49960.5	4996050	-32660	32478	4740.66	474066	-128	127	-3.02	-302
-511	100	10501	99412	1.53453	298.53453	150.03453	15003.45345	1.53453	298.53455	150.03453	15003.45354	1.53453	298.53453	150.03453	15003.45300	2020-01-01	2020-01-02	2020-01-01 00:08:31	2020-01-02 03:36:52	2020-01-01 00:08:31.000	2020-01-02 03:36:52.000	511	99412	49961.5	4996150	511	99412	49961.5	4996150	-32659	32479	4741.66	474166	-128	123	-4.58	-458
-512	100	10502	99413	1.53753	298.53753	150.03753	15003.75375	1.53753	298.53754	150.03753	15003.75366	1.53753	298.53753	150.03753	15003.75300	2020-01-01	2020-01-02	2020-01-01 00:08:32	2020-01-02 03:36:53	2020-01-01 00:08:32.000	2020-01-02 03:36:53.000	512	99413	49962.5	4996250	512	99413	49962.5	4996250	-32658	32480	4742.66	474266	-127	124	-3.58	-358
-513	100	10503	99414	1.54054	298.54054	150.04054	15004.05405	1.54054	298.54053	150.04053	15004.05397	1.54054	298.54054	150.04054	15004.05400	2020-01-01	2020-01-02	2020-01-01 00:08:33	2020-01-02 03:36:54	2020-01-01 00:08:33.000	2020-01-02 03:36:54.000	513	99414	49963.5	4996350	513	99414	49963.5	4996350	-32657	32481	4743.66	474366	-126	125	-2.58	-258
-514	100	10504	99415	1.54354	298.54354	150.04354	15004.35435	1.54354	298.54355	150.04354	15004.35459	1.54354	298.54354	150.04354	15004.35400	2020-01-01	2020-01-02	2020-01-01 00:08:34	2020-01-02 03:36:55	2020-01-01 00:08:34.000	2020-01-02 03:36:55.000	514	99415	49964.5	4996450	514	99415	49964.5	4996450	-32656	32482	4744.66	474466	-125	126	-1.58	-158
-515	100	10505	99416	1.54654	298.54654	150.04654	15004.65465	1.54654	298.54654	150.04654	15004.65425	1.54654	298.54654	150.04654	15004.65400	2020-01-01	2020-01-02	2020-01-01 00:08:35	2020-01-02 03:36:56	2020-01-01 00:08:35.000	2020-01-02 03:36:56.000	515	99416	49965.5	4996550	515	99416	49965.5	4996550	-32655	32483	4745.66	474566	-124	127	-0.58	-58
-516	100	10506	99417	1.54954	298.54954	150.04954	15004.95495	1.54954	298.54956	150.04955	15004.955	1.54954	298.54954	150.04954	15004.95400	2020-01-01	2020-01-02	2020-01-01 00:08:36	2020-01-02 03:36:57	2020-01-01 00:08:36.000	2020-01-02 03:36:57.000	516	99417	49966.5	4996650	516	99417	49966.5	4996650	-32654	32484	4746.66	474666	-128	127	-2.14	-214
-517	100	10507	99418	1.55255	298.55255	150.05255	15005.25525	1.55255	298.55255	150.05255	15005.25514	1.55255	298.55255	150.05255	15005.25500	2020-01-01	2020-01-02	2020-01-01 00:08:37	2020-01-02 03:36:58	2020-01-01 00:08:37.000	2020-01-02 03:36:58.000	517	99418	49967.5	4996750	517	99418	49967.5	4996750	-32653	32485	4747.66	474766	-128	123	-3.7	-370
-518	100	10508	99419	1.55555	298.55555	150.05555	15005.55555	1.55555	298.55554	150.05555	15005.55547	1.55555	298.55555	150.05555	15005.55500	2020-01-01	2020-01-02	2020-01-01 00:08:38	2020-01-02 03:36:59	2020-01-01 00:08:38.000	2020-01-02 03:36:59.000	518	99419	49968.5	4996850	518	99419	49968.5	4996850	-32652	32486	4748.66	474866	-127	124	-2.7	-270
-519	100	10509	99420	1.55855	298.55855	150.05855	15005.85585	1.55855	298.55856	150.05856	15005.85607	1.55855	298.55855	150.05855	15005.85500	2020-01-01	2020-01-02	2020-01-01 00:08:39	2020-01-02 03:37:00	2020-01-01 00:08:39.000	2020-01-02 03:37:00.000	519	99420	49969.5	4996950	519	99420	49969.5	4996950	-32651	32487	4749.66	474966	-126	125	-1.7	-170
+510	100	10500	99411	1.53153	298.53153	150.03153	15003.15315	1.53153	298.53152	150.03152	15003.15278	1.53153	298.53153	150.03153	15003.153	2020-01-01	2020-01-02	2020-01-01 00:08:30	2020-01-02 03:36:51	2020-01-01 00:08:30.000	2020-01-02 03:36:51.000	510	99411	49960.5	4996050	510	99411	49960.5	4996050	-32660	32478	4740.66	474066	-128	127	-3.02	-302
+511	100	10501	99412	1.53453	298.53453	150.03453	15003.45345	1.53453	298.53455	150.03453	15003.45354	1.53453	298.53453	150.03453	15003.453	2020-01-01	2020-01-02	2020-01-01 00:08:31	2020-01-02 03:36:52	2020-01-01 00:08:31.000	2020-01-02 03:36:52.000	511	99412	49961.5	4996150	511	99412	49961.5	4996150	-32659	32479	4741.66	474166	-128	123	-4.58	-458
+512	100	10502	99413	1.53753	298.53753	150.03753	15003.75375	1.53753	298.53754	150.03753	15003.75366	1.53753	298.53753	150.03753	15003.753	2020-01-01	2020-01-02	2020-01-01 00:08:32	2020-01-02 03:36:53	2020-01-01 00:08:32.000	2020-01-02 03:36:53.000	512	99413	49962.5	4996250	512	99413	49962.5	4996250	-32658	32480	4742.66	474266	-127	124	-3.58	-358
+513	100	10503	99414	1.54054	298.54054	150.04054	15004.05405	1.54054	298.54053	150.04053	15004.05397	1.54054	298.54054	150.04054	15004.054	2020-01-01	2020-01-02	2020-01-01 00:08:33	2020-01-02 03:36:54	2020-01-01 00:08:33.000	2020-01-02 03:36:54.000	513	99414	49963.5	4996350	513	99414	49963.5	4996350	-32657	32481	4743.66	474366	-126	125	-2.58	-258
+514	100	10504	99415	1.54354	298.54354	150.04354	15004.35435	1.54354	298.54355	150.04354	15004.35459	1.54354	298.54354	150.04354	15004.354	2020-01-01	2020-01-02	2020-01-01 00:08:34	2020-01-02 03:36:55	2020-01-01 00:08:34.000	2020-01-02 03:36:55.000	514	99415	49964.5	4996450	514	99415	49964.5	4996450	-32656	32482	4744.66	474466	-125	126	-1.58	-158
+515	100	10505	99416	1.54654	298.54654	150.04654	15004.65465	1.54654	298.54654	150.04654	15004.65425	1.54654	298.54654	150.04654	15004.654	2020-01-01	2020-01-02	2020-01-01 00:08:35	2020-01-02 03:36:56	2020-01-01 00:08:35.000	2020-01-02 03:36:56.000	515	99416	49965.5	4996550	515	99416	49965.5	4996550	-32655	32483	4745.66	474566	-124	127	-0.58	-58
+516	100	10506	99417	1.54954	298.54954	150.04954	15004.95495	1.54954	298.54956	150.04955	15004.955	1.54954	298.54954	150.04954	15004.954	2020-01-01	2020-01-02	2020-01-01 00:08:36	2020-01-02 03:36:57	2020-01-01 00:08:36.000	2020-01-02 03:36:57.000	516	99417	49966.5	4996650	516	99417	49966.5	4996650	-32654	32484	4746.66	474666	-128	127	-2.14	-214
+517	100	10507	99418	1.55255	298.55255	150.05255	15005.25525	1.55255	298.55255	150.05255	15005.25514	1.55255	298.55255	150.05255	15005.255	2020-01-01	2020-01-02	2020-01-01 00:08:37	2020-01-02 03:36:58	2020-01-01 00:08:37.000	2020-01-02 03:36:58.000	517	99418	49967.5	4996750	517	99418	49967.5	4996750	-32653	32485	4747.66	474766	-128	123	-3.7	-370
+518	100	10508	99419	1.55555	298.55555	150.05555	15005.55555	1.55555	298.55554	150.05555	15005.55547	1.55555	298.55555	150.05555	15005.555	2020-01-01	2020-01-02	2020-01-01 00:08:38	2020-01-02 03:36:59	2020-01-01 00:08:38.000	2020-01-02 03:36:59.000	518	99419	49968.5	4996850	518	99419	49968.5	4996850	-32652	32486	4748.66	474866	-127	124	-2.7	-270
+519	100	10509	99420	1.55855	298.55855	150.05855	15005.85585	1.55855	298.55856	150.05856	15005.85607	1.55855	298.55855	150.05855	15005.855	2020-01-01	2020-01-02	2020-01-01 00:08:39	2020-01-02 03:37:00	2020-01-01 00:08:39.000	2020-01-02 03:37:00.000	519	99420	49969.5	4996950	519	99420	49969.5	4996950	-32651	32487	4749.66	474966	-126	125	-1.7	-170
 52	102	10042	99952	0.15615	300.15615	150.15615	15165.77177	0.15615	300.15616	150.15615	15165.77193	0.15615	300.15615	150.15615	15165.77115	2020-01-01	2020-01-02	2020-01-01 00:00:52	2020-01-02 03:45:52	2020-01-01 00:00:52.000	2020-01-02 03:45:52.000	52	99952	50002	5050202	52	99952	50002	5050202	-32517	32418	4581.009900990099	462682	-125	126	-1.6435643564356435	-166
-520	100	10510	99421	1.56156	298.56156	150.06156	15006.15615	1.56156	298.56155	150.06155	15006.15572	1.56156	298.56156	150.06156000000001	15006.15600	2020-01-01	2020-01-02	2020-01-01 00:08:40	2020-01-02 03:37:01	2020-01-01 00:08:40.000	2020-01-02 03:37:01.000	520	99421	49970.5	4997050	520	99421	49970.5	4997050	-32650	32488	4750.66	475066	-125	126	-0.7	-70
-521	100	10511	99422	1.56456	298.56456	150.06456	15006.45645	1.56456	298.56458	150.06456	15006.45647	1.56456	298.56456	150.06456	15006.45600	2020-01-01	2020-01-02	2020-01-01 00:08:41	2020-01-02 03:37:02	2020-01-01 00:08:41.000	2020-01-02 03:37:02.000	521	99422	49971.5	4997150	521	99422	49971.5	4997150	-32649	32489	4751.66	475166	-124	127	0.3	30
-522	100	10512	99423	1.56756	298.56756	150.06756	15006.75675	1.56756	298.56757	150.06756	15006.75661	1.56756	298.56756	150.06756	15006.75600	2020-01-01	2020-01-02	2020-01-01 00:08:42	2020-01-02 03:37:03	2020-01-01 00:08:42.000	2020-01-02 03:37:03.000	522	99423	49972.5	4997250	522	99423	49972.5	4997250	-32648	32490	4752.66	475266	-128	127	-1.26	-126
-523	100	10513	99424	1.57057	298.57057	150.07057	15007.05705	1.57057	298.57056	150.07056	15007.05694	1.57057	298.57057	150.07057	15007.05700	2020-01-01	2020-01-02	2020-01-01 00:08:43	2020-01-02 03:37:04	2020-01-01 00:08:43.000	2020-01-02 03:37:04.000	523	99424	49973.5	4997350	523	99424	49973.5	4997350	-32647	32491	4753.66	475366	-128	123	-2.82	-282
-524	100	10514	99425	1.57357	298.57357	150.07357	15007.35735	1.57357	298.57358	150.07357	15007.35753	1.57357	298.57357	150.07357	15007.35700	2020-01-01	2020-01-02	2020-01-01 00:08:44	2020-01-02 03:37:05	2020-01-01 00:08:44.000	2020-01-02 03:37:05.000	524	99425	49974.5	4997450	524	99425	49974.5	4997450	-32646	32492	4754.66	475466	-127	124	-1.82	-182
-525	100	10515	99426	1.57657	298.57657	150.07657	15007.65765	1.57657	298.57657	150.07657	15007.65783	1.57657	298.57657	150.07657	15007.65700	2020-01-01	2020-01-02	2020-01-01 00:08:45	2020-01-02 03:37:06	2020-01-01 00:08:45.000	2020-01-02 03:37:06.000	525	99426	49975.5	4997550	525	99426	49975.5	4997550	-32645	32493	4755.66	475566	-126	125	-0.82	-82
-526	100	10516	99427	1.57957	298.57957	150.07957	15007.95795	1.57957	298.5796	150.07957	15007.95795	1.57957	298.57957	150.07957	15007.95700	2020-01-01	2020-01-02	2020-01-01 00:08:46	2020-01-02 03:37:07	2020-01-01 00:08:46.000	2020-01-02 03:37:07.000	526	99427	49976.5	4997650	526	99427	49976.5	4997650	-32644	32494	4756.66	475666	-125	126	0.18	18
-527	100	10517	99428	1.58258	298.58258	150.08258	15008.25825	1.58258	298.58258	150.08258	15008.25811	1.58258	298.58258	150.08258	15008.25800	2020-01-01	2020-01-02	2020-01-01 00:08:47	2020-01-02 03:37:08	2020-01-01 00:08:47.000	2020-01-02 03:37:08.000	527	99428	49977.5	4997750	527	99428	49977.5	4997750	-32643	32495	4757.66	475766	-124	127	1.18	118
-528	100	10518	99429	1.58558	298.58558	150.08558	15008.55855	1.58558	298.58557	150.08558	15008.5584	1.58558	298.58558	150.08558000000002	15008.55800	2020-01-01	2020-01-02	2020-01-01 00:08:48	2020-01-02 03:37:09	2020-01-01 00:08:48.000	2020-01-02 03:37:09.000	528	99429	49978.5	4997850	528	99429	49978.5	4997850	-32642	32496	4758.66	475866	-128	127	-0.38	-38
-529	100	10519	99430	1.58858	298.58858	150.08858	15008.85885	1.58858	298.5886	150.08859	15008.859	1.58858	298.58858	150.08858	15008.85800	2020-01-01	2020-01-02	2020-01-01 00:08:49	2020-01-02 03:37:10	2020-01-01 00:08:49.000	2020-01-02 03:37:10.000	529	99430	49979.5	4997950	529	99430	49979.5	4997950	-32641	32497	4759.66	475966	-128	127	-1.94	-194
+520	100	10510	99421	1.56156	298.56156	150.06156	15006.15615	1.56156	298.56155	150.06155	15006.15572	1.56156	298.56156	150.06156000000001	15006.156	2020-01-01	2020-01-02	2020-01-01 00:08:40	2020-01-02 03:37:01	2020-01-01 00:08:40.000	2020-01-02 03:37:01.000	520	99421	49970.5	4997050	520	99421	49970.5	4997050	-32650	32488	4750.66	475066	-125	126	-0.7	-70
+521	100	10511	99422	1.56456	298.56456	150.06456	15006.45645	1.56456	298.56458	150.06456	15006.45647	1.56456	298.56456	150.06456	15006.456	2020-01-01	2020-01-02	2020-01-01 00:08:41	2020-01-02 03:37:02	2020-01-01 00:08:41.000	2020-01-02 03:37:02.000	521	99422	49971.5	4997150	521	99422	49971.5	4997150	-32649	32489	4751.66	475166	-124	127	0.3	30
+522	100	10512	99423	1.56756	298.56756	150.06756	15006.75675	1.56756	298.56757	150.06756	15006.75661	1.56756	298.56756	150.06756	15006.756	2020-01-01	2020-01-02	2020-01-01 00:08:42	2020-01-02 03:37:03	2020-01-01 00:08:42.000	2020-01-02 03:37:03.000	522	99423	49972.5	4997250	522	99423	49972.5	4997250	-32648	32490	4752.66	475266	-128	127	-1.26	-126
+523	100	10513	99424	1.57057	298.57057	150.07057	15007.05705	1.57057	298.57056	150.07056	15007.05694	1.57057	298.57057	150.07057	15007.057	2020-01-01	2020-01-02	2020-01-01 00:08:43	2020-01-02 03:37:04	2020-01-01 00:08:43.000	2020-01-02 03:37:04.000	523	99424	49973.5	4997350	523	99424	49973.5	4997350	-32647	32491	4753.66	475366	-128	123	-2.82	-282
+524	100	10514	99425	1.57357	298.57357	150.07357	15007.35735	1.57357	298.57358	150.07357	15007.35753	1.57357	298.57357	150.07357	15007.357	2020-01-01	2020-01-02	2020-01-01 00:08:44	2020-01-02 03:37:05	2020-01-01 00:08:44.000	2020-01-02 03:37:05.000	524	99425	49974.5	4997450	524	99425	49974.5	4997450	-32646	32492	4754.66	475466	-127	124	-1.82	-182
+525	100	10515	99426	1.57657	298.57657	150.07657	15007.65765	1.57657	298.57657	150.07657	15007.65783	1.57657	298.57657	150.07657	15007.657	2020-01-01	2020-01-02	2020-01-01 00:08:45	2020-01-02 03:37:06	2020-01-01 00:08:45.000	2020-01-02 03:37:06.000	525	99426	49975.5	4997550	525	99426	49975.5	4997550	-32645	32493	4755.66	475566	-126	125	-0.82	-82
+526	100	10516	99427	1.57957	298.57957	150.07957	15007.95795	1.57957	298.5796	150.07957	15007.95795	1.57957	298.57957	150.07957	15007.957	2020-01-01	2020-01-02	2020-01-01 00:08:46	2020-01-02 03:37:07	2020-01-01 00:08:46.000	2020-01-02 03:37:07.000	526	99427	49976.5	4997650	526	99427	49976.5	4997650	-32644	32494	4756.66	475666	-125	126	0.18	18
+527	100	10517	99428	1.58258	298.58258	150.08258	15008.25825	1.58258	298.58258	150.08258	15008.25811	1.58258	298.58258	150.08258	15008.258	2020-01-01	2020-01-02	2020-01-01 00:08:47	2020-01-02 03:37:08	2020-01-01 00:08:47.000	2020-01-02 03:37:08.000	527	99428	49977.5	4997750	527	99428	49977.5	4997750	-32643	32495	4757.66	475766	-124	127	1.18	118
+528	100	10518	99429	1.58558	298.58558	150.08558	15008.55855	1.58558	298.58557	150.08558	15008.5584	1.58558	298.58558	150.08558000000002	15008.558	2020-01-01	2020-01-02	2020-01-01 00:08:48	2020-01-02 03:37:09	2020-01-01 00:08:48.000	2020-01-02 03:37:09.000	528	99429	49978.5	4997850	528	99429	49978.5	4997850	-32642	32496	4758.66	475866	-128	127	-0.38	-38
+529	100	10519	99430	1.58858	298.58858	150.08858	15008.85885	1.58858	298.5886	150.08859	15008.859	1.58858	298.58858	150.08858	15008.858	2020-01-01	2020-01-02	2020-01-01 00:08:49	2020-01-02 03:37:10	2020-01-01 00:08:49.000	2020-01-02 03:37:10.000	529	99430	49979.5	4997950	529	99430	49979.5	4997950	-32641	32497	4759.66	475966	-128	127	-1.94	-194
 53	102	10043	99953	0.15915	300.15915	150.15915	15166.07507	0.15915	300.15915	150.15915	15166.07511	0.15915	300.15915	150.15915	15166.07415	2020-01-01	2020-01-02	2020-01-01 00:00:53	2020-01-02 03:45:53	2020-01-01 00:00:53.000	2020-01-02 03:45:53.000	53	99953	50003	5050303	53	99953	50003	5050303	-32516	32419	4582.009900990099	462783	-124	127	-0.6435643564356436	-65
-530	100	10520	99431	1.59159	298.59159	150.09159	15009.15915	1.59159	298.59158	150.09159	15009.15929	1.59159	298.59159	150.09159	15009.15900	2020-01-01	2020-01-02	2020-01-01 00:08:50	2020-01-02 03:37:11	2020-01-01 00:08:50.000	2020-01-02 03:37:11.000	530	99431	49980.5	4998050	530	99431	49980.5	4998050	-32640	32498	4760.66	476066	-128	124	-3.5	-350
-531	100	10521	99432	1.59459	298.59459	150.09459	15009.45945	1.59459	298.5946	150.09459	15009.45941	1.59459	298.59459	150.09459	15009.45900	2020-01-01	2020-01-02	2020-01-01 00:08:51	2020-01-02 03:37:12	2020-01-01 00:08:51.000	2020-01-02 03:37:12.000	531	99432	49981.5	4998150	531	99432	49981.5	4998150	-32639	32499	4761.66	476166	-127	125	-2.5	-250
-532	100	10522	99433	1.59759	298.59759	150.09759	15009.75975	1.59759	298.5976	150.09759	15009.75958	1.59759	298.59759	150.09759	15009.75900	2020-01-01	2020-01-02	2020-01-01 00:08:52	2020-01-02 03:37:13	2020-01-01 00:08:52.000	2020-01-02 03:37:13.000	532	99433	49982.5	4998250	532	99433	49982.5	4998250	-32638	32500	4762.66	476266	-126	126	-1.5	-150
-533	100	10523	99434	1.6006	298.6006	150.1006	15010.06006	1.6006	298.6006	150.10059	15010.05988	1.60060	298.60060	150.1006	15010.06000	2020-01-01	2020-01-02	2020-01-01 00:08:53	2020-01-02 03:37:14	2020-01-01 00:08:53.000	2020-01-02 03:37:14.000	533	99434	49983.5	4998350	533	99434	49983.5	4998350	-32637	32501	4763.66	476366	-125	127	-0.5	-50
-534	100	10524	99435	1.6036	298.6036	150.1036	15010.36036	1.6036	298.6036	150.1036	15010.36063	1.60360	298.60360	150.1036	15010.36000	2020-01-01	2020-01-02	2020-01-01 00:08:54	2020-01-02 03:37:15	2020-01-01 00:08:54.000	2020-01-02 03:37:15.000	534	99435	49984.5	4998450	534	99435	49984.5	4998450	-32636	32502	4764.66	476466	-128	127	-2.06	-206
-535	100	10525	99436	1.6066	298.6066	150.1066	15010.66066	1.6066	298.6066	150.1066	15010.66077	1.60660	298.60660	150.1066	15010.66000	2020-01-01	2020-01-02	2020-01-01 00:08:55	2020-01-02 03:37:16	2020-01-01 00:08:55.000	2020-01-02 03:37:16.000	535	99436	49985.5	4998550	535	99436	49985.5	4998550	-32635	32503	4765.66	476566	-128	127	-3.62	-362
-536	100	10526	99437	1.6096	298.6096	150.1096	15010.96096	1.6096	298.60962	150.1096	15010.96092	1.60960	298.60960	150.1096	15010.96000	2020-01-01	2020-01-02	2020-01-01 00:08:56	2020-01-02 03:37:17	2020-01-01 00:08:56.000	2020-01-02 03:37:17.000	536	99437	49986.5	4998650	536	99437	49986.5	4998650	-32634	32504	4766.66	476666	-128	123	-5.18	-518
-537	100	10527	99438	1.61261	298.61261	150.11261	15011.26126	1.61261	298.6126	150.11261	15011.26105	1.61261	298.61261	150.11261000000002	15011.26100	2020-01-01	2020-01-02	2020-01-01 00:08:57	2020-01-02 03:37:18	2020-01-01 00:08:57.000	2020-01-02 03:37:18.000	537	99438	49987.5	4998750	537	99438	49987.5	4998750	-32633	32505	4767.66	476766	-127	124	-4.18	-418
-538	100	10528	99439	1.61561	298.61561	150.11561	15011.56156	1.61561	298.6156	150.11561	15011.56135	1.61561	298.61561	150.11561	15011.56100	2020-01-01	2020-01-02	2020-01-01 00:08:58	2020-01-02 03:37:19	2020-01-01 00:08:58.000	2020-01-02 03:37:19.000	538	99439	49988.5	4998850	538	99439	49988.5	4998850	-32632	32506	4768.66	476866	-126	125	-3.18	-318
-539	100	10529	99440	1.61861	298.61861	150.11861	15011.86186	1.61861	298.61862	150.11862	15011.8621	1.61861	298.61861	150.11861000000002	15011.86100	2020-01-01	2020-01-02	2020-01-01 00:08:59	2020-01-02 03:37:20	2020-01-01 00:08:59.000	2020-01-02 03:37:20.000	539	99440	49989.5	4998950	539	99440	49989.5	4998950	-32631	32507	4769.66	476966	-125	126	-2.18	-218
+530	100	10520	99431	1.59159	298.59159	150.09159	15009.15915	1.59159	298.59158	150.09159	15009.15929	1.59159	298.59159	150.09159	15009.159	2020-01-01	2020-01-02	2020-01-01 00:08:50	2020-01-02 03:37:11	2020-01-01 00:08:50.000	2020-01-02 03:37:11.000	530	99431	49980.5	4998050	530	99431	49980.5	4998050	-32640	32498	4760.66	476066	-128	124	-3.5	-350
+531	100	10521	99432	1.59459	298.59459	150.09459	15009.45945	1.59459	298.5946	150.09459	15009.45941	1.59459	298.59459	150.09459	15009.459	2020-01-01	2020-01-02	2020-01-01 00:08:51	2020-01-02 03:37:12	2020-01-01 00:08:51.000	2020-01-02 03:37:12.000	531	99432	49981.5	4998150	531	99432	49981.5	4998150	-32639	32499	4761.66	476166	-127	125	-2.5	-250
+532	100	10522	99433	1.59759	298.59759	150.09759	15009.75975	1.59759	298.5976	150.09759	15009.75958	1.59759	298.59759	150.09759	15009.759	2020-01-01	2020-01-02	2020-01-01 00:08:52	2020-01-02 03:37:13	2020-01-01 00:08:52.000	2020-01-02 03:37:13.000	532	99433	49982.5	4998250	532	99433	49982.5	4998250	-32638	32500	4762.66	476266	-126	126	-1.5	-150
+533	100	10523	99434	1.6006	298.6006	150.1006	15010.06006	1.6006	298.6006	150.10059	15010.05988	1.6006	298.6006	150.1006	15010.06	2020-01-01	2020-01-02	2020-01-01 00:08:53	2020-01-02 03:37:14	2020-01-01 00:08:53.000	2020-01-02 03:37:14.000	533	99434	49983.5	4998350	533	99434	49983.5	4998350	-32637	32501	4763.66	476366	-125	127	-0.5	-50
+534	100	10524	99435	1.6036	298.6036	150.1036	15010.36036	1.6036	298.6036	150.1036	15010.36063	1.6036	298.6036	150.1036	15010.36	2020-01-01	2020-01-02	2020-01-01 00:08:54	2020-01-02 03:37:15	2020-01-01 00:08:54.000	2020-01-02 03:37:15.000	534	99435	49984.5	4998450	534	99435	49984.5	4998450	-32636	32502	4764.66	476466	-128	127	-2.06	-206
+535	100	10525	99436	1.6066	298.6066	150.1066	15010.66066	1.6066	298.6066	150.1066	15010.66077	1.6066	298.6066	150.1066	15010.66	2020-01-01	2020-01-02	2020-01-01 00:08:55	2020-01-02 03:37:16	2020-01-01 00:08:55.000	2020-01-02 03:37:16.000	535	99436	49985.5	4998550	535	99436	49985.5	4998550	-32635	32503	4765.66	476566	-128	127	-3.62	-362
+536	100	10526	99437	1.6096	298.6096	150.1096	15010.96096	1.6096	298.60962	150.1096	15010.96092	1.6096	298.6096	150.1096	15010.96	2020-01-01	2020-01-02	2020-01-01 00:08:56	2020-01-02 03:37:17	2020-01-01 00:08:56.000	2020-01-02 03:37:17.000	536	99437	49986.5	4998650	536	99437	49986.5	4998650	-32634	32504	4766.66	476666	-128	123	-5.18	-518
+537	100	10527	99438	1.61261	298.61261	150.11261	15011.26126	1.61261	298.6126	150.11261	15011.26105	1.61261	298.61261	150.11261000000002	15011.261	2020-01-01	2020-01-02	2020-01-01 00:08:57	2020-01-02 03:37:18	2020-01-01 00:08:57.000	2020-01-02 03:37:18.000	537	99438	49987.5	4998750	537	99438	49987.5	4998750	-32633	32505	4767.66	476766	-127	124	-4.18	-418
+538	100	10528	99439	1.61561	298.61561	150.11561	15011.56156	1.61561	298.6156	150.11561	15011.56135	1.61561	298.61561	150.11561	15011.561	2020-01-01	2020-01-02	2020-01-01 00:08:58	2020-01-02 03:37:19	2020-01-01 00:08:58.000	2020-01-02 03:37:19.000	538	99439	49988.5	4998850	538	99439	49988.5	4998850	-32632	32506	4768.66	476866	-126	125	-3.18	-318
+539	100	10529	99440	1.61861	298.61861	150.11861	15011.86186	1.61861	298.61862	150.11862	15011.8621	1.61861	298.61861	150.11861000000002	15011.861	2020-01-01	2020-01-02	2020-01-01 00:08:59	2020-01-02 03:37:20	2020-01-01 00:08:59.000	2020-01-02 03:37:20.000	539	99440	49989.5	4998950	539	99440	49989.5	4998950	-32631	32507	4769.66	476966	-125	126	-2.18	-218
 54	102	10044	99954	0.16216	300.16216	150.16216	15166.37837	0.16216	300.16217	150.16216	15166.37822	0.16216	300.16216	150.16216	15166.37816	2020-01-01	2020-01-02	2020-01-01 00:00:54	2020-01-02 03:45:54	2020-01-01 00:00:54.000	2020-01-02 03:45:54.000	54	99954	50004	5050404	54	99954	50004	5050404	-32515	32420	4583.009900990099	462884	-128	127	-2.1782178217821784	-220
-540	100	10530	99441	1.62162	298.62162	150.12162	15012.16216	1.62162	298.6216	150.12162	15012.16224	1.62162	298.62162	150.12162	15012.16200	2020-01-01	2020-01-02	2020-01-01 00:09:00	2020-01-02 03:37:21	2020-01-01 00:09:00.000	2020-01-02 03:37:21.000	540	99441	49990.5	4999050	540	99441	49990.5	4999050	-32630	32508	4770.66	477066	-124	127	-1.18	-118
-541	100	10531	99442	1.62462	298.62462	150.12462	15012.46246	1.62462	298.62463	150.12462	15012.46239	1.62462	298.62462	150.12462	15012.46200	2020-01-01	2020-01-02	2020-01-01 00:09:01	2020-01-02 03:37:22	2020-01-01 00:09:01.000	2020-01-02 03:37:22.000	541	99442	49991.5	4999150	541	99442	49991.5	4999150	-32629	32509	4771.66	477166	-128	127	-2.74	-274
-542	100	10532	99443	1.62762	298.62762	150.12762	15012.76276	1.62762	298.62762	150.12762	15012.76252	1.62762	298.62762	150.12762	15012.76200	2020-01-01	2020-01-02	2020-01-01 00:09:02	2020-01-02 03:37:23	2020-01-01 00:09:02.000	2020-01-02 03:37:23.000	542	99443	49992.5	4999250	542	99443	49992.5	4999250	-32628	32510	4772.66	477266	-128	123	-4.3	-430
-543	100	10533	99444	1.63063	298.63063	150.13063	15013.06306	1.63063	298.63065	150.13063	15013.06327	1.63063	298.63063	150.13063	15013.06300	2020-01-01	2020-01-02	2020-01-01 00:09:03	2020-01-02 03:37:24	2020-01-01 00:09:03.000	2020-01-02 03:37:24.000	543	99444	49993.5	4999350	543	99444	49993.5	4999350	-32627	32511	4773.66	477366	-127	124	-3.3	-330
-544	100	10534	99445	1.63363	298.63363	150.13363	15013.36336	1.63363	298.63364	150.13363	15013.36358	1.63363	298.63363	150.13362999999998	15013.36300	2020-01-01	2020-01-02	2020-01-01 00:09:04	2020-01-02 03:37:25	2020-01-01 00:09:04.000	2020-01-02 03:37:25.000	544	99445	49994.5	4999450	544	99445	49994.5	4999450	-32626	32512	4774.66	477466	-126	125	-2.3	-230
-545	100	10535	99446	1.63663	298.63663	150.13663	15013.66366	1.63663	298.63663	150.13663	15013.6637	1.63663	298.63663	150.13663	15013.66300	2020-01-01	2020-01-02	2020-01-01 00:09:05	2020-01-02 03:37:26	2020-01-01 00:09:05.000	2020-01-02 03:37:26.000	545	99446	49995.5	4999550	545	99446	49995.5	4999550	-32625	32513	4775.66	477566	-125	126	-1.3	-130
-546	100	10536	99447	1.63963	298.63963	150.13963	15013.96396	1.63963	298.63965	150.13963	15013.96385	1.63963	298.63963	150.13963	15013.96300	2020-01-01	2020-01-02	2020-01-01 00:09:06	2020-01-02 03:37:27	2020-01-01 00:09:06.000	2020-01-02 03:37:27.000	546	99447	49996.5	4999650	546	99447	49996.5	4999650	-32624	32514	4776.66	477666	-124	127	-0.3	-30
-547	100	10537	99448	1.64264	298.64264	150.14264	15014.26426	1.64264	298.64264	150.14263	15014.26399	1.64264	298.64264	150.14264	15014.26400	2020-01-01	2020-01-02	2020-01-01 00:09:07	2020-01-02 03:37:28	2020-01-01 00:09:07.000	2020-01-02 03:37:28.000	547	99448	49997.5	4999750	547	99448	49997.5	4999750	-32623	32515	4777.66	477766	-128	127	-1.86	-186
-548	100	10538	99449	1.64564	298.64564	150.14564	15014.56456	1.64564	298.64566	150.14564	15014.56474	1.64564	298.64564	150.14564000000001	15014.56400	2020-01-01	2020-01-02	2020-01-01 00:09:08	2020-01-02 03:37:29	2020-01-01 00:09:08.000	2020-01-02 03:37:29.000	548	99449	49998.5	4999850	548	99449	49998.5	4999850	-32622	32516	4778.66	477866	-128	123	-3.42	-342
-549	100	10539	99450	1.64864	298.64864	150.14864	15014.86486	1.64864	298.64865	150.14865	15014.86504	1.64864	298.64864	150.14864	15014.86400	2020-01-01	2020-01-02	2020-01-01 00:09:09	2020-01-02 03:37:30	2020-01-01 00:09:09.000	2020-01-02 03:37:30.000	549	99450	49999.5	4999950	549	99450	49999.5	4999950	-32621	32517	4779.66	477966	-127	124	-2.42	-242
+540	100	10530	99441	1.62162	298.62162	150.12162	15012.16216	1.62162	298.6216	150.12162	15012.16224	1.62162	298.62162	150.12162	15012.162	2020-01-01	2020-01-02	2020-01-01 00:09:00	2020-01-02 03:37:21	2020-01-01 00:09:00.000	2020-01-02 03:37:21.000	540	99441	49990.5	4999050	540	99441	49990.5	4999050	-32630	32508	4770.66	477066	-124	127	-1.18	-118
+541	100	10531	99442	1.62462	298.62462	150.12462	15012.46246	1.62462	298.62463	150.12462	15012.46239	1.62462	298.62462	150.12462	15012.462	2020-01-01	2020-01-02	2020-01-01 00:09:01	2020-01-02 03:37:22	2020-01-01 00:09:01.000	2020-01-02 03:37:22.000	541	99442	49991.5	4999150	541	99442	49991.5	4999150	-32629	32509	4771.66	477166	-128	127	-2.74	-274
+542	100	10532	99443	1.62762	298.62762	150.12762	15012.76276	1.62762	298.62762	150.12762	15012.76252	1.62762	298.62762	150.12762	15012.762	2020-01-01	2020-01-02	2020-01-01 00:09:02	2020-01-02 03:37:23	2020-01-01 00:09:02.000	2020-01-02 03:37:23.000	542	99443	49992.5	4999250	542	99443	49992.5	4999250	-32628	32510	4772.66	477266	-128	123	-4.3	-430
+543	100	10533	99444	1.63063	298.63063	150.13063	15013.06306	1.63063	298.63065	150.13063	15013.06327	1.63063	298.63063	150.13063	15013.063	2020-01-01	2020-01-02	2020-01-01 00:09:03	2020-01-02 03:37:24	2020-01-01 00:09:03.000	2020-01-02 03:37:24.000	543	99444	49993.5	4999350	543	99444	49993.5	4999350	-32627	32511	4773.66	477366	-127	124	-3.3	-330
+544	100	10534	99445	1.63363	298.63363	150.13363	15013.36336	1.63363	298.63364	150.13363	15013.36358	1.63363	298.63363	150.13362999999998	15013.363	2020-01-01	2020-01-02	2020-01-01 00:09:04	2020-01-02 03:37:25	2020-01-01 00:09:04.000	2020-01-02 03:37:25.000	544	99445	49994.5	4999450	544	99445	49994.5	4999450	-32626	32512	4774.66	477466	-126	125	-2.3	-230
+545	100	10535	99446	1.63663	298.63663	150.13663	15013.66366	1.63663	298.63663	150.13663	15013.6637	1.63663	298.63663	150.13663	15013.663	2020-01-01	2020-01-02	2020-01-01 00:09:05	2020-01-02 03:37:26	2020-01-01 00:09:05.000	2020-01-02 03:37:26.000	545	99446	49995.5	4999550	545	99446	49995.5	4999550	-32625	32513	4775.66	477566	-125	126	-1.3	-130
+546	100	10536	99447	1.63963	298.63963	150.13963	15013.96396	1.63963	298.63965	150.13963	15013.96385	1.63963	298.63963	150.13963	15013.963	2020-01-01	2020-01-02	2020-01-01 00:09:06	2020-01-02 03:37:27	2020-01-01 00:09:06.000	2020-01-02 03:37:27.000	546	99447	49996.5	4999650	546	99447	49996.5	4999650	-32624	32514	4776.66	477666	-124	127	-0.3	-30
+547	100	10537	99448	1.64264	298.64264	150.14264	15014.26426	1.64264	298.64264	150.14263	15014.26399	1.64264	298.64264	150.14264	15014.264	2020-01-01	2020-01-02	2020-01-01 00:09:07	2020-01-02 03:37:28	2020-01-01 00:09:07.000	2020-01-02 03:37:28.000	547	99448	49997.5	4999750	547	99448	49997.5	4999750	-32623	32515	4777.66	477766	-128	127	-1.86	-186
+548	100	10538	99449	1.64564	298.64564	150.14564	15014.56456	1.64564	298.64566	150.14564	15014.56474	1.64564	298.64564	150.14564000000001	15014.564	2020-01-01	2020-01-02	2020-01-01 00:09:08	2020-01-02 03:37:29	2020-01-01 00:09:08.000	2020-01-02 03:37:29.000	548	99449	49998.5	4999850	548	99449	49998.5	4999850	-32622	32516	4778.66	477866	-128	123	-3.42	-342
+549	100	10539	99450	1.64864	298.64864	150.14864	15014.86486	1.64864	298.64865	150.14865	15014.86504	1.64864	298.64864	150.14864	15014.864	2020-01-01	2020-01-02	2020-01-01 00:09:09	2020-01-02 03:37:30	2020-01-01 00:09:09.000	2020-01-02 03:37:30.000	549	99450	49999.5	4999950	549	99450	49999.5	4999950	-32621	32517	4779.66	477966	-127	124	-2.42	-242
 55	102	10045	99955	0.16516	300.16516	150.16516	15166.68168	0.16516	300.16516	150.16516	15166.68151	0.16516	300.16516	150.16516000000001	15166.68116	2020-01-01	2020-01-02	2020-01-01 00:00:55	2020-01-02 03:45:55	2020-01-01 00:00:55.000	2020-01-02 03:45:55.000	55	99955	50005	5050505	55	99955	50005	5050505	-32514	32421	4584.009900990099	462985	-128	123	-3.712871287128713	-375
-550	100	10540	99451	1.65165	298.65165	150.15165	15015.16516	1.65165	298.65164	150.15165	15015.16521	1.65165	298.65165	150.15165000000002	15015.16500	2020-01-01	2020-01-02	2020-01-01 00:09:10	2020-01-02 03:37:31	2020-01-01 00:09:10.000	2020-01-02 03:37:31.000	550	99451	50000.5	5000050	550	99451	50000.5	5000050	-32620	32518	4780.66	478066	-126	125	-1.42	-142
-551	100	10541	99452	1.65465	298.65465	150.15465	15015.46546	1.65465	298.65466	150.15465	15015.46533	1.65465	298.65465	150.15465	15015.46500	2020-01-01	2020-01-02	2020-01-01 00:09:11	2020-01-02 03:37:32	2020-01-01 00:09:11.000	2020-01-02 03:37:32.000	551	99452	50001.5	5000150	551	99452	50001.5	5000150	-32619	32519	4781.66	478166	-125	126	-0.42	-42
-552	100	10542	99453	1.65765	298.65765	150.15765	15015.76576	1.65765	298.65765	150.15765	15015.76562	1.65765	298.65765	150.15765	15015.76500	2020-01-01	2020-01-02	2020-01-01 00:09:12	2020-01-02 03:37:33	2020-01-01 00:09:12.000	2020-01-02 03:37:33.000	552	99453	50002.5	5000250	552	99453	50002.5	5000250	-32618	32520	4782.66	478266	-124	127	0.58	58
-553	100	10543	99454	1.66066	298.66066	150.16066	15016.06606	1.66066	298.66068	150.16066	15016.06621	1.66066	298.66066	150.16066	15016.06600	2020-01-01	2020-01-02	2020-01-01 00:09:13	2020-01-02 03:37:34	2020-01-01 00:09:13.000	2020-01-02 03:37:34.000	553	99454	50003.5	5000350	553	99454	50003.5	5000350	-32617	32521	4783.66	478366	-128	127	-0.98	-98
-554	100	10544	99455	1.66366	298.66366	150.16366	15016.36636	1.66366	298.66367	150.16366	15016.36651	1.66366	298.66366	150.16366	15016.36600	2020-01-01	2020-01-02	2020-01-01 00:09:14	2020-01-02 03:37:35	2020-01-01 00:09:14.000	2020-01-02 03:37:35.000	554	99455	50004.5	5000450	554	99455	50004.5	5000450	-32616	32522	4784.66	478466	-128	127	-2.54	-254
-555	100	10545	99456	1.66666	298.66666	150.16666	15016.66666	1.66666	298.66666	150.16666	15016.66668	1.66666	298.66666	150.16665999999998	15016.66600	2020-01-01	2020-01-02	2020-01-01 00:09:15	2020-01-02 03:37:36	2020-01-01 00:09:15.000	2020-01-02 03:37:36.000	555	99456	50005.5	5000550	555	99456	50005.5	5000550	-32615	32523	4785.66	478566	-128	124	-4.1	-410
-556	100	10546	99457	1.66966	298.66966	150.16966	15016.96696	1.66966	298.66968	150.16966	15016.9668	1.66966	298.66966	150.16966	15016.96600	2020-01-01	2020-01-02	2020-01-01 00:09:16	2020-01-02 03:37:37	2020-01-01 00:09:16.000	2020-01-02 03:37:37.000	556	99457	50006.5	5000650	556	99457	50006.5	5000650	-32614	32524	4786.66	478666	-127	125	-3.1	-310
-557	100	10547	99458	1.67267	298.67267	150.17267	15017.26726	1.67267	298.67267	150.17267	15017.26709	1.67267	298.67267	150.17267	15017.26700	2020-01-01	2020-01-02	2020-01-01 00:09:17	2020-01-02 03:37:38	2020-01-01 00:09:17.000	2020-01-02 03:37:38.000	557	99458	50007.5	5000750	557	99458	50007.5	5000750	-32613	32525	4787.66	478766	-126	126	-2.1	-210
-558	100	10548	99459	1.67567	298.67567	150.17567	15017.56756	1.67567	298.6757	150.17567	15017.56769	1.67567	298.67567	150.17567	15017.56700	2020-01-01	2020-01-02	2020-01-01 00:09:18	2020-01-02 03:37:39	2020-01-01 00:09:18.000	2020-01-02 03:37:39.000	558	99459	50008.5	5000850	558	99459	50008.5	5000850	-32612	32526	4788.66	478866	-125	127	-1.1	-110
-559	100	10549	99460	1.67867	298.67867	150.17867	15017.86786	1.67867	298.67868	150.17868	15017.86802	1.67867	298.67867	150.17867	15017.86700	2020-01-01	2020-01-02	2020-01-01 00:09:19	2020-01-02 03:37:40	2020-01-01 00:09:19.000	2020-01-02 03:37:40.000	559	99460	50009.5	5000950	559	99460	50009.5	5000950	-32611	32527	4789.66	478966	-128	127	-2.66	-266
+550	100	10540	99451	1.65165	298.65165	150.15165	15015.16516	1.65165	298.65164	150.15165	15015.16521	1.65165	298.65165	150.15165000000002	15015.165	2020-01-01	2020-01-02	2020-01-01 00:09:10	2020-01-02 03:37:31	2020-01-01 00:09:10.000	2020-01-02 03:37:31.000	550	99451	50000.5	5000050	550	99451	50000.5	5000050	-32620	32518	4780.66	478066	-126	125	-1.42	-142
+551	100	10541	99452	1.65465	298.65465	150.15465	15015.46546	1.65465	298.65466	150.15465	15015.46533	1.65465	298.65465	150.15465	15015.465	2020-01-01	2020-01-02	2020-01-01 00:09:11	2020-01-02 03:37:32	2020-01-01 00:09:11.000	2020-01-02 03:37:32.000	551	99452	50001.5	5000150	551	99452	50001.5	5000150	-32619	32519	4781.66	478166	-125	126	-0.42	-42
+552	100	10542	99453	1.65765	298.65765	150.15765	15015.76576	1.65765	298.65765	150.15765	15015.76562	1.65765	298.65765	150.15765	15015.765	2020-01-01	2020-01-02	2020-01-01 00:09:12	2020-01-02 03:37:33	2020-01-01 00:09:12.000	2020-01-02 03:37:33.000	552	99453	50002.5	5000250	552	99453	50002.5	5000250	-32618	32520	4782.66	478266	-124	127	0.58	58
+553	100	10543	99454	1.66066	298.66066	150.16066	15016.06606	1.66066	298.66068	150.16066	15016.06621	1.66066	298.66066	150.16066	15016.066	2020-01-01	2020-01-02	2020-01-01 00:09:13	2020-01-02 03:37:34	2020-01-01 00:09:13.000	2020-01-02 03:37:34.000	553	99454	50003.5	5000350	553	99454	50003.5	5000350	-32617	32521	4783.66	478366	-128	127	-0.98	-98
+554	100	10544	99455	1.66366	298.66366	150.16366	15016.36636	1.66366	298.66367	150.16366	15016.36651	1.66366	298.66366	150.16366	15016.366	2020-01-01	2020-01-02	2020-01-01 00:09:14	2020-01-02 03:37:35	2020-01-01 00:09:14.000	2020-01-02 03:37:35.000	554	99455	50004.5	5000450	554	99455	50004.5	5000450	-32616	32522	4784.66	478466	-128	127	-2.54	-254
+555	100	10545	99456	1.66666	298.66666	150.16666	15016.66666	1.66666	298.66666	150.16666	15016.66668	1.66666	298.66666	150.16665999999998	15016.666	2020-01-01	2020-01-02	2020-01-01 00:09:15	2020-01-02 03:37:36	2020-01-01 00:09:15.000	2020-01-02 03:37:36.000	555	99456	50005.5	5000550	555	99456	50005.5	5000550	-32615	32523	4785.66	478566	-128	124	-4.1	-410
+556	100	10546	99457	1.66966	298.66966	150.16966	15016.96696	1.66966	298.66968	150.16966	15016.9668	1.66966	298.66966	150.16966	15016.966	2020-01-01	2020-01-02	2020-01-01 00:09:16	2020-01-02 03:37:37	2020-01-01 00:09:16.000	2020-01-02 03:37:37.000	556	99457	50006.5	5000650	556	99457	50006.5	5000650	-32614	32524	4786.66	478666	-127	125	-3.1	-310
+557	100	10547	99458	1.67267	298.67267	150.17267	15017.26726	1.67267	298.67267	150.17267	15017.26709	1.67267	298.67267	150.17267	15017.267	2020-01-01	2020-01-02	2020-01-01 00:09:17	2020-01-02 03:37:38	2020-01-01 00:09:17.000	2020-01-02 03:37:38.000	557	99458	50007.5	5000750	557	99458	50007.5	5000750	-32613	32525	4787.66	478766	-126	126	-2.1	-210
+558	100	10548	99459	1.67567	298.67567	150.17567	15017.56756	1.67567	298.6757	150.17567	15017.56769	1.67567	298.67567	150.17567	15017.567	2020-01-01	2020-01-02	2020-01-01 00:09:18	2020-01-02 03:37:39	2020-01-01 00:09:18.000	2020-01-02 03:37:39.000	558	99459	50008.5	5000850	558	99459	50008.5	5000850	-32612	32526	4788.66	478866	-125	127	-1.1	-110
+559	100	10549	99460	1.67867	298.67867	150.17867	15017.86786	1.67867	298.67868	150.17868	15017.86802	1.67867	298.67867	150.17867	15017.867	2020-01-01	2020-01-02	2020-01-01 00:09:19	2020-01-02 03:37:40	2020-01-01 00:09:19.000	2020-01-02 03:37:40.000	559	99460	50009.5	5000950	559	99460	50009.5	5000950	-32611	32527	4789.66	478966	-128	127	-2.66	-266
 56	102	10046	99956	0.16816	300.16816	150.16816	15166.98498	0.16816	300.16818	150.16816	15166.98512	0.16816	300.16816	150.16816	15166.98416	2020-01-01	2020-01-02	2020-01-01 00:00:56	2020-01-02 03:45:56	2020-01-01 00:00:56.000	2020-01-02 03:45:56.000	56	99956	50006	5050606	56	99956	50006	5050606	-32513	32422	4585.009900990099	463086	-127	124	-2.712871287128713	-274
-560	100	10550	99461	1.68168	298.68168	150.18168	15018.16816	1.68168	298.68167	150.18168	15018.16815	1.68168	298.68168	150.18168	15018.16800	2020-01-01	2020-01-02	2020-01-01 00:09:20	2020-01-02 03:37:41	2020-01-01 00:09:20.000	2020-01-02 03:37:41.000	560	99461	50010.5	5001050	560	99461	50010.5	5001050	-32610	32528	4790.66	479066	-128	127	-4.22	-422
-561	100	10551	99462	1.68468	298.68468	150.18468	15018.46846	1.68468	298.6847	150.18468	15018.46826	1.68468	298.68468	150.18468000000001	15018.46800	2020-01-01	2020-01-02	2020-01-01 00:09:21	2020-01-02 03:37:42	2020-01-01 00:09:21.000	2020-01-02 03:37:42.000	561	99462	50011.5	5001150	561	99462	50011.5	5001150	-32609	32529	4791.66	479166	-128	123	-5.78	-578
-562	100	10552	99463	1.68768	298.68768	150.18768	15018.76876	1.68768	298.68768	150.18768	15018.76856	1.68768	298.68768	150.18768	15018.76800	2020-01-01	2020-01-02	2020-01-01 00:09:22	2020-01-02 03:37:43	2020-01-01 00:09:22.000	2020-01-02 03:37:43.000	562	99463	50012.5	5001250	562	99463	50012.5	5001250	-32608	32530	4792.66	479266	-127	124	-4.78	-478
-563	100	10553	99464	1.69069	298.69069	150.19069	15019.06906	1.69069	298.6907	150.19069	15019.06915	1.69069	298.69069	150.19069	15019.06900	2020-01-01	2020-01-02	2020-01-01 00:09:23	2020-01-02 03:37:44	2020-01-01 00:09:23.000	2020-01-02 03:37:44.000	563	99464	50013.5	5001350	563	99464	50013.5	5001350	-32607	32531	4793.66	479366	-126	125	-3.78	-378
-564	100	10554	99465	1.69369	298.69369	150.19369	15019.36936	1.69369	298.6937	150.19369	15019.36948	1.69369	298.69369	150.19369	15019.36900	2020-01-01	2020-01-02	2020-01-01 00:09:24	2020-01-02 03:37:45	2020-01-01 00:09:24.000	2020-01-02 03:37:45.000	564	99465	50014.5	5001450	564	99465	50014.5	5001450	-32606	32532	4794.66	479466	-125	126	-2.78	-278
-565	100	10555	99466	1.69669	298.69669	150.19669	15019.66966	1.69669	298.6967	150.19669	15019.66962	1.69669	298.69669	150.19669	15019.66900	2020-01-01	2020-01-02	2020-01-01 00:09:25	2020-01-02 03:37:46	2020-01-01 00:09:25.000	2020-01-02 03:37:46.000	565	99466	50015.5	5001550	565	99466	50015.5	5001550	-32605	32533	4795.66	479566	-124	127	-1.78	-178
-566	100	10556	99467	1.69969	298.69969	150.19969	15019.96996	1.69969	298.6997	150.1997	15019.97037	1.69969	298.69969	150.19969	15019.96900	2020-01-01	2020-01-02	2020-01-01 00:09:26	2020-01-02 03:37:47	2020-01-01 00:09:26.000	2020-01-02 03:37:47.000	566	99467	50016.5	5001650	566	99467	50016.5	5001650	-32604	32534	4796.66	479666	-128	127	-3.34	-334
-567	100	10557	99468	1.7027	298.7027	150.2027	15020.27027	1.7027	298.7027	150.2027	15020.27003	1.70270	298.70270	150.2027	15020.27000	2020-01-01	2020-01-02	2020-01-01 00:09:27	2020-01-02 03:37:48	2020-01-01 00:09:27.000	2020-01-02 03:37:48.000	567	99468	50017.5	5001750	567	99468	50017.5	5001750	-32603	32535	4797.66	479766	-128	123	-4.9	-490
-568	100	10558	99469	1.7057	298.7057	150.2057	15020.57057	1.7057	298.70572	150.2057	15020.57066	1.70570	298.70570	150.2057	15020.57000	2020-01-01	2020-01-02	2020-01-01 00:09:28	2020-01-02 03:37:49	2020-01-01 00:09:28.000	2020-01-02 03:37:49.000	568	99469	50018.5	5001850	568	99469	50018.5	5001850	-32602	32536	4798.66	479866	-127	124	-3.9	-390
-569	100	10559	99470	1.7087	298.7087	150.2087	15020.87087	1.7087	298.7087	150.2087	15020.87095	1.70870	298.70870	150.20870000000002	15020.87000	2020-01-01	2020-01-02	2020-01-01 00:09:29	2020-01-02 03:37:50	2020-01-01 00:09:29.000	2020-01-02 03:37:50.000	569	99470	50019.5	5001950	569	99470	50019.5	5001950	-32601	32537	4799.66	479966	-126	125	-2.9	-290
+560	100	10550	99461	1.68168	298.68168	150.18168	15018.16816	1.68168	298.68167	150.18168	15018.16815	1.68168	298.68168	150.18168	15018.168	2020-01-01	2020-01-02	2020-01-01 00:09:20	2020-01-02 03:37:41	2020-01-01 00:09:20.000	2020-01-02 03:37:41.000	560	99461	50010.5	5001050	560	99461	50010.5	5001050	-32610	32528	4790.66	479066	-128	127	-4.22	-422
+561	100	10551	99462	1.68468	298.68468	150.18468	15018.46846	1.68468	298.6847	150.18468	15018.46826	1.68468	298.68468	150.18468000000001	15018.468	2020-01-01	2020-01-02	2020-01-01 00:09:21	2020-01-02 03:37:42	2020-01-01 00:09:21.000	2020-01-02 03:37:42.000	561	99462	50011.5	5001150	561	99462	50011.5	5001150	-32609	32529	4791.66	479166	-128	123	-5.78	-578
+562	100	10552	99463	1.68768	298.68768	150.18768	15018.76876	1.68768	298.68768	150.18768	15018.76856	1.68768	298.68768	150.18768	15018.768	2020-01-01	2020-01-02	2020-01-01 00:09:22	2020-01-02 03:37:43	2020-01-01 00:09:22.000	2020-01-02 03:37:43.000	562	99463	50012.5	5001250	562	99463	50012.5	5001250	-32608	32530	4792.66	479266	-127	124	-4.78	-478
+563	100	10553	99464	1.69069	298.69069	150.19069	15019.06906	1.69069	298.6907	150.19069	15019.06915	1.69069	298.69069	150.19069	15019.069	2020-01-01	2020-01-02	2020-01-01 00:09:23	2020-01-02 03:37:44	2020-01-01 00:09:23.000	2020-01-02 03:37:44.000	563	99464	50013.5	5001350	563	99464	50013.5	5001350	-32607	32531	4793.66	479366	-126	125	-3.78	-378
+564	100	10554	99465	1.69369	298.69369	150.19369	15019.36936	1.69369	298.6937	150.19369	15019.36948	1.69369	298.69369	150.19369	15019.369	2020-01-01	2020-01-02	2020-01-01 00:09:24	2020-01-02 03:37:45	2020-01-01 00:09:24.000	2020-01-02 03:37:45.000	564	99465	50014.5	5001450	564	99465	50014.5	5001450	-32606	32532	4794.66	479466	-125	126	-2.78	-278
+565	100	10555	99466	1.69669	298.69669	150.19669	15019.66966	1.69669	298.6967	150.19669	15019.66962	1.69669	298.69669	150.19669	15019.669	2020-01-01	2020-01-02	2020-01-01 00:09:25	2020-01-02 03:37:46	2020-01-01 00:09:25.000	2020-01-02 03:37:46.000	565	99466	50015.5	5001550	565	99466	50015.5	5001550	-32605	32533	4795.66	479566	-124	127	-1.78	-178
+566	100	10556	99467	1.69969	298.69969	150.19969	15019.96996	1.69969	298.6997	150.1997	15019.97037	1.69969	298.69969	150.19969	15019.969	2020-01-01	2020-01-02	2020-01-01 00:09:26	2020-01-02 03:37:47	2020-01-01 00:09:26.000	2020-01-02 03:37:47.000	566	99467	50016.5	5001650	566	99467	50016.5	5001650	-32604	32534	4796.66	479666	-128	127	-3.34	-334
+567	100	10557	99468	1.7027	298.7027	150.2027	15020.27027	1.7027	298.7027	150.2027	15020.27003	1.7027	298.7027	150.2027	15020.27	2020-01-01	2020-01-02	2020-01-01 00:09:27	2020-01-02 03:37:48	2020-01-01 00:09:27.000	2020-01-02 03:37:48.000	567	99468	50017.5	5001750	567	99468	50017.5	5001750	-32603	32535	4797.66	479766	-128	123	-4.9	-490
+568	100	10558	99469	1.7057	298.7057	150.2057	15020.57057	1.7057	298.70572	150.2057	15020.57066	1.7057	298.7057	150.2057	15020.57	2020-01-01	2020-01-02	2020-01-01 00:09:28	2020-01-02 03:37:49	2020-01-01 00:09:28.000	2020-01-02 03:37:49.000	568	99469	50018.5	5001850	568	99469	50018.5	5001850	-32602	32536	4798.66	479866	-127	124	-3.9	-390
+569	100	10559	99470	1.7087	298.7087	150.2087	15020.87087	1.7087	298.7087	150.2087	15020.87095	1.7087	298.7087	150.20870000000002	15020.87	2020-01-01	2020-01-02	2020-01-01 00:09:29	2020-01-02 03:37:50	2020-01-01 00:09:29.000	2020-01-02 03:37:50.000	569	99470	50019.5	5001950	569	99470	50019.5	5001950	-32601	32537	4799.66	479966	-126	125	-2.9	-290
 57	102	10047	99957	0.17117	300.17117	150.17117	15167.28828	0.17117	300.17117	150.17117	15167.28841	0.17117	300.17117	150.17117	15167.28817	2020-01-01	2020-01-02	2020-01-01 00:00:57	2020-01-02 03:45:57	2020-01-01 00:00:57.000	2020-01-02 03:45:57.000	57	99957	50007	5050707	57	99957	50007	5050707	-32512	32423	4586.009900990099	463187	-126	125	-1.7128712871287128	-173
-570	100	10560	99471	1.71171	298.71171	150.21171	15021.17117	1.71171	298.7117	150.21171	15021.17109	1.71171	298.71171	150.21171	15021.17100	2020-01-01	2020-01-02	2020-01-01 00:09:30	2020-01-02 03:37:51	2020-01-01 00:09:30.000	2020-01-02 03:37:51.000	570	99471	50020.5	5002050	570	99471	50020.5	5002050	-32600	32538	4800.66	480066	-125	126	-1.9	-190
-571	100	10561	99472	1.71471	298.71471	150.21471	15021.47147	1.71471	298.71472	150.21471	15021.47184	1.71471	298.71471	150.21471	15021.47100	2020-01-01	2020-01-02	2020-01-01 00:09:31	2020-01-02 03:37:52	2020-01-01 00:09:31.000	2020-01-02 03:37:52.000	571	99472	50021.5	5002150	571	99472	50021.5	5002150	-32599	32539	4801.66	480166	-124	127	-0.9	-90
-572	100	10562	99473	1.71771	298.71771	150.21771	15021.77177	1.71771	298.7177	150.21771	15021.7715	1.71771	298.71771	150.21771	15021.77100	2020-01-01	2020-01-02	2020-01-01 00:09:32	2020-01-02 03:37:53	2020-01-01 00:09:32.000	2020-01-02 03:37:53.000	572	99473	50022.5	5002250	572	99473	50022.5	5002250	-32598	32540	4802.66	480266	-128	127	-2.46	-246
-573	100	10563	99474	1.72072	298.72072	150.22072	15022.07207	1.72072	298.72073	150.22072	15022.07212	1.72072	298.72072	150.22072	15022.07200	2020-01-01	2020-01-02	2020-01-01 00:09:33	2020-01-02 03:37:54	2020-01-01 00:09:33.000	2020-01-02 03:37:54.000	573	99474	50023.5	5002350	573	99474	50023.5	5002350	-32597	32541	4803.66	480366	-128	123	-4.02	-402
-574	100	10564	99475	1.72372	298.72372	150.22372	15022.37237	1.72372	298.72372	150.22372	15022.37243	1.72372	298.72372	150.22372	15022.37200	2020-01-01	2020-01-02	2020-01-01 00:09:34	2020-01-02 03:37:55	2020-01-01 00:09:34.000	2020-01-02 03:37:55.000	574	99475	50024.5	5002450	574	99475	50024.5	5002450	-32596	32542	4804.66	480466	-127	124	-3.02	-302
-575	100	10565	99476	1.72672	298.72672	150.22672	15022.67267	1.72672	298.7267	150.22672	15022.67272	1.72672	298.72672	150.22672	15022.67200	2020-01-01	2020-01-02	2020-01-01 00:09:35	2020-01-02 03:37:56	2020-01-01 00:09:35.000	2020-01-02 03:37:56.000	575	99476	50025.5	5002550	575	99476	50025.5	5002550	-32595	32543	4805.66	480566	-126	125	-2.02	-202
-576	100	10566	99477	1.72972	298.72972	150.22972	15022.97297	1.72972	298.72974	150.22973	15022.97332	1.72972	298.72972	150.22972	15022.97200	2020-01-01	2020-01-02	2020-01-01 00:09:36	2020-01-02 03:37:57	2020-01-01 00:09:36.000	2020-01-02 03:37:57.000	576	99477	50026.5	5002650	576	99477	50026.5	5002650	-32594	32544	4806.66	480666	-125	126	-1.02	-102
-577	100	10567	99478	1.73273	298.73273	150.23273	15023.27327	1.73273	298.73273	150.23272	15023.27297	1.73273	298.73273	150.23273	15023.27300	2020-01-01	2020-01-02	2020-01-01 00:09:37	2020-01-02 03:37:58	2020-01-01 00:09:37.000	2020-01-02 03:37:58.000	577	99478	50027.5	5002750	577	99478	50027.5	5002750	-32593	32545	4807.66	480766	-124	127	-0.02	-2
-578	100	10568	99479	1.73573	298.73573	150.23573	15023.57357	1.73573	298.73575	150.23573	15023.57359	1.73573	298.73573	150.23573	15023.57300	2020-01-01	2020-01-02	2020-01-01 00:09:38	2020-01-02 03:37:59	2020-01-01 00:09:38.000	2020-01-02 03:37:59.000	578	99479	50028.5	5002850	578	99479	50028.5	5002850	-32592	32546	4808.66	480866	-128	127	-1.58	-158
-579	100	10569	99480	1.73873	298.73873	150.23873	15023.87387	1.73873	298.73874	150.23873	15023.8739	1.73873	298.73873	150.23873	15023.87300	2020-01-01	2020-01-02	2020-01-01 00:09:39	2020-01-02 03:38:00	2020-01-01 00:09:39.000	2020-01-02 03:38:00.000	579	99480	50029.5	5002950	579	99480	50029.5	5002950	-32591	32547	4809.66	480966	-128	123	-3.14	-314
+570	100	10560	99471	1.71171	298.71171	150.21171	15021.17117	1.71171	298.7117	150.21171	15021.17109	1.71171	298.71171	150.21171	15021.171	2020-01-01	2020-01-02	2020-01-01 00:09:30	2020-01-02 03:37:51	2020-01-01 00:09:30.000	2020-01-02 03:37:51.000	570	99471	50020.5	5002050	570	99471	50020.5	5002050	-32600	32538	4800.66	480066	-125	126	-1.9	-190
+571	100	10561	99472	1.71471	298.71471	150.21471	15021.47147	1.71471	298.71472	150.21471	15021.47184	1.71471	298.71471	150.21471	15021.471	2020-01-01	2020-01-02	2020-01-01 00:09:31	2020-01-02 03:37:52	2020-01-01 00:09:31.000	2020-01-02 03:37:52.000	571	99472	50021.5	5002150	571	99472	50021.5	5002150	-32599	32539	4801.66	480166	-124	127	-0.9	-90
+572	100	10562	99473	1.71771	298.71771	150.21771	15021.77177	1.71771	298.7177	150.21771	15021.7715	1.71771	298.71771	150.21771	15021.771	2020-01-01	2020-01-02	2020-01-01 00:09:32	2020-01-02 03:37:53	2020-01-01 00:09:32.000	2020-01-02 03:37:53.000	572	99473	50022.5	5002250	572	99473	50022.5	5002250	-32598	32540	4802.66	480266	-128	127	-2.46	-246
+573	100	10563	99474	1.72072	298.72072	150.22072	15022.07207	1.72072	298.72073	150.22072	15022.07212	1.72072	298.72072	150.22072	15022.072	2020-01-01	2020-01-02	2020-01-01 00:09:33	2020-01-02 03:37:54	2020-01-01 00:09:33.000	2020-01-02 03:37:54.000	573	99474	50023.5	5002350	573	99474	50023.5	5002350	-32597	32541	4803.66	480366	-128	123	-4.02	-402
+574	100	10564	99475	1.72372	298.72372	150.22372	15022.37237	1.72372	298.72372	150.22372	15022.37243	1.72372	298.72372	150.22372	15022.372	2020-01-01	2020-01-02	2020-01-01 00:09:34	2020-01-02 03:37:55	2020-01-01 00:09:34.000	2020-01-02 03:37:55.000	574	99475	50024.5	5002450	574	99475	50024.5	5002450	-32596	32542	4804.66	480466	-127	124	-3.02	-302
+575	100	10565	99476	1.72672	298.72672	150.22672	15022.67267	1.72672	298.7267	150.22672	15022.67272	1.72672	298.72672	150.22672	15022.672	2020-01-01	2020-01-02	2020-01-01 00:09:35	2020-01-02 03:37:56	2020-01-01 00:09:35.000	2020-01-02 03:37:56.000	575	99476	50025.5	5002550	575	99476	50025.5	5002550	-32595	32543	4805.66	480566	-126	125	-2.02	-202
+576	100	10566	99477	1.72972	298.72972	150.22972	15022.97297	1.72972	298.72974	150.22973	15022.97332	1.72972	298.72972	150.22972	15022.972	2020-01-01	2020-01-02	2020-01-01 00:09:36	2020-01-02 03:37:57	2020-01-01 00:09:36.000	2020-01-02 03:37:57.000	576	99477	50026.5	5002650	576	99477	50026.5	5002650	-32594	32544	4806.66	480666	-125	126	-1.02	-102
+577	100	10567	99478	1.73273	298.73273	150.23273	15023.27327	1.73273	298.73273	150.23272	15023.27297	1.73273	298.73273	150.23273	15023.273	2020-01-01	2020-01-02	2020-01-01 00:09:37	2020-01-02 03:37:58	2020-01-01 00:09:37.000	2020-01-02 03:37:58.000	577	99478	50027.5	5002750	577	99478	50027.5	5002750	-32593	32545	4807.66	480766	-124	127	-0.02	-2
+578	100	10568	99479	1.73573	298.73573	150.23573	15023.57357	1.73573	298.73575	150.23573	15023.57359	1.73573	298.73573	150.23573	15023.573	2020-01-01	2020-01-02	2020-01-01 00:09:38	2020-01-02 03:37:59	2020-01-01 00:09:38.000	2020-01-02 03:37:59.000	578	99479	50028.5	5002850	578	99479	50028.5	5002850	-32592	32546	4808.66	480866	-128	127	-1.58	-158
+579	100	10569	99480	1.73873	298.73873	150.23873	15023.87387	1.73873	298.73874	150.23873	15023.8739	1.73873	298.73873	150.23873	15023.873	2020-01-01	2020-01-02	2020-01-01 00:09:39	2020-01-02 03:38:00	2020-01-01 00:09:39.000	2020-01-02 03:38:00.000	579	99480	50029.5	5002950	579	99480	50029.5	5002950	-32591	32547	4809.66	480966	-128	123	-3.14	-314
 58	102	10048	99958	0.17417	300.17417	150.17417	15167.59159	0.17417	300.17416	150.17417	15167.59159	0.17417	300.17417	150.17417	15167.59117	2020-01-01	2020-01-02	2020-01-01 00:00:58	2020-01-02 03:45:58	2020-01-01 00:00:58.000	2020-01-02 03:45:58.000	58	99958	50008	5050808	58	99958	50008	5050808	-32511	32424	4587.009900990099	463288	-125	126	-0.7128712871287128	-72
-580	100	10570	99481	1.74174	298.74174	150.24174	15024.17417	1.74174	298.74173	150.24174	15024.17419	1.74174	298.74174	150.24174000000002	15024.17400	2020-01-01	2020-01-02	2020-01-01 00:09:40	2020-01-02 03:38:01	2020-01-01 00:09:40.000	2020-01-02 03:38:01.000	580	99481	50030.5	5003050	580	99481	50030.5	5003050	-32590	32548	4810.66	481066	-127	124	-2.14	-214
-581	100	10571	99482	1.74474	298.74474	150.24474	15024.47447	1.74474	298.74475	150.24474	15024.47478	1.74474	298.74474	150.24474	15024.47400	2020-01-01	2020-01-02	2020-01-01 00:09:41	2020-01-02 03:38:02	2020-01-01 00:09:41.000	2020-01-02 03:38:02.000	581	99482	50031.5	5003150	581	99482	50031.5	5003150	-32589	32549	4811.66	481166	-126	125	-1.14	-114
-582	100	10572	99483	1.74774	298.74774	150.24774	15024.77477	1.74774	298.74774	150.24774	15024.77447	1.74774	298.74774	150.24774	15024.77400	2020-01-01	2020-01-02	2020-01-01 00:09:42	2020-01-02 03:38:03	2020-01-01 00:09:42.000	2020-01-02 03:38:03.000	582	99483	50032.5	5003250	582	99483	50032.5	5003250	-32588	32550	4812.66	481266	-125	126	-0.14	-14
-583	100	10573	99484	1.75075	298.75075	150.25075	15025.07507	1.75075	298.75076	150.25075	15025.07507	1.75075	298.75075	150.25075	15025.07500	2020-01-01	2020-01-02	2020-01-01 00:09:43	2020-01-02 03:38:04	2020-01-01 00:09:43.000	2020-01-02 03:38:04.000	583	99484	50033.5	5003350	583	99484	50033.5	5003350	-32587	32551	4813.66	481366	-124	127	0.86	86
-584	100	10574	99485	1.75375	298.75375	150.25375	15025.37537	1.75375	298.75375	150.25375	15025.37536	1.75375	298.75375	150.25375	15025.37500	2020-01-01	2020-01-02	2020-01-01 00:09:44	2020-01-02 03:38:05	2020-01-01 00:09:44.000	2020-01-02 03:38:05.000	584	99485	50034.5	5003450	584	99485	50034.5	5003450	-32586	32552	4814.66	481466	-128	127	-0.7	-70
-585	100	10575	99486	1.75675	298.75675	150.25675	15025.67567	1.75675	298.75674	150.25675	15025.67566	1.75675	298.75675	150.25674999999998	15025.67500	2020-01-01	2020-01-02	2020-01-01 00:09:45	2020-01-02 03:38:06	2020-01-01 00:09:45.000	2020-01-02 03:38:06.000	585	99486	50035.5	5003550	585	99486	50035.5	5003550	-32585	32553	4815.66	481566	-128	127	-2.26	-226
-586	100	10576	99487	1.75975	298.75975	150.25975	15025.97597	1.75975	298.75977	150.25976	15025.97625	1.75975	298.75975	150.25975	15025.97500	2020-01-01	2020-01-02	2020-01-01 00:09:46	2020-01-02 03:38:07	2020-01-01 00:09:46.000	2020-01-02 03:38:07.000	586	99487	50036.5	5003650	586	99487	50036.5	5003650	-32584	32554	4816.66	481666	-128	123	-3.82	-382
-587	100	10577	99488	1.76276	298.76276	150.26276	15026.27627	1.76276	298.76276	150.26275	15026.27594	1.76276	298.76276	150.26276	15026.27600	2020-01-01	2020-01-02	2020-01-01 00:09:47	2020-01-02 03:38:08	2020-01-01 00:09:47.000	2020-01-02 03:38:08.000	587	99488	50037.5	5003750	587	99488	50037.5	5003750	-32583	32555	4817.66	481766	-127	124	-2.82	-282
-588	100	10578	99489	1.76576	298.76576	150.26576	15026.57657	1.76576	298.76578	150.26576	15026.57654	1.76576	298.76576	150.26576	15026.57600	2020-01-01	2020-01-02	2020-01-01 00:09:48	2020-01-02 03:38:09	2020-01-01 00:09:48.000	2020-01-02 03:38:09.000	588	99489	50038.5	5003850	588	99489	50038.5	5003850	-32582	32556	4818.66	481866	-126	125	-1.82	-182
-589	100	10579	99490	1.76876	298.76876	150.26876	15026.87687	1.76876	298.76877	150.26876	15026.87683	1.76876	298.76876	150.26876000000001	15026.87600	2020-01-01	2020-01-02	2020-01-01 00:09:49	2020-01-02 03:38:10	2020-01-01 00:09:49.000	2020-01-02 03:38:10.000	589	99490	50039.5	5003950	589	99490	50039.5	5003950	-32581	32557	4819.66	481966	-125	126	-0.82	-82
+580	100	10570	99481	1.74174	298.74174	150.24174	15024.17417	1.74174	298.74173	150.24174	15024.17419	1.74174	298.74174	150.24174000000002	15024.174	2020-01-01	2020-01-02	2020-01-01 00:09:40	2020-01-02 03:38:01	2020-01-01 00:09:40.000	2020-01-02 03:38:01.000	580	99481	50030.5	5003050	580	99481	50030.5	5003050	-32590	32548	4810.66	481066	-127	124	-2.14	-214
+581	100	10571	99482	1.74474	298.74474	150.24474	15024.47447	1.74474	298.74475	150.24474	15024.47478	1.74474	298.74474	150.24474	15024.474	2020-01-01	2020-01-02	2020-01-01 00:09:41	2020-01-02 03:38:02	2020-01-01 00:09:41.000	2020-01-02 03:38:02.000	581	99482	50031.5	5003150	581	99482	50031.5	5003150	-32589	32549	4811.66	481166	-126	125	-1.14	-114
+582	100	10572	99483	1.74774	298.74774	150.24774	15024.77477	1.74774	298.74774	150.24774	15024.77447	1.74774	298.74774	150.24774	15024.774	2020-01-01	2020-01-02	2020-01-01 00:09:42	2020-01-02 03:38:03	2020-01-01 00:09:42.000	2020-01-02 03:38:03.000	582	99483	50032.5	5003250	582	99483	50032.5	5003250	-32588	32550	4812.66	481266	-125	126	-0.14	-14
+583	100	10573	99484	1.75075	298.75075	150.25075	15025.07507	1.75075	298.75076	150.25075	15025.07507	1.75075	298.75075	150.25075	15025.075	2020-01-01	2020-01-02	2020-01-01 00:09:43	2020-01-02 03:38:04	2020-01-01 00:09:43.000	2020-01-02 03:38:04.000	583	99484	50033.5	5003350	583	99484	50033.5	5003350	-32587	32551	4813.66	481366	-124	127	0.86	86
+584	100	10574	99485	1.75375	298.75375	150.25375	15025.37537	1.75375	298.75375	150.25375	15025.37536	1.75375	298.75375	150.25375	15025.375	2020-01-01	2020-01-02	2020-01-01 00:09:44	2020-01-02 03:38:05	2020-01-01 00:09:44.000	2020-01-02 03:38:05.000	584	99485	50034.5	5003450	584	99485	50034.5	5003450	-32586	32552	4814.66	481466	-128	127	-0.7	-70
+585	100	10575	99486	1.75675	298.75675	150.25675	15025.67567	1.75675	298.75674	150.25675	15025.67566	1.75675	298.75675	150.25674999999998	15025.675	2020-01-01	2020-01-02	2020-01-01 00:09:45	2020-01-02 03:38:06	2020-01-01 00:09:45.000	2020-01-02 03:38:06.000	585	99486	50035.5	5003550	585	99486	50035.5	5003550	-32585	32553	4815.66	481566	-128	127	-2.26	-226
+586	100	10576	99487	1.75975	298.75975	150.25975	15025.97597	1.75975	298.75977	150.25976	15025.97625	1.75975	298.75975	150.25975	15025.975	2020-01-01	2020-01-02	2020-01-01 00:09:46	2020-01-02 03:38:07	2020-01-01 00:09:46.000	2020-01-02 03:38:07.000	586	99487	50036.5	5003650	586	99487	50036.5	5003650	-32584	32554	4816.66	481666	-128	123	-3.82	-382
+587	100	10577	99488	1.76276	298.76276	150.26276	15026.27627	1.76276	298.76276	150.26275	15026.27594	1.76276	298.76276	150.26276	15026.276	2020-01-01	2020-01-02	2020-01-01 00:09:47	2020-01-02 03:38:08	2020-01-01 00:09:47.000	2020-01-02 03:38:08.000	587	99488	50037.5	5003750	587	99488	50037.5	5003750	-32583	32555	4817.66	481766	-127	124	-2.82	-282
+588	100	10578	99489	1.76576	298.76576	150.26576	15026.57657	1.76576	298.76578	150.26576	15026.57654	1.76576	298.76576	150.26576	15026.576	2020-01-01	2020-01-02	2020-01-01 00:09:48	2020-01-02 03:38:09	2020-01-01 00:09:48.000	2020-01-02 03:38:09.000	588	99489	50038.5	5003850	588	99489	50038.5	5003850	-32582	32556	4818.66	481866	-126	125	-1.82	-182
+589	100	10579	99490	1.76876	298.76876	150.26876	15026.87687	1.76876	298.76877	150.26876	15026.87683	1.76876	298.76876	150.26876000000001	15026.876	2020-01-01	2020-01-02	2020-01-01 00:09:49	2020-01-02 03:38:10	2020-01-01 00:09:49.000	2020-01-02 03:38:10.000	589	99490	50039.5	5003950	589	99490	50039.5	5003950	-32581	32557	4819.66	481966	-125	126	-0.82	-82
 59	102	10049	99959	0.17717	300.17717	150.17717	15167.89489	0.17717	300.1772	150.17717	15167.8947	0.17717	300.17717	150.17717	15167.89417	2020-01-01	2020-01-02	2020-01-01 00:00:59	2020-01-02 03:45:59	2020-01-01 00:00:59.000	2020-01-02 03:45:59.000	59	99959	50009	5050909	59	99959	50009	5050909	-32510	32425	4588.009900990099	463389	-124	127	0.2871287128712871	29
-590	100	10580	99491	1.77177	298.77177	150.27177	15027.17717	1.77177	298.77176	150.27177	15027.17713	1.77177	298.77177	150.27177	15027.17700	2020-01-01	2020-01-02	2020-01-01 00:09:50	2020-01-02 03:38:11	2020-01-01 00:09:50.000	2020-01-02 03:38:11.000	590	99491	50040.5	5004050	590	99491	50040.5	5004050	-32580	32558	4820.66	482066	-124	127	0.18	18
-591	100	10581	99492	1.77477	298.77477	150.27477	15027.47747	1.77477	298.77478	150.27477	15027.47775	1.77477	298.77477	150.27477000000002	15027.47700	2020-01-01	2020-01-02	2020-01-01 00:09:51	2020-01-02 03:38:12	2020-01-01 00:09:51.000	2020-01-02 03:38:12.000	591	99492	50041.5	5004150	591	99492	50041.5	5004150	-32579	32559	4821.66	482166	-128	127	-1.38	-138
-592	100	10582	99493	1.77777	298.77777	150.27777	15027.77777	1.77777	298.77777	150.27777	15027.77742	1.77777	298.77777	150.27777	15027.77700	2020-01-01	2020-01-02	2020-01-01 00:09:52	2020-01-02 03:38:13	2020-01-01 00:09:52.000	2020-01-02 03:38:13.000	592	99493	50042.5	5004250	592	99493	50042.5	5004250	-32578	32560	4822.66	482266	-128	123	-2.94	-294
-593	100	10583	99494	1.78078	298.78078	150.28078	15028.07807	1.78078	298.7808	150.28078	15028.078	1.78078	298.78078	150.28078	15028.07800	2020-01-01	2020-01-02	2020-01-01 00:09:53	2020-01-02 03:38:14	2020-01-01 00:09:53.000	2020-01-02 03:38:14.000	593	99494	50043.5	5004350	593	99494	50043.5	5004350	-32577	32561	4823.66	482366	-127	124	-1.94	-194
-594	100	10584	99495	1.78378	298.78378	150.28378	15028.37837	1.78378	298.78378	150.28378	15028.3783	1.78378	298.78378	150.28378	15028.37800	2020-01-01	2020-01-02	2020-01-01 00:09:54	2020-01-02 03:38:15	2020-01-01 00:09:54.000	2020-01-02 03:38:15.000	594	99495	50044.5	5004450	594	99495	50044.5	5004450	-32576	32562	4824.66	482466	-126	125	-0.94	-94
-595	100	10585	99496	1.78678	298.78678	150.28678	15028.67867	1.78678	298.78677	150.28678	15028.6786	1.78678	298.78678	150.28678	15028.67800	2020-01-01	2020-01-02	2020-01-01 00:09:55	2020-01-02 03:38:16	2020-01-01 00:09:55.000	2020-01-02 03:38:16.000	595	99496	50045.5	5004550	595	99496	50045.5	5004550	-32575	32563	4825.66	482566	-125	126	0.06	6
-596	100	10586	99497	1.78978	298.78978	150.28978	15028.97897	1.78978	298.7898	150.28979	15028.97922	1.78978	298.78978	150.28977999999998	15028.97800	2020-01-01	2020-01-02	2020-01-01 00:09:56	2020-01-02 03:38:17	2020-01-01 00:09:56.000	2020-01-02 03:38:17.000	596	99497	50046.5	5004650	596	99497	50046.5	5004650	-32574	32564	4826.66	482666	-124	127	1.06	106
-597	100	10587	99498	1.79279	298.79279	150.29279	15029.27927	1.79279	298.7928	150.29278	15029.27888	1.79279	298.79279	150.29279	15029.27900	2020-01-01	2020-01-02	2020-01-01 00:09:57	2020-01-02 03:38:18	2020-01-01 00:09:57.000	2020-01-02 03:38:18.000	597	99498	50047.5	5004750	597	99498	50047.5	5004750	-32573	32565	4827.66	482766	-128	127	-0.5	-50
-598	100	10588	99499	1.79579	298.79579	150.29579	15029.57957	1.79579	298.7958	150.29579	15029.57964	1.79579	298.79579	150.29579	15029.57900	2020-01-01	2020-01-02	2020-01-01 00:09:58	2020-01-02 03:38:19	2020-01-01 00:09:58.000	2020-01-02 03:38:19.000	598	99499	50048.5	5004850	598	99499	50048.5	5004850	-32572	32566	4828.66	482866	-128	123	-2.06	-206
-599	100	10589	99500	1.79879	298.79879	150.29879	15029.87987	1.79879	298.7988	150.29879	15029.87977	1.79879	298.79879	150.29879	15029.87900	2020-01-01	2020-01-02	2020-01-01 00:09:59	2020-01-02 03:38:20	2020-01-01 00:09:59.000	2020-01-02 03:38:20.000	599	99500	50049.5	5004950	599	99500	50049.5	5004950	-32571	32567	4829.66	482966	-127	124	-1.06	-106
+590	100	10580	99491	1.77177	298.77177	150.27177	15027.17717	1.77177	298.77176	150.27177	15027.17713	1.77177	298.77177	150.27177	15027.177	2020-01-01	2020-01-02	2020-01-01 00:09:50	2020-01-02 03:38:11	2020-01-01 00:09:50.000	2020-01-02 03:38:11.000	590	99491	50040.5	5004050	590	99491	50040.5	5004050	-32580	32558	4820.66	482066	-124	127	0.18	18
+591	100	10581	99492	1.77477	298.77477	150.27477	15027.47747	1.77477	298.77478	150.27477	15027.47775	1.77477	298.77477	150.27477000000002	15027.477	2020-01-01	2020-01-02	2020-01-01 00:09:51	2020-01-02 03:38:12	2020-01-01 00:09:51.000	2020-01-02 03:38:12.000	591	99492	50041.5	5004150	591	99492	50041.5	5004150	-32579	32559	4821.66	482166	-128	127	-1.38	-138
+592	100	10582	99493	1.77777	298.77777	150.27777	15027.77777	1.77777	298.77777	150.27777	15027.77742	1.77777	298.77777	150.27777	15027.777	2020-01-01	2020-01-02	2020-01-01 00:09:52	2020-01-02 03:38:13	2020-01-01 00:09:52.000	2020-01-02 03:38:13.000	592	99493	50042.5	5004250	592	99493	50042.5	5004250	-32578	32560	4822.66	482266	-128	123	-2.94	-294
+593	100	10583	99494	1.78078	298.78078	150.28078	15028.07807	1.78078	298.7808	150.28078	15028.078	1.78078	298.78078	150.28078	15028.078	2020-01-01	2020-01-02	2020-01-01 00:09:53	2020-01-02 03:38:14	2020-01-01 00:09:53.000	2020-01-02 03:38:14.000	593	99494	50043.5	5004350	593	99494	50043.5	5004350	-32577	32561	4823.66	482366	-127	124	-1.94	-194
+594	100	10584	99495	1.78378	298.78378	150.28378	15028.37837	1.78378	298.78378	150.28378	15028.3783	1.78378	298.78378	150.28378	15028.378	2020-01-01	2020-01-02	2020-01-01 00:09:54	2020-01-02 03:38:15	2020-01-01 00:09:54.000	2020-01-02 03:38:15.000	594	99495	50044.5	5004450	594	99495	50044.5	5004450	-32576	32562	4824.66	482466	-126	125	-0.94	-94
+595	100	10585	99496	1.78678	298.78678	150.28678	15028.67867	1.78678	298.78677	150.28678	15028.6786	1.78678	298.78678	150.28678	15028.678	2020-01-01	2020-01-02	2020-01-01 00:09:55	2020-01-02 03:38:16	2020-01-01 00:09:55.000	2020-01-02 03:38:16.000	595	99496	50045.5	5004550	595	99496	50045.5	5004550	-32575	32563	4825.66	482566	-125	126	0.06	6
+596	100	10586	99497	1.78978	298.78978	150.28978	15028.97897	1.78978	298.7898	150.28979	15028.97922	1.78978	298.78978	150.28977999999998	15028.978	2020-01-01	2020-01-02	2020-01-01 00:09:56	2020-01-02 03:38:17	2020-01-01 00:09:56.000	2020-01-02 03:38:17.000	596	99497	50046.5	5004650	596	99497	50046.5	5004650	-32574	32564	4826.66	482666	-124	127	1.06	106
+597	100	10587	99498	1.79279	298.79279	150.29279	15029.27927	1.79279	298.7928	150.29278	15029.27888	1.79279	298.79279	150.29279	15029.279	2020-01-01	2020-01-02	2020-01-01 00:09:57	2020-01-02 03:38:18	2020-01-01 00:09:57.000	2020-01-02 03:38:18.000	597	99498	50047.5	5004750	597	99498	50047.5	5004750	-32573	32565	4827.66	482766	-128	127	-0.5	-50
+598	100	10588	99499	1.79579	298.79579	150.29579	15029.57957	1.79579	298.7958	150.29579	15029.57964	1.79579	298.79579	150.29579	15029.579	2020-01-01	2020-01-02	2020-01-01 00:09:58	2020-01-02 03:38:19	2020-01-01 00:09:58.000	2020-01-02 03:38:19.000	598	99499	50048.5	5004850	598	99499	50048.5	5004850	-32572	32566	4828.66	482866	-128	123	-2.06	-206
+599	100	10589	99500	1.79879	298.79879	150.29879	15029.87987	1.79879	298.7988	150.29879	15029.87977	1.79879	298.79879	150.29879	15029.879	2020-01-01	2020-01-02	2020-01-01 00:09:59	2020-01-02 03:38:20	2020-01-01 00:09:59.000	2020-01-02 03:38:20.000	599	99500	50049.5	5004950	599	99500	50049.5	5004950	-32571	32567	4829.66	482966	-127	124	-1.06	-106
 6	102	1005	9996	0.01801	300.01801	150.01801	15151.81981	0.01801	300.018	150.01801	15151.81978	0.01801	300.01801	150.01801	15151.81901	2020-01-01	2020-01-02	2020-01-01 00:00:06	2020-01-02 03:45:06	2020-01-01 00:00:06.000	2020-01-02 03:45:06.000	6	99906	49956	5045556	6	99906	49956	5045556	-32563	32372	4535.009900990099	458036	-127	124	-2.01980198019802	-204
 60	102	10050	99960	0.18018	300.18018	150.18018	15168.19819	0.18018	300.18018	150.18017	15168.198	0.18018	300.18018	150.18018	15168.19818	2020-01-01	2020-01-02	2020-01-01 00:01:00	2020-01-02 03:46:00	2020-01-01 00:01:00.000	2020-01-02 03:46:00.000	60	99960	50010	5051010	60	99960	50010	5051010	-32509	32426	4589.009900990099	463490	-128	127	-1.2475247524752475	-126
-600	100	10590	99501	1.8018	298.8018	150.3018	15030.18018	1.8018	298.8018	150.3018	15030.1801	1.80180	298.80180	150.30180000000001	15030.18000	2020-01-01	2020-01-02	2020-01-01 00:10:00	2020-01-02 03:38:21	2020-01-01 00:10:00.000	2020-01-02 03:38:21.000	600	99501	50050.5	5005050	600	99501	50050.5	5005050	-32570	32568	4830.66	483066	-126	125	-0.06	-6
-601	100	10591	99502	1.8048	298.8048	150.3048	15030.48048	1.8048	298.8048	150.3048	15030.4807	1.80480	298.80480	150.3048	15030.48000	2020-01-01	2020-01-02	2020-01-01 00:10:01	2020-01-02 03:38:22	2020-01-01 00:10:01.000	2020-01-02 03:38:22.000	601	99502	50051.5	5005150	601	99502	50051.5	5005150	-32569	32569	4831.66	483166	-125	126	0.94	94
-602	100	10592	99503	1.8078	298.8078	150.3078	15030.78078	1.8078	298.8078	150.3078	15030.78035	1.80780	298.80780	150.30780000000001	15030.78000	2020-01-01	2020-01-02	2020-01-01 00:10:02	2020-01-02 03:38:23	2020-01-01 00:10:02.000	2020-01-02 03:38:23.000	602	99503	50052.5	5005250	602	99503	50052.5	5005250	-32568	32570	4832.66	483266	-124	127	1.94	194
-603	100	10593	99504	1.81081	298.81081	150.31081	15031.08108	1.81081	298.81082	150.31081	15031.0811	1.81081	298.81081	150.31081	15031.08100	2020-01-01	2020-01-02	2020-01-01 00:10:03	2020-01-02 03:38:24	2020-01-01 00:10:03.000	2020-01-02 03:38:24.000	603	99504	50053.5	5005350	603	99504	50053.5	5005350	-32567	32571	4833.66	483366	-128	127	0.38	38
-604	100	10594	99505	1.81381	298.81381	150.31381	15031.38138	1.81381	298.8138	150.31381	15031.38124	1.81381	298.81381	150.31381	15031.38100	2020-01-01	2020-01-02	2020-01-01 00:10:04	2020-01-02 03:38:25	2020-01-01 00:10:04.000	2020-01-02 03:38:25.000	604	99505	50054.5	5005450	604	99505	50054.5	5005450	-32566	32572	4834.66	483466	-128	123	-1.18	-118
-605	100	10595	99506	1.81681	298.81681	150.31681	15031.68168	1.81681	298.8168	150.31681	15031.68157	1.81681	298.81681	150.31681	15031.68100	2020-01-01	2020-01-02	2020-01-01 00:10:05	2020-01-02 03:38:26	2020-01-01 00:10:05.000	2020-01-02 03:38:26.000	605	99506	50055.5	5005550	605	99506	50055.5	5005550	-32565	32573	4835.66	483566	-127	124	-0.18	-18
-606	100	10596	99507	1.81981	298.81981	150.31981	15031.98198	1.81981	298.81982	150.31982	15031.98217	1.81981	298.81981	150.31981	15031.98100	2020-01-01	2020-01-02	2020-01-01 00:10:06	2020-01-02 03:38:27	2020-01-01 00:10:06.000	2020-01-02 03:38:27.000	606	99507	50056.5	5005650	606	99507	50056.5	5005650	-32564	32574	4836.66	483666	-126	125	0.82	82
-607	100	10597	99508	1.82282	298.82282	150.32282	15032.28228	1.82282	298.8228	150.32282	15032.28246	1.82282	298.82282	150.32281999999998	15032.28200	2020-01-01	2020-01-02	2020-01-01 00:10:07	2020-01-02 03:38:28	2020-01-01 00:10:07.000	2020-01-02 03:38:28.000	607	99508	50057.5	5005750	607	99508	50057.5	5005750	-32563	32575	4837.66	483766	-125	126	1.82	182
-608	100	10598	99509	1.82582	298.82582	150.32582	15032.58258	1.82582	298.82584	150.32582	15032.58258	1.82582	298.82582	150.32582	15032.58200	2020-01-01	2020-01-02	2020-01-01 00:10:08	2020-01-02 03:38:29	2020-01-01 00:10:08.000	2020-01-02 03:38:29.000	608	99509	50058.5	5005850	608	99509	50058.5	5005850	-32562	32576	4838.66	483866	-124	127	2.82	282
-609	100	10599	99510	1.82882	298.82882	150.32882	15032.88288	1.82882	298.82883	150.32882	15032.88274	1.82882	298.82882	150.32882	15032.88200	2020-01-01	2020-01-02	2020-01-01 00:10:09	2020-01-02 03:38:30	2020-01-01 00:10:09.000	2020-01-02 03:38:30.000	609	99510	50059.5	5005950	609	99510	50059.5	5005950	-32561	32577	4839.66	483966	-128	127	1.26	126
+600	100	10590	99501	1.8018	298.8018	150.3018	15030.18018	1.8018	298.8018	150.3018	15030.1801	1.8018	298.8018	150.30180000000001	15030.18	2020-01-01	2020-01-02	2020-01-01 00:10:00	2020-01-02 03:38:21	2020-01-01 00:10:00.000	2020-01-02 03:38:21.000	600	99501	50050.5	5005050	600	99501	50050.5	5005050	-32570	32568	4830.66	483066	-126	125	-0.06	-6
+601	100	10591	99502	1.8048	298.8048	150.3048	15030.48048	1.8048	298.8048	150.3048	15030.4807	1.8048	298.8048	150.3048	15030.48	2020-01-01	2020-01-02	2020-01-01 00:10:01	2020-01-02 03:38:22	2020-01-01 00:10:01.000	2020-01-02 03:38:22.000	601	99502	50051.5	5005150	601	99502	50051.5	5005150	-32569	32569	4831.66	483166	-125	126	0.94	94
+602	100	10592	99503	1.8078	298.8078	150.3078	15030.78078	1.8078	298.8078	150.3078	15030.78035	1.8078	298.8078	150.30780000000001	15030.78	2020-01-01	2020-01-02	2020-01-01 00:10:02	2020-01-02 03:38:23	2020-01-01 00:10:02.000	2020-01-02 03:38:23.000	602	99503	50052.5	5005250	602	99503	50052.5	5005250	-32568	32570	4832.66	483266	-124	127	1.94	194
+603	100	10593	99504	1.81081	298.81081	150.31081	15031.08108	1.81081	298.81082	150.31081	15031.0811	1.81081	298.81081	150.31081	15031.081	2020-01-01	2020-01-02	2020-01-01 00:10:03	2020-01-02 03:38:24	2020-01-01 00:10:03.000	2020-01-02 03:38:24.000	603	99504	50053.5	5005350	603	99504	50053.5	5005350	-32567	32571	4833.66	483366	-128	127	0.38	38
+604	100	10594	99505	1.81381	298.81381	150.31381	15031.38138	1.81381	298.8138	150.31381	15031.38124	1.81381	298.81381	150.31381	15031.381	2020-01-01	2020-01-02	2020-01-01 00:10:04	2020-01-02 03:38:25	2020-01-01 00:10:04.000	2020-01-02 03:38:25.000	604	99505	50054.5	5005450	604	99505	50054.5	5005450	-32566	32572	4834.66	483466	-128	123	-1.18	-118
+605	100	10595	99506	1.81681	298.81681	150.31681	15031.68168	1.81681	298.8168	150.31681	15031.68157	1.81681	298.81681	150.31681	15031.681	2020-01-01	2020-01-02	2020-01-01 00:10:05	2020-01-02 03:38:26	2020-01-01 00:10:05.000	2020-01-02 03:38:26.000	605	99506	50055.5	5005550	605	99506	50055.5	5005550	-32565	32573	4835.66	483566	-127	124	-0.18	-18
+606	100	10596	99507	1.81981	298.81981	150.31981	15031.98198	1.81981	298.81982	150.31982	15031.98217	1.81981	298.81981	150.31981	15031.981	2020-01-01	2020-01-02	2020-01-01 00:10:06	2020-01-02 03:38:27	2020-01-01 00:10:06.000	2020-01-02 03:38:27.000	606	99507	50056.5	5005650	606	99507	50056.5	5005650	-32564	32574	4836.66	483666	-126	125	0.82	82
+607	100	10597	99508	1.82282	298.82282	150.32282	15032.28228	1.82282	298.8228	150.32282	15032.28246	1.82282	298.82282	150.32281999999998	15032.282	2020-01-01	2020-01-02	2020-01-01 00:10:07	2020-01-02 03:38:28	2020-01-01 00:10:07.000	2020-01-02 03:38:28.000	607	99508	50057.5	5005750	607	99508	50057.5	5005750	-32563	32575	4837.66	483766	-125	126	1.82	182
+608	100	10598	99509	1.82582	298.82582	150.32582	15032.58258	1.82582	298.82584	150.32582	15032.58258	1.82582	298.82582	150.32582	15032.582	2020-01-01	2020-01-02	2020-01-01 00:10:08	2020-01-02 03:38:29	2020-01-01 00:10:08.000	2020-01-02 03:38:29.000	608	99509	50058.5	5005850	608	99509	50058.5	5005850	-32562	32576	4838.66	483866	-124	127	2.82	282
+609	100	10599	99510	1.82882	298.82882	150.32882	15032.88288	1.82882	298.82883	150.32882	15032.88274	1.82882	298.82882	150.32882	15032.882	2020-01-01	2020-01-02	2020-01-01 00:10:09	2020-01-02 03:38:30	2020-01-01 00:10:09.000	2020-01-02 03:38:30.000	609	99510	50059.5	5005950	609	99510	50059.5	5005950	-32561	32577	4839.66	483966	-128	127	1.26	126
 61	102	10051	99961	0.18318	300.18318	150.18318	15168.5015	0.18318	300.1832	150.18318	15168.5016	0.18318	300.18318	150.18318	15168.50118	2020-01-01	2020-01-02	2020-01-01 00:01:01	2020-01-02 03:46:01	2020-01-01 00:01:01.000	2020-01-02 03:46:01.000	61	99961	50011	5051111	61	99961	50011	5051111	-32508	32427	4590.009900990099	463591	-128	123	-2.782178217821782	-281
-610	100	10600	99511	1.83183	298.83183	150.33183	15033.18318	1.83183	298.83182	150.33183	15033.18304	1.83183	298.83183	150.33183	15033.18300	2020-01-01	2020-01-02	2020-01-01 00:10:10	2020-01-02 03:38:31	2020-01-01 00:10:10.000	2020-01-02 03:38:31.000	610	99511	50060.5	5006050	610	99511	50060.5	5006050	-32560	32578	4840.66	484066	-128	127	-0.3	-30
-611	100	10601	99512	1.83483	298.83483	150.33483	15033.48348	1.83483	298.83484	150.33483	15033.48363	1.83483	298.83483	150.33483	15033.48300	2020-01-01	2020-01-02	2020-01-01 00:10:11	2020-01-02 03:38:32	2020-01-01 00:10:11.000	2020-01-02 03:38:32.000	611	99512	50061.5	5006150	611	99512	50061.5	5006150	-32559	32579	4841.66	484166	-128	123	-1.86	-186
-612	100	10602	99513	1.83783	298.83783	150.33783	15033.78378	1.83783	298.83783	150.33783	15033.78393	1.83783	298.83783	150.33783	15033.78300	2020-01-01	2020-01-02	2020-01-01 00:10:12	2020-01-02 03:38:33	2020-01-01 00:10:12.000	2020-01-02 03:38:33.000	612	99513	50062.5	5006250	612	99513	50062.5	5006250	-32558	32580	4842.66	484266	-127	124	-0.86	-86
-613	100	10603	99514	1.84084	298.84084	150.34084	15034.08408	1.84084	298.84085	150.34084	15034.08405	1.84084	298.84084	150.34084000000001	15034.08400	2020-01-01	2020-01-02	2020-01-01 00:10:13	2020-01-02 03:38:34	2020-01-01 00:10:13.000	2020-01-02 03:38:34.000	613	99514	50063.5	5006350	613	99514	50063.5	5006350	-32557	32581	4843.66	484366	-126	125	0.14	14
-614	100	10604	99515	1.84384	298.84384	150.34384	15034.38438	1.84384	298.84384	150.34384	15034.38421	1.84384	298.84384	150.34384	15034.38400	2020-01-01	2020-01-02	2020-01-01 00:10:14	2020-01-02 03:38:35	2020-01-01 00:10:14.000	2020-01-02 03:38:35.000	614	99515	50064.5	5006450	614	99515	50064.5	5006450	-32556	32582	4844.66	484466	-125	126	1.14	114
-615	100	10605	99516	1.84684	298.84684	150.34684	15034.68468	1.84684	298.84683	150.34684	15034.68452	1.84684	298.84684	150.34684	15034.68400	2020-01-01	2020-01-02	2020-01-01 00:10:15	2020-01-02 03:38:36	2020-01-01 00:10:15.000	2020-01-02 03:38:36.000	615	99516	50065.5	5006550	615	99516	50065.5	5006550	-32555	32583	4845.66	484566	-124	127	2.14	214
-616	100	10606	99517	1.84984	298.84984	150.34984	15034.98498	1.84984	298.84985	150.34985	15034.98527	1.84984	298.84984	150.34984	15034.98400	2020-01-01	2020-01-02	2020-01-01 00:10:16	2020-01-02 03:38:37	2020-01-01 00:10:16.000	2020-01-02 03:38:37.000	616	99517	50066.5	5006650	616	99517	50066.5	5006650	-32554	32584	4846.66	484666	-128	127	0.58	58
-617	100	10607	99518	1.85285	298.85285	150.35285	15035.28528	1.85285	298.85284	150.35285	15035.2854	1.85285	298.85285	150.35285	15035.28500	2020-01-01	2020-01-02	2020-01-01 00:10:17	2020-01-02 03:38:38	2020-01-01 00:10:17.000	2020-01-02 03:38:38.000	617	99518	50067.5	5006750	617	99518	50067.5	5006750	-32553	32585	4847.66	484766	-128	123	-0.98	-98
-618	100	10608	99519	1.85585	298.85585	150.35585	15035.58558	1.85585	298.85587	150.35585	15035.58551	1.85585	298.85585	150.35585	15035.58500	2020-01-01	2020-01-02	2020-01-01 00:10:18	2020-01-02 03:38:39	2020-01-01 00:10:18.000	2020-01-02 03:38:39.000	618	99519	50068.5	5006850	618	99519	50068.5	5006850	-32552	32586	4848.66	484866	-127	124	0.02	2
-619	100	10609	99520	1.85885	298.85885	150.35885	15035.88588	1.85885	298.85886	150.35885	15035.88568	1.85885	298.85885	150.35885	15035.88500	2020-01-01	2020-01-02	2020-01-01 00:10:19	2020-01-02 03:38:40	2020-01-01 00:10:19.000	2020-01-02 03:38:40.000	619	99520	50069.5	5006950	619	99520	50069.5	5006950	-32551	32587	4849.66	484966	-126	125	1.02	102
+610	100	10600	99511	1.83183	298.83183	150.33183	15033.18318	1.83183	298.83182	150.33183	15033.18304	1.83183	298.83183	150.33183	15033.183	2020-01-01	2020-01-02	2020-01-01 00:10:10	2020-01-02 03:38:31	2020-01-01 00:10:10.000	2020-01-02 03:38:31.000	610	99511	50060.5	5006050	610	99511	50060.5	5006050	-32560	32578	4840.66	484066	-128	127	-0.3	-30
+611	100	10601	99512	1.83483	298.83483	150.33483	15033.48348	1.83483	298.83484	150.33483	15033.48363	1.83483	298.83483	150.33483	15033.483	2020-01-01	2020-01-02	2020-01-01 00:10:11	2020-01-02 03:38:32	2020-01-01 00:10:11.000	2020-01-02 03:38:32.000	611	99512	50061.5	5006150	611	99512	50061.5	5006150	-32559	32579	4841.66	484166	-128	123	-1.86	-186
+612	100	10602	99513	1.83783	298.83783	150.33783	15033.78378	1.83783	298.83783	150.33783	15033.78393	1.83783	298.83783	150.33783	15033.783	2020-01-01	2020-01-02	2020-01-01 00:10:12	2020-01-02 03:38:33	2020-01-01 00:10:12.000	2020-01-02 03:38:33.000	612	99513	50062.5	5006250	612	99513	50062.5	5006250	-32558	32580	4842.66	484266	-127	124	-0.86	-86
+613	100	10603	99514	1.84084	298.84084	150.34084	15034.08408	1.84084	298.84085	150.34084	15034.08405	1.84084	298.84084	150.34084000000001	15034.084	2020-01-01	2020-01-02	2020-01-01 00:10:13	2020-01-02 03:38:34	2020-01-01 00:10:13.000	2020-01-02 03:38:34.000	613	99514	50063.5	5006350	613	99514	50063.5	5006350	-32557	32581	4843.66	484366	-126	125	0.14	14
+614	100	10604	99515	1.84384	298.84384	150.34384	15034.38438	1.84384	298.84384	150.34384	15034.38421	1.84384	298.84384	150.34384	15034.384	2020-01-01	2020-01-02	2020-01-01 00:10:14	2020-01-02 03:38:35	2020-01-01 00:10:14.000	2020-01-02 03:38:35.000	614	99515	50064.5	5006450	614	99515	50064.5	5006450	-32556	32582	4844.66	484466	-125	126	1.14	114
+615	100	10605	99516	1.84684	298.84684	150.34684	15034.68468	1.84684	298.84683	150.34684	15034.68452	1.84684	298.84684	150.34684	15034.684	2020-01-01	2020-01-02	2020-01-01 00:10:15	2020-01-02 03:38:36	2020-01-01 00:10:15.000	2020-01-02 03:38:36.000	615	99516	50065.5	5006550	615	99516	50065.5	5006550	-32555	32583	4845.66	484566	-124	127	2.14	214
+616	100	10606	99517	1.84984	298.84984	150.34984	15034.98498	1.84984	298.84985	150.34985	15034.98527	1.84984	298.84984	150.34984	15034.984	2020-01-01	2020-01-02	2020-01-01 00:10:16	2020-01-02 03:38:37	2020-01-01 00:10:16.000	2020-01-02 03:38:37.000	616	99517	50066.5	5006650	616	99517	50066.5	5006650	-32554	32584	4846.66	484666	-128	127	0.58	58
+617	100	10607	99518	1.85285	298.85285	150.35285	15035.28528	1.85285	298.85284	150.35285	15035.2854	1.85285	298.85285	150.35285	15035.285	2020-01-01	2020-01-02	2020-01-01 00:10:17	2020-01-02 03:38:38	2020-01-01 00:10:17.000	2020-01-02 03:38:38.000	617	99518	50067.5	5006750	617	99518	50067.5	5006750	-32553	32585	4847.66	484766	-128	123	-0.98	-98
+618	100	10608	99519	1.85585	298.85585	150.35585	15035.58558	1.85585	298.85587	150.35585	15035.58551	1.85585	298.85585	150.35585	15035.585	2020-01-01	2020-01-02	2020-01-01 00:10:18	2020-01-02 03:38:39	2020-01-01 00:10:18.000	2020-01-02 03:38:39.000	618	99519	50068.5	5006850	618	99519	50068.5	5006850	-32552	32586	4848.66	484866	-127	124	0.02	2
+619	100	10609	99520	1.85885	298.85885	150.35885	15035.88588	1.85885	298.85886	150.35885	15035.88568	1.85885	298.85885	150.35885	15035.885	2020-01-01	2020-01-02	2020-01-01 00:10:19	2020-01-02 03:38:40	2020-01-01 00:10:19.000	2020-01-02 03:38:40.000	619	99520	50069.5	5006950	619	99520	50069.5	5006950	-32551	32587	4849.66	484966	-126	125	1.02	102
 62	102	10052	99962	0.18618	300.18618	150.18618	15168.8048	0.18618	300.1862	150.18618	15168.80494	0.18618	300.18618	150.18617999999998	15168.80418	2020-01-01	2020-01-02	2020-01-01 00:01:02	2020-01-02 03:46:02	2020-01-01 00:01:02.000	2020-01-02 03:46:02.000	62	99962	50012	5051212	62	99962	50012	5051212	-32507	32428	4591.009900990099	463692	-127	124	-1.7821782178217822	-180
-620	100	10610	99521	1.86186	298.86186	150.36186	15036.18618	1.86186	298.86185	150.36185	15036.18598	1.86186	298.86186	150.36186	15036.18600	2020-01-01	2020-01-02	2020-01-01 00:10:20	2020-01-02 03:38:41	2020-01-01 00:10:20.000	2020-01-02 03:38:41.000	620	99521	50070.5	5007050	620	99521	50070.5	5007050	-32550	32588	4850.66	485066	-125	126	2.02	202
-621	100	10611	99522	1.86486	298.86486	150.36486	15036.48648	1.86486	298.86487	150.36486	15036.48673	1.86486	298.86486	150.36486000000002	15036.48600	2020-01-01	2020-01-02	2020-01-01 00:10:21	2020-01-02 03:38:42	2020-01-01 00:10:21.000	2020-01-02 03:38:42.000	621	99522	50071.5	5007150	621	99522	50071.5	5007150	-32549	32589	4851.66	485166	-124	127	3.02	302
-622	100	10612	99523	1.86786	298.86786	150.36786	15036.78678	1.86786	298.86786	150.36786	15036.78687	1.86786	298.86786	150.36786	15036.78600	2020-01-01	2020-01-02	2020-01-01 00:10:22	2020-01-02 03:38:43	2020-01-01 00:10:22.000	2020-01-02 03:38:43.000	622	99523	50072.5	5007250	622	99523	50072.5	5007250	-32548	32590	4852.66	485266	-128	127	1.46	146
-623	100	10613	99524	1.87087	298.87087	150.37087	15037.08708	1.87087	298.87088	150.37087	15037.08702	1.87087	298.87087	150.37087	15037.08700	2020-01-01	2020-01-02	2020-01-01 00:10:23	2020-01-02 03:38:44	2020-01-01 00:10:23.000	2020-01-02 03:38:44.000	623	99524	50073.5	5007350	623	99524	50073.5	5007350	-32547	32591	4853.66	485366	-128	123	-0.1	-10
-624	100	10614	99525	1.87387	298.87387	150.37387	15037.38738	1.87387	298.87387	150.37387	15037.38716	1.87387	298.87387	150.37387	15037.38700	2020-01-01	2020-01-02	2020-01-01 00:10:24	2020-01-02 03:38:45	2020-01-01 00:10:24.000	2020-01-02 03:38:45.000	624	99525	50074.5	5007450	624	99525	50074.5	5007450	-32546	32592	4854.66	485466	-127	124	0.9	90
-625	100	10615	99526	1.87687	298.87687	150.37687	15037.68768	1.87687	298.8769	150.37687	15037.68791	1.87687	298.87687	150.37687	15037.68700	2020-01-01	2020-01-02	2020-01-01 00:10:25	2020-01-02 03:38:46	2020-01-01 00:10:25.000	2020-01-02 03:38:46.000	625	99526	50075.5	5007550	625	99526	50075.5	5007550	-32545	32593	4855.66	485566	-126	125	1.9	190
-626	100	10616	99527	1.87987	298.87987	150.37987	15037.98798	1.87987	298.87988	150.37988	15037.9882	1.87987	298.87987	150.37986999999998	15037.98700	2020-01-01	2020-01-02	2020-01-01 00:10:26	2020-01-02 03:38:47	2020-01-01 00:10:26.000	2020-01-02 03:38:47.000	626	99527	50076.5	5007650	626	99527	50076.5	5007650	-32544	32594	4856.66	485666	-125	126	2.9	290
-627	100	10617	99528	1.88288	298.88288	150.38288	15038.28828	1.88288	298.88287	150.38288	15038.28834	1.88288	298.88288	150.38288	15038.28800	2020-01-01	2020-01-02	2020-01-01 00:10:27	2020-01-02 03:38:48	2020-01-01 00:10:27.000	2020-01-02 03:38:48.000	627	99528	50077.5	5007750	627	99528	50077.5	5007750	-32543	32595	4857.66	485766	-124	127	3.9	390
-628	100	10618	99529	1.88588	298.88588	150.38588	15038.58858	1.88588	298.8859	150.38588	15038.58849	1.88588	298.88588	150.38588	15038.58800	2020-01-01	2020-01-02	2020-01-01 00:10:28	2020-01-02 03:38:49	2020-01-01 00:10:28.000	2020-01-02 03:38:49.000	628	99529	50078.5	5007850	628	99529	50078.5	5007850	-32542	32596	4858.66	485866	-128	127	2.34	234
-629	100	10619	99530	1.88888	298.88888	150.38888	15038.88888	1.88888	298.8889	150.38888	15038.88862	1.88888	298.88888	150.38888	15038.88800	2020-01-01	2020-01-02	2020-01-01 00:10:29	2020-01-02 03:38:50	2020-01-01 00:10:29.000	2020-01-02 03:38:50.000	629	99530	50079.5	5007950	629	99530	50079.5	5007950	-32541	32597	4859.66	485966	-128	123	0.78	78
+620	100	10610	99521	1.86186	298.86186	150.36186	15036.18618	1.86186	298.86185	150.36185	15036.18598	1.86186	298.86186	150.36186	15036.186	2020-01-01	2020-01-02	2020-01-01 00:10:20	2020-01-02 03:38:41	2020-01-01 00:10:20.000	2020-01-02 03:38:41.000	620	99521	50070.5	5007050	620	99521	50070.5	5007050	-32550	32588	4850.66	485066	-125	126	2.02	202
+621	100	10611	99522	1.86486	298.86486	150.36486	15036.48648	1.86486	298.86487	150.36486	15036.48673	1.86486	298.86486	150.36486000000002	15036.486	2020-01-01	2020-01-02	2020-01-01 00:10:21	2020-01-02 03:38:42	2020-01-01 00:10:21.000	2020-01-02 03:38:42.000	621	99522	50071.5	5007150	621	99522	50071.5	5007150	-32549	32589	4851.66	485166	-124	127	3.02	302
+622	100	10612	99523	1.86786	298.86786	150.36786	15036.78678	1.86786	298.86786	150.36786	15036.78687	1.86786	298.86786	150.36786	15036.786	2020-01-01	2020-01-02	2020-01-01 00:10:22	2020-01-02 03:38:43	2020-01-01 00:10:22.000	2020-01-02 03:38:43.000	622	99523	50072.5	5007250	622	99523	50072.5	5007250	-32548	32590	4852.66	485266	-128	127	1.46	146
+623	100	10613	99524	1.87087	298.87087	150.37087	15037.08708	1.87087	298.87088	150.37087	15037.08702	1.87087	298.87087	150.37087	15037.087	2020-01-01	2020-01-02	2020-01-01 00:10:23	2020-01-02 03:38:44	2020-01-01 00:10:23.000	2020-01-02 03:38:44.000	623	99524	50073.5	5007350	623	99524	50073.5	5007350	-32547	32591	4853.66	485366	-128	123	-0.1	-10
+624	100	10614	99525	1.87387	298.87387	150.37387	15037.38738	1.87387	298.87387	150.37387	15037.38716	1.87387	298.87387	150.37387	15037.387	2020-01-01	2020-01-02	2020-01-01 00:10:24	2020-01-02 03:38:45	2020-01-01 00:10:24.000	2020-01-02 03:38:45.000	624	99525	50074.5	5007450	624	99525	50074.5	5007450	-32546	32592	4854.66	485466	-127	124	0.9	90
+625	100	10615	99526	1.87687	298.87687	150.37687	15037.68768	1.87687	298.8769	150.37687	15037.68791	1.87687	298.87687	150.37687	15037.687	2020-01-01	2020-01-02	2020-01-01 00:10:25	2020-01-02 03:38:46	2020-01-01 00:10:25.000	2020-01-02 03:38:46.000	625	99526	50075.5	5007550	625	99526	50075.5	5007550	-32545	32593	4855.66	485566	-126	125	1.9	190
+626	100	10616	99527	1.87987	298.87987	150.37987	15037.98798	1.87987	298.87988	150.37988	15037.9882	1.87987	298.87987	150.37986999999998	15037.987	2020-01-01	2020-01-02	2020-01-01 00:10:26	2020-01-02 03:38:47	2020-01-01 00:10:26.000	2020-01-02 03:38:47.000	626	99527	50076.5	5007650	626	99527	50076.5	5007650	-32544	32594	4856.66	485666	-125	126	2.9	290
+627	100	10617	99528	1.88288	298.88288	150.38288	15038.28828	1.88288	298.88287	150.38288	15038.28834	1.88288	298.88288	150.38288	15038.288	2020-01-01	2020-01-02	2020-01-01 00:10:27	2020-01-02 03:38:48	2020-01-01 00:10:27.000	2020-01-02 03:38:48.000	627	99528	50077.5	5007750	627	99528	50077.5	5007750	-32543	32595	4857.66	485766	-124	127	3.9	390
+628	100	10618	99529	1.88588	298.88588	150.38588	15038.58858	1.88588	298.8859	150.38588	15038.58849	1.88588	298.88588	150.38588	15038.588	2020-01-01	2020-01-02	2020-01-01 00:10:28	2020-01-02 03:38:49	2020-01-01 00:10:28.000	2020-01-02 03:38:49.000	628	99529	50078.5	5007850	628	99529	50078.5	5007850	-32542	32596	4858.66	485866	-128	127	2.34	234
+629	100	10619	99530	1.88888	298.88888	150.38888	15038.88888	1.88888	298.8889	150.38888	15038.88862	1.88888	298.88888	150.38888	15038.888	2020-01-01	2020-01-02	2020-01-01 00:10:29	2020-01-02 03:38:50	2020-01-01 00:10:29.000	2020-01-02 03:38:50.000	629	99530	50079.5	5007950	629	99530	50079.5	5007950	-32541	32597	4859.66	485966	-128	123	0.78	78
 63	102	10053	99963	0.18918	300.18918	150.18918	15169.1081	0.18918	300.18918	150.18918	15169.10808	0.18918	300.18918	150.18918000000002	15169.10718	2020-01-01	2020-01-02	2020-01-01 00:01:03	2020-01-02 03:46:03	2020-01-01 00:01:03.000	2020-01-02 03:46:03.000	63	99963	50013	5051313	63	99963	50013	5051313	-32506	32429	4592.009900990099	463793	-126	125	-0.7821782178217822	-79
-630	100	10620	99531	1.89189	298.89189	150.39189	15039.18918	1.89189	298.8919	150.39189	15039.18937	1.89189	298.89189	150.39189	15039.18900	2020-01-01	2020-01-02	2020-01-01 00:10:30	2020-01-02 03:38:51	2020-01-01 00:10:30.000	2020-01-02 03:38:51.000	630	99531	50080.5	5008050	630	99531	50080.5	5008050	-32540	32598	4860.66	486066	-127	124	1.78	178
-631	100	10621	99532	1.89489	298.89489	150.39489	15039.48948	1.89489	298.8949	150.39489	15039.48968	1.89489	298.89489	150.39489	15039.48900	2020-01-01	2020-01-02	2020-01-01 00:10:31	2020-01-02 03:38:52	2020-01-01 00:10:31.000	2020-01-02 03:38:52.000	631	99532	50081.5	5008150	631	99532	50081.5	5008150	-32539	32599	4861.66	486166	-126	125	2.78	278
-632	100	10622	99533	1.89789	298.89789	150.39789	15039.78978	1.89789	298.8979	150.39789	15039.78984	1.89789	298.89789	150.39789000000002	15039.78900	2020-01-01	2020-01-02	2020-01-01 00:10:32	2020-01-02 03:38:53	2020-01-01 00:10:32.000	2020-01-02 03:38:53.000	632	99533	50082.5	5008250	632	99533	50082.5	5008250	-32538	32600	4862.66	486266	-125	126	3.78	378
-633	100	10623	99534	1.9009	298.9009	150.4009	15040.09009	1.9009	298.9009	150.40089	15040.08996	1.90090	298.90090	150.4009	15040.09000	2020-01-01	2020-01-02	2020-01-01 00:10:33	2020-01-02 03:38:54	2020-01-01 00:10:33.000	2020-01-02 03:38:54.000	633	99534	50083.5	5008350	633	99534	50083.5	5008350	-32537	32601	4863.66	486366	-124	127	4.78	478
-634	100	10624	99535	1.9039	298.9039	150.4039	15040.39039	1.9039	298.9039	150.4039	15040.39009	1.90390	298.90390	150.4039	15040.39000	2020-01-01	2020-01-02	2020-01-01 00:10:34	2020-01-02 03:38:55	2020-01-01 00:10:34.000	2020-01-02 03:38:55.000	634	99535	50084.5	5008450	634	99535	50084.5	5008450	-32536	32602	4864.66	486466	-128	127	3.22	322
-635	100	10625	99536	1.9069	298.9069	150.4069	15040.69069	1.9069	298.90692	150.4069	15040.69084	1.90690	298.90690	150.4069	15040.69000	2020-01-01	2020-01-02	2020-01-01 00:10:35	2020-01-02 03:38:56	2020-01-01 00:10:35.000	2020-01-02 03:38:56.000	635	99536	50085.5	5008550	635	99536	50085.5	5008550	-32535	32603	4865.66	486566	-128	127	1.66	166
-636	100	10626	99537	1.9099	298.9099	150.4099	15040.99099	1.90991	298.9099	150.40991	15040.99115	1.90990	298.90990	150.4099	15040.99000	2020-01-01	2020-01-02	2020-01-01 00:10:36	2020-01-02 03:38:57	2020-01-01 00:10:36.000	2020-01-02 03:38:57.000	636	99537	50086.5	5008650	636	99537	50086.5	5008650	-32534	32604	4866.66	486666	-128	124	0.1	10
-637	100	10627	99538	1.91291	298.91291	150.41291	15041.29129	1.91291	298.9129	150.41291	15041.29131	1.91291	298.91291	150.41290999999998	15041.29100	2020-01-01	2020-01-02	2020-01-01 00:10:37	2020-01-02 03:38:58	2020-01-01 00:10:37.000	2020-01-02 03:38:58.000	637	99538	50087.5	5008750	637	99538	50087.5	5008750	-32533	32605	4867.66	486766	-127	125	1.1	110
-638	100	10628	99539	1.91591	298.91591	150.41591	15041.59159	1.91591	298.91592	150.41591	15041.59143	1.91591	298.91591	150.41591	15041.59100	2020-01-01	2020-01-02	2020-01-01 00:10:38	2020-01-02 03:38:59	2020-01-01 00:10:38.000	2020-01-02 03:38:59.000	638	99539	50088.5	5008850	638	99539	50088.5	5008850	-32532	32606	4868.66	486866	-126	126	2.1	210
-639	100	10629	99540	1.91891	298.91891	150.41891	15041.89189	1.91891	298.9189	150.41891	15041.89172	1.91891	298.91891	150.41890999999998	15041.89100	2020-01-01	2020-01-02	2020-01-01 00:10:39	2020-01-02 03:39:00	2020-01-01 00:10:39.000	2020-01-02 03:39:00.000	639	99540	50089.5	5008950	639	99540	50089.5	5008950	-32531	32607	4869.66	486966	-125	127	3.1	310
+630	100	10620	99531	1.89189	298.89189	150.39189	15039.18918	1.89189	298.8919	150.39189	15039.18937	1.89189	298.89189	150.39189	15039.189	2020-01-01	2020-01-02	2020-01-01 00:10:30	2020-01-02 03:38:51	2020-01-01 00:10:30.000	2020-01-02 03:38:51.000	630	99531	50080.5	5008050	630	99531	50080.5	5008050	-32540	32598	4860.66	486066	-127	124	1.78	178
+631	100	10621	99532	1.89489	298.89489	150.39489	15039.48948	1.89489	298.8949	150.39489	15039.48968	1.89489	298.89489	150.39489	15039.489	2020-01-01	2020-01-02	2020-01-01 00:10:31	2020-01-02 03:38:52	2020-01-01 00:10:31.000	2020-01-02 03:38:52.000	631	99532	50081.5	5008150	631	99532	50081.5	5008150	-32539	32599	4861.66	486166	-126	125	2.78	278
+632	100	10622	99533	1.89789	298.89789	150.39789	15039.78978	1.89789	298.8979	150.39789	15039.78984	1.89789	298.89789	150.39789000000002	15039.789	2020-01-01	2020-01-02	2020-01-01 00:10:32	2020-01-02 03:38:53	2020-01-01 00:10:32.000	2020-01-02 03:38:53.000	632	99533	50082.5	5008250	632	99533	50082.5	5008250	-32538	32600	4862.66	486266	-125	126	3.78	378
+633	100	10623	99534	1.9009	298.9009	150.4009	15040.09009	1.9009	298.9009	150.40089	15040.08996	1.9009	298.9009	150.4009	15040.09	2020-01-01	2020-01-02	2020-01-01 00:10:33	2020-01-02 03:38:54	2020-01-01 00:10:33.000	2020-01-02 03:38:54.000	633	99534	50083.5	5008350	633	99534	50083.5	5008350	-32537	32601	4863.66	486366	-124	127	4.78	478
+634	100	10624	99535	1.9039	298.9039	150.4039	15040.39039	1.9039	298.9039	150.4039	15040.39009	1.9039	298.9039	150.4039	15040.39	2020-01-01	2020-01-02	2020-01-01 00:10:34	2020-01-02 03:38:55	2020-01-01 00:10:34.000	2020-01-02 03:38:55.000	634	99535	50084.5	5008450	634	99535	50084.5	5008450	-32536	32602	4864.66	486466	-128	127	3.22	322
+635	100	10625	99536	1.9069	298.9069	150.4069	15040.69069	1.9069	298.90692	150.4069	15040.69084	1.9069	298.9069	150.4069	15040.69	2020-01-01	2020-01-02	2020-01-01 00:10:35	2020-01-02 03:38:56	2020-01-01 00:10:35.000	2020-01-02 03:38:56.000	635	99536	50085.5	5008550	635	99536	50085.5	5008550	-32535	32603	4865.66	486566	-128	127	1.66	166
+636	100	10626	99537	1.9099	298.9099	150.4099	15040.99099	1.90991	298.9099	150.40991	15040.99115	1.9099	298.9099	150.4099	15040.99	2020-01-01	2020-01-02	2020-01-01 00:10:36	2020-01-02 03:38:57	2020-01-01 00:10:36.000	2020-01-02 03:38:57.000	636	99537	50086.5	5008650	636	99537	50086.5	5008650	-32534	32604	4866.66	486666	-128	124	0.1	10
+637	100	10627	99538	1.91291	298.91291	150.41291	15041.29129	1.91291	298.9129	150.41291	15041.29131	1.91291	298.91291	150.41290999999998	15041.291	2020-01-01	2020-01-02	2020-01-01 00:10:37	2020-01-02 03:38:58	2020-01-01 00:10:37.000	2020-01-02 03:38:58.000	637	99538	50087.5	5008750	637	99538	50087.5	5008750	-32533	32605	4867.66	486766	-127	125	1.1	110
+638	100	10628	99539	1.91591	298.91591	150.41591	15041.59159	1.91591	298.91592	150.41591	15041.59143	1.91591	298.91591	150.41591	15041.591	2020-01-01	2020-01-02	2020-01-01 00:10:38	2020-01-02 03:38:59	2020-01-01 00:10:38.000	2020-01-02 03:38:59.000	638	99539	50088.5	5008850	638	99539	50088.5	5008850	-32532	32606	4868.66	486866	-126	126	2.1	210
+639	100	10629	99540	1.91891	298.91891	150.41891	15041.89189	1.91891	298.9189	150.41891	15041.89172	1.91891	298.91891	150.41890999999998	15041.891	2020-01-01	2020-01-02	2020-01-01 00:10:39	2020-01-02 03:39:00	2020-01-01 00:10:39.000	2020-01-02 03:39:00.000	639	99540	50089.5	5008950	639	99540	50089.5	5008950	-32531	32607	4869.66	486966	-125	127	3.1	310
 64	102	10054	99964	0.19219	300.19219	150.19219	15169.41141	0.19219	300.1922	150.19219	15169.41184	0.19219	300.19219	150.19219	15169.41119	2020-01-01	2020-01-02	2020-01-01 00:01:04	2020-01-02 03:46:04	2020-01-01 00:01:04.000	2020-01-02 03:46:04.000	64	99964	50014	5051414	64	99964	50014	5051414	-32505	32430	4593.009900990099	463894	-125	126	0.21782178217821782	22
-640	100	10630	99541	1.92192	298.92192	150.42192	15042.19219	1.92192	298.92194	150.42192	15042.19232	1.92192	298.92192	150.42192	15042.19200	2020-01-01	2020-01-02	2020-01-01 00:10:40	2020-01-02 03:39:01	2020-01-01 00:10:40.000	2020-01-02 03:39:01.000	640	99541	50090.5	5009050	640	99541	50090.5	5009050	-32530	32608	4870.66	487066	-128	127	1.54	154
-641	100	10631	99542	1.92492	298.92492	150.42492	15042.49249	1.92492	298.92493	150.42492	15042.49265	1.92492	298.92492	150.42492000000001	15042.49200	2020-01-01	2020-01-02	2020-01-01 00:10:41	2020-01-02 03:39:02	2020-01-01 00:10:41.000	2020-01-02 03:39:02.000	641	99542	50091.5	5009150	641	99542	50091.5	5009150	-32529	32609	4871.66	487166	-128	127	-0.02	-2
-642	100	10632	99543	1.92792	298.92792	150.42792	15042.79279	1.92792	298.92792	150.42792	15042.79278	1.92792	298.92792	150.42792	15042.79200	2020-01-01	2020-01-02	2020-01-01 00:10:42	2020-01-02 03:39:03	2020-01-01 00:10:42.000	2020-01-02 03:39:03.000	642	99543	50092.5	5009250	642	99543	50092.5	5009250	-32528	32610	4872.66	487266	-128	123	-1.58	-158
-643	100	10633	99544	1.93093	298.93093	150.43093	15043.09309	1.93093	298.93094	150.43092	15043.0929	1.93093	298.93093	150.43093000000002	15043.09300	2020-01-01	2020-01-02	2020-01-01 00:10:43	2020-01-02 03:39:04	2020-01-01 00:10:43.000	2020-01-02 03:39:04.000	643	99544	50093.5	5009350	643	99544	50093.5	5009350	-32527	32611	4873.66	487366	-127	124	-0.58	-58
-644	100	10634	99545	1.93393	298.93393	150.43393	15043.39339	1.93393	298.93393	150.43393	15043.39319	1.93393	298.93393	150.43393	15043.39300	2020-01-01	2020-01-02	2020-01-01 00:10:44	2020-01-02 03:39:05	2020-01-01 00:10:44.000	2020-01-02 03:39:05.000	644	99545	50094.5	5009450	644	99545	50094.5	5009450	-32526	32612	4874.66	487466	-126	125	0.42	42
-645	100	10635	99546	1.93693	298.93693	150.43693	15043.69369	1.93693	298.93695	150.43693	15043.69379	1.93693	298.93693	150.43693	15043.69300	2020-01-01	2020-01-02	2020-01-01 00:10:45	2020-01-02 03:39:06	2020-01-01 00:10:45.000	2020-01-02 03:39:06.000	645	99546	50095.5	5009550	645	99546	50095.5	5009550	-32525	32613	4875.66	487566	-125	126	1.42	142
-646	100	10636	99547	1.93993	298.93993	150.43993	15043.99399	1.93994	298.93994	150.43994	15043.99412	1.93993	298.93993	150.43993	15043.99300	2020-01-01	2020-01-02	2020-01-01 00:10:46	2020-01-02 03:39:07	2020-01-01 00:10:46.000	2020-01-02 03:39:07.000	646	99547	50096.5	5009650	646	99547	50096.5	5009650	-32524	32614	4876.66	487666	-124	127	2.42	242
-647	100	10637	99548	1.94294	298.94294	150.44294	15044.29429	1.94294	298.94293	150.44294	15044.29425	1.94294	298.94294	150.44294	15044.29400	2020-01-01	2020-01-02	2020-01-01 00:10:47	2020-01-02 03:39:08	2020-01-01 00:10:47.000	2020-01-02 03:39:08.000	647	99548	50097.5	5009750	647	99548	50097.5	5009750	-32523	32615	4877.66	487766	-128	127	0.86	86
-648	100	10638	99549	1.94594	298.94594	150.44594	15044.59459	1.94594	298.94595	150.44595	15044.595	1.94594	298.94594	150.44593999999998	15044.59400	2020-01-01	2020-01-02	2020-01-01 00:10:48	2020-01-02 03:39:09	2020-01-01 00:10:48.000	2020-01-02 03:39:09.000	648	99549	50098.5	5009850	648	99549	50098.5	5009850	-32522	32616	4878.66	487866	-128	123	-0.7	-70
-649	100	10639	99550	1.94894	298.94894	150.44894	15044.89489	1.94894	298.94894	150.44894	15044.89467	1.94894	298.94894	150.44894	15044.89400	2020-01-01	2020-01-02	2020-01-01 00:10:49	2020-01-02 03:39:10	2020-01-01 00:10:49.000	2020-01-02 03:39:10.000	649	99550	50099.5	5009950	649	99550	50099.5	5009950	-32521	32617	4879.66	487966	-127	124	0.3	30
+640	100	10630	99541	1.92192	298.92192	150.42192	15042.19219	1.92192	298.92194	150.42192	15042.19232	1.92192	298.92192	150.42192	15042.192	2020-01-01	2020-01-02	2020-01-01 00:10:40	2020-01-02 03:39:01	2020-01-01 00:10:40.000	2020-01-02 03:39:01.000	640	99541	50090.5	5009050	640	99541	50090.5	5009050	-32530	32608	4870.66	487066	-128	127	1.54	154
+641	100	10631	99542	1.92492	298.92492	150.42492	15042.49249	1.92492	298.92493	150.42492	15042.49265	1.92492	298.92492	150.42492000000001	15042.492	2020-01-01	2020-01-02	2020-01-01 00:10:41	2020-01-02 03:39:02	2020-01-01 00:10:41.000	2020-01-02 03:39:02.000	641	99542	50091.5	5009150	641	99542	50091.5	5009150	-32529	32609	4871.66	487166	-128	127	-0.02	-2
+642	100	10632	99543	1.92792	298.92792	150.42792	15042.79279	1.92792	298.92792	150.42792	15042.79278	1.92792	298.92792	150.42792	15042.792	2020-01-01	2020-01-02	2020-01-01 00:10:42	2020-01-02 03:39:03	2020-01-01 00:10:42.000	2020-01-02 03:39:03.000	642	99543	50092.5	5009250	642	99543	50092.5	5009250	-32528	32610	4872.66	487266	-128	123	-1.58	-158
+643	100	10633	99544	1.93093	298.93093	150.43093	15043.09309	1.93093	298.93094	150.43092	15043.0929	1.93093	298.93093	150.43093000000002	15043.093	2020-01-01	2020-01-02	2020-01-01 00:10:43	2020-01-02 03:39:04	2020-01-01 00:10:43.000	2020-01-02 03:39:04.000	643	99544	50093.5	5009350	643	99544	50093.5	5009350	-32527	32611	4873.66	487366	-127	124	-0.58	-58
+644	100	10634	99545	1.93393	298.93393	150.43393	15043.39339	1.93393	298.93393	150.43393	15043.39319	1.93393	298.93393	150.43393	15043.393	2020-01-01	2020-01-02	2020-01-01 00:10:44	2020-01-02 03:39:05	2020-01-01 00:10:44.000	2020-01-02 03:39:05.000	644	99545	50094.5	5009450	644	99545	50094.5	5009450	-32526	32612	4874.66	487466	-126	125	0.42	42
+645	100	10635	99546	1.93693	298.93693	150.43693	15043.69369	1.93693	298.93695	150.43693	15043.69379	1.93693	298.93693	150.43693	15043.693	2020-01-01	2020-01-02	2020-01-01 00:10:45	2020-01-02 03:39:06	2020-01-01 00:10:45.000	2020-01-02 03:39:06.000	645	99546	50095.5	5009550	645	99546	50095.5	5009550	-32525	32613	4875.66	487566	-125	126	1.42	142
+646	100	10636	99547	1.93993	298.93993	150.43993	15043.99399	1.93994	298.93994	150.43994	15043.99412	1.93993	298.93993	150.43993	15043.993	2020-01-01	2020-01-02	2020-01-01 00:10:46	2020-01-02 03:39:07	2020-01-01 00:10:46.000	2020-01-02 03:39:07.000	646	99547	50096.5	5009650	646	99547	50096.5	5009650	-32524	32614	4876.66	487666	-124	127	2.42	242
+647	100	10637	99548	1.94294	298.94294	150.44294	15044.29429	1.94294	298.94293	150.44294	15044.29425	1.94294	298.94294	150.44294	15044.294	2020-01-01	2020-01-02	2020-01-01 00:10:47	2020-01-02 03:39:08	2020-01-01 00:10:47.000	2020-01-02 03:39:08.000	647	99548	50097.5	5009750	647	99548	50097.5	5009750	-32523	32615	4877.66	487766	-128	127	0.86	86
+648	100	10638	99549	1.94594	298.94594	150.44594	15044.59459	1.94594	298.94595	150.44595	15044.595	1.94594	298.94594	150.44593999999998	15044.594	2020-01-01	2020-01-02	2020-01-01 00:10:48	2020-01-02 03:39:09	2020-01-01 00:10:48.000	2020-01-02 03:39:09.000	648	99549	50098.5	5009850	648	99549	50098.5	5009850	-32522	32616	4878.66	487866	-128	123	-0.7	-70
+649	100	10639	99550	1.94894	298.94894	150.44894	15044.89489	1.94894	298.94894	150.44894	15044.89467	1.94894	298.94894	150.44894	15044.894	2020-01-01	2020-01-02	2020-01-01 00:10:49	2020-01-02 03:39:10	2020-01-01 00:10:49.000	2020-01-02 03:39:10.000	649	99550	50099.5	5009950	649	99550	50099.5	5009950	-32521	32617	4879.66	487966	-127	124	0.3	30
 65	102	10055	99965	0.19519	300.19519	150.19519	15169.71471	0.19519	300.1952	150.19519	15169.71448	0.19519	300.19519	150.19519	15169.71419	2020-01-01	2020-01-02	2020-01-01 00:01:05	2020-01-02 03:46:05	2020-01-01 00:01:05.000	2020-01-02 03:46:05.000	65	99965	50015	5051515	65	99965	50015	5051515	-32504	32431	4594.009900990099	463995	-124	127	1.2178217821782178	123
-650	100	10640	99551	1.95195	298.95195	150.45195	15045.19519	1.95195	298.95197	150.45195	15045.19525	1.95195	298.95195	150.45195	15045.19500	2020-01-01	2020-01-02	2020-01-01 00:10:50	2020-01-02 03:39:11	2020-01-01 00:10:50.000	2020-01-02 03:39:11.000	650	99551	50100.5	5010050	650	99551	50100.5	5010050	-32520	32618	4880.66	488066	-126	125	1.3	130
-651	100	10641	99552	1.95495	298.95495	150.45495	15045.49549	1.95495	298.95496	150.45495	15045.49558	1.95495	298.95495	150.45495	15045.49500	2020-01-01	2020-01-02	2020-01-01 00:10:51	2020-01-02 03:39:12	2020-01-01 00:10:51.000	2020-01-02 03:39:12.000	651	99552	50101.5	5010150	651	99552	50101.5	5010150	-32519	32619	4881.66	488166	-125	126	2.3	230
-652	100	10642	99553	1.95795	298.95795	150.45795	15045.79579	1.95795	298.95795	150.45795	15045.79572	1.95795	298.95795	150.45795	15045.79500	2020-01-01	2020-01-02	2020-01-01 00:10:52	2020-01-02 03:39:13	2020-01-01 00:10:52.000	2020-01-02 03:39:13.000	652	99553	50102.5	5010250	652	99553	50102.5	5010250	-32518	32620	4882.66	488266	-124	127	3.3	330
-653	100	10643	99554	1.96096	298.96096	150.46096	15046.09609	1.96096	298.96097	150.46096	15046.09647	1.96096	298.96096	150.46096	15046.09600	2020-01-01	2020-01-02	2020-01-01 00:10:53	2020-01-02 03:39:14	2020-01-01 00:10:53.000	2020-01-02 03:39:14.000	653	99554	50103.5	5010350	653	99554	50103.5	5010350	-32517	32621	4883.66	488366	-128	127	1.74	174
-654	100	10644	99555	1.96396	298.96396	150.46396	15046.39639	1.96396	298.96396	150.46396	15046.39613	1.96396	298.96396	150.46396000000001	15046.39600	2020-01-01	2020-01-02	2020-01-01 00:10:54	2020-01-02 03:39:15	2020-01-01 00:10:54.000	2020-01-02 03:39:15.000	654	99555	50104.5	5010450	654	99555	50104.5	5010450	-32516	32622	4884.66	488466	-128	123	0.18	18
-655	100	10645	99556	1.96696	298.96696	150.46696	15046.69669	1.96696	298.96698	150.46696	15046.69676	1.96696	298.96696	150.46696	15046.69600	2020-01-01	2020-01-02	2020-01-01 00:10:55	2020-01-02 03:39:16	2020-01-01 00:10:55.000	2020-01-02 03:39:16.000	655	99556	50105.5	5010550	655	99556	50105.5	5010550	-32515	32623	4885.66	488566	-127	124	1.18	118
-656	100	10646	99557	1.96996	298.96996	150.46996	15046.99699	1.96997	298.96997	150.46997	15046.99706	1.96996	298.96996	150.46996	15046.99600	2020-01-01	2020-01-02	2020-01-01 00:10:56	2020-01-02 03:39:17	2020-01-01 00:10:56.000	2020-01-02 03:39:17.000	656	99557	50106.5	5010650	656	99557	50106.5	5010650	-32514	32624	4886.66	488666	-126	125	2.18	218
-657	100	10647	99558	1.97297	298.97297	150.47297	15047.29729	1.97297	298.97296	150.47297	15047.29735	1.97297	298.97297	150.47297	15047.29700	2020-01-01	2020-01-02	2020-01-01 00:10:57	2020-01-02 03:39:18	2020-01-01 00:10:57.000	2020-01-02 03:39:18.000	657	99558	50107.5	5010750	657	99558	50107.5	5010750	-32513	32625	4887.66	488766	-125	126	3.18	318
-658	100	10648	99559	1.97597	298.97597	150.47597	15047.59759	1.97597	298.97598	150.47597	15047.59794	1.97597	298.97597	150.47597	15047.59700	2020-01-01	2020-01-02	2020-01-01 00:10:58	2020-01-02 03:39:19	2020-01-01 00:10:58.000	2020-01-02 03:39:19.000	658	99559	50108.5	5010850	658	99559	50108.5	5010850	-32512	32626	4888.66	488866	-124	127	4.18	418
-659	100	10649	99560	1.97897	298.97897	150.47897	15047.89789	1.97897	298.97897	150.47897	15047.8976	1.97897	298.97897	150.47897	15047.89700	2020-01-01	2020-01-02	2020-01-01 00:10:59	2020-01-02 03:39:20	2020-01-01 00:10:59.000	2020-01-02 03:39:20.000	659	99560	50109.5	5010950	659	99560	50109.5	5010950	-32511	32627	4889.66	488966	-128	127	2.62	262
+650	100	10640	99551	1.95195	298.95195	150.45195	15045.19519	1.95195	298.95197	150.45195	15045.19525	1.95195	298.95195	150.45195	15045.195	2020-01-01	2020-01-02	2020-01-01 00:10:50	2020-01-02 03:39:11	2020-01-01 00:10:50.000	2020-01-02 03:39:11.000	650	99551	50100.5	5010050	650	99551	50100.5	5010050	-32520	32618	4880.66	488066	-126	125	1.3	130
+651	100	10641	99552	1.95495	298.95495	150.45495	15045.49549	1.95495	298.95496	150.45495	15045.49558	1.95495	298.95495	150.45495	15045.495	2020-01-01	2020-01-02	2020-01-01 00:10:51	2020-01-02 03:39:12	2020-01-01 00:10:51.000	2020-01-02 03:39:12.000	651	99552	50101.5	5010150	651	99552	50101.5	5010150	-32519	32619	4881.66	488166	-125	126	2.3	230
+652	100	10642	99553	1.95795	298.95795	150.45795	15045.79579	1.95795	298.95795	150.45795	15045.79572	1.95795	298.95795	150.45795	15045.795	2020-01-01	2020-01-02	2020-01-01 00:10:52	2020-01-02 03:39:13	2020-01-01 00:10:52.000	2020-01-02 03:39:13.000	652	99553	50102.5	5010250	652	99553	50102.5	5010250	-32518	32620	4882.66	488266	-124	127	3.3	330
+653	100	10643	99554	1.96096	298.96096	150.46096	15046.09609	1.96096	298.96097	150.46096	15046.09647	1.96096	298.96096	150.46096	15046.096	2020-01-01	2020-01-02	2020-01-01 00:10:53	2020-01-02 03:39:14	2020-01-01 00:10:53.000	2020-01-02 03:39:14.000	653	99554	50103.5	5010350	653	99554	50103.5	5010350	-32517	32621	4883.66	488366	-128	127	1.74	174
+654	100	10644	99555	1.96396	298.96396	150.46396	15046.39639	1.96396	298.96396	150.46396	15046.39613	1.96396	298.96396	150.46396000000001	15046.396	2020-01-01	2020-01-02	2020-01-01 00:10:54	2020-01-02 03:39:15	2020-01-01 00:10:54.000	2020-01-02 03:39:15.000	654	99555	50104.5	5010450	654	99555	50104.5	5010450	-32516	32622	4884.66	488466	-128	123	0.18	18
+655	100	10645	99556	1.96696	298.96696	150.46696	15046.69669	1.96696	298.96698	150.46696	15046.69676	1.96696	298.96696	150.46696	15046.696	2020-01-01	2020-01-02	2020-01-01 00:10:55	2020-01-02 03:39:16	2020-01-01 00:10:55.000	2020-01-02 03:39:16.000	655	99556	50105.5	5010550	655	99556	50105.5	5010550	-32515	32623	4885.66	488566	-127	124	1.18	118
+656	100	10646	99557	1.96996	298.96996	150.46996	15046.99699	1.96997	298.96997	150.46997	15046.99706	1.96996	298.96996	150.46996	15046.996	2020-01-01	2020-01-02	2020-01-01 00:10:56	2020-01-02 03:39:17	2020-01-01 00:10:56.000	2020-01-02 03:39:17.000	656	99557	50106.5	5010650	656	99557	50106.5	5010650	-32514	32624	4886.66	488666	-126	125	2.18	218
+657	100	10647	99558	1.97297	298.97297	150.47297	15047.29729	1.97297	298.97296	150.47297	15047.29735	1.97297	298.97297	150.47297	15047.297	2020-01-01	2020-01-02	2020-01-01 00:10:57	2020-01-02 03:39:18	2020-01-01 00:10:57.000	2020-01-02 03:39:18.000	657	99558	50107.5	5010750	657	99558	50107.5	5010750	-32513	32625	4887.66	488766	-125	126	3.18	318
+658	100	10648	99559	1.97597	298.97597	150.47597	15047.59759	1.97597	298.97598	150.47597	15047.59794	1.97597	298.97597	150.47597	15047.597	2020-01-01	2020-01-02	2020-01-01 00:10:58	2020-01-02 03:39:19	2020-01-01 00:10:58.000	2020-01-02 03:39:19.000	658	99559	50108.5	5010850	658	99559	50108.5	5010850	-32512	32626	4888.66	488866	-124	127	4.18	418
+659	100	10649	99560	1.97897	298.97897	150.47897	15047.89789	1.97897	298.97897	150.47897	15047.8976	1.97897	298.97897	150.47897	15047.897	2020-01-01	2020-01-02	2020-01-01 00:10:59	2020-01-02 03:39:20	2020-01-01 00:10:59.000	2020-01-02 03:39:20.000	659	99560	50109.5	5010950	659	99560	50109.5	5010950	-32511	32627	4889.66	488966	-128	127	2.62	262
 66	102	10056	99966	0.19819	300.19819	150.19819	15170.01801	0.19819	300.1982	150.19819	15170.01808	0.19819	300.19819	150.19819	15170.01719	2020-01-01	2020-01-02	2020-01-01 00:01:06	2020-01-02 03:46:06	2020-01-01 00:01:06.000	2020-01-02 03:46:06.000	66	99966	50016	5051616	66	99966	50016	5051616	-32503	32432	4595.009900990099	464096	-128	127	-0.31683168316831684	-32
-660	100	10650	99561	1.98198	298.98198	150.48198	15048.19819	1.98198	298.982	150.48198	15048.19822	1.98198	298.98198	150.48198	15048.19800	2020-01-01	2020-01-02	2020-01-01 00:11:00	2020-01-02 03:39:21	2020-01-01 00:11:00.000	2020-01-02 03:39:21.000	660	99561	50110.5	5011050	660	99561	50110.5	5011050	-32510	32628	4890.66	489066	-128	127	1.06	106
-661	100	10651	99562	1.98498	298.98498	150.48498	15048.49849	1.98498	298.985	150.48498	15048.49853	1.98498	298.98498	150.48498	15048.49800	2020-01-01	2020-01-02	2020-01-01 00:11:01	2020-01-02 03:39:22	2020-01-01 00:11:01.000	2020-01-02 03:39:22.000	661	99562	50111.5	5011150	661	99562	50111.5	5011150	-32509	32629	4891.66	489166	-128	124	-0.5	-50
-662	100	10652	99563	1.98798	298.98798	150.48798	15048.79879	1.98798	298.98798	150.48798	15048.79882	1.98798	298.98798	150.48798	15048.79800	2020-01-01	2020-01-02	2020-01-01 00:11:02	2020-01-02 03:39:23	2020-01-01 00:11:02.000	2020-01-02 03:39:23.000	662	99563	50112.5	5011250	662	99563	50112.5	5011250	-32508	32630	4892.66	489266	-127	125	0.5	50
-663	100	10653	99564	1.99099	298.99099	150.49099	15049.09909	1.99099	298.991	150.49099	15049.09942	1.99099	298.99099	150.49099	15049.09900	2020-01-01	2020-01-02	2020-01-01 00:11:03	2020-01-02 03:39:24	2020-01-01 00:11:03.000	2020-01-02 03:39:24.000	663	99564	50113.5	5011350	663	99564	50113.5	5011350	-32507	32631	4893.66	489366	-126	126	1.5	150
-664	100	10654	99565	1.99399	298.99399	150.49399	15049.39939	1.99399	298.994	150.49399	15049.39911	1.99399	298.99399	150.49399	15049.39900	2020-01-01	2020-01-02	2020-01-01 00:11:04	2020-01-02 03:39:25	2020-01-01 00:11:04.000	2020-01-02 03:39:25.000	664	99565	50114.5	5011450	664	99565	50114.5	5011450	-32506	32632	4894.66	489466	-125	127	2.5	250
-665	100	10655	99566	1.99699	298.99699	150.49699	15049.69969	1.99699	298.997	150.49699	15049.6997	1.99699	298.99699	150.49699	15049.69900	2020-01-01	2020-01-02	2020-01-01 00:11:05	2020-01-02 03:39:26	2020-01-01 00:11:05.000	2020-01-02 03:39:26.000	665	99566	50115.5	5011550	665	99566	50115.5	5011550	-32505	32633	4895.66	489566	-128	127	0.94	94
-666	100	10656	99567	2	299	150.5	15050	2	299	150.5	15050	2.00000	299.00000	150.5	15050.00000	2020-01-01	2020-01-02	2020-01-01 00:11:06	2020-01-02 03:39:27	2020-01-01 00:11:06.000	2020-01-02 03:39:27.000	666	99567	50116.5	5011650	666	99567	50116.5	5011650	-32504	32634	4896.66	489666	-128	127	-0.62	-62
-667	100	10657	99568	2.003	299.003	150.503	15050.3003	2.003	299.003	150.503	15050.30029	2.00300	299.00300	150.503	15050.30000	2020-01-01	2020-01-02	2020-01-01 00:11:07	2020-01-02 03:39:28	2020-01-01 00:11:07.000	2020-01-02 03:39:28.000	667	99568	50117.5	5011750	667	99568	50117.5	5011750	-32503	32635	4897.66	489766	-128	123	-2.18	-218
-668	100	10658	99569	2.006	299.006	150.506	15050.6006	2.006	299.006	150.506	15050.60089	2.00600	299.00600	150.506	15050.60000	2020-01-01	2020-01-02	2020-01-01 00:11:08	2020-01-02 03:39:29	2020-01-01 00:11:08.000	2020-01-02 03:39:29.000	668	99569	50118.5	5011850	668	99569	50118.5	5011850	-32502	32636	4898.66	489866	-127	124	-1.18	-118
-669	100	10659	99570	2.009	299.009	150.509	15050.9009	2.009	299.009	150.509	15050.90057	2.00900	299.00900	150.509	15050.90000	2020-01-01	2020-01-02	2020-01-01 00:11:09	2020-01-02 03:39:30	2020-01-01 00:11:09.000	2020-01-02 03:39:30.000	669	99570	50119.5	5011950	669	99570	50119.5	5011950	-32501	32637	4899.66	489966	-126	125	-0.18	-18
-67	102	10057	99967	0.2012	300.2012	150.2012	15170.32132	0.2012	300.2012	150.2012	15170.32142	0.20120	300.20120	150.2012	15170.32120	2020-01-01	2020-01-02	2020-01-01 00:01:07	2020-01-02 03:46:07	2020-01-01 00:01:07.000	2020-01-02 03:46:07.000	67	99967	50017	5051717	67	99967	50017	5051717	-32502	32433	4596.009900990099	464197	-128	127	-1.8514851485148516	-187
-670	100	10660	99571	2.01201	299.01201	150.51201	15051.2012	2.01201	299.01202	150.51201	15051.20117	2.01201	299.01201	150.51201	15051.20100	2020-01-01	2020-01-02	2020-01-01 00:11:10	2020-01-02 03:39:31	2020-01-01 00:11:10.000	2020-01-02 03:39:31.000	670	99571	50120.5	5012050	670	99571	50120.5	5012050	-32500	32638	4900.66	490066	-125	126	0.82	82
-671	100	10661	99572	2.01501	299.01501	150.51501	15051.5015	2.01501	299.015	150.51501	15051.50146	2.01501	299.01501	150.51501	15051.50100	2020-01-01	2020-01-02	2020-01-01 00:11:11	2020-01-02 03:39:32	2020-01-01 00:11:11.000	2020-01-02 03:39:32.000	671	99572	50121.5	5012150	671	99572	50121.5	5012150	-32499	32639	4901.66	490166	-124	127	1.82	182
-672	100	10662	99573	2.01801	299.01801	150.51801	15051.8018	2.01801	299.018	150.51801	15051.80176	2.01801	299.01801	150.51801	15051.80100	2020-01-01	2020-01-02	2020-01-01 00:11:12	2020-01-02 03:39:33	2020-01-01 00:11:12.000	2020-01-02 03:39:33.000	672	99573	50122.5	5012250	672	99573	50122.5	5012250	-32498	32640	4902.66	490266	-128	127	0.26	26
-673	100	10663	99574	2.02102	299.02102	150.52102	15052.1021	2.02102	299.02103	150.52102	15052.1024	2.02102	299.02102	150.52102000000002	15052.10200	2020-01-01	2020-01-02	2020-01-01 00:11:13	2020-01-02 03:39:34	2020-01-01 00:11:13.000	2020-01-02 03:39:34.000	673	99574	50123.5	5012350	673	99574	50123.5	5012350	-32497	32641	4903.66	490366	-128	123	-1.3	-130
-674	100	10664	99575	2.02402	299.02402	150.52402	15052.4024	2.02402	299.02402	150.52402	15052.40204	2.02402	299.02402	150.52402	15052.40200	2020-01-01	2020-01-02	2020-01-01 00:11:14	2020-01-02 03:39:35	2020-01-01 00:11:14.000	2020-01-02 03:39:35.000	674	99575	50124.5	5012450	674	99575	50124.5	5012450	-32496	32642	4904.66	490466	-127	124	-0.3	-30
-675	100	10665	99576	2.02702	299.02702	150.52702	15052.7027	2.02702	299.02704	150.52702	15052.70264	2.02702	299.02702	150.52702	15052.70200	2020-01-01	2020-01-02	2020-01-01 00:11:15	2020-01-02 03:39:36	2020-01-01 00:11:15.000	2020-01-02 03:39:36.000	675	99576	50125.5	5012550	675	99576	50125.5	5012550	-32495	32643	4905.66	490566	-126	125	0.7	70
-676	100	10666	99577	2.03003	299.03003	150.53003	15053.003	2.03003	299.03003	150.53002	15053.00293	2.03003	299.03003	150.53003	15053.00300	2020-01-01	2020-01-02	2020-01-01 00:11:16	2020-01-02 03:39:37	2020-01-01 00:11:16.000	2020-01-02 03:39:37.000	676	99577	50126.5	5012650	676	99577	50126.5	5012650	-32494	32644	4906.66	490666	-125	126	1.7	170
-677	100	10667	99578	2.03303	299.03303	150.53303	15053.3033	2.03303	299.03302	150.53303	15053.30323	2.03303	299.03303	150.53303	15053.30300	2020-01-01	2020-01-02	2020-01-01 00:11:17	2020-01-02 03:39:38	2020-01-01 00:11:17.000	2020-01-02 03:39:38.000	677	99578	50127.5	5012750	677	99578	50127.5	5012750	-32493	32645	4907.66	490766	-124	127	2.7	270
-678	100	10668	99579	2.03603	299.03603	150.53603	15053.6036	2.03603	299.03604	150.53603	15053.60387	2.03603	299.03603	150.53602999999998	15053.60300	2020-01-01	2020-01-02	2020-01-01 00:11:18	2020-01-02 03:39:39	2020-01-01 00:11:18.000	2020-01-02 03:39:39.000	678	99579	50128.5	5012850	678	99579	50128.5	5012850	-32492	32646	4908.66	490866	-128	127	1.14	114
-679	100	10669	99580	2.03903	299.03903	150.53903	15053.9039	2.03903	299.03903	150.53903	15053.90351	2.03903	299.03903	150.53903	15053.90300	2020-01-01	2020-01-02	2020-01-01 00:11:19	2020-01-02 03:39:40	2020-01-01 00:11:19.000	2020-01-02 03:39:40.000	679	99580	50129.5	5012950	679	99580	50129.5	5012950	-32491	32647	4909.66	490966	-128	123	-0.42	-42
-68	102	10058	99968	0.2042	300.2042	150.2042	15170.62462	0.2042	300.2042	150.2042	15170.62457	0.20420	300.20420	150.20420000000001	15170.62420	2020-01-01	2020-01-02	2020-01-01 00:01:08	2020-01-02 03:46:08	2020-01-01 00:01:08.000	2020-01-02 03:46:08.000	68	99968	50018	5051818	68	99968	50018	5051818	-32501	32434	4597.009900990099	464298	-128	124	-3.386138613861386	-342
-680	100	10670	99581	2.04204	299.04204	150.54204	15054.2042	2.04204	299.04205	150.54204	15054.20426	2.04204	299.04204	150.54204	15054.20400	2020-01-01	2020-01-02	2020-01-01 00:11:20	2020-01-02 03:39:41	2020-01-01 00:11:20.000	2020-01-02 03:39:41.000	680	99581	50130.5	5013050	680	99581	50130.5	5013050	-32490	32648	4910.66	491066	-127	124	0.58	58
-681	100	10671	99582	2.04504	299.04504	150.54504	15054.5045	2.04504	299.04504	150.54504	15054.5044	2.04504	299.04504	150.54504	15054.50400	2020-01-01	2020-01-02	2020-01-01 00:11:21	2020-01-02 03:39:42	2020-01-01 00:11:21.000	2020-01-02 03:39:42.000	681	99582	50131.5	5013150	681	99582	50131.5	5013150	-32489	32649	4911.66	491166	-126	125	1.58	158
-682	100	10672	99583	2.04804	299.04804	150.54804	15054.8048	2.04804	299.04803	150.54804	15054.80474	2.04804	299.04804	150.54804000000001	15054.80400	2020-01-01	2020-01-02	2020-01-01 00:11:22	2020-01-02 03:39:43	2020-01-01 00:11:22.000	2020-01-02 03:39:43.000	682	99583	50132.5	5013250	682	99583	50132.5	5013250	-32488	32650	4912.66	491266	-125	126	2.58	258
-683	100	10673	99584	2.05105	299.05105	150.55105	15055.1051	2.05105	299.05106	150.55105	15055.10533	2.05105	299.05105	150.55105	15055.10500	2020-01-01	2020-01-02	2020-01-01 00:11:23	2020-01-02 03:39:44	2020-01-01 00:11:23.000	2020-01-02 03:39:44.000	683	99584	50133.5	5013350	683	99584	50133.5	5013350	-32487	32651	4913.66	491366	-124	127	3.58	358
-684	100	10674	99585	2.05405	299.05405	150.55405	15055.4054	2.05405	299.05405	150.55404	15055.40498	2.05405	299.05405	150.55405000000002	15055.40500	2020-01-01	2020-01-02	2020-01-01 00:11:24	2020-01-02 03:39:45	2020-01-01 00:11:24.000	2020-01-02 03:39:45.000	684	99585	50134.5	5013450	684	99585	50134.5	5013450	-32486	32652	4914.66	491466	-128	127	2.02	202
-685	100	10675	99586	2.05705	299.05705	150.55705	15055.7057	2.05705	299.05707	150.55705	15055.70573	2.05705	299.05705	150.55705	15055.70500	2020-01-01	2020-01-02	2020-01-01 00:11:25	2020-01-02 03:39:46	2020-01-01 00:11:25.000	2020-01-02 03:39:46.000	685	99586	50135.5	5013550	685	99586	50135.5	5013550	-32485	32653	4915.66	491566	-128	127	0.46	46
-686	100	10676	99587	2.06006	299.06006	150.56006	15056.006	2.06006	299.06006	150.56005	15056.00587	2.06006	299.06006	150.56006	15056.00600	2020-01-01	2020-01-02	2020-01-01 00:11:26	2020-01-02 03:39:47	2020-01-01 00:11:26.000	2020-01-02 03:39:47.000	686	99587	50136.5	5013650	686	99587	50136.5	5013650	-32484	32654	4916.66	491666	-128	124	-1.1	-110
-687	100	10677	99588	2.06306	299.06306	150.56306	15056.3063	2.06306	299.06305	150.56306	15056.30621	2.06306	299.06306	150.56306	15056.30600	2020-01-01	2020-01-02	2020-01-01 00:11:27	2020-01-02 03:39:48	2020-01-01 00:11:27.000	2020-01-02 03:39:48.000	687	99588	50137.5	5013750	687	99588	50137.5	5013750	-32483	32655	4917.66	491766	-127	125	-0.1	-10
-688	100	10678	99589	2.06606	299.06606	150.56606	15056.6066	2.06606	299.06607	150.56606	15056.60681	2.06606	299.06606	150.56606	15056.60600	2020-01-01	2020-01-02	2020-01-01 00:11:28	2020-01-02 03:39:49	2020-01-01 00:11:28.000	2020-01-02 03:39:49.000	688	99589	50138.5	5013850	688	99589	50138.5	5013850	-32482	32656	4918.66	491866	-126	126	0.9	90
-689	100	10679	99590	2.06906	299.06906	150.56906	15056.9069	2.06906	299.06906	150.56907	15056.9071	2.06906	299.06906	150.56906	15056.90600	2020-01-01	2020-01-02	2020-01-01 00:11:29	2020-01-02 03:39:50	2020-01-01 00:11:29.000	2020-01-02 03:39:50.000	689	99590	50139.5	5013950	689	99590	50139.5	5013950	-32481	32657	4919.66	491966	-125	127	1.9	190
-69	102	10059	99969	0.2072	300.2072	150.2072	15170.92792	0.2072	300.2072	150.20721	15170.92832	0.20720	300.20720	150.2072	15170.92720	2020-01-01	2020-01-02	2020-01-01 00:01:09	2020-01-02 03:46:09	2020-01-01 00:01:09.000	2020-01-02 03:46:09.000	69	99969	50019	5051919	69	99969	50019	5051919	-32500	32435	4598.009900990099	464399	-127	125	-2.386138613861386	-241
-690	100	10680	99591	2.07207	299.07207	150.57207	15057.2072	2.07207	299.07208	150.57207	15057.2072	2.07207	299.07207	150.57207	15057.20700	2020-01-01	2020-01-02	2020-01-01 00:11:30	2020-01-02 03:39:51	2020-01-01 00:11:30.000	2020-01-02 03:39:51.000	690	99591	50140.5	5014050	690	99591	50140.5	5014050	-32480	32658	4920.66	492066	-128	127	0.34	34
-691	100	10681	99592	2.07507	299.07507	150.57507	15057.5075	2.07507	299.07507	150.57507	15057.50734	2.07507	299.07507	150.57506999999998	15057.50700	2020-01-01	2020-01-02	2020-01-01 00:11:31	2020-01-02 03:39:52	2020-01-01 00:11:31.000	2020-01-02 03:39:52.000	691	99592	50141.5	5014150	691	99592	50141.5	5014150	-32479	32659	4921.66	492166	-128	127	-1.22	-122
-692	100	10682	99593	2.07807	299.07807	150.57807	15057.8078	2.07807	299.07806	150.57807	15057.80767	2.07807	299.07807	150.57807	15057.80700	2020-01-01	2020-01-02	2020-01-01 00:11:32	2020-01-02 03:39:53	2020-01-01 00:11:32.000	2020-01-02 03:39:53.000	692	99593	50142.5	5014250	692	99593	50142.5	5014250	-32478	32660	4922.66	492266	-128	123	-2.78	-278
-693	100	10683	99594	2.08108	299.08108	150.58108	15058.1081	2.08108	299.0811	150.58108	15058.10827	2.08108	299.08108	150.58108000000001	15058.10800	2020-01-01	2020-01-02	2020-01-01 00:11:33	2020-01-02 03:39:54	2020-01-01 00:11:33.000	2020-01-02 03:39:54.000	693	99594	50143.5	5014350	693	99594	50143.5	5014350	-32477	32661	4923.66	492366	-127	124	-1.78	-178
-694	100	10684	99595	2.08408	299.08408	150.58408	15058.4084	2.08408	299.08408	150.58408	15058.40857	2.08408	299.08408	150.58408	15058.40800	2020-01-01	2020-01-02	2020-01-01 00:11:34	2020-01-02 03:39:55	2020-01-01 00:11:34.000	2020-01-02 03:39:55.000	694	99595	50144.5	5014450	694	99595	50144.5	5014450	-32476	32662	4924.66	492466	-126	125	-0.78	-78
-695	100	10685	99596	2.08708	299.08708	150.58708	15058.7087	2.08708	299.0871	150.58708	15058.70867	2.08708	299.08708	150.58708000000001	15058.70800	2020-01-01	2020-01-02	2020-01-01 00:11:35	2020-01-02 03:39:56	2020-01-01 00:11:35.000	2020-01-02 03:39:56.000	695	99596	50145.5	5014550	695	99596	50145.5	5014550	-32475	32663	4925.66	492566	-125	126	0.22	22
-696	100	10686	99597	2.09009	299.09009	150.59009	15059.009	2.09009	299.0901	150.59008	15059.00885	2.09009	299.09009	150.59009	15059.00900	2020-01-01	2020-01-02	2020-01-01 00:11:36	2020-01-02 03:39:57	2020-01-01 00:11:36.000	2020-01-02 03:39:57.000	696	99597	50146.5	5014650	696	99597	50146.5	5014650	-32474	32664	4926.66	492666	-124	127	1.22	122
-697	100	10687	99598	2.09309	299.09309	150.59309	15059.3093	2.09309	299.09308	150.59309	15059.30915	2.09309	299.09309	150.59309	15059.30900	2020-01-01	2020-01-02	2020-01-01 00:11:37	2020-01-02 03:39:58	2020-01-01 00:11:37.000	2020-01-02 03:39:58.000	697	99598	50147.5	5014750	697	99598	50147.5	5014750	-32473	32665	4927.66	492766	-128	127	-0.34	-34
-698	100	10688	99599	2.09609	299.09609	150.59609	15059.6096	2.09609	299.0961	150.59609	15059.6099	2.09609	299.09609	150.59609	15059.60900	2020-01-01	2020-01-02	2020-01-01 00:11:38	2020-01-02 03:39:59	2020-01-01 00:11:38.000	2020-01-02 03:39:59.000	698	99599	50148.5	5014850	698	99599	50148.5	5014850	-32472	32666	4928.66	492866	-128	123	-1.9	-190
-699	100	10689	99600	2.09909	299.09909	150.59909	15059.9099	2.09909	299.0991	150.5991	15059.91003	2.09909	299.09909	150.59909	15059.90900	2020-01-01	2020-01-02	2020-01-01 00:11:39	2020-01-02 03:40:00	2020-01-01 00:11:39.000	2020-01-02 03:40:00.000	699	99600	50149.5	5014950	699	99600	50149.5	5014950	-32471	32667	4929.66	492966	-127	124	-0.9	-90
+660	100	10650	99561	1.98198	298.98198	150.48198	15048.19819	1.98198	298.982	150.48198	15048.19822	1.98198	298.98198	150.48198	15048.198	2020-01-01	2020-01-02	2020-01-01 00:11:00	2020-01-02 03:39:21	2020-01-01 00:11:00.000	2020-01-02 03:39:21.000	660	99561	50110.5	5011050	660	99561	50110.5	5011050	-32510	32628	4890.66	489066	-128	127	1.06	106
+661	100	10651	99562	1.98498	298.98498	150.48498	15048.49849	1.98498	298.985	150.48498	15048.49853	1.98498	298.98498	150.48498	15048.498	2020-01-01	2020-01-02	2020-01-01 00:11:01	2020-01-02 03:39:22	2020-01-01 00:11:01.000	2020-01-02 03:39:22.000	661	99562	50111.5	5011150	661	99562	50111.5	5011150	-32509	32629	4891.66	489166	-128	124	-0.5	-50
+662	100	10652	99563	1.98798	298.98798	150.48798	15048.79879	1.98798	298.98798	150.48798	15048.79882	1.98798	298.98798	150.48798	15048.798	2020-01-01	2020-01-02	2020-01-01 00:11:02	2020-01-02 03:39:23	2020-01-01 00:11:02.000	2020-01-02 03:39:23.000	662	99563	50112.5	5011250	662	99563	50112.5	5011250	-32508	32630	4892.66	489266	-127	125	0.5	50
+663	100	10653	99564	1.99099	298.99099	150.49099	15049.09909	1.99099	298.991	150.49099	15049.09942	1.99099	298.99099	150.49099	15049.099	2020-01-01	2020-01-02	2020-01-01 00:11:03	2020-01-02 03:39:24	2020-01-01 00:11:03.000	2020-01-02 03:39:24.000	663	99564	50113.5	5011350	663	99564	50113.5	5011350	-32507	32631	4893.66	489366	-126	126	1.5	150
+664	100	10654	99565	1.99399	298.99399	150.49399	15049.39939	1.99399	298.994	150.49399	15049.39911	1.99399	298.99399	150.49399	15049.399	2020-01-01	2020-01-02	2020-01-01 00:11:04	2020-01-02 03:39:25	2020-01-01 00:11:04.000	2020-01-02 03:39:25.000	664	99565	50114.5	5011450	664	99565	50114.5	5011450	-32506	32632	4894.66	489466	-125	127	2.5	250
+665	100	10655	99566	1.99699	298.99699	150.49699	15049.69969	1.99699	298.997	150.49699	15049.6997	1.99699	298.99699	150.49699	15049.699	2020-01-01	2020-01-02	2020-01-01 00:11:05	2020-01-02 03:39:26	2020-01-01 00:11:05.000	2020-01-02 03:39:26.000	665	99566	50115.5	5011550	665	99566	50115.5	5011550	-32505	32633	4895.66	489566	-128	127	0.94	94
+666	100	10656	99567	2	299	150.5	15050	2	299	150.5	15050	2	299	150.5	15050	2020-01-01	2020-01-02	2020-01-01 00:11:06	2020-01-02 03:39:27	2020-01-01 00:11:06.000	2020-01-02 03:39:27.000	666	99567	50116.5	5011650	666	99567	50116.5	5011650	-32504	32634	4896.66	489666	-128	127	-0.62	-62
+667	100	10657	99568	2.003	299.003	150.503	15050.3003	2.003	299.003	150.503	15050.30029	2.003	299.003	150.503	15050.3	2020-01-01	2020-01-02	2020-01-01 00:11:07	2020-01-02 03:39:28	2020-01-01 00:11:07.000	2020-01-02 03:39:28.000	667	99568	50117.5	5011750	667	99568	50117.5	5011750	-32503	32635	4897.66	489766	-128	123	-2.18	-218
+668	100	10658	99569	2.006	299.006	150.506	15050.6006	2.006	299.006	150.506	15050.60089	2.006	299.006	150.506	15050.6	2020-01-01	2020-01-02	2020-01-01 00:11:08	2020-01-02 03:39:29	2020-01-01 00:11:08.000	2020-01-02 03:39:29.000	668	99569	50118.5	5011850	668	99569	50118.5	5011850	-32502	32636	4898.66	489866	-127	124	-1.18	-118
+669	100	10659	99570	2.009	299.009	150.509	15050.9009	2.009	299.009	150.509	15050.90057	2.009	299.009	150.509	15050.9	2020-01-01	2020-01-02	2020-01-01 00:11:09	2020-01-02 03:39:30	2020-01-01 00:11:09.000	2020-01-02 03:39:30.000	669	99570	50119.5	5011950	669	99570	50119.5	5011950	-32501	32637	4899.66	489966	-126	125	-0.18	-18
+67	102	10057	99967	0.2012	300.2012	150.2012	15170.32132	0.2012	300.2012	150.2012	15170.32142	0.2012	300.2012	150.2012	15170.3212	2020-01-01	2020-01-02	2020-01-01 00:01:07	2020-01-02 03:46:07	2020-01-01 00:01:07.000	2020-01-02 03:46:07.000	67	99967	50017	5051717	67	99967	50017	5051717	-32502	32433	4596.009900990099	464197	-128	127	-1.8514851485148516	-187
+670	100	10660	99571	2.01201	299.01201	150.51201	15051.2012	2.01201	299.01202	150.51201	15051.20117	2.01201	299.01201	150.51201	15051.201	2020-01-01	2020-01-02	2020-01-01 00:11:10	2020-01-02 03:39:31	2020-01-01 00:11:10.000	2020-01-02 03:39:31.000	670	99571	50120.5	5012050	670	99571	50120.5	5012050	-32500	32638	4900.66	490066	-125	126	0.82	82
+671	100	10661	99572	2.01501	299.01501	150.51501	15051.5015	2.01501	299.015	150.51501	15051.50146	2.01501	299.01501	150.51501	15051.501	2020-01-01	2020-01-02	2020-01-01 00:11:11	2020-01-02 03:39:32	2020-01-01 00:11:11.000	2020-01-02 03:39:32.000	671	99572	50121.5	5012150	671	99572	50121.5	5012150	-32499	32639	4901.66	490166	-124	127	1.82	182
+672	100	10662	99573	2.01801	299.01801	150.51801	15051.8018	2.01801	299.018	150.51801	15051.80176	2.01801	299.01801	150.51801	15051.801	2020-01-01	2020-01-02	2020-01-01 00:11:12	2020-01-02 03:39:33	2020-01-01 00:11:12.000	2020-01-02 03:39:33.000	672	99573	50122.5	5012250	672	99573	50122.5	5012250	-32498	32640	4902.66	490266	-128	127	0.26	26
+673	100	10663	99574	2.02102	299.02102	150.52102	15052.1021	2.02102	299.02103	150.52102	15052.1024	2.02102	299.02102	150.52102000000002	15052.102	2020-01-01	2020-01-02	2020-01-01 00:11:13	2020-01-02 03:39:34	2020-01-01 00:11:13.000	2020-01-02 03:39:34.000	673	99574	50123.5	5012350	673	99574	50123.5	5012350	-32497	32641	4903.66	490366	-128	123	-1.3	-130
+674	100	10664	99575	2.02402	299.02402	150.52402	15052.4024	2.02402	299.02402	150.52402	15052.40204	2.02402	299.02402	150.52402	15052.402	2020-01-01	2020-01-02	2020-01-01 00:11:14	2020-01-02 03:39:35	2020-01-01 00:11:14.000	2020-01-02 03:39:35.000	674	99575	50124.5	5012450	674	99575	50124.5	5012450	-32496	32642	4904.66	490466	-127	124	-0.3	-30
+675	100	10665	99576	2.02702	299.02702	150.52702	15052.7027	2.02702	299.02704	150.52702	15052.70264	2.02702	299.02702	150.52702	15052.702	2020-01-01	2020-01-02	2020-01-01 00:11:15	2020-01-02 03:39:36	2020-01-01 00:11:15.000	2020-01-02 03:39:36.000	675	99576	50125.5	5012550	675	99576	50125.5	5012550	-32495	32643	4905.66	490566	-126	125	0.7	70
+676	100	10666	99577	2.03003	299.03003	150.53003	15053.003	2.03003	299.03003	150.53002	15053.00293	2.03003	299.03003	150.53003	15053.003	2020-01-01	2020-01-02	2020-01-01 00:11:16	2020-01-02 03:39:37	2020-01-01 00:11:16.000	2020-01-02 03:39:37.000	676	99577	50126.5	5012650	676	99577	50126.5	5012650	-32494	32644	4906.66	490666	-125	126	1.7	170
+677	100	10667	99578	2.03303	299.03303	150.53303	15053.3033	2.03303	299.03302	150.53303	15053.30323	2.03303	299.03303	150.53303	15053.303	2020-01-01	2020-01-02	2020-01-01 00:11:17	2020-01-02 03:39:38	2020-01-01 00:11:17.000	2020-01-02 03:39:38.000	677	99578	50127.5	5012750	677	99578	50127.5	5012750	-32493	32645	4907.66	490766	-124	127	2.7	270
+678	100	10668	99579	2.03603	299.03603	150.53603	15053.6036	2.03603	299.03604	150.53603	15053.60387	2.03603	299.03603	150.53602999999998	15053.603	2020-01-01	2020-01-02	2020-01-01 00:11:18	2020-01-02 03:39:39	2020-01-01 00:11:18.000	2020-01-02 03:39:39.000	678	99579	50128.5	5012850	678	99579	50128.5	5012850	-32492	32646	4908.66	490866	-128	127	1.14	114
+679	100	10669	99580	2.03903	299.03903	150.53903	15053.9039	2.03903	299.03903	150.53903	15053.90351	2.03903	299.03903	150.53903	15053.903	2020-01-01	2020-01-02	2020-01-01 00:11:19	2020-01-02 03:39:40	2020-01-01 00:11:19.000	2020-01-02 03:39:40.000	679	99580	50129.5	5012950	679	99580	50129.5	5012950	-32491	32647	4909.66	490966	-128	123	-0.42	-42
+68	102	10058	99968	0.2042	300.2042	150.2042	15170.62462	0.2042	300.2042	150.2042	15170.62457	0.2042	300.2042	150.20420000000001	15170.6242	2020-01-01	2020-01-02	2020-01-01 00:01:08	2020-01-02 03:46:08	2020-01-01 00:01:08.000	2020-01-02 03:46:08.000	68	99968	50018	5051818	68	99968	50018	5051818	-32501	32434	4597.009900990099	464298	-128	124	-3.386138613861386	-342
+680	100	10670	99581	2.04204	299.04204	150.54204	15054.2042	2.04204	299.04205	150.54204	15054.20426	2.04204	299.04204	150.54204	15054.204	2020-01-01	2020-01-02	2020-01-01 00:11:20	2020-01-02 03:39:41	2020-01-01 00:11:20.000	2020-01-02 03:39:41.000	680	99581	50130.5	5013050	680	99581	50130.5	5013050	-32490	32648	4910.66	491066	-127	124	0.58	58
+681	100	10671	99582	2.04504	299.04504	150.54504	15054.5045	2.04504	299.04504	150.54504	15054.5044	2.04504	299.04504	150.54504	15054.504	2020-01-01	2020-01-02	2020-01-01 00:11:21	2020-01-02 03:39:42	2020-01-01 00:11:21.000	2020-01-02 03:39:42.000	681	99582	50131.5	5013150	681	99582	50131.5	5013150	-32489	32649	4911.66	491166	-126	125	1.58	158
+682	100	10672	99583	2.04804	299.04804	150.54804	15054.8048	2.04804	299.04803	150.54804	15054.80474	2.04804	299.04804	150.54804000000001	15054.804	2020-01-01	2020-01-02	2020-01-01 00:11:22	2020-01-02 03:39:43	2020-01-01 00:11:22.000	2020-01-02 03:39:43.000	682	99583	50132.5	5013250	682	99583	50132.5	5013250	-32488	32650	4912.66	491266	-125	126	2.58	258
+683	100	10673	99584	2.05105	299.05105	150.55105	15055.1051	2.05105	299.05106	150.55105	15055.10533	2.05105	299.05105	150.55105	15055.105	2020-01-01	2020-01-02	2020-01-01 00:11:23	2020-01-02 03:39:44	2020-01-01 00:11:23.000	2020-01-02 03:39:44.000	683	99584	50133.5	5013350	683	99584	50133.5	5013350	-32487	32651	4913.66	491366	-124	127	3.58	358
+684	100	10674	99585	2.05405	299.05405	150.55405	15055.4054	2.05405	299.05405	150.55404	15055.40498	2.05405	299.05405	150.55405000000002	15055.405	2020-01-01	2020-01-02	2020-01-01 00:11:24	2020-01-02 03:39:45	2020-01-01 00:11:24.000	2020-01-02 03:39:45.000	684	99585	50134.5	5013450	684	99585	50134.5	5013450	-32486	32652	4914.66	491466	-128	127	2.02	202
+685	100	10675	99586	2.05705	299.05705	150.55705	15055.7057	2.05705	299.05707	150.55705	15055.70573	2.05705	299.05705	150.55705	15055.705	2020-01-01	2020-01-02	2020-01-01 00:11:25	2020-01-02 03:39:46	2020-01-01 00:11:25.000	2020-01-02 03:39:46.000	685	99586	50135.5	5013550	685	99586	50135.5	5013550	-32485	32653	4915.66	491566	-128	127	0.46	46
+686	100	10676	99587	2.06006	299.06006	150.56006	15056.006	2.06006	299.06006	150.56005	15056.00587	2.06006	299.06006	150.56006	15056.006	2020-01-01	2020-01-02	2020-01-01 00:11:26	2020-01-02 03:39:47	2020-01-01 00:11:26.000	2020-01-02 03:39:47.000	686	99587	50136.5	5013650	686	99587	50136.5	5013650	-32484	32654	4916.66	491666	-128	124	-1.1	-110
+687	100	10677	99588	2.06306	299.06306	150.56306	15056.3063	2.06306	299.06305	150.56306	15056.30621	2.06306	299.06306	150.56306	15056.306	2020-01-01	2020-01-02	2020-01-01 00:11:27	2020-01-02 03:39:48	2020-01-01 00:11:27.000	2020-01-02 03:39:48.000	687	99588	50137.5	5013750	687	99588	50137.5	5013750	-32483	32655	4917.66	491766	-127	125	-0.1	-10
+688	100	10678	99589	2.06606	299.06606	150.56606	15056.6066	2.06606	299.06607	150.56606	15056.60681	2.06606	299.06606	150.56606	15056.606	2020-01-01	2020-01-02	2020-01-01 00:11:28	2020-01-02 03:39:49	2020-01-01 00:11:28.000	2020-01-02 03:39:49.000	688	99589	50138.5	5013850	688	99589	50138.5	5013850	-32482	32656	4918.66	491866	-126	126	0.9	90
+689	100	10679	99590	2.06906	299.06906	150.56906	15056.9069	2.06906	299.06906	150.56907	15056.9071	2.06906	299.06906	150.56906	15056.906	2020-01-01	2020-01-02	2020-01-01 00:11:29	2020-01-02 03:39:50	2020-01-01 00:11:29.000	2020-01-02 03:39:50.000	689	99590	50139.5	5013950	689	99590	50139.5	5013950	-32481	32657	4919.66	491966	-125	127	1.9	190
+69	102	10059	99969	0.2072	300.2072	150.2072	15170.92792	0.2072	300.2072	150.20721	15170.92832	0.2072	300.2072	150.2072	15170.9272	2020-01-01	2020-01-02	2020-01-01 00:01:09	2020-01-02 03:46:09	2020-01-01 00:01:09.000	2020-01-02 03:46:09.000	69	99969	50019	5051919	69	99969	50019	5051919	-32500	32435	4598.009900990099	464399	-127	125	-2.386138613861386	-241
+690	100	10680	99591	2.07207	299.07207	150.57207	15057.2072	2.07207	299.07208	150.57207	15057.2072	2.07207	299.07207	150.57207	15057.207	2020-01-01	2020-01-02	2020-01-01 00:11:30	2020-01-02 03:39:51	2020-01-01 00:11:30.000	2020-01-02 03:39:51.000	690	99591	50140.5	5014050	690	99591	50140.5	5014050	-32480	32658	4920.66	492066	-128	127	0.34	34
+691	100	10681	99592	2.07507	299.07507	150.57507	15057.5075	2.07507	299.07507	150.57507	15057.50734	2.07507	299.07507	150.57506999999998	15057.507	2020-01-01	2020-01-02	2020-01-01 00:11:31	2020-01-02 03:39:52	2020-01-01 00:11:31.000	2020-01-02 03:39:52.000	691	99592	50141.5	5014150	691	99592	50141.5	5014150	-32479	32659	4921.66	492166	-128	127	-1.22	-122
+692	100	10682	99593	2.07807	299.07807	150.57807	15057.8078	2.07807	299.07806	150.57807	15057.80767	2.07807	299.07807	150.57807	15057.807	2020-01-01	2020-01-02	2020-01-01 00:11:32	2020-01-02 03:39:53	2020-01-01 00:11:32.000	2020-01-02 03:39:53.000	692	99593	50142.5	5014250	692	99593	50142.5	5014250	-32478	32660	4922.66	492266	-128	123	-2.78	-278
+693	100	10683	99594	2.08108	299.08108	150.58108	15058.1081	2.08108	299.0811	150.58108	15058.10827	2.08108	299.08108	150.58108000000001	15058.108	2020-01-01	2020-01-02	2020-01-01 00:11:33	2020-01-02 03:39:54	2020-01-01 00:11:33.000	2020-01-02 03:39:54.000	693	99594	50143.5	5014350	693	99594	50143.5	5014350	-32477	32661	4923.66	492366	-127	124	-1.78	-178
+694	100	10684	99595	2.08408	299.08408	150.58408	15058.4084	2.08408	299.08408	150.58408	15058.40857	2.08408	299.08408	150.58408	15058.408	2020-01-01	2020-01-02	2020-01-01 00:11:34	2020-01-02 03:39:55	2020-01-01 00:11:34.000	2020-01-02 03:39:55.000	694	99595	50144.5	5014450	694	99595	50144.5	5014450	-32476	32662	4924.66	492466	-126	125	-0.78	-78
+695	100	10685	99596	2.08708	299.08708	150.58708	15058.7087	2.08708	299.0871	150.58708	15058.70867	2.08708	299.08708	150.58708000000001	15058.708	2020-01-01	2020-01-02	2020-01-01 00:11:35	2020-01-02 03:39:56	2020-01-01 00:11:35.000	2020-01-02 03:39:56.000	695	99596	50145.5	5014550	695	99596	50145.5	5014550	-32475	32663	4925.66	492566	-125	126	0.22	22
+696	100	10686	99597	2.09009	299.09009	150.59009	15059.009	2.09009	299.0901	150.59008	15059.00885	2.09009	299.09009	150.59009	15059.009	2020-01-01	2020-01-02	2020-01-01 00:11:36	2020-01-02 03:39:57	2020-01-01 00:11:36.000	2020-01-02 03:39:57.000	696	99597	50146.5	5014650	696	99597	50146.5	5014650	-32474	32664	4926.66	492666	-124	127	1.22	122
+697	100	10687	99598	2.09309	299.09309	150.59309	15059.3093	2.09309	299.09308	150.59309	15059.30915	2.09309	299.09309	150.59309	15059.309	2020-01-01	2020-01-02	2020-01-01 00:11:37	2020-01-02 03:39:58	2020-01-01 00:11:37.000	2020-01-02 03:39:58.000	697	99598	50147.5	5014750	697	99598	50147.5	5014750	-32473	32665	4927.66	492766	-128	127	-0.34	-34
+698	100	10688	99599	2.09609	299.09609	150.59609	15059.6096	2.09609	299.0961	150.59609	15059.6099	2.09609	299.09609	150.59609	15059.609	2020-01-01	2020-01-02	2020-01-01 00:11:38	2020-01-02 03:39:59	2020-01-01 00:11:38.000	2020-01-02 03:39:59.000	698	99599	50148.5	5014850	698	99599	50148.5	5014850	-32472	32666	4928.66	492866	-128	123	-1.9	-190
+699	100	10689	99600	2.09909	299.09909	150.59909	15059.9099	2.09909	299.0991	150.5991	15059.91003	2.09909	299.09909	150.59909	15059.909	2020-01-01	2020-01-02	2020-01-01 00:11:39	2020-01-02 03:40:00	2020-01-01 00:11:39.000	2020-01-02 03:40:00.000	699	99600	50149.5	5014950	699	99600	50149.5	5014950	-32471	32667	4929.66	492966	-127	124	-0.9	-90
 7	102	1006	9997	0.02102	300.02102	150.02102	15152.12312	0.02102	300.02103	150.02102	15152.12342	0.02102	300.02102	150.02102000000002	15152.12302	2020-01-01	2020-01-02	2020-01-01 00:00:07	2020-01-02 03:45:07	2020-01-01 00:00:07.000	2020-01-02 03:45:07.000	7	99907	49957	5045657	7	99907	49957	5045657	-32562	32373	4536.009900990099	458137	-126	125	-1.0198019801980198	-103
 70	102	10060	99970	0.21021	300.21021	150.21021	15171.23123	0.21021	300.2102	150.2102	15171.23097	0.21021	300.21021	150.21021	15171.23121	2020-01-01	2020-01-02	2020-01-01 00:01:10	2020-01-02 03:46:10	2020-01-01 00:01:10.000	2020-01-02 03:46:10.000	70	99970	50020	5052020	70	99970	50020	5052020	-32499	32436	4599.009900990099	464500	-126	126	-1.386138613861386	-140
-700	100	10690	99601	2.1021	299.1021	150.6021	15060.21021	2.1021	299.1021	150.6021	15060.21014	2.10210	299.10210	150.60209999999998	15060.21000	2020-01-01	2020-01-02	2020-01-01 00:11:40	2020-01-02 03:40:01	2020-01-01 00:11:40.000	2020-01-02 03:40:01.000	700	99601	50150.5	5015050	700	99601	50150.5	5015050	-32470	32668	4930.66	493066	-126	125	0.1	10
-701	100	10691	99602	2.1051	299.1051	150.6051	15060.51051	2.1051	299.1051	150.6051	15060.51031	2.10510	299.10510	150.6051	15060.51000	2020-01-01	2020-01-02	2020-01-01 00:11:41	2020-01-02 03:40:02	2020-01-01 00:11:41.000	2020-01-02 03:40:02.000	701	99602	50151.5	5015150	701	99602	50151.5	5015150	-32469	32669	4931.66	493166	-125	126	1.1	110
-702	100	10692	99603	2.1081	299.1081	150.6081	15060.81081	2.1081	299.1081	150.6081	15060.81062	2.10810	299.10810	150.6081	15060.81000	2020-01-01	2020-01-02	2020-01-01 00:11:42	2020-01-02 03:40:03	2020-01-01 00:11:42.000	2020-01-02 03:40:03.000	702	99603	50152.5	5015250	702	99603	50152.5	5015250	-32468	32670	4932.66	493266	-124	127	2.1	210
-703	100	10693	99604	2.11111	299.11111	150.61111	15061.11111	2.11111	299.1111	150.61111	15061.11137	2.11111	299.11111	150.61111	15061.11100	2020-01-01	2020-01-02	2020-01-01 00:11:43	2020-01-02 03:40:04	2020-01-01 00:11:43.000	2020-01-02 03:40:04.000	703	99604	50153.5	5015350	703	99604	50153.5	5015350	-32467	32671	4933.66	493366	-128	127	0.54	54
-704	100	10694	99605	2.11411	299.11411	150.61411	15061.41141	2.11411	299.1141	150.61411	15061.41151	2.11411	299.11411	150.61411	15061.41100	2020-01-01	2020-01-02	2020-01-01 00:11:44	2020-01-02 03:40:05	2020-01-01 00:11:44.000	2020-01-02 03:40:05.000	704	99605	50154.5	5015450	704	99605	50154.5	5015450	-32466	32672	4934.66	493466	-128	123	-1.02	-102
-705	100	10695	99606	2.11711	299.11711	150.61711	15061.71171	2.11711	299.11713	150.61711	15061.71165	2.11711	299.11711	150.61711	15061.71100	2020-01-01	2020-01-02	2020-01-01 00:11:45	2020-01-02 03:40:06	2020-01-01 00:11:45.000	2020-01-02 03:40:06.000	705	99606	50155.5	5015550	705	99606	50155.5	5015550	-32465	32673	4935.66	493566	-127	124	-0.02	-2
-706	100	10696	99607	2.12012	299.12012	150.62012	15062.01201	2.12012	299.12012	150.62011	15062.01179	2.12012	299.12012	150.62012000000001	15062.01200	2020-01-01	2020-01-02	2020-01-01 00:11:46	2020-01-02 03:40:07	2020-01-01 00:11:46.000	2020-01-02 03:40:07.000	706	99607	50156.5	5015650	706	99607	50156.5	5015650	-32464	32674	4936.66	493666	-126	125	0.98	98
-707	100	10697	99608	2.12312	299.12312	150.62312	15062.31231	2.12312	299.1231	150.62312	15062.31208	2.12312	299.12312	150.62312	15062.31200	2020-01-01	2020-01-02	2020-01-01 00:11:47	2020-01-02 03:40:08	2020-01-01 00:11:47.000	2020-01-02 03:40:08.000	707	99608	50157.5	5015750	707	99608	50157.5	5015750	-32463	32675	4937.66	493766	-125	126	1.98	198
-708	100	10698	99609	2.12612	299.12612	150.62612	15062.61261	2.12612	299.12613	150.62612	15062.61283	2.12612	299.12612	150.62612	15062.61200	2020-01-01	2020-01-02	2020-01-01 00:11:48	2020-01-02 03:40:09	2020-01-01 00:11:48.000	2020-01-02 03:40:09.000	708	99609	50158.5	5015850	708	99609	50158.5	5015850	-32462	32676	4938.66	493866	-124	127	2.98	298
-709	100	10699	99610	2.12912	299.12912	150.62912	15062.91291	2.12912	299.12912	150.62912	15062.91298	2.12912	299.12912	150.62912	15062.91200	2020-01-01	2020-01-02	2020-01-01 00:11:49	2020-01-02 03:40:10	2020-01-01 00:11:49.000	2020-01-02 03:40:10.000	709	99610	50159.5	5015950	709	99610	50159.5	5015950	-32461	32677	4939.66	493966	-128	127	1.42	142
+700	100	10690	99601	2.1021	299.1021	150.6021	15060.21021	2.1021	299.1021	150.6021	15060.21014	2.1021	299.1021	150.60209999999998	15060.21	2020-01-01	2020-01-02	2020-01-01 00:11:40	2020-01-02 03:40:01	2020-01-01 00:11:40.000	2020-01-02 03:40:01.000	700	99601	50150.5	5015050	700	99601	50150.5	5015050	-32470	32668	4930.66	493066	-126	125	0.1	10
+701	100	10691	99602	2.1051	299.1051	150.6051	15060.51051	2.1051	299.1051	150.6051	15060.51031	2.1051	299.1051	150.6051	15060.51	2020-01-01	2020-01-02	2020-01-01 00:11:41	2020-01-02 03:40:02	2020-01-01 00:11:41.000	2020-01-02 03:40:02.000	701	99602	50151.5	5015150	701	99602	50151.5	5015150	-32469	32669	4931.66	493166	-125	126	1.1	110
+702	100	10692	99603	2.1081	299.1081	150.6081	15060.81081	2.1081	299.1081	150.6081	15060.81062	2.1081	299.1081	150.6081	15060.81	2020-01-01	2020-01-02	2020-01-01 00:11:42	2020-01-02 03:40:03	2020-01-01 00:11:42.000	2020-01-02 03:40:03.000	702	99603	50152.5	5015250	702	99603	50152.5	5015250	-32468	32670	4932.66	493266	-124	127	2.1	210
+703	100	10693	99604	2.11111	299.11111	150.61111	15061.11111	2.11111	299.1111	150.61111	15061.11137	2.11111	299.11111	150.61111	15061.111	2020-01-01	2020-01-02	2020-01-01 00:11:43	2020-01-02 03:40:04	2020-01-01 00:11:43.000	2020-01-02 03:40:04.000	703	99604	50153.5	5015350	703	99604	50153.5	5015350	-32467	32671	4933.66	493366	-128	127	0.54	54
+704	100	10694	99605	2.11411	299.11411	150.61411	15061.41141	2.11411	299.1141	150.61411	15061.41151	2.11411	299.11411	150.61411	15061.411	2020-01-01	2020-01-02	2020-01-01 00:11:44	2020-01-02 03:40:05	2020-01-01 00:11:44.000	2020-01-02 03:40:05.000	704	99605	50154.5	5015450	704	99605	50154.5	5015450	-32466	32672	4934.66	493466	-128	123	-1.02	-102
+705	100	10695	99606	2.11711	299.11711	150.61711	15061.71171	2.11711	299.11713	150.61711	15061.71165	2.11711	299.11711	150.61711	15061.711	2020-01-01	2020-01-02	2020-01-01 00:11:45	2020-01-02 03:40:06	2020-01-01 00:11:45.000	2020-01-02 03:40:06.000	705	99606	50155.5	5015550	705	99606	50155.5	5015550	-32465	32673	4935.66	493566	-127	124	-0.02	-2
+706	100	10696	99607	2.12012	299.12012	150.62012	15062.01201	2.12012	299.12012	150.62011	15062.01179	2.12012	299.12012	150.62012000000001	15062.012	2020-01-01	2020-01-02	2020-01-01 00:11:46	2020-01-02 03:40:07	2020-01-01 00:11:46.000	2020-01-02 03:40:07.000	706	99607	50156.5	5015650	706	99607	50156.5	5015650	-32464	32674	4936.66	493666	-126	125	0.98	98
+707	100	10697	99608	2.12312	299.12312	150.62312	15062.31231	2.12312	299.1231	150.62312	15062.31208	2.12312	299.12312	150.62312	15062.312	2020-01-01	2020-01-02	2020-01-01 00:11:47	2020-01-02 03:40:08	2020-01-01 00:11:47.000	2020-01-02 03:40:08.000	707	99608	50157.5	5015750	707	99608	50157.5	5015750	-32463	32675	4937.66	493766	-125	126	1.98	198
+708	100	10698	99609	2.12612	299.12612	150.62612	15062.61261	2.12612	299.12613	150.62612	15062.61283	2.12612	299.12612	150.62612	15062.612	2020-01-01	2020-01-02	2020-01-01 00:11:48	2020-01-02 03:40:09	2020-01-01 00:11:48.000	2020-01-02 03:40:09.000	708	99609	50158.5	5015850	708	99609	50158.5	5015850	-32462	32676	4938.66	493866	-124	127	2.98	298
+709	100	10699	99610	2.12912	299.12912	150.62912	15062.91291	2.12912	299.12912	150.62912	15062.91298	2.12912	299.12912	150.62912	15062.912	2020-01-01	2020-01-02	2020-01-01 00:11:49	2020-01-02 03:40:10	2020-01-01 00:11:49.000	2020-01-02 03:40:10.000	709	99610	50159.5	5015950	709	99610	50159.5	5015950	-32461	32677	4939.66	493966	-128	127	1.42	142
 71	102	10061	99971	0.21321	300.21321	150.21321	15171.53453	0.21321	300.21323	150.21321	15171.5346	0.21321	300.21321	150.21321	15171.53421	2020-01-01	2020-01-02	2020-01-01 00:01:11	2020-01-02 03:46:11	2020-01-01 00:01:11.000	2020-01-02 03:46:11.000	71	99971	50021	5052121	71	99971	50021	5052121	-32498	32437	4600.009900990099	464601	-125	127	-0.38613861386138615	-39
-710	100	10700	99611	2.13213	299.13213	150.63213	15063.21321	2.13213	299.13214	150.63213	15063.21311	2.13213	299.13213	150.63213	15063.21300	2020-01-01	2020-01-02	2020-01-01 00:11:50	2020-01-02 03:40:11	2020-01-01 00:11:50.000	2020-01-02 03:40:11.000	710	99611	50160.5	5016050	710	99611	50160.5	5016050	-32460	32678	4940.66	494066	-128	127	-0.14	-14
-711	100	10701	99612	2.13513	299.13513	150.63513	15063.51351	2.13513	299.13513	150.63513	15063.51325	2.13513	299.13513	150.63513	15063.51300	2020-01-01	2020-01-02	2020-01-01 00:11:51	2020-01-02 03:40:12	2020-01-01 00:11:51.000	2020-01-02 03:40:12.000	711	99612	50161.5	5016150	711	99612	50161.5	5016150	-32459	32679	4941.66	494166	-128	124	-1.7	-170
-712	100	10702	99613	2.13813	299.13813	150.63813	15063.81381	2.13813	299.13815	150.63814	15063.81401	2.13813	299.13813	150.63813	15063.81300	2020-01-01	2020-01-02	2020-01-01 00:11:52	2020-01-02 03:40:13	2020-01-01 00:11:52.000	2020-01-02 03:40:13.000	712	99613	50162.5	5016250	712	99613	50162.5	5016250	-32458	32680	4942.66	494266	-127	125	-0.7	-70
-713	100	10703	99614	2.14114	299.14114	150.64114	15064.11411	2.14114	299.14114	150.64114	15064.11431	2.14114	299.14114	150.64114	15064.11400	2020-01-01	2020-01-02	2020-01-01 00:11:53	2020-01-02 03:40:14	2020-01-01 00:11:53.000	2020-01-02 03:40:14.000	713	99614	50163.5	5016350	713	99614	50163.5	5016350	-32457	32681	4943.66	494366	-126	126	0.3	30
-714	100	10704	99615	2.14414	299.14414	150.64414	15064.41441	2.14414	299.14413	150.64414	15064.41448	2.14414	299.14414	150.64414	15064.41400	2020-01-01	2020-01-02	2020-01-01 00:11:54	2020-01-02 03:40:15	2020-01-01 00:11:54.000	2020-01-02 03:40:15.000	714	99615	50164.5	5016450	714	99615	50164.5	5016450	-32456	32682	4944.66	494466	-125	127	1.3	130
-715	100	10705	99616	2.14714	299.14714	150.64714	15064.71471	2.14714	299.14716	150.64714	15064.71458	2.14714	299.14714	150.64714	15064.71400	2020-01-01	2020-01-02	2020-01-01 00:11:55	2020-01-02 03:40:16	2020-01-01 00:11:55.000	2020-01-02 03:40:16.000	715	99616	50165.5	5016550	715	99616	50165.5	5016550	-32455	32683	4945.66	494566	-128	127	-0.26	-26
-716	100	10706	99617	2.15015	299.15015	150.65015	15065.01501	2.15015	299.15015	150.65014	15065.01472	2.15015	299.15015	150.65015	15065.01500	2020-01-01	2020-01-02	2020-01-01 00:11:56	2020-01-02 03:40:17	2020-01-01 00:11:56.000	2020-01-02 03:40:17.000	716	99617	50166.5	5016650	716	99617	50166.5	5016650	-32454	32684	4946.66	494666	-128	127	-1.82	-182
-717	100	10707	99618	2.15315	299.15315	150.65315	15065.31531	2.15315	299.15317	150.65315	15065.31547	2.15315	299.15315	150.65315	15065.31500	2020-01-01	2020-01-02	2020-01-01 00:11:57	2020-01-02 03:40:18	2020-01-01 00:11:57.000	2020-01-02 03:40:18.000	717	99618	50167.5	5016750	717	99618	50167.5	5016750	-32453	32685	4947.66	494766	-128	123	-3.38	-338
-718	100	10708	99619	2.15615	299.15615	150.65615	15065.61561	2.15615	299.15616	150.65615	15065.61578	2.15615	299.15615	150.65615	15065.61500	2020-01-01	2020-01-02	2020-01-01 00:11:58	2020-01-02 03:40:19	2020-01-01 00:11:58.000	2020-01-02 03:40:19.000	718	99619	50168.5	5016850	718	99619	50168.5	5016850	-32452	32686	4948.66	494866	-127	124	-2.38	-238
-719	100	10709	99620	2.15915	299.15915	150.65915	15065.91591	2.15915	299.15915	150.65915	15065.91595	2.15915	299.15915	150.65915	15065.91500	2020-01-01	2020-01-02	2020-01-01 00:11:59	2020-01-02 03:40:20	2020-01-01 00:11:59.000	2020-01-02 03:40:20.000	719	99620	50169.5	5016950	719	99620	50169.5	5016950	-32451	32687	4949.66	494966	-126	125	-1.38	-138
+710	100	10700	99611	2.13213	299.13213	150.63213	15063.21321	2.13213	299.13214	150.63213	15063.21311	2.13213	299.13213	150.63213	15063.213	2020-01-01	2020-01-02	2020-01-01 00:11:50	2020-01-02 03:40:11	2020-01-01 00:11:50.000	2020-01-02 03:40:11.000	710	99611	50160.5	5016050	710	99611	50160.5	5016050	-32460	32678	4940.66	494066	-128	127	-0.14	-14
+711	100	10701	99612	2.13513	299.13513	150.63513	15063.51351	2.13513	299.13513	150.63513	15063.51325	2.13513	299.13513	150.63513	15063.513	2020-01-01	2020-01-02	2020-01-01 00:11:51	2020-01-02 03:40:12	2020-01-01 00:11:51.000	2020-01-02 03:40:12.000	711	99612	50161.5	5016150	711	99612	50161.5	5016150	-32459	32679	4941.66	494166	-128	124	-1.7	-170
+712	100	10702	99613	2.13813	299.13813	150.63813	15063.81381	2.13813	299.13815	150.63814	15063.81401	2.13813	299.13813	150.63813	15063.813	2020-01-01	2020-01-02	2020-01-01 00:11:52	2020-01-02 03:40:13	2020-01-01 00:11:52.000	2020-01-02 03:40:13.000	712	99613	50162.5	5016250	712	99613	50162.5	5016250	-32458	32680	4942.66	494266	-127	125	-0.7	-70
+713	100	10703	99614	2.14114	299.14114	150.64114	15064.11411	2.14114	299.14114	150.64114	15064.11431	2.14114	299.14114	150.64114	15064.114	2020-01-01	2020-01-02	2020-01-01 00:11:53	2020-01-02 03:40:14	2020-01-01 00:11:53.000	2020-01-02 03:40:14.000	713	99614	50163.5	5016350	713	99614	50163.5	5016350	-32457	32681	4943.66	494366	-126	126	0.3	30
+714	100	10704	99615	2.14414	299.14414	150.64414	15064.41441	2.14414	299.14413	150.64414	15064.41448	2.14414	299.14414	150.64414	15064.414	2020-01-01	2020-01-02	2020-01-01 00:11:54	2020-01-02 03:40:15	2020-01-01 00:11:54.000	2020-01-02 03:40:15.000	714	99615	50164.5	5016450	714	99615	50164.5	5016450	-32456	32682	4944.66	494466	-125	127	1.3	130
+715	100	10705	99616	2.14714	299.14714	150.64714	15064.71471	2.14714	299.14716	150.64714	15064.71458	2.14714	299.14714	150.64714	15064.714	2020-01-01	2020-01-02	2020-01-01 00:11:55	2020-01-02 03:40:16	2020-01-01 00:11:55.000	2020-01-02 03:40:16.000	715	99616	50165.5	5016550	715	99616	50165.5	5016550	-32455	32683	4945.66	494566	-128	127	-0.26	-26
+716	100	10706	99617	2.15015	299.15015	150.65015	15065.01501	2.15015	299.15015	150.65014	15065.01472	2.15015	299.15015	150.65015	15065.015	2020-01-01	2020-01-02	2020-01-01 00:11:56	2020-01-02 03:40:17	2020-01-01 00:11:56.000	2020-01-02 03:40:17.000	716	99617	50166.5	5016650	716	99617	50166.5	5016650	-32454	32684	4946.66	494666	-128	127	-1.82	-182
+717	100	10707	99618	2.15315	299.15315	150.65315	15065.31531	2.15315	299.15317	150.65315	15065.31547	2.15315	299.15315	150.65315	15065.315	2020-01-01	2020-01-02	2020-01-01 00:11:57	2020-01-02 03:40:18	2020-01-01 00:11:57.000	2020-01-02 03:40:18.000	717	99618	50167.5	5016750	717	99618	50167.5	5016750	-32453	32685	4947.66	494766	-128	123	-3.38	-338
+718	100	10708	99619	2.15615	299.15615	150.65615	15065.61561	2.15615	299.15616	150.65615	15065.61578	2.15615	299.15615	150.65615	15065.615	2020-01-01	2020-01-02	2020-01-01 00:11:58	2020-01-02 03:40:19	2020-01-01 00:11:58.000	2020-01-02 03:40:19.000	718	99619	50168.5	5016850	718	99619	50168.5	5016850	-32452	32686	4948.66	494866	-127	124	-2.38	-238
+719	100	10709	99620	2.15915	299.15915	150.65915	15065.91591	2.15915	299.15915	150.65915	15065.91595	2.15915	299.15915	150.65915	15065.915	2020-01-01	2020-01-02	2020-01-01 00:11:59	2020-01-02 03:40:20	2020-01-01 00:11:59.000	2020-01-02 03:40:20.000	719	99620	50169.5	5016950	719	99620	50169.5	5016950	-32451	32687	4949.66	494966	-126	125	-1.38	-138
 72	102	10062	99972	0.21621	300.21621	150.21621	15171.83783	0.21621	300.21622	150.21621	15171.83791	0.21621	300.21621	150.21621	15171.83721	2020-01-01	2020-01-02	2020-01-01 00:01:12	2020-01-02 03:46:12	2020-01-01 00:01:12.000	2020-01-02 03:46:12.000	72	99972	50022	5052222	72	99972	50022	5052222	-32497	32438	4601.009900990099	464702	-128	127	-1.9207920792079207	-194
-720	100	10710	99621	2.16216	299.16216	150.66216	15066.21621	2.16216	299.16217	150.66216	15066.21606	2.16216	299.16216	150.66216	15066.21600	2020-01-01	2020-01-02	2020-01-01 00:12:00	2020-01-02 03:40:21	2020-01-01 00:12:00.000	2020-01-02 03:40:21.000	720	99621	50170.5	5017050	720	99621	50170.5	5017050	-32450	32688	4950.66	495066	-125	126	-0.38	-38
-721	100	10711	99622	2.16516	299.16516	150.66516	15066.51651	2.16516	299.16516	150.66516	15066.51635	2.16516	299.16516	150.66516	15066.51600	2020-01-01	2020-01-02	2020-01-01 00:12:01	2020-01-02 03:40:22	2020-01-01 00:12:01.000	2020-01-02 03:40:22.000	721	99622	50171.5	5017150	721	99622	50171.5	5017150	-32449	32689	4951.66	495166	-124	127	0.62	62
-722	100	10712	99623	2.16816	299.16816	150.66816	15066.81681	2.16816	299.16818	150.66816	15066.81695	2.16816	299.16816	150.66816	15066.81600	2020-01-01	2020-01-02	2020-01-01 00:12:02	2020-01-02 03:40:23	2020-01-01 00:12:02.000	2020-01-02 03:40:23.000	722	99623	50172.5	5017250	722	99623	50172.5	5017250	-32448	32690	4952.66	495266	-128	127	-0.94	-94
-723	100	10713	99624	2.17117	299.17117	150.67117	15067.11711	2.17117	299.17117	150.67117	15067.11724	2.17117	299.17117	150.67117	15067.11700	2020-01-01	2020-01-02	2020-01-01 00:12:03	2020-01-02 03:40:24	2020-01-01 00:12:03.000	2020-01-02 03:40:24.000	723	99624	50173.5	5017350	723	99624	50173.5	5017350	-32447	32691	4953.66	495366	-128	123	-2.5	-250
-724	100	10714	99625	2.17417	299.17417	150.67417	15067.41741	2.17417	299.17416	150.67417	15067.41742	2.17417	299.17417	150.67417	15067.41700	2020-01-01	2020-01-02	2020-01-01 00:12:04	2020-01-02 03:40:25	2020-01-01 00:12:04.000	2020-01-02 03:40:25.000	724	99625	50174.5	5017450	724	99625	50174.5	5017450	-32446	32692	4954.66	495466	-127	124	-1.5	-150
-725	100	10715	99626	2.17717	299.17717	150.67717	15067.71771	2.17717	299.1772	150.67717	15067.71752	2.17717	299.17717	150.67717000000002	15067.71700	2020-01-01	2020-01-02	2020-01-01 00:12:05	2020-01-02 03:40:26	2020-01-01 00:12:05.000	2020-01-02 03:40:26.000	725	99626	50175.5	5017550	725	99626	50175.5	5017550	-32445	32693	4955.66	495566	-126	125	-0.5	-50
-726	100	10716	99627	2.18018	299.18018	150.68018	15068.01801	2.18018	299.18018	150.68017	15068.01782	2.18018	299.18018	150.68018	15068.01800	2020-01-01	2020-01-02	2020-01-01 00:12:06	2020-01-02 03:40:27	2020-01-01 00:12:06.000	2020-01-02 03:40:27.000	726	99627	50176.5	5017650	726	99627	50176.5	5017650	-32444	32694	4956.66	495666	-125	126	0.5	50
-727	100	10717	99628	2.18318	299.18318	150.68318	15068.31831	2.18318	299.1832	150.68318	15068.31842	2.18318	299.18318	150.68318	15068.31800	2020-01-01	2020-01-02	2020-01-01 00:12:07	2020-01-02 03:40:28	2020-01-01 00:12:07.000	2020-01-02 03:40:28.000	727	99628	50177.5	5017750	727	99628	50177.5	5017750	-32443	32695	4957.66	495766	-124	127	1.5	150
-728	100	10718	99629	2.18618	299.18618	150.68618	15068.61861	2.18618	299.1862	150.68618	15068.61875	2.18618	299.18618	150.68618	15068.61800	2020-01-01	2020-01-02	2020-01-01 00:12:08	2020-01-02 03:40:29	2020-01-01 00:12:08.000	2020-01-02 03:40:29.000	728	99629	50178.5	5017850	728	99629	50178.5	5017850	-32442	32696	4958.66	495866	-128	127	-0.06	-6
-729	100	10719	99630	2.18918	299.18918	150.68918	15068.91891	2.18918	299.18918	150.68918	15068.91889	2.18918	299.18918	150.68918	15068.91800	2020-01-01	2020-01-02	2020-01-01 00:12:09	2020-01-02 03:40:30	2020-01-01 00:12:09.000	2020-01-02 03:40:30.000	729	99630	50179.5	5017950	729	99630	50179.5	5017950	-32441	32697	4959.66	495966	-128	123	-1.62	-162
+720	100	10710	99621	2.16216	299.16216	150.66216	15066.21621	2.16216	299.16217	150.66216	15066.21606	2.16216	299.16216	150.66216	15066.216	2020-01-01	2020-01-02	2020-01-01 00:12:00	2020-01-02 03:40:21	2020-01-01 00:12:00.000	2020-01-02 03:40:21.000	720	99621	50170.5	5017050	720	99621	50170.5	5017050	-32450	32688	4950.66	495066	-125	126	-0.38	-38
+721	100	10711	99622	2.16516	299.16516	150.66516	15066.51651	2.16516	299.16516	150.66516	15066.51635	2.16516	299.16516	150.66516	15066.516	2020-01-01	2020-01-02	2020-01-01 00:12:01	2020-01-02 03:40:22	2020-01-01 00:12:01.000	2020-01-02 03:40:22.000	721	99622	50171.5	5017150	721	99622	50171.5	5017150	-32449	32689	4951.66	495166	-124	127	0.62	62
+722	100	10712	99623	2.16816	299.16816	150.66816	15066.81681	2.16816	299.16818	150.66816	15066.81695	2.16816	299.16816	150.66816	15066.816	2020-01-01	2020-01-02	2020-01-01 00:12:02	2020-01-02 03:40:23	2020-01-01 00:12:02.000	2020-01-02 03:40:23.000	722	99623	50172.5	5017250	722	99623	50172.5	5017250	-32448	32690	4952.66	495266	-128	127	-0.94	-94
+723	100	10713	99624	2.17117	299.17117	150.67117	15067.11711	2.17117	299.17117	150.67117	15067.11724	2.17117	299.17117	150.67117	15067.117	2020-01-01	2020-01-02	2020-01-01 00:12:03	2020-01-02 03:40:24	2020-01-01 00:12:03.000	2020-01-02 03:40:24.000	723	99624	50173.5	5017350	723	99624	50173.5	5017350	-32447	32691	4953.66	495366	-128	123	-2.5	-250
+724	100	10714	99625	2.17417	299.17417	150.67417	15067.41741	2.17417	299.17416	150.67417	15067.41742	2.17417	299.17417	150.67417	15067.417	2020-01-01	2020-01-02	2020-01-01 00:12:04	2020-01-02 03:40:25	2020-01-01 00:12:04.000	2020-01-02 03:40:25.000	724	99625	50174.5	5017450	724	99625	50174.5	5017450	-32446	32692	4954.66	495466	-127	124	-1.5	-150
+725	100	10715	99626	2.17717	299.17717	150.67717	15067.71771	2.17717	299.1772	150.67717	15067.71752	2.17717	299.17717	150.67717000000002	15067.717	2020-01-01	2020-01-02	2020-01-01 00:12:05	2020-01-02 03:40:26	2020-01-01 00:12:05.000	2020-01-02 03:40:26.000	725	99626	50175.5	5017550	725	99626	50175.5	5017550	-32445	32693	4955.66	495566	-126	125	-0.5	-50
+726	100	10716	99627	2.18018	299.18018	150.68018	15068.01801	2.18018	299.18018	150.68017	15068.01782	2.18018	299.18018	150.68018	15068.018	2020-01-01	2020-01-02	2020-01-01 00:12:06	2020-01-02 03:40:27	2020-01-01 00:12:06.000	2020-01-02 03:40:27.000	726	99627	50176.5	5017650	726	99627	50176.5	5017650	-32444	32694	4956.66	495666	-125	126	0.5	50
+727	100	10717	99628	2.18318	299.18318	150.68318	15068.31831	2.18318	299.1832	150.68318	15068.31842	2.18318	299.18318	150.68318	15068.318	2020-01-01	2020-01-02	2020-01-01 00:12:07	2020-01-02 03:40:28	2020-01-01 00:12:07.000	2020-01-02 03:40:28.000	727	99628	50177.5	5017750	727	99628	50177.5	5017750	-32443	32695	4957.66	495766	-124	127	1.5	150
+728	100	10718	99629	2.18618	299.18618	150.68618	15068.61861	2.18618	299.1862	150.68618	15068.61875	2.18618	299.18618	150.68618	15068.618	2020-01-01	2020-01-02	2020-01-01 00:12:08	2020-01-02 03:40:29	2020-01-01 00:12:08.000	2020-01-02 03:40:29.000	728	99629	50178.5	5017850	728	99629	50178.5	5017850	-32442	32696	4958.66	495866	-128	127	-0.06	-6
+729	100	10719	99630	2.18918	299.18918	150.68918	15068.91891	2.18918	299.18918	150.68918	15068.91889	2.18918	299.18918	150.68918	15068.918	2020-01-01	2020-01-02	2020-01-01 00:12:09	2020-01-02 03:40:30	2020-01-01 00:12:09.000	2020-01-02 03:40:30.000	729	99630	50179.5	5017950	729	99630	50179.5	5017950	-32441	32697	4959.66	495966	-128	123	-1.62	-162
 73	102	10063	99973	0.21921	300.21921	150.21921	15172.14114	0.21921	300.2192	150.21921	15172.14121	0.21921	300.21921	150.21921	15172.14021	2020-01-01	2020-01-02	2020-01-01 00:01:13	2020-01-02 03:46:13	2020-01-01 00:01:13.000	2020-01-02 03:46:13.000	73	99973	50023	5052323	73	99973	50023	5052323	-32496	32439	4602.009900990099	464803	-128	127	-3.4554455445544554	-349
-730	100	10720	99631	2.19219	299.19219	150.69219	15069.21921	2.19219	299.1922	150.69219	15069.21965	2.19219	299.19219	150.69218999999998	15069.21900	2020-01-01	2020-01-02	2020-01-01 00:12:10	2020-01-02 03:40:31	2020-01-01 00:12:10.000	2020-01-02 03:40:31.000	730	99631	50180.5	5018050	730	99631	50180.5	5018050	-32440	32698	4960.66	496066	-127	124	-0.62	-62
-731	100	10721	99632	2.19519	299.19519	150.69519	15069.51951	2.19519	299.1952	150.69519	15069.51928	2.19519	299.19519	150.69519	15069.51900	2020-01-01	2020-01-02	2020-01-01 00:12:11	2020-01-02 03:40:32	2020-01-01 00:12:11.000	2020-01-02 03:40:32.000	731	99632	50181.5	5018150	731	99632	50181.5	5018150	-32439	32699	4961.66	496166	-126	125	0.38	38
-732	100	10722	99633	2.19819	299.19819	150.69819	15069.81981	2.19819	299.1982	150.69819	15069.81988	2.19819	299.19819	150.69818999999998	15069.81900	2020-01-01	2020-01-02	2020-01-01 00:12:12	2020-01-02 03:40:33	2020-01-01 00:12:12.000	2020-01-02 03:40:33.000	732	99633	50182.5	5018250	732	99633	50182.5	5018250	-32438	32700	4962.66	496266	-125	126	1.38	138
-733	100	10723	99634	2.2012	299.2012	150.7012	15070.12012	2.2012	299.2012	150.7012	15070.12022	2.20120	299.20120	150.7012	15070.12000	2020-01-01	2020-01-02	2020-01-01 00:12:13	2020-01-02 03:40:34	2020-01-01 00:12:13.000	2020-01-02 03:40:34.000	733	99634	50183.5	5018350	733	99634	50183.5	5018350	-32437	32701	4963.66	496366	-124	127	2.38	238
-734	100	10724	99635	2.2042	299.2042	150.7042	15070.42042	2.2042	299.2042	150.7042	15070.42036	2.20420	299.20420	150.70420000000001	15070.42000	2020-01-01	2020-01-02	2020-01-01 00:12:14	2020-01-02 03:40:35	2020-01-01 00:12:14.000	2020-01-02 03:40:35.000	734	99635	50184.5	5018450	734	99635	50184.5	5018450	-32436	32702	4964.66	496466	-128	127	0.82	82
-735	100	10725	99636	2.2072	299.2072	150.7072	15070.72072	2.2072	299.2072	150.70721	15070.72111	2.20720	299.20720	150.7072	15070.72000	2020-01-01	2020-01-02	2020-01-01 00:12:15	2020-01-02 03:40:36	2020-01-01 00:12:15.000	2020-01-02 03:40:36.000	735	99636	50185.5	5018550	735	99636	50185.5	5018550	-32435	32703	4965.66	496566	-128	127	-0.74	-74
-736	100	10726	99637	2.21021	299.21021	150.71021	15071.02102	2.21021	299.2102	150.7102	15071.02076	2.21021	299.21021	150.71021000000002	15071.02100	2020-01-01	2020-01-02	2020-01-01 00:12:16	2020-01-02 03:40:37	2020-01-01 00:12:16.000	2020-01-02 03:40:37.000	736	99637	50186.5	5018650	736	99637	50186.5	5018650	-32434	32704	4966.66	496666	-128	124	-2.3	-230
-737	100	10727	99638	2.21321	299.21321	150.71321	15071.32132	2.21321	299.21323	150.71321	15071.32139	2.21321	299.21321	150.71321	15071.32100	2020-01-01	2020-01-02	2020-01-01 00:12:17	2020-01-02 03:40:38	2020-01-01 00:12:17.000	2020-01-02 03:40:38.000	737	99638	50187.5	5018750	737	99638	50187.5	5018750	-32433	32705	4967.66	496766	-127	125	-1.3	-130
-738	100	10728	99639	2.21621	299.21621	150.71621	15071.62162	2.21621	299.21622	150.71621	15071.62169	2.21621	299.21621	150.71621	15071.62100	2020-01-01	2020-01-02	2020-01-01 00:12:18	2020-01-02 03:40:39	2020-01-01 00:12:18.000	2020-01-02 03:40:39.000	738	99639	50188.5	5018850	738	99639	50188.5	5018850	-32432	32706	4968.66	496866	-126	126	-0.3	-30
-739	100	10729	99640	2.21921	299.21921	150.71921	15071.92192	2.21921	299.2192	150.71921	15071.92199	2.21921	299.21921	150.71921	15071.92100	2020-01-01	2020-01-02	2020-01-01 00:12:19	2020-01-02 03:40:40	2020-01-01 00:12:19.000	2020-01-02 03:40:40.000	739	99640	50189.5	5018950	739	99640	50189.5	5018950	-32431	32707	4969.66	496966	-125	127	0.7	70
+730	100	10720	99631	2.19219	299.19219	150.69219	15069.21921	2.19219	299.1922	150.69219	15069.21965	2.19219	299.19219	150.69218999999998	15069.219	2020-01-01	2020-01-02	2020-01-01 00:12:10	2020-01-02 03:40:31	2020-01-01 00:12:10.000	2020-01-02 03:40:31.000	730	99631	50180.5	5018050	730	99631	50180.5	5018050	-32440	32698	4960.66	496066	-127	124	-0.62	-62
+731	100	10721	99632	2.19519	299.19519	150.69519	15069.51951	2.19519	299.1952	150.69519	15069.51928	2.19519	299.19519	150.69519	15069.519	2020-01-01	2020-01-02	2020-01-01 00:12:11	2020-01-02 03:40:32	2020-01-01 00:12:11.000	2020-01-02 03:40:32.000	731	99632	50181.5	5018150	731	99632	50181.5	5018150	-32439	32699	4961.66	496166	-126	125	0.38	38
+732	100	10722	99633	2.19819	299.19819	150.69819	15069.81981	2.19819	299.1982	150.69819	15069.81988	2.19819	299.19819	150.69818999999998	15069.819	2020-01-01	2020-01-02	2020-01-01 00:12:12	2020-01-02 03:40:33	2020-01-01 00:12:12.000	2020-01-02 03:40:33.000	732	99633	50182.5	5018250	732	99633	50182.5	5018250	-32438	32700	4962.66	496266	-125	126	1.38	138
+733	100	10723	99634	2.2012	299.2012	150.7012	15070.12012	2.2012	299.2012	150.7012	15070.12022	2.2012	299.2012	150.7012	15070.12	2020-01-01	2020-01-02	2020-01-01 00:12:13	2020-01-02 03:40:34	2020-01-01 00:12:13.000	2020-01-02 03:40:34.000	733	99634	50183.5	5018350	733	99634	50183.5	5018350	-32437	32701	4963.66	496366	-124	127	2.38	238
+734	100	10724	99635	2.2042	299.2042	150.7042	15070.42042	2.2042	299.2042	150.7042	15070.42036	2.2042	299.2042	150.70420000000001	15070.42	2020-01-01	2020-01-02	2020-01-01 00:12:14	2020-01-02 03:40:35	2020-01-01 00:12:14.000	2020-01-02 03:40:35.000	734	99635	50184.5	5018450	734	99635	50184.5	5018450	-32436	32702	4964.66	496466	-128	127	0.82	82
+735	100	10725	99636	2.2072	299.2072	150.7072	15070.72072	2.2072	299.2072	150.70721	15070.72111	2.2072	299.2072	150.7072	15070.72	2020-01-01	2020-01-02	2020-01-01 00:12:15	2020-01-02 03:40:36	2020-01-01 00:12:15.000	2020-01-02 03:40:36.000	735	99636	50185.5	5018550	735	99636	50185.5	5018550	-32435	32703	4965.66	496566	-128	127	-0.74	-74
+736	100	10726	99637	2.21021	299.21021	150.71021	15071.02102	2.21021	299.2102	150.7102	15071.02076	2.21021	299.21021	150.71021000000002	15071.021	2020-01-01	2020-01-02	2020-01-01 00:12:16	2020-01-02 03:40:37	2020-01-01 00:12:16.000	2020-01-02 03:40:37.000	736	99637	50186.5	5018650	736	99637	50186.5	5018650	-32434	32704	4966.66	496666	-128	124	-2.3	-230
+737	100	10727	99638	2.21321	299.21321	150.71321	15071.32132	2.21321	299.21323	150.71321	15071.32139	2.21321	299.21321	150.71321	15071.321	2020-01-01	2020-01-02	2020-01-01 00:12:17	2020-01-02 03:40:38	2020-01-01 00:12:17.000	2020-01-02 03:40:38.000	737	99638	50187.5	5018750	737	99638	50187.5	5018750	-32433	32705	4967.66	496766	-127	125	-1.3	-130
+738	100	10728	99639	2.21621	299.21621	150.71621	15071.62162	2.21621	299.21622	150.71621	15071.62169	2.21621	299.21621	150.71621	15071.621	2020-01-01	2020-01-02	2020-01-01 00:12:18	2020-01-02 03:40:39	2020-01-01 00:12:18.000	2020-01-02 03:40:39.000	738	99639	50188.5	5018850	738	99639	50188.5	5018850	-32432	32706	4968.66	496866	-126	126	-0.3	-30
+739	100	10729	99640	2.21921	299.21921	150.71921	15071.92192	2.21921	299.2192	150.71921	15071.92199	2.21921	299.21921	150.71921	15071.921	2020-01-01	2020-01-02	2020-01-01 00:12:19	2020-01-02 03:40:40	2020-01-01 00:12:19.000	2020-01-02 03:40:40.000	739	99640	50189.5	5018950	739	99640	50189.5	5018950	-32431	32707	4969.66	496966	-125	127	0.7	70
 74	102	10064	99974	0.22222	300.22222	150.22222	15172.44444	0.22222	300.22223	150.22222	15172.4448	0.22222	300.22222	150.22222	15172.44422	2020-01-01	2020-01-02	2020-01-01 00:01:14	2020-01-02 03:46:14	2020-01-01 00:01:14.000	2020-01-02 03:46:14.000	74	99974	50024	5052424	74	99974	50024	5052424	-32495	32440	4603.009900990099	464904	-128	123	-4.99009900990099	-504
-740	100	10730	99641	2.22222	299.22222	150.72222	15072.22222	2.22222	299.22223	150.72222	15072.22258	2.22222	299.22222	150.72222	15072.22200	2020-01-01	2020-01-02	2020-01-01 00:12:20	2020-01-02 03:40:41	2020-01-01 00:12:20.000	2020-01-02 03:40:41.000	740	99641	50190.5	5019050	740	99641	50190.5	5019050	-32430	32708	4970.66	497066	-128	127	-0.86	-86
-741	100	10731	99642	2.22522	299.22522	150.72522	15072.52252	2.22522	299.22522	150.72522	15072.52223	2.22522	299.22522	150.72522	15072.52200	2020-01-01	2020-01-02	2020-01-01 00:12:21	2020-01-02 03:40:42	2020-01-01 00:12:21.000	2020-01-02 03:40:42.000	741	99642	50191.5	5019150	741	99642	50191.5	5019150	-32429	32709	4971.66	497166	-128	127	-2.42	-242
-742	100	10732	99643	2.22822	299.22822	150.72822	15072.82282	2.22822	299.22824	150.72822	15072.82286	2.22822	299.22822	150.72822	15072.82200	2020-01-01	2020-01-02	2020-01-01 00:12:22	2020-01-02 03:40:43	2020-01-01 00:12:22.000	2020-01-02 03:40:43.000	742	99643	50192.5	5019250	742	99643	50192.5	5019250	-32428	32710	4972.66	497266	-128	123	-3.98	-398
-743	100	10733	99644	2.23123	299.23123	150.73123	15073.12312	2.23123	299.23123	150.73123	15073.12316	2.23123	299.23123	150.73122999999998	15073.12300	2020-01-01	2020-01-02	2020-01-01 00:12:23	2020-01-02 03:40:44	2020-01-01 00:12:23.000	2020-01-02 03:40:44.000	743	99644	50193.5	5019350	743	99644	50193.5	5019350	-32427	32711	4973.66	497366	-127	124	-2.98	-298
-744	100	10734	99645	2.23423	299.23423	150.73423	15073.42342	2.23423	299.23422	150.73423	15073.42345	2.23423	299.23423	150.73423	15073.42300	2020-01-01	2020-01-02	2020-01-01 00:12:24	2020-01-02 03:40:45	2020-01-01 00:12:24.000	2020-01-02 03:40:45.000	744	99645	50194.5	5019450	744	99645	50194.5	5019450	-32426	32712	4974.66	497466	-126	125	-1.98	-198
-745	100	10735	99646	2.23723	299.23723	150.73723	15073.72372	2.23723	299.23724	150.73724	15073.72405	2.23723	299.23723	150.73723	15073.72300	2020-01-01	2020-01-02	2020-01-01 00:12:25	2020-01-02 03:40:46	2020-01-01 00:12:25.000	2020-01-02 03:40:46.000	745	99646	50195.5	5019550	745	99646	50195.5	5019550	-32425	32713	4975.66	497566	-125	126	-0.98	-98
-746	100	10736	99647	2.24024	299.24024	150.74024	15074.02402	2.24024	299.24023	150.74023	15074.02373	2.24024	299.24024	150.74024	15074.02400	2020-01-01	2020-01-02	2020-01-01 00:12:26	2020-01-02 03:40:47	2020-01-01 00:12:26.000	2020-01-02 03:40:47.000	746	99647	50196.5	5019650	746	99647	50196.5	5019650	-32424	32714	4976.66	497666	-124	127	0.02	2
-747	100	10737	99648	2.24324	299.24324	150.74324	15074.32432	2.24324	299.24326	150.74324	15074.32433	2.24324	299.24324	150.74324000000001	15074.32400	2020-01-01	2020-01-02	2020-01-01 00:12:27	2020-01-02 03:40:48	2020-01-01 00:12:27.000	2020-01-02 03:40:48.000	747	99648	50197.5	5019750	747	99648	50197.5	5019750	-32423	32715	4977.66	497766	-128	127	-1.54	-154
-748	100	10738	99649	2.24624	299.24624	150.74624	15074.62462	2.24624	299.24625	150.74624	15074.62463	2.24624	299.24624	150.74624	15074.62400	2020-01-01	2020-01-02	2020-01-01 00:12:28	2020-01-02 03:40:49	2020-01-01 00:12:28.000	2020-01-02 03:40:49.000	748	99649	50198.5	5019850	748	99649	50198.5	5019850	-32422	32716	4978.66	497866	-128	123	-3.1	-310
-749	100	10739	99650	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924000000001	15074.92400	2020-01-01	2020-01-02	2020-01-01 00:12:29	2020-01-02 03:40:50	2020-01-01 00:12:29.000	2020-01-02 03:40:50.000	749	99650	50199.5	5019950	749	99650	50199.5	5019950	-32421	32717	4979.66	497966	-127	124	-2.1	-210
+740	100	10730	99641	2.22222	299.22222	150.72222	15072.22222	2.22222	299.22223	150.72222	15072.22258	2.22222	299.22222	150.72222	15072.222	2020-01-01	2020-01-02	2020-01-01 00:12:20	2020-01-02 03:40:41	2020-01-01 00:12:20.000	2020-01-02 03:40:41.000	740	99641	50190.5	5019050	740	99641	50190.5	5019050	-32430	32708	4970.66	497066	-128	127	-0.86	-86
+741	100	10731	99642	2.22522	299.22522	150.72522	15072.52252	2.22522	299.22522	150.72522	15072.52223	2.22522	299.22522	150.72522	15072.522	2020-01-01	2020-01-02	2020-01-01 00:12:21	2020-01-02 03:40:42	2020-01-01 00:12:21.000	2020-01-02 03:40:42.000	741	99642	50191.5	5019150	741	99642	50191.5	5019150	-32429	32709	4971.66	497166	-128	127	-2.42	-242
+742	100	10732	99643	2.22822	299.22822	150.72822	15072.82282	2.22822	299.22824	150.72822	15072.82286	2.22822	299.22822	150.72822	15072.822	2020-01-01	2020-01-02	2020-01-01 00:12:22	2020-01-02 03:40:43	2020-01-01 00:12:22.000	2020-01-02 03:40:43.000	742	99643	50192.5	5019250	742	99643	50192.5	5019250	-32428	32710	4972.66	497266	-128	123	-3.98	-398
+743	100	10733	99644	2.23123	299.23123	150.73123	15073.12312	2.23123	299.23123	150.73123	15073.12316	2.23123	299.23123	150.73122999999998	15073.123	2020-01-01	2020-01-02	2020-01-01 00:12:23	2020-01-02 03:40:44	2020-01-01 00:12:23.000	2020-01-02 03:40:44.000	743	99644	50193.5	5019350	743	99644	50193.5	5019350	-32427	32711	4973.66	497366	-127	124	-2.98	-298
+744	100	10734	99645	2.23423	299.23423	150.73423	15073.42342	2.23423	299.23422	150.73423	15073.42345	2.23423	299.23423	150.73423	15073.423	2020-01-01	2020-01-02	2020-01-01 00:12:24	2020-01-02 03:40:45	2020-01-01 00:12:24.000	2020-01-02 03:40:45.000	744	99645	50194.5	5019450	744	99645	50194.5	5019450	-32426	32712	4974.66	497466	-126	125	-1.98	-198
+745	100	10735	99646	2.23723	299.23723	150.73723	15073.72372	2.23723	299.23724	150.73724	15073.72405	2.23723	299.23723	150.73723	15073.723	2020-01-01	2020-01-02	2020-01-01 00:12:25	2020-01-02 03:40:46	2020-01-01 00:12:25.000	2020-01-02 03:40:46.000	745	99646	50195.5	5019550	745	99646	50195.5	5019550	-32425	32713	4975.66	497566	-125	126	-0.98	-98
+746	100	10736	99647	2.24024	299.24024	150.74024	15074.02402	2.24024	299.24023	150.74023	15074.02373	2.24024	299.24024	150.74024	15074.024	2020-01-01	2020-01-02	2020-01-01 00:12:26	2020-01-02 03:40:47	2020-01-01 00:12:26.000	2020-01-02 03:40:47.000	746	99647	50196.5	5019650	746	99647	50196.5	5019650	-32424	32714	4976.66	497666	-124	127	0.02	2
+747	100	10737	99648	2.24324	299.24324	150.74324	15074.32432	2.24324	299.24326	150.74324	15074.32433	2.24324	299.24324	150.74324000000001	15074.324	2020-01-01	2020-01-02	2020-01-01 00:12:27	2020-01-02 03:40:48	2020-01-01 00:12:27.000	2020-01-02 03:40:48.000	747	99648	50197.5	5019750	747	99648	50197.5	5019750	-32423	32715	4977.66	497766	-128	127	-1.54	-154
+748	100	10738	99649	2.24624	299.24624	150.74624	15074.62462	2.24624	299.24625	150.74624	15074.62463	2.24624	299.24624	150.74624	15074.624	2020-01-01	2020-01-02	2020-01-01 00:12:28	2020-01-02 03:40:49	2020-01-01 00:12:28.000	2020-01-02 03:40:49.000	748	99649	50198.5	5019850	748	99649	50198.5	5019850	-32422	32716	4978.66	497866	-128	123	-3.1	-310
+749	100	10739	99650	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924000000001	15074.924	2020-01-01	2020-01-02	2020-01-01 00:12:29	2020-01-02 03:40:50	2020-01-01 00:12:29.000	2020-01-02 03:40:50.000	749	99650	50199.5	5019950	749	99650	50199.5	5019950	-32421	32717	4979.66	497966	-127	124	-2.1	-210
 75	102	10065	99975	0.22522	300.22522	150.22522	15172.74774	0.22522	300.22522	150.22522	15172.74745	0.22522	300.22522	150.22521999999998	15172.74722	2020-01-01	2020-01-02	2020-01-01 00:01:15	2020-01-02 03:46:15	2020-01-01 00:01:15.000	2020-01-02 03:46:15.000	75	99975	50025	5052525	75	99975	50025	5052525	-32494	32441	4604.009900990099	465005	-127	124	-3.99009900990099	-403
-750	100	10740	99651	2.25225	299.25225	150.75225	15075.22522	2.25225	299.25226	150.75225	15075.22552	2.25225	299.25225	150.75225	15075.22500	2020-01-01	2020-01-02	2020-01-01 00:12:30	2020-01-02 03:40:51	2020-01-01 00:12:30.000	2020-01-02 03:40:51.000	750	99651	50200.5	5020050	750	99651	50200.5	5020050	-32420	32718	4980.66	498066	-126	125	-1.1	-110
-751	100	10741	99652	2.25525	299.25525	150.75525	15075.52552	2.25525	299.25525	150.75525	15075.5252	2.25525	299.25525	150.75525	15075.52500	2020-01-01	2020-01-02	2020-01-01 00:12:31	2020-01-02 03:40:52	2020-01-01 00:12:31.000	2020-01-02 03:40:52.000	751	99652	50201.5	5020150	751	99652	50201.5	5020150	-32419	32719	4981.66	498166	-125	126	-0.1	-10
-752	100	10742	99653	2.25825	299.25825	150.75825	15075.82582	2.25825	299.25827	150.75825	15075.8258	2.25825	299.25825	150.75825	15075.82500	2020-01-01	2020-01-02	2020-01-01 00:12:32	2020-01-02 03:40:53	2020-01-01 00:12:32.000	2020-01-02 03:40:53.000	752	99653	50202.5	5020250	752	99653	50202.5	5020250	-32418	32720	4982.66	498266	-124	127	0.9	90
-753	100	10743	99654	2.26126	299.26126	150.76126	15076.12612	2.26126	299.26126	150.76126	15076.12609	2.26126	299.26126	150.76126	15076.12600	2020-01-01	2020-01-02	2020-01-01 00:12:33	2020-01-02 03:40:54	2020-01-01 00:12:33.000	2020-01-02 03:40:54.000	753	99654	50203.5	5020350	753	99654	50203.5	5020350	-32417	32721	4983.66	498366	-128	127	-0.66	-66
-754	100	10744	99655	2.26426	299.26426	150.76426	15076.42642	2.26426	299.26425	150.76426	15076.4264	2.26426	299.26426	150.76426	15076.42600	2020-01-01	2020-01-02	2020-01-01 00:12:34	2020-01-02 03:40:55	2020-01-01 00:12:34.000	2020-01-02 03:40:55.000	754	99655	50204.5	5020450	754	99655	50204.5	5020450	-32416	32722	4984.66	498466	-128	123	-2.22	-222
-755	100	10745	99656	2.26726	299.26726	150.76726	15076.72672	2.26726	299.26727	150.76727	15076.72703	2.26726	299.26726	150.76726	15076.72600	2020-01-01	2020-01-02	2020-01-01 00:12:35	2020-01-02 03:40:56	2020-01-01 00:12:35.000	2020-01-02 03:40:56.000	755	99656	50205.5	5020550	755	99656	50205.5	5020550	-32415	32723	4985.66	498566	-127	124	-1.22	-122
-756	100	10746	99657	2.27027	299.27027	150.77027	15077.02702	2.27027	299.27026	150.77026	15077.02667	2.27027	299.27027	150.77027	15077.02700	2020-01-01	2020-01-02	2020-01-01 00:12:36	2020-01-02 03:40:57	2020-01-01 00:12:36.000	2020-01-02 03:40:57.000	756	99657	50206.5	5020650	756	99657	50206.5	5020650	-32414	32724	4986.66	498666	-126	125	-0.22	-22
-757	100	10747	99658	2.27327	299.27327	150.77327	15077.32732	2.27327	299.2733	150.77327	15077.32727	2.27327	299.27327	150.77327	15077.32700	2020-01-01	2020-01-02	2020-01-01 00:12:37	2020-01-02 03:40:58	2020-01-01 00:12:37.000	2020-01-02 03:40:58.000	757	99658	50207.5	5020750	757	99658	50207.5	5020750	-32413	32725	4987.66	498766	-125	126	0.78	78
-758	100	10748	99659	2.27627	299.27627	150.77627	15077.62762	2.27627	299.27628	150.77627	15077.62756	2.27627	299.27627	150.77627	15077.62700	2020-01-01	2020-01-02	2020-01-01 00:12:38	2020-01-02 03:40:59	2020-01-01 00:12:38.000	2020-01-02 03:40:59.000	758	99659	50208.5	5020850	758	99659	50208.5	5020850	-32412	32726	4988.66	498866	-124	127	1.78	178
-759	100	10749	99660	2.27927	299.27927	150.77927	15077.92792	2.27927	299.27927	150.77927	15077.92787	2.27927	299.27927	150.77927	15077.92700	2020-01-01	2020-01-02	2020-01-01 00:12:39	2020-01-02 03:41:00	2020-01-01 00:12:39.000	2020-01-02 03:41:00.000	759	99660	50209.5	5020950	759	99660	50209.5	5020950	-32411	32727	4989.66	498966	-128	127	0.22	22
+750	100	10740	99651	2.25225	299.25225	150.75225	15075.22522	2.25225	299.25226	150.75225	15075.22552	2.25225	299.25225	150.75225	15075.225	2020-01-01	2020-01-02	2020-01-01 00:12:30	2020-01-02 03:40:51	2020-01-01 00:12:30.000	2020-01-02 03:40:51.000	750	99651	50200.5	5020050	750	99651	50200.5	5020050	-32420	32718	4980.66	498066	-126	125	-1.1	-110
+751	100	10741	99652	2.25525	299.25525	150.75525	15075.52552	2.25525	299.25525	150.75525	15075.5252	2.25525	299.25525	150.75525	15075.525	2020-01-01	2020-01-02	2020-01-01 00:12:31	2020-01-02 03:40:52	2020-01-01 00:12:31.000	2020-01-02 03:40:52.000	751	99652	50201.5	5020150	751	99652	50201.5	5020150	-32419	32719	4981.66	498166	-125	126	-0.1	-10
+752	100	10742	99653	2.25825	299.25825	150.75825	15075.82582	2.25825	299.25827	150.75825	15075.8258	2.25825	299.25825	150.75825	15075.825	2020-01-01	2020-01-02	2020-01-01 00:12:32	2020-01-02 03:40:53	2020-01-01 00:12:32.000	2020-01-02 03:40:53.000	752	99653	50202.5	5020250	752	99653	50202.5	5020250	-32418	32720	4982.66	498266	-124	127	0.9	90
+753	100	10743	99654	2.26126	299.26126	150.76126	15076.12612	2.26126	299.26126	150.76126	15076.12609	2.26126	299.26126	150.76126	15076.126	2020-01-01	2020-01-02	2020-01-01 00:12:33	2020-01-02 03:40:54	2020-01-01 00:12:33.000	2020-01-02 03:40:54.000	753	99654	50203.5	5020350	753	99654	50203.5	5020350	-32417	32721	4983.66	498366	-128	127	-0.66	-66
+754	100	10744	99655	2.26426	299.26426	150.76426	15076.42642	2.26426	299.26425	150.76426	15076.4264	2.26426	299.26426	150.76426	15076.426	2020-01-01	2020-01-02	2020-01-01 00:12:34	2020-01-02 03:40:55	2020-01-01 00:12:34.000	2020-01-02 03:40:55.000	754	99655	50204.5	5020450	754	99655	50204.5	5020450	-32416	32722	4984.66	498466	-128	123	-2.22	-222
+755	100	10745	99656	2.26726	299.26726	150.76726	15076.72672	2.26726	299.26727	150.76727	15076.72703	2.26726	299.26726	150.76726	15076.726	2020-01-01	2020-01-02	2020-01-01 00:12:35	2020-01-02 03:40:56	2020-01-01 00:12:35.000	2020-01-02 03:40:56.000	755	99656	50205.5	5020550	755	99656	50205.5	5020550	-32415	32723	4985.66	498566	-127	124	-1.22	-122
+756	100	10746	99657	2.27027	299.27027	150.77027	15077.02702	2.27027	299.27026	150.77026	15077.02667	2.27027	299.27027	150.77027	15077.027	2020-01-01	2020-01-02	2020-01-01 00:12:36	2020-01-02 03:40:57	2020-01-01 00:12:36.000	2020-01-02 03:40:57.000	756	99657	50206.5	5020650	756	99657	50206.5	5020650	-32414	32724	4986.66	498666	-126	125	-0.22	-22
+757	100	10747	99658	2.27327	299.27327	150.77327	15077.32732	2.27327	299.2733	150.77327	15077.32727	2.27327	299.27327	150.77327	15077.327	2020-01-01	2020-01-02	2020-01-01 00:12:37	2020-01-02 03:40:58	2020-01-01 00:12:37.000	2020-01-02 03:40:58.000	757	99658	50207.5	5020750	757	99658	50207.5	5020750	-32413	32725	4987.66	498766	-125	126	0.78	78
+758	100	10748	99659	2.27627	299.27627	150.77627	15077.62762	2.27627	299.27628	150.77627	15077.62756	2.27627	299.27627	150.77627	15077.627	2020-01-01	2020-01-02	2020-01-01 00:12:38	2020-01-02 03:40:59	2020-01-01 00:12:38.000	2020-01-02 03:40:59.000	758	99659	50208.5	5020850	758	99659	50208.5	5020850	-32412	32726	4988.66	498866	-124	127	1.78	178
+759	100	10749	99660	2.27927	299.27927	150.77927	15077.92792	2.27927	299.27927	150.77927	15077.92787	2.27927	299.27927	150.77927	15077.927	2020-01-01	2020-01-02	2020-01-01 00:12:39	2020-01-02 03:41:00	2020-01-01 00:12:39.000	2020-01-02 03:41:00.000	759	99660	50209.5	5020950	759	99660	50209.5	5020950	-32411	32727	4989.66	498966	-128	127	0.22	22
 76	102	10066	99976	0.22822	300.22822	150.22822	15173.05105	0.22822	300.22824	150.22822	15173.05109	0.22822	300.22822	150.22822	15173.05022	2020-01-01	2020-01-02	2020-01-01 00:01:16	2020-01-02 03:46:16	2020-01-01 00:01:16.000	2020-01-02 03:46:16.000	76	99976	50026	5052626	76	99976	50026	5052626	-32493	32442	4605.009900990099	465106	-126	125	-2.99009900990099	-302
-760	100	10750	99661	2.28228	299.28228	150.78228	15078.22822	2.28228	299.2823	150.78228	15078.2285	2.28228	299.28228	150.78228	15078.22800	2020-01-01	2020-01-02	2020-01-01 00:12:40	2020-01-02 03:41:01	2020-01-01 00:12:40.000	2020-01-02 03:41:01.000	760	99661	50210.5	5021050	760	99661	50210.5	5021050	-32410	32728	4990.66	499066	-128	127	-1.34	-134
-761	100	10751	99662	2.28528	299.28528	150.78528	15078.52852	2.28528	299.28528	150.78528	15078.52814	2.28528	299.28528	150.78528	15078.52800	2020-01-01	2020-01-02	2020-01-01 00:12:41	2020-01-02 03:41:02	2020-01-01 00:12:41.000	2020-01-02 03:41:02.000	761	99662	50211.5	5021150	761	99662	50211.5	5021150	-32409	32729	4991.66	499166	-128	124	-2.9	-290
-762	100	10752	99663	2.28828	299.28828	150.78828	15078.82882	2.28828	299.2883	150.78828	15078.82889	2.28828	299.28828	150.78828	15078.82800	2020-01-01	2020-01-02	2020-01-01 00:12:42	2020-01-02 03:41:03	2020-01-01 00:12:42.000	2020-01-02 03:41:03.000	762	99663	50212.5	5021250	762	99663	50212.5	5021250	-32408	32730	4992.66	499266	-127	125	-1.9	-190
-763	100	10753	99664	2.29129	299.29129	150.79129	15079.12912	2.29129	299.2913	150.79129	15079.12904	2.29129	299.29129	150.79129	15079.12900	2020-01-01	2020-01-02	2020-01-01 00:12:43	2020-01-02 03:41:04	2020-01-01 00:12:43.000	2020-01-02 03:41:04.000	763	99664	50213.5	5021350	763	99664	50213.5	5021350	-32407	32731	4993.66	499366	-126	126	-0.9	-90
-764	100	10754	99665	2.29429	299.29429	150.79429	15079.42942	2.29429	299.29428	150.79429	15079.42933	2.29429	299.29429	150.79429	15079.42900	2020-01-01	2020-01-02	2020-01-01 00:12:44	2020-01-02 03:41:05	2020-01-01 00:12:44.000	2020-01-02 03:41:05.000	764	99665	50214.5	5021450	764	99665	50214.5	5021450	-32406	32732	4994.66	499466	-125	127	0.1	10
-765	100	10755	99666	2.29729	299.29729	150.79729	15079.72972	2.29729	299.2973	150.79729	15079.72996	2.29729	299.29729	150.79729	15079.72900	2020-01-01	2020-01-02	2020-01-01 00:12:45	2020-01-02 03:41:06	2020-01-01 00:12:45.000	2020-01-02 03:41:06.000	765	99666	50215.5	5021550	765	99666	50215.5	5021550	-32405	32733	4995.66	499566	-128	127	-1.46	-146
-766	100	10756	99667	2.3003	299.3003	150.8003	15080.03003	2.3003	299.3003	150.80029	15080.02961	2.30030	299.30030	150.8003	15080.03000	2020-01-01	2020-01-02	2020-01-01 00:12:46	2020-01-02 03:41:07	2020-01-01 00:12:46.000	2020-01-02 03:41:07.000	766	99667	50216.5	5021650	766	99667	50216.5	5021650	-32404	32734	4996.66	499666	-128	127	-3.02	-302
-767	100	10757	99668	2.3033	299.3033	150.8033	15080.33033	2.3033	299.3033	150.8033	15080.33036	2.30330	299.30330	150.8033	15080.33000	2020-01-01	2020-01-02	2020-01-01 00:12:47	2020-01-02 03:41:08	2020-01-01 00:12:47.000	2020-01-02 03:41:08.000	767	99668	50217.5	5021750	767	99668	50217.5	5021750	-32403	32735	4997.66	499766	-128	123	-4.58	-458
-768	100	10758	99669	2.3063	299.3063	150.8063	15080.63063	2.3063	299.3063	150.8063	15080.6305	2.30630	299.30630	150.8063	15080.63000	2020-01-01	2020-01-02	2020-01-01 00:12:48	2020-01-02 03:41:09	2020-01-01 00:12:48.000	2020-01-02 03:41:09.000	768	99669	50218.5	5021850	768	99669	50218.5	5021850	-32402	32736	4998.66	499866	-127	124	-3.58	-358
-769	100	10759	99670	2.3093	299.3093	150.8093	15080.93093	2.3093	299.3093	150.8093	15080.93084	2.30930	299.30930	150.8093	15080.93000	2020-01-01	2020-01-02	2020-01-01 00:12:49	2020-01-02 03:41:10	2020-01-01 00:12:49.000	2020-01-02 03:41:10.000	769	99670	50219.5	5021950	769	99670	50219.5	5021950	-32401	32737	4999.66	499966	-126	125	-2.58	-258
+760	100	10750	99661	2.28228	299.28228	150.78228	15078.22822	2.28228	299.2823	150.78228	15078.2285	2.28228	299.28228	150.78228	15078.228	2020-01-01	2020-01-02	2020-01-01 00:12:40	2020-01-02 03:41:01	2020-01-01 00:12:40.000	2020-01-02 03:41:01.000	760	99661	50210.5	5021050	760	99661	50210.5	5021050	-32410	32728	4990.66	499066	-128	127	-1.34	-134
+761	100	10751	99662	2.28528	299.28528	150.78528	15078.52852	2.28528	299.28528	150.78528	15078.52814	2.28528	299.28528	150.78528	15078.528	2020-01-01	2020-01-02	2020-01-01 00:12:41	2020-01-02 03:41:02	2020-01-01 00:12:41.000	2020-01-02 03:41:02.000	761	99662	50211.5	5021150	761	99662	50211.5	5021150	-32409	32729	4991.66	499166	-128	124	-2.9	-290
+762	100	10752	99663	2.28828	299.28828	150.78828	15078.82882	2.28828	299.2883	150.78828	15078.82889	2.28828	299.28828	150.78828	15078.828	2020-01-01	2020-01-02	2020-01-01 00:12:42	2020-01-02 03:41:03	2020-01-01 00:12:42.000	2020-01-02 03:41:03.000	762	99663	50212.5	5021250	762	99663	50212.5	5021250	-32408	32730	4992.66	499266	-127	125	-1.9	-190
+763	100	10753	99664	2.29129	299.29129	150.79129	15079.12912	2.29129	299.2913	150.79129	15079.12904	2.29129	299.29129	150.79129	15079.129	2020-01-01	2020-01-02	2020-01-01 00:12:43	2020-01-02 03:41:04	2020-01-01 00:12:43.000	2020-01-02 03:41:04.000	763	99664	50213.5	5021350	763	99664	50213.5	5021350	-32407	32731	4993.66	499366	-126	126	-0.9	-90
+764	100	10754	99665	2.29429	299.29429	150.79429	15079.42942	2.29429	299.29428	150.79429	15079.42933	2.29429	299.29429	150.79429	15079.429	2020-01-01	2020-01-02	2020-01-01 00:12:44	2020-01-02 03:41:05	2020-01-01 00:12:44.000	2020-01-02 03:41:05.000	764	99665	50214.5	5021450	764	99665	50214.5	5021450	-32406	32732	4994.66	499466	-125	127	0.1	10
+765	100	10755	99666	2.29729	299.29729	150.79729	15079.72972	2.29729	299.2973	150.79729	15079.72996	2.29729	299.29729	150.79729	15079.729	2020-01-01	2020-01-02	2020-01-01 00:12:45	2020-01-02 03:41:06	2020-01-01 00:12:45.000	2020-01-02 03:41:06.000	765	99666	50215.5	5021550	765	99666	50215.5	5021550	-32405	32733	4995.66	499566	-128	127	-1.46	-146
+766	100	10756	99667	2.3003	299.3003	150.8003	15080.03003	2.3003	299.3003	150.80029	15080.02961	2.3003	299.3003	150.8003	15080.03	2020-01-01	2020-01-02	2020-01-01 00:12:46	2020-01-02 03:41:07	2020-01-01 00:12:46.000	2020-01-02 03:41:07.000	766	99667	50216.5	5021650	766	99667	50216.5	5021650	-32404	32734	4996.66	499666	-128	127	-3.02	-302
+767	100	10757	99668	2.3033	299.3033	150.8033	15080.33033	2.3033	299.3033	150.8033	15080.33036	2.3033	299.3033	150.8033	15080.33	2020-01-01	2020-01-02	2020-01-01 00:12:47	2020-01-02 03:41:08	2020-01-01 00:12:47.000	2020-01-02 03:41:08.000	767	99668	50217.5	5021750	767	99668	50217.5	5021750	-32403	32735	4997.66	499766	-128	123	-4.58	-458
+768	100	10758	99669	2.3063	299.3063	150.8063	15080.63063	2.3063	299.3063	150.8063	15080.6305	2.3063	299.3063	150.8063	15080.63	2020-01-01	2020-01-02	2020-01-01 00:12:48	2020-01-02 03:41:09	2020-01-01 00:12:48.000	2020-01-02 03:41:09.000	768	99669	50218.5	5021850	768	99669	50218.5	5021850	-32402	32736	4998.66	499866	-127	124	-3.58	-358
+769	100	10759	99670	2.3093	299.3093	150.8093	15080.93093	2.3093	299.3093	150.8093	15080.93084	2.3093	299.3093	150.8093	15080.93	2020-01-01	2020-01-02	2020-01-01 00:12:49	2020-01-02 03:41:10	2020-01-01 00:12:49.000	2020-01-02 03:41:10.000	769	99670	50219.5	5021950	769	99670	50219.5	5021950	-32401	32737	4999.66	499966	-126	125	-2.58	-258
 77	102	10067	99977	0.23123	300.23123	150.23123	15173.35435	0.23123	300.23123	150.23123	15173.35439	0.23123	300.23123	150.23123	15173.35423	2020-01-01	2020-01-02	2020-01-01 00:01:17	2020-01-02 03:46:17	2020-01-01 00:01:17.000	2020-01-02 03:46:17.000	77	99977	50027	5052727	77	99977	50027	5052727	-32492	32443	4606.009900990099	465207	-125	126	-1.99009900990099	-201
-770	100	10760	99671	2.31231	299.31231	150.81231	15081.23123	2.31231	299.31232	150.81231	15081.23144	2.31231	299.31231	150.81231	15081.23100	2020-01-01	2020-01-02	2020-01-01 00:12:50	2020-01-02 03:41:11	2020-01-01 00:12:50.000	2020-01-02 03:41:11.000	770	99671	50220.5	5022050	770	99671	50220.5	5022050	-32400	32738	5000.66	500066	-125	126	-1.58	-158
-771	100	10761	99672	2.31531	299.31531	150.81531	15081.53153	2.31531	299.3153	150.81531	15081.53173	2.31531	299.31531	150.81531	15081.53100	2020-01-01	2020-01-02	2020-01-01 00:12:51	2020-01-02 03:41:12	2020-01-01 00:12:51.000	2020-01-02 03:41:12.000	771	99672	50221.5	5022150	771	99672	50221.5	5022150	-32399	32739	5001.66	500166	-124	127	-0.58	-58
-772	100	10762	99673	2.31831	299.31831	150.81831	15081.83183	2.31831	299.31833	150.81831	15081.83183	2.31831	299.31831	150.81831	15081.83100	2020-01-01	2020-01-02	2020-01-01 00:12:52	2020-01-02 03:41:13	2020-01-01 00:12:52.000	2020-01-02 03:41:13.000	772	99673	50222.5	5022250	772	99673	50222.5	5022250	-32398	32740	5002.66	500266	-128	127	-2.14	-214
-773	100	10763	99674	2.32132	299.32132	150.82132	15082.13213	2.32132	299.32132	150.82131	15082.13197	2.32132	299.32132	150.82132	15082.13200	2020-01-01	2020-01-02	2020-01-01 00:12:53	2020-01-02 03:41:14	2020-01-01 00:12:53.000	2020-01-02 03:41:14.000	773	99674	50223.5	5022350	773	99674	50223.5	5022350	-32397	32741	5003.66	500366	-128	123	-3.7	-370
-774	100	10764	99675	2.32432	299.32432	150.82432	15082.43243	2.32432	299.3243	150.82432	15082.43231	2.32432	299.32432	150.82432	15082.43200	2020-01-01	2020-01-02	2020-01-01 00:12:54	2020-01-02 03:41:15	2020-01-01 00:12:54.000	2020-01-02 03:41:15.000	774	99675	50224.5	5022450	774	99675	50224.5	5022450	-32396	32742	5004.66	500466	-127	124	-2.7	-270
-775	100	10765	99676	2.32732	299.32732	150.82732	15082.73273	2.32732	299.32733	150.82732	15082.73291	2.32732	299.32732	150.82732	15082.73200	2020-01-01	2020-01-02	2020-01-01 00:12:55	2020-01-02 03:41:16	2020-01-01 00:12:55.000	2020-01-02 03:41:16.000	775	99676	50225.5	5022550	775	99676	50225.5	5022550	-32395	32743	5005.66	500566	-126	125	-1.7	-170
-776	100	10766	99677	2.33033	299.33033	150.83033	15083.03303	2.33033	299.33032	150.83033	15083.0332	2.33033	299.33033	150.83033	15083.03300	2020-01-01	2020-01-02	2020-01-01 00:12:56	2020-01-02 03:41:17	2020-01-01 00:12:56.000	2020-01-02 03:41:17.000	776	99677	50226.5	5022650	776	99677	50226.5	5022650	-32394	32744	5006.66	500666	-125	126	-0.7	-70
-777	100	10767	99678	2.33333	299.33333	150.83333	15083.33333	2.33333	299.33334	150.83333	15083.3333	2.33333	299.33333	150.83333000000002	15083.33300	2020-01-01	2020-01-02	2020-01-01 00:12:57	2020-01-02 03:41:18	2020-01-01 00:12:57.000	2020-01-02 03:41:18.000	777	99678	50227.5	5022750	777	99678	50227.5	5022750	-32393	32745	5007.66	500766	-124	127	0.3	30
-778	100	10768	99679	2.33633	299.33633	150.83633	15083.63363	2.33633	299.33633	150.83633	15083.63348	2.33633	299.33633	150.83633	15083.63300	2020-01-01	2020-01-02	2020-01-01 00:12:58	2020-01-02 03:41:19	2020-01-01 00:12:58.000	2020-01-02 03:41:19.000	778	99679	50228.5	5022850	778	99679	50228.5	5022850	-32392	32746	5008.66	500866	-128	127	-1.26	-126
-779	100	10769	99680	2.33933	299.33933	150.83933	15083.93393	2.33933	299.33932	150.83933	15083.93378	2.33933	299.33933	150.83933000000002	15083.93300	2020-01-01	2020-01-02	2020-01-01 00:12:59	2020-01-02 03:41:20	2020-01-01 00:12:59.000	2020-01-02 03:41:20.000	779	99680	50229.5	5022950	779	99680	50229.5	5022950	-32391	32747	5009.66	500966	-128	123	-2.82	-282
+770	100	10760	99671	2.31231	299.31231	150.81231	15081.23123	2.31231	299.31232	150.81231	15081.23144	2.31231	299.31231	150.81231	15081.231	2020-01-01	2020-01-02	2020-01-01 00:12:50	2020-01-02 03:41:11	2020-01-01 00:12:50.000	2020-01-02 03:41:11.000	770	99671	50220.5	5022050	770	99671	50220.5	5022050	-32400	32738	5000.66	500066	-125	126	-1.58	-158
+771	100	10761	99672	2.31531	299.31531	150.81531	15081.53153	2.31531	299.3153	150.81531	15081.53173	2.31531	299.31531	150.81531	15081.531	2020-01-01	2020-01-02	2020-01-01 00:12:51	2020-01-02 03:41:12	2020-01-01 00:12:51.000	2020-01-02 03:41:12.000	771	99672	50221.5	5022150	771	99672	50221.5	5022150	-32399	32739	5001.66	500166	-124	127	-0.58	-58
+772	100	10762	99673	2.31831	299.31831	150.81831	15081.83183	2.31831	299.31833	150.81831	15081.83183	2.31831	299.31831	150.81831	15081.831	2020-01-01	2020-01-02	2020-01-01 00:12:52	2020-01-02 03:41:13	2020-01-01 00:12:52.000	2020-01-02 03:41:13.000	772	99673	50222.5	5022250	772	99673	50222.5	5022250	-32398	32740	5002.66	500266	-128	127	-2.14	-214
+773	100	10763	99674	2.32132	299.32132	150.82132	15082.13213	2.32132	299.32132	150.82131	15082.13197	2.32132	299.32132	150.82132	15082.132	2020-01-01	2020-01-02	2020-01-01 00:12:53	2020-01-02 03:41:14	2020-01-01 00:12:53.000	2020-01-02 03:41:14.000	773	99674	50223.5	5022350	773	99674	50223.5	5022350	-32397	32741	5003.66	500366	-128	123	-3.7	-370
+774	100	10764	99675	2.32432	299.32432	150.82432	15082.43243	2.32432	299.3243	150.82432	15082.43231	2.32432	299.32432	150.82432	15082.432	2020-01-01	2020-01-02	2020-01-01 00:12:54	2020-01-02 03:41:15	2020-01-01 00:12:54.000	2020-01-02 03:41:15.000	774	99675	50224.5	5022450	774	99675	50224.5	5022450	-32396	32742	5004.66	500466	-127	124	-2.7	-270
+775	100	10765	99676	2.32732	299.32732	150.82732	15082.73273	2.32732	299.32733	150.82732	15082.73291	2.32732	299.32732	150.82732	15082.732	2020-01-01	2020-01-02	2020-01-01 00:12:55	2020-01-02 03:41:16	2020-01-01 00:12:55.000	2020-01-02 03:41:16.000	775	99676	50225.5	5022550	775	99676	50225.5	5022550	-32395	32743	5005.66	500566	-126	125	-1.7	-170
+776	100	10766	99677	2.33033	299.33033	150.83033	15083.03303	2.33033	299.33032	150.83033	15083.0332	2.33033	299.33033	150.83033	15083.033	2020-01-01	2020-01-02	2020-01-01 00:12:56	2020-01-02 03:41:17	2020-01-01 00:12:56.000	2020-01-02 03:41:17.000	776	99677	50226.5	5022650	776	99677	50226.5	5022650	-32394	32744	5006.66	500666	-125	126	-0.7	-70
+777	100	10767	99678	2.33333	299.33333	150.83333	15083.33333	2.33333	299.33334	150.83333	15083.3333	2.33333	299.33333	150.83333000000002	15083.333	2020-01-01	2020-01-02	2020-01-01 00:12:57	2020-01-02 03:41:18	2020-01-01 00:12:57.000	2020-01-02 03:41:18.000	777	99678	50227.5	5022750	777	99678	50227.5	5022750	-32393	32745	5007.66	500766	-124	127	0.3	30
+778	100	10768	99679	2.33633	299.33633	150.83633	15083.63363	2.33633	299.33633	150.83633	15083.63348	2.33633	299.33633	150.83633	15083.633	2020-01-01	2020-01-02	2020-01-01 00:12:58	2020-01-02 03:41:19	2020-01-01 00:12:58.000	2020-01-02 03:41:19.000	778	99679	50228.5	5022850	778	99679	50228.5	5022850	-32392	32746	5008.66	500866	-128	127	-1.26	-126
+779	100	10769	99680	2.33933	299.33933	150.83933	15083.93393	2.33933	299.33932	150.83933	15083.93378	2.33933	299.33933	150.83933000000002	15083.933	2020-01-01	2020-01-02	2020-01-01 00:12:59	2020-01-02 03:41:20	2020-01-01 00:12:59.000	2020-01-02 03:41:20.000	779	99680	50229.5	5022950	779	99680	50229.5	5022950	-32391	32747	5009.66	500966	-128	123	-2.82	-282
 78	102	10068	99978	0.23423	300.23423	150.23423	15173.65765	0.23423	300.23422	150.23423	15173.65769	0.23423	300.23423	150.23423	15173.65723	2020-01-01	2020-01-02	2020-01-01 00:01:18	2020-01-02 03:46:18	2020-01-01 00:01:18.000	2020-01-02 03:46:18.000	78	99978	50028	5052828	78	99978	50028	5052828	-32491	32444	4607.009900990099	465308	-124	127	-0.9900990099009901	-100
-780	100	10770	99681	2.34234	299.34234	150.84234	15084.23423	2.34234	299.34235	150.84234	15084.23437	2.34234	299.34234	150.84234	15084.23400	2020-01-01	2020-01-02	2020-01-01 00:13:00	2020-01-02 03:41:21	2020-01-01 00:13:00.000	2020-01-02 03:41:21.000	780	99681	50230.5	5023050	780	99681	50230.5	5023050	-32390	32748	5010.66	501066	-127	124	-1.82	-182
-781	100	10771	99682	2.34534	299.34534	150.84534	15084.53453	2.34534	299.34534	150.84534	15084.53467	2.34534	299.34534	150.84534	15084.53400	2020-01-01	2020-01-02	2020-01-01 00:13:01	2020-01-02 03:41:22	2020-01-01 00:13:01.000	2020-01-02 03:41:22.000	781	99682	50231.5	5023150	781	99682	50231.5	5023150	-32389	32749	5011.66	501166	-126	125	-0.82	-82
-782	100	10772	99683	2.34834	299.34834	150.84834	15084.83483	2.34834	299.34836	150.84834	15084.83477	2.34834	299.34834	150.84834	15084.83400	2020-01-01	2020-01-02	2020-01-01 00:13:02	2020-01-02 03:41:23	2020-01-01 00:13:02.000	2020-01-02 03:41:23.000	782	99683	50232.5	5023250	782	99683	50232.5	5023250	-32388	32750	5012.66	501266	-125	126	0.18	18
-783	100	10773	99684	2.35135	299.35135	150.85135	15085.13513	2.35135	299.35135	150.85134	15085.13495	2.35135	299.35135	150.85135	15085.13500	2020-01-01	2020-01-02	2020-01-01 00:13:03	2020-01-02 03:41:24	2020-01-01 00:13:03.000	2020-01-02 03:41:24.000	783	99684	50233.5	5023350	783	99684	50233.5	5023350	-32387	32751	5013.66	501366	-124	127	1.18	118
-784	100	10774	99685	2.35435	299.35435	150.85435	15085.43543	2.35435	299.35434	150.85435	15085.43525	2.35435	299.35435	150.85434999999998	15085.43500	2020-01-01	2020-01-02	2020-01-01 00:13:04	2020-01-02 03:41:25	2020-01-01 00:13:04.000	2020-01-02 03:41:25.000	784	99685	50234.5	5023450	784	99685	50234.5	5023450	-32386	32752	5014.66	501466	-128	127	-0.38	-38
-785	100	10775	99686	2.35735	299.35735	150.85735	15085.73573	2.35735	299.35736	150.85736	15085.736	2.35735	299.35735	150.85735	15085.73500	2020-01-01	2020-01-02	2020-01-01 00:13:05	2020-01-02 03:41:26	2020-01-01 00:13:05.000	2020-01-02 03:41:26.000	785	99686	50235.5	5023550	785	99686	50235.5	5023550	-32385	32753	5015.66	501566	-128	127	-1.94	-194
-786	100	10776	99687	2.36036	299.36036	150.86036	15086.03603	2.36036	299.36035	150.86036	15086.03614	2.36036	299.36036	150.86036000000001	15086.03600	2020-01-01	2020-01-02	2020-01-01 00:13:06	2020-01-02 03:41:27	2020-01-01 00:13:06.000	2020-01-02 03:41:27.000	786	99687	50236.5	5023650	786	99687	50236.5	5023650	-32384	32754	5016.66	501666	-128	124	-3.5	-350
-787	100	10777	99688	2.36336	299.36336	150.86336	15086.33633	2.36336	299.36337	150.86336	15086.33628	2.36336	299.36336	150.86336	15086.33600	2020-01-01	2020-01-02	2020-01-01 00:13:07	2020-01-02 03:41:28	2020-01-01 00:13:07.000	2020-01-02 03:41:28.000	787	99688	50237.5	5023750	787	99688	50237.5	5023750	-32383	32755	5017.66	501766	-127	125	-2.5	-250
-788	100	10778	99689	2.36636	299.36636	150.86636	15086.63663	2.36636	299.36636	150.86636	15086.63641	2.36636	299.36636	150.86636000000001	15086.63600	2020-01-01	2020-01-02	2020-01-01 00:13:08	2020-01-02 03:41:29	2020-01-01 00:13:08.000	2020-01-02 03:41:29.000	788	99689	50238.5	5023850	788	99689	50238.5	5023850	-32382	32756	5018.66	501866	-126	126	-1.5	-150
-789	100	10779	99690	2.36936	299.36936	150.86936	15086.93693	2.36936	299.36935	150.86936	15086.93672	2.36936	299.36936	150.86936	15086.93600	2020-01-01	2020-01-02	2020-01-01 00:13:09	2020-01-02 03:41:30	2020-01-01 00:13:09.000	2020-01-02 03:41:30.000	789	99690	50239.5	5023950	789	99690	50239.5	5023950	-32381	32757	5019.66	501966	-125	127	-0.5	-50
+780	100	10770	99681	2.34234	299.34234	150.84234	15084.23423	2.34234	299.34235	150.84234	15084.23437	2.34234	299.34234	150.84234	15084.234	2020-01-01	2020-01-02	2020-01-01 00:13:00	2020-01-02 03:41:21	2020-01-01 00:13:00.000	2020-01-02 03:41:21.000	780	99681	50230.5	5023050	780	99681	50230.5	5023050	-32390	32748	5010.66	501066	-127	124	-1.82	-182
+781	100	10771	99682	2.34534	299.34534	150.84534	15084.53453	2.34534	299.34534	150.84534	15084.53467	2.34534	299.34534	150.84534	15084.534	2020-01-01	2020-01-02	2020-01-01 00:13:01	2020-01-02 03:41:22	2020-01-01 00:13:01.000	2020-01-02 03:41:22.000	781	99682	50231.5	5023150	781	99682	50231.5	5023150	-32389	32749	5011.66	501166	-126	125	-0.82	-82
+782	100	10772	99683	2.34834	299.34834	150.84834	15084.83483	2.34834	299.34836	150.84834	15084.83477	2.34834	299.34834	150.84834	15084.834	2020-01-01	2020-01-02	2020-01-01 00:13:02	2020-01-02 03:41:23	2020-01-01 00:13:02.000	2020-01-02 03:41:23.000	782	99683	50232.5	5023250	782	99683	50232.5	5023250	-32388	32750	5012.66	501266	-125	126	0.18	18
+783	100	10773	99684	2.35135	299.35135	150.85135	15085.13513	2.35135	299.35135	150.85134	15085.13495	2.35135	299.35135	150.85135	15085.135	2020-01-01	2020-01-02	2020-01-01 00:13:03	2020-01-02 03:41:24	2020-01-01 00:13:03.000	2020-01-02 03:41:24.000	783	99684	50233.5	5023350	783	99684	50233.5	5023350	-32387	32751	5013.66	501366	-124	127	1.18	118
+784	100	10774	99685	2.35435	299.35435	150.85435	15085.43543	2.35435	299.35434	150.85435	15085.43525	2.35435	299.35435	150.85434999999998	15085.435	2020-01-01	2020-01-02	2020-01-01 00:13:04	2020-01-02 03:41:25	2020-01-01 00:13:04.000	2020-01-02 03:41:25.000	784	99685	50234.5	5023450	784	99685	50234.5	5023450	-32386	32752	5014.66	501466	-128	127	-0.38	-38
+785	100	10775	99686	2.35735	299.35735	150.85735	15085.73573	2.35735	299.35736	150.85736	15085.736	2.35735	299.35735	150.85735	15085.735	2020-01-01	2020-01-02	2020-01-01 00:13:05	2020-01-02 03:41:26	2020-01-01 00:13:05.000	2020-01-02 03:41:26.000	785	99686	50235.5	5023550	785	99686	50235.5	5023550	-32385	32753	5015.66	501566	-128	127	-1.94	-194
+786	100	10776	99687	2.36036	299.36036	150.86036	15086.03603	2.36036	299.36035	150.86036	15086.03614	2.36036	299.36036	150.86036000000001	15086.036	2020-01-01	2020-01-02	2020-01-01 00:13:06	2020-01-02 03:41:27	2020-01-01 00:13:06.000	2020-01-02 03:41:27.000	786	99687	50236.5	5023650	786	99687	50236.5	5023650	-32384	32754	5016.66	501666	-128	124	-3.5	-350
+787	100	10777	99688	2.36336	299.36336	150.86336	15086.33633	2.36336	299.36337	150.86336	15086.33628	2.36336	299.36336	150.86336	15086.336	2020-01-01	2020-01-02	2020-01-01 00:13:07	2020-01-02 03:41:28	2020-01-01 00:13:07.000	2020-01-02 03:41:28.000	787	99688	50237.5	5023750	787	99688	50237.5	5023750	-32383	32755	5017.66	501766	-127	125	-2.5	-250
+788	100	10778	99689	2.36636	299.36636	150.86636	15086.63663	2.36636	299.36636	150.86636	15086.63641	2.36636	299.36636	150.86636000000001	15086.636	2020-01-01	2020-01-02	2020-01-01 00:13:08	2020-01-02 03:41:29	2020-01-01 00:13:08.000	2020-01-02 03:41:29.000	788	99689	50238.5	5023850	788	99689	50238.5	5023850	-32382	32756	5018.66	501866	-126	126	-1.5	-150
+789	100	10779	99690	2.36936	299.36936	150.86936	15086.93693	2.36936	299.36935	150.86936	15086.93672	2.36936	299.36936	150.86936	15086.936	2020-01-01	2020-01-02	2020-01-01 00:13:09	2020-01-02 03:41:30	2020-01-01 00:13:09.000	2020-01-02 03:41:30.000	789	99690	50239.5	5023950	789	99690	50239.5	5023950	-32381	32757	5019.66	501966	-125	127	-0.5	-50
 79	102	10069	99979	0.23723	300.23723	150.23723	15173.96096	0.23723	300.23724	150.23724	15173.96129	0.23723	300.23723	150.23723	15173.96023	2020-01-01	2020-01-02	2020-01-01 00:01:19	2020-01-02 03:46:19	2020-01-01 00:01:19.000	2020-01-02 03:46:19.000	79	99979	50029	5052929	79	99979	50029	5052929	-32490	32445	4608.009900990099	465409	-128	127	-2.5247524752475248	-255
-790	100	10780	99691	2.37237	299.37237	150.87237	15087.23723	2.37237	299.37238	150.87237	15087.23747	2.37237	299.37237	150.87237	15087.23700	2020-01-01	2020-01-02	2020-01-01 00:13:10	2020-01-02 03:41:31	2020-01-01 00:13:10.000	2020-01-02 03:41:31.000	790	99691	50240.5	5024050	790	99691	50240.5	5024050	-32380	32758	5020.66	502066	-128	127	-2.06	-206
-791	100	10781	99692	2.37537	299.37537	150.87537	15087.53753	2.37537	299.37537	150.87537	15087.53761	2.37537	299.37537	150.87537	15087.53700	2020-01-01	2020-01-02	2020-01-01 00:13:11	2020-01-02 03:41:32	2020-01-01 00:13:11.000	2020-01-02 03:41:32.000	791	99692	50241.5	5024150	791	99692	50241.5	5024150	-32379	32759	5021.66	502166	-128	127	-3.62	-362
-792	100	10782	99693	2.37837	299.37837	150.87837	15087.83783	2.37837	299.3784	150.87837	15087.83775	2.37837	299.37837	150.87837	15087.83700	2020-01-01	2020-01-02	2020-01-01 00:13:12	2020-01-02 03:41:33	2020-01-01 00:13:12.000	2020-01-02 03:41:33.000	792	99693	50242.5	5024250	792	99693	50242.5	5024250	-32378	32760	5022.66	502266	-128	123	-5.18	-518
-793	100	10783	99694	2.38138	299.38138	150.88138	15088.13813	2.38138	299.38138	150.88137	15088.13789	2.38138	299.38138	150.88138	15088.13800	2020-01-01	2020-01-02	2020-01-01 00:13:13	2020-01-02 03:41:34	2020-01-01 00:13:13.000	2020-01-02 03:41:34.000	793	99694	50243.5	5024350	793	99694	50243.5	5024350	-32377	32761	5023.66	502366	-127	124	-4.18	-418
-794	100	10784	99695	2.38438	299.38438	150.88438	15088.43843	2.38438	299.3844	150.88438	15088.43864	2.38438	299.38438	150.88438	15088.43800	2020-01-01	2020-01-02	2020-01-01 00:13:14	2020-01-02 03:41:35	2020-01-01 00:13:14.000	2020-01-02 03:41:35.000	794	99695	50244.5	5024450	794	99695	50244.5	5024450	-32376	32762	5024.66	502466	-126	125	-3.18	-318
-795	100	10785	99696	2.38738	299.38738	150.88738	15088.73873	2.38738	299.3874	150.88738	15088.73894	2.38738	299.38738	150.88738	15088.73800	2020-01-01	2020-01-02	2020-01-01 00:13:15	2020-01-02 03:41:36	2020-01-01 00:13:15.000	2020-01-02 03:41:36.000	795	99696	50245.5	5024550	795	99696	50245.5	5024550	-32375	32763	5025.66	502566	-125	126	-2.18	-218
-796	100	10786	99697	2.39039	299.39039	150.89039	15089.03903	2.39039	299.39038	150.89039	15089.03908	2.39039	299.39039	150.89039	15089.03900	2020-01-01	2020-01-02	2020-01-01 00:13:16	2020-01-02 03:41:37	2020-01-01 00:13:16.000	2020-01-02 03:41:37.000	796	99697	50246.5	5024650	796	99697	50246.5	5024650	-32374	32764	5026.66	502666	-124	127	-1.18	-118
-797	100	10787	99698	2.39339	299.39339	150.89339	15089.33933	2.39339	299.3934	150.89339	15089.33921	2.39339	299.39339	150.89339	15089.33900	2020-01-01	2020-01-02	2020-01-01 00:13:17	2020-01-02 03:41:38	2020-01-01 00:13:17.000	2020-01-02 03:41:38.000	797	99698	50247.5	5024750	797	99698	50247.5	5024750	-32373	32765	5027.66	502766	-128	127	-2.74	-274
-798	100	10788	99699	2.39639	299.39639	150.89639	15089.63963	2.39639	299.3964	150.89639	15089.63936	2.39639	299.39639	150.89639	15089.63900	2020-01-01	2020-01-02	2020-01-01 00:13:18	2020-01-02 03:41:39	2020-01-01 00:13:18.000	2020-01-02 03:41:39.000	798	99699	50248.5	5024850	798	99699	50248.5	5024850	-32372	32766	5028.66	502866	-128	123	-4.3	-430
-799	100	10789	99700	2.39939	299.39939	150.89939	15089.93993	2.39939	299.3994	150.8994	15089.94011	2.39939	299.39939	150.89939	15089.93900	2020-01-01	2020-01-02	2020-01-01 00:13:19	2020-01-02 03:41:40	2020-01-01 00:13:19.000	2020-01-02 03:41:40.000	799	99700	50249.5	5024950	799	99700	50249.5	5024950	-32371	32767	5029.66	502966	-127	124	-3.3	-330
+790	100	10780	99691	2.37237	299.37237	150.87237	15087.23723	2.37237	299.37238	150.87237	15087.23747	2.37237	299.37237	150.87237	15087.237	2020-01-01	2020-01-02	2020-01-01 00:13:10	2020-01-02 03:41:31	2020-01-01 00:13:10.000	2020-01-02 03:41:31.000	790	99691	50240.5	5024050	790	99691	50240.5	5024050	-32380	32758	5020.66	502066	-128	127	-2.06	-206
+791	100	10781	99692	2.37537	299.37537	150.87537	15087.53753	2.37537	299.37537	150.87537	15087.53761	2.37537	299.37537	150.87537	15087.537	2020-01-01	2020-01-02	2020-01-01 00:13:11	2020-01-02 03:41:32	2020-01-01 00:13:11.000	2020-01-02 03:41:32.000	791	99692	50241.5	5024150	791	99692	50241.5	5024150	-32379	32759	5021.66	502166	-128	127	-3.62	-362
+792	100	10782	99693	2.37837	299.37837	150.87837	15087.83783	2.37837	299.3784	150.87837	15087.83775	2.37837	299.37837	150.87837	15087.837	2020-01-01	2020-01-02	2020-01-01 00:13:12	2020-01-02 03:41:33	2020-01-01 00:13:12.000	2020-01-02 03:41:33.000	792	99693	50242.5	5024250	792	99693	50242.5	5024250	-32378	32760	5022.66	502266	-128	123	-5.18	-518
+793	100	10783	99694	2.38138	299.38138	150.88138	15088.13813	2.38138	299.38138	150.88137	15088.13789	2.38138	299.38138	150.88138	15088.138	2020-01-01	2020-01-02	2020-01-01 00:13:13	2020-01-02 03:41:34	2020-01-01 00:13:13.000	2020-01-02 03:41:34.000	793	99694	50243.5	5024350	793	99694	50243.5	5024350	-32377	32761	5023.66	502366	-127	124	-4.18	-418
+794	100	10784	99695	2.38438	299.38438	150.88438	15088.43843	2.38438	299.3844	150.88438	15088.43864	2.38438	299.38438	150.88438	15088.438	2020-01-01	2020-01-02	2020-01-01 00:13:14	2020-01-02 03:41:35	2020-01-01 00:13:14.000	2020-01-02 03:41:35.000	794	99695	50244.5	5024450	794	99695	50244.5	5024450	-32376	32762	5024.66	502466	-126	125	-3.18	-318
+795	100	10785	99696	2.38738	299.38738	150.88738	15088.73873	2.38738	299.3874	150.88738	15088.73894	2.38738	299.38738	150.88738	15088.738	2020-01-01	2020-01-02	2020-01-01 00:13:15	2020-01-02 03:41:36	2020-01-01 00:13:15.000	2020-01-02 03:41:36.000	795	99696	50245.5	5024550	795	99696	50245.5	5024550	-32375	32763	5025.66	502566	-125	126	-2.18	-218
+796	100	10786	99697	2.39039	299.39039	150.89039	15089.03903	2.39039	299.39038	150.89039	15089.03908	2.39039	299.39039	150.89039	15089.039	2020-01-01	2020-01-02	2020-01-01 00:13:16	2020-01-02 03:41:37	2020-01-01 00:13:16.000	2020-01-02 03:41:37.000	796	99697	50246.5	5024650	796	99697	50246.5	5024650	-32374	32764	5026.66	502666	-124	127	-1.18	-118
+797	100	10787	99698	2.39339	299.39339	150.89339	15089.33933	2.39339	299.3934	150.89339	15089.33921	2.39339	299.39339	150.89339	15089.339	2020-01-01	2020-01-02	2020-01-01 00:13:17	2020-01-02 03:41:38	2020-01-01 00:13:17.000	2020-01-02 03:41:38.000	797	99698	50247.5	5024750	797	99698	50247.5	5024750	-32373	32765	5027.66	502766	-128	127	-2.74	-274
+798	100	10788	99699	2.39639	299.39639	150.89639	15089.63963	2.39639	299.3964	150.89639	15089.63936	2.39639	299.39639	150.89639	15089.639	2020-01-01	2020-01-02	2020-01-01 00:13:18	2020-01-02 03:41:39	2020-01-01 00:13:18.000	2020-01-02 03:41:39.000	798	99699	50248.5	5024850	798	99699	50248.5	5024850	-32372	32766	5028.66	502866	-128	123	-4.3	-430
+799	100	10789	99700	2.39939	299.39939	150.89939	15089.93993	2.39939	299.3994	150.8994	15089.94011	2.39939	299.39939	150.89939	15089.939	2020-01-01	2020-01-02	2020-01-01 00:13:19	2020-01-02 03:41:40	2020-01-01 00:13:19.000	2020-01-02 03:41:40.000	799	99700	50249.5	5024950	799	99700	50249.5	5024950	-32371	32767	5029.66	502966	-127	124	-3.3	-330
 8	102	1007	9998	0.02402	300.02402	150.02402	15152.42642	0.02402	300.02402	150.02402	15152.42607	0.02402	300.02402	150.02402	15152.42602	2020-01-01	2020-01-02	2020-01-01 00:00:08	2020-01-02 03:45:08	2020-01-01 00:00:08.000	2020-01-02 03:45:08.000	8	99908	49958	5045758	8	99908	49958	5045758	-32561	32374	4537.009900990099	458238	-125	126	-0.019801980198019802	-2
 80	102	10070	99980	0.24024	300.24024	150.24024	15174.26426	0.24024	300.24023	150.24023	15174.26397	0.24024	300.24024	150.24024	15174.26424	2020-01-01	2020-01-02	2020-01-01 00:01:20	2020-01-02 03:46:20	2020-01-01 00:01:20.000	2020-01-02 03:46:20.000	80	99980	50030	5053030	80	99980	50030	5053030	-32489	32446	4609.009900990099	465510	-128	123	-4.0594059405940595	-410
-800	100	10790	99701	2.4024	299.4024	150.9024	15090.24024	2.4024	299.4024	150.9024	15090.24041	2.40240	299.40240	150.9024	15090.24000	2020-01-01	2020-01-02	2020-01-01 00:13:20	2020-01-02 03:41:41	2020-01-01 00:13:20.000	2020-01-02 03:41:41.000	800	99701	50250.5	5025050	800	99701	50250.5	5025050	-32768	32167	4375.3	437530	-126	125	-2.3	-230
-801	100	10791	99702	2.4054	299.4054	150.9054	15090.54054	2.4054	299.4054	150.9054	15090.54058	2.40540	299.40540	150.90540000000001	15090.54000	2020-01-01	2020-01-02	2020-01-01 00:13:21	2020-01-02 03:41:42	2020-01-01 00:13:21.000	2020-01-02 03:41:42.000	801	99702	50251.5	5025150	801	99702	50251.5	5025150	-32767	32168	4376.3	437630	-125	126	-1.3	-130
-802	100	10792	99703	2.4084	299.4084	150.9084	15090.84084	2.4084	299.40842	150.9084	15090.84069	2.40840	299.40840	150.9084	15090.84000	2020-01-01	2020-01-02	2020-01-01 00:13:22	2020-01-02 03:41:43	2020-01-01 00:13:22.000	2020-01-02 03:41:43.000	802	99703	50252.5	5025250	802	99703	50252.5	5025250	-32766	32169	4377.3	437730	-124	127	-0.3	-30
-803	100	10793	99704	2.41141	299.41141	150.91141	15091.14114	2.41141	299.4114	150.9114	15091.14098	2.41141	299.41141	150.91141	15091.14100	2020-01-01	2020-01-02	2020-01-01 00:13:23	2020-01-02 03:41:44	2020-01-01 00:13:23.000	2020-01-02 03:41:44.000	803	99704	50253.5	5025350	803	99704	50253.5	5025350	-32765	32170	4378.3	437830	-128	127	-1.86	-186
-804	100	10794	99705	2.41441	299.41441	150.91441	15091.44144	2.41441	299.41443	150.91441	15091.44158	2.41441	299.41441	150.91441	15091.44100	2020-01-01	2020-01-02	2020-01-01 00:13:24	2020-01-02 03:41:45	2020-01-01 00:13:24.000	2020-01-02 03:41:45.000	804	99705	50254.5	5025450	804	99705	50254.5	5025450	-32764	32171	4379.3	437930	-128	123	-3.42	-342
-805	100	10795	99706	2.41741	299.41741	150.91741	15091.74174	2.41741	299.41742	150.91741	15091.74188	2.41741	299.41741	150.91741	15091.74100	2020-01-01	2020-01-02	2020-01-01 00:13:25	2020-01-02 03:41:46	2020-01-01 00:13:25.000	2020-01-02 03:41:46.000	805	99706	50255.5	5025550	805	99706	50255.5	5025550	-32763	32172	4380.3	438030	-127	124	-2.42	-242
-806	100	10796	99707	2.42042	299.42042	150.92042	15092.04204	2.42042	299.4204	150.92042	15092.04205	2.42042	299.42042	150.92042	15092.04200	2020-01-01	2020-01-02	2020-01-01 00:13:26	2020-01-02 03:41:47	2020-01-01 00:13:26.000	2020-01-02 03:41:47.000	806	99707	50256.5	5025650	806	99707	50256.5	5025650	-32762	32173	4381.3	438130	-126	125	-1.42	-142
-807	100	10797	99708	2.42342	299.42342	150.92342	15092.34234	2.42342	299.42343	150.92342	15092.34216	2.42342	299.42342	150.92342	15092.34200	2020-01-01	2020-01-02	2020-01-01 00:13:27	2020-01-02 03:41:48	2020-01-01 00:13:27.000	2020-01-02 03:41:48.000	807	99708	50257.5	5025750	807	99708	50257.5	5025750	-32761	32174	4382.3	438230	-125	126	-0.42	-42
-808	100	10798	99709	2.42642	299.42642	150.92642	15092.64264	2.42642	299.42642	150.92642	15092.64245	2.42642	299.42642	150.92642	15092.64200	2020-01-01	2020-01-02	2020-01-01 00:13:28	2020-01-02 03:41:49	2020-01-01 00:13:28.000	2020-01-02 03:41:49.000	808	99709	50258.5	5025850	808	99709	50258.5	5025850	-32760	32175	4383.3	438330	-124	127	0.58	58
-809	100	10799	99710	2.42942	299.42942	150.92942	15092.94294	2.42942	299.42944	150.92943	15092.94305	2.42942	299.42942	150.92942	15092.94200	2020-01-01	2020-01-02	2020-01-01 00:13:29	2020-01-02 03:41:50	2020-01-01 00:13:29.000	2020-01-02 03:41:50.000	809	99710	50259.5	5025950	809	99710	50259.5	5025950	-32759	32176	4384.3	438430	-128	127	-0.98	-98
+800	100	10790	99701	2.4024	299.4024	150.9024	15090.24024	2.4024	299.4024	150.9024	15090.24041	2.4024	299.4024	150.9024	15090.24	2020-01-01	2020-01-02	2020-01-01 00:13:20	2020-01-02 03:41:41	2020-01-01 00:13:20.000	2020-01-02 03:41:41.000	800	99701	50250.5	5025050	800	99701	50250.5	5025050	-32768	32167	4375.3	437530	-126	125	-2.3	-230
+801	100	10791	99702	2.4054	299.4054	150.9054	15090.54054	2.4054	299.4054	150.9054	15090.54058	2.4054	299.4054	150.90540000000001	15090.54	2020-01-01	2020-01-02	2020-01-01 00:13:21	2020-01-02 03:41:42	2020-01-01 00:13:21.000	2020-01-02 03:41:42.000	801	99702	50251.5	5025150	801	99702	50251.5	5025150	-32767	32168	4376.3	437630	-125	126	-1.3	-130
+802	100	10792	99703	2.4084	299.4084	150.9084	15090.84084	2.4084	299.40842	150.9084	15090.84069	2.4084	299.4084	150.9084	15090.84	2020-01-01	2020-01-02	2020-01-01 00:13:22	2020-01-02 03:41:43	2020-01-01 00:13:22.000	2020-01-02 03:41:43.000	802	99703	50252.5	5025250	802	99703	50252.5	5025250	-32766	32169	4377.3	437730	-124	127	-0.3	-30
+803	100	10793	99704	2.41141	299.41141	150.91141	15091.14114	2.41141	299.4114	150.9114	15091.14098	2.41141	299.41141	150.91141	15091.141	2020-01-01	2020-01-02	2020-01-01 00:13:23	2020-01-02 03:41:44	2020-01-01 00:13:23.000	2020-01-02 03:41:44.000	803	99704	50253.5	5025350	803	99704	50253.5	5025350	-32765	32170	4378.3	437830	-128	127	-1.86	-186
+804	100	10794	99705	2.41441	299.41441	150.91441	15091.44144	2.41441	299.41443	150.91441	15091.44158	2.41441	299.41441	150.91441	15091.441	2020-01-01	2020-01-02	2020-01-01 00:13:24	2020-01-02 03:41:45	2020-01-01 00:13:24.000	2020-01-02 03:41:45.000	804	99705	50254.5	5025450	804	99705	50254.5	5025450	-32764	32171	4379.3	437930	-128	123	-3.42	-342
+805	100	10795	99706	2.41741	299.41741	150.91741	15091.74174	2.41741	299.41742	150.91741	15091.74188	2.41741	299.41741	150.91741	15091.741	2020-01-01	2020-01-02	2020-01-01 00:13:25	2020-01-02 03:41:46	2020-01-01 00:13:25.000	2020-01-02 03:41:46.000	805	99706	50255.5	5025550	805	99706	50255.5	5025550	-32763	32172	4380.3	438030	-127	124	-2.42	-242
+806	100	10796	99707	2.42042	299.42042	150.92042	15092.04204	2.42042	299.4204	150.92042	15092.04205	2.42042	299.42042	150.92042	15092.042	2020-01-01	2020-01-02	2020-01-01 00:13:26	2020-01-02 03:41:47	2020-01-01 00:13:26.000	2020-01-02 03:41:47.000	806	99707	50256.5	5025650	806	99707	50256.5	5025650	-32762	32173	4381.3	438130	-126	125	-1.42	-142
+807	100	10797	99708	2.42342	299.42342	150.92342	15092.34234	2.42342	299.42343	150.92342	15092.34216	2.42342	299.42342	150.92342	15092.342	2020-01-01	2020-01-02	2020-01-01 00:13:27	2020-01-02 03:41:48	2020-01-01 00:13:27.000	2020-01-02 03:41:48.000	807	99708	50257.5	5025750	807	99708	50257.5	5025750	-32761	32174	4382.3	438230	-125	126	-0.42	-42
+808	100	10798	99709	2.42642	299.42642	150.92642	15092.64264	2.42642	299.42642	150.92642	15092.64245	2.42642	299.42642	150.92642	15092.642	2020-01-01	2020-01-02	2020-01-01 00:13:28	2020-01-02 03:41:49	2020-01-01 00:13:28.000	2020-01-02 03:41:49.000	808	99709	50258.5	5025850	808	99709	50258.5	5025850	-32760	32175	4383.3	438330	-124	127	0.58	58
+809	100	10799	99710	2.42942	299.42942	150.92942	15092.94294	2.42942	299.42944	150.92943	15092.94305	2.42942	299.42942	150.92942	15092.942	2020-01-01	2020-01-02	2020-01-01 00:13:29	2020-01-02 03:41:50	2020-01-01 00:13:29.000	2020-01-02 03:41:50.000	809	99710	50259.5	5025950	809	99710	50259.5	5025950	-32759	32176	4384.3	438430	-128	127	-0.98	-98
 81	102	10071	99981	0.24324	300.24324	150.24324	15174.56756	0.24324	300.24326	150.24324	15174.56758	0.24324	300.24324	150.24324000000001	15174.56724	2020-01-01	2020-01-02	2020-01-01 00:01:21	2020-01-02 03:46:21	2020-01-01 00:01:21.000	2020-01-02 03:46:21.000	81	99981	50031	5053131	81	99981	50031	5053131	-32488	32447	4610.009900990099	465611	-127	124	-3.0594059405940595	-309
-810	100	10800	99711	2.43243	299.43243	150.93243	15093.24324	2.43243	299.43243	150.93243	15093.24338	2.43243	299.43243	150.93243	15093.24300	2020-01-01	2020-01-02	2020-01-01 00:13:30	2020-01-02 03:41:51	2020-01-01 00:13:30.000	2020-01-02 03:41:51.000	810	99711	50260.5	5026050	810	99711	50260.5	5026050	-32758	32177	4385.3	438530	-128	127	-2.54	-254
-811	100	10801	99712	2.43543	299.43543	150.93543	15093.54354	2.43543	299.43542	150.93543	15093.54353	2.43543	299.43543	150.93543	15093.54300	2020-01-01	2020-01-02	2020-01-01 00:13:31	2020-01-02 03:41:52	2020-01-01 00:13:31.000	2020-01-02 03:41:52.000	811	99712	50261.5	5026150	811	99712	50261.5	5026150	-32757	32178	4386.3	438630	-128	124	-4.1	-410
-812	100	10802	99713	2.43843	299.43843	150.93843	15093.84384	2.43843	299.43845	150.93844	15093.84428	2.43843	299.43843	150.93843	15093.84300	2020-01-01	2020-01-02	2020-01-01 00:13:32	2020-01-02 03:41:53	2020-01-01 00:13:32.000	2020-01-02 03:41:53.000	812	99713	50262.5	5026250	812	99713	50262.5	5026250	-32756	32179	4387.3	438730	-127	125	-3.1	-310
-813	100	10803	99714	2.44144	299.44144	150.94144	15094.14414	2.44144	299.44144	150.94143	15094.14392	2.44144	299.44144	150.94144	15094.14400	2020-01-01	2020-01-02	2020-01-01 00:13:33	2020-01-02 03:41:54	2020-01-01 00:13:33.000	2020-01-02 03:41:54.000	813	99714	50263.5	5026350	813	99714	50263.5	5026350	-32755	32180	4388.3	438830	-126	126	-2.1	-210
-814	100	10804	99715	2.44444	299.44444	150.94444	15094.44444	2.44444	299.44446	150.94444	15094.44452	2.44444	299.44444	150.94444	15094.44400	2020-01-01	2020-01-02	2020-01-01 00:13:34	2020-01-02 03:41:55	2020-01-01 00:13:34.000	2020-01-02 03:41:55.000	814	99715	50264.5	5026450	814	99715	50264.5	5026450	-32754	32181	4389.3	438930	-125	127	-1.1	-110
-815	100	10805	99716	2.44744	299.44744	150.94744	15094.74474	2.44744	299.44745	150.94744	15094.74485	2.44744	299.44744	150.94744	15094.74400	2020-01-01	2020-01-02	2020-01-01 00:13:35	2020-01-02 03:41:56	2020-01-01 00:13:35.000	2020-01-02 03:41:56.000	815	99716	50265.5	5026550	815	99716	50265.5	5026550	-32753	32182	4390.3	439030	-128	127	-2.66	-266
-816	100	10806	99717	2.45045	299.45045	150.95045	15095.04504	2.45045	299.45044	150.95045	15095.045	2.45045	299.45045	150.95045	15095.04500	2020-01-01	2020-01-02	2020-01-01 00:13:36	2020-01-02 03:41:57	2020-01-01 00:13:36.000	2020-01-02 03:41:57.000	816	99717	50266.5	5026650	816	99717	50266.5	5026650	-32752	32183	4391.3	439130	-128	127	-4.22	-422
-817	100	10807	99718	2.45345	299.45345	150.95345	15095.34534	2.45345	299.45346	150.95345	15095.34574	2.45345	299.45345	150.95345	15095.34500	2020-01-01	2020-01-02	2020-01-01 00:13:37	2020-01-02 03:41:58	2020-01-01 00:13:37.000	2020-01-02 03:41:58.000	817	99718	50267.5	5026750	817	99718	50267.5	5026750	-32751	32184	4392.3	439230	-128	123	-5.78	-578
-818	100	10808	99719	2.45645	299.45645	150.95645	15095.64564	2.45645	299.45645	150.95645	15095.64539	2.45645	299.45645	150.95645000000002	15095.64500	2020-01-01	2020-01-02	2020-01-01 00:13:38	2020-01-02 03:41:59	2020-01-01 00:13:38.000	2020-01-02 03:41:59.000	818	99719	50268.5	5026850	818	99719	50268.5	5026850	-32750	32185	4393.3	439330	-127	124	-4.78	-478
-819	100	10809	99720	2.45945	299.45945	150.95945	15095.94594	2.45945	299.45947	150.95946	15095.94602	2.45945	299.45945	150.95945	15095.94500	2020-01-01	2020-01-02	2020-01-01 00:13:39	2020-01-02 03:42:00	2020-01-01 00:13:39.000	2020-01-02 03:42:00.000	819	99720	50269.5	5026950	819	99720	50269.5	5026950	-32749	32186	4394.3	439430	-126	125	-3.78	-378
+810	100	10800	99711	2.43243	299.43243	150.93243	15093.24324	2.43243	299.43243	150.93243	15093.24338	2.43243	299.43243	150.93243	15093.243	2020-01-01	2020-01-02	2020-01-01 00:13:30	2020-01-02 03:41:51	2020-01-01 00:13:30.000	2020-01-02 03:41:51.000	810	99711	50260.5	5026050	810	99711	50260.5	5026050	-32758	32177	4385.3	438530	-128	127	-2.54	-254
+811	100	10801	99712	2.43543	299.43543	150.93543	15093.54354	2.43543	299.43542	150.93543	15093.54353	2.43543	299.43543	150.93543	15093.543	2020-01-01	2020-01-02	2020-01-01 00:13:31	2020-01-02 03:41:52	2020-01-01 00:13:31.000	2020-01-02 03:41:52.000	811	99712	50261.5	5026150	811	99712	50261.5	5026150	-32757	32178	4386.3	438630	-128	124	-4.1	-410
+812	100	10802	99713	2.43843	299.43843	150.93843	15093.84384	2.43843	299.43845	150.93844	15093.84428	2.43843	299.43843	150.93843	15093.843	2020-01-01	2020-01-02	2020-01-01 00:13:32	2020-01-02 03:41:53	2020-01-01 00:13:32.000	2020-01-02 03:41:53.000	812	99713	50262.5	5026250	812	99713	50262.5	5026250	-32756	32179	4387.3	438730	-127	125	-3.1	-310
+813	100	10803	99714	2.44144	299.44144	150.94144	15094.14414	2.44144	299.44144	150.94143	15094.14392	2.44144	299.44144	150.94144	15094.144	2020-01-01	2020-01-02	2020-01-01 00:13:33	2020-01-02 03:41:54	2020-01-01 00:13:33.000	2020-01-02 03:41:54.000	813	99714	50263.5	5026350	813	99714	50263.5	5026350	-32755	32180	4388.3	438830	-126	126	-2.1	-210
+814	100	10804	99715	2.44444	299.44444	150.94444	15094.44444	2.44444	299.44446	150.94444	15094.44452	2.44444	299.44444	150.94444	15094.444	2020-01-01	2020-01-02	2020-01-01 00:13:34	2020-01-02 03:41:55	2020-01-01 00:13:34.000	2020-01-02 03:41:55.000	814	99715	50264.5	5026450	814	99715	50264.5	5026450	-32754	32181	4389.3	438930	-125	127	-1.1	-110
+815	100	10805	99716	2.44744	299.44744	150.94744	15094.74474	2.44744	299.44745	150.94744	15094.74485	2.44744	299.44744	150.94744	15094.744	2020-01-01	2020-01-02	2020-01-01 00:13:35	2020-01-02 03:41:56	2020-01-01 00:13:35.000	2020-01-02 03:41:56.000	815	99716	50265.5	5026550	815	99716	50265.5	5026550	-32753	32182	4390.3	439030	-128	127	-2.66	-266
+816	100	10806	99717	2.45045	299.45045	150.95045	15095.04504	2.45045	299.45044	150.95045	15095.045	2.45045	299.45045	150.95045	15095.045	2020-01-01	2020-01-02	2020-01-01 00:13:36	2020-01-02 03:41:57	2020-01-01 00:13:36.000	2020-01-02 03:41:57.000	816	99717	50266.5	5026650	816	99717	50266.5	5026650	-32752	32183	4391.3	439130	-128	127	-4.22	-422
+817	100	10807	99718	2.45345	299.45345	150.95345	15095.34534	2.45345	299.45346	150.95345	15095.34574	2.45345	299.45345	150.95345	15095.345	2020-01-01	2020-01-02	2020-01-01 00:13:37	2020-01-02 03:41:58	2020-01-01 00:13:37.000	2020-01-02 03:41:58.000	817	99718	50267.5	5026750	817	99718	50267.5	5026750	-32751	32184	4392.3	439230	-128	123	-5.78	-578
+818	100	10808	99719	2.45645	299.45645	150.95645	15095.64564	2.45645	299.45645	150.95645	15095.64539	2.45645	299.45645	150.95645000000002	15095.645	2020-01-01	2020-01-02	2020-01-01 00:13:38	2020-01-02 03:41:59	2020-01-01 00:13:38.000	2020-01-02 03:41:59.000	818	99719	50268.5	5026850	818	99719	50268.5	5026850	-32750	32185	4393.3	439330	-127	124	-4.78	-478
+819	100	10809	99720	2.45945	299.45945	150.95945	15095.94594	2.45945	299.45947	150.95946	15095.94602	2.45945	299.45945	150.95945	15095.945	2020-01-01	2020-01-02	2020-01-01 00:13:39	2020-01-02 03:42:00	2020-01-01 00:13:39.000	2020-01-02 03:42:00.000	819	99720	50269.5	5026950	819	99720	50269.5	5026950	-32749	32186	4394.3	439430	-126	125	-3.78	-378
 82	102	10072	99982	0.24624	300.24624	150.24624	15174.87087	0.24624	300.24625	150.24624	15174.87088	0.24624	300.24624	150.24624	15174.87024	2020-01-01	2020-01-02	2020-01-01 00:01:22	2020-01-02 03:46:22	2020-01-01 00:01:22.000	2020-01-02 03:46:22.000	82	99982	50032	5053232	82	99982	50032	5053232	-32487	32448	4611.009900990099	465712	-126	125	-2.0594059405940595	-208
-820	100	10810	99721	2.46246	299.46246	150.96246	15096.24624	2.46246	299.46246	150.96246	15096.24633	2.46246	299.46246	150.96246	15096.24600	2020-01-01	2020-01-02	2020-01-01 00:13:40	2020-01-02 03:42:01	2020-01-01 00:13:40.000	2020-01-02 03:42:01.000	820	99721	50270.5	5027050	820	99721	50270.5	5027050	-32748	32187	4395.3	439530	-125	126	-2.78	-278
-821	100	10811	99722	2.46546	299.46546	150.96546	15096.54654	2.46546	299.46545	150.96546	15096.54646	2.46546	299.46546	150.96546	15096.54600	2020-01-01	2020-01-02	2020-01-01 00:13:41	2020-01-02 03:42:02	2020-01-01 00:13:41.000	2020-01-02 03:42:02.000	821	99722	50271.5	5027150	821	99722	50271.5	5027150	-32747	32188	4396.3	439630	-124	127	-1.78	-178
-822	100	10812	99723	2.46846	299.46846	150.96846	15096.84684	2.46846	299.46848	150.96847	15096.84721	2.46846	299.46846	150.96846	15096.84600	2020-01-01	2020-01-02	2020-01-01 00:13:42	2020-01-02 03:42:03	2020-01-01 00:13:42.000	2020-01-02 03:42:03.000	822	99723	50272.5	5027250	822	99723	50272.5	5027250	-32746	32189	4397.3	439730	-128	127	-3.34	-334
-823	100	10813	99724	2.47147	299.47147	150.97147	15097.14714	2.47147	299.47147	150.97146	15097.14686	2.47147	299.47147	150.97147	15097.14700	2020-01-01	2020-01-02	2020-01-01 00:13:43	2020-01-02 03:42:04	2020-01-01 00:13:43.000	2020-01-02 03:42:04.000	823	99724	50273.5	5027350	823	99724	50273.5	5027350	-32745	32190	4398.3	439830	-128	123	-4.9	-490
-824	100	10814	99725	2.47447	299.47447	150.97447	15097.44744	2.47447	299.4745	150.97447	15097.44749	2.47447	299.47447	150.97447	15097.44700	2020-01-01	2020-01-02	2020-01-01 00:13:44	2020-01-02 03:42:05	2020-01-01 00:13:44.000	2020-01-02 03:42:05.000	824	99725	50274.5	5027450	824	99725	50274.5	5027450	-32744	32191	4399.3	439930	-127	124	-3.9	-390
-825	100	10815	99726	2.47747	299.47747	150.97747	15097.74774	2.47747	299.47748	150.97747	15097.74779	2.47747	299.47747	150.97746999999998	15097.74700	2020-01-01	2020-01-02	2020-01-01 00:13:45	2020-01-02 03:42:06	2020-01-01 00:13:45.000	2020-01-02 03:42:06.000	825	99726	50275.5	5027550	825	99726	50275.5	5027550	-32743	32192	4400.3	440030	-126	125	-2.9	-290
-826	100	10816	99727	2.48048	299.48048	150.98048	15098.04804	2.48048	299.48047	150.98048	15098.04809	2.48048	299.48048	150.98048	15098.04800	2020-01-01	2020-01-02	2020-01-01 00:13:46	2020-01-02 03:42:07	2020-01-01 00:13:46.000	2020-01-02 03:42:07.000	826	99727	50276.5	5027650	826	99727	50276.5	5027650	-32742	32193	4401.3	440130	-125	126	-1.9	-190
-827	100	10817	99728	2.48348	299.48348	150.98348	15098.34834	2.48348	299.4835	150.98348	15098.34869	2.48348	299.48348	150.98348	15098.34800	2020-01-01	2020-01-02	2020-01-01 00:13:47	2020-01-02 03:42:08	2020-01-01 00:13:47.000	2020-01-02 03:42:08.000	827	99728	50277.5	5027750	827	99728	50277.5	5027750	-32741	32194	4402.3	440230	-124	127	-0.9	-90
-828	100	10818	99729	2.48648	299.48648	150.98648	15098.64864	2.48648	299.48648	150.98648	15098.64837	2.48648	299.48648	150.98648	15098.64800	2020-01-01	2020-01-02	2020-01-01 00:13:48	2020-01-02 03:42:09	2020-01-01 00:13:48.000	2020-01-02 03:42:09.000	828	99729	50278.5	5027850	828	99729	50278.5	5027850	-32740	32195	4403.3	440330	-128	127	-2.46	-246
-829	100	10819	99730	2.48948	299.48948	150.98948	15098.94894	2.48948	299.4895	150.98948	15098.94896	2.48948	299.48948	150.98948000000001	15098.94800	2020-01-01	2020-01-02	2020-01-01 00:13:49	2020-01-02 03:42:10	2020-01-01 00:13:49.000	2020-01-02 03:42:10.000	829	99730	50279.5	5027950	829	99730	50279.5	5027950	-32739	32196	4404.3	440430	-128	123	-4.02	-402
+820	100	10810	99721	2.46246	299.46246	150.96246	15096.24624	2.46246	299.46246	150.96246	15096.24633	2.46246	299.46246	150.96246	15096.246	2020-01-01	2020-01-02	2020-01-01 00:13:40	2020-01-02 03:42:01	2020-01-01 00:13:40.000	2020-01-02 03:42:01.000	820	99721	50270.5	5027050	820	99721	50270.5	5027050	-32748	32187	4395.3	439530	-125	126	-2.78	-278
+821	100	10811	99722	2.46546	299.46546	150.96546	15096.54654	2.46546	299.46545	150.96546	15096.54646	2.46546	299.46546	150.96546	15096.546	2020-01-01	2020-01-02	2020-01-01 00:13:41	2020-01-02 03:42:02	2020-01-01 00:13:41.000	2020-01-02 03:42:02.000	821	99722	50271.5	5027150	821	99722	50271.5	5027150	-32747	32188	4396.3	439630	-124	127	-1.78	-178
+822	100	10812	99723	2.46846	299.46846	150.96846	15096.84684	2.46846	299.46848	150.96847	15096.84721	2.46846	299.46846	150.96846	15096.846	2020-01-01	2020-01-02	2020-01-01 00:13:42	2020-01-02 03:42:03	2020-01-01 00:13:42.000	2020-01-02 03:42:03.000	822	99723	50272.5	5027250	822	99723	50272.5	5027250	-32746	32189	4397.3	439730	-128	127	-3.34	-334
+823	100	10813	99724	2.47147	299.47147	150.97147	15097.14714	2.47147	299.47147	150.97146	15097.14686	2.47147	299.47147	150.97147	15097.147	2020-01-01	2020-01-02	2020-01-01 00:13:43	2020-01-02 03:42:04	2020-01-01 00:13:43.000	2020-01-02 03:42:04.000	823	99724	50273.5	5027350	823	99724	50273.5	5027350	-32745	32190	4398.3	439830	-128	123	-4.9	-490
+824	100	10814	99725	2.47447	299.47447	150.97447	15097.44744	2.47447	299.4745	150.97447	15097.44749	2.47447	299.47447	150.97447	15097.447	2020-01-01	2020-01-02	2020-01-01 00:13:44	2020-01-02 03:42:05	2020-01-01 00:13:44.000	2020-01-02 03:42:05.000	824	99725	50274.5	5027450	824	99725	50274.5	5027450	-32744	32191	4399.3	439930	-127	124	-3.9	-390
+825	100	10815	99726	2.47747	299.47747	150.97747	15097.74774	2.47747	299.47748	150.97747	15097.74779	2.47747	299.47747	150.97746999999998	15097.747	2020-01-01	2020-01-02	2020-01-01 00:13:45	2020-01-02 03:42:06	2020-01-01 00:13:45.000	2020-01-02 03:42:06.000	825	99726	50275.5	5027550	825	99726	50275.5	5027550	-32743	32192	4400.3	440030	-126	125	-2.9	-290
+826	100	10816	99727	2.48048	299.48048	150.98048	15098.04804	2.48048	299.48047	150.98048	15098.04809	2.48048	299.48048	150.98048	15098.048	2020-01-01	2020-01-02	2020-01-01 00:13:46	2020-01-02 03:42:07	2020-01-01 00:13:46.000	2020-01-02 03:42:07.000	826	99727	50276.5	5027650	826	99727	50276.5	5027650	-32742	32193	4401.3	440130	-125	126	-1.9	-190
+827	100	10817	99728	2.48348	299.48348	150.98348	15098.34834	2.48348	299.4835	150.98348	15098.34869	2.48348	299.48348	150.98348	15098.348	2020-01-01	2020-01-02	2020-01-01 00:13:47	2020-01-02 03:42:08	2020-01-01 00:13:47.000	2020-01-02 03:42:08.000	827	99728	50277.5	5027750	827	99728	50277.5	5027750	-32741	32194	4402.3	440230	-124	127	-0.9	-90
+828	100	10818	99729	2.48648	299.48648	150.98648	15098.64864	2.48648	299.48648	150.98648	15098.64837	2.48648	299.48648	150.98648	15098.648	2020-01-01	2020-01-02	2020-01-01 00:13:48	2020-01-02 03:42:09	2020-01-01 00:13:48.000	2020-01-02 03:42:09.000	828	99729	50278.5	5027850	828	99729	50278.5	5027850	-32740	32195	4403.3	440330	-128	127	-2.46	-246
+829	100	10819	99730	2.48948	299.48948	150.98948	15098.94894	2.48948	299.4895	150.98948	15098.94896	2.48948	299.48948	150.98948000000001	15098.948	2020-01-01	2020-01-02	2020-01-01 00:13:49	2020-01-02 03:42:10	2020-01-01 00:13:49.000	2020-01-02 03:42:10.000	829	99730	50279.5	5027950	829	99730	50279.5	5027950	-32739	32196	4404.3	440430	-128	123	-4.02	-402
 83	102	10073	99983	0.24924	300.24924	150.24924	15175.17417	0.24924	300.24924	150.24924	15175.17417	0.24924	300.24924	150.24924000000001	15175.17324	2020-01-01	2020-01-02	2020-01-01 00:01:23	2020-01-02 03:46:23	2020-01-01 00:01:23.000	2020-01-02 03:46:23.000	83	99983	50033	5053333	83	99983	50033	5053333	-32486	32449	4612.009900990099	465813	-125	126	-1.0594059405940595	-107
-830	100	10820	99731	2.49249	299.49249	150.99249	15099.24924	2.49249	299.4925	150.99249	15099.24926	2.49249	299.49249	150.99249	15099.24900	2020-01-01	2020-01-02	2020-01-01 00:13:50	2020-01-02 03:42:11	2020-01-01 00:13:50.000	2020-01-02 03:42:11.000	830	99731	50280.5	5028050	830	99731	50280.5	5028050	-32738	32197	4405.3	440530	-127	124	-3.02	-302
-831	100	10821	99732	2.49549	299.49549	150.99549	15099.54954	2.49549	299.49548	150.99549	15099.54956	2.49549	299.49549	150.99549000000002	15099.54900	2020-01-01	2020-01-02	2020-01-01 00:13:51	2020-01-02 03:42:12	2020-01-01 00:13:51.000	2020-01-02 03:42:12.000	831	99732	50281.5	5028150	831	99732	50281.5	5028150	-32737	32198	4406.3	440630	-126	125	-2.02	-202
-832	100	10822	99733	2.49849	299.49849	150.99849	15099.84984	2.49849	299.4985	150.9985	15099.85016	2.49849	299.49849	150.99849	15099.84900	2020-01-01	2020-01-02	2020-01-01 00:13:52	2020-01-02 03:42:13	2020-01-01 00:13:52.000	2020-01-02 03:42:13.000	832	99733	50282.5	5028250	832	99733	50282.5	5028250	-32736	32199	4407.3	440730	-125	126	-1.02	-102
-833	100	10823	99734	2.5015	299.5015	151.0015	15100.15015	2.5015	299.5015	151.00149	15100.14983	2.50150	299.50150	151.0015	15100.15000	2020-01-01	2020-01-02	2020-01-01 00:13:53	2020-01-02 03:42:14	2020-01-01 00:13:53.000	2020-01-02 03:42:14.000	833	99734	50283.5	5028350	833	99734	50283.5	5028350	-32735	32200	4408.3	440830	-124	127	-0.02	-2
-834	100	10824	99735	2.5045	299.5045	151.0045	15100.45045	2.5045	299.50452	151.0045	15100.45043	2.50450	299.50450	151.0045	15100.45000	2020-01-01	2020-01-02	2020-01-01 00:13:54	2020-01-02 03:42:15	2020-01-01 00:13:54.000	2020-01-02 03:42:15.000	834	99735	50284.5	5028450	834	99735	50284.5	5028450	-32734	32201	4409.3	440930	-128	127	-1.58	-158
-835	100	10825	99736	2.5075	299.5075	151.0075	15100.75075	2.5075	299.5075	151.0075	15100.75073	2.50750	299.50750	151.0075	15100.75000	2020-01-01	2020-01-02	2020-01-01 00:13:55	2020-01-02 03:42:16	2020-01-01 00:13:55.000	2020-01-02 03:42:16.000	835	99736	50285.5	5028550	835	99736	50285.5	5028550	-32733	32202	4410.3	441030	-128	123	-3.14	-314
-836	100	10826	99737	2.51051	299.51051	151.01051	15101.05105	2.51051	299.5105	151.01051	15101.05103	2.51051	299.51051	151.01050999999998	15101.05100	2020-01-01	2020-01-02	2020-01-01 00:13:56	2020-01-02 03:42:17	2020-01-01 00:13:56.000	2020-01-02 03:42:17.000	836	99737	50286.5	5028650	836	99737	50286.5	5028650	-32732	32203	4411.3	441130	-127	124	-2.14	-214
-837	100	10827	99738	2.51351	299.51351	151.01351	15101.35135	2.51351	299.51352	151.01351	15101.35162	2.51351	299.51351	151.01351	15101.35100	2020-01-01	2020-01-02	2020-01-01 00:13:57	2020-01-02 03:42:18	2020-01-01 00:13:57.000	2020-01-02 03:42:18.000	837	99738	50287.5	5028750	837	99738	50287.5	5028750	-32731	32204	4412.3	441230	-126	125	-1.14	-114
-838	100	10828	99739	2.51651	299.51651	151.01651	15101.65165	2.51651	299.5165	151.01651	15101.6513	2.51651	299.51651	151.01651	15101.65100	2020-01-01	2020-01-02	2020-01-01 00:13:58	2020-01-02 03:42:19	2020-01-01 00:13:58.000	2020-01-02 03:42:19.000	838	99739	50288.5	5028850	838	99739	50288.5	5028850	-32730	32205	4413.3	441330	-125	126	-0.14	-14
-839	100	10829	99740	2.51951	299.51951	151.01951	15101.95195	2.51951	299.51953	151.01951	15101.9519	2.51951	299.51951	151.01951	15101.95100	2020-01-01	2020-01-02	2020-01-01 00:13:59	2020-01-02 03:42:20	2020-01-01 00:13:59.000	2020-01-02 03:42:20.000	839	99740	50289.5	5028950	839	99740	50289.5	5028950	-32729	32206	4414.3	441430	-124	127	0.86	86
+830	100	10820	99731	2.49249	299.49249	150.99249	15099.24924	2.49249	299.4925	150.99249	15099.24926	2.49249	299.49249	150.99249	15099.249	2020-01-01	2020-01-02	2020-01-01 00:13:50	2020-01-02 03:42:11	2020-01-01 00:13:50.000	2020-01-02 03:42:11.000	830	99731	50280.5	5028050	830	99731	50280.5	5028050	-32738	32197	4405.3	440530	-127	124	-3.02	-302
+831	100	10821	99732	2.49549	299.49549	150.99549	15099.54954	2.49549	299.49548	150.99549	15099.54956	2.49549	299.49549	150.99549000000002	15099.549	2020-01-01	2020-01-02	2020-01-01 00:13:51	2020-01-02 03:42:12	2020-01-01 00:13:51.000	2020-01-02 03:42:12.000	831	99732	50281.5	5028150	831	99732	50281.5	5028150	-32737	32198	4406.3	440630	-126	125	-2.02	-202
+832	100	10822	99733	2.49849	299.49849	150.99849	15099.84984	2.49849	299.4985	150.9985	15099.85016	2.49849	299.49849	150.99849	15099.849	2020-01-01	2020-01-02	2020-01-01 00:13:52	2020-01-02 03:42:13	2020-01-01 00:13:52.000	2020-01-02 03:42:13.000	832	99733	50282.5	5028250	832	99733	50282.5	5028250	-32736	32199	4407.3	440730	-125	126	-1.02	-102
+833	100	10823	99734	2.5015	299.5015	151.0015	15100.15015	2.5015	299.5015	151.00149	15100.14983	2.5015	299.5015	151.0015	15100.15	2020-01-01	2020-01-02	2020-01-01 00:13:53	2020-01-02 03:42:14	2020-01-01 00:13:53.000	2020-01-02 03:42:14.000	833	99734	50283.5	5028350	833	99734	50283.5	5028350	-32735	32200	4408.3	440830	-124	127	-0.02	-2
+834	100	10824	99735	2.5045	299.5045	151.0045	15100.45045	2.5045	299.50452	151.0045	15100.45043	2.5045	299.5045	151.0045	15100.45	2020-01-01	2020-01-02	2020-01-01 00:13:54	2020-01-02 03:42:15	2020-01-01 00:13:54.000	2020-01-02 03:42:15.000	834	99735	50284.5	5028450	834	99735	50284.5	5028450	-32734	32201	4409.3	440930	-128	127	-1.58	-158
+835	100	10825	99736	2.5075	299.5075	151.0075	15100.75075	2.5075	299.5075	151.0075	15100.75073	2.5075	299.5075	151.0075	15100.75	2020-01-01	2020-01-02	2020-01-01 00:13:55	2020-01-02 03:42:16	2020-01-01 00:13:55.000	2020-01-02 03:42:16.000	835	99736	50285.5	5028550	835	99736	50285.5	5028550	-32733	32202	4410.3	441030	-128	123	-3.14	-314
+836	100	10826	99737	2.51051	299.51051	151.01051	15101.05105	2.51051	299.5105	151.01051	15101.05103	2.51051	299.51051	151.01050999999998	15101.051	2020-01-01	2020-01-02	2020-01-01 00:13:56	2020-01-02 03:42:17	2020-01-01 00:13:56.000	2020-01-02 03:42:17.000	836	99737	50286.5	5028650	836	99737	50286.5	5028650	-32732	32203	4411.3	441130	-127	124	-2.14	-214
+837	100	10827	99738	2.51351	299.51351	151.01351	15101.35135	2.51351	299.51352	151.01351	15101.35162	2.51351	299.51351	151.01351	15101.351	2020-01-01	2020-01-02	2020-01-01 00:13:57	2020-01-02 03:42:18	2020-01-01 00:13:57.000	2020-01-02 03:42:18.000	837	99738	50287.5	5028750	837	99738	50287.5	5028750	-32731	32204	4412.3	441230	-126	125	-1.14	-114
+838	100	10828	99739	2.51651	299.51651	151.01651	15101.65165	2.51651	299.5165	151.01651	15101.6513	2.51651	299.51651	151.01651	15101.651	2020-01-01	2020-01-02	2020-01-01 00:13:58	2020-01-02 03:42:19	2020-01-01 00:13:58.000	2020-01-02 03:42:19.000	838	99739	50288.5	5028850	838	99739	50288.5	5028850	-32730	32205	4413.3	441330	-125	126	-0.14	-14
+839	100	10829	99740	2.51951	299.51951	151.01951	15101.95195	2.51951	299.51953	151.01951	15101.9519	2.51951	299.51951	151.01951	15101.951	2020-01-01	2020-01-02	2020-01-01 00:13:59	2020-01-02 03:42:20	2020-01-01 00:13:59.000	2020-01-02 03:42:20.000	839	99740	50289.5	5028950	839	99740	50289.5	5028950	-32729	32206	4414.3	441430	-124	127	0.86	86
 84	102	10074	99984	0.25225	300.25225	150.25225	15175.47747	0.25225	300.25226	150.25225	15175.47778	0.25225	300.25225	150.25225	15175.47725	2020-01-01	2020-01-02	2020-01-01 00:01:24	2020-01-02 03:46:24	2020-01-01 00:01:24.000	2020-01-02 03:46:24.000	84	99984	50034	5053434	84	99984	50034	5053434	-32485	32450	4613.009900990099	465914	-124	127	-0.0594059405940594	-6
-840	100	10830	99741	2.52252	299.52252	151.02252	15102.25225	2.52252	299.52252	151.02252	15102.2522	2.52252	299.52252	151.02252000000001	15102.25200	2020-01-01	2020-01-02	2020-01-01 00:14:00	2020-01-02 03:42:21	2020-01-01 00:14:00.000	2020-01-02 03:42:21.000	840	99741	50290.5	5029050	840	99741	50290.5	5029050	-32728	32207	4415.3	441530	-128	127	-0.7	-70
-841	100	10831	99742	2.52552	299.52552	151.02552	15102.55255	2.52552	299.5255	151.02552	15102.5525	2.52552	299.52552	151.02552	15102.55200	2020-01-01	2020-01-02	2020-01-01 00:14:01	2020-01-02 03:42:22	2020-01-01 00:14:01.000	2020-01-02 03:42:22.000	841	99742	50291.5	5029150	841	99742	50291.5	5029150	-32727	32208	4416.3	441630	-128	127	-2.26	-226
-842	100	10832	99743	2.52852	299.52852	151.02852	15102.85285	2.52852	299.52853	151.02853	15102.85313	2.52852	299.52852	151.02852000000001	15102.85200	2020-01-01	2020-01-02	2020-01-01 00:14:02	2020-01-02 03:42:23	2020-01-01 00:14:02.000	2020-01-02 03:42:23.000	842	99743	50292.5	5029250	842	99743	50292.5	5029250	-32726	32209	4417.3	441730	-128	123	-3.82	-382
-843	100	10833	99744	2.53153	299.53153	151.03153	15103.15315	2.53153	299.53152	151.03152	15103.15278	2.53153	299.53153	151.03153	15103.15300	2020-01-01	2020-01-02	2020-01-01 00:14:03	2020-01-02 03:42:24	2020-01-01 00:14:03.000	2020-01-02 03:42:24.000	843	99744	50293.5	5029350	843	99744	50293.5	5029350	-32725	32210	4418.3	441830	-127	124	-2.82	-282
-844	100	10834	99745	2.53453	299.53453	151.03453	15103.45345	2.53453	299.53455	151.03453	15103.45353	2.53453	299.53453	151.03453	15103.45300	2020-01-01	2020-01-02	2020-01-01 00:14:04	2020-01-02 03:42:25	2020-01-01 00:14:04.000	2020-01-02 03:42:25.000	844	99745	50294.5	5029450	844	99745	50294.5	5029450	-32724	32211	4419.3	441930	-126	125	-1.82	-182
-845	100	10835	99746	2.53753	299.53753	151.03753	15103.75375	2.53753	299.53754	151.03753	15103.75366	2.53753	299.53753	151.03753	15103.75300	2020-01-01	2020-01-02	2020-01-01 00:14:05	2020-01-02 03:42:26	2020-01-01 00:14:05.000	2020-01-02 03:42:26.000	845	99746	50295.5	5029550	845	99746	50295.5	5029550	-32723	32212	4420.3	442030	-125	126	-0.82	-82
-846	100	10836	99747	2.54054	299.54054	151.04054	15104.05405	2.54054	299.54053	151.04053	15104.05397	2.54054	299.54054	151.04054	15104.05400	2020-01-01	2020-01-02	2020-01-01 00:14:06	2020-01-02 03:42:27	2020-01-01 00:14:06.000	2020-01-02 03:42:27.000	846	99747	50296.5	5029650	846	99747	50296.5	5029650	-32722	32213	4421.3	442130	-124	127	0.18	18
-847	100	10837	99748	2.54354	299.54354	151.04354	15104.35435	2.54354	299.54355	151.04354	15104.3546	2.54354	299.54354	151.04354	15104.35400	2020-01-01	2020-01-02	2020-01-01 00:14:07	2020-01-02 03:42:28	2020-01-01 00:14:07.000	2020-01-02 03:42:28.000	847	99748	50297.5	5029750	847	99748	50297.5	5029750	-32721	32214	4422.3	442230	-128	127	-1.38	-138
-848	100	10838	99749	2.54654	299.54654	151.04654	15104.65465	2.54654	299.54654	151.04654	15104.65425	2.54654	299.54654	151.04654	15104.65400	2020-01-01	2020-01-02	2020-01-01 00:14:08	2020-01-02 03:42:29	2020-01-01 00:14:08.000	2020-01-02 03:42:29.000	848	99749	50298.5	5029850	848	99749	50298.5	5029850	-32720	32215	4423.3	442330	-128	123	-2.94	-294
-849	100	10839	99750	2.54954	299.54954	151.04954	15104.95495	2.54954	299.54956	151.04954	15104.95499	2.54954	299.54954	151.04954	15104.95400	2020-01-01	2020-01-02	2020-01-01 00:14:09	2020-01-02 03:42:30	2020-01-01 00:14:09.000	2020-01-02 03:42:30.000	849	99750	50299.5	5029950	849	99750	50299.5	5029950	-32719	32216	4424.3	442430	-127	124	-1.94	-194
+840	100	10830	99741	2.52252	299.52252	151.02252	15102.25225	2.52252	299.52252	151.02252	15102.2522	2.52252	299.52252	151.02252000000001	15102.252	2020-01-01	2020-01-02	2020-01-01 00:14:00	2020-01-02 03:42:21	2020-01-01 00:14:00.000	2020-01-02 03:42:21.000	840	99741	50290.5	5029050	840	99741	50290.5	5029050	-32728	32207	4415.3	441530	-128	127	-0.7	-70
+841	100	10831	99742	2.52552	299.52552	151.02552	15102.55255	2.52552	299.5255	151.02552	15102.5525	2.52552	299.52552	151.02552	15102.552	2020-01-01	2020-01-02	2020-01-01 00:14:01	2020-01-02 03:42:22	2020-01-01 00:14:01.000	2020-01-02 03:42:22.000	841	99742	50291.5	5029150	841	99742	50291.5	5029150	-32727	32208	4416.3	441630	-128	127	-2.26	-226
+842	100	10832	99743	2.52852	299.52852	151.02852	15102.85285	2.52852	299.52853	151.02853	15102.85313	2.52852	299.52852	151.02852000000001	15102.852	2020-01-01	2020-01-02	2020-01-01 00:14:02	2020-01-02 03:42:23	2020-01-01 00:14:02.000	2020-01-02 03:42:23.000	842	99743	50292.5	5029250	842	99743	50292.5	5029250	-32726	32209	4417.3	441730	-128	123	-3.82	-382
+843	100	10833	99744	2.53153	299.53153	151.03153	15103.15315	2.53153	299.53152	151.03152	15103.15278	2.53153	299.53153	151.03153	15103.153	2020-01-01	2020-01-02	2020-01-01 00:14:03	2020-01-02 03:42:24	2020-01-01 00:14:03.000	2020-01-02 03:42:24.000	843	99744	50293.5	5029350	843	99744	50293.5	5029350	-32725	32210	4418.3	441830	-127	124	-2.82	-282
+844	100	10834	99745	2.53453	299.53453	151.03453	15103.45345	2.53453	299.53455	151.03453	15103.45353	2.53453	299.53453	151.03453	15103.453	2020-01-01	2020-01-02	2020-01-01 00:14:04	2020-01-02 03:42:25	2020-01-01 00:14:04.000	2020-01-02 03:42:25.000	844	99745	50294.5	5029450	844	99745	50294.5	5029450	-32724	32211	4419.3	441930	-126	125	-1.82	-182
+845	100	10835	99746	2.53753	299.53753	151.03753	15103.75375	2.53753	299.53754	151.03753	15103.75366	2.53753	299.53753	151.03753	15103.753	2020-01-01	2020-01-02	2020-01-01 00:14:05	2020-01-02 03:42:26	2020-01-01 00:14:05.000	2020-01-02 03:42:26.000	845	99746	50295.5	5029550	845	99746	50295.5	5029550	-32723	32212	4420.3	442030	-125	126	-0.82	-82
+846	100	10836	99747	2.54054	299.54054	151.04054	15104.05405	2.54054	299.54053	151.04053	15104.05397	2.54054	299.54054	151.04054	15104.054	2020-01-01	2020-01-02	2020-01-01 00:14:06	2020-01-02 03:42:27	2020-01-01 00:14:06.000	2020-01-02 03:42:27.000	846	99747	50296.5	5029650	846	99747	50296.5	5029650	-32722	32213	4421.3	442130	-124	127	0.18	18
+847	100	10837	99748	2.54354	299.54354	151.04354	15104.35435	2.54354	299.54355	151.04354	15104.3546	2.54354	299.54354	151.04354	15104.354	2020-01-01	2020-01-02	2020-01-01 00:14:07	2020-01-02 03:42:28	2020-01-01 00:14:07.000	2020-01-02 03:42:28.000	847	99748	50297.5	5029750	847	99748	50297.5	5029750	-32721	32214	4422.3	442230	-128	127	-1.38	-138
+848	100	10838	99749	2.54654	299.54654	151.04654	15104.65465	2.54654	299.54654	151.04654	15104.65425	2.54654	299.54654	151.04654	15104.654	2020-01-01	2020-01-02	2020-01-01 00:14:08	2020-01-02 03:42:29	2020-01-01 00:14:08.000	2020-01-02 03:42:29.000	848	99749	50298.5	5029850	848	99749	50298.5	5029850	-32720	32215	4423.3	442330	-128	123	-2.94	-294
+849	100	10839	99750	2.54954	299.54954	151.04954	15104.95495	2.54954	299.54956	151.04954	15104.95499	2.54954	299.54954	151.04954	15104.954	2020-01-01	2020-01-02	2020-01-01 00:14:09	2020-01-02 03:42:30	2020-01-01 00:14:09.000	2020-01-02 03:42:30.000	849	99750	50299.5	5029950	849	99750	50299.5	5029950	-32719	32216	4424.3	442430	-127	124	-1.94	-194
 85	102	10075	99985	0.25525	300.25525	150.25525	15175.78078	0.25525	300.25525	150.25525	15175.78046	0.25525	300.25525	150.25525	15175.78025	2020-01-01	2020-01-02	2020-01-01 00:01:25	2020-01-02 03:46:25	2020-01-01 00:01:25.000	2020-01-02 03:46:25.000	85	99985	50035	5053535	85	99985	50035	5053535	-32484	32451	4614.009900990099	466015	-128	127	-1.5940594059405941	-161
-850	100	10840	99751	2.55255	299.55255	151.05255	15105.25525	2.55255	299.55255	151.05255	15105.25514	2.55255	299.55255	151.05255	15105.25500	2020-01-01	2020-01-02	2020-01-01 00:14:10	2020-01-02 03:42:31	2020-01-01 00:14:10.000	2020-01-02 03:42:31.000	850	99751	50300.5	5030050	850	99751	50300.5	5030050	-32718	32217	4425.3	442530	-126	125	-0.94	-94
-851	100	10841	99752	2.55555	299.55555	151.05555	15105.55555	2.55555	299.55554	151.05555	15105.55547	2.55555	299.55555	151.05555	15105.55500	2020-01-01	2020-01-02	2020-01-01 00:14:11	2020-01-02 03:42:32	2020-01-01 00:14:11.000	2020-01-02 03:42:32.000	851	99752	50301.5	5030150	851	99752	50301.5	5030150	-32717	32218	4426.3	442630	-125	126	0.06	6
-852	100	10842	99753	2.55855	299.55855	151.05855	15105.85585	2.55855	299.55856	151.05856	15105.85607	2.55855	299.55855	151.05855	15105.85500	2020-01-01	2020-01-02	2020-01-01 00:14:12	2020-01-02 03:42:33	2020-01-01 00:14:12.000	2020-01-02 03:42:33.000	852	99753	50302.5	5030250	852	99753	50302.5	5030250	-32716	32219	4427.3	442730	-124	127	1.06	106
-853	100	10843	99754	2.56156	299.56156	151.06156	15106.15615	2.56156	299.56155	151.06155	15106.15571	2.56156	299.56156	151.06156000000001	15106.15600	2020-01-01	2020-01-02	2020-01-01 00:14:13	2020-01-02 03:42:34	2020-01-01 00:14:13.000	2020-01-02 03:42:34.000	853	99754	50303.5	5030350	853	99754	50303.5	5030350	-32715	32220	4428.3	442830	-128	127	-0.5	-50
-854	100	10844	99755	2.56456	299.56456	151.06456	15106.45645	2.56456	299.56458	151.06456	15106.45646	2.56456	299.56456	151.06456	15106.45600	2020-01-01	2020-01-02	2020-01-01 00:14:14	2020-01-02 03:42:35	2020-01-01 00:14:14.000	2020-01-02 03:42:35.000	854	99755	50304.5	5030450	854	99755	50304.5	5030450	-32714	32221	4429.3	442930	-128	123	-2.06	-206
-855	100	10845	99756	2.56756	299.56756	151.06756	15106.75675	2.56756	299.56757	151.06756	15106.75661	2.56756	299.56756	151.06756	15106.75600	2020-01-01	2020-01-02	2020-01-01 00:14:15	2020-01-02 03:42:36	2020-01-01 00:14:15.000	2020-01-02 03:42:36.000	855	99756	50305.5	5030550	855	99756	50305.5	5030550	-32713	32222	4430.3	443030	-127	124	-1.06	-106
-856	100	10846	99757	2.57057	299.57057	151.07057	15107.05705	2.57057	299.57056	151.07056	15107.05694	2.57057	299.57057	151.07057	15107.05700	2020-01-01	2020-01-02	2020-01-01 00:14:16	2020-01-02 03:42:37	2020-01-01 00:14:16.000	2020-01-02 03:42:37.000	856	99757	50306.5	5030650	856	99757	50306.5	5030650	-32712	32223	4431.3	443130	-126	125	-0.06	-6
-857	100	10847	99758	2.57357	299.57357	151.07357	15107.35735	2.57357	299.57358	151.07357	15107.35754	2.57357	299.57357	151.07357	15107.35700	2020-01-01	2020-01-02	2020-01-01 00:14:17	2020-01-02 03:42:38	2020-01-01 00:14:17.000	2020-01-02 03:42:38.000	857	99758	50307.5	5030750	857	99758	50307.5	5030750	-32711	32224	4432.3	443230	-125	126	0.94	94
-858	100	10848	99759	2.57657	299.57657	151.07657	15107.65765	2.57657	299.57657	151.07657	15107.65783	2.57657	299.57657	151.07657	15107.65700	2020-01-01	2020-01-02	2020-01-01 00:14:18	2020-01-02 03:42:39	2020-01-01 00:14:18.000	2020-01-02 03:42:39.000	858	99759	50308.5	5030850	858	99759	50308.5	5030850	-32710	32225	4433.3	443330	-124	127	1.94	194
-859	100	10849	99760	2.57957	299.57957	151.07957	15107.95795	2.57957	299.5796	151.07957	15107.95794	2.57957	299.57957	151.07957	15107.95700	2020-01-01	2020-01-02	2020-01-01 00:14:19	2020-01-02 03:42:40	2020-01-01 00:14:19.000	2020-01-02 03:42:40.000	859	99760	50309.5	5030950	859	99760	50309.5	5030950	-32709	32226	4434.3	443430	-128	127	0.38	38
+850	100	10840	99751	2.55255	299.55255	151.05255	15105.25525	2.55255	299.55255	151.05255	15105.25514	2.55255	299.55255	151.05255	15105.255	2020-01-01	2020-01-02	2020-01-01 00:14:10	2020-01-02 03:42:31	2020-01-01 00:14:10.000	2020-01-02 03:42:31.000	850	99751	50300.5	5030050	850	99751	50300.5	5030050	-32718	32217	4425.3	442530	-126	125	-0.94	-94
+851	100	10841	99752	2.55555	299.55555	151.05555	15105.55555	2.55555	299.55554	151.05555	15105.55547	2.55555	299.55555	151.05555	15105.555	2020-01-01	2020-01-02	2020-01-01 00:14:11	2020-01-02 03:42:32	2020-01-01 00:14:11.000	2020-01-02 03:42:32.000	851	99752	50301.5	5030150	851	99752	50301.5	5030150	-32717	32218	4426.3	442630	-125	126	0.06	6
+852	100	10842	99753	2.55855	299.55855	151.05855	15105.85585	2.55855	299.55856	151.05856	15105.85607	2.55855	299.55855	151.05855	15105.855	2020-01-01	2020-01-02	2020-01-01 00:14:12	2020-01-02 03:42:33	2020-01-01 00:14:12.000	2020-01-02 03:42:33.000	852	99753	50302.5	5030250	852	99753	50302.5	5030250	-32716	32219	4427.3	442730	-124	127	1.06	106
+853	100	10843	99754	2.56156	299.56156	151.06156	15106.15615	2.56156	299.56155	151.06155	15106.15571	2.56156	299.56156	151.06156000000001	15106.156	2020-01-01	2020-01-02	2020-01-01 00:14:13	2020-01-02 03:42:34	2020-01-01 00:14:13.000	2020-01-02 03:42:34.000	853	99754	50303.5	5030350	853	99754	50303.5	5030350	-32715	32220	4428.3	442830	-128	127	-0.5	-50
+854	100	10844	99755	2.56456	299.56456	151.06456	15106.45645	2.56456	299.56458	151.06456	15106.45646	2.56456	299.56456	151.06456	15106.456	2020-01-01	2020-01-02	2020-01-01 00:14:14	2020-01-02 03:42:35	2020-01-01 00:14:14.000	2020-01-02 03:42:35.000	854	99755	50304.5	5030450	854	99755	50304.5	5030450	-32714	32221	4429.3	442930	-128	123	-2.06	-206
+855	100	10845	99756	2.56756	299.56756	151.06756	15106.75675	2.56756	299.56757	151.06756	15106.75661	2.56756	299.56756	151.06756	15106.756	2020-01-01	2020-01-02	2020-01-01 00:14:15	2020-01-02 03:42:36	2020-01-01 00:14:15.000	2020-01-02 03:42:36.000	855	99756	50305.5	5030550	855	99756	50305.5	5030550	-32713	32222	4430.3	443030	-127	124	-1.06	-106
+856	100	10846	99757	2.57057	299.57057	151.07057	15107.05705	2.57057	299.57056	151.07056	15107.05694	2.57057	299.57057	151.07057	15107.057	2020-01-01	2020-01-02	2020-01-01 00:14:16	2020-01-02 03:42:37	2020-01-01 00:14:16.000	2020-01-02 03:42:37.000	856	99757	50306.5	5030650	856	99757	50306.5	5030650	-32712	32223	4431.3	443130	-126	125	-0.06	-6
+857	100	10847	99758	2.57357	299.57357	151.07357	15107.35735	2.57357	299.57358	151.07357	15107.35754	2.57357	299.57357	151.07357	15107.357	2020-01-01	2020-01-02	2020-01-01 00:14:17	2020-01-02 03:42:38	2020-01-01 00:14:17.000	2020-01-02 03:42:38.000	857	99758	50307.5	5030750	857	99758	50307.5	5030750	-32711	32224	4432.3	443230	-125	126	0.94	94
+858	100	10848	99759	2.57657	299.57657	151.07657	15107.65765	2.57657	299.57657	151.07657	15107.65783	2.57657	299.57657	151.07657	15107.657	2020-01-01	2020-01-02	2020-01-01 00:14:18	2020-01-02 03:42:39	2020-01-01 00:14:18.000	2020-01-02 03:42:39.000	858	99759	50308.5	5030850	858	99759	50308.5	5030850	-32710	32225	4433.3	443330	-124	127	1.94	194
+859	100	10849	99760	2.57957	299.57957	151.07957	15107.95795	2.57957	299.5796	151.07957	15107.95794	2.57957	299.57957	151.07957	15107.957	2020-01-01	2020-01-02	2020-01-01 00:14:19	2020-01-02 03:42:40	2020-01-01 00:14:19.000	2020-01-02 03:42:40.000	859	99760	50309.5	5030950	859	99760	50309.5	5030950	-32709	32226	4434.3	443430	-128	127	0.38	38
 86	102	10076	99986	0.25825	300.25825	150.25825	15176.08408	0.25825	300.25827	150.25825	15176.08406	0.25825	300.25825	150.25825	15176.08325	2020-01-01	2020-01-02	2020-01-01 00:01:26	2020-01-02 03:46:26	2020-01-01 00:01:26.000	2020-01-02 03:46:26.000	86	99986	50036	5053636	86	99986	50036	5053636	-32483	32452	4615.009900990099	466116	-128	123	-3.128712871287129	-316
-860	100	10850	99761	2.58258	299.58258	151.08258	15108.25825	2.58258	299.58258	151.08258	15108.25811	2.58258	299.58258	151.08258	15108.25800	2020-01-01	2020-01-02	2020-01-01 00:14:20	2020-01-02 03:42:41	2020-01-01 00:14:20.000	2020-01-02 03:42:41.000	860	99761	50310.5	5031050	860	99761	50310.5	5031050	-32708	32227	4435.3	443530	-128	123	-1.18	-118
-861	100	10851	99762	2.58558	299.58558	151.08558	15108.55855	2.58558	299.58557	151.08558	15108.55841	2.58558	299.58558	151.08558000000002	15108.55800	2020-01-01	2020-01-02	2020-01-01 00:14:21	2020-01-02 03:42:42	2020-01-01 00:14:21.000	2020-01-02 03:42:42.000	861	99762	50311.5	5031150	861	99762	50311.5	5031150	-32707	32228	4436.3	443630	-127	124	-0.18	-18
-862	100	10852	99763	2.58858	299.58858	151.08858	15108.85885	2.58858	299.5886	151.08859	15108.85901	2.58858	299.58858	151.08858	15108.85800	2020-01-01	2020-01-02	2020-01-01 00:14:22	2020-01-02 03:42:43	2020-01-01 00:14:22.000	2020-01-02 03:42:43.000	862	99763	50312.5	5031250	862	99763	50312.5	5031250	-32706	32229	4437.3	443730	-126	125	0.82	82
-863	100	10853	99764	2.59159	299.59159	151.09159	15109.15915	2.59159	299.59158	151.09159	15109.1593	2.59159	299.59159	151.09159	15109.15900	2020-01-01	2020-01-02	2020-01-01 00:14:23	2020-01-02 03:42:44	2020-01-01 00:14:23.000	2020-01-02 03:42:44.000	863	99764	50313.5	5031350	863	99764	50313.5	5031350	-32705	32230	4438.3	443830	-125	126	1.82	182
-864	100	10854	99765	2.59459	299.59459	151.09459	15109.45945	2.59459	299.5946	151.09459	15109.45941	2.59459	299.59459	151.09459	15109.45900	2020-01-01	2020-01-02	2020-01-01 00:14:24	2020-01-02 03:42:45	2020-01-01 00:14:24.000	2020-01-02 03:42:45.000	864	99765	50314.5	5031450	864	99765	50314.5	5031450	-32704	32231	4439.3	443930	-124	127	2.82	282
-865	100	10855	99766	2.59759	299.59759	151.09759	15109.75975	2.59759	299.5976	151.09759	15109.75958	2.59759	299.59759	151.09759	15109.75900	2020-01-01	2020-01-02	2020-01-01 00:14:25	2020-01-02 03:42:46	2020-01-01 00:14:25.000	2020-01-02 03:42:46.000	865	99766	50315.5	5031550	865	99766	50315.5	5031550	-32703	32232	4440.3	444030	-128	127	1.26	126
-866	100	10856	99767	2.6006	299.6006	151.1006	15110.06006	2.6006	299.6006	151.10059	15110.05988	2.60060	299.60060	151.1006	15110.06000	2020-01-01	2020-01-02	2020-01-01 00:14:26	2020-01-02 03:42:47	2020-01-01 00:14:26.000	2020-01-02 03:42:47.000	866	99767	50316.5	5031650	866	99767	50316.5	5031650	-32702	32233	4441.3	444130	-128	127	-0.3	-30
-867	100	10857	99768	2.6036	299.6036	151.1036	15110.36036	2.6036	299.6036	151.1036	15110.36063	2.60360	299.60360	151.1036	15110.36000	2020-01-01	2020-01-02	2020-01-01 00:14:27	2020-01-02 03:42:48	2020-01-01 00:14:27.000	2020-01-02 03:42:48.000	867	99768	50317.5	5031750	867	99768	50317.5	5031750	-32701	32234	4442.3	444230	-128	123	-1.86	-186
-868	100	10858	99769	2.6066	299.6066	151.1066	15110.66066	2.6066	299.6066	151.1066	15110.66078	2.60660	299.60660	151.1066	15110.66000	2020-01-01	2020-01-02	2020-01-01 00:14:28	2020-01-02 03:42:49	2020-01-01 00:14:28.000	2020-01-02 03:42:49.000	868	99769	50318.5	5031850	868	99769	50318.5	5031850	-32700	32235	4443.3	444330	-127	124	-0.86	-86
-869	100	10859	99770	2.6096	299.6096	151.1096	15110.96096	2.6096	299.60962	151.1096	15110.96091	2.60960	299.60960	151.1096	15110.96000	2020-01-01	2020-01-02	2020-01-01 00:14:29	2020-01-02 03:42:50	2020-01-01 00:14:29.000	2020-01-02 03:42:50.000	869	99770	50319.5	5031950	869	99770	50319.5	5031950	-32699	32236	4444.3	444430	-126	125	0.14	14
+860	100	10850	99761	2.58258	299.58258	151.08258	15108.25825	2.58258	299.58258	151.08258	15108.25811	2.58258	299.58258	151.08258	15108.258	2020-01-01	2020-01-02	2020-01-01 00:14:20	2020-01-02 03:42:41	2020-01-01 00:14:20.000	2020-01-02 03:42:41.000	860	99761	50310.5	5031050	860	99761	50310.5	5031050	-32708	32227	4435.3	443530	-128	123	-1.18	-118
+861	100	10851	99762	2.58558	299.58558	151.08558	15108.55855	2.58558	299.58557	151.08558	15108.55841	2.58558	299.58558	151.08558000000002	15108.558	2020-01-01	2020-01-02	2020-01-01 00:14:21	2020-01-02 03:42:42	2020-01-01 00:14:21.000	2020-01-02 03:42:42.000	861	99762	50311.5	5031150	861	99762	50311.5	5031150	-32707	32228	4436.3	443630	-127	124	-0.18	-18
+862	100	10852	99763	2.58858	299.58858	151.08858	15108.85885	2.58858	299.5886	151.08859	15108.85901	2.58858	299.58858	151.08858	15108.858	2020-01-01	2020-01-02	2020-01-01 00:14:22	2020-01-02 03:42:43	2020-01-01 00:14:22.000	2020-01-02 03:42:43.000	862	99763	50312.5	5031250	862	99763	50312.5	5031250	-32706	32229	4437.3	443730	-126	125	0.82	82
+863	100	10853	99764	2.59159	299.59159	151.09159	15109.15915	2.59159	299.59158	151.09159	15109.1593	2.59159	299.59159	151.09159	15109.159	2020-01-01	2020-01-02	2020-01-01 00:14:23	2020-01-02 03:42:44	2020-01-01 00:14:23.000	2020-01-02 03:42:44.000	863	99764	50313.5	5031350	863	99764	50313.5	5031350	-32705	32230	4438.3	443830	-125	126	1.82	182
+864	100	10854	99765	2.59459	299.59459	151.09459	15109.45945	2.59459	299.5946	151.09459	15109.45941	2.59459	299.59459	151.09459	15109.459	2020-01-01	2020-01-02	2020-01-01 00:14:24	2020-01-02 03:42:45	2020-01-01 00:14:24.000	2020-01-02 03:42:45.000	864	99765	50314.5	5031450	864	99765	50314.5	5031450	-32704	32231	4439.3	443930	-124	127	2.82	282
+865	100	10855	99766	2.59759	299.59759	151.09759	15109.75975	2.59759	299.5976	151.09759	15109.75958	2.59759	299.59759	151.09759	15109.759	2020-01-01	2020-01-02	2020-01-01 00:14:25	2020-01-02 03:42:46	2020-01-01 00:14:25.000	2020-01-02 03:42:46.000	865	99766	50315.5	5031550	865	99766	50315.5	5031550	-32703	32232	4440.3	444030	-128	127	1.26	126
+866	100	10856	99767	2.6006	299.6006	151.1006	15110.06006	2.6006	299.6006	151.10059	15110.05988	2.6006	299.6006	151.1006	15110.06	2020-01-01	2020-01-02	2020-01-01 00:14:26	2020-01-02 03:42:47	2020-01-01 00:14:26.000	2020-01-02 03:42:47.000	866	99767	50316.5	5031650	866	99767	50316.5	5031650	-32702	32233	4441.3	444130	-128	127	-0.3	-30
+867	100	10857	99768	2.6036	299.6036	151.1036	15110.36036	2.6036	299.6036	151.1036	15110.36063	2.6036	299.6036	151.1036	15110.36	2020-01-01	2020-01-02	2020-01-01 00:14:27	2020-01-02 03:42:48	2020-01-01 00:14:27.000	2020-01-02 03:42:48.000	867	99768	50317.5	5031750	867	99768	50317.5	5031750	-32701	32234	4442.3	444230	-128	123	-1.86	-186
+868	100	10858	99769	2.6066	299.6066	151.1066	15110.66066	2.6066	299.6066	151.1066	15110.66078	2.6066	299.6066	151.1066	15110.66	2020-01-01	2020-01-02	2020-01-01 00:14:28	2020-01-02 03:42:49	2020-01-01 00:14:28.000	2020-01-02 03:42:49.000	868	99769	50318.5	5031850	868	99769	50318.5	5031850	-32700	32235	4443.3	444330	-127	124	-0.86	-86
+869	100	10859	99770	2.6096	299.6096	151.1096	15110.96096	2.6096	299.60962	151.1096	15110.96091	2.6096	299.6096	151.1096	15110.96	2020-01-01	2020-01-02	2020-01-01 00:14:29	2020-01-02 03:42:50	2020-01-01 00:14:29.000	2020-01-02 03:42:50.000	869	99770	50319.5	5031950	869	99770	50319.5	5031950	-32699	32236	4444.3	444430	-126	125	0.14	14
 87	102	10077	99987	0.26126	300.26126	150.26126	15176.38738	0.26126	300.26126	150.26126	15176.38736	0.26126	300.26126	150.26126	15176.38726	2020-01-01	2020-01-02	2020-01-01 00:01:27	2020-01-02 03:46:27	2020-01-01 00:01:27.000	2020-01-02 03:46:27.000	87	99987	50037	5053737	87	99987	50037	5053737	-32482	32453	4616.009900990099	466217	-127	124	-2.128712871287129	-215
-870	100	10860	99771	2.61261	299.61261	151.11261	15111.26126	2.61261	299.6126	151.11261	15111.26105	2.61261	299.61261	151.11261000000002	15111.26100	2020-01-01	2020-01-02	2020-01-01 00:14:30	2020-01-02 03:42:51	2020-01-01 00:14:30.000	2020-01-02 03:42:51.000	870	99771	50320.5	5032050	870	99771	50320.5	5032050	-32698	32237	4445.3	444530	-125	126	1.14	114
-871	100	10861	99772	2.61561	299.61561	151.11561	15111.56156	2.61561	299.6156	151.11561	15111.56135	2.61561	299.61561	151.11561	15111.56100	2020-01-01	2020-01-02	2020-01-01 00:14:31	2020-01-02 03:42:52	2020-01-01 00:14:31.000	2020-01-02 03:42:52.000	871	99772	50321.5	5032150	871	99772	50321.5	5032150	-32697	32238	4446.3	444630	-124	127	2.14	214
-872	100	10862	99773	2.61861	299.61861	151.11861	15111.86186	2.61861	299.61862	151.11862	15111.8621	2.61861	299.61861	151.11861000000002	15111.86100	2020-01-01	2020-01-02	2020-01-01 00:14:32	2020-01-02 03:42:53	2020-01-01 00:14:32.000	2020-01-02 03:42:53.000	872	99773	50322.5	5032250	872	99773	50322.5	5032250	-32696	32239	4447.3	444730	-128	127	0.58	58
-873	100	10863	99774	2.62162	299.62162	151.12162	15112.16216	2.62162	299.6216	151.12162	15112.16224	2.62162	299.62162	151.12162	15112.16200	2020-01-01	2020-01-02	2020-01-01 00:14:33	2020-01-02 03:42:54	2020-01-01 00:14:33.000	2020-01-02 03:42:54.000	873	99774	50323.5	5032350	873	99774	50323.5	5032350	-32695	32240	4448.3	444830	-128	123	-0.98	-98
-874	100	10864	99775	2.62462	299.62462	151.12462	15112.46246	2.62462	299.62463	151.12462	15112.46238	2.62462	299.62462	151.12462	15112.46200	2020-01-01	2020-01-02	2020-01-01 00:14:34	2020-01-02 03:42:55	2020-01-01 00:14:34.000	2020-01-02 03:42:55.000	874	99775	50324.5	5032450	874	99775	50324.5	5032450	-32694	32241	4449.3	444930	-127	124	0.02	2
-875	100	10865	99776	2.62762	299.62762	151.12762	15112.76276	2.62762	299.62762	151.12762	15112.76252	2.62762	299.62762	151.12762	15112.76200	2020-01-01	2020-01-02	2020-01-01 00:14:35	2020-01-02 03:42:56	2020-01-01 00:14:35.000	2020-01-02 03:42:56.000	875	99776	50325.5	5032550	875	99776	50325.5	5032550	-32693	32242	4450.3	445030	-126	125	1.02	102
-876	100	10866	99777	2.63063	299.63063	151.13063	15113.06306	2.63063	299.63065	151.13063	15113.06327	2.63063	299.63063	151.13063	15113.06300	2020-01-01	2020-01-02	2020-01-01 00:14:36	2020-01-02 03:42:57	2020-01-01 00:14:36.000	2020-01-02 03:42:57.000	876	99777	50326.5	5032650	876	99777	50326.5	5032650	-32692	32243	4451.3	445130	-125	126	2.02	202
-877	100	10867	99778	2.63363	299.63363	151.13363	15113.36336	2.63363	299.63364	151.13363	15113.36358	2.63363	299.63363	151.13362999999998	15113.36300	2020-01-01	2020-01-02	2020-01-01 00:14:37	2020-01-02 03:42:58	2020-01-01 00:14:37.000	2020-01-02 03:42:58.000	877	99778	50327.5	5032750	877	99778	50327.5	5032750	-32691	32244	4452.3	445230	-124	127	3.02	302
-878	100	10868	99779	2.63663	299.63663	151.13663	15113.66366	2.63663	299.63663	151.13663	15113.66371	2.63663	299.63663	151.13663	15113.66300	2020-01-01	2020-01-02	2020-01-01 00:14:38	2020-01-02 03:42:59	2020-01-01 00:14:38.000	2020-01-02 03:42:59.000	878	99779	50328.5	5032850	878	99779	50328.5	5032850	-32690	32245	4453.3	445330	-128	127	1.46	146
-879	100	10869	99780	2.63963	299.63963	151.13963	15113.96396	2.63963	299.63965	151.13963	15113.96385	2.63963	299.63963	151.13963	15113.96300	2020-01-01	2020-01-02	2020-01-01 00:14:39	2020-01-02 03:43:00	2020-01-01 00:14:39.000	2020-01-02 03:43:00.000	879	99780	50329.5	5032950	879	99780	50329.5	5032950	-32689	32246	4454.3	445430	-128	123	-0.1	-10
+870	100	10860	99771	2.61261	299.61261	151.11261	15111.26126	2.61261	299.6126	151.11261	15111.26105	2.61261	299.61261	151.11261000000002	15111.261	2020-01-01	2020-01-02	2020-01-01 00:14:30	2020-01-02 03:42:51	2020-01-01 00:14:30.000	2020-01-02 03:42:51.000	870	99771	50320.5	5032050	870	99771	50320.5	5032050	-32698	32237	4445.3	444530	-125	126	1.14	114
+871	100	10861	99772	2.61561	299.61561	151.11561	15111.56156	2.61561	299.6156	151.11561	15111.56135	2.61561	299.61561	151.11561	15111.561	2020-01-01	2020-01-02	2020-01-01 00:14:31	2020-01-02 03:42:52	2020-01-01 00:14:31.000	2020-01-02 03:42:52.000	871	99772	50321.5	5032150	871	99772	50321.5	5032150	-32697	32238	4446.3	444630	-124	127	2.14	214
+872	100	10862	99773	2.61861	299.61861	151.11861	15111.86186	2.61861	299.61862	151.11862	15111.8621	2.61861	299.61861	151.11861000000002	15111.861	2020-01-01	2020-01-02	2020-01-01 00:14:32	2020-01-02 03:42:53	2020-01-01 00:14:32.000	2020-01-02 03:42:53.000	872	99773	50322.5	5032250	872	99773	50322.5	5032250	-32696	32239	4447.3	444730	-128	127	0.58	58
+873	100	10863	99774	2.62162	299.62162	151.12162	15112.16216	2.62162	299.6216	151.12162	15112.16224	2.62162	299.62162	151.12162	15112.162	2020-01-01	2020-01-02	2020-01-01 00:14:33	2020-01-02 03:42:54	2020-01-01 00:14:33.000	2020-01-02 03:42:54.000	873	99774	50323.5	5032350	873	99774	50323.5	5032350	-32695	32240	4448.3	444830	-128	123	-0.98	-98
+874	100	10864	99775	2.62462	299.62462	151.12462	15112.46246	2.62462	299.62463	151.12462	15112.46238	2.62462	299.62462	151.12462	15112.462	2020-01-01	2020-01-02	2020-01-01 00:14:34	2020-01-02 03:42:55	2020-01-01 00:14:34.000	2020-01-02 03:42:55.000	874	99775	50324.5	5032450	874	99775	50324.5	5032450	-32694	32241	4449.3	444930	-127	124	0.02	2
+875	100	10865	99776	2.62762	299.62762	151.12762	15112.76276	2.62762	299.62762	151.12762	15112.76252	2.62762	299.62762	151.12762	15112.762	2020-01-01	2020-01-02	2020-01-01 00:14:35	2020-01-02 03:42:56	2020-01-01 00:14:35.000	2020-01-02 03:42:56.000	875	99776	50325.5	5032550	875	99776	50325.5	5032550	-32693	32242	4450.3	445030	-126	125	1.02	102
+876	100	10866	99777	2.63063	299.63063	151.13063	15113.06306	2.63063	299.63065	151.13063	15113.06327	2.63063	299.63063	151.13063	15113.063	2020-01-01	2020-01-02	2020-01-01 00:14:36	2020-01-02 03:42:57	2020-01-01 00:14:36.000	2020-01-02 03:42:57.000	876	99777	50326.5	5032650	876	99777	50326.5	5032650	-32692	32243	4451.3	445130	-125	126	2.02	202
+877	100	10867	99778	2.63363	299.63363	151.13363	15113.36336	2.63363	299.63364	151.13363	15113.36358	2.63363	299.63363	151.13362999999998	15113.363	2020-01-01	2020-01-02	2020-01-01 00:14:37	2020-01-02 03:42:58	2020-01-01 00:14:37.000	2020-01-02 03:42:58.000	877	99778	50327.5	5032750	877	99778	50327.5	5032750	-32691	32244	4452.3	445230	-124	127	3.02	302
+878	100	10868	99779	2.63663	299.63663	151.13663	15113.66366	2.63663	299.63663	151.13663	15113.66371	2.63663	299.63663	151.13663	15113.663	2020-01-01	2020-01-02	2020-01-01 00:14:38	2020-01-02 03:42:59	2020-01-01 00:14:38.000	2020-01-02 03:42:59.000	878	99779	50328.5	5032850	878	99779	50328.5	5032850	-32690	32245	4453.3	445330	-128	127	1.46	146
+879	100	10869	99780	2.63963	299.63963	151.13963	15113.96396	2.63963	299.63965	151.13963	15113.96385	2.63963	299.63963	151.13963	15113.963	2020-01-01	2020-01-02	2020-01-01 00:14:39	2020-01-02 03:43:00	2020-01-01 00:14:39.000	2020-01-02 03:43:00.000	879	99780	50329.5	5032950	879	99780	50329.5	5032950	-32689	32246	4454.3	445430	-128	123	-0.1	-10
 88	102	10078	99988	0.26426	300.26426	150.26426	15176.69069	0.26426	300.26425	150.26426	15176.69066	0.26426	300.26426	150.26426	15176.69026	2020-01-01	2020-01-02	2020-01-01 00:01:28	2020-01-02 03:46:28	2020-01-01 00:01:28.000	2020-01-02 03:46:28.000	88	99988	50038	5053838	88	99988	50038	5053838	-32481	32454	4617.009900990099	466318	-126	125	-1.1287128712871286	-114
-880	100	10870	99781	2.64264	299.64264	151.14264	15114.26426	2.64264	299.64264	151.14263	15114.26399	2.64264	299.64264	151.14264	15114.26400	2020-01-01	2020-01-02	2020-01-01 00:14:40	2020-01-02 03:43:01	2020-01-01 00:14:40.000	2020-01-02 03:43:01.000	880	99781	50330.5	5033050	880	99781	50330.5	5033050	-32688	32247	4455.3	445530	-127	124	0.9	90
-881	100	10871	99782	2.64564	299.64564	151.14564	15114.56456	2.64564	299.64566	151.14564	15114.56474	2.64564	299.64564	151.14564000000001	15114.56400	2020-01-01	2020-01-02	2020-01-01 00:14:41	2020-01-02 03:43:02	2020-01-01 00:14:41.000	2020-01-02 03:43:02.000	881	99782	50331.5	5033150	881	99782	50331.5	5033150	-32687	32248	4456.3	445630	-126	125	1.9	190
-882	100	10872	99783	2.64864	299.64864	151.14864	15114.86486	2.64864	299.64865	151.14865	15114.86504	2.64864	299.64864	151.14864	15114.86400	2020-01-01	2020-01-02	2020-01-01 00:14:42	2020-01-02 03:43:03	2020-01-01 00:14:42.000	2020-01-02 03:43:03.000	882	99783	50332.5	5033250	882	99783	50332.5	5033250	-32686	32249	4457.3	445730	-125	126	2.9	290
-883	100	10873	99784	2.65165	299.65165	151.15165	15115.16516	2.65165	299.65164	151.15165	15115.16522	2.65165	299.65165	151.15165000000002	15115.16500	2020-01-01	2020-01-02	2020-01-01 00:14:43	2020-01-02 03:43:04	2020-01-01 00:14:43.000	2020-01-02 03:43:04.000	883	99784	50333.5	5033350	883	99784	50333.5	5033350	-32685	32250	4458.3	445830	-124	127	3.9	390
-884	100	10874	99785	2.65465	299.65465	151.15465	15115.46546	2.65465	299.65466	151.15465	15115.46532	2.65465	299.65465	151.15465	15115.46500	2020-01-01	2020-01-02	2020-01-01 00:14:44	2020-01-02 03:43:05	2020-01-01 00:14:44.000	2020-01-02 03:43:05.000	884	99785	50334.5	5033450	884	99785	50334.5	5033450	-32684	32251	4459.3	445930	-128	127	2.34	234
-885	100	10875	99786	2.65765	299.65765	151.15765	15115.76576	2.65765	299.65765	151.15765	15115.76562	2.65765	299.65765	151.15765	15115.76500	2020-01-01	2020-01-02	2020-01-01 00:14:45	2020-01-02 03:43:06	2020-01-01 00:14:45.000	2020-01-02 03:43:06.000	885	99786	50335.5	5033550	885	99786	50335.5	5033550	-32683	32252	4460.3	446030	-128	123	0.78	78
-886	100	10876	99787	2.66066	299.66066	151.16066	15116.06606	2.66066	299.66068	151.16066	15116.06621	2.66066	299.66066	151.16066	15116.06600	2020-01-01	2020-01-02	2020-01-01 00:14:46	2020-01-02 03:43:07	2020-01-01 00:14:46.000	2020-01-02 03:43:07.000	886	99787	50336.5	5033650	886	99787	50336.5	5033650	-32682	32253	4461.3	446130	-127	124	1.78	178
-887	100	10877	99788	2.66366	299.66366	151.16366	15116.36636	2.66366	299.66367	151.16366	15116.36651	2.66366	299.66366	151.16366	15116.36600	2020-01-01	2020-01-02	2020-01-01 00:14:47	2020-01-02 03:43:08	2020-01-01 00:14:47.000	2020-01-02 03:43:08.000	887	99788	50337.5	5033750	887	99788	50337.5	5033750	-32681	32254	4462.3	446230	-126	125	2.78	278
-888	100	10878	99789	2.66666	299.66666	151.16666	15116.66666	2.66666	299.66666	151.16666	15116.66669	2.66666	299.66666	151.16665999999998	15116.66600	2020-01-01	2020-01-02	2020-01-01 00:14:48	2020-01-02 03:43:09	2020-01-01 00:14:48.000	2020-01-02 03:43:09.000	888	99789	50338.5	5033850	888	99789	50338.5	5033850	-32680	32255	4463.3	446330	-125	126	3.78	378
-889	100	10879	99790	2.66966	299.66966	151.16966	15116.96696	2.66966	299.66968	151.16966	15116.96679	2.66966	299.66966	151.16966	15116.96600	2020-01-01	2020-01-02	2020-01-01 00:14:49	2020-01-02 03:43:10	2020-01-01 00:14:49.000	2020-01-02 03:43:10.000	889	99790	50339.5	5033950	889	99790	50339.5	5033950	-32679	32256	4464.3	446430	-124	127	4.78	478
+880	100	10870	99781	2.64264	299.64264	151.14264	15114.26426	2.64264	299.64264	151.14263	15114.26399	2.64264	299.64264	151.14264	15114.264	2020-01-01	2020-01-02	2020-01-01 00:14:40	2020-01-02 03:43:01	2020-01-01 00:14:40.000	2020-01-02 03:43:01.000	880	99781	50330.5	5033050	880	99781	50330.5	5033050	-32688	32247	4455.3	445530	-127	124	0.9	90
+881	100	10871	99782	2.64564	299.64564	151.14564	15114.56456	2.64564	299.64566	151.14564	15114.56474	2.64564	299.64564	151.14564000000001	15114.564	2020-01-01	2020-01-02	2020-01-01 00:14:41	2020-01-02 03:43:02	2020-01-01 00:14:41.000	2020-01-02 03:43:02.000	881	99782	50331.5	5033150	881	99782	50331.5	5033150	-32687	32248	4456.3	445630	-126	125	1.9	190
+882	100	10872	99783	2.64864	299.64864	151.14864	15114.86486	2.64864	299.64865	151.14865	15114.86504	2.64864	299.64864	151.14864	15114.864	2020-01-01	2020-01-02	2020-01-01 00:14:42	2020-01-02 03:43:03	2020-01-01 00:14:42.000	2020-01-02 03:43:03.000	882	99783	50332.5	5033250	882	99783	50332.5	5033250	-32686	32249	4457.3	445730	-125	126	2.9	290
+883	100	10873	99784	2.65165	299.65165	151.15165	15115.16516	2.65165	299.65164	151.15165	15115.16522	2.65165	299.65165	151.15165000000002	15115.165	2020-01-01	2020-01-02	2020-01-01 00:14:43	2020-01-02 03:43:04	2020-01-01 00:14:43.000	2020-01-02 03:43:04.000	883	99784	50333.5	5033350	883	99784	50333.5	5033350	-32685	32250	4458.3	445830	-124	127	3.9	390
+884	100	10874	99785	2.65465	299.65465	151.15465	15115.46546	2.65465	299.65466	151.15465	15115.46532	2.65465	299.65465	151.15465	15115.465	2020-01-01	2020-01-02	2020-01-01 00:14:44	2020-01-02 03:43:05	2020-01-01 00:14:44.000	2020-01-02 03:43:05.000	884	99785	50334.5	5033450	884	99785	50334.5	5033450	-32684	32251	4459.3	445930	-128	127	2.34	234
+885	100	10875	99786	2.65765	299.65765	151.15765	15115.76576	2.65765	299.65765	151.15765	15115.76562	2.65765	299.65765	151.15765	15115.765	2020-01-01	2020-01-02	2020-01-01 00:14:45	2020-01-02 03:43:06	2020-01-01 00:14:45.000	2020-01-02 03:43:06.000	885	99786	50335.5	5033550	885	99786	50335.5	5033550	-32683	32252	4460.3	446030	-128	123	0.78	78
+886	100	10876	99787	2.66066	299.66066	151.16066	15116.06606	2.66066	299.66068	151.16066	15116.06621	2.66066	299.66066	151.16066	15116.066	2020-01-01	2020-01-02	2020-01-01 00:14:46	2020-01-02 03:43:07	2020-01-01 00:14:46.000	2020-01-02 03:43:07.000	886	99787	50336.5	5033650	886	99787	50336.5	5033650	-32682	32253	4461.3	446130	-127	124	1.78	178
+887	100	10877	99788	2.66366	299.66366	151.16366	15116.36636	2.66366	299.66367	151.16366	15116.36651	2.66366	299.66366	151.16366	15116.366	2020-01-01	2020-01-02	2020-01-01 00:14:47	2020-01-02 03:43:08	2020-01-01 00:14:47.000	2020-01-02 03:43:08.000	887	99788	50337.5	5033750	887	99788	50337.5	5033750	-32681	32254	4462.3	446230	-126	125	2.78	278
+888	100	10878	99789	2.66666	299.66666	151.16666	15116.66666	2.66666	299.66666	151.16666	15116.66669	2.66666	299.66666	151.16665999999998	15116.666	2020-01-01	2020-01-02	2020-01-01 00:14:48	2020-01-02 03:43:09	2020-01-01 00:14:48.000	2020-01-02 03:43:09.000	888	99789	50338.5	5033850	888	99789	50338.5	5033850	-32680	32255	4463.3	446330	-125	126	3.78	378
+889	100	10879	99790	2.66966	299.66966	151.16966	15116.96696	2.66966	299.66968	151.16966	15116.96679	2.66966	299.66966	151.16966	15116.966	2020-01-01	2020-01-02	2020-01-01 00:14:49	2020-01-02 03:43:10	2020-01-01 00:14:49.000	2020-01-02 03:43:10.000	889	99790	50339.5	5033950	889	99790	50339.5	5033950	-32679	32256	4464.3	446430	-124	127	4.78	478
 89	102	10079	99989	0.26726	300.26726	150.26726	15176.99399	0.26726	300.26727	150.26727	15176.9943	0.26726	300.26726	150.26726	15176.99326	2020-01-01	2020-01-02	2020-01-01 00:01:29	2020-01-02 03:46:29	2020-01-01 00:01:29.000	2020-01-02 03:46:29.000	89	99989	50039	5053939	89	99989	50039	5053939	-32480	32455	4618.009900990099	466419	-125	126	-0.12871287128712872	-13
-890	100	10880	99791	2.67267	299.67267	151.17267	15117.26726	2.67267	299.67267	151.17267	15117.26708	2.67267	299.67267	151.17267	15117.26700	2020-01-01	2020-01-02	2020-01-01 00:14:50	2020-01-02 03:43:11	2020-01-01 00:14:50.000	2020-01-02 03:43:11.000	890	99791	50340.5	5034050	890	99791	50340.5	5034050	-32678	32257	4465.3	446530	-128	127	3.22	322
-891	100	10881	99792	2.67567	299.67567	151.17567	15117.56756	2.67567	299.6757	151.17567	15117.56768	2.67567	299.67567	151.17567	15117.56700	2020-01-01	2020-01-02	2020-01-01 00:14:51	2020-01-02 03:43:12	2020-01-01 00:14:51.000	2020-01-02 03:43:12.000	891	99792	50341.5	5034150	891	99792	50341.5	5034150	-32677	32258	4466.3	446630	-128	127	1.66	166
-892	100	10882	99793	2.67867	299.67867	151.17867	15117.86786	2.67867	299.67868	151.17868	15117.86802	2.67867	299.67867	151.17867	15117.86700	2020-01-01	2020-01-02	2020-01-01 00:14:52	2020-01-02 03:43:13	2020-01-01 00:14:52.000	2020-01-02 03:43:13.000	892	99793	50342.5	5034250	892	99793	50342.5	5034250	-32676	32259	4467.3	446730	-128	124	0.1	10
-893	100	10883	99794	2.68168	299.68168	151.18168	15118.16816	2.68168	299.68167	151.18168	15118.16816	2.68168	299.68168	151.18168	15118.16800	2020-01-01	2020-01-02	2020-01-01 00:14:53	2020-01-02 03:43:14	2020-01-01 00:14:53.000	2020-01-02 03:43:14.000	893	99794	50343.5	5034350	893	99794	50343.5	5034350	-32675	32260	4468.3	446830	-127	125	1.1	110
-894	100	10884	99795	2.68468	299.68468	151.18468	15118.46846	2.68468	299.6847	151.18468	15118.46826	2.68468	299.68468	151.18468000000001	15118.46800	2020-01-01	2020-01-02	2020-01-01 00:14:54	2020-01-02 03:43:15	2020-01-01 00:14:54.000	2020-01-02 03:43:15.000	894	99795	50344.5	5034450	894	99795	50344.5	5034450	-32674	32261	4469.3	446930	-126	126	2.1	210
-895	100	10885	99796	2.68768	299.68768	151.18768	15118.76876	2.68768	299.68768	151.18768	15118.76855	2.68768	299.68768	151.18768	15118.76800	2020-01-01	2020-01-02	2020-01-01 00:14:55	2020-01-02 03:43:16	2020-01-01 00:14:55.000	2020-01-02 03:43:16.000	895	99796	50345.5	5034550	895	99796	50345.5	5034550	-32673	32262	4470.3	447030	-125	127	3.1	310
-896	100	10886	99797	2.69069	299.69069	151.19069	15119.06906	2.69069	299.6907	151.19069	15119.06915	2.69069	299.69069	151.19069	15119.06900	2020-01-01	2020-01-02	2020-01-01 00:14:56	2020-01-02 03:43:17	2020-01-01 00:14:56.000	2020-01-02 03:43:17.000	896	99797	50346.5	5034650	896	99797	50346.5	5034650	-32672	32263	4471.3	447130	-128	127	1.54	154
-897	100	10887	99798	2.69369	299.69369	151.19369	15119.36936	2.69369	299.6937	151.19369	15119.36949	2.69369	299.69369	151.19369	15119.36900	2020-01-01	2020-01-02	2020-01-01 00:14:57	2020-01-02 03:43:18	2020-01-01 00:14:57.000	2020-01-02 03:43:18.000	897	99798	50347.5	5034750	897	99798	50347.5	5034750	-32671	32264	4472.3	447230	-128	127	-0.02	-2
-898	100	10888	99799	2.69669	299.69669	151.19669	15119.66966	2.69669	299.6967	151.19669	15119.66963	2.69669	299.69669	151.19669	15119.66900	2020-01-01	2020-01-02	2020-01-01 00:14:58	2020-01-02 03:43:19	2020-01-01 00:14:58.000	2020-01-02 03:43:19.000	898	99799	50348.5	5034850	898	99799	50348.5	5034850	-32670	32265	4473.3	447330	-128	123	-1.58	-158
-899	100	10889	99800	2.69969	299.69969	151.19969	15119.96996	2.69969	299.6997	151.1997	15119.97038	2.69969	299.69969	151.19969	15119.96900	2020-01-01	2020-01-02	2020-01-01 00:14:59	2020-01-02 03:43:20	2020-01-01 00:14:59.000	2020-01-02 03:43:20.000	899	99800	50349.5	5034950	899	99800	50349.5	5034950	-32669	32266	4474.3	447430	-127	124	-0.58	-58
+890	100	10880	99791	2.67267	299.67267	151.17267	15117.26726	2.67267	299.67267	151.17267	15117.26708	2.67267	299.67267	151.17267	15117.267	2020-01-01	2020-01-02	2020-01-01 00:14:50	2020-01-02 03:43:11	2020-01-01 00:14:50.000	2020-01-02 03:43:11.000	890	99791	50340.5	5034050	890	99791	50340.5	5034050	-32678	32257	4465.3	446530	-128	127	3.22	322
+891	100	10881	99792	2.67567	299.67567	151.17567	15117.56756	2.67567	299.6757	151.17567	15117.56768	2.67567	299.67567	151.17567	15117.567	2020-01-01	2020-01-02	2020-01-01 00:14:51	2020-01-02 03:43:12	2020-01-01 00:14:51.000	2020-01-02 03:43:12.000	891	99792	50341.5	5034150	891	99792	50341.5	5034150	-32677	32258	4466.3	446630	-128	127	1.66	166
+892	100	10882	99793	2.67867	299.67867	151.17867	15117.86786	2.67867	299.67868	151.17868	15117.86802	2.67867	299.67867	151.17867	15117.867	2020-01-01	2020-01-02	2020-01-01 00:14:52	2020-01-02 03:43:13	2020-01-01 00:14:52.000	2020-01-02 03:43:13.000	892	99793	50342.5	5034250	892	99793	50342.5	5034250	-32676	32259	4467.3	446730	-128	124	0.1	10
+893	100	10883	99794	2.68168	299.68168	151.18168	15118.16816	2.68168	299.68167	151.18168	15118.16816	2.68168	299.68168	151.18168	15118.168	2020-01-01	2020-01-02	2020-01-01 00:14:53	2020-01-02 03:43:14	2020-01-01 00:14:53.000	2020-01-02 03:43:14.000	893	99794	50343.5	5034350	893	99794	50343.5	5034350	-32675	32260	4468.3	446830	-127	125	1.1	110
+894	100	10884	99795	2.68468	299.68468	151.18468	15118.46846	2.68468	299.6847	151.18468	15118.46826	2.68468	299.68468	151.18468000000001	15118.468	2020-01-01	2020-01-02	2020-01-01 00:14:54	2020-01-02 03:43:15	2020-01-01 00:14:54.000	2020-01-02 03:43:15.000	894	99795	50344.5	5034450	894	99795	50344.5	5034450	-32674	32261	4469.3	446930	-126	126	2.1	210
+895	100	10885	99796	2.68768	299.68768	151.18768	15118.76876	2.68768	299.68768	151.18768	15118.76855	2.68768	299.68768	151.18768	15118.768	2020-01-01	2020-01-02	2020-01-01 00:14:55	2020-01-02 03:43:16	2020-01-01 00:14:55.000	2020-01-02 03:43:16.000	895	99796	50345.5	5034550	895	99796	50345.5	5034550	-32673	32262	4470.3	447030	-125	127	3.1	310
+896	100	10886	99797	2.69069	299.69069	151.19069	15119.06906	2.69069	299.6907	151.19069	15119.06915	2.69069	299.69069	151.19069	15119.069	2020-01-01	2020-01-02	2020-01-01 00:14:56	2020-01-02 03:43:17	2020-01-01 00:14:56.000	2020-01-02 03:43:17.000	896	99797	50346.5	5034650	896	99797	50346.5	5034650	-32672	32263	4471.3	447130	-128	127	1.54	154
+897	100	10887	99798	2.69369	299.69369	151.19369	15119.36936	2.69369	299.6937	151.19369	15119.36949	2.69369	299.69369	151.19369	15119.369	2020-01-01	2020-01-02	2020-01-01 00:14:57	2020-01-02 03:43:18	2020-01-01 00:14:57.000	2020-01-02 03:43:18.000	897	99798	50347.5	5034750	897	99798	50347.5	5034750	-32671	32264	4472.3	447230	-128	127	-0.02	-2
+898	100	10888	99799	2.69669	299.69669	151.19669	15119.66966	2.69669	299.6967	151.19669	15119.66963	2.69669	299.69669	151.19669	15119.669	2020-01-01	2020-01-02	2020-01-01 00:14:58	2020-01-02 03:43:19	2020-01-01 00:14:58.000	2020-01-02 03:43:19.000	898	99799	50348.5	5034850	898	99799	50348.5	5034850	-32670	32265	4473.3	447330	-128	123	-1.58	-158
+899	100	10889	99800	2.69969	299.69969	151.19969	15119.96996	2.69969	299.6997	151.1997	15119.97038	2.69969	299.69969	151.19969	15119.969	2020-01-01	2020-01-02	2020-01-01 00:14:59	2020-01-02 03:43:20	2020-01-01 00:14:59.000	2020-01-02 03:43:20.000	899	99800	50349.5	5034950	899	99800	50349.5	5034950	-32669	32266	4474.3	447430	-127	124	-0.58	-58
 9	102	1008	9999	0.02702	300.02702	150.02702	15152.72972	0.02702	300.02704	150.02702	15152.72966	0.02702	300.02702	150.02702	15152.72902	2020-01-01	2020-01-02	2020-01-01 00:00:09	2020-01-02 03:45:09	2020-01-01 00:00:09.000	2020-01-02 03:45:09.000	9	99909	49959	5045859	9	99909	49959	5045859	-32560	32375	4538.009900990099	458339	-124	127	0.9801980198019802	99
 90	102	10080	99990	0.27027	300.27027	150.27027	15177.29729	0.27027	300.27026	150.27026	15177.29694	0.27027	300.27027	150.27026999999998	15177.29727	2020-01-01	2020-01-02	2020-01-01 00:01:30	2020-01-02 03:46:30	2020-01-01 00:01:30.000	2020-01-02 03:46:30.000	90	99990	50040	5054040	90	99990	50040	5054040	-32479	32456	4619.009900990099	466520	-124	127	0.8712871287128713	88
-900	100	10890	99801	2.7027	299.7027	151.2027	15120.27027	2.7027	299.7027	151.2027	15120.27003	2.70270	299.70270	151.2027	15120.27000	2020-01-01	2020-01-02	2020-01-01 00:15:00	2020-01-02 03:43:21	2020-01-01 00:15:00.000	2020-01-02 03:43:21.000	900	99801	50350.5	5035050	900	99801	50350.5	5035050	-32668	32267	4475.3	447530	-126	125	0.42	42
-901	100	10891	99802	2.7057	299.7057	151.2057	15120.57057	2.7057	299.70572	151.2057	15120.57066	2.70570	299.70570	151.2057	15120.57000	2020-01-01	2020-01-02	2020-01-01 00:15:01	2020-01-02 03:43:22	2020-01-01 00:15:01.000	2020-01-02 03:43:22.000	901	99802	50351.5	5035150	901	99802	50351.5	5035150	-32667	32268	4476.3	447630	-125	126	1.42	142
-902	100	10892	99803	2.7087	299.7087	151.2087	15120.87087	2.7087	299.7087	151.2087	15120.87095	2.70870	299.70870	151.20870000000002	15120.87000	2020-01-01	2020-01-02	2020-01-01 00:15:02	2020-01-02 03:43:23	2020-01-01 00:15:02.000	2020-01-02 03:43:23.000	902	99803	50352.5	5035250	902	99803	50352.5	5035250	-32666	32269	4477.3	447730	-124	127	2.42	242
-903	100	10893	99804	2.71171	299.71171	151.21171	15121.17117	2.71171	299.7117	151.21171	15121.1711	2.71171	299.71171	151.21171	15121.17100	2020-01-01	2020-01-02	2020-01-01 00:15:03	2020-01-02 03:43:24	2020-01-01 00:15:03.000	2020-01-02 03:43:24.000	903	99804	50353.5	5035350	903	99804	50353.5	5035350	-32665	32270	4478.3	447830	-128	127	0.86	86
-904	100	10894	99805	2.71471	299.71471	151.21471	15121.47147	2.71471	299.71472	151.21471	15121.47185	2.71471	299.71471	151.21471	15121.47100	2020-01-01	2020-01-02	2020-01-01 00:15:04	2020-01-02 03:43:25	2020-01-01 00:15:04.000	2020-01-02 03:43:25.000	904	99805	50354.5	5035450	904	99805	50354.5	5035450	-32664	32271	4479.3	447930	-128	123	-0.7	-70
-905	100	10895	99806	2.71771	299.71771	151.21771	15121.77177	2.71771	299.7177	151.21771	15121.77149	2.71771	299.71771	151.21771	15121.77100	2020-01-01	2020-01-02	2020-01-01 00:15:05	2020-01-02 03:43:26	2020-01-01 00:15:05.000	2020-01-02 03:43:26.000	905	99806	50355.5	5035550	905	99806	50355.5	5035550	-32663	32272	4480.3	448030	-127	124	0.3	30
-906	100	10896	99807	2.72072	299.72072	151.22072	15122.07207	2.72072	299.72073	151.22072	15122.07212	2.72072	299.72072	151.22072	15122.07200	2020-01-01	2020-01-02	2020-01-01 00:15:06	2020-01-02 03:43:27	2020-01-01 00:15:06.000	2020-01-02 03:43:27.000	906	99807	50356.5	5035650	906	99807	50356.5	5035650	-32662	32273	4481.3	448130	-126	125	1.3	130
-907	100	10897	99808	2.72372	299.72372	151.22372	15122.37237	2.72372	299.72372	151.22372	15122.37243	2.72372	299.72372	151.22372	15122.37200	2020-01-01	2020-01-02	2020-01-01 00:15:07	2020-01-02 03:43:28	2020-01-01 00:15:07.000	2020-01-02 03:43:28.000	907	99808	50357.5	5035750	907	99808	50357.5	5035750	-32661	32274	4482.3	448230	-125	126	2.3	230
-908	100	10898	99809	2.72672	299.72672	151.22672	15122.67267	2.72672	299.7267	151.22672	15122.67272	2.72672	299.72672	151.22672	15122.67200	2020-01-01	2020-01-02	2020-01-01 00:15:08	2020-01-02 03:43:29	2020-01-01 00:15:08.000	2020-01-02 03:43:29.000	908	99809	50358.5	5035850	908	99809	50358.5	5035850	-32660	32275	4483.3	448330	-124	127	3.3	330
-909	100	10899	99810	2.72972	299.72972	151.22972	15122.97297	2.72972	299.72974	151.22973	15122.97332	2.72972	299.72972	151.22972	15122.97200	2020-01-01	2020-01-02	2020-01-01 00:15:09	2020-01-02 03:43:30	2020-01-01 00:15:09.000	2020-01-02 03:43:30.000	909	99810	50359.5	5035950	909	99810	50359.5	5035950	-32659	32276	4484.3	448430	-128	127	1.74	174
+900	100	10890	99801	2.7027	299.7027	151.2027	15120.27027	2.7027	299.7027	151.2027	15120.27003	2.7027	299.7027	151.2027	15120.27	2020-01-01	2020-01-02	2020-01-01 00:15:00	2020-01-02 03:43:21	2020-01-01 00:15:00.000	2020-01-02 03:43:21.000	900	99801	50350.5	5035050	900	99801	50350.5	5035050	-32668	32267	4475.3	447530	-126	125	0.42	42
+901	100	10891	99802	2.7057	299.7057	151.2057	15120.57057	2.7057	299.70572	151.2057	15120.57066	2.7057	299.7057	151.2057	15120.57	2020-01-01	2020-01-02	2020-01-01 00:15:01	2020-01-02 03:43:22	2020-01-01 00:15:01.000	2020-01-02 03:43:22.000	901	99802	50351.5	5035150	901	99802	50351.5	5035150	-32667	32268	4476.3	447630	-125	126	1.42	142
+902	100	10892	99803	2.7087	299.7087	151.2087	15120.87087	2.7087	299.7087	151.2087	15120.87095	2.7087	299.7087	151.20870000000002	15120.87	2020-01-01	2020-01-02	2020-01-01 00:15:02	2020-01-02 03:43:23	2020-01-01 00:15:02.000	2020-01-02 03:43:23.000	902	99803	50352.5	5035250	902	99803	50352.5	5035250	-32666	32269	4477.3	447730	-124	127	2.42	242
+903	100	10893	99804	2.71171	299.71171	151.21171	15121.17117	2.71171	299.7117	151.21171	15121.1711	2.71171	299.71171	151.21171	15121.171	2020-01-01	2020-01-02	2020-01-01 00:15:03	2020-01-02 03:43:24	2020-01-01 00:15:03.000	2020-01-02 03:43:24.000	903	99804	50353.5	5035350	903	99804	50353.5	5035350	-32665	32270	4478.3	447830	-128	127	0.86	86
+904	100	10894	99805	2.71471	299.71471	151.21471	15121.47147	2.71471	299.71472	151.21471	15121.47185	2.71471	299.71471	151.21471	15121.471	2020-01-01	2020-01-02	2020-01-01 00:15:04	2020-01-02 03:43:25	2020-01-01 00:15:04.000	2020-01-02 03:43:25.000	904	99805	50354.5	5035450	904	99805	50354.5	5035450	-32664	32271	4479.3	447930	-128	123	-0.7	-70
+905	100	10895	99806	2.71771	299.71771	151.21771	15121.77177	2.71771	299.7177	151.21771	15121.77149	2.71771	299.71771	151.21771	15121.771	2020-01-01	2020-01-02	2020-01-01 00:15:05	2020-01-02 03:43:26	2020-01-01 00:15:05.000	2020-01-02 03:43:26.000	905	99806	50355.5	5035550	905	99806	50355.5	5035550	-32663	32272	4480.3	448030	-127	124	0.3	30
+906	100	10896	99807	2.72072	299.72072	151.22072	15122.07207	2.72072	299.72073	151.22072	15122.07212	2.72072	299.72072	151.22072	15122.072	2020-01-01	2020-01-02	2020-01-01 00:15:06	2020-01-02 03:43:27	2020-01-01 00:15:06.000	2020-01-02 03:43:27.000	906	99807	50356.5	5035650	906	99807	50356.5	5035650	-32662	32273	4481.3	448130	-126	125	1.3	130
+907	100	10897	99808	2.72372	299.72372	151.22372	15122.37237	2.72372	299.72372	151.22372	15122.37243	2.72372	299.72372	151.22372	15122.372	2020-01-01	2020-01-02	2020-01-01 00:15:07	2020-01-02 03:43:28	2020-01-01 00:15:07.000	2020-01-02 03:43:28.000	907	99808	50357.5	5035750	907	99808	50357.5	5035750	-32661	32274	4482.3	448230	-125	126	2.3	230
+908	100	10898	99809	2.72672	299.72672	151.22672	15122.67267	2.72672	299.7267	151.22672	15122.67272	2.72672	299.72672	151.22672	15122.672	2020-01-01	2020-01-02	2020-01-01 00:15:08	2020-01-02 03:43:29	2020-01-01 00:15:08.000	2020-01-02 03:43:29.000	908	99809	50358.5	5035850	908	99809	50358.5	5035850	-32660	32275	4483.3	448330	-124	127	3.3	330
+909	100	10899	99810	2.72972	299.72972	151.22972	15122.97297	2.72972	299.72974	151.22973	15122.97332	2.72972	299.72972	151.22972	15122.972	2020-01-01	2020-01-02	2020-01-01 00:15:09	2020-01-02 03:43:30	2020-01-01 00:15:09.000	2020-01-02 03:43:30.000	909	99810	50359.5	5035950	909	99810	50359.5	5035950	-32659	32276	4484.3	448430	-128	127	1.74	174
 91	102	10081	99991	0.27327	300.27327	150.27327	15177.6006	0.27327	300.2733	150.27327	15177.60054	0.27327	300.27327	150.27327	15177.60027	2020-01-01	2020-01-02	2020-01-01 00:01:31	2020-01-02 03:46:31	2020-01-01 00:01:31.000	2020-01-02 03:46:31.000	91	99991	50041	5054141	91	99991	50041	5054141	-32478	32457	4620.009900990099	466621	-128	127	-0.6633663366336634	-67
-910	100	10900	99811	2.73273	299.73273	151.23273	15123.27327	2.73273	299.73273	151.23272	15123.27296	2.73273	299.73273	151.23273	15123.27300	2020-01-01	2020-01-02	2020-01-01 00:15:10	2020-01-02 03:43:31	2020-01-01 00:15:10.000	2020-01-02 03:43:31.000	910	99811	50360.5	5036050	910	99811	50360.5	5036050	-32658	32277	4485.3	448530	-128	123	0.18	18
-911	100	10901	99812	2.73573	299.73573	151.23573	15123.57357	2.73573	299.73575	151.23573	15123.57359	2.73573	299.73573	151.23573	15123.57300	2020-01-01	2020-01-02	2020-01-01 00:15:11	2020-01-02 03:43:32	2020-01-01 00:15:11.000	2020-01-02 03:43:32.000	911	99812	50361.5	5036150	911	99812	50361.5	5036150	-32657	32278	4486.3	448630	-127	124	1.18	118
-912	100	10902	99813	2.73873	299.73873	151.23873	15123.87387	2.73873	299.73874	151.23873	15123.8739	2.73873	299.73873	151.23873	15123.87300	2020-01-01	2020-01-02	2020-01-01 00:15:12	2020-01-02 03:43:33	2020-01-01 00:15:12.000	2020-01-02 03:43:33.000	912	99813	50362.5	5036250	912	99813	50362.5	5036250	-32656	32279	4487.3	448730	-126	125	2.18	218
-913	100	10903	99814	2.74174	299.74174	151.24174	15124.17417	2.74174	299.74173	151.24174	15124.17419	2.74174	299.74174	151.24174000000002	15124.17400	2020-01-01	2020-01-02	2020-01-01 00:15:13	2020-01-02 03:43:34	2020-01-01 00:15:13.000	2020-01-02 03:43:34.000	913	99814	50363.5	5036350	913	99814	50363.5	5036350	-32655	32280	4488.3	448830	-125	126	3.18	318
-914	100	10904	99815	2.74474	299.74474	151.24474	15124.47447	2.74474	299.74475	151.24474	15124.47479	2.74474	299.74474	151.24474	15124.47400	2020-01-01	2020-01-02	2020-01-01 00:15:14	2020-01-02 03:43:35	2020-01-01 00:15:14.000	2020-01-02 03:43:35.000	914	99815	50364.5	5036450	914	99815	50364.5	5036450	-32654	32281	4489.3	448930	-124	127	4.18	418
-915	100	10905	99816	2.74774	299.74774	151.24774	15124.77477	2.74774	299.74774	151.24774	15124.77447	2.74774	299.74774	151.24774	15124.77400	2020-01-01	2020-01-02	2020-01-01 00:15:15	2020-01-02 03:43:36	2020-01-01 00:15:15.000	2020-01-02 03:43:36.000	915	99816	50365.5	5036550	915	99816	50365.5	5036550	-32653	32282	4490.3	449030	-128	127	2.62	262
-916	100	10906	99817	2.75075	299.75075	151.25075	15125.07507	2.75075	299.75076	151.25075	15125.07507	2.75075	299.75075	151.25075	15125.07500	2020-01-01	2020-01-02	2020-01-01 00:15:16	2020-01-02 03:43:37	2020-01-01 00:15:16.000	2020-01-02 03:43:37.000	916	99817	50366.5	5036650	916	99817	50366.5	5036650	-32652	32283	4491.3	449130	-128	127	1.06	106
-917	100	10907	99818	2.75375	299.75375	151.25375	15125.37537	2.75375	299.75375	151.25375	15125.37536	2.75375	299.75375	151.25375	15125.37500	2020-01-01	2020-01-02	2020-01-01 00:15:17	2020-01-02 03:43:38	2020-01-01 00:15:17.000	2020-01-02 03:43:38.000	917	99818	50367.5	5036750	917	99818	50367.5	5036750	-32651	32284	4492.3	449230	-128	124	-0.5	-50
-918	100	10908	99819	2.75675	299.75675	151.25675	15125.67567	2.75675	299.75674	151.25675	15125.67566	2.75675	299.75675	151.25674999999998	15125.67500	2020-01-01	2020-01-02	2020-01-01 00:15:18	2020-01-02 03:43:39	2020-01-01 00:15:18.000	2020-01-02 03:43:39.000	918	99819	50368.5	5036850	918	99819	50368.5	5036850	-32650	32285	4493.3	449330	-127	125	0.5	50
-919	100	10909	99820	2.75975	299.75975	151.25975	15125.97597	2.75975	299.75977	151.25976	15125.97626	2.75975	299.75975	151.25975	15125.97500	2020-01-01	2020-01-02	2020-01-01 00:15:19	2020-01-02 03:43:40	2020-01-01 00:15:19.000	2020-01-02 03:43:40.000	919	99820	50369.5	5036950	919	99820	50369.5	5036950	-32649	32286	4494.3	449430	-126	126	1.5	150
+910	100	10900	99811	2.73273	299.73273	151.23273	15123.27327	2.73273	299.73273	151.23272	15123.27296	2.73273	299.73273	151.23273	15123.273	2020-01-01	2020-01-02	2020-01-01 00:15:10	2020-01-02 03:43:31	2020-01-01 00:15:10.000	2020-01-02 03:43:31.000	910	99811	50360.5	5036050	910	99811	50360.5	5036050	-32658	32277	4485.3	448530	-128	123	0.18	18
+911	100	10901	99812	2.73573	299.73573	151.23573	15123.57357	2.73573	299.73575	151.23573	15123.57359	2.73573	299.73573	151.23573	15123.573	2020-01-01	2020-01-02	2020-01-01 00:15:11	2020-01-02 03:43:32	2020-01-01 00:15:11.000	2020-01-02 03:43:32.000	911	99812	50361.5	5036150	911	99812	50361.5	5036150	-32657	32278	4486.3	448630	-127	124	1.18	118
+912	100	10902	99813	2.73873	299.73873	151.23873	15123.87387	2.73873	299.73874	151.23873	15123.8739	2.73873	299.73873	151.23873	15123.873	2020-01-01	2020-01-02	2020-01-01 00:15:12	2020-01-02 03:43:33	2020-01-01 00:15:12.000	2020-01-02 03:43:33.000	912	99813	50362.5	5036250	912	99813	50362.5	5036250	-32656	32279	4487.3	448730	-126	125	2.18	218
+913	100	10903	99814	2.74174	299.74174	151.24174	15124.17417	2.74174	299.74173	151.24174	15124.17419	2.74174	299.74174	151.24174000000002	15124.174	2020-01-01	2020-01-02	2020-01-01 00:15:13	2020-01-02 03:43:34	2020-01-01 00:15:13.000	2020-01-02 03:43:34.000	913	99814	50363.5	5036350	913	99814	50363.5	5036350	-32655	32280	4488.3	448830	-125	126	3.18	318
+914	100	10904	99815	2.74474	299.74474	151.24474	15124.47447	2.74474	299.74475	151.24474	15124.47479	2.74474	299.74474	151.24474	15124.474	2020-01-01	2020-01-02	2020-01-01 00:15:14	2020-01-02 03:43:35	2020-01-01 00:15:14.000	2020-01-02 03:43:35.000	914	99815	50364.5	5036450	914	99815	50364.5	5036450	-32654	32281	4489.3	448930	-124	127	4.18	418
+915	100	10905	99816	2.74774	299.74774	151.24774	15124.77477	2.74774	299.74774	151.24774	15124.77447	2.74774	299.74774	151.24774	15124.774	2020-01-01	2020-01-02	2020-01-01 00:15:15	2020-01-02 03:43:36	2020-01-01 00:15:15.000	2020-01-02 03:43:36.000	915	99816	50365.5	5036550	915	99816	50365.5	5036550	-32653	32282	4490.3	449030	-128	127	2.62	262
+916	100	10906	99817	2.75075	299.75075	151.25075	15125.07507	2.75075	299.75076	151.25075	15125.07507	2.75075	299.75075	151.25075	15125.075	2020-01-01	2020-01-02	2020-01-01 00:15:16	2020-01-02 03:43:37	2020-01-01 00:15:16.000	2020-01-02 03:43:37.000	916	99817	50366.5	5036650	916	99817	50366.5	5036650	-32652	32283	4491.3	449130	-128	127	1.06	106
+917	100	10907	99818	2.75375	299.75375	151.25375	15125.37537	2.75375	299.75375	151.25375	15125.37536	2.75375	299.75375	151.25375	15125.375	2020-01-01	2020-01-02	2020-01-01 00:15:17	2020-01-02 03:43:38	2020-01-01 00:15:17.000	2020-01-02 03:43:38.000	917	99818	50367.5	5036750	917	99818	50367.5	5036750	-32651	32284	4492.3	449230	-128	124	-0.5	-50
+918	100	10908	99819	2.75675	299.75675	151.25675	15125.67567	2.75675	299.75674	151.25675	15125.67566	2.75675	299.75675	151.25674999999998	15125.675	2020-01-01	2020-01-02	2020-01-01 00:15:18	2020-01-02 03:43:39	2020-01-01 00:15:18.000	2020-01-02 03:43:39.000	918	99819	50368.5	5036850	918	99819	50368.5	5036850	-32650	32285	4493.3	449330	-127	125	0.5	50
+919	100	10909	99820	2.75975	299.75975	151.25975	15125.97597	2.75975	299.75977	151.25976	15125.97626	2.75975	299.75975	151.25975	15125.975	2020-01-01	2020-01-02	2020-01-01 00:15:19	2020-01-02 03:43:40	2020-01-01 00:15:19.000	2020-01-02 03:43:40.000	919	99820	50369.5	5036950	919	99820	50369.5	5036950	-32649	32286	4494.3	449430	-126	126	1.5	150
 92	102	10082	99992	0.27627	300.27627	150.27627	15177.9039	0.27627	300.27628	150.27627	15177.90384	0.27627	300.27627	150.27627	15177.90327	2020-01-01	2020-01-02	2020-01-01 00:01:32	2020-01-02 03:46:32	2020-01-01 00:01:32.000	2020-01-02 03:46:32.000	92	99992	50042	5054242	92	99992	50042	5054242	-32477	32458	4621.009900990099	466722	-128	123	-2.198019801980198	-222
-920	100	10910	99821	2.76276	299.76276	151.26276	15126.27627	2.76276	299.76276	151.26275	15126.27594	2.76276	299.76276	151.26276	15126.27600	2020-01-01	2020-01-02	2020-01-01 00:15:20	2020-01-02 03:43:41	2020-01-01 00:15:20.000	2020-01-02 03:43:41.000	920	99821	50370.5	5037050	920	99821	50370.5	5037050	-32648	32287	4495.3	449530	-125	127	2.5	250
-921	100	10911	99822	2.76576	299.76576	151.26576	15126.57657	2.76576	299.76578	151.26576	15126.57654	2.76576	299.76576	151.26576	15126.57600	2020-01-01	2020-01-02	2020-01-01 00:15:21	2020-01-02 03:43:42	2020-01-01 00:15:21.000	2020-01-02 03:43:42.000	921	99822	50371.5	5037150	921	99822	50371.5	5037150	-32647	32288	4496.3	449630	-128	127	0.94	94
-922	100	10912	99823	2.76876	299.76876	151.26876	15126.87687	2.76876	299.76877	151.26876	15126.87683	2.76876	299.76876	151.26876000000001	15126.87600	2020-01-01	2020-01-02	2020-01-01 00:15:22	2020-01-02 03:43:43	2020-01-01 00:15:22.000	2020-01-02 03:43:43.000	922	99823	50372.5	5037250	922	99823	50372.5	5037250	-32646	32289	4497.3	449730	-128	127	-0.62	-62
-923	100	10913	99824	2.77177	299.77177	151.27177	15127.17717	2.77177	299.77176	151.27177	15127.17713	2.77177	299.77177	151.27177	15127.17700	2020-01-01	2020-01-02	2020-01-01 00:15:23	2020-01-02 03:43:44	2020-01-01 00:15:23.000	2020-01-02 03:43:44.000	923	99824	50373.5	5037350	923	99824	50373.5	5037350	-32645	32290	4498.3	449830	-128	123	-2.18	-218
-924	100	10914	99825	2.77477	299.77477	151.27477	15127.47747	2.77477	299.77478	151.27477	15127.47776	2.77477	299.77477	151.27477000000002	15127.47700	2020-01-01	2020-01-02	2020-01-01 00:15:24	2020-01-02 03:43:45	2020-01-01 00:15:24.000	2020-01-02 03:43:45.000	924	99825	50374.5	5037450	924	99825	50374.5	5037450	-32644	32291	4499.3	449930	-127	124	-1.18	-118
-925	100	10915	99826	2.77777	299.77777	151.27777	15127.77777	2.77777	299.77777	151.27777	15127.77741	2.77777	299.77777	151.27777	15127.77700	2020-01-01	2020-01-02	2020-01-01 00:15:25	2020-01-02 03:43:46	2020-01-01 00:15:25.000	2020-01-02 03:43:46.000	925	99826	50375.5	5037550	925	99826	50375.5	5037550	-32643	32292	4500.3	450030	-126	125	-0.18	-18
-926	100	10916	99827	2.78078	299.78078	151.28078	15128.07807	2.78078	299.7808	151.28078	15128.078	2.78078	299.78078	151.28078	15128.07800	2020-01-01	2020-01-02	2020-01-01 00:15:26	2020-01-02 03:43:47	2020-01-01 00:15:26.000	2020-01-02 03:43:47.000	926	99827	50376.5	5037650	926	99827	50376.5	5037650	-32642	32293	4501.3	450130	-125	126	0.82	82
-927	100	10917	99828	2.78378	299.78378	151.28378	15128.37837	2.78378	299.78378	151.28378	15128.3783	2.78378	299.78378	151.28378	15128.37800	2020-01-01	2020-01-02	2020-01-01 00:15:27	2020-01-02 03:43:48	2020-01-01 00:15:27.000	2020-01-02 03:43:48.000	927	99828	50377.5	5037750	927	99828	50377.5	5037750	-32641	32294	4502.3	450230	-124	127	1.82	182
-928	100	10918	99829	2.78678	299.78678	151.28678	15128.67867	2.78678	299.78677	151.28678	15128.6786	2.78678	299.78678	151.28678	15128.67800	2020-01-01	2020-01-02	2020-01-01 00:15:28	2020-01-02 03:43:49	2020-01-01 00:15:28.000	2020-01-02 03:43:49.000	928	99829	50378.5	5037850	928	99829	50378.5	5037850	-32640	32295	4503.3	450330	-128	127	0.26	26
-929	100	10919	99830	2.78978	299.78978	151.28978	15128.97897	2.78978	299.7898	151.28979	15128.97923	2.78978	299.78978	151.28977999999998	15128.97800	2020-01-01	2020-01-02	2020-01-01 00:15:29	2020-01-02 03:43:50	2020-01-01 00:15:29.000	2020-01-02 03:43:50.000	929	99830	50379.5	5037950	929	99830	50379.5	5037950	-32639	32296	4504.3	450430	-128	123	-1.3	-130
+920	100	10910	99821	2.76276	299.76276	151.26276	15126.27627	2.76276	299.76276	151.26275	15126.27594	2.76276	299.76276	151.26276	15126.276	2020-01-01	2020-01-02	2020-01-01 00:15:20	2020-01-02 03:43:41	2020-01-01 00:15:20.000	2020-01-02 03:43:41.000	920	99821	50370.5	5037050	920	99821	50370.5	5037050	-32648	32287	4495.3	449530	-125	127	2.5	250
+921	100	10911	99822	2.76576	299.76576	151.26576	15126.57657	2.76576	299.76578	151.26576	15126.57654	2.76576	299.76576	151.26576	15126.576	2020-01-01	2020-01-02	2020-01-01 00:15:21	2020-01-02 03:43:42	2020-01-01 00:15:21.000	2020-01-02 03:43:42.000	921	99822	50371.5	5037150	921	99822	50371.5	5037150	-32647	32288	4496.3	449630	-128	127	0.94	94
+922	100	10912	99823	2.76876	299.76876	151.26876	15126.87687	2.76876	299.76877	151.26876	15126.87683	2.76876	299.76876	151.26876000000001	15126.876	2020-01-01	2020-01-02	2020-01-01 00:15:22	2020-01-02 03:43:43	2020-01-01 00:15:22.000	2020-01-02 03:43:43.000	922	99823	50372.5	5037250	922	99823	50372.5	5037250	-32646	32289	4497.3	449730	-128	127	-0.62	-62
+923	100	10913	99824	2.77177	299.77177	151.27177	15127.17717	2.77177	299.77176	151.27177	15127.17713	2.77177	299.77177	151.27177	15127.177	2020-01-01	2020-01-02	2020-01-01 00:15:23	2020-01-02 03:43:44	2020-01-01 00:15:23.000	2020-01-02 03:43:44.000	923	99824	50373.5	5037350	923	99824	50373.5	5037350	-32645	32290	4498.3	449830	-128	123	-2.18	-218
+924	100	10914	99825	2.77477	299.77477	151.27477	15127.47747	2.77477	299.77478	151.27477	15127.47776	2.77477	299.77477	151.27477000000002	15127.477	2020-01-01	2020-01-02	2020-01-01 00:15:24	2020-01-02 03:43:45	2020-01-01 00:15:24.000	2020-01-02 03:43:45.000	924	99825	50374.5	5037450	924	99825	50374.5	5037450	-32644	32291	4499.3	449930	-127	124	-1.18	-118
+925	100	10915	99826	2.77777	299.77777	151.27777	15127.77777	2.77777	299.77777	151.27777	15127.77741	2.77777	299.77777	151.27777	15127.777	2020-01-01	2020-01-02	2020-01-01 00:15:25	2020-01-02 03:43:46	2020-01-01 00:15:25.000	2020-01-02 03:43:46.000	925	99826	50375.5	5037550	925	99826	50375.5	5037550	-32643	32292	4500.3	450030	-126	125	-0.18	-18
+926	100	10916	99827	2.78078	299.78078	151.28078	15128.07807	2.78078	299.7808	151.28078	15128.078	2.78078	299.78078	151.28078	15128.078	2020-01-01	2020-01-02	2020-01-01 00:15:26	2020-01-02 03:43:47	2020-01-01 00:15:26.000	2020-01-02 03:43:47.000	926	99827	50376.5	5037650	926	99827	50376.5	5037650	-32642	32293	4501.3	450130	-125	126	0.82	82
+927	100	10917	99828	2.78378	299.78378	151.28378	15128.37837	2.78378	299.78378	151.28378	15128.3783	2.78378	299.78378	151.28378	15128.378	2020-01-01	2020-01-02	2020-01-01 00:15:27	2020-01-02 03:43:48	2020-01-01 00:15:27.000	2020-01-02 03:43:48.000	927	99828	50377.5	5037750	927	99828	50377.5	5037750	-32641	32294	4502.3	450230	-124	127	1.82	182
+928	100	10918	99829	2.78678	299.78678	151.28678	15128.67867	2.78678	299.78677	151.28678	15128.6786	2.78678	299.78678	151.28678	15128.678	2020-01-01	2020-01-02	2020-01-01 00:15:28	2020-01-02 03:43:49	2020-01-01 00:15:28.000	2020-01-02 03:43:49.000	928	99829	50378.5	5037850	928	99829	50378.5	5037850	-32640	32295	4503.3	450330	-128	127	0.26	26
+929	100	10919	99830	2.78978	299.78978	151.28978	15128.97897	2.78978	299.7898	151.28979	15128.97923	2.78978	299.78978	151.28977999999998	15128.978	2020-01-01	2020-01-02	2020-01-01 00:15:29	2020-01-02 03:43:50	2020-01-01 00:15:29.000	2020-01-02 03:43:50.000	929	99830	50379.5	5037950	929	99830	50379.5	5037950	-32639	32296	4504.3	450430	-128	123	-1.3	-130
 93	102	10083	99993	0.27927	300.27927	150.27927	15178.2072	0.27927	300.27927	150.27927	15178.20715	0.27927	300.27927	150.27927	15178.20627	2020-01-01	2020-01-02	2020-01-01 00:01:33	2020-01-02 03:46:33	2020-01-01 00:01:33.000	2020-01-02 03:46:33.000	93	99993	50043	5054343	93	99993	50043	5054343	-32476	32459	4622.009900990099	466823	-127	124	-1.198019801980198	-121
-930	100	10920	99831	2.79279	299.79279	151.29279	15129.27927	2.79279	299.7928	151.29278	15129.27888	2.79279	299.79279	151.29279	15129.27900	2020-01-01	2020-01-02	2020-01-01 00:15:30	2020-01-02 03:43:51	2020-01-01 00:15:30.000	2020-01-02 03:43:51.000	930	99831	50380.5	5038050	930	99831	50380.5	5038050	-32638	32297	4505.3	450530	-127	124	-0.3	-30
-931	100	10921	99832	2.79579	299.79579	151.29579	15129.57957	2.79579	299.7958	151.29579	15129.57963	2.79579	299.79579	151.29579	15129.57900	2020-01-01	2020-01-02	2020-01-01 00:15:31	2020-01-02 03:43:52	2020-01-01 00:15:31.000	2020-01-02 03:43:52.000	931	99832	50381.5	5038150	931	99832	50381.5	5038150	-32637	32298	4506.3	450630	-126	125	0.7	70
-932	100	10922	99833	2.79879	299.79879	151.29879	15129.87987	2.79879	299.7988	151.29879	15129.87977	2.79879	299.79879	151.29879	15129.87900	2020-01-01	2020-01-02	2020-01-01 00:15:32	2020-01-02 03:43:53	2020-01-01 00:15:32.000	2020-01-02 03:43:53.000	932	99833	50382.5	5038250	932	99833	50382.5	5038250	-32636	32299	4507.3	450730	-125	126	1.7	170
-933	100	10923	99834	2.8018	299.8018	151.3018	15130.18018	2.8018	299.8018	151.3018	15130.18011	2.80180	299.80180	151.30180000000001	15130.18000	2020-01-01	2020-01-02	2020-01-01 00:15:33	2020-01-02 03:43:54	2020-01-01 00:15:33.000	2020-01-02 03:43:54.000	933	99834	50383.5	5038350	933	99834	50383.5	5038350	-32635	32300	4508.3	450830	-124	127	2.7	270
-934	100	10924	99835	2.8048	299.8048	151.3048	15130.48048	2.8048	299.8048	151.3048	15130.48071	2.80480	299.80480	151.3048	15130.48000	2020-01-01	2020-01-02	2020-01-01 00:15:34	2020-01-02 03:43:55	2020-01-01 00:15:34.000	2020-01-02 03:43:55.000	934	99835	50384.5	5038450	934	99835	50384.5	5038450	-32634	32301	4509.3	450930	-128	127	1.14	114
-935	100	10925	99836	2.8078	299.8078	151.3078	15130.78078	2.8078	299.8078	151.3078	15130.78034	2.80780	299.80780	151.30780000000001	15130.78000	2020-01-01	2020-01-02	2020-01-01 00:15:35	2020-01-02 03:43:56	2020-01-01 00:15:35.000	2020-01-02 03:43:56.000	935	99836	50385.5	5038550	935	99836	50385.5	5038550	-32633	32302	4510.3	451030	-128	123	-0.42	-42
-936	100	10926	99837	2.81081	299.81081	151.31081	15131.08108	2.81081	299.81082	151.31081	15131.0811	2.81081	299.81081	151.31081	15131.08100	2020-01-01	2020-01-02	2020-01-01 00:15:36	2020-01-02 03:43:57	2020-01-01 00:15:36.000	2020-01-02 03:43:57.000	936	99837	50386.5	5038650	936	99837	50386.5	5038650	-32632	32303	4511.3	451130	-127	124	0.58	58
-937	100	10927	99838	2.81381	299.81381	151.31381	15131.38138	2.81381	299.8138	151.31381	15131.38124	2.81381	299.81381	151.31381	15131.38100	2020-01-01	2020-01-02	2020-01-01 00:15:37	2020-01-02 03:43:58	2020-01-01 00:15:37.000	2020-01-02 03:43:58.000	937	99838	50387.5	5038750	937	99838	50387.5	5038750	-32631	32304	4512.3	451230	-126	125	1.58	158
-938	100	10928	99839	2.81681	299.81681	151.31681	15131.68168	2.81681	299.8168	151.31681	15131.68157	2.81681	299.81681	151.31681	15131.68100	2020-01-01	2020-01-02	2020-01-01 00:15:38	2020-01-02 03:43:59	2020-01-01 00:15:38.000	2020-01-02 03:43:59.000	938	99839	50388.5	5038850	938	99839	50388.5	5038850	-32630	32305	4513.3	451330	-125	126	2.58	258
-939	100	10929	99840	2.81981	299.81981	151.31981	15131.98198	2.81982	299.81982	151.31982	15131.98217	2.81981	299.81981	151.31981	15131.98100	2020-01-01	2020-01-02	2020-01-01 00:15:39	2020-01-02 03:44:00	2020-01-01 00:15:39.000	2020-01-02 03:44:00.000	939	99840	50389.5	5038950	939	99840	50389.5	5038950	-32629	32306	4514.3	451430	-124	127	3.58	358
+930	100	10920	99831	2.79279	299.79279	151.29279	15129.27927	2.79279	299.7928	151.29278	15129.27888	2.79279	299.79279	151.29279	15129.279	2020-01-01	2020-01-02	2020-01-01 00:15:30	2020-01-02 03:43:51	2020-01-01 00:15:30.000	2020-01-02 03:43:51.000	930	99831	50380.5	5038050	930	99831	50380.5	5038050	-32638	32297	4505.3	450530	-127	124	-0.3	-30
+931	100	10921	99832	2.79579	299.79579	151.29579	15129.57957	2.79579	299.7958	151.29579	15129.57963	2.79579	299.79579	151.29579	15129.579	2020-01-01	2020-01-02	2020-01-01 00:15:31	2020-01-02 03:43:52	2020-01-01 00:15:31.000	2020-01-02 03:43:52.000	931	99832	50381.5	5038150	931	99832	50381.5	5038150	-32637	32298	4506.3	450630	-126	125	0.7	70
+932	100	10922	99833	2.79879	299.79879	151.29879	15129.87987	2.79879	299.7988	151.29879	15129.87977	2.79879	299.79879	151.29879	15129.879	2020-01-01	2020-01-02	2020-01-01 00:15:32	2020-01-02 03:43:53	2020-01-01 00:15:32.000	2020-01-02 03:43:53.000	932	99833	50382.5	5038250	932	99833	50382.5	5038250	-32636	32299	4507.3	450730	-125	126	1.7	170
+933	100	10923	99834	2.8018	299.8018	151.3018	15130.18018	2.8018	299.8018	151.3018	15130.18011	2.8018	299.8018	151.30180000000001	15130.18	2020-01-01	2020-01-02	2020-01-01 00:15:33	2020-01-02 03:43:54	2020-01-01 00:15:33.000	2020-01-02 03:43:54.000	933	99834	50383.5	5038350	933	99834	50383.5	5038350	-32635	32300	4508.3	450830	-124	127	2.7	270
+934	100	10924	99835	2.8048	299.8048	151.3048	15130.48048	2.8048	299.8048	151.3048	15130.48071	2.8048	299.8048	151.3048	15130.48	2020-01-01	2020-01-02	2020-01-01 00:15:34	2020-01-02 03:43:55	2020-01-01 00:15:34.000	2020-01-02 03:43:55.000	934	99835	50384.5	5038450	934	99835	50384.5	5038450	-32634	32301	4509.3	450930	-128	127	1.14	114
+935	100	10925	99836	2.8078	299.8078	151.3078	15130.78078	2.8078	299.8078	151.3078	15130.78034	2.8078	299.8078	151.30780000000001	15130.78	2020-01-01	2020-01-02	2020-01-01 00:15:35	2020-01-02 03:43:56	2020-01-01 00:15:35.000	2020-01-02 03:43:56.000	935	99836	50385.5	5038550	935	99836	50385.5	5038550	-32633	32302	4510.3	451030	-128	123	-0.42	-42
+936	100	10926	99837	2.81081	299.81081	151.31081	15131.08108	2.81081	299.81082	151.31081	15131.0811	2.81081	299.81081	151.31081	15131.081	2020-01-01	2020-01-02	2020-01-01 00:15:36	2020-01-02 03:43:57	2020-01-01 00:15:36.000	2020-01-02 03:43:57.000	936	99837	50386.5	5038650	936	99837	50386.5	5038650	-32632	32303	4511.3	451130	-127	124	0.58	58
+937	100	10927	99838	2.81381	299.81381	151.31381	15131.38138	2.81381	299.8138	151.31381	15131.38124	2.81381	299.81381	151.31381	15131.381	2020-01-01	2020-01-02	2020-01-01 00:15:37	2020-01-02 03:43:58	2020-01-01 00:15:37.000	2020-01-02 03:43:58.000	937	99838	50387.5	5038750	937	99838	50387.5	5038750	-32631	32304	4512.3	451230	-126	125	1.58	158
+938	100	10928	99839	2.81681	299.81681	151.31681	15131.68168	2.81681	299.8168	151.31681	15131.68157	2.81681	299.81681	151.31681	15131.681	2020-01-01	2020-01-02	2020-01-01 00:15:38	2020-01-02 03:43:59	2020-01-01 00:15:38.000	2020-01-02 03:43:59.000	938	99839	50388.5	5038850	938	99839	50388.5	5038850	-32630	32305	4513.3	451330	-125	126	2.58	258
+939	100	10929	99840	2.81981	299.81981	151.31981	15131.98198	2.81982	299.81982	151.31982	15131.98217	2.81981	299.81981	151.31981	15131.981	2020-01-01	2020-01-02	2020-01-01 00:15:39	2020-01-02 03:44:00	2020-01-01 00:15:39.000	2020-01-02 03:44:00.000	939	99840	50389.5	5038950	939	99840	50389.5	5038950	-32629	32306	4514.3	451430	-124	127	3.58	358
 94	102	10084	99994	0.28228	300.28228	150.28228	15178.51051	0.28228	300.2823	150.28228	15178.51078	0.28228	300.28228	150.28228000000001	15178.51028	2020-01-01	2020-01-02	2020-01-01 00:01:34	2020-01-02 03:46:34	2020-01-01 00:01:34.000	2020-01-02 03:46:34.000	94	99994	50044	5054444	94	99994	50044	5054444	-32475	32460	4623.009900990099	466924	-126	125	-0.19801980198019803	-20
-940	100	10930	99841	2.82282	299.82282	151.32282	15132.28228	2.82282	299.8228	151.32282	15132.28247	2.82282	299.82282	151.32281999999998	15132.28200	2020-01-01	2020-01-02	2020-01-01 00:15:40	2020-01-02 03:44:01	2020-01-01 00:15:40.000	2020-01-02 03:44:01.000	940	99841	50390.5	5039050	940	99841	50390.5	5039050	-32628	32307	4515.3	451530	-128	127	2.02	202
-941	100	10931	99842	2.82582	299.82582	151.32582	15132.58258	2.82582	299.82584	151.32582	15132.58257	2.82582	299.82582	151.32582	15132.58200	2020-01-01	2020-01-02	2020-01-01 00:15:41	2020-01-02 03:44:02	2020-01-01 00:15:41.000	2020-01-02 03:44:02.000	941	99842	50391.5	5039150	941	99842	50391.5	5039150	-32627	32308	4516.3	451630	-128	127	0.46	46
-942	100	10932	99843	2.82882	299.82882	151.32882	15132.88288	2.82882	299.82883	151.32882	15132.88275	2.82882	299.82882	151.32882	15132.88200	2020-01-01	2020-01-02	2020-01-01 00:15:42	2020-01-02 03:44:03	2020-01-01 00:15:42.000	2020-01-02 03:44:03.000	942	99843	50392.5	5039250	942	99843	50392.5	5039250	-32626	32309	4517.3	451730	-128	124	-1.1	-110
-943	100	10933	99844	2.83183	299.83183	151.33183	15133.18318	2.83183	299.83182	151.33183	15133.18304	2.83183	299.83183	151.33183	15133.18300	2020-01-01	2020-01-02	2020-01-01 00:15:43	2020-01-02 03:44:04	2020-01-01 00:15:43.000	2020-01-02 03:44:04.000	943	99844	50393.5	5039350	943	99844	50393.5	5039350	-32625	32310	4518.3	451830	-127	125	-0.1	-10
-944	100	10934	99845	2.83483	299.83483	151.33483	15133.48348	2.83483	299.83484	151.33483	15133.48364	2.83483	299.83483	151.33483	15133.48300	2020-01-01	2020-01-02	2020-01-01 00:15:44	2020-01-02 03:44:05	2020-01-01 00:15:44.000	2020-01-02 03:44:05.000	944	99845	50394.5	5039450	944	99845	50394.5	5039450	-32624	32311	4519.3	451930	-126	126	0.9	90
-945	100	10935	99846	2.83783	299.83783	151.33783	15133.78378	2.83783	299.83783	151.33783	15133.78393	2.83783	299.83783	151.33783	15133.78300	2020-01-01	2020-01-02	2020-01-01 00:15:45	2020-01-02 03:44:06	2020-01-01 00:15:45.000	2020-01-02 03:44:06.000	945	99846	50395.5	5039550	945	99846	50395.5	5039550	-32623	32312	4520.3	452030	-125	127	1.9	190
-946	100	10936	99847	2.84084	299.84084	151.34084	15134.08408	2.84084	299.84085	151.34084	15134.08404	2.84084	299.84084	151.34084000000001	15134.08400	2020-01-01	2020-01-02	2020-01-01 00:15:46	2020-01-02 03:44:07	2020-01-01 00:15:46.000	2020-01-02 03:44:07.000	946	99847	50396.5	5039650	946	99847	50396.5	5039650	-32622	32313	4521.3	452130	-128	127	0.34	34
-947	100	10937	99848	2.84384	299.84384	151.34384	15134.38438	2.84384	299.84384	151.34384	15134.38421	2.84384	299.84384	151.34384	15134.38400	2020-01-01	2020-01-02	2020-01-01 00:15:47	2020-01-02 03:44:08	2020-01-01 00:15:47.000	2020-01-02 03:44:08.000	947	99848	50397.5	5039750	947	99848	50397.5	5039750	-32621	32314	4522.3	452230	-128	127	-1.22	-122
-948	100	10938	99849	2.84684	299.84684	151.34684	15134.68468	2.84684	299.84683	151.34684	15134.68452	2.84684	299.84684	151.34684	15134.68400	2020-01-01	2020-01-02	2020-01-01 00:15:48	2020-01-02 03:44:09	2020-01-01 00:15:48.000	2020-01-02 03:44:09.000	948	99849	50398.5	5039850	948	99849	50398.5	5039850	-32620	32315	4523.3	452330	-128	123	-2.78	-278
-949	100	10939	99850	2.84984	299.84984	151.34984	15134.98498	2.84985	299.84985	151.34985	15134.98527	2.84984	299.84984	151.34984	15134.98400	2020-01-01	2020-01-02	2020-01-01 00:15:49	2020-01-02 03:44:10	2020-01-01 00:15:49.000	2020-01-02 03:44:10.000	949	99850	50399.5	5039950	949	99850	50399.5	5039950	-32619	32316	4524.3	452430	-127	124	-1.78	-178
+940	100	10930	99841	2.82282	299.82282	151.32282	15132.28228	2.82282	299.8228	151.32282	15132.28247	2.82282	299.82282	151.32281999999998	15132.282	2020-01-01	2020-01-02	2020-01-01 00:15:40	2020-01-02 03:44:01	2020-01-01 00:15:40.000	2020-01-02 03:44:01.000	940	99841	50390.5	5039050	940	99841	50390.5	5039050	-32628	32307	4515.3	451530	-128	127	2.02	202
+941	100	10931	99842	2.82582	299.82582	151.32582	15132.58258	2.82582	299.82584	151.32582	15132.58257	2.82582	299.82582	151.32582	15132.582	2020-01-01	2020-01-02	2020-01-01 00:15:41	2020-01-02 03:44:02	2020-01-01 00:15:41.000	2020-01-02 03:44:02.000	941	99842	50391.5	5039150	941	99842	50391.5	5039150	-32627	32308	4516.3	451630	-128	127	0.46	46
+942	100	10932	99843	2.82882	299.82882	151.32882	15132.88288	2.82882	299.82883	151.32882	15132.88275	2.82882	299.82882	151.32882	15132.882	2020-01-01	2020-01-02	2020-01-01 00:15:42	2020-01-02 03:44:03	2020-01-01 00:15:42.000	2020-01-02 03:44:03.000	942	99843	50392.5	5039250	942	99843	50392.5	5039250	-32626	32309	4517.3	451730	-128	124	-1.1	-110
+943	100	10933	99844	2.83183	299.83183	151.33183	15133.18318	2.83183	299.83182	151.33183	15133.18304	2.83183	299.83183	151.33183	15133.183	2020-01-01	2020-01-02	2020-01-01 00:15:43	2020-01-02 03:44:04	2020-01-01 00:15:43.000	2020-01-02 03:44:04.000	943	99844	50393.5	5039350	943	99844	50393.5	5039350	-32625	32310	4518.3	451830	-127	125	-0.1	-10
+944	100	10934	99845	2.83483	299.83483	151.33483	15133.48348	2.83483	299.83484	151.33483	15133.48364	2.83483	299.83483	151.33483	15133.483	2020-01-01	2020-01-02	2020-01-01 00:15:44	2020-01-02 03:44:05	2020-01-01 00:15:44.000	2020-01-02 03:44:05.000	944	99845	50394.5	5039450	944	99845	50394.5	5039450	-32624	32311	4519.3	451930	-126	126	0.9	90
+945	100	10935	99846	2.83783	299.83783	151.33783	15133.78378	2.83783	299.83783	151.33783	15133.78393	2.83783	299.83783	151.33783	15133.783	2020-01-01	2020-01-02	2020-01-01 00:15:45	2020-01-02 03:44:06	2020-01-01 00:15:45.000	2020-01-02 03:44:06.000	945	99846	50395.5	5039550	945	99846	50395.5	5039550	-32623	32312	4520.3	452030	-125	127	1.9	190
+946	100	10936	99847	2.84084	299.84084	151.34084	15134.08408	2.84084	299.84085	151.34084	15134.08404	2.84084	299.84084	151.34084000000001	15134.084	2020-01-01	2020-01-02	2020-01-01 00:15:46	2020-01-02 03:44:07	2020-01-01 00:15:46.000	2020-01-02 03:44:07.000	946	99847	50396.5	5039650	946	99847	50396.5	5039650	-32622	32313	4521.3	452130	-128	127	0.34	34
+947	100	10937	99848	2.84384	299.84384	151.34384	15134.38438	2.84384	299.84384	151.34384	15134.38421	2.84384	299.84384	151.34384	15134.384	2020-01-01	2020-01-02	2020-01-01 00:15:47	2020-01-02 03:44:08	2020-01-01 00:15:47.000	2020-01-02 03:44:08.000	947	99848	50397.5	5039750	947	99848	50397.5	5039750	-32621	32314	4522.3	452230	-128	127	-1.22	-122
+948	100	10938	99849	2.84684	299.84684	151.34684	15134.68468	2.84684	299.84683	151.34684	15134.68452	2.84684	299.84684	151.34684	15134.684	2020-01-01	2020-01-02	2020-01-01 00:15:48	2020-01-02 03:44:09	2020-01-01 00:15:48.000	2020-01-02 03:44:09.000	948	99849	50398.5	5039850	948	99849	50398.5	5039850	-32620	32315	4523.3	452330	-128	123	-2.78	-278
+949	100	10939	99850	2.84984	299.84984	151.34984	15134.98498	2.84985	299.84985	151.34985	15134.98527	2.84984	299.84984	151.34984	15134.984	2020-01-01	2020-01-02	2020-01-01 00:15:49	2020-01-02 03:44:10	2020-01-01 00:15:49.000	2020-01-02 03:44:10.000	949	99850	50399.5	5039950	949	99850	50399.5	5039950	-32619	32316	4524.3	452430	-127	124	-1.78	-178
 95	102	10085	99995	0.28528	300.28528	150.28528	15178.81381	0.28528	300.28528	150.28528	15178.81343	0.28528	300.28528	150.28528	15178.81328	2020-01-01	2020-01-02	2020-01-01 00:01:35	2020-01-02 03:46:35	2020-01-01 00:01:35.000	2020-01-02 03:46:35.000	95	99995	50045	5054545	95	99995	50045	5054545	-32474	32461	4624.009900990099	467025	-125	126	0.801980198019802	81
-950	100	10940	99851	2.85285	299.85285	151.35285	15135.28528	2.85285	299.85284	151.35285	15135.28541	2.85285	299.85285	151.35285	15135.28500	2020-01-01	2020-01-02	2020-01-01 00:15:50	2020-01-02 03:44:11	2020-01-01 00:15:50.000	2020-01-02 03:44:11.000	950	99851	50400.5	5040050	950	99851	50400.5	5040050	-32618	32317	4525.3	452530	-126	125	-0.78	-78
-951	100	10941	99852	2.85585	299.85585	151.35585	15135.58558	2.85585	299.85587	151.35585	15135.58551	2.85585	299.85585	151.35585	15135.58500	2020-01-01	2020-01-02	2020-01-01 00:15:51	2020-01-02 03:44:12	2020-01-01 00:15:51.000	2020-01-02 03:44:12.000	951	99852	50401.5	5040150	951	99852	50401.5	5040150	-32617	32318	4526.3	452630	-125	126	0.22	22
-952	100	10942	99853	2.85885	299.85885	151.35885	15135.88588	2.85885	299.85886	151.35885	15135.88568	2.85885	299.85885	151.35885	15135.88500	2020-01-01	2020-01-02	2020-01-01 00:15:52	2020-01-02 03:44:13	2020-01-01 00:15:52.000	2020-01-02 03:44:13.000	952	99853	50402.5	5040250	952	99853	50402.5	5040250	-32616	32319	4527.3	452730	-124	127	1.22	122
-953	100	10943	99854	2.86186	299.86186	151.36186	15136.18618	2.86186	299.86185	151.36185	15136.18598	2.86186	299.86186	151.36186	15136.18600	2020-01-01	2020-01-02	2020-01-01 00:15:53	2020-01-02 03:44:14	2020-01-01 00:15:53.000	2020-01-02 03:44:14.000	953	99854	50403.5	5040350	953	99854	50403.5	5040350	-32615	32320	4528.3	452830	-128	127	-0.34	-34
-954	100	10944	99855	2.86486	299.86486	151.36486	15136.48648	2.86486	299.86487	151.36486	15136.48674	2.86486	299.86486	151.36486000000002	15136.48600	2020-01-01	2020-01-02	2020-01-01 00:15:54	2020-01-02 03:44:15	2020-01-01 00:15:54.000	2020-01-02 03:44:15.000	954	99855	50404.5	5040450	954	99855	50404.5	5040450	-32614	32321	4529.3	452930	-128	123	-1.9	-190
-955	100	10945	99856	2.86786	299.86786	151.36786	15136.78678	2.86786	299.86786	151.36786	15136.78688	2.86786	299.86786	151.36786	15136.78600	2020-01-01	2020-01-02	2020-01-01 00:15:55	2020-01-02 03:44:16	2020-01-01 00:15:55.000	2020-01-02 03:44:16.000	955	99856	50405.5	5040550	955	99856	50405.5	5040550	-32613	32322	4530.3	453030	-127	124	-0.9	-90
-956	100	10946	99857	2.87087	299.87087	151.37087	15137.08708	2.87087	299.87088	151.37087	15137.08701	2.87087	299.87087	151.37087	15137.08700	2020-01-01	2020-01-02	2020-01-01 00:15:56	2020-01-02 03:44:17	2020-01-01 00:15:56.000	2020-01-02 03:44:17.000	956	99857	50406.5	5040650	956	99857	50406.5	5040650	-32612	32323	4531.3	453130	-126	125	0.1	10
-957	100	10947	99858	2.87387	299.87387	151.37387	15137.38738	2.87387	299.87387	151.37387	15137.38716	2.87387	299.87387	151.37387	15137.38700	2020-01-01	2020-01-02	2020-01-01 00:15:57	2020-01-02 03:44:18	2020-01-01 00:15:57.000	2020-01-02 03:44:18.000	957	99858	50407.5	5040750	957	99858	50407.5	5040750	-32611	32324	4532.3	453230	-125	126	1.1	110
-958	100	10948	99859	2.87687	299.87687	151.37687	15137.68768	2.87687	299.8769	151.37687	15137.68791	2.87687	299.87687	151.37687	15137.68700	2020-01-01	2020-01-02	2020-01-01 00:15:58	2020-01-02 03:44:19	2020-01-01 00:15:58.000	2020-01-02 03:44:19.000	958	99859	50408.5	5040850	958	99859	50408.5	5040850	-32610	32325	4533.3	453330	-124	127	2.1	210
-959	100	10949	99860	2.87987	299.87987	151.37987	15137.98798	2.87988	299.87988	151.37988	15137.9882	2.87987	299.87987	151.37986999999998	15137.98700	2020-01-01	2020-01-02	2020-01-01 00:15:59	2020-01-02 03:44:20	2020-01-01 00:15:59.000	2020-01-02 03:44:20.000	959	99860	50409.5	5040950	959	99860	50409.5	5040950	-32609	32326	4534.3	453430	-128	127	0.54	54
+950	100	10940	99851	2.85285	299.85285	151.35285	15135.28528	2.85285	299.85284	151.35285	15135.28541	2.85285	299.85285	151.35285	15135.285	2020-01-01	2020-01-02	2020-01-01 00:15:50	2020-01-02 03:44:11	2020-01-01 00:15:50.000	2020-01-02 03:44:11.000	950	99851	50400.5	5040050	950	99851	50400.5	5040050	-32618	32317	4525.3	452530	-126	125	-0.78	-78
+951	100	10941	99852	2.85585	299.85585	151.35585	15135.58558	2.85585	299.85587	151.35585	15135.58551	2.85585	299.85585	151.35585	15135.585	2020-01-01	2020-01-02	2020-01-01 00:15:51	2020-01-02 03:44:12	2020-01-01 00:15:51.000	2020-01-02 03:44:12.000	951	99852	50401.5	5040150	951	99852	50401.5	5040150	-32617	32318	4526.3	452630	-125	126	0.22	22
+952	100	10942	99853	2.85885	299.85885	151.35885	15135.88588	2.85885	299.85886	151.35885	15135.88568	2.85885	299.85885	151.35885	15135.885	2020-01-01	2020-01-02	2020-01-01 00:15:52	2020-01-02 03:44:13	2020-01-01 00:15:52.000	2020-01-02 03:44:13.000	952	99853	50402.5	5040250	952	99853	50402.5	5040250	-32616	32319	4527.3	452730	-124	127	1.22	122
+953	100	10943	99854	2.86186	299.86186	151.36186	15136.18618	2.86186	299.86185	151.36185	15136.18598	2.86186	299.86186	151.36186	15136.186	2020-01-01	2020-01-02	2020-01-01 00:15:53	2020-01-02 03:44:14	2020-01-01 00:15:53.000	2020-01-02 03:44:14.000	953	99854	50403.5	5040350	953	99854	50403.5	5040350	-32615	32320	4528.3	452830	-128	127	-0.34	-34
+954	100	10944	99855	2.86486	299.86486	151.36486	15136.48648	2.86486	299.86487	151.36486	15136.48674	2.86486	299.86486	151.36486000000002	15136.486	2020-01-01	2020-01-02	2020-01-01 00:15:54	2020-01-02 03:44:15	2020-01-01 00:15:54.000	2020-01-02 03:44:15.000	954	99855	50404.5	5040450	954	99855	50404.5	5040450	-32614	32321	4529.3	452930	-128	123	-1.9	-190
+955	100	10945	99856	2.86786	299.86786	151.36786	15136.78678	2.86786	299.86786	151.36786	15136.78688	2.86786	299.86786	151.36786	15136.786	2020-01-01	2020-01-02	2020-01-01 00:15:55	2020-01-02 03:44:16	2020-01-01 00:15:55.000	2020-01-02 03:44:16.000	955	99856	50405.5	5040550	955	99856	50405.5	5040550	-32613	32322	4530.3	453030	-127	124	-0.9	-90
+956	100	10946	99857	2.87087	299.87087	151.37087	15137.08708	2.87087	299.87088	151.37087	15137.08701	2.87087	299.87087	151.37087	15137.087	2020-01-01	2020-01-02	2020-01-01 00:15:56	2020-01-02 03:44:17	2020-01-01 00:15:56.000	2020-01-02 03:44:17.000	956	99857	50406.5	5040650	956	99857	50406.5	5040650	-32612	32323	4531.3	453130	-126	125	0.1	10
+957	100	10947	99858	2.87387	299.87387	151.37387	15137.38738	2.87387	299.87387	151.37387	15137.38716	2.87387	299.87387	151.37387	15137.387	2020-01-01	2020-01-02	2020-01-01 00:15:57	2020-01-02 03:44:18	2020-01-01 00:15:57.000	2020-01-02 03:44:18.000	957	99858	50407.5	5040750	957	99858	50407.5	5040750	-32611	32324	4532.3	453230	-125	126	1.1	110
+958	100	10948	99859	2.87687	299.87687	151.37687	15137.68768	2.87687	299.8769	151.37687	15137.68791	2.87687	299.87687	151.37687	15137.687	2020-01-01	2020-01-02	2020-01-01 00:15:58	2020-01-02 03:44:19	2020-01-01 00:15:58.000	2020-01-02 03:44:19.000	958	99859	50408.5	5040850	958	99859	50408.5	5040850	-32610	32325	4533.3	453330	-124	127	2.1	210
+959	100	10949	99860	2.87987	299.87987	151.37987	15137.98798	2.87988	299.87988	151.37988	15137.9882	2.87987	299.87987	151.37986999999998	15137.987	2020-01-01	2020-01-02	2020-01-01 00:15:59	2020-01-02 03:44:20	2020-01-01 00:15:59.000	2020-01-02 03:44:20.000	959	99860	50409.5	5040950	959	99860	50409.5	5040950	-32609	32326	4534.3	453430	-128	127	0.54	54
 96	102	10086	99996	0.28828	300.28828	150.28828	15179.11711	0.28828	300.2883	150.28828	15179.11718	0.28828	300.28828	150.28828000000001	15179.11628	2020-01-01	2020-01-02	2020-01-01 00:01:36	2020-01-02 03:46:36	2020-01-01 00:01:36.000	2020-01-02 03:46:36.000	96	99996	50046	5054646	96	99996	50046	5054646	-32473	32462	4625.009900990099	467126	-124	127	1.801980198019802	182
-960	100	10950	99861	2.88288	299.88288	151.38288	15138.28828	2.88288	299.88287	151.38288	15138.28834	2.88288	299.88288	151.38288	15138.28800	2020-01-01	2020-01-02	2020-01-01 00:16:00	2020-01-02 03:44:21	2020-01-01 00:16:00.000	2020-01-02 03:44:21.000	960	99861	50410.5	5041050	960	99861	50410.5	5041050	-32608	32327	4535.3	453530	-128	123	-1.02	-102
-961	100	10951	99862	2.88588	299.88588	151.38588	15138.58858	2.88588	299.8859	151.38588	15138.58848	2.88588	299.88588	151.38588	15138.58800	2020-01-01	2020-01-02	2020-01-01 00:16:01	2020-01-02 03:44:22	2020-01-01 00:16:01.000	2020-01-02 03:44:22.000	961	99862	50411.5	5041150	961	99862	50411.5	5041150	-32607	32328	4536.3	453630	-127	124	-0.02	-2
-962	100	10952	99863	2.88888	299.88888	151.38888	15138.88888	2.88888	299.8889	151.38888	15138.88862	2.88888	299.88888	151.38888	15138.88800	2020-01-01	2020-01-02	2020-01-01 00:16:02	2020-01-02 03:44:23	2020-01-01 00:16:02.000	2020-01-02 03:44:23.000	962	99863	50412.5	5041250	962	99863	50412.5	5041250	-32606	32329	4537.3	453730	-126	125	0.98	98
-963	100	10953	99864	2.89189	299.89189	151.39189	15139.18918	2.89189	299.8919	151.39189	15139.18937	2.89189	299.89189	151.39189	15139.18900	2020-01-01	2020-01-02	2020-01-01 00:16:03	2020-01-02 03:44:24	2020-01-01 00:16:03.000	2020-01-02 03:44:24.000	963	99864	50413.5	5041350	963	99864	50413.5	5041350	-32605	32330	4538.3	453830	-125	126	1.98	198
-964	100	10954	99865	2.89489	299.89489	151.39489	15139.48948	2.89489	299.8949	151.39489	15139.48968	2.89489	299.89489	151.39489	15139.48900	2020-01-01	2020-01-02	2020-01-01 00:16:04	2020-01-02 03:44:25	2020-01-01 00:16:04.000	2020-01-02 03:44:25.000	964	99865	50414.5	5041450	964	99865	50414.5	5041450	-32604	32331	4539.3	453930	-124	127	2.98	298
-965	100	10955	99866	2.89789	299.89789	151.39789	15139.78978	2.89789	299.8979	151.39789	15139.78985	2.89789	299.89789	151.39789000000002	15139.78900	2020-01-01	2020-01-02	2020-01-01 00:16:05	2020-01-02 03:44:26	2020-01-01 00:16:05.000	2020-01-02 03:44:26.000	965	99866	50415.5	5041550	965	99866	50415.5	5041550	-32603	32332	4540.3	454030	-128	127	1.42	142
-966	100	10956	99867	2.9009	299.9009	151.4009	15140.09009	2.9009	299.9009	151.40089	15140.08996	2.90090	299.90090	151.4009	15140.09000	2020-01-01	2020-01-02	2020-01-01 00:16:06	2020-01-02 03:44:27	2020-01-01 00:16:06.000	2020-01-02 03:44:27.000	966	99867	50416.5	5041650	966	99867	50416.5	5041650	-32602	32333	4541.3	454130	-128	127	-0.14	-14
-967	100	10957	99868	2.9039	299.9039	151.4039	15140.39039	2.9039	299.9039	151.4039	15140.39009	2.90390	299.90390	151.4039	15140.39000	2020-01-01	2020-01-02	2020-01-01 00:16:07	2020-01-02 03:44:28	2020-01-01 00:16:07.000	2020-01-02 03:44:28.000	967	99868	50417.5	5041750	967	99868	50417.5	5041750	-32601	32334	4542.3	454230	-128	124	-1.7	-170
-968	100	10958	99869	2.9069	299.9069	151.4069	15140.69069	2.9069	299.90692	151.4069	15140.69084	2.90690	299.90690	151.4069	15140.69000	2020-01-01	2020-01-02	2020-01-01 00:16:08	2020-01-02 03:44:29	2020-01-01 00:16:08.000	2020-01-02 03:44:29.000	968	99869	50418.5	5041850	968	99869	50418.5	5041850	-32600	32335	4543.3	454330	-127	125	-0.7	-70
-969	100	10959	99870	2.9099	299.9099	151.4099	15140.99099	2.90991	299.9099	151.40991	15140.99114	2.90990	299.90990	151.4099	15140.99000	2020-01-01	2020-01-02	2020-01-01 00:16:09	2020-01-02 03:44:30	2020-01-01 00:16:09.000	2020-01-02 03:44:30.000	969	99870	50419.5	5041950	969	99870	50419.5	5041950	-32599	32336	4544.3	454430	-126	126	0.3	30
+960	100	10950	99861	2.88288	299.88288	151.38288	15138.28828	2.88288	299.88287	151.38288	15138.28834	2.88288	299.88288	151.38288	15138.288	2020-01-01	2020-01-02	2020-01-01 00:16:00	2020-01-02 03:44:21	2020-01-01 00:16:00.000	2020-01-02 03:44:21.000	960	99861	50410.5	5041050	960	99861	50410.5	5041050	-32608	32327	4535.3	453530	-128	123	-1.02	-102
+961	100	10951	99862	2.88588	299.88588	151.38588	15138.58858	2.88588	299.8859	151.38588	15138.58848	2.88588	299.88588	151.38588	15138.588	2020-01-01	2020-01-02	2020-01-01 00:16:01	2020-01-02 03:44:22	2020-01-01 00:16:01.000	2020-01-02 03:44:22.000	961	99862	50411.5	5041150	961	99862	50411.5	5041150	-32607	32328	4536.3	453630	-127	124	-0.02	-2
+962	100	10952	99863	2.88888	299.88888	151.38888	15138.88888	2.88888	299.8889	151.38888	15138.88862	2.88888	299.88888	151.38888	15138.888	2020-01-01	2020-01-02	2020-01-01 00:16:02	2020-01-02 03:44:23	2020-01-01 00:16:02.000	2020-01-02 03:44:23.000	962	99863	50412.5	5041250	962	99863	50412.5	5041250	-32606	32329	4537.3	453730	-126	125	0.98	98
+963	100	10953	99864	2.89189	299.89189	151.39189	15139.18918	2.89189	299.8919	151.39189	15139.18937	2.89189	299.89189	151.39189	15139.189	2020-01-01	2020-01-02	2020-01-01 00:16:03	2020-01-02 03:44:24	2020-01-01 00:16:03.000	2020-01-02 03:44:24.000	963	99864	50413.5	5041350	963	99864	50413.5	5041350	-32605	32330	4538.3	453830	-125	126	1.98	198
+964	100	10954	99865	2.89489	299.89489	151.39489	15139.48948	2.89489	299.8949	151.39489	15139.48968	2.89489	299.89489	151.39489	15139.489	2020-01-01	2020-01-02	2020-01-01 00:16:04	2020-01-02 03:44:25	2020-01-01 00:16:04.000	2020-01-02 03:44:25.000	964	99865	50414.5	5041450	964	99865	50414.5	5041450	-32604	32331	4539.3	453930	-124	127	2.98	298
+965	100	10955	99866	2.89789	299.89789	151.39789	15139.78978	2.89789	299.8979	151.39789	15139.78985	2.89789	299.89789	151.39789000000002	15139.789	2020-01-01	2020-01-02	2020-01-01 00:16:05	2020-01-02 03:44:26	2020-01-01 00:16:05.000	2020-01-02 03:44:26.000	965	99866	50415.5	5041550	965	99866	50415.5	5041550	-32603	32332	4540.3	454030	-128	127	1.42	142
+966	100	10956	99867	2.9009	299.9009	151.4009	15140.09009	2.9009	299.9009	151.40089	15140.08996	2.9009	299.9009	151.4009	15140.09	2020-01-01	2020-01-02	2020-01-01 00:16:06	2020-01-02 03:44:27	2020-01-01 00:16:06.000	2020-01-02 03:44:27.000	966	99867	50416.5	5041650	966	99867	50416.5	5041650	-32602	32333	4541.3	454130	-128	127	-0.14	-14
+967	100	10957	99868	2.9039	299.9039	151.4039	15140.39039	2.9039	299.9039	151.4039	15140.39009	2.9039	299.9039	151.4039	15140.39	2020-01-01	2020-01-02	2020-01-01 00:16:07	2020-01-02 03:44:28	2020-01-01 00:16:07.000	2020-01-02 03:44:28.000	967	99868	50417.5	5041750	967	99868	50417.5	5041750	-32601	32334	4542.3	454230	-128	124	-1.7	-170
+968	100	10958	99869	2.9069	299.9069	151.4069	15140.69069	2.9069	299.90692	151.4069	15140.69084	2.9069	299.9069	151.4069	15140.69	2020-01-01	2020-01-02	2020-01-01 00:16:08	2020-01-02 03:44:29	2020-01-01 00:16:08.000	2020-01-02 03:44:29.000	968	99869	50418.5	5041850	968	99869	50418.5	5041850	-32600	32335	4543.3	454330	-127	125	-0.7	-70
+969	100	10959	99870	2.9099	299.9099	151.4099	15140.99099	2.90991	299.9099	151.40991	15140.99114	2.9099	299.9099	151.4099	15140.99	2020-01-01	2020-01-02	2020-01-01 00:16:09	2020-01-02 03:44:30	2020-01-01 00:16:09.000	2020-01-02 03:44:30.000	969	99870	50419.5	5041950	969	99870	50419.5	5041950	-32599	32336	4544.3	454430	-126	126	0.3	30
 97	102	10087	99997	0.29129	300.29129	150.29129	15179.42042	0.29129	300.2913	150.29129	15179.42033	0.29129	300.29129	150.29129	15179.42029	2020-01-01	2020-01-02	2020-01-01 00:01:37	2020-01-02 03:46:37	2020-01-01 00:01:37.000	2020-01-02 03:46:37.000	97	99997	50047	5054747	97	99997	50047	5054747	-32472	32463	4626.009900990099	467227	-128	127	0.26732673267326734	27
-970	100	10960	99871	2.91291	299.91291	151.41291	15141.29129	2.91291	299.9129	151.41291	15141.29132	2.91291	299.91291	151.41290999999998	15141.29100	2020-01-01	2020-01-02	2020-01-01 00:16:10	2020-01-02 03:44:31	2020-01-01 00:16:10.000	2020-01-02 03:44:31.000	970	99871	50420.5	5042050	970	99871	50420.5	5042050	-32598	32337	4545.3	454530	-125	127	1.3	130
-971	100	10961	99872	2.91591	299.91591	151.41591	15141.59159	2.91591	299.91592	151.41591	15141.59142	2.91591	299.91591	151.41591	15141.59100	2020-01-01	2020-01-02	2020-01-01 00:16:11	2020-01-02 03:44:32	2020-01-01 00:16:11.000	2020-01-02 03:44:32.000	971	99872	50421.5	5042150	971	99872	50421.5	5042150	-32597	32338	4546.3	454630	-128	127	-0.26	-26
-972	100	10962	99873	2.91891	299.91891	151.41891	15141.89189	2.91891	299.9189	151.41891	15141.89172	2.91891	299.91891	151.41890999999998	15141.89100	2020-01-01	2020-01-02	2020-01-01 00:16:12	2020-01-02 03:44:33	2020-01-01 00:16:12.000	2020-01-02 03:44:33.000	972	99873	50422.5	5042250	972	99873	50422.5	5042250	-32596	32339	4547.3	454730	-128	127	-1.82	-182
-973	100	10963	99874	2.92192	299.92192	151.42192	15142.19219	2.92192	299.92194	151.42192	15142.19232	2.92192	299.92192	151.42192	15142.19200	2020-01-01	2020-01-02	2020-01-01 00:16:13	2020-01-02 03:44:34	2020-01-01 00:16:13.000	2020-01-02 03:44:34.000	973	99874	50423.5	5042350	973	99874	50423.5	5042350	-32595	32340	4548.3	454830	-128	123	-3.38	-338
-974	100	10964	99875	2.92492	299.92492	151.42492	15142.49249	2.92492	299.92493	151.42492	15142.49265	2.92492	299.92492	151.42492000000001	15142.49200	2020-01-01	2020-01-02	2020-01-01 00:16:14	2020-01-02 03:44:35	2020-01-01 00:16:14.000	2020-01-02 03:44:35.000	974	99875	50424.5	5042450	974	99875	50424.5	5042450	-32594	32341	4549.3	454930	-127	124	-2.38	-238
-975	100	10965	99876	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.79200	2020-01-01	2020-01-02	2020-01-01 00:16:15	2020-01-02 03:44:36	2020-01-01 00:16:15.000	2020-01-02 03:44:36.000	975	99876	50425.5	5042550	975	99876	50425.5	5042550	-32593	32342	4550.3	455030	-126	125	-1.38	-138
-976	100	10966	99877	2.93093	299.93093	151.43093	15143.09309	2.93093	299.93094	151.43092	15143.09289	2.93093	299.93093	151.43093000000002	15143.09300	2020-01-01	2020-01-02	2020-01-01 00:16:16	2020-01-02 03:44:37	2020-01-01 00:16:16.000	2020-01-02 03:44:37.000	976	99877	50426.5	5042650	976	99877	50426.5	5042650	-32592	32343	4551.3	455130	-125	126	-0.38	-38
-977	100	10967	99878	2.93393	299.93393	151.43393	15143.39339	2.93393	299.93393	151.43393	15143.39318	2.93393	299.93393	151.43393	15143.39300	2020-01-01	2020-01-02	2020-01-01 00:16:17	2020-01-02 03:44:38	2020-01-01 00:16:17.000	2020-01-02 03:44:38.000	977	99878	50427.5	5042750	977	99878	50427.5	5042750	-32591	32344	4552.3	455230	-124	127	0.62	62
-978	100	10968	99879	2.93693	299.93693	151.43693	15143.69369	2.93693	299.93695	151.43693	15143.69378	2.93693	299.93693	151.43693	15143.69300	2020-01-01	2020-01-02	2020-01-01 00:16:18	2020-01-02 03:44:39	2020-01-01 00:16:18.000	2020-01-02 03:44:39.000	978	99879	50428.5	5042850	978	99879	50428.5	5042850	-32590	32345	4553.3	455330	-128	127	-0.94	-94
-979	100	10969	99880	2.93993	299.93993	151.43993	15143.99399	2.93994	299.93994	151.43994	15143.99412	2.93993	299.93993	151.43993	15143.99300	2020-01-01	2020-01-02	2020-01-01 00:16:19	2020-01-02 03:44:40	2020-01-01 00:16:19.000	2020-01-02 03:44:40.000	979	99880	50429.5	5042950	979	99880	50429.5	5042950	-32589	32346	4554.3	455430	-128	123	-2.5	-250
+970	100	10960	99871	2.91291	299.91291	151.41291	15141.29129	2.91291	299.9129	151.41291	15141.29132	2.91291	299.91291	151.41290999999998	15141.291	2020-01-01	2020-01-02	2020-01-01 00:16:10	2020-01-02 03:44:31	2020-01-01 00:16:10.000	2020-01-02 03:44:31.000	970	99871	50420.5	5042050	970	99871	50420.5	5042050	-32598	32337	4545.3	454530	-125	127	1.3	130
+971	100	10961	99872	2.91591	299.91591	151.41591	15141.59159	2.91591	299.91592	151.41591	15141.59142	2.91591	299.91591	151.41591	15141.591	2020-01-01	2020-01-02	2020-01-01 00:16:11	2020-01-02 03:44:32	2020-01-01 00:16:11.000	2020-01-02 03:44:32.000	971	99872	50421.5	5042150	971	99872	50421.5	5042150	-32597	32338	4546.3	454630	-128	127	-0.26	-26
+972	100	10962	99873	2.91891	299.91891	151.41891	15141.89189	2.91891	299.9189	151.41891	15141.89172	2.91891	299.91891	151.41890999999998	15141.891	2020-01-01	2020-01-02	2020-01-01 00:16:12	2020-01-02 03:44:33	2020-01-01 00:16:12.000	2020-01-02 03:44:33.000	972	99873	50422.5	5042250	972	99873	50422.5	5042250	-32596	32339	4547.3	454730	-128	127	-1.82	-182
+973	100	10963	99874	2.92192	299.92192	151.42192	15142.19219	2.92192	299.92194	151.42192	15142.19232	2.92192	299.92192	151.42192	15142.192	2020-01-01	2020-01-02	2020-01-01 00:16:13	2020-01-02 03:44:34	2020-01-01 00:16:13.000	2020-01-02 03:44:34.000	973	99874	50423.5	5042350	973	99874	50423.5	5042350	-32595	32340	4548.3	454830	-128	123	-3.38	-338
+974	100	10964	99875	2.92492	299.92492	151.42492	15142.49249	2.92492	299.92493	151.42492	15142.49265	2.92492	299.92492	151.42492000000001	15142.492	2020-01-01	2020-01-02	2020-01-01 00:16:14	2020-01-02 03:44:35	2020-01-01 00:16:14.000	2020-01-02 03:44:35.000	974	99875	50424.5	5042450	974	99875	50424.5	5042450	-32594	32341	4549.3	454930	-127	124	-2.38	-238
+975	100	10965	99876	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.792	2020-01-01	2020-01-02	2020-01-01 00:16:15	2020-01-02 03:44:36	2020-01-01 00:16:15.000	2020-01-02 03:44:36.000	975	99876	50425.5	5042550	975	99876	50425.5	5042550	-32593	32342	4550.3	455030	-126	125	-1.38	-138
+976	100	10966	99877	2.93093	299.93093	151.43093	15143.09309	2.93093	299.93094	151.43092	15143.09289	2.93093	299.93093	151.43093000000002	15143.093	2020-01-01	2020-01-02	2020-01-01 00:16:16	2020-01-02 03:44:37	2020-01-01 00:16:16.000	2020-01-02 03:44:37.000	976	99877	50426.5	5042650	976	99877	50426.5	5042650	-32592	32343	4551.3	455130	-125	126	-0.38	-38
+977	100	10967	99878	2.93393	299.93393	151.43393	15143.39339	2.93393	299.93393	151.43393	15143.39318	2.93393	299.93393	151.43393	15143.393	2020-01-01	2020-01-02	2020-01-01 00:16:17	2020-01-02 03:44:38	2020-01-01 00:16:17.000	2020-01-02 03:44:38.000	977	99878	50427.5	5042750	977	99878	50427.5	5042750	-32591	32344	4552.3	455230	-124	127	0.62	62
+978	100	10968	99879	2.93693	299.93693	151.43693	15143.69369	2.93693	299.93695	151.43693	15143.69378	2.93693	299.93693	151.43693	15143.693	2020-01-01	2020-01-02	2020-01-01 00:16:18	2020-01-02 03:44:39	2020-01-01 00:16:18.000	2020-01-02 03:44:39.000	978	99879	50428.5	5042850	978	99879	50428.5	5042850	-32590	32345	4553.3	455330	-128	127	-0.94	-94
+979	100	10969	99880	2.93993	299.93993	151.43993	15143.99399	2.93994	299.93994	151.43994	15143.99412	2.93993	299.93993	151.43993	15143.993	2020-01-01	2020-01-02	2020-01-01 00:16:19	2020-01-02 03:44:40	2020-01-01 00:16:19.000	2020-01-02 03:44:40.000	979	99880	50429.5	5042950	979	99880	50429.5	5042950	-32589	32346	4554.3	455430	-128	123	-2.5	-250
 98	102	10088	99998	0.29429	300.29429	150.29429	15179.72372	0.29429	300.29428	150.29429	15179.72363	0.29429	300.29429	150.29429	15179.72329	2020-01-01	2020-01-02	2020-01-01 00:01:38	2020-01-02 03:46:38	2020-01-01 00:01:38.000	2020-01-02 03:46:38.000	98	99998	50048	5054848	98	99998	50048	5054848	-32471	32464	4627.009900990099	467328	-128	127	-1.2673267326732673	-128
-980	100	10970	99881	2.94294	299.94294	151.44294	15144.29429	2.94294	299.94293	151.44294	15144.29426	2.94294	299.94294	151.44294	15144.29400	2020-01-01	2020-01-02	2020-01-01 00:16:20	2020-01-02 03:44:41	2020-01-01 00:16:20.000	2020-01-02 03:44:41.000	980	99881	50430.5	5043050	980	99881	50430.5	5043050	-32588	32347	4555.3	455530	-127	124	-1.5	-150
-981	100	10971	99882	2.94594	299.94594	151.44594	15144.59459	2.94594	299.94595	151.44595	15144.59501	2.94594	299.94594	151.44593999999998	15144.59400	2020-01-01	2020-01-02	2020-01-01 00:16:21	2020-01-02 03:44:42	2020-01-01 00:16:21.000	2020-01-02 03:44:42.000	981	99882	50431.5	5043150	981	99882	50431.5	5043150	-32587	32348	4556.3	455630	-126	125	-0.5	-50
-982	100	10972	99883	2.94894	299.94894	151.44894	15144.89489	2.94894	299.94894	151.44894	15144.89466	2.94894	299.94894	151.44894	15144.89400	2020-01-01	2020-01-02	2020-01-01 00:16:22	2020-01-02 03:44:43	2020-01-01 00:16:22.000	2020-01-02 03:44:43.000	982	99883	50432.5	5043250	982	99883	50432.5	5043250	-32586	32349	4557.3	455730	-125	126	0.5	50
-983	100	10973	99884	2.95195	299.95195	151.45195	15145.19519	2.95195	299.95197	151.45195	15145.19525	2.95195	299.95195	151.45195	15145.19500	2020-01-01	2020-01-02	2020-01-01 00:16:23	2020-01-02 03:44:44	2020-01-01 00:16:23.000	2020-01-02 03:44:44.000	983	99884	50433.5	5043350	983	99884	50433.5	5043350	-32585	32350	4558.3	455830	-124	127	1.5	150
-984	100	10974	99885	2.95495	299.95495	151.45495	15145.49549	2.95495	299.95496	151.45495	15145.49559	2.95495	299.95495	151.45495	15145.49500	2020-01-01	2020-01-02	2020-01-01 00:16:24	2020-01-02 03:44:45	2020-01-01 00:16:24.000	2020-01-02 03:44:45.000	984	99885	50434.5	5043450	984	99885	50434.5	5043450	-32584	32351	4559.3	455930	-128	127	-0.06	-6
-985	100	10975	99886	2.95795	299.95795	151.45795	15145.79579	2.95795	299.95795	151.45795	15145.79573	2.95795	299.95795	151.45795	15145.79500	2020-01-01	2020-01-02	2020-01-01 00:16:25	2020-01-02 03:44:46	2020-01-01 00:16:25.000	2020-01-02 03:44:46.000	985	99886	50435.5	5043550	985	99886	50435.5	5043550	-32583	32352	4560.3	456030	-128	123	-1.62	-162
-986	100	10976	99887	2.96096	299.96096	151.46096	15146.09609	2.96096	299.96097	151.46096	15146.09648	2.96096	299.96096	151.46096	15146.09600	2020-01-01	2020-01-02	2020-01-01 00:16:26	2020-01-02 03:44:47	2020-01-01 00:16:26.000	2020-01-02 03:44:47.000	986	99887	50436.5	5043650	986	99887	50436.5	5043650	-32582	32353	4561.3	456130	-127	124	-0.62	-62
-987	100	10977	99888	2.96396	299.96396	151.46396	15146.39639	2.96396	299.96396	151.46396	15146.39612	2.96396	299.96396	151.46396000000001	15146.39600	2020-01-01	2020-01-02	2020-01-01 00:16:27	2020-01-02 03:44:48	2020-01-01 00:16:27.000	2020-01-02 03:44:48.000	987	99888	50437.5	5043750	987	99888	50437.5	5043750	-32581	32354	4562.3	456230	-126	125	0.38	38
-988	100	10978	99889	2.96696	299.96696	151.46696	15146.69669	2.96696	299.96698	151.46696	15146.69676	2.96696	299.96696	151.46696	15146.69600	2020-01-01	2020-01-02	2020-01-01 00:16:28	2020-01-02 03:44:49	2020-01-01 00:16:28.000	2020-01-02 03:44:49.000	988	99889	50438.5	5043850	988	99889	50438.5	5043850	-32580	32355	4563.3	456330	-125	126	1.38	138
-989	100	10979	99890	2.96996	299.96996	151.46996	15146.99699	2.96997	299.96997	151.46997	15146.99706	2.96996	299.96996	151.46996	15146.99600	2020-01-01	2020-01-02	2020-01-01 00:16:29	2020-01-02 03:44:50	2020-01-01 00:16:29.000	2020-01-02 03:44:50.000	989	99890	50439.5	5043950	989	99890	50439.5	5043950	-32579	32356	4564.3	456430	-124	127	2.38	238
+980	100	10970	99881	2.94294	299.94294	151.44294	15144.29429	2.94294	299.94293	151.44294	15144.29426	2.94294	299.94294	151.44294	15144.294	2020-01-01	2020-01-02	2020-01-01 00:16:20	2020-01-02 03:44:41	2020-01-01 00:16:20.000	2020-01-02 03:44:41.000	980	99881	50430.5	5043050	980	99881	50430.5	5043050	-32588	32347	4555.3	455530	-127	124	-1.5	-150
+981	100	10971	99882	2.94594	299.94594	151.44594	15144.59459	2.94594	299.94595	151.44595	15144.59501	2.94594	299.94594	151.44593999999998	15144.594	2020-01-01	2020-01-02	2020-01-01 00:16:21	2020-01-02 03:44:42	2020-01-01 00:16:21.000	2020-01-02 03:44:42.000	981	99882	50431.5	5043150	981	99882	50431.5	5043150	-32587	32348	4556.3	455630	-126	125	-0.5	-50
+982	100	10972	99883	2.94894	299.94894	151.44894	15144.89489	2.94894	299.94894	151.44894	15144.89466	2.94894	299.94894	151.44894	15144.894	2020-01-01	2020-01-02	2020-01-01 00:16:22	2020-01-02 03:44:43	2020-01-01 00:16:22.000	2020-01-02 03:44:43.000	982	99883	50432.5	5043250	982	99883	50432.5	5043250	-32586	32349	4557.3	455730	-125	126	0.5	50
+983	100	10973	99884	2.95195	299.95195	151.45195	15145.19519	2.95195	299.95197	151.45195	15145.19525	2.95195	299.95195	151.45195	15145.195	2020-01-01	2020-01-02	2020-01-01 00:16:23	2020-01-02 03:44:44	2020-01-01 00:16:23.000	2020-01-02 03:44:44.000	983	99884	50433.5	5043350	983	99884	50433.5	5043350	-32585	32350	4558.3	455830	-124	127	1.5	150
+984	100	10974	99885	2.95495	299.95495	151.45495	15145.49549	2.95495	299.95496	151.45495	15145.49559	2.95495	299.95495	151.45495	15145.495	2020-01-01	2020-01-02	2020-01-01 00:16:24	2020-01-02 03:44:45	2020-01-01 00:16:24.000	2020-01-02 03:44:45.000	984	99885	50434.5	5043450	984	99885	50434.5	5043450	-32584	32351	4559.3	455930	-128	127	-0.06	-6
+985	100	10975	99886	2.95795	299.95795	151.45795	15145.79579	2.95795	299.95795	151.45795	15145.79573	2.95795	299.95795	151.45795	15145.795	2020-01-01	2020-01-02	2020-01-01 00:16:25	2020-01-02 03:44:46	2020-01-01 00:16:25.000	2020-01-02 03:44:46.000	985	99886	50435.5	5043550	985	99886	50435.5	5043550	-32583	32352	4560.3	456030	-128	123	-1.62	-162
+986	100	10976	99887	2.96096	299.96096	151.46096	15146.09609	2.96096	299.96097	151.46096	15146.09648	2.96096	299.96096	151.46096	15146.096	2020-01-01	2020-01-02	2020-01-01 00:16:26	2020-01-02 03:44:47	2020-01-01 00:16:26.000	2020-01-02 03:44:47.000	986	99887	50436.5	5043650	986	99887	50436.5	5043650	-32582	32353	4561.3	456130	-127	124	-0.62	-62
+987	100	10977	99888	2.96396	299.96396	151.46396	15146.39639	2.96396	299.96396	151.46396	15146.39612	2.96396	299.96396	151.46396000000001	15146.396	2020-01-01	2020-01-02	2020-01-01 00:16:27	2020-01-02 03:44:48	2020-01-01 00:16:27.000	2020-01-02 03:44:48.000	987	99888	50437.5	5043750	987	99888	50437.5	5043750	-32581	32354	4562.3	456230	-126	125	0.38	38
+988	100	10978	99889	2.96696	299.96696	151.46696	15146.69669	2.96696	299.96698	151.46696	15146.69676	2.96696	299.96696	151.46696	15146.696	2020-01-01	2020-01-02	2020-01-01 00:16:28	2020-01-02 03:44:49	2020-01-01 00:16:28.000	2020-01-02 03:44:49.000	988	99889	50438.5	5043850	988	99889	50438.5	5043850	-32580	32355	4563.3	456330	-125	126	1.38	138
+989	100	10979	99890	2.96996	299.96996	151.46996	15146.99699	2.96997	299.96997	151.46997	15146.99706	2.96996	299.96996	151.46996	15146.996	2020-01-01	2020-01-02	2020-01-01 00:16:29	2020-01-02 03:44:50	2020-01-01 00:16:29.000	2020-01-02 03:44:50.000	989	99890	50439.5	5043950	989	99890	50439.5	5043950	-32579	32356	4564.3	456430	-124	127	2.38	238
 99	102	10089	99999	0.29729	300.29729	150.29729	15180.02702	0.29729	300.2973	150.29729	15180.02726	0.29729	300.29729	150.29729	15180.02629	2020-01-01	2020-01-02	2020-01-01 00:01:39	2020-01-02 03:46:39	2020-01-01 00:01:39.000	2020-01-02 03:46:39.000	99	99999	50049	5054949	99	99999	50049	5054949	-32470	32465	4628.009900990099	467429	-128	123	-2.801980198019802	-283
-990	100	10980	99891	2.97297	299.97297	151.47297	15147.29729	2.97297	299.97296	151.47297	15147.29735	2.97297	299.97297	151.47297	15147.29700	2020-01-01	2020-01-02	2020-01-01 00:16:30	2020-01-02 03:44:51	2020-01-01 00:16:30.000	2020-01-02 03:44:51.000	990	99891	50440.5	5044050	990	99891	50440.5	5044050	-32578	32357	4565.3	456530	-128	127	0.82	82
-991	100	10981	99892	2.97597	299.97597	151.47597	15147.59759	2.97597	299.97598	151.47597	15147.59795	2.97597	299.97597	151.47597	15147.59700	2020-01-01	2020-01-02	2020-01-01 00:16:31	2020-01-02 03:44:52	2020-01-01 00:16:31.000	2020-01-02 03:44:52.000	991	99892	50441.5	5044150	991	99892	50441.5	5044150	-32577	32358	4566.3	456630	-128	127	-0.74	-74
-992	100	10982	99893	2.97897	299.97897	151.47897	15147.89789	2.97897	299.97897	151.47897	15147.89759	2.97897	299.97897	151.47897	15147.89700	2020-01-01	2020-01-02	2020-01-01 00:16:32	2020-01-02 03:44:53	2020-01-01 00:16:32.000	2020-01-02 03:44:53.000	992	99893	50442.5	5044250	992	99893	50442.5	5044250	-32576	32359	4567.3	456730	-128	124	-2.3	-230
-993	100	10983	99894	2.98198	299.98198	151.48198	15148.19819	2.98198	299.982	151.48198	15148.19823	2.98198	299.98198	151.48198	15148.19800	2020-01-01	2020-01-02	2020-01-01 00:16:33	2020-01-02 03:44:54	2020-01-01 00:16:33.000	2020-01-02 03:44:54.000	993	99894	50443.5	5044350	993	99894	50443.5	5044350	-32575	32360	4568.3	456830	-127	125	-1.3	-130
-994	100	10984	99895	2.98498	299.98498	151.48498	15148.49849	2.98498	299.985	151.48498	15148.49853	2.98498	299.98498	151.48498	15148.49800	2020-01-01	2020-01-02	2020-01-01 00:16:34	2020-01-02 03:44:55	2020-01-01 00:16:34.000	2020-01-02 03:44:55.000	994	99895	50444.5	5044450	994	99895	50444.5	5044450	-32574	32361	4569.3	456930	-126	126	-0.3	-30
-995	100	10985	99896	2.98798	299.98798	151.48798	15148.79879	2.98798	299.98798	151.48798	15148.79882	2.98798	299.98798	151.48798	15148.79800	2020-01-01	2020-01-02	2020-01-01 00:16:35	2020-01-02 03:44:56	2020-01-01 00:16:35.000	2020-01-02 03:44:56.000	995	99896	50445.5	5044550	995	99896	50445.5	5044550	-32573	32362	4570.3	457030	-125	127	0.7	70
-996	100	10986	99897	2.99099	299.99099	151.49099	15149.09909	2.99099	299.991	151.49099	15149.09942	2.99099	299.99099	151.49099	15149.09900	2020-01-01	2020-01-02	2020-01-01 00:16:36	2020-01-02 03:44:57	2020-01-01 00:16:36.000	2020-01-02 03:44:57.000	996	99897	50446.5	5044650	996	99897	50446.5	5044650	-32572	32363	4571.3	457130	-128	127	-0.86	-86
-997	100	10987	99898	2.99399	299.99399	151.49399	15149.39939	2.99399	299.994	151.49399	15149.3991	2.99399	299.99399	151.49399	15149.39900	2020-01-01	2020-01-02	2020-01-01 00:16:37	2020-01-02 03:44:58	2020-01-01 00:16:37.000	2020-01-02 03:44:58.000	997	99898	50447.5	5044750	997	99898	50447.5	5044750	-32571	32364	4572.3	457230	-128	127	-2.42	-242
-998	100	10988	99899	2.99699	299.99699	151.49699	15149.69969	2.99699	299.997	151.49699	15149.6997	2.99699	299.99699	151.49699	15149.69900	2020-01-01	2020-01-02	2020-01-01 00:16:38	2020-01-02 03:44:59	2020-01-01 00:16:38.000	2020-01-02 03:44:59.000	998	99899	50448.5	5044850	998	99899	50448.5	5044850	-32570	32365	4573.3	457330	-128	123	-3.98	-398
+990	100	10980	99891	2.97297	299.97297	151.47297	15147.29729	2.97297	299.97296	151.47297	15147.29735	2.97297	299.97297	151.47297	15147.297	2020-01-01	2020-01-02	2020-01-01 00:16:30	2020-01-02 03:44:51	2020-01-01 00:16:30.000	2020-01-02 03:44:51.000	990	99891	50440.5	5044050	990	99891	50440.5	5044050	-32578	32357	4565.3	456530	-128	127	0.82	82
+991	100	10981	99892	2.97597	299.97597	151.47597	15147.59759	2.97597	299.97598	151.47597	15147.59795	2.97597	299.97597	151.47597	15147.597	2020-01-01	2020-01-02	2020-01-01 00:16:31	2020-01-02 03:44:52	2020-01-01 00:16:31.000	2020-01-02 03:44:52.000	991	99892	50441.5	5044150	991	99892	50441.5	5044150	-32577	32358	4566.3	456630	-128	127	-0.74	-74
+992	100	10982	99893	2.97897	299.97897	151.47897	15147.89789	2.97897	299.97897	151.47897	15147.89759	2.97897	299.97897	151.47897	15147.897	2020-01-01	2020-01-02	2020-01-01 00:16:32	2020-01-02 03:44:53	2020-01-01 00:16:32.000	2020-01-02 03:44:53.000	992	99893	50442.5	5044250	992	99893	50442.5	5044250	-32576	32359	4567.3	456730	-128	124	-2.3	-230
+993	100	10983	99894	2.98198	299.98198	151.48198	15148.19819	2.98198	299.982	151.48198	15148.19823	2.98198	299.98198	151.48198	15148.198	2020-01-01	2020-01-02	2020-01-01 00:16:33	2020-01-02 03:44:54	2020-01-01 00:16:33.000	2020-01-02 03:44:54.000	993	99894	50443.5	5044350	993	99894	50443.5	5044350	-32575	32360	4568.3	456830	-127	125	-1.3	-130
+994	100	10984	99895	2.98498	299.98498	151.48498	15148.49849	2.98498	299.985	151.48498	15148.49853	2.98498	299.98498	151.48498	15148.498	2020-01-01	2020-01-02	2020-01-01 00:16:34	2020-01-02 03:44:55	2020-01-01 00:16:34.000	2020-01-02 03:44:55.000	994	99895	50444.5	5044450	994	99895	50444.5	5044450	-32574	32361	4569.3	456930	-126	126	-0.3	-30
+995	100	10985	99896	2.98798	299.98798	151.48798	15148.79879	2.98798	299.98798	151.48798	15148.79882	2.98798	299.98798	151.48798	15148.798	2020-01-01	2020-01-02	2020-01-01 00:16:35	2020-01-02 03:44:56	2020-01-01 00:16:35.000	2020-01-02 03:44:56.000	995	99896	50445.5	5044550	995	99896	50445.5	5044550	-32573	32362	4570.3	457030	-125	127	0.7	70
+996	100	10986	99897	2.99099	299.99099	151.49099	15149.09909	2.99099	299.991	151.49099	15149.09942	2.99099	299.99099	151.49099	15149.099	2020-01-01	2020-01-02	2020-01-01 00:16:36	2020-01-02 03:44:57	2020-01-01 00:16:36.000	2020-01-02 03:44:57.000	996	99897	50446.5	5044650	996	99897	50446.5	5044650	-32572	32363	4571.3	457130	-128	127	-0.86	-86
+997	100	10987	99898	2.99399	299.99399	151.49399	15149.39939	2.99399	299.994	151.49399	15149.3991	2.99399	299.99399	151.49399	15149.399	2020-01-01	2020-01-02	2020-01-01 00:16:37	2020-01-02 03:44:58	2020-01-01 00:16:37.000	2020-01-02 03:44:58.000	997	99898	50447.5	5044750	997	99898	50447.5	5044750	-32571	32364	4572.3	457230	-128	127	-2.42	-242
+998	100	10988	99899	2.99699	299.99699	151.49699	15149.69969	2.99699	299.997	151.49699	15149.6997	2.99699	299.99699	151.49699	15149.699	2020-01-01	2020-01-02	2020-01-01 00:16:38	2020-01-02 03:44:59	2020-01-01 00:16:38.000	2020-01-02 03:44:59.000	998	99899	50448.5	5044850	998	99899	50448.5	5044850	-32570	32365	4573.3	457330	-128	123	-3.98	-398
  ---- select with states ---- 
 -1	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -2	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -3	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -4	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
 -5	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
-0	2	0	99900	0	300	150	15150	0	300	150	15150	0.00000	300.00000	150	15150.00000	2020-01-01	2020-01-02	2020-01-01 00:00:00	2020-01-02 03:45:00	2020-01-01 00:00:00.000	2020-01-02 03:45:00.000	0	99900	49950	5044950	0	99900	49950	5044950	-32569	32366	4529.009900990099	457430	-127	124	-2.9504950495049505	-298
-1	2	1	9991	0.003	300.003	150.003	15150.3033	0.003	300.003	150.003	15150.30329	0.00300	300.00300	150.003	15150.30300	2020-01-01	2020-01-02	2020-01-01 00:00:01	2020-01-02 03:45:01	2020-01-01 00:00:01.000	2020-01-02 03:45:01.000	1	99901	49951	5045051	1	99901	49951	5045051	-32568	32367	4530.009900990099	457531	-126	125	-1.9504950495049505	-197
+0	2	0	99900	0	300	150	15150	0	300	150	15150	0	300	150	15150	2020-01-01	2020-01-02	2020-01-01 00:00:00	2020-01-02 03:45:00	2020-01-01 00:00:00.000	2020-01-02 03:45:00.000	0	99900	49950	5044950	0	99900	49950	5044950	-32569	32366	4529.009900990099	457430	-127	124	-2.9504950495049505	-298
+1	2	1	9991	0.003	300.003	150.003	15150.3033	0.003	300.003	150.003	15150.30329	0.003	300.003	150.003	15150.303	2020-01-01	2020-01-02	2020-01-01 00:00:01	2020-01-02 03:45:01	2020-01-01 00:00:01.000	2020-01-02 03:45:01.000	1	99901	49951	5045051	1	99901	49951	5045051	-32568	32367	4530.009900990099	457531	-126	125	-1.9504950495049505	-197
 10	2	10	99910	0.03003	300.03003	150.03003	15153.03303	0.03003	300.03003	150.03002	15153.03296	0.03003	300.03003	150.03003	15153.03303	2020-01-01	2020-01-02	2020-01-01 00:00:10	2020-01-02 03:45:10	2020-01-01 00:00:10.000	2020-01-02 03:45:10.000	10	99910	49960	5045960	10	99910	49960	5045960	-32559	32376	4539.009900990099	458440	-128	127	-0.5544554455445545	-56
-100	2	100	99001	0.3003	297.3003	148.8003	14880.03003	0.3003	297.3003	148.80029	14880.02962	0.30030	297.30030	148.8003	14880.03000	2020-01-01	2020-01-02	2020-01-01 00:01:40	2020-01-02 03:30:01	2020-01-01 00:01:40.000	2020-01-02 03:30:01.000	100	99001	49550.5	4955050	100	99001	49550.5	4955050	-32469	32466	4986.02	498602	-127	124	-0.86	-86
-101	2	10091	99002	0.3033	297.3033	148.8033	14880.33033	0.3033	297.3033	148.8033	14880.33035	0.30330	297.30330	148.8033	14880.33000	2020-01-01	2020-01-02	2020-01-01 00:01:41	2020-01-02 03:30:02	2020-01-01 00:01:41.000	2020-01-02 03:30:02.000	101	99002	49551.5	4955150	101	99002	49551.5	4955150	-32468	32467	4987.02	498702	-126	125	0.14	14
-102	2	10092	99003	0.3063	297.3063	148.8063	14880.63063	0.3063	297.3063	148.8063	14880.6305	0.30630	297.30630	148.8063	14880.63000	2020-01-01	2020-01-02	2020-01-01 00:01:42	2020-01-02 03:30:03	2020-01-01 00:01:42.000	2020-01-02 03:30:03.000	102	99003	49552.5	4955250	102	99003	49552.5	4955250	-32467	32468	4988.02	498802	-125	126	1.14	114
-103	2	10093	99004	0.3093	297.3093	148.8093	14880.93093	0.3093	297.3093	148.8093	14880.93085	0.30930	297.30930	148.8093	14880.93000	2020-01-01	2020-01-02	2020-01-01 00:01:43	2020-01-02 03:30:04	2020-01-01 00:01:43.000	2020-01-02 03:30:04.000	103	99004	49553.5	4955350	103	99004	49553.5	4955350	-32466	32469	4989.02	498902	-124	127	2.14	214
-104	2	10094	99005	0.31231	297.31231	148.81231	14881.23123	0.31231	297.31232	148.81231	14881.23144	0.31231	297.31231	148.81231	14881.23100	2020-01-01	2020-01-02	2020-01-01 00:01:44	2020-01-02 03:30:05	2020-01-01 00:01:44.000	2020-01-02 03:30:05.000	104	99005	49554.5	4955450	104	99005	49554.5	4955450	-32465	32470	4990.02	499002	-128	127	0.58	58
-105	2	10095	99006	0.31531	297.31531	148.81531	14881.53153	0.31531	297.3153	148.81531	14881.53174	0.31531	297.31531	148.81531	14881.53100	2020-01-01	2020-01-02	2020-01-01 00:01:45	2020-01-02 03:30:06	2020-01-01 00:01:45.000	2020-01-02 03:30:06.000	105	99006	49555.5	4955550	105	99006	49555.5	4955550	-32464	32471	4991.02	499102	-128	123	-0.98	-98
-106	2	10096	99007	0.31831	297.31831	148.81831	14881.83183	0.31831	297.31833	148.81831	14881.83182	0.31831	297.31831	148.81831	14881.83100	2020-01-01	2020-01-02	2020-01-01 00:01:46	2020-01-02 03:30:07	2020-01-01 00:01:46.000	2020-01-02 03:30:07.000	106	99007	49556.5	4955650	106	99007	49556.5	4955650	-32463	32472	4992.02	499202	-127	124	0.02	2
-107	2	10097	99008	0.32132	297.32132	148.82132	14882.13213	0.32132	297.32132	148.82131	14882.13197	0.32132	297.32132	148.82132	14882.13200	2020-01-01	2020-01-02	2020-01-01 00:01:47	2020-01-02 03:30:08	2020-01-01 00:01:47.000	2020-01-02 03:30:08.000	107	99008	49557.5	4955750	107	99008	49557.5	4955750	-32462	32473	4993.02	499302	-126	125	1.02	102
-108	2	10098	99009	0.32432	297.32432	148.82432	14882.43243	0.32432	297.3243	148.82432	14882.43232	0.32432	297.32432	148.82432	14882.43200	2020-01-01	2020-01-02	2020-01-01 00:01:48	2020-01-02 03:30:09	2020-01-01 00:01:48.000	2020-01-02 03:30:09.000	108	99009	49558.5	4955850	108	99009	49558.5	4955850	-32461	32474	4994.02	499402	-125	126	2.02	202
-109	2	10099	99010	0.32732	297.32732	148.82732	14882.73273	0.32732	297.32733	148.82732	14882.7329	0.32732	297.32732	148.82732	14882.73200	2020-01-01	2020-01-02	2020-01-01 00:01:49	2020-01-02 03:30:10	2020-01-01 00:01:49.000	2020-01-02 03:30:10.000	109	99010	49559.5	4955950	109	99010	49559.5	4955950	-32460	32475	4995.02	499502	-124	127	3.02	302
+100	2	100	99001	0.3003	297.3003	148.8003	14880.03003	0.3003	297.3003	148.80029	14880.02962	0.3003	297.3003	148.8003	14880.03	2020-01-01	2020-01-02	2020-01-01 00:01:40	2020-01-02 03:30:01	2020-01-01 00:01:40.000	2020-01-02 03:30:01.000	100	99001	49550.5	4955050	100	99001	49550.5	4955050	-32469	32466	4986.02	498602	-127	124	-0.86	-86
+101	2	10091	99002	0.3033	297.3033	148.8033	14880.33033	0.3033	297.3033	148.8033	14880.33035	0.3033	297.3033	148.8033	14880.33	2020-01-01	2020-01-02	2020-01-01 00:01:41	2020-01-02 03:30:02	2020-01-01 00:01:41.000	2020-01-02 03:30:02.000	101	99002	49551.5	4955150	101	99002	49551.5	4955150	-32468	32467	4987.02	498702	-126	125	0.14	14
+102	2	10092	99003	0.3063	297.3063	148.8063	14880.63063	0.3063	297.3063	148.8063	14880.6305	0.3063	297.3063	148.8063	14880.63	2020-01-01	2020-01-02	2020-01-01 00:01:42	2020-01-02 03:30:03	2020-01-01 00:01:42.000	2020-01-02 03:30:03.000	102	99003	49552.5	4955250	102	99003	49552.5	4955250	-32467	32468	4988.02	498802	-125	126	1.14	114
+103	2	10093	99004	0.3093	297.3093	148.8093	14880.93093	0.3093	297.3093	148.8093	14880.93085	0.3093	297.3093	148.8093	14880.93	2020-01-01	2020-01-02	2020-01-01 00:01:43	2020-01-02 03:30:04	2020-01-01 00:01:43.000	2020-01-02 03:30:04.000	103	99004	49553.5	4955350	103	99004	49553.5	4955350	-32466	32469	4989.02	498902	-124	127	2.14	214
+104	2	10094	99005	0.31231	297.31231	148.81231	14881.23123	0.31231	297.31232	148.81231	14881.23144	0.31231	297.31231	148.81231	14881.231	2020-01-01	2020-01-02	2020-01-01 00:01:44	2020-01-02 03:30:05	2020-01-01 00:01:44.000	2020-01-02 03:30:05.000	104	99005	49554.5	4955450	104	99005	49554.5	4955450	-32465	32470	4990.02	499002	-128	127	0.58	58
+105	2	10095	99006	0.31531	297.31531	148.81531	14881.53153	0.31531	297.3153	148.81531	14881.53174	0.31531	297.31531	148.81531	14881.531	2020-01-01	2020-01-02	2020-01-01 00:01:45	2020-01-02 03:30:06	2020-01-01 00:01:45.000	2020-01-02 03:30:06.000	105	99006	49555.5	4955550	105	99006	49555.5	4955550	-32464	32471	4991.02	499102	-128	123	-0.98	-98
+106	2	10096	99007	0.31831	297.31831	148.81831	14881.83183	0.31831	297.31833	148.81831	14881.83182	0.31831	297.31831	148.81831	14881.831	2020-01-01	2020-01-02	2020-01-01 00:01:46	2020-01-02 03:30:07	2020-01-01 00:01:46.000	2020-01-02 03:30:07.000	106	99007	49556.5	4955650	106	99007	49556.5	4955650	-32463	32472	4992.02	499202	-127	124	0.02	2
+107	2	10097	99008	0.32132	297.32132	148.82132	14882.13213	0.32132	297.32132	148.82131	14882.13197	0.32132	297.32132	148.82132	14882.132	2020-01-01	2020-01-02	2020-01-01 00:01:47	2020-01-02 03:30:08	2020-01-01 00:01:47.000	2020-01-02 03:30:08.000	107	99008	49557.5	4955750	107	99008	49557.5	4955750	-32462	32473	4993.02	499302	-126	125	1.02	102
+108	2	10098	99009	0.32432	297.32432	148.82432	14882.43243	0.32432	297.3243	148.82432	14882.43232	0.32432	297.32432	148.82432	14882.432	2020-01-01	2020-01-02	2020-01-01 00:01:48	2020-01-02 03:30:09	2020-01-01 00:01:48.000	2020-01-02 03:30:09.000	108	99009	49558.5	4955850	108	99009	49558.5	4955850	-32461	32474	4994.02	499402	-125	126	2.02	202
+109	2	10099	99010	0.32732	297.32732	148.82732	14882.73273	0.32732	297.32733	148.82732	14882.7329	0.32732	297.32732	148.82732	14882.732	2020-01-01	2020-01-02	2020-01-01 00:01:49	2020-01-02 03:30:10	2020-01-01 00:01:49.000	2020-01-02 03:30:10.000	109	99010	49559.5	4955950	109	99010	49559.5	4955950	-32460	32475	4995.02	499502	-124	127	3.02	302
 11	2	10001	99911	0.03303	300.03303	150.03303	15153.33633	0.03303	300.03302	150.03303	15153.33627	0.03303	300.03303	150.03303	15153.33603	2020-01-01	2020-01-02	2020-01-01 00:00:11	2020-01-02 03:45:11	2020-01-01 00:00:11.000	2020-01-02 03:45:11.000	11	99911	49961	5046061	11	99911	49961	5046061	-32558	32377	4540.009900990099	458541	-128	123	-2.089108910891089	-211
-110	2	10100	99011	0.33033	297.33033	148.83033	14883.03303	0.33033	297.33032	148.83033	14883.03321	0.33033	297.33033	148.83033	14883.03300	2020-01-01	2020-01-02	2020-01-01 00:01:50	2020-01-02 03:30:11	2020-01-01 00:01:50.000	2020-01-02 03:30:11.000	110	99011	49560.5	4956050	110	99011	49560.5	4956050	-32459	32476	4996.02	499602	-128	127	1.46	146
-111	2	10101	99012	0.33333	297.33333	148.83333	14883.33333	0.33333	297.33334	148.83333	14883.33329	0.33333	297.33333	148.83333000000002	14883.33300	2020-01-01	2020-01-02	2020-01-01 00:01:51	2020-01-02 03:30:12	2020-01-01 00:01:51.000	2020-01-02 03:30:12.000	111	99012	49561.5	4956150	111	99012	49561.5	4956150	-32458	32477	4997.02	499702	-128	123	-0.1	-10
-112	2	10102	99013	0.33633	297.33633	148.83633	14883.63363	0.33633	297.33633	148.83633	14883.63348	0.33633	297.33633	148.83633	14883.63300	2020-01-01	2020-01-02	2020-01-01 00:01:52	2020-01-02 03:30:13	2020-01-01 00:01:52.000	2020-01-02 03:30:13.000	112	99013	49562.5	4956250	112	99013	49562.5	4956250	-32457	32478	4998.02	499802	-127	124	0.9	90
-113	2	10103	99014	0.33933	297.33933	148.83933	14883.93393	0.33933	297.33932	148.83933	14883.9338	0.33933	297.33933	148.83933000000002	14883.93300	2020-01-01	2020-01-02	2020-01-01 00:01:53	2020-01-02 03:30:14	2020-01-01 00:01:53.000	2020-01-02 03:30:14.000	113	99014	49563.5	4956350	113	99014	49563.5	4956350	-32456	32479	4999.02	499902	-126	125	1.9	190
-114	2	10104	99015	0.34234	297.34234	148.84234	14884.23423	0.34234	297.34235	148.84234	14884.23437	0.34234	297.34234	148.84234	14884.23400	2020-01-01	2020-01-02	2020-01-01 00:01:54	2020-01-02 03:30:15	2020-01-01 00:01:54.000	2020-01-02 03:30:15.000	114	99015	49564.5	4956450	114	99015	49564.5	4956450	-32455	32480	5000.02	500002	-125	126	2.9	290
-115	2	10105	99016	0.34534	297.34534	148.84534	14884.53453	0.34534	297.34534	148.84534	14884.53468	0.34534	297.34534	148.84534	14884.53400	2020-01-01	2020-01-02	2020-01-01 00:01:55	2020-01-02 03:30:16	2020-01-01 00:01:55.000	2020-01-02 03:30:16.000	115	99016	49565.5	4956550	115	99016	49565.5	4956550	-32454	32481	5001.02	500102	-124	127	3.9	390
-116	2	10106	99017	0.34834	297.34834	148.84834	14884.83483	0.34834	297.34836	148.84834	14884.83476	0.34834	297.34834	148.84834	14884.83400	2020-01-01	2020-01-02	2020-01-01 00:01:56	2020-01-02 03:30:17	2020-01-01 00:01:56.000	2020-01-02 03:30:17.000	116	99017	49566.5	4956650	116	99017	49566.5	4956650	-32453	32482	5002.02	500202	-128	127	2.34	234
-117	2	10107	99018	0.35135	297.35135	148.85135	14885.13513	0.35135	297.35135	148.85134	14885.13495	0.35135	297.35135	148.85135	14885.13500	2020-01-01	2020-01-02	2020-01-01 00:01:57	2020-01-02 03:30:18	2020-01-01 00:01:57.000	2020-01-02 03:30:18.000	117	99018	49567.5	4956750	117	99018	49567.5	4956750	-32452	32483	5003.02	500302	-128	123	0.78	78
-118	2	10108	99019	0.35435	297.35435	148.85435	14885.43543	0.35435	297.35434	148.85435	14885.43526	0.35435	297.35435	148.85434999999998	14885.43500	2020-01-01	2020-01-02	2020-01-01 00:01:58	2020-01-02 03:30:19	2020-01-01 00:01:58.000	2020-01-02 03:30:19.000	118	99019	49568.5	4956850	118	99019	49568.5	4956850	-32451	32484	5004.02	500402	-127	124	1.78	178
-119	2	10109	99020	0.35735	297.35735	148.85735	14885.73573	0.35735	297.35736	148.85736	14885.736	0.35735	297.35735	148.85735	14885.73500	2020-01-01	2020-01-02	2020-01-01 00:01:59	2020-01-02 03:30:20	2020-01-01 00:01:59.000	2020-01-02 03:30:20.000	119	99020	49569.5	4956950	119	99020	49569.5	4956950	-32450	32485	5005.02	500502	-126	125	2.78	278
+110	2	10100	99011	0.33033	297.33033	148.83033	14883.03303	0.33033	297.33032	148.83033	14883.03321	0.33033	297.33033	148.83033	14883.033	2020-01-01	2020-01-02	2020-01-01 00:01:50	2020-01-02 03:30:11	2020-01-01 00:01:50.000	2020-01-02 03:30:11.000	110	99011	49560.5	4956050	110	99011	49560.5	4956050	-32459	32476	4996.02	499602	-128	127	1.46	146
+111	2	10101	99012	0.33333	297.33333	148.83333	14883.33333	0.33333	297.33334	148.83333	14883.33329	0.33333	297.33333	148.83333000000002	14883.333	2020-01-01	2020-01-02	2020-01-01 00:01:51	2020-01-02 03:30:12	2020-01-01 00:01:51.000	2020-01-02 03:30:12.000	111	99012	49561.5	4956150	111	99012	49561.5	4956150	-32458	32477	4997.02	499702	-128	123	-0.1	-10
+112	2	10102	99013	0.33633	297.33633	148.83633	14883.63363	0.33633	297.33633	148.83633	14883.63348	0.33633	297.33633	148.83633	14883.633	2020-01-01	2020-01-02	2020-01-01 00:01:52	2020-01-02 03:30:13	2020-01-01 00:01:52.000	2020-01-02 03:30:13.000	112	99013	49562.5	4956250	112	99013	49562.5	4956250	-32457	32478	4998.02	499802	-127	124	0.9	90
+113	2	10103	99014	0.33933	297.33933	148.83933	14883.93393	0.33933	297.33932	148.83933	14883.9338	0.33933	297.33933	148.83933000000002	14883.933	2020-01-01	2020-01-02	2020-01-01 00:01:53	2020-01-02 03:30:14	2020-01-01 00:01:53.000	2020-01-02 03:30:14.000	113	99014	49563.5	4956350	113	99014	49563.5	4956350	-32456	32479	4999.02	499902	-126	125	1.9	190
+114	2	10104	99015	0.34234	297.34234	148.84234	14884.23423	0.34234	297.34235	148.84234	14884.23437	0.34234	297.34234	148.84234	14884.234	2020-01-01	2020-01-02	2020-01-01 00:01:54	2020-01-02 03:30:15	2020-01-01 00:01:54.000	2020-01-02 03:30:15.000	114	99015	49564.5	4956450	114	99015	49564.5	4956450	-32455	32480	5000.02	500002	-125	126	2.9	290
+115	2	10105	99016	0.34534	297.34534	148.84534	14884.53453	0.34534	297.34534	148.84534	14884.53468	0.34534	297.34534	148.84534	14884.534	2020-01-01	2020-01-02	2020-01-01 00:01:55	2020-01-02 03:30:16	2020-01-01 00:01:55.000	2020-01-02 03:30:16.000	115	99016	49565.5	4956550	115	99016	49565.5	4956550	-32454	32481	5001.02	500102	-124	127	3.9	390
+116	2	10106	99017	0.34834	297.34834	148.84834	14884.83483	0.34834	297.34836	148.84834	14884.83476	0.34834	297.34834	148.84834	14884.834	2020-01-01	2020-01-02	2020-01-01 00:01:56	2020-01-02 03:30:17	2020-01-01 00:01:56.000	2020-01-02 03:30:17.000	116	99017	49566.5	4956650	116	99017	49566.5	4956650	-32453	32482	5002.02	500202	-128	127	2.34	234
+117	2	10107	99018	0.35135	297.35135	148.85135	14885.13513	0.35135	297.35135	148.85134	14885.13495	0.35135	297.35135	148.85135	14885.135	2020-01-01	2020-01-02	2020-01-01 00:01:57	2020-01-02 03:30:18	2020-01-01 00:01:57.000	2020-01-02 03:30:18.000	117	99018	49567.5	4956750	117	99018	49567.5	4956750	-32452	32483	5003.02	500302	-128	123	0.78	78
+118	2	10108	99019	0.35435	297.35435	148.85435	14885.43543	0.35435	297.35434	148.85435	14885.43526	0.35435	297.35435	148.85434999999998	14885.435	2020-01-01	2020-01-02	2020-01-01 00:01:58	2020-01-02 03:30:19	2020-01-01 00:01:58.000	2020-01-02 03:30:19.000	118	99019	49568.5	4956850	118	99019	49568.5	4956850	-32451	32484	5004.02	500402	-127	124	1.78	178
+119	2	10109	99020	0.35735	297.35735	148.85735	14885.73573	0.35735	297.35736	148.85736	14885.736	0.35735	297.35735	148.85735	14885.735	2020-01-01	2020-01-02	2020-01-01 00:01:59	2020-01-02 03:30:20	2020-01-01 00:01:59.000	2020-01-02 03:30:20.000	119	99020	49569.5	4956950	119	99020	49569.5	4956950	-32450	32485	5005.02	500502	-126	125	2.78	278
 12	2	10002	99912	0.03603	300.03603	150.03603	15153.63963	0.03603	300.03604	150.03603	15153.6399	0.03603	300.03603	150.03603	15153.63903	2020-01-01	2020-01-02	2020-01-01 00:00:12	2020-01-02 03:45:12	2020-01-01 00:00:12.000	2020-01-02 03:45:12.000	12	99912	49962	5046162	12	99912	49962	5046162	-32557	32378	4541.009900990099	458642	-127	124	-1.0891089108910892	-110
-120	2	10110	99021	0.36036	297.36036	148.86036	14886.03603	0.36036	297.36035	148.86036	14886.03615	0.36036	297.36036	148.86036000000001	14886.03600	2020-01-01	2020-01-02	2020-01-01 00:02:00	2020-01-02 03:30:21	2020-01-01 00:02:00.000	2020-01-02 03:30:21.000	120	99021	49570.5	4957050	120	99021	49570.5	4957050	-32449	32486	5006.02	500602	-125	126	3.78	378
-121	2	10111	99022	0.36336	297.36336	148.86336	14886.33633	0.36336	297.36337	148.86336	14886.33627	0.36336	297.36336	148.86336	14886.33600	2020-01-01	2020-01-02	2020-01-01 00:02:01	2020-01-02 03:30:22	2020-01-01 00:02:01.000	2020-01-02 03:30:22.000	121	99022	49571.5	4957150	121	99022	49571.5	4957150	-32448	32487	5007.02	500702	-124	127	4.78	478
-122	2	10112	99023	0.36636	297.36636	148.86636	14886.63663	0.36636	297.36636	148.86636	14886.63642	0.36636	297.36636	148.86636000000001	14886.63600	2020-01-01	2020-01-02	2020-01-01 00:02:02	2020-01-02 03:30:23	2020-01-01 00:02:02.000	2020-01-02 03:30:23.000	122	99023	49572.5	4957250	122	99023	49572.5	4957250	-32447	32488	5008.02	500802	-128	127	3.22	322
-123	2	10113	99024	0.36936	297.36936	148.86936	14886.93693	0.36936	297.36935	148.86936	14886.93673	0.36936	297.36936	148.86936	14886.93600	2020-01-01	2020-01-02	2020-01-01 00:02:03	2020-01-02 03:30:24	2020-01-01 00:02:03.000	2020-01-02 03:30:24.000	123	99024	49573.5	4957350	123	99024	49573.5	4957350	-32446	32489	5009.02	500902	-128	127	1.66	166
-124	2	10114	99025	0.37237	297.37237	148.87237	14887.23723	0.37237	297.37238	148.87237	14887.23746	0.37237	297.37237	148.87237	14887.23700	2020-01-01	2020-01-02	2020-01-01 00:02:04	2020-01-02 03:30:25	2020-01-01 00:02:04.000	2020-01-02 03:30:25.000	124	99025	49574.5	4957450	124	99025	49574.5	4957450	-32445	32490	5010.02	501002	-128	124	0.1	10
-125	2	10115	99026	0.37537	297.37537	148.87537	14887.53753	0.37537	297.37537	148.87537	14887.53762	0.37537	297.37537	148.87537	14887.53700	2020-01-01	2020-01-02	2020-01-01 00:02:05	2020-01-02 03:30:26	2020-01-01 00:02:05.000	2020-01-02 03:30:26.000	125	99026	49575.5	4957550	125	99026	49575.5	4957550	-32444	32491	5011.02	501102	-127	125	1.1	110
-126	2	10116	99027	0.37837	297.37837	148.87837	14887.83783	0.37837	297.3784	148.87837	14887.83774	0.37837	297.37837	148.87837	14887.83700	2020-01-01	2020-01-02	2020-01-01 00:02:06	2020-01-02 03:30:27	2020-01-01 00:02:06.000	2020-01-02 03:30:27.000	126	99027	49576.5	4957650	126	99027	49576.5	4957650	-32443	32492	5012.02	501202	-126	126	2.1	210
-127	2	10117	99028	0.38138	297.38138	148.88138	14888.13813	0.38138	297.38138	148.88137	14888.13789	0.38138	297.38138	148.88138	14888.13800	2020-01-01	2020-01-02	2020-01-01 00:02:07	2020-01-02 03:30:28	2020-01-01 00:02:07.000	2020-01-02 03:30:28.000	127	99028	49577.5	4957750	127	99028	49577.5	4957750	-32442	32493	5013.02	501302	-125	127	3.1	310
-128	2	10118	99029	0.38438	297.38438	148.88438	14888.43843	0.38438	297.3844	148.88438	14888.43862	0.38438	297.38438	148.88438	14888.43800	2020-01-01	2020-01-02	2020-01-01 00:02:08	2020-01-02 03:30:29	2020-01-01 00:02:08.000	2020-01-02 03:30:29.000	128	99029	49578.5	4957850	128	99029	49578.5	4957850	-32441	32494	5014.02	501402	-128	127	1.54	154
-129	2	10119	99030	0.38738	297.38738	148.88738	14888.73873	0.38738	297.3874	148.88738	14888.73894	0.38738	297.38738	148.88738	14888.73800	2020-01-01	2020-01-02	2020-01-01 00:02:09	2020-01-02 03:30:30	2020-01-01 00:02:09.000	2020-01-02 03:30:30.000	129	99030	49579.5	4957950	129	99030	49579.5	4957950	-32440	32495	5015.02	501502	-128	127	-0.02	-2
+120	2	10110	99021	0.36036	297.36036	148.86036	14886.03603	0.36036	297.36035	148.86036	14886.03615	0.36036	297.36036	148.86036000000001	14886.036	2020-01-01	2020-01-02	2020-01-01 00:02:00	2020-01-02 03:30:21	2020-01-01 00:02:00.000	2020-01-02 03:30:21.000	120	99021	49570.5	4957050	120	99021	49570.5	4957050	-32449	32486	5006.02	500602	-125	126	3.78	378
+121	2	10111	99022	0.36336	297.36336	148.86336	14886.33633	0.36336	297.36337	148.86336	14886.33627	0.36336	297.36336	148.86336	14886.336	2020-01-01	2020-01-02	2020-01-01 00:02:01	2020-01-02 03:30:22	2020-01-01 00:02:01.000	2020-01-02 03:30:22.000	121	99022	49571.5	4957150	121	99022	49571.5	4957150	-32448	32487	5007.02	500702	-124	127	4.78	478
+122	2	10112	99023	0.36636	297.36636	148.86636	14886.63663	0.36636	297.36636	148.86636	14886.63642	0.36636	297.36636	148.86636000000001	14886.636	2020-01-01	2020-01-02	2020-01-01 00:02:02	2020-01-02 03:30:23	2020-01-01 00:02:02.000	2020-01-02 03:30:23.000	122	99023	49572.5	4957250	122	99023	49572.5	4957250	-32447	32488	5008.02	500802	-128	127	3.22	322
+123	2	10113	99024	0.36936	297.36936	148.86936	14886.93693	0.36936	297.36935	148.86936	14886.93673	0.36936	297.36936	148.86936	14886.936	2020-01-01	2020-01-02	2020-01-01 00:02:03	2020-01-02 03:30:24	2020-01-01 00:02:03.000	2020-01-02 03:30:24.000	123	99024	49573.5	4957350	123	99024	49573.5	4957350	-32446	32489	5009.02	500902	-128	127	1.66	166
+124	2	10114	99025	0.37237	297.37237	148.87237	14887.23723	0.37237	297.37238	148.87237	14887.23746	0.37237	297.37237	148.87237	14887.237	2020-01-01	2020-01-02	2020-01-01 00:02:04	2020-01-02 03:30:25	2020-01-01 00:02:04.000	2020-01-02 03:30:25.000	124	99025	49574.5	4957450	124	99025	49574.5	4957450	-32445	32490	5010.02	501002	-128	124	0.1	10
+125	2	10115	99026	0.37537	297.37537	148.87537	14887.53753	0.37537	297.37537	148.87537	14887.53762	0.37537	297.37537	148.87537	14887.537	2020-01-01	2020-01-02	2020-01-01 00:02:05	2020-01-02 03:30:26	2020-01-01 00:02:05.000	2020-01-02 03:30:26.000	125	99026	49575.5	4957550	125	99026	49575.5	4957550	-32444	32491	5011.02	501102	-127	125	1.1	110
+126	2	10116	99027	0.37837	297.37837	148.87837	14887.83783	0.37837	297.3784	148.87837	14887.83774	0.37837	297.37837	148.87837	14887.837	2020-01-01	2020-01-02	2020-01-01 00:02:06	2020-01-02 03:30:27	2020-01-01 00:02:06.000	2020-01-02 03:30:27.000	126	99027	49576.5	4957650	126	99027	49576.5	4957650	-32443	32492	5012.02	501202	-126	126	2.1	210
+127	2	10117	99028	0.38138	297.38138	148.88138	14888.13813	0.38138	297.38138	148.88137	14888.13789	0.38138	297.38138	148.88138	14888.138	2020-01-01	2020-01-02	2020-01-01 00:02:07	2020-01-02 03:30:28	2020-01-01 00:02:07.000	2020-01-02 03:30:28.000	127	99028	49577.5	4957750	127	99028	49577.5	4957750	-32442	32493	5013.02	501302	-125	127	3.1	310
+128	2	10118	99029	0.38438	297.38438	148.88438	14888.43843	0.38438	297.3844	148.88438	14888.43862	0.38438	297.38438	148.88438	14888.438	2020-01-01	2020-01-02	2020-01-01 00:02:08	2020-01-02 03:30:29	2020-01-01 00:02:08.000	2020-01-02 03:30:29.000	128	99029	49578.5	4957850	128	99029	49578.5	4957850	-32441	32494	5014.02	501402	-128	127	1.54	154
+129	2	10119	99030	0.38738	297.38738	148.88738	14888.73873	0.38738	297.3874	148.88738	14888.73894	0.38738	297.38738	148.88738	14888.738	2020-01-01	2020-01-02	2020-01-01 00:02:09	2020-01-02 03:30:30	2020-01-01 00:02:09.000	2020-01-02 03:30:30.000	129	99030	49579.5	4957950	129	99030	49579.5	4957950	-32440	32495	5015.02	501502	-128	127	-0.02	-2
 13	2	10003	99913	0.03903	300.03903	150.03903	15153.94294	0.03903	300.03903	150.03903	15153.94255	0.03903	300.03903	150.03903	15153.94203	2020-01-01	2020-01-02	2020-01-01 00:00:13	2020-01-02 03:45:13	2020-01-01 00:00:13.000	2020-01-02 03:45:13.000	13	99913	49963	5046263	13	99913	49963	5046263	-32556	32379	4542.009900990099	458743	-126	125	-0.0891089108910891	-9
-130	2	10120	99031	0.39039	297.39039	148.89039	14889.03903	0.39039	297.39038	148.89039	14889.03909	0.39039	297.39039	148.89039	14889.03900	2020-01-01	2020-01-02	2020-01-01 00:02:10	2020-01-02 03:30:31	2020-01-01 00:02:10.000	2020-01-02 03:30:31.000	130	99031	49580.5	4958050	130	99031	49580.5	4958050	-32439	32496	5016.02	501602	-128	123	-1.58	-158
-131	2	10121	99032	0.39339	297.39339	148.89339	14889.33933	0.39339	297.3934	148.89339	14889.33921	0.39339	297.39339	148.89339	14889.33900	2020-01-01	2020-01-02	2020-01-01 00:02:11	2020-01-02 03:30:32	2020-01-01 00:02:11.000	2020-01-02 03:30:32.000	131	99032	49581.5	4958150	131	99032	49581.5	4958150	-32438	32497	5017.02	501702	-127	124	-0.58	-58
-132	2	10122	99033	0.39639	297.39639	148.89639	14889.63963	0.39639	297.3964	148.89639	14889.63936	0.39639	297.39639	148.89639	14889.63900	2020-01-01	2020-01-02	2020-01-01 00:02:12	2020-01-02 03:30:33	2020-01-01 00:02:12.000	2020-01-02 03:30:33.000	132	99033	49582.5	4958250	132	99033	49582.5	4958250	-32437	32498	5018.02	501802	-126	125	0.42	42
-133	2	10123	99034	0.39939	297.39939	148.89939	14889.93993	0.39939	297.3994	148.8994	14889.94009	0.39939	297.39939	148.89939	14889.93900	2020-01-01	2020-01-02	2020-01-01 00:02:13	2020-01-02 03:30:34	2020-01-01 00:02:13.000	2020-01-02 03:30:34.000	133	99034	49583.5	4958350	133	99034	49583.5	4958350	-32436	32499	5019.02	501902	-125	126	1.42	142
-134	2	10124	99035	0.4024	297.4024	148.9024	14890.24024	0.4024	297.4024	148.9024	14890.24041	0.40240	297.40240	148.9024	14890.24000	2020-01-01	2020-01-02	2020-01-01 00:02:14	2020-01-02 03:30:35	2020-01-01 00:02:14.000	2020-01-02 03:30:35.000	134	99035	49584.5	4958450	134	99035	49584.5	4958450	-32435	32500	5020.02	502002	-124	127	2.42	242
-135	2	10125	99036	0.4054	297.4054	148.9054	14890.54054	0.4054	297.4054	148.9054	14890.54059	0.40540	297.40540	148.90540000000001	14890.54000	2020-01-01	2020-01-02	2020-01-01 00:02:15	2020-01-02 03:30:36	2020-01-01 00:02:15.000	2020-01-02 03:30:36.000	135	99036	49585.5	4958550	135	99036	49585.5	4958550	-32434	32501	5021.02	502102	-128	127	0.86	86
-136	2	10126	99037	0.4084	297.4084	148.9084	14890.84084	0.4084	297.40842	148.9084	14890.84068	0.40840	297.40840	148.9084	14890.84000	2020-01-01	2020-01-02	2020-01-01 00:02:16	2020-01-02 03:30:37	2020-01-01 00:02:16.000	2020-01-02 03:30:37.000	136	99037	49586.5	4958650	136	99037	49586.5	4958650	-32433	32502	5022.02	502202	-128	123	-0.7	-70
-137	2	10127	99038	0.41141	297.41141	148.91141	14891.14114	0.41141	297.4114	148.9114	14891.14099	0.41141	297.41141	148.91141	14891.14100	2020-01-01	2020-01-02	2020-01-01 00:02:17	2020-01-02 03:30:38	2020-01-01 00:02:17.000	2020-01-02 03:30:38.000	137	99038	49587.5	4958750	137	99038	49587.5	4958750	-32432	32503	5023.02	502302	-127	124	0.3	30
-138	2	10128	99039	0.41441	297.41441	148.91441	14891.44144	0.41441	297.41443	148.91441	14891.44157	0.41441	297.41441	148.91441	14891.44100	2020-01-01	2020-01-02	2020-01-01 00:02:18	2020-01-02 03:30:39	2020-01-01 00:02:18.000	2020-01-02 03:30:39.000	138	99039	49588.5	4958850	138	99039	49588.5	4958850	-32431	32504	5024.02	502402	-126	125	1.3	130
-139	2	10129	99040	0.41741	297.41741	148.91741	14891.74174	0.41741	297.41742	148.91741	14891.74188	0.41741	297.41741	148.91741	14891.74100	2020-01-01	2020-01-02	2020-01-01 00:02:19	2020-01-02 03:30:40	2020-01-01 00:02:19.000	2020-01-02 03:30:40.000	139	99040	49589.5	4958950	139	99040	49589.5	4958950	-32430	32505	5025.02	502502	-125	126	2.3	230
+130	2	10120	99031	0.39039	297.39039	148.89039	14889.03903	0.39039	297.39038	148.89039	14889.03909	0.39039	297.39039	148.89039	14889.039	2020-01-01	2020-01-02	2020-01-01 00:02:10	2020-01-02 03:30:31	2020-01-01 00:02:10.000	2020-01-02 03:30:31.000	130	99031	49580.5	4958050	130	99031	49580.5	4958050	-32439	32496	5016.02	501602	-128	123	-1.58	-158
+131	2	10121	99032	0.39339	297.39339	148.89339	14889.33933	0.39339	297.3934	148.89339	14889.33921	0.39339	297.39339	148.89339	14889.339	2020-01-01	2020-01-02	2020-01-01 00:02:11	2020-01-02 03:30:32	2020-01-01 00:02:11.000	2020-01-02 03:30:32.000	131	99032	49581.5	4958150	131	99032	49581.5	4958150	-32438	32497	5017.02	501702	-127	124	-0.58	-58
+132	2	10122	99033	0.39639	297.39639	148.89639	14889.63963	0.39639	297.3964	148.89639	14889.63936	0.39639	297.39639	148.89639	14889.639	2020-01-01	2020-01-02	2020-01-01 00:02:12	2020-01-02 03:30:33	2020-01-01 00:02:12.000	2020-01-02 03:30:33.000	132	99033	49582.5	4958250	132	99033	49582.5	4958250	-32437	32498	5018.02	501802	-126	125	0.42	42
+133	2	10123	99034	0.39939	297.39939	148.89939	14889.93993	0.39939	297.3994	148.8994	14889.94009	0.39939	297.39939	148.89939	14889.939	2020-01-01	2020-01-02	2020-01-01 00:02:13	2020-01-02 03:30:34	2020-01-01 00:02:13.000	2020-01-02 03:30:34.000	133	99034	49583.5	4958350	133	99034	49583.5	4958350	-32436	32499	5019.02	501902	-125	126	1.42	142
+134	2	10124	99035	0.4024	297.4024	148.9024	14890.24024	0.4024	297.4024	148.9024	14890.24041	0.4024	297.4024	148.9024	14890.24	2020-01-01	2020-01-02	2020-01-01 00:02:14	2020-01-02 03:30:35	2020-01-01 00:02:14.000	2020-01-02 03:30:35.000	134	99035	49584.5	4958450	134	99035	49584.5	4958450	-32435	32500	5020.02	502002	-124	127	2.42	242
+135	2	10125	99036	0.4054	297.4054	148.9054	14890.54054	0.4054	297.4054	148.9054	14890.54059	0.4054	297.4054	148.90540000000001	14890.54	2020-01-01	2020-01-02	2020-01-01 00:02:15	2020-01-02 03:30:36	2020-01-01 00:02:15.000	2020-01-02 03:30:36.000	135	99036	49585.5	4958550	135	99036	49585.5	4958550	-32434	32501	5021.02	502102	-128	127	0.86	86
+136	2	10126	99037	0.4084	297.4084	148.9084	14890.84084	0.4084	297.40842	148.9084	14890.84068	0.4084	297.4084	148.9084	14890.84	2020-01-01	2020-01-02	2020-01-01 00:02:16	2020-01-02 03:30:37	2020-01-01 00:02:16.000	2020-01-02 03:30:37.000	136	99037	49586.5	4958650	136	99037	49586.5	4958650	-32433	32502	5022.02	502202	-128	123	-0.7	-70
+137	2	10127	99038	0.41141	297.41141	148.91141	14891.14114	0.41141	297.4114	148.9114	14891.14099	0.41141	297.41141	148.91141	14891.141	2020-01-01	2020-01-02	2020-01-01 00:02:17	2020-01-02 03:30:38	2020-01-01 00:02:17.000	2020-01-02 03:30:38.000	137	99038	49587.5	4958750	137	99038	49587.5	4958750	-32432	32503	5023.02	502302	-127	124	0.3	30
+138	2	10128	99039	0.41441	297.41441	148.91441	14891.44144	0.41441	297.41443	148.91441	14891.44157	0.41441	297.41441	148.91441	14891.441	2020-01-01	2020-01-02	2020-01-01 00:02:18	2020-01-02 03:30:39	2020-01-01 00:02:18.000	2020-01-02 03:30:39.000	138	99039	49588.5	4958850	138	99039	49588.5	4958850	-32431	32504	5024.02	502402	-126	125	1.3	130
+139	2	10129	99040	0.41741	297.41741	148.91741	14891.74174	0.41741	297.41742	148.91741	14891.74188	0.41741	297.41741	148.91741	14891.741	2020-01-01	2020-01-02	2020-01-01 00:02:19	2020-01-02 03:30:40	2020-01-01 00:02:19.000	2020-01-02 03:30:40.000	139	99040	49589.5	4958950	139	99040	49589.5	4958950	-32430	32505	5025.02	502502	-125	126	2.3	230
 14	2	10004	99914	0.04204	300.04204	150.04204	15154.24624	0.04204	300.04205	150.04204	15154.2463	0.04204	300.04204	150.04204	15154.24604	2020-01-01	2020-01-02	2020-01-01 00:00:14	2020-01-02 03:45:14	2020-01-01 00:00:14.000	2020-01-02 03:45:14.000	14	99914	49964	5046364	14	99914	49964	5046364	-32555	32380	4543.009900990099	458844	-125	126	0.9108910891089109	92
-140	2	10130	99041	0.42042	297.42042	148.92042	14892.04204	0.42042	297.4204	148.92042	14892.04206	0.42042	297.42042	148.92042	14892.04200	2020-01-01	2020-01-02	2020-01-01 00:02:20	2020-01-02 03:30:41	2020-01-01 00:02:20.000	2020-01-02 03:30:41.000	140	99041	49590.5	4959050	140	99041	49590.5	4959050	-32429	32506	5026.02	502602	-124	127	3.3	330
-141	2	10131	99042	0.42342	297.42342	148.92342	14892.34234	0.42342	297.42343	148.92342	14892.34215	0.42342	297.42342	148.92342	14892.34200	2020-01-01	2020-01-02	2020-01-01 00:02:21	2020-01-02 03:30:42	2020-01-01 00:02:21.000	2020-01-02 03:30:42.000	141	99042	49591.5	4959150	141	99042	49591.5	4959150	-32428	32507	5027.02	502702	-128	127	1.74	174
-142	2	10132	99043	0.42642	297.42642	148.92642	14892.64264	0.42642	297.42642	148.92642	14892.64246	0.42642	297.42642	148.92642	14892.64200	2020-01-01	2020-01-02	2020-01-01 00:02:22	2020-01-02 03:30:43	2020-01-01 00:02:22.000	2020-01-02 03:30:43.000	142	99043	49592.5	4959250	142	99043	49592.5	4959250	-32427	32508	5028.02	502802	-128	123	0.18	18
-143	2	10133	99044	0.42942	297.42942	148.92942	14892.94294	0.42942	297.42944	148.92943	14892.94304	0.42942	297.42942	148.92942	14892.94200	2020-01-01	2020-01-02	2020-01-01 00:02:23	2020-01-02 03:30:44	2020-01-01 00:02:23.000	2020-01-02 03:30:44.000	143	99044	49593.5	4959350	143	99044	49593.5	4959350	-32426	32509	5029.02	502902	-127	124	1.18	118
-144	2	10134	99045	0.43243	297.43243	148.93243	14893.24324	0.43243	297.43243	148.93243	14893.24338	0.43243	297.43243	148.93243	14893.24300	2020-01-01	2020-01-02	2020-01-01 00:02:24	2020-01-02 03:30:45	2020-01-01 00:02:24.000	2020-01-02 03:30:45.000	144	99045	49594.5	4959450	144	99045	49594.5	4959450	-32425	32510	5030.02	503002	-126	125	2.18	218
-145	2	10135	99046	0.43543	297.43543	148.93543	14893.54354	0.43543	297.43542	148.93543	14893.54354	0.43543	297.43543	148.93543	14893.54300	2020-01-01	2020-01-02	2020-01-01 00:02:25	2020-01-02 03:30:46	2020-01-01 00:02:25.000	2020-01-02 03:30:46.000	145	99046	49595.5	4959550	145	99046	49595.5	4959550	-32424	32511	5031.02	503102	-125	126	3.18	318
-146	2	10136	99047	0.43843	297.43843	148.93843	14893.84384	0.43843	297.43845	148.93844	14893.84427	0.43843	297.43843	148.93843	14893.84300	2020-01-01	2020-01-02	2020-01-01 00:02:26	2020-01-02 03:30:47	2020-01-01 00:02:26.000	2020-01-02 03:30:47.000	146	99047	49596.5	4959650	146	99047	49596.5	4959650	-32423	32512	5032.02	503202	-124	127	4.18	418
-147	2	10137	99048	0.44144	297.44144	148.94144	14894.14414	0.44144	297.44144	148.94143	14894.14392	0.44144	297.44144	148.94144	14894.14400	2020-01-01	2020-01-02	2020-01-01 00:02:27	2020-01-02 03:30:48	2020-01-01 00:02:27.000	2020-01-02 03:30:48.000	147	99048	49597.5	4959750	147	99048	49597.5	4959750	-32422	32513	5033.02	503302	-128	127	2.62	262
-148	2	10138	99049	0.44444	297.44444	148.94444	14894.44444	0.44444	297.44446	148.94444	14894.4445	0.44444	297.44444	148.94444	14894.44400	2020-01-01	2020-01-02	2020-01-01 00:02:28	2020-01-02 03:30:49	2020-01-01 00:02:28.000	2020-01-02 03:30:49.000	148	99049	49598.5	4959850	148	99049	49598.5	4959850	-32421	32514	5034.02	503402	-128	127	1.06	106
-149	2	10139	99050	0.44744	297.44744	148.94744	14894.74474	0.44744	297.44745	148.94744	14894.74485	0.44744	297.44744	148.94744	14894.74400	2020-01-01	2020-01-02	2020-01-01 00:02:29	2020-01-02 03:30:50	2020-01-01 00:02:29.000	2020-01-02 03:30:50.000	149	99050	49599.5	4959950	149	99050	49599.5	4959950	-32420	32515	5035.02	503502	-128	124	-0.5	-50
+140	2	10130	99041	0.42042	297.42042	148.92042	14892.04204	0.42042	297.4204	148.92042	14892.04206	0.42042	297.42042	148.92042	14892.042	2020-01-01	2020-01-02	2020-01-01 00:02:20	2020-01-02 03:30:41	2020-01-01 00:02:20.000	2020-01-02 03:30:41.000	140	99041	49590.5	4959050	140	99041	49590.5	4959050	-32429	32506	5026.02	502602	-124	127	3.3	330
+141	2	10131	99042	0.42342	297.42342	148.92342	14892.34234	0.42342	297.42343	148.92342	14892.34215	0.42342	297.42342	148.92342	14892.342	2020-01-01	2020-01-02	2020-01-01 00:02:21	2020-01-02 03:30:42	2020-01-01 00:02:21.000	2020-01-02 03:30:42.000	141	99042	49591.5	4959150	141	99042	49591.5	4959150	-32428	32507	5027.02	502702	-128	127	1.74	174
+142	2	10132	99043	0.42642	297.42642	148.92642	14892.64264	0.42642	297.42642	148.92642	14892.64246	0.42642	297.42642	148.92642	14892.642	2020-01-01	2020-01-02	2020-01-01 00:02:22	2020-01-02 03:30:43	2020-01-01 00:02:22.000	2020-01-02 03:30:43.000	142	99043	49592.5	4959250	142	99043	49592.5	4959250	-32427	32508	5028.02	502802	-128	123	0.18	18
+143	2	10133	99044	0.42942	297.42942	148.92942	14892.94294	0.42942	297.42944	148.92943	14892.94304	0.42942	297.42942	148.92942	14892.942	2020-01-01	2020-01-02	2020-01-01 00:02:23	2020-01-02 03:30:44	2020-01-01 00:02:23.000	2020-01-02 03:30:44.000	143	99044	49593.5	4959350	143	99044	49593.5	4959350	-32426	32509	5029.02	502902	-127	124	1.18	118
+144	2	10134	99045	0.43243	297.43243	148.93243	14893.24324	0.43243	297.43243	148.93243	14893.24338	0.43243	297.43243	148.93243	14893.243	2020-01-01	2020-01-02	2020-01-01 00:02:24	2020-01-02 03:30:45	2020-01-01 00:02:24.000	2020-01-02 03:30:45.000	144	99045	49594.5	4959450	144	99045	49594.5	4959450	-32425	32510	5030.02	503002	-126	125	2.18	218
+145	2	10135	99046	0.43543	297.43543	148.93543	14893.54354	0.43543	297.43542	148.93543	14893.54354	0.43543	297.43543	148.93543	14893.543	2020-01-01	2020-01-02	2020-01-01 00:02:25	2020-01-02 03:30:46	2020-01-01 00:02:25.000	2020-01-02 03:30:46.000	145	99046	49595.5	4959550	145	99046	49595.5	4959550	-32424	32511	5031.02	503102	-125	126	3.18	318
+146	2	10136	99047	0.43843	297.43843	148.93843	14893.84384	0.43843	297.43845	148.93844	14893.84427	0.43843	297.43843	148.93843	14893.843	2020-01-01	2020-01-02	2020-01-01 00:02:26	2020-01-02 03:30:47	2020-01-01 00:02:26.000	2020-01-02 03:30:47.000	146	99047	49596.5	4959650	146	99047	49596.5	4959650	-32423	32512	5032.02	503202	-124	127	4.18	418
+147	2	10137	99048	0.44144	297.44144	148.94144	14894.14414	0.44144	297.44144	148.94143	14894.14392	0.44144	297.44144	148.94144	14894.144	2020-01-01	2020-01-02	2020-01-01 00:02:27	2020-01-02 03:30:48	2020-01-01 00:02:27.000	2020-01-02 03:30:48.000	147	99048	49597.5	4959750	147	99048	49597.5	4959750	-32422	32513	5033.02	503302	-128	127	2.62	262
+148	2	10138	99049	0.44444	297.44444	148.94444	14894.44444	0.44444	297.44446	148.94444	14894.4445	0.44444	297.44444	148.94444	14894.444	2020-01-01	2020-01-02	2020-01-01 00:02:28	2020-01-02 03:30:49	2020-01-01 00:02:28.000	2020-01-02 03:30:49.000	148	99049	49598.5	4959850	148	99049	49598.5	4959850	-32421	32514	5034.02	503402	-128	127	1.06	106
+149	2	10139	99050	0.44744	297.44744	148.94744	14894.74474	0.44744	297.44745	148.94744	14894.74485	0.44744	297.44744	148.94744	14894.744	2020-01-01	2020-01-02	2020-01-01 00:02:29	2020-01-02 03:30:50	2020-01-01 00:02:29.000	2020-01-02 03:30:50.000	149	99050	49599.5	4959950	149	99050	49599.5	4959950	-32420	32515	5035.02	503502	-128	124	-0.5	-50
 15	2	10005	99915	0.04504	300.04504	150.04504	15154.54954	0.04504	300.04504	150.04504	15154.54945	0.04504	300.04504	150.04504	15154.54904	2020-01-01	2020-01-02	2020-01-01 00:00:15	2020-01-02 03:45:15	2020-01-01 00:00:15.000	2020-01-02 03:45:15.000	15	99915	49965	5046465	15	99915	49965	5046465	-32554	32381	4544.009900990099	458945	-124	127	1.9108910891089108	193
-150	2	10140	99051	0.45045	297.45045	148.95045	14895.04504	0.45045	297.45044	148.95045	14895.04501	0.45045	297.45045	148.95045	14895.04500	2020-01-01	2020-01-02	2020-01-01 00:02:30	2020-01-02 03:30:51	2020-01-01 00:02:30.000	2020-01-02 03:30:51.000	150	99051	49600.5	4960050	150	99051	49600.5	4960050	-32419	32516	5036.02	503602	-127	125	0.5	50
-151	2	10141	99052	0.45345	297.45345	148.95345	14895.34534	0.45345	297.45346	148.95345	14895.34574	0.45345	297.45345	148.95345	14895.34500	2020-01-01	2020-01-02	2020-01-01 00:02:31	2020-01-02 03:30:52	2020-01-01 00:02:31.000	2020-01-02 03:30:52.000	151	99052	49601.5	4960150	151	99052	49601.5	4960150	-32418	32517	5037.02	503702	-126	126	1.5	150
-152	2	10142	99053	0.45645	297.45645	148.95645	14895.64564	0.45645	297.45645	148.95645	14895.6454	0.45645	297.45645	148.95645000000002	14895.64500	2020-01-01	2020-01-02	2020-01-01 00:02:32	2020-01-02 03:30:53	2020-01-01 00:02:32.000	2020-01-02 03:30:53.000	152	99053	49602.5	4960250	152	99053	49602.5	4960250	-32417	32518	5038.02	503802	-125	127	2.5	250
-153	2	10143	99054	0.45945	297.45945	148.95945	14895.94594	0.45945	297.45947	148.95946	14895.94601	0.45945	297.45945	148.95945	14895.94500	2020-01-01	2020-01-02	2020-01-01 00:02:33	2020-01-02 03:30:54	2020-01-01 00:02:33.000	2020-01-02 03:30:54.000	153	99054	49603.5	4960350	153	99054	49603.5	4960350	-32416	32519	5039.02	503902	-128	127	0.94	94
-154	2	10144	99055	0.46246	297.46246	148.96246	14896.24624	0.46246	297.46246	148.96246	14896.24633	0.46246	297.46246	148.96246	14896.24600	2020-01-01	2020-01-02	2020-01-01 00:02:34	2020-01-02 03:30:55	2020-01-01 00:02:34.000	2020-01-02 03:30:55.000	154	99055	49604.5	4960450	154	99055	49604.5	4960450	-32415	32520	5040.02	504002	-128	127	-0.62	-62
-155	2	10145	99056	0.46546	297.46546	148.96546	14896.54654	0.46546	297.46545	148.96546	14896.54647	0.46546	297.46546	148.96546	14896.54600	2020-01-01	2020-01-02	2020-01-01 00:02:35	2020-01-02 03:30:56	2020-01-01 00:02:35.000	2020-01-02 03:30:56.000	155	99056	49605.5	4960550	155	99056	49605.5	4960550	-32414	32521	5041.02	504102	-128	123	-2.18	-218
-156	2	10146	99057	0.46846	297.46846	148.96846	14896.84684	0.46846	297.46848	148.96847	14896.84721	0.46846	297.46846	148.96846	14896.84600	2020-01-01	2020-01-02	2020-01-01 00:02:36	2020-01-02 03:30:57	2020-01-01 00:02:36.000	2020-01-02 03:30:57.000	156	99057	49606.5	4960650	156	99057	49606.5	4960650	-32413	32522	5042.02	504202	-127	124	-1.18	-118
-157	2	10147	99058	0.47147	297.47147	148.97147	14897.14714	0.47147	297.47147	148.97146	14897.14687	0.47147	297.47147	148.97147	14897.14700	2020-01-01	2020-01-02	2020-01-01 00:02:37	2020-01-02 03:30:58	2020-01-01 00:02:37.000	2020-01-02 03:30:58.000	157	99058	49607.5	4960750	157	99058	49607.5	4960750	-32412	32523	5043.02	504302	-126	125	-0.18	-18
-158	2	10148	99059	0.47447	297.47447	148.97447	14897.44744	0.47447	297.4745	148.97447	14897.44748	0.47447	297.47447	148.97447	14897.44700	2020-01-01	2020-01-02	2020-01-01 00:02:38	2020-01-02 03:30:59	2020-01-01 00:02:38.000	2020-01-02 03:30:59.000	158	99059	49608.5	4960850	158	99059	49608.5	4960850	-32411	32524	5044.02	504402	-125	126	0.82	82
-159	2	10149	99060	0.47747	297.47747	148.97747	14897.74774	0.47747	297.47748	148.97747	14897.74779	0.47747	297.47747	148.97746999999998	14897.74700	2020-01-01	2020-01-02	2020-01-01 00:02:39	2020-01-02 03:31:00	2020-01-01 00:02:39.000	2020-01-02 03:31:00.000	159	99060	49609.5	4960950	159	99060	49609.5	4960950	-32410	32525	5045.02	504502	-124	127	1.82	182
+150	2	10140	99051	0.45045	297.45045	148.95045	14895.04504	0.45045	297.45044	148.95045	14895.04501	0.45045	297.45045	148.95045	14895.045	2020-01-01	2020-01-02	2020-01-01 00:02:30	2020-01-02 03:30:51	2020-01-01 00:02:30.000	2020-01-02 03:30:51.000	150	99051	49600.5	4960050	150	99051	49600.5	4960050	-32419	32516	5036.02	503602	-127	125	0.5	50
+151	2	10141	99052	0.45345	297.45345	148.95345	14895.34534	0.45345	297.45346	148.95345	14895.34574	0.45345	297.45345	148.95345	14895.345	2020-01-01	2020-01-02	2020-01-01 00:02:31	2020-01-02 03:30:52	2020-01-01 00:02:31.000	2020-01-02 03:30:52.000	151	99052	49601.5	4960150	151	99052	49601.5	4960150	-32418	32517	5037.02	503702	-126	126	1.5	150
+152	2	10142	99053	0.45645	297.45645	148.95645	14895.64564	0.45645	297.45645	148.95645	14895.6454	0.45645	297.45645	148.95645000000002	14895.645	2020-01-01	2020-01-02	2020-01-01 00:02:32	2020-01-02 03:30:53	2020-01-01 00:02:32.000	2020-01-02 03:30:53.000	152	99053	49602.5	4960250	152	99053	49602.5	4960250	-32417	32518	5038.02	503802	-125	127	2.5	250
+153	2	10143	99054	0.45945	297.45945	148.95945	14895.94594	0.45945	297.45947	148.95946	14895.94601	0.45945	297.45945	148.95945	14895.945	2020-01-01	2020-01-02	2020-01-01 00:02:33	2020-01-02 03:30:54	2020-01-01 00:02:33.000	2020-01-02 03:30:54.000	153	99054	49603.5	4960350	153	99054	49603.5	4960350	-32416	32519	5039.02	503902	-128	127	0.94	94
+154	2	10144	99055	0.46246	297.46246	148.96246	14896.24624	0.46246	297.46246	148.96246	14896.24633	0.46246	297.46246	148.96246	14896.246	2020-01-01	2020-01-02	2020-01-01 00:02:34	2020-01-02 03:30:55	2020-01-01 00:02:34.000	2020-01-02 03:30:55.000	154	99055	49604.5	4960450	154	99055	49604.5	4960450	-32415	32520	5040.02	504002	-128	127	-0.62	-62
+155	2	10145	99056	0.46546	297.46546	148.96546	14896.54654	0.46546	297.46545	148.96546	14896.54647	0.46546	297.46546	148.96546	14896.546	2020-01-01	2020-01-02	2020-01-01 00:02:35	2020-01-02 03:30:56	2020-01-01 00:02:35.000	2020-01-02 03:30:56.000	155	99056	49605.5	4960550	155	99056	49605.5	4960550	-32414	32521	5041.02	504102	-128	123	-2.18	-218
+156	2	10146	99057	0.46846	297.46846	148.96846	14896.84684	0.46846	297.46848	148.96847	14896.84721	0.46846	297.46846	148.96846	14896.846	2020-01-01	2020-01-02	2020-01-01 00:02:36	2020-01-02 03:30:57	2020-01-01 00:02:36.000	2020-01-02 03:30:57.000	156	99057	49606.5	4960650	156	99057	49606.5	4960650	-32413	32522	5042.02	504202	-127	124	-1.18	-118
+157	2	10147	99058	0.47147	297.47147	148.97147	14897.14714	0.47147	297.47147	148.97146	14897.14687	0.47147	297.47147	148.97147	14897.147	2020-01-01	2020-01-02	2020-01-01 00:02:37	2020-01-02 03:30:58	2020-01-01 00:02:37.000	2020-01-02 03:30:58.000	157	99058	49607.5	4960750	157	99058	49607.5	4960750	-32412	32523	5043.02	504302	-126	125	-0.18	-18
+158	2	10148	99059	0.47447	297.47447	148.97447	14897.44744	0.47447	297.4745	148.97447	14897.44748	0.47447	297.47447	148.97447	14897.447	2020-01-01	2020-01-02	2020-01-01 00:02:38	2020-01-02 03:30:59	2020-01-01 00:02:38.000	2020-01-02 03:30:59.000	158	99059	49608.5	4960850	158	99059	49608.5	4960850	-32411	32524	5044.02	504402	-125	126	0.82	82
+159	2	10149	99060	0.47747	297.47747	148.97747	14897.74774	0.47747	297.47748	148.97747	14897.74779	0.47747	297.47747	148.97746999999998	14897.747	2020-01-01	2020-01-02	2020-01-01 00:02:39	2020-01-02 03:31:00	2020-01-01 00:02:39.000	2020-01-02 03:31:00.000	159	99060	49609.5	4960950	159	99060	49609.5	4960950	-32410	32525	5045.02	504502	-124	127	1.82	182
 16	2	10006	99916	0.04804	300.04804	150.04804	15154.85285	0.04804	300.04803	150.04804	15154.85279	0.04804	300.04804	150.04804	15154.85204	2020-01-01	2020-01-02	2020-01-01 00:00:16	2020-01-02 03:45:16	2020-01-01 00:00:16.000	2020-01-02 03:45:16.000	16	99916	49966	5046566	16	99916	49966	5046566	-32553	32382	4545.009900990099	459046	-128	127	0.37623762376237624	38
-160	2	10150	99061	0.48048	297.48048	148.98048	14898.04804	0.48048	297.48047	148.98048	14898.0481	0.48048	297.48048	148.98048	14898.04800	2020-01-01	2020-01-02	2020-01-01 00:02:40	2020-01-02 03:31:01	2020-01-01 00:02:40.000	2020-01-02 03:31:01.000	160	99061	49610.5	4961050	160	99061	49610.5	4961050	-32409	32526	5046.02	504602	-128	127	0.26	26
-161	2	10151	99062	0.48348	297.48348	148.98348	14898.34834	0.48348	297.4835	148.98348	14898.34868	0.48348	297.48348	148.98348	14898.34800	2020-01-01	2020-01-02	2020-01-01 00:02:41	2020-01-02 03:31:02	2020-01-01 00:02:41.000	2020-01-02 03:31:02.000	161	99062	49611.5	4961150	161	99062	49611.5	4961150	-32408	32527	5047.02	504702	-128	123	-1.3	-130
-162	2	10152	99063	0.48648	297.48648	148.98648	14898.64864	0.48648	297.48648	148.98648	14898.64837	0.48648	297.48648	148.98648	14898.64800	2020-01-01	2020-01-02	2020-01-01 00:02:42	2020-01-02 03:31:03	2020-01-01 00:02:42.000	2020-01-02 03:31:03.000	162	99063	49612.5	4961250	162	99063	49612.5	4961250	-32407	32528	5048.02	504802	-127	124	-0.3	-30
-163	2	10153	99064	0.48948	297.48948	148.98948	14898.94894	0.48948	297.4895	148.98948	14898.94895	0.48948	297.48948	148.98948000000001	14898.94800	2020-01-01	2020-01-02	2020-01-01 00:02:43	2020-01-02 03:31:04	2020-01-01 00:02:43.000	2020-01-02 03:31:04.000	163	99064	49613.5	4961350	163	99064	49613.5	4961350	-32406	32529	5049.02	504902	-126	125	0.7	70
-164	2	10154	99065	0.49249	297.49249	148.99249	14899.24924	0.49249	297.4925	148.99249	14899.24926	0.49249	297.49249	148.99249	14899.24900	2020-01-01	2020-01-02	2020-01-01 00:02:44	2020-01-02 03:31:05	2020-01-01 00:02:44.000	2020-01-02 03:31:05.000	164	99065	49614.5	4961450	164	99065	49614.5	4961450	-32405	32530	5050.02	505002	-125	126	1.7	170
-165	2	10155	99066	0.49549	297.49549	148.99549	14899.54954	0.49549	297.49548	148.99549	14899.54957	0.49549	297.49549	148.99549000000002	14899.54900	2020-01-01	2020-01-02	2020-01-01 00:02:45	2020-01-02 03:31:06	2020-01-01 00:02:45.000	2020-01-02 03:31:06.000	165	99066	49615.5	4961550	165	99066	49615.5	4961550	-32404	32531	5051.02	505102	-124	127	2.7	270
-166	2	10156	99067	0.49849	297.49849	148.99849	14899.84984	0.49849	297.4985	148.9985	14899.85015	0.49849	297.49849	148.99849	14899.84900	2020-01-01	2020-01-02	2020-01-01 00:02:46	2020-01-02 03:31:07	2020-01-01 00:02:46.000	2020-01-02 03:31:07.000	166	99067	49616.5	4961650	166	99067	49616.5	4961650	-32403	32532	5052.02	505202	-128	127	1.14	114
-167	2	10157	99068	0.5015	297.5015	149.0015	14900.15015	0.5015	297.5015	149.00149	14900.14984	0.50150	297.50150	149.0015	14900.15000	2020-01-01	2020-01-02	2020-01-01 00:02:47	2020-01-02 03:31:08	2020-01-01 00:02:47.000	2020-01-02 03:31:08.000	167	99068	49617.5	4961750	167	99068	49617.5	4961750	-32402	32533	5053.02	505302	-128	123	-0.42	-42
-168	2	10158	99069	0.5045	297.5045	149.0045	14900.45045	0.5045	297.50452	149.0045	14900.45042	0.50450	297.50450	149.0045	14900.45000	2020-01-01	2020-01-02	2020-01-01 00:02:48	2020-01-02 03:31:09	2020-01-01 00:02:48.000	2020-01-02 03:31:09.000	168	99069	49618.5	4961850	168	99069	49618.5	4961850	-32401	32534	5054.02	505402	-127	124	0.58	58
-169	2	10159	99070	0.5075	297.5075	149.0075	14900.75075	0.5075	297.5075	149.0075	14900.75073	0.50750	297.50750	149.0075	14900.75000	2020-01-01	2020-01-02	2020-01-01 00:02:49	2020-01-02 03:31:10	2020-01-01 00:02:49.000	2020-01-02 03:31:10.000	169	99070	49619.5	4961950	169	99070	49619.5	4961950	-32400	32535	5055.02	505502	-126	125	1.58	158
+160	2	10150	99061	0.48048	297.48048	148.98048	14898.04804	0.48048	297.48047	148.98048	14898.0481	0.48048	297.48048	148.98048	14898.048	2020-01-01	2020-01-02	2020-01-01 00:02:40	2020-01-02 03:31:01	2020-01-01 00:02:40.000	2020-01-02 03:31:01.000	160	99061	49610.5	4961050	160	99061	49610.5	4961050	-32409	32526	5046.02	504602	-128	127	0.26	26
+161	2	10151	99062	0.48348	297.48348	148.98348	14898.34834	0.48348	297.4835	148.98348	14898.34868	0.48348	297.48348	148.98348	14898.348	2020-01-01	2020-01-02	2020-01-01 00:02:41	2020-01-02 03:31:02	2020-01-01 00:02:41.000	2020-01-02 03:31:02.000	161	99062	49611.5	4961150	161	99062	49611.5	4961150	-32408	32527	5047.02	504702	-128	123	-1.3	-130
+162	2	10152	99063	0.48648	297.48648	148.98648	14898.64864	0.48648	297.48648	148.98648	14898.64837	0.48648	297.48648	148.98648	14898.648	2020-01-01	2020-01-02	2020-01-01 00:02:42	2020-01-02 03:31:03	2020-01-01 00:02:42.000	2020-01-02 03:31:03.000	162	99063	49612.5	4961250	162	99063	49612.5	4961250	-32407	32528	5048.02	504802	-127	124	-0.3	-30
+163	2	10153	99064	0.48948	297.48948	148.98948	14898.94894	0.48948	297.4895	148.98948	14898.94895	0.48948	297.48948	148.98948000000001	14898.948	2020-01-01	2020-01-02	2020-01-01 00:02:43	2020-01-02 03:31:04	2020-01-01 00:02:43.000	2020-01-02 03:31:04.000	163	99064	49613.5	4961350	163	99064	49613.5	4961350	-32406	32529	5049.02	504902	-126	125	0.7	70
+164	2	10154	99065	0.49249	297.49249	148.99249	14899.24924	0.49249	297.4925	148.99249	14899.24926	0.49249	297.49249	148.99249	14899.249	2020-01-01	2020-01-02	2020-01-01 00:02:44	2020-01-02 03:31:05	2020-01-01 00:02:44.000	2020-01-02 03:31:05.000	164	99065	49614.5	4961450	164	99065	49614.5	4961450	-32405	32530	5050.02	505002	-125	126	1.7	170
+165	2	10155	99066	0.49549	297.49549	148.99549	14899.54954	0.49549	297.49548	148.99549	14899.54957	0.49549	297.49549	148.99549000000002	14899.549	2020-01-01	2020-01-02	2020-01-01 00:02:45	2020-01-02 03:31:06	2020-01-01 00:02:45.000	2020-01-02 03:31:06.000	165	99066	49615.5	4961550	165	99066	49615.5	4961550	-32404	32531	5051.02	505102	-124	127	2.7	270
+166	2	10156	99067	0.49849	297.49849	148.99849	14899.84984	0.49849	297.4985	148.9985	14899.85015	0.49849	297.49849	148.99849	14899.849	2020-01-01	2020-01-02	2020-01-01 00:02:46	2020-01-02 03:31:07	2020-01-01 00:02:46.000	2020-01-02 03:31:07.000	166	99067	49616.5	4961650	166	99067	49616.5	4961650	-32403	32532	5052.02	505202	-128	127	1.14	114
+167	2	10157	99068	0.5015	297.5015	149.0015	14900.15015	0.5015	297.5015	149.00149	14900.14984	0.5015	297.5015	149.0015	14900.15	2020-01-01	2020-01-02	2020-01-01 00:02:47	2020-01-02 03:31:08	2020-01-01 00:02:47.000	2020-01-02 03:31:08.000	167	99068	49617.5	4961750	167	99068	49617.5	4961750	-32402	32533	5053.02	505302	-128	123	-0.42	-42
+168	2	10158	99069	0.5045	297.5045	149.0045	14900.45045	0.5045	297.50452	149.0045	14900.45042	0.5045	297.5045	149.0045	14900.45	2020-01-01	2020-01-02	2020-01-01 00:02:48	2020-01-02 03:31:09	2020-01-01 00:02:48.000	2020-01-02 03:31:09.000	168	99069	49618.5	4961850	168	99069	49618.5	4961850	-32401	32534	5054.02	505402	-127	124	0.58	58
+169	2	10159	99070	0.5075	297.5075	149.0075	14900.75075	0.5075	297.5075	149.0075	14900.75073	0.5075	297.5075	149.0075	14900.75	2020-01-01	2020-01-02	2020-01-01 00:02:49	2020-01-02 03:31:10	2020-01-01 00:02:49.000	2020-01-02 03:31:10.000	169	99070	49619.5	4961950	169	99070	49619.5	4961950	-32400	32535	5055.02	505502	-126	125	1.58	158
 17	2	10007	99917	0.05105	300.05105	150.05105	15155.15615	0.05105	300.05106	150.05105	15155.15638	0.05105	300.05105	150.05105	15155.15605	2020-01-01	2020-01-02	2020-01-01 00:00:17	2020-01-02 03:45:17	2020-01-01 00:00:17.000	2020-01-02 03:45:17.000	17	99917	49967	5046667	17	99917	49967	5046667	-32552	32383	4546.009900990099	459147	-128	127	-1.1584158415841583	-117
-170	2	10160	99071	0.51051	297.51051	149.01051	14901.05105	0.51051	297.5105	149.01051	14901.05104	0.51051	297.51051	149.01050999999998	14901.05100	2020-01-01	2020-01-02	2020-01-01 00:02:50	2020-01-02 03:31:11	2020-01-01 00:02:50.000	2020-01-02 03:31:11.000	170	99071	49620.5	4962050	170	99071	49620.5	4962050	-32399	32536	5056.02	505602	-125	126	2.58	258
-171	2	10161	99072	0.51351	297.51351	149.01351	14901.35135	0.51351	297.51352	149.01351	14901.35162	0.51351	297.51351	149.01351	14901.35100	2020-01-01	2020-01-02	2020-01-01 00:02:51	2020-01-02 03:31:12	2020-01-01 00:02:51.000	2020-01-02 03:31:12.000	171	99072	49621.5	4962150	171	99072	49621.5	4962150	-32398	32537	5057.02	505702	-124	127	3.58	358
-172	2	10162	99073	0.51651	297.51651	149.01651	14901.65165	0.51651	297.5165	149.01651	14901.65131	0.51651	297.51651	149.01651	14901.65100	2020-01-01	2020-01-02	2020-01-01 00:02:52	2020-01-02 03:31:13	2020-01-01 00:02:52.000	2020-01-02 03:31:13.000	172	99073	49622.5	4962250	172	99073	49622.5	4962250	-32397	32538	5058.02	505802	-128	127	2.02	202
-173	2	10163	99074	0.51951	297.51951	149.01951	14901.95195	0.51951	297.51953	149.01951	14901.95189	0.51951	297.51951	149.01951	14901.95100	2020-01-01	2020-01-02	2020-01-01 00:02:53	2020-01-02 03:31:14	2020-01-01 00:02:53.000	2020-01-02 03:31:14.000	173	99074	49623.5	4962350	173	99074	49623.5	4962350	-32396	32539	5059.02	505902	-128	127	0.46	46
-174	2	10164	99075	0.52252	297.52252	149.02252	14902.25225	0.52252	297.52252	149.02252	14902.2522	0.52252	297.52252	149.02252000000001	14902.25200	2020-01-01	2020-01-02	2020-01-01 00:02:54	2020-01-02 03:31:15	2020-01-01 00:02:54.000	2020-01-02 03:31:15.000	174	99075	49624.5	4962450	174	99075	49624.5	4962450	-32395	32540	5060.02	506002	-128	124	-1.1	-110
-175	2	10165	99076	0.52552	297.52552	149.02552	14902.55255	0.52552	297.5255	149.02552	14902.55251	0.52552	297.52552	149.02552	14902.55200	2020-01-01	2020-01-02	2020-01-01 00:02:55	2020-01-02 03:31:16	2020-01-01 00:02:55.000	2020-01-02 03:31:16.000	175	99076	49625.5	4962550	175	99076	49625.5	4962550	-32394	32541	5061.02	506102	-127	125	-0.1	-10
-176	2	10166	99077	0.52852	297.52852	149.02852	14902.85285	0.52852	297.52853	149.02853	14902.85312	0.52852	297.52852	149.02852000000001	14902.85200	2020-01-01	2020-01-02	2020-01-01 00:02:56	2020-01-02 03:31:17	2020-01-01 00:02:56.000	2020-01-02 03:31:17.000	176	99077	49626.5	4962650	176	99077	49626.5	4962650	-32393	32542	5062.02	506202	-126	126	0.9	90
-177	2	10167	99078	0.53153	297.53153	149.03153	14903.15315	0.53153	297.53152	149.03152	14903.15278	0.53153	297.53153	149.03153	14903.15300	2020-01-01	2020-01-02	2020-01-01 00:02:57	2020-01-02 03:31:18	2020-01-01 00:02:57.000	2020-01-02 03:31:18.000	177	99078	49627.5	4962750	177	99078	49627.5	4962750	-32392	32543	5063.02	506302	-125	127	1.9	190
-178	2	10168	99079	0.53453	297.53453	149.03453	14903.45345	0.53453	297.53455	149.03453	14903.45352	0.53453	297.53453	149.03453	14903.45300	2020-01-01	2020-01-02	2020-01-01 00:02:58	2020-01-02 03:31:19	2020-01-01 00:02:58.000	2020-01-02 03:31:19.000	178	99079	49628.5	4962850	178	99079	49628.5	4962850	-32391	32544	5064.02	506402	-128	127	0.34	34
-179	2	10169	99080	0.53753	297.53753	149.03753	14903.75375	0.53753	297.53754	149.03753	14903.75366	0.53753	297.53753	149.03753	14903.75300	2020-01-01	2020-01-02	2020-01-01 00:02:59	2020-01-02 03:31:20	2020-01-01 00:02:59.000	2020-01-02 03:31:20.000	179	99080	49629.5	4962950	179	99080	49629.5	4962950	-32390	32545	5065.02	506502	-128	127	-1.22	-122
+170	2	10160	99071	0.51051	297.51051	149.01051	14901.05105	0.51051	297.5105	149.01051	14901.05104	0.51051	297.51051	149.01050999999998	14901.051	2020-01-01	2020-01-02	2020-01-01 00:02:50	2020-01-02 03:31:11	2020-01-01 00:02:50.000	2020-01-02 03:31:11.000	170	99071	49620.5	4962050	170	99071	49620.5	4962050	-32399	32536	5056.02	505602	-125	126	2.58	258
+171	2	10161	99072	0.51351	297.51351	149.01351	14901.35135	0.51351	297.51352	149.01351	14901.35162	0.51351	297.51351	149.01351	14901.351	2020-01-01	2020-01-02	2020-01-01 00:02:51	2020-01-02 03:31:12	2020-01-01 00:02:51.000	2020-01-02 03:31:12.000	171	99072	49621.5	4962150	171	99072	49621.5	4962150	-32398	32537	5057.02	505702	-124	127	3.58	358
+172	2	10162	99073	0.51651	297.51651	149.01651	14901.65165	0.51651	297.5165	149.01651	14901.65131	0.51651	297.51651	149.01651	14901.651	2020-01-01	2020-01-02	2020-01-01 00:02:52	2020-01-02 03:31:13	2020-01-01 00:02:52.000	2020-01-02 03:31:13.000	172	99073	49622.5	4962250	172	99073	49622.5	4962250	-32397	32538	5058.02	505802	-128	127	2.02	202
+173	2	10163	99074	0.51951	297.51951	149.01951	14901.95195	0.51951	297.51953	149.01951	14901.95189	0.51951	297.51951	149.01951	14901.951	2020-01-01	2020-01-02	2020-01-01 00:02:53	2020-01-02 03:31:14	2020-01-01 00:02:53.000	2020-01-02 03:31:14.000	173	99074	49623.5	4962350	173	99074	49623.5	4962350	-32396	32539	5059.02	505902	-128	127	0.46	46
+174	2	10164	99075	0.52252	297.52252	149.02252	14902.25225	0.52252	297.52252	149.02252	14902.2522	0.52252	297.52252	149.02252000000001	14902.252	2020-01-01	2020-01-02	2020-01-01 00:02:54	2020-01-02 03:31:15	2020-01-01 00:02:54.000	2020-01-02 03:31:15.000	174	99075	49624.5	4962450	174	99075	49624.5	4962450	-32395	32540	5060.02	506002	-128	124	-1.1	-110
+175	2	10165	99076	0.52552	297.52552	149.02552	14902.55255	0.52552	297.5255	149.02552	14902.55251	0.52552	297.52552	149.02552	14902.552	2020-01-01	2020-01-02	2020-01-01 00:02:55	2020-01-02 03:31:16	2020-01-01 00:02:55.000	2020-01-02 03:31:16.000	175	99076	49625.5	4962550	175	99076	49625.5	4962550	-32394	32541	5061.02	506102	-127	125	-0.1	-10
+176	2	10166	99077	0.52852	297.52852	149.02852	14902.85285	0.52852	297.52853	149.02853	14902.85312	0.52852	297.52852	149.02852000000001	14902.852	2020-01-01	2020-01-02	2020-01-01 00:02:56	2020-01-02 03:31:17	2020-01-01 00:02:56.000	2020-01-02 03:31:17.000	176	99077	49626.5	4962650	176	99077	49626.5	4962650	-32393	32542	5062.02	506202	-126	126	0.9	90
+177	2	10167	99078	0.53153	297.53153	149.03153	14903.15315	0.53153	297.53152	149.03152	14903.15278	0.53153	297.53153	149.03153	14903.153	2020-01-01	2020-01-02	2020-01-01 00:02:57	2020-01-02 03:31:18	2020-01-01 00:02:57.000	2020-01-02 03:31:18.000	177	99078	49627.5	4962750	177	99078	49627.5	4962750	-32392	32543	5063.02	506302	-125	127	1.9	190
+178	2	10168	99079	0.53453	297.53453	149.03453	14903.45345	0.53453	297.53455	149.03453	14903.45352	0.53453	297.53453	149.03453	14903.453	2020-01-01	2020-01-02	2020-01-01 00:02:58	2020-01-02 03:31:19	2020-01-01 00:02:58.000	2020-01-02 03:31:19.000	178	99079	49628.5	4962850	178	99079	49628.5	4962850	-32391	32544	5064.02	506402	-128	127	0.34	34
+179	2	10169	99080	0.53753	297.53753	149.03753	14903.75375	0.53753	297.53754	149.03753	14903.75366	0.53753	297.53753	149.03753	14903.753	2020-01-01	2020-01-02	2020-01-01 00:02:59	2020-01-02 03:31:20	2020-01-01 00:02:59.000	2020-01-02 03:31:20.000	179	99080	49629.5	4962950	179	99080	49629.5	4962950	-32390	32545	5065.02	506502	-128	127	-1.22	-122
 18	2	10008	99918	0.05405	300.05405	150.05405	15155.45945	0.05405	300.05405	150.05404	15155.45903	0.05405	300.05405	150.05405	15155.45905	2020-01-01	2020-01-02	2020-01-01 00:00:18	2020-01-02 03:45:18	2020-01-01 00:00:18.000	2020-01-02 03:45:18.000	18	99918	49968	5046768	18	99918	49968	5046768	-32551	32384	4547.009900990099	459248	-128	124	-2.6930693069306932	-272
-180	2	10170	99081	0.54054	297.54054	149.04054	14904.05405	0.54054	297.54053	149.04053	14904.05398	0.54054	297.54054	149.04054	14904.05400	2020-01-01	2020-01-02	2020-01-01 00:03:00	2020-01-02 03:31:21	2020-01-01 00:03:00.000	2020-01-02 03:31:21.000	180	99081	49630.5	4963050	180	99081	49630.5	4963050	-32389	32546	5066.02	506602	-128	123	-2.78	-278
-181	2	10171	99082	0.54354	297.54354	149.04354	14904.35435	0.54354	297.54355	149.04354	14904.35459	0.54354	297.54354	149.04354	14904.35400	2020-01-01	2020-01-02	2020-01-01 00:03:01	2020-01-02 03:31:22	2020-01-01 00:03:01.000	2020-01-02 03:31:22.000	181	99082	49631.5	4963150	181	99082	49631.5	4963150	-32388	32547	5067.02	506702	-127	124	-1.78	-178
-182	2	10172	99083	0.54654	297.54654	149.04654	14904.65465	0.54654	297.54654	149.04654	14904.65425	0.54654	297.54654	149.04654	14904.65400	2020-01-01	2020-01-02	2020-01-01 00:03:02	2020-01-02 03:31:23	2020-01-01 00:03:02.000	2020-01-02 03:31:23.000	182	99083	49632.5	4963250	182	99083	49632.5	4963250	-32387	32548	5068.02	506802	-126	125	-0.78	-78
-183	2	10173	99084	0.54954	297.54954	149.04954	14904.95495	0.54954	297.54956	149.04954	14904.95498	0.54954	297.54954	149.04954	14904.95400	2020-01-01	2020-01-02	2020-01-01 00:03:03	2020-01-02 03:31:24	2020-01-01 00:03:03.000	2020-01-02 03:31:24.000	183	99084	49633.5	4963350	183	99084	49633.5	4963350	-32386	32549	5069.02	506902	-125	126	0.22	22
-184	2	10174	99085	0.55255	297.55255	149.05255	14905.25525	0.55255	297.55255	149.05255	14905.25514	0.55255	297.55255	149.05255	14905.25500	2020-01-01	2020-01-02	2020-01-01 00:03:04	2020-01-02 03:31:25	2020-01-01 00:03:04.000	2020-01-02 03:31:25.000	184	99085	49634.5	4963450	184	99085	49634.5	4963450	-32385	32550	5070.02	507002	-124	127	1.22	122
-185	2	10175	99086	0.55555	297.55555	149.05555	14905.55555	0.55555	297.55554	149.05555	14905.55549	0.55555	297.55555	149.05555	14905.55500	2020-01-01	2020-01-02	2020-01-01 00:03:05	2020-01-02 03:31:26	2020-01-01 00:03:05.000	2020-01-02 03:31:26.000	185	99086	49635.5	4963550	185	99086	49635.5	4963550	-32384	32551	5071.02	507102	-128	127	-0.34	-34
-186	2	10176	99087	0.55855	297.55855	149.05855	14905.85585	0.55855	297.55856	149.05856	14905.85607	0.55855	297.55855	149.05855	14905.85500	2020-01-01	2020-01-02	2020-01-01 00:03:06	2020-01-02 03:31:27	2020-01-01 00:03:06.000	2020-01-02 03:31:27.000	186	99087	49636.5	4963650	186	99087	49636.5	4963650	-32383	32552	5072.02	507202	-128	123	-1.9	-190
-187	2	10177	99088	0.56156	297.56156	149.06156	14906.15615	0.56156	297.56155	149.06155	14906.15572	0.56156	297.56156	149.06156000000001	14906.15600	2020-01-01	2020-01-02	2020-01-01 00:03:07	2020-01-02 03:31:28	2020-01-01 00:03:07.000	2020-01-02 03:31:28.000	187	99088	49637.5	4963750	187	99088	49637.5	4963750	-32382	32553	5073.02	507302	-127	124	-0.9	-90
-188	2	10178	99089	0.56456	297.56456	149.06456	14906.45645	0.56456	297.56458	149.06456	14906.45645	0.56456	297.56456	149.06456	14906.45600	2020-01-01	2020-01-02	2020-01-01 00:03:08	2020-01-02 03:31:29	2020-01-01 00:03:08.000	2020-01-02 03:31:29.000	188	99089	49638.5	4963850	188	99089	49638.5	4963850	-32381	32554	5074.02	507402	-126	125	0.1	10
-189	2	10179	99090	0.56756	297.56756	149.06756	14906.75675	0.56756	297.56757	149.06756	14906.75661	0.56756	297.56756	149.06756	14906.75600	2020-01-01	2020-01-02	2020-01-01 00:03:09	2020-01-02 03:31:30	2020-01-01 00:03:09.000	2020-01-02 03:31:30.000	189	99090	49639.5	4963950	189	99090	49639.5	4963950	-32380	32555	5075.02	507502	-125	126	1.1	110
+180	2	10170	99081	0.54054	297.54054	149.04054	14904.05405	0.54054	297.54053	149.04053	14904.05398	0.54054	297.54054	149.04054	14904.054	2020-01-01	2020-01-02	2020-01-01 00:03:00	2020-01-02 03:31:21	2020-01-01 00:03:00.000	2020-01-02 03:31:21.000	180	99081	49630.5	4963050	180	99081	49630.5	4963050	-32389	32546	5066.02	506602	-128	123	-2.78	-278
+181	2	10171	99082	0.54354	297.54354	149.04354	14904.35435	0.54354	297.54355	149.04354	14904.35459	0.54354	297.54354	149.04354	14904.354	2020-01-01	2020-01-02	2020-01-01 00:03:01	2020-01-02 03:31:22	2020-01-01 00:03:01.000	2020-01-02 03:31:22.000	181	99082	49631.5	4963150	181	99082	49631.5	4963150	-32388	32547	5067.02	506702	-127	124	-1.78	-178
+182	2	10172	99083	0.54654	297.54654	149.04654	14904.65465	0.54654	297.54654	149.04654	14904.65425	0.54654	297.54654	149.04654	14904.654	2020-01-01	2020-01-02	2020-01-01 00:03:02	2020-01-02 03:31:23	2020-01-01 00:03:02.000	2020-01-02 03:31:23.000	182	99083	49632.5	4963250	182	99083	49632.5	4963250	-32387	32548	5068.02	506802	-126	125	-0.78	-78
+183	2	10173	99084	0.54954	297.54954	149.04954	14904.95495	0.54954	297.54956	149.04954	14904.95498	0.54954	297.54954	149.04954	14904.954	2020-01-01	2020-01-02	2020-01-01 00:03:03	2020-01-02 03:31:24	2020-01-01 00:03:03.000	2020-01-02 03:31:24.000	183	99084	49633.5	4963350	183	99084	49633.5	4963350	-32386	32549	5069.02	506902	-125	126	0.22	22
+184	2	10174	99085	0.55255	297.55255	149.05255	14905.25525	0.55255	297.55255	149.05255	14905.25514	0.55255	297.55255	149.05255	14905.255	2020-01-01	2020-01-02	2020-01-01 00:03:04	2020-01-02 03:31:25	2020-01-01 00:03:04.000	2020-01-02 03:31:25.000	184	99085	49634.5	4963450	184	99085	49634.5	4963450	-32385	32550	5070.02	507002	-124	127	1.22	122
+185	2	10175	99086	0.55555	297.55555	149.05555	14905.55555	0.55555	297.55554	149.05555	14905.55549	0.55555	297.55555	149.05555	14905.555	2020-01-01	2020-01-02	2020-01-01 00:03:05	2020-01-02 03:31:26	2020-01-01 00:03:05.000	2020-01-02 03:31:26.000	185	99086	49635.5	4963550	185	99086	49635.5	4963550	-32384	32551	5071.02	507102	-128	127	-0.34	-34
+186	2	10176	99087	0.55855	297.55855	149.05855	14905.85585	0.55855	297.55856	149.05856	14905.85607	0.55855	297.55855	149.05855	14905.855	2020-01-01	2020-01-02	2020-01-01 00:03:06	2020-01-02 03:31:27	2020-01-01 00:03:06.000	2020-01-02 03:31:27.000	186	99087	49636.5	4963650	186	99087	49636.5	4963650	-32383	32552	5072.02	507202	-128	123	-1.9	-190
+187	2	10177	99088	0.56156	297.56156	149.06156	14906.15615	0.56156	297.56155	149.06155	14906.15572	0.56156	297.56156	149.06156000000001	14906.156	2020-01-01	2020-01-02	2020-01-01 00:03:07	2020-01-02 03:31:28	2020-01-01 00:03:07.000	2020-01-02 03:31:28.000	187	99088	49637.5	4963750	187	99088	49637.5	4963750	-32382	32553	5073.02	507302	-127	124	-0.9	-90
+188	2	10178	99089	0.56456	297.56456	149.06456	14906.45645	0.56456	297.56458	149.06456	14906.45645	0.56456	297.56456	149.06456	14906.456	2020-01-01	2020-01-02	2020-01-01 00:03:08	2020-01-02 03:31:29	2020-01-01 00:03:08.000	2020-01-02 03:31:29.000	188	99089	49638.5	4963850	188	99089	49638.5	4963850	-32381	32554	5074.02	507402	-126	125	0.1	10
+189	2	10179	99090	0.56756	297.56756	149.06756	14906.75675	0.56756	297.56757	149.06756	14906.75661	0.56756	297.56756	149.06756	14906.756	2020-01-01	2020-01-02	2020-01-01 00:03:09	2020-01-02 03:31:30	2020-01-01 00:03:09.000	2020-01-02 03:31:30.000	189	99090	49639.5	4963950	189	99090	49639.5	4963950	-32380	32555	5075.02	507502	-125	126	1.1	110
 19	2	10009	99919	0.05705	300.05705	150.05705	15155.76276	0.05705	300.05707	150.05705	15155.76279	0.05705	300.05705	150.05705	15155.76205	2020-01-01	2020-01-02	2020-01-01 00:00:19	2020-01-02 03:45:19	2020-01-01 00:00:19.000	2020-01-02 03:45:19.000	19	99919	49969	5046869	19	99919	49969	5046869	-32550	32385	4548.009900990099	459349	-127	125	-1.693069306930693	-171
-190	2	10180	99091	0.57057	297.57057	149.07057	14907.05705	0.57057	297.57056	149.07056	14907.05695	0.57057	297.57057	149.07057	14907.05700	2020-01-01	2020-01-02	2020-01-01 00:03:10	2020-01-02 03:31:31	2020-01-01 00:03:10.000	2020-01-02 03:31:31.000	190	99091	49640.5	4964050	190	99091	49640.5	4964050	-32379	32556	5076.02	507602	-124	127	2.1	210
-191	2	10181	99092	0.57357	297.57357	149.07357	14907.35735	0.57357	297.57358	149.07357	14907.35753	0.57357	297.57357	149.07357	14907.35700	2020-01-01	2020-01-02	2020-01-01 00:03:11	2020-01-02 03:31:32	2020-01-01 00:03:11.000	2020-01-02 03:31:32.000	191	99092	49641.5	4964150	191	99092	49641.5	4964150	-32378	32557	5077.02	507702	-128	127	0.54	54
-192	2	10182	99093	0.57657	297.57657	149.07657	14907.65765	0.57657	297.57657	149.07657	14907.65784	0.57657	297.57657	149.07657	14907.65700	2020-01-01	2020-01-02	2020-01-01 00:03:12	2020-01-02 03:31:33	2020-01-01 00:03:12.000	2020-01-02 03:31:33.000	192	99093	49642.5	4964250	192	99093	49642.5	4964250	-32377	32558	5078.02	507802	-128	123	-1.02	-102
-193	2	10183	99094	0.57957	297.57957	149.07957	14907.95795	0.57957	297.5796	149.07957	14907.95793	0.57957	297.57957	149.07957	14907.95700	2020-01-01	2020-01-02	2020-01-01 00:03:13	2020-01-02 03:31:34	2020-01-01 00:03:13.000	2020-01-02 03:31:34.000	193	99094	49643.5	4964350	193	99094	49643.5	4964350	-32376	32559	5079.02	507902	-127	124	-0.02	-2
-194	2	10184	99095	0.58258	297.58258	149.08258	14908.25825	0.58258	297.58258	149.08258	14908.25811	0.58258	297.58258	149.08258	14908.25800	2020-01-01	2020-01-02	2020-01-01 00:03:14	2020-01-02 03:31:35	2020-01-01 00:03:14.000	2020-01-02 03:31:35.000	194	99095	49644.5	4964450	194	99095	49644.5	4964450	-32375	32560	5080.02	508002	-126	125	0.98	98
-195	2	10185	99096	0.58558	297.58558	149.08558	14908.55855	0.58558	297.58557	149.08558	14908.55842	0.58558	297.58558	149.08558000000002	14908.55800	2020-01-01	2020-01-02	2020-01-01 00:03:15	2020-01-02 03:31:36	2020-01-01 00:03:15.000	2020-01-02 03:31:36.000	195	99096	49645.5	4964550	195	99096	49645.5	4964550	-32374	32561	5081.02	508102	-125	126	1.98	198
-196	2	10186	99097	0.58858	297.58858	149.08858	14908.85885	0.58858	297.5886	149.08859	14908.859	0.58858	297.58858	149.08858	14908.85800	2020-01-01	2020-01-02	2020-01-01 00:03:16	2020-01-02 03:31:37	2020-01-01 00:03:16.000	2020-01-02 03:31:37.000	196	99097	49646.5	4964650	196	99097	49646.5	4964650	-32373	32562	5082.02	508202	-124	127	2.98	298
-197	2	10187	99098	0.59159	297.59159	149.09159	14909.15915	0.59159	297.59158	149.09159	14909.15931	0.59159	297.59159	149.09159	14909.15900	2020-01-01	2020-01-02	2020-01-01 00:03:17	2020-01-02 03:31:38	2020-01-01 00:03:17.000	2020-01-02 03:31:38.000	197	99098	49647.5	4964750	197	99098	49647.5	4964750	-32372	32563	5083.02	508302	-128	127	1.42	142
-198	2	10188	99099	0.59459	297.59459	149.09459	14909.45945	0.59459	297.5946	149.09459	14909.4594	0.59459	297.59459	149.09459	14909.45900	2020-01-01	2020-01-02	2020-01-01 00:03:18	2020-01-02 03:31:39	2020-01-01 00:03:18.000	2020-01-02 03:31:39.000	198	99099	49648.5	4964850	198	99099	49648.5	4964850	-32371	32564	5084.02	508402	-128	127	-0.14	-14
-199	2	10189	99100	0.59759	297.59759	149.09759	14909.75975	0.59759	297.5976	149.09759	14909.75958	0.59759	297.59759	149.09759	14909.75900	2020-01-01	2020-01-02	2020-01-01 00:03:19	2020-01-02 03:31:40	2020-01-01 00:03:19.000	2020-01-02 03:31:40.000	199	99100	49649.5	4964950	199	99100	49649.5	4964950	-32370	32565	5085.02	508502	-128	124	-1.7	-170
-2	2	1001	9992	0.006	300.006	150.006	15150.6066	0.006	300.006	150.006	15150.6069	0.00600	300.00600	150.006	15150.60600	2020-01-01	2020-01-02	2020-01-01 00:00:02	2020-01-02 03:45:02	2020-01-01 00:00:02.000	2020-01-02 03:45:02.000	2	99902	49952	5045152	2	99902	49952	5045152	-32567	32368	4531.009900990099	457632	-125	126	-0.9504950495049505	-96
+190	2	10180	99091	0.57057	297.57057	149.07057	14907.05705	0.57057	297.57056	149.07056	14907.05695	0.57057	297.57057	149.07057	14907.057	2020-01-01	2020-01-02	2020-01-01 00:03:10	2020-01-02 03:31:31	2020-01-01 00:03:10.000	2020-01-02 03:31:31.000	190	99091	49640.5	4964050	190	99091	49640.5	4964050	-32379	32556	5076.02	507602	-124	127	2.1	210
+191	2	10181	99092	0.57357	297.57357	149.07357	14907.35735	0.57357	297.57358	149.07357	14907.35753	0.57357	297.57357	149.07357	14907.357	2020-01-01	2020-01-02	2020-01-01 00:03:11	2020-01-02 03:31:32	2020-01-01 00:03:11.000	2020-01-02 03:31:32.000	191	99092	49641.5	4964150	191	99092	49641.5	4964150	-32378	32557	5077.02	507702	-128	127	0.54	54
+192	2	10182	99093	0.57657	297.57657	149.07657	14907.65765	0.57657	297.57657	149.07657	14907.65784	0.57657	297.57657	149.07657	14907.657	2020-01-01	2020-01-02	2020-01-01 00:03:12	2020-01-02 03:31:33	2020-01-01 00:03:12.000	2020-01-02 03:31:33.000	192	99093	49642.5	4964250	192	99093	49642.5	4964250	-32377	32558	5078.02	507802	-128	123	-1.02	-102
+193	2	10183	99094	0.57957	297.57957	149.07957	14907.95795	0.57957	297.5796	149.07957	14907.95793	0.57957	297.57957	149.07957	14907.957	2020-01-01	2020-01-02	2020-01-01 00:03:13	2020-01-02 03:31:34	2020-01-01 00:03:13.000	2020-01-02 03:31:34.000	193	99094	49643.5	4964350	193	99094	49643.5	4964350	-32376	32559	5079.02	507902	-127	124	-0.02	-2
+194	2	10184	99095	0.58258	297.58258	149.08258	14908.25825	0.58258	297.58258	149.08258	14908.25811	0.58258	297.58258	149.08258	14908.258	2020-01-01	2020-01-02	2020-01-01 00:03:14	2020-01-02 03:31:35	2020-01-01 00:03:14.000	2020-01-02 03:31:35.000	194	99095	49644.5	4964450	194	99095	49644.5	4964450	-32375	32560	5080.02	508002	-126	125	0.98	98
+195	2	10185	99096	0.58558	297.58558	149.08558	14908.55855	0.58558	297.58557	149.08558	14908.55842	0.58558	297.58558	149.08558000000002	14908.558	2020-01-01	2020-01-02	2020-01-01 00:03:15	2020-01-02 03:31:36	2020-01-01 00:03:15.000	2020-01-02 03:31:36.000	195	99096	49645.5	4964550	195	99096	49645.5	4964550	-32374	32561	5081.02	508102	-125	126	1.98	198
+196	2	10186	99097	0.58858	297.58858	149.08858	14908.85885	0.58858	297.5886	149.08859	14908.859	0.58858	297.58858	149.08858	14908.858	2020-01-01	2020-01-02	2020-01-01 00:03:16	2020-01-02 03:31:37	2020-01-01 00:03:16.000	2020-01-02 03:31:37.000	196	99097	49646.5	4964650	196	99097	49646.5	4964650	-32373	32562	5082.02	508202	-124	127	2.98	298
+197	2	10187	99098	0.59159	297.59159	149.09159	14909.15915	0.59159	297.59158	149.09159	14909.15931	0.59159	297.59159	149.09159	14909.159	2020-01-01	2020-01-02	2020-01-01 00:03:17	2020-01-02 03:31:38	2020-01-01 00:03:17.000	2020-01-02 03:31:38.000	197	99098	49647.5	4964750	197	99098	49647.5	4964750	-32372	32563	5083.02	508302	-128	127	1.42	142
+198	2	10188	99099	0.59459	297.59459	149.09459	14909.45945	0.59459	297.5946	149.09459	14909.4594	0.59459	297.59459	149.09459	14909.459	2020-01-01	2020-01-02	2020-01-01 00:03:18	2020-01-02 03:31:39	2020-01-01 00:03:18.000	2020-01-02 03:31:39.000	198	99099	49648.5	4964850	198	99099	49648.5	4964850	-32371	32564	5084.02	508402	-128	127	-0.14	-14
+199	2	10189	99100	0.59759	297.59759	149.09759	14909.75975	0.59759	297.5976	149.09759	14909.75958	0.59759	297.59759	149.09759	14909.759	2020-01-01	2020-01-02	2020-01-01 00:03:19	2020-01-02 03:31:40	2020-01-01 00:03:19.000	2020-01-02 03:31:40.000	199	99100	49649.5	4964950	199	99100	49649.5	4964950	-32370	32565	5085.02	508502	-128	124	-1.7	-170
+2	2	1001	9992	0.006	300.006	150.006	15150.6066	0.006	300.006	150.006	15150.6069	0.006	300.006	150.006	15150.606	2020-01-01	2020-01-02	2020-01-01 00:00:02	2020-01-02 03:45:02	2020-01-01 00:00:02.000	2020-01-02 03:45:02.000	2	99902	49952	5045152	2	99902	49952	5045152	-32567	32368	4531.009900990099	457632	-125	126	-0.9504950495049505	-96
 20	2	10010	99920	0.06006	300.06006	150.06006	15156.06606	0.06006	300.06006	150.06005	15156.06593	0.06006	300.06006	150.06006	15156.06606	2020-01-01	2020-01-02	2020-01-01 00:00:20	2020-01-02 03:45:20	2020-01-01 00:00:20.000	2020-01-02 03:45:20.000	20	99920	49970	5046970	20	99920	49970	5046970	-32549	32386	4549.009900990099	459450	-126	126	-0.693069306930693	-70
-200	2	10190	99101	0.6006	297.6006	149.1006	14910.06006	0.6006	297.6006	149.10059	14910.0599	0.60060	297.60060	149.1006	14910.06000	2020-01-01	2020-01-02	2020-01-01 00:03:20	2020-01-02 03:31:41	2020-01-01 00:03:20.000	2020-01-02 03:31:41.000	200	99101	49650.5	4965050	200	99101	49650.5	4965050	-32369	32566	5086.02	508602	-127	125	-0.7	-70
-201	2	10191	99102	0.6036	297.6036	149.1036	14910.36036	0.6036	297.6036	149.1036	14910.36063	0.60360	297.60360	149.1036	14910.36000	2020-01-01	2020-01-02	2020-01-01 00:03:21	2020-01-02 03:31:42	2020-01-01 00:03:21.000	2020-01-02 03:31:42.000	201	99102	49651.5	4965150	201	99102	49651.5	4965150	-32368	32567	5087.02	508702	-126	126	0.3	30
-202	2	10192	99103	0.6066	297.6066	149.1066	14910.66066	0.6066	297.6066	149.1066	14910.66078	0.60660	297.60660	149.1066	14910.66000	2020-01-01	2020-01-02	2020-01-01 00:03:22	2020-01-02 03:31:43	2020-01-01 00:03:22.000	2020-01-02 03:31:43.000	202	99103	49652.5	4965250	202	99103	49652.5	4965250	-32367	32568	5088.02	508802	-125	127	1.3	130
-203	2	10193	99104	0.6096	297.6096	149.1096	14910.96096	0.6096	297.60962	149.1096	14910.9609	0.60960	297.60960	149.1096	14910.96000	2020-01-01	2020-01-02	2020-01-01 00:03:23	2020-01-02 03:31:44	2020-01-01 00:03:23.000	2020-01-02 03:31:44.000	203	99104	49653.5	4965350	203	99104	49653.5	4965350	-32366	32569	5089.02	508902	-128	127	-0.26	-26
-204	2	10194	99105	0.61261	297.61261	149.11261	14911.26126	0.61261	297.6126	149.11261	14911.26105	0.61261	297.61261	149.11261000000002	14911.26100	2020-01-01	2020-01-02	2020-01-01 00:03:24	2020-01-02 03:31:45	2020-01-01 00:03:24.000	2020-01-02 03:31:45.000	204	99105	49654.5	4965450	204	99105	49654.5	4965450	-32365	32570	5090.02	509002	-128	127	-1.82	-182
-205	2	10195	99106	0.61561	297.61561	149.11561	14911.56156	0.61561	297.6156	149.11561	14911.56137	0.61561	297.61561	149.11561	14911.56100	2020-01-01	2020-01-02	2020-01-01 00:03:25	2020-01-02 03:31:46	2020-01-01 00:03:25.000	2020-01-02 03:31:46.000	205	99106	49655.5	4965550	205	99106	49655.5	4965550	-32364	32571	5091.02	509102	-128	123	-3.38	-338
-206	2	10196	99107	0.61861	297.61861	149.11861	14911.86186	0.61861	297.61862	149.11862	14911.8621	0.61861	297.61861	149.11861000000002	14911.86100	2020-01-01	2020-01-02	2020-01-01 00:03:26	2020-01-02 03:31:47	2020-01-01 00:03:26.000	2020-01-02 03:31:47.000	206	99107	49656.5	4965650	206	99107	49656.5	4965650	-32363	32572	5092.02	509202	-127	124	-2.38	-238
-207	2	10197	99108	0.62162	297.62162	149.12162	14912.16216	0.62162	297.6216	149.12162	14912.16225	0.62162	297.62162	149.12162	14912.16200	2020-01-01	2020-01-02	2020-01-01 00:03:27	2020-01-02 03:31:48	2020-01-01 00:03:27.000	2020-01-02 03:31:48.000	207	99108	49657.5	4965750	207	99108	49657.5	4965750	-32362	32573	5093.02	509302	-126	125	-1.38	-138
-208	2	10198	99109	0.62462	297.62462	149.12462	14912.46246	0.62462	297.62463	149.12462	14912.46237	0.62462	297.62462	149.12462	14912.46200	2020-01-01	2020-01-02	2020-01-01 00:03:28	2020-01-02 03:31:49	2020-01-01 00:03:28.000	2020-01-02 03:31:49.000	208	99109	49658.5	4965850	208	99109	49658.5	4965850	-32361	32574	5094.02	509402	-125	126	-0.38	-38
-209	2	10199	99110	0.62762	297.62762	149.12762	14912.76276	0.62762	297.62762	149.12762	14912.76253	0.62762	297.62762	149.12762	14912.76200	2020-01-01	2020-01-02	2020-01-01 00:03:29	2020-01-02 03:31:50	2020-01-01 00:03:29.000	2020-01-02 03:31:50.000	209	99110	49659.5	4965950	209	99110	49659.5	4965950	-32360	32575	5095.02	509502	-124	127	0.62	62
+200	2	10190	99101	0.6006	297.6006	149.1006	14910.06006	0.6006	297.6006	149.10059	14910.0599	0.6006	297.6006	149.1006	14910.06	2020-01-01	2020-01-02	2020-01-01 00:03:20	2020-01-02 03:31:41	2020-01-01 00:03:20.000	2020-01-02 03:31:41.000	200	99101	49650.5	4965050	200	99101	49650.5	4965050	-32369	32566	5086.02	508602	-127	125	-0.7	-70
+201	2	10191	99102	0.6036	297.6036	149.1036	14910.36036	0.6036	297.6036	149.1036	14910.36063	0.6036	297.6036	149.1036	14910.36	2020-01-01	2020-01-02	2020-01-01 00:03:21	2020-01-02 03:31:42	2020-01-01 00:03:21.000	2020-01-02 03:31:42.000	201	99102	49651.5	4965150	201	99102	49651.5	4965150	-32368	32567	5087.02	508702	-126	126	0.3	30
+202	2	10192	99103	0.6066	297.6066	149.1066	14910.66066	0.6066	297.6066	149.1066	14910.66078	0.6066	297.6066	149.1066	14910.66	2020-01-01	2020-01-02	2020-01-01 00:03:22	2020-01-02 03:31:43	2020-01-01 00:03:22.000	2020-01-02 03:31:43.000	202	99103	49652.5	4965250	202	99103	49652.5	4965250	-32367	32568	5088.02	508802	-125	127	1.3	130
+203	2	10193	99104	0.6096	297.6096	149.1096	14910.96096	0.6096	297.60962	149.1096	14910.9609	0.6096	297.6096	149.1096	14910.96	2020-01-01	2020-01-02	2020-01-01 00:03:23	2020-01-02 03:31:44	2020-01-01 00:03:23.000	2020-01-02 03:31:44.000	203	99104	49653.5	4965350	203	99104	49653.5	4965350	-32366	32569	5089.02	508902	-128	127	-0.26	-26
+204	2	10194	99105	0.61261	297.61261	149.11261	14911.26126	0.61261	297.6126	149.11261	14911.26105	0.61261	297.61261	149.11261000000002	14911.261	2020-01-01	2020-01-02	2020-01-01 00:03:24	2020-01-02 03:31:45	2020-01-01 00:03:24.000	2020-01-02 03:31:45.000	204	99105	49654.5	4965450	204	99105	49654.5	4965450	-32365	32570	5090.02	509002	-128	127	-1.82	-182
+205	2	10195	99106	0.61561	297.61561	149.11561	14911.56156	0.61561	297.6156	149.11561	14911.56137	0.61561	297.61561	149.11561	14911.561	2020-01-01	2020-01-02	2020-01-01 00:03:25	2020-01-02 03:31:46	2020-01-01 00:03:25.000	2020-01-02 03:31:46.000	205	99106	49655.5	4965550	205	99106	49655.5	4965550	-32364	32571	5091.02	509102	-128	123	-3.38	-338
+206	2	10196	99107	0.61861	297.61861	149.11861	14911.86186	0.61861	297.61862	149.11862	14911.8621	0.61861	297.61861	149.11861000000002	14911.861	2020-01-01	2020-01-02	2020-01-01 00:03:26	2020-01-02 03:31:47	2020-01-01 00:03:26.000	2020-01-02 03:31:47.000	206	99107	49656.5	4965650	206	99107	49656.5	4965650	-32363	32572	5092.02	509202	-127	124	-2.38	-238
+207	2	10197	99108	0.62162	297.62162	149.12162	14912.16216	0.62162	297.6216	149.12162	14912.16225	0.62162	297.62162	149.12162	14912.162	2020-01-01	2020-01-02	2020-01-01 00:03:27	2020-01-02 03:31:48	2020-01-01 00:03:27.000	2020-01-02 03:31:48.000	207	99108	49657.5	4965750	207	99108	49657.5	4965750	-32362	32573	5093.02	509302	-126	125	-1.38	-138
+208	2	10198	99109	0.62462	297.62462	149.12462	14912.46246	0.62462	297.62463	149.12462	14912.46237	0.62462	297.62462	149.12462	14912.462	2020-01-01	2020-01-02	2020-01-01 00:03:28	2020-01-02 03:31:49	2020-01-01 00:03:28.000	2020-01-02 03:31:49.000	208	99109	49658.5	4965850	208	99109	49658.5	4965850	-32361	32574	5094.02	509402	-125	126	-0.38	-38
+209	2	10199	99110	0.62762	297.62762	149.12762	14912.76276	0.62762	297.62762	149.12762	14912.76253	0.62762	297.62762	149.12762	14912.762	2020-01-01	2020-01-02	2020-01-01 00:03:29	2020-01-02 03:31:50	2020-01-01 00:03:29.000	2020-01-02 03:31:50.000	209	99110	49659.5	4965950	209	99110	49659.5	4965950	-32360	32575	5095.02	509502	-124	127	0.62	62
 21	2	10011	99921	0.06306	300.06306	150.06306	15156.36936	0.06306	300.06305	150.06306	15156.36927	0.06306	300.06306	150.06306	15156.36906	2020-01-01	2020-01-02	2020-01-01 00:00:21	2020-01-02 03:45:21	2020-01-01 00:00:21.000	2020-01-02 03:45:21.000	21	99921	49971	5047071	21	99921	49971	5047071	-32548	32387	4550.009900990099	459551	-125	127	0.3069306930693069	31
-210	2	10200	99111	0.63063	297.63063	149.13063	14913.06306	0.63063	297.63065	149.13063	14913.06326	0.63063	297.63063	149.13063	14913.06300	2020-01-01	2020-01-02	2020-01-01 00:03:30	2020-01-02 03:31:51	2020-01-01 00:03:30.000	2020-01-02 03:31:51.000	210	99111	49660.5	4966050	210	99111	49660.5	4966050	-32359	32576	5096.02	509602	-128	127	-0.94	-94
-211	2	10201	99112	0.63363	297.63363	149.13363	14913.36336	0.63363	297.63364	149.13363	14913.36357	0.63363	297.63363	149.13362999999998	14913.36300	2020-01-01	2020-01-02	2020-01-01 00:03:31	2020-01-02 03:31:52	2020-01-01 00:03:31.000	2020-01-02 03:31:52.000	211	99112	49661.5	4966150	211	99112	49661.5	4966150	-32358	32577	5097.02	509702	-128	123	-2.5	-250
-212	2	10202	99113	0.63663	297.63663	149.13663	14913.66366	0.63663	297.63663	149.13663	14913.66372	0.63663	297.63663	149.13663	14913.66300	2020-01-01	2020-01-02	2020-01-01 00:03:32	2020-01-02 03:31:53	2020-01-01 00:03:32.000	2020-01-02 03:31:53.000	212	99113	49662.5	4966250	212	99113	49662.5	4966250	-32357	32578	5098.02	509802	-127	124	-1.5	-150
-213	2	10203	99114	0.63963	297.63963	149.13963	14913.96396	0.63963	297.63965	149.13963	14913.96384	0.63963	297.63963	149.13963	14913.96300	2020-01-01	2020-01-02	2020-01-01 00:03:33	2020-01-02 03:31:54	2020-01-01 00:03:33.000	2020-01-02 03:31:54.000	213	99114	49663.5	4966350	213	99114	49663.5	4966350	-32356	32579	5099.02	509902	-126	125	-0.5	-50
-214	2	10204	99115	0.64264	297.64264	149.14264	14914.26426	0.64264	297.64264	149.14263	14914.26399	0.64264	297.64264	149.14264	14914.26400	2020-01-01	2020-01-02	2020-01-01 00:03:34	2020-01-02 03:31:55	2020-01-01 00:03:34.000	2020-01-02 03:31:55.000	214	99115	49664.5	4966450	214	99115	49664.5	4966450	-32355	32580	5100.02	510002	-125	126	0.5	50
-215	2	10205	99116	0.64564	297.64564	149.14564	14914.56456	0.64564	297.64566	149.14564	14914.56473	0.64564	297.64564	149.14564000000001	14914.56400	2020-01-01	2020-01-02	2020-01-01 00:03:35	2020-01-02 03:31:56	2020-01-01 00:03:35.000	2020-01-02 03:31:56.000	215	99116	49665.5	4966550	215	99116	49665.5	4966550	-32354	32581	5101.02	510102	-124	127	1.5	150
-216	2	10206	99117	0.64864	297.64864	149.14864	14914.86486	0.64864	297.64865	149.14865	14914.86504	0.64864	297.64864	149.14864	14914.86400	2020-01-01	2020-01-02	2020-01-01 00:03:36	2020-01-02 03:31:57	2020-01-01 00:03:36.000	2020-01-02 03:31:57.000	216	99117	49666.5	4966650	216	99117	49666.5	4966650	-32353	32582	5102.02	510202	-128	127	-0.06	-6
-217	2	10207	99118	0.65165	297.65165	149.15165	14915.16516	0.65165	297.65164	149.15165	14915.16523	0.65165	297.65165	149.15165000000002	14915.16500	2020-01-01	2020-01-02	2020-01-01 00:03:37	2020-01-02 03:31:58	2020-01-01 00:03:37.000	2020-01-02 03:31:58.000	217	99118	49667.5	4966750	217	99118	49667.5	4966750	-32352	32583	5103.02	510302	-128	123	-1.62	-162
-218	2	10208	99119	0.65465	297.65465	149.15465	14915.46546	0.65465	297.65466	149.15465	14915.46531	0.65465	297.65465	149.15465	14915.46500	2020-01-01	2020-01-02	2020-01-01 00:03:38	2020-01-02 03:31:59	2020-01-01 00:03:38.000	2020-01-02 03:31:59.000	218	99119	49668.5	4966850	218	99119	49668.5	4966850	-32351	32584	5104.02	510402	-127	124	-0.62	-62
-219	2	10209	99120	0.65765	297.65765	149.15765	14915.76576	0.65765	297.65765	149.15765	14915.76562	0.65765	297.65765	149.15765	14915.76500	2020-01-01	2020-01-02	2020-01-01 00:03:39	2020-01-02 03:32:00	2020-01-01 00:03:39.000	2020-01-02 03:32:00.000	219	99120	49669.5	4966950	219	99120	49669.5	4966950	-32350	32585	5105.02	510502	-126	125	0.38	38
+210	2	10200	99111	0.63063	297.63063	149.13063	14913.06306	0.63063	297.63065	149.13063	14913.06326	0.63063	297.63063	149.13063	14913.063	2020-01-01	2020-01-02	2020-01-01 00:03:30	2020-01-02 03:31:51	2020-01-01 00:03:30.000	2020-01-02 03:31:51.000	210	99111	49660.5	4966050	210	99111	49660.5	4966050	-32359	32576	5096.02	509602	-128	127	-0.94	-94
+211	2	10201	99112	0.63363	297.63363	149.13363	14913.36336	0.63363	297.63364	149.13363	14913.36357	0.63363	297.63363	149.13362999999998	14913.363	2020-01-01	2020-01-02	2020-01-01 00:03:31	2020-01-02 03:31:52	2020-01-01 00:03:31.000	2020-01-02 03:31:52.000	211	99112	49661.5	4966150	211	99112	49661.5	4966150	-32358	32577	5097.02	509702	-128	123	-2.5	-250
+212	2	10202	99113	0.63663	297.63663	149.13663	14913.66366	0.63663	297.63663	149.13663	14913.66372	0.63663	297.63663	149.13663	14913.663	2020-01-01	2020-01-02	2020-01-01 00:03:32	2020-01-02 03:31:53	2020-01-01 00:03:32.000	2020-01-02 03:31:53.000	212	99113	49662.5	4966250	212	99113	49662.5	4966250	-32357	32578	5098.02	509802	-127	124	-1.5	-150
+213	2	10203	99114	0.63963	297.63963	149.13963	14913.96396	0.63963	297.63965	149.13963	14913.96384	0.63963	297.63963	149.13963	14913.963	2020-01-01	2020-01-02	2020-01-01 00:03:33	2020-01-02 03:31:54	2020-01-01 00:03:33.000	2020-01-02 03:31:54.000	213	99114	49663.5	4966350	213	99114	49663.5	4966350	-32356	32579	5099.02	509902	-126	125	-0.5	-50
+214	2	10204	99115	0.64264	297.64264	149.14264	14914.26426	0.64264	297.64264	149.14263	14914.26399	0.64264	297.64264	149.14264	14914.264	2020-01-01	2020-01-02	2020-01-01 00:03:34	2020-01-02 03:31:55	2020-01-01 00:03:34.000	2020-01-02 03:31:55.000	214	99115	49664.5	4966450	214	99115	49664.5	4966450	-32355	32580	5100.02	510002	-125	126	0.5	50
+215	2	10205	99116	0.64564	297.64564	149.14564	14914.56456	0.64564	297.64566	149.14564	14914.56473	0.64564	297.64564	149.14564000000001	14914.564	2020-01-01	2020-01-02	2020-01-01 00:03:35	2020-01-02 03:31:56	2020-01-01 00:03:35.000	2020-01-02 03:31:56.000	215	99116	49665.5	4966550	215	99116	49665.5	4966550	-32354	32581	5101.02	510102	-124	127	1.5	150
+216	2	10206	99117	0.64864	297.64864	149.14864	14914.86486	0.64864	297.64865	149.14865	14914.86504	0.64864	297.64864	149.14864	14914.864	2020-01-01	2020-01-02	2020-01-01 00:03:36	2020-01-02 03:31:57	2020-01-01 00:03:36.000	2020-01-02 03:31:57.000	216	99117	49666.5	4966650	216	99117	49666.5	4966650	-32353	32582	5102.02	510202	-128	127	-0.06	-6
+217	2	10207	99118	0.65165	297.65165	149.15165	14915.16516	0.65165	297.65164	149.15165	14915.16523	0.65165	297.65165	149.15165000000002	14915.165	2020-01-01	2020-01-02	2020-01-01 00:03:37	2020-01-02 03:31:58	2020-01-01 00:03:37.000	2020-01-02 03:31:58.000	217	99118	49667.5	4966750	217	99118	49667.5	4966750	-32352	32583	5103.02	510302	-128	123	-1.62	-162
+218	2	10208	99119	0.65465	297.65465	149.15465	14915.46546	0.65465	297.65466	149.15465	14915.46531	0.65465	297.65465	149.15465	14915.465	2020-01-01	2020-01-02	2020-01-01 00:03:38	2020-01-02 03:31:59	2020-01-01 00:03:38.000	2020-01-02 03:31:59.000	218	99119	49668.5	4966850	218	99119	49668.5	4966850	-32351	32584	5104.02	510402	-127	124	-0.62	-62
+219	2	10209	99120	0.65765	297.65765	149.15765	14915.76576	0.65765	297.65765	149.15765	14915.76562	0.65765	297.65765	149.15765	14915.765	2020-01-01	2020-01-02	2020-01-01 00:03:39	2020-01-02 03:32:00	2020-01-01 00:03:39.000	2020-01-02 03:32:00.000	219	99120	49669.5	4966950	219	99120	49669.5	4966950	-32350	32585	5105.02	510502	-126	125	0.38	38
 22	2	10012	99922	0.06606	300.06606	150.06606	15156.67267	0.06606	300.06607	150.06606	15156.67287	0.06606	300.06606	150.06606000000002	15156.67206	2020-01-01	2020-01-02	2020-01-01 00:00:22	2020-01-02 03:45:22	2020-01-01 00:00:22.000	2020-01-02 03:45:22.000	22	99922	49972	5047172	22	99922	49972	5047172	-32547	32388	4551.009900990099	459652	-128	127	-1.2277227722772277	-124
-220	2	10210	99121	0.66066	297.66066	149.16066	14916.06606	0.66066	297.66068	149.16066	14916.06619	0.66066	297.66066	149.16066	14916.06600	2020-01-01	2020-01-02	2020-01-01 00:03:40	2020-01-02 03:32:01	2020-01-01 00:03:40.000	2020-01-02 03:32:01.000	220	99121	49670.5	4967050	220	99121	49670.5	4967050	-32349	32586	5106.02	510602	-125	126	1.38	138
-221	2	10211	99122	0.66366	297.66366	149.16366	14916.36636	0.66366	297.66367	149.16366	14916.36651	0.66366	297.66366	149.16366	14916.36600	2020-01-01	2020-01-02	2020-01-01 00:03:41	2020-01-02 03:32:02	2020-01-01 00:03:41.000	2020-01-02 03:32:02.000	221	99122	49671.5	4967150	221	99122	49671.5	4967150	-32348	32587	5107.02	510702	-124	127	2.38	238
-222	2	10212	99123	0.66666	297.66666	149.16666	14916.66666	0.66666	297.66666	149.16666	14916.6667	0.66666	297.66666	149.16665999999998	14916.66600	2020-01-01	2020-01-02	2020-01-01 00:03:42	2020-01-02 03:32:03	2020-01-01 00:03:42.000	2020-01-02 03:32:03.000	222	99123	49672.5	4967250	222	99123	49672.5	4967250	-32347	32588	5108.02	510802	-128	127	0.82	82
-223	2	10213	99124	0.66966	297.66966	149.16966	14916.96696	0.66966	297.66968	149.16966	14916.96678	0.66966	297.66966	149.16966	14916.96600	2020-01-01	2020-01-02	2020-01-01 00:03:43	2020-01-02 03:32:04	2020-01-01 00:03:43.000	2020-01-02 03:32:04.000	223	99124	49673.5	4967350	223	99124	49673.5	4967350	-32346	32589	5109.02	510902	-128	127	-0.74	-74
-224	2	10214	99125	0.67267	297.67267	149.17267	14917.26726	0.67267	297.67267	149.17267	14917.26709	0.67267	297.67267	149.17267	14917.26700	2020-01-01	2020-01-02	2020-01-01 00:03:44	2020-01-02 03:32:05	2020-01-01 00:03:44.000	2020-01-02 03:32:05.000	224	99125	49674.5	4967450	224	99125	49674.5	4967450	-32345	32590	5110.02	511002	-128	124	-2.3	-230
-225	2	10215	99126	0.67567	297.67567	149.17567	14917.56756	0.67567	297.6757	149.17567	14917.56767	0.67567	297.67567	149.17567	14917.56700	2020-01-01	2020-01-02	2020-01-01 00:03:45	2020-01-02 03:32:06	2020-01-01 00:03:45.000	2020-01-02 03:32:06.000	225	99126	49675.5	4967550	225	99126	49675.5	4967550	-32344	32591	5111.02	511102	-127	125	-1.3	-130
-226	2	10216	99127	0.67867	297.67867	149.17867	14917.86786	0.67867	297.67868	149.17868	14917.86802	0.67867	297.67867	149.17867	14917.86700	2020-01-01	2020-01-02	2020-01-01 00:03:46	2020-01-02 03:32:07	2020-01-01 00:03:46.000	2020-01-02 03:32:07.000	226	99127	49676.5	4967650	226	99127	49676.5	4967650	-32343	32592	5112.02	511202	-126	126	-0.3	-30
-227	2	10217	99128	0.68168	297.68168	149.18168	14918.16816	0.68168	297.68167	149.18168	14918.16817	0.68168	297.68168	149.18168	14918.16800	2020-01-01	2020-01-02	2020-01-01 00:03:47	2020-01-02 03:32:08	2020-01-01 00:03:47.000	2020-01-02 03:32:08.000	227	99128	49677.5	4967750	227	99128	49677.5	4967750	-32342	32593	5113.02	511302	-125	127	0.7	70
-228	2	10218	99129	0.68468	297.68468	149.18468	14918.46846	0.68468	297.6847	149.18468	14918.46825	0.68468	297.68468	149.18468000000001	14918.46800	2020-01-01	2020-01-02	2020-01-01 00:03:48	2020-01-02 03:32:09	2020-01-01 00:03:48.000	2020-01-02 03:32:09.000	228	99129	49678.5	4967850	228	99129	49678.5	4967850	-32341	32594	5114.02	511402	-128	127	-0.86	-86
-229	2	10219	99130	0.68768	297.68768	149.18768	14918.76876	0.68768	297.68768	149.18768	14918.76855	0.68768	297.68768	149.18768	14918.76800	2020-01-01	2020-01-02	2020-01-01 00:03:49	2020-01-02 03:32:10	2020-01-01 00:03:49.000	2020-01-02 03:32:10.000	229	99130	49679.5	4967950	229	99130	49679.5	4967950	-32340	32595	5115.02	511502	-128	127	-2.42	-242
+220	2	10210	99121	0.66066	297.66066	149.16066	14916.06606	0.66066	297.66068	149.16066	14916.06619	0.66066	297.66066	149.16066	14916.066	2020-01-01	2020-01-02	2020-01-01 00:03:40	2020-01-02 03:32:01	2020-01-01 00:03:40.000	2020-01-02 03:32:01.000	220	99121	49670.5	4967050	220	99121	49670.5	4967050	-32349	32586	5106.02	510602	-125	126	1.38	138
+221	2	10211	99122	0.66366	297.66366	149.16366	14916.36636	0.66366	297.66367	149.16366	14916.36651	0.66366	297.66366	149.16366	14916.366	2020-01-01	2020-01-02	2020-01-01 00:03:41	2020-01-02 03:32:02	2020-01-01 00:03:41.000	2020-01-02 03:32:02.000	221	99122	49671.5	4967150	221	99122	49671.5	4967150	-32348	32587	5107.02	510702	-124	127	2.38	238
+222	2	10212	99123	0.66666	297.66666	149.16666	14916.66666	0.66666	297.66666	149.16666	14916.6667	0.66666	297.66666	149.16665999999998	14916.666	2020-01-01	2020-01-02	2020-01-01 00:03:42	2020-01-02 03:32:03	2020-01-01 00:03:42.000	2020-01-02 03:32:03.000	222	99123	49672.5	4967250	222	99123	49672.5	4967250	-32347	32588	5108.02	510802	-128	127	0.82	82
+223	2	10213	99124	0.66966	297.66966	149.16966	14916.96696	0.66966	297.66968	149.16966	14916.96678	0.66966	297.66966	149.16966	14916.966	2020-01-01	2020-01-02	2020-01-01 00:03:43	2020-01-02 03:32:04	2020-01-01 00:03:43.000	2020-01-02 03:32:04.000	223	99124	49673.5	4967350	223	99124	49673.5	4967350	-32346	32589	5109.02	510902	-128	127	-0.74	-74
+224	2	10214	99125	0.67267	297.67267	149.17267	14917.26726	0.67267	297.67267	149.17267	14917.26709	0.67267	297.67267	149.17267	14917.267	2020-01-01	2020-01-02	2020-01-01 00:03:44	2020-01-02 03:32:05	2020-01-01 00:03:44.000	2020-01-02 03:32:05.000	224	99125	49674.5	4967450	224	99125	49674.5	4967450	-32345	32590	5110.02	511002	-128	124	-2.3	-230
+225	2	10215	99126	0.67567	297.67567	149.17567	14917.56756	0.67567	297.6757	149.17567	14917.56767	0.67567	297.67567	149.17567	14917.567	2020-01-01	2020-01-02	2020-01-01 00:03:45	2020-01-02 03:32:06	2020-01-01 00:03:45.000	2020-01-02 03:32:06.000	225	99126	49675.5	4967550	225	99126	49675.5	4967550	-32344	32591	5111.02	511102	-127	125	-1.3	-130
+226	2	10216	99127	0.67867	297.67867	149.17867	14917.86786	0.67867	297.67868	149.17868	14917.86802	0.67867	297.67867	149.17867	14917.867	2020-01-01	2020-01-02	2020-01-01 00:03:46	2020-01-02 03:32:07	2020-01-01 00:03:46.000	2020-01-02 03:32:07.000	226	99127	49676.5	4967650	226	99127	49676.5	4967650	-32343	32592	5112.02	511202	-126	126	-0.3	-30
+227	2	10217	99128	0.68168	297.68168	149.18168	14918.16816	0.68168	297.68167	149.18168	14918.16817	0.68168	297.68168	149.18168	14918.168	2020-01-01	2020-01-02	2020-01-01 00:03:47	2020-01-02 03:32:08	2020-01-01 00:03:47.000	2020-01-02 03:32:08.000	227	99128	49677.5	4967750	227	99128	49677.5	4967750	-32342	32593	5113.02	511302	-125	127	0.7	70
+228	2	10218	99129	0.68468	297.68468	149.18468	14918.46846	0.68468	297.6847	149.18468	14918.46825	0.68468	297.68468	149.18468000000001	14918.468	2020-01-01	2020-01-02	2020-01-01 00:03:48	2020-01-02 03:32:09	2020-01-01 00:03:48.000	2020-01-02 03:32:09.000	228	99129	49678.5	4967850	228	99129	49678.5	4967850	-32341	32594	5114.02	511402	-128	127	-0.86	-86
+229	2	10219	99130	0.68768	297.68768	149.18768	14918.76876	0.68768	297.68768	149.18768	14918.76855	0.68768	297.68768	149.18768	14918.768	2020-01-01	2020-01-02	2020-01-01 00:03:49	2020-01-02 03:32:10	2020-01-01 00:03:49.000	2020-01-02 03:32:10.000	229	99130	49679.5	4967950	229	99130	49679.5	4967950	-32340	32595	5115.02	511502	-128	127	-2.42	-242
 23	2	10013	99923	0.06906	300.06906	150.06906	15156.97597	0.06906	300.06906	150.06907	15156.97617	0.06906	300.06906	150.06906	15156.97506	2020-01-01	2020-01-02	2020-01-01 00:00:23	2020-01-02 03:45:23	2020-01-01 00:00:23.000	2020-01-02 03:45:23.000	23	99923	49973	5047273	23	99923	49973	5047273	-32546	32389	4552.009900990099	459753	-128	127	-2.762376237623762	-279
-230	2	10220	99131	0.69069	297.69069	149.19069	14919.06906	0.69069	297.6907	149.19069	14919.06914	0.69069	297.69069	149.19069	14919.06900	2020-01-01	2020-01-02	2020-01-01 00:03:50	2020-01-02 03:32:11	2020-01-01 00:03:50.000	2020-01-02 03:32:11.000	230	99131	49680.5	4968050	230	99131	49680.5	4968050	-32339	32596	5116.02	511602	-128	123	-3.98	-398
-231	2	10221	99132	0.69369	297.69369	149.19369	14919.36936	0.69369	297.6937	149.19369	14919.36949	0.69369	297.69369	149.19369	14919.36900	2020-01-01	2020-01-02	2020-01-01 00:03:51	2020-01-02 03:32:12	2020-01-01 00:03:51.000	2020-01-02 03:32:12.000	231	99132	49681.5	4968150	231	99132	49681.5	4968150	-32338	32597	5117.02	511702	-127	124	-2.98	-298
-232	2	10222	99133	0.69669	297.69669	149.19669	14919.66966	0.69669	297.6967	149.19669	14919.66964	0.69669	297.69669	149.19669	14919.66900	2020-01-01	2020-01-02	2020-01-01 00:03:52	2020-01-02 03:32:13	2020-01-01 00:03:52.000	2020-01-02 03:32:13.000	232	99133	49682.5	4968250	232	99133	49682.5	4968250	-32337	32598	5118.02	511802	-126	125	-1.98	-198
-233	2	10223	99134	0.69969	297.69969	149.19969	14919.96996	0.69969	297.6997	149.1997	14919.97037	0.69969	297.69969	149.19969	14919.96900	2020-01-01	2020-01-02	2020-01-01 00:03:53	2020-01-02 03:32:14	2020-01-01 00:03:53.000	2020-01-02 03:32:14.000	233	99134	49683.5	4968350	233	99134	49683.5	4968350	-32336	32599	5119.02	511902	-125	126	-0.98	-98
-234	2	10224	99135	0.7027	297.7027	149.2027	14920.27027	0.7027	297.7027	149.2027	14920.27003	0.70270	297.70270	149.2027	14920.27000	2020-01-01	2020-01-02	2020-01-01 00:03:54	2020-01-02 03:32:15	2020-01-01 00:03:54.000	2020-01-02 03:32:15.000	234	99135	49684.5	4968450	234	99135	49684.5	4968450	-32335	32600	5120.02	512002	-124	127	0.02	2
-235	2	10225	99136	0.7057	297.7057	149.2057	14920.57057	0.7057	297.70572	149.2057	14920.57065	0.70570	297.70570	149.2057	14920.57000	2020-01-01	2020-01-02	2020-01-01 00:03:55	2020-01-02 03:32:16	2020-01-01 00:03:55.000	2020-01-02 03:32:16.000	235	99136	49685.5	4968550	235	99136	49685.5	4968550	-32334	32601	5121.02	512102	-128	127	-1.54	-154
-236	2	10226	99137	0.7087	297.7087	149.2087	14920.87087	0.7087	297.7087	149.2087	14920.87095	0.70870	297.70870	149.20870000000002	14920.87000	2020-01-01	2020-01-02	2020-01-01 00:03:56	2020-01-02 03:32:17	2020-01-01 00:03:56.000	2020-01-02 03:32:17.000	236	99137	49686.5	4968650	236	99137	49686.5	4968650	-32333	32602	5122.02	512202	-128	123	-3.1	-310
-237	2	10227	99138	0.71171	297.71171	149.21171	14921.17117	0.71171	297.7117	149.21171	14921.17111	0.71171	297.71171	149.21171	14921.17100	2020-01-01	2020-01-02	2020-01-01 00:03:57	2020-01-02 03:32:18	2020-01-01 00:03:57.000	2020-01-02 03:32:18.000	237	99138	49687.5	4968750	237	99138	49687.5	4968750	-32332	32603	5123.02	512302	-127	124	-2.1	-210
-238	2	10228	99139	0.71471	297.71471	149.21471	14921.47147	0.71471	297.71472	149.21471	14921.47184	0.71471	297.71471	149.21471	14921.47100	2020-01-01	2020-01-02	2020-01-01 00:03:58	2020-01-02 03:32:19	2020-01-01 00:03:58.000	2020-01-02 03:32:19.000	238	99139	49688.5	4968850	238	99139	49688.5	4968850	-32331	32604	5124.02	512402	-126	125	-1.1	-110
-239	2	10229	99140	0.71771	297.71771	149.21771	14921.77177	0.71771	297.7177	149.21771	14921.7715	0.71771	297.71771	149.21771	14921.77100	2020-01-01	2020-01-02	2020-01-01 00:03:59	2020-01-02 03:32:20	2020-01-01 00:03:59.000	2020-01-02 03:32:20.000	239	99140	49689.5	4968950	239	99140	49689.5	4968950	-32330	32605	5125.02	512502	-125	126	-0.1	-10
+230	2	10220	99131	0.69069	297.69069	149.19069	14919.06906	0.69069	297.6907	149.19069	14919.06914	0.69069	297.69069	149.19069	14919.069	2020-01-01	2020-01-02	2020-01-01 00:03:50	2020-01-02 03:32:11	2020-01-01 00:03:50.000	2020-01-02 03:32:11.000	230	99131	49680.5	4968050	230	99131	49680.5	4968050	-32339	32596	5116.02	511602	-128	123	-3.98	-398
+231	2	10221	99132	0.69369	297.69369	149.19369	14919.36936	0.69369	297.6937	149.19369	14919.36949	0.69369	297.69369	149.19369	14919.369	2020-01-01	2020-01-02	2020-01-01 00:03:51	2020-01-02 03:32:12	2020-01-01 00:03:51.000	2020-01-02 03:32:12.000	231	99132	49681.5	4968150	231	99132	49681.5	4968150	-32338	32597	5117.02	511702	-127	124	-2.98	-298
+232	2	10222	99133	0.69669	297.69669	149.19669	14919.66966	0.69669	297.6967	149.19669	14919.66964	0.69669	297.69669	149.19669	14919.669	2020-01-01	2020-01-02	2020-01-01 00:03:52	2020-01-02 03:32:13	2020-01-01 00:03:52.000	2020-01-02 03:32:13.000	232	99133	49682.5	4968250	232	99133	49682.5	4968250	-32337	32598	5118.02	511802	-126	125	-1.98	-198
+233	2	10223	99134	0.69969	297.69969	149.19969	14919.96996	0.69969	297.6997	149.1997	14919.97037	0.69969	297.69969	149.19969	14919.969	2020-01-01	2020-01-02	2020-01-01 00:03:53	2020-01-02 03:32:14	2020-01-01 00:03:53.000	2020-01-02 03:32:14.000	233	99134	49683.5	4968350	233	99134	49683.5	4968350	-32336	32599	5119.02	511902	-125	126	-0.98	-98
+234	2	10224	99135	0.7027	297.7027	149.2027	14920.27027	0.7027	297.7027	149.2027	14920.27003	0.7027	297.7027	149.2027	14920.27	2020-01-01	2020-01-02	2020-01-01 00:03:54	2020-01-02 03:32:15	2020-01-01 00:03:54.000	2020-01-02 03:32:15.000	234	99135	49684.5	4968450	234	99135	49684.5	4968450	-32335	32600	5120.02	512002	-124	127	0.02	2
+235	2	10225	99136	0.7057	297.7057	149.2057	14920.57057	0.7057	297.70572	149.2057	14920.57065	0.7057	297.7057	149.2057	14920.57	2020-01-01	2020-01-02	2020-01-01 00:03:55	2020-01-02 03:32:16	2020-01-01 00:03:55.000	2020-01-02 03:32:16.000	235	99136	49685.5	4968550	235	99136	49685.5	4968550	-32334	32601	5121.02	512102	-128	127	-1.54	-154
+236	2	10226	99137	0.7087	297.7087	149.2087	14920.87087	0.7087	297.7087	149.2087	14920.87095	0.7087	297.7087	149.20870000000002	14920.87	2020-01-01	2020-01-02	2020-01-01 00:03:56	2020-01-02 03:32:17	2020-01-01 00:03:56.000	2020-01-02 03:32:17.000	236	99137	49686.5	4968650	236	99137	49686.5	4968650	-32333	32602	5122.02	512202	-128	123	-3.1	-310
+237	2	10227	99138	0.71171	297.71171	149.21171	14921.17117	0.71171	297.7117	149.21171	14921.17111	0.71171	297.71171	149.21171	14921.171	2020-01-01	2020-01-02	2020-01-01 00:03:57	2020-01-02 03:32:18	2020-01-01 00:03:57.000	2020-01-02 03:32:18.000	237	99138	49687.5	4968750	237	99138	49687.5	4968750	-32332	32603	5123.02	512302	-127	124	-2.1	-210
+238	2	10228	99139	0.71471	297.71471	149.21471	14921.47147	0.71471	297.71472	149.21471	14921.47184	0.71471	297.71471	149.21471	14921.471	2020-01-01	2020-01-02	2020-01-01 00:03:58	2020-01-02 03:32:19	2020-01-01 00:03:58.000	2020-01-02 03:32:19.000	238	99139	49688.5	4968850	238	99139	49688.5	4968850	-32331	32604	5124.02	512402	-126	125	-1.1	-110
+239	2	10229	99140	0.71771	297.71771	149.21771	14921.77177	0.71771	297.7177	149.21771	14921.7715	0.71771	297.71771	149.21771	14921.771	2020-01-01	2020-01-02	2020-01-01 00:03:59	2020-01-02 03:32:20	2020-01-01 00:03:59.000	2020-01-02 03:32:20.000	239	99140	49689.5	4968950	239	99140	49689.5	4968950	-32330	32605	5125.02	512502	-125	126	-0.1	-10
 24	2	10014	99924	0.07207	300.07207	150.07207	15157.27927	0.07207	300.07208	150.07207	15157.27928	0.07207	300.07207	150.07207	15157.27907	2020-01-01	2020-01-02	2020-01-01 00:00:24	2020-01-02 03:45:24	2020-01-01 00:00:24.000	2020-01-02 03:45:24.000	24	99924	49974	5047374	24	99924	49974	5047374	-32545	32390	4553.009900990099	459854	-128	123	-4.297029702970297	-434
-240	2	10230	99141	0.72072	297.72072	149.22072	14922.07207	0.72072	297.72073	149.22072	14922.07211	0.72072	297.72072	149.22072	14922.07200	2020-01-01	2020-01-02	2020-01-01 00:04:00	2020-01-02 03:32:21	2020-01-01 00:04:00.000	2020-01-02 03:32:21.000	240	99141	49690.5	4969050	240	99141	49690.5	4969050	-32329	32606	5126.02	512602	-124	127	0.9	90
-241	2	10231	99142	0.72372	297.72372	149.22372	14922.37237	0.72372	297.72372	149.22372	14922.37243	0.72372	297.72372	149.22372	14922.37200	2020-01-01	2020-01-02	2020-01-01 00:04:01	2020-01-02 03:32:22	2020-01-01 00:04:01.000	2020-01-02 03:32:22.000	241	99142	49691.5	4969150	241	99142	49691.5	4969150	-32328	32607	5127.02	512702	-128	127	-0.66	-66
-242	2	10232	99143	0.72672	297.72672	149.22672	14922.67267	0.72672	297.7267	149.22672	14922.67273	0.72672	297.72672	149.22672	14922.67200	2020-01-01	2020-01-02	2020-01-01 00:04:02	2020-01-02 03:32:23	2020-01-01 00:04:02.000	2020-01-02 03:32:23.000	242	99143	49692.5	4969250	242	99143	49692.5	4969250	-32327	32608	5128.02	512802	-128	123	-2.22	-222
-243	2	10233	99144	0.72972	297.72972	149.22972	14922.97297	0.72972	297.72974	149.22973	14922.97332	0.72972	297.72972	149.22972	14922.97200	2020-01-01	2020-01-02	2020-01-01 00:04:03	2020-01-02 03:32:24	2020-01-01 00:04:03.000	2020-01-02 03:32:24.000	243	99144	49693.5	4969350	243	99144	49693.5	4969350	-32326	32609	5129.02	512902	-127	124	-1.22	-122
-244	2	10234	99145	0.73273	297.73273	149.23273	14923.27327	0.73273	297.73273	149.23272	14923.27297	0.73273	297.73273	149.23273	14923.27300	2020-01-01	2020-01-02	2020-01-01 00:04:04	2020-01-02 03:32:25	2020-01-01 00:04:04.000	2020-01-02 03:32:25.000	244	99145	49694.5	4969450	244	99145	49694.5	4969450	-32325	32610	5130.02	513002	-126	125	-0.22	-22
-245	2	10235	99146	0.73573	297.73573	149.23573	14923.57357	0.73573	297.73575	149.23573	14923.57358	0.73573	297.73573	149.23573	14923.57300	2020-01-01	2020-01-02	2020-01-01 00:04:05	2020-01-02 03:32:26	2020-01-01 00:04:05.000	2020-01-02 03:32:26.000	245	99146	49695.5	4969550	245	99146	49695.5	4969550	-32324	32611	5131.02	513102	-125	126	0.78	78
-246	2	10236	99147	0.73873	297.73873	149.23873	14923.87387	0.73873	297.73874	149.23873	14923.8739	0.73873	297.73873	149.23873	14923.87300	2020-01-01	2020-01-02	2020-01-01 00:04:06	2020-01-02 03:32:27	2020-01-01 00:04:06.000	2020-01-02 03:32:27.000	246	99147	49696.5	4969650	246	99147	49696.5	4969650	-32323	32612	5132.02	513202	-124	127	1.78	178
-247	2	10237	99148	0.74174	297.74174	149.24174	14924.17417	0.74174	297.74173	149.24174	14924.1742	0.74174	297.74174	149.24174000000002	14924.17400	2020-01-01	2020-01-02	2020-01-01 00:04:07	2020-01-02 03:32:28	2020-01-01 00:04:07.000	2020-01-02 03:32:28.000	247	99148	49697.5	4969750	247	99148	49697.5	4969750	-32322	32613	5133.02	513302	-128	127	0.22	22
-248	2	10238	99149	0.74474	297.74474	149.24474	14924.47447	0.74474	297.74475	149.24474	14924.47478	0.74474	297.74474	149.24474	14924.47400	2020-01-01	2020-01-02	2020-01-01 00:04:08	2020-01-02 03:32:29	2020-01-01 00:04:08.000	2020-01-02 03:32:29.000	248	99149	49698.5	4969850	248	99149	49698.5	4969850	-32321	32614	5134.02	513402	-128	127	-1.34	-134
-249	2	10239	99150	0.74774	297.74774	149.24774	14924.77477	0.74774	297.74774	149.24774	14924.77447	0.74774	297.74774	149.24774	14924.77400	2020-01-01	2020-01-02	2020-01-01 00:04:09	2020-01-02 03:32:30	2020-01-01 00:04:09.000	2020-01-02 03:32:30.000	249	99150	49699.5	4969950	249	99150	49699.5	4969950	-32320	32615	5135.02	513502	-128	124	-2.9	-290
+240	2	10230	99141	0.72072	297.72072	149.22072	14922.07207	0.72072	297.72073	149.22072	14922.07211	0.72072	297.72072	149.22072	14922.072	2020-01-01	2020-01-02	2020-01-01 00:04:00	2020-01-02 03:32:21	2020-01-01 00:04:00.000	2020-01-02 03:32:21.000	240	99141	49690.5	4969050	240	99141	49690.5	4969050	-32329	32606	5126.02	512602	-124	127	0.9	90
+241	2	10231	99142	0.72372	297.72372	149.22372	14922.37237	0.72372	297.72372	149.22372	14922.37243	0.72372	297.72372	149.22372	14922.372	2020-01-01	2020-01-02	2020-01-01 00:04:01	2020-01-02 03:32:22	2020-01-01 00:04:01.000	2020-01-02 03:32:22.000	241	99142	49691.5	4969150	241	99142	49691.5	4969150	-32328	32607	5127.02	512702	-128	127	-0.66	-66
+242	2	10232	99143	0.72672	297.72672	149.22672	14922.67267	0.72672	297.7267	149.22672	14922.67273	0.72672	297.72672	149.22672	14922.672	2020-01-01	2020-01-02	2020-01-01 00:04:02	2020-01-02 03:32:23	2020-01-01 00:04:02.000	2020-01-02 03:32:23.000	242	99143	49692.5	4969250	242	99143	49692.5	4969250	-32327	32608	5128.02	512802	-128	123	-2.22	-222
+243	2	10233	99144	0.72972	297.72972	149.22972	14922.97297	0.72972	297.72974	149.22973	14922.97332	0.72972	297.72972	149.22972	14922.972	2020-01-01	2020-01-02	2020-01-01 00:04:03	2020-01-02 03:32:24	2020-01-01 00:04:03.000	2020-01-02 03:32:24.000	243	99144	49693.5	4969350	243	99144	49693.5	4969350	-32326	32609	5129.02	512902	-127	124	-1.22	-122
+244	2	10234	99145	0.73273	297.73273	149.23273	14923.27327	0.73273	297.73273	149.23272	14923.27297	0.73273	297.73273	149.23273	14923.273	2020-01-01	2020-01-02	2020-01-01 00:04:04	2020-01-02 03:32:25	2020-01-01 00:04:04.000	2020-01-02 03:32:25.000	244	99145	49694.5	4969450	244	99145	49694.5	4969450	-32325	32610	5130.02	513002	-126	125	-0.22	-22
+245	2	10235	99146	0.73573	297.73573	149.23573	14923.57357	0.73573	297.73575	149.23573	14923.57358	0.73573	297.73573	149.23573	14923.573	2020-01-01	2020-01-02	2020-01-01 00:04:05	2020-01-02 03:32:26	2020-01-01 00:04:05.000	2020-01-02 03:32:26.000	245	99146	49695.5	4969550	245	99146	49695.5	4969550	-32324	32611	5131.02	513102	-125	126	0.78	78
+246	2	10236	99147	0.73873	297.73873	149.23873	14923.87387	0.73873	297.73874	149.23873	14923.8739	0.73873	297.73873	149.23873	14923.873	2020-01-01	2020-01-02	2020-01-01 00:04:06	2020-01-02 03:32:27	2020-01-01 00:04:06.000	2020-01-02 03:32:27.000	246	99147	49696.5	4969650	246	99147	49696.5	4969650	-32323	32612	5132.02	513202	-124	127	1.78	178
+247	2	10237	99148	0.74174	297.74174	149.24174	14924.17417	0.74174	297.74173	149.24174	14924.1742	0.74174	297.74174	149.24174000000002	14924.174	2020-01-01	2020-01-02	2020-01-01 00:04:07	2020-01-02 03:32:28	2020-01-01 00:04:07.000	2020-01-02 03:32:28.000	247	99148	49697.5	4969750	247	99148	49697.5	4969750	-32322	32613	5133.02	513302	-128	127	0.22	22
+248	2	10238	99149	0.74474	297.74474	149.24474	14924.47447	0.74474	297.74475	149.24474	14924.47478	0.74474	297.74474	149.24474	14924.474	2020-01-01	2020-01-02	2020-01-01 00:04:08	2020-01-02 03:32:29	2020-01-01 00:04:08.000	2020-01-02 03:32:29.000	248	99149	49698.5	4969850	248	99149	49698.5	4969850	-32321	32614	5134.02	513402	-128	127	-1.34	-134
+249	2	10239	99150	0.74774	297.74774	149.24774	14924.77477	0.74774	297.74774	149.24774	14924.77447	0.74774	297.74774	149.24774	14924.774	2020-01-01	2020-01-02	2020-01-01 00:04:09	2020-01-02 03:32:30	2020-01-01 00:04:09.000	2020-01-02 03:32:30.000	249	99150	49699.5	4969950	249	99150	49699.5	4969950	-32320	32615	5135.02	513502	-128	124	-2.9	-290
 25	2	10015	99925	0.07507	300.07507	150.07507	15157.58258	0.07507	300.07507	150.07507	15157.58241	0.07507	300.07507	150.07507	15157.58207	2020-01-01	2020-01-02	2020-01-01 00:00:25	2020-01-02 03:45:25	2020-01-01 00:00:25.000	2020-01-02 03:45:25.000	25	99925	49975	5047475	25	99925	49975	5047475	-32544	32391	4554.009900990099	459955	-127	124	-3.297029702970297	-333
-250	2	10240	99151	0.75075	297.75075	149.25075	14925.07507	0.75075	297.75076	149.25075	14925.07506	0.75075	297.75075	149.25075	14925.07500	2020-01-01	2020-01-02	2020-01-01 00:04:10	2020-01-02 03:32:31	2020-01-01 00:04:10.000	2020-01-02 03:32:31.000	250	99151	49700.5	4970050	250	99151	49700.5	4970050	-32319	32616	5136.02	513602	-127	125	-1.9	-190
-251	2	10241	99152	0.75375	297.75375	149.25375	14925.37537	0.75375	297.75375	149.25375	14925.37536	0.75375	297.75375	149.25375	14925.37500	2020-01-01	2020-01-02	2020-01-01 00:04:11	2020-01-02 03:32:32	2020-01-01 00:04:11.000	2020-01-02 03:32:32.000	251	99152	49701.5	4970150	251	99152	49701.5	4970150	-32318	32617	5137.02	513702	-126	126	-0.9	-90
-252	2	10242	99153	0.75675	297.75675	149.25675	14925.67567	0.75675	297.75674	149.25675	14925.67567	0.75675	297.75675	149.25674999999998	14925.67500	2020-01-01	2020-01-02	2020-01-01 00:04:12	2020-01-02 03:32:33	2020-01-01 00:04:12.000	2020-01-02 03:32:33.000	252	99153	49702.5	4970250	252	99153	49702.5	4970250	-32317	32618	5138.02	513802	-125	127	0.1	10
-253	2	10243	99154	0.75975	297.75975	149.25975	14925.97597	0.75975	297.75977	149.25976	14925.97625	0.75975	297.75975	149.25975	14925.97500	2020-01-01	2020-01-02	2020-01-01 00:04:13	2020-01-02 03:32:34	2020-01-01 00:04:13.000	2020-01-02 03:32:34.000	253	99154	49703.5	4970350	253	99154	49703.5	4970350	-32316	32619	5139.02	513902	-128	127	-1.46	-146
-254	2	10244	99155	0.76276	297.76276	149.26276	14926.27627	0.76276	297.76276	149.26275	14926.27594	0.76276	297.76276	149.26276	14926.27600	2020-01-01	2020-01-02	2020-01-01 00:04:14	2020-01-02 03:32:35	2020-01-01 00:04:14.000	2020-01-02 03:32:35.000	254	99155	49704.5	4970450	254	99155	49704.5	4970450	-32315	32620	5140.02	514002	-128	127	-3.02	-302
-255	2	10245	99156	0.76576	297.76576	149.26576	14926.57657	0.76576	297.76578	149.26576	14926.57652	0.76576	297.76576	149.26576	14926.57600	2020-01-01	2020-01-02	2020-01-01 00:04:15	2020-01-02 03:32:36	2020-01-01 00:04:15.000	2020-01-02 03:32:36.000	255	99156	49705.5	4970550	255	99156	49705.5	4970550	-32314	32621	5141.02	514102	-128	123	-4.58	-458
-256	2	10246	99157	0.76876	297.76876	149.26876	14926.87687	0.76876	297.76877	149.26876	14926.87683	0.76876	297.76876	149.26876000000001	14926.87600	2020-01-01	2020-01-02	2020-01-01 00:04:16	2020-01-02 03:32:37	2020-01-01 00:04:16.000	2020-01-02 03:32:37.000	256	99157	49706.5	4970650	256	99157	49706.5	4970650	-32313	32622	5142.02	514202	-127	124	-3.58	-358
-257	2	10247	99158	0.77177	297.77177	149.27177	14927.17717	0.77177	297.77176	149.27177	14927.17714	0.77177	297.77177	149.27177	14927.17700	2020-01-01	2020-01-02	2020-01-01 00:04:17	2020-01-02 03:32:38	2020-01-01 00:04:17.000	2020-01-02 03:32:38.000	257	99158	49707.5	4970750	257	99158	49707.5	4970750	-32312	32623	5143.02	514302	-126	125	-2.58	-258
-258	2	10248	99159	0.77477	297.77477	149.27477	14927.47747	0.77477	297.77478	149.27477	14927.47776	0.77477	297.77477	149.27477000000002	14927.47700	2020-01-01	2020-01-02	2020-01-01 00:04:18	2020-01-02 03:32:39	2020-01-01 00:04:18.000	2020-01-02 03:32:39.000	258	99159	49708.5	4970850	258	99159	49708.5	4970850	-32311	32624	5144.02	514402	-125	126	-1.58	-158
-259	2	10249	99160	0.77777	297.77777	149.27777	14927.77777	0.77777	297.77777	149.27777	14927.77742	0.77777	297.77777	149.27777	14927.77700	2020-01-01	2020-01-02	2020-01-01 00:04:19	2020-01-02 03:32:40	2020-01-01 00:04:19.000	2020-01-02 03:32:40.000	259	99160	49709.5	4970950	259	99160	49709.5	4970950	-32310	32625	5145.02	514502	-124	127	-0.58	-58
+250	2	10240	99151	0.75075	297.75075	149.25075	14925.07507	0.75075	297.75076	149.25075	14925.07506	0.75075	297.75075	149.25075	14925.075	2020-01-01	2020-01-02	2020-01-01 00:04:10	2020-01-02 03:32:31	2020-01-01 00:04:10.000	2020-01-02 03:32:31.000	250	99151	49700.5	4970050	250	99151	49700.5	4970050	-32319	32616	5136.02	513602	-127	125	-1.9	-190
+251	2	10241	99152	0.75375	297.75375	149.25375	14925.37537	0.75375	297.75375	149.25375	14925.37536	0.75375	297.75375	149.25375	14925.375	2020-01-01	2020-01-02	2020-01-01 00:04:11	2020-01-02 03:32:32	2020-01-01 00:04:11.000	2020-01-02 03:32:32.000	251	99152	49701.5	4970150	251	99152	49701.5	4970150	-32318	32617	5137.02	513702	-126	126	-0.9	-90
+252	2	10242	99153	0.75675	297.75675	149.25675	14925.67567	0.75675	297.75674	149.25675	14925.67567	0.75675	297.75675	149.25674999999998	14925.675	2020-01-01	2020-01-02	2020-01-01 00:04:12	2020-01-02 03:32:33	2020-01-01 00:04:12.000	2020-01-02 03:32:33.000	252	99153	49702.5	4970250	252	99153	49702.5	4970250	-32317	32618	5138.02	513802	-125	127	0.1	10
+253	2	10243	99154	0.75975	297.75975	149.25975	14925.97597	0.75975	297.75977	149.25976	14925.97625	0.75975	297.75975	149.25975	14925.975	2020-01-01	2020-01-02	2020-01-01 00:04:13	2020-01-02 03:32:34	2020-01-01 00:04:13.000	2020-01-02 03:32:34.000	253	99154	49703.5	4970350	253	99154	49703.5	4970350	-32316	32619	5139.02	513902	-128	127	-1.46	-146
+254	2	10244	99155	0.76276	297.76276	149.26276	14926.27627	0.76276	297.76276	149.26275	14926.27594	0.76276	297.76276	149.26276	14926.276	2020-01-01	2020-01-02	2020-01-01 00:04:14	2020-01-02 03:32:35	2020-01-01 00:04:14.000	2020-01-02 03:32:35.000	254	99155	49704.5	4970450	254	99155	49704.5	4970450	-32315	32620	5140.02	514002	-128	127	-3.02	-302
+255	2	10245	99156	0.76576	297.76576	149.26576	14926.57657	0.76576	297.76578	149.26576	14926.57652	0.76576	297.76576	149.26576	14926.576	2020-01-01	2020-01-02	2020-01-01 00:04:15	2020-01-02 03:32:36	2020-01-01 00:04:15.000	2020-01-02 03:32:36.000	255	99156	49705.5	4970550	255	99156	49705.5	4970550	-32314	32621	5141.02	514102	-128	123	-4.58	-458
+256	2	10246	99157	0.76876	297.76876	149.26876	14926.87687	0.76876	297.76877	149.26876	14926.87683	0.76876	297.76876	149.26876000000001	14926.876	2020-01-01	2020-01-02	2020-01-01 00:04:16	2020-01-02 03:32:37	2020-01-01 00:04:16.000	2020-01-02 03:32:37.000	256	99157	49706.5	4970650	256	99157	49706.5	4970650	-32313	32622	5142.02	514202	-127	124	-3.58	-358
+257	2	10247	99158	0.77177	297.77177	149.27177	14927.17717	0.77177	297.77176	149.27177	14927.17714	0.77177	297.77177	149.27177	14927.177	2020-01-01	2020-01-02	2020-01-01 00:04:17	2020-01-02 03:32:38	2020-01-01 00:04:17.000	2020-01-02 03:32:38.000	257	99158	49707.5	4970750	257	99158	49707.5	4970750	-32312	32623	5143.02	514302	-126	125	-2.58	-258
+258	2	10248	99159	0.77477	297.77477	149.27477	14927.47747	0.77477	297.77478	149.27477	14927.47776	0.77477	297.77477	149.27477000000002	14927.477	2020-01-01	2020-01-02	2020-01-01 00:04:18	2020-01-02 03:32:39	2020-01-01 00:04:18.000	2020-01-02 03:32:39.000	258	99159	49708.5	4970850	258	99159	49708.5	4970850	-32311	32624	5144.02	514402	-125	126	-1.58	-158
+259	2	10249	99160	0.77777	297.77777	149.27777	14927.77777	0.77777	297.77777	149.27777	14927.77742	0.77777	297.77777	149.27777	14927.777	2020-01-01	2020-01-02	2020-01-01 00:04:19	2020-01-02 03:32:40	2020-01-01 00:04:19.000	2020-01-02 03:32:40.000	259	99160	49709.5	4970950	259	99160	49709.5	4970950	-32310	32625	5145.02	514502	-124	127	-0.58	-58
 26	2	10016	99926	0.07807	300.07807	150.07807	15157.88588	0.07807	300.07806	150.07807	15157.88575	0.07807	300.07807	150.07807	15157.88507	2020-01-01	2020-01-02	2020-01-01 00:00:26	2020-01-02 03:45:26	2020-01-01 00:00:26.000	2020-01-02 03:45:26.000	26	99926	49976	5047576	26	99926	49976	5047576	-32543	32392	4555.009900990099	460056	-126	125	-2.297029702970297	-232
-260	2	10250	99161	0.78078	297.78078	149.28078	14928.07807	0.78078	297.7808	149.28077	14928.07799	0.78078	297.78078	149.28078	14928.07800	2020-01-01	2020-01-02	2020-01-01 00:04:20	2020-01-02 03:32:41	2020-01-01 00:04:20.000	2020-01-02 03:32:41.000	260	99161	49710.5	4971050	260	99161	49710.5	4971050	-32309	32626	5146.02	514602	-128	127	-2.14	-214
-261	2	10251	99162	0.78378	297.78378	149.28378	14928.37837	0.78378	297.78378	149.28378	14928.3783	0.78378	297.78378	149.28378	14928.37800	2020-01-01	2020-01-02	2020-01-01 00:04:21	2020-01-02 03:32:42	2020-01-01 00:04:21.000	2020-01-02 03:32:42.000	261	99162	49711.5	4971150	261	99162	49711.5	4971150	-32308	32627	5147.02	514702	-128	123	-3.7	-370
-262	2	10252	99163	0.78678	297.78678	149.28678	14928.67867	0.78678	297.78677	149.28678	14928.67861	0.78678	297.78678	149.28678	14928.67800	2020-01-01	2020-01-02	2020-01-01 00:04:22	2020-01-02 03:32:43	2020-01-01 00:04:22.000	2020-01-02 03:32:43.000	262	99163	49712.5	4971250	262	99163	49712.5	4971250	-32307	32628	5148.02	514802	-127	124	-2.7	-270
-263	2	10253	99164	0.78978	297.78978	149.28978	14928.97897	0.78978	297.7898	149.28979	14928.97923	0.78978	297.78978	149.28977999999998	14928.97800	2020-01-01	2020-01-02	2020-01-01 00:04:23	2020-01-02 03:32:44	2020-01-01 00:04:23.000	2020-01-02 03:32:44.000	263	99164	49713.5	4971350	263	99164	49713.5	4971350	-32306	32629	5149.02	514902	-126	125	-1.7	-170
-264	2	10254	99165	0.79279	297.79279	149.29279	14929.27927	0.79279	297.7928	149.29278	14929.27888	0.79279	297.79279	149.29279	14929.27900	2020-01-01	2020-01-02	2020-01-01 00:04:24	2020-01-02 03:32:45	2020-01-01 00:04:24.000	2020-01-02 03:32:45.000	264	99165	49714.5	4971450	264	99165	49714.5	4971450	-32305	32630	5150.02	515002	-125	126	-0.7	-70
-265	2	10255	99166	0.79579	297.79579	149.29579	14929.57957	0.79579	297.7958	149.29579	14929.57962	0.79579	297.79579	149.29579	14929.57900	2020-01-01	2020-01-02	2020-01-01 00:04:25	2020-01-02 03:32:46	2020-01-01 00:04:25.000	2020-01-02 03:32:46.000	265	99166	49715.5	4971550	265	99166	49715.5	4971550	-32304	32631	5151.02	515102	-124	127	0.3	30
-266	2	10256	99167	0.79879	297.79879	149.29879	14929.87987	0.79879	297.7988	149.29879	14929.87977	0.79879	297.79879	149.29879	14929.87900	2020-01-01	2020-01-02	2020-01-01 00:04:26	2020-01-02 03:32:47	2020-01-01 00:04:26.000	2020-01-02 03:32:47.000	266	99167	49716.5	4971650	266	99167	49716.5	4971650	-32303	32632	5152.02	515202	-128	127	-1.26	-126
-267	2	10257	99168	0.8018	297.8018	149.3018	14930.18018	0.8018	297.8018	149.3018	14930.18012	0.80180	297.80180	149.30180000000001	14930.18000	2020-01-01	2020-01-02	2020-01-01 00:04:27	2020-01-02 03:32:48	2020-01-01 00:04:27.000	2020-01-02 03:32:48.000	267	99168	49717.5	4971750	267	99168	49717.5	4971750	-32302	32633	5153.02	515302	-128	123	-2.82	-282
-268	2	10258	99169	0.8048	297.8048	149.3048	14930.48048	0.8048	297.8048	149.3048	14930.4807	0.80480	297.80480	149.3048	14930.48000	2020-01-01	2020-01-02	2020-01-01 00:04:28	2020-01-02 03:32:49	2020-01-01 00:04:28.000	2020-01-02 03:32:49.000	268	99169	49718.5	4971850	268	99169	49718.5	4971850	-32301	32634	5154.02	515402	-127	124	-1.82	-182
-269	2	10259	99170	0.8078	297.8078	149.3078	14930.78078	0.8078	297.8078	149.3078	14930.78035	0.80780	297.80780	149.30780000000001	14930.78000	2020-01-01	2020-01-02	2020-01-01 00:04:29	2020-01-02 03:32:50	2020-01-01 00:04:29.000	2020-01-02 03:32:50.000	269	99170	49719.5	4971950	269	99170	49719.5	4971950	-32300	32635	5155.02	515502	-126	125	-0.82	-82
+260	2	10250	99161	0.78078	297.78078	149.28078	14928.07807	0.78078	297.7808	149.28077	14928.07799	0.78078	297.78078	149.28078	14928.078	2020-01-01	2020-01-02	2020-01-01 00:04:20	2020-01-02 03:32:41	2020-01-01 00:04:20.000	2020-01-02 03:32:41.000	260	99161	49710.5	4971050	260	99161	49710.5	4971050	-32309	32626	5146.02	514602	-128	127	-2.14	-214
+261	2	10251	99162	0.78378	297.78378	149.28378	14928.37837	0.78378	297.78378	149.28378	14928.3783	0.78378	297.78378	149.28378	14928.378	2020-01-01	2020-01-02	2020-01-01 00:04:21	2020-01-02 03:32:42	2020-01-01 00:04:21.000	2020-01-02 03:32:42.000	261	99162	49711.5	4971150	261	99162	49711.5	4971150	-32308	32627	5147.02	514702	-128	123	-3.7	-370
+262	2	10252	99163	0.78678	297.78678	149.28678	14928.67867	0.78678	297.78677	149.28678	14928.67861	0.78678	297.78678	149.28678	14928.678	2020-01-01	2020-01-02	2020-01-01 00:04:22	2020-01-02 03:32:43	2020-01-01 00:04:22.000	2020-01-02 03:32:43.000	262	99163	49712.5	4971250	262	99163	49712.5	4971250	-32307	32628	5148.02	514802	-127	124	-2.7	-270
+263	2	10253	99164	0.78978	297.78978	149.28978	14928.97897	0.78978	297.7898	149.28979	14928.97923	0.78978	297.78978	149.28977999999998	14928.978	2020-01-01	2020-01-02	2020-01-01 00:04:23	2020-01-02 03:32:44	2020-01-01 00:04:23.000	2020-01-02 03:32:44.000	263	99164	49713.5	4971350	263	99164	49713.5	4971350	-32306	32629	5149.02	514902	-126	125	-1.7	-170
+264	2	10254	99165	0.79279	297.79279	149.29279	14929.27927	0.79279	297.7928	149.29278	14929.27888	0.79279	297.79279	149.29279	14929.279	2020-01-01	2020-01-02	2020-01-01 00:04:24	2020-01-02 03:32:45	2020-01-01 00:04:24.000	2020-01-02 03:32:45.000	264	99165	49714.5	4971450	264	99165	49714.5	4971450	-32305	32630	5150.02	515002	-125	126	-0.7	-70
+265	2	10255	99166	0.79579	297.79579	149.29579	14929.57957	0.79579	297.7958	149.29579	14929.57962	0.79579	297.79579	149.29579	14929.579	2020-01-01	2020-01-02	2020-01-01 00:04:25	2020-01-02 03:32:46	2020-01-01 00:04:25.000	2020-01-02 03:32:46.000	265	99166	49715.5	4971550	265	99166	49715.5	4971550	-32304	32631	5151.02	515102	-124	127	0.3	30
+266	2	10256	99167	0.79879	297.79879	149.29879	14929.87987	0.79879	297.7988	149.29879	14929.87977	0.79879	297.79879	149.29879	14929.879	2020-01-01	2020-01-02	2020-01-01 00:04:26	2020-01-02 03:32:47	2020-01-01 00:04:26.000	2020-01-02 03:32:47.000	266	99167	49716.5	4971650	266	99167	49716.5	4971650	-32303	32632	5152.02	515202	-128	127	-1.26	-126
+267	2	10257	99168	0.8018	297.8018	149.3018	14930.18018	0.8018	297.8018	149.3018	14930.18012	0.8018	297.8018	149.30180000000001	14930.18	2020-01-01	2020-01-02	2020-01-01 00:04:27	2020-01-02 03:32:48	2020-01-01 00:04:27.000	2020-01-02 03:32:48.000	267	99168	49717.5	4971750	267	99168	49717.5	4971750	-32302	32633	5153.02	515302	-128	123	-2.82	-282
+268	2	10258	99169	0.8048	297.8048	149.3048	14930.48048	0.8048	297.8048	149.3048	14930.4807	0.8048	297.8048	149.3048	14930.48	2020-01-01	2020-01-02	2020-01-01 00:04:28	2020-01-02 03:32:49	2020-01-01 00:04:28.000	2020-01-02 03:32:49.000	268	99169	49718.5	4971850	268	99169	49718.5	4971850	-32301	32634	5154.02	515402	-127	124	-1.82	-182
+269	2	10259	99170	0.8078	297.8078	149.3078	14930.78078	0.8078	297.8078	149.3078	14930.78035	0.8078	297.8078	149.30780000000001	14930.78	2020-01-01	2020-01-02	2020-01-01 00:04:29	2020-01-02 03:32:50	2020-01-01 00:04:29.000	2020-01-02 03:32:50.000	269	99170	49719.5	4971950	269	99170	49719.5	4971950	-32300	32635	5155.02	515502	-126	125	-0.82	-82
 27	2	10017	99927	0.08108	300.08108	150.08108	15158.18918	0.08108	300.0811	150.08108	15158.18936	0.08108	300.08108	150.08108000000001	15158.18908	2020-01-01	2020-01-02	2020-01-01 00:00:27	2020-01-02 03:45:27	2020-01-01 00:00:27.000	2020-01-02 03:45:27.000	27	99927	49977	5047677	27	99927	49977	5047677	-32542	32393	4556.009900990099	460157	-125	126	-1.297029702970297	-131
-270	2	10260	99171	0.81081	297.81081	149.31081	14931.08108	0.81081	297.81082	149.31081	14931.08109	0.81081	297.81081	149.31081	14931.08100	2020-01-01	2020-01-02	2020-01-01 00:04:30	2020-01-02 03:32:51	2020-01-01 00:04:30.000	2020-01-02 03:32:51.000	270	99171	49720.5	4972050	270	99171	49720.5	4972050	-32299	32636	5156.02	515602	-125	126	0.18	18
-271	2	10261	99172	0.81381	297.81381	149.31381	14931.38138	0.81381	297.8138	149.31381	14931.38124	0.81381	297.81381	149.31381	14931.38100	2020-01-01	2020-01-02	2020-01-01 00:04:31	2020-01-02 03:32:52	2020-01-01 00:04:31.000	2020-01-02 03:32:52.000	271	99172	49721.5	4972150	271	99172	49721.5	4972150	-32298	32637	5157.02	515702	-124	127	1.18	118
-272	2	10262	99173	0.81681	297.81681	149.31681	14931.68168	0.81681	297.8168	149.31681	14931.68159	0.81681	297.81681	149.31681	14931.68100	2020-01-01	2020-01-02	2020-01-01 00:04:32	2020-01-02 03:32:53	2020-01-01 00:04:32.000	2020-01-02 03:32:53.000	272	99173	49722.5	4972250	272	99173	49722.5	4972250	-32297	32638	5158.02	515802	-128	127	-0.38	-38
-273	2	10263	99174	0.81981	297.81981	149.31981	14931.98198	0.81981	297.81982	149.31982	14931.98217	0.81981	297.81981	149.31981	14931.98100	2020-01-01	2020-01-02	2020-01-01 00:04:33	2020-01-02 03:32:54	2020-01-01 00:04:33.000	2020-01-02 03:32:54.000	273	99174	49723.5	4972350	273	99174	49723.5	4972350	-32296	32639	5159.02	515902	-128	127	-1.94	-194
-274	2	10264	99175	0.82282	297.82282	149.32282	14932.28228	0.82282	297.8228	149.32282	14932.28247	0.82282	297.82282	149.32281999999998	14932.28200	2020-01-01	2020-01-02	2020-01-01 00:04:34	2020-01-02 03:32:55	2020-01-01 00:04:34.000	2020-01-02 03:32:55.000	274	99175	49724.5	4972450	274	99175	49724.5	4972450	-32295	32640	5160.02	516002	-128	124	-3.5	-350
-275	2	10265	99176	0.82582	297.82582	149.32582	14932.58258	0.82582	297.82584	149.32582	14932.58256	0.82582	297.82582	149.32582	14932.58200	2020-01-01	2020-01-02	2020-01-01 00:04:35	2020-01-02 03:32:56	2020-01-01 00:04:35.000	2020-01-02 03:32:56.000	275	99176	49725.5	4972550	275	99176	49725.5	4972550	-32294	32641	5161.02	516102	-127	125	-2.5	-250
-276	2	10266	99177	0.82882	297.82882	149.32882	14932.88288	0.82882	297.82883	149.32882	14932.88275	0.82882	297.82882	149.32882	14932.88200	2020-01-01	2020-01-02	2020-01-01 00:04:36	2020-01-02 03:32:57	2020-01-01 00:04:36.000	2020-01-02 03:32:57.000	276	99177	49726.5	4972650	276	99177	49726.5	4972650	-32293	32642	5162.02	516202	-126	126	-1.5	-150
-277	2	10267	99178	0.83183	297.83183	149.33183	14933.18318	0.83183	297.83182	149.33183	14933.18305	0.83183	297.83183	149.33183	14933.18300	2020-01-01	2020-01-02	2020-01-01 00:04:37	2020-01-02 03:32:58	2020-01-01 00:04:37.000	2020-01-02 03:32:58.000	277	99178	49727.5	4972750	277	99178	49727.5	4972750	-32292	32643	5163.02	516302	-125	127	-0.5	-50
-278	2	10268	99179	0.83483	297.83483	149.33483	14933.48348	0.83483	297.83484	149.33483	14933.48364	0.83483	297.83483	149.33483	14933.48300	2020-01-01	2020-01-02	2020-01-01 00:04:38	2020-01-02 03:32:59	2020-01-01 00:04:38.000	2020-01-02 03:32:59.000	278	99179	49728.5	4972850	278	99179	49728.5	4972850	-32291	32644	5164.02	516402	-128	127	-2.06	-206
-279	2	10269	99180	0.83783	297.83783	149.33783	14933.78378	0.83783	297.83783	149.33783	14933.78394	0.83783	297.83783	149.33783	14933.78300	2020-01-01	2020-01-02	2020-01-01 00:04:39	2020-01-02 03:33:00	2020-01-01 00:04:39.000	2020-01-02 03:33:00.000	279	99180	49729.5	4972950	279	99180	49729.5	4972950	-32290	32645	5165.02	516502	-128	127	-3.62	-362
+270	2	10260	99171	0.81081	297.81081	149.31081	14931.08108	0.81081	297.81082	149.31081	14931.08109	0.81081	297.81081	149.31081	14931.081	2020-01-01	2020-01-02	2020-01-01 00:04:30	2020-01-02 03:32:51	2020-01-01 00:04:30.000	2020-01-02 03:32:51.000	270	99171	49720.5	4972050	270	99171	49720.5	4972050	-32299	32636	5156.02	515602	-125	126	0.18	18
+271	2	10261	99172	0.81381	297.81381	149.31381	14931.38138	0.81381	297.8138	149.31381	14931.38124	0.81381	297.81381	149.31381	14931.381	2020-01-01	2020-01-02	2020-01-01 00:04:31	2020-01-02 03:32:52	2020-01-01 00:04:31.000	2020-01-02 03:32:52.000	271	99172	49721.5	4972150	271	99172	49721.5	4972150	-32298	32637	5157.02	515702	-124	127	1.18	118
+272	2	10262	99173	0.81681	297.81681	149.31681	14931.68168	0.81681	297.8168	149.31681	14931.68159	0.81681	297.81681	149.31681	14931.681	2020-01-01	2020-01-02	2020-01-01 00:04:32	2020-01-02 03:32:53	2020-01-01 00:04:32.000	2020-01-02 03:32:53.000	272	99173	49722.5	4972250	272	99173	49722.5	4972250	-32297	32638	5158.02	515802	-128	127	-0.38	-38
+273	2	10263	99174	0.81981	297.81981	149.31981	14931.98198	0.81981	297.81982	149.31982	14931.98217	0.81981	297.81981	149.31981	14931.981	2020-01-01	2020-01-02	2020-01-01 00:04:33	2020-01-02 03:32:54	2020-01-01 00:04:33.000	2020-01-02 03:32:54.000	273	99174	49723.5	4972350	273	99174	49723.5	4972350	-32296	32639	5159.02	515902	-128	127	-1.94	-194
+274	2	10264	99175	0.82282	297.82282	149.32282	14932.28228	0.82282	297.8228	149.32282	14932.28247	0.82282	297.82282	149.32281999999998	14932.282	2020-01-01	2020-01-02	2020-01-01 00:04:34	2020-01-02 03:32:55	2020-01-01 00:04:34.000	2020-01-02 03:32:55.000	274	99175	49724.5	4972450	274	99175	49724.5	4972450	-32295	32640	5160.02	516002	-128	124	-3.5	-350
+275	2	10265	99176	0.82582	297.82582	149.32582	14932.58258	0.82582	297.82584	149.32582	14932.58256	0.82582	297.82582	149.32582	14932.582	2020-01-01	2020-01-02	2020-01-01 00:04:35	2020-01-02 03:32:56	2020-01-01 00:04:35.000	2020-01-02 03:32:56.000	275	99176	49725.5	4972550	275	99176	49725.5	4972550	-32294	32641	5161.02	516102	-127	125	-2.5	-250
+276	2	10266	99177	0.82882	297.82882	149.32882	14932.88288	0.82882	297.82883	149.32882	14932.88275	0.82882	297.82882	149.32882	14932.882	2020-01-01	2020-01-02	2020-01-01 00:04:36	2020-01-02 03:32:57	2020-01-01 00:04:36.000	2020-01-02 03:32:57.000	276	99177	49726.5	4972650	276	99177	49726.5	4972650	-32293	32642	5162.02	516202	-126	126	-1.5	-150
+277	2	10267	99178	0.83183	297.83183	149.33183	14933.18318	0.83183	297.83182	149.33183	14933.18305	0.83183	297.83183	149.33183	14933.183	2020-01-01	2020-01-02	2020-01-01 00:04:37	2020-01-02 03:32:58	2020-01-01 00:04:37.000	2020-01-02 03:32:58.000	277	99178	49727.5	4972750	277	99178	49727.5	4972750	-32292	32643	5163.02	516302	-125	127	-0.5	-50
+278	2	10268	99179	0.83483	297.83483	149.33483	14933.48348	0.83483	297.83484	149.33483	14933.48364	0.83483	297.83483	149.33483	14933.483	2020-01-01	2020-01-02	2020-01-01 00:04:38	2020-01-02 03:32:59	2020-01-01 00:04:38.000	2020-01-02 03:32:59.000	278	99179	49728.5	4972850	278	99179	49728.5	4972850	-32291	32644	5164.02	516402	-128	127	-2.06	-206
+279	2	10269	99180	0.83783	297.83783	149.33783	14933.78378	0.83783	297.83783	149.33783	14933.78394	0.83783	297.83783	149.33783	14933.783	2020-01-01	2020-01-02	2020-01-01 00:04:39	2020-01-02 03:33:00	2020-01-01 00:04:39.000	2020-01-02 03:33:00.000	279	99180	49729.5	4972950	279	99180	49729.5	4972950	-32290	32645	5165.02	516502	-128	127	-3.62	-362
 28	2	10018	99928	0.08408	300.08408	150.08408	15158.49249	0.08408	300.08408	150.08408	15158.49265	0.08408	300.08408	150.08408	15158.49208	2020-01-01	2020-01-02	2020-01-01 00:00:28	2020-01-02 03:45:28	2020-01-01 00:00:28.000	2020-01-02 03:45:28.000	28	99928	49978	5047778	28	99928	49978	5047778	-32541	32394	4557.009900990099	460258	-124	127	-0.297029702970297	-30
-280	2	10270	99181	0.84084	297.84084	149.34084	14934.08408	0.84084	297.84085	149.34084	14934.08403	0.84084	297.84084	149.34084000000001	14934.08400	2020-01-01	2020-01-02	2020-01-01 00:04:40	2020-01-02 03:33:01	2020-01-01 00:04:40.000	2020-01-02 03:33:01.000	280	99181	49730.5	4973050	280	99181	49730.5	4973050	-32289	32646	5166.02	516602	-128	123	-5.18	-518
-281	2	10271	99182	0.84384	297.84384	149.34384	14934.38438	0.84384	297.84384	149.34384	14934.38421	0.84384	297.84384	149.34384	14934.38400	2020-01-01	2020-01-02	2020-01-01 00:04:41	2020-01-02 03:33:02	2020-01-01 00:04:41.000	2020-01-02 03:33:02.000	281	99182	49731.5	4973150	281	99182	49731.5	4973150	-32288	32647	5167.02	516702	-127	124	-4.18	-418
-282	2	10272	99183	0.84684	297.84684	149.34684	14934.68468	0.84684	297.84683	149.34684	14934.68453	0.84684	297.84684	149.34684	14934.68400	2020-01-01	2020-01-02	2020-01-01 00:04:42	2020-01-02 03:33:03	2020-01-01 00:04:42.000	2020-01-02 03:33:03.000	282	99183	49732.5	4973250	282	99183	49732.5	4973250	-32287	32648	5168.02	516802	-126	125	-3.18	-318
-283	2	10273	99184	0.84984	297.84984	149.34984	14934.98498	0.84984	297.84985	149.34985	14934.98526	0.84984	297.84984	149.34984	14934.98400	2020-01-01	2020-01-02	2020-01-01 00:04:43	2020-01-02 03:33:04	2020-01-01 00:04:43.000	2020-01-02 03:33:04.000	283	99184	49733.5	4973350	283	99184	49733.5	4973350	-32286	32649	5169.02	516902	-125	126	-2.18	-218
-284	2	10274	99185	0.85285	297.85285	149.35285	14935.28528	0.85285	297.85284	149.35285	14935.28542	0.85285	297.85285	149.35285	14935.28500	2020-01-01	2020-01-02	2020-01-01 00:04:44	2020-01-02 03:33:05	2020-01-01 00:04:44.000	2020-01-02 03:33:05.000	284	99185	49734.5	4973450	284	99185	49734.5	4973450	-32285	32650	5170.02	517002	-124	127	-1.18	-118
-285	2	10275	99186	0.85585	297.85585	149.35585	14935.58558	0.85585	297.85587	149.35585	14935.5855	0.85585	297.85585	149.35585	14935.58500	2020-01-01	2020-01-02	2020-01-01 00:04:45	2020-01-02 03:33:06	2020-01-01 00:04:45.000	2020-01-02 03:33:06.000	285	99186	49735.5	4973550	285	99186	49735.5	4973550	-32284	32651	5171.02	517102	-128	127	-2.74	-274
-286	2	10276	99187	0.85885	297.85885	149.35885	14935.88588	0.85885	297.85886	149.35885	14935.88568	0.85885	297.85885	149.35885	14935.88500	2020-01-01	2020-01-02	2020-01-01 00:04:46	2020-01-02 03:33:07	2020-01-01 00:04:46.000	2020-01-02 03:33:07.000	286	99187	49736.5	4973650	286	99187	49736.5	4973650	-32283	32652	5172.02	517202	-128	123	-4.3	-430
-287	2	10277	99188	0.86186	297.86186	149.36186	14936.18618	0.86186	297.86185	149.36186	14936.186	0.86186	297.86186	149.36186	14936.18600	2020-01-01	2020-01-02	2020-01-01 00:04:47	2020-01-02 03:33:08	2020-01-01 00:04:47.000	2020-01-02 03:33:08.000	287	99188	49737.5	4973750	287	99188	49737.5	4973750	-32282	32653	5173.02	517302	-127	124	-3.3	-330
-288	2	10278	99189	0.86486	297.86486	149.36486	14936.48648	0.86486	297.86487	149.36486	14936.48673	0.86486	297.86486	149.36486000000002	14936.48600	2020-01-01	2020-01-02	2020-01-01 00:04:48	2020-01-02 03:33:09	2020-01-01 00:04:48.000	2020-01-02 03:33:09.000	288	99189	49738.5	4973850	288	99189	49738.5	4973850	-32281	32654	5174.02	517402	-126	125	-2.3	-230
-289	2	10279	99190	0.86786	297.86786	149.36786	14936.78678	0.86786	297.86786	149.36786	14936.78688	0.86786	297.86786	149.36786	14936.78600	2020-01-01	2020-01-02	2020-01-01 00:04:49	2020-01-02 03:33:10	2020-01-01 00:04:49.000	2020-01-02 03:33:10.000	289	99190	49739.5	4973950	289	99190	49739.5	4973950	-32280	32655	5175.02	517502	-125	126	-1.3	-130
+280	2	10270	99181	0.84084	297.84084	149.34084	14934.08408	0.84084	297.84085	149.34084	14934.08403	0.84084	297.84084	149.34084000000001	14934.084	2020-01-01	2020-01-02	2020-01-01 00:04:40	2020-01-02 03:33:01	2020-01-01 00:04:40.000	2020-01-02 03:33:01.000	280	99181	49730.5	4973050	280	99181	49730.5	4973050	-32289	32646	5166.02	516602	-128	123	-5.18	-518
+281	2	10271	99182	0.84384	297.84384	149.34384	14934.38438	0.84384	297.84384	149.34384	14934.38421	0.84384	297.84384	149.34384	14934.384	2020-01-01	2020-01-02	2020-01-01 00:04:41	2020-01-02 03:33:02	2020-01-01 00:04:41.000	2020-01-02 03:33:02.000	281	99182	49731.5	4973150	281	99182	49731.5	4973150	-32288	32647	5167.02	516702	-127	124	-4.18	-418
+282	2	10272	99183	0.84684	297.84684	149.34684	14934.68468	0.84684	297.84683	149.34684	14934.68453	0.84684	297.84684	149.34684	14934.684	2020-01-01	2020-01-02	2020-01-01 00:04:42	2020-01-02 03:33:03	2020-01-01 00:04:42.000	2020-01-02 03:33:03.000	282	99183	49732.5	4973250	282	99183	49732.5	4973250	-32287	32648	5168.02	516802	-126	125	-3.18	-318
+283	2	10273	99184	0.84984	297.84984	149.34984	14934.98498	0.84984	297.84985	149.34985	14934.98526	0.84984	297.84984	149.34984	14934.984	2020-01-01	2020-01-02	2020-01-01 00:04:43	2020-01-02 03:33:04	2020-01-01 00:04:43.000	2020-01-02 03:33:04.000	283	99184	49733.5	4973350	283	99184	49733.5	4973350	-32286	32649	5169.02	516902	-125	126	-2.18	-218
+284	2	10274	99185	0.85285	297.85285	149.35285	14935.28528	0.85285	297.85284	149.35285	14935.28542	0.85285	297.85285	149.35285	14935.285	2020-01-01	2020-01-02	2020-01-01 00:04:44	2020-01-02 03:33:05	2020-01-01 00:04:44.000	2020-01-02 03:33:05.000	284	99185	49734.5	4973450	284	99185	49734.5	4973450	-32285	32650	5170.02	517002	-124	127	-1.18	-118
+285	2	10275	99186	0.85585	297.85585	149.35585	14935.58558	0.85585	297.85587	149.35585	14935.5855	0.85585	297.85585	149.35585	14935.585	2020-01-01	2020-01-02	2020-01-01 00:04:45	2020-01-02 03:33:06	2020-01-01 00:04:45.000	2020-01-02 03:33:06.000	285	99186	49735.5	4973550	285	99186	49735.5	4973550	-32284	32651	5171.02	517102	-128	127	-2.74	-274
+286	2	10276	99187	0.85885	297.85885	149.35885	14935.88588	0.85885	297.85886	149.35885	14935.88568	0.85885	297.85885	149.35885	14935.885	2020-01-01	2020-01-02	2020-01-01 00:04:46	2020-01-02 03:33:07	2020-01-01 00:04:46.000	2020-01-02 03:33:07.000	286	99187	49736.5	4973650	286	99187	49736.5	4973650	-32283	32652	5172.02	517202	-128	123	-4.3	-430
+287	2	10277	99188	0.86186	297.86186	149.36186	14936.18618	0.86186	297.86185	149.36186	14936.186	0.86186	297.86186	149.36186	14936.186	2020-01-01	2020-01-02	2020-01-01 00:04:47	2020-01-02 03:33:08	2020-01-01 00:04:47.000	2020-01-02 03:33:08.000	287	99188	49737.5	4973750	287	99188	49737.5	4973750	-32282	32653	5173.02	517302	-127	124	-3.3	-330
+288	2	10278	99189	0.86486	297.86486	149.36486	14936.48648	0.86486	297.86487	149.36486	14936.48673	0.86486	297.86486	149.36486000000002	14936.486	2020-01-01	2020-01-02	2020-01-01 00:04:48	2020-01-02 03:33:09	2020-01-01 00:04:48.000	2020-01-02 03:33:09.000	288	99189	49738.5	4973850	288	99189	49738.5	4973850	-32281	32654	5174.02	517402	-126	125	-2.3	-230
+289	2	10279	99190	0.86786	297.86786	149.36786	14936.78678	0.86786	297.86786	149.36786	14936.78688	0.86786	297.86786	149.36786	14936.786	2020-01-01	2020-01-02	2020-01-01 00:04:49	2020-01-02 03:33:10	2020-01-01 00:04:49.000	2020-01-02 03:33:10.000	289	99190	49739.5	4973950	289	99190	49739.5	4973950	-32280	32655	5175.02	517502	-125	126	-1.3	-130
 29	2	10019	99929	0.08708	300.08708	150.08708	15158.79579	0.08708	300.0871	150.08708	15158.79576	0.08708	300.08708	150.08708	15158.79508	2020-01-01	2020-01-02	2020-01-01 00:00:29	2020-01-02 03:45:29	2020-01-01 00:00:29.000	2020-01-02 03:45:29.000	29	99929	49979	5047879	29	99929	49979	5047879	-32540	32395	4558.009900990099	460359	-128	127	-1.8316831683168318	-185
-290	2	10280	99191	0.87087	297.87087	149.37087	14937.08708	0.87087	297.87088	149.37087	14937.087	0.87087	297.87087	149.37087	14937.08700	2020-01-01	2020-01-02	2020-01-01 00:04:50	2020-01-02 03:33:11	2020-01-01 00:04:50.000	2020-01-02 03:33:11.000	290	99191	49740.5	4974050	290	99191	49740.5	4974050	-32279	32656	5176.02	517602	-124	127	-0.3	-30
-291	2	10281	99192	0.87387	297.87387	149.37387	14937.38738	0.87387	297.87387	149.37387	14937.38716	0.87387	297.87387	149.37387	14937.38700	2020-01-01	2020-01-02	2020-01-01 00:04:51	2020-01-02 03:33:12	2020-01-01 00:04:51.000	2020-01-02 03:33:12.000	291	99192	49741.5	4974150	291	99192	49741.5	4974150	-32278	32657	5177.02	517702	-128	127	-1.86	-186
-292	2	10282	99193	0.87687	297.87687	149.37687	14937.68768	0.87687	297.8769	149.37687	14937.68789	0.87687	297.87687	149.37687	14937.68700	2020-01-01	2020-01-02	2020-01-01 00:04:52	2020-01-02 03:33:13	2020-01-01 00:04:52.000	2020-01-02 03:33:13.000	292	99193	49742.5	4974250	292	99193	49742.5	4974250	-32277	32658	5178.02	517802	-128	123	-3.42	-342
-293	2	10283	99194	0.87987	297.87987	149.37987	14937.98798	0.87987	297.87988	149.37988	14937.9882	0.87987	297.87987	149.37986999999998	14937.98700	2020-01-01	2020-01-02	2020-01-01 00:04:53	2020-01-02 03:33:14	2020-01-01 00:04:53.000	2020-01-02 03:33:14.000	293	99194	49743.5	4974350	293	99194	49743.5	4974350	-32276	32659	5179.02	517902	-127	124	-2.42	-242
-294	2	10284	99195	0.88288	297.88288	149.38288	14938.28828	0.88288	297.88287	149.38288	14938.28835	0.88288	297.88288	149.38288	14938.28800	2020-01-01	2020-01-02	2020-01-01 00:04:54	2020-01-02 03:33:15	2020-01-01 00:04:54.000	2020-01-02 03:33:15.000	294	99195	49744.5	4974450	294	99195	49744.5	4974450	-32275	32660	5180.02	518002	-126	125	-1.42	-142
-295	2	10285	99196	0.88588	297.88588	149.38588	14938.58858	0.88588	297.8859	149.38588	14938.58847	0.88588	297.88588	149.38588	14938.58800	2020-01-01	2020-01-02	2020-01-01 00:04:55	2020-01-02 03:33:16	2020-01-01 00:04:55.000	2020-01-02 03:33:16.000	295	99196	49745.5	4974550	295	99196	49745.5	4974550	-32274	32661	5181.02	518102	-125	126	-0.42	-42
-296	2	10286	99197	0.88888	297.88888	149.38888	14938.88888	0.88888	297.8889	149.38888	14938.88863	0.88888	297.88888	149.38888	14938.88800	2020-01-01	2020-01-02	2020-01-01 00:04:56	2020-01-02 03:33:17	2020-01-01 00:04:56.000	2020-01-02 03:33:17.000	296	99197	49746.5	4974650	296	99197	49746.5	4974650	-32273	32662	5182.02	518202	-124	127	0.58	58
-297	2	10287	99198	0.89189	297.89189	149.39189	14939.18918	0.89189	297.8919	149.39189	14939.18936	0.89189	297.89189	149.39189	14939.18900	2020-01-01	2020-01-02	2020-01-01 00:04:57	2020-01-02 03:33:18	2020-01-01 00:04:57.000	2020-01-02 03:33:18.000	297	99198	49747.5	4974750	297	99198	49747.5	4974750	-32272	32663	5183.02	518302	-128	127	-0.98	-98
-298	2	10288	99199	0.89489	297.89489	149.39489	14939.48948	0.89489	297.8949	149.39489	14939.48967	0.89489	297.89489	149.39489	14939.48900	2020-01-01	2020-01-02	2020-01-01 00:04:58	2020-01-02 03:33:19	2020-01-01 00:04:58.000	2020-01-02 03:33:19.000	298	99199	49748.5	4974850	298	99199	49748.5	4974850	-32271	32664	5184.02	518402	-128	127	-2.54	-254
-299	2	10289	99200	0.89789	297.89789	149.39789	14939.78978	0.89789	297.8979	149.39789	14939.78986	0.89789	297.89789	149.39789000000002	14939.78900	2020-01-01	2020-01-02	2020-01-01 00:04:59	2020-01-02 03:33:20	2020-01-01 00:04:59.000	2020-01-02 03:33:20.000	299	99200	49749.5	4974950	299	99200	49749.5	4974950	-32270	32665	5185.02	518502	-128	124	-4.1	-410
-3	2	1002	9993	0.009	300.009	150.009	15150.9099	0.009	300.009	150.009	15150.90958	0.00900	300.00900	150.009	15150.90900	2020-01-01	2020-01-02	2020-01-01 00:00:03	2020-01-02 03:45:03	2020-01-01 00:00:03.000	2020-01-02 03:45:03.000	3	99903	49953	5045253	3	99903	49953	5045253	-32566	32369	4532.009900990099	457733	-124	127	0.04950495049504951	5
+290	2	10280	99191	0.87087	297.87087	149.37087	14937.08708	0.87087	297.87088	149.37087	14937.087	0.87087	297.87087	149.37087	14937.087	2020-01-01	2020-01-02	2020-01-01 00:04:50	2020-01-02 03:33:11	2020-01-01 00:04:50.000	2020-01-02 03:33:11.000	290	99191	49740.5	4974050	290	99191	49740.5	4974050	-32279	32656	5176.02	517602	-124	127	-0.3	-30
+291	2	10281	99192	0.87387	297.87387	149.37387	14937.38738	0.87387	297.87387	149.37387	14937.38716	0.87387	297.87387	149.37387	14937.387	2020-01-01	2020-01-02	2020-01-01 00:04:51	2020-01-02 03:33:12	2020-01-01 00:04:51.000	2020-01-02 03:33:12.000	291	99192	49741.5	4974150	291	99192	49741.5	4974150	-32278	32657	5177.02	517702	-128	127	-1.86	-186
+292	2	10282	99193	0.87687	297.87687	149.37687	14937.68768	0.87687	297.8769	149.37687	14937.68789	0.87687	297.87687	149.37687	14937.687	2020-01-01	2020-01-02	2020-01-01 00:04:52	2020-01-02 03:33:13	2020-01-01 00:04:52.000	2020-01-02 03:33:13.000	292	99193	49742.5	4974250	292	99193	49742.5	4974250	-32277	32658	5178.02	517802	-128	123	-3.42	-342
+293	2	10283	99194	0.87987	297.87987	149.37987	14937.98798	0.87987	297.87988	149.37988	14937.9882	0.87987	297.87987	149.37986999999998	14937.987	2020-01-01	2020-01-02	2020-01-01 00:04:53	2020-01-02 03:33:14	2020-01-01 00:04:53.000	2020-01-02 03:33:14.000	293	99194	49743.5	4974350	293	99194	49743.5	4974350	-32276	32659	5179.02	517902	-127	124	-2.42	-242
+294	2	10284	99195	0.88288	297.88288	149.38288	14938.28828	0.88288	297.88287	149.38288	14938.28835	0.88288	297.88288	149.38288	14938.288	2020-01-01	2020-01-02	2020-01-01 00:04:54	2020-01-02 03:33:15	2020-01-01 00:04:54.000	2020-01-02 03:33:15.000	294	99195	49744.5	4974450	294	99195	49744.5	4974450	-32275	32660	5180.02	518002	-126	125	-1.42	-142
+295	2	10285	99196	0.88588	297.88588	149.38588	14938.58858	0.88588	297.8859	149.38588	14938.58847	0.88588	297.88588	149.38588	14938.588	2020-01-01	2020-01-02	2020-01-01 00:04:55	2020-01-02 03:33:16	2020-01-01 00:04:55.000	2020-01-02 03:33:16.000	295	99196	49745.5	4974550	295	99196	49745.5	4974550	-32274	32661	5181.02	518102	-125	126	-0.42	-42
+296	2	10286	99197	0.88888	297.88888	149.38888	14938.88888	0.88888	297.8889	149.38888	14938.88863	0.88888	297.88888	149.38888	14938.888	2020-01-01	2020-01-02	2020-01-01 00:04:56	2020-01-02 03:33:17	2020-01-01 00:04:56.000	2020-01-02 03:33:17.000	296	99197	49746.5	4974650	296	99197	49746.5	4974650	-32273	32662	5182.02	518202	-124	127	0.58	58
+297	2	10287	99198	0.89189	297.89189	149.39189	14939.18918	0.89189	297.8919	149.39189	14939.18936	0.89189	297.89189	149.39189	14939.189	2020-01-01	2020-01-02	2020-01-01 00:04:57	2020-01-02 03:33:18	2020-01-01 00:04:57.000	2020-01-02 03:33:18.000	297	99198	49747.5	4974750	297	99198	49747.5	4974750	-32272	32663	5183.02	518302	-128	127	-0.98	-98
+298	2	10288	99199	0.89489	297.89489	149.39489	14939.48948	0.89489	297.8949	149.39489	14939.48967	0.89489	297.89489	149.39489	14939.489	2020-01-01	2020-01-02	2020-01-01 00:04:58	2020-01-02 03:33:19	2020-01-01 00:04:58.000	2020-01-02 03:33:19.000	298	99199	49748.5	4974850	298	99199	49748.5	4974850	-32271	32664	5184.02	518402	-128	127	-2.54	-254
+299	2	10289	99200	0.89789	297.89789	149.39789	14939.78978	0.89789	297.8979	149.39789	14939.78986	0.89789	297.89789	149.39789000000002	14939.789	2020-01-01	2020-01-02	2020-01-01 00:04:59	2020-01-02 03:33:20	2020-01-01 00:04:59.000	2020-01-02 03:33:20.000	299	99200	49749.5	4974950	299	99200	49749.5	4974950	-32270	32665	5185.02	518502	-128	124	-4.1	-410
+3	2	1002	9993	0.009	300.009	150.009	15150.9099	0.009	300.009	150.009	15150.90958	0.009	300.009	150.009	15150.909	2020-01-01	2020-01-02	2020-01-01 00:00:03	2020-01-02 03:45:03	2020-01-01 00:00:03.000	2020-01-02 03:45:03.000	3	99903	49953	5045253	3	99903	49953	5045253	-32566	32369	4532.009900990099	457733	-124	127	0.04950495049504951	5
 30	2	10020	99930	0.09009	300.09009	150.09009	15159.09909	0.09009	300.0901	150.09008	15159.09894	0.09009	300.09009	150.09009	15159.09909	2020-01-01	2020-01-02	2020-01-01 00:00:30	2020-01-02 03:45:30	2020-01-01 00:00:30.000	2020-01-02 03:45:30.000	30	99930	49980	5047980	30	99930	49980	5047980	-32539	32396	4559.009900990099	460460	-128	123	-3.366336633663366	-340
-300	2	10290	99201	0.9009	297.9009	149.4009	14940.09009	0.9009	297.9009	149.40089	14940.08995	0.90090	297.90090	149.4009	14940.09000	2020-01-01	2020-01-02	2020-01-01 00:05:00	2020-01-02 03:33:21	2020-01-01 00:05:00.000	2020-01-02 03:33:21.000	300	99201	49750.5	4975050	300	99201	49750.5	4975050	-32269	32666	5186.02	518602	-127	125	-3.1	-310
-301	2	10291	99202	0.9039	297.9039	149.4039	14940.39039	0.9039	297.9039	149.4039	14940.39009	0.90390	297.90390	149.4039	14940.39000	2020-01-01	2020-01-02	2020-01-01 00:05:01	2020-01-02 03:33:22	2020-01-01 00:05:01.000	2020-01-02 03:33:22.000	301	99202	49751.5	4975150	301	99202	49751.5	4975150	-32268	32667	5187.02	518702	-126	126	-2.1	-210
-302	2	10292	99203	0.9069	297.9069	149.4069	14940.69069	0.9069	297.90692	149.4069	14940.69083	0.90690	297.90690	149.4069	14940.69000	2020-01-01	2020-01-02	2020-01-01 00:05:02	2020-01-02 03:33:23	2020-01-01 00:05:02.000	2020-01-02 03:33:23.000	302	99203	49752.5	4975250	302	99203	49752.5	4975250	-32267	32668	5188.02	518802	-125	127	-1.1	-110
-303	2	10293	99204	0.9099	297.9099	149.4099	14940.99099	0.9099	297.9099	149.40991	14940.99114	0.90990	297.90990	149.4099	14940.99000	2020-01-01	2020-01-02	2020-01-01 00:05:03	2020-01-02 03:33:24	2020-01-01 00:05:03.000	2020-01-02 03:33:24.000	303	99204	49753.5	4975350	303	99204	49753.5	4975350	-32266	32669	5189.02	518902	-128	127	-2.66	-266
-304	2	10294	99205	0.91291	297.91291	149.41291	14941.29129	0.91291	297.9129	149.41291	14941.29133	0.91291	297.91291	149.41290999999998	14941.29100	2020-01-01	2020-01-02	2020-01-01 00:05:04	2020-01-02 03:33:25	2020-01-01 00:05:04.000	2020-01-02 03:33:25.000	304	99205	49754.5	4975450	304	99205	49754.5	4975450	-32265	32670	5190.02	519002	-128	127	-4.22	-422
-305	2	10295	99206	0.91591	297.91591	149.41591	14941.59159	0.91591	297.91592	149.41591	14941.59141	0.91591	297.91591	149.41591	14941.59100	2020-01-01	2020-01-02	2020-01-01 00:05:05	2020-01-02 03:33:26	2020-01-01 00:05:05.000	2020-01-02 03:33:26.000	305	99206	49755.5	4975550	305	99206	49755.5	4975550	-32264	32671	5191.02	519102	-128	123	-5.78	-578
-306	2	10296	99207	0.91891	297.91891	149.41891	14941.89189	0.91891	297.9189	149.41891	14941.89172	0.91891	297.91891	149.41890999999998	14941.89100	2020-01-01	2020-01-02	2020-01-01 00:05:06	2020-01-02 03:33:27	2020-01-01 00:05:06.000	2020-01-02 03:33:27.000	306	99207	49756.5	4975650	306	99207	49756.5	4975650	-32263	32672	5192.02	519202	-127	124	-4.78	-478
-307	2	10297	99208	0.92192	297.92192	149.42192	14942.19219	0.92192	297.92194	149.42192	14942.1923	0.92192	297.92192	149.42192	14942.19200	2020-01-01	2020-01-02	2020-01-01 00:05:07	2020-01-02 03:33:28	2020-01-01 00:05:07.000	2020-01-02 03:33:28.000	307	99208	49757.5	4975750	307	99208	49757.5	4975750	-32262	32673	5193.02	519302	-126	125	-3.78	-378
-308	2	10298	99209	0.92492	297.92492	149.42492	14942.49249	0.92492	297.92493	149.42492	14942.49265	0.92492	297.92492	149.42492000000001	14942.49200	2020-01-01	2020-01-02	2020-01-01 00:05:08	2020-01-02 03:33:29	2020-01-01 00:05:08.000	2020-01-02 03:33:29.000	308	99209	49758.5	4975850	308	99209	49758.5	4975850	-32261	32674	5194.02	519402	-125	126	-2.78	-278
-309	2	10299	99210	0.92792	297.92792	149.42792	14942.79279	0.92792	297.92792	149.42792	14942.7928	0.92792	297.92792	149.42792	14942.79200	2020-01-01	2020-01-02	2020-01-01 00:05:09	2020-01-02 03:33:30	2020-01-01 00:05:09.000	2020-01-02 03:33:30.000	309	99210	49759.5	4975950	309	99210	49759.5	4975950	-32260	32675	5195.02	519502	-124	127	-1.78	-178
+300	2	10290	99201	0.9009	297.9009	149.4009	14940.09009	0.9009	297.9009	149.40089	14940.08995	0.9009	297.9009	149.4009	14940.09	2020-01-01	2020-01-02	2020-01-01 00:05:00	2020-01-02 03:33:21	2020-01-01 00:05:00.000	2020-01-02 03:33:21.000	300	99201	49750.5	4975050	300	99201	49750.5	4975050	-32269	32666	5186.02	518602	-127	125	-3.1	-310
+301	2	10291	99202	0.9039	297.9039	149.4039	14940.39039	0.9039	297.9039	149.4039	14940.39009	0.9039	297.9039	149.4039	14940.39	2020-01-01	2020-01-02	2020-01-01 00:05:01	2020-01-02 03:33:22	2020-01-01 00:05:01.000	2020-01-02 03:33:22.000	301	99202	49751.5	4975150	301	99202	49751.5	4975150	-32268	32667	5187.02	518702	-126	126	-2.1	-210
+302	2	10292	99203	0.9069	297.9069	149.4069	14940.69069	0.9069	297.90692	149.4069	14940.69083	0.9069	297.9069	149.4069	14940.69	2020-01-01	2020-01-02	2020-01-01 00:05:02	2020-01-02 03:33:23	2020-01-01 00:05:02.000	2020-01-02 03:33:23.000	302	99203	49752.5	4975250	302	99203	49752.5	4975250	-32267	32668	5188.02	518802	-125	127	-1.1	-110
+303	2	10293	99204	0.9099	297.9099	149.4099	14940.99099	0.9099	297.9099	149.40991	14940.99114	0.9099	297.9099	149.4099	14940.99	2020-01-01	2020-01-02	2020-01-01 00:05:03	2020-01-02 03:33:24	2020-01-01 00:05:03.000	2020-01-02 03:33:24.000	303	99204	49753.5	4975350	303	99204	49753.5	4975350	-32266	32669	5189.02	518902	-128	127	-2.66	-266
+304	2	10294	99205	0.91291	297.91291	149.41291	14941.29129	0.91291	297.9129	149.41291	14941.29133	0.91291	297.91291	149.41290999999998	14941.291	2020-01-01	2020-01-02	2020-01-01 00:05:04	2020-01-02 03:33:25	2020-01-01 00:05:04.000	2020-01-02 03:33:25.000	304	99205	49754.5	4975450	304	99205	49754.5	4975450	-32265	32670	5190.02	519002	-128	127	-4.22	-422
+305	2	10295	99206	0.91591	297.91591	149.41591	14941.59159	0.91591	297.91592	149.41591	14941.59141	0.91591	297.91591	149.41591	14941.591	2020-01-01	2020-01-02	2020-01-01 00:05:05	2020-01-02 03:33:26	2020-01-01 00:05:05.000	2020-01-02 03:33:26.000	305	99206	49755.5	4975550	305	99206	49755.5	4975550	-32264	32671	5191.02	519102	-128	123	-5.78	-578
+306	2	10296	99207	0.91891	297.91891	149.41891	14941.89189	0.91891	297.9189	149.41891	14941.89172	0.91891	297.91891	149.41890999999998	14941.891	2020-01-01	2020-01-02	2020-01-01 00:05:06	2020-01-02 03:33:27	2020-01-01 00:05:06.000	2020-01-02 03:33:27.000	306	99207	49756.5	4975650	306	99207	49756.5	4975650	-32263	32672	5192.02	519202	-127	124	-4.78	-478
+307	2	10297	99208	0.92192	297.92192	149.42192	14942.19219	0.92192	297.92194	149.42192	14942.1923	0.92192	297.92192	149.42192	14942.192	2020-01-01	2020-01-02	2020-01-01 00:05:07	2020-01-02 03:33:28	2020-01-01 00:05:07.000	2020-01-02 03:33:28.000	307	99208	49757.5	4975750	307	99208	49757.5	4975750	-32262	32673	5193.02	519302	-126	125	-3.78	-378
+308	2	10298	99209	0.92492	297.92492	149.42492	14942.49249	0.92492	297.92493	149.42492	14942.49265	0.92492	297.92492	149.42492000000001	14942.492	2020-01-01	2020-01-02	2020-01-01 00:05:08	2020-01-02 03:33:29	2020-01-01 00:05:08.000	2020-01-02 03:33:29.000	308	99209	49758.5	4975850	308	99209	49758.5	4975850	-32261	32674	5194.02	519402	-125	126	-2.78	-278
+309	2	10299	99210	0.92792	297.92792	149.42792	14942.79279	0.92792	297.92792	149.42792	14942.7928	0.92792	297.92792	149.42792	14942.792	2020-01-01	2020-01-02	2020-01-01 00:05:09	2020-01-02 03:33:30	2020-01-01 00:05:09.000	2020-01-02 03:33:30.000	309	99210	49759.5	4975950	309	99210	49759.5	4975950	-32260	32675	5195.02	519502	-124	127	-1.78	-178
 31	2	10021	99931	0.09309	300.09309	150.09309	15159.4024	0.09309	300.09308	150.09309	15159.40224	0.09309	300.09309	150.09309	15159.40209	2020-01-01	2020-01-02	2020-01-01 00:00:31	2020-01-02 03:45:31	2020-01-01 00:00:31.000	2020-01-02 03:45:31.000	31	99931	49981	5048081	31	99931	49981	5048081	-32538	32397	4560.009900990099	460561	-127	124	-2.366336633663366	-239
-310	2	10300	99211	0.93093	297.93093	149.43093	14943.09309	0.93093	297.93094	149.43092	14943.09288	0.93093	297.93093	149.43093000000002	14943.09300	2020-01-01	2020-01-02	2020-01-01 00:05:10	2020-01-02 03:33:31	2020-01-01 00:05:10.000	2020-01-02 03:33:31.000	310	99211	49760.5	4976050	310	99211	49760.5	4976050	-32259	32676	5196.02	519602	-128	127	-3.34	-334
-311	2	10301	99212	0.93393	297.93393	149.43393	14943.39339	0.93393	297.93393	149.43393	14943.39319	0.93393	297.93393	149.43393	14943.39300	2020-01-01	2020-01-02	2020-01-01 00:05:11	2020-01-02 03:33:32	2020-01-01 00:05:11.000	2020-01-02 03:33:32.000	311	99212	49761.5	4976150	311	99212	49761.5	4976150	-32258	32677	5197.02	519702	-128	123	-4.9	-490
-312	2	10302	99213	0.93693	297.93693	149.43693	14943.69369	0.93693	297.93695	149.43693	14943.69377	0.93693	297.93693	149.43693	14943.69300	2020-01-01	2020-01-02	2020-01-01 00:05:12	2020-01-02 03:33:33	2020-01-01 00:05:12.000	2020-01-02 03:33:33.000	312	99213	49762.5	4976250	312	99213	49762.5	4976250	-32257	32678	5198.02	519802	-127	124	-3.9	-390
-313	2	10303	99214	0.93993	297.93993	149.43993	14943.99399	0.93993	297.93994	149.43994	14943.99412	0.93993	297.93993	149.43993	14943.99300	2020-01-01	2020-01-02	2020-01-01 00:05:13	2020-01-02 03:33:34	2020-01-01 00:05:13.000	2020-01-02 03:33:34.000	313	99214	49763.5	4976350	313	99214	49763.5	4976350	-32256	32679	5199.02	519902	-126	125	-2.9	-290
-314	2	10304	99215	0.94294	297.94294	149.44294	14944.29429	0.94294	297.94293	149.44294	14944.29427	0.94294	297.94294	149.44294	14944.29400	2020-01-01	2020-01-02	2020-01-01 00:05:14	2020-01-02 03:33:35	2020-01-01 00:05:14.000	2020-01-02 03:33:35.000	314	99215	49764.5	4976450	314	99215	49764.5	4976450	-32255	32680	5200.02	520002	-125	126	-1.9	-190
-315	2	10305	99216	0.94594	297.94594	149.44594	14944.59459	0.94594	297.94595	149.44595	14944.595	0.94594	297.94594	149.44593999999998	14944.59400	2020-01-01	2020-01-02	2020-01-01 00:05:15	2020-01-02 03:33:36	2020-01-01 00:05:15.000	2020-01-02 03:33:36.000	315	99216	49765.5	4976550	315	99216	49765.5	4976550	-32254	32681	5201.02	520102	-124	127	-0.9	-90
-316	2	10306	99217	0.94894	297.94894	149.44894	14944.89489	0.94894	297.94894	149.44894	14944.89466	0.94894	297.94894	149.44894	14944.89400	2020-01-01	2020-01-02	2020-01-01 00:05:16	2020-01-02 03:33:37	2020-01-01 00:05:16.000	2020-01-02 03:33:37.000	316	99217	49766.5	4976650	316	99217	49766.5	4976650	-32253	32682	5202.02	520202	-128	127	-2.46	-246
-317	2	10307	99218	0.95195	297.95195	149.45195	14945.19519	0.95195	297.95197	149.45195	14945.19524	0.95195	297.95195	149.45195	14945.19500	2020-01-01	2020-01-02	2020-01-01 00:05:17	2020-01-02 03:33:38	2020-01-01 00:05:17.000	2020-01-02 03:33:38.000	317	99218	49767.5	4976750	317	99218	49767.5	4976750	-32252	32683	5203.02	520302	-128	123	-4.02	-402
-318	2	10308	99219	0.95495	297.95495	149.45495	14945.49549	0.95495	297.95496	149.45495	14945.49558	0.95495	297.95495	149.45495	14945.49500	2020-01-01	2020-01-02	2020-01-01 00:05:18	2020-01-02 03:33:39	2020-01-01 00:05:18.000	2020-01-02 03:33:39.000	318	99219	49768.5	4976850	318	99219	49768.5	4976850	-32251	32684	5204.02	520402	-127	124	-3.02	-302
-319	2	10309	99220	0.95795	297.95795	149.45795	14945.79579	0.95795	297.95795	149.45795	14945.79574	0.95795	297.95795	149.45795	14945.79500	2020-01-01	2020-01-02	2020-01-01 00:05:19	2020-01-02 03:33:40	2020-01-01 00:05:19.000	2020-01-02 03:33:40.000	319	99220	49769.5	4976950	319	99220	49769.5	4976950	-32250	32685	5205.02	520502	-126	125	-2.02	-202
+310	2	10300	99211	0.93093	297.93093	149.43093	14943.09309	0.93093	297.93094	149.43092	14943.09288	0.93093	297.93093	149.43093000000002	14943.093	2020-01-01	2020-01-02	2020-01-01 00:05:10	2020-01-02 03:33:31	2020-01-01 00:05:10.000	2020-01-02 03:33:31.000	310	99211	49760.5	4976050	310	99211	49760.5	4976050	-32259	32676	5196.02	519602	-128	127	-3.34	-334
+311	2	10301	99212	0.93393	297.93393	149.43393	14943.39339	0.93393	297.93393	149.43393	14943.39319	0.93393	297.93393	149.43393	14943.393	2020-01-01	2020-01-02	2020-01-01 00:05:11	2020-01-02 03:33:32	2020-01-01 00:05:11.000	2020-01-02 03:33:32.000	311	99212	49761.5	4976150	311	99212	49761.5	4976150	-32258	32677	5197.02	519702	-128	123	-4.9	-490
+312	2	10302	99213	0.93693	297.93693	149.43693	14943.69369	0.93693	297.93695	149.43693	14943.69377	0.93693	297.93693	149.43693	14943.693	2020-01-01	2020-01-02	2020-01-01 00:05:12	2020-01-02 03:33:33	2020-01-01 00:05:12.000	2020-01-02 03:33:33.000	312	99213	49762.5	4976250	312	99213	49762.5	4976250	-32257	32678	5198.02	519802	-127	124	-3.9	-390
+313	2	10303	99214	0.93993	297.93993	149.43993	14943.99399	0.93993	297.93994	149.43994	14943.99412	0.93993	297.93993	149.43993	14943.993	2020-01-01	2020-01-02	2020-01-01 00:05:13	2020-01-02 03:33:34	2020-01-01 00:05:13.000	2020-01-02 03:33:34.000	313	99214	49763.5	4976350	313	99214	49763.5	4976350	-32256	32679	5199.02	519902	-126	125	-2.9	-290
+314	2	10304	99215	0.94294	297.94294	149.44294	14944.29429	0.94294	297.94293	149.44294	14944.29427	0.94294	297.94294	149.44294	14944.294	2020-01-01	2020-01-02	2020-01-01 00:05:14	2020-01-02 03:33:35	2020-01-01 00:05:14.000	2020-01-02 03:33:35.000	314	99215	49764.5	4976450	314	99215	49764.5	4976450	-32255	32680	5200.02	520002	-125	126	-1.9	-190
+315	2	10305	99216	0.94594	297.94594	149.44594	14944.59459	0.94594	297.94595	149.44595	14944.595	0.94594	297.94594	149.44593999999998	14944.594	2020-01-01	2020-01-02	2020-01-01 00:05:15	2020-01-02 03:33:36	2020-01-01 00:05:15.000	2020-01-02 03:33:36.000	315	99216	49765.5	4976550	315	99216	49765.5	4976550	-32254	32681	5201.02	520102	-124	127	-0.9	-90
+316	2	10306	99217	0.94894	297.94894	149.44894	14944.89489	0.94894	297.94894	149.44894	14944.89466	0.94894	297.94894	149.44894	14944.894	2020-01-01	2020-01-02	2020-01-01 00:05:16	2020-01-02 03:33:37	2020-01-01 00:05:16.000	2020-01-02 03:33:37.000	316	99217	49766.5	4976650	316	99217	49766.5	4976650	-32253	32682	5202.02	520202	-128	127	-2.46	-246
+317	2	10307	99218	0.95195	297.95195	149.45195	14945.19519	0.95195	297.95197	149.45195	14945.19524	0.95195	297.95195	149.45195	14945.195	2020-01-01	2020-01-02	2020-01-01 00:05:17	2020-01-02 03:33:38	2020-01-01 00:05:17.000	2020-01-02 03:33:38.000	317	99218	49767.5	4976750	317	99218	49767.5	4976750	-32252	32683	5203.02	520302	-128	123	-4.02	-402
+318	2	10308	99219	0.95495	297.95495	149.45495	14945.49549	0.95495	297.95496	149.45495	14945.49558	0.95495	297.95495	149.45495	14945.495	2020-01-01	2020-01-02	2020-01-01 00:05:18	2020-01-02 03:33:39	2020-01-01 00:05:18.000	2020-01-02 03:33:39.000	318	99219	49768.5	4976850	318	99219	49768.5	4976850	-32251	32684	5204.02	520402	-127	124	-3.02	-302
+319	2	10309	99220	0.95795	297.95795	149.45795	14945.79579	0.95795	297.95795	149.45795	14945.79574	0.95795	297.95795	149.45795	14945.795	2020-01-01	2020-01-02	2020-01-01 00:05:19	2020-01-02 03:33:40	2020-01-01 00:05:19.000	2020-01-02 03:33:40.000	319	99220	49769.5	4976950	319	99220	49769.5	4976950	-32250	32685	5205.02	520502	-126	125	-2.02	-202
 32	2	10022	99932	0.09609	300.09609	150.09609	15159.7057	0.09609	300.0961	150.09609	15159.706	0.09609	300.09609	150.09609	15159.70509	2020-01-01	2020-01-02	2020-01-01 00:00:32	2020-01-02 03:45:32	2020-01-01 00:00:32.000	2020-01-02 03:45:32.000	32	99932	49982	5048182	32	99932	49982	5048182	-32537	32398	4561.009900990099	460662	-126	125	-1.3663366336633664	-138
-320	2	10310	99221	0.96096	297.96096	149.46096	14946.09609	0.96096	297.96097	149.46096	14946.09647	0.96096	297.96096	149.46096	14946.09600	2020-01-01	2020-01-02	2020-01-01 00:05:20	2020-01-02 03:33:41	2020-01-01 00:05:20.000	2020-01-02 03:33:41.000	320	99221	49770.5	4977050	320	99221	49770.5	4977050	-32249	32686	5206.02	520602	-125	126	-1.02	-102
-321	2	10311	99222	0.96396	297.96396	149.46396	14946.39639	0.96396	297.96396	149.46396	14946.39613	0.96396	297.96396	149.46396000000001	14946.39600	2020-01-01	2020-01-02	2020-01-01 00:05:21	2020-01-02 03:33:42	2020-01-01 00:05:21.000	2020-01-02 03:33:42.000	321	99222	49771.5	4977150	321	99222	49771.5	4977150	-32248	32687	5207.02	520702	-124	127	-0.02	-2
-322	2	10312	99223	0.96696	297.96696	149.46696	14946.69669	0.96696	297.96698	149.46696	14946.69674	0.96696	297.96696	149.46696	14946.69600	2020-01-01	2020-01-02	2020-01-01 00:05:22	2020-01-02 03:33:43	2020-01-01 00:05:22.000	2020-01-02 03:33:43.000	322	99223	49772.5	4977250	322	99223	49772.5	4977250	-32247	32688	5208.02	520802	-128	127	-1.58	-158
-323	2	10313	99224	0.96996	297.96996	149.46996	14946.99699	0.96997	297.96997	149.46997	14946.99706	0.96996	297.96996	149.46996	14946.99600	2020-01-01	2020-01-02	2020-01-01 00:05:23	2020-01-02 03:33:44	2020-01-01 00:05:23.000	2020-01-02 03:33:44.000	323	99224	49773.5	4977350	323	99224	49773.5	4977350	-32246	32689	5209.02	520902	-128	123	-3.14	-314
-324	2	10314	99225	0.97297	297.97297	149.47297	14947.29729	0.97297	297.97296	149.47297	14947.29737	0.97297	297.97297	149.47297	14947.29700	2020-01-01	2020-01-02	2020-01-01 00:05:24	2020-01-02 03:33:45	2020-01-01 00:05:24.000	2020-01-02 03:33:45.000	324	99225	49774.5	4977450	324	99225	49774.5	4977450	-32245	32690	5210.02	521002	-127	124	-2.14	-214
-325	2	10315	99226	0.97597	297.97597	149.47597	14947.59759	0.97597	297.97598	149.47597	14947.59794	0.97597	297.97597	149.47597	14947.59700	2020-01-01	2020-01-02	2020-01-01 00:05:25	2020-01-02 03:33:46	2020-01-01 00:05:25.000	2020-01-02 03:33:46.000	325	99226	49775.5	4977550	325	99226	49775.5	4977550	-32244	32691	5211.02	521102	-126	125	-1.14	-114
-326	2	10316	99227	0.97897	297.97897	149.47897	14947.89789	0.97897	297.97897	149.47897	14947.8976	0.97897	297.97897	149.47897	14947.89700	2020-01-01	2020-01-02	2020-01-01 00:05:26	2020-01-02 03:33:47	2020-01-01 00:05:26.000	2020-01-02 03:33:47.000	326	99227	49776.5	4977650	326	99227	49776.5	4977650	-32243	32692	5212.02	521202	-125	126	-0.14	-14
-327	2	10317	99228	0.98198	297.98198	149.48198	14948.19819	0.98198	297.982	149.48198	14948.19821	0.98198	297.98198	149.48198	14948.19800	2020-01-01	2020-01-02	2020-01-01 00:05:27	2020-01-02 03:33:48	2020-01-01 00:05:27.000	2020-01-02 03:33:48.000	327	99228	49777.5	4977750	327	99228	49777.5	4977750	-32242	32693	5213.02	521302	-124	127	0.86	86
-328	2	10318	99229	0.98498	297.98498	149.48498	14948.49849	0.98498	297.985	149.48498	14948.49853	0.98498	297.98498	149.48498	14948.49800	2020-01-01	2020-01-02	2020-01-01 00:05:28	2020-01-02 03:33:49	2020-01-01 00:05:28.000	2020-01-02 03:33:49.000	328	99229	49778.5	4977850	328	99229	49778.5	4977850	-32241	32694	5214.02	521402	-128	127	-0.7	-70
-329	2	10319	99230	0.98798	297.98798	149.48798	14948.79879	0.98798	297.98798	149.48798	14948.79883	0.98798	297.98798	149.48798	14948.79800	2020-01-01	2020-01-02	2020-01-01 00:05:29	2020-01-02 03:33:50	2020-01-01 00:05:29.000	2020-01-02 03:33:50.000	329	99230	49779.5	4977950	329	99230	49779.5	4977950	-32240	32695	5215.02	521502	-128	127	-2.26	-226
+320	2	10310	99221	0.96096	297.96096	149.46096	14946.09609	0.96096	297.96097	149.46096	14946.09647	0.96096	297.96096	149.46096	14946.096	2020-01-01	2020-01-02	2020-01-01 00:05:20	2020-01-02 03:33:41	2020-01-01 00:05:20.000	2020-01-02 03:33:41.000	320	99221	49770.5	4977050	320	99221	49770.5	4977050	-32249	32686	5206.02	520602	-125	126	-1.02	-102
+321	2	10311	99222	0.96396	297.96396	149.46396	14946.39639	0.96396	297.96396	149.46396	14946.39613	0.96396	297.96396	149.46396000000001	14946.396	2020-01-01	2020-01-02	2020-01-01 00:05:21	2020-01-02 03:33:42	2020-01-01 00:05:21.000	2020-01-02 03:33:42.000	321	99222	49771.5	4977150	321	99222	49771.5	4977150	-32248	32687	5207.02	520702	-124	127	-0.02	-2
+322	2	10312	99223	0.96696	297.96696	149.46696	14946.69669	0.96696	297.96698	149.46696	14946.69674	0.96696	297.96696	149.46696	14946.696	2020-01-01	2020-01-02	2020-01-01 00:05:22	2020-01-02 03:33:43	2020-01-01 00:05:22.000	2020-01-02 03:33:43.000	322	99223	49772.5	4977250	322	99223	49772.5	4977250	-32247	32688	5208.02	520802	-128	127	-1.58	-158
+323	2	10313	99224	0.96996	297.96996	149.46996	14946.99699	0.96997	297.96997	149.46997	14946.99706	0.96996	297.96996	149.46996	14946.996	2020-01-01	2020-01-02	2020-01-01 00:05:23	2020-01-02 03:33:44	2020-01-01 00:05:23.000	2020-01-02 03:33:44.000	323	99224	49773.5	4977350	323	99224	49773.5	4977350	-32246	32689	5209.02	520902	-128	123	-3.14	-314
+324	2	10314	99225	0.97297	297.97297	149.47297	14947.29729	0.97297	297.97296	149.47297	14947.29737	0.97297	297.97297	149.47297	14947.297	2020-01-01	2020-01-02	2020-01-01 00:05:24	2020-01-02 03:33:45	2020-01-01 00:05:24.000	2020-01-02 03:33:45.000	324	99225	49774.5	4977450	324	99225	49774.5	4977450	-32245	32690	5210.02	521002	-127	124	-2.14	-214
+325	2	10315	99226	0.97597	297.97597	149.47597	14947.59759	0.97597	297.97598	149.47597	14947.59794	0.97597	297.97597	149.47597	14947.597	2020-01-01	2020-01-02	2020-01-01 00:05:25	2020-01-02 03:33:46	2020-01-01 00:05:25.000	2020-01-02 03:33:46.000	325	99226	49775.5	4977550	325	99226	49775.5	4977550	-32244	32691	5211.02	521102	-126	125	-1.14	-114
+326	2	10316	99227	0.97897	297.97897	149.47897	14947.89789	0.97897	297.97897	149.47897	14947.8976	0.97897	297.97897	149.47897	14947.897	2020-01-01	2020-01-02	2020-01-01 00:05:26	2020-01-02 03:33:47	2020-01-01 00:05:26.000	2020-01-02 03:33:47.000	326	99227	49776.5	4977650	326	99227	49776.5	4977650	-32243	32692	5212.02	521202	-125	126	-0.14	-14
+327	2	10317	99228	0.98198	297.98198	149.48198	14948.19819	0.98198	297.982	149.48198	14948.19821	0.98198	297.98198	149.48198	14948.198	2020-01-01	2020-01-02	2020-01-01 00:05:27	2020-01-02 03:33:48	2020-01-01 00:05:27.000	2020-01-02 03:33:48.000	327	99228	49777.5	4977750	327	99228	49777.5	4977750	-32242	32693	5213.02	521302	-124	127	0.86	86
+328	2	10318	99229	0.98498	297.98498	149.48498	14948.49849	0.98498	297.985	149.48498	14948.49853	0.98498	297.98498	149.48498	14948.498	2020-01-01	2020-01-02	2020-01-01 00:05:28	2020-01-02 03:33:49	2020-01-01 00:05:28.000	2020-01-02 03:33:49.000	328	99229	49778.5	4977850	328	99229	49778.5	4977850	-32241	32694	5214.02	521402	-128	127	-0.7	-70
+329	2	10319	99230	0.98798	297.98798	149.48798	14948.79879	0.98798	297.98798	149.48798	14948.79883	0.98798	297.98798	149.48798	14948.798	2020-01-01	2020-01-02	2020-01-01 00:05:29	2020-01-02 03:33:50	2020-01-01 00:05:29.000	2020-01-02 03:33:50.000	329	99230	49779.5	4977950	329	99230	49779.5	4977950	-32240	32695	5215.02	521502	-128	127	-2.26	-226
 33	2	10023	99933	0.09909	300.09909	150.09909	15160.009	0.09909	300.0991	150.0991	15160.00913	0.09909	300.09909	150.09909	15160.00809	2020-01-01	2020-01-02	2020-01-01 00:00:33	2020-01-02 03:45:33	2020-01-01 00:00:33.000	2020-01-02 03:45:33.000	33	99933	49983	5048283	33	99933	49983	5048283	-32536	32399	4562.009900990099	460763	-125	126	-0.36633663366336633	-37
-330	2	10320	99231	0.99099	297.99099	149.49099	14949.09909	0.99099	297.991	149.49099	14949.09941	0.99099	297.99099	149.49099	14949.09900	2020-01-01	2020-01-02	2020-01-01 00:05:30	2020-01-02 03:33:51	2020-01-01 00:05:30.000	2020-01-02 03:33:51.000	330	99231	49780.5	4978050	330	99231	49780.5	4978050	-32239	32696	5216.02	521602	-128	123	-3.82	-382
-331	2	10321	99232	0.99399	297.99399	149.49399	14949.39939	0.99399	297.994	149.49399	14949.39911	0.99399	297.99399	149.49399	14949.39900	2020-01-01	2020-01-02	2020-01-01 00:05:31	2020-01-02 03:33:52	2020-01-01 00:05:31.000	2020-01-02 03:33:52.000	331	99232	49781.5	4978150	331	99232	49781.5	4978150	-32238	32697	5217.02	521702	-127	124	-2.82	-282
-332	2	10322	99233	0.99699	297.99699	149.49699	14949.69969	0.99699	297.997	149.49699	14949.69969	0.99699	297.99699	149.49699	14949.69900	2020-01-01	2020-01-02	2020-01-01 00:05:32	2020-01-02 03:33:53	2020-01-01 00:05:32.000	2020-01-02 03:33:53.000	332	99233	49782.5	4978250	332	99233	49782.5	4978250	-32237	32698	5218.02	521802	-126	125	-1.82	-182
-333	2	10323	99234	1	298	149.5	14950	1	298	149.5	14950	1.00000	298.00000	149.5	14950.00000	2020-01-01	2020-01-02	2020-01-01 00:05:33	2020-01-02 03:33:54	2020-01-01 00:05:33.000	2020-01-02 03:33:54.000	333	99234	49783.5	4978350	333	99234	49783.5	4978350	-32236	32699	5219.02	521902	-125	126	-0.82	-82
-334	2	10324	99235	1.003	298.003	149.503	14950.3003	1.003	298.003	149.503	14950.30029	1.00300	298.00300	149.503	14950.30000	2020-01-01	2020-01-02	2020-01-01 00:05:34	2020-01-02 03:33:55	2020-01-01 00:05:34.000	2020-01-02 03:33:55.000	334	99235	49784.5	4978450	334	99235	49784.5	4978450	-32235	32700	5220.02	522002	-124	127	0.18	18
-335	2	10325	99236	1.006	298.006	149.506	14950.6006	1.006	298.006	149.506	14950.60088	1.00600	298.00600	149.506	14950.60000	2020-01-01	2020-01-02	2020-01-01 00:05:35	2020-01-02 03:33:56	2020-01-01 00:05:35.000	2020-01-02 03:33:56.000	335	99236	49785.5	4978550	335	99236	49785.5	4978550	-32234	32701	5221.02	522102	-128	127	-1.38	-138
-336	2	10326	99237	1.009	298.009	149.509	14950.9009	1.009	298.009	149.509	14950.90057	1.00900	298.00900	149.509	14950.90000	2020-01-01	2020-01-02	2020-01-01 00:05:36	2020-01-02 03:33:57	2020-01-01 00:05:36.000	2020-01-02 03:33:57.000	336	99237	49786.5	4978650	336	99237	49786.5	4978650	-32233	32702	5222.02	522202	-128	123	-2.94	-294
-337	2	10327	99238	1.01201	298.01201	149.51201	14951.2012	1.01201	298.01202	149.51201	14951.20117	1.01201	298.01201	149.51201	14951.20100	2020-01-01	2020-01-02	2020-01-01 00:05:37	2020-01-02 03:33:58	2020-01-01 00:05:37.000	2020-01-02 03:33:58.000	337	99238	49787.5	4978750	337	99238	49787.5	4978750	-32232	32703	5223.02	522302	-127	124	-1.94	-194
-338	2	10328	99239	1.01501	298.01501	149.51501	14951.5015	1.01501	298.015	149.51501	14951.50146	1.01501	298.01501	149.51501	14951.50100	2020-01-01	2020-01-02	2020-01-01 00:05:38	2020-01-02 03:33:59	2020-01-01 00:05:38.000	2020-01-02 03:33:59.000	338	99239	49788.5	4978850	338	99239	49788.5	4978850	-32231	32704	5224.02	522402	-126	125	-0.94	-94
-339	2	10329	99240	1.01801	298.01801	149.51801	14951.8018	1.01801	298.018	149.51801	14951.80177	1.01801	298.01801	149.51801	14951.80100	2020-01-01	2020-01-02	2020-01-01 00:05:39	2020-01-02 03:34:00	2020-01-01 00:05:39.000	2020-01-02 03:34:00.000	339	99240	49789.5	4978950	339	99240	49789.5	4978950	-32230	32705	5225.02	522502	-125	126	0.06	6
-34	2	10024	99934	0.1021	300.1021	150.1021	15160.31231	0.1021	300.1021	150.1021	15160.31224	0.10210	300.10210	150.10209999999998	15160.31210	2020-01-01	2020-01-02	2020-01-01 00:00:34	2020-01-02 03:45:34	2020-01-01 00:00:34.000	2020-01-02 03:45:34.000	34	99934	49984	5048384	34	99934	49984	5048384	-32535	32400	4563.009900990099	460864	-124	127	0.6336633663366337	64
-340	2	10330	99241	1.02102	298.02102	149.52102	14952.1021	1.02102	298.02103	149.52102	14952.10239	1.02102	298.02102	149.52102000000002	14952.10200	2020-01-01	2020-01-02	2020-01-01 00:05:40	2020-01-02 03:34:01	2020-01-01 00:05:40.000	2020-01-02 03:34:01.000	340	99241	49790.5	4979050	340	99241	49790.5	4979050	-32229	32706	5226.02	522602	-124	127	1.06	106
-341	2	10331	99242	1.02402	298.02402	149.52402	14952.4024	1.02402	298.02402	149.52402	14952.40205	1.02402	298.02402	149.52402	14952.40200	2020-01-01	2020-01-02	2020-01-01 00:05:41	2020-01-02 03:34:02	2020-01-01 00:05:41.000	2020-01-02 03:34:02.000	341	99242	49791.5	4979150	341	99242	49791.5	4979150	-32228	32707	5227.02	522702	-128	127	-0.5	-50
-342	2	10332	99243	1.02702	298.02702	149.52702	14952.7027	1.02702	298.02704	149.52702	14952.70264	1.02702	298.02702	149.52702	14952.70200	2020-01-01	2020-01-02	2020-01-01 00:05:42	2020-01-02 03:34:03	2020-01-01 00:05:42.000	2020-01-02 03:34:03.000	342	99243	49792.5	4979250	342	99243	49792.5	4979250	-32227	32708	5228.02	522802	-128	123	-2.06	-206
-343	2	10333	99244	1.03003	298.03003	149.53003	14953.003	1.03003	298.03003	149.53002	14953.00293	1.03003	298.03003	149.53003	14953.00300	2020-01-01	2020-01-02	2020-01-01 00:05:43	2020-01-02 03:34:04	2020-01-01 00:05:43.000	2020-01-02 03:34:04.000	343	99244	49793.5	4979350	343	99244	49793.5	4979350	-32226	32709	5229.02	522902	-127	124	-1.06	-106
-344	2	10334	99245	1.03303	298.03303	149.53303	14953.3033	1.03303	298.03302	149.53303	14953.30323	1.03303	298.03303	149.53303	14953.30300	2020-01-01	2020-01-02	2020-01-01 00:05:44	2020-01-02 03:34:05	2020-01-01 00:05:44.000	2020-01-02 03:34:05.000	344	99245	49794.5	4979450	344	99245	49794.5	4979450	-32225	32710	5230.02	523002	-126	125	-0.06	-6
-345	2	10335	99246	1.03603	298.03603	149.53603	14953.6036	1.03603	298.03604	149.53603	14953.60386	1.03603	298.03603	149.53602999999998	14953.60300	2020-01-01	2020-01-02	2020-01-01 00:05:45	2020-01-02 03:34:06	2020-01-01 00:05:45.000	2020-01-02 03:34:06.000	345	99246	49795.5	4979550	345	99246	49795.5	4979550	-32224	32711	5231.02	523102	-125	126	0.94	94
-346	2	10336	99247	1.03903	298.03903	149.53903	14953.9039	1.03903	298.03903	149.53903	14953.90352	1.03903	298.03903	149.53903	14953.90300	2020-01-01	2020-01-02	2020-01-01 00:05:46	2020-01-02 03:34:07	2020-01-01 00:05:46.000	2020-01-02 03:34:07.000	346	99247	49796.5	4979650	346	99247	49796.5	4979650	-32223	32712	5232.02	523202	-124	127	1.94	194
-347	2	10337	99248	1.04204	298.04204	149.54204	14954.2042	1.04204	298.04205	149.54204	14954.20427	1.04204	298.04204	149.54204	14954.20400	2020-01-01	2020-01-02	2020-01-01 00:05:47	2020-01-02 03:34:08	2020-01-01 00:05:47.000	2020-01-02 03:34:08.000	347	99248	49797.5	4979750	347	99248	49797.5	4979750	-32222	32713	5233.02	523302	-128	127	0.38	38
-348	2	10338	99249	1.04504	298.04504	149.54504	14954.5045	1.04504	298.04504	149.54504	14954.50441	1.04504	298.04504	149.54504	14954.50400	2020-01-01	2020-01-02	2020-01-01 00:05:48	2020-01-02 03:34:09	2020-01-01 00:05:48.000	2020-01-02 03:34:09.000	348	99249	49798.5	4979850	348	99249	49798.5	4979850	-32221	32714	5234.02	523402	-128	123	-1.18	-118
-349	2	10339	99250	1.04804	298.04804	149.54804	14954.8048	1.04804	298.04803	149.54804	14954.80474	1.04804	298.04804	149.54804000000001	14954.80400	2020-01-01	2020-01-02	2020-01-01 00:05:49	2020-01-02 03:34:10	2020-01-01 00:05:49.000	2020-01-02 03:34:10.000	349	99250	49799.5	4979950	349	99250	49799.5	4979950	-32220	32715	5235.02	523502	-127	124	-0.18	-18
-35	2	10025	99935	0.1051	300.1051	150.1051	15160.61561	0.1051	300.1051	150.1051	15160.61542	0.10510	300.10510	150.10510000000002	15160.61510	2020-01-01	2020-01-02	2020-01-01 00:00:35	2020-01-02 03:45:35	2020-01-01 00:00:35.000	2020-01-02 03:45:35.000	35	99935	49985	5048485	35	99935	49985	5048485	-32534	32401	4564.009900990099	460965	-128	127	-0.900990099009901	-91
-350	2	10340	99251	1.05105	298.05105	149.55105	14955.1051	1.05105	298.05106	149.55105	14955.10532	1.05105	298.05105	149.55105	14955.10500	2020-01-01	2020-01-02	2020-01-01 00:05:50	2020-01-02 03:34:11	2020-01-01 00:05:50.000	2020-01-02 03:34:11.000	350	99251	49800.5	4980050	350	99251	49800.5	4980050	-32219	32716	5236.02	523602	-126	125	0.82	82
-351	2	10341	99252	1.05405	298.05405	149.55405	14955.4054	1.05405	298.05405	149.55404	14955.40499	1.05405	298.05405	149.55405000000002	14955.40500	2020-01-01	2020-01-02	2020-01-01 00:05:51	2020-01-02 03:34:12	2020-01-01 00:05:51.000	2020-01-02 03:34:12.000	351	99252	49801.5	4980150	351	99252	49801.5	4980150	-32218	32717	5237.02	523702	-125	126	1.82	182
-352	2	10342	99253	1.05705	298.05705	149.55705	14955.7057	1.05705	298.05707	149.55705	14955.70574	1.05705	298.05705	149.55705	14955.70500	2020-01-01	2020-01-02	2020-01-01 00:05:52	2020-01-02 03:34:13	2020-01-01 00:05:52.000	2020-01-02 03:34:13.000	352	99253	49802.5	4980250	352	99253	49802.5	4980250	-32217	32718	5238.02	523802	-124	127	2.82	282
-353	2	10343	99254	1.06006	298.06006	149.56006	14956.006	1.06006	298.06006	149.56005	14956.00587	1.06006	298.06006	149.56006	14956.00600	2020-01-01	2020-01-02	2020-01-01 00:05:53	2020-01-02 03:34:14	2020-01-01 00:05:53.000	2020-01-02 03:34:14.000	353	99254	49803.5	4980350	353	99254	49803.5	4980350	-32216	32719	5239.02	523902	-128	127	1.26	126
-354	2	10344	99255	1.06306	298.06306	149.56306	14956.3063	1.06306	298.06305	149.56306	14956.3062	1.06306	298.06306	149.56306	14956.30600	2020-01-01	2020-01-02	2020-01-01 00:05:54	2020-01-02 03:34:15	2020-01-01 00:05:54.000	2020-01-02 03:34:15.000	354	99255	49804.5	4980450	354	99255	49804.5	4980450	-32215	32720	5240.02	524002	-128	127	-0.3	-30
-355	2	10345	99256	1.06606	298.06606	149.56606	14956.6066	1.06606	298.06607	149.56606	14956.6068	1.06606	298.06606	149.56606	14956.60600	2020-01-01	2020-01-02	2020-01-01 00:05:55	2020-01-02 03:34:16	2020-01-01 00:05:55.000	2020-01-02 03:34:16.000	355	99256	49805.5	4980550	355	99256	49805.5	4980550	-32214	32721	5241.02	524102	-128	123	-1.86	-186
-356	2	10346	99257	1.06906	298.06906	149.56906	14956.9069	1.06906	298.06906	149.56907	14956.90709	1.06906	298.06906	149.56906	14956.90600	2020-01-01	2020-01-02	2020-01-01 00:05:56	2020-01-02 03:34:17	2020-01-01 00:05:56.000	2020-01-02 03:34:17.000	356	99257	49806.5	4980650	356	99257	49806.5	4980650	-32213	32722	5242.02	524202	-127	124	-0.86	-86
-357	2	10347	99258	1.07207	298.07207	149.57207	14957.2072	1.07207	298.07208	149.57207	14957.20721	1.07207	298.07207	149.57207	14957.20700	2020-01-01	2020-01-02	2020-01-01 00:05:57	2020-01-02 03:34:18	2020-01-01 00:05:57.000	2020-01-02 03:34:18.000	357	99258	49807.5	4980750	357	99258	49807.5	4980750	-32212	32723	5243.02	524302	-126	125	0.14	14
-358	2	10348	99259	1.07507	298.07507	149.57507	14957.5075	1.07507	298.07507	149.57507	14957.50734	1.07507	298.07507	149.57506999999998	14957.50700	2020-01-01	2020-01-02	2020-01-01 00:05:58	2020-01-02 03:34:19	2020-01-01 00:05:58.000	2020-01-02 03:34:19.000	358	99259	49808.5	4980850	358	99259	49808.5	4980850	-32211	32724	5244.02	524402	-125	126	1.14	114
-359	2	10349	99260	1.07807	298.07807	149.57807	14957.8078	1.07807	298.07806	149.57807	14957.80767	1.07807	298.07807	149.57807	14957.80700	2020-01-01	2020-01-02	2020-01-01 00:05:59	2020-01-02 03:34:20	2020-01-01 00:05:59.000	2020-01-02 03:34:20.000	359	99260	49809.5	4980950	359	99260	49809.5	4980950	-32210	32725	5245.02	524502	-124	127	2.14	214
-36	2	10026	99936	0.1081	300.1081	150.1081	15160.91891	0.1081	300.1081	150.1081	15160.91873	0.10810	300.10810	150.1081	15160.91810	2020-01-01	2020-01-02	2020-01-01 00:00:36	2020-01-02 03:45:36	2020-01-01 00:00:36.000	2020-01-02 03:45:36.000	36	99936	49986	5048586	36	99936	49986	5048586	-32533	32402	4565.009900990099	461066	-128	123	-2.4356435643564356	-246
-360	2	10350	99261	1.08108	298.08108	149.58108	14958.1081	1.08108	298.0811	149.58108	14958.10827	1.08108	298.08108	149.58108000000001	14958.10800	2020-01-01	2020-01-02	2020-01-01 00:06:00	2020-01-02 03:34:21	2020-01-01 00:06:00.000	2020-01-02 03:34:21.000	360	99261	49810.5	4981050	360	99261	49810.5	4981050	-32209	32726	5246.02	524602	-128	127	0.58	58
-361	2	10351	99262	1.08408	298.08408	149.58408	14958.4084	1.08408	298.08408	149.58408	14958.40856	1.08408	298.08408	149.58408	14958.40800	2020-01-01	2020-01-02	2020-01-01 00:06:01	2020-01-02 03:34:22	2020-01-01 00:06:01.000	2020-01-02 03:34:22.000	361	99262	49811.5	4981150	361	99262	49811.5	4981150	-32208	32727	5247.02	524702	-128	123	-0.98	-98
-362	2	10352	99263	1.08708	298.08708	149.58708	14958.7087	1.08708	298.0871	149.58708	14958.70868	1.08708	298.08708	149.58708000000001	14958.70800	2020-01-01	2020-01-02	2020-01-01 00:06:02	2020-01-02 03:34:23	2020-01-01 00:06:02.000	2020-01-02 03:34:23.000	362	99263	49812.5	4981250	362	99263	49812.5	4981250	-32207	32728	5248.02	524802	-127	124	0.02	2
-363	2	10353	99264	1.09009	298.09009	149.59009	14959.009	1.09009	298.0901	149.59008	14959.00884	1.09009	298.09009	149.59009	14959.00900	2020-01-01	2020-01-02	2020-01-01 00:06:03	2020-01-02 03:34:24	2020-01-01 00:06:03.000	2020-01-02 03:34:24.000	363	99264	49813.5	4981350	363	99264	49813.5	4981350	-32206	32729	5249.02	524902	-126	125	1.02	102
-364	2	10354	99265	1.09309	298.09309	149.59309	14959.3093	1.09309	298.09308	149.59309	14959.30915	1.09309	298.09309	149.59309	14959.30900	2020-01-01	2020-01-02	2020-01-01 00:06:04	2020-01-02 03:34:25	2020-01-01 00:06:04.000	2020-01-02 03:34:25.000	364	99265	49814.5	4981450	364	99265	49814.5	4981450	-32205	32730	5250.02	525002	-125	126	2.02	202
-365	2	10355	99266	1.09609	298.09609	149.59609	14959.6096	1.09609	298.0961	149.59609	14959.6099	1.09609	298.09609	149.59609	14959.60900	2020-01-01	2020-01-02	2020-01-01 00:06:05	2020-01-02 03:34:26	2020-01-01 00:06:05.000	2020-01-02 03:34:26.000	365	99266	49815.5	4981550	365	99266	49815.5	4981550	-32204	32731	5251.02	525102	-124	127	3.02	302
-366	2	10356	99267	1.09909	298.09909	149.59909	14959.9099	1.09909	298.0991	149.5991	14959.91003	1.09909	298.09909	149.59909	14959.90900	2020-01-01	2020-01-02	2020-01-01 00:06:06	2020-01-02 03:34:27	2020-01-01 00:06:06.000	2020-01-02 03:34:27.000	366	99267	49816.5	4981650	366	99267	49816.5	4981650	-32203	32732	5252.02	525202	-128	127	1.46	146
-367	2	10357	99268	1.1021	298.1021	149.6021	14960.21021	1.1021	298.1021	149.6021	14960.21015	1.10210	298.10210	149.60209999999998	14960.21000	2020-01-01	2020-01-02	2020-01-01 00:06:07	2020-01-02 03:34:28	2020-01-01 00:06:07.000	2020-01-02 03:34:28.000	367	99268	49817.5	4981750	367	99268	49817.5	4981750	-32202	32733	5253.02	525302	-128	123	-0.1	-10
-368	2	10358	99269	1.1051	298.1051	149.6051	14960.51051	1.1051	298.1051	149.6051	14960.51031	1.10510	298.10510	149.6051	14960.51000	2020-01-01	2020-01-02	2020-01-01 00:06:08	2020-01-02 03:34:29	2020-01-01 00:06:08.000	2020-01-02 03:34:29.000	368	99269	49818.5	4981850	368	99269	49818.5	4981850	-32201	32734	5254.02	525402	-127	124	0.9	90
-369	2	10359	99270	1.1081	298.1081	149.6081	14960.81081	1.1081	298.1081	149.6081	14960.81062	1.10810	298.10810	149.6081	14960.81000	2020-01-01	2020-01-02	2020-01-01 00:06:09	2020-01-02 03:34:30	2020-01-01 00:06:09.000	2020-01-02 03:34:30.000	369	99270	49819.5	4981950	369	99270	49819.5	4981950	-32200	32735	5255.02	525502	-126	125	1.9	190
+330	2	10320	99231	0.99099	297.99099	149.49099	14949.09909	0.99099	297.991	149.49099	14949.09941	0.99099	297.99099	149.49099	14949.099	2020-01-01	2020-01-02	2020-01-01 00:05:30	2020-01-02 03:33:51	2020-01-01 00:05:30.000	2020-01-02 03:33:51.000	330	99231	49780.5	4978050	330	99231	49780.5	4978050	-32239	32696	5216.02	521602	-128	123	-3.82	-382
+331	2	10321	99232	0.99399	297.99399	149.49399	14949.39939	0.99399	297.994	149.49399	14949.39911	0.99399	297.99399	149.49399	14949.399	2020-01-01	2020-01-02	2020-01-01 00:05:31	2020-01-02 03:33:52	2020-01-01 00:05:31.000	2020-01-02 03:33:52.000	331	99232	49781.5	4978150	331	99232	49781.5	4978150	-32238	32697	5217.02	521702	-127	124	-2.82	-282
+332	2	10322	99233	0.99699	297.99699	149.49699	14949.69969	0.99699	297.997	149.49699	14949.69969	0.99699	297.99699	149.49699	14949.699	2020-01-01	2020-01-02	2020-01-01 00:05:32	2020-01-02 03:33:53	2020-01-01 00:05:32.000	2020-01-02 03:33:53.000	332	99233	49782.5	4978250	332	99233	49782.5	4978250	-32237	32698	5218.02	521802	-126	125	-1.82	-182
+333	2	10323	99234	1	298	149.5	14950	1	298	149.5	14950	1	298	149.5	14950	2020-01-01	2020-01-02	2020-01-01 00:05:33	2020-01-02 03:33:54	2020-01-01 00:05:33.000	2020-01-02 03:33:54.000	333	99234	49783.5	4978350	333	99234	49783.5	4978350	-32236	32699	5219.02	521902	-125	126	-0.82	-82
+334	2	10324	99235	1.003	298.003	149.503	14950.3003	1.003	298.003	149.503	14950.30029	1.003	298.003	149.503	14950.3	2020-01-01	2020-01-02	2020-01-01 00:05:34	2020-01-02 03:33:55	2020-01-01 00:05:34.000	2020-01-02 03:33:55.000	334	99235	49784.5	4978450	334	99235	49784.5	4978450	-32235	32700	5220.02	522002	-124	127	0.18	18
+335	2	10325	99236	1.006	298.006	149.506	14950.6006	1.006	298.006	149.506	14950.60088	1.006	298.006	149.506	14950.6	2020-01-01	2020-01-02	2020-01-01 00:05:35	2020-01-02 03:33:56	2020-01-01 00:05:35.000	2020-01-02 03:33:56.000	335	99236	49785.5	4978550	335	99236	49785.5	4978550	-32234	32701	5221.02	522102	-128	127	-1.38	-138
+336	2	10326	99237	1.009	298.009	149.509	14950.9009	1.009	298.009	149.509	14950.90057	1.009	298.009	149.509	14950.9	2020-01-01	2020-01-02	2020-01-01 00:05:36	2020-01-02 03:33:57	2020-01-01 00:05:36.000	2020-01-02 03:33:57.000	336	99237	49786.5	4978650	336	99237	49786.5	4978650	-32233	32702	5222.02	522202	-128	123	-2.94	-294
+337	2	10327	99238	1.01201	298.01201	149.51201	14951.2012	1.01201	298.01202	149.51201	14951.20117	1.01201	298.01201	149.51201	14951.201	2020-01-01	2020-01-02	2020-01-01 00:05:37	2020-01-02 03:33:58	2020-01-01 00:05:37.000	2020-01-02 03:33:58.000	337	99238	49787.5	4978750	337	99238	49787.5	4978750	-32232	32703	5223.02	522302	-127	124	-1.94	-194
+338	2	10328	99239	1.01501	298.01501	149.51501	14951.5015	1.01501	298.015	149.51501	14951.50146	1.01501	298.01501	149.51501	14951.501	2020-01-01	2020-01-02	2020-01-01 00:05:38	2020-01-02 03:33:59	2020-01-01 00:05:38.000	2020-01-02 03:33:59.000	338	99239	49788.5	4978850	338	99239	49788.5	4978850	-32231	32704	5224.02	522402	-126	125	-0.94	-94
+339	2	10329	99240	1.01801	298.01801	149.51801	14951.8018	1.01801	298.018	149.51801	14951.80177	1.01801	298.01801	149.51801	14951.801	2020-01-01	2020-01-02	2020-01-01 00:05:39	2020-01-02 03:34:00	2020-01-01 00:05:39.000	2020-01-02 03:34:00.000	339	99240	49789.5	4978950	339	99240	49789.5	4978950	-32230	32705	5225.02	522502	-125	126	0.06	6
+34	2	10024	99934	0.1021	300.1021	150.1021	15160.31231	0.1021	300.1021	150.1021	15160.31224	0.1021	300.1021	150.10209999999998	15160.3121	2020-01-01	2020-01-02	2020-01-01 00:00:34	2020-01-02 03:45:34	2020-01-01 00:00:34.000	2020-01-02 03:45:34.000	34	99934	49984	5048384	34	99934	49984	5048384	-32535	32400	4563.009900990099	460864	-124	127	0.6336633663366337	64
+340	2	10330	99241	1.02102	298.02102	149.52102	14952.1021	1.02102	298.02103	149.52102	14952.10239	1.02102	298.02102	149.52102000000002	14952.102	2020-01-01	2020-01-02	2020-01-01 00:05:40	2020-01-02 03:34:01	2020-01-01 00:05:40.000	2020-01-02 03:34:01.000	340	99241	49790.5	4979050	340	99241	49790.5	4979050	-32229	32706	5226.02	522602	-124	127	1.06	106
+341	2	10331	99242	1.02402	298.02402	149.52402	14952.4024	1.02402	298.02402	149.52402	14952.40205	1.02402	298.02402	149.52402	14952.402	2020-01-01	2020-01-02	2020-01-01 00:05:41	2020-01-02 03:34:02	2020-01-01 00:05:41.000	2020-01-02 03:34:02.000	341	99242	49791.5	4979150	341	99242	49791.5	4979150	-32228	32707	5227.02	522702	-128	127	-0.5	-50
+342	2	10332	99243	1.02702	298.02702	149.52702	14952.7027	1.02702	298.02704	149.52702	14952.70264	1.02702	298.02702	149.52702	14952.702	2020-01-01	2020-01-02	2020-01-01 00:05:42	2020-01-02 03:34:03	2020-01-01 00:05:42.000	2020-01-02 03:34:03.000	342	99243	49792.5	4979250	342	99243	49792.5	4979250	-32227	32708	5228.02	522802	-128	123	-2.06	-206
+343	2	10333	99244	1.03003	298.03003	149.53003	14953.003	1.03003	298.03003	149.53002	14953.00293	1.03003	298.03003	149.53003	14953.003	2020-01-01	2020-01-02	2020-01-01 00:05:43	2020-01-02 03:34:04	2020-01-01 00:05:43.000	2020-01-02 03:34:04.000	343	99244	49793.5	4979350	343	99244	49793.5	4979350	-32226	32709	5229.02	522902	-127	124	-1.06	-106
+344	2	10334	99245	1.03303	298.03303	149.53303	14953.3033	1.03303	298.03302	149.53303	14953.30323	1.03303	298.03303	149.53303	14953.303	2020-01-01	2020-01-02	2020-01-01 00:05:44	2020-01-02 03:34:05	2020-01-01 00:05:44.000	2020-01-02 03:34:05.000	344	99245	49794.5	4979450	344	99245	49794.5	4979450	-32225	32710	5230.02	523002	-126	125	-0.06	-6
+345	2	10335	99246	1.03603	298.03603	149.53603	14953.6036	1.03603	298.03604	149.53603	14953.60386	1.03603	298.03603	149.53602999999998	14953.603	2020-01-01	2020-01-02	2020-01-01 00:05:45	2020-01-02 03:34:06	2020-01-01 00:05:45.000	2020-01-02 03:34:06.000	345	99246	49795.5	4979550	345	99246	49795.5	4979550	-32224	32711	5231.02	523102	-125	126	0.94	94
+346	2	10336	99247	1.03903	298.03903	149.53903	14953.9039	1.03903	298.03903	149.53903	14953.90352	1.03903	298.03903	149.53903	14953.903	2020-01-01	2020-01-02	2020-01-01 00:05:46	2020-01-02 03:34:07	2020-01-01 00:05:46.000	2020-01-02 03:34:07.000	346	99247	49796.5	4979650	346	99247	49796.5	4979650	-32223	32712	5232.02	523202	-124	127	1.94	194
+347	2	10337	99248	1.04204	298.04204	149.54204	14954.2042	1.04204	298.04205	149.54204	14954.20427	1.04204	298.04204	149.54204	14954.204	2020-01-01	2020-01-02	2020-01-01 00:05:47	2020-01-02 03:34:08	2020-01-01 00:05:47.000	2020-01-02 03:34:08.000	347	99248	49797.5	4979750	347	99248	49797.5	4979750	-32222	32713	5233.02	523302	-128	127	0.38	38
+348	2	10338	99249	1.04504	298.04504	149.54504	14954.5045	1.04504	298.04504	149.54504	14954.50441	1.04504	298.04504	149.54504	14954.504	2020-01-01	2020-01-02	2020-01-01 00:05:48	2020-01-02 03:34:09	2020-01-01 00:05:48.000	2020-01-02 03:34:09.000	348	99249	49798.5	4979850	348	99249	49798.5	4979850	-32221	32714	5234.02	523402	-128	123	-1.18	-118
+349	2	10339	99250	1.04804	298.04804	149.54804	14954.8048	1.04804	298.04803	149.54804	14954.80474	1.04804	298.04804	149.54804000000001	14954.804	2020-01-01	2020-01-02	2020-01-01 00:05:49	2020-01-02 03:34:10	2020-01-01 00:05:49.000	2020-01-02 03:34:10.000	349	99250	49799.5	4979950	349	99250	49799.5	4979950	-32220	32715	5235.02	523502	-127	124	-0.18	-18
+35	2	10025	99935	0.1051	300.1051	150.1051	15160.61561	0.1051	300.1051	150.1051	15160.61542	0.1051	300.1051	150.10510000000002	15160.6151	2020-01-01	2020-01-02	2020-01-01 00:00:35	2020-01-02 03:45:35	2020-01-01 00:00:35.000	2020-01-02 03:45:35.000	35	99935	49985	5048485	35	99935	49985	5048485	-32534	32401	4564.009900990099	460965	-128	127	-0.900990099009901	-91
+350	2	10340	99251	1.05105	298.05105	149.55105	14955.1051	1.05105	298.05106	149.55105	14955.10532	1.05105	298.05105	149.55105	14955.105	2020-01-01	2020-01-02	2020-01-01 00:05:50	2020-01-02 03:34:11	2020-01-01 00:05:50.000	2020-01-02 03:34:11.000	350	99251	49800.5	4980050	350	99251	49800.5	4980050	-32219	32716	5236.02	523602	-126	125	0.82	82
+351	2	10341	99252	1.05405	298.05405	149.55405	14955.4054	1.05405	298.05405	149.55404	14955.40499	1.05405	298.05405	149.55405000000002	14955.405	2020-01-01	2020-01-02	2020-01-01 00:05:51	2020-01-02 03:34:12	2020-01-01 00:05:51.000	2020-01-02 03:34:12.000	351	99252	49801.5	4980150	351	99252	49801.5	4980150	-32218	32717	5237.02	523702	-125	126	1.82	182
+352	2	10342	99253	1.05705	298.05705	149.55705	14955.7057	1.05705	298.05707	149.55705	14955.70574	1.05705	298.05705	149.55705	14955.705	2020-01-01	2020-01-02	2020-01-01 00:05:52	2020-01-02 03:34:13	2020-01-01 00:05:52.000	2020-01-02 03:34:13.000	352	99253	49802.5	4980250	352	99253	49802.5	4980250	-32217	32718	5238.02	523802	-124	127	2.82	282
+353	2	10343	99254	1.06006	298.06006	149.56006	14956.006	1.06006	298.06006	149.56005	14956.00587	1.06006	298.06006	149.56006	14956.006	2020-01-01	2020-01-02	2020-01-01 00:05:53	2020-01-02 03:34:14	2020-01-01 00:05:53.000	2020-01-02 03:34:14.000	353	99254	49803.5	4980350	353	99254	49803.5	4980350	-32216	32719	5239.02	523902	-128	127	1.26	126
+354	2	10344	99255	1.06306	298.06306	149.56306	14956.3063	1.06306	298.06305	149.56306	14956.3062	1.06306	298.06306	149.56306	14956.306	2020-01-01	2020-01-02	2020-01-01 00:05:54	2020-01-02 03:34:15	2020-01-01 00:05:54.000	2020-01-02 03:34:15.000	354	99255	49804.5	4980450	354	99255	49804.5	4980450	-32215	32720	5240.02	524002	-128	127	-0.3	-30
+355	2	10345	99256	1.06606	298.06606	149.56606	14956.6066	1.06606	298.06607	149.56606	14956.6068	1.06606	298.06606	149.56606	14956.606	2020-01-01	2020-01-02	2020-01-01 00:05:55	2020-01-02 03:34:16	2020-01-01 00:05:55.000	2020-01-02 03:34:16.000	355	99256	49805.5	4980550	355	99256	49805.5	4980550	-32214	32721	5241.02	524102	-128	123	-1.86	-186
+356	2	10346	99257	1.06906	298.06906	149.56906	14956.9069	1.06906	298.06906	149.56907	14956.90709	1.06906	298.06906	149.56906	14956.906	2020-01-01	2020-01-02	2020-01-01 00:05:56	2020-01-02 03:34:17	2020-01-01 00:05:56.000	2020-01-02 03:34:17.000	356	99257	49806.5	4980650	356	99257	49806.5	4980650	-32213	32722	5242.02	524202	-127	124	-0.86	-86
+357	2	10347	99258	1.07207	298.07207	149.57207	14957.2072	1.07207	298.07208	149.57207	14957.20721	1.07207	298.07207	149.57207	14957.207	2020-01-01	2020-01-02	2020-01-01 00:05:57	2020-01-02 03:34:18	2020-01-01 00:05:57.000	2020-01-02 03:34:18.000	357	99258	49807.5	4980750	357	99258	49807.5	4980750	-32212	32723	5243.02	524302	-126	125	0.14	14
+358	2	10348	99259	1.07507	298.07507	149.57507	14957.5075	1.07507	298.07507	149.57507	14957.50734	1.07507	298.07507	149.57506999999998	14957.507	2020-01-01	2020-01-02	2020-01-01 00:05:58	2020-01-02 03:34:19	2020-01-01 00:05:58.000	2020-01-02 03:34:19.000	358	99259	49808.5	4980850	358	99259	49808.5	4980850	-32211	32724	5244.02	524402	-125	126	1.14	114
+359	2	10349	99260	1.07807	298.07807	149.57807	14957.8078	1.07807	298.07806	149.57807	14957.80767	1.07807	298.07807	149.57807	14957.807	2020-01-01	2020-01-02	2020-01-01 00:05:59	2020-01-02 03:34:20	2020-01-01 00:05:59.000	2020-01-02 03:34:20.000	359	99260	49809.5	4980950	359	99260	49809.5	4980950	-32210	32725	5245.02	524502	-124	127	2.14	214
+36	2	10026	99936	0.1081	300.1081	150.1081	15160.91891	0.1081	300.1081	150.1081	15160.91873	0.1081	300.1081	150.1081	15160.9181	2020-01-01	2020-01-02	2020-01-01 00:00:36	2020-01-02 03:45:36	2020-01-01 00:00:36.000	2020-01-02 03:45:36.000	36	99936	49986	5048586	36	99936	49986	5048586	-32533	32402	4565.009900990099	461066	-128	123	-2.4356435643564356	-246
+360	2	10350	99261	1.08108	298.08108	149.58108	14958.1081	1.08108	298.0811	149.58108	14958.10827	1.08108	298.08108	149.58108000000001	14958.108	2020-01-01	2020-01-02	2020-01-01 00:06:00	2020-01-02 03:34:21	2020-01-01 00:06:00.000	2020-01-02 03:34:21.000	360	99261	49810.5	4981050	360	99261	49810.5	4981050	-32209	32726	5246.02	524602	-128	127	0.58	58
+361	2	10351	99262	1.08408	298.08408	149.58408	14958.4084	1.08408	298.08408	149.58408	14958.40856	1.08408	298.08408	149.58408	14958.408	2020-01-01	2020-01-02	2020-01-01 00:06:01	2020-01-02 03:34:22	2020-01-01 00:06:01.000	2020-01-02 03:34:22.000	361	99262	49811.5	4981150	361	99262	49811.5	4981150	-32208	32727	5247.02	524702	-128	123	-0.98	-98
+362	2	10352	99263	1.08708	298.08708	149.58708	14958.7087	1.08708	298.0871	149.58708	14958.70868	1.08708	298.08708	149.58708000000001	14958.708	2020-01-01	2020-01-02	2020-01-01 00:06:02	2020-01-02 03:34:23	2020-01-01 00:06:02.000	2020-01-02 03:34:23.000	362	99263	49812.5	4981250	362	99263	49812.5	4981250	-32207	32728	5248.02	524802	-127	124	0.02	2
+363	2	10353	99264	1.09009	298.09009	149.59009	14959.009	1.09009	298.0901	149.59008	14959.00884	1.09009	298.09009	149.59009	14959.009	2020-01-01	2020-01-02	2020-01-01 00:06:03	2020-01-02 03:34:24	2020-01-01 00:06:03.000	2020-01-02 03:34:24.000	363	99264	49813.5	4981350	363	99264	49813.5	4981350	-32206	32729	5249.02	524902	-126	125	1.02	102
+364	2	10354	99265	1.09309	298.09309	149.59309	14959.3093	1.09309	298.09308	149.59309	14959.30915	1.09309	298.09309	149.59309	14959.309	2020-01-01	2020-01-02	2020-01-01 00:06:04	2020-01-02 03:34:25	2020-01-01 00:06:04.000	2020-01-02 03:34:25.000	364	99265	49814.5	4981450	364	99265	49814.5	4981450	-32205	32730	5250.02	525002	-125	126	2.02	202
+365	2	10355	99266	1.09609	298.09609	149.59609	14959.6096	1.09609	298.0961	149.59609	14959.6099	1.09609	298.09609	149.59609	14959.609	2020-01-01	2020-01-02	2020-01-01 00:06:05	2020-01-02 03:34:26	2020-01-01 00:06:05.000	2020-01-02 03:34:26.000	365	99266	49815.5	4981550	365	99266	49815.5	4981550	-32204	32731	5251.02	525102	-124	127	3.02	302
+366	2	10356	99267	1.09909	298.09909	149.59909	14959.9099	1.09909	298.0991	149.5991	14959.91003	1.09909	298.09909	149.59909	14959.909	2020-01-01	2020-01-02	2020-01-01 00:06:06	2020-01-02 03:34:27	2020-01-01 00:06:06.000	2020-01-02 03:34:27.000	366	99267	49816.5	4981650	366	99267	49816.5	4981650	-32203	32732	5252.02	525202	-128	127	1.46	146
+367	2	10357	99268	1.1021	298.1021	149.6021	14960.21021	1.1021	298.1021	149.6021	14960.21015	1.1021	298.1021	149.60209999999998	14960.21	2020-01-01	2020-01-02	2020-01-01 00:06:07	2020-01-02 03:34:28	2020-01-01 00:06:07.000	2020-01-02 03:34:28.000	367	99268	49817.5	4981750	367	99268	49817.5	4981750	-32202	32733	5253.02	525302	-128	123	-0.1	-10
+368	2	10358	99269	1.1051	298.1051	149.6051	14960.51051	1.1051	298.1051	149.6051	14960.51031	1.1051	298.1051	149.6051	14960.51	2020-01-01	2020-01-02	2020-01-01 00:06:08	2020-01-02 03:34:29	2020-01-01 00:06:08.000	2020-01-02 03:34:29.000	368	99269	49818.5	4981850	368	99269	49818.5	4981850	-32201	32734	5254.02	525402	-127	124	0.9	90
+369	2	10359	99270	1.1081	298.1081	149.6081	14960.81081	1.1081	298.1081	149.6081	14960.81062	1.1081	298.1081	149.6081	14960.81	2020-01-01	2020-01-02	2020-01-01 00:06:09	2020-01-02 03:34:30	2020-01-01 00:06:09.000	2020-01-02 03:34:30.000	369	99270	49819.5	4981950	369	99270	49819.5	4981950	-32200	32735	5255.02	525502	-126	125	1.9	190
 37	2	10027	99937	0.11111	300.11111	150.11111	15161.22222	0.11111	300.1111	150.11111	15161.22248	0.11111	300.11111	150.11111	15161.22211	2020-01-01	2020-01-02	2020-01-01 00:00:37	2020-01-02 03:45:37	2020-01-01 00:00:37.000	2020-01-02 03:45:37.000	37	99937	49987	5048687	37	99937	49987	5048687	-32532	32403	4566.009900990099	461167	-127	124	-1.4356435643564356	-145
-370	2	10360	99271	1.11111	298.11111	149.61111	14961.11111	1.11111	298.1111	149.61111	14961.11137	1.11111	298.11111	149.61111	14961.11100	2020-01-01	2020-01-02	2020-01-01 00:06:10	2020-01-02 03:34:31	2020-01-01 00:06:10.000	2020-01-02 03:34:31.000	370	99271	49820.5	4982050	370	99271	49820.5	4982050	-32199	32736	5256.02	525602	-125	126	2.9	290
-371	2	10361	99272	1.11411	298.11411	149.61411	14961.41141	1.11411	298.1141	149.61411	14961.4115	1.11411	298.11411	149.61411	14961.41100	2020-01-01	2020-01-02	2020-01-01 00:06:11	2020-01-02 03:34:32	2020-01-01 00:06:11.000	2020-01-02 03:34:32.000	371	99272	49821.5	4982150	371	99272	49821.5	4982150	-32198	32737	5257.02	525702	-124	127	3.9	390
-372	2	10362	99273	1.11711	298.11711	149.61711	14961.71171	1.11711	298.11713	149.61711	14961.71165	1.11711	298.11711	149.61711	14961.71100	2020-01-01	2020-01-02	2020-01-01 00:06:12	2020-01-02 03:34:33	2020-01-01 00:06:12.000	2020-01-02 03:34:33.000	372	99273	49822.5	4982250	372	99273	49822.5	4982250	-32197	32738	5258.02	525802	-128	127	2.34	234
-373	2	10363	99274	1.12012	298.12012	149.62012	14962.01201	1.12012	298.12012	149.62011	14962.01179	1.12012	298.12012	149.62012000000001	14962.01200	2020-01-01	2020-01-02	2020-01-01 00:06:13	2020-01-02 03:34:34	2020-01-01 00:06:13.000	2020-01-02 03:34:34.000	373	99274	49823.5	4982350	373	99274	49823.5	4982350	-32196	32739	5259.02	525902	-128	123	0.78	78
-374	2	10364	99275	1.12312	298.12312	149.62312	14962.31231	1.12312	298.1231	149.62312	14962.31208	1.12312	298.12312	149.62312	14962.31200	2020-01-01	2020-01-02	2020-01-01 00:06:14	2020-01-02 03:34:35	2020-01-01 00:06:14.000	2020-01-02 03:34:35.000	374	99275	49824.5	4982450	374	99275	49824.5	4982450	-32195	32740	5260.02	526002	-127	124	1.78	178
-375	2	10365	99276	1.12612	298.12612	149.62612	14962.61261	1.12612	298.12613	149.62612	14962.61283	1.12612	298.12612	149.62612	14962.61200	2020-01-01	2020-01-02	2020-01-01 00:06:15	2020-01-02 03:34:36	2020-01-01 00:06:15.000	2020-01-02 03:34:36.000	375	99276	49825.5	4982550	375	99276	49825.5	4982550	-32194	32741	5261.02	526102	-126	125	2.78	278
-376	2	10366	99277	1.12912	298.12912	149.62912	14962.91291	1.12912	298.12912	149.62912	14962.91297	1.12912	298.12912	149.62912	14962.91200	2020-01-01	2020-01-02	2020-01-01 00:06:16	2020-01-02 03:34:37	2020-01-01 00:06:16.000	2020-01-02 03:34:37.000	376	99277	49826.5	4982650	376	99277	49826.5	4982650	-32193	32742	5262.02	526202	-125	126	3.78	378
-377	2	10367	99278	1.13213	298.13213	149.63213	14963.21321	1.13213	298.13214	149.63213	14963.21312	1.13213	298.13213	149.63213	14963.21300	2020-01-01	2020-01-02	2020-01-01 00:06:17	2020-01-02 03:34:38	2020-01-01 00:06:17.000	2020-01-02 03:34:38.000	377	99278	49827.5	4982750	377	99278	49827.5	4982750	-32192	32743	5263.02	526302	-124	127	4.78	478
-378	2	10368	99279	1.13513	298.13513	149.63513	14963.51351	1.13513	298.13513	149.63513	14963.51326	1.13513	298.13513	149.63513	14963.51300	2020-01-01	2020-01-02	2020-01-01 00:06:18	2020-01-02 03:34:39	2020-01-01 00:06:18.000	2020-01-02 03:34:39.000	378	99279	49828.5	4982850	378	99279	49828.5	4982850	-32191	32744	5264.02	526402	-128	127	3.22	322
-379	2	10369	99280	1.13813	298.13813	149.63813	14963.81381	1.13813	298.13815	149.63814	14963.81401	1.13813	298.13813	149.63813	14963.81300	2020-01-01	2020-01-02	2020-01-01 00:06:19	2020-01-02 03:34:40	2020-01-01 00:06:19.000	2020-01-02 03:34:40.000	379	99280	49829.5	4982950	379	99280	49829.5	4982950	-32190	32745	5265.02	526502	-128	127	1.66	166
+370	2	10360	99271	1.11111	298.11111	149.61111	14961.11111	1.11111	298.1111	149.61111	14961.11137	1.11111	298.11111	149.61111	14961.111	2020-01-01	2020-01-02	2020-01-01 00:06:10	2020-01-02 03:34:31	2020-01-01 00:06:10.000	2020-01-02 03:34:31.000	370	99271	49820.5	4982050	370	99271	49820.5	4982050	-32199	32736	5256.02	525602	-125	126	2.9	290
+371	2	10361	99272	1.11411	298.11411	149.61411	14961.41141	1.11411	298.1141	149.61411	14961.4115	1.11411	298.11411	149.61411	14961.411	2020-01-01	2020-01-02	2020-01-01 00:06:11	2020-01-02 03:34:32	2020-01-01 00:06:11.000	2020-01-02 03:34:32.000	371	99272	49821.5	4982150	371	99272	49821.5	4982150	-32198	32737	5257.02	525702	-124	127	3.9	390
+372	2	10362	99273	1.11711	298.11711	149.61711	14961.71171	1.11711	298.11713	149.61711	14961.71165	1.11711	298.11711	149.61711	14961.711	2020-01-01	2020-01-02	2020-01-01 00:06:12	2020-01-02 03:34:33	2020-01-01 00:06:12.000	2020-01-02 03:34:33.000	372	99273	49822.5	4982250	372	99273	49822.5	4982250	-32197	32738	5258.02	525802	-128	127	2.34	234
+373	2	10363	99274	1.12012	298.12012	149.62012	14962.01201	1.12012	298.12012	149.62011	14962.01179	1.12012	298.12012	149.62012000000001	14962.012	2020-01-01	2020-01-02	2020-01-01 00:06:13	2020-01-02 03:34:34	2020-01-01 00:06:13.000	2020-01-02 03:34:34.000	373	99274	49823.5	4982350	373	99274	49823.5	4982350	-32196	32739	5259.02	525902	-128	123	0.78	78
+374	2	10364	99275	1.12312	298.12312	149.62312	14962.31231	1.12312	298.1231	149.62312	14962.31208	1.12312	298.12312	149.62312	14962.312	2020-01-01	2020-01-02	2020-01-01 00:06:14	2020-01-02 03:34:35	2020-01-01 00:06:14.000	2020-01-02 03:34:35.000	374	99275	49824.5	4982450	374	99275	49824.5	4982450	-32195	32740	5260.02	526002	-127	124	1.78	178
+375	2	10365	99276	1.12612	298.12612	149.62612	14962.61261	1.12612	298.12613	149.62612	14962.61283	1.12612	298.12612	149.62612	14962.612	2020-01-01	2020-01-02	2020-01-01 00:06:15	2020-01-02 03:34:36	2020-01-01 00:06:15.000	2020-01-02 03:34:36.000	375	99276	49825.5	4982550	375	99276	49825.5	4982550	-32194	32741	5261.02	526102	-126	125	2.78	278
+376	2	10366	99277	1.12912	298.12912	149.62912	14962.91291	1.12912	298.12912	149.62912	14962.91297	1.12912	298.12912	149.62912	14962.912	2020-01-01	2020-01-02	2020-01-01 00:06:16	2020-01-02 03:34:37	2020-01-01 00:06:16.000	2020-01-02 03:34:37.000	376	99277	49826.5	4982650	376	99277	49826.5	4982650	-32193	32742	5262.02	526202	-125	126	3.78	378
+377	2	10367	99278	1.13213	298.13213	149.63213	14963.21321	1.13213	298.13214	149.63213	14963.21312	1.13213	298.13213	149.63213	14963.213	2020-01-01	2020-01-02	2020-01-01 00:06:17	2020-01-02 03:34:38	2020-01-01 00:06:17.000	2020-01-02 03:34:38.000	377	99278	49827.5	4982750	377	99278	49827.5	4982750	-32192	32743	5263.02	526302	-124	127	4.78	478
+378	2	10368	99279	1.13513	298.13513	149.63513	14963.51351	1.13513	298.13513	149.63513	14963.51326	1.13513	298.13513	149.63513	14963.513	2020-01-01	2020-01-02	2020-01-01 00:06:18	2020-01-02 03:34:39	2020-01-01 00:06:18.000	2020-01-02 03:34:39.000	378	99279	49828.5	4982850	378	99279	49828.5	4982850	-32191	32744	5264.02	526402	-128	127	3.22	322
+379	2	10369	99280	1.13813	298.13813	149.63813	14963.81381	1.13813	298.13815	149.63814	14963.81401	1.13813	298.13813	149.63813	14963.813	2020-01-01	2020-01-02	2020-01-01 00:06:19	2020-01-02 03:34:40	2020-01-01 00:06:19.000	2020-01-02 03:34:40.000	379	99280	49829.5	4982950	379	99280	49829.5	4982950	-32190	32745	5265.02	526502	-128	127	1.66	166
 38	2	10028	99938	0.11411	300.11411	150.11411	15161.52552	0.11411	300.1141	150.11411	15161.52562	0.11411	300.11411	150.11411	15161.52511	2020-01-01	2020-01-02	2020-01-01 00:00:38	2020-01-02 03:45:38	2020-01-01 00:00:38.000	2020-01-02 03:45:38.000	38	99938	49988	5048788	38	99938	49988	5048788	-32531	32404	4567.009900990099	461268	-126	125	-0.43564356435643564	-44
-380	2	10370	99281	1.14114	298.14114	149.64114	14964.11411	1.14114	298.14114	149.64114	14964.11431	1.14114	298.14114	149.64114	14964.11400	2020-01-01	2020-01-02	2020-01-01 00:06:20	2020-01-02 03:34:41	2020-01-01 00:06:20.000	2020-01-02 03:34:41.000	380	99281	49830.5	4983050	380	99281	49830.5	4983050	-32189	32746	5266.02	526602	-128	124	0.1	10
-381	2	10371	99282	1.14414	298.14414	149.64414	14964.41441	1.14414	298.14413	149.64414	14964.41448	1.14414	298.14414	149.64414	14964.41400	2020-01-01	2020-01-02	2020-01-01 00:06:21	2020-01-02 03:34:42	2020-01-01 00:06:21.000	2020-01-02 03:34:42.000	381	99282	49831.5	4983150	381	99282	49831.5	4983150	-32188	32747	5267.02	526702	-127	125	1.1	110
-382	2	10372	99283	1.14714	298.14714	149.64714	14964.71471	1.14714	298.14716	149.64714	14964.71459	1.14714	298.14714	149.64714	14964.71400	2020-01-01	2020-01-02	2020-01-01 00:06:22	2020-01-02 03:34:43	2020-01-01 00:06:22.000	2020-01-02 03:34:43.000	382	99283	49832.5	4983250	382	99283	49832.5	4983250	-32187	32748	5268.02	526802	-126	126	2.1	210
-383	2	10373	99284	1.15015	298.15015	149.65015	14965.01501	1.15015	298.15015	149.65014	14965.01472	1.15015	298.15015	149.65015	14965.01500	2020-01-01	2020-01-02	2020-01-01 00:06:23	2020-01-02 03:34:44	2020-01-01 00:06:23.000	2020-01-02 03:34:44.000	383	99284	49833.5	4983350	383	99284	49833.5	4983350	-32186	32749	5269.02	526902	-125	127	3.1	310
-384	2	10374	99285	1.15315	298.15315	149.65315	14965.31531	1.15315	298.15317	149.65315	14965.31547	1.15315	298.15315	149.65315	14965.31500	2020-01-01	2020-01-02	2020-01-01 00:06:24	2020-01-02 03:34:45	2020-01-01 00:06:24.000	2020-01-02 03:34:45.000	384	99285	49834.5	4983450	384	99285	49834.5	4983450	-32185	32750	5270.02	527002	-128	127	1.54	154
-385	2	10375	99286	1.15615	298.15615	149.65615	14965.61561	1.15615	298.15616	149.65615	14965.61578	1.15615	298.15615	149.65615	14965.61500	2020-01-01	2020-01-02	2020-01-01 00:06:25	2020-01-02 03:34:46	2020-01-01 00:06:25.000	2020-01-02 03:34:46.000	385	99286	49835.5	4983550	385	99286	49835.5	4983550	-32184	32751	5271.02	527102	-128	127	-0.02	-2
-386	2	10376	99287	1.15915	298.15915	149.65915	14965.91591	1.15915	298.15915	149.65915	14965.91594	1.15915	298.15915	149.65915	14965.91500	2020-01-01	2020-01-02	2020-01-01 00:06:26	2020-01-02 03:34:47	2020-01-01 00:06:26.000	2020-01-02 03:34:47.000	386	99287	49836.5	4983650	386	99287	49836.5	4983650	-32183	32752	5272.02	527202	-128	123	-1.58	-158
-387	2	10377	99288	1.16216	298.16216	149.66216	14966.21621	1.16216	298.16217	149.66216	14966.21606	1.16216	298.16216	149.66216	14966.21600	2020-01-01	2020-01-02	2020-01-01 00:06:27	2020-01-02 03:34:48	2020-01-01 00:06:27.000	2020-01-02 03:34:48.000	387	99288	49837.5	4983750	387	99288	49837.5	4983750	-32182	32753	5273.02	527302	-127	124	-0.58	-58
-388	2	10378	99289	1.16516	298.16516	149.66516	14966.51651	1.16516	298.16516	149.66516	14966.51636	1.16516	298.16516	149.66516	14966.51600	2020-01-01	2020-01-02	2020-01-01 00:06:28	2020-01-02 03:34:49	2020-01-01 00:06:28.000	2020-01-02 03:34:49.000	388	99289	49838.5	4983850	388	99289	49838.5	4983850	-32181	32754	5274.02	527402	-126	125	0.42	42
-389	2	10379	99290	1.16816	298.16816	149.66816	14966.81681	1.16816	298.16818	149.66816	14966.81695	1.16816	298.16816	149.66816	14966.81600	2020-01-01	2020-01-02	2020-01-01 00:06:29	2020-01-02 03:34:50	2020-01-01 00:06:29.000	2020-01-02 03:34:50.000	389	99290	49839.5	4983950	389	99290	49839.5	4983950	-32180	32755	5275.02	527502	-125	126	1.42	142
+380	2	10370	99281	1.14114	298.14114	149.64114	14964.11411	1.14114	298.14114	149.64114	14964.11431	1.14114	298.14114	149.64114	14964.114	2020-01-01	2020-01-02	2020-01-01 00:06:20	2020-01-02 03:34:41	2020-01-01 00:06:20.000	2020-01-02 03:34:41.000	380	99281	49830.5	4983050	380	99281	49830.5	4983050	-32189	32746	5266.02	526602	-128	124	0.1	10
+381	2	10371	99282	1.14414	298.14414	149.64414	14964.41441	1.14414	298.14413	149.64414	14964.41448	1.14414	298.14414	149.64414	14964.414	2020-01-01	2020-01-02	2020-01-01 00:06:21	2020-01-02 03:34:42	2020-01-01 00:06:21.000	2020-01-02 03:34:42.000	381	99282	49831.5	4983150	381	99282	49831.5	4983150	-32188	32747	5267.02	526702	-127	125	1.1	110
+382	2	10372	99283	1.14714	298.14714	149.64714	14964.71471	1.14714	298.14716	149.64714	14964.71459	1.14714	298.14714	149.64714	14964.714	2020-01-01	2020-01-02	2020-01-01 00:06:22	2020-01-02 03:34:43	2020-01-01 00:06:22.000	2020-01-02 03:34:43.000	382	99283	49832.5	4983250	382	99283	49832.5	4983250	-32187	32748	5268.02	526802	-126	126	2.1	210
+383	2	10373	99284	1.15015	298.15015	149.65015	14965.01501	1.15015	298.15015	149.65014	14965.01472	1.15015	298.15015	149.65015	14965.015	2020-01-01	2020-01-02	2020-01-01 00:06:23	2020-01-02 03:34:44	2020-01-01 00:06:23.000	2020-01-02 03:34:44.000	383	99284	49833.5	4983350	383	99284	49833.5	4983350	-32186	32749	5269.02	526902	-125	127	3.1	310
+384	2	10374	99285	1.15315	298.15315	149.65315	14965.31531	1.15315	298.15317	149.65315	14965.31547	1.15315	298.15315	149.65315	14965.315	2020-01-01	2020-01-02	2020-01-01 00:06:24	2020-01-02 03:34:45	2020-01-01 00:06:24.000	2020-01-02 03:34:45.000	384	99285	49834.5	4983450	384	99285	49834.5	4983450	-32185	32750	5270.02	527002	-128	127	1.54	154
+385	2	10375	99286	1.15615	298.15615	149.65615	14965.61561	1.15615	298.15616	149.65615	14965.61578	1.15615	298.15615	149.65615	14965.615	2020-01-01	2020-01-02	2020-01-01 00:06:25	2020-01-02 03:34:46	2020-01-01 00:06:25.000	2020-01-02 03:34:46.000	385	99286	49835.5	4983550	385	99286	49835.5	4983550	-32184	32751	5271.02	527102	-128	127	-0.02	-2
+386	2	10376	99287	1.15915	298.15915	149.65915	14965.91591	1.15915	298.15915	149.65915	14965.91594	1.15915	298.15915	149.65915	14965.915	2020-01-01	2020-01-02	2020-01-01 00:06:26	2020-01-02 03:34:47	2020-01-01 00:06:26.000	2020-01-02 03:34:47.000	386	99287	49836.5	4983650	386	99287	49836.5	4983650	-32183	32752	5272.02	527202	-128	123	-1.58	-158
+387	2	10377	99288	1.16216	298.16216	149.66216	14966.21621	1.16216	298.16217	149.66216	14966.21606	1.16216	298.16216	149.66216	14966.216	2020-01-01	2020-01-02	2020-01-01 00:06:27	2020-01-02 03:34:48	2020-01-01 00:06:27.000	2020-01-02 03:34:48.000	387	99288	49837.5	4983750	387	99288	49837.5	4983750	-32182	32753	5273.02	527302	-127	124	-0.58	-58
+388	2	10378	99289	1.16516	298.16516	149.66516	14966.51651	1.16516	298.16516	149.66516	14966.51636	1.16516	298.16516	149.66516	14966.516	2020-01-01	2020-01-02	2020-01-01 00:06:28	2020-01-02 03:34:49	2020-01-01 00:06:28.000	2020-01-02 03:34:49.000	388	99289	49838.5	4983850	388	99289	49838.5	4983850	-32181	32754	5274.02	527402	-126	125	0.42	42
+389	2	10379	99290	1.16816	298.16816	149.66816	14966.81681	1.16816	298.16818	149.66816	14966.81695	1.16816	298.16816	149.66816	14966.816	2020-01-01	2020-01-02	2020-01-01 00:06:29	2020-01-02 03:34:50	2020-01-01 00:06:29.000	2020-01-02 03:34:50.000	389	99290	49839.5	4983950	389	99290	49839.5	4983950	-32180	32755	5275.02	527502	-125	126	1.42	142
 39	2	10029	99939	0.11711	300.11711	150.11711	15161.82882	0.11711	300.11713	150.11711	15161.82876	0.11711	300.11711	150.11711	15161.82811	2020-01-01	2020-01-02	2020-01-01 00:00:39	2020-01-02 03:45:39	2020-01-01 00:00:39.000	2020-01-02 03:45:39.000	39	99939	49989	5048889	39	99939	49989	5048889	-32530	32405	4568.009900990099	461369	-125	126	0.5643564356435643	57
-390	2	10380	99291	1.17117	298.17117	149.67117	14967.11711	1.17117	298.17117	149.67117	14967.11725	1.17117	298.17117	149.67117	14967.11700	2020-01-01	2020-01-02	2020-01-01 00:06:30	2020-01-02 03:34:51	2020-01-01 00:06:30.000	2020-01-02 03:34:51.000	390	99291	49840.5	4984050	390	99291	49840.5	4984050	-32179	32756	5276.02	527602	-124	127	2.42	242
-391	2	10381	99292	1.17417	298.17417	149.67417	14967.41741	1.17417	298.17416	149.67417	14967.41741	1.17417	298.17417	149.67417	14967.41700	2020-01-01	2020-01-02	2020-01-01 00:06:31	2020-01-02 03:34:52	2020-01-01 00:06:31.000	2020-01-02 03:34:52.000	391	99292	49841.5	4984150	391	99292	49841.5	4984150	-32178	32757	5277.02	527702	-128	127	0.86	86
-392	2	10382	99293	1.17717	298.17717	149.67717	14967.71771	1.17717	298.1772	149.67717	14967.71753	1.17717	298.17717	149.67717000000002	14967.71700	2020-01-01	2020-01-02	2020-01-01 00:06:32	2020-01-02 03:34:53	2020-01-01 00:06:32.000	2020-01-02 03:34:53.000	392	99293	49842.5	4984250	392	99293	49842.5	4984250	-32177	32758	5278.02	527802	-128	123	-0.7	-70
-393	2	10383	99294	1.18018	298.18018	149.68018	14968.01801	1.18018	298.18018	149.68017	14968.01782	1.18018	298.18018	149.68018	14968.01800	2020-01-01	2020-01-02	2020-01-01 00:06:33	2020-01-02 03:34:54	2020-01-01 00:06:33.000	2020-01-02 03:34:54.000	393	99294	49843.5	4984350	393	99294	49843.5	4984350	-32176	32759	5279.02	527902	-127	124	0.3	30
-394	2	10384	99295	1.18318	298.18318	149.68318	14968.31831	1.18318	298.1832	149.68318	14968.31842	1.18318	298.18318	149.68318	14968.31800	2020-01-01	2020-01-02	2020-01-01 00:06:34	2020-01-02 03:34:55	2020-01-01 00:06:34.000	2020-01-02 03:34:55.000	394	99295	49844.5	4984450	394	99295	49844.5	4984450	-32175	32760	5280.02	528002	-126	125	1.3	130
-395	2	10385	99296	1.18618	298.18618	149.68618	14968.61861	1.18618	298.1862	149.68618	14968.61875	1.18618	298.18618	149.68618	14968.61800	2020-01-01	2020-01-02	2020-01-01 00:06:35	2020-01-02 03:34:56	2020-01-01 00:06:35.000	2020-01-02 03:34:56.000	395	99296	49845.5	4984550	395	99296	49845.5	4984550	-32174	32761	5281.02	528102	-125	126	2.3	230
-396	2	10386	99297	1.18918	298.18918	149.68918	14968.91891	1.18918	298.18918	149.68918	14968.91889	1.18918	298.18918	149.68918	14968.91800	2020-01-01	2020-01-02	2020-01-01 00:06:36	2020-01-02 03:34:57	2020-01-01 00:06:36.000	2020-01-02 03:34:57.000	396	99297	49846.5	4984650	396	99297	49846.5	4984650	-32173	32762	5282.02	528202	-124	127	3.3	330
-397	2	10387	99298	1.19219	298.19219	149.69219	14969.21921	1.19219	298.1922	149.69219	14969.21964	1.19219	298.19219	149.69218999999998	14969.21900	2020-01-01	2020-01-02	2020-01-01 00:06:37	2020-01-02 03:34:58	2020-01-01 00:06:37.000	2020-01-02 03:34:58.000	397	99298	49847.5	4984750	397	99298	49847.5	4984750	-32172	32763	5283.02	528302	-128	127	1.74	174
-398	2	10388	99299	1.19519	298.19519	149.69519	14969.51951	1.19519	298.1952	149.69519	14969.51929	1.19519	298.19519	149.69519	14969.51900	2020-01-01	2020-01-02	2020-01-01 00:06:38	2020-01-02 03:34:59	2020-01-01 00:06:38.000	2020-01-02 03:34:59.000	398	99299	49848.5	4984850	398	99299	49848.5	4984850	-32171	32764	5284.02	528402	-128	123	0.18	18
-399	2	10389	99300	1.19819	298.19819	149.69819	14969.81981	1.19819	298.1982	149.69819	14969.81989	1.19819	298.19819	149.69818999999998	14969.81900	2020-01-01	2020-01-02	2020-01-01 00:06:39	2020-01-02 03:35:00	2020-01-01 00:06:39.000	2020-01-02 03:35:00.000	399	99300	49849.5	4984950	399	99300	49849.5	4984950	-32170	32765	5285.02	528502	-127	124	1.18	118
+390	2	10380	99291	1.17117	298.17117	149.67117	14967.11711	1.17117	298.17117	149.67117	14967.11725	1.17117	298.17117	149.67117	14967.117	2020-01-01	2020-01-02	2020-01-01 00:06:30	2020-01-02 03:34:51	2020-01-01 00:06:30.000	2020-01-02 03:34:51.000	390	99291	49840.5	4984050	390	99291	49840.5	4984050	-32179	32756	5276.02	527602	-124	127	2.42	242
+391	2	10381	99292	1.17417	298.17417	149.67417	14967.41741	1.17417	298.17416	149.67417	14967.41741	1.17417	298.17417	149.67417	14967.417	2020-01-01	2020-01-02	2020-01-01 00:06:31	2020-01-02 03:34:52	2020-01-01 00:06:31.000	2020-01-02 03:34:52.000	391	99292	49841.5	4984150	391	99292	49841.5	4984150	-32178	32757	5277.02	527702	-128	127	0.86	86
+392	2	10382	99293	1.17717	298.17717	149.67717	14967.71771	1.17717	298.1772	149.67717	14967.71753	1.17717	298.17717	149.67717000000002	14967.717	2020-01-01	2020-01-02	2020-01-01 00:06:32	2020-01-02 03:34:53	2020-01-01 00:06:32.000	2020-01-02 03:34:53.000	392	99293	49842.5	4984250	392	99293	49842.5	4984250	-32177	32758	5278.02	527802	-128	123	-0.7	-70
+393	2	10383	99294	1.18018	298.18018	149.68018	14968.01801	1.18018	298.18018	149.68017	14968.01782	1.18018	298.18018	149.68018	14968.018	2020-01-01	2020-01-02	2020-01-01 00:06:33	2020-01-02 03:34:54	2020-01-01 00:06:33.000	2020-01-02 03:34:54.000	393	99294	49843.5	4984350	393	99294	49843.5	4984350	-32176	32759	5279.02	527902	-127	124	0.3	30
+394	2	10384	99295	1.18318	298.18318	149.68318	14968.31831	1.18318	298.1832	149.68318	14968.31842	1.18318	298.18318	149.68318	14968.318	2020-01-01	2020-01-02	2020-01-01 00:06:34	2020-01-02 03:34:55	2020-01-01 00:06:34.000	2020-01-02 03:34:55.000	394	99295	49844.5	4984450	394	99295	49844.5	4984450	-32175	32760	5280.02	528002	-126	125	1.3	130
+395	2	10385	99296	1.18618	298.18618	149.68618	14968.61861	1.18618	298.1862	149.68618	14968.61875	1.18618	298.18618	149.68618	14968.618	2020-01-01	2020-01-02	2020-01-01 00:06:35	2020-01-02 03:34:56	2020-01-01 00:06:35.000	2020-01-02 03:34:56.000	395	99296	49845.5	4984550	395	99296	49845.5	4984550	-32174	32761	5281.02	528102	-125	126	2.3	230
+396	2	10386	99297	1.18918	298.18918	149.68918	14968.91891	1.18918	298.18918	149.68918	14968.91889	1.18918	298.18918	149.68918	14968.918	2020-01-01	2020-01-02	2020-01-01 00:06:36	2020-01-02 03:34:57	2020-01-01 00:06:36.000	2020-01-02 03:34:57.000	396	99297	49846.5	4984650	396	99297	49846.5	4984650	-32173	32762	5282.02	528202	-124	127	3.3	330
+397	2	10387	99298	1.19219	298.19219	149.69219	14969.21921	1.19219	298.1922	149.69219	14969.21964	1.19219	298.19219	149.69218999999998	14969.219	2020-01-01	2020-01-02	2020-01-01 00:06:37	2020-01-02 03:34:58	2020-01-01 00:06:37.000	2020-01-02 03:34:58.000	397	99298	49847.5	4984750	397	99298	49847.5	4984750	-32172	32763	5283.02	528302	-128	127	1.74	174
+398	2	10388	99299	1.19519	298.19519	149.69519	14969.51951	1.19519	298.1952	149.69519	14969.51929	1.19519	298.19519	149.69519	14969.519	2020-01-01	2020-01-02	2020-01-01 00:06:38	2020-01-02 03:34:59	2020-01-01 00:06:38.000	2020-01-02 03:34:59.000	398	99299	49848.5	4984850	398	99299	49848.5	4984850	-32171	32764	5284.02	528402	-128	123	0.18	18
+399	2	10389	99300	1.19819	298.19819	149.69819	14969.81981	1.19819	298.1982	149.69819	14969.81989	1.19819	298.19819	149.69818999999998	14969.819	2020-01-01	2020-01-02	2020-01-01 00:06:39	2020-01-02 03:35:00	2020-01-01 00:06:39.000	2020-01-02 03:35:00.000	399	99300	49849.5	4984950	399	99300	49849.5	4984950	-32170	32765	5285.02	528502	-127	124	1.18	118
 4	2	1003	9994	0.01201	300.01201	150.01201	15151.21321	0.01201	300.01202	150.01201	15151.21318	0.01201	300.01201	150.01201	15151.21301	2020-01-01	2020-01-02	2020-01-01 00:00:04	2020-01-02 03:45:04	2020-01-01 00:00:04.000	2020-01-02 03:45:04.000	4	99904	49954	5045354	4	99904	49954	5045354	-32565	32370	4533.009900990099	457834	-128	127	-1.4851485148514851	-150
 40	2	10030	99940	0.12012	300.12012	150.12012	15162.13213	0.12012	300.12012	150.12011	15162.13191	0.12012	300.12012	150.12012000000001	15162.13212	2020-01-01	2020-01-02	2020-01-01 00:00:40	2020-01-02 03:45:40	2020-01-01 00:00:40.000	2020-01-02 03:45:40.000	40	99940	49990	5048990	40	99940	49990	5048990	-32529	32406	4569.009900990099	461470	-124	127	1.5643564356435644	158
-400	2	10390	99301	1.2012	298.2012	149.7012	14970.12012	1.2012	298.2012	149.7012	14970.12022	1.20120	298.20120	149.7012	14970.12000	2020-01-01	2020-01-02	2020-01-01 00:06:40	2020-01-02 03:35:01	2020-01-01 00:06:40.000	2020-01-02 03:35:01.000	400	99301	49850.5	4985050	400	99301	49850.5	4985050	-32169	32766	5286.02	528602	-126	125	2.18	218
-401	2	10391	99302	1.2042	298.2042	149.7042	14970.42042	1.2042	298.2042	149.7042	14970.42035	1.20420	298.20420	149.70420000000001	14970.42000	2020-01-01	2020-01-02	2020-01-01 00:06:41	2020-01-02 03:35:02	2020-01-01 00:06:41.000	2020-01-02 03:35:02.000	401	99302	49851.5	4985150	401	99302	49851.5	4985150	-32168	32767	5287.02	528702	-125	126	3.18	318
-402	2	10392	99303	1.2072	298.2072	149.7072	14970.72072	1.2072	298.2072	149.70721	14970.72111	1.20720	298.20720	149.7072	14970.72000	2020-01-01	2020-01-02	2020-01-01 00:06:42	2020-01-02 03:35:03	2020-01-01 00:06:42.000	2020-01-02 03:35:03.000	402	99303	49852.5	4985250	402	99303	49852.5	4985250	-32768	32370	4632.66	463266	-124	127	4.18	418
-403	2	10393	99304	1.21021	298.21021	149.71021	14971.02102	1.21021	298.2102	149.7102	14971.02077	1.21021	298.21021	149.71021000000002	14971.02100	2020-01-01	2020-01-02	2020-01-01 00:06:43	2020-01-02 03:35:04	2020-01-01 00:06:43.000	2020-01-02 03:35:04.000	403	99304	49853.5	4985350	403	99304	49853.5	4985350	-32767	32371	4633.66	463366	-128	127	2.62	262
-404	2	10394	99305	1.21321	298.21321	149.71321	14971.32132	1.21321	298.21323	149.71321	14971.32139	1.21321	298.21321	149.71321	14971.32100	2020-01-01	2020-01-02	2020-01-01 00:06:44	2020-01-02 03:35:05	2020-01-01 00:06:44.000	2020-01-02 03:35:05.000	404	99305	49854.5	4985450	404	99305	49854.5	4985450	-32766	32372	4634.66	463466	-128	127	1.06	106
-405	2	10395	99306	1.21621	298.21621	149.71621	14971.62162	1.21621	298.21622	149.71621	14971.62169	1.21621	298.21621	149.71621	14971.62100	2020-01-01	2020-01-02	2020-01-01 00:06:45	2020-01-02 03:35:06	2020-01-01 00:06:45.000	2020-01-02 03:35:06.000	405	99306	49855.5	4985550	405	99306	49855.5	4985550	-32765	32373	4635.66	463566	-128	124	-0.5	-50
-406	2	10396	99307	1.21921	298.21921	149.71921	14971.92192	1.21921	298.2192	149.71921	14971.92199	1.21921	298.21921	149.71921	14971.92100	2020-01-01	2020-01-02	2020-01-01 00:06:46	2020-01-02 03:35:07	2020-01-01 00:06:46.000	2020-01-02 03:35:07.000	406	99307	49856.5	4985650	406	99307	49856.5	4985650	-32764	32374	4636.66	463666	-127	125	0.5	50
-407	2	10397	99308	1.22222	298.22222	149.72222	14972.22222	1.22222	298.22223	149.72222	14972.22257	1.22222	298.22222	149.72222	14972.22200	2020-01-01	2020-01-02	2020-01-01 00:06:47	2020-01-02 03:35:08	2020-01-01 00:06:47.000	2020-01-02 03:35:08.000	407	99308	49857.5	4985750	407	99308	49857.5	4985750	-32763	32375	4637.66	463766	-126	126	1.5	150
-408	2	10398	99309	1.22522	298.22522	149.72522	14972.52252	1.22522	298.22522	149.72522	14972.52224	1.22522	298.22522	149.72522	14972.52200	2020-01-01	2020-01-02	2020-01-01 00:06:48	2020-01-02 03:35:09	2020-01-01 00:06:48.000	2020-01-02 03:35:09.000	408	99309	49858.5	4985850	408	99309	49858.5	4985850	-32762	32376	4638.66	463866	-125	127	2.5	250
-409	2	10399	99310	1.22822	298.22822	149.72822	14972.82282	1.22822	298.22824	149.72822	14972.82286	1.22822	298.22822	149.72822	14972.82200	2020-01-01	2020-01-02	2020-01-01 00:06:49	2020-01-02 03:35:10	2020-01-01 00:06:49.000	2020-01-02 03:35:10.000	409	99310	49859.5	4985950	409	99310	49859.5	4985950	-32761	32377	4639.66	463966	-128	127	0.94	94
+400	2	10390	99301	1.2012	298.2012	149.7012	14970.12012	1.2012	298.2012	149.7012	14970.12022	1.2012	298.2012	149.7012	14970.12	2020-01-01	2020-01-02	2020-01-01 00:06:40	2020-01-02 03:35:01	2020-01-01 00:06:40.000	2020-01-02 03:35:01.000	400	99301	49850.5	4985050	400	99301	49850.5	4985050	-32169	32766	5286.02	528602	-126	125	2.18	218
+401	2	10391	99302	1.2042	298.2042	149.7042	14970.42042	1.2042	298.2042	149.7042	14970.42035	1.2042	298.2042	149.70420000000001	14970.42	2020-01-01	2020-01-02	2020-01-01 00:06:41	2020-01-02 03:35:02	2020-01-01 00:06:41.000	2020-01-02 03:35:02.000	401	99302	49851.5	4985150	401	99302	49851.5	4985150	-32168	32767	5287.02	528702	-125	126	3.18	318
+402	2	10392	99303	1.2072	298.2072	149.7072	14970.72072	1.2072	298.2072	149.70721	14970.72111	1.2072	298.2072	149.7072	14970.72	2020-01-01	2020-01-02	2020-01-01 00:06:42	2020-01-02 03:35:03	2020-01-01 00:06:42.000	2020-01-02 03:35:03.000	402	99303	49852.5	4985250	402	99303	49852.5	4985250	-32768	32370	4632.66	463266	-124	127	4.18	418
+403	2	10393	99304	1.21021	298.21021	149.71021	14971.02102	1.21021	298.2102	149.7102	14971.02077	1.21021	298.21021	149.71021000000002	14971.021	2020-01-01	2020-01-02	2020-01-01 00:06:43	2020-01-02 03:35:04	2020-01-01 00:06:43.000	2020-01-02 03:35:04.000	403	99304	49853.5	4985350	403	99304	49853.5	4985350	-32767	32371	4633.66	463366	-128	127	2.62	262
+404	2	10394	99305	1.21321	298.21321	149.71321	14971.32132	1.21321	298.21323	149.71321	14971.32139	1.21321	298.21321	149.71321	14971.321	2020-01-01	2020-01-02	2020-01-01 00:06:44	2020-01-02 03:35:05	2020-01-01 00:06:44.000	2020-01-02 03:35:05.000	404	99305	49854.5	4985450	404	99305	49854.5	4985450	-32766	32372	4634.66	463466	-128	127	1.06	106
+405	2	10395	99306	1.21621	298.21621	149.71621	14971.62162	1.21621	298.21622	149.71621	14971.62169	1.21621	298.21621	149.71621	14971.621	2020-01-01	2020-01-02	2020-01-01 00:06:45	2020-01-02 03:35:06	2020-01-01 00:06:45.000	2020-01-02 03:35:06.000	405	99306	49855.5	4985550	405	99306	49855.5	4985550	-32765	32373	4635.66	463566	-128	124	-0.5	-50
+406	2	10396	99307	1.21921	298.21921	149.71921	14971.92192	1.21921	298.2192	149.71921	14971.92199	1.21921	298.21921	149.71921	14971.921	2020-01-01	2020-01-02	2020-01-01 00:06:46	2020-01-02 03:35:07	2020-01-01 00:06:46.000	2020-01-02 03:35:07.000	406	99307	49856.5	4985650	406	99307	49856.5	4985650	-32764	32374	4636.66	463666	-127	125	0.5	50
+407	2	10397	99308	1.22222	298.22222	149.72222	14972.22222	1.22222	298.22223	149.72222	14972.22257	1.22222	298.22222	149.72222	14972.222	2020-01-01	2020-01-02	2020-01-01 00:06:47	2020-01-02 03:35:08	2020-01-01 00:06:47.000	2020-01-02 03:35:08.000	407	99308	49857.5	4985750	407	99308	49857.5	4985750	-32763	32375	4637.66	463766	-126	126	1.5	150
+408	2	10398	99309	1.22522	298.22522	149.72522	14972.52252	1.22522	298.22522	149.72522	14972.52224	1.22522	298.22522	149.72522	14972.522	2020-01-01	2020-01-02	2020-01-01 00:06:48	2020-01-02 03:35:09	2020-01-01 00:06:48.000	2020-01-02 03:35:09.000	408	99309	49858.5	4985850	408	99309	49858.5	4985850	-32762	32376	4638.66	463866	-125	127	2.5	250
+409	2	10399	99310	1.22822	298.22822	149.72822	14972.82282	1.22822	298.22824	149.72822	14972.82286	1.22822	298.22822	149.72822	14972.822	2020-01-01	2020-01-02	2020-01-01 00:06:49	2020-01-02 03:35:10	2020-01-01 00:06:49.000	2020-01-02 03:35:10.000	409	99310	49859.5	4985950	409	99310	49859.5	4985950	-32761	32377	4639.66	463966	-128	127	0.94	94
 41	2	10031	99941	0.12312	300.12312	150.12312	15162.43543	0.12312	300.1231	150.12312	15162.43521	0.12312	300.12312	150.12312	15162.43512	2020-01-01	2020-01-02	2020-01-01 00:00:41	2020-01-02 03:45:41	2020-01-01 00:00:41.000	2020-01-02 03:45:41.000	41	99941	49991	5049091	41	99941	49991	5049091	-32528	32407	4570.009900990099	461571	-128	127	0.0297029702970297	3
-410	2	10400	99311	1.23123	298.23123	149.73123	14973.12312	1.23123	298.23123	149.73123	14973.12316	1.23123	298.23123	149.73122999999998	14973.12300	2020-01-01	2020-01-02	2020-01-01 00:06:50	2020-01-02 03:35:11	2020-01-01 00:06:50.000	2020-01-02 03:35:11.000	410	99311	49860.5	4986050	410	99311	49860.5	4986050	-32760	32378	4640.66	464066	-128	127	-0.62	-62
-411	2	10401	99312	1.23423	298.23423	149.73423	14973.42342	1.23423	298.23422	149.73423	14973.42345	1.23423	298.23423	149.73423	14973.42300	2020-01-01	2020-01-02	2020-01-01 00:06:51	2020-01-02 03:35:12	2020-01-01 00:06:51.000	2020-01-02 03:35:12.000	411	99312	49861.5	4986150	411	99312	49861.5	4986150	-32759	32379	4641.66	464166	-128	123	-2.18	-218
-412	2	10402	99313	1.23723	298.23723	149.73723	14973.72372	1.23723	298.23724	149.73724	14973.72405	1.23723	298.23723	149.73723	14973.72300	2020-01-01	2020-01-02	2020-01-01 00:06:52	2020-01-02 03:35:13	2020-01-01 00:06:52.000	2020-01-02 03:35:13.000	412	99313	49862.5	4986250	412	99313	49862.5	4986250	-32758	32380	4642.66	464266	-127	124	-1.18	-118
-413	2	10403	99314	1.24024	298.24024	149.74024	14974.02402	1.24024	298.24023	149.74023	14974.02374	1.24024	298.24024	149.74024	14974.02400	2020-01-01	2020-01-02	2020-01-01 00:06:53	2020-01-02 03:35:14	2020-01-01 00:06:53.000	2020-01-02 03:35:14.000	413	99314	49863.5	4986350	413	99314	49863.5	4986350	-32757	32381	4643.66	464366	-126	125	-0.18	-18
-414	2	10404	99315	1.24324	298.24324	149.74324	14974.32432	1.24324	298.24326	149.74324	14974.32433	1.24324	298.24324	149.74324000000001	14974.32400	2020-01-01	2020-01-02	2020-01-01 00:06:54	2020-01-02 03:35:15	2020-01-01 00:06:54.000	2020-01-02 03:35:15.000	414	99315	49864.5	4986450	414	99315	49864.5	4986450	-32756	32382	4644.66	464466	-125	126	0.82	82
-415	2	10405	99316	1.24624	298.24624	149.74624	14974.62462	1.24624	298.24625	149.74624	14974.62463	1.24624	298.24624	149.74624	14974.62400	2020-01-01	2020-01-02	2020-01-01 00:06:55	2020-01-02 03:35:16	2020-01-01 00:06:55.000	2020-01-02 03:35:16.000	415	99316	49865.5	4986550	415	99316	49865.5	4986550	-32755	32383	4645.66	464566	-124	127	1.82	182
-416	2	10406	99317	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924000000001	14974.92400	2020-01-01	2020-01-02	2020-01-01 00:06:56	2020-01-02 03:35:17	2020-01-01 00:06:56.000	2020-01-02 03:35:17.000	416	99317	49866.5	4986650	416	99317	49866.5	4986650	-32754	32384	4646.66	464666	-128	127	0.26	26
-417	2	10407	99318	1.25225	298.25225	149.75225	14975.22522	1.25225	298.25226	149.75225	14975.22552	1.25225	298.25225	149.75225	14975.22500	2020-01-01	2020-01-02	2020-01-01 00:06:57	2020-01-02 03:35:18	2020-01-01 00:06:57.000	2020-01-02 03:35:18.000	417	99318	49867.5	4986750	417	99318	49867.5	4986750	-32753	32385	4647.66	464766	-128	123	-1.3	-130
-418	2	10408	99319	1.25525	298.25525	149.75525	14975.52552	1.25525	298.25525	149.75525	14975.52521	1.25525	298.25525	149.75525	14975.52500	2020-01-01	2020-01-02	2020-01-01 00:06:58	2020-01-02 03:35:19	2020-01-01 00:06:58.000	2020-01-02 03:35:19.000	418	99319	49868.5	4986850	418	99319	49868.5	4986850	-32752	32386	4648.66	464866	-127	124	-0.3	-30
-419	2	10409	99320	1.25825	298.25825	149.75825	14975.82582	1.25825	298.25827	149.75825	14975.8258	1.25825	298.25825	149.75825	14975.82500	2020-01-01	2020-01-02	2020-01-01 00:06:59	2020-01-02 03:35:20	2020-01-01 00:06:59.000	2020-01-02 03:35:20.000	419	99320	49869.5	4986950	419	99320	49869.5	4986950	-32751	32387	4649.66	464966	-126	125	0.7	70
+410	2	10400	99311	1.23123	298.23123	149.73123	14973.12312	1.23123	298.23123	149.73123	14973.12316	1.23123	298.23123	149.73122999999998	14973.123	2020-01-01	2020-01-02	2020-01-01 00:06:50	2020-01-02 03:35:11	2020-01-01 00:06:50.000	2020-01-02 03:35:11.000	410	99311	49860.5	4986050	410	99311	49860.5	4986050	-32760	32378	4640.66	464066	-128	127	-0.62	-62
+411	2	10401	99312	1.23423	298.23423	149.73423	14973.42342	1.23423	298.23422	149.73423	14973.42345	1.23423	298.23423	149.73423	14973.423	2020-01-01	2020-01-02	2020-01-01 00:06:51	2020-01-02 03:35:12	2020-01-01 00:06:51.000	2020-01-02 03:35:12.000	411	99312	49861.5	4986150	411	99312	49861.5	4986150	-32759	32379	4641.66	464166	-128	123	-2.18	-218
+412	2	10402	99313	1.23723	298.23723	149.73723	14973.72372	1.23723	298.23724	149.73724	14973.72405	1.23723	298.23723	149.73723	14973.723	2020-01-01	2020-01-02	2020-01-01 00:06:52	2020-01-02 03:35:13	2020-01-01 00:06:52.000	2020-01-02 03:35:13.000	412	99313	49862.5	4986250	412	99313	49862.5	4986250	-32758	32380	4642.66	464266	-127	124	-1.18	-118
+413	2	10403	99314	1.24024	298.24024	149.74024	14974.02402	1.24024	298.24023	149.74023	14974.02374	1.24024	298.24024	149.74024	14974.024	2020-01-01	2020-01-02	2020-01-01 00:06:53	2020-01-02 03:35:14	2020-01-01 00:06:53.000	2020-01-02 03:35:14.000	413	99314	49863.5	4986350	413	99314	49863.5	4986350	-32757	32381	4643.66	464366	-126	125	-0.18	-18
+414	2	10404	99315	1.24324	298.24324	149.74324	14974.32432	1.24324	298.24326	149.74324	14974.32433	1.24324	298.24324	149.74324000000001	14974.324	2020-01-01	2020-01-02	2020-01-01 00:06:54	2020-01-02 03:35:15	2020-01-01 00:06:54.000	2020-01-02 03:35:15.000	414	99315	49864.5	4986450	414	99315	49864.5	4986450	-32756	32382	4644.66	464466	-125	126	0.82	82
+415	2	10405	99316	1.24624	298.24624	149.74624	14974.62462	1.24624	298.24625	149.74624	14974.62463	1.24624	298.24624	149.74624	14974.624	2020-01-01	2020-01-02	2020-01-01 00:06:55	2020-01-02 03:35:16	2020-01-01 00:06:55.000	2020-01-02 03:35:16.000	415	99316	49865.5	4986550	415	99316	49865.5	4986550	-32755	32383	4645.66	464566	-124	127	1.82	182
+416	2	10406	99317	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924	14974.92492	1.24924	298.24924	149.74924000000001	14974.924	2020-01-01	2020-01-02	2020-01-01 00:06:56	2020-01-02 03:35:17	2020-01-01 00:06:56.000	2020-01-02 03:35:17.000	416	99317	49866.5	4986650	416	99317	49866.5	4986650	-32754	32384	4646.66	464666	-128	127	0.26	26
+417	2	10407	99318	1.25225	298.25225	149.75225	14975.22522	1.25225	298.25226	149.75225	14975.22552	1.25225	298.25225	149.75225	14975.225	2020-01-01	2020-01-02	2020-01-01 00:06:57	2020-01-02 03:35:18	2020-01-01 00:06:57.000	2020-01-02 03:35:18.000	417	99318	49867.5	4986750	417	99318	49867.5	4986750	-32753	32385	4647.66	464766	-128	123	-1.3	-130
+418	2	10408	99319	1.25525	298.25525	149.75525	14975.52552	1.25525	298.25525	149.75525	14975.52521	1.25525	298.25525	149.75525	14975.525	2020-01-01	2020-01-02	2020-01-01 00:06:58	2020-01-02 03:35:19	2020-01-01 00:06:58.000	2020-01-02 03:35:19.000	418	99319	49868.5	4986850	418	99319	49868.5	4986850	-32752	32386	4648.66	464866	-127	124	-0.3	-30
+419	2	10409	99320	1.25825	298.25825	149.75825	14975.82582	1.25825	298.25827	149.75825	14975.8258	1.25825	298.25825	149.75825	14975.825	2020-01-01	2020-01-02	2020-01-01 00:06:59	2020-01-02 03:35:20	2020-01-01 00:06:59.000	2020-01-02 03:35:20.000	419	99320	49869.5	4986950	419	99320	49869.5	4986950	-32751	32387	4649.66	464966	-126	125	0.7	70
 42	2	10032	99942	0.12612	300.12612	150.12612	15162.73873	0.12612	300.12613	150.12612	15162.73896	0.12612	300.12612	150.12612	15162.73812	2020-01-01	2020-01-02	2020-01-01 00:00:42	2020-01-02 03:45:42	2020-01-01 00:00:42.000	2020-01-02 03:45:42.000	42	99942	49992	5049192	42	99942	49992	5049192	-32527	32408	4571.009900990099	461672	-128	127	-1.504950495049505	-152
-420	2	10410	99321	1.26126	298.26126	149.76126	14976.12612	1.26126	298.26126	149.76126	14976.12609	1.26126	298.26126	149.76126	14976.12600	2020-01-01	2020-01-02	2020-01-01 00:07:00	2020-01-02 03:35:21	2020-01-01 00:07:00.000	2020-01-02 03:35:21.000	420	99321	49870.5	4987050	420	99321	49870.5	4987050	-32750	32388	4650.66	465066	-125	126	1.7	170
-421	2	10411	99322	1.26426	298.26426	149.76426	14976.42642	1.26426	298.26425	149.76426	14976.4264	1.26426	298.26426	149.76426	14976.42600	2020-01-01	2020-01-02	2020-01-01 00:07:01	2020-01-02 03:35:22	2020-01-01 00:07:01.000	2020-01-02 03:35:22.000	421	99322	49871.5	4987150	421	99322	49871.5	4987150	-32749	32389	4651.66	465166	-124	127	2.7	270
-422	2	10412	99323	1.26726	298.26726	149.76726	14976.72672	1.26726	298.26727	149.76727	14976.72702	1.26726	298.26726	149.76726	14976.72600	2020-01-01	2020-01-02	2020-01-01 00:07:02	2020-01-02 03:35:23	2020-01-01 00:07:02.000	2020-01-02 03:35:23.000	422	99323	49872.5	4987250	422	99323	49872.5	4987250	-32748	32390	4652.66	465266	-128	127	1.14	114
-423	2	10413	99324	1.27027	298.27027	149.77027	14977.02702	1.27027	298.27026	149.77026	14977.02667	1.27027	298.27027	149.77027	14977.02700	2020-01-01	2020-01-02	2020-01-01 00:07:03	2020-01-02 03:35:24	2020-01-01 00:07:03.000	2020-01-02 03:35:24.000	423	99324	49873.5	4987350	423	99324	49873.5	4987350	-32747	32391	4653.66	465366	-128	123	-0.42	-42
-424	2	10414	99325	1.27327	298.27327	149.77327	14977.32732	1.27327	298.2733	149.77327	14977.32727	1.27327	298.27327	149.77327	14977.32700	2020-01-01	2020-01-02	2020-01-01 00:07:04	2020-01-02 03:35:25	2020-01-01 00:07:04.000	2020-01-02 03:35:25.000	424	99325	49874.5	4987450	424	99325	49874.5	4987450	-32746	32392	4654.66	465466	-127	124	0.58	58
-425	2	10415	99326	1.27627	298.27627	149.77627	14977.62762	1.27627	298.27628	149.77627	14977.62756	1.27627	298.27627	149.77627	14977.62700	2020-01-01	2020-01-02	2020-01-01 00:07:05	2020-01-02 03:35:26	2020-01-01 00:07:05.000	2020-01-02 03:35:26.000	425	99326	49875.5	4987550	425	99326	49875.5	4987550	-32745	32393	4655.66	465566	-126	125	1.58	158
-426	2	10416	99327	1.27927	298.27927	149.77927	14977.92792	1.27927	298.27927	149.77927	14977.92787	1.27927	298.27927	149.77927	14977.92700	2020-01-01	2020-01-02	2020-01-01 00:07:06	2020-01-02 03:35:27	2020-01-01 00:07:06.000	2020-01-02 03:35:27.000	426	99327	49876.5	4987650	426	99327	49876.5	4987650	-32744	32394	4656.66	465666	-125	126	2.58	258
-427	2	10417	99328	1.28228	298.28228	149.78228	14978.22822	1.28228	298.2823	149.78228	14978.22849	1.28228	298.28228	149.78228	14978.22800	2020-01-01	2020-01-02	2020-01-01 00:07:07	2020-01-02 03:35:28	2020-01-01 00:07:07.000	2020-01-02 03:35:28.000	427	99328	49877.5	4987750	427	99328	49877.5	4987750	-32743	32395	4657.66	465766	-124	127	3.58	358
-428	2	10418	99329	1.28528	298.28528	149.78528	14978.52852	1.28528	298.28528	149.78528	14978.52815	1.28528	298.28528	149.78528	14978.52800	2020-01-01	2020-01-02	2020-01-01 00:07:08	2020-01-02 03:35:29	2020-01-01 00:07:08.000	2020-01-02 03:35:29.000	428	99329	49878.5	4987850	428	99329	49878.5	4987850	-32742	32396	4658.66	465866	-128	127	2.02	202
-429	2	10419	99330	1.28828	298.28828	149.78828	14978.82882	1.28828	298.2883	149.78828	14978.8289	1.28828	298.28828	149.78828	14978.82800	2020-01-01	2020-01-02	2020-01-01 00:07:09	2020-01-02 03:35:30	2020-01-01 00:07:09.000	2020-01-02 03:35:30.000	429	99330	49879.5	4987950	429	99330	49879.5	4987950	-32741	32397	4659.66	465966	-128	127	0.46	46
+420	2	10410	99321	1.26126	298.26126	149.76126	14976.12612	1.26126	298.26126	149.76126	14976.12609	1.26126	298.26126	149.76126	14976.126	2020-01-01	2020-01-02	2020-01-01 00:07:00	2020-01-02 03:35:21	2020-01-01 00:07:00.000	2020-01-02 03:35:21.000	420	99321	49870.5	4987050	420	99321	49870.5	4987050	-32750	32388	4650.66	465066	-125	126	1.7	170
+421	2	10411	99322	1.26426	298.26426	149.76426	14976.42642	1.26426	298.26425	149.76426	14976.4264	1.26426	298.26426	149.76426	14976.426	2020-01-01	2020-01-02	2020-01-01 00:07:01	2020-01-02 03:35:22	2020-01-01 00:07:01.000	2020-01-02 03:35:22.000	421	99322	49871.5	4987150	421	99322	49871.5	4987150	-32749	32389	4651.66	465166	-124	127	2.7	270
+422	2	10412	99323	1.26726	298.26726	149.76726	14976.72672	1.26726	298.26727	149.76727	14976.72702	1.26726	298.26726	149.76726	14976.726	2020-01-01	2020-01-02	2020-01-01 00:07:02	2020-01-02 03:35:23	2020-01-01 00:07:02.000	2020-01-02 03:35:23.000	422	99323	49872.5	4987250	422	99323	49872.5	4987250	-32748	32390	4652.66	465266	-128	127	1.14	114
+423	2	10413	99324	1.27027	298.27027	149.77027	14977.02702	1.27027	298.27026	149.77026	14977.02667	1.27027	298.27027	149.77027	14977.027	2020-01-01	2020-01-02	2020-01-01 00:07:03	2020-01-02 03:35:24	2020-01-01 00:07:03.000	2020-01-02 03:35:24.000	423	99324	49873.5	4987350	423	99324	49873.5	4987350	-32747	32391	4653.66	465366	-128	123	-0.42	-42
+424	2	10414	99325	1.27327	298.27327	149.77327	14977.32732	1.27327	298.2733	149.77327	14977.32727	1.27327	298.27327	149.77327	14977.327	2020-01-01	2020-01-02	2020-01-01 00:07:04	2020-01-02 03:35:25	2020-01-01 00:07:04.000	2020-01-02 03:35:25.000	424	99325	49874.5	4987450	424	99325	49874.5	4987450	-32746	32392	4654.66	465466	-127	124	0.58	58
+425	2	10415	99326	1.27627	298.27627	149.77627	14977.62762	1.27627	298.27628	149.77627	14977.62756	1.27627	298.27627	149.77627	14977.627	2020-01-01	2020-01-02	2020-01-01 00:07:05	2020-01-02 03:35:26	2020-01-01 00:07:05.000	2020-01-02 03:35:26.000	425	99326	49875.5	4987550	425	99326	49875.5	4987550	-32745	32393	4655.66	465566	-126	125	1.58	158
+426	2	10416	99327	1.27927	298.27927	149.77927	14977.92792	1.27927	298.27927	149.77927	14977.92787	1.27927	298.27927	149.77927	14977.927	2020-01-01	2020-01-02	2020-01-01 00:07:06	2020-01-02 03:35:27	2020-01-01 00:07:06.000	2020-01-02 03:35:27.000	426	99327	49876.5	4987650	426	99327	49876.5	4987650	-32744	32394	4656.66	465666	-125	126	2.58	258
+427	2	10417	99328	1.28228	298.28228	149.78228	14978.22822	1.28228	298.2823	149.78228	14978.22849	1.28228	298.28228	149.78228	14978.228	2020-01-01	2020-01-02	2020-01-01 00:07:07	2020-01-02 03:35:28	2020-01-01 00:07:07.000	2020-01-02 03:35:28.000	427	99328	49877.5	4987750	427	99328	49877.5	4987750	-32743	32395	4657.66	465766	-124	127	3.58	358
+428	2	10418	99329	1.28528	298.28528	149.78528	14978.52852	1.28528	298.28528	149.78528	14978.52815	1.28528	298.28528	149.78528	14978.528	2020-01-01	2020-01-02	2020-01-01 00:07:08	2020-01-02 03:35:29	2020-01-01 00:07:08.000	2020-01-02 03:35:29.000	428	99329	49878.5	4987850	428	99329	49878.5	4987850	-32742	32396	4658.66	465866	-128	127	2.02	202
+429	2	10419	99330	1.28828	298.28828	149.78828	14978.82882	1.28828	298.2883	149.78828	14978.8289	1.28828	298.28828	149.78828	14978.828	2020-01-01	2020-01-02	2020-01-01 00:07:09	2020-01-02 03:35:30	2020-01-01 00:07:09.000	2020-01-02 03:35:30.000	429	99330	49879.5	4987950	429	99330	49879.5	4987950	-32741	32397	4659.66	465966	-128	127	0.46	46
 43	2	10033	99943	0.12912	300.12912	150.12912	15163.04204	0.12912	300.12912	150.12912	15163.04211	0.12912	300.12912	150.12912	15163.04112	2020-01-01	2020-01-02	2020-01-01 00:00:43	2020-01-02 03:45:43	2020-01-01 00:00:43.000	2020-01-02 03:45:43.000	43	99943	49993	5049293	43	99943	49993	5049293	-32526	32409	4572.009900990099	461773	-128	124	-3.0396039603960396	-307
-430	2	10420	99331	1.29129	298.29129	149.79129	14979.12912	1.29129	298.2913	149.79129	14979.12904	1.29129	298.29129	149.79129	14979.12900	2020-01-01	2020-01-02	2020-01-01 00:07:10	2020-01-02 03:35:31	2020-01-01 00:07:10.000	2020-01-02 03:35:31.000	430	99331	49880.5	4988050	430	99331	49880.5	4988050	-32740	32398	4660.66	466066	-128	124	-1.1	-110
-431	2	10421	99332	1.29429	298.29429	149.79429	14979.42942	1.29429	298.29428	149.79429	14979.42933	1.29429	298.29429	149.79429	14979.42900	2020-01-01	2020-01-02	2020-01-01 00:07:11	2020-01-02 03:35:32	2020-01-01 00:07:11.000	2020-01-02 03:35:32.000	431	99332	49881.5	4988150	431	99332	49881.5	4988150	-32739	32399	4661.66	466166	-127	125	-0.1	-10
-432	2	10422	99333	1.29729	298.29729	149.79729	14979.72972	1.29729	298.2973	149.79729	14979.72996	1.29729	298.29729	149.79729	14979.72900	2020-01-01	2020-01-02	2020-01-01 00:07:12	2020-01-02 03:35:33	2020-01-01 00:07:12.000	2020-01-02 03:35:33.000	432	99333	49882.5	4988250	432	99333	49882.5	4988250	-32738	32400	4662.66	466266	-126	126	0.9	90
-433	2	10423	99334	1.3003	298.3003	149.8003	14980.03003	1.3003	298.3003	149.80029	14980.02962	1.30030	298.30030	149.8003	14980.03000	2020-01-01	2020-01-02	2020-01-01 00:07:13	2020-01-02 03:35:34	2020-01-01 00:07:13.000	2020-01-02 03:35:34.000	433	99334	49883.5	4988350	433	99334	49883.5	4988350	-32737	32401	4663.66	466366	-125	127	1.9	190
-434	2	10424	99335	1.3033	298.3033	149.8033	14980.33033	1.3033	298.3033	149.8033	14980.33037	1.30330	298.30330	149.8033	14980.33000	2020-01-01	2020-01-02	2020-01-01 00:07:14	2020-01-02 03:35:35	2020-01-01 00:07:14.000	2020-01-02 03:35:35.000	434	99335	49884.5	4988450	434	99335	49884.5	4988450	-32736	32402	4664.66	466466	-128	127	0.34	34
-435	2	10425	99336	1.3063	298.3063	149.8063	14980.63063	1.3063	298.3063	149.8063	14980.63051	1.30630	298.30630	149.8063	14980.63000	2020-01-01	2020-01-02	2020-01-01 00:07:15	2020-01-02 03:35:36	2020-01-01 00:07:15.000	2020-01-02 03:35:36.000	435	99336	49885.5	4988550	435	99336	49885.5	4988550	-32735	32403	4665.66	466566	-128	127	-1.22	-122
-436	2	10426	99337	1.3093	298.3093	149.8093	14980.93093	1.3093	298.3093	149.8093	14980.93084	1.30930	298.30930	149.8093	14980.93000	2020-01-01	2020-01-02	2020-01-01 00:07:16	2020-01-02 03:35:37	2020-01-01 00:07:16.000	2020-01-02 03:35:37.000	436	99337	49886.5	4988650	436	99337	49886.5	4988650	-32734	32404	4666.66	466666	-128	123	-2.78	-278
-437	2	10427	99338	1.31231	298.31231	149.81231	14981.23123	1.31231	298.31232	149.81231	14981.23143	1.31231	298.31231	149.81231	14981.23100	2020-01-01	2020-01-02	2020-01-01 00:07:17	2020-01-02 03:35:38	2020-01-01 00:07:17.000	2020-01-02 03:35:38.000	437	99338	49887.5	4988750	437	99338	49887.5	4988750	-32733	32405	4667.66	466766	-127	124	-1.78	-178
-438	2	10428	99339	1.31531	298.31531	149.81531	14981.53153	1.31531	298.3153	149.81531	14981.53173	1.31531	298.31531	149.81531	14981.53100	2020-01-01	2020-01-02	2020-01-01 00:07:18	2020-01-02 03:35:39	2020-01-01 00:07:18.000	2020-01-02 03:35:39.000	438	99339	49888.5	4988850	438	99339	49888.5	4988850	-32732	32406	4668.66	466866	-126	125	-0.78	-78
-439	2	10429	99340	1.31831	298.31831	149.81831	14981.83183	1.31831	298.31833	149.81831	14981.83184	1.31831	298.31831	149.81831	14981.83100	2020-01-01	2020-01-02	2020-01-01 00:07:19	2020-01-02 03:35:40	2020-01-01 00:07:19.000	2020-01-02 03:35:40.000	439	99340	49889.5	4988950	439	99340	49889.5	4988950	-32731	32407	4669.66	466966	-125	126	0.22	22
+430	2	10420	99331	1.29129	298.29129	149.79129	14979.12912	1.29129	298.2913	149.79129	14979.12904	1.29129	298.29129	149.79129	14979.129	2020-01-01	2020-01-02	2020-01-01 00:07:10	2020-01-02 03:35:31	2020-01-01 00:07:10.000	2020-01-02 03:35:31.000	430	99331	49880.5	4988050	430	99331	49880.5	4988050	-32740	32398	4660.66	466066	-128	124	-1.1	-110
+431	2	10421	99332	1.29429	298.29429	149.79429	14979.42942	1.29429	298.29428	149.79429	14979.42933	1.29429	298.29429	149.79429	14979.429	2020-01-01	2020-01-02	2020-01-01 00:07:11	2020-01-02 03:35:32	2020-01-01 00:07:11.000	2020-01-02 03:35:32.000	431	99332	49881.5	4988150	431	99332	49881.5	4988150	-32739	32399	4661.66	466166	-127	125	-0.1	-10
+432	2	10422	99333	1.29729	298.29729	149.79729	14979.72972	1.29729	298.2973	149.79729	14979.72996	1.29729	298.29729	149.79729	14979.729	2020-01-01	2020-01-02	2020-01-01 00:07:12	2020-01-02 03:35:33	2020-01-01 00:07:12.000	2020-01-02 03:35:33.000	432	99333	49882.5	4988250	432	99333	49882.5	4988250	-32738	32400	4662.66	466266	-126	126	0.9	90
+433	2	10423	99334	1.3003	298.3003	149.8003	14980.03003	1.3003	298.3003	149.80029	14980.02962	1.3003	298.3003	149.8003	14980.03	2020-01-01	2020-01-02	2020-01-01 00:07:13	2020-01-02 03:35:34	2020-01-01 00:07:13.000	2020-01-02 03:35:34.000	433	99334	49883.5	4988350	433	99334	49883.5	4988350	-32737	32401	4663.66	466366	-125	127	1.9	190
+434	2	10424	99335	1.3033	298.3033	149.8033	14980.33033	1.3033	298.3033	149.8033	14980.33037	1.3033	298.3033	149.8033	14980.33	2020-01-01	2020-01-02	2020-01-01 00:07:14	2020-01-02 03:35:35	2020-01-01 00:07:14.000	2020-01-02 03:35:35.000	434	99335	49884.5	4988450	434	99335	49884.5	4988450	-32736	32402	4664.66	466466	-128	127	0.34	34
+435	2	10425	99336	1.3063	298.3063	149.8063	14980.63063	1.3063	298.3063	149.8063	14980.63051	1.3063	298.3063	149.8063	14980.63	2020-01-01	2020-01-02	2020-01-01 00:07:15	2020-01-02 03:35:36	2020-01-01 00:07:15.000	2020-01-02 03:35:36.000	435	99336	49885.5	4988550	435	99336	49885.5	4988550	-32735	32403	4665.66	466566	-128	127	-1.22	-122
+436	2	10426	99337	1.3093	298.3093	149.8093	14980.93093	1.3093	298.3093	149.8093	14980.93084	1.3093	298.3093	149.8093	14980.93	2020-01-01	2020-01-02	2020-01-01 00:07:16	2020-01-02 03:35:37	2020-01-01 00:07:16.000	2020-01-02 03:35:37.000	436	99337	49886.5	4988650	436	99337	49886.5	4988650	-32734	32404	4666.66	466666	-128	123	-2.78	-278
+437	2	10427	99338	1.31231	298.31231	149.81231	14981.23123	1.31231	298.31232	149.81231	14981.23143	1.31231	298.31231	149.81231	14981.231	2020-01-01	2020-01-02	2020-01-01 00:07:17	2020-01-02 03:35:38	2020-01-01 00:07:17.000	2020-01-02 03:35:38.000	437	99338	49887.5	4988750	437	99338	49887.5	4988750	-32733	32405	4667.66	466766	-127	124	-1.78	-178
+438	2	10428	99339	1.31531	298.31531	149.81531	14981.53153	1.31531	298.3153	149.81531	14981.53173	1.31531	298.31531	149.81531	14981.531	2020-01-01	2020-01-02	2020-01-01 00:07:18	2020-01-02 03:35:39	2020-01-01 00:07:18.000	2020-01-02 03:35:39.000	438	99339	49888.5	4988850	438	99339	49888.5	4988850	-32732	32406	4668.66	466866	-126	125	-0.78	-78
+439	2	10429	99340	1.31831	298.31831	149.81831	14981.83183	1.31831	298.31833	149.81831	14981.83184	1.31831	298.31831	149.81831	14981.831	2020-01-01	2020-01-02	2020-01-01 00:07:19	2020-01-02 03:35:40	2020-01-01 00:07:19.000	2020-01-02 03:35:40.000	439	99340	49889.5	4988950	439	99340	49889.5	4988950	-32731	32407	4669.66	466966	-125	126	0.22	22
 44	2	10034	99944	0.13213	300.13213	150.13213	15163.34534	0.13213	300.13214	150.13213	15163.34525	0.13213	300.13213	150.13213	15163.34513	2020-01-01	2020-01-02	2020-01-01 00:00:44	2020-01-02 03:45:44	2020-01-01 00:00:44.000	2020-01-02 03:45:44.000	44	99944	49994	5049394	44	99944	49994	5049394	-32525	32410	4573.009900990099	461874	-127	125	-2.0396039603960396	-206
-440	2	10430	99341	1.32132	298.32132	149.82132	14982.13213	1.32132	298.32132	149.82131	14982.13197	1.32132	298.32132	149.82132	14982.13200	2020-01-01	2020-01-02	2020-01-01 00:07:20	2020-01-02 03:35:41	2020-01-01 00:07:20.000	2020-01-02 03:35:41.000	440	99341	49890.5	4989050	440	99341	49890.5	4989050	-32730	32408	4670.66	467066	-124	127	1.22	122
-441	2	10431	99342	1.32432	298.32432	149.82432	14982.43243	1.32432	298.3243	149.82432	14982.4323	1.32432	298.32432	149.82432	14982.43200	2020-01-01	2020-01-02	2020-01-01 00:07:21	2020-01-02 03:35:42	2020-01-01 00:07:21.000	2020-01-02 03:35:42.000	441	99342	49891.5	4989150	441	99342	49891.5	4989150	-32729	32409	4671.66	467166	-128	127	-0.34	-34
-442	2	10432	99343	1.32732	298.32732	149.82732	14982.73273	1.32732	298.32733	149.82732	14982.7329	1.32732	298.32732	149.82732	14982.73200	2020-01-01	2020-01-02	2020-01-01 00:07:22	2020-01-02 03:35:43	2020-01-01 00:07:22.000	2020-01-02 03:35:43.000	442	99343	49892.5	4989250	442	99343	49892.5	4989250	-32728	32410	4672.66	467266	-128	123	-1.9	-190
-443	2	10433	99344	1.33033	298.33033	149.83033	14983.03303	1.33033	298.33032	149.83033	14983.03319	1.33033	298.33033	149.83033	14983.03300	2020-01-01	2020-01-02	2020-01-01 00:07:23	2020-01-02 03:35:44	2020-01-01 00:07:23.000	2020-01-02 03:35:44.000	443	99344	49893.5	4989350	443	99344	49893.5	4989350	-32727	32411	4673.66	467366	-127	124	-0.9	-90
-444	2	10434	99345	1.33333	298.33333	149.83333	14983.33333	1.33333	298.33334	149.83333	14983.33331	1.33333	298.33333	149.83333000000002	14983.33300	2020-01-01	2020-01-02	2020-01-01 00:07:24	2020-01-02 03:35:45	2020-01-01 00:07:24.000	2020-01-02 03:35:45.000	444	99345	49894.5	4989450	444	99345	49894.5	4989450	-32726	32412	4674.66	467466	-126	125	0.1	10
-445	2	10435	99346	1.33633	298.33633	149.83633	14983.63363	1.33633	298.33633	149.83633	14983.63348	1.33633	298.33633	149.83633	14983.63300	2020-01-01	2020-01-02	2020-01-01 00:07:25	2020-01-02 03:35:46	2020-01-01 00:07:25.000	2020-01-02 03:35:46.000	445	99346	49895.5	4989550	445	99346	49895.5	4989550	-32725	32413	4675.66	467566	-125	126	1.1	110
-446	2	10436	99347	1.33933	298.33933	149.83933	14983.93393	1.33933	298.33932	149.83933	14983.93378	1.33933	298.33933	149.83933000000002	14983.93300	2020-01-01	2020-01-02	2020-01-01 00:07:26	2020-01-02 03:35:47	2020-01-01 00:07:26.000	2020-01-02 03:35:47.000	446	99347	49896.5	4989650	446	99347	49896.5	4989650	-32724	32414	4676.66	467666	-124	127	2.1	210
-447	2	10437	99348	1.34234	298.34234	149.84234	14984.23423	1.34234	298.34235	149.84234	14984.23437	1.34234	298.34234	149.84234	14984.23400	2020-01-01	2020-01-02	2020-01-01 00:07:27	2020-01-02 03:35:48	2020-01-01 00:07:27.000	2020-01-02 03:35:48.000	447	99348	49897.5	4989750	447	99348	49897.5	4989750	-32723	32415	4677.66	467766	-128	127	0.54	54
-448	2	10438	99349	1.34534	298.34534	149.84534	14984.53453	1.34534	298.34534	149.84534	14984.53466	1.34534	298.34534	149.84534	14984.53400	2020-01-01	2020-01-02	2020-01-01 00:07:28	2020-01-02 03:35:49	2020-01-01 00:07:28.000	2020-01-02 03:35:49.000	448	99349	49898.5	4989850	448	99349	49898.5	4989850	-32722	32416	4678.66	467866	-128	123	-1.02	-102
-449	2	10439	99350	1.34834	298.34834	149.84834	14984.83483	1.34834	298.34836	149.84834	14984.83478	1.34834	298.34834	149.84834	14984.83400	2020-01-01	2020-01-02	2020-01-01 00:07:29	2020-01-02 03:35:50	2020-01-01 00:07:29.000	2020-01-02 03:35:50.000	449	99350	49899.5	4989950	449	99350	49899.5	4989950	-32721	32417	4679.66	467966	-127	124	-0.02	-2
+440	2	10430	99341	1.32132	298.32132	149.82132	14982.13213	1.32132	298.32132	149.82131	14982.13197	1.32132	298.32132	149.82132	14982.132	2020-01-01	2020-01-02	2020-01-01 00:07:20	2020-01-02 03:35:41	2020-01-01 00:07:20.000	2020-01-02 03:35:41.000	440	99341	49890.5	4989050	440	99341	49890.5	4989050	-32730	32408	4670.66	467066	-124	127	1.22	122
+441	2	10431	99342	1.32432	298.32432	149.82432	14982.43243	1.32432	298.3243	149.82432	14982.4323	1.32432	298.32432	149.82432	14982.432	2020-01-01	2020-01-02	2020-01-01 00:07:21	2020-01-02 03:35:42	2020-01-01 00:07:21.000	2020-01-02 03:35:42.000	441	99342	49891.5	4989150	441	99342	49891.5	4989150	-32729	32409	4671.66	467166	-128	127	-0.34	-34
+442	2	10432	99343	1.32732	298.32732	149.82732	14982.73273	1.32732	298.32733	149.82732	14982.7329	1.32732	298.32732	149.82732	14982.732	2020-01-01	2020-01-02	2020-01-01 00:07:22	2020-01-02 03:35:43	2020-01-01 00:07:22.000	2020-01-02 03:35:43.000	442	99343	49892.5	4989250	442	99343	49892.5	4989250	-32728	32410	4672.66	467266	-128	123	-1.9	-190
+443	2	10433	99344	1.33033	298.33033	149.83033	14983.03303	1.33033	298.33032	149.83033	14983.03319	1.33033	298.33033	149.83033	14983.033	2020-01-01	2020-01-02	2020-01-01 00:07:23	2020-01-02 03:35:44	2020-01-01 00:07:23.000	2020-01-02 03:35:44.000	443	99344	49893.5	4989350	443	99344	49893.5	4989350	-32727	32411	4673.66	467366	-127	124	-0.9	-90
+444	2	10434	99345	1.33333	298.33333	149.83333	14983.33333	1.33333	298.33334	149.83333	14983.33331	1.33333	298.33333	149.83333000000002	14983.333	2020-01-01	2020-01-02	2020-01-01 00:07:24	2020-01-02 03:35:45	2020-01-01 00:07:24.000	2020-01-02 03:35:45.000	444	99345	49894.5	4989450	444	99345	49894.5	4989450	-32726	32412	4674.66	467466	-126	125	0.1	10
+445	2	10435	99346	1.33633	298.33633	149.83633	14983.63363	1.33633	298.33633	149.83633	14983.63348	1.33633	298.33633	149.83633	14983.633	2020-01-01	2020-01-02	2020-01-01 00:07:25	2020-01-02 03:35:46	2020-01-01 00:07:25.000	2020-01-02 03:35:46.000	445	99346	49895.5	4989550	445	99346	49895.5	4989550	-32725	32413	4675.66	467566	-125	126	1.1	110
+446	2	10436	99347	1.33933	298.33933	149.83933	14983.93393	1.33933	298.33932	149.83933	14983.93378	1.33933	298.33933	149.83933000000002	14983.933	2020-01-01	2020-01-02	2020-01-01 00:07:26	2020-01-02 03:35:47	2020-01-01 00:07:26.000	2020-01-02 03:35:47.000	446	99347	49896.5	4989650	446	99347	49896.5	4989650	-32724	32414	4676.66	467666	-124	127	2.1	210
+447	2	10437	99348	1.34234	298.34234	149.84234	14984.23423	1.34234	298.34235	149.84234	14984.23437	1.34234	298.34234	149.84234	14984.234	2020-01-01	2020-01-02	2020-01-01 00:07:27	2020-01-02 03:35:48	2020-01-01 00:07:27.000	2020-01-02 03:35:48.000	447	99348	49897.5	4989750	447	99348	49897.5	4989750	-32723	32415	4677.66	467766	-128	127	0.54	54
+448	2	10438	99349	1.34534	298.34534	149.84534	14984.53453	1.34534	298.34534	149.84534	14984.53466	1.34534	298.34534	149.84534	14984.534	2020-01-01	2020-01-02	2020-01-01 00:07:28	2020-01-02 03:35:49	2020-01-01 00:07:28.000	2020-01-02 03:35:49.000	448	99349	49898.5	4989850	448	99349	49898.5	4989850	-32722	32416	4678.66	467866	-128	123	-1.02	-102
+449	2	10439	99350	1.34834	298.34834	149.84834	14984.83483	1.34834	298.34836	149.84834	14984.83478	1.34834	298.34834	149.84834	14984.834	2020-01-01	2020-01-02	2020-01-01 00:07:29	2020-01-02 03:35:50	2020-01-01 00:07:29.000	2020-01-02 03:35:50.000	449	99350	49899.5	4989950	449	99350	49899.5	4989950	-32721	32417	4679.66	467966	-127	124	-0.02	-2
 45	2	10035	99945	0.13513	300.13513	150.13513	15163.64864	0.13513	300.13513	150.13513	15163.64839	0.13513	300.13513	150.13513	15163.64813	2020-01-01	2020-01-02	2020-01-01 00:00:45	2020-01-02 03:45:45	2020-01-01 00:00:45.000	2020-01-02 03:45:45.000	45	99945	49995	5049495	45	99945	49995	5049495	-32524	32411	4574.009900990099	461975	-126	126	-1.0396039603960396	-105
-450	2	10440	99351	1.35135	298.35135	149.85135	14985.13513	1.35135	298.35135	149.85134	14985.13495	1.35135	298.35135	149.85135	14985.13500	2020-01-01	2020-01-02	2020-01-01 00:07:30	2020-01-02 03:35:51	2020-01-01 00:07:30.000	2020-01-02 03:35:51.000	450	99351	49900.5	4990050	450	99351	49900.5	4990050	-32720	32418	4680.66	468066	-126	125	0.98	98
-451	2	10441	99352	1.35435	298.35435	149.85435	14985.43543	1.35435	298.35434	149.85435	14985.43525	1.35435	298.35435	149.85434999999998	14985.43500	2020-01-01	2020-01-02	2020-01-01 00:07:31	2020-01-02 03:35:52	2020-01-01 00:07:31.000	2020-01-02 03:35:52.000	451	99352	49901.5	4990150	451	99352	49901.5	4990150	-32719	32419	4681.66	468166	-125	126	1.98	198
-452	2	10442	99353	1.35735	298.35735	149.85735	14985.73573	1.35735	298.35736	149.85736	14985.736	1.35735	298.35735	149.85735	14985.73500	2020-01-01	2020-01-02	2020-01-01 00:07:32	2020-01-02 03:35:53	2020-01-01 00:07:32.000	2020-01-02 03:35:53.000	452	99353	49902.5	4990250	452	99353	49902.5	4990250	-32718	32420	4682.66	468266	-124	127	2.98	298
-453	2	10443	99354	1.36036	298.36036	149.86036	14986.03603	1.36036	298.36035	149.86036	14986.03614	1.36036	298.36036	149.86036000000001	14986.03600	2020-01-01	2020-01-02	2020-01-01 00:07:33	2020-01-02 03:35:54	2020-01-01 00:07:33.000	2020-01-02 03:35:54.000	453	99354	49903.5	4990350	453	99354	49903.5	4990350	-32717	32421	4683.66	468366	-128	127	1.42	142
-454	2	10444	99355	1.36336	298.36336	149.86336	14986.33633	1.36336	298.36337	149.86336	14986.33629	1.36336	298.36336	149.86336	14986.33600	2020-01-01	2020-01-02	2020-01-01 00:07:34	2020-01-02 03:35:55	2020-01-01 00:07:34.000	2020-01-02 03:35:55.000	454	99355	49904.5	4990450	454	99355	49904.5	4990450	-32716	32422	4684.66	468466	-128	127	-0.14	-14
-455	2	10445	99356	1.36636	298.36636	149.86636	14986.63663	1.36636	298.36636	149.86636	14986.63641	1.36636	298.36636	149.86636000000001	14986.63600	2020-01-01	2020-01-02	2020-01-01 00:07:35	2020-01-02 03:35:56	2020-01-01 00:07:35.000	2020-01-02 03:35:56.000	455	99356	49905.5	4990550	455	99356	49905.5	4990550	-32715	32423	4685.66	468566	-128	124	-1.7	-170
-456	2	10446	99357	1.36936	298.36936	149.86936	14986.93693	1.36936	298.36935	149.86936	14986.93672	1.36936	298.36936	149.86936	14986.93600	2020-01-01	2020-01-02	2020-01-01 00:07:36	2020-01-02 03:35:57	2020-01-01 00:07:36.000	2020-01-02 03:35:57.000	456	99357	49906.5	4990650	456	99357	49906.5	4990650	-32714	32424	4686.66	468666	-127	125	-0.7	-70
-457	2	10447	99358	1.37237	298.37237	149.87237	14987.23723	1.37237	298.37238	149.87237	14987.23747	1.37237	298.37237	149.87237	14987.23700	2020-01-01	2020-01-02	2020-01-01 00:07:37	2020-01-02 03:35:58	2020-01-01 00:07:37.000	2020-01-02 03:35:58.000	457	99358	49907.5	4990750	457	99358	49907.5	4990750	-32713	32425	4687.66	468766	-126	126	0.3	30
-458	2	10448	99359	1.37537	298.37537	149.87537	14987.53753	1.37537	298.37537	149.87537	14987.5376	1.37537	298.37537	149.87537	14987.53700	2020-01-01	2020-01-02	2020-01-01 00:07:38	2020-01-02 03:35:59	2020-01-01 00:07:38.000	2020-01-02 03:35:59.000	458	99359	49908.5	4990850	458	99359	49908.5	4990850	-32712	32426	4688.66	468866	-125	127	1.3	130
-459	2	10449	99360	1.37837	298.37837	149.87837	14987.83783	1.37837	298.3784	149.87837	14987.83775	1.37837	298.37837	149.87837	14987.83700	2020-01-01	2020-01-02	2020-01-01 00:07:39	2020-01-02 03:36:00	2020-01-01 00:07:39.000	2020-01-02 03:36:00.000	459	99360	49909.5	4990950	459	99360	49909.5	4990950	-32711	32427	4689.66	468966	-128	127	-0.26	-26
+450	2	10440	99351	1.35135	298.35135	149.85135	14985.13513	1.35135	298.35135	149.85134	14985.13495	1.35135	298.35135	149.85135	14985.135	2020-01-01	2020-01-02	2020-01-01 00:07:30	2020-01-02 03:35:51	2020-01-01 00:07:30.000	2020-01-02 03:35:51.000	450	99351	49900.5	4990050	450	99351	49900.5	4990050	-32720	32418	4680.66	468066	-126	125	0.98	98
+451	2	10441	99352	1.35435	298.35435	149.85435	14985.43543	1.35435	298.35434	149.85435	14985.43525	1.35435	298.35435	149.85434999999998	14985.435	2020-01-01	2020-01-02	2020-01-01 00:07:31	2020-01-02 03:35:52	2020-01-01 00:07:31.000	2020-01-02 03:35:52.000	451	99352	49901.5	4990150	451	99352	49901.5	4990150	-32719	32419	4681.66	468166	-125	126	1.98	198
+452	2	10442	99353	1.35735	298.35735	149.85735	14985.73573	1.35735	298.35736	149.85736	14985.736	1.35735	298.35735	149.85735	14985.735	2020-01-01	2020-01-02	2020-01-01 00:07:32	2020-01-02 03:35:53	2020-01-01 00:07:32.000	2020-01-02 03:35:53.000	452	99353	49902.5	4990250	452	99353	49902.5	4990250	-32718	32420	4682.66	468266	-124	127	2.98	298
+453	2	10443	99354	1.36036	298.36036	149.86036	14986.03603	1.36036	298.36035	149.86036	14986.03614	1.36036	298.36036	149.86036000000001	14986.036	2020-01-01	2020-01-02	2020-01-01 00:07:33	2020-01-02 03:35:54	2020-01-01 00:07:33.000	2020-01-02 03:35:54.000	453	99354	49903.5	4990350	453	99354	49903.5	4990350	-32717	32421	4683.66	468366	-128	127	1.42	142
+454	2	10444	99355	1.36336	298.36336	149.86336	14986.33633	1.36336	298.36337	149.86336	14986.33629	1.36336	298.36336	149.86336	14986.336	2020-01-01	2020-01-02	2020-01-01 00:07:34	2020-01-02 03:35:55	2020-01-01 00:07:34.000	2020-01-02 03:35:55.000	454	99355	49904.5	4990450	454	99355	49904.5	4990450	-32716	32422	4684.66	468466	-128	127	-0.14	-14
+455	2	10445	99356	1.36636	298.36636	149.86636	14986.63663	1.36636	298.36636	149.86636	14986.63641	1.36636	298.36636	149.86636000000001	14986.636	2020-01-01	2020-01-02	2020-01-01 00:07:35	2020-01-02 03:35:56	2020-01-01 00:07:35.000	2020-01-02 03:35:56.000	455	99356	49905.5	4990550	455	99356	49905.5	4990550	-32715	32423	4685.66	468566	-128	124	-1.7	-170
+456	2	10446	99357	1.36936	298.36936	149.86936	14986.93693	1.36936	298.36935	149.86936	14986.93672	1.36936	298.36936	149.86936	14986.936	2020-01-01	2020-01-02	2020-01-01 00:07:36	2020-01-02 03:35:57	2020-01-01 00:07:36.000	2020-01-02 03:35:57.000	456	99357	49906.5	4990650	456	99357	49906.5	4990650	-32714	32424	4686.66	468666	-127	125	-0.7	-70
+457	2	10447	99358	1.37237	298.37237	149.87237	14987.23723	1.37237	298.37238	149.87237	14987.23747	1.37237	298.37237	149.87237	14987.237	2020-01-01	2020-01-02	2020-01-01 00:07:37	2020-01-02 03:35:58	2020-01-01 00:07:37.000	2020-01-02 03:35:58.000	457	99358	49907.5	4990750	457	99358	49907.5	4990750	-32713	32425	4687.66	468766	-126	126	0.3	30
+458	2	10448	99359	1.37537	298.37537	149.87537	14987.53753	1.37537	298.37537	149.87537	14987.5376	1.37537	298.37537	149.87537	14987.537	2020-01-01	2020-01-02	2020-01-01 00:07:38	2020-01-02 03:35:59	2020-01-01 00:07:38.000	2020-01-02 03:35:59.000	458	99359	49908.5	4990850	458	99359	49908.5	4990850	-32712	32426	4688.66	468866	-125	127	1.3	130
+459	2	10449	99360	1.37837	298.37837	149.87837	14987.83783	1.37837	298.3784	149.87837	14987.83775	1.37837	298.37837	149.87837	14987.837	2020-01-01	2020-01-02	2020-01-01 00:07:39	2020-01-02 03:36:00	2020-01-01 00:07:39.000	2020-01-02 03:36:00.000	459	99360	49909.5	4990950	459	99360	49909.5	4990950	-32711	32427	4689.66	468966	-128	127	-0.26	-26
 46	2	10036	99946	0.13813	300.13813	150.13813	15163.95195	0.13813	300.13815	150.13814	15163.95214	0.13813	300.13813	150.13813	15163.95113	2020-01-01	2020-01-02	2020-01-01 00:00:46	2020-01-02 03:45:46	2020-01-01 00:00:46.000	2020-01-02 03:45:46.000	46	99946	49996	5049596	46	99946	49996	5049596	-32523	32412	4575.009900990099	462076	-125	127	-0.039603960396039604	-4
-460	2	10450	99361	1.38138	298.38138	149.88138	14988.13813	1.38138	298.38138	149.88137	14988.13789	1.38138	298.38138	149.88138	14988.13800	2020-01-01	2020-01-02	2020-01-01 00:07:40	2020-01-02 03:36:01	2020-01-01 00:07:40.000	2020-01-02 03:36:01.000	460	99361	49910.5	4991050	460	99361	49910.5	4991050	-32710	32428	4690.66	469066	-128	127	-1.82	-182
-461	2	10451	99362	1.38438	298.38438	149.88438	14988.43843	1.38438	298.3844	149.88438	14988.43864	1.38438	298.38438	149.88438	14988.43800	2020-01-01	2020-01-02	2020-01-01 00:07:41	2020-01-02 03:36:02	2020-01-01 00:07:41.000	2020-01-02 03:36:02.000	461	99362	49911.5	4991150	461	99362	49911.5	4991150	-32709	32429	4691.66	469166	-128	123	-3.38	-338
-462	2	10452	99363	1.38738	298.38738	149.88738	14988.73873	1.38738	298.3874	149.88738	14988.73894	1.38738	298.38738	149.88738	14988.73800	2020-01-01	2020-01-02	2020-01-01 00:07:42	2020-01-02 03:36:03	2020-01-01 00:07:42.000	2020-01-02 03:36:03.000	462	99363	49912.5	4991250	462	99363	49912.5	4991250	-32708	32430	4692.66	469266	-127	124	-2.38	-238
-463	2	10453	99364	1.39039	298.39039	149.89039	14989.03903	1.39039	298.39038	149.89039	14989.03907	1.39039	298.39039	149.89039	14989.03900	2020-01-01	2020-01-02	2020-01-01 00:07:43	2020-01-02 03:36:04	2020-01-01 00:07:43.000	2020-01-02 03:36:04.000	463	99364	49913.5	4991350	463	99364	49913.5	4991350	-32707	32431	4693.66	469366	-126	125	-1.38	-138
-464	2	10454	99365	1.39339	298.39339	149.89339	14989.33933	1.39339	298.3934	149.89339	14989.33922	1.39339	298.39339	149.89339	14989.33900	2020-01-01	2020-01-02	2020-01-01 00:07:44	2020-01-02 03:36:05	2020-01-01 00:07:44.000	2020-01-02 03:36:05.000	464	99365	49914.5	4991450	464	99365	49914.5	4991450	-32706	32432	4694.66	469466	-125	126	-0.38	-38
-465	2	10455	99366	1.39639	298.39639	149.89639	14989.63963	1.39639	298.3964	149.89639	14989.63936	1.39639	298.39639	149.89639	14989.63900	2020-01-01	2020-01-02	2020-01-01 00:07:45	2020-01-02 03:36:06	2020-01-01 00:07:45.000	2020-01-02 03:36:06.000	465	99366	49915.5	4991550	465	99366	49915.5	4991550	-32705	32433	4695.66	469566	-124	127	0.62	62
-466	2	10456	99367	1.39939	298.39939	149.89939	14989.93993	1.39939	298.3994	149.8994	14989.94011	1.39939	298.39939	149.89939	14989.93900	2020-01-01	2020-01-02	2020-01-01 00:07:46	2020-01-02 03:36:07	2020-01-01 00:07:46.000	2020-01-02 03:36:07.000	466	99367	49916.5	4991650	466	99367	49916.5	4991650	-32704	32434	4696.66	469666	-128	127	-0.94	-94
-467	2	10457	99368	1.4024	298.4024	149.9024	14990.24024	1.4024	298.4024	149.9024	14990.24041	1.40240	298.40240	149.9024	14990.24000	2020-01-01	2020-01-02	2020-01-01 00:07:47	2020-01-02 03:36:08	2020-01-01 00:07:47.000	2020-01-02 03:36:08.000	467	99368	49917.5	4991750	467	99368	49917.5	4991750	-32703	32435	4697.66	469766	-128	123	-2.5	-250
-468	2	10458	99369	1.4054	298.4054	149.9054	14990.54054	1.4054	298.4054	149.9054	14990.54058	1.40540	298.40540	149.90540000000001	14990.54000	2020-01-01	2020-01-02	2020-01-01 00:07:48	2020-01-02 03:36:09	2020-01-01 00:07:48.000	2020-01-02 03:36:09.000	468	99369	49918.5	4991850	468	99369	49918.5	4991850	-32702	32436	4698.66	469866	-127	124	-1.5	-150
-469	2	10459	99370	1.4084	298.4084	149.9084	14990.84084	1.4084	298.40842	149.9084	14990.8407	1.40840	298.40840	149.9084	14990.84000	2020-01-01	2020-01-02	2020-01-01 00:07:49	2020-01-02 03:36:10	2020-01-01 00:07:49.000	2020-01-02 03:36:10.000	469	99370	49919.5	4991950	469	99370	49919.5	4991950	-32701	32437	4699.66	469966	-126	125	-0.5	-50
+460	2	10450	99361	1.38138	298.38138	149.88138	14988.13813	1.38138	298.38138	149.88137	14988.13789	1.38138	298.38138	149.88138	14988.138	2020-01-01	2020-01-02	2020-01-01 00:07:40	2020-01-02 03:36:01	2020-01-01 00:07:40.000	2020-01-02 03:36:01.000	460	99361	49910.5	4991050	460	99361	49910.5	4991050	-32710	32428	4690.66	469066	-128	127	-1.82	-182
+461	2	10451	99362	1.38438	298.38438	149.88438	14988.43843	1.38438	298.3844	149.88438	14988.43864	1.38438	298.38438	149.88438	14988.438	2020-01-01	2020-01-02	2020-01-01 00:07:41	2020-01-02 03:36:02	2020-01-01 00:07:41.000	2020-01-02 03:36:02.000	461	99362	49911.5	4991150	461	99362	49911.5	4991150	-32709	32429	4691.66	469166	-128	123	-3.38	-338
+462	2	10452	99363	1.38738	298.38738	149.88738	14988.73873	1.38738	298.3874	149.88738	14988.73894	1.38738	298.38738	149.88738	14988.738	2020-01-01	2020-01-02	2020-01-01 00:07:42	2020-01-02 03:36:03	2020-01-01 00:07:42.000	2020-01-02 03:36:03.000	462	99363	49912.5	4991250	462	99363	49912.5	4991250	-32708	32430	4692.66	469266	-127	124	-2.38	-238
+463	2	10453	99364	1.39039	298.39039	149.89039	14989.03903	1.39039	298.39038	149.89039	14989.03907	1.39039	298.39039	149.89039	14989.039	2020-01-01	2020-01-02	2020-01-01 00:07:43	2020-01-02 03:36:04	2020-01-01 00:07:43.000	2020-01-02 03:36:04.000	463	99364	49913.5	4991350	463	99364	49913.5	4991350	-32707	32431	4693.66	469366	-126	125	-1.38	-138
+464	2	10454	99365	1.39339	298.39339	149.89339	14989.33933	1.39339	298.3934	149.89339	14989.33922	1.39339	298.39339	149.89339	14989.339	2020-01-01	2020-01-02	2020-01-01 00:07:44	2020-01-02 03:36:05	2020-01-01 00:07:44.000	2020-01-02 03:36:05.000	464	99365	49914.5	4991450	464	99365	49914.5	4991450	-32706	32432	4694.66	469466	-125	126	-0.38	-38
+465	2	10455	99366	1.39639	298.39639	149.89639	14989.63963	1.39639	298.3964	149.89639	14989.63936	1.39639	298.39639	149.89639	14989.639	2020-01-01	2020-01-02	2020-01-01 00:07:45	2020-01-02 03:36:06	2020-01-01 00:07:45.000	2020-01-02 03:36:06.000	465	99366	49915.5	4991550	465	99366	49915.5	4991550	-32705	32433	4695.66	469566	-124	127	0.62	62
+466	2	10456	99367	1.39939	298.39939	149.89939	14989.93993	1.39939	298.3994	149.8994	14989.94011	1.39939	298.39939	149.89939	14989.939	2020-01-01	2020-01-02	2020-01-01 00:07:46	2020-01-02 03:36:07	2020-01-01 00:07:46.000	2020-01-02 03:36:07.000	466	99367	49916.5	4991650	466	99367	49916.5	4991650	-32704	32434	4696.66	469666	-128	127	-0.94	-94
+467	2	10457	99368	1.4024	298.4024	149.9024	14990.24024	1.4024	298.4024	149.9024	14990.24041	1.4024	298.4024	149.9024	14990.24	2020-01-01	2020-01-02	2020-01-01 00:07:47	2020-01-02 03:36:08	2020-01-01 00:07:47.000	2020-01-02 03:36:08.000	467	99368	49917.5	4991750	467	99368	49917.5	4991750	-32703	32435	4697.66	469766	-128	123	-2.5	-250
+468	2	10458	99369	1.4054	298.4054	149.9054	14990.54054	1.4054	298.4054	149.9054	14990.54058	1.4054	298.4054	149.90540000000001	14990.54	2020-01-01	2020-01-02	2020-01-01 00:07:48	2020-01-02 03:36:09	2020-01-01 00:07:48.000	2020-01-02 03:36:09.000	468	99369	49918.5	4991850	468	99369	49918.5	4991850	-32702	32436	4698.66	469866	-127	124	-1.5	-150
+469	2	10459	99370	1.4084	298.4084	149.9084	14990.84084	1.4084	298.40842	149.9084	14990.8407	1.4084	298.4084	149.9084	14990.84	2020-01-01	2020-01-02	2020-01-01 00:07:49	2020-01-02 03:36:10	2020-01-01 00:07:49.000	2020-01-02 03:36:10.000	469	99370	49919.5	4991950	469	99370	49919.5	4991950	-32701	32437	4699.66	469966	-126	125	-0.5	-50
 47	2	10037	99947	0.14114	300.14114	150.14114	15164.25525	0.14114	300.14114	150.14114	15164.25545	0.14114	300.14114	150.14114	15164.25514	2020-01-01	2020-01-02	2020-01-01 00:00:47	2020-01-02 03:45:47	2020-01-01 00:00:47.000	2020-01-02 03:45:47.000	47	99947	49997	5049697	47	99947	49997	5049697	-32522	32413	4576.009900990099	462177	-128	127	-1.5742574257425743	-159
-470	2	10460	99371	1.41141	298.41141	149.91141	14991.14114	1.41141	298.4114	149.9114	14991.14099	1.41141	298.41141	149.91141	14991.14100	2020-01-01	2020-01-02	2020-01-01 00:07:50	2020-01-02 03:36:11	2020-01-01 00:07:50.000	2020-01-02 03:36:11.000	470	99371	49920.5	4992050	470	99371	49920.5	4992050	-32700	32438	4700.66	470066	-125	126	0.5	50
-471	2	10461	99372	1.41441	298.41441	149.91441	14991.44144	1.41441	298.41443	149.91441	14991.44159	1.41441	298.41441	149.91441	14991.44100	2020-01-01	2020-01-02	2020-01-01 00:07:51	2020-01-02 03:36:12	2020-01-01 00:07:51.000	2020-01-02 03:36:12.000	471	99372	49921.5	4992150	471	99372	49921.5	4992150	-32699	32439	4701.66	470166	-124	127	1.5	150
-472	2	10462	99373	1.41741	298.41741	149.91741	14991.74174	1.41741	298.41742	149.91741	14991.74188	1.41741	298.41741	149.91741	14991.74100	2020-01-01	2020-01-02	2020-01-01 00:07:52	2020-01-02 03:36:13	2020-01-01 00:07:52.000	2020-01-02 03:36:13.000	472	99373	49922.5	4992250	472	99373	49922.5	4992250	-32698	32440	4702.66	470266	-128	127	-0.06	-6
-473	2	10463	99374	1.42042	298.42042	149.92042	14992.04204	1.42042	298.4204	149.92042	14992.04204	1.42042	298.42042	149.92042	14992.04200	2020-01-01	2020-01-02	2020-01-01 00:07:53	2020-01-02 03:36:14	2020-01-01 00:07:53.000	2020-01-02 03:36:14.000	473	99374	49923.5	4992350	473	99374	49923.5	4992350	-32697	32441	4703.66	470366	-128	123	-1.62	-162
-474	2	10464	99375	1.42342	298.42342	149.92342	14992.34234	1.42342	298.42343	149.92342	14992.34216	1.42342	298.42342	149.92342	14992.34200	2020-01-01	2020-01-02	2020-01-01 00:07:54	2020-01-02 03:36:15	2020-01-01 00:07:54.000	2020-01-02 03:36:15.000	474	99375	49924.5	4992450	474	99375	49924.5	4992450	-32696	32442	4704.66	470466	-127	124	-0.62	-62
-475	2	10465	99376	1.42642	298.42642	149.92642	14992.64264	1.42642	298.42642	149.92642	14992.64246	1.42642	298.42642	149.92642	14992.64200	2020-01-01	2020-01-02	2020-01-01 00:07:55	2020-01-02 03:36:16	2020-01-01 00:07:55.000	2020-01-02 03:36:16.000	475	99376	49925.5	4992550	475	99376	49925.5	4992550	-32695	32443	4705.66	470566	-126	125	0.38	38
-476	2	10466	99377	1.42942	298.42942	149.92942	14992.94294	1.42942	298.42944	149.92943	14992.94305	1.42942	298.42942	149.92942	14992.94200	2020-01-01	2020-01-02	2020-01-01 00:07:56	2020-01-02 03:36:17	2020-01-01 00:07:56.000	2020-01-02 03:36:17.000	476	99377	49926.5	4992650	476	99377	49926.5	4992650	-32694	32444	4706.66	470666	-125	126	1.38	138
-477	2	10467	99378	1.43243	298.43243	149.93243	14993.24324	1.43243	298.43243	149.93243	14993.24338	1.43243	298.43243	149.93243	14993.24300	2020-01-01	2020-01-02	2020-01-01 00:07:57	2020-01-02 03:36:18	2020-01-01 00:07:57.000	2020-01-02 03:36:18.000	477	99378	49927.5	4992750	477	99378	49927.5	4992750	-32693	32445	4707.66	470766	-124	127	2.38	238
-478	2	10468	99379	1.43543	298.43543	149.93543	14993.54354	1.43543	298.43542	149.93543	14993.54352	1.43543	298.43543	149.93543	14993.54300	2020-01-01	2020-01-02	2020-01-01 00:07:58	2020-01-02 03:36:19	2020-01-01 00:07:58.000	2020-01-02 03:36:19.000	478	99379	49928.5	4992850	478	99379	49928.5	4992850	-32692	32446	4708.66	470866	-128	127	0.82	82
-479	2	10469	99380	1.43843	298.43843	149.93843	14993.84384	1.43843	298.43845	149.93844	14993.84427	1.43843	298.43843	149.93843	14993.84300	2020-01-01	2020-01-02	2020-01-01 00:07:59	2020-01-02 03:36:20	2020-01-01 00:07:59.000	2020-01-02 03:36:20.000	479	99380	49929.5	4992950	479	99380	49929.5	4992950	-32691	32447	4709.66	470966	-128	127	-0.74	-74
+470	2	10460	99371	1.41141	298.41141	149.91141	14991.14114	1.41141	298.4114	149.9114	14991.14099	1.41141	298.41141	149.91141	14991.141	2020-01-01	2020-01-02	2020-01-01 00:07:50	2020-01-02 03:36:11	2020-01-01 00:07:50.000	2020-01-02 03:36:11.000	470	99371	49920.5	4992050	470	99371	49920.5	4992050	-32700	32438	4700.66	470066	-125	126	0.5	50
+471	2	10461	99372	1.41441	298.41441	149.91441	14991.44144	1.41441	298.41443	149.91441	14991.44159	1.41441	298.41441	149.91441	14991.441	2020-01-01	2020-01-02	2020-01-01 00:07:51	2020-01-02 03:36:12	2020-01-01 00:07:51.000	2020-01-02 03:36:12.000	471	99372	49921.5	4992150	471	99372	49921.5	4992150	-32699	32439	4701.66	470166	-124	127	1.5	150
+472	2	10462	99373	1.41741	298.41741	149.91741	14991.74174	1.41741	298.41742	149.91741	14991.74188	1.41741	298.41741	149.91741	14991.741	2020-01-01	2020-01-02	2020-01-01 00:07:52	2020-01-02 03:36:13	2020-01-01 00:07:52.000	2020-01-02 03:36:13.000	472	99373	49922.5	4992250	472	99373	49922.5	4992250	-32698	32440	4702.66	470266	-128	127	-0.06	-6
+473	2	10463	99374	1.42042	298.42042	149.92042	14992.04204	1.42042	298.4204	149.92042	14992.04204	1.42042	298.42042	149.92042	14992.042	2020-01-01	2020-01-02	2020-01-01 00:07:53	2020-01-02 03:36:14	2020-01-01 00:07:53.000	2020-01-02 03:36:14.000	473	99374	49923.5	4992350	473	99374	49923.5	4992350	-32697	32441	4703.66	470366	-128	123	-1.62	-162
+474	2	10464	99375	1.42342	298.42342	149.92342	14992.34234	1.42342	298.42343	149.92342	14992.34216	1.42342	298.42342	149.92342	14992.342	2020-01-01	2020-01-02	2020-01-01 00:07:54	2020-01-02 03:36:15	2020-01-01 00:07:54.000	2020-01-02 03:36:15.000	474	99375	49924.5	4992450	474	99375	49924.5	4992450	-32696	32442	4704.66	470466	-127	124	-0.62	-62
+475	2	10465	99376	1.42642	298.42642	149.92642	14992.64264	1.42642	298.42642	149.92642	14992.64246	1.42642	298.42642	149.92642	14992.642	2020-01-01	2020-01-02	2020-01-01 00:07:55	2020-01-02 03:36:16	2020-01-01 00:07:55.000	2020-01-02 03:36:16.000	475	99376	49925.5	4992550	475	99376	49925.5	4992550	-32695	32443	4705.66	470566	-126	125	0.38	38
+476	2	10466	99377	1.42942	298.42942	149.92942	14992.94294	1.42942	298.42944	149.92943	14992.94305	1.42942	298.42942	149.92942	14992.942	2020-01-01	2020-01-02	2020-01-01 00:07:56	2020-01-02 03:36:17	2020-01-01 00:07:56.000	2020-01-02 03:36:17.000	476	99377	49926.5	4992650	476	99377	49926.5	4992650	-32694	32444	4706.66	470666	-125	126	1.38	138
+477	2	10467	99378	1.43243	298.43243	149.93243	14993.24324	1.43243	298.43243	149.93243	14993.24338	1.43243	298.43243	149.93243	14993.243	2020-01-01	2020-01-02	2020-01-01 00:07:57	2020-01-02 03:36:18	2020-01-01 00:07:57.000	2020-01-02 03:36:18.000	477	99378	49927.5	4992750	477	99378	49927.5	4992750	-32693	32445	4707.66	470766	-124	127	2.38	238
+478	2	10468	99379	1.43543	298.43543	149.93543	14993.54354	1.43543	298.43542	149.93543	14993.54352	1.43543	298.43543	149.93543	14993.543	2020-01-01	2020-01-02	2020-01-01 00:07:58	2020-01-02 03:36:19	2020-01-01 00:07:58.000	2020-01-02 03:36:19.000	478	99379	49928.5	4992850	478	99379	49928.5	4992850	-32692	32446	4708.66	470866	-128	127	0.82	82
+479	2	10469	99380	1.43843	298.43843	149.93843	14993.84384	1.43843	298.43845	149.93844	14993.84427	1.43843	298.43843	149.93843	14993.843	2020-01-01	2020-01-02	2020-01-01 00:07:59	2020-01-02 03:36:20	2020-01-01 00:07:59.000	2020-01-02 03:36:20.000	479	99380	49929.5	4992950	479	99380	49929.5	4992950	-32691	32447	4709.66	470966	-128	127	-0.74	-74
 48	2	10038	99948	0.14414	300.14414	150.14414	15164.55855	0.14414	300.14413	150.14414	15164.55863	0.14414	300.14414	150.14414	15164.55814	2020-01-01	2020-01-02	2020-01-01 00:00:48	2020-01-02 03:45:48	2020-01-01 00:00:48.000	2020-01-02 03:45:48.000	48	99948	49998	5049798	48	99948	49998	5049798	-32521	32414	4577.009900990099	462278	-128	127	-3.108910891089109	-314
-480	2	10470	99381	1.44144	298.44144	149.94144	14994.14414	1.44144	298.44144	149.94143	14994.14392	1.44144	298.44144	149.94144	14994.14400	2020-01-01	2020-01-02	2020-01-01 00:08:00	2020-01-02 03:36:21	2020-01-01 00:08:00.000	2020-01-02 03:36:21.000	480	99381	49930.5	4993050	480	99381	49930.5	4993050	-32690	32448	4710.66	471066	-128	124	-2.3	-230
-481	2	10471	99382	1.44444	298.44444	149.94444	14994.44444	1.44444	298.44446	149.94444	14994.44452	1.44444	298.44444	149.94444	14994.44400	2020-01-01	2020-01-02	2020-01-01 00:08:01	2020-01-02 03:36:22	2020-01-01 00:08:01.000	2020-01-02 03:36:22.000	481	99382	49931.5	4993150	481	99382	49931.5	4993150	-32689	32449	4711.66	471166	-127	125	-1.3	-130
-482	2	10472	99383	1.44744	298.44744	149.94744	14994.74474	1.44744	298.44745	149.94744	14994.74485	1.44744	298.44744	149.94744	14994.74400	2020-01-01	2020-01-02	2020-01-01 00:08:02	2020-01-02 03:36:23	2020-01-01 00:08:02.000	2020-01-02 03:36:23.000	482	99383	49932.5	4993250	482	99383	49932.5	4993250	-32688	32450	4712.66	471266	-126	126	-0.3	-30
-483	2	10473	99384	1.45045	298.45045	149.95045	14995.04504	1.45045	298.45044	149.95044	14995.04499	1.45045	298.45045	149.95045	14995.04500	2020-01-01	2020-01-02	2020-01-01 00:08:03	2020-01-02 03:36:24	2020-01-01 00:08:03.000	2020-01-02 03:36:24.000	483	99384	49933.5	4993350	483	99384	49933.5	4993350	-32687	32451	4713.66	471366	-125	127	0.7	70
-484	2	10474	99385	1.45345	298.45345	149.95345	14995.34534	1.45345	298.45346	149.95345	14995.34574	1.45345	298.45345	149.95345	14995.34500	2020-01-01	2020-01-02	2020-01-01 00:08:04	2020-01-02 03:36:25	2020-01-01 00:08:04.000	2020-01-02 03:36:25.000	484	99385	49934.5	4993450	484	99385	49934.5	4993450	-32686	32452	4714.66	471466	-128	127	-0.86	-86
-485	2	10475	99386	1.45645	298.45645	149.95645	14995.64564	1.45645	298.45645	149.95645	14995.6454	1.45645	298.45645	149.95645000000002	14995.64500	2020-01-01	2020-01-02	2020-01-01 00:08:05	2020-01-02 03:36:26	2020-01-01 00:08:05.000	2020-01-02 03:36:26.000	485	99386	49935.5	4993550	485	99386	49935.5	4993550	-32685	32453	4715.66	471566	-128	127	-2.42	-242
-486	2	10476	99387	1.45945	298.45945	149.95945	14995.94594	1.45945	298.45947	149.95946	14995.94602	1.45945	298.45945	149.95945	14995.94500	2020-01-01	2020-01-02	2020-01-01 00:08:06	2020-01-02 03:36:27	2020-01-01 00:08:06.000	2020-01-02 03:36:27.000	486	99387	49936.5	4993650	486	99387	49936.5	4993650	-32684	32454	4716.66	471666	-128	123	-3.98	-398
-487	2	10477	99388	1.46246	298.46246	149.96246	14996.24624	1.46246	298.46246	149.96246	14996.24633	1.46246	298.46246	149.96246	14996.24600	2020-01-01	2020-01-02	2020-01-01 00:08:07	2020-01-02 03:36:28	2020-01-01 00:08:07.000	2020-01-02 03:36:28.000	487	99388	49937.5	4993750	487	99388	49937.5	4993750	-32683	32455	4717.66	471766	-127	124	-2.98	-298
-488	2	10478	99389	1.46546	298.46546	149.96546	14996.54654	1.46546	298.46545	149.96546	14996.54645	1.46546	298.46546	149.96546	14996.54600	2020-01-01	2020-01-02	2020-01-01 00:08:08	2020-01-02 03:36:29	2020-01-01 00:08:08.000	2020-01-02 03:36:29.000	488	99389	49938.5	4993850	488	99389	49938.5	4993850	-32682	32456	4718.66	471866	-126	125	-1.98	-198
-489	2	10479	99390	1.46846	298.46846	149.96846	14996.84684	1.46846	298.46848	149.96847	14996.84721	1.46846	298.46846	149.96846	14996.84600	2020-01-01	2020-01-02	2020-01-01 00:08:09	2020-01-02 03:36:30	2020-01-01 00:08:09.000	2020-01-02 03:36:30.000	489	99390	49939.5	4993950	489	99390	49939.5	4993950	-32681	32457	4719.66	471966	-125	126	-0.98	-98
+480	2	10470	99381	1.44144	298.44144	149.94144	14994.14414	1.44144	298.44144	149.94143	14994.14392	1.44144	298.44144	149.94144	14994.144	2020-01-01	2020-01-02	2020-01-01 00:08:00	2020-01-02 03:36:21	2020-01-01 00:08:00.000	2020-01-02 03:36:21.000	480	99381	49930.5	4993050	480	99381	49930.5	4993050	-32690	32448	4710.66	471066	-128	124	-2.3	-230
+481	2	10471	99382	1.44444	298.44444	149.94444	14994.44444	1.44444	298.44446	149.94444	14994.44452	1.44444	298.44444	149.94444	14994.444	2020-01-01	2020-01-02	2020-01-01 00:08:01	2020-01-02 03:36:22	2020-01-01 00:08:01.000	2020-01-02 03:36:22.000	481	99382	49931.5	4993150	481	99382	49931.5	4993150	-32689	32449	4711.66	471166	-127	125	-1.3	-130
+482	2	10472	99383	1.44744	298.44744	149.94744	14994.74474	1.44744	298.44745	149.94744	14994.74485	1.44744	298.44744	149.94744	14994.744	2020-01-01	2020-01-02	2020-01-01 00:08:02	2020-01-02 03:36:23	2020-01-01 00:08:02.000	2020-01-02 03:36:23.000	482	99383	49932.5	4993250	482	99383	49932.5	4993250	-32688	32450	4712.66	471266	-126	126	-0.3	-30
+483	2	10473	99384	1.45045	298.45045	149.95045	14995.04504	1.45045	298.45044	149.95044	14995.04499	1.45045	298.45045	149.95045	14995.045	2020-01-01	2020-01-02	2020-01-01 00:08:03	2020-01-02 03:36:24	2020-01-01 00:08:03.000	2020-01-02 03:36:24.000	483	99384	49933.5	4993350	483	99384	49933.5	4993350	-32687	32451	4713.66	471366	-125	127	0.7	70
+484	2	10474	99385	1.45345	298.45345	149.95345	14995.34534	1.45345	298.45346	149.95345	14995.34574	1.45345	298.45345	149.95345	14995.345	2020-01-01	2020-01-02	2020-01-01 00:08:04	2020-01-02 03:36:25	2020-01-01 00:08:04.000	2020-01-02 03:36:25.000	484	99385	49934.5	4993450	484	99385	49934.5	4993450	-32686	32452	4714.66	471466	-128	127	-0.86	-86
+485	2	10475	99386	1.45645	298.45645	149.95645	14995.64564	1.45645	298.45645	149.95645	14995.6454	1.45645	298.45645	149.95645000000002	14995.645	2020-01-01	2020-01-02	2020-01-01 00:08:05	2020-01-02 03:36:26	2020-01-01 00:08:05.000	2020-01-02 03:36:26.000	485	99386	49935.5	4993550	485	99386	49935.5	4993550	-32685	32453	4715.66	471566	-128	127	-2.42	-242
+486	2	10476	99387	1.45945	298.45945	149.95945	14995.94594	1.45945	298.45947	149.95946	14995.94602	1.45945	298.45945	149.95945	14995.945	2020-01-01	2020-01-02	2020-01-01 00:08:06	2020-01-02 03:36:27	2020-01-01 00:08:06.000	2020-01-02 03:36:27.000	486	99387	49936.5	4993650	486	99387	49936.5	4993650	-32684	32454	4716.66	471666	-128	123	-3.98	-398
+487	2	10477	99388	1.46246	298.46246	149.96246	14996.24624	1.46246	298.46246	149.96246	14996.24633	1.46246	298.46246	149.96246	14996.246	2020-01-01	2020-01-02	2020-01-01 00:08:07	2020-01-02 03:36:28	2020-01-01 00:08:07.000	2020-01-02 03:36:28.000	487	99388	49937.5	4993750	487	99388	49937.5	4993750	-32683	32455	4717.66	471766	-127	124	-2.98	-298
+488	2	10478	99389	1.46546	298.46546	149.96546	14996.54654	1.46546	298.46545	149.96546	14996.54645	1.46546	298.46546	149.96546	14996.546	2020-01-01	2020-01-02	2020-01-01 00:08:08	2020-01-02 03:36:29	2020-01-01 00:08:08.000	2020-01-02 03:36:29.000	488	99389	49938.5	4993850	488	99389	49938.5	4993850	-32682	32456	4718.66	471866	-126	125	-1.98	-198
+489	2	10479	99390	1.46846	298.46846	149.96846	14996.84684	1.46846	298.46848	149.96847	14996.84721	1.46846	298.46846	149.96846	14996.846	2020-01-01	2020-01-02	2020-01-01 00:08:09	2020-01-02 03:36:30	2020-01-01 00:08:09.000	2020-01-02 03:36:30.000	489	99390	49939.5	4993950	489	99390	49939.5	4993950	-32681	32457	4719.66	471966	-125	126	-0.98	-98
 49	2	10039	99949	0.14714	300.14714	150.14714	15164.86186	0.14714	300.14716	150.14714	15164.86173	0.14714	300.14714	150.14714	15164.86114	2020-01-01	2020-01-02	2020-01-01 00:00:49	2020-01-02 03:45:49	2020-01-01 00:00:49.000	2020-01-02 03:45:49.000	49	99949	49999	5049899	49	99949	49999	5049899	-32520	32415	4578.009900990099	462379	-128	123	-4.643564356435643	-469
-490	2	10480	99391	1.47147	298.47147	149.97147	14997.14714	1.47147	298.47147	149.97146	14997.14687	1.47147	298.47147	149.97147	14997.14700	2020-01-01	2020-01-02	2020-01-01 00:08:10	2020-01-02 03:36:31	2020-01-01 00:08:10.000	2020-01-02 03:36:31.000	490	99391	49940.5	4994050	490	99391	49940.5	4994050	-32680	32458	4720.66	472066	-124	127	0.02	2
-491	2	10481	99392	1.47447	298.47447	149.97447	14997.44744	1.47447	298.4745	149.97447	14997.44749	1.47447	298.47447	149.97447	14997.44700	2020-01-01	2020-01-02	2020-01-01 00:08:11	2020-01-02 03:36:32	2020-01-01 00:08:11.000	2020-01-02 03:36:32.000	491	99392	49941.5	4994150	491	99392	49941.5	4994150	-32679	32459	4721.66	472166	-128	127	-1.54	-154
-492	2	10482	99393	1.47747	298.47747	149.97747	14997.74774	1.47747	298.47748	149.97747	14997.74779	1.47747	298.47747	149.97746999999998	14997.74700	2020-01-01	2020-01-02	2020-01-01 00:08:12	2020-01-02 03:36:33	2020-01-01 00:08:12.000	2020-01-02 03:36:33.000	492	99393	49942.5	4994250	492	99393	49942.5	4994250	-32678	32460	4722.66	472266	-128	123	-3.1	-310
-493	2	10483	99394	1.48048	298.48048	149.98048	14998.04804	1.48048	298.48047	149.98048	14998.04809	1.48048	298.48048	149.98048	14998.04800	2020-01-01	2020-01-02	2020-01-01 00:08:13	2020-01-02 03:36:34	2020-01-01 00:08:13.000	2020-01-02 03:36:34.000	493	99394	49943.5	4994350	493	99394	49943.5	4994350	-32677	32461	4723.66	472366	-127	124	-2.1	-210
-494	2	10484	99395	1.48348	298.48348	149.98348	14998.34834	1.48348	298.4835	149.98348	14998.34868	1.48348	298.48348	149.98348	14998.34800	2020-01-01	2020-01-02	2020-01-01 00:08:14	2020-01-02 03:36:35	2020-01-01 00:08:14.000	2020-01-02 03:36:35.000	494	99395	49944.5	4994450	494	99395	49944.5	4994450	-32676	32462	4724.66	472466	-126	125	-1.1	-110
-495	2	10485	99396	1.48648	298.48648	149.98648	14998.64864	1.48648	298.48648	149.98648	14998.64837	1.48648	298.48648	149.98648	14998.64800	2020-01-01	2020-01-02	2020-01-01 00:08:15	2020-01-02 03:36:36	2020-01-01 00:08:15.000	2020-01-02 03:36:36.000	495	99396	49945.5	4994550	495	99396	49945.5	4994550	-32675	32463	4725.66	472566	-125	126	-0.1	-10
-496	2	10486	99397	1.48948	298.48948	149.98948	14998.94894	1.48948	298.4895	149.98948	14998.94896	1.48948	298.48948	149.98948000000001	14998.94800	2020-01-01	2020-01-02	2020-01-01 00:08:16	2020-01-02 03:36:37	2020-01-01 00:08:16.000	2020-01-02 03:36:37.000	496	99397	49946.5	4994650	496	99397	49946.5	4994650	-32674	32464	4726.66	472666	-124	127	0.9	90
-497	2	10487	99398	1.49249	298.49249	149.99249	14999.24924	1.49249	298.4925	149.99249	14999.24926	1.49249	298.49249	149.99249	14999.24900	2020-01-01	2020-01-02	2020-01-01 00:08:17	2020-01-02 03:36:38	2020-01-01 00:08:17.000	2020-01-02 03:36:38.000	497	99398	49947.5	4994750	497	99398	49947.5	4994750	-32673	32465	4727.66	472766	-128	127	-0.66	-66
-498	2	10488	99399	1.49549	298.49549	149.99549	14999.54954	1.49549	298.49548	149.99549	14999.54956	1.49549	298.49549	149.99549000000002	14999.54900	2020-01-01	2020-01-02	2020-01-01 00:08:18	2020-01-02 03:36:39	2020-01-01 00:08:18.000	2020-01-02 03:36:39.000	498	99399	49948.5	4994850	498	99399	49948.5	4994850	-32672	32466	4728.66	472866	-128	123	-2.22	-222
-499	2	10489	99400	1.49849	298.49849	149.99849	14999.84984	1.49849	298.4985	149.9985	14999.85015	1.49849	298.49849	149.99849	14999.84900	2020-01-01	2020-01-02	2020-01-01 00:08:19	2020-01-02 03:36:40	2020-01-01 00:08:19.000	2020-01-02 03:36:40.000	499	99400	49949.5	4994950	499	99400	49949.5	4994950	-32671	32467	4729.66	472966	-127	124	-1.22	-122
+490	2	10480	99391	1.47147	298.47147	149.97147	14997.14714	1.47147	298.47147	149.97146	14997.14687	1.47147	298.47147	149.97147	14997.147	2020-01-01	2020-01-02	2020-01-01 00:08:10	2020-01-02 03:36:31	2020-01-01 00:08:10.000	2020-01-02 03:36:31.000	490	99391	49940.5	4994050	490	99391	49940.5	4994050	-32680	32458	4720.66	472066	-124	127	0.02	2
+491	2	10481	99392	1.47447	298.47447	149.97447	14997.44744	1.47447	298.4745	149.97447	14997.44749	1.47447	298.47447	149.97447	14997.447	2020-01-01	2020-01-02	2020-01-01 00:08:11	2020-01-02 03:36:32	2020-01-01 00:08:11.000	2020-01-02 03:36:32.000	491	99392	49941.5	4994150	491	99392	49941.5	4994150	-32679	32459	4721.66	472166	-128	127	-1.54	-154
+492	2	10482	99393	1.47747	298.47747	149.97747	14997.74774	1.47747	298.47748	149.97747	14997.74779	1.47747	298.47747	149.97746999999998	14997.747	2020-01-01	2020-01-02	2020-01-01 00:08:12	2020-01-02 03:36:33	2020-01-01 00:08:12.000	2020-01-02 03:36:33.000	492	99393	49942.5	4994250	492	99393	49942.5	4994250	-32678	32460	4722.66	472266	-128	123	-3.1	-310
+493	2	10483	99394	1.48048	298.48048	149.98048	14998.04804	1.48048	298.48047	149.98048	14998.04809	1.48048	298.48048	149.98048	14998.048	2020-01-01	2020-01-02	2020-01-01 00:08:13	2020-01-02 03:36:34	2020-01-01 00:08:13.000	2020-01-02 03:36:34.000	493	99394	49943.5	4994350	493	99394	49943.5	4994350	-32677	32461	4723.66	472366	-127	124	-2.1	-210
+494	2	10484	99395	1.48348	298.48348	149.98348	14998.34834	1.48348	298.4835	149.98348	14998.34868	1.48348	298.48348	149.98348	14998.348	2020-01-01	2020-01-02	2020-01-01 00:08:14	2020-01-02 03:36:35	2020-01-01 00:08:14.000	2020-01-02 03:36:35.000	494	99395	49944.5	4994450	494	99395	49944.5	4994450	-32676	32462	4724.66	472466	-126	125	-1.1	-110
+495	2	10485	99396	1.48648	298.48648	149.98648	14998.64864	1.48648	298.48648	149.98648	14998.64837	1.48648	298.48648	149.98648	14998.648	2020-01-01	2020-01-02	2020-01-01 00:08:15	2020-01-02 03:36:36	2020-01-01 00:08:15.000	2020-01-02 03:36:36.000	495	99396	49945.5	4994550	495	99396	49945.5	4994550	-32675	32463	4725.66	472566	-125	126	-0.1	-10
+496	2	10486	99397	1.48948	298.48948	149.98948	14998.94894	1.48948	298.4895	149.98948	14998.94896	1.48948	298.48948	149.98948000000001	14998.948	2020-01-01	2020-01-02	2020-01-01 00:08:16	2020-01-02 03:36:37	2020-01-01 00:08:16.000	2020-01-02 03:36:37.000	496	99397	49946.5	4994650	496	99397	49946.5	4994650	-32674	32464	4726.66	472666	-124	127	0.9	90
+497	2	10487	99398	1.49249	298.49249	149.99249	14999.24924	1.49249	298.4925	149.99249	14999.24926	1.49249	298.49249	149.99249	14999.249	2020-01-01	2020-01-02	2020-01-01 00:08:17	2020-01-02 03:36:38	2020-01-01 00:08:17.000	2020-01-02 03:36:38.000	497	99398	49947.5	4994750	497	99398	49947.5	4994750	-32673	32465	4727.66	472766	-128	127	-0.66	-66
+498	2	10488	99399	1.49549	298.49549	149.99549	14999.54954	1.49549	298.49548	149.99549	14999.54956	1.49549	298.49549	149.99549000000002	14999.549	2020-01-01	2020-01-02	2020-01-01 00:08:18	2020-01-02 03:36:39	2020-01-01 00:08:18.000	2020-01-02 03:36:39.000	498	99399	49948.5	4994850	498	99399	49948.5	4994850	-32672	32466	4728.66	472866	-128	123	-2.22	-222
+499	2	10489	99400	1.49849	298.49849	149.99849	14999.84984	1.49849	298.4985	149.9985	14999.85015	1.49849	298.49849	149.99849	14999.849	2020-01-01	2020-01-02	2020-01-01 00:08:19	2020-01-02 03:36:40	2020-01-01 00:08:19.000	2020-01-02 03:36:40.000	499	99400	49949.5	4994950	499	99400	49949.5	4994950	-32671	32467	4729.66	472966	-127	124	-1.22	-122
 5	2	1004	9995	0.01501	300.01501	150.01501	15151.51651	0.01501	300.015	150.01501	15151.51648	0.01501	300.01501	150.01501	15151.51601	2020-01-01	2020-01-02	2020-01-01 00:00:05	2020-01-02 03:45:05	2020-01-01 00:00:05.000	2020-01-02 03:45:05.000	5	99905	49955	5045455	5	99905	49955	5045455	-32564	32371	4534.009900990099	457935	-128	123	-3.01980198019802	-305
 50	2	10040	99950	0.15015	300.15015	150.15015	15165.16516	0.15015	300.15015	150.15014	15165.16487	0.15015	300.15015	150.15015	15165.16515	2020-01-01	2020-01-02	2020-01-01 00:00:50	2020-01-02 03:45:50	2020-01-01 00:00:50.000	2020-01-02 03:45:50.000	50	99950	50000	5050000	50	99950	50000	5050000	-32519	32416	4579.009900990099	462480	-127	124	-3.6435643564356437	-368
-500	2	10490	99401	1.5015	298.5015	150.0015	15000.15015	1.5015	298.5015	150.00149	15000.14984	1.50150	298.50150	150.0015	15000.15000	2020-01-01	2020-01-02	2020-01-01 00:08:20	2020-01-02 03:36:41	2020-01-01 00:08:20.000	2020-01-02 03:36:41.000	500	99401	49950.5	4995050	500	99401	49950.5	4995050	-32670	32468	4730.66	473066	-126	125	-0.22	-22
-501	2	10491	99402	1.5045	298.5045	150.0045	15000.45045	1.5045	298.50452	150.0045	15000.45043	1.50450	298.50450	150.0045	15000.45000	2020-01-01	2020-01-02	2020-01-01 00:08:21	2020-01-02 03:36:42	2020-01-01 00:08:21.000	2020-01-02 03:36:42.000	501	99402	49951.5	4995150	501	99402	49951.5	4995150	-32669	32469	4731.66	473166	-125	126	0.78	78
-502	2	10492	99403	1.5075	298.5075	150.0075	15000.75075	1.5075	298.5075	150.0075	15000.75073	1.50750	298.50750	150.0075	15000.75000	2020-01-01	2020-01-02	2020-01-01 00:08:22	2020-01-02 03:36:43	2020-01-01 00:08:22.000	2020-01-02 03:36:43.000	502	99403	49952.5	4995250	502	99403	49952.5	4995250	-32668	32470	4732.66	473266	-124	127	1.78	178
-503	2	10493	99404	1.51051	298.51051	150.01051	15001.05105	1.51051	298.5105	150.01051	15001.05103	1.51051	298.51051	150.01050999999998	15001.05100	2020-01-01	2020-01-02	2020-01-01 00:08:23	2020-01-02 03:36:44	2020-01-01 00:08:23.000	2020-01-02 03:36:44.000	503	99404	49953.5	4995350	503	99404	49953.5	4995350	-32667	32471	4733.66	473366	-128	127	0.22	22
-504	2	10494	99405	1.51351	298.51351	150.01351	15001.35135	1.51351	298.51352	150.01351	15001.35162	1.51351	298.51351	150.01351	15001.35100	2020-01-01	2020-01-02	2020-01-01 00:08:24	2020-01-02 03:36:45	2020-01-01 00:08:24.000	2020-01-02 03:36:45.000	504	99405	49954.5	4995450	504	99405	49954.5	4995450	-32666	32472	4734.66	473466	-128	127	-1.34	-134
-505	2	10495	99406	1.51651	298.51651	150.01651	15001.65165	1.51651	298.5165	150.01651	15001.65131	1.51651	298.51651	150.01651	15001.65100	2020-01-01	2020-01-02	2020-01-01 00:08:25	2020-01-02 03:36:46	2020-01-01 00:08:25.000	2020-01-02 03:36:46.000	505	99406	49955.5	4995550	505	99406	49955.5	4995550	-32665	32473	4735.66	473566	-128	124	-2.9	-290
-506	2	10496	99407	1.51951	298.51951	150.01951	15001.95195	1.51951	298.51953	150.01951	15001.9519	1.51951	298.51951	150.01951	15001.95100	2020-01-01	2020-01-02	2020-01-01 00:08:26	2020-01-02 03:36:47	2020-01-01 00:08:26.000	2020-01-02 03:36:47.000	506	99407	49956.5	4995650	506	99407	49956.5	4995650	-32664	32474	4736.66	473666	-127	125	-1.9	-190
-507	2	10497	99408	1.52252	298.52252	150.02252	15002.25225	1.52252	298.52252	150.02252	15002.2522	1.52252	298.52252	150.02252000000001	15002.25200	2020-01-01	2020-01-02	2020-01-01 00:08:27	2020-01-02 03:36:48	2020-01-01 00:08:27.000	2020-01-02 03:36:48.000	507	99408	49957.5	4995750	507	99408	49957.5	4995750	-32663	32475	4737.66	473766	-126	126	-0.9	-90
-508	2	10498	99409	1.52552	298.52552	150.02552	15002.55255	1.52552	298.5255	150.02552	15002.5525	1.52552	298.52552	150.02552	15002.55200	2020-01-01	2020-01-02	2020-01-01 00:08:28	2020-01-02 03:36:49	2020-01-01 00:08:28.000	2020-01-02 03:36:49.000	508	99409	49958.5	4995850	508	99409	49958.5	4995850	-32662	32476	4738.66	473866	-125	127	0.1	10
-509	2	10499	99410	1.52852	298.52852	150.02852	15002.85285	1.52852	298.52853	150.02853	15002.85312	1.52852	298.52852	150.02852000000001	15002.85200	2020-01-01	2020-01-02	2020-01-01 00:08:29	2020-01-02 03:36:50	2020-01-01 00:08:29.000	2020-01-02 03:36:50.000	509	99410	49959.5	4995950	509	99410	49959.5	4995950	-32661	32477	4739.66	473966	-128	127	-1.46	-146
+500	2	10490	99401	1.5015	298.5015	150.0015	15000.15015	1.5015	298.5015	150.00149	15000.14984	1.5015	298.5015	150.0015	15000.15	2020-01-01	2020-01-02	2020-01-01 00:08:20	2020-01-02 03:36:41	2020-01-01 00:08:20.000	2020-01-02 03:36:41.000	500	99401	49950.5	4995050	500	99401	49950.5	4995050	-32670	32468	4730.66	473066	-126	125	-0.22	-22
+501	2	10491	99402	1.5045	298.5045	150.0045	15000.45045	1.5045	298.50452	150.0045	15000.45043	1.5045	298.5045	150.0045	15000.45	2020-01-01	2020-01-02	2020-01-01 00:08:21	2020-01-02 03:36:42	2020-01-01 00:08:21.000	2020-01-02 03:36:42.000	501	99402	49951.5	4995150	501	99402	49951.5	4995150	-32669	32469	4731.66	473166	-125	126	0.78	78
+502	2	10492	99403	1.5075	298.5075	150.0075	15000.75075	1.5075	298.5075	150.0075	15000.75073	1.5075	298.5075	150.0075	15000.75	2020-01-01	2020-01-02	2020-01-01 00:08:22	2020-01-02 03:36:43	2020-01-01 00:08:22.000	2020-01-02 03:36:43.000	502	99403	49952.5	4995250	502	99403	49952.5	4995250	-32668	32470	4732.66	473266	-124	127	1.78	178
+503	2	10493	99404	1.51051	298.51051	150.01051	15001.05105	1.51051	298.5105	150.01051	15001.05103	1.51051	298.51051	150.01050999999998	15001.051	2020-01-01	2020-01-02	2020-01-01 00:08:23	2020-01-02 03:36:44	2020-01-01 00:08:23.000	2020-01-02 03:36:44.000	503	99404	49953.5	4995350	503	99404	49953.5	4995350	-32667	32471	4733.66	473366	-128	127	0.22	22
+504	2	10494	99405	1.51351	298.51351	150.01351	15001.35135	1.51351	298.51352	150.01351	15001.35162	1.51351	298.51351	150.01351	15001.351	2020-01-01	2020-01-02	2020-01-01 00:08:24	2020-01-02 03:36:45	2020-01-01 00:08:24.000	2020-01-02 03:36:45.000	504	99405	49954.5	4995450	504	99405	49954.5	4995450	-32666	32472	4734.66	473466	-128	127	-1.34	-134
+505	2	10495	99406	1.51651	298.51651	150.01651	15001.65165	1.51651	298.5165	150.01651	15001.65131	1.51651	298.51651	150.01651	15001.651	2020-01-01	2020-01-02	2020-01-01 00:08:25	2020-01-02 03:36:46	2020-01-01 00:08:25.000	2020-01-02 03:36:46.000	505	99406	49955.5	4995550	505	99406	49955.5	4995550	-32665	32473	4735.66	473566	-128	124	-2.9	-290
+506	2	10496	99407	1.51951	298.51951	150.01951	15001.95195	1.51951	298.51953	150.01951	15001.9519	1.51951	298.51951	150.01951	15001.951	2020-01-01	2020-01-02	2020-01-01 00:08:26	2020-01-02 03:36:47	2020-01-01 00:08:26.000	2020-01-02 03:36:47.000	506	99407	49956.5	4995650	506	99407	49956.5	4995650	-32664	32474	4736.66	473666	-127	125	-1.9	-190
+507	2	10497	99408	1.52252	298.52252	150.02252	15002.25225	1.52252	298.52252	150.02252	15002.2522	1.52252	298.52252	150.02252000000001	15002.252	2020-01-01	2020-01-02	2020-01-01 00:08:27	2020-01-02 03:36:48	2020-01-01 00:08:27.000	2020-01-02 03:36:48.000	507	99408	49957.5	4995750	507	99408	49957.5	4995750	-32663	32475	4737.66	473766	-126	126	-0.9	-90
+508	2	10498	99409	1.52552	298.52552	150.02552	15002.55255	1.52552	298.5255	150.02552	15002.5525	1.52552	298.52552	150.02552	15002.552	2020-01-01	2020-01-02	2020-01-01 00:08:28	2020-01-02 03:36:49	2020-01-01 00:08:28.000	2020-01-02 03:36:49.000	508	99409	49958.5	4995850	508	99409	49958.5	4995850	-32662	32476	4738.66	473866	-125	127	0.1	10
+509	2	10499	99410	1.52852	298.52852	150.02852	15002.85285	1.52852	298.52853	150.02853	15002.85312	1.52852	298.52852	150.02852000000001	15002.852	2020-01-01	2020-01-02	2020-01-01 00:08:29	2020-01-02 03:36:50	2020-01-01 00:08:29.000	2020-01-02 03:36:50.000	509	99410	49959.5	4995950	509	99410	49959.5	4995950	-32661	32477	4739.66	473966	-128	127	-1.46	-146
 51	2	10041	99951	0.15315	300.15315	150.15315	15165.46846	0.15315	300.15317	150.15315	15165.46863	0.15315	300.15315	150.15315	15165.46815	2020-01-01	2020-01-02	2020-01-01 00:00:51	2020-01-02 03:45:51	2020-01-01 00:00:51.000	2020-01-02 03:45:51.000	51	99951	50001	5050101	51	99951	50001	5050101	-32518	32417	4580.009900990099	462581	-126	125	-2.6435643564356437	-267
-510	2	10500	99411	1.53153	298.53153	150.03153	15003.15315	1.53153	298.53152	150.03152	15003.15278	1.53153	298.53153	150.03153	15003.15300	2020-01-01	2020-01-02	2020-01-01 00:08:30	2020-01-02 03:36:51	2020-01-01 00:08:30.000	2020-01-02 03:36:51.000	510	99411	49960.5	4996050	510	99411	49960.5	4996050	-32660	32478	4740.66	474066	-128	127	-3.02	-302
-511	2	10501	99412	1.53453	298.53453	150.03453	15003.45345	1.53453	298.53455	150.03453	15003.45354	1.53453	298.53453	150.03453	15003.45300	2020-01-01	2020-01-02	2020-01-01 00:08:31	2020-01-02 03:36:52	2020-01-01 00:08:31.000	2020-01-02 03:36:52.000	511	99412	49961.5	4996150	511	99412	49961.5	4996150	-32659	32479	4741.66	474166	-128	123	-4.58	-458
-512	2	10502	99413	1.53753	298.53753	150.03753	15003.75375	1.53753	298.53754	150.03753	15003.75366	1.53753	298.53753	150.03753	15003.75300	2020-01-01	2020-01-02	2020-01-01 00:08:32	2020-01-02 03:36:53	2020-01-01 00:08:32.000	2020-01-02 03:36:53.000	512	99413	49962.5	4996250	512	99413	49962.5	4996250	-32658	32480	4742.66	474266	-127	124	-3.58	-358
-513	2	10503	99414	1.54054	298.54054	150.04054	15004.05405	1.54054	298.54053	150.04053	15004.05397	1.54054	298.54054	150.04054	15004.05400	2020-01-01	2020-01-02	2020-01-01 00:08:33	2020-01-02 03:36:54	2020-01-01 00:08:33.000	2020-01-02 03:36:54.000	513	99414	49963.5	4996350	513	99414	49963.5	4996350	-32657	32481	4743.66	474366	-126	125	-2.58	-258
-514	2	10504	99415	1.54354	298.54354	150.04354	15004.35435	1.54354	298.54355	150.04354	15004.35459	1.54354	298.54354	150.04354	15004.35400	2020-01-01	2020-01-02	2020-01-01 00:08:34	2020-01-02 03:36:55	2020-01-01 00:08:34.000	2020-01-02 03:36:55.000	514	99415	49964.5	4996450	514	99415	49964.5	4996450	-32656	32482	4744.66	474466	-125	126	-1.58	-158
-515	2	10505	99416	1.54654	298.54654	150.04654	15004.65465	1.54654	298.54654	150.04654	15004.65425	1.54654	298.54654	150.04654	15004.65400	2020-01-01	2020-01-02	2020-01-01 00:08:35	2020-01-02 03:36:56	2020-01-01 00:08:35.000	2020-01-02 03:36:56.000	515	99416	49965.5	4996550	515	99416	49965.5	4996550	-32655	32483	4745.66	474566	-124	127	-0.58	-58
-516	2	10506	99417	1.54954	298.54954	150.04954	15004.95495	1.54954	298.54956	150.04955	15004.955	1.54954	298.54954	150.04954	15004.95400	2020-01-01	2020-01-02	2020-01-01 00:08:36	2020-01-02 03:36:57	2020-01-01 00:08:36.000	2020-01-02 03:36:57.000	516	99417	49966.5	4996650	516	99417	49966.5	4996650	-32654	32484	4746.66	474666	-128	127	-2.14	-214
-517	2	10507	99418	1.55255	298.55255	150.05255	15005.25525	1.55255	298.55255	150.05255	15005.25514	1.55255	298.55255	150.05255	15005.25500	2020-01-01	2020-01-02	2020-01-01 00:08:37	2020-01-02 03:36:58	2020-01-01 00:08:37.000	2020-01-02 03:36:58.000	517	99418	49967.5	4996750	517	99418	49967.5	4996750	-32653	32485	4747.66	474766	-128	123	-3.7	-370
-518	2	10508	99419	1.55555	298.55555	150.05555	15005.55555	1.55555	298.55554	150.05555	15005.55547	1.55555	298.55555	150.05555	15005.55500	2020-01-01	2020-01-02	2020-01-01 00:08:38	2020-01-02 03:36:59	2020-01-01 00:08:38.000	2020-01-02 03:36:59.000	518	99419	49968.5	4996850	518	99419	49968.5	4996850	-32652	32486	4748.66	474866	-127	124	-2.7	-270
-519	2	10509	99420	1.55855	298.55855	150.05855	15005.85585	1.55855	298.55856	150.05856	15005.85607	1.55855	298.55855	150.05855	15005.85500	2020-01-01	2020-01-02	2020-01-01 00:08:39	2020-01-02 03:37:00	2020-01-01 00:08:39.000	2020-01-02 03:37:00.000	519	99420	49969.5	4996950	519	99420	49969.5	4996950	-32651	32487	4749.66	474966	-126	125	-1.7	-170
+510	2	10500	99411	1.53153	298.53153	150.03153	15003.15315	1.53153	298.53152	150.03152	15003.15278	1.53153	298.53153	150.03153	15003.153	2020-01-01	2020-01-02	2020-01-01 00:08:30	2020-01-02 03:36:51	2020-01-01 00:08:30.000	2020-01-02 03:36:51.000	510	99411	49960.5	4996050	510	99411	49960.5	4996050	-32660	32478	4740.66	474066	-128	127	-3.02	-302
+511	2	10501	99412	1.53453	298.53453	150.03453	15003.45345	1.53453	298.53455	150.03453	15003.45354	1.53453	298.53453	150.03453	15003.453	2020-01-01	2020-01-02	2020-01-01 00:08:31	2020-01-02 03:36:52	2020-01-01 00:08:31.000	2020-01-02 03:36:52.000	511	99412	49961.5	4996150	511	99412	49961.5	4996150	-32659	32479	4741.66	474166	-128	123	-4.58	-458
+512	2	10502	99413	1.53753	298.53753	150.03753	15003.75375	1.53753	298.53754	150.03753	15003.75366	1.53753	298.53753	150.03753	15003.753	2020-01-01	2020-01-02	2020-01-01 00:08:32	2020-01-02 03:36:53	2020-01-01 00:08:32.000	2020-01-02 03:36:53.000	512	99413	49962.5	4996250	512	99413	49962.5	4996250	-32658	32480	4742.66	474266	-127	124	-3.58	-358
+513	2	10503	99414	1.54054	298.54054	150.04054	15004.05405	1.54054	298.54053	150.04053	15004.05397	1.54054	298.54054	150.04054	15004.054	2020-01-01	2020-01-02	2020-01-01 00:08:33	2020-01-02 03:36:54	2020-01-01 00:08:33.000	2020-01-02 03:36:54.000	513	99414	49963.5	4996350	513	99414	49963.5	4996350	-32657	32481	4743.66	474366	-126	125	-2.58	-258
+514	2	10504	99415	1.54354	298.54354	150.04354	15004.35435	1.54354	298.54355	150.04354	15004.35459	1.54354	298.54354	150.04354	15004.354	2020-01-01	2020-01-02	2020-01-01 00:08:34	2020-01-02 03:36:55	2020-01-01 00:08:34.000	2020-01-02 03:36:55.000	514	99415	49964.5	4996450	514	99415	49964.5	4996450	-32656	32482	4744.66	474466	-125	126	-1.58	-158
+515	2	10505	99416	1.54654	298.54654	150.04654	15004.65465	1.54654	298.54654	150.04654	15004.65425	1.54654	298.54654	150.04654	15004.654	2020-01-01	2020-01-02	2020-01-01 00:08:35	2020-01-02 03:36:56	2020-01-01 00:08:35.000	2020-01-02 03:36:56.000	515	99416	49965.5	4996550	515	99416	49965.5	4996550	-32655	32483	4745.66	474566	-124	127	-0.58	-58
+516	2	10506	99417	1.54954	298.54954	150.04954	15004.95495	1.54954	298.54956	150.04955	15004.955	1.54954	298.54954	150.04954	15004.954	2020-01-01	2020-01-02	2020-01-01 00:08:36	2020-01-02 03:36:57	2020-01-01 00:08:36.000	2020-01-02 03:36:57.000	516	99417	49966.5	4996650	516	99417	49966.5	4996650	-32654	32484	4746.66	474666	-128	127	-2.14	-214
+517	2	10507	99418	1.55255	298.55255	150.05255	15005.25525	1.55255	298.55255	150.05255	15005.25514	1.55255	298.55255	150.05255	15005.255	2020-01-01	2020-01-02	2020-01-01 00:08:37	2020-01-02 03:36:58	2020-01-01 00:08:37.000	2020-01-02 03:36:58.000	517	99418	49967.5	4996750	517	99418	49967.5	4996750	-32653	32485	4747.66	474766	-128	123	-3.7	-370
+518	2	10508	99419	1.55555	298.55555	150.05555	15005.55555	1.55555	298.55554	150.05555	15005.55547	1.55555	298.55555	150.05555	15005.555	2020-01-01	2020-01-02	2020-01-01 00:08:38	2020-01-02 03:36:59	2020-01-01 00:08:38.000	2020-01-02 03:36:59.000	518	99419	49968.5	4996850	518	99419	49968.5	4996850	-32652	32486	4748.66	474866	-127	124	-2.7	-270
+519	2	10509	99420	1.55855	298.55855	150.05855	15005.85585	1.55855	298.55856	150.05856	15005.85607	1.55855	298.55855	150.05855	15005.855	2020-01-01	2020-01-02	2020-01-01 00:08:39	2020-01-02 03:37:00	2020-01-01 00:08:39.000	2020-01-02 03:37:00.000	519	99420	49969.5	4996950	519	99420	49969.5	4996950	-32651	32487	4749.66	474966	-126	125	-1.7	-170
 52	2	10042	99952	0.15615	300.15615	150.15615	15165.77177	0.15615	300.15616	150.15615	15165.77193	0.15615	300.15615	150.15615	15165.77115	2020-01-01	2020-01-02	2020-01-01 00:00:52	2020-01-02 03:45:52	2020-01-01 00:00:52.000	2020-01-02 03:45:52.000	52	99952	50002	5050202	52	99952	50002	5050202	-32517	32418	4581.009900990099	462682	-125	126	-1.6435643564356435	-166
-520	2	10510	99421	1.56156	298.56156	150.06156	15006.15615	1.56156	298.56155	150.06155	15006.15572	1.56156	298.56156	150.06156000000001	15006.15600	2020-01-01	2020-01-02	2020-01-01 00:08:40	2020-01-02 03:37:01	2020-01-01 00:08:40.000	2020-01-02 03:37:01.000	520	99421	49970.5	4997050	520	99421	49970.5	4997050	-32650	32488	4750.66	475066	-125	126	-0.7	-70
-521	2	10511	99422	1.56456	298.56456	150.06456	15006.45645	1.56456	298.56458	150.06456	15006.45647	1.56456	298.56456	150.06456	15006.45600	2020-01-01	2020-01-02	2020-01-01 00:08:41	2020-01-02 03:37:02	2020-01-01 00:08:41.000	2020-01-02 03:37:02.000	521	99422	49971.5	4997150	521	99422	49971.5	4997150	-32649	32489	4751.66	475166	-124	127	0.3	30
-522	2	10512	99423	1.56756	298.56756	150.06756	15006.75675	1.56756	298.56757	150.06756	15006.75661	1.56756	298.56756	150.06756	15006.75600	2020-01-01	2020-01-02	2020-01-01 00:08:42	2020-01-02 03:37:03	2020-01-01 00:08:42.000	2020-01-02 03:37:03.000	522	99423	49972.5	4997250	522	99423	49972.5	4997250	-32648	32490	4752.66	475266	-128	127	-1.26	-126
-523	2	10513	99424	1.57057	298.57057	150.07057	15007.05705	1.57057	298.57056	150.07056	15007.05694	1.57057	298.57057	150.07057	15007.05700	2020-01-01	2020-01-02	2020-01-01 00:08:43	2020-01-02 03:37:04	2020-01-01 00:08:43.000	2020-01-02 03:37:04.000	523	99424	49973.5	4997350	523	99424	49973.5	4997350	-32647	32491	4753.66	475366	-128	123	-2.82	-282
-524	2	10514	99425	1.57357	298.57357	150.07357	15007.35735	1.57357	298.57358	150.07357	15007.35753	1.57357	298.57357	150.07357	15007.35700	2020-01-01	2020-01-02	2020-01-01 00:08:44	2020-01-02 03:37:05	2020-01-01 00:08:44.000	2020-01-02 03:37:05.000	524	99425	49974.5	4997450	524	99425	49974.5	4997450	-32646	32492	4754.66	475466	-127	124	-1.82	-182
-525	2	10515	99426	1.57657	298.57657	150.07657	15007.65765	1.57657	298.57657	150.07657	15007.65783	1.57657	298.57657	150.07657	15007.65700	2020-01-01	2020-01-02	2020-01-01 00:08:45	2020-01-02 03:37:06	2020-01-01 00:08:45.000	2020-01-02 03:37:06.000	525	99426	49975.5	4997550	525	99426	49975.5	4997550	-32645	32493	4755.66	475566	-126	125	-0.82	-82
-526	2	10516	99427	1.57957	298.57957	150.07957	15007.95795	1.57957	298.5796	150.07957	15007.95795	1.57957	298.57957	150.07957	15007.95700	2020-01-01	2020-01-02	2020-01-01 00:08:46	2020-01-02 03:37:07	2020-01-01 00:08:46.000	2020-01-02 03:37:07.000	526	99427	49976.5	4997650	526	99427	49976.5	4997650	-32644	32494	4756.66	475666	-125	126	0.18	18
-527	2	10517	99428	1.58258	298.58258	150.08258	15008.25825	1.58258	298.58258	150.08258	15008.25811	1.58258	298.58258	150.08258	15008.25800	2020-01-01	2020-01-02	2020-01-01 00:08:47	2020-01-02 03:37:08	2020-01-01 00:08:47.000	2020-01-02 03:37:08.000	527	99428	49977.5	4997750	527	99428	49977.5	4997750	-32643	32495	4757.66	475766	-124	127	1.18	118
-528	2	10518	99429	1.58558	298.58558	150.08558	15008.55855	1.58558	298.58557	150.08558	15008.5584	1.58558	298.58558	150.08558000000002	15008.55800	2020-01-01	2020-01-02	2020-01-01 00:08:48	2020-01-02 03:37:09	2020-01-01 00:08:48.000	2020-01-02 03:37:09.000	528	99429	49978.5	4997850	528	99429	49978.5	4997850	-32642	32496	4758.66	475866	-128	127	-0.38	-38
-529	2	10519	99430	1.58858	298.58858	150.08858	15008.85885	1.58858	298.5886	150.08859	15008.859	1.58858	298.58858	150.08858	15008.85800	2020-01-01	2020-01-02	2020-01-01 00:08:49	2020-01-02 03:37:10	2020-01-01 00:08:49.000	2020-01-02 03:37:10.000	529	99430	49979.5	4997950	529	99430	49979.5	4997950	-32641	32497	4759.66	475966	-128	127	-1.94	-194
+520	2	10510	99421	1.56156	298.56156	150.06156	15006.15615	1.56156	298.56155	150.06155	15006.15572	1.56156	298.56156	150.06156000000001	15006.156	2020-01-01	2020-01-02	2020-01-01 00:08:40	2020-01-02 03:37:01	2020-01-01 00:08:40.000	2020-01-02 03:37:01.000	520	99421	49970.5	4997050	520	99421	49970.5	4997050	-32650	32488	4750.66	475066	-125	126	-0.7	-70
+521	2	10511	99422	1.56456	298.56456	150.06456	15006.45645	1.56456	298.56458	150.06456	15006.45647	1.56456	298.56456	150.06456	15006.456	2020-01-01	2020-01-02	2020-01-01 00:08:41	2020-01-02 03:37:02	2020-01-01 00:08:41.000	2020-01-02 03:37:02.000	521	99422	49971.5	4997150	521	99422	49971.5	4997150	-32649	32489	4751.66	475166	-124	127	0.3	30
+522	2	10512	99423	1.56756	298.56756	150.06756	15006.75675	1.56756	298.56757	150.06756	15006.75661	1.56756	298.56756	150.06756	15006.756	2020-01-01	2020-01-02	2020-01-01 00:08:42	2020-01-02 03:37:03	2020-01-01 00:08:42.000	2020-01-02 03:37:03.000	522	99423	49972.5	4997250	522	99423	49972.5	4997250	-32648	32490	4752.66	475266	-128	127	-1.26	-126
+523	2	10513	99424	1.57057	298.57057	150.07057	15007.05705	1.57057	298.57056	150.07056	15007.05694	1.57057	298.57057	150.07057	15007.057	2020-01-01	2020-01-02	2020-01-01 00:08:43	2020-01-02 03:37:04	2020-01-01 00:08:43.000	2020-01-02 03:37:04.000	523	99424	49973.5	4997350	523	99424	49973.5	4997350	-32647	32491	4753.66	475366	-128	123	-2.82	-282
+524	2	10514	99425	1.57357	298.57357	150.07357	15007.35735	1.57357	298.57358	150.07357	15007.35753	1.57357	298.57357	150.07357	15007.357	2020-01-01	2020-01-02	2020-01-01 00:08:44	2020-01-02 03:37:05	2020-01-01 00:08:44.000	2020-01-02 03:37:05.000	524	99425	49974.5	4997450	524	99425	49974.5	4997450	-32646	32492	4754.66	475466	-127	124	-1.82	-182
+525	2	10515	99426	1.57657	298.57657	150.07657	15007.65765	1.57657	298.57657	150.07657	15007.65783	1.57657	298.57657	150.07657	15007.657	2020-01-01	2020-01-02	2020-01-01 00:08:45	2020-01-02 03:37:06	2020-01-01 00:08:45.000	2020-01-02 03:37:06.000	525	99426	49975.5	4997550	525	99426	49975.5	4997550	-32645	32493	4755.66	475566	-126	125	-0.82	-82
+526	2	10516	99427	1.57957	298.57957	150.07957	15007.95795	1.57957	298.5796	150.07957	15007.95795	1.57957	298.57957	150.07957	15007.957	2020-01-01	2020-01-02	2020-01-01 00:08:46	2020-01-02 03:37:07	2020-01-01 00:08:46.000	2020-01-02 03:37:07.000	526	99427	49976.5	4997650	526	99427	49976.5	4997650	-32644	32494	4756.66	475666	-125	126	0.18	18
+527	2	10517	99428	1.58258	298.58258	150.08258	15008.25825	1.58258	298.58258	150.08258	15008.25811	1.58258	298.58258	150.08258	15008.258	2020-01-01	2020-01-02	2020-01-01 00:08:47	2020-01-02 03:37:08	2020-01-01 00:08:47.000	2020-01-02 03:37:08.000	527	99428	49977.5	4997750	527	99428	49977.5	4997750	-32643	32495	4757.66	475766	-124	127	1.18	118
+528	2	10518	99429	1.58558	298.58558	150.08558	15008.55855	1.58558	298.58557	150.08558	15008.5584	1.58558	298.58558	150.08558000000002	15008.558	2020-01-01	2020-01-02	2020-01-01 00:08:48	2020-01-02 03:37:09	2020-01-01 00:08:48.000	2020-01-02 03:37:09.000	528	99429	49978.5	4997850	528	99429	49978.5	4997850	-32642	32496	4758.66	475866	-128	127	-0.38	-38
+529	2	10519	99430	1.58858	298.58858	150.08858	15008.85885	1.58858	298.5886	150.08859	15008.859	1.58858	298.58858	150.08858	15008.858	2020-01-01	2020-01-02	2020-01-01 00:08:49	2020-01-02 03:37:10	2020-01-01 00:08:49.000	2020-01-02 03:37:10.000	529	99430	49979.5	4997950	529	99430	49979.5	4997950	-32641	32497	4759.66	475966	-128	127	-1.94	-194
 53	2	10043	99953	0.15915	300.15915	150.15915	15166.07507	0.15915	300.15915	150.15915	15166.07511	0.15915	300.15915	150.15915	15166.07415	2020-01-01	2020-01-02	2020-01-01 00:00:53	2020-01-02 03:45:53	2020-01-01 00:00:53.000	2020-01-02 03:45:53.000	53	99953	50003	5050303	53	99953	50003	5050303	-32516	32419	4582.009900990099	462783	-124	127	-0.6435643564356436	-65
-530	2	10520	99431	1.59159	298.59159	150.09159	15009.15915	1.59159	298.59158	150.09159	15009.15929	1.59159	298.59159	150.09159	15009.15900	2020-01-01	2020-01-02	2020-01-01 00:08:50	2020-01-02 03:37:11	2020-01-01 00:08:50.000	2020-01-02 03:37:11.000	530	99431	49980.5	4998050	530	99431	49980.5	4998050	-32640	32498	4760.66	476066	-128	124	-3.5	-350
-531	2	10521	99432	1.59459	298.59459	150.09459	15009.45945	1.59459	298.5946	150.09459	15009.45941	1.59459	298.59459	150.09459	15009.45900	2020-01-01	2020-01-02	2020-01-01 00:08:51	2020-01-02 03:37:12	2020-01-01 00:08:51.000	2020-01-02 03:37:12.000	531	99432	49981.5	4998150	531	99432	49981.5	4998150	-32639	32499	4761.66	476166	-127	125	-2.5	-250
-532	2	10522	99433	1.59759	298.59759	150.09759	15009.75975	1.59759	298.5976	150.09759	15009.75958	1.59759	298.59759	150.09759	15009.75900	2020-01-01	2020-01-02	2020-01-01 00:08:52	2020-01-02 03:37:13	2020-01-01 00:08:52.000	2020-01-02 03:37:13.000	532	99433	49982.5	4998250	532	99433	49982.5	4998250	-32638	32500	4762.66	476266	-126	126	-1.5	-150
-533	2	10523	99434	1.6006	298.6006	150.1006	15010.06006	1.6006	298.6006	150.10059	15010.05988	1.60060	298.60060	150.1006	15010.06000	2020-01-01	2020-01-02	2020-01-01 00:08:53	2020-01-02 03:37:14	2020-01-01 00:08:53.000	2020-01-02 03:37:14.000	533	99434	49983.5	4998350	533	99434	49983.5	4998350	-32637	32501	4763.66	476366	-125	127	-0.5	-50
-534	2	10524	99435	1.6036	298.6036	150.1036	15010.36036	1.6036	298.6036	150.1036	15010.36063	1.60360	298.60360	150.1036	15010.36000	2020-01-01	2020-01-02	2020-01-01 00:08:54	2020-01-02 03:37:15	2020-01-01 00:08:54.000	2020-01-02 03:37:15.000	534	99435	49984.5	4998450	534	99435	49984.5	4998450	-32636	32502	4764.66	476466	-128	127	-2.06	-206
-535	2	10525	99436	1.6066	298.6066	150.1066	15010.66066	1.6066	298.6066	150.1066	15010.66077	1.60660	298.60660	150.1066	15010.66000	2020-01-01	2020-01-02	2020-01-01 00:08:55	2020-01-02 03:37:16	2020-01-01 00:08:55.000	2020-01-02 03:37:16.000	535	99436	49985.5	4998550	535	99436	49985.5	4998550	-32635	32503	4765.66	476566	-128	127	-3.62	-362
-536	2	10526	99437	1.6096	298.6096	150.1096	15010.96096	1.6096	298.60962	150.1096	15010.96092	1.60960	298.60960	150.1096	15010.96000	2020-01-01	2020-01-02	2020-01-01 00:08:56	2020-01-02 03:37:17	2020-01-01 00:08:56.000	2020-01-02 03:37:17.000	536	99437	49986.5	4998650	536	99437	49986.5	4998650	-32634	32504	4766.66	476666	-128	123	-5.18	-518
-537	2	10527	99438	1.61261	298.61261	150.11261	15011.26126	1.61261	298.6126	150.11261	15011.26105	1.61261	298.61261	150.11261000000002	15011.26100	2020-01-01	2020-01-02	2020-01-01 00:08:57	2020-01-02 03:37:18	2020-01-01 00:08:57.000	2020-01-02 03:37:18.000	537	99438	49987.5	4998750	537	99438	49987.5	4998750	-32633	32505	4767.66	476766	-127	124	-4.18	-418
-538	2	10528	99439	1.61561	298.61561	150.11561	15011.56156	1.61561	298.6156	150.11561	15011.56135	1.61561	298.61561	150.11561	15011.56100	2020-01-01	2020-01-02	2020-01-01 00:08:58	2020-01-02 03:37:19	2020-01-01 00:08:58.000	2020-01-02 03:37:19.000	538	99439	49988.5	4998850	538	99439	49988.5	4998850	-32632	32506	4768.66	476866	-126	125	-3.18	-318
-539	2	10529	99440	1.61861	298.61861	150.11861	15011.86186	1.61861	298.61862	150.11862	15011.8621	1.61861	298.61861	150.11861000000002	15011.86100	2020-01-01	2020-01-02	2020-01-01 00:08:59	2020-01-02 03:37:20	2020-01-01 00:08:59.000	2020-01-02 03:37:20.000	539	99440	49989.5	4998950	539	99440	49989.5	4998950	-32631	32507	4769.66	476966	-125	126	-2.18	-218
+530	2	10520	99431	1.59159	298.59159	150.09159	15009.15915	1.59159	298.59158	150.09159	15009.15929	1.59159	298.59159	150.09159	15009.159	2020-01-01	2020-01-02	2020-01-01 00:08:50	2020-01-02 03:37:11	2020-01-01 00:08:50.000	2020-01-02 03:37:11.000	530	99431	49980.5	4998050	530	99431	49980.5	4998050	-32640	32498	4760.66	476066	-128	124	-3.5	-350
+531	2	10521	99432	1.59459	298.59459	150.09459	15009.45945	1.59459	298.5946	150.09459	15009.45941	1.59459	298.59459	150.09459	15009.459	2020-01-01	2020-01-02	2020-01-01 00:08:51	2020-01-02 03:37:12	2020-01-01 00:08:51.000	2020-01-02 03:37:12.000	531	99432	49981.5	4998150	531	99432	49981.5	4998150	-32639	32499	4761.66	476166	-127	125	-2.5	-250
+532	2	10522	99433	1.59759	298.59759	150.09759	15009.75975	1.59759	298.5976	150.09759	15009.75958	1.59759	298.59759	150.09759	15009.759	2020-01-01	2020-01-02	2020-01-01 00:08:52	2020-01-02 03:37:13	2020-01-01 00:08:52.000	2020-01-02 03:37:13.000	532	99433	49982.5	4998250	532	99433	49982.5	4998250	-32638	32500	4762.66	476266	-126	126	-1.5	-150
+533	2	10523	99434	1.6006	298.6006	150.1006	15010.06006	1.6006	298.6006	150.10059	15010.05988	1.6006	298.6006	150.1006	15010.06	2020-01-01	2020-01-02	2020-01-01 00:08:53	2020-01-02 03:37:14	2020-01-01 00:08:53.000	2020-01-02 03:37:14.000	533	99434	49983.5	4998350	533	99434	49983.5	4998350	-32637	32501	4763.66	476366	-125	127	-0.5	-50
+534	2	10524	99435	1.6036	298.6036	150.1036	15010.36036	1.6036	298.6036	150.1036	15010.36063	1.6036	298.6036	150.1036	15010.36	2020-01-01	2020-01-02	2020-01-01 00:08:54	2020-01-02 03:37:15	2020-01-01 00:08:54.000	2020-01-02 03:37:15.000	534	99435	49984.5	4998450	534	99435	49984.5	4998450	-32636	32502	4764.66	476466	-128	127	-2.06	-206
+535	2	10525	99436	1.6066	298.6066	150.1066	15010.66066	1.6066	298.6066	150.1066	15010.66077	1.6066	298.6066	150.1066	15010.66	2020-01-01	2020-01-02	2020-01-01 00:08:55	2020-01-02 03:37:16	2020-01-01 00:08:55.000	2020-01-02 03:37:16.000	535	99436	49985.5	4998550	535	99436	49985.5	4998550	-32635	32503	4765.66	476566	-128	127	-3.62	-362
+536	2	10526	99437	1.6096	298.6096	150.1096	15010.96096	1.6096	298.60962	150.1096	15010.96092	1.6096	298.6096	150.1096	15010.96	2020-01-01	2020-01-02	2020-01-01 00:08:56	2020-01-02 03:37:17	2020-01-01 00:08:56.000	2020-01-02 03:37:17.000	536	99437	49986.5	4998650	536	99437	49986.5	4998650	-32634	32504	4766.66	476666	-128	123	-5.18	-518
+537	2	10527	99438	1.61261	298.61261	150.11261	15011.26126	1.61261	298.6126	150.11261	15011.26105	1.61261	298.61261	150.11261000000002	15011.261	2020-01-01	2020-01-02	2020-01-01 00:08:57	2020-01-02 03:37:18	2020-01-01 00:08:57.000	2020-01-02 03:37:18.000	537	99438	49987.5	4998750	537	99438	49987.5	4998750	-32633	32505	4767.66	476766	-127	124	-4.18	-418
+538	2	10528	99439	1.61561	298.61561	150.11561	15011.56156	1.61561	298.6156	150.11561	15011.56135	1.61561	298.61561	150.11561	15011.561	2020-01-01	2020-01-02	2020-01-01 00:08:58	2020-01-02 03:37:19	2020-01-01 00:08:58.000	2020-01-02 03:37:19.000	538	99439	49988.5	4998850	538	99439	49988.5	4998850	-32632	32506	4768.66	476866	-126	125	-3.18	-318
+539	2	10529	99440	1.61861	298.61861	150.11861	15011.86186	1.61861	298.61862	150.11862	15011.8621	1.61861	298.61861	150.11861000000002	15011.861	2020-01-01	2020-01-02	2020-01-01 00:08:59	2020-01-02 03:37:20	2020-01-01 00:08:59.000	2020-01-02 03:37:20.000	539	99440	49989.5	4998950	539	99440	49989.5	4998950	-32631	32507	4769.66	476966	-125	126	-2.18	-218
 54	2	10044	99954	0.16216	300.16216	150.16216	15166.37837	0.16216	300.16217	150.16216	15166.37822	0.16216	300.16216	150.16216	15166.37816	2020-01-01	2020-01-02	2020-01-01 00:00:54	2020-01-02 03:45:54	2020-01-01 00:00:54.000	2020-01-02 03:45:54.000	54	99954	50004	5050404	54	99954	50004	5050404	-32515	32420	4583.009900990099	462884	-128	127	-2.1782178217821784	-220
-540	2	10530	99441	1.62162	298.62162	150.12162	15012.16216	1.62162	298.6216	150.12162	15012.16224	1.62162	298.62162	150.12162	15012.16200	2020-01-01	2020-01-02	2020-01-01 00:09:00	2020-01-02 03:37:21	2020-01-01 00:09:00.000	2020-01-02 03:37:21.000	540	99441	49990.5	4999050	540	99441	49990.5	4999050	-32630	32508	4770.66	477066	-124	127	-1.18	-118
-541	2	10531	99442	1.62462	298.62462	150.12462	15012.46246	1.62462	298.62463	150.12462	15012.46239	1.62462	298.62462	150.12462	15012.46200	2020-01-01	2020-01-02	2020-01-01 00:09:01	2020-01-02 03:37:22	2020-01-01 00:09:01.000	2020-01-02 03:37:22.000	541	99442	49991.5	4999150	541	99442	49991.5	4999150	-32629	32509	4771.66	477166	-128	127	-2.74	-274
-542	2	10532	99443	1.62762	298.62762	150.12762	15012.76276	1.62762	298.62762	150.12762	15012.76252	1.62762	298.62762	150.12762	15012.76200	2020-01-01	2020-01-02	2020-01-01 00:09:02	2020-01-02 03:37:23	2020-01-01 00:09:02.000	2020-01-02 03:37:23.000	542	99443	49992.5	4999250	542	99443	49992.5	4999250	-32628	32510	4772.66	477266	-128	123	-4.3	-430
-543	2	10533	99444	1.63063	298.63063	150.13063	15013.06306	1.63063	298.63065	150.13063	15013.06327	1.63063	298.63063	150.13063	15013.06300	2020-01-01	2020-01-02	2020-01-01 00:09:03	2020-01-02 03:37:24	2020-01-01 00:09:03.000	2020-01-02 03:37:24.000	543	99444	49993.5	4999350	543	99444	49993.5	4999350	-32627	32511	4773.66	477366	-127	124	-3.3	-330
-544	2	10534	99445	1.63363	298.63363	150.13363	15013.36336	1.63363	298.63364	150.13363	15013.36358	1.63363	298.63363	150.13362999999998	15013.36300	2020-01-01	2020-01-02	2020-01-01 00:09:04	2020-01-02 03:37:25	2020-01-01 00:09:04.000	2020-01-02 03:37:25.000	544	99445	49994.5	4999450	544	99445	49994.5	4999450	-32626	32512	4774.66	477466	-126	125	-2.3	-230
-545	2	10535	99446	1.63663	298.63663	150.13663	15013.66366	1.63663	298.63663	150.13663	15013.6637	1.63663	298.63663	150.13663	15013.66300	2020-01-01	2020-01-02	2020-01-01 00:09:05	2020-01-02 03:37:26	2020-01-01 00:09:05.000	2020-01-02 03:37:26.000	545	99446	49995.5	4999550	545	99446	49995.5	4999550	-32625	32513	4775.66	477566	-125	126	-1.3	-130
-546	2	10536	99447	1.63963	298.63963	150.13963	15013.96396	1.63963	298.63965	150.13963	15013.96385	1.63963	298.63963	150.13963	15013.96300	2020-01-01	2020-01-02	2020-01-01 00:09:06	2020-01-02 03:37:27	2020-01-01 00:09:06.000	2020-01-02 03:37:27.000	546	99447	49996.5	4999650	546	99447	49996.5	4999650	-32624	32514	4776.66	477666	-124	127	-0.3	-30
-547	2	10537	99448	1.64264	298.64264	150.14264	15014.26426	1.64264	298.64264	150.14263	15014.26399	1.64264	298.64264	150.14264	15014.26400	2020-01-01	2020-01-02	2020-01-01 00:09:07	2020-01-02 03:37:28	2020-01-01 00:09:07.000	2020-01-02 03:37:28.000	547	99448	49997.5	4999750	547	99448	49997.5	4999750	-32623	32515	4777.66	477766	-128	127	-1.86	-186
-548	2	10538	99449	1.64564	298.64564	150.14564	15014.56456	1.64564	298.64566	150.14564	15014.56474	1.64564	298.64564	150.14564000000001	15014.56400	2020-01-01	2020-01-02	2020-01-01 00:09:08	2020-01-02 03:37:29	2020-01-01 00:09:08.000	2020-01-02 03:37:29.000	548	99449	49998.5	4999850	548	99449	49998.5	4999850	-32622	32516	4778.66	477866	-128	123	-3.42	-342
-549	2	10539	99450	1.64864	298.64864	150.14864	15014.86486	1.64864	298.64865	150.14865	15014.86504	1.64864	298.64864	150.14864	15014.86400	2020-01-01	2020-01-02	2020-01-01 00:09:09	2020-01-02 03:37:30	2020-01-01 00:09:09.000	2020-01-02 03:37:30.000	549	99450	49999.5	4999950	549	99450	49999.5	4999950	-32621	32517	4779.66	477966	-127	124	-2.42	-242
+540	2	10530	99441	1.62162	298.62162	150.12162	15012.16216	1.62162	298.6216	150.12162	15012.16224	1.62162	298.62162	150.12162	15012.162	2020-01-01	2020-01-02	2020-01-01 00:09:00	2020-01-02 03:37:21	2020-01-01 00:09:00.000	2020-01-02 03:37:21.000	540	99441	49990.5	4999050	540	99441	49990.5	4999050	-32630	32508	4770.66	477066	-124	127	-1.18	-118
+541	2	10531	99442	1.62462	298.62462	150.12462	15012.46246	1.62462	298.62463	150.12462	15012.46239	1.62462	298.62462	150.12462	15012.462	2020-01-01	2020-01-02	2020-01-01 00:09:01	2020-01-02 03:37:22	2020-01-01 00:09:01.000	2020-01-02 03:37:22.000	541	99442	49991.5	4999150	541	99442	49991.5	4999150	-32629	32509	4771.66	477166	-128	127	-2.74	-274
+542	2	10532	99443	1.62762	298.62762	150.12762	15012.76276	1.62762	298.62762	150.12762	15012.76252	1.62762	298.62762	150.12762	15012.762	2020-01-01	2020-01-02	2020-01-01 00:09:02	2020-01-02 03:37:23	2020-01-01 00:09:02.000	2020-01-02 03:37:23.000	542	99443	49992.5	4999250	542	99443	49992.5	4999250	-32628	32510	4772.66	477266	-128	123	-4.3	-430
+543	2	10533	99444	1.63063	298.63063	150.13063	15013.06306	1.63063	298.63065	150.13063	15013.06327	1.63063	298.63063	150.13063	15013.063	2020-01-01	2020-01-02	2020-01-01 00:09:03	2020-01-02 03:37:24	2020-01-01 00:09:03.000	2020-01-02 03:37:24.000	543	99444	49993.5	4999350	543	99444	49993.5	4999350	-32627	32511	4773.66	477366	-127	124	-3.3	-330
+544	2	10534	99445	1.63363	298.63363	150.13363	15013.36336	1.63363	298.63364	150.13363	15013.36358	1.63363	298.63363	150.13362999999998	15013.363	2020-01-01	2020-01-02	2020-01-01 00:09:04	2020-01-02 03:37:25	2020-01-01 00:09:04.000	2020-01-02 03:37:25.000	544	99445	49994.5	4999450	544	99445	49994.5	4999450	-32626	32512	4774.66	477466	-126	125	-2.3	-230
+545	2	10535	99446	1.63663	298.63663	150.13663	15013.66366	1.63663	298.63663	150.13663	15013.6637	1.63663	298.63663	150.13663	15013.663	2020-01-01	2020-01-02	2020-01-01 00:09:05	2020-01-02 03:37:26	2020-01-01 00:09:05.000	2020-01-02 03:37:26.000	545	99446	49995.5	4999550	545	99446	49995.5	4999550	-32625	32513	4775.66	477566	-125	126	-1.3	-130
+546	2	10536	99447	1.63963	298.63963	150.13963	15013.96396	1.63963	298.63965	150.13963	15013.96385	1.63963	298.63963	150.13963	15013.963	2020-01-01	2020-01-02	2020-01-01 00:09:06	2020-01-02 03:37:27	2020-01-01 00:09:06.000	2020-01-02 03:37:27.000	546	99447	49996.5	4999650	546	99447	49996.5	4999650	-32624	32514	4776.66	477666	-124	127	-0.3	-30
+547	2	10537	99448	1.64264	298.64264	150.14264	15014.26426	1.64264	298.64264	150.14263	15014.26399	1.64264	298.64264	150.14264	15014.264	2020-01-01	2020-01-02	2020-01-01 00:09:07	2020-01-02 03:37:28	2020-01-01 00:09:07.000	2020-01-02 03:37:28.000	547	99448	49997.5	4999750	547	99448	49997.5	4999750	-32623	32515	4777.66	477766	-128	127	-1.86	-186
+548	2	10538	99449	1.64564	298.64564	150.14564	15014.56456	1.64564	298.64566	150.14564	15014.56474	1.64564	298.64564	150.14564000000001	15014.564	2020-01-01	2020-01-02	2020-01-01 00:09:08	2020-01-02 03:37:29	2020-01-01 00:09:08.000	2020-01-02 03:37:29.000	548	99449	49998.5	4999850	548	99449	49998.5	4999850	-32622	32516	4778.66	477866	-128	123	-3.42	-342
+549	2	10539	99450	1.64864	298.64864	150.14864	15014.86486	1.64864	298.64865	150.14865	15014.86504	1.64864	298.64864	150.14864	15014.864	2020-01-01	2020-01-02	2020-01-01 00:09:09	2020-01-02 03:37:30	2020-01-01 00:09:09.000	2020-01-02 03:37:30.000	549	99450	49999.5	4999950	549	99450	49999.5	4999950	-32621	32517	4779.66	477966	-127	124	-2.42	-242
 55	2	10045	99955	0.16516	300.16516	150.16516	15166.68168	0.16516	300.16516	150.16516	15166.68151	0.16516	300.16516	150.16516000000001	15166.68116	2020-01-01	2020-01-02	2020-01-01 00:00:55	2020-01-02 03:45:55	2020-01-01 00:00:55.000	2020-01-02 03:45:55.000	55	99955	50005	5050505	55	99955	50005	5050505	-32514	32421	4584.009900990099	462985	-128	123	-3.712871287128713	-375
-550	2	10540	99451	1.65165	298.65165	150.15165	15015.16516	1.65165	298.65164	150.15165	15015.16521	1.65165	298.65165	150.15165000000002	15015.16500	2020-01-01	2020-01-02	2020-01-01 00:09:10	2020-01-02 03:37:31	2020-01-01 00:09:10.000	2020-01-02 03:37:31.000	550	99451	50000.5	5000050	550	99451	50000.5	5000050	-32620	32518	4780.66	478066	-126	125	-1.42	-142
-551	2	10541	99452	1.65465	298.65465	150.15465	15015.46546	1.65465	298.65466	150.15465	15015.46533	1.65465	298.65465	150.15465	15015.46500	2020-01-01	2020-01-02	2020-01-01 00:09:11	2020-01-02 03:37:32	2020-01-01 00:09:11.000	2020-01-02 03:37:32.000	551	99452	50001.5	5000150	551	99452	50001.5	5000150	-32619	32519	4781.66	478166	-125	126	-0.42	-42
-552	2	10542	99453	1.65765	298.65765	150.15765	15015.76576	1.65765	298.65765	150.15765	15015.76562	1.65765	298.65765	150.15765	15015.76500	2020-01-01	2020-01-02	2020-01-01 00:09:12	2020-01-02 03:37:33	2020-01-01 00:09:12.000	2020-01-02 03:37:33.000	552	99453	50002.5	5000250	552	99453	50002.5	5000250	-32618	32520	4782.66	478266	-124	127	0.58	58
-553	2	10543	99454	1.66066	298.66066	150.16066	15016.06606	1.66066	298.66068	150.16066	15016.06621	1.66066	298.66066	150.16066	15016.06600	2020-01-01	2020-01-02	2020-01-01 00:09:13	2020-01-02 03:37:34	2020-01-01 00:09:13.000	2020-01-02 03:37:34.000	553	99454	50003.5	5000350	553	99454	50003.5	5000350	-32617	32521	4783.66	478366	-128	127	-0.98	-98
-554	2	10544	99455	1.66366	298.66366	150.16366	15016.36636	1.66366	298.66367	150.16366	15016.36651	1.66366	298.66366	150.16366	15016.36600	2020-01-01	2020-01-02	2020-01-01 00:09:14	2020-01-02 03:37:35	2020-01-01 00:09:14.000	2020-01-02 03:37:35.000	554	99455	50004.5	5000450	554	99455	50004.5	5000450	-32616	32522	4784.66	478466	-128	127	-2.54	-254
-555	2	10545	99456	1.66666	298.66666	150.16666	15016.66666	1.66666	298.66666	150.16666	15016.66668	1.66666	298.66666	150.16665999999998	15016.66600	2020-01-01	2020-01-02	2020-01-01 00:09:15	2020-01-02 03:37:36	2020-01-01 00:09:15.000	2020-01-02 03:37:36.000	555	99456	50005.5	5000550	555	99456	50005.5	5000550	-32615	32523	4785.66	478566	-128	124	-4.1	-410
-556	2	10546	99457	1.66966	298.66966	150.16966	15016.96696	1.66966	298.66968	150.16966	15016.9668	1.66966	298.66966	150.16966	15016.96600	2020-01-01	2020-01-02	2020-01-01 00:09:16	2020-01-02 03:37:37	2020-01-01 00:09:16.000	2020-01-02 03:37:37.000	556	99457	50006.5	5000650	556	99457	50006.5	5000650	-32614	32524	4786.66	478666	-127	125	-3.1	-310
-557	2	10547	99458	1.67267	298.67267	150.17267	15017.26726	1.67267	298.67267	150.17267	15017.26709	1.67267	298.67267	150.17267	15017.26700	2020-01-01	2020-01-02	2020-01-01 00:09:17	2020-01-02 03:37:38	2020-01-01 00:09:17.000	2020-01-02 03:37:38.000	557	99458	50007.5	5000750	557	99458	50007.5	5000750	-32613	32525	4787.66	478766	-126	126	-2.1	-210
-558	2	10548	99459	1.67567	298.67567	150.17567	15017.56756	1.67567	298.6757	150.17567	15017.56769	1.67567	298.67567	150.17567	15017.56700	2020-01-01	2020-01-02	2020-01-01 00:09:18	2020-01-02 03:37:39	2020-01-01 00:09:18.000	2020-01-02 03:37:39.000	558	99459	50008.5	5000850	558	99459	50008.5	5000850	-32612	32526	4788.66	478866	-125	127	-1.1	-110
-559	2	10549	99460	1.67867	298.67867	150.17867	15017.86786	1.67867	298.67868	150.17868	15017.86802	1.67867	298.67867	150.17867	15017.86700	2020-01-01	2020-01-02	2020-01-01 00:09:19	2020-01-02 03:37:40	2020-01-01 00:09:19.000	2020-01-02 03:37:40.000	559	99460	50009.5	5000950	559	99460	50009.5	5000950	-32611	32527	4789.66	478966	-128	127	-2.66	-266
+550	2	10540	99451	1.65165	298.65165	150.15165	15015.16516	1.65165	298.65164	150.15165	15015.16521	1.65165	298.65165	150.15165000000002	15015.165	2020-01-01	2020-01-02	2020-01-01 00:09:10	2020-01-02 03:37:31	2020-01-01 00:09:10.000	2020-01-02 03:37:31.000	550	99451	50000.5	5000050	550	99451	50000.5	5000050	-32620	32518	4780.66	478066	-126	125	-1.42	-142
+551	2	10541	99452	1.65465	298.65465	150.15465	15015.46546	1.65465	298.65466	150.15465	15015.46533	1.65465	298.65465	150.15465	15015.465	2020-01-01	2020-01-02	2020-01-01 00:09:11	2020-01-02 03:37:32	2020-01-01 00:09:11.000	2020-01-02 03:37:32.000	551	99452	50001.5	5000150	551	99452	50001.5	5000150	-32619	32519	4781.66	478166	-125	126	-0.42	-42
+552	2	10542	99453	1.65765	298.65765	150.15765	15015.76576	1.65765	298.65765	150.15765	15015.76562	1.65765	298.65765	150.15765	15015.765	2020-01-01	2020-01-02	2020-01-01 00:09:12	2020-01-02 03:37:33	2020-01-01 00:09:12.000	2020-01-02 03:37:33.000	552	99453	50002.5	5000250	552	99453	50002.5	5000250	-32618	32520	4782.66	478266	-124	127	0.58	58
+553	2	10543	99454	1.66066	298.66066	150.16066	15016.06606	1.66066	298.66068	150.16066	15016.06621	1.66066	298.66066	150.16066	15016.066	2020-01-01	2020-01-02	2020-01-01 00:09:13	2020-01-02 03:37:34	2020-01-01 00:09:13.000	2020-01-02 03:37:34.000	553	99454	50003.5	5000350	553	99454	50003.5	5000350	-32617	32521	4783.66	478366	-128	127	-0.98	-98
+554	2	10544	99455	1.66366	298.66366	150.16366	15016.36636	1.66366	298.66367	150.16366	15016.36651	1.66366	298.66366	150.16366	15016.366	2020-01-01	2020-01-02	2020-01-01 00:09:14	2020-01-02 03:37:35	2020-01-01 00:09:14.000	2020-01-02 03:37:35.000	554	99455	50004.5	5000450	554	99455	50004.5	5000450	-32616	32522	4784.66	478466	-128	127	-2.54	-254
+555	2	10545	99456	1.66666	298.66666	150.16666	15016.66666	1.66666	298.66666	150.16666	15016.66668	1.66666	298.66666	150.16665999999998	15016.666	2020-01-01	2020-01-02	2020-01-01 00:09:15	2020-01-02 03:37:36	2020-01-01 00:09:15.000	2020-01-02 03:37:36.000	555	99456	50005.5	5000550	555	99456	50005.5	5000550	-32615	32523	4785.66	478566	-128	124	-4.1	-410
+556	2	10546	99457	1.66966	298.66966	150.16966	15016.96696	1.66966	298.66968	150.16966	15016.9668	1.66966	298.66966	150.16966	15016.966	2020-01-01	2020-01-02	2020-01-01 00:09:16	2020-01-02 03:37:37	2020-01-01 00:09:16.000	2020-01-02 03:37:37.000	556	99457	50006.5	5000650	556	99457	50006.5	5000650	-32614	32524	4786.66	478666	-127	125	-3.1	-310
+557	2	10547	99458	1.67267	298.67267	150.17267	15017.26726	1.67267	298.67267	150.17267	15017.26709	1.67267	298.67267	150.17267	15017.267	2020-01-01	2020-01-02	2020-01-01 00:09:17	2020-01-02 03:37:38	2020-01-01 00:09:17.000	2020-01-02 03:37:38.000	557	99458	50007.5	5000750	557	99458	50007.5	5000750	-32613	32525	4787.66	478766	-126	126	-2.1	-210
+558	2	10548	99459	1.67567	298.67567	150.17567	15017.56756	1.67567	298.6757	150.17567	15017.56769	1.67567	298.67567	150.17567	15017.567	2020-01-01	2020-01-02	2020-01-01 00:09:18	2020-01-02 03:37:39	2020-01-01 00:09:18.000	2020-01-02 03:37:39.000	558	99459	50008.5	5000850	558	99459	50008.5	5000850	-32612	32526	4788.66	478866	-125	127	-1.1	-110
+559	2	10549	99460	1.67867	298.67867	150.17867	15017.86786	1.67867	298.67868	150.17868	15017.86802	1.67867	298.67867	150.17867	15017.867	2020-01-01	2020-01-02	2020-01-01 00:09:19	2020-01-02 03:37:40	2020-01-01 00:09:19.000	2020-01-02 03:37:40.000	559	99460	50009.5	5000950	559	99460	50009.5	5000950	-32611	32527	4789.66	478966	-128	127	-2.66	-266
 56	2	10046	99956	0.16816	300.16816	150.16816	15166.98498	0.16816	300.16818	150.16816	15166.98512	0.16816	300.16816	150.16816	15166.98416	2020-01-01	2020-01-02	2020-01-01 00:00:56	2020-01-02 03:45:56	2020-01-01 00:00:56.000	2020-01-02 03:45:56.000	56	99956	50006	5050606	56	99956	50006	5050606	-32513	32422	4585.009900990099	463086	-127	124	-2.712871287128713	-274
-560	2	10550	99461	1.68168	298.68168	150.18168	15018.16816	1.68168	298.68167	150.18168	15018.16815	1.68168	298.68168	150.18168	15018.16800	2020-01-01	2020-01-02	2020-01-01 00:09:20	2020-01-02 03:37:41	2020-01-01 00:09:20.000	2020-01-02 03:37:41.000	560	99461	50010.5	5001050	560	99461	50010.5	5001050	-32610	32528	4790.66	479066	-128	127	-4.22	-422
-561	2	10551	99462	1.68468	298.68468	150.18468	15018.46846	1.68468	298.6847	150.18468	15018.46826	1.68468	298.68468	150.18468000000001	15018.46800	2020-01-01	2020-01-02	2020-01-01 00:09:21	2020-01-02 03:37:42	2020-01-01 00:09:21.000	2020-01-02 03:37:42.000	561	99462	50011.5	5001150	561	99462	50011.5	5001150	-32609	32529	4791.66	479166	-128	123	-5.78	-578
-562	2	10552	99463	1.68768	298.68768	150.18768	15018.76876	1.68768	298.68768	150.18768	15018.76856	1.68768	298.68768	150.18768	15018.76800	2020-01-01	2020-01-02	2020-01-01 00:09:22	2020-01-02 03:37:43	2020-01-01 00:09:22.000	2020-01-02 03:37:43.000	562	99463	50012.5	5001250	562	99463	50012.5	5001250	-32608	32530	4792.66	479266	-127	124	-4.78	-478
-563	2	10553	99464	1.69069	298.69069	150.19069	15019.06906	1.69069	298.6907	150.19069	15019.06915	1.69069	298.69069	150.19069	15019.06900	2020-01-01	2020-01-02	2020-01-01 00:09:23	2020-01-02 03:37:44	2020-01-01 00:09:23.000	2020-01-02 03:37:44.000	563	99464	50013.5	5001350	563	99464	50013.5	5001350	-32607	32531	4793.66	479366	-126	125	-3.78	-378
-564	2	10554	99465	1.69369	298.69369	150.19369	15019.36936	1.69369	298.6937	150.19369	15019.36948	1.69369	298.69369	150.19369	15019.36900	2020-01-01	2020-01-02	2020-01-01 00:09:24	2020-01-02 03:37:45	2020-01-01 00:09:24.000	2020-01-02 03:37:45.000	564	99465	50014.5	5001450	564	99465	50014.5	5001450	-32606	32532	4794.66	479466	-125	126	-2.78	-278
-565	2	10555	99466	1.69669	298.69669	150.19669	15019.66966	1.69669	298.6967	150.19669	15019.66962	1.69669	298.69669	150.19669	15019.66900	2020-01-01	2020-01-02	2020-01-01 00:09:25	2020-01-02 03:37:46	2020-01-01 00:09:25.000	2020-01-02 03:37:46.000	565	99466	50015.5	5001550	565	99466	50015.5	5001550	-32605	32533	4795.66	479566	-124	127	-1.78	-178
-566	2	10556	99467	1.69969	298.69969	150.19969	15019.96996	1.69969	298.6997	150.1997	15019.97037	1.69969	298.69969	150.19969	15019.96900	2020-01-01	2020-01-02	2020-01-01 00:09:26	2020-01-02 03:37:47	2020-01-01 00:09:26.000	2020-01-02 03:37:47.000	566	99467	50016.5	5001650	566	99467	50016.5	5001650	-32604	32534	4796.66	479666	-128	127	-3.34	-334
-567	2	10557	99468	1.7027	298.7027	150.2027	15020.27027	1.7027	298.7027	150.2027	15020.27003	1.70270	298.70270	150.2027	15020.27000	2020-01-01	2020-01-02	2020-01-01 00:09:27	2020-01-02 03:37:48	2020-01-01 00:09:27.000	2020-01-02 03:37:48.000	567	99468	50017.5	5001750	567	99468	50017.5	5001750	-32603	32535	4797.66	479766	-128	123	-4.9	-490
-568	2	10558	99469	1.7057	298.7057	150.2057	15020.57057	1.7057	298.70572	150.2057	15020.57066	1.70570	298.70570	150.2057	15020.57000	2020-01-01	2020-01-02	2020-01-01 00:09:28	2020-01-02 03:37:49	2020-01-01 00:09:28.000	2020-01-02 03:37:49.000	568	99469	50018.5	5001850	568	99469	50018.5	5001850	-32602	32536	4798.66	479866	-127	124	-3.9	-390
-569	2	10559	99470	1.7087	298.7087	150.2087	15020.87087	1.7087	298.7087	150.2087	15020.87095	1.70870	298.70870	150.20870000000002	15020.87000	2020-01-01	2020-01-02	2020-01-01 00:09:29	2020-01-02 03:37:50	2020-01-01 00:09:29.000	2020-01-02 03:37:50.000	569	99470	50019.5	5001950	569	99470	50019.5	5001950	-32601	32537	4799.66	479966	-126	125	-2.9	-290
+560	2	10550	99461	1.68168	298.68168	150.18168	15018.16816	1.68168	298.68167	150.18168	15018.16815	1.68168	298.68168	150.18168	15018.168	2020-01-01	2020-01-02	2020-01-01 00:09:20	2020-01-02 03:37:41	2020-01-01 00:09:20.000	2020-01-02 03:37:41.000	560	99461	50010.5	5001050	560	99461	50010.5	5001050	-32610	32528	4790.66	479066	-128	127	-4.22	-422
+561	2	10551	99462	1.68468	298.68468	150.18468	15018.46846	1.68468	298.6847	150.18468	15018.46826	1.68468	298.68468	150.18468000000001	15018.468	2020-01-01	2020-01-02	2020-01-01 00:09:21	2020-01-02 03:37:42	2020-01-01 00:09:21.000	2020-01-02 03:37:42.000	561	99462	50011.5	5001150	561	99462	50011.5	5001150	-32609	32529	4791.66	479166	-128	123	-5.78	-578
+562	2	10552	99463	1.68768	298.68768	150.18768	15018.76876	1.68768	298.68768	150.18768	15018.76856	1.68768	298.68768	150.18768	15018.768	2020-01-01	2020-01-02	2020-01-01 00:09:22	2020-01-02 03:37:43	2020-01-01 00:09:22.000	2020-01-02 03:37:43.000	562	99463	50012.5	5001250	562	99463	50012.5	5001250	-32608	32530	4792.66	479266	-127	124	-4.78	-478
+563	2	10553	99464	1.69069	298.69069	150.19069	15019.06906	1.69069	298.6907	150.19069	15019.06915	1.69069	298.69069	150.19069	15019.069	2020-01-01	2020-01-02	2020-01-01 00:09:23	2020-01-02 03:37:44	2020-01-01 00:09:23.000	2020-01-02 03:37:44.000	563	99464	50013.5	5001350	563	99464	50013.5	5001350	-32607	32531	4793.66	479366	-126	125	-3.78	-378
+564	2	10554	99465	1.69369	298.69369	150.19369	15019.36936	1.69369	298.6937	150.19369	15019.36948	1.69369	298.69369	150.19369	15019.369	2020-01-01	2020-01-02	2020-01-01 00:09:24	2020-01-02 03:37:45	2020-01-01 00:09:24.000	2020-01-02 03:37:45.000	564	99465	50014.5	5001450	564	99465	50014.5	5001450	-32606	32532	4794.66	479466	-125	126	-2.78	-278
+565	2	10555	99466	1.69669	298.69669	150.19669	15019.66966	1.69669	298.6967	150.19669	15019.66962	1.69669	298.69669	150.19669	15019.669	2020-01-01	2020-01-02	2020-01-01 00:09:25	2020-01-02 03:37:46	2020-01-01 00:09:25.000	2020-01-02 03:37:46.000	565	99466	50015.5	5001550	565	99466	50015.5	5001550	-32605	32533	4795.66	479566	-124	127	-1.78	-178
+566	2	10556	99467	1.69969	298.69969	150.19969	15019.96996	1.69969	298.6997	150.1997	15019.97037	1.69969	298.69969	150.19969	15019.969	2020-01-01	2020-01-02	2020-01-01 00:09:26	2020-01-02 03:37:47	2020-01-01 00:09:26.000	2020-01-02 03:37:47.000	566	99467	50016.5	5001650	566	99467	50016.5	5001650	-32604	32534	4796.66	479666	-128	127	-3.34	-334
+567	2	10557	99468	1.7027	298.7027	150.2027	15020.27027	1.7027	298.7027	150.2027	15020.27003	1.7027	298.7027	150.2027	15020.27	2020-01-01	2020-01-02	2020-01-01 00:09:27	2020-01-02 03:37:48	2020-01-01 00:09:27.000	2020-01-02 03:37:48.000	567	99468	50017.5	5001750	567	99468	50017.5	5001750	-32603	32535	4797.66	479766	-128	123	-4.9	-490
+568	2	10558	99469	1.7057	298.7057	150.2057	15020.57057	1.7057	298.70572	150.2057	15020.57066	1.7057	298.7057	150.2057	15020.57	2020-01-01	2020-01-02	2020-01-01 00:09:28	2020-01-02 03:37:49	2020-01-01 00:09:28.000	2020-01-02 03:37:49.000	568	99469	50018.5	5001850	568	99469	50018.5	5001850	-32602	32536	4798.66	479866	-127	124	-3.9	-390
+569	2	10559	99470	1.7087	298.7087	150.2087	15020.87087	1.7087	298.7087	150.2087	15020.87095	1.7087	298.7087	150.20870000000002	15020.87	2020-01-01	2020-01-02	2020-01-01 00:09:29	2020-01-02 03:37:50	2020-01-01 00:09:29.000	2020-01-02 03:37:50.000	569	99470	50019.5	5001950	569	99470	50019.5	5001950	-32601	32537	4799.66	479966	-126	125	-2.9	-290
 57	2	10047	99957	0.17117	300.17117	150.17117	15167.28828	0.17117	300.17117	150.17117	15167.28841	0.17117	300.17117	150.17117	15167.28817	2020-01-01	2020-01-02	2020-01-01 00:00:57	2020-01-02 03:45:57	2020-01-01 00:00:57.000	2020-01-02 03:45:57.000	57	99957	50007	5050707	57	99957	50007	5050707	-32512	32423	4586.009900990099	463187	-126	125	-1.7128712871287128	-173
-570	2	10560	99471	1.71171	298.71171	150.21171	15021.17117	1.71171	298.7117	150.21171	15021.17109	1.71171	298.71171	150.21171	15021.17100	2020-01-01	2020-01-02	2020-01-01 00:09:30	2020-01-02 03:37:51	2020-01-01 00:09:30.000	2020-01-02 03:37:51.000	570	99471	50020.5	5002050	570	99471	50020.5	5002050	-32600	32538	4800.66	480066	-125	126	-1.9	-190
-571	2	10561	99472	1.71471	298.71471	150.21471	15021.47147	1.71471	298.71472	150.21471	15021.47184	1.71471	298.71471	150.21471	15021.47100	2020-01-01	2020-01-02	2020-01-01 00:09:31	2020-01-02 03:37:52	2020-01-01 00:09:31.000	2020-01-02 03:37:52.000	571	99472	50021.5	5002150	571	99472	50021.5	5002150	-32599	32539	4801.66	480166	-124	127	-0.9	-90
-572	2	10562	99473	1.71771	298.71771	150.21771	15021.77177	1.71771	298.7177	150.21771	15021.7715	1.71771	298.71771	150.21771	15021.77100	2020-01-01	2020-01-02	2020-01-01 00:09:32	2020-01-02 03:37:53	2020-01-01 00:09:32.000	2020-01-02 03:37:53.000	572	99473	50022.5	5002250	572	99473	50022.5	5002250	-32598	32540	4802.66	480266	-128	127	-2.46	-246
-573	2	10563	99474	1.72072	298.72072	150.22072	15022.07207	1.72072	298.72073	150.22072	15022.07212	1.72072	298.72072	150.22072	15022.07200	2020-01-01	2020-01-02	2020-01-01 00:09:33	2020-01-02 03:37:54	2020-01-01 00:09:33.000	2020-01-02 03:37:54.000	573	99474	50023.5	5002350	573	99474	50023.5	5002350	-32597	32541	4803.66	480366	-128	123	-4.02	-402
-574	2	10564	99475	1.72372	298.72372	150.22372	15022.37237	1.72372	298.72372	150.22372	15022.37243	1.72372	298.72372	150.22372	15022.37200	2020-01-01	2020-01-02	2020-01-01 00:09:34	2020-01-02 03:37:55	2020-01-01 00:09:34.000	2020-01-02 03:37:55.000	574	99475	50024.5	5002450	574	99475	50024.5	5002450	-32596	32542	4804.66	480466	-127	124	-3.02	-302
-575	2	10565	99476	1.72672	298.72672	150.22672	15022.67267	1.72672	298.7267	150.22672	15022.67272	1.72672	298.72672	150.22672	15022.67200	2020-01-01	2020-01-02	2020-01-01 00:09:35	2020-01-02 03:37:56	2020-01-01 00:09:35.000	2020-01-02 03:37:56.000	575	99476	50025.5	5002550	575	99476	50025.5	5002550	-32595	32543	4805.66	480566	-126	125	-2.02	-202
-576	2	10566	99477	1.72972	298.72972	150.22972	15022.97297	1.72972	298.72974	150.22973	15022.97332	1.72972	298.72972	150.22972	15022.97200	2020-01-01	2020-01-02	2020-01-01 00:09:36	2020-01-02 03:37:57	2020-01-01 00:09:36.000	2020-01-02 03:37:57.000	576	99477	50026.5	5002650	576	99477	50026.5	5002650	-32594	32544	4806.66	480666	-125	126	-1.02	-102
-577	2	10567	99478	1.73273	298.73273	150.23273	15023.27327	1.73273	298.73273	150.23272	15023.27297	1.73273	298.73273	150.23273	15023.27300	2020-01-01	2020-01-02	2020-01-01 00:09:37	2020-01-02 03:37:58	2020-01-01 00:09:37.000	2020-01-02 03:37:58.000	577	99478	50027.5	5002750	577	99478	50027.5	5002750	-32593	32545	4807.66	480766	-124	127	-0.02	-2
-578	2	10568	99479	1.73573	298.73573	150.23573	15023.57357	1.73573	298.73575	150.23573	15023.57359	1.73573	298.73573	150.23573	15023.57300	2020-01-01	2020-01-02	2020-01-01 00:09:38	2020-01-02 03:37:59	2020-01-01 00:09:38.000	2020-01-02 03:37:59.000	578	99479	50028.5	5002850	578	99479	50028.5	5002850	-32592	32546	4808.66	480866	-128	127	-1.58	-158
-579	2	10569	99480	1.73873	298.73873	150.23873	15023.87387	1.73873	298.73874	150.23873	15023.8739	1.73873	298.73873	150.23873	15023.87300	2020-01-01	2020-01-02	2020-01-01 00:09:39	2020-01-02 03:38:00	2020-01-01 00:09:39.000	2020-01-02 03:38:00.000	579	99480	50029.5	5002950	579	99480	50029.5	5002950	-32591	32547	4809.66	480966	-128	123	-3.14	-314
+570	2	10560	99471	1.71171	298.71171	150.21171	15021.17117	1.71171	298.7117	150.21171	15021.17109	1.71171	298.71171	150.21171	15021.171	2020-01-01	2020-01-02	2020-01-01 00:09:30	2020-01-02 03:37:51	2020-01-01 00:09:30.000	2020-01-02 03:37:51.000	570	99471	50020.5	5002050	570	99471	50020.5	5002050	-32600	32538	4800.66	480066	-125	126	-1.9	-190
+571	2	10561	99472	1.71471	298.71471	150.21471	15021.47147	1.71471	298.71472	150.21471	15021.47184	1.71471	298.71471	150.21471	15021.471	2020-01-01	2020-01-02	2020-01-01 00:09:31	2020-01-02 03:37:52	2020-01-01 00:09:31.000	2020-01-02 03:37:52.000	571	99472	50021.5	5002150	571	99472	50021.5	5002150	-32599	32539	4801.66	480166	-124	127	-0.9	-90
+572	2	10562	99473	1.71771	298.71771	150.21771	15021.77177	1.71771	298.7177	150.21771	15021.7715	1.71771	298.71771	150.21771	15021.771	2020-01-01	2020-01-02	2020-01-01 00:09:32	2020-01-02 03:37:53	2020-01-01 00:09:32.000	2020-01-02 03:37:53.000	572	99473	50022.5	5002250	572	99473	50022.5	5002250	-32598	32540	4802.66	480266	-128	127	-2.46	-246
+573	2	10563	99474	1.72072	298.72072	150.22072	15022.07207	1.72072	298.72073	150.22072	15022.07212	1.72072	298.72072	150.22072	15022.072	2020-01-01	2020-01-02	2020-01-01 00:09:33	2020-01-02 03:37:54	2020-01-01 00:09:33.000	2020-01-02 03:37:54.000	573	99474	50023.5	5002350	573	99474	50023.5	5002350	-32597	32541	4803.66	480366	-128	123	-4.02	-402
+574	2	10564	99475	1.72372	298.72372	150.22372	15022.37237	1.72372	298.72372	150.22372	15022.37243	1.72372	298.72372	150.22372	15022.372	2020-01-01	2020-01-02	2020-01-01 00:09:34	2020-01-02 03:37:55	2020-01-01 00:09:34.000	2020-01-02 03:37:55.000	574	99475	50024.5	5002450	574	99475	50024.5	5002450	-32596	32542	4804.66	480466	-127	124	-3.02	-302
+575	2	10565	99476	1.72672	298.72672	150.22672	15022.67267	1.72672	298.7267	150.22672	15022.67272	1.72672	298.72672	150.22672	15022.672	2020-01-01	2020-01-02	2020-01-01 00:09:35	2020-01-02 03:37:56	2020-01-01 00:09:35.000	2020-01-02 03:37:56.000	575	99476	50025.5	5002550	575	99476	50025.5	5002550	-32595	32543	4805.66	480566	-126	125	-2.02	-202
+576	2	10566	99477	1.72972	298.72972	150.22972	15022.97297	1.72972	298.72974	150.22973	15022.97332	1.72972	298.72972	150.22972	15022.972	2020-01-01	2020-01-02	2020-01-01 00:09:36	2020-01-02 03:37:57	2020-01-01 00:09:36.000	2020-01-02 03:37:57.000	576	99477	50026.5	5002650	576	99477	50026.5	5002650	-32594	32544	4806.66	480666	-125	126	-1.02	-102
+577	2	10567	99478	1.73273	298.73273	150.23273	15023.27327	1.73273	298.73273	150.23272	15023.27297	1.73273	298.73273	150.23273	15023.273	2020-01-01	2020-01-02	2020-01-01 00:09:37	2020-01-02 03:37:58	2020-01-01 00:09:37.000	2020-01-02 03:37:58.000	577	99478	50027.5	5002750	577	99478	50027.5	5002750	-32593	32545	4807.66	480766	-124	127	-0.02	-2
+578	2	10568	99479	1.73573	298.73573	150.23573	15023.57357	1.73573	298.73575	150.23573	15023.57359	1.73573	298.73573	150.23573	15023.573	2020-01-01	2020-01-02	2020-01-01 00:09:38	2020-01-02 03:37:59	2020-01-01 00:09:38.000	2020-01-02 03:37:59.000	578	99479	50028.5	5002850	578	99479	50028.5	5002850	-32592	32546	4808.66	480866	-128	127	-1.58	-158
+579	2	10569	99480	1.73873	298.73873	150.23873	15023.87387	1.73873	298.73874	150.23873	15023.8739	1.73873	298.73873	150.23873	15023.873	2020-01-01	2020-01-02	2020-01-01 00:09:39	2020-01-02 03:38:00	2020-01-01 00:09:39.000	2020-01-02 03:38:00.000	579	99480	50029.5	5002950	579	99480	50029.5	5002950	-32591	32547	4809.66	480966	-128	123	-3.14	-314
 58	2	10048	99958	0.17417	300.17417	150.17417	15167.59159	0.17417	300.17416	150.17417	15167.59159	0.17417	300.17417	150.17417	15167.59117	2020-01-01	2020-01-02	2020-01-01 00:00:58	2020-01-02 03:45:58	2020-01-01 00:00:58.000	2020-01-02 03:45:58.000	58	99958	50008	5050808	58	99958	50008	5050808	-32511	32424	4587.009900990099	463288	-125	126	-0.7128712871287128	-72
-580	2	10570	99481	1.74174	298.74174	150.24174	15024.17417	1.74174	298.74173	150.24174	15024.17419	1.74174	298.74174	150.24174000000002	15024.17400	2020-01-01	2020-01-02	2020-01-01 00:09:40	2020-01-02 03:38:01	2020-01-01 00:09:40.000	2020-01-02 03:38:01.000	580	99481	50030.5	5003050	580	99481	50030.5	5003050	-32590	32548	4810.66	481066	-127	124	-2.14	-214
-581	2	10571	99482	1.74474	298.74474	150.24474	15024.47447	1.74474	298.74475	150.24474	15024.47478	1.74474	298.74474	150.24474	15024.47400	2020-01-01	2020-01-02	2020-01-01 00:09:41	2020-01-02 03:38:02	2020-01-01 00:09:41.000	2020-01-02 03:38:02.000	581	99482	50031.5	5003150	581	99482	50031.5	5003150	-32589	32549	4811.66	481166	-126	125	-1.14	-114
-582	2	10572	99483	1.74774	298.74774	150.24774	15024.77477	1.74774	298.74774	150.24774	15024.77447	1.74774	298.74774	150.24774	15024.77400	2020-01-01	2020-01-02	2020-01-01 00:09:42	2020-01-02 03:38:03	2020-01-01 00:09:42.000	2020-01-02 03:38:03.000	582	99483	50032.5	5003250	582	99483	50032.5	5003250	-32588	32550	4812.66	481266	-125	126	-0.14	-14
-583	2	10573	99484	1.75075	298.75075	150.25075	15025.07507	1.75075	298.75076	150.25075	15025.07507	1.75075	298.75075	150.25075	15025.07500	2020-01-01	2020-01-02	2020-01-01 00:09:43	2020-01-02 03:38:04	2020-01-01 00:09:43.000	2020-01-02 03:38:04.000	583	99484	50033.5	5003350	583	99484	50033.5	5003350	-32587	32551	4813.66	481366	-124	127	0.86	86
-584	2	10574	99485	1.75375	298.75375	150.25375	15025.37537	1.75375	298.75375	150.25375	15025.37536	1.75375	298.75375	150.25375	15025.37500	2020-01-01	2020-01-02	2020-01-01 00:09:44	2020-01-02 03:38:05	2020-01-01 00:09:44.000	2020-01-02 03:38:05.000	584	99485	50034.5	5003450	584	99485	50034.5	5003450	-32586	32552	4814.66	481466	-128	127	-0.7	-70
-585	2	10575	99486	1.75675	298.75675	150.25675	15025.67567	1.75675	298.75674	150.25675	15025.67566	1.75675	298.75675	150.25674999999998	15025.67500	2020-01-01	2020-01-02	2020-01-01 00:09:45	2020-01-02 03:38:06	2020-01-01 00:09:45.000	2020-01-02 03:38:06.000	585	99486	50035.5	5003550	585	99486	50035.5	5003550	-32585	32553	4815.66	481566	-128	127	-2.26	-226
-586	2	10576	99487	1.75975	298.75975	150.25975	15025.97597	1.75975	298.75977	150.25976	15025.97625	1.75975	298.75975	150.25975	15025.97500	2020-01-01	2020-01-02	2020-01-01 00:09:46	2020-01-02 03:38:07	2020-01-01 00:09:46.000	2020-01-02 03:38:07.000	586	99487	50036.5	5003650	586	99487	50036.5	5003650	-32584	32554	4816.66	481666	-128	123	-3.82	-382
-587	2	10577	99488	1.76276	298.76276	150.26276	15026.27627	1.76276	298.76276	150.26275	15026.27594	1.76276	298.76276	150.26276	15026.27600	2020-01-01	2020-01-02	2020-01-01 00:09:47	2020-01-02 03:38:08	2020-01-01 00:09:47.000	2020-01-02 03:38:08.000	587	99488	50037.5	5003750	587	99488	50037.5	5003750	-32583	32555	4817.66	481766	-127	124	-2.82	-282
-588	2	10578	99489	1.76576	298.76576	150.26576	15026.57657	1.76576	298.76578	150.26576	15026.57654	1.76576	298.76576	150.26576	15026.57600	2020-01-01	2020-01-02	2020-01-01 00:09:48	2020-01-02 03:38:09	2020-01-01 00:09:48.000	2020-01-02 03:38:09.000	588	99489	50038.5	5003850	588	99489	50038.5	5003850	-32582	32556	4818.66	481866	-126	125	-1.82	-182
-589	2	10579	99490	1.76876	298.76876	150.26876	15026.87687	1.76876	298.76877	150.26876	15026.87683	1.76876	298.76876	150.26876000000001	15026.87600	2020-01-01	2020-01-02	2020-01-01 00:09:49	2020-01-02 03:38:10	2020-01-01 00:09:49.000	2020-01-02 03:38:10.000	589	99490	50039.5	5003950	589	99490	50039.5	5003950	-32581	32557	4819.66	481966	-125	126	-0.82	-82
+580	2	10570	99481	1.74174	298.74174	150.24174	15024.17417	1.74174	298.74173	150.24174	15024.17419	1.74174	298.74174	150.24174000000002	15024.174	2020-01-01	2020-01-02	2020-01-01 00:09:40	2020-01-02 03:38:01	2020-01-01 00:09:40.000	2020-01-02 03:38:01.000	580	99481	50030.5	5003050	580	99481	50030.5	5003050	-32590	32548	4810.66	481066	-127	124	-2.14	-214
+581	2	10571	99482	1.74474	298.74474	150.24474	15024.47447	1.74474	298.74475	150.24474	15024.47478	1.74474	298.74474	150.24474	15024.474	2020-01-01	2020-01-02	2020-01-01 00:09:41	2020-01-02 03:38:02	2020-01-01 00:09:41.000	2020-01-02 03:38:02.000	581	99482	50031.5	5003150	581	99482	50031.5	5003150	-32589	32549	4811.66	481166	-126	125	-1.14	-114
+582	2	10572	99483	1.74774	298.74774	150.24774	15024.77477	1.74774	298.74774	150.24774	15024.77447	1.74774	298.74774	150.24774	15024.774	2020-01-01	2020-01-02	2020-01-01 00:09:42	2020-01-02 03:38:03	2020-01-01 00:09:42.000	2020-01-02 03:38:03.000	582	99483	50032.5	5003250	582	99483	50032.5	5003250	-32588	32550	4812.66	481266	-125	126	-0.14	-14
+583	2	10573	99484	1.75075	298.75075	150.25075	15025.07507	1.75075	298.75076	150.25075	15025.07507	1.75075	298.75075	150.25075	15025.075	2020-01-01	2020-01-02	2020-01-01 00:09:43	2020-01-02 03:38:04	2020-01-01 00:09:43.000	2020-01-02 03:38:04.000	583	99484	50033.5	5003350	583	99484	50033.5	5003350	-32587	32551	4813.66	481366	-124	127	0.86	86
+584	2	10574	99485	1.75375	298.75375	150.25375	15025.37537	1.75375	298.75375	150.25375	15025.37536	1.75375	298.75375	150.25375	15025.375	2020-01-01	2020-01-02	2020-01-01 00:09:44	2020-01-02 03:38:05	2020-01-01 00:09:44.000	2020-01-02 03:38:05.000	584	99485	50034.5	5003450	584	99485	50034.5	5003450	-32586	32552	4814.66	481466	-128	127	-0.7	-70
+585	2	10575	99486	1.75675	298.75675	150.25675	15025.67567	1.75675	298.75674	150.25675	15025.67566	1.75675	298.75675	150.25674999999998	15025.675	2020-01-01	2020-01-02	2020-01-01 00:09:45	2020-01-02 03:38:06	2020-01-01 00:09:45.000	2020-01-02 03:38:06.000	585	99486	50035.5	5003550	585	99486	50035.5	5003550	-32585	32553	4815.66	481566	-128	127	-2.26	-226
+586	2	10576	99487	1.75975	298.75975	150.25975	15025.97597	1.75975	298.75977	150.25976	15025.97625	1.75975	298.75975	150.25975	15025.975	2020-01-01	2020-01-02	2020-01-01 00:09:46	2020-01-02 03:38:07	2020-01-01 00:09:46.000	2020-01-02 03:38:07.000	586	99487	50036.5	5003650	586	99487	50036.5	5003650	-32584	32554	4816.66	481666	-128	123	-3.82	-382
+587	2	10577	99488	1.76276	298.76276	150.26276	15026.27627	1.76276	298.76276	150.26275	15026.27594	1.76276	298.76276	150.26276	15026.276	2020-01-01	2020-01-02	2020-01-01 00:09:47	2020-01-02 03:38:08	2020-01-01 00:09:47.000	2020-01-02 03:38:08.000	587	99488	50037.5	5003750	587	99488	50037.5	5003750	-32583	32555	4817.66	481766	-127	124	-2.82	-282
+588	2	10578	99489	1.76576	298.76576	150.26576	15026.57657	1.76576	298.76578	150.26576	15026.57654	1.76576	298.76576	150.26576	15026.576	2020-01-01	2020-01-02	2020-01-01 00:09:48	2020-01-02 03:38:09	2020-01-01 00:09:48.000	2020-01-02 03:38:09.000	588	99489	50038.5	5003850	588	99489	50038.5	5003850	-32582	32556	4818.66	481866	-126	125	-1.82	-182
+589	2	10579	99490	1.76876	298.76876	150.26876	15026.87687	1.76876	298.76877	150.26876	15026.87683	1.76876	298.76876	150.26876000000001	15026.876	2020-01-01	2020-01-02	2020-01-01 00:09:49	2020-01-02 03:38:10	2020-01-01 00:09:49.000	2020-01-02 03:38:10.000	589	99490	50039.5	5003950	589	99490	50039.5	5003950	-32581	32557	4819.66	481966	-125	126	-0.82	-82
 59	2	10049	99959	0.17717	300.17717	150.17717	15167.89489	0.17717	300.1772	150.17717	15167.8947	0.17717	300.17717	150.17717	15167.89417	2020-01-01	2020-01-02	2020-01-01 00:00:59	2020-01-02 03:45:59	2020-01-01 00:00:59.000	2020-01-02 03:45:59.000	59	99959	50009	5050909	59	99959	50009	5050909	-32510	32425	4588.009900990099	463389	-124	127	0.2871287128712871	29
-590	2	10580	99491	1.77177	298.77177	150.27177	15027.17717	1.77177	298.77176	150.27177	15027.17713	1.77177	298.77177	150.27177	15027.17700	2020-01-01	2020-01-02	2020-01-01 00:09:50	2020-01-02 03:38:11	2020-01-01 00:09:50.000	2020-01-02 03:38:11.000	590	99491	50040.5	5004050	590	99491	50040.5	5004050	-32580	32558	4820.66	482066	-124	127	0.18	18
-591	2	10581	99492	1.77477	298.77477	150.27477	15027.47747	1.77477	298.77478	150.27477	15027.47775	1.77477	298.77477	150.27477000000002	15027.47700	2020-01-01	2020-01-02	2020-01-01 00:09:51	2020-01-02 03:38:12	2020-01-01 00:09:51.000	2020-01-02 03:38:12.000	591	99492	50041.5	5004150	591	99492	50041.5	5004150	-32579	32559	4821.66	482166	-128	127	-1.38	-138
-592	2	10582	99493	1.77777	298.77777	150.27777	15027.77777	1.77777	298.77777	150.27777	15027.77742	1.77777	298.77777	150.27777	15027.77700	2020-01-01	2020-01-02	2020-01-01 00:09:52	2020-01-02 03:38:13	2020-01-01 00:09:52.000	2020-01-02 03:38:13.000	592	99493	50042.5	5004250	592	99493	50042.5	5004250	-32578	32560	4822.66	482266	-128	123	-2.94	-294
-593	2	10583	99494	1.78078	298.78078	150.28078	15028.07807	1.78078	298.7808	150.28078	15028.078	1.78078	298.78078	150.28078	15028.07800	2020-01-01	2020-01-02	2020-01-01 00:09:53	2020-01-02 03:38:14	2020-01-01 00:09:53.000	2020-01-02 03:38:14.000	593	99494	50043.5	5004350	593	99494	50043.5	5004350	-32577	32561	4823.66	482366	-127	124	-1.94	-194
-594	2	10584	99495	1.78378	298.78378	150.28378	15028.37837	1.78378	298.78378	150.28378	15028.3783	1.78378	298.78378	150.28378	15028.37800	2020-01-01	2020-01-02	2020-01-01 00:09:54	2020-01-02 03:38:15	2020-01-01 00:09:54.000	2020-01-02 03:38:15.000	594	99495	50044.5	5004450	594	99495	50044.5	5004450	-32576	32562	4824.66	482466	-126	125	-0.94	-94
-595	2	10585	99496	1.78678	298.78678	150.28678	15028.67867	1.78678	298.78677	150.28678	15028.6786	1.78678	298.78678	150.28678	15028.67800	2020-01-01	2020-01-02	2020-01-01 00:09:55	2020-01-02 03:38:16	2020-01-01 00:09:55.000	2020-01-02 03:38:16.000	595	99496	50045.5	5004550	595	99496	50045.5	5004550	-32575	32563	4825.66	482566	-125	126	0.06	6
-596	2	10586	99497	1.78978	298.78978	150.28978	15028.97897	1.78978	298.7898	150.28979	15028.97922	1.78978	298.78978	150.28977999999998	15028.97800	2020-01-01	2020-01-02	2020-01-01 00:09:56	2020-01-02 03:38:17	2020-01-01 00:09:56.000	2020-01-02 03:38:17.000	596	99497	50046.5	5004650	596	99497	50046.5	5004650	-32574	32564	4826.66	482666	-124	127	1.06	106
-597	2	10587	99498	1.79279	298.79279	150.29279	15029.27927	1.79279	298.7928	150.29278	15029.27888	1.79279	298.79279	150.29279	15029.27900	2020-01-01	2020-01-02	2020-01-01 00:09:57	2020-01-02 03:38:18	2020-01-01 00:09:57.000	2020-01-02 03:38:18.000	597	99498	50047.5	5004750	597	99498	50047.5	5004750	-32573	32565	4827.66	482766	-128	127	-0.5	-50
-598	2	10588	99499	1.79579	298.79579	150.29579	15029.57957	1.79579	298.7958	150.29579	15029.57964	1.79579	298.79579	150.29579	15029.57900	2020-01-01	2020-01-02	2020-01-01 00:09:58	2020-01-02 03:38:19	2020-01-01 00:09:58.000	2020-01-02 03:38:19.000	598	99499	50048.5	5004850	598	99499	50048.5	5004850	-32572	32566	4828.66	482866	-128	123	-2.06	-206
-599	2	10589	99500	1.79879	298.79879	150.29879	15029.87987	1.79879	298.7988	150.29879	15029.87977	1.79879	298.79879	150.29879	15029.87900	2020-01-01	2020-01-02	2020-01-01 00:09:59	2020-01-02 03:38:20	2020-01-01 00:09:59.000	2020-01-02 03:38:20.000	599	99500	50049.5	5004950	599	99500	50049.5	5004950	-32571	32567	4829.66	482966	-127	124	-1.06	-106
+590	2	10580	99491	1.77177	298.77177	150.27177	15027.17717	1.77177	298.77176	150.27177	15027.17713	1.77177	298.77177	150.27177	15027.177	2020-01-01	2020-01-02	2020-01-01 00:09:50	2020-01-02 03:38:11	2020-01-01 00:09:50.000	2020-01-02 03:38:11.000	590	99491	50040.5	5004050	590	99491	50040.5	5004050	-32580	32558	4820.66	482066	-124	127	0.18	18
+591	2	10581	99492	1.77477	298.77477	150.27477	15027.47747	1.77477	298.77478	150.27477	15027.47775	1.77477	298.77477	150.27477000000002	15027.477	2020-01-01	2020-01-02	2020-01-01 00:09:51	2020-01-02 03:38:12	2020-01-01 00:09:51.000	2020-01-02 03:38:12.000	591	99492	50041.5	5004150	591	99492	50041.5	5004150	-32579	32559	4821.66	482166	-128	127	-1.38	-138
+592	2	10582	99493	1.77777	298.77777	150.27777	15027.77777	1.77777	298.77777	150.27777	15027.77742	1.77777	298.77777	150.27777	15027.777	2020-01-01	2020-01-02	2020-01-01 00:09:52	2020-01-02 03:38:13	2020-01-01 00:09:52.000	2020-01-02 03:38:13.000	592	99493	50042.5	5004250	592	99493	50042.5	5004250	-32578	32560	4822.66	482266	-128	123	-2.94	-294
+593	2	10583	99494	1.78078	298.78078	150.28078	15028.07807	1.78078	298.7808	150.28078	15028.078	1.78078	298.78078	150.28078	15028.078	2020-01-01	2020-01-02	2020-01-01 00:09:53	2020-01-02 03:38:14	2020-01-01 00:09:53.000	2020-01-02 03:38:14.000	593	99494	50043.5	5004350	593	99494	50043.5	5004350	-32577	32561	4823.66	482366	-127	124	-1.94	-194
+594	2	10584	99495	1.78378	298.78378	150.28378	15028.37837	1.78378	298.78378	150.28378	15028.3783	1.78378	298.78378	150.28378	15028.378	2020-01-01	2020-01-02	2020-01-01 00:09:54	2020-01-02 03:38:15	2020-01-01 00:09:54.000	2020-01-02 03:38:15.000	594	99495	50044.5	5004450	594	99495	50044.5	5004450	-32576	32562	4824.66	482466	-126	125	-0.94	-94
+595	2	10585	99496	1.78678	298.78678	150.28678	15028.67867	1.78678	298.78677	150.28678	15028.6786	1.78678	298.78678	150.28678	15028.678	2020-01-01	2020-01-02	2020-01-01 00:09:55	2020-01-02 03:38:16	2020-01-01 00:09:55.000	2020-01-02 03:38:16.000	595	99496	50045.5	5004550	595	99496	50045.5	5004550	-32575	32563	4825.66	482566	-125	126	0.06	6
+596	2	10586	99497	1.78978	298.78978	150.28978	15028.97897	1.78978	298.7898	150.28979	15028.97922	1.78978	298.78978	150.28977999999998	15028.978	2020-01-01	2020-01-02	2020-01-01 00:09:56	2020-01-02 03:38:17	2020-01-01 00:09:56.000	2020-01-02 03:38:17.000	596	99497	50046.5	5004650	596	99497	50046.5	5004650	-32574	32564	4826.66	482666	-124	127	1.06	106
+597	2	10587	99498	1.79279	298.79279	150.29279	15029.27927	1.79279	298.7928	150.29278	15029.27888	1.79279	298.79279	150.29279	15029.279	2020-01-01	2020-01-02	2020-01-01 00:09:57	2020-01-02 03:38:18	2020-01-01 00:09:57.000	2020-01-02 03:38:18.000	597	99498	50047.5	5004750	597	99498	50047.5	5004750	-32573	32565	4827.66	482766	-128	127	-0.5	-50
+598	2	10588	99499	1.79579	298.79579	150.29579	15029.57957	1.79579	298.7958	150.29579	15029.57964	1.79579	298.79579	150.29579	15029.579	2020-01-01	2020-01-02	2020-01-01 00:09:58	2020-01-02 03:38:19	2020-01-01 00:09:58.000	2020-01-02 03:38:19.000	598	99499	50048.5	5004850	598	99499	50048.5	5004850	-32572	32566	4828.66	482866	-128	123	-2.06	-206
+599	2	10589	99500	1.79879	298.79879	150.29879	15029.87987	1.79879	298.7988	150.29879	15029.87977	1.79879	298.79879	150.29879	15029.879	2020-01-01	2020-01-02	2020-01-01 00:09:59	2020-01-02 03:38:20	2020-01-01 00:09:59.000	2020-01-02 03:38:20.000	599	99500	50049.5	5004950	599	99500	50049.5	5004950	-32571	32567	4829.66	482966	-127	124	-1.06	-106
 6	2	1005	9996	0.01801	300.01801	150.01801	15151.81981	0.01801	300.018	150.01801	15151.81978	0.01801	300.01801	150.01801	15151.81901	2020-01-01	2020-01-02	2020-01-01 00:00:06	2020-01-02 03:45:06	2020-01-01 00:00:06.000	2020-01-02 03:45:06.000	6	99906	49956	5045556	6	99906	49956	5045556	-32563	32372	4535.009900990099	458036	-127	124	-2.01980198019802	-204
 60	2	10050	99960	0.18018	300.18018	150.18018	15168.19819	0.18018	300.18018	150.18017	15168.198	0.18018	300.18018	150.18018	15168.19818	2020-01-01	2020-01-02	2020-01-01 00:01:00	2020-01-02 03:46:00	2020-01-01 00:01:00.000	2020-01-02 03:46:00.000	60	99960	50010	5051010	60	99960	50010	5051010	-32509	32426	4589.009900990099	463490	-128	127	-1.2475247524752475	-126
-600	2	10590	99501	1.8018	298.8018	150.3018	15030.18018	1.8018	298.8018	150.3018	15030.1801	1.80180	298.80180	150.30180000000001	15030.18000	2020-01-01	2020-01-02	2020-01-01 00:10:00	2020-01-02 03:38:21	2020-01-01 00:10:00.000	2020-01-02 03:38:21.000	600	99501	50050.5	5005050	600	99501	50050.5	5005050	-32570	32568	4830.66	483066	-126	125	-0.06	-6
-601	2	10591	99502	1.8048	298.8048	150.3048	15030.48048	1.8048	298.8048	150.3048	15030.4807	1.80480	298.80480	150.3048	15030.48000	2020-01-01	2020-01-02	2020-01-01 00:10:01	2020-01-02 03:38:22	2020-01-01 00:10:01.000	2020-01-02 03:38:22.000	601	99502	50051.5	5005150	601	99502	50051.5	5005150	-32569	32569	4831.66	483166	-125	126	0.94	94
-602	2	10592	99503	1.8078	298.8078	150.3078	15030.78078	1.8078	298.8078	150.3078	15030.78035	1.80780	298.80780	150.30780000000001	15030.78000	2020-01-01	2020-01-02	2020-01-01 00:10:02	2020-01-02 03:38:23	2020-01-01 00:10:02.000	2020-01-02 03:38:23.000	602	99503	50052.5	5005250	602	99503	50052.5	5005250	-32568	32570	4832.66	483266	-124	127	1.94	194
-603	2	10593	99504	1.81081	298.81081	150.31081	15031.08108	1.81081	298.81082	150.31081	15031.0811	1.81081	298.81081	150.31081	15031.08100	2020-01-01	2020-01-02	2020-01-01 00:10:03	2020-01-02 03:38:24	2020-01-01 00:10:03.000	2020-01-02 03:38:24.000	603	99504	50053.5	5005350	603	99504	50053.5	5005350	-32567	32571	4833.66	483366	-128	127	0.38	38
-604	2	10594	99505	1.81381	298.81381	150.31381	15031.38138	1.81381	298.8138	150.31381	15031.38124	1.81381	298.81381	150.31381	15031.38100	2020-01-01	2020-01-02	2020-01-01 00:10:04	2020-01-02 03:38:25	2020-01-01 00:10:04.000	2020-01-02 03:38:25.000	604	99505	50054.5	5005450	604	99505	50054.5	5005450	-32566	32572	4834.66	483466	-128	123	-1.18	-118
-605	2	10595	99506	1.81681	298.81681	150.31681	15031.68168	1.81681	298.8168	150.31681	15031.68157	1.81681	298.81681	150.31681	15031.68100	2020-01-01	2020-01-02	2020-01-01 00:10:05	2020-01-02 03:38:26	2020-01-01 00:10:05.000	2020-01-02 03:38:26.000	605	99506	50055.5	5005550	605	99506	50055.5	5005550	-32565	32573	4835.66	483566	-127	124	-0.18	-18
-606	2	10596	99507	1.81981	298.81981	150.31981	15031.98198	1.81981	298.81982	150.31982	15031.98217	1.81981	298.81981	150.31981	15031.98100	2020-01-01	2020-01-02	2020-01-01 00:10:06	2020-01-02 03:38:27	2020-01-01 00:10:06.000	2020-01-02 03:38:27.000	606	99507	50056.5	5005650	606	99507	50056.5	5005650	-32564	32574	4836.66	483666	-126	125	0.82	82
-607	2	10597	99508	1.82282	298.82282	150.32282	15032.28228	1.82282	298.8228	150.32282	15032.28246	1.82282	298.82282	150.32281999999998	15032.28200	2020-01-01	2020-01-02	2020-01-01 00:10:07	2020-01-02 03:38:28	2020-01-01 00:10:07.000	2020-01-02 03:38:28.000	607	99508	50057.5	5005750	607	99508	50057.5	5005750	-32563	32575	4837.66	483766	-125	126	1.82	182
-608	2	10598	99509	1.82582	298.82582	150.32582	15032.58258	1.82582	298.82584	150.32582	15032.58258	1.82582	298.82582	150.32582	15032.58200	2020-01-01	2020-01-02	2020-01-01 00:10:08	2020-01-02 03:38:29	2020-01-01 00:10:08.000	2020-01-02 03:38:29.000	608	99509	50058.5	5005850	608	99509	50058.5	5005850	-32562	32576	4838.66	483866	-124	127	2.82	282
-609	2	10599	99510	1.82882	298.82882	150.32882	15032.88288	1.82882	298.82883	150.32882	15032.88274	1.82882	298.82882	150.32882	15032.88200	2020-01-01	2020-01-02	2020-01-01 00:10:09	2020-01-02 03:38:30	2020-01-01 00:10:09.000	2020-01-02 03:38:30.000	609	99510	50059.5	5005950	609	99510	50059.5	5005950	-32561	32577	4839.66	483966	-128	127	1.26	126
+600	2	10590	99501	1.8018	298.8018	150.3018	15030.18018	1.8018	298.8018	150.3018	15030.1801	1.8018	298.8018	150.30180000000001	15030.18	2020-01-01	2020-01-02	2020-01-01 00:10:00	2020-01-02 03:38:21	2020-01-01 00:10:00.000	2020-01-02 03:38:21.000	600	99501	50050.5	5005050	600	99501	50050.5	5005050	-32570	32568	4830.66	483066	-126	125	-0.06	-6
+601	2	10591	99502	1.8048	298.8048	150.3048	15030.48048	1.8048	298.8048	150.3048	15030.4807	1.8048	298.8048	150.3048	15030.48	2020-01-01	2020-01-02	2020-01-01 00:10:01	2020-01-02 03:38:22	2020-01-01 00:10:01.000	2020-01-02 03:38:22.000	601	99502	50051.5	5005150	601	99502	50051.5	5005150	-32569	32569	4831.66	483166	-125	126	0.94	94
+602	2	10592	99503	1.8078	298.8078	150.3078	15030.78078	1.8078	298.8078	150.3078	15030.78035	1.8078	298.8078	150.30780000000001	15030.78	2020-01-01	2020-01-02	2020-01-01 00:10:02	2020-01-02 03:38:23	2020-01-01 00:10:02.000	2020-01-02 03:38:23.000	602	99503	50052.5	5005250	602	99503	50052.5	5005250	-32568	32570	4832.66	483266	-124	127	1.94	194
+603	2	10593	99504	1.81081	298.81081	150.31081	15031.08108	1.81081	298.81082	150.31081	15031.0811	1.81081	298.81081	150.31081	15031.081	2020-01-01	2020-01-02	2020-01-01 00:10:03	2020-01-02 03:38:24	2020-01-01 00:10:03.000	2020-01-02 03:38:24.000	603	99504	50053.5	5005350	603	99504	50053.5	5005350	-32567	32571	4833.66	483366	-128	127	0.38	38
+604	2	10594	99505	1.81381	298.81381	150.31381	15031.38138	1.81381	298.8138	150.31381	15031.38124	1.81381	298.81381	150.31381	15031.381	2020-01-01	2020-01-02	2020-01-01 00:10:04	2020-01-02 03:38:25	2020-01-01 00:10:04.000	2020-01-02 03:38:25.000	604	99505	50054.5	5005450	604	99505	50054.5	5005450	-32566	32572	4834.66	483466	-128	123	-1.18	-118
+605	2	10595	99506	1.81681	298.81681	150.31681	15031.68168	1.81681	298.8168	150.31681	15031.68157	1.81681	298.81681	150.31681	15031.681	2020-01-01	2020-01-02	2020-01-01 00:10:05	2020-01-02 03:38:26	2020-01-01 00:10:05.000	2020-01-02 03:38:26.000	605	99506	50055.5	5005550	605	99506	50055.5	5005550	-32565	32573	4835.66	483566	-127	124	-0.18	-18
+606	2	10596	99507	1.81981	298.81981	150.31981	15031.98198	1.81981	298.81982	150.31982	15031.98217	1.81981	298.81981	150.31981	15031.981	2020-01-01	2020-01-02	2020-01-01 00:10:06	2020-01-02 03:38:27	2020-01-01 00:10:06.000	2020-01-02 03:38:27.000	606	99507	50056.5	5005650	606	99507	50056.5	5005650	-32564	32574	4836.66	483666	-126	125	0.82	82
+607	2	10597	99508	1.82282	298.82282	150.32282	15032.28228	1.82282	298.8228	150.32282	15032.28246	1.82282	298.82282	150.32281999999998	15032.282	2020-01-01	2020-01-02	2020-01-01 00:10:07	2020-01-02 03:38:28	2020-01-01 00:10:07.000	2020-01-02 03:38:28.000	607	99508	50057.5	5005750	607	99508	50057.5	5005750	-32563	32575	4837.66	483766	-125	126	1.82	182
+608	2	10598	99509	1.82582	298.82582	150.32582	15032.58258	1.82582	298.82584	150.32582	15032.58258	1.82582	298.82582	150.32582	15032.582	2020-01-01	2020-01-02	2020-01-01 00:10:08	2020-01-02 03:38:29	2020-01-01 00:10:08.000	2020-01-02 03:38:29.000	608	99509	50058.5	5005850	608	99509	50058.5	5005850	-32562	32576	4838.66	483866	-124	127	2.82	282
+609	2	10599	99510	1.82882	298.82882	150.32882	15032.88288	1.82882	298.82883	150.32882	15032.88274	1.82882	298.82882	150.32882	15032.882	2020-01-01	2020-01-02	2020-01-01 00:10:09	2020-01-02 03:38:30	2020-01-01 00:10:09.000	2020-01-02 03:38:30.000	609	99510	50059.5	5005950	609	99510	50059.5	5005950	-32561	32577	4839.66	483966	-128	127	1.26	126
 61	2	10051	99961	0.18318	300.18318	150.18318	15168.5015	0.18318	300.1832	150.18318	15168.5016	0.18318	300.18318	150.18318	15168.50118	2020-01-01	2020-01-02	2020-01-01 00:01:01	2020-01-02 03:46:01	2020-01-01 00:01:01.000	2020-01-02 03:46:01.000	61	99961	50011	5051111	61	99961	50011	5051111	-32508	32427	4590.009900990099	463591	-128	123	-2.782178217821782	-281
-610	2	10600	99511	1.83183	298.83183	150.33183	15033.18318	1.83183	298.83182	150.33183	15033.18304	1.83183	298.83183	150.33183	15033.18300	2020-01-01	2020-01-02	2020-01-01 00:10:10	2020-01-02 03:38:31	2020-01-01 00:10:10.000	2020-01-02 03:38:31.000	610	99511	50060.5	5006050	610	99511	50060.5	5006050	-32560	32578	4840.66	484066	-128	127	-0.3	-30
-611	2	10601	99512	1.83483	298.83483	150.33483	15033.48348	1.83483	298.83484	150.33483	15033.48363	1.83483	298.83483	150.33483	15033.48300	2020-01-01	2020-01-02	2020-01-01 00:10:11	2020-01-02 03:38:32	2020-01-01 00:10:11.000	2020-01-02 03:38:32.000	611	99512	50061.5	5006150	611	99512	50061.5	5006150	-32559	32579	4841.66	484166	-128	123	-1.86	-186
-612	2	10602	99513	1.83783	298.83783	150.33783	15033.78378	1.83783	298.83783	150.33783	15033.78393	1.83783	298.83783	150.33783	15033.78300	2020-01-01	2020-01-02	2020-01-01 00:10:12	2020-01-02 03:38:33	2020-01-01 00:10:12.000	2020-01-02 03:38:33.000	612	99513	50062.5	5006250	612	99513	50062.5	5006250	-32558	32580	4842.66	484266	-127	124	-0.86	-86
-613	2	10603	99514	1.84084	298.84084	150.34084	15034.08408	1.84084	298.84085	150.34084	15034.08405	1.84084	298.84084	150.34084000000001	15034.08400	2020-01-01	2020-01-02	2020-01-01 00:10:13	2020-01-02 03:38:34	2020-01-01 00:10:13.000	2020-01-02 03:38:34.000	613	99514	50063.5	5006350	613	99514	50063.5	5006350	-32557	32581	4843.66	484366	-126	125	0.14	14
-614	2	10604	99515	1.84384	298.84384	150.34384	15034.38438	1.84384	298.84384	150.34384	15034.38421	1.84384	298.84384	150.34384	15034.38400	2020-01-01	2020-01-02	2020-01-01 00:10:14	2020-01-02 03:38:35	2020-01-01 00:10:14.000	2020-01-02 03:38:35.000	614	99515	50064.5	5006450	614	99515	50064.5	5006450	-32556	32582	4844.66	484466	-125	126	1.14	114
-615	2	10605	99516	1.84684	298.84684	150.34684	15034.68468	1.84684	298.84683	150.34684	15034.68452	1.84684	298.84684	150.34684	15034.68400	2020-01-01	2020-01-02	2020-01-01 00:10:15	2020-01-02 03:38:36	2020-01-01 00:10:15.000	2020-01-02 03:38:36.000	615	99516	50065.5	5006550	615	99516	50065.5	5006550	-32555	32583	4845.66	484566	-124	127	2.14	214
-616	2	10606	99517	1.84984	298.84984	150.34984	15034.98498	1.84984	298.84985	150.34985	15034.98527	1.84984	298.84984	150.34984	15034.98400	2020-01-01	2020-01-02	2020-01-01 00:10:16	2020-01-02 03:38:37	2020-01-01 00:10:16.000	2020-01-02 03:38:37.000	616	99517	50066.5	5006650	616	99517	50066.5	5006650	-32554	32584	4846.66	484666	-128	127	0.58	58
-617	2	10607	99518	1.85285	298.85285	150.35285	15035.28528	1.85285	298.85284	150.35285	15035.2854	1.85285	298.85285	150.35285	15035.28500	2020-01-01	2020-01-02	2020-01-01 00:10:17	2020-01-02 03:38:38	2020-01-01 00:10:17.000	2020-01-02 03:38:38.000	617	99518	50067.5	5006750	617	99518	50067.5	5006750	-32553	32585	4847.66	484766	-128	123	-0.98	-98
-618	2	10608	99519	1.85585	298.85585	150.35585	15035.58558	1.85585	298.85587	150.35585	15035.58551	1.85585	298.85585	150.35585	15035.58500	2020-01-01	2020-01-02	2020-01-01 00:10:18	2020-01-02 03:38:39	2020-01-01 00:10:18.000	2020-01-02 03:38:39.000	618	99519	50068.5	5006850	618	99519	50068.5	5006850	-32552	32586	4848.66	484866	-127	124	0.02	2
-619	2	10609	99520	1.85885	298.85885	150.35885	15035.88588	1.85885	298.85886	150.35885	15035.88568	1.85885	298.85885	150.35885	15035.88500	2020-01-01	2020-01-02	2020-01-01 00:10:19	2020-01-02 03:38:40	2020-01-01 00:10:19.000	2020-01-02 03:38:40.000	619	99520	50069.5	5006950	619	99520	50069.5	5006950	-32551	32587	4849.66	484966	-126	125	1.02	102
+610	2	10600	99511	1.83183	298.83183	150.33183	15033.18318	1.83183	298.83182	150.33183	15033.18304	1.83183	298.83183	150.33183	15033.183	2020-01-01	2020-01-02	2020-01-01 00:10:10	2020-01-02 03:38:31	2020-01-01 00:10:10.000	2020-01-02 03:38:31.000	610	99511	50060.5	5006050	610	99511	50060.5	5006050	-32560	32578	4840.66	484066	-128	127	-0.3	-30
+611	2	10601	99512	1.83483	298.83483	150.33483	15033.48348	1.83483	298.83484	150.33483	15033.48363	1.83483	298.83483	150.33483	15033.483	2020-01-01	2020-01-02	2020-01-01 00:10:11	2020-01-02 03:38:32	2020-01-01 00:10:11.000	2020-01-02 03:38:32.000	611	99512	50061.5	5006150	611	99512	50061.5	5006150	-32559	32579	4841.66	484166	-128	123	-1.86	-186
+612	2	10602	99513	1.83783	298.83783	150.33783	15033.78378	1.83783	298.83783	150.33783	15033.78393	1.83783	298.83783	150.33783	15033.783	2020-01-01	2020-01-02	2020-01-01 00:10:12	2020-01-02 03:38:33	2020-01-01 00:10:12.000	2020-01-02 03:38:33.000	612	99513	50062.5	5006250	612	99513	50062.5	5006250	-32558	32580	4842.66	484266	-127	124	-0.86	-86
+613	2	10603	99514	1.84084	298.84084	150.34084	15034.08408	1.84084	298.84085	150.34084	15034.08405	1.84084	298.84084	150.34084000000001	15034.084	2020-01-01	2020-01-02	2020-01-01 00:10:13	2020-01-02 03:38:34	2020-01-01 00:10:13.000	2020-01-02 03:38:34.000	613	99514	50063.5	5006350	613	99514	50063.5	5006350	-32557	32581	4843.66	484366	-126	125	0.14	14
+614	2	10604	99515	1.84384	298.84384	150.34384	15034.38438	1.84384	298.84384	150.34384	15034.38421	1.84384	298.84384	150.34384	15034.384	2020-01-01	2020-01-02	2020-01-01 00:10:14	2020-01-02 03:38:35	2020-01-01 00:10:14.000	2020-01-02 03:38:35.000	614	99515	50064.5	5006450	614	99515	50064.5	5006450	-32556	32582	4844.66	484466	-125	126	1.14	114
+615	2	10605	99516	1.84684	298.84684	150.34684	15034.68468	1.84684	298.84683	150.34684	15034.68452	1.84684	298.84684	150.34684	15034.684	2020-01-01	2020-01-02	2020-01-01 00:10:15	2020-01-02 03:38:36	2020-01-01 00:10:15.000	2020-01-02 03:38:36.000	615	99516	50065.5	5006550	615	99516	50065.5	5006550	-32555	32583	4845.66	484566	-124	127	2.14	214
+616	2	10606	99517	1.84984	298.84984	150.34984	15034.98498	1.84984	298.84985	150.34985	15034.98527	1.84984	298.84984	150.34984	15034.984	2020-01-01	2020-01-02	2020-01-01 00:10:16	2020-01-02 03:38:37	2020-01-01 00:10:16.000	2020-01-02 03:38:37.000	616	99517	50066.5	5006650	616	99517	50066.5	5006650	-32554	32584	4846.66	484666	-128	127	0.58	58
+617	2	10607	99518	1.85285	298.85285	150.35285	15035.28528	1.85285	298.85284	150.35285	15035.2854	1.85285	298.85285	150.35285	15035.285	2020-01-01	2020-01-02	2020-01-01 00:10:17	2020-01-02 03:38:38	2020-01-01 00:10:17.000	2020-01-02 03:38:38.000	617	99518	50067.5	5006750	617	99518	50067.5	5006750	-32553	32585	4847.66	484766	-128	123	-0.98	-98
+618	2	10608	99519	1.85585	298.85585	150.35585	15035.58558	1.85585	298.85587	150.35585	15035.58551	1.85585	298.85585	150.35585	15035.585	2020-01-01	2020-01-02	2020-01-01 00:10:18	2020-01-02 03:38:39	2020-01-01 00:10:18.000	2020-01-02 03:38:39.000	618	99519	50068.5	5006850	618	99519	50068.5	5006850	-32552	32586	4848.66	484866	-127	124	0.02	2
+619	2	10609	99520	1.85885	298.85885	150.35885	15035.88588	1.85885	298.85886	150.35885	15035.88568	1.85885	298.85885	150.35885	15035.885	2020-01-01	2020-01-02	2020-01-01 00:10:19	2020-01-02 03:38:40	2020-01-01 00:10:19.000	2020-01-02 03:38:40.000	619	99520	50069.5	5006950	619	99520	50069.5	5006950	-32551	32587	4849.66	484966	-126	125	1.02	102
 62	2	10052	99962	0.18618	300.18618	150.18618	15168.8048	0.18618	300.1862	150.18618	15168.80494	0.18618	300.18618	150.18617999999998	15168.80418	2020-01-01	2020-01-02	2020-01-01 00:01:02	2020-01-02 03:46:02	2020-01-01 00:01:02.000	2020-01-02 03:46:02.000	62	99962	50012	5051212	62	99962	50012	5051212	-32507	32428	4591.009900990099	463692	-127	124	-1.7821782178217822	-180
-620	2	10610	99521	1.86186	298.86186	150.36186	15036.18618	1.86186	298.86185	150.36185	15036.18598	1.86186	298.86186	150.36186	15036.18600	2020-01-01	2020-01-02	2020-01-01 00:10:20	2020-01-02 03:38:41	2020-01-01 00:10:20.000	2020-01-02 03:38:41.000	620	99521	50070.5	5007050	620	99521	50070.5	5007050	-32550	32588	4850.66	485066	-125	126	2.02	202
-621	2	10611	99522	1.86486	298.86486	150.36486	15036.48648	1.86486	298.86487	150.36486	15036.48673	1.86486	298.86486	150.36486000000002	15036.48600	2020-01-01	2020-01-02	2020-01-01 00:10:21	2020-01-02 03:38:42	2020-01-01 00:10:21.000	2020-01-02 03:38:42.000	621	99522	50071.5	5007150	621	99522	50071.5	5007150	-32549	32589	4851.66	485166	-124	127	3.02	302
-622	2	10612	99523	1.86786	298.86786	150.36786	15036.78678	1.86786	298.86786	150.36786	15036.78687	1.86786	298.86786	150.36786	15036.78600	2020-01-01	2020-01-02	2020-01-01 00:10:22	2020-01-02 03:38:43	2020-01-01 00:10:22.000	2020-01-02 03:38:43.000	622	99523	50072.5	5007250	622	99523	50072.5	5007250	-32548	32590	4852.66	485266	-128	127	1.46	146
-623	2	10613	99524	1.87087	298.87087	150.37087	15037.08708	1.87087	298.87088	150.37087	15037.08702	1.87087	298.87087	150.37087	15037.08700	2020-01-01	2020-01-02	2020-01-01 00:10:23	2020-01-02 03:38:44	2020-01-01 00:10:23.000	2020-01-02 03:38:44.000	623	99524	50073.5	5007350	623	99524	50073.5	5007350	-32547	32591	4853.66	485366	-128	123	-0.1	-10
-624	2	10614	99525	1.87387	298.87387	150.37387	15037.38738	1.87387	298.87387	150.37387	15037.38716	1.87387	298.87387	150.37387	15037.38700	2020-01-01	2020-01-02	2020-01-01 00:10:24	2020-01-02 03:38:45	2020-01-01 00:10:24.000	2020-01-02 03:38:45.000	624	99525	50074.5	5007450	624	99525	50074.5	5007450	-32546	32592	4854.66	485466	-127	124	0.9	90
-625	2	10615	99526	1.87687	298.87687	150.37687	15037.68768	1.87687	298.8769	150.37687	15037.68791	1.87687	298.87687	150.37687	15037.68700	2020-01-01	2020-01-02	2020-01-01 00:10:25	2020-01-02 03:38:46	2020-01-01 00:10:25.000	2020-01-02 03:38:46.000	625	99526	50075.5	5007550	625	99526	50075.5	5007550	-32545	32593	4855.66	485566	-126	125	1.9	190
-626	2	10616	99527	1.87987	298.87987	150.37987	15037.98798	1.87987	298.87988	150.37988	15037.9882	1.87987	298.87987	150.37986999999998	15037.98700	2020-01-01	2020-01-02	2020-01-01 00:10:26	2020-01-02 03:38:47	2020-01-01 00:10:26.000	2020-01-02 03:38:47.000	626	99527	50076.5	5007650	626	99527	50076.5	5007650	-32544	32594	4856.66	485666	-125	126	2.9	290
-627	2	10617	99528	1.88288	298.88288	150.38288	15038.28828	1.88288	298.88287	150.38288	15038.28834	1.88288	298.88288	150.38288	15038.28800	2020-01-01	2020-01-02	2020-01-01 00:10:27	2020-01-02 03:38:48	2020-01-01 00:10:27.000	2020-01-02 03:38:48.000	627	99528	50077.5	5007750	627	99528	50077.5	5007750	-32543	32595	4857.66	485766	-124	127	3.9	390
-628	2	10618	99529	1.88588	298.88588	150.38588	15038.58858	1.88588	298.8859	150.38588	15038.58849	1.88588	298.88588	150.38588	15038.58800	2020-01-01	2020-01-02	2020-01-01 00:10:28	2020-01-02 03:38:49	2020-01-01 00:10:28.000	2020-01-02 03:38:49.000	628	99529	50078.5	5007850	628	99529	50078.5	5007850	-32542	32596	4858.66	485866	-128	127	2.34	234
-629	2	10619	99530	1.88888	298.88888	150.38888	15038.88888	1.88888	298.8889	150.38888	15038.88862	1.88888	298.88888	150.38888	15038.88800	2020-01-01	2020-01-02	2020-01-01 00:10:29	2020-01-02 03:38:50	2020-01-01 00:10:29.000	2020-01-02 03:38:50.000	629	99530	50079.5	5007950	629	99530	50079.5	5007950	-32541	32597	4859.66	485966	-128	123	0.78	78
+620	2	10610	99521	1.86186	298.86186	150.36186	15036.18618	1.86186	298.86185	150.36185	15036.18598	1.86186	298.86186	150.36186	15036.186	2020-01-01	2020-01-02	2020-01-01 00:10:20	2020-01-02 03:38:41	2020-01-01 00:10:20.000	2020-01-02 03:38:41.000	620	99521	50070.5	5007050	620	99521	50070.5	5007050	-32550	32588	4850.66	485066	-125	126	2.02	202
+621	2	10611	99522	1.86486	298.86486	150.36486	15036.48648	1.86486	298.86487	150.36486	15036.48673	1.86486	298.86486	150.36486000000002	15036.486	2020-01-01	2020-01-02	2020-01-01 00:10:21	2020-01-02 03:38:42	2020-01-01 00:10:21.000	2020-01-02 03:38:42.000	621	99522	50071.5	5007150	621	99522	50071.5	5007150	-32549	32589	4851.66	485166	-124	127	3.02	302
+622	2	10612	99523	1.86786	298.86786	150.36786	15036.78678	1.86786	298.86786	150.36786	15036.78687	1.86786	298.86786	150.36786	15036.786	2020-01-01	2020-01-02	2020-01-01 00:10:22	2020-01-02 03:38:43	2020-01-01 00:10:22.000	2020-01-02 03:38:43.000	622	99523	50072.5	5007250	622	99523	50072.5	5007250	-32548	32590	4852.66	485266	-128	127	1.46	146
+623	2	10613	99524	1.87087	298.87087	150.37087	15037.08708	1.87087	298.87088	150.37087	15037.08702	1.87087	298.87087	150.37087	15037.087	2020-01-01	2020-01-02	2020-01-01 00:10:23	2020-01-02 03:38:44	2020-01-01 00:10:23.000	2020-01-02 03:38:44.000	623	99524	50073.5	5007350	623	99524	50073.5	5007350	-32547	32591	4853.66	485366	-128	123	-0.1	-10
+624	2	10614	99525	1.87387	298.87387	150.37387	15037.38738	1.87387	298.87387	150.37387	15037.38716	1.87387	298.87387	150.37387	15037.387	2020-01-01	2020-01-02	2020-01-01 00:10:24	2020-01-02 03:38:45	2020-01-01 00:10:24.000	2020-01-02 03:38:45.000	624	99525	50074.5	5007450	624	99525	50074.5	5007450	-32546	32592	4854.66	485466	-127	124	0.9	90
+625	2	10615	99526	1.87687	298.87687	150.37687	15037.68768	1.87687	298.8769	150.37687	15037.68791	1.87687	298.87687	150.37687	15037.687	2020-01-01	2020-01-02	2020-01-01 00:10:25	2020-01-02 03:38:46	2020-01-01 00:10:25.000	2020-01-02 03:38:46.000	625	99526	50075.5	5007550	625	99526	50075.5	5007550	-32545	32593	4855.66	485566	-126	125	1.9	190
+626	2	10616	99527	1.87987	298.87987	150.37987	15037.98798	1.87987	298.87988	150.37988	15037.9882	1.87987	298.87987	150.37986999999998	15037.987	2020-01-01	2020-01-02	2020-01-01 00:10:26	2020-01-02 03:38:47	2020-01-01 00:10:26.000	2020-01-02 03:38:47.000	626	99527	50076.5	5007650	626	99527	50076.5	5007650	-32544	32594	4856.66	485666	-125	126	2.9	290
+627	2	10617	99528	1.88288	298.88288	150.38288	15038.28828	1.88288	298.88287	150.38288	15038.28834	1.88288	298.88288	150.38288	15038.288	2020-01-01	2020-01-02	2020-01-01 00:10:27	2020-01-02 03:38:48	2020-01-01 00:10:27.000	2020-01-02 03:38:48.000	627	99528	50077.5	5007750	627	99528	50077.5	5007750	-32543	32595	4857.66	485766	-124	127	3.9	390
+628	2	10618	99529	1.88588	298.88588	150.38588	15038.58858	1.88588	298.8859	150.38588	15038.58849	1.88588	298.88588	150.38588	15038.588	2020-01-01	2020-01-02	2020-01-01 00:10:28	2020-01-02 03:38:49	2020-01-01 00:10:28.000	2020-01-02 03:38:49.000	628	99529	50078.5	5007850	628	99529	50078.5	5007850	-32542	32596	4858.66	485866	-128	127	2.34	234
+629	2	10619	99530	1.88888	298.88888	150.38888	15038.88888	1.88888	298.8889	150.38888	15038.88862	1.88888	298.88888	150.38888	15038.888	2020-01-01	2020-01-02	2020-01-01 00:10:29	2020-01-02 03:38:50	2020-01-01 00:10:29.000	2020-01-02 03:38:50.000	629	99530	50079.5	5007950	629	99530	50079.5	5007950	-32541	32597	4859.66	485966	-128	123	0.78	78
 63	2	10053	99963	0.18918	300.18918	150.18918	15169.1081	0.18918	300.18918	150.18918	15169.10808	0.18918	300.18918	150.18918000000002	15169.10718	2020-01-01	2020-01-02	2020-01-01 00:01:03	2020-01-02 03:46:03	2020-01-01 00:01:03.000	2020-01-02 03:46:03.000	63	99963	50013	5051313	63	99963	50013	5051313	-32506	32429	4592.009900990099	463793	-126	125	-0.7821782178217822	-79
-630	2	10620	99531	1.89189	298.89189	150.39189	15039.18918	1.89189	298.8919	150.39189	15039.18937	1.89189	298.89189	150.39189	15039.18900	2020-01-01	2020-01-02	2020-01-01 00:10:30	2020-01-02 03:38:51	2020-01-01 00:10:30.000	2020-01-02 03:38:51.000	630	99531	50080.5	5008050	630	99531	50080.5	5008050	-32540	32598	4860.66	486066	-127	124	1.78	178
-631	2	10621	99532	1.89489	298.89489	150.39489	15039.48948	1.89489	298.8949	150.39489	15039.48968	1.89489	298.89489	150.39489	15039.48900	2020-01-01	2020-01-02	2020-01-01 00:10:31	2020-01-02 03:38:52	2020-01-01 00:10:31.000	2020-01-02 03:38:52.000	631	99532	50081.5	5008150	631	99532	50081.5	5008150	-32539	32599	4861.66	486166	-126	125	2.78	278
-632	2	10622	99533	1.89789	298.89789	150.39789	15039.78978	1.89789	298.8979	150.39789	15039.78984	1.89789	298.89789	150.39789000000002	15039.78900	2020-01-01	2020-01-02	2020-01-01 00:10:32	2020-01-02 03:38:53	2020-01-01 00:10:32.000	2020-01-02 03:38:53.000	632	99533	50082.5	5008250	632	99533	50082.5	5008250	-32538	32600	4862.66	486266	-125	126	3.78	378
-633	2	10623	99534	1.9009	298.9009	150.4009	15040.09009	1.9009	298.9009	150.40089	15040.08996	1.90090	298.90090	150.4009	15040.09000	2020-01-01	2020-01-02	2020-01-01 00:10:33	2020-01-02 03:38:54	2020-01-01 00:10:33.000	2020-01-02 03:38:54.000	633	99534	50083.5	5008350	633	99534	50083.5	5008350	-32537	32601	4863.66	486366	-124	127	4.78	478
-634	2	10624	99535	1.9039	298.9039	150.4039	15040.39039	1.9039	298.9039	150.4039	15040.39009	1.90390	298.90390	150.4039	15040.39000	2020-01-01	2020-01-02	2020-01-01 00:10:34	2020-01-02 03:38:55	2020-01-01 00:10:34.000	2020-01-02 03:38:55.000	634	99535	50084.5	5008450	634	99535	50084.5	5008450	-32536	32602	4864.66	486466	-128	127	3.22	322
-635	2	10625	99536	1.9069	298.9069	150.4069	15040.69069	1.9069	298.90692	150.4069	15040.69084	1.90690	298.90690	150.4069	15040.69000	2020-01-01	2020-01-02	2020-01-01 00:10:35	2020-01-02 03:38:56	2020-01-01 00:10:35.000	2020-01-02 03:38:56.000	635	99536	50085.5	5008550	635	99536	50085.5	5008550	-32535	32603	4865.66	486566	-128	127	1.66	166
-636	2	10626	99537	1.9099	298.9099	150.4099	15040.99099	1.90991	298.9099	150.40991	15040.99115	1.90990	298.90990	150.4099	15040.99000	2020-01-01	2020-01-02	2020-01-01 00:10:36	2020-01-02 03:38:57	2020-01-01 00:10:36.000	2020-01-02 03:38:57.000	636	99537	50086.5	5008650	636	99537	50086.5	5008650	-32534	32604	4866.66	486666	-128	124	0.1	10
-637	2	10627	99538	1.91291	298.91291	150.41291	15041.29129	1.91291	298.9129	150.41291	15041.29131	1.91291	298.91291	150.41290999999998	15041.29100	2020-01-01	2020-01-02	2020-01-01 00:10:37	2020-01-02 03:38:58	2020-01-01 00:10:37.000	2020-01-02 03:38:58.000	637	99538	50087.5	5008750	637	99538	50087.5	5008750	-32533	32605	4867.66	486766	-127	125	1.1	110
-638	2	10628	99539	1.91591	298.91591	150.41591	15041.59159	1.91591	298.91592	150.41591	15041.59143	1.91591	298.91591	150.41591	15041.59100	2020-01-01	2020-01-02	2020-01-01 00:10:38	2020-01-02 03:38:59	2020-01-01 00:10:38.000	2020-01-02 03:38:59.000	638	99539	50088.5	5008850	638	99539	50088.5	5008850	-32532	32606	4868.66	486866	-126	126	2.1	210
-639	2	10629	99540	1.91891	298.91891	150.41891	15041.89189	1.91891	298.9189	150.41891	15041.89172	1.91891	298.91891	150.41890999999998	15041.89100	2020-01-01	2020-01-02	2020-01-01 00:10:39	2020-01-02 03:39:00	2020-01-01 00:10:39.000	2020-01-02 03:39:00.000	639	99540	50089.5	5008950	639	99540	50089.5	5008950	-32531	32607	4869.66	486966	-125	127	3.1	310
+630	2	10620	99531	1.89189	298.89189	150.39189	15039.18918	1.89189	298.8919	150.39189	15039.18937	1.89189	298.89189	150.39189	15039.189	2020-01-01	2020-01-02	2020-01-01 00:10:30	2020-01-02 03:38:51	2020-01-01 00:10:30.000	2020-01-02 03:38:51.000	630	99531	50080.5	5008050	630	99531	50080.5	5008050	-32540	32598	4860.66	486066	-127	124	1.78	178
+631	2	10621	99532	1.89489	298.89489	150.39489	15039.48948	1.89489	298.8949	150.39489	15039.48968	1.89489	298.89489	150.39489	15039.489	2020-01-01	2020-01-02	2020-01-01 00:10:31	2020-01-02 03:38:52	2020-01-01 00:10:31.000	2020-01-02 03:38:52.000	631	99532	50081.5	5008150	631	99532	50081.5	5008150	-32539	32599	4861.66	486166	-126	125	2.78	278
+632	2	10622	99533	1.89789	298.89789	150.39789	15039.78978	1.89789	298.8979	150.39789	15039.78984	1.89789	298.89789	150.39789000000002	15039.789	2020-01-01	2020-01-02	2020-01-01 00:10:32	2020-01-02 03:38:53	2020-01-01 00:10:32.000	2020-01-02 03:38:53.000	632	99533	50082.5	5008250	632	99533	50082.5	5008250	-32538	32600	4862.66	486266	-125	126	3.78	378
+633	2	10623	99534	1.9009	298.9009	150.4009	15040.09009	1.9009	298.9009	150.40089	15040.08996	1.9009	298.9009	150.4009	15040.09	2020-01-01	2020-01-02	2020-01-01 00:10:33	2020-01-02 03:38:54	2020-01-01 00:10:33.000	2020-01-02 03:38:54.000	633	99534	50083.5	5008350	633	99534	50083.5	5008350	-32537	32601	4863.66	486366	-124	127	4.78	478
+634	2	10624	99535	1.9039	298.9039	150.4039	15040.39039	1.9039	298.9039	150.4039	15040.39009	1.9039	298.9039	150.4039	15040.39	2020-01-01	2020-01-02	2020-01-01 00:10:34	2020-01-02 03:38:55	2020-01-01 00:10:34.000	2020-01-02 03:38:55.000	634	99535	50084.5	5008450	634	99535	50084.5	5008450	-32536	32602	4864.66	486466	-128	127	3.22	322
+635	2	10625	99536	1.9069	298.9069	150.4069	15040.69069	1.9069	298.90692	150.4069	15040.69084	1.9069	298.9069	150.4069	15040.69	2020-01-01	2020-01-02	2020-01-01 00:10:35	2020-01-02 03:38:56	2020-01-01 00:10:35.000	2020-01-02 03:38:56.000	635	99536	50085.5	5008550	635	99536	50085.5	5008550	-32535	32603	4865.66	486566	-128	127	1.66	166
+636	2	10626	99537	1.9099	298.9099	150.4099	15040.99099	1.90991	298.9099	150.40991	15040.99115	1.9099	298.9099	150.4099	15040.99	2020-01-01	2020-01-02	2020-01-01 00:10:36	2020-01-02 03:38:57	2020-01-01 00:10:36.000	2020-01-02 03:38:57.000	636	99537	50086.5	5008650	636	99537	50086.5	5008650	-32534	32604	4866.66	486666	-128	124	0.1	10
+637	2	10627	99538	1.91291	298.91291	150.41291	15041.29129	1.91291	298.9129	150.41291	15041.29131	1.91291	298.91291	150.41290999999998	15041.291	2020-01-01	2020-01-02	2020-01-01 00:10:37	2020-01-02 03:38:58	2020-01-01 00:10:37.000	2020-01-02 03:38:58.000	637	99538	50087.5	5008750	637	99538	50087.5	5008750	-32533	32605	4867.66	486766	-127	125	1.1	110
+638	2	10628	99539	1.91591	298.91591	150.41591	15041.59159	1.91591	298.91592	150.41591	15041.59143	1.91591	298.91591	150.41591	15041.591	2020-01-01	2020-01-02	2020-01-01 00:10:38	2020-01-02 03:38:59	2020-01-01 00:10:38.000	2020-01-02 03:38:59.000	638	99539	50088.5	5008850	638	99539	50088.5	5008850	-32532	32606	4868.66	486866	-126	126	2.1	210
+639	2	10629	99540	1.91891	298.91891	150.41891	15041.89189	1.91891	298.9189	150.41891	15041.89172	1.91891	298.91891	150.41890999999998	15041.891	2020-01-01	2020-01-02	2020-01-01 00:10:39	2020-01-02 03:39:00	2020-01-01 00:10:39.000	2020-01-02 03:39:00.000	639	99540	50089.5	5008950	639	99540	50089.5	5008950	-32531	32607	4869.66	486966	-125	127	3.1	310
 64	2	10054	99964	0.19219	300.19219	150.19219	15169.41141	0.19219	300.1922	150.19219	15169.41184	0.19219	300.19219	150.19219	15169.41119	2020-01-01	2020-01-02	2020-01-01 00:01:04	2020-01-02 03:46:04	2020-01-01 00:01:04.000	2020-01-02 03:46:04.000	64	99964	50014	5051414	64	99964	50014	5051414	-32505	32430	4593.009900990099	463894	-125	126	0.21782178217821782	22
-640	2	10630	99541	1.92192	298.92192	150.42192	15042.19219	1.92192	298.92194	150.42192	15042.19232	1.92192	298.92192	150.42192	15042.19200	2020-01-01	2020-01-02	2020-01-01 00:10:40	2020-01-02 03:39:01	2020-01-01 00:10:40.000	2020-01-02 03:39:01.000	640	99541	50090.5	5009050	640	99541	50090.5	5009050	-32530	32608	4870.66	487066	-128	127	1.54	154
-641	2	10631	99542	1.92492	298.92492	150.42492	15042.49249	1.92492	298.92493	150.42492	15042.49265	1.92492	298.92492	150.42492000000001	15042.49200	2020-01-01	2020-01-02	2020-01-01 00:10:41	2020-01-02 03:39:02	2020-01-01 00:10:41.000	2020-01-02 03:39:02.000	641	99542	50091.5	5009150	641	99542	50091.5	5009150	-32529	32609	4871.66	487166	-128	127	-0.02	-2
-642	2	10632	99543	1.92792	298.92792	150.42792	15042.79279	1.92792	298.92792	150.42792	15042.79278	1.92792	298.92792	150.42792	15042.79200	2020-01-01	2020-01-02	2020-01-01 00:10:42	2020-01-02 03:39:03	2020-01-01 00:10:42.000	2020-01-02 03:39:03.000	642	99543	50092.5	5009250	642	99543	50092.5	5009250	-32528	32610	4872.66	487266	-128	123	-1.58	-158
-643	2	10633	99544	1.93093	298.93093	150.43093	15043.09309	1.93093	298.93094	150.43092	15043.0929	1.93093	298.93093	150.43093000000002	15043.09300	2020-01-01	2020-01-02	2020-01-01 00:10:43	2020-01-02 03:39:04	2020-01-01 00:10:43.000	2020-01-02 03:39:04.000	643	99544	50093.5	5009350	643	99544	50093.5	5009350	-32527	32611	4873.66	487366	-127	124	-0.58	-58
-644	2	10634	99545	1.93393	298.93393	150.43393	15043.39339	1.93393	298.93393	150.43393	15043.39319	1.93393	298.93393	150.43393	15043.39300	2020-01-01	2020-01-02	2020-01-01 00:10:44	2020-01-02 03:39:05	2020-01-01 00:10:44.000	2020-01-02 03:39:05.000	644	99545	50094.5	5009450	644	99545	50094.5	5009450	-32526	32612	4874.66	487466	-126	125	0.42	42
-645	2	10635	99546	1.93693	298.93693	150.43693	15043.69369	1.93693	298.93695	150.43693	15043.69379	1.93693	298.93693	150.43693	15043.69300	2020-01-01	2020-01-02	2020-01-01 00:10:45	2020-01-02 03:39:06	2020-01-01 00:10:45.000	2020-01-02 03:39:06.000	645	99546	50095.5	5009550	645	99546	50095.5	5009550	-32525	32613	4875.66	487566	-125	126	1.42	142
-646	2	10636	99547	1.93993	298.93993	150.43993	15043.99399	1.93994	298.93994	150.43994	15043.99412	1.93993	298.93993	150.43993	15043.99300	2020-01-01	2020-01-02	2020-01-01 00:10:46	2020-01-02 03:39:07	2020-01-01 00:10:46.000	2020-01-02 03:39:07.000	646	99547	50096.5	5009650	646	99547	50096.5	5009650	-32524	32614	4876.66	487666	-124	127	2.42	242
-647	2	10637	99548	1.94294	298.94294	150.44294	15044.29429	1.94294	298.94293	150.44294	15044.29425	1.94294	298.94294	150.44294	15044.29400	2020-01-01	2020-01-02	2020-01-01 00:10:47	2020-01-02 03:39:08	2020-01-01 00:10:47.000	2020-01-02 03:39:08.000	647	99548	50097.5	5009750	647	99548	50097.5	5009750	-32523	32615	4877.66	487766	-128	127	0.86	86
-648	2	10638	99549	1.94594	298.94594	150.44594	15044.59459	1.94594	298.94595	150.44595	15044.595	1.94594	298.94594	150.44593999999998	15044.59400	2020-01-01	2020-01-02	2020-01-01 00:10:48	2020-01-02 03:39:09	2020-01-01 00:10:48.000	2020-01-02 03:39:09.000	648	99549	50098.5	5009850	648	99549	50098.5	5009850	-32522	32616	4878.66	487866	-128	123	-0.7	-70
-649	2	10639	99550	1.94894	298.94894	150.44894	15044.89489	1.94894	298.94894	150.44894	15044.89467	1.94894	298.94894	150.44894	15044.89400	2020-01-01	2020-01-02	2020-01-01 00:10:49	2020-01-02 03:39:10	2020-01-01 00:10:49.000	2020-01-02 03:39:10.000	649	99550	50099.5	5009950	649	99550	50099.5	5009950	-32521	32617	4879.66	487966	-127	124	0.3	30
+640	2	10630	99541	1.92192	298.92192	150.42192	15042.19219	1.92192	298.92194	150.42192	15042.19232	1.92192	298.92192	150.42192	15042.192	2020-01-01	2020-01-02	2020-01-01 00:10:40	2020-01-02 03:39:01	2020-01-01 00:10:40.000	2020-01-02 03:39:01.000	640	99541	50090.5	5009050	640	99541	50090.5	5009050	-32530	32608	4870.66	487066	-128	127	1.54	154
+641	2	10631	99542	1.92492	298.92492	150.42492	15042.49249	1.92492	298.92493	150.42492	15042.49265	1.92492	298.92492	150.42492000000001	15042.492	2020-01-01	2020-01-02	2020-01-01 00:10:41	2020-01-02 03:39:02	2020-01-01 00:10:41.000	2020-01-02 03:39:02.000	641	99542	50091.5	5009150	641	99542	50091.5	5009150	-32529	32609	4871.66	487166	-128	127	-0.02	-2
+642	2	10632	99543	1.92792	298.92792	150.42792	15042.79279	1.92792	298.92792	150.42792	15042.79278	1.92792	298.92792	150.42792	15042.792	2020-01-01	2020-01-02	2020-01-01 00:10:42	2020-01-02 03:39:03	2020-01-01 00:10:42.000	2020-01-02 03:39:03.000	642	99543	50092.5	5009250	642	99543	50092.5	5009250	-32528	32610	4872.66	487266	-128	123	-1.58	-158
+643	2	10633	99544	1.93093	298.93093	150.43093	15043.09309	1.93093	298.93094	150.43092	15043.0929	1.93093	298.93093	150.43093000000002	15043.093	2020-01-01	2020-01-02	2020-01-01 00:10:43	2020-01-02 03:39:04	2020-01-01 00:10:43.000	2020-01-02 03:39:04.000	643	99544	50093.5	5009350	643	99544	50093.5	5009350	-32527	32611	4873.66	487366	-127	124	-0.58	-58
+644	2	10634	99545	1.93393	298.93393	150.43393	15043.39339	1.93393	298.93393	150.43393	15043.39319	1.93393	298.93393	150.43393	15043.393	2020-01-01	2020-01-02	2020-01-01 00:10:44	2020-01-02 03:39:05	2020-01-01 00:10:44.000	2020-01-02 03:39:05.000	644	99545	50094.5	5009450	644	99545	50094.5	5009450	-32526	32612	4874.66	487466	-126	125	0.42	42
+645	2	10635	99546	1.93693	298.93693	150.43693	15043.69369	1.93693	298.93695	150.43693	15043.69379	1.93693	298.93693	150.43693	15043.693	2020-01-01	2020-01-02	2020-01-01 00:10:45	2020-01-02 03:39:06	2020-01-01 00:10:45.000	2020-01-02 03:39:06.000	645	99546	50095.5	5009550	645	99546	50095.5	5009550	-32525	32613	4875.66	487566	-125	126	1.42	142
+646	2	10636	99547	1.93993	298.93993	150.43993	15043.99399	1.93994	298.93994	150.43994	15043.99412	1.93993	298.93993	150.43993	15043.993	2020-01-01	2020-01-02	2020-01-01 00:10:46	2020-01-02 03:39:07	2020-01-01 00:10:46.000	2020-01-02 03:39:07.000	646	99547	50096.5	5009650	646	99547	50096.5	5009650	-32524	32614	4876.66	487666	-124	127	2.42	242
+647	2	10637	99548	1.94294	298.94294	150.44294	15044.29429	1.94294	298.94293	150.44294	15044.29425	1.94294	298.94294	150.44294	15044.294	2020-01-01	2020-01-02	2020-01-01 00:10:47	2020-01-02 03:39:08	2020-01-01 00:10:47.000	2020-01-02 03:39:08.000	647	99548	50097.5	5009750	647	99548	50097.5	5009750	-32523	32615	4877.66	487766	-128	127	0.86	86
+648	2	10638	99549	1.94594	298.94594	150.44594	15044.59459	1.94594	298.94595	150.44595	15044.595	1.94594	298.94594	150.44593999999998	15044.594	2020-01-01	2020-01-02	2020-01-01 00:10:48	2020-01-02 03:39:09	2020-01-01 00:10:48.000	2020-01-02 03:39:09.000	648	99549	50098.5	5009850	648	99549	50098.5	5009850	-32522	32616	4878.66	487866	-128	123	-0.7	-70
+649	2	10639	99550	1.94894	298.94894	150.44894	15044.89489	1.94894	298.94894	150.44894	15044.89467	1.94894	298.94894	150.44894	15044.894	2020-01-01	2020-01-02	2020-01-01 00:10:49	2020-01-02 03:39:10	2020-01-01 00:10:49.000	2020-01-02 03:39:10.000	649	99550	50099.5	5009950	649	99550	50099.5	5009950	-32521	32617	4879.66	487966	-127	124	0.3	30
 65	2	10055	99965	0.19519	300.19519	150.19519	15169.71471	0.19519	300.1952	150.19519	15169.71448	0.19519	300.19519	150.19519	15169.71419	2020-01-01	2020-01-02	2020-01-01 00:01:05	2020-01-02 03:46:05	2020-01-01 00:01:05.000	2020-01-02 03:46:05.000	65	99965	50015	5051515	65	99965	50015	5051515	-32504	32431	4594.009900990099	463995	-124	127	1.2178217821782178	123
-650	2	10640	99551	1.95195	298.95195	150.45195	15045.19519	1.95195	298.95197	150.45195	15045.19525	1.95195	298.95195	150.45195	15045.19500	2020-01-01	2020-01-02	2020-01-01 00:10:50	2020-01-02 03:39:11	2020-01-01 00:10:50.000	2020-01-02 03:39:11.000	650	99551	50100.5	5010050	650	99551	50100.5	5010050	-32520	32618	4880.66	488066	-126	125	1.3	130
-651	2	10641	99552	1.95495	298.95495	150.45495	15045.49549	1.95495	298.95496	150.45495	15045.49558	1.95495	298.95495	150.45495	15045.49500	2020-01-01	2020-01-02	2020-01-01 00:10:51	2020-01-02 03:39:12	2020-01-01 00:10:51.000	2020-01-02 03:39:12.000	651	99552	50101.5	5010150	651	99552	50101.5	5010150	-32519	32619	4881.66	488166	-125	126	2.3	230
-652	2	10642	99553	1.95795	298.95795	150.45795	15045.79579	1.95795	298.95795	150.45795	15045.79572	1.95795	298.95795	150.45795	15045.79500	2020-01-01	2020-01-02	2020-01-01 00:10:52	2020-01-02 03:39:13	2020-01-01 00:10:52.000	2020-01-02 03:39:13.000	652	99553	50102.5	5010250	652	99553	50102.5	5010250	-32518	32620	4882.66	488266	-124	127	3.3	330
-653	2	10643	99554	1.96096	298.96096	150.46096	15046.09609	1.96096	298.96097	150.46096	15046.09647	1.96096	298.96096	150.46096	15046.09600	2020-01-01	2020-01-02	2020-01-01 00:10:53	2020-01-02 03:39:14	2020-01-01 00:10:53.000	2020-01-02 03:39:14.000	653	99554	50103.5	5010350	653	99554	50103.5	5010350	-32517	32621	4883.66	488366	-128	127	1.74	174
-654	2	10644	99555	1.96396	298.96396	150.46396	15046.39639	1.96396	298.96396	150.46396	15046.39613	1.96396	298.96396	150.46396000000001	15046.39600	2020-01-01	2020-01-02	2020-01-01 00:10:54	2020-01-02 03:39:15	2020-01-01 00:10:54.000	2020-01-02 03:39:15.000	654	99555	50104.5	5010450	654	99555	50104.5	5010450	-32516	32622	4884.66	488466	-128	123	0.18	18
-655	2	10645	99556	1.96696	298.96696	150.46696	15046.69669	1.96696	298.96698	150.46696	15046.69676	1.96696	298.96696	150.46696	15046.69600	2020-01-01	2020-01-02	2020-01-01 00:10:55	2020-01-02 03:39:16	2020-01-01 00:10:55.000	2020-01-02 03:39:16.000	655	99556	50105.5	5010550	655	99556	50105.5	5010550	-32515	32623	4885.66	488566	-127	124	1.18	118
-656	2	10646	99557	1.96996	298.96996	150.46996	15046.99699	1.96997	298.96997	150.46997	15046.99706	1.96996	298.96996	150.46996	15046.99600	2020-01-01	2020-01-02	2020-01-01 00:10:56	2020-01-02 03:39:17	2020-01-01 00:10:56.000	2020-01-02 03:39:17.000	656	99557	50106.5	5010650	656	99557	50106.5	5010650	-32514	32624	4886.66	488666	-126	125	2.18	218
-657	2	10647	99558	1.97297	298.97297	150.47297	15047.29729	1.97297	298.97296	150.47297	15047.29735	1.97297	298.97297	150.47297	15047.29700	2020-01-01	2020-01-02	2020-01-01 00:10:57	2020-01-02 03:39:18	2020-01-01 00:10:57.000	2020-01-02 03:39:18.000	657	99558	50107.5	5010750	657	99558	50107.5	5010750	-32513	32625	4887.66	488766	-125	126	3.18	318
-658	2	10648	99559	1.97597	298.97597	150.47597	15047.59759	1.97597	298.97598	150.47597	15047.59794	1.97597	298.97597	150.47597	15047.59700	2020-01-01	2020-01-02	2020-01-01 00:10:58	2020-01-02 03:39:19	2020-01-01 00:10:58.000	2020-01-02 03:39:19.000	658	99559	50108.5	5010850	658	99559	50108.5	5010850	-32512	32626	4888.66	488866	-124	127	4.18	418
-659	2	10649	99560	1.97897	298.97897	150.47897	15047.89789	1.97897	298.97897	150.47897	15047.8976	1.97897	298.97897	150.47897	15047.89700	2020-01-01	2020-01-02	2020-01-01 00:10:59	2020-01-02 03:39:20	2020-01-01 00:10:59.000	2020-01-02 03:39:20.000	659	99560	50109.5	5010950	659	99560	50109.5	5010950	-32511	32627	4889.66	488966	-128	127	2.62	262
+650	2	10640	99551	1.95195	298.95195	150.45195	15045.19519	1.95195	298.95197	150.45195	15045.19525	1.95195	298.95195	150.45195	15045.195	2020-01-01	2020-01-02	2020-01-01 00:10:50	2020-01-02 03:39:11	2020-01-01 00:10:50.000	2020-01-02 03:39:11.000	650	99551	50100.5	5010050	650	99551	50100.5	5010050	-32520	32618	4880.66	488066	-126	125	1.3	130
+651	2	10641	99552	1.95495	298.95495	150.45495	15045.49549	1.95495	298.95496	150.45495	15045.49558	1.95495	298.95495	150.45495	15045.495	2020-01-01	2020-01-02	2020-01-01 00:10:51	2020-01-02 03:39:12	2020-01-01 00:10:51.000	2020-01-02 03:39:12.000	651	99552	50101.5	5010150	651	99552	50101.5	5010150	-32519	32619	4881.66	488166	-125	126	2.3	230
+652	2	10642	99553	1.95795	298.95795	150.45795	15045.79579	1.95795	298.95795	150.45795	15045.79572	1.95795	298.95795	150.45795	15045.795	2020-01-01	2020-01-02	2020-01-01 00:10:52	2020-01-02 03:39:13	2020-01-01 00:10:52.000	2020-01-02 03:39:13.000	652	99553	50102.5	5010250	652	99553	50102.5	5010250	-32518	32620	4882.66	488266	-124	127	3.3	330
+653	2	10643	99554	1.96096	298.96096	150.46096	15046.09609	1.96096	298.96097	150.46096	15046.09647	1.96096	298.96096	150.46096	15046.096	2020-01-01	2020-01-02	2020-01-01 00:10:53	2020-01-02 03:39:14	2020-01-01 00:10:53.000	2020-01-02 03:39:14.000	653	99554	50103.5	5010350	653	99554	50103.5	5010350	-32517	32621	4883.66	488366	-128	127	1.74	174
+654	2	10644	99555	1.96396	298.96396	150.46396	15046.39639	1.96396	298.96396	150.46396	15046.39613	1.96396	298.96396	150.46396000000001	15046.396	2020-01-01	2020-01-02	2020-01-01 00:10:54	2020-01-02 03:39:15	2020-01-01 00:10:54.000	2020-01-02 03:39:15.000	654	99555	50104.5	5010450	654	99555	50104.5	5010450	-32516	32622	4884.66	488466	-128	123	0.18	18
+655	2	10645	99556	1.96696	298.96696	150.46696	15046.69669	1.96696	298.96698	150.46696	15046.69676	1.96696	298.96696	150.46696	15046.696	2020-01-01	2020-01-02	2020-01-01 00:10:55	2020-01-02 03:39:16	2020-01-01 00:10:55.000	2020-01-02 03:39:16.000	655	99556	50105.5	5010550	655	99556	50105.5	5010550	-32515	32623	4885.66	488566	-127	124	1.18	118
+656	2	10646	99557	1.96996	298.96996	150.46996	15046.99699	1.96997	298.96997	150.46997	15046.99706	1.96996	298.96996	150.46996	15046.996	2020-01-01	2020-01-02	2020-01-01 00:10:56	2020-01-02 03:39:17	2020-01-01 00:10:56.000	2020-01-02 03:39:17.000	656	99557	50106.5	5010650	656	99557	50106.5	5010650	-32514	32624	4886.66	488666	-126	125	2.18	218
+657	2	10647	99558	1.97297	298.97297	150.47297	15047.29729	1.97297	298.97296	150.47297	15047.29735	1.97297	298.97297	150.47297	15047.297	2020-01-01	2020-01-02	2020-01-01 00:10:57	2020-01-02 03:39:18	2020-01-01 00:10:57.000	2020-01-02 03:39:18.000	657	99558	50107.5	5010750	657	99558	50107.5	5010750	-32513	32625	4887.66	488766	-125	126	3.18	318
+658	2	10648	99559	1.97597	298.97597	150.47597	15047.59759	1.97597	298.97598	150.47597	15047.59794	1.97597	298.97597	150.47597	15047.597	2020-01-01	2020-01-02	2020-01-01 00:10:58	2020-01-02 03:39:19	2020-01-01 00:10:58.000	2020-01-02 03:39:19.000	658	99559	50108.5	5010850	658	99559	50108.5	5010850	-32512	32626	4888.66	488866	-124	127	4.18	418
+659	2	10649	99560	1.97897	298.97897	150.47897	15047.89789	1.97897	298.97897	150.47897	15047.8976	1.97897	298.97897	150.47897	15047.897	2020-01-01	2020-01-02	2020-01-01 00:10:59	2020-01-02 03:39:20	2020-01-01 00:10:59.000	2020-01-02 03:39:20.000	659	99560	50109.5	5010950	659	99560	50109.5	5010950	-32511	32627	4889.66	488966	-128	127	2.62	262
 66	2	10056	99966	0.19819	300.19819	150.19819	15170.01801	0.19819	300.1982	150.19819	15170.01808	0.19819	300.19819	150.19819	15170.01719	2020-01-01	2020-01-02	2020-01-01 00:01:06	2020-01-02 03:46:06	2020-01-01 00:01:06.000	2020-01-02 03:46:06.000	66	99966	50016	5051616	66	99966	50016	5051616	-32503	32432	4595.009900990099	464096	-128	127	-0.31683168316831684	-32
-660	2	10650	99561	1.98198	298.98198	150.48198	15048.19819	1.98198	298.982	150.48198	15048.19822	1.98198	298.98198	150.48198	15048.19800	2020-01-01	2020-01-02	2020-01-01 00:11:00	2020-01-02 03:39:21	2020-01-01 00:11:00.000	2020-01-02 03:39:21.000	660	99561	50110.5	5011050	660	99561	50110.5	5011050	-32510	32628	4890.66	489066	-128	127	1.06	106
-661	2	10651	99562	1.98498	298.98498	150.48498	15048.49849	1.98498	298.985	150.48498	15048.49853	1.98498	298.98498	150.48498	15048.49800	2020-01-01	2020-01-02	2020-01-01 00:11:01	2020-01-02 03:39:22	2020-01-01 00:11:01.000	2020-01-02 03:39:22.000	661	99562	50111.5	5011150	661	99562	50111.5	5011150	-32509	32629	4891.66	489166	-128	124	-0.5	-50
-662	2	10652	99563	1.98798	298.98798	150.48798	15048.79879	1.98798	298.98798	150.48798	15048.79882	1.98798	298.98798	150.48798	15048.79800	2020-01-01	2020-01-02	2020-01-01 00:11:02	2020-01-02 03:39:23	2020-01-01 00:11:02.000	2020-01-02 03:39:23.000	662	99563	50112.5	5011250	662	99563	50112.5	5011250	-32508	32630	4892.66	489266	-127	125	0.5	50
-663	2	10653	99564	1.99099	298.99099	150.49099	15049.09909	1.99099	298.991	150.49099	15049.09942	1.99099	298.99099	150.49099	15049.09900	2020-01-01	2020-01-02	2020-01-01 00:11:03	2020-01-02 03:39:24	2020-01-01 00:11:03.000	2020-01-02 03:39:24.000	663	99564	50113.5	5011350	663	99564	50113.5	5011350	-32507	32631	4893.66	489366	-126	126	1.5	150
-664	2	10654	99565	1.99399	298.99399	150.49399	15049.39939	1.99399	298.994	150.49399	15049.39911	1.99399	298.99399	150.49399	15049.39900	2020-01-01	2020-01-02	2020-01-01 00:11:04	2020-01-02 03:39:25	2020-01-01 00:11:04.000	2020-01-02 03:39:25.000	664	99565	50114.5	5011450	664	99565	50114.5	5011450	-32506	32632	4894.66	489466	-125	127	2.5	250
-665	2	10655	99566	1.99699	298.99699	150.49699	15049.69969	1.99699	298.997	150.49699	15049.6997	1.99699	298.99699	150.49699	15049.69900	2020-01-01	2020-01-02	2020-01-01 00:11:05	2020-01-02 03:39:26	2020-01-01 00:11:05.000	2020-01-02 03:39:26.000	665	99566	50115.5	5011550	665	99566	50115.5	5011550	-32505	32633	4895.66	489566	-128	127	0.94	94
-666	2	10656	99567	2	299	150.5	15050	2	299	150.5	15050	2.00000	299.00000	150.5	15050.00000	2020-01-01	2020-01-02	2020-01-01 00:11:06	2020-01-02 03:39:27	2020-01-01 00:11:06.000	2020-01-02 03:39:27.000	666	99567	50116.5	5011650	666	99567	50116.5	5011650	-32504	32634	4896.66	489666	-128	127	-0.62	-62
-667	2	10657	99568	2.003	299.003	150.503	15050.3003	2.003	299.003	150.503	15050.30029	2.00300	299.00300	150.503	15050.30000	2020-01-01	2020-01-02	2020-01-01 00:11:07	2020-01-02 03:39:28	2020-01-01 00:11:07.000	2020-01-02 03:39:28.000	667	99568	50117.5	5011750	667	99568	50117.5	5011750	-32503	32635	4897.66	489766	-128	123	-2.18	-218
-668	2	10658	99569	2.006	299.006	150.506	15050.6006	2.006	299.006	150.506	15050.60089	2.00600	299.00600	150.506	15050.60000	2020-01-01	2020-01-02	2020-01-01 00:11:08	2020-01-02 03:39:29	2020-01-01 00:11:08.000	2020-01-02 03:39:29.000	668	99569	50118.5	5011850	668	99569	50118.5	5011850	-32502	32636	4898.66	489866	-127	124	-1.18	-118
-669	2	10659	99570	2.009	299.009	150.509	15050.9009	2.009	299.009	150.509	15050.90057	2.00900	299.00900	150.509	15050.90000	2020-01-01	2020-01-02	2020-01-01 00:11:09	2020-01-02 03:39:30	2020-01-01 00:11:09.000	2020-01-02 03:39:30.000	669	99570	50119.5	5011950	669	99570	50119.5	5011950	-32501	32637	4899.66	489966	-126	125	-0.18	-18
-67	2	10057	99967	0.2012	300.2012	150.2012	15170.32132	0.2012	300.2012	150.2012	15170.32142	0.20120	300.20120	150.2012	15170.32120	2020-01-01	2020-01-02	2020-01-01 00:01:07	2020-01-02 03:46:07	2020-01-01 00:01:07.000	2020-01-02 03:46:07.000	67	99967	50017	5051717	67	99967	50017	5051717	-32502	32433	4596.009900990099	464197	-128	127	-1.8514851485148516	-187
-670	2	10660	99571	2.01201	299.01201	150.51201	15051.2012	2.01201	299.01202	150.51201	15051.20117	2.01201	299.01201	150.51201	15051.20100	2020-01-01	2020-01-02	2020-01-01 00:11:10	2020-01-02 03:39:31	2020-01-01 00:11:10.000	2020-01-02 03:39:31.000	670	99571	50120.5	5012050	670	99571	50120.5	5012050	-32500	32638	4900.66	490066	-125	126	0.82	82
-671	2	10661	99572	2.01501	299.01501	150.51501	15051.5015	2.01501	299.015	150.51501	15051.50146	2.01501	299.01501	150.51501	15051.50100	2020-01-01	2020-01-02	2020-01-01 00:11:11	2020-01-02 03:39:32	2020-01-01 00:11:11.000	2020-01-02 03:39:32.000	671	99572	50121.5	5012150	671	99572	50121.5	5012150	-32499	32639	4901.66	490166	-124	127	1.82	182
-672	2	10662	99573	2.01801	299.01801	150.51801	15051.8018	2.01801	299.018	150.51801	15051.80176	2.01801	299.01801	150.51801	15051.80100	2020-01-01	2020-01-02	2020-01-01 00:11:12	2020-01-02 03:39:33	2020-01-01 00:11:12.000	2020-01-02 03:39:33.000	672	99573	50122.5	5012250	672	99573	50122.5	5012250	-32498	32640	4902.66	490266	-128	127	0.26	26
-673	2	10663	99574	2.02102	299.02102	150.52102	15052.1021	2.02102	299.02103	150.52102	15052.1024	2.02102	299.02102	150.52102000000002	15052.10200	2020-01-01	2020-01-02	2020-01-01 00:11:13	2020-01-02 03:39:34	2020-01-01 00:11:13.000	2020-01-02 03:39:34.000	673	99574	50123.5	5012350	673	99574	50123.5	5012350	-32497	32641	4903.66	490366	-128	123	-1.3	-130
-674	2	10664	99575	2.02402	299.02402	150.52402	15052.4024	2.02402	299.02402	150.52402	15052.40204	2.02402	299.02402	150.52402	15052.40200	2020-01-01	2020-01-02	2020-01-01 00:11:14	2020-01-02 03:39:35	2020-01-01 00:11:14.000	2020-01-02 03:39:35.000	674	99575	50124.5	5012450	674	99575	50124.5	5012450	-32496	32642	4904.66	490466	-127	124	-0.3	-30
-675	2	10665	99576	2.02702	299.02702	150.52702	15052.7027	2.02702	299.02704	150.52702	15052.70264	2.02702	299.02702	150.52702	15052.70200	2020-01-01	2020-01-02	2020-01-01 00:11:15	2020-01-02 03:39:36	2020-01-01 00:11:15.000	2020-01-02 03:39:36.000	675	99576	50125.5	5012550	675	99576	50125.5	5012550	-32495	32643	4905.66	490566	-126	125	0.7	70
-676	2	10666	99577	2.03003	299.03003	150.53003	15053.003	2.03003	299.03003	150.53002	15053.00293	2.03003	299.03003	150.53003	15053.00300	2020-01-01	2020-01-02	2020-01-01 00:11:16	2020-01-02 03:39:37	2020-01-01 00:11:16.000	2020-01-02 03:39:37.000	676	99577	50126.5	5012650	676	99577	50126.5	5012650	-32494	32644	4906.66	490666	-125	126	1.7	170
-677	2	10667	99578	2.03303	299.03303	150.53303	15053.3033	2.03303	299.03302	150.53303	15053.30323	2.03303	299.03303	150.53303	15053.30300	2020-01-01	2020-01-02	2020-01-01 00:11:17	2020-01-02 03:39:38	2020-01-01 00:11:17.000	2020-01-02 03:39:38.000	677	99578	50127.5	5012750	677	99578	50127.5	5012750	-32493	32645	4907.66	490766	-124	127	2.7	270
-678	2	10668	99579	2.03603	299.03603	150.53603	15053.6036	2.03603	299.03604	150.53603	15053.60387	2.03603	299.03603	150.53602999999998	15053.60300	2020-01-01	2020-01-02	2020-01-01 00:11:18	2020-01-02 03:39:39	2020-01-01 00:11:18.000	2020-01-02 03:39:39.000	678	99579	50128.5	5012850	678	99579	50128.5	5012850	-32492	32646	4908.66	490866	-128	127	1.14	114
-679	2	10669	99580	2.03903	299.03903	150.53903	15053.9039	2.03903	299.03903	150.53903	15053.90351	2.03903	299.03903	150.53903	15053.90300	2020-01-01	2020-01-02	2020-01-01 00:11:19	2020-01-02 03:39:40	2020-01-01 00:11:19.000	2020-01-02 03:39:40.000	679	99580	50129.5	5012950	679	99580	50129.5	5012950	-32491	32647	4909.66	490966	-128	123	-0.42	-42
-68	2	10058	99968	0.2042	300.2042	150.2042	15170.62462	0.2042	300.2042	150.2042	15170.62457	0.20420	300.20420	150.20420000000001	15170.62420	2020-01-01	2020-01-02	2020-01-01 00:01:08	2020-01-02 03:46:08	2020-01-01 00:01:08.000	2020-01-02 03:46:08.000	68	99968	50018	5051818	68	99968	50018	5051818	-32501	32434	4597.009900990099	464298	-128	124	-3.386138613861386	-342
-680	2	10670	99581	2.04204	299.04204	150.54204	15054.2042	2.04204	299.04205	150.54204	15054.20426	2.04204	299.04204	150.54204	15054.20400	2020-01-01	2020-01-02	2020-01-01 00:11:20	2020-01-02 03:39:41	2020-01-01 00:11:20.000	2020-01-02 03:39:41.000	680	99581	50130.5	5013050	680	99581	50130.5	5013050	-32490	32648	4910.66	491066	-127	124	0.58	58
-681	2	10671	99582	2.04504	299.04504	150.54504	15054.5045	2.04504	299.04504	150.54504	15054.5044	2.04504	299.04504	150.54504	15054.50400	2020-01-01	2020-01-02	2020-01-01 00:11:21	2020-01-02 03:39:42	2020-01-01 00:11:21.000	2020-01-02 03:39:42.000	681	99582	50131.5	5013150	681	99582	50131.5	5013150	-32489	32649	4911.66	491166	-126	125	1.58	158
-682	2	10672	99583	2.04804	299.04804	150.54804	15054.8048	2.04804	299.04803	150.54804	15054.80474	2.04804	299.04804	150.54804000000001	15054.80400	2020-01-01	2020-01-02	2020-01-01 00:11:22	2020-01-02 03:39:43	2020-01-01 00:11:22.000	2020-01-02 03:39:43.000	682	99583	50132.5	5013250	682	99583	50132.5	5013250	-32488	32650	4912.66	491266	-125	126	2.58	258
-683	2	10673	99584	2.05105	299.05105	150.55105	15055.1051	2.05105	299.05106	150.55105	15055.10533	2.05105	299.05105	150.55105	15055.10500	2020-01-01	2020-01-02	2020-01-01 00:11:23	2020-01-02 03:39:44	2020-01-01 00:11:23.000	2020-01-02 03:39:44.000	683	99584	50133.5	5013350	683	99584	50133.5	5013350	-32487	32651	4913.66	491366	-124	127	3.58	358
-684	2	10674	99585	2.05405	299.05405	150.55405	15055.4054	2.05405	299.05405	150.55404	15055.40498	2.05405	299.05405	150.55405000000002	15055.40500	2020-01-01	2020-01-02	2020-01-01 00:11:24	2020-01-02 03:39:45	2020-01-01 00:11:24.000	2020-01-02 03:39:45.000	684	99585	50134.5	5013450	684	99585	50134.5	5013450	-32486	32652	4914.66	491466	-128	127	2.02	202
-685	2	10675	99586	2.05705	299.05705	150.55705	15055.7057	2.05705	299.05707	150.55705	15055.70573	2.05705	299.05705	150.55705	15055.70500	2020-01-01	2020-01-02	2020-01-01 00:11:25	2020-01-02 03:39:46	2020-01-01 00:11:25.000	2020-01-02 03:39:46.000	685	99586	50135.5	5013550	685	99586	50135.5	5013550	-32485	32653	4915.66	491566	-128	127	0.46	46
-686	2	10676	99587	2.06006	299.06006	150.56006	15056.006	2.06006	299.06006	150.56005	15056.00587	2.06006	299.06006	150.56006	15056.00600	2020-01-01	2020-01-02	2020-01-01 00:11:26	2020-01-02 03:39:47	2020-01-01 00:11:26.000	2020-01-02 03:39:47.000	686	99587	50136.5	5013650	686	99587	50136.5	5013650	-32484	32654	4916.66	491666	-128	124	-1.1	-110
-687	2	10677	99588	2.06306	299.06306	150.56306	15056.3063	2.06306	299.06305	150.56306	15056.30621	2.06306	299.06306	150.56306	15056.30600	2020-01-01	2020-01-02	2020-01-01 00:11:27	2020-01-02 03:39:48	2020-01-01 00:11:27.000	2020-01-02 03:39:48.000	687	99588	50137.5	5013750	687	99588	50137.5	5013750	-32483	32655	4917.66	491766	-127	125	-0.1	-10
-688	2	10678	99589	2.06606	299.06606	150.56606	15056.6066	2.06606	299.06607	150.56606	15056.60681	2.06606	299.06606	150.56606	15056.60600	2020-01-01	2020-01-02	2020-01-01 00:11:28	2020-01-02 03:39:49	2020-01-01 00:11:28.000	2020-01-02 03:39:49.000	688	99589	50138.5	5013850	688	99589	50138.5	5013850	-32482	32656	4918.66	491866	-126	126	0.9	90
-689	2	10679	99590	2.06906	299.06906	150.56906	15056.9069	2.06906	299.06906	150.56907	15056.9071	2.06906	299.06906	150.56906	15056.90600	2020-01-01	2020-01-02	2020-01-01 00:11:29	2020-01-02 03:39:50	2020-01-01 00:11:29.000	2020-01-02 03:39:50.000	689	99590	50139.5	5013950	689	99590	50139.5	5013950	-32481	32657	4919.66	491966	-125	127	1.9	190
-69	2	10059	99969	0.2072	300.2072	150.2072	15170.92792	0.2072	300.2072	150.20721	15170.92832	0.20720	300.20720	150.2072	15170.92720	2020-01-01	2020-01-02	2020-01-01 00:01:09	2020-01-02 03:46:09	2020-01-01 00:01:09.000	2020-01-02 03:46:09.000	69	99969	50019	5051919	69	99969	50019	5051919	-32500	32435	4598.009900990099	464399	-127	125	-2.386138613861386	-241
-690	2	10680	99591	2.07207	299.07207	150.57207	15057.2072	2.07207	299.07208	150.57207	15057.2072	2.07207	299.07207	150.57207	15057.20700	2020-01-01	2020-01-02	2020-01-01 00:11:30	2020-01-02 03:39:51	2020-01-01 00:11:30.000	2020-01-02 03:39:51.000	690	99591	50140.5	5014050	690	99591	50140.5	5014050	-32480	32658	4920.66	492066	-128	127	0.34	34
-691	2	10681	99592	2.07507	299.07507	150.57507	15057.5075	2.07507	299.07507	150.57507	15057.50734	2.07507	299.07507	150.57506999999998	15057.50700	2020-01-01	2020-01-02	2020-01-01 00:11:31	2020-01-02 03:39:52	2020-01-01 00:11:31.000	2020-01-02 03:39:52.000	691	99592	50141.5	5014150	691	99592	50141.5	5014150	-32479	32659	4921.66	492166	-128	127	-1.22	-122
-692	2	10682	99593	2.07807	299.07807	150.57807	15057.8078	2.07807	299.07806	150.57807	15057.80767	2.07807	299.07807	150.57807	15057.80700	2020-01-01	2020-01-02	2020-01-01 00:11:32	2020-01-02 03:39:53	2020-01-01 00:11:32.000	2020-01-02 03:39:53.000	692	99593	50142.5	5014250	692	99593	50142.5	5014250	-32478	32660	4922.66	492266	-128	123	-2.78	-278
-693	2	10683	99594	2.08108	299.08108	150.58108	15058.1081	2.08108	299.0811	150.58108	15058.10827	2.08108	299.08108	150.58108000000001	15058.10800	2020-01-01	2020-01-02	2020-01-01 00:11:33	2020-01-02 03:39:54	2020-01-01 00:11:33.000	2020-01-02 03:39:54.000	693	99594	50143.5	5014350	693	99594	50143.5	5014350	-32477	32661	4923.66	492366	-127	124	-1.78	-178
-694	2	10684	99595	2.08408	299.08408	150.58408	15058.4084	2.08408	299.08408	150.58408	15058.40857	2.08408	299.08408	150.58408	15058.40800	2020-01-01	2020-01-02	2020-01-01 00:11:34	2020-01-02 03:39:55	2020-01-01 00:11:34.000	2020-01-02 03:39:55.000	694	99595	50144.5	5014450	694	99595	50144.5	5014450	-32476	32662	4924.66	492466	-126	125	-0.78	-78
-695	2	10685	99596	2.08708	299.08708	150.58708	15058.7087	2.08708	299.0871	150.58708	15058.70867	2.08708	299.08708	150.58708000000001	15058.70800	2020-01-01	2020-01-02	2020-01-01 00:11:35	2020-01-02 03:39:56	2020-01-01 00:11:35.000	2020-01-02 03:39:56.000	695	99596	50145.5	5014550	695	99596	50145.5	5014550	-32475	32663	4925.66	492566	-125	126	0.22	22
-696	2	10686	99597	2.09009	299.09009	150.59009	15059.009	2.09009	299.0901	150.59008	15059.00885	2.09009	299.09009	150.59009	15059.00900	2020-01-01	2020-01-02	2020-01-01 00:11:36	2020-01-02 03:39:57	2020-01-01 00:11:36.000	2020-01-02 03:39:57.000	696	99597	50146.5	5014650	696	99597	50146.5	5014650	-32474	32664	4926.66	492666	-124	127	1.22	122
-697	2	10687	99598	2.09309	299.09309	150.59309	15059.3093	2.09309	299.09308	150.59309	15059.30915	2.09309	299.09309	150.59309	15059.30900	2020-01-01	2020-01-02	2020-01-01 00:11:37	2020-01-02 03:39:58	2020-01-01 00:11:37.000	2020-01-02 03:39:58.000	697	99598	50147.5	5014750	697	99598	50147.5	5014750	-32473	32665	4927.66	492766	-128	127	-0.34	-34
-698	2	10688	99599	2.09609	299.09609	150.59609	15059.6096	2.09609	299.0961	150.59609	15059.6099	2.09609	299.09609	150.59609	15059.60900	2020-01-01	2020-01-02	2020-01-01 00:11:38	2020-01-02 03:39:59	2020-01-01 00:11:38.000	2020-01-02 03:39:59.000	698	99599	50148.5	5014850	698	99599	50148.5	5014850	-32472	32666	4928.66	492866	-128	123	-1.9	-190
-699	2	10689	99600	2.09909	299.09909	150.59909	15059.9099	2.09909	299.0991	150.5991	15059.91003	2.09909	299.09909	150.59909	15059.90900	2020-01-01	2020-01-02	2020-01-01 00:11:39	2020-01-02 03:40:00	2020-01-01 00:11:39.000	2020-01-02 03:40:00.000	699	99600	50149.5	5014950	699	99600	50149.5	5014950	-32471	32667	4929.66	492966	-127	124	-0.9	-90
+660	2	10650	99561	1.98198	298.98198	150.48198	15048.19819	1.98198	298.982	150.48198	15048.19822	1.98198	298.98198	150.48198	15048.198	2020-01-01	2020-01-02	2020-01-01 00:11:00	2020-01-02 03:39:21	2020-01-01 00:11:00.000	2020-01-02 03:39:21.000	660	99561	50110.5	5011050	660	99561	50110.5	5011050	-32510	32628	4890.66	489066	-128	127	1.06	106
+661	2	10651	99562	1.98498	298.98498	150.48498	15048.49849	1.98498	298.985	150.48498	15048.49853	1.98498	298.98498	150.48498	15048.498	2020-01-01	2020-01-02	2020-01-01 00:11:01	2020-01-02 03:39:22	2020-01-01 00:11:01.000	2020-01-02 03:39:22.000	661	99562	50111.5	5011150	661	99562	50111.5	5011150	-32509	32629	4891.66	489166	-128	124	-0.5	-50
+662	2	10652	99563	1.98798	298.98798	150.48798	15048.79879	1.98798	298.98798	150.48798	15048.79882	1.98798	298.98798	150.48798	15048.798	2020-01-01	2020-01-02	2020-01-01 00:11:02	2020-01-02 03:39:23	2020-01-01 00:11:02.000	2020-01-02 03:39:23.000	662	99563	50112.5	5011250	662	99563	50112.5	5011250	-32508	32630	4892.66	489266	-127	125	0.5	50
+663	2	10653	99564	1.99099	298.99099	150.49099	15049.09909	1.99099	298.991	150.49099	15049.09942	1.99099	298.99099	150.49099	15049.099	2020-01-01	2020-01-02	2020-01-01 00:11:03	2020-01-02 03:39:24	2020-01-01 00:11:03.000	2020-01-02 03:39:24.000	663	99564	50113.5	5011350	663	99564	50113.5	5011350	-32507	32631	4893.66	489366	-126	126	1.5	150
+664	2	10654	99565	1.99399	298.99399	150.49399	15049.39939	1.99399	298.994	150.49399	15049.39911	1.99399	298.99399	150.49399	15049.399	2020-01-01	2020-01-02	2020-01-01 00:11:04	2020-01-02 03:39:25	2020-01-01 00:11:04.000	2020-01-02 03:39:25.000	664	99565	50114.5	5011450	664	99565	50114.5	5011450	-32506	32632	4894.66	489466	-125	127	2.5	250
+665	2	10655	99566	1.99699	298.99699	150.49699	15049.69969	1.99699	298.997	150.49699	15049.6997	1.99699	298.99699	150.49699	15049.699	2020-01-01	2020-01-02	2020-01-01 00:11:05	2020-01-02 03:39:26	2020-01-01 00:11:05.000	2020-01-02 03:39:26.000	665	99566	50115.5	5011550	665	99566	50115.5	5011550	-32505	32633	4895.66	489566	-128	127	0.94	94
+666	2	10656	99567	2	299	150.5	15050	2	299	150.5	15050	2	299	150.5	15050	2020-01-01	2020-01-02	2020-01-01 00:11:06	2020-01-02 03:39:27	2020-01-01 00:11:06.000	2020-01-02 03:39:27.000	666	99567	50116.5	5011650	666	99567	50116.5	5011650	-32504	32634	4896.66	489666	-128	127	-0.62	-62
+667	2	10657	99568	2.003	299.003	150.503	15050.3003	2.003	299.003	150.503	15050.30029	2.003	299.003	150.503	15050.3	2020-01-01	2020-01-02	2020-01-01 00:11:07	2020-01-02 03:39:28	2020-01-01 00:11:07.000	2020-01-02 03:39:28.000	667	99568	50117.5	5011750	667	99568	50117.5	5011750	-32503	32635	4897.66	489766	-128	123	-2.18	-218
+668	2	10658	99569	2.006	299.006	150.506	15050.6006	2.006	299.006	150.506	15050.60089	2.006	299.006	150.506	15050.6	2020-01-01	2020-01-02	2020-01-01 00:11:08	2020-01-02 03:39:29	2020-01-01 00:11:08.000	2020-01-02 03:39:29.000	668	99569	50118.5	5011850	668	99569	50118.5	5011850	-32502	32636	4898.66	489866	-127	124	-1.18	-118
+669	2	10659	99570	2.009	299.009	150.509	15050.9009	2.009	299.009	150.509	15050.90057	2.009	299.009	150.509	15050.9	2020-01-01	2020-01-02	2020-01-01 00:11:09	2020-01-02 03:39:30	2020-01-01 00:11:09.000	2020-01-02 03:39:30.000	669	99570	50119.5	5011950	669	99570	50119.5	5011950	-32501	32637	4899.66	489966	-126	125	-0.18	-18
+67	2	10057	99967	0.2012	300.2012	150.2012	15170.32132	0.2012	300.2012	150.2012	15170.32142	0.2012	300.2012	150.2012	15170.3212	2020-01-01	2020-01-02	2020-01-01 00:01:07	2020-01-02 03:46:07	2020-01-01 00:01:07.000	2020-01-02 03:46:07.000	67	99967	50017	5051717	67	99967	50017	5051717	-32502	32433	4596.009900990099	464197	-128	127	-1.8514851485148516	-187
+670	2	10660	99571	2.01201	299.01201	150.51201	15051.2012	2.01201	299.01202	150.51201	15051.20117	2.01201	299.01201	150.51201	15051.201	2020-01-01	2020-01-02	2020-01-01 00:11:10	2020-01-02 03:39:31	2020-01-01 00:11:10.000	2020-01-02 03:39:31.000	670	99571	50120.5	5012050	670	99571	50120.5	5012050	-32500	32638	4900.66	490066	-125	126	0.82	82
+671	2	10661	99572	2.01501	299.01501	150.51501	15051.5015	2.01501	299.015	150.51501	15051.50146	2.01501	299.01501	150.51501	15051.501	2020-01-01	2020-01-02	2020-01-01 00:11:11	2020-01-02 03:39:32	2020-01-01 00:11:11.000	2020-01-02 03:39:32.000	671	99572	50121.5	5012150	671	99572	50121.5	5012150	-32499	32639	4901.66	490166	-124	127	1.82	182
+672	2	10662	99573	2.01801	299.01801	150.51801	15051.8018	2.01801	299.018	150.51801	15051.80176	2.01801	299.01801	150.51801	15051.801	2020-01-01	2020-01-02	2020-01-01 00:11:12	2020-01-02 03:39:33	2020-01-01 00:11:12.000	2020-01-02 03:39:33.000	672	99573	50122.5	5012250	672	99573	50122.5	5012250	-32498	32640	4902.66	490266	-128	127	0.26	26
+673	2	10663	99574	2.02102	299.02102	150.52102	15052.1021	2.02102	299.02103	150.52102	15052.1024	2.02102	299.02102	150.52102000000002	15052.102	2020-01-01	2020-01-02	2020-01-01 00:11:13	2020-01-02 03:39:34	2020-01-01 00:11:13.000	2020-01-02 03:39:34.000	673	99574	50123.5	5012350	673	99574	50123.5	5012350	-32497	32641	4903.66	490366	-128	123	-1.3	-130
+674	2	10664	99575	2.02402	299.02402	150.52402	15052.4024	2.02402	299.02402	150.52402	15052.40204	2.02402	299.02402	150.52402	15052.402	2020-01-01	2020-01-02	2020-01-01 00:11:14	2020-01-02 03:39:35	2020-01-01 00:11:14.000	2020-01-02 03:39:35.000	674	99575	50124.5	5012450	674	99575	50124.5	5012450	-32496	32642	4904.66	490466	-127	124	-0.3	-30
+675	2	10665	99576	2.02702	299.02702	150.52702	15052.7027	2.02702	299.02704	150.52702	15052.70264	2.02702	299.02702	150.52702	15052.702	2020-01-01	2020-01-02	2020-01-01 00:11:15	2020-01-02 03:39:36	2020-01-01 00:11:15.000	2020-01-02 03:39:36.000	675	99576	50125.5	5012550	675	99576	50125.5	5012550	-32495	32643	4905.66	490566	-126	125	0.7	70
+676	2	10666	99577	2.03003	299.03003	150.53003	15053.003	2.03003	299.03003	150.53002	15053.00293	2.03003	299.03003	150.53003	15053.003	2020-01-01	2020-01-02	2020-01-01 00:11:16	2020-01-02 03:39:37	2020-01-01 00:11:16.000	2020-01-02 03:39:37.000	676	99577	50126.5	5012650	676	99577	50126.5	5012650	-32494	32644	4906.66	490666	-125	126	1.7	170
+677	2	10667	99578	2.03303	299.03303	150.53303	15053.3033	2.03303	299.03302	150.53303	15053.30323	2.03303	299.03303	150.53303	15053.303	2020-01-01	2020-01-02	2020-01-01 00:11:17	2020-01-02 03:39:38	2020-01-01 00:11:17.000	2020-01-02 03:39:38.000	677	99578	50127.5	5012750	677	99578	50127.5	5012750	-32493	32645	4907.66	490766	-124	127	2.7	270
+678	2	10668	99579	2.03603	299.03603	150.53603	15053.6036	2.03603	299.03604	150.53603	15053.60387	2.03603	299.03603	150.53602999999998	15053.603	2020-01-01	2020-01-02	2020-01-01 00:11:18	2020-01-02 03:39:39	2020-01-01 00:11:18.000	2020-01-02 03:39:39.000	678	99579	50128.5	5012850	678	99579	50128.5	5012850	-32492	32646	4908.66	490866	-128	127	1.14	114
+679	2	10669	99580	2.03903	299.03903	150.53903	15053.9039	2.03903	299.03903	150.53903	15053.90351	2.03903	299.03903	150.53903	15053.903	2020-01-01	2020-01-02	2020-01-01 00:11:19	2020-01-02 03:39:40	2020-01-01 00:11:19.000	2020-01-02 03:39:40.000	679	99580	50129.5	5012950	679	99580	50129.5	5012950	-32491	32647	4909.66	490966	-128	123	-0.42	-42
+68	2	10058	99968	0.2042	300.2042	150.2042	15170.62462	0.2042	300.2042	150.2042	15170.62457	0.2042	300.2042	150.20420000000001	15170.6242	2020-01-01	2020-01-02	2020-01-01 00:01:08	2020-01-02 03:46:08	2020-01-01 00:01:08.000	2020-01-02 03:46:08.000	68	99968	50018	5051818	68	99968	50018	5051818	-32501	32434	4597.009900990099	464298	-128	124	-3.386138613861386	-342
+680	2	10670	99581	2.04204	299.04204	150.54204	15054.2042	2.04204	299.04205	150.54204	15054.20426	2.04204	299.04204	150.54204	15054.204	2020-01-01	2020-01-02	2020-01-01 00:11:20	2020-01-02 03:39:41	2020-01-01 00:11:20.000	2020-01-02 03:39:41.000	680	99581	50130.5	5013050	680	99581	50130.5	5013050	-32490	32648	4910.66	491066	-127	124	0.58	58
+681	2	10671	99582	2.04504	299.04504	150.54504	15054.5045	2.04504	299.04504	150.54504	15054.5044	2.04504	299.04504	150.54504	15054.504	2020-01-01	2020-01-02	2020-01-01 00:11:21	2020-01-02 03:39:42	2020-01-01 00:11:21.000	2020-01-02 03:39:42.000	681	99582	50131.5	5013150	681	99582	50131.5	5013150	-32489	32649	4911.66	491166	-126	125	1.58	158
+682	2	10672	99583	2.04804	299.04804	150.54804	15054.8048	2.04804	299.04803	150.54804	15054.80474	2.04804	299.04804	150.54804000000001	15054.804	2020-01-01	2020-01-02	2020-01-01 00:11:22	2020-01-02 03:39:43	2020-01-01 00:11:22.000	2020-01-02 03:39:43.000	682	99583	50132.5	5013250	682	99583	50132.5	5013250	-32488	32650	4912.66	491266	-125	126	2.58	258
+683	2	10673	99584	2.05105	299.05105	150.55105	15055.1051	2.05105	299.05106	150.55105	15055.10533	2.05105	299.05105	150.55105	15055.105	2020-01-01	2020-01-02	2020-01-01 00:11:23	2020-01-02 03:39:44	2020-01-01 00:11:23.000	2020-01-02 03:39:44.000	683	99584	50133.5	5013350	683	99584	50133.5	5013350	-32487	32651	4913.66	491366	-124	127	3.58	358
+684	2	10674	99585	2.05405	299.05405	150.55405	15055.4054	2.05405	299.05405	150.55404	15055.40498	2.05405	299.05405	150.55405000000002	15055.405	2020-01-01	2020-01-02	2020-01-01 00:11:24	2020-01-02 03:39:45	2020-01-01 00:11:24.000	2020-01-02 03:39:45.000	684	99585	50134.5	5013450	684	99585	50134.5	5013450	-32486	32652	4914.66	491466	-128	127	2.02	202
+685	2	10675	99586	2.05705	299.05705	150.55705	15055.7057	2.05705	299.05707	150.55705	15055.70573	2.05705	299.05705	150.55705	15055.705	2020-01-01	2020-01-02	2020-01-01 00:11:25	2020-01-02 03:39:46	2020-01-01 00:11:25.000	2020-01-02 03:39:46.000	685	99586	50135.5	5013550	685	99586	50135.5	5013550	-32485	32653	4915.66	491566	-128	127	0.46	46
+686	2	10676	99587	2.06006	299.06006	150.56006	15056.006	2.06006	299.06006	150.56005	15056.00587	2.06006	299.06006	150.56006	15056.006	2020-01-01	2020-01-02	2020-01-01 00:11:26	2020-01-02 03:39:47	2020-01-01 00:11:26.000	2020-01-02 03:39:47.000	686	99587	50136.5	5013650	686	99587	50136.5	5013650	-32484	32654	4916.66	491666	-128	124	-1.1	-110
+687	2	10677	99588	2.06306	299.06306	150.56306	15056.3063	2.06306	299.06305	150.56306	15056.30621	2.06306	299.06306	150.56306	15056.306	2020-01-01	2020-01-02	2020-01-01 00:11:27	2020-01-02 03:39:48	2020-01-01 00:11:27.000	2020-01-02 03:39:48.000	687	99588	50137.5	5013750	687	99588	50137.5	5013750	-32483	32655	4917.66	491766	-127	125	-0.1	-10
+688	2	10678	99589	2.06606	299.06606	150.56606	15056.6066	2.06606	299.06607	150.56606	15056.60681	2.06606	299.06606	150.56606	15056.606	2020-01-01	2020-01-02	2020-01-01 00:11:28	2020-01-02 03:39:49	2020-01-01 00:11:28.000	2020-01-02 03:39:49.000	688	99589	50138.5	5013850	688	99589	50138.5	5013850	-32482	32656	4918.66	491866	-126	126	0.9	90
+689	2	10679	99590	2.06906	299.06906	150.56906	15056.9069	2.06906	299.06906	150.56907	15056.9071	2.06906	299.06906	150.56906	15056.906	2020-01-01	2020-01-02	2020-01-01 00:11:29	2020-01-02 03:39:50	2020-01-01 00:11:29.000	2020-01-02 03:39:50.000	689	99590	50139.5	5013950	689	99590	50139.5	5013950	-32481	32657	4919.66	491966	-125	127	1.9	190
+69	2	10059	99969	0.2072	300.2072	150.2072	15170.92792	0.2072	300.2072	150.20721	15170.92832	0.2072	300.2072	150.2072	15170.9272	2020-01-01	2020-01-02	2020-01-01 00:01:09	2020-01-02 03:46:09	2020-01-01 00:01:09.000	2020-01-02 03:46:09.000	69	99969	50019	5051919	69	99969	50019	5051919	-32500	32435	4598.009900990099	464399	-127	125	-2.386138613861386	-241
+690	2	10680	99591	2.07207	299.07207	150.57207	15057.2072	2.07207	299.07208	150.57207	15057.2072	2.07207	299.07207	150.57207	15057.207	2020-01-01	2020-01-02	2020-01-01 00:11:30	2020-01-02 03:39:51	2020-01-01 00:11:30.000	2020-01-02 03:39:51.000	690	99591	50140.5	5014050	690	99591	50140.5	5014050	-32480	32658	4920.66	492066	-128	127	0.34	34
+691	2	10681	99592	2.07507	299.07507	150.57507	15057.5075	2.07507	299.07507	150.57507	15057.50734	2.07507	299.07507	150.57506999999998	15057.507	2020-01-01	2020-01-02	2020-01-01 00:11:31	2020-01-02 03:39:52	2020-01-01 00:11:31.000	2020-01-02 03:39:52.000	691	99592	50141.5	5014150	691	99592	50141.5	5014150	-32479	32659	4921.66	492166	-128	127	-1.22	-122
+692	2	10682	99593	2.07807	299.07807	150.57807	15057.8078	2.07807	299.07806	150.57807	15057.80767	2.07807	299.07807	150.57807	15057.807	2020-01-01	2020-01-02	2020-01-01 00:11:32	2020-01-02 03:39:53	2020-01-01 00:11:32.000	2020-01-02 03:39:53.000	692	99593	50142.5	5014250	692	99593	50142.5	5014250	-32478	32660	4922.66	492266	-128	123	-2.78	-278
+693	2	10683	99594	2.08108	299.08108	150.58108	15058.1081	2.08108	299.0811	150.58108	15058.10827	2.08108	299.08108	150.58108000000001	15058.108	2020-01-01	2020-01-02	2020-01-01 00:11:33	2020-01-02 03:39:54	2020-01-01 00:11:33.000	2020-01-02 03:39:54.000	693	99594	50143.5	5014350	693	99594	50143.5	5014350	-32477	32661	4923.66	492366	-127	124	-1.78	-178
+694	2	10684	99595	2.08408	299.08408	150.58408	15058.4084	2.08408	299.08408	150.58408	15058.40857	2.08408	299.08408	150.58408	15058.408	2020-01-01	2020-01-02	2020-01-01 00:11:34	2020-01-02 03:39:55	2020-01-01 00:11:34.000	2020-01-02 03:39:55.000	694	99595	50144.5	5014450	694	99595	50144.5	5014450	-32476	32662	4924.66	492466	-126	125	-0.78	-78
+695	2	10685	99596	2.08708	299.08708	150.58708	15058.7087	2.08708	299.0871	150.58708	15058.70867	2.08708	299.08708	150.58708000000001	15058.708	2020-01-01	2020-01-02	2020-01-01 00:11:35	2020-01-02 03:39:56	2020-01-01 00:11:35.000	2020-01-02 03:39:56.000	695	99596	50145.5	5014550	695	99596	50145.5	5014550	-32475	32663	4925.66	492566	-125	126	0.22	22
+696	2	10686	99597	2.09009	299.09009	150.59009	15059.009	2.09009	299.0901	150.59008	15059.00885	2.09009	299.09009	150.59009	15059.009	2020-01-01	2020-01-02	2020-01-01 00:11:36	2020-01-02 03:39:57	2020-01-01 00:11:36.000	2020-01-02 03:39:57.000	696	99597	50146.5	5014650	696	99597	50146.5	5014650	-32474	32664	4926.66	492666	-124	127	1.22	122
+697	2	10687	99598	2.09309	299.09309	150.59309	15059.3093	2.09309	299.09308	150.59309	15059.30915	2.09309	299.09309	150.59309	15059.309	2020-01-01	2020-01-02	2020-01-01 00:11:37	2020-01-02 03:39:58	2020-01-01 00:11:37.000	2020-01-02 03:39:58.000	697	99598	50147.5	5014750	697	99598	50147.5	5014750	-32473	32665	4927.66	492766	-128	127	-0.34	-34
+698	2	10688	99599	2.09609	299.09609	150.59609	15059.6096	2.09609	299.0961	150.59609	15059.6099	2.09609	299.09609	150.59609	15059.609	2020-01-01	2020-01-02	2020-01-01 00:11:38	2020-01-02 03:39:59	2020-01-01 00:11:38.000	2020-01-02 03:39:59.000	698	99599	50148.5	5014850	698	99599	50148.5	5014850	-32472	32666	4928.66	492866	-128	123	-1.9	-190
+699	2	10689	99600	2.09909	299.09909	150.59909	15059.9099	2.09909	299.0991	150.5991	15059.91003	2.09909	299.09909	150.59909	15059.909	2020-01-01	2020-01-02	2020-01-01 00:11:39	2020-01-02 03:40:00	2020-01-01 00:11:39.000	2020-01-02 03:40:00.000	699	99600	50149.5	5014950	699	99600	50149.5	5014950	-32471	32667	4929.66	492966	-127	124	-0.9	-90
 7	2	1006	9997	0.02102	300.02102	150.02102	15152.12312	0.02102	300.02103	150.02102	15152.12342	0.02102	300.02102	150.02102000000002	15152.12302	2020-01-01	2020-01-02	2020-01-01 00:00:07	2020-01-02 03:45:07	2020-01-01 00:00:07.000	2020-01-02 03:45:07.000	7	99907	49957	5045657	7	99907	49957	5045657	-32562	32373	4536.009900990099	458137	-126	125	-1.0198019801980198	-103
 70	2	10060	99970	0.21021	300.21021	150.21021	15171.23123	0.21021	300.2102	150.2102	15171.23097	0.21021	300.21021	150.21021	15171.23121	2020-01-01	2020-01-02	2020-01-01 00:01:10	2020-01-02 03:46:10	2020-01-01 00:01:10.000	2020-01-02 03:46:10.000	70	99970	50020	5052020	70	99970	50020	5052020	-32499	32436	4599.009900990099	464500	-126	126	-1.386138613861386	-140
-700	2	10690	99601	2.1021	299.1021	150.6021	15060.21021	2.1021	299.1021	150.6021	15060.21014	2.10210	299.10210	150.60209999999998	15060.21000	2020-01-01	2020-01-02	2020-01-01 00:11:40	2020-01-02 03:40:01	2020-01-01 00:11:40.000	2020-01-02 03:40:01.000	700	99601	50150.5	5015050	700	99601	50150.5	5015050	-32470	32668	4930.66	493066	-126	125	0.1	10
-701	2	10691	99602	2.1051	299.1051	150.6051	15060.51051	2.1051	299.1051	150.6051	15060.51031	2.10510	299.10510	150.6051	15060.51000	2020-01-01	2020-01-02	2020-01-01 00:11:41	2020-01-02 03:40:02	2020-01-01 00:11:41.000	2020-01-02 03:40:02.000	701	99602	50151.5	5015150	701	99602	50151.5	5015150	-32469	32669	4931.66	493166	-125	126	1.1	110
-702	2	10692	99603	2.1081	299.1081	150.6081	15060.81081	2.1081	299.1081	150.6081	15060.81062	2.10810	299.10810	150.6081	15060.81000	2020-01-01	2020-01-02	2020-01-01 00:11:42	2020-01-02 03:40:03	2020-01-01 00:11:42.000	2020-01-02 03:40:03.000	702	99603	50152.5	5015250	702	99603	50152.5	5015250	-32468	32670	4932.66	493266	-124	127	2.1	210
-703	2	10693	99604	2.11111	299.11111	150.61111	15061.11111	2.11111	299.1111	150.61111	15061.11137	2.11111	299.11111	150.61111	15061.11100	2020-01-01	2020-01-02	2020-01-01 00:11:43	2020-01-02 03:40:04	2020-01-01 00:11:43.000	2020-01-02 03:40:04.000	703	99604	50153.5	5015350	703	99604	50153.5	5015350	-32467	32671	4933.66	493366	-128	127	0.54	54
-704	2	10694	99605	2.11411	299.11411	150.61411	15061.41141	2.11411	299.1141	150.61411	15061.41151	2.11411	299.11411	150.61411	15061.41100	2020-01-01	2020-01-02	2020-01-01 00:11:44	2020-01-02 03:40:05	2020-01-01 00:11:44.000	2020-01-02 03:40:05.000	704	99605	50154.5	5015450	704	99605	50154.5	5015450	-32466	32672	4934.66	493466	-128	123	-1.02	-102
-705	2	10695	99606	2.11711	299.11711	150.61711	15061.71171	2.11711	299.11713	150.61711	15061.71165	2.11711	299.11711	150.61711	15061.71100	2020-01-01	2020-01-02	2020-01-01 00:11:45	2020-01-02 03:40:06	2020-01-01 00:11:45.000	2020-01-02 03:40:06.000	705	99606	50155.5	5015550	705	99606	50155.5	5015550	-32465	32673	4935.66	493566	-127	124	-0.02	-2
-706	2	10696	99607	2.12012	299.12012	150.62012	15062.01201	2.12012	299.12012	150.62011	15062.01179	2.12012	299.12012	150.62012000000001	15062.01200	2020-01-01	2020-01-02	2020-01-01 00:11:46	2020-01-02 03:40:07	2020-01-01 00:11:46.000	2020-01-02 03:40:07.000	706	99607	50156.5	5015650	706	99607	50156.5	5015650	-32464	32674	4936.66	493666	-126	125	0.98	98
-707	2	10697	99608	2.12312	299.12312	150.62312	15062.31231	2.12312	299.1231	150.62312	15062.31208	2.12312	299.12312	150.62312	15062.31200	2020-01-01	2020-01-02	2020-01-01 00:11:47	2020-01-02 03:40:08	2020-01-01 00:11:47.000	2020-01-02 03:40:08.000	707	99608	50157.5	5015750	707	99608	50157.5	5015750	-32463	32675	4937.66	493766	-125	126	1.98	198
-708	2	10698	99609	2.12612	299.12612	150.62612	15062.61261	2.12612	299.12613	150.62612	15062.61283	2.12612	299.12612	150.62612	15062.61200	2020-01-01	2020-01-02	2020-01-01 00:11:48	2020-01-02 03:40:09	2020-01-01 00:11:48.000	2020-01-02 03:40:09.000	708	99609	50158.5	5015850	708	99609	50158.5	5015850	-32462	32676	4938.66	493866	-124	127	2.98	298
-709	2	10699	99610	2.12912	299.12912	150.62912	15062.91291	2.12912	299.12912	150.62912	15062.91298	2.12912	299.12912	150.62912	15062.91200	2020-01-01	2020-01-02	2020-01-01 00:11:49	2020-01-02 03:40:10	2020-01-01 00:11:49.000	2020-01-02 03:40:10.000	709	99610	50159.5	5015950	709	99610	50159.5	5015950	-32461	32677	4939.66	493966	-128	127	1.42	142
+700	2	10690	99601	2.1021	299.1021	150.6021	15060.21021	2.1021	299.1021	150.6021	15060.21014	2.1021	299.1021	150.60209999999998	15060.21	2020-01-01	2020-01-02	2020-01-01 00:11:40	2020-01-02 03:40:01	2020-01-01 00:11:40.000	2020-01-02 03:40:01.000	700	99601	50150.5	5015050	700	99601	50150.5	5015050	-32470	32668	4930.66	493066	-126	125	0.1	10
+701	2	10691	99602	2.1051	299.1051	150.6051	15060.51051	2.1051	299.1051	150.6051	15060.51031	2.1051	299.1051	150.6051	15060.51	2020-01-01	2020-01-02	2020-01-01 00:11:41	2020-01-02 03:40:02	2020-01-01 00:11:41.000	2020-01-02 03:40:02.000	701	99602	50151.5	5015150	701	99602	50151.5	5015150	-32469	32669	4931.66	493166	-125	126	1.1	110
+702	2	10692	99603	2.1081	299.1081	150.6081	15060.81081	2.1081	299.1081	150.6081	15060.81062	2.1081	299.1081	150.6081	15060.81	2020-01-01	2020-01-02	2020-01-01 00:11:42	2020-01-02 03:40:03	2020-01-01 00:11:42.000	2020-01-02 03:40:03.000	702	99603	50152.5	5015250	702	99603	50152.5	5015250	-32468	32670	4932.66	493266	-124	127	2.1	210
+703	2	10693	99604	2.11111	299.11111	150.61111	15061.11111	2.11111	299.1111	150.61111	15061.11137	2.11111	299.11111	150.61111	15061.111	2020-01-01	2020-01-02	2020-01-01 00:11:43	2020-01-02 03:40:04	2020-01-01 00:11:43.000	2020-01-02 03:40:04.000	703	99604	50153.5	5015350	703	99604	50153.5	5015350	-32467	32671	4933.66	493366	-128	127	0.54	54
+704	2	10694	99605	2.11411	299.11411	150.61411	15061.41141	2.11411	299.1141	150.61411	15061.41151	2.11411	299.11411	150.61411	15061.411	2020-01-01	2020-01-02	2020-01-01 00:11:44	2020-01-02 03:40:05	2020-01-01 00:11:44.000	2020-01-02 03:40:05.000	704	99605	50154.5	5015450	704	99605	50154.5	5015450	-32466	32672	4934.66	493466	-128	123	-1.02	-102
+705	2	10695	99606	2.11711	299.11711	150.61711	15061.71171	2.11711	299.11713	150.61711	15061.71165	2.11711	299.11711	150.61711	15061.711	2020-01-01	2020-01-02	2020-01-01 00:11:45	2020-01-02 03:40:06	2020-01-01 00:11:45.000	2020-01-02 03:40:06.000	705	99606	50155.5	5015550	705	99606	50155.5	5015550	-32465	32673	4935.66	493566	-127	124	-0.02	-2
+706	2	10696	99607	2.12012	299.12012	150.62012	15062.01201	2.12012	299.12012	150.62011	15062.01179	2.12012	299.12012	150.62012000000001	15062.012	2020-01-01	2020-01-02	2020-01-01 00:11:46	2020-01-02 03:40:07	2020-01-01 00:11:46.000	2020-01-02 03:40:07.000	706	99607	50156.5	5015650	706	99607	50156.5	5015650	-32464	32674	4936.66	493666	-126	125	0.98	98
+707	2	10697	99608	2.12312	299.12312	150.62312	15062.31231	2.12312	299.1231	150.62312	15062.31208	2.12312	299.12312	150.62312	15062.312	2020-01-01	2020-01-02	2020-01-01 00:11:47	2020-01-02 03:40:08	2020-01-01 00:11:47.000	2020-01-02 03:40:08.000	707	99608	50157.5	5015750	707	99608	50157.5	5015750	-32463	32675	4937.66	493766	-125	126	1.98	198
+708	2	10698	99609	2.12612	299.12612	150.62612	15062.61261	2.12612	299.12613	150.62612	15062.61283	2.12612	299.12612	150.62612	15062.612	2020-01-01	2020-01-02	2020-01-01 00:11:48	2020-01-02 03:40:09	2020-01-01 00:11:48.000	2020-01-02 03:40:09.000	708	99609	50158.5	5015850	708	99609	50158.5	5015850	-32462	32676	4938.66	493866	-124	127	2.98	298
+709	2	10699	99610	2.12912	299.12912	150.62912	15062.91291	2.12912	299.12912	150.62912	15062.91298	2.12912	299.12912	150.62912	15062.912	2020-01-01	2020-01-02	2020-01-01 00:11:49	2020-01-02 03:40:10	2020-01-01 00:11:49.000	2020-01-02 03:40:10.000	709	99610	50159.5	5015950	709	99610	50159.5	5015950	-32461	32677	4939.66	493966	-128	127	1.42	142
 71	2	10061	99971	0.21321	300.21321	150.21321	15171.53453	0.21321	300.21323	150.21321	15171.5346	0.21321	300.21321	150.21321	15171.53421	2020-01-01	2020-01-02	2020-01-01 00:01:11	2020-01-02 03:46:11	2020-01-01 00:01:11.000	2020-01-02 03:46:11.000	71	99971	50021	5052121	71	99971	50021	5052121	-32498	32437	4600.009900990099	464601	-125	127	-0.38613861386138615	-39
-710	2	10700	99611	2.13213	299.13213	150.63213	15063.21321	2.13213	299.13214	150.63213	15063.21311	2.13213	299.13213	150.63213	15063.21300	2020-01-01	2020-01-02	2020-01-01 00:11:50	2020-01-02 03:40:11	2020-01-01 00:11:50.000	2020-01-02 03:40:11.000	710	99611	50160.5	5016050	710	99611	50160.5	5016050	-32460	32678	4940.66	494066	-128	127	-0.14	-14
-711	2	10701	99612	2.13513	299.13513	150.63513	15063.51351	2.13513	299.13513	150.63513	15063.51325	2.13513	299.13513	150.63513	15063.51300	2020-01-01	2020-01-02	2020-01-01 00:11:51	2020-01-02 03:40:12	2020-01-01 00:11:51.000	2020-01-02 03:40:12.000	711	99612	50161.5	5016150	711	99612	50161.5	5016150	-32459	32679	4941.66	494166	-128	124	-1.7	-170
-712	2	10702	99613	2.13813	299.13813	150.63813	15063.81381	2.13813	299.13815	150.63814	15063.81401	2.13813	299.13813	150.63813	15063.81300	2020-01-01	2020-01-02	2020-01-01 00:11:52	2020-01-02 03:40:13	2020-01-01 00:11:52.000	2020-01-02 03:40:13.000	712	99613	50162.5	5016250	712	99613	50162.5	5016250	-32458	32680	4942.66	494266	-127	125	-0.7	-70
-713	2	10703	99614	2.14114	299.14114	150.64114	15064.11411	2.14114	299.14114	150.64114	15064.11431	2.14114	299.14114	150.64114	15064.11400	2020-01-01	2020-01-02	2020-01-01 00:11:53	2020-01-02 03:40:14	2020-01-01 00:11:53.000	2020-01-02 03:40:14.000	713	99614	50163.5	5016350	713	99614	50163.5	5016350	-32457	32681	4943.66	494366	-126	126	0.3	30
-714	2	10704	99615	2.14414	299.14414	150.64414	15064.41441	2.14414	299.14413	150.64414	15064.41448	2.14414	299.14414	150.64414	15064.41400	2020-01-01	2020-01-02	2020-01-01 00:11:54	2020-01-02 03:40:15	2020-01-01 00:11:54.000	2020-01-02 03:40:15.000	714	99615	50164.5	5016450	714	99615	50164.5	5016450	-32456	32682	4944.66	494466	-125	127	1.3	130
-715	2	10705	99616	2.14714	299.14714	150.64714	15064.71471	2.14714	299.14716	150.64714	15064.71458	2.14714	299.14714	150.64714	15064.71400	2020-01-01	2020-01-02	2020-01-01 00:11:55	2020-01-02 03:40:16	2020-01-01 00:11:55.000	2020-01-02 03:40:16.000	715	99616	50165.5	5016550	715	99616	50165.5	5016550	-32455	32683	4945.66	494566	-128	127	-0.26	-26
-716	2	10706	99617	2.15015	299.15015	150.65015	15065.01501	2.15015	299.15015	150.65014	15065.01472	2.15015	299.15015	150.65015	15065.01500	2020-01-01	2020-01-02	2020-01-01 00:11:56	2020-01-02 03:40:17	2020-01-01 00:11:56.000	2020-01-02 03:40:17.000	716	99617	50166.5	5016650	716	99617	50166.5	5016650	-32454	32684	4946.66	494666	-128	127	-1.82	-182
-717	2	10707	99618	2.15315	299.15315	150.65315	15065.31531	2.15315	299.15317	150.65315	15065.31547	2.15315	299.15315	150.65315	15065.31500	2020-01-01	2020-01-02	2020-01-01 00:11:57	2020-01-02 03:40:18	2020-01-01 00:11:57.000	2020-01-02 03:40:18.000	717	99618	50167.5	5016750	717	99618	50167.5	5016750	-32453	32685	4947.66	494766	-128	123	-3.38	-338
-718	2	10708	99619	2.15615	299.15615	150.65615	15065.61561	2.15615	299.15616	150.65615	15065.61578	2.15615	299.15615	150.65615	15065.61500	2020-01-01	2020-01-02	2020-01-01 00:11:58	2020-01-02 03:40:19	2020-01-01 00:11:58.000	2020-01-02 03:40:19.000	718	99619	50168.5	5016850	718	99619	50168.5	5016850	-32452	32686	4948.66	494866	-127	124	-2.38	-238
-719	2	10709	99620	2.15915	299.15915	150.65915	15065.91591	2.15915	299.15915	150.65915	15065.91595	2.15915	299.15915	150.65915	15065.91500	2020-01-01	2020-01-02	2020-01-01 00:11:59	2020-01-02 03:40:20	2020-01-01 00:11:59.000	2020-01-02 03:40:20.000	719	99620	50169.5	5016950	719	99620	50169.5	5016950	-32451	32687	4949.66	494966	-126	125	-1.38	-138
+710	2	10700	99611	2.13213	299.13213	150.63213	15063.21321	2.13213	299.13214	150.63213	15063.21311	2.13213	299.13213	150.63213	15063.213	2020-01-01	2020-01-02	2020-01-01 00:11:50	2020-01-02 03:40:11	2020-01-01 00:11:50.000	2020-01-02 03:40:11.000	710	99611	50160.5	5016050	710	99611	50160.5	5016050	-32460	32678	4940.66	494066	-128	127	-0.14	-14
+711	2	10701	99612	2.13513	299.13513	150.63513	15063.51351	2.13513	299.13513	150.63513	15063.51325	2.13513	299.13513	150.63513	15063.513	2020-01-01	2020-01-02	2020-01-01 00:11:51	2020-01-02 03:40:12	2020-01-01 00:11:51.000	2020-01-02 03:40:12.000	711	99612	50161.5	5016150	711	99612	50161.5	5016150	-32459	32679	4941.66	494166	-128	124	-1.7	-170
+712	2	10702	99613	2.13813	299.13813	150.63813	15063.81381	2.13813	299.13815	150.63814	15063.81401	2.13813	299.13813	150.63813	15063.813	2020-01-01	2020-01-02	2020-01-01 00:11:52	2020-01-02 03:40:13	2020-01-01 00:11:52.000	2020-01-02 03:40:13.000	712	99613	50162.5	5016250	712	99613	50162.5	5016250	-32458	32680	4942.66	494266	-127	125	-0.7	-70
+713	2	10703	99614	2.14114	299.14114	150.64114	15064.11411	2.14114	299.14114	150.64114	15064.11431	2.14114	299.14114	150.64114	15064.114	2020-01-01	2020-01-02	2020-01-01 00:11:53	2020-01-02 03:40:14	2020-01-01 00:11:53.000	2020-01-02 03:40:14.000	713	99614	50163.5	5016350	713	99614	50163.5	5016350	-32457	32681	4943.66	494366	-126	126	0.3	30
+714	2	10704	99615	2.14414	299.14414	150.64414	15064.41441	2.14414	299.14413	150.64414	15064.41448	2.14414	299.14414	150.64414	15064.414	2020-01-01	2020-01-02	2020-01-01 00:11:54	2020-01-02 03:40:15	2020-01-01 00:11:54.000	2020-01-02 03:40:15.000	714	99615	50164.5	5016450	714	99615	50164.5	5016450	-32456	32682	4944.66	494466	-125	127	1.3	130
+715	2	10705	99616	2.14714	299.14714	150.64714	15064.71471	2.14714	299.14716	150.64714	15064.71458	2.14714	299.14714	150.64714	15064.714	2020-01-01	2020-01-02	2020-01-01 00:11:55	2020-01-02 03:40:16	2020-01-01 00:11:55.000	2020-01-02 03:40:16.000	715	99616	50165.5	5016550	715	99616	50165.5	5016550	-32455	32683	4945.66	494566	-128	127	-0.26	-26
+716	2	10706	99617	2.15015	299.15015	150.65015	15065.01501	2.15015	299.15015	150.65014	15065.01472	2.15015	299.15015	150.65015	15065.015	2020-01-01	2020-01-02	2020-01-01 00:11:56	2020-01-02 03:40:17	2020-01-01 00:11:56.000	2020-01-02 03:40:17.000	716	99617	50166.5	5016650	716	99617	50166.5	5016650	-32454	32684	4946.66	494666	-128	127	-1.82	-182
+717	2	10707	99618	2.15315	299.15315	150.65315	15065.31531	2.15315	299.15317	150.65315	15065.31547	2.15315	299.15315	150.65315	15065.315	2020-01-01	2020-01-02	2020-01-01 00:11:57	2020-01-02 03:40:18	2020-01-01 00:11:57.000	2020-01-02 03:40:18.000	717	99618	50167.5	5016750	717	99618	50167.5	5016750	-32453	32685	4947.66	494766	-128	123	-3.38	-338
+718	2	10708	99619	2.15615	299.15615	150.65615	15065.61561	2.15615	299.15616	150.65615	15065.61578	2.15615	299.15615	150.65615	15065.615	2020-01-01	2020-01-02	2020-01-01 00:11:58	2020-01-02 03:40:19	2020-01-01 00:11:58.000	2020-01-02 03:40:19.000	718	99619	50168.5	5016850	718	99619	50168.5	5016850	-32452	32686	4948.66	494866	-127	124	-2.38	-238
+719	2	10709	99620	2.15915	299.15915	150.65915	15065.91591	2.15915	299.15915	150.65915	15065.91595	2.15915	299.15915	150.65915	15065.915	2020-01-01	2020-01-02	2020-01-01 00:11:59	2020-01-02 03:40:20	2020-01-01 00:11:59.000	2020-01-02 03:40:20.000	719	99620	50169.5	5016950	719	99620	50169.5	5016950	-32451	32687	4949.66	494966	-126	125	-1.38	-138
 72	2	10062	99972	0.21621	300.21621	150.21621	15171.83783	0.21621	300.21622	150.21621	15171.83791	0.21621	300.21621	150.21621	15171.83721	2020-01-01	2020-01-02	2020-01-01 00:01:12	2020-01-02 03:46:12	2020-01-01 00:01:12.000	2020-01-02 03:46:12.000	72	99972	50022	5052222	72	99972	50022	5052222	-32497	32438	4601.009900990099	464702	-128	127	-1.9207920792079207	-194
-720	2	10710	99621	2.16216	299.16216	150.66216	15066.21621	2.16216	299.16217	150.66216	15066.21606	2.16216	299.16216	150.66216	15066.21600	2020-01-01	2020-01-02	2020-01-01 00:12:00	2020-01-02 03:40:21	2020-01-01 00:12:00.000	2020-01-02 03:40:21.000	720	99621	50170.5	5017050	720	99621	50170.5	5017050	-32450	32688	4950.66	495066	-125	126	-0.38	-38
-721	2	10711	99622	2.16516	299.16516	150.66516	15066.51651	2.16516	299.16516	150.66516	15066.51635	2.16516	299.16516	150.66516	15066.51600	2020-01-01	2020-01-02	2020-01-01 00:12:01	2020-01-02 03:40:22	2020-01-01 00:12:01.000	2020-01-02 03:40:22.000	721	99622	50171.5	5017150	721	99622	50171.5	5017150	-32449	32689	4951.66	495166	-124	127	0.62	62
-722	2	10712	99623	2.16816	299.16816	150.66816	15066.81681	2.16816	299.16818	150.66816	15066.81695	2.16816	299.16816	150.66816	15066.81600	2020-01-01	2020-01-02	2020-01-01 00:12:02	2020-01-02 03:40:23	2020-01-01 00:12:02.000	2020-01-02 03:40:23.000	722	99623	50172.5	5017250	722	99623	50172.5	5017250	-32448	32690	4952.66	495266	-128	127	-0.94	-94
-723	2	10713	99624	2.17117	299.17117	150.67117	15067.11711	2.17117	299.17117	150.67117	15067.11724	2.17117	299.17117	150.67117	15067.11700	2020-01-01	2020-01-02	2020-01-01 00:12:03	2020-01-02 03:40:24	2020-01-01 00:12:03.000	2020-01-02 03:40:24.000	723	99624	50173.5	5017350	723	99624	50173.5	5017350	-32447	32691	4953.66	495366	-128	123	-2.5	-250
-724	2	10714	99625	2.17417	299.17417	150.67417	15067.41741	2.17417	299.17416	150.67417	15067.41742	2.17417	299.17417	150.67417	15067.41700	2020-01-01	2020-01-02	2020-01-01 00:12:04	2020-01-02 03:40:25	2020-01-01 00:12:04.000	2020-01-02 03:40:25.000	724	99625	50174.5	5017450	724	99625	50174.5	5017450	-32446	32692	4954.66	495466	-127	124	-1.5	-150
-725	2	10715	99626	2.17717	299.17717	150.67717	15067.71771	2.17717	299.1772	150.67717	15067.71752	2.17717	299.17717	150.67717000000002	15067.71700	2020-01-01	2020-01-02	2020-01-01 00:12:05	2020-01-02 03:40:26	2020-01-01 00:12:05.000	2020-01-02 03:40:26.000	725	99626	50175.5	5017550	725	99626	50175.5	5017550	-32445	32693	4955.66	495566	-126	125	-0.5	-50
-726	2	10716	99627	2.18018	299.18018	150.68018	15068.01801	2.18018	299.18018	150.68017	15068.01782	2.18018	299.18018	150.68018	15068.01800	2020-01-01	2020-01-02	2020-01-01 00:12:06	2020-01-02 03:40:27	2020-01-01 00:12:06.000	2020-01-02 03:40:27.000	726	99627	50176.5	5017650	726	99627	50176.5	5017650	-32444	32694	4956.66	495666	-125	126	0.5	50
-727	2	10717	99628	2.18318	299.18318	150.68318	15068.31831	2.18318	299.1832	150.68318	15068.31842	2.18318	299.18318	150.68318	15068.31800	2020-01-01	2020-01-02	2020-01-01 00:12:07	2020-01-02 03:40:28	2020-01-01 00:12:07.000	2020-01-02 03:40:28.000	727	99628	50177.5	5017750	727	99628	50177.5	5017750	-32443	32695	4957.66	495766	-124	127	1.5	150
-728	2	10718	99629	2.18618	299.18618	150.68618	15068.61861	2.18618	299.1862	150.68618	15068.61875	2.18618	299.18618	150.68618	15068.61800	2020-01-01	2020-01-02	2020-01-01 00:12:08	2020-01-02 03:40:29	2020-01-01 00:12:08.000	2020-01-02 03:40:29.000	728	99629	50178.5	5017850	728	99629	50178.5	5017850	-32442	32696	4958.66	495866	-128	127	-0.06	-6
-729	2	10719	99630	2.18918	299.18918	150.68918	15068.91891	2.18918	299.18918	150.68918	15068.91889	2.18918	299.18918	150.68918	15068.91800	2020-01-01	2020-01-02	2020-01-01 00:12:09	2020-01-02 03:40:30	2020-01-01 00:12:09.000	2020-01-02 03:40:30.000	729	99630	50179.5	5017950	729	99630	50179.5	5017950	-32441	32697	4959.66	495966	-128	123	-1.62	-162
+720	2	10710	99621	2.16216	299.16216	150.66216	15066.21621	2.16216	299.16217	150.66216	15066.21606	2.16216	299.16216	150.66216	15066.216	2020-01-01	2020-01-02	2020-01-01 00:12:00	2020-01-02 03:40:21	2020-01-01 00:12:00.000	2020-01-02 03:40:21.000	720	99621	50170.5	5017050	720	99621	50170.5	5017050	-32450	32688	4950.66	495066	-125	126	-0.38	-38
+721	2	10711	99622	2.16516	299.16516	150.66516	15066.51651	2.16516	299.16516	150.66516	15066.51635	2.16516	299.16516	150.66516	15066.516	2020-01-01	2020-01-02	2020-01-01 00:12:01	2020-01-02 03:40:22	2020-01-01 00:12:01.000	2020-01-02 03:40:22.000	721	99622	50171.5	5017150	721	99622	50171.5	5017150	-32449	32689	4951.66	495166	-124	127	0.62	62
+722	2	10712	99623	2.16816	299.16816	150.66816	15066.81681	2.16816	299.16818	150.66816	15066.81695	2.16816	299.16816	150.66816	15066.816	2020-01-01	2020-01-02	2020-01-01 00:12:02	2020-01-02 03:40:23	2020-01-01 00:12:02.000	2020-01-02 03:40:23.000	722	99623	50172.5	5017250	722	99623	50172.5	5017250	-32448	32690	4952.66	495266	-128	127	-0.94	-94
+723	2	10713	99624	2.17117	299.17117	150.67117	15067.11711	2.17117	299.17117	150.67117	15067.11724	2.17117	299.17117	150.67117	15067.117	2020-01-01	2020-01-02	2020-01-01 00:12:03	2020-01-02 03:40:24	2020-01-01 00:12:03.000	2020-01-02 03:40:24.000	723	99624	50173.5	5017350	723	99624	50173.5	5017350	-32447	32691	4953.66	495366	-128	123	-2.5	-250
+724	2	10714	99625	2.17417	299.17417	150.67417	15067.41741	2.17417	299.17416	150.67417	15067.41742	2.17417	299.17417	150.67417	15067.417	2020-01-01	2020-01-02	2020-01-01 00:12:04	2020-01-02 03:40:25	2020-01-01 00:12:04.000	2020-01-02 03:40:25.000	724	99625	50174.5	5017450	724	99625	50174.5	5017450	-32446	32692	4954.66	495466	-127	124	-1.5	-150
+725	2	10715	99626	2.17717	299.17717	150.67717	15067.71771	2.17717	299.1772	150.67717	15067.71752	2.17717	299.17717	150.67717000000002	15067.717	2020-01-01	2020-01-02	2020-01-01 00:12:05	2020-01-02 03:40:26	2020-01-01 00:12:05.000	2020-01-02 03:40:26.000	725	99626	50175.5	5017550	725	99626	50175.5	5017550	-32445	32693	4955.66	495566	-126	125	-0.5	-50
+726	2	10716	99627	2.18018	299.18018	150.68018	15068.01801	2.18018	299.18018	150.68017	15068.01782	2.18018	299.18018	150.68018	15068.018	2020-01-01	2020-01-02	2020-01-01 00:12:06	2020-01-02 03:40:27	2020-01-01 00:12:06.000	2020-01-02 03:40:27.000	726	99627	50176.5	5017650	726	99627	50176.5	5017650	-32444	32694	4956.66	495666	-125	126	0.5	50
+727	2	10717	99628	2.18318	299.18318	150.68318	15068.31831	2.18318	299.1832	150.68318	15068.31842	2.18318	299.18318	150.68318	15068.318	2020-01-01	2020-01-02	2020-01-01 00:12:07	2020-01-02 03:40:28	2020-01-01 00:12:07.000	2020-01-02 03:40:28.000	727	99628	50177.5	5017750	727	99628	50177.5	5017750	-32443	32695	4957.66	495766	-124	127	1.5	150
+728	2	10718	99629	2.18618	299.18618	150.68618	15068.61861	2.18618	299.1862	150.68618	15068.61875	2.18618	299.18618	150.68618	15068.618	2020-01-01	2020-01-02	2020-01-01 00:12:08	2020-01-02 03:40:29	2020-01-01 00:12:08.000	2020-01-02 03:40:29.000	728	99629	50178.5	5017850	728	99629	50178.5	5017850	-32442	32696	4958.66	495866	-128	127	-0.06	-6
+729	2	10719	99630	2.18918	299.18918	150.68918	15068.91891	2.18918	299.18918	150.68918	15068.91889	2.18918	299.18918	150.68918	15068.918	2020-01-01	2020-01-02	2020-01-01 00:12:09	2020-01-02 03:40:30	2020-01-01 00:12:09.000	2020-01-02 03:40:30.000	729	99630	50179.5	5017950	729	99630	50179.5	5017950	-32441	32697	4959.66	495966	-128	123	-1.62	-162
 73	2	10063	99973	0.21921	300.21921	150.21921	15172.14114	0.21921	300.2192	150.21921	15172.14121	0.21921	300.21921	150.21921	15172.14021	2020-01-01	2020-01-02	2020-01-01 00:01:13	2020-01-02 03:46:13	2020-01-01 00:01:13.000	2020-01-02 03:46:13.000	73	99973	50023	5052323	73	99973	50023	5052323	-32496	32439	4602.009900990099	464803	-128	127	-3.4554455445544554	-349
-730	2	10720	99631	2.19219	299.19219	150.69219	15069.21921	2.19219	299.1922	150.69219	15069.21965	2.19219	299.19219	150.69218999999998	15069.21900	2020-01-01	2020-01-02	2020-01-01 00:12:10	2020-01-02 03:40:31	2020-01-01 00:12:10.000	2020-01-02 03:40:31.000	730	99631	50180.5	5018050	730	99631	50180.5	5018050	-32440	32698	4960.66	496066	-127	124	-0.62	-62
-731	2	10721	99632	2.19519	299.19519	150.69519	15069.51951	2.19519	299.1952	150.69519	15069.51928	2.19519	299.19519	150.69519	15069.51900	2020-01-01	2020-01-02	2020-01-01 00:12:11	2020-01-02 03:40:32	2020-01-01 00:12:11.000	2020-01-02 03:40:32.000	731	99632	50181.5	5018150	731	99632	50181.5	5018150	-32439	32699	4961.66	496166	-126	125	0.38	38
-732	2	10722	99633	2.19819	299.19819	150.69819	15069.81981	2.19819	299.1982	150.69819	15069.81988	2.19819	299.19819	150.69818999999998	15069.81900	2020-01-01	2020-01-02	2020-01-01 00:12:12	2020-01-02 03:40:33	2020-01-01 00:12:12.000	2020-01-02 03:40:33.000	732	99633	50182.5	5018250	732	99633	50182.5	5018250	-32438	32700	4962.66	496266	-125	126	1.38	138
-733	2	10723	99634	2.2012	299.2012	150.7012	15070.12012	2.2012	299.2012	150.7012	15070.12022	2.20120	299.20120	150.7012	15070.12000	2020-01-01	2020-01-02	2020-01-01 00:12:13	2020-01-02 03:40:34	2020-01-01 00:12:13.000	2020-01-02 03:40:34.000	733	99634	50183.5	5018350	733	99634	50183.5	5018350	-32437	32701	4963.66	496366	-124	127	2.38	238
-734	2	10724	99635	2.2042	299.2042	150.7042	15070.42042	2.2042	299.2042	150.7042	15070.42036	2.20420	299.20420	150.70420000000001	15070.42000	2020-01-01	2020-01-02	2020-01-01 00:12:14	2020-01-02 03:40:35	2020-01-01 00:12:14.000	2020-01-02 03:40:35.000	734	99635	50184.5	5018450	734	99635	50184.5	5018450	-32436	32702	4964.66	496466	-128	127	0.82	82
-735	2	10725	99636	2.2072	299.2072	150.7072	15070.72072	2.2072	299.2072	150.70721	15070.72111	2.20720	299.20720	150.7072	15070.72000	2020-01-01	2020-01-02	2020-01-01 00:12:15	2020-01-02 03:40:36	2020-01-01 00:12:15.000	2020-01-02 03:40:36.000	735	99636	50185.5	5018550	735	99636	50185.5	5018550	-32435	32703	4965.66	496566	-128	127	-0.74	-74
-736	2	10726	99637	2.21021	299.21021	150.71021	15071.02102	2.21021	299.2102	150.7102	15071.02076	2.21021	299.21021	150.71021000000002	15071.02100	2020-01-01	2020-01-02	2020-01-01 00:12:16	2020-01-02 03:40:37	2020-01-01 00:12:16.000	2020-01-02 03:40:37.000	736	99637	50186.5	5018650	736	99637	50186.5	5018650	-32434	32704	4966.66	496666	-128	124	-2.3	-230
-737	2	10727	99638	2.21321	299.21321	150.71321	15071.32132	2.21321	299.21323	150.71321	15071.32139	2.21321	299.21321	150.71321	15071.32100	2020-01-01	2020-01-02	2020-01-01 00:12:17	2020-01-02 03:40:38	2020-01-01 00:12:17.000	2020-01-02 03:40:38.000	737	99638	50187.5	5018750	737	99638	50187.5	5018750	-32433	32705	4967.66	496766	-127	125	-1.3	-130
-738	2	10728	99639	2.21621	299.21621	150.71621	15071.62162	2.21621	299.21622	150.71621	15071.62169	2.21621	299.21621	150.71621	15071.62100	2020-01-01	2020-01-02	2020-01-01 00:12:18	2020-01-02 03:40:39	2020-01-01 00:12:18.000	2020-01-02 03:40:39.000	738	99639	50188.5	5018850	738	99639	50188.5	5018850	-32432	32706	4968.66	496866	-126	126	-0.3	-30
-739	2	10729	99640	2.21921	299.21921	150.71921	15071.92192	2.21921	299.2192	150.71921	15071.92199	2.21921	299.21921	150.71921	15071.92100	2020-01-01	2020-01-02	2020-01-01 00:12:19	2020-01-02 03:40:40	2020-01-01 00:12:19.000	2020-01-02 03:40:40.000	739	99640	50189.5	5018950	739	99640	50189.5	5018950	-32431	32707	4969.66	496966	-125	127	0.7	70
+730	2	10720	99631	2.19219	299.19219	150.69219	15069.21921	2.19219	299.1922	150.69219	15069.21965	2.19219	299.19219	150.69218999999998	15069.219	2020-01-01	2020-01-02	2020-01-01 00:12:10	2020-01-02 03:40:31	2020-01-01 00:12:10.000	2020-01-02 03:40:31.000	730	99631	50180.5	5018050	730	99631	50180.5	5018050	-32440	32698	4960.66	496066	-127	124	-0.62	-62
+731	2	10721	99632	2.19519	299.19519	150.69519	15069.51951	2.19519	299.1952	150.69519	15069.51928	2.19519	299.19519	150.69519	15069.519	2020-01-01	2020-01-02	2020-01-01 00:12:11	2020-01-02 03:40:32	2020-01-01 00:12:11.000	2020-01-02 03:40:32.000	731	99632	50181.5	5018150	731	99632	50181.5	5018150	-32439	32699	4961.66	496166	-126	125	0.38	38
+732	2	10722	99633	2.19819	299.19819	150.69819	15069.81981	2.19819	299.1982	150.69819	15069.81988	2.19819	299.19819	150.69818999999998	15069.819	2020-01-01	2020-01-02	2020-01-01 00:12:12	2020-01-02 03:40:33	2020-01-01 00:12:12.000	2020-01-02 03:40:33.000	732	99633	50182.5	5018250	732	99633	50182.5	5018250	-32438	32700	4962.66	496266	-125	126	1.38	138
+733	2	10723	99634	2.2012	299.2012	150.7012	15070.12012	2.2012	299.2012	150.7012	15070.12022	2.2012	299.2012	150.7012	15070.12	2020-01-01	2020-01-02	2020-01-01 00:12:13	2020-01-02 03:40:34	2020-01-01 00:12:13.000	2020-01-02 03:40:34.000	733	99634	50183.5	5018350	733	99634	50183.5	5018350	-32437	32701	4963.66	496366	-124	127	2.38	238
+734	2	10724	99635	2.2042	299.2042	150.7042	15070.42042	2.2042	299.2042	150.7042	15070.42036	2.2042	299.2042	150.70420000000001	15070.42	2020-01-01	2020-01-02	2020-01-01 00:12:14	2020-01-02 03:40:35	2020-01-01 00:12:14.000	2020-01-02 03:40:35.000	734	99635	50184.5	5018450	734	99635	50184.5	5018450	-32436	32702	4964.66	496466	-128	127	0.82	82
+735	2	10725	99636	2.2072	299.2072	150.7072	15070.72072	2.2072	299.2072	150.70721	15070.72111	2.2072	299.2072	150.7072	15070.72	2020-01-01	2020-01-02	2020-01-01 00:12:15	2020-01-02 03:40:36	2020-01-01 00:12:15.000	2020-01-02 03:40:36.000	735	99636	50185.5	5018550	735	99636	50185.5	5018550	-32435	32703	4965.66	496566	-128	127	-0.74	-74
+736	2	10726	99637	2.21021	299.21021	150.71021	15071.02102	2.21021	299.2102	150.7102	15071.02076	2.21021	299.21021	150.71021000000002	15071.021	2020-01-01	2020-01-02	2020-01-01 00:12:16	2020-01-02 03:40:37	2020-01-01 00:12:16.000	2020-01-02 03:40:37.000	736	99637	50186.5	5018650	736	99637	50186.5	5018650	-32434	32704	4966.66	496666	-128	124	-2.3	-230
+737	2	10727	99638	2.21321	299.21321	150.71321	15071.32132	2.21321	299.21323	150.71321	15071.32139	2.21321	299.21321	150.71321	15071.321	2020-01-01	2020-01-02	2020-01-01 00:12:17	2020-01-02 03:40:38	2020-01-01 00:12:17.000	2020-01-02 03:40:38.000	737	99638	50187.5	5018750	737	99638	50187.5	5018750	-32433	32705	4967.66	496766	-127	125	-1.3	-130
+738	2	10728	99639	2.21621	299.21621	150.71621	15071.62162	2.21621	299.21622	150.71621	15071.62169	2.21621	299.21621	150.71621	15071.621	2020-01-01	2020-01-02	2020-01-01 00:12:18	2020-01-02 03:40:39	2020-01-01 00:12:18.000	2020-01-02 03:40:39.000	738	99639	50188.5	5018850	738	99639	50188.5	5018850	-32432	32706	4968.66	496866	-126	126	-0.3	-30
+739	2	10729	99640	2.21921	299.21921	150.71921	15071.92192	2.21921	299.2192	150.71921	15071.92199	2.21921	299.21921	150.71921	15071.921	2020-01-01	2020-01-02	2020-01-01 00:12:19	2020-01-02 03:40:40	2020-01-01 00:12:19.000	2020-01-02 03:40:40.000	739	99640	50189.5	5018950	739	99640	50189.5	5018950	-32431	32707	4969.66	496966	-125	127	0.7	70
 74	2	10064	99974	0.22222	300.22222	150.22222	15172.44444	0.22222	300.22223	150.22222	15172.4448	0.22222	300.22222	150.22222	15172.44422	2020-01-01	2020-01-02	2020-01-01 00:01:14	2020-01-02 03:46:14	2020-01-01 00:01:14.000	2020-01-02 03:46:14.000	74	99974	50024	5052424	74	99974	50024	5052424	-32495	32440	4603.009900990099	464904	-128	123	-4.99009900990099	-504
-740	2	10730	99641	2.22222	299.22222	150.72222	15072.22222	2.22222	299.22223	150.72222	15072.22258	2.22222	299.22222	150.72222	15072.22200	2020-01-01	2020-01-02	2020-01-01 00:12:20	2020-01-02 03:40:41	2020-01-01 00:12:20.000	2020-01-02 03:40:41.000	740	99641	50190.5	5019050	740	99641	50190.5	5019050	-32430	32708	4970.66	497066	-128	127	-0.86	-86
-741	2	10731	99642	2.22522	299.22522	150.72522	15072.52252	2.22522	299.22522	150.72522	15072.52223	2.22522	299.22522	150.72522	15072.52200	2020-01-01	2020-01-02	2020-01-01 00:12:21	2020-01-02 03:40:42	2020-01-01 00:12:21.000	2020-01-02 03:40:42.000	741	99642	50191.5	5019150	741	99642	50191.5	5019150	-32429	32709	4971.66	497166	-128	127	-2.42	-242
-742	2	10732	99643	2.22822	299.22822	150.72822	15072.82282	2.22822	299.22824	150.72822	15072.82286	2.22822	299.22822	150.72822	15072.82200	2020-01-01	2020-01-02	2020-01-01 00:12:22	2020-01-02 03:40:43	2020-01-01 00:12:22.000	2020-01-02 03:40:43.000	742	99643	50192.5	5019250	742	99643	50192.5	5019250	-32428	32710	4972.66	497266	-128	123	-3.98	-398
-743	2	10733	99644	2.23123	299.23123	150.73123	15073.12312	2.23123	299.23123	150.73123	15073.12316	2.23123	299.23123	150.73122999999998	15073.12300	2020-01-01	2020-01-02	2020-01-01 00:12:23	2020-01-02 03:40:44	2020-01-01 00:12:23.000	2020-01-02 03:40:44.000	743	99644	50193.5	5019350	743	99644	50193.5	5019350	-32427	32711	4973.66	497366	-127	124	-2.98	-298
-744	2	10734	99645	2.23423	299.23423	150.73423	15073.42342	2.23423	299.23422	150.73423	15073.42345	2.23423	299.23423	150.73423	15073.42300	2020-01-01	2020-01-02	2020-01-01 00:12:24	2020-01-02 03:40:45	2020-01-01 00:12:24.000	2020-01-02 03:40:45.000	744	99645	50194.5	5019450	744	99645	50194.5	5019450	-32426	32712	4974.66	497466	-126	125	-1.98	-198
-745	2	10735	99646	2.23723	299.23723	150.73723	15073.72372	2.23723	299.23724	150.73724	15073.72405	2.23723	299.23723	150.73723	15073.72300	2020-01-01	2020-01-02	2020-01-01 00:12:25	2020-01-02 03:40:46	2020-01-01 00:12:25.000	2020-01-02 03:40:46.000	745	99646	50195.5	5019550	745	99646	50195.5	5019550	-32425	32713	4975.66	497566	-125	126	-0.98	-98
-746	2	10736	99647	2.24024	299.24024	150.74024	15074.02402	2.24024	299.24023	150.74023	15074.02373	2.24024	299.24024	150.74024	15074.02400	2020-01-01	2020-01-02	2020-01-01 00:12:26	2020-01-02 03:40:47	2020-01-01 00:12:26.000	2020-01-02 03:40:47.000	746	99647	50196.5	5019650	746	99647	50196.5	5019650	-32424	32714	4976.66	497666	-124	127	0.02	2
-747	2	10737	99648	2.24324	299.24324	150.74324	15074.32432	2.24324	299.24326	150.74324	15074.32433	2.24324	299.24324	150.74324000000001	15074.32400	2020-01-01	2020-01-02	2020-01-01 00:12:27	2020-01-02 03:40:48	2020-01-01 00:12:27.000	2020-01-02 03:40:48.000	747	99648	50197.5	5019750	747	99648	50197.5	5019750	-32423	32715	4977.66	497766	-128	127	-1.54	-154
-748	2	10738	99649	2.24624	299.24624	150.74624	15074.62462	2.24624	299.24625	150.74624	15074.62463	2.24624	299.24624	150.74624	15074.62400	2020-01-01	2020-01-02	2020-01-01 00:12:28	2020-01-02 03:40:49	2020-01-01 00:12:28.000	2020-01-02 03:40:49.000	748	99649	50198.5	5019850	748	99649	50198.5	5019850	-32422	32716	4978.66	497866	-128	123	-3.1	-310
-749	2	10739	99650	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924000000001	15074.92400	2020-01-01	2020-01-02	2020-01-01 00:12:29	2020-01-02 03:40:50	2020-01-01 00:12:29.000	2020-01-02 03:40:50.000	749	99650	50199.5	5019950	749	99650	50199.5	5019950	-32421	32717	4979.66	497966	-127	124	-2.1	-210
+740	2	10730	99641	2.22222	299.22222	150.72222	15072.22222	2.22222	299.22223	150.72222	15072.22258	2.22222	299.22222	150.72222	15072.222	2020-01-01	2020-01-02	2020-01-01 00:12:20	2020-01-02 03:40:41	2020-01-01 00:12:20.000	2020-01-02 03:40:41.000	740	99641	50190.5	5019050	740	99641	50190.5	5019050	-32430	32708	4970.66	497066	-128	127	-0.86	-86
+741	2	10731	99642	2.22522	299.22522	150.72522	15072.52252	2.22522	299.22522	150.72522	15072.52223	2.22522	299.22522	150.72522	15072.522	2020-01-01	2020-01-02	2020-01-01 00:12:21	2020-01-02 03:40:42	2020-01-01 00:12:21.000	2020-01-02 03:40:42.000	741	99642	50191.5	5019150	741	99642	50191.5	5019150	-32429	32709	4971.66	497166	-128	127	-2.42	-242
+742	2	10732	99643	2.22822	299.22822	150.72822	15072.82282	2.22822	299.22824	150.72822	15072.82286	2.22822	299.22822	150.72822	15072.822	2020-01-01	2020-01-02	2020-01-01 00:12:22	2020-01-02 03:40:43	2020-01-01 00:12:22.000	2020-01-02 03:40:43.000	742	99643	50192.5	5019250	742	99643	50192.5	5019250	-32428	32710	4972.66	497266	-128	123	-3.98	-398
+743	2	10733	99644	2.23123	299.23123	150.73123	15073.12312	2.23123	299.23123	150.73123	15073.12316	2.23123	299.23123	150.73122999999998	15073.123	2020-01-01	2020-01-02	2020-01-01 00:12:23	2020-01-02 03:40:44	2020-01-01 00:12:23.000	2020-01-02 03:40:44.000	743	99644	50193.5	5019350	743	99644	50193.5	5019350	-32427	32711	4973.66	497366	-127	124	-2.98	-298
+744	2	10734	99645	2.23423	299.23423	150.73423	15073.42342	2.23423	299.23422	150.73423	15073.42345	2.23423	299.23423	150.73423	15073.423	2020-01-01	2020-01-02	2020-01-01 00:12:24	2020-01-02 03:40:45	2020-01-01 00:12:24.000	2020-01-02 03:40:45.000	744	99645	50194.5	5019450	744	99645	50194.5	5019450	-32426	32712	4974.66	497466	-126	125	-1.98	-198
+745	2	10735	99646	2.23723	299.23723	150.73723	15073.72372	2.23723	299.23724	150.73724	15073.72405	2.23723	299.23723	150.73723	15073.723	2020-01-01	2020-01-02	2020-01-01 00:12:25	2020-01-02 03:40:46	2020-01-01 00:12:25.000	2020-01-02 03:40:46.000	745	99646	50195.5	5019550	745	99646	50195.5	5019550	-32425	32713	4975.66	497566	-125	126	-0.98	-98
+746	2	10736	99647	2.24024	299.24024	150.74024	15074.02402	2.24024	299.24023	150.74023	15074.02373	2.24024	299.24024	150.74024	15074.024	2020-01-01	2020-01-02	2020-01-01 00:12:26	2020-01-02 03:40:47	2020-01-01 00:12:26.000	2020-01-02 03:40:47.000	746	99647	50196.5	5019650	746	99647	50196.5	5019650	-32424	32714	4976.66	497666	-124	127	0.02	2
+747	2	10737	99648	2.24324	299.24324	150.74324	15074.32432	2.24324	299.24326	150.74324	15074.32433	2.24324	299.24324	150.74324000000001	15074.324	2020-01-01	2020-01-02	2020-01-01 00:12:27	2020-01-02 03:40:48	2020-01-01 00:12:27.000	2020-01-02 03:40:48.000	747	99648	50197.5	5019750	747	99648	50197.5	5019750	-32423	32715	4977.66	497766	-128	127	-1.54	-154
+748	2	10738	99649	2.24624	299.24624	150.74624	15074.62462	2.24624	299.24625	150.74624	15074.62463	2.24624	299.24624	150.74624	15074.624	2020-01-01	2020-01-02	2020-01-01 00:12:28	2020-01-02 03:40:49	2020-01-01 00:12:28.000	2020-01-02 03:40:49.000	748	99649	50198.5	5019850	748	99649	50198.5	5019850	-32422	32716	4978.66	497866	-128	123	-3.1	-310
+749	2	10739	99650	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924	15074.92492	2.24924	299.24924	150.74924000000001	15074.924	2020-01-01	2020-01-02	2020-01-01 00:12:29	2020-01-02 03:40:50	2020-01-01 00:12:29.000	2020-01-02 03:40:50.000	749	99650	50199.5	5019950	749	99650	50199.5	5019950	-32421	32717	4979.66	497966	-127	124	-2.1	-210
 75	2	10065	99975	0.22522	300.22522	150.22522	15172.74774	0.22522	300.22522	150.22522	15172.74745	0.22522	300.22522	150.22521999999998	15172.74722	2020-01-01	2020-01-02	2020-01-01 00:01:15	2020-01-02 03:46:15	2020-01-01 00:01:15.000	2020-01-02 03:46:15.000	75	99975	50025	5052525	75	99975	50025	5052525	-32494	32441	4604.009900990099	465005	-127	124	-3.99009900990099	-403
-750	2	10740	99651	2.25225	299.25225	150.75225	15075.22522	2.25225	299.25226	150.75225	15075.22552	2.25225	299.25225	150.75225	15075.22500	2020-01-01	2020-01-02	2020-01-01 00:12:30	2020-01-02 03:40:51	2020-01-01 00:12:30.000	2020-01-02 03:40:51.000	750	99651	50200.5	5020050	750	99651	50200.5	5020050	-32420	32718	4980.66	498066	-126	125	-1.1	-110
-751	2	10741	99652	2.25525	299.25525	150.75525	15075.52552	2.25525	299.25525	150.75525	15075.5252	2.25525	299.25525	150.75525	15075.52500	2020-01-01	2020-01-02	2020-01-01 00:12:31	2020-01-02 03:40:52	2020-01-01 00:12:31.000	2020-01-02 03:40:52.000	751	99652	50201.5	5020150	751	99652	50201.5	5020150	-32419	32719	4981.66	498166	-125	126	-0.1	-10
-752	2	10742	99653	2.25825	299.25825	150.75825	15075.82582	2.25825	299.25827	150.75825	15075.8258	2.25825	299.25825	150.75825	15075.82500	2020-01-01	2020-01-02	2020-01-01 00:12:32	2020-01-02 03:40:53	2020-01-01 00:12:32.000	2020-01-02 03:40:53.000	752	99653	50202.5	5020250	752	99653	50202.5	5020250	-32418	32720	4982.66	498266	-124	127	0.9	90
-753	2	10743	99654	2.26126	299.26126	150.76126	15076.12612	2.26126	299.26126	150.76126	15076.12609	2.26126	299.26126	150.76126	15076.12600	2020-01-01	2020-01-02	2020-01-01 00:12:33	2020-01-02 03:40:54	2020-01-01 00:12:33.000	2020-01-02 03:40:54.000	753	99654	50203.5	5020350	753	99654	50203.5	5020350	-32417	32721	4983.66	498366	-128	127	-0.66	-66
-754	2	10744	99655	2.26426	299.26426	150.76426	15076.42642	2.26426	299.26425	150.76426	15076.4264	2.26426	299.26426	150.76426	15076.42600	2020-01-01	2020-01-02	2020-01-01 00:12:34	2020-01-02 03:40:55	2020-01-01 00:12:34.000	2020-01-02 03:40:55.000	754	99655	50204.5	5020450	754	99655	50204.5	5020450	-32416	32722	4984.66	498466	-128	123	-2.22	-222
-755	2	10745	99656	2.26726	299.26726	150.76726	15076.72672	2.26726	299.26727	150.76727	15076.72703	2.26726	299.26726	150.76726	15076.72600	2020-01-01	2020-01-02	2020-01-01 00:12:35	2020-01-02 03:40:56	2020-01-01 00:12:35.000	2020-01-02 03:40:56.000	755	99656	50205.5	5020550	755	99656	50205.5	5020550	-32415	32723	4985.66	498566	-127	124	-1.22	-122
-756	2	10746	99657	2.27027	299.27027	150.77027	15077.02702	2.27027	299.27026	150.77026	15077.02667	2.27027	299.27027	150.77027	15077.02700	2020-01-01	2020-01-02	2020-01-01 00:12:36	2020-01-02 03:40:57	2020-01-01 00:12:36.000	2020-01-02 03:40:57.000	756	99657	50206.5	5020650	756	99657	50206.5	5020650	-32414	32724	4986.66	498666	-126	125	-0.22	-22
-757	2	10747	99658	2.27327	299.27327	150.77327	15077.32732	2.27327	299.2733	150.77327	15077.32727	2.27327	299.27327	150.77327	15077.32700	2020-01-01	2020-01-02	2020-01-01 00:12:37	2020-01-02 03:40:58	2020-01-01 00:12:37.000	2020-01-02 03:40:58.000	757	99658	50207.5	5020750	757	99658	50207.5	5020750	-32413	32725	4987.66	498766	-125	126	0.78	78
-758	2	10748	99659	2.27627	299.27627	150.77627	15077.62762	2.27627	299.27628	150.77627	15077.62756	2.27627	299.27627	150.77627	15077.62700	2020-01-01	2020-01-02	2020-01-01 00:12:38	2020-01-02 03:40:59	2020-01-01 00:12:38.000	2020-01-02 03:40:59.000	758	99659	50208.5	5020850	758	99659	50208.5	5020850	-32412	32726	4988.66	498866	-124	127	1.78	178
-759	2	10749	99660	2.27927	299.27927	150.77927	15077.92792	2.27927	299.27927	150.77927	15077.92787	2.27927	299.27927	150.77927	15077.92700	2020-01-01	2020-01-02	2020-01-01 00:12:39	2020-01-02 03:41:00	2020-01-01 00:12:39.000	2020-01-02 03:41:00.000	759	99660	50209.5	5020950	759	99660	50209.5	5020950	-32411	32727	4989.66	498966	-128	127	0.22	22
+750	2	10740	99651	2.25225	299.25225	150.75225	15075.22522	2.25225	299.25226	150.75225	15075.22552	2.25225	299.25225	150.75225	15075.225	2020-01-01	2020-01-02	2020-01-01 00:12:30	2020-01-02 03:40:51	2020-01-01 00:12:30.000	2020-01-02 03:40:51.000	750	99651	50200.5	5020050	750	99651	50200.5	5020050	-32420	32718	4980.66	498066	-126	125	-1.1	-110
+751	2	10741	99652	2.25525	299.25525	150.75525	15075.52552	2.25525	299.25525	150.75525	15075.5252	2.25525	299.25525	150.75525	15075.525	2020-01-01	2020-01-02	2020-01-01 00:12:31	2020-01-02 03:40:52	2020-01-01 00:12:31.000	2020-01-02 03:40:52.000	751	99652	50201.5	5020150	751	99652	50201.5	5020150	-32419	32719	4981.66	498166	-125	126	-0.1	-10
+752	2	10742	99653	2.25825	299.25825	150.75825	15075.82582	2.25825	299.25827	150.75825	15075.8258	2.25825	299.25825	150.75825	15075.825	2020-01-01	2020-01-02	2020-01-01 00:12:32	2020-01-02 03:40:53	2020-01-01 00:12:32.000	2020-01-02 03:40:53.000	752	99653	50202.5	5020250	752	99653	50202.5	5020250	-32418	32720	4982.66	498266	-124	127	0.9	90
+753	2	10743	99654	2.26126	299.26126	150.76126	15076.12612	2.26126	299.26126	150.76126	15076.12609	2.26126	299.26126	150.76126	15076.126	2020-01-01	2020-01-02	2020-01-01 00:12:33	2020-01-02 03:40:54	2020-01-01 00:12:33.000	2020-01-02 03:40:54.000	753	99654	50203.5	5020350	753	99654	50203.5	5020350	-32417	32721	4983.66	498366	-128	127	-0.66	-66
+754	2	10744	99655	2.26426	299.26426	150.76426	15076.42642	2.26426	299.26425	150.76426	15076.4264	2.26426	299.26426	150.76426	15076.426	2020-01-01	2020-01-02	2020-01-01 00:12:34	2020-01-02 03:40:55	2020-01-01 00:12:34.000	2020-01-02 03:40:55.000	754	99655	50204.5	5020450	754	99655	50204.5	5020450	-32416	32722	4984.66	498466	-128	123	-2.22	-222
+755	2	10745	99656	2.26726	299.26726	150.76726	15076.72672	2.26726	299.26727	150.76727	15076.72703	2.26726	299.26726	150.76726	15076.726	2020-01-01	2020-01-02	2020-01-01 00:12:35	2020-01-02 03:40:56	2020-01-01 00:12:35.000	2020-01-02 03:40:56.000	755	99656	50205.5	5020550	755	99656	50205.5	5020550	-32415	32723	4985.66	498566	-127	124	-1.22	-122
+756	2	10746	99657	2.27027	299.27027	150.77027	15077.02702	2.27027	299.27026	150.77026	15077.02667	2.27027	299.27027	150.77027	15077.027	2020-01-01	2020-01-02	2020-01-01 00:12:36	2020-01-02 03:40:57	2020-01-01 00:12:36.000	2020-01-02 03:40:57.000	756	99657	50206.5	5020650	756	99657	50206.5	5020650	-32414	32724	4986.66	498666	-126	125	-0.22	-22
+757	2	10747	99658	2.27327	299.27327	150.77327	15077.32732	2.27327	299.2733	150.77327	15077.32727	2.27327	299.27327	150.77327	15077.327	2020-01-01	2020-01-02	2020-01-01 00:12:37	2020-01-02 03:40:58	2020-01-01 00:12:37.000	2020-01-02 03:40:58.000	757	99658	50207.5	5020750	757	99658	50207.5	5020750	-32413	32725	4987.66	498766	-125	126	0.78	78
+758	2	10748	99659	2.27627	299.27627	150.77627	15077.62762	2.27627	299.27628	150.77627	15077.62756	2.27627	299.27627	150.77627	15077.627	2020-01-01	2020-01-02	2020-01-01 00:12:38	2020-01-02 03:40:59	2020-01-01 00:12:38.000	2020-01-02 03:40:59.000	758	99659	50208.5	5020850	758	99659	50208.5	5020850	-32412	32726	4988.66	498866	-124	127	1.78	178
+759	2	10749	99660	2.27927	299.27927	150.77927	15077.92792	2.27927	299.27927	150.77927	15077.92787	2.27927	299.27927	150.77927	15077.927	2020-01-01	2020-01-02	2020-01-01 00:12:39	2020-01-02 03:41:00	2020-01-01 00:12:39.000	2020-01-02 03:41:00.000	759	99660	50209.5	5020950	759	99660	50209.5	5020950	-32411	32727	4989.66	498966	-128	127	0.22	22
 76	2	10066	99976	0.22822	300.22822	150.22822	15173.05105	0.22822	300.22824	150.22822	15173.05109	0.22822	300.22822	150.22822	15173.05022	2020-01-01	2020-01-02	2020-01-01 00:01:16	2020-01-02 03:46:16	2020-01-01 00:01:16.000	2020-01-02 03:46:16.000	76	99976	50026	5052626	76	99976	50026	5052626	-32493	32442	4605.009900990099	465106	-126	125	-2.99009900990099	-302
-760	2	10750	99661	2.28228	299.28228	150.78228	15078.22822	2.28228	299.2823	150.78228	15078.2285	2.28228	299.28228	150.78228	15078.22800	2020-01-01	2020-01-02	2020-01-01 00:12:40	2020-01-02 03:41:01	2020-01-01 00:12:40.000	2020-01-02 03:41:01.000	760	99661	50210.5	5021050	760	99661	50210.5	5021050	-32410	32728	4990.66	499066	-128	127	-1.34	-134
-761	2	10751	99662	2.28528	299.28528	150.78528	15078.52852	2.28528	299.28528	150.78528	15078.52814	2.28528	299.28528	150.78528	15078.52800	2020-01-01	2020-01-02	2020-01-01 00:12:41	2020-01-02 03:41:02	2020-01-01 00:12:41.000	2020-01-02 03:41:02.000	761	99662	50211.5	5021150	761	99662	50211.5	5021150	-32409	32729	4991.66	499166	-128	124	-2.9	-290
-762	2	10752	99663	2.28828	299.28828	150.78828	15078.82882	2.28828	299.2883	150.78828	15078.82889	2.28828	299.28828	150.78828	15078.82800	2020-01-01	2020-01-02	2020-01-01 00:12:42	2020-01-02 03:41:03	2020-01-01 00:12:42.000	2020-01-02 03:41:03.000	762	99663	50212.5	5021250	762	99663	50212.5	5021250	-32408	32730	4992.66	499266	-127	125	-1.9	-190
-763	2	10753	99664	2.29129	299.29129	150.79129	15079.12912	2.29129	299.2913	150.79129	15079.12904	2.29129	299.29129	150.79129	15079.12900	2020-01-01	2020-01-02	2020-01-01 00:12:43	2020-01-02 03:41:04	2020-01-01 00:12:43.000	2020-01-02 03:41:04.000	763	99664	50213.5	5021350	763	99664	50213.5	5021350	-32407	32731	4993.66	499366	-126	126	-0.9	-90
-764	2	10754	99665	2.29429	299.29429	150.79429	15079.42942	2.29429	299.29428	150.79429	15079.42933	2.29429	299.29429	150.79429	15079.42900	2020-01-01	2020-01-02	2020-01-01 00:12:44	2020-01-02 03:41:05	2020-01-01 00:12:44.000	2020-01-02 03:41:05.000	764	99665	50214.5	5021450	764	99665	50214.5	5021450	-32406	32732	4994.66	499466	-125	127	0.1	10
-765	2	10755	99666	2.29729	299.29729	150.79729	15079.72972	2.29729	299.2973	150.79729	15079.72996	2.29729	299.29729	150.79729	15079.72900	2020-01-01	2020-01-02	2020-01-01 00:12:45	2020-01-02 03:41:06	2020-01-01 00:12:45.000	2020-01-02 03:41:06.000	765	99666	50215.5	5021550	765	99666	50215.5	5021550	-32405	32733	4995.66	499566	-128	127	-1.46	-146
-766	2	10756	99667	2.3003	299.3003	150.8003	15080.03003	2.3003	299.3003	150.80029	15080.02961	2.30030	299.30030	150.8003	15080.03000	2020-01-01	2020-01-02	2020-01-01 00:12:46	2020-01-02 03:41:07	2020-01-01 00:12:46.000	2020-01-02 03:41:07.000	766	99667	50216.5	5021650	766	99667	50216.5	5021650	-32404	32734	4996.66	499666	-128	127	-3.02	-302
-767	2	10757	99668	2.3033	299.3033	150.8033	15080.33033	2.3033	299.3033	150.8033	15080.33036	2.30330	299.30330	150.8033	15080.33000	2020-01-01	2020-01-02	2020-01-01 00:12:47	2020-01-02 03:41:08	2020-01-01 00:12:47.000	2020-01-02 03:41:08.000	767	99668	50217.5	5021750	767	99668	50217.5	5021750	-32403	32735	4997.66	499766	-128	123	-4.58	-458
-768	2	10758	99669	2.3063	299.3063	150.8063	15080.63063	2.3063	299.3063	150.8063	15080.6305	2.30630	299.30630	150.8063	15080.63000	2020-01-01	2020-01-02	2020-01-01 00:12:48	2020-01-02 03:41:09	2020-01-01 00:12:48.000	2020-01-02 03:41:09.000	768	99669	50218.5	5021850	768	99669	50218.5	5021850	-32402	32736	4998.66	499866	-127	124	-3.58	-358
-769	2	10759	99670	2.3093	299.3093	150.8093	15080.93093	2.3093	299.3093	150.8093	15080.93084	2.30930	299.30930	150.8093	15080.93000	2020-01-01	2020-01-02	2020-01-01 00:12:49	2020-01-02 03:41:10	2020-01-01 00:12:49.000	2020-01-02 03:41:10.000	769	99670	50219.5	5021950	769	99670	50219.5	5021950	-32401	32737	4999.66	499966	-126	125	-2.58	-258
+760	2	10750	99661	2.28228	299.28228	150.78228	15078.22822	2.28228	299.2823	150.78228	15078.2285	2.28228	299.28228	150.78228	15078.228	2020-01-01	2020-01-02	2020-01-01 00:12:40	2020-01-02 03:41:01	2020-01-01 00:12:40.000	2020-01-02 03:41:01.000	760	99661	50210.5	5021050	760	99661	50210.5	5021050	-32410	32728	4990.66	499066	-128	127	-1.34	-134
+761	2	10751	99662	2.28528	299.28528	150.78528	15078.52852	2.28528	299.28528	150.78528	15078.52814	2.28528	299.28528	150.78528	15078.528	2020-01-01	2020-01-02	2020-01-01 00:12:41	2020-01-02 03:41:02	2020-01-01 00:12:41.000	2020-01-02 03:41:02.000	761	99662	50211.5	5021150	761	99662	50211.5	5021150	-32409	32729	4991.66	499166	-128	124	-2.9	-290
+762	2	10752	99663	2.28828	299.28828	150.78828	15078.82882	2.28828	299.2883	150.78828	15078.82889	2.28828	299.28828	150.78828	15078.828	2020-01-01	2020-01-02	2020-01-01 00:12:42	2020-01-02 03:41:03	2020-01-01 00:12:42.000	2020-01-02 03:41:03.000	762	99663	50212.5	5021250	762	99663	50212.5	5021250	-32408	32730	4992.66	499266	-127	125	-1.9	-190
+763	2	10753	99664	2.29129	299.29129	150.79129	15079.12912	2.29129	299.2913	150.79129	15079.12904	2.29129	299.29129	150.79129	15079.129	2020-01-01	2020-01-02	2020-01-01 00:12:43	2020-01-02 03:41:04	2020-01-01 00:12:43.000	2020-01-02 03:41:04.000	763	99664	50213.5	5021350	763	99664	50213.5	5021350	-32407	32731	4993.66	499366	-126	126	-0.9	-90
+764	2	10754	99665	2.29429	299.29429	150.79429	15079.42942	2.29429	299.29428	150.79429	15079.42933	2.29429	299.29429	150.79429	15079.429	2020-01-01	2020-01-02	2020-01-01 00:12:44	2020-01-02 03:41:05	2020-01-01 00:12:44.000	2020-01-02 03:41:05.000	764	99665	50214.5	5021450	764	99665	50214.5	5021450	-32406	32732	4994.66	499466	-125	127	0.1	10
+765	2	10755	99666	2.29729	299.29729	150.79729	15079.72972	2.29729	299.2973	150.79729	15079.72996	2.29729	299.29729	150.79729	15079.729	2020-01-01	2020-01-02	2020-01-01 00:12:45	2020-01-02 03:41:06	2020-01-01 00:12:45.000	2020-01-02 03:41:06.000	765	99666	50215.5	5021550	765	99666	50215.5	5021550	-32405	32733	4995.66	499566	-128	127	-1.46	-146
+766	2	10756	99667	2.3003	299.3003	150.8003	15080.03003	2.3003	299.3003	150.80029	15080.02961	2.3003	299.3003	150.8003	15080.03	2020-01-01	2020-01-02	2020-01-01 00:12:46	2020-01-02 03:41:07	2020-01-01 00:12:46.000	2020-01-02 03:41:07.000	766	99667	50216.5	5021650	766	99667	50216.5	5021650	-32404	32734	4996.66	499666	-128	127	-3.02	-302
+767	2	10757	99668	2.3033	299.3033	150.8033	15080.33033	2.3033	299.3033	150.8033	15080.33036	2.3033	299.3033	150.8033	15080.33	2020-01-01	2020-01-02	2020-01-01 00:12:47	2020-01-02 03:41:08	2020-01-01 00:12:47.000	2020-01-02 03:41:08.000	767	99668	50217.5	5021750	767	99668	50217.5	5021750	-32403	32735	4997.66	499766	-128	123	-4.58	-458
+768	2	10758	99669	2.3063	299.3063	150.8063	15080.63063	2.3063	299.3063	150.8063	15080.6305	2.3063	299.3063	150.8063	15080.63	2020-01-01	2020-01-02	2020-01-01 00:12:48	2020-01-02 03:41:09	2020-01-01 00:12:48.000	2020-01-02 03:41:09.000	768	99669	50218.5	5021850	768	99669	50218.5	5021850	-32402	32736	4998.66	499866	-127	124	-3.58	-358
+769	2	10759	99670	2.3093	299.3093	150.8093	15080.93093	2.3093	299.3093	150.8093	15080.93084	2.3093	299.3093	150.8093	15080.93	2020-01-01	2020-01-02	2020-01-01 00:12:49	2020-01-02 03:41:10	2020-01-01 00:12:49.000	2020-01-02 03:41:10.000	769	99670	50219.5	5021950	769	99670	50219.5	5021950	-32401	32737	4999.66	499966	-126	125	-2.58	-258
 77	2	10067	99977	0.23123	300.23123	150.23123	15173.35435	0.23123	300.23123	150.23123	15173.35439	0.23123	300.23123	150.23123	15173.35423	2020-01-01	2020-01-02	2020-01-01 00:01:17	2020-01-02 03:46:17	2020-01-01 00:01:17.000	2020-01-02 03:46:17.000	77	99977	50027	5052727	77	99977	50027	5052727	-32492	32443	4606.009900990099	465207	-125	126	-1.99009900990099	-201
-770	2	10760	99671	2.31231	299.31231	150.81231	15081.23123	2.31231	299.31232	150.81231	15081.23144	2.31231	299.31231	150.81231	15081.23100	2020-01-01	2020-01-02	2020-01-01 00:12:50	2020-01-02 03:41:11	2020-01-01 00:12:50.000	2020-01-02 03:41:11.000	770	99671	50220.5	5022050	770	99671	50220.5	5022050	-32400	32738	5000.66	500066	-125	126	-1.58	-158
-771	2	10761	99672	2.31531	299.31531	150.81531	15081.53153	2.31531	299.3153	150.81531	15081.53173	2.31531	299.31531	150.81531	15081.53100	2020-01-01	2020-01-02	2020-01-01 00:12:51	2020-01-02 03:41:12	2020-01-01 00:12:51.000	2020-01-02 03:41:12.000	771	99672	50221.5	5022150	771	99672	50221.5	5022150	-32399	32739	5001.66	500166	-124	127	-0.58	-58
-772	2	10762	99673	2.31831	299.31831	150.81831	15081.83183	2.31831	299.31833	150.81831	15081.83183	2.31831	299.31831	150.81831	15081.83100	2020-01-01	2020-01-02	2020-01-01 00:12:52	2020-01-02 03:41:13	2020-01-01 00:12:52.000	2020-01-02 03:41:13.000	772	99673	50222.5	5022250	772	99673	50222.5	5022250	-32398	32740	5002.66	500266	-128	127	-2.14	-214
-773	2	10763	99674	2.32132	299.32132	150.82132	15082.13213	2.32132	299.32132	150.82131	15082.13197	2.32132	299.32132	150.82132	15082.13200	2020-01-01	2020-01-02	2020-01-01 00:12:53	2020-01-02 03:41:14	2020-01-01 00:12:53.000	2020-01-02 03:41:14.000	773	99674	50223.5	5022350	773	99674	50223.5	5022350	-32397	32741	5003.66	500366	-128	123	-3.7	-370
-774	2	10764	99675	2.32432	299.32432	150.82432	15082.43243	2.32432	299.3243	150.82432	15082.43231	2.32432	299.32432	150.82432	15082.43200	2020-01-01	2020-01-02	2020-01-01 00:12:54	2020-01-02 03:41:15	2020-01-01 00:12:54.000	2020-01-02 03:41:15.000	774	99675	50224.5	5022450	774	99675	50224.5	5022450	-32396	32742	5004.66	500466	-127	124	-2.7	-270
-775	2	10765	99676	2.32732	299.32732	150.82732	15082.73273	2.32732	299.32733	150.82732	15082.73291	2.32732	299.32732	150.82732	15082.73200	2020-01-01	2020-01-02	2020-01-01 00:12:55	2020-01-02 03:41:16	2020-01-01 00:12:55.000	2020-01-02 03:41:16.000	775	99676	50225.5	5022550	775	99676	50225.5	5022550	-32395	32743	5005.66	500566	-126	125	-1.7	-170
-776	2	10766	99677	2.33033	299.33033	150.83033	15083.03303	2.33033	299.33032	150.83033	15083.0332	2.33033	299.33033	150.83033	15083.03300	2020-01-01	2020-01-02	2020-01-01 00:12:56	2020-01-02 03:41:17	2020-01-01 00:12:56.000	2020-01-02 03:41:17.000	776	99677	50226.5	5022650	776	99677	50226.5	5022650	-32394	32744	5006.66	500666	-125	126	-0.7	-70
-777	2	10767	99678	2.33333	299.33333	150.83333	15083.33333	2.33333	299.33334	150.83333	15083.3333	2.33333	299.33333	150.83333000000002	15083.33300	2020-01-01	2020-01-02	2020-01-01 00:12:57	2020-01-02 03:41:18	2020-01-01 00:12:57.000	2020-01-02 03:41:18.000	777	99678	50227.5	5022750	777	99678	50227.5	5022750	-32393	32745	5007.66	500766	-124	127	0.3	30
-778	2	10768	99679	2.33633	299.33633	150.83633	15083.63363	2.33633	299.33633	150.83633	15083.63348	2.33633	299.33633	150.83633	15083.63300	2020-01-01	2020-01-02	2020-01-01 00:12:58	2020-01-02 03:41:19	2020-01-01 00:12:58.000	2020-01-02 03:41:19.000	778	99679	50228.5	5022850	778	99679	50228.5	5022850	-32392	32746	5008.66	500866	-128	127	-1.26	-126
-779	2	10769	99680	2.33933	299.33933	150.83933	15083.93393	2.33933	299.33932	150.83933	15083.93378	2.33933	299.33933	150.83933000000002	15083.93300	2020-01-01	2020-01-02	2020-01-01 00:12:59	2020-01-02 03:41:20	2020-01-01 00:12:59.000	2020-01-02 03:41:20.000	779	99680	50229.5	5022950	779	99680	50229.5	5022950	-32391	32747	5009.66	500966	-128	123	-2.82	-282
+770	2	10760	99671	2.31231	299.31231	150.81231	15081.23123	2.31231	299.31232	150.81231	15081.23144	2.31231	299.31231	150.81231	15081.231	2020-01-01	2020-01-02	2020-01-01 00:12:50	2020-01-02 03:41:11	2020-01-01 00:12:50.000	2020-01-02 03:41:11.000	770	99671	50220.5	5022050	770	99671	50220.5	5022050	-32400	32738	5000.66	500066	-125	126	-1.58	-158
+771	2	10761	99672	2.31531	299.31531	150.81531	15081.53153	2.31531	299.3153	150.81531	15081.53173	2.31531	299.31531	150.81531	15081.531	2020-01-01	2020-01-02	2020-01-01 00:12:51	2020-01-02 03:41:12	2020-01-01 00:12:51.000	2020-01-02 03:41:12.000	771	99672	50221.5	5022150	771	99672	50221.5	5022150	-32399	32739	5001.66	500166	-124	127	-0.58	-58
+772	2	10762	99673	2.31831	299.31831	150.81831	15081.83183	2.31831	299.31833	150.81831	15081.83183	2.31831	299.31831	150.81831	15081.831	2020-01-01	2020-01-02	2020-01-01 00:12:52	2020-01-02 03:41:13	2020-01-01 00:12:52.000	2020-01-02 03:41:13.000	772	99673	50222.5	5022250	772	99673	50222.5	5022250	-32398	32740	5002.66	500266	-128	127	-2.14	-214
+773	2	10763	99674	2.32132	299.32132	150.82132	15082.13213	2.32132	299.32132	150.82131	15082.13197	2.32132	299.32132	150.82132	15082.132	2020-01-01	2020-01-02	2020-01-01 00:12:53	2020-01-02 03:41:14	2020-01-01 00:12:53.000	2020-01-02 03:41:14.000	773	99674	50223.5	5022350	773	99674	50223.5	5022350	-32397	32741	5003.66	500366	-128	123	-3.7	-370
+774	2	10764	99675	2.32432	299.32432	150.82432	15082.43243	2.32432	299.3243	150.82432	15082.43231	2.32432	299.32432	150.82432	15082.432	2020-01-01	2020-01-02	2020-01-01 00:12:54	2020-01-02 03:41:15	2020-01-01 00:12:54.000	2020-01-02 03:41:15.000	774	99675	50224.5	5022450	774	99675	50224.5	5022450	-32396	32742	5004.66	500466	-127	124	-2.7	-270
+775	2	10765	99676	2.32732	299.32732	150.82732	15082.73273	2.32732	299.32733	150.82732	15082.73291	2.32732	299.32732	150.82732	15082.732	2020-01-01	2020-01-02	2020-01-01 00:12:55	2020-01-02 03:41:16	2020-01-01 00:12:55.000	2020-01-02 03:41:16.000	775	99676	50225.5	5022550	775	99676	50225.5	5022550	-32395	32743	5005.66	500566	-126	125	-1.7	-170
+776	2	10766	99677	2.33033	299.33033	150.83033	15083.03303	2.33033	299.33032	150.83033	15083.0332	2.33033	299.33033	150.83033	15083.033	2020-01-01	2020-01-02	2020-01-01 00:12:56	2020-01-02 03:41:17	2020-01-01 00:12:56.000	2020-01-02 03:41:17.000	776	99677	50226.5	5022650	776	99677	50226.5	5022650	-32394	32744	5006.66	500666	-125	126	-0.7	-70
+777	2	10767	99678	2.33333	299.33333	150.83333	15083.33333	2.33333	299.33334	150.83333	15083.3333	2.33333	299.33333	150.83333000000002	15083.333	2020-01-01	2020-01-02	2020-01-01 00:12:57	2020-01-02 03:41:18	2020-01-01 00:12:57.000	2020-01-02 03:41:18.000	777	99678	50227.5	5022750	777	99678	50227.5	5022750	-32393	32745	5007.66	500766	-124	127	0.3	30
+778	2	10768	99679	2.33633	299.33633	150.83633	15083.63363	2.33633	299.33633	150.83633	15083.63348	2.33633	299.33633	150.83633	15083.633	2020-01-01	2020-01-02	2020-01-01 00:12:58	2020-01-02 03:41:19	2020-01-01 00:12:58.000	2020-01-02 03:41:19.000	778	99679	50228.5	5022850	778	99679	50228.5	5022850	-32392	32746	5008.66	500866	-128	127	-1.26	-126
+779	2	10769	99680	2.33933	299.33933	150.83933	15083.93393	2.33933	299.33932	150.83933	15083.93378	2.33933	299.33933	150.83933000000002	15083.933	2020-01-01	2020-01-02	2020-01-01 00:12:59	2020-01-02 03:41:20	2020-01-01 00:12:59.000	2020-01-02 03:41:20.000	779	99680	50229.5	5022950	779	99680	50229.5	5022950	-32391	32747	5009.66	500966	-128	123	-2.82	-282
 78	2	10068	99978	0.23423	300.23423	150.23423	15173.65765	0.23423	300.23422	150.23423	15173.65769	0.23423	300.23423	150.23423	15173.65723	2020-01-01	2020-01-02	2020-01-01 00:01:18	2020-01-02 03:46:18	2020-01-01 00:01:18.000	2020-01-02 03:46:18.000	78	99978	50028	5052828	78	99978	50028	5052828	-32491	32444	4607.009900990099	465308	-124	127	-0.9900990099009901	-100
-780	2	10770	99681	2.34234	299.34234	150.84234	15084.23423	2.34234	299.34235	150.84234	15084.23437	2.34234	299.34234	150.84234	15084.23400	2020-01-01	2020-01-02	2020-01-01 00:13:00	2020-01-02 03:41:21	2020-01-01 00:13:00.000	2020-01-02 03:41:21.000	780	99681	50230.5	5023050	780	99681	50230.5	5023050	-32390	32748	5010.66	501066	-127	124	-1.82	-182
-781	2	10771	99682	2.34534	299.34534	150.84534	15084.53453	2.34534	299.34534	150.84534	15084.53467	2.34534	299.34534	150.84534	15084.53400	2020-01-01	2020-01-02	2020-01-01 00:13:01	2020-01-02 03:41:22	2020-01-01 00:13:01.000	2020-01-02 03:41:22.000	781	99682	50231.5	5023150	781	99682	50231.5	5023150	-32389	32749	5011.66	501166	-126	125	-0.82	-82
-782	2	10772	99683	2.34834	299.34834	150.84834	15084.83483	2.34834	299.34836	150.84834	15084.83477	2.34834	299.34834	150.84834	15084.83400	2020-01-01	2020-01-02	2020-01-01 00:13:02	2020-01-02 03:41:23	2020-01-01 00:13:02.000	2020-01-02 03:41:23.000	782	99683	50232.5	5023250	782	99683	50232.5	5023250	-32388	32750	5012.66	501266	-125	126	0.18	18
-783	2	10773	99684	2.35135	299.35135	150.85135	15085.13513	2.35135	299.35135	150.85134	15085.13495	2.35135	299.35135	150.85135	15085.13500	2020-01-01	2020-01-02	2020-01-01 00:13:03	2020-01-02 03:41:24	2020-01-01 00:13:03.000	2020-01-02 03:41:24.000	783	99684	50233.5	5023350	783	99684	50233.5	5023350	-32387	32751	5013.66	501366	-124	127	1.18	118
-784	2	10774	99685	2.35435	299.35435	150.85435	15085.43543	2.35435	299.35434	150.85435	15085.43525	2.35435	299.35435	150.85434999999998	15085.43500	2020-01-01	2020-01-02	2020-01-01 00:13:04	2020-01-02 03:41:25	2020-01-01 00:13:04.000	2020-01-02 03:41:25.000	784	99685	50234.5	5023450	784	99685	50234.5	5023450	-32386	32752	5014.66	501466	-128	127	-0.38	-38
-785	2	10775	99686	2.35735	299.35735	150.85735	15085.73573	2.35735	299.35736	150.85736	15085.736	2.35735	299.35735	150.85735	15085.73500	2020-01-01	2020-01-02	2020-01-01 00:13:05	2020-01-02 03:41:26	2020-01-01 00:13:05.000	2020-01-02 03:41:26.000	785	99686	50235.5	5023550	785	99686	50235.5	5023550	-32385	32753	5015.66	501566	-128	127	-1.94	-194
-786	2	10776	99687	2.36036	299.36036	150.86036	15086.03603	2.36036	299.36035	150.86036	15086.03614	2.36036	299.36036	150.86036000000001	15086.03600	2020-01-01	2020-01-02	2020-01-01 00:13:06	2020-01-02 03:41:27	2020-01-01 00:13:06.000	2020-01-02 03:41:27.000	786	99687	50236.5	5023650	786	99687	50236.5	5023650	-32384	32754	5016.66	501666	-128	124	-3.5	-350
-787	2	10777	99688	2.36336	299.36336	150.86336	15086.33633	2.36336	299.36337	150.86336	15086.33628	2.36336	299.36336	150.86336	15086.33600	2020-01-01	2020-01-02	2020-01-01 00:13:07	2020-01-02 03:41:28	2020-01-01 00:13:07.000	2020-01-02 03:41:28.000	787	99688	50237.5	5023750	787	99688	50237.5	5023750	-32383	32755	5017.66	501766	-127	125	-2.5	-250
-788	2	10778	99689	2.36636	299.36636	150.86636	15086.63663	2.36636	299.36636	150.86636	15086.63641	2.36636	299.36636	150.86636000000001	15086.63600	2020-01-01	2020-01-02	2020-01-01 00:13:08	2020-01-02 03:41:29	2020-01-01 00:13:08.000	2020-01-02 03:41:29.000	788	99689	50238.5	5023850	788	99689	50238.5	5023850	-32382	32756	5018.66	501866	-126	126	-1.5	-150
-789	2	10779	99690	2.36936	299.36936	150.86936	15086.93693	2.36936	299.36935	150.86936	15086.93672	2.36936	299.36936	150.86936	15086.93600	2020-01-01	2020-01-02	2020-01-01 00:13:09	2020-01-02 03:41:30	2020-01-01 00:13:09.000	2020-01-02 03:41:30.000	789	99690	50239.5	5023950	789	99690	50239.5	5023950	-32381	32757	5019.66	501966	-125	127	-0.5	-50
+780	2	10770	99681	2.34234	299.34234	150.84234	15084.23423	2.34234	299.34235	150.84234	15084.23437	2.34234	299.34234	150.84234	15084.234	2020-01-01	2020-01-02	2020-01-01 00:13:00	2020-01-02 03:41:21	2020-01-01 00:13:00.000	2020-01-02 03:41:21.000	780	99681	50230.5	5023050	780	99681	50230.5	5023050	-32390	32748	5010.66	501066	-127	124	-1.82	-182
+781	2	10771	99682	2.34534	299.34534	150.84534	15084.53453	2.34534	299.34534	150.84534	15084.53467	2.34534	299.34534	150.84534	15084.534	2020-01-01	2020-01-02	2020-01-01 00:13:01	2020-01-02 03:41:22	2020-01-01 00:13:01.000	2020-01-02 03:41:22.000	781	99682	50231.5	5023150	781	99682	50231.5	5023150	-32389	32749	5011.66	501166	-126	125	-0.82	-82
+782	2	10772	99683	2.34834	299.34834	150.84834	15084.83483	2.34834	299.34836	150.84834	15084.83477	2.34834	299.34834	150.84834	15084.834	2020-01-01	2020-01-02	2020-01-01 00:13:02	2020-01-02 03:41:23	2020-01-01 00:13:02.000	2020-01-02 03:41:23.000	782	99683	50232.5	5023250	782	99683	50232.5	5023250	-32388	32750	5012.66	501266	-125	126	0.18	18
+783	2	10773	99684	2.35135	299.35135	150.85135	15085.13513	2.35135	299.35135	150.85134	15085.13495	2.35135	299.35135	150.85135	15085.135	2020-01-01	2020-01-02	2020-01-01 00:13:03	2020-01-02 03:41:24	2020-01-01 00:13:03.000	2020-01-02 03:41:24.000	783	99684	50233.5	5023350	783	99684	50233.5	5023350	-32387	32751	5013.66	501366	-124	127	1.18	118
+784	2	10774	99685	2.35435	299.35435	150.85435	15085.43543	2.35435	299.35434	150.85435	15085.43525	2.35435	299.35435	150.85434999999998	15085.435	2020-01-01	2020-01-02	2020-01-01 00:13:04	2020-01-02 03:41:25	2020-01-01 00:13:04.000	2020-01-02 03:41:25.000	784	99685	50234.5	5023450	784	99685	50234.5	5023450	-32386	32752	5014.66	501466	-128	127	-0.38	-38
+785	2	10775	99686	2.35735	299.35735	150.85735	15085.73573	2.35735	299.35736	150.85736	15085.736	2.35735	299.35735	150.85735	15085.735	2020-01-01	2020-01-02	2020-01-01 00:13:05	2020-01-02 03:41:26	2020-01-01 00:13:05.000	2020-01-02 03:41:26.000	785	99686	50235.5	5023550	785	99686	50235.5	5023550	-32385	32753	5015.66	501566	-128	127	-1.94	-194
+786	2	10776	99687	2.36036	299.36036	150.86036	15086.03603	2.36036	299.36035	150.86036	15086.03614	2.36036	299.36036	150.86036000000001	15086.036	2020-01-01	2020-01-02	2020-01-01 00:13:06	2020-01-02 03:41:27	2020-01-01 00:13:06.000	2020-01-02 03:41:27.000	786	99687	50236.5	5023650	786	99687	50236.5	5023650	-32384	32754	5016.66	501666	-128	124	-3.5	-350
+787	2	10777	99688	2.36336	299.36336	150.86336	15086.33633	2.36336	299.36337	150.86336	15086.33628	2.36336	299.36336	150.86336	15086.336	2020-01-01	2020-01-02	2020-01-01 00:13:07	2020-01-02 03:41:28	2020-01-01 00:13:07.000	2020-01-02 03:41:28.000	787	99688	50237.5	5023750	787	99688	50237.5	5023750	-32383	32755	5017.66	501766	-127	125	-2.5	-250
+788	2	10778	99689	2.36636	299.36636	150.86636	15086.63663	2.36636	299.36636	150.86636	15086.63641	2.36636	299.36636	150.86636000000001	15086.636	2020-01-01	2020-01-02	2020-01-01 00:13:08	2020-01-02 03:41:29	2020-01-01 00:13:08.000	2020-01-02 03:41:29.000	788	99689	50238.5	5023850	788	99689	50238.5	5023850	-32382	32756	5018.66	501866	-126	126	-1.5	-150
+789	2	10779	99690	2.36936	299.36936	150.86936	15086.93693	2.36936	299.36935	150.86936	15086.93672	2.36936	299.36936	150.86936	15086.936	2020-01-01	2020-01-02	2020-01-01 00:13:09	2020-01-02 03:41:30	2020-01-01 00:13:09.000	2020-01-02 03:41:30.000	789	99690	50239.5	5023950	789	99690	50239.5	5023950	-32381	32757	5019.66	501966	-125	127	-0.5	-50
 79	2	10069	99979	0.23723	300.23723	150.23723	15173.96096	0.23723	300.23724	150.23724	15173.96129	0.23723	300.23723	150.23723	15173.96023	2020-01-01	2020-01-02	2020-01-01 00:01:19	2020-01-02 03:46:19	2020-01-01 00:01:19.000	2020-01-02 03:46:19.000	79	99979	50029	5052929	79	99979	50029	5052929	-32490	32445	4608.009900990099	465409	-128	127	-2.5247524752475248	-255
-790	2	10780	99691	2.37237	299.37237	150.87237	15087.23723	2.37237	299.37238	150.87237	15087.23747	2.37237	299.37237	150.87237	15087.23700	2020-01-01	2020-01-02	2020-01-01 00:13:10	2020-01-02 03:41:31	2020-01-01 00:13:10.000	2020-01-02 03:41:31.000	790	99691	50240.5	5024050	790	99691	50240.5	5024050	-32380	32758	5020.66	502066	-128	127	-2.06	-206
-791	2	10781	99692	2.37537	299.37537	150.87537	15087.53753	2.37537	299.37537	150.87537	15087.53761	2.37537	299.37537	150.87537	15087.53700	2020-01-01	2020-01-02	2020-01-01 00:13:11	2020-01-02 03:41:32	2020-01-01 00:13:11.000	2020-01-02 03:41:32.000	791	99692	50241.5	5024150	791	99692	50241.5	5024150	-32379	32759	5021.66	502166	-128	127	-3.62	-362
-792	2	10782	99693	2.37837	299.37837	150.87837	15087.83783	2.37837	299.3784	150.87837	15087.83775	2.37837	299.37837	150.87837	15087.83700	2020-01-01	2020-01-02	2020-01-01 00:13:12	2020-01-02 03:41:33	2020-01-01 00:13:12.000	2020-01-02 03:41:33.000	792	99693	50242.5	5024250	792	99693	50242.5	5024250	-32378	32760	5022.66	502266	-128	123	-5.18	-518
-793	2	10783	99694	2.38138	299.38138	150.88138	15088.13813	2.38138	299.38138	150.88137	15088.13789	2.38138	299.38138	150.88138	15088.13800	2020-01-01	2020-01-02	2020-01-01 00:13:13	2020-01-02 03:41:34	2020-01-01 00:13:13.000	2020-01-02 03:41:34.000	793	99694	50243.5	5024350	793	99694	50243.5	5024350	-32377	32761	5023.66	502366	-127	124	-4.18	-418
-794	2	10784	99695	2.38438	299.38438	150.88438	15088.43843	2.38438	299.3844	150.88438	15088.43864	2.38438	299.38438	150.88438	15088.43800	2020-01-01	2020-01-02	2020-01-01 00:13:14	2020-01-02 03:41:35	2020-01-01 00:13:14.000	2020-01-02 03:41:35.000	794	99695	50244.5	5024450	794	99695	50244.5	5024450	-32376	32762	5024.66	502466	-126	125	-3.18	-318
-795	2	10785	99696	2.38738	299.38738	150.88738	15088.73873	2.38738	299.3874	150.88738	15088.73894	2.38738	299.38738	150.88738	15088.73800	2020-01-01	2020-01-02	2020-01-01 00:13:15	2020-01-02 03:41:36	2020-01-01 00:13:15.000	2020-01-02 03:41:36.000	795	99696	50245.5	5024550	795	99696	50245.5	5024550	-32375	32763	5025.66	502566	-125	126	-2.18	-218
-796	2	10786	99697	2.39039	299.39039	150.89039	15089.03903	2.39039	299.39038	150.89039	15089.03908	2.39039	299.39039	150.89039	15089.03900	2020-01-01	2020-01-02	2020-01-01 00:13:16	2020-01-02 03:41:37	2020-01-01 00:13:16.000	2020-01-02 03:41:37.000	796	99697	50246.5	5024650	796	99697	50246.5	5024650	-32374	32764	5026.66	502666	-124	127	-1.18	-118
-797	2	10787	99698	2.39339	299.39339	150.89339	15089.33933	2.39339	299.3934	150.89339	15089.33921	2.39339	299.39339	150.89339	15089.33900	2020-01-01	2020-01-02	2020-01-01 00:13:17	2020-01-02 03:41:38	2020-01-01 00:13:17.000	2020-01-02 03:41:38.000	797	99698	50247.5	5024750	797	99698	50247.5	5024750	-32373	32765	5027.66	502766	-128	127	-2.74	-274
-798	2	10788	99699	2.39639	299.39639	150.89639	15089.63963	2.39639	299.3964	150.89639	15089.63936	2.39639	299.39639	150.89639	15089.63900	2020-01-01	2020-01-02	2020-01-01 00:13:18	2020-01-02 03:41:39	2020-01-01 00:13:18.000	2020-01-02 03:41:39.000	798	99699	50248.5	5024850	798	99699	50248.5	5024850	-32372	32766	5028.66	502866	-128	123	-4.3	-430
-799	2	10789	99700	2.39939	299.39939	150.89939	15089.93993	2.39939	299.3994	150.8994	15089.94011	2.39939	299.39939	150.89939	15089.93900	2020-01-01	2020-01-02	2020-01-01 00:13:19	2020-01-02 03:41:40	2020-01-01 00:13:19.000	2020-01-02 03:41:40.000	799	99700	50249.5	5024950	799	99700	50249.5	5024950	-32371	32767	5029.66	502966	-127	124	-3.3	-330
+790	2	10780	99691	2.37237	299.37237	150.87237	15087.23723	2.37237	299.37238	150.87237	15087.23747	2.37237	299.37237	150.87237	15087.237	2020-01-01	2020-01-02	2020-01-01 00:13:10	2020-01-02 03:41:31	2020-01-01 00:13:10.000	2020-01-02 03:41:31.000	790	99691	50240.5	5024050	790	99691	50240.5	5024050	-32380	32758	5020.66	502066	-128	127	-2.06	-206
+791	2	10781	99692	2.37537	299.37537	150.87537	15087.53753	2.37537	299.37537	150.87537	15087.53761	2.37537	299.37537	150.87537	15087.537	2020-01-01	2020-01-02	2020-01-01 00:13:11	2020-01-02 03:41:32	2020-01-01 00:13:11.000	2020-01-02 03:41:32.000	791	99692	50241.5	5024150	791	99692	50241.5	5024150	-32379	32759	5021.66	502166	-128	127	-3.62	-362
+792	2	10782	99693	2.37837	299.37837	150.87837	15087.83783	2.37837	299.3784	150.87837	15087.83775	2.37837	299.37837	150.87837	15087.837	2020-01-01	2020-01-02	2020-01-01 00:13:12	2020-01-02 03:41:33	2020-01-01 00:13:12.000	2020-01-02 03:41:33.000	792	99693	50242.5	5024250	792	99693	50242.5	5024250	-32378	32760	5022.66	502266	-128	123	-5.18	-518
+793	2	10783	99694	2.38138	299.38138	150.88138	15088.13813	2.38138	299.38138	150.88137	15088.13789	2.38138	299.38138	150.88138	15088.138	2020-01-01	2020-01-02	2020-01-01 00:13:13	2020-01-02 03:41:34	2020-01-01 00:13:13.000	2020-01-02 03:41:34.000	793	99694	50243.5	5024350	793	99694	50243.5	5024350	-32377	32761	5023.66	502366	-127	124	-4.18	-418
+794	2	10784	99695	2.38438	299.38438	150.88438	15088.43843	2.38438	299.3844	150.88438	15088.43864	2.38438	299.38438	150.88438	15088.438	2020-01-01	2020-01-02	2020-01-01 00:13:14	2020-01-02 03:41:35	2020-01-01 00:13:14.000	2020-01-02 03:41:35.000	794	99695	50244.5	5024450	794	99695	50244.5	5024450	-32376	32762	5024.66	502466	-126	125	-3.18	-318
+795	2	10785	99696	2.38738	299.38738	150.88738	15088.73873	2.38738	299.3874	150.88738	15088.73894	2.38738	299.38738	150.88738	15088.738	2020-01-01	2020-01-02	2020-01-01 00:13:15	2020-01-02 03:41:36	2020-01-01 00:13:15.000	2020-01-02 03:41:36.000	795	99696	50245.5	5024550	795	99696	50245.5	5024550	-32375	32763	5025.66	502566	-125	126	-2.18	-218
+796	2	10786	99697	2.39039	299.39039	150.89039	15089.03903	2.39039	299.39038	150.89039	15089.03908	2.39039	299.39039	150.89039	15089.039	2020-01-01	2020-01-02	2020-01-01 00:13:16	2020-01-02 03:41:37	2020-01-01 00:13:16.000	2020-01-02 03:41:37.000	796	99697	50246.5	5024650	796	99697	50246.5	5024650	-32374	32764	5026.66	502666	-124	127	-1.18	-118
+797	2	10787	99698	2.39339	299.39339	150.89339	15089.33933	2.39339	299.3934	150.89339	15089.33921	2.39339	299.39339	150.89339	15089.339	2020-01-01	2020-01-02	2020-01-01 00:13:17	2020-01-02 03:41:38	2020-01-01 00:13:17.000	2020-01-02 03:41:38.000	797	99698	50247.5	5024750	797	99698	50247.5	5024750	-32373	32765	5027.66	502766	-128	127	-2.74	-274
+798	2	10788	99699	2.39639	299.39639	150.89639	15089.63963	2.39639	299.3964	150.89639	15089.63936	2.39639	299.39639	150.89639	15089.639	2020-01-01	2020-01-02	2020-01-01 00:13:18	2020-01-02 03:41:39	2020-01-01 00:13:18.000	2020-01-02 03:41:39.000	798	99699	50248.5	5024850	798	99699	50248.5	5024850	-32372	32766	5028.66	502866	-128	123	-4.3	-430
+799	2	10789	99700	2.39939	299.39939	150.89939	15089.93993	2.39939	299.3994	150.8994	15089.94011	2.39939	299.39939	150.89939	15089.939	2020-01-01	2020-01-02	2020-01-01 00:13:19	2020-01-02 03:41:40	2020-01-01 00:13:19.000	2020-01-02 03:41:40.000	799	99700	50249.5	5024950	799	99700	50249.5	5024950	-32371	32767	5029.66	502966	-127	124	-3.3	-330
 8	2	1007	9998	0.02402	300.02402	150.02402	15152.42642	0.02402	300.02402	150.02402	15152.42607	0.02402	300.02402	150.02402	15152.42602	2020-01-01	2020-01-02	2020-01-01 00:00:08	2020-01-02 03:45:08	2020-01-01 00:00:08.000	2020-01-02 03:45:08.000	8	99908	49958	5045758	8	99908	49958	5045758	-32561	32374	4537.009900990099	458238	-125	126	-0.019801980198019802	-2
 80	2	10070	99980	0.24024	300.24024	150.24024	15174.26426	0.24024	300.24023	150.24023	15174.26397	0.24024	300.24024	150.24024	15174.26424	2020-01-01	2020-01-02	2020-01-01 00:01:20	2020-01-02 03:46:20	2020-01-01 00:01:20.000	2020-01-02 03:46:20.000	80	99980	50030	5053030	80	99980	50030	5053030	-32489	32446	4609.009900990099	465510	-128	123	-4.0594059405940595	-410
-800	2	10790	99701	2.4024	299.4024	150.9024	15090.24024	2.4024	299.4024	150.9024	15090.24041	2.40240	299.40240	150.9024	15090.24000	2020-01-01	2020-01-02	2020-01-01 00:13:20	2020-01-02 03:41:41	2020-01-01 00:13:20.000	2020-01-02 03:41:41.000	800	99701	50250.5	5025050	800	99701	50250.5	5025050	-32768	32167	4375.3	437530	-126	125	-2.3	-230
-801	2	10791	99702	2.4054	299.4054	150.9054	15090.54054	2.4054	299.4054	150.9054	15090.54058	2.40540	299.40540	150.90540000000001	15090.54000	2020-01-01	2020-01-02	2020-01-01 00:13:21	2020-01-02 03:41:42	2020-01-01 00:13:21.000	2020-01-02 03:41:42.000	801	99702	50251.5	5025150	801	99702	50251.5	5025150	-32767	32168	4376.3	437630	-125	126	-1.3	-130
-802	2	10792	99703	2.4084	299.4084	150.9084	15090.84084	2.4084	299.40842	150.9084	15090.84069	2.40840	299.40840	150.9084	15090.84000	2020-01-01	2020-01-02	2020-01-01 00:13:22	2020-01-02 03:41:43	2020-01-01 00:13:22.000	2020-01-02 03:41:43.000	802	99703	50252.5	5025250	802	99703	50252.5	5025250	-32766	32169	4377.3	437730	-124	127	-0.3	-30
-803	2	10793	99704	2.41141	299.41141	150.91141	15091.14114	2.41141	299.4114	150.9114	15091.14098	2.41141	299.41141	150.91141	15091.14100	2020-01-01	2020-01-02	2020-01-01 00:13:23	2020-01-02 03:41:44	2020-01-01 00:13:23.000	2020-01-02 03:41:44.000	803	99704	50253.5	5025350	803	99704	50253.5	5025350	-32765	32170	4378.3	437830	-128	127	-1.86	-186
-804	2	10794	99705	2.41441	299.41441	150.91441	15091.44144	2.41441	299.41443	150.91441	15091.44158	2.41441	299.41441	150.91441	15091.44100	2020-01-01	2020-01-02	2020-01-01 00:13:24	2020-01-02 03:41:45	2020-01-01 00:13:24.000	2020-01-02 03:41:45.000	804	99705	50254.5	5025450	804	99705	50254.5	5025450	-32764	32171	4379.3	437930	-128	123	-3.42	-342
-805	2	10795	99706	2.41741	299.41741	150.91741	15091.74174	2.41741	299.41742	150.91741	15091.74188	2.41741	299.41741	150.91741	15091.74100	2020-01-01	2020-01-02	2020-01-01 00:13:25	2020-01-02 03:41:46	2020-01-01 00:13:25.000	2020-01-02 03:41:46.000	805	99706	50255.5	5025550	805	99706	50255.5	5025550	-32763	32172	4380.3	438030	-127	124	-2.42	-242
-806	2	10796	99707	2.42042	299.42042	150.92042	15092.04204	2.42042	299.4204	150.92042	15092.04205	2.42042	299.42042	150.92042	15092.04200	2020-01-01	2020-01-02	2020-01-01 00:13:26	2020-01-02 03:41:47	2020-01-01 00:13:26.000	2020-01-02 03:41:47.000	806	99707	50256.5	5025650	806	99707	50256.5	5025650	-32762	32173	4381.3	438130	-126	125	-1.42	-142
-807	2	10797	99708	2.42342	299.42342	150.92342	15092.34234	2.42342	299.42343	150.92342	15092.34216	2.42342	299.42342	150.92342	15092.34200	2020-01-01	2020-01-02	2020-01-01 00:13:27	2020-01-02 03:41:48	2020-01-01 00:13:27.000	2020-01-02 03:41:48.000	807	99708	50257.5	5025750	807	99708	50257.5	5025750	-32761	32174	4382.3	438230	-125	126	-0.42	-42
-808	2	10798	99709	2.42642	299.42642	150.92642	15092.64264	2.42642	299.42642	150.92642	15092.64245	2.42642	299.42642	150.92642	15092.64200	2020-01-01	2020-01-02	2020-01-01 00:13:28	2020-01-02 03:41:49	2020-01-01 00:13:28.000	2020-01-02 03:41:49.000	808	99709	50258.5	5025850	808	99709	50258.5	5025850	-32760	32175	4383.3	438330	-124	127	0.58	58
-809	2	10799	99710	2.42942	299.42942	150.92942	15092.94294	2.42942	299.42944	150.92943	15092.94305	2.42942	299.42942	150.92942	15092.94200	2020-01-01	2020-01-02	2020-01-01 00:13:29	2020-01-02 03:41:50	2020-01-01 00:13:29.000	2020-01-02 03:41:50.000	809	99710	50259.5	5025950	809	99710	50259.5	5025950	-32759	32176	4384.3	438430	-128	127	-0.98	-98
+800	2	10790	99701	2.4024	299.4024	150.9024	15090.24024	2.4024	299.4024	150.9024	15090.24041	2.4024	299.4024	150.9024	15090.24	2020-01-01	2020-01-02	2020-01-01 00:13:20	2020-01-02 03:41:41	2020-01-01 00:13:20.000	2020-01-02 03:41:41.000	800	99701	50250.5	5025050	800	99701	50250.5	5025050	-32768	32167	4375.3	437530	-126	125	-2.3	-230
+801	2	10791	99702	2.4054	299.4054	150.9054	15090.54054	2.4054	299.4054	150.9054	15090.54058	2.4054	299.4054	150.90540000000001	15090.54	2020-01-01	2020-01-02	2020-01-01 00:13:21	2020-01-02 03:41:42	2020-01-01 00:13:21.000	2020-01-02 03:41:42.000	801	99702	50251.5	5025150	801	99702	50251.5	5025150	-32767	32168	4376.3	437630	-125	126	-1.3	-130
+802	2	10792	99703	2.4084	299.4084	150.9084	15090.84084	2.4084	299.40842	150.9084	15090.84069	2.4084	299.4084	150.9084	15090.84	2020-01-01	2020-01-02	2020-01-01 00:13:22	2020-01-02 03:41:43	2020-01-01 00:13:22.000	2020-01-02 03:41:43.000	802	99703	50252.5	5025250	802	99703	50252.5	5025250	-32766	32169	4377.3	437730	-124	127	-0.3	-30
+803	2	10793	99704	2.41141	299.41141	150.91141	15091.14114	2.41141	299.4114	150.9114	15091.14098	2.41141	299.41141	150.91141	15091.141	2020-01-01	2020-01-02	2020-01-01 00:13:23	2020-01-02 03:41:44	2020-01-01 00:13:23.000	2020-01-02 03:41:44.000	803	99704	50253.5	5025350	803	99704	50253.5	5025350	-32765	32170	4378.3	437830	-128	127	-1.86	-186
+804	2	10794	99705	2.41441	299.41441	150.91441	15091.44144	2.41441	299.41443	150.91441	15091.44158	2.41441	299.41441	150.91441	15091.441	2020-01-01	2020-01-02	2020-01-01 00:13:24	2020-01-02 03:41:45	2020-01-01 00:13:24.000	2020-01-02 03:41:45.000	804	99705	50254.5	5025450	804	99705	50254.5	5025450	-32764	32171	4379.3	437930	-128	123	-3.42	-342
+805	2	10795	99706	2.41741	299.41741	150.91741	15091.74174	2.41741	299.41742	150.91741	15091.74188	2.41741	299.41741	150.91741	15091.741	2020-01-01	2020-01-02	2020-01-01 00:13:25	2020-01-02 03:41:46	2020-01-01 00:13:25.000	2020-01-02 03:41:46.000	805	99706	50255.5	5025550	805	99706	50255.5	5025550	-32763	32172	4380.3	438030	-127	124	-2.42	-242
+806	2	10796	99707	2.42042	299.42042	150.92042	15092.04204	2.42042	299.4204	150.92042	15092.04205	2.42042	299.42042	150.92042	15092.042	2020-01-01	2020-01-02	2020-01-01 00:13:26	2020-01-02 03:41:47	2020-01-01 00:13:26.000	2020-01-02 03:41:47.000	806	99707	50256.5	5025650	806	99707	50256.5	5025650	-32762	32173	4381.3	438130	-126	125	-1.42	-142
+807	2	10797	99708	2.42342	299.42342	150.92342	15092.34234	2.42342	299.42343	150.92342	15092.34216	2.42342	299.42342	150.92342	15092.342	2020-01-01	2020-01-02	2020-01-01 00:13:27	2020-01-02 03:41:48	2020-01-01 00:13:27.000	2020-01-02 03:41:48.000	807	99708	50257.5	5025750	807	99708	50257.5	5025750	-32761	32174	4382.3	438230	-125	126	-0.42	-42
+808	2	10798	99709	2.42642	299.42642	150.92642	15092.64264	2.42642	299.42642	150.92642	15092.64245	2.42642	299.42642	150.92642	15092.642	2020-01-01	2020-01-02	2020-01-01 00:13:28	2020-01-02 03:41:49	2020-01-01 00:13:28.000	2020-01-02 03:41:49.000	808	99709	50258.5	5025850	808	99709	50258.5	5025850	-32760	32175	4383.3	438330	-124	127	0.58	58
+809	2	10799	99710	2.42942	299.42942	150.92942	15092.94294	2.42942	299.42944	150.92943	15092.94305	2.42942	299.42942	150.92942	15092.942	2020-01-01	2020-01-02	2020-01-01 00:13:29	2020-01-02 03:41:50	2020-01-01 00:13:29.000	2020-01-02 03:41:50.000	809	99710	50259.5	5025950	809	99710	50259.5	5025950	-32759	32176	4384.3	438430	-128	127	-0.98	-98
 81	2	10071	99981	0.24324	300.24324	150.24324	15174.56756	0.24324	300.24326	150.24324	15174.56758	0.24324	300.24324	150.24324000000001	15174.56724	2020-01-01	2020-01-02	2020-01-01 00:01:21	2020-01-02 03:46:21	2020-01-01 00:01:21.000	2020-01-02 03:46:21.000	81	99981	50031	5053131	81	99981	50031	5053131	-32488	32447	4610.009900990099	465611	-127	124	-3.0594059405940595	-309
-810	2	10800	99711	2.43243	299.43243	150.93243	15093.24324	2.43243	299.43243	150.93243	15093.24338	2.43243	299.43243	150.93243	15093.24300	2020-01-01	2020-01-02	2020-01-01 00:13:30	2020-01-02 03:41:51	2020-01-01 00:13:30.000	2020-01-02 03:41:51.000	810	99711	50260.5	5026050	810	99711	50260.5	5026050	-32758	32177	4385.3	438530	-128	127	-2.54	-254
-811	2	10801	99712	2.43543	299.43543	150.93543	15093.54354	2.43543	299.43542	150.93543	15093.54353	2.43543	299.43543	150.93543	15093.54300	2020-01-01	2020-01-02	2020-01-01 00:13:31	2020-01-02 03:41:52	2020-01-01 00:13:31.000	2020-01-02 03:41:52.000	811	99712	50261.5	5026150	811	99712	50261.5	5026150	-32757	32178	4386.3	438630	-128	124	-4.1	-410
-812	2	10802	99713	2.43843	299.43843	150.93843	15093.84384	2.43843	299.43845	150.93844	15093.84428	2.43843	299.43843	150.93843	15093.84300	2020-01-01	2020-01-02	2020-01-01 00:13:32	2020-01-02 03:41:53	2020-01-01 00:13:32.000	2020-01-02 03:41:53.000	812	99713	50262.5	5026250	812	99713	50262.5	5026250	-32756	32179	4387.3	438730	-127	125	-3.1	-310
-813	2	10803	99714	2.44144	299.44144	150.94144	15094.14414	2.44144	299.44144	150.94143	15094.14392	2.44144	299.44144	150.94144	15094.14400	2020-01-01	2020-01-02	2020-01-01 00:13:33	2020-01-02 03:41:54	2020-01-01 00:13:33.000	2020-01-02 03:41:54.000	813	99714	50263.5	5026350	813	99714	50263.5	5026350	-32755	32180	4388.3	438830	-126	126	-2.1	-210
-814	2	10804	99715	2.44444	299.44444	150.94444	15094.44444	2.44444	299.44446	150.94444	15094.44452	2.44444	299.44444	150.94444	15094.44400	2020-01-01	2020-01-02	2020-01-01 00:13:34	2020-01-02 03:41:55	2020-01-01 00:13:34.000	2020-01-02 03:41:55.000	814	99715	50264.5	5026450	814	99715	50264.5	5026450	-32754	32181	4389.3	438930	-125	127	-1.1	-110
-815	2	10805	99716	2.44744	299.44744	150.94744	15094.74474	2.44744	299.44745	150.94744	15094.74485	2.44744	299.44744	150.94744	15094.74400	2020-01-01	2020-01-02	2020-01-01 00:13:35	2020-01-02 03:41:56	2020-01-01 00:13:35.000	2020-01-02 03:41:56.000	815	99716	50265.5	5026550	815	99716	50265.5	5026550	-32753	32182	4390.3	439030	-128	127	-2.66	-266
-816	2	10806	99717	2.45045	299.45045	150.95045	15095.04504	2.45045	299.45044	150.95045	15095.045	2.45045	299.45045	150.95045	15095.04500	2020-01-01	2020-01-02	2020-01-01 00:13:36	2020-01-02 03:41:57	2020-01-01 00:13:36.000	2020-01-02 03:41:57.000	816	99717	50266.5	5026650	816	99717	50266.5	5026650	-32752	32183	4391.3	439130	-128	127	-4.22	-422
-817	2	10807	99718	2.45345	299.45345	150.95345	15095.34534	2.45345	299.45346	150.95345	15095.34574	2.45345	299.45345	150.95345	15095.34500	2020-01-01	2020-01-02	2020-01-01 00:13:37	2020-01-02 03:41:58	2020-01-01 00:13:37.000	2020-01-02 03:41:58.000	817	99718	50267.5	5026750	817	99718	50267.5	5026750	-32751	32184	4392.3	439230	-128	123	-5.78	-578
-818	2	10808	99719	2.45645	299.45645	150.95645	15095.64564	2.45645	299.45645	150.95645	15095.64539	2.45645	299.45645	150.95645000000002	15095.64500	2020-01-01	2020-01-02	2020-01-01 00:13:38	2020-01-02 03:41:59	2020-01-01 00:13:38.000	2020-01-02 03:41:59.000	818	99719	50268.5	5026850	818	99719	50268.5	5026850	-32750	32185	4393.3	439330	-127	124	-4.78	-478
-819	2	10809	99720	2.45945	299.45945	150.95945	15095.94594	2.45945	299.45947	150.95946	15095.94602	2.45945	299.45945	150.95945	15095.94500	2020-01-01	2020-01-02	2020-01-01 00:13:39	2020-01-02 03:42:00	2020-01-01 00:13:39.000	2020-01-02 03:42:00.000	819	99720	50269.5	5026950	819	99720	50269.5	5026950	-32749	32186	4394.3	439430	-126	125	-3.78	-378
+810	2	10800	99711	2.43243	299.43243	150.93243	15093.24324	2.43243	299.43243	150.93243	15093.24338	2.43243	299.43243	150.93243	15093.243	2020-01-01	2020-01-02	2020-01-01 00:13:30	2020-01-02 03:41:51	2020-01-01 00:13:30.000	2020-01-02 03:41:51.000	810	99711	50260.5	5026050	810	99711	50260.5	5026050	-32758	32177	4385.3	438530	-128	127	-2.54	-254
+811	2	10801	99712	2.43543	299.43543	150.93543	15093.54354	2.43543	299.43542	150.93543	15093.54353	2.43543	299.43543	150.93543	15093.543	2020-01-01	2020-01-02	2020-01-01 00:13:31	2020-01-02 03:41:52	2020-01-01 00:13:31.000	2020-01-02 03:41:52.000	811	99712	50261.5	5026150	811	99712	50261.5	5026150	-32757	32178	4386.3	438630	-128	124	-4.1	-410
+812	2	10802	99713	2.43843	299.43843	150.93843	15093.84384	2.43843	299.43845	150.93844	15093.84428	2.43843	299.43843	150.93843	15093.843	2020-01-01	2020-01-02	2020-01-01 00:13:32	2020-01-02 03:41:53	2020-01-01 00:13:32.000	2020-01-02 03:41:53.000	812	99713	50262.5	5026250	812	99713	50262.5	5026250	-32756	32179	4387.3	438730	-127	125	-3.1	-310
+813	2	10803	99714	2.44144	299.44144	150.94144	15094.14414	2.44144	299.44144	150.94143	15094.14392	2.44144	299.44144	150.94144	15094.144	2020-01-01	2020-01-02	2020-01-01 00:13:33	2020-01-02 03:41:54	2020-01-01 00:13:33.000	2020-01-02 03:41:54.000	813	99714	50263.5	5026350	813	99714	50263.5	5026350	-32755	32180	4388.3	438830	-126	126	-2.1	-210
+814	2	10804	99715	2.44444	299.44444	150.94444	15094.44444	2.44444	299.44446	150.94444	15094.44452	2.44444	299.44444	150.94444	15094.444	2020-01-01	2020-01-02	2020-01-01 00:13:34	2020-01-02 03:41:55	2020-01-01 00:13:34.000	2020-01-02 03:41:55.000	814	99715	50264.5	5026450	814	99715	50264.5	5026450	-32754	32181	4389.3	438930	-125	127	-1.1	-110
+815	2	10805	99716	2.44744	299.44744	150.94744	15094.74474	2.44744	299.44745	150.94744	15094.74485	2.44744	299.44744	150.94744	15094.744	2020-01-01	2020-01-02	2020-01-01 00:13:35	2020-01-02 03:41:56	2020-01-01 00:13:35.000	2020-01-02 03:41:56.000	815	99716	50265.5	5026550	815	99716	50265.5	5026550	-32753	32182	4390.3	439030	-128	127	-2.66	-266
+816	2	10806	99717	2.45045	299.45045	150.95045	15095.04504	2.45045	299.45044	150.95045	15095.045	2.45045	299.45045	150.95045	15095.045	2020-01-01	2020-01-02	2020-01-01 00:13:36	2020-01-02 03:41:57	2020-01-01 00:13:36.000	2020-01-02 03:41:57.000	816	99717	50266.5	5026650	816	99717	50266.5	5026650	-32752	32183	4391.3	439130	-128	127	-4.22	-422
+817	2	10807	99718	2.45345	299.45345	150.95345	15095.34534	2.45345	299.45346	150.95345	15095.34574	2.45345	299.45345	150.95345	15095.345	2020-01-01	2020-01-02	2020-01-01 00:13:37	2020-01-02 03:41:58	2020-01-01 00:13:37.000	2020-01-02 03:41:58.000	817	99718	50267.5	5026750	817	99718	50267.5	5026750	-32751	32184	4392.3	439230	-128	123	-5.78	-578
+818	2	10808	99719	2.45645	299.45645	150.95645	15095.64564	2.45645	299.45645	150.95645	15095.64539	2.45645	299.45645	150.95645000000002	15095.645	2020-01-01	2020-01-02	2020-01-01 00:13:38	2020-01-02 03:41:59	2020-01-01 00:13:38.000	2020-01-02 03:41:59.000	818	99719	50268.5	5026850	818	99719	50268.5	5026850	-32750	32185	4393.3	439330	-127	124	-4.78	-478
+819	2	10809	99720	2.45945	299.45945	150.95945	15095.94594	2.45945	299.45947	150.95946	15095.94602	2.45945	299.45945	150.95945	15095.945	2020-01-01	2020-01-02	2020-01-01 00:13:39	2020-01-02 03:42:00	2020-01-01 00:13:39.000	2020-01-02 03:42:00.000	819	99720	50269.5	5026950	819	99720	50269.5	5026950	-32749	32186	4394.3	439430	-126	125	-3.78	-378
 82	2	10072	99982	0.24624	300.24624	150.24624	15174.87087	0.24624	300.24625	150.24624	15174.87088	0.24624	300.24624	150.24624	15174.87024	2020-01-01	2020-01-02	2020-01-01 00:01:22	2020-01-02 03:46:22	2020-01-01 00:01:22.000	2020-01-02 03:46:22.000	82	99982	50032	5053232	82	99982	50032	5053232	-32487	32448	4611.009900990099	465712	-126	125	-2.0594059405940595	-208
-820	2	10810	99721	2.46246	299.46246	150.96246	15096.24624	2.46246	299.46246	150.96246	15096.24633	2.46246	299.46246	150.96246	15096.24600	2020-01-01	2020-01-02	2020-01-01 00:13:40	2020-01-02 03:42:01	2020-01-01 00:13:40.000	2020-01-02 03:42:01.000	820	99721	50270.5	5027050	820	99721	50270.5	5027050	-32748	32187	4395.3	439530	-125	126	-2.78	-278
-821	2	10811	99722	2.46546	299.46546	150.96546	15096.54654	2.46546	299.46545	150.96546	15096.54646	2.46546	299.46546	150.96546	15096.54600	2020-01-01	2020-01-02	2020-01-01 00:13:41	2020-01-02 03:42:02	2020-01-01 00:13:41.000	2020-01-02 03:42:02.000	821	99722	50271.5	5027150	821	99722	50271.5	5027150	-32747	32188	4396.3	439630	-124	127	-1.78	-178
-822	2	10812	99723	2.46846	299.46846	150.96846	15096.84684	2.46846	299.46848	150.96847	15096.84721	2.46846	299.46846	150.96846	15096.84600	2020-01-01	2020-01-02	2020-01-01 00:13:42	2020-01-02 03:42:03	2020-01-01 00:13:42.000	2020-01-02 03:42:03.000	822	99723	50272.5	5027250	822	99723	50272.5	5027250	-32746	32189	4397.3	439730	-128	127	-3.34	-334
-823	2	10813	99724	2.47147	299.47147	150.97147	15097.14714	2.47147	299.47147	150.97146	15097.14686	2.47147	299.47147	150.97147	15097.14700	2020-01-01	2020-01-02	2020-01-01 00:13:43	2020-01-02 03:42:04	2020-01-01 00:13:43.000	2020-01-02 03:42:04.000	823	99724	50273.5	5027350	823	99724	50273.5	5027350	-32745	32190	4398.3	439830	-128	123	-4.9	-490
-824	2	10814	99725	2.47447	299.47447	150.97447	15097.44744	2.47447	299.4745	150.97447	15097.44749	2.47447	299.47447	150.97447	15097.44700	2020-01-01	2020-01-02	2020-01-01 00:13:44	2020-01-02 03:42:05	2020-01-01 00:13:44.000	2020-01-02 03:42:05.000	824	99725	50274.5	5027450	824	99725	50274.5	5027450	-32744	32191	4399.3	439930	-127	124	-3.9	-390
-825	2	10815	99726	2.47747	299.47747	150.97747	15097.74774	2.47747	299.47748	150.97747	15097.74779	2.47747	299.47747	150.97746999999998	15097.74700	2020-01-01	2020-01-02	2020-01-01 00:13:45	2020-01-02 03:42:06	2020-01-01 00:13:45.000	2020-01-02 03:42:06.000	825	99726	50275.5	5027550	825	99726	50275.5	5027550	-32743	32192	4400.3	440030	-126	125	-2.9	-290
-826	2	10816	99727	2.48048	299.48048	150.98048	15098.04804	2.48048	299.48047	150.98048	15098.04809	2.48048	299.48048	150.98048	15098.04800	2020-01-01	2020-01-02	2020-01-01 00:13:46	2020-01-02 03:42:07	2020-01-01 00:13:46.000	2020-01-02 03:42:07.000	826	99727	50276.5	5027650	826	99727	50276.5	5027650	-32742	32193	4401.3	440130	-125	126	-1.9	-190
-827	2	10817	99728	2.48348	299.48348	150.98348	15098.34834	2.48348	299.4835	150.98348	15098.34869	2.48348	299.48348	150.98348	15098.34800	2020-01-01	2020-01-02	2020-01-01 00:13:47	2020-01-02 03:42:08	2020-01-01 00:13:47.000	2020-01-02 03:42:08.000	827	99728	50277.5	5027750	827	99728	50277.5	5027750	-32741	32194	4402.3	440230	-124	127	-0.9	-90
-828	2	10818	99729	2.48648	299.48648	150.98648	15098.64864	2.48648	299.48648	150.98648	15098.64837	2.48648	299.48648	150.98648	15098.64800	2020-01-01	2020-01-02	2020-01-01 00:13:48	2020-01-02 03:42:09	2020-01-01 00:13:48.000	2020-01-02 03:42:09.000	828	99729	50278.5	5027850	828	99729	50278.5	5027850	-32740	32195	4403.3	440330	-128	127	-2.46	-246
-829	2	10819	99730	2.48948	299.48948	150.98948	15098.94894	2.48948	299.4895	150.98948	15098.94896	2.48948	299.48948	150.98948000000001	15098.94800	2020-01-01	2020-01-02	2020-01-01 00:13:49	2020-01-02 03:42:10	2020-01-01 00:13:49.000	2020-01-02 03:42:10.000	829	99730	50279.5	5027950	829	99730	50279.5	5027950	-32739	32196	4404.3	440430	-128	123	-4.02	-402
+820	2	10810	99721	2.46246	299.46246	150.96246	15096.24624	2.46246	299.46246	150.96246	15096.24633	2.46246	299.46246	150.96246	15096.246	2020-01-01	2020-01-02	2020-01-01 00:13:40	2020-01-02 03:42:01	2020-01-01 00:13:40.000	2020-01-02 03:42:01.000	820	99721	50270.5	5027050	820	99721	50270.5	5027050	-32748	32187	4395.3	439530	-125	126	-2.78	-278
+821	2	10811	99722	2.46546	299.46546	150.96546	15096.54654	2.46546	299.46545	150.96546	15096.54646	2.46546	299.46546	150.96546	15096.546	2020-01-01	2020-01-02	2020-01-01 00:13:41	2020-01-02 03:42:02	2020-01-01 00:13:41.000	2020-01-02 03:42:02.000	821	99722	50271.5	5027150	821	99722	50271.5	5027150	-32747	32188	4396.3	439630	-124	127	-1.78	-178
+822	2	10812	99723	2.46846	299.46846	150.96846	15096.84684	2.46846	299.46848	150.96847	15096.84721	2.46846	299.46846	150.96846	15096.846	2020-01-01	2020-01-02	2020-01-01 00:13:42	2020-01-02 03:42:03	2020-01-01 00:13:42.000	2020-01-02 03:42:03.000	822	99723	50272.5	5027250	822	99723	50272.5	5027250	-32746	32189	4397.3	439730	-128	127	-3.34	-334
+823	2	10813	99724	2.47147	299.47147	150.97147	15097.14714	2.47147	299.47147	150.97146	15097.14686	2.47147	299.47147	150.97147	15097.147	2020-01-01	2020-01-02	2020-01-01 00:13:43	2020-01-02 03:42:04	2020-01-01 00:13:43.000	2020-01-02 03:42:04.000	823	99724	50273.5	5027350	823	99724	50273.5	5027350	-32745	32190	4398.3	439830	-128	123	-4.9	-490
+824	2	10814	99725	2.47447	299.47447	150.97447	15097.44744	2.47447	299.4745	150.97447	15097.44749	2.47447	299.47447	150.97447	15097.447	2020-01-01	2020-01-02	2020-01-01 00:13:44	2020-01-02 03:42:05	2020-01-01 00:13:44.000	2020-01-02 03:42:05.000	824	99725	50274.5	5027450	824	99725	50274.5	5027450	-32744	32191	4399.3	439930	-127	124	-3.9	-390
+825	2	10815	99726	2.47747	299.47747	150.97747	15097.74774	2.47747	299.47748	150.97747	15097.74779	2.47747	299.47747	150.97746999999998	15097.747	2020-01-01	2020-01-02	2020-01-01 00:13:45	2020-01-02 03:42:06	2020-01-01 00:13:45.000	2020-01-02 03:42:06.000	825	99726	50275.5	5027550	825	99726	50275.5	5027550	-32743	32192	4400.3	440030	-126	125	-2.9	-290
+826	2	10816	99727	2.48048	299.48048	150.98048	15098.04804	2.48048	299.48047	150.98048	15098.04809	2.48048	299.48048	150.98048	15098.048	2020-01-01	2020-01-02	2020-01-01 00:13:46	2020-01-02 03:42:07	2020-01-01 00:13:46.000	2020-01-02 03:42:07.000	826	99727	50276.5	5027650	826	99727	50276.5	5027650	-32742	32193	4401.3	440130	-125	126	-1.9	-190
+827	2	10817	99728	2.48348	299.48348	150.98348	15098.34834	2.48348	299.4835	150.98348	15098.34869	2.48348	299.48348	150.98348	15098.348	2020-01-01	2020-01-02	2020-01-01 00:13:47	2020-01-02 03:42:08	2020-01-01 00:13:47.000	2020-01-02 03:42:08.000	827	99728	50277.5	5027750	827	99728	50277.5	5027750	-32741	32194	4402.3	440230	-124	127	-0.9	-90
+828	2	10818	99729	2.48648	299.48648	150.98648	15098.64864	2.48648	299.48648	150.98648	15098.64837	2.48648	299.48648	150.98648	15098.648	2020-01-01	2020-01-02	2020-01-01 00:13:48	2020-01-02 03:42:09	2020-01-01 00:13:48.000	2020-01-02 03:42:09.000	828	99729	50278.5	5027850	828	99729	50278.5	5027850	-32740	32195	4403.3	440330	-128	127	-2.46	-246
+829	2	10819	99730	2.48948	299.48948	150.98948	15098.94894	2.48948	299.4895	150.98948	15098.94896	2.48948	299.48948	150.98948000000001	15098.948	2020-01-01	2020-01-02	2020-01-01 00:13:49	2020-01-02 03:42:10	2020-01-01 00:13:49.000	2020-01-02 03:42:10.000	829	99730	50279.5	5027950	829	99730	50279.5	5027950	-32739	32196	4404.3	440430	-128	123	-4.02	-402
 83	2	10073	99983	0.24924	300.24924	150.24924	15175.17417	0.24924	300.24924	150.24924	15175.17417	0.24924	300.24924	150.24924000000001	15175.17324	2020-01-01	2020-01-02	2020-01-01 00:01:23	2020-01-02 03:46:23	2020-01-01 00:01:23.000	2020-01-02 03:46:23.000	83	99983	50033	5053333	83	99983	50033	5053333	-32486	32449	4612.009900990099	465813	-125	126	-1.0594059405940595	-107
-830	2	10820	99731	2.49249	299.49249	150.99249	15099.24924	2.49249	299.4925	150.99249	15099.24926	2.49249	299.49249	150.99249	15099.24900	2020-01-01	2020-01-02	2020-01-01 00:13:50	2020-01-02 03:42:11	2020-01-01 00:13:50.000	2020-01-02 03:42:11.000	830	99731	50280.5	5028050	830	99731	50280.5	5028050	-32738	32197	4405.3	440530	-127	124	-3.02	-302
-831	2	10821	99732	2.49549	299.49549	150.99549	15099.54954	2.49549	299.49548	150.99549	15099.54956	2.49549	299.49549	150.99549000000002	15099.54900	2020-01-01	2020-01-02	2020-01-01 00:13:51	2020-01-02 03:42:12	2020-01-01 00:13:51.000	2020-01-02 03:42:12.000	831	99732	50281.5	5028150	831	99732	50281.5	5028150	-32737	32198	4406.3	440630	-126	125	-2.02	-202
-832	2	10822	99733	2.49849	299.49849	150.99849	15099.84984	2.49849	299.4985	150.9985	15099.85016	2.49849	299.49849	150.99849	15099.84900	2020-01-01	2020-01-02	2020-01-01 00:13:52	2020-01-02 03:42:13	2020-01-01 00:13:52.000	2020-01-02 03:42:13.000	832	99733	50282.5	5028250	832	99733	50282.5	5028250	-32736	32199	4407.3	440730	-125	126	-1.02	-102
-833	2	10823	99734	2.5015	299.5015	151.0015	15100.15015	2.5015	299.5015	151.00149	15100.14983	2.50150	299.50150	151.0015	15100.15000	2020-01-01	2020-01-02	2020-01-01 00:13:53	2020-01-02 03:42:14	2020-01-01 00:13:53.000	2020-01-02 03:42:14.000	833	99734	50283.5	5028350	833	99734	50283.5	5028350	-32735	32200	4408.3	440830	-124	127	-0.02	-2
-834	2	10824	99735	2.5045	299.5045	151.0045	15100.45045	2.5045	299.50452	151.0045	15100.45043	2.50450	299.50450	151.0045	15100.45000	2020-01-01	2020-01-02	2020-01-01 00:13:54	2020-01-02 03:42:15	2020-01-01 00:13:54.000	2020-01-02 03:42:15.000	834	99735	50284.5	5028450	834	99735	50284.5	5028450	-32734	32201	4409.3	440930	-128	127	-1.58	-158
-835	2	10825	99736	2.5075	299.5075	151.0075	15100.75075	2.5075	299.5075	151.0075	15100.75073	2.50750	299.50750	151.0075	15100.75000	2020-01-01	2020-01-02	2020-01-01 00:13:55	2020-01-02 03:42:16	2020-01-01 00:13:55.000	2020-01-02 03:42:16.000	835	99736	50285.5	5028550	835	99736	50285.5	5028550	-32733	32202	4410.3	441030	-128	123	-3.14	-314
-836	2	10826	99737	2.51051	299.51051	151.01051	15101.05105	2.51051	299.5105	151.01051	15101.05103	2.51051	299.51051	151.01050999999998	15101.05100	2020-01-01	2020-01-02	2020-01-01 00:13:56	2020-01-02 03:42:17	2020-01-01 00:13:56.000	2020-01-02 03:42:17.000	836	99737	50286.5	5028650	836	99737	50286.5	5028650	-32732	32203	4411.3	441130	-127	124	-2.14	-214
-837	2	10827	99738	2.51351	299.51351	151.01351	15101.35135	2.51351	299.51352	151.01351	15101.35162	2.51351	299.51351	151.01351	15101.35100	2020-01-01	2020-01-02	2020-01-01 00:13:57	2020-01-02 03:42:18	2020-01-01 00:13:57.000	2020-01-02 03:42:18.000	837	99738	50287.5	5028750	837	99738	50287.5	5028750	-32731	32204	4412.3	441230	-126	125	-1.14	-114
-838	2	10828	99739	2.51651	299.51651	151.01651	15101.65165	2.51651	299.5165	151.01651	15101.6513	2.51651	299.51651	151.01651	15101.65100	2020-01-01	2020-01-02	2020-01-01 00:13:58	2020-01-02 03:42:19	2020-01-01 00:13:58.000	2020-01-02 03:42:19.000	838	99739	50288.5	5028850	838	99739	50288.5	5028850	-32730	32205	4413.3	441330	-125	126	-0.14	-14
-839	2	10829	99740	2.51951	299.51951	151.01951	15101.95195	2.51951	299.51953	151.01951	15101.9519	2.51951	299.51951	151.01951	15101.95100	2020-01-01	2020-01-02	2020-01-01 00:13:59	2020-01-02 03:42:20	2020-01-01 00:13:59.000	2020-01-02 03:42:20.000	839	99740	50289.5	5028950	839	99740	50289.5	5028950	-32729	32206	4414.3	441430	-124	127	0.86	86
+830	2	10820	99731	2.49249	299.49249	150.99249	15099.24924	2.49249	299.4925	150.99249	15099.24926	2.49249	299.49249	150.99249	15099.249	2020-01-01	2020-01-02	2020-01-01 00:13:50	2020-01-02 03:42:11	2020-01-01 00:13:50.000	2020-01-02 03:42:11.000	830	99731	50280.5	5028050	830	99731	50280.5	5028050	-32738	32197	4405.3	440530	-127	124	-3.02	-302
+831	2	10821	99732	2.49549	299.49549	150.99549	15099.54954	2.49549	299.49548	150.99549	15099.54956	2.49549	299.49549	150.99549000000002	15099.549	2020-01-01	2020-01-02	2020-01-01 00:13:51	2020-01-02 03:42:12	2020-01-01 00:13:51.000	2020-01-02 03:42:12.000	831	99732	50281.5	5028150	831	99732	50281.5	5028150	-32737	32198	4406.3	440630	-126	125	-2.02	-202
+832	2	10822	99733	2.49849	299.49849	150.99849	15099.84984	2.49849	299.4985	150.9985	15099.85016	2.49849	299.49849	150.99849	15099.849	2020-01-01	2020-01-02	2020-01-01 00:13:52	2020-01-02 03:42:13	2020-01-01 00:13:52.000	2020-01-02 03:42:13.000	832	99733	50282.5	5028250	832	99733	50282.5	5028250	-32736	32199	4407.3	440730	-125	126	-1.02	-102
+833	2	10823	99734	2.5015	299.5015	151.0015	15100.15015	2.5015	299.5015	151.00149	15100.14983	2.5015	299.5015	151.0015	15100.15	2020-01-01	2020-01-02	2020-01-01 00:13:53	2020-01-02 03:42:14	2020-01-01 00:13:53.000	2020-01-02 03:42:14.000	833	99734	50283.5	5028350	833	99734	50283.5	5028350	-32735	32200	4408.3	440830	-124	127	-0.02	-2
+834	2	10824	99735	2.5045	299.5045	151.0045	15100.45045	2.5045	299.50452	151.0045	15100.45043	2.5045	299.5045	151.0045	15100.45	2020-01-01	2020-01-02	2020-01-01 00:13:54	2020-01-02 03:42:15	2020-01-01 00:13:54.000	2020-01-02 03:42:15.000	834	99735	50284.5	5028450	834	99735	50284.5	5028450	-32734	32201	4409.3	440930	-128	127	-1.58	-158
+835	2	10825	99736	2.5075	299.5075	151.0075	15100.75075	2.5075	299.5075	151.0075	15100.75073	2.5075	299.5075	151.0075	15100.75	2020-01-01	2020-01-02	2020-01-01 00:13:55	2020-01-02 03:42:16	2020-01-01 00:13:55.000	2020-01-02 03:42:16.000	835	99736	50285.5	5028550	835	99736	50285.5	5028550	-32733	32202	4410.3	441030	-128	123	-3.14	-314
+836	2	10826	99737	2.51051	299.51051	151.01051	15101.05105	2.51051	299.5105	151.01051	15101.05103	2.51051	299.51051	151.01050999999998	15101.051	2020-01-01	2020-01-02	2020-01-01 00:13:56	2020-01-02 03:42:17	2020-01-01 00:13:56.000	2020-01-02 03:42:17.000	836	99737	50286.5	5028650	836	99737	50286.5	5028650	-32732	32203	4411.3	441130	-127	124	-2.14	-214
+837	2	10827	99738	2.51351	299.51351	151.01351	15101.35135	2.51351	299.51352	151.01351	15101.35162	2.51351	299.51351	151.01351	15101.351	2020-01-01	2020-01-02	2020-01-01 00:13:57	2020-01-02 03:42:18	2020-01-01 00:13:57.000	2020-01-02 03:42:18.000	837	99738	50287.5	5028750	837	99738	50287.5	5028750	-32731	32204	4412.3	441230	-126	125	-1.14	-114
+838	2	10828	99739	2.51651	299.51651	151.01651	15101.65165	2.51651	299.5165	151.01651	15101.6513	2.51651	299.51651	151.01651	15101.651	2020-01-01	2020-01-02	2020-01-01 00:13:58	2020-01-02 03:42:19	2020-01-01 00:13:58.000	2020-01-02 03:42:19.000	838	99739	50288.5	5028850	838	99739	50288.5	5028850	-32730	32205	4413.3	441330	-125	126	-0.14	-14
+839	2	10829	99740	2.51951	299.51951	151.01951	15101.95195	2.51951	299.51953	151.01951	15101.9519	2.51951	299.51951	151.01951	15101.951	2020-01-01	2020-01-02	2020-01-01 00:13:59	2020-01-02 03:42:20	2020-01-01 00:13:59.000	2020-01-02 03:42:20.000	839	99740	50289.5	5028950	839	99740	50289.5	5028950	-32729	32206	4414.3	441430	-124	127	0.86	86
 84	2	10074	99984	0.25225	300.25225	150.25225	15175.47747	0.25225	300.25226	150.25225	15175.47778	0.25225	300.25225	150.25225	15175.47725	2020-01-01	2020-01-02	2020-01-01 00:01:24	2020-01-02 03:46:24	2020-01-01 00:01:24.000	2020-01-02 03:46:24.000	84	99984	50034	5053434	84	99984	50034	5053434	-32485	32450	4613.009900990099	465914	-124	127	-0.0594059405940594	-6
-840	2	10830	99741	2.52252	299.52252	151.02252	15102.25225	2.52252	299.52252	151.02252	15102.2522	2.52252	299.52252	151.02252000000001	15102.25200	2020-01-01	2020-01-02	2020-01-01 00:14:00	2020-01-02 03:42:21	2020-01-01 00:14:00.000	2020-01-02 03:42:21.000	840	99741	50290.5	5029050	840	99741	50290.5	5029050	-32728	32207	4415.3	441530	-128	127	-0.7	-70
-841	2	10831	99742	2.52552	299.52552	151.02552	15102.55255	2.52552	299.5255	151.02552	15102.5525	2.52552	299.52552	151.02552	15102.55200	2020-01-01	2020-01-02	2020-01-01 00:14:01	2020-01-02 03:42:22	2020-01-01 00:14:01.000	2020-01-02 03:42:22.000	841	99742	50291.5	5029150	841	99742	50291.5	5029150	-32727	32208	4416.3	441630	-128	127	-2.26	-226
-842	2	10832	99743	2.52852	299.52852	151.02852	15102.85285	2.52852	299.52853	151.02853	15102.85313	2.52852	299.52852	151.02852000000001	15102.85200	2020-01-01	2020-01-02	2020-01-01 00:14:02	2020-01-02 03:42:23	2020-01-01 00:14:02.000	2020-01-02 03:42:23.000	842	99743	50292.5	5029250	842	99743	50292.5	5029250	-32726	32209	4417.3	441730	-128	123	-3.82	-382
-843	2	10833	99744	2.53153	299.53153	151.03153	15103.15315	2.53153	299.53152	151.03152	15103.15278	2.53153	299.53153	151.03153	15103.15300	2020-01-01	2020-01-02	2020-01-01 00:14:03	2020-01-02 03:42:24	2020-01-01 00:14:03.000	2020-01-02 03:42:24.000	843	99744	50293.5	5029350	843	99744	50293.5	5029350	-32725	32210	4418.3	441830	-127	124	-2.82	-282
-844	2	10834	99745	2.53453	299.53453	151.03453	15103.45345	2.53453	299.53455	151.03453	15103.45353	2.53453	299.53453	151.03453	15103.45300	2020-01-01	2020-01-02	2020-01-01 00:14:04	2020-01-02 03:42:25	2020-01-01 00:14:04.000	2020-01-02 03:42:25.000	844	99745	50294.5	5029450	844	99745	50294.5	5029450	-32724	32211	4419.3	441930	-126	125	-1.82	-182
-845	2	10835	99746	2.53753	299.53753	151.03753	15103.75375	2.53753	299.53754	151.03753	15103.75366	2.53753	299.53753	151.03753	15103.75300	2020-01-01	2020-01-02	2020-01-01 00:14:05	2020-01-02 03:42:26	2020-01-01 00:14:05.000	2020-01-02 03:42:26.000	845	99746	50295.5	5029550	845	99746	50295.5	5029550	-32723	32212	4420.3	442030	-125	126	-0.82	-82
-846	2	10836	99747	2.54054	299.54054	151.04054	15104.05405	2.54054	299.54053	151.04053	15104.05397	2.54054	299.54054	151.04054	15104.05400	2020-01-01	2020-01-02	2020-01-01 00:14:06	2020-01-02 03:42:27	2020-01-01 00:14:06.000	2020-01-02 03:42:27.000	846	99747	50296.5	5029650	846	99747	50296.5	5029650	-32722	32213	4421.3	442130	-124	127	0.18	18
-847	2	10837	99748	2.54354	299.54354	151.04354	15104.35435	2.54354	299.54355	151.04354	15104.3546	2.54354	299.54354	151.04354	15104.35400	2020-01-01	2020-01-02	2020-01-01 00:14:07	2020-01-02 03:42:28	2020-01-01 00:14:07.000	2020-01-02 03:42:28.000	847	99748	50297.5	5029750	847	99748	50297.5	5029750	-32721	32214	4422.3	442230	-128	127	-1.38	-138
-848	2	10838	99749	2.54654	299.54654	151.04654	15104.65465	2.54654	299.54654	151.04654	15104.65425	2.54654	299.54654	151.04654	15104.65400	2020-01-01	2020-01-02	2020-01-01 00:14:08	2020-01-02 03:42:29	2020-01-01 00:14:08.000	2020-01-02 03:42:29.000	848	99749	50298.5	5029850	848	99749	50298.5	5029850	-32720	32215	4423.3	442330	-128	123	-2.94	-294
-849	2	10839	99750	2.54954	299.54954	151.04954	15104.95495	2.54954	299.54956	151.04954	15104.95499	2.54954	299.54954	151.04954	15104.95400	2020-01-01	2020-01-02	2020-01-01 00:14:09	2020-01-02 03:42:30	2020-01-01 00:14:09.000	2020-01-02 03:42:30.000	849	99750	50299.5	5029950	849	99750	50299.5	5029950	-32719	32216	4424.3	442430	-127	124	-1.94	-194
+840	2	10830	99741	2.52252	299.52252	151.02252	15102.25225	2.52252	299.52252	151.02252	15102.2522	2.52252	299.52252	151.02252000000001	15102.252	2020-01-01	2020-01-02	2020-01-01 00:14:00	2020-01-02 03:42:21	2020-01-01 00:14:00.000	2020-01-02 03:42:21.000	840	99741	50290.5	5029050	840	99741	50290.5	5029050	-32728	32207	4415.3	441530	-128	127	-0.7	-70
+841	2	10831	99742	2.52552	299.52552	151.02552	15102.55255	2.52552	299.5255	151.02552	15102.5525	2.52552	299.52552	151.02552	15102.552	2020-01-01	2020-01-02	2020-01-01 00:14:01	2020-01-02 03:42:22	2020-01-01 00:14:01.000	2020-01-02 03:42:22.000	841	99742	50291.5	5029150	841	99742	50291.5	5029150	-32727	32208	4416.3	441630	-128	127	-2.26	-226
+842	2	10832	99743	2.52852	299.52852	151.02852	15102.85285	2.52852	299.52853	151.02853	15102.85313	2.52852	299.52852	151.02852000000001	15102.852	2020-01-01	2020-01-02	2020-01-01 00:14:02	2020-01-02 03:42:23	2020-01-01 00:14:02.000	2020-01-02 03:42:23.000	842	99743	50292.5	5029250	842	99743	50292.5	5029250	-32726	32209	4417.3	441730	-128	123	-3.82	-382
+843	2	10833	99744	2.53153	299.53153	151.03153	15103.15315	2.53153	299.53152	151.03152	15103.15278	2.53153	299.53153	151.03153	15103.153	2020-01-01	2020-01-02	2020-01-01 00:14:03	2020-01-02 03:42:24	2020-01-01 00:14:03.000	2020-01-02 03:42:24.000	843	99744	50293.5	5029350	843	99744	50293.5	5029350	-32725	32210	4418.3	441830	-127	124	-2.82	-282
+844	2	10834	99745	2.53453	299.53453	151.03453	15103.45345	2.53453	299.53455	151.03453	15103.45353	2.53453	299.53453	151.03453	15103.453	2020-01-01	2020-01-02	2020-01-01 00:14:04	2020-01-02 03:42:25	2020-01-01 00:14:04.000	2020-01-02 03:42:25.000	844	99745	50294.5	5029450	844	99745	50294.5	5029450	-32724	32211	4419.3	441930	-126	125	-1.82	-182
+845	2	10835	99746	2.53753	299.53753	151.03753	15103.75375	2.53753	299.53754	151.03753	15103.75366	2.53753	299.53753	151.03753	15103.753	2020-01-01	2020-01-02	2020-01-01 00:14:05	2020-01-02 03:42:26	2020-01-01 00:14:05.000	2020-01-02 03:42:26.000	845	99746	50295.5	5029550	845	99746	50295.5	5029550	-32723	32212	4420.3	442030	-125	126	-0.82	-82
+846	2	10836	99747	2.54054	299.54054	151.04054	15104.05405	2.54054	299.54053	151.04053	15104.05397	2.54054	299.54054	151.04054	15104.054	2020-01-01	2020-01-02	2020-01-01 00:14:06	2020-01-02 03:42:27	2020-01-01 00:14:06.000	2020-01-02 03:42:27.000	846	99747	50296.5	5029650	846	99747	50296.5	5029650	-32722	32213	4421.3	442130	-124	127	0.18	18
+847	2	10837	99748	2.54354	299.54354	151.04354	15104.35435	2.54354	299.54355	151.04354	15104.3546	2.54354	299.54354	151.04354	15104.354	2020-01-01	2020-01-02	2020-01-01 00:14:07	2020-01-02 03:42:28	2020-01-01 00:14:07.000	2020-01-02 03:42:28.000	847	99748	50297.5	5029750	847	99748	50297.5	5029750	-32721	32214	4422.3	442230	-128	127	-1.38	-138
+848	2	10838	99749	2.54654	299.54654	151.04654	15104.65465	2.54654	299.54654	151.04654	15104.65425	2.54654	299.54654	151.04654	15104.654	2020-01-01	2020-01-02	2020-01-01 00:14:08	2020-01-02 03:42:29	2020-01-01 00:14:08.000	2020-01-02 03:42:29.000	848	99749	50298.5	5029850	848	99749	50298.5	5029850	-32720	32215	4423.3	442330	-128	123	-2.94	-294
+849	2	10839	99750	2.54954	299.54954	151.04954	15104.95495	2.54954	299.54956	151.04954	15104.95499	2.54954	299.54954	151.04954	15104.954	2020-01-01	2020-01-02	2020-01-01 00:14:09	2020-01-02 03:42:30	2020-01-01 00:14:09.000	2020-01-02 03:42:30.000	849	99750	50299.5	5029950	849	99750	50299.5	5029950	-32719	32216	4424.3	442430	-127	124	-1.94	-194
 85	2	10075	99985	0.25525	300.25525	150.25525	15175.78078	0.25525	300.25525	150.25525	15175.78046	0.25525	300.25525	150.25525	15175.78025	2020-01-01	2020-01-02	2020-01-01 00:01:25	2020-01-02 03:46:25	2020-01-01 00:01:25.000	2020-01-02 03:46:25.000	85	99985	50035	5053535	85	99985	50035	5053535	-32484	32451	4614.009900990099	466015	-128	127	-1.5940594059405941	-161
-850	2	10840	99751	2.55255	299.55255	151.05255	15105.25525	2.55255	299.55255	151.05255	15105.25514	2.55255	299.55255	151.05255	15105.25500	2020-01-01	2020-01-02	2020-01-01 00:14:10	2020-01-02 03:42:31	2020-01-01 00:14:10.000	2020-01-02 03:42:31.000	850	99751	50300.5	5030050	850	99751	50300.5	5030050	-32718	32217	4425.3	442530	-126	125	-0.94	-94
-851	2	10841	99752	2.55555	299.55555	151.05555	15105.55555	2.55555	299.55554	151.05555	15105.55547	2.55555	299.55555	151.05555	15105.55500	2020-01-01	2020-01-02	2020-01-01 00:14:11	2020-01-02 03:42:32	2020-01-01 00:14:11.000	2020-01-02 03:42:32.000	851	99752	50301.5	5030150	851	99752	50301.5	5030150	-32717	32218	4426.3	442630	-125	126	0.06	6
-852	2	10842	99753	2.55855	299.55855	151.05855	15105.85585	2.55855	299.55856	151.05856	15105.85607	2.55855	299.55855	151.05855	15105.85500	2020-01-01	2020-01-02	2020-01-01 00:14:12	2020-01-02 03:42:33	2020-01-01 00:14:12.000	2020-01-02 03:42:33.000	852	99753	50302.5	5030250	852	99753	50302.5	5030250	-32716	32219	4427.3	442730	-124	127	1.06	106
-853	2	10843	99754	2.56156	299.56156	151.06156	15106.15615	2.56156	299.56155	151.06155	15106.15571	2.56156	299.56156	151.06156000000001	15106.15600	2020-01-01	2020-01-02	2020-01-01 00:14:13	2020-01-02 03:42:34	2020-01-01 00:14:13.000	2020-01-02 03:42:34.000	853	99754	50303.5	5030350	853	99754	50303.5	5030350	-32715	32220	4428.3	442830	-128	127	-0.5	-50
-854	2	10844	99755	2.56456	299.56456	151.06456	15106.45645	2.56456	299.56458	151.06456	15106.45646	2.56456	299.56456	151.06456	15106.45600	2020-01-01	2020-01-02	2020-01-01 00:14:14	2020-01-02 03:42:35	2020-01-01 00:14:14.000	2020-01-02 03:42:35.000	854	99755	50304.5	5030450	854	99755	50304.5	5030450	-32714	32221	4429.3	442930	-128	123	-2.06	-206
-855	2	10845	99756	2.56756	299.56756	151.06756	15106.75675	2.56756	299.56757	151.06756	15106.75661	2.56756	299.56756	151.06756	15106.75600	2020-01-01	2020-01-02	2020-01-01 00:14:15	2020-01-02 03:42:36	2020-01-01 00:14:15.000	2020-01-02 03:42:36.000	855	99756	50305.5	5030550	855	99756	50305.5	5030550	-32713	32222	4430.3	443030	-127	124	-1.06	-106
-856	2	10846	99757	2.57057	299.57057	151.07057	15107.05705	2.57057	299.57056	151.07056	15107.05694	2.57057	299.57057	151.07057	15107.05700	2020-01-01	2020-01-02	2020-01-01 00:14:16	2020-01-02 03:42:37	2020-01-01 00:14:16.000	2020-01-02 03:42:37.000	856	99757	50306.5	5030650	856	99757	50306.5	5030650	-32712	32223	4431.3	443130	-126	125	-0.06	-6
-857	2	10847	99758	2.57357	299.57357	151.07357	15107.35735	2.57357	299.57358	151.07357	15107.35754	2.57357	299.57357	151.07357	15107.35700	2020-01-01	2020-01-02	2020-01-01 00:14:17	2020-01-02 03:42:38	2020-01-01 00:14:17.000	2020-01-02 03:42:38.000	857	99758	50307.5	5030750	857	99758	50307.5	5030750	-32711	32224	4432.3	443230	-125	126	0.94	94
-858	2	10848	99759	2.57657	299.57657	151.07657	15107.65765	2.57657	299.57657	151.07657	15107.65783	2.57657	299.57657	151.07657	15107.65700	2020-01-01	2020-01-02	2020-01-01 00:14:18	2020-01-02 03:42:39	2020-01-01 00:14:18.000	2020-01-02 03:42:39.000	858	99759	50308.5	5030850	858	99759	50308.5	5030850	-32710	32225	4433.3	443330	-124	127	1.94	194
-859	2	10849	99760	2.57957	299.57957	151.07957	15107.95795	2.57957	299.5796	151.07957	15107.95794	2.57957	299.57957	151.07957	15107.95700	2020-01-01	2020-01-02	2020-01-01 00:14:19	2020-01-02 03:42:40	2020-01-01 00:14:19.000	2020-01-02 03:42:40.000	859	99760	50309.5	5030950	859	99760	50309.5	5030950	-32709	32226	4434.3	443430	-128	127	0.38	38
+850	2	10840	99751	2.55255	299.55255	151.05255	15105.25525	2.55255	299.55255	151.05255	15105.25514	2.55255	299.55255	151.05255	15105.255	2020-01-01	2020-01-02	2020-01-01 00:14:10	2020-01-02 03:42:31	2020-01-01 00:14:10.000	2020-01-02 03:42:31.000	850	99751	50300.5	5030050	850	99751	50300.5	5030050	-32718	32217	4425.3	442530	-126	125	-0.94	-94
+851	2	10841	99752	2.55555	299.55555	151.05555	15105.55555	2.55555	299.55554	151.05555	15105.55547	2.55555	299.55555	151.05555	15105.555	2020-01-01	2020-01-02	2020-01-01 00:14:11	2020-01-02 03:42:32	2020-01-01 00:14:11.000	2020-01-02 03:42:32.000	851	99752	50301.5	5030150	851	99752	50301.5	5030150	-32717	32218	4426.3	442630	-125	126	0.06	6
+852	2	10842	99753	2.55855	299.55855	151.05855	15105.85585	2.55855	299.55856	151.05856	15105.85607	2.55855	299.55855	151.05855	15105.855	2020-01-01	2020-01-02	2020-01-01 00:14:12	2020-01-02 03:42:33	2020-01-01 00:14:12.000	2020-01-02 03:42:33.000	852	99753	50302.5	5030250	852	99753	50302.5	5030250	-32716	32219	4427.3	442730	-124	127	1.06	106
+853	2	10843	99754	2.56156	299.56156	151.06156	15106.15615	2.56156	299.56155	151.06155	15106.15571	2.56156	299.56156	151.06156000000001	15106.156	2020-01-01	2020-01-02	2020-01-01 00:14:13	2020-01-02 03:42:34	2020-01-01 00:14:13.000	2020-01-02 03:42:34.000	853	99754	50303.5	5030350	853	99754	50303.5	5030350	-32715	32220	4428.3	442830	-128	127	-0.5	-50
+854	2	10844	99755	2.56456	299.56456	151.06456	15106.45645	2.56456	299.56458	151.06456	15106.45646	2.56456	299.56456	151.06456	15106.456	2020-01-01	2020-01-02	2020-01-01 00:14:14	2020-01-02 03:42:35	2020-01-01 00:14:14.000	2020-01-02 03:42:35.000	854	99755	50304.5	5030450	854	99755	50304.5	5030450	-32714	32221	4429.3	442930	-128	123	-2.06	-206
+855	2	10845	99756	2.56756	299.56756	151.06756	15106.75675	2.56756	299.56757	151.06756	15106.75661	2.56756	299.56756	151.06756	15106.756	2020-01-01	2020-01-02	2020-01-01 00:14:15	2020-01-02 03:42:36	2020-01-01 00:14:15.000	2020-01-02 03:42:36.000	855	99756	50305.5	5030550	855	99756	50305.5	5030550	-32713	32222	4430.3	443030	-127	124	-1.06	-106
+856	2	10846	99757	2.57057	299.57057	151.07057	15107.05705	2.57057	299.57056	151.07056	15107.05694	2.57057	299.57057	151.07057	15107.057	2020-01-01	2020-01-02	2020-01-01 00:14:16	2020-01-02 03:42:37	2020-01-01 00:14:16.000	2020-01-02 03:42:37.000	856	99757	50306.5	5030650	856	99757	50306.5	5030650	-32712	32223	4431.3	443130	-126	125	-0.06	-6
+857	2	10847	99758	2.57357	299.57357	151.07357	15107.35735	2.57357	299.57358	151.07357	15107.35754	2.57357	299.57357	151.07357	15107.357	2020-01-01	2020-01-02	2020-01-01 00:14:17	2020-01-02 03:42:38	2020-01-01 00:14:17.000	2020-01-02 03:42:38.000	857	99758	50307.5	5030750	857	99758	50307.5	5030750	-32711	32224	4432.3	443230	-125	126	0.94	94
+858	2	10848	99759	2.57657	299.57657	151.07657	15107.65765	2.57657	299.57657	151.07657	15107.65783	2.57657	299.57657	151.07657	15107.657	2020-01-01	2020-01-02	2020-01-01 00:14:18	2020-01-02 03:42:39	2020-01-01 00:14:18.000	2020-01-02 03:42:39.000	858	99759	50308.5	5030850	858	99759	50308.5	5030850	-32710	32225	4433.3	443330	-124	127	1.94	194
+859	2	10849	99760	2.57957	299.57957	151.07957	15107.95795	2.57957	299.5796	151.07957	15107.95794	2.57957	299.57957	151.07957	15107.957	2020-01-01	2020-01-02	2020-01-01 00:14:19	2020-01-02 03:42:40	2020-01-01 00:14:19.000	2020-01-02 03:42:40.000	859	99760	50309.5	5030950	859	99760	50309.5	5030950	-32709	32226	4434.3	443430	-128	127	0.38	38
 86	2	10076	99986	0.25825	300.25825	150.25825	15176.08408	0.25825	300.25827	150.25825	15176.08406	0.25825	300.25825	150.25825	15176.08325	2020-01-01	2020-01-02	2020-01-01 00:01:26	2020-01-02 03:46:26	2020-01-01 00:01:26.000	2020-01-02 03:46:26.000	86	99986	50036	5053636	86	99986	50036	5053636	-32483	32452	4615.009900990099	466116	-128	123	-3.128712871287129	-316
-860	2	10850	99761	2.58258	299.58258	151.08258	15108.25825	2.58258	299.58258	151.08258	15108.25811	2.58258	299.58258	151.08258	15108.25800	2020-01-01	2020-01-02	2020-01-01 00:14:20	2020-01-02 03:42:41	2020-01-01 00:14:20.000	2020-01-02 03:42:41.000	860	99761	50310.5	5031050	860	99761	50310.5	5031050	-32708	32227	4435.3	443530	-128	123	-1.18	-118
-861	2	10851	99762	2.58558	299.58558	151.08558	15108.55855	2.58558	299.58557	151.08558	15108.55841	2.58558	299.58558	151.08558000000002	15108.55800	2020-01-01	2020-01-02	2020-01-01 00:14:21	2020-01-02 03:42:42	2020-01-01 00:14:21.000	2020-01-02 03:42:42.000	861	99762	50311.5	5031150	861	99762	50311.5	5031150	-32707	32228	4436.3	443630	-127	124	-0.18	-18
-862	2	10852	99763	2.58858	299.58858	151.08858	15108.85885	2.58858	299.5886	151.08859	15108.85901	2.58858	299.58858	151.08858	15108.85800	2020-01-01	2020-01-02	2020-01-01 00:14:22	2020-01-02 03:42:43	2020-01-01 00:14:22.000	2020-01-02 03:42:43.000	862	99763	50312.5	5031250	862	99763	50312.5	5031250	-32706	32229	4437.3	443730	-126	125	0.82	82
-863	2	10853	99764	2.59159	299.59159	151.09159	15109.15915	2.59159	299.59158	151.09159	15109.1593	2.59159	299.59159	151.09159	15109.15900	2020-01-01	2020-01-02	2020-01-01 00:14:23	2020-01-02 03:42:44	2020-01-01 00:14:23.000	2020-01-02 03:42:44.000	863	99764	50313.5	5031350	863	99764	50313.5	5031350	-32705	32230	4438.3	443830	-125	126	1.82	182
-864	2	10854	99765	2.59459	299.59459	151.09459	15109.45945	2.59459	299.5946	151.09459	15109.45941	2.59459	299.59459	151.09459	15109.45900	2020-01-01	2020-01-02	2020-01-01 00:14:24	2020-01-02 03:42:45	2020-01-01 00:14:24.000	2020-01-02 03:42:45.000	864	99765	50314.5	5031450	864	99765	50314.5	5031450	-32704	32231	4439.3	443930	-124	127	2.82	282
-865	2	10855	99766	2.59759	299.59759	151.09759	15109.75975	2.59759	299.5976	151.09759	15109.75958	2.59759	299.59759	151.09759	15109.75900	2020-01-01	2020-01-02	2020-01-01 00:14:25	2020-01-02 03:42:46	2020-01-01 00:14:25.000	2020-01-02 03:42:46.000	865	99766	50315.5	5031550	865	99766	50315.5	5031550	-32703	32232	4440.3	444030	-128	127	1.26	126
-866	2	10856	99767	2.6006	299.6006	151.1006	15110.06006	2.6006	299.6006	151.10059	15110.05988	2.60060	299.60060	151.1006	15110.06000	2020-01-01	2020-01-02	2020-01-01 00:14:26	2020-01-02 03:42:47	2020-01-01 00:14:26.000	2020-01-02 03:42:47.000	866	99767	50316.5	5031650	866	99767	50316.5	5031650	-32702	32233	4441.3	444130	-128	127	-0.3	-30
-867	2	10857	99768	2.6036	299.6036	151.1036	15110.36036	2.6036	299.6036	151.1036	15110.36063	2.60360	299.60360	151.1036	15110.36000	2020-01-01	2020-01-02	2020-01-01 00:14:27	2020-01-02 03:42:48	2020-01-01 00:14:27.000	2020-01-02 03:42:48.000	867	99768	50317.5	5031750	867	99768	50317.5	5031750	-32701	32234	4442.3	444230	-128	123	-1.86	-186
-868	2	10858	99769	2.6066	299.6066	151.1066	15110.66066	2.6066	299.6066	151.1066	15110.66078	2.60660	299.60660	151.1066	15110.66000	2020-01-01	2020-01-02	2020-01-01 00:14:28	2020-01-02 03:42:49	2020-01-01 00:14:28.000	2020-01-02 03:42:49.000	868	99769	50318.5	5031850	868	99769	50318.5	5031850	-32700	32235	4443.3	444330	-127	124	-0.86	-86
-869	2	10859	99770	2.6096	299.6096	151.1096	15110.96096	2.6096	299.60962	151.1096	15110.96091	2.60960	299.60960	151.1096	15110.96000	2020-01-01	2020-01-02	2020-01-01 00:14:29	2020-01-02 03:42:50	2020-01-01 00:14:29.000	2020-01-02 03:42:50.000	869	99770	50319.5	5031950	869	99770	50319.5	5031950	-32699	32236	4444.3	444430	-126	125	0.14	14
+860	2	10850	99761	2.58258	299.58258	151.08258	15108.25825	2.58258	299.58258	151.08258	15108.25811	2.58258	299.58258	151.08258	15108.258	2020-01-01	2020-01-02	2020-01-01 00:14:20	2020-01-02 03:42:41	2020-01-01 00:14:20.000	2020-01-02 03:42:41.000	860	99761	50310.5	5031050	860	99761	50310.5	5031050	-32708	32227	4435.3	443530	-128	123	-1.18	-118
+861	2	10851	99762	2.58558	299.58558	151.08558	15108.55855	2.58558	299.58557	151.08558	15108.55841	2.58558	299.58558	151.08558000000002	15108.558	2020-01-01	2020-01-02	2020-01-01 00:14:21	2020-01-02 03:42:42	2020-01-01 00:14:21.000	2020-01-02 03:42:42.000	861	99762	50311.5	5031150	861	99762	50311.5	5031150	-32707	32228	4436.3	443630	-127	124	-0.18	-18
+862	2	10852	99763	2.58858	299.58858	151.08858	15108.85885	2.58858	299.5886	151.08859	15108.85901	2.58858	299.58858	151.08858	15108.858	2020-01-01	2020-01-02	2020-01-01 00:14:22	2020-01-02 03:42:43	2020-01-01 00:14:22.000	2020-01-02 03:42:43.000	862	99763	50312.5	5031250	862	99763	50312.5	5031250	-32706	32229	4437.3	443730	-126	125	0.82	82
+863	2	10853	99764	2.59159	299.59159	151.09159	15109.15915	2.59159	299.59158	151.09159	15109.1593	2.59159	299.59159	151.09159	15109.159	2020-01-01	2020-01-02	2020-01-01 00:14:23	2020-01-02 03:42:44	2020-01-01 00:14:23.000	2020-01-02 03:42:44.000	863	99764	50313.5	5031350	863	99764	50313.5	5031350	-32705	32230	4438.3	443830	-125	126	1.82	182
+864	2	10854	99765	2.59459	299.59459	151.09459	15109.45945	2.59459	299.5946	151.09459	15109.45941	2.59459	299.59459	151.09459	15109.459	2020-01-01	2020-01-02	2020-01-01 00:14:24	2020-01-02 03:42:45	2020-01-01 00:14:24.000	2020-01-02 03:42:45.000	864	99765	50314.5	5031450	864	99765	50314.5	5031450	-32704	32231	4439.3	443930	-124	127	2.82	282
+865	2	10855	99766	2.59759	299.59759	151.09759	15109.75975	2.59759	299.5976	151.09759	15109.75958	2.59759	299.59759	151.09759	15109.759	2020-01-01	2020-01-02	2020-01-01 00:14:25	2020-01-02 03:42:46	2020-01-01 00:14:25.000	2020-01-02 03:42:46.000	865	99766	50315.5	5031550	865	99766	50315.5	5031550	-32703	32232	4440.3	444030	-128	127	1.26	126
+866	2	10856	99767	2.6006	299.6006	151.1006	15110.06006	2.6006	299.6006	151.10059	15110.05988	2.6006	299.6006	151.1006	15110.06	2020-01-01	2020-01-02	2020-01-01 00:14:26	2020-01-02 03:42:47	2020-01-01 00:14:26.000	2020-01-02 03:42:47.000	866	99767	50316.5	5031650	866	99767	50316.5	5031650	-32702	32233	4441.3	444130	-128	127	-0.3	-30
+867	2	10857	99768	2.6036	299.6036	151.1036	15110.36036	2.6036	299.6036	151.1036	15110.36063	2.6036	299.6036	151.1036	15110.36	2020-01-01	2020-01-02	2020-01-01 00:14:27	2020-01-02 03:42:48	2020-01-01 00:14:27.000	2020-01-02 03:42:48.000	867	99768	50317.5	5031750	867	99768	50317.5	5031750	-32701	32234	4442.3	444230	-128	123	-1.86	-186
+868	2	10858	99769	2.6066	299.6066	151.1066	15110.66066	2.6066	299.6066	151.1066	15110.66078	2.6066	299.6066	151.1066	15110.66	2020-01-01	2020-01-02	2020-01-01 00:14:28	2020-01-02 03:42:49	2020-01-01 00:14:28.000	2020-01-02 03:42:49.000	868	99769	50318.5	5031850	868	99769	50318.5	5031850	-32700	32235	4443.3	444330	-127	124	-0.86	-86
+869	2	10859	99770	2.6096	299.6096	151.1096	15110.96096	2.6096	299.60962	151.1096	15110.96091	2.6096	299.6096	151.1096	15110.96	2020-01-01	2020-01-02	2020-01-01 00:14:29	2020-01-02 03:42:50	2020-01-01 00:14:29.000	2020-01-02 03:42:50.000	869	99770	50319.5	5031950	869	99770	50319.5	5031950	-32699	32236	4444.3	444430	-126	125	0.14	14
 87	2	10077	99987	0.26126	300.26126	150.26126	15176.38738	0.26126	300.26126	150.26126	15176.38736	0.26126	300.26126	150.26126	15176.38726	2020-01-01	2020-01-02	2020-01-01 00:01:27	2020-01-02 03:46:27	2020-01-01 00:01:27.000	2020-01-02 03:46:27.000	87	99987	50037	5053737	87	99987	50037	5053737	-32482	32453	4616.009900990099	466217	-127	124	-2.128712871287129	-215
-870	2	10860	99771	2.61261	299.61261	151.11261	15111.26126	2.61261	299.6126	151.11261	15111.26105	2.61261	299.61261	151.11261000000002	15111.26100	2020-01-01	2020-01-02	2020-01-01 00:14:30	2020-01-02 03:42:51	2020-01-01 00:14:30.000	2020-01-02 03:42:51.000	870	99771	50320.5	5032050	870	99771	50320.5	5032050	-32698	32237	4445.3	444530	-125	126	1.14	114
-871	2	10861	99772	2.61561	299.61561	151.11561	15111.56156	2.61561	299.6156	151.11561	15111.56135	2.61561	299.61561	151.11561	15111.56100	2020-01-01	2020-01-02	2020-01-01 00:14:31	2020-01-02 03:42:52	2020-01-01 00:14:31.000	2020-01-02 03:42:52.000	871	99772	50321.5	5032150	871	99772	50321.5	5032150	-32697	32238	4446.3	444630	-124	127	2.14	214
-872	2	10862	99773	2.61861	299.61861	151.11861	15111.86186	2.61861	299.61862	151.11862	15111.8621	2.61861	299.61861	151.11861000000002	15111.86100	2020-01-01	2020-01-02	2020-01-01 00:14:32	2020-01-02 03:42:53	2020-01-01 00:14:32.000	2020-01-02 03:42:53.000	872	99773	50322.5	5032250	872	99773	50322.5	5032250	-32696	32239	4447.3	444730	-128	127	0.58	58
-873	2	10863	99774	2.62162	299.62162	151.12162	15112.16216	2.62162	299.6216	151.12162	15112.16224	2.62162	299.62162	151.12162	15112.16200	2020-01-01	2020-01-02	2020-01-01 00:14:33	2020-01-02 03:42:54	2020-01-01 00:14:33.000	2020-01-02 03:42:54.000	873	99774	50323.5	5032350	873	99774	50323.5	5032350	-32695	32240	4448.3	444830	-128	123	-0.98	-98
-874	2	10864	99775	2.62462	299.62462	151.12462	15112.46246	2.62462	299.62463	151.12462	15112.46238	2.62462	299.62462	151.12462	15112.46200	2020-01-01	2020-01-02	2020-01-01 00:14:34	2020-01-02 03:42:55	2020-01-01 00:14:34.000	2020-01-02 03:42:55.000	874	99775	50324.5	5032450	874	99775	50324.5	5032450	-32694	32241	4449.3	444930	-127	124	0.02	2
-875	2	10865	99776	2.62762	299.62762	151.12762	15112.76276	2.62762	299.62762	151.12762	15112.76252	2.62762	299.62762	151.12762	15112.76200	2020-01-01	2020-01-02	2020-01-01 00:14:35	2020-01-02 03:42:56	2020-01-01 00:14:35.000	2020-01-02 03:42:56.000	875	99776	50325.5	5032550	875	99776	50325.5	5032550	-32693	32242	4450.3	445030	-126	125	1.02	102
-876	2	10866	99777	2.63063	299.63063	151.13063	15113.06306	2.63063	299.63065	151.13063	15113.06327	2.63063	299.63063	151.13063	15113.06300	2020-01-01	2020-01-02	2020-01-01 00:14:36	2020-01-02 03:42:57	2020-01-01 00:14:36.000	2020-01-02 03:42:57.000	876	99777	50326.5	5032650	876	99777	50326.5	5032650	-32692	32243	4451.3	445130	-125	126	2.02	202
-877	2	10867	99778	2.63363	299.63363	151.13363	15113.36336	2.63363	299.63364	151.13363	15113.36358	2.63363	299.63363	151.13362999999998	15113.36300	2020-01-01	2020-01-02	2020-01-01 00:14:37	2020-01-02 03:42:58	2020-01-01 00:14:37.000	2020-01-02 03:42:58.000	877	99778	50327.5	5032750	877	99778	50327.5	5032750	-32691	32244	4452.3	445230	-124	127	3.02	302
-878	2	10868	99779	2.63663	299.63663	151.13663	15113.66366	2.63663	299.63663	151.13663	15113.66371	2.63663	299.63663	151.13663	15113.66300	2020-01-01	2020-01-02	2020-01-01 00:14:38	2020-01-02 03:42:59	2020-01-01 00:14:38.000	2020-01-02 03:42:59.000	878	99779	50328.5	5032850	878	99779	50328.5	5032850	-32690	32245	4453.3	445330	-128	127	1.46	146
-879	2	10869	99780	2.63963	299.63963	151.13963	15113.96396	2.63963	299.63965	151.13963	15113.96385	2.63963	299.63963	151.13963	15113.96300	2020-01-01	2020-01-02	2020-01-01 00:14:39	2020-01-02 03:43:00	2020-01-01 00:14:39.000	2020-01-02 03:43:00.000	879	99780	50329.5	5032950	879	99780	50329.5	5032950	-32689	32246	4454.3	445430	-128	123	-0.1	-10
+870	2	10860	99771	2.61261	299.61261	151.11261	15111.26126	2.61261	299.6126	151.11261	15111.26105	2.61261	299.61261	151.11261000000002	15111.261	2020-01-01	2020-01-02	2020-01-01 00:14:30	2020-01-02 03:42:51	2020-01-01 00:14:30.000	2020-01-02 03:42:51.000	870	99771	50320.5	5032050	870	99771	50320.5	5032050	-32698	32237	4445.3	444530	-125	126	1.14	114
+871	2	10861	99772	2.61561	299.61561	151.11561	15111.56156	2.61561	299.6156	151.11561	15111.56135	2.61561	299.61561	151.11561	15111.561	2020-01-01	2020-01-02	2020-01-01 00:14:31	2020-01-02 03:42:52	2020-01-01 00:14:31.000	2020-01-02 03:42:52.000	871	99772	50321.5	5032150	871	99772	50321.5	5032150	-32697	32238	4446.3	444630	-124	127	2.14	214
+872	2	10862	99773	2.61861	299.61861	151.11861	15111.86186	2.61861	299.61862	151.11862	15111.8621	2.61861	299.61861	151.11861000000002	15111.861	2020-01-01	2020-01-02	2020-01-01 00:14:32	2020-01-02 03:42:53	2020-01-01 00:14:32.000	2020-01-02 03:42:53.000	872	99773	50322.5	5032250	872	99773	50322.5	5032250	-32696	32239	4447.3	444730	-128	127	0.58	58
+873	2	10863	99774	2.62162	299.62162	151.12162	15112.16216	2.62162	299.6216	151.12162	15112.16224	2.62162	299.62162	151.12162	15112.162	2020-01-01	2020-01-02	2020-01-01 00:14:33	2020-01-02 03:42:54	2020-01-01 00:14:33.000	2020-01-02 03:42:54.000	873	99774	50323.5	5032350	873	99774	50323.5	5032350	-32695	32240	4448.3	444830	-128	123	-0.98	-98
+874	2	10864	99775	2.62462	299.62462	151.12462	15112.46246	2.62462	299.62463	151.12462	15112.46238	2.62462	299.62462	151.12462	15112.462	2020-01-01	2020-01-02	2020-01-01 00:14:34	2020-01-02 03:42:55	2020-01-01 00:14:34.000	2020-01-02 03:42:55.000	874	99775	50324.5	5032450	874	99775	50324.5	5032450	-32694	32241	4449.3	444930	-127	124	0.02	2
+875	2	10865	99776	2.62762	299.62762	151.12762	15112.76276	2.62762	299.62762	151.12762	15112.76252	2.62762	299.62762	151.12762	15112.762	2020-01-01	2020-01-02	2020-01-01 00:14:35	2020-01-02 03:42:56	2020-01-01 00:14:35.000	2020-01-02 03:42:56.000	875	99776	50325.5	5032550	875	99776	50325.5	5032550	-32693	32242	4450.3	445030	-126	125	1.02	102
+876	2	10866	99777	2.63063	299.63063	151.13063	15113.06306	2.63063	299.63065	151.13063	15113.06327	2.63063	299.63063	151.13063	15113.063	2020-01-01	2020-01-02	2020-01-01 00:14:36	2020-01-02 03:42:57	2020-01-01 00:14:36.000	2020-01-02 03:42:57.000	876	99777	50326.5	5032650	876	99777	50326.5	5032650	-32692	32243	4451.3	445130	-125	126	2.02	202
+877	2	10867	99778	2.63363	299.63363	151.13363	15113.36336	2.63363	299.63364	151.13363	15113.36358	2.63363	299.63363	151.13362999999998	15113.363	2020-01-01	2020-01-02	2020-01-01 00:14:37	2020-01-02 03:42:58	2020-01-01 00:14:37.000	2020-01-02 03:42:58.000	877	99778	50327.5	5032750	877	99778	50327.5	5032750	-32691	32244	4452.3	445230	-124	127	3.02	302
+878	2	10868	99779	2.63663	299.63663	151.13663	15113.66366	2.63663	299.63663	151.13663	15113.66371	2.63663	299.63663	151.13663	15113.663	2020-01-01	2020-01-02	2020-01-01 00:14:38	2020-01-02 03:42:59	2020-01-01 00:14:38.000	2020-01-02 03:42:59.000	878	99779	50328.5	5032850	878	99779	50328.5	5032850	-32690	32245	4453.3	445330	-128	127	1.46	146
+879	2	10869	99780	2.63963	299.63963	151.13963	15113.96396	2.63963	299.63965	151.13963	15113.96385	2.63963	299.63963	151.13963	15113.963	2020-01-01	2020-01-02	2020-01-01 00:14:39	2020-01-02 03:43:00	2020-01-01 00:14:39.000	2020-01-02 03:43:00.000	879	99780	50329.5	5032950	879	99780	50329.5	5032950	-32689	32246	4454.3	445430	-128	123	-0.1	-10
 88	2	10078	99988	0.26426	300.26426	150.26426	15176.69069	0.26426	300.26425	150.26426	15176.69066	0.26426	300.26426	150.26426	15176.69026	2020-01-01	2020-01-02	2020-01-01 00:01:28	2020-01-02 03:46:28	2020-01-01 00:01:28.000	2020-01-02 03:46:28.000	88	99988	50038	5053838	88	99988	50038	5053838	-32481	32454	4617.009900990099	466318	-126	125	-1.1287128712871286	-114
-880	2	10870	99781	2.64264	299.64264	151.14264	15114.26426	2.64264	299.64264	151.14263	15114.26399	2.64264	299.64264	151.14264	15114.26400	2020-01-01	2020-01-02	2020-01-01 00:14:40	2020-01-02 03:43:01	2020-01-01 00:14:40.000	2020-01-02 03:43:01.000	880	99781	50330.5	5033050	880	99781	50330.5	5033050	-32688	32247	4455.3	445530	-127	124	0.9	90
-881	2	10871	99782	2.64564	299.64564	151.14564	15114.56456	2.64564	299.64566	151.14564	15114.56474	2.64564	299.64564	151.14564000000001	15114.56400	2020-01-01	2020-01-02	2020-01-01 00:14:41	2020-01-02 03:43:02	2020-01-01 00:14:41.000	2020-01-02 03:43:02.000	881	99782	50331.5	5033150	881	99782	50331.5	5033150	-32687	32248	4456.3	445630	-126	125	1.9	190
-882	2	10872	99783	2.64864	299.64864	151.14864	15114.86486	2.64864	299.64865	151.14865	15114.86504	2.64864	299.64864	151.14864	15114.86400	2020-01-01	2020-01-02	2020-01-01 00:14:42	2020-01-02 03:43:03	2020-01-01 00:14:42.000	2020-01-02 03:43:03.000	882	99783	50332.5	5033250	882	99783	50332.5	5033250	-32686	32249	4457.3	445730	-125	126	2.9	290
-883	2	10873	99784	2.65165	299.65165	151.15165	15115.16516	2.65165	299.65164	151.15165	15115.16522	2.65165	299.65165	151.15165000000002	15115.16500	2020-01-01	2020-01-02	2020-01-01 00:14:43	2020-01-02 03:43:04	2020-01-01 00:14:43.000	2020-01-02 03:43:04.000	883	99784	50333.5	5033350	883	99784	50333.5	5033350	-32685	32250	4458.3	445830	-124	127	3.9	390
-884	2	10874	99785	2.65465	299.65465	151.15465	15115.46546	2.65465	299.65466	151.15465	15115.46532	2.65465	299.65465	151.15465	15115.46500	2020-01-01	2020-01-02	2020-01-01 00:14:44	2020-01-02 03:43:05	2020-01-01 00:14:44.000	2020-01-02 03:43:05.000	884	99785	50334.5	5033450	884	99785	50334.5	5033450	-32684	32251	4459.3	445930	-128	127	2.34	234
-885	2	10875	99786	2.65765	299.65765	151.15765	15115.76576	2.65765	299.65765	151.15765	15115.76562	2.65765	299.65765	151.15765	15115.76500	2020-01-01	2020-01-02	2020-01-01 00:14:45	2020-01-02 03:43:06	2020-01-01 00:14:45.000	2020-01-02 03:43:06.000	885	99786	50335.5	5033550	885	99786	50335.5	5033550	-32683	32252	4460.3	446030	-128	123	0.78	78
-886	2	10876	99787	2.66066	299.66066	151.16066	15116.06606	2.66066	299.66068	151.16066	15116.06621	2.66066	299.66066	151.16066	15116.06600	2020-01-01	2020-01-02	2020-01-01 00:14:46	2020-01-02 03:43:07	2020-01-01 00:14:46.000	2020-01-02 03:43:07.000	886	99787	50336.5	5033650	886	99787	50336.5	5033650	-32682	32253	4461.3	446130	-127	124	1.78	178
-887	2	10877	99788	2.66366	299.66366	151.16366	15116.36636	2.66366	299.66367	151.16366	15116.36651	2.66366	299.66366	151.16366	15116.36600	2020-01-01	2020-01-02	2020-01-01 00:14:47	2020-01-02 03:43:08	2020-01-01 00:14:47.000	2020-01-02 03:43:08.000	887	99788	50337.5	5033750	887	99788	50337.5	5033750	-32681	32254	4462.3	446230	-126	125	2.78	278
-888	2	10878	99789	2.66666	299.66666	151.16666	15116.66666	2.66666	299.66666	151.16666	15116.66669	2.66666	299.66666	151.16665999999998	15116.66600	2020-01-01	2020-01-02	2020-01-01 00:14:48	2020-01-02 03:43:09	2020-01-01 00:14:48.000	2020-01-02 03:43:09.000	888	99789	50338.5	5033850	888	99789	50338.5	5033850	-32680	32255	4463.3	446330	-125	126	3.78	378
-889	2	10879	99790	2.66966	299.66966	151.16966	15116.96696	2.66966	299.66968	151.16966	15116.96679	2.66966	299.66966	151.16966	15116.96600	2020-01-01	2020-01-02	2020-01-01 00:14:49	2020-01-02 03:43:10	2020-01-01 00:14:49.000	2020-01-02 03:43:10.000	889	99790	50339.5	5033950	889	99790	50339.5	5033950	-32679	32256	4464.3	446430	-124	127	4.78	478
+880	2	10870	99781	2.64264	299.64264	151.14264	15114.26426	2.64264	299.64264	151.14263	15114.26399	2.64264	299.64264	151.14264	15114.264	2020-01-01	2020-01-02	2020-01-01 00:14:40	2020-01-02 03:43:01	2020-01-01 00:14:40.000	2020-01-02 03:43:01.000	880	99781	50330.5	5033050	880	99781	50330.5	5033050	-32688	32247	4455.3	445530	-127	124	0.9	90
+881	2	10871	99782	2.64564	299.64564	151.14564	15114.56456	2.64564	299.64566	151.14564	15114.56474	2.64564	299.64564	151.14564000000001	15114.564	2020-01-01	2020-01-02	2020-01-01 00:14:41	2020-01-02 03:43:02	2020-01-01 00:14:41.000	2020-01-02 03:43:02.000	881	99782	50331.5	5033150	881	99782	50331.5	5033150	-32687	32248	4456.3	445630	-126	125	1.9	190
+882	2	10872	99783	2.64864	299.64864	151.14864	15114.86486	2.64864	299.64865	151.14865	15114.86504	2.64864	299.64864	151.14864	15114.864	2020-01-01	2020-01-02	2020-01-01 00:14:42	2020-01-02 03:43:03	2020-01-01 00:14:42.000	2020-01-02 03:43:03.000	882	99783	50332.5	5033250	882	99783	50332.5	5033250	-32686	32249	4457.3	445730	-125	126	2.9	290
+883	2	10873	99784	2.65165	299.65165	151.15165	15115.16516	2.65165	299.65164	151.15165	15115.16522	2.65165	299.65165	151.15165000000002	15115.165	2020-01-01	2020-01-02	2020-01-01 00:14:43	2020-01-02 03:43:04	2020-01-01 00:14:43.000	2020-01-02 03:43:04.000	883	99784	50333.5	5033350	883	99784	50333.5	5033350	-32685	32250	4458.3	445830	-124	127	3.9	390
+884	2	10874	99785	2.65465	299.65465	151.15465	15115.46546	2.65465	299.65466	151.15465	15115.46532	2.65465	299.65465	151.15465	15115.465	2020-01-01	2020-01-02	2020-01-01 00:14:44	2020-01-02 03:43:05	2020-01-01 00:14:44.000	2020-01-02 03:43:05.000	884	99785	50334.5	5033450	884	99785	50334.5	5033450	-32684	32251	4459.3	445930	-128	127	2.34	234
+885	2	10875	99786	2.65765	299.65765	151.15765	15115.76576	2.65765	299.65765	151.15765	15115.76562	2.65765	299.65765	151.15765	15115.765	2020-01-01	2020-01-02	2020-01-01 00:14:45	2020-01-02 03:43:06	2020-01-01 00:14:45.000	2020-01-02 03:43:06.000	885	99786	50335.5	5033550	885	99786	50335.5	5033550	-32683	32252	4460.3	446030	-128	123	0.78	78
+886	2	10876	99787	2.66066	299.66066	151.16066	15116.06606	2.66066	299.66068	151.16066	15116.06621	2.66066	299.66066	151.16066	15116.066	2020-01-01	2020-01-02	2020-01-01 00:14:46	2020-01-02 03:43:07	2020-01-01 00:14:46.000	2020-01-02 03:43:07.000	886	99787	50336.5	5033650	886	99787	50336.5	5033650	-32682	32253	4461.3	446130	-127	124	1.78	178
+887	2	10877	99788	2.66366	299.66366	151.16366	15116.36636	2.66366	299.66367	151.16366	15116.36651	2.66366	299.66366	151.16366	15116.366	2020-01-01	2020-01-02	2020-01-01 00:14:47	2020-01-02 03:43:08	2020-01-01 00:14:47.000	2020-01-02 03:43:08.000	887	99788	50337.5	5033750	887	99788	50337.5	5033750	-32681	32254	4462.3	446230	-126	125	2.78	278
+888	2	10878	99789	2.66666	299.66666	151.16666	15116.66666	2.66666	299.66666	151.16666	15116.66669	2.66666	299.66666	151.16665999999998	15116.666	2020-01-01	2020-01-02	2020-01-01 00:14:48	2020-01-02 03:43:09	2020-01-01 00:14:48.000	2020-01-02 03:43:09.000	888	99789	50338.5	5033850	888	99789	50338.5	5033850	-32680	32255	4463.3	446330	-125	126	3.78	378
+889	2	10879	99790	2.66966	299.66966	151.16966	15116.96696	2.66966	299.66968	151.16966	15116.96679	2.66966	299.66966	151.16966	15116.966	2020-01-01	2020-01-02	2020-01-01 00:14:49	2020-01-02 03:43:10	2020-01-01 00:14:49.000	2020-01-02 03:43:10.000	889	99790	50339.5	5033950	889	99790	50339.5	5033950	-32679	32256	4464.3	446430	-124	127	4.78	478
 89	2	10079	99989	0.26726	300.26726	150.26726	15176.99399	0.26726	300.26727	150.26727	15176.9943	0.26726	300.26726	150.26726	15176.99326	2020-01-01	2020-01-02	2020-01-01 00:01:29	2020-01-02 03:46:29	2020-01-01 00:01:29.000	2020-01-02 03:46:29.000	89	99989	50039	5053939	89	99989	50039	5053939	-32480	32455	4618.009900990099	466419	-125	126	-0.12871287128712872	-13
-890	2	10880	99791	2.67267	299.67267	151.17267	15117.26726	2.67267	299.67267	151.17267	15117.26708	2.67267	299.67267	151.17267	15117.26700	2020-01-01	2020-01-02	2020-01-01 00:14:50	2020-01-02 03:43:11	2020-01-01 00:14:50.000	2020-01-02 03:43:11.000	890	99791	50340.5	5034050	890	99791	50340.5	5034050	-32678	32257	4465.3	446530	-128	127	3.22	322
-891	2	10881	99792	2.67567	299.67567	151.17567	15117.56756	2.67567	299.6757	151.17567	15117.56768	2.67567	299.67567	151.17567	15117.56700	2020-01-01	2020-01-02	2020-01-01 00:14:51	2020-01-02 03:43:12	2020-01-01 00:14:51.000	2020-01-02 03:43:12.000	891	99792	50341.5	5034150	891	99792	50341.5	5034150	-32677	32258	4466.3	446630	-128	127	1.66	166
-892	2	10882	99793	2.67867	299.67867	151.17867	15117.86786	2.67867	299.67868	151.17868	15117.86802	2.67867	299.67867	151.17867	15117.86700	2020-01-01	2020-01-02	2020-01-01 00:14:52	2020-01-02 03:43:13	2020-01-01 00:14:52.000	2020-01-02 03:43:13.000	892	99793	50342.5	5034250	892	99793	50342.5	5034250	-32676	32259	4467.3	446730	-128	124	0.1	10
-893	2	10883	99794	2.68168	299.68168	151.18168	15118.16816	2.68168	299.68167	151.18168	15118.16816	2.68168	299.68168	151.18168	15118.16800	2020-01-01	2020-01-02	2020-01-01 00:14:53	2020-01-02 03:43:14	2020-01-01 00:14:53.000	2020-01-02 03:43:14.000	893	99794	50343.5	5034350	893	99794	50343.5	5034350	-32675	32260	4468.3	446830	-127	125	1.1	110
-894	2	10884	99795	2.68468	299.68468	151.18468	15118.46846	2.68468	299.6847	151.18468	15118.46826	2.68468	299.68468	151.18468000000001	15118.46800	2020-01-01	2020-01-02	2020-01-01 00:14:54	2020-01-02 03:43:15	2020-01-01 00:14:54.000	2020-01-02 03:43:15.000	894	99795	50344.5	5034450	894	99795	50344.5	5034450	-32674	32261	4469.3	446930	-126	126	2.1	210
-895	2	10885	99796	2.68768	299.68768	151.18768	15118.76876	2.68768	299.68768	151.18768	15118.76855	2.68768	299.68768	151.18768	15118.76800	2020-01-01	2020-01-02	2020-01-01 00:14:55	2020-01-02 03:43:16	2020-01-01 00:14:55.000	2020-01-02 03:43:16.000	895	99796	50345.5	5034550	895	99796	50345.5	5034550	-32673	32262	4470.3	447030	-125	127	3.1	310
-896	2	10886	99797	2.69069	299.69069	151.19069	15119.06906	2.69069	299.6907	151.19069	15119.06915	2.69069	299.69069	151.19069	15119.06900	2020-01-01	2020-01-02	2020-01-01 00:14:56	2020-01-02 03:43:17	2020-01-01 00:14:56.000	2020-01-02 03:43:17.000	896	99797	50346.5	5034650	896	99797	50346.5	5034650	-32672	32263	4471.3	447130	-128	127	1.54	154
-897	2	10887	99798	2.69369	299.69369	151.19369	15119.36936	2.69369	299.6937	151.19369	15119.36949	2.69369	299.69369	151.19369	15119.36900	2020-01-01	2020-01-02	2020-01-01 00:14:57	2020-01-02 03:43:18	2020-01-01 00:14:57.000	2020-01-02 03:43:18.000	897	99798	50347.5	5034750	897	99798	50347.5	5034750	-32671	32264	4472.3	447230	-128	127	-0.02	-2
-898	2	10888	99799	2.69669	299.69669	151.19669	15119.66966	2.69669	299.6967	151.19669	15119.66963	2.69669	299.69669	151.19669	15119.66900	2020-01-01	2020-01-02	2020-01-01 00:14:58	2020-01-02 03:43:19	2020-01-01 00:14:58.000	2020-01-02 03:43:19.000	898	99799	50348.5	5034850	898	99799	50348.5	5034850	-32670	32265	4473.3	447330	-128	123	-1.58	-158
-899	2	10889	99800	2.69969	299.69969	151.19969	15119.96996	2.69969	299.6997	151.1997	15119.97038	2.69969	299.69969	151.19969	15119.96900	2020-01-01	2020-01-02	2020-01-01 00:14:59	2020-01-02 03:43:20	2020-01-01 00:14:59.000	2020-01-02 03:43:20.000	899	99800	50349.5	5034950	899	99800	50349.5	5034950	-32669	32266	4474.3	447430	-127	124	-0.58	-58
+890	2	10880	99791	2.67267	299.67267	151.17267	15117.26726	2.67267	299.67267	151.17267	15117.26708	2.67267	299.67267	151.17267	15117.267	2020-01-01	2020-01-02	2020-01-01 00:14:50	2020-01-02 03:43:11	2020-01-01 00:14:50.000	2020-01-02 03:43:11.000	890	99791	50340.5	5034050	890	99791	50340.5	5034050	-32678	32257	4465.3	446530	-128	127	3.22	322
+891	2	10881	99792	2.67567	299.67567	151.17567	15117.56756	2.67567	299.6757	151.17567	15117.56768	2.67567	299.67567	151.17567	15117.567	2020-01-01	2020-01-02	2020-01-01 00:14:51	2020-01-02 03:43:12	2020-01-01 00:14:51.000	2020-01-02 03:43:12.000	891	99792	50341.5	5034150	891	99792	50341.5	5034150	-32677	32258	4466.3	446630	-128	127	1.66	166
+892	2	10882	99793	2.67867	299.67867	151.17867	15117.86786	2.67867	299.67868	151.17868	15117.86802	2.67867	299.67867	151.17867	15117.867	2020-01-01	2020-01-02	2020-01-01 00:14:52	2020-01-02 03:43:13	2020-01-01 00:14:52.000	2020-01-02 03:43:13.000	892	99793	50342.5	5034250	892	99793	50342.5	5034250	-32676	32259	4467.3	446730	-128	124	0.1	10
+893	2	10883	99794	2.68168	299.68168	151.18168	15118.16816	2.68168	299.68167	151.18168	15118.16816	2.68168	299.68168	151.18168	15118.168	2020-01-01	2020-01-02	2020-01-01 00:14:53	2020-01-02 03:43:14	2020-01-01 00:14:53.000	2020-01-02 03:43:14.000	893	99794	50343.5	5034350	893	99794	50343.5	5034350	-32675	32260	4468.3	446830	-127	125	1.1	110
+894	2	10884	99795	2.68468	299.68468	151.18468	15118.46846	2.68468	299.6847	151.18468	15118.46826	2.68468	299.68468	151.18468000000001	15118.468	2020-01-01	2020-01-02	2020-01-01 00:14:54	2020-01-02 03:43:15	2020-01-01 00:14:54.000	2020-01-02 03:43:15.000	894	99795	50344.5	5034450	894	99795	50344.5	5034450	-32674	32261	4469.3	446930	-126	126	2.1	210
+895	2	10885	99796	2.68768	299.68768	151.18768	15118.76876	2.68768	299.68768	151.18768	15118.76855	2.68768	299.68768	151.18768	15118.768	2020-01-01	2020-01-02	2020-01-01 00:14:55	2020-01-02 03:43:16	2020-01-01 00:14:55.000	2020-01-02 03:43:16.000	895	99796	50345.5	5034550	895	99796	50345.5	5034550	-32673	32262	4470.3	447030	-125	127	3.1	310
+896	2	10886	99797	2.69069	299.69069	151.19069	15119.06906	2.69069	299.6907	151.19069	15119.06915	2.69069	299.69069	151.19069	15119.069	2020-01-01	2020-01-02	2020-01-01 00:14:56	2020-01-02 03:43:17	2020-01-01 00:14:56.000	2020-01-02 03:43:17.000	896	99797	50346.5	5034650	896	99797	50346.5	5034650	-32672	32263	4471.3	447130	-128	127	1.54	154
+897	2	10887	99798	2.69369	299.69369	151.19369	15119.36936	2.69369	299.6937	151.19369	15119.36949	2.69369	299.69369	151.19369	15119.369	2020-01-01	2020-01-02	2020-01-01 00:14:57	2020-01-02 03:43:18	2020-01-01 00:14:57.000	2020-01-02 03:43:18.000	897	99798	50347.5	5034750	897	99798	50347.5	5034750	-32671	32264	4472.3	447230	-128	127	-0.02	-2
+898	2	10888	99799	2.69669	299.69669	151.19669	15119.66966	2.69669	299.6967	151.19669	15119.66963	2.69669	299.69669	151.19669	15119.669	2020-01-01	2020-01-02	2020-01-01 00:14:58	2020-01-02 03:43:19	2020-01-01 00:14:58.000	2020-01-02 03:43:19.000	898	99799	50348.5	5034850	898	99799	50348.5	5034850	-32670	32265	4473.3	447330	-128	123	-1.58	-158
+899	2	10889	99800	2.69969	299.69969	151.19969	15119.96996	2.69969	299.6997	151.1997	15119.97038	2.69969	299.69969	151.19969	15119.969	2020-01-01	2020-01-02	2020-01-01 00:14:59	2020-01-02 03:43:20	2020-01-01 00:14:59.000	2020-01-02 03:43:20.000	899	99800	50349.5	5034950	899	99800	50349.5	5034950	-32669	32266	4474.3	447430	-127	124	-0.58	-58
 9	2	1008	9999	0.02702	300.02702	150.02702	15152.72972	0.02702	300.02704	150.02702	15152.72966	0.02702	300.02702	150.02702	15152.72902	2020-01-01	2020-01-02	2020-01-01 00:00:09	2020-01-02 03:45:09	2020-01-01 00:00:09.000	2020-01-02 03:45:09.000	9	99909	49959	5045859	9	99909	49959	5045859	-32560	32375	4538.009900990099	458339	-124	127	0.9801980198019802	99
 90	2	10080	99990	0.27027	300.27027	150.27027	15177.29729	0.27027	300.27026	150.27026	15177.29694	0.27027	300.27027	150.27026999999998	15177.29727	2020-01-01	2020-01-02	2020-01-01 00:01:30	2020-01-02 03:46:30	2020-01-01 00:01:30.000	2020-01-02 03:46:30.000	90	99990	50040	5054040	90	99990	50040	5054040	-32479	32456	4619.009900990099	466520	-124	127	0.8712871287128713	88
-900	2	10890	99801	2.7027	299.7027	151.2027	15120.27027	2.7027	299.7027	151.2027	15120.27003	2.70270	299.70270	151.2027	15120.27000	2020-01-01	2020-01-02	2020-01-01 00:15:00	2020-01-02 03:43:21	2020-01-01 00:15:00.000	2020-01-02 03:43:21.000	900	99801	50350.5	5035050	900	99801	50350.5	5035050	-32668	32267	4475.3	447530	-126	125	0.42	42
-901	2	10891	99802	2.7057	299.7057	151.2057	15120.57057	2.7057	299.70572	151.2057	15120.57066	2.70570	299.70570	151.2057	15120.57000	2020-01-01	2020-01-02	2020-01-01 00:15:01	2020-01-02 03:43:22	2020-01-01 00:15:01.000	2020-01-02 03:43:22.000	901	99802	50351.5	5035150	901	99802	50351.5	5035150	-32667	32268	4476.3	447630	-125	126	1.42	142
-902	2	10892	99803	2.7087	299.7087	151.2087	15120.87087	2.7087	299.7087	151.2087	15120.87095	2.70870	299.70870	151.20870000000002	15120.87000	2020-01-01	2020-01-02	2020-01-01 00:15:02	2020-01-02 03:43:23	2020-01-01 00:15:02.000	2020-01-02 03:43:23.000	902	99803	50352.5	5035250	902	99803	50352.5	5035250	-32666	32269	4477.3	447730	-124	127	2.42	242
-903	2	10893	99804	2.71171	299.71171	151.21171	15121.17117	2.71171	299.7117	151.21171	15121.1711	2.71171	299.71171	151.21171	15121.17100	2020-01-01	2020-01-02	2020-01-01 00:15:03	2020-01-02 03:43:24	2020-01-01 00:15:03.000	2020-01-02 03:43:24.000	903	99804	50353.5	5035350	903	99804	50353.5	5035350	-32665	32270	4478.3	447830	-128	127	0.86	86
-904	2	10894	99805	2.71471	299.71471	151.21471	15121.47147	2.71471	299.71472	151.21471	15121.47185	2.71471	299.71471	151.21471	15121.47100	2020-01-01	2020-01-02	2020-01-01 00:15:04	2020-01-02 03:43:25	2020-01-01 00:15:04.000	2020-01-02 03:43:25.000	904	99805	50354.5	5035450	904	99805	50354.5	5035450	-32664	32271	4479.3	447930	-128	123	-0.7	-70
-905	2	10895	99806	2.71771	299.71771	151.21771	15121.77177	2.71771	299.7177	151.21771	15121.77149	2.71771	299.71771	151.21771	15121.77100	2020-01-01	2020-01-02	2020-01-01 00:15:05	2020-01-02 03:43:26	2020-01-01 00:15:05.000	2020-01-02 03:43:26.000	905	99806	50355.5	5035550	905	99806	50355.5	5035550	-32663	32272	4480.3	448030	-127	124	0.3	30
-906	2	10896	99807	2.72072	299.72072	151.22072	15122.07207	2.72072	299.72073	151.22072	15122.07212	2.72072	299.72072	151.22072	15122.07200	2020-01-01	2020-01-02	2020-01-01 00:15:06	2020-01-02 03:43:27	2020-01-01 00:15:06.000	2020-01-02 03:43:27.000	906	99807	50356.5	5035650	906	99807	50356.5	5035650	-32662	32273	4481.3	448130	-126	125	1.3	130
-907	2	10897	99808	2.72372	299.72372	151.22372	15122.37237	2.72372	299.72372	151.22372	15122.37243	2.72372	299.72372	151.22372	15122.37200	2020-01-01	2020-01-02	2020-01-01 00:15:07	2020-01-02 03:43:28	2020-01-01 00:15:07.000	2020-01-02 03:43:28.000	907	99808	50357.5	5035750	907	99808	50357.5	5035750	-32661	32274	4482.3	448230	-125	126	2.3	230
-908	2	10898	99809	2.72672	299.72672	151.22672	15122.67267	2.72672	299.7267	151.22672	15122.67272	2.72672	299.72672	151.22672	15122.67200	2020-01-01	2020-01-02	2020-01-01 00:15:08	2020-01-02 03:43:29	2020-01-01 00:15:08.000	2020-01-02 03:43:29.000	908	99809	50358.5	5035850	908	99809	50358.5	5035850	-32660	32275	4483.3	448330	-124	127	3.3	330
-909	2	10899	99810	2.72972	299.72972	151.22972	15122.97297	2.72972	299.72974	151.22973	15122.97332	2.72972	299.72972	151.22972	15122.97200	2020-01-01	2020-01-02	2020-01-01 00:15:09	2020-01-02 03:43:30	2020-01-01 00:15:09.000	2020-01-02 03:43:30.000	909	99810	50359.5	5035950	909	99810	50359.5	5035950	-32659	32276	4484.3	448430	-128	127	1.74	174
+900	2	10890	99801	2.7027	299.7027	151.2027	15120.27027	2.7027	299.7027	151.2027	15120.27003	2.7027	299.7027	151.2027	15120.27	2020-01-01	2020-01-02	2020-01-01 00:15:00	2020-01-02 03:43:21	2020-01-01 00:15:00.000	2020-01-02 03:43:21.000	900	99801	50350.5	5035050	900	99801	50350.5	5035050	-32668	32267	4475.3	447530	-126	125	0.42	42
+901	2	10891	99802	2.7057	299.7057	151.2057	15120.57057	2.7057	299.70572	151.2057	15120.57066	2.7057	299.7057	151.2057	15120.57	2020-01-01	2020-01-02	2020-01-01 00:15:01	2020-01-02 03:43:22	2020-01-01 00:15:01.000	2020-01-02 03:43:22.000	901	99802	50351.5	5035150	901	99802	50351.5	5035150	-32667	32268	4476.3	447630	-125	126	1.42	142
+902	2	10892	99803	2.7087	299.7087	151.2087	15120.87087	2.7087	299.7087	151.2087	15120.87095	2.7087	299.7087	151.20870000000002	15120.87	2020-01-01	2020-01-02	2020-01-01 00:15:02	2020-01-02 03:43:23	2020-01-01 00:15:02.000	2020-01-02 03:43:23.000	902	99803	50352.5	5035250	902	99803	50352.5	5035250	-32666	32269	4477.3	447730	-124	127	2.42	242
+903	2	10893	99804	2.71171	299.71171	151.21171	15121.17117	2.71171	299.7117	151.21171	15121.1711	2.71171	299.71171	151.21171	15121.171	2020-01-01	2020-01-02	2020-01-01 00:15:03	2020-01-02 03:43:24	2020-01-01 00:15:03.000	2020-01-02 03:43:24.000	903	99804	50353.5	5035350	903	99804	50353.5	5035350	-32665	32270	4478.3	447830	-128	127	0.86	86
+904	2	10894	99805	2.71471	299.71471	151.21471	15121.47147	2.71471	299.71472	151.21471	15121.47185	2.71471	299.71471	151.21471	15121.471	2020-01-01	2020-01-02	2020-01-01 00:15:04	2020-01-02 03:43:25	2020-01-01 00:15:04.000	2020-01-02 03:43:25.000	904	99805	50354.5	5035450	904	99805	50354.5	5035450	-32664	32271	4479.3	447930	-128	123	-0.7	-70
+905	2	10895	99806	2.71771	299.71771	151.21771	15121.77177	2.71771	299.7177	151.21771	15121.77149	2.71771	299.71771	151.21771	15121.771	2020-01-01	2020-01-02	2020-01-01 00:15:05	2020-01-02 03:43:26	2020-01-01 00:15:05.000	2020-01-02 03:43:26.000	905	99806	50355.5	5035550	905	99806	50355.5	5035550	-32663	32272	4480.3	448030	-127	124	0.3	30
+906	2	10896	99807	2.72072	299.72072	151.22072	15122.07207	2.72072	299.72073	151.22072	15122.07212	2.72072	299.72072	151.22072	15122.072	2020-01-01	2020-01-02	2020-01-01 00:15:06	2020-01-02 03:43:27	2020-01-01 00:15:06.000	2020-01-02 03:43:27.000	906	99807	50356.5	5035650	906	99807	50356.5	5035650	-32662	32273	4481.3	448130	-126	125	1.3	130
+907	2	10897	99808	2.72372	299.72372	151.22372	15122.37237	2.72372	299.72372	151.22372	15122.37243	2.72372	299.72372	151.22372	15122.372	2020-01-01	2020-01-02	2020-01-01 00:15:07	2020-01-02 03:43:28	2020-01-01 00:15:07.000	2020-01-02 03:43:28.000	907	99808	50357.5	5035750	907	99808	50357.5	5035750	-32661	32274	4482.3	448230	-125	126	2.3	230
+908	2	10898	99809	2.72672	299.72672	151.22672	15122.67267	2.72672	299.7267	151.22672	15122.67272	2.72672	299.72672	151.22672	15122.672	2020-01-01	2020-01-02	2020-01-01 00:15:08	2020-01-02 03:43:29	2020-01-01 00:15:08.000	2020-01-02 03:43:29.000	908	99809	50358.5	5035850	908	99809	50358.5	5035850	-32660	32275	4483.3	448330	-124	127	3.3	330
+909	2	10899	99810	2.72972	299.72972	151.22972	15122.97297	2.72972	299.72974	151.22973	15122.97332	2.72972	299.72972	151.22972	15122.972	2020-01-01	2020-01-02	2020-01-01 00:15:09	2020-01-02 03:43:30	2020-01-01 00:15:09.000	2020-01-02 03:43:30.000	909	99810	50359.5	5035950	909	99810	50359.5	5035950	-32659	32276	4484.3	448430	-128	127	1.74	174
 91	2	10081	99991	0.27327	300.27327	150.27327	15177.6006	0.27327	300.2733	150.27327	15177.60054	0.27327	300.27327	150.27327	15177.60027	2020-01-01	2020-01-02	2020-01-01 00:01:31	2020-01-02 03:46:31	2020-01-01 00:01:31.000	2020-01-02 03:46:31.000	91	99991	50041	5054141	91	99991	50041	5054141	-32478	32457	4620.009900990099	466621	-128	127	-0.6633663366336634	-67
-910	2	10900	99811	2.73273	299.73273	151.23273	15123.27327	2.73273	299.73273	151.23272	15123.27296	2.73273	299.73273	151.23273	15123.27300	2020-01-01	2020-01-02	2020-01-01 00:15:10	2020-01-02 03:43:31	2020-01-01 00:15:10.000	2020-01-02 03:43:31.000	910	99811	50360.5	5036050	910	99811	50360.5	5036050	-32658	32277	4485.3	448530	-128	123	0.18	18
-911	2	10901	99812	2.73573	299.73573	151.23573	15123.57357	2.73573	299.73575	151.23573	15123.57359	2.73573	299.73573	151.23573	15123.57300	2020-01-01	2020-01-02	2020-01-01 00:15:11	2020-01-02 03:43:32	2020-01-01 00:15:11.000	2020-01-02 03:43:32.000	911	99812	50361.5	5036150	911	99812	50361.5	5036150	-32657	32278	4486.3	448630	-127	124	1.18	118
-912	2	10902	99813	2.73873	299.73873	151.23873	15123.87387	2.73873	299.73874	151.23873	15123.8739	2.73873	299.73873	151.23873	15123.87300	2020-01-01	2020-01-02	2020-01-01 00:15:12	2020-01-02 03:43:33	2020-01-01 00:15:12.000	2020-01-02 03:43:33.000	912	99813	50362.5	5036250	912	99813	50362.5	5036250	-32656	32279	4487.3	448730	-126	125	2.18	218
-913	2	10903	99814	2.74174	299.74174	151.24174	15124.17417	2.74174	299.74173	151.24174	15124.17419	2.74174	299.74174	151.24174000000002	15124.17400	2020-01-01	2020-01-02	2020-01-01 00:15:13	2020-01-02 03:43:34	2020-01-01 00:15:13.000	2020-01-02 03:43:34.000	913	99814	50363.5	5036350	913	99814	50363.5	5036350	-32655	32280	4488.3	448830	-125	126	3.18	318
-914	2	10904	99815	2.74474	299.74474	151.24474	15124.47447	2.74474	299.74475	151.24474	15124.47479	2.74474	299.74474	151.24474	15124.47400	2020-01-01	2020-01-02	2020-01-01 00:15:14	2020-01-02 03:43:35	2020-01-01 00:15:14.000	2020-01-02 03:43:35.000	914	99815	50364.5	5036450	914	99815	50364.5	5036450	-32654	32281	4489.3	448930	-124	127	4.18	418
-915	2	10905	99816	2.74774	299.74774	151.24774	15124.77477	2.74774	299.74774	151.24774	15124.77447	2.74774	299.74774	151.24774	15124.77400	2020-01-01	2020-01-02	2020-01-01 00:15:15	2020-01-02 03:43:36	2020-01-01 00:15:15.000	2020-01-02 03:43:36.000	915	99816	50365.5	5036550	915	99816	50365.5	5036550	-32653	32282	4490.3	449030	-128	127	2.62	262
-916	2	10906	99817	2.75075	299.75075	151.25075	15125.07507	2.75075	299.75076	151.25075	15125.07507	2.75075	299.75075	151.25075	15125.07500	2020-01-01	2020-01-02	2020-01-01 00:15:16	2020-01-02 03:43:37	2020-01-01 00:15:16.000	2020-01-02 03:43:37.000	916	99817	50366.5	5036650	916	99817	50366.5	5036650	-32652	32283	4491.3	449130	-128	127	1.06	106
-917	2	10907	99818	2.75375	299.75375	151.25375	15125.37537	2.75375	299.75375	151.25375	15125.37536	2.75375	299.75375	151.25375	15125.37500	2020-01-01	2020-01-02	2020-01-01 00:15:17	2020-01-02 03:43:38	2020-01-01 00:15:17.000	2020-01-02 03:43:38.000	917	99818	50367.5	5036750	917	99818	50367.5	5036750	-32651	32284	4492.3	449230	-128	124	-0.5	-50
-918	2	10908	99819	2.75675	299.75675	151.25675	15125.67567	2.75675	299.75674	151.25675	15125.67566	2.75675	299.75675	151.25674999999998	15125.67500	2020-01-01	2020-01-02	2020-01-01 00:15:18	2020-01-02 03:43:39	2020-01-01 00:15:18.000	2020-01-02 03:43:39.000	918	99819	50368.5	5036850	918	99819	50368.5	5036850	-32650	32285	4493.3	449330	-127	125	0.5	50
-919	2	10909	99820	2.75975	299.75975	151.25975	15125.97597	2.75975	299.75977	151.25976	15125.97626	2.75975	299.75975	151.25975	15125.97500	2020-01-01	2020-01-02	2020-01-01 00:15:19	2020-01-02 03:43:40	2020-01-01 00:15:19.000	2020-01-02 03:43:40.000	919	99820	50369.5	5036950	919	99820	50369.5	5036950	-32649	32286	4494.3	449430	-126	126	1.5	150
+910	2	10900	99811	2.73273	299.73273	151.23273	15123.27327	2.73273	299.73273	151.23272	15123.27296	2.73273	299.73273	151.23273	15123.273	2020-01-01	2020-01-02	2020-01-01 00:15:10	2020-01-02 03:43:31	2020-01-01 00:15:10.000	2020-01-02 03:43:31.000	910	99811	50360.5	5036050	910	99811	50360.5	5036050	-32658	32277	4485.3	448530	-128	123	0.18	18
+911	2	10901	99812	2.73573	299.73573	151.23573	15123.57357	2.73573	299.73575	151.23573	15123.57359	2.73573	299.73573	151.23573	15123.573	2020-01-01	2020-01-02	2020-01-01 00:15:11	2020-01-02 03:43:32	2020-01-01 00:15:11.000	2020-01-02 03:43:32.000	911	99812	50361.5	5036150	911	99812	50361.5	5036150	-32657	32278	4486.3	448630	-127	124	1.18	118
+912	2	10902	99813	2.73873	299.73873	151.23873	15123.87387	2.73873	299.73874	151.23873	15123.8739	2.73873	299.73873	151.23873	15123.873	2020-01-01	2020-01-02	2020-01-01 00:15:12	2020-01-02 03:43:33	2020-01-01 00:15:12.000	2020-01-02 03:43:33.000	912	99813	50362.5	5036250	912	99813	50362.5	5036250	-32656	32279	4487.3	448730	-126	125	2.18	218
+913	2	10903	99814	2.74174	299.74174	151.24174	15124.17417	2.74174	299.74173	151.24174	15124.17419	2.74174	299.74174	151.24174000000002	15124.174	2020-01-01	2020-01-02	2020-01-01 00:15:13	2020-01-02 03:43:34	2020-01-01 00:15:13.000	2020-01-02 03:43:34.000	913	99814	50363.5	5036350	913	99814	50363.5	5036350	-32655	32280	4488.3	448830	-125	126	3.18	318
+914	2	10904	99815	2.74474	299.74474	151.24474	15124.47447	2.74474	299.74475	151.24474	15124.47479	2.74474	299.74474	151.24474	15124.474	2020-01-01	2020-01-02	2020-01-01 00:15:14	2020-01-02 03:43:35	2020-01-01 00:15:14.000	2020-01-02 03:43:35.000	914	99815	50364.5	5036450	914	99815	50364.5	5036450	-32654	32281	4489.3	448930	-124	127	4.18	418
+915	2	10905	99816	2.74774	299.74774	151.24774	15124.77477	2.74774	299.74774	151.24774	15124.77447	2.74774	299.74774	151.24774	15124.774	2020-01-01	2020-01-02	2020-01-01 00:15:15	2020-01-02 03:43:36	2020-01-01 00:15:15.000	2020-01-02 03:43:36.000	915	99816	50365.5	5036550	915	99816	50365.5	5036550	-32653	32282	4490.3	449030	-128	127	2.62	262
+916	2	10906	99817	2.75075	299.75075	151.25075	15125.07507	2.75075	299.75076	151.25075	15125.07507	2.75075	299.75075	151.25075	15125.075	2020-01-01	2020-01-02	2020-01-01 00:15:16	2020-01-02 03:43:37	2020-01-01 00:15:16.000	2020-01-02 03:43:37.000	916	99817	50366.5	5036650	916	99817	50366.5	5036650	-32652	32283	4491.3	449130	-128	127	1.06	106
+917	2	10907	99818	2.75375	299.75375	151.25375	15125.37537	2.75375	299.75375	151.25375	15125.37536	2.75375	299.75375	151.25375	15125.375	2020-01-01	2020-01-02	2020-01-01 00:15:17	2020-01-02 03:43:38	2020-01-01 00:15:17.000	2020-01-02 03:43:38.000	917	99818	50367.5	5036750	917	99818	50367.5	5036750	-32651	32284	4492.3	449230	-128	124	-0.5	-50
+918	2	10908	99819	2.75675	299.75675	151.25675	15125.67567	2.75675	299.75674	151.25675	15125.67566	2.75675	299.75675	151.25674999999998	15125.675	2020-01-01	2020-01-02	2020-01-01 00:15:18	2020-01-02 03:43:39	2020-01-01 00:15:18.000	2020-01-02 03:43:39.000	918	99819	50368.5	5036850	918	99819	50368.5	5036850	-32650	32285	4493.3	449330	-127	125	0.5	50
+919	2	10909	99820	2.75975	299.75975	151.25975	15125.97597	2.75975	299.75977	151.25976	15125.97626	2.75975	299.75975	151.25975	15125.975	2020-01-01	2020-01-02	2020-01-01 00:15:19	2020-01-02 03:43:40	2020-01-01 00:15:19.000	2020-01-02 03:43:40.000	919	99820	50369.5	5036950	919	99820	50369.5	5036950	-32649	32286	4494.3	449430	-126	126	1.5	150
 92	2	10082	99992	0.27627	300.27627	150.27627	15177.9039	0.27627	300.27628	150.27627	15177.90384	0.27627	300.27627	150.27627	15177.90327	2020-01-01	2020-01-02	2020-01-01 00:01:32	2020-01-02 03:46:32	2020-01-01 00:01:32.000	2020-01-02 03:46:32.000	92	99992	50042	5054242	92	99992	50042	5054242	-32477	32458	4621.009900990099	466722	-128	123	-2.198019801980198	-222
-920	2	10910	99821	2.76276	299.76276	151.26276	15126.27627	2.76276	299.76276	151.26275	15126.27594	2.76276	299.76276	151.26276	15126.27600	2020-01-01	2020-01-02	2020-01-01 00:15:20	2020-01-02 03:43:41	2020-01-01 00:15:20.000	2020-01-02 03:43:41.000	920	99821	50370.5	5037050	920	99821	50370.5	5037050	-32648	32287	4495.3	449530	-125	127	2.5	250
-921	2	10911	99822	2.76576	299.76576	151.26576	15126.57657	2.76576	299.76578	151.26576	15126.57654	2.76576	299.76576	151.26576	15126.57600	2020-01-01	2020-01-02	2020-01-01 00:15:21	2020-01-02 03:43:42	2020-01-01 00:15:21.000	2020-01-02 03:43:42.000	921	99822	50371.5	5037150	921	99822	50371.5	5037150	-32647	32288	4496.3	449630	-128	127	0.94	94
-922	2	10912	99823	2.76876	299.76876	151.26876	15126.87687	2.76876	299.76877	151.26876	15126.87683	2.76876	299.76876	151.26876000000001	15126.87600	2020-01-01	2020-01-02	2020-01-01 00:15:22	2020-01-02 03:43:43	2020-01-01 00:15:22.000	2020-01-02 03:43:43.000	922	99823	50372.5	5037250	922	99823	50372.5	5037250	-32646	32289	4497.3	449730	-128	127	-0.62	-62
-923	2	10913	99824	2.77177	299.77177	151.27177	15127.17717	2.77177	299.77176	151.27177	15127.17713	2.77177	299.77177	151.27177	15127.17700	2020-01-01	2020-01-02	2020-01-01 00:15:23	2020-01-02 03:43:44	2020-01-01 00:15:23.000	2020-01-02 03:43:44.000	923	99824	50373.5	5037350	923	99824	50373.5	5037350	-32645	32290	4498.3	449830	-128	123	-2.18	-218
-924	2	10914	99825	2.77477	299.77477	151.27477	15127.47747	2.77477	299.77478	151.27477	15127.47776	2.77477	299.77477	151.27477000000002	15127.47700	2020-01-01	2020-01-02	2020-01-01 00:15:24	2020-01-02 03:43:45	2020-01-01 00:15:24.000	2020-01-02 03:43:45.000	924	99825	50374.5	5037450	924	99825	50374.5	5037450	-32644	32291	4499.3	449930	-127	124	-1.18	-118
-925	2	10915	99826	2.77777	299.77777	151.27777	15127.77777	2.77777	299.77777	151.27777	15127.77741	2.77777	299.77777	151.27777	15127.77700	2020-01-01	2020-01-02	2020-01-01 00:15:25	2020-01-02 03:43:46	2020-01-01 00:15:25.000	2020-01-02 03:43:46.000	925	99826	50375.5	5037550	925	99826	50375.5	5037550	-32643	32292	4500.3	450030	-126	125	-0.18	-18
-926	2	10916	99827	2.78078	299.78078	151.28078	15128.07807	2.78078	299.7808	151.28078	15128.078	2.78078	299.78078	151.28078	15128.07800	2020-01-01	2020-01-02	2020-01-01 00:15:26	2020-01-02 03:43:47	2020-01-01 00:15:26.000	2020-01-02 03:43:47.000	926	99827	50376.5	5037650	926	99827	50376.5	5037650	-32642	32293	4501.3	450130	-125	126	0.82	82
-927	2	10917	99828	2.78378	299.78378	151.28378	15128.37837	2.78378	299.78378	151.28378	15128.3783	2.78378	299.78378	151.28378	15128.37800	2020-01-01	2020-01-02	2020-01-01 00:15:27	2020-01-02 03:43:48	2020-01-01 00:15:27.000	2020-01-02 03:43:48.000	927	99828	50377.5	5037750	927	99828	50377.5	5037750	-32641	32294	4502.3	450230	-124	127	1.82	182
-928	2	10918	99829	2.78678	299.78678	151.28678	15128.67867	2.78678	299.78677	151.28678	15128.6786	2.78678	299.78678	151.28678	15128.67800	2020-01-01	2020-01-02	2020-01-01 00:15:28	2020-01-02 03:43:49	2020-01-01 00:15:28.000	2020-01-02 03:43:49.000	928	99829	50378.5	5037850	928	99829	50378.5	5037850	-32640	32295	4503.3	450330	-128	127	0.26	26
-929	2	10919	99830	2.78978	299.78978	151.28978	15128.97897	2.78978	299.7898	151.28979	15128.97923	2.78978	299.78978	151.28977999999998	15128.97800	2020-01-01	2020-01-02	2020-01-01 00:15:29	2020-01-02 03:43:50	2020-01-01 00:15:29.000	2020-01-02 03:43:50.000	929	99830	50379.5	5037950	929	99830	50379.5	5037950	-32639	32296	4504.3	450430	-128	123	-1.3	-130
+920	2	10910	99821	2.76276	299.76276	151.26276	15126.27627	2.76276	299.76276	151.26275	15126.27594	2.76276	299.76276	151.26276	15126.276	2020-01-01	2020-01-02	2020-01-01 00:15:20	2020-01-02 03:43:41	2020-01-01 00:15:20.000	2020-01-02 03:43:41.000	920	99821	50370.5	5037050	920	99821	50370.5	5037050	-32648	32287	4495.3	449530	-125	127	2.5	250
+921	2	10911	99822	2.76576	299.76576	151.26576	15126.57657	2.76576	299.76578	151.26576	15126.57654	2.76576	299.76576	151.26576	15126.576	2020-01-01	2020-01-02	2020-01-01 00:15:21	2020-01-02 03:43:42	2020-01-01 00:15:21.000	2020-01-02 03:43:42.000	921	99822	50371.5	5037150	921	99822	50371.5	5037150	-32647	32288	4496.3	449630	-128	127	0.94	94
+922	2	10912	99823	2.76876	299.76876	151.26876	15126.87687	2.76876	299.76877	151.26876	15126.87683	2.76876	299.76876	151.26876000000001	15126.876	2020-01-01	2020-01-02	2020-01-01 00:15:22	2020-01-02 03:43:43	2020-01-01 00:15:22.000	2020-01-02 03:43:43.000	922	99823	50372.5	5037250	922	99823	50372.5	5037250	-32646	32289	4497.3	449730	-128	127	-0.62	-62
+923	2	10913	99824	2.77177	299.77177	151.27177	15127.17717	2.77177	299.77176	151.27177	15127.17713	2.77177	299.77177	151.27177	15127.177	2020-01-01	2020-01-02	2020-01-01 00:15:23	2020-01-02 03:43:44	2020-01-01 00:15:23.000	2020-01-02 03:43:44.000	923	99824	50373.5	5037350	923	99824	50373.5	5037350	-32645	32290	4498.3	449830	-128	123	-2.18	-218
+924	2	10914	99825	2.77477	299.77477	151.27477	15127.47747	2.77477	299.77478	151.27477	15127.47776	2.77477	299.77477	151.27477000000002	15127.477	2020-01-01	2020-01-02	2020-01-01 00:15:24	2020-01-02 03:43:45	2020-01-01 00:15:24.000	2020-01-02 03:43:45.000	924	99825	50374.5	5037450	924	99825	50374.5	5037450	-32644	32291	4499.3	449930	-127	124	-1.18	-118
+925	2	10915	99826	2.77777	299.77777	151.27777	15127.77777	2.77777	299.77777	151.27777	15127.77741	2.77777	299.77777	151.27777	15127.777	2020-01-01	2020-01-02	2020-01-01 00:15:25	2020-01-02 03:43:46	2020-01-01 00:15:25.000	2020-01-02 03:43:46.000	925	99826	50375.5	5037550	925	99826	50375.5	5037550	-32643	32292	4500.3	450030	-126	125	-0.18	-18
+926	2	10916	99827	2.78078	299.78078	151.28078	15128.07807	2.78078	299.7808	151.28078	15128.078	2.78078	299.78078	151.28078	15128.078	2020-01-01	2020-01-02	2020-01-01 00:15:26	2020-01-02 03:43:47	2020-01-01 00:15:26.000	2020-01-02 03:43:47.000	926	99827	50376.5	5037650	926	99827	50376.5	5037650	-32642	32293	4501.3	450130	-125	126	0.82	82
+927	2	10917	99828	2.78378	299.78378	151.28378	15128.37837	2.78378	299.78378	151.28378	15128.3783	2.78378	299.78378	151.28378	15128.378	2020-01-01	2020-01-02	2020-01-01 00:15:27	2020-01-02 03:43:48	2020-01-01 00:15:27.000	2020-01-02 03:43:48.000	927	99828	50377.5	5037750	927	99828	50377.5	5037750	-32641	32294	4502.3	450230	-124	127	1.82	182
+928	2	10918	99829	2.78678	299.78678	151.28678	15128.67867	2.78678	299.78677	151.28678	15128.6786	2.78678	299.78678	151.28678	15128.678	2020-01-01	2020-01-02	2020-01-01 00:15:28	2020-01-02 03:43:49	2020-01-01 00:15:28.000	2020-01-02 03:43:49.000	928	99829	50378.5	5037850	928	99829	50378.5	5037850	-32640	32295	4503.3	450330	-128	127	0.26	26
+929	2	10919	99830	2.78978	299.78978	151.28978	15128.97897	2.78978	299.7898	151.28979	15128.97923	2.78978	299.78978	151.28977999999998	15128.978	2020-01-01	2020-01-02	2020-01-01 00:15:29	2020-01-02 03:43:50	2020-01-01 00:15:29.000	2020-01-02 03:43:50.000	929	99830	50379.5	5037950	929	99830	50379.5	5037950	-32639	32296	4504.3	450430	-128	123	-1.3	-130
 93	2	10083	99993	0.27927	300.27927	150.27927	15178.2072	0.27927	300.27927	150.27927	15178.20715	0.27927	300.27927	150.27927	15178.20627	2020-01-01	2020-01-02	2020-01-01 00:01:33	2020-01-02 03:46:33	2020-01-01 00:01:33.000	2020-01-02 03:46:33.000	93	99993	50043	5054343	93	99993	50043	5054343	-32476	32459	4622.009900990099	466823	-127	124	-1.198019801980198	-121
-930	2	10920	99831	2.79279	299.79279	151.29279	15129.27927	2.79279	299.7928	151.29278	15129.27888	2.79279	299.79279	151.29279	15129.27900	2020-01-01	2020-01-02	2020-01-01 00:15:30	2020-01-02 03:43:51	2020-01-01 00:15:30.000	2020-01-02 03:43:51.000	930	99831	50380.5	5038050	930	99831	50380.5	5038050	-32638	32297	4505.3	450530	-127	124	-0.3	-30
-931	2	10921	99832	2.79579	299.79579	151.29579	15129.57957	2.79579	299.7958	151.29579	15129.57963	2.79579	299.79579	151.29579	15129.57900	2020-01-01	2020-01-02	2020-01-01 00:15:31	2020-01-02 03:43:52	2020-01-01 00:15:31.000	2020-01-02 03:43:52.000	931	99832	50381.5	5038150	931	99832	50381.5	5038150	-32637	32298	4506.3	450630	-126	125	0.7	70
-932	2	10922	99833	2.79879	299.79879	151.29879	15129.87987	2.79879	299.7988	151.29879	15129.87977	2.79879	299.79879	151.29879	15129.87900	2020-01-01	2020-01-02	2020-01-01 00:15:32	2020-01-02 03:43:53	2020-01-01 00:15:32.000	2020-01-02 03:43:53.000	932	99833	50382.5	5038250	932	99833	50382.5	5038250	-32636	32299	4507.3	450730	-125	126	1.7	170
-933	2	10923	99834	2.8018	299.8018	151.3018	15130.18018	2.8018	299.8018	151.3018	15130.18011	2.80180	299.80180	151.30180000000001	15130.18000	2020-01-01	2020-01-02	2020-01-01 00:15:33	2020-01-02 03:43:54	2020-01-01 00:15:33.000	2020-01-02 03:43:54.000	933	99834	50383.5	5038350	933	99834	50383.5	5038350	-32635	32300	4508.3	450830	-124	127	2.7	270
-934	2	10924	99835	2.8048	299.8048	151.3048	15130.48048	2.8048	299.8048	151.3048	15130.48071	2.80480	299.80480	151.3048	15130.48000	2020-01-01	2020-01-02	2020-01-01 00:15:34	2020-01-02 03:43:55	2020-01-01 00:15:34.000	2020-01-02 03:43:55.000	934	99835	50384.5	5038450	934	99835	50384.5	5038450	-32634	32301	4509.3	450930	-128	127	1.14	114
-935	2	10925	99836	2.8078	299.8078	151.3078	15130.78078	2.8078	299.8078	151.3078	15130.78034	2.80780	299.80780	151.30780000000001	15130.78000	2020-01-01	2020-01-02	2020-01-01 00:15:35	2020-01-02 03:43:56	2020-01-01 00:15:35.000	2020-01-02 03:43:56.000	935	99836	50385.5	5038550	935	99836	50385.5	5038550	-32633	32302	4510.3	451030	-128	123	-0.42	-42
-936	2	10926	99837	2.81081	299.81081	151.31081	15131.08108	2.81081	299.81082	151.31081	15131.0811	2.81081	299.81081	151.31081	15131.08100	2020-01-01	2020-01-02	2020-01-01 00:15:36	2020-01-02 03:43:57	2020-01-01 00:15:36.000	2020-01-02 03:43:57.000	936	99837	50386.5	5038650	936	99837	50386.5	5038650	-32632	32303	4511.3	451130	-127	124	0.58	58
-937	2	10927	99838	2.81381	299.81381	151.31381	15131.38138	2.81381	299.8138	151.31381	15131.38124	2.81381	299.81381	151.31381	15131.38100	2020-01-01	2020-01-02	2020-01-01 00:15:37	2020-01-02 03:43:58	2020-01-01 00:15:37.000	2020-01-02 03:43:58.000	937	99838	50387.5	5038750	937	99838	50387.5	5038750	-32631	32304	4512.3	451230	-126	125	1.58	158
-938	2	10928	99839	2.81681	299.81681	151.31681	15131.68168	2.81681	299.8168	151.31681	15131.68157	2.81681	299.81681	151.31681	15131.68100	2020-01-01	2020-01-02	2020-01-01 00:15:38	2020-01-02 03:43:59	2020-01-01 00:15:38.000	2020-01-02 03:43:59.000	938	99839	50388.5	5038850	938	99839	50388.5	5038850	-32630	32305	4513.3	451330	-125	126	2.58	258
-939	2	10929	99840	2.81981	299.81981	151.31981	15131.98198	2.81982	299.81982	151.31982	15131.98217	2.81981	299.81981	151.31981	15131.98100	2020-01-01	2020-01-02	2020-01-01 00:15:39	2020-01-02 03:44:00	2020-01-01 00:15:39.000	2020-01-02 03:44:00.000	939	99840	50389.5	5038950	939	99840	50389.5	5038950	-32629	32306	4514.3	451430	-124	127	3.58	358
+930	2	10920	99831	2.79279	299.79279	151.29279	15129.27927	2.79279	299.7928	151.29278	15129.27888	2.79279	299.79279	151.29279	15129.279	2020-01-01	2020-01-02	2020-01-01 00:15:30	2020-01-02 03:43:51	2020-01-01 00:15:30.000	2020-01-02 03:43:51.000	930	99831	50380.5	5038050	930	99831	50380.5	5038050	-32638	32297	4505.3	450530	-127	124	-0.3	-30
+931	2	10921	99832	2.79579	299.79579	151.29579	15129.57957	2.79579	299.7958	151.29579	15129.57963	2.79579	299.79579	151.29579	15129.579	2020-01-01	2020-01-02	2020-01-01 00:15:31	2020-01-02 03:43:52	2020-01-01 00:15:31.000	2020-01-02 03:43:52.000	931	99832	50381.5	5038150	931	99832	50381.5	5038150	-32637	32298	4506.3	450630	-126	125	0.7	70
+932	2	10922	99833	2.79879	299.79879	151.29879	15129.87987	2.79879	299.7988	151.29879	15129.87977	2.79879	299.79879	151.29879	15129.879	2020-01-01	2020-01-02	2020-01-01 00:15:32	2020-01-02 03:43:53	2020-01-01 00:15:32.000	2020-01-02 03:43:53.000	932	99833	50382.5	5038250	932	99833	50382.5	5038250	-32636	32299	4507.3	450730	-125	126	1.7	170
+933	2	10923	99834	2.8018	299.8018	151.3018	15130.18018	2.8018	299.8018	151.3018	15130.18011	2.8018	299.8018	151.30180000000001	15130.18	2020-01-01	2020-01-02	2020-01-01 00:15:33	2020-01-02 03:43:54	2020-01-01 00:15:33.000	2020-01-02 03:43:54.000	933	99834	50383.5	5038350	933	99834	50383.5	5038350	-32635	32300	4508.3	450830	-124	127	2.7	270
+934	2	10924	99835	2.8048	299.8048	151.3048	15130.48048	2.8048	299.8048	151.3048	15130.48071	2.8048	299.8048	151.3048	15130.48	2020-01-01	2020-01-02	2020-01-01 00:15:34	2020-01-02 03:43:55	2020-01-01 00:15:34.000	2020-01-02 03:43:55.000	934	99835	50384.5	5038450	934	99835	50384.5	5038450	-32634	32301	4509.3	450930	-128	127	1.14	114
+935	2	10925	99836	2.8078	299.8078	151.3078	15130.78078	2.8078	299.8078	151.3078	15130.78034	2.8078	299.8078	151.30780000000001	15130.78	2020-01-01	2020-01-02	2020-01-01 00:15:35	2020-01-02 03:43:56	2020-01-01 00:15:35.000	2020-01-02 03:43:56.000	935	99836	50385.5	5038550	935	99836	50385.5	5038550	-32633	32302	4510.3	451030	-128	123	-0.42	-42
+936	2	10926	99837	2.81081	299.81081	151.31081	15131.08108	2.81081	299.81082	151.31081	15131.0811	2.81081	299.81081	151.31081	15131.081	2020-01-01	2020-01-02	2020-01-01 00:15:36	2020-01-02 03:43:57	2020-01-01 00:15:36.000	2020-01-02 03:43:57.000	936	99837	50386.5	5038650	936	99837	50386.5	5038650	-32632	32303	4511.3	451130	-127	124	0.58	58
+937	2	10927	99838	2.81381	299.81381	151.31381	15131.38138	2.81381	299.8138	151.31381	15131.38124	2.81381	299.81381	151.31381	15131.381	2020-01-01	2020-01-02	2020-01-01 00:15:37	2020-01-02 03:43:58	2020-01-01 00:15:37.000	2020-01-02 03:43:58.000	937	99838	50387.5	5038750	937	99838	50387.5	5038750	-32631	32304	4512.3	451230	-126	125	1.58	158
+938	2	10928	99839	2.81681	299.81681	151.31681	15131.68168	2.81681	299.8168	151.31681	15131.68157	2.81681	299.81681	151.31681	15131.681	2020-01-01	2020-01-02	2020-01-01 00:15:38	2020-01-02 03:43:59	2020-01-01 00:15:38.000	2020-01-02 03:43:59.000	938	99839	50388.5	5038850	938	99839	50388.5	5038850	-32630	32305	4513.3	451330	-125	126	2.58	258
+939	2	10929	99840	2.81981	299.81981	151.31981	15131.98198	2.81982	299.81982	151.31982	15131.98217	2.81981	299.81981	151.31981	15131.981	2020-01-01	2020-01-02	2020-01-01 00:15:39	2020-01-02 03:44:00	2020-01-01 00:15:39.000	2020-01-02 03:44:00.000	939	99840	50389.5	5038950	939	99840	50389.5	5038950	-32629	32306	4514.3	451430	-124	127	3.58	358
 94	2	10084	99994	0.28228	300.28228	150.28228	15178.51051	0.28228	300.2823	150.28228	15178.51078	0.28228	300.28228	150.28228000000001	15178.51028	2020-01-01	2020-01-02	2020-01-01 00:01:34	2020-01-02 03:46:34	2020-01-01 00:01:34.000	2020-01-02 03:46:34.000	94	99994	50044	5054444	94	99994	50044	5054444	-32475	32460	4623.009900990099	466924	-126	125	-0.19801980198019803	-20
-940	2	10930	99841	2.82282	299.82282	151.32282	15132.28228	2.82282	299.8228	151.32282	15132.28247	2.82282	299.82282	151.32281999999998	15132.28200	2020-01-01	2020-01-02	2020-01-01 00:15:40	2020-01-02 03:44:01	2020-01-01 00:15:40.000	2020-01-02 03:44:01.000	940	99841	50390.5	5039050	940	99841	50390.5	5039050	-32628	32307	4515.3	451530	-128	127	2.02	202
-941	2	10931	99842	2.82582	299.82582	151.32582	15132.58258	2.82582	299.82584	151.32582	15132.58257	2.82582	299.82582	151.32582	15132.58200	2020-01-01	2020-01-02	2020-01-01 00:15:41	2020-01-02 03:44:02	2020-01-01 00:15:41.000	2020-01-02 03:44:02.000	941	99842	50391.5	5039150	941	99842	50391.5	5039150	-32627	32308	4516.3	451630	-128	127	0.46	46
-942	2	10932	99843	2.82882	299.82882	151.32882	15132.88288	2.82882	299.82883	151.32882	15132.88275	2.82882	299.82882	151.32882	15132.88200	2020-01-01	2020-01-02	2020-01-01 00:15:42	2020-01-02 03:44:03	2020-01-01 00:15:42.000	2020-01-02 03:44:03.000	942	99843	50392.5	5039250	942	99843	50392.5	5039250	-32626	32309	4517.3	451730	-128	124	-1.1	-110
-943	2	10933	99844	2.83183	299.83183	151.33183	15133.18318	2.83183	299.83182	151.33183	15133.18304	2.83183	299.83183	151.33183	15133.18300	2020-01-01	2020-01-02	2020-01-01 00:15:43	2020-01-02 03:44:04	2020-01-01 00:15:43.000	2020-01-02 03:44:04.000	943	99844	50393.5	5039350	943	99844	50393.5	5039350	-32625	32310	4518.3	451830	-127	125	-0.1	-10
-944	2	10934	99845	2.83483	299.83483	151.33483	15133.48348	2.83483	299.83484	151.33483	15133.48364	2.83483	299.83483	151.33483	15133.48300	2020-01-01	2020-01-02	2020-01-01 00:15:44	2020-01-02 03:44:05	2020-01-01 00:15:44.000	2020-01-02 03:44:05.000	944	99845	50394.5	5039450	944	99845	50394.5	5039450	-32624	32311	4519.3	451930	-126	126	0.9	90
-945	2	10935	99846	2.83783	299.83783	151.33783	15133.78378	2.83783	299.83783	151.33783	15133.78393	2.83783	299.83783	151.33783	15133.78300	2020-01-01	2020-01-02	2020-01-01 00:15:45	2020-01-02 03:44:06	2020-01-01 00:15:45.000	2020-01-02 03:44:06.000	945	99846	50395.5	5039550	945	99846	50395.5	5039550	-32623	32312	4520.3	452030	-125	127	1.9	190
-946	2	10936	99847	2.84084	299.84084	151.34084	15134.08408	2.84084	299.84085	151.34084	15134.08404	2.84084	299.84084	151.34084000000001	15134.08400	2020-01-01	2020-01-02	2020-01-01 00:15:46	2020-01-02 03:44:07	2020-01-01 00:15:46.000	2020-01-02 03:44:07.000	946	99847	50396.5	5039650	946	99847	50396.5	5039650	-32622	32313	4521.3	452130	-128	127	0.34	34
-947	2	10937	99848	2.84384	299.84384	151.34384	15134.38438	2.84384	299.84384	151.34384	15134.38421	2.84384	299.84384	151.34384	15134.38400	2020-01-01	2020-01-02	2020-01-01 00:15:47	2020-01-02 03:44:08	2020-01-01 00:15:47.000	2020-01-02 03:44:08.000	947	99848	50397.5	5039750	947	99848	50397.5	5039750	-32621	32314	4522.3	452230	-128	127	-1.22	-122
-948	2	10938	99849	2.84684	299.84684	151.34684	15134.68468	2.84684	299.84683	151.34684	15134.68452	2.84684	299.84684	151.34684	15134.68400	2020-01-01	2020-01-02	2020-01-01 00:15:48	2020-01-02 03:44:09	2020-01-01 00:15:48.000	2020-01-02 03:44:09.000	948	99849	50398.5	5039850	948	99849	50398.5	5039850	-32620	32315	4523.3	452330	-128	123	-2.78	-278
-949	2	10939	99850	2.84984	299.84984	151.34984	15134.98498	2.84985	299.84985	151.34985	15134.98527	2.84984	299.84984	151.34984	15134.98400	2020-01-01	2020-01-02	2020-01-01 00:15:49	2020-01-02 03:44:10	2020-01-01 00:15:49.000	2020-01-02 03:44:10.000	949	99850	50399.5	5039950	949	99850	50399.5	5039950	-32619	32316	4524.3	452430	-127	124	-1.78	-178
+940	2	10930	99841	2.82282	299.82282	151.32282	15132.28228	2.82282	299.8228	151.32282	15132.28247	2.82282	299.82282	151.32281999999998	15132.282	2020-01-01	2020-01-02	2020-01-01 00:15:40	2020-01-02 03:44:01	2020-01-01 00:15:40.000	2020-01-02 03:44:01.000	940	99841	50390.5	5039050	940	99841	50390.5	5039050	-32628	32307	4515.3	451530	-128	127	2.02	202
+941	2	10931	99842	2.82582	299.82582	151.32582	15132.58258	2.82582	299.82584	151.32582	15132.58257	2.82582	299.82582	151.32582	15132.582	2020-01-01	2020-01-02	2020-01-01 00:15:41	2020-01-02 03:44:02	2020-01-01 00:15:41.000	2020-01-02 03:44:02.000	941	99842	50391.5	5039150	941	99842	50391.5	5039150	-32627	32308	4516.3	451630	-128	127	0.46	46
+942	2	10932	99843	2.82882	299.82882	151.32882	15132.88288	2.82882	299.82883	151.32882	15132.88275	2.82882	299.82882	151.32882	15132.882	2020-01-01	2020-01-02	2020-01-01 00:15:42	2020-01-02 03:44:03	2020-01-01 00:15:42.000	2020-01-02 03:44:03.000	942	99843	50392.5	5039250	942	99843	50392.5	5039250	-32626	32309	4517.3	451730	-128	124	-1.1	-110
+943	2	10933	99844	2.83183	299.83183	151.33183	15133.18318	2.83183	299.83182	151.33183	15133.18304	2.83183	299.83183	151.33183	15133.183	2020-01-01	2020-01-02	2020-01-01 00:15:43	2020-01-02 03:44:04	2020-01-01 00:15:43.000	2020-01-02 03:44:04.000	943	99844	50393.5	5039350	943	99844	50393.5	5039350	-32625	32310	4518.3	451830	-127	125	-0.1	-10
+944	2	10934	99845	2.83483	299.83483	151.33483	15133.48348	2.83483	299.83484	151.33483	15133.48364	2.83483	299.83483	151.33483	15133.483	2020-01-01	2020-01-02	2020-01-01 00:15:44	2020-01-02 03:44:05	2020-01-01 00:15:44.000	2020-01-02 03:44:05.000	944	99845	50394.5	5039450	944	99845	50394.5	5039450	-32624	32311	4519.3	451930	-126	126	0.9	90
+945	2	10935	99846	2.83783	299.83783	151.33783	15133.78378	2.83783	299.83783	151.33783	15133.78393	2.83783	299.83783	151.33783	15133.783	2020-01-01	2020-01-02	2020-01-01 00:15:45	2020-01-02 03:44:06	2020-01-01 00:15:45.000	2020-01-02 03:44:06.000	945	99846	50395.5	5039550	945	99846	50395.5	5039550	-32623	32312	4520.3	452030	-125	127	1.9	190
+946	2	10936	99847	2.84084	299.84084	151.34084	15134.08408	2.84084	299.84085	151.34084	15134.08404	2.84084	299.84084	151.34084000000001	15134.084	2020-01-01	2020-01-02	2020-01-01 00:15:46	2020-01-02 03:44:07	2020-01-01 00:15:46.000	2020-01-02 03:44:07.000	946	99847	50396.5	5039650	946	99847	50396.5	5039650	-32622	32313	4521.3	452130	-128	127	0.34	34
+947	2	10937	99848	2.84384	299.84384	151.34384	15134.38438	2.84384	299.84384	151.34384	15134.38421	2.84384	299.84384	151.34384	15134.384	2020-01-01	2020-01-02	2020-01-01 00:15:47	2020-01-02 03:44:08	2020-01-01 00:15:47.000	2020-01-02 03:44:08.000	947	99848	50397.5	5039750	947	99848	50397.5	5039750	-32621	32314	4522.3	452230	-128	127	-1.22	-122
+948	2	10938	99849	2.84684	299.84684	151.34684	15134.68468	2.84684	299.84683	151.34684	15134.68452	2.84684	299.84684	151.34684	15134.684	2020-01-01	2020-01-02	2020-01-01 00:15:48	2020-01-02 03:44:09	2020-01-01 00:15:48.000	2020-01-02 03:44:09.000	948	99849	50398.5	5039850	948	99849	50398.5	5039850	-32620	32315	4523.3	452330	-128	123	-2.78	-278
+949	2	10939	99850	2.84984	299.84984	151.34984	15134.98498	2.84985	299.84985	151.34985	15134.98527	2.84984	299.84984	151.34984	15134.984	2020-01-01	2020-01-02	2020-01-01 00:15:49	2020-01-02 03:44:10	2020-01-01 00:15:49.000	2020-01-02 03:44:10.000	949	99850	50399.5	5039950	949	99850	50399.5	5039950	-32619	32316	4524.3	452430	-127	124	-1.78	-178
 95	2	10085	99995	0.28528	300.28528	150.28528	15178.81381	0.28528	300.28528	150.28528	15178.81343	0.28528	300.28528	150.28528	15178.81328	2020-01-01	2020-01-02	2020-01-01 00:01:35	2020-01-02 03:46:35	2020-01-01 00:01:35.000	2020-01-02 03:46:35.000	95	99995	50045	5054545	95	99995	50045	5054545	-32474	32461	4624.009900990099	467025	-125	126	0.801980198019802	81
-950	2	10940	99851	2.85285	299.85285	151.35285	15135.28528	2.85285	299.85284	151.35285	15135.28541	2.85285	299.85285	151.35285	15135.28500	2020-01-01	2020-01-02	2020-01-01 00:15:50	2020-01-02 03:44:11	2020-01-01 00:15:50.000	2020-01-02 03:44:11.000	950	99851	50400.5	5040050	950	99851	50400.5	5040050	-32618	32317	4525.3	452530	-126	125	-0.78	-78
-951	2	10941	99852	2.85585	299.85585	151.35585	15135.58558	2.85585	299.85587	151.35585	15135.58551	2.85585	299.85585	151.35585	15135.58500	2020-01-01	2020-01-02	2020-01-01 00:15:51	2020-01-02 03:44:12	2020-01-01 00:15:51.000	2020-01-02 03:44:12.000	951	99852	50401.5	5040150	951	99852	50401.5	5040150	-32617	32318	4526.3	452630	-125	126	0.22	22
-952	2	10942	99853	2.85885	299.85885	151.35885	15135.88588	2.85885	299.85886	151.35885	15135.88568	2.85885	299.85885	151.35885	15135.88500	2020-01-01	2020-01-02	2020-01-01 00:15:52	2020-01-02 03:44:13	2020-01-01 00:15:52.000	2020-01-02 03:44:13.000	952	99853	50402.5	5040250	952	99853	50402.5	5040250	-32616	32319	4527.3	452730	-124	127	1.22	122
-953	2	10943	99854	2.86186	299.86186	151.36186	15136.18618	2.86186	299.86185	151.36185	15136.18598	2.86186	299.86186	151.36186	15136.18600	2020-01-01	2020-01-02	2020-01-01 00:15:53	2020-01-02 03:44:14	2020-01-01 00:15:53.000	2020-01-02 03:44:14.000	953	99854	50403.5	5040350	953	99854	50403.5	5040350	-32615	32320	4528.3	452830	-128	127	-0.34	-34
-954	2	10944	99855	2.86486	299.86486	151.36486	15136.48648	2.86486	299.86487	151.36486	15136.48674	2.86486	299.86486	151.36486000000002	15136.48600	2020-01-01	2020-01-02	2020-01-01 00:15:54	2020-01-02 03:44:15	2020-01-01 00:15:54.000	2020-01-02 03:44:15.000	954	99855	50404.5	5040450	954	99855	50404.5	5040450	-32614	32321	4529.3	452930	-128	123	-1.9	-190
-955	2	10945	99856	2.86786	299.86786	151.36786	15136.78678	2.86786	299.86786	151.36786	15136.78688	2.86786	299.86786	151.36786	15136.78600	2020-01-01	2020-01-02	2020-01-01 00:15:55	2020-01-02 03:44:16	2020-01-01 00:15:55.000	2020-01-02 03:44:16.000	955	99856	50405.5	5040550	955	99856	50405.5	5040550	-32613	32322	4530.3	453030	-127	124	-0.9	-90
-956	2	10946	99857	2.87087	299.87087	151.37087	15137.08708	2.87087	299.87088	151.37087	15137.08701	2.87087	299.87087	151.37087	15137.08700	2020-01-01	2020-01-02	2020-01-01 00:15:56	2020-01-02 03:44:17	2020-01-01 00:15:56.000	2020-01-02 03:44:17.000	956	99857	50406.5	5040650	956	99857	50406.5	5040650	-32612	32323	4531.3	453130	-126	125	0.1	10
-957	2	10947	99858	2.87387	299.87387	151.37387	15137.38738	2.87387	299.87387	151.37387	15137.38716	2.87387	299.87387	151.37387	15137.38700	2020-01-01	2020-01-02	2020-01-01 00:15:57	2020-01-02 03:44:18	2020-01-01 00:15:57.000	2020-01-02 03:44:18.000	957	99858	50407.5	5040750	957	99858	50407.5	5040750	-32611	32324	4532.3	453230	-125	126	1.1	110
-958	2	10948	99859	2.87687	299.87687	151.37687	15137.68768	2.87687	299.8769	151.37687	15137.68791	2.87687	299.87687	151.37687	15137.68700	2020-01-01	2020-01-02	2020-01-01 00:15:58	2020-01-02 03:44:19	2020-01-01 00:15:58.000	2020-01-02 03:44:19.000	958	99859	50408.5	5040850	958	99859	50408.5	5040850	-32610	32325	4533.3	453330	-124	127	2.1	210
-959	2	10949	99860	2.87987	299.87987	151.37987	15137.98798	2.87988	299.87988	151.37988	15137.9882	2.87987	299.87987	151.37986999999998	15137.98700	2020-01-01	2020-01-02	2020-01-01 00:15:59	2020-01-02 03:44:20	2020-01-01 00:15:59.000	2020-01-02 03:44:20.000	959	99860	50409.5	5040950	959	99860	50409.5	5040950	-32609	32326	4534.3	453430	-128	127	0.54	54
+950	2	10940	99851	2.85285	299.85285	151.35285	15135.28528	2.85285	299.85284	151.35285	15135.28541	2.85285	299.85285	151.35285	15135.285	2020-01-01	2020-01-02	2020-01-01 00:15:50	2020-01-02 03:44:11	2020-01-01 00:15:50.000	2020-01-02 03:44:11.000	950	99851	50400.5	5040050	950	99851	50400.5	5040050	-32618	32317	4525.3	452530	-126	125	-0.78	-78
+951	2	10941	99852	2.85585	299.85585	151.35585	15135.58558	2.85585	299.85587	151.35585	15135.58551	2.85585	299.85585	151.35585	15135.585	2020-01-01	2020-01-02	2020-01-01 00:15:51	2020-01-02 03:44:12	2020-01-01 00:15:51.000	2020-01-02 03:44:12.000	951	99852	50401.5	5040150	951	99852	50401.5	5040150	-32617	32318	4526.3	452630	-125	126	0.22	22
+952	2	10942	99853	2.85885	299.85885	151.35885	15135.88588	2.85885	299.85886	151.35885	15135.88568	2.85885	299.85885	151.35885	15135.885	2020-01-01	2020-01-02	2020-01-01 00:15:52	2020-01-02 03:44:13	2020-01-01 00:15:52.000	2020-01-02 03:44:13.000	952	99853	50402.5	5040250	952	99853	50402.5	5040250	-32616	32319	4527.3	452730	-124	127	1.22	122
+953	2	10943	99854	2.86186	299.86186	151.36186	15136.18618	2.86186	299.86185	151.36185	15136.18598	2.86186	299.86186	151.36186	15136.186	2020-01-01	2020-01-02	2020-01-01 00:15:53	2020-01-02 03:44:14	2020-01-01 00:15:53.000	2020-01-02 03:44:14.000	953	99854	50403.5	5040350	953	99854	50403.5	5040350	-32615	32320	4528.3	452830	-128	127	-0.34	-34
+954	2	10944	99855	2.86486	299.86486	151.36486	15136.48648	2.86486	299.86487	151.36486	15136.48674	2.86486	299.86486	151.36486000000002	15136.486	2020-01-01	2020-01-02	2020-01-01 00:15:54	2020-01-02 03:44:15	2020-01-01 00:15:54.000	2020-01-02 03:44:15.000	954	99855	50404.5	5040450	954	99855	50404.5	5040450	-32614	32321	4529.3	452930	-128	123	-1.9	-190
+955	2	10945	99856	2.86786	299.86786	151.36786	15136.78678	2.86786	299.86786	151.36786	15136.78688	2.86786	299.86786	151.36786	15136.786	2020-01-01	2020-01-02	2020-01-01 00:15:55	2020-01-02 03:44:16	2020-01-01 00:15:55.000	2020-01-02 03:44:16.000	955	99856	50405.5	5040550	955	99856	50405.5	5040550	-32613	32322	4530.3	453030	-127	124	-0.9	-90
+956	2	10946	99857	2.87087	299.87087	151.37087	15137.08708	2.87087	299.87088	151.37087	15137.08701	2.87087	299.87087	151.37087	15137.087	2020-01-01	2020-01-02	2020-01-01 00:15:56	2020-01-02 03:44:17	2020-01-01 00:15:56.000	2020-01-02 03:44:17.000	956	99857	50406.5	5040650	956	99857	50406.5	5040650	-32612	32323	4531.3	453130	-126	125	0.1	10
+957	2	10947	99858	2.87387	299.87387	151.37387	15137.38738	2.87387	299.87387	151.37387	15137.38716	2.87387	299.87387	151.37387	15137.387	2020-01-01	2020-01-02	2020-01-01 00:15:57	2020-01-02 03:44:18	2020-01-01 00:15:57.000	2020-01-02 03:44:18.000	957	99858	50407.5	5040750	957	99858	50407.5	5040750	-32611	32324	4532.3	453230	-125	126	1.1	110
+958	2	10948	99859	2.87687	299.87687	151.37687	15137.68768	2.87687	299.8769	151.37687	15137.68791	2.87687	299.87687	151.37687	15137.687	2020-01-01	2020-01-02	2020-01-01 00:15:58	2020-01-02 03:44:19	2020-01-01 00:15:58.000	2020-01-02 03:44:19.000	958	99859	50408.5	5040850	958	99859	50408.5	5040850	-32610	32325	4533.3	453330	-124	127	2.1	210
+959	2	10949	99860	2.87987	299.87987	151.37987	15137.98798	2.87988	299.87988	151.37988	15137.9882	2.87987	299.87987	151.37986999999998	15137.987	2020-01-01	2020-01-02	2020-01-01 00:15:59	2020-01-02 03:44:20	2020-01-01 00:15:59.000	2020-01-02 03:44:20.000	959	99860	50409.5	5040950	959	99860	50409.5	5040950	-32609	32326	4534.3	453430	-128	127	0.54	54
 96	2	10086	99996	0.28828	300.28828	150.28828	15179.11711	0.28828	300.2883	150.28828	15179.11718	0.28828	300.28828	150.28828000000001	15179.11628	2020-01-01	2020-01-02	2020-01-01 00:01:36	2020-01-02 03:46:36	2020-01-01 00:01:36.000	2020-01-02 03:46:36.000	96	99996	50046	5054646	96	99996	50046	5054646	-32473	32462	4625.009900990099	467126	-124	127	1.801980198019802	182
-960	2	10950	99861	2.88288	299.88288	151.38288	15138.28828	2.88288	299.88287	151.38288	15138.28834	2.88288	299.88288	151.38288	15138.28800	2020-01-01	2020-01-02	2020-01-01 00:16:00	2020-01-02 03:44:21	2020-01-01 00:16:00.000	2020-01-02 03:44:21.000	960	99861	50410.5	5041050	960	99861	50410.5	5041050	-32608	32327	4535.3	453530	-128	123	-1.02	-102
-961	2	10951	99862	2.88588	299.88588	151.38588	15138.58858	2.88588	299.8859	151.38588	15138.58848	2.88588	299.88588	151.38588	15138.58800	2020-01-01	2020-01-02	2020-01-01 00:16:01	2020-01-02 03:44:22	2020-01-01 00:16:01.000	2020-01-02 03:44:22.000	961	99862	50411.5	5041150	961	99862	50411.5	5041150	-32607	32328	4536.3	453630	-127	124	-0.02	-2
-962	2	10952	99863	2.88888	299.88888	151.38888	15138.88888	2.88888	299.8889	151.38888	15138.88862	2.88888	299.88888	151.38888	15138.88800	2020-01-01	2020-01-02	2020-01-01 00:16:02	2020-01-02 03:44:23	2020-01-01 00:16:02.000	2020-01-02 03:44:23.000	962	99863	50412.5	5041250	962	99863	50412.5	5041250	-32606	32329	4537.3	453730	-126	125	0.98	98
-963	2	10953	99864	2.89189	299.89189	151.39189	15139.18918	2.89189	299.8919	151.39189	15139.18937	2.89189	299.89189	151.39189	15139.18900	2020-01-01	2020-01-02	2020-01-01 00:16:03	2020-01-02 03:44:24	2020-01-01 00:16:03.000	2020-01-02 03:44:24.000	963	99864	50413.5	5041350	963	99864	50413.5	5041350	-32605	32330	4538.3	453830	-125	126	1.98	198
-964	2	10954	99865	2.89489	299.89489	151.39489	15139.48948	2.89489	299.8949	151.39489	15139.48968	2.89489	299.89489	151.39489	15139.48900	2020-01-01	2020-01-02	2020-01-01 00:16:04	2020-01-02 03:44:25	2020-01-01 00:16:04.000	2020-01-02 03:44:25.000	964	99865	50414.5	5041450	964	99865	50414.5	5041450	-32604	32331	4539.3	453930	-124	127	2.98	298
-965	2	10955	99866	2.89789	299.89789	151.39789	15139.78978	2.89789	299.8979	151.39789	15139.78985	2.89789	299.89789	151.39789000000002	15139.78900	2020-01-01	2020-01-02	2020-01-01 00:16:05	2020-01-02 03:44:26	2020-01-01 00:16:05.000	2020-01-02 03:44:26.000	965	99866	50415.5	5041550	965	99866	50415.5	5041550	-32603	32332	4540.3	454030	-128	127	1.42	142
-966	2	10956	99867	2.9009	299.9009	151.4009	15140.09009	2.9009	299.9009	151.40089	15140.08996	2.90090	299.90090	151.4009	15140.09000	2020-01-01	2020-01-02	2020-01-01 00:16:06	2020-01-02 03:44:27	2020-01-01 00:16:06.000	2020-01-02 03:44:27.000	966	99867	50416.5	5041650	966	99867	50416.5	5041650	-32602	32333	4541.3	454130	-128	127	-0.14	-14
-967	2	10957	99868	2.9039	299.9039	151.4039	15140.39039	2.9039	299.9039	151.4039	15140.39009	2.90390	299.90390	151.4039	15140.39000	2020-01-01	2020-01-02	2020-01-01 00:16:07	2020-01-02 03:44:28	2020-01-01 00:16:07.000	2020-01-02 03:44:28.000	967	99868	50417.5	5041750	967	99868	50417.5	5041750	-32601	32334	4542.3	454230	-128	124	-1.7	-170
-968	2	10958	99869	2.9069	299.9069	151.4069	15140.69069	2.9069	299.90692	151.4069	15140.69084	2.90690	299.90690	151.4069	15140.69000	2020-01-01	2020-01-02	2020-01-01 00:16:08	2020-01-02 03:44:29	2020-01-01 00:16:08.000	2020-01-02 03:44:29.000	968	99869	50418.5	5041850	968	99869	50418.5	5041850	-32600	32335	4543.3	454330	-127	125	-0.7	-70
-969	2	10959	99870	2.9099	299.9099	151.4099	15140.99099	2.90991	299.9099	151.40991	15140.99114	2.90990	299.90990	151.4099	15140.99000	2020-01-01	2020-01-02	2020-01-01 00:16:09	2020-01-02 03:44:30	2020-01-01 00:16:09.000	2020-01-02 03:44:30.000	969	99870	50419.5	5041950	969	99870	50419.5	5041950	-32599	32336	4544.3	454430	-126	126	0.3	30
+960	2	10950	99861	2.88288	299.88288	151.38288	15138.28828	2.88288	299.88287	151.38288	15138.28834	2.88288	299.88288	151.38288	15138.288	2020-01-01	2020-01-02	2020-01-01 00:16:00	2020-01-02 03:44:21	2020-01-01 00:16:00.000	2020-01-02 03:44:21.000	960	99861	50410.5	5041050	960	99861	50410.5	5041050	-32608	32327	4535.3	453530	-128	123	-1.02	-102
+961	2	10951	99862	2.88588	299.88588	151.38588	15138.58858	2.88588	299.8859	151.38588	15138.58848	2.88588	299.88588	151.38588	15138.588	2020-01-01	2020-01-02	2020-01-01 00:16:01	2020-01-02 03:44:22	2020-01-01 00:16:01.000	2020-01-02 03:44:22.000	961	99862	50411.5	5041150	961	99862	50411.5	5041150	-32607	32328	4536.3	453630	-127	124	-0.02	-2
+962	2	10952	99863	2.88888	299.88888	151.38888	15138.88888	2.88888	299.8889	151.38888	15138.88862	2.88888	299.88888	151.38888	15138.888	2020-01-01	2020-01-02	2020-01-01 00:16:02	2020-01-02 03:44:23	2020-01-01 00:16:02.000	2020-01-02 03:44:23.000	962	99863	50412.5	5041250	962	99863	50412.5	5041250	-32606	32329	4537.3	453730	-126	125	0.98	98
+963	2	10953	99864	2.89189	299.89189	151.39189	15139.18918	2.89189	299.8919	151.39189	15139.18937	2.89189	299.89189	151.39189	15139.189	2020-01-01	2020-01-02	2020-01-01 00:16:03	2020-01-02 03:44:24	2020-01-01 00:16:03.000	2020-01-02 03:44:24.000	963	99864	50413.5	5041350	963	99864	50413.5	5041350	-32605	32330	4538.3	453830	-125	126	1.98	198
+964	2	10954	99865	2.89489	299.89489	151.39489	15139.48948	2.89489	299.8949	151.39489	15139.48968	2.89489	299.89489	151.39489	15139.489	2020-01-01	2020-01-02	2020-01-01 00:16:04	2020-01-02 03:44:25	2020-01-01 00:16:04.000	2020-01-02 03:44:25.000	964	99865	50414.5	5041450	964	99865	50414.5	5041450	-32604	32331	4539.3	453930	-124	127	2.98	298
+965	2	10955	99866	2.89789	299.89789	151.39789	15139.78978	2.89789	299.8979	151.39789	15139.78985	2.89789	299.89789	151.39789000000002	15139.789	2020-01-01	2020-01-02	2020-01-01 00:16:05	2020-01-02 03:44:26	2020-01-01 00:16:05.000	2020-01-02 03:44:26.000	965	99866	50415.5	5041550	965	99866	50415.5	5041550	-32603	32332	4540.3	454030	-128	127	1.42	142
+966	2	10956	99867	2.9009	299.9009	151.4009	15140.09009	2.9009	299.9009	151.40089	15140.08996	2.9009	299.9009	151.4009	15140.09	2020-01-01	2020-01-02	2020-01-01 00:16:06	2020-01-02 03:44:27	2020-01-01 00:16:06.000	2020-01-02 03:44:27.000	966	99867	50416.5	5041650	966	99867	50416.5	5041650	-32602	32333	4541.3	454130	-128	127	-0.14	-14
+967	2	10957	99868	2.9039	299.9039	151.4039	15140.39039	2.9039	299.9039	151.4039	15140.39009	2.9039	299.9039	151.4039	15140.39	2020-01-01	2020-01-02	2020-01-01 00:16:07	2020-01-02 03:44:28	2020-01-01 00:16:07.000	2020-01-02 03:44:28.000	967	99868	50417.5	5041750	967	99868	50417.5	5041750	-32601	32334	4542.3	454230	-128	124	-1.7	-170
+968	2	10958	99869	2.9069	299.9069	151.4069	15140.69069	2.9069	299.90692	151.4069	15140.69084	2.9069	299.9069	151.4069	15140.69	2020-01-01	2020-01-02	2020-01-01 00:16:08	2020-01-02 03:44:29	2020-01-01 00:16:08.000	2020-01-02 03:44:29.000	968	99869	50418.5	5041850	968	99869	50418.5	5041850	-32600	32335	4543.3	454330	-127	125	-0.7	-70
+969	2	10959	99870	2.9099	299.9099	151.4099	15140.99099	2.90991	299.9099	151.40991	15140.99114	2.9099	299.9099	151.4099	15140.99	2020-01-01	2020-01-02	2020-01-01 00:16:09	2020-01-02 03:44:30	2020-01-01 00:16:09.000	2020-01-02 03:44:30.000	969	99870	50419.5	5041950	969	99870	50419.5	5041950	-32599	32336	4544.3	454430	-126	126	0.3	30
 97	2	10087	99997	0.29129	300.29129	150.29129	15179.42042	0.29129	300.2913	150.29129	15179.42033	0.29129	300.29129	150.29129	15179.42029	2020-01-01	2020-01-02	2020-01-01 00:01:37	2020-01-02 03:46:37	2020-01-01 00:01:37.000	2020-01-02 03:46:37.000	97	99997	50047	5054747	97	99997	50047	5054747	-32472	32463	4626.009900990099	467227	-128	127	0.26732673267326734	27
-970	2	10960	99871	2.91291	299.91291	151.41291	15141.29129	2.91291	299.9129	151.41291	15141.29132	2.91291	299.91291	151.41290999999998	15141.29100	2020-01-01	2020-01-02	2020-01-01 00:16:10	2020-01-02 03:44:31	2020-01-01 00:16:10.000	2020-01-02 03:44:31.000	970	99871	50420.5	5042050	970	99871	50420.5	5042050	-32598	32337	4545.3	454530	-125	127	1.3	130
-971	2	10961	99872	2.91591	299.91591	151.41591	15141.59159	2.91591	299.91592	151.41591	15141.59142	2.91591	299.91591	151.41591	15141.59100	2020-01-01	2020-01-02	2020-01-01 00:16:11	2020-01-02 03:44:32	2020-01-01 00:16:11.000	2020-01-02 03:44:32.000	971	99872	50421.5	5042150	971	99872	50421.5	5042150	-32597	32338	4546.3	454630	-128	127	-0.26	-26
-972	2	10962	99873	2.91891	299.91891	151.41891	15141.89189	2.91891	299.9189	151.41891	15141.89172	2.91891	299.91891	151.41890999999998	15141.89100	2020-01-01	2020-01-02	2020-01-01 00:16:12	2020-01-02 03:44:33	2020-01-01 00:16:12.000	2020-01-02 03:44:33.000	972	99873	50422.5	5042250	972	99873	50422.5	5042250	-32596	32339	4547.3	454730	-128	127	-1.82	-182
-973	2	10963	99874	2.92192	299.92192	151.42192	15142.19219	2.92192	299.92194	151.42192	15142.19232	2.92192	299.92192	151.42192	15142.19200	2020-01-01	2020-01-02	2020-01-01 00:16:13	2020-01-02 03:44:34	2020-01-01 00:16:13.000	2020-01-02 03:44:34.000	973	99874	50423.5	5042350	973	99874	50423.5	5042350	-32595	32340	4548.3	454830	-128	123	-3.38	-338
-974	2	10964	99875	2.92492	299.92492	151.42492	15142.49249	2.92492	299.92493	151.42492	15142.49265	2.92492	299.92492	151.42492000000001	15142.49200	2020-01-01	2020-01-02	2020-01-01 00:16:14	2020-01-02 03:44:35	2020-01-01 00:16:14.000	2020-01-02 03:44:35.000	974	99875	50424.5	5042450	974	99875	50424.5	5042450	-32594	32341	4549.3	454930	-127	124	-2.38	-238
-975	2	10965	99876	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.79200	2020-01-01	2020-01-02	2020-01-01 00:16:15	2020-01-02 03:44:36	2020-01-01 00:16:15.000	2020-01-02 03:44:36.000	975	99876	50425.5	5042550	975	99876	50425.5	5042550	-32593	32342	4550.3	455030	-126	125	-1.38	-138
-976	2	10966	99877	2.93093	299.93093	151.43093	15143.09309	2.93093	299.93094	151.43092	15143.09289	2.93093	299.93093	151.43093000000002	15143.09300	2020-01-01	2020-01-02	2020-01-01 00:16:16	2020-01-02 03:44:37	2020-01-01 00:16:16.000	2020-01-02 03:44:37.000	976	99877	50426.5	5042650	976	99877	50426.5	5042650	-32592	32343	4551.3	455130	-125	126	-0.38	-38
-977	2	10967	99878	2.93393	299.93393	151.43393	15143.39339	2.93393	299.93393	151.43393	15143.39318	2.93393	299.93393	151.43393	15143.39300	2020-01-01	2020-01-02	2020-01-01 00:16:17	2020-01-02 03:44:38	2020-01-01 00:16:17.000	2020-01-02 03:44:38.000	977	99878	50427.5	5042750	977	99878	50427.5	5042750	-32591	32344	4552.3	455230	-124	127	0.62	62
-978	2	10968	99879	2.93693	299.93693	151.43693	15143.69369	2.93693	299.93695	151.43693	15143.69378	2.93693	299.93693	151.43693	15143.69300	2020-01-01	2020-01-02	2020-01-01 00:16:18	2020-01-02 03:44:39	2020-01-01 00:16:18.000	2020-01-02 03:44:39.000	978	99879	50428.5	5042850	978	99879	50428.5	5042850	-32590	32345	4553.3	455330	-128	127	-0.94	-94
-979	2	10969	99880	2.93993	299.93993	151.43993	15143.99399	2.93994	299.93994	151.43994	15143.99412	2.93993	299.93993	151.43993	15143.99300	2020-01-01	2020-01-02	2020-01-01 00:16:19	2020-01-02 03:44:40	2020-01-01 00:16:19.000	2020-01-02 03:44:40.000	979	99880	50429.5	5042950	979	99880	50429.5	5042950	-32589	32346	4554.3	455430	-128	123	-2.5	-250
+970	2	10960	99871	2.91291	299.91291	151.41291	15141.29129	2.91291	299.9129	151.41291	15141.29132	2.91291	299.91291	151.41290999999998	15141.291	2020-01-01	2020-01-02	2020-01-01 00:16:10	2020-01-02 03:44:31	2020-01-01 00:16:10.000	2020-01-02 03:44:31.000	970	99871	50420.5	5042050	970	99871	50420.5	5042050	-32598	32337	4545.3	454530	-125	127	1.3	130
+971	2	10961	99872	2.91591	299.91591	151.41591	15141.59159	2.91591	299.91592	151.41591	15141.59142	2.91591	299.91591	151.41591	15141.591	2020-01-01	2020-01-02	2020-01-01 00:16:11	2020-01-02 03:44:32	2020-01-01 00:16:11.000	2020-01-02 03:44:32.000	971	99872	50421.5	5042150	971	99872	50421.5	5042150	-32597	32338	4546.3	454630	-128	127	-0.26	-26
+972	2	10962	99873	2.91891	299.91891	151.41891	15141.89189	2.91891	299.9189	151.41891	15141.89172	2.91891	299.91891	151.41890999999998	15141.891	2020-01-01	2020-01-02	2020-01-01 00:16:12	2020-01-02 03:44:33	2020-01-01 00:16:12.000	2020-01-02 03:44:33.000	972	99873	50422.5	5042250	972	99873	50422.5	5042250	-32596	32339	4547.3	454730	-128	127	-1.82	-182
+973	2	10963	99874	2.92192	299.92192	151.42192	15142.19219	2.92192	299.92194	151.42192	15142.19232	2.92192	299.92192	151.42192	15142.192	2020-01-01	2020-01-02	2020-01-01 00:16:13	2020-01-02 03:44:34	2020-01-01 00:16:13.000	2020-01-02 03:44:34.000	973	99874	50423.5	5042350	973	99874	50423.5	5042350	-32595	32340	4548.3	454830	-128	123	-3.38	-338
+974	2	10964	99875	2.92492	299.92492	151.42492	15142.49249	2.92492	299.92493	151.42492	15142.49265	2.92492	299.92492	151.42492000000001	15142.492	2020-01-01	2020-01-02	2020-01-01 00:16:14	2020-01-02 03:44:35	2020-01-01 00:16:14.000	2020-01-02 03:44:35.000	974	99875	50424.5	5042450	974	99875	50424.5	5042450	-32594	32341	4549.3	454930	-127	124	-2.38	-238
+975	2	10965	99876	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.79279	2.92792	299.92792	151.42792	15142.792	2020-01-01	2020-01-02	2020-01-01 00:16:15	2020-01-02 03:44:36	2020-01-01 00:16:15.000	2020-01-02 03:44:36.000	975	99876	50425.5	5042550	975	99876	50425.5	5042550	-32593	32342	4550.3	455030	-126	125	-1.38	-138
+976	2	10966	99877	2.93093	299.93093	151.43093	15143.09309	2.93093	299.93094	151.43092	15143.09289	2.93093	299.93093	151.43093000000002	15143.093	2020-01-01	2020-01-02	2020-01-01 00:16:16	2020-01-02 03:44:37	2020-01-01 00:16:16.000	2020-01-02 03:44:37.000	976	99877	50426.5	5042650	976	99877	50426.5	5042650	-32592	32343	4551.3	455130	-125	126	-0.38	-38
+977	2	10967	99878	2.93393	299.93393	151.43393	15143.39339	2.93393	299.93393	151.43393	15143.39318	2.93393	299.93393	151.43393	15143.393	2020-01-01	2020-01-02	2020-01-01 00:16:17	2020-01-02 03:44:38	2020-01-01 00:16:17.000	2020-01-02 03:44:38.000	977	99878	50427.5	5042750	977	99878	50427.5	5042750	-32591	32344	4552.3	455230	-124	127	0.62	62
+978	2	10968	99879	2.93693	299.93693	151.43693	15143.69369	2.93693	299.93695	151.43693	15143.69378	2.93693	299.93693	151.43693	15143.693	2020-01-01	2020-01-02	2020-01-01 00:16:18	2020-01-02 03:44:39	2020-01-01 00:16:18.000	2020-01-02 03:44:39.000	978	99879	50428.5	5042850	978	99879	50428.5	5042850	-32590	32345	4553.3	455330	-128	127	-0.94	-94
+979	2	10969	99880	2.93993	299.93993	151.43993	15143.99399	2.93994	299.93994	151.43994	15143.99412	2.93993	299.93993	151.43993	15143.993	2020-01-01	2020-01-02	2020-01-01 00:16:19	2020-01-02 03:44:40	2020-01-01 00:16:19.000	2020-01-02 03:44:40.000	979	99880	50429.5	5042950	979	99880	50429.5	5042950	-32589	32346	4554.3	455430	-128	123	-2.5	-250
 98	2	10088	99998	0.29429	300.29429	150.29429	15179.72372	0.29429	300.29428	150.29429	15179.72363	0.29429	300.29429	150.29429	15179.72329	2020-01-01	2020-01-02	2020-01-01 00:01:38	2020-01-02 03:46:38	2020-01-01 00:01:38.000	2020-01-02 03:46:38.000	98	99998	50048	5054848	98	99998	50048	5054848	-32471	32464	4627.009900990099	467328	-128	127	-1.2673267326732673	-128
-980	2	10970	99881	2.94294	299.94294	151.44294	15144.29429	2.94294	299.94293	151.44294	15144.29426	2.94294	299.94294	151.44294	15144.29400	2020-01-01	2020-01-02	2020-01-01 00:16:20	2020-01-02 03:44:41	2020-01-01 00:16:20.000	2020-01-02 03:44:41.000	980	99881	50430.5	5043050	980	99881	50430.5	5043050	-32588	32347	4555.3	455530	-127	124	-1.5	-150
-981	2	10971	99882	2.94594	299.94594	151.44594	15144.59459	2.94594	299.94595	151.44595	15144.59501	2.94594	299.94594	151.44593999999998	15144.59400	2020-01-01	2020-01-02	2020-01-01 00:16:21	2020-01-02 03:44:42	2020-01-01 00:16:21.000	2020-01-02 03:44:42.000	981	99882	50431.5	5043150	981	99882	50431.5	5043150	-32587	32348	4556.3	455630	-126	125	-0.5	-50
-982	2	10972	99883	2.94894	299.94894	151.44894	15144.89489	2.94894	299.94894	151.44894	15144.89466	2.94894	299.94894	151.44894	15144.89400	2020-01-01	2020-01-02	2020-01-01 00:16:22	2020-01-02 03:44:43	2020-01-01 00:16:22.000	2020-01-02 03:44:43.000	982	99883	50432.5	5043250	982	99883	50432.5	5043250	-32586	32349	4557.3	455730	-125	126	0.5	50
-983	2	10973	99884	2.95195	299.95195	151.45195	15145.19519	2.95195	299.95197	151.45195	15145.19525	2.95195	299.95195	151.45195	15145.19500	2020-01-01	2020-01-02	2020-01-01 00:16:23	2020-01-02 03:44:44	2020-01-01 00:16:23.000	2020-01-02 03:44:44.000	983	99884	50433.5	5043350	983	99884	50433.5	5043350	-32585	32350	4558.3	455830	-124	127	1.5	150
-984	2	10974	99885	2.95495	299.95495	151.45495	15145.49549	2.95495	299.95496	151.45495	15145.49559	2.95495	299.95495	151.45495	15145.49500	2020-01-01	2020-01-02	2020-01-01 00:16:24	2020-01-02 03:44:45	2020-01-01 00:16:24.000	2020-01-02 03:44:45.000	984	99885	50434.5	5043450	984	99885	50434.5	5043450	-32584	32351	4559.3	455930	-128	127	-0.06	-6
-985	2	10975	99886	2.95795	299.95795	151.45795	15145.79579	2.95795	299.95795	151.45795	15145.79573	2.95795	299.95795	151.45795	15145.79500	2020-01-01	2020-01-02	2020-01-01 00:16:25	2020-01-02 03:44:46	2020-01-01 00:16:25.000	2020-01-02 03:44:46.000	985	99886	50435.5	5043550	985	99886	50435.5	5043550	-32583	32352	4560.3	456030	-128	123	-1.62	-162
-986	2	10976	99887	2.96096	299.96096	151.46096	15146.09609	2.96096	299.96097	151.46096	15146.09648	2.96096	299.96096	151.46096	15146.09600	2020-01-01	2020-01-02	2020-01-01 00:16:26	2020-01-02 03:44:47	2020-01-01 00:16:26.000	2020-01-02 03:44:47.000	986	99887	50436.5	5043650	986	99887	50436.5	5043650	-32582	32353	4561.3	456130	-127	124	-0.62	-62
-987	2	10977	99888	2.96396	299.96396	151.46396	15146.39639	2.96396	299.96396	151.46396	15146.39612	2.96396	299.96396	151.46396000000001	15146.39600	2020-01-01	2020-01-02	2020-01-01 00:16:27	2020-01-02 03:44:48	2020-01-01 00:16:27.000	2020-01-02 03:44:48.000	987	99888	50437.5	5043750	987	99888	50437.5	5043750	-32581	32354	4562.3	456230	-126	125	0.38	38
-988	2	10978	99889	2.96696	299.96696	151.46696	15146.69669	2.96696	299.96698	151.46696	15146.69676	2.96696	299.96696	151.46696	15146.69600	2020-01-01	2020-01-02	2020-01-01 00:16:28	2020-01-02 03:44:49	2020-01-01 00:16:28.000	2020-01-02 03:44:49.000	988	99889	50438.5	5043850	988	99889	50438.5	5043850	-32580	32355	4563.3	456330	-125	126	1.38	138
-989	2	10979	99890	2.96996	299.96996	151.46996	15146.99699	2.96997	299.96997	151.46997	15146.99706	2.96996	299.96996	151.46996	15146.99600	2020-01-01	2020-01-02	2020-01-01 00:16:29	2020-01-02 03:44:50	2020-01-01 00:16:29.000	2020-01-02 03:44:50.000	989	99890	50439.5	5043950	989	99890	50439.5	5043950	-32579	32356	4564.3	456430	-124	127	2.38	238
+980	2	10970	99881	2.94294	299.94294	151.44294	15144.29429	2.94294	299.94293	151.44294	15144.29426	2.94294	299.94294	151.44294	15144.294	2020-01-01	2020-01-02	2020-01-01 00:16:20	2020-01-02 03:44:41	2020-01-01 00:16:20.000	2020-01-02 03:44:41.000	980	99881	50430.5	5043050	980	99881	50430.5	5043050	-32588	32347	4555.3	455530	-127	124	-1.5	-150
+981	2	10971	99882	2.94594	299.94594	151.44594	15144.59459	2.94594	299.94595	151.44595	15144.59501	2.94594	299.94594	151.44593999999998	15144.594	2020-01-01	2020-01-02	2020-01-01 00:16:21	2020-01-02 03:44:42	2020-01-01 00:16:21.000	2020-01-02 03:44:42.000	981	99882	50431.5	5043150	981	99882	50431.5	5043150	-32587	32348	4556.3	455630	-126	125	-0.5	-50
+982	2	10972	99883	2.94894	299.94894	151.44894	15144.89489	2.94894	299.94894	151.44894	15144.89466	2.94894	299.94894	151.44894	15144.894	2020-01-01	2020-01-02	2020-01-01 00:16:22	2020-01-02 03:44:43	2020-01-01 00:16:22.000	2020-01-02 03:44:43.000	982	99883	50432.5	5043250	982	99883	50432.5	5043250	-32586	32349	4557.3	455730	-125	126	0.5	50
+983	2	10973	99884	2.95195	299.95195	151.45195	15145.19519	2.95195	299.95197	151.45195	15145.19525	2.95195	299.95195	151.45195	15145.195	2020-01-01	2020-01-02	2020-01-01 00:16:23	2020-01-02 03:44:44	2020-01-01 00:16:23.000	2020-01-02 03:44:44.000	983	99884	50433.5	5043350	983	99884	50433.5	5043350	-32585	32350	4558.3	455830	-124	127	1.5	150
+984	2	10974	99885	2.95495	299.95495	151.45495	15145.49549	2.95495	299.95496	151.45495	15145.49559	2.95495	299.95495	151.45495	15145.495	2020-01-01	2020-01-02	2020-01-01 00:16:24	2020-01-02 03:44:45	2020-01-01 00:16:24.000	2020-01-02 03:44:45.000	984	99885	50434.5	5043450	984	99885	50434.5	5043450	-32584	32351	4559.3	455930	-128	127	-0.06	-6
+985	2	10975	99886	2.95795	299.95795	151.45795	15145.79579	2.95795	299.95795	151.45795	15145.79573	2.95795	299.95795	151.45795	15145.795	2020-01-01	2020-01-02	2020-01-01 00:16:25	2020-01-02 03:44:46	2020-01-01 00:16:25.000	2020-01-02 03:44:46.000	985	99886	50435.5	5043550	985	99886	50435.5	5043550	-32583	32352	4560.3	456030	-128	123	-1.62	-162
+986	2	10976	99887	2.96096	299.96096	151.46096	15146.09609	2.96096	299.96097	151.46096	15146.09648	2.96096	299.96096	151.46096	15146.096	2020-01-01	2020-01-02	2020-01-01 00:16:26	2020-01-02 03:44:47	2020-01-01 00:16:26.000	2020-01-02 03:44:47.000	986	99887	50436.5	5043650	986	99887	50436.5	5043650	-32582	32353	4561.3	456130	-127	124	-0.62	-62
+987	2	10977	99888	2.96396	299.96396	151.46396	15146.39639	2.96396	299.96396	151.46396	15146.39612	2.96396	299.96396	151.46396000000001	15146.396	2020-01-01	2020-01-02	2020-01-01 00:16:27	2020-01-02 03:44:48	2020-01-01 00:16:27.000	2020-01-02 03:44:48.000	987	99888	50437.5	5043750	987	99888	50437.5	5043750	-32581	32354	4562.3	456230	-126	125	0.38	38
+988	2	10978	99889	2.96696	299.96696	151.46696	15146.69669	2.96696	299.96698	151.46696	15146.69676	2.96696	299.96696	151.46696	15146.696	2020-01-01	2020-01-02	2020-01-01 00:16:28	2020-01-02 03:44:49	2020-01-01 00:16:28.000	2020-01-02 03:44:49.000	988	99889	50438.5	5043850	988	99889	50438.5	5043850	-32580	32355	4563.3	456330	-125	126	1.38	138
+989	2	10979	99890	2.96996	299.96996	151.46996	15146.99699	2.96997	299.96997	151.46997	15146.99706	2.96996	299.96996	151.46996	15146.996	2020-01-01	2020-01-02	2020-01-01 00:16:29	2020-01-02 03:44:50	2020-01-01 00:16:29.000	2020-01-02 03:44:50.000	989	99890	50439.5	5043950	989	99890	50439.5	5043950	-32579	32356	4564.3	456430	-124	127	2.38	238
 99	2	10089	99999	0.29729	300.29729	150.29729	15180.02702	0.29729	300.2973	150.29729	15180.02726	0.29729	300.29729	150.29729	15180.02629	2020-01-01	2020-01-02	2020-01-01 00:01:39	2020-01-02 03:46:39	2020-01-01 00:01:39.000	2020-01-02 03:46:39.000	99	99999	50049	5054949	99	99999	50049	5054949	-32470	32465	4628.009900990099	467429	-128	123	-2.801980198019802	-283
-990	2	10980	99891	2.97297	299.97297	151.47297	15147.29729	2.97297	299.97296	151.47297	15147.29735	2.97297	299.97297	151.47297	15147.29700	2020-01-01	2020-01-02	2020-01-01 00:16:30	2020-01-02 03:44:51	2020-01-01 00:16:30.000	2020-01-02 03:44:51.000	990	99891	50440.5	5044050	990	99891	50440.5	5044050	-32578	32357	4565.3	456530	-128	127	0.82	82
-991	2	10981	99892	2.97597	299.97597	151.47597	15147.59759	2.97597	299.97598	151.47597	15147.59795	2.97597	299.97597	151.47597	15147.59700	2020-01-01	2020-01-02	2020-01-01 00:16:31	2020-01-02 03:44:52	2020-01-01 00:16:31.000	2020-01-02 03:44:52.000	991	99892	50441.5	5044150	991	99892	50441.5	5044150	-32577	32358	4566.3	456630	-128	127	-0.74	-74
-992	2	10982	99893	2.97897	299.97897	151.47897	15147.89789	2.97897	299.97897	151.47897	15147.89759	2.97897	299.97897	151.47897	15147.89700	2020-01-01	2020-01-02	2020-01-01 00:16:32	2020-01-02 03:44:53	2020-01-01 00:16:32.000	2020-01-02 03:44:53.000	992	99893	50442.5	5044250	992	99893	50442.5	5044250	-32576	32359	4567.3	456730	-128	124	-2.3	-230
-993	2	10983	99894	2.98198	299.98198	151.48198	15148.19819	2.98198	299.982	151.48198	15148.19823	2.98198	299.98198	151.48198	15148.19800	2020-01-01	2020-01-02	2020-01-01 00:16:33	2020-01-02 03:44:54	2020-01-01 00:16:33.000	2020-01-02 03:44:54.000	993	99894	50443.5	5044350	993	99894	50443.5	5044350	-32575	32360	4568.3	456830	-127	125	-1.3	-130
-994	2	10984	99895	2.98498	299.98498	151.48498	15148.49849	2.98498	299.985	151.48498	15148.49853	2.98498	299.98498	151.48498	15148.49800	2020-01-01	2020-01-02	2020-01-01 00:16:34	2020-01-02 03:44:55	2020-01-01 00:16:34.000	2020-01-02 03:44:55.000	994	99895	50444.5	5044450	994	99895	50444.5	5044450	-32574	32361	4569.3	456930	-126	126	-0.3	-30
-995	2	10985	99896	2.98798	299.98798	151.48798	15148.79879	2.98798	299.98798	151.48798	15148.79882	2.98798	299.98798	151.48798	15148.79800	2020-01-01	2020-01-02	2020-01-01 00:16:35	2020-01-02 03:44:56	2020-01-01 00:16:35.000	2020-01-02 03:44:56.000	995	99896	50445.5	5044550	995	99896	50445.5	5044550	-32573	32362	4570.3	457030	-125	127	0.7	70
-996	2	10986	99897	2.99099	299.99099	151.49099	15149.09909	2.99099	299.991	151.49099	15149.09942	2.99099	299.99099	151.49099	15149.09900	2020-01-01	2020-01-02	2020-01-01 00:16:36	2020-01-02 03:44:57	2020-01-01 00:16:36.000	2020-01-02 03:44:57.000	996	99897	50446.5	5044650	996	99897	50446.5	5044650	-32572	32363	4571.3	457130	-128	127	-0.86	-86
-997	2	10987	99898	2.99399	299.99399	151.49399	15149.39939	2.99399	299.994	151.49399	15149.3991	2.99399	299.99399	151.49399	15149.39900	2020-01-01	2020-01-02	2020-01-01 00:16:37	2020-01-02 03:44:58	2020-01-01 00:16:37.000	2020-01-02 03:44:58.000	997	99898	50447.5	5044750	997	99898	50447.5	5044750	-32571	32364	4572.3	457230	-128	127	-2.42	-242
-998	2	10988	99899	2.99699	299.99699	151.49699	15149.69969	2.99699	299.997	151.49699	15149.6997	2.99699	299.99699	151.49699	15149.69900	2020-01-01	2020-01-02	2020-01-01 00:16:38	2020-01-02 03:44:59	2020-01-01 00:16:38.000	2020-01-02 03:44:59.000	998	99899	50448.5	5044850	998	99899	50448.5	5044850	-32570	32365	4573.3	457330	-128	123	-3.98	-398
+990	2	10980	99891	2.97297	299.97297	151.47297	15147.29729	2.97297	299.97296	151.47297	15147.29735	2.97297	299.97297	151.47297	15147.297	2020-01-01	2020-01-02	2020-01-01 00:16:30	2020-01-02 03:44:51	2020-01-01 00:16:30.000	2020-01-02 03:44:51.000	990	99891	50440.5	5044050	990	99891	50440.5	5044050	-32578	32357	4565.3	456530	-128	127	0.82	82
+991	2	10981	99892	2.97597	299.97597	151.47597	15147.59759	2.97597	299.97598	151.47597	15147.59795	2.97597	299.97597	151.47597	15147.597	2020-01-01	2020-01-02	2020-01-01 00:16:31	2020-01-02 03:44:52	2020-01-01 00:16:31.000	2020-01-02 03:44:52.000	991	99892	50441.5	5044150	991	99892	50441.5	5044150	-32577	32358	4566.3	456630	-128	127	-0.74	-74
+992	2	10982	99893	2.97897	299.97897	151.47897	15147.89789	2.97897	299.97897	151.47897	15147.89759	2.97897	299.97897	151.47897	15147.897	2020-01-01	2020-01-02	2020-01-01 00:16:32	2020-01-02 03:44:53	2020-01-01 00:16:32.000	2020-01-02 03:44:53.000	992	99893	50442.5	5044250	992	99893	50442.5	5044250	-32576	32359	4567.3	456730	-128	124	-2.3	-230
+993	2	10983	99894	2.98198	299.98198	151.48198	15148.19819	2.98198	299.982	151.48198	15148.19823	2.98198	299.98198	151.48198	15148.198	2020-01-01	2020-01-02	2020-01-01 00:16:33	2020-01-02 03:44:54	2020-01-01 00:16:33.000	2020-01-02 03:44:54.000	993	99894	50443.5	5044350	993	99894	50443.5	5044350	-32575	32360	4568.3	456830	-127	125	-1.3	-130
+994	2	10984	99895	2.98498	299.98498	151.48498	15148.49849	2.98498	299.985	151.48498	15148.49853	2.98498	299.98498	151.48498	15148.498	2020-01-01	2020-01-02	2020-01-01 00:16:34	2020-01-02 03:44:55	2020-01-01 00:16:34.000	2020-01-02 03:44:55.000	994	99895	50444.5	5044450	994	99895	50444.5	5044450	-32574	32361	4569.3	456930	-126	126	-0.3	-30
+995	2	10985	99896	2.98798	299.98798	151.48798	15148.79879	2.98798	299.98798	151.48798	15148.79882	2.98798	299.98798	151.48798	15148.798	2020-01-01	2020-01-02	2020-01-01 00:16:35	2020-01-02 03:44:56	2020-01-01 00:16:35.000	2020-01-02 03:44:56.000	995	99896	50445.5	5044550	995	99896	50445.5	5044550	-32573	32362	4570.3	457030	-125	127	0.7	70
+996	2	10986	99897	2.99099	299.99099	151.49099	15149.09909	2.99099	299.991	151.49099	15149.09942	2.99099	299.99099	151.49099	15149.099	2020-01-01	2020-01-02	2020-01-01 00:16:36	2020-01-02 03:44:57	2020-01-01 00:16:36.000	2020-01-02 03:44:57.000	996	99897	50446.5	5044650	996	99897	50446.5	5044650	-32572	32363	4571.3	457130	-128	127	-0.86	-86
+997	2	10987	99898	2.99399	299.99399	151.49399	15149.39939	2.99399	299.994	151.49399	15149.3991	2.99399	299.99399	151.49399	15149.399	2020-01-01	2020-01-02	2020-01-01 00:16:37	2020-01-02 03:44:58	2020-01-01 00:16:37.000	2020-01-02 03:44:58.000	997	99898	50447.5	5044750	997	99898	50447.5	5044750	-32571	32364	4572.3	457230	-128	127	-2.42	-242
+998	2	10988	99899	2.99699	299.99699	151.49699	15149.69969	2.99699	299.997	151.49699	15149.6997	2.99699	299.99699	151.49699	15149.699	2020-01-01	2020-01-02	2020-01-01 00:16:38	2020-01-02 03:44:59	2020-01-01 00:16:38.000	2020-01-02 03:44:59.000	998	99899	50448.5	5044850	998	99899	50448.5	5044850	-32570	32365	4573.3	457330	-128	123	-3.98	-398
  ---- select row with nulls without states ---- 
 -2	1	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
  ---- select row with nulls with states ---- 
diff --git a/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql b/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
index 9963823023d..0e35d270f20 100644
--- a/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
+++ b/tests/queries/0_stateless/01519_topK_distributed_parametrized.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 CREATE TABLE IF NOT EXISTS topXtest(A Int64) ENGINE = Memory;
 INSERT INTO topXtest SELECT number FROM numbers(100);
 INSERT INTO topXtest SELECT number FROM numbers(30);
diff --git a/tests/queries/0_stateless/01520_client_print_query_id.expect b/tests/queries/0_stateless/01520_client_print_query_id.expect
index b0ff5d9d165..1989ab51aea 100755
--- a/tests/queries/0_stateless/01520_client_print_query_id.expect
+++ b/tests/queries/0_stateless/01520_client_print_query_id.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01521_distributed_query_hang.sql b/tests/queries/0_stateless/01521_distributed_query_hang.sql
index 73e0f1ec921..9ec303947c9 100644
--- a/tests/queries/0_stateless/01521_distributed_query_hang.sql
+++ b/tests/queries/0_stateless/01521_distributed_query_hang.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- regression for endless loop with connections_with_failover_max_tries=0
 set connections_with_failover_max_tries=0;
 select * from remote('127.2', system.one);
diff --git a/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql b/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
index adb7bccd0df..fe58710a9e6 100644
--- a/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
+++ b/tests/queries/0_stateless/01521_global_in_prewhere_15792.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh b/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
index f4681907ced..cf19efa9b7d 100755
--- a/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
+++ b/tests/queries/0_stateless/01523_client_local_queries_file_parameter.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.reference b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.reference
index 4063d93d542..1dcd3543d4e 100644
--- a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.reference
+++ b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.reference
@@ -1,6 +1,6 @@
 2019-10-01	a	1	aa	1	1	1
 2019-10-01	a	1	aa	1	1	1	0
-CREATE TABLE default.table_for_alter\n(\n    `d` Date,\n    `a` String,\n    `b` UInt8,\n    `x` String,\n    `y` Int8,\n    `version` UInt64,\n    `sign` Int8 DEFAULT 1,\n    `order` UInt32\n)\nENGINE = ReplicatedVersionedCollapsingMergeTree(\'/clickhouse/tables/01526_alter_add/t1\', \'1\', sign, version)\nPARTITION BY y\nPRIMARY KEY d\nORDER BY (d, order)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_alter\n(\n    `d` Date,\n    `a` String,\n    `b` UInt8,\n    `x` String,\n    `y` Int8,\n    `version` UInt64,\n    `sign` Int8 DEFAULT 1,\n    `order` UInt32\n)\nENGINE = ReplicatedVersionedCollapsingMergeTree(\'/clickhouse/tables/default/01526_alter_add/t1\', \'1\', sign, version)\nPARTITION BY y\nPRIMARY KEY d\nORDER BY (d, order)\nSETTINGS index_granularity = 8192
 2019-10-01	a	1	aa	1	1	1	0	0
 2019-10-02	b	2	bb	2	2	2	1	2
-CREATE TABLE default.table_for_alter\n(\n    `d` Date,\n    `a` String,\n    `b` UInt8,\n    `x` String,\n    `y` Int8,\n    `version` UInt64,\n    `sign` Int8 DEFAULT 1,\n    `order` UInt32,\n    `datum` UInt32\n)\nENGINE = ReplicatedVersionedCollapsingMergeTree(\'/clickhouse/tables/01526_alter_add/t1\', \'1\', sign, version)\nPARTITION BY y\nPRIMARY KEY d\nORDER BY (d, order, datum)\nSETTINGS index_granularity = 8192
+CREATE TABLE default.table_for_alter\n(\n    `d` Date,\n    `a` String,\n    `b` UInt8,\n    `x` String,\n    `y` Int8,\n    `version` UInt64,\n    `sign` Int8 DEFAULT 1,\n    `order` UInt32,\n    `datum` UInt32\n)\nENGINE = ReplicatedVersionedCollapsingMergeTree(\'/clickhouse/tables/default/01526_alter_add/t1\', \'1\', sign, version)\nPARTITION BY y\nPRIMARY KEY d\nORDER BY (d, order, datum)\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
index b718ba199c1..24f43a89c0b 100644
--- a/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
+++ b/tests/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS table_for_alter;
 
 SET replication_alter_partitions_sync = 2;
@@ -12,17 +14,27 @@ CREATE TABLE table_for_alter
     `version` UInt64,
     `sign` Int8 DEFAULT 1
 )
-ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/01526_alter_add/t1', '1', sign, version)
+ENGINE = ReplicatedVersionedCollapsingMergeTree('/clickhouse/tables/{database}/01526_alter_add/t1', '1', sign, version)
 PARTITION BY y
 ORDER BY d
 SETTINGS index_granularity = 8192;
 
 INSERT INTO table_for_alter VALUES(toDate('2019-10-01'), 'a', 1, 'aa', 1, 1, 1);
 
+DETACH TABLE table_for_alter;
+
+ATTACH TABLE table_for_alter;
+
+
 SELECT * FROM table_for_alter;
 
 ALTER TABLE table_for_alter ADD COLUMN order UInt32, MODIFY ORDER BY (d, order);
 
+
+DETACH TABLE table_for_alter;
+
+ATTACH TABLE table_for_alter;
+
 SELECT * FROM table_for_alter;
 
 SHOW CREATE TABLE table_for_alter;
@@ -35,4 +47,8 @@ SELECT * FROM table_for_alter ORDER BY d;
 
 SHOW CREATE TABLE table_for_alter;
 
+DETACH TABLE table_for_alter;
+
+ATTACH TABLE table_for_alter;
+
 DROP TABLE IF EXISTS table_for_alter;
diff --git a/tests/queries/0_stateless/01526_client_start_and_exit.sh b/tests/queries/0_stateless/01526_client_start_and_exit.sh
index 19f9cb8c37b..82eb56305fc 100755
--- a/tests/queries/0_stateless/01526_client_start_and_exit.sh
+++ b/tests/queries/0_stateless/01526_client_start_and_exit.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql b/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
index c303b35386f..30a5b7e8783 100644
--- a/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
+++ b/tests/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS db_01526;
 
 CREATE DATABASE db_01526;
diff --git a/tests/queries/0_stateless/01526_max_untracked_memory.sh b/tests/queries/0_stateless/01526_max_untracked_memory.sh
index df5dbae35a9..20c986f14ca 100755
--- a/tests/queries/0_stateless/01526_max_untracked_memory.sh
+++ b/tests/queries/0_stateless/01526_max_untracked_memory.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan
+# Tag no-tsan: requires TraceCollector, does not available under sanitizers
+# Tag no-asan: requires TraceCollector, does not available under sanitizers
+# Tag no-ubsan: requires TraceCollector, does not available under sanitizers
+# Tag no-msan: requires TraceCollector, does not available under sanitizers
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
index 82453c00ca4..c1d5c357308 100755
--- a/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
+++ b/tests/queries/0_stateless/01527_clickhouse_local_optimize.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -9,6 +10,6 @@ rm -rf "${WORKING_FOLDER_01527}"
 mkdir -p "${WORKING_FOLDER_01527}"
 
 # OPTIMIZE was crashing due to lack of temporary volume in local
-${CLICKHOUSE_LOCAL} --query "drop database if exists d; create database d; create table d.t engine MergeTree order by a as select 1 a; optimize table d.t final" -- --path="${WORKING_FOLDER_01527}"
+${CLICKHOUSE_LOCAL} --query "drop database if exists d; create database d; create table d.t engine MergeTree order by a as select 1 a; optimize table d.t final" --path="${WORKING_FOLDER_01527}"
 
 rm -rf "${WORKING_FOLDER_01527}"
diff --git a/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql b/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
index 7e0782ebe84..5e42fe69c2f 100644
--- a/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
+++ b/tests/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 set allow_nondeterministic_optimize_skip_unused_shards=1;
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
diff --git a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
index 51970db73cb..08fba7480d1 100644
--- a/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
+++ b/tests/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists dist_01528;
 create table dist_01528 as system.one engine=Distributed('test_cluster_two_shards', system, one, rand()+dummy);
 
diff --git a/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh b/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
index 8684582ad45..95ecbf09cf5 100755
--- a/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
+++ b/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
@@ -36,10 +36,10 @@ ATTACH TABLE local.data_csv (id UInt64, d Date, s String) Engine=File(CSV, '${WO
 EOF
 
 ## feed the table
-${CLICKHOUSE_LOCAL} --query "INSERT INTO local.test SELECT * FROM local.data_csv;" -- --path="${WORKING_FOLDER_01528}"
+${CLICKHOUSE_LOCAL} --query "INSERT INTO local.test SELECT * FROM local.data_csv;" --path="${WORKING_FOLDER_01528}"
 
 ## check the parts were created
-${CLICKHOUSE_LOCAL} --query "SELECT * FROM local.test WHERE id < 10 ORDER BY id;" -- --path="${WORKING_FOLDER_01528}"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM local.test WHERE id < 10 ORDER BY id;" --path="${WORKING_FOLDER_01528}"
 
 #################
 
@@ -49,36 +49,36 @@ cat <<EOF > "${WORKING_FOLDER_01528}/metadata/local/stdin.sql"
 ATTACH TABLE local.stdin (id UInt64, d Date, s String) Engine=File(CSV, stdin);
 EOF
 
-cat <<EOF | ${CLICKHOUSE_LOCAL} --query "INSERT INTO local.test SELECT * FROM local.stdin;" -- --path="${WORKING_FOLDER_01528}"
+cat <<EOF | ${CLICKHOUSE_LOCAL} --query "INSERT INTO local.test SELECT * FROM local.stdin;" --path="${WORKING_FOLDER_01528}"
 11,2020-01-01,"String"
 12,2020-02-02,"Another string"
 13,2020-03-03,"One more string"
 14,2020-01-02,"String for first partition"
 EOF
 
-${CLICKHOUSE_LOCAL} --query "SELECT * FROM local.test WHERE id BETWEEN 10 AND 19 ORDER BY id;" -- --path="${WORKING_FOLDER_01528}"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM local.test WHERE id BETWEEN 10 AND 19 ORDER BY id;" --path="${WORKING_FOLDER_01528}"
 
 #################
 
 echo "Option 3. Prepare parts from from table with Engine=File defined via command line, read from stdin (pipe)"
 
-cat <<EOF | ${CLICKHOUSE_LOCAL} --query "INSERT INTO local.test SELECT * FROM table;" -S "id UInt64, d Date, s String" --input-format=CSV -- --path="${WORKING_FOLDER_01528}"
+cat <<EOF | ${CLICKHOUSE_LOCAL} --query "INSERT INTO local.test SELECT * FROM table;" -S "id UInt64, d Date, s String" --input-format=CSV --path="${WORKING_FOLDER_01528}"
 21,2020-01-01,"String"
 22,2020-02-02,"Another string"
 23,2020-03-03,"One more string"
 24,2020-01-02,"String for first partition"
 EOF
 
-${CLICKHOUSE_LOCAL} --query "SELECT * FROM local.test WHERE id BETWEEN 20 AND 29 ORDER BY id;" -- --path="${WORKING_FOLDER_01528}"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM local.test WHERE id BETWEEN 20 AND 29 ORDER BY id;" --path="${WORKING_FOLDER_01528}"
 
 #################
 
 echo "Possibility to run optimize on prepared parts before sending parts to server"
 
-${CLICKHOUSE_LOCAL} --query "OPTIMIZE TABLE local.test FINAL;" -- --path="${WORKING_FOLDER_01528}"
+${CLICKHOUSE_LOCAL} --query "OPTIMIZE TABLE local.test FINAL;" --path="${WORKING_FOLDER_01528}"
 
 # ensure we have one part per partition
-${CLICKHOUSE_LOCAL} --query "SELECT toYYYYMM(d) m, uniqExact(_part) FROM local.test GROUP BY m ORDER BY m" -- --path="${WORKING_FOLDER_01528}"
+${CLICKHOUSE_LOCAL} --query "SELECT toYYYYMM(d) m, uniqExact(_part) FROM local.test GROUP BY m ORDER BY m" --path="${WORKING_FOLDER_01528}"
 
 # cleanup
 rm -rf "${WORKING_FOLDER_01528}"
diff --git a/tests/queries/0_stateless/01529_bad_memory_tracking.sh b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
index 5ad2535074a..f5d096cc799 100755
--- a/tests/queries/0_stateless/01529_bad_memory_tracking.sh
+++ b/tests/queries/0_stateless/01529_bad_memory_tracking.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -7,5 +8,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 for _ in {1..10}; do
-    ${CLICKHOUSE_CLIENT} --max_memory_usage '10G' --query "SELECT i FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536" 2>&1 | grep -v -P '^(Received exception from server|Code: 241)' ||:
+    ${CLICKHOUSE_CLIENT} --max_memory_usage '10G' --query "SELECT i FROM generateRandom('i Array(Int8)', 1, 1, 1048577) LIMIT 65536" |& grep -v -e 'Received exception from server' -e 'Code: 241' -e '(query: '
 done
+exit 0
diff --git a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
index d5fb25a9241..7a2e64742cf 100644
--- a/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
+++ b/tests/queries/0_stateless/01530_drop_database_atomic_sync.sql
@@ -1,33 +1,36 @@
+-- Tags: no-parallel
+-- Tag no-parallel: creates database
+
 drop database if exists db_01530_atomic sync;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/db_01530_atomic/data', 'test') order by key;
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key;
 drop database db_01530_atomic sync;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/db_01530_atomic/data', 'test') order by key;
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key;
 drop database db_01530_atomic sync;
 
 
 set database_atomic_wait_for_drop_and_detach_synchronously=1;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/db_01530_atomic/data', 'test') order by key;
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key;
 drop database db_01530_atomic;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/db_01530_atomic/data', 'test') order by key;
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key;
 drop database db_01530_atomic;
 
 
 set database_atomic_wait_for_drop_and_detach_synchronously=0;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/db_01530_atomic/data', 'test') order by key;
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key;
 drop database db_01530_atomic;
 
 create database db_01530_atomic Engine=Atomic;
-create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/db_01530_atomic/data', 'test') order by key; -- { serverError 253; }
+create table db_01530_atomic.data (key Int) Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/db_01530_atomic/data', 'test') order by key; -- { serverError 253; }
 
 set database_atomic_wait_for_drop_and_detach_synchronously=1;
 
diff --git a/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql b/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
index b6fba26eb2d..ace36236292 100644
--- a/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
+++ b/tests/queries/0_stateless/01532_collate_in_low_cardinality.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collate;
 DROP TABLE IF EXISTS test_collate_null;
 
diff --git a/tests/queries/0_stateless/01532_execute_merges_on_single_replica.reference b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01532_execute_merges_on_single_replica.reference
rename to tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.reference
diff --git a/tests/queries/0_stateless/01532_execute_merges_on_single_replica.sql b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
similarity index 92%
rename from tests/queries/0_stateless/01532_execute_merges_on_single_replica.sql
rename to tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
index 69369321d26..8df6d0b314e 100644
--- a/tests/queries/0_stateless/01532_execute_merges_on_single_replica.sql
+++ b/tests/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
@@ -1,7 +1,11 @@
+-- Tags: long, replica, no-replicated-database, no-parallel
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+-- Tag no-parallel: static zk path
+
 DROP TABLE IF EXISTS execute_on_single_replica_r1 NO DELAY;
 DROP TABLE IF EXISTS execute_on_single_replica_r2 NO DELAY;
 
-/* that test requires fixed zookeeper path */
+/* that test requires fixed zookeeper path, so we cannot use ReplicatedMergeTree({database}) */
 CREATE TABLE execute_on_single_replica_r1 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01532/execute_on_single_replica', 'r1') ORDER BY tuple() SETTINGS execute_merges_on_single_replica_time_threshold=10;
 CREATE TABLE execute_on_single_replica_r2 (x UInt64) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01532/execute_on_single_replica', 'r2') ORDER BY tuple() SETTINGS execute_merges_on_single_replica_time_threshold=10;
 
@@ -98,6 +102,7 @@ SELECT '*** disable the feature';
 ALTER TABLE execute_on_single_replica_r1 MODIFY SETTING execute_merges_on_single_replica_time_threshold=0;
 ALTER TABLE execute_on_single_replica_r2 MODIFY SETTING execute_merges_on_single_replica_time_threshold=0;
 
+SET replication_alter_partitions_sync=2;
 /* all_0_0_6 - we disabled the feature, both replicas will merge */
 OPTIMIZE TABLE execute_on_single_replica_r2 FINAL;
 /* all_0_0_7 - same */
@@ -124,4 +129,4 @@ ORDER BY part_name
 FORMAT Vertical;
 
 DROP TABLE execute_on_single_replica_r1 NO DELAY;
-DROP TABLE execute_on_single_replica_r2 NO DELAY;
\ No newline at end of file
+DROP TABLE execute_on_single_replica_r2 NO DELAY;
diff --git a/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql b/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
index 31294d8ebbc..8d413cf6c35 100644
--- a/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
+++ b/tests/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS merge_tree_pk;
 
 CREATE TABLE merge_tree_pk
diff --git a/tests/queries/0_stateless/01533_collate_in_nullable.sql b/tests/queries/0_stateless/01533_collate_in_nullable.sql
index 40b48bee465..9e54581bc54 100644
--- a/tests/queries/0_stateless/01533_collate_in_nullable.sql
+++ b/tests/queries/0_stateless/01533_collate_in_nullable.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collate;
 
 CREATE TABLE test_collate (x UInt32, s Nullable(String)) ENGINE=Memory();
diff --git a/tests/queries/0_stateless/01536_fuzz_cast.sql b/tests/queries/0_stateless/01536_fuzz_cast.sql
index 436d76b5c4c..fb1303549b6 100644
--- a/tests/queries/0_stateless/01536_fuzz_cast.sql
+++ b/tests/queries/0_stateless/01536_fuzz_cast.sql
@@ -1 +1,2 @@
+SET cast_keep_nullable = 0;
 SELECT CAST(arrayJoin([NULL, '', '', NULL, '', NULL, '01.02.2017 03:04\005GMT', '', NULL, '01/02/2017 03:04:05 MSK01/02/\0017 03:04:05 MSK', '', NULL, '03/04/201903/04/201903/04/\001903/04/2019']), 'Enum8(\'a\' = 1, \'b\' = 2)') AS x; -- { serverError 349 }
diff --git a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
index 32877bfd0fe..e2d0306fee0 100755
--- a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
+++ b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-replicated-database, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01542_collate_in_array.sql b/tests/queries/0_stateless/01542_collate_in_array.sql
index dd0ec769e7d..1e748bd549f 100644
--- a/tests/queries/0_stateless/01542_collate_in_array.sql
+++ b/tests/queries/0_stateless/01542_collate_in_array.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS collate_test1;
 DROP TABLE IF EXISTS collate_test2;
 DROP TABLE IF EXISTS collate_test3;
diff --git a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
index 334fcc87baf..981beb785a5 100755
--- a/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
+++ b/tests/queries/0_stateless/01542_dictionary_load_exception_race.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference
index e69de29bb2d..8d99d88ca14 100644
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.reference
@@ -0,0 +1,30 @@
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+\N
+1
+\N
+3
+\N
+5
+\N
+7
+\N
+9
diff --git a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
index f3f636dee73..0e987c66512 100755
--- a/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
+++ b/tests/queries/0_stateless/01543_avro_deserialization_with_lc.sh
@@ -1,13 +1,28 @@
 #!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_CLIENT --query "CREATE TABLE IF NOT EXISTS test_01543 (value LowCardinality(String)) ENGINE=Memory()"
-$CLICKHOUSE_CLIENT --query "INSERT INTO test_01543 SELECT toString(number) FROM numbers(1000)"
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+$CLICKHOUSE_CLIENT --multiquery --query "
+SET allow_suspicious_low_cardinality_types=1;
+CREATE TABLE IF NOT EXISTS test_01543 (value LowCardinality(String), value2 LowCardinality(UInt64)) ENGINE=Memory();
+"
+
+$CLICKHOUSE_CLIENT --query "INSERT INTO test_01543 SELECT toString(number), number FROM numbers(10)"
 
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_01543 FORMAT Avro" |
     $CLICKHOUSE_CLIENT -q "INSERT INTO test_01543 FORMAT Avro";
 
+$CLICKHOUSE_CLIENT -q "SELECT * FROM test_01543";
+
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_01543"
+
+$CLICKHOUSE_CLIENT --query "SELECT number % 2 ? number: NULL as x from numbers(10) FORMAT Avro" > $USER_FILES_PATH/test_01543.avro
+
+$CLICKHOUSE_CLIENT --query "SELECT * FROM file('test_01543.avro', 'Avro', 'x LowCardinality(Nullable(UInt64))')"
+
+rm $USER_FILES_PATH/test_01543.avro
diff --git a/tests/queries/0_stateless/01543_collate_in_tuple.sql b/tests/queries/0_stateless/01543_collate_in_tuple.sql
index 17d9426cf45..222f7762b32 100644
--- a/tests/queries/0_stateless/01543_collate_in_tuple.sql
+++ b/tests/queries/0_stateless/01543_collate_in_tuple.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS collate_test1;
 DROP TABLE IF EXISTS collate_test2;
 DROP TABLE IF EXISTS collate_test3;
diff --git a/tests/queries/0_stateless/01544_errorCodeToName.sql b/tests/queries/0_stateless/01544_errorCodeToName.sql
index aa32270f00b..3a925bcea90 100644
--- a/tests/queries/0_stateless/01544_errorCodeToName.sql
+++ b/tests/queries/0_stateless/01544_errorCodeToName.sql
@@ -1,5 +1,5 @@
 SELECT errorCodeToName(toUInt32(-1));
 SELECT errorCodeToName(-1);
-SELECT errorCodeToName(600); /* gap in error codes */
+SELECT errorCodeToName(950); /* gap in error codes */
 SELECT errorCodeToName(0);
 SELECT errorCodeToName(1);
diff --git a/tests/queries/0_stateless/01545_system_errors.sh b/tests/queries/0_stateless/01545_system_errors.sh
index 970fd403866..11db3836ddb 100755
--- a/tests/queries/0_stateless/01545_system_errors.sh
+++ b/tests/queries/0_stateless/01545_system_errors.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: Checks system.errors
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01550_type_map_formats.reference b/tests/queries/0_stateless/01550_type_map_formats.reference
index ca081db75a2..998473ef63a 100644
--- a/tests/queries/0_stateless/01550_type_map_formats.reference
+++ b/tests/queries/0_stateless/01550_type_map_formats.reference
@@ -4,15 +4,15 @@ JSON
 	[
 		{
 			"name": "m",
-			"type": "Map(String,UInt32)"
+			"type": "Map(String, UInt32)"
 		},
 		{
 			"name": "m1",
-			"type": "Map(String,Date)"
+			"type": "Map(String, Date)"
 		},
 		{
 			"name": "m2",
-			"type": "Map(String,Array(UInt32))"
+			"type": "Map(String, Array(UInt32))"
 		}
 	],
 
diff --git a/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference b/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
index cdc595a3c57..b6b8b04907c 100644
--- a/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
+++ b/tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
@@ -1,17 +1,18 @@
 (Expression)
-ExpressionTransform
+ExpressionTransform × 3
   (Aggregating)
-  FinalizingSimpleTransform
-    FinishAggregatingInOrderTransform 3 → 1
-      AggregatingInOrderTransform × 3
-        (Expression)
-        ExpressionTransform × 3
-          (SettingQuotaAndLimits)
-            (ReadFromMergeTree)
-            ExpressionTransform × 4
-              MergeTreeInOrder 0 → 1
-                MergingSortedTransform 2 → 1
-                  ExpressionTransform × 2
-                    MergeTreeInOrder × 2 0 → 1
-                      ExpressionTransform
-                        MergeTreeInOrder 0 → 1
+  MergingAggregatedBucketTransform × 3
+    Resize 1 → 3
+      FinishAggregatingInOrderTransform 3 → 1
+        AggregatingInOrderTransform × 3
+          (Expression)
+          ExpressionTransform × 3
+            (SettingQuotaAndLimits)
+              (ReadFromMergeTree)
+              ExpressionTransform × 4
+                MergeTreeInOrder 0 → 1
+                  MergingSortedTransform 2 → 1
+                    ExpressionTransform × 2
+                      MergeTreeInOrder × 2 0 → 1
+                        ExpressionTransform
+                          MergeTreeInOrder 0 → 1
diff --git a/tests/queries/0_stateless/01556_accurate_cast_or_null.reference b/tests/queries/0_stateless/01556_accurate_cast_or_null.reference
index 3b27dd2e2e1..b329aede01a 100644
--- a/tests/queries/0_stateless/01556_accurate_cast_or_null.reference
+++ b/tests/queries/0_stateless/01556_accurate_cast_or_null.reference
@@ -15,7 +15,7 @@
 5
 \N
 \N
-1.000000000
+1
 \N
 \N
 \N
diff --git a/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql b/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
index d86f692a1ea..2b1a66147a4 100644
--- a/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
+++ b/tests/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS t;
 CREATE TABLE t (x String) ENGINE = MergeTree ORDER BY x;
 INSERT INTO t VALUES ('Hello');
diff --git a/tests/queries/0_stateless/01560_merge_distributed_join.sql b/tests/queries/0_stateless/01560_merge_distributed_join.sql
index 991a0609dcd..40e89135de7 100644
--- a/tests/queries/0_stateless/01560_merge_distributed_join.sql
+++ b/tests/queries/0_stateless/01560_merge_distributed_join.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- test from https://github.com/ClickHouse/ClickHouse/issues/11755#issuecomment-700850254
 DROP TABLE IF EXISTS cat_hist;
 DROP TABLE IF EXISTS prod_hist;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_long.sql b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
index 1c6418a50df..5570bb76230 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SELECT 'Replacing Merge Tree';
 DROP TABLE IF EXISTS replacing_merge_tree;
 CREATE TABLE replacing_merge_tree (key UInt32, date Datetime) ENGINE=ReplacingMergeTree() PARTITION BY date ORDER BY key;
diff --git a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
index a98818b2195..f909c2129c1 100644
--- a/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
+++ b/tests/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper, no-parallel
+
 DROP TABLE IF EXISTS empty1;
 DROP TABLE IF EXISTS empty2;
 
diff --git a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
index a01bc7f5065..72161333812 100755
--- a/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
+++ b/tests/queries/0_stateless/01561_clickhouse_client_stage.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01561_mann_whitney_scipy.sh b/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
index a04b630e2f3..8c68dec8925 100755
--- a/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
+++ b/tests/queries/0_stateless/01561_mann_whitney_scipy.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: Require python libraries like scipy, pandas and numpy
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
index 0eb7e06f724..d8c9b88d8e8 100644
--- a/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
+++ b/tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
@@ -5,13 +5,11 @@ FROM test_order_by
 ORDER BY timestamp ASC
 LIMIT 10
 Expression (Projection)
-  Limit (preliminary LIMIT)
-    MergingSorted (Merge sorted streams for ORDER BY)
-      MergeSorting (Merge sorted blocks for ORDER BY)
-        PartialSorting (Sort each block for ORDER BY)
-          Expression (Before ORDER BY)
-            SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromMergeTree
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting (Sorting for ORDER BY)
+      Expression (Before ORDER BY)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -19,8 +17,8 @@ FROM test_order_by
 ORDER BY toDate(timestamp) ASC
 LIMIT 10
 Expression (Projection)
-  Limit (preliminary LIMIT)
-    FinishSorting
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromMergeTree
@@ -33,8 +31,8 @@ ORDER BY
     timestamp ASC
 LIMIT 10
 Expression (Projection)
-  Limit (preliminary LIMIT)
-    FinishSorting
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromMergeTree
diff --git a/tests/queries/0_stateless/01563_distributed_query_finish.sh b/tests/queries/0_stateless/01563_distributed_query_finish.sh
index a9e6a5b1fce..b49042ead9d 100755
--- a/tests/queries/0_stateless/01563_distributed_query_finish.sh
+++ b/tests/queries/0_stateless/01563_distributed_query_finish.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed, no-parallel, no-fasttest
+# Tag no-fasttest: Checks system.errors
 
 # query finish should not produce any NETWORK_ERROR
 # (NETWORK_ERROR will be in case of connection reset)
diff --git a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
index 712fe4ff64a..261e46c2111 100755
--- a/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
+++ b/tests/queries/0_stateless/01565_reconnect_after_client_error.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 # This is a separate test, because we want to test the interactive mode.
 # https://github.com/ClickHouse/ClickHouse/issues/19353
diff --git a/tests/queries/0_stateless/01568_window_functions_distributed.sql b/tests/queries/0_stateless/01568_window_functions_distributed.sql
index 5e20c57d23d..140b02bfa6d 100644
--- a/tests/queries/0_stateless/01568_window_functions_distributed.sql
+++ b/tests/queries/0_stateless/01568_window_functions_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- { echo }
 select row_number() over (order by dummy) from (select * from remote('127.0.0.{1,2}', system, one));
 
diff --git a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
index 98e85e9b196..2588a98fbfc 100755
--- a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
+++ b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-unbundled
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01572_kill_window_function.reference b/tests/queries/0_stateless/01572_kill_window_function.reference
new file mode 100644
index 00000000000..f1218bf5bdf
--- /dev/null
+++ b/tests/queries/0_stateless/01572_kill_window_function.reference
@@ -0,0 +1,3 @@
+Started
+Sent kill request
+Exit 138
diff --git a/tests/queries/0_stateless/01572_kill_window_function.sh b/tests/queries/0_stateless/01572_kill_window_function.sh
new file mode 100755
index 00000000000..7103b7f7210
--- /dev/null
+++ b/tests/queries/0_stateless/01572_kill_window_function.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e -o pipefail
+
+# Run a test query that takes very long to run.
+query_id="01572_kill_window_function-$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT --query_id="$query_id" --query "SELECT count(1048575) OVER (PARTITION BY intDiv(NULL, number) ORDER BY number DESC NULLS FIRST ROWS BETWEEN CURRENT ROW AND 1048575 FOLLOWING) FROM numbers(255, 1048575)" >/dev/null 2>&1 &
+client_pid=$!
+echo Started
+
+# Use one query to both kill the test query and verify that it has started,
+# because if we try to kill it before it starts, the test will fail.
+while [ -z "$($CLICKHOUSE_CLIENT --query "kill query where query_id = '$query_id' and current_database = currentDatabase()")" ]
+do
+    # If we don't yet see the query in the process list, the client should still
+    # be running. The query is very long.
+    kill -0 -- $client_pid
+    sleep 1
+done
+echo Sent kill request
+
+# Wait for the client to terminate.
+client_exit_code=0
+wait $client_pid || client_exit_code=$?
+
+echo "Exit $client_exit_code"
+
+# We have tested for Ctrl+C.
+# The following client flags don't cancel, but should: --max_execution_time,
+# --receive_timeout. Probably needs asynchonous calculation of query limits, as
+# discussed with Nikolay on TG: https://t.me/c/1214350934/21492
+
diff --git a/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql b/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
index 0dc402715c3..2cf9ce661b6 100644
--- a/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
+++ b/tests/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_dict;
 
 CREATE DATABASE database_for_dict;
diff --git a/tests/queries/0_stateless/01576_alias_column_rewrite.reference b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
index c9a4c04b352..07d361cfa46 100644
--- a/tests/queries/0_stateless/01576_alias_column_rewrite.reference
+++ b/tests/queries/0_stateless/01576_alias_column_rewrite.reference
@@ -22,22 +22,20 @@ lambda
 1
 optimize_read_in_order
 Expression (Projection)
-  Limit (preliminary LIMIT)
-    MergingSorted (Merge sorted streams for ORDER BY)
-      MergeSorting (Merge sorted blocks for ORDER BY)
-        PartialSorting (Sort each block for ORDER BY)
-          Expression (Before ORDER BY)
-            SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromMergeTree
-Expression (Projection)
-  Limit (preliminary LIMIT)
-    FinishSorting
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting (Sorting for ORDER BY)
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromMergeTree
 Expression (Projection)
-  Limit (preliminary LIMIT)
-    FinishSorting
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting
+      Expression (Before ORDER BY)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromMergeTree
+Expression (Projection)
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           ReadFromMergeTree
diff --git a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated.reference b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01581_deduplicate_by_columns_replicated.reference
rename to tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.reference
diff --git a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated.sql b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
similarity index 91%
rename from tests/queries/0_stateless/01581_deduplicate_by_columns_replicated.sql
rename to tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
index 9779dca90a2..87eec36a596 100644
--- a/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated.sql
+++ b/tests/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, replica
+
 --- See also tests/queries/0_stateless/01581_deduplicate_by_columns_local.sql
 
 --- replicated case
@@ -11,11 +13,11 @@ SET replication_alter_partitions_sync = 2;
 -- IRL insert_replica_id were filled from hostname
 CREATE TABLE IF NOT EXISTS replicated_deduplicate_by_columns_r1 (
     id Int32, val UInt32, unique_value UInt64 MATERIALIZED rowNumberInBlock()
-) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01581/replicated_deduplicate', 'r1') ORDER BY id;
+) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_01581/replicated_deduplicate', 'r1') ORDER BY id;
 
 CREATE TABLE IF NOT EXISTS replicated_deduplicate_by_columns_r2 (
     id Int32, val UInt32, unique_value UInt64 MATERIALIZED rowNumberInBlock()
-) ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_01581/replicated_deduplicate', 'r2') ORDER BY id;
+) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_01581/replicated_deduplicate', 'r2') ORDER BY id;
 
 
 -- insert some data, 2 records: (3, 1003), (4, 1004) are duplicated and have difference in unique_value / insert_replica_id
diff --git a/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql b/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
index 4d58e51d690..648eb14f507 100644
--- a/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
+++ b/tests/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS realtimedrep;
 DROP TABLE IF EXISTS realtimedistributed;
 DROP TABLE IF EXISTS realtimebuff;
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in.sql b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
index 8f89fc1a57b..a0a5b90ac1f 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql b/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
index 72f12ce435a..6129c92c888 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
index 73245fe49ec..e52e0c94c3c 100644
--- a/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
+++ b/tests/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
@@ -1,3 +1,5 @@
+-- Tags: replica
+
 DROP TABLE IF EXISTS replicated_mutations_empty_partitions;
 
 CREATE TABLE replicated_mutations_empty_partitions
diff --git a/tests/queries/0_stateless/01591_window_functions.reference b/tests/queries/0_stateless/01591_window_functions.reference
index 26e9e500c3c..07562557369 100644
--- a/tests/queries/0_stateless/01591_window_functions.reference
+++ b/tests/queries/0_stateless/01591_window_functions.reference
@@ -908,12 +908,10 @@ Expression ((Projection + Before ORDER BY))
   Window (Window step for window \'\')
     Window (Window step for window \'PARTITION BY p\')
       Window (Window step for window \'PARTITION BY p ORDER BY o ASC\')
-        MergingSorted (Merge sorted streams for window \'PARTITION BY p ORDER BY o ASC\')
-          MergeSorting (Merge sorted blocks for window \'PARTITION BY p ORDER BY o ASC\')
-            PartialSorting (Sort each block for window \'PARTITION BY p ORDER BY o ASC\')
-              Expression ((Before window functions + (Projection + Before ORDER BY)))
-                SettingQuotaAndLimits (Set limits and quota after reading from storage)
-                  ReadFromStorage (SystemNumbers)
+        Sorting (Sorting for window \'PARTITION BY p ORDER BY o ASC\')
+          Expression ((Before window functions + (Projection + Before ORDER BY)))
+            SettingQuotaAndLimits (Set limits and quota after reading from storage)
+              ReadFromStorage (SystemNumbers)
 explain select
     count(*) over (order by o, number),
     count(*) over (order by number)
@@ -923,16 +921,12 @@ from
 ;
 Expression ((Projection + Before ORDER BY))
   Window (Window step for window \'ORDER BY o ASC, number ASC\')
-    MergingSorted (Merge sorted streams for window \'ORDER BY o ASC, number ASC\')
-      MergeSorting (Merge sorted blocks for window \'ORDER BY o ASC, number ASC\')
-        PartialSorting (Sort each block for window \'ORDER BY o ASC, number ASC\')
-          Window (Window step for window \'ORDER BY number ASC\')
-            MergingSorted (Merge sorted streams for window \'ORDER BY number ASC\')
-              MergeSorting (Merge sorted blocks for window \'ORDER BY number ASC\')
-                PartialSorting (Sort each block for window \'ORDER BY number ASC\')
-                  Expression ((Before window functions + (Projection + Before ORDER BY)))
-                    SettingQuotaAndLimits (Set limits and quota after reading from storage)
-                      ReadFromStorage (SystemNumbers)
+    Sorting (Sorting for window \'ORDER BY o ASC, number ASC\')
+      Window (Window step for window \'ORDER BY number ASC\')
+        Sorting (Sorting for window \'ORDER BY number ASC\')
+          Expression ((Before window functions + (Projection + Before ORDER BY)))
+            SettingQuotaAndLimits (Set limits and quota after reading from storage)
+              ReadFromStorage (SystemNumbers)
 -- A test case for the sort comparator found by fuzzer.
 SELECT
     max(number) OVER (ORDER BY number DESC NULLS FIRST),
@@ -1094,62 +1088,24 @@ order by number
 7	6	8
 8	7	9
 9	8	9
--- nth_value without specific frame range given
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number)
-order by number
-;
-0	0	0	0	0
-1	0	1	0	0
-2	0	1	2	0
-3	0	1	2	3
-4	0	1	2	3
-5	0	1	2	3
-6	0	1	2	3
-7	0	1	2	3
-8	0	1	2	3
-9	0	1	2	3
--- nth_value with frame range specified
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number range between 1 preceding and 1 following)
-order by number
-;
-0	0	1	0	0
-1	0	1	2	0
-2	1	2	3	0
-3	2	3	4	0
-4	3	4	5	0
-5	4	5	6	0
-6	5	6	7	0
-7	6	7	8	0
-8	7	8	9	0
-9	8	9	0	0
--- to make nth_value return null for out-of-frame rows, cast the argument to
--- Nullable; otherwise, it returns default values.
-SELECT
-    number,
-    nth_value(toNullable(number), 1) OVER w as firstValue,
-    nth_value(toNullable(number), 3) OVER w as thridValue
-FROM numbers(5)
-WINDOW w AS (ORDER BY number ASC)
-;
-0	0	\N
-1	0	\N
-2	0	2
-3	0	2
-4	0	2
+-- lagInFrame UBsan
+SELECT lagInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, 0) OVER ();
+1
+SELECT lagInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+0
+SELECT lagInFrame(1, 1) OVER ();
+0
+-- leadInFrame UBsan
+SELECT leadInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, 0) OVER ();
+1
+SELECT leadInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+0
+SELECT leadInFrame(1, 1) OVER ();
+0
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
 select count() over () from numbers(4) where number < 2;
diff --git a/tests/queries/0_stateless/01591_window_functions.sql b/tests/queries/0_stateless/01591_window_functions.sql
index 3075c1ddb46..aa9bd9795e7 100644
--- a/tests/queries/0_stateless/01591_window_functions.sql
+++ b/tests/queries/0_stateless/01591_window_functions.sql
@@ -401,40 +401,20 @@ window w as (order by number range between 1 preceding and 1 following)
 order by number
 ;
 
--- nth_value without specific frame range given
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number)
-order by number
-;
+-- lagInFrame UBsan
+SELECT lagInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, 0) OVER ();
+SELECT lagInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT lagInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT lagInFrame(1, 1) OVER ();
 
--- nth_value with frame range specified
-select
-    number,
-    nth_value(number, 1) over w as firstValue,
-    nth_value(number, 2) over w as secondValue,
-    nth_value(number, 3) over w as thirdValue,
-    nth_value(number, 4) over w as fourthValue
-from numbers(10)
-window w as (order by number range between 1 preceding and 1 following)
-order by number
-;
+-- leadInFrame UBsan
+SELECT leadInFrame(1, -1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, 0) OVER ();
+SELECT leadInFrame(1, /* INT64_MAX+1 */ 0x7fffffffffffffff+1) OVER (); -- { serverError BAD_ARGUMENTS }
+SELECT leadInFrame(1, /* INT64_MAX */ 0x7fffffffffffffff) OVER ();
+SELECT leadInFrame(1, 1) OVER ();
 
--- to make nth_value return null for out-of-frame rows, cast the argument to
--- Nullable; otherwise, it returns default values.
-SELECT
-    number,
-    nth_value(toNullable(number), 1) OVER w as firstValue,
-    nth_value(toNullable(number), 3) OVER w as thridValue
-FROM numbers(5)
-WINDOW w AS (ORDER BY number ASC)
-;
-    
 -- In this case, we had a problem with PartialSortingTransform returning zero-row
 -- chunks for input chunks w/o columns.
 select count() over () from numbers(4) where number < 2;
diff --git a/tests/queries/0_stateless/01592_long_window_functions1.sql b/tests/queries/0_stateless/01592_long_window_functions1.sql
index 14fe3affed3..4911b7aa792 100644
--- a/tests/queries/0_stateless/01592_long_window_functions1.sql
+++ b/tests/queries/0_stateless/01592_long_window_functions1.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists stack;
 
 set max_insert_threads = 4;
diff --git a/tests/queries/0_stateless/01592_window_functions.reference b/tests/queries/0_stateless/01592_window_functions.reference
index 8ca5086821b..ec957dd7a02 100644
--- a/tests/queries/0_stateless/01592_window_functions.reference
+++ b/tests/queries/0_stateless/01592_window_functions.reference
@@ -1,81 +1,81 @@
 ---- Q1 ----
-Dell Vostro	800.00	Laptop	850
-HP Elite	1200.00	Laptop	850
-Lenovo Thinkpad	700.00	Laptop	850
-Sony VAIO	700.00	Laptop	850
-HTC One	400.00	Smartphone	500
-Microsoft Lumia	200.00	Smartphone	500
-Nexus	500.00	Smartphone	500
-iPhone	900.00	Smartphone	500
-Kindle Fire	150.00	Tablet	350
-Samsung Galaxy Tab	200.00	Tablet	350
-iPad	700.00	Tablet	350
+Dell Vostro	800	Laptop	850
+HP Elite	1200	Laptop	850
+Lenovo Thinkpad	700	Laptop	850
+Sony VAIO	700	Laptop	850
+HTC One	400	Smartphone	500
+Microsoft Lumia	200	Smartphone	500
+Nexus	500	Smartphone	500
+iPhone	900	Smartphone	500
+Kindle Fire	150	Tablet	350
+Samsung Galaxy Tab	200	Tablet	350
+iPad	700	Tablet	350
 ---- Q2 ----
-Lenovo Thinkpad	Laptop	700.00	1
-Sony VAIO	Laptop	700.00	1
-Dell Vostro	Laptop	800.00	3
-HP Elite	Laptop	1200.00	4
-Microsoft Lumia	Smartphone	200.00	1
-HTC One	Smartphone	400.00	2
-Nexus	Smartphone	500.00	3
-iPhone	Smartphone	900.00	4
-Kindle Fire	Tablet	150.00	1
-Samsung Galaxy Tab	Tablet	200.00	2
-iPad	Tablet	700.00	3
+Lenovo Thinkpad	Laptop	700	1
+Sony VAIO	Laptop	700	1
+Dell Vostro	Laptop	800	3
+HP Elite	Laptop	1200	4
+Microsoft Lumia	Smartphone	200	1
+HTC One	Smartphone	400	2
+Nexus	Smartphone	500	3
+iPhone	Smartphone	900	4
+Kindle Fire	Tablet	150	1
+Samsung Galaxy Tab	Tablet	200	2
+iPad	Tablet	700	3
 ---- Q3 ----
-HP Elite	Laptop	1200.00	1
-Dell Vostro	Laptop	800.00	2
-Lenovo Thinkpad	Laptop	700.00	3
-Sony VAIO	Laptop	700.00	4
-iPhone	Smartphone	900.00	1
-Nexus	Smartphone	500.00	2
-HTC One	Smartphone	400.00	3
-Microsoft Lumia	Smartphone	200.00	4
-iPad	Tablet	700.00	1
-Samsung Galaxy Tab	Tablet	200.00	2
-Kindle Fire	Tablet	150.00	3
+HP Elite	Laptop	1200	1
+Dell Vostro	Laptop	800	2
+Lenovo Thinkpad	Laptop	700	3
+Sony VAIO	Laptop	700	4
+iPhone	Smartphone	900	1
+Nexus	Smartphone	500	2
+HTC One	Smartphone	400	3
+Microsoft Lumia	Smartphone	200	4
+iPad	Tablet	700	1
+Samsung Galaxy Tab	Tablet	200	2
+Kindle Fire	Tablet	150	3
 ---- Q4 ----
-Lenovo Thinkpad	Laptop	700.00	700.00	1
-Sony VAIO	Laptop	700.00	700.00	1
-Dell Vostro	Laptop	800.00	700.00	2
-HP Elite	Laptop	1200.00	700.00	3
-Microsoft Lumia	Smartphone	200.00	200.00	1
-HTC One	Smartphone	400.00	200.00	2
-Nexus	Smartphone	500.00	200.00	3
-iPhone	Smartphone	900.00	200.00	4
+Lenovo Thinkpad	Laptop	700	700	1
+Sony VAIO	Laptop	700	700	1
+Dell Vostro	Laptop	800	700	2
+HP Elite	Laptop	1200	700	3
+Microsoft Lumia	Smartphone	200	200	1
+HTC One	Smartphone	400	200	2
+Nexus	Smartphone	500	200	3
+iPhone	Smartphone	900	200	4
 ---- Q5 ----
-Sony VAIO	Laptop	700.00	700.00
-Lenovo Thinkpad	Laptop	700.00	700.00
-HP Elite	Laptop	1200.00	700.00
-Dell Vostro	Laptop	800.00	700.00
-iPhone	Smartphone	900.00	900.00
-Nexus	Smartphone	500.00	900.00
-Microsoft Lumia	Smartphone	200.00	900.00
-HTC One	Smartphone	400.00	900.00
-iPad	Tablet	700.00	700.00
-Samsung Galaxy Tab	Tablet	200.00	700.00
-Kindle Fire	Tablet	150.00	700.00
+Sony VAIO	Laptop	700	700
+Lenovo Thinkpad	Laptop	700	700
+HP Elite	Laptop	1200	700
+Dell Vostro	Laptop	800	700
+iPhone	Smartphone	900	900
+Nexus	Smartphone	500	900
+Microsoft Lumia	Smartphone	200	900
+HTC One	Smartphone	400	900
+iPad	Tablet	700	700
+Samsung Galaxy Tab	Tablet	200	700
+Kindle Fire	Tablet	150	700
 ---- Q6 ----
-Dell Vostro	Laptop	800.00	1200.00
-HP Elite	Laptop	1200.00	1200.00
-Lenovo Thinkpad	Laptop	700.00	1200.00
-Sony VAIO	Laptop	700.00	1200.00
-HTC One	Smartphone	400.00	900.00
-Microsoft Lumia	Smartphone	200.00	900.00
-Nexus	Smartphone	500.00	900.00
-iPhone	Smartphone	900.00	900.00
-Kindle Fire	Tablet	150.00	700.00
-Samsung Galaxy Tab	Tablet	200.00	700.00
-iPad	Tablet	700.00	700.00
+Dell Vostro	Laptop	800	1200
+HP Elite	Laptop	1200	1200
+Lenovo Thinkpad	Laptop	700	1200
+Sony VAIO	Laptop	700	1200
+HTC One	Smartphone	400	900
+Microsoft Lumia	Smartphone	200	900
+Nexus	Smartphone	500	900
+iPhone	Smartphone	900	900
+Kindle Fire	Tablet	150	700
+Samsung Galaxy Tab	Tablet	200	700
+iPad	Tablet	700	700
 ---- Q7 ----
-Dell Vostro	800.00	Laptop	733	850
-HP Elite	1200.00	Laptop	850	850
-Lenovo Thinkpad	700.00	Laptop	700	850
-Sony VAIO	700.00	Laptop	700	850
-HTC One	400.00	Smartphone	300	500
-Microsoft Lumia	200.00	Smartphone	200	500
-Nexus	500.00	Smartphone	367	500
-iPhone	900.00	Smartphone	500	500
-Kindle Fire	150.00	Tablet	150	350
-Samsung Galaxy Tab	200.00	Tablet	175	350
-iPad	700.00	Tablet	350	350
+Dell Vostro	800	Laptop	733	850
+HP Elite	1200	Laptop	850	850
+Lenovo Thinkpad	700	Laptop	700	850
+Sony VAIO	700	Laptop	700	850
+HTC One	400	Smartphone	300	500
+Microsoft Lumia	200	Smartphone	200	500
+Nexus	500	Smartphone	367	500
+iPhone	900	Smartphone	500	500
+Kindle Fire	150	Tablet	150	350
+Samsung Galaxy Tab	200	Tablet	175	350
+iPad	700	Tablet	350	350
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
index d40406222c2..bc0b92eb55b 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
index f7c65e36be4..c68053e8270 100644
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
@@ -14,3 +14,5 @@ CREATE TABLE default.concurrent_kill_4\n(\n    `key` UInt64,\n    `value` Int64\
 Metadata version on replica 5 equal with first replica, OK
 CREATE TABLE default.concurrent_kill_5\n(\n    `key` UInt64,\n    `value` Int64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/01593_concurrent_alter_mutations_kill_many_replicas_long_default/{shard}\', \'{replica}5\')\nORDER BY key\nSETTINGS max_replicated_mutations_in_queue = 1000, number_of_free_entries_in_pool_to_execute_mutation = 0, max_replicated_merges_in_queue = 1000, index_granularity = 8192
 499999500000
+Replication did not hang: synced all replicas of concurrent_kill_
+Consistency: 1
diff --git a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
index e263750c431..f8f3ccd6dd6 100755
--- a/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
+++ b/tests/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+# Tags: long, replica, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 REPLICAS=5
 
@@ -59,10 +62,6 @@ timeout $TIMEOUT bash -c kill_mutation_thread 2> /dev/null &
 
 wait
 
-for i in $(seq $REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA concurrent_kill_$i"
-done
-
 # with timeout alter query can be not finished yet, so to execute new alter
 # we use retries
 counter=0
@@ -80,7 +79,7 @@ while true; do
 done
 
 
-metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/r1$i/' and name = 'metadata_version'")
+metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/r11/' and name = 'metadata_version'")
 for i in $(seq $REPLICAS); do
     replica_metadata_version=$($CLICKHOUSE_CLIENT --query "SELECT value FROM system.zookeeper WHERE path = '/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/s1/replicas/r1$i/' and name = 'metadata_version'")
 
@@ -95,6 +94,8 @@ done
 
 $CLICKHOUSE_CLIENT --query "SELECT sum(value) FROM concurrent_kill_1"
 
+check_replication_consistency "concurrent_kill_" "count(), sum(key), sum(cityHash64(value))"
+
 for i in $(seq $REPLICAS); do
     $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS concurrent_kill_$i"
 done
diff --git a/tests/queries/0_stateless/01594_too_low_memory_limits.config.xml b/tests/queries/0_stateless/01594_too_low_memory_limits.config.xml
index 2d0a480a375..0c286bfbd21 100644
--- a/tests/queries/0_stateless/01594_too_low_memory_limits.config.xml
+++ b/tests/queries/0_stateless/01594_too_low_memory_limits.config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -32,4 +32,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/queries/0_stateless/01594_too_low_memory_limits.sh b/tests/queries/0_stateless/01594_too_low_memory_limits.sh
index 6a33bd81dd1..b513a947bd9 100755
--- a/tests/queries/0_stateless/01594_too_low_memory_limits.sh
+++ b/tests/queries/0_stateless/01594_too_low_memory_limits.sh
@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-parallel, no-fasttest
+# Tag no-tsan: requires jemalloc to track small allocations
+# Tag no-asan: requires jemalloc to track small allocations
+# Tag no-ubsan: requires jemalloc to track small allocations
+# Tag no-msan: requires jemalloc to track small allocations
 
 #
 # Regression for INSERT SELECT, that abnormally terminates the server
diff --git a/tests/queries/0_stateless/01598_memory_limit_zeros.sql b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
index a07ce0bcca3..5b321687e43 100644
--- a/tests/queries/0_stateless/01598_memory_limit_zeros.sql
+++ b/tests/queries/0_stateless/01598_memory_limit_zeros.sql
@@ -1,2 +1,4 @@
-SET max_memory_usage = 1, max_untracked_memory = 1000000;
+-- Tags: no-parallel, no-fasttest
+
+SET max_memory_usage = 1, max_untracked_memory = 1000000, max_threads=40;
 select 'test', count(*) from zeros_mt(1000000) where not ignore(zero); -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01600_detach_permanently.sh b/tests/queries/0_stateless/01600_detach_permanently.sh
index 087545ec378..949fe0e6ea2 100755
--- a/tests/queries/0_stateless/01600_detach_permanently.sh
+++ b/tests/queries/0_stateless/01600_detach_permanently.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -14,7 +15,7 @@ mkdir -p "${WORKING_FOLDER_01600}"
 clickhouse_local() {
     local query="$1"
     shift
-    ${CLICKHOUSE_LOCAL} --query "$query" "$@" -- --path="${WORKING_FOLDER_01600}"
+    ${CLICKHOUSE_LOCAL} --query "$query" "$@" --path="${WORKING_FOLDER_01600}"
 }
 
 test_detach_attach_sequence() {
diff --git a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
index 6f0f1c29208..46fea5001a1 100755
--- a/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
+++ b/tests/queries/0_stateless/01600_log_queries_with_extensive_info.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -ue
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
index 9eb4221d063..ae296e18560 100644
--- a/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
+++ b/tests/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop database if exists test_01600;
 create database test_01600;
 
diff --git a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
index 634cb403f85..9c0d28fdd91 100755
--- a/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_states_metrics_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
index 67d2c0c306d..6e4ccbdd325 100755
--- a/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
+++ b/tests/queries/0_stateless/01600_parts_types_metrics_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh b/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh
index 97e4da5f9e3..1d768c8b027 100755
--- a/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh
+++ b/tests/queries/0_stateless/01600_quota_by_forwarded_ip.sh
@@ -21,7 +21,9 @@ CREATE QUOTA quota_by_forwarded_ip_${CLICKHOUSE_DATABASE} KEYED BY forwarded_ip_
 
 echo '--- Test with quota by immediate IP ---'
 
-while true; do
+i=0 retries=300
+while [[ $i -lt $retries ]]; do
+    ((++i))
     ${CLICKHOUSE_CURL} --fail -sS "${CLICKHOUSE_URL}&user=quoted_by_ip_${CLICKHOUSE_DATABASE}" -d "SELECT count() FROM numbers(10)" 2>/dev/null || break
 done | uniq
 
@@ -33,14 +35,18 @@ ${CLICKHOUSE_CURL} -H 'X-Forwarded-For: 1.2.3.4' -sS "${CLICKHOUSE_URL}&user=quo
 
 echo '--- Test with quota by forwarded IP ---'
 
-while true; do
+i=0 retries=300
+while [[ $i -lt $retries ]]; do
+    ((++i))
     ${CLICKHOUSE_CURL} --fail -sS "${CLICKHOUSE_URL}&user=quoted_by_forwarded_ip_${CLICKHOUSE_DATABASE}" -d "SELECT count() FROM numbers(10)" 2>/dev/null || break
 done | uniq
 
 ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&user=quoted_by_forwarded_ip_${CLICKHOUSE_DATABASE}" -d "SELECT count() FROM numbers(10)" | grep -oF 'exceeded'
 
+i=0 retries=300
 # X-Forwarded-For is respected for quota by forwarded IP address
-while true; do
+while [[ $i -lt $retries ]]; do
+    ((++i))
     ${CLICKHOUSE_CURL} -H 'X-Forwarded-For: 1.2.3.4' -sS "${CLICKHOUSE_URL}&user=quoted_by_forwarded_ip_${CLICKHOUSE_DATABASE}" -d "SELECT count() FROM numbers(10)" | grep -oP '^10$' || break
 done | uniq
 
diff --git a/tests/queries/0_stateless/01601_accurate_cast.reference b/tests/queries/0_stateless/01601_accurate_cast.reference
index 6ccedbdcfea..c1e7feffbe6 100644
--- a/tests/queries/0_stateless/01601_accurate_cast.reference
+++ b/tests/queries/0_stateless/01601_accurate_cast.reference
@@ -4,5 +4,5 @@
 5
 5
 5
-1.000000000
+1
 12
diff --git a/tests/queries/0_stateless/01601_custom_tld.reference b/tests/queries/0_stateless/01601_custom_tld.reference
index 04204ebf02a..ee326a77834 100644
--- a/tests/queries/0_stateless/01601_custom_tld.reference
+++ b/tests/queries/0_stateless/01601_custom_tld.reference
@@ -28,3 +28,7 @@ foo
 -- vector
 xx.blogspot.co.at
 
+-- no new line
+foo.bar
+a.foo.bar
+foo.baz
diff --git a/tests/queries/0_stateless/01601_custom_tld.sql b/tests/queries/0_stateless/01601_custom_tld.sql
index ceb00d5ff19..92ce28828f8 100644
--- a/tests/queries/0_stateless/01601_custom_tld.sql
+++ b/tests/queries/0_stateless/01601_custom_tld.sql
@@ -37,3 +37,8 @@ select cutToFirstSignificantSubdomainCustom('http://www.foo', 'public_suffix_lis
 select '-- vector';
 select cutToFirstSignificantSubdomainCustom('http://xx.blogspot.co.at/' || toString(number), 'public_suffix_list') from numbers(1);
 select cutToFirstSignificantSubdomainCustom('there-is-no-such-domain' || toString(number), 'public_suffix_list') from numbers(1);
+
+select '-- no new line';
+select cutToFirstSignificantSubdomainCustom('foo.bar', 'no_new_line_list');
+select cutToFirstSignificantSubdomainCustom('a.foo.bar', 'no_new_line_list');
+select cutToFirstSignificantSubdomainCustom('a.foo.baz', 'no_new_line_list');
diff --git a/tests/queries/0_stateless/01601_detach_permanently.sql b/tests/queries/0_stateless/01601_detach_permanently.sql
index 3af8ed573ef..97797a59af5 100644
--- a/tests/queries/0_stateless/01601_detach_permanently.sql
+++ b/tests/queries/0_stateless/01601_detach_permanently.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'database atomic tests';
 
 DROP DATABASE IF EXISTS test1601_detach_permanently_atomic;
@@ -129,7 +131,7 @@ SELECT 'And detach permanently again to check how database drop will behave';
 DETACH table test1601_detach_permanently_ordinary.test_name_reuse PERMANENTLY;
 
 SELECT 'DROP database - Directory not empty error, but database detached';
-DROP DATABASE test1601_detach_permanently_ordinary; -- { serverError 1001 }
+DROP DATABASE test1601_detach_permanently_ordinary; -- { serverError 219 }
 
 ATTACH DATABASE test1601_detach_permanently_ordinary;
 
@@ -203,7 +205,7 @@ SELECT 'And detach permanently again to check how database drop will behave';
 DETACH table test1601_detach_permanently_lazy.test_name_reuse PERMANENTLY;
 
 SELECT 'DROP database - Directory not empty error, but database deteched';
-DROP DATABASE test1601_detach_permanently_lazy; -- { serverError 1001 }
+DROP DATABASE test1601_detach_permanently_lazy; -- { serverError 219 }
 
 ATTACH DATABASE test1601_detach_permanently_lazy;
 
diff --git a/tests/queries/0_stateless/01601_proxy_protocol.sh b/tests/queries/0_stateless/01601_proxy_protocol.sh
index e8d1a7c45b2..5f4ec6cc597 100755
--- a/tests/queries/0_stateless/01601_proxy_protocol.sh
+++ b/tests/queries/0_stateless/01601_proxy_protocol.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: nc - command not found
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01602_array_aggregation.reference b/tests/queries/0_stateless/01602_array_aggregation.reference
index 4baef982f29..bc21fae692e 100644
--- a/tests/queries/0_stateless/01602_array_aggregation.reference
+++ b/tests/queries/0_stateless/01602_array_aggregation.reference
@@ -19,17 +19,17 @@ Table array int avg
 0
 2
 Table array decimal min
-1.00000000
-0.00000000
-1.00000000
+1
+0
+1
 Table array decimal max
-6.00000000
-0.00000000
-3.00000000
+6
+0
+3
 Table array decimal sum
-21.00000000
-0.00000000
-6.00000000
+21
+0
+6
 Table array decimal avg
 3.5
 0
diff --git a/tests/queries/0_stateless/01602_max_distributed_connections.sh b/tests/queries/0_stateless/01602_max_distributed_connections.sh
index 772acb39344..ed835a8768f 100755
--- a/tests/queries/0_stateless/01602_max_distributed_connections.sh
+++ b/tests/queries/0_stateless/01602_max_distributed_connections.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -12,14 +13,18 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # If concurrency is 10 (good), the query may take less than 10 second with non-zero probability
 #  and the following loops will finish with probability 1 assuming independent random variables.
 
-while true; do
+i=0 retries=30
+while [[ $i -lt $retries ]]; do
     timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
         SELECT sleep(1.5) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=0 && break
+    ((++i))
 done
 
-while true; do
+i=0 retries=30
+while [[ $i -lt $retries ]]; do
     timeout 10 ${CLICKHOUSE_CLIENT} --max_threads 1 --max_distributed_connections 10 --query "
         SELECT sleep(1.5) FROM remote('127.{1..10}', system.one) FORMAT Null" --prefer_localhost_replica=1 && break
+    ((++i))
 done
 
 # If max_distributed_connections is low and async_socket_for_remote is disabled,
diff --git a/tests/queries/0_stateless/01602_show_create_view.sql b/tests/queries/0_stateless/01602_show_create_view.sql
index fd5bf70d470..11b9c235290 100644
--- a/tests/queries/0_stateless/01602_show_create_view.sql
+++ b/tests/queries/0_stateless/01602_show_create_view.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_1602;
 
 CREATE DATABASE test_1602;
diff --git a/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference b/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference
index 5b321d6c87a..4ab84e129fe 100644
--- a/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference
+++ b/tests/queries/0_stateless/01602_temporary_table_in_system_tables.reference
@@ -1,8 +1,8 @@
 	test_01602a	CREATE TEMPORARY TABLE test_01602a (`x` UInt32) ENGINE = Memory	Memory	Memory	1
 	test_01602b	CREATE TEMPORARY TABLE test_01602b (`y` Float64, `z` String) ENGINE = Memory	Memory	Memory	1
-	test_01602a	x	UInt32	1			0	0	0		0	0	0	0	
-	test_01602b	y	Float64	1			0	0	0		0	0	0	0	
-	test_01602b	z	String	2			0	0	0		0	0	0	0	
+	test_01602a	x	UInt32	1			0	0	0		0	0	0	0		\N	32	2	0	\N
+	test_01602b	y	Float64	1			0	0	0		0	0	0	0		\N	\N	\N	\N	\N
+	test_01602b	z	String	2			0	0	0		0	0	0	0		\N	\N	\N	\N	\N
 CREATE TEMPORARY TABLE test_01602a\n(\n    `x` UInt32\n)\nENGINE = Memory
 CREATE TEMPORARY TABLE test_01602b\n(\n    `y` Float64,\n    `z` String\n)\nENGINE = Memory
 0
diff --git a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
index e80d657fdb4..0c8f80f2b63 100644
--- a/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
+++ b/tests/queries/0_stateless/01603_read_with_backoff_bug.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan
+-- Tag no-tsan: Too long for TSan
+
 drop table if exists t;
 
 create table t (x UInt64, s String) engine = MergeTree order by x;
diff --git a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
index c857e08b243..82f9996991f 100644
--- a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
+++ b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP database IF EXISTS test_1603_rename_bug_ordinary;
 create database test_1603_rename_bug_ordinary engine=Ordinary;
 create table test_1603_rename_bug_ordinary.foo engine=Memory as select * from numbers(100);
diff --git a/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference b/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
index 63f00b6f9c5..3c92ffb0a8c 100644
--- a/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
+++ b/tests/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
@@ -1,6 +1,6 @@
 AlterQuery  t1 (children 1)
  ExpressionList (children 1)
-  AlterCommand 31 (children 1)
+  AlterCommand 33 (children 1)
    Function equals (children 1)
     ExpressionList (children 2)
      Identifier date
diff --git a/tests/queries/0_stateless/01610_client_spawn_editor.sh b/tests/queries/0_stateless/01610_client_spawn_editor.sh
index b372d82847c..873b45e12a9 100755
--- a/tests/queries/0_stateless/01610_client_spawn_editor.sh
+++ b/tests/queries/0_stateless/01610_client_spawn_editor.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01611_constant_folding_subqueries.reference b/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
index 6128cd109e2..c3df2314112 100644
--- a/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
+++ b/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
@@ -5,7 +5,7 @@ SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) FO
 1,10
 EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
 SELECT
-    identity(CAST(0, \'Nullable(UInt64)\')) AS n,
+    identity(_CAST(0, \'Nullable(UInt64)\')) AS n,
     toUInt64(10 / n)
 SELECT * FROM (WITH (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) as q SELECT * FROM system.one WHERE q > 0);
 0
diff --git a/tests/queries/0_stateless/01615_random_one_shard_insertion.sql b/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
index 59412adbdbf..e205a358db1 100644
--- a/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
+++ b/tests/queries/0_stateless/01615_random_one_shard_insertion.sql
@@ -1,3 +1,5 @@
+-- Tags: shard, no-parallel
+
 create database if not exists shard_0;
 create database if not exists shard_1;
 drop table if exists shard_0.tbl;
diff --git a/tests/queries/0_stateless/01622_byte_size.reference b/tests/queries/0_stateless/01622_byte_size.reference
index cae5bc94f9e..580a36a5c68 100644
--- a/tests/queries/0_stateless/01622_byte_size.reference
+++ b/tests/queries/0_stateless/01622_byte_size.reference
@@ -25,11 +25,11 @@ constants: 		9	a	10	abcde	14
 
 byteSize for simple array
 1	60	[]	8	[]	8	[]	8	[]	8	[]	8	[]	8	[]	8
-2	92	[1]	9	[-1]	9	[256]	12	[1.1]	12	[1.1000]	12	['2020-01-01']	10	['61f0c404-5cb3-11e7-907b-a6006ad3dba0']	24
-3	124	[1,1]	10	[-1,-1]	10	[256,256]	16	[1.1,1.1]	16	[1.1000,1.1000]	16	['2020-01-01','2020-01-01']	12	['61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0']	40
-4	156	[1,1,1]	11	[-1,-1,-1]	11	[256,256,256]	20	[1.1,1.1,1.1]	20	[1.1000,1.1000,1.1000]	20	['2020-01-01','2020-01-01','2020-01-01']	14	['61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0']	56
+2	92	[1]	9	[-1]	9	[256]	12	[1.1]	12	[1.1]	12	['2020-01-01']	10	['61f0c404-5cb3-11e7-907b-a6006ad3dba0']	24
+3	124	[1,1]	10	[-1,-1]	10	[256,256]	16	[1.1,1.1]	16	[1.1,1.1]	16	['2020-01-01','2020-01-01']	12	['61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0']	40
+4	156	[1,1,1]	11	[-1,-1,-1]	11	[256,256,256]	20	[1.1,1.1,1.1]	20	[1.1,1.1,1.1]	20	['2020-01-01','2020-01-01','2020-01-01']	14	['61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0']	56
 constants:	[]	8	[1,1]	10	[-1,-1]	10	Array(UInt16)	12	Array(Float64)	24
-constants:	[1.1000,1.1000]	16	['2020-01-01','2020-01-01']	12
+constants:	[1.1,1.1]	16	['2020-01-01','2020-01-01']	12
 constants:	['61f0c404-5cb3-11e7-907b-a6006ad3dba0','61f0c404-5cb3-11e7-907b-a6006ad3dba0']	40
 
 byteSize for int array of arrays
diff --git a/tests/queries/0_stateless/01622_codec_zstd_long.sql b/tests/queries/0_stateless/01622_codec_zstd_long.sql
index 7045699d73f..ddfa9952f2d 100644
--- a/tests/queries/0_stateless/01622_codec_zstd_long.sql
+++ b/tests/queries/0_stateless/01622_codec_zstd_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS zstd_1_00;
 DROP TABLE IF EXISTS zstd_1_24;
 DROP TABLE IF EXISTS zstd_9_00;
diff --git a/tests/queries/0_stateless/01622_defaults_for_url_engine.sh b/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
index 491a1bd8988..0a93a3ef479 100755
--- a/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
+++ b/tests/queries/0_stateless/01622_defaults_for_url_engine.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: nc - command not found
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.reference b/tests/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.reference
index b8cf9277350..3045308f844 100644
--- a/tests/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.reference
+++ b/tests/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.reference
@@ -1,2 +1,2 @@
-42.10
+42.1
 \N
diff --git a/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql b/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
index 7fb81efaac8..f38b1da29e4 100644
--- a/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
+++ b/tests/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 
diff --git a/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql b/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
index b0a674b8389..8bf370b13d7 100644
--- a/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
+++ b/tests/queries/0_stateless/01640_distributed_async_insert_compression.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS local;
 DROP TABLE IF EXISTS distributed;
 
diff --git a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
index 8bbc9ec0a14..6bbf6fcec6a 100644
--- a/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
+++ b/tests/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 drop table if exists data_01641;
 
 create table data_01641 (key Int, value String) engine=MergeTree order by (key, repeat(value, 40)) settings old_parts_lifetime=0, min_bytes_for_wide_part=0;
diff --git a/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql b/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
index 87ae96aa451..d0d64294ed4 100644
--- a/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
+++ b/tests/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists dist_01643;
 drop table if exists data_01643;
 
diff --git a/tests/queries/0_stateless/01645_system_table_engines.sql b/tests/queries/0_stateless/01645_system_table_engines.sql
index 5e8eef5508b..c2048427670 100644
--- a/tests/queries/0_stateless/01645_system_table_engines.sql
+++ b/tests/queries/0_stateless/01645_system_table_engines.sql
@@ -1 +1 @@
-SELECT * FROM system.table_engines WHERE name in ('MergeTree', 'ReplicatedCollapsingMergeTree') FORMAT PrettyCompactNoEscapes;
+SELECT * FROM system.table_engines WHERE name in ('MergeTree', 'ReplicatedCollapsingMergeTree') ORDER BY name FORMAT PrettyCompactNoEscapes;
diff --git a/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql b/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
index cfd70df8dd4..7307ba60e3f 100644
--- a/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
+++ b/tests/queries/0_stateless/01646_system_restart_replicas_smoke.sql
@@ -1,5 +1,8 @@
+-- Tags: replica, no-tsan, no-parallel
+-- Tag no-tsan: RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
+
 DROP TABLE IF EXISTS data_01646;
-CREATE TABLE data_01646 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01646/data_01646', 'r') ORDER BY s PARTITION BY x;
+CREATE TABLE data_01646 (x Date, s String) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01646/data_01646', 'r') ORDER BY s PARTITION BY x;
 SYSTEM RESTART REPLICAS;
 DESCRIBE TABLE data_01646;
 DROP TABLE data_01646;
diff --git a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.reference b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.reference
rename to tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.sql b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
similarity index 65%
rename from tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.sql
rename to tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
index c3e459dfc49..1aa568c1663 100644
--- a/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.sql
+++ b/tests/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS partitioned_table;
 
 CREATE TABLE partitioned_table (
@@ -5,7 +8,7 @@ CREATE TABLE partitioned_table (
     partitioner UInt8,
     value String
 )
-ENGINE ReplicatedMergeTree('/clickhouse/01650_drop_part_and_deduplication_partitioned_table', '1')
+ENGINE ReplicatedMergeTree('/clickhouse/{database}/01650_drop_part_and_deduplication_partitioned_table', '1')
 ORDER BY key
 PARTITION BY partitioner;
 
@@ -16,24 +19,24 @@ INSERT INTO partitioned_table VALUES (11, 1, 'AA'), (22, 2, 'BB'), (33, 3, 'CC')
 
 SELECT partition_id, name FROM system.parts WHERE table = 'partitioned_table' AND database = currentDatabase() ORDER BY name;
 
-SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
+SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/' || currentDatabase() || '/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
 
 INSERT INTO partitioned_table VALUES (33, 3, 'CC'); -- must be deduplicated
 
 SELECT partition_id, name FROM system.parts WHERE table = 'partitioned_table' AND database = currentDatabase() ORDER BY name;
 
-SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
+SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/' || currentDatabase() || '/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
 
 ALTER TABLE partitioned_table DROP PART '3_1_1_0';
 
 SELECT partition_id, name FROM system.parts WHERE table = 'partitioned_table' AND database = currentDatabase() ORDER BY name;
 
-SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
+SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/' || currentDatabase() || '/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
 
 INSERT INTO partitioned_table VALUES (33, 3, 'CC'); -- mustn't be deduplicated
 
 SELECT partition_id, name FROM system.parts WHERE table = 'partitioned_table' AND database = currentDatabase() ORDER BY name;
 
-SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
+SELECT substring(name, 1, 2), value FROM system.zookeeper WHERE path='/clickhouse/' || currentDatabase() || '/01650_drop_part_and_deduplication_partitioned_table/blocks/' ORDER BY value;
 
 DROP TABLE IF EXISTS partitioned_table;
diff --git a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference
rename to tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.reference
diff --git a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
similarity index 73%
rename from tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql
rename to tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
index 2c50a7a8516..ce48ad6a02a 100644
--- a/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql
+++ b/tests/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
@@ -1,18 +1,20 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS test_01640;
 DROP TABLE IF EXISTS restore_01640;
 
 CREATE TABLE test_01640(i Int64, d Date, s String)
-ENGINE = ReplicatedMergeTree('/clickhouse/{shard}/tables/test_01640','{replica}') 
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/{shard}/tables/test_01640','{replica}') 
 PARTITION BY toYYYYMM(d) ORDER BY i;
 
 insert into test_01640 values (1, '2021-01-01','some');
 
 CREATE TABLE restore_01640(i Int64, d Date, s String)
-ENGINE = ReplicatedMergeTree('/clickhouse/{shard}/tables/restore_01640','{replica}')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/{shard}/tables/restore_01640','{replica}')
 PARTITION BY toYYYYMM(d) ORDER BY i;
 
-ALTER TABLE restore_01640 FETCH PARTITION tuple(toYYYYMM(toDate('2021-01-01'))) 
-  FROM '/clickhouse/{shard}/tables/test_01640';
+ALTER TABLE restore_01640 FETCH PARTITION tuple(toYYYYMM(toDate('2021-01-01')))
+  FROM '/clickhouse/{database}/{shard}/tables/test_01640';
 
 SELECT partition_id
 FROM system.detached_parts
diff --git a/tests/queries/0_stateless/01651_map_functions.sql b/tests/queries/0_stateless/01651_map_functions.sql
index 997006ecdf3..bbaaf9bee84 100644
--- a/tests/queries/0_stateless/01651_map_functions.sql
+++ b/tests/queries/0_stateless/01651_map_functions.sql
@@ -8,14 +8,14 @@ select mapContains(a, 'name') from table_map;
 select mapContains(a, 'gender') from table_map;
 select mapContains(a, 'abc') from table_map;
 select mapContains(a, b) from table_map;
-select mapContains(a, 10) from table_map; -- { serverError 43 }
+select mapContains(a, 10) from table_map; -- { serverError 386 }
 select mapKeys(a) from table_map;
 drop table if exists table_map;
 
 CREATE TABLE table_map (a Map(UInt8, Int), b UInt8, c UInt32) engine = MergeTree order by tuple();
 insert into table_map select map(number, number), number, number from numbers(1000, 3);
 select mapContains(a, b), mapContains(a, c), mapContains(a, 233) from table_map;
-select mapContains(a, 'aaa') from table_map; -- { serverError 43 }
+select mapContains(a, 'aaa') from table_map; -- { serverError 386 }
 select mapContains(b, 'aaa') from table_map; -- { serverError 43 }
 select mapKeys(a) from table_map;
 select mapValues(a) from table_map;
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.reference b/tests/queries/0_stateless/01655_plan_optimizations.reference
index 22f5a2e73e3..33a7ff44b74 100644
--- a/tests/queries/0_stateless/01655_plan_optimizations.reference
+++ b/tests/queries/0_stateless/01655_plan_optimizations.reference
@@ -5,11 +5,8 @@ FUNCTION sipHash64
 Filter column: equals
 > sorting steps should know about limit
 Limit 10
-MergingSorted
-Limit 10
-MergeSorting
-Limit 10
-PartialSorting
+Sorting
+Sorting
 Limit 10
 -- filter push down --
 > filter should be pushed down after aggregating
@@ -56,7 +53,7 @@ Filter column: notEquals(y, 0)
 9	10
 > one condition of filter should be pushed down after aggregating, other condition is casted
 Filter column
-FUNCTION CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))
+FUNCTION _CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))
 Aggregating
 Filter column: notEquals(y, 0)
 0	1
@@ -108,9 +105,8 @@ Filter column: notEquals(y, 2)
 1	0
 1	1
 > filter is pushed down before sorting steps
-MergingSorted
-MergeSorting
-PartialSorting
+Sorting
+Sorting
 Filter column: and(notEquals(x, 0), notEquals(y, 0))
 1	2
 1	1
diff --git a/tests/queries/0_stateless/01655_plan_optimizations.sh b/tests/queries/0_stateless/01655_plan_optimizations.sh
index 148e6157773..de3d3ac3eb6 100755
--- a/tests/queries/0_stateless/01655_plan_optimizations.sh
+++ b/tests/queries/0_stateless/01655_plan_optimizations.sh
@@ -10,7 +10,7 @@ $CLICKHOUSE_CLIENT -q "select x + 1 from (select y + 2 as x from (select dummy +
 echo "> sipHash should be calculated after filtration"
 $CLICKHOUSE_CLIENT -q "explain actions = 1 select sum(x), sum(y) from (select sipHash64(number) as x, bitAnd(number, 1024) as y from numbers_mt(1000000000) limit 1000000000) where y = 0" | grep -o "FUNCTION sipHash64\|Filter column: equals"
 echo "> sorting steps should know about limit"
-$CLICKHOUSE_CLIENT -q "explain actions = 1 select number from (select number from numbers(500000000) order by -number) limit 10" | grep -o "MergingSorted\|MergeSorting\|PartialSorting\|Limit 10"
+$CLICKHOUSE_CLIENT -q "explain actions = 1 select number from (select number from numbers(500000000) order by -number) limit 10" | grep -o "Sorting\|Limit 10"
 
 echo "-- filter push down --"
 echo "> filter should be pushed down after aggregating"
@@ -56,7 +56,7 @@ $CLICKHOUSE_CLIENT -q "
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
     ) where y != 0 and s - 4
     settings enable_optimize_predicate_expression=0" |
-    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))"
+    grep -o "Aggregating\|Filter column\|Filter column: notEquals(y, 0)\|FUNCTION _CAST(minus(s, 4) :: 1, UInt8 :: 3) -> and(notEquals(y, 0), minus(s, 4))"
 $CLICKHOUSE_CLIENT -q "
     select s, y from (
         select sum(x) as s, y from (select number as x, number + 1 as y from numbers(10)) group by y
@@ -132,7 +132,7 @@ $CLICKHOUSE_CLIENT -q "
         select number % 2 as x, number % 3 as y from numbers(6) order by y desc
     ) where x != 0 and y != 0
     settings enable_optimize_predicate_expression = 0" |
-    grep -o "MergingSorted\|MergeSorting\|PartialSorting\|Filter column: and(notEquals(x, 0), notEquals(y, 0))"
+    grep -o "Sorting\|Filter column: and(notEquals(x, 0), notEquals(y, 0))"
 $CLICKHOUSE_CLIENT -q "
     select x, y from (
         select number % 2 as x, number % 3 as y from numbers(6) order by y desc
diff --git a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
index 03970134ca0..827f559f3d8 100644
--- a/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT ISNULL(NULL);
 SELECT '---';
 SELECT ISNULL('abc');
diff --git a/tests/queries/0_stateless/01656_sequence_next_node_long.sql b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
index 9c181f5e491..a53074701b3 100644
--- a/tests/queries/0_stateless/01656_sequence_next_node_long.sql
+++ b/tests/queries/0_stateless/01656_sequence_next_node_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET allow_experimental_funnel_functions = 1;
 
 DROP TABLE IF EXISTS test_sequenceNextNode_Nullable;
diff --git a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
index 7ac335062b8..003bc3d9383 100644
--- a/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01656_test_hex_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT HEX(10);
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
index 50d50155480..020d7cc5e72 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET database_atomic_wait_for_drop_and_detach_synchronously=1;
 SET log_queries=1;
 
@@ -15,7 +17,7 @@ SELECT uniqArray([1, 1, 2]),
        toDayOfYear(d) % 2)
 FROM numbers(100);
 
-SELECT repeat('a', number)
+SELECT repeat('aa', number)
 FROM numbers(10e3)
 SETTINGS max_memory_usage=4e6, max_block_size=100
 FORMAT Null; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
index f691481dfc4..c9d4fb6d105 100644
--- a/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT HOUR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.reference b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.reference
index 1d0901cf9f6..ad8df154dcc 100644
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.reference
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.reference
@@ -13,13 +13,13 @@ ccccccccc
 :35
 :35
 :233
-699415
+695071
 aaaaaaaaa	bbbbbbbbb
 ccccccccc	aaaaaaaaa	bbbbbbbbb
 ccccccccc	aaaaaaaaa	bbbbbbbbb
 ccccccccc	aaaaaaaaa	bbbbbbbbb
 ccccccccc	aaaaaaaaa	bbbbbbbbb
-699415	0
+695071	0
 :0
-:70
+:233
 :79
diff --git a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
index 1bfcf863184..3797b264f26 100755
--- a/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+++ b/tests/queries/0_stateless/01658_read_file_to_stringcolumn.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
+
 set -eu
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
index 0d255e771b4..9eee88f7422 100644
--- a/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT TO_BASE64('test string');
diff --git a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
index f2d77641ec9..d7564af01af 100644
--- a/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
+++ b/tests/queries/0_stateless/01659_h3_buffer_overflow.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 -- the behaviour on overflow can be implementation specific
 -- and we don't care about the results, but no buffer overflow should be possible.
 SELECT length(h3kRing(9223372036854775807, 1000)) FORMAT Null;
diff --git a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
index 3e130716091..0b233e07aa9 100644
--- a/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT FROM_BASE64('dGVzdCBzdHJpbmc=');
diff --git a/tests/queries/0_stateless/01660_join_or_all.reference b/tests/queries/0_stateless/01660_join_or_all.reference
new file mode 100644
index 00000000000..d746b5fb899
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_all.reference
@@ -0,0 +1,68 @@
+join on OR chain (all left)
+2	3
+6	4
+6	4
+==
+2	3
+5	4
+100	4
+==
+2	3	2	3
+6	4	5	4
+6	4	100	4
+==
+1
+==
+1	3
+==
+1	2	2	3
+==
+2	4
+join on OR chain (all right)
+2	3
+6	4
+6	4
+==
+2	3
+5	4
+100	4
+==
+2	3	2	3
+6	4	5	4
+6	4	100	4
+==
+0
+1
+==
+0	4
+1	3
+==
+0	0	6	4
+1	2	2	3
+==
+2	4
+6	5
+join on OR chain (full)
+2	3
+6	4
+6	4
+==
+2	3
+5	4
+100	4
+==
+2	3	2	3
+6	4	5	4
+6	4	100	4
+==
+0
+1
+==
+0	4
+1	3
+==
+0	0	6	4
+1	2	2	3
+==
+2	4
+6	5
diff --git a/tests/queries/0_stateless/01660_join_or_all.sql b/tests/queries/0_stateless/01660_join_or_all.sql
new file mode 100644
index 00000000000..a9c4d8e1102
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_all.sql
@@ -0,0 +1,67 @@
+SET joined_subquery_requires_alias = 0;
+
+drop table if exists tab1;
+drop table if exists tab2;
+drop table if exists tab3;
+
+create table tab1 (a1 Int32, b1 Int32) engine = MergeTree order by a1;
+create table tab2 (a2 Int32, b2 Int32) engine = MergeTree order by a2;
+create table tab3 (a3 Int32, b3 Int32) engine = MergeTree order by a3;
+
+insert into tab1 values (1, 2);
+
+insert into tab2 values (2, 3);
+insert into tab2 values (6, 4);
+
+insert into tab3 values (2, 3);
+insert into tab3 values (5, 4);
+insert into tab3 values (100, 4);
+
+select 'join on OR chain (all left)';
+select a2, b2 from tab2 all left join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2;
+select '==';
+select a3, b3 from tab2 all left join tab3 on a2 = a3 or b2 = b3 ORDER BY a3, b3;
+select '==';
+select a2, b2, a3, b3 from tab2 all left join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2, a3, b3;
+select '==';
+select a1 from tab1 all left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1;
+select '==';
+select a1, b2 from tab1 all left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b2;
+select '==';
+select a1, b1, a2, b2 from tab1 all left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b1, a2, b2;
+select '==';
+select a2, b2 + 1 from tab1 all left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a2, b2 + 1;
+
+select 'join on OR chain (all right)';
+select a2, b2 from tab2 all right join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2;
+select '==';
+select a3, b3 from tab2 all right join tab3 on a2 = a3 or b2 = b3 ORDER BY a3, b3;
+select '==';
+select a2, b2, a3, b3 from tab2 all right join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2, a3, b3;
+select '==';
+select a1 from tab1 all right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1;
+select '==';
+select a1, b2 from tab1 all right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b2;
+select '==';
+select a1, b1, a2, b2 from tab1 all right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b1, a2, b2;
+select '==';
+select a2, b2 + 1 from tab1 all right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a2, b2 + 1;
+
+select 'join on OR chain (full)';
+select a2, b2 from tab2 full join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2;
+select '==';
+select a3, b3 from tab2 full join tab3 on a2 = a3 or b2 = b3 ORDER BY a3, b3;
+select '==';
+select a2, b2, a3, b3 from tab2 full join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2, a3, b3;
+select '==';
+select a1 from tab1 full join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1;
+select '==';
+select a1, b2 from tab1 full join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b2;
+select '==';
+select a1, b1, a2, b2 from tab1 full join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b1, a2, b2;
+select '==';
+select a2, b2 + 1 from tab1 full join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a2, b2 + 1;
+
+drop table tab1;
+drop table tab2;
+drop table tab3;
diff --git a/tests/queries/0_stateless/01660_join_or_any.reference b/tests/queries/0_stateless/01660_join_or_any.reference
new file mode 100644
index 00000000000..39123f6ef9b
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_any.reference
@@ -0,0 +1,49 @@
+join on OR chain (any left)
+2	3
+6	4
+==
+0	3
+1	4
+==
+2	3	0	3
+6	4	1	4
+==
+1
+==
+1	3
+==
+1	2	2	3
+==
+2	4
+join on OR chain (any right)
+2	3
+6	4
+6	4
+==
+2	3
+5	4
+100	4
+==
+2	3	2	3
+6	4	5	4
+6	4	100	4
+==
+0
+1
+==
+0	4
+1	3
+==
+0	0	6	4
+1	2	2	3
+==
+2	4
+6	5
+any_join_distinct_right_table_keys = 1
+0	0
+2	3
+6	4
+==
+2	3
+5	4
+100	4
diff --git a/tests/queries/0_stateless/01660_join_or_any.sql b/tests/queries/0_stateless/01660_join_or_any.sql
new file mode 100644
index 00000000000..62c9dd680be
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_any.sql
@@ -0,0 +1,62 @@
+SET joined_subquery_requires_alias = 0;
+SET any_join_distinct_right_table_keys = 0;
+
+
+drop table if exists tab1;
+drop table if exists tab2;
+drop table if exists tab3;
+
+create table tab1 (a1 Int32, b1 Int32) engine = MergeTree order by a1;
+create table tab2 (a2 Int32, b2 Int32) engine = MergeTree order by a2;
+create table tab3 (a3 Int32, b3 Int32) engine = MergeTree order by a3;
+
+insert into tab1 values (1, 2);
+
+insert into tab2 values (2, 3);
+insert into tab2 values (6, 4);
+
+insert into tab3 values (2, 3);
+insert into tab3 values (5, 4);
+insert into tab3 values (100, 4);
+
+select 'join on OR chain (any left)';
+select a2, b2 from tab2 any left join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2;
+select '==';
+select a3 == 5 OR a3 == 100, b3 from tab2 any left join tab3 on a2 = a3 or b2 = b3 ORDER BY a3, b3;
+select '==';
+select a2, b2, a3 == 5 OR a3 == 100, b3 from tab2 any left join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2, b3;
+select '==';
+select a1 from tab1 any left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1;
+select '==';
+select a1, b2 from tab1 any left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b2;
+select '==';
+select a1, b1, a2, b2 from tab1 any left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b1, a2, b2;
+select '==';
+select a2, b2 + 1 from tab1 any left join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a2, b2 + 1;
+
+
+select 'join on OR chain (any right)';
+select a2, b2 from tab2 any right join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2;
+select '==';
+select a3, b3 from tab2 any right join tab3 on a2 = a3 or b2 = b3 ORDER BY a3, b3;
+select '==';
+select a2, b2, a3, b3 from tab2 any right join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2, a3, b3;
+select '==';
+select a1 from tab1 any right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1;
+select '==';
+select a1, b2 from tab1 any right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b2;
+select '==';
+select a1, b1, a2, b2 from tab1 any right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a1, b1, a2, b2;
+select '==';
+select a2, b2 + 1 from tab1 any right join tab2 on b1 + 1 = a2 + 1 or a1 + 4 = b2 + 2 ORDER BY a2, b2 + 1;
+
+SET any_join_distinct_right_table_keys = 1;
+select 'any_join_distinct_right_table_keys = 1';
+select a2, b2 from tab2 any right join tab3 on a2 = a3 or b2 = b3 ORDER BY a2, b2;
+select '==';
+select a3, b3 from tab2 any right join tab3 on a2 = a3 or b2 = b3 ORDER BY a3, b3;
+
+
+drop table tab1;
+drop table tab2;
+drop table tab3;
diff --git a/tests/queries/0_stateless/01660_join_or_inner.reference b/tests/queries/0_stateless/01660_join_or_inner.reference
new file mode 100644
index 00000000000..c5aaf095fd9
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_inner.reference
@@ -0,0 +1,13 @@
+any_join_distinct_right_table_keys = 0
+2	3	2	3
+6	4	5	4
+==
+2	3	2	3
+6	4	5	4
+any_join_distinct_right_table_keys = 1
+2	3	2	3
+6	4	5	4
+==
+2	3	2	3
+6	4	5	4
+1
diff --git a/tests/queries/0_stateless/01660_join_or_inner.sql b/tests/queries/0_stateless/01660_join_or_inner.sql
new file mode 100644
index 00000000000..b7b15b1a071
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_inner.sql
@@ -0,0 +1,35 @@
+SET joined_subquery_requires_alias = 0;
+
+drop table if exists tab2;
+drop table if exists tab3;
+
+create table tab2 (a2 Int32, b2 Int32) engine = MergeTree order by a2;
+create table tab3 (a3 Int32, b3 Int32) engine = MergeTree order by a3;
+
+insert into tab2 values (2, 3);
+insert into tab2 values (6, 4);
+insert into tab2 values (998, 999);
+
+insert into tab3 values (2, 3);
+insert into tab3 values (5, 4);
+insert into tab3 values (100, 4);
+insert into tab3 values (1998, 1999);
+
+set max_threads = 1;
+
+SET any_join_distinct_right_table_keys = 0;
+select 'any_join_distinct_right_table_keys = 0';
+select tab2.*, tab3.* from tab2 any join tab3 on a2 = a3 or b2 = b3;
+select '==';
+select tab2.*, tab3.* from tab2 any join tab3 on b2 = b3 or a2 = a3;
+
+SET any_join_distinct_right_table_keys = 1;
+select 'any_join_distinct_right_table_keys = 1';
+select tab2.*, tab3.* from tab2 any join tab3 on a2 = a3 or b2 = b3;
+select '==';
+select tab2.*, tab3.* from tab2 any join tab3 on b2 = b3 or a2 = a3;
+
+SELECT 1 FROM (select 1 a, 1 aa, 1 aaa, 1 aaaa) A JOIN (select 1 b, 1 bb, 1 bbb, 1 bbbb, 1 bbbbb) B ON a = b OR a = bb OR a = bbb OR a = bbbb OR aa = b OR aa = bb OR aa = bbb OR aa = bbbb OR aaa = b OR aaa = bb OR aaa = bbb OR aaa = bbbb OR aaaa = b OR aaaa = bb OR aaaa = bbb OR aaaa = bbbb OR a = bbbbb OR aa = bbbbb;
+
+drop table tab2;
+drop table tab3;
diff --git a/tests/queries/0_stateless/01660_join_or_subqueries.reference b/tests/queries/0_stateless/01660_join_or_subqueries.reference
new file mode 100644
index 00000000000..ae5e6686d40
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_subqueries.reference
@@ -0,0 +1,10 @@
+subqueries with OR
+1
+==
+1
+==
+1	2
+subquery column alias with OR
+1	2	2	3
+==
+1	2	2	3
diff --git a/tests/queries/0_stateless/01660_join_or_subqueries.sql b/tests/queries/0_stateless/01660_join_or_subqueries.sql
new file mode 100644
index 00000000000..bdfddf60c8e
--- /dev/null
+++ b/tests/queries/0_stateless/01660_join_or_subqueries.sql
@@ -0,0 +1,27 @@
+SET joined_subquery_requires_alias = 0;
+SET max_threads = 1;
+
+drop table if exists tab1;
+drop table if exists tab2;
+
+create table tab1 (a1 Int32, b1 Int32) engine = MergeTree order by a1;
+create table tab2 (a2 Int32, b2 Int32) engine = MergeTree order by a2;
+
+insert into tab1 values (1, 2);
+insert into tab2 values (2, 3);
+insert into tab2 values (6, 4);
+
+select 'subqueries with OR';
+select a1 from tab1 any left join (select * from tab2) on b1 = a2 or b2 = a1;
+select '==';
+select a1 from tab1 any left join (select a2, b2 from tab2) on b1 = a2 or b2 = a1;
+select '==';
+select a1, b1 from tab1 any left join (select * from tab2) on b1 = a2 or b2 = a1;
+
+select 'subquery column alias with OR';
+select a1, b1, a2, b2 from tab1 any left join (select *, a2 as z from tab2) on b1 + 1 = z + 1 or b1 = z * 2;
+select '==';
+select a1, b1, a2, b2 from tab1 any left join (select *, a2 + 1 as z from tab2) on b1 + 1 = z or b1 = z * 2;
+
+drop table tab1;
+drop table tab2;
diff --git a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
index 7de1d287d2d..8998f6f8008 100644
--- a/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFYEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01661_join_complex.reference b/tests/queries/0_stateless/01661_join_complex.reference
new file mode 100644
index 00000000000..8ce5b860a06
--- /dev/null
+++ b/tests/queries/0_stateless/01661_join_complex.reference
@@ -0,0 +1,8 @@
+a	b	c	d	e	f	a	b	c	d	e	f
+a	b	c	d	e	f	a	b	c	d	e	f
+a	b	c	d	e	f	a	b	c	d	e	f
+a	b	c	d	e	f	a	b	c	d	e	f
+a	b	c	d	e	f	a	b	c	d	e	f
+join on OR/AND chain
+2	3	2	3
+6	4	0	0
diff --git a/tests/queries/0_stateless/01661_join_complex.sql b/tests/queries/0_stateless/01661_join_complex.sql
new file mode 100644
index 00000000000..7ce426dee22
--- /dev/null
+++ b/tests/queries/0_stateless/01661_join_complex.sql
@@ -0,0 +1,35 @@
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on t1.b = t2.b and t1.c = t2.b and t1.d = t2.b or t1.e = t2.e;
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on t1.d = t2.b or t1.c = t2.b or t1.d = t2.b and t1.d = t2.b or t1.e = t2.e and t1.a=t2.a and t2.f=t1.f;
+
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 left join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on t1.d = t2.b or t1.c = t2.b or t1.d = t2.b and t1.d = t2.b or (t1.e = t2.e and t1.a=t2.a and t2.f=t1.f);
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 right join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on t1.d = t2.b or t1.c = t2.b or t1.e = t2.e;
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on t1.d = t2.b or t1.c = t2.b or t1.e = t2.e and t1.a=t2.a and t2.f=t1.f;
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on t1.d = t2.b AND t1.e = t2.e OR t1.c = t2.b AND t1.e = t2.e OR t1.d = t2.b AND t1.f=t2.f OR t1.c = t2.b AND t1.f=t2.f;
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on (or(t1.d = t2.b and t1.e = t2.e, t1.d = t2.b and t1.f=t2.f, t1.c = t2.b and t1.e = t2.e, t1.c = t2.b and t1.f=t2.f));
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on (t1.d = t2.b and t1.e = t2.e or t1.d = t2.b and t1.f=t2.f or t1.c = t2.b and t1.e = t2.e or t1.c = t2.b and t1.f=t2.f);
+
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 left join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on (t1.d = t2.b or t1.c = t2.b or t1.d = t2.b and t1.d = t2.b) or (t1.e = t2.e and t1.a=t2.a and t2.f=t1.f); -- { serverError INVALID_JOIN_ON_EXPRESSION }
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 right join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on (t1.d = t2.b or t1.c = t2.b) or t1.e = t2.e; -- { serverError INVALID_JOIN_ON_EXPRESSION }
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on (t1.d = t2.b or t1.c = t2.b) or (t1.e = t2.e and t1.a=t2.a and t2.f=t1.f); -- { serverError INVALID_JOIN_ON_EXPRESSION }
+select * from (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t1 inner join (select 'a' as a, 'b' as b, 'c' as c, 'd' as d, 'e' as e, 'f' as f) as t2 on (t1.d = t2.b or t1.c = t2.b) and (t1.e = t2.e or t1.f=t2.f); -- { serverError INVALID_JOIN_ON_EXPRESSION }
+
+SET joined_subquery_requires_alias = 0;
+SET max_threads = 1;
+
+drop table if exists tab2;
+drop table if exists tab3;
+
+create table tab2 (a2 Int32, b2 Int32) engine = MergeTree order by a2;
+create table tab3 (a3 Int32, b3 Int32) engine = MergeTree order by a3;
+
+insert into tab2 values (2, 3);
+insert into tab2 values (6, 4);
+insert into tab3 values (2, 3);
+insert into tab3 values (5, 4);
+insert into tab3 values (100, 4);
+
+select 'join on OR/AND chain';
+select a2, b2, a3, b3 from tab2 any left join tab3 on a2=a3 and a2 +1 = b3 + 0 or b2=b3 and a2 +1 = b3 + 0 ;
+
+drop table tab2;
+drop table tab3;
diff --git a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
index cde47ea483e..007f15ebe06 100644
--- a/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFWEEK(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01662_join_mixed.reference b/tests/queries/0_stateless/01662_join_mixed.reference
new file mode 100644
index 00000000000..0df32f791ae
--- /dev/null
+++ b/tests/queries/0_stateless/01662_join_mixed.reference
@@ -0,0 +1,3 @@
+a	b	42	a	b	42
+===
+a	b	42	a	b	42
diff --git a/tests/queries/0_stateless/01662_join_mixed.sql b/tests/queries/0_stateless/01662_join_mixed.sql
new file mode 100644
index 00000000000..da548a9a679
--- /dev/null
+++ b/tests/queries/0_stateless/01662_join_mixed.sql
@@ -0,0 +1,3 @@
+select * from (select 'a' as a, 'b' as b, 42 as forty_two) as t1 inner join (select 'a' as a, 'b' as b, 42 as forty_two) as t2 on t1.b = t2.a or t1.forty_two = t2.forty_two;
+select '===';
+select * from (select 'a' as a, 'b' as b, 42 as forty_two) as t1 inner join (select 'a' as a, 'b' as b, 42 as forty_two) as t2 on t1.b = t2.b or t1.forty_two = t2.forty_two;
diff --git a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
index 88b97613ff8..a9b078205da 100644
--- a/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT DAYOFMONTH(toDateTime('2016-06-15 23:00:00'));
 SELECT '---';
 SELECT DAY(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01663_aes_msan.sql b/tests/queries/0_stateless/01663_aes_msan.sql
index 1d549aece56..16ad0029f44 100644
--- a/tests/queries/0_stateless/01663_aes_msan.sql
+++ b/tests/queries/0_stateless/01663_aes_msan.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT hex(encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''));
 SELECT decrypt('aes-128-cbc', encrypt('aes-128-cbc', 'text', 'keykeykeykeykeyk', ''), 'keykeykeykeykeyk', '');
diff --git a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
index cefa672777c..bfc815c8863 100644
--- a/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT DATE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql b/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
index 4f4aef09259..3378f782d03 100644
--- a/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
+++ b/tests/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT INET6_NTOA(toFixedString(unhex('2A0206B8000000000000000000000011'), 16));
 SELECT hex(INET6_ATON('2a02:6b8::11'));
 SELECT INET_NTOA(toUInt32(1337));
diff --git a/tests/queries/0_stateless/01666_blns.reference b/tests/queries/0_stateless/01666_blns_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01666_blns.reference
rename to tests/queries/0_stateless/01666_blns_long.reference
diff --git a/tests/queries/0_stateless/01666_blns.sql b/tests/queries/0_stateless/01666_blns_long.sql
similarity index 99%
rename from tests/queries/0_stateless/01666_blns.sql
rename to tests/queries/0_stateless/01666_blns_long.sql
index be9632092bc..fd959cf0a73 100644
--- a/tests/queries/0_stateless/01666_blns.sql
+++ b/tests/queries/0_stateless/01666_blns_long.sql
@@ -1,3 +1,6 @@
+-- Tags: long, no-fasttest
+-- Tag no-fasttest: JSON functions
+
 -- https://github.com/minimaxir/big-list-of-naughty-strings
 
 /*
@@ -554,9 +557,9 @@ SELECT count() FROM test;
 DROP TABLE IF EXISTS test_r1;
 DROP TABLE IF EXISTS test_r2;
 
-CREATE TABLE test_r1 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test_01666', 'r1') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
+CREATE TABLE test_r1 AS test ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01666', 'r1') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
 INSERT INTO test_r1 SELECT * FROM test;
-CREATE TABLE test_r2 AS test ENGINE = ReplicatedMergeTree('/clickhouse/test_01666', 'r2') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
+CREATE TABLE test_r2 AS test ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01666', 'r2') ORDER BY "\\" SETTINGS min_bytes_for_wide_part = '100G';
 
 SYSTEM SYNC REPLICA test_r2;
 
diff --git a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
index c5fbb35a9cd..e04c9515009 100755
--- a/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
+++ b/tests/queries/0_stateless/01666_merge_tree_max_query_limit.sh
@@ -4,8 +4,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-function wait_for_query_to_start()
-{
+function wait_for_query_to_start() {
     while [[ $($CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" -d "SELECT sum(read_rows) FROM system.processes WHERE query_id = '$1'") == 0 ]]; do sleep 0.1; done
 }
 
@@ -21,14 +20,14 @@ insert into simple select number, number + 100 from numbers(5000);
 query_id="long_running_query-$CLICKHOUSE_DATABASE"
 
 echo "Spin up a long running query"
-${CLICKHOUSE_CLIENT} --query "select sleepEachRow(0.1) from simple settings max_block_size = 1 format Null" --query_id "$query_id" > /dev/null 2>&1 &
+${CLICKHOUSE_CLIENT} --query "select sleepEachRow(0.1) from simple settings max_block_size = 1 format Null" --query_id "$query_id" >/dev/null 2>&1 &
 wait_for_query_to_start "$query_id"
 
 # query which reads marks >= min_marks_to_honor_max_concurrent_queries is throttled
 echo "Check if another query with some marks to read is throttled"
-${CLICKHOUSE_CLIENT} --query "select * from simple" 2> /dev/null;
+${CLICKHOUSE_CLIENT} --query "select * from simple" 2>/dev/null
 CODE=$?
-[ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1;
+[ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1
 echo "yes"
 
 # query which reads marks less than min_marks_to_honor_max_concurrent_queries is allowed
@@ -41,9 +40,9 @@ ${CLICKHOUSE_CLIENT} --query "alter table simple modify setting min_marks_to_hon
 
 # Now smaller queries are also throttled
 echo "Check if another query with less marks to read is throttled"
-${CLICKHOUSE_CLIENT} --query "select * from simple where i = 0" 2> /dev/null;
+${CLICKHOUSE_CLIENT} --query "select * from simple where i = 0" 2>/dev/null
 CODE=$?
-[ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1;
+[ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1
 echo "yes"
 
 echo "Modify max_concurrent_queries to 2"
@@ -58,14 +57,21 @@ ${CLICKHOUSE_CLIENT} --query "alter table simple modify setting max_concurrent_q
 
 # Now queries are throttled again
 echo "Check if another query with less marks to read is throttled"
-${CLICKHOUSE_CLIENT} --query "select * from simple where i = 0" 2> /dev/null;
+${CLICKHOUSE_CLIENT} --query "select * from simple where i = 0" 2>/dev/null
 CODE=$?
-[ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1;
+[ "$CODE" -ne "202" ] && echo "Expected error code: 202 but got: $CODE" && exit 1
 echo "yes"
 
 ${CLICKHOUSE_CLIENT} --query "KILL QUERY WHERE query_id = '$query_id' SYNC FORMAT Null"
 wait
 
-${CLICKHOUSE_CLIENT} --multiline --multiquery --query "
-drop table simple
-"
+# Check correctness of multiple subqueries
+query_id=max_concurrent_queries_$RANDOM
+${CLICKHOUSE_CLIENT} --query_id "$query_id" --query "select i from simple where j in (select i from simple where i < 10)"
+
+# We have to search the server's error log because the following warning message
+# is generated during pipeline destruction and thus is not sent to the client.
+${CLICKHOUSE_CLIENT} --query "system flush logs"
+if [[ $(${CLICKHOUSE_CLIENT} --query "select count() > 0 from system.text_log where query_id = '$query_id' and level = 'Warning' and message like '%We have query_id removed but it\'s not recorded. This is a bug%' format TSVRaw") == 1 ]]; then echo "We have query_id removed but it's not recorded. This is a bug." >&2; exit 1; fi
+
+${CLICKHOUSE_CLIENT} --query "drop table simple"
diff --git a/tests/queries/0_stateless/01667_aes_args_check.sql b/tests/queries/0_stateless/01667_aes_args_check.sql
index b1d7088c956..fc271e8aca1 100644
--- a/tests/queries/0_stateless/01667_aes_args_check.sql
+++ b/tests/queries/0_stateless/01667_aes_args_check.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT encrypt('aes-128-ecb', [1, -1, 0, NULL], 'text'); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
index bdde3e7b825..c6b0cb84f35 100644
--- a/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT MONTH(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.reference b/tests/queries/0_stateless/01669_columns_declaration_serde_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01669_columns_declaration_serde.reference
rename to tests/queries/0_stateless/01669_columns_declaration_serde_long.reference
diff --git a/tests/queries/0_stateless/01669_columns_declaration_serde.sql b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
similarity index 80%
rename from tests/queries/0_stateless/01669_columns_declaration_serde.sql
rename to tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
index a6bf1184e9f..7d42358bbc6 100644
--- a/tests/queries/0_stateless/01669_columns_declaration_serde.sql
+++ b/tests/queries/0_stateless/01669_columns_declaration_serde_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 CREATE TEMPORARY TABLE test ("\\" String DEFAULT '\r\n\t\\' || '
 ');
 
@@ -22,12 +24,12 @@ DROP TABLE IF EXISTS test_r1;
 DROP TABLE IF EXISTS test_r2;
 
 CREATE TABLE test_r1 (x UInt64, "\\" String DEFAULT '\r\n\t\\' || '
-') ENGINE = ReplicatedMergeTree('/clickhouse/test_01669', 'r1') ORDER BY "\\";
+') ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01669', 'r1') ORDER BY "\\";
 
 INSERT INTO test_r1 ("\\") VALUES ('\\');
 
 CREATE TABLE test_r2 (x UInt64, "\\" String DEFAULT '\r\n\t\\' || '
-') ENGINE = ReplicatedMergeTree('/clickhouse/test_01669', 'r2') ORDER BY "\\";
+') ENGINE = ReplicatedMergeTree('/clickhouse/{database}/test_01669', 'r2') ORDER BY "\\";
 
 SYSTEM SYNC REPLICA test_r2;
 
diff --git a/tests/queries/0_stateless/01669_join_or_duplicates.reference b/tests/queries/0_stateless/01669_join_or_duplicates.reference
new file mode 100644
index 00000000000..a2132c25c19
--- /dev/null
+++ b/tests/queries/0_stateless/01669_join_or_duplicates.reference
@@ -0,0 +1,115 @@
+1 left	1	2	1	2
+5 left	1	2	1	2
+5 left	1	2	1	2
+5 left	1	2	1	2
+5 left	1	2	1	2
+5 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+15 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+16 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 left	1	2	1	2
+17 any left	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 any right	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+17 full	1	2	1	2
+555
+a	0	a	0
+a	0	a	1
+a	1	a	0
+a	1	a	1
+a	0	a	0
+a	0	a	1
+a	1	a	0
+a	1	a	1
diff --git a/tests/queries/0_stateless/01669_join_or_duplicates.sql b/tests/queries/0_stateless/01669_join_or_duplicates.sql
new file mode 100644
index 00000000000..7495ecd1dec
--- /dev/null
+++ b/tests/queries/0_stateless/01669_join_or_duplicates.sql
@@ -0,0 +1,23 @@
+select '1 left', * from (select 1 as x, 2 as y) t1 left join (select 1 as xx, 2 as yy from numbers(1)) t2  on x = xx or y = yy;
+
+select '5 left', * from (select 1 as x, 2 as y) t1 left join (select 1 as xx, 2 as yy from numbers(5)) t2  on x = xx or y = yy;
+
+select '15 left', * from (select 1 as x, 2 as y) t1 left join (select 1 as xx, 2 as yy from numbers(15)) t2  on x = xx or y = yy;
+
+select '16 left', * from (select 1 as x, 2 as y) t1 left join (select 1 as xx, 2 as yy from numbers(16)) t2  on x = xx or y = yy;
+
+select '17 left', * from (select 1 as x, 2 as y) t1 left join (select 1 as xx, 2 as yy from numbers(17)) t2  on x = xx or y = yy;
+
+select '17 any left', * from (select 1 as x, 2 as y) t1 any left join (select 1 as xx, 2 as yy from numbers(17)) t2  on x = xx or y = yy;
+
+select '17 right', * from (select 1 as x, 2 as y) t1 right join (select 1 as xx, 2 as yy from numbers(17)) t2  on x = xx or y = yy;
+
+select '17 any right', * from (select 1 as x, 2 as y) t1 any right join (select 1 as xx, 2 as yy from numbers(17)) t2  on x = xx or y = yy;
+
+select '17 full', * from (select 1 as x, 2 as y) t1 full join (select 1 as xx, 2 as yy from numbers(17)) t2  on x = xx or y = yy;
+
+select count(1) from (select * from (select 1 as x, 2 as y) t1 left join (select 1 as xx, 2 as yy from numbers(555)) t2  on x = xx or y = yy);
+
+select * from (select 'a' as a, number as c from numbers(2)) as t1 join (select 'a' as a, number as c from numbers(2)) as t2  on  t1.c = t2.c or t1.a = t2.a order by t1.c, t2.c;
+
+select * from (select 'a' as a, number as c from numbers(2)) as t1 join (select 'a' as a, number as c from numbers(2)) as t2  on  t1.a = t2.a or t1.c = t2.c order by t1.c, t2.c;
diff --git a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
index afd79e2c1ba..31088b5dd5f 100644
--- a/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT YEAR(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
index 2d75764c0fa..32e7dc17479 100644
--- a/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
+++ b/tests/queries/0_stateless/01670_dictionary_create_key_expression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE database_dictionary_test_key_expression;
 
 CREATE TABLE database_dictionary_test_key_expression.test_for_dictionary (value String) ENGINE=TinyLog;
diff --git a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
index 1415c895290..0e85b61070b 100644
--- a/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
+++ b/tests/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists dist_01670;
 drop table if exists data_01670;
 
diff --git a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
index ae2bdb46412..87cdc00fe29 100644
--- a/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT REPEAT('Test', 3);
diff --git a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
index 641eba2d8fa..93c4451524c 100755
--- a/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
+++ b/tests/queries/0_stateless/01671_ddl_hang_timeout_long.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: long
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
index 369f2b47723..9c9965c8fce 100644
--- a/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT QUARTER(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
index 0306fde14cd..3438b598413 100644
--- a/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT SECOND(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
index 5d188b5b95b..a4f1427e0c3 100644
--- a/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
+++ b/tests/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
@@ -1 +1,3 @@
+-- Tags: no-fasttest
+
 SELECT MINUTE(toDateTime('2016-06-15 23:00:00'));
diff --git a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
index ee75f675eb3..c9a7c3e55b1 100755
--- a/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
+++ b/tests/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql b/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
index c98cb0a5e0f..caa3e976017 100644
--- a/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
+++ b/tests/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT dictGet('simple_executable_cache_dictionary_no_implicit_key', 'value', toUInt64(1));
 SELECT dictGet('simple_executable_cache_dictionary_implicit_key', 'value', toUInt64(1));
 
diff --git a/tests/queries/0_stateless/01675_data_type_coroutine.sh b/tests/queries/0_stateless/01675_data_type_coroutine.sh
index 781e43e4134..8e80d722a4c 100755
--- a/tests/queries/0_stateless/01675_data_type_coroutine.sh
+++ b/tests/queries/0_stateless/01675_data_type_coroutine.sh
@@ -4,12 +4,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+
+counter=0 retries=60
 I=0
-while true
-do
+while [[ $counter -lt $retries ]]; do
     I=$((I + 1))
     TYPE=$(perl -e "print 'Array(' x $I; print 'UInt8'; print ')' x $I")
     ${CLICKHOUSE_CLIENT} --max_parser_depth 1000000 --query "SELECT * FROM remote('127.0.0.{1,2}', generateRandom('x $TYPE', 1, 1, 1)) LIMIT 1 FORMAT Null" 2>&1 | grep -q -F 'Maximum parse depth' && break;
+    ((++counter))
 done
 
 #echo "I = ${I}"
diff --git a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
index 5687fe323d0..e373f632155 100755
--- a/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
+++ b/tests/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, distributed
 
 # NOTE: $SECONDS accuracy is second, so we need some delta, hence -1 in time conditions.
 
diff --git a/tests/queries/0_stateless/01676_dictget_in_default_expression.sql b/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
index cd4feaf5709..54e46a2b718 100644
--- a/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
+++ b/tests/queries/0_stateless/01676_dictget_in_default_expression.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01676 SYNC;
 
 CREATE DATABASE test_01676;
diff --git a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
index c8cfe0084cd..fb2d97b6270 100755
--- a/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -6,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 # NOTE: database = $CLICKHOUSE_DATABASE is superfluous
 
-function test_completion_word()
+function test_completion_word_client()
 {
     local w=$1 && shift
 
@@ -54,7 +55,7 @@ EOF
 
 # last 3 bytes will be completed,
 # so take this in mind when you will update the list.
-compwords_positive=(
+client_compwords_positive=(
     # system.functions
     concatAssumeInjective
     # system.table_engines
@@ -88,8 +89,73 @@ compwords_positive=(
     # system.dictionaries
     # FIXME: none
 )
-for w in "${compwords_positive[@]}"; do
-    test_completion_word "$w" || echo "[FAIL] $w (positive)"
+
+
+function test_completion_word_local()
+{
+    local w=$1 && shift
+
+    local w_len=${#w}
+    local compword_begin=${w:0:$((w_len-3))}
+    local compword_end=${w:$((w_len-3))}
+
+    # NOTE: here and below you should escape variables of the expect.
+    timeout 60s expect << EOF
+log_user 0
+set timeout 3
+match_max 100000
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
+
+spawn bash -c "$CLICKHOUSE_LOCAL"
+expect ":) "
+
+# Make a query
+send -- "SET $compword_begin"
+expect "SET $compword_begin"
+
+# Wait for suggestions to load, they are loaded in background
+set is_done 0
+while {\$is_done == 0} {
+    send -- "\\t"
+    expect {
+        "$compword_begin$compword_end" {
+            set is_done 1
+        }
+        default {
+            sleep 1
+        }
+    }
+}
+
+send -- "\\3\\4"
+expect eof
+EOF
+}
+
+local_compwords_positive=(
+    # system.functions
+    concatAssumeInjective
+    # system.table_engines
+    ReplacingMergeTree
+    # system.formats
+    JSONEachRow
+    # system.table_functions
+    clusterAllReplicas
+    # system.data_type_families
+    SimpleAggregateFunction
+)
+
+for w in "${client_compwords_positive[@]}"; do
+    test_completion_word_client "$w" || echo "[FAIL] $w (positive)"
+done
+
+for w in "${local_compwords_positive[@]}"; do
+    test_completion_word_local "$w" || echo "[FAIL] $w (positive)"
 done
 
 exit 0
diff --git a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
index 455e850b239..e933d599bd2 100644
--- a/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
+++ b/tests/queries/0_stateless/01676_range_hashed_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS database_for_range_dict;
 
 CREATE DATABASE database_for_range_dict;
diff --git a/tests/queries/0_stateless/01676_reinterpret_as.reference b/tests/queries/0_stateless/01676_reinterpret_as.reference
index 459ca166dc1..b800016375a 100644
--- a/tests/queries/0_stateless/01676_reinterpret_as.reference
+++ b/tests/queries/0_stateless/01676_reinterpret_as.reference
@@ -33,9 +33,9 @@ Dates
 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
 Decimals
-5.00	0.49
-5.00	0.49
-5.00	0.49
-5.00	0.49
-0.00
+5	0.49
+5	0.49
+5	0.49
+5	0.49
+0
 ReinterpretErrors
diff --git a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
index f200ead341b..c6133e7a5ee 100644
--- a/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01681_cache_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01681_database_for_cache_dictionary;
 CREATE DATABASE 01681_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh b/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
index 0bbf8942c1a..62469da0b3e 100755
--- a/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
+++ b/tests/queries/0_stateless/01681_hyperscan_debug_assertion.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-debug, no-fasttest
+# Tag no-fasttest: Hyperscan
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
 
@@ -11,13 +13,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 M=1000000
 
-while true
-do
+i=0 retries=300
+while [[ $i -lt $retries ]]; do
     $CLICKHOUSE_CLIENT --allow_hyperscan 1 --max_memory_usage $M --format Null --query "
         SELECT [1, 2, 3, 11] = arraySort(multiMatchAllIndices('фабрикант', ['', 'рикан', 'а', 'f[a${RANDOM}e]b[ei]rl', 'ф[иа${RANDOM}эе]б[еэи][рпл]', 'афиукд', 'a[f${RANDOM}t],th', '^ф[аие${RANDOM}э]?б?[еэи]?$', 'бе${RANDOM}рлик', 'fa${RANDOM}b', 'фа[беьв]+е?[рл${RANDOM}ко]']))
     " 2>&1 | grep -q 'Memory limit' || break;
 
     M=$((M + 100000))
+    ((++i))
 done
 
 echo 'Ok'
diff --git a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
index 4cc83412457..dbbbf8ad454 100644
--- a/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01682_cache_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01682_database_for_cache_dictionary;
 CREATE DATABASE 01682_database_for_cache_dictionary;
 
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.reference b/tests/queries/0_stateless/01683_codec_encrypted.reference
index 0d30be781e5..4bed8ab92b8 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.reference
+++ b/tests/queries/0_stateless/01683_codec_encrypted.reference
@@ -1 +1,2 @@
 1	Some plaintext
+1	Some plaintext
diff --git a/tests/queries/0_stateless/01683_codec_encrypted.sql b/tests/queries/0_stateless/01683_codec_encrypted.sql
index ec90e6c3129..d3ba1bb5e69 100644
--- a/tests/queries/0_stateless/01683_codec_encrypted.sql
+++ b/tests/queries/0_stateless/01683_codec_encrypted.sql
@@ -1,5 +1,15 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 DROP TABLE IF EXISTS encryption_test;
-CREATE TABLE encryption_test (i Int, s String Codec(Encrypted('AES-128-GCM-SIV'))) ENGINE = MergeTree ORDER BY i;
+CREATE TABLE encryption_test (i Int, s String Codec(AES_128_GCM_SIV)) ENGINE = MergeTree ORDER BY i;
+
+INSERT INTO encryption_test VALUES (1, 'Some plaintext');
+SELECT * FROM encryption_test;
+
+DROP TABLE encryption_test;
+
+CREATE TABLE encryption_test (i Int, s String Codec(AES_256_GCM_SIV)) ENGINE = MergeTree ORDER BY i;
 
 INSERT INTO encryption_test VALUES (1, 'Some plaintext');
 SELECT * FROM encryption_test;
diff --git a/tests/queries/0_stateless/01683_flat_dictionary.sql b/tests/queries/0_stateless/01683_flat_dictionary.sql
index c9f864c6a16..f65695219a5 100644
--- a/tests/queries/0_stateless/01683_flat_dictionary.sql
+++ b/tests/queries/0_stateless/01683_flat_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01681_database_for_flat_dictionary;
 CREATE DATABASE 01681_database_for_flat_dictionary;
 
diff --git a/tests/queries/0_stateless/01683_text_log_deadlock.sh b/tests/queries/0_stateless/01683_text_log_deadlock.sh
index ee772bffa27..debb7a0017f 100755
--- a/tests/queries/0_stateless/01683_text_log_deadlock.sh
+++ b/tests/queries/0_stateless/01683_text_log_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
index 712fbfcc506..830f987e811 100644
--- a/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
+++ b/tests/queries/0_stateless/01684_insert_specify_shard_id.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 DROP TABLE IF EXISTS x;
 DROP TABLE IF EXISTS x_dist;
 DROP TABLE IF EXISTS y;
diff --git a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
index 3e6b5146a80..5a030bfdfaf 100755
--- a/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
+++ b/tests/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01685_json_extract_double_as_float.sql b/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
index c9aa2518085..ffbddf43907 100644
--- a/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
+++ b/tests/queries/0_stateless/01685_json_extract_double_as_float.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 WITH '{ "v":1.1}' AS raw
 SELECT
     JSONExtract(raw, 'v', 'float') AS float32_1,
diff --git a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
index 82344a64e99..7f47ce1438f 100755
--- a/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
+++ b/tests/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01686_rocksdb.sql b/tests/queries/0_stateless/01686_rocksdb.sql
index 23baf249d1f..ad6f56772b0 100644
--- a/tests/queries/0_stateless/01686_rocksdb.sql
+++ b/tests/queries/0_stateless/01686_rocksdb.sql
@@ -1,3 +1,7 @@
+-- Tags: no-ordinary-database, no-fasttest
+-- Tag no-ordinary-database: Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database
+-- Tag no-fasttest: In fasttest, ENABLE_LIBRARIES=0, so rocksdb engine is not enabled by default
+
 DROP TABLE IF EXISTS 01686_test;
 
 CREATE TABLE 01686_test (key UInt64, value String) Engine=EmbeddedRocksDB PRIMARY KEY(key);
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
index e491dd9e091..dcee18b33e0 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.reference
@@ -12,3 +12,5 @@ blocks
 failed_parts
 last_part
 parallel
+shared
+shared
diff --git a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
index 02457a956a1..cf4bc7650e7 100644
--- a/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
+++ b/tests/queries/0_stateless/01700_system_zookeeper_path_in.sql
@@ -1,22 +1,24 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS sample_table;
 
 CREATE TABLE sample_table (
     key UInt64
 )
-ENGINE ReplicatedMergeTree('/clickhouse/01700_system_zookeeper_path_in/{shard}', '{replica}')
+ENGINE ReplicatedMergeTree('/clickhouse/{database}/01700_system_zookeeper_path_in/{shard}', '{replica}')
 ORDER BY tuple();
 
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/01700_system_zookeeper_path_in/s1' AND name like 'block%' ORDER BY name;
-SELECT name FROM system.zookeeper WHERE path = '/clickhouse/01700_system_zookeeper_path_in/s1/replicas' AND name LIKE '%r1%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1' AND name like 'block%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path = '/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1/replicas' AND name LIKE '%r1%' ORDER BY name;
 
 SELECT '========';
-SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/s1') AND name LIKE 'block%' ORDER BY name;
-SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/s1/replicas') AND name LIKE '%r1%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1') AND name LIKE 'block%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1/replicas') AND name LIKE '%r1%' ORDER BY name;
 SELECT '========';
-SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/01700_system_zookeeper_path_in/s1',
-                                                 '/clickhouse/01700_system_zookeeper_path_in/s1/replicas') AND name LIKE 'block%' ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN ('/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1',
+                                                 '/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1/replicas') AND name LIKE 'block%' ORDER BY name;
 SELECT '========';
-SELECT name FROM system.zookeeper WHERE path IN (SELECT concat('/clickhouse/01700_system_zookeeper_path_in/s1/', name)
-    FROM system.zookeeper WHERE (name != 'replicas' AND name NOT LIKE 'leader_election%' AND path = '/clickhouse/01700_system_zookeeper_path_in/s1')) ORDER BY name;
+SELECT name FROM system.zookeeper WHERE path IN (SELECT concat('/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1/', name)
+    FROM system.zookeeper WHERE (name != 'replicas' AND name NOT LIKE 'leader_election%' AND path = '/clickhouse/' || currentDatabase() || '/01700_system_zookeeper_path_in/s1')) ORDER BY name;
 
 DROP TABLE IF EXISTS sample_table;
diff --git a/tests/queries/0_stateless/01702_system_query_log.reference b/tests/queries/0_stateless/01702_system_query_log.reference
index 1f329feac22..c9d75db01c0 100644
--- a/tests/queries/0_stateless/01702_system_query_log.reference
+++ b/tests/queries/0_stateless/01702_system_query_log.reference
@@ -42,7 +42,7 @@ Alter	ALTER TABLE sqllt.table DROP COLUMN the_new_col;
 Alter	ALTER TABLE sqllt.table UPDATE i = i + 1 WHERE 1;
 Alter	ALTER TABLE sqllt.table DELETE WHERE i > 65535;
 Select	-- not done, seems to hard, so I\'ve skipped queries of ALTER-X, where X is:\n-- PARTITION\n-- ORDER BY\n-- SAMPLE BY\n-- INDEX\n-- CONSTRAINT\n-- TTL\n-- USER\n-- QUOTA\n-- ROLE\n-- ROW POLICY\n-- SETTINGS PROFILE\n\nSELECT \'SYSTEM queries\';
-System	SYSTEM FLUSH LOGS;
+System	SYSTEM FLUSH LOGS
 System	SYSTEM STOP MERGES sqllt.table
 System	SYSTEM START MERGES sqllt.table
 System	SYSTEM STOP TTL MERGES sqllt.table
diff --git a/tests/queries/0_stateless/01702_system_query_log.sql b/tests/queries/0_stateless/01702_system_query_log.sql
index e3ebf97edb7..f40b2604645 100644
--- a/tests/queries/0_stateless/01702_system_query_log.sql
+++ b/tests/queries/0_stateless/01702_system_query_log.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- fire all kinds of queries and then check if those are present in the system.query_log
 SET log_comment='system.query_log logging test';
 
diff --git a/tests/queries/0_stateless/01710_join_use_nulls.reference b/tests/queries/0_stateless/01707_join_use_nulls.reference
similarity index 100%
rename from tests/queries/0_stateless/01710_join_use_nulls.reference
rename to tests/queries/0_stateless/01707_join_use_nulls.reference
diff --git a/tests/queries/0_stateless/01710_join_use_nulls.sql b/tests/queries/0_stateless/01707_join_use_nulls.sql
similarity index 100%
rename from tests/queries/0_stateless/01710_join_use_nulls.sql
rename to tests/queries/0_stateless/01707_join_use_nulls.sql
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection.reference b/tests/queries/0_stateless/01710_minmax_count_projection.reference
new file mode 100644
index 00000000000..ed78b475842
--- /dev/null
+++ b/tests/queries/0_stateless/01710_minmax_count_projection.reference
@@ -0,0 +1,10 @@
+0	9999	10000
+0	9998	5000
+1	9999	5000
+0	9998	5000
+1
+0
+1
+0	9999
+1	9999
+3
diff --git a/tests/queries/0_stateless/01710_minmax_count_projection.sql b/tests/queries/0_stateless/01710_minmax_count_projection.sql
new file mode 100644
index 00000000000..0138ad8c57e
--- /dev/null
+++ b/tests/queries/0_stateless/01710_minmax_count_projection.sql
@@ -0,0 +1,45 @@
+drop table if exists d;
+
+create table d (i int, j int) engine MergeTree partition by i % 2 order by tuple() settings index_granularity = 1;
+
+insert into d select number, number from numbers(10000);
+
+set max_rows_to_read = 2, allow_experimental_projection_optimization = 1;
+
+select min(i), max(i), count() from d;
+select min(i), max(i), count() from d group by _partition_id order by _partition_id;
+select min(i), max(i), count() from d where _partition_value.1 = 0 group by _partition_id order by _partition_id;
+select min(i), max(i), count() from d where _partition_value.1 = 10 group by _partition_id order by _partition_id;
+
+-- fuzz crash
+select min(i) from d where 1 = _partition_value.1;
+
+drop table d;
+
+drop table if exists has_final_mark;
+drop table if exists mixed_final_mark;
+
+create table has_final_mark (i int, j int) engine MergeTree partition by i % 2 order by j settings index_granularity = 10, write_final_mark = 1;
+create table mixed_final_mark (i int, j int) engine MergeTree partition by i % 2 order by j settings index_granularity = 10;
+
+set max_rows_to_read = 100000;
+
+insert into has_final_mark select number, number from numbers(10000);
+
+alter table mixed_final_mark attach partition 1 from has_final_mark;
+
+set max_rows_to_read = 2;
+
+select min(j) from has_final_mark;
+select min(j) from mixed_final_mark;
+
+select min(j), max(j) from has_final_mark;
+
+set max_rows_to_read = 5001; -- one normal part 5000 + one minmax_count_projection part 1
+select min(j), max(j) from mixed_final_mark;
+
+-- The first primary expr is the same of some partition column
+drop table if exists t;
+create table t (server_date Date, something String) engine MergeTree partition by (toYYYYMM(server_date), server_date) order by (server_date, something);
+insert into t values ('2019-01-01', 'test1'), ('2019-02-01', 'test2'), ('2019-03-01', 'test3');
+select count() from t;
diff --git a/tests/queries/0_stateless/01710_normal_projections.reference b/tests/queries/0_stateless/01710_normal_projections.reference
index a935f5b71d8..22ee679ce53 100644
--- a/tests/queries/0_stateless/01710_normal_projections.reference
+++ b/tests/queries/0_stateless/01710_normal_projections.reference
@@ -100,3 +100,4 @@ optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 0
 		"rows_read": 100,
 optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1
 		"rows_read": 100,
+50
diff --git a/tests/queries/0_stateless/01710_normal_projections.sh b/tests/queries/0_stateless/01710_normal_projections.sh
index 6b16021de17..70e38b3722a 100755
--- a/tests/queries/0_stateless/01710_normal_projections.sh
+++ b/tests/queries/0_stateless/01710_normal_projections.sh
@@ -77,4 +77,7 @@ echo "optimize_move_to_prewhere = 1, allow_experimental_projection_optimization
 $CLICKHOUSE_CLIENT -q "SELECT * FROM test_sort_proj WHERE y > 4294967286 order by x FORMAT JSON
                        SETTINGS optimize_move_to_prewhere = 1, allow_experimental_projection_optimization = 1" | grep rows_read
 
+$CLICKHOUSE_CLIENT -q "ALTER TABLE test_sort_proj DELETE WHERE x % 2 = 0 SETTINGS mutations_sync=2;"
+$CLICKHOUSE_CLIENT -q "SELECT count() from test_sort_proj;"
+
 $CLICKHOUSE_CLIENT -q "DROP TABLE test_sort_proj"
diff --git a/tests/queries/0_stateless/01710_projection_array_join.reference b/tests/queries/0_stateless/01710_projection_array_join.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_array_join.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/01710_projection_array_join.sql b/tests/queries/0_stateless/01710_projection_array_join.sql
new file mode 100644
index 00000000000..cd18d9282b9
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_array_join.sql
@@ -0,0 +1,11 @@
+set allow_experimental_projection_optimization = 1;
+
+drop table if exists x;
+
+create table x (pk int, arr Array(int), projection p (select arr order by pk)) engine MergeTree order by tuple();
+
+insert into x values (1, [2]);
+
+select a from x array join arr as a;
+
+drop table x;
diff --git a/tests/queries/0_stateless/01710_projection_fetch.reference b/tests/queries/0_stateless/01710_projection_fetch_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01710_projection_fetch.reference
rename to tests/queries/0_stateless/01710_projection_fetch_long.reference
diff --git a/tests/queries/0_stateless/01710_projection_fetch.sql b/tests/queries/0_stateless/01710_projection_fetch_long.sql
similarity index 74%
rename from tests/queries/0_stateless/01710_projection_fetch.sql
rename to tests/queries/0_stateless/01710_projection_fetch_long.sql
index 7e4f6cc1d9a..6c41c69254e 100644
--- a/tests/queries/0_stateless/01710_projection_fetch.sql
+++ b/tests/queries/0_stateless/01710_projection_fetch_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 drop table if exists tp_1;
 drop table if exists tp_2;
 
@@ -18,23 +20,23 @@ select * from tp_2 order by x;
 -- test projection creation, materialization, clear and drop
 alter table tp_1 add projection pp (select x, count() group by x);
 system sync replica tp_2;
-select count() from system.projection_parts where table = 'tp_2' and name = 'pp' and active;
+select count() from system.projection_parts where database = currentDatabase() and table = 'tp_2' and name = 'pp' and active;
 show create table tp_2;
 
 -- all other three operations are mutations
 set mutations_sync = 2;
 alter table tp_1 materialize projection pp;
-select count() from system.projection_parts where table = 'tp_2' and name = 'pp' and active;
+select count() from system.projection_parts where database = currentDatabase() and table = 'tp_2' and name = 'pp' and active;
 show create table tp_2;
 
 alter table tp_1 clear projection pp;
 system sync replica tp_2;
-select * from system.projection_parts where table = 'tp_2' and name = 'pp' and active;
+select * from system.projection_parts where database = currentDatabase() and table = 'tp_2' and name = 'pp' and active;
 show create table tp_2;
 
 alter table tp_1 drop projection pp;
 system sync replica tp_2;
-select * from system.projection_parts where table = 'tp_2' and name = 'pp' and active;
+select * from system.projection_parts where database = currentDatabase() and table = 'tp_2' and name = 'pp' and active;
 show create table tp_2;
 
 drop table if exists tp_1;
diff --git a/tests/queries/0_stateless/01710_projection_materialize_with_missing_columns.reference b/tests/queries/0_stateless/01710_projection_materialize_with_missing_columns.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_materialize_with_missing_columns.sql b/tests/queries/0_stateless/01710_projection_materialize_with_missing_columns.sql
new file mode 100644
index 00000000000..28bf1c050d0
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_materialize_with_missing_columns.sql
@@ -0,0 +1,9 @@
+drop table if exists x;
+
+create table x (i int) engine MergeTree order by tuple();
+insert into x values (1);
+alter table x add column j int;
+alter table x add projection p_agg (select sum(j));
+alter table x materialize projection p_agg settings mutations_sync = 1;
+
+drop table x;
diff --git a/tests/queries/0_stateless/01710_projection_vertical_merges.reference b/tests/queries/0_stateless/01710_projection_vertical_merges.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_vertical_merges.sql b/tests/queries/0_stateless/01710_projection_vertical_merges.sql
new file mode 100644
index 00000000000..d54fef7e71d
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_vertical_merges.sql
@@ -0,0 +1,19 @@
+-- Tags: long, no-parallel
+
+drop table if exists t;
+
+create table t (c1 Int64, c2 String, c3 DateTime, c4 Int8, c5 String, c6 String, c7 String, c8 String, c9 String, c10 String, c11 String, c12 String, c13 Int8, c14 Int64, c15 String, c16 String, c17 String, c18 Int64, c19 Int64, c20 Int64) engine MergeTree order by c18;
+
+insert into t (c1, c18) select number, -number from numbers(2000000);
+
+alter table t add projection p_norm (select * order by c1);
+
+optimize table t final;
+
+alter table t materialize projection p_norm settings mutations_sync = 1;
+
+set allow_experimental_projection_optimization = 1, max_rows_to_read = 3;
+
+select c18 from t where c1 < 0;
+
+drop table t;
diff --git a/tests/queries/0_stateless/01710_projection_with_joins.reference b/tests/queries/0_stateless/01710_projection_with_joins.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_with_joins.sql b/tests/queries/0_stateless/01710_projection_with_joins.sql
new file mode 100644
index 00000000000..fcd1c586fa3
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_with_joins.sql
@@ -0,0 +1,8 @@
+drop table if exists t;
+
+create table t (s UInt16, l UInt16, projection p (select s, l  order by l)) engine MergeTree order by s;
+
+select s from t join (select toUInt16(1) as s) x using (s) settings allow_experimental_projection_optimization = 1;
+select s from t join (select toUInt16(1) as s) x using (s) settings allow_experimental_projection_optimization = 0;
+
+drop table t;
diff --git a/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.reference b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
new file mode 100644
index 00000000000..734aa659146
--- /dev/null
+++ b/tests/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
@@ -0,0 +1,9 @@
+drop table if exists t;
+
+create table t (x UInt32) engine = MergeTree order by tuple() settings index_granularity = 8;
+insert into t select number from numbers(100);
+alter table t add projection p (select uniqHLL12(x));
+insert into t select number + 100 from numbers(100);
+select uniqHLL12(x) from t settings allow_experimental_projection_optimization = 1, max_bytes_to_read=400, max_block_size=8; -- { serverError 307; }
+
+drop table if exists t;
diff --git a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
index 475e8372fc6..fa734b605cd 100644
--- a/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
+++ b/tests/queries/0_stateless/01710_projections_in_distributed_query.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 drop table if exists projection_test;
 
 create table projection_test (dt DateTime, cost Int64, projection p (select toStartOfMinute(dt) dt_m, sum(cost) group by dt_m)) engine MergeTree partition by toDate(dt) order by dt;
diff --git a/tests/queries/0_stateless/01711_decimal_multiplication.reference b/tests/queries/0_stateless/01711_decimal_multiplication.reference
index 37869329ca4..487b1165348 100644
--- a/tests/queries/0_stateless/01711_decimal_multiplication.reference
+++ b/tests/queries/0_stateless/01711_decimal_multiplication.reference
@@ -1,4 +1,4 @@
-2.0000
-2.0000
-2.0000
-2.0000
+2
+2
+2
+2
diff --git a/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql b/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
index 7d4c83c9d3a..1709a2d412a 100644
--- a/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
+++ b/tests/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS ttl_table;
 
 CREATE TABLE ttl_table
@@ -5,7 +7,7 @@ CREATE TABLE ttl_table
     date Date,
     value UInt64
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01713_table_ttl', '1', date, date, 8192)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01713_table_ttl', '1', date, date, 8192)
 TTL date + INTERVAL 2 MONTH; --{ serverError 36 }
 
 CREATE TABLE ttl_table
@@ -13,7 +15,7 @@ CREATE TABLE ttl_table
     date Date,
     value UInt64
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01713_table_ttl', '1', date, date, 8192)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01713_table_ttl', '1', date, date, 8192)
 PARTITION BY date; --{ serverError 42 }
 
 CREATE TABLE ttl_table
@@ -21,7 +23,7 @@ CREATE TABLE ttl_table
     date Date,
     value UInt64
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_01713_table_ttl', '1', date, date, 8192)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_01713_table_ttl', '1', date, date, 8192)
 ORDER BY value; --{ serverError 42 }
 
 SELECT 1;
diff --git a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper.reference b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01715_background_checker_blather_zookeeper.reference
rename to tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper.sql b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
similarity index 72%
rename from tests/queries/0_stateless/01715_background_checker_blather_zookeeper.sql
rename to tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
index 66b53369517..dad5cdbf1f3 100644
--- a/tests/queries/0_stateless/01715_background_checker_blather_zookeeper.sql
+++ b/tests/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
@@ -1,12 +1,14 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS i20203_1;
 DROP TABLE IF EXISTS i20203_2;
 
 CREATE TABLE i20203_1 (a Int8)
-ENGINE = ReplicatedMergeTree('/clickhouse/01715_background_checker_i20203', 'r1')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/01715_background_checker_i20203', 'r1')
 ORDER BY tuple();
 
 CREATE TABLE i20203_2 (a Int8)
-ENGINE = ReplicatedMergeTree('/clickhouse/01715_background_checker_i20203', 'r2')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/01715_background_checker_i20203', 'r2')
 ORDER BY tuple();
 
 DETACH TABLE i20203_2;
diff --git a/tests/queries/0_stateless/01717_global_with_subquery_fix.sql b/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
index 14c4ac3e4ca..eaebbe1163e 100644
--- a/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
+++ b/tests/queries/0_stateless/01717_global_with_subquery_fix.sql
@@ -1 +1,3 @@
+-- Tags: global
+
 WITH (SELECT count(distinct colU) from tabA) AS withA, (SELECT count(distinct colU) from tabA) AS withB SELECT withA / withB AS ratio FROM (SELECT date AS period, colX FROM (SELECT date, if(colA IN (SELECT colB FROM tabC), 0, colA) AS colX FROM tabB) AS tempB GROUP BY period, colX) AS main; -- {serverError 60}
diff --git a/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql b/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
index a0a4fbbfab9..216a6284508 100644
--- a/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
+++ b/tests/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01720_dictionary_db;
 CREATE DATABASE 01720_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2 b/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2
index f7760c38163..d1de6d06593 100644
--- a/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2
+++ b/tests/queries/0_stateless/01720_join_implicit_cast.sql.j2
@@ -42,14 +42,13 @@ SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 RIGHT JOI
 SELECT sum(a) + sum(t_ab2.a) - 1, sum(b) + sum(t_ab2.b) - 1 FROM t_ab1 INNER JOIN t_ab2 ON (t_ab1.a == t_ab2.a AND t_ab1.b == t_ab2.b);
 
 SELECT '= types =';
-
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 FULL JOIN t_ab2 USING (a, b);
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 LEFT JOIN t_ab2 USING (a, b);
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 RIGHT JOIN t_ab2 USING (a, b);
 SELECT any(toTypeName(a)) == 'Int32' AND any(toTypeName(b)) == 'Nullable(Int64)' FROM t_ab1 INNER JOIN t_ab2 USING (a, b);
 
-SELECT * FROM ( SELECT a, b as "CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a); -- { serverError 44 }
-SELECT * FROM ( SELECT a, b as "CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 USING (a) FORMAT Null;
+SELECT * FROM ( SELECT a, b as "_CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 ON (t_ab1.a == t_ab2.a); -- { serverError 44 }
+SELECT * FROM ( SELECT a, b as "_CAST(a, Int32)" FROM t_ab1 ) t_ab1 FULL JOIN t_ab2 USING (a) FORMAT Null;
 
 {% endfor %}
 
diff --git a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.reference b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.reference
index cfc5444a56e..db98b9dacbb 100644
--- a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.reference
+++ b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.reference
@@ -1,10 +1,10 @@
 -------- 42 --------
-42	14.0000	14.00000000	14.00000000	14.0000000000000000627860895963620057088
-42	14.0000	14.00000000	14.00000000
-14.0000	14.00000000	14.00000000
+42	14	14	14	14.0000000000000000627860895963620057088
+42	14	14	14
+14	14	14
 -------- 4999 --------
-4999	1666.3333	1666.33333333	1666.33333333	1666.3333333333331934501138529985348370480
+4999	1666.3333	1666.33333333	1666.33333333	1666.333333333333193450113852998534837048
 4999	1666.3333	1666.33333333	1666.33333333
 1666.3333	1666.33333333	1666.33333333
 -------- 5000 --------
-0.1100	0.11000000	0.11000000
+0.11	0.11	0.11
diff --git a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
index 0451d455009..272bd2d7104 100644
--- a/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
+++ b/tests/queries/0_stateless/01721_dictionary_decimal_p_s.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 set allow_experimental_bigint_types=1;
 drop database if exists db_01721;
 drop table if exists db_01721.table_decimal_dict;
diff --git a/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql b/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
index 079b2546a20..fb61931d738 100644
--- a/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
+++ b/tests/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database, no-parallel
+-- Tag no-replicated-database: user_files
+
 DROP TABLE IF EXISTS test;
 
 INSERT INTO TABLE FUNCTION file('01721_file/test/data.TSV', 'TSV', 'id UInt32') VALUES (1);
diff --git a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2 b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
index 4479f507046..8c3ed03fce7 100644
--- a/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
+++ b/tests/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 
diff --git a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
index a187d778fdb..7295537a2d2 100755
--- a/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
index e43b81dca48..7f36bcb6c8a 100644
--- a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
+++ b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, distributed
+
 drop table if exists data_01730;
 
 -- does not use 127.1 due to prefer_localhost_replica
diff --git a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
index b7dd76760d4..5bb10220f7f 100755
--- a/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
+++ b/tests/queries/0_stateless/01732_race_condition_storage_join_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 unset CLICKHOUSE_LOG_COMMENT
 
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
index 2d0a480a375..0c286bfbd21 100644
--- a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -32,4 +32,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
index a4fd7529ab2..d83656e0e8c 100755
--- a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
index cad7b5803d4..4648889ca27 100644
--- a/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
+++ b/tests/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS fuse_tbl;
 CREATE TABLE fuse_tbl(a Int8, b Int8) Engine = Log;
 INSERT INTO fuse_tbl SELECT number, number + 1 FROM numbers(1, 20);
 
-SET optimize_fuse_sum_count_avg = 1;
+SET optimize_syntax_fuse_functions = 1;
 SELECT sum(a), sum(b), count(b) from fuse_tbl;
 EXPLAIN SYNTAX SELECT sum(a), sum(b), count(b) from fuse_tbl;
 SELECT '---------NOT trigger fuse--------';
diff --git a/tests/queries/0_stateless/01746_convert_type_with_default.reference b/tests/queries/0_stateless/01746_convert_type_with_default.reference
new file mode 100644
index 00000000000..9ebef9c4a8d
--- /dev/null
+++ b/tests/queries/0_stateless/01746_convert_type_with_default.reference
@@ -0,0 +1,24 @@
+1
+2
+-1
+-2
+1
+2
+-1
+-2
+1
+2
+-1
+-2
+1
+2
+-1
+-2
+-1
+-2
+1
+2
+-1
+-2
+61f0c404-5cb3-11e7-907b-a6006ad3dba0
+59f0c404-5cb3-11e7-907b-a6006ad3dba0
diff --git a/tests/queries/0_stateless/01746_convert_type_with_default.sql b/tests/queries/0_stateless/01746_convert_type_with_default.sql
new file mode 100644
index 00000000000..0881e911466
--- /dev/null
+++ b/tests/queries/0_stateless/01746_convert_type_with_default.sql
@@ -0,0 +1,30 @@
+select toUInt8OrDefault('1', cast(2 as UInt8));
+select toUInt8OrDefault('1xx', cast(2 as UInt8));
+select toInt8OrDefault('-1', cast(-2 as Int8));
+select toInt8OrDefault('-1xx', cast(-2 as Int8));
+
+select toUInt16OrDefault('1', cast(2 as UInt16));
+select toUInt16OrDefault('1xx', cast(2 as UInt16));
+select toInt16OrDefault('-1', cast(-2 as Int16));
+select toInt16OrDefault('-1xx', cast(-2 as Int16));
+
+select toUInt32OrDefault('1', cast(2 as UInt32));
+select toUInt32OrDefault('1xx', cast(2 as UInt32));
+select toInt32OrDefault('-1', cast(-2 as Int32));
+select toInt32OrDefault('-1xx', cast(-2 as Int32));
+
+select toUInt64OrDefault('1', cast(2 as UInt64));
+select toUInt64OrDefault('1xx', cast(2 as UInt64));
+select toInt64OrDefault('-1', cast(-2 as Int64));
+select toInt64OrDefault('-1xx', cast(-2 as Int64));
+
+select toInt128OrDefault('-1', cast(-2 as Int128));
+select toInt128OrDefault('-1xx', cast(-2 as Int128));
+
+select toUInt256OrDefault('1', cast(2 as UInt256));
+select toUInt256OrDefault('1xx', cast(2 as UInt256));
+select toInt256OrDefault('-1', cast(-2 as Int256));
+select toInt256OrDefault('-1xx', cast(-2 as Int256));
+
+SELECT toUUIDOrDefault('61f0c404-5cb3-11e7-907b-a6006ad3dba0', cast('59f0c404-5cb3-11e7-907b-a6006ad3dba0' as UUID));
+SELECT toUUIDOrDefault('-----61f0c404-5cb3-11e7-907b-a6006ad3dba0', cast('59f0c404-5cb3-11e7-907b-a6006ad3dba0' as UUID));
diff --git a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
index aa59d209b51..69c37d127dc 100644
--- a/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
+++ b/tests/queries/0_stateless/01746_executable_pool_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'executable_pool_simple';
 
 SELECT dictGet('executable_pool_simple', 'a', toUInt64(1));
diff --git a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
index 7a2343a953a..feaf4bcf623 100755
--- a/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
index f520a21e9b3..02943cad583 100755
--- a/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
+++ b/tests/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.reference b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.reference
similarity index 100%
rename from tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.reference
rename to tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.reference
diff --git a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
similarity index 93%
rename from tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql
rename to tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
index 759c8ba3a0b..09a85baada6 100644
--- a/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql
+++ b/tests/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS report;
 
 CREATE TABLE report
@@ -39,7 +41,7 @@ CREATE TABLE replicated_report
     `branch` String,
     `generated_time` DateTime
 )
-ENGINE = ReplicatedMergeTree('/clickhouse/01747_alter_partition_key/t', '1')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/01747_alter_partition_key/t', '1')
 PARTITION BY (product, toYYYYMM(generated_time))
 ORDER BY (product, machine, branch, generated_time);
 
diff --git a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
index 6c6d33c7d43..fb3b7e20e98 100644
--- a/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
+++ b/tests/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'executable_pool_simple_implicit_key';
 
 SELECT dictGet('executable_pool_simple_implicit_key', 'a', toUInt64(1));
diff --git a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
index b43fa336485..11ecaf1ca2e 100644
--- a/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
+++ b/tests/queries/0_stateless/01747_join_view_filter_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists summing_table01747;
 drop view if exists rates01747;
 drop view if exists agg_view01747;
@@ -23,8 +25,8 @@ create table dictst01747(some_name String, field1 String, field2 UInt8) Engine =
 as select 'name', 'test', 33;
 
 CREATE DICTIONARY default.dict01747 (some_name String, field1 String, field2 UInt8)
-PRIMARY KEY some_name SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000 
-TABLE dictst01747 DB currentDatabase() USER 'default')) 
+PRIMARY KEY some_name SOURCE(CLICKHOUSE(HOST 'localhost' PORT 9000
+TABLE dictst01747 DB currentDatabase() USER 'default'))
 LIFETIME(MIN 0 MAX 0) LAYOUT(COMPLEX_KEY_HASHED());
 
 
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.reference b/tests/queries/0_stateless/01747_system_session_log_long.reference
new file mode 100644
index 00000000000..9ecf7e05421
--- /dev/null
+++ b/tests/queries/0_stateless/01747_system_session_log_long.reference
@@ -0,0 +1,218 @@
+
+#  no_password - User with profile from XML 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  no_password - No profiles no roles 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  no_password - Two profiles, no roles 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  no_password - Two profiles and two simple roles 
+TCP endpoint
+TCP 'wrong password' case is skipped for no_password.
+HTTP endpoint
+HTTP 'wrong password' case is skipped for no_password.
+MySQL endpoint
+MySQL 'wrong password' case is skipped for no_password.
+
+#  plaintext_password - No profiles no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  plaintext_password - Two profiles, no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  plaintext_password - Two profiles and two simple roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  sha256_password - No profiles no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+MySQL 'successful login' case is skipped for sha256_password.
+
+#  sha256_password - Two profiles, no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+MySQL 'successful login' case is skipped for sha256_password.
+
+#  sha256_password - Two profiles and two simple roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+MySQL 'successful login' case is skipped for sha256_password.
+
+#  double_sha1_password - No profiles no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  double_sha1_password - Two profiles, no roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+
+#  double_sha1_password - Two profiles and two simple roles 
+TCP endpoint
+HTTP endpoint
+MySQL endpoint
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	Logout	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_no_password_no_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_no_password_two_profiles_two_roles	MySQL	Logout	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	LoginSuccess	1
+${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	Logout	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_sha256_password_no_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_no_roles	MySQL	LoginFailure	many
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	LoginFailure	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	LoginSuccess	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	Logout	1
+${BASE_USERNAME}_sha256_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_double_sha1_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_no_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_no_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_no_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_no_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_plaintext_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_sha256_password_no_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_no_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_no_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_no_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_no_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_no_roles	MySQL	LoginFailure	many
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_two_roles	TCP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_two_roles	HTTP	LoginFailure	1
+invalid_${BASE_USERNAME}_sha256_password_two_profiles_two_roles	MySQL	LoginFailure	many
+invalid_session_log_test_xml_user	TCP	LoginFailure	1
+invalid_session_log_test_xml_user	HTTP	LoginFailure	1
+invalid_session_log_test_xml_user	MySQL	LoginFailure	many
+session_log_test_xml_user	TCP	LoginSuccess	1
+session_log_test_xml_user	TCP	Logout	1
+session_log_test_xml_user	HTTP	LoginSuccess	1
+session_log_test_xml_user	HTTP	Logout	1
+session_log_test_xml_user	MySQL	LoginSuccess	1
+session_log_test_xml_user	MySQL	Logout	1
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.sh b/tests/queries/0_stateless/01747_system_session_log_long.sh
new file mode 100755
index 00000000000..b41bf077b57
--- /dev/null
+++ b/tests/queries/0_stateless/01747_system_session_log_long.sh
@@ -0,0 +1,372 @@
+#!/usr/bin/env bash
+# Tags: long, no-parallel, no-fasttest
+# Tag no-fasttest: Accesses CH via mysql table function (which is unavailable)
+
+##################################################################################################
+# Verify that login, logout, and login failure events are properly stored in system.session_log
+# when different `IDENTIFIED BY` clauses are used on user.
+#
+# Make sure that system.session_log entries are non-empty and provide enough info on each event.
+#
+# Using multiple protocols
+# * native TCP protocol with CH client
+# * HTTP with CURL
+# * MySQL - CH server accesses itself via mysql table function, query typically fails (unrelated)
+#   but auth should be performed properly.
+# * PostgreSQL - CH server accesses itself via postgresql table function (currently out of order).
+# * gRPC - not done yet
+#
+# There is way to control how many time a query (e.g. via mysql table function) is retried
+# and hence variable number of records in session_log. To mitigate this and simplify final query,
+# each auth_type is tested for separate user. That way SELECT DISTINCT doesn't exclude log entries
+# from different cases.
+#
+# All created users added to the ALL_USERNAMES and later cleaned up.
+##################################################################################################
+
+# To minimize amount of error context sent on failed queries when talking to CH via MySQL protocol.
+export CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -eu
+
+# Since there is no way to cleanup system.session_log table,
+# make sure that we can identify log entries from this test by a random user name.
+readonly BASE_USERNAME="session_log_test_user_$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32)"
+readonly TMP_QUERY_FILE=$(mktemp /tmp/tmp_query.log.XXXXXX)
+declare -a ALL_USERNAMES
+ALL_USERNAMES+=("${BASE_USERNAME}")
+
+function reportError()
+{
+    if [ -s "${TMP_QUERY_FILE}" ] ;
+    then
+        echo "!!!!!! ERROR ${CLICKHOUSE_CLIENT} ${*} --queries-file ${TMP_QUERY_FILE}" >&2
+        echo "query:" >&2
+        cat "${TMP_QUERY_FILE}" >&2
+        rm -f "${TMP_QUERY_FILE}"
+    fi
+}
+
+function executeQuery()
+{
+    ## Execute query (provided via heredoc or herestring) and print query in case of error.
+    trap 'rm -f ${TMP_QUERY_FILE}; trap - ERR RETURN' RETURN
+    # Since we want to report with current values supplied to this function call
+    # shellcheck disable=SC2064
+    trap "reportError $*" ERR
+
+    cat - > "${TMP_QUERY_FILE}"
+    ${CLICKHOUSE_CLIENT} "${@}" --queries-file "${TMP_QUERY_FILE}"
+}
+
+function cleanup()
+{
+    local usernames_to_cleanup
+    usernames_to_cleanup="$(IFS=, ; echo "${ALL_USERNAMES[*]}")"
+    executeQuery <<EOF
+DROP USER IF EXISTS ${usernames_to_cleanup};
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile;
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile2;
+DROP ROLE IF EXISTS session_log_test_role;
+DROP ROLE IF EXISTS session_log_test_role2;
+EOF
+}
+
+cleanup
+trap "cleanup" EXIT
+
+function executeQueryExpectError()
+{
+    cat - > "${TMP_QUERY_FILE}"
+    ! ${CLICKHOUSE_CLIENT} "${@}" --multiquery --queries-file "${TMP_QUERY_FILE}" 2>&1 | tee -a ${TMP_QUERY_FILE}
+}
+
+function createUser()
+{
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        password=""
+
+    elif [[ "${auth_type}" == "plaintext_password" ]]
+    then
+        password="${password}"
+
+    elif [[ "${auth_type}" == "sha256_password" ]]
+    then
+        password="$(executeQuery <<< "SELECT hex(SHA256('${password}'))")"
+
+    elif [[ "${auth_type}" == "double_sha1_password" ]]
+    then
+        password="$(executeQuery <<< "SELECT hex(SHA1(SHA1('${password}')))")"
+
+    else
+        echo "Invalid auth_type: ${auth_type}" >&2
+        exit 1
+    fi
+
+    export RESULTING_PASS="${password}"
+    if [ -n "${password}" ]
+    then
+        password="BY '${password}'"
+    fi
+
+    executeQuery <<EOF
+DROP USER IF EXISTS '${username}';
+CREATE USER '${username}' IDENTIFIED WITH ${auth_type} ${password};
+EOF
+    ALL_USERNAMES+=("${username}")
+}
+
+function testTCP()
+{
+    echo "TCP endpoint"
+
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+
+    # Loging\Logout
+    if [[ -n "${password}" ]]
+    then
+        executeQuery -u "${username}" --password "${password}" <<< "SELECT 1 FORMAT Null;"
+    else
+        executeQuery -u "${username}" <<< "SELECT 1 FORMAT Null;" 
+    fi
+
+    # Wrong username
+    executeQueryExpectError -u "invalid_${username}" \
+        <<< "SELECT 1 Format Null" \
+        | grep -Eq "Code: 516. .+ invalid_${username}: Authentication failed: password is incorrect or there is no user with such name"
+
+    # Wrong password
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        echo "TCP 'wrong password' case is skipped for ${auth_type}."
+    else
+        # user with `no_password` user is able to login with any password, so it makes sense to skip this testcase.
+        executeQueryExpectError -u "${username}" --password  "invalid_${password}" \
+            <<< "SELECT 1 Format Null" \
+            | grep -Eq "Code: 516. .+ ${username}: Authentication failed: password is incorrect or there is no user with such name"
+    fi
+}
+
+function testHTTPWithURL()
+{
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+    local clickhouse_url="${4}"
+
+    # Loging\Logout
+    ${CLICKHOUSE_CURL} -sS "${clickhouse_url}" \
+        -H "X-ClickHouse-User: ${username}" -H "X-ClickHouse-Key: ${password}" \
+        -d 'SELECT 1 Format Null'
+
+    # Wrong username
+    ${CLICKHOUSE_CURL} -sS "${clickhouse_url}" \
+        -H "X-ClickHouse-User: invalid_${username}" -H "X-ClickHouse-Key: ${password}" \
+        -d 'SELECT 1 Format Null' \
+        | grep -Eq "Code: 516. .+ invalid_${username}: Authentication failed: password is incorrect or there is no user with such name"
+
+    # Wrong password
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        echo "HTTP 'wrong password' case is skipped for ${auth_type}."
+    else
+        # user with `no_password` is able to login with any password, so it makes sense to skip this testcase.
+        ${CLICKHOUSE_CURL} -sS "${clickhouse_url}" \
+            -H "X-ClickHouse-User: ${username}" -H "X-ClickHouse-Key: invalid_${password}" \
+            -d 'SELECT 1 Format Null' \
+            | grep -Eq "Code: 516. .+ ${username}: Authentication failed: password is incorrect or there is no user with such name"
+    fi
+}
+
+function testHTTP()
+{
+    echo "HTTP endpoint"
+    testHTTPWithURL "${1}" "${2}" "${3}" "${CLICKHOUSE_URL}"
+}
+
+function testHTTPNamedSession()
+{
+    # echo "HTTP endpoint with named session"
+    local HTTP_SESSION_ID
+    HTTP_SESSION_ID="session_id_$(cat /dev/urandom | tr -cd 'a-f0-9' | head -c 32)"
+    if [ -v CLICKHOUSE_URL_PARAMS ]
+    then
+        CLICKHOUSE_URL_WITH_SESSION_ID="${CLICKHOUSE_URL}&session_id=${HTTP_SESSION_ID}"
+    else
+        CLICKHOUSE_URL_WITH_SESSION_ID="${CLICKHOUSE_URL}?session_id=${HTTP_SESSION_ID}"
+    fi
+
+    testHTTPWithURL "${1}" "${2}" "${3}" "${CLICKHOUSE_URL_WITH_SESSION_ID}"
+}
+
+function testMySQL()
+{
+    echo "MySQL endpoint"
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+
+    trap "reportError" ERR
+
+    # echo 'Loging\Logout'
+    # sha256 auth is done differenctly for MySQL, so skip it for now.
+    if [[ "${auth_type}" == "sha256_password" ]]
+    then
+        echo "MySQL 'successful login' case is skipped for ${auth_type}."
+    else
+        # CH is able to log into itself via MySQL protocol but query fails.
+        executeQueryExpectError \
+            <<< "SELECT 1 FROM mysql('127.0.0.1:9004', 'system', 'numbers', '${username}', '${password}') LIMIT 1 \
+            FORMAT NUll" \
+            | grep -Eq "Code: 1000\. DB::Exception: .*"
+    fi
+
+    # echo 'Wrong username'
+    executeQueryExpectError \
+        <<< "SELECT 1 FROM mysql('127.0.0.1:9004', 'system', 'numbers', 'invalid_${username}', '${password}') LIMIT 1 \
+        FORMAT NUll" \
+        | grep -Eq "Code: 1000\. DB::Exception: .* invalid_${username}"
+
+    # echo 'Wrong password'
+    if [[ "${auth_type}" == "no_password" ]]
+    then
+        echo "MySQL 'wrong password' case is skipped for ${auth_type}."
+    else
+        # user with `no_password` is able to login with any password, so it makes sense to skip this testcase.
+        executeQueryExpectError \
+            <<< "SELECT 1 FROM mysql('127.0.0.1:9004', 'system', 'numbers', '${username}', 'invalid_${password}') LIMIT 1 \
+            FORMAT NUll" \
+            | grep -Eq "Code: 1000\. DB::Exception: .* ${username}"
+    fi
+}
+
+# function testPostgreSQL()
+# {
+#     local auth_type="${1}"
+#
+#     # Right now it is impossible to log into CH via PostgreSQL protocol without a password.
+#     if [[ "${auth_type}" == "no_password" ]]
+#     then
+#         return 0
+#     fi
+#
+#     # Loging\Logout
+#     # CH is being able to log into itself via PostgreSQL protocol but query fails.
+#     executeQueryExpectError \
+#         <<< "SELECT 1 FROM postgresql('localhost:9005', 'system', 'numbers', '${username}', '${password}') LIMIT 1 FORMAT NUll" \
+#         | grep -Eq "Code: 1001. DB::Exception: .* pqxx::broken_connection: .*"
+#
+#     # Wrong username
+#     executeQueryExpectError \
+#         <<< "SELECT 1 FROM postgresql('localhost:9005', 'system', 'numbers', 'invalid_${username}', '${password}') LIMIT 1 FORMAT NUll" \
+#         | grep -Eq "Code: 1001. DB::Exception: .* pqxx::broken_connection: .*"
+#
+#     # Wrong password
+#     executeQueryExpectError \
+#         <<< "SELECT 1 FROM postgresql('localhost:9005', 'system', 'numbers', '${username}', 'invalid_${password}') LIMIT 1 FORMAT NUll" \
+#         | grep -Eq "Code: 1001. DB::Exception: .* pqxx::broken_connection: .*"
+# }
+
+function runEndpointTests()
+{
+    local case_name="${1}"
+    shift 1
+
+    local auth_type="${1}"
+    local username="${2}"
+    local password="${3}"
+    local setup_queries="${4:-}"
+
+    echo 
+    echo "#  ${auth_type} - ${case_name} "
+
+    ${CLICKHOUSE_CLIENT} -q "SET log_comment='${username} ${auth_type} - ${case_name}';"
+    if [[ -n "${setup_queries}" ]]
+    then
+        # echo "Executing setup queries: ${setup_queries}"
+        echo "${setup_queries}" | executeQuery --multiquery
+    fi
+
+    testTCP "${auth_type}" "${username}" "${password}"
+    testHTTP "${auth_type}" "${username}" "${password}"
+
+    # testHTTPNamedSession "${auth_type}" "${username}" "${password}"
+    testMySQL "${auth_type}" "${username}" "${password}"
+    # testPostgreSQL "${auth_type}" "${username}" "${password}"
+}
+
+function testAsUserIdentifiedBy()
+{
+    local auth_type="${1}"
+    local password="password"
+
+    cleanup
+
+    local username="${BASE_USERNAME}_${auth_type}_no_profiles_no_roles"
+    createUser "${auth_type}" "${username}" "${password}"
+    runEndpointTests "No profiles no roles" "${auth_type}" "${username}" "${RESULTING_PASS}"
+
+    username="${BASE_USERNAME}_${auth_type}_two_profiles_no_roles"
+    createUser "${auth_type}" "${username}" "${password}"
+    runEndpointTests "Two profiles, no roles" "${auth_type}" "${username}" "${RESULTING_PASS}" "\
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile;
+DROP SETTINGS PROFILE IF EXISTS session_log_test_profile2;
+CREATE PROFILE session_log_test_profile SETTINGS max_memory_usage=10000000 TO ${username};
+CREATE PROFILE session_log_test_profile2 SETTINGS max_rows_to_transfer=1000 TO ${username};
+"
+
+    username="${BASE_USERNAME}_${auth_type}_two_profiles_two_roles"
+    createUser "${auth_type}" "${username}" "${password}"
+    runEndpointTests "Two profiles and two simple roles" "${auth_type}" "${username}" "${RESULTING_PASS}" "\
+CREATE ROLE session_log_test_role;
+GRANT session_log_test_role TO ${username};
+CREATE ROLE session_log_test_role2 SETTINGS max_columns_to_read=100;
+GRANT session_log_test_role2 TO ${username};
+SET DEFAULT ROLE session_log_test_role, session_log_test_role2 TO ${username};
+"
+}
+
+# to cut off previous runs
+readonly start_time="$(executeQuery <<< 'SELECT now64(6);')"
+
+# Special case: user and profile are both defined in XML
+runEndpointTests "User with profile from XML" "no_password" "session_log_test_xml_user" ''
+
+testAsUserIdentifiedBy "no_password"
+testAsUserIdentifiedBy "plaintext_password"
+testAsUserIdentifiedBy "sha256_password"
+testAsUserIdentifiedBy "double_sha1_password"
+
+executeQuery --multiquery <<EOF
+SYSTEM FLUSH LOGS;
+
+WITH
+    now64(6) as n,
+    toDateTime64('${start_time}', 3) as test_start_time
+SELECT
+    replaceAll(user, '${BASE_USERNAME}', '\${BASE_USERNAME}') as user_name,
+    interface,
+    type,
+    if(count(*) > 1, 'many', toString(count(*))) -- do not rely on count value since MySQL does arbitrary number of retries
+FROM
+    system.session_log
+WHERE
+    (user LIKE '%session_log_test_xml_user%' OR user LIKE '%${BASE_USERNAME}%')
+    AND
+    event_time_microseconds >= test_start_time
+GROUP BY
+    user_name, interface, type
+ORDER BY
+    user_name, interface, type;
+EOF
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01748_dictionary_table_dot.sql b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
index a974786f446..a2364fdf823 100644
--- a/tests/queries/0_stateless/01748_dictionary_table_dot.sql
+++ b/tests/queries/0_stateless/01748_dictionary_table_dot.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS test_01748;
 CREATE DATABASE test_01748;
 USE test_01748;
diff --git a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
index a6936aec913..c6af23bd1db 100644
--- a/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
+++ b/tests/queries/0_stateless/01752_distributed_query_sigsegv.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 -- this is enough to trigger the regression
 SELECT throwIf(dummy = 0) FROM remote('127.1', system.one); -- { serverError 395 }
 
diff --git a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
index afd91ffdaa5..86af09f391d 100644
--- a/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01753_direct_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01753_dictionary_db;
 CREATE DATABASE 01753_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
index d3046e73b93..40567f944df 100755
--- a/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
+++ b/tests/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
index 833f86c538d..59e0ca60f8f 100644
--- a/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
+++ b/tests/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
@@ -1,3 +1,5 @@
+-- Tags: replica, shard
+
 SELECT _shard_num FROM cluster('test_shard_localhost', system.one);
 SELECT _shard_num FROM clusterAllReplicas('test_shard_localhost', system.one);
 
diff --git a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
index 51b29457011..a695302161d 100644
--- a/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01754_direct_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01754_dictionary_db;
 CREATE DATABASE 01754_dictionary_db;
 
diff --git a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
index 5543af4dd05..89c4bec3dca 100755
--- a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
+++ b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
index 0e93d76573c..1633665610a 100644
--- a/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
+++ b/tests/queries/0_stateless/01755_shard_pruning_with_literal.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 
 drop table if exists data_01755;
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
index 972f4c89bdf..66fbe8a5d1c 100644
--- a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
@@ -1,17 +1,17 @@
 (0, 2)
 0	0
 0	0
-WITH CAST(\'default\', \'Nullable(String)\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
-WITH CAST(\'default\', \'Nullable(String)\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
+WITH _CAST(\'default\', \'Nullable(String)\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
+WITH _CAST(\'default\', \'Nullable(String)\') AS id_no SELECT one.dummy, ignore(id_no) FROM system.one WHERE dummy IN (0, 2)
 optimize_skip_unused_shards_rewrite_in(0, 2)
 0	0
-WITH CAST(\'default\', \'Nullable(String)\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(0)
-WITH CAST(\'default\', \'Nullable(String)\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(2)
+WITH _CAST(\'default\', \'Nullable(String)\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(0)
+WITH _CAST(\'default\', \'Nullable(String)\') AS id_02 SELECT one.dummy, ignore(id_02) FROM system.one WHERE dummy IN tuple(2)
 optimize_skip_unused_shards_rewrite_in(2,)
-WITH CAST(\'default\', \'Nullable(String)\') AS id_2 SELECT one.dummy, ignore(id_2) FROM system.one WHERE dummy IN tuple(2)
+WITH _CAST(\'default\', \'Nullable(String)\') AS id_2 SELECT one.dummy, ignore(id_2) FROM system.one WHERE dummy IN tuple(2)
 optimize_skip_unused_shards_rewrite_in(0,)
 0	0
-WITH CAST(\'default\', \'Nullable(String)\') AS id_0 SELECT one.dummy, ignore(id_0) FROM system.one WHERE dummy IN tuple(0)
+WITH _CAST(\'default\', \'Nullable(String)\') AS id_0 SELECT one.dummy, ignore(id_0) FROM system.one WHERE dummy IN tuple(0)
 0
 0
 errors
diff --git a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
index ea7d526c039..efde0ac1e60 100644
--- a/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- NOTE: this test cannot use 'current_database = currentDatabase()',
 -- because it does not propagated via remote queries,
 -- hence it uses 'with (select currentDatabase()) as X'
diff --git a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
index 68247dbfbe5..fd19e17b6bb 100644
--- a/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
+++ b/tests/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 drop table if exists dist_01757;
 create table dist_01757 as system.one engine=Distributed(test_cluster_two_shards, system, one, dummy);
 
diff --git a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
index d18ea8694a9..b963f3a618f 100755
--- a/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
+++ b/tests/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
diff --git a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
index 11a52976716..59f20ca7a51 100644
--- a/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
+++ b/tests/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01759_db;
 CREATE DATABASE 01759_db;
 
diff --git a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference
index e69de29bb2d..109c1835a6e 100644
--- a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference
+++ b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference
@@ -0,0 +1,4 @@
+-- { echo }
+select * from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
+select count() from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
+0
diff --git a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
index 2ddf318313f..937bd1c0c63 100644
--- a/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
+++ b/tests/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
@@ -1,3 +1,5 @@
-create table dist_01756 (dummy UInt8) ENGINE = Distributed('test_cluster_two_shards', 'system', 'one', dummy);
-select ignore(1), * from dist_01756 where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
-drop table dist_01756;
+-- Tags: shard
+
+-- { echo }
+select * from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
+select count() from remote('127.{1,2}', system, one, dummy)  where 0 settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
index 9c405640930..55c0d1e3678 100644
--- a/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
+++ b/tests/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS ddl_dictonary_test_source;
 CREATE TABLE ddl_dictonary_test_source
 (
diff --git a/tests/queries/0_stateless/01760_polygon_dictionaries.sql b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
index 0054be0642d..1589a091ee7 100644
--- a/tests/queries/0_stateless/01760_polygon_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_polygon_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01760_db;
 CREATE DATABASE 01760_db;
 
diff --git a/tests/queries/0_stateless/01760_system_dictionaries.sql b/tests/queries/0_stateless/01760_system_dictionaries.sql
index f4e0cfa0086..a5609281e49 100644
--- a/tests/queries/0_stateless/01760_system_dictionaries.sql
+++ b/tests/queries/0_stateless/01760_system_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01760_db;
 CREATE DATABASE 01760_db;
 
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper.reference b/tests/queries/0_stateless/01761_alter_decimal_zookeeper.reference
deleted file mode 100644
index 5dcc95fd7b7..00000000000
--- a/tests/queries/0_stateless/01761_alter_decimal_zookeeper.reference
+++ /dev/null
@@ -1,9 +0,0 @@
-1	5.00000000
-2	6.00000000
-CREATE TABLE default.test_alter_decimal\n(\n    `n` UInt64,\n    `d` Decimal(18, 8)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/01761_alter_decimal_zookeeper\', \'r1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-1	5.00000000
-2	6.00000000
-CREATE TABLE default.test_alter_decimal\n(\n    `n` UInt64,\n    `d` Decimal(18, 8)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/01761_alter_decimal_zookeeper\', \'r1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
-1	5.00000000
-2	6.00000000
-3	7.00000000
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.reference b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.reference
new file mode 100644
index 00000000000..ad5f224bc73
--- /dev/null
+++ b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.reference
@@ -0,0 +1,9 @@
+1	5
+2	6
+CREATE TABLE default.test_alter_decimal\n(\n    `n` UInt64,\n    `d` Decimal(18, 8)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/01761_alter_decimal_zookeeper\', \'r1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+1	5
+2	6
+CREATE TABLE default.test_alter_decimal\n(\n    `n` UInt64,\n    `d` Decimal(18, 8)\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/01761_alter_decimal_zookeeper\', \'r1\')\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+1	5
+2	6
+3	7
diff --git a/tests/queries/0_stateless/01761_alter_decimal_zookeeper.sql b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
similarity index 86%
rename from tests/queries/0_stateless/01761_alter_decimal_zookeeper.sql
rename to tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
index 01766f0d6c2..5d28e8ca6b3 100644
--- a/tests/queries/0_stateless/01761_alter_decimal_zookeeper.sql
+++ b/tests/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
@@ -1,8 +1,10 @@
+-- Tags: long, zookeeper
+
 DROP TABLE IF EXISTS test_alter_decimal;
 
 CREATE TABLE test_alter_decimal
 (n UInt64, d Decimal(15, 8))
-ENGINE = ReplicatedMergeTree('/clickhouse/01761_alter_decimal_zookeeper', 'r1')
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/01761_alter_decimal_zookeeper', 'r1')
 ORDER BY tuple();
 
 INSERT INTO test_alter_decimal VALUES (1, toDecimal32(5, 5));
diff --git a/tests/queries/0_stateless/01763_filter_push_down_bugs.reference b/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
index 66ea84a07c1..6917117b3e2 100644
--- a/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
+++ b/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
@@ -4,3 +4,4 @@
 [[1]]	2
 String1_0	String2_0	String3_0	String4_0	1
 String1_0	String2_0	String3_0	String4_0	1
+1	[0,1,2]
diff --git a/tests/queries/0_stateless/01763_filter_push_down_bugs.sql b/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
index 5000eb38878..b13282e6dca 100644
--- a/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
+++ b/tests/queries/0_stateless/01763_filter_push_down_bugs.sql
@@ -9,7 +9,7 @@ CREATE TABLE Test
 ENGINE = MergeTree()
 PRIMARY KEY (String1,String2)
 ORDER BY (String1,String2)
-AS 
+AS
 SELECT
    'String1_' || toString(number) as String1,
    'String2_' || toString(number) as String2,
@@ -35,3 +35,5 @@ FROM
 WHERE  String4 ='String4_0';
 
 DROP TABLE IF EXISTS Test;
+
+select x, y from (select [0, 1, 2] as y, 1 as a, 2 as b) array join y as x where a = 1 and b = 2 and (x = 1 or x != 1) and x = 1;
diff --git a/tests/queries/0_stateless/01763_long_ttl_group_by.sql b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
index e0c6f678f15..9e1ad574f52 100644
--- a/tests/queries/0_stateless/01763_long_ttl_group_by.sql
+++ b/tests/queries/0_stateless/01763_long_ttl_group_by.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS test_ttl_group_by01763;
 CREATE TABLE test_ttl_group_by01763
 (key UInt32, ts DateTime, value UInt32, min_value UInt32 default value, max_value UInt32 default value)
diff --git a/tests/queries/0_stateless/01763_max_distributed_depth.sql b/tests/queries/0_stateless/01763_max_distributed_depth.sql
index d1bb9e4be90..12b2e368007 100644
--- a/tests/queries/0_stateless/01763_max_distributed_depth.sql
+++ b/tests/queries/0_stateless/01763_max_distributed_depth.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS tt6;
 
 CREATE TABLE tt6
@@ -9,7 +11,9 @@ CREATE TABLE tt6
 	`status` String
 
 )
-ENGINE = Distributed('test_shard_localhost', '', 'tt6', rand());
+ENGINE = Distributed('test_shard_localhost', '', 'tt7', rand());
+
+CREATE TABLE tt7 as tt6 ENGINE = Distributed('test_shard_localhost', '', 'tt6', rand());
 
 INSERT INTO tt6 VALUES (1, 1, 1, 1, 'ok'); -- { serverError 581 }
 
diff --git a/tests/queries/0_stateless/01764_table_function_dictionary.sql b/tests/queries/0_stateless/01764_table_function_dictionary.sql
index 0168566077d..b642fdd741e 100644
--- a/tests/queries/0_stateless/01764_table_function_dictionary.sql
+++ b/tests/queries/0_stateless/01764_table_function_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS table_function_dictionary_source_table;
 CREATE TABLE table_function_dictionary_source_table
 (
diff --git a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
index 7502c6a93bb..db3431b1572 100644
--- a/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
+++ b/tests/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01765_db;
 CREATE DATABASE 01765_db;
 
diff --git a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
index de7ab5b5a1a..1342e3d69cb 100644
--- a/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
+++ b/tests/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01766_db;
 CREATE DATABASE 01766_db;
 
diff --git a/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
index 52eea094ae4..b0e96ac9e54 100644
--- a/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
+++ b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
@@ -1 +1 @@
-2021-03-22 00:00:00.000
+2021-03-23 00:00:00.000
diff --git a/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
index 99141a694c1..2aac922487e 100644
--- a/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
+++ b/tests/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
@@ -1 +1 @@
-SELECT toDateTime64('2021-03-22', 3);
+SELECT toDateTime64('2021-03-23', 3);
diff --git a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
index 8730ed0eda2..f03b1e0350a 100644
--- a/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
+++ b/tests/queries/0_stateless/01776_decrypt_aead_size_check.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 SELECT decrypt('aes-128-gcm', 'text', 'key', 'IV'); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
index f6e1a7c9375..8e5f68c2c5f 100644
--- a/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
+++ b/tests/queries/0_stateless/01778_hierarchical_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01778_db;
 CREATE DATABASE 01778_db;
 
diff --git a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
index 5673e646a47..2ea6119cef8 100644
--- a/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
+++ b/tests/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01780_db;
 CREATE DATABASE 01780_db;
 
diff --git a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
index 236f7b35b80..1e3b464da30 100644
--- a/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
+++ b/tests/queries/0_stateless/01781_merge_tree_deduplication.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Unsupported type of ALTER query
+
 DROP TABLE IF EXISTS merge_tree_deduplication;
 
 CREATE TABLE merge_tree_deduplication
diff --git a/tests/queries/0_stateless/01783_http_chunk_size.sh b/tests/queries/0_stateless/01783_http_chunk_size.sh
index 66ac4dfa975..a4fa7780077 100755
--- a/tests/queries/0_stateless/01783_http_chunk_size.sh
+++ b/tests/queries/0_stateless/01783_http_chunk_size.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-replicated-database
+# Tag no-replicated-database: Requires investigation
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01785_dictionary_element_count.sql b/tests/queries/0_stateless/01785_dictionary_element_count.sql
index 6db65152a56..1d60fc92447 100644
--- a/tests/queries/0_stateless/01785_dictionary_element_count.sql
+++ b/tests/queries/0_stateless/01785_dictionary_element_count.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01785_db;
 CREATE DATABASE 01785_db;
 
diff --git a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
index 0b728d690d2..bb400c5de14 100644
--- a/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01798_uniq_theta_sketch.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT 'uniqTheta many agrs';
 
 SELECT
diff --git a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
index 8f0b096a11d..d86575c3f0a 100644
--- a/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
+++ b/tests/queries/0_stateless/01799_long_uniq_theta_sketch.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-fasttest
+
 SELECT 'uniqTheta';
 
 SELECT Y, uniqTheta(X) FROM (SELECT number AS X, (3*X*X - 7*X + 11) % 37 AS Y FROM system.numbers LIMIT 15) GROUP BY Y;
diff --git a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
index ca6572b91ee..848077f05d4 100644
--- a/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
+++ b/tests/queries/0_stateless/01801_distinct_group_by_shard.sql
@@ -1 +1,3 @@
+-- Tags: shard
+
 SELECT DISTINCT a FROM remote('127.0.0.{1,2,3}', values('a UInt8, b UInt8', (1, 2), (1, 3))) GROUP BY a, b;
diff --git a/tests/queries/0_stateless/01801_s3_cluster.reference b/tests/queries/0_stateless/01801_s3_cluster.reference
index e69de29bb2d..5e36c5923ce 100644
--- a/tests/queries/0_stateless/01801_s3_cluster.reference
+++ b/tests/queries/0_stateless/01801_s3_cluster.reference
@@ -0,0 +1,24 @@
+0	0	0
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+20	21	22
+23	24	25
+26	27	28
+0	0	0
+0	0	0
+0	0	0
+1	2	3
+4	5	6
+7	8	9
+10	11	12
+13	14	15
+16	17	18
+20	21	22
+23	24	25
+26	27	28
diff --git a/tests/queries/0_stateless/01801_s3_cluster.sh b/tests/queries/0_stateless/01801_s3_cluster.sh
deleted file mode 100755
index 215d5500be5..00000000000
--- a/tests/queries/0_stateless/01801_s3_cluster.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# NOTE: this is a partial copy of the 01683_dist_INSERT_block_structure_mismatch,
-# but this test also checks the log messages
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-
-${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3('https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
-${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT *  FROM s3Cluster('test_cluster_two_shards', 'https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv',  '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;"
diff --git a/tests/queries/0_stateless/01801_s3_cluster.sql b/tests/queries/0_stateless/01801_s3_cluster.sql
new file mode 100644
index 00000000000..e466b1e108e
--- /dev/null
+++ b/tests/queries/0_stateless/01801_s3_cluster.sql
@@ -0,0 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+select * from s3('http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c;
+select * from s3Cluster('test_cluster_two_shards', 'http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c;
diff --git a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
index 4b3e35047bc..4713b15bb5b 100755
--- a/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
+++ b/tests/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-parallel: Creates database and users
+# Tag no-fasttest: Requires postgresql-client
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference b/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
index e9803f2f9f2..9e5abf6c5cc 100644
--- a/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.reference
@@ -1,12 +1,12 @@
 Flat dictionary
-5.00000
+5
 Hashed dictionary
-5.00000
+5
 Cache dictionary
-5.00000
+5
 Direct dictionary
-5.00000
+5
 IPTrie dictionary
-5.00000
+5
 Polygon dictionary
-5.00000
+5
diff --git a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
index 1aba8ef7596..77e9abfb742 100644
--- a/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
+++ b/tests/queries/0_stateless/01804_dictionary_decimal256_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SET allow_experimental_bigint_types = 1;
 
 DROP TABLE IF EXISTS dictionary_decimal_source_table;
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
index f2aa1f63197..a2945de5b0c 100755
--- a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
+++ b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 # NOTE: this done as not .sql since we need to Ordinary database
 # (to account threads in query_log for DROP TABLE query)
diff --git a/tests/queries/0_stateless/01811_filter_by_null.sql b/tests/queries/0_stateless/01811_filter_by_null.sql
index 496faf428ab..77d6335254e 100644
--- a/tests/queries/0_stateless/01811_filter_by_null.sql
+++ b/tests/queries/0_stateless/01811_filter_by_null.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
 DROP TABLE IF EXISTS test_01344;
 
 CREATE TABLE test_01344 (x String, INDEX idx (x) TYPE set(10) GRANULARITY 1) ENGINE = MergeTree ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0;
diff --git a/tests/queries/0_stateless/01812_basic_auth_http_server.sh b/tests/queries/0_stateless/01812_basic_auth_http_server.sh
index 4b993137bbd..5f93062ad63 100755
--- a/tests/queries/0_stateless/01812_basic_auth_http_server.sh
+++ b/tests/queries/0_stateless/01812_basic_auth_http_server.sh
@@ -16,4 +16,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 for i in {3950..4100}; do ${CLICKHOUSE_CURL} --user default:12345 "${CLICKHOUSE_URL}&query=SELECT+1"$(perl -e "print '+'x$i") | grep -v -F 'password' ||:; done
 
 # You can check that the bug exists in old version by running the old server in Docker:
-# docker run --network host -it --rm yandex/clickhouse-server:1.1.54385
+# docker run --network host -it --rm clickhouse/clickhouse-server:1.1.54385
diff --git a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
index c39947f2c04..668c3511d82 100644
--- a/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
+++ b/tests/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- remote() does not have sharding key, while force_optimize_skip_unused_shards=2 requires from table to have it.
 -- But due to only one node, everything works.
 select * from remote('127.1', system.one) settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=2 format Null;
diff --git a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
index 722bd4af5bb..9ccea41c5cc 100644
--- a/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
+++ b/tests/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS data;
 CREATE TABLE data (a Int64, b Int64) ENGINE = TinyLog();
 
diff --git a/tests/queries/0_stateless/01814_distributed_push_down_limit.reference b/tests/queries/0_stateless/01814_distributed_push_down_limit.reference
index f879f2cbd21..c542b5b7325 100644
--- a/tests/queries/0_stateless/01814_distributed_push_down_limit.reference
+++ b/tests/queries/0_stateless/01814_distributed_push_down_limit.reference
@@ -12,18 +12,6 @@ distributed_push_down_limit=1
 8
 9
 40 40
-auto-distributed_push_down_limit
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-40 40
 distributed_push_down_limit=1 with OFFSET
 97
 96
diff --git a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
index 93321646037..81ed4568092 100755
--- a/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
+++ b/tests/queries/0_stateless/01814_distributed_push_down_limit.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: distributed
+
 # shellcheck disable=SC2206
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
@@ -86,9 +88,11 @@ function test_distributed_push_down_limit_0()
 function test_distributed_push_down_limit_1()
 {
     local args=(
-        "remote('127.{2,3}', $CLICKHOUSE_DATABASE, data_01814)"
+        "remote('127.{2,3}', $CLICKHOUSE_DATABASE, data_01814, key)"
         0 # offset
         --distributed_push_down_limit 1
+        --optimize_skip_unused_shards 1
+        --optimize_distributed_group_by_sharding_key 1
     )
     test_distributed_push_down_limit_with_query_log "${args[@]}"
 }
@@ -97,22 +101,11 @@ function test_distributed_push_down_limit_1_offset()
 {
     local settings_and_opts=(
         --distributed_push_down_limit 1
-    )
-
-    $CLICKHOUSE_CLIENT "${settings_and_opts[@]}" -q "select * from remote('127.{2,3}', $CLICKHOUSE_DATABASE, data_01814) group by key order by key desc limit 5, 10"
-}
-
-function test_auto_distributed_push_down_limit()
-{
-    local args=(
-        dist_01814
-        0 # offset
         --optimize_skip_unused_shards 1
         --optimize_distributed_group_by_sharding_key 1
-        --prefer_localhost_replica 0
-        --distributed_push_down_limit 0
     )
-    test_distributed_push_down_limit_with_query_log "${args[@]}"
+
+    $CLICKHOUSE_CLIENT "${settings_and_opts[@]}" -q "select * from remote('127.{2,3}', $CLICKHOUSE_DATABASE, data_01814, key) group by key order by key desc limit 5, 10"
 }
 
 function main()
@@ -151,16 +144,6 @@ function main()
     done
     echo "$out"
 
-    echo 'auto-distributed_push_down_limit'
-    for ((i = 0; i < max_tries; ++i)); do
-        out=$(test_auto_distributed_push_down_limit)
-        out_lines=( $out )
-        if [[ ${#out_lines[@]} -gt 2 ]] && [[ ${out_lines[-1]} = 40 ]] && [[ ${out_lines[-2]} = 40 ]]; then
-            break
-        fi
-    done
-    echo "$out"
-
     echo 'distributed_push_down_limit=1 with OFFSET'
     test_distributed_push_down_limit_1_offset
 }
diff --git a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
index 636426fcc91..c53c59df72a 100644
--- a/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
+++ b/tests/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_primary_key_source_table;
 CREATE TABLE dictionary_primary_key_source_table
 (
diff --git a/tests/queries/0_stateless/01821_join_table_race_long.sh b/tests/queries/0_stateless/01821_join_table_race_long.sh
index 7c56bf77bfd..e02fe788653 100755
--- a/tests/queries/0_stateless/01821_join_table_race_long.sh
+++ b/tests/queries/0_stateless/01821_join_table_race_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: race
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01821_table_comment.sql b/tests/queries/0_stateless/01821_table_comment.sql
index 6d9218d5a42..4bd71d3e278 100644
--- a/tests/queries/0_stateless/01821_table_comment.sql
+++ b/tests/queries/0_stateless/01821_table_comment.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/01822_short_circuit.reference b/tests/queries/0_stateless/01822_short_circuit.reference
new file mode 100644
index 00000000000..949d2fa4985
--- /dev/null
+++ b/tests/queries/0_stateless/01822_short_circuit.reference
@@ -0,0 +1,1835 @@
+0
+101
+51
+34
+26
+21
+17
+15
+13
+12
+0
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
+0
+0
+0
+0
+0
+10000000
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+00
+22
+33
+44
+55
+55
+77
+88
+99
+1010
+1010
+1212
+1313
+1414
+1515
+1515
+1717
+1818
+1919
+2020
+00
+\N
+\N
+\N
+\N
+55
+\N
+\N
+\N
+\N
+1010
+\N
+\N
+\N
+\N
+1515
+\N
+\N
+\N
+\N
+\N
+11
+22
+33
+44
+\N
+66
+77
+88
+99
+\N
+1111
+1212
+1313
+1414
+\N
+1616
+1717
+1818
+1919
+00
+\N
+\N
+\N
+\N
+55
+\N
+\N
+\N
+\N
+1010
+\N
+\N
+\N
+\N
+1515
+\N
+\N
+\N
+\N
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+20
+22
+23
+24
+25
+25
+27
+28
+29
+30
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+20
+\N
+\N
+\N
+\N
+25
+\N
+\N
+\N
+\N
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+\N
+21
+22
+23
+24
+\N
+26
+27
+28
+29
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+20
+\N
+\N
+\N
+\N
+25
+\N
+\N
+\N
+\N
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01
+\N
+\N
+\N
+\N
+\N
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+\N
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+\N
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+\N
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01
+\N
+\N
+\N
+\N
+1970-01-01 00:00:00
+1970-01-01 05:33:20
+1970-01-01 08:20:00
+1970-01-01 11:06:40
+1970-01-01 13:53:20
+1970-01-01 13:53:20
+1970-01-01 19:26:40
+1970-01-01 22:13:20
+1970-01-02 01:00:00
+1970-01-02 03:46:40
+1970-01-02 03:46:40
+1970-01-02 09:20:00
+1970-01-02 12:06:40
+1970-01-02 14:53:20
+1970-01-02 17:40:00
+1970-01-02 17:40:00
+1970-01-02 23:13:20
+1970-01-03 02:00:00
+1970-01-03 04:46:40
+1970-01-03 07:33:20
+1970-01-01 00:00:00
+\N
+\N
+\N
+\N
+1970-01-01 13:53:20
+\N
+\N
+\N
+\N
+1970-01-02 03:46:40
+\N
+\N
+\N
+\N
+1970-01-02 17:40:00
+\N
+\N
+\N
+\N
+\N
+1970-01-01 02:46:40
+1970-01-01 05:33:20
+1970-01-01 08:20:00
+1970-01-01 11:06:40
+\N
+1970-01-01 16:40:00
+1970-01-01 19:26:40
+1970-01-01 22:13:20
+1970-01-02 01:00:00
+\N
+1970-01-02 06:33:20
+1970-01-02 09:20:00
+1970-01-02 12:06:40
+1970-01-02 14:53:20
+\N
+1970-01-02 20:26:40
+1970-01-02 23:13:20
+1970-01-03 02:00:00
+1970-01-03 04:46:40
+1970-01-01 00:00:00
+\N
+\N
+\N
+\N
+1970-01-01 13:53:20
+\N
+\N
+\N
+\N
+1970-01-02 03:46:40
+\N
+\N
+\N
+\N
+1970-01-02 17:40:00
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+0
+2
+3
+4
+5
+5
+7
+8
+9
+10
+10
+12
+13
+14
+15
+15
+17
+18
+19
+20
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+4
+\N
+6
+7
+8
+9
+\N
+11
+12
+13
+14
+\N
+16
+17
+18
+19
+0
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+15
+\N
+\N
+\N
+\N
+[]
+[0,1]
+[0,1,2]
+[0,1,2,3]
+[0,1,2,3,4]
+[0,1,2,3,4]
+[0,1,2,3,4,5,6]
+[0,1,2,3,4,5,6,7]
+[0,1,2,3,4,5,6,7,8]
+[0,1,2,3,4,5,6,7,8,9]
+[0,1,2,3,4,5,6,7,8,9]
+[0,1,2,3,4,5,6,7,8,9,10,11]
+[0,1,2,3,4,5,6,7,8,9,10,11,12]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]
+[]
+['1','1']
+['2','2','2']
+['3','3','3','3']
+['4','4','4','4','4']
+['5','5','5','5','5']
+['6','6','6','6','6','6','6']
+['7','7','7','7','7','7','7','7']
+['8','8','8','8','8','8','8','8','8']
+['9','9','9','9','9','9','9','9','9','9']
+['10','10','10','10','10','10','10','10','10','10']
+['11','11','11','11','11','11','11','11','11','11','11','11']
+['12','12','12','12','12','12','12','12','12','12','12','12','12']
+['13','13','13','13','13','13','13','13','13','13','13','13','13','13']
+['14','14','14','14','14','14','14','14','14','14','14','14','14','14','14']
+['15','15','15','15','15','15','15','15','15','15','15','15','15','15','15']
+['16','16','16','16','16','16','16','16','16','16','16','16','16','16','16','16','16']
+['17','17','17','17','17','17','17','17','17','17','17','17','17','17','17','17','17','17']
+['18','18','18','18','18','18','18','18','18','18','18','18','18','18','18','18','18','18','18']
+['19','19','19','19','19','19','19','19','19','19','19','19','19','19','19','19','19','19','19','19']
+0
+1
+1
+1
+1
+0
+\N
+\N
+\N
+\N
+1
+1
+1
+1
+1
+10
+10
+10
+10
+10
+10
+505
+255
+170
+130
+13
+255
+33
+130
+53
+85
+73
+65
+93
+55
+2
+10
+2
+12
+2
+14
+2
+16
+2
+18
+2
+String
+String
+String
+String
+String
+String
+String
+String
+String
+String
+Int64
+Int64
+Int64
+Int64
+Int64
+Int64
+Int64
+Int64
+Int64
+Int64
+Decimal(9, 5)
+Decimal(9, 5)
+Decimal(9, 5)
+Decimal(9, 5)
+Decimal(9, 5)
+Decimal32
+Decimal32
+Decimal32
+Decimal32
+Decimal32
+8
+42
+21
+14
+10
+0	0
+42	42
+21	21
+14	14
+10	10
+\N
+\N
+\N
+\N
+\N
+1
+42
+21
+14
+10
+1
+42
+21
+14
+10
+1
+42
+21
+14
+10
+1
+42
+21
+14
+10
+0
+42
+21
+14
+10.5
+0
+42
+21
+14
+10.5
+\N
+\N
+\N
+0
+1
+0
+1
+0
+0
+1
+1
+1
+1
+1
+1
+3
+3
+5
+5
+7
+7
+9
+9
+1
+1
+3
+3
+5
+5
+7
+7
+9
+9
diff --git a/tests/queries/0_stateless/01822_short_circuit.sql b/tests/queries/0_stateless/01822_short_circuit.sql
new file mode 100644
index 00000000000..48fff04921b
--- /dev/null
+++ b/tests/queries/0_stateless/01822_short_circuit.sql
@@ -0,0 +1,156 @@
+set short_circuit_function_evaluation = 'enable';
+
+select if(number > 0, intDiv(number + 100, number), throwIf(number)) from numbers(10);
+select multiIf(number == 0, 0, number == 1, intDiv(1, number), number == 2, intDiv(1, number - 1), number == 3, intDiv(1, number - 2), intDiv(1, number - 3)) from numbers(10);
+select number != 0 and intDiv(1, number) == 0 and number != 2 and intDiv(1, number - 2) == 0 from numbers(10);
+select number == 0 or intDiv(1, number) != 0 or number == 2 or intDiv(1, number - 2) != 0 from numbers(10);
+
+select count() from (select if(number >= 0, number, sleep(1)) from numbers(10000000));
+
+
+select if(number % 5 == 0, toInt8OrZero(toString(number)), toInt8OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toInt8OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toInt8OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toInt8OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toUInt8OrZero(toString(number)), toUInt8OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toUInt8OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toUInt8OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toUInt8OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toInt32OrZero(toString(number)), toInt32OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toInt32OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toInt32OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toInt32OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toUInt32OrZero(toString(number)), toUInt32OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toUInt32OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toUInt32OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toUInt32OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toInt64OrZero(toString(number)), toInt64OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toInt64OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toInt64OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toInt64OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toUInt64OrZero(toString(number)), toUInt64OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toUInt64OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toUInt64OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toUInt64OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toInt128OrZero(toString(number)), toInt128OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toInt128OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toInt128OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toInt128OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toUInt128OrZero(toString(number)), toUInt128OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toUInt128OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toUInt128OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toUInt128OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toInt256OrZero(toString(number)), toInt256OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toInt256OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toInt256OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toInt256OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toUInt256OrZero(toString(number)), toUInt256OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toUInt256OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toUInt256OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toUInt256OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toFloat32OrZero(toString(number)), toFloat32OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toFloat32OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toFloat32OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toFloat32OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toFloat64OrZero(toString(number)), toFloat64OrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toFloat64OrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toFloat64OrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toFloat64OrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, repeat(toString(number), 2), repeat(toString(number + 1), 2)) from numbers(20);
+select if(number % 5 == 0, repeat(toString(number), 2), Null) from numbers(20);
+select if(number % 5 == 0, Null, repeat(toString(number), 2)) from numbers(20);
+select if(number % 5, Null, repeat(toString(number), 2)) from numbers(20);
+
+select if(number % 5 == 0, toFixedString(toString(number + 10), 2), toFixedString(toString(number + 11), 2)) from numbers(20);
+select if(number % 5 == 0, toFixedString(toString(number + 10), 2), Null) from numbers(20);
+select if(number % 5 == 0, Null, toFixedString(toString(number + 10), 2)) from numbers(20);
+select if(number % 5, Null, toFixedString(toString(number + 10), 2)) from numbers(20);
+
+select if(number % 5 == 0, toDateOrZero(toString(number)), toDateOrZero(toString(number + 1))) from numbers(20);
+select if(number % 5 == 0, toDateOrZero(toString(number)), Null) from numbers(20);
+select if(number % 5 == 0, Null, toDateOrZero(toString(number))) from numbers(20);
+select if(number % 5, Null, toDateOrZero(toString(number))) from numbers(20);
+
+select if(number % 5 == 0, toDateTimeOrZero(toString(number * 10000), 'UTC'), toDateTimeOrZero(toString((number + 1) * 10000), 'UTC')) from numbers(20);
+select if(number % 5 == 0, toDateTimeOrZero(toString(number * 10000), 'UTC'), Null) from numbers(20);
+select if(number % 5 == 0, Null, toDateTimeOrZero(toString(number * 10000), 'UTC')) from numbers(20);
+select if(number % 5, Null, toDateTimeOrZero(toString(number * 10000), 'UTC')) from numbers(20);
+
+select if(number % 5 == 0, toDecimal32OrZero(toString(number), 5), toDecimal32OrZero(toString(number + 1), 5)) from numbers(20);
+select if(number % 5 == 0, toDecimal32OrZero(toString(number), 5), Null) from numbers(20);
+select if(number % 5 == 0, Null, toDecimal32OrZero(toString(number), 5)) from numbers(20);
+select if(number % 5, Null, toDecimal32OrZero(toString(number), 5)) from numbers(20);
+
+select if(number % 5 == 0, toDecimal64OrZero(toString(number), 5), toDecimal64OrZero(toString(number + 1), 5)) from numbers(20);
+select if(number % 5 == 0, toDecimal64OrZero(toString(number), 5), Null) from numbers(20);
+select if(number % 5 == 0, Null, toDecimal64OrZero(toString(number), 5)) from numbers(20);
+select if(number % 5, Null, toDecimal64OrZero(toString(number), 5)) from numbers(20);
+
+select if(number % 5 == 0, toDecimal128OrZero(toString(number), 5), toDecimal128OrZero(toString(number + 1), 5)) from numbers(20);
+select if(number % 5 == 0, toDecimal128OrZero(toString(number), 5), Null) from numbers(20);
+select if(number % 5 == 0, Null, toDecimal128OrZero(toString(number), 5)) from numbers(20);
+select if(number % 5, Null, toDecimal128OrZero(toString(number), 5)) from numbers(20);
+
+select if(number % 5 == 0, toDecimal256OrZero(toString(number), 5), toDecimal256OrZero(toString(number + 1), 5)) from numbers(20);
+select if(number % 5 == 0, toDecimal256OrZero(toString(number), 5), Null) from numbers(20);
+select if(number % 5 == 0, Null, toDecimal256OrZero(toString(number), 5)) from numbers(20);
+select if(number % 5, Null, toDecimal256OrZero(toString(number), 5)) from numbers(20);
+
+select if(number % 5 == 0, range(number), range(number + 1)) from numbers(20);
+select if(number % 5 == 0, replicate(toString(number), range(number)), replicate(toString(number), range(number + 1))) from numbers(20);
+
+select number > 0 and 5 and intDiv(100, number) from numbers(5);
+select number > 0 and Null and intDiv(100, number) from numbers(5);
+select number == 0 or 5 or intDiv(100, number) from numbers(5);
+select multiIf(number % 2 != 0, intDiv(10, number % 2), 5, intDiv(10, 1 - number % 2), intDiv(10, number)) from numbers(5);
+
+select if(number != 0, 5 * (1 + intDiv(100, number)), toInt32(exp(log(throwIf(number) + 10)))) from numbers(5);
+select if(number % 2, 5 * (1 + intDiv(100, number + 1)), 3 + 10 * intDiv(100, intDiv(100, number + 1))) from numbers(10);
+
+select sum(number) FROM numbers(10) WHERE number != 0 and 3 % number and number != 1 and intDiv(1, number - 1) > 0;
+select multiIf(0, 1, intDiv(number % 2, 1), 2, 0, 3, 1, number + 10, 2) from numbers(10);
+
+select toTypeName(toString(number)) from numbers(5);
+select toColumnTypeName(toString(number)) from numbers(5);
+
+select toTypeName(toInt64OrZero(toString(number))) from numbers(5);
+select toColumnTypeName(toInt64OrZero(toString(number))) from numbers(5);
+
+select toTypeName(toDecimal32OrZero(toString(number), 5)) from numbers(5);
+select toColumnTypeName(toDecimal32OrZero(toString(number), 5)) from numbers(5);
+
+select if(if(number > 0, intDiv(42, number), 0), intDiv(42, number), 8) from numbers(5);
+select if(number > 0, intDiv(42, number), 0), if(number = 0, 0, intDiv(42, number)) from numbers(5);
+
+select Null or isNull(intDiv(number, 1)) from numbers(5);
+
+set compile_expressions = 1;
+select if(number > 0, intDiv(42, number), 1) from numbers(5);
+select if(number > 0, intDiv(42, number), 1) from numbers(5);
+select if(number > 0, intDiv(42, number), 1) from numbers(5);
+select if(number > 0, intDiv(42, number), 1) from numbers(5);
+
+select if(number > 0, 42 / toDecimal32(number, 2), 0) from numbers(5);
+select if(number = 0, 0, toDecimal32(42, 2) / number) from numbers(5);
+select if(isNull(x), Null, 42 / x) from (select CAST(materialize(Null), 'Nullable(Decimal32(2))') as x);
+select if(isNull(x), Null, x / 0) from (select CAST(materialize(Null), 'Nullable(Decimal32(2))') as x);
+
+select if(isNull(x), Null, intDiv(42, x)) from (select CAST(materialize(Null), 'Nullable(Int64)') as x);
+
+select number % 2 and toLowCardinality(number) from numbers(5);
+select number % 2 or toLowCardinality(number) from numbers(5);
+select if(toLowCardinality(number) % 2, number, number + 1) from numbers(10);
+select multiIf(toLowCardinality(number) % 2, number, number + 1) from numbers(10);
+
diff --git a/tests/queries/0_stateless/01823_explain_json.reference b/tests/queries/0_stateless/01823_explain_json.reference
index 5c7845a22d5..f75cd69dbf3 100644
--- a/tests/queries/0_stateless/01823_explain_json.reference
+++ b/tests/queries/0_stateless/01823_explain_json.reference
@@ -111,31 +111,3 @@
                 }
               ],
               "Limit": 3,
---
-                  "Sort Description": [
-                    {
-                      "Column": "number",
-                      "Ascending": false,
-                      "With Fill": false
-                    },
-                    {
-                      "Column": "plus(number, 1)",
-                      "Ascending": true,
-                      "With Fill": false
-                    }
-                  ],
-                  "Limit": 3,
---
-                      "Sort Description": [
-                        {
-                          "Column": "number",
-                          "Ascending": false,
-                          "With Fill": false
-                        },
-                        {
-                          "Column": "plus(number, 1)",
-                          "Ascending": true,
-                          "With Fill": false
-                        }
-                      ],
-                      "Limit": 3,
diff --git a/tests/queries/0_stateless/01823_explain_json.sh b/tests/queries/0_stateless/01823_explain_json.sh
index 004e85cd965..3db2dcb6dc4 100755
--- a/tests/queries/0_stateless/01823_explain_json.sh
+++ b/tests/queries/0_stateless/01823_explain_json.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql b/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
index 7f163f9ac7b..01ef768b423 100644
--- a/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
+++ b/tests/queries/0_stateless/01824_prefer_global_in_and_join.sql
@@ -1,3 +1,5 @@
+-- Tags: global, no-parallel
+
 -- { echo }
 CREATE DATABASE IF NOT EXISTS test_01824;
 USE test_01824;
diff --git a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
index 65422731711..7a9e9cd8838 100644
--- a/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
+++ b/tests/queries/0_stateless/01833_test_collation_alvarotuso.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 DROP TABLE IF EXISTS test_collation;
 
 CREATE TABLE test_collation
diff --git a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
index 793f477b3cb..1d70ba1df7c 100755
--- a/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
+++ b/tests/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
@@ -16,9 +16,10 @@ insert into aliases_lazyness(x) select * from numbers(40);
 # The exact time is not guaranteed, so we check in a loop that at least once 
 # the query will process in less than one second, that proves that the behaviour is not like it was long time ago.
 
-while true
-do
+i=0 retries=300
+while [[ $i -lt $retries ]]; do
     timeout 1 ${CLICKHOUSE_CLIENT} --query "SELECT x, y FROM aliases_lazyness WHERE x = 1 FORMAT Null" && break
+    ((++i))
 done
 
 ${CLICKHOUSE_CLIENT} --multiquery --query "
diff --git a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
index baba8b5188e..99bde21d2e5 100644
--- a/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
+++ b/tests/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel, no-fasttest
+
 DROP DATABASE IF EXISTS 01837_db;
 CREATE DATABASE 01837_db ENGINE = Memory;
 
diff --git a/tests/queries/0_stateless/01849_geoToS2.sql b/tests/queries/0_stateless/01849_geoToS2.sql
index eb50fa81b8a..abd084a2b19 100644
--- a/tests/queries/0_stateless/01849_geoToS2.sql
+++ b/tests/queries/0_stateless/01849_geoToS2.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 DROP TABLE IF EXISTS s2_indexes;
 
 CREATE TABLE s2_indexes (s2_index UInt64, longitude Float64, latitude Float64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
index ab4c63ccdf2..790173013f6 100644
--- a/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
+++ b/tests/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 create database if not exists shard_0;
 create database if not exists shard_1;
 
diff --git a/tests/queries/0_stateless/01851_s2_to_geo.sql b/tests/queries/0_stateless/01851_s2_to_geo.sql
index 76e4b2a5346..d833b95a62f 100644
--- a/tests/queries/0_stateless/01851_s2_to_geo.sql
+++ b/tests/queries/0_stateless/01851_s2_to_geo.sql
@@ -1,2 +1,5 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2ToGeo(4573520603753570041);
 select s2ToGeo(4573517609713934091);
diff --git a/tests/queries/0_stateless/01852_cast_operator.reference b/tests/queries/0_stateless/01852_cast_operator.reference
index dc522ae8076..198a122d86e 100644
--- a/tests/queries/0_stateless/01852_cast_operator.reference
+++ b/tests/queries/0_stateless/01852_cast_operator.reference
@@ -1,4 +1,4 @@
-0.10000000000000000000000000000000000000
+0.1
 SELECT CAST(\'0.1\', \'Decimal(38, 38)\') AS c
 [1,2,3]
 SELECT CAST(\'[1, 2, 3]\', \'Array(UInt32)\') AS c
@@ -27,7 +27,7 @@ SELECT
 FROM numbers(1)
 1970-01-11
 SELECT CAST((((0 + 1) + 2) + 3) + 4, \'Date\') AS c
-0.6000
+0.6
 SELECT CAST((CAST(\'0.1\', \'Decimal(4, 4)\') + CAST(\'0.2\', \'Decimal(4, 4)\')) + CAST(\'0.3\', \'Decimal(4, 4)\'), \'Decimal(4, 4)\') AS c
 [1]
 [[1,2,3],[],[1]]
diff --git a/tests/queries/0_stateless/01852_cast_operator_2.reference b/tests/queries/0_stateless/01852_cast_operator_2.reference
index 438eabda142..a734dc75559 100644
--- a/tests/queries/0_stateless/01852_cast_operator_2.reference
+++ b/tests/queries/0_stateless/01852_cast_operator_2.reference
@@ -1,6 +1,6 @@
-(0.1000000000000000000000000000000000000000000000000000000000000000000000,0.2000000000000000000000000000000000000000000000000000000000000000000000)
+(0.1,0.2)
 SELECT CAST(\'(0.1, 0.2)\', \'Tuple(Decimal(75, 70), Decimal(75, 70))\')
-0.1000
+0.1
 SELECT CAST(\'0.1\', \'Decimal(4, 4)\')
 [1,2,3]
 SELECT CAST(\'[1, 2, 3]\', \'Array(Int32)\')
diff --git a/tests/queries/0_stateless/01852_cast_operator_3.reference b/tests/queries/0_stateless/01852_cast_operator_3.reference
new file mode 100644
index 00000000000..a1e54797d60
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator_3.reference
@@ -0,0 +1,10 @@
+-1
+SELECT CAST(\'-1\', \'Int32\')
+-0.1
+SELECT CAST(\'-0.1\', \'Decimal(38, 38)\')
+-0.111
+SELECT CAST(\'-0.111\', \'Float64\')
+[-1,2,-3]
+SELECT CAST(\'[-1, 2, -3]\', \'Array(Int32)\')
+[-1.1,2,-3]
+SELECT CAST(\'[-1.1, 2, -3]\', \'Array(Float64)\')
diff --git a/tests/queries/0_stateless/01852_cast_operator_3.sql b/tests/queries/0_stateless/01852_cast_operator_3.sql
new file mode 100644
index 00000000000..1ad015a8dc4
--- /dev/null
+++ b/tests/queries/0_stateless/01852_cast_operator_3.sql
@@ -0,0 +1,14 @@
+SELECT -1::Int32;
+EXPLAIN SYNTAX SELECT -1::Int32;
+
+SELECT -0.1::Decimal(38, 38);
+EXPLAIN SYNTAX SELECT -0.1::Decimal(38, 38);
+
+SELECT -0.111::Float64;
+EXPLAIN SYNTAX SELECT -0.111::Float64;
+
+SELECT [-1, 2, -3]::Array(Int32);
+EXPLAIN SYNTAX SELECT [-1, 2, -3]::Array(Int32);
+
+SELECT [-1.1, 2, -3]::Array(Float64);
+EXPLAIN SYNTAX SELECT [-1.1, 2, -3]::Array(Float64);
diff --git a/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference b/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference
index 2c4517e0eda..b179e5e927a 100644
--- a/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference
+++ b/tests/queries/0_stateless/01852_cast_operator_bad_cases.reference
@@ -8,3 +8,11 @@ Syntax error
 Syntax error
 Syntax error
 Code: 6
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
+Syntax error
diff --git a/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh b/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh
index f2f566b78c4..6c578a0996c 100755
--- a/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh
+++ b/tests/queries/0_stateless/01852_cast_operator_bad_cases.sh
@@ -15,3 +15,13 @@ $CLICKHOUSE_CLIENT --query="SELECT [1 2]::Array(UInt8)"  2>&1 | grep -o -m1 'Syn
 $CLICKHOUSE_CLIENT --query="SELECT 1 4::UInt32"  2>&1 | grep -o 'Syntax error'
 $CLICKHOUSE_CLIENT --query="SELECT '1' '4'::UInt32"  2>&1 | grep -o -m1 'Syntax error'
 $CLICKHOUSE_CLIENT --query="SELECT '1''4'::UInt32"  2>&1 | grep -o -m1 'Code: 6'
+
+$CLICKHOUSE_CLIENT --query="SELECT ::UInt32"  2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT ::String"  2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT -::Int32"  2>&1 | grep -o 'Syntax error'
+
+$CLICKHOUSE_CLIENT --query="SELECT [1, -]::Array(Int32)"  2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [1, 3-]::Array(Int32)"  2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [-, 2]::Array(Int32)"  2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [--, 2]::Array(Int32)"  2>&1 | grep -o 'Syntax error'
+$CLICKHOUSE_CLIENT --query="SELECT [1, 2]-::Array(Int32)"  2>&1 | grep -o 'Syntax error'
diff --git a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
index a51309b3ffd..09ca0e2063d 100644
--- a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
+++ b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long, no-parallel
+
 --
 -- Simple key
 --
diff --git a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference
new file mode 100644
index 00000000000..eb37a198435
--- /dev/null
+++ b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.reference
@@ -0,0 +1,2 @@
+1	1	1	1
+1	1	1	1
diff --git a/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
new file mode 100644
index 00000000000..39818fa51c2
--- /dev/null
+++ b/tests/queries/0_stateless/01852_multiple_joins_with_union_join.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS v1;
+DROP TABLE IF EXISTS v2;
+
+CREATE TABLE v1 ( id Int32 ) ENGINE = MergeTree() ORDER BY id;
+CREATE TABLE v2 ( value Int32 ) ENGINE = MergeTree() ORDER BY value;
+
+INSERT INTO v1 ( id ) VALUES (1);
+INSERT INTO v2 ( value ) VALUES (1);
+
+SELECT * FROM v1 AS t1
+JOIN v1 AS t2 USING (id)
+JOIN v2 AS n1 ON t1.id = n1.value
+JOIN v2 AS n2 ON t1.id = n2.value;
+
+SELECT * FROM v1 AS t1
+JOIN v1 AS t2 USING (id)
+CROSS JOIN v2 AS n1
+CROSS JOIN v2 AS n2;
+
+SELECT * FROM v1 AS t1 JOIN v1 AS t2 USING (id) JOIN v1 AS t3 USING (value); -- { serverError NOT_IMPLEMENTED }
+
+DROP TABLE IF EXISTS v1;
+DROP TABLE IF EXISTS v2;
diff --git a/tests/queries/0_stateless/01852_s2_get_neighbours.sql b/tests/queries/0_stateless/01852_s2_get_neighbours.sql
index 8163f827697..89232c512df 100644
--- a/tests/queries/0_stateless/01852_s2_get_neighbours.sql
+++ b/tests/queries/0_stateless/01852_s2_get_neighbours.sql
@@ -1 +1,4 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2GetNeighbors(5074766849661468672);
diff --git a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
index 409f8d5ecf5..218320772c9 100755
--- a/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
+++ b/tests/queries/0_stateless/01853_dictionary_cache_duplicates.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01853_s2_cells_intersect.sql b/tests/queries/0_stateless/01853_s2_cells_intersect.sql
index 2a033a67d58..c426a86f631 100644
--- a/tests/queries/0_stateless/01853_s2_cells_intersect.sql
+++ b/tests/queries/0_stateless/01853_s2_cells_intersect.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CellsIntersect(9926595209846587392, 9926594385212866560);
 select s2CellsIntersect(9926595209846587392, 9937259648002293760);
 
diff --git a/tests/queries/0_stateless/01854_HTTP_dict_decompression.python b/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
index 216e1afa71d..929eaae8067 100644
--- a/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
+++ b/tests/queries/0_stateless/01854_HTTP_dict_decompression.python
@@ -13,12 +13,25 @@ import urllib.request
 import subprocess
 import lzma
 
-def get_local_port(host):
-    with socket.socket() as fd:
+
+def is_ipv6(host):
+    try:
+        socket.inet_aton(host)
+        return False
+    except:
+        return True
+
+def get_local_port(host, ipv6):
+    if ipv6:
+        family = socket.AF_INET6
+    else:
+        family = socket.AF_INET
+
+    with socket.socket(family) as fd:
         fd.bind((host, 0))
         return fd.getsockname()[1]
 
-CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
+CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', 'localhost')
 CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
 
 #####################################################################################
@@ -30,11 +43,15 @@ CLICKHOUSE_PORT_HTTP = os.environ.get('CLICKHOUSE_PORT_HTTP', '8123')
 
 # IP-address of this host accessible from the outside world. Get the first one
 HTTP_SERVER_HOST = subprocess.check_output(['hostname', '-i']).decode('utf-8').strip().split()[0]
-HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST)
+IS_IPV6 = is_ipv6(HTTP_SERVER_HOST)
+HTTP_SERVER_PORT = get_local_port(HTTP_SERVER_HOST, IS_IPV6)
 
 # IP address and port of the HTTP server started from this script.
 HTTP_SERVER_ADDRESS = (HTTP_SERVER_HOST, HTTP_SERVER_PORT)
-HTTP_SERVER_URL_STR = 'http://' + ':'.join(str(s) for s in HTTP_SERVER_ADDRESS) + "/"
+if IS_IPV6:
+    HTTP_SERVER_URL_STR = 'http://' + f'[{str(HTTP_SERVER_ADDRESS[0])}]:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
+else:
+    HTTP_SERVER_URL_STR = 'http://' + f'{str(HTTP_SERVER_ADDRESS[0])}:{str(HTTP_SERVER_ADDRESS[1])}' + "/"
 
 # Because we need to check the content of file.csv we can create this content and avoid reading csv
 CSV_DATA = "Hello, 1\nWorld, 2\nThis, 152\nis, 9283\ntesting, 2313213\ndata, 555\n"
@@ -48,6 +65,10 @@ ENDINGS = ['.gz', '.xz']
 SEND_ENCODING = True
 
 def get_ch_answer(query):
+    host = CLICKHOUSE_HOST
+    if IS_IPV6:
+        host = f'[{host}]'
+
     url = os.environ.get('CLICKHOUSE_URL', 'http://{host}:{port}'.format(host=CLICKHOUSE_HOST, port=CLICKHOUSE_PORT_HTTP))
     return urllib.request.urlopen(url, data=query.encode()).read().decode()
 
@@ -98,8 +119,14 @@ class HttpProcessor(SimpleHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
+class HTTPServerV6(HTTPServer):
+    address_family = socket.AF_INET6
+
 def start_server(requests_amount):
-    httpd = HTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
+    if IS_IPV6:
+        httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
+    else:
+        httpd = HTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
 
     def real_func():
         for i in range(requests_amount):
@@ -127,7 +154,7 @@ def test_select(dict_name="", schema="word String, counter UInt32", requests=[],
             PRIMARY KEY word
             SOURCE(HTTP(url '{}' format 'CSV'))
             LAYOUT(complex_key_hashed())
-            LIFETIME(0)'''.format(dict_name, schema, HTTP_SERVER_URL_STR+'/test.csv' + ADDING_ENDING))
+            LIFETIME(0)'''.format(dict_name, schema, HTTP_SERVER_URL_STR + '/test.csv' + ADDING_ENDING))
 
         COMPRESS_METHOD = requests[i]
         print(i, COMPRESS_METHOD, ADDING_ENDING, SEND_ENCODING)
diff --git a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
index f6a9d6aa25c..34ce7ea04b5 100644
--- a/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
+++ b/tests/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DICTIONARY IF EXISTS dict_01864;
 CREATE DICTIONARY dict_01864
 (
diff --git a/tests/queries/0_stateless/01854_s2_cap_contains.sql b/tests/queries/0_stateless/01854_s2_cap_contains.sql
index 1a8d2548352..4ee4158fdbb 100644
--- a/tests/queries/0_stateless/01854_s2_cap_contains.sql
+++ b/tests/queries/0_stateless/01854_s2_cap_contains.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CapContains(1157339245694594829, 1.0, 1157347770437378819);
 select s2CapContains(1157339245694594829, 1.0, 1152921504606846977);
 select s2CapContains(1157339245694594829, 3.14, 1157339245694594829);
diff --git a/tests/queries/0_stateless/01854_s2_cap_union.sql b/tests/queries/0_stateless/01854_s2_cap_union.sql
index 921a00ac663..9f8510fb833 100644
--- a/tests/queries/0_stateless/01854_s2_cap_union.sql
+++ b/tests/queries/0_stateless/01854_s2_cap_union.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s2
+
 select s2CapUnion(3814912406305146967, 1.0, 1157347770437378819, 1.0);
 select s2CapUnion(1157339245694594829, -1.0, 1152921504606846977, -1.0);
 select s2CapUnion(1157339245694594829, toFloat64(toUInt64(-1)), 1157339245694594829, toFloat64(toUInt64(-1)));
diff --git a/tests/queries/0_stateless/01856_create_function.reference b/tests/queries/0_stateless/01856_create_function.reference
new file mode 100644
index 00000000000..a211b2318a0
--- /dev/null
+++ b/tests/queries/0_stateless/01856_create_function.reference
@@ -0,0 +1,2 @@
+24
+1
diff --git a/tests/queries/0_stateless/01856_create_function.sql b/tests/queries/0_stateless/01856_create_function.sql
new file mode 100644
index 00000000000..cdc4baad1af
--- /dev/null
+++ b/tests/queries/0_stateless/01856_create_function.sql
@@ -0,0 +1,14 @@
+-- Tags: no-parallel
+
+CREATE FUNCTION 01856_test_function_0 AS (a, b, c) -> a * b * c;
+SELECT 01856_test_function_0(2, 3, 4);
+SELECT isConstant(01856_test_function_0(1, 2, 3));
+DROP FUNCTION 01856_test_function_0;
+CREATE FUNCTION 01856_test_function_1 AS (a, b) -> 01856_test_function_1(a, b) + 01856_test_function_1(a, b); --{serverError 611}
+CREATE FUNCTION cast AS a -> a + 1; --{serverError 609}
+CREATE FUNCTION sum AS (a, b) -> a + b; --{serverError 609}
+CREATE FUNCTION 01856_test_function_2 AS (a, b) -> a + b;
+CREATE FUNCTION 01856_test_function_2 AS (a) -> a || '!!!'; --{serverError 609}
+DROP FUNCTION 01856_test_function_2;
+DROP FUNCTION unknown_function; -- {serverError 46}
+DROP FUNCTION CAST; -- {serverError 610}
diff --git a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
index d8a86b7799e..5dfdb9482ee 100644
--- a/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
+++ b/tests/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- GROUP BY _shard_num
 SELECT _shard_num, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num ORDER BY _shard_num;
 SELECT _shard_num s, count() FROM remote('127.0.0.{1,2}', system.one) GROUP BY _shard_num ORDER BY _shard_num;
diff --git a/tests/queries/0_stateless/01866_view_persist_settings.reference b/tests/queries/0_stateless/01866_view_persist_settings.reference
index 07c96e76875..4d7e1356807 100644
--- a/tests/queries/0_stateless/01866_view_persist_settings.reference
+++ b/tests/queries/0_stateless/01866_view_persist_settings.reference
@@ -1,8 +1,5 @@
 join_use_nulls = 1
 -
-1	11	0
-2	12	22
-3	0	23
 -
 1	11	0
 2	12	22
@@ -12,9 +9,40 @@ join_use_nulls = 1
 2	12	22
 3	\N	23
 -
-1	11	0
+1	11	\N
 2	12	22
-3	0	23
+3	\N	23
+join_use_nulls = 0
+-
+1	11	0
+2	12	22
+3	0	23
+-
+1	11	0
+2	12	22
+3	0	23
+-
+1	11	\N
+2	12	22
+3	\N	23
+-
+1	11	0
+2	12	22
+3	0	23
+join_use_nulls = 1
+-
+-
+1	11	0
+2	12	22
+3	0	23
+-
+1	11	\N
+2	12	22
+3	\N	23
+-
+1	11	\N
+2	12	22
+3	\N	23
 join_use_nulls = 0
 -
 1	11	0
diff --git a/tests/queries/0_stateless/01866_view_persist_settings.sql b/tests/queries/0_stateless/01866_view_persist_settings.sql
index 71d6c856b9b..c58b802494d 100644
--- a/tests/queries/0_stateless/01866_view_persist_settings.sql
+++ b/tests/queries/0_stateless/01866_view_persist_settings.sql
@@ -33,6 +33,19 @@ SET join_use_nulls = 1;
 
 SELECT 'join_use_nulls = 1';
 
+SELECT '-';
+SELECT * FROM view_no_nulls; -- { serverError 80 }
+SELECT '-';
+SELECT * FROM view_no_nulls_set;
+SELECT '-';
+SELECT * FROM view_nulls_set;
+SELECT '-';
+SELECT * FROM view_nulls;
+
+SET join_use_nulls = 0;
+
+SELECT 'join_use_nulls = 0';
+
 SELECT '-';
 SELECT * FROM view_no_nulls;
 SELECT '-';
@@ -42,6 +55,29 @@ SELECT * FROM view_nulls_set;
 SELECT '-';
 SELECT * FROM view_nulls;
 
+DETACH TABLE view_no_nulls;
+DETACH TABLE view_no_nulls_set;
+DETACH TABLE view_nulls_set;
+DETACH TABLE view_nulls;
+
+ATTACH TABLE view_no_nulls;
+ATTACH TABLE view_no_nulls_set;
+ATTACH TABLE view_nulls_set;
+ATTACH TABLE view_nulls;
+
+SET join_use_nulls = 1;
+
+SELECT 'join_use_nulls = 1';
+
+SELECT '-';
+SELECT * FROM view_no_nulls; -- { serverError 80 }
+SELECT '-';
+SELECT * FROM view_no_nulls_set;
+SELECT '-';
+SELECT * FROM view_nulls_set;
+SELECT '-';
+SELECT * FROM view_nulls;
+
 SET join_use_nulls = 0;
 
 SELECT 'join_use_nulls = 0';
diff --git a/tests/queries/0_stateless/01870_buffer_flush.sql b/tests/queries/0_stateless/01870_buffer_flush.sql
index 55ec79325dc..5e60bc7e080 100644
--- a/tests/queries/0_stateless/01870_buffer_flush.sql
+++ b/tests/queries/0_stateless/01870_buffer_flush.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 -- Check that Buffer will be flushed before shutdown
 -- (via DETACH DATABASE)
 
diff --git a/tests/queries/0_stateless/01870_modulo_partition_key.sql b/tests/queries/0_stateless/01870_modulo_partition_key.sql
index 0226bcc0a3c..06b6fc86d3e 100644
--- a/tests/queries/0_stateless/01870_modulo_partition_key.sql
+++ b/tests/queries/0_stateless/01870_modulo_partition_key.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 SELECT 'simple partition key:';
 DROP TABLE IF EXISTS table1 SYNC;
 CREATE TABLE table1 (id Int64, v UInt64)
diff --git a/tests/queries/0_stateless/01872_functions_to_subcolumns.reference b/tests/queries/0_stateless/01872_functions_to_subcolumns.reference
index 8c5ca4df602..a1cd31e2dc9 100644
--- a/tests/queries/0_stateless/01872_functions_to_subcolumns.reference
+++ b/tests/queries/0_stateless/01872_functions_to_subcolumns.reference
@@ -1,7 +1,7 @@
 0	0	1
 0	1	0
 SELECT
-    isNull(id),
+    id IS NULL,
     `n.null`,
     NOT `n.null`
 FROM t_func_to_subcolumns
@@ -31,7 +31,7 @@ FROM t_func_to_subcolumns
 SELECT
     id,
     `n.null`,
-    isNull(right.n)
+    right.n IS NULL
 FROM t_func_to_subcolumns AS left
 ALL FULL OUTER JOIN
 (
diff --git a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference
index 9b3c41ac646..64d34583100 100644
--- a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference
@@ -1,2 +1,2 @@
 SSDCache dictionary
-5.00000
+5
diff --git a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
index 51c47d4ad14..806fbd05fbf 100755
--- a/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
+++ b/tests/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01881_join_on_conditions.reference b/tests/queries/0_stateless/01881_join_on_conditions.reference
deleted file mode 100644
index e1fac0e7dc3..00000000000
--- a/tests/queries/0_stateless/01881_join_on_conditions.reference
+++ /dev/null
@@ -1,108 +0,0 @@
--- hash_join --
---
-222	2
-222	222
-333	333
---
-222	222
-333	333
---
-222
-333
---
-1
-1
-1
-1
-1
-1
-1
-1
-1
---
-2
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
---
-222	2
-333	3
-222	2
-333	3
---
-0			2	AAA	a
-0			4	CCC	CCC
-1	111	111	0		
-2	222	2	0		
-2	222	222	2	AAA	AAA
-3	333	333	3	BBB	BBB
---
-2	222	2	2	AAA	a
-2	222	222	2	AAA	AAA
--- partial_merge --
---
-222	2
-222	222
-333	333
---
-222	222
-333	333
---
-222
-333
---
-1
-1
-1
-1
-1
-1
-1
-1
-1
---
-2
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
-2
-3
---
-222	2
-333	3
-222	2
-333	3
---
-0			2	AAA	a
-0			4	CCC	CCC
-1	111	111	0		
-2	222	2	0		
-2	222	222	2	AAA	AAA
-3	333	333	3	BBB	BBB
---
-2	222	2	2	AAA	a
-2	222	222	2	AAA	AAA
diff --git a/tests/queries/0_stateless/01881_join_on_conditions_hash.reference.j2 b/tests/queries/0_stateless/01881_join_on_conditions_hash.reference.j2
new file mode 100644
index 00000000000..94b3e19483f
--- /dev/null
+++ b/tests/queries/0_stateless/01881_join_on_conditions_hash.reference.j2
@@ -0,0 +1,73 @@
+{%- macro jnull(join_use_nulls, value='') -%}
+{#- default value or null if join_use_nulls is enabled -#}
+{% if join_use_nulls == 1 %}\N{% else %}{{ value }}{% endif %}
+{%- endmacro -%}
+{% for jn in [0, 1] -%}
+-- hash_join --
+--
+222	2
+222	222
+333	333
+--
+222	222
+333	333
+--
+222
+333
+--
+1
+1
+1
+1
+1
+1
+1
+1
+1
+--
+2
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+--
+222	2
+333	3
+222	2
+333	3
+--
+{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}	2	AAA	a
+{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}	4	CCC	CCC
+1	111	111	{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}
+2	222	2	{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}
+2	222	222	2	AAA	AAA
+3	333	333	3	BBB	BBB
+{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}	4	101	CCC	CCC
+1	111	111	2	1	AAA	AAA
+2	222	2	{{ jnull(jn, 0) }}	{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}
+2	222	222	2	1	AAA	AAA
+3	333	333	2	3	AAA	a
+3	333	333	3	100	BBB	BBB
+2	222	2	2	AAA	AAA
+2	222	222	2	AAA	AAA
+3	333	333	3	BBB	BBB
+--
+2	222	2	2	AAA	a
+2	222	222	2	AAA	AAA
+t22	1	111	111	2	1	AAA	AAA
+t22	1	111	111	2	1	AAA	AAA
+t22	1	111	111	2	1	AAA	AAA
+t22	1	111	111	2	1	AAA	AAA
+{% endfor -%}
diff --git a/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2 b/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2
new file mode 100644
index 00000000000..0d6bef7fadb
--- /dev/null
+++ b/tests/queries/0_stateless/01881_join_on_conditions_hash.sql.j2
@@ -0,0 +1,102 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t2_nullable;
+DROP TABLE IF EXISTS t2_lc;
+DROP TABLE IF EXISTS t22;
+
+CREATE TABLE t1 (`id` Int32, key String, key2 String) ENGINE = TinyLog;
+CREATE TABLE t2 (`id` Int32, key String, key2 String) ENGINE = TinyLog;
+CREATE TABLE t2_nullable (`id` Int32, key String, key2 Nullable(String)) ENGINE = TinyLog;
+CREATE TABLE t2_lc (`id` Int32, key String, key2 LowCardinality(String)) ENGINE = TinyLog;
+CREATE TABLE t22 (`id` Int32, `idd` Int32, `key` String, `key2` String) ENGINE = TinyLog;
+INSERT INTO t1 VALUES (1, '111', '111'),(2, '222', '2'),(2, '222', '222'),(3, '333', '333');
+INSERT INTO t2 VALUES (2, 'AAA', 'AAA'),(2, 'AAA', 'a'),(3, 'BBB', 'BBB'),(4, 'CCC', 'CCC');
+INSERT INTO t2_nullable VALUES (2, 'AAA', 'AAA'),(2, 'AAA', 'a'),(3, 'BBB', NULL),(4, 'CCC', 'CCC');
+INSERT INTO t2_lc VALUES (2, 'AAA', 'AAA'),(2, 'AAA', 'a'),(3, 'BBB', 'BBB'),(4, 'CCC', 'CCC');
+INSERT INTO t22 VALUES (2, 1, 'AAA', 'AAA'),(2, 3, 'AAA', 'a'),(3, 100, 'BBB', 'BBB'),(4, 101, 'CCC', 'CCC');
+
+{% for join_use_nulls in [0, 1] -%}
+
+SET join_use_nulls = {{ join_use_nulls }};
+
+SET join_algorithm = 'hash';
+
+SELECT '-- hash_join --';
+
+SELECT '--';
+SELECT t1.key, t1.key2 FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2;
+SELECT '--';
+SELECT t1.key, t1.key2 FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2;
+
+SELECT '--';
+SELECT t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2;
+
+SELECT '--';
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.id > 2;
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.id == 3;
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.key2 == 'BBB';
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.key2 == '333';
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND (t2.key == t2.key2 OR isNull(t2.key2)) AND t1.key == t1.key2 AND t1.key2 == '333';
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_lc as t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.key2 == '333';
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND isNull(t2.key2);
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND t1.key2 like '33%';
+SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.id >= length(t1.key);
+
+-- DISTINCT is used to remove the difference between 'hash' and 'merge' join: 'merge' doesn't support `any_join_distinct_right_table_keys`
+
+SELECT '--';
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND t2.key2 != '';
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(t2.key2 != '');
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(t2.key2 != '');
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(toNullable(t2.key2 != ''));
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t2.key2 != ''));
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(t1.key2 != '');
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(t1.key2 != '');
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(toNullable(t1.key2 != ''));
+SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t1.key2 != ''));
+
+SELECT '--';
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e;
+-- `e + 1` is UInt16
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e + 1; -- { serverError 403 }
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1);
+
+SELECT '--';
+SELECT t1.id, t1.key, t1.key2, t2.id, t2.key, t2.key2  FROM t1 FULL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 ORDER BY t1.id NULLS FIRST, t2.id NULLS FIRST;
+SELECT t1.id, t1.key, t1.key2, t22.id, t22.idd, t22.key, t22.key2  FROM t1 FULL JOIN t22 ON t1.id == t22.id AND t22.key == t22.key2 AND t1.key == t1.key2 OR t1.id = t22.idd AND t1.key = t1.key2 ORDER BY t1.id NULLS FIRST, t22.id NULLS FIRST;
+
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id + 2; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id + 2; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.key; -- { serverError 403 }
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverError 403 }
+SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND (t1.id == t2.id OR isNull(t2.key2)); -- { serverError 403 }
+SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 OR t1.id == t2.id; -- { serverError 403 }
+SELECT * FROM t1 JOIN t2 ON (t2.key == t2.key2 AND (t1.key == t1.key2 AND t1.key != 'XXX' OR t1.id == t2.id)) AND t1.id == t2.id; -- { serverError 403 }
+SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND t1.key == t1.key2 AND t1.key != 'XXX' AND t1.id == t2.id OR t2.key == t2.key2 AND t1.id == t2.id AND t1.id == t2.id;
+-- non-equi condition containing columns from different tables doesn't supported yet
+SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id >= t2.id; -- { serverError 403 }
+SELECT * FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.id >= length(t2.key); -- { serverError 403 }
+
+SELECT '--';
+-- length(t1.key2) == length(t2.key2) is expression for columns from both tables, it works because it part of joining key
+SELECT t1.*, t2.* FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND length(t1.key2) == length(t2.key2) AND t1.key != '333';
+
+SELECT 't22', * FROM t1 JOIN t22 ON t1.id == t22.idd and (t22.key == t22.key2 OR t1.id == t22.id); -- { serverError 403 }
+SELECT 't22', * FROM t1 JOIN t22 ON t1.id == t22.idd and (t1.id == t22.id OR t22.key == t22.key2); -- { serverError 403 }
+SELECT 't22', * FROM t1 JOIN t22 ON (t22.key == t22.key2 OR t1.id == t22.id) and t1.id == t22.idd; -- { serverError 403 }
+SELECT 't22', * FROM t1 JOIN t22 ON (t1.id == t22.id OR t22.key == t22.key2) and t1.id == t22.idd; -- { serverError 403 }
+SELECT 't22', * FROM t1 JOIN t22 ON (t1.id == t22.id OR t22.key == t22.key2) and (t1.id == t22.idd AND (t1.key2 = 'a1' OR t1.key2 = 'a2' OR t1.key2 = 'a3' OR t1.key2 = 'a4' OR t1.key2 = 'a5' OR t1.key2 = 'a6' OR t1.key2 = 'a7' OR t1.key2 = 'a8' OR t1.key2 = 'a9' OR t1.key2 = 'a10' OR t1.key2 = 'a11' OR t1.key2 = 'a12' OR t1.key2 = 'a13' OR t1.key2 = 'a14' OR t1.key2 = 'a15' OR t1.key2 = 'a16' OR t1.key2 = 'a17' OR t1.key2 = 'a18' OR t1.key2 = 'a19' OR t1.key2 = '111')); -- { serverError 403 }
+SELECT 't22', * FROM t1 JOIN t22 ON t1.id == t22.idd and t22.key == t22.key2 OR t1.id == t22.idd and t1.id == t22.id;
+SELECT 't22', * FROM t1 JOIN t22 ON t1.id == t22.idd and t1.id == t22.id OR t1.id == t22.idd and t22.key == t22.key2;
+SELECT 't22', * FROM t1 JOIN t22 ON t22.key == t22.key2 and t1.id == t22.idd OR t1.id == t22.id and t1.id == t22.idd;
+SELECT 't22', * FROM t1 JOIN t22 ON t1.id == t22.id and t1.id == t22.idd OR t22.key == t22.key2 and t1.id == t22.idd;
+
+{% endfor -%}
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t2_nullable;
+DROP TABLE IF EXISTS t2_lc;
+DROP TABLE IF EXISTS t22;
diff --git a/tests/queries/0_stateless/01881_join_on_conditions_merge.reference.j2 b/tests/queries/0_stateless/01881_join_on_conditions_merge.reference.j2
new file mode 100644
index 00000000000..040b4a059ff
--- /dev/null
+++ b/tests/queries/0_stateless/01881_join_on_conditions_merge.reference.j2
@@ -0,0 +1,60 @@
+{%- macro jnull(join_use_nulls, value='') -%}
+{#- default value or null if join_use_nulls is enabled -#}
+{% if join_use_nulls == 1 %}\N{% else %}{{ value }}{% endif %}
+{%- endmacro -%}
+{% for jn in [0, 1] -%}
+-- partial_merge --
+--
+222	2
+222	222
+333	333
+--
+222	222
+333	333
+--
+222
+333
+--
+1
+1
+1
+1
+1
+1
+1
+1
+1
+--
+2
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+2
+3
+--
+222	2
+333	3
+222	2
+333	3
+--
+{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}	2	AAA	a
+{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}	4	CCC	CCC
+1	111	111	{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}
+2	222	2	{{ jnull(jn, 0) }}	{{ jnull(jn) }}	{{ jnull(jn) }}
+2	222	222	2	AAA	AAA
+3	333	333	3	BBB	BBB
+--
+2	222	2	2	AAA	a
+2	222	222	2	AAA	AAA
+{% endfor -%}
diff --git a/tests/queries/0_stateless/01881_join_on_conditions.sql b/tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
similarity index 53%
rename from tests/queries/0_stateless/01881_join_on_conditions.sql
rename to tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
index a34c413845b..a51f4c856f3 100644
--- a/tests/queries/0_stateless/01881_join_on_conditions.sql
+++ b/tests/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
@@ -2,76 +2,22 @@ DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t2_nullable;
 DROP TABLE IF EXISTS t2_lc;
+DROP TABLE IF EXISTS t22;
 
 CREATE TABLE t1 (`id` Int32, key String, key2 String) ENGINE = TinyLog;
 CREATE TABLE t2 (`id` Int32, key String, key2 String) ENGINE = TinyLog;
 CREATE TABLE t2_nullable (`id` Int32, key String, key2 Nullable(String)) ENGINE = TinyLog;
 CREATE TABLE t2_lc (`id` Int32, key String, key2 LowCardinality(String)) ENGINE = TinyLog;
-
+CREATE TABLE t22 (`id` Int32, `idd` Int32, `key` String, `key2` String) ENGINE = TinyLog;
 INSERT INTO t1 VALUES (1, '111', '111'),(2, '222', '2'),(2, '222', '222'),(3, '333', '333');
 INSERT INTO t2 VALUES (2, 'AAA', 'AAA'),(2, 'AAA', 'a'),(3, 'BBB', 'BBB'),(4, 'CCC', 'CCC');
 INSERT INTO t2_nullable VALUES (2, 'AAA', 'AAA'),(2, 'AAA', 'a'),(3, 'BBB', NULL),(4, 'CCC', 'CCC');
 INSERT INTO t2_lc VALUES (2, 'AAA', 'AAA'),(2, 'AAA', 'a'),(3, 'BBB', 'BBB'),(4, 'CCC', 'CCC');
+INSERT INTO t22 VALUES (2, 1, 'AAA', 'AAA'),(2, 3, 'AAA', 'a'),(3, 100, 'BBB', 'BBB'),(4, 101, 'CCC', 'CCC');
 
-SELECT '-- hash_join --';
+{% for join_use_nulls in [0, 1] -%}
 
-SELECT '--';
-SELECT t1.key, t1.key2 FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2;
-SELECT '--';
-SELECT t1.key, t1.key2 FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2;
-
-SELECT '--';
-SELECT t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2;
-
-SELECT '--';
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.id > 2;
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.id == 3;
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t2.key2 == 'BBB';
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.key2 == '333';
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND (t2.key == t2.key2 OR isNull(t2.key2)) AND t1.key == t1.key2 AND t1.key2 == '333';
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_lc as t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.key2 == '333';
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND isNull(t2.key2);
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND t1.key2 like '33%';
-SELECT '333' = t1.key FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.id >= length(t1.key);
-
--- DISTINCT is used to remove the difference between 'hash' and 'merge' join: 'merge' doesn't support `any_join_distinct_right_table_keys`
-
-SELECT '--';
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2_nullable as t2 ON t1.id == t2.id AND t2.key2 != '';
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(t2.key2 != '');
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(t2.key2 != '');
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(toNullable(t2.key2 != ''));
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t2.key2 != ''));
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(t1.key2 != '');
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(t1.key2 != '');
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardinality(toNullable(t1.key2 != ''));
-SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t1.key2 != ''));
-
-SELECT '--';
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e; 
--- `e + 1` is UInt16
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e + 1; -- { serverError 403 }
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1); 
-
-SELECT '--';
-SELECT t1.id, t1.key, t1.key2, t2.id, t2.key, t2.key2  FROM t1 FULL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 ORDER BY t1.id, t2.id;
-
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id + 2; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id + 2; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.key; -- { serverError 403 }
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverError 403 }
-SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND (t1.id == t2.id OR isNull(t2.key2)); -- { serverError 403 }
-SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 OR t1.id == t2.id; -- { serverError 403 }
-SELECT * FROM t1 JOIN t2 ON (t2.key == t2.key2 AND (t1.key == t1.key2 AND t1.key != 'XXX' OR t1.id == t2.id)) AND t1.id == t2.id; -- { serverError 403 }
--- non-equi condition containing columns from different tables doesn't supported yet
-SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id >= t2.id; -- { serverError 403 }
-SELECT * FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.id >= length(t2.key); -- { serverError 403 }
-
-SELECT '--';
--- length(t1.key2) == length(t2.key2) is expression for columns from both tables, it works because it part of joining key
-SELECT t1.*, t2.* FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND length(t1.key2) == length(t2.key2) AND t1.key != '333';
+SET join_use_nulls = {{ join_use_nulls }};
 
 SET join_algorithm = 'partial_merge';
 
@@ -110,13 +56,13 @@ SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toLowCardi
 SELECT DISTINCT t1.id FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toNullable(toLowCardinality(t1.key2 != ''));
 
 SELECT '--';
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e; 
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e;
 -- `e + 1` is UInt16
 SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND e + 1; -- { serverError 403 }
-SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1); 
+SELECT DISTINCT t1.key, toUInt8(t1.id) as e FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND toUInt8(e + 1);
 
 SELECT '--';
-SELECT t1.id, t1.key, t1.key2, t2.id, t2.key, t2.key2  FROM t1 FULL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 ORDER BY t1.id, t2.id;
+SELECT t1.id, t1.key, t1.key2, t2.id, t2.key, t2.key2  FROM t1 FULL JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 ORDER BY t1.id NULLS FIRST, t2.id NULLS FIRST;
 
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id; -- { serverError 403 }
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.id; -- { serverError 403 }
@@ -127,6 +73,7 @@ SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t2.key; -- { serverErro
 SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND (t1.id == t2.id OR isNull(t2.key2)); -- { serverError 403 }
 SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 OR t1.id == t2.id; -- { serverError 403 }
 SELECT * FROM t1 JOIN t2 ON (t2.key == t2.key2 AND (t1.key == t1.key2 AND t1.key != 'XXX' OR t1.id == t2.id)) AND t1.id == t2.id; -- { serverError 403 }
+SELECT * FROM t1 JOIN t2 ON t2.key == t2.key2 AND t1.key == t1.key2 AND t1.key != 'XXX' AND t1.id == t2.id OR t2.key == t2.key2 AND t1.id == t2.id AND t1.id == t2.id; -- { serverError 48 }
 -- non-equi condition containing columns from different tables doesn't supported yet
 SELECT * FROM t1 INNER ALL JOIN t2 ON t1.id == t2.id AND t1.id >= t2.id; -- { serverError 403 }
 SELECT * FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND t2.key == t2.key2 AND t1.key == t1.key2 AND t1.id >= length(t2.key); -- { serverError 403 }
@@ -135,7 +82,11 @@ SELECT '--';
 -- length(t1.key2) == length(t2.key2) is expression for columns from both tables, it works because it part of joining key
 SELECT t1.*, t2.* FROM t1 INNER ANY JOIN t2 ON t1.id == t2.id AND length(t1.key2) == length(t2.key2) AND t1.key != '333';
 
+
+{% endfor -%}
+
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t2_nullable;
 DROP TABLE IF EXISTS t2_lc;
+DROP TABLE IF EXISTS t22;
diff --git a/tests/queries/0_stateless/01883_subcolumns_distributed.sql b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
index 5593dc60251..7aedc7c8eab 100644
--- a/tests/queries/0_stateless/01883_subcolumns_distributed.sql
+++ b/tests/queries/0_stateless/01883_subcolumns_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 DROP TABLE IF EXISTS t_subcolumns_local;
 DROP TABLE IF EXISTS t_subcolumns_dist;
 
diff --git a/tests/queries/0_stateless/01888_read_int_safe.sql b/tests/queries/0_stateless/01888_read_int_safe.sql
index 3caa4878aba..3aea8e38ab0 100644
--- a/tests/queries/0_stateless/01888_read_int_safe.sql
+++ b/tests/queries/0_stateless/01888_read_int_safe.sql
@@ -3,8 +3,8 @@ select toInt64('+-1'); -- { serverError 72; }
 select toInt64('++1'); -- { serverError 72; }
 select toInt64('++'); -- { serverError 72; }
 select toInt64('+'); -- { serverError 72; }
-select toInt64('1+1'); -- { serverError 72; }
-select toInt64('1-1'); -- { serverError 72; }
+select toInt64('1+1'); -- { serverError 6; }
+select toInt64('1-1'); -- { serverError 6; }
 select toInt64(''); -- { serverError 32; }
 select toInt64('1');
 select toInt64('-1');
diff --git a/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh b/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
index b49c7b5371c..b5be39a91df 100755
--- a/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
+++ b/tests/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=none
 
diff --git a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
index 6cea18e2c66..aa162911399 100755
--- a/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
+++ b/tests/queries/0_stateless/01889_clickhouse_client_config_format.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
index 9d61f7034cf..e9467d77451 100755
--- a/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
+++ b/tests/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Tag no-fasttest: needs psql
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01889_sql_json_functions.sql b/tests/queries/0_stateless/01889_sql_json_functions.sql
index 1c5069ccfde..087f029e635 100644
--- a/tests/queries/0_stateless/01889_sql_json_functions.sql
+++ b/tests/queries/0_stateless/01889_sql_json_functions.sql
@@ -1,44 +1,46 @@
+-- Tags: no-fasttest
+
 SELECT '--JSON_VALUE--';
-SELECT JSON_VALUE('$', '{"hello":1}'); -- root is a complex object => default value (empty string)
-SELECT JSON_VALUE('$.hello', '{"hello":1}');
-SELECT JSON_VALUE('$.hello', '{"hello":1.2}');
-SELECT JSON_VALUE('$.hello', '{"hello":true}');
-SELECT JSON_VALUE('$.hello', '{"hello":"world"}');
-SELECT JSON_VALUE('$.hello', '{"hello":null}');
-SELECT JSON_VALUE('$.hello', '{"hello":["world","world2"]}');
-SELECT JSON_VALUE('$.hello', '{"hello":{"world":"!"}}');
-SELECT JSON_VALUE('$.hello', '{hello:world}'); -- invalid json => default value (empty string)
-SELECT JSON_VALUE('$.hello', '');
+SELECT JSON_VALUE('{"hello":1}', '$'); -- root is a complex object => default value (empty string)
+SELECT JSON_VALUE('{"hello":1}', '$.hello');
+SELECT JSON_VALUE('{"hello":1.2}', '$.hello');
+SELECT JSON_VALUE('{"hello":true}', '$.hello');
+SELECT JSON_VALUE('{"hello":"world"}', '$.hello');
+SELECT JSON_VALUE('{"hello":null}', '$.hello');
+SELECT JSON_VALUE('{"hello":["world","world2"]}', '$.hello');
+SELECT JSON_VALUE('{"hello":{"world":"!"}}', '$.hello');
+SELECT JSON_VALUE('{hello:world}', '$.hello'); -- invalid json => default value (empty string)
+SELECT JSON_VALUE('', '$.hello');
 
 SELECT '--JSON_QUERY--';
-SELECT JSON_QUERY('$', '{"hello":1}');
-SELECT JSON_QUERY('$.hello', '{"hello":1}');
-SELECT JSON_QUERY('$.hello', '{"hello":1.2}');
-SELECT JSON_QUERY('$.hello', '{"hello":true}');
-SELECT JSON_QUERY('$.hello', '{"hello":"world"}');
-SELECT JSON_QUERY('$.hello', '{"hello":null}');
-SELECT JSON_QUERY('$.hello', '{"hello":["world","world2"]}');
-SELECT JSON_QUERY('$.hello', '{"hello":{"world":"!"}}');
-SELECT JSON_QUERY('$.hello', '{hello:{"world":"!"}}}'); -- invalid json => default value (empty string)
-SELECT JSON_QUERY('$.hello', '');
-SELECT JSON_QUERY('$.array[*][0 to 2, 4]', '{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}');
+SELECT JSON_QUERY('{"hello":1}', '$');
+SELECT JSON_QUERY('{"hello":1}', '$.hello');
+SELECT JSON_QUERY('{"hello":1.2}', '$.hello');
+SELECT JSON_QUERY('{"hello":true}', '$.hello');
+SELECT JSON_QUERY('{"hello":"world"}', '$.hello');
+SELECT JSON_QUERY('{"hello":null}', '$.hello');
+SELECT JSON_QUERY('{"hello":["world","world2"]}', '$.hello');
+SELECT JSON_QUERY('{"hello":{"world":"!"}}', '$.hello');
+SELECT JSON_QUERY( '{hello:{"world":"!"}}}', '$.hello'); -- invalid json => default value (empty string)
+SELECT JSON_QUERY('', '$.hello');
+SELECT JSON_QUERY('{"array":[[0, 1, 2, 3, 4, 5], [0, -1, -2, -3, -4, -5]]}', '$.array[*][0 to 2, 4]');
 
 SELECT '--JSON_EXISTS--';
-SELECT JSON_EXISTS('$', '{"hello":1}');
-SELECT JSON_EXISTS('$', '');
-SELECT JSON_EXISTS('$', '{}');
-SELECT JSON_EXISTS('$.hello', '{"hello":1}');
-SELECT JSON_EXISTS('$.world', '{"hello":1,"world":2}');
-SELECT JSON_EXISTS('$.world', '{"hello":{"world":1}}');
-SELECT JSON_EXISTS('$.hello.world', '{"hello":{"world":1}}');
-SELECT JSON_EXISTS('$.hello', '{hello:world}'); -- invalid json => default value (zero integer)
-SELECT JSON_EXISTS('$.hello', '');
-SELECT JSON_EXISTS('$.hello[*]', '{"hello":["world"]}');
-SELECT JSON_EXISTS('$.hello[0]', '{"hello":["world"]}');
-SELECT JSON_EXISTS('$.hello[1]', '{"hello":["world"]}');
-SELECT JSON_EXISTS('$.a[*].b', '{"a":[{"b":1},{"c":2}]}');
-SELECT JSON_EXISTS('$.a[*].f', '{"a":[{"b":1},{"c":2}]}');
-SELECT JSON_EXISTS('$.a[*][0].h', '{"a":[[{"b":1}, {"g":1}],[{"h":1},{"y":1}]]}');
+SELECT JSON_EXISTS('{"hello":1}', '$');
+SELECT JSON_EXISTS('', '$');
+SELECT JSON_EXISTS('{}', '$');
+SELECT JSON_EXISTS('{"hello":1}', '$.hello');
+SELECT JSON_EXISTS('{"hello":1,"world":2}', '$.world');
+SELECT JSON_EXISTS('{"hello":{"world":1}}', '$.world');
+SELECT JSON_EXISTS('{"hello":{"world":1}}', '$.hello.world');
+SELECT JSON_EXISTS('{hello:world}', '$.hello'); -- invalid json => default value (zero integer)
+SELECT JSON_EXISTS('', '$.hello');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[*]');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[0]');
+SELECT JSON_EXISTS('{"hello":["world"]}', '$.hello[1]');
+SELECT JSON_EXISTS('{"a":[{"b":1},{"c":2}]}', '$.a[*].b');
+SELECT JSON_EXISTS('{"a":[{"b":1},{"c":2}]}', '$.a[*].f');
+SELECT JSON_EXISTS('{"a":[[{"b":1}, {"g":1}],[{"h":1},{"y":1}]]}', '$.a[*][0].h');
 
 SELECT '--MANY ROWS--';
 DROP TABLE IF EXISTS 01889_sql_json;
@@ -46,5 +48,5 @@ CREATE TABLE 01889_sql_json (id UInt8, json String) ENGINE = MergeTree ORDER BY
 INSERT INTO 01889_sql_json(id, json) VALUES(0, '{"name":"Ivan","surname":"Ivanov","friends":["Vasily","Kostya","Artyom"]}');
 INSERT INTO 01889_sql_json(id, json) VALUES(1, '{"name":"Katya","surname":"Baltica","friends":["Tihon","Ernest","Innokentiy"]}');
 INSERT INTO 01889_sql_json(id, json) VALUES(2, '{"name":"Vitali","surname":"Brown","friends":["Katya","Anatoliy","Ivan","Oleg"]}');
-SELECT id, JSON_QUERY('$.friends[0 to 2]', json) FROM 01889_sql_json ORDER BY id;
+SELECT id, JSON_QUERY(json, '$.friends[0 to 2]') FROM 01889_sql_json ORDER BY id;
 DROP TABLE 01889_sql_json;
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.sh b/tests/queries/0_stateless/01889_sqlite_read_write.sh
index 73b106e9eb4..247f44b61e7 100755
--- a/tests/queries/0_stateless/01889_sqlite_read_write.sh
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -7,60 +8,68 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # See 01658_read_file_to_string_column.sh
 user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
 
-mkdir -p ${user_files_path}/
-chmod 777 ${user_files_path}
-DB_PATH=${user_files_path}/db1
+mkdir -p "${user_files_path}/"
+chmod 777 "${user_files_path}"
 
+export CURR_DATABASE="test_01889_sqllite_${CLICKHOUSE_DATABASE}"
 
-sqlite3 ${DB_PATH} 'DROP TABLE IF EXISTS table1'
-sqlite3 ${DB_PATH} 'DROP TABLE IF EXISTS table2'
-sqlite3 ${DB_PATH} 'DROP TABLE IF EXISTS table3'
-sqlite3 ${DB_PATH} 'DROP TABLE IF EXISTS table4'
-sqlite3 ${DB_PATH} 'DROP TABLE IF EXISTS table5'
+DB_PATH=${user_files_path}/${CURR_DATABASE}_db1
+DB_PATH2=$CUR_DIR/${CURR_DATABASE}_db2
 
-sqlite3 ${DB_PATH} 'CREATE TABLE table1 (col1 text, col2 smallint);'
-sqlite3 ${DB_PATH} 'CREATE TABLE table2 (col1 int, col2 text);'
+function cleanup()
+{
+    ${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS ${CURR_DATABASE}"
+    rm -r "${DB_PATH}" "${DB_PATH2}"
+}
+trap cleanup EXIT
 
-chmod ugo+w ${DB_PATH}
+sqlite3 "${DB_PATH}" 'DROP TABLE IF EXISTS table1'
+sqlite3 "${DB_PATH}" 'DROP TABLE IF EXISTS table2'
+sqlite3 "${DB_PATH}" 'DROP TABLE IF EXISTS table3'
+sqlite3 "${DB_PATH}" 'DROP TABLE IF EXISTS table4'
+sqlite3 "${DB_PATH}" 'DROP TABLE IF EXISTS table5'
 
-sqlite3 ${DB_PATH} "INSERT INTO table1 VALUES ('line1', 1), ('line2', 2), ('line3', 3)"
-sqlite3 ${DB_PATH} "INSERT INTO table2 VALUES (1, 'text1'), (2, 'text2'), (3, 'text3')"
+sqlite3 "${DB_PATH}" 'CREATE TABLE table1 (col1 text, col2 smallint);'
+sqlite3 "${DB_PATH}" 'CREATE TABLE table2 (col1 int, col2 text);'
 
-sqlite3 ${DB_PATH} 'CREATE TABLE table3 (col1 text, col2 int);'
-sqlite3 ${DB_PATH} 'INSERT INTO table3 VALUES (NULL, 1)'
-sqlite3 ${DB_PATH} "INSERT INTO table3 VALUES ('not a null', 2)"
-sqlite3 ${DB_PATH} 'INSERT INTO table3 VALUES (NULL, 3)'
-sqlite3 ${DB_PATH} "INSERT INTO table3 VALUES ('', 4)"
+chmod ugo+w "${DB_PATH}"
 
-sqlite3 ${DB_PATH} 'CREATE TABLE table4 (a int, b integer, c tinyint, d smallint, e mediumint, bigint, int2, int8)'
-sqlite3 ${DB_PATH} 'CREATE TABLE table5 (a character(20), b varchar(10), c real, d double, e double precision, f float)'
+sqlite3 "${DB_PATH}" "INSERT INTO table1 VALUES ('line1', 1), ('line2', 2), ('line3', 3)"
+sqlite3 "${DB_PATH}" "INSERT INTO table2 VALUES (1, 'text1'), (2, 'text2'), (3, 'text3')"
 
+sqlite3 "${DB_PATH}" 'CREATE TABLE table3 (col1 text, col2 int);'
+sqlite3 "${DB_PATH}" 'INSERT INTO table3 VALUES (NULL, 1)'
+sqlite3 "${DB_PATH}" "INSERT INTO table3 VALUES ('not a null', 2)"
+sqlite3 "${DB_PATH}" 'INSERT INTO table3 VALUES (NULL, 3)'
+sqlite3 "${DB_PATH}" "INSERT INTO table3 VALUES ('', 4)"
+
+sqlite3 "${DB_PATH}" 'CREATE TABLE table4 (a int, b integer, c tinyint, d smallint, e mediumint, bigint, int2, int8)'
+sqlite3 "${DB_PATH}" 'CREATE TABLE table5 (a character(20), b varchar(10), c real, d double, e double precision, f float)'
 
-${CLICKHOUSE_CLIENT} --query='DROP DATABASE IF EXISTS sqlite_database'
 
 ${CLICKHOUSE_CLIENT} --query="select 'create database engine'";
-${CLICKHOUSE_CLIENT} --query="CREATE DATABASE sqlite_database ENGINE = SQLite('${DB_PATH}')"
+${CLICKHOUSE_CLIENT} --query="CREATE DATABASE ${CURR_DATABASE} ENGINE = SQLite('${DB_PATH}')"
 
 ${CLICKHOUSE_CLIENT} --query="select 'show database tables:'";
-${CLICKHOUSE_CLIENT} --query='SHOW TABLES FROM sqlite_database;'
+${CLICKHOUSE_CLIENT} --query='SHOW TABLES FROM '"${CURR_DATABASE}"';'
 
 ${CLICKHOUSE_CLIENT} --query="select 'show creare table:'";
-${CLICKHOUSE_CLIENT} --query='SHOW CREATE TABLE sqlite_database.table1;' | sed -r 's/(.*SQLite)(.*)/\1/'
-${CLICKHOUSE_CLIENT} --query='SHOW CREATE TABLE sqlite_database.table2;' | sed -r 's/(.*SQLite)(.*)/\1/'
+${CLICKHOUSE_CLIENT} --query="SHOW CREATE TABLE ${CURR_DATABASE}.table1;" | sed -r 's/(.*SQLite)(.*)/\1/'
+${CLICKHOUSE_CLIENT} --query="SHOW CREATE TABLE ${CURR_DATABASE}.table2;" | sed -r 's/(.*SQLite)(.*)/\1/'
 
 ${CLICKHOUSE_CLIENT} --query="select 'describe table:'";
-${CLICKHOUSE_CLIENT} --query='DESCRIBE TABLE sqlite_database.table1;'
-${CLICKHOUSE_CLIENT} --query='DESCRIBE TABLE sqlite_database.table2;'
+${CLICKHOUSE_CLIENT} --query="DESCRIBE TABLE ${CURR_DATABASE}.table1;"
+${CLICKHOUSE_CLIENT} --query="DESCRIBE TABLE ${CURR_DATABASE}.table2;"
 
 ${CLICKHOUSE_CLIENT} --query="select 'select *:'";
-${CLICKHOUSE_CLIENT} --query='SELECT * FROM sqlite_database.table1 ORDER BY col2'
-${CLICKHOUSE_CLIENT} --query='SELECT * FROM sqlite_database.table2 ORDER BY col1;'
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM ${CURR_DATABASE}.table1 ORDER BY col2"
+${CLICKHOUSE_CLIENT} --query="SELECT * FROM ${CURR_DATABASE}.table2 ORDER BY col1"
 
 ${CLICKHOUSE_CLIENT} --query="select 'test types'";
-${CLICKHOUSE_CLIENT} --query='SHOW CREATE TABLE sqlite_database.table4;' | sed -r 's/(.*SQLite)(.*)/\1/'
-${CLICKHOUSE_CLIENT} --query='SHOW CREATE TABLE sqlite_database.table5;' | sed -r 's/(.*SQLite)(.*)/\1/'
+${CLICKHOUSE_CLIENT} --query="SHOW CREATE TABLE ${CURR_DATABASE}.table4;" | sed -r 's/(.*SQLite)(.*)/\1/'
+${CLICKHOUSE_CLIENT} --query="SHOW CREATE TABLE ${CURR_DATABASE}.table5;" | sed -r 's/(.*SQLite)(.*)/\1/'
 
-${CLICKHOUSE_CLIENT} --query='DROP DATABASE IF EXISTS sqlite_database'
+${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS ${CURR_DATABASE}"
 
 
 ${CLICKHOUSE_CLIENT} --query="select 'create table engine with table3'";
@@ -79,11 +88,9 @@ ${CLICKHOUSE_CLIENT} --query="INSERT INTO TABLE FUNCTION sqlite('${DB_PATH}', 't
 ${CLICKHOUSE_CLIENT} --query="SELECT * FROM sqlite('${DB_PATH}', 'table1') ORDER BY col2"
 
 
-sqlite3 $CUR_DIR/db2 'DROP TABLE IF EXISTS table1'
-sqlite3 $CUR_DIR/db2 'CREATE TABLE table1 (col1 text, col2 smallint);'
-sqlite3 $CUR_DIR/db2 "INSERT INTO table1 VALUES ('line1', 1), ('line2', 2), ('line3', 3)"
+sqlite3 "${DB_PATH2}" 'DROP TABLE IF EXISTS table1'
+sqlite3 "${DB_PATH2}" 'CREATE TABLE table1 (col1 text, col2 smallint);'
+sqlite3 "${DB_PATH2}" "INSERT INTO table1 VALUES ('line1', 1), ('line2', 2), ('line3', 3)"
 
 ${CLICKHOUSE_CLIENT} --query="select 'test path in clickhouse-local'";
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM sqlite('$CUR_DIR/db2', 'table1') ORDER BY col2"
-
-rm -r ${DB_PATH}
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM sqlite('${DB_PATH2}', 'table1') ORDER BY col2"
diff --git a/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql b/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
index 0f61ab168f5..d1b8f407389 100644
--- a/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
+++ b/tests/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01890_materialized_distributed_join.sh b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
index e9808a80db1..8aca09303e0 100755
--- a/tests/queries/0_stateless/01890_materialized_distributed_join.sh
+++ b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: distributed
 
 # FIXME: this is an .sh test because JOIN with Distributed in the left will use default database for the right.
 
diff --git a/tests/queries/0_stateless/01890_stem.sql b/tests/queries/0_stateless/01890_stem.sql
index 472cfb54251..8fe41d225ec 100644
--- a/tests/queries/0_stateless/01890_stem.sql
+++ b/tests/queries/0_stateless/01890_stem.sql
@@ -1,3 +1,6 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: depends on libstemmer_c
+
 SET allow_experimental_nlp_functions = 1;
 
 SELECT stem('en', 'given');
diff --git a/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql b/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
index 28e81640993..237f1fd4e21 100644
--- a/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
+++ b/tests/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01891_not_in_partition_prune.reference b/tests/queries/0_stateless/01891_not_in_partition_prune.reference
index 628053cd4f8..9d2517ad760 100644
--- a/tests/queries/0_stateless/01891_not_in_partition_prune.reference
+++ b/tests/queries/0_stateless/01891_not_in_partition_prune.reference
@@ -4,3 +4,5 @@
 7	107
 8	108
 9	109
+1970-01-01	1	one
+1970-01-01	3	three
diff --git a/tests/queries/0_stateless/01891_not_in_partition_prune.sql b/tests/queries/0_stateless/01891_not_in_partition_prune.sql
index edbfad93e5d..5bf90fdd65c 100644
--- a/tests/queries/0_stateless/01891_not_in_partition_prune.sql
+++ b/tests/queries/0_stateless/01891_not_in_partition_prune.sql
@@ -8,3 +8,18 @@ set max_rows_to_read = 5;
 select * from test1 where i not in (1,2,3,4,5) order by i;
 
 drop table test1;
+
+drop table if exists t1;
+drop table if exists t2;
+
+create table t1 (date Date, a Float64, b String) Engine=MergeTree ORDER BY date;
+create table t2 (date Date, a Float64, b String) Engine=MergeTree ORDER BY date;
+
+insert into t1(a, b) values (1, 'one'), (2, 'two');
+insert into t2(a, b) values (2, 'two'), (3, 'three');
+
+select date, a, b from t1 where (date, a, b) NOT IN (select date,a,b from t2);
+select date, a, b from t2 where (date, a, b) NOT IN (select date,a,b from t1);
+
+drop table t1;
+drop table t2;
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 0751ff2729f..643266f1ea3 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,3 +1,5 @@
+-- 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();
 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');
diff --git a/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql b/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
index c02ed8f18ee..13ebd958a84 100644
--- a/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
+++ b/tests/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql b/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
index bcd6e47d4c7..88867eef24a 100644
--- a/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
+++ b/tests/queries/0_stateless/01892_setting_limit_offset_distributed.sql
@@ -1,3 +1,5 @@
+-- Tags: distributed
+
 SELECT 'limit', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS limit=5;
 SELECT 'offset', * FROM remote('127.1', view(SELECT * FROM numbers(10))) SETTINGS offset=5;
 
diff --git a/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql b/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
index 5e700e537eb..2f2b683a153 100644
--- a/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
+++ b/tests/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql b/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
index 8ba11f4c643..99dda05930e 100644
--- a/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
+++ b/tests/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql b/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
index 903a7c65f21..27a97faa45a 100644
--- a/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
+++ b/tests/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql b/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
index 8b5618230f0..a3228d4a841 100644
--- a/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
+++ b/tests/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql b/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
index 04b8a818382..5e378f3ec6b 100644
--- a/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
+++ b/tests/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
index bb12f7c0e42..30dff6db0c4 100755
--- a/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
+++ b/tests/queries/0_stateless/01900_kill_mutation_parallel_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 #
 # Check that KILL MUTATION can be executed in parallel for different tables.
diff --git a/tests/queries/0_stateless/01901_in_literal_shard_prune.sql b/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
index cc587c36613..9250547dad8 100644
--- a/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
+++ b/tests/queries/0_stateless/01901_in_literal_shard_prune.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=1;
 
diff --git a/tests/queries/0_stateless/01901_test_attach_partition_from.sql b/tests/queries/0_stateless/01901_test_attach_partition_from.sql
index 0ffa4cdecf2..1fe073f0c32 100644
--- a/tests/queries/0_stateless/01901_test_attach_partition_from.sql
+++ b/tests/queries/0_stateless/01901_test_attach_partition_from.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS test_alter_attach_01901S;
 DROP TABLE IF EXISTS test_alter_attach_01901D;
 
@@ -5,7 +7,7 @@ CREATE TABLE test_alter_attach_01901S (A Int64, D date) ENGINE = MergeTree PARTI
 INSERT INTO test_alter_attach_01901S VALUES (1, '2020-01-01');
 
 CREATE TABLE test_alter_attach_01901D (A Int64, D date) 
-Engine=ReplicatedMergeTree('/clickhouse/tables/test_alter_attach_01901D', 'r1')
+Engine=ReplicatedMergeTree('/clickhouse/tables/{database}/test_alter_attach_01901D', 'r1')
 PARTITION BY D ORDER BY A;
 
 ALTER TABLE test_alter_attach_01901D ATTACH PARTITION '2020-01-01' FROM test_alter_attach_01901S;
diff --git a/tests/queries/0_stateless/01902_dictionary_array_type.sql b/tests/queries/0_stateless/01902_dictionary_array_type.sql
index 700f26e915d..bff107d4dad 100644
--- a/tests/queries/0_stateless/01902_dictionary_array_type.sql
+++ b/tests/queries/0_stateless/01902_dictionary_array_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_array_source_table;
 CREATE TABLE dictionary_array_source_table
 (
diff --git a/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql b/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
index 3aabf1a1f36..3801a83e247 100644
--- a/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
+++ b/tests/queries/0_stateless/01902_table_function_merge_db_repr.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01902_db;
 DROP DATABASE IF EXISTS 01902_db1;
 DROP DATABASE IF EXISTS 01902_db2;
diff --git a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
index 70aa4623320..b1d6049abcf 100755
--- a/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
+++ b/tests/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql b/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
index 0d4f7119fa3..e6831c92c9f 100644
--- a/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
+++ b/tests/queries/0_stateless/01904_dictionary_default_nullable_type.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_nullable_source_table;
 CREATE TABLE dictionary_nullable_source_table
 (
diff --git a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
index d3a4389e6d5..07d2ac7baad 100755
--- a/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
+++ b/tests/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01905_to_json_string.sql b/tests/queries/0_stateless/01905_to_json_string.sql
index 80d9c2e2625..e92c32f3422 100644
--- a/tests/queries/0_stateless/01905_to_json_string.sql
+++ b/tests/queries/0_stateless/01905_to_json_string.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 create temporary table t engine Memory as select * from generateRandom(
 $$
     a Array(Int8),
diff --git a/tests/queries/0_stateless/01906_h3_to_geo.sql b/tests/queries/0_stateless/01906_h3_to_geo.sql
index aa6ecca1754..dd8608fbccd 100644
--- a/tests/queries/0_stateless/01906_h3_to_geo.sql
+++ b/tests/queries/0_stateless/01906_h3_to_geo.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS h3_indexes;
 
 CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/01909_mbtolou.reference b/tests/queries/0_stateless/01909_mbtolou.reference
new file mode 100644
index 00000000000..1dd4baba031
--- /dev/null
+++ b/tests/queries/0_stateless/01909_mbtolou.reference
@@ -0,0 +1,10 @@
+1400-02-28	00-02-28 : 1
+1400-02-29	00-02-29 : 1
+1400-02-30	00-02-30 : 1
+1400-02-31	00-02-31 : 1
+1400-03-01	00-03-01 : 1
+1400-02-28	00-02-28 : 1
+1400-02-29	00-02-29 : 1
+1400-02-30	00-02-30 : 1
+1400-02-31	00-02-31 : 1
+1400-03-01	00-03-01 : 1
diff --git a/tests/queries/0_stateless/01909_mbtolou.sql b/tests/queries/0_stateless/01909_mbtolou.sql
new file mode 100644
index 00000000000..a1b05e7c461
--- /dev/null
+++ b/tests/queries/0_stateless/01909_mbtolou.sql
@@ -0,0 +1,51 @@
+-- BIGMDM.DATE_INFO_DICT definition
+
+DROP TABLE IF EXISTS DATE_INFO_DICT;
+
+CREATE TABLE DATE_INFO_DICT
+(
+    `TV` Date,
+    `SHAMSI` String,
+    `HIJRI` String,
+    `MILADI` String,
+    `S_DAY` UInt8,
+    `H_DAY` UInt8,
+    `S_MONTH` UInt8,
+    `H_MONTH` UInt8,
+    `WEEK_DAY_NAME` String,
+    `DAY_NUMBER` UInt8,
+    `HOLIDAY` UInt8,
+    `WEEK_NAME` String
+)
+ENGINE = Join(ANY, LEFT, TV);
+
+
+truncate table DATE_INFO_DICT;
+
+INSERT INTO DATE_INFO_DICT (TV, SHAMSI, HIJRI, MILADI, S_DAY, H_DAY, S_MONTH, H_MONTH, WEEK_DAY_NAME, DAY_NUMBER, HOLIDAY, WEEK_NAME) VALUES ('2017-04-01', '1396-01-12', '1438-07-04', '2017-04-01', 12, 4, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2017-04-02', '1396-01-13', '1438-07-05', '2017-04-02', 13, 5, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2017-04-03', '1396-01-14', '1438-07-06', '2017-04-03', 14, 6, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2017-04-04', '1396-01-15', '1438-07-07', '2017-04-04', 15, 7, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2017-04-05', '1396-01-16', '1438-07-08', '2017-04-05', 16, 8, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2017-04-06', '1396-01-17', '1438-07-09', '2017-04-06', 17, 9, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2017-04-07', '1396-01-18', '1438-07-10', '2017-04-07', 18, 10, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2017-04-08', '1396-01-19', '1438-07-11', '2017-04-08', 19, 11, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2017-04-09', '1396-01-20', '1438-07-12', '2017-04-09', 20, 12, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2017-04-10', '1396-01-21', '1438-07-13', '2017-04-10', 21, 13, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2017-04-11', '1396-01-22', '1438-07-14', '2017-04-11', 22, 14, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2017-04-12', '1396-01-23', '1438-07-15', '2017-04-12', 23, 15, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2017-04-13', '1396-01-24', '1438-07-16', '2017-04-13', 24, 16, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2017-04-14', '1396-01-25', '1438-07-17', '2017-04-14', 25, 17, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2017-04-15', '1396-01-26', '1438-07-18', '2017-04-15', 26, 18, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2017-04-16', '1396-01-27', '1438-07-19', '2017-04-16', 27, 19, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2017-04-17', '1396-01-28', '1438-07-20', '2017-04-17', 28, 20, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2017-04-18', '1396-01-29', '1438-07-21', '2017-04-18', 29, 21, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2017-04-19', '1396-01-30', '1438-07-22', '2017-04-19', 30, 22, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2017-04-20', '1396-01-31', '1438-07-23', '2017-04-20', 31, 23, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2017-04-21', '1396-02-01', '1438-07-24', '2017-04-21', 1, 24, 2, 7, 'friday   ', 6, 0, 'NONE') ,('2017-04-22', '1396-02-02', '1438-07-25', '2017-04-22', 2, 25, 2, 7, 'saturday ', 7, 0, 'NONE') ,('2017-04-23', '1396-02-03', '1438-07-26', '2017-04-23', 3, 26, 2, 7, 'sunday   ', 1, 0, 'NONE') ,('2017-04-24', '1396-02-04', '1438-07-27', '2017-04-24', 4, 27, 2, 7, 'monday   ', 2, 0, 'NONE') ,('2017-04-25', '1396-02-05', '1438-07-28', '2017-04-25', 5, 28, 2, 7, 'tuesday  ', 3, 0, 'NONE') ,('2017-04-26', '1396-02-06', '1438-07-29', '2017-04-26', 6, 29, 2, 7, 'wednesday', 4, 0, 'NONE') ,('2017-04-27', '1396-02-07', '1438-07-30', '2017-04-27', 7, 30, 2, 7, 'thursday ', 5, 0, 'NONE') ,('2017-04-28', '1396-02-08', '1438-08-01', '2017-04-28', 8, 1, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2017-04-29', '1396-02-09', '1438-08-02', '2017-04-29', 9, 2, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2017-04-30', '1396-02-10', '1438-08-03', '2017-04-30', 10, 3, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2017-05-01', '1396-02-11', '1438-08-04', '2017-05-01', 11, 4, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2017-05-02', '1396-02-12', '1438-08-05', '2017-05-02', 12, 5, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2017-05-03', '1396-02-13', '1438-08-06', '2017-05-03', 13, 6, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2017-05-04', '1396-02-14', '1438-08-07', '2017-05-04', 14, 7, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2017-05-05', '1396-02-15', '1438-08-08', '2017-05-05', 15, 8, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2017-05-06', '1396-02-16', '1438-08-09', '2017-05-06', 16, 9, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2017-05-07', '1396-02-17', '1438-08-10', '2017-05-07', 17, 10, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2017-05-08', '1396-02-18', '1438-08-11', '2017-05-08', 18, 11, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2017-05-09', '1396-02-19', '1438-08-12', '2017-05-09', 19, 12, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2017-05-10', '1396-02-20', '1438-08-13', '2017-05-10', 20, 13, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2017-05-11', '1396-02-21', '1438-08-14', '2017-05-11', 21, 14, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2017-05-12', '1396-02-22', '1438-08-15', '2017-05-12', 22, 15, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2017-05-13', '1396-02-23', '1438-08-16', '2017-05-13', 23, 16, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2017-05-14', '1396-02-24', '1438-08-17', '2017-05-14', 24, 17, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2017-05-15', '1396-02-25', '1438-08-18', '2017-05-15', 25, 18, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2017-05-16', '1396-02-26', '1438-08-19', '2017-05-16', 26, 19, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2017-05-17', '1396-02-27', '1438-08-20', '2017-05-17', 27, 20, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2017-05-18', '1396-02-28', '1438-08-21', '2017-05-18', 28, 21, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2017-05-19', '1396-02-29', '1438-08-22', '2017-05-19', 29, 22, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2017-05-20', '1396-02-30', '1438-08-23', '2017-05-20', 30, 23, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2017-05-21', '1396-02-31', '1438-08-24', '2017-05-21', 31, 24, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2017-05-22', '1396-03-01', '1438-08-25', '2017-05-22', 1, 25, 3, 8, 'monday   ', 2, 0, 'NONE') ,('2017-05-23', '1396-03-02', '1438-08-26', '2017-05-23', 2, 26, 3, 8, 'tuesday  ', 3, 0, 'NONE') ,('2017-05-24', '1396-03-03', '1438-08-27', '2017-05-24', 3, 27, 3, 8, 'wednesday', 4, 0, 'NONE') ,('2017-05-25', '1396-03-04', '1438-08-28', '2017-05-25', 4, 28, 3, 8, 'thursday ', 5, 0, 'NONE') ,('2017-05-26', '1396-03-05', '1438-08-29', '2017-05-26', 5, 29, 3, 8, 'friday   ', 6, 0, 'NONE') ,('2017-05-27', '1396-03-06', '1438-09-01', '2017-05-27', 6, 1, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2017-05-28', '1396-03-07', '1438-09-02', '2017-05-28', 7, 2, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2017-05-29', '1396-03-08', '1438-09-03', '2017-05-29', 8, 3, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2017-05-30', '1396-03-09', '1438-09-04', '2017-05-30', 9, 4, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2017-05-31', '1396-03-10', '1438-09-05', '2017-05-31', 10, 5, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2017-06-01', '1396-03-11', '1438-09-06', '2017-06-01', 11, 6, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2017-06-02', '1396-03-12', '1438-09-07', '2017-06-02', 12, 7, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2017-06-03', '1396-03-13', '1438-09-08', '2017-06-03', 13, 8, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2017-06-04', '1396-03-14', '1438-09-09', '2017-06-04', 14, 9, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2017-06-05', '1396-03-15', '1438-09-10', '2017-06-05', 15, 10, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2017-06-06', '1396-03-16', '1438-09-11', '2017-06-06', 16, 11, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2017-06-07', '1396-03-17', '1438-09-12', '2017-06-07', 17, 12, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2017-06-08', '1396-03-18', '1438-09-13', '2017-06-08', 18, 13, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2017-06-09', '1396-03-19', '1438-09-14', '2017-06-09', 19, 14, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2017-06-10', '1396-03-20', '1438-09-15', '2017-06-10', 20, 15, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2017-06-11', '1396-03-21', '1438-09-16', '2017-06-11', 21, 16, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2017-06-12', '1396-03-22', '1438-09-17', '2017-06-12', 22, 17, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2017-06-13', '1396-03-23', '1438-09-18', '2017-06-13', 23, 18, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2017-06-14', '1396-03-24', '1438-09-19', '2017-06-14', 24, 19, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2017-06-15', '1396-03-25', '1438-09-20', '2017-06-15', 25, 20, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2017-06-16', '1396-03-26', '1438-09-21', '2017-06-16', 26, 21, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2017-06-17', '1396-03-27', '1438-09-22', '2017-06-17', 27, 22, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2017-06-18', '1396-03-28', '1438-09-23', '2017-06-18', 28, 23, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2017-06-19', '1396-03-29', '1438-09-24', '2017-06-19', 29, 24, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2017-06-20', '1396-03-30', '1438-09-25', '2017-06-20', 30, 25, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2017-06-21', '1396-03-31', '1438-09-26', '2017-06-21', 31, 26, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2017-06-22', '1396-04-01', '1438-09-27', '2017-06-22', 1, 27, 4, 9, 'thursday ', 5, 0, 'NONE') ,('2017-06-23', '1396-04-02', '1438-09-28', '2017-06-23', 2, 28, 4, 9, 'friday   ', 6, 0, 'NONE') ,('2017-06-24', '1396-04-03', '1438-09-29', '2017-06-24', 3, 29, 4, 9, 'saturday ', 7, 0, 'NONE') ,('2017-06-25', '1396-04-04', '1438-09-30', '2017-06-25', 4, 30, 4, 9, 'sunday   ', 1, 0, 'NONE') ,('2017-06-26', '1396-04-05', '1438-10-01', '2017-06-26', 5, 1, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2017-06-27', '1396-04-06', '1438-10-02', '2017-06-27', 6, 2, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2017-06-28', '1396-04-07', '1438-10-03', '2017-06-28', 7, 3, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2017-06-29', '1396-04-08', '1438-10-04', '2017-06-29', 8, 4, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2017-06-30', '1396-04-09', '1438-10-05', '2017-06-30', 9, 5, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2017-07-01', '1396-04-10', '1438-10-06', '2017-07-01', 10, 6, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2017-07-02', '1396-04-11', '1438-10-07', '2017-07-02', 11, 7, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2017-07-03', '1396-04-12', '1438-10-08', '2017-07-03', 12, 8, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2017-07-04', '1396-04-13', '1438-10-09', '2017-07-04', 13, 9, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2017-07-05', '1396-04-14', '1438-10-10', '2017-07-05', 14, 10, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2017-07-06', '1396-04-15', '1438-10-11', '2017-07-06', 15, 11, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2017-07-07', '1396-04-16', '1438-10-12', '2017-07-07', 16, 12, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2017-07-08', '1396-04-17', '1438-10-13', '2017-07-08', 17, 13, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2017-07-09', '1396-04-18', '1438-10-14', '2017-07-09', 18, 14, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2017-07-10', '1396-04-19', '1438-10-15', '2017-07-10', 19, 15, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2017-07-11', '1396-04-20', '1438-10-16', '2017-07-11', 20, 16, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2017-07-12', '1396-04-21', '1438-10-17', '2017-07-12', 21, 17, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2017-07-13', '1396-04-22', '1438-10-18', '2017-07-13', 22, 18, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2017-07-14', '1396-04-23', '1438-10-19', '2017-07-14', 23, 19, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2017-07-15', '1396-04-24', '1438-10-20', '2017-07-15', 24, 20, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2017-07-16', '1396-04-25', '1438-10-21', '2017-07-16', 25, 21, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2017-07-17', '1396-04-26', '1438-10-22', '2017-07-17', 26, 22, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2017-07-18', '1396-04-27', '1438-10-23', '2017-07-18', 27, 23, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2017-07-19', '1396-04-28', '1438-10-24', '2017-07-19', 28, 24, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2017-07-20', '1396-04-29', '1438-10-25', '2017-07-20', 29, 25, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2017-07-21', '1396-04-30', '1438-10-26', '2017-07-21', 30, 26, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2017-07-22', '1396-04-31', '1438-10-27', '2017-07-22', 31, 27, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2017-07-23', '1396-05-01', '1438-10-28', '2017-07-23', 1, 28, 5, 10, 'sunday   ', 1, 0, 'NONE') ,('2017-07-24', '1396-05-02', '1438-10-29', '2017-07-24', 2, 29, 5, 10, 'monday   ', 2, 0, 'NONE') ,('2017-07-25', '1396-05-03', '1438-11-01', '2017-07-25', 3, 1, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2017-07-26', '1396-05-04', '1438-11-02', '2017-07-26', 4, 2, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2017-07-27', '1396-05-05', '1438-11-03', '2017-07-27', 5, 3, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2017-07-28', '1396-05-06', '1438-11-04', '2017-07-28', 6, 4, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2017-07-29', '1396-05-07', '1438-11-05', '2017-07-29', 7, 5, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2017-07-30', '1396-05-08', '1438-11-06', '2017-07-30', 8, 6, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2017-07-31', '1396-05-09', '1438-11-07', '2017-07-31', 9, 7, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2017-08-01', '1396-05-10', '1438-11-08', '2017-08-01', 10, 8, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2017-08-02', '1396-05-11', '1438-11-09', '2017-08-02', 11, 9, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2017-08-03', '1396-05-12', '1438-11-10', '2017-08-03', 12, 10, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2017-08-04', '1396-05-13', '1438-11-11', '2017-08-04', 13, 11, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2017-08-05', '1396-05-14', '1438-11-12', '2017-08-05', 14, 12, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2017-08-06', '1396-05-15', '1438-11-13', '2017-08-06', 15, 13, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2017-08-07', '1396-05-16', '1438-11-14', '2017-08-07', 16, 14, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2017-08-08', '1396-05-17', '1438-11-15', '2017-08-08', 17, 15, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2017-08-09', '1396-05-18', '1438-11-16', '2017-08-09', 18, 16, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2017-08-10', '1396-05-19', '1438-11-17', '2017-08-10', 19, 17, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2017-08-11', '1396-05-20', '1438-11-18', '2017-08-11', 20, 18, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2017-08-12', '1396-05-21', '1438-11-19', '2017-08-12', 21, 19, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2017-08-13', '1396-05-22', '1438-11-20', '2017-08-13', 22, 20, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2017-08-14', '1396-05-23', '1438-11-21', '2017-08-14', 23, 21, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2017-08-15', '1396-05-24', '1438-11-22', '2017-08-15', 24, 22, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2017-08-16', '1396-05-25', '1438-11-23', '2017-08-16', 25, 23, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2017-08-17', '1396-05-26', '1438-11-24', '2017-08-17', 26, 24, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2017-08-18', '1396-05-27', '1438-11-25', '2017-08-18', 27, 25, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2017-08-19', '1396-05-28', '1438-11-26', '2017-08-19', 28, 26, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2017-08-20', '1396-05-29', '1438-11-27', '2017-08-20', 29, 27, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2017-08-21', '1396-05-30', '1438-11-28', '2017-08-21', 30, 28, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2017-08-22', '1396-05-31', '1438-11-29', '2017-08-22', 31, 29, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2017-08-23', '1396-06-01', '1438-11-30', '2017-08-23', 1, 30, 6, 11, 'wednesday', 4, 0, 'NONE') ,('2017-08-24', '1396-06-02', '1438-12-01', '2017-08-24', 2, 1, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2017-08-25', '1396-06-03', '1438-12-02', '2017-08-25', 3, 2, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2017-08-26', '1396-06-04', '1438-12-03', '2017-08-26', 4, 3, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2017-08-27', '1396-06-05', '1438-12-04', '2017-08-27', 5, 4, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2017-08-28', '1396-06-06', '1438-12-05', '2017-08-28', 6, 5, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2017-08-29', '1396-06-07', '1438-12-06', '2017-08-29', 7, 6, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2017-08-30', '1396-06-08', '1438-12-07', '2017-08-30', 8, 7, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2017-08-31', '1396-06-09', '1438-12-08', '2017-08-31', 9, 8, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2017-09-01', '1396-06-10', '1438-12-09', '2017-09-01', 10, 9, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2017-09-02', '1396-06-11', '1438-12-10', '2017-09-02', 11, 10, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2017-09-03', '1396-06-12', '1438-12-11', '2017-09-03', 12, 11, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2017-09-04', '1396-06-13', '1438-12-12', '2017-09-04', 13, 12, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2017-09-05', '1396-06-14', '1438-12-13', '2017-09-05', 14, 13, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2017-09-06', '1396-06-15', '1438-12-14', '2017-09-06', 15, 14, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2017-09-07', '1396-06-16', '1438-12-15', '2017-09-07', 16, 15, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2017-09-08', '1396-06-17', '1438-12-16', '2017-09-08', 17, 16, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2017-09-09', '1396-06-18', '1438-12-17', '2017-09-09', 18, 17, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2017-09-10', '1396-06-19', '1438-12-18', '2017-09-10', 19, 18, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2017-09-11', '1396-06-20', '1438-12-19', '2017-09-11', 20, 19, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2017-09-12', '1396-06-21', '1438-12-20', '2017-09-12', 21, 20, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2017-09-13', '1396-06-22', '1438-12-21', '2017-09-13', 22, 21, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2017-09-14', '1396-06-23', '1438-12-22', '2017-09-14', 23, 22, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2017-09-15', '1396-06-24', '1438-12-23', '2017-09-15', 24, 23, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2017-09-16', '1396-06-25', '1438-12-24', '2017-09-16', 25, 24, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2017-09-17', '1396-06-26', '1438-12-25', '2017-09-17', 26, 25, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2017-09-18', '1396-06-27', '1438-12-26', '2017-09-18', 27, 26, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2017-09-19', '1396-06-28', '1438-12-27', '2017-09-19', 28, 27, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2017-09-20', '1396-06-29', '1438-12-28', '2017-09-20', 29, 28, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2017-09-21', '1396-06-30', '1438-12-29', '2017-09-21', 30, 29, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2017-09-22', '1396-06-31', '1439-01-01', '2017-09-22', 31, 1, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2017-09-23', '1396-07-01', '1439-01-02', '2017-09-23', 1, 2, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2017-09-24', '1396-07-02', '1439-01-03', '2017-09-24', 2, 3, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2017-09-25', '1396-07-03', '1439-01-04', '2017-09-25', 3, 4, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2017-09-26', '1396-07-04', '1439-01-05', '2017-09-26', 4, 5, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2017-09-27', '1396-07-05', '1439-01-06', '2017-09-27', 5, 6, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2017-09-28', '1396-07-06', '1439-01-07', '2017-09-28', 6, 7, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2017-09-29', '1396-07-07', '1439-01-08', '2017-09-29', 7, 8, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2017-09-30', '1396-07-08', '1439-01-09', '2017-09-30', 8, 9, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2017-10-01', '1396-07-09', '1439-01-10', '2017-10-01', 9, 10, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2017-10-02', '1396-07-10', '1439-01-11', '2017-10-02', 10, 11, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2017-10-03', '1396-07-11', '1439-01-12', '2017-10-03', 11, 12, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2017-10-04', '1396-07-12', '1439-01-13', '2017-10-04', 12, 13, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2017-10-05', '1396-07-13', '1439-01-14', '2017-10-05', 13, 14, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2017-10-06', '1396-07-14', '1439-01-15', '2017-10-06', 14, 15, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2017-10-07', '1396-07-15', '1439-01-16', '2017-10-07', 15, 16, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2017-10-08', '1396-07-16', '1439-01-17', '2017-10-08', 16, 17, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2017-10-09', '1396-07-17', '1439-01-18', '2017-10-09', 17, 18, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2017-10-10', '1396-07-18', '1439-01-19', '2017-10-10', 18, 19, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2017-10-11', '1396-07-19', '1439-01-20', '2017-10-11', 19, 20, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2017-10-12', '1396-07-20', '1439-01-21', '2017-10-12', 20, 21, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2017-10-13', '1396-07-21', '1439-01-22', '2017-10-13', 21, 22, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2017-10-14', '1396-07-22', '1439-01-23', '2017-10-14', 22, 23, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2017-10-15', '1396-07-23', '1439-01-24', '2017-10-15', 23, 24, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2017-10-16', '1396-07-24', '1439-01-25', '2017-10-16', 24, 25, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2017-10-17', '1396-07-25', '1439-01-26', '2017-10-17', 25, 26, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2017-10-18', '1396-07-26', '1439-01-27', '2017-10-18', 26, 27, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2017-10-19', '1396-07-27', '1439-01-28', '2017-10-19', 27, 28, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2017-10-20', '1396-07-28', '1439-01-29', '2017-10-20', 28, 29, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2017-10-21', '1396-07-29', '1439-01-30', '2017-10-21', 29, 30, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2017-10-22', '1396-07-30', '1439-02-01', '2017-10-22', 30, 1, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2017-10-23', '1396-08-01', '1439-02-02', '2017-10-23', 1, 2, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2017-10-24', '1396-08-02', '1439-02-03', '2017-10-24', 2, 3, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2017-10-25', '1396-08-03', '1439-02-04', '2017-10-25', 3, 4, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2017-10-26', '1396-08-04', '1439-02-05', '2017-10-26', 4, 5, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2017-10-27', '1396-08-05', '1439-02-06', '2017-10-27', 5, 6, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2017-10-28', '1396-08-06', '1439-02-07', '2017-10-28', 6, 7, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2017-10-29', '1396-08-07', '1439-02-08', '2017-10-29', 7, 8, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2017-10-30', '1396-08-08', '1439-02-09', '2017-10-30', 8, 9, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2017-10-31', '1396-08-09', '1439-02-10', '2017-10-31', 9, 10, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2017-11-01', '1396-08-10', '1439-02-11', '2017-11-01', 10, 11, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2017-11-02', '1396-08-11', '1439-02-12', '2017-11-02', 11, 12, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2017-11-03', '1396-08-12', '1439-02-13', '2017-11-03', 12, 13, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2017-11-04', '1396-08-13', '1439-02-14', '2017-11-04', 13, 14, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2017-11-05', '1396-08-14', '1439-02-15', '2017-11-05', 14, 15, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2017-11-06', '1396-08-15', '1439-02-16', '2017-11-06', 15, 16, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2017-11-07', '1396-08-16', '1439-02-17', '2017-11-07', 16, 17, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2017-11-08', '1396-08-17', '1439-02-18', '2017-11-08', 17, 18, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2017-11-09', '1396-08-18', '1439-02-19', '2017-11-09', 18, 19, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2017-11-10', '1396-08-19', '1439-02-20', '2017-11-10', 19, 20, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2017-11-11', '1396-08-20', '1439-02-21', '2017-11-11', 20, 21, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2017-11-12', '1396-08-21', '1439-02-22', '2017-11-12', 21, 22, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2017-11-13', '1396-08-22', '1439-02-23', '2017-11-13', 22, 23, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2017-11-14', '1396-08-23', '1439-02-24', '2017-11-14', 23, 24, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2017-11-15', '1396-08-24', '1439-02-25', '2017-11-15', 24, 25, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2017-11-16', '1396-08-25', '1439-02-26', '2017-11-16', 25, 26, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2017-11-17', '1396-08-26', '1439-02-27', '2017-11-17', 26, 27, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2017-11-18', '1396-08-27', '1439-02-28', '2017-11-18', 27, 28, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2017-11-19', '1396-08-28', '1439-02-29', '2017-11-19', 28, 29, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2017-11-20', '1396-08-29', '1439-03-01', '2017-11-20', 29, 1, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2017-11-21', '1396-08-30', '1439-03-02', '2017-11-21', 30, 2, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2017-11-22', '1396-09-01', '1439-03-03', '2017-11-22', 1, 3, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2017-11-23', '1396-09-02', '1439-03-04', '2017-11-23', 2, 4, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2017-11-24', '1396-09-03', '1439-03-05', '2017-11-24', 3, 5, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2017-11-25', '1396-09-04', '1439-03-06', '2017-11-25', 4, 6, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2017-11-26', '1396-09-05', '1439-03-07', '2017-11-26', 5, 7, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2017-11-27', '1396-09-06', '1439-03-08', '2017-11-27', 6, 8, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2017-11-28', '1396-09-07', '1439-03-09', '2017-11-28', 7, 9, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2017-11-29', '1396-09-08', '1439-03-10', '2017-11-29', 8, 10, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2017-11-30', '1396-09-09', '1439-03-11', '2017-11-30', 9, 11, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2017-12-01', '1396-09-10', '1439-03-12', '2017-12-01', 10, 12, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2017-12-02', '1396-09-11', '1439-03-13', '2017-12-02', 11, 13, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2017-12-03', '1396-09-12', '1439-03-14', '2017-12-03', 12, 14, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2017-12-04', '1396-09-13', '1439-03-15', '2017-12-04', 13, 15, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2017-12-05', '1396-09-14', '1439-03-16', '2017-12-05', 14, 16, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2017-12-06', '1396-09-15', '1439-03-17', '2017-12-06', 15, 17, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2017-12-07', '1396-09-16', '1439-03-18', '2017-12-07', 16, 18, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2017-12-08', '1396-09-17', '1439-03-19', '2017-12-08', 17, 19, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2017-12-09', '1396-09-18', '1439-03-20', '2017-12-09', 18, 20, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2017-12-10', '1396-09-19', '1439-03-21', '2017-12-10', 19, 21, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2017-12-11', '1396-09-20', '1439-03-22', '2017-12-11', 20, 22, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2017-12-12', '1396-09-21', '1439-03-23', '2017-12-12', 21, 23, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2017-12-13', '1396-09-22', '1439-03-24', '2017-12-13', 22, 24, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2017-12-14', '1396-09-23', '1439-03-25', '2017-12-14', 23, 25, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2017-12-15', '1396-09-24', '1439-03-26', '2017-12-15', 24, 26, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2017-12-16', '1396-09-25', '1439-03-27', '2017-12-16', 25, 27, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2017-12-17', '1396-09-26', '1439-03-28', '2017-12-17', 26, 28, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2017-12-18', '1396-09-27', '1439-03-29', '2017-12-18', 27, 29, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2017-12-19', '1396-09-28', '1439-03-30', '2017-12-19', 28, 30, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2017-12-20', '1396-09-29', '1439-04-01', '2017-12-20', 29, 1, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2017-12-21', '1396-09-30', '1439-04-02', '2017-12-21', 30, 2, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2017-12-22', '1396-10-01', '1439-04-03', '2017-12-22', 1, 3, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2017-12-23', '1396-10-02', '1439-04-04', '2017-12-23', 2, 4, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2017-12-24', '1396-10-03', '1439-04-05', '2017-12-24', 3, 5, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2017-12-25', '1396-10-04', '1439-04-06', '2017-12-25', 4, 6, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2017-12-26', '1396-10-05', '1439-04-07', '2017-12-26', 5, 7, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2017-12-27', '1396-10-06', '1439-04-08', '2017-12-27', 6, 8, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2017-12-28', '1396-10-07', '1439-04-09', '2017-12-28', 7, 9, 10, 4, 'thursday ', 5, 0, 'NONE') ,('2017-12-29', '1396-10-08', '1439-04-10', '2017-12-29', 8, 10, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2017-12-30', '1396-10-09', '1439-04-11', '2017-12-30', 9, 11, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2017-12-31', '1396-10-10', '1439-04-12', '2017-12-31', 10, 12, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2018-01-01', '1396-10-11', '1439-04-13', '2018-01-01', 11, 13, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2018-01-02', '1396-10-12', '1439-04-14', '2018-01-02', 12, 14, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2018-01-03', '1396-10-13', '1439-04-15', '2018-01-03', 13, 15, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2018-01-04', '1396-10-14', '1439-04-16', '2018-01-04', 14, 16, 10, 4, 'thursday ', 5, 0, 'NONE') ,('2018-01-05', '1396-10-15', '1439-04-17', '2018-01-05', 15, 17, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2018-01-06', '1396-10-16', '1439-04-18', '2018-01-06', 16, 18, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2018-01-07', '1396-10-17', '1439-04-19', '2018-01-07', 17, 19, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2018-01-08', '1396-10-18', '1439-04-20', '2018-01-08', 18, 20, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2018-01-09', '1396-10-19', '1439-04-21', '2018-01-09', 19, 21, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2018-01-10', '1396-10-20', '1439-04-22', '2018-01-10', 20, 22, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2018-01-11', '1396-10-21', '1439-04-23', '2018-01-11', 21, 23, 10, 4, 'thursday ', 5, 0, 'NONE') ,('2018-01-12', '1396-10-22', '1439-04-24', '2018-01-12', 22, 24, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2018-01-13', '1396-10-23', '1439-04-25', '2018-01-13', 23, 25, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2018-01-14', '1396-10-24', '1439-04-26', '2018-01-14', 24, 26, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2018-01-15', '1396-10-25', '1439-04-27', '2018-01-15', 25, 27, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2018-01-16', '1396-10-26', '1439-04-28', '2018-01-16', 26, 28, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2018-01-17', '1396-10-27', '1439-04-29', '2018-01-17', 27, 29, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2018-01-18', '1396-10-28', '1439-05-01', '2018-01-18', 28, 1, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2018-01-19', '1396-10-29', '1439-05-02', '2018-01-19', 29, 2, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2018-01-20', '1396-10-30', '1439-05-03', '2018-01-20', 30, 3, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2018-01-21', '1396-11-01', '1439-05-04', '2018-01-21', 1, 4, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2018-01-22', '1396-11-02', '1439-05-05', '2018-01-22', 2, 5, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2018-01-23', '1396-11-03', '1439-05-06', '2018-01-23', 3, 6, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2018-01-24', '1396-11-04', '1439-05-07', '2018-01-24', 4, 7, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2018-01-25', '1396-11-05', '1439-05-08', '2018-01-25', 5, 8, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2018-01-26', '1396-11-06', '1439-05-09', '2018-01-26', 6, 9, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2018-01-27', '1396-11-07', '1439-05-10', '2018-01-27', 7, 10, 11, 5, 'saturday ', 7, 0, 'NONE') ,('2018-01-28', '1396-11-08', '1439-05-11', '2018-01-28', 8, 11, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2018-01-29', '1396-11-09', '1439-05-12', '2018-01-29', 9, 12, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2018-01-30', '1396-11-10', '1439-05-13', '2018-01-30', 10, 13, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2018-01-31', '1396-11-11', '1439-05-14', '2018-01-31', 11, 14, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2018-02-01', '1396-11-12', '1439-05-15', '2018-02-01', 12, 15, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2018-02-02', '1396-11-13', '1439-05-16', '2018-02-02', 13, 16, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2018-02-03', '1396-11-14', '1439-05-17', '2018-02-03', 14, 17, 11, 5, 'saturday ', 7, 0, 'NONE') ,('2018-02-04', '1396-11-15', '1439-05-18', '2018-02-04', 15, 18, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2018-02-05', '1396-11-16', '1439-05-19', '2018-02-05', 16, 19, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2018-02-06', '1396-11-17', '1439-05-20', '2018-02-06', 17, 20, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2018-02-07', '1396-11-18', '1439-05-21', '2018-02-07', 18, 21, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2018-02-08', '1396-11-19', '1439-05-22', '2018-02-08', 19, 22, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2018-02-09', '1396-11-20', '1439-05-23', '2018-02-09', 20, 23, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2018-02-10', '1396-11-21', '1439-05-24', '2018-02-10', 21, 24, 11, 5, 'saturday ', 7, 0, 'NONE') ,('2018-02-11', '1396-11-22', '1439-05-25', '2018-02-11', 22, 25, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2018-02-12', '1396-11-23', '1439-05-26', '2018-02-12', 23, 26, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2018-02-13', '1396-11-24', '1439-05-27', '2018-02-13', 24, 27, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2018-02-14', '1396-11-25', '1439-05-28', '2018-02-14', 25, 28, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2018-02-15', '1396-11-26', '1439-05-29', '2018-02-15', 26, 29, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2018-02-16', '1396-11-27', '1439-05-30', '2018-02-16', 27, 30, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2018-02-17', '1396-11-28', '1439-06-01', '2018-02-17', 28, 1, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2018-02-18', '1396-11-29', '1439-06-02', '2018-02-18', 29, 2, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2018-02-19', '1396-11-30', '1439-06-03', '2018-02-19', 30, 3, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2018-02-20', '1396-12-01', '1439-06-04', '2018-02-20', 1, 4, 12, 6, 'tuesday  ', 3, 0, 'NONE') ,('2018-02-21', '1396-12-02', '1439-06-05', '2018-02-21', 2, 5, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2018-02-22', '1396-12-03', '1439-06-06', '2018-02-22', 3, 6, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2018-02-23', '1396-12-04', '1439-06-07', '2018-02-23', 4, 7, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2018-02-24', '1396-12-05', '1439-06-08', '2018-02-24', 5, 8, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2018-02-25', '1396-12-06', '1439-06-09', '2018-02-25', 6, 9, 12, 6, 'sunday   ', 1, 0, 'NONE') ,('2018-02-26', '1396-12-07', '1439-06-10', '2018-02-26', 7, 10, 12, 6, 'monday   ', 2, 0, 'NONE') ,('2018-02-27', '1396-12-08', '1439-06-11', '2018-02-27', 8, 11, 12, 6, 'tuesday  ', 3, 0, 'NONE') ,('2018-02-28', '1396-12-09', '1439-06-12', '2018-02-28', 9, 12, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2018-03-01', '1396-12-10', '1439-06-13', '2018-03-01', 10, 13, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2018-03-02', '1396-12-11', '1439-06-14', '2018-03-02', 11, 14, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2018-03-03', '1396-12-12', '1439-06-15', '2018-03-03', 12, 15, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2018-03-04', '1396-12-13', '1439-06-16', '2018-03-04', 13, 16, 12, 6, 'sunday   ', 1, 0, 'NONE') ,('2018-03-05', '1396-12-14', '1439-06-17', '2018-03-05', 14, 17, 12, 6, 'monday   ', 2, 0, 'NONE') ,('2018-03-06', '1396-12-15', '1439-06-18', '2018-03-06', 15, 18, 12, 6, 'tuesday  ', 3, 0, 'NONE') ,('2018-03-07', '1396-12-16', '1439-06-19', '2018-03-07', 16, 19, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2018-03-08', '1396-12-17', '1439-06-20', '2018-03-08', 17, 20, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2018-03-09', '1396-12-18', '1439-06-21', '2018-03-09', 18, 21, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2018-03-10', '1396-12-19', '1439-06-22', '2018-03-10', 19, 22, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2018-03-11', '1396-12-20', '1439-06-23', '2018-03-11', 20, 23, 12, 6, 'sunday   ', 1, 0, 'NONE') ,('2018-03-12', '1396-12-21', '1439-06-24', '2018-03-12', 21, 24, 12, 6, 'monday   ', 2, 0, 'NONE') ,('2018-03-13', '1396-12-22', '1439-06-25', '2018-03-13', 22, 25, 12, 6, 'tuesday  ', 3, 0, 'NONE') ,('2018-03-14', '1396-12-23', '1439-06-26', '2018-03-14', 23, 26, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2018-03-15', '1396-12-24', '1439-06-27', '2018-03-15', 24, 27, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2018-03-16', '1396-12-25', '1439-06-28', '2018-03-16', 25, 28, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2018-03-17', '1396-12-26', '1439-06-29', '2018-03-17', 26, 29, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2018-03-18', '1396-12-27', '1439-07-01', '2018-03-18', 27, 1, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2018-03-19', '1396-12-28', '1439-07-02', '2018-03-19', 28, 2, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2018-03-20', '1396-12-29', '1439-07-03', '2018-03-20', 29, 3, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2018-03-21', '1397-01-01', '1439-07-04', '2018-03-21', 1, 4, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2018-03-22', '1397-01-02', '1439-07-05', '2018-03-22', 2, 5, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2018-03-23', '1397-01-03', '1439-07-06', '2018-03-23', 3, 6, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2018-03-24', '1397-01-04', '1439-07-07', '2018-03-24', 4, 7, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2018-03-25', '1397-01-05', '1439-07-08', '2018-03-25', 5, 8, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2018-03-26', '1397-01-06', '1439-07-09', '2018-03-26', 6, 9, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2018-03-27', '1397-01-07', '1439-07-10', '2018-03-27', 7, 10, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2018-03-28', '1397-01-08', '1439-07-11', '2018-03-28', 8, 11, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2018-03-29', '1397-01-09', '1439-07-12', '2018-03-29', 9, 12, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2018-03-30', '1397-01-10', '1439-07-13', '2018-03-30', 10, 13, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2018-03-31', '1397-01-11', '1439-07-14', '2018-03-31', 11, 14, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2018-04-01', '1397-01-12', '1439-07-15', '2018-04-01', 12, 15, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2018-04-02', '1397-01-13', '1439-07-16', '2018-04-02', 13, 16, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2018-04-03', '1397-01-14', '1439-07-17', '2018-04-03', 14, 17, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2018-04-04', '1397-01-15', '1439-07-18', '2018-04-04', 15, 18, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2018-04-05', '1397-01-16', '1439-07-19', '2018-04-05', 16, 19, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2018-04-06', '1397-01-17', '1439-07-20', '2018-04-06', 17, 20, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2018-04-07', '1397-01-18', '1439-07-21', '2018-04-07', 18, 21, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2018-04-08', '1397-01-19', '1439-07-22', '2018-04-08', 19, 22, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2018-04-09', '1397-01-20', '1439-07-23', '2018-04-09', 20, 23, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2018-04-10', '1397-01-21', '1439-07-24', '2018-04-10', 21, 24, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2018-04-11', '1397-01-22', '1439-07-25', '2018-04-11', 22, 25, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2018-04-12', '1397-01-23', '1439-07-26', '2018-04-12', 23, 26, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2018-04-13', '1397-01-24', '1439-07-27', '2018-04-13', 24, 27, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2018-04-14', '1397-01-25', '1439-07-28', '2018-04-14', 25, 28, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2018-04-15', '1397-01-26', '1439-07-29', '2018-04-15', 26, 29, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2018-04-16', '1397-01-27', '1439-07-30', '2018-04-16', 27, 30, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2018-04-17', '1397-01-28', '1439-08-01', '2018-04-17', 28, 1, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2018-04-18', '1397-01-29', '1439-08-02', '2018-04-18', 29, 2, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2018-04-19', '1397-01-30', '1439-08-03', '2018-04-19', 30, 3, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2018-04-20', '1397-01-31', '1439-08-04', '2018-04-20', 31, 4, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2018-04-21', '1397-02-01', '1439-08-05', '2018-04-21', 1, 5, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2018-04-22', '1397-02-02', '1439-08-06', '2018-04-22', 2, 6, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2018-04-23', '1397-02-03', '1439-08-07', '2018-04-23', 3, 7, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2018-04-24', '1397-02-04', '1439-08-08', '2018-04-24', 4, 8, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2018-04-25', '1397-02-05', '1439-08-09', '2018-04-25', 5, 9, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2018-04-26', '1397-02-06', '1439-08-10', '2018-04-26', 6, 10, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2018-04-27', '1397-02-07', '1439-08-11', '2018-04-27', 7, 11, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2018-04-28', '1397-02-08', '1439-08-12', '2018-04-28', 8, 12, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2018-04-29', '1397-02-09', '1439-08-13', '2018-04-29', 9, 13, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2018-04-30', '1397-02-10', '1439-08-14', '2018-04-30', 10, 14, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2018-05-01', '1397-02-11', '1439-08-15', '2018-05-01', 11, 15, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2018-05-02', '1397-02-12', '1439-08-16', '2018-05-02', 12, 16, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2018-05-03', '1397-02-13', '1439-08-17', '2018-05-03', 13, 17, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2018-05-04', '1397-02-14', '1439-08-18', '2018-05-04', 14, 18, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2018-05-05', '1397-02-15', '1439-08-19', '2018-05-05', 15, 19, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2018-05-06', '1397-02-16', '1439-08-20', '2018-05-06', 16, 20, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2018-05-07', '1397-02-17', '1439-08-21', '2018-05-07', 17, 21, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2018-05-08', '1397-02-18', '1439-08-22', '2018-05-08', 18, 22, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2018-05-09', '1397-02-19', '1439-08-23', '2018-05-09', 19, 23, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2018-05-10', '1397-02-20', '1439-08-24', '2018-05-10', 20, 24, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2018-05-11', '1397-02-21', '1439-08-25', '2018-05-11', 21, 25, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2018-05-12', '1397-02-22', '1439-08-26', '2018-05-12', 22, 26, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2018-05-13', '1397-02-23', '1439-08-27', '2018-05-13', 23, 27, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2018-05-14', '1397-02-24', '1439-08-28', '2018-05-14', 24, 28, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2018-05-15', '1397-02-25', '1439-08-29', '2018-05-15', 25, 29, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2018-05-16', '1397-02-26', '1439-09-01', '2018-05-16', 26, 1, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2018-05-17', '1397-02-27', '1439-09-02', '2018-05-17', 27, 2, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2018-05-18', '1397-02-28', '1439-09-03', '2018-05-18', 28, 3, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2018-05-19', '1397-02-29', '1439-09-04', '2018-05-19', 29, 4, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2018-05-20', '1397-02-30', '1439-09-05', '2018-05-20', 30, 5, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2018-05-21', '1397-02-31', '1439-09-06', '2018-05-21', 31, 6, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2018-05-22', '1397-03-01', '1439-09-07', '2018-05-22', 1, 7, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2018-05-23', '1397-03-02', '1439-09-08', '2018-05-23', 2, 8, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2018-05-24', '1397-03-03', '1439-09-09', '2018-05-24', 3, 9, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2018-05-25', '1397-03-04', '1439-09-10', '2018-05-25', 4, 10, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2018-05-26', '1397-03-05', '1439-09-11', '2018-05-26', 5, 11, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2018-05-27', '1397-03-06', '1439-09-12', '2018-05-27', 6, 12, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2018-05-28', '1397-03-07', '1439-09-13', '2018-05-28', 7, 13, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2018-05-29', '1397-03-08', '1439-09-14', '2018-05-29', 8, 14, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2018-05-30', '1397-03-09', '1439-09-15', '2018-05-30', 9, 15, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2018-05-31', '1397-03-10', '1439-09-16', '2018-05-31', 10, 16, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2018-06-01', '1397-03-11', '1439-09-17', '2018-06-01', 11, 17, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2018-06-02', '1397-03-12', '1439-09-18', '2018-06-02', 12, 18, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2018-06-03', '1397-03-13', '1439-09-19', '2018-06-03', 13, 19, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2018-06-04', '1397-03-14', '1439-09-20', '2018-06-04', 14, 20, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2018-06-05', '1397-03-15', '1439-09-21', '2018-06-05', 15, 21, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2018-06-06', '1397-03-16', '1439-09-22', '2018-06-06', 16, 22, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2018-06-07', '1397-03-17', '1439-09-23', '2018-06-07', 17, 23, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2018-06-08', '1397-03-18', '1439-09-24', '2018-06-08', 18, 24, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2018-06-09', '1397-03-19', '1439-09-25', '2018-06-09', 19, 25, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2018-06-10', '1397-03-20', '1439-09-26', '2018-06-10', 20, 26, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2018-06-11', '1397-03-21', '1439-09-27', '2018-06-11', 21, 27, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2018-06-12', '1397-03-22', '1439-09-28', '2018-06-12', 22, 28, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2018-06-13', '1397-03-23', '1439-09-29', '2018-06-13', 23, 29, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2018-06-14', '1397-03-24', '1439-09-30', '2018-06-14', 24, 30, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2018-06-15', '1397-03-25', '1439-10-01', '2018-06-15', 25, 1, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2018-06-16', '1397-03-26', '1439-10-02', '2018-06-16', 26, 2, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2018-06-17', '1397-03-27', '1439-10-03', '2018-06-17', 27, 3, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2018-06-18', '1397-03-28', '1439-10-04', '2018-06-18', 28, 4, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2018-06-19', '1397-03-29', '1439-10-05', '2018-06-19', 29, 5, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2018-06-20', '1397-03-30', '1439-10-06', '2018-06-20', 30, 6, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2018-06-21', '1397-03-31', '1439-10-07', '2018-06-21', 31, 7, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2018-06-22', '1397-04-01', '1439-10-08', '2018-06-22', 1, 8, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2018-06-23', '1397-04-02', '1439-10-09', '2018-06-23', 2, 9, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2018-06-24', '1397-04-03', '1439-10-10', '2018-06-24', 3, 10, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2018-06-25', '1397-04-04', '1439-10-11', '2018-06-25', 4, 11, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2018-06-26', '1397-04-05', '1439-10-12', '2018-06-26', 5, 12, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2018-06-27', '1397-04-06', '1439-10-13', '2018-06-27', 6, 13, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2018-06-28', '1397-04-07', '1439-10-14', '2018-06-28', 7, 14, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2018-06-29', '1397-04-08', '1439-10-15', '2018-06-29', 8, 15, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2018-06-30', '1397-04-09', '1439-10-16', '2018-06-30', 9, 16, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2018-07-01', '1397-04-10', '1439-10-17', '2018-07-01', 10, 17, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2018-07-02', '1397-04-11', '1439-10-18', '2018-07-02', 11, 18, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2018-07-03', '1397-04-12', '1439-10-19', '2018-07-03', 12, 19, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2018-07-04', '1397-04-13', '1439-10-20', '2018-07-04', 13, 20, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2018-07-05', '1397-04-14', '1439-10-21', '2018-07-05', 14, 21, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2018-07-06', '1397-04-15', '1439-10-22', '2018-07-06', 15, 22, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2018-07-07', '1397-04-16', '1439-10-23', '2018-07-07', 16, 23, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2018-07-08', '1397-04-17', '1439-10-24', '2018-07-08', 17, 24, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2018-07-09', '1397-04-18', '1439-10-25', '2018-07-09', 18, 25, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2018-07-10', '1397-04-19', '1439-10-26', '2018-07-10', 19, 26, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2018-07-11', '1397-04-20', '1439-10-27', '2018-07-11', 20, 27, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2018-07-12', '1397-04-21', '1439-10-28', '2018-07-12', 21, 28, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2018-07-13', '1397-04-22', '1439-10-29', '2018-07-13', 22, 29, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2018-07-14', '1397-04-23', '1439-11-01', '2018-07-14', 23, 1, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2018-07-15', '1397-04-24', '1439-11-02', '2018-07-15', 24, 2, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2018-07-16', '1397-04-25', '1439-11-03', '2018-07-16', 25, 3, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2018-07-17', '1397-04-26', '1439-11-04', '2018-07-17', 26, 4, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2018-07-18', '1397-04-27', '1439-11-05', '2018-07-18', 27, 5, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2018-07-19', '1397-04-28', '1439-11-06', '2018-07-19', 28, 6, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2018-07-20', '1397-04-29', '1439-11-07', '2018-07-20', 29, 7, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2018-07-21', '1397-04-30', '1439-11-08', '2018-07-21', 30, 8, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2018-07-22', '1397-04-31', '1439-11-09', '2018-07-22', 31, 9, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2018-07-23', '1397-05-01', '1439-11-10', '2018-07-23', 1, 10, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2018-07-24', '1397-05-02', '1439-11-11', '2018-07-24', 2, 11, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2018-07-25', '1397-05-03', '1439-11-12', '2018-07-25', 3, 12, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2018-07-26', '1397-05-04', '1439-11-13', '2018-07-26', 4, 13, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2018-07-27', '1397-05-05', '1439-11-14', '2018-07-27', 5, 14, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2018-07-28', '1397-05-06', '1439-11-15', '2018-07-28', 6, 15, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2018-07-29', '1397-05-07', '1439-11-16', '2018-07-29', 7, 16, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2018-07-30', '1397-05-08', '1439-11-17', '2018-07-30', 8, 17, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2018-07-31', '1397-05-09', '1439-11-18', '2018-07-31', 9, 18, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2018-08-01', '1397-05-10', '1439-11-19', '2018-08-01', 10, 19, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2018-08-02', '1397-05-11', '1439-11-20', '2018-08-02', 11, 20, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2018-08-03', '1397-05-12', '1439-11-21', '2018-08-03', 12, 21, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2018-08-04', '1397-05-13', '1439-11-22', '2018-08-04', 13, 22, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2018-08-05', '1397-05-14', '1439-11-23', '2018-08-05', 14, 23, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2018-08-06', '1397-05-15', '1439-11-24', '2018-08-06', 15, 24, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2018-08-07', '1397-05-16', '1439-11-25', '2018-08-07', 16, 25, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2018-08-08', '1397-05-17', '1439-11-26', '2018-08-08', 17, 26, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2018-08-09', '1397-05-18', '1439-11-27', '2018-08-09', 18, 27, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2018-08-10', '1397-05-19', '1439-11-28', '2018-08-10', 19, 28, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2018-08-11', '1397-05-20', '1439-11-29', '2018-08-11', 20, 29, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2018-08-12', '1397-05-21', '1439-11-30', '2018-08-12', 21, 30, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2018-08-13', '1397-05-22', '1439-12-01', '2018-08-13', 22, 1, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2018-08-14', '1397-05-23', '1439-12-02', '2018-08-14', 23, 2, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2018-08-15', '1397-05-24', '1439-12-03', '2018-08-15', 24, 3, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2018-08-16', '1397-05-25', '1439-12-04', '2018-08-16', 25, 4, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2018-08-17', '1397-05-26', '1439-12-05', '2018-08-17', 26, 5, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2018-08-18', '1397-05-27', '1439-12-06', '2018-08-18', 27, 6, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2018-08-19', '1397-05-28', '1439-12-07', '2018-08-19', 28, 7, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2018-08-20', '1397-05-29', '1439-12-08', '2018-08-20', 29, 8, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2018-08-21', '1397-05-30', '1439-12-09', '2018-08-21', 30, 9, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2018-08-22', '1397-05-31', '1439-12-10', '2018-08-22', 31, 10, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2018-08-23', '1397-06-01', '1439-12-11', '2018-08-23', 1, 11, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2018-08-24', '1397-06-02', '1439-12-12', '2018-08-24', 2, 12, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2018-08-25', '1397-06-03', '1439-12-13', '2018-08-25', 3, 13, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2018-08-26', '1397-06-04', '1439-12-14', '2018-08-26', 4, 14, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2018-08-27', '1397-06-05', '1439-12-15', '2018-08-27', 5, 15, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2018-08-28', '1397-06-06', '1439-12-16', '2018-08-28', 6, 16, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2018-08-29', '1397-06-07', '1439-12-17', '2018-08-29', 7, 17, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2018-08-30', '1397-06-08', '1439-12-18', '2018-08-30', 8, 18, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2018-08-31', '1397-06-09', '1439-12-19', '2018-08-31', 9, 19, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2018-09-01', '1397-06-10', '1439-12-20', '2018-09-01', 10, 20, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2018-09-02', '1397-06-11', '1439-12-21', '2018-09-02', 11, 21, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2018-09-03', '1397-06-12', '1439-12-22', '2018-09-03', 12, 22, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2018-09-04', '1397-06-13', '1439-12-23', '2018-09-04', 13, 23, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2018-09-05', '1397-06-14', '1439-12-24', '2018-09-05', 14, 24, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2018-09-06', '1397-06-15', '1439-12-25', '2018-09-06', 15, 25, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2018-09-07', '1397-06-16', '1439-12-26', '2018-09-07', 16, 26, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2018-09-08', '1397-06-17', '1439-12-27', '2018-09-08', 17, 27, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2018-09-09', '1397-06-18', '1439-12-28', '2018-09-09', 18, 28, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2018-09-10', '1397-06-19', '1439-12-29', '2018-09-10', 19, 29, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2018-09-11', '1397-06-20', '1439-12-30', '2018-09-11', 20, 30, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2018-09-12', '1397-06-21', '1440-01-01', '2018-09-12', 21, 1, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2018-09-13', '1397-06-22', '1440-01-02', '2018-09-13', 22, 2, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2018-09-14', '1397-06-23', '1440-01-03', '2018-09-14', 23, 3, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2018-09-15', '1397-06-24', '1440-01-04', '2018-09-15', 24, 4, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2018-09-16', '1397-06-25', '1440-01-05', '2018-09-16', 25, 5, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2018-09-17', '1397-06-26', '1440-01-06', '2018-09-17', 26, 6, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2018-09-18', '1397-06-27', '1440-01-07', '2018-09-18', 27, 7, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2018-09-19', '1397-06-28', '1440-01-08', '2018-09-19', 28, 8, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2018-09-20', '1397-06-29', '1440-01-09', '2018-09-20', 29, 9, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2018-09-21', '1397-06-30', '1440-01-10', '2018-09-21', 30, 10, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2018-09-22', '1397-06-31', '1440-01-11', '2018-09-22', 31, 11, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2018-09-23', '1397-07-01', '1440-01-12', '2018-09-23', 1, 12, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2018-09-24', '1397-07-02', '1440-01-13', '2018-09-24', 2, 13, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2018-09-25', '1397-07-03', '1440-01-14', '2018-09-25', 3, 14, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2018-09-26', '1397-07-04', '1440-01-15', '2018-09-26', 4, 15, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2018-09-27', '1397-07-05', '1440-01-16', '2018-09-27', 5, 16, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2018-09-28', '1397-07-06', '1440-01-17', '2018-09-28', 6, 17, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2018-09-29', '1397-07-07', '1440-01-18', '2018-09-29', 7, 18, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2018-09-30', '1397-07-08', '1440-01-19', '2018-09-30', 8, 19, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2018-10-01', '1397-07-09', '1440-01-20', '2018-10-01', 9, 20, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2018-10-02', '1397-07-10', '1440-01-21', '2018-10-02', 10, 21, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2018-10-03', '1397-07-11', '1440-01-22', '2018-10-03', 11, 22, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2018-10-04', '1397-07-12', '1440-01-23', '2018-10-04', 12, 23, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2018-10-05', '1397-07-13', '1440-01-24', '2018-10-05', 13, 24, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2018-10-06', '1397-07-14', '1440-01-25', '2018-10-06', 14, 25, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2018-10-07', '1397-07-15', '1440-01-26', '2018-10-07', 15, 26, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2018-10-08', '1397-07-16', '1440-01-27', '2018-10-08', 16, 27, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2018-10-09', '1397-07-17', '1440-01-28', '2018-10-09', 17, 28, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2018-10-10', '1397-07-18', '1440-01-29', '2018-10-10', 18, 29, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2018-10-11', '1397-07-19', '1440-01-30', '2018-10-11', 19, 30, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2018-10-12', '1397-07-20', '1440-02-01', '2018-10-12', 20, 1, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2018-10-13', '1397-07-21', '1440-02-02', '2018-10-13', 21, 2, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2018-10-14', '1397-07-22', '1440-02-03', '2018-10-14', 22, 3, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2018-10-15', '1397-07-23', '1440-02-04', '2018-10-15', 23, 4, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2018-10-16', '1397-07-24', '1440-02-05', '2018-10-16', 24, 5, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2018-10-17', '1397-07-25', '1440-02-06', '2018-10-17', 25, 6, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2018-10-18', '1397-07-26', '1440-02-07', '2018-10-18', 26, 7, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2018-10-19', '1397-07-27', '1440-02-08', '2018-10-19', 27, 8, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2018-10-20', '1397-07-28', '1440-02-09', '2018-10-20', 28, 9, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2018-10-21', '1397-07-29', '1440-02-10', '2018-10-21', 29, 10, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2018-10-22', '1397-07-30', '1440-02-11', '2018-10-22', 30, 11, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2018-10-23', '1397-08-01', '1440-02-12', '2018-10-23', 1, 12, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2018-10-24', '1397-08-02', '1440-02-13', '2018-10-24', 2, 13, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2018-10-25', '1397-08-03', '1440-02-14', '2018-10-25', 3, 14, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2018-10-26', '1397-08-04', '1440-02-15', '2018-10-26', 4, 15, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2018-10-27', '1397-08-05', '1440-02-16', '2018-10-27', 5, 16, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2018-10-28', '1397-08-06', '1440-02-17', '2018-10-28', 6, 17, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2018-10-29', '1397-08-07', '1440-02-18', '2018-10-29', 7, 18, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2018-10-30', '1397-08-08', '1440-02-19', '2018-10-30', 8, 19, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2018-10-31', '1397-08-09', '1440-02-20', '2018-10-31', 9, 20, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2018-11-01', '1397-08-10', '1440-02-21', '2018-11-01', 10, 21, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2018-11-02', '1397-08-11', '1440-02-22', '2018-11-02', 11, 22, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2018-11-03', '1397-08-12', '1440-02-23', '2018-11-03', 12, 23, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2018-11-04', '1397-08-13', '1440-02-24', '2018-11-04', 13, 24, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2018-11-05', '1397-08-14', '1440-02-25', '2018-11-05', 14, 25, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2018-11-06', '1397-08-15', '1440-02-26', '2018-11-06', 15, 26, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2018-11-07', '1397-08-16', '1440-02-27', '2018-11-07', 16, 27, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2018-11-08', '1397-08-17', '1440-02-28', '2018-11-08', 17, 28, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2018-11-09', '1397-08-18', '1440-02-29', '2018-11-09', 18, 29, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2018-11-10', '1397-08-19', '1440-03-01', '2018-11-10', 19, 1, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2018-11-11', '1397-08-20', '1440-03-02', '2018-11-11', 20, 2, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2018-11-12', '1397-08-21', '1440-03-03', '2018-11-12', 21, 3, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2018-11-13', '1397-08-22', '1440-03-04', '2018-11-13', 22, 4, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2018-11-14', '1397-08-23', '1440-03-05', '2018-11-14', 23, 5, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2018-11-15', '1397-08-24', '1440-03-06', '2018-11-15', 24, 6, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2018-11-16', '1397-08-25', '1440-03-07', '2018-11-16', 25, 7, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2018-11-17', '1397-08-26', '1440-03-08', '2018-11-17', 26, 8, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2018-11-18', '1397-08-27', '1440-03-09', '2018-11-18', 27, 9, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2018-11-19', '1397-08-28', '1440-03-10', '2018-11-19', 28, 10, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2018-11-20', '1397-08-29', '1440-03-11', '2018-11-20', 29, 11, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2018-11-21', '1397-08-30', '1440-03-12', '2018-11-21', 30, 12, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2018-11-22', '1397-09-01', '1440-03-13', '2018-11-22', 1, 13, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2018-11-23', '1397-09-02', '1440-03-14', '2018-11-23', 2, 14, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2018-11-24', '1397-09-03', '1440-03-15', '2018-11-24', 3, 15, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2018-11-25', '1397-09-04', '1440-03-16', '2018-11-25', 4, 16, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2018-11-26', '1397-09-05', '1440-03-17', '2018-11-26', 5, 17, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2018-11-27', '1397-09-06', '1440-03-18', '2018-11-27', 6, 18, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2018-11-28', '1397-09-07', '1440-03-19', '2018-11-28', 7, 19, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2018-11-29', '1397-09-08', '1440-03-20', '2018-11-29', 8, 20, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2018-11-30', '1397-09-09', '1440-03-21', '2018-11-30', 9, 21, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2018-12-01', '1397-09-10', '1440-03-22', '2018-12-01', 10, 22, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2018-12-02', '1397-09-11', '1440-03-23', '2018-12-02', 11, 23, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2018-12-03', '1397-09-12', '1440-03-24', '2018-12-03', 12, 24, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2018-12-04', '1397-09-13', '1440-03-25', '2018-12-04', 13, 25, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2018-12-05', '1397-09-14', '1440-03-26', '2018-12-05', 14, 26, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2018-12-06', '1397-09-15', '1440-03-27', '2018-12-06', 15, 27, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2018-12-07', '1397-09-16', '1440-03-28', '2018-12-07', 16, 28, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2018-12-08', '1397-09-17', '1440-03-29', '2018-12-08', 17, 29, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2018-12-09', '1397-09-18', '1440-03-30', '2018-12-09', 18, 30, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2018-12-10', '1397-09-19', '1440-04-01', '2018-12-10', 19, 1, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2018-12-11', '1397-09-20', '1440-04-02', '2018-12-11', 20, 2, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2018-12-12', '1397-09-21', '1440-04-03', '2018-12-12', 21, 3, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2018-12-13', '1397-09-22', '1440-04-04', '2018-12-13', 22, 4, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2018-12-14', '1397-09-23', '1440-04-05', '2018-12-14', 23, 5, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2018-12-15', '1397-09-24', '1440-04-06', '2018-12-15', 24, 6, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2018-12-16', '1397-09-25', '1440-04-07', '2018-12-16', 25, 7, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2018-12-17', '1397-09-26', '1440-04-08', '2018-12-17', 26, 8, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2018-12-18', '1397-09-27', '1440-04-09', '2018-12-18', 27, 9, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2018-12-19', '1397-09-28', '1440-04-10', '2018-12-19', 28, 10, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2018-12-20', '1397-09-29', '1440-04-11', '2018-12-20', 29, 11, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2018-12-21', '1397-09-30', '1440-04-12', '2018-12-21', 30, 12, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2018-12-22', '1397-10-01', '1440-04-13', '2018-12-22', 1, 13, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2018-12-23', '1397-10-02', '1440-04-14', '2018-12-23', 2, 14, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2018-12-24', '1397-10-03', '1440-04-15', '2018-12-24', 3, 15, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2018-12-25', '1397-10-04', '1440-04-16', '2018-12-25', 4, 16, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2018-12-26', '1397-10-05', '1440-04-17', '2018-12-26', 5, 17, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2018-12-27', '1397-10-06', '1440-04-18', '2018-12-27', 6, 18, 10, 4, 'thursday ', 5, 0, 'NONE') ,('2018-12-28', '1397-10-07', '1440-04-19', '2018-12-28', 7, 19, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2018-12-29', '1397-10-08', '1440-04-20', '2018-12-29', 8, 20, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2018-12-30', '1397-10-09', '1440-04-21', '2018-12-30', 9, 21, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2018-12-31', '1397-10-10', '1440-04-22', '2018-12-31', 10, 22, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2019-01-01', '1397-10-11', '1440-04-23', '2019-01-01', 11, 23, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2019-01-02', '1397-10-12', '1440-04-24', '2019-01-02', 12, 24, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2019-01-03', '1397-10-13', '1440-04-25', '2019-01-03', 13, 25, 10, 4, 'thursday ', 5, 0, 'NONE') ,('2019-01-04', '1397-10-14', '1440-04-26', '2019-01-04', 14, 26, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2019-01-05', '1397-10-15', '1440-04-27', '2019-01-05', 15, 27, 10, 4, 'saturday ', 7, 0, 'NONE') ,('2019-01-06', '1397-10-16', '1440-04-28', '2019-01-06', 16, 28, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2019-01-07', '1397-10-17', '1440-04-29', '2019-01-07', 17, 29, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2019-01-08', '1397-10-18', '1440-05-01', '2019-01-08', 18, 1, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2019-01-09', '1397-10-19', '1440-05-02', '2019-01-09', 19, 2, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2019-01-10', '1397-10-20', '1440-05-03', '2019-01-10', 20, 3, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2019-01-11', '1397-10-21', '1440-05-04', '2019-01-11', 21, 4, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2019-01-12', '1397-10-22', '1440-05-05', '2019-01-12', 22, 5, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2019-01-13', '1397-10-23', '1440-05-06', '2019-01-13', 23, 6, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2019-01-14', '1397-10-24', '1440-05-07', '2019-01-14', 24, 7, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2019-01-15', '1397-10-25', '1440-05-08', '2019-01-15', 25, 8, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2019-01-16', '1397-10-26', '1440-05-09', '2019-01-16', 26, 9, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2019-01-17', '1397-10-27', '1440-05-10', '2019-01-17', 27, 10, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2019-01-18', '1397-10-28', '1440-05-11', '2019-01-18', 28, 11, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2019-01-19', '1397-10-29', '1440-05-12', '2019-01-19', 29, 12, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2019-01-20', '1397-10-30', '1440-05-13', '2019-01-20', 30, 13, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2019-01-21', '1397-11-01', '1440-05-14', '2019-01-21', 1, 14, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2019-01-22', '1397-11-02', '1440-05-15', '2019-01-22', 2, 15, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2019-01-23', '1397-11-03', '1440-05-16', '2019-01-23', 3, 16, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2019-01-24', '1397-11-04', '1440-05-17', '2019-01-24', 4, 17, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2019-01-25', '1397-11-05', '1440-05-18', '2019-01-25', 5, 18, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2019-01-26', '1397-11-06', '1440-05-19', '2019-01-26', 6, 19, 11, 5, 'saturday ', 7, 0, 'NONE') ,('2019-01-27', '1397-11-07', '1440-05-20', '2019-01-27', 7, 20, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2019-01-28', '1397-11-08', '1440-05-21', '2019-01-28', 8, 21, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2019-01-29', '1397-11-09', '1440-05-22', '2019-01-29', 9, 22, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2019-01-30', '1397-11-10', '1440-05-23', '2019-01-30', 10, 23, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2019-01-31', '1397-11-11', '1440-05-24', '2019-01-31', 11, 24, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2019-02-01', '1397-11-12', '1440-05-25', '2019-02-01', 12, 25, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2019-02-02', '1397-11-13', '1440-05-26', '2019-02-02', 13, 26, 11, 5, 'saturday ', 7, 0, 'NONE') ,('2019-02-03', '1397-11-14', '1440-05-27', '2019-02-03', 14, 27, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2019-02-04', '1397-11-15', '1440-05-28', '2019-02-04', 15, 28, 11, 5, 'monday   ', 2, 0, 'NONE') ,('2019-02-05', '1397-11-16', '1440-05-29', '2019-02-05', 16, 29, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2019-02-06', '1397-11-17', '1440-05-30', '2019-02-06', 17, 30, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2019-02-07', '1397-11-18', '1440-06-01', '2019-02-07', 18, 1, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2019-02-08', '1397-11-19', '1440-06-02', '2019-02-08', 19, 2, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2019-02-09', '1397-11-20', '1440-06-03', '2019-02-09', 20, 3, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2019-02-10', '1397-11-21', '1440-06-04', '2019-02-10', 21, 4, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2019-02-11', '1397-11-22', '1440-06-05', '2019-02-11', 22, 5, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2019-02-12', '1397-11-23', '1440-06-06', '2019-02-12', 23, 6, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2019-02-13', '1397-11-24', '1440-06-07', '2019-02-13', 24, 7, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2019-02-14', '1397-11-25', '1440-06-08', '2019-02-14', 25, 8, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2019-02-15', '1397-11-26', '1440-06-09', '2019-02-15', 26, 9, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2019-02-16', '1397-11-27', '1440-06-10', '2019-02-16', 27, 10, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2019-02-17', '1397-11-28', '1440-06-11', '2019-02-17', 28, 11, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2019-02-18', '1397-11-29', '1440-06-12', '2019-02-18', 29, 12, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2019-02-19', '1397-11-30', '1440-06-13', '2019-02-19', 30, 13, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2019-02-20', '1397-12-01', '1440-06-14', '2019-02-20', 1, 14, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2019-02-21', '1397-12-02', '1440-06-15', '2019-02-21', 2, 15, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2019-02-22', '1397-12-03', '1440-06-16', '2019-02-22', 3, 16, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2019-02-23', '1397-12-04', '1440-06-17', '2019-02-23', 4, 17, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2019-02-24', '1397-12-05', '1440-06-18', '2019-02-24', 5, 18, 12, 6, 'sunday   ', 1, 0, 'NONE') ,('2019-02-25', '1397-12-06', '1440-06-19', '2019-02-25', 6, 19, 12, 6, 'monday   ', 2, 0, 'NONE') ,('2019-02-26', '1397-12-07', '1440-06-20', '2019-02-26', 7, 20, 12, 6, 'tuesday  ', 3, 0, 'NONE') ,('2019-02-27', '1397-12-08', '1440-06-21', '2019-02-27', 8, 21, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2019-02-28', '1397-12-09', '1440-06-22', '2019-02-28', 9, 22, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2019-03-01', '1397-12-10', '1440-06-23', '2019-03-01', 10, 23, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2019-03-02', '1397-12-11', '1440-06-24', '2019-03-02', 11, 24, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2019-03-03', '1397-12-12', '1440-06-25', '2019-03-03', 12, 25, 12, 6, 'sunday   ', 1, 0, 'NONE') ,('2019-03-04', '1397-12-13', '1440-06-26', '2019-03-04', 13, 26, 12, 6, 'monday   ', 2, 0, 'NONE') ,('2019-03-05', '1397-12-14', '1440-06-27', '2019-03-05', 14, 27, 12, 6, 'tuesday  ', 3, 0, 'NONE') ,('2019-03-06', '1397-12-15', '1440-06-28', '2019-03-06', 15, 28, 12, 6, 'wednesday', 4, 0, 'NONE') ,('2019-03-07', '1397-12-16', '1440-06-29', '2019-03-07', 16, 29, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2019-03-08', '1397-12-17', '1440-07-01', '2019-03-08', 17, 1, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2019-03-09', '1397-12-18', '1440-07-02', '2019-03-09', 18, 2, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2019-03-10', '1397-12-19', '1440-07-03', '2019-03-10', 19, 3, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2019-03-11', '1397-12-20', '1440-07-04', '2019-03-11', 20, 4, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2019-03-12', '1397-12-21', '1440-07-05', '2019-03-12', 21, 5, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2019-03-13', '1397-12-22', '1440-07-06', '2019-03-13', 22, 6, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2019-03-14', '1397-12-23', '1440-07-07', '2019-03-14', 23, 7, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2019-03-15', '1397-12-24', '1440-07-08', '2019-03-15', 24, 8, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2019-03-16', '1397-12-25', '1440-07-09', '2019-03-16', 25, 9, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2019-03-17', '1397-12-26', '1440-07-10', '2019-03-17', 26, 10, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2019-03-18', '1397-12-27', '1440-07-11', '2019-03-18', 27, 11, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2019-03-19', '1397-12-28', '1440-07-12', '2019-03-19', 28, 12, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2019-03-20', '1397-12-29', '1440-07-13', '2019-03-20', 29, 13, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2019-03-21', '1398-01-01', '1440-07-14', '2019-03-21', 1, 14, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2019-03-22', '1398-01-02', '1440-07-15', '2019-03-22', 2, 15, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2019-03-23', '1398-01-03', '1440-07-16', '2019-03-23', 3, 16, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2019-03-24', '1398-01-04', '1440-07-17', '2019-03-24', 4, 17, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2019-03-25', '1398-01-05', '1440-07-18', '2019-03-25', 5, 18, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2019-03-26', '1398-01-06', '1440-07-19', '2019-03-26', 6, 19, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2019-03-27', '1398-01-07', '1440-07-20', '2019-03-27', 7, 20, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2019-03-28', '1398-01-08', '1440-07-21', '2019-03-28', 8, 21, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2019-03-29', '1398-01-09', '1440-07-22', '2019-03-29', 9, 22, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2019-03-30', '1398-01-10', '1440-07-23', '2019-03-30', 10, 23, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2019-03-31', '1398-01-11', '1440-07-24', '2019-03-31', 11, 24, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2019-04-01', '1398-01-12', '1440-07-25', '2019-04-01', 12, 25, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2019-04-02', '1398-01-13', '1440-07-26', '2019-04-02', 13, 26, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2019-04-03', '1398-01-14', '1440-07-27', '2019-04-03', 14, 27, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2019-04-04', '1398-01-15', '1440-07-28', '2019-04-04', 15, 28, 1, 7, 'thursday ', 5, 0, 'NONE') ,('2019-04-05', '1398-01-16', '1440-07-29', '2019-04-05', 16, 29, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2019-04-06', '1398-01-17', '1440-07-30', '2019-04-06', 17, 30, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2019-04-07', '1398-01-18', '1440-08-01', '2019-04-07', 18, 1, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2019-04-08', '1398-01-19', '1440-08-02', '2019-04-08', 19, 2, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2019-04-09', '1398-01-20', '1440-08-03', '2019-04-09', 20, 3, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2019-04-10', '1398-01-21', '1440-08-04', '2019-04-10', 21, 4, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2019-04-11', '1398-01-22', '1440-08-05', '2019-04-11', 22, 5, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2019-04-12', '1398-01-23', '1440-08-06', '2019-04-12', 23, 6, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2019-04-13', '1398-01-24', '1440-08-07', '2019-04-13', 24, 7, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2019-04-14', '1398-01-25', '1440-08-08', '2019-04-14', 25, 8, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2019-04-15', '1398-01-26', '1440-08-09', '2019-04-15', 26, 9, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2019-04-16', '1398-01-27', '1440-08-10', '2019-04-16', 27, 10, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2019-04-17', '1398-01-28', '1440-08-11', '2019-04-17', 28, 11, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2019-04-18', '1398-01-29', '1440-08-12', '2019-04-18', 29, 12, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2019-04-19', '1398-01-30', '1440-08-13', '2019-04-19', 30, 13, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2019-04-20', '1398-01-31', '1440-08-14', '2019-04-20', 31, 14, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2019-04-21', '1398-02-01', '1440-08-15', '2019-04-21', 1, 15, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2019-04-22', '1398-02-02', '1440-08-16', '2019-04-22', 2, 16, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2019-04-23', '1398-02-03', '1440-08-17', '2019-04-23', 3, 17, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2019-04-24', '1398-02-04', '1440-08-18', '2019-04-24', 4, 18, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2019-04-25', '1398-02-05', '1440-08-19', '2019-04-25', 5, 19, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2019-04-26', '1398-02-06', '1440-08-20', '2019-04-26', 6, 20, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2019-04-27', '1398-02-07', '1440-08-21', '2019-04-27', 7, 21, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2019-04-28', '1398-02-08', '1440-08-22', '2019-04-28', 8, 22, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2019-04-29', '1398-02-09', '1440-08-23', '2019-04-29', 9, 23, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2019-04-30', '1398-02-10', '1440-08-24', '2019-04-30', 10, 24, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2019-05-01', '1398-02-11', '1440-08-25', '2019-05-01', 11, 25, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2019-05-02', '1398-02-12', '1440-08-26', '2019-05-02', 12, 26, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2019-05-03', '1398-02-13', '1440-08-27', '2019-05-03', 13, 27, 2, 8, 'friday   ', 6, 0, 'NONE') ,('2019-05-04', '1398-02-14', '1440-08-28', '2019-05-04', 14, 28, 2, 8, 'saturday ', 7, 0, 'NONE') ,('2019-05-05', '1398-02-15', '1440-08-29', '2019-05-05', 15, 29, 2, 8, 'sunday   ', 1, 0, 'NONE') ,('2019-05-06', '1398-02-16', '1440-09-01', '2019-05-06', 16, 1, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2019-05-07', '1398-02-17', '1440-09-02', '2019-05-07', 17, 2, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2019-05-08', '1398-02-18', '1440-09-03', '2019-05-08', 18, 3, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2019-05-09', '1398-02-19', '1440-09-04', '2019-05-09', 19, 4, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2019-05-10', '1398-02-20', '1440-09-05', '2019-05-10', 20, 5, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2019-05-11', '1398-02-21', '1440-09-06', '2019-05-11', 21, 6, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2019-05-12', '1398-02-22', '1440-09-07', '2019-05-12', 22, 7, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2019-05-13', '1398-02-23', '1440-09-08', '2019-05-13', 23, 8, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2019-05-14', '1398-02-24', '1440-09-09', '2019-05-14', 24, 9, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2019-05-15', '1398-02-25', '1440-09-10', '2019-05-15', 25, 10, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2019-05-16', '1398-02-26', '1440-09-11', '2019-05-16', 26, 11, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2019-05-17', '1398-02-27', '1440-09-12', '2019-05-17', 27, 12, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2019-05-18', '1398-02-28', '1440-09-13', '2019-05-18', 28, 13, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2019-05-19', '1398-02-29', '1440-09-14', '2019-05-19', 29, 14, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2019-05-20', '1398-02-30', '1440-09-15', '2019-05-20', 30, 15, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2019-05-21', '1398-02-31', '1440-09-16', '2019-05-21', 31, 16, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2019-05-22', '1398-03-01', '1440-09-17', '2019-05-22', 1, 17, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2019-05-23', '1398-03-02', '1440-09-18', '2019-05-23', 2, 18, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2019-05-24', '1398-03-03', '1440-09-19', '2019-05-24', 3, 19, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2019-05-25', '1398-03-04', '1440-09-20', '2019-05-25', 4, 20, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2019-05-26', '1398-03-05', '1440-09-21', '2019-05-26', 5, 21, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2019-05-27', '1398-03-06', '1440-09-22', '2019-05-27', 6, 22, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2019-05-28', '1398-03-07', '1440-09-23', '2019-05-28', 7, 23, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2019-05-29', '1398-03-08', '1440-09-24', '2019-05-29', 8, 24, 3, 9, 'wednesday', 4, 0, 'NONE') ,('2019-05-30', '1398-03-09', '1440-09-25', '2019-05-30', 9, 25, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2019-05-31', '1398-03-10', '1440-09-26', '2019-05-31', 10, 26, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2019-06-01', '1398-03-11', '1440-09-27', '2019-06-01', 11, 27, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2019-06-02', '1398-03-12', '1440-09-28', '2019-06-02', 12, 28, 3, 9, 'sunday   ', 1, 0, 'NONE') ,('2019-06-03', '1398-03-13', '1440-09-29', '2019-06-03', 13, 29, 3, 9, 'monday   ', 2, 0, 'NONE') ,('2019-06-04', '1398-03-14', '1440-09-30', '2019-06-04', 14, 30, 3, 9, 'tuesday  ', 3, 0, 'NONE') ,('2019-06-05', '1398-03-15', '1440-10-01', '2019-06-05', 15, 1, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2019-06-06', '1398-03-16', '1440-10-02', '2019-06-06', 16, 2, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2019-06-07', '1398-03-17', '1440-10-03', '2019-06-07', 17, 3, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2019-06-08', '1398-03-18', '1440-10-04', '2019-06-08', 18, 4, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2019-06-09', '1398-03-19', '1440-10-05', '2019-06-09', 19, 5, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2019-06-10', '1398-03-20', '1440-10-06', '2019-06-10', 20, 6, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2019-06-11', '1398-03-21', '1440-10-07', '2019-06-11', 21, 7, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2019-06-12', '1398-03-22', '1440-10-08', '2019-06-12', 22, 8, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2019-06-13', '1398-03-23', '1440-10-09', '2019-06-13', 23, 9, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2019-06-14', '1398-03-24', '1440-10-10', '2019-06-14', 24, 10, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2019-06-15', '1398-03-25', '1440-10-11', '2019-06-15', 25, 11, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2019-06-16', '1398-03-26', '1440-10-12', '2019-06-16', 26, 12, 3, 10, 'sundaINSERT INTO DATE_INFO_DICT (TV, SHAMSI, HIJRI, MILADI, S_DAY, H_DAY, S_MONTH, H_MONTH, WEEK_DAY_NAME, DAY_NUMBER, HOLIDAY, WEEK_NAME) VALUESy   ', 1, 0, 'NONE') ,('2019-06-17', '1398-03-27', '1440-10-13', '2019-06-17', 27, 13, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2019-06-18', '1398-03-28', '1440-10-14', '2019-06-18', 28, 14, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2019-06-19', '1398-03-29', '1440-10-15', '2019-06-19', 29, 15, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2019-06-20', '1398-03-30', '1440-10-16', '2019-06-20', 30, 16, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2019-06-21', '1398-03-31', '1440-10-17', '2019-06-21', 31, 17, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2019-06-22', '1398-04-01', '1440-10-18', '2019-06-22', 1, 18, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2019-06-23', '1398-04-02', '1440-10-19', '2019-06-23', 2, 19, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2019-06-24', '1398-04-03', '1440-10-20', '2019-06-24', 3, 20, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2019-06-25', '1398-04-04', '1440-10-21', '2019-06-25', 4, 21, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2019-06-26', '1398-04-05', '1440-10-22', '2019-06-26', 5, 22, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2019-06-27', '1398-04-06', '1440-10-23', '2019-06-27', 6, 23, 4, 10, 'thursday ', 5, 0, 'NONE') ,('2019-06-28', '1398-04-07', '1440-10-24', '2019-06-28', 7, 24, 4, 10, 'friday   ', 6, 0, 'NONE') ,('2019-06-29', '1398-04-08', '1440-10-25', '2019-06-29', 8, 25, 4, 10, 'saturday ', 7, 0, 'NONE') ,('2019-06-30', '1398-04-09', '1440-10-26', '2019-06-30', 9, 26, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2019-07-01', '1398-04-10', '1440-10-27', '2019-07-01', 10, 27, 4, 10, 'monday   ', 2, 0, 'NONE') ,('2019-07-02', '1398-04-11', '1440-10-28', '2019-07-02', 11, 28, 4, 10, 'tuesday  ', 3, 0, 'NONE') ,('2019-07-03', '1398-04-12', '1440-10-29', '2019-07-03', 12, 29, 4, 10, 'wednesday', 4, 0, 'NONE') ,('2019-07-04', '1398-04-13', '1440-11-01', '2019-07-04', 13, 1, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2019-07-05', '1398-04-14', '1440-11-02', '2019-07-05', 14, 2, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2019-07-06', '1398-04-15', '1440-11-03', '2019-07-06', 15, 3, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2019-07-07', '1398-04-16', '1440-11-04', '2019-07-07', 16, 4, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2019-07-08', '1398-04-17', '1440-11-05', '2019-07-08', 17, 5, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2019-07-09', '1398-04-18', '1440-11-06', '2019-07-09', 18, 6, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2019-07-10', '1398-04-19', '1440-11-07', '2019-07-10', 19, 7, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2019-07-11', '1398-04-20', '1440-11-08', '2019-07-11', 20, 8, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2019-07-12', '1398-04-21', '1440-11-09', '2019-07-12', 21, 9, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2019-07-13', '1398-04-22', '1440-11-10', '2019-07-13', 22, 10, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2019-07-14', '1398-04-23', '1440-11-11', '2019-07-14', 23, 11, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2019-07-15', '1398-04-24', '1440-11-12', '2019-07-15', 24, 12, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2019-07-16', '1398-04-25', '1440-11-13', '2019-07-16', 25, 13, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2019-07-17', '1398-04-26', '1440-11-14', '2019-07-17', 26, 14, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2019-07-18', '1398-04-27', '1440-11-15', '2019-07-18', 27, 15, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2019-07-19', '1398-04-28', '1440-11-16', '2019-07-19', 28, 16, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2019-07-20', '1398-04-29', '1440-11-17', '2019-07-20', 29, 17, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2019-07-21', '1398-04-30', '1440-11-18', '2019-07-21', 30, 18, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2019-07-22', '1398-04-31', '1440-11-19', '2019-07-22', 31, 19, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2019-07-23', '1398-05-01', '1440-11-20', '2019-07-23', 1, 20, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2019-07-24', '1398-05-02', '1440-11-21', '2019-07-24', 2, 21, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2019-07-25', '1398-05-03', '1440-11-22', '2019-07-25', 3, 22, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2019-07-26', '1398-05-04', '1440-11-23', '2019-07-26', 4, 23, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2019-07-27', '1398-05-05', '1440-11-24', '2019-07-27', 5, 24, 5, 11, 'saturday ', 7, 0, 'NONE') ,('2019-07-28', '1398-05-06', '1440-11-25', '2019-07-28', 6, 25, 5, 11, 'sunday   ', 1, 0, 'NONE') ,('2019-07-29', '1398-05-07', '1440-11-26', '2019-07-29', 7, 26, 5, 11, 'monday   ', 2, 0, 'NONE') ,('2019-07-30', '1398-05-08', '1440-11-27', '2019-07-30', 8, 27, 5, 11, 'tuesday  ', 3, 0, 'NONE') ,('2019-07-31', '1398-05-09', '1440-11-28', '2019-07-31', 9, 28, 5, 11, 'wednesday', 4, 0, 'NONE') ,('2019-08-01', '1398-05-10', '1440-11-29', '2019-08-01', 10, 29, 5, 11, 'thursday ', 5, 0, 'NONE') ,('2019-08-02', '1398-05-11', '1440-11-30', '2019-08-02', 11, 30, 5, 11, 'friday   ', 6, 0, 'NONE') ,('2019-08-03', '1398-05-12', '1440-12-01', '2019-08-03', 12, 1, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2019-08-04', '1398-05-13', '1440-12-02', '2019-08-04', 13, 2, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2019-08-05', '1398-05-14', '1440-12-03', '2019-08-05', 14, 3, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2019-08-06', '1398-05-15', '1440-12-04', '2019-08-06', 15, 4, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2019-08-07', '1398-05-16', '1440-12-05', '2019-08-07', 16, 5, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2019-08-08', '1398-05-17', '1440-12-06', '2019-08-08', 17, 6, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2019-08-09', '1398-05-18', '1440-12-07', '2019-08-09', 18, 7, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2019-08-10', '1398-05-19', '1440-12-08', '2019-08-10', 19, 8, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2019-08-11', '1398-05-20', '1440-12-09', '2019-08-11', 20, 9, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2019-08-12', '1398-05-21', '1440-12-10', '2019-08-12', 21, 10, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2019-08-13', '1398-05-22', '1440-12-11', '2019-08-13', 22, 11, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2019-08-14', '1398-05-23', '1440-12-12', '2019-08-14', 23, 12, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2019-08-15', '1398-05-24', '1440-12-13', '2019-08-15', 24, 13, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2019-08-16', '1398-05-25', '1440-12-14', '2019-08-16', 25, 14, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2019-08-17', '1398-05-26', '1440-12-15', '2019-08-17', 26, 15, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2019-08-18', '1398-05-27', '1440-12-16', '2019-08-18', 27, 16, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2019-08-19', '1398-05-28', '1440-12-17', '2019-08-19', 28, 17, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2019-08-20', '1398-05-29', '1440-12-18', '2019-08-20', 29, 18, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2019-08-21', '1398-05-30', '1440-12-19', '2019-08-21', 30, 19, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2019-08-22', '1398-05-31', '1440-12-20', '2019-08-22', 31, 20, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2019-08-23', '1398-06-01', '1440-12-21', '2019-08-23', 1, 21, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2019-08-24', '1398-06-02', '1440-12-22', '2019-08-24', 2, 22, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2019-08-25', '1398-06-03', '1440-12-23', '2019-08-25', 3, 23, 6, 12, 'sunday   ', 1, 0, 'NONE') ,('2019-08-26', '1398-06-04', '1440-12-24', '2019-08-26', 4, 24, 6, 12, 'monday   ', 2, 0, 'NONE') ,('2019-08-27', '1398-06-05', '1440-12-25', '2019-08-27', 5, 25, 6, 12, 'tuesday  ', 3, 0, 'NONE') ,('2019-08-28', '1398-06-06', '1440-12-26', '2019-08-28', 6, 26, 6, 12, 'wednesday', 4, 0, 'NONE') ,('2019-08-29', '1398-06-07', '1440-12-27', '2019-08-29', 7, 27, 6, 12, 'thursday ', 5, 0, 'NONE') ,('2019-08-30', '1398-06-08', '1440-12-28', '2019-08-30', 8, 28, 6, 12, 'friday   ', 6, 0, 'NONE') ,('2019-08-31', '1398-06-09', '1440-12-29', '2019-08-31', 9, 29, 6, 12, 'saturday ', 7, 0, 'NONE') ,('2019-09-01', '1398-06-10', '1441-01-01', '2019-09-01', 10, 1, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2019-09-02', '1398-06-11', '1441-01-02', '2019-09-02', 11, 2, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2019-09-03', '1398-06-12', '1441-01-03', '2019-09-03', 12, 3, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2019-09-04', '1398-06-13', '1441-01-04', '2019-09-04', 13, 4, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2019-09-05', '1398-06-14', '1441-01-05', '2019-09-05', 14, 5, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2019-09-06', '1398-06-15', '1441-01-06', '2019-09-06', 15, 6, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2019-09-07', '1398-06-16', '1441-01-07', '2019-09-07', 16, 7, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2019-09-08', '1398-06-17', '1441-01-08', '2019-09-08', 17, 8, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2019-09-09', '1398-06-18', '1441-01-09', '2019-09-09', 18, 9, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2019-09-10', '1398-06-19', '1441-01-10', '2019-09-10', 19, 10, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2019-09-11', '1398-06-20', '1441-01-11', '2019-09-11', 20, 11, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2019-09-12', '1398-06-21', '1441-01-12', '2019-09-12', 21, 12, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2019-09-13', '1398-06-22', '1441-01-13', '2019-09-13', 22, 13, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2019-09-14', '1398-06-23', '1441-01-14', '2019-09-14', 23, 14, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2019-09-15', '1398-06-24', '1441-01-15', '2019-09-15', 24, 15, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2019-09-16', '1398-06-25', '1441-01-16', '2019-09-16', 25, 16, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2019-09-17', '1398-06-26', '1441-01-17', '2019-09-17', 26, 17, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2019-09-18', '1398-06-27', '1441-01-18', '2019-09-18', 27, 18, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2019-09-19', '1398-06-28', '1441-01-19', '2019-09-19', 28, 19, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2019-09-20', '1398-06-29', '1441-01-20', '2019-09-20', 29, 20, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2019-09-21', '1398-06-30', '1441-01-21', '2019-09-21', 30, 21, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2019-09-22', '1398-06-31', '1441-01-22', '2019-09-22', 31, 22, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2019-09-23', '1398-07-01', '1441-01-23', '2019-09-23', 1, 23, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2019-09-24', '1398-07-02', '1441-01-24', '2019-09-24', 2, 24, 7, 1, 'tuesday  ', 3, 0, 'NONE') ,('2019-09-25', '1398-07-03', '1441-01-25', '2019-09-25', 3, 25, 7, 1, 'wednesday', 4, 0, 'NONE') ,('2019-09-26', '1398-07-04', '1441-01-26', '2019-09-26', 4, 26, 7, 1, 'thursday ', 5, 0, 'NONE') ,('2019-09-27', '1398-07-05', '1441-01-27', '2019-09-27', 5, 27, 7, 1, 'friday   ', 6, 0, 'NONE') ,('2019-09-28', '1398-07-06', '1441-01-28', '2019-09-28', 6, 28, 7, 1, 'saturday ', 7, 0, 'NONE') ,('2019-09-29', '1398-07-07', '1441-01-29', '2019-09-29', 7, 29, 7, 1, 'sunday   ', 1, 0, 'NONE') ,('2019-09-30', '1398-07-08', '1441-01-30', '2019-09-30', 8, 30, 7, 1, 'monday   ', 2, 0, 'NONE') ,('2019-10-01', '1398-07-09', '1441-02-01', '2019-10-01', 9, 1, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2019-10-02', '1398-07-10', '1441-02-02', '2019-10-02', 10, 2, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2019-10-03', '1398-07-11', '1441-02-03', '2019-10-03', 11, 3, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2019-10-04', '1398-07-12', '1441-02-04', '2019-10-04', 12, 4, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2019-10-05', '1398-07-13', '1441-02-05', '2019-10-05', 13, 5, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2019-10-06', '1398-07-14', '1441-02-06', '2019-10-06', 14, 6, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2019-10-07', '1398-07-15', '1441-02-07', '2019-10-07', 15, 7, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2019-10-08', '1398-07-16', '1441-02-08', '2019-10-08', 16, 8, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2019-10-09', '1398-07-17', '1441-02-09', '2019-10-09', 17, 9, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2019-10-10', '1398-07-18', '1441-02-10', '2019-10-10', 18, 10, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2019-10-11', '1398-07-19', '1441-02-11', '2019-10-11', 19, 11, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2019-10-12', '1398-07-20', '1441-02-12', '2019-10-12', 20, 12, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2019-10-13', '1398-07-21', '1441-02-13', '2019-10-13', 21, 13, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2019-10-14', '1398-07-22', '1441-02-14', '2019-10-14', 22, 14, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2019-10-15', '1398-07-23', '1441-02-15', '2019-10-15', 23, 15, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2019-10-16', '1398-07-24', '1441-02-16', '2019-10-16', 24, 16, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2019-10-17', '1398-07-25', '1441-02-17', '2019-10-17', 25, 17, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2019-10-18', '1398-07-26', '1441-02-18', '2019-10-18', 26, 18, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2019-10-19', '1398-07-27', '1441-02-19', '2019-10-19', 27, 19, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2019-10-20', '1398-07-28', '1441-02-20', '2019-10-20', 28, 20, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2019-10-21', '1398-07-29', '1441-02-21', '2019-10-21', 29, 21, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2019-10-22', '1398-07-30', '1441-02-22', '2019-10-22', 30, 22, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2019-10-23', '1398-08-01', '1441-02-23', '2019-10-23', 1, 23, 8, 2, 'wednesday', 4, 0, 'NONE') ,('2019-10-24', '1398-08-02', '1441-02-24', '2019-10-24', 2, 24, 8, 2, 'thursday ', 5, 0, 'NONE') ,('2019-10-25', '1398-08-03', '1441-02-25', '2019-10-25', 3, 25, 8, 2, 'friday   ', 6, 0, 'NONE') ,('2019-10-26', '1398-08-04', '1441-02-26', '2019-10-26', 4, 26, 8, 2, 'saturday ', 7, 0, 'NONE') ,('2019-10-27', '1398-08-05', '1441-02-27', '2019-10-27', 5, 27, 8, 2, 'sunday   ', 1, 0, 'NONE') ,('2019-10-28', '1398-08-06', '1441-02-28', '2019-10-28', 6, 28, 8, 2, 'monday   ', 2, 0, 'NONE') ,('2019-10-29', '1398-08-07', '1441-02-29', '2019-10-29', 7, 29, 8, 2, 'tuesday  ', 3, 0, 'NONE') ,('2019-10-30', '1398-08-08', '1441-03-01', '2019-10-30', 8, 1, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2019-10-31', '1398-08-09', '1441-03-02', '2019-10-31', 9, 2, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2019-11-01', '1398-08-10', '1441-03-03', '2019-11-01', 10, 3, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2019-11-02', '1398-08-11', '1441-03-04', '2019-11-02', 11, 4, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2019-11-03', '1398-08-12', '1441-03-05', '2019-11-03', 12, 5, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2019-11-04', '1398-08-13', '1441-03-06', '2019-11-04', 13, 6, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2019-11-05', '1398-08-14', '1441-03-07', '2019-11-05', 14, 7, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2019-11-06', '1398-08-15', '1441-03-08', '2019-11-06', 15, 8, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2019-11-07', '1398-08-16', '1441-03-09', '2019-11-07', 16, 9, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2019-11-08', '1398-08-17', '1441-03-10', '2019-11-08', 17, 10, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2019-11-09', '1398-08-18', '1441-03-11', '2019-11-09', 18, 11, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2019-11-10', '1398-08-19', '1441-03-12', '2019-11-10', 19, 12, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2019-11-11', '1398-08-20', '1441-03-13', '2019-11-11', 20, 13, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2019-11-12', '1398-08-21', '1441-03-14', '2019-11-12', 21, 14, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2019-11-13', '1398-08-22', '1441-03-15', '2019-11-13', 22, 15, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2019-11-14', '1398-08-23', '1441-03-16', '2019-11-14', 23, 16, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2019-11-15', '1398-08-24', '1441-03-17', '2019-11-15', 24, 17, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2019-11-16', '1398-08-25', '1441-03-18', '2019-11-16', 25, 18, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2019-11-17', '1398-08-26', '1441-03-19', '2019-11-17', 26, 19, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2019-11-18', '1398-08-27', '1441-03-20', '2019-11-18', 27, 20, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2019-11-19', '1398-08-28', '1441-03-21', '2019-11-19', 28, 21, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2019-11-20', '1398-08-29', '1441-03-22', '2019-11-20', 29, 22, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2019-11-21', '1398-08-30', '1441-03-23', '2019-11-21', 30, 23, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2019-11-22', '1398-09-01', '1441-03-24', '2019-11-22', 1, 24, 9, 3, 'friday   ', 6, 0, 'NONE') ,('2019-11-23', '1398-09-02', '1441-03-25', '2019-11-23', 2, 25, 9, 3, 'saturday ', 7, 0, 'NONE') ,('2019-11-24', '1398-09-03', '1441-03-26', '2019-11-24', 3, 26, 9, 3, 'sunday   ', 1, 0, 'NONE') ,('2019-11-25', '1398-09-04', '1441-03-27', '2019-11-25', 4, 27, 9, 3, 'monday   ', 2, 0, 'NONE') ,('2019-11-26', '1398-09-05', '1441-03-28', '2019-11-26', 5, 28, 9, 3, 'tuesday  ', 3, 0, 'NONE') ,('2019-11-27', '1398-09-06', '1441-03-29', '2019-11-27', 6, 29, 9, 3, 'wednesday', 4, 0, 'NONE') ,('2019-11-28', '1398-09-07', '1441-03-30', '2019-11-28', 7, 30, 9, 3, 'thursday ', 5, 0, 'NONE') ,('2019-11-29', '1398-09-08', '1441-04-01', '2019-11-29', 8, 1, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2019-11-30', '1398-09-09', '1441-04-02', '2019-11-30', 9, 2, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2019-12-01', '1398-09-10', '1441-04-03', '2019-12-01', 10, 3, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2019-12-02', '1398-09-11', '1441-04-04', '2019-12-02', 11, 4, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2019-12-03', '1398-09-12', '1441-04-05', '2019-12-03', 12, 5, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2019-12-04', '1398-09-13', '1441-04-06', '2019-12-04', 13, 6, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2019-12-05', '1398-09-14', '1441-04-07', '2019-12-05', 14, 7, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2019-12-06', '1398-09-15', '1441-04-08', '2019-12-06', 15, 8, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2019-12-07', '1398-09-16', '1441-04-09', '2019-12-07', 16, 9, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2019-12-08', '1398-09-17', '1441-04-10', '2019-12-08', 17, 10, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2019-12-09', '1398-09-18', '1441-04-11', '2019-12-09', 18, 11, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2019-12-10', '1398-09-19', '1441-04-12', '2019-12-10', 19, 12, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2019-12-11', '1398-09-20', '1441-04-13', '2019-12-11', 20, 13, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2019-12-12', '1398-09-21', '1441-04-14', '2019-12-12', 21, 14, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2019-12-13', '1398-09-22', '1441-04-15', '2019-12-13', 22, 15, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2019-12-14', '1398-09-23', '1441-04-16', '2019-12-14', 23, 16, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2019-12-15', '1398-09-24', '1441-04-17', '2019-12-15', 24, 17, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2019-12-16', '1398-09-25', '1441-04-18', '2019-12-16', 25, 18, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2019-12-17', '1398-09-26', '1441-04-19', '2019-12-17', 26, 19, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2019-12-18', '1398-09-27', '1441-04-20', '2019-12-18', 27, 20, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2019-12-19', '1398-09-28', '1441-04-21', '2019-12-19', 28, 21, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2019-12-20', '1398-09-29', '1441-04-22', '2019-12-20', 29, 22, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2019-12-21', '1398-09-30', '1441-04-23', '2019-12-21', 30, 23, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2019-12-22', '1398-10-01', '1441-04-24', '2019-12-22', 1, 24, 10, 4, 'sunday   ', 1, 0, 'NONE') ,('2019-12-23', '1398-10-02', '1441-04-25', '2019-12-23', 2, 25, 10, 4, 'monday   ', 2, 0, 'NONE') ,('2019-12-24', '1398-10-03', '1441-04-26', '2019-12-24', 3, 26, 10, 4, 'tuesday  ', 3, 0, 'NONE') ,('2019-12-25', '1398-10-04', '1441-04-27', '2019-12-25', 4, 27, 10, 4, 'wednesday', 4, 0, 'NONE') ,('2019-12-26', '1398-10-05', '1441-04-28', '2019-12-26', 5, 28, 10, 4, 'thursday ', 5, 0, 'NONE') ,('2019-12-27', '1398-10-06', '1441-04-29', '2019-12-27', 6, 29, 10, 4, 'friday   ', 6, 0, 'NONE') ,('2019-12-28', '1398-10-07', '1441-05-01', '2019-12-28', 7, 1, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2019-12-29', '1398-10-08', '1441-05-02', '2019-12-29', 8, 2, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2019-12-30', '1398-10-09', '1441-05-03', '2019-12-30', 9, 3, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2019-12-31', '1398-10-10', '1441-05-04', '2019-12-31', 10, 4, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2020-01-01', '1398-10-11', '1441-05-05', '2020-01-01', 11, 5, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2020-01-02', '1398-10-12', '1441-05-06', '2020-01-02', 12, 6, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2020-01-03', '1398-10-13', '1441-05-07', '2020-01-03', 13, 7, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2020-01-04', '1398-10-14', '1441-05-08', '2020-01-04', 14, 8, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2020-01-05', '1398-10-15', '1441-05-09', '2020-01-05', 15, 9, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2020-01-06', '1398-10-16', '1441-05-10', '2020-01-06', 16, 10, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2020-01-07', '1398-10-17', '1441-05-11', '2020-01-07', 17, 11, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2020-01-08', '1398-10-18', '1441-05-12', '2020-01-08', 18, 12, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2020-01-09', '1398-10-19', '1441-05-13', '2020-01-09', 19, 13, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2020-01-10', '1398-10-20', '1441-05-14', '2020-01-10', 20, 14, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2020-01-11', '1398-10-21', '1441-05-15', '2020-01-11', 21, 15, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2020-01-12', '1398-10-22', '1441-05-16', '2020-01-12', 22, 16, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2020-01-13', '1398-10-23', '1441-05-17', '2020-01-13', 23, 17, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2020-01-14', '1398-10-24', '1441-05-18', '2020-01-14', 24, 18, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2020-01-15', '1398-10-25', '1441-05-19', '2020-01-15', 25, 19, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2020-01-16', '1398-10-26', '1441-05-20', '2020-01-16', 26, 20, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2020-01-17', '1398-10-27', '1441-05-21', '2020-01-17', 27, 21, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2020-01-18', '1398-10-28', '1441-05-22', '2020-01-18', 28, 22, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2020-01-19', '1398-10-29', '1441-05-23', '2020-01-19', 29, 23, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2020-01-20', '1398-10-30', '1441-05-24', '2020-01-20', 30, 24, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2020-01-21', '1398-11-01', '1441-05-25', '2020-01-21', 1, 25, 11, 5, 'tuesday  ', 3, 0, 'NONE') ,('2020-01-22', '1398-11-02', '1441-05-26', '2020-01-22', 2, 26, 11, 5, 'wednesday', 4, 0, 'NONE') ,('2020-01-23', '1398-11-03', '1441-05-27', '2020-01-23', 3, 27, 11, 5, 'thursday ', 5, 0, 'NONE') ,('2020-01-24', '1398-11-04', '1441-05-28', '2020-01-24', 4, 28, 11, 5, 'friday   ', 6, 0, 'NONE') ,('2020-01-25', '1398-11-05', '1441-05-29', '2020-01-25', 5, 29, 11, 5, 'saturday ', 7, 0, 'NONE') ,('2020-01-26', '1398-11-06', '1441-05-30', '2020-01-26', 6, 30, 11, 5, 'sunday   ', 1, 0, 'NONE') ,('2020-01-27', '1398-11-07', '1441-06-01', '2020-01-27', 7, 1, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2020-01-28', '1398-11-08', '1441-06-02', '2020-01-28', 8, 2, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2020-01-29', '1398-11-09', '1441-06-03', '2020-01-29', 9, 3, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2020-01-30', '1398-11-10', '1441-06-04', '2020-01-30', 10, 4, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2020-01-31', '1398-11-11', '1441-06-05', '2020-01-31', 11, 5, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2020-02-01', '1398-11-12', '1441-06-06', '2020-02-01', 12, 6, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2020-02-02', '1398-11-13', '1441-06-07', '2020-02-02', 13, 7, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2020-02-03', '1398-11-14', '1441-06-08', '2020-02-03', 14, 8, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2020-02-04', '1398-11-15', '1441-06-09', '2020-02-04', 15, 9, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2020-02-05', '1398-11-16', '1441-06-10', '2020-02-05', 16, 10, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2020-02-06', '1398-11-17', '1441-06-11', '2020-02-06', 17, 11, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2020-02-07', '1398-11-18', '1441-06-12', '2020-02-07', 18, 12, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2020-02-08', '1398-11-19', '1441-06-13', '2020-02-08', 19, 13, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2020-02-09', '1398-11-20', '1441-06-14', '2020-02-09', 20, 14, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2020-02-10', '1398-11-21', '1441-06-15', '2020-02-10', 21, 15, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2020-02-11', '1398-11-22', '1441-06-16', '2020-02-11', 22, 16, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2020-02-12', '1398-11-23', '1441-06-17', '2020-02-12', 23, 17, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2020-02-13', '1398-11-24', '1441-06-18', '2020-02-13', 24, 18, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2020-02-14', '1398-11-25', '1441-06-19', '2020-02-14', 25, 19, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2020-02-15', '1398-11-26', '1441-06-20', '2020-02-15', 26, 20, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2020-02-16', '1398-11-27', '1441-06-21', '2020-02-16', 27, 21, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2020-02-17', '1398-11-28', '1441-06-22', '2020-02-17', 28, 22, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2020-02-18', '1398-11-29', '1441-06-23', '2020-02-18', 29, 23, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2020-02-19', '1398-11-30', '1441-06-24', '2020-02-19', 30, 24, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2020-02-20', '1398-12-01', '1441-06-25', '2020-02-20', 1, 25, 12, 6, 'thursday ', 5, 0, 'NONE') ,('2020-02-21', '1398-12-02', '1441-06-26', '2020-02-21', 2, 26, 12, 6, 'friday   ', 6, 0, 'NONE') ,('2020-02-22', '1398-12-03', '1441-06-27', '2020-02-22', 3, 27, 12, 6, 'saturday ', 7, 0, 'NONE') ,('2020-02-23', '1398-12-04', '1441-06-28', '2020-02-23', 4, 28, 12, 6, 'sunday   ', 1, 0, 'NONE') ,('2020-02-24', '1398-12-05', '1441-06-29', '2020-02-24', 5, 29, 12, 6, 'monday   ', 2, 0, 'NONE') ,('2020-02-25', '1398-12-06', '1441-07-01', '2020-02-25', 6, 1, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2020-02-26', '1398-12-07', '1441-07-02', '2020-02-26', 7, 2, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2020-02-27', '1398-12-08', '1441-07-03', '2020-02-27', 8, 3, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2020-02-28', '1398-12-09', '1441-07-04', '2020-02-28', 9, 4, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2020-02-29', '1398-12-10', '1441-07-05', '2020-02-29', 10, 5, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2020-03-01', '1398-12-11', '1441-07-06', '2020-03-01', 11, 6, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2020-03-02', '1398-12-12', '1441-07-07', '2020-03-02', 12, 7, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2020-03-03', '1398-12-13', '1441-07-08', '2020-03-03', 13, 8, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2020-03-04', '1398-12-14', '1441-07-09', '2020-03-04', 14, 9, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2020-03-05', '1398-12-15', '1441-07-10', '2020-03-05', 15, 10, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2020-03-06', '1398-12-16', '1441-07-11', '2020-03-06', 16, 11, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2020-03-07', '1398-12-17', '1441-07-12', '2020-03-07', 17, 12, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2020-03-08', '1398-12-18', '1441-07-13', '2020-03-08', 18, 13, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2020-03-09', '1398-12-19', '1441-07-14', '2020-03-09', 19, 14, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2020-03-10', '1398-12-20', '1441-07-15', '2020-03-10', 20, 15, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2020-03-11', '1398-12-21', '1441-07-16', '2020-03-11', 21, 16, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2020-03-12', '1398-12-22', '1441-07-17', '2020-03-12', 22, 17, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2020-03-13', '1398-12-23', '1441-07-18', '2020-03-13', 23, 18, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2020-03-14', '1398-12-24', '1441-07-19', '2020-03-14', 24, 19, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2020-03-15', '1398-12-25', '1441-07-20', '2020-03-15', 25, 20, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2020-03-16', '1398-12-26', '1441-07-21', '2020-03-16', 26, 21, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2020-03-17', '1398-12-27', '1441-07-22', '2020-03-17', 27, 22, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2020-03-18', '1398-12-28', '1441-07-23', '2020-03-18', 28, 23, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2020-03-19', '1398-12-29', '1441-07-24', '2020-03-19', 29, 24, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2020-03-20', '1399-01-01', '1441-07-25', '2020-03-20', 1, 25, 1, 7, 'friday   ', 6, 0, 'NONE') ,('2020-03-21', '1399-01-02', '1441-07-26', '2020-03-21', 2, 26, 1, 7, 'saturday ', 7, 0, 'NONE') ,('2020-03-22', '1399-01-03', '1441-07-27', '2020-03-22', 3, 27, 1, 7, 'sunday   ', 1, 0, 'NONE') ,('2020-03-23', '1399-01-04', '1441-07-28', '2020-03-23', 4, 28, 1, 7, 'monday   ', 2, 0, 'NONE') ,('2020-03-24', '1399-01-05', '1441-07-29', '2020-03-24', 5, 29, 1, 7, 'tuesday  ', 3, 0, 'NONE') ,('2020-03-25', '1399-01-06', '1441-07-30', '2020-03-25', 6, 30, 1, 7, 'wednesday', 4, 0, 'NONE') ,('2020-03-26', '1399-01-07', '1441-08-01', '2020-03-26', 7, 1, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2020-03-27', '1399-01-08', '1441-08-02', '2020-03-27', 8, 2, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2020-03-28', '1399-01-09', '1441-08-03', '2020-03-28', 9, 3, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2020-03-29', '1399-01-10', '1441-08-04', '2020-03-29', 10, 4, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2020-03-30', '1399-01-11', '1441-08-05', '2020-03-30', 11, 5, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2020-03-31', '1399-01-12', '1441-08-06', '2020-03-31', 12, 6, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2020-04-01', '1399-01-13', '1441-08-07', '2020-04-01', 13, 7, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2020-04-02', '1399-01-14', '1441-08-08', '2020-04-02', 14, 8, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2020-04-03', '1399-01-15', '1441-08-09', '2020-04-03', 15, 9, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2020-04-04', '1399-01-16', '1441-08-10', '2020-04-04', 16, 10, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2020-04-05', '1399-01-17', '1441-08-11', '2020-04-05', 17, 11, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2020-04-06', '1399-01-18', '1441-08-12', '2020-04-06', 18, 12, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2020-04-07', '1399-01-19', '1441-08-13', '2020-04-07', 19, 13, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2020-04-08', '1399-01-20', '1441-08-14', '2020-04-08', 20, 14, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2020-04-09', '1399-01-21', '1441-08-15', '2020-04-09', 21, 15, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2020-04-10', '1399-01-22', '1441-08-16', '2020-04-10', 22, 16, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2020-04-11', '1399-01-23', '1441-08-17', '2020-04-11', 23, 17, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2020-04-12', '1399-01-24', '1441-08-18', '2020-04-12', 24, 18, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2020-04-13', '1399-01-25', '1441-08-19', '2020-04-13', 25, 19, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2020-04-14', '1399-01-26', '1441-08-20', '2020-04-14', 26, 20, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2020-04-15', '1399-01-27', '1441-08-21', '2020-04-15', 27, 21, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2020-04-16', '1399-01-28', '1441-08-22', '2020-04-16', 28, 22, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2020-04-17', '1399-01-29', '1441-08-23', '2020-04-17', 29, 23, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2020-04-18', '1399-01-30', '1441-08-24', '2020-04-18', 30, 24, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2020-04-19', '1399-01-31', '1441-08-25', '2020-04-19', 31, 25, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2020-04-20', '1399-02-01', '1441-08-26', '2020-04-20', 1, 26, 2, 8, 'monday   ', 2, 0, 'NONE') ,('2020-04-21', '1399-02-02', '1441-08-27', '2020-04-21', 2, 27, 2, 8, 'tuesday  ', 3, 0, 'NONE') ,('2020-04-22', '1399-02-03', '1441-08-28', '2020-04-22', 3, 28, 2, 8, 'wednesday', 4, 0, 'NONE') ,('2020-04-23', '1399-02-04', '1441-08-29', '2020-04-23', 4, 29, 2, 8, 'thursday ', 5, 0, 'NONE') ,('2020-04-24', '1399-02-05', '1441-09-01', '2020-04-24', 5, 1, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2020-04-25', '1399-02-06', '1441-09-02', '2020-04-25', 6, 2, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2020-04-26', '1399-02-07', '1441-09-03', '2020-04-26', 7, 3, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2020-04-27', '1399-02-08', '1441-09-04', '2020-04-27', 8, 4, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2020-04-28', '1399-02-09', '1441-09-05', '2020-04-28', 9, 5, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2020-04-29', '1399-02-10', '1441-09-06', '2020-04-29', 10, 6, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2020-04-30', '1399-02-11', '1441-09-07', '2020-04-30', 11, 7, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2020-05-01', '1399-02-12', '1441-09-08', '2020-05-01', 12, 8, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2020-05-02', '1399-02-13', '1441-09-09', '2020-05-02', 13, 9, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2020-05-03', '1399-02-14', '1441-09-10', '2020-05-03', 14, 10, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2020-05-04', '1399-02-15', '1441-09-11', '2020-05-04', 15, 11, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2020-05-05', '1399-02-16', '1441-09-12', '2020-05-05', 16, 12, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2020-05-06', '1399-02-17', '1441-09-13', '2020-05-06', 17, 13, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2020-05-07', '1399-02-18', '1441-09-14', '2020-05-07', 18, 14, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2020-05-08', '1399-02-19', '1441-09-15', '2020-05-08', 19, 15, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2020-05-09', '1399-02-20', '1441-09-16', '2020-05-09', 20, 16, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2020-05-10', '1399-02-21', '1441-09-17', '2020-05-10', 21, 17, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2020-05-11', '1399-02-22', '1441-09-18', '2020-05-11', 22, 18, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2020-05-12', '1399-02-23', '1441-09-19', '2020-05-12', 23, 19, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2020-05-13', '1399-02-24', '1441-09-20', '2020-05-13', 24, 20, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2020-05-14', '1399-02-25', '1441-09-21', '2020-05-14', 25, 21, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2020-05-15', '1399-02-26', '1441-09-22', '2020-05-15', 26, 22, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2020-05-16', '1399-02-27', '1441-09-23', '2020-05-16', 27, 23, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2020-05-17', '1399-02-28', '1441-09-24', '2020-05-17', 28, 24, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2020-05-18', '1399-02-29', '1441-09-25', '2020-05-18', 29, 25, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2020-05-19', '1399-02-30', '1441-09-26', '2020-05-19', 30, 26, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2020-05-20', '1399-02-31', '1441-09-27', '2020-05-20', 31, 27, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2020-05-21', '1399-03-01', '1441-09-28', '2020-05-21', 1, 28, 3, 9, 'thursday ', 5, 0, 'NONE') ,('2020-05-22', '1399-03-02', '1441-09-29', '2020-05-22', 2, 29, 3, 9, 'friday   ', 6, 0, 'NONE') ,('2020-05-23', '1399-03-03', '1441-09-30', '2020-05-23', 3, 30, 3, 9, 'saturday ', 7, 0, 'NONE') ,('2020-05-24', '1399-03-04', '1441-10-01', '2020-05-24', 4, 1, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2020-05-25', '1399-03-05', '1441-10-02', '2020-05-25', 5, 2, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2020-05-26', '1399-03-06', '1441-10-03', '2020-05-26', 6, 3, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2020-05-27', '1399-03-07', '1441-10-04', '2020-05-27', 7, 4, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2020-05-28', '1399-03-08', '1441-10-05', '2020-05-28', 8, 5, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2020-05-29', '1399-03-09', '1441-10-06', '2020-05-29', 9, 6, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2020-05-30', '1399-03-10', '1441-10-07', '2020-05-30', 10, 7, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2020-05-31', '1399-03-11', '1441-10-08', '2020-05-31', 11, 8, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2020-06-01', '1399-03-12', '1441-10-09', '2020-06-01', 12, 9, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2020-06-02', '1399-03-13', '1441-10-10', '2020-06-02', 13, 10, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2020-06-03', '1399-03-14', '1441-10-11', '2020-06-03', 14, 11, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2020-06-04', '1399-03-15', '1441-10-12', '2020-06-04', 15, 12, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2020-06-05', '1399-03-16', '1441-10-13', '2020-06-05', 16, 13, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2020-06-06', '1399-03-17', '1441-10-14', '2020-06-06', 17, 14, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2020-06-07', '1399-03-18', '1441-10-15', '2020-06-07', 18, 15, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2020-06-08', '1399-03-19', '1441-10-16', '2020-06-08', 19, 16, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2020-06-09', '1399-03-20', '1441-10-17', '2020-06-09', 20, 17, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2020-06-10', '1399-03-21', '1441-10-18', '2020-06-10', 21, 18, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2020-06-11', '1399-03-22', '1441-10-19', '2020-06-11', 22, 19, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2020-06-12', '1399-03-23', '1441-10-20', '2020-06-12', 23, 20, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2020-06-13', '1399-03-24', '1441-10-21', '2020-06-13', 24, 21, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2020-06-14', '1399-03-25', '1441-10-22', '2020-06-14', 25, 22, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2020-06-15', '1399-03-26', '1441-10-23', '2020-06-15', 26, 23, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2020-06-16', '1399-03-27', '1441-10-24', '2020-06-16', 27, 24, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2020-06-17', '1399-03-28', '1441-10-25', '2020-06-17', 28, 25, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2020-06-18', '1399-03-29', '1441-10-26', '2020-06-18', 29, 26, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2020-06-19', '1399-03-30', '1441-10-27', '2020-06-19', 30, 27, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2020-06-20', '1399-03-31', '1441-10-28', '2020-06-20', 31, 28, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2020-06-21', '1399-04-01', '1441-10-29', '2020-06-21', 1, 29, 4, 10, 'sunday   ', 1, 0, 'NONE') ,('2020-06-22', '1399-04-02', '1441-11-01', '2020-06-22', 2, 1, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2020-06-23', '1399-04-03', '1441-11-02', '2020-06-23', 3, 2, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2020-06-24', '1399-04-04', '1441-11-03', '2020-06-24', 4, 3, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2020-06-25', '1399-04-05', '1441-11-04', '2020-06-25', 5, 4, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2020-06-26', '1399-04-06', '1441-11-05', '2020-06-26', 6, 5, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2020-06-27', '1399-04-07', '1441-11-06', '2020-06-27', 7, 6, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2020-06-28', '1399-04-08', '1441-11-07', '2020-06-28', 8, 7, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2020-06-29', '1399-04-09', '1441-11-08', '2020-06-29', 9, 8, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2020-06-30', '1399-04-10', '1441-11-09', '2020-06-30', 10, 9, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2020-07-01', '1399-04-11', '1441-11-10', '2020-07-01', 11, 10, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2020-07-02', '1399-04-12', '1441-11-11', '2020-07-02', 12, 11, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2020-07-03', '1399-04-13', '1441-11-12', '2020-07-03', 13, 12, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2020-07-04', '1399-04-14', '1441-11-13', '2020-07-04', 14, 13, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2020-07-05', '1399-04-15', '1441-11-14', '2020-07-05', 15, 14, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2020-07-06', '1399-04-16', '1441-11-15', '2020-07-06', 16, 15, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2020-07-07', '1399-04-17', '1441-11-16', '2020-07-07', 17, 16, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2020-07-08', '1399-04-18', '1441-11-17', '2020-07-08', 18, 17, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2020-07-09', '1399-04-19', '1441-11-18', '2020-07-09', 19, 18, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2020-07-10', '1399-04-20', '1441-11-19', '2020-07-10', 20, 19, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2020-07-11', '1399-04-21', '1441-11-20', '2020-07-11', 21, 20, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2020-07-12', '1399-04-22', '1441-11-21', '2020-07-12', 22, 21, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2020-07-13', '1399-04-23', '1441-11-22', '2020-07-13', 23, 22, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2020-07-14', '1399-04-24', '1441-11-23', '2020-07-14', 24, 23, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2020-07-15', '1399-04-25', '1441-11-24', '2020-07-15', 25, 24, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2020-07-16', '1399-04-26', '1441-11-25', '2020-07-16', 26, 25, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2020-07-17', '1399-04-27', '1441-11-26', '2020-07-17', 27, 26, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2020-07-18', '1399-04-28', '1441-11-27', '2020-07-18', 28, 27, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2020-07-19', '1399-04-29', '1441-11-28', '2020-07-19', 29, 28, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2020-07-20', '1399-04-30', '1441-11-29', '2020-07-20', 30, 29, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2020-07-21', '1399-04-31', '1441-11-30', '2020-07-21', 31, 30, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2020-07-22', '1399-05-01', '1441-12-01', '2020-07-22', 1, 1, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2020-07-23', '1399-05-02', '1441-12-02', '2020-07-23', 2, 2, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2020-07-24', '1399-05-03', '1441-12-03', '2020-07-24', 3, 3, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2020-07-25', '1399-05-04', '1441-12-04', '2020-07-25', 4, 4, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2020-07-26', '1399-05-05', '1441-12-05', '2020-07-26', 5, 5, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2020-07-27', '1399-05-06', '1441-12-06', '2020-07-27', 6, 6, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2020-07-28', '1399-05-07', '1441-12-07', '2020-07-28', 7, 7, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2020-07-29', '1399-05-08', '1441-12-08', '2020-07-29', 8, 8, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2020-07-30', '1399-05-09', '1441-12-09', '2020-07-30', 9, 9, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2020-07-31', '1399-05-10', '1441-12-10', '2020-07-31', 10, 10, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2020-08-01', '1399-05-11', '1441-12-11', '2020-08-01', 11, 11, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2020-08-02', '1399-05-12', '1441-12-12', '2020-08-02', 12, 12, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2020-08-03', '1399-05-13', '1441-12-13', '2020-08-03', 13, 13, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2020-08-04', '1399-05-14', '1441-12-14', '2020-08-04', 14, 14, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2020-08-05', '1399-05-15', '1441-12-15', '2020-08-05', 15, 15, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2020-08-06', '1399-05-16', '1441-12-16', '2020-08-06', 16, 16, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2020-08-07', '1399-05-17', '1441-12-17', '2020-08-07', 17, 17, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2020-08-08', '1399-05-18', '1441-12-18', '2020-08-08', 18, 18, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2020-08-09', '1399-05-19', '1441-12-19', '2020-08-09', 19, 19, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2020-08-10', '1399-05-20', '1441-12-20', '2020-08-10', 20, 20, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2020-08-11', '1399-05-21', '1441-12-21', '2020-08-11', 21, 21, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2020-08-12', '1399-05-22', '1441-12-22', '2020-08-12', 22, 22, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2020-08-13', '1399-05-23', '1441-12-23', '2020-08-13', 23, 23, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2020-08-14', '1399-05-24', '1441-12-24', '2020-08-14', 24, 24, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2020-08-15', '1399-05-25', '1441-12-25', '2020-08-15', 25, 25, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2020-08-16', '1399-05-26', '1441-12-26', '2020-08-16', 26, 26, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2020-08-17', '1399-05-27', '1441-12-27', '2020-08-17', 27, 27, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2020-08-18', '1399-05-28', '1441-12-28', '2020-08-18', 28, 28, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2020-08-19', '1399-05-29', '1441-12-29', '2020-08-19', 29, 29, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2020-08-20', '1399-05-30', '1442-01-01', '2020-08-20', 30, 1, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2020-08-21', '1399-05-31', '1442-01-02', '2020-08-21', 31, 2, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2020-08-22', '1399-06-01', '1442-01-03', '2020-08-22', 1, 3, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2020-08-23', '1399-06-02', '1442-01-04', '2020-08-23', 2, 4, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2020-08-24', '1399-06-03', '1442-01-05', '2020-08-24', 3, 5, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2020-08-25', '1399-06-04', '1442-01-06', '2020-08-25', 4, 6, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2020-08-26', '1399-06-05', '1442-01-07', '2020-08-26', 5, 7, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2020-08-27', '1399-06-06', '1442-01-08', '2020-08-27', 6, 8, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2020-08-28', '1399-06-07', '1442-01-09', '2020-08-28', 7, 9, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2020-08-29', '1399-06-08', '1442-01-10', '2020-08-29', 8, 10, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2020-08-30', '1399-06-09', '1442-01-11', '2020-08-30', 9, 11, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2020-08-31', '1399-06-10', '1442-01-12', '2020-08-31', 10, 12, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2020-09-01', '1399-06-11', '1442-01-13', '2020-09-01', 11, 13, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2020-09-02', '1399-06-12', '1442-01-14', '2020-09-02', 12, 14, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2020-09-03', '1399-06-13', '1442-01-15', '2020-09-03', 13, 15, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2020-09-04', '1399-06-14', '1442-01-16', '2020-09-04', 14, 16, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2020-09-05', '1399-06-15', '1442-01-17', '2020-09-05', 15, 17, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2020-09-06', '1399-06-16', '1442-01-18', '2020-09-06', 16, 18, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2020-09-07', '1399-06-17', '1442-01-19', '2020-09-07', 17, 19, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2020-09-08', '1399-06-18', '1442-01-20', '2020-09-08', 18, 20, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2020-09-09', '1399-06-19', '1442-01-21', '2020-09-09', 19, 21, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2020-09-10', '1399-06-20', '1442-01-22', '2020-09-10', 20, 22, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2020-09-11', '1399-06-21', '1442-01-23', '2020-09-11', 21, 23, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2020-09-12', '1399-06-22', '1442-01-24', '2020-09-12', 22, 24, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2020-09-13', '1399-06-23', '1442-01-25', '2020-09-13', 23, 25, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2020-09-14', '1399-06-24', '1442-01-26', '2020-09-14', 24, 26, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2020-09-15', '1399-06-25', '1442-01-27', '2020-09-15', 25, 27, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2020-09-16', '1399-06-26', '1442-01-28', '2020-09-16', 26, 28, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2020-09-17', '1399-06-27', '1442-01-29', '2020-09-17', 27, 29, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2020-09-18', '1399-06-28', '1442-01-30', '2020-09-18', 28, 30, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2020-09-19', '1399-06-29', '1442-02-01', '2020-09-19', 29, 1, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2020-09-20', '1399-06-30', '1442-02-02', '2020-09-20', 30, 2, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2020-09-21', '1399-06-31', '1442-02-03', '2020-09-21', 31, 3, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2020-09-22', '1399-07-01', '1442-02-04', '2020-09-22', 1, 4, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2020-09-23', '1399-07-02', '1442-02-05', '2020-09-23', 2, 5, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2020-09-24', '1399-07-03', '1442-02-06', '2020-09-24', 3, 6, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2020-09-25', '1399-07-04', '1442-02-07', '2020-09-25', 4, 7, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2020-09-26', '1399-07-05', '1442-02-08', '2020-09-26', 5, 8, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2020-09-27', '1399-07-06', '1442-02-09', '2020-09-27', 6, 9, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2020-09-28', '1399-07-07', '1442-02-10', '2020-09-28', 7, 10, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2020-09-29', '1399-07-08', '1442-02-11', '2020-09-29', 8, 11, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2020-09-30', '1399-07-09', '1442-02-12', '2020-09-30', 9, 12, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2020-10-01', '1399-07-10', '1442-02-13', '2020-10-01', 10, 13, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2020-10-02', '1399-07-11', '1442-02-14', '2020-10-02', 11, 14, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2020-10-03', '1399-07-12', '1442-02-15', '2020-10-03', 12, 15, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2020-10-04', '1399-07-13', '1442-02-16', '2020-10-04', 13, 16, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2020-10-05', '1399-07-14', '1442-02-17', '2020-10-05', 14, 17, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2020-10-06', '1399-07-15', '1442-02-18', '2020-10-06', 15, 18, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2020-10-07', '1399-07-16', '1442-02-19', '2020-10-07', 16, 19, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2020-10-08', '1399-07-17', '1442-02-20', '2020-10-08', 17, 20, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2020-10-09', '1399-07-18', '1442-02-21', '2020-10-09', 18, 21, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2020-10-10', '1399-07-19', '1442-02-22', '2020-10-10', 19, 22, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2020-10-11', '1399-07-20', '1442-02-23', '2020-10-11', 20, 23, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2020-10-12', '1399-07-21', '1442-02-24', '2020-10-12', 21, 24, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2020-10-13', '1399-07-22', '1442-02-25', '2020-10-13', 22, 25, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2020-10-14', '1399-07-23', '1442-02-26', '2020-10-14', 23, 26, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2020-10-15', '1399-07-24', '1442-02-27', '2020-10-15', 24, 27, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2020-10-16', '1399-07-25', '1442-02-28', '2020-10-16', 25, 28, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2020-10-17', '1399-07-26', '1442-02-29', '2020-10-17', 26, 29, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2020-10-18', '1399-07-27', '1442-03-01', '2020-10-18', 27, 1, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2020-10-19', '1399-07-28', '1442-03-02', '2020-10-19', 28, 2, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2020-10-20', '1399-07-29', '1442-03-03', '2020-10-20', 29, 3, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2020-10-21', '1399-07-30', '1442-03-04', '2020-10-21', 30, 4, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2020-10-22', '1399-08-01', '1442-03-05', '2020-10-22', 1, 5, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2020-10-23', '1399-08-02', '1442-03-06', '2020-10-23', 2, 6, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2020-10-24', '1399-08-03', '1442-03-07', '2020-10-24', 3, 7, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2020-10-25', '1399-08-04', '1442-03-08', '2020-10-25', 4, 8, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2020-10-26', '1399-08-05', '1442-03-09', '2020-10-26', 5, 9, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2020-10-27', '1399-08-06', '1442-03-10', '2020-10-27', 6, 10, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2020-10-28', '1399-08-07', '1442-03-11', '2020-10-28', 7, 11, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2020-10-29', '1399-08-08', '1442-03-12', '2020-10-29', 8, 12, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2020-10-30', '1399-08-09', '1442-03-13', '2020-10-30', 9, 13, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2020-10-31', '1399-08-10', '1442-03-14', '2020-10-31', 10, 14, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2020-11-01', '1399-08-11', '1442-03-15', '2020-11-01', 11, 15, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2020-11-02', '1399-08-12', '1442-03-16', '2020-11-02', 12, 16, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2020-11-03', '1399-08-13', '1442-03-17', '2020-11-03', 13, 17, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2020-11-04', '1399-08-14', '1442-03-18', '2020-11-04', 14, 18, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2020-11-05', '1399-08-15', '1442-03-19', '2020-11-05', 15, 19, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2020-11-06', '1399-08-16', '1442-03-20', '2020-11-06', 16, 20, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2020-11-07', '1399-08-17', '1442-03-21', '2020-11-07', 17, 21, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2020-11-08', '1399-08-18', '1442-03-22', '2020-11-08', 18, 22, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2020-11-09', '1399-08-19', '1442-03-23', '2020-11-09', 19, 23, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2020-11-10', '1399-08-20', '1442-03-24', '2020-11-10', 20, 24, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2020-11-11', '1399-08-21', '1442-03-25', '2020-11-11', 21, 25, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2020-11-12', '1399-08-22', '1442-03-26', '2020-11-12', 22, 26, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2020-11-13', '1399-08-23', '1442-03-27', '2020-11-13', 23, 27, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2020-11-14', '1399-08-24', '1442-03-28', '2020-11-14', 24, 28, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2020-11-15', '1399-08-25', '1442-03-29', '2020-11-15', 25, 29, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2020-11-16', '1399-08-26', '1442-03-30', '2020-11-16', 26, 30, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2020-11-17', '1399-08-27', '1442-04-01', '2020-11-17', 27, 1, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2020-11-18', '1399-08-28', '1442-04-02', '2020-11-18', 28, 2, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2020-11-19', '1399-08-29', '1442-04-03', '2020-11-19', 29, 3, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2020-11-20', '1399-08-30', '1442-04-04', '2020-11-20', 30, 4, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2020-11-21', '1399-09-01', '1442-04-05', '2020-11-21', 1, 5, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2020-11-22', '1399-09-02', '1442-04-06', '2020-11-22', 2, 6, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2020-11-23', '1399-09-03', '1442-04-07', '2020-11-23', 3, 7, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2020-11-24', '1399-09-04', '1442-04-08', '2020-11-24', 4, 8, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2020-11-25', '1399-09-05', '1442-04-09', '2020-11-25', 5, 9, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2020-11-26', '1399-09-06', '1442-04-10', '2020-11-26', 6, 10, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2020-11-27', '1399-09-07', '1442-04-11', '2020-11-27', 7, 11, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2020-11-28', '1399-09-08', '1442-04-12', '2020-11-28', 8, 12, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2020-11-29', '1399-09-09', '1442-04-13', '2020-11-29', 9, 13, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2020-11-30', '1399-09-10', '1442-04-14', '2020-11-30', 10, 14, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2020-12-01', '1399-09-11', '1442-04-15', '2020-12-01', 11, 15, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2020-12-02', '1399-09-12', '1442-04-16', '2020-12-02', 12, 16, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2020-12-03', '1399-09-13', '1442-04-17', '2020-12-03', 13, 17, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2020-12-04', '1399-09-14', '1442-04-18', '2020-12-04', 14, 18, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2020-12-05', '1399-09-15', '1442-04-19', '2020-12-05', 15, 19, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2020-12-06', '1399-09-16', '1442-04-20', '2020-12-06', 16, 20, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2020-12-07', '1399-09-17', '1442-04-21', '2020-12-07', 17, 21, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2020-12-08', '1399-09-18', '1442-04-22', '2020-12-08', 18, 22, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2020-12-09', '1399-09-19', '1442-04-23', '2020-12-09', 19, 23, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2020-12-10', '1399-09-20', '1442-04-24', '2020-12-10', 20, 24, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2020-12-11', '1399-09-21', '1442-04-25', '2020-12-11', 21, 25, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2020-12-12', '1399-09-22', '1442-04-26', '2020-12-12', 22, 26, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2020-12-13', '1399-09-23', '1442-04-27', '2020-12-13', 23, 27, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2020-12-14', '1399-09-24', '1442-04-28', '2020-12-14', 24, 28, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2020-12-15', '1399-09-25', '1442-04-29', '2020-12-15', 25, 29, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2020-12-16', '1399-09-26', '1442-05-01', '2020-12-16', 26, 1, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2020-12-17', '1399-09-27', '1442-05-02', '2020-12-17', 27, 2, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2020-12-18', '1399-09-28', '1442-05-03', '2020-12-18', 28, 3, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2020-12-19', '1399-09-29', '1442-05-04', '2020-12-19', 29, 4, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2020-12-20', '1399-09-30', '1442-05-05', '2020-12-20', 30, 5, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2020-12-21', '1399-10-01', '1442-05-06', '2020-12-21', 1, 6, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2020-12-22', '1399-10-02', '1442-05-07', '2020-12-22', 2, 7, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2020-12-23', '1399-10-03', '1442-05-08', '2020-12-23', 3, 8, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2020-12-24', '1399-10-04', '1442-05-09', '2020-12-24', 4, 9, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2020-12-25', '1399-10-05', '1442-05-10', '2020-12-25', 5, 10, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2020-12-26', '1399-10-06', '1442-05-11', '2020-12-26', 6, 11, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2020-12-27', '1399-10-07', '1442-05-12', '2020-12-27', 7, 12, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2020-12-28', '1399-10-08', '1442-05-13', '2020-12-28', 8, 13, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2020-12-29', '1399-10-09', '1442-05-14', '2020-12-29', 9, 14, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2020-12-30', '1399-10-10', '1442-05-15', '2020-12-30', 10, 15, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2020-12-31', '1399-10-11', '1442-05-16', '2020-12-31', 11, 16, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2021-01-01', '1399-10-12', '1442-05-17', '2021-01-01', 12, 17, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2021-01-02', '1399-10-13', '1442-05-18', '2021-01-02', 13, 18, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2021-01-03', '1399-10-14', '1442-05-19', '2021-01-03', 14, 19, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2021-01-04', '1399-10-15', '1442-05-20', '2021-01-04', 15, 20, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2021-01-05', '1399-10-16', '1442-05-21', '2021-01-05', 16, 21, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2021-01-06', '1399-10-17', '1442-05-22', '2021-01-06', 17, 22, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2021-01-07', '1399-10-18', '1442-05-23', '2021-01-07', 18, 23, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2021-01-08', '1399-10-19', '1442-05-24', '2021-01-08', 19, 24, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2021-01-09', '1399-10-20', '1442-05-25', '2021-01-09', 20, 25, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2021-01-10', '1399-10-21', '1442-05-26', '2021-01-10', 21, 26, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2021-01-11', '1399-10-22', '1442-05-27', '2021-01-11', 22, 27, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2021-01-12', '1399-10-23', '1442-05-28', '2021-01-12', 23, 28, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2021-01-13', '1399-10-24', '1442-05-29', '2021-01-13', 24, 29, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2021-01-14', '1399-10-25', '1442-05-30', '2021-01-14', 25, 30, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2021-01-15', '1399-10-26', '1442-06-01', '2021-01-15', 26, 1, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2021-01-16', '1399-10-27', '1442-06-02', '2021-01-16', 27, 2, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2021-01-17', '1399-10-28', '1442-06-03', '2021-01-17', 28, 3, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2021-01-18', '1399-10-29', '1442-06-04', '2021-01-18', 29, 4, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2021-01-19', '1399-10-30', '1442-06-05', '2021-01-19', 30, 5, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2021-01-20', '1399-11-01', '1442-06-06', '2021-01-20', 1, 6, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2021-01-21', '1399-11-02', '1442-06-07', '2021-01-21', 2, 7, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2021-01-22', '1399-11-03', '1442-06-08', '2021-01-22', 3, 8, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2021-01-23', '1399-11-04', '1442-06-09', '2021-01-23', 4, 9, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2021-01-24', '1399-11-05', '1442-06-10', '2021-01-24', 5, 10, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2021-01-25', '1399-11-06', '1442-06-11', '2021-01-25', 6, 11, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2021-01-26', '1399-11-07', '1442-06-12', '2021-01-26', 7, 12, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2021-01-27', '1399-11-08', '1442-06-13', '2021-01-27', 8, 13, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2021-01-28', '1399-11-09', '1442-06-14', '2021-01-28', 9, 14, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2021-01-29', '1399-11-10', '1442-06-15', '2021-01-29', 10, 15, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2021-01-30', '1399-11-11', '1442-06-16', '2021-01-30', 11, 16, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2021-01-31', '1399-11-12', '1442-06-17', '2021-01-31', 12, 17, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2021-02-01', '1399-11-13', '1442-06-18', '2021-02-01', 13, 18, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2021-02-02', '1399-11-14', '1442-06-19', '2021-02-02', 14, 19, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2021-02-03', '1399-11-15', '1442-06-20', '2021-02-03', 15, 20, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2021-02-04', '1399-11-16', '1442-06-21', '2021-02-04', 16, 21, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2021-02-05', '1399-11-17', '1442-06-22', '2021-02-05', 17, 22, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2021-02-06', '1399-11-18', '1442-06-23', '2021-02-06', 18, 23, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2021-02-07', '1399-11-19', '1442-06-24', '2021-02-07', 19, 24, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2021-02-08', '1399-11-20', '1442-06-25', '2021-02-08', 20, 25, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2021-02-09', '1399-11-21', '1442-06-26', '2021-02-09', 21, 26, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2021-02-10', '1399-11-22', '1442-06-27', '2021-02-10', 22, 27, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2021-02-11', '1399-11-23', '1442-06-28', '2021-02-11', 23, 28, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2021-02-12', '1399-11-24', '1442-06-29', '2021-02-12', 24, 29, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2021-02-13', '1399-11-25', '1442-07-01', '2021-02-13', 25, 1, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2021-02-14', '1399-11-26', '1442-07-02', '2021-02-14', 26, 2, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2021-02-15', '1399-11-27', '1442-07-03', '2021-02-15', 27, 3, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2021-02-16', '1399-11-28', '1442-07-04', '2021-02-16', 28, 4, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2021-02-17', '1399-11-29', '1442-07-05', '2021-02-17', 29, 5, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2021-02-18', '1399-11-30', '1442-07-06', '2021-02-18', 30, 6, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2021-02-19', '1399-12-01', '1442-07-07', '2021-02-19', 1, 7, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2021-02-20', '1399-12-02', '1442-07-08', '2021-02-20', 2, 8, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2021-02-21', '1399-12-03', '1442-07-09', '2021-02-21', 3, 9, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2021-02-22', '1399-12-04', '1442-07-10', '2021-02-22', 4, 10, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2021-02-23', '1399-12-05', '1442-07-11', '2021-02-23', 5, 11, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2021-02-24', '1399-12-06', '1442-07-12', '2021-02-24', 6, 12, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2021-02-25', '1399-12-07', '1442-07-13', '2021-02-25', 7, 13, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2021-02-26', '1399-12-08', '1442-07-14', '2021-02-26', 8, 14, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2021-02-27', '1399-12-09', '1442-07-15', '2021-02-27', 9, 15, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2021-02-28', '1399-12-10', '1442-07-16', '2021-02-28', 10, 16, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2021-03-01', '1399-12-11', '1442-07-17', '2021-03-01', 11, 17, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2021-03-02', '1399-12-12', '1442-07-18', '2021-03-02', 12, 18, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2021-03-03', '1399-12-13', '1442-07-19', '2021-03-03', 13, 19, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2021-03-04', '1399-12-14', '1442-07-20', '2021-03-04', 14, 20, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2021-03-05', '1399-12-15', '1442-07-21', '2021-03-05', 15, 21, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2021-03-06', '1399-12-16', '1442-07-22', '2021-03-06', 16, 22, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2021-03-07', '1399-12-17', '1442-07-23', '2021-03-07', 17, 23, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2021-03-08', '1399-12-18', '1442-07-24', '2021-03-08', 18, 24, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2021-03-09', '1399-12-19', '1442-07-25', '2021-03-09', 19, 25, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2021-03-10', '1399-12-20', '1442-07-26', '2021-03-10', 20, 26, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2021-03-11', '1399-12-21', '1442-07-27', '2021-03-11', 21, 27, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2021-03-12', '1399-12-22', '1442-07-28', '2021-03-12', 22, 28, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2021-03-13', '1399-12-23', '1442-07-29', '2021-03-13', 23, 29, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2021-03-14', '1399-12-24', '1442-07-30', '2021-03-14', 24, 30, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2021-03-15', '1399-12-25', '1442-08-01', '2021-03-15', 25, 1, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2021-03-16', '1399-12-26', '1442-08-02', '2021-03-16', 26, 2, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2021-03-17', '1399-12-27', '1442-08-03', '2021-03-17', 27, 3, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2021-03-18', '1399-12-28', '1442-08-04', '2021-03-18', 28, 4, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2021-03-19', '1399-12-29', '1442-08-05', '2021-03-19', 29, 5, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2021-03-20', '1399-12-30', '1442-08-06', '2021-03-20', 30, 6, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2021-03-21', '1400-01-01', '1442-08-07', '2021-03-21', 1, 7, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2021-03-22', '1400-01-02', '1442-08-08', '2021-03-22', 2, 8, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2021-03-23', '1400-01-03', '1442-08-09', '2021-03-23', 3, 9, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2021-03-24', '1400-01-04', '1442-08-10', '2021-03-24', 4, 10, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2021-03-25', '1400-01-05', '1442-08-11', '2021-03-25', 5, 11, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2021-03-26', '1400-01-06', '1442-08-12', '2021-03-26', 6, 12, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2021-03-27', '1400-01-07', '1442-08-13', '2021-03-27', 7, 13, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2021-03-28', '1400-01-08', '1442-08-14', '2021-03-28', 8, 14, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2021-03-29', '1400-01-09', '1442-08-15', '2021-03-29', 9, 15, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2021-03-30', '1400-01-10', '1442-08-16', '2021-03-30', 10, 16, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2021-03-31', '1400-01-11', '1442-08-17', '2021-03-31', 11, 17, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2021-04-01', '1400-01-12', '1442-08-18', '2021-04-01', 12, 18, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2021-04-02', '1400-01-13', '1442-08-19', '2021-04-02', 13, 19, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2021-04-03', '1400-01-14', '1442-08-20', '2021-04-03', 14, 20, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2021-04-04', '1400-01-15', '1442-08-21', '2021-04-04', 15, 21, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2021-04-05', '1400-01-16', '1442-08-22', '2021-04-05', 16, 22, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2021-04-06', '1400-01-17', '1442-08-23', '2021-04-06', 17, 23, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2021-04-07', '1400-01-18', '1442-08-24', '2021-04-07', 18, 24, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2021-04-08', '1400-01-19', '1442-08-25', '2021-04-08', 19, 25, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2021-04-09', '1400-01-20', '1442-08-26', '2021-04-09', 20, 26, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2021-04-10', '1400-01-21', '1442-08-27', '2021-04-10', 21, 27, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2021-04-11', '1400-01-22', '1442-08-28', '2021-04-11', 22, 28, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2021-04-12', '1400-01-23', '1442-08-29', '2021-04-12', 23, 29, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2021-04-13', '1400-01-24', '1442-09-01', '2021-04-13', 24, 1, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2021-04-14', '1400-01-25', '1442-09-02', '2021-04-14', 25, 2, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2021-04-15', '1400-01-26', '1442-09-03', '2021-04-15', 26, 3, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2021-04-16', '1400-01-27', '1442-09-04', '2021-04-16', 27, 4, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2021-04-17', '1400-01-28', '1442-09-05', '2021-04-17', 28, 5, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2021-04-18', '1400-01-29', '1442-09-06', '2021-04-18', 29, 6, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2021-04-19', '1400-01-30', '1442-09-07', '2021-04-19', 30, 7, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2021-04-20', '1400-01-31', '1442-09-08', '2021-04-20', 31, 8, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2021-04-21', '1400-02-01', '1442-09-09', '2021-04-21', 1, 9, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2021-04-22', '1400-02-02', '1442-09-10', '2021-04-22', 2, 10, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2021-04-23', '1400-02-03', '1442-09-11', '2021-04-23', 3, 11, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2021-04-24', '1400-02-04', '1442-09-12', '2021-04-24', 4, 12, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2021-04-25', '1400-02-05', '1442-09-13', '2021-04-25', 5, 13, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2021-04-26', '1400-02-06', '1442-09-14', '2021-04-26', 6, 14, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2021-04-27', '1400-02-07', '1442-09-15', '2021-04-27', 7, 15, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2021-04-28', '1400-02-08', '1442-09-16', '2021-04-28', 8, 16, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2021-04-29', '1400-02-09', '1442-09-17', '2021-04-29', 9, 17, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2021-04-30', '1400-02-10', '1442-09-18', '2021-04-30', 10, 18, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2021-05-01', '1400-02-11', '1442-09-19', '2021-05-01', 11, 19, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2021-05-02', '1400-02-12', '1442-09-20', '2021-05-02', 12, 20, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2021-05-03', '1400-02-13', '1442-09-21', '2021-05-03', 13, 21, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2021-05-04', '1400-02-14', '1442-09-22', '2021-05-04', 14, 22, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2021-05-05', '1400-02-15', '1442-09-23', '2021-05-05', 15, 23, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2021-05-06', '1400-02-16', '1442-09-24', '2021-05-06', 16, 24, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2021-05-07', '1400-02-17', '1442-09-25', '2021-05-07', 17, 25, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2021-05-08', '1400-02-18', '1442-09-26', '2021-05-08', 18, 26, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2021-05-09', '1400-02-19', '1442-09-27', '2021-05-09', 19, 27, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2021-05-10', '1400-02-20', '1442-09-28', '2021-05-10', 20, 28, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2021-05-11', '1400-02-21', '1442-09-29', '2021-05-11', 21, 29, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2021-05-12', '1400-02-22', '1442-09-30', '2021-05-12', 22, 30, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2021-05-13', '1400-02-23', '1442-10-01', '2021-05-13', 23, 1, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2021-05-14', '1400-02-24', '1442-10-02', '2021-05-14', 24, 2, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2021-05-15', '1400-02-25', '1442-10-03', '2021-05-15', 25, 3, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2021-05-16', '1400-02-26', '1442-10-04', '2021-05-16', 26, 4, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2021-05-17', '1400-02-27', '1442-10-05', '2021-05-17', 27, 5, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2021-05-18', '1400-02-28', '1442-10-06', '2021-05-18', 28, 6, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2021-05-19', '1400-02-29', '1442-10-07', '2021-05-19', 29, 7, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2021-05-20', '1400-02-30', '1442-10-08', '2021-05-20', 30, 8, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2021-05-21', '1400-02-31', '1442-10-09', '2021-05-21', 31, 9, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2021-05-22', '1400-03-01', '1442-10-10', '2021-05-22', 1, 10, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2021-05-23', '1400-03-02', '1442-10-11', '2021-05-23', 2, 11, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2021-05-24', '1400-03-03', '1442-10-12', '2021-05-24', 3, 12, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2021-05-25', '1400-03-04', '1442-10-13', '2021-05-25', 4, 13, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2021-05-26', '1400-03-05', '1442-10-14', '2021-05-26', 5, 14, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2021-05-27', '1400-03-06', '1442-10-15', '2021-05-27', 6, 15, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2021-05-28', '1400-03-07', '1442-10-16', '2021-05-28', 7, 16, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2021-05-29', '1400-03-08', '1442-10-17', '2021-05-29', 8, 17, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2021-05-30', '1400-03-09', '1442-10-18', '2021-05-30', 9, 18, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2021-05-31', '1400-03-10', '1442-10-19', '2021-05-31', 10, 19, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2021-06-01', '1400-03-11', '1442-10-20', '2021-06-01', 11, 20, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2021-06-02', '1400-03-12', '1442-10-21', '2021-06-02', 12, 21, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2021-06-03', '1400-03-13', '1442-10-22', '2021-06-03', 13, 22, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2021-06-04', '1400-03-14', '1442-10-23', '2021-06-04', 14, 23, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2021-06-05', '1400-03-15', '1442-10-24', '2021-06-05', 15, 24, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2021-06-06', '1400-03-16', '1442-10-25', '2021-06-06', 16, 25, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2021-06-07', '1400-03-17', '1442-10-26', '2021-06-07', 17, 26, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2021-06-08', '1400-03-18', '1442-10-27', '2021-06-08', 18, 27, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2021-06-09', '1400-03-19', '1442-10-28', '2021-06-09', 19, 28, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2021-06-10', '1400-03-20', '1442-10-29', '2021-06-10', 20, 29, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2021-06-11', '1400-03-21', '1442-11-01', '2021-06-11', 21, 1, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2021-06-12', '1400-03-22', '1442-11-02', '2021-06-12', 22, 2, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2021-06-13', '1400-03-23', '1442-11-03', '2021-06-13', 23, 3, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2021-06-14', '1400-03-24', '1442-11-04', '2021-06-14', 24, 4, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2021-06-15', '1400-03-25', '1442-11-05', '2021-06-15', 25, 5, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2021-06-16', '1400-03-26', '1442-11-06', '2021-06-16', 26, 6, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2021-06-17', '1400-03-27', '1442-11-07', '2021-06-17', 27, 7, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2021-06-18', '1400-03-28', '1442-11-08', '2021-06-18', 28, 8, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2021-06-19', '1400-03-29', '1442-11-09', '2021-06-19', 29, 9, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2021-06-20', '1400-03-30', '1442-11-10', '2021-06-20', 30, 10, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2021-06-21', '1400-03-31', '1442-11-11', '2021-06-21', 31, 11, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2021-06-22', '1400-04-01', '1442-11-12', '2021-06-22', 1, 12, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2021-06-23', '1400-04-02', '1442-11-13', '2021-06-23', 2, 13, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2021-06-24', '1400-04-03', '1442-11-14', '2021-06-24', 3, 14, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2021-06-25', '1400-04-04', '1442-11-15', '2021-06-25', 4, 15, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2021-06-26', '1400-04-05', '1442-11-16', '2021-06-26', 5, 16, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2021-06-27', '1400-04-06', '1442-11-17', '2021-06-27', 6, 17, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2021-06-28', '1400-04-07', '1442-11-18', '2021-06-28', 7, 18, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2021-06-29', '1400-04-08', '1442-11-19', '2021-06-29', 8, 19, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2021-06-30', '1400-04-09', '1442-11-20', '2021-06-30', 9, 20, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2021-07-01', '1400-04-10', '1442-11-21', '2021-07-01', 10, 21, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2021-07-02', '1400-04-11', '1442-11-22', '2021-07-02', 11, 22, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2021-07-03', '1400-04-12', '1442-11-23', '2021-07-03', 12, 23, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2021-07-04', '1400-04-13', '1442-11-24', '2021-07-04', 13, 24, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2021-07-05', '1400-04-14', '1442-11-25', '2021-07-05', 14, 25, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2021-07-06', '1400-04-15', '1442-11-26', '2021-07-06', 15, 26, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2021-07-07', '1400-04-16', '1442-11-27', '2021-07-07', 16, 27, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2021-07-08', '1400-04-17', '1442-11-28', '2021-07-08', 17, 28, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2021-07-09', '1400-04-18', '1442-11-29', '2021-07-09', 18, 29, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2021-07-10', '1400-04-19', '1442-11-30', '2021-07-10', 19, 30, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2021-07-11', '1400-04-20', '1442-12-01', '2021-07-11', 20, 1, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2021-07-12', '1400-04-21', '1442-12-02', '2021-07-12', 21, 2, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2021-07-13', '1400-04-22', '1442-12-03', '2021-07-13', 22, 3, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2021-07-14', '1400-04-23', '1442-12-04', '2021-07-14', 23, 4, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2021-07-15', '1400-04-24', '1442-12-05', '2021-07-15', 24, 5, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2021-07-16', '1400-04-25', '1442-12-06', '2021-07-16', 25, 6, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2021-07-17', '1400-04-26', '1442-12-07', '2021-07-17', 26, 7, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2021-07-18', '1400-04-27', '1442-12-08', '2021-07-18', 27, 8, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2021-07-19', '1400-04-28', '1442-12-09', '2021-07-19', 28, 9, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2021-07-20', '1400-04-29', '1442-12-10', '2021-07-20', 29, 10, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2021-07-21', '1400-04-30', '1442-12-11', '2021-07-21', 30, 11, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2021-07-22', '1400-04-31', '1442-12-12', '2021-07-22', 31, 12, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2021-07-23', '1400-05-01', '1442-12-13', '2021-07-23', 1, 13, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2021-07-24', '1400-05-02', '1442-12-14', '2021-07-24', 2, 14, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2021-07-25', '1400-05-03', '1442-12-15', '2021-07-25', 3, 15, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2021-07-26', '1400-05-04', '1442-12-16', '2021-07-26', 4, 16, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2021-07-27', '1400-05-05', '1442-12-17', '2021-07-27', 5, 17, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2021-07-28', '1400-05-06', '1442-12-18', '2021-07-28', 6, 18, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2021-07-29', '1400-05-07', '1442-12-19', '2021-07-29', 7, 19, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2021-07-30', '1400-05-08', '1442-12-20', '2021-07-30', 8, 20, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2021-07-31', '1400-05-09', '1442-12-21', '2021-07-31', 9, 21, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2021-08-01', '1400-05-10', '1442-12-22', '2021-08-01', 10, 22, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2021-08-02', '1400-05-11', '1442-12-23', '2021-08-02', 11, 23, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2021-08-03', '1400-05-12', '1442-12-24', '2021-08-03', 12, 24, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2021-08-04', '1400-05-13', '1442-12-25', '2021-08-04', 13, 25, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2021-08-05', '1400-05-14', '1442-12-26', '2021-08-05', 14, 26, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2021-08-06', '1400-05-15', '1442-12-27', '2021-08-06', 15, 27, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2021-08-07', '1400-05-16', '1442-12-28', '2021-08-07', 16, 28, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2021-08-08', '1400-05-17', '1442-12-29', '2021-08-08', 17, 29, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2021-08-09', '1400-05-18', '1442-12-30', '2021-08-09', 18, 30, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2021-08-10', '1400-05-19', '1443-01-01', '2021-08-10', 19, 1, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2021-08-11', '1400-05-20', '1443-01-02', '2021-08-11', 20, 2, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2021-08-12', '1400-05-21', '1443-01-03', '2021-08-12', 21, 3, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2021-08-13', '1400-05-22', '1443-01-04', '2021-08-13', 22, 4, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2021-08-14', '1400-05-23', '1443-01-05', '2021-08-14', 23, 5, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2021-08-15', '1400-05-24', '1443-01-06', '2021-08-15', 24, 6, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2021-08-16', '1400-05-25', '1443-01-07', '2021-08-16', 25, 7, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2021-08-17', '1400-05-26', '1443-01-08', '2021-08-17', 26, 8, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2021-08-18', '1400-05-27', '1443-01-09', '2021-08-18', 27, 9, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2021-08-19', '1400-05-28', '1443-01-10', '2021-08-19', 28, 10, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2021-08-20', '1400-05-29', '1443-01-11', '2021-08-20', 29, 11, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2021-08-21', '1400-05-30', '1443-01-12', '2021-08-21', 30, 12, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2021-08-22', '1400-05-31', '1443-01-13', '2021-08-22', 31, 13, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2021-08-23', '1400-06-01', '1443-01-14', '2021-08-23', 1, 14, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2021-08-24', '1400-06-02', '1443-01-15', '2021-08-24', 2, 15, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2021-08-25', '1400-06-03', '1443-01-16', '2021-08-25', 3, 16, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2021-08-26', '1400-06-04', '1443-01-17', '2021-08-26', 4, 17, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2021-08-27', '1400-06-05', '1443-01-18', '2021-08-27', 5, 18, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2021-08-28', '1400-06-06', '1443-01-19', '2021-08-28', 6, 19, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2021-08-29', '1400-06-07', '1443-01-20', '2021-08-29', 7, 20, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2021-08-30', '1400-06-08', '1443-01-21', '2021-08-30', 8, 21, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2021-08-31', '1400-06-09', '1443-01-22', '2021-08-31', 9, 22, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2021-09-01', '1400-06-10', '1443-01-23', '2021-09-01', 10, 23, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2021-09-02', '1400-06-11', '1443-01-24', '2021-09-02', 11, 24, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2021-09-03', '1400-06-12', '1443-01-25', '2021-09-03', 12, 25, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2021-09-04', '1400-06-13', '1443-01-26', '2021-09-04', 13, 26, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2021-09-05', '1400-06-14', '1443-01-27', '2021-09-05', 14, 27, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2021-09-06', '1400-06-15', '1443-01-28', '2021-09-06', 15, 28, 6, 1, 'monday   ', 2, 0, 'NONE') ,('2021-09-07', '1400-06-16', '1443-01-29', '2021-09-07', 16, 29, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2021-09-08', '1400-06-17', '1443-01-30', '2021-09-08', 17, 30, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2021-09-09', '1400-06-18', '1443-02-01', '2021-09-09', 18, 1, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2021-09-10', '1400-06-19', '1443-02-02', '2021-09-10', 19, 2, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2021-09-11', '1400-06-20', '1443-02-03', '2021-09-11', 20, 3, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2021-09-12', '1400-06-21', '1443-02-04', '2021-09-12', 21, 4, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2021-09-13', '1400-06-22', '1443-02-05', '2021-09-13', 22, 5, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2021-09-14', '1400-06-23', '1443-02-06', '2021-09-14', 23, 6, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2021-09-15', '1400-06-24', '1443-02-07', '2021-09-15', 24, 7, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2021-09-16', '1400-06-25', '1443-02-08', '2021-09-16', 25, 8, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2021-09-17', '1400-06-26', '1443-02-09', '2021-09-17', 26, 9, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2021-09-18', '1400-06-27', '1443-02-10', '2021-09-18', 27, 10, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2021-09-19', '1400-06-28', '1443-02-11', '2021-09-19', 28, 11, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2021-09-20', '1400-06-29', '1443-02-12', '2021-09-20', 29, 12, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2021-09-21', '1400-06-30', '1443-02-13', '2021-09-21', 30, 13, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2021-09-22', '1400-06-31', '1443-02-14', '2021-09-22', 31, 14, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2021-09-23', '1400-07-01', '1443-02-15', '2021-09-23', 1, 15, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2021-09-24', '1400-07-02', '1443-02-16', '2021-09-24', 2, 16, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2021-09-25', '1400-07-03', '1443-02-17', '2021-09-25', 3, 17, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2021-09-26', '1400-07-04', '1443-02-18', '2021-09-26', 4, 18, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2021-09-27', '1400-07-05', '1443-02-19', '2021-09-27', 5, 19, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2021-09-28', '1400-07-06', '1443-02-20', '2021-09-28', 6, 20, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2021-09-29', '1400-07-07', '1443-02-21', '2021-09-29', 7, 21, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2021-09-30', '1400-07-08', '1443-02-22', '2021-09-30', 8, 22, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2021-10-01', '1400-07-09', '1443-02-23', '2021-10-01', 9, 23, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2021-10-02', '1400-07-10', '1443-02-24', '2021-10-02', 10, 24, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2021-10-03', '1400-07-11', '1443-02-25', '2021-10-03', 11, 25, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2021-10-04', '1400-07-12', '1443-02-26', '2021-10-04', 12, 26, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2021-10-05', '1400-07-13', '1443-02-27', '2021-10-05', 13, 27, 7, 2, 'tuesday  ', 3, 0, 'NONE') ,('2021-10-06', '1400-07-14', '1443-02-28', '2021-10-06', 14, 28, 7, 2, 'wednesday', 4, 0, 'NONE') ,('2021-10-07', '1400-07-15', '1443-02-29', '2021-10-07', 15, 29, 7, 2, 'thursday ', 5, 0, 'NONE') ,('2021-10-08', '1400-07-16', '1443-03-01', '2021-10-08', 16, 1, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2021-10-09', '1400-07-17', '1443-03-02', '2021-10-09', 17, 2, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2021-10-10', '1400-07-18', '1443-03-03', '2021-10-10', 18, 3, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2021-10-11', '1400-07-19', '1443-03-04', '2021-10-11', 19, 4, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2021-10-12', '1400-07-20', '1443-03-05', '2021-10-12', 20, 5, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2021-10-13', '1400-07-21', '1443-03-06', '2021-10-13', 21, 6, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2021-10-14', '1400-07-22', '1443-03-07', '2021-10-14', 22, 7, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2021-10-15', '1400-07-23', '1443-03-08', '2021-10-15', 23, 8, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2021-10-16', '1400-07-24', '1443-03-09', '2021-10-16', 24, 9, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2021-10-17', '1400-07-25', '1443-03-10', '2021-10-17', 25, 10, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2021-10-18', '1400-07-26', '1443-03-11', '2021-10-18', 26, 11, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2021-10-19', '1400-07-27', '1443-03-12', '2021-10-19', 27, 12, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2021-10-20', '1400-07-28', '1443-03-13', '2021-10-20', 28, 13, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2021-10-21', '1400-07-29', '1443-03-14', '2021-10-21', 29, 14, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2021-10-22', '1400-07-30', '1443-03-15', '2021-10-22', 30, 15, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2021-10-23', '1400-08-01', '1443-03-16', '2021-10-23', 1, 16, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2021-10-24', '1400-08-02', '1443-03-17', '2021-10-24', 2, 17, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2021-10-25', '1400-08-03', '1443-03-18', '2021-10-25', 3, 18, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2021-10-26', '1400-08-04', '1443-03-19', '2021-10-26', 4, 19, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2021-10-27', '1400-08-05', '1443-03-20', '2021-10-27', 5, 20, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2021-10-28', '1400-08-06', '1443-03-21', '2021-10-28', 6, 21, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2021-10-29', '1400-08-07', '1443-03-22', '2021-10-29', 7, 22, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2021-10-30', '1400-08-08', '1443-03-23', '2021-10-30', 8, 23, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2021-10-31', '1400-08-09', '1443-03-24', '2021-10-31', 9, 24, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2021-11-01', '1400-08-10', '1443-03-25', '2021-11-01', 10, 25, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2021-11-02', '1400-08-11', '1443-03-26', '2021-11-02', 11, 26, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2021-11-03', '1400-08-12', '1443-03-27', '2021-11-03', 12, 27, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2021-11-04', '1400-08-13', '1443-03-28', '2021-11-04', 13, 28, 8, 3, 'thursday ', 5, 0, 'NONE') ,('2021-11-05', '1400-08-14', '1443-03-29', '2021-11-05', 14, 29, 8, 3, 'friday   ', 6, 0, 'NONE') ,('2021-11-06', '1400-08-15', '1443-03-30', '2021-11-06', 15, 30, 8, 3, 'saturday ', 7, 0, 'NONE') ,('2021-11-07', '1400-08-16', '1443-04-01', '2021-11-07', 16, 1, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2021-11-08', '1400-08-17', '1443-04-02', '2021-11-08', 17, 2, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2021-11-09', '1400-08-18', '1443-04-03', '2021-11-09', 18, 3, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2021-11-10', '1400-08-19', '1443-04-04', '2021-11-10', 19, 4, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2021-11-11', '1400-08-20', '1443-04-05', '2021-11-11', 20, 5, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2021-11-12', '1400-08-21', '1443-04-06', '2021-11-12', 21, 6, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2021-11-13', '1400-08-22', '1443-04-07', '2021-11-13', 22, 7, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2021-11-14', '1400-08-23', '1443-04-08', '2021-11-14', 23, 8, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2021-11-15', '1400-08-24', '1443-04-09', '2021-11-15', 24, 9, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2021-11-16', '1400-08-25', '1443-04-10', '2021-11-16', 25, 10, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2021-11-17', '1400-08-26', '1443-04-11', '2021-11-17', 26, 11, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2021-11-18', '1400-08-27', '1443-04-12', '2021-11-18', 27, 12, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2021-11-19', '1400-08-28', '1443-04-13', '2021-11-19', 28, 13, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2021-11-20', '1400-08-29', '1443-04-14', '2021-11-20', 29, 14, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2021-11-21', '1400-08-30', '1443-04-15', '2021-11-21', 30, 15, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2021-11-22', '1400-09-01', '1443-04-16', '2021-11-22', 1, 16, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2021-11-23', '1400-09-02', '1443-04-17', '2021-11-23', 2, 17, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2021-11-24', '1400-09-03', '1443-04-18', '2021-11-24', 3, 18, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2021-11-25', '1400-09-04', '1443-04-19', '2021-11-25', 4, 19, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2021-11-26', '1400-09-05', '1443-04-20', '2021-11-26', 5, 20, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2021-11-27', '1400-09-06', '1443-04-21', '2021-11-27', 6, 21, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2021-11-28', '1400-09-07', '1443-04-22', '2021-11-28', 7, 22, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2021-11-29', '1400-09-08', '1443-04-23', '2021-11-29', 8, 23, 9, 4, 'monday   ', 2, 0, 'NONE') ,('2021-11-30', '1400-09-09', '1443-04-24', '2021-11-30', 9, 24, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2021-12-01', '1400-09-10', '1443-04-25', '2021-12-01', 10, 25, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2021-12-02', '1400-09-11', '1443-04-26', '2021-12-02', 11, 26, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2021-12-03', '1400-09-12', '1443-04-27', '2021-12-03', 12, 27, 9, 4, 'friday   ', 6, 0, 'NONE') ,('2021-12-04', '1400-09-13', '1443-04-28', '2021-12-04', 13, 28, 9, 4, 'saturday ', 7, 0, 'NONE') ,('2021-12-05', '1400-09-14', '1443-04-29', '2021-12-05', 14, 29, 9, 4, 'sunday   ', 1, 0, 'NONE') ,('2021-12-06', '1400-09-15', '1443-05-01', '2021-12-06', 15, 1, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2021-12-07', '1400-09-16', '1443-05-02', '2021-12-07', 16, 2, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2021-12-08', '1400-09-17', '1443-05-03', '2021-12-08', 17, 3, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2021-12-09', '1400-09-18', '1443-05-04', '2021-12-09', 18, 4, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2021-12-10', '1400-09-19', '1443-05-05', '2021-12-10', 19, 5, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2021-12-11', '1400-09-20', '1443-05-06', '2021-12-11', 20, 6, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2021-12-12', '1400-09-21', '1443-05-07', '2021-12-12', 21, 7, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2021-12-13', '1400-09-22', '1443-05-08', '2021-12-13', 22, 8, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2021-12-14', '1400-09-23', '1443-05-09', '2021-12-14', 23, 9, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2021-12-15', '1400-09-24', '1443-05-10', '2021-12-15', 24, 10, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2021-12-16', '1400-09-25', '1443-05-11', '2021-12-16', 25, 11, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2021-12-17', '1400-09-26', '1443-05-12', '2021-12-17', 26, 12, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2021-12-18', '1400-09-27', '1443-05-13', '2021-12-18', 27, 13, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2021-12-19', '1400-09-28', '1443-05-14', '2021-12-19', 28, 14, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2021-12-20', '1400-09-29', '1443-05-15', '2021-12-20', 29, 15, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2021-12-21', '1400-09-30', '1443-05-16', '2021-12-21', 30, 16, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2021-12-22', '1400-10-01', '1443-05-17', '2021-12-22', 1, 17, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2021-12-23', '1400-10-02', '1443-05-18', '2021-12-23', 2, 18, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2021-12-24', '1400-10-03', '1443-05-19', '2021-12-24', 3, 19, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2021-12-25', '1400-10-04', '1443-05-20', '2021-12-25', 4, 20, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2021-12-26', '1400-10-05', '1443-05-21', '2021-12-26', 5, 21, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2021-12-27', '1400-10-06', '1443-05-22', '2021-12-27', 6, 22, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2021-12-28', '1400-10-07', '1443-05-23', '2021-12-28', 7, 23, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2021-12-29', '1400-10-08', '1443-05-24', '2021-12-29', 8, 24, 10, 5, 'wednesday', 4, 0, 'NONE') ,('2021-12-30', '1400-10-09', '1443-05-25', '2021-12-30', 9, 25, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2021-12-31', '1400-10-10', '1443-05-26', '2021-12-31', 10, 26, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2022-01-01', '1400-10-11', '1443-05-27', '2022-01-01', 11, 27, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2022-01-02', '1400-10-12', '1443-05-28', '2022-01-02', 12, 28, 10, 5, 'sunday   ', 1, 0, 'NONE') ,('2022-01-03', '1400-10-13', '1443-05-29', '2022-01-03', 13, 29, 10, 5, 'monday   ', 2, 0, 'NONE') ,('2022-01-04', '1400-10-14', '1443-05-30', '2022-01-04', 14, 30, 10, 5, 'tuesday  ', 3, 0, 'NONE') ,('2022-01-05', '1400-10-15', '1443-06-01', '2022-01-05', 15, 1, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2022-01-06', '1400-10-16', '1443-06-02', '2022-01-06', 16, 2, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2022-01-07', '1400-10-17', '1443-06-03', '2022-01-07', 17, 3, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2022-01-08', '1400-10-18', '1443-06-04', '2022-01-08', 18, 4, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2022-01-09', '1400-10-19', '1443-06-05', '2022-01-09', 19, 5, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2022-01-10', '1400-10-20', '1443-06-06', '2022-01-10', 20, 6, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2022-01-11', '1400-10-21', '1443-06-07', '2022-01-11', 21, 7, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2022-01-12', '1400-10-22', '1443-06-08', '2022-01-12', 22, 8, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2022-01-13', '1400-10-23', '1443-06-09', '2022-01-13', 23, 9, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2022-01-14', '1400-10-24', '1443-06-10', '2022-01-14', 24, 10, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2022-01-15', '1400-10-25', '1443-06-11', '2022-01-15', 25, 11, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2022-01-16', '1400-10-26', '1443-06-12', '2022-01-16', 26, 12, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2022-01-17', '1400-10-27', '1443-06-13', '2022-01-17', 27, 13, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2022-01-18', '1400-10-28', '1443-06-14', '2022-01-18', 28, 14, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2022-01-19', '1400-10-29', '1443-06-15', '2022-01-19', 29, 15, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2022-01-20', '1400-10-30', '1443-06-16', '2022-01-20', 30, 16, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2022-01-21', '1400-11-01', '1443-06-17', '2022-01-21', 1, 17, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2022-01-22', '1400-11-02', '1443-06-18', '2022-01-22', 2, 18, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2022-01-23', '1400-11-03', '1443-06-19', '2022-01-23', 3, 19, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2022-01-24', '1400-11-04', '1443-06-20', '2022-01-24', 4, 20, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2022-01-25', '1400-11-05', '1443-06-21', '2022-01-25', 5, 21, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2022-01-26', '1400-11-06', '1443-06-22', '2022-01-26', 6, 22, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2022-01-27', '1400-11-07', '1443-06-23', '2022-01-27', 7, 23, 11, 6, 'thursday ', 5, 0, 'NONE') ,('2022-01-28', '1400-11-08', '1443-06-24', '2022-01-28', 8, 24, 11, 6, 'friday   ', 6, 0, 'NONE') ,('2022-01-29', '1400-11-09', '1443-06-25', '2022-01-29', 9, 25, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2022-01-30', '1400-11-10', '1443-06-26', '2022-01-30', 10, 26, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2022-01-31', '1400-11-11', '1443-06-27', '2022-01-31', 11, 27, 11, 6, 'monday   ', 2, 0, 'NONE') ,('2022-02-01', '1400-11-12', '1443-06-28', '2022-02-01', 12, 28, 11, 6, 'tuesday  ', 3, 0, 'NONE') ,('2022-02-02', '1400-11-13', '1443-06-29', '2022-02-02', 13, 29, 11, 6, 'wednesday', 4, 0, 'NONE') ,('2022-02-03', '1400-11-14', '1443-07-01', '2022-02-03', 14, 1, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2022-02-04', '1400-11-15', '1443-07-02', '2022-02-04', 15, 2, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2022-02-05', '1400-11-16', '1443-07-03', '2022-02-05', 16, 3, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2022-02-06', '1400-11-17', '1443-07-04', '2022-02-06', 17, 4, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2022-02-07', '1400-11-18', '1443-07-05', '2022-02-07', 18, 5, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2022-02-08', '1400-11-19', '1443-07-06', '2022-02-08', 19, 6, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2022-02-09', '1400-11-20', '1443-07-07', '2022-02-09', 20, 7, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2022-02-10', '1400-11-21', '1443-07-08', '2022-02-10', 21, 8, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2022-02-11', '1400-11-22', '1443-07-09', '2022-02-11', 22, 9, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2022-02-12', '1400-11-23', '1443-07-10', '2022-02-12', 23, 10, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2022-02-13', '1400-11-24', '1443-07-11', '2022-02-13', 24, 11, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2022-02-14', '1400-11-25', '1443-07-12', '2022-02-14', 25, 12, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2022-02-15', '1400-11-26', '1443-07-13', '2022-02-15', 26, 13, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2022-02-16', '1400-11-27', '1443-07-14', '2022-02-16', 27, 14, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2022-02-17', '1400-11-28', '1443-07-15', '2022-02-17', 28, 15, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2022-02-18', '1400-11-29', '1443-07-16', '2022-02-18', 29, 16, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2022-02-19', '1400-11-30', '1443-07-17', '2022-02-19', 30, 17, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2022-02-20', '1400-12-01', '1443-07-18', '2022-02-20', 1, 18, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2022-02-21', '1400-12-02', '1443-07-19', '2022-02-21', 2, 19, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2022-02-22', '1400-12-03', '1443-07-20', '2022-02-22', 3, 20, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2022-02-23', '1400-12-04', '1443-07-21', '2022-02-23', 4, 21, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2022-02-24', '1400-12-05', '1443-07-22', '2022-02-24', 5, 22, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2022-02-25', '1400-12-06', '1443-07-23', '2022-02-25', 6, 23, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2022-02-26', '1400-12-07', '1443-07-24', '2022-02-26', 7, 24, 12, 7, 'saturday ', 7, 0, 'NONE') ,('2022-02-27', '1400-12-08', '1443-07-25', '2022-02-27', 8, 25, 12, 7, 'sunday   ', 1, 0, 'NONE') ,('2022-02-28', '1400-12-09', '1443-07-26', '2022-02-28', 9, 26, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2022-03-01', '1400-12-10', '1443-07-27', '2022-03-01', 10, 27, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2022-03-02', '1400-12-11', '1443-07-28', '2022-03-02', 11, 28, 12, 7, 'wednesday', 4, 0, 'NONE') ,('2022-03-03', '1400-12-12', '1443-07-29', '2022-03-03', 12, 29, 12, 7, 'thursday ', 5, 0, 'NONE') ,('2022-03-04', '1400-12-13', '1443-07-30', '2022-03-04', 13, 30, 12, 7, 'friday   ', 6, 0, 'NONE') ,('2022-03-05', '1400-12-14', '1443-08-01', '2022-03-05', 14, 1, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2022-03-06', '1400-12-15', '1443-08-02', '2022-03-06', 15, 2, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2022-03-07', '1400-12-16', '1443-08-03', '2022-03-07', 16, 3, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2022-03-08', '1400-12-17', '1443-08-04', '2022-03-08', 17, 4, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2022-03-09', '1400-12-18', '1443-08-05', '2022-03-09', 18, 5, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2022-03-10', '1400-12-19', '1443-08-06', '2022-03-10', 19, 6, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2022-03-11', '1400-12-20', '1443-08-07', '2022-03-11', 20, 7, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2022-03-12', '1400-12-21', '1443-08-08', '2022-03-12', 21, 8, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2022-03-13', '1400-12-22', '1443-08-09', '2022-03-13', 22, 9, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2022-03-14', '1400-12-23', '1443-08-10', '2022-03-14', 23, 10, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2022-03-15', '1400-12-24', '1443-08-11', '2022-03-15', 24, 11, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2022-03-16', '1400-12-25', '1443-08-12', '2022-03-16', 25, 12, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2022-03-17', '1400-12-26', '1443-08-13', '2022-03-17', 26, 13, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2022-03-18', '1400-12-27', '1443-08-14', '2022-03-18', 27, 14, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2022-03-19', '1400-12-28', '1443-08-15', '2022-03-19', 28, 15, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2022-03-20', '1400-12-29', '1443-08-16', '2022-03-20', 29, 16, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2022-03-21', '1401-01-01', '1443-08-17', '2022-03-21', 1, 17, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2022-03-22', '1401-01-02', '1443-08-18', '2022-03-22', 2, 18, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2022-03-23', '1401-01-03', '1443-08-19', '2022-03-23', 3, 19, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2022-03-24', '1401-01-04', '1443-08-20', '2022-03-24', 4, 20, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2022-03-25', '1401-01-05', '1443-08-21', '2022-03-25', 5, 21, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2022-03-26', '1401-01-06', '1443-08-22', '2022-03-26', 6, 22, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2022-03-27', '1401-01-07', '1443-08-23', '2022-03-27', 7, 23, 1, 8, 'sunday   ', 1, 0, 'NONE') ,('2022-03-28', '1401-01-08', '1443-08-24', '2022-03-28', 8, 24, 1, 8, 'monday   ', 2, 0, 'NONE') ,('2022-03-29', '1401-01-09', '1443-08-25', '2022-03-29', 9, 25, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2022-03-30', '1401-01-10', '1443-08-26', '2022-03-30', 10, 26, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2022-03-31', '1401-01-11', '1443-08-27', '2022-03-31', 11, 27, 1, 8, 'thursday ', 5, 0, 'NONE') ,('2022-04-01', '1401-01-12', '1443-08-28', '2022-04-01', 12, 28, 1, 8, 'friday   ', 6, 0, 'NONE') ,('2022-04-02', '1401-01-13', '1443-08-29', '2022-04-02', 13, 29, 1, 8, 'saturday ', 7, 0, 'NONE') ,('2022-04-03', '1401-01-14', '1443-09-01', '2022-04-03', 14, 1, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2022-04-04', '1401-01-15', '1443-09-02', '2022-04-04', 15, 2, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2022-04-05', '1401-01-16', '1443-09-03', '2022-04-05', 16, 3, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2022-04-06', '1401-01-17', '1443-09-04', '2022-04-06', 17, 4, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2022-04-07', '1401-01-18', '1443-09-05', '2022-04-07', 18, 5, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2022-04-08', '1401-01-19', '1443-09-06', '2022-04-08', 19, 6, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2022-04-09', '1401-01-20', '1443-09-07', '2022-04-09', 20, 7, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2022-04-10', '1401-01-21', '1443-09-08', '2022-04-10', 21, 8, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2022-04-11', '1401-01-22', '1443-09-09', '2022-04-11', 22, 9, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2022-04-12', '1401-01-23', '1443-09-10', '2022-04-12', 23, 10, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2022-04-13', '1401-01-24', '1443-09-11', '2022-04-13', 24, 11, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2022-04-14', '1401-01-25', '1443-09-12', '2022-04-14', 25, 12, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2022-04-15', '1401-01-26', '1443-09-13', '2022-04-15', 26, 13, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2022-04-16', '1401-01-27', '1443-09-14', '2022-04-16', 27, 14, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2022-04-17', '1401-01-28', '1443-09-15', '2022-04-17', 28, 15, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2022-04-18', '1401-01-29', '1443-09-16', '2022-04-18', 29, 16, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2022-04-19', '1401-01-30', '1443-09-17', '2022-04-19', 30, 17, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2022-04-20', '1401-01-31', '1443-09-18', '2022-04-20', 31, 18, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2022-04-21', '1401-02-01', '1443-09-19', '2022-04-21', 1, 19, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2022-04-22', '1401-02-02', '1443-09-20', '2022-04-22', 2, 20, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2022-04-23', '1401-02-03', '1443-09-21', '2022-04-23', 3, 21, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2022-04-24', '1401-02-04', '1443-09-22', '2022-04-24', 4, 22, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2022-04-25', '1401-02-05', '1443-09-23', '2022-04-25', 5, 23, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2022-04-26', '1401-02-06', '1443-09-24', '2022-04-26', 6, 24, 2, 9, 'tuesday  ', 3, 0, 'NONE') ,('2022-04-27', '1401-02-07', '1443-09-25', '2022-04-27', 7, 25, 2, 9, 'wednesday', 4, 0, 'NONE') ,('2022-04-28', '1401-02-08', '1443-09-26', '2022-04-28', 8, 26, 2, 9, 'thursday ', 5, 0, 'NONE') ,('2022-04-29', '1401-02-09', '1443-09-27', '2022-04-29', 9, 27, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2022-04-30', '1401-02-10', '1443-09-28', '2022-04-30', 10, 28, 2, 9, 'saturday ', 7, 0, 'NONE') ,('2022-05-01', '1401-02-11', '1443-09-29', '2022-05-01', 11, 29, 2, 9, 'sunday   ', 1, 0, 'NONE') ,('2022-05-02', '1401-02-12', '1443-09-30', '2022-05-02', 12, 30, 2, 9, 'monday   ', 2, 0, 'NONE') ,('2022-05-03', '1401-02-13', '1443-10-01', '2022-05-03', 13, 1, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2022-05-04', '1401-02-14', '1443-10-02', '2022-05-04', 14, 2, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2022-05-05', '1401-02-15', '1443-10-03', '2022-05-05', 15, 3, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2022-05-06', '1401-02-16', '1443-10-04', '2022-05-06', 16, 4, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2022-05-07', '1401-02-17', '1443-10-05', '2022-05-07', 17, 5, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2022-05-08', '1401-02-18', '1443-10-06', '2022-05-08', 18, 6, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2022-05-09', '1401-02-19', '1443-10-07', '2022-05-09', 19, 7, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2022-05-10', '1401-02-20', '1443-10-08', '2022-05-10', 20, 8, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2022-05-11', '1401-02-21', '1443-10-09', '2022-05-11', 21, 9, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2022-05-12', '1401-02-22', '1443-10-10', '2022-05-12', 22, 10, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2022-05-13', '1401-02-23', '1443-10-11', '2022-05-13', 23, 11, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2022-05-14', '1401-02-24', '1443-10-12', '2022-05-14', 24, 12, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2022-05-15', '1401-02-25', '1443-10-13', '2022-05-15', 25, 13, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2022-05-16', '1401-02-26', '1443-10-14', '2022-05-16', 26, 14, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2022-05-17', '1401-02-27', '1443-10-15', '2022-05-17', 27, 15, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2022-05-18', '1401-02-28', '1443-10-16', '2022-05-18', 28, 16, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2022-05-19', '1401-02-29', '1443-10-17', '2022-05-19', 29, 17, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2022-05-20', '1401-02-30', '1443-10-18', '2022-05-20', 30, 18, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2022-05-21', '1401-02-31', '1443-10-19', '2022-05-21', 31, 19, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2022-05-22', '1401-03-01', '1443-10-20', '2022-05-22', 1, 20, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2022-05-23', '1401-03-02', '1443-10-21', '2022-05-23', 2, 21, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2022-05-24', '1401-03-03', '1443-10-22', '2022-05-24', 3, 22, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2022-05-25', '1401-03-04', '1443-10-23', '2022-05-25', 4, 23, 3, 10, 'wednesday', 4, 0, 'NONE') ,('2022-05-26', '1401-03-05', '1443-10-24', '2022-05-26', 5, 24, 3, 10, 'thursday ', 5, 0, 'NONE') ,('2022-05-27', '1401-03-06', '1443-10-25', '2022-05-27', 6, 25, 3, 10, 'friday   ', 6, 0, 'NONE') ,('2022-05-28', '1401-03-07', '1443-10-26', '2022-05-28', 7, 26, 3, 10, 'saturday ', 7, 0, 'NONE') ,('2022-05-29', '1401-03-08', '1443-10-27', '2022-05-29', 8, 27, 3, 10, 'sunday   ', 1, 0, 'NONE') ,('2022-05-30', '1401-03-09', '1443-10-28', '2022-05-30', 9, 28, 3, 10, 'monday   ', 2, 0, 'NONE') ,('2022-05-31', '1401-03-10', '1443-10-29', '2022-05-31', 10, 29, 3, 10, 'tuesday  ', 3, 0, 'NONE') ,('2022-06-01', '1401-03-11', '1443-11-01', '2022-06-01', 11, 1, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2022-06-02', '1401-03-12', '1443-11-02', '2022-06-02', 12, 2, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2022-06-03', '1401-03-13', '1443-11-03', '2022-06-03', 13, 3, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2022-06-04', '1401-03-14', '1443-11-04', '2022-06-04', 14, 4, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2022-06-05', '1401-03-15', '1443-11-05', '2022-06-05', 15, 5, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2022-06-06', '1401-03-16', '1443-11-06', '2022-06-06', 16, 6, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2022-06-07', '1401-03-17', '1443-11-07', '2022-06-07', 17, 7, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2022-06-08', '1401-03-18', '1443-11-08', '2022-06-08', 18, 8, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2022-06-09', '1401-03-19', '1443-11-09', '2022-06-09', 19, 9, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2022-06-10', '1401-03-20', '1443-11-10', '2022-06-10', 20, 10, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2022-06-11', '1401-03-21', '1443-11-11', '2022-06-11', 21, 11, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2022-06-12', '1401-03-22', '1443-11-12', '2022-06-12', 22, 12, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2022-06-13', '1401-03-23', '1443-11-13', '2022-06-13', 23, 13, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2022-06-14', '1401-03-24', '1443-11-14', '2022-06-14', 24, 14, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2022-06-15', '1401-03-25', '1443-11-15', '2022-06-15', 25, 15, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2022-06-16', '1401-03-26', '1443-11-16', '2022-06-16', 26, 16, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2022-06-17', '1401-03-27', '1443-11-17', '2022-06-17', 27, 17, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2022-06-18', '1401-03-28', '1443-11-18', '2022-06-18', 28, 18, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2022-06-19', '1401-03-29', '1443-11-19', '2022-06-19', 29, 19, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2022-06-20', '1401-03-30', '1443-11-20', '2022-06-20', 30, 20, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2022-06-21', '1401-03-31', '1443-11-21', '2022-06-21', 31, 21, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2022-06-22', '1401-04-01', '1443-11-22', '2022-06-22', 1, 22, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2022-06-23', '1401-04-02', '1443-11-23', '2022-06-23', 2, 23, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2022-06-24', '1401-04-03', '1443-11-24', '2022-06-24', 3, 24, 4, 11, 'friday   ', 6, 0, 'NONE') ,('2022-06-25', '1401-04-04', '1443-11-25', '2022-06-25', 4, 25, 4, 11, 'saturday ', 7, 0, 'NONE') ,('2022-06-26', '1401-04-05', '1443-11-26', '2022-06-26', 5, 26, 4, 11, 'sunday   ', 1, 0, 'NONE') ,('2022-06-27', '1401-04-06', '1443-11-27', '2022-06-27', 6, 27, 4, 11, 'monday   ', 2, 0, 'NONE') ,('2022-06-28', '1401-04-07', '1443-11-28', '2022-06-28', 7, 28, 4, 11, 'tuesday  ', 3, 0, 'NONE') ,('2022-06-29', '1401-04-08', '1443-11-29', '2022-06-29', 8, 29, 4, 11, 'wednesday', 4, 0, 'NONE') ,('2022-06-30', '1401-04-09', '1443-11-30', '2022-06-30', 9, 30, 4, 11, 'thursday ', 5, 0, 'NONE') ,('2022-07-01', '1401-04-10', '1443-12-01', '2022-07-01', 10, 1, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2022-07-02', '1401-04-11', '1443-12-02', '2022-07-02', 11, 2, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2022-07-03', '1401-04-12', '1443-12-03', '2022-07-03', 12, 3, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2022-07-04', '1401-04-13', '1443-12-04', '2022-07-04', 13, 4, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2022-07-05', '1401-04-14', '1443-12-05', '2022-07-05', 14, 5, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2022-07-06', '1401-04-15', '1443-12-06', '2022-07-06', 15, 6, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2022-07-07', '1401-04-16', '1443-12-07', '2022-07-07', 16, 7, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2022-07-08', '1401-04-17', '1443-12-08', '2022-07-08', 17, 8, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2022-07-09', '1401-04-18', '1443-12-09', '2022-07-09', 18, 9, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2022-07-10', '1401-04-19', '1443-12-10', '2022-07-10', 19, 10, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2022-07-11', '1401-04-20', '1443-12-11', '2022-07-11', 20, 11, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2022-07-12', '1401-04-21', '1443-12-12', '2022-07-12', 21, 12, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2022-07-13', '1401-04-22', '1443-12-13', '2022-07-13', 22, 13, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2022-07-14', '1401-04-23', '1443-12-14', '2022-07-14', 23, 14, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2022-07-15', '1401-04-24', '1443-12-15', '2022-07-15', 24, 15, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2022-07-16', '1401-04-25', '1443-12-16', '2022-07-16', 25, 16, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2022-07-17', '1401-04-26', '1443-12-17', '2022-07-17', 26, 17, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2022-07-18', '1401-04-27', '1443-12-18', '2022-07-18', 27, 18, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2022-07-19', '1401-04-28', '1443-12-19', '2022-07-19', 28, 19, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2022-07-20', '1401-04-29', '1443-12-20', '2022-07-20', 29, 20, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2022-07-21', '1401-04-30', '1443-12-21', '2022-07-21', 30, 21, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2022-07-22', '1401-04-31', '1443-12-22', '2022-07-22', 31, 22, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2022-07-23', '1401-05-01', '1443-12-23', '2022-07-23', 1, 23, 5, 12, 'saturday ', 7, 0, 'NONE') ,('2022-07-24', '1401-05-02', '1443-12-24', '2022-07-24', 2, 24, 5, 12, 'sunday   ', 1, 0, 'NONE') ,('2022-07-25', '1401-05-03', '1443-12-25', '2022-07-25', 3, 25, 5, 12, 'monday   ', 2, 0, 'NONE') ,('2022-07-26', '1401-05-04', '1443-12-26', '2022-07-26', 4, 26, 5, 12, 'tuesday  ', 3, 0, 'NONE') ,('2022-07-27', '1401-05-05', '1443-12-27', '2022-07-27', 5, 27, 5, 12, 'wednesday', 4, 0, 'NONE') ,('2022-07-28', '1401-05-06', '1443-12-28', '2022-07-28', 6, 28, 5, 12, 'thursday ', 5, 0, 'NONE') ,('2022-07-29', '1401-05-07', '1443-12-29', '2022-07-29', 7, 29, 5, 12, 'friday   ', 6, 0, 'NONE') ,('2022-07-30', '1401-05-08', '1444-01-01', '2022-07-30', 8, 1, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2022-07-31', '1401-05-09', '1444-01-02', '2022-07-31', 9, 2, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2022-08-01', '1401-05-10', '1444-01-03', '2022-08-01', 10, 3, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2022-08-02', '1401-05-11', '1444-01-04', '2022-08-02', 11, 4, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2022-08-03', '1401-05-12', '1444-01-05', '2022-08-03', 12, 5, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2022-08-04', '1401-05-13', '1444-01-06', '2022-08-04', 13, 6, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2022-08-05', '1401-05-14', '1444-01-07', '2022-08-05', 14, 7, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2022-08-06', '1401-05-15', '1444-01-08', '2022-08-06', 15, 8, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2022-08-07', '1401-05-16', '1444-01-09', '2022-08-07', 16, 9, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2022-08-08', '1401-05-17', '1444-01-10', '2022-08-08', 17, 10, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2022-08-09', '1401-05-18', '1444-01-11', '2022-08-09', 18, 11, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2022-08-10', '1401-05-19', '1444-01-12', '2022-08-10', 19, 12, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2022-08-11', '1401-05-20', '1444-01-13', '2022-08-11', 20, 13, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2022-08-12', '1401-05-21', '1444-01-14', '2022-08-12', 21, 14, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2022-08-13', '1401-05-22', '1444-01-15', '2022-08-13', 22, 15, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2022-08-14', '1401-05-23', '1444-01-16', '2022-08-14', 23, 16, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2022-08-15', '1401-05-24', '1444-01-17', '2022-08-15', 24, 17, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2022-08-16', '1401-05-25', '1444-01-18', '2022-08-16', 25, 18, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2022-08-17', '1401-05-26', '1444-01-19', '2022-08-17', 26, 19, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2022-08-18', '1401-05-27', '1444-01-20', '2022-08-18', 27, 20, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2022-08-19', '1401-05-28', '1444-01-21', '2022-08-19', 28, 21, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2022-08-20', '1401-05-29', '1444-01-22', '2022-08-20', 29, 22, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2022-08-21', '1401-05-30', '1444-01-23', '2022-08-21', 30, 23, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2022-08-22', '1401-05-31', '1444-01-24', '2022-08-22', 31, 24, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2022-08-23', '1401-06-01', '1444-01-25', '2022-08-23', 1, 25, 6, 1, 'tuesday  ', 3, 0, 'NONE') ,('2022-08-24', '1401-06-02', '1444-01-26', '2022-08-24', 2, 26, 6, 1, 'wednesday', 4, 0, 'NONE') ,('2022-08-25', '1401-06-03', '1444-01-27', '2022-08-25', 3, 27, 6, 1, 'thursday ', 5, 0, 'NONE') ,('2022-08-26', '1401-06-04', '1444-01-28', '2022-08-26', 4, 28, 6, 1, 'friday   ', 6, 0, 'NONE') ,('2022-08-27', '1401-06-05', '1444-01-29', '2022-08-27', 5, 29, 6, 1, 'saturday ', 7, 0, 'NONE') ,('2022-08-28', '1401-06-06', '1444-01-30', '2022-08-28', 6, 30, 6, 1, 'sunday   ', 1, 0, 'NONE') ,('2022-08-29', '1401-06-07', '1444-02-01', '2022-08-29', 7, 1, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2022-08-30', '1401-06-08', '1444-02-02', '2022-08-30', 8, 2, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2022-08-31', '1401-06-09', '1444-02-03', '2022-08-31', 9, 3, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2022-09-01', '1401-06-10', '1444-02-04', '2022-09-01', 10, 4, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2022-09-02', '1401-06-11', '1444-02-05', '2022-09-02', 11, 5, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2022-09-03', '1401-06-12', '1444-02-06', '2022-09-03', 12, 6, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2022-09-04', '1401-06-13', '1444-02-07', '2022-09-04', 13, 7, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2022-09-05', '1401-06-14', '1444-02-08', '2022-09-05', 14, 8, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2022-09-06', '1401-06-15', '1444-02-09', '2022-09-06', 15, 9, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2022-09-07', '1401-06-16', '1444-02-10', '2022-09-07', 16, 10, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2022-09-08', '1401-06-17', '1444-02-11', '2022-09-08', 17, 11, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2022-09-09', '1401-06-18', '1444-02-12', '2022-09-09', 18, 12, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2022-09-10', '1401-06-19', '1444-02-13', '2022-09-10', 19, 13, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2022-09-11', '1401-06-20', '1444-02-14', '2022-09-11', 20, 14, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2022-09-12', '1401-06-21', '1444-02-15', '2022-09-12', 21, 15, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2022-09-13', '1401-06-22', '1444-02-16', '2022-09-13', 22, 16, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2022-09-14', '1401-06-23', '1444-02-17', '2022-09-14', 23, 17, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2022-09-15', '1401-06-24', '1444-02-18', '2022-09-15', 24, 18, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2022-09-16', '1401-06-25', '1444-02-19', '2022-09-16', 25, 19, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2022-09-17', '1401-06-26', '1444-02-20', '2022-09-17', 26, 20, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2022-09-18', '1401-06-27', '1444-02-21', '2022-09-18', 27, 21, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2022-09-19', '1401-06-28', '1444-02-22', '2022-09-19', 28, 22, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2022-09-20', '1401-06-29', '1444-02-23', '2022-09-20', 29, 23, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2022-09-21', '1401-06-30', '1444-02-24', '2022-09-21', 30, 24, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2022-09-22', '1401-06-31', '1444-02-25', '2022-09-22', 31, 25, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2022-09-23', '1401-07-01', '1444-02-26', '2022-09-23', 1, 26, 7, 2, 'friday   ', 6, 0, 'NONE') ,('2022-09-24', '1401-07-02', '1444-02-27', '2022-09-24', 2, 27, 7, 2, 'saturday ', 7, 0, 'NONE') ,('2022-09-25', '1401-07-03', '1444-02-28', '2022-09-25', 3, 28, 7, 2, 'sunday   ', 1, 0, 'NONE') ,('2022-09-26', '1401-07-04', '1444-02-29', '2022-09-26', 4, 29, 7, 2, 'monday   ', 2, 0, 'NONE') ,('2022-09-27', '1401-07-05', '1444-03-01', '2022-09-27', 5, 1, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2022-09-28', '1401-07-06', '1444-03-02', '2022-09-28', 6, 2, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2022-09-29', '1401-07-07', '1444-03-03', '2022-09-29', 7, 3, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2022-09-30', '1401-07-08', '1444-03-04', '2022-09-30', 8, 4, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2022-10-01', '1401-07-09', '1444-03-05', '2022-10-01', 9, 5, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2022-10-02', '1401-07-10', '1444-03-06', '2022-10-02', 10, 6, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2022-10-03', '1401-07-11', '1444-03-07', '2022-10-03', 11, 7, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2022-10-04', '1401-07-12', '1444-03-08', '2022-10-04', 12, 8, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2022-10-05', '1401-07-13', '1444-03-09', '2022-10-05', 13, 9, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2022-10-06', '1401-07-14', '1444-03-10', '2022-10-06', 14, 10, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2022-10-07', '1401-07-15', '1444-03-11', '2022-10-07', 15, 11, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2022-10-08', '1401-07-16', '1444-03-12', '2022-10-08', 16, 12, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2022-10-09', '1401-07-17', '1444-03-13', '2022-10-09', 17, 13, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2022-10-10', '1401-07-18', '1444-03-14', '2022-10-10', 18, 14, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2022-10-11', '1401-07-19', '1444-03-15', '2022-10-11', 19, 15, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2022-10-12', '1401-07-20', '1444-03-16', '2022-10-12', 20, 16, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2022-10-13', '1401-07-21', '1444-03-17', '2022-10-13', 21, 17, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2022-10-14', '1401-07-22', '1444-03-18', '2022-10-14', 22, 18, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2022-10-15', '1401-07-23', '1444-03-19', '2022-10-15', 23, 19, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2022-10-16', '1401-07-24', '1444-03-20', '2022-10-16', 24, 20, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2022-10-17', '1401-07-25', '1444-03-21', '2022-10-17', 25, 21, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2022-10-18', '1401-07-26', '1444-03-22', '2022-10-18', 26, 22, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2022-10-19', '1401-07-27', '1444-03-23', '2022-10-19', 27, 23, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2022-10-20', '1401-07-28', '1444-03-24', '2022-10-20', 28, 24, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2022-10-21', '1401-07-29', '1444-03-25', '2022-10-21', 29, 25, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2022-10-22', '1401-07-30', '1444-03-26', '2022-10-22', 30, 26, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2022-10-23', '1401-08-01', '1444-03-27', '2022-10-23', 1, 27, 8, 3, 'sunday   ', 1, 0, 'NONE') ,('2022-10-24', '1401-08-02', '1444-03-28', '2022-10-24', 2, 28, 8, 3, 'monday   ', 2, 0, 'NONE') ,('2022-10-25', '1401-08-03', '1444-03-29', '2022-10-25', 3, 29, 8, 3, 'tuesday  ', 3, 0, 'NONE') ,('2022-10-26', '1401-08-04', '1444-03-30', '2022-10-26', 4, 30, 8, 3, 'wednesday', 4, 0, 'NONE') ,('2022-10-27', '1401-08-05', '1444-04-01', '2022-10-27', 5, 1, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2022-10-28', '1401-08-06', '1444-04-02', '2022-10-28', 6, 2, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2022-10-29', '1401-08-07', '1444-04-03', '2022-10-29', 7, 3, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2022-10-30', '1401-08-08', '1444-04-04', '2022-10-30', 8, 4, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2022-10-31', '1401-08-09', '1444-04-05', '2022-10-31', 9, 5, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2022-11-01', '1401-08-10', '1444-04-06', '2022-11-01', 10, 6, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2022-11-02', '1401-08-11', '1444-04-07', '2022-11-02', 11, 7, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2022-11-03', '1401-08-12', '1444-04-08', '2022-11-03', 12, 8, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2022-11-04', '1401-08-13', '1444-04-09', '2022-11-04', 13, 9, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2022-11-05', '1401-08-14', '1444-04-10', '2022-11-05', 14, 10, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2022-11-06', '1401-08-15', '1444-04-11', '2022-11-06', 15, 11, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2022-11-07', '1401-08-16', '1444-04-12', '2022-11-07', 16, 12, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2022-11-08', '1401-08-17', '1444-04-13', '2022-11-08', 17, 13, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2022-11-09', '1401-08-18', '1444-04-14', '2022-11-09', 18, 14, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2022-11-10', '1401-08-19', '1444-04-15', '2022-11-10', 19, 15, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2022-11-11', '1401-08-20', '1444-04-16', '2022-11-11', 20, 16, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2022-11-12', '1401-08-21', '1444-04-17', '2022-11-12', 21, 17, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2022-11-13', '1401-08-22', '1444-04-18', '2022-11-13', 22, 18, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2022-11-14', '1401-08-23', '1444-04-19', '2022-11-14', 23, 19, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2022-11-15', '1401-08-24', '1444-04-20', '2022-11-15', 24, 20, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2022-11-16', '1401-08-25', '1444-04-21', '2022-11-16', 25, 21, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2022-11-17', '1401-08-26', '1444-04-22', '2022-11-17', 26, 22, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2022-11-18', '1401-08-27', '1444-04-23', '2022-11-18', 27, 23, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2022-11-19', '1401-08-28', '1444-04-24', '2022-11-19', 28, 24, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2022-11-20', '1401-08-29', '1444-04-25', '2022-11-20', 29, 25, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2022-11-21', '1401-08-30', '1444-04-26', '2022-11-21', 30, 26, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2022-11-22', '1401-09-01', '1444-04-27', '2022-11-22', 1, 27, 9, 4, 'tuesday  ', 3, 0, 'NONE') ,('2022-11-23', '1401-09-02', '1444-04-28', '2022-11-23', 2, 28, 9, 4, 'wednesday', 4, 0, 'NONE') ,('2022-11-24', '1401-09-03', '1444-04-29', '2022-11-24', 3, 29, 9, 4, 'thursday ', 5, 0, 'NONE') ,('2022-11-25', '1401-09-04', '1444-05-01', '2022-11-25', 4, 1, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2022-11-26', '1401-09-05', '1444-05-02', '2022-11-26', 5, 2, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2022-11-27', '1401-09-06', '1444-05-03', '2022-11-27', 6, 3, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2022-11-28', '1401-09-07', '1444-05-04', '2022-11-28', 7, 4, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2022-11-29', '1401-09-08', '1444-05-05', '2022-11-29', 8, 5, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2022-11-30', '1401-09-09', '1444-05-06', '2022-11-30', 9, 6, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2022-12-01', '1401-09-10', '1444-05-07', '2022-12-01', 10, 7, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2022-12-02', '1401-09-11', '1444-05-08', '2022-12-02', 11, 8, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2022-12-03', '1401-09-12', '1444-05-09', '2022-12-03', 12, 9, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2022-12-04', '1401-09-13', '1444-05-10', '2022-12-04', 13, 10, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2022-12-05', '1401-09-14', '1444-05-11', '2022-12-05', 14, 11, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2022-12-06', '1401-09-15', '1444-05-12', '2022-12-06', 15, 12, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2022-12-07', '1401-09-16', '1444-05-13', '2022-12-07', 16, 13, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2022-12-08', '1401-09-17', '1444-05-14', '2022-12-08', 17, 14, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2022-12-09', '1401-09-18', '1444-05-15', '2022-12-09', 18, 15, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2022-12-10', '1401-09-19', '1444-05-16', '2022-12-10', 19, 16, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2022-12-11', '1401-09-20', '1444-05-17', '2022-12-11', 20, 17, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2022-12-12', '1401-09-21', '1444-05-18', '2022-12-12', 21, 18, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2022-12-13', '1401-09-22', '1444-05-19', '2022-12-13', 22, 19, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2022-12-14', '1401-09-23', '1444-05-20', '2022-12-14', 23, 20, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2022-12-15', '1401-09-24', '1444-05-21', '2022-12-15', 24, 21, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2022-12-16', '1401-09-25', '1444-05-22', '2022-12-16', 25, 22, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2022-12-17', '1401-09-26', '1444-05-23', '2022-12-17', 26, 23, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2022-12-18', '1401-09-27', '1444-05-24', '2022-12-18', 27, 24, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2022-12-19', '1401-09-28', '1444-05-25', '2022-12-19', 28, 25, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2022-12-20', '1401-09-29', '1444-05-26', '2022-12-20', 29, 26, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2022-12-21', '1401-09-30', '1444-05-27', '2022-12-21', 30, 27, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2022-12-22', '1401-10-01', '1444-05-28', '2022-12-22', 1, 28, 10, 5, 'thursday ', 5, 0, 'NONE') ,('2022-12-23', '1401-10-02', '1444-05-29', '2022-12-23', 2, 29, 10, 5, 'friday   ', 6, 0, 'NONE') ,('2022-12-24', '1401-10-03', '1444-05-30', '2022-12-24', 3, 30, 10, 5, 'saturday ', 7, 0, 'NONE') ,('2022-12-25', '1401-10-04', '1444-06-01', '2022-12-25', 4, 1, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2022-12-26', '1401-10-05', '1444-06-02', '2022-12-26', 5, 2, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2022-12-27', '1401-10-06', '1444-06-03', '2022-12-27', 6, 3, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2022-12-28', '1401-10-07', '1444-06-04', '2022-12-28', 7, 4, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2022-12-29', '1401-10-08', '1444-06-05', '2022-12-29', 8, 5, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2022-12-30', '1401-10-09', '1444-06-06', '2022-12-30', 9, 6, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2022-12-31', '1401-10-10', '1444-06-07', '2022-12-31', 10, 7, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2023-01-01', '1401-10-11', '1444-06-08', '2023-01-01', 11, 8, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2023-01-02', '1401-10-12', '1444-06-09', '2023-01-02', 12, 9, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2023-01-03', '1401-10-13', '1444-06-10', '2023-01-03', 13, 10, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2023-01-04', '1401-10-14', '1444-06-11', '2023-01-04', 14, 11, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2023-01-05', '1401-10-15', '1444-06-12', '2023-01-05', 15, 12, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2023-01-06', '1401-10-16', '1444-06-13', '2023-01-06', 16, 13, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2023-01-07', '1401-10-17', '1444-06-14', '2023-01-07', 17, 14, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2023-01-08', '1401-10-18', '1444-06-15', '2023-01-08', 18, 15, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2023-01-09', '1401-10-19', '1444-06-16', '2023-01-09', 19, 16, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2023-01-10', '1401-10-20', '1444-06-17', '2023-01-10', 20, 17, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2023-01-11', '1401-10-21', '1444-06-18', '2023-01-11', 21, 18, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2023-01-12', '1401-10-22', '1444-06-19', '2023-01-12', 22, 19, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2023-01-13', '1401-10-23', '1444-06-20', '2023-01-13', 23, 20, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2023-01-14', '1401-10-24', '1444-06-21', '2023-01-14', 24, 21, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2023-01-15', '1401-10-25', '1444-06-22', '2023-01-15', 25, 22, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2023-01-16', '1401-10-26', '1444-06-23', '2023-01-16', 26, 23, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2023-01-17', '1401-10-27', '1444-06-24', '2023-01-17', 27, 24, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2023-01-18', '1401-10-28', '1444-06-25', '2023-01-18', 28, 25, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2023-01-19', '1401-10-29', '1444-06-26', '2023-01-19', 29, 26, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2023-01-20', '1401-10-30', '1444-06-27', '2023-01-20', 30, 27, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2023-01-21', '1401-11-01', '1444-06-28', '2023-01-21', 1, 28, 11, 6, 'saturday ', 7, 0, 'NONE') ,('2023-01-22', '1401-11-02', '1444-06-29', '2023-01-22', 2, 29, 11, 6, 'sunday   ', 1, 0, 'NONE') ,('2023-01-23', '1401-11-03', '1444-07-01', '2023-01-23', 3, 1, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2023-01-24', '1401-11-04', '1444-07-02', '2023-01-24', 4, 2, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2023-01-25', '1401-11-05', '1444-07-03', '2023-01-25', 5, 3, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2023-01-26', '1401-11-06', '1444-07-04', '2023-01-26', 6, 4, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2023-01-27', '1401-11-07', '1444-07-05', '2023-01-27', 7, 5, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2023-01-28', '1401-11-08', '1444-07-06', '2023-01-28', 8, 6, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2023-01-29', '1401-11-09', '1444-07-07', '2023-01-29', 9, 7, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2023-01-30', '1401-11-10', '1444-07-08', '2023-01-30', 10, 8, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2023-01-31', '1401-11-11', '1444-07-09', '2023-01-31', 11, 9, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2023-02-01', '1401-11-12', '1444-07-10', '2023-02-01', 12, 10, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2023-02-02', '1401-11-13', '1444-07-11', '2023-02-02', 13, 11, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2023-02-03', '1401-11-14', '1444-07-12', '2023-02-03', 14, 12, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2023-02-04', '1401-11-15', '1444-07-13', '2023-02-04', 15, 13, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2023-02-05', '1401-11-16', '1444-07-14', '2023-02-05', 16, 14, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2023-02-06', '1401-11-17', '1444-07-15', '2023-02-06', 17, 15, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2023-02-07', '1401-11-18', '1444-07-16', '2023-02-07', 18, 16, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2023-02-08', '1401-11-19', '1444-07-17', '2023-02-08', 19, 17, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2023-02-09', '1401-11-20', '1444-07-18', '2023-02-09', 20, 18, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2023-02-10', '1401-11-21', '1444-07-19', '2023-02-10', 21, 19, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2023-02-11', '1401-11-22', '1444-07-20', '2023-02-11', 22, 20, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2023-02-12', '1401-11-23', '1444-07-21', '2023-02-12', 23, 21, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2023-02-13', '1401-11-24', '1444-07-22', '2023-02-13', 24, 22, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2023-02-14', '1401-11-25', '1444-07-23', '2023-02-14', 25, 23, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2023-02-15', '1401-11-26', '1444-07-24', '2023-02-15', 26, 24, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2023-02-16', '1401-11-27', '1444-07-25', '2023-02-16', 27, 25, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2023-02-17', '1401-11-28', '1444-07-26', '2023-02-17', 28, 26, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2023-02-18', '1401-11-29', '1444-07-27', '2023-02-18', 29, 27, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2023-02-19', '1401-11-30', '1444-07-28', '2023-02-19', 30, 28, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2023-02-20', '1401-12-01', '1444-07-29', '2023-02-20', 1, 29, 12, 7, 'monday   ', 2, 0, 'NONE') ,('2023-02-21', '1401-12-02', '1444-07-30', '2023-02-21', 2, 30, 12, 7, 'tuesday  ', 3, 0, 'NONE') ,('2023-02-22', '1401-12-03', '1444-08-01', '2023-02-22', 3, 1, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2023-02-23', '1401-12-04', '1444-08-02', '2023-02-23', 4, 2, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2023-02-24', '1401-12-05', '1444-08-03', '2023-02-24', 5, 3, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2023-02-25', '1401-12-06', '1444-08-04', '2023-02-25', 6, 4, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2023-02-26', '1401-12-07', '1444-08-05', '2023-02-26', 7, 5, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2023-02-27', '1401-12-08', '1444-08-06', '2023-02-27', 8, 6, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2023-02-28', '1401-12-09', '1444-08-07', '2023-02-28', 9, 7, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2023-03-01', '1401-12-10', '1444-08-08', '2023-03-01', 10, 8, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2023-03-02', '1401-12-11', '1444-08-09', '2023-03-02', 11, 9, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2023-03-03', '1401-12-12', '1444-08-10', '2023-03-03', 12, 10, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2023-03-04', '1401-12-13', '1444-08-11', '2023-03-04', 13, 11, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2023-03-05', '1401-12-14', '1444-08-12', '2023-03-05', 14, 12, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2023-03-06', '1401-12-15', '1444-08-13', '2023-03-06', 15, 13, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2023-03-07', '1401-12-16', '1444-08-14', '2023-03-07', 16, 14, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2023-03-08', '1401-12-17', '1444-08-15', '2023-03-08', 17, 15, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2023-03-09', '1401-12-18', '1444-08-16', '2023-03-09', 18, 16, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2023-03-10', '1401-12-19', '1444-08-17', '2023-03-10', 19, 17, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2023-03-11', '1401-12-20', '1444-08-18', '2023-03-11', 20, 18, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2023-03-12', '1401-12-21', '1444-08-19', '2023-03-12', 21, 19, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2023-03-13', '1401-12-22', '1444-08-20', '2023-03-13', 22, 20, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2023-03-14', '1401-12-23', '1444-08-21', '2023-03-14', 23, 21, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2023-03-15', '1401-12-24', '1444-08-22', '2023-03-15', 24, 22, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2023-03-16', '1401-12-25', '1444-08-23', '2023-03-16', 25, 23, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2023-03-17', '1401-12-26', '1444-08-24', '2023-03-17', 26, 24, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2023-03-18', '1401-12-27', '1444-08-25', '2023-03-18', 27, 25, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2023-03-19', '1401-12-28', '1444-08-26', '2023-03-19', 28, 26, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2023-03-20', '1401-12-29', '1444-08-27', '2023-03-20', 29, 27, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2023-03-21', '1402-01-01', '1444-08-28', '2023-03-21', 1, 28, 1, 8, 'tuesday  ', 3, 0, 'NONE') ,('2023-03-22', '1402-01-02', '1444-08-29', '2023-03-22', 2, 29, 1, 8, 'wednesday', 4, 0, 'NONE') ,('2023-03-23', '1402-01-03', '1444-09-01', '2023-03-23', 3, 1, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2023-03-24', '1402-01-04', '1444-09-02', '2023-03-24', 4, 2, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2023-03-25', '1402-01-05', '1444-09-03', '2023-03-25', 5, 3, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2023-03-26', '1402-01-06', '1444-09-04', '2023-03-26', 6, 4, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2023-03-27', '1402-01-07', '1444-09-05', '2023-03-27', 7, 5, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2023-03-28', '1402-01-08', '1444-09-06', '2023-03-28', 8, 6, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2023-03-29', '1402-01-09', '1444-09-07', '2023-03-29', 9, 7, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2023-03-30', '1402-01-10', '1444-09-08', '2023-03-30', 10, 8, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2023-03-31', '1402-01-11', '1444-09-09', '2023-03-31', 11, 9, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2023-04-01', '1402-01-12', '1444-09-10', '2023-04-01', 12, 10, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2023-04-02', '1402-01-13', '1444-09-11', '2023-04-02', 13, 11, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2023-04-03', '1402-01-14', '1444-09-12', '2023-04-03', 14, 12, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2023-04-04', '1402-01-15', '1444-09-13', '2023-04-04', 15, 13, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2023-04-05', '1402-01-16', '1444-09-14', '2023-04-05', 16, 14, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2023-04-06', '1402-01-17', '1444-09-15', '2023-04-06', 17, 15, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2023-04-07', '1402-01-18', '1444-09-16', '2023-04-07', 18, 16, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2023-04-08', '1402-01-19', '1444-09-17', '2023-04-08', 19, 17, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2023-04-09', '1402-01-20', '1444-09-18', '2023-04-09', 20, 18, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2023-04-10', '1402-01-21', '1444-09-19', '2023-04-10', 21, 19, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2023-04-11', '1402-01-22', '1444-09-20', '2023-04-11', 22, 20, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2023-04-12', '1402-01-23', '1444-09-21', '2023-04-12', 23, 21, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2023-04-13', '1402-01-24', '1444-09-22', '2023-04-13', 24, 22, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2023-04-14', '1402-01-25', '1444-09-23', '2023-04-14', 25, 23, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2023-04-15', '1402-01-26', '1444-09-24', '2023-04-15', 26, 24, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2023-04-16', '1402-01-27', '1444-09-25', '2023-04-16', 27, 25, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2023-04-17', '1402-01-28', '1444-09-26', '2023-04-17', 28, 26, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2023-04-18', '1402-01-29', '1444-09-27', '2023-04-18', 29, 27, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2023-04-19', '1402-01-30', '1444-09-28', '2023-04-19', 30, 28, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2023-04-20', '1402-01-31', '1444-09-29', '2023-04-20', 31, 29, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2023-04-21', '1402-02-01', '1444-09-30', '2023-04-21', 1, 30, 2, 9, 'friday   ', 6, 0, 'NONE') ,('2023-04-22', '1402-02-02', '1444-10-01', '2023-04-22', 2, 1, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2023-04-23', '1402-02-03', '1444-10-02', '2023-04-23', 3, 2, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2023-04-24', '1402-02-04', '1444-10-03', '2023-04-24', 4, 3, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2023-04-25', '1402-02-05', '1444-10-04', '2023-04-25', 5, 4, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2023-04-26', '1402-02-06', '1444-10-05', '2023-04-26', 6, 5, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2023-04-27', '1402-02-07', '1444-10-06', '2023-04-27', 7, 6, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2023-04-28', '1402-02-08', '1444-10-07', '2023-04-28', 8, 7, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2023-04-29', '1402-02-09', '1444-10-08', '2023-04-29', 9, 8, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2023-04-30', '1402-02-10', '1444-10-09', '2023-04-30', 10, 9, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2023-05-01', '1402-02-11', '1444-10-10', '2023-05-01', 11, 10, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2023-05-02', '1402-02-12', '1444-10-11', '2023-05-02', 12, 11, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2023-05-03', '1402-02-13', '1444-10-12', '2023-05-03', 13, 12, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2023-05-04', '1402-02-14', '1444-10-13', '2023-05-04', 14, 13, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2023-05-05', '1402-02-15', '1444-10-14', '2023-05-05', 15, 14, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2023-05-06', '1402-02-16', '1444-10-15', '2023-05-06', 16, 15, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2023-05-07', '1402-02-17', '1444-10-16', '2023-05-07', 17, 16, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2023-05-08', '1402-02-18', '1444-10-17', '2023-05-08', 18, 17, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2023-05-09', '1402-02-19', '1444-10-18', '2023-05-09', 19, 18, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2023-05-10', '1402-02-20', '1444-10-19', '2023-05-10', 20, 19, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2023-05-11', '1402-02-21', '1444-10-20', '2023-05-11', 21, 20, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2023-05-12', '1402-02-22', '1444-10-21', '2023-05-12', 22, 21, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2023-05-13', '1402-02-23', '1444-10-22', '2023-05-13', 23, 22, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2023-05-14', '1402-02-24', '1444-10-23', '2023-05-14', 24, 23, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2023-05-15', '1402-02-25', '1444-10-24', '2023-05-15', 25, 24, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2023-05-16', '1402-02-26', '1444-10-25', '2023-05-16', 26, 25, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2023-05-17', '1402-02-27', '1444-10-26', '2023-05-17', 27, 26, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2023-05-18', '1402-02-28', '1444-10-27', '2023-05-18', 28, 27, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2023-05-19', '1402-02-29', '1444-10-28', '2023-05-19', 29, 28, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2023-05-20', '1402-02-30', '1444-10-29', '2023-05-20', 30, 29, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2023-05-21', '1402-02-31', '1444-11-01', '2023-05-21', 31, 1, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2023-05-22', '1402-03-01', '1444-11-02', '2023-05-22', 1, 2, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2023-05-23', '1402-03-02', '1444-11-03', '2023-05-23', 2, 3, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2023-05-24', '1402-03-03', '1444-11-04', '2023-05-24', 3, 4, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2023-05-25', '1402-03-04', '1444-11-05', '2023-05-25', 4, 5, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2023-05-26', '1402-03-05', '1444-11-06', '2023-05-26', 5, 6, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2023-05-27', '1402-03-06', '1444-11-07', '2023-05-27', 6, 7, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2023-05-28', '1402-03-07', '1444-11-08', '2023-05-28', 7, 8, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2023-05-29', '1402-03-08', '1444-11-09', '2023-05-29', 8, 9, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2023-05-30', '1402-03-09', '1444-11-10', '2023-05-30', 9, 10, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2023-05-31', '1402-03-10', '1444-11-11', '2023-05-31', 10, 11, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2023-06-01', '1402-03-11', '1444-11-12', '2023-06-01', 11, 12, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2023-06-02', '1402-03-12', '1444-11-13', '2023-06-02', 12, 13, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2023-06-03', '1402-03-13', '1444-11-14', '2023-06-03', 13, 14, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2023-06-04', '1402-03-14', '1444-11-15', '2023-06-04', 14, 15, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2023-06-05', '1402-03-15', '1444-11-16', '2023-06-05', 15, 16, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2023-06-06', '1402-03-16', '1444-11-17', '2023-06-06', 16, 17, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2023-06-07', '1402-03-17', '1444-11-18', '2023-06-07', 17, 18, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2023-06-08', '1402-03-18', '1444-11-19', '2023-06-08', 18, 19, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2023-06-09', '1402-03-19', '1444-11-20', '2023-06-09', 19, 20, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2023-06-10', '1402-03-20', '1444-11-21', '2023-06-10', 20, 21, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2023-06-11', '1402-03-21', '1444-11-22', '2023-06-11', 21, 22, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2023-06-12', '1402-03-22', '1444-11-23', '2023-06-12', 22, 23, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2023-06-13', '1402-03-23', '1444-11-24', '2023-06-13', 23, 24, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2023-06-14', '1402-03-24', '1444-11-25', '2023-06-14', 24, 25, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2023-06-15', '1402-03-25', '1444-11-26', '2023-06-15', 25, 26, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2023-06-16', '1402-03-26', '1444-11-27', '2023-06-16', 26, 27, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2023-06-17', '1402-03-27', '1444-11-28', '2023-06-17', 27, 28, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2023-06-18', '1402-03-28', '1444-11-29', '2023-06-18', 28, 29, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2023-06-19', '1402-03-29', '1444-11-30', '2023-06-19', 29, 30, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2023-06-20', '1402-03-30', '1444-12-01', '2023-06-20', 30, 1, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2023-06-21', '1402-03-31', '1444-12-02', '2023-06-21', 31, 2, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2023-06-22', '1402-04-01', '1444-12-03', '2023-06-22', 1, 3, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2023-06-23', '1402-04-02', '1444-12-04', '2023-06-23', 2, 4, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2023-06-24', '1402-04-03', '1444-12-05', '2023-06-24', 3, 5, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2023-06-25', '1402-04-04', '1444-12-06', '2023-06-25', 4, 6, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2023-06-26', '1402-04-05', '1444-12-07', '2023-06-26', 5, 7, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2023-06-27', '1402-04-06', '1444-12-08', '2023-06-27', 6, 8, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2023-06-28', '1402-04-07', '1444-12-09', '2023-06-28', 7, 9, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2023-06-29', '1402-04-08', '1444-12-10', '2023-06-29', 8, 10, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2023-06-30', '1402-04-09', '1444-12-11', '2023-06-30', 9, 11, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2023-07-01', '1402-04-10', '1444-12-12', '2023-07-01', 10, 12, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2023-07-02', '1402-04-11', '1444-12-13', '2023-07-02', 11, 13, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2023-07-03', '1402-04-12', '1444-12-14', '2023-07-03', 12, 14, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2023-07-04', '1402-04-13', '1444-12-15', '2023-07-04', 13, 15, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2023-07-05', '1402-04-14', '1444-12-16', '2023-07-05', 14, 16, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2023-07-06', '1402-04-15', '1444-12-17', '2023-07-06', 15, 17, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2023-07-07', '1402-04-16', '1444-12-18', '2023-07-07', 16, 18, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2023-07-08', '1402-04-17', '1444-12-19', '2023-07-08', 17, 19, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2023-07-09', '1402-04-18', '1444-12-20', '2023-07-09', 18, 20, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2023-07-10', '1402-04-19', '1444-12-21', '2023-07-10', 19, 21, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2023-07-11', '1402-04-20', '1444-12-22', '2023-07-11', 20, 22, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2023-07-12', '1402-04-21', '1444-12-23', '2023-07-12', 21, 23, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2023-07-13', '1402-04-22', '1444-12-24', '2023-07-13', 22, 24, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2023-07-14', '1402-04-23', '1444-12-25', '2023-07-14', 23, 25, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2023-07-15', '1402-04-24', '1444-12-26', '2023-07-15', 24, 26, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2023-07-16', '1402-04-25', '1444-12-27', '2023-07-16', 25, 27, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2023-07-17', '1402-04-26', '1444-12-28', '2023-07-17', 26, 28, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2023-07-18', '1402-04-27', '1444-12-29', '2023-07-18', 27, 29, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2023-07-19', '1402-04-28', '1445-01-01', '2023-07-19', 28, 1, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2023-07-20', '1402-04-29', '1445-01-02', '2023-07-20', 29, 2, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2023-07-21', '1402-04-30', '1445-01-03', '2023-07-21', 30, 3, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2023-07-22', '1402-04-31', '1445-01-04', '2023-07-22', 31, 4, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2023-07-23', '1402-05-01', '1445-01-05', '2023-07-23', 1, 5, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2023-07-24', '1402-05-02', '1445-01-06', '2023-07-24', 2, 6, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2023-07-25', '1402-05-03', '1445-01-07', '2023-07-25', 3, 7, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2023-07-26', '1402-05-04', '1445-01-08', '2023-07-26', 4, 8, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2023-07-27', '1402-05-05', '1445-01-09', '2023-07-27', 5, 9, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2023-07-28', '1402-05-06', '1445-01-10', '2023-07-28', 6, 10, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2023-07-29', '1402-05-07', '1445-01-11', '2023-07-29', 7, 11, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2023-07-30', '1402-05-08', '1445-01-12', '2023-07-30', 8, 12, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2023-07-31', '1402-05-09', '1445-01-13', '2023-07-31', 9, 13, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2023-08-01', '1402-05-10', '1445-01-14', '2023-08-01', 10, 14, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2023-08-02', '1402-05-11', '1445-01-15', '2023-08-02', 11, 15, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2023-08-03', '1402-05-12', '1445-01-16', '2023-08-03', 12, 16, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2023-08-04', '1402-05-13', '1445-01-17', '2023-08-04', 13, 17, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2023-08-05', '1402-05-14', '1445-01-18', '2023-08-05', 14, 18, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2023-08-06', '1402-05-15', '1445-01-19', '2023-08-06', 15, 19, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2023-08-07', '1402-05-16', '1445-01-20', '2023-08-07', 16, 20, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2023-08-08', '1402-05-17', '1445-01-21', '2023-08-08', 17, 21, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2023-08-09', '1402-05-18', '1445-01-22', '2023-08-09', 18, 22, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2023-08-10', '1402-05-19', '1445-01-23', '2023-08-10', 19, 23, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2023-08-11', '1402-05-20', '1445-01-24', '2023-08-11', 20, 24, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2023-08-12', '1402-05-21', '1445-01-25', '2023-08-12', 21, 25, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2023-08-13', '1402-05-22', '1445-01-26', '2023-08-13', 22, 26, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2023-08-14', '1402-05-23', '1445-01-27', '2023-08-14', 23, 27, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2023-08-15', '1402-05-24', '1445-01-28', '2023-08-15', 24, 28, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2023-08-16', '1402-05-25', '1445-01-29', '2023-08-16', 25, 29, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2023-08-17', '1402-05-26', '1445-01-30', '2023-08-17', 26, 30, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2023-08-18', '1402-05-27', '1445-02-01', '2023-08-18', 27, 1, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2023-08-19', '1402-05-28', '1445-02-02', '2023-08-19', 28, 2, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2023-08-20', '1402-05-29', '1445-02-03', '2023-08-20', 29, 3, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2023-08-21', '1402-05-30', '1445-02-04', '2023-08-21', 30, 4, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2023-08-22', '1402-05-31', '1445-02-05', '2023-08-22', 31, 5, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2023-08-23', '1402-06-01', '1445-02-06', '2023-08-23', 1, 6, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2023-08-24', '1402-06-02', '1445-02-07', '2023-08-24', 2, 7, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2023-08-25', '1402-06-03', '1445-02-08', '2023-08-25', 3, 8, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2023-08-26', '1402-06-04', '1445-02-09', '2023-08-26', 4, 9, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2023-08-27', '1402-06-05', '1445-02-10', '2023-08-27', 5, 10, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2023-08-28', '1402-06-06', '1445-02-11', '2023-08-28', 6, 11, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2023-08-29', '1402-06-07', '1445-02-12', '2023-08-29', 7, 12, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2023-08-30', '1402-06-08', '1445-02-13', '2023-08-30', 8, 13, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2023-08-31', '1402-06-09', '1445-02-14', '2023-08-31', 9, 14, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2023-09-01', '1402-06-10', '1445-02-15', '2023-09-01', 10, 15, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2023-09-02', '1402-06-11', '1445-02-16', '2023-09-02', 11, 16, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2023-09-03', '1402-06-12', '1445-02-17', '2023-09-03', 12, 17, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2023-09-04', '1402-06-13', '1445-02-18', '2023-09-04', 13, 18, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2023-09-05', '1402-06-14', '1445-02-19', '2023-09-05', 14, 19, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2023-09-06', '1402-06-15', '1445-02-20', '2023-09-06', 15, 20, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2023-09-07', '1402-06-16', '1445-02-21', '2023-09-07', 16, 21, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2023-09-08', '1402-06-17', '1445-02-22', '2023-09-08', 17, 22, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2023-09-09', '1402-06-18', '1445-02-23', '2023-09-09', 18, 23, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2023-09-10', '1402-06-19', '1445-02-24', '2023-09-10', 19, 24, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2023-09-11', '1402-06-20', '1445-02-25', '2023-09-11', 20, 25, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2023-09-12', '1402-06-21', '1445-02-26', '2023-09-12', 21, 26, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2023-09-13', '1402-06-22', '1445-02-27', '2023-09-13', 22, 27, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2023-09-14', '1402-06-23', '1445-02-28', '2023-09-14', 23, 28, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2023-09-15', '1402-06-24', '1445-02-29', '2023-09-15', 24, 29, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2023-09-16', '1402-06-25', '1445-03-01', '2023-09-16', 25, 1, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2023-09-17', '1402-06-26', '1445-03-02', '2023-09-17', 26, 2, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2023-09-18', '1402-06-27', '1445-03-03', '2023-09-18', 27, 3, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2023-09-19', '1402-06-28', '1445-03-04', '2023-09-19', 28, 4, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2023-09-20', '1402-06-29', '1445-03-05', '2023-09-20', 29, 5, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2023-09-21', '1402-06-30', '1445-03-06', '2023-09-21', 30, 6, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2023-09-22', '1402-06-31', '1445-03-07', '2023-09-22', 31, 7, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2023-09-23', '1402-07-01', '1445-03-08', '2023-09-23', 1, 8, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2023-09-24', '1402-07-02', '1445-03-09', '2023-09-24', 2, 9, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2023-09-25', '1402-07-03', '1445-03-10', '2023-09-25', 3, 10, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2023-09-26', '1402-07-04', '1445-03-11', '2023-09-26', 4, 11, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2023-09-27', '1402-07-05', '1445-03-12', '2023-09-27', 5, 12, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2023-09-28', '1402-07-06', '1445-03-13', '2023-09-28', 6, 13, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2023-09-29', '1402-07-07', '1445-03-14', '2023-09-29', 7, 14, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2023-09-30', '1402-07-08', '1445-03-15', '2023-09-30', 8, 15, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2023-10-01', '1402-07-09', '1445-03-16', '2023-10-01', 9, 16, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2023-10-02', '1402-07-10', '1445-03-17', '2023-10-02', 10, 17, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2023-10-03', '1402-07-11', '1445-03-18', '2023-10-03', 11, 18, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2023-10-04', '1402-07-12', '1445-03-19', '2023-10-04', 12, 19, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2023-10-05', '1402-07-13', '1445-03-20', '2023-10-05', 13, 20, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2023-10-06', '1402-07-14', '1445-03-21', '2023-10-06', 14, 21, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2023-10-07', '1402-07-15', '1445-03-22', '2023-10-07', 15, 22, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2023-10-08', '1402-07-16', '1445-03-23', '2023-10-08', 16, 23, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2023-10-09', '1402-07-17', '1445-03-24', '2023-10-09', 17, 24, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2023-10-10', '1402-07-18', '1445-03-25', '2023-10-10', 18, 25, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2023-10-11', '1402-07-19', '1445-03-26', '2023-10-11', 19, 26, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2023-10-12', '1402-07-20', '1445-03-27', '2023-10-12', 20, 27, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2023-10-13', '1402-07-21', '1445-03-28', '2023-10-13', 21, 28, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2023-10-14', '1402-07-22', '1445-03-29', '2023-10-14', 22, 29, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2023-10-15', '1402-07-23', '1445-03-30', '2023-10-15', 23, 30, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2023-10-16', '1402-07-24', '1445-04-01', '2023-10-16', 24, 1, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2023-10-17', '1402-07-25', '1445-04-02', '2023-10-17', 25, 2, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2023-10-18', '1402-07-26', '1445-04-03', '2023-10-18', 26, 3, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2023-10-19', '1402-07-27', '1445-04-04', '2023-10-19', 27, 4, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2023-10-20', '1402-07-28', '1445-04-05', '2023-10-20', 28, 5, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2023-10-21', '1402-07-29', '1445-04-06', '2023-10-21', 29, 6, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2023-10-22', '1402-07-30', '1445-04-07', '2023-10-22', 30, 7, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2023-10-23', '1402-08-01', '1445-04-08', '2023-10-23', 1, 8, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2023-10-24', '1402-08-02', '1445-04-09', '2023-10-24', 2, 9, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2023-10-25', '1402-08-03', '1445-04-10', '2023-10-25', 3, 10, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2023-10-26', '1402-08-04', '1445-04-11', '2023-10-26', 4, 11, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2023-10-27', '1402-08-05', '1445-04-12', '2023-10-27', 5, 12, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2023-10-28', '1402-08-06', '1445-04-13', '2023-10-28', 6, 13, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2023-10-29', '1402-08-07', '1445-04-14', '2023-10-29', 7, 14, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2023-10-30', '1402-08-08', '1445-04-15', '2023-10-30', 8, 15, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2023-10-31', '1402-08-09', '1445-04-16', '2023-10-31', 9, 16, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2023-11-01', '1402-08-10', '1445-04-17', '2023-11-01', 10, 17, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2023-11-02', '1402-08-11', '1445-04-18', '2023-11-02', 11, 18, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2023-11-03', '1402-08-12', '1445-04-19', '2023-11-03', 12, 19, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2023-11-04', '1402-08-13', '1445-04-20', '2023-11-04', 13, 20, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2023-11-05', '1402-08-14', '1445-04-21', '2023-11-05', 14, 21, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2023-11-06', '1402-08-15', '1445-04-22', '2023-11-06', 15, 22, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2023-11-07', '1402-08-16', '1445-04-23', '2023-11-07', 16, 23, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2023-11-08', '1402-08-17', '1445-04-24', '2023-11-08', 17, 24, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2023-11-09', '1402-08-18', '1445-04-25', '2023-11-09', 18, 25, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2023-11-10', '1402-08-19', '1445-04-26', '2023-11-10', 19, 26, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2023-11-11', '1402-08-20', '1445-04-27', '2023-11-11', 20, 27, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2023-11-12', '1402-08-21', '1445-04-28', '2023-11-12', 21, 28, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2023-11-13', '1402-08-22', '1445-04-29', '2023-11-13', 22, 29, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2023-11-14', '1402-08-23', '1445-05-01', '2023-11-14', 23, 1, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2023-11-15', '1402-08-24', '1445-05-02', '2023-11-15', 24, 2, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2023-11-16', '1402-08-25', '1445-05-03', '2023-11-16', 25, 3, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2023-11-17', '1402-08-26', '1445-05-04', '2023-11-17', 26, 4, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2023-11-18', '1402-08-27', '1445-05-05', '2023-11-18', 27, 5, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2023-11-19', '1402-08-28', '1445-05-06', '2023-11-19', 28, 6, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2023-11-20', '1402-08-29', '1445-05-07', '2023-11-20', 29, 7, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2023-11-21', '1402-08-30', '1445-05-08', '2023-11-21', 30, 8, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2023-11-22', '1402-09-01', '1445-05-09', '2023-11-22', 1, 9, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2023-11-23', '1402-09-02', '1445-05-10', '2023-11-23', 2, 10, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2023-11-24', '1402-09-03', '1445-05-11', '2023-11-24', 3, 11, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2023-11-25', '1402-09-04', '1445-05-12', '2023-11-25', 4, 12, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2023-11-26', '1402-09-05', '1445-05-13', '2023-11-26', 5, 13, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2023-11-27', '1402-09-06', '1445-05-14', '2023-11-27', 6, 14, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2023-11-28', '1402-09-07', '1445-05-15', '2023-11-28', 7, 15, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2023-11-29', '1402-09-08', '1445-05-16', '2023-11-29', 8, 16, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2023-11-30', '1402-09-09', '1445-05-17', '2023-11-30', 9, 17, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2023-12-01', '1402-09-10', '1445-05-18', '2023-12-01', 10, 18, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2023-12-02', '1402-09-11', '1445-05-19', '2023-12-02', 11, 19, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2023-12-03', '1402-09-12', '1445-05-20', '2023-12-03', 12, 20, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2023-12-04', '1402-09-13', '1445-05-21', '2023-12-04', 13, 21, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2023-12-05', '1402-09-14', '1445-05-22', '2023-12-05', 14, 22, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2023-12-06', '1402-09-15', '1445-05-23', '2023-12-06', 15, 23, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2023-12-07', '1402-09-16', '1445-05-24', '2023-12-07', 16, 24, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2023-12-08', '1402-09-17', '1445-05-25', '2023-12-08', 17, 25, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2023-12-09', '1402-09-18', '1445-05-26', '2023-12-09', 18, 26, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2023-12-10', '1402-09-19', '1445-05-27', '2023-12-10', 19, 27, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2023-12-11', '1402-09-20', '1445-05-28', '2023-12-11', 20, 28, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2023-12-12', '1402-09-21', '1445-05-29', '2023-12-12', 21, 29, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2023-12-13', '1402-09-22', '1445-05-30', '2023-12-13', 22, 30, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2023-12-14', '1402-09-23', '1445-06-01', '2023-12-14', 23, 1, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2023-12-15', '1402-09-24', '1445-06-02', '2023-12-15', 24, 2, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2023-12-16', '1402-09-25', '1445-06-03', '2023-12-16', 25, 3, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2023-12-17', '1402-09-26', '1445-06-04', '2023-12-17', 26, 4, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2023-12-18', '1402-09-27', '1445-06-05', '2023-12-18', 27, 5, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2023-12-19', '1402-09-28', '1445-06-06', '2023-12-19', 28, 6, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2023-12-20', '1402-09-29', '1445-06-07', '2023-12-20', 29, 7, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2023-12-21', '1402-09-30', '1445-06-08', '2023-12-21', 30, 8, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2023-12-22', '1402-10-01', '1445-06-09', '2023-12-22', 1, 9, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2023-12-23', '1402-10-02', '1445-06-10', '2023-12-23', 2, 10, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2023-12-24', '1402-10-03', '1445-06-11', '2023-12-24', 3, 11, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2023-12-25', '1402-10-04', '1445-06-12', '2023-12-25', 4, 12, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2023-12-26', '1402-10-05', '1445-06-13', '2023-12-26', 5, 13, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2023-12-27', '1402-10-06', '1445-06-14', '2023-12-27', 6, 14, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2023-12-28', '1402-10-07', '1445-06-15', '2023-12-28', 7, 15, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2023-12-29', '1402-10-08', '1445-06-16', '2023-12-29', 8, 16, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2023-12-30', '1402-10-09', '1445-06-17', '2023-12-30', 9, 17, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2023-12-31', '1402-10-10', '1445-06-18', '2023-12-31', 10, 18, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2024-01-01', '1402-10-11', '1445-06-19', '2024-01-01', 11, 19, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2024-01-02', '1402-10-12', '1445-06-20', '2024-01-02', 12, 20, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2024-01-03', '1402-10-13', '1445-06-21', '2024-01-03', 13, 21, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2024-01-04', '1402-10-14', '1445-06-22', '2024-01-04', 14, 22, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2024-01-05', '1402-10-15', '1445-06-23', '2024-01-05', 15, 23, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2024-01-06', '1402-10-16', '1445-06-24', '2024-01-06', 16, 24, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2024-01-07', '1402-10-17', '1445-06-25', '2024-01-07', 17, 25, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2024-01-08', '1402-10-18', '1445-06-26', '2024-01-08', 18, 26, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2024-01-09', '1402-10-19', '1445-06-27', '2024-01-09', 19, 27, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2024-01-10', '1402-10-20', '1445-06-28', '2024-01-10', 20, 28, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2024-01-11', '1402-10-21', '1445-06-29', '2024-01-11', 21, 29, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2024-01-12', '1402-10-22', '1445-07-01', '2024-01-12', 22, 1, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2024-01-13', '1402-10-23', '1445-07-02', '2024-01-13', 23, 2, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2024-01-14', '1402-10-24', '1445-07-03', '2024-01-14', 24, 3, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2024-01-15', '1402-10-25', '1445-07-04', '2024-01-15', 25, 4, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2024-01-16', '1402-10-26', '1445-07-05', '2024-01-16', 26, 5, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2024-01-17', '1402-10-27', '1445-07-06', '2024-01-17', 27, 6, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2024-01-18', '1402-10-28', '1445-07-07', '2024-01-18', 28, 7, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2024-01-19', '1402-10-29', '1445-07-08', '2024-01-19', 29, 8, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2024-01-20', '1402-10-30', '1445-07-09', '2024-01-20', 30, 9, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2024-01-21', '1402-11-01', '1445-07-10', '2024-01-21', 1, 10, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2024-01-22', '1402-11-02', '1445-07-11', '2024-01-22', 2, 11, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2024-01-23', '1402-11-03', '1445-07-12', '2024-01-23', 3, 12, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2024-01-24', '1402-11-04', '1445-07-13', '2024-01-24', 4, 13, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2024-01-25', '1402-11-05', '1445-07-14', '2024-01-25', 5, 14, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2024-01-26', '1402-11-06', '1445-07-15', '2024-01-26', 6, 15, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2024-01-27', '1402-11-07', '1445-07-16', '2024-01-27', 7, 16, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2024-01-28', '1402-11-08', '1445-07-17', '2024-01-28', 8, 17, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2024-01-29', '1402-11-09', '1445-07-18', '2024-01-29', 9, 18, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2024-01-30', '1402-11-10', '1445-07-19', '2024-01-30', 10, 19, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2024-01-31', '1402-11-11', '1445-07-20', '2024-01-31', 11, 20, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2024-02-01', '1402-11-12', '1445-07-21', '2024-02-01', 12, 21, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2024-02-02', '1402-11-13', '1445-07-22', '2024-02-02', 13, 22, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2024-02-03', '1402-11-14', '1445-07-23', '2024-02-03', 14, 23, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2024-02-04', '1402-11-15', '1445-07-24', '2024-02-04', 15, 24, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2024-02-05', '1402-11-16', '1445-07-25', '2024-02-05', 16, 25, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2024-02-06', '1402-11-17', '1445-07-26', '2024-02-06', 17, 26, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2024-02-07', '1402-11-18', '1445-07-27', '2024-02-07', 18, 27, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2024-02-08', '1402-11-19', '1445-07-28', '2024-02-08', 19, 28, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2024-02-09', '1402-11-20', '1445-07-29', '2024-02-09', 20, 29, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2024-02-10', '1402-11-21', '1445-07-30', '2024-02-10', 21, 30, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2024-02-11', '1402-11-22', '1445-08-01', '2024-02-11', 22, 1, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2024-02-12', '1402-11-23', '1445-08-02', '2024-02-12', 23, 2, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2024-02-13', '1402-11-24', '1445-08-03', '2024-02-13', 24, 3, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2024-02-14', '1402-11-25', '1445-08-04', '2024-02-14', 25, 4, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2024-02-15', '1402-11-26', '1445-08-05', '2024-02-15', 26, 5, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2024-02-16', '1402-11-27', '1445-08-06', '2024-02-16', 27, 6, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2024-02-17', '1402-11-28', '1445-08-07', '2024-02-17', 28, 7, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2024-02-18', '1402-11-29', '1445-08-08', '2024-02-18', 29, 8, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2024-02-19', '1402-11-30', '1445-08-09', '2024-02-19', 30, 9, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2024-02-20', '1402-12-01', '1445-08-10', '2024-02-20', 1, 10, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2024-02-21', '1402-12-02', '1445-08-11', '2024-02-21', 2, 11, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2024-02-22', '1402-12-03', '1445-08-12', '2024-02-22', 3, 12, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2024-02-23', '1402-12-04', '1445-08-13', '2024-02-23', 4, 13, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2024-02-24', '1402-12-05', '1445-08-14', '2024-02-24', 5, 14, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2024-02-25', '1402-12-06', '1445-08-15', '2024-02-25', 6, 15, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2024-02-26', '1402-12-07', '1445-08-16', '2024-02-26', 7, 16, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2024-02-27', '1402-12-08', '1445-08-17', '2024-02-27', 8, 17, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2024-02-28', '1402-12-09', '1445-08-18', '2024-02-28', 9, 18, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2024-02-29', '1402-12-10', '1445-08-19', '2024-02-29', 10, 19, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2024-03-01', '1402-12-11', '1445-08-20', '2024-03-01', 11, 20, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2024-03-02', '1402-12-12', '1445-08-21', '2024-03-02', 12, 21, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2024-03-03', '1402-12-13', '1445-08-22', '2024-03-03', 13, 22, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2024-03-04', '1402-12-14', '1445-08-23', '2024-03-04', 14, 23, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2024-03-05', '1402-12-15', '1445-08-24', '2024-03-05', 15, 24, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2024-03-06', '1402-12-16', '1445-08-25', '2024-03-06', 16, 25, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2024-03-07', '1402-12-17', '1445-08-26', '2024-03-07', 17, 26, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2024-03-08', '1402-12-18', '1445-08-27', '2024-03-08', 18, 27, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2024-03-09', '1402-12-19', '1445-08-28', '2024-03-09', 19, 28, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2024-03-10', '1402-12-20', '1445-08-29', '2024-03-10', 20, 29, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2024-03-11', '1402-12-21', '1445-09-01', '2024-03-11', 21, 1, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2024-03-12', '1402-12-22', '1445-09-02', '2024-03-12', 22, 2, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2024-03-13', '1402-12-23', '1445-09-03', '2024-03-13', 23, 3, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2024-03-14', '1402-12-24', '1445-09-04', '2024-03-14', 24, 4, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2024-03-15', '1402-12-25', '1445-09-05', '2024-03-15', 25, 5, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2024-03-16', '1402-12-26', '1445-09-06', '2024-03-16', 26, 6, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2024-03-17', '1402-12-27', '1445-09-07', '2024-03-17', 27, 7, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2024-03-18', '1402-12-28', '1445-09-08', '2024-03-18', 28, 8, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2024-03-19', '1402-12-29', '1445-09-09', '2024-03-19', 29, 9, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2024-03-20', '1403-01-01', '1445-09-10', '2024-03-20', 1, 10, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2024-03-21', '1403-01-02', '1445-09-11', '2024-03-21', 2, 11, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2024-03-22', '1403-01-03', '1445-09-12', '2024-03-22', 3, 12, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2024-03-23', '1403-01-04', '1445-09-13', '2024-03-23', 4, 13, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2024-03-24', '1403-01-05', '1445-09-14', '2024-03-24', 5, 14, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2024-03-25', '1403-01-06', '1445-09-15', '2024-03-25', 6, 15, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2024-03-26', '1403-01-07', '1445-09-16', '2024-03-26', 7, 16, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2024-03-27', '1403-01-08', '1445-09-17', '2024-03-27', 8, 17, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2024-03-28', '1403-01-09', '1445-09-18', '2024-03-28', 9, 18, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2024-03-29', '1403-01-10', '1445-09-19', '2024-03-29', 10, 19, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2024-03-30', '1403-01-11', '1445-09-20', '2024-03-30', 11, 20, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2024-03-31', '1403-01-12', '1445-09-21', '2024-03-31', 12, 21, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2024-04-01', '1403-01-13', '1445-09-22', '2024-04-01', 13, 22, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2024-04-02', '1403-01-14', '1445-09-23', '2024-04-02', 14, 23, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2024-04-03', '1403-01-15', '1445-09-24', '2024-04-03', 15, 24, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2024-04-04', '1403-01-16', '1445-09-25', '2024-04-04', 16, 25, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2024-04-05', '1403-01-17', '1445-09-26', '2024-04-05', 17, 26, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2024-04-06', '1403-01-18', '1445-09-27', '2024-04-06', 18, 27, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2024-04-07', '1403-01-19', '1445-09-28', '2024-04-07', 19, 28, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2024-04-08', '1403-01-20', '1445-09-29', '2024-04-08', 20, 29, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2024-04-09', '1403-01-21', '1445-09-30', '2024-04-09', 21, 30, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2024-04-10', '1403-01-22', '1445-10-01', '2024-04-10', 22, 1, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2024-04-11', '1403-01-23', '1445-10-02', '2024-04-11', 23, 2, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2024-04-12', '1403-01-24', '1445-10-03', '2024-04-12', 24, 3, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2024-04-13', '1403-01-25', '1445-10-04', '2024-04-13', 25, 4, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2024-04-14', '1403-01-26', '1445-10-05', '2024-04-14', 26, 5, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2024-04-15', '1403-01-27', '1445-10-06', '2024-04-15', 27, 6, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2024-04-16', '1403-01-28', '1445-10-07', '2024-04-16', 28, 7, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2024-04-17', '1403-01-29', '1445-10-08', '2024-04-17', 29, 8, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2024-04-18', '1403-01-30', '1445-10-09', '2024-04-18', 30, 9, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2024-04-19', '1403-01-31', '1445-10-10', '2024-04-19', 31, 10, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2024-04-20', '1403-02-01', '1445-10-11', '2024-04-20', 1, 11, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2024-04-21', '1403-02-02', '1445-10-12', '2024-04-21', 2, 12, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2024-04-22', '1403-02-03', '1445-10-13', '2024-04-22', 3, 13, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2024-04-23', '1403-02-04', '1445-10-14', '2024-04-23', 4, 14, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2024-04-24', '1403-02-05', '1445-10-15', '2024-04-24', 5, 15, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2024-04-25', '1403-02-06', '1445-10-16', '2024-04-25', 6, 16, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2024-04-26', '1403-02-07', '1445-10-17', '2024-04-26', 7, 17, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2024-04-27', '1403-02-08', '1445-10-18', '2024-04-27', 8, 18, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2024-04-28', '1403-02-09', '1445-10-19', '2024-04-28', 9, 19, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2024-04-29', '1403-02-10', '1445-10-20', '2024-04-29', 10, 20, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2024-04-30', '1403-02-11', '1445-10-21', '2024-04-30', 11, 21, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2024-05-01', '1403-02-12', '1445-10-22', '2024-05-01', 12, 22, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2024-05-02', '1403-02-13', '1445-10-23', '2024-05-02', 13, 23, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2024-05-03', '1403-02-14', '1445-10-24', '2024-05-03', 14, 24, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2024-05-04', '1403-02-15', '1445-10-25', '2024-05-04', 15, 25, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2024-05-05', '1403-02-16', '1445-10-26', '2024-05-05', 16, 26, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2024-05-06', '1403-02-17', '1445-10-27', '2024-05-06', 17, 27, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2024-05-07', '1403-02-18', '1445-10-28', '2024-05-07', 18, 28, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2024-05-08', '1403-02-19', '1445-10-29', '2024-05-08', 19, 29, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2024-05-09', '1403-02-20', '1445-11-01', '2024-05-09', 20, 1, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2024-05-10', '1403-02-21', '1445-11-02', '2024-05-10', 21, 2, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2024-05-11', '1403-02-22', '1445-11-03', '2024-05-11', 22, 3, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2024-05-12', '1403-02-23', '1445-11-04', '2024-05-12', 23, 4, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2024-05-13', '1403-02-24', '1445-11-05', '2024-05-13', 24, 5, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2024-05-14', '1403-02-25', '1445-11-06', '2024-05-14', 25, 6, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2024-05-15', '1403-02-26', '1445-11-07', '2024-05-15', 26, 7, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2024-05-16', '1403-02-27', '1445-11-08', '2024-05-16', 27, 8, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2024-05-17', '1403-02-28', '1445-11-09', '2024-05-17', 28, 9, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2024-05-18', '1403-02-29', '1445-11-10', '2024-05-18', 29, 10, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2024-05-19', '1403-02-30', '1445-11-11', '2024-05-19', 30, 11, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2024-05-20', '1403-02-31', '1445-11-12', '2024-05-20', 31, 12, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2024-05-21', '1403-03-01', '1445-11-13', '2024-05-21', 1, 13, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2024-05-22', '1403-03-02', '1445-11-14', '2024-05-22', 2, 14, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2024-05-23', '1403-03-03', '1445-11-15', '2024-05-23', 3, 15, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2024-05-24', '1403-03-04', '1445-11-16', '2024-05-24', 4, 16, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2024-05-25', '1403-03-05', '1445-11-17', '2024-05-25', 5, 17, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2024-05-26', '1403-03-06', '1445-11-18', '2024-05-26', 6, 18, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2024-05-27', '1403-03-07', '1445-11-19', '2024-05-27', 7, 19, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2024-05-28', '1403-03-08', '1445-11-20', '2024-05-28', 8, 20, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2024-05-29', '1403-03-09', '1445-11-21', '2024-05-29', 9, 21, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2024-05-30', '1403-03-10', '1445-11-22', '2024-05-30', 10, 22, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2024-05-31', '1403-03-11', '1445-11-23', '2024-05-31', 11, 23, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2024-06-01', '1403-03-12', '1445-11-24', '2024-06-01', 12, 24, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2024-06-02', '1403-03-13', '1445-11-25', '2024-06-02', 13, 25, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2024-06-03', '1403-03-14', '1445-11-26', '2024-06-03', 14, 26, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2024-06-04', '1403-03-15', '1445-11-27', '2024-06-04', 15, 27, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2024-06-05', '1403-03-16', '1445-11-28', '2024-06-05', 16, 28, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2024-06-06', '1403-03-17', '1445-11-29', '2024-06-06', 17, 29, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2024-06-07', '1403-03-18', '1445-11-30', '2024-06-07', 18, 30, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2024-06-08', '1403-03-19', '1445-12-01', '2024-06-08', 19, 1, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2024-06-09', '1403-03-20', '1445-12-02', '2024-06-09', 20, 2, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2024-06-10', '1403-03-21', '1445-12-03', '2024-06-10', 21, 3, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2024-06-11', '1403-03-22', '1445-12-04', '2024-06-11', 22, 4, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2024-06-12', '1403-03-23', '1445-12-05', '2024-06-12', 23, 5, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2024-06-13', '1403-03-24', '1445-12-06', '2024-06-13', 24, 6, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2024-06-14', '1403-03-25', '1445-12-07', '2024-06-14', 25, 7, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2024-06-15', '1403-03-26', '1445-12-08', '2024-06-15', 26, 8, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2024-06-16', '1403-03-27', '1445-12-09', '2024-06-16', 27, 9, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2024-06-17', '1403-03-28', '1445-12-10', '2024-06-17', 28, 10, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2024-06-18', '1403-03-29', '1445-12-11', '2024-06-18', 29, 11, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2024-06-19', '1403-03-30', '1445-12-12', '2024-06-19', 30, 12, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2024-06-20', '1403-03-31', '1445-12-13', '2024-06-20', 31, 13, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2024-06-21', '1403-04-01', '1445-12-14', '2024-06-21', 1, 14, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2024-06-22', '1403-04-02', '1445-12-15', '2024-06-22', 2, 15, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2024-06-23', '1403-04-03', '1445-12-16', '2024-06-23', 3, 16, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2024-06-24', '1403-04-04', '1445-12-17', '2024-06-24', 4, 17, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2024-06-25', '1403-04-05', '1445-12-18', '2024-06-25', 5, 18, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2024-06-26', '1403-04-06', '1445-12-19', '2024-06-26', 6, 19, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2024-06-27', '1403-04-07', '1445-12-20', '2024-06-27', 7, 20, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2024-06-28', '1403-04-08', '1445-12-21', '2024-06-28', 8, 21, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2024-06-29', '1403-04-09', '1445-12-22', '2024-06-29', 9, 22, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2024-06-30', '1403-04-10', '1445-12-23', '2024-06-30', 10, 23, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2024-07-01', '1403-04-11', '1445-12-24', '2024-07-01', 11, 24, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2024-07-02', '1403-04-12', '1445-12-25', '2024-07-02', 12, 25, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2024-07-03', '1403-04-13', '1445-12-26', '2024-07-03', 13, 26, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2024-07-04', '1403-04-14', '1445-12-27', '2024-07-04', 14, 27, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2024-07-05', '1403-04-15', '1445-12-28', '2024-07-05', 15, 28, 4, 12, 'friday   ', 6, 0, 'NONE') ,('2024-07-06', '1403-04-16', '1445-12-29', '2024-07-06', 16, 29, 4, 12, 'saturday ', 7, 0, 'NONE') ,('2024-07-07', '1403-04-17', '1445-12-30', '2024-07-07', 17, 30, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2024-07-08', '1403-04-18', '1446-01-01', '2024-07-08', 18, 1, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2024-07-09', '1403-04-19', '1446-01-02', '2024-07-09', 19, 2, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2024-07-10', '1403-04-20', '1446-01-03', '2024-07-10', 20, 3, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2024-07-11', '1403-04-21', '1446-01-04', '2024-07-11', 21, 4, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2024-07-12', '1403-04-22', '1446-01-05', '2024-07-12', 22, 5, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2024-07-13', '1403-04-23', '1446-01-06', '2024-07-13', 23, 6, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2024-07-14', '1403-04-24', '1446-01-07', '2024-07-14', 24, 7, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2024-07-15', '1403-04-25', '1446-01-08', '2024-07-15', 25, 8, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2024-07-16', '1403-04-26', '1446-01-09', '2024-07-16', 26, 9, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2024-07-17', '1403-04-27', '1446-01-10', '2024-07-17', 27, 10, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2024-07-18', '1403-04-28', '1446-01-11', '2024-07-18', 28, 11, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2024-07-19', '1403-04-29', '1446-01-12', '2024-07-19', 29, 12, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2024-07-20', '1403-04-30', '1446-01-13', '2024-07-20', 30, 13, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2024-07-21', '1403-04-31', '1446-01-14', '2024-07-21', 31, 14, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2024-07-22', '1403-05-01', '1446-01-15', '2024-07-22', 1, 15, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2024-07-23', '1403-05-02', '1446-01-16', '2024-07-23', 2, 16, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2024-07-24', '1403-05-03', '1446-01-17', '2024-07-24', 3, 17, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2024-07-25', '1403-05-04', '1446-01-18', '2024-07-25', 4, 18, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2024-07-26', '1403-05-05', '1446-01-19', '2024-07-26', 5, 19, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2024-07-27', '1403-05-06', '1446-01-20', '2024-07-27', 6, 20, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2024-07-28', '1403-05-07', '1446-01-21', '2024-07-28', 7, 21, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2024-07-29', '1403-05-08', '1446-01-22', '2024-07-29', 8, 22, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2024-07-30', '1403-05-09', '1446-01-23', '2024-07-30', 9, 23, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2024-07-31', '1403-05-10', '1446-01-24', '2024-07-31', 10, 24, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2024-08-01', '1403-05-11', '1446-01-25', '2024-08-01', 11, 25, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2024-08-02', '1403-05-12', '1446-01-26', '2024-08-02', 12, 26, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2024-08-03', '1403-05-13', '1446-01-27', '2024-08-03', 13, 27, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2024-08-04', '1403-05-14', '1446-01-28', '2024-08-04', 14, 28, 5, 1, 'sunday   ', 1, 0, 'NONE') ,('2024-08-05', '1403-05-15', '1446-01-29', '2024-08-05', 15, 29, 5, 1, 'monday   ', 2, 0, 'NONE') ,('2024-08-06', '1403-05-16', '1446-01-30', '2024-08-06', 16, 30, 5, 1, 'tuesday  ', 3, 0, 'NONE') ,('2024-08-07', '1403-05-17', '1446-02-01', '2024-08-07', 17, 1, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2024-08-08', '1403-05-18', '1446-02-02', '2024-08-08', 18, 2, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2024-08-09', '1403-05-19', '1446-02-03', '2024-08-09', 19, 3, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2024-08-10', '1403-05-20', '1446-02-04', '2024-08-10', 20, 4, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2024-08-11', '1403-05-21', '1446-02-05', '2024-08-11', 21, 5, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2024-08-12', '1403-05-22', '1446-02-06', '2024-08-12', 22, 6, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2024-08-13', '1403-05-23', '1446-02-07', '2024-08-13', 23, 7, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2024-08-14', '1403-05-24', '1446-02-08', '2024-08-14', 24, 8, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2024-08-15', '1403-05-25', '1446-02-09', '2024-08-15', 25, 9, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2024-08-16', '1403-05-26', '1446-02-10', '2024-08-16', 26, 10, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2024-08-17', '1403-05-27', '1446-02-11', '2024-08-17', 27, 11, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2024-08-18', '1403-05-28', '1446-02-12', '2024-08-18', 28, 12, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2024-08-19', '1403-05-29', '1446-02-13', '2024-08-19', 29, 13, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2024-08-20', '1403-05-30', '1446-02-14', '2024-08-20', 30, 14, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2024-08-21', '1403-05-31', '1446-02-15', '2024-08-21', 31, 15, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2024-08-22', '1403-06-01', '1446-02-16', '2024-08-22', 1, 16, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2024-08-23', '1403-06-02', '1446-02-17', '2024-08-23', 2, 17, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2024-08-24', '1403-06-03', '1446-02-18', '2024-08-24', 3, 18, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2024-08-25', '1403-06-04', '1446-02-19', '2024-08-25', 4, 19, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2024-08-26', '1403-06-05', '1446-02-20', '2024-08-26', 5, 20, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2024-08-27', '1403-06-06', '1446-02-21', '2024-08-27', 6, 21, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2024-08-28', '1403-06-07', '1446-02-22', '2024-08-28', 7, 22, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2024-08-29', '1403-06-08', '1446-02-23', '2024-08-29', 8, 23, 6, 2, 'thursday ', 5, 0, 'NONE') ,('2024-08-30', '1403-06-09', '1446-02-24', '2024-08-30', 9, 24, 6, 2, 'friday   ', 6, 0, 'NONE') ,('2024-08-31', '1403-06-10', '1446-02-25', '2024-08-31', 10, 25, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2024-09-01', '1403-06-11', '1446-02-26', '2024-09-01', 11, 26, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2024-09-02', '1403-06-12', '1446-02-27', '2024-09-02', 12, 27, 6, 2, 'monday   ', 2, 0, 'NONE') ,('2024-09-03', '1403-06-13', '1446-02-28', '2024-09-03', 13, 28, 6, 2, 'tuesday  ', 3, 0, 'NONE') ,('2024-09-04', '1403-06-14', '1446-02-29', '2024-09-04', 14, 29, 6, 2, 'wednesday', 4, 0, 'NONE') ,('2024-09-05', '1403-06-15', '1446-03-01', '2024-09-05', 15, 1, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2024-09-06', '1403-06-16', '1446-03-02', '2024-09-06', 16, 2, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2024-09-07', '1403-06-17', '1446-03-03', '2024-09-07', 17, 3, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2024-09-08', '1403-06-18', '1446-03-04', '2024-09-08', 18, 4, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2024-09-09', '1403-06-19', '1446-03-05', '2024-09-09', 19, 5, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2024-09-10', '1403-06-20', '1446-03-06', '2024-09-10', 20, 6, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2024-09-11', '1403-06-21', '1446-03-07', '2024-09-11', 21, 7, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2024-09-12', '1403-06-22', '1446-03-08', '2024-09-12', 22, 8, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2024-09-13', '1403-06-23', '1446-03-09', '2024-09-13', 23, 9, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2024-09-14', '1403-06-24', '1446-03-10', '2024-09-14', 24, 10, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2024-09-15', '1403-06-25', '1446-03-11', '2024-09-15', 25, 11, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2024-09-16', '1403-06-26', '1446-03-12', '2024-09-16', 26, 12, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2024-09-17', '1403-06-27', '1446-03-13', '2024-09-17', 27, 13, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2024-09-18', '1403-06-28', '1446-03-14', '2024-09-18', 28, 14, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2024-09-19', '1403-06-29', '1446-03-15', '2024-09-19', 29, 15, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2024-09-20', '1403-06-30', '1446-03-16', '2024-09-20', 30, 16, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2024-09-21', '1403-06-31', '1446-03-17', '2024-09-21', 31, 17, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2024-09-22', '1403-07-01', '1446-03-18', '2024-09-22', 1, 18, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2024-09-23', '1403-07-02', '1446-03-19', '2024-09-23', 2, 19, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2024-09-24', '1403-07-03', '1446-03-20', '2024-09-24', 3, 20, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2024-09-25', '1403-07-04', '1446-03-21', '2024-09-25', 4, 21, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2024-09-26', '1403-07-05', '1446-03-22', '2024-09-26', 5, 22, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2024-09-27', '1403-07-06', '1446-03-23', '2024-09-27', 6, 23, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2024-09-28', '1403-07-07', '1446-03-24', '2024-09-28', 7, 24, 7, 3, 'saturday ', 7, 0, 'NONE') ,('2024-09-29', '1403-07-08', '1446-03-25', '2024-09-29', 8, 25, 7, 3, 'sunday   ', 1, 0, 'NONE') ,('2024-09-30', '1403-07-09', '1446-03-26', '2024-09-30', 9, 26, 7, 3, 'monday   ', 2, 0, 'NONE') ,('2024-10-01', '1403-07-10', '1446-03-27', '2024-10-01', 10, 27, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2024-10-02', '1403-07-11', '1446-03-28', '2024-10-02', 11, 28, 7, 3, 'wednesday', 4, 0, 'NONE') ,('2024-10-03', '1403-07-12', '1446-03-29', '2024-10-03', 12, 29, 7, 3, 'thursday ', 5, 0, 'NONE') ,('2024-10-04', '1403-07-13', '1446-03-30', '2024-10-04', 13, 30, 7, 3, 'friday   ', 6, 0, 'NONE') ,('2024-10-05', '1403-07-14', '1446-04-01', '2024-10-05', 14, 1, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2024-10-06', '1403-07-15', '1446-04-02', '2024-10-06', 15, 2, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2024-10-07', '1403-07-16', '1446-04-03', '2024-10-07', 16, 3, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2024-10-08', '1403-07-17', '1446-04-04', '2024-10-08', 17, 4, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2024-10-09', '1403-07-18', '1446-04-05', '2024-10-09', 18, 5, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2024-10-10', '1403-07-19', '1446-04-06', '2024-10-10', 19, 6, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2024-10-11', '1403-07-20', '1446-04-07', '2024-10-11', 20, 7, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2024-10-12', '1403-07-21', '1446-04-08', '2024-10-12', 21, 8, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2024-10-13', '1403-07-22', '1446-04-09', '2024-10-13', 22, 9, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2024-10-14', '1403-07-23', '1446-04-10', '2024-10-14', 23, 10, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2024-10-15', '1403-07-24', '1446-04-11', '2024-10-15', 24, 11, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2024-10-16', '1403-07-25', '1446-04-12', '2024-10-16', 25, 12, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2024-10-17', '1403-07-26', '1446-04-13', '2024-10-17', 26, 13, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2024-10-18', '1403-07-27', '1446-04-14', '2024-10-18', 27, 14, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2024-10-19', '1403-07-28', '1446-04-15', '2024-10-19', 28, 15, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2024-10-20', '1403-07-29', '1446-04-16', '2024-10-20', 29, 16, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2024-10-21', '1403-07-30', '1446-04-17', '2024-10-21', 30, 17, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2024-10-22', '1403-08-01', '1446-04-18', '2024-10-22', 1, 18, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2024-10-23', '1403-08-02', '1446-04-19', '2024-10-23', 2, 19, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2024-10-24', '1403-08-03', '1446-04-20', '2024-10-24', 3, 20, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2024-10-25', '1403-08-04', '1446-04-21', '2024-10-25', 4, 21, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2024-10-26', '1403-08-05', '1446-04-22', '2024-10-26', 5, 22, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2024-10-27', '1403-08-06', '1446-04-23', '2024-10-27', 6, 23, 8, 4, 'sunday   ', 1, 0, 'NONE') ,('2024-10-28', '1403-08-07', '1446-04-24', '2024-10-28', 7, 24, 8, 4, 'monday   ', 2, 0, 'NONE') ,('2024-10-29', '1403-08-08', '1446-04-25', '2024-10-29', 8, 25, 8, 4, 'tuesday  ', 3, 0, 'NONE') ,('2024-10-30', '1403-08-09', '1446-04-26', '2024-10-30', 9, 26, 8, 4, 'wednesday', 4, 0, 'NONE') ,('2024-10-31', '1403-08-10', '1446-04-27', '2024-10-31', 10, 27, 8, 4, 'thursday ', 5, 0, 'NONE') ,('2024-11-01', '1403-08-11', '1446-04-28', '2024-11-01', 11, 28, 8, 4, 'friday   ', 6, 0, 'NONE') ,('2024-11-02', '1403-08-12', '1446-04-29', '2024-11-02', 12, 29, 8, 4, 'saturday ', 7, 0, 'NONE') ,('2024-11-03', '1403-08-13', '1446-05-01', '2024-11-03', 13, 1, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2024-11-04', '1403-08-14', '1446-05-02', '2024-11-04', 14, 2, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2024-11-05', '1403-08-15', '1446-05-03', '2024-11-05', 15, 3, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2024-11-06', '1403-08-16', '1446-05-04', '2024-11-06', 16, 4, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2024-11-07', '1403-08-17', '1446-05-05', '2024-11-07', 17, 5, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2024-11-08', '1403-08-18', '1446-05-06', '2024-11-08', 18, 6, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2024-11-09', '1403-08-19', '1446-05-07', '2024-11-09', 19, 7, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2024-11-10', '1403-08-20', '1446-05-08', '2024-11-10', 20, 8, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2024-11-11', '1403-08-21', '1446-05-09', '2024-11-11', 21, 9, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2024-11-12', '1403-08-22', '1446-05-10', '2024-11-12', 22, 10, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2024-11-13', '1403-08-23', '1446-05-11', '2024-11-13', 23, 11, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2024-11-14', '1403-08-24', '1446-05-12', '2024-11-14', 24, 12, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2024-11-15', '1403-08-25', '1446-05-13', '2024-11-15', 25, 13, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2024-11-16', '1403-08-26', '1446-05-14', '2024-11-16', 26, 14, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2024-11-17', '1403-08-27', '1446-05-15', '2024-11-17', 27, 15, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2024-11-18', '1403-08-28', '1446-05-16', '2024-11-18', 28, 16, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2024-11-19', '1403-08-29', '1446-05-17', '2024-11-19', 29, 17, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2024-11-20', '1403-08-30', '1446-05-18', '2024-11-20', 30, 18, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2024-11-21', '1403-09-01', '1446-05-19', '2024-11-21', 1, 19, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2024-11-22', '1403-09-02', '1446-05-20', '2024-11-22', 2, 20, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2024-11-23', '1403-09-03', '1446-05-21', '2024-11-23', 3, 21, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2024-11-24', '1403-09-04', '1446-05-22', '2024-11-24', 4, 22, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2024-11-25', '1403-09-05', '1446-05-23', '2024-11-25', 5, 23, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2024-11-26', '1403-09-06', '1446-05-24', '2024-11-26', 6, 24, 9, 5, 'tuesday  ', 3, 0, 'NONE') ,('2024-11-27', '1403-09-07', '1446-05-25', '2024-11-27', 7, 25, 9, 5, 'wednesday', 4, 0, 'NONE') ,('2024-11-28', '1403-09-08', '1446-05-26', '2024-11-28', 8, 26, 9, 5, 'thursday ', 5, 0, 'NONE') ,('2024-11-29', '1403-09-09', '1446-05-27', '2024-11-29', 9, 27, 9, 5, 'friday   ', 6, 0, 'NONE') ,('2024-11-30', '1403-09-10', '1446-05-28', '2024-11-30', 10, 28, 9, 5, 'saturday ', 7, 0, 'NONE') ,('2024-12-01', '1403-09-11', '1446-05-29', '2024-12-01', 11, 29, 9, 5, 'sunday   ', 1, 0, 'NONE') ,('2024-12-02', '1403-09-12', '1446-05-30', '2024-12-02', 12, 30, 9, 5, 'monday   ', 2, 0, 'NONE') ,('2024-12-03', '1403-09-13', '1446-06-01', '2024-12-03', 13, 1, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2024-12-04', '1403-09-14', '1446-06-02', '2024-12-04', 14, 2, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2024-12-05', '1403-09-15', '1446-06-03', '2024-12-05', 15, 3, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2024-12-06', '1403-09-16', '1446-06-04', '2024-12-06', 16, 4, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2024-12-07', '1403-09-17', '1446-06-05', '2024-12-07', 17, 5, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2024-12-08', '1403-09-18', '1446-06-06', '2024-12-08', 18, 6, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2024-12-09', '1403-09-19', '1446-06-07', '2024-12-09', 19, 7, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2024-12-10', '1403-09-20', '1446-06-08', '2024-12-10', 20, 8, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2024-12-11', '1403-09-21', '1446-06-09', '2024-12-11', 21, 9, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2024-12-12', '1403-09-22', '1446-06-10', '2024-12-12', 22, 10, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2024-12-13', '1403-09-23', '1446-06-11', '2024-12-13', 23, 11, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2024-12-14', '1403-09-24', '1446-06-12', '2024-12-14', 24, 12, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2024-12-15', '1403-09-25', '1446-06-13', '2024-12-15', 25, 13, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2024-12-16', '1403-09-26', '1446-06-14', '2024-12-16', 26, 14, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2024-12-17', '1403-09-27', '1446-06-15', '2024-12-17', 27, 15, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2024-12-18', '1403-09-28', '1446-06-16', '2024-12-18', 28, 16, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2024-12-19', '1403-09-29', '1446-06-17', '2024-12-19', 29, 17, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2024-12-20', '1403-09-30', '1446-06-18', '2024-12-20', 30, 18, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2024-12-21', '1403-10-01', '1446-06-19', '2024-12-21', 1, 19, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2024-12-22', '1403-10-02', '1446-06-20', '2024-12-22', 2, 20, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2024-12-23', '1403-10-03', '1446-06-21', '2024-12-23', 3, 21, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2024-12-24', '1403-10-04', '1446-06-22', '2024-12-24', 4, 22, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2024-12-25', '1403-10-05', '1446-06-23', '2024-12-25', 5, 23, 10, 6, 'wednesday', 4, 0, 'NONE') ,('2024-12-26', '1403-10-06', '1446-06-24', '2024-12-26', 6, 24, 10, 6, 'thursday ', 5, 0, 'NONE') ,('2024-12-27', '1403-10-07', '1446-06-25', '2024-12-27', 7, 25, 10, 6, 'friday   ', 6, 0, 'NONE') ,('2024-12-28', '1403-10-08', '1446-06-26', '2024-12-28', 8, 26, 10, 6, 'saturday ', 7, 0, 'NONE') ,('2024-12-29', '1403-10-09', '1446-06-27', '2024-12-29', 9, 27, 10, 6, 'sunday   ', 1, 0, 'NONE') ,('2024-12-30', '1403-10-10', '1446-06-28', '2024-12-30', 10, 28, 10, 6, 'monday   ', 2, 0, 'NONE') ,('2024-12-31', '1403-10-11', '1446-06-29', '2024-12-31', 11, 29, 10, 6, 'tuesday  ', 3, 0, 'NONE') ,('2025-01-01', '1403-10-12', '1446-07-01', '2025-01-01', 12, 1, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2025-01-02', '1403-10-13', '1446-07-02', '2025-01-02', 13, 2, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2025-01-03', '1403-10-14', '1446-07-03', '2025-01-03', 14, 3, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2025-01-04', '1403-10-15', '1446-07-04', '2025-01-04', 15, 4, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2025-01-05', '1403-10-16', '1446-07-05', '2025-01-05', 16, 5, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2025-01-06', '1403-10-17', '1446-07-06', '2025-01-06', 17, 6, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2025-01-07', '1403-10-18', '1446-07-07', '2025-01-07', 18, 7, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2025-01-08', '1403-10-19', '1446-07-08', '2025-01-08', 19, 8, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2025-01-09', '1403-10-20', '1446-07-09', '2025-01-09', 20, 9, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2025-01-10', '1403-10-21', '1446-07-10', '2025-01-10', 21, 10, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2025-01-11', '1403-10-22', '1446-07-11', '2025-01-11', 22, 11, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2025-01-12', '1403-10-23', '1446-07-12', '2025-01-12', 23, 12, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2025-01-13', '1403-10-24', '1446-07-13', '2025-01-13', 24, 13, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2025-01-14', '1403-10-25', '1446-07-14', '2025-01-14', 25, 14, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2025-01-15', '1403-10-26', '1446-07-15', '2025-01-15', 26, 15, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2025-01-16', '1403-10-27', '1446-07-16', '2025-01-16', 27, 16, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2025-01-17', '1403-10-28', '1446-07-17', '2025-01-17', 28, 17, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2025-01-18', '1403-10-29', '1446-07-18', '2025-01-18', 29, 18, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2025-01-19', '1403-10-30', '1446-07-19', '2025-01-19', 30, 19, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2025-01-20', '1403-11-01', '1446-07-20', '2025-01-20', 1, 20, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2025-01-21', '1403-11-02', '1446-07-21', '2025-01-21', 2, 21, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2025-01-22', '1403-11-03', '1446-07-22', '2025-01-22', 3, 22, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2025-01-23', '1403-11-04', '1446-07-23', '2025-01-23', 4, 23, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2025-01-24', '1403-11-05', '1446-07-24', '2025-01-24', 5, 24, 11, 7, 'friday   ', 6, 0, 'NONE') ,('2025-01-25', '1403-11-06', '1446-07-25', '2025-01-25', 6, 25, 11, 7, 'saturday ', 7, 0, 'NONE') ,('2025-01-26', '1403-11-07', '1446-07-26', '2025-01-26', 7, 26, 11, 7, 'sunday   ', 1, 0, 'NONE') ,('2025-01-27', '1403-11-08', '1446-07-27', '2025-01-27', 8, 27, 11, 7, 'monday   ', 2, 0, 'NONE') ,('2025-01-28', '1403-11-09', '1446-07-28', '2025-01-28', 9, 28, 11, 7, 'tuesday  ', 3, 0, 'NONE') ,('2025-01-29', '1403-11-10', '1446-07-29', '2025-01-29', 10, 29, 11, 7, 'wednesday', 4, 0, 'NONE') ,('2025-01-30', '1403-11-11', '1446-07-30', '2025-01-30', 11, 30, 11, 7, 'thursday ', 5, 0, 'NONE') ,('2025-01-31', '1403-11-12', '1446-08-01', '2025-01-31', 12, 1, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2025-02-01', '1403-11-13', '1446-08-02', '2025-02-01', 13, 2, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2025-02-02', '1403-11-14', '1446-08-03', '2025-02-02', 14, 3, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2025-02-03', '1403-11-15', '1446-08-04', '2025-02-03', 15, 4, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2025-02-04', '1403-11-16', '1446-08-05', '2025-02-04', 16, 5, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2025-02-05', '1403-11-17', '1446-08-06', '2025-02-05', 17, 6, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2025-02-06', '1403-11-18', '1446-08-07', '2025-02-06', 18, 7, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2025-02-07', '1403-11-19', '1446-08-08', '2025-02-07', 19, 8, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2025-02-08', '1403-11-20', '1446-08-09', '2025-02-08', 20, 9, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2025-02-09', '1403-11-21', '1446-08-10', '2025-02-09', 21, 10, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2025-02-10', '1403-11-22', '1446-08-11', '2025-02-10', 22, 11, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2025-02-11', '1403-11-23', '1446-08-12', '2025-02-11', 23, 12, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2025-02-12', '1403-11-24', '1446-08-13', '2025-02-12', 24, 13, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2025-02-13', '1403-11-25', '1446-08-14', '2025-02-13', 25, 14, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2025-02-14', '1403-11-26', '1446-08-15', '2025-02-14', 26, 15, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2025-02-15', '1403-11-27', '1446-08-16', '2025-02-15', 27, 16, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2025-02-16', '1403-11-28', '1446-08-17', '2025-02-16', 28, 17, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2025-02-17', '1403-11-29', '1446-08-18', '2025-02-17', 29, 18, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2025-02-18', '1403-11-30', '1446-08-19', '2025-02-18', 30, 19, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2025-02-19', '1403-12-01', '1446-08-20', '2025-02-19', 1, 20, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2025-02-20', '1403-12-02', '1446-08-21', '2025-02-20', 2, 21, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2025-02-21', '1403-12-03', '1446-08-22', '2025-02-21', 3, 22, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2025-02-22', '1403-12-04', '1446-08-23', '2025-02-22', 4, 23, 12, 8, 'saturday ', 7, 0, 'NONE') ,('2025-02-23', '1403-12-05', '1446-08-24', '2025-02-23', 5, 24, 12, 8, 'sunday   ', 1, 0, 'NONE') ,('2025-02-24', '1403-12-06', '1446-08-25', '2025-02-24', 6, 25, 12, 8, 'monday   ', 2, 0, 'NONE') ,('2025-02-25', '1403-12-07', '1446-08-26', '2025-02-25', 7, 26, 12, 8, 'tuesday  ', 3, 0, 'NONE') ,('2025-02-26', '1403-12-08', '1446-08-27', '2025-02-26', 8, 27, 12, 8, 'wednesday', 4, 0, 'NONE') ,('2025-02-27', '1403-12-09', '1446-08-28', '2025-02-27', 9, 28, 12, 8, 'thursday ', 5, 0, 'NONE') ,('2025-02-28', '1403-12-10', '1446-08-29', '2025-02-28', 10, 29, 12, 8, 'friday   ', 6, 0, 'NONE') ,('2025-03-01', '1403-12-11', '1446-09-01', '2025-03-01', 11, 1, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2025-03-02', '1403-12-12', '1446-09-02', '2025-03-02', 12, 2, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2025-03-03', '1403-12-13', '1446-09-03', '2025-03-03', 13, 3, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2025-03-04', '1403-12-14', '1446-09-04', '2025-03-04', 14, 4, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2025-03-05', '1403-12-15', '1446-09-05', '2025-03-05', 15, 5, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2025-03-06', '1403-12-16', '1446-09-06', '2025-03-06', 16, 6, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2025-03-07', '1403-12-17', '1446-09-07', '2025-03-07', 17, 7, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2025-03-08', '1403-12-18', '1446-09-08', '2025-03-08', 18, 8, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2025-03-09', '1403-12-19', '1446-09-09', '2025-03-09', 19, 9, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2025-03-10', '1403-12-20', '1446-09-10', '2025-03-10', 20, 10, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2025-03-11', '1403-12-21', '1446-09-11', '2025-03-11', 21, 11, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2025-03-12', '1403-12-22', '1446-09-12', '2025-03-12', 22, 12, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2025-03-13', '1403-12-23', '1446-09-13', '2025-03-13', 23, 13, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2025-03-14', '1403-12-24', '1446-09-14', '2025-03-14', 24, 14, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2025-03-15', '1403-12-25', '1446-09-15', '2025-03-15', 25, 15, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2025-03-16', '1403-12-26', '1446-09-16', '2025-03-16', 26, 16, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2025-03-17', '1403-12-27', '1446-09-17', '2025-03-17', 27, 17, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2025-03-18', '1403-12-28', '1446-09-18', '2025-03-18', 28, 18, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2025-03-19', '1403-12-29', '1446-09-19', '2025-03-19', 29, 19, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2025-03-20', '1403-12-30', '1446-09-20', '2025-03-20', 30, 20, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2025-03-21', '1404-01-01', '1446-09-21', '2025-03-21', 1, 21, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2025-03-22', '1404-01-02', '1446-09-22', '2025-03-22', 2, 22, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2025-03-23', '1404-01-03', '1446-09-23', '2025-03-23', 3, 23, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2025-03-24', '1404-01-04', '1446-09-24', '2025-03-24', 4, 24, 1, 9, 'monday   ', 2, 0, 'NONE') ,('2025-03-25', '1404-01-05', '1446-09-25', '2025-03-25', 5, 25, 1, 9, 'tuesday  ', 3, 0, 'NONE') ,('2025-03-26', '1404-01-06', '1446-09-26', '2025-03-26', 6, 26, 1, 9, 'wednesday', 4, 0, 'NONE') ,('2025-03-27', '1404-01-07', '1446-09-27', '2025-03-27', 7, 27, 1, 9, 'thursday ', 5, 0, 'NONE') ,('2025-03-28', '1404-01-08', '1446-09-28', '2025-03-28', 8, 28, 1, 9, 'friday   ', 6, 0, 'NONE') ,('2025-03-29', '1404-01-09', '1446-09-29', '2025-03-29', 9, 29, 1, 9, 'saturday ', 7, 0, 'NONE') ,('2025-03-30', '1404-01-10', '1446-09-30', '2025-03-30', 10, 30, 1, 9, 'sunday   ', 1, 0, 'NONE') ,('2025-03-31', '1404-01-11', '1446-10-01', '2025-03-31', 11, 1, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2025-04-01', '1404-01-12', '1446-10-02', '2025-04-01', 12, 2, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2025-04-02', '1404-01-13', '1446-10-03', '2025-04-02', 13, 3, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2025-04-03', '1404-01-14', '1446-10-04', '2025-04-03', 14, 4, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2025-04-04', '1404-01-15', '1446-10-05', '2025-04-04', 15, 5, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2025-04-05', '1404-01-16', '1446-10-06', '2025-04-05', 16, 6, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2025-04-06', '1404-01-17', '1446-10-07', '2025-04-06', 17, 7, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2025-04-07', '1404-01-18', '1446-10-08', '2025-04-07', 18, 8, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2025-04-08', '1404-01-19', '1446-10-09', '2025-04-08', 19, 9, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2025-04-09', '1404-01-20', '1446-10-10', '2025-04-09', 20, 10, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2025-04-10', '1404-01-21', '1446-10-11', '2025-04-10', 21, 11, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2025-04-11', '1404-01-22', '1446-10-12', '2025-04-11', 22, 12, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2025-04-12', '1404-01-23', '1446-10-13', '2025-04-12', 23, 13, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2025-04-13', '1404-01-24', '1446-10-14', '2025-04-13', 24, 14, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2025-04-14', '1404-01-25', '1446-10-15', '2025-04-14', 25, 15, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2025-04-15', '1404-01-26', '1446-10-16', '2025-04-15', 26, 16, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2025-04-16', '1404-01-27', '1446-10-17', '2025-04-16', 27, 17, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2025-04-17', '1404-01-28', '1446-10-18', '2025-04-17', 28, 18, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2025-04-18', '1404-01-29', '1446-10-19', '2025-04-18', 29, 19, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2025-04-19', '1404-01-30', '1446-10-20', '2025-04-19', 30, 20, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2025-04-20', '1404-01-31', '1446-10-21', '2025-04-20', 31, 21, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2025-04-21', '1404-02-01', '1446-10-22', '2025-04-21', 1, 22, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2025-04-22', '1404-02-02', '1446-10-23', '2025-04-22', 2, 23, 2, 10, 'tuesday  ', 3, 0, 'NONE') ,('2025-04-23', '1404-02-03', '1446-10-24', '2025-04-23', 3, 24, 2, 10, 'wednesday', 4, 0, 'NONE') ,('2025-04-24', '1404-02-04', '1446-10-25', '2025-04-24', 4, 25, 2, 10, 'thursday ', 5, 0, 'NONE') ,('2025-04-25', '1404-02-05', '1446-10-26', '2025-04-25', 5, 26, 2, 10, 'friday   ', 6, 0, 'NONE') ,('2025-04-26', '1404-02-06', '1446-10-27', '2025-04-26', 6, 27, 2, 10, 'saturday ', 7, 0, 'NONE') ,('2025-04-27', '1404-02-07', '1446-10-28', '2025-04-27', 7, 28, 2, 10, 'sunday   ', 1, 0, 'NONE') ,('2025-04-28', '1404-02-08', '1446-10-29', '2025-04-28', 8, 29, 2, 10, 'monday   ', 2, 0, 'NONE') ,('2025-04-29', '1404-02-09', '1446-11-01', '2025-04-29', 9, 1, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2025-04-30', '1404-02-10', '1446-11-02', '2025-04-30', 10, 2, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2025-05-01', '1404-02-11', '1446-11-03', '2025-05-01', 11, 3, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2025-05-02', '1404-02-12', '1446-11-04', '2025-05-02', 12, 4, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2025-05-03', '1404-02-13', '1446-11-05', '2025-05-03', 13, 5, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2025-05-04', '1404-02-14', '1446-11-06', '2025-05-04', 14, 6, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2025-05-05', '1404-02-15', '1446-11-07', '2025-05-05', 15, 7, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2025-05-06', '1404-02-16', '1446-11-08', '2025-05-06', 16, 8, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2025-05-07', '1404-02-17', '1446-11-09', '2025-05-07', 17, 9, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2025-05-08', '1404-02-18', '1446-11-10', '2025-05-08', 18, 10, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2025-05-09', '1404-02-19', '1446-11-11', '2025-05-09', 19, 11, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2025-05-10', '1404-02-20', '1446-11-12', '2025-05-10', 20, 12, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2025-05-11', '1404-02-21', '1446-11-13', '2025-05-11', 21, 13, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2025-05-12', '1404-02-22', '1446-11-14', '2025-05-12', 22, 14, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2025-05-13', '1404-02-23', '1446-11-15', '2025-05-13', 23, 15, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2025-05-14', '1404-02-24', '1446-11-16', '2025-05-14', 24, 16, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2025-05-15', '1404-02-25', '1446-11-17', '2025-05-15', 25, 17, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2025-05-16', '1404-02-26', '1446-11-18', '2025-05-16', 26, 18, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2025-05-17', '1404-02-27', '1446-11-19', '2025-05-17', 27, 19, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2025-05-18', '1404-02-28', '1446-11-20', '2025-05-18', 28, 20, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2025-05-19', '1404-02-29', '1446-11-21', '2025-05-19', 29, 21, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2025-05-20', '1404-02-30', '1446-11-22', '2025-05-20', 30, 22, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2025-05-21', '1404-02-31', '1446-11-23', '2025-05-21', 31, 23, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2025-05-22', '1404-03-01', '1446-11-24', '2025-05-22', 1, 24, 3, 11, 'thursday ', 5, 0, 'NONE') ,('2025-05-23', '1404-03-02', '1446-11-25', '2025-05-23', 2, 25, 3, 11, 'friday   ', 6, 0, 'NONE') ,('2025-05-24', '1404-03-03', '1446-11-26', '2025-05-24', 3, 26, 3, 11, 'saturday ', 7, 0, 'NONE') ,('2025-05-25', '1404-03-04', '1446-11-27', '2025-05-25', 4, 27, 3, 11, 'sunday   ', 1, 0, 'NONE') ,('2025-05-26', '1404-03-05', '1446-11-28', '2025-05-26', 5, 28, 3, 11, 'monday   ', 2, 0, 'NONE') ,('2025-05-27', '1404-03-06', '1446-11-29', '2025-05-27', 6, 29, 3, 11, 'tuesday  ', 3, 0, 'NONE') ,('2025-05-28', '1404-03-07', '1446-11-30', '2025-05-28', 7, 30, 3, 11, 'wednesday', 4, 0, 'NONE') ,('2025-05-29', '1404-03-08', '1446-12-01', '2025-05-29', 8, 1, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2025-05-30', '1404-03-09', '1446-12-02', '2025-05-30', 9, 2, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2025-05-31', '1404-03-10', '1446-12-03', '2025-05-31', 10, 3, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2025-06-01', '1404-03-11', '1446-12-04', '2025-06-01', 11, 4, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2025-06-02', '1404-03-12', '1446-12-05', '2025-06-02', 12, 5, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2025-06-03', '1404-03-13', '1446-12-06', '2025-06-03', 13, 6, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2025-06-04', '1404-03-14', '1446-12-07', '2025-06-04', 14, 7, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2025-06-05', '1404-03-15', '1446-12-08', '2025-06-05', 15, 8, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2025-06-06', '1404-03-16', '1446-12-09', '2025-06-06', 16, 9, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2025-06-07', '1404-03-17', '1446-12-10', '2025-06-07', 17, 10, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2025-06-08', '1404-03-18', '1446-12-11', '2025-06-08', 18, 11, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2025-06-09', '1404-03-19', '1446-12-12', '2025-06-09', 19, 12, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2025-06-10', '1404-03-20', '1446-12-13', '2025-06-10', 20, 13, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2025-06-11', '1404-03-21', '1446-12-14', '2025-06-11', 21, 14, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2025-06-12', '1404-03-22', '1446-12-15', '2025-06-12', 22, 15, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2025-06-13', '1404-03-23', '1446-12-16', '2025-06-13', 23, 16, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2025-06-14', '1404-03-24', '1446-12-17', '2025-06-14', 24, 17, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2025-06-15', '1404-03-25', '1446-12-18', '2025-06-15', 25, 18, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2025-06-16', '1404-03-26', '1446-12-19', '2025-06-16', 26, 19, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2025-06-17', '1404-03-27', '1446-12-20', '2025-06-17', 27, 20, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2025-06-18', '1404-03-28', '1446-12-21', '2025-06-18', 28, 21, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2025-06-19', '1404-03-29', '1446-12-22', '2025-06-19', 29, 22, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2025-06-20', '1404-03-30', '1446-12-23', '2025-06-20', 30, 23, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2025-06-21', '1404-03-31', '1446-12-24', '2025-06-21', 31, 24, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2025-06-22', '1404-04-01', '1446-12-25', '2025-06-22', 1, 25, 4, 12, 'sunday   ', 1, 0, 'NONE') ,('2025-06-23', '1404-04-02', '1446-12-26', '2025-06-23', 2, 26, 4, 12, 'monday   ', 2, 0, 'NONE') ,('2025-06-24', '1404-04-03', '1446-12-27', '2025-06-24', 3, 27, 4, 12, 'tuesday  ', 3, 0, 'NONE') ,('2025-06-25', '1404-04-04', '1446-12-28', '2025-06-25', 4, 28, 4, 12, 'wednesday', 4, 0, 'NONE') ,('2025-06-26', '1404-04-05', '1446-12-29', '2025-06-26', 5, 29, 4, 12, 'thursday ', 5, 0, 'NONE') ,('2025-06-27', '1404-04-06', '1447-01-01', '2025-06-27', 6, 1, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2025-06-28', '1404-04-07', '1447-01-02', '2025-06-28', 7, 2, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2025-06-29', '1404-04-08', '1447-01-03', '2025-06-29', 8, 3, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2025-06-30', '1404-04-09', '1447-01-04', '2025-06-30', 9, 4, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2025-07-01', '1404-04-10', '1447-01-05', '2025-07-01', 10, 5, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2025-07-02', '1404-04-11', '1447-01-06', '2025-07-02', 11, 6, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2025-07-03', '1404-04-12', '1447-01-07', '2025-07-03', 12, 7, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2025-07-04', '1404-04-13', '1447-01-08', '2025-07-04', 13, 8, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2025-07-05', '1404-04-14', '1447-01-09', '2025-07-05', 14, 9, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2025-07-06', '1404-04-15', '1447-01-10', '2025-07-06', 15, 10, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2025-07-07', '1404-04-16', '1447-01-11', '2025-07-07', 16, 11, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2025-07-08', '1404-04-17', '1447-01-12', '2025-07-08', 17, 12, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2025-07-09', '1404-04-18', '1447-01-13', '2025-07-09', 18, 13, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2025-07-10', '1404-04-19', '1447-01-14', '2025-07-10', 19, 14, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2025-07-11', '1404-04-20', '1447-01-15', '2025-07-11', 20, 15, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2025-07-12', '1404-04-21', '1447-01-16', '2025-07-12', 21, 16, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2025-07-13', '1404-04-22', '1447-01-17', '2025-07-13', 22, 17, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2025-07-14', '1404-04-23', '1447-01-18', '2025-07-14', 23, 18, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2025-07-15', '1404-04-24', '1447-01-19', '2025-07-15', 24, 19, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2025-07-16', '1404-04-25', '1447-01-20', '2025-07-16', 25, 20, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2025-07-17', '1404-04-26', '1447-01-21', '2025-07-17', 26, 21, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2025-07-18', '1404-04-27', '1447-01-22', '2025-07-18', 27, 22, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2025-07-19', '1404-04-28', '1447-01-23', '2025-07-19', 28, 23, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2025-07-20', '1404-04-29', '1447-01-24', '2025-07-20', 29, 24, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2025-07-21', '1404-04-30', '1447-01-25', '2025-07-21', 30, 25, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2025-07-22', '1404-04-31', '1447-01-26', '2025-07-22', 31, 26, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2025-07-23', '1404-05-01', '1447-01-27', '2025-07-23', 1, 27, 5, 1, 'wednesday', 4, 0, 'NONE') ,('2025-07-24', '1404-05-02', '1447-01-28', '2025-07-24', 2, 28, 5, 1, 'thursday ', 5, 0, 'NONE') ,('2025-07-25', '1404-05-03', '1447-01-29', '2025-07-25', 3, 29, 5, 1, 'friday   ', 6, 0, 'NONE') ,('2025-07-26', '1404-05-04', '1447-01-30', '2025-07-26', 4, 30, 5, 1, 'saturday ', 7, 0, 'NONE') ,('2025-07-27', '1404-05-05', '1447-02-01', '2025-07-27', 5, 1, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2025-07-28', '1404-05-06', '1447-02-02', '2025-07-28', 6, 2, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2025-07-29', '1404-05-07', '1447-02-03', '2025-07-29', 7, 3, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2025-07-30', '1404-05-08', '1447-02-04', '2025-07-30', 8, 4, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2025-07-31', '1404-05-09', '1447-02-05', '2025-07-31', 9, 5, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2025-08-01', '1404-05-10', '1447-02-06', '2025-08-01', 10, 6, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2025-08-02', '1404-05-11', '1447-02-07', '2025-08-02', 11, 7, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2025-08-03', '1404-05-12', '1447-02-08', '2025-08-03', 12, 8, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2025-08-04', '1404-05-13', '1447-02-09', '2025-08-04', 13, 9, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2025-08-05', '1404-05-14', '1447-02-10', '2025-08-05', 14, 10, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2025-08-06', '1404-05-15', '1447-02-11', '2025-08-06', 15, 11, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2025-08-07', '1404-05-16', '1447-02-12', '2025-08-07', 16, 12, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2025-08-08', '1404-05-17', '1447-02-13', '2025-08-08', 17, 13, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2025-08-09', '1404-05-18', '1447-02-14', '2025-08-09', 18, 14, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2025-08-10', '1404-05-19', '1447-02-15', '2025-08-10', 19, 15, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2025-08-11', '1404-05-20', '1447-02-16', '2025-08-11', 20, 16, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2025-08-12', '1404-05-21', '1447-02-17', '2025-08-12', 21, 17, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2025-08-13', '1404-05-22', '1447-02-18', '2025-08-13', 22, 18, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2025-08-14', '1404-05-23', '1447-02-19', '2025-08-14', 23, 19, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2025-08-15', '1404-05-24', '1447-02-20', '2025-08-15', 24, 20, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2025-08-16', '1404-05-25', '1447-02-21', '2025-08-16', 25, 21, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2025-08-17', '1404-05-26', '1447-02-22', '2025-08-17', 26, 22, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2025-08-18', '1404-05-27', '1447-02-23', '2025-08-18', 27, 23, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2025-08-19', '1404-05-28', '1447-02-24', '2025-08-19', 28, 24, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2025-08-20', '1404-05-29', '1447-02-25', '2025-08-20', 29, 25, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2025-08-21', '1404-05-30', '1447-02-26', '2025-08-21', 30, 26, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2025-08-22', '1404-05-31', '1447-02-27', '2025-08-22', 31, 27, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2025-08-23', '1404-06-01', '1447-02-28', '2025-08-23', 1, 28, 6, 2, 'saturday ', 7, 0, 'NONE') ,('2025-08-24', '1404-06-02', '1447-02-29', '2025-08-24', 2, 29, 6, 2, 'sunday   ', 1, 0, 'NONE') ,('2025-08-25', '1404-06-03', '1447-03-01', '2025-08-25', 3, 1, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2025-08-26', '1404-06-04', '1447-03-02', '2025-08-26', 4, 2, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2025-08-27', '1404-06-05', '1447-03-03', '2025-08-27', 5, 3, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2025-08-28', '1404-06-06', '1447-03-04', '2025-08-28', 6, 4, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2025-08-29', '1404-06-07', '1447-03-05', '2025-08-29', 7, 5, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2025-08-30', '1404-06-08', '1447-03-06', '2025-08-30', 8, 6, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2025-08-31', '1404-06-09', '1447-03-07', '2025-08-31', 9, 7, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2025-09-01', '1404-06-10', '1447-03-08', '2025-09-01', 10, 8, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2025-09-02', '1404-06-11', '1447-03-09', '2025-09-02', 11, 9, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2025-09-03', '1404-06-12', '1447-03-10', '2025-09-03', 12, 10, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2025-09-04', '1404-06-13', '1447-03-11', '2025-09-04', 13, 11, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2025-09-05', '1404-06-14', '1447-03-12', '2025-09-05', 14, 12, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2025-09-06', '1404-06-15', '1447-03-13', '2025-09-06', 15, 13, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2025-09-07', '1404-06-16', '1447-03-14', '2025-09-07', 16, 14, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2025-09-08', '1404-06-17', '1447-03-15', '2025-09-08', 17, 15, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2025-09-09', '1404-06-18', '1447-03-16', '2025-09-09', 18, 16, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2025-09-10', '1404-06-19', '1447-03-17', '2025-09-10', 19, 17, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2025-09-11', '1404-06-20', '1447-03-18', '2025-09-11', 20, 18, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2025-09-12', '1404-06-21', '1447-03-19', '2025-09-12', 21, 19, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2025-09-13', '1404-06-22', '1447-03-20', '2025-09-13', 22, 20, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2025-09-14', '1404-06-23', '1447-03-21', '2025-09-14', 23, 21, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2025-09-15', '1404-06-24', '1447-03-22', '2025-09-15', 24, 22, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2025-09-16', '1404-06-25', '1447-03-23', '2025-09-16', 25, 23, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2025-09-17', '1404-06-26', '1447-03-24', '2025-09-17', 26, 24, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2025-09-18', '1404-06-27', '1447-03-25', '2025-09-18', 27, 25, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2025-09-19', '1404-06-28', '1447-03-26', '2025-09-19', 28, 26, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2025-09-20', '1404-06-29', '1447-03-27', '2025-09-20', 29, 27, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2025-09-21', '1404-06-30', '1447-03-28', '2025-09-21', 30, 28, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2025-09-22', '1404-06-31', '1447-03-29', '2025-09-22', 31, 29, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2025-09-23', '1404-07-01', '1447-03-30', '2025-09-23', 1, 30, 7, 3, 'tuesday  ', 3, 0, 'NONE') ,('2025-09-24', '1404-07-02', '1447-04-01', '2025-09-24', 2, 1, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2025-09-25', '1404-07-03', '1447-04-02', '2025-09-25', 3, 2, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2025-09-26', '1404-07-04', '1447-04-03', '2025-09-26', 4, 3, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2025-09-27', '1404-07-05', '1447-04-04', '2025-09-27', 5, 4, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2025-09-28', '1404-07-06', '1447-04-05', '2025-09-28', 6, 5, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2025-09-29', '1404-07-07', '1447-04-06', '2025-09-29', 7, 6, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2025-09-30', '1404-07-08', '1447-04-07', '2025-09-30', 8, 7, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2025-10-01', '1404-07-09', '1447-04-08', '2025-10-01', 9, 8, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2025-10-02', '1404-07-10', '1447-04-09', '2025-10-02', 10, 9, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2025-10-03', '1404-07-11', '1447-04-10', '2025-10-03', 11, 10, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2025-10-04', '1404-07-12', '1447-04-11', '2025-10-04', 12, 11, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2025-10-05', '1404-07-13', '1447-04-12', '2025-10-05', 13, 12, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2025-10-06', '1404-07-14', '1447-04-13', '2025-10-06', 14, 13, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2025-10-07', '1404-07-15', '1447-04-14', '2025-10-07', 15, 14, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2025-10-08', '1404-07-16', '1447-04-15', '2025-10-08', 16, 15, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2025-10-09', '1404-07-17', '1447-04-16', '2025-10-09', 17, 16, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2025-10-10', '1404-07-18', '1447-04-17', '2025-10-10', 18, 17, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2025-10-11', '1404-07-19', '1447-04-18', '2025-10-11', 19, 18, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2025-10-12', '1404-07-20', '1447-04-19', '2025-10-12', 20, 19, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2025-10-13', '1404-07-21', '1447-04-20', '2025-10-13', 21, 20, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2025-10-14', '1404-07-22', '1447-04-21', '2025-10-14', 22, 21, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2025-10-15', '1404-07-23', '1447-04-22', '2025-10-15', 23, 22, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2025-10-16', '1404-07-24', '1447-04-23', '2025-10-16', 24, 23, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2025-10-17', '1404-07-25', '1447-04-24', '2025-10-17', 25, 24, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2025-10-18', '1404-07-26', '1447-04-25', '2025-10-18', 26, 25, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2025-10-19', '1404-07-27', '1447-04-26', '2025-10-19', 27, 26, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2025-10-20', '1404-07-28', '1447-04-27', '2025-10-20', 28, 27, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2025-10-21', '1404-07-29', '1447-04-28', '2025-10-21', 29, 28, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2025-10-22', '1404-07-30', '1447-04-29', '2025-10-22', 30, 29, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2025-10-23', '1404-08-01', '1447-05-01', '2025-10-23', 1, 1, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2025-10-24', '1404-08-02', '1447-05-02', '2025-10-24', 2, 2, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2025-10-25', '1404-08-03', '1447-05-03', '2025-10-25', 3, 3, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2025-10-26', '1404-08-04', '1447-05-04', '2025-10-26', 4, 4, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2025-10-27', '1404-08-05', '1447-05-05', '2025-10-27', 5, 5, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2025-10-28', '1404-08-06', '1447-05-06', '2025-10-28', 6, 6, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2025-10-29', '1404-08-07', '1447-05-07', '2025-10-29', 7, 7, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2025-10-30', '1404-08-08', '1447-05-08', '2025-10-30', 8, 8, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2025-10-31', '1404-08-09', '1447-05-09', '2025-10-31', 9, 9, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2025-11-01', '1404-08-10', '1447-05-10', '2025-11-01', 10, 10, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2025-11-02', '1404-08-11', '1447-05-11', '2025-11-02', 11, 11, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2025-11-03', '1404-08-12', '1447-05-12', '2025-11-03', 12, 12, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2025-11-04', '1404-08-13', '1447-05-13', '2025-11-04', 13, 13, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2025-11-05', '1404-08-14', '1447-05-14', '2025-11-05', 14, 14, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2025-11-06', '1404-08-15', '1447-05-15', '2025-11-06', 15, 15, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2025-11-07', '1404-08-16', '1447-05-16', '2025-11-07', 16, 16, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2025-11-08', '1404-08-17', '1447-05-17', '2025-11-08', 17, 17, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2025-11-09', '1404-08-18', '1447-05-18', '2025-11-09', 18, 18, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2025-11-10', '1404-08-19', '1447-05-19', '2025-11-10', 19, 19, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2025-11-11', '1404-08-20', '1447-05-20', '2025-11-11', 20, 20, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2025-11-12', '1404-08-21', '1447-05-21', '2025-11-12', 21, 21, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2025-11-13', '1404-08-22', '1447-05-22', '2025-11-13', 22, 22, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2025-11-14', '1404-08-23', '1447-05-23', '2025-11-14', 23, 23, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2025-11-15', '1404-08-24', '1447-05-24', '2025-11-15', 24, 24, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2025-11-16', '1404-08-25', '1447-05-25', '2025-11-16', 25, 25, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2025-11-17', '1404-08-26', '1447-05-26', '2025-11-17', 26, 26, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2025-11-18', '1404-08-27', '1447-05-27', '2025-11-18', 27, 27, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2025-11-19', '1404-08-28', '1447-05-28', '2025-11-19', 28, 28, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2025-11-20', '1404-08-29', '1447-05-29', '2025-11-20', 29, 29, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2025-11-21', '1404-08-30', '1447-05-30', '2025-11-21', 30, 30, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2025-11-22', '1404-09-01', '1447-06-01', '2025-11-22', 1, 1, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2025-11-23', '1404-09-02', '1447-06-02', '2025-11-23', 2, 2, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2025-11-24', '1404-09-03', '1447-06-03', '2025-11-24', 3, 3, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2025-11-25', '1404-09-04', '1447-06-04', '2025-11-25', 4, 4, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2025-11-26', '1404-09-05', '1447-06-05', '2025-11-26', 5, 5, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2025-11-27', '1404-09-06', '1447-06-06', '2025-11-27', 6, 6, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2025-11-28', '1404-09-07', '1447-06-07', '2025-11-28', 7, 7, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2025-11-29', '1404-09-08', '1447-06-08', '2025-11-29', 8, 8, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2025-11-30', '1404-09-09', '1447-06-09', '2025-11-30', 9, 9, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2025-12-01', '1404-09-10', '1447-06-10', '2025-12-01', 10, 10, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2025-12-02', '1404-09-11', '1447-06-11', '2025-12-02', 11, 11, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2025-12-03', '1404-09-12', '1447-06-12', '2025-12-03', 12, 12, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2025-12-04', '1404-09-13', '1447-06-13', '2025-12-04', 13, 13, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2025-12-05', '1404-09-14', '1447-06-14', '2025-12-05', 14, 14, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2025-12-06', '1404-09-15', '1447-06-15', '2025-12-06', 15, 15, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2025-12-07', '1404-09-16', '1447-06-16', '2025-12-07', 16, 16, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2025-12-08', '1404-09-17', '1447-06-17', '2025-12-08', 17, 17, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2025-12-09', '1404-09-18', '1447-06-18', '2025-12-09', 18, 18, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2025-12-10', '1404-09-19', '1447-06-19', '2025-12-10', 19, 19, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2025-12-11', '1404-09-20', '1447-06-20', '2025-12-11', 20, 20, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2025-12-12', '1404-09-21', '1447-06-21', '2025-12-12', 21, 21, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2025-12-13', '1404-09-22', '1447-06-22', '2025-12-13', 22, 22, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2025-12-14', '1404-09-23', '1447-06-23', '2025-12-14', 23, 23, 9, 6, 'sunday   ', 1, 0, 'NONE') ,('2025-12-15', '1404-09-24', '1447-06-24', '2025-12-15', 24, 24, 9, 6, 'monday   ', 2, 0, 'NONE') ,('2025-12-16', '1404-09-25', '1447-06-25', '2025-12-16', 25, 25, 9, 6, 'tuesday  ', 3, 0, 'NONE') ,('2025-12-17', '1404-09-26', '1447-06-26', '2025-12-17', 26, 26, 9, 6, 'wednesday', 4, 0, 'NONE') ,('2025-12-18', '1404-09-27', '1447-06-27', '2025-12-18', 27, 27, 9, 6, 'thursday ', 5, 0, 'NONE') ,('2025-12-19', '1404-09-28', '1447-06-28', '2025-12-19', 28, 28, 9, 6, 'friday   ', 6, 0, 'NONE') ,('2025-12-20', '1404-09-29', '1447-06-29', '2025-12-20', 29, 29, 9, 6, 'saturday ', 7, 0, 'NONE') ,('2025-12-21', '1404-09-30', '1447-07-01', '2025-12-21', 30, 1, 9, 7, 'sunday   ', 1, 0, 'NONE') ,('2025-12-22', '1404-10-01', '1447-07-02', '2025-12-22', 1, 2, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2025-12-23', '1404-10-02', '1447-07-03', '2025-12-23', 2, 3, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2025-12-24', '1404-10-03', '1447-07-04', '2025-12-24', 3, 4, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2025-12-25', '1404-10-04', '1447-07-05', '2025-12-25', 4, 5, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2025-12-26', '1404-10-05', '1447-07-06', '2025-12-26', 5, 6, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2025-12-27', '1404-10-06', '1447-07-07', '2025-12-27', 6, 7, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2025-12-28', '1404-10-07', '1447-07-08', '2025-12-28', 7, 8, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2025-12-29', '1404-10-08', '1447-07-09', '2025-12-29', 8, 9, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2025-12-30', '1404-10-09', '1447-07-10', '2025-12-30', 9, 10, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2025-12-31', '1404-10-10', '1447-07-11', '2025-12-31', 10, 11, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2026-01-01', '1404-10-11', '1447-07-12', '2026-01-01', 11, 12, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2026-01-02', '1404-10-12', '1447-07-13', '2026-01-02', 12, 13, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2026-01-03', '1404-10-13', '1447-07-14', '2026-01-03', 13, 14, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2026-01-04', '1404-10-14', '1447-07-15', '2026-01-04', 14, 15, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2026-01-05', '1404-10-15', '1447-07-16', '2026-01-05', 15, 16, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2026-01-06', '1404-10-16', '1447-07-17', '2026-01-06', 16, 17, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2026-01-07', '1404-10-17', '1447-07-18', '2026-01-07', 17, 18, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2026-01-08', '1404-10-18', '1447-07-19', '2026-01-08', 18, 19, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2026-01-09', '1404-10-19', '1447-07-20', '2026-01-09', 19, 20, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2026-01-10', '1404-10-20', '1447-07-21', '2026-01-10', 20, 21, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2026-01-11', '1404-10-21', '1447-07-22', '2026-01-11', 21, 22, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2026-01-12', '1404-10-22', '1447-07-23', '2026-01-12', 22, 23, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2026-01-13', '1404-10-23', '1447-07-24', '2026-01-13', 23, 24, 10, 7, 'tuesday  ', 3, 0, 'NONE') ,('2026-01-14', '1404-10-24', '1447-07-25', '2026-01-14', 24, 25, 10, 7, 'wednesday', 4, 0, 'NONE') ,('2026-01-15', '1404-10-25', '1447-07-26', '2026-01-15', 25, 26, 10, 7, 'thursday ', 5, 0, 'NONE') ,('2026-01-16', '1404-10-26', '1447-07-27', '2026-01-16', 26, 27, 10, 7, 'friday   ', 6, 0, 'NONE') ,('2026-01-17', '1404-10-27', '1447-07-28', '2026-01-17', 27, 28, 10, 7, 'saturday ', 7, 0, 'NONE') ,('2026-01-18', '1404-10-28', '1447-07-29', '2026-01-18', 28, 29, 10, 7, 'sunday   ', 1, 0, 'NONE') ,('2026-01-19', '1404-10-29', '1447-07-30', '2026-01-19', 29, 30, 10, 7, 'monday   ', 2, 0, 'NONE') ,('2026-01-20', '1404-10-30', '1447-08-01', '2026-01-20', 30, 1, 10, 8, 'tuesday  ', 3, 0, 'NONE') ,('2026-01-21', '1404-11-01', '1447-08-02', '2026-01-21', 1, 2, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2026-01-22', '1404-11-02', '1447-08-03', '2026-01-22', 2, 3, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2026-01-23', '1404-11-03', '1447-08-04', '2026-01-23', 3, 4, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2026-01-24', '1404-11-04', '1447-08-05', '2026-01-24', 4, 5, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2026-01-25', '1404-11-05', '1447-08-06', '2026-01-25', 5, 6, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2026-01-26', '1404-11-06', '1447-08-07', '2026-01-26', 6, 7, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2026-01-27', '1404-11-07', '1447-08-08', '2026-01-27', 7, 8, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2026-01-28', '1404-11-08', '1447-08-09', '2026-01-28', 8, 9, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2026-01-29', '1404-11-09', '1447-08-10', '2026-01-29', 9, 10, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2026-01-30', '1404-11-10', '1447-08-11', '2026-01-30', 10, 11, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2026-01-31', '1404-11-11', '1447-08-12', '2026-01-31', 11, 12, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2026-02-01', '1404-11-12', '1447-08-13', '2026-02-01', 12, 13, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2026-02-02', '1404-11-13', '1447-08-14', '2026-02-02', 13, 14, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2026-02-03', '1404-11-14', '1447-08-15', '2026-02-03', 14, 15, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2026-02-04', '1404-11-15', '1447-08-16', '2026-02-04', 15, 16, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2026-02-05', '1404-11-16', '1447-08-17', '2026-02-05', 16, 17, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2026-02-06', '1404-11-17', '1447-08-18', '2026-02-06', 17, 18, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2026-02-07', '1404-11-18', '1447-08-19', '2026-02-07', 18, 19, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2026-02-08', '1404-11-19', '1447-08-20', '2026-02-08', 19, 20, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2026-02-09', '1404-11-20', '1447-08-21', '2026-02-09', 20, 21, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2026-02-10', '1404-11-21', '1447-08-22', '2026-02-10', 21, 22, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2026-02-11', '1404-11-22', '1447-08-23', '2026-02-11', 22, 23, 11, 8, 'wednesday', 4, 0, 'NONE') ,('2026-02-12', '1404-11-23', '1447-08-24', '2026-02-12', 23, 24, 11, 8, 'thursday ', 5, 0, 'NONE') ,('2026-02-13', '1404-11-24', '1447-08-25', '2026-02-13', 24, 25, 11, 8, 'friday   ', 6, 0, 'NONE') ,('2026-02-14', '1404-11-25', '1447-08-26', '2026-02-14', 25, 26, 11, 8, 'saturday ', 7, 0, 'NONE') ,('2026-02-15', '1404-11-26', '1447-08-27', '2026-02-15', 26, 27, 11, 8, 'sunday   ', 1, 0, 'NONE') ,('2026-02-16', '1404-11-27', '1447-08-28', '2026-02-16', 27, 28, 11, 8, 'monday   ', 2, 0, 'NONE') ,('2026-02-17', '1404-11-28', '1447-08-29', '2026-02-17', 28, 29, 11, 8, 'tuesday  ', 3, 0, 'NONE') ,('2026-02-18', '1404-11-29', '1447-09-01', '2026-02-18', 29, 1, 11, 9, 'wednesday', 4, 0, 'NONE') ,('2026-02-19', '1404-11-30', '1447-09-02', '2026-02-19', 30, 2, 11, 9, 'thursday ', 5, 0, 'NONE') ,('2026-02-20', '1404-12-01', '1447-09-03', '2026-02-20', 1, 3, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2026-02-21', '1404-12-02', '1447-09-04', '2026-02-21', 2, 4, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2026-02-22', '1404-12-03', '1447-09-05', '2026-02-22', 3, 5, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2026-02-23', '1404-12-04', '1447-09-06', '2026-02-23', 4, 6, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2026-02-24', '1404-12-05', '1447-09-07', '2026-02-24', 5, 7, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2026-02-25', '1404-12-06', '1447-09-08', '2026-02-25', 6, 8, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2026-02-26', '1404-12-07', '1447-09-09', '2026-02-26', 7, 9, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2026-02-27', '1404-12-08', '1447-09-10', '2026-02-27', 8, 10, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2026-02-28', '1404-12-09', '1447-09-11', '2026-02-28', 9, 11, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2026-03-01', '1404-12-10', '1447-09-12', '2026-03-01', 10, 12, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2026-03-02', '1404-12-11', '1447-09-13', '2026-03-02', 11, 13, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2026-03-03', '1404-12-12', '1447-09-14', '2026-03-03', 12, 14, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2026-03-04', '1404-12-13', '1447-09-15', '2026-03-04', 13, 15, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2026-03-05', '1404-12-14', '1447-09-16', '2026-03-05', 14, 16, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2026-03-06', '1404-12-15', '1447-09-17', '2026-03-06', 15, 17, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2026-03-07', '1404-12-16', '1447-09-18', '2026-03-07', 16, 18, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2026-03-08', '1404-12-17', '1447-09-19', '2026-03-08', 17, 19, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2026-03-09', '1404-12-18', '1447-09-20', '2026-03-09', 18, 20, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2026-03-10', '1404-12-19', '1447-09-21', '2026-03-10', 19, 21, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2026-03-11', '1404-12-20', '1447-09-22', '2026-03-11', 20, 22, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2026-03-12', '1404-12-21', '1447-09-23', '2026-03-12', 21, 23, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2026-03-13', '1404-12-22', '1447-09-24', '2026-03-13', 22, 24, 12, 9, 'friday   ', 6, 0, 'NONE') ,('2026-03-14', '1404-12-23', '1447-09-25', '2026-03-14', 23, 25, 12, 9, 'saturday ', 7, 0, 'NONE') ,('2026-03-15', '1404-12-24', '1447-09-26', '2026-03-15', 24, 26, 12, 9, 'sunday   ', 1, 0, 'NONE') ,('2026-03-16', '1404-12-25', '1447-09-27', '2026-03-16', 25, 27, 12, 9, 'monday   ', 2, 0, 'NONE') ,('2026-03-17', '1404-12-26', '1447-09-28', '2026-03-17', 26, 28, 12, 9, 'tuesday  ', 3, 0, 'NONE') ,('2026-03-18', '1404-12-27', '1447-09-29', '2026-03-18', 27, 29, 12, 9, 'wednesday', 4, 0, 'NONE') ,('2026-03-19', '1404-12-28', '1447-09-30', '2026-03-19', 28, 30, 12, 9, 'thursday ', 5, 0, 'NONE') ,('2026-03-20', '1404-12-29', '1447-10-01', '2026-03-20', 29, 1, 12, 10, 'friday   ', 6, 0, 'NONE') ,('2026-03-21', '1405-01-01', '1447-10-02', '2026-03-21', 1, 2, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2026-03-22', '1405-01-02', '1447-10-03', '2026-03-22', 2, 3, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2026-03-23', '1405-01-03', '1447-10-04', '2026-03-23', 3, 4, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2026-03-24', '1405-01-04', '1447-10-05', '2026-03-24', 4, 5, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2026-03-25', '1405-01-05', '1447-10-06', '2026-03-25', 5, 6, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2026-03-26', '1405-01-06', '1447-10-07', '2026-03-26', 6, 7, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2026-03-27', '1405-01-07', '1447-10-08', '2026-03-27', 7, 8, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2026-03-28', '1405-01-08', '1447-10-09', '2026-03-28', 8, 9, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2026-03-29', '1405-01-09', '1447-10-10', '2026-03-29', 9, 10, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2026-03-30', '1405-01-10', '1447-10-11', '2026-03-30', 10, 11, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2026-03-31', '1405-01-11', '1447-10-12', '2026-03-31', 11, 12, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2026-04-01', '1405-01-12', '1447-10-13', '2026-04-01', 12, 13, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2026-04-02', '1405-01-13', '1447-10-14', '2026-04-02', 13, 14, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2026-04-03', '1405-01-14', '1447-10-15', '2026-04-03', 14, 15, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2026-04-04', '1405-01-15', '1447-10-16', '2026-04-04', 15, 16, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2026-04-05', '1405-01-16', '1447-10-17', '2026-04-05', 16, 17, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2026-04-06', '1405-01-17', '1447-10-18', '2026-04-06', 17, 18, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2026-04-07', '1405-01-18', '1447-10-19', '2026-04-07', 18, 19, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2026-04-08', '1405-01-19', '1447-10-20', '2026-04-08', 19, 20, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2026-04-09', '1405-01-20', '1447-10-21', '2026-04-09', 20, 21, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2026-04-10', '1405-01-21', '1447-10-22', '2026-04-10', 21, 22, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2026-04-11', '1405-01-22', '1447-10-23', '2026-04-11', 22, 23, 1, 10, 'saturday ', 7, 0, 'NONE') ,('2026-04-12', '1405-01-23', '1447-10-24', '2026-04-12', 23, 24, 1, 10, 'sunday   ', 1, 0, 'NONE') ,('2026-04-13', '1405-01-24', '1447-10-25', '2026-04-13', 24, 25, 1, 10, 'monday   ', 2, 0, 'NONE') ,('2026-04-14', '1405-01-25', '1447-10-26', '2026-04-14', 25, 26, 1, 10, 'tuesday  ', 3, 0, 'NONE') ,('2026-04-15', '1405-01-26', '1447-10-27', '2026-04-15', 26, 27, 1, 10, 'wednesday', 4, 0, 'NONE') ,('2026-04-16', '1405-01-27', '1447-10-28', '2026-04-16', 27, 28, 1, 10, 'thursday ', 5, 0, 'NONE') ,('2026-04-17', '1405-01-28', '1447-10-29', '2026-04-17', 28, 29, 1, 10, 'friday   ', 6, 0, 'NONE') ,('2026-04-18', '1405-01-29', '1447-11-01', '2026-04-18', 29, 1, 1, 11, 'saturday ', 7, 0, 'NONE') ,('2026-04-19', '1405-01-30', '1447-11-02', '2026-04-19', 30, 2, 1, 11, 'sunday   ', 1, 0, 'NONE') ,('2026-04-20', '1405-01-31', '1447-11-03', '2026-04-20', 31, 3, 1, 11, 'monday   ', 2, 0, 'NONE') ,('2026-04-21', '1405-02-01', '1447-11-04', '2026-04-21', 1, 4, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2026-04-22', '1405-02-02', '1447-11-05', '2026-04-22', 2, 5, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2026-04-23', '1405-02-03', '1447-11-06', '2026-04-23', 3, 6, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2026-04-24', '1405-02-04', '1447-11-07', '2026-04-24', 4, 7, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2026-04-25', '1405-02-05', '1447-11-08', '2026-04-25', 5, 8, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2026-04-26', '1405-02-06', '1447-11-09', '2026-04-26', 6, 9, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2026-04-27', '1405-02-07', '1447-11-10', '2026-04-27', 7, 10, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2026-04-28', '1405-02-08', '1447-11-11', '2026-04-28', 8, 11, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2026-04-29', '1405-02-09', '1447-11-12', '2026-04-29', 9, 12, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2026-04-30', '1405-02-10', '1447-11-13', '2026-04-30', 10, 13, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2026-05-01', '1405-02-11', '1447-11-14', '2026-05-01', 11, 14, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2026-05-02', '1405-02-12', '1447-11-15', '2026-05-02', 12, 15, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2026-05-03', '1405-02-13', '1447-11-16', '2026-05-03', 13, 16, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2026-05-04', '1405-02-14', '1447-11-17', '2026-05-04', 14, 17, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2026-05-05', '1405-02-15', '1447-11-18', '2026-05-05', 15, 18, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2026-05-06', '1405-02-16', '1447-11-19', '2026-05-06', 16, 19, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2026-05-07', '1405-02-17', '1447-11-20', '2026-05-07', 17, 20, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2026-05-08', '1405-02-18', '1447-11-21', '2026-05-08', 18, 21, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2026-05-09', '1405-02-19', '1447-11-22', '2026-05-09', 19, 22, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2026-05-10', '1405-02-20', '1447-11-23', '2026-05-10', 20, 23, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2026-05-11', '1405-02-21', '1447-11-24', '2026-05-11', 21, 24, 2, 11, 'monday   ', 2, 0, 'NONE') ,('2026-05-12', '1405-02-22', '1447-11-25', '2026-05-12', 22, 25, 2, 11, 'tuesday  ', 3, 0, 'NONE') ,('2026-05-13', '1405-02-23', '1447-11-26', '2026-05-13', 23, 26, 2, 11, 'wednesday', 4, 0, 'NONE') ,('2026-05-14', '1405-02-24', '1447-11-27', '2026-05-14', 24, 27, 2, 11, 'thursday ', 5, 0, 'NONE') ,('2026-05-15', '1405-02-25', '1447-11-28', '2026-05-15', 25, 28, 2, 11, 'friday   ', 6, 0, 'NONE') ,('2026-05-16', '1405-02-26', '1447-11-29', '2026-05-16', 26, 29, 2, 11, 'saturday ', 7, 0, 'NONE') ,('2026-05-17', '1405-02-27', '1447-11-30', '2026-05-17', 27, 30, 2, 11, 'sunday   ', 1, 0, 'NONE') ,('2026-05-18', '1405-02-28', '1447-12-01', '2026-05-18', 28, 1, 2, 12, 'monday   ', 2, 0, 'NONE') ,('2026-05-19', '1405-02-29', '1447-12-02', '2026-05-19', 29, 2, 2, 12, 'tuesday  ', 3, 0, 'NONE') ,('2026-05-20', '1405-02-30', '1447-12-03', '2026-05-20', 30, 3, 2, 12, 'wednesday', 4, 0, 'NONE') ,('2026-05-21', '1405-02-31', '1447-12-04', '2026-05-21', 31, 4, 2, 12, 'thursday ', 5, 0, 'NONE') ,('2026-05-22', '1405-03-01', '1447-12-05', '2026-05-22', 1, 5, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2026-05-23', '1405-03-02', '1447-12-06', '2026-05-23', 2, 6, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2026-05-24', '1405-03-03', '1447-12-07', '2026-05-24', 3, 7, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2026-05-25', '1405-03-04', '1447-12-08', '2026-05-25', 4, 8, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2026-05-26', '1405-03-05', '1447-12-09', '2026-05-26', 5, 9, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2026-05-27', '1405-03-06', '1447-12-10', '2026-05-27', 6, 10, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2026-05-28', '1405-03-07', '1447-12-11', '2026-05-28', 7, 11, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2026-05-29', '1405-03-08', '1447-12-12', '2026-05-29', 8, 12, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2026-05-30', '1405-03-09', '1447-12-13', '2026-05-30', 9, 13, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2026-05-31', '1405-03-10', '1447-12-14', '2026-05-31', 10, 14, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2026-06-01', '1405-03-11', '1447-12-15', '2026-06-01', 11, 15, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2026-06-02', '1405-03-12', '1447-12-16', '2026-06-02', 12, 16, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2026-06-03', '1405-03-13', '1447-12-17', '2026-06-03', 13, 17, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2026-06-04', '1405-03-14', '1447-12-18', '2026-06-04', 14, 18, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2026-06-05', '1405-03-15', '1447-12-19', '2026-06-05', 15, 19, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2026-06-06', '1405-03-16', '1447-12-20', '2026-06-06', 16, 20, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2026-06-07', '1405-03-17', '1447-12-21', '2026-06-07', 17, 21, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2026-06-08', '1405-03-18', '1447-12-22', '2026-06-08', 18, 22, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2026-06-09', '1405-03-19', '1447-12-23', '2026-06-09', 19, 23, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2026-06-10', '1405-03-20', '1447-12-24', '2026-06-10', 20, 24, 3, 12, 'wednesday', 4, 0, 'NONE') ,('2026-06-11', '1405-03-21', '1447-12-25', '2026-06-11', 21, 25, 3, 12, 'thursday ', 5, 0, 'NONE') ,('2026-06-12', '1405-03-22', '1447-12-26', '2026-06-12', 22, 26, 3, 12, 'friday   ', 6, 0, 'NONE') ,('2026-06-13', '1405-03-23', '1447-12-27', '2026-06-13', 23, 27, 3, 12, 'saturday ', 7, 0, 'NONE') ,('2026-06-14', '1405-03-24', '1447-12-28', '2026-06-14', 24, 28, 3, 12, 'sunday   ', 1, 0, 'NONE') ,('2026-06-15', '1405-03-25', '1447-12-29', '2026-06-15', 25, 29, 3, 12, 'monday   ', 2, 0, 'NONE') ,('2026-06-16', '1405-03-26', '1447-12-30', '2026-06-16', 26, 30, 3, 12, 'tuesday  ', 3, 0, 'NONE') ,('2026-06-17', '1405-03-27', '1448-01-01', '2026-06-17', 27, 1, 3, 1, 'wednesday', 4, 0, 'NONE') ,('2026-06-18', '1405-03-28', '1448-01-02', '2026-06-18', 28, 2, 3, 1, 'thursday ', 5, 0, 'NONE') ,('2026-06-19', '1405-03-29', '1448-01-03', '2026-06-19', 29, 3, 3, 1, 'friday   ', 6, 0, 'NONE') ,('2026-06-20', '1405-03-30', '1448-01-04', '2026-06-20', 30, 4, 3, 1, 'saturday ', 7, 0, 'NONE') ,('2026-06-21', '1405-03-31', '1448-01-05', '2026-06-21', 31, 5, 3, 1, 'sunday   ', 1, 0, 'NONE') ,('2026-06-22', '1405-04-01', '1448-01-06', '2026-06-22', 1, 6, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2026-06-23', '1405-04-02', '1448-01-07', '2026-06-23', 2, 7, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2026-06-24', '1405-04-03', '1448-01-08', '2026-06-24', 3, 8, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2026-06-25', '1405-04-04', '1448-01-09', '2026-06-25', 4, 9, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2026-06-26', '1405-04-05', '1448-01-10', '2026-06-26', 5, 10, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2026-06-27', '1405-04-06', '1448-01-11', '2026-06-27', 6, 11, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2026-06-28', '1405-04-07', '1448-01-12', '2026-06-28', 7, 12, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2026-06-29', '1405-04-08', '1448-01-13', '2026-06-29', 8, 13, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2026-06-30', '1405-04-09', '1448-01-14', '2026-06-30', 9, 14, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2026-07-01', '1405-04-10', '1448-01-15', '2026-07-01', 10, 15, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2026-07-02', '1405-04-11', '1448-01-16', '2026-07-02', 11, 16, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2026-07-03', '1405-04-12', '1448-01-17', '2026-07-03', 12, 17, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2026-07-04', '1405-04-13', '1448-01-18', '2026-07-04', 13, 18, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2026-07-05', '1405-04-14', '1448-01-19', '2026-07-05', 14, 19, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2026-07-06', '1405-04-15', '1448-01-20', '2026-07-06', 15, 20, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2026-07-07', '1405-04-16', '1448-01-21', '2026-07-07', 16, 21, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2026-07-08', '1405-04-17', '1448-01-22', '2026-07-08', 17, 22, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2026-07-09', '1405-04-18', '1448-01-23', '2026-07-09', 18, 23, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2026-07-10', '1405-04-19', '1448-01-24', '2026-07-10', 19, 24, 4, 1, 'friday   ', 6, 0, 'NONE') ,('2026-07-11', '1405-04-20', '1448-01-25', '2026-07-11', 20, 25, 4, 1, 'saturday ', 7, 0, 'NONE') ,('2026-07-12', '1405-04-21', '1448-01-26', '2026-07-12', 21, 26, 4, 1, 'sunday   ', 1, 0, 'NONE') ,('2026-07-13', '1405-04-22', '1448-01-27', '2026-07-13', 22, 27, 4, 1, 'monday   ', 2, 0, 'NONE') ,('2026-07-14', '1405-04-23', '1448-01-28', '2026-07-14', 23, 28, 4, 1, 'tuesday  ', 3, 0, 'NONE') ,('2026-07-15', '1405-04-24', '1448-01-29', '2026-07-15', 24, 29, 4, 1, 'wednesday', 4, 0, 'NONE') ,('2026-07-16', '1405-04-25', '1448-01-30', '2026-07-16', 25, 30, 4, 1, 'thursday ', 5, 0, 'NONE') ,('2026-07-17', '1405-04-26', '1448-02-01', '2026-07-17', 26, 1, 4, 2, 'friday   ', 6, 0, 'NONE') ,('2026-07-18', '1405-04-27', '1448-02-02', '2026-07-18', 27, 2, 4, 2, 'saturday ', 7, 0, 'NONE') ,('2026-07-19', '1405-04-28', '1448-02-03', '2026-07-19', 28, 3, 4, 2, 'sunday   ', 1, 0, 'NONE') ,('2026-07-20', '1405-04-29', '1448-02-04', '2026-07-20', 29, 4, 4, 2, 'monday   ', 2, 0, 'NONE') ,('2026-07-21', '1405-04-30', '1448-02-05', '2026-07-21', 30, 5, 4, 2, 'tuesday  ', 3, 0, 'NONE') ,('2026-07-22', '1405-04-31', '1448-02-06', '2026-07-22', 31, 6, 4, 2, 'wednesday', 4, 0, 'NONE') ,('2026-07-23', '1405-05-01', '1448-02-07', '2026-07-23', 1, 7, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2026-07-24', '1405-05-02', '1448-02-08', '2026-07-24', 2, 8, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2026-07-25', '1405-05-03', '1448-02-09', '2026-07-25', 3, 9, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2026-07-26', '1405-05-04', '1448-02-10', '2026-07-26', 4, 10, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2026-07-27', '1405-05-05', '1448-02-11', '2026-07-27', 5, 11, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2026-07-28', '1405-05-06', '1448-02-12', '2026-07-28', 6, 12, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2026-07-29', '1405-05-07', '1448-02-13', '2026-07-29', 7, 13, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2026-07-30', '1405-05-08', '1448-02-14', '2026-07-30', 8, 14, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2026-07-31', '1405-05-09', '1448-02-15', '2026-07-31', 9, 15, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2026-08-01', '1405-05-10', '1448-02-16', '2026-08-01', 10, 16, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2026-08-02', '1405-05-11', '1448-02-17', '2026-08-02', 11, 17, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2026-08-03', '1405-05-12', '1448-02-18', '2026-08-03', 12, 18, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2026-08-04', '1405-05-13', '1448-02-19', '2026-08-04', 13, 19, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2026-08-05', '1405-05-14', '1448-02-20', '2026-08-05', 14, 20, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2026-08-06', '1405-05-15', '1448-02-21', '2026-08-06', 15, 21, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2026-08-07', '1405-05-16', '1448-02-22', '2026-08-07', 16, 22, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2026-08-08', '1405-05-17', '1448-02-23', '2026-08-08', 17, 23, 5, 2, 'saturday ', 7, 0, 'NONE') ,('2026-08-09', '1405-05-18', '1448-02-24', '2026-08-09', 18, 24, 5, 2, 'sunday   ', 1, 0, 'NONE') ,('2026-08-10', '1405-05-19', '1448-02-25', '2026-08-10', 19, 25, 5, 2, 'monday   ', 2, 0, 'NONE') ,('2026-08-11', '1405-05-20', '1448-02-26', '2026-08-11', 20, 26, 5, 2, 'tuesday  ', 3, 0, 'NONE') ,('2026-08-12', '1405-05-21', '1448-02-27', '2026-08-12', 21, 27, 5, 2, 'wednesday', 4, 0, 'NONE') ,('2026-08-13', '1405-05-22', '1448-02-28', '2026-08-13', 22, 28, 5, 2, 'thursday ', 5, 0, 'NONE') ,('2026-08-14', '1405-05-23', '1448-02-29', '2026-08-14', 23, 29, 5, 2, 'friday   ', 6, 0, 'NONE') ,('2026-08-15', '1405-05-24', '1448-03-01', '2026-08-15', 24, 1, 5, 3, 'saturday ', 7, 0, 'NONE') ,('2026-08-16', '1405-05-25', '1448-03-02', '2026-08-16', 25, 2, 5, 3, 'sunday   ', 1, 0, 'NONE') ,('2026-08-17', '1405-05-26', '1448-03-03', '2026-08-17', 26, 3, 5, 3, 'monday   ', 2, 0, 'NONE') ,('2026-08-18', '1405-05-27', '1448-03-04', '2026-08-18', 27, 4, 5, 3, 'tuesday  ', 3, 0, 'NONE') ,('2026-08-19', '1405-05-28', '1448-03-05', '2026-08-19', 28, 5, 5, 3, 'wednesday', 4, 0, 'NONE') ,('2026-08-20', '1405-05-29', '1448-03-06', '2026-08-20', 29, 6, 5, 3, 'thursday ', 5, 0, 'NONE') ,('2026-08-21', '1405-05-30', '1448-03-07', '2026-08-21', 30, 7, 5, 3, 'friday   ', 6, 0, 'NONE') ,('2026-08-22', '1405-05-31', '1448-03-08', '2026-08-22', 31, 8, 5, 3, 'saturday ', 7, 0, 'NONE') ,('2026-08-23', '1405-06-01', '1448-03-09', '2026-08-23', 1, 9, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2026-08-24', '1405-06-02', '1448-03-10', '2026-08-24', 2, 10, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2026-08-25', '1405-06-03', '1448-03-11', '2026-08-25', 3, 11, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2026-08-26', '1405-06-04', '1448-03-12', '2026-08-26', 4, 12, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2026-08-27', '1405-06-05', '1448-03-13', '2026-08-27', 5, 13, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2026-08-28', '1405-06-06', '1448-03-14', '2026-08-28', 6, 14, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2026-08-29', '1405-06-07', '1448-03-15', '2026-08-29', 7, 15, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2026-08-30', '1405-06-08', '1448-03-16', '2026-08-30', 8, 16, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2026-08-31', '1405-06-09', '1448-03-17', '2026-08-31', 9, 17, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2026-09-01', '1405-06-10', '1448-03-18', '2026-09-01', 10, 18, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2026-09-02', '1405-06-11', '1448-03-19', '2026-09-02', 11, 19, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2026-09-03', '1405-06-12', '1448-03-20', '2026-09-03', 12, 20, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2026-09-04', '1405-06-13', '1448-03-21', '2026-09-04', 13, 21, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2026-09-05', '1405-06-14', '1448-03-22', '2026-09-05', 14, 22, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2026-09-06', '1405-06-15', '1448-03-23', '2026-09-06', 15, 23, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2026-09-07', '1405-06-16', '1448-03-24', '2026-09-07', 16, 24, 6, 3, 'monday   ', 2, 0, 'NONE') ,('2026-09-08', '1405-06-17', '1448-03-25', '2026-09-08', 17, 25, 6, 3, 'tuesday  ', 3, 0, 'NONE') ,('2026-09-09', '1405-06-18', '1448-03-26', '2026-09-09', 18, 26, 6, 3, 'wednesday', 4, 0, 'NONE') ,('2026-09-10', '1405-06-19', '1448-03-27', '2026-09-10', 19, 27, 6, 3, 'thursday ', 5, 0, 'NONE') ,('2026-09-11', '1405-06-20', '1448-03-28', '2026-09-11', 20, 28, 6, 3, 'friday   ', 6, 0, 'NONE') ,('2026-09-12', '1405-06-21', '1448-03-29', '2026-09-12', 21, 29, 6, 3, 'saturday ', 7, 0, 'NONE') ,('2026-09-13', '1405-06-22', '1448-03-30', '2026-09-13', 22, 30, 6, 3, 'sunday   ', 1, 0, 'NONE') ,('2026-09-14', '1405-06-23', '1448-04-01', '2026-09-14', 23, 1, 6, 4, 'monday   ', 2, 0, 'NONE') ,('2026-09-15', '1405-06-24', '1448-04-02', '2026-09-15', 24, 2, 6, 4, 'tuesday  ', 3, 0, 'NONE') ,('2026-09-16', '1405-06-25', '1448-04-03', '2026-09-16', 25, 3, 6, 4, 'wednesday', 4, 0, 'NONE') ,('2026-09-17', '1405-06-26', '1448-04-04', '2026-09-17', 26, 4, 6, 4, 'thursday ', 5, 0, 'NONE') ,('2026-09-18', '1405-06-27', '1448-04-05', '2026-09-18', 27, 5, 6, 4, 'friday   ', 6, 0, 'NONE') ,('2026-09-19', '1405-06-28', '1448-04-06', '2026-09-19', 28, 6, 6, 4, 'saturday ', 7, 0, 'NONE') ,('2026-09-20', '1405-06-29', '1448-04-07', '2026-09-20', 29, 7, 6, 4, 'sunday   ', 1, 0, 'NONE') ,('2026-09-21', '1405-06-30', '1448-04-08', '2026-09-21', 30, 8, 6, 4, 'monday   ', 2, 0, 'NONE') ,('2026-09-22', '1405-06-31', '1448-04-09', '2026-09-22', 31, 9, 6, 4, 'tuesday  ', 3, 0, 'NONE') ,('2026-09-23', '1405-07-01', '1448-04-10', '2026-09-23', 1, 10, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2026-09-24', '1405-07-02', '1448-04-11', '2026-09-24', 2, 11, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2026-09-25', '1405-07-03', '1448-04-12', '2026-09-25', 3, 12, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2026-09-26', '1405-07-04', '1448-04-13', '2026-09-26', 4, 13, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2026-09-27', '1405-07-05', '1448-04-14', '2026-09-27', 5, 14, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2026-09-28', '1405-07-06', '1448-04-15', '2026-09-28', 6, 15, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2026-09-29', '1405-07-07', '1448-04-16', '2026-09-29', 7, 16, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2026-09-30', '1405-07-08', '1448-04-17', '2026-09-30', 8, 17, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2026-10-01', '1405-07-09', '1448-04-18', '2026-10-01', 9, 18, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2026-10-02', '1405-07-10', '1448-04-19', '2026-10-02', 10, 19, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2026-10-03', '1405-07-11', '1448-04-20', '2026-10-03', 11, 20, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2026-10-04', '1405-07-12', '1448-04-21', '2026-10-04', 12, 21, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2026-10-05', '1405-07-13', '1448-04-22', '2026-10-05', 13, 22, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2026-10-06', '1405-07-14', '1448-04-23', '2026-10-06', 14, 23, 7, 4, 'tuesday  ', 3, 0, 'NONE') ,('2026-10-07', '1405-07-15', '1448-04-24', '2026-10-07', 15, 24, 7, 4, 'wednesday', 4, 0, 'NONE') ,('2026-10-08', '1405-07-16', '1448-04-25', '2026-10-08', 16, 25, 7, 4, 'thursday ', 5, 0, 'NONE') ,('2026-10-09', '1405-07-17', '1448-04-26', '2026-10-09', 17, 26, 7, 4, 'friday   ', 6, 0, 'NONE') ,('2026-10-10', '1405-07-18', '1448-04-27', '2026-10-10', 18, 27, 7, 4, 'saturday ', 7, 0, 'NONE') ,('2026-10-11', '1405-07-19', '1448-04-28', '2026-10-11', 19, 28, 7, 4, 'sunday   ', 1, 0, 'NONE') ,('2026-10-12', '1405-07-20', '1448-04-29', '2026-10-12', 20, 29, 7, 4, 'monday   ', 2, 0, 'NONE') ,('2026-10-13', '1405-07-21', '1448-05-01', '2026-10-13', 21, 1, 7, 5, 'tuesday  ', 3, 0, 'NONE') ,('2026-10-14', '1405-07-22', '1448-05-02', '2026-10-14', 22, 2, 7, 5, 'wednesday', 4, 0, 'NONE') ,('2026-10-15', '1405-07-23', '1448-05-03', '2026-10-15', 23, 3, 7, 5, 'thursday ', 5, 0, 'NONE') ,('2026-10-16', '1405-07-24', '1448-05-04', '2026-10-16', 24, 4, 7, 5, 'friday   ', 6, 0, 'NONE') ,('2026-10-17', '1405-07-25', '1448-05-05', '2026-10-17', 25, 5, 7, 5, 'saturday ', 7, 0, 'NONE') ,('2026-10-18', '1405-07-26', '1448-05-06', '2026-10-18', 26, 6, 7, 5, 'sunday   ', 1, 0, 'NONE') ,('2026-10-19', '1405-07-27', '1448-05-07', '2026-10-19', 27, 7, 7, 5, 'monday   ', 2, 0, 'NONE') ,('2026-10-20', '1405-07-28', '1448-05-08', '2026-10-20', 28, 8, 7, 5, 'tuesday  ', 3, 0, 'NONE') ,('2026-10-21', '1405-07-29', '1448-05-09', '2026-10-21', 29, 9, 7, 5, 'wednesday', 4, 0, 'NONE') ,('2026-10-22', '1405-07-30', '1448-05-10', '2026-10-22', 30, 10, 7, 5, 'thursday ', 5, 0, 'NONE') ,('2026-10-23', '1405-08-01', '1448-05-11', '2026-10-23', 1, 11, 8, 5, 'friday   ', 6, 0, 'NONE') ,('2026-10-24', '1405-08-02', '1448-05-12', '2026-10-24', 2, 12, 8, 5, 'saturday ', 7, 0, 'NONE') ,('2026-10-25', '1405-08-03', '1448-05-13', '2026-10-25', 3, 13, 8, 5, 'sunday   ', 1, 0, 'NONE') ,('2026-10-26', '1405-08-04', '1448-05-14', '2026-10-26', 4, 14, 8, 5, 'monday   ', 2, 0, 'NONE') ,('2026-10-27', '1405-08-05', '1448-05-15', '2026-10-27', 5, 15, 8, 5, 'tuesday  ', 3, 0, 'NONE') ,('2026-10-28', '1405-08-06', '1448-05-16', '2026-10-28', 6, 16, 8, 5, 'wednesday', 4, 0, 'NONE') ,('2026-10-29', '1405-08-07', '1448-05-17', '2026-10-29', 7, 17, 8, 5, 'thursday ', 5, 0, 'NONE') ,('2026-10-30', '1405-08-08', '1448-05-18', '2026-10-30', 8, 18, 8, 5, 'friday   ', 6, 0, 'NONE');
+
+
+WITH A as (SELECT rowNumberInAllBlocks() R,addDays(toDate('2021-05-18'), R) TVV from numbers(5)),
+    B as (SELECT rowNumberInAllBlocks() R,toDateTime(NULL) TVV from numbers(1))
+SELECT
+    joinGet('DATE_INFO_DICT',  'SHAMSI',   toDate(A.TVV) ) TV1,
+    substr(TV1, 3,  8) || ' : ' || toString(1) TV_CHAR_1
+from A LEFT JOIN B USING (R)
+ORDER BY TV1;
+
+--query run success in 215ms
+
+
+
+WITH A as (SELECT rowNumberInAllBlocks() R,addDays(toDate('2021-05-18'), R) TVV from numbers(5)),
+    B as (SELECT rowNumberInAllBlocks() R,toDateTime(NULL) TVV from numbers(1))
+SELECT
+    joinGetOrNull('DATE_INFO_DICT',    'SHAMSI',   toDate(A.TVV) ) TV1,
+    substr(TV1, 3,  8) || ' : ' || toString(1) TV_CHAR_1
+from A LEFT JOIN B USING (R)
+ORDER BY TV1;
+
+--query not run success !!!!
+
+
+DROP TABLE DATE_INFO_DICT;
diff --git a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
index 55211dca979..3003a0de42d 100755
--- a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
+++ b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
@@ -1,4 +1,5 @@
 #!/usr/bin/expect -f
+# Tags: long, no-fasttest
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01910_memory_tracking_topk.sql b/tests/queries/0_stateless/01910_memory_tracking_topk.sql
index e6309c1eeb8..ea0b4f9047e 100644
--- a/tests/queries/0_stateless/01910_memory_tracking_topk.sql
+++ b/tests/queries/0_stateless/01910_memory_tracking_topk.sql
@@ -1,3 +1,5 @@
+-- Tags: no-replicated-database
+
 -- Memory limit must correctly apply, triggering an exception:
 
 SET max_memory_usage = '100M';
diff --git a/tests/queries/0_stateless/01910_view_dictionary.sql b/tests/queries/0_stateless/01910_view_dictionary.sql
index 28c50daeba1..7b807c7fbba 100644
--- a/tests/queries/0_stateless/01910_view_dictionary.sql
+++ b/tests/queries/0_stateless/01910_view_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP TABLE IF EXISTS dictionary_source_en;
 DROP TABLE IF EXISTS dictionary_source_ru;
 DROP TABLE IF EXISTS dictionary_source_view;
diff --git a/tests/queries/0_stateless/01911_logical_error_minus.reference b/tests/queries/0_stateless/01911_logical_error_minus.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01911_logical_error_minus.sql b/tests/queries/0_stateless/01911_logical_error_minus.sql
new file mode 100644
index 00000000000..ac69f553e89
--- /dev/null
+++ b/tests/queries/0_stateless/01911_logical_error_minus.sql
@@ -0,0 +1,76 @@
+-- This test case is almost completely generated by fuzzer.
+-- It appeared to trigger assertion.
+
+DROP TABLE IF EXISTS codecTest;
+
+CREATE TABLE codecTest (
+    key      UInt64,
+    name     String,
+    ref_valueF64 Float64,
+    ref_valueF32 Float32,
+    valueF64 Float64  CODEC(Gorilla),
+    valueF32 Float32  CODEC(Gorilla)
+) Engine = MergeTree ORDER BY key;
+
+INSERT INTO codecTest (key, name, ref_valueF64, valueF64, ref_valueF32, valueF32)
+    SELECT number AS n, 'e()', e() AS v, v, v, v FROM system.numbers LIMIT 1, 100;
+
+INSERT INTO codecTest (key, name, ref_valueF64, valueF64, ref_valueF32, valueF32)
+    SELECT number AS n, 'log2(n)', log2(n) AS v, v, v, v FROM system.numbers LIMIT 101, 100;
+
+INSERT INTO codecTest (key, name, ref_valueF64, valueF64, ref_valueF32, valueF32)
+    SELECT number AS n, 'n*sqrt(n)', n*sqrt(n) AS v, v, v, v FROM system.numbers LIMIT 201, 100;
+
+INSERT INTO codecTest (key, name, ref_valueF64, valueF64, ref_valueF32, valueF32)
+    SELECT number AS n, 'sin(n*n*n)*n', sin(n * n * n * n* n) AS v, v, v, v FROM system.numbers LIMIT 301, 100;
+
+SELECT IF(-2, NULL, 0.00009999999747378752), IF(1048577, 1048576, NULL), c1.key, IF(1, NULL, NULL), c2.key FROM codecTest AS c1 , codecTest AS c2 WHERE ignore(IF(257, -2, NULL), arrayJoin([65537]), IF(3, 1024, 9223372036854775807)) AND IF(NULL, 256, NULL) AND (IF(NULL, '1048576', NULL) = (c1.key - NULL)) LIMIT 65535;
+
+SELECT c1.key, c1.name, c1.ref_valueF64, c1.valueF64, c1.ref_valueF64 - c1.valueF64 AS dF64, '', c2.key, c2.ref_valueF64 FROM codecTest AS c1 , codecTest AS c2 WHERE (dF64 != 3) AND c1.valueF64 AND (c2.key = (c1.key - 1048576)) LIMIT 0;
+
+
+DROP TABLE codecTest;
+
+CREATE TABLE codecTest (
+    key      UInt64,
+    ref_valueU64 UInt64,
+    ref_valueU32 UInt32,
+    ref_valueU16 UInt16,
+    ref_valueU8  UInt8,
+    ref_valueI64 Int64,
+    ref_valueI32 Int32,
+    ref_valueI16 Int16,
+    ref_valueI8  Int8,
+    ref_valueDT  DateTime,
+    ref_valueD   Date,
+    valueU64 UInt64   CODEC(DoubleDelta),
+    valueU32 UInt32   CODEC(DoubleDelta),
+    valueU16 UInt16   CODEC(DoubleDelta),
+    valueU8  UInt8    CODEC(DoubleDelta),
+    valueI64 Int64    CODEC(DoubleDelta),
+    valueI32 Int32    CODEC(DoubleDelta),
+    valueI16 Int16    CODEC(DoubleDelta),
+    valueI8  Int8     CODEC(DoubleDelta),
+    valueDT  DateTime CODEC(DoubleDelta),
+    valueD   Date     CODEC(DoubleDelta)
+) Engine = MergeTree ORDER BY key SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO codecTest (key, ref_valueU64, valueU64, ref_valueI64, valueI64)
+    VALUES (1, 18446744073709551615, 18446744073709551615, 9223372036854775807, 9223372036854775807), (2, 0, 0, -9223372036854775808, -9223372036854775808), (3, 18446744073709551615, 18446744073709551615, 9223372036854775807, 9223372036854775807);
+
+INSERT INTO codecTest (key, ref_valueU64, valueU64, ref_valueU32, valueU32, ref_valueU16, valueU16, ref_valueU8, valueU8, ref_valueI64, valueI64, ref_valueI32, valueI32, ref_valueI16, valueI16, ref_valueI8, valueI8, ref_valueDT, valueDT, ref_valueD, valueD)
+    SELECT number as n, n * n * n as v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, toDateTime(v), toDateTime(v), toDate(v), toDate(v)
+    FROM system.numbers LIMIT 101, 1000;
+
+INSERT INTO codecTest (key, ref_valueU64, valueU64, ref_valueU32, valueU32, ref_valueU16, valueU16, ref_valueU8, valueU8, ref_valueI64, valueI64, ref_valueI32, valueI32, ref_valueI16, valueI16, ref_valueI8, valueI8, ref_valueDT, valueDT, ref_valueD, valueD)
+    SELECT number as n, n as v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, toDateTime(v), toDateTime(v), toDate(v), toDate(v)
+    FROM system.numbers LIMIT 2001, 1000;
+
+INSERT INTO codecTest (key, ref_valueU64, valueU64, ref_valueU32, valueU32, ref_valueU16, valueU16, ref_valueU8, valueU8, ref_valueI64, valueI64, ref_valueI32, valueI32, ref_valueI16, valueI16, ref_valueI8, valueI8, ref_valueDT, valueDT, ref_valueD, valueD)
+    SELECT number as n, n + (rand64() - 9223372036854775807)/1000 as v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, v, toDateTime(v), toDateTime(v), toDate(v), toDate(v)
+    FROM system.numbers LIMIT 3001, 1000;
+
+SELECT IF(-2, NULL, 0.00009999999747378752), IF(1048577, 1048576, NULL), c1.key, IF(1, NULL, NULL), c2.key FROM codecTest AS c1 , codecTest AS c2 WHERE ignore(IF(257, -2, NULL), arrayJoin([65537]), IF(3, 1024, 9223372036854775807)) AND IF(NULL, 256, NULL) AND (IF(NULL, '1048576', NULL) = (c1.key - NULL)) LIMIT 65535;
+
+
+DROP TABLE codecTest;
diff --git a/tests/queries/0_stateless/01913_if_int_decimal.reference b/tests/queries/0_stateless/01913_if_int_decimal.reference
index c54e91df3e4..5357a4ab725 100644
--- a/tests/queries/0_stateless/01913_if_int_decimal.reference
+++ b/tests/queries/0_stateless/01913_if_int_decimal.reference
@@ -1,3 +1,3 @@
-2.0000000000
-1.0000000000
-2.0000000000
+2
+1
+2
diff --git a/tests/queries/0_stateless/01913_replace_dictionary.sql b/tests/queries/0_stateless/01913_replace_dictionary.sql
index 43dd460707a..891d0c6abd6 100644
--- a/tests/queries/0_stateless/01913_replace_dictionary.sql
+++ b/tests/queries/0_stateless/01913_replace_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS 01913_db;
 CREATE DATABASE 01913_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01914_exchange_dictionaries.sql b/tests/queries/0_stateless/01914_exchange_dictionaries.sql
index 77bcf53ab5e..8c86a04fd90 100644
--- a/tests/queries/0_stateless/01914_exchange_dictionaries.sql
+++ b/tests/queries/0_stateless/01914_exchange_dictionaries.sql
@@ -1,3 +1,6 @@
+-- Tags: no-ordinary-database, no-parallel
+-- Tag no-ordinary-database: Requires Atomic database
+
 DROP DATABASE IF EXISTS 01914_db;
 CREATE DATABASE 01914_db ENGINE=Atomic;
 
diff --git a/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql b/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
index c9df6114ec9..6f52aea0f69 100644
--- a/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
+++ b/tests/queries/0_stateless/01915_create_or_replace_dictionary.sql
@@ -1,51 +1,53 @@
-DROP DATABASE IF EXISTS 01915_db;
-CREATE DATABASE 01915_db ENGINE=Atomic;
+-- Tags: no-parallel
 
-DROP TABLE IF EXISTS 01915_db.test_source_table_1;
-CREATE TABLE 01915_db.test_source_table_1
+DROP DATABASE IF EXISTS test_01915_db;
+CREATE DATABASE test_01915_db ENGINE=Atomic;
+
+DROP TABLE IF EXISTS test_01915_db.test_source_table_1;
+CREATE TABLE test_01915_db.test_source_table_1
 (
     id UInt64,
     value String
 ) ENGINE=TinyLog;
 
-INSERT INTO 01915_db.test_source_table_1 VALUES (0, 'Value0');
+INSERT INTO test_01915_db.test_source_table_1 VALUES (0, 'Value0');
 
-DROP DICTIONARY IF EXISTS 01915_db.test_dictionary;
-CREATE OR REPLACE DICTIONARY 01915_db.test_dictionary
+DROP DICTIONARY IF EXISTS test_01915_db.test_dictionary;
+CREATE OR REPLACE DICTIONARY test_01915_db.test_dictionary
 (
     id UInt64,
     value String
 )
 PRIMARY KEY id
 LAYOUT(DIRECT())
-SOURCE(CLICKHOUSE(DB '01915_db' TABLE 'test_source_table_1'));
+SOURCE(CLICKHOUSE(DB 'test_01915_db' TABLE 'test_source_table_1'));
 
-SELECT * FROM 01915_db.test_dictionary;
+SELECT * FROM test_01915_db.test_dictionary;
 
-DROP TABLE IF EXISTS 01915_db.test_source_table_2;
-CREATE TABLE 01915_db.test_source_table_2
+DROP TABLE IF EXISTS test_01915_db.test_source_table_2;
+CREATE TABLE test_01915_db.test_source_table_2
 (
     id UInt64,
     value_1 String
 ) ENGINE=TinyLog;
 
-INSERT INTO 01915_db.test_source_table_2 VALUES (0, 'Value1');
+INSERT INTO test_01915_db.test_source_table_2 VALUES (0, 'Value1');
 
-CREATE OR REPLACE DICTIONARY 01915_db.test_dictionary
+CREATE OR REPLACE DICTIONARY test_01915_db.test_dictionary
 (
     id UInt64,
     value_1 String
 )
 PRIMARY KEY id
 LAYOUT(HASHED())
-SOURCE(CLICKHOUSE(DB '01915_db' TABLE 'test_source_table_2'))
+SOURCE(CLICKHOUSE(DB 'test_01915_db' TABLE 'test_source_table_2'))
 LIFETIME(0);
 
-SELECT * FROM 01915_db.test_dictionary;
+SELECT * FROM test_01915_db.test_dictionary;
 
-DROP DICTIONARY 01915_db.test_dictionary;
+DROP DICTIONARY test_01915_db.test_dictionary;
 
-DROP TABLE 01915_db.test_source_table_1;
-DROP TABLE 01915_db.test_source_table_2;
+DROP TABLE test_01915_db.test_source_table_1;
+DROP TABLE test_01915_db.test_source_table_2;
 
-DROP DATABASE 01915_db;
+DROP DATABASE test_01915_db;
diff --git a/tests/queries/0_stateless/01915_json_extract_raw_string.reference b/tests/queries/0_stateless/01915_json_extract_raw_string.reference
index 839cb33f5f2..e88c7e018d2 100644
--- a/tests/queries/0_stateless/01915_json_extract_raw_string.reference
+++ b/tests/queries/0_stateless/01915_json_extract_raw_string.reference
@@ -1 +1,5 @@
 ('123','456','[7,8,9]')
+\N
+123
+123
+
diff --git a/tests/queries/0_stateless/01915_json_extract_raw_string.sql b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
index 6ba94ac6dfd..98bff692d71 100644
--- a/tests/queries/0_stateless/01915_json_extract_raw_string.sql
+++ b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
@@ -1 +1,9 @@
+-- Tags: no-fasttest
+
 select JSONExtract('{"a": "123", "b": 456, "c": [7, 8, 9]}', 'Tuple(a String, b String, c String)');
+
+with '{"string_value":null}' as json select JSONExtract(json, 'string_value', 'Nullable(String)');
+
+select JSONExtractString('{"a": 123}', 'a');
+select JSONExtractString('{"a": "123"}', 'a');
+select JSONExtractString('{"a": null}', 'a');
diff --git a/tests/queries/0_stateless/01917_system_data_skipping_indices.reference b/tests/queries/0_stateless/01917_system_data_skipping_indices.reference
index b5a4b596a97..115d60f60cc 100644
--- a/tests/queries/0_stateless/01917_system_data_skipping_indices.reference
+++ b/tests/queries/0_stateless/01917_system_data_skipping_indices.reference
@@ -1,8 +1,8 @@
-default	data_01917	d1_idx	minmax	d1	1
-default	data_01917	d1_null_idx	minmax	assumeNotNull(d1_null)	1
-default	data_01917_2	memory	set	frequency * length(name)	5
-default	data_01917_2	sample_index1	minmax	length(name), name	4
-default	data_01917_2	sample_index2	ngrambf_v1	lower(name), name	4
+default	data_01917	d1_idx	minmax	d1	1	0	0	0
+default	data_01917	d1_null_idx	minmax	assumeNotNull(d1_null)	1	0	0	0
+default	data_01917_2	memory	set	frequency * length(name)	5	0	0	0
+default	data_01917_2	sample_index1	minmax	length(name), name	4	0	0	0
+default	data_01917_2	sample_index2	ngrambf_v1	lower(name), name	4	0	0	0
 2
 3
 d1_idx
diff --git a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.reference b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.reference
index d00491fd7e5..e5a8ecd20b4 100644
--- a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.reference
+++ b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.reference
@@ -1 +1,3 @@
+Replication did not hang: synced all replicas of ttl_table
+Consistency: 1
 1
diff --git a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
index 13086879e0d..07988da12c2 100755
--- a/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
+++ b/tests/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
+# Tags: long, zookeeper, no-parallel
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
 
 NUM_REPLICAS=5
 
@@ -58,14 +61,16 @@ timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
 timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
 
 wait
-
 for i in $(seq 1 $NUM_REPLICAS); do
-    $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA ttl_table$i"
+    # disable ttl merges before checking consistency
+    $CLICKHOUSE_CLIENT --query "ALTER TABLE ttl_table$i MODIFY SETTING max_replicated_merges_with_ttl_in_queue=0"
 done
+check_replication_consistency "ttl_table" "count(), sum(toUInt64(key))"
 
 $CLICKHOUSE_CLIENT --query "SELECT * FROM system.replication_queue where table like 'ttl_table%' and database = '${CLICKHOUSE_DATABASE}' and type='MERGE_PARTS' and last_exception != '' FORMAT Vertical"
 $CLICKHOUSE_CLIENT --query "SELECT COUNT() > 0 FROM system.part_log where table like 'ttl_table%' and database = '${CLICKHOUSE_DATABASE}'"
 
+
 for i in $(seq 1 $NUM_REPLICAS); do
     $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS ttl_table$i" &
 done
diff --git a/tests/queries/0_stateless/01922_client_param.sh b/tests/queries/0_stateless/01922_client_param.sh
index bb0abfb2191..b126746a53b 100755
--- a/tests/queries/0_stateless/01922_client_param.sh
+++ b/tests/queries/0_stateless/01922_client_param.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
index bcb3775f86a..ec5aa141859 100755
--- a/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+++ b/tests/queries/0_stateless/01923_network_receive_time_metric_insert.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: needs pv
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql b/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
index baf6c1fbf8f..7d151f063e1 100644
--- a/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
+++ b/tests/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
@@ -1,3 +1,5 @@
+-- Tags: zookeeper
+
 DROP TABLE IF EXISTS broken_partition;
 
 CREATE TABLE broken_partition
@@ -14,3 +16,13 @@ ALTER TABLE broken_partition DROP PARTITION ID '20210325_0_13241_6_12747'; --{se
 ALTER TABLE broken_partition DROP PARTITION ID '20210325_0_13241_6_12747'; --{serverError 248}
 
 DROP TABLE IF EXISTS broken_partition;
+
+DROP TABLE IF EXISTS old_partition_key;
+
+CREATE TABLE old_partition_key (sd Date, dh UInt64, ak UInt32, ed Date) ENGINE=MergeTree(sd, dh, (ak, ed, dh), 8192);
+
+ALTER TABLE old_partition_key DROP PARTITION ID '20210325_0_13241_6_12747'; --{serverError 248}
+
+ALTER TABLE old_partition_key DROP PARTITION ID '202103';
+
+DROP TABLE old_partition_key;
diff --git a/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql b/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
index 03a3c4f8b65..01e2c711ed5 100644
--- a/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
+++ b/tests/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
@@ -1,3 +1,5 @@
+-- Tags: long
+
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.reference b/tests/queries/0_stateless/01925_join_materialized_columns.reference
index 1dfda3c769b..5125b322aed 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.reference
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.reference
@@ -22,3 +22,13 @@ fact1t1_val1	fact1t2_val2
 fact2t1_val2	fact2t1_val2
 -
 2020-02-02 13:00:00	2020-02-05 13:00:00
+-
+1
+1
+1
+1
+-
+2020-01-01 12:00:00
+2020-01-01 12:00:00
+2020-01-01 12:00:00
+2020-01-01 12:00:00
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.sql b/tests/queries/0_stateless/01925_join_materialized_columns.sql
index 6a34fef96ab..7c56d5fea39 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.sql
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.sql
@@ -2,17 +2,23 @@ DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 
 CREATE TABLE t1 (
-    time DateTime, foo String, dimension_1 String,
+    time DateTime,
+    foo String,
+    dimension_1 String,
     dt Date MATERIALIZED toDate(time),
     dt1 Date MATERIALIZED toDayOfYear(time),
-    aliascol1 ALIAS foo || dimension_1
+    aliascol1 ALIAS foo || dimension_1,
+    time_alias DateTime ALIAS time
 ) ENGINE = MergeTree() PARTITION BY toYYYYMM(dt) ORDER BY (dt, foo);
 
 CREATE TABLE t2 (
-    time DateTime, bar String, dimension_2 String, 
+    time DateTime,
+    bar String,
+    dimension_2 String,
     dt Date MATERIALIZED toDate(time),
     dt2 Date MATERIALIZED toDayOfYear(time),
-    aliascol2 ALIAS bar || dimension_2
+    aliascol2 ALIAS bar || dimension_2,
+    time_alias DateTime ALIAS time
 ) ENGINE = MergeTree() PARTITION BY toYYYYMM(dt) ORDER BY (dt, bar);
 
 INSERT INTO t1 VALUES ('2020-01-01 12:00:00', 'fact1', 't1_val1'), ('2020-02-02 13:00:00', 'fact2', 't1_val2'), ('2020-01-01 13:00:00', 'fact3', 't1_val3');
@@ -35,3 +41,15 @@ SELECT '-';
 SELECT t1.aliascol1, t2.aliascol2 FROM t1 JOIN t2 ON t1.foo = t2.bar ORDER BY t1.time, t2.time;
 SELECT '-';
 SELECT t1.time, t2.time FROM t1 JOIN t2 ON t1.aliascol1 = t2.aliascol2 ORDER BY t1.time, t2.time;
+SELECT '-';
+SELECT count() FROM t1 JOIN t2 ON t1.time_alias = t2.time;
+SELECT count() FROM t1 JOIN t2 ON t1.time = t2.time_alias;
+SELECT count() FROM t1 JOIN t2 ON t1.time_alias = t2.time_alias;
+SELECT count() FROM t1 JOIN t2 USING (time_alias);
+SELECT '-';
+SELECT t1.time as talias FROM t1 JOIN t2 ON talias = t2.time;
+SELECT t1.time as talias FROM t1 JOIN t2 ON talias = t2.time_alias;
+SELECT t2.time as talias FROM t1 JOIN t2 ON t1.time = talias;
+SELECT t2.time as talias FROM t1 JOIN t2 ON t1.time_alias = talias;
+SELECT time as talias FROM t1 JOIN t2 ON t1.time = talias; -- { serverError AMBIGUOUS_COLUMN_NAME }
+SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time; -- { serverError AMBIGUOUS_COLUMN_NAME }
diff --git a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.reference b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.reference
new file mode 100644
index 00000000000..4e4852ed726
--- /dev/null
+++ b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.reference
@@ -0,0 +1,2 @@
+{"id": 1, "name": "name1"}
+{"id": 2, "name": "name2"}
diff --git a/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
new file mode 100644
index 00000000000..3b1e5176ff9
--- /dev/null
+++ b/tests/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
@@ -0,0 +1,11 @@
+-- Tags: no-fasttest
+
+DROP TABLE IF EXISTS json_square_brackets;
+CREATE TABLE json_square_brackets (field String) ENGINE = Memory;
+INSERT INTO json_square_brackets FORMAT JSONAsString [{"id": 1, "name": "name1"}, {"id": 2, "name": "name2"}];
+INSERT INTO json_square_brackets FORMAT JSONAsString[];
+INSERT INTO json_square_brackets FORMAT JSONAsString [  ]  ;
+INSERT INTO json_square_brackets FORMAT JSONEachRow ;
+
+SELECT * FROM json_square_brackets;
+DROP TABLE IF EXISTS json_square_brackets;
diff --git a/tests/queries/0_stateless/01925_map_populate_series_on_map.reference b/tests/queries/0_stateless/01925_map_populate_series_on_map.reference
new file mode 100644
index 00000000000..fd3d3b2450d
--- /dev/null
+++ b/tests/queries/0_stateless/01925_map_populate_series_on_map.reference
@@ -0,0 +1,67 @@
+-- { echo }
+drop table if exists map_test;
+set allow_experimental_map_type = 1;
+create table map_test engine=TinyLog() as (select (number + 1) as n, map(1, 1, number,2) as m from numbers(1, 5));
+select mapPopulateSeries(m) from map_test;
+{1:1}
+{1:1,2:2}
+{1:1,2:0,3:2}
+{1:1,2:0,3:0,4:2}
+{1:1,2:0,3:0,4:0,5:2}
+select mapPopulateSeries(m, toUInt64(3)) from map_test;
+{1:1,2:0,3:0}
+{1:1,2:2,3:0}
+{1:1,2:0,3:2}
+{1:1,2:0,3:0}
+{1:1,2:0,3:0}
+select mapPopulateSeries(m, toUInt64(10)) from map_test;
+{1:1,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:0}
+{1:1,2:2,3:0,4:0,5:0,6:0,7:0,8:0,9:0,10:0}
+{1:1,2:0,3:2,4:0,5:0,6:0,7:0,8:0,9:0,10:0}
+{1:1,2:0,3:0,4:2,5:0,6:0,7:0,8:0,9:0,10:0}
+{1:1,2:0,3:0,4:0,5:2,6:0,7:0,8:0,9:0,10:0}
+select mapPopulateSeries(m, 1000) from map_test; -- { serverError 43 }
+select mapPopulateSeries(m, n) from map_test;
+{1:1,2:0}
+{1:1,2:2,3:0}
+{1:1,2:0,3:2,4:0}
+{1:1,2:0,3:0,4:2,5:0}
+{1:1,2:0,3:0,4:0,5:2,6:0}
+drop table map_test;
+select mapPopulateSeries(map(toUInt8(1), toUInt8(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(UInt8, UInt8)
+select mapPopulateSeries(map(toUInt16(1), toUInt16(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(UInt16, UInt16)
+select mapPopulateSeries(map(toUInt32(1), toUInt32(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(UInt32, UInt32)
+select mapPopulateSeries(map(toUInt64(1), toUInt64(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(UInt64, UInt64)
+select mapPopulateSeries(map(toUInt128(1), toUInt128(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(UInt128, UInt128)
+select mapPopulateSeries(map(toUInt256(1), toUInt256(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(UInt256, UInt256)
+select mapPopulateSeries(map(toInt8(1), toInt8(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(Int16, Int16)
+select mapPopulateSeries(map(toInt16(1), toInt16(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(Int16, Int16)
+select mapPopulateSeries(map(toInt32(1), toInt32(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(Int32, Int32)
+select mapPopulateSeries(map(toInt64(1), toInt64(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(Int64, Int64)
+select mapPopulateSeries(map(toInt128(1), toInt128(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(Int128, Int128)
+select mapPopulateSeries(map(toInt256(1), toInt256(1), 2, 1)) as res, toTypeName(res);
+{1:1,2:1}	Map(Int256, Int256)
+select mapPopulateSeries(map(toInt8(-10), toInt8(1), 2, 1)) as res, toTypeName(res);
+{-10:1,-9:0,-8:0,-7:0,-6:0,-5:0,-4:0,-3:0,-2:0,-1:0,0:0,1:0,2:1}	Map(Int16, Int16)
+select mapPopulateSeries(map(toInt16(-10), toInt16(1), 2, 1)) as res, toTypeName(res);
+{-10:1,-9:0,-8:0,-7:0,-6:0,-5:0,-4:0,-3:0,-2:0,-1:0,0:0,1:0,2:1}	Map(Int16, Int16)
+select mapPopulateSeries(map(toInt32(-10), toInt32(1), 2, 1)) as res, toTypeName(res);
+{-10:1,-9:0,-8:0,-7:0,-6:0,-5:0,-4:0,-3:0,-2:0,-1:0,0:0,1:0,2:1}	Map(Int32, Int32)
+select mapPopulateSeries(map(toInt64(-10), toInt64(1), 2, 1)) as res, toTypeName(res);
+{-10:1,-9:0,-8:0,-7:0,-6:0,-5:0,-4:0,-3:0,-2:0,-1:0,0:0,1:0,2:1}	Map(Int64, Int64)
+select mapPopulateSeries(map(toInt64(-10), toInt64(1), 2, 1), toInt64(-5)) as res, toTypeName(res);
+{-10:1,-9:0,-8:0,-7:0,-6:0,-5:0}	Map(Int64, Int64)
+select mapPopulateSeries(); -- { serverError 42 }
+select mapPopulateSeries('asdf'); -- { serverError 43 }
+select mapPopulateSeries(map('1', 1, '2', 1)) as res, toTypeName(res); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/01925_map_populate_series_on_map.sql b/tests/queries/0_stateless/01925_map_populate_series_on_map.sql
new file mode 100644
index 00000000000..ac78280ec1d
--- /dev/null
+++ b/tests/queries/0_stateless/01925_map_populate_series_on_map.sql
@@ -0,0 +1,36 @@
+-- { echo }
+drop table if exists map_test;
+set allow_experimental_map_type = 1;
+create table map_test engine=TinyLog() as (select (number + 1) as n, map(1, 1, number,2) as m from numbers(1, 5));
+
+select mapPopulateSeries(m) from map_test;
+select mapPopulateSeries(m, toUInt64(3)) from map_test;
+select mapPopulateSeries(m, toUInt64(10)) from map_test;
+select mapPopulateSeries(m, 1000) from map_test; -- { serverError 43 }
+select mapPopulateSeries(m, n) from map_test;
+
+drop table map_test;
+
+select mapPopulateSeries(map(toUInt8(1), toUInt8(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toUInt16(1), toUInt16(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toUInt32(1), toUInt32(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toUInt64(1), toUInt64(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toUInt128(1), toUInt128(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toUInt256(1), toUInt256(1), 2, 1)) as res, toTypeName(res);
+
+select mapPopulateSeries(map(toInt8(1), toInt8(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt16(1), toInt16(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt32(1), toInt32(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt64(1), toInt64(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt128(1), toInt128(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt256(1), toInt256(1), 2, 1)) as res, toTypeName(res);
+
+select mapPopulateSeries(map(toInt8(-10), toInt8(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt16(-10), toInt16(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt32(-10), toInt32(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt64(-10), toInt64(1), 2, 1)) as res, toTypeName(res);
+select mapPopulateSeries(map(toInt64(-10), toInt64(1), 2, 1), toInt64(-5)) as res, toTypeName(res);
+
+select mapPopulateSeries(); -- { serverError 42 }
+select mapPopulateSeries('asdf'); -- { serverError 43 }
+select mapPopulateSeries(map('1', 1, '2', 1)) as res, toTypeName(res); -- { serverError 43 }
diff --git a/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference b/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
index 573541ac970..93f9e3d10db 100644
--- a/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
+++ b/tests/queries/0_stateless/01925_test_group_by_const_consistency.reference
@@ -1 +1,2 @@
 0
+1	0
diff --git a/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql b/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
index 8a5de0e7c4f..a73c06bbe49 100644
--- a/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
+++ b/tests/queries/0_stateless/01925_test_group_by_const_consistency.sql
@@ -1,2 +1,4 @@
-SELECT 1 as a, count() FROM numbers(10)　WHERE 0 GROUP BY a;
-SELECT count() FROM numbers(10) WHERE 0
+SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a;
+SELECT count() FROM numbers(10) WHERE 0;
+
+SELECT 1 as a, count() FROM numbers(10) WHERE 0 GROUP BY a SETTINGS empty_result_for_aggregation_by_constant_keys_on_empty_set = 0;
diff --git a/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql b/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
index f3a5b2db62e..56d255570c8 100644
--- a/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
+++ b/tests/queries/0_stateless/01925_test_storage_merge_aliases.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 drop table if exists merge;
 create table merge
 (
diff --git a/tests/queries/0_stateless/01926_json_as_string_array.reference b/tests/queries/0_stateless/01926_json_as_string_array.reference
new file mode 100644
index 00000000000..749fce669df
--- /dev/null
+++ b/tests/queries/0_stateless/01926_json_as_string_array.reference
@@ -0,0 +1 @@
+1000000
diff --git a/tests/queries/0_stateless/01926_json_as_string_array.sh b/tests/queries/0_stateless/01926_json_as_string_array.sh
new file mode 100755
index 00000000000..477cb8cff9e
--- /dev/null
+++ b/tests/queries/0_stateless/01926_json_as_string_array.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+set -e
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_LOCAL} --query "SELECT '[' || arrayStringConcat(arrayMap(x -> '{\"id\": 1, \"name\": \"name1\"}', range(1000000)), ',') || ']'" | ${CLICKHOUSE_LOCAL} --query "SELECT count() FROM table" --input-format JSONAsString --structure 'field String'
diff --git a/tests/queries/0_stateless/01927_query_views_log_current_database.reference b/tests/queries/0_stateless/01927_query_views_log_current_database.reference
new file mode 100644
index 00000000000..ff9eca2d97f
--- /dev/null
+++ b/tests/queries/0_stateless/01927_query_views_log_current_database.reference
@@ -0,0 +1,70 @@
+Row 1:
+──────
+stage:        Query log rows
+read_rows:    100
+written_rows: 201
+databases:    ['_table_function','default']
+tables:       ['_table_function.numbers','default.table_a','default.table_b','default.table_b_live_view','default.table_c']
+views:        ['default.matview_a_to_b','default.matview_b_to_c','default.table_b_live_view']
+sleep_calls:  200
+sleep_us:     298
+Row 1:
+──────
+stage:        Depending views
+view_name:    default.matview_a_to_b
+view_type:    Materialized
+status:       QueryFinish
+view_target:  default.table_b
+view_query:   SELECT toFloat64(a) AS a, b + sleepEachRow(0.000001) AS count FROM default.table_a
+read_rows:    100
+written_rows: 100
+sleep_calls:  100
+sleep_us:     99
+
+Row 2:
+──────
+stage:        Depending views
+view_name:    default.matview_b_to_c
+view_type:    Materialized
+status:       QueryFinish
+view_target:  default.table_c
+view_query:   SELECT sum(a + sleepEachRow(0.000002)) AS a FROM default.table_b
+read_rows:    100
+written_rows: 1
+sleep_calls:  100
+sleep_us:     199
+
+Row 3:
+──────
+stage:        Depending views
+view_name:    default.table_b_live_view
+view_type:    Live
+status:       QueryFinish
+view_target:  default.table_b_live_view
+view_query:   SELECT sum(a + b) FROM default.table_b
+read_rows:    100
+written_rows: 0
+sleep_calls:  0
+sleep_us:     0
+Row 1:
+──────
+stage:        Query log rows 2
+read_rows:    50
+written_rows: 100
+databases:    ['_table_function','default']
+tables:       ['_table_function.numbers','default.table_d','default.table_e','default.table_f']
+views:        ['default.matview_join_d_e']
+sleep_calls:  50
+sleep_us:     150
+Row 1:
+──────
+stage:        Depending views 2
+view_name:    default.matview_join_d_e
+view_type:    Materialized
+status:       QueryFinish
+view_target:  default.table_f
+view_query:   SELECT table_d.a AS a, table_e.count + sleepEachRow(0.000003) AS count FROM default.table_d LEFT JOIN default.table_e ON table_d.a = table_e.a
+read_rows:    50
+written_rows: 50
+sleep_calls:  50
+sleep_us:     150
diff --git a/tests/queries/0_stateless/01927_query_views_log_current_database.sql b/tests/queries/0_stateless/01927_query_views_log_current_database.sql
new file mode 100644
index 00000000000..40ab8c8e16a
--- /dev/null
+++ b/tests/queries/0_stateless/01927_query_views_log_current_database.sql
@@ -0,0 +1,129 @@
+SET allow_experimental_live_view = 1;
+SET log_queries=0;
+SET log_query_threads=0;
+
+-- SETUP TABLES
+CREATE TABLE table_a (a String, b Int64) ENGINE = MergeTree ORDER BY b;
+CREATE TABLE table_b (a Float64,  b Int64) ENGINE = MergeTree ORDER BY tuple();
+CREATE TABLE table_c (a Float64) ENGINE = MergeTree ORDER BY a;
+
+CREATE TABLE table_d (a Float64, count Int64) ENGINE MergeTree ORDER BY a;
+CREATE TABLE table_e (a Float64, count Int64) ENGINE MergeTree ORDER BY a;
+CREATE TABLE table_f (a Float64, count Int64) ENGINE MergeTree ORDER BY a;
+
+-- SETUP MATERIALIZED VIEWS
+CREATE MATERIALIZED VIEW matview_a_to_b TO table_b AS SELECT toFloat64(a) AS a, b + sleepEachRow(0.000001) AS count FROM table_a;
+CREATE MATERIALIZED VIEW matview_b_to_c TO table_c AS SELECT SUM(a + sleepEachRow(0.000002)) as a FROM table_b;
+CREATE MATERIALIZED VIEW matview_join_d_e TO table_f AS SELECT table_d.a as a, table_e.count + sleepEachRow(0.000003) as count FROM table_d LEFT JOIN table_e ON table_d.a = table_e.a;
+
+-- SETUP LIVE VIEW
+---- table_b_live_view (Int64)
+DROP TABLE IF EXISTS table_b_live_view;
+CREATE LIVE VIEW table_b_live_view AS SELECT sum(a + b) FROM table_b;
+
+-- ENABLE LOGS
+SET log_query_views=1;
+SET log_queries_min_type='QUERY_FINISH';
+SET log_queries=1;
+
+-- INSERT 1
+INSERT INTO table_a SELECT '111', * FROM numbers(100);
+
+-- INSERT 2
+INSERT INTO table_d SELECT 0.5, * FROM numbers(50);
+
+SYSTEM FLUSH LOGS;
+
+
+-- CHECK LOGS OF INSERT 1
+-- Note that live views currently don't report written rows
+SELECT
+    'Query log rows' as stage,
+    read_rows,
+    written_rows,
+    arraySort(databases) as databases,
+    arraySort(tables) as tables,
+    arraySort(views) as views,
+    ProfileEvents['SleepFunctionCalls'] as sleep_calls,
+    ProfileEvents['SleepFunctionMicroseconds'] as sleep_us
+FROM system.query_log
+WHERE query like '-- INSERT 1%INSERT INTO table_a%'
+  AND current_database = currentDatabase()
+  AND event_date >= yesterday()
+FORMAT Vertical;
+
+SELECT
+    'Depending views' as stage,
+    view_name,
+    view_type,
+    status,
+    view_target,
+    view_query,
+    read_rows,
+    written_rows,
+    ProfileEvents['SleepFunctionCalls'] as sleep_calls,
+    ProfileEvents['SleepFunctionMicroseconds'] as sleep_us
+FROM system.query_views_log
+WHERE initial_query_id =
+      (
+          SELECT initial_query_id
+          FROM system.query_log
+          WHERE query like '-- INSERT 1%INSERT INTO table_a%'
+            AND current_database = currentDatabase()
+            AND event_date >= yesterday()
+          LIMIT 1
+      )
+ORDER BY view_name
+FORMAT Vertical;
+
+-- CHECK LOGS OF INSERT 2
+SELECT
+    'Query log rows 2' as stage,
+    read_rows,
+    written_rows,
+    arraySort(databases) as databases,
+    arraySort(tables) as tables,
+    arraySort(views) as views,
+    ProfileEvents['SleepFunctionCalls'] as sleep_calls,
+    ProfileEvents['SleepFunctionMicroseconds'] as sleep_us
+FROM system.query_log
+WHERE query like '-- INSERT 2%INSERT INTO table_d%'
+  AND current_database = currentDatabase()
+  AND event_date >= yesterday()
+FORMAT Vertical;
+
+SELECT
+    'Depending views 2' as stage,
+    view_name,
+    view_type,
+    status,
+    view_target,
+    view_query,
+    read_rows,
+    written_rows,
+    ProfileEvents['SleepFunctionCalls'] as sleep_calls,
+    ProfileEvents['SleepFunctionMicroseconds'] as sleep_us
+FROM system.query_views_log
+WHERE initial_query_id =
+      (
+          SELECT initial_query_id
+          FROM system.query_log
+          WHERE query like '-- INSERT 2%INSERT INTO table_d%'
+            AND current_database = currentDatabase()
+            AND event_date >= yesterday()
+          LIMIT 1
+      )
+ORDER BY view_name
+FORMAT Vertical;
+
+-- TEARDOWN
+DROP TABLE table_b_live_view;
+DROP TABLE matview_a_to_b;
+DROP TABLE matview_b_to_c;
+DROP TABLE matview_join_d_e;
+DROP TABLE table_f;
+DROP TABLE table_e;
+DROP TABLE table_d;
+DROP TABLE table_c;
+DROP TABLE table_b;
+DROP TABLE table_a;
diff --git a/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.reference b/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.reference
new file mode 100644
index 00000000000..b02dfc5c3d4
--- /dev/null
+++ b/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.reference
@@ -0,0 +1,14 @@
+--parallel_view_processing 0
+table_exception_a	1
+table_exception_b	0
+table_exception_c	1
+Excep****WhileProcessing
+default.matview_exception_a_to_b	Excep****WhileProcessing	6	default.table_exception_b	SELECT toFloat64(a) AS a, b FROM default.table_exception_a
+default.matview_exception_a_to_c	QueryFinish	0	default.table_exception_c	SELECT b AS a FROM default.table_exception_a
+--parallel_view_processing 1
+table_exception_a	2
+table_exception_b	0
+table_exception_c	2
+Excep****WhileProcessing
+default.matview_exception_a_to_b	Excep****WhileProcessing	6	default.table_exception_b	SELECT toFloat64(a) AS a, b FROM default.table_exception_a
+default.matview_exception_a_to_c	QueryFinish	0	default.table_exception_c	SELECT b AS a FROM default.table_exception_a
diff --git a/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh b/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh
new file mode 100755
index 00000000000..47d5e733480
--- /dev/null
+++ b/tests/queries/0_stateless/01927_query_views_log_matview_exceptions.sh
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function cleanup()
+{
+    ${CLICKHOUSE_CLIENT} -n -q "
+        DROP TABLE IF EXISTS matview_exception_a_to_c;
+        DROP TABLE IF EXISTS matview_exception_a_to_b;
+        DROP TABLE IF EXISTS table_exception_c;
+        DROP TABLE IF EXISTS table_exception_b;
+        DROP TABLE IF EXISTS table_exception_a;
+        ";
+}
+
+function setup()
+{
+    ${CLICKHOUSE_CLIENT} -n -q "
+        CREATE TABLE table_exception_a (a String, b Int64) ENGINE = MergeTree ORDER BY b;
+        CREATE TABLE table_exception_b (a Float64,  b Int64) ENGINE = MergeTree ORDER BY tuple();
+        CREATE TABLE table_exception_c (a Float64) ENGINE = MergeTree ORDER BY a;
+
+        CREATE MATERIALIZED VIEW matview_exception_a_to_b TO table_exception_b AS SELECT toFloat64(a) AS a, b FROM table_exception_a;
+        CREATE MATERIALIZED VIEW matview_exception_a_to_c TO table_exception_c AS SELECT b AS a FROM table_exception_a;
+      ";
+}
+
+function test()
+{
+    echo "$@";
+    # We are going to insert an invalid number into table_exception_a. This will fail when inserting into
+    # table_exception_b via matview_exception_a_to_b, and will work ok when inserting into table_exception_c
+    ${CLICKHOUSE_CLIENT} "$@" --log_queries=1 --log_query_views=1 -q "INSERT INTO table_exception_a VALUES ('0.Aa234', 22)" > /dev/null 2>&1 || true;
+    ${CLICKHOUSE_CLIENT} -q "
+        SELECT * FROM
+        (
+          SELECT 'table_exception_a' as name, count() AS c FROM table_exception_a UNION ALL
+          SELECT 'table_exception_b' as name, count() AS c FROM table_exception_b UNION ALL
+          SELECT 'table_exception_c' as name, count() AS c FROM table_exception_c
+        )
+        ORDER BY name ASC
+        FORMAT TSV";
+
+    ${CLICKHOUSE_CLIENT} -q 'SYSTEM FLUSH LOGS';
+
+    ${CLICKHOUSE_CLIENT} -q "
+        SELECT
+            replaceOne(CAST(type AS String), 'ExceptionWhileProcessing', 'Excep****WhileProcessing')
+            exception_code
+        FROM system.query_log
+        WHERE
+              query LIKE 'INSERT INTO table_exception_a%' AND
+              type > 0 AND
+              event_date >= yesterday() AND
+              current_database = currentDatabase()
+        ORDER BY event_time_microseconds DESC
+        LIMIT 1
+        FORMAT TSV";
+
+    ${CLICKHOUSE_CLIENT} -q "
+        SELECT
+            view_name,
+            replaceOne(CAST(status AS String), 'ExceptionWhileProcessing', 'Excep****WhileProcessing'),
+            exception_code,
+            view_target,
+            view_query
+        FROM system.query_views_log
+        WHERE initial_query_id =
+            (
+                SELECT query_id
+                FROM system.query_log
+                WHERE
+                      current_database = '${CLICKHOUSE_DATABASE}' AND
+                      query LIKE 'INSERT INTO table_exception_a%' AND
+                      type > 0 AND
+                      event_date >= yesterday() AND
+                      current_database = currentDatabase()
+                ORDER BY event_time_microseconds DESC
+                LIMIT 1
+            )
+        ORDER BY view_name ASC
+        ";
+}
+
+trap cleanup EXIT;
+cleanup;
+setup;
+
+test --parallel_view_processing 0;
+test --parallel_view_processing 1;
+
+exit 0
diff --git a/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql b/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
index 7e53c0c2db7..afc2d014f4f 100644
--- a/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
+++ b/tests/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 set optimize_skip_unused_shards=1;
 set force_optimize_skip_unused_shards=2;
 
diff --git a/tests/queries/0_stateless/01932_alter_index_with_order.reference b/tests/queries/0_stateless/01932_alter_index_with_order.reference
index 07e1aab3df9..eff9ea7da0e 100644
--- a/tests/queries/0_stateless/01932_alter_index_with_order.reference
+++ b/tests/queries/0_stateless/01932_alter_index_with_order.reference
@@ -1,9 +1,9 @@
-default	alter_index_test	index_a	set	a	1
-default	alter_index_test	index_b	minmax	b	1
-default	alter_index_test	index_c	set	c	2
-default	alter_index_test	index_a	set	a	1
-default	alter_index_test	index_d	set	d	1
-default	alter_index_test	index_b	minmax	b	1
-default	alter_index_test	index_c	set	c	2
-default	alter_index_test	index_a	set	a	1
-default	alter_index_test	index_d	set	d	1
+default	alter_index_test	index_a	set	a	1	0	0	0
+default	alter_index_test	index_b	minmax	b	1	0	0	0
+default	alter_index_test	index_c	set	c	2	0	0	0
+default	alter_index_test	index_a	set	a	1	0	0	0
+default	alter_index_test	index_d	set	d	1	0	0	0
+default	alter_index_test	index_b	minmax	b	1	0	0	0
+default	alter_index_test	index_c	set	c	2	0	0	0
+default	alter_index_test	index_a	set	a	1	0	0	0
+default	alter_index_test	index_d	set	d	1	0	0	0
diff --git a/tests/queries/0_stateless/01932_global_in_function.sql b/tests/queries/0_stateless/01932_global_in_function.sql
index 467bf6c3495..ccae1e17a55 100644
--- a/tests/queries/0_stateless/01932_global_in_function.sql
+++ b/tests/queries/0_stateless/01932_global_in_function.sql
@@ -1,2 +1,4 @@
+-- Tags: global
+
 select number from cluster(test_cluster_two_shards_localhost, numbers(1)) where number global in tuple(0, 1, 2, 3);
 select number from cluster(test_cluster_two_shards_localhost, numbers(1)) where number global in array(0, 1, 2, 3);
diff --git a/tests/queries/0_stateless/01932_remote_sharding_key_column.sql b/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
index ded2f187821..20b86eacd71 100644
--- a/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
+++ b/tests/queries/0_stateless/01932_remote_sharding_key_column.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 -- regression test for the following query:
 --
 --     select * from remote('127.1', system.one, dummy)
diff --git a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
index 890d024847f..664c3f06d20 100755
--- a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
+++ b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
@@ -1,4 +1,6 @@
 #!/usr/bin/expect -f
+# Tags: no-parallel, no-fasttest
+# Tag no-parallel: Uses non unique history file
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh b/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh
deleted file mode 100755
index e862a273de4..00000000000
--- a/tests/queries/0_stateless/01939_network_send_bytes_metrics.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-${CLICKHOUSE_CLIENT} --multiquery --query "DROP TABLE IF EXISTS t; CREATE TABLE t (x UInt64) ENGINE = Memory;"
-
-${CLICKHOUSE_CLIENT} --query "SELECT number FROM numbers(1000)" > /dev/null
-
-${CLICKHOUSE_CLIENT} --multiquery --query "SYSTEM FLUSH LOGS;
-    WITH ProfileEvents['NetworkSendBytes'] AS bytes
-    SELECT bytes >= 8000 AND bytes < 9000 ? 1 : bytes FROM system.query_log
-        WHERE current_database = currentDatabase() AND query_kind = 'Select' AND event_date >= yesterday() AND type = 2 ORDER BY event_time DESC LIMIT 1;"
-
-${CLICKHOUSE_CLIENT} --query "DROP TABLE t"
diff --git a/tests/queries/0_stateless/01939_type_map_json.sql b/tests/queries/0_stateless/01939_type_map_json.sql
index df782334c90..9a2d8840e93 100644
--- a/tests/queries/0_stateless/01939_type_map_json.sql
+++ b/tests/queries/0_stateless/01939_type_map_json.sql
@@ -1,3 +1,5 @@
+-- Tags: no-fasttest
+
 SELECT map(1, 2, 3, 4) AS m FORMAT JSONEachRow;
 SELECT map(1, 2, 3, 4) AS m, toJSONString(m) AS s, isValidJSON(s);
 
diff --git a/tests/queries/0_stateless/01939_user_with_default_database.sh b/tests/queries/0_stateless/01939_user_with_default_database.sh
index 6dcd288797b..7dee12ced2e 100755
--- a/tests/queries/0_stateless/01939_user_with_default_database.sh
+++ b/tests/queries/0_stateless/01939_user_with_default_database.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql b/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
index 5d38cfb18dc..dd2ec704ce9 100644
--- a/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
+++ b/tests/queries/0_stateless/01940_custom_tld_sharding_key.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 select * from remote('127.{1,2}', view(select 'foo.com' key), cityHash64(key)) where key = cutToFirstSignificantSubdomainCustom('foo.com', 'public_suffix_list') settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
 select * from remote('127.{1,2}', view(select 'foo.com' key), cityHash64(key)) where key = cutToFirstSignificantSubdomainCustom('bar.com', 'public_suffix_list') settings optimize_skip_unused_shards=1, force_optimize_skip_unused_shards=1;
diff --git a/tests/queries/0_stateless/01942_dateTimeToSnowflake.reference b/tests/queries/0_stateless/01942_dateTimeToSnowflake.reference
new file mode 100644
index 00000000000..dfca3a10eeb
--- /dev/null
+++ b/tests/queries/0_stateless/01942_dateTimeToSnowflake.reference
@@ -0,0 +1,6 @@
+const column
+2021-08-15 18:57:56	1426860702823350272
+2021-08-15 18:57:56.492	1426860704886947840
+non-const column
+2021-08-15 18:57:56	1426860702823350272
+2021-08-15 18:57:56.492	1426860704886947840
diff --git a/tests/queries/0_stateless/01942_dateTimeToSnowflake.sql b/tests/queries/0_stateless/01942_dateTimeToSnowflake.sql
new file mode 100644
index 00000000000..047d8be7be5
--- /dev/null
+++ b/tests/queries/0_stateless/01942_dateTimeToSnowflake.sql
@@ -0,0 +1,23 @@
+-- Error cases
+SELECT dateTimeToSnowflake();  -- {serverError 42}
+SELECT dateTime64ToSnowflake();  -- {serverError 42}
+
+SELECT dateTimeToSnowflake('abc');  -- {serverError 43}
+SELECT dateTime64ToSnowflake('abc');  -- {serverError 43}
+
+SELECT dateTimeToSnowflake('abc', 123);  -- {serverError 42}
+SELECT dateTime64ToSnowflake('abc', 123);  -- {serverError 42}
+
+SELECT 'const column';
+WITH toDateTime('2021-08-15 18:57:56', 'Asia/Shanghai') AS dt
+SELECT dt, dateTimeToSnowflake(dt);
+
+WITH toDateTime64('2021-08-15 18:57:56.492', 3, 'Asia/Shanghai') AS dt64
+SELECT dt64, dateTime64ToSnowflake(dt64);
+
+SELECT 'non-const column';
+WITH toDateTime('2021-08-15 18:57:56', 'Asia/Shanghai') AS x
+SELECT materialize(x) as dt, dateTimeToSnowflake(dt);;
+
+WITH toDateTime64('2021-08-15 18:57:56.492', 3, 'Asia/Shanghai') AS x
+SELECT materialize(x) as dt64, dateTime64ToSnowflake(dt64);
diff --git a/tests/queries/0_stateless/01942_snowflakeToDateTime.reference b/tests/queries/0_stateless/01942_snowflakeToDateTime.reference
new file mode 100644
index 00000000000..bed18023f6a
--- /dev/null
+++ b/tests/queries/0_stateless/01942_snowflakeToDateTime.reference
@@ -0,0 +1,3 @@
+const column
+UTC	1426860704886947840	2021-08-15 10:57:56	DateTime(\'UTC\')	2021-08-15 10:57:56.492	DateTime64(3, \'UTC\')
+Asia/Shanghai	1426860704886947840	2021-08-15 18:57:56	DateTime(\'Asia/Shanghai\')	2021-08-15 18:57:56.492	DateTime64(3, \'Asia/Shanghai\')
diff --git a/tests/queries/0_stateless/01942_snowflakeToDateTime.sql b/tests/queries/0_stateless/01942_snowflakeToDateTime.sql
new file mode 100644
index 00000000000..f6f171afabf
--- /dev/null
+++ b/tests/queries/0_stateless/01942_snowflakeToDateTime.sql
@@ -0,0 +1,32 @@
+-- -- Error cases
+SELECT snowflakeToDateTime();  -- {serverError 42}
+SELECT snowflakeToDateTime64();  -- {serverError 42}
+
+SELECT snowflakeToDateTime('abc');  -- {serverError 43}
+SELECT snowflakeToDateTime64('abc');  -- {serverError 43}
+
+SELECT snowflakeToDateTime('abc', 123);  -- {serverError 43}
+SELECT snowflakeToDateTime64('abc', 123);  -- {serverError 43}
+
+SELECT 'const column';
+WITH
+	CAST(1426860704886947840 AS Int64) AS i64,
+	'UTC' AS tz
+SELECT
+	tz,
+	i64,
+	snowflakeToDateTime(i64, tz) as dt,
+	toTypeName(dt),
+	snowflakeToDateTime64(i64, tz) as dt64,
+	toTypeName(dt64);
+
+WITH
+	CAST(1426860704886947840 AS Int64) AS i64,
+	'Asia/Shanghai' AS tz
+SELECT
+	tz,
+	i64,
+	snowflakeToDateTime(i64, tz) as dt,
+	toTypeName(dt),
+	snowflakeToDateTime64(i64, tz) as dt64,
+	toTypeName(dt64);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01943_query_id_check.sql b/tests/queries/0_stateless/01943_query_id_check.sql
index 6e3d281386d..cb2ef090854 100644
--- a/tests/queries/0_stateless/01943_query_id_check.sql
+++ b/tests/queries/0_stateless/01943_query_id_check.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Different query_id
+
 DROP TABLE IF EXISTS tmp;
 
 CREATE TABLE tmp ENGINE = TinyLog AS SELECT queryID();
diff --git a/tests/queries/0_stateless/01944_insert_partition_by.reference b/tests/queries/0_stateless/01944_insert_partition_by.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01944_insert_partition_by.sql b/tests/queries/0_stateless/01944_insert_partition_by.sql
new file mode 100644
index 00000000000..5396ca4daf6
--- /dev/null
+++ b/tests/queries/0_stateless/01944_insert_partition_by.sql
@@ -0,0 +1,12 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: needs s3
+
+INSERT INTO TABLE FUNCTION file('foo.csv', 'CSV', 'id Int32, val Int32') PARTITION BY val VALUES (1, 1), (2, 2); -- { serverError NOT_IMPLEMENTED }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, '\r\n'); -- { serverError CANNOT_PARSE_TEXT }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'abc\x00abc'); -- { serverError CANNOT_PARSE_TEXT }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'abc\xc3\x28abc'); -- { serverError CANNOT_PARSE_TEXT }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'abc}{abc'); -- { serverError CANNOT_PARSE_TEXT }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/test_{_partition_id}.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'abc*abc'); -- { serverError CANNOT_PARSE_TEXT }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/foo/{_partition_id}', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, ''); -- { serverError BAD_ARGUMENTS }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/{_partition_id}/key.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, ''); -- { serverError BAD_ARGUMENTS }
+INSERT INTO TABLE FUNCTION s3('http://localhost:9001/{_partition_id}/key.csv', 'admin', 'admin', 'CSV', 'id Int32, val String') PARTITION BY val VALUES (1, 'aa/bb'); -- { serverError CANNOT_PARSE_TEXT }
diff --git a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
index 86e1fdd768f..a00f307673e 100755
--- a/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
+++ b/tests/queries/0_stateless/01946_test_wrong_host_name_access.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 MYHOSTNAME=$(hostname -f)
 
diff --git a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
index abca5cdfa3b..b6721d4a798 100755
--- a/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+++ b/tests/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-parallel
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql b/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
index 21e8e07c724..33fd79b14eb 100644
--- a/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
+++ b/tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP DATABASE IF EXISTS `01945.db`;
 CREATE DATABASE `01945.db`;
 
diff --git a/tests/queries/0_stateless/01950_aliases_bad_cast.reference b/tests/queries/0_stateless/01950_aliases_bad_cast.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01950_aliases_bad_cast.sql b/tests/queries/0_stateless/01950_aliases_bad_cast.sql
new file mode 100644
index 00000000000..bdd2339f855
--- /dev/null
+++ b/tests/queries/0_stateless/01950_aliases_bad_cast.sql
@@ -0,0 +1,2 @@
+SELECT 1, * FROM (SELECT NULL AS `1`); -- { serverError 352 }
+SELECT '7', 'xyz', * FROM (SELECT NULL AS `'xyz'`); -- { serverError 352 }
diff --git a/tests/queries/0_stateless/01950_kill_large_group_by_query.reference b/tests/queries/0_stateless/01950_kill_large_group_by_query.reference
index 1602d6587ad..f1df2658897 100644
--- a/tests/queries/0_stateless/01950_kill_large_group_by_query.reference
+++ b/tests/queries/0_stateless/01950_kill_large_group_by_query.reference
@@ -1,2 +1,2 @@
-finished	test_01948_tcp_default	default	SELECT * FROM\n    (\n        SELECT a.name as n\n        FROM\n        (\n            SELECT \'Name\' as name, number FROM system.numbers LIMIT 2000000\n        ) AS a,\n        (\n            SELECT \'Name\' as name, number FROM system.numbers LIMIT 2000000\n        ) as b\n        GROUP BY n\n    )\n    LIMIT 20\n    FORMAT Null
-finished	test_01948_http_default	default	SELECT * FROM\n    (\n        SELECT a.name as n\n        FROM\n        (\n            SELECT \'Name\' as name, number FROM system.numbers LIMIT 2000000\n        ) AS a,\n        (\n            SELECT \'Name\' as name, number FROM system.numbers LIMIT 2000000\n        ) as b\n        GROUP BY n\n    )\n    LIMIT 20\n    FORMAT Null
+finished	test_01948_tcp_default	default	SELECT * FROM\n    (\n        SELECT a.name as n\n        FROM\n        (\n            SELECT \'Name\' as name, number FROM system.numbers LIMIT 2000000\n        ) AS a,\n        (\n            SELECT \'Name\' as name2, number FROM system.numbers LIMIT 2000000\n        ) as b\n        GROUP BY n\n    )\n    LIMIT 20\n    FORMAT Null
+finished	test_01948_http_default	default	SELECT * FROM\n    (\n        SELECT a.name as n\n        FROM\n        (\n            SELECT \'Name\' as name, number FROM system.numbers LIMIT 2000000\n        ) AS a,\n        (\n            SELECT \'Name\' as name2, number FROM system.numbers LIMIT 2000000\n        ) as b\n        GROUP BY n\n    )\n    LIMIT 20\n    FORMAT Null
diff --git a/tests/queries/0_stateless/01950_kill_large_group_by_query.sh b/tests/queries/0_stateless/01950_kill_large_group_by_query.sh
index 465b923187e..0b369c7257e 100755
--- a/tests/queries/0_stateless/01950_kill_large_group_by_query.sh
+++ b/tests/queries/0_stateless/01950_kill_large_group_by_query.sh
@@ -23,7 +23,7 @@ $CLICKHOUSE_CLIENT --max_execution_time 10 --query_id "test_01948_tcp_$CLICKHOUS
             SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
         ) AS a,
         (
-            SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
+            SELECT 'Name' as name2, number FROM system.numbers LIMIT 2000000
         ) as b
         GROUP BY n
     )
@@ -44,7 +44,7 @@ ${CLICKHOUSE_CURL_COMMAND} -q --max-time 10 -sS "$CLICKHOUSE_URL&query_id=test_0
             SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
         ) AS a,
         (
-            SELECT 'Name' as name, number FROM system.numbers LIMIT 2000000
+            SELECT 'Name' as name2, number FROM system.numbers LIMIT 2000000
         ) as b
         GROUP BY n
     )
diff --git a/tests/queries/0_stateless/01951_distributed_push_down_limit.reference b/tests/queries/0_stateless/01951_distributed_push_down_limit.reference
new file mode 100644
index 00000000000..d0e7a9ef15b
--- /dev/null
+++ b/tests/queries/0_stateless/01951_distributed_push_down_limit.reference
@@ -0,0 +1,28 @@
+-- { echo }
+explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=0;
+Expression (Projection)
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting (Merge sorted streams after aggregation stage for ORDER BY)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        Union
+          Sorting (Sorting for ORDER BY)
+            Expression (Before ORDER BY)
+              SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                  SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                    ReadFromStorage (SystemNumbers)
+          ReadFromRemote (Read from remote replica)
+explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=1;
+Expression (Projection)
+  Limit (preliminary LIMIT (without OFFSET))
+    Sorting (Merge sorted streams after aggregation stage for ORDER BY)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        Union
+          Limit (preliminary LIMIT (with OFFSET))
+            Sorting (Sorting for ORDER BY)
+              Expression (Before ORDER BY)
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                      ReadFromStorage (SystemNumbers)
+          ReadFromRemote (Read from remote replica)
diff --git a/tests/queries/0_stateless/01951_distributed_push_down_limit.sql b/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
new file mode 100644
index 00000000000..fa2fc1800c1
--- /dev/null
+++ b/tests/queries/0_stateless/01951_distributed_push_down_limit.sql
@@ -0,0 +1,5 @@
+-- Tags: distributed
+
+-- { echo }
+explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=0;
+explain select * from remote('127.{1,2}', view(select * from numbers(1e6))) order by number limit 10 settings distributed_push_down_limit=1;
diff --git a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
new file mode 100644
index 00000000000..b23631395ff
--- /dev/null
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
@@ -0,0 +1,107 @@
+-- { echo }
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+Expression (Projection)
+  Distinct
+    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+      Union
+        Distinct (Preliminary DISTINCT)
+          Expression (Before ORDER BY)
+            SettingQuotaAndLimits (Set limits and quota after reading from storage)
+              Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  ReadFromStorage (SystemNumbers)
+        ReadFromRemote (Read from remote replica)
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+SettingQuotaAndLimits (Set limits and quota after reading from storage)
+  Union
+    Expression (Projection)
+      Distinct
+        Distinct (Preliminary DISTINCT)
+          Expression (Before ORDER BY)
+            SettingQuotaAndLimits (Set limits and quota after reading from storage)
+              Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  ReadFromStorage (SystemNumbers)
+    ReadFromRemote (Read from remote replica)
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+Expression (Projection)
+  LimitBy
+    Expression (Before LIMIT BY)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        Union
+          LimitBy
+            Expression ((Before LIMIT BY + Before ORDER BY))
+              SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                  SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                    ReadFromStorage (SystemNumbers)
+          ReadFromRemote (Read from remote replica)
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+SettingQuotaAndLimits (Set limits and quota after reading from storage)
+  Union
+    Expression (Projection)
+      LimitBy
+        Expression ((Before LIMIT BY + Before ORDER BY))
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+              SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                ReadFromStorage (SystemNumbers)
+    ReadFromRemote (Read from remote replica)
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+Expression (Projection)
+  Distinct
+    Sorting (Merge sorted streams for ORDER BY, without aggregation)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        Union
+          Sorting (Sorting for ORDER BY)
+            Distinct (Preliminary DISTINCT)
+              Expression (Before ORDER BY)
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                      ReadFromStorage (SystemNumbers)
+          ReadFromRemote (Read from remote replica)
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+Expression (Projection)
+  Sorting (Merge sorted streams after aggregation stage for ORDER BY)
+    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+      Union
+        Distinct
+          Sorting (Sorting for ORDER BY)
+            Distinct (Preliminary DISTINCT)
+              Expression (Before ORDER BY)
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                      ReadFromStorage (SystemNumbers)
+        ReadFromRemote (Read from remote replica)
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+Expression (Projection)
+  LimitBy
+    Expression (Before LIMIT BY)
+      Sorting (Merge sorted streams for ORDER BY, without aggregation)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          Union
+            LimitBy
+              Expression (Before LIMIT BY)
+                Sorting (Sorting for ORDER BY)
+                  Expression (Before ORDER BY)
+                    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                      Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                          ReadFromStorage (SystemNumbers)
+            ReadFromRemote (Read from remote replica)
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+Expression (Projection)
+  Sorting (Merge sorted streams after aggregation stage for ORDER BY)
+    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+      Union
+        LimitBy
+          Expression (Before LIMIT BY)
+            Sorting (Sorting for ORDER BY)
+              Expression (Before ORDER BY)
+                SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                  Expression ((Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))
+                    SettingQuotaAndLimits (Set limits and quota after reading from storage)
+                      ReadFromStorage (SystemNumbers)
+        ReadFromRemote (Read from remote replica)
diff --git a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
new file mode 100644
index 00000000000..d1f80b42e75
--- /dev/null
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
@@ -0,0 +1,15 @@
+-- Tags: distributed
+
+set optimize_skip_unused_shards=1;
+set optimize_distributed_group_by_sharding_key=1;
+
+-- { echo }
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
diff --git a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.config.xml b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.config.xml
index e51779006ab..61363a07625 100644
--- a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.config.xml
+++ b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <console>true</console>
@@ -30,4 +30,4 @@
     <quotas>
         <default />
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
index 069695c16db..38e5edf15fd 100755
--- a/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
+++ b/tests/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: long
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh b/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
index 9085d646a28..e7871454192 100755
--- a/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
+++ b/tests/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Tags: no-ubsan
+# Tag no-ubsan: Limits RLIMIT_NOFILE, see comment in the test
+
 # shellcheck disable=SC2086
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
diff --git a/tests/queries/0_stateless/01956_fuse_quantile_optimization.reference b/tests/queries/0_stateless/01956_fuse_quantile_optimization.reference
new file mode 100644
index 00000000000..d4cb1477ed6
--- /dev/null
+++ b/tests/queries/0_stateless/01956_fuse_quantile_optimization.reference
@@ -0,0 +1,98 @@
+2016-06-15 23:00:00	2016-06-15 23:00:00
+2016-06-15 23:00:00	2016-06-15 23:00:00
+2016-06-15 23:00:00	2016-06-15 23:00:00
+2016-06-15 23:00:00	2016-06-15 23:00:00	2016-06-15 23:00:00
+30000	30000	30000
+30000	30000	30000
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+2016-04-02 17:23:12	2016-04-02 17:23:12	2016-04-02 17:23:12
+---------After fuse result-----------
+quantile:
+SELECT
+    quantiles(0.2, 0.3)(d)[1],
+    quantiles(0.2, 0.3)(d)[2]
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileDeterministic:
+SELECT
+    quantilesDeterministic(0.2, 0.5)(d, 1)[1],
+    quantilesDeterministic(0.2, 0.5)(d, 1)[2]
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileExact:
+SELECT
+    quantilesExact(0.2, 0.5)(d)[1],
+    quantilesExact(0.2, 0.5)(d)[2]
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileExactWeighted:
+SELECT
+    quantilesExactWeighted(0.2, 0.4)(d, 1)[1],
+    quantilesExactWeighted(0.2, 0.4)(d, 1)[2],
+    quantileExactWeighted(0.3)(d, 2)
+FROM datetime
+2016-06-15 23:00:00	2016-06-15 23:00:00	2016-06-15 23:00:00
+quantileTiming:
+SELECT
+    quantilesTiming(0.2, 0.3)(d)[1],
+    quantilesTiming(0.2, 0.3)(d)[2],
+    quantileTiming(0.2)(d + 1)
+FROM datetime
+30000	30000	30000
+quantileTimingWeighted:
+SELECT
+    quantilesTimingWeighted(0.2, 0.3)(d, 1)[1],
+    quantilesTimingWeighted(0.2, 0.3)(d, 1)[2],
+    quantileTimingWeighted(0.2)(d, 2)
+FROM datetime
+30000	30000	30000
+quantileTDigest:
+SELECT
+    quantilesTDigest(0.2, 0.3)(d)[1],
+    quantilesTDigest(0.2, 0.3)(d)[2],
+    quantileTDigest(0.2)(d + 1)
+FROM datetime
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+quantileTDigestWeighted:
+SELECT
+    quantilesTDigestWeighted(0.2, 0.3)(d, 1)[1],
+    quantilesTDigestWeighted(0.2, 0.3)(d, 1)[2],
+    quantileTDigestWeighted(0.4)(d, 2)
+FROM datetime
+2016-06-15 23:00:16	2016-06-15 23:00:16	2016-06-15 23:00:16
+quantileBFloat16:
+SELECT
+    quantilesBFloat16(0.2, 0.3)(d)[1],
+    quantilesBFloat16(0.2, 0.3)(d)[2],
+    quantileBFloat16(0.4)(d + 1)
+FROM datetime
+2016-04-02 17:23:12	2016-04-02 17:23:12	2016-04-02 17:23:12
+quantileBFloat16Weighted:
+SELECT
+    quantilesBFloat16Weighted(0.2, 0.3)(d, 1)[1],
+    quantilesBFloat16Weighted(0.2, 0.3)(d, 1)[2],
+    quantileBFloat16Weighted(0.2)(d, 2)
+FROM datetime
+2016-04-02 17:23:12	2016-04-02 17:23:12	2016-04-02 17:23:12
+SELECT
+    quantiles(0.2, 0.3, 0.2)(d)[1] AS k,
+    quantiles(0.2, 0.3, 0.2)(d)[2]
+FROM datetime
+ORDER BY quantiles(0.2, 0.3, 0.2)(d)[3] ASC
+0	4	7.2	7.6
+1	5	8.2	8.6
+SELECT
+    b,
+    quantiles(0.5, 0.9, 0.95)(x)[1] AS a,
+    quantiles(0.5, 0.9, 0.95)(x)[2] AS y,
+    quantiles(0.5, 0.9, 0.95)(x)[3]
+FROM
+(
+    SELECT
+        number AS x,
+        number % 2 AS b
+    FROM numbers(10)
+)
+GROUP BY b
+1	1	1
diff --git a/tests/queries/0_stateless/01956_fuse_quantile_optimization.sql b/tests/queries/0_stateless/01956_fuse_quantile_optimization.sql
new file mode 100644
index 00000000000..a4729e89755
--- /dev/null
+++ b/tests/queries/0_stateless/01956_fuse_quantile_optimization.sql
@@ -0,0 +1,76 @@
+DROP TABLE IF EXISTS datetime;
+CREATE TABLE datetime (d DateTime('UTC')) ENGINE = Memory;
+INSERT INTO datetime(d) VALUES(toDateTime('2016-06-15 23:00:00', 'UTC'))
+
+SET optimize_syntax_fuse_functions = true;
+
+SELECT quantile(0.2)(d), quantile(0.3)(d) FROM datetime;
+SELECT quantileDeterministic(0.2)(d, 1), quantileDeterministic(0.5)(d, 1) FROM datetime;
+SELECT quantileExact(0.2)(d), quantileExact(0.5)(d) FROM datetime;
+SELECT quantileExactWeighted(0.2)(d, 1), quantileExactWeighted(0.4)(d, 1), quantileExactWeighted(0.3)(d, 2) FROM datetime;
+SELECT quantileTiming(0.2)(d), quantileTiming(0.3)(d), quantileTiming(0.2)(d+1) FROM datetime;
+SELECT quantileTimingWeighted(0.2)(d, 1), quantileTimingWeighted(0.3)(d, 1), quantileTimingWeighted(0.2)(d, 2) FROM datetime;
+SELECT quantileTDigest(0.2)(d), quantileTDigest(0.3)(d), quantileTDigest(0.2)(d + 1) FROM datetime;
+SELECT quantileTDigestWeighted(0.2)(d, 1), quantileTDigestWeighted(0.3)(d, 1), quantileTDigestWeighted(0.4)(d, 2) FROM datetime;
+SELECT quantileBFloat16(0.2)(d), quantileBFloat16(0.3)(d), quantileBFloat16(0.4)(d + 1) FROM datetime;
+
+
+SELECT '---------After fuse result-----------';
+SELECT 'quantile:';
+EXPLAIN SYNTAX SELECT quantile(0.2)(d), quantile(0.3)(d) FROM datetime;
+SELECT quantile(0.2)(d), quantile(0.3)(d) FROM datetime;
+
+SELECT 'quantileDeterministic:';
+EXPLAIN SYNTAX SELECT quantileDeterministic(0.2)(d, 1), quantileDeterministic(0.5)(d, 1) FROM datetime;
+SELECT quantileDeterministic(0.2)(d, 1), quantileDeterministic(0.5)(d, 1) FROM datetime;
+
+SELECT 'quantileExact:';
+EXPLAIN SYNTAX SELECT quantileExact(0.2)(d), quantileExact(0.5)(d) FROM datetime;
+SELECT quantileExact(0.2)(d), quantileExact(0.5)(d) FROM datetime;
+
+SELECT 'quantileExactWeighted:';
+EXPLAIN SYNTAX SELECT quantileExactWeighted(0.2)(d, 1), quantileExactWeighted(0.4)(d, 1), quantileExactWeighted(0.3)(d, 2) FROM datetime;
+SELECT quantileExactWeighted(0.2)(d, 1), quantileExactWeighted(0.4)(d, 1), quantileExactWeighted(0.3)(d, 2) FROM datetime;
+
+SELECT 'quantileTiming:';
+EXPLAIN SYNTAX SELECT quantileTiming(0.2)(d), quantileTiming(0.3)(d), quantileTiming(0.2)(d+1) FROM datetime;
+SELECT quantileTiming(0.2)(d), quantileTiming(0.3)(d), quantileTiming(0.2)(d+1) FROM datetime;
+
+SELECT 'quantileTimingWeighted:';
+EXPLAIN SYNTAX SELECT quantileTimingWeighted(0.2)(d, 1), quantileTimingWeighted(0.3)(d, 1), quantileTimingWeighted(0.2)(d, 2) FROM datetime;
+SELECT quantileTimingWeighted(0.2)(d, 1), quantileTimingWeighted(0.3)(d, 1), quantileTimingWeighted(0.2)(d, 2) FROM datetime;
+
+SELECT 'quantileTDigest:';
+EXPLAIN SYNTAX SELECT quantileTDigest(0.2)(d), quantileTDigest(0.3)(d), quantileTDigest(0.2)(d + 1) FROM datetime;
+SELECT quantileTDigest(0.2)(d), quantileTDigest(0.3)(d), quantileTDigest(0.2)(d + 1) FROM datetime;
+
+SELECT 'quantileTDigestWeighted:';
+EXPLAIN SYNTAX SELECT quantileTDigestWeighted(0.2)(d, 1), quantileTDigestWeighted(0.3)(d, 1), quantileTDigestWeighted(0.4)(d, 2) FROM datetime;
+SELECT quantileTDigestWeighted(0.2)(d, 1), quantileTDigestWeighted(0.3)(d, 1), quantileTDigestWeighted(0.4)(d, 2) FROM datetime;
+
+SELECT 'quantileBFloat16:';
+EXPLAIN SYNTAX SELECT quantileBFloat16(0.2)(d), quantileBFloat16(0.3)(d), quantileBFloat16(0.4)(d + 1) FROM datetime;
+SELECT quantileBFloat16(0.2)(d), quantileBFloat16(0.3)(d), quantileBFloat16(0.4)(d + 1) FROM datetime;
+
+SELECT 'quantileBFloat16Weighted:';
+EXPLAIN SYNTAX SELECT quantileBFloat16Weighted(0.2)(d, 1), quantileBFloat16Weighted(0.3)(d, 1), quantileBFloat16Weighted(0.2)(d, 2) FROM datetime;
+SELECT quantileBFloat16Weighted(0.2)(d, 1), quantileBFloat16Weighted(0.3)(d, 1), quantileBFloat16Weighted(0.2)(d, 2) FROM datetime;
+
+EXPLAIN SYNTAX SELECT quantile(0.2)(d) as k, quantile(0.3)(d) FROM datetime order by quantile(0.2)(d);
+
+SELECT b, quantile(0.5)(x) as a, quantile(0.9)(x) as y, quantile(0.95)(x) FROM (select number as x, number % 2 as b from numbers(10)) group by b;
+EXPLAIN SYNTAX SELECT b, quantile(0.5)(x) as a, quantile(0.9)(x) as y, quantile(0.95)(x) FROM (select number as x, number % 2 as b from numbers(10)) group by b;
+
+-- fuzzer
+SELECT quantileDeterministic(0.99)(1023) FROM datetime FORMAT Null; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT quantileTiming(0.5)(NULL, NULL, quantileTiming(-inf)(NULL), NULL) FROM datetime FORMAT Null; -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantileTDigest(NULL)(NULL, quantileTDigest(3.14)(NULL, d + NULL), 2.), NULL FORMAT Null; -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantile(1, 0.3)(d), quantile(0.3)(d) FROM datetime; -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT quantile(quantileDeterministic('', '2.47')('0.02', '0.2', NULL), 0.9)(d), quantile(0.3)(d) FROM datetime; -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantileTimingWeighted([[[[['-214748364.8'], NULL]], [[[quantileTimingWeighted([[[[['-214748364.8'], NULL], '-922337203.6854775808'], [[['-214748364.7']]], NULL]])([NULL], NULL), '-214748364.7']]], NULL]])([NULL], NULL); -- { serverError ILLEGAL_AGGREGATION }
+SELECT quantileTimingWeighted([quantileTimingWeighted(0.5)(1, 1)])(1, 1); -- { serverError ILLEGAL_AGGREGATION }
+
+DROP TABLE datetime;
+
+SET optimize_syntax_fuse_functions = 1;
+SELECT quantile(1 AS a), quantile(a AS b), quantile(b AS c);
diff --git a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
index 0e2f1857aed..3ddb6346631 100755
--- a/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
+++ b/tests/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: shard
 
 CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=trace
 
diff --git a/tests/queries/0_stateless/01958_partial_hour_timezone.reference b/tests/queries/0_stateless/01958_partial_hour_timezone.reference
new file mode 100644
index 00000000000..a86391b491c
--- /dev/null
+++ b/tests/queries/0_stateless/01958_partial_hour_timezone.reference
@@ -0,0 +1,20 @@
+Row 1:
+──────
+toUnixTimestamp(t):                            14459031
+timeZoneOffset(t):                             -2670
+formatDateTime(t, '%F %T', 'Africa/Monrovia'): 1970-06-17 07:39:21
+toString(t, 'Africa/Monrovia'):                1970-06-17 07:39:21
+toStartOfMinute(t):                            1970-06-17 07:39:00
+toStartOfFiveMinute(t):                        1970-06-17 07:35:00
+toStartOfFifteenMinutes(t):                    1970-06-17 07:30:00
+toStartOfTenMinutes(t):                        1970-06-17 07:30:00
+toStartOfHour(t):                              1970-06-17 07:00:00
+toStartOfDay(t):                               1970-06-17 00:00:00
+toStartOfWeek(t):                              1970-06-14
+toStartOfInterval(t, toIntervalSecond(1)):     1970-06-17 07:39:21
+toStartOfInterval(t, toIntervalMinute(1)):     1970-06-17 07:39:00
+toStartOfInterval(t, toIntervalMinute(2)):     1970-06-17 07:38:00
+toStartOfInterval(t, toIntervalMinute(5)):     1970-06-17 07:35:00
+toStartOfInterval(t, toIntervalMinute(60)):    1970-06-17 07:00:00
+addMinutes(t, 1):                              1970-06-17 07:40:21
+addMinutes(t, 60):                             1970-06-17 08:39:21
diff --git a/tests/queries/0_stateless/01958_partial_hour_timezone.sql b/tests/queries/0_stateless/01958_partial_hour_timezone.sql
new file mode 100644
index 00000000000..9bcb03ea4f2
--- /dev/null
+++ b/tests/queries/0_stateless/01958_partial_hour_timezone.sql
@@ -0,0 +1,21 @@
+-- Appeared in https://github.com/ClickHouse/ClickHouse/pull/26978#issuecomment-890889362
+WITH toDateTime('1970-06-17 07:39:21', 'Africa/Monrovia') as t
+SELECT toUnixTimestamp(t),
+       timeZoneOffset(t),
+       formatDateTime(t, '%F %T', 'Africa/Monrovia'),
+       toString(t, 'Africa/Monrovia'),
+       toStartOfMinute(t),
+       toStartOfFiveMinute(t),
+       toStartOfFifteenMinutes(t),
+       toStartOfTenMinutes(t),
+       toStartOfHour(t),
+       toStartOfDay(t),
+       toStartOfWeek(t),
+       toStartOfInterval(t, INTERVAL 1 second),
+       toStartOfInterval(t, INTERVAL 1 minute),
+       toStartOfInterval(t, INTERVAL 2 minute),
+       toStartOfInterval(t, INTERVAL 5 minute),
+       toStartOfInterval(t, INTERVAL 60 minute),
+       addMinutes(t, 1),
+       addMinutes(t, 60)
+FORMAT Vertical;
diff --git a/tests/queries/0_stateless/01960_lambda_precedence.reference b/tests/queries/0_stateless/01960_lambda_precedence.reference
new file mode 100644
index 00000000000..96e36988183
--- /dev/null
+++ b/tests/queries/0_stateless/01960_lambda_precedence.reference
@@ -0,0 +1,3 @@
+1000	[2,3,4]	1010
+1
+1
diff --git a/tests/queries/0_stateless/01960_lambda_precedence.sql b/tests/queries/0_stateless/01960_lambda_precedence.sql
new file mode 100644
index 00000000000..a3ff1424cf2
--- /dev/null
+++ b/tests/queries/0_stateless/01960_lambda_precedence.sql
@@ -0,0 +1,26 @@
+SELECT
+    1000 AS a,
+    arrayMap(a -> (a + 1), [1, 2, 3]),
+    a + 10 as c;
+
+
+-- https://github.com/ClickHouse/ClickHouse/issues/5046
+SELECT sum(c1) AS v
+FROM
+    (
+     SELECT
+         1 AS c1,
+         ['v'] AS c2
+        )
+WHERE arrayExists(v -> (v = 'v'), c2);
+
+
+SELECT sum(c1) AS v
+FROM
+    (
+     SELECT
+         1 AS c1,
+         ['v'] AS c2,
+         ['d'] AS d
+        )
+WHERE arrayExists(i -> (d = ['d']), c2);
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.reference b/tests/queries/0_stateless/01961_roaring_memory_tracking.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
new file mode 100644
index 00000000000..64c31472e89
--- /dev/null
+++ b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
@@ -0,0 +1,4 @@
+-- Tags: no-replicated-database
+
+SET max_memory_usage = '100M';
+SELECT cityHash64(rand() % 1000) as n, groupBitmapState(number) FROM numbers_mt(2000000000) GROUP BY n; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01999_grant_with_replace.sql b/tests/queries/0_stateless/01999_grant_with_replace.sql
index 31a9187c0d2..0f11bc5423c 100644
--- a/tests/queries/0_stateless/01999_grant_with_replace.sql
+++ b/tests/queries/0_stateless/01999_grant_with_replace.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 DROP USER IF EXISTS test_user_01999;
 
 CREATE USER test_user_01999;
diff --git a/tests/queries/0_stateless/02000_map_full_text_bloom_filter_index.reference b/tests/queries/0_stateless/02000_map_full_text_bloom_filter_index.reference
new file mode 100644
index 00000000000..28ede3d4074
--- /dev/null
+++ b/tests/queries/0_stateless/02000_map_full_text_bloom_filter_index.reference
@@ -0,0 +1,104 @@
+Map full text bloom filter tokenbf mapKeys
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map fixed full text bloom filter tokenbf mapKeys
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map full text bloom filter tokenbf mapValues
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map fixed full text bloom filter tokenbf mapKeys
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map full text bloom filter ngrambf mapKeys
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map fixed full text bloom filter ngrambf mapKeys
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map full text bloom filter ngrambf mapValues
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
+Map fixed full text bloom filter ngrambf mapKeys
+Equals with existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}	{'K0':'V0'}
+1	{'K1':'V1'}	{'K1':'V1'}
+Not equals with non existing key and default value
diff --git a/tests/queries/0_stateless/02000_map_full_text_bloom_filter_index.sql b/tests/queries/0_stateless/02000_map_full_text_bloom_filter_index.sql
new file mode 100644
index 00000000000..18e75eac9bc
--- /dev/null
+++ b/tests/queries/0_stateless/02000_map_full_text_bloom_filter_index.sql
@@ -0,0 +1,174 @@
+DROP TABLE IF EXISTS bf_tokenbf_map_keys_test;
+DROP TABLE IF EXISTS bf_ngrambf_map_keys_test;
+
+CREATE TABLE bf_tokenbf_map_keys_test
+(
+    row_id UInt32,
+    map Map(String, String),
+    map_fixed Map(FixedString(2), String),
+    INDEX map_keys_tokenbf mapKeys(map) TYPE tokenbf_v1(256,2,0) GRANULARITY 1,
+    INDEX map_fixed_keys_tokenbf mapKeys(map_fixed) TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO bf_tokenbf_map_keys_test VALUES (0, {'K0':'V0'}, {'K0':'V0'}), (1, {'K1':'V1'}, {'K1':'V1'});
+
+SELECT 'Map full text bloom filter tokenbf mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_keys_tokenbf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_keys_tokenbf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_keys_tokenbf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_keys_tokenbf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map['K3'] != '';
+
+SELECT 'Map fixed full text bloom filter tokenbf mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map_fixed['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_fixed_keys_tokenbf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map_fixed['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_fixed_keys_tokenbf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map_fixed['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map_fixed['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_fixed_keys_tokenbf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map_fixed['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_fixed_keys_tokenbf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_keys_test WHERE map_fixed['K3'] != '';
+
+DROP TABLE bf_tokenbf_map_keys_test;
+
+CREATE TABLE bf_tokenbf_map_values_test
+(
+    row_id UInt32,
+    map Map(String, String),
+    map_fixed Map(FixedString(2), String),
+    INDEX map_values_tokenbf mapValues(map) TYPE tokenbf_v1(256,2,0) GRANULARITY 1,
+    INDEX map_fixed_values_tokenbf mapValues(map_fixed) TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO bf_tokenbf_map_values_test VALUES (0, {'K0':'V0'}, {'K0':'V0'}), (1, {'K1':'V1'}, {'K1':'V1'});
+
+SELECT 'Map full text bloom filter tokenbf mapValues';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_values_tokenbf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_values_tokenbf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_values_tokenbf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_values_tokenbf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map['K3'] != '';
+
+SELECT 'Map fixed full text bloom filter tokenbf mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map_fixed['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_fixed_values_tokenbf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map_fixed['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_fixed_values_tokenbf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map_fixed['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map_fixed['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_fixed_values_tokenbf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map_fixed['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_fixed_values_tokenbf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_tokenbf_map_values_test WHERE map_fixed['K3'] != '';
+
+DROP TABLE bf_tokenbf_map_values_test;
+
+CREATE TABLE bf_ngrambf_map_keys_test
+(
+    row_id UInt32,
+    map Map(String, String),
+    map_fixed Map(FixedString(2), String),
+    INDEX map_keys_ngrambf mapKeys(map) TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1,
+    INDEX map_fixed_keys_ngrambf mapKeys(map_fixed) TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO bf_ngrambf_map_keys_test VALUES (0, {'K0':'V0'}, {'K0':'V0'}), (1, {'K1':'V1'}, {'K1':'V1'});
+
+SELECT 'Map full text bloom filter ngrambf mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_keys_ngrambf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_keys_ngrambf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_keys_ngrambf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_keys_ngrambf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map['K3'] != '';
+
+SELECT 'Map fixed full text bloom filter ngrambf mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map_fixed['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_fixed_keys_ngrambf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map_fixed['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_fixed_keys_ngrambf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map_fixed['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map_fixed['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_fixed_keys_ngrambf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map_fixed['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_fixed_keys_ngrambf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_keys_test WHERE map_fixed['K3'] != '';
+
+DROP TABLE bf_ngrambf_map_keys_test;
+
+CREATE TABLE bf_ngrambf_map_values_test
+(
+    row_id UInt32,
+    map Map(String, String),
+    map_fixed Map(FixedString(2), String),
+    INDEX map_values_ngrambf mapKeys(map) TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1,
+    INDEX map_fixed_values_ngrambf mapKeys(map_fixed) TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO bf_ngrambf_map_values_test VALUES (0, {'K0':'V0'}, {'K0':'V0'}), (1, {'K1':'V1'}, {'K1':'V1'});
+
+SELECT 'Map full text bloom filter ngrambf mapValues';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_values_ngrambf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_values_ngrambf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_values_ngrambf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_values_ngrambf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map['K3'] != '';
+
+SELECT 'Map fixed full text bloom filter ngrambf mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map_fixed['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_fixed_values_ngrambf';
+SELECT 'Equals with non existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map_fixed['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_fixed_values_ngrambf';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map_fixed['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map_fixed['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_fixed_values_ngrambf';
+SELECT 'Not equals with non existing key';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map_fixed['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_fixed_values_ngrambf';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM bf_ngrambf_map_values_test WHERE map_fixed['K3'] != '';
+
+DROP TABLE bf_ngrambf_map_values_test;
diff --git a/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql b/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
index b006f9acb22..9cf02930199 100644
--- a/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
+++ b/tests/queries/0_stateless/02001_add_default_database_to_system_users.sql
@@ -1,3 +1,6 @@
+-- Tags: no-parallel
+-- Tag no-parallel: create user
+
 create user if not exists u_02001 default database system;
 select default_database from system.users where name = 'u_02001';
 drop user if exists u_02001;
diff --git a/tests/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.reference b/tests/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.reference
new file mode 100644
index 00000000000..6c680840239
--- /dev/null
+++ b/tests/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.reference
@@ -0,0 +1,8 @@
+-- { echo }
+select dummy as foo from remote('127.{2,3}', currentDatabase(), dist) limit 1 settings prefer_localhost_replica=0, distributed_push_down_limit=0;
+0
+select dummy as foo from remote('127.{2,3}', currentDatabase(), dist) limit 1 settings prefer_localhost_replica=0, distributed_push_down_limit=1;
+0
+select dummy as foo from remote('127.{2,3}', currentDatabase(), dist) limit 1 settings prefer_localhost_replica=0, distributed_group_by_no_merge=1;
+0
+0
diff --git a/tests/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.sql b/tests/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.sql
new file mode 100644
index 00000000000..0925df1888d
--- /dev/null
+++ b/tests/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.sql
@@ -0,0 +1,6 @@
+drop table if exists dist;
+create table dist as system.one engine=Distributed('test_shard_localhost', system, one);
+-- { echo }
+select dummy as foo from remote('127.{2,3}', currentDatabase(), dist) limit 1 settings prefer_localhost_replica=0, distributed_push_down_limit=0;
+select dummy as foo from remote('127.{2,3}', currentDatabase(), dist) limit 1 settings prefer_localhost_replica=0, distributed_push_down_limit=1;
+select dummy as foo from remote('127.{2,3}', currentDatabase(), dist) limit 1 settings prefer_localhost_replica=0, distributed_group_by_no_merge=1;
diff --git a/tests/queries/0_stateless/02001_select_with_filter.reference b/tests/queries/0_stateless/02001_select_with_filter.reference
new file mode 100644
index 00000000000..92af7d1d38f
--- /dev/null
+++ b/tests/queries/0_stateless/02001_select_with_filter.reference
@@ -0,0 +1,4 @@
+98
+2450
+\N
+2500
diff --git a/tests/queries/0_stateless/02001_select_with_filter.sql b/tests/queries/0_stateless/02001_select_with_filter.sql
new file mode 100644
index 00000000000..70152db83f8
--- /dev/null
+++ b/tests/queries/0_stateless/02001_select_with_filter.sql
@@ -0,0 +1,4 @@
+SELECT argMax(number, number + 1) FILTER(WHERE number != 99) FROM numbers(100) ;
+SELECT sum(number) FILTER(WHERE number % 2 == 0) FROM numbers(100);
+SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE 0) FROM numbers(100);
+SELECT sumIfOrNull(number, number % 2 == 1) FILTER(WHERE 1) FROM numbers(100);
diff --git a/tests/queries/0_stateless/02001_shard_num_shard_count.sql b/tests/queries/0_stateless/02001_shard_num_shard_count.sql
index daf1084a614..0d4a92f4ede 100644
--- a/tests/queries/0_stateless/02001_shard_num_shard_count.sql
+++ b/tests/queries/0_stateless/02001_shard_num_shard_count.sql
@@ -1,3 +1,5 @@
+-- Tags: shard
+
 select shardNum() n, shardCount() c;
 select shardNum() n, shardCount() c from remote('127.0.0.{1,2,3}', system.one) order by n settings prefer_localhost_replica = 0;
 select shardNum() n, shardCount() c from remote('127.0.0.{1,2,3}', system.one) order by n settings prefer_localhost_replica = 1;
diff --git a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
index 1b24617569c..7d9c08c7cb6 100644
--- a/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
+++ b/tests/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
@@ -1,3 +1,5 @@
+-- Tags: global
+
 SELECT
     cityHash64(number GLOBAL IN (NULL, -2147483648, -9223372036854775808), nan, 1024, NULL, NULL, 1.000100016593933, NULL),
     (NULL, cityHash64(inf, -2147483648, NULL, NULL, 10.000100135803223), cityHash64(1.1754943508222875e-38, NULL, NULL, NULL), 2147483647)
diff --git a/tests/queries/0_stateless/02002_parse_map_int_key.reference b/tests/queries/0_stateless/02002_parse_map_int_key.reference
new file mode 100644
index 00000000000..dc02589d4bc
--- /dev/null
+++ b/tests/queries/0_stateless/02002_parse_map_int_key.reference
@@ -0,0 +1 @@
+{1:2,3:4,5:6,7:8}	{'2021-05-20':1,'2021-05-21':2,'2021-05-22':3,'2021-05-23':4}
diff --git a/tests/queries/0_stateless/02002_parse_map_int_key.sql b/tests/queries/0_stateless/02002_parse_map_int_key.sql
new file mode 100644
index 00000000000..ecd2a090975
--- /dev/null
+++ b/tests/queries/0_stateless/02002_parse_map_int_key.sql
@@ -0,0 +1,11 @@
+SET allow_experimental_map_type = 1;
+
+DROP TABLE IF EXISTS t_map_int_key;
+CREATE TABLE t_map_int_key (m1 Map(UInt32, UInt32), m2 Map(Date, UInt32)) ENGINE = Memory;
+
+INSERT INTO t_map_int_key FORMAT CSV "{1:2, 3: 4, 5 :6, 7 : 8}","{'2021-05-20':1, '2021-05-21': 2, '2021-05-22' :3, '2021-05-23' : 4}"
+;
+
+SELECT m1, m2 FROM t_map_int_key;
+
+DROP TABLE t_map_int_key;
diff --git a/tests/queries/0_stateless/02002_row_level_filter_bug.reference b/tests/queries/0_stateless/02002_row_level_filter_bug.reference
new file mode 100644
index 00000000000..ea14f6fa1dd
--- /dev/null
+++ b/tests/queries/0_stateless/02002_row_level_filter_bug.reference
@@ -0,0 +1,3 @@
+600
+AWD	3130	2021-07-15	600
+0
diff --git a/tests/queries/0_stateless/02002_row_level_filter_bug.sh b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
new file mode 100755
index 00000000000..d15a26f48f5
--- /dev/null
+++ b/tests/queries/0_stateless/02002_row_level_filter_bug.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+# Tag no-parallel: create user
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT --query "drop table if exists test_table"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE test_table
+(
+    a      UInt16 DEFAULT 0,
+    c      LowCardinality(String) DEFAULT '',
+    t_date LowCardinality(String) DEFAULT '',
+    ex     LowCardinality(String) DEFAULT '',
+    team   LowCardinality(String) DEFAULT '',
+    g      LowCardinality(String) DEFAULT '',
+    mt     FixedString(1) DEFAULT ' ',
+    rw_ts  Int64 DEFAULT 0,
+    exr_t  Int64 DEFAULT 0,
+    en     UInt16 DEFAULT 0,
+    f_t    Int64 DEFAULT 0,
+    j      UInt64 DEFAULT 0,
+    oj     UInt64 DEFAULT 0
+)
+ENGINE = MergeTree
+PARTITION BY (c, t_date)
+ORDER BY (ex, team, g, mt, rw_ts, exr_t, en, f_t, j, oj)
+SETTINGS index_granularity = 8192"
+
+$CLICKHOUSE_CLIENT --query "
+INSERT INTO test_table(t_date, c,team, a) SELECT
+arrayJoin([toDate('2021-07-15'),toDate('2021-07-16')]) as t_date,
+arrayJoin(['aur','rua']) as c,
+arrayJoin(['AWD','ZZZ']) as team,
+arrayJoin([3183,3106,0,3130,3108,3126,3109,3107,3182,3180,3129,3128,3125,3266]) as a
+FROM numbers(600);"
+
+$CLICKHOUSE_CLIENT --query "DROP ROLE IF exists AWD;"
+$CLICKHOUSE_CLIENT --query "create role AWD;"
+$CLICKHOUSE_CLIENT --query "REVOKE ALL ON *.* FROM AWD;"
+
+$CLICKHOUSE_CLIENT --query "DROP USER IF EXISTS AWD_user;"
+$CLICKHOUSE_CLIENT --query "CREATE USER AWD_user IDENTIFIED WITH plaintext_password BY 'AWD_pwd' DEFAULT ROLE AWD;"
+
+$CLICKHOUSE_CLIENT --query "GRANT SELECT ON test_table TO AWD;"
+
+$CLICKHOUSE_CLIENT --query "DROP ROW POLICY IF EXISTS ttt_bu_test_table_AWD ON test_table;"
+$CLICKHOUSE_CLIENT --query "CREATE ROW POLICY ttt_bu_test_table_AWD ON test_table FOR SELECT USING team = 'AWD' TO AWD;"
+
+$CLICKHOUSE_CLIENT  --user=AWD_user --password=AWD_pwd  --query "
+SELECT count() AS count
+ FROM test_table
+WHERE
+ t_date = '2021-07-15' AND c = 'aur' AND a=3130;
+"
+
+$CLICKHOUSE_CLIENT  --user=AWD_user --password=AWD_pwd  --query "
+SELECT
+    team,
+    a,
+    t_date,
+    count() AS count
+FROM test_table
+WHERE (t_date = '2021-07-15') AND (c = 'aur') AND (a = 3130)
+GROUP BY
+    team,
+    a,
+    t_date;
+"
+
+$CLICKHOUSE_CLIENT  --user=AWD_user --password=AWD_pwd  --query "
+SELECT count() AS count
+FROM test_table
+WHERE (t_date = '2021-07-15') AND (c = 'aur') AND (a = 313)
+"
diff --git a/tests/queries/0_stateless/02002_sampling_and_unknown_column_bug.reference b/tests/queries/0_stateless/02002_sampling_and_unknown_column_bug.reference
new file mode 100644
index 00000000000..9315e86b328
--- /dev/null
+++ b/tests/queries/0_stateless/02002_sampling_and_unknown_column_bug.reference
@@ -0,0 +1,2 @@
+1
+1	1	1
diff --git a/tests/queries/0_stateless/02002_sampling_and_unknown_column_bug.sql b/tests/queries/0_stateless/02002_sampling_and_unknown_column_bug.sql
new file mode 100644
index 00000000000..838d7a5526b
--- /dev/null
+++ b/tests/queries/0_stateless/02002_sampling_and_unknown_column_bug.sql
@@ -0,0 +1,20 @@
+drop table if exists sessions;
+CREATE TABLE sessions
+(
+  `user_id` UInt64
+)
+ENGINE = MergeTree
+ORDER BY user_id 
+SAMPLE BY user_id;
+
+insert into sessions values(1);
+
+SELECT
+    sum(user_id * _sample_factor) 
+FROM sessions
+SAMPLE 10000000;
+
+SELECT
+    uniq(user_id) a,  min(_sample_factor) x,  a*x
+FROM sessions
+SAMPLE 10000000;
diff --git a/tests/queries/0_stateless/01939_network_send_bytes_metrics.reference b/tests/queries/0_stateless/02002_system_table_with_tuple.reference
similarity index 100%
rename from tests/queries/0_stateless/01939_network_send_bytes_metrics.reference
rename to tests/queries/0_stateless/02002_system_table_with_tuple.reference
diff --git a/tests/queries/0_stateless/02002_system_table_with_tuple.sh b/tests/queries/0_stateless/02002_system_table_with_tuple.sh
new file mode 100755
index 00000000000..2abf5b8b525
--- /dev/null
+++ b/tests/queries/0_stateless/02002_system_table_with_tuple.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "SELECT count() > 0 FROM system.tables \
+    WHERE database IN ('system', '$CLICKHOUSE_DATABASE') \
+    SETTINGS legacy_column_name_of_tuple_literal = 1"
diff --git a/tests/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.reference b/tests/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.reference
new file mode 100644
index 00000000000..6cdb80167d1
--- /dev/null
+++ b/tests/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.reference
@@ -0,0 +1,38 @@
+-- { echo }
+SELECT *
+FROM remote('127.{1,2}', view(
+    SELECT number%20 number
+    FROM numbers(40)
+    WHERE (number % 2) = (shardNum() - 1)
+), number)
+GROUP BY number
+ORDER BY number ASC
+LIMIT 1 BY number
+LIMIT 5, 5
+SETTINGS
+    optimize_skip_unused_shards=1,
+    optimize_distributed_group_by_sharding_key=1,
+    distributed_push_down_limit=1;
+5
+6
+7
+8
+9
+SELECT *
+FROM remote('127.{1,2}', view(
+    SELECT number%20 number
+    FROM numbers(40)
+    WHERE (number % 2) = (shardNum() - 1)
+), number)
+GROUP BY number
+ORDER BY number ASC
+LIMIT 1 BY number
+LIMIT 5, 5
+SETTINGS
+    distributed_group_by_no_merge=2,
+    distributed_push_down_limit=1;
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.sql b/tests/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.sql
new file mode 100644
index 00000000000..1a446a80603
--- /dev/null
+++ b/tests/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.sql
@@ -0,0 +1,36 @@
+-- Here we use a trick with shardNum() to generate unique data on each shard.
+-- Since distributed_group_by_no_merge=2 will use WithMergeableStateAfterAggregationAndLimit,
+-- which assume that the data on shards is unique
+-- (LIMIT BY will be applied only on shards, not on the initiator).
+
+-- To distinguish echoing from the comments above we use SELECT FORMAT Null.
+SELECT '' FORMAT Null;
+
+-- { echo }
+SELECT *
+FROM remote('127.{1,2}', view(
+    SELECT number%20 number
+    FROM numbers(40)
+    WHERE (number % 2) = (shardNum() - 1)
+), number)
+GROUP BY number
+ORDER BY number ASC
+LIMIT 1 BY number
+LIMIT 5, 5
+SETTINGS
+    optimize_skip_unused_shards=1,
+    optimize_distributed_group_by_sharding_key=1,
+    distributed_push_down_limit=1;
+SELECT *
+FROM remote('127.{1,2}', view(
+    SELECT number%20 number
+    FROM numbers(40)
+    WHERE (number % 2) = (shardNum() - 1)
+), number)
+GROUP BY number
+ORDER BY number ASC
+LIMIT 1 BY number
+LIMIT 5, 5
+SETTINGS
+    distributed_group_by_no_merge=2,
+    distributed_push_down_limit=1;
diff --git a/tests/queries/0_stateless/02003_bug_from_23515.reference b/tests/queries/0_stateless/02003_bug_from_23515.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02003_bug_from_23515.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02003_bug_from_23515.sql b/tests/queries/0_stateless/02003_bug_from_23515.sql
new file mode 100644
index 00000000000..febd59b0755
--- /dev/null
+++ b/tests/queries/0_stateless/02003_bug_from_23515.sql
@@ -0,0 +1,10 @@
+drop table if exists tab;
+create table tab (a LowCardinality(String), b LowCardinality(String)) engine = MergeTree partition by a order by tuple() settings min_bytes_for_wide_part = 0, min_rows_for_wide_part = 0;
+
+insert into tab values ('1', 'a'), ('2', 'b');
+SELECT a = '1' FROM tab WHERE a = '1' and b='a';
+
+-- Fuzzed
+SELECT * FROM tab WHERE (a = '1') AND 0 AND (b = 'a');
+
+drop table if exists tab;
diff --git a/tests/queries/0_stateless/02003_compress_bz2.reference b/tests/queries/0_stateless/02003_compress_bz2.reference
new file mode 100644
index 00000000000..8ab686eafeb
--- /dev/null
+++ b/tests/queries/0_stateless/02003_compress_bz2.reference
@@ -0,0 +1 @@
+Hello, World!
diff --git a/tests/queries/0_stateless/02003_compress_bz2.sh b/tests/queries/0_stateless/02003_compress_bz2.sh
new file mode 100755
index 00000000000..afcea410297
--- /dev/null
+++ b/tests/queries/0_stateless/02003_compress_bz2.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on bzip2
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+WORKING_FOLDER_02003="${USER_FILES_PATH}/${CLICKHOUSE_DATABASE}"
+
+rm -rf "${WORKING_FOLDER_02003}"
+mkdir "${WORKING_FOLDER_02003}"
+
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World!' as String) INTO OUTFILE '${WORKING_FOLDER_02003}/bz2_compression.bz2'"
+bzip2 -t ${WORKING_FOLDER_02003}/bz2_compression.bz2
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM file('${WORKING_FOLDER_02003}/bz2_compression.bz2', 'TabSeparated', 'col String')"
+
+rm -rf "${WORKING_FOLDER_02003}"
diff --git a/tests/queries/0_stateless/02003_memory_limit_in_client.expect b/tests/queries/0_stateless/02003_memory_limit_in_client.expect
new file mode 100755
index 00000000000..47ac4926537
--- /dev/null
+++ b/tests/queries/0_stateless/02003_memory_limit_in_client.expect
@@ -0,0 +1,41 @@
+#!/usr/bin/expect -f
+# Tags: no-parallel, no-fasttest
+
+# This is a test for system.warnings. Testing in interactive mode is necessary,
+# as we want to see certain warnings from client
+
+log_user 0
+set timeout 60
+match_max 100000
+
+# A default timeout action is to do nothing, change it to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion --max_memory_usage_in_client=1"
+expect ":) "
+
+send  -- "SELECT arrayMap(x -> range(x), range(number)) FROM numbers(1000)\r"
+expect "Code: 241"
+
+expect ":) "
+
+# Exit.
+send -- "\4"
+expect eof
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion --max_memory_usage_in_client=1"
+expect ":) "
+
+send  -- "SELECT * FROM (SELECT * FROM system.numbers LIMIT 600000) as num WHERE num.number=60000\r"
+expect "60000"
+expect ":) "
+
+# Exit.
+send -- "\4"
+expect eof
diff --git a/tests/queries/0_stateless/02003_memory_limit_in_client.reference b/tests/queries/0_stateless/02003_memory_limit_in_client.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02004_intersect_except_operators.reference b/tests/queries/0_stateless/02004_intersect_except_operators.reference
new file mode 100644
index 00000000000..85559496f2f
--- /dev/null
+++ b/tests/queries/0_stateless/02004_intersect_except_operators.reference
@@ -0,0 +1,136 @@
+-- { echo }
+select 1 intersect select 1;
+1
+select 2 intersect select 1;
+select 1 except select 1;
+select 2 except select 1;
+2
+select number from numbers(20) intersect select number from numbers(5, 5);
+5
+6
+7
+8
+9
+select number from numbers(10) except select number from numbers(5);
+5
+6
+7
+8
+9
+select number, number+10 from numbers(12) except select number+5, number+15 from numbers(10);
+0	10
+1	11
+2	12
+3	13
+4	14
+select 1 except select 2 intersect select 1;
+1
+select 1 except select 2 intersect select 2;
+1
+select 1 intersect select 1 except select 2;
+1
+select 1 intersect select 1 except select 1;
+select 1 intersect select 1 except select 2 intersect select 1 except select 3 intersect select 1;
+1
+select 1 intersect select 1 except select 2 intersect select 1 except select 3 intersect select 2;
+1
+select 1 intersect select 1 except select 2 intersect select 1 except select 3 intersect select 2 except select 1;
+select number from numbers(10) except select 5;
+0
+1
+2
+3
+4
+6
+7
+8
+9
+select number from numbers(100) intersect select number from numbers(20, 60) except select number from numbers(30, 20) except select number from numbers(60, 20);
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+select * from (select 1 intersect select 1);
+1
+with (select number from numbers(10) intersect select 5) as a select a * 10;
+50
+with (select 5 except select 1) as a select a except select 5;
+with (select number from numbers(10) intersect select 5) as a select a intersect select 1;
+with (select number from numbers(10) intersect select 5) as a select a except select 1;
+5
+select count() from (select number from numbers(10) except select 5);
+9
+select count() from (select number from numbers(1000000) intersect select number from numbers(200000, 600000));
+600000
+select count() from (select number from numbers(100) intersect select number from numbers(20, 60) except select number from numbers(30, 20) except select number from numbers(60, 20));
+20
+select count() from (select number from numbers(100) intersect select number from numbers(20, 60) except select number from numbers(30, 20) except select number from numbers(60, 20) union all select number from numbers(100, 10));
+30
+select count() from (select number from numbers(1000000) intersect select number from numbers(200000, 600000) except select number from numbers(300000, 200000) except select number from numbers(600000, 200000));
+200000
+select count() from (select 1 intersect select 1) limit 100;
+1
+select count() from (select 1 except select 2) limit 100;
+1
+with (select count() from (select 1 union distinct select 2 except select 1)) as max
+select count() from (select 1 union all select max) limit 100;
+2
+select 1 union all select 1 intersect select 1;
+1
+1
+select 1 union all select 1 intersect select 2;
+1
+select * from (select 1 union all select 2 union all select 3 union all select 4 except select 3 union all select 5) order by 1;
+1
+2
+4
+5
+select * from (select 1 union all select 2 union all select 3 union all select 4 intersect select 3 union all select 5) order by 1;
+1
+2
+3
+5
+select * from (select 1 union all select 2 union all select 3 union all select 4 intersect select 3 union all select 5 except select 1) order by 1;
+2
+3
+5
+select 1 intersect (select 1 except select 2);
+1
+select 1 union all select 2  except (select 2 except select 1 union all select 1) except select 4;
+select 1 intersect select count() from (select 1 except select 2 intersect select 2 union all select 1);
+explain syntax select 1 intersect select 1;
+SELECT 1
+INTERSECT
+SELECT 1
+explain syntax select 1 except select 1;
+SELECT 1
+EXCEPT
+SELECT 1
+explain syntax select 1 union all select 2  except (select 2 except select 1 union all select 1) except select 4;
+SELECT 1
+UNION ALL
+SELECT 2
+EXCEPT
+SELECT 2
+EXCEPT
+SELECT 1
+UNION ALL
+SELECT 1
+EXCEPT
+SELECT 4
diff --git a/tests/queries/0_stateless/02004_intersect_except_operators.sql b/tests/queries/0_stateless/02004_intersect_except_operators.sql
new file mode 100644
index 00000000000..b95051cba65
--- /dev/null
+++ b/tests/queries/0_stateless/02004_intersect_except_operators.sql
@@ -0,0 +1,50 @@
+-- { echo }
+select 1 intersect select 1;
+select 2 intersect select 1;
+select 1 except select 1;
+select 2 except select 1;
+
+select number from numbers(20) intersect select number from numbers(5, 5);
+select number from numbers(10) except select number from numbers(5);
+select number, number+10 from numbers(12) except select number+5, number+15 from numbers(10);
+
+select 1 except select 2 intersect select 1;
+select 1 except select 2 intersect select 2;
+select 1 intersect select 1 except select 2;
+select 1 intersect select 1 except select 1;
+select 1 intersect select 1 except select 2 intersect select 1 except select 3 intersect select 1;
+select 1 intersect select 1 except select 2 intersect select 1 except select 3 intersect select 2;
+select 1 intersect select 1 except select 2 intersect select 1 except select 3 intersect select 2 except select 1;
+
+select number from numbers(10) except select 5;
+select number from numbers(100) intersect select number from numbers(20, 60) except select number from numbers(30, 20) except select number from numbers(60, 20);
+
+select * from (select 1 intersect select 1);
+with (select number from numbers(10) intersect select 5) as a select a * 10;
+with (select 5 except select 1) as a select a except select 5;
+with (select number from numbers(10) intersect select 5) as a select a intersect select 1;
+with (select number from numbers(10) intersect select 5) as a select a except select 1;
+select count() from (select number from numbers(10) except select 5);
+select count() from (select number from numbers(1000000) intersect select number from numbers(200000, 600000));
+select count() from (select number from numbers(100) intersect select number from numbers(20, 60) except select number from numbers(30, 20) except select number from numbers(60, 20));
+select count() from (select number from numbers(100) intersect select number from numbers(20, 60) except select number from numbers(30, 20) except select number from numbers(60, 20) union all select number from numbers(100, 10));
+select count() from (select number from numbers(1000000) intersect select number from numbers(200000, 600000) except select number from numbers(300000, 200000) except select number from numbers(600000, 200000));
+
+select count() from (select 1 intersect select 1) limit 100;
+select count() from (select 1 except select 2) limit 100;
+with (select count() from (select 1 union distinct select 2 except select 1)) as max
+select count() from (select 1 union all select max) limit 100;
+
+select 1 union all select 1 intersect select 1;
+select 1 union all select 1 intersect select 2;
+select * from (select 1 union all select 2 union all select 3 union all select 4 except select 3 union all select 5) order by 1;
+select * from (select 1 union all select 2 union all select 3 union all select 4 intersect select 3 union all select 5) order by 1;
+select * from (select 1 union all select 2 union all select 3 union all select 4 intersect select 3 union all select 5 except select 1) order by 1;
+
+select 1 intersect (select 1 except select 2);
+select 1 union all select 2  except (select 2 except select 1 union all select 1) except select 4;
+select 1 intersect select count() from (select 1 except select 2 intersect select 2 union all select 1);
+
+explain syntax select 1 intersect select 1;
+explain syntax select 1 except select 1;
+explain syntax select 1 union all select 2  except (select 2 except select 1 union all select 1) except select 4;
diff --git a/tests/queries/0_stateless/02004_invalid_partition_mutation_stuck.reference b/tests/queries/0_stateless/02004_invalid_partition_mutation_stuck.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02004_invalid_partition_mutation_stuck.sql b/tests/queries/0_stateless/02004_invalid_partition_mutation_stuck.sql
new file mode 100644
index 00000000000..481a5565095
--- /dev/null
+++ b/tests/queries/0_stateless/02004_invalid_partition_mutation_stuck.sql
@@ -0,0 +1,33 @@
+SET mutations_sync=2;
+
+DROP TABLE IF EXISTS rep_data;
+CREATE TABLE rep_data
+(
+    p Int,
+    t DateTime,
+    INDEX idx t TYPE minmax GRANULARITY 1
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/rep_data', '1')
+PARTITION BY p
+ORDER BY t
+SETTINGS number_of_free_entries_in_pool_to_execute_mutation=0;
+INSERT INTO rep_data VALUES (1, now());
+ALTER TABLE rep_data MATERIALIZE INDEX idx IN PARTITION ID 'NO_SUCH_PART'; -- { serverError 248 }
+ALTER TABLE rep_data MATERIALIZE INDEX idx IN PARTITION ID '1';
+ALTER TABLE rep_data MATERIALIZE INDEX idx IN PARTITION ID '2';
+
+DROP TABLE IF EXISTS data;
+CREATE TABLE data
+(
+    p Int,
+    t DateTime,
+    INDEX idx t TYPE minmax GRANULARITY 1
+)
+ENGINE = MergeTree
+PARTITION BY p
+ORDER BY t
+SETTINGS number_of_free_entries_in_pool_to_execute_mutation=0;
+INSERT INTO data VALUES (1, now());
+ALTER TABLE data MATERIALIZE INDEX idx IN PARTITION ID 'NO_SUCH_PART'; -- { serverError 341 }
+ALTER TABLE data MATERIALIZE INDEX idx IN PARTITION ID '1';
+ALTER TABLE data MATERIALIZE INDEX idx IN PARTITION ID '2';
diff --git a/tests/queries/0_stateless/02004_max_hyperscan_regex_length.reference b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.reference
new file mode 100644
index 00000000000..87e68c152c3
--- /dev/null
+++ b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.reference
@@ -0,0 +1,6 @@
+1
+1
+[1]
+1
+1
+[1]
diff --git a/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
new file mode 100644
index 00000000000..9d62093a702
--- /dev/null
+++ b/tests/queries/0_stateless/02004_max_hyperscan_regex_length.sql
@@ -0,0 +1,29 @@
+-- Tags: no-debug, no-fasttest
+-- Tag no-fasttest: Hyperscan
+
+set max_hyperscan_regexp_length = 1;
+set max_hyperscan_regexp_total_length = 1;
+
+select multiMatchAny('123', ['1']);
+select multiMatchAny('123', ['12']); -- { serverError 36 }
+select multiMatchAny('123', ['1', '2']); -- { serverError 36 }
+
+select multiMatchAnyIndex('123', ['1']);
+select multiMatchAnyIndex('123', ['12']); -- { serverError 36 }
+select multiMatchAnyIndex('123', ['1', '2']); -- { serverError 36 }
+
+select multiMatchAllIndices('123', ['1']);
+select multiMatchAllIndices('123', ['12']); -- { serverError 36 }
+select multiMatchAllIndices('123', ['1', '2']); -- { serverError 36 }
+
+select multiFuzzyMatchAny('123', 0, ['1']);
+select multiFuzzyMatchAny('123', 0, ['12']); -- { serverError 36 }
+select multiFuzzyMatchAny('123', 0, ['1', '2']); -- { serverError 36 }
+
+select multiFuzzyMatchAnyIndex('123', 0, ['1']);
+select multiFuzzyMatchAnyIndex('123', 0, ['12']); -- { serverError 36 }
+select multiFuzzyMatchAnyIndex('123', 0, ['1', '2']); -- { serverError 36 }
+
+select multiFuzzyMatchAllIndices('123', 0, ['1']);
+select multiFuzzyMatchAllIndices('123', 0, ['12']); -- { serverError 36 }
+select multiFuzzyMatchAllIndices('123', 0, ['1', '2']); -- { serverError 36 }
diff --git a/tests/queries/0_stateless/02005_log_formatted_queries.reference b/tests/queries/0_stateless/02005_log_formatted_queries.reference
new file mode 100644
index 00000000000..3ddd8b0d64f
--- /dev/null
+++ b/tests/queries/0_stateless/02005_log_formatted_queries.reference
@@ -0,0 +1,3 @@
+02005_log_formatted_queries.sql
+select \'02005_log_formatted_queries.sql\' from system.one;	SELECT \'02005_log_formatted_queries.sql\' FROM system.one
+select \'02005_log_formatted_queries.sql\' from system.one;	SELECT \'02005_log_formatted_queries.sql\' FROM system.one
diff --git a/tests/queries/0_stateless/02005_log_formatted_queries.sql b/tests/queries/0_stateless/02005_log_formatted_queries.sql
new file mode 100644
index 00000000000..62f839af0f0
--- /dev/null
+++ b/tests/queries/0_stateless/02005_log_formatted_queries.sql
@@ -0,0 +1,5 @@
+set log_formatted_queries = 1;
+
+select '02005_log_formatted_queries.sql' from system.one;
+system flush logs;
+select query, formatted_query from system.query_log where current_database = currentDatabase() and query = 'select \'02005_log_formatted_queries.sql\' from system.one;' and event_date >= yesterday() and event_time > now() - interval 5 minute;
diff --git a/tests/queries/0_stateless/02006_client_test_hint_error_name.reference b/tests/queries/0_stateless/02006_client_test_hint_error_name.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02006_client_test_hint_error_name.sql b/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
new file mode 100644
index 00000000000..60d840fb4ec
--- /dev/null
+++ b/tests/queries/0_stateless/02006_client_test_hint_error_name.sql
@@ -0,0 +1,3 @@
+-- Tags: no-fasttest
+
+select throwIf(1); -- { serverError FUNCTION_THROW_IF_VALUE_IS_NON_ZERO }
diff --git a/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.reference b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.reference
new file mode 100644
index 00000000000..40bea919c93
--- /dev/null
+++ b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.reference
@@ -0,0 +1 @@
+No error code with name: 'FOOBAR'. (NO_SUCH_ERROR_CODE)
diff --git a/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
new file mode 100755
index 00000000000..b846136ae58
--- /dev/null
+++ b/tests/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --testmode -n -q 'select 1 -- { clientError FOOBAR }' |& grep -o 'No error code with name:.*'
diff --git a/tests/queries/0_stateless/02006_h3_to_geo_boundary.reference b/tests/queries/0_stateless/02006_h3_to_geo_boundary.reference
new file mode 100644
index 00000000000..0d54f3895bd
--- /dev/null
+++ b/tests/queries/0_stateless/02006_h3_to_geo_boundary.reference
@@ -0,0 +1,16 @@
+[(-25.60370257696877,-170.61932339479839),(-16.505947603561054,-161.6348206171839),(-5.762860491436932,-165.41674992858833),(-3.968796976609588,-176.05696384421356),(-11.54529597541476,175.98600155652952),(-22.19754138630238,177.51613498805204)]
+[(57.15637211465772,51.15131422930827),(53.74532256646542,56.28611799875301),(54.25756495131088,64.15861768734945),(58.31910366055611,68.25632325438265),(62.114389785017146,63.44462184184533),(61.440920615681854,53.98254701603947)]
+[(-82.24829137508873,167.18203088800593),(-83.41761096812805,158.00531624510785),(-84.94207431820979,162.09183616506846),(-85.00324300064887,-178.60454506450245),(-83.46691212211444,-172.41232929697492),(-82.25118471750908,179.4928586395771)]
+[(-69.70201806837188,-95.63006768303532),(-69.78121889088241,-93.8329499937899),(-69.26603652285242,-92.70414199751751),(-68.6908704290193,-93.35479180342097),(-68.62037380778602,-95.0614247833063),(-69.11663254992226,-96.20491957306085)]
+[(-55.64960804791368,-8.350548718066527),(-55.828830219010115,-8.612333853721543),(-56.03525612929049,-8.450494689408638),(-56.06193617137633,-8.024722968315496),(-55.88205068143165,-7.7639036247878686),(-55.67615021200244,-7.927868022867216)]
+[(47.4047230189944,77.11372810022105),(47.31523866865899,77.16981222471887),(47.30324229614998,77.31177114774472),(47.380675190840634,77.39807294060385),(47.47025252565847,77.34232219743376),(47.482304118992815,77.19993524307596)]
+[(36.59082706214739,135.1447773494689),(36.623412749699106,135.14466572237862),(36.640360586702336,135.11335418763244),(36.62472012921161,135.0821822076476),(36.592149268586866,135.08232217250773),(36.575204036900494,135.1136057921021)]
+[(49.072491410488254,39.26829772479248),(49.06434071502539,39.28264806614126),(49.068946849412825,39.29969935764574),(49.08170687750978,39.30240475320644),(49.08985976852211,39.288050003564216),(49.0852504352169,39.27099426655672)]
+[(-27.484668731117956,124.71456214331452),(-27.480255804296018,124.7164671069391),(-27.476759420067374,124.71353974495929),(-27.477675754654342,124.70870779388683),(-27.48208829554146,124.706802674375),(-27.485584887763263,124.70972966178107)]
+[(76.73422062536704,-147.4905412849195),(76.73289074232657,-147.4965026703208),(76.73104961876471,-147.49472931389167),(76.730538300536,-147.48699643238956),(76.73186795003895,-147.4810352654388),(76.73370915128375,-147.4828067613433)]
+[(-25.52488377871919,86.63224601066914),(-25.525614626072162,86.63222807640663),(-25.525993697439322,86.63290113101664),(-25.5256419200276,86.6335921124905),(-25.524911076278325,86.63361003835355),(-25.524532006337036,86.63293699114213)]
+[(13.126242531761285,23.27727960465014),(13.125977729043674,23.277268554217677),(13.125836559860176,23.277506856149834),(13.125960192636454,23.27775620899515),(13.12622499528112,23.27776726055665),(13.126366165222441,23.277528958143787)]
+[(-63.12570930185924,-70.40176049055108),(-63.12571366261393,-70.4015366058905),(-63.1256297288591,-70.40140848801948),(-63.125541434726955,-70.4015042543287),(-63.125537074078174,-70.40172813751032),(-63.125621007455614,-70.40185625586165)]
+[(40.28583119436284,15.642383240826787),(40.2857926151193,15.642384471654026),(40.28577492591182,15.642429586343791),(40.28579581594201,15.642473470233714),(40.2858343951909,15.642472239444253),(40.28585208440421,15.642427124727082)]
+[(54.55605961596273,-76.53410754061841),(54.556055751776405,-76.53413299495058),(54.5560411051761,-76.53413993412053),(54.55603032276505,-76.53412141897394),(54.55603418694863,-76.53409596465765),(54.556048833546,-76.53408902547206)]
+[(67.69370622234305,8.199070817163335),(67.69370970389446,8.199075597443361),(67.69371314705361,8.199068130094206),(67.69371310866035,8.199055882463448),(67.69370962710823,8.19905110218645),(67.69370618395016,8.199058569537081)]
diff --git a/tests/queries/0_stateless/02006_h3_to_geo_boundary.sql b/tests/queries/0_stateless/02006_h3_to_geo_boundary.sql
new file mode 100644
index 00000000000..1019cd45c0b
--- /dev/null
+++ b/tests/queries/0_stateless/02006_h3_to_geo_boundary.sql
@@ -0,0 +1,28 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- Coordinates from h3ToGeo test.
+
+INSERT INTO h3_indexes VALUES (579205133326352383);
+INSERT INTO h3_indexes VALUES (581263419093549055);
+INSERT INTO h3_indexes VALUES (589753847883235327);
+INSERT INTO h3_indexes VALUES (594082350283882495);
+INSERT INTO h3_indexes VALUES (598372386957426687);
+INSERT INTO h3_indexes VALUES (599542359671177215);
+INSERT INTO h3_indexes VALUES (604296355086598143);
+INSERT INTO h3_indexes VALUES (608785214872748031);
+INSERT INTO h3_indexes VALUES (615732192485572607);
+INSERT INTO h3_indexes VALUES (617056794467368959);
+INSERT INTO h3_indexes VALUES (624586477873168383);
+INSERT INTO h3_indexes VALUES (627882919484481535);
+INSERT INTO h3_indexes VALUES (634600058503392255);
+INSERT INTO h3_indexes VALUES (635544851677385791);
+INSERT INTO h3_indexes VALUES (639763125756281263);
+INSERT INTO h3_indexes VALUES (644178757620501158);
+
+SELECT h3ToGeoBoundary(h3_index) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.reference b/tests/queries/0_stateless/02006_test_positional_arguments.reference
new file mode 100644
index 00000000000..27936137a1b
--- /dev/null
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.reference
@@ -0,0 +1,147 @@
+-- { echo }
+select x3, x2, x1 from test order by 1;
+1	100	100
+10	1	10
+100	10	1
+select x3, x2, x1 from test order by x3;
+1	100	100
+10	1	10
+100	10	1
+select x3, x2, x1 from test order by 1 desc;
+100	10	1
+10	1	10
+1	100	100
+select x3, x2, x1 from test order by x3 desc;
+100	10	1
+10	1	10
+1	100	100
+insert into test values (1, 10, 200), (10, 1, 200), (100, 100, 1);
+select x3, x2 from test group by x3, x2;
+200	1
+10	1
+200	10
+1	100
+100	10
+select x3, x2 from test group by 1, 2;
+200	1
+10	1
+200	10
+1	100
+100	10
+select x1, x2, x3 from test order by x3 limit 1 by x3;
+100	100	1
+10	1	10
+1	10	100
+1	10	200
+select x1, x2, x3 from test order by 3 limit 1 by 3;
+100	100	1
+10	1	10
+1	10	100
+1	10	200
+select x1, x2, x3 from test order by x3 limit 1 by x1;
+100	100	1
+10	1	10
+1	10	100
+select x1, x2, x3 from test order by 3 limit 1 by 1;
+100	100	1
+10	1	10
+1	10	100
+explain syntax select x3, x2, x1 from test order by 1 + 1;
+SELECT
+    x3,
+    x2,
+    x1
+FROM test
+ORDER BY x3 + x3 ASC
+explain syntax select x3, x2, x1 from test order by (1 + 1) * 3;
+SELECT
+    x3,
+    x2,
+    x1
+FROM test
+ORDER BY (x3 + x3) * x1 ASC
+select x2, x1 from test group by x2 + x1; -- { serverError 215 }
+select x2, x1 from test group by 1 + 2; -- { serverError 215 }
+explain syntax select x3, x2, x1 from test order by 1;
+SELECT
+    x3,
+    x2,
+    x1
+FROM test
+ORDER BY x3 ASC
+explain syntax select x3 + 1, x2, x1 from test order by 1;
+SELECT
+    x3 + 1,
+    x2,
+    x1
+FROM test
+ORDER BY x3 + 1 ASC
+explain syntax select x3, x3 - x2, x2, x1 from test order by 2;
+SELECT
+    x3,
+    x3 - x2,
+    x2,
+    x1
+FROM test
+ORDER BY x3 - x2 ASC
+explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order by 2;
+SELECT
+    x3,
+    if(x3 > 10, x3, x1 + x2),
+    x1 + x2
+FROM test
+ORDER BY if(x3 > 10, x3, x1 + x2) ASC
+explain syntax select max(x1), x2 from test group by 2 order by 1, 2;
+SELECT
+    max(x1),
+    x2
+FROM test
+GROUP BY x2
+ORDER BY
+    max(x1) ASC,
+    x2 ASC
+explain syntax select 1 + greatest(x1, 1), x2 from test group by 1, 2;
+SELECT
+    1 + greatest(x1, 1),
+    x2
+FROM test
+GROUP BY
+    1 + greatest(x1, 1),
+    x2
+select max(x1), x2 from test group by 1, 2; -- { serverError 43 }
+select 1 + max(x1), x2 from test group by 1, 2; -- { serverError 43 }
+select x1 + x2, x3 from test group by x1 + x2, x3;
+11	100
+200	1
+11	200
+11	10
+select x3, x2, x1 from test order by x3 * 2, x2, x1; -- check x3 * 2 does not become x3 * x2
+1	100	100
+1	100	100
+10	1	10
+100	10	1
+200	1	10
+200	10	1
+explain syntax select x1, x3 from test group by 1 + 2, 1, 2;
+SELECT
+    x1,
+    x3
+FROM test
+GROUP BY
+    x1 + x3,
+    x1,
+    x3
+explain syntax select x1 + x3, x3 from test group by 1, 2;
+SELECT
+    x1 + x3,
+    x3
+FROM test
+GROUP BY
+    x1 + x3,
+    x3
+create table test2(x1 Int, x2 Int, x3 Int) engine=Memory;
+insert into test2 values (1, 10, 100), (10, 1, 10), (100, 100, 1);
+select x1, x1 * 2, max(x2), max(x3) from test2 group by 2, 1, x1 order by 1, 2, 4 desc, 3 asc;
+1	2	10	100
+10	20	1	10
+100	200	100	1
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.sql b/tests/queries/0_stateless/02006_test_positional_arguments.sql
new file mode 100644
index 00000000000..4b6affc290a
--- /dev/null
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.sql
@@ -0,0 +1,49 @@
+set enable_positional_arguments = 1;
+
+drop table if exists test;
+drop table if exists test2;
+
+create table test(x1 Int, x2 Int, x3 Int) engine=Memory();
+insert into test values (1, 10, 100), (10, 1, 10), (100, 100, 1);
+
+-- { echo }
+select x3, x2, x1 from test order by 1;
+select x3, x2, x1 from test order by x3;
+
+select x3, x2, x1 from test order by 1 desc;
+select x3, x2, x1 from test order by x3 desc;
+
+insert into test values (1, 10, 200), (10, 1, 200), (100, 100, 1);
+select x3, x2 from test group by x3, x2;
+select x3, x2 from test group by 1, 2;
+
+select x1, x2, x3 from test order by x3 limit 1 by x3;
+select x1, x2, x3 from test order by 3 limit 1 by 3;
+select x1, x2, x3 from test order by x3 limit 1 by x1;
+select x1, x2, x3 from test order by 3 limit 1 by 1;
+
+explain syntax select x3, x2, x1 from test order by 1 + 1;
+explain syntax select x3, x2, x1 from test order by (1 + 1) * 3;
+
+select x2, x1 from test group by x2 + x1; -- { serverError 215 }
+select x2, x1 from test group by 1 + 2; -- { serverError 215 }
+
+explain syntax select x3, x2, x1 from test order by 1;
+explain syntax select x3 + 1, x2, x1 from test order by 1;
+explain syntax select x3, x3 - x2, x2, x1 from test order by 2;
+explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order by 2;
+explain syntax select max(x1), x2 from test group by 2 order by 1, 2;
+explain syntax select 1 + greatest(x1, 1), x2 from test group by 1, 2;
+
+select max(x1), x2 from test group by 1, 2; -- { serverError 43 }
+select 1 + max(x1), x2 from test group by 1, 2; -- { serverError 43 }
+select x1 + x2, x3 from test group by x1 + x2, x3;
+
+select x3, x2, x1 from test order by x3 * 2, x2, x1; -- check x3 * 2 does not become x3 * x2
+
+explain syntax select x1, x3 from test group by 1 + 2, 1, 2;
+explain syntax select x1 + x3, x3 from test group by 1, 2;
+
+create table test2(x1 Int, x2 Int, x3 Int) engine=Memory;
+insert into test2 values (1, 10, 100), (10, 1, 10), (100, 100, 1);
+select x1, x1 * 2, max(x2), max(x3) from test2 group by 2, 1, x1 order by 1, 2, 4 desc, 3 asc;
diff --git a/tests/queries/0_stateless/02006_todatetime64_from_string.reference b/tests/queries/0_stateless/02006_todatetime64_from_string.reference
new file mode 100644
index 00000000000..e95351fe815
--- /dev/null
+++ b/tests/queries/0_stateless/02006_todatetime64_from_string.reference
@@ -0,0 +1 @@
+2021-03-21 23:00:00.000
diff --git a/tests/queries/0_stateless/02006_todatetime64_from_string.sql b/tests/queries/0_stateless/02006_todatetime64_from_string.sql
new file mode 100644
index 00000000000..305dd49f70e
--- /dev/null
+++ b/tests/queries/0_stateless/02006_todatetime64_from_string.sql
@@ -0,0 +1 @@
+SELECT toDateTime64('2021-03-22', 3, 'Asia/Tehran');
diff --git a/tests/queries/0_stateless/02006_use_constants_in_with_and_select.reference b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.reference
new file mode 100644
index 00000000000..bbf008ffdf2
--- /dev/null
+++ b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.reference
@@ -0,0 +1,5 @@
+1	[1]
+[1]
+99.9
+0.1	99.9
+[99.9]
diff --git a/tests/queries/0_stateless/02006_use_constants_in_with_and_select.sql b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.sql
new file mode 100644
index 00000000000..91171c9ab7b
--- /dev/null
+++ b/tests/queries/0_stateless/02006_use_constants_in_with_and_select.sql
@@ -0,0 +1,36 @@
+SELECT
+    1 AS max_size,
+    groupArray(max_size)(col)
+FROM
+    (
+        SELECT 1 AS col
+        UNION ALL
+        SELECT 2
+    );
+
+WITH 1 AS max_size
+SELECT groupArray(max_size)(col)
+FROM
+     (
+         SELECT 1 as col
+         UNION ALL
+         SELECT 2
+     );
+
+WITH 0.1 AS level
+SELECT quantile(level)(number)
+FROM numbers(1000);
+
+SELECT 0.1 AS level, quantile(level)(number)
+FROM numbers(1000);
+
+WITH
+    0.1 AS level,
+    1 AS max_size
+SELECT groupArray(max_size)(col)
+FROM
+    (
+        SELECT quantile(level)(number) AS col
+        FROM numbers(1000)
+    );
+
diff --git a/tests/queries/0_stateless/02007_join_use_nulls.reference b/tests/queries/0_stateless/02007_join_use_nulls.reference
new file mode 100644
index 00000000000..30ee87bf91d
--- /dev/null
+++ b/tests/queries/0_stateless/02007_join_use_nulls.reference
@@ -0,0 +1,8 @@
+1	2	3	1	3
+1	UInt8	2	UInt8	3	Nullable(UInt8)
+1	LowCardinality(UInt8)	2	LowCardinality(UInt8)	3	LowCardinality(Nullable(UInt8))
+1	LowCardinality(UInt8)	2	LowCardinality(UInt8)	1	LowCardinality(Nullable(UInt8))
+1	UInt8	2	UInt8	3	Nullable(UInt8)
+1	UInt8	2	UInt8	1	Nullable(UInt8)	3	Nullable(UInt8)
+1	LowCardinality(UInt8)	2	LowCardinality(UInt8)	3	LowCardinality(Nullable(UInt8))
+1	LowCardinality(UInt8)	2	LowCardinality(UInt8)	1	LowCardinality(Nullable(UInt8))	3	LowCardinality(Nullable(UInt8))
diff --git a/tests/queries/0_stateless/02007_join_use_nulls.sql b/tests/queries/0_stateless/02007_join_use_nulls.sql
new file mode 100644
index 00000000000..e08fffce3b7
--- /dev/null
+++ b/tests/queries/0_stateless/02007_join_use_nulls.sql
@@ -0,0 +1,11 @@
+SET join_use_nulls = 1;
+
+SELECT *, d.* FROM ( SELECT 1 AS id, 2 AS value ) a SEMI LEFT JOIN ( SELECT 1 AS id, 3 AS values ) AS d USING id;
+
+SELECT id, toTypeName(id), value, toTypeName(value), d.values, toTypeName(d.values) FROM ( SELECT 1 AS id, 2 AS value ) a SEMI LEFT JOIN ( SELECT 1 AS id, 3 AS values ) AS d USING id;
+SELECT id, toTypeName(id), value, toTypeName(value), d.values, toTypeName(d.values) FROM ( SELECT toLowCardinality(1) AS id, toLowCardinality(2) AS value ) a SEMI LEFT JOIN ( SELECT toLowCardinality(1) AS id, toLowCardinality(3) AS values ) AS d USING id;
+SELECT id, toTypeName(id), value, toTypeName(value), d.id, toTypeName(d.id) FROM ( SELECT toLowCardinality(1) AS id, toLowCardinality(2) AS value ) a SEMI LEFT JOIN ( SELECT toLowCardinality(1) AS id, toLowCardinality(3) AS values ) AS d USING id;
+SELECT id, toTypeName(id), value, toTypeName(value), d.values, toTypeName(d.values) FROM ( SELECT 1 AS id, 2 AS value ) a SEMI LEFT JOIN ( SELECT 1 AS id, 3 AS values ) AS d USING id;
+SELECT id, toTypeName(id), value, toTypeName(value), d.id, toTypeName(d.id) , d.values, toTypeName(d.values) FROM ( SELECT 1 AS id, 2 AS value ) a SEMI LEFT JOIN ( SELECT 1 AS id, 3 AS values ) AS d USING id;
+SELECT id, toTypeName(id), value, toTypeName(value), d.values, toTypeName(d.values) FROM ( SELECT toLowCardinality(1) AS id, toLowCardinality(2) AS value ) a SEMI LEFT JOIN ( SELECT toLowCardinality(1) AS id, toLowCardinality(3) AS values ) AS d USING id;
+SELECT id, toTypeName(id), value, toTypeName(value), d.id, toTypeName(d.id) , d.values, toTypeName(d.values) FROM ( SELECT toLowCardinality(1) AS id, toLowCardinality(2) AS value ) a SEMI LEFT JOIN ( SELECT toLowCardinality(1) AS id, toLowCardinality(3) AS values ) AS d USING id;
diff --git a/tests/queries/0_stateless/02007_test_any_all_operators.reference b/tests/queries/0_stateless/02007_test_any_all_operators.reference
new file mode 100644
index 00000000000..a232320d15c
--- /dev/null
+++ b/tests/queries/0_stateless/02007_test_any_all_operators.reference
@@ -0,0 +1,51 @@
+-- { echo }
+select 1 == any (select number from numbers(10));
+1
+select 1 == any (select number from numbers(2, 10));
+0
+select 1 != all (select 1 from numbers(10));
+0
+select 1 != all (select number from numbers(10));
+0
+select 1 == all (select 1 from numbers(10));
+1
+select 1 == all (select number from numbers(10));
+0
+select 1 != any (select 1 from numbers(10));
+0
+select 1 != any (select number from numbers(10));
+1
+select number as a from numbers(10) where a == any (select number from numbers(3, 3));
+3
+4
+5
+select number as a from numbers(10) where a != any (select 5 from numbers(3, 3));
+0
+1
+2
+3
+4
+6
+7
+8
+9
+select 1 < any (select 1 from numbers(10));
+0
+select 1 <= any (select 1 from numbers(10));
+1
+select 1 < any (select number from numbers(10));
+1
+select 1 > any (select number from numbers(10));
+1
+select 1 >= any (select number from numbers(10));
+1
+select 11 > all (select number from numbers(10));
+1
+select 11 <= all (select number from numbers(11));
+0
+select 11 < all (select 11 from numbers(10));
+0
+select 11 > all (select 11 from numbers(10));
+0
+select 11 >= all (select 11 from numbers(10));
+1
diff --git a/tests/queries/0_stateless/02007_test_any_all_operators.sql b/tests/queries/0_stateless/02007_test_any_all_operators.sql
new file mode 100644
index 00000000000..10d7325afca
--- /dev/null
+++ b/tests/queries/0_stateless/02007_test_any_all_operators.sql
@@ -0,0 +1,26 @@
+-- { echo }
+select 1 == any (select number from numbers(10));
+select 1 == any (select number from numbers(2, 10));
+
+select 1 != all (select 1 from numbers(10));
+select 1 != all (select number from numbers(10));
+
+select 1 == all (select 1 from numbers(10));
+select 1 == all (select number from numbers(10));
+
+select 1 != any (select 1 from numbers(10));
+select 1 != any (select number from numbers(10));
+
+select number as a from numbers(10) where a == any (select number from numbers(3, 3));
+select number as a from numbers(10) where a != any (select 5 from numbers(3, 3));
+
+select 1 < any (select 1 from numbers(10));
+select 1 <= any (select 1 from numbers(10));
+select 1 < any (select number from numbers(10));
+select 1 > any (select number from numbers(10));
+select 1 >= any (select number from numbers(10));
+select 11 > all (select number from numbers(10));
+select 11 <= all (select number from numbers(11));
+select 11 < all (select 11 from numbers(10));
+select 11 > all (select 11 from numbers(10));
+select 11 >= all (select 11 from numbers(10));
diff --git a/tests/queries/0_stateless/02008_aliased_column_distributed_bug.reference b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.reference
new file mode 100644
index 00000000000..406c915e7d7
--- /dev/null
+++ b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.reference
@@ -0,0 +1,20 @@
+0
+0
+0
+0
+0
+0
+6
+7
+8
+9
+0
+0
+0
+0
+0
+0
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
new file mode 100644
index 00000000000..9796beefd6d
--- /dev/null
+++ b/tests/queries/0_stateless/02008_aliased_column_distributed_bug.sql
@@ -0,0 +1,18 @@
+-- Tags: distributed
+
+DROP TABLE IF EXISTS click_storage;
+DROP TABLE IF EXISTS click_storage_dst;
+
+CREATE TABLE click_storage ( `PhraseID` UInt64, `PhraseProcessedID` UInt64 ALIAS if(PhraseID > 5, PhraseID, 0) ) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO click_storage SELECT number AS PhraseID from numbers(10);
+
+CREATE TABLE click_storage_dst ( `PhraseID` UInt64, `PhraseProcessedID` UInt64 ) ENGINE = Distributed(test_shard_localhost, currentDatabase(), 'click_storage');
+
+SET prefer_localhost_replica = 1;
+SELECT materialize(PhraseProcessedID)　FROM click_storage_dst;
+
+SET prefer_localhost_replica = 0;
+SELECT materialize(PhraseProcessedID)　FROM click_storage_dst;
+
+DROP TABLE IF EXISTS click_storage;
+DROP TABLE IF EXISTS click_storage_dst;
diff --git a/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.reference b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.reference
new file mode 100644
index 00000000000..41a12f88906
--- /dev/null
+++ b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.reference
@@ -0,0 +1,58 @@
+Dictionary not nullable
+dictGet
+0.33
+0.42
+0.46
+0.2
+0.4
+dictHas
+1
+1
+1
+0
+select columns from dictionary
+allColumns
+2019-05-05	2019-05-20	1	1	0.33
+2019-05-21	2019-05-30	1	1	0.42
+2019-05-21	2019-05-30	2	2	0.46
+noColumns
+1
+1
+1
+onlySpecificColumns
+1	2019-05-05	0.33
+1	2019-05-21	0.42
+2	2019-05-21	0.46
+onlySpecificColumn
+0.33
+0.42
+0.46
+Dictionary nullable
+dictGet
+0.33
+0.42
+\N
+0.2
+0.4
+dictHas
+1
+1
+1
+0
+select columns from dictionary
+allColumns
+2019-05-05	2019-05-20	1	1	0.33
+2019-05-21	2019-05-30	1	1	0.42
+2019-05-21	2019-05-30	2	2	\N
+noColumns
+1
+1
+1
+onlySpecificColumns
+1	2019-05-05	0.33
+1	2019-05-21	0.42
+2	2019-05-21	\N
+onlySpecificColumn
+0.33
+0.42
+\N
diff --git a/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
new file mode 100644
index 00000000000..677879b1ebd
--- /dev/null
+++ b/tests/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
@@ -0,0 +1,111 @@
+-- Tags: no-parallel
+
+DROP TABLE IF EXISTS date_table;
+CREATE TABLE date_table
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64
+)
+ENGINE = MergeTree()
+ORDER BY CountryID;
+
+INSERT INTO date_table VALUES(1, '1', toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
+INSERT INTO date_table VALUES(1, '1', toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
+INSERT INTO date_table VALUES(2, '2', toDate('2019-05-21'), toDate('2019-05-30'), 0.46);
+
+DROP DICTIONARY IF EXISTS range_dictionary;
+CREATE DICTIONARY range_dictionary
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Float64 DEFAULT 0.2
+)
+PRIMARY KEY CountryID, CountryKey
+SOURCE(CLICKHOUSE(TABLE 'date_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+
+SELECT 'Dictionary not nullable';
+SELECT 'dictGet';
+SELECT dictGet('range_dictionary', 'Tax', (toUInt64(1), '1'), toDate('2019-05-15'));
+SELECT dictGet('range_dictionary', 'Tax', (toUInt64(1), '1'), toDate('2019-05-29'));
+SELECT dictGet('range_dictionary', 'Tax', (toUInt64(2), '2'), toDate('2019-05-29'));
+SELECT dictGet('range_dictionary', 'Tax', (toUInt64(2), '2'), toDate('2019-05-31'));
+SELECT dictGetOrDefault('range_dictionary', 'Tax', (toUInt64(2), '2'), toDate('2019-05-31'), 0.4);
+SELECT 'dictHas';
+SELECT dictHas('range_dictionary', (toUInt64(1), '1'), toDate('2019-05-15'));
+SELECT dictHas('range_dictionary', (toUInt64(1), '1'), toDate('2019-05-29'));
+SELECT dictHas('range_dictionary', (toUInt64(2), '2'), toDate('2019-05-29'));
+SELECT dictHas('range_dictionary', (toUInt64(2), '2'), toDate('2019-05-31'));
+SELECT 'select columns from dictionary';
+SELECT 'allColumns';
+SELECT * FROM range_dictionary;
+SELECT 'noColumns';
+SELECT 1 FROM range_dictionary;
+SELECT 'onlySpecificColumns';
+SELECT CountryID, StartDate, Tax FROM range_dictionary;
+SELECT 'onlySpecificColumn';
+SELECT Tax FROM range_dictionary;
+
+DROP TABLE date_table;
+DROP DICTIONARY range_dictionary;
+
+CREATE TABLE date_table
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Nullable(Float64)
+)
+ENGINE = MergeTree()
+ORDER BY CountryID;
+
+INSERT INTO date_table VALUES(1, '1', toDate('2019-05-05'), toDate('2019-05-20'), 0.33);
+INSERT INTO date_table VALUES(1, '1', toDate('2019-05-21'), toDate('2019-05-30'), 0.42);
+INSERT INTO date_table VALUES(2, '2', toDate('2019-05-21'), toDate('2019-05-30'), NULL);
+
+CREATE DICTIONARY range_dictionary_nullable
+(
+  CountryID UInt64,
+  CountryKey String,
+  StartDate Date,
+  EndDate Date,
+  Tax Nullable(Float64) DEFAULT 0.2
+)
+PRIMARY KEY CountryID, CountryKey
+SOURCE(CLICKHOUSE(TABLE 'date_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_RANGE_HASHED())
+RANGE(MIN StartDate MAX EndDate);
+
+SELECT 'Dictionary nullable';
+SELECT 'dictGet';
+SELECT dictGet('range_dictionary_nullable', 'Tax', (toUInt64(1), '1'), toDate('2019-05-15'));
+SELECT dictGet('range_dictionary_nullable', 'Tax', (toUInt64(1), '1'), toDate('2019-05-29'));
+SELECT dictGet('range_dictionary_nullable', 'Tax', (toUInt64(2), '2'), toDate('2019-05-29'));
+SELECT dictGet('range_dictionary_nullable', 'Tax', (toUInt64(2), '2'), toDate('2019-05-31'));
+SELECT dictGetOrDefault('range_dictionary_nullable', 'Tax', (toUInt64(2), '2'), toDate('2019-05-31'), 0.4);
+SELECT 'dictHas';
+SELECT dictHas('range_dictionary_nullable', (toUInt64(1), '1'), toDate('2019-05-15'));
+SELECT dictHas('range_dictionary_nullable', (toUInt64(1), '1'), toDate('2019-05-29'));
+SELECT dictHas('range_dictionary_nullable', (toUInt64(2), '2'), toDate('2019-05-29'));
+SELECT dictHas('range_dictionary_nullable', (toUInt64(2), '2'), toDate('2019-05-31'));
+SELECT 'select columns from dictionary';
+SELECT 'allColumns';
+SELECT * FROM range_dictionary_nullable;
+SELECT 'noColumns';
+SELECT 1 FROM range_dictionary_nullable;
+SELECT 'onlySpecificColumns';
+SELECT CountryID, StartDate, Tax FROM range_dictionary_nullable;
+SELECT 'onlySpecificColumn';
+SELECT Tax FROM range_dictionary_nullable;
+
+DROP TABLE date_table;
+DROP DICTIONARY range_dictionary_nullable;
diff --git a/tests/queries/0_stateless/02008_materialize_column.reference b/tests/queries/0_stateless/02008_materialize_column.reference
new file mode 100644
index 00000000000..f0bc01f9edd
--- /dev/null
+++ b/tests/queries/0_stateless/02008_materialize_column.reference
@@ -0,0 +1,8 @@
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['0','1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['0','1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20']
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]	['2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21']
diff --git a/tests/queries/0_stateless/02008_materialize_column.sql b/tests/queries/0_stateless/02008_materialize_column.sql
new file mode 100644
index 00000000000..4136a04568e
--- /dev/null
+++ b/tests/queries/0_stateless/02008_materialize_column.sql
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS tmp;
+
+SET mutations_sync = 2;
+
+CREATE TABLE tmp (x Int64) ENGINE = MergeTree() ORDER BY tuple() PARTITION BY tuple();
+INSERT INTO tmp SELECT * FROM system.numbers LIMIT 20;
+
+ALTER TABLE tmp ADD COLUMN s String DEFAULT toString(x);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+
+ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+1);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+
+ALTER TABLE tmp MATERIALIZE COLUMN s;
+ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+2);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+
+ALTER TABLE tmp MATERIALIZE COLUMN s;
+ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+3);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+ALTER TABLE tmp DROP COLUMN s;
+
+ALTER TABLE tmp ADD COLUMN s String MATERIALIZED toString(x);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+
+ALTER TABLE tmp MODIFY COLUMN s String MATERIALIZED toString(x+1);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+
+ALTER TABLE tmp MATERIALIZE COLUMN s;
+ALTER TABLE tmp MODIFY COLUMN s String MATERIALIZED toString(x+2);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+
+ALTER TABLE tmp MATERIALIZE COLUMN s;
+ALTER TABLE tmp MODIFY COLUMN s String MATERIALIZED toString(x+3);
+SELECT groupArray(x), groupArray(s) FROM tmp;
+ALTER TABLE tmp DROP COLUMN s;
+
+DROP TABLE tmp;
+
diff --git a/tests/queries/0_stateless/02008_test_union_distinct_in_subquery.reference b/tests/queries/0_stateless/02008_test_union_distinct_in_subquery.reference
new file mode 100644
index 00000000000..e4f1a68c87a
--- /dev/null
+++ b/tests/queries/0_stateless/02008_test_union_distinct_in_subquery.reference
@@ -0,0 +1,26 @@
+-- { echo }
+select count() from (select * from test union distinct select * from test);
+5
+select count() from (select * from test union distinct select * from test union all select * from test);
+10
+select count() from (select * from test union distinct select * from test except select * from test where name = '3');
+4
+select count() from (select * from test intersect (select * from test where toUInt8(name) < 4) union distinct (select * from test where name = '5' or name = '1') except select * from test where name = '3');
+3
+with (select count() from (select * from test union distinct select * from test except select * from test where toUInt8(name) > 3)) as max
+select count() from (select * from test union all select * from test where toUInt8(name) < max);
+7
+with (select count() from (select * from test union distinct select * from test except select * from test where toUInt8(name) > 3)) as max
+select count() from (select * from test except select * from test where toUInt8(name) < max);
+3
+select uuid from test union distinct select uuid from test;
+00000000-0000-0000-0000-000000000000
+select uuid from test union distinct select uuid from test union all select uuid from test where name = '1';
+00000000-0000-0000-0000-000000000000
+00000000-0000-0000-0000-000000000000
+select uuid from (select * from test union distinct select * from test);
+00000000-0000-0000-0000-000000000000
+00000000-0000-0000-0000-000000000000
+00000000-0000-0000-0000-000000000000
+00000000-0000-0000-0000-000000000000
+00000000-0000-0000-0000-000000000000
diff --git a/tests/queries/0_stateless/02008_test_union_distinct_in_subquery.sql b/tests/queries/0_stateless/02008_test_union_distinct_in_subquery.sql
new file mode 100644
index 00000000000..c5d270a4c8c
--- /dev/null
+++ b/tests/queries/0_stateless/02008_test_union_distinct_in_subquery.sql
@@ -0,0 +1,23 @@
+drop table if exists test;
+create table test (name String, uuid UUID) engine=Memory();
+insert into test select '1', '00000000-0000-0000-0000-000000000000';
+insert into test select '2', '00000000-0000-0000-0000-000000000000';
+insert into test select '3', '00000000-0000-0000-0000-000000000000';
+insert into test select '4', '00000000-0000-0000-0000-000000000000';
+insert into test select '5', '00000000-0000-0000-0000-000000000000';
+
+-- { echo }
+select count() from (select * from test union distinct select * from test);
+select count() from (select * from test union distinct select * from test union all select * from test);
+select count() from (select * from test union distinct select * from test except select * from test where name = '3');
+select count() from (select * from test intersect (select * from test where toUInt8(name) < 4) union distinct (select * from test where name = '5' or name = '1') except select * from test where name = '3');
+
+with (select count() from (select * from test union distinct select * from test except select * from test where toUInt8(name) > 3)) as max
+select count() from (select * from test union all select * from test where toUInt8(name) < max);
+with (select count() from (select * from test union distinct select * from test except select * from test where toUInt8(name) > 3)) as max
+select count() from (select * from test except select * from test where toUInt8(name) < max);
+
+select uuid from test union distinct select uuid from test;
+select uuid from test union distinct select uuid from test union all select uuid from test where name = '1';
+select uuid from (select * from test union distinct select * from test);
+
diff --git a/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.reference b/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.reference
new file mode 100644
index 00000000000..90d15b16dcd
--- /dev/null
+++ b/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.reference
@@ -0,0 +1,6 @@
+[('1',1),('2',2),('3',3)]
+[('a',(1,2)),('b',(3,4))]
+[('a',(5,6)),('b',(7,8))]
+CPU	3.3
+Memory	5.5
+Disk	6.6
diff --git a/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql b/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql
new file mode 100644
index 00000000000..9204975b579
--- /dev/null
+++ b/tests/queries/0_stateless/02008_tuple_to_name_value_pairs.sql
@@ -0,0 +1,25 @@
+SELECT tupleToNameValuePairs(tuple(1, 2, 3));
+
+DROP TABLE IF EXISTS test02008;
+CREATE TABLE test02008 (
+       col Tuple(
+           a Tuple(key1 int, key2 int),
+           b Tuple(key1 int, key3 int)
+       )
+) ENGINE=Memory();
+INSERT INTO test02008 VALUES (tuple(tuple(1, 2), tuple(3, 4)));
+INSERT INTO test02008 VALUES (tuple(tuple(5, 6), tuple(7, 8)));
+SELECT tupleToNameValuePairs(col) FROM test02008 ORDER BY col;
+
+DROP TABLE IF EXISTS test02008;
+CREATE TABLE test02008 (
+       col Tuple(CPU double, Memory double, Disk double)
+) ENGINE=Memory();
+INSERT INTO test02008 VALUES (tuple(3.3, 5.5, 6.6));
+SELECT untuple(arrayJoin(tupleToNameValuePairs(col))) from test02008;
+
+DROP TABLE IF EXISTS test02008;
+SELECT tupleToNameValuePairs(tuple(1, 1.3)); -- { serverError 43; }
+SELECT tupleToNameValuePairs(tuple(1, [1,2])); -- { serverError 43; }
+SELECT tupleToNameValuePairs(tuple(1, 'a')); -- { serverError 43; }
+SELECT tupleToNameValuePairs(33); -- { serverError 43; }
diff --git a/tests/queries/0_stateless/02009_array_join_partition.reference b/tests/queries/0_stateless/02009_array_join_partition.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02009_array_join_partition.sql b/tests/queries/0_stateless/02009_array_join_partition.sql
new file mode 100644
index 00000000000..a78efe96f66
--- /dev/null
+++ b/tests/queries/0_stateless/02009_array_join_partition.sql
@@ -0,0 +1,4 @@
+CREATE TABLE table_2009_part (`i` Int64, `d` Date, `s` String) ENGINE = MergeTree PARTITION BY toYYYYMM(d) ORDER BY i;
+
+ALTER TABLE table_2009_part ATTACH PARTITION tuple(arrayJoin([0, 1])); -- {serverError 248}
+ALTER TABLE table_2009_part ATTACH PARTITION tuple(toYYYYMM(toDate([arrayJoin([arrayJoin([arrayJoin([arrayJoin([3, materialize(NULL), arrayJoin([1025, materialize(NULL), materialize(NULL)]), NULL])])]), materialize(NULL)])], NULL))); -- {serverError 248}
diff --git a/tests/queries/0_stateless/02009_body_query_params.reference b/tests/queries/0_stateless/02009_body_query_params.reference
new file mode 100644
index 00000000000..f78e78ca220
--- /dev/null
+++ b/tests/queries/0_stateless/02009_body_query_params.reference
@@ -0,0 +1,3 @@
+1
+1
+1	2
diff --git a/tests/queries/0_stateless/02009_body_query_params.sh b/tests/queries/0_stateless/02009_body_query_params.sh
new file mode 100755
index 00000000000..494d208ee1a
--- /dev/null
+++ b/tests/queries/0_stateless/02009_body_query_params.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+curl -sS -F param_id=1 -X POST "${CLICKHOUSE_URL}&query=select%201%20as%20c%20where%20c%20%3D%20%7Bid%3AUInt8%7D";
+curl -sS -X GET "${CLICKHOUSE_URL}&query=select%201%20as%20c%20where%20c%20%3D%20%7Bid%3AUInt8%7D&param_id=1";
+curl -sS -F param_id=1 -X POST "${CLICKHOUSE_URL}&query=select%201%20as%20c%2C%202%20as%20c2%20where%20c%20%3D%20%7Bid%3AUInt8%7D%20and%20c2%20%3D%20%20%7Bid2%3AUInt8%7D&param_id2=2";
diff --git a/tests/queries/0_stateless/02009_decimal_no_trailing_zeros.reference b/tests/queries/0_stateless/02009_decimal_no_trailing_zeros.reference
new file mode 100644
index 00000000000..58f5180322a
--- /dev/null
+++ b/tests/queries/0_stateless/02009_decimal_no_trailing_zeros.reference
@@ -0,0 +1,63 @@
+-- { echo }
+
+SELECT 1.123::Decimal64(1);
+1.1
+SELECT 1.123::Decimal64(2);
+1.12
+SELECT 1.123::Decimal64(3);
+1.123
+SELECT 1.123::Decimal64(4);
+1.123
+SELECT 1.123::Decimal64(5);
+1.123
+SELECT 1.123::Decimal64(10);
+1.123
+SELECT 1::Decimal64(0);
+1
+SELECT 1::Decimal64(1);
+1
+SELECT 1::Decimal64(10);
+1
+SELECT 1.1234567::Decimal32(8);
+1.1234567
+SELECT 1.1234567890::Decimal64(10);
+1.123456789
+SELECT 1.1234567890::Decimal128(10);
+1.123456789
+SELECT 1.1234567890::Decimal256(10);
+1.123456789
+SELECT 1.123456789012345678901::Decimal256(20);
+1.1234567890123456789
+SELECT 1.123456789012345678901::Decimal256(22);
+1.123456789012345678901
+SET output_format_decimal_trailing_zeros = 1;
+SELECT 1.123::Decimal64(1);
+1.1
+SELECT 1.123::Decimal64(2);
+1.12
+SELECT 1.123::Decimal64(3);
+1.123
+SELECT 1.123::Decimal64(4);
+1.1230
+SELECT 1.123::Decimal64(5);
+1.12300
+SELECT 1.123::Decimal64(10);
+1.1230000000
+SELECT 1::Decimal64(0);
+1
+SELECT 1::Decimal64(1);
+1.0
+SELECT 1::Decimal64(10);
+1.0000000000
+SELECT 1.1234567::Decimal32(8);
+1.12345670
+SELECT 1.1234567890::Decimal64(10);
+1.1234567890
+SELECT 1.1234567890::Decimal128(10);
+1.1234567890
+SELECT 1.1234567890::Decimal256(10);
+1.1234567890
+SELECT 1.123456789012345678901::Decimal256(20);
+1.12345678901234567890
+SELECT 1.123456789012345678901::Decimal256(22);
+1.1234567890123456789010
diff --git a/tests/queries/0_stateless/02009_decimal_no_trailing_zeros.sql b/tests/queries/0_stateless/02009_decimal_no_trailing_zeros.sql
new file mode 100644
index 00000000000..e88e878b378
--- /dev/null
+++ b/tests/queries/0_stateless/02009_decimal_no_trailing_zeros.sql
@@ -0,0 +1,37 @@
+-- { echo }
+
+SELECT 1.123::Decimal64(1);
+SELECT 1.123::Decimal64(2);
+SELECT 1.123::Decimal64(3);
+SELECT 1.123::Decimal64(4);
+SELECT 1.123::Decimal64(5);
+SELECT 1.123::Decimal64(10);
+SELECT 1::Decimal64(0);
+SELECT 1::Decimal64(1);
+SELECT 1::Decimal64(10);
+
+SELECT 1.1234567::Decimal32(8);
+SELECT 1.1234567890::Decimal64(10);
+SELECT 1.1234567890::Decimal128(10);
+SELECT 1.1234567890::Decimal256(10);
+SELECT 1.123456789012345678901::Decimal256(20);
+SELECT 1.123456789012345678901::Decimal256(22);
+
+SET output_format_decimal_trailing_zeros = 1;
+
+SELECT 1.123::Decimal64(1);
+SELECT 1.123::Decimal64(2);
+SELECT 1.123::Decimal64(3);
+SELECT 1.123::Decimal64(4);
+SELECT 1.123::Decimal64(5);
+SELECT 1.123::Decimal64(10);
+SELECT 1::Decimal64(0);
+SELECT 1::Decimal64(1);
+SELECT 1::Decimal64(10);
+
+SELECT 1.1234567::Decimal32(8);
+SELECT 1.1234567890::Decimal64(10);
+SELECT 1.1234567890::Decimal128(10);
+SELECT 1.1234567890::Decimal256(10);
+SELECT 1.123456789012345678901::Decimal256(20);
+SELECT 1.123456789012345678901::Decimal256(22);
diff --git a/tests/queries/0_stateless/02009_from_infile.reference b/tests/queries/0_stateless/02009_from_infile.reference
new file mode 100644
index 00000000000..48483fe50c1
--- /dev/null
+++ b/tests/queries/0_stateless/02009_from_infile.reference
@@ -0,0 +1,3 @@
+Hello
+Hello
+Correct URL
diff --git a/tests/queries/0_stateless/02009_from_infile.sh b/tests/queries/0_stateless/02009_from_infile.sh
new file mode 100755
index 00000000000..578ac14f558
--- /dev/null
+++ b/tests/queries/0_stateless/02009_from_infile.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+[ -e "${CLICKHOUSE_TMP}"/test_infile.gz ] && rm "${CLICKHOUSE_TMP}"/test_infile.gz
+[ -e "${CLICKHOUSE_TMP}"/test_infile ] && rm "${CLICKHOUSE_TMP}"/test_infile
+
+echo "Hello" > "${CLICKHOUSE_TMP}"/test_infile
+
+gzip "${CLICKHOUSE_TMP}"/test_infile
+
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_infile;"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_infile (word String) ENGINE=Memory();"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV;"
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_infile;"
+
+# if it not fails, select will print information
+${CLICKHOUSE_LOCAL} --query "CREATE TABLE test_infile (word String) ENGINE=Memory(); INSERT INTO test_infile FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV; SELECT * from test_infile;"
+
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=DROP+TABLE" -d 'IF EXISTS test_infile_url'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=CREATE" -d 'TABLE test_infile_url (x String) ENGINE = Memory'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d "INSERT INTO test_infile_url FROM INFILE '${CLICKHOUSE_TMP}/test_infile.gz' FORMAT CSV" 2>&1 | grep -q "UNKNOWN_TYPE_OF_QUERY" && echo "Correct URL" || echo 'Fail'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -d 'SELECT x FROM test_infile_url'
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=DROP+TABLE" -d 'test_infile_url'
diff --git a/tests/queries/0_stateless/02009_mysql_client_empty_result.reference b/tests/queries/0_stateless/02009_mysql_client_empty_result.reference
new file mode 100644
index 00000000000..f11935a87d3
--- /dev/null
+++ b/tests/queries/0_stateless/02009_mysql_client_empty_result.reference
@@ -0,0 +1,4 @@
+x
+1
+i
+3
diff --git a/tests/queries/0_stateless/02009_mysql_client_empty_result.sh b/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
new file mode 100755
index 00000000000..f9fef73e64b
--- /dev/null
+++ b/tests/queries/0_stateless/02009_mysql_client_empty_result.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${MYSQL_CLIENT} --batch --execute 'SELECT 1 AS x'
+${MYSQL_CLIENT} --batch --execute 'SELECT 1 AS x WHERE 0'
+
+${MYSQL_CLIENT} <<<"
+    DROP TABLE IF EXISTS b;
+    CREATE TABLE b (i UInt8) ENGINE=MergeTree() PRIMARY KEY(i) ORDER BY (i);
+    INSERT INTO b VALUES (1), (2), (3);
+"
+
+${MYSQL_CLIENT} --batch --execute 'SELECT * FROM b WHERE i>=3;'
+${MYSQL_CLIENT} --batch --execute 'SELECT * FROM b WHERE i>=300;'
+
+${MYSQL_CLIENT} <<<"
+    DROP TABLE b;
+"
diff --git a/tests/queries/0_stateless/02010_array_index_bad_cast.reference b/tests/queries/0_stateless/02010_array_index_bad_cast.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02010_array_index_bad_cast.sql b/tests/queries/0_stateless/02010_array_index_bad_cast.sql
new file mode 100644
index 00000000000..19c58bb28a7
--- /dev/null
+++ b/tests/queries/0_stateless/02010_array_index_bad_cast.sql
@@ -0,0 +1,2 @@
+-- This query throws exception about uncomparable data types (but at least it does not introduce bad cast in code).
+SELECT has(materialize(CAST(['2021-07-14'] AS Array(LowCardinality(Nullable(DateTime))))), materialize('2021-07-14'::DateTime64(7))); -- { serverError 44 }
diff --git a/tests/queries/0_stateless/02010_lc_native.python b/tests/queries/0_stateless/02010_lc_native.python
new file mode 100755
index 00000000000..6b3cad89ed6
--- /dev/null
+++ b/tests/queries/0_stateless/02010_lc_native.python
@@ -0,0 +1,302 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import socket
+import os
+
+CLICKHOUSE_HOST = os.environ.get('CLICKHOUSE_HOST', '127.0.0.1')
+CLICKHOUSE_PORT = int(os.environ.get('CLICKHOUSE_PORT_TCP', '900000'))
+CLICKHOUSE_DATABASE = os.environ.get('CLICKHOUSE_DATABASE', 'default')
+
+def writeVarUInt(x, ba):
+    for _ in range(0, 9):
+
+        byte = x & 0x7F
+        if x > 0x7F:
+            byte |= 0x80
+
+        ba.append(byte)
+
+        x >>= 7
+        if x == 0:
+            return
+
+
+def writeStringBinary(s, ba):
+    b = bytes(s, 'utf-8')
+    writeVarUInt(len(s), ba)
+    ba.extend(b)
+
+
+def readStrict(s, size = 1):
+    res = bytearray()
+    while size:
+        cur = s.recv(size)
+        # if not res:
+        #     raise "Socket is closed"
+        size -= len(cur)
+        res.extend(cur)
+
+    return res
+
+
+def readUInt(s, size=1):
+    res = readStrict(s, size)
+    val = 0
+    for i in range(len(res)):
+        val += res[i] << (i * 8)
+    return val
+
+def readUInt8(s):
+    return readUInt(s)
+
+def readUInt16(s):
+    return readUInt(s, 2)
+
+def readUInt32(s):
+    return readUInt(s, 4)
+
+def readUInt64(s):
+    return readUInt(s, 8)
+
+def readVarUInt(s):
+    x = 0
+    for i in range(9):
+        byte = readStrict(s)[0]
+        x |= (byte & 0x7F) << (7 * i)
+
+        if not byte & 0x80:
+            return x
+
+    return x
+
+
+def readStringBinary(s):
+    size = readVarUInt(s)
+    s = readStrict(s, size)
+    return s.decode('utf-8')
+
+
+def sendHello(s):
+    ba = bytearray()
+    writeVarUInt(0, ba) # Hello
+    writeStringBinary('simple native protocol', ba)
+    writeVarUInt(21, ba)
+    writeVarUInt(9, ba)
+    writeVarUInt(54449, ba)
+    writeStringBinary('default', ba) # database
+    writeStringBinary('default', ba) # user
+    writeStringBinary('', ba) # pwd
+    s.sendall(ba)
+
+
+def receiveHello(s):
+    p_type = readVarUInt(s)
+    assert (p_type == 0) # Hello
+    server_name = readStringBinary(s)
+    # print("Server name: ", server_name)
+    server_version_major = readVarUInt(s)
+    # print("Major: ", server_version_major)
+    server_version_minor = readVarUInt(s)
+    # print("Minor: ", server_version_minor)
+    server_revision = readVarUInt(s)
+    # print("Revision: ", server_revision)
+    server_timezone = readStringBinary(s)
+    # print("Timezone: ", server_timezone)
+    server_display_name = readStringBinary(s)
+    # print("Display name: ", server_display_name)
+    server_version_patch = readVarUInt(s)
+    # print("Version patch: ", server_version_patch)
+
+
+def serializeClientInfo(ba):
+    writeStringBinary('default', ba) # initial_user
+    writeStringBinary('123456', ba) # initial_query_id
+    writeStringBinary('127.0.0.1:9000', ba) # initial_address
+    ba.extend([0] * 8) # initial_query_start_time_microseconds
+    ba.append(1) # TCP
+    writeStringBinary('os_user', ba) # os_user
+    writeStringBinary('client_hostname', ba) # client_hostname
+    writeStringBinary('client_name', ba) # client_name
+    writeVarUInt(21, ba)
+    writeVarUInt(9, ba)
+    writeVarUInt(54449, ba)
+    writeStringBinary('', ba) # quota_key
+    writeVarUInt(0, ba) # distributed_depth
+    writeVarUInt(1, ba) # client_version_patch
+    ba.append(0) # No telemetry
+
+
+def sendQuery(s, query):
+    ba = bytearray()
+    writeVarUInt(1, ba) # query
+    writeStringBinary('123456', ba)
+
+    ba.append(1) # INITIAL_QUERY
+
+    # client info
+    serializeClientInfo(ba)
+
+    writeStringBinary('', ba) # No settings
+    writeStringBinary('', ba) # No interserver secret
+    writeVarUInt(2, ba) # Stage - Complete
+    ba.append(0) # No compression
+    writeStringBinary(query + ' settings input_format_defaults_for_omitted_fields=0', ba) # query, finally
+    s.sendall(ba)
+
+
+def serializeBlockInfo(ba):
+    writeVarUInt(1, ba) # 1
+    ba.append(0) # is_overflows
+    writeVarUInt(2, ba) # 2
+    writeVarUInt(0, ba) # 0
+    ba.extend([0] * 4) # bucket_num
+
+
+def sendEmptyBlock(s):
+    ba = bytearray()
+    writeVarUInt(2, ba) # Data
+    writeStringBinary('', ba)
+    serializeBlockInfo(ba)
+    writeVarUInt(0, ba) # rows
+    writeVarUInt(0, ba) # columns
+    s.sendall(ba)
+
+
+def readHeader(s):
+    readVarUInt(s) # Data
+    readStringBinary(s) # external table name
+    # BlockInfo
+    readVarUInt(s) # 1
+    readUInt8(s) # is_overflows
+    readVarUInt(s) # 2
+    readUInt32(s) # bucket_num
+    readVarUInt(s) # 0
+    columns = readVarUInt(s) # rows
+    rows = readVarUInt(s) # columns
+    print("Rows {} Columns {}".format(rows, columns))
+    for _ in range(columns):
+        col_name = readStringBinary(s)
+        type_name = readStringBinary(s)
+        print("Column {} type {}".format(col_name, type_name))
+
+
+def readException(s):
+    assert(readVarUInt(s) == 2)
+    code = readUInt32(s)
+    name = readStringBinary(s)
+    text = readStringBinary(s)
+    readStringBinary(s) # trace
+    assert(readUInt8(s) == 0) # has_nested
+    print("code {}: {}".format(code, text.replace('DB::Exception:', '')))
+
+
+def insertValidLowCardinalityRow():
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.settimeout(30)
+        s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
+        sendHello(s)
+        receiveHello(s)
+        sendQuery(s, 'insert into {}.tab format TSV'.format(CLICKHOUSE_DATABASE))
+
+        # external tables
+        sendEmptyBlock(s)
+        readHeader(s)
+
+        # Data
+        ba = bytearray()
+        writeVarUInt(2, ba) # Data
+        writeStringBinary('', ba)
+        serializeBlockInfo(ba)
+        writeVarUInt(1, ba) # rows
+        writeVarUInt(1, ba) # columns
+        writeStringBinary('x', ba)
+        writeStringBinary('LowCardinality(String)', ba)
+        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
+        ba.extend([3, 2] + [0] * 6) # indexes type: UInt64 [3], with additional keys [2]
+        ba.extend([1] + [0] * 7) # num_keys in dict
+        writeStringBinary('hello', ba) # key
+        ba.extend([1] + [0] * 7) # num_indexes
+        ba.extend([0] * 8) # UInt64 index (0 for 'hello')
+        s.sendall(ba)
+
+        # Fin block
+        sendEmptyBlock(s)
+
+        assert(readVarUInt(s) == 5) # End of stream
+        s.close()
+
+
+def insertLowCardinalityRowWithIndexOverflow():
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.settimeout(30)
+        s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
+        sendHello(s)
+        receiveHello(s)
+        sendQuery(s, 'insert into {}.tab format TSV'.format(CLICKHOUSE_DATABASE))
+
+        # external tables
+        sendEmptyBlock(s)
+        readHeader(s)
+
+        # Data
+        ba = bytearray()
+        writeVarUInt(2, ba) # Data
+        writeStringBinary('', ba)
+        serializeBlockInfo(ba)
+        writeVarUInt(1, ba) # rows
+        writeVarUInt(1, ba) # columns
+        writeStringBinary('x', ba)
+        writeStringBinary('LowCardinality(String)', ba)
+        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
+        ba.extend([3, 2] + [0] * 6) # indexes type: UInt64 [3], with additional keys [2]
+        ba.extend([1] + [0] * 7) # num_keys in dict
+        writeStringBinary('hello', ba) # key
+        ba.extend([1] + [0] * 7) # num_indexes
+        ba.extend([0] * 7 + [1]) # UInt64 index (overflow)
+        s.sendall(ba)
+
+        readException(s)
+        s.close()
+
+
+def insertLowCardinalityRowWithIncorrectDictType():
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        s.settimeout(30)
+        s.connect((CLICKHOUSE_HOST, CLICKHOUSE_PORT))
+        sendHello(s)
+        receiveHello(s)
+        sendQuery(s, 'insert into {}.tab format TSV'.format(CLICKHOUSE_DATABASE))
+
+        # external tables
+        sendEmptyBlock(s)
+        readHeader(s)
+
+        # Data
+        ba = bytearray()
+        writeVarUInt(2, ba) # Data
+        writeStringBinary('', ba)
+        serializeBlockInfo(ba)
+        writeVarUInt(1, ba) # rows
+        writeVarUInt(1, ba) # columns
+        writeStringBinary('x', ba)
+        writeStringBinary('LowCardinality(String)', ba)
+        ba.extend([1] + [0] * 7) # SharedDictionariesWithAdditionalKeys
+        ba.extend([3, 3] + [0] * 6) # indexes type: UInt64 [3], with global dict and add keys [1 + 2]
+        ba.extend([1] + [0] * 7) # num_keys in dict
+        writeStringBinary('hello', ba) # key
+        ba.extend([1] + [0] * 7) # num_indexes
+        ba.extend([0] * 8) # UInt64 index (overflow)
+        s.sendall(ba)
+
+        readException(s)
+        s.close()
+
+
+def main():
+    insertValidLowCardinalityRow()
+    insertLowCardinalityRowWithIndexOverflow()
+    insertLowCardinalityRowWithIncorrectDictType()
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/queries/0_stateless/02010_lc_native.reference b/tests/queries/0_stateless/02010_lc_native.reference
new file mode 100644
index 00000000000..0167f05c952
--- /dev/null
+++ b/tests/queries/0_stateless/02010_lc_native.reference
@@ -0,0 +1,8 @@
+Rows 0 Columns 1
+Column x type LowCardinality(String)
+Rows 0 Columns 1
+Column x type LowCardinality(String)
+code 117:  Index for LowCardinality is out of range. Dictionary size is 1, but found index with value 72057594037927936
+Rows 0 Columns 1
+Column x type LowCardinality(String)
+code 117:  LowCardinality indexes serialization type for Native format cannot use global dictionary
diff --git a/tests/queries/0_stateless/02010_lc_native.sh b/tests/queries/0_stateless/02010_lc_native.sh
new file mode 100755
index 00000000000..0c544db38e6
--- /dev/null
+++ b/tests/queries/0_stateless/02010_lc_native.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "drop table if exists tab;"
+$CLICKHOUSE_CLIENT -q "create table tab(x LowCardinality(String)) engine = MergeTree order by tuple();"
+
+# We should have correct env vars from shell_config.sh to run this test
+python3 "$CURDIR"/02010_lc_native.python
+
+$CLICKHOUSE_CLIENT -q "drop table if exists tab;"
diff --git a/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.reference b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.reference
new file mode 100644
index 00000000000..7938dcdde86
--- /dev/null
+++ b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.reference
@@ -0,0 +1,3 @@
+0
+1
+0
diff --git a/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
new file mode 100644
index 00000000000..684cc365b73
--- /dev/null
+++ b/tests/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
@@ -0,0 +1,14 @@
+-- Tags: no-parallel
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table (id UInt64) ENGINE=TinyLog;
+INSERT INTO test_table VALUES (0);
+
+DROP DICTIONARY IF EXISTS test_dictionary;
+CREATE DICTIONARY test_dictionary (id UInt64) PRIMARY KEY id LAYOUT(DIRECT()) SOURCE(CLICKHOUSE(TABLE 'test_table'));
+SELECT * FROM test_dictionary;
+SELECT dictHas('test_dictionary', toUInt64(0));
+SELECT dictHas('test_dictionary', toUInt64(1));
+
+DROP DICTIONARY test_dictionary;
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02011_http_parsing.reference b/tests/queries/0_stateless/02011_http_parsing.reference
new file mode 100644
index 00000000000..e059b92b8b7
--- /dev/null
+++ b/tests/queries/0_stateless/02011_http_parsing.reference
@@ -0,0 +1,6 @@
+One
+Two
+Three
+Four
+Five
+Six
diff --git a/tests/queries/0_stateless/02011_http_parsing.sh b/tests/queries/0_stateless/02011_http_parsing.sh
new file mode 100755
index 00000000000..8021f7c550b
--- /dev/null
+++ b/tests/queries/0_stateless/02011_http_parsing.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo -ne 'One\nTwo\n'  | ${CLICKHOUSE_CURL} -sSF 'metrics_list=@-;' "${CLICKHOUSE_URL}/?metrics_list_format=TSV&metrics_list_structure=Path+String&query=SELECT+*+FROM+metrics_list";
+echo -ne 'Three\nFour' | ${CLICKHOUSE_CURL} -sSF 'metrics_list=@-;' "${CLICKHOUSE_URL}/?metrics_list_format=TSV&metrics_list_structure=Path+String&query=SELECT+*+FROM+metrics_list";
+echo -ne 'Five\n'      | ${CLICKHOUSE_CURL} -sSF 'metrics_list=@-;' "${CLICKHOUSE_URL}/?metrics_list_format=TSV&metrics_list_structure=Path+String&query=SELECT+*+FROM+metrics_list";
+echo -ne 'Six'         | ${CLICKHOUSE_CURL} -sSF 'metrics_list=@-;' "${CLICKHOUSE_URL}/?metrics_list_format=TSV&metrics_list_structure=Path+String&query=SELECT+*+FROM+metrics_list";
diff --git a/tests/queries/0_stateless/02011_normalize_utf8.reference b/tests/queries/0_stateless/02011_normalize_utf8.reference
new file mode 100644
index 00000000000..b97f0ee5a01
--- /dev/null
+++ b/tests/queries/0_stateless/02011_normalize_utf8.reference
@@ -0,0 +1,11 @@
+ё	ё	2	4	ё	ё	2	2
+1	ё	4	ё	2	ё	4	ё	2	ё	4
+2	ё	2	ё	2	ё	4	ё	2	ё	4
+3	జ్ఞ‌ా	15	జ్ఞ‌ా	15	జ్ఞ‌ా	15	జ్ఞ‌ా	15	జ్ఞ‌ా	15
+4	本気ですか	15	本気ですか	15	本気ですか	18	本気ですか	15	本気ですか	18
+5	ﷺ	3	ﷺ	3	ﷺ	3	صلى الله عليه وسلم	33	صلى الله عليه وسلم	33
+6	ᾂ	3	ᾂ	3	ᾂ	8	ᾂ	3	ᾂ	8
+7	ΐ	2	ΐ	2	ΐ	6	ΐ	2	ΐ	6
+8	שּׁ	6	שּׁ	6	שּׁ	6	שּׁ	6	שּׁ	6
+9	𝅘𝅥𝅮	12	𝅘𝅥𝅮	12	𝅘𝅥𝅮	12	𝅘𝅥𝅮	12	𝅘𝅥𝅮	12
+10	Q̹̣̩̭̰̰̹̄ͬ̿͋̃ṷ̬̰ͥe̘͚͈̰̺̍͐s͎̜̖t͔̣̯̲̜̠ͣ̑ͨ̉̈̈o̲͙̺͊ͯͣ̐̋̂̔ ̳͉͍̒̂è̗ͥͯͨ̍ͮ͛ ̦̹̣̰̐̅̑͑̅̂t͙̭̻̖͛̾e̺͙ͣ͒̚ṣ̠͉͓͔̲̦̎t̖͖̝͓̣ͭ͑̈́̂ỏ̥͕͈͛̓ ̀ͦ̽ͅZͯ̑̎a͆l̻ͨ̋ͧͣͨͬg͉̙̟̾̅̾ͬo̠ͮ͒	281	Q̹̣̩̭̰̰̹̄ͬ̿͋̃ṷ̬̰ͥe̘͚͈̰̺̍͐s͎̜̖t͔̣̯̲̜̠ͣ̑ͨ̉̈̈o̲͙̺͊ͯͣ̐̋̂̔ ̳͉͍̒̂è̗ͥͯͨ̍ͮ͛ ̦̹̣̰̐̅̑͑̅̂t͙̭̻̖͛̾e̺͙ͣ͒̚ṣ̠͉͓͔̲̦̎t̖͖̝͓̣ͭ͑̈́̂ỏ̥͕͈͛̓ ̀ͦ̽ͅZͯ̑̎a͆l̻ͨ̋ͧͣͨͬg͉̙̟̾̅̾ͬo̠ͮ͒	281	Q̹̣̩̭̰̰̹̄ͬ̿͋̃ṷ̬̰ͥe̘͚͈̰̺̍͐s͎̜̖t͔̣̯̲̜̠ͣ̑ͨ̉̈̈o̲͙̺͊ͯͣ̐̋̂̔ ̳͉͍̒̂è̗ͥͯͨ̍ͮ͛ ̦̹̣̰̐̅̑͑̅̂t͙̭̻̖͛̾e̺͙ͣ͒̚ṣ̠͉͓͔̲̦̎t̖͖̝͓̣ͭ͑̈́̂ỏ̥͕͈͛̓ ̀ͦ̽ͅZͯ̑̎a͆l̻ͨ̋ͧͣͨͬg͉̙̟̾̅̾ͬo̠ͮ͒	282	Q̹̣̩̭̰̰̹̄ͬ̿͋̃ṷ̬̰ͥe̘͚͈̰̺̍͐s͎̜̖t͔̣̯̲̜̠ͣ̑ͨ̉̈̈o̲͙̺͊ͯͣ̐̋̂̔ ̳͉͍̒̂è̗ͥͯͨ̍ͮ͛ ̦̹̣̰̐̅̑͑̅̂t͙̭̻̖͛̾e̺͙ͣ͒̚ṣ̠͉͓͔̲̦̎t̖͖̝͓̣ͭ͑̈́̂ỏ̥͕͈͛̓ ̀ͦ̽ͅZͯ̑̎a͆l̻ͨ̋ͧͣͨͬg͉̙̟̾̅̾ͬo̠ͮ͒	281	Q̹̣̩̭̰̰̹̄ͬ̿͋̃ṷ̬̰ͥe̘͚͈̰̺̍͐s͎̜̖t͔̣̯̲̜̠ͣ̑ͨ̉̈̈o̲͙̺͊ͯͣ̐̋̂̔ ̳͉͍̒̂è̗ͥͯͨ̍ͮ͛ ̦̹̣̰̐̅̑͑̅̂t͙̭̻̖͛̾e̺͙ͣ͒̚ṣ̠͉͓͔̲̦̎t̖͖̝͓̣ͭ͑̈́̂ỏ̥͕͈͛̓ ̀ͦ̽ͅZͯ̑̎a͆l̻ͨ̋ͧͣͨͬg͉̙̟̾̅̾ͬo̠ͮ͒	282
diff --git a/tests/queries/0_stateless/02011_normalize_utf8.sql b/tests/queries/0_stateless/02011_normalize_utf8.sql
new file mode 100644
index 00000000000..5abb6b4d8fb
--- /dev/null
+++ b/tests/queries/0_stateless/02011_normalize_utf8.sql
@@ -0,0 +1,44 @@
+-- Tags: no-fasttest
+
+DROP TABLE IF EXISTS normalize_test;
+CREATE TABLE normalize_test (id int, value String) ENGINE = MergeTree ORDER BY value;
+
+
+SELECT
+    'ё' AS norm, 'ё' AS denorm,
+    length(norm), length(denorm),
+    normalizeUTF8NFC(norm) AS norm_nfc,
+    normalizeUTF8NFC(denorm) AS denorm_nfc,
+    length(norm_nfc),
+    length(denorm_nfc);
+
+
+INSERT INTO normalize_test (id, value) VALUES (1, 'ё');
+INSERT INTO normalize_test (id, value) VALUES (2, 'ё');
+INSERT INTO normalize_test (id, value) VALUES (3, 'జ్ఞ‌ా');
+INSERT INTO normalize_test (id, value) VALUES (4, '本気ですか');
+INSERT INTO normalize_test (id, value) VALUES (5, 'ﷺ');
+INSERT INTO normalize_test (id, value) VALUES (6, 'ᾂ');
+INSERT INTO normalize_test (id, value) VALUES (7, 'ΐ');
+INSERT INTO normalize_test (id, value) VALUES (8, 'שּׁ');
+INSERT INTO normalize_test (id, value) VALUES (9, '𝅘𝅥𝅮');
+
+
+INSERT INTO normalize_test (id, value) VALUES (10, 'Q̹̣̩̭̰̰̹̄ͬ̿͋̃ṷ̬̰ͥe̘͚͈̰̺̍͐s͎̜̖t͔̣̯̲̜̠ͣ̑ͨ̉̈̈o̲͙̺͊ͯͣ̐̋̂̔ ̳͉͍̒̂è̗ͥͯͨ̍ͮ͛ ̦̹̣̰̐̅̑͑̅̂t͙̭̻̖͛̾e̺͙ͣ͒̚ṣ̠͉͓͔̲̦̎t̖͖̝͓̣ͭ͑̈́̂ỏ̥͕͈͛̓ ̀ͦ̽ͅZͯ̑̎a͆l̻ͨ̋ͧͣͨͬg͉̙̟̾̅̾ͬo̠ͮ͒');
+
+
+
+SELECT
+    id, value, length(value),
+    normalizeUTF8NFC(value) AS nfc, length(nfc) AS nfc_len,
+    normalizeUTF8NFD(value) AS nfd, length(nfd) AS nfd_len,
+    normalizeUTF8NFKC(value) AS nfkc, length(nfkc) AS nfkc_len,
+    normalizeUTF8NFKD(value) AS nfkd, length(nfkd) AS nfkd_len
+FROM normalize_test
+ORDER BY id;
+
+
+SELECT char(228) AS value, normalizeUTF8NFC(value); -- { serverError 621 }
+SELECT char(228) AS value, normalizeUTF8NFD(value); -- { serverError 621 }
+SELECT char(228) AS value, normalizeUTF8NFKC(value); -- { serverError 621 }
+SELECT char(228) AS value, normalizeUTF8NFKD(value); -- { serverError 621 }
diff --git a/tests/queries/0_stateless/02011_tuple_vector_functions.reference b/tests/queries/0_stateless/02011_tuple_vector_functions.reference
new file mode 100644
index 00000000000..4c5067c7da2
--- /dev/null
+++ b/tests/queries/0_stateless/02011_tuple_vector_functions.reference
@@ -0,0 +1,74 @@
+0
+1
+(10,3)
+(-1,0)
+(-23,-27)
+(-2.5,4,2.75)
+(3)
+(-1,0,-3.5)
+(-1,-2,-3)
+(-1)
+(0.5,1,1.5)
+(2,5,6)
+(1)
+(1)
+(3,6,9.3)
+(11,22)
+(0.5,1)
+20
+16.808
+0
+6
+7.1
+1.4142135623730951
+13
+1.5
+-3
+2.3
+1
+1
+1.1
+422481
+1
+1
+2.0000887587111964
+4
+2.8284271247461903
+1
+0
+-4.413254828250501e-8
+(0.2,-0.8)
+(0.6,0.8)
+(1,-1,1)
+(0.4999999999999999,0.9936703773322288)
+2.220446049250313e-16
+1
+1.9999999999999998
+0.4999999999999999
+(NULL,NULL)
+\N
+\N
+(2,4,NULL)
+\N
+\N
+(NULL,NULL,-1)
+\N
+(NULL,NULL)
+\N
+\N
+(3.1,6.2)
+(2,1)
+(3,2)
+(4,3)
+2.220446049250313e-16
+0.007722123286332261
+0.01613008990009257
+(NULL,0,0)
+(NULL,-2,-1)
+2	1.4142135623730951	1	2
+0	0	0	0
+(0.5,0.5)	(0.7071067811865475,0.7071067811865475)	(1,1)	(0.5,0.5)
+3.6060655943063797
+4.3208683194033215
+\N
+SELECT -((3, 7, 3), 100)
diff --git a/tests/queries/0_stateless/02011_tuple_vector_functions.sql b/tests/queries/0_stateless/02011_tuple_vector_functions.sql
new file mode 100644
index 00000000000..f34fb91586c
--- /dev/null
+++ b/tests/queries/0_stateless/02011_tuple_vector_functions.sql
@@ -0,0 +1,106 @@
+SELECT tupleHammingDistance(tuple(1), tuple(1));
+SELECT tupleHammingDistance((1, 3), (1, 2));
+
+SELECT (1, 2) + tupleMultiply((3, 4), materialize((5, 1))) - (6, 3);
+SELECT vectorDifference(tuplePlus((1, 2), (3, 4)), (5, 6));
+SELECT tupleMinus(materialize(vectorSum(tupleMultiply(materialize((1, 2)), (3, 4)), (5, 6))), (31, 41));
+SELECT tupleDivide((5, 8, 11), (-2, 2, 4));
+SELECT tuple(1) + tuple(2);
+
+SELECT tupleNegate((1, 0, 3.5));
+SELECT -materialize((1, 2, 3));
+SELECT -tuple(1);
+
+SELECT tupleMultiplyByNumber((1, 2, 3), 0.5);
+SELECT tupleDivideByNumber((1, 2.5, 3), materialize(0.5));
+SELECT tupleMultiplyByNumber(tuple(1), 1);
+SELECT tupleDivideByNumber(tuple(1), materialize(1));
+
+SELECT materialize((1, 2.0, 3.1)) * 3;
+SELECT 5.5 * (2, 4);
+SELECT (1, 2) / 2;
+SELECT 2 / (1, 1); -- { serverError 43 }
+
+SELECT tuple(1, 2, 3) * tuple(2, 3, 4);
+SELECT dotProduct(materialize((-1, 2, 3.002)), materialize((2, 3.4, 4)));
+SELECT scalarProduct(tuple(1), tuple(0));
+
+SELECT L1Norm((-1, 2, -3));
+SELECT L1Norm((-1, 2.5, -3.6));
+SELECT L2Norm((1, 1.0));
+SELECT L2Norm(materialize((-12, 5)));
+
+SELECT max2(materialize(1), 1.5);
+SELECT min2(-1, -3);
+SELECT LinfNorm((1, -2.3, 1.7));
+
+SELECT LpNorm(tuple(-1), 3.3);
+SELECT LpNorm(tuple(-1), 3);
+SELECT LpNorm(tuple(-1.1), 3);
+SELECT LpNorm((95800, 217519, 414560), 4);
+SELECT LpNorm((13, -84.4, 91, 63.1), 2) = L2Norm(tuple(13, -84.4, 91, 63.1));
+SELECT LpNorm(materialize((13, -84.4, 91, 63.1)), 1) = L1Norm(tuple(13, -84.4, 91, 63.1));
+SELECT LpNorm((-1, -2), 11.);
+
+SELECT L1Distance((1, 2, 3), (2, 3, 1));
+SELECT L2Distance(materialize((1, 1)), (3, -1));
+SELECT LinfDistance((1, 1), (1, 2));
+SELECT L2Distance((5, 5), (5, 5));
+SELECT LpDistance((1800, 1900), (18, 59), 12) - LpDistance(tuple(-22), tuple(1900), 12.);
+
+SELECT L1Normalize(materialize((1, -4)));
+SELECT L2Normalize((3, 4));
+SELECT LinfNormalize((5, -5, 5.0));
+SELECT LpNormalize((1, pow(31, 1 / 5)), 5.);
+
+SELECT cosineDistance(materialize((1, 1)), (2, 2));
+SELECT cosineDistance((1, 1), materialize((-3, 3.0)));
+SELECT cosineDistance((1, 1), (-1, -1));
+SELECT cosineDistance((1, 0), (0.5, sqrt(3) / 2));
+
+SELECT (NULL, 1) + (1, NULL);
+SELECT (NULL, 1) * materialize((1, NULL));
+SELECT L2Norm((NULL, 3, 4));
+SELECT 2 * (1, 2, NULL);
+SELECT (1, 1.0, NULL) / NULL;
+SELECT (1, 1.0, NULL) / materialize(NULL);
+SELECT -(NULL, NULL, 1);
+SELECT (NULL, NULL) * NULL;
+SELECT L1Normalize((NULL, 1));
+SELECT cosineDistance((NULL, 1), (NULL, NULL));
+SELECT max2(NULL, 1) - min2(NULL, 1);
+
+SELECT L1Norm(1); -- { serverError 43 }
+SELECT (1, 1) / toString(1); -- { serverError 43 }
+SELECT -(1, toString(1)); -- { serverError 43 }
+SELECT LpNorm((1, 2), toDecimal32(2, 4)); -- { serverError 43 }
+SELECT (1, 2) * toDecimal32(3.1, 8);
+
+SELECT cosineDistance((1, 2), (2, 3, 4)); -- { serverError 43 }
+SELECT tuple() + tuple(); -- { serverError 42 }
+SELECT LpNorm((1, 2, 3)); -- { serverError 42 }
+SELECT max2(1, 2, -1); -- { serverError 42 }
+
+SELECT LpNorm((1, 2, 3), materialize(4.)); -- { serverError 44 }
+
+SELECT tuple(*, 1) + tuple(2, *) FROM numbers(3);
+SELECT LpDistance(tuple(*, 1), tuple(2, *), * + 1.) FROM numbers(3, 2); -- { serverError 44 }
+SELECT cosineDistance(tuple(*, * + 1), tuple(1, 2)) FROM numbers(1, 3);
+SELECT -tuple(NULL, * * 2, *) FROM numbers(2);
+
+SELECT normL1((1, 1)), normL2((1, 1)), normLinf((1, 1)), normLp((1, 1), 1.);
+SELECT distanceL1((1, 1), (1, 1)), distanceL2((1, 1), (1, 1)), distanceLinf((1, 1), (1, 1)), distanceLp((1, 1), (1, 1), 1.);
+SELECT normalizeL1((1, 1)), normalizeL2((1, 1)), normalizeLinf((1, 1)), normalizeLp((1, 1), 1.);
+
+SELECT LpNorm((1, 2, 3), 2.2);
+SELECT LpNorm((1.5, 2.5, 4), pi());
+SELECT LpNorm((3, 1, 4), 0); -- { serverError 69 }
+SELECT LpNorm((1, 2, 3), 0.5); -- { serverError 69 }
+SELECT LpNorm((1, 2, 3), inf); -- { serverError 69 }
+SELECT LpNorm((1, 2, 3), -1.); -- { serverError 69 }
+SELECT LpNorm((1, 2, 3), -1); -- { serverError 44 }
+SELECT LpNorm((1, 2, 3), 0.); -- { serverError 69 }
+SELECT cosineDistance(materialize((NULL, -2147483648)), (1048577, 1048575));
+
+-- not extra parentheses
+EXPLAIN SYNTAX SELECT -((3, 7, 3), 100);
diff --git a/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.reference b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.reference
new file mode 100644
index 00000000000..abb96cefb59
--- /dev/null
+++ b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.reference
@@ -0,0 +1,4 @@
+one
+one
+two
+two
diff --git a/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
new file mode 100644
index 00000000000..50d5bfe0d39
--- /dev/null
+++ b/tests/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
@@ -0,0 +1,10 @@
+-- Tags: replica
+
+create table enum_alter_issue (a Enum8('one' = 1, 'two' = 2)) engine = MergeTree() ORDER BY a;
+insert into enum_alter_issue values ('one'), ('two');
+alter table enum_alter_issue modify column a Enum8('one' = 1, 'two' = 2, 'three' = 3);
+insert into enum_alter_issue values ('one'), ('two');
+alter table enum_alter_issue detach partition id 'all';
+alter table enum_alter_issue attach partition id 'all';
+select * from enum_alter_issue order by a;
+drop table enum_alter_issue;
diff --git a/tests/queries/0_stateless/02012_compress_lz4.reference b/tests/queries/0_stateless/02012_compress_lz4.reference
new file mode 100644
index 00000000000..8ab686eafeb
--- /dev/null
+++ b/tests/queries/0_stateless/02012_compress_lz4.reference
@@ -0,0 +1 @@
+Hello, World!
diff --git a/tests/queries/0_stateless/02012_compress_lz4.sh b/tests/queries/0_stateless/02012_compress_lz4.sh
new file mode 100755
index 00000000000..1823718fc9c
--- /dev/null
+++ b/tests/queries/0_stateless/02012_compress_lz4.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+WORKING_FOLDER_02012="${USER_FILES_PATH}/${CLICKHOUSE_DATABASE}"
+
+rm -rf "${WORKING_FOLDER_02012}"
+mkdir "${WORKING_FOLDER_02012}"
+
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World!' as String) INTO OUTFILE '${WORKING_FOLDER_02012}/lz4_compression.lz4'"
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM file('${WORKING_FOLDER_02012}/lz4_compression.lz4', 'TabSeparated', 'col String')"
+
+rm -rf "${WORKING_FOLDER_02012}"
diff --git a/tests/queries/0_stateless/02012_get_server_port.reference b/tests/queries/0_stateless/02012_get_server_port.reference
new file mode 100644
index 00000000000..d58c55a31dc
--- /dev/null
+++ b/tests/queries/0_stateless/02012_get_server_port.reference
@@ -0,0 +1 @@
+9000
diff --git a/tests/queries/0_stateless/02012_get_server_port.sql b/tests/queries/0_stateless/02012_get_server_port.sql
new file mode 100644
index 00000000000..cc7fecb0bf0
--- /dev/null
+++ b/tests/queries/0_stateless/02012_get_server_port.sql
@@ -0,0 +1,3 @@
+select getServerPort('tcp_port');
+
+select getServerPort('unknown'); -- { serverError 170 }
diff --git a/tests/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.reference b/tests/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.reference
new file mode 100644
index 00000000000..af2447df807
--- /dev/null
+++ b/tests/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.reference
@@ -0,0 +1,4 @@
+0562380c-d1f3-4091-83d5-8c972f534317
+
+0562380c-d1f3-4091-83d5-8c972f534317
+0562380c-d1f3-4091-83d5-8c972f534317
diff --git a/tests/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.sql b/tests/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.sql
new file mode 100644
index 00000000000..191383cc978
--- /dev/null
+++ b/tests/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS tbl;
+
+SET allow_suspicious_low_cardinality_types = 1;
+CREATE TABLE tbl (`lc` LowCardinality(UUID)) ENGINE = Memory;
+
+INSERT INTO tbl VALUES ('0562380c-d1f3-4091-83d5-8c972f534317');
+
+SET extremes = 1;
+SELECT * FROM tbl;
+
+DROP TABLE tbl;
diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.reference b/tests/queries/0_stateless/02012_settings_clause_for_s3.reference
new file mode 100644
index 00000000000..b8f46d348ca
--- /dev/null
+++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.reference
@@ -0,0 +1,3 @@
+ClickHouse	1
+Hello	2
+Hedhehog	3
diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
new file mode 100644
index 00000000000..87d45c9d566
--- /dev/null
+++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql
@@ -0,0 +1,10 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on AWS
+
+DROP TABLE IF EXISTS table_with_range;
+
+CREATE TABLE table_with_range(`name` String,`number` UInt32)　ENGINE = S3('http://localhost:11111/test/tsv_with_header.tsv', 'test', 'testtest', 'TSVWithNames')　SETTINGS input_format_with_names_use_header = 1;
+
+select * from table_with_range;
+
+DROP TABLE IF EXISTS table_with_range;
diff --git a/tests/queries/0_stateless/02012_sha512_fixedstring.reference b/tests/queries/0_stateless/02012_sha512_fixedstring.reference
new file mode 100644
index 00000000000..dfc2f87087c
--- /dev/null
+++ b/tests/queries/0_stateless/02012_sha512_fixedstring.reference
@@ -0,0 +1,22 @@
+CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E
+DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA20A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD454D4423643CE80E2A9AC94FA54CA49F
+5809F3ECB4AA006F71AF562D4381F2BF64EA0931FD530E939740D0C38F6EEB2A71FA0113A21C170569D8319B8C4DE8A1C1A5ABA1A1C5B23A886B06712D373B9E
+6FDB5E5BCCBD093ECC48DD262A99E6B867D6F48E1DAE014D26428365E7529B0022F000CBF852BEA38F43A2034E8FE7555AC41B9EA9E27FE72F4E968926998EA8
+8018978D8AAE19322205E4CACFA045CDF7A0C4A5773A93FD24331064AFC5726F324B76802AA6FC30DFC412A6E5C3EEF4693AE4E2D0A1EA24A2D3EC46439B7923
+22F1080BFD1CEA5B86CFDEFE129D2FF67E756AA3DA0EADB4C6EBA86A0710F3C2E0F91815A28062BDA4FBF23E5FA1BD66A3CFDA37AC7354516943AB6E08E88106
+08788919600C5C9B93704570858D8B64D5B335FAD2B23E28A5E68A08BCC4AD9BCA1991178FEA22BDAAA3C9C2FEB061FF4919C1C840DFA8188858D80EDCE98499
+0EFD835B217A94C32F45B9C3720644D7A4A49DD3A74EDE4257CFBB74164C80382322B8EA7B6131747609BA1B2776E84AEC2820D9414FC5F66B6A42D3F90F1D9F
+C161DA64EE30E86768040C4BB7B88C3FAE5A1E79CA2441B2DB66552B126C00F952D2D854DF2F5D56FB85ED57C5A39E95BFE485A6AF70963A81BE67DFDB96CFBF
+F65B5379D687EA1FB38E32F8251F0FB270061DC6DF9AECA1E258A6F1BAFF70D4E979FC9315ED1FAE24D000CC0EF7937D02703B2061694B3DCA2308C5C0779184
+DF25395F5FFF00E5B64BF5EEAFD94A1A21B4F4FC4FAE01DF48C27C77E0C9DC6FC253C7E7F32185146048190B73E3ED53BC76F626D24E9DE3FBA3EBC48B671CC0
+F1DD6EFB26D0169259FBD53150D6E0C4F2E1FFF2F9DA6B77EC9AD065AD67D33F95411CC5E5B31CEAB970974E5C8E3C6376445D8422F052CABB121BCE1449C494
+561A1DEDBB03FD632DBFDCC73E83A8DBD17D6E30B14642BAC8EBF3DF6622150A5E51ACC059E2C44EF71A00FBEEB062F2EE7A610E5462E6B4805449574AAE857F
+D59943FE43CB50F2C3AE74F9BD09F72140519EA30C1A24E6F7A4BCBBD12860D954F9752A24FBAA1D606F362564D905E8B29806903B1542D948C2B8293FC09A59
+E18A99CED7BD69979406C5A666336D7316E11240FF5F8C1632F17BEB1BD58838E0222CCD48D4227F0751592F1C731B4BB11C325F09FB15923F0334C64303D73A
+0508B92D15B0750343F9B3E2218C7D54BB6D9A3ABA5FA941977832AA89300516505E91034E4ECD4812A7A58438251651C00974DDCD3C471B9ED02451871F4A48
+ADFDC00D41881138C96581D43298C5724C20500C5A966144B51531FFB2FE6CE265BE3101CD19B985A2253A7B48EE4EC5EBD4B2876CF0E66F1095EB0A2521C525
+758ABA28159AABFFF659E6698397AD7A9EBBA77AA3FFC25551B7CF2057930AD051D357866259E5288B0B837E3F5C4ED1D1229320595F914381903CD48DF76CB2
+E7A061D9B066E2CA44CF959A76FC04D8B02998CB9D46A60C19E015EA9389F3F9595CBBC4CC46E1319B02B3269FBD21F62D15A6F13428F8389CB4507AF6DB6D89
+3438D75650E1EDB8A11EF4F63A5DFF239A70B28B6A14F13FCFDD14D02BE8BD00E84DF956C159CFDC85D6E44DB62D00E9206F40453FFD9CC97C38449527D33FF6
+DB229C3A53B0340E94EFDA4D03B54F161313699757CAC312F377B731AE6C62010E0C0010E78F73E6D6B0BB438F644D176244B2614897799F9FA3F85DA980C218
+FDD9FD54050D95855B8E3A34F3A54E309E1CA87CD44A8506EB10051D1CA650DB64ABD0BE4F4F44E45F630C22CA270FA7694AC2261DF2EFD766B8CED53F285A27
diff --git a/tests/queries/0_stateless/02012_sha512_fixedstring.sql b/tests/queries/0_stateless/02012_sha512_fixedstring.sql
new file mode 100644
index 00000000000..cd014a58e65
--- /dev/null
+++ b/tests/queries/0_stateless/02012_sha512_fixedstring.sql
@@ -0,0 +1,17 @@
+-- Tags: no-fasttest
+-- Tag no-fasttest: Depends on OpenSSL
+
+SELECT hex(SHA512(''));
+SELECT hex(SHA512('abc'));
+
+DROP TABLE IF EXISTS defaults;
+CREATE TABLE defaults
+(
+    s FixedString(20)
+)ENGINE = Memory();
+
+INSERT INTO defaults SELECT s FROM generateRandom('s FixedString(20)', 1, 1, 1) LIMIT 20;
+
+SELECT hex(SHA512(s)) FROM defaults;
+
+DROP TABLE defaults;
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.reference b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.reference
new file mode 100644
index 00000000000..a83c714a5cf
--- /dev/null
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.reference
@@ -0,0 +1,4 @@
+one	1
+two	2
+one	3
+two	4
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
new file mode 100644
index 00000000000..5dc9ef8ca17
--- /dev/null
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
@@ -0,0 +1,16 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
+create table enum_alter_issue (a Enum8('one' = 1, 'two' = 2), b Int)
+engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02012/enum_alter_issue', 'r1')
+ORDER BY a;
+
+insert into enum_alter_issue values ('one', 1), ('two', 2);
+alter table enum_alter_issue modify column a Enum8('one' = 1, 'two' = 2, 'three' = 3);
+insert into enum_alter_issue values ('one', 3), ('two', 4);
+
+alter table enum_alter_issue detach partition id 'all';
+alter table enum_alter_issue attach partition id 'all';
+select * from enum_alter_issue order by b;
+
+drop table enum_alter_issue;
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.reference b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
new file mode 100644
index 00000000000..e236e6d2767
--- /dev/null
+++ b/tests/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
@@ -0,0 +1,15 @@
+-- Tags: zookeeper, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
+drop table if exists enum_alter_issue;
+create table enum_alter_issue (a Enum16('one' = 1, 'two' = 2), b Int)
+engine = ReplicatedMergeTree('/clickhouse/tables/{database}/test_02012/enum_alter_issue', 'r2')
+ORDER BY b;
+
+insert into enum_alter_issue values ('one', 1), ('two', 1);
+alter table enum_alter_issue detach partition id 'all';
+alter table enum_alter_issue modify column a Enum8('one' = 1, 'two' = 2, 'three' = 3);
+insert into enum_alter_issue values ('one', 1), ('two', 1);
+
+alter table enum_alter_issue attach partition id 'all'; -- {serverError TYPE_MISMATCH}
+drop table enum_alter_issue;
diff --git a/tests/queries/0_stateless/02013_bloom_filter_hasAll.reference b/tests/queries/0_stateless/02013_bloom_filter_hasAll.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02013_bloom_filter_hasAll.sql b/tests/queries/0_stateless/02013_bloom_filter_hasAll.sql
new file mode 100644
index 00000000000..adba3db6cf5
--- /dev/null
+++ b/tests/queries/0_stateless/02013_bloom_filter_hasAll.sql
@@ -0,0 +1,41 @@
+DROP TABLE IF EXISTS bftest;
+CREATE TABLE bftest (
+    k Int64,
+    y Array(Int64) DEFAULT x,
+    x Array(Int64),
+    index ix1(x) TYPE bloom_filter GRANULARITY 3
+)
+Engine=MergeTree
+ORDER BY k;
+
+INSERT INTO bftest (k, x) SELECT number, arrayMap(i->rand64()%565656, range(10)) FROM numbers(1000);
+
+-- index is not used, but query should still work
+SELECT count() FROM bftest WHERE hasAll(x, materialize([1,2,3])) FORMAT Null;
+
+-- verify the expression in WHERE works on non-index col the same way as on index cols
+SELECT count() FROM bftest WHERE hasAll(y, [NULL,-42]) FORMAT Null;
+SELECT count() FROM bftest WHERE hasAll(y, [0,NULL]) FORMAT Null;
+SELECT count() FROM bftest WHERE hasAll(y, [[123], -42]) FORMAT Null; -- { serverError 386 }
+SELECT count() FROM bftest WHERE hasAll(y, [toDecimal32(123, 3), 2]) FORMAT Null; -- different, doesn't fail
+
+SET force_data_skipping_indices='ix1';
+SELECT count() FROM bftest WHERE has (x, 42) and has(x, -42) FORMAT Null;
+SELECT count() FROM bftest WHERE hasAll(x, [42,-42]) FORMAT Null;
+SELECT count() FROM bftest WHERE hasAll(x, []) FORMAT Null;
+SELECT count() FROM bftest WHERE hasAll(x, [1]) FORMAT Null;
+
+-- can't use bloom_filter with `hasAll` on non-constant arguments (just like `has`)
+SELECT count() FROM bftest WHERE hasAll(x, materialize([1,2,3])) FORMAT Null; -- { serverError 277 }
+
+-- NULLs are not Ok
+SELECT count() FROM bftest WHERE hasAll(x, [NULL,-42]) FORMAT Null; -- { serverError 277 }
+SELECT count() FROM bftest WHERE hasAll(x, [0,NULL]) FORMAT Null; -- { serverError 277 }
+
+-- non-compatible types
+SELECT count() FROM bftest WHERE hasAll(x, [[123], -42]) FORMAT Null; -- { serverError 386 }
+SELECT count() FROM bftest WHERE hasAll(x, [toDecimal32(123, 3), 2]) FORMAT Null; -- { serverError 277 }
+
+-- Bug discovered by AST fuzzier (fixed, shouldn't crash).
+SELECT 1 FROM bftest WHERE has(x, -0.) OR 0. FORMAT Null;
+SELECT count() FROM bftest WHERE hasAll(x, [0, 1]) OR 0. FORMAT Null;
diff --git a/tests/queries/0_stateless/02013_emptystring_cast.reference b/tests/queries/0_stateless/02013_emptystring_cast.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02013_emptystring_cast.sql b/tests/queries/0_stateless/02013_emptystring_cast.sql
new file mode 100644
index 00000000000..b91c523aeb2
--- /dev/null
+++ b/tests/queries/0_stateless/02013_emptystring_cast.sql
@@ -0,0 +1,19 @@
+drop table if exists test_uint64;
+create table test_uint64 (`data` UInt64 Default 0) engine = MergeTree order by tuple();
+insert into test_uint64 values ('0'), (NULL), (1), ('2');
+drop table if exists test_uint64;
+
+drop table if exists test_float64;
+create table test_float64 (`data` Float64 Default 0.0) engine = MergeTree order by tuple();
+insert into test_float64 values ('0.1'), (NULL), (1.1), ('2.2');
+drop table if exists test_float64;
+
+drop table if exists test_date;
+create table test_date (`data` Date) engine = MergeTree order by tuple();
+insert into test_date values ('2021-01-01'), (NULL), ('2021-02-01'), ('2021-03-01');
+drop table if exists test_date;
+
+drop table if exists test_datetime;
+create table test_datetime (`data` DateTime) engine = MergeTree order by tuple();
+insert into test_datetime values ('2021-01-01 00:00:00'), (NULL), ('2021-02-01 01:00:00'), ('2021-03-01 02:00:00');
+drop table if exists test_datetime;
diff --git a/tests/queries/0_stateless/02013_json_function_null_column.reference b/tests/queries/0_stateless/02013_json_function_null_column.reference
new file mode 100644
index 00000000000..a4ed0f4d844
--- /dev/null
+++ b/tests/queries/0_stateless/02013_json_function_null_column.reference
@@ -0,0 +1,22 @@
+\N	Nullable(String)
+	String
+\N	Nullable(String)
+	Nullable(String)
+\N	Nullable(Nothing)
+\N	Nullable(Nothing)
+b
+\N
+
+
+
+c
+1
+0
+1
+a
+1
+1
+1
+1
+a
+\N
diff --git a/tests/queries/0_stateless/02013_json_function_null_column.sql b/tests/queries/0_stateless/02013_json_function_null_column.sql
new file mode 100644
index 00000000000..ef5ea3e1320
--- /dev/null
+++ b/tests/queries/0_stateless/02013_json_function_null_column.sql
@@ -0,0 +1,25 @@
+-- Tags: no-fasttest
+
+SELECT JSONExtract('{"string_value":null}', 'string_value', 'Nullable(String)') as x, toTypeName(x);
+SELECT JSONExtract('{"string_value":null}', 'string_value', 'String') as x, toTypeName(x);
+SELECT JSONExtract(toNullable('{"string_value":null}'), 'string_value', 'Nullable(String)') as x, toTypeName(x);
+SELECT JSONExtract(toNullable('{"string_value":null}'), 'string_value', 'String') as x, toTypeName(x);
+SELECT JSONExtract(NULL, 'string_value', 'Nullable(String)') as x, toTypeName(x);
+SELECT JSONExtract(NULL, 'string_value', 'String') as x, toTypeName(x);
+SELECT JSONExtractString('["a", "b", "c", "d", "e"]', idx) FROM (SELECT arrayJoin([2, NULL, 2147483646, 65535, 65535, 3]) AS idx);
+
+SELECT JSONExtractInt('[1]', toNullable(1));
+SELECT JSONExtractBool('[1]', toNullable(1));
+SELECT JSONExtractFloat('[1]', toNullable(1));
+SELECT JSONExtractString('["a"]', toNullable(1));
+
+SELECT JSONExtractArrayRaw('["1"]', toNullable(1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT JSONExtractKeysAndValuesRaw('["1"]', toNullable(1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT JSONExtractKeysAndValues('["1"]', toNullable(1)); -- { serverError ILLEGAL_COLUMN }
+
+SELECT JSONExtract('[1]', toNullable(1), 'Nullable(Int)');
+SELECT JSONExtract('[1]', toNullable(1), 'Nullable(UInt8)');
+SELECT JSONExtract('[1]', toNullable(1), 'Nullable(Bool)');
+SELECT JSONExtract('[1]', toNullable(1), 'Nullable(Float)');
+SELECT JSONExtract('["a"]', toNullable(1), 'Nullable(String)');
+SELECT JSONExtract('["a"]', toNullable(1), 'Nullable(Int)');
diff --git a/tests/queries/0_stateless/02013_lc_nullable_and_infinity.reference b/tests/queries/0_stateless/02013_lc_nullable_and_infinity.reference
new file mode 100644
index 00000000000..ef5038b2236
--- /dev/null
+++ b/tests/queries/0_stateless/02013_lc_nullable_and_infinity.reference
@@ -0,0 +1,4 @@
+0	\N
+
+0	\N
+0	\N
diff --git a/tests/queries/0_stateless/02013_lc_nullable_and_infinity.sql b/tests/queries/0_stateless/02013_lc_nullable_and_infinity.sql
new file mode 100644
index 00000000000..c1c8a9c00b1
--- /dev/null
+++ b/tests/queries/0_stateless/02013_lc_nullable_and_infinity.sql
@@ -0,0 +1,3 @@
+set receive_timeout = '10', receive_data_timeout_ms = '10000', extremes = '1', allow_suspicious_low_cardinality_types = '1', force_primary_key = '1', join_use_nulls = '1', max_rows_to_read = '1', join_algorithm = 'partial_merge';
+
+SELECT * FROM (SELECT dummy AS val FROM system.one) AS s1 ANY LEFT JOIN (SELECT toLowCardinality(dummy) AS rval FROM system.one) AS s2 ON (val + 9223372036854775806) = (rval * 1);
diff --git a/tests/queries/0_stateless/02013_zlib_read_after_eof.go b/tests/queries/0_stateless/02013_zlib_read_after_eof.go
new file mode 100644
index 00000000000..a97a1438bdf
--- /dev/null
+++ b/tests/queries/0_stateless/02013_zlib_read_after_eof.go
@@ -0,0 +1,61 @@
+package main
+
+import (
+	"compress/gzip"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+)
+
+func compress(data io.Reader) io.Reader {
+	pr, pw := io.Pipe()
+	gw := gzip.NewWriter(pw)
+
+	go func() {
+		_, _ = io.Copy(gw, data)
+		gw.Close()
+		pw.Close()
+	}()
+
+	return pr
+}
+
+func main() {
+	database := os.Getenv("CLICKHOUSE_DATABASE")
+	p, err := url.Parse("http://localhost:8123/")
+	if err != nil {
+		panic(err)
+	}
+	q := p.Query()
+
+	q.Set("query", "INSERT INTO "+database+".graphite FORMAT RowBinary")
+	p.RawQuery = q.Encode()
+	queryUrl := p.String()
+
+	var req *http.Request
+
+	req, err = http.NewRequest("POST", queryUrl, compress(os.Stdin))
+	req.Header.Add("Content-Encoding", "gzip")
+
+	if err != nil {
+		panic(err)
+	}
+
+	client := &http.Client{
+		Transport: &http.Transport{DisableKeepAlives: true},
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		panic(err)
+	}
+	defer resp.Body.Close()
+
+	body, _ := ioutil.ReadAll(resp.Body)
+
+	if resp.StatusCode != 200 {
+		panic(fmt.Errorf("clickhouse response status %d: %s", resp.StatusCode, string(body)))
+	}
+}
diff --git a/tests/queries/0_stateless/02013_zlib_read_after_eof.reference b/tests/queries/0_stateless/02013_zlib_read_after_eof.reference
new file mode 100644
index 00000000000..5caff40c4a0
--- /dev/null
+++ b/tests/queries/0_stateless/02013_zlib_read_after_eof.reference
@@ -0,0 +1 @@
+10000
diff --git a/tests/queries/0_stateless/02013_zlib_read_after_eof.sh b/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
new file mode 100755
index 00000000000..a4a20fe5970
--- /dev/null
+++ b/tests/queries/0_stateless/02013_zlib_read_after_eof.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: depends on Go
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+DATA_FILE=$CUR_DIR/data_zlib/02013_zlib_read_after_eof_data
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS graphite;"
+
+$CLICKHOUSE_CLIENT -q "CREATE TABLE graphite(\`Path\` String, \`Value\` Float64, \`Time\` UInt32, \`Date\` Date, \`Timestamp\` UInt32) \
+    ENGINE = MergeTree PARTITION BY toYYYYMM(Date) ORDER BY (Path, Time) SETTINGS index_granularity = 8192;"
+
+cat "$DATA_FILE" | go run $CUR_DIR/02013_zlib_read_after_eof.go
+
+$CLICKHOUSE_CLIENT -q "SELECT count() FROM graphite;"
+
+$CLICKHOUSE_CLIENT -q "drop table graphite;"
diff --git a/tests/queries/0_stateless/02014_dict_get_nullable_key.reference b/tests/queries/0_stateless/02014_dict_get_nullable_key.reference
new file mode 100644
index 00000000000..08127d35829
--- /dev/null
+++ b/tests/queries/0_stateless/02014_dict_get_nullable_key.reference
@@ -0,0 +1,13 @@
+Non nullable value only null key 
+\N
+Non nullable value nullable key
+Test
+\N
+
+Nullable value only null key 
+\N
+Nullable value nullable key
+Test
+\N
+\N
+\N
diff --git a/tests/queries/0_stateless/02014_dict_get_nullable_key.sql b/tests/queries/0_stateless/02014_dict_get_nullable_key.sql
new file mode 100644
index 00000000000..d6c058b285f
--- /dev/null
+++ b/tests/queries/0_stateless/02014_dict_get_nullable_key.sql
@@ -0,0 +1,29 @@
+DROP TABLE IF EXISTS dictionary_non_nullable_source_table;
+CREATE TABLE dictionary_non_nullable_source_table (id UInt64, value String) ENGINE=TinyLog;
+INSERT INTO dictionary_non_nullable_source_table VALUES (0, 'Test');
+
+DROP DICTIONARY IF EXISTS test_dictionary_non_nullable;
+CREATE DICTIONARY test_dictionary_non_nullable (id UInt64, value String) PRIMARY KEY id LAYOUT(DIRECT()) SOURCE(CLICKHOUSE(TABLE 'dictionary_non_nullable_source_table'));
+
+SELECT 'Non nullable value only null key ';
+SELECT dictGet('test_dictionary_non_nullable', 'value', NULL);
+SELECT 'Non nullable value nullable key';
+SELECT dictGet('test_dictionary_non_nullable', 'value', arrayJoin([toUInt64(0), NULL, 1]));
+
+DROP DICTIONARY test_dictionary_non_nullable;
+DROP TABLE dictionary_non_nullable_source_table;
+
+DROP TABLE IF EXISTS dictionary_nullable_source_table;
+CREATE TABLE dictionary_nullable_source_table (id UInt64, value Nullable(String)) ENGINE=TinyLog;
+INSERT INTO dictionary_nullable_source_table VALUES (0, 'Test'), (1, NULL);
+
+DROP DICTIONARY IF EXISTS test_dictionary_nullable;
+CREATE DICTIONARY test_dictionary_nullable (id UInt64, value Nullable(String)) PRIMARY KEY id LAYOUT(DIRECT()) SOURCE(CLICKHOUSE(TABLE 'dictionary_nullable_source_table'));
+
+SELECT 'Nullable value only null key ';
+SELECT dictGet('test_dictionary_nullable', 'value', NULL);
+SELECT 'Nullable value nullable key';
+SELECT dictGet('test_dictionary_nullable', 'value', arrayJoin([toUInt64(0), NULL, 1, 2]));
+
+DROP DICTIONARY test_dictionary_nullable;
+DROP TABLE dictionary_nullable_source_table;
diff --git a/tests/queries/0_stateless/02014_map_different_keys.reference b/tests/queries/0_stateless/02014_map_different_keys.reference
new file mode 100644
index 00000000000..8af8f57f9df
--- /dev/null
+++ b/tests/queries/0_stateless/02014_map_different_keys.reference
@@ -0,0 +1,22 @@
+...const maps...
+0
+2
+0
+4
+0
+0
+2
+0
+4
+0
+4
+4
+...int keys...
+foo	bar	bar
+	foo	foo
+...string keys...
+foo	foo
+foo	foo
+foo	foo
+bar	bar
+0
diff --git a/tests/queries/0_stateless/02014_map_different_keys.sql b/tests/queries/0_stateless/02014_map_different_keys.sql
new file mode 100644
index 00000000000..0998a9283f7
--- /dev/null
+++ b/tests/queries/0_stateless/02014_map_different_keys.sql
@@ -0,0 +1,32 @@
+SELECT '...const maps...';
+
+WITH map(1, 2, 3, 4) AS m SELECT m[number] FROM numbers(5);
+WITH map('1', 2, '3', 4) AS m SELECT m[toString(number)] FROM numbers(5);
+
+WITH map(1, 2, 3, 4) AS m SELECT m[3];
+WITH map('1', 2, '3', 4) AS m SELECT m['3'];
+
+DROP TABLE IF EXISTS t_map_02014;
+
+CREATE TABLE t_map_02014(i1 UInt64, i2 Int32, m1 Map(UInt32, String), m2 Map(Int8, String), m3 Map(Int128, String)) ENGINE = Memory;
+INSERT INTO t_map_02014 VALUES (1, -1, map(1, 'foo', 2, 'bar'), map(-1, 'foo', 1, 'bar'), map(-1, 'foo', 1, 'bar'));
+
+SELECT '...int keys...';
+
+SELECT m1[i1], m2[i1], m3[i1] FROM t_map_02014;
+SELECT m1[i2], m2[i2], m3[i2] FROM t_map_02014;
+
+DROP TABLE IF EXISTS t_map_02014;
+
+CREATE TABLE t_map_02014(s String, fs FixedString(3), m1 Map(String, String), m2 Map(FixedString(3), String)) ENGINE = Memory;
+INSERT INTO t_map_02014 VALUES ('aaa', 'bbb', map('aaa', 'foo', 'bbb', 'bar'), map('aaa', 'foo', 'bbb', 'bar'));
+
+SELECT '...string keys...';
+
+SELECT m1['aaa'], m2['aaa'] FROM t_map_02014;
+SELECT m1['aaa'::FixedString(3)], m2['aaa'::FixedString(3)] FROM t_map_02014;
+SELECT m1[s], m2[s] FROM t_map_02014;
+SELECT m1[fs], m2[fs] FROM t_map_02014;
+SELECT length(m2['aaa'::FixedString(4)]) FROM t_map_02014;
+
+DROP TABLE IF EXISTS t_map_02014;
diff --git a/tests/queries/0_stateless/02014_storage_merge_order_by.reference b/tests/queries/0_stateless/02014_storage_merge_order_by.reference
new file mode 100644
index 00000000000..0bb816b3987
--- /dev/null
+++ b/tests/queries/0_stateless/02014_storage_merge_order_by.reference
@@ -0,0 +1,5 @@
+20
+20
+20
+20
+20
diff --git a/tests/queries/0_stateless/02014_storage_merge_order_by.sql b/tests/queries/0_stateless/02014_storage_merge_order_by.sql
new file mode 100644
index 00000000000..5b9789ae1d9
--- /dev/null
+++ b/tests/queries/0_stateless/02014_storage_merge_order_by.sql
@@ -0,0 +1,22 @@
+DROP TABLE IF EXISTS short;
+DROP TABLE IF EXISTS long;
+DROP TABLE IF EXISTS merged;
+
+CREATE TABLE short (e Int64, t DateTime ) ENGINE = MergeTree PARTITION BY e ORDER BY t;
+CREATE TABLE long (e Int64, t DateTime ) ENGINE = MergeTree PARTITION BY (e, toStartOfMonth(t)) ORDER BY t;
+
+insert into short select number % 11, toDateTime('2021-01-01 00:00:00') + number from numbers(1000);
+insert into long select number % 11, toDateTime('2021-01-01 00:00:00') + number from numbers(1000);
+
+CREATE TABLE merged as short ENGINE = Merge(currentDatabase(), 'short|long');
+
+select sum(e) from (select * from merged order by t limit 10) SETTINGS optimize_read_in_order = 0;
+
+select sum(e) from (select * from merged order by t limit 10) SETTINGS max_threads = 1;
+select sum(e) from (select * from merged order by t limit 10) SETTINGS max_threads = 3;
+select sum(e) from (select * from merged order by t limit 10) SETTINGS max_threads = 10;
+select sum(e) from (select * from merged order by t limit 10) SETTINGS max_threads = 50;
+
+DROP TABLE IF EXISTS short;
+DROP TABLE IF EXISTS long;
+DROP TABLE IF EXISTS merged;
diff --git a/tests/queries/0_stateless/02015_async_inserts_1.reference b/tests/queries/0_stateless/02015_async_inserts_1.reference
new file mode 100644
index 00000000000..85305b34657
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_1.reference
@@ -0,0 +1,12 @@
+1	a
+2	b
+3	c
+4	d
+5	e
+6	f
+7	g
+8	h
+9	i
+10	j
+11	k
+12	l
diff --git a/tests/queries/0_stateless/02015_async_inserts_1.sh b/tests/queries/0_stateless/02015_async_inserts_1.sh
new file mode 100755
index 00000000000..b4310f5101c
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_1.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,"a"
+2,"b"' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+3,"c"
+4,"d"
+' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}' &
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 7, "s": "g"} {"id": 8, "s": "h"}' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSVWithNames
+"id","s"
+9,"i"
+10,"j"' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSVWithNames
+"id","s"
+11,"k"
+12,"l"
+' &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_2.reference b/tests/queries/0_stateless/02015_async_inserts_2.reference
new file mode 100644
index 00000000000..d5b35a8f8af
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_2.reference
@@ -0,0 +1,6 @@
+Code: 27
+1	a
+2	b
+3	d
+4	c
+all_1_1_0	4	0
diff --git a/tests/queries/0_stateless/02015_async_inserts_2.sh b/tests/queries/0_stateless/02015_async_inserts_2.sh
new file mode 100755
index 00000000000..90f5584d84e
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_2.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,"a"
+2,"b"' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+qqqqqqqqqqq' 2>&1 | grep -o "Code: 27" &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+4,"c"
+3,"d"' &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+${CLICKHOUSE_CLIENT} -q "SELECT name, rows, level FROM system.parts WHERE table = 'async_inserts' AND database = '$CLICKHOUSE_DATABASE' ORDER BY name"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_3.reference b/tests/queries/0_stateless/02015_async_inserts_3.reference
new file mode 100644
index 00000000000..4c5b75aff3e
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_3.reference
@@ -0,0 +1,8 @@
+1	1
+2	4
+3	9
+4	16
+5	25
+6	36
+7	49
+8	64
diff --git a/tests/queries/0_stateless/02015_async_inserts_3.sh b/tests/queries/0_stateless/02015_async_inserts_3.sh
new file mode 100755
index 00000000000..9d85d81caac
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_3.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, v UInt32 DEFAULT id * id) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,
+2,' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+3,
+4,
+' &
+
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5} {"id": 6}' &
+${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 7} {"id": 8}' &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_4.reference b/tests/queries/0_stateless/02015_async_inserts_4.reference
new file mode 100644
index 00000000000..d169dbeba50
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_4.reference
@@ -0,0 +1,3 @@
+Not enough privileges
+1	a
+2	b
diff --git a/tests/queries/0_stateless/02015_async_inserts_4.sh b/tests/queries/0_stateless/02015_async_inserts_4.sh
new file mode 100755
index 00000000000..65598923b96
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_4.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02015_allowed"
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS u_02015_denied"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS role_02015"
+
+${CLICKHOUSE_CLIENT} -q "CREATE ROLE role_02015"
+${CLICKHOUSE_CLIENT} -q "CREATE USER u_02015_allowed";
+${CLICKHOUSE_CLIENT} -q "CREATE USER u_02015_denied";
+
+${CLICKHOUSE_CLIENT} -q "REVOKE ALL ON *.* FROM u_02015_allowed"
+${CLICKHOUSE_CLIENT} -q "REVOKE ALL ON *.* FROM u_02015_denied"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "GRANT INSERT ON async_inserts TO role_02015"
+${CLICKHOUSE_CLIENT} -q "GRANT role_02015 to u_02015_allowed"
+
+${CLICKHOUSE_CURL} -sS "$url&user=u_02015_denied" \
+    -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 1, "s": "a"} {"id": 2, "s": "b"}' \
+    | grep -o "Not enough privileges"
+
+${CLICKHOUSE_CURL} -sS "$url&user=u_02015_allowed" \
+    -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 1, "s": "a"} {"id": 2, "s": "b"}'
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
+${CLICKHOUSE_CLIENT} -q "DROP USER u_02015_allowed"
+${CLICKHOUSE_CLIENT} -q "DROP USER u_02015_denied"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE role_02015"
diff --git a/tests/queries/0_stateless/02015_async_inserts_5.reference b/tests/queries/0_stateless/02015_async_inserts_5.reference
new file mode 100644
index 00000000000..0ba3573ae14
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_5.reference
@@ -0,0 +1,3 @@
+Too many parts
+Too many parts
+Too many parts
diff --git a/tests/queries/0_stateless/02015_async_inserts_5.sh b/tests/queries/0_stateless/02015_async_inserts_5.sh
new file mode 100755
index 00000000000..05ea876b101
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_5.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id SETTINGS parts_to_throw_insert = 1"
+${CLICKHOUSE_CLIENT} -q "SYSTEM STOP MERGES $CLICKHOUSE_DATABASE.async_inserts"
+
+${CLICKHOUSE_CLIENT} -q "INSERT INTO async_inserts VALUES (1, 's')"
+
+for _ in {1..3}; do
+    ${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 2, "s": "a"} {"id": 3, "s": "b"}' \
+        | grep -o "Too many parts" &
+done
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_6.reference b/tests/queries/0_stateless/02015_async_inserts_6.reference
new file mode 100644
index 00000000000..f3a80cd0cdf
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_6.reference
@@ -0,0 +1,4 @@
+Code: 60
+Code: 73
+Code: 73
+Code: 16
diff --git a/tests/queries/0_stateless/02015_async_inserts_6.sh b/tests/queries/0_stateless/02015_async_inserts_6.sh
new file mode 100755
index 00000000000..94091783081
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_6.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts1 FORMAT JSONEachRow {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 60"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts FORMAT BadFormat {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 73"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts FORMAT Pretty {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 73"
+
+${CLICKHOUSE_CURL} -sS $url -d 'INSERT INTO async_inserts (id, a) FORMAT JSONEachRow {"id": 1, "s": "a"}'  \
+    | grep -o "Code: 16"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_7.reference b/tests/queries/0_stateless/02015_async_inserts_7.reference
new file mode 100644
index 00000000000..8816e320ee8
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_7.reference
@@ -0,0 +1,6 @@
+1	a
+2	b
+3	c
+4	d
+5	e
+6	f
diff --git a/tests/queries/0_stateless/02015_async_inserts_7.sh b/tests/queries/0_stateless/02015_async_inserts_7.sh
new file mode 100755
index 00000000000..c8cbbc48a29
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_7.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = Memory"
+
+${CLICKHOUSE_CURL} -sS $url -d "INSERT INTO async_inserts VALUES (1, 'a') (2, 'b')" &
+${CLICKHOUSE_CURL} -sS $url -d "INSERT INTO async_inserts VALUES (3, 'c'), (4, 'd')" &
+${CLICKHOUSE_CURL} -sS $url -d "INSERT INTO async_inserts VALUES (5, 'e'), (6, 'f'), " &
+
+wait
+
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts ORDER BY id"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE async_inserts"
diff --git a/tests/queries/0_stateless/02015_async_inserts_stress_long.reference b/tests/queries/0_stateless/02015_async_inserts_stress_long.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_stress_long.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02015_async_inserts_stress_long.sh b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
new file mode 100755
index 00000000000..f9a58818404
--- /dev/null
+++ b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+set -e
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function insert1()
+{
+    url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
+    while true; do
+        ${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
+1,"a"
+2,"b"
+'
+    done
+}
+
+function insert2()
+{
+    url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
+    while true; do
+        ${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}'
+    done
+}
+
+function select1()
+{
+    while true; do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts FORMAT Null"
+    done
+}
+
+function select2()
+{
+    while true; do
+        ${CLICKHOUSE_CLIENT} -q "SELECT * FROM system.asynchronous_inserts FORMAT Null"
+    done
+}
+
+function truncate1()
+{
+    while true; do
+        sleep 0.1
+        ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE async_inserts"
+    done
+}
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
+${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
+
+TIMEOUT=10
+
+export -f insert1
+export -f insert2
+export -f select1
+export -f select2
+export -f truncate1
+
+for _ in {1..5}; do
+    timeout $TIMEOUT bash -c insert1 &
+    timeout $TIMEOUT bash -c insert2 &
+done
+
+timeout $TIMEOUT bash -c select1 &
+timeout $TIMEOUT bash -c select2 &
+timeout $TIMEOUT bash -c truncate1 &
+
+wait
+echo "OK"
+
+${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts";
diff --git a/tests/queries/0_stateless/02015_column_default_dict_get_identifier.reference b/tests/queries/0_stateless/02015_column_default_dict_get_identifier.reference
new file mode 100644
index 00000000000..29e04d559e1
--- /dev/null
+++ b/tests/queries/0_stateless/02015_column_default_dict_get_identifier.reference
@@ -0,0 +1 @@
+5	0
diff --git a/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql b/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql
new file mode 100644
index 00000000000..f0ddb825abc
--- /dev/null
+++ b/tests/queries/0_stateless/02015_column_default_dict_get_identifier.sql
@@ -0,0 +1,44 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS 02015_db;
+CREATE DATABASE 02015_db;
+
+DROP TABLE IF EXISTS 02015_db.test_table;
+CREATE TABLE 02015_db.test_table
+(
+    key_column UInt64,
+    data_column_1 UInt64,
+    data_column_2 UInt8
+)
+ENGINE = MergeTree
+ORDER BY key_column;
+
+INSERT INTO 02015_db.test_table VALUES (0, 0, 0);
+
+DROP DICTIONARY IF EXISTS 02015_db.test_dictionary;
+CREATE DICTIONARY 02015_db.test_dictionary
+(
+    key_column UInt64 DEFAULT 0,
+    data_column_1 UInt64 DEFAULT 1,
+    data_column_2 UInt8 DEFAULT 1
+)
+PRIMARY KEY key_column
+LAYOUT(DIRECT())
+SOURCE(CLICKHOUSE(DB '02015_db' TABLE 'test_table'));
+
+DROP TABLE IF EXISTS 02015_db.test_table_default;
+CREATE TABLE 02015_db.test_table_default
+(
+    data_1 DEFAULT dictGetUInt64('02015_db.test_dictionary', 'data_column_1', toUInt64(0)),
+    data_2 DEFAULT dictGet(02015_db.test_dictionary, 'data_column_2', toUInt64(0))
+)
+ENGINE=TinyLog;
+
+INSERT INTO 02015_db.test_table_default(data_1) VALUES (5);
+SELECT * FROM 02015_db.test_table_default;
+
+DROP DICTIONARY 02015_db.test_dictionary;
+DROP TABLE 02015_db.test_table;
+DROP TABLE 02015_db.test_table_default;
+
+DROP DATABASE 02015_db;
diff --git a/tests/queries/0_stateless/02015_division_by_nullable.reference b/tests/queries/0_stateless/02015_division_by_nullable.reference
new file mode 100644
index 00000000000..d85e2a48b71
--- /dev/null
+++ b/tests/queries/0_stateless/02015_division_by_nullable.reference
@@ -0,0 +1,80 @@
+\N
+\N
+\N
+\N
+1
+1
+1
+1
+\N
+\N
+\N
+\N
+1
+1
+1
+1
+\N
+\N
+\N
+\N
+1
+1
+1
+1
+\N
+\N
+\N
+\N
+1
+1
+1
+1
+\N
+\N
+\N
+\N
+0
+0
+0
+0
+\N
+\N
+\N
+\N
+1
+1
+1
+1
+\N
+\N
+\N
+\N
+0
+0
+0
+0
+1
+\N
+0
+0
+\N
+0
+1
+\N
+0
+1
+\N
+0
+1
+\N
+0
+1
+\N
+0
+1
+\N
+0
+1
+\N
+0
diff --git a/tests/queries/0_stateless/02015_division_by_nullable.sql b/tests/queries/0_stateless/02015_division_by_nullable.sql
new file mode 100644
index 00000000000..16a01061070
--- /dev/null
+++ b/tests/queries/0_stateless/02015_division_by_nullable.sql
@@ -0,0 +1,101 @@
+SELECT 1 / CAST(NULL, 'Nullable(Decimal(7, 2))');
+SELECT materialize(1) / CAST(NULL, 'Nullable(Decimal(7, 2))');
+SELECT 1 / CAST(materialize(NULL), 'Nullable(Decimal(7, 2))');
+SELECT materialize(1) / CAST(materialize(NULL), 'Nullable(Decimal(7, 2))');
+
+
+SELECT 1 / CAST(1, 'Nullable(Decimal(7, 2))');
+SELECT materialize(1) / CAST(1, 'Nullable(Decimal(7, 2))');
+SELECT 1 / CAST(materialize(1), 'Nullable(Decimal(7, 2))');
+SELECT materialize(1) / CAST(materialize(1), 'Nullable(Decimal(7, 2))');
+
+
+SELECT intDiv(1, CAST(NULL, 'Nullable(Decimal(7, 2))'));
+SELECT intDiv(materialize(1), CAST(NULL, 'Nullable(Decimal(7, 2))'));
+SELECT intDiv(1, CAST(materialize(NULL), 'Nullable(Decimal(7, 2))'));
+SELECT intDiv(materialize(1), CAST(materialize(NULL), 'Nullable(Decimal(7, 2))'));
+
+
+SELECT intDiv(1, CAST(1, 'Nullable(Decimal(7, 2))'));
+SELECT intDiv(materialize(1), CAST(1, 'Nullable(Decimal(7, 2))'));
+SELECT intDiv(1, CAST(materialize(1), 'Nullable(Decimal(7, 2))'));
+SELECT intDiv(materialize(1), CAST(materialize(1), 'Nullable(Decimal(7, 2))'));
+
+
+SELECT toDecimal32(1, 2) / CAST(NULL, 'Nullable(UInt32)');
+SELECT materialize(toDecimal32(1, 2)) / CAST(NULL, 'Nullable(UInt32)');
+SELECT toDecimal32(1, 2) / CAST(materialize(NULL), 'Nullable(UInt32)');
+SELECT materialize(toDecimal32(1, 2)) / CAST(materialize(NULL), 'Nullable(UInt32)');
+
+
+SELECT toDecimal32(1, 2) / CAST(1, 'Nullable(UInt32)');
+SELECT materialize(toDecimal32(1, 2)) / CAST(1, 'Nullable(UInt32)');
+SELECT toDecimal32(1, 2) / CAST(materialize(1), 'Nullable(UInt32)');
+SELECT materialize(toDecimal32(1, 2)) / CAST(materialize(1), 'Nullable(UInt32)');
+
+
+SELECT intDiv(1, CAST(NULL, 'Nullable(UInt32)'));
+SELECT intDiv(materialize(1), CAST(NULL, 'Nullable(UInt32)'));
+SELECT intDiv(1, CAST(materialize(NULL), 'Nullable(UInt32)'));
+SELECT intDiv(materialize(1), CAST(materialize(NULL), 'Nullable(UInt32)'));
+
+
+SELECT intDiv(1, CAST(1, 'Nullable(UInt32)'));
+SELECT intDiv(materialize(1), CAST(1, 'Nullable(UInt32)'));
+SELECT intDiv(1, CAST(materialize(1), 'Nullable(UInt32)'));
+SELECT intDiv(materialize(1), CAST(materialize(1), 'Nullable(UInt32)'));
+
+
+SELECT 1 % CAST(NULL, 'Nullable(UInt32)');
+SELECT materialize(1) % CAST(NULL, 'Nullable(UInt32)');
+SELECT 1 % CAST(materialize(NULL), 'Nullable(UInt32)');
+SELECT materialize(1) % CAST(materialize(NULL), 'Nullable(UInt32)');
+
+
+SELECT 1 % CAST(1, 'Nullable(UInt32)');
+SELECT materialize(1) % CAST(1, 'Nullable(UInt32)');
+SELECT 1 % CAST(materialize(1), 'Nullable(UInt32)');
+SELECT materialize(1) % CAST(materialize(1), 'Nullable(UInt32)');
+
+
+SELECT intDiv(1, CAST(NULL, 'Nullable(Float32)'));
+SELECT intDiv(materialize(1), CAST(NULL, 'Nullable(Float32)'));
+SELECT intDiv(1, CAST(materialize(NULL), 'Nullable(Float32)'));
+SELECT intDiv(materialize(1), CAST(materialize(NULL), 'Nullable(Float32)'));
+
+
+SELECT intDiv(1, CAST(1, 'Nullable(Float32)'));
+SELECT intDiv(materialize(1), CAST(1, 'Nullable(Float32)'));
+SELECT intDiv(1, CAST(materialize(1), 'Nullable(Float32)'));
+SELECT intDiv(materialize(1), CAST(materialize(1), 'Nullable(Float32)'));
+
+
+SELECT 1 % CAST(NULL, 'Nullable(Float32)');
+SELECT materialize(1) % CAST(NULL, 'Nullable(Float32)');
+SELECT 1 % CAST(materialize(NULL), 'Nullable(Float32)');
+SELECT materialize(1) % CAST(materialize(NULL), 'Nullable(Float32)');
+
+
+SELECT 1 % CAST(1, 'Nullable(Float32)');
+SELECT materialize(1) % CAST(1, 'Nullable(Float32)');
+SELECT 1 % CAST(materialize(1), 'Nullable(Float32)');
+SELECT materialize(1) % CAST(materialize(1), 'Nullable(Float32)');
+
+
+DROP TABLE IF EXISTS nullable_division;
+CREATE TABLE nullable_division (x UInt32, y Nullable(UInt32), a Decimal(7, 2), b Nullable(Decimal(7, 2))) ENGINE=MergeTree() order by x;
+INSERT INTO nullable_division VALUES (1, 1, 1, 1), (1, NULL, 1, NULL), (1, 0, 1, 0);
+
+SELECT if(y = 0, 0, intDiv(x, y)) from nullable_division;
+SELECT if(y = 0, 0, x % y) from nullable_division;
+
+SELECT if(y = 0, 0, intDiv(a, y)) from nullable_division;
+SELECT if(y = 0, 0, a / y) from nullable_division;
+
+SELECT if(b = 0, 0, intDiv(a, b)) from nullable_division;
+SELECT if(b = 0, 0, a / b) from nullable_division;
+
+SELECT if(b = 0, 0, intDiv(x, b)) from nullable_division;
+SELECT if(b = 0, 0, x / b) from nullable_division;
+
+DROP TABLE nullable_division;
diff --git a/tests/queries/0_stateless/02015_executable_user_defined_functions.reference b/tests/queries/0_stateless/02015_executable_user_defined_functions.reference
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/tests/queries/0_stateless/02015_executable_user_defined_functions.reference
@@ -0,0 +1 @@
+4
diff --git a/tests/queries/0_stateless/02015_executable_user_defined_functions.sql b/tests/queries/0_stateless/02015_executable_user_defined_functions.sql
new file mode 100644
index 00000000000..68848f49cfc
--- /dev/null
+++ b/tests/queries/0_stateless/02015_executable_user_defined_functions.sql
@@ -0,0 +1 @@
+SELECT test_function(toUInt64(2), toUInt64(2));
diff --git a/tests/queries/0_stateless/02015_global_in_threads.reference b/tests/queries/0_stateless/02015_global_in_threads.reference
new file mode 100644
index 00000000000..af81158ecae
--- /dev/null
+++ b/tests/queries/0_stateless/02015_global_in_threads.reference
@@ -0,0 +1,2 @@
+10
+1
diff --git a/tests/queries/0_stateless/02015_global_in_threads.sh b/tests/queries/0_stateless/02015_global_in_threads.sh
new file mode 100755
index 00000000000..c112e47fe92
--- /dev/null
+++ b/tests/queries/0_stateless/02015_global_in_threads.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --log_queries=1 --max_threads=32 --query_id "2015_${CLICKHOUSE_DATABASE}_query" -q "select count() from remote('127.0.0.{2,3}', numbers(10)) where number global in (select number % 5 from numbers_mt(1000000))"
+${CLICKHOUSE_CLIENT} -q "system flush logs"
+${CLICKHOUSE_CLIENT} -q "select length(thread_ids) >= 32 from system.query_log where event_date = today() and query_id = '2015_${CLICKHOUSE_DATABASE}_query' and type = 'QueryFinish' and current_database = currentDatabase()"
diff --git a/tests/queries/0_stateless/02015_order_by_with_fill_misoptimization.reference b/tests/queries/0_stateless/02015_order_by_with_fill_misoptimization.reference
new file mode 100644
index 00000000000..07258cd829a
--- /dev/null
+++ b/tests/queries/0_stateless/02015_order_by_with_fill_misoptimization.reference
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+Hello
diff --git a/tests/queries/0_stateless/02015_order_by_with_fill_misoptimization.sql b/tests/queries/0_stateless/02015_order_by_with_fill_misoptimization.sql
new file mode 100644
index 00000000000..f0d90f151b2
--- /dev/null
+++ b/tests/queries/0_stateless/02015_order_by_with_fill_misoptimization.sql
@@ -0,0 +1 @@
+SELECT s FROM (SELECT 5 AS x, 'Hello' AS s ORDER BY x WITH FILL FROM 1 TO 10) ORDER BY s;
diff --git a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.reference b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
new file mode 100755
index 00000000000..256297e253e
--- /dev/null
+++ b/tests/queries/0_stateless/02015_shard_crash_clang_12_build.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Tags: shard
+
+# This test reproduces crash in case of insufficient coroutines stack size
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS local"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS distributed"
+
+$CLICKHOUSE_CLIENT --query "CREATE TABLE local (x UInt8) ENGINE = Memory;"
+$CLICKHOUSE_CLIENT --query "CREATE TABLE distributed AS local ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), local, x);"
+
+$CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "INSERT INTO distributed SELECT number FROM numbers(256);"
+$CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SYSTEM FLUSH DISTRIBUTED distributed;"
+
+function select_thread()
+{
+    while true; do
+        $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM local" >/dev/null
+        $CLICKHOUSE_CLIENT --insert_distributed_sync=0 --network_compression_method='zstd' --query "SELECT count() FROM distributed" >/dev/null
+    done
+}
+
+export -f select_thread;
+
+TIMEOUT=30
+
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+timeout $TIMEOUT bash -c select_thread 2> /dev/null &
+
+wait
+
+$CLICKHOUSE_CLIENT --query "SELECT 1"
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS local"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS distributed"
diff --git a/tests/queries/0_stateless/02016_agg_empty_result_bug_28880.reference b/tests/queries/0_stateless/02016_agg_empty_result_bug_28880.reference
new file mode 100644
index 00000000000..9edaf84f295
--- /dev/null
+++ b/tests/queries/0_stateless/02016_agg_empty_result_bug_28880.reference
@@ -0,0 +1,5 @@
+0
+0
+0
+0
+\N
diff --git a/tests/queries/0_stateless/02016_agg_empty_result_bug_28880.sql b/tests/queries/0_stateless/02016_agg_empty_result_bug_28880.sql
new file mode 100644
index 00000000000..005358eb425
--- /dev/null
+++ b/tests/queries/0_stateless/02016_agg_empty_result_bug_28880.sql
@@ -0,0 +1,10 @@
+SELECT count() AS cnt WHERE 0 HAVING cnt = 0;
+
+select cnt from (select count() cnt where 0) where cnt = 0;
+
+select cnt from (select count() cnt from system.one where 0) where cnt = 0;
+
+select sum from (select sum(dummy) sum from system.one where 0) where sum = 0;
+
+set aggregate_functions_null_for_empty=1;
+select sum from (select sum(dummy) sum from system.one where 0) where sum is null;
diff --git a/tests/queries/0_stateless/02016_aggregation_spark_bar.reference b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
new file mode 100644
index 00000000000..cc6cc81037b
--- /dev/null
+++ b/tests/queries/0_stateless/02016_aggregation_spark_bar.reference
@@ -0,0 +1,24 @@
+▁
+▁█
+▃█▁
+▄▅█▁
+▄▄█▇▁
+▃▄▅█▃▁
+▂▅▃▇█▁▂
+▂▅▃▅██ ▁
+▁▅▄▃██▅ ▁
+▁▄▄▂▅▇█▂ ▂
+▁▄▅▂▃▇▆█  ▂
+
+
+
+▁
+▆█▁▃
+▅▁▂█▇
+▁▂▇▆█  ▁
+▁█
+▁█
+▁▁█
+▁▁█
+▁▃▅█
+▁▄▂▇█
diff --git a/tests/queries/0_stateless/02016_aggregation_spark_bar.sql b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
new file mode 100644
index 00000000000..90403332529
--- /dev/null
+++ b/tests/queries/0_stateless/02016_aggregation_spark_bar.sql
@@ -0,0 +1,35 @@
+DROP TABLE IF EXISTS spark_bar_test;
+
+CREATE TABLE spark_bar_test (`cnt` UInt64,`event_date` Date) ENGINE = MergeTree ORDER BY event_date SETTINGS index_granularity = 8192;
+
+INSERT INTO spark_bar_test VALUES(1,'2020-01-01'),(4,'2020-01-02'),(5,'2020-01-03'),(2,'2020-01-04'),(3,'2020-01-05'),(7,'2020-01-06'),(6,'2020-01-07'),(8,'2020-01-08'),(2,'2020-01-11');
+
+SELECT sparkbar(1)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(2)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(4)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(5)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(6)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(7)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(8)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(9)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(10)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11)(event_date,cnt) FROM spark_bar_test;
+
+SELECT sparkbar(11,2,5)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,3,7)(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,4,11)(event_date,cnt) FROM spark_bar_test;
+
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-02'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-02'),toDate('2020-01-05'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-03'),toDate('2020-01-07'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(11,toDate('2020-01-04'),toDate('2020-01-11'))(event_date,cnt) FROM spark_bar_test;
+
+SELECT sparkbar(2,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(2,toDate('2020-01-02'),toDate('2020-01-09'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-09'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(3,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(4,toDate('2020-01-01'),toDate('2020-01-08'))(event_date,cnt) FROM spark_bar_test;
+SELECT sparkbar(5,toDate('2020-01-01'),toDate('2020-01-10'))(event_date,cnt) FROM spark_bar_test;
+
+DROP TABLE IF EXISTS spark_bar_test;
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
new file mode 100644
index 00000000000..e6a2b2b6aaf
--- /dev/null
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
@@ -0,0 +1,339 @@
+String ConstConst
+1
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+2	Hello	0001001000011001010110110001101100011011
+3	Hello	0000100100001100101011011000110110001101
+4	Hello	0000010010000110010101101100011011000110
+5	Hello	0000001001000011001010110110001101100011
+6	Hello	0000000100100001100101011011000110110001
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+10	Hello	00010010000110010101101100011011
+11	Hello	00001001000011001010110110001101
+12	Hello	00000100100001100101011011000110
+13	Hello	00000010010000110010101101100011
+14	Hello	00000001001000011001010110110001
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+18	Hello	000100100001100101011011
+19	Hello	000010010000110010101101
+20	Hello	000001001000011001010110
+21	Hello	000000100100001100101011
+22	Hello	000000010010000110010101
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+26	Hello	0001001000011001
+27	Hello	0000100100001100
+28	Hello	0000010010000110
+29	Hello	0000001001000011
+30	Hello	0000000100100001
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+34	Hello	00010010
+35	Hello	00001001
+36	Hello	00000100
+37	Hello	00000010
+38	Hello	00000001
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+FixedString ConstConst
+1
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+2	Hello\0\0\0\0\0	00010010000110010101101100011011000110111100000000000000000000000000000000000000
+3	Hello\0\0\0\0\0	00001001000011001010110110001101100011011110000000000000000000000000000000000000
+4	Hello\0\0\0\0\0	00000100100001100101011011000110110001101111000000000000000000000000000000000000
+5	Hello\0\0\0\0\0	00000010010000110010101101100011011000110111100000000000000000000000000000000000
+6	Hello\0\0\0\0\0	00000001001000011001010110110001101100011011110000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+10	Hello\0\0\0\0\0	00000000000100100001100101011011000110110001101111000000000000000000000000000000
+11	Hello\0\0\0\0\0	00000000000010010000110010101101100011011000110111100000000000000000000000000000
+12	Hello\0\0\0\0\0	00000000000001001000011001010110110001101100011011110000000000000000000000000000
+13	Hello\0\0\0\0\0	00000000000000100100001100101011011000110110001101111000000000000000000000000000
+14	Hello\0\0\0\0\0	00000000000000010010000110010101101100011011000110111100000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+18	Hello\0\0\0\0\0	00000000000000000001001000011001010110110001101100011011110000000000000000000000
+19	Hello\0\0\0\0\0	00000000000000000000100100001100101011011000110110001101111000000000000000000000
+20	Hello\0\0\0\0\0	00000000000000000000010010000110010101101100011011000110111100000000000000000000
+21	Hello\0\0\0\0\0	00000000000000000000001001000011001010110110001101100011011110000000000000000000
+22	Hello\0\0\0\0\0	00000000000000000000000100100001100101011011000110110001101111000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+26	Hello\0\0\0\0\0	00000000000000000000000000010010000110010101101100011011000110111100000000000000
+27	Hello\0\0\0\0\0	00000000000000000000000000001001000011001010110110001101100011011110000000000000
+28	Hello\0\0\0\0\0	00000000000000000000000000000100100001100101011011000110110001101111000000000000
+29	Hello\0\0\0\0\0	00000000000000000000000000000010010000110010101101100011011000110111100000000000
+30	Hello\0\0\0\0\0	00000000000000000000000000000001001000011001010110110001101100011011110000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+34	Hello\0\0\0\0\0	00000000000000000000000000000000000100100001100101011011000110110001101111000000
+35	Hello\0\0\0\0\0	00000000000000000000000000000000000010010000110010101101100011011000110111100000
+36	Hello\0\0\0\0\0	00000000000000000000000000000000000001001000011001010110110001101100011011110000
+37	Hello\0\0\0\0\0	00000000000000000000000000000000000000100100001100101011011000110110001101111000
+38	Hello\0\0\0\0\0	00000000000000000000000000000000000000010010000110010101101100011011000110111100
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+77	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000010
+78	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000001
+79	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+80	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+81	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+
+FixedString VectorVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+
+String VectorConst
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hello	0000000010010000110010101101100011011000
+7	Hel	000000001001000011001010
+7	Hel	000000001001000011001010
+7	Hel	000000001001000011001010
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hello	01001000011001010110110001101100
+8	Hel	0100100001100101
+8	Hel	0100100001100101
+8	Hel	0100100001100101
+
+FixedString VectorConst
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+
+String ConstVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	0010010000110010101101100011011000110111
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+15	Hello	00000000100100001100101011011000
+16	Hello	010010000110010101101100
+17	Hello	001001000011001010110110
+23	Hello	000000001001000011001010
+24	Hello	0100100001100101
+25	Hello	0010010000110010
+31	Hello	0000000010010000
+32	Hello	01001000
+33	Hello	00100100
+39	Hello	00000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hello	0000000010010000110010101101100011011000
+8	Hello	01001000011001010110110001101100
+9	Hello	00100100001100101011011000110110
+-1	Hel	
+0	Hel	010010000110010101101100
+1	Hel	001001000011001010110110
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+15	Hel	0000000010010000
+16	Hel	01001000
+17	Hel	00100100
+23	Hel	00000000
+24	Hel	
+25	Hel	
+31	Hel	
+32	Hel	
+33	Hel	
+39	Hel	
+40	Hel	
+41	Hel	
+42	Hel	
+7	Hel	000000001001000011001010
+8	Hel	0100100001100101
+9	Hel	0010010000110010
+
+FixedString ConstVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+15	Hello\0\0\0\0\0	00000000000000001001000011001010110110001101100011011110000000000000000000000000
+16	Hello\0\0\0\0\0	00000000000000000100100001100101011011000110110001101111000000000000000000000000
+17	Hello\0\0\0\0\0	00000000000000000010010000110010101101100011011000110111100000000000000000000000
+23	Hello\0\0\0\0\0	00000000000000000000000010010000110010101101100011011000110111100000000000000000
+24	Hello\0\0\0\0\0	00000000000000000000000001001000011001010110110001101100011011110000000000000000
+25	Hello\0\0\0\0\0	00000000000000000000000000100100001100101011011000110110001101111000000000000000
+31	Hello\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000110110001101111000000000
+32	Hello\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100011011000110111100000000
+33	Hello\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110001101100011011110000000
+39	Hello\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110001101100011011110
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000110110001101111
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100011011000110111
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110001101100011011
+7	Hello\0\0\0\0\0	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+8	Hello\0\0\0\0\0	00000000010010000110010101101100011011000110111100000000000000000000000000000000
+9	Hello\0\0\0\0\0	00000000001001000011001010110110001101100011011110000000000000000000000000000000
+-1	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hel\0\0\0\0\0\0\0	01001000011001010110110000000000000000000000000000000000000000000000000000000000
+1	Hel\0\0\0\0\0\0\0	00100100001100101011011000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
+15	Hel\0\0\0\0\0\0\0	00000000000000001001000011001010110110000000000000000000000000000000000000000000
+16	Hel\0\0\0\0\0\0\0	00000000000000000100100001100101011011000000000000000000000000000000000000000000
+17	Hel\0\0\0\0\0\0\0	00000000000000000010010000110010101101100000000000000000000000000000000000000000
+23	Hel\0\0\0\0\0\0\0	00000000000000000000000010010000110010101101100000000000000000000000000000000000
+24	Hel\0\0\0\0\0\0\0	00000000000000000000000001001000011001010110110000000000000000000000000000000000
+25	Hel\0\0\0\0\0\0\0	00000000000000000000000000100100001100101011011000000000000000000000000000000000
+31	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000100100001100101011011000000000000000000000000000
+32	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000010010000110010101101100000000000000000000000000
+33	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000001001000011001010110110000000000000000000000000
+39	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000001001000011001010110110000000000000000000
+40	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000100100001100101011011000000000000000000
+41	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000010010000110010101101100000000000000000
+42	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000001001000011001010110110000000000000000
+7	Hel\0\0\0\0\0\0\0	00000000100100001100101011011000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	00000000010010000110010101101100000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	00000000001001000011001010110110000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
new file mode 100644
index 00000000000..0ee04e408ba
--- /dev/null
+++ b/tests/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
@@ -0,0 +1,134 @@
+SELECT 'String ConstConst';
+SELECT bin('Hello') == bin(bitShiftRight('Hello', 0));
+SELECT 0, 'Hello',bin(bitShiftRight('Hello', 0));
+SELECT 1, 'Hello',bin(bitShiftRight('Hello', 1));
+SELECT 2, 'Hello',bin(bitShiftRight('Hello', 2));
+SELECT 3, 'Hello',bin(bitShiftRight('Hello', 3));
+SELECT 4, 'Hello',bin(bitShiftRight('Hello', 4));
+SELECT 5, 'Hello',bin(bitShiftRight('Hello', 5));
+SELECT 6, 'Hello',bin(bitShiftRight('Hello', 6));
+SELECT 7, 'Hello',bin(bitShiftRight('Hello', 7));
+SELECT 8, 'Hello',bin(bitShiftRight('Hello', 8));
+SELECT 9, 'Hello',bin(bitShiftRight('Hello', 9));
+SELECT 10,'Hello',bin(bitShiftRight('Hello', 10));
+SELECT 11,'Hello',bin(bitShiftRight('Hello', 11));
+SELECT 12,'Hello',bin(bitShiftRight('Hello', 12));
+SELECT 13,'Hello',bin(bitShiftRight('Hello', 13));
+SELECT 14,'Hello',bin(bitShiftRight('Hello', 14));
+SELECT 15,'Hello',bin(bitShiftRight('Hello', 15));
+SELECT 16,'Hello',bin(bitShiftRight('Hello', 16));
+SELECT 17,'Hello',bin(bitShiftRight('Hello', 17));
+SELECT 18,'Hello',bin(bitShiftRight('Hello', 18));
+SELECT 19,'Hello',bin(bitShiftRight('Hello', 19));
+SELECT 20,'Hello',bin(bitShiftRight('Hello', 20));
+SELECT 21,'Hello',bin(bitShiftRight('Hello', 21));
+SELECT 22,'Hello',bin(bitShiftRight('Hello', 22));
+SELECT 23,'Hello',bin(bitShiftRight('Hello', 23));
+SELECT 24,'Hello',bin(bitShiftRight('Hello', 24));
+SELECT 25,'Hello',bin(bitShiftRight('Hello', 25));
+SELECT 26,'Hello',bin(bitShiftRight('Hello', 26));
+SELECT 27,'Hello',bin(bitShiftRight('Hello', 27));
+SELECT 28,'Hello',bin(bitShiftRight('Hello', 28));
+SELECT 29,'Hello',bin(bitShiftRight('Hello', 29));
+SELECT 30,'Hello',bin(bitShiftRight('Hello', 30));
+SELECT 31,'Hello',bin(bitShiftRight('Hello', 31));
+SELECT 32,'Hello',bin(bitShiftRight('Hello', 32));
+SELECT 33,'Hello',bin(bitShiftRight('Hello', 33));
+SELECT 34,'Hello',bin(bitShiftRight('Hello', 34));
+SELECT 35,'Hello',bin(bitShiftRight('Hello', 35));
+SELECT 36,'Hello',bin(bitShiftRight('Hello', 36));
+SELECT 37,'Hello',bin(bitShiftRight('Hello', 37));
+SELECT 38,'Hello',bin(bitShiftRight('Hello', 38));
+SELECT 39,'Hello',bin(bitShiftRight('Hello', 39));
+SELECT 40,'Hello',bin(bitShiftRight('Hello', 40));
+SELECT 41,'Hello',bin(bitShiftRight('Hello', 41));
+SELECT 42,'Hello',bin(bitShiftRight('Hello', 42));
+
+SELECT 'FixedString ConstConst';
+SELECT bin(toFixedString('Hello', 10)) == bin(bitShiftRight(toFixedString('Hello', 10), 0));
+SELECT 0, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 0));
+SELECT 1, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 1));
+SELECT 2, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 2));
+SELECT 3, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 3));
+SELECT 4, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 4));
+SELECT 5, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 5));
+SELECT 6, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 6));
+SELECT 7, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 7));
+SELECT 8, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 8));
+SELECT 9, toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 9));
+SELECT 10,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 10));
+SELECT 11,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 11));
+SELECT 12,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 12));
+SELECT 13,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 13));
+SELECT 14,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 14));
+SELECT 15,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 15));
+SELECT 16,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 16));
+SELECT 17,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 17));
+SELECT 18,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 18));
+SELECT 19,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 19));
+SELECT 20,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 20));
+SELECT 21,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 21));
+SELECT 22,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 22));
+SELECT 23,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 23));
+SELECT 24,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 24));
+SELECT 25,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 25));
+SELECT 26,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 26));
+SELECT 27,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 27));
+SELECT 28,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 28));
+SELECT 29,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 29));
+SELECT 30,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 30));
+SELECT 31,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 31));
+SELECT 32,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 32));
+SELECT 33,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 33));
+SELECT 34,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 34));
+SELECT 35,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 35));
+SELECT 36,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 36));
+SELECT 37,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 37));
+SELECT 38,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 38));
+SELECT 39,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 39));
+SELECT 40,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 40));
+SELECT 41,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 41));
+SELECT 42,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 42));
+SELECT 77,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 77));
+SELECT 78,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 78));
+SELECT 79,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 79));
+SELECT 80,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 80));
+SELECT 81,toFixedString('Hello', 10), bin(bitShiftRight(toFixedString('Hello', 10), 81));
+
+DROP TABLE IF EXISTS test_bit_shift_right_string_integer;
+
+CREATE TABLE test_bit_shift_right_string_integer (str String, fixedStr FixedString(10), id Int64) engine=Log;
+
+INSERT INTO test_bit_shift_right_string_integer VALUES('Hello','Hello',-1)('Hello','Hello',0),('Hello','Hello',1),('Hello','Hello',7),('Hello','Hello',8),('Hello','Hello',9),('Hello','Hello',15),('Hello','Hello',16),('Hello','Hello',17),('Hello','Hello',23),('Hello','Hello',24),('Hello','Hello',25),('Hello','Hello',31),('Hello','Hello',32),('Hello','Hello',33),('Hello','Hello',39),('Hello','Hello',40),('Hello','Hello',41),('Hello','Hello',42),('Hel','Hel',7),('Hel','Hel',8),('Hel','Hel',9);
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String VectorVector';
+SELECT id as shift_right_bit,str as arg,bin(bitShiftRight(str, id)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,str as arg,bin(bitShiftRight(str, id)) as string_res FROM test_bit_shift_right_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftRight('Hello', 42));
+SELECT 'FixedString VectorVector';
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, id)) as fixed_string_res FROM test_bit_shift_right_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String VectorConst';
+SELECT 7 as shift_right_bit,str as arg,bin(bitShiftRight(str, 7)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT 8 as shift_right_bit,str as arg,bin(bitShiftRight(str, 8)) as string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'FixedString VectorConst';
+SELECT 7 as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, 7)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT 8 as shift_right_bit,fixedStr as arg,bin(bitShiftRight(fixedStr, 8)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'String ConstVector';
+SELECT id as shift_right_bit,'Hello' as arg,bin(bitShiftRight('Hello', id)) as string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,'Hel' as arg,bin(bitShiftRight('Hel', id)) as string_res FROM test_bit_shift_right_string_integer;
+
+SELECT bin(bitShiftRight('Hello', 42));  --A blank line
+SELECT 'FixedString ConstVector';
+SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftRight(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftRight(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_right_string_integer;
+
+DROP TABLE IF EXISTS test_bit_shift_right_string_integer;
diff --git a/tests/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.reference b/tests/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.reference
new file mode 100644
index 00000000000..264f29a6ecd
--- /dev/null
+++ b/tests/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.reference
@@ -0,0 +1,3 @@
+2021-07-07 15:21:00
+2021-07-07 15:21:05
+2021-07-07 15:21:10
diff --git a/tests/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.sql b/tests/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.sql
new file mode 100644
index 00000000000..bf232ed5c86
--- /dev/null
+++ b/tests/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.sql
@@ -0,0 +1,6 @@
+SELECT toStartOfMinute(some_time) AS ts
+FROM
+(
+    SELECT toDateTime('2021-07-07 15:21:05') AS some_time
+)
+ORDER BY ts ASC WITH FILL FROM toDateTime('2021-07-07 15:21:00') TO toDateTime('2021-07-07 15:21:15') STEP 5;
diff --git a/tests/queries/0_stateless/02016_summing_mt_aggregating_column.reference b/tests/queries/0_stateless/02016_summing_mt_aggregating_column.reference
new file mode 100644
index 00000000000..884409e23ca
--- /dev/null
+++ b/tests/queries/0_stateless/02016_summing_mt_aggregating_column.reference
@@ -0,0 +1 @@
+1	5	[333,444,555,999]	[33,44,55,99]
diff --git a/tests/queries/0_stateless/02016_summing_mt_aggregating_column.sql b/tests/queries/0_stateless/02016_summing_mt_aggregating_column.sql
new file mode 100644
index 00000000000..c1f115a9d0a
--- /dev/null
+++ b/tests/queries/0_stateless/02016_summing_mt_aggregating_column.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS summing_mt_aggregating_column;
+
+CREATE TABLE summing_mt_aggregating_column
+(
+    Key UInt64,
+    Value UInt64,
+    ConcatArraySimple SimpleAggregateFunction(groupArrayArray, Array(UInt64)),
+    ConcatArrayComplex AggregateFunction(groupArrayArray, Array(UInt64))
+)
+ENGINE = SummingMergeTree()
+ORDER BY Key;
+
+INSERT INTO summing_mt_aggregating_column SELECT 1, 2, [333, 444], groupArrayArrayState([toUInt64(33), toUInt64(44)]);
+INSERT INTO summing_mt_aggregating_column SELECT 1, 3, [555, 999], groupArrayArrayState([toUInt64(55), toUInt64(99)]);
+
+OPTIMIZE TABLE summing_mt_aggregating_column FINAL;
+
+SELECT Key, any(Value), any(ConcatArraySimple), groupArrayArrayMerge(ConcatArrayComplex) FROM summing_mt_aggregating_column GROUP BY Key;
+
+DROP TABLE IF EXISTS summing_mt_aggregating_column;
diff --git a/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
new file mode 100644
index 00000000000..ff5a09c0d48
--- /dev/null
+++ b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
@@ -0,0 +1,339 @@
+String ConstConst
+1
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+2	Hello	000000010010000110010101101100011011000110111100
+3	Hello	000000100100001100101011011000110110001101111000
+4	Hello	000001001000011001010110110001101100011011110000
+5	Hello	000010010000110010101101100011011000110111100000
+6	Hello	000100100001100101011011000110110001101111000000
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+10	Hello	00000001001000011001010110110001101100011011110000000000
+11	Hello	00000010010000110010101101100011011000110111100000000000
+12	Hello	00000100100001100101011011000110110001101111000000000000
+13	Hello	00001001000011001010110110001101100011011110000000000000
+14	Hello	00010010000110010101101100011011000110111100000000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+18	Hello	0000000100100001100101011011000110110001101111000000000000000000
+19	Hello	0000001001000011001010110110001101100011011110000000000000000000
+20	Hello	0000010010000110010101101100011011000110111100000000000000000000
+21	Hello	0000100100001100101011011000110110001101111000000000000000000000
+22	Hello	0001001000011001010110110001101100011011110000000000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+26	Hello	000000010010000110010101101100011011000110111100000000000000000000000000
+27	Hello	000000100100001100101011011000110110001101111000000000000000000000000000
+28	Hello	000001001000011001010110110001101100011011110000000000000000000000000000
+29	Hello	000010010000110010101101100011011000110111100000000000000000000000000000
+30	Hello	000100100001100101011011000110110001101111000000000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+34	Hello	00000001001000011001010110110001101100011011110000000000000000000000000000000000
+35	Hello	00000010010000110010101101100011011000110111100000000000000000000000000000000000
+36	Hello	00000100100001100101011011000110110001101111000000000000000000000000000000000000
+37	Hello	00001001000011001010110110001101100011011110000000000000000000000000000000000000
+38	Hello	00010010000110010101101100011011000110111100000000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+FixedString ConstConst
+1
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+2	Hello\0\0\0\0\0	00100001100101011011000110110001101111000000000000000000000000000000000000000000
+3	Hello\0\0\0\0\0	01000011001010110110001101100011011110000000000000000000000000000000000000000000
+4	Hello\0\0\0\0\0	10000110010101101100011011000110111100000000000000000000000000000000000000000000
+5	Hello\0\0\0\0\0	00001100101011011000110110001101111000000000000000000000000000000000000000000000
+6	Hello\0\0\0\0\0	00011001010110110001101100011011110000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+10	Hello\0\0\0\0\0	10010101101100011011000110111100000000000000000000000000000000000000000000000000
+11	Hello\0\0\0\0\0	00101011011000110110001101111000000000000000000000000000000000000000000000000000
+12	Hello\0\0\0\0\0	01010110110001101100011011110000000000000000000000000000000000000000000000000000
+13	Hello\0\0\0\0\0	10101101100011011000110111100000000000000000000000000000000000000000000000000000
+14	Hello\0\0\0\0\0	01011011000110110001101111000000000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+18	Hello\0\0\0\0\0	10110001101100011011110000000000000000000000000000000000000000000000000000000000
+19	Hello\0\0\0\0\0	01100011011000110111100000000000000000000000000000000000000000000000000000000000
+20	Hello\0\0\0\0\0	11000110110001101111000000000000000000000000000000000000000000000000000000000000
+21	Hello\0\0\0\0\0	10001101100011011110000000000000000000000000000000000000000000000000000000000000
+22	Hello\0\0\0\0\0	00011011000110111100000000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+26	Hello\0\0\0\0\0	10110001101111000000000000000000000000000000000000000000000000000000000000000000
+27	Hello\0\0\0\0\0	01100011011110000000000000000000000000000000000000000000000000000000000000000000
+28	Hello\0\0\0\0\0	11000110111100000000000000000000000000000000000000000000000000000000000000000000
+29	Hello\0\0\0\0\0	10001101111000000000000000000000000000000000000000000000000000000000000000000000
+30	Hello\0\0\0\0\0	00011011110000000000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+34	Hello\0\0\0\0\0	10111100000000000000000000000000000000000000000000000000000000000000000000000000
+35	Hello\0\0\0\0\0	01111000000000000000000000000000000000000000000000000000000000000000000000000000
+36	Hello\0\0\0\0\0	11110000000000000000000000000000000000000000000000000000000000000000000000000000
+37	Hello\0\0\0\0\0	11100000000000000000000000000000000000000000000000000000000000000000000000000000
+38	Hello\0\0\0\0\0	11000000000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+77	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+78	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+79	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+80	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+81	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+
+FixedString VectorVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+
+String VectorConst
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hello	001001000011001010110110001101100011011110000000
+7	Hel	00100100001100101011011000000000
+7	Hel	00100100001100101011011000000000
+7	Hel	00100100001100101011011000000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hello	010010000110010101101100011011000110111100000000
+8	Hel	01001000011001010110110000000000
+8	Hel	01001000011001010110110000000000
+8	Hel	01001000011001010110110000000000
+
+FixedString VectorConst
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+
+String ConstVector
+-1	Hello	
+0	Hello	0100100001100101011011000110110001101111
+1	Hello	000000001001000011001010110110001101100011011110
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+15	Hello	00100100001100101011011000110110001101111000000000000000
+16	Hello	01001000011001010110110001101100011011110000000000000000
+17	Hello	0000000010010000110010101101100011011000110111100000000000000000
+23	Hello	0010010000110010101101100011011000110111100000000000000000000000
+24	Hello	0100100001100101011011000110110001101111000000000000000000000000
+25	Hello	000000001001000011001010110110001101100011011110000000000000000000000000
+31	Hello	001001000011001010110110001101100011011110000000000000000000000000000000
+32	Hello	010010000110010101101100011011000110111100000000000000000000000000000000
+33	Hello	00000000100100001100101011011000110110001101111000000000000000000000000000000000
+39	Hello	00100100001100101011011000110110001101111000000000000000000000000000000000000000
+40	Hello	
+41	Hello	
+42	Hello	
+7	Hello	001001000011001010110110001101100011011110000000
+8	Hello	010010000110010101101100011011000110111100000000
+9	Hello	00000000100100001100101011011000110110001101111000000000
+-1	Hel	
+0	Hel	010010000110010101101100
+1	Hel	00000000100100001100101011011000
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+15	Hel	0010010000110010101101100000000000000000
+16	Hel	0100100001100101011011000000000000000000
+17	Hel	000000001001000011001010110110000000000000000000
+23	Hel	001001000011001010110110000000000000000000000000
+24	Hel	
+25	Hel	
+31	Hel	
+32	Hel	
+33	Hel	
+39	Hel	
+40	Hel	
+41	Hel	
+42	Hel	
+7	Hel	00100100001100101011011000000000
+8	Hel	01001000011001010110110000000000
+9	Hel	0000000010010000110010101101100000000000
+
+FixedString ConstVector
+-1	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hello\0\0\0\0\0	01001000011001010110110001101100011011110000000000000000000000000000000000000000
+1	Hello\0\0\0\0\0	10010000110010101101100011011000110111100000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+15	Hello\0\0\0\0\0	10110110001101100011011110000000000000000000000000000000000000000000000000000000
+16	Hello\0\0\0\0\0	01101100011011000110111100000000000000000000000000000000000000000000000000000000
+17	Hello\0\0\0\0\0	11011000110110001101111000000000000000000000000000000000000000000000000000000000
+23	Hello\0\0\0\0\0	00110110001101111000000000000000000000000000000000000000000000000000000000000000
+24	Hello\0\0\0\0\0	01101100011011110000000000000000000000000000000000000000000000000000000000000000
+25	Hello\0\0\0\0\0	11011000110111100000000000000000000000000000000000000000000000000000000000000000
+31	Hello\0\0\0\0\0	00110111100000000000000000000000000000000000000000000000000000000000000000000000
+32	Hello\0\0\0\0\0	01101111000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hello\0\0\0\0\0	11011110000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hello\0\0\0\0\0	10000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hello\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hello\0\0\0\0\0	00110010101101100011011000110111100000000000000000000000000000000000000000000000
+8	Hello\0\0\0\0\0	01100101011011000110110001101111000000000000000000000000000000000000000000000000
+9	Hello\0\0\0\0\0	11001010110110001101100011011110000000000000000000000000000000000000000000000000
+-1	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+0	Hel\0\0\0\0\0\0\0	01001000011001010110110000000000000000000000000000000000000000000000000000000000
+1	Hel\0\0\0\0\0\0\0	10010000110010101101100000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
+15	Hel\0\0\0\0\0\0\0	10110110000000000000000000000000000000000000000000000000000000000000000000000000
+16	Hel\0\0\0\0\0\0\0	01101100000000000000000000000000000000000000000000000000000000000000000000000000
+17	Hel\0\0\0\0\0\0\0	11011000000000000000000000000000000000000000000000000000000000000000000000000000
+23	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+24	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+25	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+31	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+32	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+33	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+39	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+40	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+41	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+42	Hel\0\0\0\0\0\0\0	00000000000000000000000000000000000000000000000000000000000000000000000000000000
+7	Hel\0\0\0\0\0\0\0	00110010101101100000000000000000000000000000000000000000000000000000000000000000
+8	Hel\0\0\0\0\0\0\0	01100101011011000000000000000000000000000000000000000000000000000000000000000000
+9	Hel\0\0\0\0\0\0\0	11001010110110000000000000000000000000000000000000000000000000000000000000000000
diff --git a/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
new file mode 100644
index 00000000000..5c7a9901dae
--- /dev/null
+++ b/tests/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
@@ -0,0 +1,134 @@
+SELECT 'String ConstConst';
+SELECT bin('Hello') == bin(bitShiftLeft('Hello', 0));
+SELECT 0, 'Hello',bin(bitShiftLeft('Hello', 0));
+SELECT 1, 'Hello',bin(bitShiftLeft('Hello', 1));
+SELECT 2, 'Hello',bin(bitShiftLeft('Hello', 2));
+SELECT 3, 'Hello',bin(bitShiftLeft('Hello', 3));
+SELECT 4, 'Hello',bin(bitShiftLeft('Hello', 4));
+SELECT 5, 'Hello',bin(bitShiftLeft('Hello', 5));
+SELECT 6, 'Hello',bin(bitShiftLeft('Hello', 6));
+SELECT 7, 'Hello',bin(bitShiftLeft('Hello', 7));
+SELECT 8, 'Hello',bin(bitShiftLeft('Hello', 8));
+SELECT 9, 'Hello',bin(bitShiftLeft('Hello', 9));
+SELECT 10,'Hello',bin(bitShiftLeft('Hello', 10));
+SELECT 11,'Hello',bin(bitShiftLeft('Hello', 11));
+SELECT 12,'Hello',bin(bitShiftLeft('Hello', 12));
+SELECT 13,'Hello',bin(bitShiftLeft('Hello', 13));
+SELECT 14,'Hello',bin(bitShiftLeft('Hello', 14));
+SELECT 15,'Hello',bin(bitShiftLeft('Hello', 15));
+SELECT 16,'Hello',bin(bitShiftLeft('Hello', 16));
+SELECT 17,'Hello',bin(bitShiftLeft('Hello', 17));
+SELECT 18,'Hello',bin(bitShiftLeft('Hello', 18));
+SELECT 19,'Hello',bin(bitShiftLeft('Hello', 19));
+SELECT 20,'Hello',bin(bitShiftLeft('Hello', 20));
+SELECT 21,'Hello',bin(bitShiftLeft('Hello', 21));
+SELECT 22,'Hello',bin(bitShiftLeft('Hello', 22));
+SELECT 23,'Hello',bin(bitShiftLeft('Hello', 23));
+SELECT 24,'Hello',bin(bitShiftLeft('Hello', 24));
+SELECT 25,'Hello',bin(bitShiftLeft('Hello', 25));
+SELECT 26,'Hello',bin(bitShiftLeft('Hello', 26));
+SELECT 27,'Hello',bin(bitShiftLeft('Hello', 27));
+SELECT 28,'Hello',bin(bitShiftLeft('Hello', 28));
+SELECT 29,'Hello',bin(bitShiftLeft('Hello', 29));
+SELECT 30,'Hello',bin(bitShiftLeft('Hello', 30));
+SELECT 31,'Hello',bin(bitShiftLeft('Hello', 31));
+SELECT 32,'Hello',bin(bitShiftLeft('Hello', 32));
+SELECT 33,'Hello',bin(bitShiftLeft('Hello', 33));
+SELECT 34,'Hello',bin(bitShiftLeft('Hello', 34));
+SELECT 35,'Hello',bin(bitShiftLeft('Hello', 35));
+SELECT 36,'Hello',bin(bitShiftLeft('Hello', 36));
+SELECT 37,'Hello',bin(bitShiftLeft('Hello', 37));
+SELECT 38,'Hello',bin(bitShiftLeft('Hello', 38));
+SELECT 39,'Hello',bin(bitShiftLeft('Hello', 39));
+SELECT 40,'Hello',bin(bitShiftLeft('Hello', 40));
+SELECT 41,'Hello',bin(bitShiftLeft('Hello', 41));
+SELECT 42,'Hello',bin(bitShiftLeft('Hello', 42));
+
+SELECT 'FixedString ConstConst';
+SELECT bin(toFixedString('Hello', 10)) == bin(bitShiftLeft(toFixedString('Hello', 10), 0));
+SELECT 0, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 0));
+SELECT 1, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 1));
+SELECT 2, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 2));
+SELECT 3, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 3));
+SELECT 4, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 4));
+SELECT 5, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 5));
+SELECT 6, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 6));
+SELECT 7, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 7));
+SELECT 8, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 8));
+SELECT 9, toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 9));
+SELECT 10,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 10));
+SELECT 11,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 11));
+SELECT 12,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 12));
+SELECT 13,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 13));
+SELECT 14,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 14));
+SELECT 15,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 15));
+SELECT 16,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 16));
+SELECT 17,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 17));
+SELECT 18,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 18));
+SELECT 19,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 19));
+SELECT 20,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 20));
+SELECT 21,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 21));
+SELECT 22,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 22));
+SELECT 23,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 23));
+SELECT 24,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 24));
+SELECT 25,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 25));
+SELECT 26,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 26));
+SELECT 27,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 27));
+SELECT 28,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 28));
+SELECT 29,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 29));
+SELECT 30,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 30));
+SELECT 31,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 31));
+SELECT 32,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 32));
+SELECT 33,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 33));
+SELECT 34,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 34));
+SELECT 35,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 35));
+SELECT 36,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 36));
+SELECT 37,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 37));
+SELECT 38,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 38));
+SELECT 39,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 39));
+SELECT 40,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 40));
+SELECT 41,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 41));
+SELECT 42,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 42));
+SELECT 77,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 77));
+SELECT 78,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 78));
+SELECT 79,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 79));
+SELECT 80,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 80));
+SELECT 81,toFixedString('Hello', 10), bin(bitShiftLeft(toFixedString('Hello', 10), 81));
+
+DROP TABLE IF EXISTS test_bit_shift_left_string_integer;
+
+CREATE TABLE test_bit_shift_left_string_integer (str String, fixedStr FixedString(10), id Int64) engine=Log;
+
+INSERT INTO test_bit_shift_left_string_integer VALUES('Hello','Hello',-1)('Hello','Hello',0),('Hello','Hello',1),('Hello','Hello',7),('Hello','Hello',8),('Hello','Hello',9),('Hello','Hello',15),('Hello','Hello',16),('Hello','Hello',17),('Hello','Hello',23),('Hello','Hello',24),('Hello','Hello',25),('Hello','Hello',31),('Hello','Hello',32),('Hello','Hello',33),('Hello','Hello',39),('Hello','Hello',40),('Hello','Hello',41),('Hello','Hello',42),('Hel','Hel',7),('Hel','Hel',8),('Hel','Hel',9);
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String VectorVector';
+SELECT id as shift_right_bit,str as arg,bin(bitShiftLeft(str, id)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,str as arg,bin(bitShiftLeft(str, id)) as string_res FROM test_bit_shift_left_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftLeft('Hello', 42));
+SELECT 'FixedString VectorVector';
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, id)) as fixed_string_res FROM test_bit_shift_left_string_integer WHERE (str='Hello' AND (id=23 OR id=24 OR id=25)) OR (str='Hel' AND (id=7 OR id=8 OR id=9));
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String VectorConst';
+SELECT 7 as shift_right_bit,str as arg,bin(bitShiftLeft(str, 7)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT 8 as shift_right_bit,str as arg,bin(bitShiftLeft(str, 8)) as string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'FixedString VectorConst';
+SELECT 7 as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, 7)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT 8 as shift_right_bit,fixedStr as arg,bin(bitShiftLeft(fixedStr, 8)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'String ConstVector';
+SELECT id as shift_right_bit,'Hello' as arg,bin(bitShiftLeft('Hello', id)) as string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,'Hel' as arg,bin(bitShiftLeft('Hel', id)) as string_res FROM test_bit_shift_left_string_integer;
+
+SELECT bin(bitShiftLeft('Hello', 42));  --A blank line
+SELECT 'FixedString ConstVector';
+SELECT id as shift_right_bit,toFixedString('Hello', 10) as arg,bin(bitShiftLeft(toFixedString('Hello', 10), id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+SELECT id as shift_right_bit,toFixedString('Hel', 10) as arg,bin(bitShiftLeft(toFixedString('Hel', 10), id)) as fixed_string_res FROM test_bit_shift_left_string_integer;
+
+DROP TABLE IF EXISTS test_bit_shift_left_string_integer;
diff --git a/tests/queries/0_stateless/02017_columns_with_dot.reference b/tests/queries/0_stateless/02017_columns_with_dot.reference
new file mode 100644
index 00000000000..5922e56fb56
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot.reference
@@ -0,0 +1,3 @@
+1	[0,0]	2	[1,1,3]
+1	[0,0]	2	[1,1,3]
+1	[0,0]	2	[1,1,3]
diff --git a/tests/queries/0_stateless/02017_columns_with_dot.sql b/tests/queries/0_stateless/02017_columns_with_dot.sql
new file mode 100644
index 00000000000..ae901214d75
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS t_with_dots;
+CREATE TABLE t_with_dots (id UInt32, arr Array(UInt32), `b.id` UInt32, `b.arr` Array(UInt32)) ENGINE = Log;
+
+INSERT INTO t_with_dots VALUES (1, [0, 0], 2, [1, 1, 3]);
+SELECT * FROM t_with_dots;
+
+DROP TABLE t_with_dots;
+
+CREATE TABLE t_with_dots (id UInt32, arr Array(UInt32), `b.id` UInt32, `b.arr` Array(UInt32))
+ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO t_with_dots VALUES (1, [0, 0], 2, [1, 1, 3]);
+SELECT * FROM t_with_dots;
+
+DROP TABLE t_with_dots;
+
+CREATE TABLE t_with_dots (id UInt32, arr Array(UInt32), `b.id` UInt32, `b.arr` Array(UInt32))
+ENGINE = MergeTree ORDER BY id
+SETTINGS min_bytes_for_wide_part = 0;
+
+INSERT INTO t_with_dots VALUES (1, [0, 0], 2, [1, 1, 3]);
+SELECT * FROM t_with_dots;
+
+DROP TABLE t_with_dots;
diff --git a/tests/queries/0_stateless/02017_columns_with_dot_2.reference b/tests/queries/0_stateless/02017_columns_with_dot_2.reference
new file mode 100644
index 00000000000..8d43601632c
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot_2.reference
@@ -0,0 +1,2 @@
+123	asd	[1,2]
+123	asd	[1,2]	0
diff --git a/tests/queries/0_stateless/02017_columns_with_dot_2.sql b/tests/queries/0_stateless/02017_columns_with_dot_2.sql
new file mode 100644
index 00000000000..eefe52b74f3
--- /dev/null
+++ b/tests/queries/0_stateless/02017_columns_with_dot_2.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS test_nested;
+
+CREATE TABLE test_nested
+(
+    `id` String,
+    `with_dot.str` String,
+    `with_dot.array` Array(Int32)
+)
+ENGINE = MergeTree()
+ORDER BY id;
+
+INSERT INTO test_nested VALUES('123', 'asd', [1,2]);
+SELECT * FROM test_nested;
+
+ALTER TABLE test_nested ADD COLUMN `with_dot.bool` UInt8;
+SELECT * FROM test_nested;
+
+DROP TABLE test_nested;
diff --git a/tests/queries/0_stateless/02017_create_distributed_table_coredump.reference b/tests/queries/0_stateless/02017_create_distributed_table_coredump.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql b/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
new file mode 100644
index 00000000000..a7a77672aa9
--- /dev/null
+++ b/tests/queries/0_stateless/02017_create_distributed_table_coredump.sql
@@ -0,0 +1,14 @@
+-- Tags: distributed
+
+drop table if exists t;
+drop table if exists td1;
+drop table if exists td2;
+drop table if exists td3;
+create table t (val UInt32) engine = MergeTree order by val;
+create table td1 engine = Distributed(test_shard_localhost, currentDatabase(), 't') as t;
+create table td2 engine = Distributed(test_shard_localhost, currentDatabase(), 't', xxHash32(val), default) as t;
+create table td3 engine = Distributed(test_shard_localhost, currentDatabase(), 't', xxHash32(val), 'default') as t;
+drop table if exists t;
+drop table if exists td1; 
+drop table if exists td2; 
+drop table if exists td3; 
diff --git a/tests/queries/0_stateless/02017_order_by_with_fill_redundant_functions.reference b/tests/queries/0_stateless/02017_order_by_with_fill_redundant_functions.reference
new file mode 100644
index 00000000000..07193989308
--- /dev/null
+++ b/tests/queries/0_stateless/02017_order_by_with_fill_redundant_functions.reference
@@ -0,0 +1,9 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/02017_order_by_with_fill_redundant_functions.sql b/tests/queries/0_stateless/02017_order_by_with_fill_redundant_functions.sql
new file mode 100644
index 00000000000..6f3e6787c34
--- /dev/null
+++ b/tests/queries/0_stateless/02017_order_by_with_fill_redundant_functions.sql
@@ -0,0 +1 @@
+SELECT x FROM (SELECT 5 AS x) ORDER BY -x, x WITH FILL FROM 1 TO 10;
diff --git a/tests/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.reference b/tests/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.sql b/tests/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.sql
new file mode 100644
index 00000000000..32b38388cf6
--- /dev/null
+++ b/tests/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.sql
@@ -0,0 +1 @@
+SELECT x, y FROM (SELECT 5 AS x, 'Hello' AS y) ORDER BY x WITH FILL FROM 3 TO 7, y, x WITH FILL FROM 1 TO 10; -- { serverError 475 }
diff --git a/tests/queries/0_stateless/02019_multiple_weird_with_fill.reference b/tests/queries/0_stateless/02019_multiple_weird_with_fill.reference
new file mode 100644
index 00000000000..822d290564a
--- /dev/null
+++ b/tests/queries/0_stateless/02019_multiple_weird_with_fill.reference
@@ -0,0 +1,45 @@
+3	-10	
+3	-9	
+3	-8	
+3	-7	
+3	-6	
+3	-5	
+3	-4	
+3	-3	
+3	-2	
+4	-10	
+4	-9	
+4	-8	
+4	-7	
+4	-6	
+4	-5	
+4	-4	
+4	-3	
+4	-2	
+5	-10	
+5	-9	
+5	-8	
+5	-7	
+5	-6	
+5	-5	Hello
+5	-4	
+5	-3	
+5	-2	
+6	-10	
+6	-9	
+6	-8	
+6	-7	
+6	-6	
+6	-5	
+6	-4	
+6	-3	
+6	-2	
+7	-10	
+7	-9	
+7	-8	
+7	-7	
+7	-6	
+7	-5	
+7	-4	
+7	-3	
+7	-2	
diff --git a/tests/queries/0_stateless/02019_multiple_weird_with_fill.sql b/tests/queries/0_stateless/02019_multiple_weird_with_fill.sql
new file mode 100644
index 00000000000..a2ed33c51dd
--- /dev/null
+++ b/tests/queries/0_stateless/02019_multiple_weird_with_fill.sql
@@ -0,0 +1,14 @@
+SELECT
+    x,
+    -x,
+    y
+FROM
+(
+    SELECT
+        5 AS x,
+        'Hello' AS y
+)
+ORDER BY
+    x ASC WITH FILL FROM 3 TO 7,
+    y ASC,
+    -x ASC WITH FILL FROM -10 TO -1;
diff --git a/tests/queries/0_stateless/02020_alter_table_modify_comment.reference b/tests/queries/0_stateless/02020_alter_table_modify_comment.reference
new file mode 100644
index 00000000000..a9c37eb2ba5
--- /dev/null
+++ b/tests/queries/0_stateless/02020_alter_table_modify_comment.reference
@@ -0,0 +1,144 @@
+engine : Null
+initial comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Null\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+change a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Null\nCOMMENT \'new comment on a table\'
+comment=	new comment on a table
+
+remove a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Null
+comment=	
+
+add a comment back
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Null\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+detach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Null\nCOMMENT \'another comment on a table\'
+
+re-attach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Null\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+engine : Memory
+initial comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Memory\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+change a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Memory\nCOMMENT \'new comment on a table\'
+comment=	new comment on a table
+
+remove a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Memory
+comment=	
+
+add a comment back
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Memory\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+detach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Memory\nCOMMENT \'another comment on a table\'
+
+re-attach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Memory\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+engine : MergeTree() ORDER BY k
+initial comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+change a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'new comment on a table\'
+comment=	new comment on a table
+
+remove a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY k\nSETTINGS index_granularity = 8192
+comment=	
+
+add a comment back
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+detach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'another comment on a table\'
+
+re-attach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = MergeTree\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+engine : Log
+initial comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Log\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+change a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Log\nCOMMENT \'new comment on a table\'
+comment=	new comment on a table
+
+remove a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Log
+comment=	
+
+add a comment back
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Log\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+detach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Log\nCOMMENT \'another comment on a table\'
+
+re-attach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = Log\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+engine : TinyLog
+initial comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = TinyLog\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+change a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = TinyLog\nCOMMENT \'new comment on a table\'
+comment=	new comment on a table
+
+remove a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = TinyLog
+comment=	
+
+add a comment back
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = TinyLog\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+detach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = TinyLog\nCOMMENT \'another comment on a table\'
+
+re-attach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = TinyLog\nCOMMENT \'another comment on a table\'
+comment=	another comment on a table
+
+engine : ReplicatedMergeTree('/clickhouse/02020_alter_table_modify_comment_default', '1') ORDER BY k
+initial comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/02020_alter_table_modify_comment_default\', \'1\')\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+change a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/02020_alter_table_modify_comment_default\', \'1\')\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+remove a comment
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/02020_alter_table_modify_comment_default\', \'1\')\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+add a comment back
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/02020_alter_table_modify_comment_default\', \'1\')\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
+detach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/02020_alter_table_modify_comment_default\', \'1\')\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+
+re-attach table
+CREATE TABLE default.comment_test_table\n(\n    `k` UInt64,\n    `s` String\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/02020_alter_table_modify_comment_default\', \'1\')\nORDER BY k\nSETTINGS index_granularity = 8192\nCOMMENT \'Test table with comment\'
+comment=	Test table with comment
+
diff --git a/tests/queries/0_stateless/02020_alter_table_modify_comment.sh b/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
new file mode 100755
index 00000000000..c674f21034c
--- /dev/null
+++ b/tests/queries/0_stateless/02020_alter_table_modify_comment.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function get_table_comment_info()
+{
+    $CLICKHOUSE_CLIENT --query="SHOW CREATE TABLE comment_test_table;"
+    $CLICKHOUSE_CLIENT --query="SELECT 'comment=', comment FROM system.tables WHERE database=currentDatabase() and name='comment_test_table'"
+    echo # just a newline
+}
+
+function test_table_comments()
+{
+    local ENGINE_NAME="$1"
+    echo "engine : ${ENGINE_NAME}"
+
+    $CLICKHOUSE_CLIENT -nm <<EOF
+    DROP TABLE IF EXISTS comment_test_table;
+
+    CREATE TABLE comment_test_table
+    (
+        k UInt64,
+        s String
+    ) ENGINE = ${ENGINE_NAME}
+    COMMENT 'Test table with comment';
+EOF
+
+    echo initial comment
+    get_table_comment_info
+
+    echo change a comment
+    $CLICKHOUSE_CLIENT --query="ALTER TABLE comment_test_table MODIFY COMMENT 'new comment on a table';"
+    get_table_comment_info
+
+    echo remove a comment
+    $CLICKHOUSE_CLIENT --query="ALTER TABLE comment_test_table MODIFY COMMENT '';"
+    get_table_comment_info
+
+    echo add a comment back
+    $CLICKHOUSE_CLIENT --query="ALTER TABLE comment_test_table MODIFY COMMENT 'another comment on a table';"
+    get_table_comment_info
+
+    echo detach table
+    $CLICKHOUSE_CLIENT --query="DETACH TABLE comment_test_table NO DELAY;"
+    get_table_comment_info
+
+    echo re-attach table
+    $CLICKHOUSE_CLIENT --query="ATTACH TABLE comment_test_table;"
+    get_table_comment_info
+}
+
+test_table_comments "Null"
+test_table_comments "Memory"
+test_table_comments "MergeTree() ORDER BY k"
+test_table_comments "Log"
+test_table_comments "TinyLog"
+test_table_comments "ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '1') ORDER BY k"
diff --git a/tests/queries/0_stateless/02020_cast_integer_overflow.reference b/tests/queries/0_stateless/02020_cast_integer_overflow.reference
new file mode 100644
index 00000000000..acceae4a72e
--- /dev/null
+++ b/tests/queries/0_stateless/02020_cast_integer_overflow.reference
@@ -0,0 +1,2 @@
+-2147483648
+-2147483648
diff --git a/tests/queries/0_stateless/02020_cast_integer_overflow.sql b/tests/queries/0_stateless/02020_cast_integer_overflow.sql
new file mode 100644
index 00000000000..57aeff9a982
--- /dev/null
+++ b/tests/queries/0_stateless/02020_cast_integer_overflow.sql
@@ -0,0 +1,2 @@
+SELECT toInt32('-2147483648');
+SELECT toInt32OrNull('-2147483648');
diff --git a/tests/queries/0_stateless/02020_exponential_smoothing.reference b/tests/queries/0_stateless/02020_exponential_smoothing.reference
new file mode 100644
index 00000000000..8ebf4c3c066
--- /dev/null
+++ b/tests/queries/0_stateless/02020_exponential_smoothing.reference
@@ -0,0 +1,130 @@
+1	0	0.5
+0	1	0.25
+0	2	0.125
+0	3	0.0625
+0	4	0.03125
+0	5	0.015625
+0	6	0.0078125
+0	7	0.00390625
+0	8	0.001953125
+0	9	0.0009765625
+1	0	0.067
+0	1	0.062
+0	2	0.058
+0	3	0.054
+0	4	0.051
+0	5	0.047
+0	6	0.044
+0	7	0.041
+0	8	0.038
+0	9	0.036
+0	0	0
+1	1	0.5
+2	2	1.25
+3	3	2.125
+4	4	3.0625
+5	5	4.03125
+6	6	5.015625
+7	7	6.0078125
+8	8	7.00390625
+9	9	8.001953125
+1	0	0.067	███▎
+0	1	0.062	███
+0	2	0.058	██▊
+0	3	0.054	██▋
+0	4	0.051	██▌
+0	5	0.047	██▎
+0	6	0.044	██▏
+0	7	0.041	██
+0	8	0.038	█▊
+0	9	0.036	█▋
+0	10	0.033	█▋
+0	11	0.031	█▌
+0	12	0.029	█▍
+0	13	0.027	█▎
+0	14	0.025	█▎
+0	15	0.024	█▏
+0	16	0.022	█
+0	17	0.021	█
+0	18	0.019	▊
+0	19	0.018	▊
+0	20	0.017	▋
+0	21	0.016	▋
+0	22	0.015	▋
+0	23	0.014	▋
+0	24	0.013	▋
+1	25	0.079	███▊
+1	26	0.14	███████
+1	27	0.198	█████████▊
+1	28	0.252	████████████▌
+1	29	0.302	███████████████
+1	30	0.349	█████████████████▍
+1	31	0.392	███████████████████▌
+1	32	0.433	█████████████████████▋
+1	33	0.471	███████████████████████▌
+1	34	0.506	█████████████████████████▎
+1	35	0.539	██████████████████████████▊
+1	36	0.57	████████████████████████████▌
+1	37	0.599	█████████████████████████████▊
+1	38	0.626	███████████████████████████████▎
+1	39	0.651	████████████████████████████████▌
+1	40	0.674	█████████████████████████████████▋
+1	41	0.696	██████████████████████████████████▋
+1	42	0.716	███████████████████████████████████▋
+1	43	0.735	████████████████████████████████████▋
+1	44	0.753	█████████████████████████████████████▋
+1	45	0.77	██████████████████████████████████████▍
+1	46	0.785	███████████████████████████████████████▎
+1	47	0.8	███████████████████████████████████████▊
+1	48	0.813	████████████████████████████████████████▋
+1	49	0.825	█████████████████████████████████████████▎
+1	0	0.5	█████████████████████████
+0	1	0.25	████████████▌
+0	2	0.125	██████▎
+0	3	0.062	███
+0	4	0.031	█▌
+1	5	0.516	█████████████████████████▋
+0	6	0.258	████████████▊
+0	7	0.129	██████▍
+0	8	0.064	███▏
+0	9	0.032	█▌
+1	10	0.516	█████████████████████████▋
+0	11	0.258	████████████▊
+0	12	0.129	██████▍
+0	13	0.065	███▏
+0	14	0.032	█▌
+1	15	0.516	█████████████████████████▋
+0	16	0.258	████████████▊
+0	17	0.129	██████▍
+0	18	0.065	███▏
+0	19	0.032	█▌
+1	20	0.516	█████████████████████████▋
+0	21	0.258	████████████▊
+0	22	0.129	██████▍
+0	23	0.065	███▏
+0	24	0.032	█▌
+1	25	0.516	█████████████████████████▋
+0	26	0.258	████████████▊
+0	27	0.129	██████▍
+0	28	0.065	███▏
+0	29	0.032	█▌
+1	30	0.516	█████████████████████████▋
+0	31	0.258	████████████▊
+0	32	0.129	██████▍
+0	33	0.065	███▏
+0	34	0.032	█▌
+1	35	0.516	█████████████████████████▋
+0	36	0.258	████████████▊
+0	37	0.129	██████▍
+0	38	0.065	███▏
+0	39	0.032	█▌
+1	40	0.516	█████████████████████████▋
+0	41	0.258	████████████▊
+0	42	0.129	██████▍
+0	43	0.065	███▏
+0	44	0.032	█▌
+1	45	0.516	█████████████████████████▋
+0	46	0.258	████████████▊
+0	47	0.129	██████▍
+0	48	0.065	███▏
+0	49	0.032	█▌
diff --git a/tests/queries/0_stateless/02020_exponential_smoothing.sql b/tests/queries/0_stateless/02020_exponential_smoothing.sql
new file mode 100644
index 00000000000..a210225453a
--- /dev/null
+++ b/tests/queries/0_stateless/02020_exponential_smoothing.sql
@@ -0,0 +1,32 @@
+SELECT number = 0 AS value, number AS time, exponentialMovingAverage(1)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth FROM numbers(10);
+SELECT value, time, round(exp_smooth, 3) FROM (SELECT number = 0 AS value, number AS time, exponentialMovingAverage(10)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth FROM numbers(10));
+
+SELECT number AS value, number AS time, exponentialMovingAverage(1)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth FROM numbers(10);
+
+SELECT
+    value,
+    time,
+    round(exp_smooth, 3),
+    bar(exp_smooth, 0, 1, 50) AS bar
+FROM
+(
+    SELECT
+        (number = 0) OR (number >= 25) AS value,
+        number AS time,
+        exponentialMovingAverage(10)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth
+    FROM numbers(50)
+);
+
+SELECT
+    value,
+    time,
+    round(exp_smooth, 3),
+    bar(exp_smooth, 0, 1, 50) AS bar
+FROM
+(
+    SELECT
+        (number % 5) = 0 AS value,
+        number AS time,
+        exponentialMovingAverage(1)(value, time) OVER (ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS exp_smooth
+    FROM numbers(50)
+);
diff --git a/tests/queries/0_stateless/02021_create_database_with_comment.reference b/tests/queries/0_stateless/02021_create_database_with_comment.reference
new file mode 100644
index 00000000000..ada8f919956
--- /dev/null
+++ b/tests/queries/0_stateless/02021_create_database_with_comment.reference
@@ -0,0 +1,16 @@
+engine : Atomic
+CREATE DATABASE default\nENGINE = Atomic\nCOMMENT \'Test DB with comment\'
+comment=	Test DB with comment
+
+engine : Ordinary
+CREATE DATABASE default\nENGINE = Ordinary\nCOMMENT \'Test DB with comment\'
+comment=	Test DB with comment
+
+engine : Lazy(1)
+CREATE DATABASE default\nENGINE = Lazy(1)\nCOMMENT \'Test DB with comment\'
+comment=	Test DB with comment
+
+engine : Memory
+CREATE DATABASE default\nENGINE = Memory()\nCOMMENT \'Test DB with comment\'
+comment=	Test DB with comment
+
diff --git a/tests/queries/0_stateless/02021_create_database_with_comment.sh b/tests/queries/0_stateless/02021_create_database_with_comment.sh
new file mode 100755
index 00000000000..d8b288eb9ba
--- /dev/null
+++ b/tests/queries/0_stateless/02021_create_database_with_comment.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+DB_NAME="${CLICKHOUSE_DATABASE}"
+
+function get_db_comment_info()
+{
+    $CLICKHOUSE_CLIENT --query="SHOW CREATE DATABASE ${DB_NAME};"
+    $CLICKHOUSE_CLIENT --query="SELECT 'comment=', comment FROM system.databases WHERE name='${DB_NAME}'"
+    echo # just a newline
+}
+
+function test_db_comments()
+{
+    local ENGINE_NAME="$1"
+    echo "engine : ${ENGINE_NAME}"
+
+    $CLICKHOUSE_CLIENT -nm <<EOF
+DROP DATABASE IF EXISTS ${DB_NAME};
+CREATE DATABASE ${DB_NAME} ENGINE = ${ENGINE_NAME} COMMENT 'Test DB with comment';
+EOF
+
+    get_db_comment_info
+}
+
+# For some reason order seems important, putting Atomic after Memory makes test fail every time
+#  due to DB metadata SQL file still being present after "DROP DATABASE"
+test_db_comments "Atomic"
+test_db_comments "Ordinary"
+test_db_comments "Lazy(1)"
+test_db_comments "Memory"
+# test_db_comments "MySQL('127.0.0.1:9004', 'default', 'default', '')" # fails due to CH internal reasons
+# test_db_comments "SQLite('dummy_sqlitedb')"
+## needs to be explicitly enabled with `SET allow_experimental_database_replicated=1`
+# test_db_comments "Replicated('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX', '1') ORDER BY k"
diff --git a/tests/queries/0_stateless/02021_exponential_sum.reference b/tests/queries/0_stateless/02021_exponential_sum.reference
new file mode 100644
index 00000000000..5bd77479cf7
--- /dev/null
+++ b/tests/queries/0_stateless/02021_exponential_sum.reference
@@ -0,0 +1,8 @@
+0.0009765625
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
+0.0009775171065493646
diff --git a/tests/queries/0_stateless/02021_exponential_sum.sql b/tests/queries/0_stateless/02021_exponential_sum.sql
new file mode 100644
index 00000000000..8ab7638029c
--- /dev/null
+++ b/tests/queries/0_stateless/02021_exponential_sum.sql
@@ -0,0 +1,9 @@
+-- Check that it is deterministic
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(1000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(1000000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(10000000);
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM numbers_mt(100000000);
diff --git a/tests/queries/0_stateless/02021_exponential_sum_shard.reference b/tests/queries/0_stateless/02021_exponential_sum_shard.reference
new file mode 100644
index 00000000000..8453706a05a
--- /dev/null
+++ b/tests/queries/0_stateless/02021_exponential_sum_shard.reference
@@ -0,0 +1,5 @@
+0.009775171065493644
+0.009775171065493644
+0.009775171065493644
+0.009775171065493644
+0.009775171065493644
diff --git a/tests/queries/0_stateless/02021_exponential_sum_shard.sql b/tests/queries/0_stateless/02021_exponential_sum_shard.sql
new file mode 100644
index 00000000000..49fde0fe217
--- /dev/null
+++ b/tests/queries/0_stateless/02021_exponential_sum_shard.sql
@@ -0,0 +1,6 @@
+-- Check that it is deterministic
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(1000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(10000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(100000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(1000000));
+WITH number % 10 = 0 AS value, number AS time SELECT exponentialMovingAverage(1)(value, time) AS exp_smooth FROM remote('127.0.0.{1..10}', numbers_mt(10000000));
diff --git a/tests/queries/0_stateless/02021_h3_get_faces.reference b/tests/queries/0_stateless/02021_h3_get_faces.reference
new file mode 100644
index 00000000000..459a9af5827
--- /dev/null
+++ b/tests/queries/0_stateless/02021_h3_get_faces.reference
@@ -0,0 +1,4 @@
+[2,3,7,8,12]
+[7,12]
+[7]
+[7]
diff --git a/tests/queries/0_stateless/02021_h3_get_faces.sql b/tests/queries/0_stateless/02021_h3_get_faces.sql
new file mode 100644
index 00000000000..4a549c5dcf1
--- /dev/null
+++ b/tests/queries/0_stateless/02021_h3_get_faces.sql
@@ -0,0 +1,16 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- test H3 indexes from: https://github.com/uber/h3-java/blob/master/src/test/java/com/uber/h3core/TestInspection.java#L86
+
+INSERT INTO h3_indexes VALUES (stringToH3('0x85283473fffffffL'));
+INSERT INTO h3_indexes VALUES (stringToH3('85283473fffffff'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x8167bffffffffffL'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x804dfffffffffffL'));
+
+SELECT arraySort(h3GetFaces(h3_index)) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/02021_h3_is_pentagon.reference b/tests/queries/0_stateless/02021_h3_is_pentagon.reference
new file mode 100644
index 00000000000..d9ff83f1949
--- /dev/null
+++ b/tests/queries/0_stateless/02021_h3_is_pentagon.reference
@@ -0,0 +1,4 @@
+1
+1
+0
+0
diff --git a/tests/queries/0_stateless/02021_h3_is_pentagon.sql b/tests/queries/0_stateless/02021_h3_is_pentagon.sql
new file mode 100644
index 00000000000..c583fa24451
--- /dev/null
+++ b/tests/queries/0_stateless/02021_h3_is_pentagon.sql
@@ -0,0 +1,16 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- test H3 indexes from: https://github.com/uber/h3-java/blob/master/src/test/java/com/uber/h3core/TestInspection.java#L78
+
+INSERT INTO h3_indexes VALUES (stringToH3('8f28308280f18f2'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x8f28308280f18f2L'));
+INSERT INTO h3_indexes VALUES (stringToH3('821c07fffffffff'));
+INSERT INTO h3_indexes VALUES (stringToH3('0x821c07fffffffffL'));
+
+SELECT h3IsPentagon(h3_index) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/02021_h3_is_res_classIII.reference b/tests/queries/0_stateless/02021_h3_is_res_classIII.reference
new file mode 100644
index 00000000000..5565ed6787f
--- /dev/null
+++ b/tests/queries/0_stateless/02021_h3_is_res_classIII.reference
@@ -0,0 +1,4 @@
+0
+1
+0
+1
diff --git a/tests/queries/0_stateless/02021_h3_is_res_classIII.sql b/tests/queries/0_stateless/02021_h3_is_res_classIII.sql
new file mode 100644
index 00000000000..7b9cc7acb48
--- /dev/null
+++ b/tests/queries/0_stateless/02021_h3_is_res_classIII.sql
@@ -0,0 +1,16 @@
+-- Tags: no-unbundled, no-fasttest
+
+DROP TABLE IF EXISTS h3_indexes;
+
+CREATE TABLE h3_indexes (h3_index UInt64) ENGINE = Memory;
+
+-- test H3 indexes from: https://github.com/uber/h3-java/blob/master/src/test/java/com/uber/h3core/TestInspection.java#L57
+
+INSERT INTO h3_indexes VALUES (geoToH3(0.0, 0.0, 0));
+INSERT INTO h3_indexes VALUES (geoToH3(10.0, 0.0, 1));
+INSERT INTO h3_indexes VALUES (geoToH3(0.0, 10.0, 2));
+INSERT INTO h3_indexes VALUES (geoToH3(10.0, 10.0, 3));
+
+SELECT h3IsResClassIII(h3_index) FROM h3_indexes ORDER BY h3_index;
+
+DROP TABLE h3_indexes;
diff --git a/tests/queries/0_stateless/02021_map_bloom_filter_index.reference b/tests/queries/0_stateless/02021_map_bloom_filter_index.reference
new file mode 100644
index 00000000000..ccfd5f93695
--- /dev/null
+++ b/tests/queries/0_stateless/02021_map_bloom_filter_index.reference
@@ -0,0 +1,58 @@
+Map bloom filter mapKeys
+Equals with existing key
+0	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+Not equals with non existing key and default value
+IN with existing key
+0	{'K0':'V0'}
+IN with non existing key
+IN with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with existing key
+1	{'K1':'V1'}
+NOT IN with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with non existing key and default value
+MapContains with existing key
+0	{'K0':'V0'}
+MapContains with non existing key
+MapContains with non existing key and default value
+Has with existing key
+0	{'K0':'V0'}
+Has with non existing key
+Has with non existing key and default value
+Map bloom filter mapValues
+Equals with existing key
+0	{'K0':'V0'}
+Equals with non existing key
+Equals with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+Not equals with existing key
+1	{'K1':'V1'}
+Not equals with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+Not equals with non existing key and default value
+IN with existing key
+0	{'K0':'V0'}
+IN with non existing key
+IN with non existing key and default value
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with existing key
+1	{'K1':'V1'}
+NOT IN with non existing key
+0	{'K0':'V0'}
+1	{'K1':'V1'}
+NOT IN with non existing key and default value
diff --git a/tests/queries/0_stateless/02021_map_bloom_filter_index.sql b/tests/queries/0_stateless/02021_map_bloom_filter_index.sql
new file mode 100644
index 00000000000..7a03ff3c473
--- /dev/null
+++ b/tests/queries/0_stateless/02021_map_bloom_filter_index.sql
@@ -0,0 +1,92 @@
+DROP TABLE IF EXISTS map_test_index_map_keys;
+CREATE TABLE map_test_index_map_keys
+(
+    row_id UInt32,
+    map Map(String, String),
+    INDEX map_bloom_filter_keys mapKeys(map) TYPE bloom_filter GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO map_test_index_map_keys VALUES (0, {'K0':'V0'}), (1, {'K1':'V1'});
+
+SELECT 'Map bloom filter mapKeys';
+
+SELECT 'Equals with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'Equals with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'Not equals with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] != '';
+
+SELECT 'IN with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] IN 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'IN with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] IN 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'IN with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] IN '';
+SELECT 'NOT IN with existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K0'] NOT IN 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'NOT IN with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE map['K2'] NOT IN 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'NOT IN with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE map['K3'] NOT IN '';
+
+SELECT 'MapContains with existing key';
+SELECT * FROM map_test_index_map_keys WHERE mapContains(map, 'K0') SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'MapContains with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE mapContains(map, 'K2') SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'MapContains with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE mapContains(map, '');
+
+SELECT 'Has with existing key';
+SELECT * FROM map_test_index_map_keys WHERE has(map, 'K0') SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'Has with non existing key';
+SELECT * FROM map_test_index_map_keys WHERE has(map, 'K2') SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+SELECT 'Has with non existing key and default value';
+SELECT * FROM map_test_index_map_keys WHERE has(map, '') SETTINGS force_data_skipping_indices='map_bloom_filter_keys';
+
+DROP TABLE map_test_index_map_keys;
+
+DROP TABLE IF EXISTS map_test_index_map_values;
+CREATE TABLE map_test_index_map_values
+(
+    row_id UInt32,
+    map Map(String, String),
+    INDEX map_bloom_filter_values mapValues(map) TYPE bloom_filter GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO map_test_index_map_values VALUES (0, {'K0':'V0'}), (1, {'K1':'V1'});
+
+SELECT 'Map bloom filter mapValues';
+
+SELECT 'Equals with existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K0'] = 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'Equals with non existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K2'] = 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'Equals with non existing key and default value';
+SELECT * FROM map_test_index_map_values WHERE map['K3'] = '';
+SELECT 'Not equals with existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K0'] != 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'Not equals with non existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K2'] != 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'Not equals with non existing key and default value';
+SELECT * FROM map_test_index_map_values WHERE map['K3'] != '';
+SELECT 'IN with existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K0'] IN 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'IN with non existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K2'] IN 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'IN with non existing key and default value';
+SELECT * FROM map_test_index_map_values WHERE map['K3'] IN '';
+SELECT 'NOT IN with existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K0'] NOT IN 'V0' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'NOT IN with non existing key';
+SELECT * FROM map_test_index_map_values WHERE map['K2'] NOT IN 'V2' SETTINGS force_data_skipping_indices='map_bloom_filter_values';
+SELECT 'NOT IN with non existing key and default value';
+SELECT * FROM map_test_index_map_values WHERE map['K3'] NOT IN '';
+
+DROP TABLE map_test_index_map_values;
diff --git a/tests/queries/0_stateless/02021_map_has.reference b/tests/queries/0_stateless/02021_map_has.reference
new file mode 100644
index 00000000000..2c10bd62504
--- /dev/null
+++ b/tests/queries/0_stateless/02021_map_has.reference
@@ -0,0 +1,6 @@
+Non constant map
+1
+0
+Constant map
+1
+0
diff --git a/tests/queries/0_stateless/02021_map_has.sql b/tests/queries/0_stateless/02021_map_has.sql
new file mode 100644
index 00000000000..84099058273
--- /dev/null
+++ b/tests/queries/0_stateless/02021_map_has.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS test_map;
+CREATE TABLE test_map (value Map(String, String)) ENGINE=TinyLog;
+
+SELECT 'Non constant map';
+INSERT INTO test_map VALUES ({'K0':'V0'});
+SELECT has(value, 'K0') FROM test_map;
+SELECT has(value, 'K1') FROM test_map;
+
+SELECT 'Constant map';
+
+SELECT has(map('K0', 'V0'), 'K0') FROM system.one;
+SELECT has(map('K0', 'V0'), 'K1') FROM system.one;
+
+DROP TABLE test_map;
diff --git a/tests/queries/0_stateless/02021_prewhere_always_true_where.reference b/tests/queries/0_stateless/02021_prewhere_always_true_where.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02021_prewhere_always_true_where.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02021_prewhere_always_true_where.sql b/tests/queries/0_stateless/02021_prewhere_always_true_where.sql
new file mode 100644
index 00000000000..95dcb6a15c2
--- /dev/null
+++ b/tests/queries/0_stateless/02021_prewhere_always_true_where.sql
@@ -0,0 +1,5 @@
+drop table if exists data_02021;
+create table data_02021 (key Int) engine=MergeTree() order by key;
+insert into data_02021 values (1);
+select count() from data_02021 prewhere 1 or ignore(key) where ignore(key)=0;
+drop table data_02021;
diff --git a/tests/queries/0_stateless/02021_prewhere_column_optimization.reference b/tests/queries/0_stateless/02021_prewhere_column_optimization.reference
new file mode 100644
index 00000000000..7f97e6efd69
--- /dev/null
+++ b/tests/queries/0_stateless/02021_prewhere_column_optimization.reference
@@ -0,0 +1,7 @@
+-- { echoOn }
+select * from data_02021 prewhere 1 or ignore(key);
+1
+select * from data_02021 prewhere 1 or ignore(key) where key = 1;
+1
+select * from data_02021 prewhere 0 or ignore(key);
+select * from data_02021 prewhere 0 or ignore(key) where key = 1;
diff --git a/tests/queries/0_stateless/02021_prewhere_column_optimization.sql b/tests/queries/0_stateless/02021_prewhere_column_optimization.sql
new file mode 100644
index 00000000000..4fe8b912c3f
--- /dev/null
+++ b/tests/queries/0_stateless/02021_prewhere_column_optimization.sql
@@ -0,0 +1,10 @@
+drop table if exists data_02021;
+create table data_02021 (key Int) engine=MergeTree() order by key;
+insert into data_02021 values (1);
+-- { echoOn }
+select * from data_02021 prewhere 1 or ignore(key);
+select * from data_02021 prewhere 1 or ignore(key) where key = 1;
+select * from data_02021 prewhere 0 or ignore(key);
+select * from data_02021 prewhere 0 or ignore(key) where key = 1;
+-- { echoOff }
+drop table data_02021;
diff --git a/tests/queries/0_stateless/02022_array_full_text_bloom_filter_index.reference b/tests/queries/0_stateless/02022_array_full_text_bloom_filter_index.reference
new file mode 100644
index 00000000000..3d9bc03bd63
--- /dev/null
+++ b/tests/queries/0_stateless/02022_array_full_text_bloom_filter_index.reference
@@ -0,0 +1,8 @@
+1	['K1']	['K1']
+2	['K2']	['K2']
+1	['K1']	['K1']
+2	['K2']	['K2']
+1	['K1']	['K1']
+2	['K2']	['K2']
+1	['K1']	['K1']
+2	['K2']	['K2']
diff --git a/tests/queries/0_stateless/02022_array_full_text_bloom_filter_index.sql b/tests/queries/0_stateless/02022_array_full_text_bloom_filter_index.sql
new file mode 100644
index 00000000000..646a566b877
--- /dev/null
+++ b/tests/queries/0_stateless/02022_array_full_text_bloom_filter_index.sql
@@ -0,0 +1,42 @@
+DROP TABLE IF EXISTS bf_tokenbf_array_test;
+DROP TABLE IF EXISTS bf_ngram_array_test;
+
+CREATE TABLE bf_tokenbf_array_test
+(
+    row_id UInt32,
+    array Array(String),
+    array_fixed Array(FixedString(2)),
+    INDEX array_bf_tokenbf array TYPE tokenbf_v1(256,2,0) GRANULARITY 1,
+    INDEX array_fixed_bf_tokenbf array_fixed TYPE tokenbf_v1(256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+CREATE TABLE bf_ngram_array_test
+(
+    row_id UInt32,
+    array Array(String),
+    array_fixed Array(FixedString(2)),
+    INDEX array_ngram array TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1,
+    INDEX array_fixed_ngram array_fixed TYPE ngrambf_v1(4,256,2,0) GRANULARITY 1
+) Engine=MergeTree() ORDER BY row_id SETTINGS index_granularity = 1;
+
+INSERT INTO bf_tokenbf_array_test VALUES (1, ['K1'], ['K1']), (2, ['K2'], ['K2']);
+INSERT INTO bf_ngram_array_test VALUES (1, ['K1'], ['K1']), (2, ['K2'], ['K2']);
+
+SELECT * FROM bf_tokenbf_array_test WHERE has(array, 'K1') SETTINGS force_data_skipping_indices='array_bf_tokenbf';
+SELECT * FROM bf_tokenbf_array_test WHERE has(array, 'K2') SETTINGS force_data_skipping_indices='array_bf_tokenbf';
+SELECT * FROM bf_tokenbf_array_test WHERE has(array, 'K3') SETTINGS force_data_skipping_indices='array_bf_tokenbf';
+
+SELECT * FROM bf_tokenbf_array_test WHERE has(array_fixed, 'K1') SETTINGS force_data_skipping_indices='array_fixed_bf_tokenbf';
+SELECT * FROM bf_tokenbf_array_test WHERE has(array_fixed, 'K2') SETTINGS force_data_skipping_indices='array_fixed_bf_tokenbf';
+SELECT * FROM bf_tokenbf_array_test WHERE has(array_fixed, 'K3') SETTINGS force_data_skipping_indices='array_fixed_bf_tokenbf';
+
+SELECT * FROM bf_ngram_array_test WHERE has(array, 'K1') SETTINGS force_data_skipping_indices='array_ngram';
+SELECT * FROM bf_ngram_array_test WHERE has(array, 'K2') SETTINGS force_data_skipping_indices='array_ngram';
+SELECT * FROM bf_ngram_array_test WHERE has(array, 'K3') SETTINGS force_data_skipping_indices='array_ngram';
+
+SELECT * FROM bf_ngram_array_test WHERE has(array_fixed, 'K1') SETTINGS force_data_skipping_indices='array_fixed_ngram';
+SELECT * FROM bf_ngram_array_test WHERE has(array_fixed, 'K2') SETTINGS force_data_skipping_indices='array_fixed_ngram';
+SELECT * FROM bf_ngram_array_test WHERE has(array_fixed, 'K3') SETTINGS force_data_skipping_indices='array_fixed_ngram';
+
+DROP TABLE bf_tokenbf_array_test;
+DROP TABLE bf_ngram_array_test;
diff --git a/tests/queries/0_stateless/02022_bzip2_truncated.reference b/tests/queries/0_stateless/02022_bzip2_truncated.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02022_bzip2_truncated.sh b/tests/queries/0_stateless/02022_bzip2_truncated.sh
new file mode 100755
index 00000000000..16d3e22feb9
--- /dev/null
+++ b/tests/queries/0_stateless/02022_bzip2_truncated.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+tmp_path=$(mktemp "$CURDIR/02022_bzip2_truncate.XXXXXX.bz2")
+trap 'rm -f $tmp_path' EXIT
+
+${CLICKHOUSE_LOCAL} -q "SELECT * FROM numbers(1e6) FORMAT TSV" | bzip2 > "$tmp_path"
+truncate -s10000 "$tmp_path"
+# just ensure that it will exit eventually
+${CLICKHOUSE_LOCAL} -q "SELECT count() FROM file('$tmp_path', 'TSV', 'n UInt64') FORMAT Null" >& /dev/null
+
+exit 0
diff --git a/tests/queries/0_stateless/02022_storage_filelog_one_file.reference b/tests/queries/0_stateless/02022_storage_filelog_one_file.reference
new file mode 100644
index 00000000000..88332de037f
--- /dev/null
+++ b/tests/queries/0_stateless/02022_storage_filelog_one_file.reference
@@ -0,0 +1,41 @@
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+100	100
+101	101
+102	102
+103	103
+104	104
+105	105
+106	106
+107	107
+108	108
+109	109
+110	110
+111	111
+112	112
+113	113
+114	114
+115	115
+116	116
+117	117
+118	118
+119	119
+120	120
diff --git a/tests/queries/0_stateless/02022_storage_filelog_one_file.sh b/tests/queries/0_stateless/02022_storage_filelog_one_file.sh
new file mode 100755
index 00000000000..600e537a352
--- /dev/null
+++ b/tests/queries/0_stateless/02022_storage_filelog_one_file.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+set -eu
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Data preparation.
+# Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
+#  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+for i in {1..20}
+do
+	echo $i, $i >> ${user_files_path}/a.txt
+done
+
+${CLICKHOUSE_CLIENT} --query "drop table if exists file_log;"
+${CLICKHOUSE_CLIENT} --query "create table file_log(k UInt8, v UInt8) engine=FileLog('${user_files_path}/a.txt', 'CSV');"
+
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+for i in {100..120}
+do
+	echo $i, $i >> ${user_files_path}/a.txt
+done
+
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+# touch does not change file content, no event
+touch ${user_files_path}/a.txt
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+${CLICKHOUSE_CLIENT} --query "detach table file_log;"
+${CLICKHOUSE_CLIENT} --query "attach table file_log;"
+
+# should no records return
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+rm -rf ${user_files_path}/a.txt
diff --git a/tests/queries/0_stateless/02023_nullable_int_uint_where.reference b/tests/queries/0_stateless/02023_nullable_int_uint_where.reference
new file mode 100644
index 00000000000..0811eaa4efb
--- /dev/null
+++ b/tests/queries/0_stateless/02023_nullable_int_uint_where.reference
@@ -0,0 +1 @@
+21585718595728998
diff --git a/tests/queries/0_stateless/02023_nullable_int_uint_where.sql b/tests/queries/0_stateless/02023_nullable_int_uint_where.sql
new file mode 100644
index 00000000000..4318fbf506f
--- /dev/null
+++ b/tests/queries/0_stateless/02023_nullable_int_uint_where.sql
@@ -0,0 +1,10 @@
+drop table if exists t1;
+
+set allow_suspicious_low_cardinality_types = 1;
+create table t1 (id LowCardinality(Nullable(Int64))) engine MergeTree order by id settings allow_nullable_key = 1, index_granularity = 1;
+
+insert into t1 values (21585718595728998), (null);
+
+select * from t1 where id = 21585718595728998;
+
+drop table t1;
diff --git a/tests/queries/0_stateless/02023_parser_number_binary_literal.reference b/tests/queries/0_stateless/02023_parser_number_binary_literal.reference
new file mode 100644
index 00000000000..f2356a9a4c0
--- /dev/null
+++ b/tests/queries/0_stateless/02023_parser_number_binary_literal.reference
@@ -0,0 +1,14 @@
+1	UInt8
+2	UInt8
+4	UInt8
+8	UInt8
+Unsigned numbers
+128	UInt8
+32768	UInt16
+2147483648	UInt32
+9223372036854775808	UInt64
+Signed numbers
+-128	Int8
+-32768	Int16
+-2147483648	Int32
+-9223372036854775808	Int64
diff --git a/tests/queries/0_stateless/02023_parser_number_binary_literal.sql b/tests/queries/0_stateless/02023_parser_number_binary_literal.sql
new file mode 100644
index 00000000000..bd5df7845c9
--- /dev/null
+++ b/tests/queries/0_stateless/02023_parser_number_binary_literal.sql
@@ -0,0 +1,16 @@
+SELECT 0b0001 as number, toTypeName(number);
+SELECT 0b0010 as number, toTypeName(number);
+SELECT 0b0100 as number, toTypeName(number);
+SELECT 0b1000 as number, toTypeName(number);
+
+SELECT 'Unsigned numbers';
+SELECT 0b10000000 as number, toTypeName(number);
+SELECT 0b1000000000000000 as number, toTypeName(number);
+SELECT 0b10000000000000000000000000000000 as number, toTypeName(number);
+SELECT 0b1000000000000000000000000000000000000000000000000000000000000000 as number, toTypeName(number);
+
+SELECT 'Signed numbers';
+SELECT -0b10000000 as number, toTypeName(number);
+SELECT -0b1000000000000000 as number, toTypeName(number);
+SELECT -0b10000000000000000000000000000000 as number, toTypeName(number);
+SELECT -0b1000000000000000000000000000000000000000000000000000000000000000 as number, toTypeName(number);
diff --git a/tests/queries/0_stateless/02023_storage_filelog.reference b/tests/queries/0_stateless/02023_storage_filelog.reference
new file mode 100644
index 00000000000..c787d2047db
--- /dev/null
+++ b/tests/queries/0_stateless/02023_storage_filelog.reference
@@ -0,0 +1,287 @@
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+1	1
+1	1
+2	2
+2	2
+3	3
+3	3
+4	4
+4	4
+5	5
+5	5
+6	6
+6	6
+7	7
+7	7
+8	8
+8	8
+9	9
+9	9
+10	10
+10	10
+11	11
+11	11
+12	12
+12	12
+13	13
+13	13
+14	14
+14	14
+15	15
+15	15
+16	16
+16	16
+17	17
+17	17
+18	18
+18	18
+19	19
+19	19
+20	20
+20	20
+100	100
+100	100
+100	100
+101	101
+101	101
+101	101
+102	102
+102	102
+102	102
+103	103
+103	103
+103	103
+104	104
+104	104
+104	104
+105	105
+105	105
+105	105
+106	106
+106	106
+106	106
+107	107
+107	107
+107	107
+108	108
+108	108
+108	108
+109	109
+109	109
+109	109
+110	110
+110	110
+110	110
+111	111
+111	111
+111	111
+112	112
+112	112
+112	112
+113	113
+113	113
+113	113
+114	114
+114	114
+114	114
+115	115
+115	115
+115	115
+116	116
+116	116
+116	116
+117	117
+117	117
+117	117
+118	118
+118	118
+118	118
+119	119
+119	119
+119	119
+120	120
+120	120
+120	120
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+100	100
+101	101
+102	102
+103	103
+104	104
+105	105
+106	106
+107	107
+108	108
+109	109
+110	110
+111	111
+112	112
+113	113
+114	114
+115	115
+116	116
+117	117
+118	118
+119	119
+120	120
+150	150
+151	151
+152	152
+153	153
+154	154
+155	155
+156	156
+157	157
+158	158
+159	159
+160	160
+161	161
+162	162
+163	163
+164	164
+165	165
+166	166
+167	167
+168	168
+169	169
+170	170
+171	171
+172	172
+173	173
+174	174
+175	175
+176	176
+177	177
+178	178
+179	179
+180	180
+181	181
+182	182
+183	183
+184	184
+185	185
+186	186
+187	187
+188	188
+189	189
+190	190
+191	191
+192	192
+193	193
+194	194
+195	195
+196	196
+197	197
+198	198
+199	199
+200	200
+200	200
+201	201
+202	202
+203	203
+204	204
+205	205
+206	206
+207	207
+208	208
+209	209
+210	210
+211	211
+212	212
+213	213
+214	214
+215	215
+216	216
+217	217
+218	218
+219	219
+220	220
+221	221
+222	222
+223	223
+224	224
+225	225
+226	226
+227	227
+228	228
+229	229
+230	230
+231	231
+232	232
+233	233
+234	234
+235	235
+236	236
+237	237
+238	238
+239	239
+240	240
+241	241
+242	242
+243	243
+244	244
+245	245
+246	246
+247	247
+248	248
+249	249
+250	250
+OK
diff --git a/tests/queries/0_stateless/02023_storage_filelog.sh b/tests/queries/0_stateless/02023_storage_filelog.sh
new file mode 100755
index 00000000000..8279e09ff65
--- /dev/null
+++ b/tests/queries/0_stateless/02023_storage_filelog.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+set -eu
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Data preparation.
+# Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
+#  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+mkdir -p ${user_files_path}/logs/
+
+rm -rf ${user_files_path}/logs/*
+
+for i in {1..20}
+do
+	echo $i, $i >> ${user_files_path}/logs/a.txt
+done
+
+${CLICKHOUSE_CLIENT} --query "drop table if exists file_log;"
+${CLICKHOUSE_CLIENT} --query "create table file_log(k UInt8, v UInt8) engine=FileLog('${user_files_path}/logs/', 'CSV');"
+
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/b.txt
+
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+for i in {100..120}
+do
+	echo $i, $i >> ${user_files_path}/logs/a.txt
+done
+
+# touch does not change file content, no event
+touch ${user_files_path}/logs/a.txt
+
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/c.txt
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/d.txt
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/e.txt
+mv ${user_files_path}/logs/b.txt ${user_files_path}/logs/j.txt
+
+rm ${user_files_path}/logs/d.txt
+
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+${CLICKHOUSE_CLIENT} --query "detach table file_log;"
+cp ${user_files_path}/logs/e.txt ${user_files_path}/logs/f.txt
+mv ${user_files_path}/logs/e.txt ${user_files_path}/logs/g.txt
+mv ${user_files_path}/logs/c.txt ${user_files_path}/logs/h.txt
+for i in {150..200}
+do
+	echo $i, $i >> ${user_files_path}/logs/h.txt
+done
+for i in {200..250}
+do
+	echo $i, $i >> ${user_files_path}/logs/i.txt
+done
+${CLICKHOUSE_CLIENT} --query "attach table file_log;"
+
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+${CLICKHOUSE_CLIENT} --query "detach table file_log;"
+${CLICKHOUSE_CLIENT} --query "attach table file_log;"
+
+# should no records return
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;"
+
+truncate ${user_files_path}/logs/a.txt --size 0
+
+# exception happend
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;" 2>&1 | grep -q "Code: 33" && echo 'OK' || echo 'FAIL'
+
+${CLICKHOUSE_CLIENT} --query "drop table file_log;"
+
+rm -rf ${user_files_path}/logs
diff --git a/tests/queries/0_stateless/02023_transform_or_to_in.reference b/tests/queries/0_stateless/02023_transform_or_to_in.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/02023_transform_or_to_in.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/02023_transform_or_to_in.sql b/tests/queries/0_stateless/02023_transform_or_to_in.sql
new file mode 100644
index 00000000000..c4ceeb76931
--- /dev/null
+++ b/tests/queries/0_stateless/02023_transform_or_to_in.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS t_transform_or;
+
+CREATE TABLE t_transform_or(B AggregateFunction(uniq, String), A String) Engine=MergeTree ORDER BY (A);
+
+INSERT INTO t_transform_or SELECT uniqState(''), '0';
+
+SELECT uniqMergeIf(B, (A = '1') OR (A = '2') OR (A = '3'))
+FROM cluster(test_cluster_two_shards, currentDatabase(), t_transform_or)
+SETTINGS legacy_column_name_of_tuple_literal = 0;
+
+SELECT uniqMergeIf(B, (A = '1') OR (A = '2') OR (A = '3'))
+FROM cluster(test_cluster_two_shards, currentDatabase(), t_transform_or)
+SETTINGS legacy_column_name_of_tuple_literal = 1;
+
+DROP TABLE t_transform_or;
diff --git a/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
new file mode 100644
index 00000000000..af23232bb2e
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
@@ -0,0 +1,3 @@
+-- { echo }
+select 1+number+multiIf(number == 1, cityHash64(number), number) from numbers(1) settings compile_expressions=1, min_count_to_compile_expression=0;
+1
diff --git a/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
new file mode 100644
index 00000000000..113d0d9d4f7
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
@@ -0,0 +1,2 @@
+-- { echo }
+select 1+number+multiIf(number == 1, cityHash64(number), number) from numbers(1) settings compile_expressions=1, min_count_to_compile_expression=0;
diff --git a/tests/queries/0_stateless/02024_compression_in_query.reference b/tests/queries/0_stateless/02024_compression_in_query.reference
new file mode 100644
index 00000000000..5b5f8363347
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compression_in_query.reference
@@ -0,0 +1,10 @@
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From client.
+Hello, World! From local.
+Hello, World! From local.
+Hello, World! From local.
+Hello, World! From local.
+Hello, World! From local.
diff --git a/tests/queries/0_stateless/02024_compression_in_query.sh b/tests/queries/0_stateless/02024_compression_in_query.sh
new file mode 100755
index 00000000000..9daf8d1913c
--- /dev/null
+++ b/tests/queries/0_stateless/02024_compression_in_query.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -e
+
+#____________________CLIENT__________________
+# clear files from previous tests.
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz_to_decomp ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz_to_decomp
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_to_decomp ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_to_decomp
+
+# create files using compression method and without it to check that both queries work correct
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World! From client.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM (SELECT 'Hello, World! From client.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
+
+# check content of files
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp
+
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp
+
+# create table to check inserts
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_compression_keyword;"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE test_compression_keyword (text String) Engine=Memory;"
+
+# insert them
+${CLICKHOUSE_CLIENT} --query "INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' COMPRESSION 'gz' FORMAT TabSeparated;"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'gz' FORMAT TabSeparated;"
+
+# check result
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_compression_keyword;"
+
+# delete all created elements
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz"
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS test_compression_keyword;"
+
+#____________________LOCAL__________________
+# clear files from previous tests.
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output.gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz
+[ -e "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz ] && rm "${CLICKHOUSE_TMP}"/test_comp_for_input_and_output_without_gz.gz
+
+# create files using compression method and without it to check that both queries work correct
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;"
+${CLICKHOUSE_LOCAL} --query "SELECT * FROM (SELECT 'Hello, World! From local.') INTO OUTFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'GZ' FORMAT TabSeparated;"
+
+# check content of files
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp
+
+cp ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+gunzip ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp.gz
+cat ${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp
+
+# create table to check inserts
+${CLICKHOUSE_LOCAL} --query "
+DROP TABLE IF EXISTS test_compression_keyword;
+CREATE TABLE test_compression_keyword (text String) Engine=Memory;
+INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' FORMAT TabSeparated;
+INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz' COMPRESSION 'gz' FORMAT TabSeparated;
+INSERT INTO TABLE test_compression_keyword FROM INFILE '${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz' COMPRESSION 'gz' FORMAT TabSeparated;
+SELECT * FROM test_compression_keyword;
+"
+
+# delete all created elements
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output.gz"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz_to_decomp"
+rm -f "${CLICKHOUSE_TMP}/test_comp_for_input_and_output_without_gz"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02024_create_dictionary_with_comment.reference b/tests/queries/0_stateless/02024_create_dictionary_with_comment.reference
new file mode 100644
index 00000000000..45f2c41f0b0
--- /dev/null
+++ b/tests/queries/0_stateless/02024_create_dictionary_with_comment.reference
@@ -0,0 +1,2 @@
+CREATE DICTIONARY default.`2024_dictionary_with_comment`\n(\n    `id` UInt64,\n    `value` String\n)\nPRIMARY KEY id\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT tcpPort() TABLE \'source_table\'))\nLIFETIME(MIN 0 MAX 1000)\nLAYOUT(FLAT())\nCOMMENT \'Test dictionary with comment\'
+Test dictionary with comment
diff --git a/tests/queries/0_stateless/02024_create_dictionary_with_comment.sql b/tests/queries/0_stateless/02024_create_dictionary_with_comment.sql
new file mode 100644
index 00000000000..00557e4cf5c
--- /dev/null
+++ b/tests/queries/0_stateless/02024_create_dictionary_with_comment.sql
@@ -0,0 +1,33 @@
+-----------------------------------------------------------------------------------
+-- Check that `DICTIONARY` can be created with a `COMMENT` clause
+-- and comment is visible both in `comment` column of `system.dictionaries`
+-- and `SHOW CREATE DICTIONARY`.
+-----------------------------------------------------------------------------------
+
+-- prerequisites
+CREATE TABLE source_table
+(
+    id UInt64,
+    value String
+) ENGINE = Memory();
+
+INSERT INTO source_table VALUES (1, 'First');
+INSERT INTO source_table VALUES (2, 'Second');
+
+DROP DICTIONARY IF EXISTS 2024_dictionary_with_comment;
+
+CREATE DICTIONARY 2024_dictionary_with_comment
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'source_table'))
+LAYOUT(FLAT())
+LIFETIME(MIN 0 MAX 1000)
+COMMENT 'Test dictionary with comment';
+
+SHOW CREATE DICTIONARY 2024_dictionary_with_comment;
+SELECT comment FROM system.dictionaries WHERE name == '2024_dictionary_with_comment' AND database == currentDatabase();
+
+DROP DICTIONARY IF EXISTS 2024_dictionary_with_comment;
diff --git a/tests/queries/0_stateless/02024_join_on_or_long.reference b/tests/queries/0_stateless/02024_join_on_or_long.reference
new file mode 100644
index 00000000000..5cd5e5ee5fb
--- /dev/null
+++ b/tests/queries/0_stateless/02024_join_on_or_long.reference
@@ -0,0 +1,64 @@
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02024_join_on_or_long.sql.j2 b/tests/queries/0_stateless/02024_join_on_or_long.sql.j2
new file mode 100644
index 00000000000..58c6e02f426
--- /dev/null
+++ b/tests/queries/0_stateless/02024_join_on_or_long.sql.j2
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+
+CREATE TABLE t1 (`a` Int64, `b` Int64) ENGINE = MergeTree() ORDER BY a;
+CREATE TABLE t2 (`key` Int32, `val` Int64) ENGINE = MergeTree() ORDER BY key;
+
+INSERT INTO t1 SELECT number + 500 as a, -a as b from numbers(1000);
+INSERT INTO t2 SELECT if(number % 2 == 0, toInt64(number), -number) as key, number as val from numbers(1000);
+
+{% for bs in [99, 100, 101, 127, 128, 129, 256, 2048] -%}
+
+SET max_block_size = {{ bs }};
+
+SET join_use_nulls = 1;
+
+SELECT count() == 500 AND count(a) == 500 AND sum(a) == 1499 * 500 / 2 FROM (
+    SELECT a, b, val FROM t1 INNER JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SELECT count() == 1000 AND count(val) == 500 AND sum(val) == 1499 * 500 / 2 FROM (
+    SELECT a, b, val FROM t1 LEFT JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SELECT count() == 1000 AND count(a) == 500 AND sum(val) == 999 * 1000 / 2  FROM (
+    SELECT * FROM t1 RIGHT JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SELECT count() == 1500 AND count(a) == 1000 AND count(val) = 1000 AND sum(val) == 999 * 1000 / 2 AND sum(a) == 1999 * 1000 / 2 FROM (
+    SELECT a, b, val FROM t1 FULL JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SET join_use_nulls = 0;
+
+SELECT count() == 500 AND count(a) == 500 AND sum(a) == 1499 * 500 / 2 FROM (
+    SELECT a, b, val FROM t1 INNER JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SELECT count() == 1000 AND count(val) == 1000 AND sum(val) == 1499 * 500 / 2 FROM (
+    SELECT a, b, val FROM t1 LEFT JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SELECT count() == 1000 AND count(a) == 1000 AND sum(val) == 999 * 1000 / 2  FROM (
+    SELECT * FROM t1 RIGHT JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+SELECT count() == 1500 AND count(a) == 1500 AND count(val) = 1500 AND sum(val) == 999 * 1000 / 2 AND sum(a) == 1999 * 1000 / 2 FROM (
+    SELECT a, b, val FROM t1 FULL JOIN t2 ON t1.a = t2.key OR t1.b = t2.key);
+
+
+{% endfor %}
diff --git a/tests/queries/0_stateless/02024_merge_regexp_assert.reference b/tests/queries/0_stateless/02024_merge_regexp_assert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02024_merge_regexp_assert.sql b/tests/queries/0_stateless/02024_merge_regexp_assert.sql
new file mode 100644
index 00000000000..fed26b08ad9
--- /dev/null
+++ b/tests/queries/0_stateless/02024_merge_regexp_assert.sql
@@ -0,0 +1,10 @@
+-- Tags: no-parallel
+-- (databases can be removed in background, so this test should not be run in parallel)
+
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (b UInt8) ENGINE = Memory;
+SELECT a FROM merge(REGEXP('.'), '^t$'); -- { serverError 47 }
+SELECT a FROM merge(REGEXP('\0'), '^t$'); -- { serverError 47 }
+SELECT a FROM merge(REGEXP('\0a'), '^t$'); -- { serverError 47 }
+SELECT a FROM merge(REGEXP('\0a'), '^$'); -- { serverError 36 }
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/02024_storage_filelog_mv.reference b/tests/queries/0_stateless/02024_storage_filelog_mv.reference
new file mode 100644
index 00000000000..2ebb200a43a
--- /dev/null
+++ b/tests/queries/0_stateless/02024_storage_filelog_mv.reference
@@ -0,0 +1,121 @@
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
+10	10
+11	11
+12	12
+13	13
+14	14
+15	15
+16	16
+17	17
+18	18
+19	19
+20	20
+1	1
+1	1
+1	1
+1	1
+2	2
+2	2
+2	2
+2	2
+3	3
+3	3
+3	3
+3	3
+4	4
+4	4
+4	4
+4	4
+5	5
+5	5
+5	5
+5	5
+6	6
+6	6
+6	6
+6	6
+7	7
+7	7
+7	7
+7	7
+8	8
+8	8
+8	8
+8	8
+9	9
+9	9
+9	9
+9	9
+10	10
+10	10
+10	10
+10	10
+11	11
+11	11
+11	11
+11	11
+12	12
+12	12
+12	12
+12	12
+13	13
+13	13
+13	13
+13	13
+14	14
+14	14
+14	14
+14	14
+15	15
+15	15
+15	15
+15	15
+16	16
+16	16
+16	16
+16	16
+17	17
+17	17
+17	17
+17	17
+18	18
+18	18
+18	18
+18	18
+19	19
+19	19
+19	19
+19	19
+20	20
+20	20
+20	20
+20	20
+100	100
+101	101
+102	102
+103	103
+104	104
+105	105
+106	106
+107	107
+108	108
+109	109
+110	110
+111	111
+112	112
+113	113
+114	114
+115	115
+116	116
+117	117
+118	118
+119	119
+120	120
diff --git a/tests/queries/0_stateless/02024_storage_filelog_mv.sh b/tests/queries/0_stateless/02024_storage_filelog_mv.sh
new file mode 100755
index 00000000000..9ac0c95eae0
--- /dev/null
+++ b/tests/queries/0_stateless/02024_storage_filelog_mv.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+# Tags: long, no-parallel
+
+set -eu
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Data preparation.
+# Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
+#  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+mkdir -p ${user_files_path}/logs/
+rm -rf ${user_files_path}/logs/*
+
+for i in {1..20}
+do
+	echo $i, $i >> ${user_files_path}/logs/a.txt
+done
+
+${CLICKHOUSE_CLIENT} --query "drop table if exists file_log;"
+${CLICKHOUSE_CLIENT} --query "create table file_log(k UInt8, v UInt8) engine=FileLog('${user_files_path}/logs/', 'CSV');"
+
+${CLICKHOUSE_CLIENT} --query "drop table if exists mv;"
+${CLICKHOUSE_CLIENT} --query "create Materialized View mv engine=MergeTree order by k as select * from file_log;"
+
+function count()
+{
+	COUNT=$(${CLICKHOUSE_CLIENT} --query "select count() from mv;")
+	echo $COUNT
+}
+
+while true; do
+	[[ $(count) == 20 ]] && break
+	sleep 1
+done
+
+${CLICKHOUSE_CLIENT} --query "select * from mv order by k;"
+
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/b.txt
+
+# touch does not change file content, no event
+touch ${user_files_path}/logs/a.txt
+
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/c.txt
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/d.txt
+
+for i in {100..120}
+do
+	echo $i, $i >> ${user_files_path}/logs/d.txt
+done
+
+while true; do
+	[[ $(count) == 101 ]] && break
+	sleep 1
+done
+
+${CLICKHOUSE_CLIENT} --query "select * from mv order by k;"
+
+${CLICKHOUSE_CLIENT} --query "drop table mv;"
+${CLICKHOUSE_CLIENT} --query "drop table file_log;"
+
+rm -rf ${user_files_path}/logs
diff --git a/tests/queries/0_stateless/02025_dictionary_array_nested_map.reference b/tests/queries/0_stateless/02025_dictionary_array_nested_map.reference
new file mode 100644
index 00000000000..5e1ee2e8faa
--- /dev/null
+++ b/tests/queries/0_stateless/02025_dictionary_array_nested_map.reference
@@ -0,0 +1 @@
+[{'l':0,'h':10000,'t':0.1},{'l':10001,'h':100000000000000,'t':0.2}]
diff --git a/tests/queries/0_stateless/02025_dictionary_array_nested_map.sql b/tests/queries/0_stateless/02025_dictionary_array_nested_map.sql
new file mode 100644
index 00000000000..1a0dd05c83d
--- /dev/null
+++ b/tests/queries/0_stateless/02025_dictionary_array_nested_map.sql
@@ -0,0 +1,25 @@
+CREATE TABLE dict_nested_map_test_table
+(
+	test_id UInt32,
+	type String,
+	test_config Array(Map(String, Decimal(28,12))),
+	ncp UInt8
+)
+ENGINE=MergeTree()
+ORDER BY test_id;
+
+INSERT INTO dict_nested_map_test_table VALUES (3, 't', [{'l': 0.0, 'h': 10000.0, 't': 0.1}, {'l': 10001.0, 'h': 100000000000000.0, 't': 0.2}], 0);
+
+CREATE DICTIONARY dict_nested_map_dictionary
+(
+	test_id UInt32,
+	type String,
+	test_config Array(Map(String, Decimal(28,12))),
+	ncp UInt8
+)
+PRIMARY KEY test_id
+SOURCE(CLICKHOUSE(TABLE 'dict_nested_map_test_table'))
+LAYOUT(HASHED(PREALLOCATE 1))
+LIFETIME(MIN 1 MAX 1000000);
+
+SELECT dictGet('dict_nested_map_dictionary', 'test_config', toUInt64(3));
diff --git a/tests/queries/0_stateless/02025_dictionary_view_different_db.reference b/tests/queries/0_stateless/02025_dictionary_view_different_db.reference
new file mode 100644
index 00000000000..1aa2c68151a
--- /dev/null
+++ b/tests/queries/0_stateless/02025_dictionary_view_different_db.reference
@@ -0,0 +1 @@
+0	ViewValue	Value
diff --git a/tests/queries/0_stateless/02025_dictionary_view_different_db.sql b/tests/queries/0_stateless/02025_dictionary_view_different_db.sql
new file mode 100644
index 00000000000..b06285b683f
--- /dev/null
+++ b/tests/queries/0_stateless/02025_dictionary_view_different_db.sql
@@ -0,0 +1,43 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS 2025_test_db;
+CREATE DATABASE 2025_test_db;
+
+DROP TABLE IF EXISTS 2025_test_db.test_table;
+CREATE TABLE 2025_test_db.test_table
+(
+    id UInt64,
+    value String
+) ENGINE=TinyLog;
+
+INSERT INTO 2025_test_db.test_table VALUES (0, 'Value');
+
+CREATE DICTIONARY 2025_test_db.test_dictionary
+(
+    id UInt64,
+    value String
+)
+PRIMARY KEY id
+LAYOUT(DIRECT())
+SOURCE(CLICKHOUSE(TABLE 'test_table' DB '2025_test_db'));
+
+DROP TABLE IF EXISTS 2025_test_db.view_table;
+CREATE TABLE 2025_test_db.view_table
+(
+    id UInt64,
+    value String
+) ENGINE=TinyLog;
+
+INSERT INTO 2025_test_db.view_table VALUES (0, 'ViewValue');
+
+DROP VIEW IF EXISTS test_view_different_db;
+CREATE VIEW test_view_different_db AS SELECT id, value, dictGet('2025_test_db.test_dictionary', 'value', id) FROM 2025_test_db.view_table;
+SELECT * FROM test_view_different_db;
+
+DROP TABLE 2025_test_db.test_table;
+DROP DICTIONARY 2025_test_db.test_dictionary;
+DROP TABLE 2025_test_db.view_table;
+
+DROP VIEW test_view_different_db;
+
+DROP DATABASE 2025_test_db;
diff --git a/tests/queries/0_stateless/02025_having_filter_column.reference b/tests/queries/0_stateless/02025_having_filter_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02025_having_filter_column.sql b/tests/queries/0_stateless/02025_having_filter_column.sql
new file mode 100644
index 00000000000..aab419adc16
--- /dev/null
+++ b/tests/queries/0_stateless/02025_having_filter_column.sql
@@ -0,0 +1,40 @@
+drop table if exists test;
+
+-- #29010
+CREATE TABLE test
+(
+    d DateTime,
+    a String,
+    b UInt64
+)
+ENGINE = MergeTree
+PARTITION BY toDate(d)
+ORDER BY d;
+
+SELECT *
+FROM (
+    SELECT
+        a,
+        max((d, b)).2 AS value
+    FROM test
+    GROUP BY rollup(a)
+)
+WHERE a <> '';
+
+-- the same query, but after syntax optimization
+SELECT
+    a,
+    value
+FROM
+(
+    SELECT
+        a,
+        max((d, b)).2 AS value
+    FROM test
+    GROUP BY a
+        WITH ROLLUP
+    HAVING a != ''
+)
+WHERE a != '';
+
+drop table if exists test;
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
new file mode 100644
index 00000000000..2b3b5b30715
--- /dev/null
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.reference
@@ -0,0 +1,12 @@
+-- { echo }
+SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+5
+SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+0
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMerge(n) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+0
+SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+5
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
diff --git a/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
new file mode 100644
index 00000000000..4811023c198
--- /dev/null
+++ b/tests/queries/0_stateless/02025_nested_func_for_if_combinator.sql
@@ -0,0 +1,8 @@
+-- { echo }
+SELECT uniqCombinedIfMerge(n) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 50) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMerge(n) FILTER(WHERE last>50) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10));
+SELECT uniqCombinedIfMergeIfIf(n, last > 5) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
+SELECT uniqCombinedIfMergeIfIf(n, last > 5, 1) FROM (SELECT uniqCombinedIfState(number, number % 2) AS n, max(number) AS last FROM numbers(10)); -- { serverError ILLEGAL_AGGREGATION }
diff --git a/tests/queries/0_stateless/02025_storage_filelog_virtual_col.reference b/tests/queries/0_stateless/02025_storage_filelog_virtual_col.reference
new file mode 100644
index 00000000000..aaa25ebb451
--- /dev/null
+++ b/tests/queries/0_stateless/02025_storage_filelog_virtual_col.reference
@@ -0,0 +1,144 @@
+1	1	a.txt	0
+2	2	a.txt	5
+3	3	a.txt	10
+4	4	a.txt	15
+5	5	a.txt	20
+6	6	a.txt	25
+7	7	a.txt	30
+8	8	a.txt	35
+9	9	a.txt	40
+10	10	a.txt	45
+11	11	a.txt	52
+12	12	a.txt	59
+13	13	a.txt	66
+14	14	a.txt	73
+15	15	a.txt	80
+16	16	a.txt	87
+17	17	a.txt	94
+18	18	a.txt	101
+19	19	a.txt	108
+20	20	a.txt	115
+1	1	b.txt	0
+2	2	b.txt	5
+3	3	b.txt	10
+4	4	b.txt	15
+5	5	b.txt	20
+6	6	b.txt	25
+7	7	b.txt	30
+8	8	b.txt	35
+9	9	b.txt	40
+10	10	b.txt	45
+11	11	b.txt	52
+12	12	b.txt	59
+13	13	b.txt	66
+14	14	b.txt	73
+15	15	b.txt	80
+16	16	b.txt	87
+17	17	b.txt	94
+18	18	b.txt	101
+19	19	b.txt	108
+20	20	b.txt	115
+100	100	a.txt	122
+101	101	a.txt	131
+102	102	a.txt	140
+103	103	a.txt	149
+104	104	a.txt	158
+105	105	a.txt	167
+106	106	a.txt	176
+107	107	a.txt	185
+108	108	a.txt	194
+109	109	a.txt	203
+110	110	a.txt	212
+111	111	a.txt	221
+112	112	a.txt	230
+113	113	a.txt	239
+114	114	a.txt	248
+115	115	a.txt	257
+116	116	a.txt	266
+117	117	a.txt	275
+118	118	a.txt	284
+119	119	a.txt	293
+120	120	a.txt	302
+1	1	c.txt	0
+2	2	c.txt	5
+3	3	c.txt	10
+4	4	c.txt	15
+5	5	c.txt	20
+6	6	c.txt	25
+7	7	c.txt	30
+8	8	c.txt	35
+9	9	c.txt	40
+10	10	c.txt	45
+11	11	c.txt	52
+12	12	c.txt	59
+13	13	c.txt	66
+14	14	c.txt	73
+15	15	c.txt	80
+16	16	c.txt	87
+17	17	c.txt	94
+18	18	c.txt	101
+19	19	c.txt	108
+20	20	c.txt	115
+100	100	c.txt	122
+101	101	c.txt	131
+102	102	c.txt	140
+103	103	c.txt	149
+104	104	c.txt	158
+105	105	c.txt	167
+106	106	c.txt	176
+107	107	c.txt	185
+108	108	c.txt	194
+109	109	c.txt	203
+110	110	c.txt	212
+111	111	c.txt	221
+112	112	c.txt	230
+113	113	c.txt	239
+114	114	c.txt	248
+115	115	c.txt	257
+116	116	c.txt	266
+117	117	c.txt	275
+118	118	c.txt	284
+119	119	c.txt	293
+120	120	c.txt	302
+1	1	e.txt	0
+2	2	e.txt	5
+3	3	e.txt	10
+4	4	e.txt	15
+5	5	e.txt	20
+6	6	e.txt	25
+7	7	e.txt	30
+8	8	e.txt	35
+9	9	e.txt	40
+10	10	e.txt	45
+11	11	e.txt	52
+12	12	e.txt	59
+13	13	e.txt	66
+14	14	e.txt	73
+15	15	e.txt	80
+16	16	e.txt	87
+17	17	e.txt	94
+18	18	e.txt	101
+19	19	e.txt	108
+20	20	e.txt	115
+100	100	e.txt	122
+101	101	e.txt	131
+102	102	e.txt	140
+103	103	e.txt	149
+104	104	e.txt	158
+105	105	e.txt	167
+106	106	e.txt	176
+107	107	e.txt	185
+108	108	e.txt	194
+109	109	e.txt	203
+110	110	e.txt	212
+111	111	e.txt	221
+112	112	e.txt	230
+113	113	e.txt	239
+114	114	e.txt	248
+115	115	e.txt	257
+116	116	e.txt	266
+117	117	e.txt	275
+118	118	e.txt	284
+119	119	e.txt	293
+120	120	e.txt	302
+OK
diff --git a/tests/queries/0_stateless/02025_storage_filelog_virtual_col.sh b/tests/queries/0_stateless/02025_storage_filelog_virtual_col.sh
new file mode 100755
index 00000000000..a92f93991ef
--- /dev/null
+++ b/tests/queries/0_stateless/02025_storage_filelog_virtual_col.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+set -eu
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Data preparation.
+# Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
+#  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+mkdir -p ${user_files_path}/logs/
+
+rm -rf ${user_files_path}/logs/*
+
+for i in {1..20}
+do
+	echo $i, $i >> ${user_files_path}/logs/a.txt
+done
+
+${CLICKHOUSE_CLIENT} --query "drop table if exists file_log;"
+${CLICKHOUSE_CLIENT} --query "create table file_log(k UInt8, v UInt8) engine=FileLog('${user_files_path}/logs/', 'CSV');"
+
+${CLICKHOUSE_CLIENT} --query "select *, _filename, _offset from file_log order by  _filename, _offset;"
+
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/b.txt
+
+${CLICKHOUSE_CLIENT} --query "select *, _filename, _offset from file_log order by  _filename, _offset;"
+
+for i in {100..120}
+do
+	echo $i, $i >> ${user_files_path}/logs/a.txt
+done
+
+# touch does not change file content, no event
+touch ${user_files_path}/logs/a.txt
+
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/c.txt
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/d.txt
+cp ${user_files_path}/logs/a.txt ${user_files_path}/logs/e.txt
+
+rm ${user_files_path}/logs/d.txt
+
+${CLICKHOUSE_CLIENT} --query "select *, _filename, _offset from file_log order by  _filename, _offset;"
+
+${CLICKHOUSE_CLIENT} --query "detach table file_log;"
+${CLICKHOUSE_CLIENT} --query "attach table file_log;"
+
+# should no records return
+${CLICKHOUSE_CLIENT} --query "select *, _filename, _offset from file_log order by  _filename, _offset;"
+
+truncate ${user_files_path}/logs/a.txt --size 0
+
+# exception happend
+${CLICKHOUSE_CLIENT} --query "select * from file_log order by k;" 2>&1 | grep -q "Code: 33" && echo 'OK' || echo 'FAIL'
+
+${CLICKHOUSE_CLIENT} --query "drop table file_log;"
+
+rm -rf ${user_files_path}/logs
diff --git a/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference b/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
new file mode 100644
index 00000000000..431d62da742
--- /dev/null
+++ b/tests/queries/0_stateless/02025_subcolumns_compact_parts.reference
@@ -0,0 +1,8 @@
+0
+0
+0
+0
+0
+0
+40000
+219970
diff --git a/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql b/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql
new file mode 100644
index 00000000000..7d1957a1efc
--- /dev/null
+++ b/tests/queries/0_stateless/02025_subcolumns_compact_parts.sql
@@ -0,0 +1,14 @@
+DROP TABLE IF EXISTS t_comp_subcolumns;
+
+CREATE TABLE t_comp_subcolumns (id UInt32, n Nullable(String), arr Array(Array(UInt32)))
+ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO t_comp_subcolumns SELECT number, 'a', [range(number % 11), range(number % 13)] FROM numbers(20000);
+
+SELECT sum(n.null) FROM t_comp_subcolumns;
+SELECT n.null FROM t_comp_subcolumns LIMIT 10000, 5;
+
+SELECT sum(arr.size0) FROM t_comp_subcolumns;
+SELECT sumArray(arr.size1) FROM t_comp_subcolumns;
+
+DROP TABLE t_comp_subcolumns;
diff --git a/tests/queries/0_stateless/02026_accurate_cast_or_default.reference b/tests/queries/0_stateless/02026_accurate_cast_or_default.reference
new file mode 100644
index 00000000000..67be2da9975
--- /dev/null
+++ b/tests/queries/0_stateless/02026_accurate_cast_or_default.reference
@@ -0,0 +1,32 @@
+0	5
+5
+0	5
+0	5
+5
+0	5
+0	5
+5
+0	5
+0	5
+5
+0	5
+5
+0	5
+5
+0	5
+0	2
+1
+0	2
+\0\0	12
+0	5
+0	5
+0	5
+0	5
+0	5
+0	5
+0	5
+0	5
+0	5
+0	5
+127	127
+0	5
diff --git a/tests/queries/0_stateless/02026_accurate_cast_or_default.sql b/tests/queries/0_stateless/02026_accurate_cast_or_default.sql
new file mode 100644
index 00000000000..1c35055749e
--- /dev/null
+++ b/tests/queries/0_stateless/02026_accurate_cast_or_default.sql
@@ -0,0 +1,36 @@
+SELECT accurateCastOrDefault(-1, 'UInt8'), accurateCastOrDefault(5, 'UInt8');
+SELECT accurateCastOrDefault(5, 'UInt8');
+SELECT accurateCastOrDefault(257, 'UInt8'),  accurateCastOrDefault(257, 'UInt8', 5);
+SELECT accurateCastOrDefault(-1, 'UInt16'),  accurateCastOrDefault(-1, 'UInt16', toUInt16(5));
+SELECT accurateCastOrDefault(5, 'UInt16');
+SELECT accurateCastOrDefault(65536, 'UInt16'),  accurateCastOrDefault(65536, 'UInt16', toUInt16(5));
+SELECT accurateCastOrDefault(-1, 'UInt32'),  accurateCastOrDefault(-1, 'UInt32', toUInt32(5));
+SELECT accurateCastOrDefault(5, 'UInt32');
+SELECT accurateCastOrDefault(4294967296, 'UInt32'),  accurateCastOrDefault(4294967296, 'UInt32', toUInt32(5));
+SELECT accurateCastOrDefault(-1, 'UInt64'), accurateCastOrDefault(-1, 'UInt64', toUInt64(5));
+SELECT accurateCastOrDefault(5, 'UInt64');
+SELECT accurateCastOrDefault(-1, 'UInt256'), accurateCastOrDefault(-1, 'UInt256', toUInt256(5));
+SELECT accurateCastOrDefault(5, 'UInt256');
+SELECT accurateCastOrDefault(-129, 'Int8'), accurateCastOrDefault(-129, 'Int8', toInt8(5));
+SELECT accurateCastOrDefault(5, 'Int8');
+SELECT accurateCastOrDefault(128, 'Int8'),  accurateCastOrDefault(128, 'Int8', toInt8(5));
+
+SELECT accurateCastOrDefault(10, 'Decimal32(9)'), accurateCastOrDefault(10, 'Decimal32(9)', toDecimal32(2, 9));
+SELECT accurateCastOrDefault(1, 'Decimal32(9)');
+SELECT accurateCastOrDefault(-10, 'Decimal32(9)'), accurateCastOrDefault(-10, 'Decimal32(9)', toDecimal32(2, 9));
+
+SELECT accurateCastOrDefault('123', 'FixedString(2)'), accurateCastOrDefault('123', 'FixedString(2)', cast('12', 'FixedString(2)'));
+
+SELECT accurateCastOrDefault(inf, 'Int64'), accurateCastOrDefault(inf, 'Int64', toInt64(5));
+SELECT accurateCastOrDefault(inf, 'Int128'), accurateCastOrDefault(inf, 'Int128', toInt128(5));
+SELECT accurateCastOrDefault(inf, 'Int256'), accurateCastOrDefault(inf, 'Int256', toInt256(5));
+SELECT accurateCastOrDefault(nan, 'Int64'), accurateCastOrDefault(nan, 'Int64', toInt64(5));
+SELECT accurateCastOrDefault(nan, 'Int128'), accurateCastOrDefault(nan, 'Int128', toInt128(5));
+SELECT accurateCastOrDefault(nan, 'Int256'), accurateCastOrDefault(nan, 'Int256', toInt256(5));
+
+SELECT accurateCastOrDefault(inf, 'UInt64'), accurateCastOrDefault(inf, 'UInt64', toUInt64(5));
+SELECT accurateCastOrDefault(inf, 'UInt256'), accurateCastOrDefault(inf, 'UInt256', toUInt256(5));
+SELECT accurateCastOrDefault(nan, 'UInt64'), accurateCastOrDefault(nan, 'UInt64', toUInt64(5));
+SELECT accurateCastOrDefault(nan, 'UInt256'), accurateCastOrDefault(nan, 'UInt256', toUInt256(5));
+
+SELECT accurateCastOrDefault(number + 127, 'Int8') AS x, accurateCastOrDefault(number + 127, 'Int8', toInt8(5)) AS x_with_default FROM numbers (2) ORDER BY number;
diff --git a/tests/queries/0_stateless/02026_arrayDifference_const.reference b/tests/queries/0_stateless/02026_arrayDifference_const.reference
new file mode 100644
index 00000000000..7a0beed21a5
--- /dev/null
+++ b/tests/queries/0_stateless/02026_arrayDifference_const.reference
@@ -0,0 +1 @@
+[0,0]
diff --git a/tests/queries/0_stateless/02026_arrayDifference_const.sql b/tests/queries/0_stateless/02026_arrayDifference_const.sql
new file mode 100644
index 00000000000..55a48d2bedb
--- /dev/null
+++ b/tests/queries/0_stateless/02026_arrayDifference_const.sql
@@ -0,0 +1 @@
+SELECT toString(arrayDifference(x->0, [1, 2]));
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.reference b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
new file mode 100644
index 00000000000..ba792ea9f74
--- /dev/null
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
@@ -0,0 +1,23 @@
+┌─name─┬─type────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┐
+│ d    │ Date                                                │              │                    │                         │                  │                      │
+│ n    │ Nullable(String)                                    │              │                    │ It is a nullable column │                  │                      │
+│ arr1 │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │
+│ arr2 │ Array(Array(String))                                │              │                    │                         │                  │ d + toIntervalDay(1) │
+│ t    │ Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │
+└──────┴─────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┘
+┌─name───────┬─type────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┬─is_subcolumn─┐
+│ d          │ Date                                                │              │                    │                         │                  │                      │            0 │
+│ n          │ Nullable(String)                                    │              │                    │ It is a nullable column │                  │                      │            0 │
+│ arr1       │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            0 │
+│ arr2       │ Array(Array(String))                                │              │                    │                         │                  │ d + toIntervalDay(1) │            0 │
+│ t          │ Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │            0 │
+│ n.null     │ UInt8                                               │              │                    │ It is a nullable column │                  │                      │            1 │
+│ arr1.size0 │ UInt64                                              │              │                    │                         │                  │                      │            1 │
+│ arr2.size0 │ UInt64                                              │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+│ arr2.size1 │ Array(UInt64)                                       │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+│ t.s        │ String                                              │              │                    │                         │ ZSTD(1)          │                      │            1 │
+│ t.a        │ Array(Tuple(a UInt32, b UInt32))                    │              │                    │                         │                  │                      │            1 │
+│ t.a.size0  │ UInt64                                              │              │                    │                         │                  │                      │            1 │
+│ t.a.a      │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            1 │
+│ t.a.b      │ Array(UInt32)                                       │              │                    │                         │ ZSTD(1)          │                      │            1 │
+└────────────┴─────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┴──────────────┘
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.sql b/tests/queries/0_stateless/02026_describe_include_subcolumns.sql
new file mode 100644
index 00000000000..1a58913425c
--- /dev/null
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS t_desc_subcolumns;
+
+CREATE TABLE t_desc_subcolumns
+(
+    d Date,
+    n Nullable(String) COMMENT 'It is a nullable column',
+    arr1 Array(UInt32) CODEC(ZSTD),
+    arr2 Array(Array(String)) TTL d + INTERVAL 1 DAY,
+    t Tuple(s String, a Array(Tuple(a UInt32, b UInt32))) CODEC(ZSTD)
+)
+ENGINE = MergeTree ORDER BY d;
+
+DESCRIBE TABLE t_desc_subcolumns FORMAT PrettyCompactNoEscapes;
+
+DESCRIBE TABLE t_desc_subcolumns FORMAT PrettyCompactNoEscapes
+SETTINGS describe_include_subcolumns = 1;
+
+DROP TABLE t_desc_subcolumns;
diff --git a/tests/queries/0_stateless/02026_storage_filelog_largefile.reference b/tests/queries/0_stateless/02026_storage_filelog_largefile.reference
new file mode 100644
index 00000000000..95240890a95
--- /dev/null
+++ b/tests/queries/0_stateless/02026_storage_filelog_largefile.reference
@@ -0,0 +1,3 @@
+2000000
+2000000
+2000000
diff --git a/tests/queries/0_stateless/02026_storage_filelog_largefile.sh b/tests/queries/0_stateless/02026_storage_filelog_largefile.sh
new file mode 100755
index 00000000000..a6c5d19287e
--- /dev/null
+++ b/tests/queries/0_stateless/02026_storage_filelog_largefile.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+# Tags: long, no-parallel
+
+set -eu
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Data preparation.
+# Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
+#  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+mkdir -p ${user_files_path}/logs/
+
+rm -rf ${user_files_path}/logs/*
+
+chmod 777 ${user_files_path}/logs/
+
+for i in {1..200}
+do
+	${CLICKHOUSE_CLIENT} --query "insert into function file('${user_files_path}/logs/test$i.csv', 'CSV', 'k UInt32, v UInt32') select number, number from numbers(10000);"
+done
+
+${CLICKHOUSE_CLIENT} --query "drop table if exists file_log;"
+${CLICKHOUSE_CLIENT} --query "create table file_log(k UInt32, v UInt32) engine=FileLog('${user_files_path}/logs/', 'CSV');"
+
+${CLICKHOUSE_CLIENT} --query "select count() from file_log "
+
+for i in {201..400}
+do
+	${CLICKHOUSE_CLIENT} --query "insert into function file('${user_files_path}/logs/test$i.csv', 'CSV', 'k UInt32, v UInt32') select number, number from numbers(10000);"
+done
+
+${CLICKHOUSE_CLIENT} --query "select count() from file_log "
+
+for i in {401..600}
+do
+	${CLICKHOUSE_CLIENT} --query "insert into function file('${user_files_path}/logs/test$i.csv', 'CSV', 'k UInt32, v UInt32') select number, number from numbers(10000);"
+done
+
+${CLICKHOUSE_CLIENT} --query "select count() from file_log "
+
+${CLICKHOUSE_CLIENT} --query "drop table file_log;"
+
+rm -rf ${user_files_path}/logs
diff --git a/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
new file mode 100644
index 00000000000..7a0beed21a5
--- /dev/null
+++ b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
@@ -0,0 +1 @@
+[0,0]
diff --git a/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
new file mode 100644
index 00000000000..f9522073154
--- /dev/null
+++ b/tests/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
@@ -0,0 +1 @@
+SELECT toString(arrayCumSumNonNegative(x->0, [1, 2]));
diff --git a/tests/queries/0_stateless/02027_ngrams.reference b/tests/queries/0_stateless/02027_ngrams.reference
new file mode 100644
index 00000000000..4c6afcdf02c
--- /dev/null
+++ b/tests/queries/0_stateless/02027_ngrams.reference
@@ -0,0 +1,20 @@
+['T','e','s','t']
+['Te','es','st']
+['Tes','est']
+['Test']
+[]
+['T','e','s','t']
+['Te','es','st']
+['Tes','est']
+['Test']
+[]
+['T','e','s','t']
+['Te','es','st']
+['Tes','est']
+['Test']
+[]
+['T','e','s','t']
+['Te','es','st']
+['Tes','est']
+['Test']
+[]
diff --git a/tests/queries/0_stateless/02027_ngrams.sql b/tests/queries/0_stateless/02027_ngrams.sql
new file mode 100644
index 00000000000..b9ce36272d8
--- /dev/null
+++ b/tests/queries/0_stateless/02027_ngrams.sql
@@ -0,0 +1,23 @@
+SELECT ngrams('Test', 1);
+SELECT ngrams('Test', 2);
+SELECT ngrams('Test', 3);
+SELECT ngrams('Test', 4);
+SELECT ngrams('Test', 5);
+
+SELECT ngrams(materialize('Test'), 1);
+SELECT ngrams(materialize('Test'), 2);
+SELECT ngrams(materialize('Test'), 3);
+SELECT ngrams(materialize('Test'), 4);
+SELECT ngrams(materialize('Test'), 5);
+
+SELECT ngrams(toFixedString('Test', 4), 1);
+SELECT ngrams(toFixedString('Test', 4), 2);
+SELECT ngrams(toFixedString('Test', 4), 3);
+SELECT ngrams(toFixedString('Test', 4), 4);
+SELECT ngrams(toFixedString('Test', 4), 5);
+
+SELECT ngrams(materialize(toFixedString('Test', 4)), 1);
+SELECT ngrams(materialize(toFixedString('Test', 4)), 2);
+SELECT ngrams(materialize(toFixedString('Test', 4)), 3);
+SELECT ngrams(materialize(toFixedString('Test', 4)), 4);
+SELECT ngrams(materialize(toFixedString('Test', 4)), 5);
diff --git a/tests/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.reference b/tests/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.reference
new file mode 100644
index 00000000000..ad172e61180
--- /dev/null
+++ b/tests/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.reference
@@ -0,0 +1,7 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
+localhost	9000	0		0	0
diff --git a/tests/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.sql b/tests/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.sql
new file mode 100644
index 00000000000..8408f7d17a9
--- /dev/null
+++ b/tests/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.sql
@@ -0,0 +1,19 @@
+-- Tags: distributed, no-parallel, no-replicated-database
+-- Tag no-replicated-database: ON CLUSTER is not allowed
+
+DROP DATABASE IF EXISTS 02028_db ON CLUSTER test_shard_localhost;
+CREATE DATABASE 02028_db ON CLUSTER test_shard_localhost;
+USE 02028_db;
+
+CREATE TABLE t1_local ON CLUSTER test_shard_localhost(partition_col_1 String, tc1 int,tc2 int)ENGINE=MergeTree() PARTITION BY partition_col_1 ORDER BY tc1;
+CREATE TABLE t2_local ON CLUSTER test_shard_localhost(partition_col_1 String, tc1 int,tc2 int)ENGINE=MergeTree() PARTITION BY partition_col_1 ORDER BY tc1;
+
+INSERT INTO t1_local VALUES('partition1', 1,1);
+INSERT INTO t1_local VALUES('partition2', 1,1);
+INSERT INTO t2_local VALUES('partition1', 3,3);
+INSERT INTO t2_local VALUES('partition2', 6,6);
+
+ALTER TABLE t1_local ON CLUSTER test_shard_localhost REPLACE PARTITION 'partition1' FROM  t2_local;
+ALTER TABLE t1_local ON CLUSTER test_shard_localhost MOVE PARTITION 'partition2' TO TABLE t2_local;
+
+DROP DATABASE 02028_db ON CLUSTER test_shard_localhost;
diff --git a/tests/queries/0_stateless/02028_create_select_settings.reference b/tests/queries/0_stateless/02028_create_select_settings.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02028_create_select_settings.sql b/tests/queries/0_stateless/02028_create_select_settings.sql
new file mode 100644
index 00000000000..5275d335f53
--- /dev/null
+++ b/tests/queries/0_stateless/02028_create_select_settings.sql
@@ -0,0 +1 @@
+create table test_table engine MergeTree order by a as select a_table.a, b_table.b_arr from (select arrayJoin(range(10000)) as a) a_table cross join (select range(10000) as b_arr) b_table settings max_memory_usage = 1; -- { serverError MEMORY_LIMIT_EXCEEDED }
diff --git a/tests/queries/0_stateless/02028_system_data_skipping_indices_size.reference b/tests/queries/0_stateless/02028_system_data_skipping_indices_size.reference
new file mode 100644
index 00000000000..d0378511850
--- /dev/null
+++ b/tests/queries/0_stateless/02028_system_data_skipping_indices_size.reference
@@ -0,0 +1 @@
+default	test_table	value_index	minmax	value	1	38	12	24
diff --git a/tests/queries/0_stateless/02028_system_data_skipping_indices_size.sql b/tests/queries/0_stateless/02028_system_data_skipping_indices_size.sql
new file mode 100644
index 00000000000..e77f88aa36f
--- /dev/null
+++ b/tests/queries/0_stateless/02028_system_data_skipping_indices_size.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS test_table;
+
+CREATE TABLE test_table
+(
+    key UInt64,
+    value String,
+    INDEX value_index value TYPE minmax GRANULARITY 1
+)
+Engine=MergeTree()
+ORDER BY key;
+
+INSERT INTO test_table VALUES (0, 'Value');
+SELECT * FROM system.data_skipping_indices WHERE database = currentDatabase();
+
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02028_tokens.reference b/tests/queries/0_stateless/02028_tokens.reference
new file mode 100644
index 00000000000..04098272263
--- /dev/null
+++ b/tests/queries/0_stateless/02028_tokens.reference
@@ -0,0 +1,16 @@
+['test']
+['test1','test2','test3']
+['test1','test2','test3','test4']
+['test1','test2','test3','test4']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['test']
+['test1','test2','test3']
+['test1','test2','test3','test4']
+['test1','test2','test3','test4']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
+['ё','ё','జ్ఞ‌ా','本気ですか','ﷺ','ᾂ','ΐ','שּ']
diff --git a/tests/queries/0_stateless/02028_tokens.sql b/tests/queries/0_stateless/02028_tokens.sql
new file mode 100644
index 00000000000..16c88397cba
--- /dev/null
+++ b/tests/queries/0_stateless/02028_tokens.sql
@@ -0,0 +1,17 @@
+SELECT tokens('test');
+SELECT tokens('test1, test2, test3');
+SELECT tokens('test1, test2,     test3, test4');
+SELECT tokens('test1,;\ test2,;\ test3,;\   test4');
+SELECT tokens('ё ё జ్ఞ‌ా 本気ですか ﷺ ᾂ ΐ שּ');
+SELECT tokens('ё, ё, జ్ఞ‌ా, 本気ですか, ﷺ, ᾂ, ΐ, שּ');
+SELECT tokens('ё, ё, జ్ఞ‌ా, 本気ですか, ﷺ, ᾂ, ΐ,    שּ');
+SELECT tokens('ё;\ ё;\ జ్ఞ‌ా;\ 本気ですか;\ ﷺ;\ ᾂ;\ ΐ;\    שּ');
+
+SELECT tokens(materialize('test'));
+SELECT tokens(materialize('test1, test2, test3'));
+SELECT tokens(materialize('test1, test2,    test3, test4'));
+SELECT tokens(materialize('test1,;\ test2,;\ test3,;\    test4'));
+SELECT tokens(materialize('ё ё జ్ఞ‌ా 本気ですか ﷺ ᾂ ΐ שּ'));
+SELECT tokens(materialize('ё, ё, జ్ఞ‌ా, 本気ですか, ﷺ, ᾂ, ΐ, שּ'));
+SELECT tokens(materialize('ё, ё, జ్ఞ‌ా, 本気ですか, ﷺ, ᾂ, ΐ,    שּ'));
+SELECT tokens(materialize('ё;\ ё;\ జ్ఞ‌ా;\ 本気ですか;\ ﷺ;\ ᾂ;\ ΐ;\    שּ'));
diff --git a/tests/queries/0_stateless/02029_orc_low_cardinality.reference b/tests/queries/0_stateless/02029_orc_low_cardinality.reference
new file mode 100644
index 00000000000..51537082c87
--- /dev/null
+++ b/tests/queries/0_stateless/02029_orc_low_cardinality.reference
@@ -0,0 +1,10 @@
+0	['0']	('0')
+1	['1']	('1')
+2	['2']	('2')
+3	['3']	('3')
+4	['4']	('4')
+5	['5']	('5')
+6	['6']	('6')
+7	['7']	('7')
+8	['8']	('8')
+9	['9']	('9')
diff --git a/tests/queries/0_stateless/02029_orc_low_cardinality.sh b/tests/queries/0_stateless/02029_orc_low_cardinality.sh
new file mode 100755
index 00000000000..44584a8d969
--- /dev/null
+++ b/tests/queries/0_stateless/02029_orc_low_cardinality.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Tags: no-unbundled, no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS orc_lc";
+
+
+$CLICKHOUSE_CLIENT --query="CREATE TABLE orc_lc (lc LowCardinality(String), array_lc Array(LowCardinality(String)), tuple_lc  Tuple(LowCardinality(String))) ENGINE = Memory()";
+
+
+$CLICKHOUSE_CLIENT --query="SELECT [lc] as array_lc, tuple(lc) as tuple_lc, toLowCardinality(toString(number)) as lc from numbers(10) FORMAT ORC" | $CLICKHOUSE_CLIENT --query="INSERT INTO orc_lc FORMAT ORC";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM orc_lc";
diff --git a/tests/queries/0_stateless/02029_output_csv_null_representation.reference b/tests/queries/0_stateless/02029_output_csv_null_representation.reference
new file mode 100644
index 00000000000..a5174f4424f
--- /dev/null
+++ b/tests/queries/0_stateless/02029_output_csv_null_representation.reference
@@ -0,0 +1,4 @@
+# output_format_csv_null_representation should initially be \\N
+"val1",\N,"val3"
+# Changing output_format_csv_null_representation
+"val1",∅,"val3"
diff --git a/tests/queries/0_stateless/02029_output_csv_null_representation.sql b/tests/queries/0_stateless/02029_output_csv_null_representation.sql
new file mode 100644
index 00000000000..772c6c89144
--- /dev/null
+++ b/tests/queries/0_stateless/02029_output_csv_null_representation.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS test_data;
+CREATE TABLE test_data (
+    col1 Nullable(String),
+    col2 Nullable(String),
+    col3 Nullable(String)
+) ENGINE = Memory;
+
+INSERT INTO test_data VALUES ('val1', NULL, 'val3');
+
+SELECT '# output_format_csv_null_representation should initially be \\N';
+SELECT * FROM test_data FORMAT CSV;
+
+SELECT '# Changing output_format_csv_null_representation';
+SET output_format_csv_null_representation = '∅';
+SELECT * FROM test_data FORMAT CSV;
+SET output_format_csv_null_representation = '\\N';
diff --git a/tests/queries/0_stateless/02029_quantile_sanitizer.reference b/tests/queries/0_stateless/02029_quantile_sanitizer.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02029_quantile_sanitizer.sql b/tests/queries/0_stateless/02029_quantile_sanitizer.sql
new file mode 100644
index 00000000000..3e06775ce4c
--- /dev/null
+++ b/tests/queries/0_stateless/02029_quantile_sanitizer.sql
@@ -0,0 +1 @@
+SELECT quantileTDigestWeighted(-0.)(toDateTime(10000000000.), 1); -- { serverError DECIMAL_OVERFLOW }
diff --git a/tests/queries/0_stateless/02029_test_implemented_methods.reference b/tests/queries/0_stateless/02029_test_implemented_methods.reference
new file mode 100644
index 00000000000..0044ca5dab1
--- /dev/null
+++ b/tests/queries/0_stateless/02029_test_implemented_methods.reference
@@ -0,0 +1,3 @@
+< HTTP/1.1 200 OK
+< HTTP/1.1 501 Not Implemented
+< HTTP/1.1 200 OK
diff --git a/tests/queries/0_stateless/02029_test_implemented_methods.sh b/tests/queries/0_stateless/02029_test_implemented_methods.sh
new file mode 100755
index 00000000000..093cb3d0173
--- /dev/null
+++ b/tests/queries/0_stateless/02029_test_implemented_methods.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CURL "${CLICKHOUSE_URL}" -X GET -d "SELECT 1" -vs 2>&1 | grep "OK"
+$CLICKHOUSE_CURL "${CLICKHOUSE_URL}" -X aaa -vs 2>&1 | grep "Not Implemented"
+$CLICKHOUSE_CURL "${CLICKHOUSE_URL}" -d "SELECT 1" -vs 2>&1 | grep "OK"
diff --git a/tests/queries/0_stateless/02029_test_options_requests.reference b/tests/queries/0_stateless/02029_test_options_requests.reference
new file mode 100644
index 00000000000..8b001eacbe3
--- /dev/null
+++ b/tests/queries/0_stateless/02029_test_options_requests.reference
@@ -0,0 +1,5 @@
+< HTTP/1.1 204 No Content
+< Access-Control-Allow-Origin: *
+< Access-Control-Allow-Headers: origin, x-requested-with
+< Access-Control-Allow-Methods: POST, GET, OPTIONS
+< Access-Control-Max-Age: 86400
diff --git a/tests/queries/0_stateless/02029_test_options_requests.sh b/tests/queries/0_stateless/02029_test_options_requests.sh
new file mode 100755
index 00000000000..8ea09e3ffe6
--- /dev/null
+++ b/tests/queries/0_stateless/02029_test_options_requests.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# grep all fields, that should be set for CORS support (see CORS.xml)
+$CLICKHOUSE_CURL "${CLICKHOUSE_URL}" -X OPTIONS -vs 2>&1 | grep -E "HTTP/1.1 204 No Content|Access-Control-Allow-Origin|Access-Control-Allow-Headers|Access-Control-Allow-Methods|Access-Control-Max-Age"
diff --git a/tests/queries/0_stateless/02030_capnp_format.reference b/tests/queries/0_stateless/02030_capnp_format.reference
new file mode 100644
index 00000000000..8c3c81b5bc3
--- /dev/null
+++ b/tests/queries/0_stateless/02030_capnp_format.reference
@@ -0,0 +1,53 @@
+-1	1	-1000	1000	-10000000	1000000	-1000000000	1000000000	123.123	123123123.12312312	Some string	fixed	Some data	2000-01-06	2000-06-01 19:42:42	2000-04-01 11:21:33.123
+-1	1	-1000	1000	-10000000	1000000	-1000000000	1000000000	123.123	123123123.12312312	Some string	fixed	Some data	2000-01-06	2000-06-01 19:42:42	2000-04-01 11:21:33.123
+1	(2,(3,4))	(((5)))
+1	(2,(3,4))	(((5)))
+1	[1,2,3]	[[[1,2,3],[4,5,6]],[[7,8,9],[]],[]]
+1	[1,2,3]	[[[1,2,3],[4,5,6]],[[7,8,9],[]],[]]
+1	((2,[[3,4],[5,6],[]]),[([[(7,8),(9,10)],[(11,12),(13,14)],[]],[([15,16,17]),([])])])
+1	((2,[[3,4],[5,6],[]]),[([[(7,8),(9,10)],[(11,12),(13,14)],[]],[([15,16,17]),([])])])
+[1,2,3]	[[4,5,6],[],[7,8]]	[(9,10),(11,12),(13,14)]
+[1,2,3]	[[4,5,6],[],[7,8]]	[(9,10),(11,12),(13,14)]
+1	[1,NULL,2]	(1)
+\N	[NULL,NULL,42]	(NULL)
+1	[1,NULL,2]	(1)
+\N	[NULL,NULL,42]	(NULL)
+one
+two
+tHrEe
+oNe
+tWo
+threE
+first
+second
+third
+OK
+OK
+OK
+OK
+one	two	['one',NULL,'two',NULL]
+two	\N	[NULL]
+one	two	['one',NULL,'two',NULL]
+two	\N	[NULL]
+0	1	2
+1	2	3
+2	3	4
+3	4	5
+4	5	6
+(0,(1,(2)))
+(1,(2,(3)))
+(2,(3,(4)))
+(3,(4,(5)))
+(4,(5,(6)))
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
diff --git a/tests/queries/0_stateless/02030_capnp_format.sh b/tests/queries/0_stateless/02030_capnp_format.sh
new file mode 100755
index 00000000000..aa2fe6c1b35
--- /dev/null
+++ b/tests/queries/0_stateless/02030_capnp_format.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+CAPN_PROTO_FILE=$USER_FILES_PATH/data.capnp
+touch $CAPN_PROTO_FILE
+
+SCHEMADIR=$(clickhouse-client --query "select * from file('data.capnp', 'CapnProto', 'val1 char') settings format_schema='nonexist:Message'" 2>&1 | grep Exception | grep -oP "file \K.*(?=/nonexist.capnp)")
+CLIENT_SCHEMADIR=$CURDIR/format_schemas
+SERVER_SCHEMADIR=test_02030
+mkdir -p $SCHEMADIR/$SERVER_SCHEMADIR
+cp -r $CLIENT_SCHEMADIR/02030_* $SCHEMADIR/$SERVER_SCHEMADIR/
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_simple_types";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_simple_types (int8 Int8, uint8 UInt8, int16 Int16, uint16 UInt16, int32 Int32, uint32 UInt32, int64 Int64, uint64 UInt64, float32 Float32, float64 Float64, string String, fixed FixedString(5), data String, date Date, datetime DateTime, datetime64 DateTime64(3)) ENGINE=Memory"
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_simple_types values (-1, 1, -1000, 1000, -10000000, 1000000, -1000000000, 1000000000, 123.123, 123123123.123123123, 'Some string', 'fixed', 'Some data', '2000-01-06', '2000-06-01 19:42:42', '2000-04-01 11:21:33.123')"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_simple_types FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_simple_types:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_simple_types FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_simple_types:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_simple_types"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_simple_types"
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_tuples"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_tuples (value UInt64, tuple1 Tuple(one UInt64, two Tuple(three UInt64, four UInt64)), tuple2 Tuple(nested1 Tuple(nested2 Tuple(x UInt64)))) ENGINE=Memory";
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_tuples VALUES (1, (2, (3, 4)), (((5))))"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_tuples FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_tuples:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_tuples FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_tuples:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_tuples"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_tuples"
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_lists"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_lists (value UInt64, list1 Array(UInt64), list2 Array(Array(Array(UInt64)))) ENGINE=Memory";
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_lists VALUES (1, [1, 2, 3], [[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], []], []])"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_lists FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_lists:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_lists FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_lists:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_lists"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_lists"
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_nested_lists_and_tuples"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_nested_lists_and_tuples (value UInt64, nested Tuple(a Tuple(b UInt64, c Array(Array(UInt64))), d Array(Tuple(e Array(Array(Tuple(f UInt64, g UInt64))), h Array(Tuple(k Array(UInt64))))))) ENGINE=Memory";
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_nested_lists_and_tuples VALUES (1, ((2, [[3, 4], [5, 6], []]), [([[(7, 8), (9, 10)], [(11, 12), (13, 14)], []], [([15, 16, 17]), ([])])]))"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_nested_lists_and_tuples FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nested_lists_and_tuples:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_nested_lists_and_tuples FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nested_lists_and_tuples:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_nested_lists_and_tuples"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_nested_lists_and_tuples"
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_nested_table"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_nested_table (nested Nested(value UInt64, array Array(UInt64), tuple Tuple(one UInt64, two UInt64))) ENGINE=Memory";
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_nested_table VALUES ([1, 2, 3], [[4, 5, 6], [], [7, 8]], [(9, 10), (11, 12), (13, 14)])"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_nested_table FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nested_table:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_nested_table FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nested_table:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_nested_table"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_nested_table"
+
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_nullable"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_nullable (nullable Nullable(UInt64), array Array(Nullable(UInt64)), tuple Tuple(nullable Nullable(UInt64))) ENGINE=Memory";
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_nullable VALUES (1, [1, Null, 2], (1)), (Null, [Null, Null, 42], (Null))"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_nullable FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nullable:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_nullable FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nullable:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_nullable"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_nullable"
+
+
+$CLICKHOUSE_CLIENT --query="SELECT CAST(number, 'Enum(\'one\' = 0, \'two\' = 1, \'tHrEe\' = 2)') AS value FROM numbers(3) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_enum:Message'" > $CAPN_PROTO_FILE
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'one\' = 1, \'two\' = 2, \'tHrEe\' = 3)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_names'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'oNe\' = 1, \'tWo\' = 2, \'threE\' = 3)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_names_case_insensitive'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'first\' = 0, \'second\' = 1, \'third\' = 2)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_values'"
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'one\' = 0, \'two\' = 1, \'three\' = 2)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_names'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'one\' = 0, \'two\' = 1, \'tHrEe\' = 2, \'four\' = 3)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_names'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'one\' = 1, \'two\' = 2, \'tHrEe\' = 3)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_values'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'value Enum(\'first\' = 1, \'two\' = 2, \'three\' = 3)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_enum:Message', format_capn_proto_enum_comparising_mode='by_names_case_insensitive'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS capnp_low_cardinality"
+$CLICKHOUSE_CLIENT --query="CREATE TABLE capnp_low_cardinality (lc1 LowCardinality(String), lc2 LowCardinality(Nullable(String)), lc3 Array(LowCardinality(Nullable(String)))) ENGINE=Memory"
+$CLICKHOUSE_CLIENT --query="INSERT INTO capnp_low_cardinality VALUES ('one', 'two', ['one', Null, 'two', Null]), ('two', Null, [Null])"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_low_cardinality FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_low_cardinality:Message'" |  $CLICKHOUSE_CLIENT --query="INSERT INTO capnp_low_cardinality FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_low_cardinality:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM capnp_low_cardinality"
+$CLICKHOUSE_CLIENT --query="DROP TABLE capnp_low_cardinality"
+
+
+$CLICKHOUSE_CLIENT --query="SELECT CAST(tuple(number, tuple(number + 1, tuple(number + 2))), 'Tuple(b UInt64, c Tuple(d UInt64, e Tuple(f UInt64)))') AS a FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nested_tuples:Message'" > $CAPN_PROTO_FILE
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'a_b UInt64, a_c_d UInt64, a_c_e_f UInt64') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_nested_tuples:Message'"
+
+
+$CLICKHOUSE_CLIENT --query="SELECT number AS a_b, number + 1 AS a_c_d, number + 2 AS a_c_e_f FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_nested_tuples:Message'" > $CAPN_PROTO_FILE
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'a Tuple(b UInt64, c Tuple(d UInt64, e Tuple(f UInt64)))') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_nested_tuples:Message'"
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'a Tuple(bb UInt64, c Tuple(d UInt64, e Tuple(f UInt64)))') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_nested_tuples:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'a Tuple(b UInt64, c Tuple(d UInt64, e Tuple(ff UInt64)))') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_nested_tuples:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'string String') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "INCORRECT_DATA" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT number AS uint64 FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_simple_types:Message'" > $CAPN_PROTO_FILE
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 String') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Array(UInt64)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Enum(\'one\' = 1)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Tuple(UInt64)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Nullable(UInt64)') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT * FROM file('data.capnp', 'CapnProto', 'uint64 Int32') SETTINGS format_schema='$SERVER_SCHEMADIR/02030_capnp_simple_types:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+
+
+$CLICKHOUSE_CLIENT --query="SELECT number AS a, toString(number) as b FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_unnamed_union:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT toNullable(toString(number)) as nullable1 FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_fake_nullable:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="SELECT toNullable(toString(number)) as nullable2 FROM numbers(5) FORMAT CapnProto SETTINGS format_schema='$CLIENT_SCHEMADIR/02030_capnp_fake_nullable:Message'" 2>&1 | grep -F -q "CAPN_PROTO_BAD_CAST" && echo 'OK' || echo 'FAIL';
+
+rm $CAPN_PROTO_FILE
+rm -rf ${SCHEMADIR:?}/${SERVER_SCHEMADIR:?}
diff --git a/tests/queries/0_stateless/02030_client_unknown_database.reference b/tests/queries/0_stateless/02030_client_unknown_database.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02030_client_unknown_database.sh b/tests/queries/0_stateless/02030_client_unknown_database.sh
new file mode 100755
index 00000000000..28bd4895a23
--- /dev/null
+++ b/tests/queries/0_stateless/02030_client_unknown_database.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CLICKHOUSE_DATABASE=no_such_database_could_exist
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "SELECT 1" |& grep -q UNKNOWN_DATABASE
diff --git a/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference
new file mode 100644
index 00000000000..eb8bc83384e
--- /dev/null
+++ b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.reference
@@ -0,0 +1,6 @@
+1	{'1-K1':'1-V1','1-K2':'1-V2'}
+1	{'1-K1':'1-V1','1-K2':'1-V2'}
+2	{'2-K1':'2-V1','2-K2':'2-V2'}
+4	{'4-K1':'4-V1','4-K2':'4-V2'}
+5	{'5-K1':'5-V1','5-K2':'5-V2'}
+6	{'6-K1':'6-V1','6-K2':'6-V2'}
diff --git a/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql
new file mode 100644
index 00000000000..7d9722b4c90
--- /dev/null
+++ b/tests/queries/0_stateless/02030_function_mapContainsKeyLike.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS map_containsKeyLike_test;
+
+CREATE TABLE map_containsKeyLike_test (id UInt32, map Map(String, String)) Engine=MergeTree() ORDER BY id settings index_granularity=2;
+
+INSERT INTO map_containsKeyLike_test VALUES (1, {'1-K1':'1-V1','1-K2':'1-V2'}),(2,{'2-K1':'2-V1','2-K2':'2-V2'});
+INSERT INTO map_containsKeyLike_test VALUES (3, {'3-K1':'3-V1','3-K2':'3-V2'}),(4, {'4-K1':'4-V1','4-K2':'4-V2'});
+INSERT INTO map_containsKeyLike_test VALUES (5, {'5-K1':'5-V1','5-K2':'5-V2'}),(6, {'6-K1':'6-V1','6-K2':'6-V2'});
+
+SELECT id, map FROM map_containsKeyLike_test WHERE mapContainsKeyLike(map, '1-%') = 1;
+SELECT id, map FROM map_containsKeyLike_test WHERE mapContainsKeyLike(map, '3-%') = 0 order by id;
+
+DROP TABLE map_containsKeyLike_test;
diff --git a/tests/queries/0_stateless/02030_quantiles_underflow.reference b/tests/queries/0_stateless/02030_quantiles_underflow.reference
new file mode 100644
index 00000000000..907330658e6
--- /dev/null
+++ b/tests/queries/0_stateless/02030_quantiles_underflow.reference
@@ -0,0 +1 @@
+[-1717986918.2,1.8]
diff --git a/tests/queries/0_stateless/02030_quantiles_underflow.sql b/tests/queries/0_stateless/02030_quantiles_underflow.sql
new file mode 100644
index 00000000000..cb5ad3dac87
--- /dev/null
+++ b/tests/queries/0_stateless/02030_quantiles_underflow.sql
@@ -0,0 +1,6 @@
+SELECT
+    arrayMap(y -> round(y, 1), quantilesExactInclusive(0.1, 0.9)(x)) AS q
+FROM
+(
+    SELECT arrayJoin([-2147483648, 1, 2]) AS x
+);
diff --git a/tests/queries/0_stateless/02030_rocksdb_race_long.reference b/tests/queries/0_stateless/02030_rocksdb_race_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02030_rocksdb_race_long.sh b/tests/queries/0_stateless/02030_rocksdb_race_long.sh
new file mode 100755
index 00000000000..88c30852c86
--- /dev/null
+++ b/tests/queries/0_stateless/02030_rocksdb_race_long.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# Tags: race
+
+unset CLICKHOUSE_LOG_COMMENT
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+set -o errexit
+set -o pipefail
+
+echo "
+	DROP TABLE IF EXISTS rocksdb_race;
+	CREATE TABLE rocksdb_race (key String, value UInt32) Engine=EmbeddedRocksDB PRIMARY KEY(key);
+    INSERT INTO rocksdb_race SELECT '1_' || toString(number), number FROM numbers(100000);
+" | $CLICKHOUSE_CLIENT -n
+
+function read_stat_thread()
+{
+    while true; do
+        echo "
+            SELECT * FROM system.rocksdb FORMAT Null;
+        " | $CLICKHOUSE_CLIENT -n
+    done
+}
+
+function truncate_thread()
+{
+    while true; do
+        sleep 3s;
+        echo "
+            TRUNCATE TABLE rocksdb_race;
+        " | $CLICKHOUSE_CLIENT -n
+    done
+}
+
+# https://stackoverflow.com/questions/9954794/execute-a-shell-function-with-timeout
+export -f read_stat_thread;
+export -f truncate_thread;
+
+TIMEOUT=20
+
+timeout $TIMEOUT bash -c read_stat_thread 2> /dev/null &
+timeout $TIMEOUT bash -c truncate_thread 2> /dev/null &
+
+wait
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE rocksdb_race"
diff --git a/tests/queries/0_stateless/02030_tuple_filter.reference b/tests/queries/0_stateless/02030_tuple_filter.reference
new file mode 100644
index 00000000000..a2e1290c0e1
--- /dev/null
+++ b/tests/queries/0_stateless/02030_tuple_filter.reference
@@ -0,0 +1,8 @@
+1	A	2021-01-01
+1	A	2021-01-01
+1	A	2021-01-01
+1	A	2021-01-01
+1	A	2021-01-01
+1	A	2021-01-01
+1	A	2021-01-01
+1	A	2021-01-01
diff --git a/tests/queries/0_stateless/02030_tuple_filter.sql b/tests/queries/0_stateless/02030_tuple_filter.sql
new file mode 100644
index 00000000000..5efedeb8c0d
--- /dev/null
+++ b/tests/queries/0_stateless/02030_tuple_filter.sql
@@ -0,0 +1,41 @@
+DROP TABLE IF EXISTS test_tuple_filter;
+
+CREATE TABLE test_tuple_filter (id UInt32, value String, log_date Date) Engine=MergeTree() ORDER BY id PARTITION BY log_date SETTINGS index_granularity = 3;
+
+INSERT INTO test_tuple_filter VALUES (1,'A','2021-01-01'),(2,'B','2021-01-01'),(3,'C','2021-01-01'),(4,'D','2021-01-02'),(5,'E','2021-01-02');
+
+SET force_primary_key = 1;
+
+SELECT * FROM test_tuple_filter WHERE (id, value) = (1, 'A');
+SELECT * FROM test_tuple_filter WHERE (1, 'A') = (id, value);
+SELECT * FROM test_tuple_filter WHERE (id, value) = (1, 'A') AND (id, log_date) = (1, '2021-01-01');
+SELECT * FROM test_tuple_filter WHERE ((id, value), id * 2) = ((1, 'A'), 2);
+SELECT * FROM test_tuple_filter WHERE ((id, value), log_date) = ((1, 'A'), '2021-01-01');
+
+-- not supported functions (concat) do not lost
+SELECT * FROM test_tuple_filter WHERE (id, value, value||'foo') = ('1', 'A', 'A');
+
+-- Condition fully moved to PREWHERE and such conditions does not supported yet.
+SELECT * FROM test_tuple_filter WHERE (1, (1, (1, (1, (id, value))))) = (1, (1, (1, (1, (1, 'A'))))); -- { serverError INDEX_NOT_USED }
+
+-- not implemented yet
+SELECT * FROM test_tuple_filter WHERE (1, value) = (id, 'A'); -- { serverError INDEX_NOT_USED }
+SELECT * FROM test_tuple_filter WHERE (1, (1, (1, (1, tuple(id))))) = (1, (1, (1, (1, tuple(1))))); -- { serverError INDEX_NOT_USED }
+SELECT * FROM test_tuple_filter WHERE ((id, value), tuple(log_date)) = ((1, 'A'), tuple('2021-01-01')); -- { serverError INDEX_NOT_USED }
+
+SET force_index_by_date = 1;
+SET force_primary_key = 0;
+SELECT * FROM test_tuple_filter WHERE (log_date, value) = ('2021-01-01', 'A');
+
+SET force_index_by_date = 0;
+SET force_primary_key = 0;
+
+SELECT * FROM test_tuple_filter WHERE (1, value) = (id, 'A');
+SELECT * FROM test_tuple_filter WHERE tuple(id) = tuple(1);
+
+SELECT * FROM test_tuple_filter WHERE (log_date, value) = tuple('2021-01-01'); -- { serverError 43 }
+SELECT * FROM test_tuple_filter WHERE (id, value) = tuple(1); -- { serverError 43 }
+SELECT * FROM test_tuple_filter WHERE tuple(id, value) = tuple(value, id); -- { serverError 386 }
+SELECT * FROM test_tuple_filter WHERE equals((id, value)); -- { serverError 42 }
+
+DROP TABLE IF EXISTS test_tuple_filter;
diff --git a/tests/queries/0_stateless/02031_format_query_option.reference b/tests/queries/0_stateless/02031_format_query_option.reference
new file mode 100644
index 00000000000..2e3761f7a2c
--- /dev/null
+++ b/tests/queries/0_stateless/02031_format_query_option.reference
@@ -0,0 +1 @@
+SELECT 1
diff --git a/tests/queries/0_stateless/02031_format_query_option.sh b/tests/queries/0_stateless/02031_format_query_option.sh
new file mode 100755
index 00000000000..1e87200950d
--- /dev/null
+++ b/tests/queries/0_stateless/02031_format_query_option.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_FORMAT} --query "SELECT 1"
diff --git a/tests/queries/0_stateless/02032_short_circuit_least_greatest_bug.reference b/tests/queries/0_stateless/02032_short_circuit_least_greatest_bug.reference
new file mode 100644
index 00000000000..57c88cc489e
--- /dev/null
+++ b/tests/queries/0_stateless/02032_short_circuit_least_greatest_bug.reference
@@ -0,0 +1,20 @@
+0
+1
+1
+1
+1
+1
+0
+1
+1
+1
+0
+1
+0
+0
+0
+1
+0
+1
+0
+0
diff --git a/tests/queries/0_stateless/02032_short_circuit_least_greatest_bug.sql b/tests/queries/0_stateless/02032_short_circuit_least_greatest_bug.sql
new file mode 100644
index 00000000000..e7dca0bde91
--- /dev/null
+++ b/tests/queries/0_stateless/02032_short_circuit_least_greatest_bug.sql
@@ -0,0 +1,2 @@
+select 1 and greatest(number % 2, number % 3) from numbers(10);
+select 1 and least(number % 2, number % 3) from numbers(10);
diff --git a/tests/queries/0_stateless/02033_join_engine_deadlock_long.reference b/tests/queries/0_stateless/02033_join_engine_deadlock_long.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02033_join_engine_deadlock_long.sh b/tests/queries/0_stateless/02033_join_engine_deadlock_long.sh
new file mode 100755
index 00000000000..13cf013b53b
--- /dev/null
+++ b/tests/queries/0_stateless/02033_join_engine_deadlock_long.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+# Tags: long, deadlock
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+create_table () {
+    $CLICKHOUSE_CLIENT --query "
+            CREATE TABLE join_block_test
+            (
+                id String,
+                num Int64
+            )
+            ENGINE = Join(ANY, LEFT, id)
+        "
+}
+
+drop_table () {
+    # Force a sync drop to free the memory before ending the test
+    # Otherwise things get interesting if you run the test many times before the database is finally dropped
+    $CLICKHOUSE_CLIENT --query "
+            DROP TABLE join_block_test SYNC
+        "
+}
+
+populate_table_bg () {
+    (
+        $CLICKHOUSE_CLIENT --query "
+            INSERT INTO join_block_test
+            SELECT toString(number) as id, number * number as num
+            FROM system.numbers LIMIT 500000
+        " >/dev/null
+    ) &
+}
+
+read_table_bg () {
+    (
+        $CLICKHOUSE_CLIENT --query "
+            SELECT *
+            FROM
+            (
+                SELECT toString(number) AS user_id
+                FROM system.numbers LIMIT 10000 OFFSET 20000
+            ) AS t1
+            LEFT JOIN
+            (
+                SELECT
+                    *
+                FROM join_block_test AS i1
+                ANY LEFT JOIN
+                (
+                    SELECT *
+                    FROM join_block_test
+                ) AS i2 ON i1.id = toString(i2.num)
+            ) AS t2 ON t1.user_id = t2.id
+        " >/dev/null
+    ) &
+}
+
+create_table
+for _ in {1..5};
+do
+    populate_table_bg
+    sleep 0.05
+    read_table_bg
+    sleep 0.05
+done
+
+wait
+drop_table
diff --git a/tests/queries/0_stateless/02035_isNull_isNotNull_format.reference b/tests/queries/0_stateless/02035_isNull_isNotNull_format.reference
new file mode 100644
index 00000000000..4964bc68fff
--- /dev/null
+++ b/tests/queries/0_stateless/02035_isNull_isNotNull_format.reference
@@ -0,0 +1,14 @@
+-- { echo }
+explain syntax select null is null;
+SELECT NULL IS NULL
+explain syntax select null is not null;
+SELECT NULL IS NOT NULL
+explain syntax select isNull(null);
+SELECT NULL IS NULL
+explain syntax select isNotNull(null);
+SELECT NULL IS NOT NULL
+explain syntax select isNotNull(1)+isNotNull(2) from remote('127.2', system.one);
+SELECT (1 IS NOT NULL) + (2 IS NOT NULL)
+FROM remote(\'127.2\', \'system.one\')
+select isNotNull(1)+isNotNull(2) from remote('127.2', system.one);
+2
diff --git a/tests/queries/0_stateless/02035_isNull_isNotNull_format.sql b/tests/queries/0_stateless/02035_isNull_isNotNull_format.sql
new file mode 100644
index 00000000000..d9138e12bca
--- /dev/null
+++ b/tests/queries/0_stateless/02035_isNull_isNotNull_format.sql
@@ -0,0 +1,7 @@
+-- { echo }
+explain syntax select null is null;
+explain syntax select null is not null;
+explain syntax select isNull(null);
+explain syntax select isNotNull(null);
+explain syntax select isNotNull(1)+isNotNull(2) from remote('127.2', system.one);
+select isNotNull(1)+isNotNull(2) from remote('127.2', system.one);
diff --git a/tests/queries/0_stateless/02036_jit_short_circuit.reference b/tests/queries/0_stateless/02036_jit_short_circuit.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02036_jit_short_circuit.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02036_jit_short_circuit.sql b/tests/queries/0_stateless/02036_jit_short_circuit.sql
new file mode 100644
index 00000000000..18faf701a84
--- /dev/null
+++ b/tests/queries/0_stateless/02036_jit_short_circuit.sql
@@ -0,0 +1,12 @@
+SET compile_expressions = 1;
+SET min_count_to_compile_expression = 0;
+SET short_circuit_function_evaluation='enable';
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table (message String) ENGINE=TinyLog;
+
+INSERT INTO test_table VALUES ('Test');
+
+SELECT if(action = 'bonus', sport_amount, 0) * 100 FROM (SELECT message AS action, cast(message, 'Float64') AS sport_amount FROM test_table);
+
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02039_group_by_with_totals_having.reference b/tests/queries/0_stateless/02039_group_by_with_totals_having.reference
new file mode 100644
index 00000000000..581470ced83
--- /dev/null
+++ b/tests/queries/0_stateless/02039_group_by_with_totals_having.reference
@@ -0,0 +1,9 @@
+-- { echo }
+SELECT 'x' FROM numbers(2) GROUP BY number WITH TOTALS HAVING count(number)>0;
+x
+x
+
+x
+SELECT 'x' FROM numbers(2) GROUP BY number WITH TOTALS HAVING count(number)<0;
+
+x
diff --git a/tests/queries/0_stateless/02039_group_by_with_totals_having.sql b/tests/queries/0_stateless/02039_group_by_with_totals_having.sql
new file mode 100644
index 00000000000..28aa34a90d2
--- /dev/null
+++ b/tests/queries/0_stateless/02039_group_by_with_totals_having.sql
@@ -0,0 +1,3 @@
+-- { echo }
+SELECT 'x' FROM numbers(2) GROUP BY number WITH TOTALS HAVING count(number)>0;
+SELECT 'x' FROM numbers(2) GROUP BY number WITH TOTALS HAVING count(number)<0;
diff --git a/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference
new file mode 100644
index 00000000000..00750edc07d
--- /dev/null
+++ b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference
@@ -0,0 +1 @@
+3
diff --git a/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh
new file mode 100755
index 00000000000..9cab6db6940
--- /dev/null
+++ b/tests/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+query_id="${CLICKHOUSE_DATABASE}_$$"
+benchmark_args=(
+    --iterations 1
+    --log_queries 1
+    --query_id "$query_id"
+    --log_queries_min_type QUERY_FINISH
+)
+$CLICKHOUSE_BENCHMARK "${benchmark_args[@]}" --query "SELECT * FROM remote('127.2', 'system.one')" >& /dev/null
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+# Number of queries:
+# - DESC TABLE system.one
+# - query on initiator
+# - query on shard
+# Total: 3
+#
+# -- NOTE: this test cannot use 'current_database = $CLICKHOUSE_DATABASE',
+# -- because it does not propagated via remote queries,
+# -- but it uses query_id, and this is enough.
+$CLICKHOUSE_CLIENT --param_query_id="$query_id" -q "SELECT count() FROM system.query_log WHERE event_date >= yesterday() AND initial_query_id = {query_id:String}"
diff --git a/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.reference b/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.reference
new file mode 100644
index 00000000000..4c4b6807a22
--- /dev/null
+++ b/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.reference
@@ -0,0 +1 @@
+2019-01-01	2019-01-01 00:00:00.000
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
new file mode 100644
index 00000000000..9a25f2b007b
--- /dev/null
+++ b/tests/queries/0_stateless/02041_conversion_between_date32_and_datetime64.sql
@@ -0,0 +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
diff --git a/tests/queries/0_stateless/02041_openssl_hash_functions_test.reference b/tests/queries/0_stateless/02041_openssl_hash_functions_test.reference
new file mode 100644
index 00000000000..e5298179e6f
--- /dev/null
+++ b/tests/queries/0_stateless/02041_openssl_hash_functions_test.reference
@@ -0,0 +1,8 @@
+098F6BCD4621D373
+DB346D691D7ACC4DC2625DB19F9E3F52
+098F6BCD4621D373CADE4E832627B4F6
+A94A8FE5CCB19BA61C4C0873D391E987982FBBD3
+90A3ED9E32B2AAF4C61C410EB925426119E1A9DC53D4286ADE99A809
+9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08
+768412320F7B0AA5812FCE428DC4706B3CAE50E02A64CAA16A782249BFE8EFC4B7EF1CCB126255D196047DFEDF17A0A9
+EE26B0DD4AF7E749AA1A8EE3C10AE9923F618980772E473F8819A5D4940E0DB27AC185F8A0E1D5F84F88BC887FD67B143732C304CC5FA9AD8E6F57F50028A8FF
diff --git a/tests/queries/0_stateless/02041_openssl_hash_functions_test.sql b/tests/queries/0_stateless/02041_openssl_hash_functions_test.sql
new file mode 100644
index 00000000000..71940b24af4
--- /dev/null
+++ b/tests/queries/0_stateless/02041_openssl_hash_functions_test.sql
@@ -0,0 +1,10 @@
+-- Tags: no-fasttest
+
+SELECT hex(halfMD5('test'));
+SELECT hex(MD4('test'));
+SELECT hex(MD5('test'));
+SELECT hex(SHA1('test'));
+SELECT hex(SHA224('test'));
+SELECT hex(SHA256('test'));
+SELECT hex(SHA384('test'));
+SELECT hex(SHA512('test'));
diff --git a/tests/queries/0_stateless/02041_test_fuzzy_alter.reference b/tests/queries/0_stateless/02041_test_fuzzy_alter.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02041_test_fuzzy_alter.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02041_test_fuzzy_alter.sql b/tests/queries/0_stateless/02041_test_fuzzy_alter.sql
new file mode 100644
index 00000000000..a330defc316
--- /dev/null
+++ b/tests/queries/0_stateless/02041_test_fuzzy_alter.sql
@@ -0,0 +1,13 @@
+DROP TABLE IF EXISTS alter_table;
+
+CREATE TABLE alter_table (a UInt8, b Int16)
+ENGINE = MergeTree
+ORDER BY a;
+
+ALTER TABLE alter_table
+    MODIFY COLUMN `b` DateTime DEFAULT now(([NULL, NULL, NULL, [-2147483648], [NULL, NULL, NULL, NULL, NULL, NULL, NULL]] AND (1048576 AND NULL) AND (NULL AND 1048575 AND NULL AND -2147483649) AND NULL) IN (test_01103.t1_distr.id)); --{serverError 47}
+
+SELECT 1;
+
+
+DROP TABLE IF EXISTS alter_table;
diff --git a/tests/queries/0_stateless/02042_map_get_non_const_key.reference b/tests/queries/0_stateless/02042_map_get_non_const_key.reference
new file mode 100644
index 00000000000..6d4e150796a
--- /dev/null
+++ b/tests/queries/0_stateless/02042_map_get_non_const_key.reference
@@ -0,0 +1 @@
+value
diff --git a/tests/queries/0_stateless/02042_map_get_non_const_key.sql b/tests/queries/0_stateless/02042_map_get_non_const_key.sql
new file mode 100644
index 00000000000..96f70f88021
--- /dev/null
+++ b/tests/queries/0_stateless/02042_map_get_non_const_key.sql
@@ -0,0 +1,5 @@
+SELECT map[key]
+FROM
+(
+    SELECT materialize('key') AS key,  CAST((['key'], ['value']), 'Map(String, String)') AS map
+);
diff --git a/tests/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.reference b/tests/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.reference
new file mode 100644
index 00000000000..d4a8637a281
--- /dev/null
+++ b/tests/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.reference
@@ -0,0 +1 @@
+SELECT regionToName(203), regionToCountry(203)
diff --git a/tests/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.sh b/tests/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.sh
new file mode 100755
index 00000000000..2b9ad96d4df
--- /dev/null
+++ b/tests/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_FORMAT --seed Hello --obfuscate <<< "SELECT regionToName(213), regionToCountry(213)"
diff --git a/tests/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.reference b/tests/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.reference
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/tests/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.reference
@@ -0,0 +1 @@
+4
diff --git a/tests/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.sql b/tests/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.sql
new file mode 100644
index 00000000000..b7c6e4837e8
--- /dev/null
+++ b/tests/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.sql
@@ -0,0 +1 @@
+SELECT test_function(2, 2);
diff --git a/tests/queries/0_stateless/02044_url_glob_parallel.reference b/tests/queries/0_stateless/02044_url_glob_parallel.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02044_url_glob_parallel.sh b/tests/queries/0_stateless/02044_url_glob_parallel.sh
new file mode 100755
index 00000000000..c9c779a9ddb
--- /dev/null
+++ b/tests/queries/0_stateless/02044_url_glob_parallel.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Tags: distributed
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+i=0 retries=60
+# Sometimes five seconds are not enough due to system overload.
+# But if it can run in less than five seconds at least sometimes - it is enough for the test.
+while [[ $i -lt $retries ]]; do
+    timeout 5s ${CLICKHOUSE_CLIENT} --max_threads 10 --query "SELECT * FROM url('http://127.0.0.{1..10}:${CLICKHOUSE_PORT_HTTP}/?query=SELECT+sleep(1)', TSV, 'x UInt8')" --format Null && break
+    ((++i))
+done
diff --git a/tests/queries/0_stateless/02045_like_function.reference b/tests/queries/0_stateless/02045_like_function.reference
new file mode 100644
index 00000000000..0633853274a
--- /dev/null
+++ b/tests/queries/0_stateless/02045_like_function.reference
@@ -0,0 +1,2 @@
+1
+1	1	1	1	1	1
diff --git a/tests/queries/0_stateless/02045_like_function.sql b/tests/queries/0_stateless/02045_like_function.sql
new file mode 100644
index 00000000000..d395e8d4579
--- /dev/null
+++ b/tests/queries/0_stateless/02045_like_function.sql
@@ -0,0 +1,10 @@
+SELECT 'r\\a1bbb' LIKE '%r\\\\a1%bbb%' AS res;
+
+WITH lower('\RealVNC\WinVNC4 /v password') as CommandLine
+SELECT
+    CommandLine LIKE '%\\\\realvnc\\\\winvnc4%password%' as t1,
+    CommandLine LIKE '%\\\\realvnc\\\\winvnc4 %password%' as t2,
+    CommandLine LIKE '%\\\\realvnc\\\\winvnc4%password' as t3,
+    CommandLine LIKE '%\\\\realvnc\\\\winvnc4 %password' as t4,
+    CommandLine LIKE '%realvnc%winvnc4%password%' as t5,
+    CommandLine LIKE '%\\\\winvnc4%password%' as t6;
diff --git a/tests/queries/0_stateless/02046_low_cardinality_parallel_group_by.reference b/tests/queries/0_stateless/02046_low_cardinality_parallel_group_by.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02046_low_cardinality_parallel_group_by.sh b/tests/queries/0_stateless/02046_low_cardinality_parallel_group_by.sh
new file mode 100755
index 00000000000..c2ae622e6a8
--- /dev/null
+++ b/tests/queries/0_stateless/02046_low_cardinality_parallel_group_by.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# This is the regression test for parallel usage of LowCardinality column
+# via Buffer engine.
+#
+# See also:
+# - https://github.com/ClickHouse/ClickHouse/issues/24158
+# - https://github.com/ClickHouse/ClickHouse/pull/3138
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS low_card_buffer_test"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE low_card_buffer_test (test_text LowCardinality(String)) ENGINE=Buffer('', '', 16, 60, 360, 100, 1000, 10000, 100000)"
+
+$CLICKHOUSE_BENCHMARK -d 0 -i 1000 -c 5 <<<"SELECT count() FROM low_card_buffer_test GROUP BY test_text format Null" 2>/dev/null &
+$CLICKHOUSE_BENCHMARK -d 0 -i 1000 -c 2 <<<"INSERT INTO low_card_buffer_test values('TEST1')" 2>/dev/null &
+wait
+
+# server is alive
+$CLICKHOUSE_CLIENT -q "SELECT 1 FORMAT Null"
diff --git a/tests/queries/0_stateless/02046_remote_table_function_named_collections.reference b/tests/queries/0_stateless/02046_remote_table_function_named_collections.reference
new file mode 100644
index 00000000000..de78180725a
--- /dev/null
+++ b/tests/queries/0_stateless/02046_remote_table_function_named_collections.reference
@@ -0,0 +1,2 @@
+4
+8
diff --git a/tests/queries/0_stateless/02046_remote_table_function_named_collections.sql b/tests/queries/0_stateless/02046_remote_table_function_named_collections.sql
new file mode 100644
index 00000000000..18aa6faf357
--- /dev/null
+++ b/tests/queries/0_stateless/02046_remote_table_function_named_collections.sql
@@ -0,0 +1,11 @@
+-- Tags: shard, no-fasttest
+
+DROP TABLE IF EXISTS remote_test;
+CREATE TABLE remote_test(a1 UInt8) ENGINE=Memory;
+INSERT INTO FUNCTION remote(remote1, database=currentDatabase()) VALUES(1);
+INSERT INTO FUNCTION remote(remote1, database=currentDatabase()) VALUES(2);
+INSERT INTO FUNCTION remote(remote1, database=currentDatabase()) VALUES(3);
+INSERT INTO FUNCTION remote(remote1, database=currentDatabase()) VALUES(4);
+SELECT count() FROM remote(remote1, database=currentDatabase());
+SELECT count() FROM remote(remote2, database=merge(currentDatabase(), '^remote_test'));
+DROP TABLE remote_test;
diff --git a/tests/queries/0_stateless/02047_alias_for_table_and_database_name.reference b/tests/queries/0_stateless/02047_alias_for_table_and_database_name.reference
new file mode 100644
index 00000000000..324e7ff9ab8
--- /dev/null
+++ b/tests/queries/0_stateless/02047_alias_for_table_and_database_name.reference
@@ -0,0 +1,2 @@
+numbers	numbers
+default	default
diff --git a/tests/queries/0_stateless/02047_alias_for_table_and_database_name.sql b/tests/queries/0_stateless/02047_alias_for_table_and_database_name.sql
new file mode 100644
index 00000000000..2fabd2affd4
--- /dev/null
+++ b/tests/queries/0_stateless/02047_alias_for_table_and_database_name.sql
@@ -0,0 +1,2 @@
+SELECT name,table from system.tables where database = 'system' and name = 'numbers';
+SELECt name,database from system.databases where name = 'default';
diff --git a/tests/queries/0_stateless/02047_client_exception.expect b/tests/queries/0_stateless/02047_client_exception.expect
new file mode 100755
index 00000000000..120f8ef11e3
--- /dev/null
+++ b/tests/queries/0_stateless/02047_client_exception.expect
@@ -0,0 +1,32 @@
+#!/usr/bin/expect -f
+# Tags: no-unbundled, no-fasttest
+
+log_user 0
+set timeout 20
+match_max 100000
+
+# A default timeout action is to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+}
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion"
+expect ":) "
+
+send -- "DROP TABLE IF EXISTS test_02047\r"
+expect "Ok."
+
+send -- "CREATE TABLE test_02047 (s Int32) ENGINE=Memory()\r"
+expect "Ok."
+
+send -- "INSERT INTO test_02047 SELECT 'f' \r"
+expect "Received exception from server"
+
+send -- "DROP TABLE test_02047\r"
+expect "Ok."
+
+send -- "\4"
+expect eof
diff --git a/tests/queries/0_stateless/02047_client_exception.reference b/tests/queries/0_stateless/02047_client_exception.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02047_log_family_data_file_sizes.reference b/tests/queries/0_stateless/02047_log_family_data_file_sizes.reference
new file mode 100644
index 00000000000..b802026a0dd
--- /dev/null
+++ b/tests/queries/0_stateless/02047_log_family_data_file_sizes.reference
@@ -0,0 +1,47 @@
+Log:
+empty:
+1 element:
+1	a
+__marks.mrk
+sizes.json
+x.bin
+y.bin
+3 elements:
+1	a
+22	bc
+333	def
+__marks.mrk greater size
+sizes.json
+x.bin greater size
+y.bin greater size
+
+TinyLog:
+empty:
+1 element:
+1	a
+sizes.json
+x.bin
+y.bin
+3 elements:
+1	a
+22	bc
+333	def
+sizes.json
+x.bin greater size
+y.bin greater size
+
+StripeLog:
+empty:
+1 element:
+1	a
+data.bin
+index.mrk
+sizes.json
+3 elements:
+1	a
+22	bc
+333	def
+data.bin greater size
+index.mrk greater size
+sizes.json
+
diff --git a/tests/queries/0_stateless/02047_log_family_data_file_sizes.sh b/tests/queries/0_stateless/02047_log_family_data_file_sizes.sh
new file mode 100755
index 00000000000..e7c1cb5d71e
--- /dev/null
+++ b/tests/queries/0_stateless/02047_log_family_data_file_sizes.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+declare -a engines=("Log" "TinyLog" "StripeLog")
+for engine in "${engines[@]}"
+do
+    echo "$engine:"
+
+    $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS tbl"
+    $CLICKHOUSE_CLIENT --query="CREATE TABLE tbl(x UInt32, y String) ENGINE=$engine"
+    data_dir=$($CLICKHOUSE_CLIENT --query="SELECT data_paths[1] FROM system.tables WHERE name='tbl' AND database=currentDatabase()")
+
+    echo "empty:"
+    find "$data_dir"* 2>/dev/null
+
+    echo "1 element:"
+    $CLICKHOUSE_CLIENT --query="INSERT INTO tbl VALUES (1, 'a')"
+    $CLICKHOUSE_CLIENT --query="SELECT * FROM tbl ORDER BY x"
+    declare -A file_sizes
+    for name in $(find "$data_dir"* -print0 | xargs -0 -n 1 basename | sort); do
+        file_path=$data_dir$name
+        file_size=$(stat -c%s "$file_path")
+        file_sizes[$name]=$file_size
+        echo $name
+    done
+
+    echo "3 elements:"
+    $CLICKHOUSE_CLIENT --query="INSERT INTO tbl VALUES (22, 'bc'), (333, 'def')"
+    $CLICKHOUSE_CLIENT --query="SELECT * FROM tbl ORDER BY x"
+    for name in $(find "$data_dir"* -print0 | xargs -0 -n 1 basename | sort); do
+        file_path=$data_dir$name
+        file_size=$(stat -c%s "$file_path")
+        old_file_size=${file_sizes[$name]}
+        if [ "$name" == "sizes.json" ]; then
+            cmp=""
+        elif (( file_size > old_file_size )); then
+            cmp="greater size"
+        else
+            cmp="unexpected size ($file_size, old_size=$old_file_size)"
+        fi
+        echo $name $cmp
+    done
+
+    echo
+done
diff --git a/tests/queries/0_stateless/02048_alter_command_format.reference b/tests/queries/0_stateless/02048_alter_command_format.reference
new file mode 100644
index 00000000000..719c9391f46
--- /dev/null
+++ b/tests/queries/0_stateless/02048_alter_command_format.reference
@@ -0,0 +1,5 @@
+ALTER TABLE t
+    DROP COLUMN a,
+    DROP COLUMN b,
+    DROP COLUMN c,
+    ADD COLUMN `d` UInt8
diff --git a/tests/queries/0_stateless/02048_alter_command_format.sh b/tests/queries/0_stateless/02048_alter_command_format.sh
new file mode 100755
index 00000000000..2f088cf8176
--- /dev/null
+++ b/tests/queries/0_stateless/02048_alter_command_format.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "alter table t drop column a, drop column b, drop column c, add column d UInt8" | $CLICKHOUSE_FORMAT;
diff --git a/tests/queries/0_stateless/02048_clickhouse_local_stage.reference b/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
new file mode 100644
index 00000000000..44c39f2a444
--- /dev/null
+++ b/tests/queries/0_stateless/02048_clickhouse_local_stage.reference
@@ -0,0 +1,15 @@
+execute: default
+"foo"
+1
+execute: --stage fetch_columns
+"dummy"
+0
+execute: --stage with_mergeable_state
+"1"
+1
+execute: --stage with_mergeable_state_after_aggregation
+"1"
+1
+execute: --stage complete
+"foo"
+1
diff --git a/tests/queries/0_stateless/02048_clickhouse_local_stage.sh b/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
new file mode 100755
index 00000000000..5c1303b5160
--- /dev/null
+++ b/tests/queries/0_stateless/02048_clickhouse_local_stage.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function execute_query()
+{
+    if [ $# -eq 0 ]; then
+        echo "execute: default"
+    else
+        echo "execute: $*"
+    fi
+    ${CLICKHOUSE_LOCAL} "$@" --format CSVWithNames -q "SELECT 1 AS foo"
+}
+
+execute_query # default -- complete
+execute_query --stage fetch_columns
+execute_query --stage with_mergeable_state
+execute_query --stage with_mergeable_state_after_aggregation
+execute_query --stage complete
diff --git a/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect b/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
new file mode 100755
index 00000000000..17b98b077d5
--- /dev/null
+++ b/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
@@ -0,0 +1,53 @@
+#!/usr/bin/expect -f
+# Tags: no-fasttest
+
+log_user 0
+set timeout 20
+match_max 100000
+
+# A default timeout action is to fail
+expect_after {
+    timeout {
+        exit 1
+    }
+
+}
+
+set basedir [file dirname $argv0]
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL  --disable_suggestion"
+expect ":) "
+
+send -- "drop table if exists t\r"
+expect "Ok."
+
+send -- "create table t engine=MergeTree() order by tuple() as select 1\r"
+expect "Ok."
+
+send -- "set optimize_on_insert = 0\r"
+expect "Ok."
+
+send -- "drop table if exists tt\r"
+expect "Ok."
+
+send -- "create table tt (date Date, version UInt64, val UInt64) engine = ReplacingMergeTree(version) partition by date order by date\r"
+expect "Ok."
+
+send -- "insert into tt values ('2020-01-01', 2, 2), ('2020-01-01', 1, 1)\r"
+expect "Ok."
+
+send -- "insert into tt values ('2020-01-01', 0, 0)\r"
+expect "Ok."
+
+send -- "OPTIMIZE TABLE tt\r"
+expect "Ok."
+
+send -- "select * from tt order by version format TSV\r"
+expect "2020-01-01\t2\t2"
+
+send -- "drop table tt\r"
+expect "Ok."
+send -- "drop table t\r"
+expect "Ok."
+
+send -- "\4"
+expect eof
diff --git a/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.reference b/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.reference b/tests/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.reference
new file mode 100644
index 00000000000..c84236dce7d
--- /dev/null
+++ b/tests/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.reference
@@ -0,0 +1,60 @@
+0	0
+1	1
+2	2
+3	3
+4	40
+5	50
+6	60
+7	70
+8	800
+9	900
+10	1000
+11	1100
+12	12000
+13	13000
+14	14000
+15	15000
+16	160000
+17	170000
+18	180000
+19	190000
+0	0
+1	1
+2	2
+3	3
+4	40
+5	50
+6	60
+7	70
+8	80000
+9	90000
+10	100000
+11	110000
+12	120000
+13	130000
+14	140000
+15	150000
+16	160000
+17	170000
+18	180000
+19	190000
+0	0
+1	1
+2	2
+3	3
+4	40
+5	50
+6	60
+7	70
+8	800
+9	900
+10	1000
+11	1100
+12	12000
+13	13000
+14	14000
+15	15000
+16	160000
+17	170000
+18	180000
+19	190000
diff --git a/tests/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.sql b/tests/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.sql
new file mode 100644
index 00000000000..2a837380250
--- /dev/null
+++ b/tests/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.sql
@@ -0,0 +1,45 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/30231
+SELECT *
+FROM (
+      SELECT number,
+             multiIf(
+                     CAST(number < 4, 'UInt8'), toString(number),
+                     CAST(number < 8, 'LowCardinality(UInt8)'), toString(number * 10),
+                     CAST(number < 12, 'Nullable(UInt8)'), toString(number * 100),
+                     CAST(number < 16, 'LowCardinality(Nullable(UInt8))'), toString(number * 1000),
+                     toString(number * 10000)) as m
+      FROM system.numbers
+      LIMIT 20
+     )
+ORDER BY number
+SETTINGS short_circuit_function_evaluation='enable';
+
+SELECT *
+FROM (
+      SELECT number,
+             multiIf(
+                     CAST(number < 4, 'UInt8'), toString(number),
+                     CAST(number < 8, 'LowCardinality(UInt8)'), toString(number * 10),
+                     CAST(NULL, 'Nullable(UInt8)'), toString(number * 100),
+                     CAST(NULL, 'LowCardinality(Nullable(UInt8))'), toString(number * 1000),
+                     toString(number * 10000)) as m
+      FROM system.numbers
+      LIMIT 20
+         )
+ORDER BY number
+SETTINGS short_circuit_function_evaluation='enable';
+
+SELECT *
+FROM (
+      SELECT number,
+             multiIf(
+                     CAST(number < 4, 'UInt8'), toString(number),
+                     CAST(number < 8, 'LowCardinality(UInt8)'), toString(number * 10)::LowCardinality(String),
+                     CAST(number < 12, 'Nullable(UInt8)'), toString(number * 100)::Nullable(String),
+                     CAST(number < 16, 'LowCardinality(Nullable(UInt8))'), toString(number * 1000)::LowCardinality(Nullable(String)),
+                     toString(number * 10000)) as m
+      FROM system.numbers
+      LIMIT 20
+         )
+ORDER BY number
+SETTINGS short_circuit_function_evaluation='enable';
diff --git a/tests/queries/0_stateless/02050_clickhouse_client_local_exception.reference b/tests/queries/0_stateless/02050_clickhouse_client_local_exception.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02050_clickhouse_client_local_exception.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02050_clickhouse_client_local_exception.sh b/tests/queries/0_stateless/02050_clickhouse_client_local_exception.sh
new file mode 100755
index 00000000000..d66cc7048c4
--- /dev/null
+++ b/tests/queries/0_stateless/02050_clickhouse_client_local_exception.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+touch test_exception
+$CLICKHOUSE_LOCAL --query="SELECT 1 INTO OUTFILE 'test_exception' FORMAT Native" 2>&1 | grep -q "Code: 76. DB::ErrnoException:" && echo 'OK' || echo 'FAIL' ||:
diff --git a/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.reference b/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.sh b/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.sh
new file mode 100755
index 00000000000..7a92fa6fefe
--- /dev/null
+++ b/tests/queries/0_stateless/02050_clickhouse_local_parsing_exception.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL --query="SELECT number FROM system.numbers INTO OUTFILE test.native.zst FORMAT Native" 2>&1 | grep -q "Code: 62. DB::Exception: Syntax error: failed at position 48 ('test'): test.native.zst FORMAT Native. Expected string literal." && echo 'OK' || echo 'FAIL' ||:
+
diff --git a/tests/queries/0_stateless/02050_client_profile_events.reference b/tests/queries/0_stateless/02050_client_profile_events.reference
new file mode 100644
index 00000000000..00fc3b5d06a
--- /dev/null
+++ b/tests/queries/0_stateless/02050_client_profile_events.reference
@@ -0,0 +1,4 @@
+0
+SelectedRows: 131010 (increment)
+OK
+OK
diff --git a/tests/queries/0_stateless/02050_client_profile_events.sh b/tests/queries/0_stateless/02050_client_profile_events.sh
new file mode 100755
index 00000000000..5c3887cf5fb
--- /dev/null
+++ b/tests/queries/0_stateless/02050_client_profile_events.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# do not print any ProfileEvents packets
+$CLICKHOUSE_CLIENT -q 'select * from numbers(1e5) format Null' |& grep -c 'SelectedRows'
+# print only last
+$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -q 'select * from numbers(1e5) format Null' |& grep -o 'SelectedRows: .*$'
+# print everything
+test "$($CLICKHOUSE_CLIENT --print-profile-events -q 'select * from numbers(1e9) format Null' |& grep -c 'SelectedRows')" -gt 1 && echo OK || echo FAIL
+# print each 100 ms
+test "$($CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=100 -q 'select * from numbers(1e9) format Null' |& grep -c 'SelectedRows')" -gt 1 && echo OK || echo FAIL
diff --git a/tests/queries/0_stateless/02051_read_settings.reference.j2 b/tests/queries/0_stateless/02051_read_settings.reference.j2
new file mode 100644
index 00000000000..86aa67a9d2d
--- /dev/null
+++ b/tests/queries/0_stateless/02051_read_settings.reference.j2
@@ -0,0 +1,11 @@
+{% for read_method in ['read', 'mmap', 'pread_threadpool', 'pread_fake_async'] -%}
+{% for direct_io in [0, 1] -%}
+{% for prefetch in [0, 1] -%}
+{% for priority  in [0, 1] -%}
+{% for buffer_size in [65505, 1048576] -%}
+1000000
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02051_read_settings.sql.j2 b/tests/queries/0_stateless/02051_read_settings.sql.j2
new file mode 100644
index 00000000000..9f02274e732
--- /dev/null
+++ b/tests/queries/0_stateless/02051_read_settings.sql.j2
@@ -0,0 +1,31 @@
+-- Tags: long
+--
+-- Test for testing various read settings.
+
+drop table if exists data_02051;
+
+create table data_02051 (key Int, value String) engine=MergeTree() order by key
+as select number, repeat(toString(number), 5) from numbers(1e6);
+
+{# check each local_filesystem_read_method #}
+{% for read_method in ['read', 'mmap', 'pread_threadpool', 'pread_fake_async'] %}
+{# check w/ O_DIRECT and w/o (min_bytes_to_use_direct_io) #}
+{% for direct_io in [0, 1] %}
+{# check local_filesystem_read_prefetch (just a smoke test) #}
+{% for prefetch in [0, 1] %}
+{# check read_priority (just a smoke test) #}
+{% for priority  in [0, 1] %}
+{# check alignment for O_DIRECT with various max_read_buffer_size #}
+{% for buffer_size in [65505, 1048576] %}
+select count(ignore(*)) from data_02051 settings
+    min_bytes_to_use_direct_io={{ direct_io }},
+    local_filesystem_read_method='{{ read_method }}',
+    local_filesystem_read_prefetch={{ prefetch }},
+    read_priority={{ priority }},
+    max_read_buffer_size={{ buffer_size }}
+;
+{% endfor %}
+{% endfor %}
+{% endfor %}
+{% endfor %}
+{% endfor %}
diff --git a/tests/queries/0_stateless/02051_symlinks_to_user_files.reference b/tests/queries/0_stateless/02051_symlinks_to_user_files.reference
new file mode 100644
index 00000000000..d86bac9de59
--- /dev/null
+++ b/tests/queries/0_stateless/02051_symlinks_to_user_files.reference
@@ -0,0 +1 @@
+OK
diff --git a/tests/queries/0_stateless/02051_symlinks_to_user_files.sh b/tests/queries/0_stateless/02051_symlinks_to_user_files.sh
new file mode 100755
index 00000000000..dfdc71e0f0b
--- /dev/null
+++ b/tests/queries/0_stateless/02051_symlinks_to_user_files.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# See 01658_read_file_to_string_column.sh
+user_files_path=$(clickhouse-client --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+FILE_PATH="${user_files_path}/file/"
+mkdir -p ${FILE_PATH}
+chmod 777 ${FILE_PATH}
+
+FILE="test_symlink_${CLICKHOUSE_DATABASE}"
+
+symlink_path=${FILE_PATH}/${FILE}
+file_path=$CUR_DIR/${FILE}
+
+touch ${file_path}
+ln -s ${file_path} ${symlink_path}
+chmod ugo+w ${symlink_path}
+
+function cleanup()
+{
+    rm ${symlink_path} ${file_path}
+}
+trap cleanup EXIT
+
+${CLICKHOUSE_CLIENT} --query="insert into table function file('${symlink_path}', 'Values', 'a String') select 'OK'";
+${CLICKHOUSE_CLIENT} --query="select * from file('${symlink_path}', 'Values', 'a String')";
+
diff --git a/tests/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.reference b/tests/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.reference
new file mode 100644
index 00000000000..d7d3ee8f362
--- /dev/null
+++ b/tests/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.reference
@@ -0,0 +1,8 @@
+1
+1
+10
+10
+100
+100
+10000
+10000
diff --git a/tests/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.sql.j2 b/tests/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.sql.j2
new file mode 100644
index 00000000000..465aa22beb3
--- /dev/null
+++ b/tests/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.sql.j2
@@ -0,0 +1,19 @@
+-- Tags: long
+
+{% for rows_in_table in [1, 10, 100, 10000] %}
+{% for wide in [0, 100000000] %}
+drop table if exists data_02052_{{ rows_in_table }}_wide{{ wide }};
+create table data_02052_{{ rows_in_table }}_wide{{ wide }} (key Int, value String)
+engine=MergeTree()
+order by key
+settings
+    min_bytes_for_wide_part={{ wide }}
+as select number, repeat(toString(number), 5) from numbers({{ rows_in_table }});
+
+-- avoid any optimizations with ignore(*)
+select count(ignore(*)) from data_02052_{{ rows_in_table }}_wide{{ wide }} settings max_read_buffer_size=1, max_threads=1;
+select count(ignore(*)) from data_02052_{{ rows_in_table }}_wide{{ wide }} settings max_read_buffer_size=0, max_threads=1; -- { serverError CANNOT_READ_ALL_DATA }
+
+drop table data_02052_{{ rows_in_table }}_wide{{ wide }};
+{% endfor %}
+{% endfor %}
diff --git a/tests/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.reference b/tests/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.reference
new file mode 100644
index 00000000000..5154881396a
--- /dev/null
+++ b/tests/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.reference
@@ -0,0 +1,2 @@
+1	42	42
+1	42	42
diff --git a/tests/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.sql b/tests/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.sql
new file mode 100644
index 00000000000..e9ea0c9f016
--- /dev/null
+++ b/tests/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.sql
@@ -0,0 +1,6 @@
+-- Test from https://github.com/ClickHouse/ClickHouse/issues/29729
+create table data_02053 (id Int64, A Nullable(Int64), X Int64 materialized coalesce(A, -1)) engine=MergeTree order by id;
+insert into data_02053 values (1, 42);
+-- Due to insert_null_as_default A became Null and X became -1
+insert into data_02053 select 1, 42;
+select *, X from data_02053 order by id;
diff --git a/tests/queries/0_stateless/02095_function_get_os_kernel_version.reference b/tests/queries/0_stateless/02095_function_get_os_kernel_version.reference
new file mode 100644
index 00000000000..9b075671eac
--- /dev/null
+++ b/tests/queries/0_stateless/02095_function_get_os_kernel_version.reference
@@ -0,0 +1 @@
+Linux
diff --git a/tests/queries/0_stateless/02095_function_get_os_kernel_version.sql b/tests/queries/0_stateless/02095_function_get_os_kernel_version.sql
new file mode 100644
index 00000000000..d62b360f7e0
--- /dev/null
+++ b/tests/queries/0_stateless/02095_function_get_os_kernel_version.sql
@@ -0,0 +1 @@
+WITH splitByChar(' ', getOSKernelVersion()) AS version_pair SELECT version_pair[1]
diff --git a/tests/queries/0_stateless/02096_bad_options_in_client_and_local.reference b/tests/queries/0_stateless/02096_bad_options_in_client_and_local.reference
new file mode 100644
index 00000000000..c4c0901b9df
--- /dev/null
+++ b/tests/queries/0_stateless/02096_bad_options_in_client_and_local.reference
@@ -0,0 +1,12 @@
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
+OK
diff --git a/tests/queries/0_stateless/02096_bad_options_in_client_and_local.sh b/tests/queries/0_stateless/02096_bad_options_in_client_and_local.sh
new file mode 100755
index 00000000000..d37155e8506
--- /dev/null
+++ b/tests/queries/0_stateless/02096_bad_options_in_client_and_local.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2206
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_LOCAL} --unknown-option 2>&1 | grep -F -q "UNRECOGNIZED_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_LOCAL} --unknown-option-1 --unknown-option-2 2>&1 | grep -F -q "UNRECOGNIZED_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_LOCAL} -- --unknown-option 2>&1 | grep -F -q "BAD_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_LOCAL} -- 'positional-argument' 2>&1 | grep -F -q "BAD_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_LOCAL} -f 2>&1 | grep -F -q "Bad arguments" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_LOCAL} --query 2>&1 | grep -F -q "Bad arguments" && echo "OK" || echo "FAIL"
+
+
+${CLICKHOUSE_CLIENT} --unknown-option 2>&1 | grep -F -q "UNRECOGNIZED_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_CLIENT} --unknown-option-1 --unknown-option-2 2>&1 | grep -F -q "UNRECOGNIZED_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_CLIENT} -- --unknown-option 2>&1 | grep -F -q "BAD_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_CLIENT} -- 'positional-argument' 2>&1 | grep -F -q "BAD_ARGUMENTS" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_CLIENT} --j 2>&1 | grep -F -q "Bad arguments" && echo "OK" || echo "FAIL"
+
+${CLICKHOUSE_CLIENT} --query 2>&1 | grep -F -q "Bad arguments" && echo "OK" || echo "FAIL"
+
+
+
diff --git a/tests/queries/0_stateless/02096_join_unusual_identifier_begin.reference b/tests/queries/0_stateless/02096_join_unusual_identifier_begin.reference
new file mode 100644
index 00000000000..e8cc5e526c0
--- /dev/null
+++ b/tests/queries/0_stateless/02096_join_unusual_identifier_begin.reference
@@ -0,0 +1,2 @@
+1	1	1	1	1	1
+1
diff --git a/tests/queries/0_stateless/02096_join_unusual_identifier_begin.sql b/tests/queries/0_stateless/02096_join_unusual_identifier_begin.sql
new file mode 100644
index 00000000000..fc6be2eff7b
--- /dev/null
+++ b/tests/queries/0_stateless/02096_join_unusual_identifier_begin.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+CREATE TABLE t1 ( `a1` Int64, `1a1` Int64 ) ENGINE = Memory;
+INSERT INTO t1 VALUES (1, 1);
+
+CREATE TABLE t2 ( `b1` Int64, `1b1` Int64 ) ENGINE = Memory;
+INSERT INTO t2 VALUES (1, 1);
+
+CREATE TABLE t3 ( `c1` Int64, `1c1` Int64 ) ENGINE = Memory;
+INSERT INTO t3 VALUES (1, 1);
+
+SELECT
+    *
+FROM t1 AS t1
+INNER JOIN t2 AS t2 ON t1.a1 = t2.b1
+INNER JOIN t3 AS t3 ON t1.a1 = t3.c1;
+
+SELECT t2.`1b1` FROM t1 JOIN t2 ON a1 = b1;
+
+-- Without quialification it doesn't work:
+-- SELECT `1b1` FROM t1 JOIN t2 ON a1 = b1;
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/02096_rename_atomic_hang.reference b/tests/queries/0_stateless/02096_rename_atomic_hang.reference
new file mode 100644
index 00000000000..f0073e8f708
--- /dev/null
+++ b/tests/queries/0_stateless/02096_rename_atomic_hang.reference
@@ -0,0 +1,2 @@
+2000
+2000
diff --git a/tests/queries/0_stateless/02096_rename_atomic_hang.sql b/tests/queries/0_stateless/02096_rename_atomic_hang.sql
new file mode 100644
index 00000000000..96261bfe127
--- /dev/null
+++ b/tests/queries/0_stateless/02096_rename_atomic_hang.sql
@@ -0,0 +1,20 @@
+-- Tags: no-parallel
+
+drop database if exists db_hang;
+drop database if exists db_hang_temp;
+create database db_hang engine=Ordinary;
+use db_hang;
+create table db_hang.test(A Int64) Engine=MergeTree order by A;
+create materialized view db_hang.test_mv(A Int64) Engine=MergeTree order by A as select * from db_hang.test;
+insert into db_hang.test select * from numbers(1000);
+
+create database db_hang_temp engine=Atomic;
+rename table db_hang.test to db_hang_temp.test;
+rename table db_hang.test_mv to db_hang_temp.test_mv;
+
+drop database db_hang;
+rename database db_hang_temp to db_hang;
+insert into db_hang.test select * from numbers(1000);
+select count() from db_hang.test;
+select count() from db_hang.test_mv;
+drop database db_hang;
diff --git a/tests/queries/0_stateless/02096_sample_by_tuple.reference b/tests/queries/0_stateless/02096_sample_by_tuple.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02096_sample_by_tuple.sql b/tests/queries/0_stateless/02096_sample_by_tuple.sql
new file mode 100644
index 00000000000..4996c9b8384
--- /dev/null
+++ b/tests/queries/0_stateless/02096_sample_by_tuple.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS t;
+
+CREATE TABLE t (n UInt8) ENGINE=MergeTree ORDER BY n SAMPLE BY tuple(); -- { serverError 80 }
+
+CREATE TABLE t (n UInt8) ENGINE=MergeTree ORDER BY tuple();
+
+ALTER TABLE t MODIFY SAMPLE BY tuple(); -- { serverError 80 }
diff --git a/tests/queries/0_stateless/02096_sql_user_defined_function_alias.reference b/tests/queries/0_stateless/02096_sql_user_defined_function_alias.reference
new file mode 100644
index 00000000000..18bca00293c
--- /dev/null
+++ b/tests/queries/0_stateless/02096_sql_user_defined_function_alias.reference
@@ -0,0 +1 @@
+a	UInt16					
diff --git a/tests/queries/0_stateless/02096_sql_user_defined_function_alias.sql b/tests/queries/0_stateless/02096_sql_user_defined_function_alias.sql
new file mode 100644
index 00000000000..70e6572629e
--- /dev/null
+++ b/tests/queries/0_stateless/02096_sql_user_defined_function_alias.sql
@@ -0,0 +1,5 @@
+-- Tags: no-parallel
+
+CREATE FUNCTION 02096_test_function AS x -> x + 1;
+DESCRIBE (SELECT 02096_test_function(1) AS a);
+DROP FUNCTION 02096_test_function;
diff --git a/tests/queries/0_stateless/02096_totals_global_in_bug.reference b/tests/queries/0_stateless/02096_totals_global_in_bug.reference
new file mode 100644
index 00000000000..a536e1a5329
--- /dev/null
+++ b/tests/queries/0_stateless/02096_totals_global_in_bug.reference
@@ -0,0 +1,4 @@
+0
+2
+
+2
diff --git a/tests/queries/0_stateless/02096_totals_global_in_bug.sql b/tests/queries/0_stateless/02096_totals_global_in_bug.sql
new file mode 100644
index 00000000000..ac4f2b9d2ba
--- /dev/null
+++ b/tests/queries/0_stateless/02096_totals_global_in_bug.sql
@@ -0,0 +1,2 @@
+select sum(number) from remote('127.0.0.{2,3}', numbers(2)) where number global in (select sum(number) from numbers(2) group by number with totals) group by number with totals
+
diff --git a/tests/queries/0_stateless/02097_default_dict_get_add_database.reference b/tests/queries/0_stateless/02097_default_dict_get_add_database.reference
new file mode 100644
index 00000000000..9b0ac07a68a
--- /dev/null
+++ b/tests/queries/0_stateless/02097_default_dict_get_add_database.reference
@@ -0,0 +1 @@
+CREATE TABLE `02097_db`.test_table_default (`data_1` UInt64 DEFAULT dictGetUInt64(\'02097_db.test_dictionary\', \'data_column_1\', toUInt64(0)), `data_2` UInt8 DEFAULT dictGet(`02097_db`.test_dictionary, \'data_column_2\', toUInt64(0))) ENGINE = TinyLog
diff --git a/tests/queries/0_stateless/02097_default_dict_get_add_database.sql b/tests/queries/0_stateless/02097_default_dict_get_add_database.sql
new file mode 100644
index 00000000000..af177566476
--- /dev/null
+++ b/tests/queries/0_stateless/02097_default_dict_get_add_database.sql
@@ -0,0 +1,44 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS 02097_db;
+CREATE DATABASE 02097_db;
+
+USE 02097_db;
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    key_column UInt64,
+    data_column_1 UInt64,
+    data_column_2 UInt8
+)
+ENGINE = MergeTree
+ORDER BY key_column;
+
+DROP DICTIONARY IF EXISTS test_dictionary;
+CREATE DICTIONARY test_dictionary
+(
+    key_column UInt64 DEFAULT 0,
+    data_column_1 UInt64 DEFAULT 1,
+    data_column_2 UInt8 DEFAULT 1
+)
+PRIMARY KEY key_column
+LAYOUT(DIRECT())
+SOURCE(CLICKHOUSE(TABLE 'test_table'));
+
+DROP TABLE IF EXISTS test_table_default;
+CREATE TABLE test_table_default
+(
+    data_1 DEFAULT dictGetUInt64('test_dictionary', 'data_column_1', toUInt64(0)),
+    data_2 DEFAULT dictGet(test_dictionary, 'data_column_2', toUInt64(0))
+)
+ENGINE=TinyLog;
+
+SELECT create_table_query FROM system.tables WHERE name = 'test_table_default' AND database = '02097_db';
+
+DROP DICTIONARY test_dictionary;
+DROP TABLE test_table;
+DROP TABLE test_table_default;
+
+DROP DATABASE 02097_db;
+
diff --git a/tests/queries/0_stateless/02097_initializeAggregationNullable.reference b/tests/queries/0_stateless/02097_initializeAggregationNullable.reference
new file mode 100644
index 00000000000..6d2e42f2ca6
--- /dev/null
+++ b/tests/queries/0_stateless/02097_initializeAggregationNullable.reference
@@ -0,0 +1,6 @@
+1
+AggregateFunction(uniqExact, Nullable(String))
+1
+AggregateFunction(uniqExact, Nullable(UInt8))
+1
+1
diff --git a/tests/queries/0_stateless/02097_initializeAggregationNullable.sql b/tests/queries/0_stateless/02097_initializeAggregationNullable.sql
new file mode 100644
index 00000000000..aa4e6d47579
--- /dev/null
+++ b/tests/queries/0_stateless/02097_initializeAggregationNullable.sql
@@ -0,0 +1,8 @@
+SELECT finalizeAggregation(initializeAggregation('uniqExactState', toNullable('foo')));
+SELECT toTypeName(initializeAggregation('uniqExactState', toNullable('foo')));
+
+SELECT finalizeAggregation(initializeAggregation('uniqExactState', toNullable(123)));
+SELECT toTypeName(initializeAggregation('uniqExactState', toNullable(123)));
+
+SELECT initializeAggregation('uniqExactState', toNullable('foo')) = arrayReduce('uniqExactState', [toNullable('foo')]);
+SELECT initializeAggregation('uniqExactState', toNullable(123)) = arrayReduce('uniqExactState', [toNullable(123)]);
diff --git a/tests/queries/0_stateless/02097_polygon_dictionary_store_key.reference b/tests/queries/0_stateless/02097_polygon_dictionary_store_key.reference
new file mode 100644
index 00000000000..f44a7c2a068
--- /dev/null
+++ b/tests/queries/0_stateless/02097_polygon_dictionary_store_key.reference
@@ -0,0 +1 @@
+[[[(3,1),(0,1),(0,-1),(3,-1)]]]	Value
diff --git a/tests/queries/0_stateless/02097_polygon_dictionary_store_key.sql b/tests/queries/0_stateless/02097_polygon_dictionary_store_key.sql
new file mode 100644
index 00000000000..95557da481e
--- /dev/null
+++ b/tests/queries/0_stateless/02097_polygon_dictionary_store_key.sql
@@ -0,0 +1,38 @@
+DROP TABLE IF EXISTS polygons_test_table;
+CREATE TABLE polygons_test_table
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+) ENGINE = TinyLog;
+
+INSERT INTO polygons_test_table VALUES ([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'Value');
+
+DROP DICTIONARY IF EXISTS polygons_test_dictionary_no_option;
+CREATE DICTIONARY polygons_test_dictionary_no_option
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE 'polygons_test_table'))
+LAYOUT(POLYGON())
+LIFETIME(0);
+
+SELECT * FROM polygons_test_dictionary_no_option; -- {serverError 1}
+
+DROP DICTIONARY IF EXISTS polygons_test_dictionary;
+CREATE DICTIONARY polygons_test_dictionary
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name String
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE 'polygons_test_table'))
+LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1))
+LIFETIME(0);
+
+SELECT * FROM polygons_test_dictionary;
+
+DROP DICTIONARY polygons_test_dictionary_no_option;
+DROP DICTIONARY polygons_test_dictionary;
+DROP TABLE polygons_test_table;
diff --git a/tests/queries/0_stateless/02097_remove_sample_by.reference b/tests/queries/0_stateless/02097_remove_sample_by.reference
new file mode 100644
index 00000000000..0747bbd5d1f
--- /dev/null
+++ b/tests/queries/0_stateless/02097_remove_sample_by.reference
@@ -0,0 +1,3 @@
+CREATE TABLE default.t_remove_sample_by\n(\n    `id` UInt64\n)\nENGINE = MergeTree\nORDER BY id\nSETTINGS index_granularity = 8192
+CREATE TABLE default.t_remove_sample_by\n(\n    `id` UInt64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/default/t_remove_sample_by\', \'1\')\nORDER BY id\nSETTINGS index_granularity = 8192
+CREATE TABLE default.t_remove_sample_by\n(\n    `id` String\n)\nENGINE = MergeTree\nORDER BY id\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/02097_remove_sample_by.sql b/tests/queries/0_stateless/02097_remove_sample_by.sql
new file mode 100644
index 00000000000..89fbfe0c4c5
--- /dev/null
+++ b/tests/queries/0_stateless/02097_remove_sample_by.sql
@@ -0,0 +1,44 @@
+-- Tags: zookeeper
+
+DROP TABLE IF EXISTS t_remove_sample_by;
+
+CREATE TABLE t_remove_sample_by(id UInt64) ENGINE = MergeTree ORDER BY id SAMPLE BY id;
+
+ALTER TABLE t_remove_sample_by REMOVE SAMPLE BY;
+SHOW CREATE TABLE t_remove_sample_by;
+
+ALTER TABLE t_remove_sample_by REMOVE SAMPLE BY; -- { serverError 36 }
+SELECT * FROM t_remove_sample_by SAMPLE 1 / 10; -- { serverError 141 }
+
+DROP TABLE t_remove_sample_by;
+
+CREATE TABLE t_remove_sample_by(id UInt64)
+ENGINE = ReplicatedMergeTree('/clickhouse/{database}/t_remove_sample_by', '1')
+ORDER BY id SAMPLE BY id;
+
+ALTER TABLE t_remove_sample_by REMOVE SAMPLE BY;
+SHOW CREATE TABLE t_remove_sample_by;
+
+DROP TABLE t_remove_sample_by;
+
+CREATE TABLE t_remove_sample_by(id UInt64) ENGINE = Memory;
+ALTER TABLE t_remove_sample_by REMOVE SAMPLE BY; -- { serverError 36 }
+
+DROP TABLE t_remove_sample_by;
+
+CREATE TABLE t_remove_sample_by(id String)
+ENGINE = MergeTree ORDER BY id SAMPLE BY id
+SETTINGS check_sample_column_is_correct = 0;
+
+ALTER TABLE t_remove_sample_by RESET SETTING check_sample_column_is_correct;
+
+DETACH TABLE t_remove_sample_by;
+ATTACH TABLE t_remove_sample_by;
+
+INSERT INTO t_remove_sample_by VALUES (1);
+SELECT * FROM t_remove_sample_by SAMPLE 1 / 10; -- { serverError 59 }
+
+ALTER TABLE t_remove_sample_by REMOVE SAMPLE BY;
+SHOW CREATE TABLE t_remove_sample_by;
+
+DROP TABLE t_remove_sample_by;
diff --git a/tests/queries/0_stateless/02098_date32_comparison.reference b/tests/queries/0_stateless/02098_date32_comparison.reference
new file mode 100644
index 00000000000..16d1f96acfd
--- /dev/null
+++ b/tests/queries/0_stateless/02098_date32_comparison.reference
@@ -0,0 +1,19 @@
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02098_date32_comparison.sql b/tests/queries/0_stateless/02098_date32_comparison.sql
new file mode 100644
index 00000000000..5fd7172e0bb
--- /dev/null
+++ b/tests/queries/0_stateless/02098_date32_comparison.sql
@@ -0,0 +1,19 @@
+select  toDate32('1990-01-01') = toDate('1990-01-01');
+select  toDate('1991-01-02') > toDate32('1990-01-01');
+select  toDate32('1925-01-01') <= toDate('1990-01-01');
+select  toDate('1991-01-01') < toDate32('2283-11-11');
+select  toDate32('1990-01-01') = toDateTime('1990-01-01');
+select  toDateTime('1991-01-02') > toDate32('1990-01-01');
+select  toDate32('1925-01-01') <= toDateTime('1990-01-01');
+select  toDateTime('1991-01-01') < toDate32('2283-11-11');
+select  toDate32('1990-01-01') = toDateTime64('1990-01-01',2);
+select  toDateTime64('1991-01-02',2) > toDate32('1990-01-01');
+select  toDate32('1925-01-01') = toDateTime64('1925-01-01',2);
+select  toDateTime64('1925-01-02',2) > toDate32('1925-01-01');
+select  toDate32('2283-11-11') = toDateTime64('2283-11-11',2);
+select  toDateTime64('2283-11-11',2) > toDate32('1925-01-01');
+select  toDate32('1990-01-01') = '1990-01-01';
+select  '1991-01-02' > toDate32('1990-01-01');
+select  toDate32('1925-01-01') = '1925-01-01';
+select  '2283-11-11' >= toDate32('2283-11-10');
+select  '2283-11-11' > toDate32('1925-01-01');
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.reference b/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.reference
new file mode 100644
index 00000000000..6e88bbad146
--- /dev/null
+++ b/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.reference
@@ -0,0 +1,66 @@
+Dictionary hashed_array_dictionary_simple_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	value_second_1
+2	value_2	value_second_2
+Dictionary hashed_array_dictionary_simple_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	value_0	value_second_0
+1	value_1	\N
+2	value_2	value_second_2
+Dictionary hashed_array_dictionary_simple_key_hierarchy
+dictGet
+0
+0
+1
+1
+2
+dictGetHierarchy
+[1]
+[4,2,1]
diff --git a/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql b/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql
new file mode 100644
index 00000000000..8d792836562
--- /dev/null
+++ b/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql
@@ -0,0 +1,125 @@
+DROP TABLE IF EXISTS simple_key_simple_attributes_source_table;
+CREATE TABLE simple_key_simple_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
+INSERT INTO simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+DROP DICTIONARY IF EXISTS hashed_array_dictionary_simple_key_simple_attributes;
+CREATE DICTIONARY hashed_array_dictionary_simple_key_simple_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'simple_key_simple_attributes_source_table'))
+LAYOUT(HASHED_ARRAY())
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Dictionary hashed_array_dictionary_simple_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('hashed_array_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('hashed_array_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('hashed_array_dictionary_simple_key_simple_attributes', 'value_first', number) as value_first,
+    dictGet('hashed_array_dictionary_simple_key_simple_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_simple_key_simple_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_simple_key_simple_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('hashed_array_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM hashed_array_dictionary_simple_key_simple_attributes ORDER BY id;
+
+DROP DICTIONARY hashed_array_dictionary_simple_key_simple_attributes;
+
+DROP TABLE simple_key_simple_attributes_source_table;
+
+DROP TABLE IF EXISTS simple_key_complex_attributes_source_table;
+CREATE TABLE simple_key_complex_attributes_source_table
+(
+   id UInt64,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
+INSERT INTO simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
+INSERT INTO simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+
+DROP DICTIONARY IF EXISTS hashed_array_dictionary_simple_key_complex_attributes;
+CREATE DICTIONARY hashed_array_dictionary_simple_key_complex_attributes
+(
+   id UInt64,
+   value_first String DEFAULT 'value_first_default',
+   value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'simple_key_complex_attributes_source_table'))
+LAYOUT(HASHED_ARRAY())
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Dictionary hashed_array_dictionary_simple_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('hashed_array_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('hashed_array_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('hashed_array_dictionary_simple_key_complex_attributes', 'value_first', number) as value_first,
+    dictGet('hashed_array_dictionary_simple_key_complex_attributes', 'value_second', number) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_simple_key_complex_attributes', 'value_first', number, toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_simple_key_complex_attributes', 'value_second', number, toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('hashed_array_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM hashed_array_dictionary_simple_key_complex_attributes ORDER BY id;
+
+DROP DICTIONARY hashed_array_dictionary_simple_key_complex_attributes;
+DROP TABLE simple_key_complex_attributes_source_table;
+
+DROP TABLE IF EXISTS simple_key_hierarchy_table;
+CREATE TABLE simple_key_hierarchy_table
+(
+    id UInt64,
+    parent_id UInt64
+) ENGINE = TinyLog();
+
+INSERT INTO simple_key_hierarchy_table VALUES (1, 0);
+INSERT INTO simple_key_hierarchy_table VALUES (2, 1);
+INSERT INTO simple_key_hierarchy_table VALUES (3, 1);
+INSERT INTO simple_key_hierarchy_table VALUES (4, 2);
+
+DROP DICTIONARY IF EXISTS hashed_array_dictionary_simple_key_hierarchy;
+CREATE DICTIONARY hashed_array_dictionary_simple_key_hierarchy
+(
+   id UInt64,
+   parent_id UInt64 HIERARCHICAL
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'simple_key_hierarchy_table'))
+LAYOUT(HASHED_ARRAY())
+LIFETIME(MIN 1 MAX 1000);
+
+SELECT 'Dictionary hashed_array_dictionary_simple_key_hierarchy';
+SELECT 'dictGet';
+SELECT dictGet('hashed_array_dictionary_simple_key_hierarchy', 'parent_id', number) FROM system.numbers LIMIT 5;
+SELECT 'dictGetHierarchy';
+SELECT dictGetHierarchy('hashed_array_dictionary_simple_key_hierarchy', toUInt64(1));
+SELECT dictGetHierarchy('hashed_array_dictionary_simple_key_hierarchy', toUInt64(4));
+
+DROP DICTIONARY hashed_array_dictionary_simple_key_hierarchy;
+DROP TABLE simple_key_hierarchy_table;
diff --git a/tests/queries/0_stateless/02098_sql_user_defined_functions_aliases.reference b/tests/queries/0_stateless/02098_sql_user_defined_functions_aliases.reference
new file mode 100644
index 00000000000..45a4fb75db8
--- /dev/null
+++ b/tests/queries/0_stateless/02098_sql_user_defined_functions_aliases.reference
@@ -0,0 +1 @@
+8
diff --git a/tests/queries/0_stateless/02098_sql_user_defined_functions_aliases.sql b/tests/queries/0_stateless/02098_sql_user_defined_functions_aliases.sql
new file mode 100644
index 00000000000..c5bd2b5b5f2
--- /dev/null
+++ b/tests/queries/0_stateless/02098_sql_user_defined_functions_aliases.sql
@@ -0,0 +1,4 @@
+-- Tags: no-parallel
+CREATE FUNCTION 02098_alias_function AS x -> (((x * 2) AS x_doubled) + x_doubled);
+SELECT 02098_alias_function(2);
+DROP FUNCTION 02098_alias_function;
diff --git a/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.reference b/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.reference
new file mode 100644
index 00000000000..ec32fa72b4e
--- /dev/null
+++ b/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.reference
@@ -0,0 +1,56 @@
+Dictionary hashed_array_dictionary_complex_key_simple_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	value_second_1
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	value_second_1
+2	id_key_2	value_2	value_second_2
+Dictionary hashed_array_dictionary_complex_key_complex_attributes
+dictGet existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGet with non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+value_first_default	value_second_default
+dictGetOrDefault existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+dictGetOrDefault non existing value
+value_0	value_second_0
+value_1	\N
+value_2	value_second_2
+default	default
+dictHas
+1
+1
+1
+0
+select all values as input stream
+0	id_key_0	value_0	value_second_0
+1	id_key_1	value_1	\N
+2	id_key_2	value_2	value_second_2
diff --git a/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql b/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql
new file mode 100644
index 00000000000..4d2a825c8af
--- /dev/null
+++ b/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql
@@ -0,0 +1,97 @@
+DROP TABLE IF EXISTS complex_key_simple_attributes_source_table;
+CREATE TABLE complex_key_simple_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second String
+)
+ENGINE = TinyLog;
+
+INSERT INTO complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
+INSERT INTO complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+DROP DICTIONARY IF EXISTS hashed_array_dictionary_complex_key_simple_attributes;
+CREATE DICTIONARY hashed_array_dictionary_complex_key_simple_attributes
+(
+   id UInt64,
+   id_key String,
+   value_first String DEFAULT 'value_first_default',
+   value_second String DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(TABLE 'complex_key_simple_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_HASHED_ARRAY());
+
+SELECT 'Dictionary hashed_array_dictionary_complex_key_simple_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('hashed_array_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('hashed_array_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('hashed_array_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('hashed_array_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_complex_key_simple_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_complex_key_simple_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('hashed_array_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM hashed_array_dictionary_complex_key_simple_attributes ORDER BY (id, id_key);
+
+DROP DICTIONARY hashed_array_dictionary_complex_key_simple_attributes;
+
+DROP TABLE complex_key_simple_attributes_source_table;
+
+DROP TABLE IF EXISTS complex_key_complex_attributes_source_table;
+CREATE TABLE complex_key_complex_attributes_source_table
+(
+   id UInt64,
+   id_key String,
+   value_first String,
+   value_second Nullable(String)
+)
+ENGINE = TinyLog;
+
+INSERT INTO complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
+INSERT INTO complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
+INSERT INTO complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+
+DROP DICTIONARY IF EXISTS hashed_array_dictionary_complex_key_complex_attributes;
+CREATE DICTIONARY hashed_array_dictionary_complex_key_complex_attributes
+(
+    id UInt64,
+    id_key String,
+
+    value_first String DEFAULT 'value_first_default',
+    value_second Nullable(String) DEFAULT 'value_second_default'
+)
+PRIMARY KEY id, id_key
+SOURCE(CLICKHOUSE(TABLE 'complex_key_complex_attributes_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(COMPLEX_KEY_HASHED_ARRAY());
+
+SELECT 'Dictionary hashed_array_dictionary_complex_key_complex_attributes';
+SELECT 'dictGet existing value';
+SELECT dictGet('hashed_array_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('hashed_array_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGet with non existing value';
+SELECT dictGet('hashed_array_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number)))) as value_first,
+    dictGet('hashed_array_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number)))) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictGetOrDefault existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 3;
+SELECT 'dictGetOrDefault non existing value';
+SELECT dictGetOrDefault('hashed_array_dictionary_complex_key_complex_attributes', 'value_first', (number, concat('id_key_', toString(number))), toString('default')) as value_first,
+    dictGetOrDefault('hashed_array_dictionary_complex_key_complex_attributes', 'value_second', (number, concat('id_key_', toString(number))), toString('default')) as value_second FROM system.numbers LIMIT 4;
+SELECT 'dictHas';
+SELECT dictHas('hashed_array_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
+SELECT 'select all values as input stream';
+SELECT * FROM hashed_array_dictionary_complex_key_complex_attributes ORDER BY (id, id_key);
+
+DROP DICTIONARY hashed_array_dictionary_complex_key_complex_attributes;
+DROP TABLE complex_key_complex_attributes_source_table;
diff --git a/tests/queries/0_stateless/02099_sql_user_defined_functions_lambda.reference b/tests/queries/0_stateless/02099_sql_user_defined_functions_lambda.reference
new file mode 100644
index 00000000000..8f6cd5ccd03
--- /dev/null
+++ b/tests/queries/0_stateless/02099_sql_user_defined_functions_lambda.reference
@@ -0,0 +1 @@
+[2,4,6]
diff --git a/tests/queries/0_stateless/02099_sql_user_defined_functions_lambda.sql b/tests/queries/0_stateless/02099_sql_user_defined_functions_lambda.sql
new file mode 100644
index 00000000000..1c926faf3a1
--- /dev/null
+++ b/tests/queries/0_stateless/02099_sql_user_defined_functions_lambda.sql
@@ -0,0 +1,4 @@
+-- Tags: no-parallel
+CREATE FUNCTION 02099_lambda_function AS x -> arrayMap(array_element -> array_element * 2, x);
+SELECT 02099_lambda_function([1,2,3]);
+DROP FUNCTION 02099_lambda_function;
diff --git a/tests/queries/0_stateless/01411_bayesian_ab_testing.reference b/tests/queries/0_stateless/02100_alter_scalar_circular_deadlock.reference
similarity index 100%
rename from tests/queries/0_stateless/01411_bayesian_ab_testing.reference
rename to tests/queries/0_stateless/02100_alter_scalar_circular_deadlock.reference
diff --git a/tests/queries/0_stateless/02100_alter_scalar_circular_deadlock.sql b/tests/queries/0_stateless/02100_alter_scalar_circular_deadlock.sql
new file mode 100644
index 00000000000..32b757f54a3
--- /dev/null
+++ b/tests/queries/0_stateless/02100_alter_scalar_circular_deadlock.sql
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS foo;
+
+CREATE TABLE foo (ts DateTime, x UInt64)
+ENGINE = MergeTree PARTITION BY toYYYYMMDD(ts)
+ORDER BY (ts);
+
+INSERT INTO foo (ts, x) SELECT toDateTime('2020-01-01 00:05:00'), number from system.numbers_mt LIMIT 10;
+
+SET mutations_sync = 1;
+
+ALTER TABLE foo UPDATE x = 1 WHERE x = (SELECT x from foo WHERE x = 4);
+
+SELECT sum(x) == 42 FROM foo;
+
+ALTER TABLE foo UPDATE x = 1 WHERE x IN (SELECT x FROM foo WHERE x != 0);
+
+SELECT sum(x) == 9 FROM foo;
+
+DROP TABLE IF EXISTS bar;
+
+CREATE TABLE bar (ts DateTime, x UInt64)
+ENGINE = Memory;
+
+INSERT INTO bar (ts, x) SELECT toDateTime('2020-01-01 00:05:00'), number from system.numbers_mt LIMIT 10;
+
+SET mutations_sync = 1;
+
+ALTER TABLE bar UPDATE x = 1 WHERE x = (SELECT x from bar WHERE x = 4);
+
+SELECT sum(x) == 42 FROM bar;
+
+ALTER TABLE bar UPDATE x = 1 WHERE x IN (SELECT x FROM bar WHERE x != 0);
+
+SELECT sum(x) == 9 FROM bar;
diff --git a/tests/queries/0_stateless/02100_limit_push_down_bug.reference b/tests/queries/0_stateless/02100_limit_push_down_bug.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02100_limit_push_down_bug.sql b/tests/queries/0_stateless/02100_limit_push_down_bug.sql
new file mode 100644
index 00000000000..2ba9d2b8818
--- /dev/null
+++ b/tests/queries/0_stateless/02100_limit_push_down_bug.sql
@@ -0,0 +1,21 @@
+drop table if exists tbl_repr;
+
+CREATE TABLE tbl_repr(
+ts DateTime,
+x  String)
+ENGINE=MergeTree ORDER BY ts;
+
+
+SELECT *
+FROM
+(
+    SELECT
+        x,
+        length(x)
+    FROM tbl_repr
+    WHERE ts > now()
+    LIMIT 1
+)
+WHERE x != '';
+
+drop table if exists tbl_repr;
diff --git a/tests/queries/0_stateless/02100_now64_types_bug.reference b/tests/queries/0_stateless/02100_now64_types_bug.reference
new file mode 100644
index 00000000000..ae136939b64
--- /dev/null
+++ b/tests/queries/0_stateless/02100_now64_types_bug.reference
@@ -0,0 +1,3 @@
+2
+1
+0
diff --git a/tests/queries/0_stateless/02100_now64_types_bug.sql b/tests/queries/0_stateless/02100_now64_types_bug.sql
new file mode 100644
index 00000000000..ef91b19bb08
--- /dev/null
+++ b/tests/queries/0_stateless/02100_now64_types_bug.sql
@@ -0,0 +1,8 @@
+SELECT x
+FROM
+(
+    SELECT if((number % NULL) = -2147483648, NULL, if(toInt64(toInt64(now64(if((number % NULL) = -2147483648, NULL, if(toInt64(now64(toInt64(9223372036854775807, now64(plus(NULL, NULL))), plus(NULL, NULL))) = (number % NULL), nan, toFloat64(number))), toInt64(9223372036854775807, toInt64(9223372036854775807, now64(plus(NULL, NULL))), now64(plus(NULL, NULL))), plus(NULL, NULL))), now64(toInt64(9223372036854775807, toInt64(0, now64(plus(NULL, NULL))), now64(plus(NULL, NULL))), plus(NULL, NULL))) = (number % NULL), nan, toFloat64(number))) AS x
+    FROM system.numbers
+    LIMIT 3
+)
+ORDER BY x DESC NULLS LAST
diff --git a/tests/queries/0_stateless/02100_replaceRegexpAll_bug.reference b/tests/queries/0_stateless/02100_replaceRegexpAll_bug.reference
new file mode 100644
index 00000000000..993dd9b1cde
--- /dev/null
+++ b/tests/queries/0_stateless/02100_replaceRegexpAll_bug.reference
@@ -0,0 +1,11 @@
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02100_replaceRegexpAll_bug.sql b/tests/queries/0_stateless/02100_replaceRegexpAll_bug.sql
new file mode 100644
index 00000000000..32f7f63f6d0
--- /dev/null
+++ b/tests/queries/0_stateless/02100_replaceRegexpAll_bug.sql
@@ -0,0 +1,14 @@
+SELECT 'aaaabb ' == trim(leading 'b ' FROM 'b aaaabb ') x;
+SELECT 'b aaaa' == trim(trailing 'b ' FROM 'b aaaabb ') x;
+SELECT 'aaaa' == trim(both 'b ' FROM 'b aaaabb ') x;
+
+SELECT '1' == replaceRegexpAll(',,1,,', '^[,]*|[,]*$', '') x;
+SELECT '1' == replaceRegexpAll(',,1', '^[,]*|[,]*$', '') x;
+SELECT '1' == replaceRegexpAll('1,,', '^[,]*|[,]*$', '') x;
+
+SELECT '1,,' == replaceRegexpOne(',,1,,', '^[,]*|[,]*$', '') x;
+SELECT '1' == replaceRegexpOne(',,1', '^[,]*|[,]*$', '') x;
+SELECT '1,,' == replaceRegexpOne('1,,', '^[,]*|[,]*$', '') x;
+
+SELECT '5935,5998,6014' == trim(BOTH ', ' FROM '5935,5998,6014, ') x;
+SELECT '5935,5998,6014' == replaceRegexpAll('5935,5998,6014, ', concat('^[', regexpQuoteMeta(', '), ']*|[', regexpQuoteMeta(', '), ']*$'), '') AS x;
diff --git a/tests/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.reference b/tests/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.reference
new file mode 100644
index 00000000000..437cc81afba
--- /dev/null
+++ b/tests/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.reference
@@ -0,0 +1,4 @@
+CREATE FUNCTION `02101_test_function` AS x -> (x + 1)
+2
+CREATE FUNCTION `02101_test_function` AS x -> (x + 2)
+3
diff --git a/tests/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.sql b/tests/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.sql
new file mode 100644
index 00000000000..7b0ad311bd4
--- /dev/null
+++ b/tests/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.sql
@@ -0,0 +1,13 @@
+-- Tags: no-parallel
+
+CREATE OR REPLACE FUNCTION 02101_test_function AS x -> x + 1;
+
+SELECT create_query FROM system.functions WHERE name = '02101_test_function';
+SELECT 02101_test_function(1);
+
+CREATE OR REPLACE FUNCTION 02101_test_function AS x -> x + 2;
+
+SELECT create_query FROM system.functions WHERE name = '02101_test_function';
+SELECT 02101_test_function(1);
+
+DROP FUNCTION 02101_test_function;
diff --git a/tests/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.reference b/tests/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.sql b/tests/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.sql
new file mode 100644
index 00000000000..09e2677774c
--- /dev/null
+++ b/tests/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.sql
@@ -0,0 +1,9 @@
+-- Tags: no-parallel
+
+CREATE FUNCTION 02101_test_function AS x -> x + 1;
+
+SELECT 02101_test_function(1);
+
+DROP FUNCTION 02101_test_function;
+DROP FUNCTION 02101_test_function; --{serverError 46}
+DROP FUNCTION IF EXISTS 02101_test_function;
diff --git a/tests/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.reference b/tests/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.sql b/tests/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.sql
new file mode 100644
index 00000000000..092fa660cb0
--- /dev/null
+++ b/tests/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.sql
@@ -0,0 +1,8 @@
+-- Tags: no-parallel
+
+CREATE FUNCTION IF NOT EXISTS 02102_test_function AS x -> x + 1;
+SELECT 02102_test_function(1);
+
+CREATE FUNCTION 02102_test_function AS x -> x + 1; --{serverError 609}
+CREATE FUNCTION IF NOT EXISTS 02102_test_function AS x -> x + 1;
+DROP FUNCTION 02102_test_function;
diff --git a/tests/queries/0_stateless/02103_sql_user_defined_functions_composition.reference b/tests/queries/0_stateless/02103_sql_user_defined_functions_composition.reference
new file mode 100644
index 00000000000..51993f072d5
--- /dev/null
+++ b/tests/queries/0_stateless/02103_sql_user_defined_functions_composition.reference
@@ -0,0 +1,2 @@
+2
+2
diff --git a/tests/queries/0_stateless/02103_sql_user_defined_functions_composition.sql b/tests/queries/0_stateless/02103_sql_user_defined_functions_composition.sql
new file mode 100644
index 00000000000..3d34413b9d3
--- /dev/null
+++ b/tests/queries/0_stateless/02103_sql_user_defined_functions_composition.sql
@@ -0,0 +1,12 @@
+-- Tags: no-parallel
+
+CREATE FUNCTION 02103_test_function AS x -> x + 1;
+CREATE FUNCTION 02103_test_function_with_nested_function_empty_args AS () -> 02103_test_function(1);
+CREATE FUNCTION 02103_test_function_with_nested_function_arg AS (x) -> 02103_test_function(x);
+
+SELECT 02103_test_function_with_nested_function_empty_args();
+SELECT 02103_test_function_with_nested_function_arg(1);
+
+DROP FUNCTION 02103_test_function_with_nested_function_empty_args;
+DROP FUNCTION 02103_test_function_with_nested_function_arg;
+DROP FUNCTION 02103_test_function;
diff --git a/tests/queries/0_stateless/02104_clickhouse_local_columns_description.reference b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.reference
new file mode 100644
index 00000000000..0e291f3ac0d
--- /dev/null
+++ b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.reference
@@ -0,0 +1 @@
+1	42
diff --git a/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
new file mode 100755
index 00000000000..f88a8de80f5
--- /dev/null
+++ b/tests/queries/0_stateless/02104_clickhouse_local_columns_description.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_LOCAL} --query "create table t (n int, m int default 42) engine=Memory;insert into t values (1, NULL);select * from t"
diff --git a/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.config.xml b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.config.xml
new file mode 100644
index 00000000000..0baa5b32ef8
--- /dev/null
+++ b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.config.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <profiles>
+        <default></default>
+    </profiles>
+    <users>
+        <default>
+            <password></password>
+            <networks>
+                <ip>::/0</ip>
+            </networks>
+            <profile>default</profile>
+            <quota>default</quota>
+        </default>
+    </users>
+    <quotas>
+        <default></default>
+    </quotas>
+
+    <top_level_domains_lists>
+        <public_suffix_list>02110_clickhouse_local_custom_tld.tld.dat</public_suffix_list>
+    </top_level_domains_lists>
+</clickhouse>
diff --git a/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.reference b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.reference
new file mode 100644
index 00000000000..bf62392aeee
--- /dev/null
+++ b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.reference
@@ -0,0 +1 @@
+biz.ss	kernel.biz.ss
diff --git a/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.sh b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.sh
new file mode 100755
index 00000000000..02a454957d4
--- /dev/null
+++ b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+function clickhouse_local()
+{
+    local opts=(
+        --config "$CURDIR/$(basename "${BASH_SOURCE[0]}" .sh).config.xml"
+        --top_level_domains_path "$CURDIR"
+    )
+    $CLICKHOUSE_LOCAL "${opts[@]}" "$@"
+}
+
+# -- biz.ss is not in the default TLD list, hence:
+clickhouse_local -q "
+    select
+        cutToFirstSignificantSubdomain('foo.kernel.biz.ss'),
+        cutToFirstSignificantSubdomainCustom('foo.kernel.biz.ss', 'public_suffix_list')
+" |& grep -v -e 'Processing configuration file'
diff --git a/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.tld.dat b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.tld.dat
new file mode 100644
index 00000000000..510e6dd9ec0
--- /dev/null
+++ b/tests/queries/0_stateless/02110_clickhouse_local_custom_tld.tld.dat
@@ -0,0 +1 @@
+biz.ss
diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt
deleted file mode 100644
index d7581cc4e07..00000000000
--- a/tests/queries/0_stateless/arcadia_skip_list.txt
+++ /dev/null
@@ -1,267 +0,0 @@
-# Add testcase here to skip it in Arcadia CI (Yandex synchronization check)
-# It is useful for tests with not supported features in Arcadia build
-00105_shard_collations
-00184_shard_distributed_group_by_no_merge
-00436_convert_charset
-00490_special_line_separators_and_characters_outside_of_bmp
-00506_union_distributed
-00586_removing_unused_columns_from_subquery
-00588_shard_distributed_prewhere
-00594_alias_in_distributed
-00609_distributed_with_case_when_then
-00678_murmurhash
-00717_low_cardinaliry_distributed_group_by
-00717_merge_and_distributed
-00732_base64_functions
-00746_hashing_tuples
-00751_hashing_ints
-00753_distributed_system_columns_and_system_tables
-00800_function_java_hash
-00800_low_cardinality_distributed_insert
-00821_distributed_storage_with_join_on
-00829_bitmap_function
-00829_bitmap64_function
-00850_global_join_dups
-00858_issue_4756
-00877_memory_limit_for_new_delete
-00921_datetime64_basic
-00926_geo_to_h3
-01659_h3_buffer_overflow
-00926_multimatch
-00929_multi_match_edit_distance
-00952_insert_into_distributed_with_materialized_column
-00967_insert_into_distributed_different_types
-00974_bitmapContains_with_primary_key
-00974_distributed_join_on
-00974_query_profiler
-00980_shard_aggregation_state_deserialization
-00980_skip_unused_shards_without_sharding_key
-00987_distributed_stack_overflow
-00990_metric_log_table_not_empty
-01009_global_array_join_names
-01016_macros
-01018_ddl_dictionaries_select
-01018_ddl_dictionaries_special
-01018_dictionaries_from_dictionaries
-01018_Distributed__shard_num
-01023_materialized_view_query_context
-01030_storage_hdfs_syntax
-01033_dictionaries_lifetime
-01036_no_superfluous_dict_reload_on_create_database
-01036_no_superfluous_dict_reload_on_create_database_2
-01037_polygon_dict_multi_polygons
-01037_polygon_dict_simple_polygons
-01040_distributed_directory_monitor_batch_inserts
-01040_h3_get_resolution
-01041_create_dictionary_if_not_exists
-01041_h3_is_valid
-01042_h3_k_ring
-01043_dictionary_attribute_properties_values
-01043_h3_edge_length_m
-01044_h3_edge_angle
-01046_materialized_view_with_join_over_distributed
-01050_clickhouse_dict_source_with_subquery
-01053_ssd_dictionary
-01059_storage_file_brotli
-01070_h3_get_base_cell
-01070_h3_hex_area_m2
-01070_h3_indexes_are_neighbors
-01070_h3_to_children
-01070_h3_to_parent
-01070_h3_to_string
-01070_string_to_h3
-01071_force_optimize_skip_unused_shards
-01072_optimize_skip_unused_shards_const_expr_eval
-01074_h3_range_check
-01080_check_for_error_incorrect_size_of_nested_column
-01083_expressions_in_engine_arguments
-01083_log_family_disk_memory
-01091_num_threads
-01092_base64
-01092_memory_profiler
-01099_parallel_distributed_insert_select
-01102_distributed_local_in_bug
-01103_distributed_product_mode_local_column_renames
-01104_distributed_numbers_test
-01104_distributed_one_test
-01110_dictionary_layout_without_arguments
-01113_local_dictionary_type_conversion
-01114_mysql_database_engine_segfault
-01115_join_with_dictionary
-01125_dict_ddl_cannot_add_column
-01129_dict_get_join_lose_constness
-01138_join_on_distributed_and_tmp
-01153_attach_mv_uuid
-01155_rename_move_materialized_view
-01191_rename_dictionary
-01200_mutations_memory_consumption
-01211_optimize_skip_unused_shards_type_mismatch
-01213_optimize_skip_unused_shards_DISTINCT
-01220_scalar_optimization_in_alter
-01223_dist_on_dist
-01225_drop_dictionary_as_table
-01227_distributed_global_in_issue_2610
-01231_distributed_aggregation_memory_efficient_mix_levels
-01232_extremes
-01235_live_view_over_distributed
-01236_distributed_over_live_view_over_distributed
-01236_graphite_mt
-01237_live_view_over_distributed_with_subquery_select_table_alias
-01247_optimize_distributed_group_by_sharding_key
-01247_optimize_distributed_group_by_sharding_key_dist_on_dist
-01251_dict_is_in_infinite_loop
-01253_subquery_in_aggregate_function_JustStranger
-01254_dict_create_without_db
-01254_dict_load_after_detach_attach
-01257_dictionary_mismatch_types
-01259_dictionary_custom_settings_ddl
-01263_type_conversion_nvartolomei
-01267_alter_default_key_columns
-01268_dictionary_direct_layout
-01270_optimize_skip_unused_shards_low_cardinality
-01273_h3EdgeAngle_range_check
-01274_alter_rename_column_distributed
-01276_system_licenses
-01280_ssd_complex_key_dictionary
-01291_distributed_low_cardinality_memory_efficient
-01292_create_user
-01293_show_clusters
-01293_system_distribution_queue
-01294_system_distributed_on_cluster
-01297_alter_distributed
-01303_aggregate_function_nothing_serde
-01307_orc_output_format
-01308_orc_output_format_arrays
-01319_query_formatting_in_server_log
-01326_build_id
-01354_order_by_tuple_collate_const
-01370_client_autocomplete_word_break_characters
-01319_optimize_skip_unused_shards_nesting
-01376_GROUP_BY_injective_elimination_dictGet
-01391_join_on_dict_crash
-01401_FORMAT_SETTINGS
-01411_bayesian_ab_testing
-01455_time_zones
-01456_ast_optimizations_over_distributed
-01460_DistributedFilesToInsert
-01474_executable_dictionary
-01474_bad_global_join
-01457_create_as_table_function_structure
-01473_event_time_microseconds
-01461_query_start_time_microseconds
-01455_shard_leaf_max_rows_bytes_to_read
-01505_distributed_local_type_conversion_enum
-01505_log_distributed_deadlock
-00604_show_create_database
-00609_mv_index_in_in
-00510_materizlized_view_and_deduplication_zookeeper
-00738_lock_for_inner_table
-01501_cache_dictionary_all_fields
-01504_rocksdb
-01515_force_data_skipping_indices
-01526_complex_key_dict_direct_layout
-01509_dictionary_preallocate
-01526_max_untracked_memory
-01530_drop_database_atomic_sync
-01532_collate_in_low_cardinality
-01533_collate_in_nullable
-01542_collate_in_array
-01543_collate_in_tuple
-01545_url_file_format_settings
-01546_log_queries_min_query_duration_ms
-01547_query_log_current_database
-01548_query_log_query_execution_ms
-01552_dict_fixedstring
-01555_system_distribution_queue_mask
-01557_max_parallel_replicas_no_sample
-01525_select_with_offset_fetch_clause
-01560_timeseriesgroupsum_segfault
-00976_ttl_with_old_parts
-01584_distributed_buffer_cannot_find_column
-01018_ip_dictionary_long
-01582_distinct_subquery_groupby
-01558_ttest
-01558_ttest_scipy
-01561_mann_whitney_scipy
-01601_custom_tld
-01602_insert_into_table_function_cluster
-01636_nullable_fuzz2
-01639_distributed_sync_insert_zero_rows
-01644_distributed_async_insert_fsync_smoke
-01552_impl_aggfunc_cloneresize
-01650_fetch_patition_with_macro_in_zk_path
-01651_bugs_from_15889
-01655_agg_if_nullable
-01658_read_file_to_stringcolumn
-01182_materialized_view_different_structure
-01660_sum_ubsan
-01669_columns_declaration_serde
-01666_blns
-01181_db_atomic_drop_on_cluster
-01658_test_base64Encode_mysql_compatibility
-01659_test_base64Decode_mysql_compatibility
-01670_distributed_bytes_to_throw_insert
-01674_htm_xml_coarse_parse
-01675_distributed_bytes_to_delay_insert
-01675_data_type_coroutine
-01676_clickhouse_client_autocomplete
-01671_aggregate_function_group_bitmap_data
-01674_executable_dictionary_implicit_key
-01686_rocksdb
-01683_dist_INSERT_block_structure_mismatch
-01702_bitmap_native_integers
-01686_event_time_microseconds_part_log
-01017_uniqCombined_memory_usage
-01747_join_view_filter_dictionary
-01748_dictionary_table_dot
-01755_client_highlight_multi_line_comment_regression
-01756_optimize_skip_unused_shards_rewrite_in
-00950_dict_get
-01683_flat_dictionary
-01681_cache_dictionary_simple_key
-01682_cache_dictionary_complex_key
-01684_ssd_cache_dictionary_simple_key
-01685_ssd_cache_dictionary_complex_key
-01304_polygons_sym_difference
-01305_polygons_union
-01306_polygons_intersection
-01702_system_query_log
-01710_projection_fetch
-01759_optimize_skip_unused_shards_zero_shards
-01780_clickhouse_dictionary_source_loop
-01790_dist_INSERT_block_structure_mismatch_types_and_names
-01791_dist_INSERT_block_structure_mismatch
-01798_uniq_theta_sketch
-01799_long_uniq_theta_sketch
-01801_distinct_group_by_shard
-01804_dictionary_decimal256_type
-01801_s3_distributed
-01814_distributed_push_down_limit
-01833_test_collation_alvarotuso
-01850_dist_INSERT_preserve_error
-01870_modulo_partition_key
-01880_remote_ipv6
-01882_scalar_subquery_exception
-01882_check_max_parts_to_merge_at_once
-01890_materialized_distributed_join
-01892_setting_limit_offset_distributed
-01901_test_attach_partition_from
-01910_view_dictionary
-01824_prefer_global_in_and_join
-01576_alias_column_rewrite
-01924_argmax_bitmap_state
-01914_exchange_dictionaries
-01923_different_expression_name_alias
-01930_optimize_skip_unused_shards_rewrite_in
-01932_null_valid_identifier
-00918_json_functions
-01889_sql_json_functions
-01849_geoToS2
-01851_s2_to_geo
-01852_s2_get_neighbours
-01853_s2_cells_intersect
-01854_s2_cap_contains
-01854_s2_cap_union
-01428_h3_range_check
-01442_h3kring_range_check
-01906_h3_to_geo
diff --git a/tests/queries/0_stateless/data_minio/a.tsv b/tests/queries/0_stateless/data_minio/a.tsv
new file mode 100644
index 00000000000..acd7c60768b
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/a.tsv
@@ -0,0 +1,4 @@
+1	2	3
+4	5	6
+7	8	9
+0	0	0
diff --git a/tests/queries/0_stateless/data_minio/b.tsv b/tests/queries/0_stateless/data_minio/b.tsv
new file mode 100644
index 00000000000..a32392250a7
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/b.tsv
@@ -0,0 +1,4 @@
+10	11	12
+13	14	15
+16	17	18
+0	0	0
diff --git a/tests/queries/0_stateless/data_minio/c.tsv b/tests/queries/0_stateless/data_minio/c.tsv
new file mode 100644
index 00000000000..c935e93430c
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/c.tsv
@@ -0,0 +1,4 @@
+20	21	22
+23	24	25
+26	27	28
+0	0	0
diff --git a/tests/queries/0_stateless/data_minio/tsv_with_header.tsv b/tests/queries/0_stateless/data_minio/tsv_with_header.tsv
new file mode 100644
index 00000000000..d93a8c9ba0c
--- /dev/null
+++ b/tests/queries/0_stateless/data_minio/tsv_with_header.tsv
@@ -0,0 +1,4 @@
+number	name
+1	ClickHouse
+2	Hello
+3	Hedhehog
diff --git a/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.arrow b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.arrow
new file mode 100644
index 00000000000..2f3709d079e
Binary files /dev/null and b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.arrow differ
diff --git a/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.orc b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.orc
new file mode 100644
index 00000000000..4112df41a52
Binary files /dev/null and b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.orc differ
diff --git a/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.parquet b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.parquet
new file mode 100644
index 00000000000..c73fba8d483
Binary files /dev/null and b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.parquet differ
diff --git a/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.arrow b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.arrow
new file mode 100644
index 00000000000..0d5682e7d62
Binary files /dev/null and b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.arrow differ
diff --git a/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.orc b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.orc
new file mode 100644
index 00000000000..6fd8ac5477b
Binary files /dev/null and b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.orc differ
diff --git a/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.parquet b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.parquet
new file mode 100644
index 00000000000..0bdcc288107
Binary files /dev/null and b/tests/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns b/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
index 299ec3b6af2..3eafbc1bb02 100644
--- a/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
@@ -1 +1 @@
-`ID` Nullable(Int64), `Int_Array` Array(Nullable(Int32)), `int_array_array` Array(Array(Nullable(Int32))), `Int_Map` Map(String, Nullable(Int32)), `int_map_array` Array(Map(String, Nullable(Int32))), `nested_Struct` Tuple(Nullable(Int32), Array(Nullable(Int32)), Tuple(Array(Array(Tuple(Nullable(Int32))))), Map(String, Tuple(Tuple(Array(Nullable(Float64))))))
+`ID` Nullable(Int64), `Int_Array` Array(Nullable(Int32)), `int_array_array` Array(Array(Nullable(Int32))), `Int_Map` Map(String, Nullable(Int32)), `int_map_array` Array(Map(String, Nullable(Int32))), `nested_Struct` Tuple(Nullable(Int32), Array(Nullable(Int32)), Tuple(Array(Array(Tuple(Nullable(Int32), Nullable(String))))), Map(String, Tuple(Tuple(Array(Nullable(Float64))))))
diff --git a/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns b/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
index 6fcbcdd4a0b..f8e51d8b43a 100644
--- a/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
+++ b/tests/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
@@ -1 +1 @@
-`id` Nullable(Int64), `int_array` Array(Nullable(Int32)), `int_array_Array` Array(Array(Nullable(Int32))), `int_map` Map(String, Nullable(Int32)), `int_Map_Array` Array(Map(String, Nullable(Int32))), `nested_struct` Tuple(Nullable(Int32), Array(Nullable(Int32)), Tuple(Array(Array(Tuple(Nullable(Int32))))), Map(String, Tuple(Tuple(Array(Nullable(Float64))))))
+`id` Nullable(Int64), `int_array` Array(Nullable(Int32)), `int_array_Array` Array(Array(Nullable(Int32))), `int_map` Map(String, Nullable(Int32)), `int_Map_Array` Array(Map(String, Nullable(Int32))), `nested_struct` Tuple(Nullable(Int32), Array(Nullable(Int32)), Tuple(Array(Array(Tuple(Nullable(Int32), Nullable(String))))), Map(String, Tuple(Tuple(Array(Nullable(Float64))))))
diff --git a/tests/queries/0_stateless/data_zlib/02013_zlib_read_after_eof_data b/tests/queries/0_stateless/data_zlib/02013_zlib_read_after_eof_data
new file mode 100644
index 00000000000..3e57c082462
Binary files /dev/null and b/tests/queries/0_stateless/data_zlib/02013_zlib_read_after_eof_data differ
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_enum.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_enum.capnp
new file mode 100644
index 00000000000..f033b177a45
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_enum.capnp
@@ -0,0 +1,13 @@
+@0x9ef128e10a8010b2;
+
+struct Message
+{
+    value @0 : EnumType;
+    
+    enum EnumType
+    {
+        one @0;
+        two @1;
+        tHrEe @2;
+    }
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_fake_nullable.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_fake_nullable.capnp
new file mode 100644
index 00000000000..a027692e4bc
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_fake_nullable.capnp
@@ -0,0 +1,23 @@
+@0xd8dd7b35452d1c4c;
+
+struct FakeNullable1
+{
+    union
+    {
+        value @0 : Text;
+        null @1 : Void;
+        trash @2 : Text;
+    }
+}
+
+struct FakeNullable2
+{
+    value @0 : Text;
+    null @1 : Void;
+}
+
+struct Message
+{
+    nullable1 @0 : FakeNullable1;
+    nullable2 @1 : FakeNullable2;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_lists.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_lists.capnp
new file mode 100644
index 00000000000..78fe3cf551e
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_lists.capnp
@@ -0,0 +1,8 @@
+@0x9ef128e10a8010b7;
+
+struct Message
+{
+    value @0 : UInt64;
+    list1 @1 : List(UInt64);
+    list2 @2 : List(List(List(UInt64)));
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_low_cardinality.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_low_cardinality.capnp
new file mode 100644
index 00000000000..0958889f0d8
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_low_cardinality.capnp
@@ -0,0 +1,17 @@
+@0x9ef128e10a8010b7;
+
+struct NullableText
+{
+    union
+    {
+        value @0 : Text;
+        null @1 : Void;
+    }
+}
+
+struct Message
+{
+    lc1 @0 : Text;
+    lc2 @1 : NullableText;
+    lc3 @2 : List(NullableText);
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_nested_lists_and_tuples.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_nested_lists_and_tuples.capnp
new file mode 100644
index 00000000000..11fa99f62f5
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_nested_lists_and_tuples.capnp
@@ -0,0 +1,36 @@
+@0x9ef128e10a8010b2;
+
+struct Nested1
+{
+    b @0 : UInt64;
+    c @1 : List(List(UInt64));
+}
+
+struct Nested2
+{
+    e @0 : List(List(Nested3));
+    h @1 : List(Nested4);
+}
+
+struct Nested3
+{
+    f @0 : UInt64;
+    g @1 : UInt64;
+}
+
+struct Nested4
+{
+    k @0 : List(UInt64);    
+}
+
+struct Nested
+{
+    a @0 : Nested1;
+    d @1 : List(Nested2);
+}
+
+struct Message
+{
+    value @0 : UInt64;
+    nested @1 : Nested;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_nested_table.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_nested_table.capnp
new file mode 100644
index 00000000000..42f17246d58
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_nested_table.capnp
@@ -0,0 +1,20 @@
+@0x9ef128e10a8010b3;
+
+
+struct Nested1
+{
+    one @0 : UInt64;
+    two @1 : UInt64;
+}
+
+struct Nested
+{
+    value @0 : List(UInt64);
+    array @1 : List(List(UInt64));
+    tuple @2 : List(Nested1);
+}
+
+struct Message
+{
+    nested @0 : Nested;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_nested_tuples.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_nested_tuples.capnp
new file mode 100644
index 00000000000..161c1bbaea6
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_nested_tuples.capnp
@@ -0,0 +1,23 @@
+@0x9ef128e12a8010b2;
+
+struct Nested1
+{
+    d @0 : UInt64;
+    e @1 : Nested2;
+}
+
+struct Nested2
+{
+    f @0 : UInt64;
+}
+
+struct Nested
+{
+    b @0 : UInt64;
+    c @1 : Nested1;
+}
+
+struct Message
+{
+    a @0 : Nested;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_nullable.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_nullable.capnp
new file mode 100644
index 00000000000..41254911710
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_nullable.capnp
@@ -0,0 +1,22 @@
+@0x9ef128e10a8010b2;
+
+struct NullableUInt64
+{
+    union
+    {
+        value @0 : UInt64;
+        null @1 : Void;
+    }
+}
+
+struct Tuple
+{
+    nullable @0 : NullableUInt64;
+}
+
+struct Message
+{
+    nullable @0 : NullableUInt64;
+    array @1 : List(NullableUInt64);
+    tuple @2 : Tuple;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_simple_types.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_simple_types.capnp
new file mode 100644
index 00000000000..a85bbbc511b
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_simple_types.capnp
@@ -0,0 +1,21 @@
+@0xd9dd7b35452d1c4f;
+
+struct Message
+{
+    int8 @0 : Int8;
+    uint8 @1 : UInt8;
+    int16 @2 : Int16;
+    uint16 @3 : UInt16;
+    int32 @4 : Int32;
+    uint32 @5 : UInt32;
+    int64 @6 : Int64;
+    uint64 @7 : UInt64;
+    float32 @8 : Float32;
+    float64 @9 : Float64;
+    string @10 : Text;
+    fixed @11 : Text;
+    data @12 : Data;
+    date @13 : UInt16;
+    datetime @14 : UInt32;
+    datetime64 @15 : Int64;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_tuples.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_tuples.capnp
new file mode 100644
index 00000000000..21c3f0eb2e1
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_tuples.capnp
@@ -0,0 +1,35 @@
+@0x9ef128e10a8010b8;
+
+struct Nested5
+{
+    x @0 : UInt64;    
+}
+
+struct Nested4
+{
+    nested2 @0 : Nested5;
+}
+
+struct Nested3
+{
+    nested1 @0 : Nested4;
+}
+
+struct Nested2
+{
+    three @0 : UInt64;
+    four @1 : UInt64;
+}
+
+struct Nested1
+{
+    one @0 : UInt64;
+    two @1 : Nested2;
+}
+
+struct Message
+{
+    value @0 : UInt64;
+    tuple1 @1 : Nested1;
+    tuple2 @2 : Nested3;
+}
diff --git a/tests/queries/0_stateless/format_schemas/02030_capnp_unnamed_union.capnp b/tests/queries/0_stateless/format_schemas/02030_capnp_unnamed_union.capnp
new file mode 100644
index 00000000000..9fb5e37bfea
--- /dev/null
+++ b/tests/queries/0_stateless/format_schemas/02030_capnp_unnamed_union.capnp
@@ -0,0 +1,10 @@
+@0xd8dd7b35452d1c4f;
+
+struct Message
+{
+    union
+    {
+        a @0 : UInt64;
+        b @1 : Text;
+    }
+}
diff --git a/tests/queries/0_stateless/mergetree_mutations.lib b/tests/queries/0_stateless/mergetree_mutations.lib
index d10ac883764..7d02f9f1b41 100644
--- a/tests/queries/0_stateless/mergetree_mutations.lib
+++ b/tests/queries/0_stateless/mergetree_mutations.lib
@@ -20,3 +20,23 @@ function wait_for_mutation()
 
     done
 }
+
+function wait_for_all_mutations()
+{
+    local table=$1
+    local database=$2
+    database=${database:="${CLICKHOUSE_DATABASE}"}
+
+    for i in {1..200}
+    do
+        sleep 1
+        if [[ $(${CLICKHOUSE_CLIENT} --query="SELECT coalesce(minOrNull(is_done), 1) FROM system.mutations WHERE database='$database' AND table like '$table'") -eq 1 ]]; then
+            break
+        fi
+
+        if [[ $i -eq 200 ]]; then
+            echo "Timed out while waiting for mutation to execute!"
+        fi
+
+    done
+}
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
new file mode 100755
index 00000000000..61491630f46
--- /dev/null
+++ b/tests/queries/0_stateless/replication.lib
@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+# shellcheck source=./mergetree_mutations.lib
+. "$CURDIR"/mergetree_mutations.lib
+
+function try_sync_replicas()
+{
+    table_name_prefix=$1
+
+    readarray -t empty_partitions_arr < <(${CLICKHOUSE_CLIENT} -q \
+        "SELECT DISTINCT substr(new_part_name, 1, position(new_part_name, '_') - 1) AS partition_id
+        FROM system.replication_queue
+        WHERE (database = currentDatabase()) AND (table LIKE '$table_name_prefix%') AND (last_exception LIKE '%No active replica has part%') AND (partition_id NOT IN (
+            SELECT partition_id
+            FROM system.parts
+            WHERE (database = currentDatabase()) AND (table LIKE '$table_name_prefix%')
+        ))")
+    readarray -t tables_arr < <(${CLICKHOUSE_CLIENT} -q "SELECT name FROM system.tables WHERE database=currentDatabase() AND name like '$table_name_prefix%' AND engine like '%Replicated%'")
+
+    for t in "${tables_arr[@]}"
+    do
+        for p in "${empty_partitions_arr[@]}"
+        do
+            # Avoid "Empty part ... is not created instead of lost part because there are no parts in partition"
+            $CLICKHOUSE_CLIENT -q "ALTER TABLE $t DROP PARTITION ID '$p'" 2>/dev/null
+        done
+    done
+
+    for t in "${tables_arr[@]}"
+    do
+        # The size of log may be big, so increase timeout.
+        $CLICKHOUSE_CLIENT --receive_timeout 400 -q "SYSTEM SYNC REPLICA $t" || $CLICKHOUSE_CLIENT -q \
+            "select 'sync failed, queue:', * from system.replication_queue where database=currentDatabase() and table='$t' order by database, table, node_name" &
+    done
+    wait
+    echo "Replication did not hang: synced all replicas of $table_name_prefix"
+}
+
+function check_replication_consistency()
+{
+    table_name_prefix=$1
+    check_query_part=$2
+
+    # Wait for all queries to finish (query may still be running if thread is killed by timeout)
+    num_tries=0
+    while [[ $($CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE current_database=currentDatabase() AND query LIKE '%$table_name_prefix%'") -ne 1 ]]; do
+        sleep 0.5;
+        num_tries=$((num_tries-1))
+        if [ $num_tries -eq 100 ]; then
+            $CLICKHOUSE_CLIENT -q "SELECT count() FROM system.processes WHERE current_database=currentDatabase() AND query LIKE '%$table_name_prefix%' FORMAT Vertical"
+            break
+        fi
+    done
+
+    # Do not check anything if all replicas are readonly,
+    # because is this case all replicas are probably lost (it may happen and it's not a bug)
+    res=$($CLICKHOUSE_CLIENT -q "SELECT count() - sum(is_readonly) FROM system.replicas WHERE database=currentDatabase() AND table LIKE '$table_name_prefix%'")
+    if [ $res -eq 0 ]; then
+        # Print dummy lines
+        echo "Replication did not hang: synced all replicas of $table_name_prefix"
+        echo "Consistency: 1"
+        return 0
+    fi
+
+    # Trigger pullLogsToQueue(...) and updateMutations(...) on some replica to make it pull all mutations, so it will be possible to kill them
+    some_table=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.tables WHERE database=currentDatabase() AND name like '$table_name_prefix%' ORDER BY rand() LIMIT 1")
+    $CLICKHOUSE_CLIENT --receive_timeout 3 -q "SYSTEM SYNC REPLICA $some_table" 1>/dev/null 2>/dev/null ||:
+    some_table=$($CLICKHOUSE_CLIENT -q "SELECT name FROM system.tables WHERE database=currentDatabase() AND name like '$table_name_prefix%' ORDER BY rand() LIMIT 1")
+    $CLICKHOUSE_CLIENT --receive_timeout 3 -q "SYSTEM SYNC REPLICA $some_table" 1>/dev/null 2>/dev/null ||:
+
+    # Forcefully cancel mutations to avoid waiting for them to finish
+    ${CLICKHOUSE_CLIENT} -q "KILL MUTATION WHERE database=currentDatabase() AND table like '$table_name_prefix%'" > /dev/null
+
+    # SYNC REPLICA is not enough if some MUTATE_PARTs are not assigned yet
+    wait_for_all_mutations "$table_name_prefix%"
+
+    try_sync_replicas "$table_name_prefix"
+
+    res=$($CLICKHOUSE_CLIENT -q \
+    "SELECT
+        if((countDistinct(data) as c) == 0, 1, c)
+    FROM
+    (
+        SELECT _table, ($check_query_part) AS data
+        FROM merge(currentDatabase(), '$table_name_prefix') GROUP BY _table
+    )")
+
+    echo "Consistency: $res"
+    if [ $res -ne 1 ]; then
+        echo "Replicas have diverged:"
+        $CLICKHOUSE_CLIENT -q "select 'data', _table, $check_query_part, arraySort(groupArrayDistinct(_part)) from merge(currentDatabase(), '$table_name_prefix') group by _table order by _table"
+        $CLICKHOUSE_CLIENT -q "select 'queue', * from system.replication_queue where database=currentDatabase() and table like '$table_name_prefix%' order by database, table, node_name"
+        $CLICKHOUSE_CLIENT -q "select 'mutations', * from system.mutations where database=currentDatabase() and table like '$table_name_prefix%' order by database, table, mutation_id"
+        $CLICKHOUSE_CLIENT -q "select 'parts', * from system.parts where database=currentDatabase() and table like '$table_name_prefix%' order by database, table, name"
+        echo "Good luck with debugging..."
+    fi
+
+}
diff --git a/tests/queries/1_stateful/00009_uniq_distributed.sql b/tests/queries/1_stateful/00009_uniq_distributed.sql
index 71d90efbccc..f78604fd401 100644
--- a/tests/queries/1_stateful/00009_uniq_distributed.sql
+++ b/tests/queries/1_stateful/00009_uniq_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT uniq(UserID), uniqIf(UserID, CounterID = 800784), uniqIf(FUniqID, RegionID = 213) FROM remote('127.0.0.{1,2}', test, hits)
diff --git a/tests/queries/1_stateful/00012_sorting_distributed.sql b/tests/queries/1_stateful/00012_sorting_distributed.sql
index b0cdb8bd8a2..c71f643045d 100644
--- a/tests/queries/1_stateful/00012_sorting_distributed.sql
+++ b/tests/queries/1_stateful/00012_sorting_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT EventTime::DateTime('Europe/Moscow') FROM remote('127.0.0.{1,2}', test, hits) ORDER BY EventTime DESC LIMIT 10
diff --git a/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql b/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
index 8beedd09e4e..2afe28639f2 100644
--- a/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
+++ b/tests/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT anyIf(SearchPhrase, CounterID = -1) FROM remote('127.0.0.{1,2}:9000', test, hits)
diff --git a/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql b/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
index c3c726e4ca7..21b577d3b56 100644
--- a/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
+++ b/tests/queries/1_stateful/00020_distinct_order_by_distributed.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SET max_rows_to_sort = 10000;
 SELECT count() FROM (SELECT DISTINCT PredLastVisit AS x FROM remote('127.0.0.{1,2}', test, visits) ORDER BY VisitID);
diff --git a/tests/queries/1_stateful/00046_uniq_upto_distributed.sql b/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
index 1491972b37d..3aa1d5b9909 100644
--- a/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
+++ b/tests/queries/1_stateful/00046_uniq_upto_distributed.sql
@@ -1 +1,3 @@
+-- Tags: distributed
+
 SELECT RegionID, uniqExact(UserID) AS u1, uniqUpTo(10)(UserID) AS u2 FROM remote('127.0.0.{1,2}', test, visits) GROUP BY RegionID HAVING u1 <= 11 AND u1 != u2
\ No newline at end of file
diff --git a/tests/queries/1_stateful/00053_replicate_segfault.sql b/tests/queries/1_stateful/00053_replicate_segfault.sql
index b727ae3aad8..3e0be96861b 100644
--- a/tests/queries/1_stateful/00053_replicate_segfault.sql
+++ b/tests/queries/1_stateful/00053_replicate_segfault.sql
@@ -1 +1,3 @@
+-- Tags: replica
+
 SELECT count() > 0 FROM (SELECT ParsedParams.Key1 AS p FROM test.visits WHERE arrayAll(y -> arrayExists(x -> y != x, p), p))
diff --git a/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql b/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
index 4bc563712c0..3e34d9d1348 100644
--- a/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
+++ b/tests/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
@@ -1,2 +1,4 @@
+-- Tags: replica, distributed
+
 SET max_parallel_replicas = 2;
 SELECT EventTime::DateTime('Europe/Moscow') FROM remote('127.0.0.{1|2}', test, hits) ORDER BY EventTime DESC LIMIT 10
diff --git a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
index 60dbec2e9bc..52f9c46997f 100644
--- a/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
+++ b/tests/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
@@ -1,2 +1,4 @@
+-- Tags: shard
+
 SET output_format_write_statistics = 0;
 SELECT EventDate, count() FROM remote('127.0.0.1', test.hits) WHERE UserID GLOBAL IN (SELECT UserID FROM test.hits) GROUP BY EventDate ORDER BY EventDate LIMIT 5 FORMAT JSONCompact;
diff --git a/tests/queries/1_stateful/00090_thread_pool_deadlock.sh b/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
index e94243bfea2..75665166741 100755
--- a/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
+++ b/tests/queries/1_stateful/00090_thread_pool_deadlock.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: deadlock
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/1_stateful/00095_hyperscan_profiler.sql b/tests/queries/1_stateful/00095_hyperscan_profiler.sql
index df07bc92408..c704907178c 100644
--- a/tests/queries/1_stateful/00095_hyperscan_profiler.sql
+++ b/tests/queries/1_stateful/00095_hyperscan_profiler.sql
@@ -1,3 +1,5 @@
+-- Tags: no-debug
+
 -- Check that server does not get segfault due to bad stack unwinding from Hyperscan
 
 SET query_profiler_cpu_time_period_ns = 1000000;
diff --git a/tests/queries/1_stateful/00140_rename.sql b/tests/queries/1_stateful/00140_rename.sql
index b0ecd2aeb92..9702d00a4d5 100644
--- a/tests/queries/1_stateful/00140_rename.sql
+++ b/tests/queries/1_stateful/00140_rename.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Does not support renaming of multiple tables in single query
+
 RENAME TABLE test.hits TO test.visits_tmp, test.visits TO test.hits, test.visits_tmp TO test.visits;
 
 SELECT sum(Sign) FROM test.hits WHERE CounterID = 912887;
diff --git a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
index 8276f4c1b16..075c01530c6 100644
--- a/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
+++ b/tests/queries/1_stateful/00147_global_in_aggregate_function.sql
@@ -1,2 +1,4 @@
+-- Tags: global
+
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM remote('127.0.0.{1,2}', test.hits))) FROM remote('127.0.0.{1,2}', test.hits);
 SELECT sum(UserID GLOBAL IN (SELECT UserID FROM test.hits)) FROM remote('127.0.0.{1,2}', test.hits);
diff --git a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
index dc63cb5867f..6f910646fb7 100644
--- a/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
+++ b/tests/queries/1_stateful/00149_quantiles_timing_distributed.sql
@@ -1,2 +1,4 @@
+-- Tags: distributed
+
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID);
 SELECT sum(cityHash64(*)) FROM (SELECT CounterID, quantileTiming(0.5)(SendTiming), count() FROM remote('127.0.0.{1,2,3,4,5,6,7,8,9,10}', test.hits) WHERE SendTiming != -1 GROUP BY CounterID) SETTINGS optimize_aggregation_in_order = 1;
diff --git a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
index fa18b53bdf9..c1a2001e2a5 100644
--- a/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
+++ b/tests/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan
+
 DROP TABLE IF EXISTS mixed_granularity_table;
 
 CREATE TABLE mixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, enable_mixed_granularity_parts=1; -- same with hits, but enabled mixed granularity
diff --git a/tests/queries/1_stateful/00152_insert_different_granularity.sql b/tests/queries/1_stateful/00152_insert_different_granularity.sql
index 7e04aedf2dd..da99173ed96 100644
--- a/tests/queries/1_stateful/00152_insert_different_granularity.sql
+++ b/tests/queries/1_stateful/00152_insert_different_granularity.sql
@@ -1,3 +1,6 @@
+-- Tags: no-tsan, no-replicated-database
+-- Tag no-replicated-database: Fails due to additional replicas or shards
+
 DROP TABLE IF EXISTS fixed_granularity_table;
 
 CREATE TABLE fixed_granularity_table (`WatchID` UInt64, `JavaEnable` UInt8, `Title` String, `GoodEvent` Int16, `EventTime` DateTime, `EventDate` Date, `CounterID` UInt32, `ClientIP` UInt32, `ClientIP6` FixedString(16), `RegionID` UInt32, `UserID` UInt64, `CounterClass` Int8, `OS` UInt8, `UserAgent` UInt8, `URL` String, `Referer` String, `URLDomain` String, `RefererDomain` String, `Refresh` UInt8, `IsRobot` UInt8, `RefererCategories` Array(UInt16), `URLCategories` Array(UInt16), `URLRegions` Array(UInt32), `RefererRegions` Array(UInt32), `ResolutionWidth` UInt16, `ResolutionHeight` UInt16, `ResolutionDepth` UInt8, `FlashMajor` UInt8, `FlashMinor` UInt8, `FlashMinor2` String, `NetMajor` UInt8, `NetMinor` UInt8, `UserAgentMajor` UInt16, `UserAgentMinor` FixedString(2), `CookieEnable` UInt8, `JavascriptEnable` UInt8, `IsMobile` UInt8, `MobilePhone` UInt8, `MobilePhoneModel` String, `Params` String, `IPNetworkID` UInt32, `TraficSourceID` Int8, `SearchEngineID` UInt16, `SearchPhrase` String, `AdvEngineID` UInt8, `IsArtifical` UInt8, `WindowClientWidth` UInt16, `WindowClientHeight` UInt16, `ClientTimeZone` Int16, `ClientEventTime` DateTime, `SilverlightVersion1` UInt8, `SilverlightVersion2` UInt8, `SilverlightVersion3` UInt32, `SilverlightVersion4` UInt16, `PageCharset` String, `CodeVersion` UInt32, `IsLink` UInt8, `IsDownload` UInt8, `IsNotBounce` UInt8, `FUniqID` UInt64, `HID` UInt32, `IsOldCounter` UInt8, `IsEvent` UInt8, `IsParameter` UInt8, `DontCountHits` UInt8, `WithHash` UInt8, `HitColor` FixedString(1), `UTCEventTime` DateTime, `Age` UInt8, `Sex` UInt8, `Income` UInt8, `Interests` UInt16, `Robotness` UInt8, `GeneralInterests` Array(UInt16), `RemoteIP` UInt32, `RemoteIP6` FixedString(16), `WindowName` Int32, `OpenerName` Int32, `HistoryLength` Int16, `BrowserLanguage` FixedString(2), `BrowserCountry` FixedString(2), `SocialNetwork` String, `SocialAction` String, `HTTPError` UInt16, `SendTiming` Int32, `DNSTiming` Int32, `ConnectTiming` Int32, `ResponseStartTiming` Int32, `ResponseEndTiming` Int32, `FetchTiming` Int32, `RedirectTiming` Int32, `DOMInteractiveTiming` Int32, `DOMContentLoadedTiming` Int32, `DOMCompleteTiming` Int32, `LoadEventStartTiming` Int32, `LoadEventEndTiming` Int32, `NSToDOMContentLoadedTiming` Int32, `FirstPaintTiming` Int32, `RedirectCount` Int8, `SocialSourceNetworkID` UInt8, `SocialSourcePage` String, `ParamPrice` Int64, `ParamOrderID` String, `ParamCurrency` FixedString(3), `ParamCurrencyID` UInt16, `GoalsReached` Array(UInt32), `OpenstatServiceName` String, `OpenstatCampaignID` String, `OpenstatAdID` String, `OpenstatSourceID` String, `UTMSource` String, `UTMMedium` String, `UTMCampaign` String, `UTMContent` String, `UTMTerm` String, `FromTag` String, `HasGCLID` UInt8, `RefererHash` UInt64, `URLHash` UInt64, `CLID` UInt32, `YCLID` UInt64, `ShareService` String, `ShareURL` String, `ShareTitle` String, `ParsedParams.Key1` Array(String), `ParsedParams.Key2` Array(String), `ParsedParams.Key3` Array(String), `ParsedParams.Key4` Array(String), `ParsedParams.Key5` Array(String), `ParsedParams.ValueDouble` Array(Float64), `IslandID` FixedString(16), `RequestNum` UInt32, `RequestTry` UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity=8192, index_granularity_bytes=0, min_bytes_for_wide_part = 0; -- looks like default table before update
diff --git a/tests/queries/1_stateful/00153_aggregate_arena_race.sql b/tests/queries/1_stateful/00153_aggregate_arena_race.sql
index 239b5ad0aa5..cf3971df6a9 100644
--- a/tests/queries/1_stateful/00153_aggregate_arena_race.sql
+++ b/tests/queries/1_stateful/00153_aggregate_arena_race.sql
@@ -1,2 +1,4 @@
+-- Tags: race
+
 create temporary table dest00153 (`s` AggregateFunction(groupUniqArray, String)) engine Memory;
 insert into dest00153 select groupUniqArrayState(RefererDomain) from test.hits group by URLDomain;
diff --git a/tests/queries/1_stateful/00154_avro.sql b/tests/queries/1_stateful/00154_avro.sql
index b3c80f657c9..a2a35dfec12 100644
--- a/tests/queries/1_stateful/00154_avro.sql
+++ b/tests/queries/1_stateful/00154_avro.sql
@@ -1,3 +1,5 @@
+-- Tags: no-unbundled, no-fasttest
+
 DROP TABLE IF EXISTS test.avro;
 
 SET max_threads = 1, max_block_size = 8192, min_insert_block_size_rows = 8192, min_insert_block_size_bytes = 1048576; -- lower memory usage
diff --git a/tests/queries/1_stateful/00157_cache_dictionary.sql b/tests/queries/1_stateful/00157_cache_dictionary.sql
index 368da1cc36a..a8f9d12ab3a 100644
--- a/tests/queries/1_stateful/00157_cache_dictionary.sql
+++ b/tests/queries/1_stateful/00157_cache_dictionary.sql
@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
 
diff --git a/tests/queries/1_stateful/00158_cache_dictionary_has.sql b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
index 8461728c58e..32c109417de 100644
--- a/tests/queries/1_stateful/00158_cache_dictionary_has.sql
+++ b/tests/queries/1_stateful/00158_cache_dictionary_has.sql
@@ -1,3 +1,5 @@
+-- Tags: no-parallel
+
 CREATE DATABASE IF NOT EXISTS db_dict;
 DROP DICTIONARY IF EXISTS db_dict.cache_hits;
 
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
index 9f61b454d56..5d54328e45d 100755
--- a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Tags: no-fasttest
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/1_stateful/00165_jit_aggregate_functions.reference b/tests/queries/1_stateful/00165_jit_aggregate_functions.reference
index 451a676754c..fa084170f53 100644
--- a/tests/queries/1_stateful/00165_jit_aggregate_functions.reference
+++ b/tests/queries/1_stateful/00165_jit_aggregate_functions.reference
@@ -62,6 +62,12 @@ Simple functions if combinator
 11482817	4611990575414646848	9223302669582414438	9828522700609834800	378121905921203.2	34845264.2080656	25993	9223372036854775806	4611686018427387904	4689180182672571856
 63469	4612175339998036670	9222961628400798084	17239621485933250238	663164390134376.5	7825349797.6059	25996	9223372036854775806	4611686018427387904	2067736879306995526
 29103473	4611744585914335132	9223035551850347954	12590190375872647672	525927999326314.7	26049107.15514301	23939	9223372036854775806	4611686018427387904	8318055464870862444
+Simple functions without key
+4611686725751467379	9223371678237104442	3626326766789368100	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
+Simple functions with non compilable function without key
+4611686725751467379	9223371678237104442	3626326766789368100	61384643584599682996279588	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
+Simple functions if combinator without key
+4611687533683519016	9223371678237104442	4124667747700004330	930178817930.5122	321189.2280948817	4434274	9223372036854775806	4611686018427387904	2265422677606390266
 Aggregation without JIT compilation
 Simple functions
 1704509	4611700827100483880	9223360787015464643	10441337359398154812	19954243669348.844	9648741.579254271	523264	9223372036854775807	4611686018427387904	4544239379628300646
@@ -126,3 +132,9 @@ Simple functions if combinator
 11482817	4611990575414646848	9223302669582414438	9828522700609834800	378121905921203.2	34845264.2080656	25993	9223372036854775806	4611686018427387904	4689180182672571856
 63469	4612175339998036670	9222961628400798084	17239621485933250238	663164390134376.5	7825349797.6059	25996	9223372036854775806	4611686018427387904	2067736879306995526
 29103473	4611744585914335132	9223035551850347954	12590190375872647672	525927999326314.7	26049107.15514301	23939	9223372036854775806	4611686018427387904	8318055464870862444
+Simple functions without key
+4611686725751467379	9223371678237104442	3626326766789368100	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
+Simple functions with non compilable function without key
+4611686725751467379	9223371678237104442	3626326766789368100	61384643584599682996279588	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
+Simple functions if combinator without key
+4611687533683519016	9223371678237104442	4124667747700004330	930178817930.5122	321189.2280948817	4434274	9223372036854775806	4611686018427387904	2265422677606390266
diff --git a/tests/queries/1_stateful/00165_jit_aggregate_functions.sql b/tests/queries/1_stateful/00165_jit_aggregate_functions.sql
index 6c13c6e4d42..c826a129b2a 100644
--- a/tests/queries/1_stateful/00165_jit_aggregate_functions.sql
+++ b/tests/queries/1_stateful/00165_jit_aggregate_functions.sql
@@ -53,6 +53,54 @@ SELECT
 FROM test.hits
 GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
 
+SELECT 'Simple functions without key';
+
+SELECT
+    min(WatchID) AS min_watch_id,
+    max(WatchID),
+    sum(WatchID),
+    avg(WatchID),
+    avgWeighted(WatchID, CounterID),
+    count(WatchID),
+    groupBitOr(WatchID),
+    groupBitAnd(WatchID),
+    groupBitXor(WatchID)
+FROM test.hits
+ORDER BY min_watch_id DESC LIMIT 20;
+
+SELECT 'Simple functions with non compilable function without key';
+
+SELECT
+    min(WatchID) AS min_watch_id,
+    max(WatchID),
+    sum(WatchID),
+    sum(toUInt128(WatchID)),
+    avg(WatchID),
+    avgWeighted(WatchID, CounterID),
+    count(WatchID),
+    groupBitOr(WatchID),
+    groupBitAnd(WatchID),
+    groupBitXor(WatchID)
+FROM test.hits
+ORDER BY min_watch_id DESC LIMIT 20;
+
+SELECT 'Simple functions if combinator without key';
+
+WITH (WatchID % 2 == 0) AS predicate
+SELECT
+    minIf(WatchID, predicate) as min_watch_id,
+    maxIf(WatchID, predicate),
+    sumIf(WatchID, predicate),
+    avgIf(WatchID, predicate),
+    avgWeightedIf(WatchID, CounterID, predicate),
+    countIf(WatchID, predicate),
+    groupBitOrIf(WatchID, predicate),
+    groupBitAndIf(WatchID, predicate),
+    groupBitXorIf(WatchID, predicate)
+FROM test.hits
+ORDER BY min_watch_id
+DESC LIMIT 20;
+
 SET compile_aggregate_expressions = 0;
 
 SELECT 'Aggregation without JIT compilation';
@@ -105,3 +153,51 @@ SELECT
     groupBitXorIf(WatchID, predicate)
 FROM test.hits
 GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
+
+SELECT 'Simple functions without key';
+
+SELECT
+    min(WatchID) AS min_watch_id,
+    max(WatchID),
+    sum(WatchID),
+    avg(WatchID),
+    avgWeighted(WatchID, CounterID),
+    count(WatchID),
+    groupBitOr(WatchID),
+    groupBitAnd(WatchID),
+    groupBitXor(WatchID)
+FROM test.hits
+ORDER BY min_watch_id DESC LIMIT 20;
+
+SELECT 'Simple functions with non compilable function without key';
+
+SELECT
+    min(WatchID) AS min_watch_id,
+    max(WatchID),
+    sum(WatchID),
+    sum(toUInt128(WatchID)),
+    avg(WatchID),
+    avgWeighted(WatchID, CounterID),
+    count(WatchID),
+    groupBitOr(WatchID),
+    groupBitAnd(WatchID),
+    groupBitXor(WatchID)
+FROM test.hits
+ORDER BY min_watch_id DESC LIMIT 20;
+
+SELECT 'Simple functions if combinator without key';
+
+WITH (WatchID % 2 == 0) AS predicate
+SELECT
+    minIf(WatchID, predicate) as min_watch_id,
+    maxIf(WatchID, predicate),
+    sumIf(WatchID, predicate),
+    avgIf(WatchID, predicate),
+    avgWeightedIf(WatchID, CounterID, predicate),
+    countIf(WatchID, predicate),
+    groupBitOrIf(WatchID, predicate),
+    groupBitAndIf(WatchID, predicate),
+    groupBitXorIf(WatchID, predicate)
+FROM test.hits
+ORDER BY min_watch_id
+DESC LIMIT 20;
diff --git a/tests/queries/1_stateful/00166_explain_estimate.sql b/tests/queries/1_stateful/00166_explain_estimate.sql
index 06725ff7f9f..c4071271736 100644
--- a/tests/queries/1_stateful/00166_explain_estimate.sql
+++ b/tests/queries/1_stateful/00166_explain_estimate.sql
@@ -1,3 +1,6 @@
+-- Tags: no-replicated-database
+-- Tag no-replicated-database: Requires investigation
+
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID = 29103473;
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID != 29103473;
 EXPLAIN ESTIMATE SELECT count() FROM test.hits WHERE CounterID > 29103473;
diff --git a/tests/queries/1_stateful/00167_read_bytes_from_fs.reference b/tests/queries/1_stateful/00167_read_bytes_from_fs.reference
new file mode 100644
index 00000000000..05b54da2ac7
--- /dev/null
+++ b/tests/queries/1_stateful/00167_read_bytes_from_fs.reference
@@ -0,0 +1,2 @@
+468426149779992039
+1
diff --git a/tests/queries/1_stateful/00167_read_bytes_from_fs.sql b/tests/queries/1_stateful/00167_read_bytes_from_fs.sql
new file mode 100644
index 00000000000..ac20e60b177
--- /dev/null
+++ b/tests/queries/1_stateful/00167_read_bytes_from_fs.sql
@@ -0,0 +1,7 @@
+SELECT sum(cityHash64(*)) FROM test.hits SETTINGS max_threads=40;
+
+-- We had a bug which lead to additional compressed data read. test.hits compressed size is about 1.2Gb, but we read more then 3Gb.
+-- Small additional reads still possible, so we compare with about 1.5Gb.
+SYSTEM FLUSH LOGS;
+
+SELECT ProfileEvents['ReadBufferFromFileDescriptorReadBytes'] < 1500000000 from system.query_log where query = 'SELECT sum(cityHash64(*)) FROM test.hits SETTINGS max_threads=40;' and current_database = currentDatabase() and type = 'QueryFinish';
diff --git a/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql b/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
index b79a3cf05b4..b81cf585b13 100644
--- a/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
+++ b/tests/queries/bugs/01482_move_to_prewhere_and_cast.sql
@@ -1,3 +1,6 @@
+-- Tags: no-polymorphic-parts
+-- Tag no-polymorphic-parts: bug, shoud be fixed
+
 DROP TABLE IF EXISTS APPLICATION;
 DROP TABLE IF EXISTS DATABASE_IO;
 
diff --git a/tests/queries/conftest.py b/tests/queries/conftest.py
deleted file mode 100644
index 2a5ebd2bf3c..00000000000
--- a/tests/queries/conftest.py
+++ /dev/null
@@ -1,84 +0,0 @@
-import os
-import re
-import sys
-
-import pytest
-
-from .server import ServerThread
-
-
-# Command-line arguments
-
-def pytest_addoption(parser):
-    parser.addoption("--builddir", action="store", default=None, help="Path to build directory to use binaries from")
-    parser.addoption("--antlr", action="store_true", default=False, help="Use ANTLR parser")
-
-
-# HTML report hooks
-
-def pytest_html_report_title(report):
-    report.title = "ClickHouse Functional Stateless Tests (PyTest)"
-
-
-RE_TEST_NAME = re.compile(r"\[(.*)\]")
-def pytest_itemcollected(item):
-    match = RE_TEST_NAME.search(item.name)
-    if match:
-        item._nodeid = match.group(1)
-
-
-# Fixtures
-
-@pytest.fixture(scope='module')
-def cmdopts(request):
-    return {
-        'builddir': request.config.getoption("--builddir"),
-        'antlr': request.config.getoption("--antlr"),
-    }
-
-
-@pytest.fixture(scope='module')
-def bin_prefix(cmdopts):
-    prefix = 'clickhouse'
-    if cmdopts['builddir'] is not None:
-        prefix = os.path.join(cmdopts['builddir'], 'programs', prefix)
-    # FIXME: does this hangs the server start for some reason?
-    # if not os.path.isabs(prefix):
-    #     prefix = os.path.abspath(prefix)
-    return prefix
-
-
-@pytest.fixture(scope='module')
-def use_antlr(cmdopts):
-    return cmdopts['antlr']
-
-
-# TODO: also support stateful queries.
-QUERIES_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '0_stateless')
-
-@pytest.fixture(scope='module', params=[f for f in os.listdir(QUERIES_PATH) if f.endswith('.sql')])
-def sql_query(request):
-    return os.path.join(QUERIES_PATH, os.path.splitext(request.param)[0])
-
-
-@pytest.fixture(scope='module', params=[f for f in os.listdir(QUERIES_PATH) if f.endswith('.sh')])
-def shell_query(request):
-    return os.path.join(QUERIES_PATH, os.path.splitext(request.param)[0])
-
-
-@pytest.fixture
-def standalone_server(bin_prefix, tmp_path):
-    server = ServerThread(bin_prefix, str(tmp_path))
-    server.start()
-    wait_result = server.wait()
-
-    if wait_result is not None:
-        with open(os.path.join(server.log_dir, 'server', 'stdout.txt'), 'r') as f:
-            print(f.read(), file=sys.stderr)
-        with open(os.path.join(server.log_dir, 'server', 'stderr.txt'), 'r') as f:
-            print(f.read(), file=sys.stderr)
-        pytest.fail('Server died unexpectedly with code {code}'.format(code=server._proc.returncode), pytrace=False)
-
-    yield server
-
-    server.stop()
diff --git a/tests/queries/pytest.ini b/tests/queries/pytest.ini
deleted file mode 100644
index 13a2ebbaf83..00000000000
--- a/tests/queries/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-render_collapsed = True
diff --git a/tests/queries/query_test.py b/tests/queries/query_test.py
deleted file mode 100644
index 5f7dd79cf3f..00000000000
--- a/tests/queries/query_test.py
+++ /dev/null
@@ -1,264 +0,0 @@
-import difflib
-import os
-import random
-import string
-import subprocess
-import sys
-
-import pytest
-
-
-SKIP_LIST = [
-    # these couple of tests hangs everything
-    "00600_replace_running_query",
-    "00987_distributed_stack_overflow",
-    "01954_clickhouse_benchmark_multiple_long",
-
-    # just fail
-    "00133_long_shard_memory_tracker_and_exception_safety",
-    "00463_long_sessions_in_http_interface",
-    "00505_secure",
-    "00505_shard_secure",
-    "00646_url_engine",
-    "00725_memory_tracking",  # BROKEN
-    "00738_lock_for_inner_table",
-    "00821_distributed_storage_with_join_on",
-    "00825_protobuf_format_array_3dim",
-    "00825_protobuf_format_array_of_arrays",
-    "00825_protobuf_format_enum_mapping",
-    "00825_protobuf_format_nested_in_nested",
-    "00825_protobuf_format_nested_optional",
-    "00825_protobuf_format_no_length_delimiter",
-    "00825_protobuf_format_persons",
-    "00825_protobuf_format_squares",
-    "00825_protobuf_format_table_default",
-    "00834_cancel_http_readonly_queries_on_client_close",
-    "00877_memory_limit_for_new_delete",
-    "00900_parquet_load",
-    "00933_test_fix_extra_seek_on_compressed_cache",
-    "00965_logs_level_bugfix",
-    "00965_send_logs_level_concurrent_queries",
-    "00974_query_profiler",
-    "00990_hasToken",
-    "00990_metric_log_table_not_empty",
-    "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
-    "01017_uniqCombined_memory_usage",
-    "01018_Distributed__shard_num",
-    "01018_ip_dictionary_long",
-    "01035_lc_empty_part_bug",  # FLAKY
-    "01050_clickhouse_dict_source_with_subquery",
-    "01053_ssd_dictionary",
-    "01054_cache_dictionary_overflow_cell",
-    "01057_http_compression_prefer_brotli",
-    "01080_check_for_error_incorrect_size_of_nested_column",
-    "01083_expressions_in_engine_arguments",
-    "01086_odbc_roundtrip",
-    "01088_benchmark_query_id",
-    "01092_memory_profiler",
-    "01098_temporary_and_external_tables",
-    "01099_parallel_distributed_insert_select",
-    "01103_check_cpu_instructions_at_startup",
-    "01107_atomic_db_detach_attach",
-    "01114_database_atomic",
-    "01148_zookeeper_path_macros_unfolding",
-    "01152_cross_replication",  # tcp port in reference
-    "01175_distributed_ddl_output_mode_long",
-    "01181_db_atomic_drop_on_cluster",  # tcp port in reference
-    "01280_ssd_complex_key_dictionary",
-    "01293_client_interactive_vertical_multiline",  # expect-test
-    "01293_client_interactive_vertical_singleline",  # expect-test
-    "01293_show_clusters",
-    "01293_show_settings",
-    "01293_system_distribution_queue",  # FLAKY
-    "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
-    "01294_system_distributed_on_cluster",
-    "01300_client_save_history_when_terminated",  # expect-test
-    "01304_direct_io",
-    "01306_benchmark_json",
-    "01035_lc_empty_part_bug",  # FLAKY
-    "01175_distributed_ddl_output_mode_long",  # tcp port in reference
-    "01320_create_sync_race_condition_zookeeper",
-    "01355_CSV_input_format_allow_errors",
-    "01370_client_autocomplete_word_break_characters",  # expect-test
-    "01376_GROUP_BY_injective_elimination_dictGet",
-    "01393_benchmark_secure_port",
-    "01418_custom_settings",
-    "01451_wrong_error_long_query",
-    "01455_opentelemetry_distributed",
-    "01473_event_time_microseconds",
-    "01474_executable_dictionary",
-    "01507_clickhouse_server_start_with_embedded_config",
-    "01514_distributed_cancel_query_on_error",
-    "01520_client_print_query_id",  # expect-test
-    "01526_client_start_and_exit",  # expect-test
-    "01526_max_untracked_memory",
-    "01527_dist_sharding_key_dictGet_reload",
-    "01528_play",
-    "01545_url_file_format_settings",
-    "01553_datetime64_comparison",
-    "01555_system_distribution_queue_mask",
-    "01558_ttest_scipy",
-    "01561_mann_whitney_scipy",
-    "01582_distinct_optimization",
-    "01591_window_functions",
-    "01594_too_low_memory_limits",
-    "01599_multiline_input_and_singleline_comments",  # expect-test
-    "01601_custom_tld",
-    "01606_git_import",
-    "01610_client_spawn_editor",  # expect-test
-    "01654_test_writer_block_sequence",  # No module named 'pandas'
-    "01658_read_file_to_stringcolumn",
-    "01666_merge_tree_max_query_limit",
-    "01674_unicode_asan",
-    "01676_clickhouse_client_autocomplete",  # expect-test (partially)
-    "01676_long_clickhouse_client_autocomplete",
-    "01683_text_log_deadlock",  # secure tcp
-    "01684_ssd_cache_dictionary_simple_key",
-    "01685_ssd_cache_dictionary_complex_key",
-    "01737_clickhouse_server_wait_server_pool_long",
-    "01746_executable_pool_dictionary",
-    "01747_executable_pool_dictionary_implicit_key.sql",
-    "01747_join_view_filter_dictionary",
-    "01748_dictionary_table_dot",
-    "01754_cluster_all_replicas_shard_num",
-    "01759_optimize_skip_unused_shards_zero_shards",
-    "01763_max_distributed_depth",  # BROKEN
-    "01780_clickhouse_dictionary_source_loop",
-    "01801_s3_cluster",
-    "01802_test_postgresql_protocol_with_row_policy",
-    "01804_dictionary_decimal256_type",  # hardcoded path
-    "01848_http_insert_segfault",
-    "01875_ssd_cache_dictionary_decimal256_type",
-    "01880_remote_ipv6",
-    "01889_check_row_policy_defined_using_user_function",
-    "01889_clickhouse_client_config_format",
-    "01903_ssd_cache_dictionary_array_type",
-]
-
-
-def check_result(result, error, return_code, reference, replace_map):
-    if replace_map:
-        for old, new in replace_map.items():
-            result = result.replace(old.encode('utf-8'), new.encode('utf-8'))
-
-    if return_code != 0:
-        try:
-            print(error.decode('utf-8'), file=sys.stderr)
-        except UnicodeDecodeError:
-            print(error.decode('latin1'), file=sys.stderr)  # encoding with 1 symbol per 1 byte, covering all values
-        pytest.fail('Client died unexpectedly with code {code}'.format(code=return_code), pytrace=False)
-    elif result != reference:
-        pytest.fail("Query output doesn't match reference:{eol}{diff}".format(
-                eol=os.linesep,
-                diff=os.linesep.join(l.strip() for l in difflib.unified_diff(reference.decode('utf-8').splitlines(),
-                                                                             result.decode('utf-8').splitlines(),
-                                                                             fromfile='expected', tofile='actual'))),
-            pytrace=False)
-
-
-def run_client(use_antlr, bin_prefix, port, database, query, reference, replace_map=None):
-    # We can't use `text=True` since some tests may return binary data
-    cmd = [bin_prefix + '-client', '--port', str(port), '-d', database, '-m', '-n', '--testmode']
-    if use_antlr:
-        cmd.append('--use_antlr_parser=1')
-    client = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    result, error = client.communicate(query.encode('utf-8'))
-    assert client.returncode is not None, "Client should exit after processing all queries"
-
-    check_result(result, error, client.returncode, reference, replace_map)
-
-
-def run_shell(use_antlr, bin_prefix, server, database, path, reference, replace_map=None):
-    env = {
-        'CLICKHOUSE_BINARY': bin_prefix,
-        'CLICKHOUSE_DATABASE': database,
-        'CLICKHOUSE_PORT_TCP': str(server.tcp_port),
-        'CLICKHOUSE_PORT_TCP_SECURE': str(server.tcps_port),
-        'CLICKHOUSE_PORT_TCP_WITH_PROXY': str(server.proxy_port),
-        'CLICKHOUSE_PORT_HTTP': str(server.http_port),
-        'CLICKHOUSE_PORT_INTERSERVER': str(server.inter_port),
-        'CLICKHOUSE_PORT_POSTGRESQL': str(server.postgresql_port),
-        'CLICKHOUSE_TMP': server.tmp_dir,
-        'CLICKHOUSE_CONFIG_CLIENT': server.client_config,
-        'PROTOC_BINARY': os.path.abspath(os.path.join(os.path.dirname(bin_prefix), '..', 'contrib', 'protobuf', 'protoc')),  # FIXME: adhoc solution
-    }
-    if use_antlr:
-        env['CLICKHOUSE_CLIENT_OPT'] = '--use_antlr_parser=1'
-    shell = subprocess.Popen([path], env=env, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    result, error = shell.communicate()
-    assert shell.returncode is not None, "Script should exit after executing all commands"
-
-    check_result(result, error, shell.returncode, reference, replace_map)
-
-
-def random_str(length=10):
-    alphabet = string.ascii_lowercase + string.digits
-    random.seed(os.urandom(8))
-    return ''.join(random.choice(alphabet) for _ in range(length))
-
-
-def test_sql_query(use_antlr, bin_prefix, sql_query, standalone_server):
-    for test in SKIP_LIST:
-        if test in sql_query:
-            pytest.skip("Test matches skip-list: " + test)
-            return
-
-    tcp_port = standalone_server.tcp_port
-
-    query_path = sql_query + ".sql"
-    reference_path = sql_query + ".reference"
-
-    if not os.path.exists(reference_path):
-        pytest.skip('No .reference file found')
-
-    with open(query_path, 'r') as file:
-        query = file.read()
-    with open(reference_path, 'rb') as file:
-        reference = file.read()
-
-    random_name = 'test_{random}'.format(random=random_str())
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', 'CREATE DATABASE {random};'.format(random=random_name), b'')
-
-    run_client(use_antlr, bin_prefix, tcp_port, random_name, query, reference, {random_name: 'default'})
-
-    query = "SELECT 'SHOW ORPHANED TABLES'; SELECT name FROM system.tables WHERE database != 'system' ORDER BY (database, name);"
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
-
-    query = 'DROP DATABASE {random};'.format(random=random_name)
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'')
-
-    query = "SELECT 'SHOW ORPHANED DATABASES'; SHOW DATABASES;"
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
-
-
-def test_shell_query(use_antlr, bin_prefix, shell_query, standalone_server):
-    for test in SKIP_LIST:
-        if test in shell_query:
-            pytest.skip("Test matches skip-list: " + test)
-            return
-
-    tcp_port = standalone_server.tcp_port
-
-    shell_path = shell_query + ".sh"
-    reference_path = shell_query + ".reference"
-
-    if not os.path.exists(reference_path):
-        pytest.skip('No .reference file found')
-
-    with open(reference_path, 'rb') as file:
-        reference = file.read()
-
-    random_name = 'test_{random}'.format(random=random_str())
-    query = 'CREATE DATABASE {random};'.format(random=random_name)
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'')
-
-    run_shell(use_antlr, bin_prefix, standalone_server, random_name, shell_path, reference, {random_name: 'default'})
-
-    query = "SELECT 'SHOW ORPHANED TABLES'; SELECT name FROM system.tables WHERE database != 'system' ORDER BY (database, name);"
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
-
-    query = 'DROP DATABASE {random};'.format(random=random_name)
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'')
-
-    query = "SELECT 'SHOW ORPHANED DATABASES'; SHOW DATABASES;"
-    run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
diff --git a/tests/queries/server.py b/tests/queries/server.py
deleted file mode 100644
index c08004aff61..00000000000
--- a/tests/queries/server.py
+++ /dev/null
@@ -1,1303 +0,0 @@
-import os
-import random
-import socket
-import subprocess
-import sys
-import threading
-import time
-
-
-class ServerThread(threading.Thread):
-    DEFAULT_RETRIES = 3
-    DEFAULT_SERVER_DELAY = 0.5  # seconds
-    DEFAULT_CONNECTION_TIMEOUT = 1.0  # seconds
-
-    def __init__(self, bin_prefix, tmp_dir):
-        self._bin = bin_prefix + '-server'
-        self._lock = threading.Lock()
-        threading.Thread.__init__(self)
-        self._lock.acquire()
-
-        self.tmp_dir = tmp_dir
-        self.log_dir = os.path.join(tmp_dir, 'log')
-        self.etc_dir = os.path.join(tmp_dir, 'etc')
-        self.server_config = os.path.join(self.etc_dir, 'server-config.xml')
-        self.users_config = os.path.join(self.etc_dir, 'users.xml')
-        self.dicts_config = os.path.join(self.etc_dir, 'dictionaries.xml')
-        self.client_config = os.path.join(self.etc_dir, 'client-config.xml')
-
-        os.makedirs(self.log_dir)
-        os.makedirs(self.etc_dir)
-
-    def _choose_ports_and_args(self):
-        port_base = random.SystemRandom().randrange(10000, 60000)
-        self.tcp_port = port_base + 1
-        self.http_port = port_base + 2
-        self.inter_port = port_base + 3
-        self.tcps_port = port_base + 4
-        self.https_port = port_base + 5
-        self.odbc_port = port_base + 6
-        self.proxy_port = port_base + 7
-        self.postgresql_port = port_base + 8
-
-        self._args = [
-            '--config-file={config_path}'.format(config_path=self.server_config),
-            '--',
-            '--tcp_port={tcp_port}'.format(tcp_port=self.tcp_port),
-            '--http_port={http_port}'.format(http_port=self.http_port),
-            '--interserver_http_port={inter_port}'.format(inter_port=self.inter_port),
-            '--tcp_with_proxy_port={proxy_port}'.format(proxy_port=self.proxy_port),
-            '--postgresql_port={psql_port}'.format(psql_port=self.postgresql_port),
-            # TODO: SSL certificate is not specified '--tcp_port_secure={tcps_port}'.format(tcps_port=self.tcps_port),
-        ]
-
-        with open(self.server_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_SERVER_CONFIG.format(
-                tmp_dir=self.tmp_dir, log_dir=self.log_dir, tcp_port=self.tcp_port))
-
-        with open(self.users_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_USERS_CONFIG)
-
-        with open(self.dicts_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_DICTIONARIES_CONFIG.format(tcp_port=self.tcp_port))
-
-        with open(self.client_config, 'w') as f:
-            f.write(ServerThread.DEFAULT_CLIENT_CONFIG)
-
-    def run(self):
-        retries = ServerThread.DEFAULT_RETRIES
-
-        while retries:
-            self._choose_ports_and_args()
-            print('Start clickhouse-server with args:', self._args)
-            self._proc = subprocess.Popen([self._bin] + self._args, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-            while self._proc.poll() is None:
-                try:
-                    time.sleep(ServerThread.DEFAULT_SERVER_DELAY)
-                    s = socket.create_connection(('localhost', self.tcp_port), ServerThread.DEFAULT_CONNECTION_TIMEOUT)
-                    s.sendall(b'G')  # trigger expected "bad" HELLO response
-                    s.recv(1024)  # FIXME: read whole buffered response
-                    s.shutdown(socket.SHUT_RDWR)
-                    s.close()
-                except Exception:
-                    # Failed to connect to server - try again
-                    continue
-                else:
-                    break
-
-            # If process has died then try to fetch output before releasing lock
-            if self._proc.returncode is not None:
-                stdout, stderr = self._proc.communicate()
-                print(stdout.decode('utf-8'), file=sys.stderr)
-                print(stderr.decode('utf-8'), file=sys.stderr)
-
-            if self._proc.returncode == 70:  # Address already in use
-                retries -= 1
-                continue
-
-            break
-
-        self._lock.release()
-
-        if not retries:
-            print('Failed to start server', file=sys.stderr)
-            return
-
-        while self._proc.returncode is None:
-            self._proc.communicate()
-
-    def wait(self):
-        self._lock.acquire()
-        if self._proc.returncode is not None:
-            self.join()
-        self._lock.release()
-        return self._proc.returncode
-
-    def stop(self):
-        if self._proc.returncode is None:
-            self._proc.terminate()
-        self.join()
-        print('Stopped clickhouse-server')
-
-
-ServerThread.DEFAULT_SERVER_CONFIG = \
-"""\
-<?xml version="1.0"?>
-<yandex>
-    <logger>
-        <level>trace</level>
-        <log>{log_dir}/server/stdout.txt</log>
-        <errorlog>{log_dir}/server/stderr.txt</errorlog>
-        <size>never</size>
-        <count>1</count>
-    </logger>
-
-    <listen_host>::</listen_host>
-
-    <path>{tmp_dir}/data/</path>
-    <tmp_path>{tmp_dir}/tmp/</tmp_path>
-    <access_control_path>{tmp_dir}/data/access/</access_control_path>
-    <users_config>users.xml</users_config>
-    <dictionaries_config>dictionaries.xml</dictionaries_config>
-    <mark_cache_size>5368709120</mark_cache_size>
-
-    <keep_alive_timeout>3</keep_alive_timeout>
-    <timezone>Europe/Moscow</timezone>
-
-    <macros>
-        <test>Hello, world!</test>
-        <shard>s1</shard>
-        <replica>r1</replica>
-    </macros>
-
-    <graphite_rollup>
-        <version_column_name>Version</version_column_name>
-        <pattern>
-            <regexp>sum</regexp>
-            <function>sum</function>
-            <retention>
-                <age>0</age>
-                <precision>600</precision>
-            </retention>
-            <retention>
-                <age>172800</age> <!-- 2 days -->
-                <precision>6000</precision>
-            </retention>
-        </pattern>
-        <default>
-            <function>max</function>
-            <retention>
-                <age>0</age>
-                <precision>600</precision>
-            </retention>
-            <retention>
-                <age>172800</age>
-                <precision>6000</precision>
-            </retention>
-        </default>
-    </graphite_rollup>
-
-    <query_masking_rules>
-        <rule>
-            <regexp>TOPSECRET.TOPSECRET</regexp>
-            <replace>[hidden]</replace>
-        </rule>
-    </query_masking_rules>
-
-    <remote_servers>
-        <test_shard_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_shard_localhost>
-
-        <test_cluster_two_shards_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards_localhost>
-
-        <test_cluster_two_shards>
-            <shard>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>127.0.0.2</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards>
-
-        <test_unavailable_shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>1</port>
-                </replica>
-            </shard>
-        </test_unavailable_shard>
-
-        <test_cluster_two_shards_different_databases>
-             <shard>
-                 <replica>
-                     <default_database>shard_0</default_database>
-                     <host>localhost</host>
-                     <port>{tcp_port}</port>
-                 </replica>
-             </shard>
-             <shard>
-                 <replica>
-                     <default_database>shard_1</default_database>
-                     <host>localhost</host>
-                     <port>{tcp_port}</port>
-                 </replica>
-             </shard>
-         </test_cluster_two_shards_different_databases>
-
-         <test_cluster_two_shards_internal_replication>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>127.0.0.2</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards_internal_replication>
-
-        <test_cluster_with_incorrect_pw>
-             <shard>
-                 <internal_replication>true</internal_replication>
-                 <replica>
-                     <host>127.0.0.1</host>
-                     <port>{tcp_port}</port>
-                     <!-- password is incorrect -->
-                     <password>foo</password>
-                 </replica>
-                 <replica>
-                     <host>127.0.0.2</host>
-                     <port>{tcp_port}</port>
-                     <!-- password is incorrect -->
-                     <password>foo</password>
-                 </replica>
-             </shard>
-         </test_cluster_with_incorrect_pw>
-
-         <test_cluster_one_shard_two_replicas>
-           <shard>
-               <replica>
-                   <host>127.0.0.1</host>
-                   <port>{tcp_port}</port>
-               </replica>
-               <replica>
-                   <host>127.0.0.2</host>
-                   <port>{tcp_port}</port>
-               </replica>
-           </shard>
-        </test_cluster_one_shard_two_replicas>
-
-        <test_cluster_two_replicas_different_databases>
-            <shard>
-                <replica>
-                    <default_database>shard_0</default_database>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-                <replica>
-                    <default_database>shard_1</default_database>
-                    <host>localhost</host>
-                    <port>{tcp_port}</port>
-                </replica>
-            </shard>
-        </test_cluster_two_replicas_different_databases>
-    </remote_servers>
-
-    <storage_configuration>
-        <disks>
-            <disk_memory>
-                <type>memory</type>
-            </disk_memory>
-        </disks>
-    </storage_configuration>
-
-    <zookeeper>
-        <implementation>testkeeper</implementation>
-    </zookeeper>
-
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-    </part_log>
-
-    <query_log>
-        <database>system</database>
-        <table>query_log</table>
-    </query_log>
-
-    <query_thread_log>
-        <database>system</database>
-        <table>query_thread_log</table>
-    </query_thread_log>
-
-    <text_log>
-        <database>system</database>
-        <table>text_log</table>
-    </text_log>
-
-    <trace_log>
-        <database>system</database>
-        <table>trace_log</table>
-    </trace_log>
-</yandex>
-"""
-
-
-ServerThread.DEFAULT_USERS_CONFIG = \
-"""\
-<?xml version="1.0"?>
-<yandex>
-    <profiles>
-        <default>
-            <max_memory_usage>10000000000</max_memory_usage>
-            <use_uncompressed_cache>0</use_uncompressed_cache>
-            <load_balancing>random</load_balancing>
-        </default>
-
-        <readonly>
-            <readonly>1</readonly>
-        </readonly>
-    </profiles>
-
-    <users>
-        <default>
-            <password></password>
-            <networks replace="replace">
-                <ip>::/0</ip>
-            </networks>
-
-            <profile>default</profile>
-
-            <quota>default</quota>
-
-            <access_management>1</access_management>
-        </default>
-
-        <readonly>
-            <password></password>
-            <networks replace="replace">
-                <ip>::1</ip>
-                <ip>127.0.0.1</ip>
-            </networks>
-
-            <profile>readonly</profile>
-
-            <quota>default</quota>
-        </readonly>
-    </users>
-
-    <quotas>
-        <default>
-            <interval>
-                <duration>3600</duration>
-                <queries>0</queries>
-                <errors>0</errors>
-                <result_rows>0</result_rows>
-                <read_rows>0</read_rows>
-                <execution_time>0</execution_time>
-            </interval>
-        </default>
-    </quotas>
-</yandex>
-"""
-
-
-ServerThread.DEFAULT_DICTIONARIES_CONFIG = \
-"""\
-<yandex>
-    <dictionary>
-        <name>flat_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_sparse_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <sparse_hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>cache_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <cache><size_in_cells>1000</size_in_cells></cache>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_hashed_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_hashed/>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_cache_ints</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>ints</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_cache><size_in_cells>1000</size_in_cells></complex_key_cache>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>i8</name>
-                <type>Int8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i16</name>
-                <type>Int16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i32</name>
-                <type>Int32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>i64</name>
-                <type>Int64</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u8</name>
-                <type>UInt8</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u16</name>
-                <type>UInt16</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u32</name>
-                <type>UInt32</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>u64</name>
-                <type>UInt64</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>flat_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>cache_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <cache><size_in_cells>1000</size_in_cells></cache>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_hashed_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_hashed/>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_cache_strings</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>strings</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_cache><size_in_cells>1000</size_in_cells></complex_key_cache>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>str</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>flat_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <flat/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>hashed_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <hashed/>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>cache_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <cache><size_in_cells>1000</size_in_cells></cache>
-        </layout>
-        <structure>
-            <id>
-                <name>key</name>
-            </id>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_hashed_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_hashed/>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_cache_decimals</name>
-        <source>
-            <clickhouse>
-                <host>localhost</host>
-                <port>{tcp_port}</port>
-                <user>default</user>
-                <password></password>
-                <db>system</db>
-                <table>decimals</table>
-            </clickhouse>
-        </source>
-        <lifetime>0</lifetime>
-        <layout>
-            <complex_key_cache><size_in_cells>1000</size_in_cells></complex_key_cache>
-        </layout>
-        <structure>
-            <key>
-                <attribute>
-                    <name>key</name>
-                    <type>UInt64</type>
-                </attribute>
-            </key>
-            <attribute>
-                <name>d32</name>
-                <type>Decimal32(4)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d64</name>
-                <type>Decimal64(6)</type>
-                <null_value>0</null_value>
-            </attribute>
-            <attribute>
-                <name>d128</name>
-                <type>Decimal128(1)</type>
-                <null_value>0</null_value>
-            </attribute>
-        </structure>
-    </dictionary>
-
-    <dictionary>
-        <name>simple_executable_cache_dictionary_no_implicit_key</name>
-        <structure>
-            <id>
-                <name>id</name>
-                <type>UInt64</type>
-            </id>
-
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "1\tValue"</command>
-                <format>TabSeparated</format>
-                <implicit_key>false</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <cache>
-                <size_in_cells>10000</size_in_cells>
-            </cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-
-    <dictionary>
-        <name>simple_executable_cache_dictionary_implicit_key</name>
-        <structure>
-            <id>
-                <name>id</name>
-                <type>UInt64</type>
-            </id>
-
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "Value"</command>
-                <format>TabSeparated</format>
-                <implicit_key>true</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <cache>
-                <size_in_cells>10000</size_in_cells>
-            </cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_executable_cache_dictionary_no_implicit_key</name>
-        <structure>
-            <key>
-                <attribute>
-                    <name>id</name>
-                    <type>UInt64</type>
-                    <null_value></null_value>
-                </attribute>
-                <attribute>
-                    <name>id_key</name>
-                    <type>String</type>
-                    <null_value></null_value>
-                </attribute>
-            </key>
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "1\tFirstKey\tValue"</command>
-                <format>TabSeparated</format>
-                <implicit_key>false</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <complex_key_cache>
-                <size_in_cells>10000</size_in_cells>
-            </complex_key_cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-
-    <dictionary>
-        <name>complex_executable_cache_dictionary_implicit_key</name>
-        <structure>
-            <key>
-                <attribute>
-                    <name>id</name>
-                    <type>UInt64</type>
-                    <null_value></null_value>
-                </attribute>
-                <attribute>
-                    <name>id_key</name>
-                    <type>String</type>
-                    <null_value></null_value>
-                </attribute>
-            </key>
-            <attribute>
-                <name>value</name>
-                <type>String</type>
-                <null_value></null_value>
-            </attribute>
-        </structure>
-        <source>
-            <executable>
-                <command>echo "Value"</command>
-                <format>TabSeparated</format>
-                <implicit_key>true</implicit_key>
-            </executable>
-        </source>
-        <layout>
-            <complex_key_cache>
-                <size_in_cells>10000</size_in_cells>
-            </complex_key_cache>
-        </layout>
-        <lifetime>300</lifetime>
-    </dictionary>
-</yandex>
-"""
-
-ServerThread.DEFAULT_CLIENT_CONFIG = \
-"""\
-<config>
-    <openSSL>
-        <client>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <invalidCertificateHandler>
-                <name>AcceptCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-</config>
-"""
diff --git a/tests/queries/skip_list.json b/tests/queries/skip_list.json
deleted file mode 100644
index d40d9a940d0..00000000000
--- a/tests/queries/skip_list.json
+++ /dev/null
@@ -1,532 +0,0 @@
-/** List of tests which should be skipped depending on clickhouse build options.
-  * This file in json format, but javascript-style comments are allowed.
-  */
-{
-    "thread-sanitizer": [
-        "00877",
-        "query_profiler",
-        "memory_profiler",
-        "01103_check_cpu_instructions_at_startup",
-        "00152_insert_different_granularity",
-        "00151_replace_partition_with_different_granularity",
-        "00157_cache_dictionary",
-        "01193_metadata_loading",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01474_executable_dictionary", /// informational stderr from sanitizer at start
-        "functions_bad_arguments", /// Too long for TSan
-        "01603_read_with_backoff_bug", /// Too long for TSan
-        "01646_system_restart_replicas_smoke", /// RESTART REPLICAS can acquire too much locks, while only 64 is possible from one thread under TSan
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "address-sanitizer": [
-        "00877",
-        "query_profiler",
-        "memory_profiler",
-        "odbc_roundtrip",
-        "01103_check_cpu_instructions_at_startup",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "ub-sanitizer": [
-        "capnproto",
-        "query_profiler",
-        "memory_profiler",
-        "01103_check_cpu_instructions_at_startup",
-        "00900_orc_load",
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01955_clickhouse_benchmark_connection_hang" /// Limits RLIMIT_NOFILE, see comment in the test
-    ],
-    "memory-sanitizer": [
-        "capnproto",
-        "query_profiler",
-        "memory_profiler",
-        "01175_distributed_ddl_output_mode_long",  /// issue 21600
-        "01103_check_cpu_instructions_at_startup",
-        "01086_odbc_roundtrip", /// can't pass because odbc libraries are not instrumented
-        "00877_memory_limit_for_new_delete", /// memory limits don't work correctly under msan because it replaces malloc/free
-        "01473_event_time_microseconds",
-        "01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
-        "01594_too_low_memory_limits", /// requires jemalloc to track small allocations
-        "01193_metadata_loading",
-        "01017_uniqCombined_memory_usage" /// Fine thresholds on memory usage
-    ],
-    "debug-build": [
-        "query_profiler",
-        "memory_profiler",
-        "00899_long_attach",
-        "00980_alter_settings_race",
-        "00834_kill_mutation_replicated_zookeeper",
-        "00834_kill_mutation",
-        "01200_mutations_memory_consumption",
-        "01103_check_cpu_instructions_at_startup",
-        "01037_polygon_dicts_",
-        "hyperscan",
-        "01193_metadata_loading",
-        "01473_event_time_microseconds",
-        "01396_inactive_replica_cleanup_nodes"
-    ],
-    "unbundled-build": [
-        "00429",
-        "00877",
-        "pocopatch",
-        "parquet",
-        "xxhash",
-        "_h3",
-        "query_profiler",
-        "memory_profiler",
-        "orc_load",
-        "01033_storage_odbc_parsing_exception_check",
-        "avro",
-        "01072_optimize_skip_unused_shards_const_expr_eval",
-        "00505_secure",
-        "00505_shard_secure",
-        "odbc_roundtrip",
-        "01103_check_cpu_instructions_at_startup",
-        "01114_mysql_database_engine_segfault",
-        "00834_cancel_http_readonly_queries_on_client_close",
-        "_arrow",
-        "01099_parallel_distributed_insert_select",
-        "01300_client_save_history_when_terminated",
-        "orc_output",
-        "01370_client_autocomplete_word_break_characters",
-        "01676_clickhouse_client_autocomplete",
-        "01193_metadata_loading",
-        "01455_time_zones",
-        "01755_client_highlight_multi_line_comment_regression"
-    ],
-    "release-build": [
-    ],
-    "database-ordinary": [
-        "00604_show_create_database",
-        "00609_mv_index_in_in",
-        "00510_materizlized_view_and_deduplication_zookeeper",
-        "00738_lock_for_inner_table",
-        "01153_attach_mv_uuid",
-        /// Sometimes cannot lock file most likely due to concurrent or adjacent tests, but we don't care how it works in Ordinary database.
-        "rocksdb",
-        "01914_exchange_dictionaries" /// Requires Atomic database
-    ],
-    "database-replicated": [
-        /// Unclassified
-        "memory_tracking",
-        "memory_usage",
-        "live_view",
-        "01148_zookeeper_path_macros_unfolding",
-        "01269_create_with_null",
-        "01451_replicated_detach_drop_and_quorum",
-        "01188_attach_table_from_path",
-        /// ON CLUSTER is not allowed
-        "01181_db_atomic_drop_on_cluster",
-        "01175_distributed_ddl_output_mode",
-        "01415_sticking_mutations",
-        /// user_files
-        "01721_engine_file_truncate_on_insert",
-        /// Fails due to additional replicas or shards
-        "quorum",
-        "01650_drop_part_and_deduplication_zookeeper",
-        "01532_execute_merges_on_single_replica",
-        "00652_replicated_mutations_default_database_zookeeper",
-        "00620_optimize_on_nonleader_replica_zookeeper",
-        "01158_zookeeper_log",
-        /// grep -c
-        "01018_ddl_dictionaries_bad_queries",
-        "00908_bloom_filter_index",
-        /// Unsupported type of ALTER query
-        "01650_fetch_patition_with_macro_in_zk_path",
-        "01451_detach_drop_part",
-        "01451_replicated_detach_drop_part",
-        "01417_freeze_partition_verbose",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01130_in_memory_parts_partitons",
-        "01060_shutdown_table_after_detach",
-        "01021_only_tuple_columns",
-        "01015_attach_part",
-        "00955_test_final_mark",
-        "00753_alter_attach",
-        "00626_replace_partition_from_table_zookeeper",
-        "00626_replace_partition_from_table",
-        "00152_insert_different_granularity",
-        "00054_merge_tree_partitions",
-        "01781_merge_tree_deduplication",
-        "00980_zookeeper_merge_tree_alter_settings",
-        "00980_merge_alter_settings",
-        /// Old syntax is not allowed
-        "01062_alter_on_mutataion_zookeeper",
-        "00925_zookeeper_empty_replicated_merge_tree_optimize_final",
-        "00754_alter_modify_order_by_replicated_zookeeper",
-        "00652_replicated_mutations_zookeeper",
-        "00623_replicated_truncate_table_zookeeper",
-        "00516_deduplication_after_drop_partition_zookeeper",
-        "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00236_replicated_drop_on_non_leader_zookeeper",
-        "00226_zookeeper_deduplication_and_unexpected_parts",
-        "00215_primary_key_order_zookeeper",
-        "00121_drop_column_zookeeper",
-        "00083_create_merge_tree_zookeeper",
-        "00062_replicated_merge_tree_alter_zookeeper",
-        /// Does not support renaming of multiple tables in single query
-        "00634_rename_view",
-        "00140_rename",
-        /// Different query_id
-        "01943_query_id_check",
-        /// Requires investigation
-        "00953_zookeeper_suetin_deduplication_bug",
-        "01783_http_chunk_size",
-        "00166_explain_estimate"
-    ],
-    "polymorphic-parts": [
-        "01508_partition_pruning_long", /// bug, shoud be fixed
-        "01482_move_to_prewhere_and_cast", /// bug, shoud be fixed
-        "01158_zookeeper_log"
-    ],
-    "parallel":
-    [
-        /// Pessimistic list of tests which work badly in parallel.
-        /// Probably they need better investigation.
-        "00062_replicated_merge_tree_alter_zookeeper",
-        "00080_show_tables_and_system_tables",
-        "00101_materialized_views_and_insert_without_explicit_database",
-        "00109_shard_totals_after_having",
-        "00110_external_sort",
-        "00116_storage_set",
-        "00121_drop_column_zookeeper",
-        "00133_long_shard_memory_tracker_and_exception_safety",
-        "00158_buffer_and_nonexistent_table",
-        "00180_attach_materialized_view",
-        "00226_zookeeper_deduplication_and_unexpected_parts",
-        "00236_replicated_drop_on_non_leader_zookeeper",
-        "00305_http_and_readonly",
-        "00311_array_primary_key",
-        "00417_kill_query",
-        "00423_storage_log_single_thread",
-        "00429_long_http_bufferization",
-        "00446_clear_column_in_partition_concurrent_zookeeper",
-        "00446_clear_column_in_partition_zookeeper",
-        "00463_long_sessions_in_http_interface",
-        "00505_shard_secure",
-        "00508_materialized_view_to",
-        "00516_deduplication_after_drop_partition_zookeeper",
-        "00534_functions_bad_arguments10",
-        "00552_or_nullable",
-        "00564_versioned_collapsing_merge_tree",
-        "00571_non_exist_database_when_create_materializ_view",
-        "00575_illegal_column_exception_when_drop_depen_column",
-        "00599_create_view_with_subquery",
-        "00600_replace_running_query",
-        "00604_show_create_database",
-        "00612_http_max_query_size",
-        "00619_union_highlite",
-        "00620_optimize_on_nonleader_replica_zookeeper",
-        "00623_truncate_table",
-        "00623_truncate_table_throw_exception",
-        "00625_arrays_in_nested",
-        "00626_replace_partition_from_table",
-        "00626_replace_partition_from_table_zookeeper",
-        "00633_materialized_view_and_too_many_parts_zookeeper",
-        "00643_cast_zookeeper",
-        "00652_mergetree_mutations",
-        "00652_replicated_mutations_zookeeper",
-        "00682_empty_parts_merge",
-        "00688_low_cardinality_serialization",
-        "00693_max_block_size_system_tables_columns",
-        "00699_materialized_view_mutations",
-        "00701_rollup",
-        "00715_fetch_merged_or_mutated_part_zookeeper",
-        "00716_allow_ddl",
-        "00719_parallel_ddl_db",
-        "00740_database_in_nested_view",
-        "00741_client_comment_multiline",
-        "00751_default_databasename_for_view",
-        "00753_alter_attach",
-        "00754_alter_modify_column_partitions",
-        "00754_alter_modify_order_by_replicated_zookeeper",
-        "00763_long_lock_buffer_alter_destination_table",
-        "00800_versatile_storage_join",
-        "00804_test_alter_compression_codecs",
-        "00804_test_custom_compression_codecs",
-        "00804_test_custom_compression_codes_log_storages",
-        "00804_test_delta_codec_compression",
-        "00815_left_join_on_stepanel",
-        "00834_cancel_http_readonly_queries_on_client_close",
-        "00834_kill_mutation",
-        "00834_kill_mutation_replicated_zookeeper",
-        "00840_long_concurrent_select_and_drop_deadlock",
-        "00857_global_joinsavel_table_alias",
-        "00899_long_attach_memory_limit",
-        "00910_buffer_prewhere",
-        "00910_zookeeper_custom_compression_codecs_replicated",
-        "00926_adaptive_index_granularity_merge_tree",
-        "00926_adaptive_index_granularity_pk",
-        "00926_adaptive_index_granularity_replacing_merge_tree",
-        "00926_zookeeper_adaptive_index_granularity_replicated_merge_tree",
-        "00933_alter_ttl",
-        "00933_reserved_word",
-        "00933_test_fix_extra_seek_on_compressed_cache",
-        "00933_ttl_replicated_zookeeper",
-        "00933_ttl_with_default",
-        "00950_dict_get",
-        "00955_test_final_mark",
-        "00976_ttl_with_old_parts",
-        "00980_merge_alter_settings",
-        "00980_zookeeper_merge_tree_alter_settings",
-        "00988_constraints_replication_zookeeper",
-        "00989_parallel_parts_loading",
-        "00992_system_parts_race_condition_zookeeper_long",
-        "00993_system_parts_race_condition_drop_zookeeper",
-        "01012_show_tables_limit",
-        "01013_sync_replica_timeout_zookeeper",
-        "01014_lazy_database_basic",
-        "01014_lazy_database_concurrent_recreate_reattach_and_show_tables",
-        "01015_attach_part",
-        "01015_database_bad_tables",
-        "01018_ddl_dictionaries_concurrent_requrests",
-        "01018_ddl_dictionaries_create",
-        "01018_ddl_dictionaries_select",
-        "01018_ddl_dictionaries_special",
-        "01018_dictionaries_from_dictionaries",
-        "01018_ip_dictionary_long",
-        "01021_only_tuple_columns",
-        "01023_materialized_view_query_context",
-        "01031_mutations_interpreter_and_context",
-        "01033_dictionaries_lifetime",
-        "01035_concurrent_move_partition_from_table_zookeeper",
-        "01036_no_superfluous_dict_reload_on_create_database",
-        "01036_no_superfluous_dict_reload_on_create_database_2",
-        "01037_polygon_dicts_correctness_all",
-        "01037_polygon_dicts_correctness_fast",
-        "01037_polygon_dicts_simple_functions",
-        "01038_dictionary_lifetime_min_zero_sec",
-        "01040_dictionary_invalidate_query_switchover_long",
-        "01041_create_dictionary_if_not_exists",
-        "01042_system_reload_dictionary_reloads_completely",
-        "01043_dictionary_attribute_properties_values",
-        "01045_dictionaries_restrictions",
-        "01045_zookeeper_system_mutations_with_parts_names",
-        "01048_exists_query",
-        "01053_drop_database_mat_view",
-        "01053_ssd_dictionary",
-        "01054_cache_dictionary_bunch_update",
-        "01054_cache_dictionary_overflow_cell",
-        "01055_compact_parts_1",
-        "01056_create_table_as",
-        "01060_avro",
-        "01060_shutdown_table_after_detach",
-        "01069_database_memory",
-        "01070_materialize_ttl",
-        "01070_modify_ttl",
-        "01070_mutations_with_dependencies",
-        "01071_live_view_detach_dependency",
-        "01071_prohibition_secondary_index_with_old_format_merge_tree",
-        "01073_attach_if_not_exists",
-        "01073_show_tables_not_like",
-        "01076_cache_dictionary_datarace_exception_ptr",
-        "01076_parallel_alter_replicated_zookeeper",
-        "01079_parallel_alter_add_drop_column_zookeeper",
-        "01079_parallel_alter_detach_table_zookeeper",
-        "01080_check_for_error_incorrect_size_of_nested_column",
-        "01083_expressions_in_engine_arguments",
-        "01084_regexp_empty",
-        "01085_max_distributed_connections_http",
-        "01092_memory_profiler",
-        "01098_temporary_and_external_tables",
-        "01103_distributed_product_mode_local_column_renames",
-        "01107_atomic_db_detach_attach",
-        "01108_restart_replicas_rename_deadlock_zookeeper",
-        "01109_exchange_tables",
-        "01110_dictionary_layout_without_arguments",
-        "01113_local_dictionary_type_conversion",
-        "01114_database_atomic",
-        "01114_mysql_database_engine_segfault",
-        "01115_join_with_dictionary",
-        "01125_dict_ddl_cannot_add_column",
-        "01127_month_partitioning_consistency_select",
-        "01130_in_memory_parts_partitons",
-        "01135_default_and_alter_zookeeper",
-        "01148_zookeeper_path_macros_unfolding",
-        "01150_ddl_guard_rwr",
-        "01153_attach_mv_uuid",
-        "01152_cross_replication",
-        "01154_move_partition_long",
-        "01155_rename_move_materialized_view",
-        "01185_create_or_replace_table",
-        "01190_full_attach_syntax",
-        "01191_rename_dictionary",
-        "01192_rename_database_zookeeper",
-        "01193_metadata_loading",
-        "01200_mutations_memory_consumption",
-        "01224_no_superfluous_dict_reload",
-        "01225_drop_dictionary_as_table",
-        "01225_show_create_table_from_dictionary",
-        "01231_distributed_aggregation_memory_efficient_mix_levels",
-        "01232_extremes",
-        "01238_http_memory_tracking",
-        "01249_bad_arguments_for_bloom_filter",
-        "01251_dict_is_in_infinite_loop",
-        "01254_dict_create_without_db",
-        "01254_dict_load_after_detach_attach",
-        "01257_dictionary_mismatch_types",
-        "01259_dictionary_custom_settings_ddl",
-        "01267_alter_default_key_columns_zookeeper",
-        "01268_dictionary_direct_layout",
-        "01269_alias_type_differs",
-        "01272_suspicious_codecs",
-        "01277_alter_rename_column_constraint_zookeeper",
-        "01280_ssd_complex_key_dictionary",
-        "01280_ttl_where_group_by",
-        "01281_group_by_limit_memory_tracking",
-        "01281_unsucceeded_insert_select_queries_counter",
-        "01293_system_distribution_queue",
-        "01294_lazy_database_concurrent",
-        "01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long",
-        "01294_system_distributed_on_cluster",
-        "01296_create_row_policy_in_current_database",
-        "01297_create_quota",
-        "01305_replica_create_drop_zookeeper",
-        "01307_multiple_leaders_zookeeper",
-        "01318_long_unsuccessful_mutation_zookeeper",
-        "01319_manual_write_to_replicas",
-        "01320_create_sync_race_condition_zookeeper",
-        "01338_long_select_and_alter",
-        "01338_long_select_and_alter_zookeeper",
-        "01355_alter_column_with_order",
-        "01355_ilike",
-        "01357_version_collapsing_attach_detach_zookeeper",
-        "01375_compact_parts_codecs",
-        "01376_GROUP_BY_injective_elimination_dictGet",
-        "01378_alter_rename_with_ttl_zookeeper",
-        "01383_remote_ambiguous_column_shard",
-        "01388_clear_all_columns",
-        "01391_join_on_dict_crash",
-        "01392_column_resolve",
-        "01396_inactive_replica_cleanup_nodes_zookeeper",
-        "01412_cache_dictionary_race",
-        "01414_mutations_and_errors_zookeeper",
-        "01415_inconsistent_merge_tree_settings",
-        "01415_sticking_mutations",
-        "01417_freeze_partition_verbose",
-        "01417_freeze_partition_verbose_zookeeper",
-        "01430_modify_sample_by_zookeeper",
-        "01444_create_table_drop_database_race",
-        "01454_storagememory_data_race_challenge",
-        "01455_rank_correlation_spearman",
-        "01456_modify_column_type_via_add_drop_update",
-        "01457_create_as_table_function_structure",
-        "01459_manual_write_to_replicas",
-        "01460_DistributedFilesToInsert",
-        "01465_ttl_recompression",
-        "01470_show_databases_like",
-        "01471_calculate_ttl_during_merge",
-        "01487_distributed_in_not_default_db",
-        "01493_alter_remove_properties_zookeeper",
-        "01493_storage_set_persistency",
-        "01494_storage_join_persistency",
-        "01501_cache_dictionary_all_fields",
-        "01507_clickhouse_server_start_with_embedded_config",
-        "01509_dictionary_preallocate",
-        "01516_create_table_primary_key",
-        "01516_drop_table_stress",
-        "01517_drop_mv_with_inner_table",
-        "01526_complex_key_dict_direct_layout",
-        "01527_clickhouse_local_optimize",
-        "01527_dist_sharding_key_dictGet_reload",
-        "01530_drop_database_atomic_sync",
-        "01541_max_memory_usage_for_user_long",
-        "01542_dictionary_load_exception_race",
-        "01545_system_errors", // looks at the difference of values in system.errors
-        "01560_optimize_on_insert_zookeeper",
-        "01563_distributed_query_finish", // looks at system.errors which is global
-        "01575_disable_detach_table_of_dictionary",
-        "01593_concurrent_alter_mutations_kill",
-        "01593_concurrent_alter_mutations_kill_many_replicas",
-        "01600_count_of_parts_metrics", // tests global system metrics
-        "01600_detach_permanently",
-        "01600_log_queries_with_extensive_info",
-        "01600_multiple_left_join_with_aliases",
-        "01601_detach_permanently",
-        "01602_show_create_view",
-        "01603_rename_overwrite_bug",
-        "01666_blns",
-        "01646_system_restart_replicas_smoke", // system restart replicas is a global query
-        "01656_test_query_log_factories_info",
-        "01658_read_file_to_stringcolumn",
-        "01669_columns_declaration_serde",
-        "01676_dictget_in_default_expression",
-        "01681_cache_dictionary_simple_key",
-        "01682_cache_dictionary_complex_key",
-        "01683_flat_dictionary",
-        "01684_ssd_cache_dictionary_simple_key",
-        "01685_ssd_cache_dictionary_complex_key",
-        "01700_system_zookeeper_path_in",
-        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
-        "01702_system_query_log", // Runs many global system queries
-        "01715_background_checker_blather_zookeeper",
-        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
-        "01722_long_brotli_http_compression_json_format", // It is broken in some unimaginable way with the genius error 'cannot write to ofstream'. Not sure how to debug this
-        "01747_alter_partition_key_enum_zookeeper",
-        "01748_dictionary_table_dot", // creates database
-        "01760_polygon_dictionaries",
-        "01760_system_dictionaries",
-        "01761_alter_decimal_zookeeper",
-        "01360_materialized_view_with_join_on_query_log", // creates and drops MVs on query_log, which may interrupt flushes.
-        "01509_parallel_quorum_insert_no_replicas", // It's ok to execute in parallel with oter tests but not several instances of the same test.
-        "attach",
-        "ddl_dictionaries",
-        "dictionary",
-        "limit_memory",
-        "live_view",
-        "memory_leak",
-        "memory_limit",
-        "polygon_dicts", // they use an explicitly specified database
-        "01658_read_file_to_stringcolumn",
-        "01721_engine_file_truncate_on_insert", // It's ok to execute in parallel but not several instances of the same test.
-        "01702_system_query_log", // It's ok to execute in parallel with oter tests but not several instances of the same test.
-        "01748_dictionary_table_dot", // creates database
-        "00950_dict_get",
-        "01615_random_one_shard_insertion",
-        "01683_flat_dictionary",
-        "01681_cache_dictionary_simple_key",
-        "01682_cache_dictionary_complex_key",
-        "01684_ssd_cache_dictionary_simple_key",
-        "01685_ssd_cache_dictionary_complex_key",
-        "01737_clickhouse_server_wait_server_pool_long", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01954_clickhouse_benchmark_round_robin", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01594_too_low_memory_limits", // This test is fully compatible to run in parallel, however under ASAN processes are pretty heavy and may fail under flaky adress check.
-        "01760_system_dictionaries",
-        "01760_polygon_dictionaries",
-        "01778_hierarchical_dictionaries",
-        "01780_clickhouse_dictionary_source_loop",
-        "01785_dictionary_element_count",
-        "01802_test_postgresql_protocol_with_row_policy", /// Creates database and users
-        "01804_dictionary_decimal256_type",
-        "01850_dist_INSERT_preserve_error", // uses cluster with different static databases shard_0/shard_1
-        "01821_table_comment",
-        "01710_projection_fetch",
-        "01824_prefer_global_in_and_join",
-        "01870_modulo_partition_key",
-        "01870_buffer_flush", // creates database
-        "01889_sqlite_read_write",
-        "01889_postgresql_protocol_null_fields",
-        "01889_check_row_policy_defined_using_user_function",
-        "01921_concurrent_ttl_and_normal_merges_zookeeper_long", // heavy test, better to run sequentially
-        "01913_replace_dictionary",
-        "01914_exchange_dictionaries",
-        "01915_create_or_replace_dictionary",
-        "01925_test_storage_merge_aliases",
-        "01933_client_replxx_convert_history", /// Uses non unique history file
-        "01939_user_with_default_database", //create user and database
-        "01999_grant_with_replace",
-        "01902_table_function_merge_db_repr",
-        "01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer",
-        "01946_test_wrong_host_name_access",
-        "01213_alter_rename_with_default_zookeeper", /// Warning: Removing leftovers from table.
-        "02001_add_default_database_to_system_users" ///create user
-    ]
-}
diff --git a/tests/server-test.xml b/tests/server-test.xml
deleted file mode 100644
index 1f67317ad0a..00000000000
--- a/tests/server-test.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Config for test server in "Arcadia".
-   This file is unused by ClickHouse continuous integration tests.
-   "Arcadia" is a proprietary monorepository in Yandex, that we don't care about.
-   If you are looking at this file, it is a wrong place.
-   Do not edit this file.
--->
-<yandex>
-    <logger>
-        <level>trace</level>
-        <log>/tmp/clickhouse/log/clickhouse-server.log</log>
-        <errorlog>/tmp/clickhouse/log/clickhouse-server.err.log</errorlog>
-        <size>10M</size>
-        <count>1</count>
-        <compress>0</compress>
-    </logger>
-    <listen_host>::</listen_host>
-    <listen_host>0.0.0.0</listen_host>
-    <listen_try>1</listen_try>
-    <http_port>58123</http_port>
-    <tcp_port>59000</tcp_port>
-    <https_port>58443</https_port>
-    <tcp_port_secure>59440</tcp_port_secure>
-    <interserver_http_port>59009</interserver_http_port>
-    <max_thread_pool_size>10000</max_thread_pool_size>
-    <openSSL>
-        <server> <!-- Used for https server AND secure tcp port -->
-            <!-- openssl req -subj "/CN=localhost" -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout /etc/clickhouse-server/server.key -out /etc/clickhouse-server/server.crt -->
-            <certificateFile>/tmp/clickhouse/etc/server.crt</certificateFile>
-            <privateKeyFile>/tmp/clickhouse/etc/server.key</privateKeyFile>
-            <!-- openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096 -->
-            <dhParamsFile>/tmp/clickhouse/etc/dhparam.pem</dhParamsFile>
-            <verificationMode>none</verificationMode>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-        </server>
-
-        <client> <!-- Used for connecting to https dictionary source and secured Zookeeper communication -->
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <verificationMode>none</verificationMode>
-            <invalidCertificateHandler>
-                <name>AcceptCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-
-    <keep_alive_timeout>3</keep_alive_timeout>
-    <path>/tmp/clickhouse/data/</path>
-    <tmp_path>/tmp/clickhouse/tmp/</tmp_path>
-    <users_config>users.xml</users_config>
-    <access_control_path>/tmp/clickhouse/data/access/</access_control_path>
-    <custom_settings_prefixes>custom_</custom_settings_prefixes>
-    <mark_cache_size>5368709120</mark_cache_size>
-    <default_profile>default</default_profile>
-    <default_database>default</default_database>
-    <timezone>Europe/Moscow</timezone>
-    <remote_servers incl="clickhouse_remote_servers" >
-        <!-- Test only shard config for testing distributed storage -->
-        <test_unavailable_shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>1</port>
-                </replica>
-            </shard>
-        </test_unavailable_shard>
-        <test_shard_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-        </test_shard_localhost>
-        <test_cluster_two_shards>
-            <shard>
-                <replica>
-                    <host>127.0.0.1</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>127.0.0.2</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards>
-        <test_cluster_two_shards_localhost>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59000</port>
-                </replica>
-            </shard>
-        </test_cluster_two_shards_localhost>
-        <test_shard_localhost_secure>
-            <shard>
-                <replica>
-                    <host>localhost</host>
-                    <port>59440</port>
-                    <secure>1</secure>
-                </replica>
-            </shard>
-        </test_shard_localhost_secure>
-    </remote_servers>
-    <include_from/>
-    <zookeeper incl="zookeeper-servers" optional="true" />
-    <macros incl="macros" optional="true" />
-    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
-    <max_session_timeout>3600</max_session_timeout>
-    <default_session_timeout>60</default_session_timeout>
-    <query_log>
-        <database>system</database>
-        <table>query_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_log>
-    <dictionaries_config>*_dictionary.xml</dictionaries_config>
-    <compression incl="clickhouse_compression">
-    </compression>
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-    <format_schema_path>/tmp/clickhouse/data/format_schemas/</format_schema_path>
-    <query_masking_rules>
-        <rule>
-            <regexp>TOPSECRET.TOPSECRET</regexp>
-            <replace>[hidden]</replace>
-        </rule>
-    </query_masking_rules>
-</yandex>
diff --git a/tests/strings_dictionary.xml b/tests/strings_dictionary.xml
deleted file mode 120000
index be66c1da224..00000000000
--- a/tests/strings_dictionary.xml
+++ /dev/null
@@ -1 +0,0 @@
-config/strings_dictionary.xml
\ No newline at end of file
diff --git a/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
+++ b/tests/testflows/aes_encryption/aes_encryption_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/common.xml b/tests/testflows/aes_encryption/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/common.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.d/logs.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.d/ports.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.d/remote.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.d/ssl.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.d/storage.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/config.xml b/tests/testflows/aes_encryption/configs/clickhouse/config.xml
index beeeafa5704..9854f9f990e 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/config.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -158,7 +158,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -212,20 +212,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -285,7 +285,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -317,13 +317,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -335,7 +335,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -346,7 +346,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -433,4 +433,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse/users.xml b/tests/testflows/aes_encryption/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse/users.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse1/config.d/macros.xml b/tests/testflows/aes_encryption/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse2/config.d/macros.xml b/tests/testflows/aes_encryption/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/configs/clickhouse3/config.d/macros.xml b/tests/testflows/aes_encryption/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/aes_encryption/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/aes_encryption/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/aes_encryption/requirements/requirements.md b/tests/testflows/aes_encryption/requirements/requirements.md
index 4621a15af9d..80cb614268c 100644
--- a/tests/testflows/aes_encryption/requirements/requirements.md
+++ b/tests/testflows/aes_encryption/requirements/requirements.md
@@ -940,17 +940,17 @@ version: 1.0
 * **GDPR:** https://en.wikipedia.org/wiki/General_Data_Protection_Regulation
 * **MySQL:** https://www.mysql.com/
 * **AES:** https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **Git:** https://git-scm.com/
 
 [AEAD]: #aead
 [OpenSSL]: https://www.openssl.org/
-[LowCardinality]: https://clickhouse.tech/docs/en/sql-reference/data-types/lowcardinality/
-[MergeTree]: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/
-[MySQL Database Engine]: https://clickhouse.tech/docs/en/engines/database-engines/mysql/
-[MySQL Table Engine]: https://clickhouse.tech/docs/en/engines/table-engines/integrations/mysql/
-[MySQL Table Function]: https://clickhouse.tech/docs/en/sql-reference/table-functions/mysql/
-[MySQL Dictionary]: https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#dicts-external_dicts_dict_sources-mysql
+[LowCardinality]: https://clickhouse.com/docs/en/sql-reference/data-types/lowcardinality/
+[MergeTree]: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/
+[MySQL Database Engine]: https://clickhouse.com/docs/en/engines/database-engines/mysql/
+[MySQL Table Engine]: https://clickhouse.com/docs/en/engines/table-engines/integrations/mysql/
+[MySQL Table Function]: https://clickhouse.com/docs/en/sql-reference/table-functions/mysql/
+[MySQL Dictionary]: https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#dicts-external_dicts_dict_sources-mysql
 [GCM]: https://en.wikipedia.org/wiki/Galois/Counter_Mode
 [CTR]: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#Counter_(CTR)
 [CBC]: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#Cipher_block_chaining_(CBC)
@@ -965,7 +965,7 @@ version: 1.0
 [MySQL aes_encrypt]: https://dev.mysql.com/doc/refman/5.7/en/encryption-functions.html#function_aes-encrypt
 [MySQL aes_decrypt]: https://dev.mysql.com/doc/refman/5.7/en/encryption-functions.html#function_aes-decrypt
 [AES]: https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/aes_encryption/requirements/requirements.md
 [Revision history]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/aes_encryption/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/aes_encryption/requirements/requirements.py b/tests/testflows/aes_encryption/requirements/requirements.py
index cf8613ceff6..22259aef65e 100644
--- a/tests/testflows/aes_encryption/requirements/requirements.py
+++ b/tests/testflows/aes_encryption/requirements/requirements.py
@@ -2862,17 +2862,17 @@ version: 1.0
 * **GDPR:** https://en.wikipedia.org/wiki/General_Data_Protection_Regulation
 * **MySQL:** https://www.mysql.com/
 * **AES:** https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **Git:** https://git-scm.com/
 
 [AEAD]: #aead
 [OpenSSL]: https://www.openssl.org/
-[LowCardinality]: https://clickhouse.tech/docs/en/sql-reference/data-types/lowcardinality/
-[MergeTree]: https://clickhouse.tech/docs/en/engines/table-engines/mergetree-family/mergetree/
-[MySQL Database Engine]: https://clickhouse.tech/docs/en/engines/database-engines/mysql/
-[MySQL Table Engine]: https://clickhouse.tech/docs/en/engines/table-engines/integrations/mysql/
-[MySQL Table Function]: https://clickhouse.tech/docs/en/sql-reference/table-functions/mysql/
-[MySQL Dictionary]: https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#dicts-external_dicts_dict_sources-mysql
+[LowCardinality]: https://clickhouse.com/docs/en/sql-reference/data-types/lowcardinality/
+[MergeTree]: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/
+[MySQL Database Engine]: https://clickhouse.com/docs/en/engines/database-engines/mysql/
+[MySQL Table Engine]: https://clickhouse.com/docs/en/engines/table-engines/integrations/mysql/
+[MySQL Table Function]: https://clickhouse.com/docs/en/sql-reference/table-functions/mysql/
+[MySQL Dictionary]: https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#dicts-external_dicts_dict_sources-mysql
 [GCM]: https://en.wikipedia.org/wiki/Galois/Counter_Mode
 [CTR]: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#Counter_(CTR)
 [CBC]: https://en.wikipedia.org/wiki/Block_cipher_mode_of_operation#Cipher_block_chaining_(CBC)
@@ -2887,7 +2887,7 @@ version: 1.0
 [MySQL aes_encrypt]: https://dev.mysql.com/doc/refman/5.7/en/encryption-functions.html#function_aes-encrypt
 [MySQL aes_decrypt]: https://dev.mysql.com/doc/refman/5.7/en/encryption-functions.html#function_aes-decrypt
 [AES]: https://en.wikipedia.org/wiki/Advanced_Encryption_Standard
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/aes_encryption/requirements/requirements.md
 [Revision history]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/aes_encryption/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py
index 911d03fe016..612e8bc450e 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/database_engine.py
@@ -187,7 +187,7 @@ def encrypt(self, mysql_datatype):
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL database engine].
 
-    [MySQL database engine]: https://clickhouse.tech/docs/en/engines/database-engines/mysql/
+    [MySQL database engine]: https://clickhouse.com/docs/en/engines/database-engines/mysql/
     """
     self.context.node = self.context.cluster.node(node)
     self.context.mysql_node = self.context.cluster.node(mysql_node)
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py
index 76d010f348d..812e0222866 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/dictionary.py
@@ -242,7 +242,7 @@ def decrypt(self, mysql_datatype):
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL dictionary].
 
-    [MySQL dictionary]: https://clickhouse.tech/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#dicts-external_dicts_dict_sources-mysql
+    [MySQL dictionary]: https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts-dict-sources/#dicts-external_dicts_dict_sources-mysql
     """
     self.context.node = self.context.cluster.node(node)
     self.context.mysql_node = self.context.cluster.node(mysql_node)
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py
index 5598cf2d98c..afc8b607a6f 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_engine.py
@@ -193,7 +193,7 @@ def encrypt(self, mysql_datatype):
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL table engine].
 
-    [MySQL table engine]: https://clickhouse.tech/docs/en/engines/table-engines/integrations/mysql/
+    [MySQL table engine]: https://clickhouse.com/docs/en/engines/table-engines/integrations/mysql/
     """
     self.context.node = self.context.cluster.node(node)
     self.context.mysql_node = self.context.cluster.node(mysql_node)
diff --git a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py
index 937a46ce2c4..91ea8956cad 100644
--- a/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py
+++ b/tests/testflows/aes_encryption/tests/compatibility/mysql/table_function.py
@@ -174,7 +174,7 @@ def encrypt(self, mysql_datatype):
 def feature(self, node="clickhouse1", mysql_node="mysql1"):
     """Check usage of encryption functions with [MySQL table function].
 
-    [MySQL table function]: https://clickhouse.tech/docs/en/sql-reference/table-functions/mysql/
+    [MySQL table function]: https://clickhouse.com/docs/en/sql-reference/table-functions/mysql/
     """
     self.context.node = self.context.cluster.node(node)
     self.context.mysql_node = self.context.cluster.node(mysql_node)
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/logs.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ports.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/remote.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ssl.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/storage.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml
index d34d2c35253..a9a37875273 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -158,7 +158,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -212,20 +212,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -285,7 +285,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -317,13 +317,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -335,7 +335,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -346,7 +346,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -433,4 +433,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse1/config.d/macros.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse2/config.d/macros.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/configs/clickhouse3/config.d/macros.xml b/tests/testflows/datetime64_extended_range/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/datetime64_extended_range/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/datetime64_extended_range/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
+++ b/tests/testflows/datetime64_extended_range/datetime64_extended_range_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/datetime64_extended_range/requirements/requirements.md b/tests/testflows/datetime64_extended_range/requirements/requirements.md
index 0c2b0abb14c..659057ebfdc 100644
--- a/tests/testflows/datetime64_extended_range/requirements/requirements.md
+++ b/tests/testflows/datetime64_extended_range/requirements/requirements.md
@@ -293,388 +293,388 @@ version: 1.0
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTimeZone
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toTimeZone](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#totimezone)
+[ClickHouse] SHALL support correct operation of the [toTimeZone](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#totimezone)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyear)
+[ClickHouse] SHALL support correct operation of the [toYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toQuarter
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toQuarter](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toquarter)
+[ClickHouse] SHALL support correct operation of the [toQuarter](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toquarter)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonth
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tomonth)
+[ClickHouse] SHALL support correct operation of the [toMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tomonth)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toDayOfYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofyear)
+[ClickHouse] SHALL support correct operation of the [toDayOfYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfMonth
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toDayOfMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofmonth)
+[ClickHouse] SHALL support correct operation of the [toDayOfMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofmonth)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toDayOfWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofweek)
+[ClickHouse] SHALL support correct operation of the [toDayOfWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofweek)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toHour
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toHour](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tohour)
+[ClickHouse] SHALL support correct operation of the [toHour](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tohour)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMinute
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tominute)
+[ClickHouse] SHALL support correct operation of the [toMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tominute)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toSecond
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toSecond](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tosecond)
+[ClickHouse] SHALL support correct operation of the [toSecond](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tosecond)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toUnixTimestamp
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toUnitTimestamp](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#to-unix-timestamp)
+[ClickHouse] SHALL support correct operation of the [toUnitTimestamp](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#to-unix-timestamp)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 Timestamp value expected to be negative when DateTime64 value is prior to `1970-01-01` and positine otherwise.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofyear)
+[ClickHouse] SHALL support correct operation of the [toStartOfYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfISOYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfISOYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofisoyear)
+[ClickHouse] SHALL support correct operation of the [toStartOfISOYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofisoyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfQuarter
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfQuarter](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofquarter)
+[ClickHouse] SHALL support correct operation of the [toStartOfQuarter](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofquarter)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMonth
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofmonth)
+[ClickHouse] SHALL support correct operation of the [toStartOfMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofmonth)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonday
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toMonday](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tomonday)
+[ClickHouse] SHALL support correct operation of the [toMonday](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tomonday)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofweektmode)
+[ClickHouse] SHALL support correct operation of the [toStartOfWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofweektmode)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfDay
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfDay](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofday)
+[ClickHouse] SHALL support correct operation of the [toStartOfDay](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofday)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfHour
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfHour](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofhour)
+[ClickHouse] SHALL support correct operation of the [toStartOfHour](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofhour)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMinute
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofminute)
+[ClickHouse] SHALL support correct operation of the [toStartOfMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofminute)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfSecond
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfSecond](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofsecond)
+[ClickHouse] SHALL support correct operation of the [toStartOfSecond](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofsecond)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFiveMinute
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfFiveMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoffiveminute)
+[ClickHouse] SHALL support correct operation of the [toStartOfFiveMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoffiveminute)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfTenMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfTenMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoftenminutes)
+[ClickHouse] SHALL support correct operation of the [toStartOfTenMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoftenminutes)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFifteenMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfFifteenMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoffifteenminutes)
+[ClickHouse] SHALL support correct operation of the [toStartOfFifteenMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoffifteenminutes)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfInterval
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfInterval](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofintervaltime-or-data-interval-x-unit-time-zone)
+[ClickHouse] SHALL support correct operation of the [toStartOfInterval](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofintervaltime-or-data-interval-x-unit-time-zone)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 More detailed description can be found [here](https://github.com/ClickHouse/ClickHouse/issues/1201).
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTime
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toTime](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#totime)
+[ClickHouse] SHALL support correct operation of the [toTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#totime)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeYearNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeYearNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeyearnum)
+[ClickHouse] SHALL support correct operation of the [toRelativeYearNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeyearnum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeQuarterNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeQuarterNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativequarternum)
+[ClickHouse] SHALL support correct operation of the [toRelativeQuarterNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativequarternum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMonthNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeMonthNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativemonthnum)
+[ClickHouse] SHALL support correct operation of the [toRelativeMonthNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativemonthnum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeWeekNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeWeekNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeweeknum)
+[ClickHouse] SHALL support correct operation of the [toRelativeWeekNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeweeknum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeDayNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeDayNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativedaynum)
+[ClickHouse] SHALL support correct operation of the [toRelativeDayNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativedaynum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeHourNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeHourNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativehournum)
+[ClickHouse] SHALL support correct operation of the [toRelativeHourNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativehournum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMinuteNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeMinuteNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeminutenum)
+[ClickHouse] SHALL support correct operation of the [toRelativeMinuteNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeminutenum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeSecondNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeSecondNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativesecondnum)
+[ClickHouse] SHALL support correct operation of the [toRelativeSecondNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativesecondnum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toISOYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toisoyear)
+[ClickHouse] SHALL support correct operation of the [toISOYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toisoyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toISOWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toisoweek)
+[ClickHouse] SHALL support correct operation of the [toISOWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toisoweek)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode)
+[ClickHouse] SHALL support correct operation of the [toWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYearWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYearWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyearweekdatemode)
+[ClickHouse] SHALL support correct operation of the [toYearWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyearweekdatemode)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.now
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [now](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#now)
+[ClickHouse] SHALL support conversion of output from the [now](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#now)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.today
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [today](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#today)
+[ClickHouse] SHALL support conversion of output from the [today](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#today)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.yesterday
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [yesterday](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#yesterday)
+[ClickHouse] SHALL support conversion of output from the [yesterday](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#yesterday)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlot
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [timeSlot](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#timeslot)
+[ClickHouse] SHALL support conversion of output from the [timeSlot](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#timeslot)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMM
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYYYYMM](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymm)
+[ClickHouse] SHALL support correct operation of the [toYYYYMM](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymm)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDD
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYYYYMMDD](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymmdd)
+[ClickHouse] SHALL support correct operation of the [toYYYYMMDD](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymmdd)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDDhhmmss
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYYYYMMDDhhmmss](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymmddhhmmss)
+[ClickHouse] SHALL support correct operation of the [toYYYYMMDDhhmmss](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymmddhhmmss)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addYears
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addYears](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addYears](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMonths
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addMonths](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addMonths](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addWeeks
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addWeeks](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addWeeks](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addDays
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addDays](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addDays](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addHours
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addHours](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addHours](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addSeconds
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addSeconds](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addSeconds](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addQuarters
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addQuarters](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addQuarters](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractYears
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractYears](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractYears](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMonths
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractMonths](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractMonths](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractWeeks
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractWeeks](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractWeeks](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractDays
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractDays](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractDays](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractHours
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractHours](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractHours](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractSeconds
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractSeconds](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractSeconds](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractQuarters
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractQuarters](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractQuarters](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.dateDiff
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [dateDiff](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#datediff)
+[ClickHouse] SHALL support correct operation of the [dateDiff](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#datediff)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlots
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [timeSlots](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#timeslotsstarttime-duration-size)
+[ClickHouse] SHALL support correct operation of the [timeSlots](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#timeslotsstarttime-duration-size)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.formatDateTime
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [formatDateTime](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)
+[ClickHouse] SHALL support correct operation of the [formatDateTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 
@@ -684,45 +684,45 @@ function used with the [DateTime64] data type when it stores dates within the [n
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#toint8163264128256) functions.
+to integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#toint8163264128256) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUInt(8|16|32|64|256)
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to unsigned integer types using [toUInt(8|16|32|64|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#touint8163264256) functions.
+to unsigned integer types using [toUInt(8|16|32|64|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#touint8163264256) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toFloat(32|64)
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to float types using [toFloat(32|64)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tofloat3264) functions.
+to float types using [toFloat(32|64)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tofloat3264) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDate
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range]
-to the [Date](https://clickhouse.tech/docs/en/sql-reference/data-types/date/) type using the [toDate](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todate) function.
+to the [Date](https://clickhouse.com/docs/en/sql-reference/data-types/date/) type using the [toDate](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todate) function.
 This function is ONLY supposed to work in NORMAL RANGE.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [DateTime](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime/) type using the [toDateTime](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todatetime) function.
+to the [DateTime](https://clickhouse.com/docs/en/sql-reference/data-types/datetime/) type using the [toDateTime](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todatetime) function.
 This function is ONLY supposed to work in NORMAL RANGE.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the data types supported by the [toDateTime64](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/) function
+[ClickHouse] SHALL support correct conversion from the data types supported by the [toDateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/) function
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64.FromString.MissingTime
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)
-data type to the [DateTime64](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/) data type
+[ClickHouse] SHALL support correct conversion from the [String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)
+data type to the [DateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/) data type
 when value of the string is missing the `hh:mm-ss.sss` part.
 For example, `toDateTime64('2020-01-01', 3)`.
 
@@ -730,64 +730,64 @@ For example, `toDateTime64('2020-01-01', 3)`.
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to [Decimal](https://clickhouse.tech/docs/en/sql-reference/data-types/decimal/) types using [toDecimal(32|64|128|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todecimal3264128256) functions.
+to [Decimal](https://clickhouse.com/docs/en/sql-reference/data-types/decimal/) types using [toDecimal(32|64|128|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todecimal3264128256) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toString
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/) type using the [toString](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tostring) function.
+to the [String](https://clickhouse.com/docs/en/sql-reference/data-types/string/) type using the [toString](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tostring) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.CAST(x,T)
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to one of the supported data type using the [CAST(x,T)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) function.
+to one of the supported data type using the [CAST(x,T)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Milli
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Milli](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64milli) function.
+to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Milli](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64milli) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Micro
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Micro](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64micro) function.
+to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Micro](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64micro) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Nano
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64nano) function.
+to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Nano](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64nano) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Milli
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type
+[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-using the [fromUnixTimestamp64Milli](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64milli) function.
+using the [fromUnixTimestamp64Milli](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64milli) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Micro
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type
+[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-using the [fromUnixTimestamp64Micro](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64micro) function.
+using the [fromUnixTimestamp64Micro](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64micro) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Nano
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type
+[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-using the [fromUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64nano) function.
+using the [fromUnixTimestamp64Nano](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64nano) function.
 
 ## References
 
-* **DateTime64**: https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/
+* **DateTime64**: https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/
 * **ISO 8601 format**: https://en.wikipedia.org/wiki/ISO_8601
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 * **Revision History:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 * **Git:** https://git-scm.com/
@@ -795,10 +795,10 @@ using the [fromUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-referenc
 [SRS]: #srs
 [normal date range]: #normal-date-range
 [extended date range]: #extended-date-range
-[Dates and Times Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/
-[DateTime64]: https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/
+[Dates and Times Functions]: https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/
+[DateTime64]: https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/
 [ISO 8601 format]: https://en.wikipedia.org/wiki/ISO_8601
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/datetime64_extended_range/requirements/requirements.py b/tests/testflows/datetime64_extended_range/requirements/requirements.py
index 0d013e57ff4..a9ba2c235f2 100644
--- a/tests/testflows/datetime64_extended_range/requirements/requirements.py
+++ b/tests/testflows/datetime64_extended_range/requirements/requirements.py
@@ -345,7 +345,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTimeZone = Requirem
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toTimeZone](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#totimezone)\n'
+        '[ClickHouse] SHALL support correct operation of the [toTimeZone](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#totimezone)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -361,7 +361,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYear = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyear)\n'
+        '[ClickHouse] SHALL support correct operation of the [toYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyear)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -377,7 +377,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toQuarter = Requireme
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toQuarter](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toquarter)\n'
+        '[ClickHouse] SHALL support correct operation of the [toQuarter](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toquarter)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -393,7 +393,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonth = Requirement
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tomonth)\n'
+        '[ClickHouse] SHALL support correct operation of the [toMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tomonth)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -409,7 +409,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfYear = Require
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toDayOfYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofyear)\n'
+        '[ClickHouse] SHALL support correct operation of the [toDayOfYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofyear)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -425,7 +425,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfMonth = Requir
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toDayOfMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofmonth)\n'
+        '[ClickHouse] SHALL support correct operation of the [toDayOfMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofmonth)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -441,7 +441,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toDayOfWeek = Require
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toDayOfWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofweek)\n'
+        '[ClickHouse] SHALL support correct operation of the [toDayOfWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofweek)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -457,7 +457,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toHour = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toHour](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tohour)\n'
+        '[ClickHouse] SHALL support correct operation of the [toHour](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tohour)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -473,7 +473,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMinute = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tominute)\n'
+        '[ClickHouse] SHALL support correct operation of the [toMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tominute)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -489,7 +489,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toSecond = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toSecond](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tosecond)\n'
+        '[ClickHouse] SHALL support correct operation of the [toSecond](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tosecond)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -505,7 +505,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toUnixTimestamp = Req
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toUnitTimestamp](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#to-unix-timestamp)\n'
+        '[ClickHouse] SHALL support correct operation of the [toUnitTimestamp](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#to-unix-timestamp)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         'Timestamp value expected to be negative when DateTime64 value is prior to `1970-01-01` and positine otherwise.\n'
         '\n'
@@ -522,7 +522,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfYear = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofyear)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofyear)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -538,7 +538,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfISOYear = Re
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfISOYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofisoyear)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfISOYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofisoyear)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -554,7 +554,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfQuarter = Re
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfQuarter](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofquarter)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfQuarter](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofquarter)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -570,7 +570,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMonth = Requ
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofmonth)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofmonth)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -586,7 +586,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toMonday = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toMonday](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tomonday)\n'
+        '[ClickHouse] SHALL support correct operation of the [toMonday](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tomonday)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -602,7 +602,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfWeek = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofweektmode)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofweektmode)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -618,7 +618,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfDay = Requir
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfDay](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofday)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfDay](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofday)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -634,7 +634,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfHour = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfHour](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofhour)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfHour](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofhour)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -650,7 +650,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfMinute = Req
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofminute)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofminute)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -666,7 +666,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfSecond = Req
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfSecond](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofsecond)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfSecond](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofsecond)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -682,7 +682,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFiveMinute =
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfFiveMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoffiveminute)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfFiveMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoffiveminute)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -698,7 +698,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfTenMinutes =
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfTenMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoftenminutes)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfTenMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoftenminutes)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -714,7 +714,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfFifteenMinut
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfFifteenMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoffifteenminutes)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfFifteenMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoffifteenminutes)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -730,7 +730,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toStartOfInterval = R
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toStartOfInterval](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofintervaltime-or-data-interval-x-unit-time-zone)\n'
+        '[ClickHouse] SHALL support correct operation of the [toStartOfInterval](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofintervaltime-or-data-interval-x-unit-time-zone)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         'More detailed description can be found [here](https://github.com/ClickHouse/ClickHouse/issues/1201).\n'
         '\n'
@@ -747,7 +747,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toTime = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toTime](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#totime)\n'
+        '[ClickHouse] SHALL support correct operation of the [toTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#totime)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -763,7 +763,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeYearNum = R
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeYearNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeyearnum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeYearNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeyearnum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -779,7 +779,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeQuarterNum
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeQuarterNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativequarternum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeQuarterNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativequarternum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -795,7 +795,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMonthNum =
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeMonthNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativemonthnum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeMonthNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativemonthnum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -811,7 +811,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeWeekNum = R
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeWeekNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeweeknum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeWeekNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeweeknum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -827,7 +827,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeDayNum = Re
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeDayNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativedaynum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeDayNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativedaynum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -843,7 +843,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeHourNum = R
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeHourNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativehournum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeHourNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativehournum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -859,7 +859,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeMinuteNum =
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeMinuteNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeminutenum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeMinuteNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeminutenum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -875,7 +875,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toRelativeSecondNum =
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toRelativeSecondNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativesecondnum)\n'
+        '[ClickHouse] SHALL support correct operation of the [toRelativeSecondNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativesecondnum)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -891,7 +891,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOYear = Requireme
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toISOYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toisoyear)\n'
+        '[ClickHouse] SHALL support correct operation of the [toISOYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toisoyear)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -907,7 +907,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toISOWeek = Requireme
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toISOWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toisoweek)\n'
+        '[ClickHouse] SHALL support correct operation of the [toISOWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toisoweek)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -923,7 +923,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toWeek = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode)\n'
+        '[ClickHouse] SHALL support correct operation of the [toWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -939,7 +939,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYearWeek = Requirem
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toYearWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyearweekdatemode)\n'
+        '[ClickHouse] SHALL support correct operation of the [toYearWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyearweekdatemode)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -955,7 +955,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_now = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support conversion of output from the [now](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#now)\n'
+        '[ClickHouse] SHALL support conversion of output from the [now](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#now)\n'
         'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -971,7 +971,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_today = Requirement(
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support conversion of output from the [today](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#today)\n'
+        '[ClickHouse] SHALL support conversion of output from the [today](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#today)\n'
         'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -987,7 +987,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_yesterday = Requireme
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support conversion of output from the [yesterday](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#yesterday)\n'
+        '[ClickHouse] SHALL support conversion of output from the [yesterday](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#yesterday)\n'
         'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1003,7 +1003,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlot = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support conversion of output from the [timeSlot](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#timeslot)\n'
+        '[ClickHouse] SHALL support conversion of output from the [timeSlot](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#timeslot)\n'
         'function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1019,7 +1019,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMM = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toYYYYMM](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymm)\n'
+        '[ClickHouse] SHALL support correct operation of the [toYYYYMM](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymm)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1035,7 +1035,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDD = Requirem
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toYYYYMMDD](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymmdd)\n'
+        '[ClickHouse] SHALL support correct operation of the [toYYYYMMDD](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymmdd)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1051,7 +1051,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_toYYYYMMDDhhmmss = Re
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [toYYYYMMDDhhmmss](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymmddhhmmss)\n'
+        '[ClickHouse] SHALL support correct operation of the [toYYYYMMDDhhmmss](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymmddhhmmss)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1067,7 +1067,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addYears = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addYears](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addYears](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1083,7 +1083,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMonths = Requireme
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addMonths](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addMonths](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1099,7 +1099,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addWeeks = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addWeeks](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addWeeks](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1115,7 +1115,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addDays = Requirement
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addDays](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addDays](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1131,7 +1131,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addHours = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addHours](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addHours](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1147,7 +1147,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addMinutes = Requirem
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1163,7 +1163,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addSeconds = Requirem
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addSeconds](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addSeconds](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1179,7 +1179,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_addQuarters = Require
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [addQuarters](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [addQuarters](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1195,7 +1195,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractYears = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractYears](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractYears](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1211,7 +1211,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMonths = Requ
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractMonths](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractMonths](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1227,7 +1227,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractWeeks = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractWeeks](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractWeeks](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1243,7 +1243,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractDays = Requir
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractDays](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractDays](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         '\n'
@@ -1260,7 +1260,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractHours = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractHours](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractHours](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1276,7 +1276,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractMinutes = Req
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1292,7 +1292,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractSeconds = Req
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractSeconds](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractSeconds](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1308,7 +1308,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_subtractQuarters = Re
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [subtractQuarters](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
+        '[ClickHouse] SHALL support correct operation of the [subtractQuarters](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1324,7 +1324,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_dateDiff = Requiremen
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [dateDiff](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#datediff)\n'
+        '[ClickHouse] SHALL support correct operation of the [dateDiff](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#datediff)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1340,7 +1340,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_timeSlots = Requireme
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [timeSlots](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#timeslotsstarttime-duration-size)\n'
+        '[ClickHouse] SHALL support correct operation of the [timeSlots](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#timeslotsstarttime-duration-size)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1356,7 +1356,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_DatesAndTimesFunctions_formatDateTime = Requ
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct operation of the [formatDateTime](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)\n'
+        '[ClickHouse] SHALL support correct operation of the [formatDateTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)\n'
         'function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         '\n'
@@ -1374,7 +1374,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toInt_8_16_32_64_128
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#toint8163264128256) functions.\n'
+        'to integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#toint8163264128256) functions.\n'
         '\n'
         ),
     link=None,
@@ -1390,7 +1390,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUInt_8_16_32_64_25
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to unsigned integer types using [toUInt(8|16|32|64|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#touint8163264256) functions.\n'
+        'to unsigned integer types using [toUInt(8|16|32|64|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#touint8163264256) functions.\n'
         '\n'
         ),
     link=None,
@@ -1406,7 +1406,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toFloat_32_64_ = Req
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to float types using [toFloat(32|64)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tofloat3264) functions.\n'
+        'to float types using [toFloat(32|64)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tofloat3264) functions.\n'
         '\n'
         ),
     link=None,
@@ -1422,7 +1422,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDate = Requirement
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range]\n'
-        'to the [Date](https://clickhouse.tech/docs/en/sql-reference/data-types/date/) type using the [toDate](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todate) function.\n'
+        'to the [Date](https://clickhouse.com/docs/en/sql-reference/data-types/date/) type using the [toDate](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todate) function.\n'
         'This function is ONLY supposed to work in NORMAL RANGE.\n'
         '\n'
         ),
@@ -1439,7 +1439,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime = Require
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to the [DateTime](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime/) type using the [toDateTime](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todatetime) function.\n'
+        'to the [DateTime](https://clickhouse.com/docs/en/sql-reference/data-types/datetime/) type using the [toDateTime](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todatetime) function.\n'
         'This function is ONLY supposed to work in NORMAL RANGE.\n'
         '\n'
         ),
@@ -1455,7 +1455,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64 = Requi
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct conversion from the data types supported by the [toDateTime64](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/) function\n'
+        '[ClickHouse] SHALL support correct conversion from the data types supported by the [toDateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/) function\n'
         'to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].\n'
         '\n'
         ),
@@ -1471,8 +1471,8 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDateTime64_FromStr
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct conversion from the [String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)\n'
-        'data type to the [DateTime64](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/) data type\n'
+        '[ClickHouse] SHALL support correct conversion from the [String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)\n'
+        'data type to the [DateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/) data type\n'
         'when value of the string is missing the `hh:mm-ss.sss` part.\n'
         "For example, `toDateTime64('2020-01-01', 3)`.\n"
         '\n'
@@ -1490,7 +1490,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toDecimal_32_64_128_
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to [Decimal](https://clickhouse.tech/docs/en/sql-reference/data-types/decimal/) types using [toDecimal(32|64|128|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todecimal3264128256) functions.\n'
+        'to [Decimal](https://clickhouse.com/docs/en/sql-reference/data-types/decimal/) types using [toDecimal(32|64|128|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todecimal3264128256) functions.\n'
         '\n'
         ),
     link=None,
@@ -1506,7 +1506,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toString = Requireme
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to the [String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/) type using the [toString](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tostring) function.\n'
+        'to the [String](https://clickhouse.com/docs/en/sql-reference/data-types/string/) type using the [toString](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tostring) function.\n'
         '\n'
         ),
     link=None,
@@ -1522,7 +1522,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_CAST_x_T_ = Requirem
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to one of the supported data type using the [CAST(x,T)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) function.\n'
+        'to one of the supported data type using the [CAST(x,T)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) function.\n'
         '\n'
         ),
     link=None,
@@ -1538,7 +1538,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Mil
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Milli](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64milli) function.\n'
+        'to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Milli](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64milli) function.\n'
         '\n'
         ),
     link=None,
@@ -1554,7 +1554,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Mic
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Micro](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64micro) function.\n'
+        'to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Micro](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64micro) function.\n'
         '\n'
         ),
     link=None,
@@ -1570,7 +1570,7 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_toUnixTimestamp64Nan
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64nano) function.\n'
+        'to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Nano](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64nano) function.\n'
         '\n'
         ),
     link=None,
@@ -1585,9 +1585,9 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64M
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type\n'
+        '[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type\n'
         'to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'using the [fromUnixTimestamp64Milli](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64milli) function.\n'
+        'using the [fromUnixTimestamp64Milli](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64milli) function.\n'
         '\n'
         ),
     link=None,
@@ -1602,9 +1602,9 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64M
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type\n'
+        '[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type\n'
         'to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'using the [fromUnixTimestamp64Micro](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64micro) function.\n'
+        'using the [fromUnixTimestamp64Micro](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64micro) function.\n'
         '\n'
         ),
     link=None,
@@ -1619,9 +1619,9 @@ RQ_SRS_010_DateTime64_ExtendedRange_TypeConversionFunctions_fromUnixTimestamp64N
     type=None,
     uid=None,
     description=(
-        '[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type\n'
+        '[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type\n'
         'to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]\n'
-        'using the [fromUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64nano) function.\n'
+        'using the [fromUnixTimestamp64Nano](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64nano) function.\n'
         '\n'
         ),
     link=None,
@@ -2155,388 +2155,388 @@ version: 1.0
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTimeZone
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toTimeZone](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#totimezone)
+[ClickHouse] SHALL support correct operation of the [toTimeZone](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#totimezone)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyear)
+[ClickHouse] SHALL support correct operation of the [toYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toQuarter
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toQuarter](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toquarter)
+[ClickHouse] SHALL support correct operation of the [toQuarter](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toquarter)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonth
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tomonth)
+[ClickHouse] SHALL support correct operation of the [toMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tomonth)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toDayOfYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofyear)
+[ClickHouse] SHALL support correct operation of the [toDayOfYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfMonth
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toDayOfMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofmonth)
+[ClickHouse] SHALL support correct operation of the [toDayOfMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofmonth)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toDayOfWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toDayOfWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#todayofweek)
+[ClickHouse] SHALL support correct operation of the [toDayOfWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#todayofweek)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toHour
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toHour](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tohour)
+[ClickHouse] SHALL support correct operation of the [toHour](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tohour)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMinute
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tominute)
+[ClickHouse] SHALL support correct operation of the [toMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tominute)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toSecond
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toSecond](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tosecond)
+[ClickHouse] SHALL support correct operation of the [toSecond](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tosecond)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toUnixTimestamp
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toUnitTimestamp](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#to-unix-timestamp)
+[ClickHouse] SHALL support correct operation of the [toUnitTimestamp](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#to-unix-timestamp)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 Timestamp value expected to be negative when DateTime64 value is prior to `1970-01-01` and positine otherwise.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofyear)
+[ClickHouse] SHALL support correct operation of the [toStartOfYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfISOYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfISOYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofisoyear)
+[ClickHouse] SHALL support correct operation of the [toStartOfISOYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofisoyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfQuarter
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfQuarter](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofquarter)
+[ClickHouse] SHALL support correct operation of the [toStartOfQuarter](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofquarter)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMonth
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfMonth](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofmonth)
+[ClickHouse] SHALL support correct operation of the [toStartOfMonth](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofmonth)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toMonday
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toMonday](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tomonday)
+[ClickHouse] SHALL support correct operation of the [toMonday](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tomonday)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofweektmode)
+[ClickHouse] SHALL support correct operation of the [toStartOfWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofweektmode)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfDay
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfDay](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofday)
+[ClickHouse] SHALL support correct operation of the [toStartOfDay](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofday)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfHour
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfHour](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofhour)
+[ClickHouse] SHALL support correct operation of the [toStartOfHour](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofhour)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfMinute
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofminute)
+[ClickHouse] SHALL support correct operation of the [toStartOfMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofminute)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfSecond
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfSecond](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofsecond)
+[ClickHouse] SHALL support correct operation of the [toStartOfSecond](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofsecond)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFiveMinute
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfFiveMinute](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoffiveminute)
+[ClickHouse] SHALL support correct operation of the [toStartOfFiveMinute](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoffiveminute)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfTenMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfTenMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoftenminutes)
+[ClickHouse] SHALL support correct operation of the [toStartOfTenMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoftenminutes)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfFifteenMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfFifteenMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartoffifteenminutes)
+[ClickHouse] SHALL support correct operation of the [toStartOfFifteenMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartoffifteenminutes)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toStartOfInterval
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toStartOfInterval](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#tostartofintervaltime-or-data-interval-x-unit-time-zone)
+[ClickHouse] SHALL support correct operation of the [toStartOfInterval](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#tostartofintervaltime-or-data-interval-x-unit-time-zone)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 More detailed description can be found [here](https://github.com/ClickHouse/ClickHouse/issues/1201).
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toTime
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toTime](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#totime)
+[ClickHouse] SHALL support correct operation of the [toTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#totime)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeYearNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeYearNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeyearnum)
+[ClickHouse] SHALL support correct operation of the [toRelativeYearNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeyearnum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeQuarterNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeQuarterNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativequarternum)
+[ClickHouse] SHALL support correct operation of the [toRelativeQuarterNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativequarternum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMonthNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeMonthNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativemonthnum)
+[ClickHouse] SHALL support correct operation of the [toRelativeMonthNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativemonthnum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeWeekNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeWeekNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeweeknum)
+[ClickHouse] SHALL support correct operation of the [toRelativeWeekNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeweeknum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeDayNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeDayNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativedaynum)
+[ClickHouse] SHALL support correct operation of the [toRelativeDayNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativedaynum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeHourNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeHourNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativehournum)
+[ClickHouse] SHALL support correct operation of the [toRelativeHourNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativehournum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeMinuteNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeMinuteNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativeminutenum)
+[ClickHouse] SHALL support correct operation of the [toRelativeMinuteNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativeminutenum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toRelativeSecondNum
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toRelativeSecondNum](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#torelativesecondnum)
+[ClickHouse] SHALL support correct operation of the [toRelativeSecondNum](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#torelativesecondnum)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOYear
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toISOYear](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toisoyear)
+[ClickHouse] SHALL support correct operation of the [toISOYear](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toisoyear)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toISOWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toISOWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toisoweek)
+[ClickHouse] SHALL support correct operation of the [toISOWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toisoweek)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode)
+[ClickHouse] SHALL support correct operation of the [toWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYearWeek
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYearWeek](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyearweekdatemode)
+[ClickHouse] SHALL support correct operation of the [toYearWeek](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyearweekdatemode)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.now
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [now](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#now)
+[ClickHouse] SHALL support conversion of output from the [now](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#now)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.today
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [today](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#today)
+[ClickHouse] SHALL support conversion of output from the [today](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#today)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.yesterday
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [yesterday](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#yesterday)
+[ClickHouse] SHALL support conversion of output from the [yesterday](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#yesterday)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlot
 version: 1.0
 
-[ClickHouse] SHALL support conversion of output from the [timeSlot](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#timeslot)
+[ClickHouse] SHALL support conversion of output from the [timeSlot](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#timeslot)
 function to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMM
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYYYYMM](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymm)
+[ClickHouse] SHALL support correct operation of the [toYYYYMM](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymm)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDD
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYYYYMMDD](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymmdd)
+[ClickHouse] SHALL support correct operation of the [toYYYYMMDD](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymmdd)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.toYYYYMMDDhhmmss
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [toYYYYMMDDhhmmss](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toyyyymmddhhmmss)
+[ClickHouse] SHALL support correct operation of the [toYYYYMMDDhhmmss](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toyyyymmddhhmmss)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addYears
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addYears](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addYears](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMonths
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addMonths](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addMonths](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addWeeks
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addWeeks](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addWeeks](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addDays
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addDays](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addDays](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addHours
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addHours](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addHours](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addSeconds
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addSeconds](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addSeconds](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.addQuarters
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [addQuarters](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
+[ClickHouse] SHALL support correct operation of the [addQuarters](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#addyears-addmonths-addweeks-adddays-addhours-addminutes-addseconds-addquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractYears
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractYears](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractYears](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMonths
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractMonths](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractMonths](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractWeeks
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractWeeks](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractWeeks](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractDays
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractDays](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractDays](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractHours
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractHours](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractHours](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractMinutes
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractMinutes](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractMinutes](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractSeconds
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractSeconds](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractSeconds](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.subtractQuarters
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [subtractQuarters](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
+[ClickHouse] SHALL support correct operation of the [subtractQuarters](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#subtractyears-subtractmonths-subtractweeks-subtractdays-subtracthours-subtractminutes-subtractseconds-subtractquarters)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.dateDiff
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [dateDiff](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#datediff)
+[ClickHouse] SHALL support correct operation of the [dateDiff](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#datediff)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.timeSlots
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [timeSlots](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#timeslotsstarttime-duration-size)
+[ClickHouse] SHALL support correct operation of the [timeSlots](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#timeslotsstarttime-duration-size)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.DatesAndTimesFunctions.formatDateTime
 version: 1.0
 
-[ClickHouse] SHALL support correct operation of the [formatDateTime](https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)
+[ClickHouse] SHALL support correct operation of the [formatDateTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)
 function used with the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 
@@ -2546,45 +2546,45 @@ function used with the [DateTime64] data type when it stores dates within the [n
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#toint8163264128256) functions.
+to integer types using [toInt(8|16|32|64|128|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#toint8163264128256) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUInt(8|16|32|64|256)
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to unsigned integer types using [toUInt(8|16|32|64|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#touint8163264256) functions.
+to unsigned integer types using [toUInt(8|16|32|64|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#touint8163264256) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toFloat(32|64)
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to float types using [toFloat(32|64)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tofloat3264) functions.
+to float types using [toFloat(32|64)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tofloat3264) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDate
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range]
-to the [Date](https://clickhouse.tech/docs/en/sql-reference/data-types/date/) type using the [toDate](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todate) function.
+to the [Date](https://clickhouse.com/docs/en/sql-reference/data-types/date/) type using the [toDate](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todate) function.
 This function is ONLY supposed to work in NORMAL RANGE.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [DateTime](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime/) type using the [toDateTime](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todatetime) function.
+to the [DateTime](https://clickhouse.com/docs/en/sql-reference/data-types/datetime/) type using the [toDateTime](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todatetime) function.
 This function is ONLY supposed to work in NORMAL RANGE.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the data types supported by the [toDateTime64](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/) function
+[ClickHouse] SHALL support correct conversion from the data types supported by the [toDateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/) function
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range].
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toDateTime64.FromString.MissingTime
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/)
-data type to the [DateTime64](https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/) data type
+[ClickHouse] SHALL support correct conversion from the [String](https://clickhouse.com/docs/en/sql-reference/data-types/string/)
+data type to the [DateTime64](https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/) data type
 when value of the string is missing the `hh:mm-ss.sss` part.
 For example, `toDateTime64('2020-01-01', 3)`.
 
@@ -2592,64 +2592,64 @@ For example, `toDateTime64('2020-01-01', 3)`.
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to [Decimal](https://clickhouse.tech/docs/en/sql-reference/data-types/decimal/) types using [toDecimal(32|64|128|256)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#todecimal3264128256) functions.
+to [Decimal](https://clickhouse.com/docs/en/sql-reference/data-types/decimal/) types using [toDecimal(32|64|128|256)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#todecimal3264128256) functions.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toString
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [String](https://clickhouse.tech/docs/en/sql-reference/data-types/string/) type using the [toString](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tostring) function.
+to the [String](https://clickhouse.com/docs/en/sql-reference/data-types/string/) type using the [toString](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tostring) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.CAST(x,T)
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to one of the supported data type using the [CAST(x,T)](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) function.
+to one of the supported data type using the [CAST(x,T)](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Milli
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Milli](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64milli) function.
+to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Milli](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64milli) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Micro
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Micro](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64micro) function.
+to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Micro](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64micro) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.toUnixTimestamp64Nano
 version: 1.0
 
 [ClickHouse] SHALL support correct conversion of the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-to the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64nano) function.
+to the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type using the [toUnixTimestamp64Nano](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#tounixtimestamp64nano) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Milli
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type
+[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-using the [fromUnixTimestamp64Milli](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64milli) function.
+using the [fromUnixTimestamp64Milli](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64milli) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Micro
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type
+[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-using the [fromUnixTimestamp64Micro](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64micro) function.
+using the [fromUnixTimestamp64Micro](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64micro) function.
 
 ###### RQ.SRS-010.DateTime64.ExtendedRange.TypeConversionFunctions.fromUnixTimestamp64Nano
 version: 1.0
 
-[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/) type
+[ClickHouse] SHALL support correct conversion from the [Int64](https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/) type
 to the [DateTime64] data type when it stores dates within the [normal date range] and the [extended date range]
-using the [fromUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64nano) function.
+using the [fromUnixTimestamp64Nano](https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#fromunixtimestamp64nano) function.
 
 ## References
 
-* **DateTime64**: https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/
+* **DateTime64**: https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/
 * **ISO 8601 format**: https://en.wikipedia.org/wiki/ISO_8601
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 * **Revision History:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 * **Git:** https://git-scm.com/
@@ -2657,10 +2657,10 @@ using the [fromUnixTimestamp64Nano](https://clickhouse.tech/docs/en/sql-referenc
 [SRS]: #srs
 [normal date range]: #normal-date-range
 [extended date range]: #extended-date-range
-[Dates and Times Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/
-[DateTime64]: https://clickhouse.tech/docs/en/sql-reference/data-types/datetime64/
+[Dates and Times Functions]: https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/
+[DateTime64]: https://clickhouse.com/docs/en/sql-reference/data-types/datetime64/
 [ISO 8601 format]: https://en.wikipedia.org/wiki/ISO_8601
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/datetime64_extended_range/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/datetime64_extended_range/tests/date_time_functions.py b/tests/testflows/datetime64_extended_range/tests/date_time_functions.py
index 7338f34668a..f972caac95b 100644
--- a/tests/testflows/datetime64_extended_range/tests/date_time_functions.py
+++ b/tests/testflows/datetime64_extended_range/tests/date_time_functions.py
@@ -978,7 +978,7 @@ def to_week_compute_expected(dt: datetime.datetime, mode: int, ret_year=False):
 def to_week_year_week(self, clh_func, ret_year):
     """Check the toWeek/toYearWeek function with DateTime64 extended range.
     For detailed info on work modes and description, see
-    https://clickhouse.tech/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode
+    https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#toweekdatemode
     :param self: current test
     :param clh_func: ClickHouse function to be called, string
     :param ret_year: toWeek/toYearWeek selector, Boolean
diff --git a/tests/testflows/example/configs/clickhouse/common.xml b/tests/testflows/example/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/example/configs/clickhouse/common.xml
+++ b/tests/testflows/example/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/config.d/logs.xml b/tests/testflows/example/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/example/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/example/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/config.d/ports.xml b/tests/testflows/example/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/example/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/example/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/example/configs/clickhouse/config.d/remote.xml b/tests/testflows/example/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/example/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/example/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/config.d/ssl.xml b/tests/testflows/example/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/example/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/example/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/config.d/storage.xml b/tests/testflows/example/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/example/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/example/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/example/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/example/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/example/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/config.xml b/tests/testflows/example/configs/clickhouse/config.xml
index beeeafa5704..9854f9f990e 100644
--- a/tests/testflows/example/configs/clickhouse/config.xml
+++ b/tests/testflows/example/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -158,7 +158,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -212,20 +212,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -285,7 +285,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -317,13 +317,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -335,7 +335,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -346,7 +346,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -433,4 +433,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse/users.xml b/tests/testflows/example/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/example/configs/clickhouse/users.xml
+++ b/tests/testflows/example/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/configs/clickhouse1/config.d/macros.xml b/tests/testflows/example/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/example/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/example/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/example/example_env/clickhouse-service.yml b/tests/testflows/example/example_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/example/example_env/clickhouse-service.yml
+++ b/tests/testflows/example/example_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/example/requirements/CH_SRS001_ClickHouse.md b/tests/testflows/example/requirements/CH_SRS001_ClickHouse.md
index 6297bd0543f..9ecebd55954 100644
--- a/tests/testflows/example/requirements/CH_SRS001_ClickHouse.md
+++ b/tests/testflows/example/requirements/CH_SRS001_ClickHouse.md
@@ -127,9 +127,9 @@ SELECT 1
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 
 [SRS]: #SRS
 [Some term that you will use]: #Sometermthatyouwilluse
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/example/requirements/requirements.py b/tests/testflows/example/requirements/requirements.py
index 35cd7d09c85..5b4765eb90e 100644
--- a/tests/testflows/example/requirements/requirements.py
+++ b/tests/testflows/example/requirements/requirements.py
@@ -239,10 +239,10 @@ SELECT 1
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 
 [SRS]: #SRS
 [Some term that you will use]: #Sometermthatyouwilluse
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [Git]: https://git-scm.com/
 ''')
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml
index 567c8c05e32..0ba01589b90 100644
--- a/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">::</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/logs.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/storage.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml
index 4ec12232539..842a0573d49 100644
--- a/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -170,7 +170,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="clickhouse_remote_servers" >
         <!-- Test only shard config for testing distributed storage -->
@@ -224,20 +224,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper-servers" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -297,7 +297,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -329,13 +329,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -347,7 +347,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -358,7 +358,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -445,4 +445,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml b/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml
+++ b/tests/testflows/extended_precision_data_types/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100644
--- a/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
+++ b/tests/testflows/extended_precision_data_types/extended-precision-data-type_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/extended_precision_data_types/requirements/requirements.md b/tests/testflows/extended_precision_data_types/requirements/requirements.md
index 232eb4d7aba..1088cafdb99 100644
--- a/tests/testflows/extended_precision_data_types/requirements/requirements.md
+++ b/tests/testflows/extended_precision_data_types/requirements/requirements.md
@@ -541,24 +541,24 @@ version: 1.0
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository**: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 * **Revision History**: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 * **Git:** https://git-scm.com/
 
 [Extended Precision Data Types]: #extended-precision-data-types
-[Arithmetic functions]: https://clickhouse.tech/docs/en/sql-reference/functions/arithmetic-functions/
-[Array functions]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/
-[Comparison functions]: https://clickhouse.tech/docs/en/sql-reference/functions/comparison-functions/
-[Logical Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/logical-functions/
-[Mathematical Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/math-functions/
-[Rounding Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/rounding-functions/
-[Bit Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/bit-functions/
-[Null Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/functions-for-nulls/
-[Tuple Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/tuple-functions/
-[Map Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/tuple-map-functions/
+[Arithmetic functions]: https://clickhouse.com/docs/en/sql-reference/functions/arithmetic-functions/
+[Array functions]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/
+[Comparison functions]: https://clickhouse.com/docs/en/sql-reference/functions/comparison-functions/
+[Logical Functions]: https://clickhouse.com/docs/en/sql-reference/functions/logical-functions/
+[Mathematical Functions]: https://clickhouse.com/docs/en/sql-reference/functions/math-functions/
+[Rounding Functions]: https://clickhouse.com/docs/en/sql-reference/functions/rounding-functions/
+[Bit Functions]: https://clickhouse.com/docs/en/sql-reference/functions/bit-functions/
+[Null Functions]: https://clickhouse.com/docs/en/sql-reference/functions/functions-for-nulls/
+[Tuple Functions]: https://clickhouse.com/docs/en/sql-reference/functions/tuple-functions/
+[Map Functions]: https://clickhouse.com/docs/en/sql-reference/functions/tuple-map-functions/
 [SRS]: #srs
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/extended_precision_data_types/requirements/requirements.py b/tests/testflows/extended_precision_data_types/requirements/requirements.py
index 6069b98a551..fa828897f66 100644
--- a/tests/testflows/extended_precision_data_types/requirements/requirements.py
+++ b/tests/testflows/extended_precision_data_types/requirements/requirements.py
@@ -1398,24 +1398,24 @@ version: 1.0
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository**: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 * **Revision History**: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 * **Git:** https://git-scm.com/
 
 [Extended Precision Data Types]: #extended-precision-data-types
-[Arithmetic functions]: https://clickhouse.tech/docs/en/sql-reference/functions/arithmetic-functions/
-[Array functions]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/
-[Comparison functions]: https://clickhouse.tech/docs/en/sql-reference/functions/comparison-functions/
-[Logical Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/logical-functions/
-[Mathematical Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/math-functions/
-[Rounding Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/rounding-functions/
-[Bit Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/bit-functions/
-[Null Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/functions-for-nulls/
-[Tuple Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/tuple-functions/
-[Map Functions]: https://clickhouse.tech/docs/en/sql-reference/functions/tuple-map-functions/
+[Arithmetic functions]: https://clickhouse.com/docs/en/sql-reference/functions/arithmetic-functions/
+[Array functions]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/
+[Comparison functions]: https://clickhouse.com/docs/en/sql-reference/functions/comparison-functions/
+[Logical Functions]: https://clickhouse.com/docs/en/sql-reference/functions/logical-functions/
+[Mathematical Functions]: https://clickhouse.com/docs/en/sql-reference/functions/math-functions/
+[Rounding Functions]: https://clickhouse.com/docs/en/sql-reference/functions/rounding-functions/
+[Bit Functions]: https://clickhouse.com/docs/en/sql-reference/functions/bit-functions/
+[Null Functions]: https://clickhouse.com/docs/en/sql-reference/functions/functions-for-nulls/
+[Tuple Functions]: https://clickhouse.com/docs/en/sql-reference/functions/tuple-functions/
+[Map Functions]: https://clickhouse.com/docs/en/sql-reference/functions/tuple-map-functions/
 [SRS]: #srs
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/extended_precision_data_types/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/extended_precision_data_types/snapshots/common.py.tests.snapshot b/tests/testflows/extended_precision_data_types/snapshots/common.py.tests.snapshot
index 18b58b0cfdc..e0414393111 100644
--- a/tests/testflows/extended_precision_data_types/snapshots/common.py.tests.snapshot
+++ b/tests/testflows/extended_precision_data_types/snapshots/common.py.tests.snapshot
@@ -1045,6 +1045,7 @@ a
 
 mapPopulateSeries_with_Int128_on_a_table = r"""
 a
+([1,2,3,4,5],[1,2,3,0,0])
 """
 
 mapContains_with_Int128_on_a_table = r"""
@@ -1575,6 +1576,7 @@ a
 
 mapPopulateSeries_with_Int256_on_a_table = r"""
 a
+([1,2,3,4,5],[1,2,3,0,0])
 """
 
 mapContains_with_Int256_on_a_table = r"""
@@ -2105,6 +2107,7 @@ a
 
 mapPopulateSeries_with_UInt128_on_a_table = r"""
 a
+([1,2,3,4,5],[1,2,3,0,0])
 """
 
 mapContains_with_UInt128_on_a_table = r"""
@@ -2635,6 +2638,7 @@ a
 
 mapPopulateSeries_with_UInt256_on_a_table = r"""
 a
+([1,2,3,4,5],[1,2,3,0,0])
 """
 
 mapContains_with_UInt256_on_a_table = r"""
diff --git a/tests/testflows/extended_precision_data_types/tests/array_tuple_map.py b/tests/testflows/extended_precision_data_types/tests/array_tuple_map.py
index 938beabfff4..c39574ba75e 100644
--- a/tests/testflows/extended_precision_data_types/tests/array_tuple_map.py
+++ b/tests/testflows/extended_precision_data_types/tests/array_tuple_map.py
@@ -357,7 +357,7 @@ def map_func(self, data_type, node=None):
             exitcode, message = 0, None
 
             if data_type.startswith("Decimal"):
-                exitcode, message = 43, "Exception:"        
+                exitcode, message = 43, "Exception:"
             node.query(sql, exitcode=exitcode, message=message)
 
         execute_query(f"""SELECT * FROM {table_name} ORDER BY a ASC""")
@@ -393,9 +393,13 @@ def map_func(self, data_type, node=None):
         execute_query(f"SELECT * FROM {table_name} ORDER BY a ASC")
 
     with Scenario(f"mapPopulateSeries with {data_type}"):
-        node.query(f"SELECT mapPopulateSeries([1,2,3], [{to_data_type(data_type,1)},"
-            f"{to_data_type(data_type,2)}, {to_data_type(data_type,3)}], 5)",
-            exitcode = 44, message='Exception:')
+        sql = (f"SELECT mapPopulateSeries([1,2,3], [{to_data_type(data_type,1)},"
+            f"{to_data_type(data_type,2)}, {to_data_type(data_type,3)}], 5)")
+
+        exitcode, message = 0, None
+        if data_type.startswith("Decimal"):
+            exitcode, message = 44, "Exception:"
+        node.query(sql, exitcode=exitcode, message=message)
 
     with Scenario(f"mapPopulateSeries with {data_type} on a table"):
         table_name = get_table_name()
@@ -403,9 +407,13 @@ def map_func(self, data_type, node=None):
         table(name = table_name, data_type = f'Tuple(Array({data_type}), Array({data_type}))')
 
         with When("I insert the output into a table"):
-            node.query(f"INSERT INTO {table_name} SELECT mapPopulateSeries([1,2,3],"
-                f"[{to_data_type(data_type,1)}, {to_data_type(data_type,2)}, {to_data_type(data_type,3)}], 5)",
-                exitcode = 44, message='Exception:')
+            sql = (f"INSERT INTO {table_name} SELECT mapPopulateSeries([1,2,3],"
+                f"[{to_data_type(data_type,1)}, {to_data_type(data_type,2)}, {to_data_type(data_type,3)}], 5)")
+
+            exitcode, message = 0, None
+            if data_type.startswith("Decimal"):
+                exitcode, message = 44, "Exception:"
+            node.query(sql, exitcode=exitcode, message=message)
 
         execute_query(f"SELECT * FROM {table_name} ORDER BY a ASC")
 
diff --git a/tests/testflows/kerberos/configs/clickhouse/common.xml b/tests/testflows/kerberos/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/kerberos/configs/clickhouse/common.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/config.xml b/tests/testflows/kerberos/configs/clickhouse/config.xml
index a0133238f25..0d2904eed48 100644
--- a/tests/testflows/kerberos/configs/clickhouse/config.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -162,7 +162,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -216,20 +216,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -289,7 +289,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -321,13 +321,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -339,7 +339,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -350,7 +350,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -437,4 +437,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse/users.xml b/tests/testflows/kerberos/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/kerberos/configs/clickhouse/users.xml
+++ b/tests/testflows/kerberos/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml b/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml
index e45c4519c73..93ae1a31534 100644
--- a/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml
+++ b/tests/testflows/kerberos/configs/clickhouse1/config.d/kerberos.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf8'?>
-<yandex>
+<clickhouse>
     <kerberos>
         <realm>EXAMPLE.COM</realm>
     </kerberos>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml b/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/kerberos/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml b/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml
index 7029f20217f..60d2bba71bb 100644
--- a/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml
+++ b/tests/testflows/kerberos/configs/clickhouse1/users.d/kerberos-users.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <users>
         <kerberos_user>
             <kerberos>
@@ -7,4 +7,4 @@
             <access_management>1</access_management>
         </kerberos_user>
     </users>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml b/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml
index ceaa497c561..703aa6c8a8d 100644
--- a/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml
+++ b/tests/testflows/kerberos/configs/clickhouse2/config.d/kerberos.xml
@@ -1,5 +1,5 @@
-<yandex>
+<clickhouse>
     <kerberos>
         <realm>EXAMPLE.COM</realm>
     </kerberos>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml b/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/kerberos/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml b/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml
index e45c4519c73..93ae1a31534 100644
--- a/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml
+++ b/tests/testflows/kerberos/configs/clickhouse3/config.d/kerberos.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf8'?>
-<yandex>
+<clickhouse>
     <kerberos>
         <realm>EXAMPLE.COM</realm>
     </kerberos>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml b/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/kerberos/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
index 14736a264b8..9f30ca3039a 100644
--- a/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
+++ b/tests/testflows/kerberos/kerberos_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test:21454
+    image: clickhouse/integration-test:21454
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/kerberos/requirements/requirements.md b/tests/testflows/kerberos/requirements/requirements.md
index 8f2b3b7e11e..f4d298c7572 100644
--- a/tests/testflows/kerberos/requirements/requirements.md
+++ b/tests/testflows/kerberos/requirements/requirements.md
@@ -108,26 +108,26 @@ version: 1.0
 [ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:
 
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <kerberos />
-</yandex>
+</clickhouse>
 ```
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <kerberos>
         <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
     </kerberos>
-</yandex>
+</clickhouse>
 ```
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <kerberos>
         <realm>EXAMPLE.COM</realm>
     </kerberos>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections
@@ -163,7 +163,7 @@ version: 1.0
 [ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:
 
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <users>
         <!- ... -->
@@ -174,7 +174,7 @@ version: 1.0
             </kerberos>
         </my_user>
     </users>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser
@@ -274,7 +274,7 @@ version: 1.0
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/kerberos/requirements/requirements.md
 * **Revision History:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/kerberos/requirements/requirements.md
 * **Git:** https://git-scm.com/
@@ -282,7 +282,7 @@ version: 1.0
 
 [Kerberos]: https://en.wikipedia.org/wiki/Kerberos_(protocol)
 [SPNEGO]: https://en.wikipedia.org/wiki/SPNEGO
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub]: https://gitlab.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/kerberos/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/kerberos/requirements/requirements.md
diff --git a/tests/testflows/kerberos/requirements/requirements.py b/tests/testflows/kerberos/requirements/requirements.py
index 418c51ca8b3..774f533373a 100644
--- a/tests/testflows/kerberos/requirements/requirements.py
+++ b/tests/testflows/kerberos/requirements/requirements.py
@@ -64,26 +64,26 @@ RQ_SRS_016_Kerberos_Configuration_KerberosNotEnabled = Requirement(
         '[ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <!- ... -->\n'
         '    <kerberos />\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <!- ... -->\n'
         '    <kerberos>\n'
         '        <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>\n'
         '    </kerberos>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <!- ... -->\n'
         '    <kerberos>\n'
         '        <realm>EXAMPLE.COM</realm>\n'
         '    </kerberos>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -177,7 +177,7 @@ RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser = Requirement(
         '[ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <!- ... -->\n'
         '    <users>\n'
         '        <!- ... -->\n'
@@ -188,7 +188,7 @@ RQ_SRS_016_Kerberos_ValidUser_XMLConfiguredUser = Requirement(
         '            </kerberos>\n'
         '        </my_user>\n'
         '    </users>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -626,26 +626,26 @@ version: 1.0
 [ClickHouse] SHALL reject [Kerberos] authentication in case user is properly configured for using Kerberos, but Kerberos itself is not enabled in `config.xml`. For example:
 
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <kerberos />
-</yandex>
+</clickhouse>
 ```
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <kerberos>
         <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
     </kerberos>
-</yandex>
+</clickhouse>
 ```
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <kerberos>
         <realm>EXAMPLE.COM</realm>
     </kerberos>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-016.Kerberos.Configuration.MultipleKerberosSections
@@ -681,7 +681,7 @@ version: 1.0
 [ClickHouse] SHALL accept [Kerberos] authentication for a user that is configured in `users.xml` and has [Kerberos] enabled, i.e.:
 
 ```xml
-<yandex>
+<clickhouse>
     <!- ... -->
     <users>
         <!- ... -->
@@ -692,7 +692,7 @@ version: 1.0
             </kerberos>
         </my_user>
     </users>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-016.Kerberos.ValidUser.RBACConfiguredUser
@@ -792,7 +792,7 @@ version: 1.0
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/kerberos/requirements/requirements.md
 * **Revision History:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/kerberos/requirements/requirements.md
 * **Git:** https://git-scm.com/
@@ -800,7 +800,7 @@ version: 1.0
 
 [Kerberos]: https://en.wikipedia.org/wiki/Kerberos_(protocol)
 [SPNEGO]: https://en.wikipedia.org/wiki/SPNEGO
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub]: https://gitlab.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/kerberos/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/kerberos/requirements/requirements.md
diff --git a/tests/testflows/kerberos/tests/common.py b/tests/testflows/kerberos/tests/common.py
index 8b72f1c2ffd..5dd0f734d8f 100644
--- a/tests/testflows/kerberos/tests/common.py
+++ b/tests/testflows/kerberos/tests/common.py
@@ -31,10 +31,10 @@ def xml_parse_file(filename):
 def create_default_config(filename):
     contents = ""
     if "kerberos_users.xml" in filename:
-        contents = "<yandex><users><kerberos_user><kerberos><realm>EXAMPLE.COM" \
-               "</realm></kerberos></kerberos_user></users></yandex>"
+        contents = "<clickhouse><users><kerberos_user><kerberos><realm>EXAMPLE.COM" \
+               "</realm></kerberos></kerberos_user></users></clickhouse>"
     elif "kerberos.xml" in filename:
-        contents = "<yandex><kerberos><realm>EXAMPLE.COM</realm></kerberos></yandex>"
+        contents = "<clickhouse><kerberos><realm>EXAMPLE.COM</realm></kerberos></clickhouse>"
 
     with open(filename, "w") as f:
         f.write(contents)
@@ -104,7 +104,7 @@ def temp_erase(self, node, filename=None):
     try:
         with Then("I overwrite file to be dummy"):
             with open(filename, 'w') as f:
-                f.write("<yandex></yandex>\n")
+                f.write("<clickhouse></clickhouse>\n")
             node.restart()
             yield
     finally:
diff --git a/tests/testflows/kerberos/tests/config.py b/tests/testflows/kerberos/tests/config.py
index 85af0b3214e..35cec9527d8 100644
--- a/tests/testflows/kerberos/tests/config.py
+++ b/tests/testflows/kerberos/tests/config.py
@@ -19,7 +19,7 @@ def kerberos_not_enabled(self):
     config_path = f"kerberos/configs/{ch_nodes[0].name}/config.d/kerberos.xml"
 
     def modify_file(root):
-        return xmltree.fromstring("<yandex></yandex>")
+        return xmltree.fromstring("<clickhouse></clickhouse>")
 
     check_wrong_config(node=ch_nodes[0], client=ch_nodes[2], config_path=config_path, modify_file=modify_file,
                        output="Kerberos is not enabled")
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/common.xml b/tests/testflows/ldap/authentication/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/common.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/logs.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ports.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/remote.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ssl.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/storage.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/config.xml b/tests/testflows/ldap/authentication/configs/clickhouse/config.xml
index 3db8338b865..53ffa10384e 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/config.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -164,7 +164,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -218,20 +218,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -291,7 +291,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -323,13 +323,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -341,7 +341,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -352,7 +352,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -439,4 +439,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse/users.xml b/tests/testflows/ldap/authentication/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse/users.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse1/config.d/macros.xml b/tests/testflows/ldap/authentication/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse2/config.d/macros.xml b/tests/testflows/ldap/authentication/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/configs/clickhouse3/config.d/macros.xml b/tests/testflows/ldap/authentication/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/ldap/authentication/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/ldap/authentication/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/authentication/ldap_authentication_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/authentication/requirements/requirements.md b/tests/testflows/ldap/authentication/requirements/requirements.md
index e27a0ca14f7..a42e2eaa132 100644
--- a/tests/testflows/ldap/authentication/requirements/requirements.md
+++ b/tests/testflows/ldap/authentication/requirements/requirements.md
@@ -442,7 +442,7 @@ version: 2.0
 configuration file or of any configuration file inside the `config.d` directory.
 
 ```xml
-<yandex>
+<clickhouse>
     <my_ldap_server>
         <host>localhost</host>
         <port>636</port>
@@ -458,7 +458,7 @@ configuration file or of any configuration file inside the `config.d` directory.
         <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
         <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
     </my_ldap_server>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-007.LDAP.Configuration.User.RBAC
@@ -478,7 +478,7 @@ version: 1.0
 an [LDAP] server inside the `users.xml` file or any configuration file inside the `users.d` directory.
 
 ```xml
-<yandex>
+<clickhouse>
     <users>
         <user_name>
             <ldap>
@@ -486,7 +486,7 @@ an [LDAP] server inside the `users.xml` file or any configuration file inside th
             </ldap>
         </user_name>
     </users>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-007.LDAP.Configuration.User.Name.Empty
@@ -593,7 +593,7 @@ to result in contacting the [LDAP] server to verify user's username and password
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 
 [Anonymous Authentication Mechanism of Simple Bind]: https://ldapwiki.com/wiki/Simple%20Authentication#section-Simple+Authentication-AnonymousAuthenticationMechanismOfSimpleBind
 [Unauthenticated Authentication Mechanism of Simple Bind]: https://ldapwiki.com/wiki/Simple%20Authentication#section-Simple+Authentication-UnauthenticatedAuthenticationMechanismOfSimpleBind
@@ -604,7 +604,7 @@ to result in contacting the [LDAP] server to verify user's username and password
 [CA]: https://en.wikipedia.org/wiki/Certificate_authority
 [TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security
 [LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub]: https://github.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/authentication/requirements/requirements.md
diff --git a/tests/testflows/ldap/authentication/requirements/requirements.py b/tests/testflows/ldap/authentication/requirements/requirements.py
index 2437711dd22..97c85d93c86 100644
--- a/tests/testflows/ldap/authentication/requirements/requirements.py
+++ b/tests/testflows/ldap/authentication/requirements/requirements.py
@@ -867,7 +867,7 @@ RQ_SRS_007_LDAP_Configuration_Server_Syntax = Requirement(
         'configuration file or of any configuration file inside the `config.d` directory.\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <my_ldap_server>\n'
         '        <host>localhost</host>\n'
         '        <port>636</port>\n'
@@ -883,7 +883,7 @@ RQ_SRS_007_LDAP_Configuration_Server_Syntax = Requirement(
         '        <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>\n'
         '        <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>\n'
         '    </my_ldap_server>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -923,7 +923,7 @@ RQ_SRS_007_LDAP_Configuration_User_Syntax = Requirement(
         'an [LDAP] server inside the `users.xml` file or any configuration file inside the `users.d` directory.\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <users>\n'
         '        <user_name>\n'
         '            <ldap>\n'
@@ -931,7 +931,7 @@ RQ_SRS_007_LDAP_Configuration_User_Syntax = Requirement(
         '            </ldap>\n'
         '        </user_name>\n'
         '    </users>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -1815,7 +1815,7 @@ version: 2.0
 configuration file or of any configuration file inside the `config.d` directory.
 
 ```xml
-<yandex>
+<clickhouse>
     <my_ldap_server>
         <host>localhost</host>
         <port>636</port>
@@ -1831,7 +1831,7 @@ configuration file or of any configuration file inside the `config.d` directory.
         <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
         <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
     </my_ldap_server>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-007.LDAP.Configuration.User.RBAC
@@ -1851,7 +1851,7 @@ version: 1.0
 an [LDAP] server inside the `users.xml` file or any configuration file inside the `users.d` directory.
 
 ```xml
-<yandex>
+<clickhouse>
     <users>
         <user_name>
             <ldap>
@@ -1859,7 +1859,7 @@ an [LDAP] server inside the `users.xml` file or any configuration file inside th
             </ldap>
         </user_name>
     </users>
-</yandex>
+</clickhouse>
 ```
 
 #### RQ.SRS-007.LDAP.Configuration.User.Name.Empty
@@ -1966,7 +1966,7 @@ to result in contacting the [LDAP] server to verify user's username and password
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 
 [Anonymous Authentication Mechanism of Simple Bind]: https://ldapwiki.com/wiki/Simple%20Authentication#section-Simple+Authentication-AnonymousAuthenticationMechanismOfSimpleBind
 [Unauthenticated Authentication Mechanism of Simple Bind]: https://ldapwiki.com/wiki/Simple%20Authentication#section-Simple+Authentication-UnauthenticatedAuthenticationMechanismOfSimpleBind
@@ -1977,7 +1977,7 @@ to result in contacting the [LDAP] server to verify user's username and password
 [CA]: https://en.wikipedia.org/wiki/Certificate_authority
 [TLS]: https://en.wikipedia.org/wiki/Transport_Layer_Security
 [LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub]: https://github.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/authentication/requirements/requirements.md
diff --git a/tests/testflows/ldap/authentication/tests/common.py b/tests/testflows/ldap/authentication/tests/common.py
index e1615f3ee97..a6bf11fd2cf 100644
--- a/tests/testflows/ldap/authentication/tests/common.py
+++ b/tests/testflows/ldap/authentication/tests/common.py
@@ -194,7 +194,7 @@ def create_ldap_servers_config_content(servers, config_d_dir="/etc/clickhouse-se
     path = os.path.join(config_d_dir, config_file)
     name = config_file
 
-    root = xmltree.fromstring("<yandex><ldap_servers></ldap_servers></yandex>")
+    root = xmltree.fromstring("<clickhouse><ldap_servers></ldap_servers></clickhouse>")
     xml_servers = root.find("ldap_servers")
     xml_servers.append(xmltree.Comment(text=f"LDAP servers {uid}"))
 
@@ -231,7 +231,7 @@ def create_ldap_users_config_content(*users, config_d_dir="/etc/clickhouse-serve
     path = os.path.join(config_d_dir, config_file)
     name = config_file
 
-    root = xmltree.fromstring("<yandex><users></users></yandex>")
+    root = xmltree.fromstring("<clickhouse><users></users></clickhouse>")
     xml_users = root.find("users")
     xml_users.append(xmltree.Comment(text=f"LDAP users {uid}"))
 
diff --git a/tests/testflows/ldap/authentication/tests/server_config.py b/tests/testflows/ldap/authentication/tests/server_config.py
index 88b6bfa0325..87835ddc7d3 100644
--- a/tests/testflows/ldap/authentication/tests/server_config.py
+++ b/tests/testflows/ldap/authentication/tests/server_config.py
@@ -254,7 +254,7 @@ def invalid_verification_cooldown_value(self, invalid_value, timeout=300):
 def syntax(self):
     """Check that server configuration with valid syntax can be loaded.
     ```xml
-    <yandex>
+    <clickhouse>
         <ldap_server>
             <host>localhost</host>
             <port>636</port>
@@ -270,7 +270,7 @@ def syntax(self):
             <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
             <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
         </ldap_server>
-    </yandex>
+    </clickhouse>
     ```
     """
     servers = {
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/common.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/common.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/logs.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ports.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/remote.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ssl.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/storage.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
index 3db8338b865..53ffa10384e 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -164,7 +164,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -218,20 +218,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -291,7 +291,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -323,13 +323,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -341,7 +341,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -352,7 +352,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -439,4 +439,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse/users.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse/users.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse1/config.d/macros.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse2/config.d/macros.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/configs/clickhouse3/config.d/macros.xml b/tests/testflows/ldap/external_user_directory/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/ldap/external_user_directory/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/ldap/external_user_directory/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/external_user_directory/ldap_external_user_directory_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.md b/tests/testflows/ldap/external_user_directory/requirements/requirements.md
index 998996c5874..44c9bdf4c67 100644
--- a/tests/testflows/ldap/external_user_directory/requirements/requirements.md
+++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.md
@@ -611,7 +611,7 @@ version: 2.0
 configuration file or of any configuration file inside the `config.d` directory.
 
 ```xml
-<yandex>
+<clickhouse>
     <my_ldap_server>
         <host>localhost</host>
         <port>636</port>
@@ -627,7 +627,7 @@ configuration file or of any configuration file inside the `config.d` directory.
         <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
         <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
     </my_ldap_server>
-</yandex>
+</clickhouse>
 ```
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory
@@ -649,7 +649,7 @@ version: 1.0
 [ClickHouse] SHALL support `<ldap>` section with the following syntax
 
 ```xml
-<yandex>
+<clickhouse>
     <user_directories>
         <ldap>
             <server>my_ldap_server</server>
@@ -659,7 +659,7 @@ version: 1.0
             </roles>
         </ldap>
     </user_directories>
-</yandex>
+</clickhouse>
 ```
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server
@@ -795,15 +795,15 @@ to result in contacting the [LDAP] server to verify user's username and password
 
 ## References
 
-* **Access Control and Account Management**: https://clickhouse.tech/docs/en/operations/access-rights/
+* **Access Control and Account Management**: https://clickhouse.com/docs/en/operations/access-rights/
 * **LDAP**: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 
 [SRS]: #srs
-[Access Control and Account Management]: https://clickhouse.tech/docs/en/operations/access-rights/
+[Access Control and Account Management]: https://clickhouse.com/docs/en/operations/access-rights/
 [SRS-007 ClickHouse Authentication of Users via LDAP]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
 [LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/ldap/external_user_directory/requirements/requirements.py b/tests/testflows/ldap/external_user_directory/requirements/requirements.py
index 4256ba62716..90969725725 100644
--- a/tests/testflows/ldap/external_user_directory/requirements/requirements.py
+++ b/tests/testflows/ldap/external_user_directory/requirements/requirements.py
@@ -1166,7 +1166,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Syntax = Requirement(
         'configuration file or of any configuration file inside the `config.d` directory.\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <my_ldap_server>\n'
         '        <host>localhost</host>\n'
         '        <port>636</port>\n'
@@ -1182,7 +1182,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Server_Syntax = Requirement(
         '        <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>\n'
         '        <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>\n'
         '    </my_ldap_server>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -1234,7 +1234,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Syntax = Requirement(
         '[ClickHouse] SHALL support `<ldap>` section with the following syntax\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <user_directories>\n'
         '        <ldap>\n'
         '            <server>my_ldap_server</server>\n'
@@ -1244,7 +1244,7 @@ RQ_SRS_009_LDAP_ExternalUserDirectory_Configuration_Users_Syntax = Requirement(
         '            </roles>\n'
         '        </ldap>\n'
         '    </user_directories>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -2403,7 +2403,7 @@ version: 2.0
 configuration file or of any configuration file inside the `config.d` directory.
 
 ```xml
-<yandex>
+<clickhouse>
     <my_ldap_server>
         <host>localhost</host>
         <port>636</port>
@@ -2419,7 +2419,7 @@ configuration file or of any configuration file inside the `config.d` directory.
         <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
         <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
     </my_ldap_server>
-</yandex>
+</clickhouse>
 ```
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.LDAPUserDirectory
@@ -2441,7 +2441,7 @@ version: 1.0
 [ClickHouse] SHALL support `<ldap>` section with the following syntax
 
 ```xml
-<yandex>
+<clickhouse>
     <user_directories>
         <ldap>
             <server>my_ldap_server</server>
@@ -2451,7 +2451,7 @@ version: 1.0
             </roles>
         </ldap>
     </user_directories>
-</yandex>
+</clickhouse>
 ```
 
 ##### RQ.SRS-009.LDAP.ExternalUserDirectory.Configuration.Users.Parameters.Server
@@ -2587,15 +2587,15 @@ to result in contacting the [LDAP] server to verify user's username and password
 
 ## References
 
-* **Access Control and Account Management**: https://clickhouse.tech/docs/en/operations/access-rights/
+* **Access Control and Account Management**: https://clickhouse.com/docs/en/operations/access-rights/
 * **LDAP**: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 
 [SRS]: #srs
-[Access Control and Account Management]: https://clickhouse.tech/docs/en/operations/access-rights/
+[Access Control and Account Management]: https://clickhouse.com/docs/en/operations/access-rights/
 [SRS-007 ClickHouse Authentication of Users via LDAP]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
 [LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/ldap/external_user_directory/tests/common.py b/tests/testflows/ldap/external_user_directory/tests/common.py
index f6d1654efd6..6256fcd1f39 100644
--- a/tests/testflows/ldap/external_user_directory/tests/common.py
+++ b/tests/testflows/ldap/external_user_directory/tests/common.py
@@ -93,7 +93,7 @@ def create_entries_ldap_external_user_directory_config_content(entries, config_d
     path = os.path.join(config_d_dir, config_file)
     name = config_file
 
-    root = xmltree.fromstring("<yandex><user_directories></user_directories></yandex>")
+    root = xmltree.fromstring("<clickhouse><user_directories></user_directories></clickhouse>")
     xml_user_directories = root.find("user_directories")
     xml_user_directories.append(xmltree.Comment(text=f"LDAP external user directories {uid}"))
 
diff --git a/tests/testflows/ldap/external_user_directory/tests/server_config.py b/tests/testflows/ldap/external_user_directory/tests/server_config.py
index 4bf76f373e0..ac6cfa154a6 100644
--- a/tests/testflows/ldap/external_user_directory/tests/server_config.py
+++ b/tests/testflows/ldap/external_user_directory/tests/server_config.py
@@ -268,7 +268,7 @@ def invalid_verification_cooldown_value(self, invalid_value, timeout=300):
 def syntax(self):
     """Check that server configuration with valid syntax can be loaded.
     ```xml
-    <yandex>
+    <clickhouse>
         <ldap_server>
             <host>localhost</host>
             <port>636</port>
@@ -284,7 +284,7 @@ def syntax(self):
             <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
             <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
         </ldap_server>
-    </yandex>
+    </clickhouse>
     ```
     """
     servers = {
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml
index df952b28c82..31fa972199f 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">0.0.0.0</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/logs.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ports.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/remote.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/remote.xml
index 51be2a6e8e3..04066290061 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -104,4 +104,4 @@
             </shard>
         </sharded_cluster_secure>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml
index ca65ffd5e04..77e03e9cf0f 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -14,4 +14,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/storage.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
index 3db8338b865..53ffa10384e 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -164,7 +164,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="remote" >
         <!-- Test only shard config for testing distributed storage -->
@@ -218,20 +218,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -291,7 +291,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -323,13 +323,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -341,7 +341,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -352,7 +352,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -439,4 +439,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse/users.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse/users.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml b/tests/testflows/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/ldap/role_mapping/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
index 0789decf022..0c9352dbc0b 100644
--- a/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
+++ b/tests/testflows/ldap/role_mapping/ldap_role_mapping_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.md b/tests/testflows/ldap/role_mapping/requirements/requirements.md
index fbd772b9d29..e857694f520 100644
--- a/tests/testflows/ldap/role_mapping/requirements/requirements.md
+++ b/tests/testflows/ldap/role_mapping/requirements/requirements.md
@@ -306,7 +306,7 @@ with the actual user name during each authentication attempt.
 For example, 
 
 ```xml
-<yandex>
+<clickhouse>
     <ldap_servers>
         <my_ldap_server>
             <!-- ... -->
@@ -314,7 +314,7 @@ For example,
             <!-- ... -->
         </my_ldap_server>
     </ldap_servers>
-</yandex>
+</clickhouse>
 ```
 
 ##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN
@@ -397,7 +397,7 @@ of the `config.xml`.
 For example,
 
 ```xml
-<yandex>
+<clickhouse>
     <user_directories>
         <ldap>
             <!-- ... -->
@@ -410,7 +410,7 @@ For example,
             </role_mapping>
         </ldap>
     </user_directories>
-</yandex>
+</clickhouse>
 ```
 
 #### Special Characters Escaping
@@ -550,20 +550,20 @@ the `<user directories><ldap><role_mapping>` section of the `config.xml`.
 
 ## References
 
-* **Access Control and Account Management**: https://clickhouse.tech/docs/en/operations/access-rights/
+* **Access Control and Account Management**: https://clickhouse.com/docs/en/operations/access-rights/
 * **LDAP**: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository**: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/role_mapping/requirements/requirements.md
 * **Revision History**: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/role_mapping/requirements/requirements.md 
 * **Git:** https://git-scm.com/
 
-[RBAC]: https://clickhouse.tech/docs/en/operations/access-rights/
+[RBAC]: https://clickhouse.com/docs/en/operations/access-rights/
 [SRS]: #srs
-[Access Control and Account Management]: https://clickhouse.tech/docs/en/operations/access-rights/
+[Access Control and Account Management]: https://clickhouse.com/docs/en/operations/access-rights/
 [SRS-009 ClickHouse LDAP External User Directory]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
 [SRS-007 ClickHouse Authentication of Users via LDAP]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
 [LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/role_mapping/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/role_mapping/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/ldap/role_mapping/requirements/requirements.py b/tests/testflows/ldap/role_mapping/requirements/requirements.py
index 9c038f8b497..5fb8c646483 100644
--- a/tests/testflows/ldap/role_mapping/requirements/requirements.py
+++ b/tests/testflows/ldap/role_mapping/requirements/requirements.py
@@ -456,7 +456,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN = Requirement(
         'For example, \n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <ldap_servers>\n'
         '        <my_ldap_server>\n'
         '            <!-- ... -->\n'
@@ -464,7 +464,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_Server_BindDN = Requirement(
         '            <!-- ... -->\n'
         '        </my_ldap_server>\n'
         '    </ldap_servers>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -601,7 +601,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax = Req
         'For example,\n'
         '\n'
         '```xml\n'
-        '<yandex>\n'
+        '<clickhouse>\n'
         '    <user_directories>\n'
         '        <ldap>\n'
         '            <!-- ... -->\n'
@@ -614,7 +614,7 @@ RQ_SRS_014_LDAP_RoleMapping_Configuration_UserDirectory_RoleMapping_Syntax = Req
         '            </role_mapping>\n'
         '        </ldap>\n'
         '    </user_directories>\n'
-        '</yandex>\n'
+        '</clickhouse>\n'
         '```\n'
         '\n'
         ),
@@ -1366,7 +1366,7 @@ with the actual user name during each authentication attempt.
 For example, 
 
 ```xml
-<yandex>
+<clickhouse>
     <ldap_servers>
         <my_ldap_server>
             <!-- ... -->
@@ -1374,7 +1374,7 @@ For example,
             <!-- ... -->
         </my_ldap_server>
     </ldap_servers>
-</yandex>
+</clickhouse>
 ```
 
 ##### RQ.SRS-014.LDAP.RoleMapping.Configuration.Server.BindDN.ConflictWith.AuthDN
@@ -1457,7 +1457,7 @@ of the `config.xml`.
 For example,
 
 ```xml
-<yandex>
+<clickhouse>
     <user_directories>
         <ldap>
             <!-- ... -->
@@ -1470,7 +1470,7 @@ For example,
             </role_mapping>
         </ldap>
     </user_directories>
-</yandex>
+</clickhouse>
 ```
 
 #### Special Characters Escaping
@@ -1610,20 +1610,20 @@ the `<user directories><ldap><role_mapping>` section of the `config.xml`.
 
 ## References
 
-* **Access Control and Account Management**: https://clickhouse.tech/docs/en/operations/access-rights/
+* **Access Control and Account Management**: https://clickhouse.com/docs/en/operations/access-rights/
 * **LDAP**: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub Repository**: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/role_mapping/requirements/requirements.md
 * **Revision History**: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/role_mapping/requirements/requirements.md 
 * **Git:** https://git-scm.com/
 
-[RBAC]: https://clickhouse.tech/docs/en/operations/access-rights/
+[RBAC]: https://clickhouse.com/docs/en/operations/access-rights/
 [SRS]: #srs
-[Access Control and Account Management]: https://clickhouse.tech/docs/en/operations/access-rights/
+[Access Control and Account Management]: https://clickhouse.com/docs/en/operations/access-rights/
 [SRS-009 ClickHouse LDAP External User Directory]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/external_user_directory/requirements/requirements.md
 [SRS-007 ClickHouse Authentication of Users via LDAP]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/authentication/requirements/requirements.md
 [LDAP]: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/ldap/role_mapping/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/ldap/role_mapping/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml b/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml
index e5077af3f49..6d73908cf1e 100644
--- a/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/map_type/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/log.log</log>
@@ -13,4 +13,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml b/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml
index b7d02ceeec1..ea292b045e5 100644
--- a/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/map_type/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -39,4 +39,4 @@
             </shard>
         </sharded_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/map_type/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse/config.xml b/tests/testflows/map_type/configs/clickhouse/config.xml
index 4ec12232539..842a0573d49 100644
--- a/tests/testflows/map_type/configs/clickhouse/config.xml
+++ b/tests/testflows/map_type/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -170,7 +170,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="clickhouse_remote_servers" >
         <!-- Test only shard config for testing distributed storage -->
@@ -224,20 +224,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper-servers" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -297,7 +297,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -329,13 +329,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -347,7 +347,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -358,7 +358,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -445,4 +445,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse/users.xml b/tests/testflows/map_type/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/map_type/configs/clickhouse/users.xml
+++ b/tests/testflows/map_type/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/map_type/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/map_type/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml b/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/map_type/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/map_type/map_type_env/clickhouse-service.yml b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100755
--- a/tests/testflows/map_type/map_type_env/clickhouse-service.yml
+++ b/tests/testflows/map_type/map_type_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/map_type/requirements/requirements.md b/tests/testflows/map_type/requirements/requirements.md
index f19f5a7f7bd..ebaebc291fb 100644
--- a/tests/testflows/map_type/requirements/requirements.md
+++ b/tests/testflows/map_type/requirements/requirements.md
@@ -495,17 +495,17 @@ For example,
 SELECT mapValues(a) from table_map;
 ```
 
-[Nested]: https://clickhouse.tech/docs/en/sql-reference/data-types/nested-data-structures/nested/
-[length]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#array_functions-length
-[empty]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#function-empty
-[notEmpty]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#function-notempty
-[CAST]: https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast
-[Tuple]: https://clickhouse.tech/docs/en/sql-reference/data-types/tuple/
-[Tuple(Array,Array)]: https://clickhouse.tech/docs/en/sql-reference/data-types/tuple/
-[Array]: https://clickhouse.tech/docs/en/sql-reference/data-types/array/ 
-[String]: https://clickhouse.tech/docs/en/sql-reference/data-types/string/
-[Integer]: https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/
-[ClickHouse]: https://clickhouse.tech
+[Nested]: https://clickhouse.com/docs/en/sql-reference/data-types/nested-data-structures/nested/
+[length]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#array_functions-length
+[empty]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#function-empty
+[notEmpty]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#function-notempty
+[CAST]: https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast
+[Tuple]: https://clickhouse.com/docs/en/sql-reference/data-types/tuple/
+[Tuple(Array,Array)]: https://clickhouse.com/docs/en/sql-reference/data-types/tuple/
+[Array]: https://clickhouse.com/docs/en/sql-reference/data-types/array/ 
+[String]: https://clickhouse.com/docs/en/sql-reference/data-types/string/
+[Integer]: https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/map_type/requirements/requirements.md 
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/map_type/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/map_type/requirements/requirements.py b/tests/testflows/map_type/requirements/requirements.py
index 24e8abdf15f..7569f7cc177 100644
--- a/tests/testflows/map_type/requirements/requirements.py
+++ b/tests/testflows/map_type/requirements/requirements.py
@@ -770,17 +770,17 @@ RQ_SRS_018_ClickHouse_Map_DataType_Functions_MapValues = Requirement(
         'SELECT mapValues(a) from table_map;\n'
         '```\n'
         '\n'
-        '[Nested]: https://clickhouse.tech/docs/en/sql-reference/data-types/nested-data-structures/nested/\n'
-        '[length]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#array_functions-length\n'
-        '[empty]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#function-empty\n'
-        '[notEmpty]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#function-notempty\n'
-        '[CAST]: https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast\n'
-        '[Tuple]: https://clickhouse.tech/docs/en/sql-reference/data-types/tuple/\n'
-        '[Tuple(Array,Array)]: https://clickhouse.tech/docs/en/sql-reference/data-types/tuple/\n'
-        '[Array]: https://clickhouse.tech/docs/en/sql-reference/data-types/array/ \n'
-        '[String]: https://clickhouse.tech/docs/en/sql-reference/data-types/string/\n'
-        '[Integer]: https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/\n'
-        '[ClickHouse]: https://clickhouse.tech\n'
+        '[Nested]: https://clickhouse.com/docs/en/sql-reference/data-types/nested-data-structures/nested/\n'
+        '[length]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#array_functions-length\n'
+        '[empty]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#function-empty\n'
+        '[notEmpty]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#function-notempty\n'
+        '[CAST]: https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast\n'
+        '[Tuple]: https://clickhouse.com/docs/en/sql-reference/data-types/tuple/\n'
+        '[Tuple(Array,Array)]: https://clickhouse.com/docs/en/sql-reference/data-types/tuple/\n'
+        '[Array]: https://clickhouse.com/docs/en/sql-reference/data-types/array/ \n'
+        '[String]: https://clickhouse.com/docs/en/sql-reference/data-types/string/\n'
+        '[Integer]: https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/\n'
+        '[ClickHouse]: https://clickhouse.com\n'
         '[GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/map_type/requirements/requirements.md \n'
         '[Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/map_type/requirements/requirements.md\n'
         '[Git]: https://git-scm.com/\n'
@@ -1409,17 +1409,17 @@ For example,
 SELECT mapValues(a) from table_map;
 ```
 
-[Nested]: https://clickhouse.tech/docs/en/sql-reference/data-types/nested-data-structures/nested/
-[length]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#array_functions-length
-[empty]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#function-empty
-[notEmpty]: https://clickhouse.tech/docs/en/sql-reference/functions/array-functions/#function-notempty
-[CAST]: https://clickhouse.tech/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast
-[Tuple]: https://clickhouse.tech/docs/en/sql-reference/data-types/tuple/
-[Tuple(Array,Array)]: https://clickhouse.tech/docs/en/sql-reference/data-types/tuple/
-[Array]: https://clickhouse.tech/docs/en/sql-reference/data-types/array/ 
-[String]: https://clickhouse.tech/docs/en/sql-reference/data-types/string/
-[Integer]: https://clickhouse.tech/docs/en/sql-reference/data-types/int-uint/
-[ClickHouse]: https://clickhouse.tech
+[Nested]: https://clickhouse.com/docs/en/sql-reference/data-types/nested-data-structures/nested/
+[length]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#array_functions-length
+[empty]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#function-empty
+[notEmpty]: https://clickhouse.com/docs/en/sql-reference/functions/array-functions/#function-notempty
+[CAST]: https://clickhouse.com/docs/en/sql-reference/functions/type-conversion-functions/#type_conversion_function-cast
+[Tuple]: https://clickhouse.com/docs/en/sql-reference/data-types/tuple/
+[Tuple(Array,Array)]: https://clickhouse.com/docs/en/sql-reference/data-types/tuple/
+[Array]: https://clickhouse.com/docs/en/sql-reference/data-types/array/ 
+[String]: https://clickhouse.com/docs/en/sql-reference/data-types/string/
+[Integer]: https://clickhouse.com/docs/en/sql-reference/data-types/int-uint/
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/map_type/requirements/requirements.md 
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/map_type/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/rbac/configs/clickhouse/common.xml b/tests/testflows/rbac/configs/clickhouse/common.xml
index 567c8c05e32..0ba01589b90 100644
--- a/tests/testflows/rbac/configs/clickhouse/common.xml
+++ b/tests/testflows/rbac/configs/clickhouse/common.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <timezone>Europe/Moscow</timezone>
     <listen_host replace="replace">::</listen_host>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/config.d/logs.xml b/tests/testflows/rbac/configs/clickhouse/config.d/logs.xml
index bdf1bbc11c1..2ee8bb55f38 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <shutdown_wait_unfinished>3</shutdown_wait_unfinished>
     <logger>
         <level>trace</level>
@@ -14,4 +14,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/config.d/ports.xml b/tests/testflows/rbac/configs/clickhouse/config.d/ports.xml
index fbc6cea74c0..1e061e2252e 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.d/ports.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.d/ports.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <https_port>8443</https_port>
     <tcp_port_secure>9440</tcp_port_secure>
-</yandex>
\ No newline at end of file
+</clickhouse>
\ No newline at end of file
diff --git a/tests/testflows/rbac/configs/clickhouse/config.d/remote.xml b/tests/testflows/rbac/configs/clickhouse/config.d/remote.xml
index a7ed0d6e2b4..dc1ec4e1d03 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -208,4 +208,4 @@
             </shard>
         </sharded_cluster_secure_long_usernames>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/config.d/ssl.xml b/tests/testflows/rbac/configs/clickhouse/config.d/ssl.xml
index 768d2250b79..1083c8d74a4 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.d/ssl.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.d/ssl.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <openSSL>
         <server>
             <certificateFile>/etc/clickhouse-server/ssl/server.crt</certificateFile>
@@ -15,4 +15,4 @@
             </invalidCertificateHandler>
         </client>
     </openSSL>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/config.d/storage.xml b/tests/testflows/rbac/configs/clickhouse/config.d/storage.xml
index 618fd6b6d24..0c53fd70593 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.d/storage.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.d/storage.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
 
 <storage_configuration>
     <disks>
@@ -17,4 +17,4 @@
     </policies>
 </storage_configuration>
 
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/rbac/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/config.xml b/tests/testflows/rbac/configs/clickhouse/config.xml
index 265bcd1882a..f71f14f4733 100644
--- a/tests/testflows/rbac/configs/clickhouse/config.xml
+++ b/tests/testflows/rbac/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -170,7 +170,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="clickhouse_remote_servers" >
         <!-- Test only shard config for testing distributed storage -->
@@ -224,20 +224,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper-servers" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -297,7 +297,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -328,14 +328,22 @@
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </query_thread_log>
 
+    <!-- Logs materialized and live views associated with a query -->
+    <query_views_log>
+        <database>system</database>
+        <table>query_views_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+    </query_views_log>
+
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -347,7 +355,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -358,7 +366,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -445,4 +453,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse/users.xml b/tests/testflows/rbac/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/rbac/configs/clickhouse/users.xml
+++ b/tests/testflows/rbac/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse1/config.d/macros.xml b/tests/testflows/rbac/configs/clickhouse1/config.d/macros.xml
index 6cdcc1b440c..c59a85cad8f 100644
--- a/tests/testflows/rbac/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/rbac/configs/clickhouse1/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
         <shard2>01</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse2/config.d/macros.xml b/tests/testflows/rbac/configs/clickhouse2/config.d/macros.xml
index a114a9ce4ab..1f880da0f65 100644
--- a/tests/testflows/rbac/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/rbac/configs/clickhouse2/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>01</shard>
         <shard2>02</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/configs/clickhouse3/config.d/macros.xml b/tests/testflows/rbac/configs/clickhouse3/config.d/macros.xml
index 904a27b0172..d2f1dbafa04 100644
--- a/tests/testflows/rbac/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/rbac/configs/clickhouse3/config.d/macros.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>01</shard>
         <shard2>03</shard2>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/rbac/rbac_env/clickhouse-service.yml b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
index 2d79443dcbb..ac52e3b83eb 100755
--- a/tests/testflows/rbac/rbac_env/clickhouse-service.yml
+++ b/tests/testflows/rbac/rbac_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/testflows/rbac/requirements/requirements.md b/tests/testflows/rbac/requirements/requirements.md
index 163417e1617..1c59f51fce4 100644
--- a/tests/testflows/rbac/requirements/requirements.md
+++ b/tests/testflows/rbac/requirements/requirements.md
@@ -2016,7 +2016,7 @@ version: 1.0
 [ClickHouse] SHALL support the `FORMAT` clause in the `SHOW QUOTAS` statement to define a format for the output quota list.
 
 The types of valid formats are many, listed in output column:
-https://clickhouse.tech/docs/en/interfaces/formats/
+https://clickhouse.com/docs/en/interfaces/formats/
 
 ##### RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings
 version: 1.0
@@ -2897,6 +2897,7 @@ version: 1.0
 * processes
 * query_log
 * query_thread_log
+* query_views_log
 * clusters
 * events
 * graphite_retentions
@@ -4503,14 +4504,14 @@ the user has that role with `ADMIN OPTION` privilege.
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/rbac/requirements/requirements.md
 * **Revision history:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/rbac/requirements/requirements.md
 * **Git:** https://git-scm.com/
 * **MySQL:** https://dev.mysql.com/doc/refman/8.0/en/account-management-statements.html
 * **PostgreSQL:** https://www.postgresql.org/docs/12/user-manag.html
 
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/rbac/requirements/requirements.md
 [Revision history]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/rbac/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/rbac/requirements/requirements.py b/tests/testflows/rbac/requirements/requirements.py
index 27f455d3fe6..d970ff629da 100755
--- a/tests/testflows/rbac/requirements/requirements.py
+++ b/tests/testflows/rbac/requirements/requirements.py
@@ -3267,7 +3267,7 @@ RQ_SRS_006_RBAC_Quota_ShowQuotas_Format = Requirement(
         '[ClickHouse] SHALL support the `FORMAT` clause in the `SHOW QUOTAS` statement to define a format for the output quota list.\n'
         '\n'
         'The types of valid formats are many, listed in output column:\n'
-        'https://clickhouse.tech/docs/en/interfaces/formats/\n'
+        'https://clickhouse.com/docs/en/interfaces/formats/\n'
         '\n'
         ),
     link=None,
@@ -5350,6 +5350,7 @@ RQ_SRS_006_RBAC_Table_SensitiveTables = Requirement(
         '* processes\n'
         '* query_log\n'
         '* query_thread_log\n'
+        '* query_views_log\n'
         '* clusters\n'
         '* events\n'
         '* graphite_retentions\n'
@@ -8854,11 +8855,11 @@ RQ_SRS_006_RBAC_Privileges_AdminOption = Requirement(
     num='5.40')
 
 SRS_006_ClickHouse_Role_Based_Access_Control = Specification(
-    name='SRS-006 ClickHouse Role Based Access Control', 
+    name='SRS-006 ClickHouse Role Based Access Control',
     description=None,
     author=None,
-    date=None, 
-    status=None, 
+    date=None,
+    status=None,
     approved_by=None,
     approved_date=None,
     approved_version=None,
@@ -11996,7 +11997,7 @@ version: 1.0
 [ClickHouse] SHALL support the `FORMAT` clause in the `SHOW QUOTAS` statement to define a format for the output quota list.
 
 The types of valid formats are many, listed in output column:
-https://clickhouse.tech/docs/en/interfaces/formats/
+https://clickhouse.com/docs/en/interfaces/formats/
 
 ##### RQ.SRS-006.RBAC.Quota.ShowQuotas.Settings
 version: 1.0
@@ -12877,6 +12878,7 @@ version: 1.0
 * processes
 * query_log
 * query_thread_log
+* query_views_log
 * clusters
 * events
 * graphite_retentions
@@ -14483,14 +14485,14 @@ the user has that role with `ADMIN OPTION` privilege.
 
 ## References
 
-* **ClickHouse:** https://clickhouse.tech
+* **ClickHouse:** https://clickhouse.com
 * **GitHub repository:** https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/rbac/requirements/requirements.md
 * **Revision history:** https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/rbac/requirements/requirements.md
 * **Git:** https://git-scm.com/
 * **MySQL:** https://dev.mysql.com/doc/refman/8.0/en/account-management-statements.html
 * **PostgreSQL:** https://www.postgresql.org/docs/12/user-manag.html
 
-[ClickHouse]: https://clickhouse.tech
+[ClickHouse]: https://clickhouse.com
 [GitHub repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/rbac/requirements/requirements.md
 [Revision history]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/rbac/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/rbac/tests/privileges/public_tables.py b/tests/testflows/rbac/tests/privileges/public_tables.py
index ed17c1a77ea..52232022ed6 100755
--- a/tests/testflows/rbac/tests/privileges/public_tables.py
+++ b/tests/testflows/rbac/tests/privileges/public_tables.py
@@ -58,6 +58,10 @@ def sensitive_tables(self, node=None):
             output = node.query("SELECT count(*) FROM system.query_thread_log", settings = [("user",user_name)]).output
             assert output == 0, error()
 
+        with And("I select from query_views_log"):
+            output = node.query("SELECT count(*) FROM system.query_views_log", settings = [("user",user_name)]).output
+            assert output == 0, error()
+
         with And("I select from clusters"):
             output = node.query("SELECT count(*) FROM system.clusters", settings = [("user",user_name)]).output
             assert output == 0, error()
diff --git a/tests/testflows/regression.py b/tests/testflows/regression.py
index ba2ea3b111c..bae1c5db90a 100755
--- a/tests/testflows/regression.py
+++ b/tests/testflows/regression.py
@@ -22,7 +22,7 @@ def regression(self, local, clickhouse_binary_path, stress=None):
             # run_scenario(pool, tasks, Feature(test=load("ldap.regression", "regression")), args)
             # run_scenario(pool, tasks, Feature(test=load("rbac.regression", "regression")), args)
             Feature(test=load("aes_encryption.regression", "regression"), parallel=True, executor=pool)(**args)
-            Feature(test=load("map_type.regression", "regression"), parallel=True, executor=pool)(**args)
+            # Feature(test=load("map_type.regression", "regression"), parallel=True, executor=pool)(**args)
             Feature(test=load("window_functions.regression", "regression"), parallel=True, executor=pool)(**args)
             Feature(test=load("datetime64_extended_range.regression", "regression"), parallel=True, executor=pool)(**args)
             Feature(test=load("kerberos.regression", "regression"), parallel=True, executor=pool)(**args)
diff --git a/tests/testflows/runner b/tests/testflows/runner
index 772a4d01a84..0208512762c 100755
--- a/tests/testflows/runner
+++ b/tests/testflows/runner
@@ -14,7 +14,7 @@ DEFAULT_CLICKHOUSE_ROOT = os.path.abspath(os.path.join(CUR_FILE_DIR, "../../"))
 CURRENT_WORK_DIR = os.getcwd()
 CONTAINER_NAME = "clickhouse_testflows_tests"
 
-DIND_TESTFLOWS_TESTS_IMAGE_NAME = "yandex/clickhouse-testflows-runner"
+DIND_TESTFLOWS_TESTS_IMAGE_NAME = "clickhouse/testflows-runner"
 
 def check_args_and_update_paths(args):
     if not os.path.isabs(args.binary):
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml
index e5077af3f49..6d73908cf1e 100644
--- a/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml
+++ b/tests/testflows/window_functions/configs/clickhouse/config.d/logs.xml
@@ -1,4 +1,4 @@
-<yandex>
+<clickhouse>
     <logger>
         <level>trace</level>
         <log>/var/log/clickhouse-server/log.log</log>
@@ -13,4 +13,4 @@
         <table>part_log</table>
         <flush_interval_milliseconds>500</flush_interval_milliseconds>
     </part_log>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml
index b7d02ceeec1..ea292b045e5 100644
--- a/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml
+++ b/tests/testflows/window_functions/configs/clickhouse/config.d/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <remote_servers>
         <replicated_cluster>
             <shard>
@@ -39,4 +39,4 @@
             </shard>
         </sharded_cluster>
     </remote_servers>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml b/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml
index 96270e7b645..1d5c0b6cb8b 100644
--- a/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml
+++ b/tests/testflows/window_functions/configs/clickhouse/config.d/zookeeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <zookeeper>
 	    <node index="1">
 		    <host>zookeeper</host>
@@ -7,4 +7,4 @@
 	    </node>
         <session_timeout_ms>15000</session_timeout_ms>
     </zookeeper>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse/config.xml b/tests/testflows/window_functions/configs/clickhouse/config.xml
index 4ec12232539..842a0573d49 100644
--- a/tests/testflows/window_functions/configs/clickhouse/config.xml
+++ b/tests/testflows/window_functions/configs/clickhouse/config.xml
@@ -2,7 +2,7 @@
 <!--
   NOTE: User and query level settings are set up in "users.xml" file.
 -->
-<yandex>
+<clickhouse>
     <logger>
         <!-- Possible levels: https://github.com/pocoproject/poco/blob/develop/Foundation/include/Poco/Logger.h#L105 -->
         <level>trace</level>
@@ -170,7 +170,7 @@
     <mlock_executable>false</mlock_executable>
 
     <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.yandex/docs/en/table_engines/distributed/
+         https://clickhouse.com/docs/en/table_engines/distributed/
       -->
     <remote_servers incl="clickhouse_remote_servers" >
         <!-- Test only shard config for testing distributed storage -->
@@ -224,20 +224,20 @@
 
     <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
          By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /yandex/name_of_substitution elements in that file.
+         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
       -->
 
     <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
          Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/
+         See https://clickhouse.com/docs/en/table_engines/replication/
       -->
     <zookeeper incl="zookeeper-servers" optional="true" />
 
     <!-- Substitutions for parameters of replicated tables.
           Optional. If you don't use replicated tables, you could omit that.
 
-         See https://clickhouse.yandex/docs/en/table_engines/replication/#creating-replicated-tables
+         See https://clickhouse.com/docs/en/table_engines/replication/#creating-replicated-tables
       -->
     <macros incl="macros" optional="true" />
 
@@ -297,7 +297,7 @@
         <database>system</database>
         <table>query_log</table>
         <!--
-            PARTITION BY expr https://clickhouse.yandex/docs/en/table_engines/custom_partitioning_key/
+            PARTITION BY expr https://clickhouse.com/docs/en/table_engines/custom_partitioning_key/
             Example:
                 event_date
                 toMonday(event_date)
@@ -329,13 +329,13 @@
     </query_thread_log>
 
     <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
+         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
     <part_log>
         <database>system</database>
         <table>part_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
     </part_log>
-    -->
 
     <!-- Uncomment to write text log into table.
          Text log contains all information from usual server log but stores it in structured and efficient way.
@@ -347,7 +347,7 @@
     -->
 
     <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.yandex/docs/en/dicts/internal_dicts/
+         See https://clickhouse.com/docs/en/dicts/internal_dicts/
     -->
 
     <!-- Path to file with region hierarchy. -->
@@ -358,7 +358,7 @@
 
 
     <!-- Configuration of external dictionaries. See:
-         https://clickhouse.yandex/docs/en/dicts/external_dicts/
+         https://clickhouse.com/docs/en/dicts/external_dicts/
     -->
     <dictionaries_config>*_dictionary.xml</dictionaries_config>
 
@@ -445,4 +445,4 @@
 
     <!-- Uncomment to disable ClickHouse internal DNS caching. -->
     <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse/users.xml b/tests/testflows/window_functions/configs/clickhouse/users.xml
index 86b2cd9e1e3..c7d0ecae693 100644
--- a/tests/testflows/window_functions/configs/clickhouse/users.xml
+++ b/tests/testflows/window_functions/configs/clickhouse/users.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <!-- Profiles of settings. -->
     <profiles>
         <!-- Default settings. -->
@@ -130,4 +130,4 @@
             </interval>
         </default>
     </quotas>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml
index 42256946311..19372adede4 100644
--- a/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml
+++ b/tests/testflows/window_functions/configs/clickhouse1/config.d/macros.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse1</replica>
         <shard>01</shard>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml
index a0c7042f04e..82580bb69f5 100644
--- a/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml
+++ b/tests/testflows/window_functions/configs/clickhouse2/config.d/macros.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse2</replica>
         <shard>02</shard>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml b/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml
index f0afc7d307d..923e0e8abb7 100644
--- a/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml
+++ b/tests/testflows/window_functions/configs/clickhouse3/config.d/macros.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<yandex>
+<clickhouse>
     <macros>
         <replica>clickhouse3</replica>
         <shard>03</shard>
     </macros>
-</yandex>
+</clickhouse>
diff --git a/tests/testflows/window_functions/requirements/requirements.md b/tests/testflows/window_functions/requirements/requirements.md
index d8bfbe30ead..1079e7f8e91 100644
--- a/tests/testflows/window_functions/requirements/requirements.md
+++ b/tests/testflows/window_functions/requirements/requirements.md
@@ -235,7 +235,7 @@ table engines such as `MergeTree`.
 version: 1.0
 
 [ClickHouse] SHALL support correct operation of [window functions] on
-[Distributed](https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/) table engine.
+[Distributed](https://clickhouse.com/docs/en/engines/table-engines/special/distributed/) table engine.
 
 ### Window Specification
 
@@ -2230,72 +2230,72 @@ version: 1.0
 
 [ClickHouse] SHALL support using aggregate functions over windows.
 
-* [count](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/count/)
-* [min](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/min/)
-* [max](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/max/)
-* [sum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sum/)
-* [avg](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/)
-* [any](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/any/)
-* [stddevPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevpop/)
-* [stddevSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/)
-* [varPop(x)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varpop/)
-* [varSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varsamp/)
-* [covarPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarpop/)
-* [covarSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarsamp/)
-* [anyHeavy](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anyheavy/)
-* [anyLast](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anylast/)
-* [argMin](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmin/)
-* [argMax](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmax/)
-* [avgWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avgweighted/)
-* [corr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/corr/)
-* [topK](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topk/)
-* [topKWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topkweighted/)
-* [groupArray](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparray/)
-* [groupUniqArray](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/)
-* [groupArrayInsertAt](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/)
-* [groupArrayMovingSum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/)
-* [groupArrayMovingAvg](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/)
-* [groupArraySample](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraysample/)
-* [groupBitAnd](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitand/)
-* [groupBitOr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitor/)
-* [groupBitXor](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/)
-* [groupBitmap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/)
-* [groupBitmapAnd](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapand/)
-* [groupBitmapOr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor/)
-* [groupBitmapXor](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor/)
-* [sumWithOverflow](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/)
-* [deltaSum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/deltasum/)
-* [sumMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/summap/)
-* [minMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/minmap/)
-* [maxMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/maxmap/)
-* [initializeAggregation](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation/)
-* [skewPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewpop/)
-* [skewSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewsamp/)
-* [kurtPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtpop/)
-* [kurtSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/)
-* [uniq](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniq/)
-* [uniqExact](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqexact/)
-* [uniqCombined](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/)
-* [uniqCombined64](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/)
-* [uniqHLL12](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/)
-* [quantile](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantile/)
-* [quantiles](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiles/)
-* [quantileExact](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexact/)
-* [quantileExactWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/)
-* [quantileTiming](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/)
-* [quantileTimingWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted/)
-* [quantileDeterministic](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic/)
-* [quantileTDigest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest/)
-* [quantileTDigestWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted/)
-* [simpleLinearRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/)
-* [stochasticLinearRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/)
-* [stochasticLogisticRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
-* [categoricalInformationValue](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
-* [studentTTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/studentttest/)
-* [welchTTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/welchttest/)
-* [mannWhitneyUTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/)
-* [median](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/median/)
-* [rankCorr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/rankCorr/)
+* [count](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/count/)
+* [min](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/min/)
+* [max](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/max/)
+* [sum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/sum/)
+* [avg](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avg/)
+* [any](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/any/)
+* [stddevPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stddevpop/)
+* [stddevSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/)
+* [varPop(x)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/varpop/)
+* [varSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/varsamp/)
+* [covarPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/covarpop/)
+* [covarSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/covarsamp/)
+* [anyHeavy](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/anyheavy/)
+* [anyLast](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/anylast/)
+* [argMin](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/argmin/)
+* [argMax](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/argmax/)
+* [avgWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avgweighted/)
+* [corr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/corr/)
+* [topK](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/topk/)
+* [topKWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/topkweighted/)
+* [groupArray](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparray/)
+* [groupUniqArray](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/)
+* [groupArrayInsertAt](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/)
+* [groupArrayMovingSum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/)
+* [groupArrayMovingAvg](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/)
+* [groupArraySample](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraysample/)
+* [groupBitAnd](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitand/)
+* [groupBitOr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitor/)
+* [groupBitXor](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/)
+* [groupBitmap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/)
+* [groupBitmapAnd](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapand/)
+* [groupBitmapOr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor/)
+* [groupBitmapXor](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor/)
+* [sumWithOverflow](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/)
+* [deltaSum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/deltasum/)
+* [sumMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/summap/)
+* [minMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/minmap/)
+* [maxMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/maxmap/)
+* [initializeAggregation](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation/)
+* [skewPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/skewpop/)
+* [skewSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/skewsamp/)
+* [kurtPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/kurtpop/)
+* [kurtSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/)
+* [uniq](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniq/)
+* [uniqExact](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqexact/)
+* [uniqCombined](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/)
+* [uniqCombined64](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/)
+* [uniqHLL12](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/)
+* [quantile](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantile/)
+* [quantiles](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiles/)
+* [quantileExact](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexact/)
+* [quantileExactWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/)
+* [quantileTiming](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/)
+* [quantileTimingWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted/)
+* [quantileDeterministic](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic/)
+* [quantileTDigest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest/)
+* [quantileTDigestWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted/)
+* [simpleLinearRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/)
+* [stochasticLinearRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/)
+* [stochasticLogisticRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
+* [categoricalInformationValue](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
+* [studentTTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/studentttest/)
+* [welchTTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/welchttest/)
+* [mannWhitneyUTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/)
+* [median](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/median/)
+* [rankCorr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/rankCorr/)
 
 ##### Combinators
 
@@ -2304,17 +2304,17 @@ version: 1.0
 
 [ClickHouse] SHALL support aggregate functions with combinator prefixes over windows.
 
-* [-If](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-if)
-* [-Array](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-array)
-* [-SimpleState](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-simplestate)
-* [-State](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-state)
-* [-Merge](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-merge)
-* [-MergeState](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-mergestate)
-* [-ForEach](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-foreach)
-* [-Distinct](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-distinct)
-* [-OrDefault](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ordefault)
-* [-OrNull](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ornull)
-* [-Resample](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-resample)
+* [-If](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-if)
+* [-Array](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-array)
+* [-SimpleState](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-simplestate)
+* [-State](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-state)
+* [-Merge](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-merge)
+* [-MergeState](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-mergestate)
+* [-ForEach](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-foreach)
+* [-Distinct](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-distinct)
+* [-OrDefault](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ordefault)
+* [-OrNull](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ornull)
+* [-Resample](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-resample)
 
 ##### Parametric
 
@@ -2323,13 +2323,13 @@ version: 1.0
 
 [ClickHouse] SHALL support parametric aggregate functions over windows.
 
-* [histogram](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#histogram)
-* [sequenceMatch(pattern)(timestamp, cond1, cond2, ...)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencematch)
-* [sequenceCount(pattern)(time, cond1, cond2, ...)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencecount)
-* [windowFunnel](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#windowfunnel)
-* [retention](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#retention)
-* [uniqUpTo(N)(x)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#uniquptonx)
-* [sumMapFiltered(keys_to_keep)(keys, values)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#summapfilteredkeys-to-keepkeys-values)
+* [histogram](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#histogram)
+* [sequenceMatch(pattern)(timestamp, cond1, cond2, ...)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencematch)
+* [sequenceCount(pattern)(time, cond1, cond2, ...)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencecount)
+* [windowFunnel](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#windowfunnel)
+* [retention](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#retention)
+* [uniqUpTo(N)(x)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#uniquptonx)
+* [sumMapFiltered(keys_to_keep)(keys, values)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#summapfilteredkeys-to-keepkeys-values)
 
 ## References
 
@@ -2348,8 +2348,8 @@ version: 1.0
 [partition_clause]: #partition-clause
 [order_clause]: #order-clause
 [frame_clause]: #frame-clause
-[window functions]: https://clickhouse.tech/docs/en/sql-reference/window-functions/
-[ClickHouse]: https://clickhouse.tech
+[window functions]: https://clickhouse.com/docs/en/sql-reference/window-functions/
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/window_functions/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/window_functions/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/window_functions/requirements/requirements.py b/tests/testflows/window_functions/requirements/requirements.py
index 9ed86380da2..e453b1728e1 100644
--- a/tests/testflows/window_functions/requirements/requirements.py
+++ b/tests/testflows/window_functions/requirements/requirements.py
@@ -49,7 +49,7 @@ RQ_SRS_019_ClickHouse_WindowFunctions_DistributedTables = Requirement(
     uid=None,
     description=(
         '[ClickHouse] SHALL support correct operation of [window functions] on\n'
-        '[Distributed](https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/) table engine.\n'
+        '[Distributed](https://clickhouse.com/docs/en/engines/table-engines/special/distributed/) table engine.\n'
         '\n'
         ),
     link=None,
@@ -3209,72 +3209,72 @@ RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions = Requirement(
     description=(
         '[ClickHouse] SHALL support using aggregate functions over windows.\n'
         '\n'
-        '* [count](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/count/)\n'
-        '* [min](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/min/)\n'
-        '* [max](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/max/)\n'
-        '* [sum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sum/)\n'
-        '* [avg](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/)\n'
-        '* [any](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/any/)\n'
-        '* [stddevPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevpop/)\n'
-        '* [stddevSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/)\n'
-        '* [varPop(x)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varpop/)\n'
-        '* [varSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varsamp/)\n'
-        '* [covarPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarpop/)\n'
-        '* [covarSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarsamp/)\n'
-        '* [anyHeavy](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anyheavy/)\n'
-        '* [anyLast](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anylast/)\n'
-        '* [argMin](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmin/)\n'
-        '* [argMax](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmax/)\n'
-        '* [avgWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avgweighted/)\n'
-        '* [corr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/corr/)\n'
-        '* [topK](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topk/)\n'
-        '* [topKWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topkweighted/)\n'
-        '* [groupArray](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparray/)\n'
-        '* [groupUniqArray](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/)\n'
-        '* [groupArrayInsertAt](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/)\n'
-        '* [groupArrayMovingSum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/)\n'
-        '* [groupArrayMovingAvg](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/)\n'
-        '* [groupArraySample](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraysample/)\n'
-        '* [groupBitAnd](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitand/)\n'
-        '* [groupBitOr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitor/)\n'
-        '* [groupBitXor](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/)\n'
-        '* [groupBitmap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/)\n'
-        '* [groupBitmapAnd](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapand/)\n'
-        '* [groupBitmapOr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor/)\n'
-        '* [groupBitmapXor](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor/)\n'
-        '* [sumWithOverflow](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/)\n'
-        '* [deltaSum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/deltasum/)\n'
-        '* [sumMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/summap/)\n'
-        '* [minMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/minmap/)\n'
-        '* [maxMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/maxmap/)\n'
-        '* [initializeAggregation](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation/)\n'
-        '* [skewPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewpop/)\n'
-        '* [skewSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewsamp/)\n'
-        '* [kurtPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtpop/)\n'
-        '* [kurtSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/)\n'
-        '* [uniq](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniq/)\n'
-        '* [uniqExact](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqexact/)\n'
-        '* [uniqCombined](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/)\n'
-        '* [uniqCombined64](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/)\n'
-        '* [uniqHLL12](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/)\n'
-        '* [quantile](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantile/)\n'
-        '* [quantiles](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiles/)\n'
-        '* [quantileExact](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexact/)\n'
-        '* [quantileExactWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/)\n'
-        '* [quantileTiming](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/)\n'
-        '* [quantileTimingWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted/)\n'
-        '* [quantileDeterministic](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic/)\n'
-        '* [quantileTDigest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest/)\n'
-        '* [quantileTDigestWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted/)\n'
-        '* [simpleLinearRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/)\n'
-        '* [stochasticLinearRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/)\n'
-        '* [stochasticLogisticRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)\n'
-        '* [categoricalInformationValue](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)\n'
-        '* [studentTTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/studentttest/)\n'
-        '* [welchTTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/welchttest/)\n'
-        '* [mannWhitneyUTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/)\n'
-        '* [median](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/median/)\n'
-        '* [rankCorr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/rankCorr/)\n'
+        '* [count](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/count/)\n'
+        '* [min](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/min/)\n'
+        '* [max](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/max/)\n'
+        '* [sum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/sum/)\n'
+        '* [avg](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avg/)\n'
+        '* [any](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/any/)\n'
+        '* [stddevPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stddevpop/)\n'
+        '* [stddevSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/)\n'
+        '* [varPop(x)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/varpop/)\n'
+        '* [varSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/varsamp/)\n'
+        '* [covarPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/covarpop/)\n'
+        '* [covarSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/covarsamp/)\n'
+        '* [anyHeavy](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/anyheavy/)\n'
+        '* [anyLast](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/anylast/)\n'
+        '* [argMin](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/argmin/)\n'
+        '* [argMax](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/argmax/)\n'
+        '* [avgWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avgweighted/)\n'
+        '* [corr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/corr/)\n'
+        '* [topK](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/topk/)\n'
+        '* [topKWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/topkweighted/)\n'
+        '* [groupArray](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparray/)\n'
+        '* [groupUniqArray](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/)\n'
+        '* [groupArrayInsertAt](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/)\n'
+        '* [groupArrayMovingSum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/)\n'
+        '* [groupArrayMovingAvg](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/)\n'
+        '* [groupArraySample](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraysample/)\n'
+        '* [groupBitAnd](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitand/)\n'
+        '* [groupBitOr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitor/)\n'
+        '* [groupBitXor](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/)\n'
+        '* [groupBitmap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/)\n'
+        '* [groupBitmapAnd](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapand/)\n'
+        '* [groupBitmapOr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor/)\n'
+        '* [groupBitmapXor](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor/)\n'
+        '* [sumWithOverflow](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/)\n'
+        '* [deltaSum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/deltasum/)\n'
+        '* [sumMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/summap/)\n'
+        '* [minMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/minmap/)\n'
+        '* [maxMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/maxmap/)\n'
+        '* [initializeAggregation](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation/)\n'
+        '* [skewPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/skewpop/)\n'
+        '* [skewSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/skewsamp/)\n'
+        '* [kurtPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/kurtpop/)\n'
+        '* [kurtSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/)\n'
+        '* [uniq](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniq/)\n'
+        '* [uniqExact](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqexact/)\n'
+        '* [uniqCombined](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/)\n'
+        '* [uniqCombined64](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/)\n'
+        '* [uniqHLL12](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/)\n'
+        '* [quantile](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantile/)\n'
+        '* [quantiles](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiles/)\n'
+        '* [quantileExact](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexact/)\n'
+        '* [quantileExactWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/)\n'
+        '* [quantileTiming](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/)\n'
+        '* [quantileTimingWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted/)\n'
+        '* [quantileDeterministic](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic/)\n'
+        '* [quantileTDigest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest/)\n'
+        '* [quantileTDigestWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted/)\n'
+        '* [simpleLinearRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/)\n'
+        '* [stochasticLinearRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/)\n'
+        '* [stochasticLogisticRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)\n'
+        '* [categoricalInformationValue](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)\n'
+        '* [studentTTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/studentttest/)\n'
+        '* [welchTTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/welchttest/)\n'
+        '* [mannWhitneyUTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/)\n'
+        '* [median](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/median/)\n'
+        '* [rankCorr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/rankCorr/)\n'
         '\n'
         ),
     link=None,
@@ -3291,17 +3291,17 @@ RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions_Combinators = Requireme
     description=(
         '[ClickHouse] SHALL support aggregate functions with combinator prefixes over windows.\n'
         '\n'
-        '* [-If](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-if)\n'
-        '* [-Array](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-array)\n'
-        '* [-SimpleState](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-simplestate)\n'
-        '* [-State](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-state)\n'
-        '* [-Merge](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-merge)\n'
-        '* [-MergeState](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-mergestate)\n'
-        '* [-ForEach](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-foreach)\n'
-        '* [-Distinct](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-distinct)\n'
-        '* [-OrDefault](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ordefault)\n'
-        '* [-OrNull](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ornull)\n'
-        '* [-Resample](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-resample)\n'
+        '* [-If](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-if)\n'
+        '* [-Array](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-array)\n'
+        '* [-SimpleState](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-simplestate)\n'
+        '* [-State](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-state)\n'
+        '* [-Merge](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-merge)\n'
+        '* [-MergeState](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-mergestate)\n'
+        '* [-ForEach](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-foreach)\n'
+        '* [-Distinct](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-distinct)\n'
+        '* [-OrDefault](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ordefault)\n'
+        '* [-OrNull](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ornull)\n'
+        '* [-Resample](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-resample)\n'
         '\n'
         ),
     link=None,
@@ -3318,13 +3318,13 @@ RQ_SRS_019_ClickHouse_WindowFunctions_AggregateFunctions_Parametric = Requiremen
     description=(
         '[ClickHouse] SHALL support parametric aggregate functions over windows.\n'
         '\n'
-        '* [histogram](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#histogram)\n'
-        '* [sequenceMatch(pattern)(timestamp, cond1, cond2, ...)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencematch)\n'
-        '* [sequenceCount(pattern)(time, cond1, cond2, ...)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencecount)\n'
-        '* [windowFunnel](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#windowfunnel)\n'
-        '* [retention](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#retention)\n'
-        '* [uniqUpTo(N)(x)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#uniquptonx)\n'
-        '* [sumMapFiltered(keys_to_keep)(keys, values)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#summapfilteredkeys-to-keepkeys-values)\n'
+        '* [histogram](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#histogram)\n'
+        '* [sequenceMatch(pattern)(timestamp, cond1, cond2, ...)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencematch)\n'
+        '* [sequenceCount(pattern)(time, cond1, cond2, ...)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencecount)\n'
+        '* [windowFunnel](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#windowfunnel)\n'
+        '* [retention](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#retention)\n'
+        '* [uniqUpTo(N)(x)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#uniquptonx)\n'
+        '* [sumMapFiltered(keys_to_keep)(keys, values)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#summapfilteredkeys-to-keepkeys-values)\n'
         '\n'
         ),
     link=None,
@@ -3916,7 +3916,7 @@ table engines such as `MergeTree`.
 version: 1.0
 
 [ClickHouse] SHALL support correct operation of [window functions] on
-[Distributed](https://clickhouse.tech/docs/en/engines/table-engines/special/distributed/) table engine.
+[Distributed](https://clickhouse.com/docs/en/engines/table-engines/special/distributed/) table engine.
 
 ### Window Specification
 
@@ -5911,72 +5911,72 @@ version: 1.0
 
 [ClickHouse] SHALL support using aggregate functions over windows.
 
-* [count](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/count/)
-* [min](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/min/)
-* [max](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/max/)
-* [sum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sum/)
-* [avg](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avg/)
-* [any](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/any/)
-* [stddevPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevpop/)
-* [stddevSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/)
-* [varPop(x)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varpop/)
-* [varSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/varsamp/)
-* [covarPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarpop/)
-* [covarSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/covarsamp/)
-* [anyHeavy](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anyheavy/)
-* [anyLast](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/anylast/)
-* [argMin](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmin/)
-* [argMax](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/argmax/)
-* [avgWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/avgweighted/)
-* [corr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/corr/)
-* [topK](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topk/)
-* [topKWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/topkweighted/)
-* [groupArray](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparray/)
-* [groupUniqArray](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/)
-* [groupArrayInsertAt](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/)
-* [groupArrayMovingSum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/)
-* [groupArrayMovingAvg](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/)
-* [groupArraySample](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/grouparraysample/)
-* [groupBitAnd](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitand/)
-* [groupBitOr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitor/)
-* [groupBitXor](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/)
-* [groupBitmap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/)
-* [groupBitmapAnd](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapand/)
-* [groupBitmapOr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor/)
-* [groupBitmapXor](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor/)
-* [sumWithOverflow](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/)
-* [deltaSum](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/deltasum/)
-* [sumMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/summap/)
-* [minMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/minmap/)
-* [maxMap](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/maxmap/)
-* [initializeAggregation](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation/)
-* [skewPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewpop/)
-* [skewSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/skewsamp/)
-* [kurtPop](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtpop/)
-* [kurtSamp](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/)
-* [uniq](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniq/)
-* [uniqExact](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqexact/)
-* [uniqCombined](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/)
-* [uniqCombined64](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/)
-* [uniqHLL12](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/)
-* [quantile](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantile/)
-* [quantiles](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiles/)
-* [quantileExact](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexact/)
-* [quantileExactWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/)
-* [quantileTiming](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/)
-* [quantileTimingWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted/)
-* [quantileDeterministic](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic/)
-* [quantileTDigest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest/)
-* [quantileTDigestWeighted](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted/)
-* [simpleLinearRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/)
-* [stochasticLinearRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/)
-* [stochasticLogisticRegression](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
-* [categoricalInformationValue](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
-* [studentTTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/studentttest/)
-* [welchTTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/welchttest/)
-* [mannWhitneyUTest](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/)
-* [median](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/median/)
-* [rankCorr](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/reference/rankCorr/)
+* [count](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/count/)
+* [min](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/min/)
+* [max](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/max/)
+* [sum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/sum/)
+* [avg](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avg/)
+* [any](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/any/)
+* [stddevPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stddevpop/)
+* [stddevSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stddevsamp/)
+* [varPop(x)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/varpop/)
+* [varSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/varsamp/)
+* [covarPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/covarpop/)
+* [covarSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/covarsamp/)
+* [anyHeavy](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/anyheavy/)
+* [anyLast](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/anylast/)
+* [argMin](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/argmin/)
+* [argMax](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/argmax/)
+* [avgWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/avgweighted/)
+* [corr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/corr/)
+* [topK](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/topk/)
+* [topKWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/topkweighted/)
+* [groupArray](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparray/)
+* [groupUniqArray](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupuniqarray/)
+* [groupArrayInsertAt](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparrayinsertat/)
+* [groupArrayMovingSum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum/)
+* [groupArrayMovingAvg](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg/)
+* [groupArraySample](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/grouparraysample/)
+* [groupBitAnd](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitand/)
+* [groupBitOr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitor/)
+* [groupBitXor](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitxor/)
+* [groupBitmap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmap/)
+* [groupBitmapAnd](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapand/)
+* [groupBitmapOr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapor/)
+* [groupBitmapXor](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/groupbitmapxor/)
+* [sumWithOverflow](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/sumwithoverflow/)
+* [deltaSum](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/deltasum/)
+* [sumMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/summap/)
+* [minMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/minmap/)
+* [maxMap](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/maxmap/)
+* [initializeAggregation](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/initializeAggregation/)
+* [skewPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/skewpop/)
+* [skewSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/skewsamp/)
+* [kurtPop](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/kurtpop/)
+* [kurtSamp](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/kurtsamp/)
+* [uniq](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniq/)
+* [uniqExact](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqexact/)
+* [uniqCombined](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined/)
+* [uniqCombined64](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64/)
+* [uniqHLL12](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/uniqhll12/)
+* [quantile](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantile/)
+* [quantiles](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiles/)
+* [quantileExact](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexact/)
+* [quantileExactWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/)
+* [quantileTiming](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletiming/)
+* [quantileTimingWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletimingweighted/)
+* [quantileDeterministic](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiledeterministic/)
+* [quantileTDigest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletdigest/)
+* [quantileTDigestWeighted](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted/)
+* [simpleLinearRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression/)
+* [stochasticLinearRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression/)
+* [stochasticLogisticRegression](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
+* [categoricalInformationValue](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression/)
+* [studentTTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/studentttest/)
+* [welchTTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/welchttest/)
+* [mannWhitneyUTest](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/mannwhitneyutest/)
+* [median](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/median/)
+* [rankCorr](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/rankCorr/)
 
 ##### Combinators
 
@@ -5985,17 +5985,17 @@ version: 1.0
 
 [ClickHouse] SHALL support aggregate functions with combinator prefixes over windows.
 
-* [-If](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-if)
-* [-Array](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-array)
-* [-SimpleState](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-simplestate)
-* [-State](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-state)
-* [-Merge](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-merge)
-* [-MergeState](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-mergestate)
-* [-ForEach](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-foreach)
-* [-Distinct](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-distinct)
-* [-OrDefault](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ordefault)
-* [-OrNull](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ornull)
-* [-Resample](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-resample)
+* [-If](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-if)
+* [-Array](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-array)
+* [-SimpleState](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-simplestate)
+* [-State](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-state)
+* [-Merge](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-merge)
+* [-MergeState](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#aggregate_functions_combinators-mergestate)
+* [-ForEach](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-foreach)
+* [-Distinct](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-distinct)
+* [-OrDefault](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ordefault)
+* [-OrNull](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-ornull)
+* [-Resample](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/combinators/#agg-functions-combinator-resample)
 
 ##### Parametric
 
@@ -6004,13 +6004,13 @@ version: 1.0
 
 [ClickHouse] SHALL support parametric aggregate functions over windows.
 
-* [histogram](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#histogram)
-* [sequenceMatch(pattern)(timestamp, cond1, cond2, ...)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencematch)
-* [sequenceCount(pattern)(time, cond1, cond2, ...)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencecount)
-* [windowFunnel](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#windowfunnel)
-* [retention](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#retention)
-* [uniqUpTo(N)(x)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#uniquptonx)
-* [sumMapFiltered(keys_to_keep)(keys, values)](https://clickhouse.tech/docs/en/sql-reference/aggregate-functions/parametric-functions/#summapfilteredkeys-to-keepkeys-values)
+* [histogram](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#histogram)
+* [sequenceMatch(pattern)(timestamp, cond1, cond2, ...)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencematch)
+* [sequenceCount(pattern)(time, cond1, cond2, ...)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#function-sequencecount)
+* [windowFunnel](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#windowfunnel)
+* [retention](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#retention)
+* [uniqUpTo(N)(x)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#uniquptonx)
+* [sumMapFiltered(keys_to_keep)(keys, values)](https://clickhouse.com/docs/en/sql-reference/aggregate-functions/parametric-functions/#summapfilteredkeys-to-keepkeys-values)
 
 ## References
 
@@ -6029,8 +6029,8 @@ version: 1.0
 [partition_clause]: #partition-clause
 [order_clause]: #order-clause
 [frame_clause]: #frame-clause
-[window functions]: https://clickhouse.tech/docs/en/sql-reference/window-functions/
-[ClickHouse]: https://clickhouse.tech
+[window functions]: https://clickhouse.com/docs/en/sql-reference/window-functions/
+[ClickHouse]: https://clickhouse.com
 [GitHub Repository]: https://github.com/ClickHouse/ClickHouse/blob/master/tests/testflows/window_functions/requirements/requirements.md
 [Revision History]: https://github.com/ClickHouse/ClickHouse/commits/master/tests/testflows/window_functions/requirements/requirements.md
 [Git]: https://git-scm.com/
diff --git a/tests/testflows/window_functions/tests/common.py b/tests/testflows/window_functions/tests/common.py
index 3ed4f794ada..4f8b8081bf9 100644
--- a/tests/testflows/window_functions/tests/common.py
+++ b/tests/testflows/window_functions/tests/common.py
@@ -33,7 +33,7 @@ def syntax_error():
     return (62, "Exception: Syntax error")
 
 def groups_frame_error():
-    return (48, "Exception: Window frame 'GROUPS' is not implemented")
+    return (48, "Exception: Window frame 'Groups' is not implemented")
 
 def getuid():
     if current().subtype == TestSubType.Example:
diff --git a/tests/testflows/window_functions/tests/feature.py b/tests/testflows/window_functions/tests/feature.py
index e9f137360b8..f6c565d116b 100755
--- a/tests/testflows/window_functions/tests/feature.py
+++ b/tests/testflows/window_functions/tests/feature.py
@@ -17,7 +17,7 @@ def feature(self, distributed, node="clickhouse1"):
     self.context.distributed = distributed
     self.context.node = self.context.cluster.node(node)
 
-    with And("employee salary table"):
+    with Given("employee salary table"):
         empsalary_table(distributed=distributed)
 
     with And("tenk1 table"):
diff --git a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
index fdd4a8057a9..afb31f77c94 100755
--- a/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
+++ b/tests/testflows/window_functions/window_functions_env/clickhouse-service.yml
@@ -2,7 +2,7 @@ version: '2.3'
 
 services:
   clickhouse:
-    image: yandex/clickhouse-integration-test
+    image: clickhouse/integration-test
     expose:
       - "9000"
       - "9009"
diff --git a/tests/users.d/access_management.xml b/tests/users.d/access_management.xml
deleted file mode 100644
index 7e799cb7b10..00000000000
--- a/tests/users.d/access_management.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<yandex>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</yandex>
diff --git a/tests/users.d/readonly.xml b/tests/users.d/readonly.xml
deleted file mode 120000
index 023bb5bf9f5..00000000000
--- a/tests/users.d/readonly.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../programs/server/users.d/readonly.xml
\ No newline at end of file
diff --git a/tests/users.xml b/tests/users.xml
deleted file mode 120000
index 32a83e5806f..00000000000
--- a/tests/users.xml
+++ /dev/null
@@ -1 +0,0 @@
-../programs/server/users.xml
\ No newline at end of file
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index a6bf2843e9a..8309b6bcb53 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -38,7 +38,7 @@ if (NOT DEFINED ENABLE_UTILS OR ENABLE_UTILS)
     endif ()
 
     # memcpy_jart.S contains position dependent code
-    if (NOT CMAKE_POSITION_INDEPENDENT_CODE AND NOT OS_DARWIN AND NOT OS_SUNOS AND NOT ARCH_AARCH64)
+    if (NOT CMAKE_POSITION_INDEPENDENT_CODE AND OS_LINUX AND ARCH_AMD64)
         add_subdirectory (memcpy-bench)
     endif ()
 endif ()
diff --git a/utils/antlr/ClickHouseLexer.g4 b/utils/antlr/ClickHouseLexer.g4
index 8a1debaf412..0c087bff68c 100644
--- a/utils/antlr/ClickHouseLexer.g4
+++ b/utils/antlr/ClickHouseLexer.g4
@@ -35,6 +35,7 @@ CONSTRAINT: C O N S T R A I N T;
 CREATE: C R E A T E;
 CROSS: C R O S S;
 CUBE: C U B E;
+CURRENT: C U R R E N T;
 DATABASE: D A T A B A S E;
 DATABASES: D A T A B A S E S;
 DATE: D A T E;
@@ -65,6 +66,7 @@ FETCHES: F E T C H E S;
 FINAL: F I N A L;
 FIRST: F I R S T;
 FLUSH: F L U S H;
+FOLLOWING: F O L L O W I N G;
 FOR: F O R;
 FORMAT: F O R M A T;
 FREEZE: F R E E Z E;
@@ -125,8 +127,10 @@ OR: O R;
 ORDER: O R D E R;
 OUTER: O U T E R;
 OUTFILE: O U T F I L E;
+OVER: O V E R;
 PARTITION: P A R T I T I O N;
 POPULATE: P O P U L A T E;
+PRECEDING: P R E C E D I N G;
 PREWHERE: P R E W H E R E;
 PRIMARY: P R I M A R Y;
 PROJECTION: P R O J E C T I O N;
@@ -140,6 +144,8 @@ REPLICA: R E P L I C A;
 REPLICATED: R E P L I C A T E D;
 RIGHT: R I G H T;
 ROLLUP: R O L L U P;
+ROW: R O W;
+ROWS: R O W S;
 SAMPLE: S A M P L E;
 SECOND: S E C O N D;
 SELECT: S E L E C T;
@@ -171,6 +177,7 @@ TRIM: T R I M;
 TRUNCATE: T R U N C A T E;
 TTL: T T L;
 TYPE: T Y P E;
+UNBOUNDED: U N B O U N D E D;
 UNION: U N I O N;
 UPDATE: U P D A T E;
 USE: U S E;
@@ -183,6 +190,7 @@ WATCH: W A T C H;
 WEEK: W E E K;
 WHEN: W H E N;
 WHERE: W H E R E;
+WINDOW: W I N D O W;
 WITH: W I T H;
 YEAR: Y E A R | Y Y Y Y;
 
diff --git a/utils/antlr/ClickHouseParser.g4 b/utils/antlr/ClickHouseParser.g4
index 28e5b1217ab..24db6478aa0 100644
--- a/utils/antlr/ClickHouseParser.g4
+++ b/utils/antlr/ClickHouseParser.g4
@@ -91,10 +91,10 @@ checkStmt: CHECK TABLE tableIdentifier partitionClause?;
 
 createStmt
     : (ATTACH | CREATE) DATABASE (IF NOT EXISTS)? databaseIdentifier clusterClause? engineExpr?                                                                                       # CreateDatabaseStmt
-    | (ATTACH | CREATE) DICTIONARY (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? dictionarySchemaClause dictionaryEngineClause                                          # CreateDictionaryStmt
+    | (ATTACH | CREATE (OR REPLACE)? | REPLACE) DICTIONARY (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? dictionarySchemaClause dictionaryEngineClause                                          # CreateDictionaryStmt
     | (ATTACH | CREATE) LIVE VIEW (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? (WITH TIMEOUT DECIMAL_LITERAL?)? destinationClause? tableSchemaClause? subqueryClause   # CreateLiveViewStmt
     | (ATTACH | CREATE) MATERIALIZED VIEW (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? tableSchemaClause? (destinationClause | engineClause POPULATE?) subqueryClause  # CreateMaterializedViewStmt
-    | (ATTACH | CREATE) TEMPORARY? TABLE (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? tableSchemaClause? engineClause? subqueryClause?                                 # CreateTableStmt
+    | (ATTACH | CREATE (OR REPLACE)? | REPLACE) TEMPORARY? TABLE (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? tableSchemaClause? engineClause? subqueryClause?                                 # CreateTableStmt
     | (ATTACH | CREATE) (OR REPLACE)? VIEW (IF NOT EXISTS)? tableIdentifier uuidClause? clusterClause? tableSchemaClause? subqueryClause                                              # CreateViewStmt
     ;
 
@@ -243,6 +243,7 @@ selectStmt:
     SELECT DISTINCT? topClause? columnExprList
     fromClause?
     arrayJoinClause?
+    windowClause?
     prewhereClause?
     whereClause?
     groupByClause? (WITH (CUBE | ROLLUP))? (WITH TOTALS)?
@@ -257,6 +258,7 @@ withClause: WITH columnExprList;
 topClause: TOP DECIMAL_LITERAL (WITH TIES)?;
 fromClause: FROM joinExpr;
 arrayJoinClause: (LEFT | INNER)? ARRAY JOIN columnExprList;
+windowClause: WINDOW identifier AS LPAREN windowExpr RPAREN;
 prewhereClause: PREWHERE columnExpr;
 whereClause: WHERE columnExpr;
 groupByClause: GROUP BY ((CUBE | ROLLUP) LPAREN columnExprList RPAREN | columnExprList);
@@ -298,6 +300,18 @@ ratioExpr: numberLiteral (SLASH numberLiteral)?;
 settingExprList: settingExpr (COMMA settingExpr)*;
 settingExpr: identifier EQ_SINGLE literal;
 
+windowExpr: winPartitionByClause? winOrderByClause? winFrameClause?;
+winPartitionByClause: PARTITION BY columnExprList;
+winOrderByClause: ORDER BY orderExprList;
+winFrameClause: (ROWS | RANGE) winFrameExtend;
+winFrameExtend
+    : winFrameBound                             # frameStart
+    | BETWEEN winFrameBound AND winFrameBound   # frameBetween
+    ;
+winFrameBound: (CURRENT ROW | UNBOUNDED PRECEDING | UNBOUNDED FOLLOWING | numberLiteral PRECEDING | numberLiteral FOLLOWING);
+//rangeClause: RANGE LPAREN (MIN identifier MAX identifier | MAX identifier MIN identifier) RPAREN;
+
+
 // SET statement
 
 setStmt: SET settingExprList;
@@ -364,6 +378,8 @@ columnExpr
     | SUBSTRING LPAREN columnExpr FROM columnExpr (FOR columnExpr)? RPAREN                # ColumnExprSubstring
     | TIMESTAMP STRING_LITERAL                                                            # ColumnExprTimestamp
     | TRIM LPAREN (BOTH | LEADING | TRAILING) STRING_LITERAL FROM columnExpr RPAREN       # ColumnExprTrim
+    | identifier (LPAREN columnExprList? RPAREN) OVER LPAREN windowExpr RPAREN            # ColumnExprWinFunction
+    | identifier (LPAREN columnExprList? RPAREN) OVER identifier                          # ColumnExprWinFunctionTarget
     | identifier (LPAREN columnExprList? RPAREN)? LPAREN DISTINCT? columnArgList? RPAREN  # ColumnExprFunction
     | literal                                                                             # ColumnExprLiteral
 
@@ -454,17 +470,17 @@ interval: SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR;
 keyword
     // except NULL_SQL, INF, NAN_SQL
     : AFTER | ALIAS | ALL | ALTER | AND | ANTI | ANY | ARRAY | AS | ASCENDING | ASOF | AST | ASYNC | ATTACH | BETWEEN | BOTH | BY | CASE
-    | CAST | CHECK | CLEAR | CLUSTER | CODEC | COLLATE | COLUMN | COMMENT | CONSTRAINT | CREATE | CROSS | CUBE | DATABASE | DATABASES
-    | DATE | DEDUPLICATE | DEFAULT | DELAY | DELETE | DESCRIBE | DESC | DESCENDING | DETACH | DICTIONARIES | DICTIONARY | DISK | DISTINCT
-    | DISTRIBUTED | DROP | ELSE | END | ENGINE | EVENTS | EXISTS | EXPLAIN | EXPRESSION | EXTRACT | FETCHES | FINAL | FIRST | FLUSH | FOR
-    | FORMAT | FREEZE | FROM | FULL | FUNCTION | GLOBAL | GRANULARITY | GROUP | HAVING | HIERARCHICAL | ID | IF | ILIKE | IN | INDEX
-    | INJECTIVE | INNER | INSERT | INTERVAL | INTO | IS | IS_OBJECT_ID | JOIN | JSON_FALSE | JSON_TRUE | KEY | KILL | LAST | LAYOUT
-    | LEADING | LEFT | LIFETIME | LIKE | LIMIT | LIVE | LOCAL | LOGS | MATERIALIZE | MATERIALIZED | MAX | MERGES | MIN | MODIFY | MOVE
-    | MUTATION | NO | NOT | NULLS | OFFSET | ON | OPTIMIZE | OR | ORDER | OUTER | OUTFILE | PARTITION | POPULATE | PREWHERE | PRIMARY
-    | RANGE | RELOAD | REMOVE | RENAME | REPLACE | REPLICA | REPLICATED | RIGHT | ROLLUP | SAMPLE | SELECT | SEMI | SENDS | SET | SETTINGS
-    | SHOW | SOURCE | START | STOP | SUBSTRING | SYNC | SYNTAX | SYSTEM | TABLE | TABLES | TEMPORARY | TEST | THEN | TIES | TIMEOUT
-    | TIMESTAMP | TOTALS | TRAILING | TRIM | TRUNCATE | TO | TOP | TTL | TYPE | UNION | UPDATE | USE | USING | UUID | VALUES | VIEW
-    | VOLUME | WATCH | WHEN | WHERE | WITH
+    | CAST | CHECK | CLEAR | CLUSTER | CODEC | COLLATE | COLUMN | COMMENT | CONSTRAINT | CREATE | CROSS | CUBE | CURRENT | DATABASE
+    | DATABASES | DATE | DEDUPLICATE | DEFAULT | DELAY | DELETE | DESCRIBE | DESC | DESCENDING | DETACH | DICTIONARIES | DICTIONARY | DISK
+    | DISTINCT | DISTRIBUTED | DROP | ELSE | END | ENGINE | EVENTS | EXISTS | EXPLAIN | EXPRESSION | EXTRACT | FETCHES | FINAL | FIRST
+    | FLUSH | FOR | FOLLOWING | FOR | FORMAT | FREEZE | FROM | FULL | FUNCTION | GLOBAL | GRANULARITY | GROUP | HAVING | HIERARCHICAL | ID
+    | IF | ILIKE | IN | INDEX | INJECTIVE | INNER | INSERT | INTERVAL | INTO | IS | IS_OBJECT_ID | JOIN | JSON_FALSE | JSON_TRUE | KEY
+    | KILL | LAST | LAYOUT | LEADING | LEFT | LIFETIME | LIKE | LIMIT | LIVE | LOCAL | LOGS | MATERIALIZE | MATERIALIZED | MAX | MERGES
+    | MIN | MODIFY | MOVE | MUTATION | NO | NOT | NULLS | OFFSET | ON | OPTIMIZE | OR | ORDER | OUTER | OUTFILE | OVER | PARTITION
+    | POPULATE | PRECEDING | PREWHERE | PRIMARY | RANGE | RELOAD | REMOVE | RENAME | REPLACE | REPLICA | REPLICATED | RIGHT | ROLLUP | ROW
+    | ROWS | SAMPLE | SELECT | SEMI | SENDS | SET | SETTINGS | SHOW | SOURCE | START | STOP | SUBSTRING | SYNC | SYNTAX | SYSTEM | TABLE
+    | TABLES | TEMPORARY | TEST | THEN | TIES | TIMEOUT | TIMESTAMP | TOTALS | TRAILING | TRIM | TRUNCATE | TO | TOP | TTL | TYPE
+    | UNBOUNDED | UNION | UPDATE | USE | USING | UUID | VALUES | VIEW | VOLUME | WATCH | WHEN | WHERE | WINDOW | WITH
     ;
 keywordForAlias
     : DATE | FIRST | ID | KEY
diff --git a/utils/build/build_debian.sh b/utils/build/build_debian.sh
index c6cfe6ce4b8..55cb593bf3c 100755
--- a/utils/build/build_debian.sh
+++ b/utils/build/build_debian.sh
@@ -3,7 +3,7 @@
 # How to build ClickHouse under debian-based systems (ubuntu)
 
 # apt install -y curl sudo
-# curl https://raw.githubusercontent.com/yandex/ClickHouse/master/utils/build/build_debian.sh | sh
+# curl https://raw.githubusercontent.com/clickhouse/ClickHouse/master/utils/build/build_debian.sh | sh
 
 # install compiler and libs
 sudo apt install -y git bash cmake ninja-build gcc-8 g++-8 libicu-dev libreadline-dev gperf
@@ -17,7 +17,7 @@ BASE_DIR=$(dirname $0) && [ -f "$BASE_DIR/../../CMakeLists.txt" ] && ROOT_DIR=$B
 
 if [ -z $ROOT_DIR ]; then
     # Checkout ClickHouse sources
-    git clone --recursive https://github.com/yandex/ClickHouse.git
+    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
     cd ClickHouse
 fi
 
diff --git a/utils/build/build_freebsd.sh b/utils/build/build_freebsd.sh
index b2bf7243f12..aea8772ff43 100755
--- a/utils/build/build_freebsd.sh
+++ b/utils/build/build_freebsd.sh
@@ -17,7 +17,7 @@
 
 
 # pkg install -y curl sudo
-# curl https://raw.githubusercontent.com/yandex/ClickHouse/master/utils/build/build_freebsd.sh | sh
+# curl https://raw.githubusercontent.com/clickhouse/ClickHouse/master/utils/build/build_freebsd.sh | sh
 
 #  install compiler and libs
 sudo pkg install devel/git devel/cmake devel/ninja shells/bash devel/icu devel/libltdl databases/unixODBC devel/google-perftools devel/libdouble-conversion archivers/zstd archivers/liblz4 devel/sparsehash devel/re2
@@ -32,7 +32,7 @@ BASE_DIR=$(dirname $0) && [ -f "$BASE_DIR/../../CMakeLists.txt" ] && ROOT_DIR=$B
 
 if [ -z $ROOT_DIR ]; then
     #  Checkout ClickHouse sources
-    git clone --recursive https://github.com/yandex/ClickHouse.git
+    git clone --recursive https://github.com/ClickHouse/ClickHouse.git
     cd ClickHouse
 fi
 
diff --git a/utils/build/build_macos.sh b/utils/build/build_macos.sh
index d27c8cf4367..9edaad828e2 100755
--- a/utils/build/build_macos.sh
+++ b/utils/build/build_macos.sh
@@ -26,7 +26,7 @@ BASE_DIR=$(dirname $0) && [ -f "$BASE_DIR/../../CMakeLists.txt" ] && ROOT_DIR=$B
 
 if [ -z $ROOT_DIR ]; then
     # Checkout ClickHouse sources
-    git clone -b stable --recursive https://github.com/yandex/ClickHouse.git
+    git clone -b stable --recursive https://github.com/ClickHouse/ClickHouse.git
     cd ClickHouse
 fi
 
@@ -50,4 +50,4 @@ cd ..
 
 
 ## Caveats
-#  If you intend to run clickhouse-server, make sure to increase system's maxfiles variable. See [MacOS.md](https://github.com/yandex/ClickHouse/blob/master/MacOS.md) for more details.
+#  If you intend to run clickhouse-server, make sure to increase system's maxfiles variable. See [MacOS.md](https://github.com/ClickHouse/ClickHouse/blob/master/MacOS.md) for more details.
diff --git a/utils/build/build_msvc2017.bat b/utils/build/build_msvc2017.bat
deleted file mode 100644
index 880802999ab..00000000000
--- a/utils/build/build_msvc2017.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-
-:: WINDOWS BUILD NOT SUPPORTED!
-:: Script only for development
-
-cd ../..
-git clone --recursive https://github.com/madler/zlib contrib/zlib
-md build
-cd build
-
-:: Stage 1: try build client
-cmake .. -G "Visual Studio 15 2017 Win64" -DENABLE_CLICKHOUSE_ALL=0 -DENABLE_CLICKHOUSE_CLIENT=1 > cmake.log
-cmake --build . --target clickhouse -- /m > build.log
-:: Stage 2: try build minimal server
-:: Stage 3: enable all possible features (ssl, ...)
diff --git a/utils/check-marks/main.cpp b/utils/check-marks/main.cpp
index e9e0bbf1134..36b81509046 100644
--- a/utils/check-marks/main.cpp
+++ b/utils/check-marks/main.cpp
@@ -10,6 +10,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/createReadBufferFromFileBase.h>
 #include <Compression/CompressedReadBufferFromFile.h>
 
 
@@ -19,7 +20,7 @@
 static void checkByCompressedReadBuffer(const std::string & mrk_path, const std::string & bin_path)
 {
     DB::ReadBufferFromFile mrk_in(mrk_path);
-    DB::CompressedReadBufferFromFile bin_in(bin_path, 0, 0, 0, nullptr);
+    DB::CompressedReadBufferFromFile bin_in(DB::createReadBufferFromFileBase(bin_path, /* settings= */ {}));
 
     DB::WriteBufferFromFileDescriptor out(STDOUT_FILENO);
     bool mrk2_format = boost::algorithm::ends_with(mrk_path, ".mrk2");
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 551368e5fd8..514f01ce4b9 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -70,7 +70,7 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.xml' |
     xargs xmllint --noout --nonet
 
 # FIXME: for now only clickhouse-test
-pylint --rcfile=$ROOT_PATH/.pylintrc --score=n $ROOT_PATH/tests/clickhouse-test
+pylint --rcfile=$ROOT_PATH/.pylintrc --persistent=no --score=n $ROOT_PATH/tests/clickhouse-test $ROOT_PATH/tests/ci/*.py
 
 find $ROOT_PATH -not -path $ROOT_PATH'/contrib*' \( -name '*.yaml' -or -name '*.yml' \) -type f |
     grep -vP $EXCLUDE_DIRS |
@@ -89,7 +89,7 @@ find $ROOT_PATH/tests/queries -iname '*fail*' |
 # Queries to system.query_log/system.query_thread_log should have current_database = currentDatabase() condition
 # NOTE: it is not that accuate, but at least something.
 tests_with_query_log=( $(
-    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' |
+    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' -or -iname '*.j2' |
         grep -vP $EXCLUDE_DIRS |
         xargs grep --with-filename -e system.query_log -e system.query_thread_log | cut -d: -f1 | sort -u
 ) )
@@ -99,13 +99,24 @@ for test_case in "${tests_with_query_log[@]}"; do
     } || echo "Queries to system.query_log/system.query_thread_log does not have current_database = currentDatabase() condition in $test_case"
 done
 
-# Queries to system.tables/system.parts/system.detached_parts/system.parts_columns/system.columns should have database = currentDatabase() condition
+# Queries to:
+tables_with_database_column=(
+    system.tables
+    system.parts
+    system.detached_parts
+    system.parts_columns
+    system.columns
+    system.projection_parts
+    system.mutations
+)
+# should have database = currentDatabase() condition
+#
 # NOTE: it is not that accuate, but at least something.
 tests_with_database_column=( $(
-    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' |
+    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' -or -iname '*.j2' |
         grep -vP $EXCLUDE_DIRS |
         grep -v -x -e $ROOT_PATH/tests/queries/query_test.py |
-        xargs grep --with-filename -e system.tables -e system.parts -e system.detached_parts -e system.parts_columns -e system.columns | cut -d: -f1 | sort -u
+        xargs grep --with-filename $(printf -- "-e %s " "${tables_with_database_column[@]}") | cut -d: -f1 | sort -u
 ) )
 for test_case in "${tests_with_database_column[@]}"; do
     grep -qE database.*currentDatabase "$test_case" || {
@@ -114,32 +125,28 @@ for test_case in "${tests_with_database_column[@]}"; do
         # explicit database
         grep -qE "database[ ]*=[ ]*'" "$test_case"
     } || {
-        echo "Queries to system.tables/system.parts/system.detached_parts/system.parts_columns/system.columns does not have database = currentDatabase()/\$CLICKHOUSE_DATABASE condition in $test_case"
+        echo "Queries to ${tables_with_database_column[*]} does not have database = currentDatabase()/\$CLICKHOUSE_DATABASE condition in $test_case"
     }
 done
 
 # Queries with ReplicatedMergeTree
 # NOTE: it is not that accuate, but at least something.
 tests_with_replicated_merge_tree=( $(
-    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' |
+    find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' -or -iname '*.j2' |
         grep -vP $EXCLUDE_DIRS |
         xargs grep --with-filename -e ReplicatedMergeTree | cut -d: -f1 | sort -u
 ) )
 for test_case in "${tests_with_replicated_merge_tree[@]}"; do
     case "$test_case" in
+        *.gen.*)
+            ;;
         *.sh)
             test_case_zk_prefix="\$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX"
-            grep -q -e "ReplicatedMergeTree.*$test_case_zk_prefix" "$test_case" || echo "ReplicatedMergeTree should contain '$test_case_zk_prefix' in zookeeper path to avoid overlaps ($test_case)"
+            grep -q -e "ReplicatedMergeTree[ ]*(.*$test_case_zk_prefix" "$test_case" || echo "ReplicatedMergeTree should contain '$test_case_zk_prefix' in zookeeper path to avoid overlaps ($test_case)"
             ;;
-        *.sql)
-            # NOTE: *.sql is not supported because it is not possible right now, because:
-            # - ReplicatedMergeTree supports only ASTLiteral for zookeeper path
-            #   (and adding support of other nodes, with evaluating them are not that easy, due to zk_prefix is "optional")
-            # - Hence concat(currentDatabase(), 'foo')
-            # - Also params cannot be used, because the are wrapped with CAST()
-            #
-            # But hopefully they will not be a problem
-            # (since they do not do any "stressing" and overlap probability should be lower).
+        *.sql|*.sql.j2)
+            test_case_zk_prefix="\({database}\|currentDatabase()\)"
+            grep -q -e "ReplicatedMergeTree[ ]*(.*$test_case_zk_prefix" "$test_case" || echo "ReplicatedMergeTree should contain '$test_case_zk_prefix' in zookeeper path to avoid overlaps ($test_case)"
             ;;
         *.py)
             # Right now there is not such tests anyway
@@ -155,38 +162,18 @@ find $ROOT_PATH -name '.gitmodules' | while read i; do grep -F 'url = ' $i | gre
 find $ROOT_PATH/{src,base,programs} -name '*.h' -or -name '*.cpp' 2>/dev/null | xargs grep -i -F 'General Public License' && echo "There shouldn't be any code snippets under GPL or LGPL"
 
 # There shouldn't be any docker containers outside docker directory
-find $ROOT_PATH -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*' -name Dockerfile -type f 2>/dev/null | xargs --no-run-if-empty -n1 echo "Please move Dockerfile to docker directory:"
+find $ROOT_PATH -not -path $ROOT_PATH'/tests/ci*' -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*' -name Dockerfile -type f 2>/dev/null | xargs --no-run-if-empty -n1 echo "Please move Dockerfile to docker directory:"
 
 # There shouldn't be any docker compose files outside docker directory
 #find $ROOT_PATH -not -path $ROOT_PATH'/tests/testflows*' -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*' -name '*compose*.yml' -type f 2>/dev/null | xargs --no-run-if-empty grep -l "version:" | xargs --no-run-if-empty -n1 echo "Please move docker compose to docker directory:"
 
-# Check that ya.make files are auto-generated
-"$ROOT_PATH"/utils/generate-ya-make/generate-ya-make.sh
-# FIXME: apparently sandbox (don't confuse it with docker) cloning sources
-# using some ancient git version, <2.8, that contains one bug for submodules
-# initialization [1]:
-#
-#    " * A partial rewrite of "git submodule" in the 2.7 timeframe changed
-#        the way the gitdir: pointer in the submodules point at the real
-#        repository location to use absolute paths by accident.  This has
-#        been corrected."
-#
-#  [1]: https://github.com/git/git/blob/cf11a67975b057a144618badf16dc4e3d25b9407/Documentation/RelNotes/2.8.3.txt#L33-L36
-#
-# Due to which "git status" will report the following error:
-#
-#     fatal: not a git repository: /place/sandbox-data/tasks/0/2/882869720/ClickHouse/.git/modules/contrib/AMQP-CPP
-#
-# Anyway this check does not requires any submodule traverse, so it is fine to ignore those errors.
-git status -uno 2> >(grep "fatal: not a git repository: /place/sandbox-data/tasks/.*/ClickHouse/\\.git/modules/contrib") | grep ya.make && echo "ya.make files should be generated with utils/generate-ya-make/generate-ya-make.sh"
-
 # Check that every header file has #pragma once in first line
 find $ROOT_PATH/{src,programs,utils} -name '*.h' |
     grep -vP $EXCLUDE_DIRS |
     while read file; do [[ $(head -n1 $file) != '#pragma once' ]] && echo "File $file must have '#pragma once' in first line"; done
 
 # Check for executable bit on non-executable files
-find $ROOT_PATH/{src,base,programs,utils,tests,docs,website,cmake} '(' -name '*.cpp' -or -name '*.h' -or -name '*.sql' -or -name '*.xml' -or -name '*.reference' -or -name '*.txt' -or -name '*.md' ')' -and -executable | grep -P '.' && echo "These files should not be executable."
+find $ROOT_PATH/{src,base,programs,utils,tests,docs,website,cmake} '(' -name '*.cpp' -or -name '*.h' -or -name '*.sql' -or -name '*.j2' -or -name '*.xml' -or -name '*.reference' -or -name '*.txt' -or -name '*.md' ')' -and -executable | grep -P '.' && echo "These files should not be executable."
 
 # Check for BOM
 find $ROOT_PATH/{src,base,programs,utils,tests,docs,website,cmake} -name '*.md' -or -name '*.cpp' -or -name '*.h' | xargs grep -l -F $'\xEF\xBB\xBF' | grep -P '.' && echo "Files should not have UTF-8 BOM"
@@ -208,6 +195,41 @@ find $ROOT_PATH/{src,programs,utils} -name '*.h' -or -name '*.cpp' |
     grep -vP $EXCLUDE_DIRS |
     xargs grep -P 'std::[io]?stringstream' | grep -v "STYLE_CHECK_ALLOW_STD_STRING_STREAM" && echo "Use WriteBufferFromOwnString or ReadBufferFromString instead of std::stringstream"
 
+# Forbid std::cerr/std::cout in src (fine in programs/utils)
+std_cerr_cout_excludes=(
+    /examples/
+    /tests/
+    _fuzzer
+    # OK
+    src/Common/ProgressIndication.cpp
+    # only under #ifdef DBMS_HASH_MAP_DEBUG_RESIZES, that is used only in tests
+    src/Common/HashTable/HashTable.h
+    # SensitiveDataMasker::printStats()
+    src/Common/SensitiveDataMasker.cpp
+    # StreamStatistics::print()
+    src/Compression/LZ4_decompress_faster.cpp
+    # ContextSharedPart with subsequent std::terminate()
+    src/Interpreters/Context.cpp
+    # IProcessor::dump()
+    src/Processors/IProcessor.cpp
+    src/Client/ClientBase.cpp
+    src/Client/QueryFuzzer.cpp
+    src/Client/Suggest.cpp
+)
+sources_with_std_cerr_cout=( $(
+    find $ROOT_PATH/src -name '*.h' -or -name '*.cpp' | \
+        grep -vP $EXCLUDE_DIRS | \
+        grep -F -v $(printf -- "-e %s " "${std_cerr_cout_excludes[@]}") | \
+        xargs grep -F --with-filename -e std::cerr -e std::cout | cut -d: -f1 | sort -u
+) )
+# Exclude comments
+for src in "${sources_with_std_cerr_cout[@]}"; do
+    # suppress stderr, since it may contain warning for #pargma once in headers
+    if gcc -fpreprocessed -dD -E "$src" 2>/dev/null | grep -F -q -e std::cerr -e std::cout; then
+        echo "$src: uses std::cerr/std::cout"
+    fi
+done
+
 # Conflict markers
 find $ROOT_PATH/{src,base,programs,utils,tests,docs,website,cmake} -name '*.md' -or -name '*.cpp' -or -name '*.h' |
     xargs grep -P '^(<<<<<<<|=======|>>>>>>>)$' | grep -P '.' && echo "Conflict markers are found in files"
@@ -215,3 +237,10 @@ find $ROOT_PATH/{src,base,programs,utils,tests,docs,website,cmake} -name '*.md'
 # Forbid subprocess.check_call(...) in integration tests because it does not provide enough information on errors
 find $ROOT_PATH'/tests/integration' -name '*.py' |
     xargs grep -F 'subprocess.check_call' | grep -v "STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL" && echo "Use helpers.cluster.run_and_check or subprocess.run instead of subprocess.check_call to print detailed info on error"
+
+# Forbid non-unique error codes
+if [[ "$(grep -Po "M\([0-9]*," $ROOT_PATH/src/Common/ErrorCodes.cpp | wc -l)" != "$(grep -Po "M\([0-9]*," $ROOT_PATH/src/Common/ErrorCodes.cpp | sort | uniq | wc -l)" ]]
+then
+    echo "ErrorCodes.cpp contains non-unique error codes"
+fi
+
diff --git a/utils/clickhouse-docker b/utils/clickhouse-docker
index 383a82e6d2c..cfe515f1de5 100755
--- a/utils/clickhouse-docker
+++ b/utils/clickhouse-docker
@@ -24,13 +24,13 @@ param="$1"
 if [ "${param}" = "list" ]
 then
     # https://stackoverflow.com/a/39454426/1555175
-    wget -nv https://registry.hub.docker.com/v1/repositories/yandex/clickhouse-server/tags -O -  | sed -e 's/[][]//g' -e 's/"//g' -e 's/ //g' | tr '}' '\n'  | awk -F: '{print $3}'
+    wget -nv https://registry.hub.docker.com/v1/repositories/clickhouse/clickhouse-server/tags -O -  | sed -e 's/[][]//g' -e 's/"//g' -e 's/ //g' | tr '}' '\n'  | awk -F: '{print $3}'
 else
-    docker pull yandex/clickhouse-server:${param}
+    docker pull clickhouse/clickhouse-server:${param}
     tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX) # older version require /nonexistent folder to exist to run clickhouse client :D
     chmod 777 ${tmp_dir}
     set -e
-    containerid=`docker run -v${tmp_dir}:/nonexistent -d yandex/clickhouse-server:${param}`
+    containerid=`docker run -v${tmp_dir}:/nonexistent -d clickhouse/clickhouse-server:${param}`
     set +e
     while :
     do
diff --git a/utils/compressor/decompress_perf.cpp b/utils/compressor/decompress_perf.cpp
index 1c5f29359fc..20f974aab7f 100644
--- a/utils/compressor/decompress_perf.cpp
+++ b/utils/compressor/decompress_perf.cpp
@@ -1,7 +1,7 @@
 #include <lz4.h>
 #include <string.h>
 #include <optional>
-#include <common/types.h>
+#include <base/types.h>
 
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
@@ -17,7 +17,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <Common/memcpySmall.h>
-#include <common/unaligned.h>
+#include <base/unaligned.h>
 
 
 /** for i in *.bin; do ./decompress_perf < $i > /dev/null; done
diff --git a/utils/generate-ya-make/generate-ya-make.sh b/utils/generate-ya-make/generate-ya-make.sh
deleted file mode 100755
index d20f8d4fb8c..00000000000
--- a/utils/generate-ya-make/generate-ya-make.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# This script searches for ya.make.in files in repository and generates ya.make files from them.
-# ya.make.in is a template with substitutions in form of <? command ?>
-# command is interpreted by bash and output is put in place of substitution
-
-ROOT_PATH=$(git rev-parse --show-toplevel)
-EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|consistent-hashing'
-
-# Otherwise 'sort' behaves differently on Mac OS and also depends on locale.
-export LC_ALL=C
-
-find "${ROOT_PATH}" -name 'ya.make.in' | while read path; do
-    echo "# This file is generated automatically, do not edit. See 'ya.make.in' and use 'utils/generate-ya-make' to regenerate it." > "${path/.in/}"
-    (cd $(dirname "${path}") && perl -pne 's/<\?(.+?)\?>/`$1`/e' < "${path}" >> "${path/.in/}")
-done
diff --git a/utils/github/cherrypick.py b/utils/github/cherrypick.py
index 89072b316b2..8bedf54fefa 100644
--- a/utils/github/cherrypick.py
+++ b/utils/github/cherrypick.py
@@ -114,7 +114,7 @@ class CherryPick:
             'Merge it only if you intend to backport changes to the target branch, otherwise just close it.\n'
         )
 
-        git_prefix = ['git', '-C', repo_path, '-c', 'user.email=robot-clickhouse@yandex-team.ru', '-c', 'user.name=robot-clickhouse']
+        git_prefix = ['git', '-C', repo_path, '-c', 'user.email=robot-clickhouse@clickhouse.com', '-c', 'user.name=robot-clickhouse']
 
         pr_title = 'Backport #{number} to {target}: {title}'.format(
             number=self._pr['number'], target=self.target_branch,
diff --git a/utils/github/ya.make b/utils/github/ya.make
deleted file mode 100644
index 3b19a5b69d1..00000000000
--- a/utils/github/ya.make
+++ /dev/null
@@ -1,13 +0,0 @@
-OWNER(g:clickhouse)
-
-PY23_LIBRARY()
-
-PY_SRCS(
-    __init__.py
-    backport.py
-    cherrypick.py
-    local.py
-    query.py
-)
-
-END()
diff --git a/utils/grpc-client/clickhouse-grpc-client.py b/utils/grpc-client/clickhouse-grpc-client.py
index 19d213a8e3f..dfaa7ed4e01 100755
--- a/utils/grpc-client/clickhouse-grpc-client.py
+++ b/utils/grpc-client/clickhouse-grpc-client.py
@@ -14,13 +14,14 @@ import grpc  # pip3 install grpcio
 import grpc_tools  # pip3 install grpcio-tools
 import argparse, cmd, os, signal, subprocess, sys, threading, time, uuid
 
-default_host = 'localhost'
-default_port = 9100
-default_user_name = 'default'
-default_output_format_for_interactive_mode = 'PrettyCompact'
-history_filename = '~/.clickhouse_grpc_history'
-history_size = 1000
-stdin_bufsize = 1048576
+DEFAULT_HOST = 'localhost'
+DEFAULT_PORT = 9100
+DEFAULT_USER_NAME = 'default'
+DEFAULT_OUTPUT_FORMAT_FOR_INTERACTIVE_MODE = 'PrettyCompact'
+HISTORY_FILENAME = '~/.clickhouse_grpc_history'
+HISTORY_SIZE = 1000
+STDIN_BUFFER_SIZE = 1048576
+DEFAULT_ENCODING = 'utf-8'
 
 
 class ClickHouseGRPCError(Exception):
@@ -52,7 +53,7 @@ def error_print(*args, **kwargs):
 class ClickHouseGRPCClient(cmd.Cmd):
     prompt="grpc :) "
 
-    def __init__(self, host=default_host, port=default_port, user_name=default_user_name, password='', 
+    def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT, user_name=DEFAULT_USER_NAME, password='', 
                  database='', output_format='', settings='', verbatim=False, show_debug_info=False):
         super(ClickHouseGRPCClient, self).__init__(completekey=None)
         self.host = host
@@ -85,7 +86,7 @@ class ClickHouseGRPCClient(cmd.Cmd):
         if self.show_debug_info:
             print('\nresult={}'.format(result))
         ClickHouseGRPCClient.__check_no_errors(result)
-        return result.output
+        return result.output.decode(DEFAULT_ENCODING)
 
     # Executes a query using the stream IO and with ability to cancel it by pressing Ctrl+C.
     def run_query(self, query_text, raise_exceptions=True, allow_cancel=False):
@@ -117,7 +118,7 @@ class ClickHouseGRPCClient(cmd.Cmd):
                     # send input data
                     if not sys.stdin.isatty():
                         while True:
-                            info.input_data = sys.stdin.buffer.read(stdin_bufsize)
+                            info.input_data = sys.stdin.buffer.read(STDIN_BUFFER_SIZE)
                             if not info.input_data:
                                 break
                             info.next_query_info = True
@@ -134,7 +135,8 @@ class ClickHouseGRPCClient(cmd.Cmd):
                     if self.show_debug_info:
                         print('\nresult={}'.format(result))
                     ClickHouseGRPCClient.__check_no_errors(result)
-                    print(result.output, end='')
+                    sys.stdout.buffer.write(result.output)
+                    sys.stdout.flush()
                     if result.cancelled:
                         cancelled = True
                         self.verbatim_print("Query was cancelled.")
@@ -244,7 +246,7 @@ class ClickHouseGRPCClient(cmd.Cmd):
             import readline
         except ImportError:
             readline = None
-        histfile = os.path.expanduser(history_filename)
+        histfile = os.path.expanduser(HISTORY_FILENAME)
         if readline and os.path.exists(histfile):
             readline.read_history_file(histfile)
 
@@ -252,8 +254,8 @@ class ClickHouseGRPCClient(cmd.Cmd):
     def __write_history():
         global readline
         if readline:
-            readline.set_history_length(history_size)
-            histfile = os.path.expanduser(history_filename)
+            readline.set_history_length(HISTORY_SIZE)
+            histfile = os.path.expanduser(HISTORY_FILENAME)
             readline.write_history_file(histfile)
 
 
@@ -281,7 +283,7 @@ def main(args):
 
     output_format = args.output_format
     if not output_format and interactive_mode:
-        output_format = default_output_format_for_interactive_mode
+        output_format = DEFAULT_OUTPUT_FORMAT_FOR_INTERACTIVE_MODE
    
     try:
         with ClickHouseGRPCClient(host=args.host, port=args.port, user_name=args.user_name, password=args.password,
diff --git a/utils/iotest/iotest.cpp b/utils/iotest/iotest.cpp
index 5b28dbc95f9..b327355d07b 100644
--- a/utils/iotest/iotest.cpp
+++ b/utils/iotest/iotest.cpp
@@ -6,7 +6,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
 #include <Common/randomSeed.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 
 #include <cstdlib>
 #include <iomanip>
diff --git a/utils/iotest/iotest_aio.cpp b/utils/iotest/iotest_aio.cpp
index 66de4713893..4db76b1eb2d 100644
--- a/utils/iotest/iotest_aio.cpp
+++ b/utils/iotest/iotest_aio.cpp
@@ -14,7 +14,7 @@ int main(int, char **) { return 0; }
 #include <Common/ThreadPool.h>
 #include <Common/Stopwatch.h>
 #include <Common/randomSeed.h>
-#include <common/getPageSize.h>
+#include <base/getPageSize.h>
 #include <pcg_random.hpp>
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadHelpers.h>
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index 11db6fc61bc..ed6a7aea972 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -7,7 +7,7 @@
 #include <libnuraft/nuraft.hxx> // Y_IGNORE
 #include <Coordination/KeeperLogStore.h>
 #include <Coordination/Changelog.h>
-#include <common/logger_useful.h>
+#include <base/logger_useful.h>
 
 using namespace Coordination;
 using namespace DB;
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
         Poco::Logger::root().setLevel("trace");
     }
     auto * logger = &Poco::Logger::get("keeper-dumper");
-    ResponsesQueue queue;
+    ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
     CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
     auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, argv[1], settings);
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
 
     LOG_INFO(logger, "Last committed index: {}", last_commited_index);
 
-    DB::KeeperLogStore changelog(argv[2], 10000000, true);
+    DB::KeeperLogStore changelog(argv[2], 10000000, true, settings->compress_logs);
     changelog.init(last_commited_index, 10000000000UL); /// collect all logs
     if (changelog.size() == 0)
         LOG_INFO(logger, "Changelog empty");
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index cd781e56973..539aa6f1b19 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,7 +1,23 @@
+v21.9.4.35-stable	2021-09-22
+v21.9.3.30-stable	2021-09-16
+v21.9.2.17-stable	2021-09-09
+v21.8.8.29-lts	2021-09-28
+v21.8.7.22-lts	2021-09-22
+v21.8.6.15-lts	2021-09-16
+v21.8.5.7-lts	2021-09-02
+v21.8.4.51-lts	2021-08-17
+v21.8.3.44-lts	2021-08-12
+v21.7.11.3-stable	2021-09-23
+v21.7.10.4-stable	2021-09-16
+v21.7.9.7-stable	2021-09-02
+v21.7.8.58-stable	2021-08-17
+v21.7.7.47-stable	2021-08-09
+v21.7.6.39-stable	2021-08-06
 v21.7.5.29-stable	2021-07-28
 v21.7.4.18-stable	2021-07-17
 v21.7.3.14-stable	2021-07-13
 v21.7.2.7-stable	2021-07-09
+v21.6.9.7-stable	2021-09-02
 v21.6.8.62-stable	2021-07-13
 v21.6.7.57-stable	2021-07-09
 v21.6.6.51-stable	2021-07-02
@@ -18,6 +34,8 @@ v21.4.6.55-stable	2021-04-30
 v21.4.5.46-stable	2021-04-24
 v21.4.4.30-stable	2021-04-16
 v21.4.3.21-stable	2021-04-12
+v21.3.17.2-lts	2021-09-16
+v21.3.16.5-lts	2021-09-03
 v21.3.15.4-stable	2021-07-10
 v21.3.14.1-lts	2021-07-01
 v21.3.13.9-lts	2021-06-22
diff --git a/utils/memcpy-bench/CMakeLists.txt b/utils/memcpy-bench/CMakeLists.txt
index 5353b6fb68e..593a359a876 100644
--- a/utils/memcpy-bench/CMakeLists.txt
+++ b/utils/memcpy-bench/CMakeLists.txt
@@ -16,7 +16,7 @@ add_executable (memcpy-bench
 add_compile_options(memcpy-bench PRIVATE -fno-tree-loop-distribute-patterns)
 
 if (OS_SUNOS)
-	target_compile_options(memcpy-bench PRIVATE "-Wa,--divide")
+    target_compile_options(memcpy-bench PRIVATE "-Wa,--divide")
 endif()
 
 set_source_files_properties(FastMemcpy.cpp PROPERTIES COMPILE_FLAGS "-Wno-old-style-cast")
diff --git a/utils/memcpy-bench/memcpy-bench.cpp b/utils/memcpy-bench/memcpy-bench.cpp
index 025c9100f75..7f8e89b8355 100644
--- a/utils/memcpy-bench/memcpy-bench.cpp
+++ b/utils/memcpy-bench/memcpy-bench.cpp
@@ -1,3 +1,7 @@
+#ifdef HAS_RESERVED_IDENTIFIER
+#pragma clang diagnostic ignored "-Wreserved-identifier"
+#endif
+
 #include <memory>
 #include <cstddef>
 #include <stdexcept>
@@ -11,7 +15,7 @@
 
 #include <pcg_random.hpp>
 
-#include <common/defines.h>
+#include <base/defines.h>
 
 #include <Common/Stopwatch.h>
 
diff --git a/utils/package/arch/PKGBUILD.in b/utils/package/arch/PKGBUILD.in
index b5c63a3edea..4e068e8b8a2 100644
--- a/utils/package/arch/PKGBUILD.in
+++ b/utils/package/arch/PKGBUILD.in
@@ -3,7 +3,7 @@ pkgver=${VERSION_STRING}
 pkgrel=1
 pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time'
 arch=('x86_64')
-url='https://clickhouse.yandex/'
+url='https://clickhouse.com/'
 license=('Apache')
 
 package() {
diff --git a/utils/package/arch/logging.xml b/utils/package/arch/logging.xml
index 0f9c51dff80..c7a78442424 100644
--- a/utils/package/arch/logging.xml
+++ b/utils/package/arch/logging.xml
@@ -1,6 +1,6 @@
-<yandex>
+<clickhouse>
     <logger>
         <log></log>
         <errorlog></errorlog>
     </logger>
-</yandex>
+</clickhouse>
diff --git a/utils/release/release_lib.sh b/utils/release/release_lib.sh
index efa41ae22ad..9f6c2285d93 100644
--- a/utils/release/release_lib.sh
+++ b/utils/release/release_lib.sh
@@ -168,7 +168,7 @@ function gen_changelog {
         -e "s/[@]VERSION_STRING[@]/$VERSION_STRING/g" \
         -e "s/[@]DATE[@]/$CHDATE/g" \
         -e "s/[@]AUTHOR[@]/$AUTHOR/g" \
-        -e "s/[@]EMAIL[@]/$(whoami)@yandex-team.ru/g" \
+        -e "s/[@]EMAIL[@]/$(whoami)@clickhouse.com/g" \
         < $CHLOG.in > $CHLOG
 }
 
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
index a21263c1094..0627b19ea8f 100755
--- a/utils/s3tools/s3uploader
+++ b/utils/s3tools/s3uploader
@@ -8,6 +8,7 @@ import math
 
 try:
     from boto.s3.connection import S3Connection
+    from boto.s3.key import Key
 except ImportError:
     raise ImportError("You have to install boto package 'pip install boto'")
 
@@ -23,12 +24,13 @@ class S3API(object):
 
     def upload_file(self, bucket_name, file_path, s3_path):
         logging.info("Start uploading file to bucket %s", bucket_name)
+
         bucket = self.connection.get_bucket(bucket_name)
         key = bucket.initiate_multipart_upload(s3_path)
         logging.info("Will upload to s3 path %s", s3_path)
         chunksize = 1024 * 1024 * 1024 # 1 GB
         filesize = os.stat(file_path).st_size
-        logging.info("File size if %s", filesize)
+        logging.info("File size is %s", filesize)
         chunkcount = int(math.ceil(filesize / chunksize))
 
         def call_back(x, y):
@@ -38,6 +40,7 @@ class S3API(object):
                 logging.info("Uploading chunk %s of %s", i, chunkcount + 1)
                 offset = chunksize * i
                 bytes_size = min(chunksize, filesize - offset)
+
                 with open(file_path, 'r') as fp:
                     fp.seek(offset)
                     key.upload_part_from_file(fp=fp, part_num=i+1,
@@ -51,6 +54,46 @@ class S3API(object):
         return "https://{bucket}.{mds_url}/{path}".format(
             bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
 
+    def set_file_contents(self, bucket, local_file_path, s3_file_path):
+        key = Key(bucket)
+        key.key = s3_file_path
+        file_size = os.stat(local_file_path).st_size
+        logging.info("Uploading file `%s` to `%s`. Size is %s", local_file_path, s3_file_path, file_size)
+        def call_back(x, y):
+            print("Uploaded {}/{} bytes".format(x, y))
+        key.set_contents_from_filename(local_file_path, cb=call_back)
+
+    def upload_data_for_static_files_disk(self, bucket_name, directory_path, s3_path):
+        bucket = self.connection.get_bucket(bucket_name)
+        if s3_path.endswith("/"):
+            s3_path += "store/"
+        else:
+            s3_path += "/store/"
+        print(s3_path)
+        for root, dirs, files in os.walk(directory_path):
+            path = root.split(os.sep)
+            for file in files:
+                local_file_path = os.path.join(root, file)
+                s3_file = local_file_path[len(directory_path) + 1:]
+                s3_file_path = os.path.join(s3_path, s3_file)
+                self.set_file_contents(bucket, local_file_path, s3_file_path)
+
+        logging.info("Uploading finished")
+        return "https://{bucket}.{mds_url}/{path}".format(bucket=bucket_name, mds_url=self.mds_url, path=s3_path)
+
+    def list_bucket_keys(self, bucket_name):
+        bucket = self.connection.get_bucket(bucket_name)
+        for obj in bucket.get_all_keys():
+            print(obj.key)
+
+    def remove_folder_from_bucket(self, bucket_name, folder_path):
+        bucket = self.connection.get_bucket(bucket_name)
+        bucket.get_all_keys()
+        for obj in bucket.get_all_keys():
+            if obj.key.startswith(folder_path):
+                print('Removing ' + obj.key)
+                obj.delete()
+
 
 def make_tar_file_for_table(clickhouse_data_path, db_name, table_name,
                             tmp_prefix):
@@ -96,6 +139,9 @@ if __name__ == "__main__":
                             help='Name of table with database, if you are uploading partitions')
     data_group.add_argument('--file-path',
                             help='Name of file, if you are uploading')
+    data_group.add_argument('--directory-path', help='Path to directory with files to upload')
+    data_group.add_argument('--list-directory', help='List s3 directory by --directory-path')
+    data_group.add_argument('--remove-directory', help='Remove s3 directory by --directory-path')
     args = parser.parse_args()
 
     if args.table_name is not None and args.clickhouse_data_path is None:
@@ -106,27 +152,41 @@ if __name__ == "__main__":
         args.access_key_id, args.secret_access_key,
         args.s3_api_url, args.s3_common_url)
 
-    if args.table_name is not None:
-        if '.' not in args.table_name:
-            db_name = 'default'
+    file_path = ''
+    directory_path = args.directory_path
+    s3_path = args.s3_path
+
+    if args.list_directory:
+        s3_conn.list_bucket_keys(args.bucket_name)
+    elif args.remove_directory:
+        print('Removing s3 path: ' + args.remove_directory)
+        s3_conn.remove_folder_from_bucket(args.bucket_name, args.remove_directory)
+    elif args.directory_path is not None:
+        url = s3_conn.upload_data_for_static_files_disk(args.bucket_name, directory_path, s3_path)
+        logging.info("Data uploaded: %s", url)
+    else:
+
+        if args.table_name is not None:
+            if '.' not in args.table_name:
+                db_name = 'default'
+            else:
+                db_name, table_name = args.table_name.split('.')
+            file_path = make_tar_file_for_table(
+                args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
         else:
-            db_name, table_name = args.table_name.split('.')
-        file_path = make_tar_file_for_table(
-            args.clickhouse_data_path, db_name, table_name, args.tmp_prefix)
-    else:
-        file_path = args.file_path
+            file_path = args.file_path
 
-    if 'tsv' in file_path:
-        s3_path = os.path.join(
-            args.dataset_name, 'tsv', os.path.basename(file_path))
-    elif args.table_name is not None:
-        s3_path = os.path.join(
-            args.dataset_name, 'partitions', os.path.basename(file_path))
-    elif args.s3_path is not None:
-        s3_path = os.path.join(
-            args.dataset_name, args.s3_path, os.path.basename(file_path))
-    else:
-        raise Exception("Don't know s3-path to upload")
+        if 'tsv' in file_path:
+            s3_path = os.path.join(
+                args.dataset_name, 'tsv', os.path.basename(file_path))
+        if args.table_name is not None:
+            s3_path = os.path.join(
+                args.dataset_name, 'partitions', os.path.basename(file_path))
+        elif args.s3_path is not None:
+            s3_path = os.path.join(
+                args.dataset_name, args.s3_path, os.path.basename(file_path))
+        else:
+            raise Exception("Don't know s3-path to upload")
 
-    url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
-    logging.info("Data uploaded: %s", url)
+        url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
+        logging.info("Data uploaded: %s", url)
diff --git a/utils/wal-dump/main.cpp b/utils/wal-dump/main.cpp
index 361aa9df887..3566936324b 100644
--- a/utils/wal-dump/main.cpp
+++ b/utils/wal-dump/main.cpp
@@ -5,7 +5,7 @@
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedReadBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
-#include <DataStreams/NativeBlockInputStream.h>
+#include <Formats/NativeReader.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
@@ -21,7 +21,7 @@
 static void dump(const std::string & bin_path)
 {
     DB::ReadBufferFromFile in(bin_path);
-    DB::NativeBlockInputStream block_in(in, 0);
+    DB::NativeReader block_in(in, 0);
     DB::Block block;
 
     DB::WriteBufferFromFileDescriptor out(STDOUT_FILENO);
diff --git a/utils/zookeeper-cli/zookeeper-cli.cpp b/utils/zookeeper-cli/zookeeper-cli.cpp
index 47423dcd202..690a9d6b097 100644
--- a/utils/zookeeper-cli/zookeeper-cli.cpp
+++ b/utils/zookeeper-cli/zookeeper-cli.cpp
@@ -3,8 +3,8 @@
 #include <Poco/ConsoleChannel.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/LineReader.h>
-#include <common/logger_useful.h>
+#include <base/LineReader.h>
+#include <base/logger_useful.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/utils/zookeeper-test/main.cpp b/utils/zookeeper-test/main.cpp
index 39a282ce258..b60c45c9df6 100644
--- a/utils/zookeeper-test/main.cpp
+++ b/utils/zookeeper-test/main.cpp
@@ -3,8 +3,8 @@
 #include <Poco/ConsoleChannel.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
-#include <common/LineReader.h>
-#include <common/logger_useful.h>
+#include <base/LineReader.h>
+#include <base/logger_useful.h>
 #include <fmt/format.h>
 #include <random>
 #include <iterator>
diff --git a/website/README.md b/website/README.md
index 9f808c6f658..f02deb0ad91 100644
--- a/website/README.md
+++ b/website/README.md
@@ -23,7 +23,7 @@ virtualenv build
 ./build.py --skip-multi-page --skip-single-page --skip-amp --skip-pdf --skip-git-log --skip-docs --livereload 8080
 ```
 
-# How to quickly test the ugly annoying broken links in docs
+# How to quickly test the broken links in docs
 
 ```
 ./build.py --skip-multi-page --skip-amp --skip-pdf --skip-blog --skip-git-log --lang en --livereload 8080
diff --git a/website/benchmark/benchmark.js b/website/benchmark/benchmark.js
index 8fb2693aa97..bd5ec3c083e 100644
--- a/website/benchmark/benchmark.js
+++ b/website/benchmark/benchmark.js
@@ -58,7 +58,7 @@ function generate_selectors(elem) {
         var available = available_systems_for_current_data_size.indexOf(systems[i]) != -1;
         var button_class = 'btn-outline-dark';
         if (system_kinds[i] == 'cloud' || system_kinds[i] == 'vps') {
-            button_class = 'btn-outline-primary';
+            button_class = 'btn-light';
         } else if (system_kinds[i] == 'desktop' || system_kinds[i] == 'laptop') {
             button_class = 'btn-outline-secondary';
         };
@@ -424,11 +424,11 @@ function generate_diagram() {
             }
 
 
-            table_row += '<div class="progress ml-2 my-2" style="height:1rem;"><div class="progress-bar ';
+            table_row += '<div class="progress bg-light ml-2 my-2" style="height:1rem;"><div class="progress-bar ';
 
             var bg = 'bg-dark';
             if (filtered_results[j].kind == 'cloud' || filtered_results[j].kind == 'vps') {
-                bg = 'bg-primary';
+                bg = 'bg-medium';
             } else if (filtered_results[j].kind == 'desktop' || filtered_results[j].kind == 'laptop' || filtered_results[j].kind == 'phone') {
                 bg = 'bg-secondary';
             }
diff --git a/website/benchmark/dbms/index.html b/website/benchmark/dbms/index.html
index 28baa33dcdc..453b6fff9cd 100644
--- a/website/benchmark/dbms/index.html
+++ b/website/benchmark/dbms/index.html
@@ -6,7 +6,7 @@
     'results.js?' + rev_short,
     '../benchmark.js?' + rev_short]
 %}
-{% set url = 'https://clickhouse.tech/benchmark/dbms/' %}
+{% set url = 'https://clickhouse.com/benchmark/dbms/' %}
 {% set no_footer = True %}
 
 {% block content %}
diff --git a/website/benchmark/hardware/index.html b/website/benchmark/hardware/index.html
index 71d3333432e..d7f8c80e1cf 100644
--- a/website/benchmark/hardware/index.html
+++ b/website/benchmark/hardware/index.html
@@ -6,7 +6,7 @@
     'results.js?' + rev_short,
     '../benchmark.js?' + rev_short]
 %}
-{% set url = 'https://clickhouse.tech/benchmark/hardware/' %}
+{% set url = 'https://clickhouse.com/benchmark/hardware/' %}
 {% set no_footer = True %}
 
 {% block content %}
@@ -42,7 +42,7 @@
 <div class="row">
     <div class="col">
         <h3 class="my-3">Comments</h3>
-        <p>Submit your own results: <a href="https://clickhouse.tech/docs/en/operations/performance-test/">https://clickhouse.tech/docs/en/operations/performance-test/</a></p>
+        <p>Submit your own results: <a href="https://clickhouse.com/docs/en/operations/performance-test/">https://clickhouse.com/docs/en/operations/performance-test/</a></p>
         <p>
 Results for Lenovo B580 Laptop are from <b>Ragıp Ünal</b>. 16GB RAM 1600 GHz, 240GB SSD, Intel(R) Core(TM) i5-3210M CPU @ 2.50GHz (2 Core / 4 HT)<br/>
 Results for Time4vps.eu are from <b>Ragıp Ünal</b>.<br/>
@@ -77,6 +77,7 @@ Results for 2x AMD EPYC 7F72 3.2 Ghz (Total 96 Cores, IBM Cloud's Bare Metal Ser
 Results for 2x AMD EPYC 7742 (128 physical cores, 1 TB DDR4-3200 RAM) from <b>Yedige Davletgaliyev</b> and <b>Nikita Zhavoronkov</b> of blockchair.com.<br/>
 Results for ASUS A15 (Ryzen laptop) are from <b>Kimmo Linna</b>.<br/>
 Results for MacBook Air M1 are from <b>Denis Glazachev</b>.<br/>
+Results for Xeon Gold 6140 are from <b>Shiv Iyer</b> (ChistaDATA Labs).<br/>
 </p>
     </div>
 </div>
diff --git a/website/benchmark/hardware/results/macbook_pro_m1_2020.json b/website/benchmark/hardware/results/macbook_pro_m1_2020.json
new file mode 100644
index 00000000000..52e62b06d61
--- /dev/null
+++ b/website/benchmark/hardware/results/macbook_pro_m1_2020.json
@@ -0,0 +1,54 @@
+[
+    {
+        "system":       "MacBook Pro M1",
+        "system_full":  "MacBook Pro M1 13\" 2020, 8‑core CPU, 16 GiB RAM, 512 GB SSD",
+        "time":         "2021-10-22 18:17:00",
+        "kind":         "laptop",
+        "result":
+        [
+[0.001, 0.001, 0.001],
+[0.020, 0.013, 0.012],
+[0.046, 0.032, 0.032],
+[0.083, 0.045, 0.044],
+[0.099, 0.098, 0.099],
+[0.361, 0.306, 0.297],
+[0.031, 0.028, 0.026],
+[0.017, 0.015, 0.015],
+[0.530, 0.500, 0.497],
+[0.621, 0.633, 0.634],
+[0.229, 0.207, 0.207],
+[0.259, 0.243, 0.242],
+[0.818, 0.796, 0.767],
+[1.090, 1.052, 1.055],
+[1.053, 1.011, 1.071],
+[1.223, 0.966, 0.864],
+[14.533, 8.276, 8.041],
+[6.470, 8.012, 6.991],
+[38.097, 6.530, 8.532],
+[0.058, 0.054, 0.052],
+[1.341, 1.306, 1.141],
+[1.313, 1.330, 1.311],
+[3.156, 2.974, 2.919],
+[1.665, 1.423, 1.401],
+[0.421, 0.337, 0.338],
+[0.289, 0.287, 0.300],
+[0.348, 0.344, 0.341],
+[1.149, 1.142, 1.150],
+[1.855, 1.591, 1.984],
+[1.691, 1.644, 1.646],
+[0.921, 0.750, 0.771],
+[1.485, 1.233, 1.011],
+[91.560, 10.399, 8.895],
+[8.034, 7.663, 7.372],
+[6.836, 7.444, 7.235],
+[1.263, 1.166, 1.150],
+[0.125, 0.118, 0.118],
+[0.055, 0.053, 0.053],
+[0.043, 0.043, 0.043],
+[0.248, 0.243, 0.251],
+[0.016, 0.012, 0.012],
+[0.011, 0.010, 0.010],
+[0.003, 0.002, 0.002]
+        ]
+    }
+]
diff --git a/website/benchmark/hardware/results/xeon_gold_6140.json b/website/benchmark/hardware/results/xeon_gold_6140.json
new file mode 100644
index 00000000000..b31ea90ab68
--- /dev/null
+++ b/website/benchmark/hardware/results/xeon_gold_6140.json
@@ -0,0 +1,56 @@
+[
+    {
+        "system":       "Xeon Gold 6140",
+        "system_full":  "Xeon Gold 6140, 1 socket, 32 threads, 64 GB RAM, vda",
+        "cpu_vendor":   "Intel",
+        "cpu_model":    "Xeon Gold 6140",
+        "time":         "2021-08-24 00:00:00",
+        "kind": "server",
+        "result":
+        [
+[0.002, 0.002, 0.001],
+[0.017, 0.008, 0.008],
+[0.029, 0.019, 0.018],
+[0.043, 0.026, 0.025],
+[0.101, 0.087, 0.084],
+[0.213, 0.190, 0.187],
+[0.017, 0.012, 0.012],
+[0.036, 0.009, 0.009],
+[0.264, 0.240, 0.245],
+[0.313, 0.269, 0.270],
+[0.139, 0.120, 0.123],
+[0.149, 0.129, 0.134],
+[0.411, 0.342, 0.342],
+[0.490, 0.448, 0.445],
+[0.433, 0.411, 0.403],
+[0.459, 0.446, 0.445],
+[1.223, 1.143, 1.133],
+[0.723, 0.675, 0.685],
+[2.121, 2.095, 2.049],
+[0.058, 0.049, 0.030],
+[0.560, 0.429, 0.430],
+[0.653, 0.499, 0.501],
+[1.379, 1.171, 1.152],
+[1.153, 0.564, 0.562],
+[0.200, 0.155, 0.152],
+[0.150, 0.129, 0.127],
+[0.192, 0.151, 0.152],
+[0.583, 0.449, 0.459],
+[0.752, 0.666, 0.656],
+[1.073, 1.072, 1.073],
+[0.373, 0.330, 0.336],
+[0.525, 0.441, 0.441],
+[3.795, 2.731, 2.908],
+[1.918, 1.756, 1.787],
+[1.828, 1.732, 1.735],
+[0.725, 0.697, 0.711],
+[0.188, 0.171, 0.179],
+[0.072, 0.067, 0.065],
+[0.077, 0.062, 0.062],
+[0.435, 0.415, 0.391],
+[0.027, 0.022, 0.020],
+[0.023, 0.020, 0.014],
+[0.014, 0.008, 0.003]
+        ]
+    }
+]
diff --git a/website/blog/README.md b/website/blog/README.md
index c99f293f669..2c29eda459b 100644
--- a/website/blog/README.md
+++ b/website/blog/README.md
@@ -28,14 +28,14 @@ The recommended place to store images is this GitHub repo: <https://github.com/C
  ```markdown
 ---
 title: 'ClickHouse Meetup in Beijing on June 8, 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/main.jpg'
 date: '2019-06-13'
 tags: ['meetup','Beijing','China','events']
 ---
 
 24th ClickHouse Meetup globally and 3rd one in China took place in Beijing on Dragon Boat Festival weekend, which appeared to...
 
-![ClickHouse branded Beijing duck](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/9.jpg)
+![ClickHouse branded Beijing duck](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/9.jpg)
 ```
 
 ## How To Preview My Post?
diff --git a/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md b/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md
index 44739a24191..c9ea238bf5e 100644
--- a/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md
+++ b/website/blog/en/2016/evolution-of-data-structures-in-yandex-metrica.md
@@ -1,6 +1,6 @@
 ---
 title: 'Evolution of Data Structures in Yandex.Metrica'
-image: 'https://blog-images.clickhouse.tech/en/2016/evolution-of-data-structures-in-yandex-metrica/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/main.jpg'
 date: '2016-12-13'
 tags: ['Yandex.Metrica', 'data structures', 'LSM tree', 'columnar storage']
 ---
@@ -18,7 +18,7 @@ A MyISAM table is comprised of a data file and an index file. If nothing was del
 Let's look at the real-life situation when the index is in RAM (key cache in MySQL or system page cache), but the table data is not cached. Let's assume that we are using HDDs. The time it takes to read data depends on the volume of data that needs to be read and how many Seek operations need to be run. The number of Seek's is determined by the locality of data on the disk.
 
 Data locality illustrated:
-![Data locality](https://blog-images.clickhouse.tech/en/2016/evolution-of-data-structures-in-yandex-metrica/1.jpg)
+![Data locality](https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/1.jpg)
 
 Metrica events are received in almost the same order in which they actually took place. In this incoming stream, data from different counters is scattered completely at random. In other words, incoming data is local by time, but not local by CounterID. When writing to a MyISAM table, data from different counters is also placed quite randomly. This means that to read the data report, you will need to perform about as many random reads as there are rows that we need in the table.
 
@@ -32,7 +32,7 @@ It took a lot of tricks like periodic table sorting, complicated manual partitio
 
 Metrage is an implementation of [LSM Tree](https://en.wikipedia.org/wiki/Log-structured_merge-tree), a fairly common data structure that works well for workloads with intensive stream of writes and mostly primary key reads, like Yandex.Metrica has. LevelDB did not exist in 2010 and TokuDB was proprietary at the time.
 
-![LSM Tree](https://blog-images.clickhouse.tech/en/2016/evolution-of-data-structures-in-yandex-metrica/2.jpg)
+![LSM Tree](https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/2.jpg)
 
 In Metrage arbitrary data structures (fixed at compile time) can be used as “rows” in it. Every row is a key, value pair. A key is a structure with comparison operations for equality and inequality. The value is an arbitrary structure with operations to update (to add something) and merge (to aggregate or combine with another value). In short, it's a CRDT. Data is located pretty locally on the hard disk, so the primary key range reads are quick. Blocks of data are effectively compressed even with fast algorithms because of ordering (in 2010 we used QuickLZ, since 2011 - LZ4). Storing data in a systematic manner enables us to use a sparse index.
 
@@ -50,7 +50,7 @@ To mitigate this we had to keep for a while a separate storage for custom report
 
 Using OLAPServer, we developed an understanding of how well column-oriented DBMS's handle ad-hoc analytics tasks with non-aggregated data. If you can retrieve any report from non-aggregated data, then it begs the question of whether data even needs to be aggregated in advance, as we did with Metrage.
 
-![](https://blog-images.clickhouse.tech/en/2016/evolution-of-data-structures-in-yandex-metrica/3.gif)
+![](https://blog-images.clickhouse.com/en/2016/evolution-of-data-structures-in-yandex-metrica/3.gif)
 
 On the one hand, pre-aggregating data can reduce the volume of data that is used at the moment when the report page is loading. On the other hand, though, aggregated data doesn't solve everything. Here are the reasons why:
 
diff --git a/website/blog/en/2016/how-to-update-data-in-clickhouse.md b/website/blog/en/2016/how-to-update-data-in-clickhouse.md
index 22c2fa3ccc1..951fb957d13 100644
--- a/website/blog/en/2016/how-to-update-data-in-clickhouse.md
+++ b/website/blog/en/2016/how-to-update-data-in-clickhouse.md
@@ -1,7 +1,7 @@
 ---
 title: 'How to Update Data in ClickHouse'
 date: '2016-11-20'
-image: 'https://blog-images.clickhouse.tech/en/2016/how-to-update-data-in-clickhouse/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2016/how-to-update-data-in-clickhouse/main.jpg'
 tags: ['features', 'update', 'delete', 'CollapsingMergeTree', 'partitions']
 ---
 
diff --git a/website/blog/en/2016/yandex-opensources-clickhouse.md b/website/blog/en/2016/yandex-opensources-clickhouse.md
index feffec65d79..c2b01ba3125 100644
--- a/website/blog/en/2016/yandex-opensources-clickhouse.md
+++ b/website/blog/en/2016/yandex-opensources-clickhouse.md
@@ -1,11 +1,11 @@
 ---
 title: 'Yandex Opensources ClickHouse'
-image: 'https://blog-images.clickhouse.tech/en/2016/yandex-opensources-clickhouse/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2016/yandex-opensources-clickhouse/main.jpg'
 date: '2016-06-15'
 tags: ['announcement', 'GitHub', 'license']
 ---
 
-Today [analytical DBMS ClickHouse](https://clickhouse.tech/) initially developed internally at Yandex, became available to everyone. Source code is published on [GitHub](https://github.com/ClickHouse/ClickHouse) under Apache 2.0 license.
+Today [analytical DBMS ClickHouse](https://clickhouse.com/) initially developed internally at Yandex, became available to everyone. Source code is published on [GitHub](https://github.com/ClickHouse/ClickHouse) under Apache 2.0 license.
 
 ClickHouse allows interactive analytical query execution on data updated in real time. System is able to scale to tens of trillions of rows and petabytes of stored data. Using ClickHouse opens up opportunities that were hard to imagine: you can store full stream of data and slice and dice it to produce reports without offline aggregation. ClickHouse was initially developed as a backend for [Yandex.Metrica](https://metrika.yandex.com/) — second largest web analytics system in the world.
 
diff --git a/website/blog/en/2017/clickhouse-at-data-scale-2017.md b/website/blog/en/2017/clickhouse-at-data-scale-2017.md
index f05cc9e1e89..d7fcb035ee5 100644
--- a/website/blog/en/2017/clickhouse-at-data-scale-2017.md
+++ b/website/blog/en/2017/clickhouse-at-data-scale-2017.md
@@ -1,10 +1,10 @@
 ---
 title: 'ClickHouse at Data@Scale 2017'
-image: 'https://blog-images.clickhouse.tech/en/2017/clickhouse-at-data-scale-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-at-data-scale-2017/main.jpg'
 date: '2017-06-15'
 tags: ['conference', 'Seattle', 'USA', 'America', 'events']
 ---
 
 ![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
 
-[Slides](https://presentations.clickhouse.tech/data_at_scale/)
+[Slides](https://presentations.clickhouse.com/data_at_scale/)
diff --git a/website/blog/en/2017/clickhouse-at-percona-live-2017.md b/website/blog/en/2017/clickhouse-at-percona-live-2017.md
index 989dfde932d..12966ffa726 100644
--- a/website/blog/en/2017/clickhouse-at-percona-live-2017.md
+++ b/website/blog/en/2017/clickhouse-at-percona-live-2017.md
@@ -1,22 +1,22 @@
 ---
 title: 'ClickHouse at Percona Live 2017'
-image: 'https://blog-images.clickhouse.tech/en/2017/clickhouse-at-percona-live-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/main.jpg'
 date: '2017-04-28'
 tags: ['meetup', 'Santa Clara', 'Bay Area', 'California', 'USA', 'America', 'events', 'Graphouse']
 ---
 
-For those who haven't heard, [Percona Live](https://percona.com/live/17) is probably one of the largest international conferences about opensource database management systems, having 12 talk tracks in parallel. It's been around for many years and initially, it was focused mainly on MySQL (and had that in its name), but nowadays it is more generic and other products of this category get lots of attention too. Needless to say that for a relatively new player on the market like [ClickHouse](https://clickhouse.tech/), it's been a great opportunity to spread the word about the technology and how exactly it allows us to perform analytics on petabytes of data in real-time.
+For those who haven't heard, [Percona Live](https://percona.com/live/17) is probably one of the largest international conferences about opensource database management systems, having 12 talk tracks in parallel. It's been around for many years and initially, it was focused mainly on MySQL (and had that in its name), but nowadays it is more generic and other products of this category get lots of attention too. Needless to say that for a relatively new player on the market like [ClickHouse](https://clickhouse.com/), it's been a great opportunity to spread the word about the technology and how exactly it allows us to perform analytics on petabytes of data in real-time.
 
-![Percona Live](https://blog-images.clickhouse.tech/en/2017/clickhouse-at-percona-live-2017/1.jpg)
+![Percona Live](https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/1.jpg)
 
 Yandex team members had three chances to talk about ClickHouse from the stage:
 
 1. A large portion of [Opening Keynote](https://www.percona.com/blog/2017/04/25/percona-live-2017-day-one-keynotes/) has been dedicated to different time-series databases. ClickHouse is not really a specialized time-series database but still outperforms many alternatives if used as such. So Dmitry Andreev, Head of Yandex.Market Infrastructure Development Group, had a short talk about how ClickHouse can be used a as storage backend for Graphite using [Graphouse](https://github.com/clickhouse/graphouse), an open-source adapter that implements this. This setup is used in Yandex.Market and number of other Yandex services and have proven to be very reliable and effective. Chain of short talks has been followed by a live panel about time series in general with the same speakers including Dmitry. Unfortunately, as we figured out later, many keynote attendees perceived ClickHouse as just yet another time-series database and missed the explicitly said part that it opens up way more opportunities to analyze data.
-2. Victor Tarnavsky, Head of Yandex.Metrica, and Alexey Milovidov, Head of ClickHouse Development Group, gave a full-length talk about ClickHouse overview, capabilities, features and use cases. Their video has not been recorded, but you can check out [the slides](https://presentations.clickhouse.tech/percona2017/ClickHouse%20Percona%20Santa%20Clara%202.0.pdf).
+2. Victor Tarnavsky, Head of Yandex.Metrica, and Alexey Milovidov, Head of ClickHouse Development Group, gave a full-length talk about ClickHouse overview, capabilities, features and use cases. Their video has not been recorded, but you can check out [the slides](https://presentations.clickhouse.com/percona2017/ClickHouse%20Percona%20Santa%20Clara%202.0.pdf).
 3. Later on, Dmitry Andreev went deeper on the same topic he covered on an opening keynote. He spoke in more detail about how Graphouse works, shown the benchmark results and future plans of the project. Also, [only slides](https://www.percona.com/live/17/sites/default/files/slides/clickhouse-as-timeseries-database.pdf) are available.
 
-![Keynote](https://blog-images.clickhouse.tech/en/2017/clickhouse-at-percona-live-2017/2.gif)
+![Keynote](https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/2.gif)
 
 Besides, ClickHouse has been represented in the exhibition accompanying the conference. Altinity, the private company independent from Yandex that provides consulting and support services for ClickHouse, organized the booth and invited Yandex team members to join them to talk about ClickHouse with conference attendees which appeared to be quite productive.
 
-![ClickHouse Booth](https://blog-images.clickhouse.tech/en/2017/clickhouse-at-percona-live-2017/3.jpg)
+![ClickHouse Booth](https://blog-images.clickhouse.com/en/2017/clickhouse-at-percona-live-2017/3.jpg)
diff --git a/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md b/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md
index bd15350ba34..b882cf81fa2 100644
--- a/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md
+++ b/website/blog/en/2017/clickhouse-meetup-in-berlin-october-5-2017.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup in Berlin, October 5, 2017'
-image: 'https://blog-images.clickhouse.tech/en/2017/clickhouse-meetup-in-berlin-october-5-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-meetup-in-berlin-october-5-2017/main.jpg'
 date: '2017-10-19'
 tags: ['meetup', 'Berlin', 'Germany', 'events']
 ---
diff --git a/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md b/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
index 5974a292853..832cf476b6a 100644
--- a/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
+++ b/website/blog/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017.md
@@ -1,8 +1,8 @@
 ---
 title: 'ClickHouse Meetup in Santa Clara on May 4, 2017'
-image: 'https://blog-images.clickhouse.tech/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2017/clickhouse-meetup-in-santa-clara-may-4-2017/main.jpg'
 date: '2017-05-11'
 tags: ['meetup', 'Santa Clara', 'Bay Area', 'California', 'USA', 'America', 'events']
 ---
 
-After [Percona Live 2017](clickhouse-at-percona-live-2017.md), Yandex ClickHouse team stayed for one more week in San Francisco Bay Area to meet with local companies in person to talk about ClickHouse and how it can be applied to their tasks. On the last evening we even managed to organize our own meetup with active ClickHouse users in the area, not as large as we regularly host in Russia, but still had some very interesting discussions.
+After [Percona Live 2017](clickhouse-at-percona-live-2017.md), ClickHouse team stayed for one more week in San Francisco Bay Area to meet with local companies in person to talk about ClickHouse and how it can be applied to their tasks. On the last evening we even managed to organize our own meetup with active ClickHouse users in the area, not as large as we regularly host in Russia, but still had some very interesting discussions.
diff --git a/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md b/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md
index 5521127edba..d9ba8890ad0 100644
--- a/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md
+++ b/website/blog/en/2017/join-the-clickhouse-meetup-in-berlin.md
@@ -1,6 +1,6 @@
 ---
 title: 'Join the ClickHouse Meetup in Berlin'
-image: 'https://blog-images.clickhouse.tech/en/2017/join-the-clickhouse-meetup-in-berlin/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2017/join-the-clickhouse-meetup-in-berlin/main.jpg'
 date: '2017-10-19'
 tags: ['announcement', 'meetup', 'Berlin', 'Germany', 'events']
 ---
diff --git a/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md b/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md
index c3534efee55..421f03ae226 100644
--- a/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md
+++ b/website/blog/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15.md
@@ -1,6 +1,6 @@
 ---
 title: 'Announcing ClickHouse Meetup in Amsterdam on November 15'
-image: 'https://blog-images.clickhouse.tech/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/announcing-clickhouse-meetup-in-amsterdam-on-november-15/main.jpg'
 date: '2018-10-17'
 tags: ['meetup', 'Amsterdam', 'Netherlands', 'events', 'announcement']
 ---
diff --git a/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md b/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md
index d3700b40e42..6c111420497 100644
--- a/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md
+++ b/website/blog/en/2018/clickhouse-at-analysys-a10-2018.md
@@ -1,27 +1,27 @@
 ---
 title: 'ClickHouse at Analysys A10 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-at-analysys-a10-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/main.jpg'
 date: '2018-11-04'
 tags: ['conference', 'Beijing', 'China', 'events', 'Analysys', 'Asia']
 ---
 
-[Analysys A10](https://event.analysys.cn/pc/2018/index.html) is a large conference on Big Data that took place on October 26-27 in Beijing. Since China's population is huge, it generates a lot of data and Big Data industry is in very high demand. Yandex ClickHouse team has been honored to participate in this event alongside top management, analysts, and IT professionals from various Chinese companies.
+[Analysys A10](https://event.analysys.cn/pc/2018/index.html) is a large conference on Big Data that took place on October 26-27 in Beijing. Since China's population is huge, it generates a lot of data and Big Data industry is in very high demand. ClickHouse team has been honored to participate in this event alongside top management, analysts, and IT professionals from various Chinese companies.
 
 Each year Analysys also organizes the OLAP contest. The second year in a row the same team of Sundy Li (李本旺) and Winter Zhang (张健) wins it by using ClickHouse as the core of their solution. The task was to calculate complex marketing funnel as fast as possible.
 
 Sundy Li (李本旺) receives award for winning Analysys OLAP contest 2018 from William Kwok (郭炜):
-![Sundy Li and William Kwok](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-analysys-a10-2018/1.jpg)
+![Sundy Li and William Kwok](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/1.jpg)
 
 The first day of the conference we mostly spent talking with people on ClickHouse booth, while on the second day there were two technical talks about ClickHouse.
 
 Alexey Milovidov demonstrates ClickHouse and how it works internally:
-![Alexey Milovidov](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-analysys-a10-2018/2.jpg)
+![Alexey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/2.jpg)
 
 Sundy Li (李本旺) explains the audience how they won the OLAP contest using ClickHouse:
-![Sundy Li](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-analysys-a10-2018/3.jpg)
+![Sundy Li](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/3.jpg)
 
 The next day after A10 was a dedicated ClickHouse Community Meetup in Beijing, but it deserves a separate recap post.
 
 Analysys A10 afterparty:
-![Analysys A10 afterparty](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-analysys-a10-2018/4.jpg)
+![Analysys A10 afterparty](https://blog-images.clickhouse.com/en/2018/clickhouse-at-analysys-a10-2018/4.jpg)
 
diff --git a/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md b/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md
index 1e0b7e4c99d..0fc8660c92c 100644
--- a/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md
+++ b/website/blog/en/2018/clickhouse-at-percona-live-europe-2018.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse at Percona Live Europe 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-at-percona-live-europe-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/main.jpg'
 date: '2018-11-21'
 tags: ['conference', 'Frankfurt', 'Germany', 'events', 'Percona Live', 'Europe']
 ---
@@ -9,17 +9,17 @@ Open-source database management systems conference [Percona Live](https://www.pe
 
 There were three talks about ClickHouse in agenda, while only one of them was from Yandex. Also we had a lot of interesting conversations with conference attendees at ClickHouse booth sponsored by Altinity.
 
-Alexander Zaitsev, CTO and co-founder of Altinity, gives an overview of ClickHouse and then demonstrates case studies and best practices ([slides](https://presentations.clickhouse.tech/percona_europe_2018/Altinity.pdf)):
-![](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-percona-live-europe-2018/1.jpg)
+Alexander Zaitsev, CTO and co-founder of Altinity, gives an overview of ClickHouse and then demonstrates case studies and best practices ([slides](https://presentations.clickhouse.com/percona_europe_2018/Altinity.pdf)):
+![](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/1.jpg)
 
 Fast! Flexible! Free! Fun!
-![Fast! Flexible! Free! Fun!](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-percona-live-europe-2018/2.jpg)
+![Fast! Flexible! Free! Fun!](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/2.jpg)
 
-Aleksey Milovidov, lead ClickHouse developer from Yandex, talks about unusual and unique ClickHouse features ([slides](https://presentations.clickhouse.tech/percona_europe_2018)):
-![Aleksey Milovidov](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-percona-live-europe-2018/3.jpg)
+Aleksey Milovidov, lead ClickHouse developer from Yandex, talks about unusual and unique ClickHouse features ([slides](https://presentations.clickhouse.com/percona_europe_2018)):
+![Aleksey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/3.jpg)
 
-Aleksandar Aleksandrov and Felix Mattrat, data engineers from MessageBird, show how they use ClickHouse to analyze process of delivery of SMS and other kinds of messages ([slides](http://presentations.clickhouse.tech/percona_europe_2018/MessageBird.pdf)):
-![Aleksandar Aleksandrov and Felix Mattrat](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-percona-live-europe-2018/4.jpg)
+Aleksandar Aleksandrov and Felix Mattrat, data engineers from MessageBird, show how they use ClickHouse to analyze process of delivery of SMS and other kinds of messages ([slides](http://presentations.clickhouse.com/percona_europe_2018/MessageBird.pdf)):
+![Aleksandar Aleksandrov and Felix Mattrat](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/4.jpg)
 
 Live demo at ClickHouse booth by Alexey Milovidov:
-![Demo at ClickHouse booth by Alexey Milovidov](https://blog-images.clickhouse.tech/en/2018/clickhouse-at-percona-live-europe-2018/5.jpg)
+![Demo at ClickHouse booth by Alexey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-at-percona-live-europe-2018/5.jpg)
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md
index cd7cb155c37..63293f1ff67 100644
--- a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md
+++ b/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Community Meetup in Beijing on January 27, 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/main.jpg'
 date: '2018-02-08'
 tags: ['meetup', 'Beijing', 'China', 'events', 'Asia']
 ---
@@ -8,41 +8,41 @@ tags: ['meetup', 'Beijing', 'China', 'events', 'Asia']
 Last year there has been an OLAP algorithm contest in China organized by Analysys. The team who have shown the top results and won the competition has been using ClickHouse as the core of their solution. Other teams were mostly using different technologies and didn't really know much about ClickHouse at a time. When the final results were published, many people in China who participated in or were aware of this competition became really eager to learn more about ClickHouse. This spike of interest about ClickHouse in China has eventually lead to the first Chinese ClickHouse Community Meetup that has taken place in Beijing.
 
 Welcome word by William Kwok, CTO of Analysys, who personally played a huge role in making this event possible:
-![William Kwok, CTO of Analysys](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/1.jpg)
+![William Kwok, CTO of Analysys](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/1.jpg)
 
 It was probably the most intense ClickHouse Meetup compared to all previous ones worldwide. The main part of the event took over 6 hours non-stop and there were also either pre-meetup and after-party on the same day. Well over 150 people have shown up on Saturday to participate.
 
 Audience listening for ClickHouse introduction by Alexey Milovidov:
-![ClickHouse introduction by Alexey Milovidov](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/2.jpg)
+![ClickHouse introduction by Alexey Milovidov](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/2.jpg)
 
-Alexey Milovidov has started the main meetup session with an introductory talk about ClickHouse, it's usage inside Yandex and history that lead to becoming an open-source analytical DBMS ([slides](https://presentations.clickhouse.tech/meetup12/introduction/)).
+Alexey Milovidov has started the main meetup session with an introductory talk about ClickHouse, it's usage inside Yandex and history that lead to becoming an open-source analytical DBMS ([slides](https://presentations.clickhouse.com/meetup12/introduction/)).
 
 Alexander Zaitsev's practical talk about migrating to ClickHouse:
-![Alexander Zaitsev](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/3.jpg)
+![Alexander Zaitsev](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/3.jpg)
 
-Alexander Zaitsev has shared his vast experience in migrating to ClickHouse. LifeStreet, advertisement company where he works, was one of the first companies outside of Yandex which switched to ClickHouse from other analytical DBMS in production. Later on, Alexander also co-founded Altinity, a company that specializes in helping others to migrate to ClickHouse and then effectively use it to achieve their business goals. The talk has covered many specific topics that are important for those who are in the middle of such migration or just considering it ([Slides](https://presentations.clickhouse.tech/meetup12/migration.pptx)).
+Alexander Zaitsev has shared his vast experience in migrating to ClickHouse. LifeStreet, advertisement company where he works, was one of the first companies outside of Yandex which switched to ClickHouse from other analytical DBMS in production. Later on, Alexander also co-founded Altinity, a company that specializes in helping others to migrate to ClickHouse and then effectively use it to achieve their business goals. The talk has covered many specific topics that are important for those who are in the middle of such migration or just considering it ([Slides](https://presentations.clickhouse.com/meetup12/migration.pptx)).
 
 Alexey Zatelepin explaining how ClickHouse sparse index works and other implementation details:
-![Alexey Zatelepin](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/4.jpg)
+![Alexey Zatelepin](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/4.jpg)
 
-Alexey Zatelepin's technical talk was focused on providing engineers some insights on why ClickHouse is that fast in OLAP workloads and how to leverage its design and core features as a primary index, replication, and distributed tables to achieve great performance and reliability ([slides](https://presentations.clickhouse.tech/meetup12/internals.pdf)).
+Alexey Zatelepin's technical talk was focused on providing engineers some insights on why ClickHouse is that fast in OLAP workloads and how to leverage its design and core features as a primary index, replication, and distributed tables to achieve great performance and reliability ([slides](https://presentations.clickhouse.com/meetup12/internals.pdf)).
 
 Jack Gao gives an extensive overview of ClickHouse and it's use cases in Chinese:
-![Jack Gao](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/5.jpg)
+![Jack Gao](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/5.jpg)
 
 As we have learned during meet up and the rest of our business trip, actually there are many companies in China that are already using or seriously evaluating ClickHouse to use either part of their products or for internal analytics. Three of them are doing this long and extensively enough to give a full talk about their progress and experience.
 
 In China, in general, and especially in Beijing the knowledge of English is not really common. Chinese people working in the IT industry have to know English well enough to read documentation, but it does not really imply that they can talk or understand verbal English well. So the talks by representatives of local companies were in Chinese.
 
-Jack Gao, ex-DBA and now an analyst at Sina (major social network) have dedicated a significant part of his talk to go over fundamental topics essential to most ClickHouse users. It partially overlapped with previous talks, but this time in Chinese. Also, he covered not only use case of ClickHouse in Sina but also other publicly known cases by other companies. Considering the reaction of the audience, it has been the most useful talk of the whole meetup, because of the widely useful content, lack of language barrier, and excellent execution of presentation. We even had to sacrifice initially scheduled a short break to give Jack some additional time ([slides](https://presentations.clickhouse.tech/meetup12/power_your_data.pdf)).
+Jack Gao, ex-DBA and now an analyst at Sina (major social network) have dedicated a significant part of his talk to go over fundamental topics essential to most ClickHouse users. It partially overlapped with previous talks, but this time in Chinese. Also, he covered not only use case of ClickHouse in Sina but also other publicly known cases by other companies. Considering the reaction of the audience, it has been the most useful talk of the whole meetup, because of the widely useful content, lack of language barrier, and excellent execution of presentation. We even had to sacrifice initially scheduled a short break to give Jack some additional time ([slides](https://presentations.clickhouse.com/meetup12/power_your_data.pdf)).
 
-Yang Xujun from Dataliance / UltraPower, which provides outsourced data analysis platform to telecom companies in China, have demonstrated why they decided to move away from reports prepared offline in Apache Hadoop / Spark and exported to MySQL towards ClickHouse. In short: Hadoop is too slow and cumbersome ([slides](https://presentations.clickhouse.tech/meetup12/telecom.pdf)).
+Yang Xujun from Dataliance / UltraPower, which provides outsourced data analysis platform to telecom companies in China, have demonstrated why they decided to move away from reports prepared offline in Apache Hadoop / Spark and exported to MySQL towards ClickHouse. In short: Hadoop is too slow and cumbersome ([slides](https://presentations.clickhouse.com/meetup12/telecom.pdf)).
 
 It might sound obvious, but the huge Chinese population generates insane amounts of data to store and process. So IT companies operating mostly on the local Chinese market are often handling amounts of information comparable to even the largest global companies.
 
-Kent Wang from Splunk Shanghai R&D center has demonstrated the current state of ClickHouse integration into Splunk ecosystem. Basically, they have plugged ClickHouse into their system via JDBC driver to allow data from ClickHouse to be easily accessed in Splunk UI and dashboards. Last spring Yandex ClickHouse team actually had a friendly visit to Splunk office in San Francisco to discuss potential points of interaction and exchange experience, so it was great to hear that there's some real progress in that direction ([slides](https://presentations.clickhouse.tech/meetup12/splunk.pdf)).
+Kent Wang from Splunk Shanghai R&D center has demonstrated the current state of ClickHouse integration into Splunk ecosystem. Basically, they have plugged ClickHouse into their system via JDBC driver to allow data from ClickHouse to be easily accessed in Splunk UI and dashboards. Last spring ClickHouse team actually had a friendly visit to Splunk office in San Francisco to discuss potential points of interaction and exchange experience, so it was great to hear that there's some real progress in that direction ([slides](https://presentations.clickhouse.com/meetup12/splunk.pdf)).
 
-The last talk was for the most tenacious ClickHouse users. Alexey Milovidov has announced some recently released features and improvements and shared what's coming next either in the short and long term [slides](https://presentations.clickhouse.tech/meetup12/news_and_plans/).
+The last talk was for the most tenacious ClickHouse users. Alexey Milovidov has announced some recently released features and improvements and shared what's coming next either in the short and long term [slides](https://presentations.clickhouse.com/meetup12/news_and_plans/).
 
 Here is an over 5 hours long video recording of main meetup session:
 
@@ -62,7 +62,7 @@ ClickHouse Community Meetup afterparty.
 ##}
 
 Pre-meetup meeting of speakers and most active ClickHouse users in China:
-![Pre-meetup meeting](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/6.jpg)
+![Pre-meetup meeting](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/6.jpg)
 
 ClickHouse Community Meetup afterparty:
-![ClickHouse Community Meetup afterparty](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/7.jpg)
+![ClickHouse Community Meetup afterparty](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-january-27-2018/7.jpg)
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md
index a794a5f7a7e..5934e34cb25 100644
--- a/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md
+++ b/website/blog/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018.md
@@ -1,37 +1,37 @@
 ---
 title: 'ClickHouse Community Meetup in Beijing on October 28, 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/main.jpg'
 date: '2018-11-12'
 tags: ['meetup', 'Beijing', 'China', 'Asia', 'events']
 ---
 
 Interest in ClickHouse among Chinese experts is growing rapidly. It was second ClickHouse Meetup in Beijing this year and the venue was more than full, it could fit only about 170 people out of 500 who signed up and around 2000 more joined the live translation online. Many Chinese companies have already adopted ClickHouse in production and are willing to share their experience.
 
-See the **[video recording of all talks](http://play.yunxi.tv/livestream/flash?id=05527cf6e260448b9d880b99d2cf4d40)** and **[all slides](https://github.com/yandex/clickhouse-presentations/tree/master/meetup19)**.
+See the **[video recording of all talks](http://play.yunxi.tv/livestream/flash?id=05527cf6e260448b9d880b99d2cf4d40)** and **[all slides](https://github.com/ClickHouse/clickhouse-presentations/tree/master/meetup19)**.
 
 Welcome word by William Kwok (郭炜), CTO of Analysys, who played a key role in organizing this event:
-![William Kwok](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/1.jpg)
+![William Kwok](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/1.jpg)
 
 Nikolay Kochetov from Yandex demonstrating recent advancements in string processing optimization using LowCardinality feature:
-![Nikolay Kochetov from Yandex](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/2.jpg)
+![Nikolay Kochetov from Yandex](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/2.jpg)
 
 Shang Shujie (尚书杰) from Kuaishou gives an overview of ClickHouse and it's usage scenarios:
-![Shang Shujie](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/3.jpg)
+![Shang Shujie](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/3.jpg)
 
 Winter Zhang (张健) from QingCloud explains their services based on ClickHouse:
-![Winter Zhang](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/4.jpg)
+![Winter Zhang](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/4.jpg)
 
 Audience listening to Zhang's talk:
-![Audience listening to Zhang's talk](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/5.jpg)
+![Audience listening to Zhang's talk](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/5.jpg)
 
 Li Junfei (李俊飞) from Tencent explains how ClickHouse fits their data processing infrastructure:
-![Li Junfei](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/6.jpg)
+![Li Junfei](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/6.jpg)
 
 Questions&Answers session:
-![Q&A](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/7.jpg)
+![Q&A](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/7.jpg)
 
 Jack Gao (高鹏) from Sina explains their ClickHouse use case and gives some advice based on their extensive experience with ClickHouse:
-![Jack Gao](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/8.jpg)
+![Jack Gao](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/8.jpg)
 
 Chinese developers are also one of the most active worldwide in contributing to ClickHouse source code compared to other countries. Chinese ClickHouse Contributors Awards 2018 ceremony was also part of the meetup agenda with the following:
 
@@ -42,13 +42,13 @@ Chinese developers are also one of the most active worldwide in contributing to
 A special award went to William Kwok (郭炜) for his active role in developing the Chinese ClickHouse Community.
 
 Sundy Li (李本旺) receives ClickHouse Contributor Award from Alexey Milovidov:
-![Sundy Li](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/9.jpg)
+![Sundy Li](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/9.jpg)
 
 William Kwok (郭炜) receives special award for organizing Chinese ClickHouse community and meetups:
-![William Kwok](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/10.jpg)
+![William Kwok](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/10.jpg)
 
 Pre-meetup at the Analysys office:
-![Pre-meetup](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/11.jpg)
+![Pre-meetup](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-beijing-on-october-28-2018/11.jpg)
 
 
 
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md
index 1db4b33c8dc..2f86859c3f9 100644
--- a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md
+++ b/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018.md
@@ -1,20 +1,20 @@
 ---
 title: 'ClickHouse Community Meetup in Berlin on July 3, 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/main.jpg'
 date: '2018-07-05'
 tags: ['meetup', 'Berlin', 'Germany', 'events']
 ---
 
 Just a few months ago Brenno Oliveira from Delivery Hero has dropped us an email saying that they want to host a meetup of ClickHouse community in their HQ and together we made it happen. Actually, renting a suitable room is one of the main limiting factors on how often ClickHouse meetups can happen worldwide and it was very kind of Delivery Hero to provide it for free. Bringing interesting speakers was the easy part as there are more and more companies adopting ClickHouse and willing to share their stories. Being an open-source product has its advantages after all. About 50 people have shown up from 75 sign-ups, which is way above the typical rate.
 
-To get started Alexander Zaitsev from Altinity gave an overview of ClickHouse for those who are not that familiar with the technology yet. He was using use cases from his personal experience and their clients as examples. Here are [the slides](https://presentations.clickhouse.tech/meetup16/introduction.pdf), unfortunately, no video this time.
+To get started Alexander Zaitsev from Altinity gave an overview of ClickHouse for those who are not that familiar with the technology yet. He was using use cases from his personal experience and their clients as examples. Here are [the slides](https://presentations.clickhouse.com/meetup16/introduction.pdf), unfortunately, no video this time.
 
 Gleb Kanterov talking about the usage of ClickHouse for experimentation metrics at Spotify:
-![Gleb Kanterov Spotify](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/1.jpg)
+![Gleb Kanterov Spotify](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/1.jpg)
 
-![Gleb Kanterov Spotify](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/2.jpg)
+![Gleb Kanterov Spotify](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3-2018/2.jpg)
 
-Spotify relies heavily on what Google Cloud Platform provides, but nevertheless found a spot in their infrastructure where only ClickHouse appeared to satisfy the requirements. Gleb Kanterov has demonstrated their approach to conducting experiments and measuring if they are worth being promoted to production solutions. Using ClickHouse has allowed them to build a framework scalable to thousands of metrics, which in the end makes them move even faster and break fewer things. Checking out [full slides](https://presentations.clickhouse.tech/meetup16/spotify.pdf) is highly recommended and here are a few quotes:
+Spotify relies heavily on what Google Cloud Platform provides, but nevertheless found a spot in their infrastructure where only ClickHouse appeared to satisfy the requirements. Gleb Kanterov has demonstrated their approach to conducting experiments and measuring if they are worth being promoted to production solutions. Using ClickHouse has allowed them to build a framework scalable to thousands of metrics, which in the end makes them move even faster and break fewer things. Checking out [full slides](https://presentations.clickhouse.com/meetup16/spotify.pdf) is highly recommended and here are a few quotes:
 
 -   **Requirements**
     - Serve 100-s of QPS with sub-second latency
@@ -34,6 +34,6 @@ Spotify relies heavily on what Google Cloud Platform provides, but nevertheless
     - Superset integration is great
     - Easy to query using clickhouse-jdbc and jooq
 
-The last talk by Alexey Milovidov was pretty technical and mostly intended for a deeper understanding of what's going on inside ClickHouse, see [the slides](https://presentations.clickhouse.tech/meetup16/internals.pdf). There were many experienced users in the audience who didn't mind staying late to hear that and ask very relevant questions. Actually, we had to leave the building way before people were out of topics to discuss.
+The last talk by Alexey Milovidov was pretty technical and mostly intended for a deeper understanding of what's going on inside ClickHouse, see [the slides](https://presentations.clickhouse.com/meetup16/internals.pdf). There were many experienced users in the audience who didn't mind staying late to hear that and ask very relevant questions. Actually, we had to leave the building way before people were out of topics to discuss.
 
-If your company regularly hosts technical meetups and you are looking for interesting topics to talk about, ClickHouse might be in pretty high demand. Feel free to write Yandex ClickHouse team via [this form](http://clickhouse.tech/#meet) if you are interested to host a similar event in your city and we'll find a way to cooperate and bring in other ClickHouse community members.
+If your company regularly hosts technical meetups and you are looking for interesting topics to talk about, ClickHouse might be in pretty high demand. Feel free to write ClickHouse team via [this form](http://clickhouse.com/#meet) if you are interested to host a similar event in your city and we'll find a way to cooperate and bring in other ClickHouse community members.
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md b/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md
index 7e0082cd570..beb06f1f3d4 100644
--- a/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md
+++ b/website/blog/en/2018/clickhouse-community-meetup-in-berlin-on-july-3.md
@@ -1,6 +1,6 @@
 ---
 title: 'Announcing ClickHouse Community Meetup in Berlin on July 3'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-berlin-on-july-3/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-berlin-on-july-3/main.jpg'
 date: '2018-06-25'
 tags: ['meetup', 'Berlin', 'Germany', 'events', 'announcement']
 ---
diff --git a/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md b/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md
index 4f9874af655..a8c5c2a92dd 100644
--- a/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md
+++ b/website/blog/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Community Meetup in Paris on October 2, 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/main.jpg'
 date: '2018-10-09'
 tags: ['meetup', 'Paris', 'France', 'events']
 ---
@@ -8,13 +8,13 @@ tags: ['meetup', 'Paris', 'France', 'events']
 Agenda of Paris ClickHouse Meetup was full of use cases, mostly from France-based companies which are actively using ClickHouse. Slides for all talks are [available on the GitHub](https://github.com/clickhouse/clickhouse-presentations/tree/master/meetup18).
 
 Christophe Kalenzaga and Vianney Foucault, engineers from ContentSquare, company that provided the meetup venue:
-![Christophe Kalenzaga and Vianney Foucault](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/1.jpg)
+![Christophe Kalenzaga and Vianney Foucault](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/1.jpg)
 
 Matthieu Jacquet from Storetail (Criteo):
-![Matthieu Jacquet](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/2.jpg)
+![Matthieu Jacquet](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/2.jpg)
 
 The audience:
-![Audience](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/3.jpg)
+![Audience](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/3.jpg)
 
 Networking after the meetup:
-![Networking](https://blog-images.clickhouse.tech/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/4.jpg)
+![Networking](https://blog-images.clickhouse.com/en/2018/clickhouse-community-meetup-in-paris-on-october-2-2018/4.jpg)
diff --git a/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md b/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md
index 080caf610e5..ad408d51658 100644
--- a/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md
+++ b/website/blog/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup in Amsterdam on November 15, 2018'
-image: 'https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/main.jpg'
 date: '2018-11-22'
 tags: ['meetup', 'Amsterdam', 'Netherlands', 'events']
 ---
@@ -8,20 +8,20 @@ tags: ['meetup', 'Amsterdam', 'Netherlands', 'events']
 20th ClickHouse Meetup took place in Amsterdam, which appeared to be a convenient location for people from all over Europe to join the event, including Austria, Czech Republic and Germany. We were also glad to see people from many local companies including Booking.com, Crobox, Marktplaats (eBay), MessageBird and others.
 
 Aleksandar Aleksandrov and Felix Mattrat, data engineers from MessageBird, show how they use ClickHouse to analyze process of delivery of SMS and other kinds of messages:
-![Aleksandar Aleksandrov and Felix Mattrat](https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/1.jpg)
+![Aleksandar Aleksandrov and Felix Mattrat](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/1.jpg)
 
-Nikolay Kochetov from Yandex ClickHouse team demonstrates recent features related to string processing optimization:
-![Nikolay Kochetov from Yandex ClickHouse team](https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/2.jpg)
+Nikolay Kochetov from ClickHouse team demonstrates recent features related to string processing optimization:
+![Nikolay Kochetov from ClickHouse team](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/2.jpg)
 
 Konstantin Ignatov from Qrator Labs shares his experience in using ClickHouse as time-series database:
-![Konstantin Ignatov from Qrator Labs](https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/3.jpg)
+![Konstantin Ignatov from Qrator Labs](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/3.jpg)
 
 Aurimas Jacikevicius from Altinity demonstrates benchmark of ClickHouse against TimescaleDB and InfluxDB under time-series workload:
-![Aurimas Jacikevicius from Altinity](https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/4.jpg)
+![Aurimas Jacikevicius from Altinity](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/4.jpg)
 
 Roy Brondgeest from Crobox showcases [ClickHouse Scala reactive client](https://github.com/crobox/clickhouse-scala-client) and it's bundled [DSL for query building](https://github.com/crobox/clickhouse-scala-client/wiki):
-![Roy Brondgeest from Crobox](https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/5.jpg)
+![Roy Brondgeest from Crobox](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/5.jpg)
 
 Alexey Milovidov from Yandex closes the meetup with talk about performance analysis of ClickHouse queries:
-![Alexey Milovidov from Yandex](https://blog-images.clickhouse.tech/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/6.jpg)
+![Alexey Milovidov from Yandex](https://blog-images.clickhouse.com/en/2018/clickhouse-meetup-in-amsterdam-on-november-15-2018/6.jpg)
 
diff --git a/website/blog/en/2018/concept-cloud-mergetree-tables.md b/website/blog/en/2018/concept-cloud-mergetree-tables.md
index 9d4818ba8d7..4d19a3299b3 100644
--- a/website/blog/en/2018/concept-cloud-mergetree-tables.md
+++ b/website/blog/en/2018/concept-cloud-mergetree-tables.md
@@ -1,6 +1,6 @@
 ---
 title: 'Concept: "Cloud" MergeTree Tables'
-image: 'https://blog-images.clickhouse.tech/en/2018/concept-cloud-mergetree-tables/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2018/concept-cloud-mergetree-tables/main.jpg'
 date: '2018-11-23'
 tags: ['concept', 'MergeTree', 'future', 'sharding']
 ---
diff --git a/website/blog/en/2019/clickhouse-at-percona-live-2019.md b/website/blog/en/2019/clickhouse-at-percona-live-2019.md
index 15a9973c0d0..37beb163f1d 100644
--- a/website/blog/en/2019/clickhouse-at-percona-live-2019.md
+++ b/website/blog/en/2019/clickhouse-at-percona-live-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse at Percona Live 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/main.jpg'
 date: '2019-06-04'
 tags: ['Percona Live','USA','Texas','Austin', 'events', 'conference']
 ---
@@ -8,31 +8,31 @@ tags: ['Percona Live','USA','Texas','Austin', 'events', 'conference']
 This year American episode of [Percona Live](https://www.percona.com/live/19/) took place in nice waterfront location in Austin, TX, which welcomed open source database experts with pretty hot weather. ClickHouse community is undeniably growing and it became a common database product to give a talk about or at least compare or refer to, while just [two short years ago](../2017/clickhouse-at-percona-live-2017.md) it was more like “wth is ClickHouse?”.
 
 Alexey Rubin from VirtualHealth compared two column-oriented databases: ClickHouse and MariaDB Column Store. Bottom line was no surprise, ClickHouse is noticeably faster and MariaDB is more familiar for MySQL users, details were useful though.
-![Alexey Rubin from VirtualHealth](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/1.jpg)
+![Alexey Rubin from VirtualHealth](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/1.jpg)
 
 Alexey Milovidov from Yandex have demonstrated how exactly ClickHouse became even faster in recent releases.
-![Alexey Milovidov from Yandex](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/2.jpg)
+![Alexey Milovidov from Yandex](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/2.jpg)
 
 Alexander Zaitsev and Robert Hodges from Altinity have given an entry level tutorial to ClickHouse, which included loading in demo dataset and going through realistic queries against it with some extra variation demonstrating possible query optimization techniques. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Making%20HTAP%20Real%20with%20TiFlash%20--%20A%20TiDB%20Native%20Columnar%20Extension%20-%20FileId%20-%20174070.pdf). Also Altinity was sponsoring the ClickHouse booth in Expo Hall which became an easy spot for people interested in ClickHouse to chat outside of talks.
-![Alexander Zaitsev and Robert Hodges from Altinity](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/3.jpg)
+![Alexander Zaitsev and Robert Hodges from Altinity](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/3.jpg)
 
 Ruoxi Sun from PingCAP introduced TiFlash, column-oriented add-on to TiDB for analytics based on ClickHouse source code. Basically it provides [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree/)-like table engine that is hooked up to TiDB replication and has in-memory row-friendly cache for recent updates. Unfortunately, PingCAP has no plans  to bring TiFlash to opensource at the moment. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Making%20HTAP%20Real%20with%20TiFlash%20--%20A%20TiDB%20Native%20Columnar%20Extension%20-%20FileId%20-%20174070.pdf).
-![Ruoxi Sun from PingCAP](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/4.jpg)
+![Ruoxi Sun from PingCAP](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/4.jpg)
 
 ClickHouse has also been covered in talk by Jervin Real and Francisco Bordenave from Percona with overview of moving and replicating data around MySQL-compatible storage solutions. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Replicating%20MySQL%20Data%20to%20TiDB%20For%20Real-Time%20Analytics%20-%20FileId%20-%20187672.pdf).
-![Jervin Real](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/5.jpg)
+![Jervin Real](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/5.jpg)
 
 ClickHouse represented columnar storage systems in venture beyond relational by Marcos Albe from Percona.
-![Marcos Albe from Percona](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/6.jpg)
+![Marcos Albe from Percona](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/6.jpg)
 
 Jervin Real from Percona have demonstrated real case study of applying ClickHouse in practice. It heavily involved manual partitions manipulation, hopefully audience have understood that it is an option, but not exactly a best practice for most use cases. [Slides](https://www.percona.com/live/19/sites/default/files/slides/Low%20Cost%20Transactional%20and%20Analytics%20With%20MySQL%20and%20Clickhouse,%20Have%20Your%20Cake%20and%20Eat%20It%20Too!%20-%20FileId%20-%20187674.pdf).
-![Jervin Real from Percona](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/7.jpg)
+![Jervin Real from Percona](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/7.jpg)
 
 Evgeny Potapov from ITSumma went through modern options for time-series storage and once more confirmed ClickHouse is leading the way in this field as well.
-![Evgeny Potapov from ITSumma](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/8.jpg)
+![Evgeny Potapov from ITSumma](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/8.jpg)
 
 Event location in the center of US provided equal opportunities for peoplefrom East and West Coast to show up, but presence of people from other countries was also quite noticeable. The content they all brought in was top notch as usual.
-![The venue](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/9.jpg)
+![The venue](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/9.jpg)
 
 Austin after the Event.
-![Austin](https://blog-images.clickhouse.tech/en/2019/clickhouse-at-percona-live-2019/10.jpg)
+![Austin](https://blog-images.clickhouse.com/en/2019/clickhouse-at-percona-live-2019/10.jpg)
diff --git a/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md b/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md
index ab55f746bdd..f9a156fa54b 100644
--- a/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md
+++ b/website/blog/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Lecture at Institute of Computing Technology, Chinese Academy of Science on June 11, 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019/main.jpg'
 tags: ['lecture', 'events', 'China', 'Beijing', 'university', 'academy', 'institute']
 date: '2019-06-14'
 ---
@@ -13,5 +13,5 @@ Alexey Milovidov, head of ClickHouse development group at Yandex, have given an
 The event has been organised by [Amos Bird](https://github.com/amosbird), who is one of the most active ClickHouse community members and contributors, at the same time being a last year PhD student at this institution.
 
 Alexey with the event announcement:
-![Alexey with the event announcement](https://blog-images.clickhouse.tech/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019/1.jpg)
+![Alexey with the event announcement](https://blog-images.clickhouse.com/en/2019/clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019/1.jpg)
 
diff --git a/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md b/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md
index ace5967736c..46685db0c37 100644
--- a/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md
+++ b/website/blog/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019.md
@@ -1,35 +1,35 @@
 ---
 title: 'ClickHouse Meetup in Beijing on June 8, 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/main.jpg'
 date: '2019-06-13'
 tags: ['meetup','Beijing','China','events']
 ---
 
-24th ClickHouse Meetup globally and 3rd one in China took place in Beijing on Dragon Boat Festival weekend, which appeared to have a rich history and be a popular opportunity for Chinese people to travel around the country. Nevertheless the ClickHouse Meetup venue was more than full as usual, this time kindly provided by Gaea Mobile, with hundreds more people watching live broadcast online. Yandex ClickHouse team have extensively used this trip as an opportunity to strengthen the bond with ClickHouse Community in China by also giving an [open lecture in  Institute of Computing Technology, Chinese Academy of Science](clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md) and by having a private conversations with the most active local corporate users including ByteDance and JD.com.
+24th ClickHouse Meetup globally and 3rd one in China took place in Beijing on Dragon Boat Festival weekend, which appeared to have a rich history and be a popular opportunity for Chinese people to travel around the country. Nevertheless the ClickHouse Meetup venue was more than full as usual, this time kindly provided by Gaea Mobile, with hundreds more people watching live broadcast online. ClickHouse team have extensively used this trip as an opportunity to strengthen the bond with ClickHouse Community in China by also giving an [open lecture in  Institute of Computing Technology, Chinese Academy of Science](clickhouse-lecture-at-institute-of-computing-technology-chinese-academy-of-science-on-june-11-2019.md) and by having a private conversations with the most active local corporate users including ByteDance and JD.com.
 
 Welcome word by William Kwok, CTO of Analysys, who played the key role in making this event in particular possible and also in establishment of ClickHouse Community in China:
-![William Kwok, CTO of Analysys](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/1.jpg)
+![William Kwok, CTO of Analysys](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/1.jpg)
 
 He's also administering ClickHouse WeChat groups, feel free to ask him for invite (@guodaxia2999 at WeChat):
-![@guodaxia2999 at WeChat](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/2.jpg)
+![@guodaxia2999 at WeChat](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/2.jpg)
 
 Alexey Milovidov from ClickHouse core developers team at Yandex got the content part of main event part started with overview of new features and roadmap overview:
-![Alexey Milovidov](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/3.jpg)
+![Alexey Milovidov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/3.jpg)
 
 Amos Bird, one of the most active ClickHouse contributors either in China and worldwide, shares his experience of using ClickHouse for graph processing ([slides](https://github.com/ClickHouse/clickhouse-presentations/raw/master/meetup24/2.%20SQLGraph%20--%20When%20ClickHouse%20marries%20graph%20processing%20Amoisbird.pdf)):
-![Amos Bird](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/4.jpg)
+![Amos Bird](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/4.jpg)
 
-Yan Gangqiang from Golden Data shares details of their approach to data storage for surveys system based on ClickHouse ([slides](https://presentations.clickhouse.tech/meetup24/3.%20金数据数据架构调整方案Public.pdf)):
-![Yan Gangqiang](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/5.jpg)
+Yan Gangqiang from Golden Data shares details of their approach to data storage for surveys system based on ClickHouse ([slides](https://presentations.clickhouse.com/meetup24/3.%20金数据数据架构调整方案Public.pdf)):
+![Yan Gangqiang](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/5.jpg)
 
-ClickHouse for beginners talk by Percent ([slides](https://presentations.clickhouse.tech/meetup24/4.%20ClickHouse万亿数据双中心的设计与实践%20.pdf)):
-![Percent](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/6.jpg)
+ClickHouse for beginners talk by Percent ([slides](https://presentations.clickhouse.com/meetup24/4.%20ClickHouse万亿数据双中心的设计与实践%20.pdf)):
+![Percent](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/6.jpg)
 
-ClickHouse core developer Nikolay Kochetov demonstrates upcoming query execution pipeline changes ([slides](https://presentations.clickhouse.tech/meetup24/5.%20Clickhouse%20query%20execution%20pipeline%20changes/)):
-![Nikolay Kochetov](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/7.jpg)
+ClickHouse core developer Nikolay Kochetov demonstrates upcoming query execution pipeline changes ([slides](https://presentations.clickhouse.com/meetup24/5.%20Clickhouse%20query%20execution%20pipeline%20changes/)):
+![Nikolay Kochetov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/7.jpg)
 
 Pre-meetup meeting with active ClickHouse community members in China:
-![Pre-meetup meeting](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/8.jpg)
+![Pre-meetup meeting](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/8.jpg)
 
 ClickHouse branded Beijing duck :)
-![ClickHouse branded Beijing duck](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/9.jpg)
+![ClickHouse branded Beijing duck](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-beijing-on-june-8-2019/9.jpg)
diff --git a/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md b/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md
index 71176ab3d47..0ca02aaac66 100644
--- a/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md
+++ b/website/blog/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019.md
@@ -1,41 +1,41 @@
 ---
 title: 'ClickHouse Meetup in Limassol on May 7, 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/main.jpg'
 date: '2019-05-14'
 tags: ['meetup', 'Cyprus', 'Limassol', 'events']
 ---
 
 The first open-air ClickHouse Meetup took place in the heart of Limassol, the second-largest city of Cyprus, on the roof kindly provided by Exness Group. The views were stunning, but speakers did a great job competing with them for audience attention. Over one hundred people have joined in, which once again confirms high interest in ClickHouse around the globe. Meetup content is also available as [video recording](https://www.youtube.com/watch?v=_rpU-TvSfZ8).
 
-![Intro](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/1.jpg)
+![Intro](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/1.jpg)
 
-[Kirill Shvakov](https://github.com/kshvakov) has played the key role in making this event possible by reaching out to the ClickHouse Community at Cyprus, finding the great venue, and other speakers. Most of the worldwide ClickHouse Meetups happen thanks to active community members like Kirill, if you want to help us organize ClickHouse Meetup in your area, please reach the Yandex ClickHouse team via [this form](https://clickhouse.tech/#meet) or any other convenient way.
+[Kirill Shvakov](https://github.com/kshvakov) has played the key role in making this event possible by reaching out to the ClickHouse Community at Cyprus, finding the great venue, and other speakers. Most of the worldwide ClickHouse Meetups happen thanks to active community members like Kirill, if you want to help us organize ClickHouse Meetup in your area, please reach the ClickHouse team via [this form](https://clickhouse.com/#meet) or any other convenient way.
 
-![Kirill Shvakov](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/2.jpg)
+![Kirill Shvakov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/2.jpg)
 
-Kirill is well known for his top-notch [ClickHouse Go Driver](https://github.com/clickhouse/clickhouse-go) running over native protocol, but his opening talk was about his experience optimizing ClickHouse queries and solving real-world tasks at Integros and Wisebits. [Slides](https://presentations.clickhouse.tech/meetup22/strategies.pdf). [Full query listings](https://github.com/kshvakov/ClickHouse-Meetup-Exness).
+Kirill is well known for his top-notch [ClickHouse Go Driver](https://github.com/clickhouse/clickhouse-go) running over native protocol, but his opening talk was about his experience optimizing ClickHouse queries and solving real-world tasks at Integros and Wisebits. [Slides](https://presentations.clickhouse.com/meetup22/strategies.pdf). [Full query listings](https://github.com/kshvakov/ClickHouse-Meetup-Exness).
 
 The event has begun in the early evening...
-![Evening in Limassol](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/3.jpg)
+![Evening in Limassol](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/3.jpg)
 
 ...but it took just around one hour for nature to turn the night mode on. It made the projected slides easier to read.
-![Night in Limassol](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/4.jpg)
+![Night in Limassol](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/4.jpg)
 
-Sergey Tomilov with his colleagues from the Exness Platform Team has shared details on the evolution of their systems for analyzing logs and metrics and how they ended up relying on ClickHouse for long-term storage ([slides](https://presentations.clickhouse.tech/meetup22/exness.pdf)):
-![Sergey Tomilov](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/5.jpg)
+Sergey Tomilov with his colleagues from the Exness Platform Team has shared details on the evolution of their systems for analyzing logs and metrics and how they ended up relying on ClickHouse for long-term storage ([slides](https://presentations.clickhouse.com/meetup22/exness.pdf)):
+![Sergey Tomilov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/5.jpg)
 
-Alexey Milovidov from the Yandex ClickHouse team has demonstrated features from recent ClickHouse releases and gave an update on what's coming soon ([slides](https://presentations.clickhouse.tech/meetup22/new_features/)):
-![Alexey Milovidov](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/6.jpg)
+Alexey Milovidov from the ClickHouse team has demonstrated features from recent ClickHouse releases and gave an update on what's coming soon ([slides](https://presentations.clickhouse.com/meetup22/new_features/)):
+![Alexey Milovidov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/6.jpg)
 
-Alexander Zaitsev, CTO of Altinity, have shown an overview of how to integrate ClickHouse into environments running on Kubernetes ([slides](https://presentations.clickhouse.tech/meetup22/kubernetes.pdf)):
-![Alexander Zaitsev, CTO of Altinity](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/7.jpg)
+Alexander Zaitsev, CTO of Altinity, have shown an overview of how to integrate ClickHouse into environments running on Kubernetes ([slides](https://presentations.clickhouse.com/meetup22/kubernetes.pdf)):
+![Alexander Zaitsev, CTO of Altinity](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/7.jpg)
 
-Vladimir Goncharov, a backend engineer from Aloha Browser, has closed the ClickHouse Limassol Meetup by demonstrating few projects that allow integrating other opensource tools for logs processing with ClickHouse ([slides](https://presentations.clickhouse.tech/meetup22/aloha.pdf)):
-![Vladimir Goncharov](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/8.jpg)
+Vladimir Goncharov, a backend engineer from Aloha Browser, has closed the ClickHouse Limassol Meetup by demonstrating few projects that allow integrating other opensource tools for logs processing with ClickHouse ([slides](https://presentations.clickhouse.com/meetup22/aloha.pdf)):
+![Vladimir Goncharov](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/8.jpg)
 
 Unfortunately, midnight was closing in and only the most weather-proof ClickHouse fans have managed to stay the whole event as it started getting pretty chilly.
 
-![Final](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/9.jpg)
+![Final](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-limassol-on-may-7-2019/9.jpg)
 
 More photos from the event are available at [short event afterword by Exness](https://www.facebook.com/events/386638262181785/permalink/402167077295570/).
 
diff --git a/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md b/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md
index 6141b4c2fd5..e166c2227ff 100644
--- a/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md
+++ b/website/blog/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup in Madrid on April 2, 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/main.jpg'
 date: '2019-04-11'
 tags: ['meetup', 'Spain', 'Madrid', 'events']
 ---
@@ -8,21 +8,21 @@ tags: ['meetup', 'Spain', 'Madrid', 'events']
 Madrid ClickHouse Meetup has probably been the largest one in the EU so far with well over one hundred attendees. As usual, we've seen not only people working and living in the same city, Madrid, but also many people who have traveled a long way to join the event and talk about ClickHouse use cases and learn about new and upcoming features. 
 
 Opening word by [Javi Santana](https://twitter.com/javisantana), who personally made this event possible by gathering up all the people and setting up the venue provided by Google Campus for Startups:
-![Javi Santana](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/1.jpg)
+![Javi Santana](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/1.jpg)
 
 Alexander Zaitsev, CTO of Altinity, has introduced ClickHouse to those who're just starting to use it or only considering for future ([slides](https://www.slideshare.net/Altinity/clickhouse-introduction-by-alexander-zaitsev-altinity-cto)):
-![Alexander Zaitsev](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/2.jpg)
+![Alexander Zaitsev](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/2.jpg)
 
 Robert Hodges, CEO of Altinity, has probably traveled the longest distance to join the event since he's based in California and he has also [published his thoughts on this event in the Altinity blog](https://www.altinity.com/blog/2019/4/9/madrid-clickhouse-meetup-summary).
 
-Alexey Milovidov from Yandex has shown the recent advancements in ClickHouse features and briefly walked the audience through the current roadmap ([slides](https://presentations.clickhouse.tech/meetup21/new_features/)):
-![Alexey Milovidov from Yandex](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/3.jpg)
+Alexey Milovidov from Yandex has shown the recent advancements in ClickHouse features and briefly walked the audience through the current roadmap ([slides](https://presentations.clickhouse.com/meetup21/new_features/)):
+![Alexey Milovidov from Yandex](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/3.jpg)
 
 Iago Enriquez from Idealista was talking about their migration from “legacy” commercial DBMS to ClickHouse. It was the first time we've heard that someone talking about using two flagship opensource products by Yandex together in production. They are using [CatBoost](https://catboost.ai/) model inference right from ClickHouse SQL queries to fill in the incompleteness of their source data. Unfortunately, slides of Iago's talk were not allowed to be published.
-![Iago Enriquez from Idealista](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/4.jpg)
+![Iago Enriquez from Idealista](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/4.jpg)
 
-David Pardo Villaverde from Corunet gave a talk about how they've used ClickHouse to prepare data for dense model generation for one of their clients. It took a pretty short time on a single server. Fun quote from conclusions: “If I wasn't already married, I'd marry it! \[ClickHouse\]” ([slides](https://presentations.clickhouse.tech/meetup21/predictive_models.pdf)):
-![David Pardo Villaverde from Corunet](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/5.jpg)
+David Pardo Villaverde from Corunet gave a talk about how they've used ClickHouse to prepare data for dense model generation for one of their clients. It took a pretty short time on a single server. Fun quote from conclusions: “If I wasn't already married, I'd marry it! \[ClickHouse\]” ([slides](https://presentations.clickhouse.com/meetup21/predictive_models.pdf)):
+![David Pardo Villaverde from Corunet](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/5.jpg)
 
-Closing talk of the meetup was by Murat Kabilov fro Adjust Gmbh, he was demonstrating his opensource project [pg2ch](https://github.com/mkabilov/pg2ch) that allows to sync data from PostgreSQL to ClickHouse in real-time ([slides](https://presentations.clickhouse.tech/meetup21/postgres_to_clickhouse.pdf)).
-![Murat Kabilov fro Adjust Gmbh](https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/6.jpg)
+Closing talk of the meetup was by Murat Kabilov fro Adjust Gmbh, he was demonstrating his opensource project [pg2ch](https://github.com/mkabilov/pg2ch) that allows to sync data from PostgreSQL to ClickHouse in real-time ([slides](https://presentations.clickhouse.com/meetup21/postgres_to_clickhouse.pdf)).
+![Murat Kabilov fro Adjust Gmbh](https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-madrid-on-april-2-2019/6.jpg)
diff --git a/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md b/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md
index 94ad125b71b..aa468fb6aa9 100644
--- a/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md
+++ b/website/blog/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup in San Francisco on June 4, 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/clickhouse-meetup-in-san-francisco-on-june-4-2019/main.jpg'
 date: '2019-06-12'
 tags: ['meetup','USA','San Francisco','events', 'California', 'Bay Area']
 ---
diff --git a/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md b/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md
index b5799702d04..d4a0923de37 100644
--- a/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md
+++ b/website/blog/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse.md
@@ -1,11 +1,11 @@
 ---
 title: 'How to speed up LZ4 decompression in ClickHouse?'
-image: 'https://blog-images.clickhouse.tech/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/how-to-speed-up-lz4-decompression-in-clickhouse/main.jpg'
 date: '2019-06-25'
 tags: ['performance', 'lz4', 'article', 'decompression']
 ---
 
-When you run queries in [ClickHouse](https://clickhouse.tech/), you might notice that the profiler often shows the `LZ_decompress_fast` function near the top. What is going on? This question had us wondering how to choose the best compression algorithm.
+When you run queries in [ClickHouse](https://clickhouse.com/), you might notice that the profiler often shows the `LZ_decompress_fast` function near the top. What is going on? This question had us wondering how to choose the best compression algorithm.
 
 ClickHouse stores data in compressed form. When running queries, ClickHouse tries to do as little as possible, in order to conserve CPU resources. In many cases, all the potentially time-consuming computations are already well optimized, plus the user wrote a well thought-out query. Then all that's left to do is to perform decompression.
 
diff --git a/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md b/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md
index 726d714b765..c6bfadb8a4b 100644
--- a/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md
+++ b/website/blog/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'Schedule of ClickHouse Meetups in China for 2019'
-image: 'https://blog-images.clickhouse.tech/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2019/schedule-of-clickhouse-meetups-in-china-for-2019/main.jpg'
 date: '2019-04-18'
 tags: ['China', 'Beijing', 'Shanghai', 'Shenzhen', 'announcement', 'meetup']
 ---
diff --git a/website/blog/en/2020/five-methods-for-database-obfuscation.md b/website/blog/en/2020/five-methods-for-database-obfuscation.md
index 9a6615b0079..b13c443ea40 100644
--- a/website/blog/en/2020/five-methods-for-database-obfuscation.md
+++ b/website/blog/en/2020/five-methods-for-database-obfuscation.md
@@ -1,6 +1,6 @@
 ---
 title: 'Five Methods For Database Obfuscation'
-image: 'https://blog-images.clickhouse.tech/en/2020/five-methods-for-database-obfuscation/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2020/five-methods-for-database-obfuscation/main.jpg'
 date: '2020-01-27'
 tags: ['article', 'obfuscation']
 ---
diff --git a/website/blog/en/2020/package-repository-behind-cdn.md b/website/blog/en/2020/package-repository-behind-cdn.md
index c5857bcd4a4..e6b9bafaa4e 100644
--- a/website/blog/en/2020/package-repository-behind-cdn.md
+++ b/website/blog/en/2020/package-repository-behind-cdn.md
@@ -1,6 +1,6 @@
 ---
 title: 'Package Repository Behind CDN'
-image: 'https://blog-images.clickhouse.tech/en/2020/package-repository-behind-cdn/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2020/package-repository-behind-cdn/main.jpg'
 date: '2020-07-02'
 tags: ['article', 'CDN', 'Cloudflare', 'repository', 'deb', 'rpm', 'tgz']
 ---
@@ -8,27 +8,27 @@ tags: ['article', 'CDN', 'Cloudflare', 'repository', 'deb', 'rpm', 'tgz']
 On initial open-source launch, ClickHouse packages were published at an independent repository implemented on Yandex infrastructure. We'd love to use the default repositories of Linux distributions, but, unfortunately, they have their own strict rules on third-party library usage and software compilation options. These rules happen to contradict with how ClickHouse is produced. In 2018 ClickHouse was added to [official Debian repository](https://packages.debian.org/sid/clickhouse-server) as an experiment, but it didn't get much traction. Adaptation to those rules ended up producing more like a demo version of ClickHouse with crippled performance and limited features.
 
 !!! info "TL;DR"
-    If you have configured your system to use <http://repo.yandex.ru/clickhouse/> for fetching ClickHouse packages, replace it with <https://repo.clickhouse.tech/>.
+    If you have configured your system to use <http://repo.yandex.ru/clickhouse/> for fetching ClickHouse packages, replace it with <https://repo.clickhouse.com/>.
 
 Distributing packages via our own repository was working totally fine until ClickHouse has started getting traction in countries far from Moscow, most notably the USA and China. Downloading large files of packages from remote location was especially painful for Chinese ClickHouse users, likely due to how China is connected to the rest of the world via its famous firewall. But at least it worked (with high latencies and low throughput), while in some smaller countries there was completely no access to this repository and people living there had to host their own mirrors on neutral ground as a workaround.
 
-Earlier this year we made the ClickHouse official website to be served via global CDN by [Cloudflare](https://www.cloudflare.com) on a `clickhouse.tech` domain. To solve the download issues discussed above, we have also configured a new location for ClickHouse packages that are also served by Cloudflare at [repo.clickhouse.tech](https://repo.clickhouse.tech). It used to have some quirks, but now it seems to be working fine while improving throughput and latencies in remote geographical locations by over an order of magnitude.
+Earlier this year we made the ClickHouse official website to be served via global CDN by [Cloudflare](https://www.cloudflare.com) on a `clickhouse.com` domain. To solve the download issues discussed above, we have also configured a new location for ClickHouse packages that are also served by Cloudflare at [repo.clickhouse.com](https://repo.clickhouse.com). It used to have some quirks, but now it seems to be working fine while improving throughput and latencies in remote geographical locations by over an order of magnitude.
 
 ## Switching To Repository Behind CDN
 
-This transition has some more benefits besides improving the package fetching, but let's get back to them in a minute. One of the key reasons for this post is that we can't actually influence the repository configuration of ClickHouse users. We have updated all instructions, but for people who have followed these instructions earlier, **action is required** to use the new location behind CDN. Basically, you need to replace `http://repo.yandex.ru/clickhouse/` with `https://repo.clickhouse.tech/` in your package manager configuration.
+This transition has some more benefits besides improving the package fetching, but let's get back to them in a minute. One of the key reasons for this post is that we can't actually influence the repository configuration of ClickHouse users. We have updated all instructions, but for people who have followed these instructions earlier, **action is required** to use the new location behind CDN. Basically, you need to replace `http://repo.yandex.ru/clickhouse/` with `https://repo.clickhouse.com/` in your package manager configuration.
 
 One-liner for Ubuntu or Debian:
 ```bash
-sudo apt-get install apt-transport-https ca-certificates && sudo perl -pi -e 's|http://repo.yandex.ru/clickhouse/|https://repo.clickhouse.tech/|g' /etc/apt/sources.list.d/clickhouse.list && sudo apt-get update
+sudo apt-get install apt-transport-https ca-certificates && sudo perl -pi -e 's|http://repo.yandex.ru/clickhouse/|https://repo.clickhouse.com/|g' /etc/apt/sources.list.d/clickhouse.list && sudo apt-get update
 ```
 
 One-liner for RedHat or CentOS:
 ```bash
-sudo perl -pi -e 's|http://repo.yandex.ru/clickhouse/|https://repo.clickhouse.tech/|g' /etc/yum.repos.d/clickhouse*
+sudo perl -pi -e 's|http://repo.yandex.ru/clickhouse/|https://repo.clickhouse.com/|g' /etc/yum.repos.d/clickhouse*
 ```
 
-As you might have noticed, the domain name is not the only thing that has changed: the new URL uses `https://` protocol. Usually, it's considered less important for package repositories compared to normal websites because most package managers check [GPG signatures](https://en.wikipedia.org/wiki/GNU_Privacy_Guard) for what they download anyway. However it still has some benefits: for example, it's not so uncommon for people to download packages via browser, `curl` or `wget`, and install them manually (while for [tgz](https://repo.clickhouse.tech/tgz/) builds it's the only option). Fewer opportunities for sniffing traffic can't hurt either. The downside is that `apt` in some Debian flavors has no HTTPS support by default and needs a couple more packages to be installed (`apt-transport-https` and `ca-certificates`).
+As you might have noticed, the domain name is not the only thing that has changed: the new URL uses `https://` protocol. Usually, it's considered less important for package repositories compared to normal websites because most package managers check [GPG signatures](https://en.wikipedia.org/wiki/GNU_Privacy_Guard) for what they download anyway. However it still has some benefits: for example, it's not so uncommon for people to download packages via browser, `curl` or `wget`, and install them manually (while for [tgz](https://repo.clickhouse.com/tgz/) builds it's the only option). Fewer opportunities for sniffing traffic can't hurt either. The downside is that `apt` in some Debian flavors has no HTTPS support by default and needs a couple more packages to be installed (`apt-transport-https` and `ca-certificates`).
 
 ## Investigating Repository Usage
 
@@ -51,17 +51,17 @@ Ever heard the [“serverless computing”](https://en.wikipedia.org/wiki/Server
 Implementing it required a little bit of research, but the overall solution appeared to be quite elegant:
 
 1. For a ClickHouse database, it was a no-brainer to use [Yandex Managed Service for ClickHouse](https://cloud.yandex.com/services/managed-clickhouse). With a few clicks in the admin interface, we got a running ClickHouse cluster with properly configured high-availability and automated backups. Ad-hoc SQL queries could be run from that same admin interface.
-2. Cloudflare allows customers to run custom code on CDN edge servers in a serverless fashion (so-called [workers](https://workers.cloudflare.com)). Those workers are executed in a tight sandbox which doesn't allow for anything complicated, but this feature fits perfectly to gather some data about download events and send it somewhere else. This is normally a paid feature, but special thanks to Connor Peshek from Cloudflare who arranged a lot of extra features for free on `clickhouse.tech` when we have applied to their [open-source support program](https://developers.cloudflare.com/sponsorships/). 
-3. To avoid publicly exposing yet another ClickHouse instance (like we did with **[playground](https://clickhouse.tech/docs/en/getting-started/playground/)** regardless of being a 100% anti-pattern), the download event data is sent to [Yandex Cloud Functions](https://cloud.yandex.com/services/functions). It's a generic serverless computing framework at Yandex Cloud, which also allows running custom code without maintaining any servers, but with less strict sandbox limitations and direct access to other cloud services like Managed ClickHouse that was needed for this task.
+2. Cloudflare allows customers to run custom code on CDN edge servers in a serverless fashion (so-called [workers](https://workers.cloudflare.com)). Those workers are executed in a tight sandbox which doesn't allow for anything complicated, but this feature fits perfectly to gather some data about download events and send it somewhere else. This is normally a paid feature, but special thanks to Connor Peshek from Cloudflare who arranged a lot of extra features for free on `clickhouse.com` when we have applied to their [open-source support program](https://developers.cloudflare.com/sponsorships/).
+3. To avoid publicly exposing yet another ClickHouse instance (like we did with **[playground](/docs/en/getting-started/playground/)** regardless of being a 100% anti-pattern), the download event data is sent to [Yandex Cloud Functions](https://cloud.yandex.com/services/functions). It's a generic serverless computing framework at Yandex Cloud, which also allows running custom code without maintaining any servers, but with less strict sandbox limitations and direct access to other cloud services like Managed ClickHouse that was needed for this task.
 4. It didn't require much effort to choose a visualization tool either, as [DataLens BI](https://cloud.yandex.com/docs/datalens/) is tightly integrated with ClickHouse, capable to build what's required right from the UI, and satisfies the “no servers” requirement because it's a SaaS solution. Public access option for charts and dashboards have also appeared to be handy.
 
-There's not so much data collected yet, but here's a live example of how the resulting data visualization looks like. For example, here we can see that LTS releases of ClickHouse are not so popular yet *(yes, we have [LTS releases](https://clickhouse.tech/docs/en/faq/operations/production/)!)*:
+There's not so much data collected yet, but here's a live example of how the resulting data visualization looks like. For example, here we can see that LTS releases of ClickHouse are not so popular yet *(yes, we have [LTS releases](https://clickhouse.com/docs/en/faq/operations/production/)!)*:
 ![iframe](https://datalens.yandex/qk01mwxkgiysm?_embedded=1)
 
 While here we confirmed that `rpm` is at least as popular as `deb`:
 ![iframe](https://datalens.yandex/lfvldsf92i2uh?_embedded=1)
 
-Or you can take a look at all key charts for `repo.clickhouse.tech` together on a handy **[dashboard](https://datalens.yandex/pjzq4rot3t2ql)** with a filtering possibility.
+Or you can take a look at all key charts for `repo.clickhouse.com` together on a handy **[dashboard](https://datalens.yandex/pjzq4rot3t2ql)** with a filtering possibility.
 
 ## Lessons Learned
 
diff --git a/website/blog/en/2020/pixel-benchmark.md b/website/blog/en/2020/pixel-benchmark.md
index b9be7638c38..6714c18a8e4 100644
--- a/website/blog/en/2020/pixel-benchmark.md
+++ b/website/blog/en/2020/pixel-benchmark.md
@@ -1,6 +1,6 @@
 ---
 title: 'Running ClickHouse on an Android phone'
-image: 'https://blog-images.clickhouse.tech/en/2020/pixel-benchmark/main.jpg'
+image: 'https://blog-images.clickhouse.com/en/2020/pixel-benchmark/main.jpg'
 date: '2020-07-16'
 author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
 tags: ['Android', 'benchmark', 'experiment']
@@ -35,7 +35,7 @@ Surprisingly, it's rather simple to set up. Our build system uses CMake and alre
 
 At last, we have a binary we can actually run. Copy it to  the phone, `chmod +x`, `./clickhouse server --config-path db/config.xml`, run some queries, it works!
 
-<img src="https://blog-images.clickhouse.tech/en/2020/pixel-benchmark/segfault.png" width="40%"/>
+<img src="https://blog-images.clickhouse.com/en/2020/pixel-benchmark/segfault.png" width="40%"/>
 
 Feels so good to see my favorite message.
 
@@ -66,9 +66,9 @@ What is this function, and why do we need it? In this particular stack trace, we
 
 ## Is your phone good enough?
 
-There is a beaten genre of using data sets and queries of a varying degree of syntheticity to prove that a particular DBMS you work on has performance superior to other, less advanced, DBMSes. We've moved past that, and instead use the DBMS we love as a benchmark of hardware. For this benchmark we use a small 100M rows obfuscated data set from Yandex.Metrica, about 12 GB compressed, and some queries representative of Metrica dashboards. There is [this page](https://clickhouse.tech/benchmark/hardware/) with crowdsourced results for various cloud and traditional servers and even some laptops, but how do the phones compare? Let's find out. Following [the manual](https://clickhouse.tech/docs/en/operations/performance-test/) to download the necessary data to the phone and run the benchmark was pretty straightforward. One problem was that some queries can't run because they use too much memory and the server gets killed by Android, so I had to script around that. Also, I'm not sure how to reset a file system cache on Android, so the 'cold run' data is not correct. The results look pretty good:
+There is a beaten genre of using data sets and queries of a varying degree of syntheticity to prove that a particular DBMS you work on has performance superior to other, less advanced, DBMSes. We've moved past that, and instead use the DBMS we love as a benchmark of hardware. For this benchmark we use a small 100M rows obfuscated data set from Yandex.Metrica, about 12 GB compressed, and some queries representative of Metrica dashboards. There is [this page](/benchmark/hardware/) with crowdsourced results for various cloud and traditional servers and even some laptops, but how do the phones compare? Let's find out. Following [the manual](/docs/en/operations/performance-test/) to download the necessary data to the phone and run the benchmark was pretty straightforward. One problem was that some queries can't run because they use too much memory and the server gets killed by Android, so I had to script around that. Also, I'm not sure how to reset a file system cache on Android, so the 'cold run' data is not correct. The results look pretty good:
 
-<img src="https://blog-images.clickhouse.tech/en/2020/pixel-benchmark/compare.png" width="80%"/>
+<img src="https://blog-images.clickhouse.com/en/2020/pixel-benchmark/compare.png" width="80%"/>
 
 My phone is Google Pixel 3a, and it is only 5 times slower on average than my Dell XPS 15 work laptop. The queries where the data doesn't fit into memory and has to go to disk (the flash, I mean) are noticeably slower, up to 20 times, but mostly they don't complete because the server gets killed &mdash; it only has about 3 GB of memory available. Overall I think the results look pretty good for the phone. High-end models should be even more performant, reaching performance comparable to some smaller laptops.
 
diff --git a/website/blog/en/2020/the-clickhouse-community.md b/website/blog/en/2020/the-clickhouse-community.md
index 7080fed6479..8fc049955fc 100644
--- a/website/blog/en/2020/the-clickhouse-community.md
+++ b/website/blog/en/2020/the-clickhouse-community.md
@@ -1,6 +1,6 @@
 ---
 title: 'The ClickHouse Community'
-image: 'https://blog-images.clickhouse.tech/en/2020/the-clickhouse-community/clickhouse-community-history.png'
+image: 'https://blog-images.clickhouse.com/en/2020/the-clickhouse-community/clickhouse-community-history.png'
 date: '2020-12-10'
 author: '[Robert Hodges](https://github.com/hodgesrm)'
 tags: ['community', 'open source', 'telegram', 'meetup']
@@ -16,13 +16,13 @@ ClickHouse began as a solution for web analytics in [Yandex Metrica](https://met
 
 This is a classic problem for data warehouses. However, Alexey could not find one that met Yandex requirements, specifically large datasets, linear scaling, high efficiency, and compatibility with SQL tools. In a nutshell: like MySQL but for analytic applications. So Alexey wrote one. It started as a prototype to do GROUP BY operations.
 
-The prototype evolved into a full solution with a name, ClickHouse, short for “Clickstream Data Warehouse”. Alexey added additional features including SQL support and the MergeTree engine. The SQL dialect was superficially similar to MySQL, [which was also used in Metrica](https://clickhouse.tech/blog/en/2016/evolution-of-data-structures-in-yandex-metrica/) but could not handle query workloads without complex pre-aggregation. By 2011 ClickHouse was in production for Metrica.
+The prototype evolved into a full solution with a name, ClickHouse, short for “Clickstream Data Warehouse”. Alexey added additional features including SQL support and the MergeTree engine. The SQL dialect was superficially similar to MySQL, [which was also used in Metrica](/blog/en/2016/evolution-of-data-structures-in-yandex-metrica/) but could not handle query workloads without complex pre-aggregation. By 2011 ClickHouse was in production for Metrica.
 
 Over the next 5 years Alexey and a growing team of developers extended ClickHouse to cover new use cases. By 2016 ClickHouse was a core Metrica backend service. It was also becoming entrenched as a data warehouse within Yandex, extending to use cases like service monitoring, network flow logs, and event management. ClickHouse had evolved from the original one-person project to business critical software with a full team of a dozen engineers led by Alexey.
 
 By 2016, ClickHouse had an 8 year history and was ready to become a major open source project.  Here’s a timeline that tracks major developments as a time series.
 
-<img src="https://blog-images.clickhouse.tech/en/2020/the-clickhouse-community/clickhouse-community-history.png"/>
+<img src="https://blog-images.clickhouse.com/en/2020/the-clickhouse-community/clickhouse-community-history.png"/>
 
 ## ClickHouse goes open source
 
@@ -38,13 +38,13 @@ Alexey and the development team moved ClickHouse code to a Github repo under the
 
 ClickHouse quickly picked up steam in Eastern Europe. The first ClickHouse meetups started in 2016 and have grown to include 200 participants for in-person meetings and up to 400 for online meetings.  ClickHouse is now widely used in start-ups in Russia as well as other Eastern European countries. Developers located in Eastern Europe continue to supply more contributions to ClickHouse than any other region.
 
-ClickHouse also started to gain recognition in the US and Western Europe. [CloudFlare](https://www.cloudflare.com/) published a widely read blog article about [their success using ClickHouse for DNS analytics](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/). Alexander Zaitsev successfully migrated an ad tech analytics system from a commercial DBMS to a ClickHouse cluster. This success prompted him to found [Altinity](https://altinity.com) in 2017 with help from friends at [Percona](https://www.percona.com). US meetups started in the same year. With support from Altinity these have grown to over 100 attendees for online meetings.
+ClickHouse also started to gain recognition in the US and Western Europe. [CloudFlare](https://www.cloudflare.com/) published a widely read blog article about [their success using ClickHouse for DNS analytics](https://blog.cloudflare.com/how-cloudflare-analyzes-1m-dns-queries-per-second/).
 
 ClickHouse also took off in China. The first meetup in China took place in 2018 and attracted enormous interest. In-person meetups included over 400 participants.  Online meetings have reached up to 1000 online viewers.
 
 In 2019 a further step occurred as ClickHouse moved out from under the Yandex Github organization into a separate [ClickHouse organization](https://github.com/ClickHouse). The new organization includes ClickHouse server code plus core ecosystem projects like the cpp and ODBC drivers.
 
-ClickHouse community events shifted online following world-wide disruptions due to COVID-19, but growth in usage continued. One interesting development has been the increasing number of startups using ClickHouse as a backend. Many of these are listed on the [ClickHouse Adopters](https://clickhouse.tech/docs/en/introduction/adopters/) page. Also, additional prominent companies like eBay, Uber, and Flipcart went public in 2020 with stories of successful ClickHouse usage.
+ClickHouse community events shifted online following world-wide disruptions due to COVID-19, but growth in usage continued. One interesting development has been the increasing number of startups using ClickHouse as a backend. Many of these are listed on the [ClickHouse Adopters](/docs/en/introduction/adopters/) page. Also, additional prominent companies like eBay, Uber, and Flipcart went public in 2020 with stories of successful ClickHouse usage.
 
 ## The ClickHouse community today
 
@@ -87,19 +87,18 @@ ClickHouse ecosystem projects are also growing rapidly. Here is a selected list
 * [mymarilyn/clickhouse-driver](https://github.com/mymarilyn/clickhouse-driver) — ClickHouse Python driver with native interface support
 * [Vertamedia/clickhouse-grafana](https://github.com/Vertamedia/clickhouse-grafana) — Grafana datasource for ClickHouse
 * [smi2/phpClickHouse](https://github.com/smi2/phpClickHouse) — PHP ClickHouse client
-* [Altinity/clickhouse-operator](https://github.com/Altinity/clickhouse-operator) — Kubernetes operator for ClickHouse
 * [AlexAkulov/clickhouse-backup](https://github.com/AlexAkulov/clickhouse-backup) — ClickHouse backup and restore using cloud storage
 * [And almost 1200 more...](https://github.com/search?o=desc&p=1&q=clickhouse&s=stars&type=Repositories)
 
 ## Resources
 
-With the community growth numerous resources are available to users. At the center is the [ClickHouse org on Github](https://github.com/ClickHouse), which hosts [ClickHouse server code](https://github.com/ClickHouse/ClickHouse).  ClickHouse server documentation is available at the [clickhouse.tech](https://clickhouse.tech/) website. It has [installation instructions](https://clickhouse.tech/docs/en/getting-started/install/) and links to ClickHouse community builds for major Linux distributions as well as Mac, FreeBSD, and Docker.
+With the community growth numerous resources are available to users. At the center is the [ClickHouse org on Github](https://github.com/ClickHouse), which hosts [ClickHouse server code](https://github.com/ClickHouse/ClickHouse).  ClickHouse server documentation is available at the [clickhouse.com](/) website. It has [installation instructions](/docs/en/getting-started/install/) and links to ClickHouse community builds for major Linux distributions as well as Mac, FreeBSD, and Docker.
 
 In addition, ClickHouse users have a wide range of ways to engage with the community and get help on applications.  These include both chat applications as well as meetups.  Here are some links to get started.
 
-* Yandex Meetups — Yandex has regular in-person and online international and Russian-language meetups. Video recordings and online translations are available at the official [YouTube channel](https://www.youtube.com/c/ClickHouseDB/videos). Watch for announcements on the [clickhouse.tech](https://clickhouse.tech/) site and [Telegram](https://t.me/clickhouse_ru).
+* Yandex Meetups — Yandex has regular in-person and online international and Russian-language meetups. Video recordings and online translations are available at the official [YouTube channel](https://www.youtube.com/c/ClickHouseDB/videos). Watch for announcements on the [clickhouse.com](/) site and [Telegram](https://t.me/clickhouse_ru).
 * [SF Bay Area ClickHouse Meetup](https://www.meetup.com/San-Francisco-Bay-Area-ClickHouse-Meetup/) — The largest US ClickHouse meetup, with meetings approximately every 2 months.
-* Chinese meetups occur at regular intervals with different sponsors.  Watch for announcements on clickhouse.tech.
+* Chinese meetups occur at regular intervals with different sponsors.  Watch for announcements on clickhouse.com.
 * Telegram - By far the largest forum for ClickHouse. It is the best place to talk to ClickHouse devs. There are two groups.
 * [ClickHouse не тормозит](https://t.me/clickhouse_ru) (“ClickHouse does not slow down”) - Russian language Telegram group with 4,629 members currently.
 * [ClickHouse](https://t.me/clickhouse_en) — English language group with 1,286 members.
@@ -116,28 +115,20 @@ We welcome users to join the ClickHouse community in every capacity. There are f
 
 ### Use ClickHouse and share your experiences
 
-Start with the documentation. Download ClickHouse and try it out. Join the chat channels. If you encounter bugs, [log issues](https://github.com/ClickHouse/ClickHouse/issues) so we can get them fixed. Also, it’s easy to make contributions to the documentation if you have basic Github and markdown skills. Press the pencil icon on any page of the clickhouse.tech website to edit pages and automatically generate pull requests to merge your changes.
+Start with the documentation. Download ClickHouse and try it out. Join the chat channels. If you encounter bugs, [log issues](https://github.com/ClickHouse/ClickHouse/issues) so we can get them fixed. Also, it’s easy to make contributions to the documentation if you have basic Github and markdown skills. Press the pencil icon on any page of the clickhouse.com website to edit pages and automatically generate pull requests to merge your changes.
 
-If your company has deployed ClickHouse and is comfortable talking about it, please don't be shy. Add them to the [ClickHouse Adopters](https://clickhouse.tech/docs/en/introduction/adopters/) page so that others can learn from your experience.
+If your company has deployed ClickHouse and is comfortable talking about it, please don't be shy. Add them to the [ClickHouse Adopters](/docs/en/introduction/adopters/) page so that others can learn from your experience.
 
 ### Become a ClickHouse developer
 
 Write code to make ClickHouse better. Here are your choices.
 
-* ClickHouse server — Start with the [“For Beginners” documentation](https://clickhouse.tech/docs/en/development/developer-instruction/) to learn how to build ClickHouse and submit PRs. Check out the current ClickHouse issues if you are looking for work. PRs that follow the development standards will be merged faster.
+* ClickHouse server — Start with the [“For Beginners” documentation](/docs/en/development/developer-instruction/) to learn how to build ClickHouse and submit PRs. Check out the current ClickHouse issues if you are looking for work. PRs that follow the development standards will be merged faster.
 
 * Ecosystem projects — Most projects in the ClickHouse ecosystem accept PRs.  Check with each project for specific practices.
 
 ClickHouse is also a great target for research problems.  Overall the years many dozens of university CS students have worked on ClickHouse features. Alexey Milovidov maintains an especially rich set of [project suggestions for students](https://github.com/ClickHouse/ClickHouse/issues/15065). Join Telegram and ask for help if you are interested.  Both Yandex and Altinity also offer internships.
 
-### Write ClickHouse applications
-
-ClickHouse enables a host of new applications that depend on low latency access to large datasets. If you write something interesting, blog about it and present at local meetups. Altinity has a program to highlight startups who are developing ClickHouse applications and help with marketing as well as resources for development. Send email to [info@altinity.com](mailto:info@altinity.com) for more information.
-
-### Become a corporate sponsor
-
-The ClickHouse community has been assisted by many corporate users who have helped organize meetups, funded development, and guided growth of ClickHouse.  Contact community members directly at [clickhouse-feedback@yandex-team.ru](mailto:clickhouse-feedback@yandex-team.ru),  [info@altinity.com](mailto:info@altinity.com), or via Telegram to find out more about how to chip in as a corporate sponsor.
-
 ## Where we go from here
 
 ClickHouse has grown enormously from its origins as a basic prototype in 2008 to the popular SQL data warehouse users see today. Our community is the rock that will enable ClickHouse to become the default data warehouse worldwide. We are working together to create an inclusive environment where everyone feels welcome and has an opportunity to contribute. We welcome you to join!
diff --git a/website/blog/en/2021/clickhouse-inc.md b/website/blog/en/2021/clickhouse-inc.md
new file mode 100644
index 00000000000..f11020b6a8d
--- /dev/null
+++ b/website/blog/en/2021/clickhouse-inc.md
@@ -0,0 +1,51 @@
+---
+title: 'Introducing ClickHouse, Inc.'
+image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-inc/home.png'
+date: '2021-09-20'
+author: '[Alexey Milovidov](https://github.com/alexey-milovidov)'
+tags: ['company', 'incorporation', 'yandex', 'community']
+---
+
+Today I’m happy to announce **ClickHouse Inc.**, the new home of ClickHouse. The development team has moved from Yandex and joined ClickHouse Inc. to continue building the fastest (and the greatest) analytical database management system. The company has received nearly $50M in Series A funding led by Index Ventures and Benchmark with participation by Yandex N.V. and others. I created ClickHouse, Inc. with two co-founders, [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/) and [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/). I will continue to lead the development of ClickHouse as Chief Technology Officer (CTO), Yury will run product and engineering, and Aaron will be CEO.
+
+## History of ClickHouse
+
+I started developing ClickHouse more than ten years ago, and it has never been an easy ride. The idea of ClickHouse came up while I was working in Yandex as a developer of a real-time web analytics system. My team and I faced multiple data processing challenges that often required custom data structures and sophisticated algorithms, creative solutions and tradeoffs, deep understanding of domain area, hardware, and math. All these years, I often went to bed with endless thoughts about how we could solve yet another data processing challenge. I love data and processing in extreme constraints, where you have to think about bytes and nanoseconds to save petabytes and seconds. The ClickHouse team shares this passion: in my opinion, this is the main reason for ClickHouse’s success.
+
+In 2009 we started ClickHouse as an experimental project to check the hypothesis if it's viable to generate analytical reports in real-time from non-aggregated data that is also constantly added in real-time. It took three years to prove this hypothesis, and in 2012 ClickHouse launched in production for the first time. Unlike custom data structures used before, ClickHouse was applicable more generally to work as a database management system. After several years I found that most departments in my company were using ClickHouse, and it made me wonder: maybe ClickHouse is too good to run only inside Yandex? Then we released it in [open source](https://github.com/ClickHouse/ClickHouse) in 2016.
+
+## ClickHouse in Open Source
+
+Making ClickHouse open source was also not an easy decision, but now I see: doing open source is hard, but it is a big win. While it takes a tremendous effort and responsibility to maintain a popular open-source product, for us, the benefits outweigh all the costs. Since we published ClickHouse, it has been deployed in production in thousands of companies across the globe for a wide range of use cases, from agriculture to self-driving cars. In 2019 we spent over a third of our time abroad organizing various ClickHouse events and speaking at external conferences, and we’re thrilled to see you all again in person once travel restrictions become less severe. The feedback and contributions from our community are priceless, and we improve the quality of implementation, the feature completeness, and making product decisions with the help of our community. One of our main focuses is to make ClickHouse welcoming for contributors by making the source code easy to read and understand, with the processes easy to follow. For me, ClickHouse is a showcase so everyone can learn the ideas in data processing.
+
+I like to present ClickHouse as the answer to many questions in software engineering. What is better: vectorization or JIT compilation? Look at ClickHouse; it is using both. How to write the code in modern C++ in a safe way? Ok, look at the testing infrastructure in ClickHouse. How to optimize the memcpy function? What is the fastest way to transform a Unix timestamp to date in a custom timezone? I can do multiple-hour talks about these topics, and thanks to the open-source, everyone can read the code, run ClickHouse and validate our claims.
+
+## Technical Advantage
+
+The most notable advantage of ClickHouse is its extremely high query processing speed and data storage efficiency. What is unique about ClickHouse performance? It is difficult to answer because there is no single "[silver bullet](https://www.youtube.com/watch?v=ZOZQCQEtrz8)". The main advantage is attention to details of the most extreme production workloads. We develop ClickHouse from practical needs. It has been created to solve the needs of Metrica, one of the [most widespread](https://w3techs.com/technologies/overview/traffic_analysis) web analytics services in the world. So ClickHouse is capable of processing 100+ PBs of data with more than 100 billion records inserted every day. One of the early adopters, Cloudflare, uses ClickHouse to process a large portion of all HTTP traffic on the internet with 10+ million records per second. As ClickHouse developers, we don’t consider the task solved if there is room for performance improvement.
+
+Query processing performance is not only about speed. It opens new possibilities. In previous generation data warehouses, you cannot run interactive queries without pre-aggregation; or you cannot insert new data in real time while serving interactive queries; or you cannot just store all your data. With ClickHouse, you can keep all records as long as you need and make interactive real-time reporting across the data. Before using ClickHouse, it was difficult to imagine that analytical data processing could be so easy and efficient: there is no need for a dozen pre-aggregating and tiering services (e.g. Druid), no need to place huge data volumes in RAM (e.g. Elastic), and no need to maintain daily/hourly/minutely tables (e.g. Hadoop, Spark).
+
+Most other database management systems don’t even permit benchmarks (through the infamous "DeWitt clause"). But we don’t fear benchmarks; we [collect them](https://github.com/ClickHouse/ClickHouse/issues/22398). ClickHouse documentation has [links](/docs/en/getting-started/example-datasets/) to publicly available datasets up to multiple terabytes in size from various domain areas. We encourage you to try ClickHouse, do some experiments on your workload, and find ClickHouse faster than others. And if not, we encourage you to publish the benchmark, and we will make ClickHouse better!
+
+Lastly, ClickHouse was purpose-built from the beginning to:
+
+— Be easy to install and use. It runs everywhere, from your laptop to the cloud
+— Be highly reliable and scale both vertically and horizontally
+— Provide SQL with many practical and convenient extensions
+— Integrate with foreign data sources and streams
+
+## ClickHouse Spinout From Yandex
+
+Yandex N.V. is the largest internet company in Europe and employs over 14,000 people. They develop search, advertisement, and e-commerce services, ride tech and food tech solutions, self-driving cars... and also ClickHouse with a team of 15 engineers. It is hard to believe that we have managed to build a world-class leading analytical DBMS with such a small team while leveraging the global community. While this was barely enough to keep up with the development of the open-source product, everyone understands that the potential of ClickHouse technology highly outgrows such a small team.
+
+We decided to unite the resources: take the team of core ClickHouse developers, bring in a world-class business team led by [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/) and a cloud engineering team led by [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/), keep the power of open source, add the investment from the leading VC funds, and make an international company 100% focused on ClickHouse. I’m thrilled to announce ClickHouse, Inc.
+
+## What’s Next?
+
+Companies love ClickHouse because it gives tremendous improvements in data processing efficiency. But it is mostly about the core technology, the database server itself. We want to make ClickHouse suitable for all kinds of companies and enterprises, not just tech-savvy internet companies who are fine with managing their clusters. We want to lower the learning curve, make ClickHouse compliant with enterprise standards, make ClickHouse service to be instantly available in the cloud in a serverless way, make auto-scaling easy, and much more.
+
+Our mission is to make ClickHouse the first choice of analytical database management systems. Whenever you think about data analytics, ClickHouse should be the obvious preferred solution. I see how many companies already benefit from ClickHouse and I'm very eager to make it even more widespread and universally accepted across the world. Now we have the best engineers and the best entrepreneurs together and we are ready for the mission.
+
+
+_2021-09-20, [Alexey Milovidov](https://github.com/alexey-milovidov)_
diff --git a/website/blog/en/2021/clickhouse-raises-250m-series-b.md b/website/blog/en/2021/clickhouse-raises-250m-series-b.md
new file mode 100644
index 00000000000..b476371013e
--- /dev/null
+++ b/website/blog/en/2021/clickhouse-raises-250m-series-b.md
@@ -0,0 +1,15 @@
+---
+title: 'ClickHouse raises a $250M Series B at a $2B valuation...and we are hiring'
+image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-raises-250m-series-b/featured.jpg'
+date: '2021-10-28'
+author: '[Dorota Szeremeta](https://www.linkedin.com/in/dorota-szeremeta-a849b7/)'
+tags: ['company', 'investment']
+---
+
+Today, we are excited to announce that ClickHouse has raised $250 million in Series B funding at a $2B valuation. The round was led by Coatue and Altimeter, with participation from existing investors Index, Benchmark, Yandex, Almaz, and Lead Edge alongside new investors Lightspeed, Redpoint, and FirstMark. We are thrilled to partner with such an accomplished group. Not only is it a testament to the disruptive potential of our technology and our momentum to date, but more importantly, it’s an aggressive investment in our future. This funding will enable ClickHouse to grow our team, scale the product, and continue building a world-class, commercial-grade cloud solution that’s secure, compliant, and convenient for any customer to use. (You can read more about the funding round in our press release [here](https://www.businesswire.com/news/home/20211028005287/en)). 
+
+For the past five years, ClickHouse thrived as a popular open-source product— with a dedicated user community. ClickHouse thrived for a simple reason—we deliver high query processing speed and data storage efficiency that is unmatched. ClickHouse is capable of processing 100+ PBs of data with more than 100 billion records inserted every day. It is 100-1000X faster than traditional approaches and this speed and efficiency has attracted customers that are household names. The commercial potential for the product was clear - and in September 2021, we decided to combine resources and officially incorporate as a company. We took the team of core ClickHouse developers led by ClickHouse creator [Alexey Milovidov](https://www.linkedin.com/in/alexey-milovidov-7b658135/) and brought in a world-class business team led by [Aaron Katz](https://www.linkedin.com/in/aaron-katz-5762094/) and a cloud engineering team led by [Yury Izrailevsky](https://www.linkedin.com/in/yuryizrailevsky/).
+
+Fueled by this large investment, we are hiring. We plan to double our team this year, and double it again next year. We are calling on all visionaries, builders, and contributors to join us as we build ClickHouse into a transformative, paradigm-shifting company. Our mission is to become the first choice of analytical database management systems. We are relentlessly focused on building an enterprise-grade, highly secure, and fault tolerant, multi-tenant service in the cloud that is accessible to organizations across sizes and sectors. 
+
+If this sounds like something you want to be a part of, now’s the time to join us. To learn more about the positions we are hiring for, and what we are looking for in new hires, visit [clickhouse.com/careers](/careers/).
diff --git a/website/blog/en/2021/clickhouse-v21.10-released.md b/website/blog/en/2021/clickhouse-v21.10-released.md
new file mode 100644
index 00000000000..ed0aab88017
--- /dev/null
+++ b/website/blog/en/2021/clickhouse-v21.10-released.md
@@ -0,0 +1,29 @@
+---
+title: 'ClickHouse v21.10 Released'
+image: 'https://blog-images.clickhouse.com/en/2021/clickhouse-v21-10/featured.jpg'
+date: '2021-10-14'
+author: '[Rich Raposa](https://github.com/rfraposa), [Alexey Milovidov](https://github.com/alexey-milovidov)'
+tags: ['company', 'community']
+---
+
+We're excited to share with you our first release since [announcing ClickHouse, Inc](https://clickhouse.com/blog/en/2021/clickhouse-inc/). The 21.10 release includes new contributions from multiple contributors including many in our community, and we are grateful for your ongoing ideas, development, and support. Our Engineering team continues to be laser-focused on providing our community and users with the fastest and most scalable OLAP DBMS available while implementing many new features. In the 21.10 release, we have a wonderful 79 contributors with 1255 commits across 211 pull requests - what an amazing community and we cherish your contributions.
+
+Let's highlight some of these new exciting new capabilities in 21.10:
+
+* User-defined functions (UDFs) can now be [created as lambda expressions](https://clickhouse.com/docs/en/sql-reference/functions/#higher-order-functions). For example, `CREATE FUNCTION plus_one as (a) -> a + 1`
+* Two new table engines: Executable and ExecutablePool which allow you to stream the results of a query to a custom shell script
+* Instead of logging every query (which can be a lot of logs!), you can now log a random sample of your queries. The number of queries logged is determined by defining a specified probability between 0.0 (no queries logged) and 1.0 (all queries logged) using the new `log_queries_probability` setting.
+* Positional arguments are now available in your GROUP BY, ORDER BY and LIMIT BY clauses. For example, `SELECT foo, bar, baz FROM my_table ORDER BY 2,3` orders the results by whatever the bar and baz columns (no need to specify column names twice!)
+
+We're also thrilled to announce some new free training available to you in our Learn ClickHouse portal: [https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.10/](https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.10/)
+
+We're always listening for new ideas, and we're happy to welcome new contributors to the ClickHouse project. Whether for submitting code or improving our documentation and examples, please get involved by sending us a pull request or submitting an issue. Our beginner developers contribution guide will help you get started: [https://clickhouse.com/docs/en/development/developer-instruction/](https://clickhouse.com/docs/en/development/developer-instruction/)
+
+
+## ClickHouse Release Notes 
+
+Release 21.10
+
+Release Date: 2021-10-17
+
+Release Notes: [21.10](https://github.com/ClickHouse/ClickHouse/blob/master/CHANGELOG.md)
diff --git a/website/blog/en/2021/code-review.md b/website/blog/en/2021/code-review.md
index dcde371629b..15dc727986d 100644
--- a/website/blog/en/2021/code-review.md
+++ b/website/blog/en/2021/code-review.md
@@ -1,6 +1,6 @@
 ---
 title: 'The Tests Are Passing, Why Would I Read The Diff Again?'
-image: 'https://blog-images.clickhouse.tech/en/2021/code-review/two-ducks.jpg'
+image: 'https://blog-images.clickhouse.com/en/2021/code-review/two-ducks.jpg'
 date: '2021-04-14'
 author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
 tags: ['code review', 'development']
@@ -34,7 +34,7 @@ You probably don't need to be concerned with trivia such as code style. There ar
 
 Start with checking the high-level description of the problem that the pull request is trying to solve. Read the description of the bug it fixes, or the docs for the feature it adds. For bigger features, there is normally a design document that describes the overall implementation without getting too deep into the code details. After you understand the problem, start reading the code. Does it make sense to you? You shouldn't try too hard to understand it. Imagine that you are tired and under time pressure. If you feel you have to make a lot of effort to understand the code, ask the author for clarifications. As you talk, you might discover that the code is not correct, or it may be rewritten in a more straightforward way, or it needs more comments.
 
-<img src="https://blog-images.clickhouse.tech/en/2021/code-review/hidden-items.png"/>
+<img src="https://blog-images.clickhouse.com/en/2021/code-review/hidden-items.png"/>
 
 After you get the answers, don't forget to update the code and the comments to reflect them. Don't just stop after getting it explained to you personally. If you had a question as a reviewer, chances are that other people will also have this question later, but there might be nobody around to ask. They will have to resort to `git blame` and re-reading the entire pull request or several of them. Code archaeology is sometimes fun, but it's the last thing you want to do when you are investigating an urgent bug. All the answers should be on the surface.
 
diff --git a/website/blog/en/2021/fuzzing-clickhouse.md b/website/blog/en/2021/fuzzing-clickhouse.md
index b6852dcce15..cd53f00930d 100644
--- a/website/blog/en/2021/fuzzing-clickhouse.md
+++ b/website/blog/en/2021/fuzzing-clickhouse.md
@@ -1,6 +1,6 @@
 ---
 title: 'Fuzzing ClickHouse'
-image: 'https://blog-images.clickhouse.tech/en/2021/fuzzing-clickhouse/some-checks-were-not-successful.png'
+image: 'https://blog-images.clickhouse.com/en/2021/fuzzing-clickhouse/some-checks-were-not-successful.png'
 date: '2021-03-11'
 author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
 tags: ['fuzzing', 'testing']
@@ -24,7 +24,7 @@ Consider some SQL query from a regression test. After parsing, it is easy to mut
 
 Another interesting thing we can do is change the arguments of functions, or the list of expressions in `SELECT`, `ORDER BY` and so on. Naturally, all the interesting arguments can be taken from other test queries. Same goes for changing the tables used in the queries. When the fuzzer runs in CI, it runs queries from all the SQL tests in random order, mixing into them some parts of queries it has seen previously. This process can eventually cover all the possible permutations of our features.
 
-The core implementation of the fuzzer is relatively small, consisting of about 700 lines of C++ code. A prototype was made in a couple of days, but naturally it took significantly longer to polish it and to start routinely using it in CI. It is very productive and let us find more than 200 bugs already (see the label [fuzz](https://github.com/ClickHouse/ClickHouse/labels/fuzz) on GitHub), some of which are serious logic errors or even memory errors. When we only started, we could segfault the server or make it enter a never-ending loop with simplest read-only queries such as `SELECT arrayReverseFill(x -> (x < 10), [])` or `SELECT geoDistance(0., 0., -inf, 1.)`. Of course I couldn't resist bringing down our [public playground](https://gh-api.clickhouse.tech/play?user=play#LS0gWW91IGNhbiBxdWVyeSB0aGUgR2l0SHViIGhpc3RvcnkgZGF0YSBoZXJlLiBTZWUgaHR0cHM6Ly9naC5jbGlja2hvdXNlLnRlY2gvZXhwbG9yZXIvIGZvciB0aGUgZGVzY3JpcHRpb24gYW5kIGV4YW1wbGUgcXVlcmllcy4Kc2VsZWN0ICdoZWxsbyB3b3JsZCc=) with some of these queries, and was content to see that the server soon restarts correctly.  These queries are actually minified by hand, normally the fuzzer would generate something barely intelligible such as:
+The core implementation of the fuzzer is relatively small, consisting of about 700 lines of C++ code. A prototype was made in a couple of days, but naturally it took significantly longer to polish it and to start routinely using it in CI. It is very productive and let us find more than 200 bugs already (see the label [fuzz](https://github.com/ClickHouse/ClickHouse/labels/fuzz) on GitHub), some of which are serious logic errors or even memory errors. When we only started, we could segfault the server or make it enter a never-ending loop with simplest read-only queries such as `SELECT arrayReverseFill(x -> (x < 10), [])` or `SELECT geoDistance(0., 0., -inf, 1.)`. Of course I couldn't resist bringing down our [public playground](https://gh-api.clickhouse.com/play?user=play#LS0gWW91IGNhbiBxdWVyeSB0aGUgR2l0SHViIGhpc3RvcnkgZGF0YSBoZXJlLiBTZWUgaHR0cHM6Ly9naC5jbGlja2hvdXNlLnRlY2gvZXhwbG9yZXIvIGZvciB0aGUgZGVzY3JpcHRpb24gYW5kIGV4YW1wbGUgcXVlcmllcy4Kc2VsZWN0ICdoZWxsbyB3b3JsZCc=) with some of these queries, and was content to see that the server soon restarts correctly.  These queries are actually minified by hand, normally the fuzzer would generate something barely intelligible such as:
 ```
 SELECT
     (val + 257,
@@ -51,11 +51,11 @@ After fixing the majority of pre-existing error, this fuzzer became efficient fo
 
 A major factor that makes fuzzing really efficient for us is that we have a lot of assertions and other checks of program logic in our code. For debug-only checks, we use the plain `assert` macro from `<cassert>`. For checks that are needed even in release mode, we use an exception with a special code `LOGICAL_ERROR` that signifies an internal program error. We did some work to ensure that these errors are distinct from errors caused by the wrong user actions. A user error reported for a randomly generated query is normal (e.g.  it references some non-existent columns), but when we see an internal program error, we know that it's definitely a bug, same as an assertion. Of course, even without assertions, you get some checks for memory errors provided by the OS (segfaults). Another way to add runtime checks to your program is to use some kind of sanitizer. We already run most of our tests under clang's Address, Memory, UndefinedBehavior and Thread sanitizers. Using them in conjunction with this fuzzer also proved to be very efficient.
 
-To see for yourself how the fuzzer works, you only need the normal ClickHouse client.  Start `clickhouse-client --query-fuzzer-runs=100`, enter any query, and enjoy the client going crazy and running a hundred of random queries instead. All queries from the current session become a source for expressions for fuzzing, so try entering several different queries to get more interesting results. Be careful not to do this in production! When you do this experiment, you'll soon notice that the fuzzer tends to generate queries that take very long to run. This is why for the CI fuzzer runs we have to configure the server to limit query execution time, memory usage and so on using the corresponding [server settings](https://clickhouse.tech/docs/en/operations/settings/query-complexity/#:~:text=In%20the%20default%20configuration%20file,query%20within%20a%20single%20server.). We had a hilarious situation after that: the fuzzer figured out how to remove the limits by generating a `SET max_execution_time = 0` query, and then generated a never-ending query and failed. Thankfully we were able to defeat its cleverness by using [settings constraints](https://clickhouse.tech/docs/en/operations/settings/constraints-on-settings/).
+To see for yourself how the fuzzer works, you only need the normal ClickHouse client.  Start `clickhouse-client --query-fuzzer-runs=100`, enter any query, and enjoy the client going crazy and running a hundred of random queries instead. All queries from the current session become a source for expressions for fuzzing, so try entering several different queries to get more interesting results. Be careful not to do this in production! When you do this experiment, you'll soon notice that the fuzzer tends to generate queries that take very long to run. This is why for the CI fuzzer runs we have to configure the server to limit query execution time, memory usage and so on using the corresponding [server settings](/docs/en/operations/settings/query-complexity/#:~:text=In%20the%20default%20configuration%20file,query%20within%20a%20single%20server.). We had a hilarious situation after that: the fuzzer figured out how to remove the limits by generating a `SET max_execution_time = 0` query, and then generated a never-ending query and failed. Thankfully we were able to defeat its cleverness by using [settings constraints](/docs/en/operations/settings/constraints-on-settings/).
 
 ## Other Fuzzers
 
-The AST-based fuzzer we discussed is only one of the many kinds of fuzzers we have in ClickHouse. There is a [talk](https://www.youtube.com/watch?v=GbmK84ZwSeI&t=4481s) (in Russian, [slides are here](https://presentations.clickhouse.tech/cpp_siberia_2021/)) by Alexey Milovidov that explores all the fuzzers we have. Another interesting recent development is application of pivoted query synthesis technique, implemented in [SQLancer](https://github.com/sqlancer/sqlancer), to ClickHouse.  The authors are going to give [a talk about this](https://heisenbug-piter.ru/2021/spb/talks/nr1cwknssdodjkqgzsbvh/) soon, so stay tuned.
+The AST-based fuzzer we discussed is only one of the many kinds of fuzzers we have in ClickHouse. There is a [talk](https://www.youtube.com/watch?v=GbmK84ZwSeI&t=4481s) (in Russian, [slides are here](https://presentations.clickhouse.com/cpp_siberia_2021/)) by Alexey Milovidov that explores all the fuzzers we have. Another interesting recent development is application of pivoted query synthesis technique, implemented in [SQLancer](https://github.com/sqlancer/sqlancer), to ClickHouse.  The authors are going to give [a talk about this](https://heisenbug-piter.ru/2021/spb/talks/nr1cwknssdodjkqgzsbvh/) soon, so stay tuned.
 
 _2021-03-11 [Alexander Kuzmenkov](https://github.com/akuzm)_
 
diff --git a/website/blog/en/2021/performance-test-1.md b/website/blog/en/2021/performance-test-1.md
new file mode 100644
index 00000000000..9b06e9e59e0
--- /dev/null
+++ b/website/blog/en/2021/performance-test-1.md
@@ -0,0 +1,84 @@
+---
+title: 'Testing the Performance of ClickHouse'
+image: 'https://blog-images.clickhouse.com/en/2021/performance-testing-1/chebu-crop.jpg'
+date: '2021-08-19'
+author: '[Alexander Kuzmenkov](https://github.com/akuzm)'
+tags: ['testing', 'performance']
+---
+
+One of the main selling points of ClickHouse is that it's very fast, in many cases utilizing the hardware up to the theoretical limits. This was noted by many independent benchmark such as [this one](http://brandonharris.io/redshift-clickhouse-time-series/). This speed boils down to a right combination of architectural choices and algorithmic optimizations, sprinkled with a dash of pixie dust. There is an [overview of these factors](/docs/en/faq/general/why-clickhouse-is-so-fast) on our website, or a talk by the ClickHouse lead developer Alexey Milovidov ["The secrets of ClickHouse performance optimizations"](https://www.youtube.com/watch?v=ZOZQCQEtrz8). But this is a static picture of "how the things are". Software is a living and changing organism, and ClickHouse is changing very fast &mdash; to give you a scale, in July 2021 we merged 319 pull requests made by 60 different authors ([live statistics here](https://gh-api.clickhouse.com/play?user=play#c2VsZWN0IGRhdGVfdHJ1bmMoJ21vbnRoJywgY3JlYXRlZF9hdCkgbW9udGgsIHVuaXEoY3JlYXRvcl91c2VyX2xvZ2luKSBhdXRob3JzLCB1bmlxKG51bWJlcikgcHJzIGZyb20gZ2l0aHViX2V2ZW50cyB3aGVyZSByZXBvX25hbWUgPSAnQ2xpY2tIb3VzZS9DbGlja0hvdXNlJyBhbmQgbm90IGhhc0FueShsYWJlbHMsIFsncHItYmFja3BvcnQnLCAncHItZG9jdW1lbnRhdGlvbicsICdwci1jaGVycnlwaWNrJ10pIGFuZCBtZXJnZWQgYW5kIGNyZWF0ZWRfYXQgYmV0d2VlbiAnMjAyMC0wOS0wMScgYW5kICcyMDIxLTA5LTAxJyBncm91cCBieSBtb250aA==)). Any quality that is not actively selected for is going to be lost in this endless stream of changes, and the performance is no exception. For this reason, we have to have some process that allows us to ensure than ClickHouse always stays fast.
+
+# Measuring and Comparing the Performance
+
+How do we know it is fast, in the first place? We do a lot of benchmarks, many kinds of them. The most basic kind of a benchmark is a micro-benchmark, that doesn't use the full code of the server and tests a particular algorithm in isolation. We use them to choose a better inner loop for some aggregate function, or to test various layouts of hash tables, and so on. For example, when we discovered that a competing database engine completes a query with `sum` aggregate function twice as fast, we tested a couple of dozen implementations of `sum` to ultimately find the one that gives the best performance (see [a talk](https://www.youtube.com/watch?v=MJJfWoWJq0o) about this, in Russian). But testing a particular algorithm by itself is not enough to say how the entire query is going to work. We have to also make end-to-end measurements of entire queries, often using the real production data, because the particulars of the data (e.g. the cardinality and the distribution of values) heavily influence the performance. Currently we have about 3000 end-to-end test queries organized into about 200 [tests](https://github.com/ClickHouse/ClickHouse/tree/6c4c3df96e41425185beb0c471a8dde0ce6f25a7/tests/performance). Many of them use real data sets, such as the [production data of Yandex.Metrica](/docs/en/getting-started/example-datasets/metrica/), obfuscated with `clickhouse-obfuscator` as described [here](https://habr.com/ru/company/yandex/blog/485096/).
+
+Micro-benchmarks are normally ran by a developer while working on the code, but it is not practical to manually run the entire battery of the end-to-end tests for each change. We use an automated system that does this for each pull request as part of continuous integration checks. It measures whether the code changes introduced by a pull request influenced the performance, for which kinds of queries and by how much, and alerts the developer if there is a regression. Here is how a typical report looks.
+
+<img src="https://blog-images.clickhouse.com/en/2021/performance-testing-1/report.png"/>
+
+To talk about "changes in performance", we first have to measure this performance. The most natural measure for a single query is elapsed time. It is susceptible to random variations, so we have to take several measurements and average them in some way. From the application point of view, the most interesting statistic is maximum. We want to guarantee that e.g. an analytical dashboard built on ClickHouse is responsive. However, the query time can grow almost without limit due to random factor such as sudden disk load spikes or network delays, so using the maximum is not practical. The minimum is also interesting &mdash; after all, there is a theoretical bound on it. We know that the particular algorithm can run only so fast on the particular hardware, in ideal conditions. But if we only look at the minimum, we are going to miss cases where some runs of the query are slow and some are not (e.g. boundary effects in some cache). So we compromise by measuring the median. It is a robust statistic that is reasonably sensitive to outliers and stable enough against noise.
+
+After measuring the performance, how do we determine that it has changed? Due to various random and systematic factors, the query time always drifts, so the number always changes, but the question is whether this change is meaningful. If we have an old version of the server, and a new version of the server, are they going to consistently give a different result for this query, or was it just a fluke? To answer this, we have to employ some statistical method. The core idea of these methods is comparing the observed values to some reference distribution, and deciding whether what we observed can plausibly belong to this distribution, or, on the contrary, it cannot, which means that the performance characteristics of the patched server are indeed different.
+
+Choosing the reference distribution is the starting point. One way to obtain it is to build a mathematical model of the process. This works well for simple things like tossing a coin a fixed number of times. We can analytically deduce that the number of heads we get follows the binomial distribution, and get a confidence interval on this number, given the required [level of significance](https://en.wikipedia.org/wiki/P-value#Definition_and_interpretation). If the observed number of heads doesn't belong to this interval, we can conclude that the coin is biased. However, modeling the query execution from first principles is too complex. The best we can do is to use the hardware capabilities to estimate how fast the query could run, in principle, and try to achieve this throughput.
+
+For complex processes which resist modeling, a practical option is to use the historical data from the same process. We actually used to do this for ClickHouse. For each tested commit, we measured the run times for each test query and saved them into a database. We could compare the patched server to these reference values, build graphs of changes over time and so on. The main problem with this approach is systematic errors induced by environment. Sometimes the performance testing task ends up on a machine with dying HDD, or they update `atop` to a broken version that slows every kernel call in half, et cetera, ad infinitum. This is why now we employ another approach.
+
+We run the reference version of the server process and the tested version, simultaneously on the same machine, and run the test queries on each of them in turn, one by one. This way we eliminate most systematic errors, because both servers are equally influenced by them. We can then compare the set of results we got from the reference server process, and the set from the test server process, to see whether they look the same. Comparing the distributions using two samples is a very interesting problem in itself. We use a non-parametric bootstrap method to build a randomization distribution for the observed difference of median query run times. This method is described in detail in [[1]](#ref1), where they apply it to see how changing a fertilizer mixture changes the yield of tomato plants. ClickHouse is not much different from tomatoes, only we have to check how the changes in code influence the performance.
+
+This method ultimately gives a single threshold number _T_: what is the largest difference in median query run times between old and new server, that we can observe even if nothing has changed. Then we have a simple decision protocol given this threshold _T_ and the measured difference of medians _D_:
+
+1. _abs(D) <= T_ &mdash; the changes are not statistically significant,
+2. _abs(D) <= 5%_ &mdash; the changes are too small to be important,
+3. _abs(T) >= 10%_ &mdash; the test query has excessive run time variance that leads to poor sensitivity,
+4. finally, _abs(D) >= T and abs(D) >= 5%_ &mdash; there are statistically significant changes of significant magnitude.
+
+The most interesting case are the unstable queries _(3)_. When the elapsed time changes significantly between runs even on the same version of server, it means we won't be able to detect the changes of performance, because they are going to be drowned out by the noise. Such queries tend to be the most difficult to debug, because there is no straightforward way to compare "good" and "bad" server. This topic deserves its own article which we will publish next. For now, let's consider the happy path _(4)_. This is the case of real and notable changes in performance that this system is intended to catch. What do we do next?
+
+# Understanding the Reasons Behind the Changes
+
+An investigation of code performance often starts with applying a profiler. On Linux, you would use `perf`, a sampling profiler that periodically collects the stack trace of the process, so that you can then see an aggregate picture of where your program spends the most time. In ClickHouse, we actually have a built-in sampling profiler that saves results into a system table, so no external tools are needed. It can be enabled for all queries or for a particular one, by passing the settings [as described in the docs](/docs/en/operations/optimizing-performance/sampling-query-profiler/). It is on by default, so if you use a recent version of ClickHouse, you already have a combined profile of your production server load. To visualize it, we can use a well-known script for building [flamegraphs](https://github.com/brendangregg/FlameGraph):
+```
+clickhouse-client -q "SELECT
+    arrayStringConcat(
+        arrayMap(
+            x -> concat(splitByChar('/', addressToLine(x))[-1],
+                '#', demangle(addressToSymbol(x))),
+            trace),
+        ';') AS stack,
+    count(*) AS samples
+FROM system.trace_log
+WHERE trace_type = 'Real'
+AND query_id = '4aac5305-b27f-4a5a-91c3-61c0cf52ec2a'
+GROUP BY trace" \
+| flamegraph.pl
+
+```
+
+As an example, let's use the test run we've seen above. The tested [pull request](https://github.com/ClickHouse/ClickHouse/pull/26248) is supposed to speed up the `sum` aggregate function for nullable integer types. Let's look at the query #8 of the test 'sum': `SELECT sum(toNullable(number)) FROM numbers(100000000)`. The test system reported that its performance increased by 38.5%, and built a "differential" variant of flamegraph for it, that shows the relative time spent in different functions. We can see that the function that calculates the sum, `DB::AggregateFunctionSumData<unsigned long>::addManyNotNull<unsigned long>`, now takes 15% less time.
+
+<object data="https://blog-images.clickhouse.com/en/2021/performance-testing-1/sum-8-diff.svg" type="image/svg+xml" width="100%"/>
+
+To get more leads into why the performance has changed, we can check how the various query metrics have changed between the old and the new servers. This includes all the metrics from `system.query_log.ProfileEvents`, such as `SelectedRows` or `RealTimeMicroseconds`. ClickHouse also tracks the hardware CPU metrics such as the number of branch or cache misses, using the Linux `perf_event_open` API. After downloading the test output archive, we can use a simple ad hoc [script](https://gist.github.com/akuzm/bb28a442f882349e0a5ec2b5262b97d0) to build some statistics and graphs of these metrics.
+
+<img src="https://blog-images.clickhouse.com/en/2021/performance-testing-1/sum_8_scatter_2d_PerfBranchInstructions_per_client_time.png"/>
+
+This graph shows the number of branch instructions per second, on the old and the new server. We can see that the number of branch instructions has dramatically decreased, which might explain the performance difference. The tested pull request removes some `if`s and replaces them with multiplication, so this explanation sounds plausible.
+
+While side-to-side comparison is more robust against the systemic errors, the historical data is still very valuable for finding where a regression was introduced or investigating the unstable test queries. This is why we save the results of all test runs into a ClickHouse database. Let's consider the same query #8 from the `sum` test. We can build the history of performance changes with this [SQL query](https://play-ci.clickhouse.com/play?user=play#V0lUSCAwLjA1IEFTIHMKU0VMRUNUIG9sZF9zaGEsIG5ld19zaGEsIGV2ZW50X3RpbWUsIG1lc3NhZ2UsIG9sZF92YWx1ZSBBUyBgb2xkIHNlcnZlcmAsICAgbmV3X3ZhbHVlIEFTIGBuZXcgc2VydmVyYCwgYmVmb3JlIEFTIGBwcmV2IDExIHJ1bnNgLCBhZnRlciBBUyBgbmV4dCAxMSBydW5zYCwgICAgZGlmZiBBUyBgZGlmZiwgcmF0aW9gLCBzdGF0X3RocmVzaG9sZF9oaXN0b3JpY2FsIEFTIGBzdGF0IHRocmVzaG9sZCwgcmF0aW8sIGhpc3RvcmljYWxgLCBzdGF0X3RocmVzaG9sZCBBUyBgc3RhdCB0aHJlc2hvbGQsIHJhdGlvLCBwZXItcnVuYCwgY3B1X21vZGVsLHF1ZXJ5X2Rpc3BsYXlfbmFtZQpGUk9NIAooU0VMRUNUICosIHJ1bl9hdHRyaWJ1dGVzX3YxLnZhbHVlIEFTIGNwdV9tb2RlbCwKICAgICAgICBtZWRpYW4ob2xkX3ZhbHVlKSBPVkVSIChQQVJUSVRJT04gQlkgcnVuX2F0dHJpYnV0ZXNfdjEudmFsdWUsIHRlc3QsIHF1ZXJ5X2luZGV4LCBxdWVyeV9kaXNwbGF5X25hbWUgT1JERVIgQlkgZXZlbnRfZGF0ZSBBU0MgUk9XUyBCRVRXRUVOIDExIFBSRUNFRElORyBBTkQgQ1VSUkVOVCBST1cpIEFTIGJlZm9yZSwKICAgICAgICBtZWRpYW4obmV3X3ZhbHVlKSBPVkVSIChQQVJUSVRJT04gQlkgcnVuX2F0dHJpYnV0ZXNfdjEudmFsdWUsIHRlc3QsIHF1ZXJ5X2luZGV4LCBxdWVyeV9kaXNwbGF5X25hbWUgT1JERVIgQlkgZXZlbnRfZGF0ZSBBU0MgUk9XUyBCRVRXRUVOIENVUlJFTlQgUk9XIEFORCAxMSBGT0xMT1dJTkcpIEFTIGFmdGVyLAogICAgICAgIHF1YW50aWxlRXhhY3QoMC45NSkoYWJzKGRpZmYpKSBPVkVSIChQQVJUSVRJT04gQlkgcnVuX2F0dHJpYnV0ZXNfdjEudmFsdWUsIHRlc3QsIHF1ZXJ5X2luZGV4LCBxdWVyeV9kaXNwbGF5X25hbWUgT1JERVIgQlkgZXZlbnRfZGF0ZSBBU0MgUk9XUyBCRVRXRUVOIDM3IFBSRUNFRElORyBBTkQgQ1VSUkVOVCBST1cpIEFTIHN0YXRfdGhyZXNob2xkX2hpc3RvcmljYWwKICAgIEZST00gcGVyZnRlc3QucXVlcnlfbWV0cmljc192MgogICAgTEVGVCBKT0lOIHBlcmZ0ZXN0LnJ1bl9hdHRyaWJ1dGVzX3YxIFVTSU5HIChvbGRfc2hhLCBuZXdfc2hhKQogICAgV0hFUkUgKGF0dHJpYnV0ZSA9ICdsc2NwdS1tb2RlbC1uYW1lJykgQU5EIChtZXRyaWMgPSAnY2xpZW50X3RpbWUnKQogICAgICAgIC0tIG9ubHkgZm9yIGNvbW1pdHMgaW4gbWFzdGVyCiAgICAgICAgQU5EIChwcl9udW1iZXIgPSAwKQogICAgICAgIC0tIHNlbGVjdCB0aGUgcXVlcmllcyB3ZSBhcmUgaW50ZXJlc3RlZCBpbgogICAgICAgIEFORCAodGVzdCA9ICdzdW0nKSBBTkQgKHF1ZXJ5X2luZGV4ID0gOCkKKSBBUyB0CkFOWSBMRUZUIEpPSU4gYGdoLWRhdGFgLmNvbW1pdHMgT04gbmV3X3NoYSA9IHNoYQpXSEVSRQogICAgLS0gQ2hlY2sgZm9yIGEgcGVyc2lzdGVudCBhbmQgc2lnbmlmaWNhbnQgY2hhbmdlIGluIHF1ZXJ5IHJ1biB0aW1lLCBpbnRyb2R1Y2VkIGJ5IGEgY29tbWl0OgogICAgLS0gMSkgb24gYSBoaXN0b3JpY2FsIGdyYXBoIG9mIHF1ZXJ5IHJ1biB0aW1lLCB0aGVyZSBpcyBhIHN0ZXAgYmV0d2VlbiB0aGUgYWRqYWNlbnQgY29tbWl0cywKICAgIC0tIHRoYXQgaXMgaGlnaGVyIHRoYW4gdGhlIG5vcm1hbCB2YXJpYW5jZSwKICAgICgoKGFicyhhZnRlciAtIGJlZm9yZSkgLyBpZihhZnRlciA+IGJlZm9yZSwgYWZ0ZXIsIGJlZm9yZSkpIEFTIHN0ZXBfaGVpZ2h0KSA+PSBncmVhdGVzdChzLCBzdGF0X3RocmVzaG9sZF9oaXN0b3JpY2FsKSkKICAgIC0tIDIpIGluIHNpZGUtdG8tc2lkZSBjb21wYXJpc29uIG9mIHRoZXNlIHR3byBjb21taXRzLCB0aGVyZSB3YXMgYSBzdGF0aXN0aWNhbGx5IHNpZ25pZmljYW50IGRpZmZlcmVuY2UKICAgIC0tIHRoYXQgaXMgYWxzbyBoaWdoZXIgdGhhbiB0aGUgbm9ybWFsIHZhcmlhbmNlLAogICAgICAgIEFORCAoYWJzKGRpZmYpID49IGdyZWF0ZXN0KHN0YXRfdGhyZXNob2xkLCBzdGF0X3RocmVzaG9sZF9oaXN0b3JpY2FsLCBzKSkKICAgIC0tIDMpIGZpbmFsbHksIHRoaXMgc2lkZS10by1zaWRlIGRpZmZlcmVuY2UgaXMgb2YgbWFnbml0dWRlIGNvbXBhcmFibGUgdG8gdGhlIHN0ZXAgaW4gaGlzdG9yaWNhbCBncmFwaHMuCiAgICAgICAgQU5EIChhYnMoZGlmZikgPj0gKDAuNyAqIHN0ZXBfaGVpZ2h0KSkKb3JkZXIgYnkgZXZlbnRfdGltZSBkZXNjCmZvcm1hdCBWZXJ0aWNhbAoKCg==) to the live ClickHouse CI database. Open the link and run the query so that you can examine the query and see the result for yourself. There were three significant changes of performance throughout the test history. The most recent is a speedup in PR we started with. The second speedup is related to fully switching to clang 11. Curiously, there is also a small slowdown introduced by a PR that was supposed to speed it up instead.
+
+# Usability Considerations
+
+Regardless of how it works inside, a test system must be actually usable as a part of the development process. First and foremost, the false positive rate should be as low as possible. False positives are costly to investigate, and if they happen often, developers perceive the test as generally unreliable and tend to ignore the true positives as well. The test must also provide a concise report that makes it obvious what went wrong. We have not really succeeded in this. This test has many more failure modes than a plain functional test, and worse, some of these failures are quantitative, not binary. Much of the complexity is essential, and we try to alleviate it by providing good documentation and linking to the relevant parts of it right from the report page. Another important thing is that the user must be able to investigate a problematic query post-mortem, without running it again locally. This is why we try to export every metric and every intermediate result we have, in easily-manipulated plain text formats.
+
+Organizationally, it is hard to prevent devolving into a system that does a lot of busywork to just show a green check without giving any insight. I like to call this process "mining the green check", by analogy to cryptocurrencies. Our previous system did just that. It used increasingly complex heuristics tailored to each test query to prevent false positives, restarted itself many times if the results didn't look good, and so on. Ultimately, it wasted a lot of processing power without giving the real picture of the server performance. If you wanted to be sure that the performance did or did not change, you had to recheck by hand. This sorry state is the result of how the incentives are aligned around development &mdash; most of the time, the developers just want to merge their pull requests and not be bothered by some obscure test failures. Writing a good performance test query is also not always simple. Just any other query won't do &mdash; it has to give predictable performance, be not too fast and not too slow, actually measure something, and so on. After gathering more precise statistics, we discovered that several hundred of our test queries don't measure anything meaningful, e.g. they give a result that varies by 100% between runs. Another problem is that the performance often changes in statistically significant ways (true positive) with no relevant code changes (due to e.g. random differences in layout of the executable). Given all these difficulties, a working performance test system is bound to add noticeable friction to the development process. Most of the "obvious" ways to remove this friction ultimately boil down to "mining the green check".
+
+Implementation-wise, our system is peculiar in that it doesn't rely on well-known statistical packages, but instead heavily uses `clickhouse-local`, a tool that turns the ClickHouse SQL query processor into a command line utility Doing all the computations in ClickHouse SQL helped us find bugs and usability problems with `clickhouse-local`. The performance test continues to work in dual purpose as a heavy SQL test, and sometimes catches newly introduced bugs in complex joins and the like. The query profiler is always on in the performance tests, and this finds bugs in our fork of `libunwind`. To run the test queries, we use a third-party [Python driver](https://github.com/mymarilyn/clickhouse-driver). This is the only use of this driver in our CI, and it also helped us find some bugs in native protocol handling. A not so honorable fact is that the scaffolding consists of an unreasonable amount of bash, but this at least served to convince us that running [shellcheck](https://github.com/koalaman/shellcheck) in CI is very helpful.
+
+This concludes the overview of the ClickHouse performance test system. Stay tuned for the next article where we will discuss the most problematic kind of a performance test failure &mdash; the unstable query run time.
+
+_2021-08-20 [Alexander Kuzmenkov](https://github.com/akuzm). Title photo by [Alexander Tokmakov](https://github.com/tavplubix)_
+
+References:
+
+<a id="ref1"/>1. Box, Hunter, Hunter, 2005. Statistics for experimenters, p. 78: A Randomized Design Used in the Comparison of Standard and Modified Fertilizer Mixtures for Tomato Plants.
diff --git a/website/blog/en/2021/reading-from-external-memory.md b/website/blog/en/2021/reading-from-external-memory.md
index f431bde0625..2274c47c5a5 100644
--- a/website/blog/en/2021/reading-from-external-memory.md
+++ b/website/blog/en/2021/reading-from-external-memory.md
@@ -1,6 +1,6 @@
 ---
 title: 'A journey to io_uring, AIO and modern storage devices'
-image: 'https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/all-single-read.png'
+image: 'https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/all-single-read.png'
 date: '2021-03-09'
 author: '[Ruslan Savchenko](https://github.com/savrus)'
 tags: ['Linux', 'benchmark', 'experiment']
@@ -18,7 +18,7 @@ Our goal is to pick the best block size for a random read. An application (or fi
 
 This figure shows results for HDD.
 
-![HDD single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/hdd-single-read.png)
+![HDD single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/hdd-single-read.png)
 
 The latency is almost the same for all block sizes smaller than 256 kilobytes. This happens because seek time is much larger than the data transfer time. The seek time includes arm positioning to find the right track and awaiting for platter rotation to bring data under the head. A simple consequence is that for a HDD random read one should use blocks of size at least 256 kilobytes. Even if an application use smaller blocks the drive access time would be the same. However one could still decide to use smaller blocks for better cache utilization: if the amount of data per request is small and is expected to fit in cache then storing a large block along with the requested data would actually make cache capacity smaller in terms of useful data.
 
@@ -28,7 +28,7 @@ The 256 kilobyte block read takes 12 milliseconds on the average. We experienced
 
 The figure below shows SATA SSD read latencies.
 
-![SATA SSD single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/ssd-single-read.png)
+![SATA SSD single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/ssd-single-read.png)
 
 Note that the time at the lower part of the figure is in microseconds (we use standard shortenings ms for milliseconds and us for microseconds). Reading block of size 4 kilobytes takes 140 microseconds on the average and the time growth is linear when the block size increase. Compared to HDD reading a 4 kilobyte block from SSD is 80 times faster. For a 256 kilobyte block SSD is ten times faster than HDD. When block size is large enough (starting from 4 megabytes) SSD is only two times faster than HDD.
 
@@ -36,7 +36,7 @@ Note that the time at the lower part of the figure is in microseconds (we use st
 
 The next figure shows results for NVMe SSD.
 
-![NVMe SSD single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/nvme-single-read.png)
+![NVMe SSD single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/nvme-single-read.png)
 
 The latency is better than those for SATA SSD. For a 4 kilobytes block size the average time improved only a little, but the 99 percentile is two times lower. It takes less than millisecond to read a megabyte block from NVMe SSD. For SATA SSD it took 3 milliseconds. As we see, upgrade from SATA SSD to NVMe SSD is not as dramatic as upgrade from HDD to SATA SSD. This is not surprising since both SATA and NVMe SSD are based on the same thechnology. Only interfaces differ.
 
@@ -44,12 +44,13 @@ The latency is better than those for SATA SSD. For a 4 kilobytes block size the
 
 This figure shows results for Intel Optane SSD.
 
-![Intel Optane single read latency](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/optane-single-read.png)
+![Intel Optane single read latency](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/optane-single-read.png)
 
 Minimal latency is 12 microseconds whih is 10 times lower than those of NVMe SSD. Average latency is 1000 lower than those of HDD. There is quite large variation for small block read latency: even though the average time is quite low and close to minimal latency the maximum latency and even 99 percentile are significantly worse. If somebody looks at these results and wishes to create an Intel Optane-based service with 12 microsecond latency for reads they would have to install larger number of Intel Optane drives or consider providing more realistic timings.
 
 When latency is so small overheads of context switching and interrupt handling become noticeable. One can use polling mode to gain some improvement. In this mode the Linux kernel monitors the completion queue instead of switching to some other job and relying on hardware interrupt with interrupt handler to notify about completion. Clearly, it is considerable to use the polling mode only when hardware response is expected to arrive fast enough.
-![Intel Optane single read latency in polling mode](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/optane-single-hipri-read.png)
+
+![Intel Optane single read latency in polling mode](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/optane-single-hipri-read.png)
 
 The figure above shows results for reading from Intel Optane in polling mode. The polling mode is used when an application calls preadv2(2) system call with RWF\_HIGHPRI flag. Compared to usual pread(2) the polling mode lowers the maximum latency by a factor of two for block sizes up to 256 kilobytes.
 
@@ -57,7 +58,7 @@ The figure above shows results for reading from Intel Optane in polling mode. Th
 
 To summarize our results the next figure shows single read latencies for all four storage types on a single chart.
 
-![Single read latency for Optane, SSD and HDD](https://blog-images.clickhouse.tech/en/2021/reading-from-external-memory/all-single-read.png)
+![Single read latency for Optane, SSD and HDD](https://blog-images.clickhouse.com/en/2021/reading-from-external-memory/all-single-read.png)
 
 Starting from 4 megabytes the latency is easily predicted by linear extrapolation so we don't show larger blocks here. To show everything on a single figure we are forced to use quite an overloaded legend. We use vertical level to show the latency and we iterate the block size horizontally. For each block size we show four bars, from left to right: for Intel Optane, NVMe SSD, SATA SSD, and HDD. Storage type is represented by hatch and the latency by color.
 
diff --git a/website/blog/ru/2016/clickhouse-meetup-v-moskve-21-noyabrya-2016.md b/website/blog/ru/2016/clickhouse-meetup-v-moskve-21-noyabrya-2016.md
index 71fb8da8215..2c0463687b4 100644
--- a/website/blog/ru/2016/clickhouse-meetup-v-moskve-21-noyabrya-2016.md
+++ b/website/blog/ru/2016/clickhouse-meetup-v-moskve-21-noyabrya-2016.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup в Москве, 21 ноября 2016'
-image: 'https://blog-images.clickhouse.tech/ru/2016/clickhouse-meetup-v-moskve-21-noyabrya-2016/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2016/clickhouse-meetup-v-moskve-21-noyabrya-2016/main.jpg'
 date: '2016-11-22'
 tags: ['мероприятия', 'meetup', 'Москва']
 ---
diff --git a/website/blog/ru/2016/clickhouse-na-highload-2016.md b/website/blog/ru/2016/clickhouse-na-highload-2016.md
index fb950db35b0..7dacbde140a 100644
--- a/website/blog/ru/2016/clickhouse-na-highload-2016.md
+++ b/website/blog/ru/2016/clickhouse-na-highload-2016.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse на HighLoad++ 2016'
-image: 'https://blog-images.clickhouse.tech/ru/2016/clickhouse-na-highload-2016/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2016/clickhouse-na-highload-2016/main.jpg'
 date: '2016-12-10'
 tags: ['мероприятия', 'конференции', 'Москва', 'HighLoad++']
 ---
diff --git a/website/blog/ru/2016/clickhouse-na-vstreche-pro-infrastrukturu-khraneniya-i-obrabotki-dannykh-v-yandekse.md b/website/blog/ru/2016/clickhouse-na-vstreche-pro-infrastrukturu-khraneniya-i-obrabotki-dannykh-v-yandekse.md
index 6404ee0465a..d90a7b9c4bb 100644
--- a/website/blog/ru/2016/clickhouse-na-vstreche-pro-infrastrukturu-khraneniya-i-obrabotki-dannykh-v-yandekse.md
+++ b/website/blog/ru/2016/clickhouse-na-vstreche-pro-infrastrukturu-khraneniya-i-obrabotki-dannykh-v-yandekse.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse на встрече про инфраструктуру хранения и обработки данных в Яндексе'
-image: 'https://blog-images.clickhouse.tech/ru/2016/clickhouse-na-vstreche-pro-infrastrukturu-khraneniya-i-obrabotki-dannykh-v-yandekse/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2016/clickhouse-na-vstreche-pro-infrastrukturu-khraneniya-i-obrabotki-dannykh-v-yandekse/main.jpg'
 date: '2016-10-16'
 tags: ['мероприятия', 'инфраструктура']
 ---
diff --git a/website/blog/ru/2016/yandeks-otkryvaet-clickhouse.md b/website/blog/ru/2016/yandeks-otkryvaet-clickhouse.md
index 36daa047ce7..e7216f47408 100644
--- a/website/blog/ru/2016/yandeks-otkryvaet-clickhouse.md
+++ b/website/blog/ru/2016/yandeks-otkryvaet-clickhouse.md
@@ -1,10 +1,10 @@
 ---
 title: 'Яндекс открывает ClickHouse'
-image: 'https://blog-images.clickhouse.tech/ru/2016/yandeks-otkryvaet-clickhouse/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2016/yandeks-otkryvaet-clickhouse/main.jpg'
 date: '2016-06-15'
 tags: ['анонс', 'GitHub', 'лицензия']
 ---
 
-Сегодня внутренняя разработка компании Яндекс — [аналитическая СУБД ClickHouse](https://clickhouse.tech/), стала доступна каждому. Исходники опубликованы на [GitHub](https://github.com/yandex/ClickHouse) под лицензией Apache 2.0.
+Сегодня внутренняя разработка компании Яндекс — [аналитическая СУБД ClickHouse](https://clickhouse.com/), стала доступна каждому. Исходники опубликованы на [GitHub](https://github.com/ClickHouse/ClickHouse) под лицензией Apache 2.0.
 
 ClickHouse позволяет выполнять аналитические запросы в интерактивном режиме по данным, обновляемым в реальном времени. Система способна масштабироваться до десятков триллионов записей и петабайт хранимых данных. Использование ClickHouse открывает возможности, которые раньше было даже трудно представить: вы можете сохранять весь поток данных без предварительной агрегации и быстро получать отчёты в любых разрезах. ClickHouse разработан в Яндексе для задач [Яндекс.Метрики](https://metrika.yandex.ru/) — второй по величине системы веб-аналитики в мире.
diff --git a/website/blog/ru/2017/clickhouse-meetup-edet-v-minsk.md b/website/blog/ru/2017/clickhouse-meetup-edet-v-minsk.md
index fb84a16c02a..adab2fd7676 100644
--- a/website/blog/ru/2017/clickhouse-meetup-edet-v-minsk.md
+++ b/website/blog/ru/2017/clickhouse-meetup-edet-v-minsk.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse MeetUp едет в Минск!'
-image: 'https://blog-images.clickhouse.tech/ru/2017/clickhouse-meetup-edet-v-minsk/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2017/clickhouse-meetup-edet-v-minsk/main.jpg'
 date: '2017-06-13'
 tags: ['мероприятия', 'meetup', 'Минск', 'Беларусь', 'анонс']
 ---
diff --git a/website/blog/ru/2017/clickhouse-meetup-v-ekaterinburge-16-maya-2017.md b/website/blog/ru/2017/clickhouse-meetup-v-ekaterinburge-16-maya-2017.md
index 80d399203b0..b7441b7ac30 100644
--- a/website/blog/ru/2017/clickhouse-meetup-v-ekaterinburge-16-maya-2017.md
+++ b/website/blog/ru/2017/clickhouse-meetup-v-ekaterinburge-16-maya-2017.md
@@ -1,8 +1,8 @@
 ---
 title: 'ClickHouse Meetup в Екатеринбурге, 16 мая 2017'
-image: 'https://blog-images.clickhouse.tech/ru/2017/clickhouse-meetup-v-ekaterinburge-16-maya-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2017/clickhouse-meetup-v-ekaterinburge-16-maya-2017/main.jpg'
 date: '2017-05-17'
 tags: ['мероприятия', 'meetup', 'Екатеринбург']
 ---
 
-[Посмотреть презентацию](https://presentations.clickhouse.tech/meetup6/)
+[Посмотреть презентацию](https://presentations.clickhouse.com/meetup6/)
diff --git a/website/blog/ru/2017/clickhouse-meetup-v-minske-itogi.md b/website/blog/ru/2017/clickhouse-meetup-v-minske-itogi.md
index de38df47af3..8cd3375abe9 100644
--- a/website/blog/ru/2017/clickhouse-meetup-v-minske-itogi.md
+++ b/website/blog/ru/2017/clickhouse-meetup-v-minske-itogi.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse MeetUp в Минске: итоги'
-image: 'https://blog-images.clickhouse.tech/ru/2017/clickhouse-meetup-v-minske-itogi/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2017/clickhouse-meetup-v-minske-itogi/main.jpg'
 date: '2017-06-19'
 tags: ['мероприятия', 'meetup', 'Минск', 'Беларусь']
 ---
@@ -9,8 +9,8 @@ tags: ['мероприятия', 'meetup', 'Минск', 'Беларусь']
 
 Мы делимся с вами презентациями докладчиков и будем рады ответить на вопросы в [чате ClickHouse в Телеграме](https://t.me/clickhouse_ru).
 
-[История создания ClickHouse, новости и планы по развитию](https://presentations.clickhouse.tech/meetup7/), Алексей Миловидов
+[История создания ClickHouse, новости и планы по развитию](https://presentations.clickhouse.com/meetup7/), Алексей Миловидов
 
-[Использование ClickHouse для мониторинга связности сети](https://presentations.clickhouse.tech/meetup7/netmon.pdf), Дмитрий Липин
+[Использование ClickHouse для мониторинга связности сети](https://presentations.clickhouse.com/meetup7/netmon.pdf), Дмитрий Липин
 
-[Разбираемся во внутреннем устройстве ClickHouse](https://presentations.clickhouse.tech/meetup7/internals.pdf), Виталий Людвиченко
+[Разбираемся во внутреннем устройстве ClickHouse](https://presentations.clickhouse.com/meetup7/internals.pdf), Виталий Людвиченко
diff --git a/website/blog/ru/2017/clickhouse-meetup-v-novosibirske-3-aprelya-2017.md b/website/blog/ru/2017/clickhouse-meetup-v-novosibirske-3-aprelya-2017.md
index e4a614befad..e8bbf23c2c4 100644
--- a/website/blog/ru/2017/clickhouse-meetup-v-novosibirske-3-aprelya-2017.md
+++ b/website/blog/ru/2017/clickhouse-meetup-v-novosibirske-3-aprelya-2017.md
@@ -1,10 +1,10 @@
 ---
 title: 'ClickHouse Meetup в Новосибирске, 3 апреля 2017'
-image: 'https://blog-images.clickhouse.tech/ru/2017/clickhouse-meetup-v-novosibirske-3-aprelya-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2017/clickhouse-meetup-v-novosibirske-3-aprelya-2017/main.jpg'
 date: '2017-04-04'
 tags: ['мероприятия', 'meetup', 'Новосибирск']
 ---
 
-[Презентация Алексея Миловидова](https://presentations.clickhouse.tech/meetup4/)
+[Презентация Алексея Миловидова](https://presentations.clickhouse.com/meetup4/)
 
-[Презентация Марии Мансуровой](https://presentations.clickhouse.tech/meetup4/clickhouse_for_analysts.pdf)
+[Презентация Марии Мансуровой](https://presentations.clickhouse.com/meetup4/clickhouse_for_analysts.pdf)
diff --git a/website/blog/ru/2017/clickhouse-meetup-v-sankt-peterburge-28-fevralya-2017.md b/website/blog/ru/2017/clickhouse-meetup-v-sankt-peterburge-28-fevralya-2017.md
index 3bdfd2763b8..16bf2822746 100644
--- a/website/blog/ru/2017/clickhouse-meetup-v-sankt-peterburge-28-fevralya-2017.md
+++ b/website/blog/ru/2017/clickhouse-meetup-v-sankt-peterburge-28-fevralya-2017.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup в Санкт-Петербурге, 28 февраля 2017'
-image: 'https://blog-images.clickhouse.tech/ru/2017/clickhouse-meetup-v-sankt-peterburge-28-fevralya-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2017/clickhouse-meetup-v-sankt-peterburge-28-fevralya-2017/main.jpg'
 date: '2017-03-01'
 tags: ['мероприятия', 'meetup', 'Санкт-Петербург']
 ---
diff --git a/website/blog/ru/2017/clickhouse-na-uwdc-2017.md b/website/blog/ru/2017/clickhouse-na-uwdc-2017.md
index 7b801181803..1806f5fb6ba 100644
--- a/website/blog/ru/2017/clickhouse-na-uwdc-2017.md
+++ b/website/blog/ru/2017/clickhouse-na-uwdc-2017.md
@@ -1,10 +1,10 @@
 ---
 title: 'ClickHouse на UWDC 2017'
-image: 'https://blog-images.clickhouse.tech/ru/2017/clickhouse-na-uwdc-2017/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2017/clickhouse-na-uwdc-2017/main.jpg'
 date: '2017-05-20'
 tags: ['мероприятия', 'конференции', 'Челябинск']
 ---
 
 ![iframe](https://www.youtube.com/embed/isYA4e5zg1M?t=2h8m15s)
 
-[Посмотреть презентацию](https://presentations.clickhouse.tech/uwdc/)
+[Посмотреть презентацию](https://presentations.clickhouse.com/uwdc/)
diff --git a/website/blog/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019.md b/website/blog/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019.md
index 38e697d6b4c..a4dbff081ff 100644
--- a/website/blog/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019.md
+++ b/website/blog/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019.md
@@ -1,38 +1,38 @@
 ---
 title: 'ClickHouse Meetup в Лимассоле, 7 мая 2019'
-image: 'https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/main.jpg'
 date: '2019-05-14'
 tags: ['мероприятия', 'meetup', 'Лимассол', 'Кипр', 'Европа']
 ---
 
 Первый ClickHouse Meetup под открытым небом прошел в сердце Лимассола, второго по размеру города Кипра, на крыше, любезно предоставленной Exness Group. С крыши открывались сногсшибательные виды, но докладчики отлично справлялись с конкуренцией с ними за внимание аудитории. Более ста человек присоединилось к мероприятие, что в очередной раз подтверждает высокий интерес к ClickHouse по всему земному шару. Контент мероприятия также доступен в формате [видеозаписи](https://www.youtube.com/watch?v=_rpU-TvSfZ8).
 
-[Кирилл Шваков](https://github.com/kshvakov) сыграл ключевую роль в том, чтобы данное мероприятие стало возможным: наладил коммуникацию с ClickHouse сообществом на Кипре, нашел отличную площадку и докладчиков. Большинство ClickHouse митапов по всему миру происходят благодаря активным участникам сообщества таким как Кирилл. Если вы хотите помочь нам организовать ClickHouse митап в своём регионе, пожалуйста свяжитесь с командой ClickHouse в Яндексе через [эту форму](https://clickhouse.tech/#meet) или любым другим удобным способом.
+[Кирилл Шваков](https://github.com/kshvakov) сыграл ключевую роль в том, чтобы данное мероприятие стало возможным: наладил коммуникацию с ClickHouse сообществом на Кипре, нашел отличную площадку и докладчиков. Большинство ClickHouse митапов по всему миру происходят благодаря активным участникам сообщества таким как Кирилл. Если вы хотите помочь нам организовать ClickHouse митап в своём регионе, пожалуйста свяжитесь с командой ClickHouse в Яндексе через [эту форму](https://clickhouse.com/#meet) или любым другим удобным способом.
 
-![Кирилл Шваков](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/1.jpg)
+![Кирилл Шваков](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/1.jpg)
 
-Кирилл широко известен благодаря его замечательногму [ClickHouse Go Driver](https://github.com/clickhouse/clickhouse-go), работающему по нативному протоколу, а его открывающий доклад был о его опыте оптимизации ClickHouse запросов и решению реальных прикладных задач в Integros и Wisebits. [Слайды](https://presentations.clickhouse.tech/meetup22/strategies.pdf). [Полные тексты запросов](https://github.com/kshvakov/ClickHouse-Meetup-Exness).
+Кирилл широко известен благодаря его замечательногму [ClickHouse Go Driver](https://github.com/clickhouse/clickhouse-go), работающему по нативному протоколу, а его открывающий доклад был о его опыте оптимизации ClickHouse запросов и решению реальных прикладных задач в Integros и Wisebits. [Слайды](https://presentations.clickhouse.com/meetup22/strategies.pdf). [Полные тексты запросов](https://github.com/kshvakov/ClickHouse-Meetup-Exness).
 
 Мероприятие началось ранним вечером…
-![Вечер в Лимассоле](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/2.jpg)
+![Вечер в Лимассоле](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/2.jpg)
 
 …но природе потребовалось всего около часа, чтобы включить «ночной режим». Зато проецируемые слайды стало заметно легче читать.
-![Ночь в Лимассоле](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/3.jpg)
+![Ночь в Лимассоле](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/3.jpg)
 
-Сергей Томилов с его коллегами из Exness Platform Team поделились деталями об эволюции их систем для анализа логов и метрик, а также как они в итоге стали использовать ClickHouse для долгосрочного хранения и анализа данных([слайды](https://presentations.clickhouse.tech/meetup22/exness.pdf)):
-![Сергей Томилов](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/4.jpg)
+Сергей Томилов с его коллегами из Exness Platform Team поделились деталями об эволюции их систем для анализа логов и метрик, а также как они в итоге стали использовать ClickHouse для долгосрочного хранения и анализа данных([слайды](https://presentations.clickhouse.com/meetup22/exness.pdf)):
+![Сергей Томилов](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/4.jpg)
 
-Алексей Миловидов из команды ClickHouse в Яндексе продемонстрировал функциональность из недавних релизов ClickHouse, а также рассказал о том, что стоит ждать в ближайшем будущем([слайды](https://presentations.clickhouse.tech/meetup22/new_features/)):
-![Алексей Миловидов](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/5.jpg)
+Алексей Миловидов из команды ClickHouse в Яндексе продемонстрировал функциональность из недавних релизов ClickHouse, а также рассказал о том, что стоит ждать в ближайшем будущем([слайды](https://presentations.clickhouse.com/meetup22/new_features/)):
+![Алексей Миловидов](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/5.jpg)
 
-Александр Зайцев, технический директор Altinity, показал обзор того, как можно интегрировать ClickHouse в окружения, работающие на Kubernetes([слайды](https://presentations.clickhouse.tech/meetup22/kubernetes.pdf)):
-![Александр Зайцев](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/6.jpg)
+Александр Зайцев, технический директор Altinity, показал обзор того, как можно интегрировать ClickHouse в окружения, работающие на Kubernetes([слайды](https://presentations.clickhouse.com/meetup22/kubernetes.pdf)):
+![Александр Зайцев](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/6.jpg)
 
-Владимир Гончаров, бекенд разработчик из Aloha Browser, закрывал ClickHouse Limassol Meetup демонстрацией нескольких проектов для интеграции других opensource продуктов для анализа логов с ClickHouse ([слайды](https://presentations.clickhouse.tech/meetup22/aloha.pdf)):
-![Владимир Гончаров](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/7.jpg)
+Владимир Гончаров, бекенд разработчик из Aloha Browser, закрывал ClickHouse Limassol Meetup демонстрацией нескольких проектов для интеграции других opensource продуктов для анализа логов с ClickHouse ([слайды](https://presentations.clickhouse.com/meetup22/aloha.pdf)):
+![Владимир Гончаров](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/7.jpg)
 
 К сожалению, приближалась полнось и только самые «морозостойкие» любители ClickHouse продержались всё мероприятие, так стало заметно холодать.
 
-![Лимассол](https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/8.jpg)
+![Лимассол](https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-limassole-7-maya-2019/8.jpg)
 
 Больше фотографий с мероприятия доступно в [коротком послесловии от Exness](https://www.facebook.com/events/386638262181785/permalink/402167077295570/).
diff --git a/website/blog/ru/2019/clickhouse-meetup-v-moskve-5-sentyabrya-2019.md b/website/blog/ru/2019/clickhouse-meetup-v-moskve-5-sentyabrya-2019.md
index d3a5471b1a8..7e82fd653d7 100644
--- a/website/blog/ru/2019/clickhouse-meetup-v-moskve-5-sentyabrya-2019.md
+++ b/website/blog/ru/2019/clickhouse-meetup-v-moskve-5-sentyabrya-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup в Москве, 5 сентября 2019'
-image: 'https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-moskve-5-sentyabrya-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-moskve-5-sentyabrya-2019/main.jpg'
 date: '2019-09-06'
 tags: ['мероприятия', 'meetup', 'Москва']
 ---
diff --git a/website/blog/ru/2019/clickhouse-meetup-v-novosibirske-26-iyunya-2019.md b/website/blog/ru/2019/clickhouse-meetup-v-novosibirske-26-iyunya-2019.md
index d1dafe580f1..a90efdca645 100644
--- a/website/blog/ru/2019/clickhouse-meetup-v-novosibirske-26-iyunya-2019.md
+++ b/website/blog/ru/2019/clickhouse-meetup-v-novosibirske-26-iyunya-2019.md
@@ -1,6 +1,6 @@
 ---
 title: 'ClickHouse Meetup в Новосибирске, 26 июня 2019'
-image: 'https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-novosibirske-26-iyunya-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-novosibirske-26-iyunya-2019/main.jpg'
 date: '2019-06-05'
 tags: ['мероприятия', 'meetup', 'Новосибирск']
 ---
@@ -9,4 +9,4 @@ tags: ['мероприятия', 'meetup', 'Новосибирск']
 
 ![iframe](https://www.youtube.com/embed/videoseries?list=PL0Z2YDlm0b3ionSVt-NYC9Vu_83xxhb4J)
 
-Как обычно, [все слайды опубликованы на GitHub](https://presentations.clickhouse.tech/meetup25).
+Как обычно, [все слайды опубликованы на GitHub](https://presentations.clickhouse.com/meetup25).
diff --git a/website/blog/ru/2019/clickhouse-meetup-v-sankt-peterburge-27-iyulya-2019.md b/website/blog/ru/2019/clickhouse-meetup-v-sankt-peterburge-27-iyulya-2019.md
index 8f8f9b4aae2..bef157ade4e 100644
--- a/website/blog/ru/2019/clickhouse-meetup-v-sankt-peterburge-27-iyulya-2019.md
+++ b/website/blog/ru/2019/clickhouse-meetup-v-sankt-peterburge-27-iyulya-2019.md
@@ -1,10 +1,10 @@
 ---
 title: 'ClickHouse Meetup в Санкт-Петербурге, 27 июля 2019'
-image: 'https://blog-images.clickhouse.tech/ru/2019/clickhouse-meetup-v-sankt-peterburge-27-iyulya-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2019/clickhouse-meetup-v-sankt-peterburge-27-iyulya-2019/main.jpg'
 date: '2019-08-01'
 tags: ['мероприятия', 'meetup', 'Санкт-Петербург']
 ---
 
 ![iframe](https://www.youtube.com/embed/videoseries?list=PL0Z2YDlm0b3j3X7TWrKmnEPcfEG901W-T)
 
-[Слайды опубликованы на GitHub](https://github.com/yandex/clickhouse-presentations/tree/master/meetup27).
+[Слайды опубликованы на GitHub](https://github.com/ClickHouse/clickhouse-presentations/tree/master/meetup27).
diff --git a/website/blog/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019.md b/website/blog/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019.md
index cbd9e6c01fb..e6897f17156 100644
--- a/website/blog/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019.md
+++ b/website/blog/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019.md
@@ -1,12 +1,12 @@
 ---
 title: 'ClickHouse Meetup в Минске, 11 июля 2019'
-image: 'https://blog-images.clickhouse.tech/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019/main.jpg'
+image: 'https://blog-images.clickhouse.com/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019/main.jpg'
 date: '2019-07-12'
 tags: ['мероприятия', 'meetup', 'Минск', 'Беларусь']
 ---
 
 ![iframe](https://www.youtube.com/embed/videoseries?list=PL0Z2YDlm0b3hLz6dmyu6gM_X871FG9eCc)
 
-[Все слайды опубликованы на GitHub](https://github.com/yandex/clickhouse-presentations/tree/master/meetup26).
+[Все слайды опубликованы на GitHub](https://github.com/ClickHouse/clickhouse-presentations/tree/master/meetup26).
 
-![Минск](https://blog-images.clickhouse.tech/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019/1.jpg)
+![Минск](https://blog-images.clickhouse.com/ru/2019/clickrouse-meetup-v-minske-11-iyulya-2019/1.jpg)
diff --git a/website/careers/index.html b/website/careers/index.html
new file mode 100644
index 00000000000..14e23e3357c
--- /dev/null
+++ b/website/careers/index.html
@@ -0,0 +1,26 @@
+{% set prefetch_items = [
+    ('/docs/en/', 'document')
+] %}
+
+{% extends "templates/base.html" %}
+
+{% block extra_meta %}
+{% include "templates/common_fonts.html" %}
+{% endblock %}
+
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
+{% block content %}
+
+{% include "templates/careers/hero.html" %}
+{% include "templates/careers/overview.html" %}
+{% include "templates/careers/greenhouse.html" %}
+
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
+
+{% endblock %}
diff --git a/website/company/index.html b/website/company/index.html
new file mode 100644
index 00000000000..7439ebf15fe
--- /dev/null
+++ b/website/company/index.html
@@ -0,0 +1,29 @@
+{% set prefetch_items = [
+    ('/docs/en/', 'document')
+] %}
+
+{% extends "templates/base.html" %}
+
+{% block extra_meta %}
+{% include "templates/common_fonts.html" %}
+{% endblock %}
+
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
+{% block content %}
+
+{% include "templates/company/hero.html" %}
+{% include "templates/company/overview.html" %}
+{% include "templates/company/founders.html" %}
+{% include "templates/company/team.html" %}
+{% include "templates/company/press.html" %}
+{% include "templates/company/contact.html" %}
+
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
+
+{% endblock %}
diff --git a/website/css/base.css b/website/css/base.css
index a63d1d7b166..b65c8e869f4 100644
--- a/website/css/base.css
+++ b/website/css/base.css
@@ -1,13 +1,11 @@
-body {
-    font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans","Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-}
-
-a:link, a:visited {
+.blog a:link, .blog a:visited,
+.docs a:link, .docs a:visited {
     color: #f14600;
     text-decoration: none;
 }
 
-a:hover, a:active {
+.blog a:hover, .blog a:active,
+.docs a:hover, .docs a:active {
     text-decoration: underline;
 }
 
@@ -25,7 +23,7 @@ a:hover, a:active {
 }
 
 #logo-icon, #docs-logo-icon {
-    width: 40px;
+    width: 64px;
 }
 
 #logo-text {
@@ -113,19 +111,6 @@ a.btn-outline-yellow {
     color: #fc0;
 }
 
-.navbar-light {
-    border-bottom: 1px solid #efefef;
-}
-
-
-.navbar-light .navbar-nav .nav-link {
-    color: #000;
-}
-
-.navbar-light .navbar-nav .nav-link:hover {
-    color: #f14600;
-}
-
 .bg-number {
     position: absolute;
     font-size: 900%;
@@ -145,7 +130,7 @@ a.btn-outline-yellow {
 }
 
 .nav .dropdown-toggle::after {
-    vertical-align: 0;
+    vertical-align: 0 !important;
 }
 .nav .dropdown-toggle[aria-expanded=false]::after {
     display: inline-block;
@@ -204,3 +189,7 @@ a.btn-outline-yellow {
 #feedback_email {
     white-space: nowrap;
 }
+
+.height-20 {
+    height: 20px;
+}
diff --git a/website/css/bootstrap.css b/website/css/bootstrap.css
index 0703d5d3b65..b65cbbfed01 100644
--- a/website/css/bootstrap.css
+++ b/website/css/bootstrap.css
@@ -3,10195 +3,4 @@
  * Copyright 2011-2019 The Bootstrap Authors
  * Copyright 2011-2019 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-:root {
-  --blue: #007bff;
-  --indigo: #6610f2;
-  --purple: #6f42c1;
-  --pink: #e83e8c;
-  --red: #dc3545;
-  --orange: #fd7e14;
-  --yellow: #ffc107;
-  --green: #28a745;
-  --teal: #20c997;
-  --cyan: #17a2b8;
-  --white: #fff;
-  --gray: #6c757d;
-  --gray-dark: #343a40;
-  --primary: #007bff;
-  --secondary: #6c757d;
-  --success: #28a745;
-  --info: #17a2b8;
-  --warning: #ffc107;
-  --danger: #dc3545;
-  --light: #f8f9fa;
-  --dark: #343a40;
-  --breakpoint-xs: 0;
-  --breakpoint-sm: 576px;
-  --breakpoint-md: 768px;
-  --breakpoint-lg: 992px;
-  --breakpoint-xl: 1200px;
-  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
-
-html {
-  font-family: sans-serif;
-  line-height: 1.15;
-  -webkit-text-size-adjust: 100%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
-  display: block;
-}
-
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #212529;
-  text-align: left;
-  background-color: #fff;
-}
-
-[tabindex="-1"]:focus:not(:focus-visible) {
-  outline: 0 !important;
-}
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-  overflow: visible;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  margin-top: 0;
-  margin-bottom: 0.5rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title],
-abbr[data-original-title] {
-  text-decoration: underline;
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
-  cursor: help;
-  border-bottom: 0;
-  -webkit-text-decoration-skip-ink: none;
-  text-decoration-skip-ink: none;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: 700;
-}
-
-dd {
-  margin-bottom: .5rem;
-  margin-left: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-small {
-  font-size: 80%;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -.25em;
-}
-
-sup {
-  top: -.5em;
-}
-
-a {
-  color: #007bff;
-  text-decoration: none;
-  background-color: transparent;
-}
-
-a:hover {
-  color: #0056b3;
-  text-decoration: underline;
-}
-
-a:not([href]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-a:not([href]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-pre,
-code,
-kbd,
-samp {
-  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  font-size: 1em;
-}
-
-pre {
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img {
-  vertical-align: middle;
-  border-style: none;
-}
-
-svg {
-  overflow: hidden;
-  vertical-align: middle;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-caption {
-  padding-top: 0.75rem;
-  padding-bottom: 0.75rem;
-  color: #6c757d;
-  text-align: left;
-  caption-side: bottom;
-}
-
-th {
-  text-align: inherit;
-}
-
-label {
-  display: inline-block;
-  margin-bottom: 0.5rem;
-}
-
-button {
-  border-radius: 0;
-}
-
-button:focus {
-  outline: 1px dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-}
-
-input,
-button,
-select,
-optgroup,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-input {
-  overflow: visible;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-select {
-  word-wrap: normal;
-}
-
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button;
-}
-
-button:not(:disabled),
-[type="button"]:not(:disabled),
-[type="reset"]:not(:disabled),
-[type="submit"]:not(:disabled) {
-  cursor: pointer;
-}
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  padding: 0;
-  border-style: none;
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  box-sizing: border-box;
-  padding: 0;
-}
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
-  -webkit-appearance: listbox;
-}
-
-textarea {
-  overflow: auto;
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  max-width: 100%;
-  padding: 0;
-  margin-bottom: .5rem;
-  font-size: 1.5rem;
-  line-height: inherit;
-  color: inherit;
-  white-space: normal;
-}
-
-progress {
-  vertical-align: baseline;
-}
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-[type="search"] {
-  outline-offset: -2px;
-  -webkit-appearance: none;
-}
-
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-output {
-  display: inline-block;
-}
-
-summary {
-  display: list-item;
-  cursor: pointer;
-}
-
-template {
-  display: none;
-}
-
-[hidden] {
-  display: none !important;
-}
-
-h1, h2, h3, h4, h5, h6,
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  margin-bottom: 0.5rem;
-  font-weight: 500;
-  line-height: 1.2;
-}
-
-h1, .h1 {
-  font-size: 2rem;
-}
-
-h2, .h2 {
-  font-size: 1.5rem;
-}
-
-h3, .h3 {
-  font-size: 1.25rem;
-}
-
-h4, .h4 {
-  font-size: 1rem;
-}
-
-h5, .h5 {
-  font-size: 1rem;
-}
-
-h6, .h6 {
-  font-size: 1rem;
-}
-
-.lead {
-  font-size: 1.25rem;
-  font-weight: 300;
-}
-
-.display-1 {
-  font-size: 6rem;
-  font-weight: 300;
-  line-height: 1.2;
-}
-
-.display-2 {
-  font-size: 5.5rem;
-  font-weight: 300;
-  line-height: 1.2;
-}
-
-.display-3 {
-  font-size: 4.5rem;
-  font-weight: 300;
-  line-height: 1.2;
-}
-
-.display-4 {
-  font-size: 3.5rem;
-  font-weight: 300;
-  line-height: 1.2;
-}
-
-hr {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-  border: 0;
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-small,
-.small {
-  font-size: 80%;
-  font-weight: 400;
-}
-
-mark,
-.mark {
-  padding: 0.2em;
-  background-color: #fcf8e3;
-}
-
-.list-unstyled {
-  padding-left: 0;
-  list-style: none;
-}
-
-.list-inline {
-  padding-left: 0;
-  list-style: none;
-}
-
-.list-inline-item {
-  display: inline-block;
-}
-
-.list-inline-item:not(:last-child) {
-  margin-right: 0.5rem;
-}
-
-.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-.blockquote {
-  margin-bottom: 1rem;
-  font-size: 1.25rem;
-}
-
-.blockquote-footer {
-  display: block;
-  font-size: 80%;
-  color: #6c757d;
-}
-
-.blockquote-footer::before {
-  content: "\2014\00A0";
-}
-
-.img-fluid {
-  max-width: 100%;
-  height: auto;
-}
-
-.img-thumbnail {
-  padding: 0.25rem;
-  background-color: #fff;
-  border: 1px solid #dee2e6;
-  border-radius: 0.25rem;
-  max-width: 100%;
-  height: auto;
-}
-
-.figure {
-  display: inline-block;
-}
-
-.figure-img {
-  margin-bottom: 0.5rem;
-  line-height: 1;
-}
-
-.figure-caption {
-  font-size: 90%;
-  color: #6c757d;
-}
-
-code {
-  font-size: 87.5%;
-  color: #e83e8c;
-  word-wrap: break-word;
-}
-
-a > code {
-  color: inherit;
-}
-
-kbd {
-  padding: 0.2rem 0.4rem;
-  font-size: 87.5%;
-  color: #fff;
-  background-color: #212529;
-  border-radius: 0.2rem;
-}
-
-kbd kbd {
-  padding: 0;
-  font-size: 100%;
-  font-weight: 700;
-}
-
-pre {
-  display: block;
-  font-size: 87.5%;
-}
-
-pre code {
-  font-size: inherit;
-  color: inherit;
-  word-break: normal;
-}
-
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-
-.container {
-  width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-@media (min-width: 576px) {
-  .container {
-    max-width: 540px;
-  }
-}
-
-@media (min-width: 768px) {
-  .container {
-    max-width: 720px;
-  }
-}
-
-@media (min-width: 992px) {
-  .container {
-    max-width: 960px;
-  }
-}
-
-@media (min-width: 1200px) {
-  .container {
-    max-width: 1140px;
-  }
-}
-
-.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {
-  width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-@media (min-width: 576px) {
-  .container, .container-sm {
-    max-width: 540px;
-  }
-}
-
-@media (min-width: 768px) {
-  .container, .container-sm, .container-md {
-    max-width: 720px;
-  }
-}
-
-@media (min-width: 992px) {
-  .container, .container-sm, .container-md, .container-lg {
-    max-width: 960px;
-  }
-}
-
-@media (min-width: 1200px) {
-  .container, .container-sm, .container-md, .container-lg, .container-xl {
-    max-width: 1140px;
-  }
-}
-
-.row {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
-.no-gutters {
-  margin-right: 0;
-  margin-left: 0;
-}
-
-.no-gutters > .col,
-.no-gutters > [class*="col-"] {
-  padding-right: 0;
-  padding-left: 0;
-}
-
-.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col,
-.col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm,
-.col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md,
-.col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg,
-.col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
-.col-xl-auto {
-  position: relative;
-  width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
-}
-
-.col {
-  -ms-flex-preferred-size: 0;
-  flex-basis: 0;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  max-width: 100%;
-}
-
-.row-cols-1 > * {
-  -ms-flex: 0 0 100%;
-  flex: 0 0 100%;
-  max-width: 100%;
-}
-
-.row-cols-2 > * {
-  -ms-flex: 0 0 50%;
-  flex: 0 0 50%;
-  max-width: 50%;
-}
-
-.row-cols-3 > * {
-  -ms-flex: 0 0 33.333333%;
-  flex: 0 0 33.333333%;
-  max-width: 33.333333%;
-}
-
-.row-cols-4 > * {
-  -ms-flex: 0 0 25%;
-  flex: 0 0 25%;
-  max-width: 25%;
-}
-
-.row-cols-5 > * {
-  -ms-flex: 0 0 20%;
-  flex: 0 0 20%;
-  max-width: 20%;
-}
-
-.row-cols-6 > * {
-  -ms-flex: 0 0 16.666667%;
-  flex: 0 0 16.666667%;
-  max-width: 16.666667%;
-}
-
-.col-auto {
-  -ms-flex: 0 0 auto;
-  flex: 0 0 auto;
-  width: auto;
-  max-width: 100%;
-}
-
-.col-1 {
-  -ms-flex: 0 0 8.333333%;
-  flex: 0 0 8.333333%;
-  max-width: 8.333333%;
-}
-
-.col-2 {
-  -ms-flex: 0 0 16.666667%;
-  flex: 0 0 16.666667%;
-  max-width: 16.666667%;
-}
-
-.col-3 {
-  -ms-flex: 0 0 25%;
-  flex: 0 0 25%;
-  max-width: 25%;
-}
-
-.col-4 {
-  -ms-flex: 0 0 33.333333%;
-  flex: 0 0 33.333333%;
-  max-width: 33.333333%;
-}
-
-.col-5 {
-  -ms-flex: 0 0 41.666667%;
-  flex: 0 0 41.666667%;
-  max-width: 41.666667%;
-}
-
-.col-6 {
-  -ms-flex: 0 0 50%;
-  flex: 0 0 50%;
-  max-width: 50%;
-}
-
-.col-7 {
-  -ms-flex: 0 0 58.333333%;
-  flex: 0 0 58.333333%;
-  max-width: 58.333333%;
-}
-
-.col-8 {
-  -ms-flex: 0 0 66.666667%;
-  flex: 0 0 66.666667%;
-  max-width: 66.666667%;
-}
-
-.col-9 {
-  -ms-flex: 0 0 75%;
-  flex: 0 0 75%;
-  max-width: 75%;
-}
-
-.col-10 {
-  -ms-flex: 0 0 83.333333%;
-  flex: 0 0 83.333333%;
-  max-width: 83.333333%;
-}
-
-.col-11 {
-  -ms-flex: 0 0 91.666667%;
-  flex: 0 0 91.666667%;
-  max-width: 91.666667%;
-}
-
-.col-12 {
-  -ms-flex: 0 0 100%;
-  flex: 0 0 100%;
-  max-width: 100%;
-}
-
-.order-first {
-  -ms-flex-order: -1;
-  order: -1;
-}
-
-.order-last {
-  -ms-flex-order: 13;
-  order: 13;
-}
-
-.order-0 {
-  -ms-flex-order: 0;
-  order: 0;
-}
-
-.order-1 {
-  -ms-flex-order: 1;
-  order: 1;
-}
-
-.order-2 {
-  -ms-flex-order: 2;
-  order: 2;
-}
-
-.order-3 {
-  -ms-flex-order: 3;
-  order: 3;
-}
-
-.order-4 {
-  -ms-flex-order: 4;
-  order: 4;
-}
-
-.order-5 {
-  -ms-flex-order: 5;
-  order: 5;
-}
-
-.order-6 {
-  -ms-flex-order: 6;
-  order: 6;
-}
-
-.order-7 {
-  -ms-flex-order: 7;
-  order: 7;
-}
-
-.order-8 {
-  -ms-flex-order: 8;
-  order: 8;
-}
-
-.order-9 {
-  -ms-flex-order: 9;
-  order: 9;
-}
-
-.order-10 {
-  -ms-flex-order: 10;
-  order: 10;
-}
-
-.order-11 {
-  -ms-flex-order: 11;
-  order: 11;
-}
-
-.order-12 {
-  -ms-flex-order: 12;
-  order: 12;
-}
-
-.offset-1 {
-  margin-left: 8.333333%;
-}
-
-.offset-2 {
-  margin-left: 16.666667%;
-}
-
-.offset-3 {
-  margin-left: 25%;
-}
-
-.offset-4 {
-  margin-left: 33.333333%;
-}
-
-.offset-5 {
-  margin-left: 41.666667%;
-}
-
-.offset-6 {
-  margin-left: 50%;
-}
-
-.offset-7 {
-  margin-left: 58.333333%;
-}
-
-.offset-8 {
-  margin-left: 66.666667%;
-}
-
-.offset-9 {
-  margin-left: 75%;
-}
-
-.offset-10 {
-  margin-left: 83.333333%;
-}
-
-.offset-11 {
-  margin-left: 91.666667%;
-}
-
-@media (min-width: 576px) {
-  .col-sm {
-    -ms-flex-preferred-size: 0;
-    flex-basis: 0;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    max-width: 100%;
-  }
-  .row-cols-sm-1 > * {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .row-cols-sm-2 > * {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .row-cols-sm-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .row-cols-sm-4 > * {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .row-cols-sm-5 > * {
-    -ms-flex: 0 0 20%;
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-  .row-cols-sm-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-sm-auto {
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
-    width: auto;
-    max-width: 100%;
-  }
-  .col-sm-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
-  }
-  .col-sm-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-sm-3 {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .col-sm-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .col-sm-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
-  }
-  .col-sm-6 {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .col-sm-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
-  }
-  .col-sm-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
-  }
-  .col-sm-9 {
-    -ms-flex: 0 0 75%;
-    flex: 0 0 75%;
-    max-width: 75%;
-  }
-  .col-sm-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
-  }
-  .col-sm-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
-  }
-  .col-sm-12 {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .order-sm-first {
-    -ms-flex-order: -1;
-    order: -1;
-  }
-  .order-sm-last {
-    -ms-flex-order: 13;
-    order: 13;
-  }
-  .order-sm-0 {
-    -ms-flex-order: 0;
-    order: 0;
-  }
-  .order-sm-1 {
-    -ms-flex-order: 1;
-    order: 1;
-  }
-  .order-sm-2 {
-    -ms-flex-order: 2;
-    order: 2;
-  }
-  .order-sm-3 {
-    -ms-flex-order: 3;
-    order: 3;
-  }
-  .order-sm-4 {
-    -ms-flex-order: 4;
-    order: 4;
-  }
-  .order-sm-5 {
-    -ms-flex-order: 5;
-    order: 5;
-  }
-  .order-sm-6 {
-    -ms-flex-order: 6;
-    order: 6;
-  }
-  .order-sm-7 {
-    -ms-flex-order: 7;
-    order: 7;
-  }
-  .order-sm-8 {
-    -ms-flex-order: 8;
-    order: 8;
-  }
-  .order-sm-9 {
-    -ms-flex-order: 9;
-    order: 9;
-  }
-  .order-sm-10 {
-    -ms-flex-order: 10;
-    order: 10;
-  }
-  .order-sm-11 {
-    -ms-flex-order: 11;
-    order: 11;
-  }
-  .order-sm-12 {
-    -ms-flex-order: 12;
-    order: 12;
-  }
-  .offset-sm-0 {
-    margin-left: 0;
-  }
-  .offset-sm-1 {
-    margin-left: 8.333333%;
-  }
-  .offset-sm-2 {
-    margin-left: 16.666667%;
-  }
-  .offset-sm-3 {
-    margin-left: 25%;
-  }
-  .offset-sm-4 {
-    margin-left: 33.333333%;
-  }
-  .offset-sm-5 {
-    margin-left: 41.666667%;
-  }
-  .offset-sm-6 {
-    margin-left: 50%;
-  }
-  .offset-sm-7 {
-    margin-left: 58.333333%;
-  }
-  .offset-sm-8 {
-    margin-left: 66.666667%;
-  }
-  .offset-sm-9 {
-    margin-left: 75%;
-  }
-  .offset-sm-10 {
-    margin-left: 83.333333%;
-  }
-  .offset-sm-11 {
-    margin-left: 91.666667%;
-  }
-}
-
-@media (min-width: 768px) {
-  .col-md {
-    -ms-flex-preferred-size: 0;
-    flex-basis: 0;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    max-width: 100%;
-  }
-  .row-cols-md-1 > * {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .row-cols-md-2 > * {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .row-cols-md-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .row-cols-md-4 > * {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .row-cols-md-5 > * {
-    -ms-flex: 0 0 20%;
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-  .row-cols-md-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-md-auto {
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
-    width: auto;
-    max-width: 100%;
-  }
-  .col-md-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
-  }
-  .col-md-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-md-3 {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .col-md-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .col-md-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
-  }
-  .col-md-6 {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .col-md-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
-  }
-  .col-md-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
-  }
-  .col-md-9 {
-    -ms-flex: 0 0 75%;
-    flex: 0 0 75%;
-    max-width: 75%;
-  }
-  .col-md-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
-  }
-  .col-md-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
-  }
-  .col-md-12 {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .order-md-first {
-    -ms-flex-order: -1;
-    order: -1;
-  }
-  .order-md-last {
-    -ms-flex-order: 13;
-    order: 13;
-  }
-  .order-md-0 {
-    -ms-flex-order: 0;
-    order: 0;
-  }
-  .order-md-1 {
-    -ms-flex-order: 1;
-    order: 1;
-  }
-  .order-md-2 {
-    -ms-flex-order: 2;
-    order: 2;
-  }
-  .order-md-3 {
-    -ms-flex-order: 3;
-    order: 3;
-  }
-  .order-md-4 {
-    -ms-flex-order: 4;
-    order: 4;
-  }
-  .order-md-5 {
-    -ms-flex-order: 5;
-    order: 5;
-  }
-  .order-md-6 {
-    -ms-flex-order: 6;
-    order: 6;
-  }
-  .order-md-7 {
-    -ms-flex-order: 7;
-    order: 7;
-  }
-  .order-md-8 {
-    -ms-flex-order: 8;
-    order: 8;
-  }
-  .order-md-9 {
-    -ms-flex-order: 9;
-    order: 9;
-  }
-  .order-md-10 {
-    -ms-flex-order: 10;
-    order: 10;
-  }
-  .order-md-11 {
-    -ms-flex-order: 11;
-    order: 11;
-  }
-  .order-md-12 {
-    -ms-flex-order: 12;
-    order: 12;
-  }
-  .offset-md-0 {
-    margin-left: 0;
-  }
-  .offset-md-1 {
-    margin-left: 8.333333%;
-  }
-  .offset-md-2 {
-    margin-left: 16.666667%;
-  }
-  .offset-md-3 {
-    margin-left: 25%;
-  }
-  .offset-md-4 {
-    margin-left: 33.333333%;
-  }
-  .offset-md-5 {
-    margin-left: 41.666667%;
-  }
-  .offset-md-6 {
-    margin-left: 50%;
-  }
-  .offset-md-7 {
-    margin-left: 58.333333%;
-  }
-  .offset-md-8 {
-    margin-left: 66.666667%;
-  }
-  .offset-md-9 {
-    margin-left: 75%;
-  }
-  .offset-md-10 {
-    margin-left: 83.333333%;
-  }
-  .offset-md-11 {
-    margin-left: 91.666667%;
-  }
-}
-
-@media (min-width: 992px) {
-  .col-lg {
-    -ms-flex-preferred-size: 0;
-    flex-basis: 0;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    max-width: 100%;
-  }
-  .row-cols-lg-1 > * {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .row-cols-lg-2 > * {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .row-cols-lg-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .row-cols-lg-4 > * {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .row-cols-lg-5 > * {
-    -ms-flex: 0 0 20%;
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-  .row-cols-lg-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-lg-auto {
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
-    width: auto;
-    max-width: 100%;
-  }
-  .col-lg-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
-  }
-  .col-lg-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-lg-3 {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .col-lg-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .col-lg-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
-  }
-  .col-lg-6 {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .col-lg-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
-  }
-  .col-lg-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
-  }
-  .col-lg-9 {
-    -ms-flex: 0 0 75%;
-    flex: 0 0 75%;
-    max-width: 75%;
-  }
-  .col-lg-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
-  }
-  .col-lg-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
-  }
-  .col-lg-12 {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .order-lg-first {
-    -ms-flex-order: -1;
-    order: -1;
-  }
-  .order-lg-last {
-    -ms-flex-order: 13;
-    order: 13;
-  }
-  .order-lg-0 {
-    -ms-flex-order: 0;
-    order: 0;
-  }
-  .order-lg-1 {
-    -ms-flex-order: 1;
-    order: 1;
-  }
-  .order-lg-2 {
-    -ms-flex-order: 2;
-    order: 2;
-  }
-  .order-lg-3 {
-    -ms-flex-order: 3;
-    order: 3;
-  }
-  .order-lg-4 {
-    -ms-flex-order: 4;
-    order: 4;
-  }
-  .order-lg-5 {
-    -ms-flex-order: 5;
-    order: 5;
-  }
-  .order-lg-6 {
-    -ms-flex-order: 6;
-    order: 6;
-  }
-  .order-lg-7 {
-    -ms-flex-order: 7;
-    order: 7;
-  }
-  .order-lg-8 {
-    -ms-flex-order: 8;
-    order: 8;
-  }
-  .order-lg-9 {
-    -ms-flex-order: 9;
-    order: 9;
-  }
-  .order-lg-10 {
-    -ms-flex-order: 10;
-    order: 10;
-  }
-  .order-lg-11 {
-    -ms-flex-order: 11;
-    order: 11;
-  }
-  .order-lg-12 {
-    -ms-flex-order: 12;
-    order: 12;
-  }
-  .offset-lg-0 {
-    margin-left: 0;
-  }
-  .offset-lg-1 {
-    margin-left: 8.333333%;
-  }
-  .offset-lg-2 {
-    margin-left: 16.666667%;
-  }
-  .offset-lg-3 {
-    margin-left: 25%;
-  }
-  .offset-lg-4 {
-    margin-left: 33.333333%;
-  }
-  .offset-lg-5 {
-    margin-left: 41.666667%;
-  }
-  .offset-lg-6 {
-    margin-left: 50%;
-  }
-  .offset-lg-7 {
-    margin-left: 58.333333%;
-  }
-  .offset-lg-8 {
-    margin-left: 66.666667%;
-  }
-  .offset-lg-9 {
-    margin-left: 75%;
-  }
-  .offset-lg-10 {
-    margin-left: 83.333333%;
-  }
-  .offset-lg-11 {
-    margin-left: 91.666667%;
-  }
-}
-
-@media (min-width: 1200px) {
-  .col-xl {
-    -ms-flex-preferred-size: 0;
-    flex-basis: 0;
-    -ms-flex-positive: 1;
-    flex-grow: 1;
-    max-width: 100%;
-  }
-  .row-cols-xl-1 > * {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .row-cols-xl-2 > * {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .row-cols-xl-3 > * {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .row-cols-xl-4 > * {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .row-cols-xl-5 > * {
-    -ms-flex: 0 0 20%;
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-  .row-cols-xl-6 > * {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-xl-auto {
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
-    width: auto;
-    max-width: 100%;
-  }
-  .col-xl-1 {
-    -ms-flex: 0 0 8.333333%;
-    flex: 0 0 8.333333%;
-    max-width: 8.333333%;
-  }
-  .col-xl-2 {
-    -ms-flex: 0 0 16.666667%;
-    flex: 0 0 16.666667%;
-    max-width: 16.666667%;
-  }
-  .col-xl-3 {
-    -ms-flex: 0 0 25%;
-    flex: 0 0 25%;
-    max-width: 25%;
-  }
-  .col-xl-4 {
-    -ms-flex: 0 0 33.333333%;
-    flex: 0 0 33.333333%;
-    max-width: 33.333333%;
-  }
-  .col-xl-5 {
-    -ms-flex: 0 0 41.666667%;
-    flex: 0 0 41.666667%;
-    max-width: 41.666667%;
-  }
-  .col-xl-6 {
-    -ms-flex: 0 0 50%;
-    flex: 0 0 50%;
-    max-width: 50%;
-  }
-  .col-xl-7 {
-    -ms-flex: 0 0 58.333333%;
-    flex: 0 0 58.333333%;
-    max-width: 58.333333%;
-  }
-  .col-xl-8 {
-    -ms-flex: 0 0 66.666667%;
-    flex: 0 0 66.666667%;
-    max-width: 66.666667%;
-  }
-  .col-xl-9 {
-    -ms-flex: 0 0 75%;
-    flex: 0 0 75%;
-    max-width: 75%;
-  }
-  .col-xl-10 {
-    -ms-flex: 0 0 83.333333%;
-    flex: 0 0 83.333333%;
-    max-width: 83.333333%;
-  }
-  .col-xl-11 {
-    -ms-flex: 0 0 91.666667%;
-    flex: 0 0 91.666667%;
-    max-width: 91.666667%;
-  }
-  .col-xl-12 {
-    -ms-flex: 0 0 100%;
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
-  .order-xl-first {
-    -ms-flex-order: -1;
-    order: -1;
-  }
-  .order-xl-last {
-    -ms-flex-order: 13;
-    order: 13;
-  }
-  .order-xl-0 {
-    -ms-flex-order: 0;
-    order: 0;
-  }
-  .order-xl-1 {
-    -ms-flex-order: 1;
-    order: 1;
-  }
-  .order-xl-2 {
-    -ms-flex-order: 2;
-    order: 2;
-  }
-  .order-xl-3 {
-    -ms-flex-order: 3;
-    order: 3;
-  }
-  .order-xl-4 {
-    -ms-flex-order: 4;
-    order: 4;
-  }
-  .order-xl-5 {
-    -ms-flex-order: 5;
-    order: 5;
-  }
-  .order-xl-6 {
-    -ms-flex-order: 6;
-    order: 6;
-  }
-  .order-xl-7 {
-    -ms-flex-order: 7;
-    order: 7;
-  }
-  .order-xl-8 {
-    -ms-flex-order: 8;
-    order: 8;
-  }
-  .order-xl-9 {
-    -ms-flex-order: 9;
-    order: 9;
-  }
-  .order-xl-10 {
-    -ms-flex-order: 10;
-    order: 10;
-  }
-  .order-xl-11 {
-    -ms-flex-order: 11;
-    order: 11;
-  }
-  .order-xl-12 {
-    -ms-flex-order: 12;
-    order: 12;
-  }
-  .offset-xl-0 {
-    margin-left: 0;
-  }
-  .offset-xl-1 {
-    margin-left: 8.333333%;
-  }
-  .offset-xl-2 {
-    margin-left: 16.666667%;
-  }
-  .offset-xl-3 {
-    margin-left: 25%;
-  }
-  .offset-xl-4 {
-    margin-left: 33.333333%;
-  }
-  .offset-xl-5 {
-    margin-left: 41.666667%;
-  }
-  .offset-xl-6 {
-    margin-left: 50%;
-  }
-  .offset-xl-7 {
-    margin-left: 58.333333%;
-  }
-  .offset-xl-8 {
-    margin-left: 66.666667%;
-  }
-  .offset-xl-9 {
-    margin-left: 75%;
-  }
-  .offset-xl-10 {
-    margin-left: 83.333333%;
-  }
-  .offset-xl-11 {
-    margin-left: 91.666667%;
-  }
-}
-
-.table {
-  width: 100%;
-  margin-bottom: 1rem;
-  color: #212529;
-}
-
-.table th,
-.table td {
-  padding: 0.75rem;
-  vertical-align: top;
-  border-top: 1px solid #dee2e6;
-}
-
-.table thead th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #dee2e6;
-}
-
-.table tbody + tbody {
-  border-top: 2px solid #dee2e6;
-}
-
-.table-sm th,
-.table-sm td {
-  padding: 0.3rem;
-}
-
-.table-bordered {
-  border: 1px solid #dee2e6;
-}
-
-.table-bordered th,
-.table-bordered td {
-  border: 1px solid #dee2e6;
-}
-
-.table-bordered thead th,
-.table-bordered thead td {
-  border-bottom-width: 2px;
-}
-
-.table-borderless th,
-.table-borderless td,
-.table-borderless thead th,
-.table-borderless tbody + tbody {
-  border: 0;
-}
-
-.table-striped tbody tr:nth-of-type(odd) {
-  background-color: rgba(0, 0, 0, 0.05);
-}
-
-.table-hover tbody tr:hover {
-  color: #212529;
-  background-color: rgba(0, 0, 0, 0.075);
-}
-
-.table-primary,
-.table-primary > th,
-.table-primary > td {
-  background-color: #b8daff;
-}
-
-.table-primary th,
-.table-primary td,
-.table-primary thead th,
-.table-primary tbody + tbody {
-  border-color: #7abaff;
-}
-
-.table-hover .table-primary:hover {
-  background-color: #9fcdff;
-}
-
-.table-hover .table-primary:hover > td,
-.table-hover .table-primary:hover > th {
-  background-color: #9fcdff;
-}
-
-.table-secondary,
-.table-secondary > th,
-.table-secondary > td {
-  background-color: #d6d8db;
-}
-
-.table-secondary th,
-.table-secondary td,
-.table-secondary thead th,
-.table-secondary tbody + tbody {
-  border-color: #b3b7bb;
-}
-
-.table-hover .table-secondary:hover {
-  background-color: #c8cbcf;
-}
-
-.table-hover .table-secondary:hover > td,
-.table-hover .table-secondary:hover > th {
-  background-color: #c8cbcf;
-}
-
-.table-success,
-.table-success > th,
-.table-success > td {
-  background-color: #c3e6cb;
-}
-
-.table-success th,
-.table-success td,
-.table-success thead th,
-.table-success tbody + tbody {
-  border-color: #8fd19e;
-}
-
-.table-hover .table-success:hover {
-  background-color: #b1dfbb;
-}
-
-.table-hover .table-success:hover > td,
-.table-hover .table-success:hover > th {
-  background-color: #b1dfbb;
-}
-
-.table-info,
-.table-info > th,
-.table-info > td {
-  background-color: #bee5eb;
-}
-
-.table-info th,
-.table-info td,
-.table-info thead th,
-.table-info tbody + tbody {
-  border-color: #86cfda;
-}
-
-.table-hover .table-info:hover {
-  background-color: #abdde5;
-}
-
-.table-hover .table-info:hover > td,
-.table-hover .table-info:hover > th {
-  background-color: #abdde5;
-}
-
-.table-warning,
-.table-warning > th,
-.table-warning > td {
-  background-color: #ffeeba;
-}
-
-.table-warning th,
-.table-warning td,
-.table-warning thead th,
-.table-warning tbody + tbody {
-  border-color: #ffdf7e;
-}
-
-.table-hover .table-warning:hover {
-  background-color: #ffe8a1;
-}
-
-.table-hover .table-warning:hover > td,
-.table-hover .table-warning:hover > th {
-  background-color: #ffe8a1;
-}
-
-.table-danger,
-.table-danger > th,
-.table-danger > td {
-  background-color: #f5c6cb;
-}
-
-.table-danger th,
-.table-danger td,
-.table-danger thead th,
-.table-danger tbody + tbody {
-  border-color: #ed969e;
-}
-
-.table-hover .table-danger:hover {
-  background-color: #f1b0b7;
-}
-
-.table-hover .table-danger:hover > td,
-.table-hover .table-danger:hover > th {
-  background-color: #f1b0b7;
-}
-
-.table-light,
-.table-light > th,
-.table-light > td {
-  background-color: #fdfdfe;
-}
-
-.table-light th,
-.table-light td,
-.table-light thead th,
-.table-light tbody + tbody {
-  border-color: #fbfcfc;
-}
-
-.table-hover .table-light:hover {
-  background-color: #ececf6;
-}
-
-.table-hover .table-light:hover > td,
-.table-hover .table-light:hover > th {
-  background-color: #ececf6;
-}
-
-.table-dark,
-.table-dark > th,
-.table-dark > td {
-  background-color: #c6c8ca;
-}
-
-.table-dark th,
-.table-dark td,
-.table-dark thead th,
-.table-dark tbody + tbody {
-  border-color: #95999c;
-}
-
-.table-hover .table-dark:hover {
-  background-color: #b9bbbe;
-}
-
-.table-hover .table-dark:hover > td,
-.table-hover .table-dark:hover > th {
-  background-color: #b9bbbe;
-}
-
-.table-active,
-.table-active > th,
-.table-active > td {
-  background-color: rgba(0, 0, 0, 0.075);
-}
-
-.table-hover .table-active:hover {
-  background-color: rgba(0, 0, 0, 0.075);
-}
-
-.table-hover .table-active:hover > td,
-.table-hover .table-active:hover > th {
-  background-color: rgba(0, 0, 0, 0.075);
-}
-
-.table .thead-dark th {
-  color: #fff;
-  background-color: #343a40;
-  border-color: #454d55;
-}
-
-.table .thead-light th {
-  color: #495057;
-  background-color: #e9ecef;
-  border-color: #dee2e6;
-}
-
-.table-dark {
-  color: #fff;
-  background-color: #343a40;
-}
-
-.table-dark th,
-.table-dark td,
-.table-dark thead th {
-  border-color: #454d55;
-}
-
-.table-dark.table-bordered {
-  border: 0;
-}
-
-.table-dark.table-striped tbody tr:nth-of-type(odd) {
-  background-color: rgba(255, 255, 255, 0.05);
-}
-
-.table-dark.table-hover tbody tr:hover {
-  color: #fff;
-  background-color: rgba(255, 255, 255, 0.075);
-}
-
-@media (max-width: 575.98px) {
-  .table-responsive-sm {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch;
-  }
-  .table-responsive-sm > .table-bordered {
-    border: 0;
-  }
-}
-
-@media (max-width: 767.98px) {
-  .table-responsive-md {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch;
-  }
-  .table-responsive-md > .table-bordered {
-    border: 0;
-  }
-}
-
-@media (max-width: 991.98px) {
-  .table-responsive-lg {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch;
-  }
-  .table-responsive-lg > .table-bordered {
-    border: 0;
-  }
-}
-
-@media (max-width: 1199.98px) {
-  .table-responsive-xl {
-    display: block;
-    width: 100%;
-    overflow-x: auto;
-    -webkit-overflow-scrolling: touch;
-  }
-  .table-responsive-xl > .table-bordered {
-    border: 0;
-  }
-}
-
-.table-responsive {
-  display: block;
-  width: 100%;
-  overflow-x: auto;
-  -webkit-overflow-scrolling: touch;
-}
-
-.table-responsive > .table-bordered {
-  border: 0;
-}
-
-.form-control {
-  display: block;
-  width: 100%;
-  height: calc(1.5em + 0.75rem + 2px);
-  padding: 0.375rem 0.75rem;
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #495057;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid #ced4da;
-  border-radius: 0.25rem;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .form-control {
-    transition: none;
-  }
-}
-
-.form-control::-ms-expand {
-  background-color: transparent;
-  border: 0;
-}
-
-.form-control:-moz-focusring {
-  color: transparent;
-  text-shadow: 0 0 0 #495057;
-}
-
-.form-control:focus {
-  color: #495057;
-  background-color: #fff;
-  border-color: #80bdff;
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.form-control::-webkit-input-placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
-
-.form-control::-moz-placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
-
-.form-control:-ms-input-placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
-
-.form-control::-ms-input-placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
-
-.form-control::placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
-
-.form-control:disabled, .form-control[readonly] {
-  background-color: #e9ecef;
-  opacity: 1;
-}
-
-select.form-control:focus::-ms-value {
-  color: #495057;
-  background-color: #fff;
-}
-
-.form-control-file,
-.form-control-range {
-  display: block;
-  width: 100%;
-}
-
-.col-form-label {
-  padding-top: calc(0.375rem + 1px);
-  padding-bottom: calc(0.375rem + 1px);
-  margin-bottom: 0;
-  font-size: inherit;
-  line-height: 1.5;
-}
-
-.col-form-label-lg {
-  padding-top: calc(0.5rem + 1px);
-  padding-bottom: calc(0.5rem + 1px);
-  font-size: 1.25rem;
-  line-height: 1.5;
-}
-
-.col-form-label-sm {
-  padding-top: calc(0.25rem + 1px);
-  padding-bottom: calc(0.25rem + 1px);
-  font-size: 0.875rem;
-  line-height: 1.5;
-}
-
-.form-control-plaintext {
-  display: block;
-  width: 100%;
-  padding: 0.375rem 0;
-  margin-bottom: 0;
-  font-size: 1rem;
-  line-height: 1.5;
-  color: #212529;
-  background-color: transparent;
-  border: solid transparent;
-  border-width: 1px 0;
-}
-
-.form-control-plaintext.form-control-sm, .form-control-plaintext.form-control-lg {
-  padding-right: 0;
-  padding-left: 0;
-}
-
-.form-control-sm {
-  height: calc(1.5em + 0.5rem + 2px);
-  padding: 0.25rem 0.5rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-  border-radius: 0.2rem;
-}
-
-.form-control-lg {
-  height: calc(1.5em + 1rem + 2px);
-  padding: 0.5rem 1rem;
-  font-size: 1.25rem;
-  line-height: 1.5;
-  border-radius: 0.3rem;
-}
-
-select.form-control[size], select.form-control[multiple] {
-  height: auto;
-}
-
-textarea.form-control {
-  height: auto;
-}
-
-.form-group {
-  margin-bottom: 1rem;
-}
-
-.form-text {
-  display: block;
-  margin-top: 0.25rem;
-}
-
-.form-row {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  margin-right: -5px;
-  margin-left: -5px;
-}
-
-.form-row > .col,
-.form-row > [class*="col-"] {
-  padding-right: 5px;
-  padding-left: 5px;
-}
-
-.form-check {
-  position: relative;
-  display: block;
-  padding-left: 1.25rem;
-}
-
-.form-check-input {
-  position: absolute;
-  margin-top: 0.3rem;
-  margin-left: -1.25rem;
-}
-
-.form-check-input[disabled] ~ .form-check-label,
-.form-check-input:disabled ~ .form-check-label {
-  color: #6c757d;
-}
-
-.form-check-label {
-  margin-bottom: 0;
-}
-
-.form-check-inline {
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -ms-flex-align: center;
-  align-items: center;
-  padding-left: 0;
-  margin-right: 0.75rem;
-}
-
-.form-check-inline .form-check-input {
-  position: static;
-  margin-top: 0;
-  margin-right: 0.3125rem;
-  margin-left: 0;
-}
-
-.valid-feedback {
-  display: none;
-  width: 100%;
-  margin-top: 0.25rem;
-  font-size: 80%;
-  color: #28a745;
-}
-
-.valid-tooltip {
-  position: absolute;
-  top: 100%;
-  z-index: 5;
-  display: none;
-  max-width: 100%;
-  padding: 0.25rem 0.5rem;
-  margin-top: .1rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-  color: #fff;
-  background-color: rgba(40, 167, 69, 0.9);
-  border-radius: 0.25rem;
-}
-
-.was-validated :valid ~ .valid-feedback,
-.was-validated :valid ~ .valid-tooltip,
-.is-valid ~ .valid-feedback,
-.is-valid ~ .valid-tooltip {
-  display: block;
-}
-
-.was-validated .form-control:valid, .form-control.is-valid {
-  border-color: #28a745;
-  padding-right: calc(1.5em + 0.75rem);
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");
-  background-repeat: no-repeat;
-  background-position: right calc(0.375em + 0.1875rem) center;
-  background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
-}
-
-.was-validated .form-control:valid:focus, .form-control.is-valid:focus {
-  border-color: #28a745;
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
-}
-
-.was-validated textarea.form-control:valid, textarea.form-control.is-valid {
-  padding-right: calc(1.5em + 0.75rem);
-  background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);
-}
-
-.was-validated .custom-select:valid, .custom-select.is-valid {
-  border-color: #28a745;
-  padding-right: calc(0.75em + 2.3125rem);
-  background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
-}
-
-.was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
-  border-color: #28a745;
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
-}
-
-.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
-  color: #28a745;
-}
-
-.was-validated .form-check-input:valid ~ .valid-feedback,
-.was-validated .form-check-input:valid ~ .valid-tooltip, .form-check-input.is-valid ~ .valid-feedback,
-.form-check-input.is-valid ~ .valid-tooltip {
-  display: block;
-}
-
-.was-validated .custom-control-input:valid ~ .custom-control-label, .custom-control-input.is-valid ~ .custom-control-label {
-  color: #28a745;
-}
-
-.was-validated .custom-control-input:valid ~ .custom-control-label::before, .custom-control-input.is-valid ~ .custom-control-label::before {
-  border-color: #28a745;
-}
-
-.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before, .custom-control-input.is-valid:checked ~ .custom-control-label::before {
-  border-color: #34ce57;
-  background-color: #34ce57;
-}
-
-.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before, .custom-control-input.is-valid:focus ~ .custom-control-label::before {
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
-}
-
-.was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before {
-  border-color: #28a745;
-}
-
-.was-validated .custom-file-input:valid ~ .custom-file-label, .custom-file-input.is-valid ~ .custom-file-label {
-  border-color: #28a745;
-}
-
-.was-validated .custom-file-input:valid:focus ~ .custom-file-label, .custom-file-input.is-valid:focus ~ .custom-file-label {
-  border-color: #28a745;
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);
-}
-
-.invalid-feedback {
-  display: none;
-  width: 100%;
-  margin-top: 0.25rem;
-  font-size: 80%;
-  color: #dc3545;
-}
-
-.invalid-tooltip {
-  position: absolute;
-  top: 100%;
-  z-index: 5;
-  display: none;
-  max-width: 100%;
-  padding: 0.25rem 0.5rem;
-  margin-top: .1rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-  color: #fff;
-  background-color: rgba(220, 53, 69, 0.9);
-  border-radius: 0.25rem;
-}
-
-.was-validated :invalid ~ .invalid-feedback,
-.was-validated :invalid ~ .invalid-tooltip,
-.is-invalid ~ .invalid-feedback,
-.is-invalid ~ .invalid-tooltip {
-  display: block;
-}
-
-.was-validated .form-control:invalid, .form-control.is-invalid {
-  border-color: #dc3545;
-  padding-right: calc(1.5em + 0.75rem);
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");
-  background-repeat: no-repeat;
-  background-position: right calc(0.375em + 0.1875rem) center;
-  background-size: calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
-}
-
-.was-validated .form-control:invalid:focus, .form-control.is-invalid:focus {
-  border-color: #dc3545;
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
-}
-
-.was-validated textarea.form-control:invalid, textarea.form-control.is-invalid {
-  padding-right: calc(1.5em + 0.75rem);
-  background-position: top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem);
-}
-
-.was-validated .custom-select:invalid, .custom-select.is-invalid {
-  border-color: #dc3545;
-  padding-right: calc(0.75em + 2.3125rem);
-  background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
-}
-
-.was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {
-  border-color: #dc3545;
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
-}
-
-.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {
-  color: #dc3545;
-}
-
-.was-validated .form-check-input:invalid ~ .invalid-feedback,
-.was-validated .form-check-input:invalid ~ .invalid-tooltip, .form-check-input.is-invalid ~ .invalid-feedback,
-.form-check-input.is-invalid ~ .invalid-tooltip {
-  display: block;
-}
-
-.was-validated .custom-control-input:invalid ~ .custom-control-label, .custom-control-input.is-invalid ~ .custom-control-label {
-  color: #dc3545;
-}
-
-.was-validated .custom-control-input:invalid ~ .custom-control-label::before, .custom-control-input.is-invalid ~ .custom-control-label::before {
-  border-color: #dc3545;
-}
-
-.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before, .custom-control-input.is-invalid:checked ~ .custom-control-label::before {
-  border-color: #e4606d;
-  background-color: #e4606d;
-}
-
-.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before, .custom-control-input.is-invalid:focus ~ .custom-control-label::before {
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
-}
-
-.was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before, .custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before {
-  border-color: #dc3545;
-}
-
-.was-validated .custom-file-input:invalid ~ .custom-file-label, .custom-file-input.is-invalid ~ .custom-file-label {
-  border-color: #dc3545;
-}
-
-.was-validated .custom-file-input:invalid:focus ~ .custom-file-label, .custom-file-input.is-invalid:focus ~ .custom-file-label {
-  border-color: #dc3545;
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
-}
-
-.form-inline {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-flow: row wrap;
-  flex-flow: row wrap;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.form-inline .form-check {
-  width: 100%;
-}
-
-@media (min-width: 576px) {
-  .form-inline label {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    margin-bottom: 0;
-  }
-  .form-inline .form-group {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
-    -ms-flex-flow: row wrap;
-    flex-flow: row wrap;
-    -ms-flex-align: center;
-    align-items: center;
-    margin-bottom: 0;
-  }
-  .form-inline .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .form-inline .form-control-plaintext {
-    display: inline-block;
-  }
-  .form-inline .input-group,
-  .form-inline .custom-select {
-    width: auto;
-  }
-  .form-inline .form-check {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-    width: auto;
-    padding-left: 0;
-  }
-  .form-inline .form-check-input {
-    position: relative;
-    -ms-flex-negative: 0;
-    flex-shrink: 0;
-    margin-top: 0;
-    margin-right: 0.25rem;
-    margin-left: 0;
-  }
-  .form-inline .custom-control {
-    -ms-flex-align: center;
-    align-items: center;
-    -ms-flex-pack: center;
-    justify-content: center;
-  }
-  .form-inline .custom-control-label {
-    margin-bottom: 0;
-  }
-}
-
-.btn {
-  display: inline-block;
-  font-weight: 400;
-  color: #212529;
-  text-align: center;
-  vertical-align: middle;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  background-color: transparent;
-  border: 1px solid transparent;
-  padding: 0.375rem 0.75rem;
-  font-size: 1rem;
-  line-height: 1.5;
-  border-radius: 0.25rem;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .btn {
-    transition: none;
-  }
-}
-
-.btn:hover {
-  color: #212529;
-  text-decoration: none;
-}
-
-.btn:focus, .btn.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.btn.disabled, .btn:disabled {
-  opacity: 0.65;
-}
-
-a.btn.disabled,
-fieldset:disabled a.btn {
-  pointer-events: none;
-}
-
-.btn-primary {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
-}
-
-.btn-primary:hover {
-  color: #fff;
-  background-color: #0069d9;
-  border-color: #0062cc;
-}
-
-.btn-primary:focus, .btn-primary.focus {
-  color: #fff;
-  background-color: #0069d9;
-  border-color: #0062cc;
-  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
-}
-
-.btn-primary.disabled, .btn-primary:disabled {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
-}
-
-.btn-primary:not(:disabled):not(.disabled):active, .btn-primary:not(:disabled):not(.disabled).active,
-.show > .btn-primary.dropdown-toggle {
-  color: #fff;
-  background-color: #0062cc;
-  border-color: #005cbf;
-}
-
-.btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-primary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(38, 143, 255, 0.5);
-}
-
-.btn-secondary {
-  color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
-}
-
-.btn-secondary:hover {
-  color: #fff;
-  background-color: #5a6268;
-  border-color: #545b62;
-}
-
-.btn-secondary:focus, .btn-secondary.focus {
-  color: #fff;
-  background-color: #5a6268;
-  border-color: #545b62;
-  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
-}
-
-.btn-secondary.disabled, .btn-secondary:disabled {
-  color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
-}
-
-.btn-secondary:not(:disabled):not(.disabled):active, .btn-secondary:not(:disabled):not(.disabled).active,
-.show > .btn-secondary.dropdown-toggle {
-  color: #fff;
-  background-color: #545b62;
-  border-color: #4e555b;
-}
-
-.btn-secondary:not(:disabled):not(.disabled):active:focus, .btn-secondary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-secondary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(130, 138, 145, 0.5);
-}
-
-.btn-success {
-  color: #fff;
-  background-color: #28a745;
-  border-color: #28a745;
-}
-
-.btn-success:hover {
-  color: #fff;
-  background-color: #218838;
-  border-color: #1e7e34;
-}
-
-.btn-success:focus, .btn-success.focus {
-  color: #fff;
-  background-color: #218838;
-  border-color: #1e7e34;
-  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
-}
-
-.btn-success.disabled, .btn-success:disabled {
-  color: #fff;
-  background-color: #28a745;
-  border-color: #28a745;
-}
-
-.btn-success:not(:disabled):not(.disabled):active, .btn-success:not(:disabled):not(.disabled).active,
-.show > .btn-success.dropdown-toggle {
-  color: #fff;
-  background-color: #1e7e34;
-  border-color: #1c7430;
-}
-
-.btn-success:not(:disabled):not(.disabled):active:focus, .btn-success:not(:disabled):not(.disabled).active:focus,
-.show > .btn-success.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(72, 180, 97, 0.5);
-}
-
-.btn-info {
-  color: #fff;
-  background-color: #17a2b8;
-  border-color: #17a2b8;
-}
-
-.btn-info:hover {
-  color: #fff;
-  background-color: #138496;
-  border-color: #117a8b;
-}
-
-.btn-info:focus, .btn-info.focus {
-  color: #fff;
-  background-color: #138496;
-  border-color: #117a8b;
-  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
-}
-
-.btn-info.disabled, .btn-info:disabled {
-  color: #fff;
-  background-color: #17a2b8;
-  border-color: #17a2b8;
-}
-
-.btn-info:not(:disabled):not(.disabled):active, .btn-info:not(:disabled):not(.disabled).active,
-.show > .btn-info.dropdown-toggle {
-  color: #fff;
-  background-color: #117a8b;
-  border-color: #10707f;
-}
-
-.btn-info:not(:disabled):not(.disabled):active:focus, .btn-info:not(:disabled):not(.disabled).active:focus,
-.show > .btn-info.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(58, 176, 195, 0.5);
-}
-
-.btn-warning {
-  color: #212529;
-  background-color: #ffc107;
-  border-color: #ffc107;
-}
-
-.btn-warning:hover {
-  color: #212529;
-  background-color: #e0a800;
-  border-color: #d39e00;
-}
-
-.btn-warning:focus, .btn-warning.focus {
-  color: #212529;
-  background-color: #e0a800;
-  border-color: #d39e00;
-  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
-}
-
-.btn-warning.disabled, .btn-warning:disabled {
-  color: #212529;
-  background-color: #ffc107;
-  border-color: #ffc107;
-}
-
-.btn-warning:not(:disabled):not(.disabled):active, .btn-warning:not(:disabled):not(.disabled).active,
-.show > .btn-warning.dropdown-toggle {
-  color: #212529;
-  background-color: #d39e00;
-  border-color: #c69500;
-}
-
-.btn-warning:not(:disabled):not(.disabled):active:focus, .btn-warning:not(:disabled):not(.disabled).active:focus,
-.show > .btn-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(222, 170, 12, 0.5);
-}
-
-.btn-danger {
-  color: #fff;
-  background-color: #dc3545;
-  border-color: #dc3545;
-}
-
-.btn-danger:hover {
-  color: #fff;
-  background-color: #c82333;
-  border-color: #bd2130;
-}
-
-.btn-danger:focus, .btn-danger.focus {
-  color: #fff;
-  background-color: #c82333;
-  border-color: #bd2130;
-  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
-}
-
-.btn-danger.disabled, .btn-danger:disabled {
-  color: #fff;
-  background-color: #dc3545;
-  border-color: #dc3545;
-}
-
-.btn-danger:not(:disabled):not(.disabled):active, .btn-danger:not(:disabled):not(.disabled).active,
-.show > .btn-danger.dropdown-toggle {
-  color: #fff;
-  background-color: #bd2130;
-  border-color: #b21f2d;
-}
-
-.btn-danger:not(:disabled):not(.disabled):active:focus, .btn-danger:not(:disabled):not(.disabled).active:focus,
-.show > .btn-danger.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(225, 83, 97, 0.5);
-}
-
-.btn-light {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
-}
-
-.btn-light:hover {
-  color: #212529;
-  background-color: #e2e6ea;
-  border-color: #dae0e5;
-}
-
-.btn-light:focus, .btn-light.focus {
-  color: #212529;
-  background-color: #e2e6ea;
-  border-color: #dae0e5;
-  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
-}
-
-.btn-light.disabled, .btn-light:disabled {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
-}
-
-.btn-light:not(:disabled):not(.disabled):active, .btn-light:not(:disabled):not(.disabled).active,
-.show > .btn-light.dropdown-toggle {
-  color: #212529;
-  background-color: #dae0e5;
-  border-color: #d3d9df;
-}
-
-.btn-light:not(:disabled):not(.disabled):active:focus, .btn-light:not(:disabled):not(.disabled).active:focus,
-.show > .btn-light.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(216, 217, 219, 0.5);
-}
-
-.btn-dark {
-  color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
-}
-
-.btn-dark:hover {
-  color: #fff;
-  background-color: #23272b;
-  border-color: #1d2124;
-}
-
-.btn-dark:focus, .btn-dark.focus {
-  color: #fff;
-  background-color: #23272b;
-  border-color: #1d2124;
-  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
-}
-
-.btn-dark.disabled, .btn-dark:disabled {
-  color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
-}
-
-.btn-dark:not(:disabled):not(.disabled):active, .btn-dark:not(:disabled):not(.disabled).active,
-.show > .btn-dark.dropdown-toggle {
-  color: #fff;
-  background-color: #1d2124;
-  border-color: #171a1d;
-}
-
-.btn-dark:not(:disabled):not(.disabled):active:focus, .btn-dark:not(:disabled):not(.disabled).active:focus,
-.show > .btn-dark.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(82, 88, 93, 0.5);
-}
-
-.btn-outline-primary {
-  color: #007bff;
-  border-color: #007bff;
-}
-
-.btn-outline-primary:hover {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
-}
-
-.btn-outline-primary:focus, .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
-}
-
-.btn-outline-primary.disabled, .btn-outline-primary:disabled {
-  color: #007bff;
-  background-color: transparent;
-}
-
-.btn-outline-primary:not(:disabled):not(.disabled):active, .btn-outline-primary:not(:disabled):not(.disabled).active,
-.show > .btn-outline-primary.dropdown-toggle {
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
-}
-
-.btn-outline-primary:not(:disabled):not(.disabled):active:focus, .btn-outline-primary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-primary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
-}
-
-.btn-outline-secondary {
-  color: #6c757d;
-  border-color: #6c757d;
-}
-
-.btn-outline-secondary:hover {
-  color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
-}
-
-.btn-outline-secondary:focus, .btn-outline-secondary.focus {
-  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
-}
-
-.btn-outline-secondary.disabled, .btn-outline-secondary:disabled {
-  color: #6c757d;
-  background-color: transparent;
-}
-
-.btn-outline-secondary:not(:disabled):not(.disabled):active, .btn-outline-secondary:not(:disabled):not(.disabled).active,
-.show > .btn-outline-secondary.dropdown-toggle {
-  color: #fff;
-  background-color: #6c757d;
-  border-color: #6c757d;
-}
-
-.btn-outline-secondary:not(:disabled):not(.disabled):active:focus, .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-secondary.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
-}
-
-.btn-outline-success {
-  color: #28a745;
-  border-color: #28a745;
-}
-
-.btn-outline-success:hover {
-  color: #fff;
-  background-color: #28a745;
-  border-color: #28a745;
-}
-
-.btn-outline-success:focus, .btn-outline-success.focus {
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
-}
-
-.btn-outline-success.disabled, .btn-outline-success:disabled {
-  color: #28a745;
-  background-color: transparent;
-}
-
-.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active,
-.show > .btn-outline-success.dropdown-toggle {
-  color: #fff;
-  background-color: #28a745;
-  border-color: #28a745;
-}
-
-.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-success.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
-}
-
-.btn-outline-info {
-  color: #17a2b8;
-  border-color: #17a2b8;
-}
-
-.btn-outline-info:hover {
-  color: #fff;
-  background-color: #17a2b8;
-  border-color: #17a2b8;
-}
-
-.btn-outline-info:focus, .btn-outline-info.focus {
-  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
-}
-
-.btn-outline-info.disabled, .btn-outline-info:disabled {
-  color: #17a2b8;
-  background-color: transparent;
-}
-
-.btn-outline-info:not(:disabled):not(.disabled):active, .btn-outline-info:not(:disabled):not(.disabled).active,
-.show > .btn-outline-info.dropdown-toggle {
-  color: #fff;
-  background-color: #17a2b8;
-  border-color: #17a2b8;
-}
-
-.btn-outline-info:not(:disabled):not(.disabled):active:focus, .btn-outline-info:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-info.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
-}
-
-.btn-outline-warning {
-  color: #ffc107;
-  border-color: #ffc107;
-}
-
-.btn-outline-warning:hover {
-  color: #212529;
-  background-color: #ffc107;
-  border-color: #ffc107;
-}
-
-.btn-outline-warning:focus, .btn-outline-warning.focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
-}
-
-.btn-outline-warning.disabled, .btn-outline-warning:disabled {
-  color: #ffc107;
-  background-color: transparent;
-}
-
-.btn-outline-warning:not(:disabled):not(.disabled):active, .btn-outline-warning:not(:disabled):not(.disabled).active,
-.show > .btn-outline-warning.dropdown-toggle {
-  color: #212529;
-  background-color: #ffc107;
-  border-color: #ffc107;
-}
-
-.btn-outline-warning:not(:disabled):not(.disabled):active:focus, .btn-outline-warning:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-warning.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
-}
-
-.btn-outline-danger {
-  color: #dc3545;
-  border-color: #dc3545;
-}
-
-.btn-outline-danger:hover {
-  color: #fff;
-  background-color: #dc3545;
-  border-color: #dc3545;
-}
-
-.btn-outline-danger:focus, .btn-outline-danger.focus {
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
-}
-
-.btn-outline-danger.disabled, .btn-outline-danger:disabled {
-  color: #dc3545;
-  background-color: transparent;
-}
-
-.btn-outline-danger:not(:disabled):not(.disabled):active, .btn-outline-danger:not(:disabled):not(.disabled).active,
-.show > .btn-outline-danger.dropdown-toggle {
-  color: #fff;
-  background-color: #dc3545;
-  border-color: #dc3545;
-}
-
-.btn-outline-danger:not(:disabled):not(.disabled):active:focus, .btn-outline-danger:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-danger.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
-}
-
-.btn-outline-light {
-  color: #f8f9fa;
-  border-color: #f8f9fa;
-}
-
-.btn-outline-light:hover {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
-}
-
-.btn-outline-light:focus, .btn-outline-light.focus {
-  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
-}
-
-.btn-outline-light.disabled, .btn-outline-light:disabled {
-  color: #f8f9fa;
-  background-color: transparent;
-}
-
-.btn-outline-light:not(:disabled):not(.disabled):active, .btn-outline-light:not(:disabled):not(.disabled).active,
-.show > .btn-outline-light.dropdown-toggle {
-  color: #212529;
-  background-color: #f8f9fa;
-  border-color: #f8f9fa;
-}
-
-.btn-outline-light:not(:disabled):not(.disabled):active:focus, .btn-outline-light:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-light.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
-}
-
-.btn-outline-dark {
-  color: #343a40;
-  border-color: #343a40;
-}
-
-.btn-outline-dark:hover {
-  color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
-}
-
-.btn-outline-dark:focus, .btn-outline-dark.focus {
-  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
-}
-
-.btn-outline-dark.disabled, .btn-outline-dark:disabled {
-  color: #343a40;
-  background-color: transparent;
-}
-
-.btn-outline-dark:not(:disabled):not(.disabled):active, .btn-outline-dark:not(:disabled):not(.disabled).active,
-.show > .btn-outline-dark.dropdown-toggle {
-  color: #fff;
-  background-color: #343a40;
-  border-color: #343a40;
-}
-
-.btn-outline-dark:not(:disabled):not(.disabled):active:focus, .btn-outline-dark:not(:disabled):not(.disabled).active:focus,
-.show > .btn-outline-dark.dropdown-toggle:focus {
-  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
-}
-
-.btn-link {
-  font-weight: 400;
-  color: #007bff;
-  text-decoration: none;
-}
-
-.btn-link:hover {
-  color: #0056b3;
-  text-decoration: underline;
-}
-
-.btn-link:focus, .btn-link.focus {
-  text-decoration: underline;
-  box-shadow: none;
-}
-
-.btn-link:disabled, .btn-link.disabled {
-  color: #6c757d;
-  pointer-events: none;
-}
-
-.btn-lg, .btn-group-lg > .btn {
-  padding: 0.5rem 1rem;
-  font-size: 1.25rem;
-  line-height: 1.5;
-  border-radius: 0.3rem;
-}
-
-.btn-sm, .btn-group-sm > .btn {
-  padding: 0.25rem 0.5rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-  border-radius: 0.2rem;
-}
-
-.btn-block {
-  display: block;
-  width: 100%;
-}
-
-.btn-block + .btn-block {
-  margin-top: 0.5rem;
-}
-
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
-}
-
-.fade {
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .fade {
-    transition: none;
-  }
-}
-
-.fade:not(.show) {
-  opacity: 0;
-}
-
-.collapse:not(.show) {
-  display: none;
-}
-
-.collapsing {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .collapsing {
-    transition: none;
-  }
-}
-
-.dropup,
-.dropright,
-.dropdown,
-.dropleft {
-  position: relative;
-}
-
-.dropdown-toggle {
-  white-space: nowrap;
-}
-
-.dropdown-toggle::after {
-  display: inline-block;
-  margin-left: 0.255em;
-  vertical-align: 0.255em;
-  content: "";
-  border-top: 0.3em solid;
-  border-right: 0.3em solid transparent;
-  border-bottom: 0;
-  border-left: 0.3em solid transparent;
-}
-
-.dropdown-toggle:empty::after {
-  margin-left: 0;
-}
-
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 10rem;
-  padding: 0.5rem 0;
-  margin: 0.125rem 0 0;
-  font-size: 1rem;
-  color: #212529;
-  text-align: left;
-  list-style: none;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 0.25rem;
-}
-
-.dropdown-menu-left {
-  right: auto;
-  left: 0;
-}
-
-.dropdown-menu-right {
-  right: 0;
-  left: auto;
-}
-
-@media (min-width: 576px) {
-  .dropdown-menu-sm-left {
-    right: auto;
-    left: 0;
-  }
-  .dropdown-menu-sm-right {
-    right: 0;
-    left: auto;
-  }
-}
-
-@media (min-width: 768px) {
-  .dropdown-menu-md-left {
-    right: auto;
-    left: 0;
-  }
-  .dropdown-menu-md-right {
-    right: 0;
-    left: auto;
-  }
-}
-
-@media (min-width: 992px) {
-  .dropdown-menu-lg-left {
-    right: auto;
-    left: 0;
-  }
-  .dropdown-menu-lg-right {
-    right: 0;
-    left: auto;
-  }
-}
-
-@media (min-width: 1200px) {
-  .dropdown-menu-xl-left {
-    right: auto;
-    left: 0;
-  }
-  .dropdown-menu-xl-right {
-    right: 0;
-    left: auto;
-  }
-}
-
-.dropup .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-top: 0;
-  margin-bottom: 0.125rem;
-}
-
-.dropup .dropdown-toggle::after {
-  display: inline-block;
-  margin-left: 0.255em;
-  vertical-align: 0.255em;
-  content: "";
-  border-top: 0;
-  border-right: 0.3em solid transparent;
-  border-bottom: 0.3em solid;
-  border-left: 0.3em solid transparent;
-}
-
-.dropup .dropdown-toggle:empty::after {
-  margin-left: 0;
-}
-
-.dropright .dropdown-menu {
-  top: 0;
-  right: auto;
-  left: 100%;
-  margin-top: 0;
-  margin-left: 0.125rem;
-}
-
-.dropright .dropdown-toggle::after {
-  display: inline-block;
-  margin-left: 0.255em;
-  vertical-align: 0.255em;
-  content: "";
-  border-top: 0.3em solid transparent;
-  border-right: 0;
-  border-bottom: 0.3em solid transparent;
-  border-left: 0.3em solid;
-}
-
-.dropright .dropdown-toggle:empty::after {
-  margin-left: 0;
-}
-
-.dropright .dropdown-toggle::after {
-  vertical-align: 0;
-}
-
-.dropleft .dropdown-menu {
-  top: 0;
-  right: 100%;
-  left: auto;
-  margin-top: 0;
-  margin-right: 0.125rem;
-}
-
-.dropleft .dropdown-toggle::after {
-  display: inline-block;
-  margin-left: 0.255em;
-  vertical-align: 0.255em;
-  content: "";
-}
-
-.dropleft .dropdown-toggle::after {
-  display: none;
-}
-
-.dropleft .dropdown-toggle::before {
-  display: inline-block;
-  margin-right: 0.255em;
-  vertical-align: 0.255em;
-  content: "";
-  border-top: 0.3em solid transparent;
-  border-right: 0.3em solid;
-  border-bottom: 0.3em solid transparent;
-}
-
-.dropleft .dropdown-toggle:empty::after {
-  margin-left: 0;
-}
-
-.dropleft .dropdown-toggle::before {
-  vertical-align: 0;
-}
-
-.dropdown-menu[x-placement^="top"], .dropdown-menu[x-placement^="right"], .dropdown-menu[x-placement^="bottom"], .dropdown-menu[x-placement^="left"] {
-  right: auto;
-  bottom: auto;
-}
-
-.dropdown-divider {
-  height: 0;
-  margin: 0.5rem 0;
-  overflow: hidden;
-  border-top: 1px solid #e9ecef;
-}
-
-.dropdown-item {
-  display: block;
-  width: 100%;
-  padding: 0.25rem 1.5rem;
-  clear: both;
-  font-weight: 400;
-  color: #212529;
-  text-align: inherit;
-  white-space: nowrap;
-  background-color: transparent;
-  border: 0;
-}
-
-.dropdown-item:hover, .dropdown-item:focus {
-  color: #16181b;
-  text-decoration: none;
-  background-color: #f8f9fa;
-}
-
-.dropdown-item.active, .dropdown-item:active {
-  color: #fff;
-  text-decoration: none;
-  background-color: #007bff;
-}
-
-.dropdown-item.disabled, .dropdown-item:disabled {
-  color: #6c757d;
-  pointer-events: none;
-  background-color: transparent;
-}
-
-.dropdown-menu.show {
-  display: block;
-}
-
-.dropdown-header {
-  display: block;
-  padding: 0.5rem 1.5rem;
-  margin-bottom: 0;
-  font-size: 0.875rem;
-  color: #6c757d;
-  white-space: nowrap;
-}
-
-.dropdown-item-text {
-  display: block;
-  padding: 0.25rem 1.5rem;
-  color: #212529;
-}
-
-.btn-group,
-.btn-group-vertical {
-  position: relative;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  vertical-align: middle;
-}
-
-.btn-group > .btn,
-.btn-group-vertical > .btn {
-  position: relative;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-}
-
-.btn-group > .btn:hover,
-.btn-group-vertical > .btn:hover {
-  z-index: 1;
-}
-
-.btn-group > .btn:focus, .btn-group > .btn:active, .btn-group > .btn.active,
-.btn-group-vertical > .btn:focus,
-.btn-group-vertical > .btn:active,
-.btn-group-vertical > .btn.active {
-  z-index: 1;
-}
-
-.btn-toolbar {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.btn-toolbar .input-group {
-  width: auto;
-}
-
-.btn-group > .btn:not(:first-child),
-.btn-group > .btn-group:not(:first-child) {
-  margin-left: -1px;
-}
-
-.btn-group > .btn:not(:last-child):not(.dropdown-toggle),
-.btn-group > .btn-group:not(:last-child) > .btn {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.btn-group > .btn:not(:first-child),
-.btn-group > .btn-group:not(:first-child) > .btn {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.dropdown-toggle-split {
-  padding-right: 0.5625rem;
-  padding-left: 0.5625rem;
-}
-
-.dropdown-toggle-split::after,
-.dropup .dropdown-toggle-split::after,
-.dropright .dropdown-toggle-split::after {
-  margin-left: 0;
-}
-
-.dropleft .dropdown-toggle-split::before {
-  margin-right: 0;
-}
-
-.btn-sm + .dropdown-toggle-split, .btn-group-sm > .btn + .dropdown-toggle-split {
-  padding-right: 0.375rem;
-  padding-left: 0.375rem;
-}
-
-.btn-lg + .dropdown-toggle-split, .btn-group-lg > .btn + .dropdown-toggle-split {
-  padding-right: 0.75rem;
-  padding-left: 0.75rem;
-}
-
-.btn-group-vertical {
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -ms-flex-align: start;
-  align-items: flex-start;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group {
-  width: 100%;
-}
-
-.btn-group-vertical > .btn:not(:first-child),
-.btn-group-vertical > .btn-group:not(:first-child) {
-  margin-top: -1px;
-}
-
-.btn-group-vertical > .btn:not(:last-child):not(.dropdown-toggle),
-.btn-group-vertical > .btn-group:not(:last-child) > .btn {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.btn-group-vertical > .btn:not(:first-child),
-.btn-group-vertical > .btn-group:not(:first-child) > .btn {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-
-.btn-group-toggle > .btn,
-.btn-group-toggle > .btn-group > .btn {
-  margin-bottom: 0;
-}
-
-.btn-group-toggle > .btn input[type="radio"],
-.btn-group-toggle > .btn input[type="checkbox"],
-.btn-group-toggle > .btn-group > .btn input[type="radio"],
-.btn-group-toggle > .btn-group > .btn input[type="checkbox"] {
-  position: absolute;
-  clip: rect(0, 0, 0, 0);
-  pointer-events: none;
-}
-
-.input-group {
-  position: relative;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -ms-flex-align: stretch;
-  align-items: stretch;
-  width: 100%;
-}
-
-.input-group > .form-control,
-.input-group > .form-control-plaintext,
-.input-group > .custom-select,
-.input-group > .custom-file {
-  position: relative;
-  -ms-flex: 1 1 0%;
-  flex: 1 1 0%;
-  min-width: 0;
-  margin-bottom: 0;
-}
-
-.input-group > .form-control + .form-control,
-.input-group > .form-control + .custom-select,
-.input-group > .form-control + .custom-file,
-.input-group > .form-control-plaintext + .form-control,
-.input-group > .form-control-plaintext + .custom-select,
-.input-group > .form-control-plaintext + .custom-file,
-.input-group > .custom-select + .form-control,
-.input-group > .custom-select + .custom-select,
-.input-group > .custom-select + .custom-file,
-.input-group > .custom-file + .form-control,
-.input-group > .custom-file + .custom-select,
-.input-group > .custom-file + .custom-file {
-  margin-left: -1px;
-}
-
-.input-group > .form-control:focus,
-.input-group > .custom-select:focus,
-.input-group > .custom-file .custom-file-input:focus ~ .custom-file-label {
-  z-index: 3;
-}
-
-.input-group > .custom-file .custom-file-input:focus {
-  z-index: 4;
-}
-
-.input-group > .form-control:not(:last-child),
-.input-group > .custom-select:not(:last-child) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.input-group > .form-control:not(:first-child),
-.input-group > .custom-select:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.input-group > .custom-file {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.input-group > .custom-file:not(:last-child) .custom-file-label,
-.input-group > .custom-file:not(:last-child) .custom-file-label::after {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.input-group > .custom-file:not(:first-child) .custom-file-label {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.input-group-prepend,
-.input-group-append {
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.input-group-prepend .btn,
-.input-group-append .btn {
-  position: relative;
-  z-index: 2;
-}
-
-.input-group-prepend .btn:focus,
-.input-group-append .btn:focus {
-  z-index: 3;
-}
-
-.input-group-prepend .btn + .btn,
-.input-group-prepend .btn + .input-group-text,
-.input-group-prepend .input-group-text + .input-group-text,
-.input-group-prepend .input-group-text + .btn,
-.input-group-append .btn + .btn,
-.input-group-append .btn + .input-group-text,
-.input-group-append .input-group-text + .input-group-text,
-.input-group-append .input-group-text + .btn {
-  margin-left: -1px;
-}
-
-.input-group-prepend {
-  margin-right: -1px;
-}
-
-.input-group-append {
-  margin-left: -1px;
-}
-
-.input-group-text {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-  align-items: center;
-  padding: 0.375rem 0.75rem;
-  margin-bottom: 0;
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #495057;
-  text-align: center;
-  white-space: nowrap;
-  background-color: #e9ecef;
-  border: 1px solid #ced4da;
-  border-radius: 0.25rem;
-}
-
-.input-group-text input[type="radio"],
-.input-group-text input[type="checkbox"] {
-  margin-top: 0;
-}
-
-.input-group-lg > .form-control:not(textarea),
-.input-group-lg > .custom-select {
-  height: calc(1.5em + 1rem + 2px);
-}
-
-.input-group-lg > .form-control,
-.input-group-lg > .custom-select,
-.input-group-lg > .input-group-prepend > .input-group-text,
-.input-group-lg > .input-group-append > .input-group-text,
-.input-group-lg > .input-group-prepend > .btn,
-.input-group-lg > .input-group-append > .btn {
-  padding: 0.5rem 1rem;
-  font-size: 1.25rem;
-  line-height: 1.5;
-  border-radius: 0.3rem;
-}
-
-.input-group-sm > .form-control:not(textarea),
-.input-group-sm > .custom-select {
-  height: calc(1.5em + 0.5rem + 2px);
-}
-
-.input-group-sm > .form-control,
-.input-group-sm > .custom-select,
-.input-group-sm > .input-group-prepend > .input-group-text,
-.input-group-sm > .input-group-append > .input-group-text,
-.input-group-sm > .input-group-prepend > .btn,
-.input-group-sm > .input-group-append > .btn {
-  padding: 0.25rem 0.5rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-  border-radius: 0.2rem;
-}
-
-.input-group-lg > .custom-select,
-.input-group-sm > .custom-select {
-  padding-right: 1.75rem;
-}
-
-.input-group > .input-group-prepend > .btn,
-.input-group > .input-group-prepend > .input-group-text,
-.input-group > .input-group-append:not(:last-child) > .btn,
-.input-group > .input-group-append:not(:last-child) > .input-group-text,
-.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),
-.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.input-group > .input-group-append > .btn,
-.input-group > .input-group-append > .input-group-text,
-.input-group > .input-group-prepend:not(:first-child) > .btn,
-.input-group > .input-group-prepend:not(:first-child) > .input-group-text,
-.input-group > .input-group-prepend:first-child > .btn:not(:first-child),
-.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.custom-control {
-  position: relative;
-  display: block;
-  min-height: 1.5rem;
-  padding-left: 1.5rem;
-}
-
-.custom-control-inline {
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  margin-right: 1rem;
-}
-
-.custom-control-input {
-  position: absolute;
-  left: 0;
-  z-index: -1;
-  width: 1rem;
-  height: 1.25rem;
-  opacity: 0;
-}
-
-.custom-control-input:checked ~ .custom-control-label::before {
-  color: #fff;
-  border-color: #007bff;
-  background-color: #007bff;
-}
-
-.custom-control-input:focus ~ .custom-control-label::before {
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.custom-control-input:focus:not(:checked) ~ .custom-control-label::before {
-  border-color: #80bdff;
-}
-
-.custom-control-input:not(:disabled):active ~ .custom-control-label::before {
-  color: #fff;
-  background-color: #b3d7ff;
-  border-color: #b3d7ff;
-}
-
-.custom-control-input[disabled] ~ .custom-control-label, .custom-control-input:disabled ~ .custom-control-label {
-  color: #6c757d;
-}
-
-.custom-control-input[disabled] ~ .custom-control-label::before, .custom-control-input:disabled ~ .custom-control-label::before {
-  background-color: #e9ecef;
-}
-
-.custom-control-label {
-  position: relative;
-  margin-bottom: 0;
-  vertical-align: top;
-}
-
-.custom-control-label::before {
-  position: absolute;
-  top: 0.25rem;
-  left: -1.5rem;
-  display: block;
-  width: 1rem;
-  height: 1rem;
-  pointer-events: none;
-  content: "";
-  background-color: #fff;
-  border: #adb5bd solid 1px;
-}
-
-.custom-control-label::after {
-  position: absolute;
-  top: 0.25rem;
-  left: -1.5rem;
-  display: block;
-  width: 1rem;
-  height: 1rem;
-  content: "";
-  background: no-repeat 50% / 50% 50%;
-}
-
-.custom-checkbox .custom-control-label::before {
-  border-radius: 0.25rem;
-}
-
-.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e");
-}
-
-.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before {
-  border-color: #007bff;
-  background-color: #007bff;
-}
-
-.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e");
-}
-
-.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
-}
-
-.custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
-}
-
-.custom-radio .custom-control-label::before {
-  border-radius: 50%;
-}
-
-.custom-radio .custom-control-input:checked ~ .custom-control-label::after {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e");
-}
-
-.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
-}
-
-.custom-switch {
-  padding-left: 2.25rem;
-}
-
-.custom-switch .custom-control-label::before {
-  left: -2.25rem;
-  width: 1.75rem;
-  pointer-events: all;
-  border-radius: 0.5rem;
-}
-
-.custom-switch .custom-control-label::after {
-  top: calc(0.25rem + 2px);
-  left: calc(-2.25rem + 2px);
-  width: calc(1rem - 4px);
-  height: calc(1rem - 4px);
-  background-color: #adb5bd;
-  border-radius: 0.5rem;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .custom-switch .custom-control-label::after {
-    transition: none;
-  }
-}
-
-.custom-switch .custom-control-input:checked ~ .custom-control-label::after {
-  background-color: #fff;
-  -webkit-transform: translateX(0.75rem);
-  transform: translateX(0.75rem);
-}
-
-.custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before {
-  background-color: rgba(0, 123, 255, 0.5);
-}
-
-.custom-select {
-  display: inline-block;
-  width: 100%;
-  height: calc(1.5em + 0.75rem + 2px);
-  padding: 0.375rem 1.75rem 0.375rem 0.75rem;
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #495057;
-  vertical-align: middle;
-  background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
-  border: 1px solid #ced4da;
-  border-radius: 0.25rem;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-}
-
-.custom-select:focus {
-  border-color: #80bdff;
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.custom-select:focus::-ms-value {
-  color: #495057;
-  background-color: #fff;
-}
-
-.custom-select[multiple], .custom-select[size]:not([size="1"]) {
-  height: auto;
-  padding-right: 0.75rem;
-  background-image: none;
-}
-
-.custom-select:disabled {
-  color: #6c757d;
-  background-color: #e9ecef;
-}
-
-.custom-select::-ms-expand {
-  display: none;
-}
-
-.custom-select:-moz-focusring {
-  color: transparent;
-  text-shadow: 0 0 0 #495057;
-}
-
-.custom-select-sm {
-  height: calc(1.5em + 0.5rem + 2px);
-  padding-top: 0.25rem;
-  padding-bottom: 0.25rem;
-  padding-left: 0.5rem;
-  font-size: 0.875rem;
-}
-
-.custom-select-lg {
-  height: calc(1.5em + 1rem + 2px);
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  padding-left: 1rem;
-  font-size: 1.25rem;
-}
-
-.custom-file {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-  height: calc(1.5em + 0.75rem + 2px);
-  margin-bottom: 0;
-}
-
-.custom-file-input {
-  position: relative;
-  z-index: 2;
-  width: 100%;
-  height: calc(1.5em + 0.75rem + 2px);
-  margin: 0;
-  opacity: 0;
-}
-
-.custom-file-input:focus ~ .custom-file-label {
-  border-color: #80bdff;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.custom-file-input[disabled] ~ .custom-file-label,
-.custom-file-input:disabled ~ .custom-file-label {
-  background-color: #e9ecef;
-}
-
-.custom-file-input:lang(en) ~ .custom-file-label::after {
-  content: "Browse";
-}
-
-.custom-file-input ~ .custom-file-label[data-browse]::after {
-  content: attr(data-browse);
-}
-
-.custom-file-label {
-  position: absolute;
-  top: 0;
-  right: 0;
-  left: 0;
-  z-index: 1;
-  height: calc(1.5em + 0.75rem + 2px);
-  padding: 0.375rem 0.75rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #495057;
-  background-color: #fff;
-  border: 1px solid #ced4da;
-  border-radius: 0.25rem;
-}
-
-.custom-file-label::after {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 3;
-  display: block;
-  height: calc(1.5em + 0.75rem);
-  padding: 0.375rem 0.75rem;
-  line-height: 1.5;
-  color: #495057;
-  content: "Browse";
-  background-color: #e9ecef;
-  border-left: inherit;
-  border-radius: 0 0.25rem 0.25rem 0;
-}
-
-.custom-range {
-  width: 100%;
-  height: 1.4rem;
-  padding: 0;
-  background-color: transparent;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-}
-
-.custom-range:focus {
-  outline: none;
-}
-
-.custom-range:focus::-webkit-slider-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.custom-range:focus::-moz-range-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.custom-range:focus::-ms-thumb {
-  box-shadow: 0 0 0 1px #fff, 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.custom-range::-moz-focus-outer {
-  border: 0;
-}
-
-.custom-range::-webkit-slider-thumb {
-  width: 1rem;
-  height: 1rem;
-  margin-top: -0.25rem;
-  background-color: #007bff;
-  border: 0;
-  border-radius: 1rem;
-  -webkit-appearance: none;
-  appearance: none;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .custom-range::-webkit-slider-thumb {
-    -webkit-transition: none;
-    transition: none;
-  }
-}
-
-.custom-range::-webkit-slider-thumb:active {
-  background-color: #b3d7ff;
-}
-
-.custom-range::-webkit-slider-runnable-track {
-  width: 100%;
-  height: 0.5rem;
-  color: transparent;
-  cursor: pointer;
-  background-color: #dee2e6;
-  border-color: transparent;
-  border-radius: 1rem;
-}
-
-.custom-range::-moz-range-thumb {
-  width: 1rem;
-  height: 1rem;
-  background-color: #007bff;
-  border: 0;
-  border-radius: 1rem;
-  -moz-appearance: none;
-  appearance: none;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .custom-range::-moz-range-thumb {
-    -moz-transition: none;
-    transition: none;
-  }
-}
-
-.custom-range::-moz-range-thumb:active {
-  background-color: #b3d7ff;
-}
-
-.custom-range::-moz-range-track {
-  width: 100%;
-  height: 0.5rem;
-  color: transparent;
-  cursor: pointer;
-  background-color: #dee2e6;
-  border-color: transparent;
-  border-radius: 1rem;
-}
-
-.custom-range::-ms-thumb {
-  width: 1rem;
-  height: 1rem;
-  margin-top: 0;
-  margin-right: 0.2rem;
-  margin-left: 0.2rem;
-  background-color: #007bff;
-  border: 0;
-  border-radius: 1rem;
-  appearance: none;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .custom-range::-ms-thumb {
-    -ms-transition: none;
-    transition: none;
-  }
-}
-
-.custom-range::-ms-thumb:active {
-  background-color: #b3d7ff;
-}
-
-.custom-range::-ms-track {
-  width: 100%;
-  height: 0.5rem;
-  color: transparent;
-  cursor: pointer;
-  background-color: transparent;
-  border-color: transparent;
-  border-width: 0.5rem;
-}
-
-.custom-range::-ms-fill-lower {
-  background-color: #dee2e6;
-  border-radius: 1rem;
-}
-
-.custom-range::-ms-fill-upper {
-  margin-right: 15px;
-  background-color: #dee2e6;
-  border-radius: 1rem;
-}
-
-.custom-range:disabled::-webkit-slider-thumb {
-  background-color: #adb5bd;
-}
-
-.custom-range:disabled::-webkit-slider-runnable-track {
-  cursor: default;
-}
-
-.custom-range:disabled::-moz-range-thumb {
-  background-color: #adb5bd;
-}
-
-.custom-range:disabled::-moz-range-track {
-  cursor: default;
-}
-
-.custom-range:disabled::-ms-thumb {
-  background-color: #adb5bd;
-}
-
-.custom-control-label::before,
-.custom-file-label,
-.custom-select {
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .custom-control-label::before,
-  .custom-file-label,
-  .custom-select {
-    transition: none;
-  }
-}
-
-.nav {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  padding-left: 0;
-  margin-bottom: 0;
-  list-style: none;
-}
-
-.nav-link {
-  display: block;
-  padding: 0.25rem 1rem;
-}
-
-.nav-link:hover, .nav-link:focus {
-  text-decoration: none;
-}
-
-.nav-link.disabled {
-  color: #6c757d;
-  pointer-events: none;
-  cursor: default;
-}
-
-.nav-tabs {
-  border-bottom: 1px solid #dee2e6;
-}
-
-.nav-tabs .nav-item {
-  margin-bottom: -1px;
-}
-
-.nav-tabs .nav-link {
-  border: 1px solid transparent;
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
-}
-
-.nav-tabs .nav-link:hover, .nav-tabs .nav-link:focus {
-  border-color: #e9ecef #e9ecef #dee2e6;
-}
-
-.nav-tabs .nav-link.disabled {
-  color: #6c757d;
-  background-color: transparent;
-  border-color: transparent;
-}
-
-.nav-tabs .nav-link.active,
-.nav-tabs .nav-item.show .nav-link {
-  color: #495057;
-  background-color: #fff;
-  border-color: #dee2e6 #dee2e6 #fff;
-}
-
-.nav-tabs .dropdown-menu {
-  margin-top: -1px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-
-.nav-pills .nav-link {
-  border-radius: 0.25rem;
-}
-
-.nav-pills .nav-link.active,
-.nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #007bff;
-}
-
-.nav-fill .nav-item {
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  text-align: center;
-}
-
-.nav-justified .nav-item {
-  -ms-flex-preferred-size: 0;
-  flex-basis: 0;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  text-align: center;
-}
-
-.tab-content > .tab-pane {
-  display: none;
-}
-
-.tab-content > .active {
-  display: block;
-}
-
-.navbar {
-  position: relative;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -ms-flex-align: center;
-  align-items: center;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  padding: 0.5rem 1rem;
-}
-
-.navbar .container,
-.navbar .container-fluid, .navbar .container-sm, .navbar .container-md, .navbar .container-lg, .navbar .container-xl {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -ms-flex-align: center;
-  align-items: center;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.navbar-brand {
-  display: inline-block;
-  padding-top: 0.3125rem;
-  padding-bottom: 0.3125rem;
-  margin-right: 1rem;
-  font-size: 1.25rem;
-  line-height: inherit;
-  white-space: nowrap;
-}
-
-.navbar-brand:hover, .navbar-brand:focus {
-  text-decoration: none;
-}
-
-.navbar-nav {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  padding-left: 0;
-  margin-bottom: 0;
-  list-style: none;
-}
-
-.navbar-nav .nav-link {
-  padding-right: 0;
-  padding-left: 0;
-}
-
-.navbar-nav .dropdown-menu {
-  position: static;
-  float: none;
-}
-
-.navbar-text {
-  display: inline-block;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-}
-
-.navbar-collapse {
-  -ms-flex-preferred-size: 100%;
-  flex-basis: 100%;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.navbar-toggler {
-  padding: 0.25rem 0.75rem;
-  font-size: 1.25rem;
-  line-height: 1;
-  background-color: transparent;
-  border: 1px solid transparent;
-  border-radius: 0.25rem;
-}
-
-.navbar-toggler:hover, .navbar-toggler:focus {
-  text-decoration: none;
-}
-
-.navbar-toggler-icon {
-  display: inline-block;
-  width: 1.5em;
-  height: 1.5em;
-  vertical-align: middle;
-  content: "";
-  background: no-repeat center center;
-  background-size: 100% 100%;
-}
-
-@media (max-width: 575.98px) {
-  .navbar-expand-sm > .container,
-  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-
-@media (min-width: 576px) {
-  .navbar-expand-sm {
-    -ms-flex-flow: row nowrap;
-    flex-flow: row nowrap;
-    -ms-flex-pack: start;
-    justify-content: flex-start;
-  }
-  .navbar-expand-sm .navbar-nav {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .navbar-expand-sm .navbar-nav .dropdown-menu {
-    position: absolute;
-  }
-  .navbar-expand-sm .navbar-nav .nav-link {
-    padding-right: 0.5rem;
-    padding-left: 0.5rem;
-  }
-  .navbar-expand-sm > .container,
-  .navbar-expand-sm > .container-fluid, .navbar-expand-sm > .container-sm, .navbar-expand-sm > .container-md, .navbar-expand-sm > .container-lg, .navbar-expand-sm > .container-xl {
-    -ms-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-  }
-  .navbar-expand-sm .navbar-collapse {
-    display: -ms-flexbox !important;
-    display: flex !important;
-    -ms-flex-preferred-size: auto;
-    flex-basis: auto;
-  }
-  .navbar-expand-sm .navbar-toggler {
-    display: none;
-  }
-}
-
-@media (max-width: 767.98px) {
-  .navbar-expand-md > .container,
-  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-
-@media (min-width: 768px) {
-  .navbar-expand-md {
-    -ms-flex-flow: row nowrap;
-    flex-flow: row nowrap;
-    -ms-flex-pack: start;
-    justify-content: flex-start;
-  }
-  .navbar-expand-md .navbar-nav {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .navbar-expand-md .navbar-nav .dropdown-menu {
-    position: absolute;
-  }
-  .navbar-expand-md .navbar-nav .nav-link {
-    padding-right: 0.5rem;
-    padding-left: 0.5rem;
-  }
-  .navbar-expand-md > .container,
-  .navbar-expand-md > .container-fluid, .navbar-expand-md > .container-sm, .navbar-expand-md > .container-md, .navbar-expand-md > .container-lg, .navbar-expand-md > .container-xl {
-    -ms-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-  }
-  .navbar-expand-md .navbar-collapse {
-    display: -ms-flexbox !important;
-    display: flex !important;
-    -ms-flex-preferred-size: auto;
-    flex-basis: auto;
-  }
-  .navbar-expand-md .navbar-toggler {
-    display: none;
-  }
-}
-
-@media (max-width: 991.98px) {
-  .navbar-expand-lg > .container,
-  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-
-@media (min-width: 992px) {
-  .navbar-expand-lg {
-    -ms-flex-flow: row nowrap;
-    flex-flow: row nowrap;
-    -ms-flex-pack: start;
-    justify-content: flex-start;
-  }
-  .navbar-expand-lg .navbar-nav {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .navbar-expand-lg .navbar-nav .dropdown-menu {
-    position: absolute;
-  }
-  .navbar-expand-lg .navbar-nav .nav-link {
-    padding-right: 0.5rem;
-    padding-left: 0.5rem;
-  }
-  .navbar-expand-lg > .container,
-  .navbar-expand-lg > .container-fluid, .navbar-expand-lg > .container-sm, .navbar-expand-lg > .container-md, .navbar-expand-lg > .container-lg, .navbar-expand-lg > .container-xl {
-    -ms-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-  }
-  .navbar-expand-lg .navbar-collapse {
-    display: -ms-flexbox !important;
-    display: flex !important;
-    -ms-flex-preferred-size: auto;
-    flex-basis: auto;
-  }
-  .navbar-expand-lg .navbar-toggler {
-    display: none;
-  }
-}
-
-@media (max-width: 1199.98px) {
-  .navbar-expand-xl > .container,
-  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {
-    padding-right: 0;
-    padding-left: 0;
-  }
-}
-
-@media (min-width: 1200px) {
-  .navbar-expand-xl {
-    -ms-flex-flow: row nowrap;
-    flex-flow: row nowrap;
-    -ms-flex-pack: start;
-    justify-content: flex-start;
-  }
-  .navbar-expand-xl .navbar-nav {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .navbar-expand-xl .navbar-nav .dropdown-menu {
-    position: absolute;
-  }
-  .navbar-expand-xl .navbar-nav .nav-link {
-    padding-right: 0.5rem;
-    padding-left: 0.5rem;
-  }
-  .navbar-expand-xl > .container,
-  .navbar-expand-xl > .container-fluid, .navbar-expand-xl > .container-sm, .navbar-expand-xl > .container-md, .navbar-expand-xl > .container-lg, .navbar-expand-xl > .container-xl {
-    -ms-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-  }
-  .navbar-expand-xl .navbar-collapse {
-    display: -ms-flexbox !important;
-    display: flex !important;
-    -ms-flex-preferred-size: auto;
-    flex-basis: auto;
-  }
-  .navbar-expand-xl .navbar-toggler {
-    display: none;
-  }
-}
-
-.navbar-expand {
-  -ms-flex-flow: row nowrap;
-  flex-flow: row nowrap;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-}
-
-.navbar-expand > .container,
-.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {
-  padding-right: 0;
-  padding-left: 0;
-}
-
-.navbar-expand .navbar-nav {
-  -ms-flex-direction: row;
-  flex-direction: row;
-}
-
-.navbar-expand .navbar-nav .dropdown-menu {
-  position: absolute;
-}
-
-.navbar-expand .navbar-nav .nav-link {
-  padding-right: 0.5rem;
-  padding-left: 0.5rem;
-}
-
-.navbar-expand > .container,
-.navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl {
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-}
-
-.navbar-expand .navbar-collapse {
-  display: -ms-flexbox !important;
-  display: flex !important;
-  -ms-flex-preferred-size: auto;
-  flex-basis: auto;
-}
-
-.navbar-expand .navbar-toggler {
-  display: none;
-}
-
-.navbar-light .navbar-brand {
-  color: rgba(0, 0, 0, 0.9);
-}
-
-.navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus {
-  color: rgba(0, 0, 0, 0.9);
-}
-
-.navbar-light .navbar-nav .nav-link {
-  color: rgba(0, 0, 0, 0.5);
-}
-
-.navbar-light .navbar-nav .nav-link:hover, .navbar-light .navbar-nav .nav-link:focus {
-  color: rgba(0, 0, 0, 0.7);
-}
-
-.navbar-light .navbar-nav .nav-link.disabled {
-  color: rgba(0, 0, 0, 0.3);
-}
-
-.navbar-light .navbar-nav .show > .nav-link,
-.navbar-light .navbar-nav .active > .nav-link,
-.navbar-light .navbar-nav .nav-link.show,
-.navbar-light .navbar-nav .nav-link.active {
-  color: rgba(0, 0, 0, 0.9);
-}
-
-.navbar-light .navbar-toggler {
-  color: rgba(0, 0, 0, 0.5);
-  border-color: rgba(0, 0, 0, 0.1);
-}
-
-.navbar-light .navbar-toggler-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(0, 0, 0, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
-}
-
-.navbar-light .navbar-text {
-  color: rgba(0, 0, 0, 0.5);
-}
-
-.navbar-light .navbar-text a {
-  color: rgba(0, 0, 0, 0.9);
-}
-
-.navbar-light .navbar-text a:hover, .navbar-light .navbar-text a:focus {
-  color: rgba(0, 0, 0, 0.9);
-}
-
-.navbar-dark .navbar-brand {
-  color: #fff;
-}
-
-.navbar-dark .navbar-brand:hover, .navbar-dark .navbar-brand:focus {
-  color: #fff;
-}
-
-.navbar-dark .navbar-nav .nav-link {
-  color: rgba(255, 255, 255, 0.5);
-}
-
-.navbar-dark .navbar-nav .nav-link:hover, .navbar-dark .navbar-nav .nav-link:focus {
-  color: rgba(255, 255, 255, 0.75);
-}
-
-.navbar-dark .navbar-nav .nav-link.disabled {
-  color: rgba(255, 255, 255, 0.25);
-}
-
-.navbar-dark .navbar-nav .show > .nav-link,
-.navbar-dark .navbar-nav .active > .nav-link,
-.navbar-dark .navbar-nav .nav-link.show,
-.navbar-dark .navbar-nav .nav-link.active {
-  color: #fff;
-}
-
-.navbar-dark .navbar-toggler {
-  color: rgba(255, 255, 255, 0.5);
-  border-color: rgba(255, 255, 255, 0.1);
-}
-
-.navbar-dark .navbar-toggler-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
-}
-
-.navbar-dark .navbar-text {
-  color: rgba(255, 255, 255, 0.5);
-}
-
-.navbar-dark .navbar-text a {
-  color: #fff;
-}
-
-.navbar-dark .navbar-text a:hover, .navbar-dark .navbar-text a:focus {
-  color: #fff;
-}
-
-.card {
-  position: relative;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  min-width: 0;
-  word-wrap: break-word;
-  background-color: #fff;
-  background-clip: border-box;
-  border: 1px solid rgba(0, 0, 0, 0.125);
-  border-radius: 0.25rem;
-}
-
-.card > hr {
-  margin-right: 0;
-  margin-left: 0;
-}
-
-.card > .list-group:first-child .list-group-item:first-child {
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
-}
-
-.card > .list-group:last-child .list-group-item:last-child {
-  border-bottom-right-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
-}
-
-.card-body {
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  min-height: 1px;
-  padding: 1.25rem;
-}
-
-.card-title {
-  margin-bottom: 0.75rem;
-}
-
-.card-subtitle {
-  margin-top: -0.375rem;
-  margin-bottom: 0;
-}
-
-.card-text:last-child {
-  margin-bottom: 0;
-}
-
-.card-link:hover {
-  text-decoration: none;
-}
-
-.card-link + .card-link {
-  margin-left: 1.25rem;
-}
-
-.card-header {
-  padding: 0.75rem 1.25rem;
-  margin-bottom: 0;
-  background-color: rgba(0, 0, 0, 0.03);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.card-header:first-child {
-  border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
-}
-
-.card-header + .list-group .list-group-item:first-child {
-  border-top: 0;
-}
-
-.card-footer {
-  padding: 0.75rem 1.25rem;
-  background-color: rgba(0, 0, 0, 0.03);
-  border-top: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.card-footer:last-child {
-  border-radius: 0 0 calc(0.25rem - 1px) calc(0.25rem - 1px);
-}
-
-.card-header-tabs {
-  margin-right: -0.625rem;
-  margin-bottom: -0.75rem;
-  margin-left: -0.625rem;
-  border-bottom: 0;
-}
-
-.card-header-pills {
-  margin-right: -0.625rem;
-  margin-left: -0.625rem;
-}
-
-.card-img-overlay {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 1.25rem;
-}
-
-.card-img,
-.card-img-top,
-.card-img-bottom {
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-  width: 100%;
-}
-
-.card-img,
-.card-img-top {
-  border-top-left-radius: calc(0.25rem - 1px);
-  border-top-right-radius: calc(0.25rem - 1px);
-}
-
-.card-img,
-.card-img-bottom {
-  border-bottom-right-radius: calc(0.25rem - 1px);
-  border-bottom-left-radius: calc(0.25rem - 1px);
-}
-
-.card-deck .card {
-  margin-bottom: 15px;
-}
-
-@media (min-width: 576px) {
-  .card-deck {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-flow: row wrap;
-    flex-flow: row wrap;
-    margin-right: -15px;
-    margin-left: -15px;
-  }
-  .card-deck .card {
-    -ms-flex: 1 0 0%;
-    flex: 1 0 0%;
-    margin-right: 15px;
-    margin-bottom: 0;
-    margin-left: 15px;
-  }
-}
-
-.card-group > .card {
-  margin-bottom: 15px;
-}
-
-@media (min-width: 576px) {
-  .card-group {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-flow: row wrap;
-    flex-flow: row wrap;
-  }
-  .card-group > .card {
-    -ms-flex: 1 0 0%;
-    flex: 1 0 0%;
-    margin-bottom: 0;
-  }
-  .card-group > .card + .card {
-    margin-left: 0;
-    border-left: 0;
-  }
-  .card-group > .card:not(:last-child) {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-  .card-group > .card:not(:last-child) .card-img-top,
-  .card-group > .card:not(:last-child) .card-header {
-    border-top-right-radius: 0;
-  }
-  .card-group > .card:not(:last-child) .card-img-bottom,
-  .card-group > .card:not(:last-child) .card-footer {
-    border-bottom-right-radius: 0;
-  }
-  .card-group > .card:not(:first-child) {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-  .card-group > .card:not(:first-child) .card-img-top,
-  .card-group > .card:not(:first-child) .card-header {
-    border-top-left-radius: 0;
-  }
-  .card-group > .card:not(:first-child) .card-img-bottom,
-  .card-group > .card:not(:first-child) .card-footer {
-    border-bottom-left-radius: 0;
-  }
-}
-
-.card-columns .card {
-  margin-bottom: 0.75rem;
-}
-
-@media (min-width: 576px) {
-  .card-columns {
-    -webkit-column-count: 3;
-    -moz-column-count: 3;
-    column-count: 3;
-    -webkit-column-gap: 1.25rem;
-    -moz-column-gap: 1.25rem;
-    column-gap: 1.25rem;
-    orphans: 1;
-    widows: 1;
-  }
-  .card-columns .card {
-    display: inline-block;
-    width: 100%;
-  }
-}
-
-.accordion > .card {
-  overflow: hidden;
-}
-
-.accordion > .card:not(:last-of-type) {
-  border-bottom: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.accordion > .card:not(:first-of-type) {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
-
-.accordion > .card > .card-header {
-  border-radius: 0;
-  margin-bottom: -1px;
-}
-
-.breadcrumb {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  padding: 0.75rem 1rem;
-  margin-bottom: 1rem;
-  list-style: none;
-  background-color: #e9ecef;
-  border-radius: 0.25rem;
-}
-
-.breadcrumb-item + .breadcrumb-item {
-  padding-left: 0.5rem;
-}
-
-.breadcrumb-item + .breadcrumb-item::before {
-  display: inline-block;
-  padding-right: 0.5rem;
-  color: #6c757d;
-  content: "/";
-}
-
-.breadcrumb-item + .breadcrumb-item:hover::before {
-  text-decoration: underline;
-}
-
-.breadcrumb-item + .breadcrumb-item:hover::before {
-  text-decoration: none;
-}
-
-.breadcrumb-item.active {
-  color: #6c757d;
-}
-
-.pagination {
-  display: -ms-flexbox;
-  display: flex;
-  padding-left: 0;
-  list-style: none;
-  border-radius: 0.25rem;
-}
-
-.page-link {
-  position: relative;
-  display: block;
-  padding: 0.5rem 0.75rem;
-  margin-left: -1px;
-  line-height: 1.25;
-  color: #007bff;
-  background-color: #fff;
-  border: 1px solid #dee2e6;
-}
-
-.page-link:hover {
-  z-index: 2;
-  color: #0056b3;
-  text-decoration: none;
-  background-color: #e9ecef;
-  border-color: #dee2e6;
-}
-
-.page-link:focus {
-  z-index: 3;
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);
-}
-
-.page-item:first-child .page-link {
-  margin-left: 0;
-  border-top-left-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
-}
-
-.page-item:last-child .page-link {
-  border-top-right-radius: 0.25rem;
-  border-bottom-right-radius: 0.25rem;
-}
-
-.page-item.active .page-link {
-  z-index: 3;
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
-}
-
-.page-item.disabled .page-link {
-  color: #6c757d;
-  pointer-events: none;
-  cursor: auto;
-  background-color: #fff;
-  border-color: #dee2e6;
-}
-
-.pagination-lg .page-link {
-  padding: 0.75rem 1.5rem;
-  font-size: 1.25rem;
-  line-height: 1.5;
-}
-
-.pagination-lg .page-item:first-child .page-link {
-  border-top-left-radius: 0.3rem;
-  border-bottom-left-radius: 0.3rem;
-}
-
-.pagination-lg .page-item:last-child .page-link {
-  border-top-right-radius: 0.3rem;
-  border-bottom-right-radius: 0.3rem;
-}
-
-.pagination-sm .page-link {
-  padding: 0.25rem 0.5rem;
-  font-size: 0.875rem;
-  line-height: 1.5;
-}
-
-.pagination-sm .page-item:first-child .page-link {
-  border-top-left-radius: 0.2rem;
-  border-bottom-left-radius: 0.2rem;
-}
-
-.pagination-sm .page-item:last-child .page-link {
-  border-top-right-radius: 0.2rem;
-  border-bottom-right-radius: 0.2rem;
-}
-
-.badge {
-  display: inline-block;
-  padding: 0.25em 0.4em;
-  font-size: 75%;
-  font-weight: 700;
-  line-height: 1;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: 0.25rem;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .badge {
-    transition: none;
-  }
-}
-
-a.badge:hover, a.badge:focus {
-  text-decoration: none;
-}
-
-.badge:empty {
-  display: none;
-}
-
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
-.badge-pill {
-  padding-right: 0.6em;
-  padding-left: 0.6em;
-  border-radius: 10rem;
-}
-
-.badge-primary {
-  color: #fff;
-  background-color: #007bff;
-}
-
-a.badge-primary:hover, a.badge-primary:focus {
-  color: #fff;
-  background-color: #0062cc;
-}
-
-a.badge-primary:focus, a.badge-primary.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.5);
-}
-
-.badge-secondary {
-  color: #fff;
-  background-color: #6c757d;
-}
-
-a.badge-secondary:hover, a.badge-secondary:focus {
-  color: #fff;
-  background-color: #545b62;
-}
-
-a.badge-secondary:focus, a.badge-secondary.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(108, 117, 125, 0.5);
-}
-
-.badge-success {
-  color: #fff;
-  background-color: #28a745;
-}
-
-a.badge-success:hover, a.badge-success:focus {
-  color: #fff;
-  background-color: #1e7e34;
-}
-
-a.badge-success:focus, a.badge-success.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
-}
-
-.badge-info {
-  color: #fff;
-  background-color: #17a2b8;
-}
-
-a.badge-info:hover, a.badge-info:focus {
-  color: #fff;
-  background-color: #117a8b;
-}
-
-a.badge-info:focus, a.badge-info.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(23, 162, 184, 0.5);
-}
-
-.badge-warning {
-  color: #212529;
-  background-color: #ffc107;
-}
-
-a.badge-warning:hover, a.badge-warning:focus {
-  color: #212529;
-  background-color: #d39e00;
-}
-
-a.badge-warning:focus, a.badge-warning.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(255, 193, 7, 0.5);
-}
-
-.badge-danger {
-  color: #fff;
-  background-color: #dc3545;
-}
-
-a.badge-danger:hover, a.badge-danger:focus {
-  color: #fff;
-  background-color: #bd2130;
-}
-
-a.badge-danger:focus, a.badge-danger.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.5);
-}
-
-.badge-light {
-  color: #212529;
-  background-color: #f8f9fa;
-}
-
-a.badge-light:hover, a.badge-light:focus {
-  color: #212529;
-  background-color: #dae0e5;
-}
-
-a.badge-light:focus, a.badge-light.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(248, 249, 250, 0.5);
-}
-
-.badge-dark {
-  color: #fff;
-  background-color: #343a40;
-}
-
-a.badge-dark:hover, a.badge-dark:focus {
-  color: #fff;
-  background-color: #1d2124;
-}
-
-a.badge-dark:focus, a.badge-dark.focus {
-  outline: 0;
-  box-shadow: 0 0 0 0.2rem rgba(52, 58, 64, 0.5);
-}
-
-.jumbotron {
-  padding: 2rem 1rem;
-  margin-bottom: 2rem;
-  background-color: #e9ecef;
-  border-radius: 0.3rem;
-}
-
-@media (min-width: 576px) {
-  .jumbotron {
-    padding: 4rem 2rem;
-  }
-}
-
-.jumbotron-fluid {
-  padding-right: 0;
-  padding-left: 0;
-  border-radius: 0;
-}
-
-.alert {
-  position: relative;
-  padding: 0.75rem 1.25rem;
-  margin-bottom: 1rem;
-  border: 1px solid transparent;
-  border-radius: 0.25rem;
-}
-
-.alert-heading {
-  color: inherit;
-}
-
-.alert-link {
-  font-weight: 700;
-}
-
-.alert-dismissible {
-  padding-right: 4rem;
-}
-
-.alert-dismissible .close {
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding: 0.75rem 1.25rem;
-  color: inherit;
-}
-
-.alert-primary {
-  color: #004085;
-  background-color: #cce5ff;
-  border-color: #b8daff;
-}
-
-.alert-primary hr {
-  border-top-color: #9fcdff;
-}
-
-.alert-primary .alert-link {
-  color: #002752;
-}
-
-.alert-secondary {
-  color: #383d41;
-  background-color: #e2e3e5;
-  border-color: #d6d8db;
-}
-
-.alert-secondary hr {
-  border-top-color: #c8cbcf;
-}
-
-.alert-secondary .alert-link {
-  color: #202326;
-}
-
-.alert-success {
-  color: #155724;
-  background-color: #d4edda;
-  border-color: #c3e6cb;
-}
-
-.alert-success hr {
-  border-top-color: #b1dfbb;
-}
-
-.alert-success .alert-link {
-  color: #0b2e13;
-}
-
-.alert-info {
-  color: #0c5460;
-  background-color: #d1ecf1;
-  border-color: #bee5eb;
-}
-
-.alert-info hr {
-  border-top-color: #abdde5;
-}
-
-.alert-info .alert-link {
-  color: #062c33;
-}
-
-.alert-warning {
-  color: #856404;
-  background-color: #fff3cd;
-  border-color: #ffeeba;
-}
-
-.alert-warning hr {
-  border-top-color: #ffe8a1;
-}
-
-.alert-warning .alert-link {
-  color: #533f03;
-}
-
-.alert-danger {
-  color: #721c24;
-  background-color: #f8d7da;
-  border-color: #f5c6cb;
-}
-
-.alert-danger hr {
-  border-top-color: #f1b0b7;
-}
-
-.alert-danger .alert-link {
-  color: #491217;
-}
-
-.alert-light {
-  color: #818182;
-  background-color: #fefefe;
-  border-color: #fdfdfe;
-}
-
-.alert-light hr {
-  border-top-color: #ececf6;
-}
-
-.alert-light .alert-link {
-  color: #686868;
-}
-
-.alert-dark {
-  color: #1b1e21;
-  background-color: #d6d8d9;
-  border-color: #c6c8ca;
-}
-
-.alert-dark hr {
-  border-top-color: #b9bbbe;
-}
-
-.alert-dark .alert-link {
-  color: #040505;
-}
-
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 1rem 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 1rem 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-.progress {
-  display: -ms-flexbox;
-  display: flex;
-  height: 1rem;
-  overflow: hidden;
-  font-size: 0.75rem;
-  background-color: #e9ecef;
-  border-radius: 0.25rem;
-}
-
-.progress-bar {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -ms-flex-pack: center;
-  justify-content: center;
-  overflow: hidden;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  background-color: #007bff;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .progress-bar {
-    transition: none;
-  }
-}
-
-.progress-bar-striped {
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-size: 1rem 1rem;
-}
-
-.progress-bar-animated {
-  -webkit-animation: progress-bar-stripes 1s linear infinite;
-  animation: progress-bar-stripes 1s linear infinite;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .progress-bar-animated {
-    -webkit-animation: none;
-    animation: none;
-  }
-}
-
-.media {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: start;
-  align-items: flex-start;
-}
-
-.media-body {
-  -ms-flex: 1;
-  flex: 1;
-}
-
-.list-group {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  padding-left: 0;
-  margin-bottom: 0;
-}
-
-.list-group-item-action {
-  width: 100%;
-  color: #495057;
-  text-align: inherit;
-}
-
-.list-group-item-action:hover, .list-group-item-action:focus {
-  z-index: 1;
-  color: #495057;
-  text-decoration: none;
-  background-color: #f8f9fa;
-}
-
-.list-group-item-action:active {
-  color: #212529;
-  background-color: #e9ecef;
-}
-
-.list-group-item {
-  position: relative;
-  display: block;
-  padding: 0.75rem 1.25rem;
-  background-color: #fff;
-  border: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.list-group-item:first-child {
-  border-top-left-radius: 0.25rem;
-  border-top-right-radius: 0.25rem;
-}
-
-.list-group-item:last-child {
-  border-bottom-right-radius: 0.25rem;
-  border-bottom-left-radius: 0.25rem;
-}
-
-.list-group-item.disabled, .list-group-item:disabled {
-  color: #6c757d;
-  pointer-events: none;
-  background-color: #fff;
-}
-
-.list-group-item.active {
-  z-index: 2;
-  color: #fff;
-  background-color: #007bff;
-  border-color: #007bff;
-}
-
-.list-group-item + .list-group-item {
-  border-top-width: 0;
-}
-
-.list-group-item + .list-group-item.active {
-  margin-top: -1px;
-  border-top-width: 1px;
-}
-
-.list-group-horizontal {
-  -ms-flex-direction: row;
-  flex-direction: row;
-}
-
-.list-group-horizontal .list-group-item:first-child {
-  border-bottom-left-radius: 0.25rem;
-  border-top-right-radius: 0;
-}
-
-.list-group-horizontal .list-group-item:last-child {
-  border-top-right-radius: 0.25rem;
-  border-bottom-left-radius: 0;
-}
-
-.list-group-horizontal .list-group-item.active {
-  margin-top: 0;
-}
-
-.list-group-horizontal .list-group-item + .list-group-item {
-  border-top-width: 1px;
-  border-left-width: 0;
-}
-
-.list-group-horizontal .list-group-item + .list-group-item.active {
-  margin-left: -1px;
-  border-left-width: 1px;
-}
-
-@media (min-width: 576px) {
-  .list-group-horizontal-sm {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .list-group-horizontal-sm .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
-    border-top-right-radius: 0;
-  }
-  .list-group-horizontal-sm .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
-    border-bottom-left-radius: 0;
-  }
-  .list-group-horizontal-sm .list-group-item.active {
-    margin-top: 0;
-  }
-  .list-group-horizontal-sm .list-group-item + .list-group-item {
-    border-top-width: 1px;
-    border-left-width: 0;
-  }
-  .list-group-horizontal-sm .list-group-item + .list-group-item.active {
-    margin-left: -1px;
-    border-left-width: 1px;
-  }
-}
-
-@media (min-width: 768px) {
-  .list-group-horizontal-md {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .list-group-horizontal-md .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
-    border-top-right-radius: 0;
-  }
-  .list-group-horizontal-md .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
-    border-bottom-left-radius: 0;
-  }
-  .list-group-horizontal-md .list-group-item.active {
-    margin-top: 0;
-  }
-  .list-group-horizontal-md .list-group-item + .list-group-item {
-    border-top-width: 1px;
-    border-left-width: 0;
-  }
-  .list-group-horizontal-md .list-group-item + .list-group-item.active {
-    margin-left: -1px;
-    border-left-width: 1px;
-  }
-}
-
-@media (min-width: 992px) {
-  .list-group-horizontal-lg {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .list-group-horizontal-lg .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
-    border-top-right-radius: 0;
-  }
-  .list-group-horizontal-lg .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
-    border-bottom-left-radius: 0;
-  }
-  .list-group-horizontal-lg .list-group-item.active {
-    margin-top: 0;
-  }
-  .list-group-horizontal-lg .list-group-item + .list-group-item {
-    border-top-width: 1px;
-    border-left-width: 0;
-  }
-  .list-group-horizontal-lg .list-group-item + .list-group-item.active {
-    margin-left: -1px;
-    border-left-width: 1px;
-  }
-}
-
-@media (min-width: 1200px) {
-  .list-group-horizontal-xl {
-    -ms-flex-direction: row;
-    flex-direction: row;
-  }
-  .list-group-horizontal-xl .list-group-item:first-child {
-    border-bottom-left-radius: 0.25rem;
-    border-top-right-radius: 0;
-  }
-  .list-group-horizontal-xl .list-group-item:last-child {
-    border-top-right-radius: 0.25rem;
-    border-bottom-left-radius: 0;
-  }
-  .list-group-horizontal-xl .list-group-item.active {
-    margin-top: 0;
-  }
-  .list-group-horizontal-xl .list-group-item + .list-group-item {
-    border-top-width: 1px;
-    border-left-width: 0;
-  }
-  .list-group-horizontal-xl .list-group-item + .list-group-item.active {
-    margin-left: -1px;
-    border-left-width: 1px;
-  }
-}
-
-.list-group-flush .list-group-item {
-  border-right-width: 0;
-  border-left-width: 0;
-  border-radius: 0;
-}
-
-.list-group-flush .list-group-item:first-child {
-  border-top-width: 0;
-}
-
-.list-group-flush:last-child .list-group-item:last-child {
-  border-bottom-width: 0;
-}
-
-.list-group-item-primary {
-  color: #004085;
-  background-color: #b8daff;
-}
-
-.list-group-item-primary.list-group-item-action:hover, .list-group-item-primary.list-group-item-action:focus {
-  color: #004085;
-  background-color: #9fcdff;
-}
-
-.list-group-item-primary.list-group-item-action.active {
-  color: #fff;
-  background-color: #004085;
-  border-color: #004085;
-}
-
-.list-group-item-secondary {
-  color: #383d41;
-  background-color: #d6d8db;
-}
-
-.list-group-item-secondary.list-group-item-action:hover, .list-group-item-secondary.list-group-item-action:focus {
-  color: #383d41;
-  background-color: #c8cbcf;
-}
-
-.list-group-item-secondary.list-group-item-action.active {
-  color: #fff;
-  background-color: #383d41;
-  border-color: #383d41;
-}
-
-.list-group-item-success {
-  color: #155724;
-  background-color: #c3e6cb;
-}
-
-.list-group-item-success.list-group-item-action:hover, .list-group-item-success.list-group-item-action:focus {
-  color: #155724;
-  background-color: #b1dfbb;
-}
-
-.list-group-item-success.list-group-item-action.active {
-  color: #fff;
-  background-color: #155724;
-  border-color: #155724;
-}
-
-.list-group-item-info {
-  color: #0c5460;
-  background-color: #bee5eb;
-}
-
-.list-group-item-info.list-group-item-action:hover, .list-group-item-info.list-group-item-action:focus {
-  color: #0c5460;
-  background-color: #abdde5;
-}
-
-.list-group-item-info.list-group-item-action.active {
-  color: #fff;
-  background-color: #0c5460;
-  border-color: #0c5460;
-}
-
-.list-group-item-warning {
-  color: #856404;
-  background-color: #ffeeba;
-}
-
-.list-group-item-warning.list-group-item-action:hover, .list-group-item-warning.list-group-item-action:focus {
-  color: #856404;
-  background-color: #ffe8a1;
-}
-
-.list-group-item-warning.list-group-item-action.active {
-  color: #fff;
-  background-color: #856404;
-  border-color: #856404;
-}
-
-.list-group-item-danger {
-  color: #721c24;
-  background-color: #f5c6cb;
-}
-
-.list-group-item-danger.list-group-item-action:hover, .list-group-item-danger.list-group-item-action:focus {
-  color: #721c24;
-  background-color: #f1b0b7;
-}
-
-.list-group-item-danger.list-group-item-action.active {
-  color: #fff;
-  background-color: #721c24;
-  border-color: #721c24;
-}
-
-.list-group-item-light {
-  color: #818182;
-  background-color: #fdfdfe;
-}
-
-.list-group-item-light.list-group-item-action:hover, .list-group-item-light.list-group-item-action:focus {
-  color: #818182;
-  background-color: #ececf6;
-}
-
-.list-group-item-light.list-group-item-action.active {
-  color: #fff;
-  background-color: #818182;
-  border-color: #818182;
-}
-
-.list-group-item-dark {
-  color: #1b1e21;
-  background-color: #c6c8ca;
-}
-
-.list-group-item-dark.list-group-item-action:hover, .list-group-item-dark.list-group-item-action:focus {
-  color: #1b1e21;
-  background-color: #b9bbbe;
-}
-
-.list-group-item-dark.list-group-item-action.active {
-  color: #fff;
-  background-color: #1b1e21;
-  border-color: #1b1e21;
-}
-
-.close {
-  float: right;
-  font-size: 1.5rem;
-  font-weight: 700;
-  line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 #fff;
-  opacity: .5;
-}
-
-.close:hover {
-  color: #000;
-  text-decoration: none;
-}
-
-.close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus {
-  opacity: .75;
-}
-
-button.close {
-  padding: 0;
-  background-color: transparent;
-  border: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-}
-
-a.close.disabled {
-  pointer-events: none;
-}
-
-.toast {
-  max-width: 350px;
-  overflow: hidden;
-  font-size: 0.875rem;
-  background-color: rgba(255, 255, 255, 0.85);
-  background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
-  -webkit-backdrop-filter: blur(10px);
-  backdrop-filter: blur(10px);
-  opacity: 0;
-  border-radius: 0.25rem;
-}
-
-.toast:not(:last-child) {
-  margin-bottom: 0.75rem;
-}
-
-.toast.showing {
-  opacity: 1;
-}
-
-.toast.show {
-  display: block;
-  opacity: 1;
-}
-
-.toast.hide {
-  display: none;
-}
-
-.toast-header {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-  align-items: center;
-  padding: 0.25rem 0.75rem;
-  color: #6c757d;
-  background-color: rgba(255, 255, 255, 0.85);
-  background-clip: padding-box;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-}
-
-.toast-body {
-  padding: 0.75rem;
-}
-
-.modal-open {
-  overflow: hidden;
-}
-
-.modal-open .modal {
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1050;
-  display: none;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  outline: 0;
-}
-
-.modal-dialog {
-  position: relative;
-  width: auto;
-  margin: 0.5rem;
-  pointer-events: none;
-}
-
-.modal.fade .modal-dialog {
-  -webkit-transform: translate(0, -50px);
-  transform: translate(0, -50px);
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .modal.fade .modal-dialog {
-    transition: none;
-  }
-}
-
-.modal.show .modal-dialog {
-  -webkit-transform: none;
-  transform: none;
-}
-
-.modal.modal-static .modal-dialog {
-  -webkit-transform: scale(1.02);
-  transform: scale(1.02);
-}
-
-.modal-dialog-scrollable {
-  display: -ms-flexbox;
-  display: flex;
-  max-height: calc(100% - 1rem);
-}
-
-.modal-dialog-scrollable .modal-content {
-  max-height: calc(100vh - 1rem);
-  overflow: hidden;
-}
-
-.modal-dialog-scrollable .modal-header,
-.modal-dialog-scrollable .modal-footer {
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-}
-
-.modal-dialog-scrollable .modal-body {
-  overflow-y: auto;
-}
-
-.modal-dialog-centered {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-  align-items: center;
-  min-height: calc(100% - 1rem);
-}
-
-.modal-dialog-centered::before {
-  display: block;
-  height: calc(100vh - 1rem);
-  content: "";
-}
-
-.modal-dialog-centered.modal-dialog-scrollable {
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -ms-flex-pack: center;
-  justify-content: center;
-  height: 100%;
-}
-
-.modal-dialog-centered.modal-dialog-scrollable .modal-content {
-  max-height: none;
-}
-
-.modal-dialog-centered.modal-dialog-scrollable::before {
-  content: none;
-}
-
-.modal-content {
-  position: relative;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  width: 100%;
-  pointer-events: auto;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 0.3rem;
-  outline: 0;
-}
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 1040;
-  width: 100vw;
-  height: 100vh;
-  background-color: #000;
-}
-
-.modal-backdrop.fade {
-  opacity: 0;
-}
-
-.modal-backdrop.show {
-  opacity: 0.5;
-}
-
-.modal-header {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: start;
-  align-items: flex-start;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  padding: 1rem 1rem;
-  border-bottom: 1px solid #dee2e6;
-  border-top-left-radius: calc(0.3rem - 1px);
-  border-top-right-radius: calc(0.3rem - 1px);
-}
-
-.modal-header .close {
-  padding: 1rem 1rem;
-  margin: -1rem -1rem -1rem auto;
-}
-
-.modal-title {
-  margin-bottom: 0;
-  line-height: 1.5;
-}
-
-.modal-body {
-  position: relative;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  padding: 1rem;
-}
-
-.modal-footer {
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -ms-flex-align: center;
-  align-items: center;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  padding: 0.75rem;
-  border-top: 1px solid #dee2e6;
-  border-bottom-right-radius: calc(0.3rem - 1px);
-  border-bottom-left-radius: calc(0.3rem - 1px);
-}
-
-.modal-footer > * {
-  margin: 0.25rem;
-}
-
-.modal-scrollbar-measure {
-  position: absolute;
-  top: -9999px;
-  width: 50px;
-  height: 50px;
-  overflow: scroll;
-}
-
-@media (min-width: 576px) {
-  .modal-dialog {
-    max-width: 500px;
-    margin: 1.75rem auto;
-  }
-  .modal-dialog-scrollable {
-    max-height: calc(100% - 3.5rem);
-  }
-  .modal-dialog-scrollable .modal-content {
-    max-height: calc(100vh - 3.5rem);
-  }
-  .modal-dialog-centered {
-    min-height: calc(100% - 3.5rem);
-  }
-  .modal-dialog-centered::before {
-    height: calc(100vh - 3.5rem);
-  }
-  .modal-sm {
-    max-width: 300px;
-  }
-}
-
-@media (min-width: 992px) {
-  .modal-lg,
-  .modal-xl {
-    max-width: 800px;
-  }
-}
-
-@media (min-width: 1200px) {
-  .modal-xl {
-    max-width: 1140px;
-  }
-}
-
-.tooltip {
-  position: absolute;
-  z-index: 1070;
-  display: block;
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  font-style: normal;
-  font-weight: 400;
-  line-height: 1.5;
-  text-align: left;
-  text-align: start;
-  text-decoration: none;
-  text-shadow: none;
-  text-transform: none;
-  letter-spacing: normal;
-  word-break: normal;
-  word-spacing: normal;
-  white-space: normal;
-  line-break: auto;
-  font-size: 0.875rem;
-  word-wrap: break-word;
-  opacity: 0;
-}
-
-.tooltip.show {
-  opacity: 0.9;
-}
-
-.tooltip .arrow {
-  position: absolute;
-  display: block;
-  width: 0.8rem;
-  height: 0.4rem;
-}
-
-.tooltip .arrow::before {
-  position: absolute;
-  content: "";
-  border-color: transparent;
-  border-style: solid;
-}
-
-.bs-tooltip-top, .bs-tooltip-auto[x-placement^="top"] {
-  padding: 0.4rem 0;
-}
-
-.bs-tooltip-top .arrow, .bs-tooltip-auto[x-placement^="top"] .arrow {
-  bottom: 0;
-}
-
-.bs-tooltip-top .arrow::before, .bs-tooltip-auto[x-placement^="top"] .arrow::before {
-  top: 0;
-  border-width: 0.4rem 0.4rem 0;
-  border-top-color: #000;
-}
-
-.bs-tooltip-right, .bs-tooltip-auto[x-placement^="right"] {
-  padding: 0 0.4rem;
-}
-
-.bs-tooltip-right .arrow, .bs-tooltip-auto[x-placement^="right"] .arrow {
-  left: 0;
-  width: 0.4rem;
-  height: 0.8rem;
-}
-
-.bs-tooltip-right .arrow::before, .bs-tooltip-auto[x-placement^="right"] .arrow::before {
-  right: 0;
-  border-width: 0.4rem 0.4rem 0.4rem 0;
-  border-right-color: #000;
-}
-
-.bs-tooltip-bottom, .bs-tooltip-auto[x-placement^="bottom"] {
-  padding: 0.4rem 0;
-}
-
-.bs-tooltip-bottom .arrow, .bs-tooltip-auto[x-placement^="bottom"] .arrow {
-  top: 0;
-}
-
-.bs-tooltip-bottom .arrow::before, .bs-tooltip-auto[x-placement^="bottom"] .arrow::before {
-  bottom: 0;
-  border-width: 0 0.4rem 0.4rem;
-  border-bottom-color: #000;
-}
-
-.bs-tooltip-left, .bs-tooltip-auto[x-placement^="left"] {
-  padding: 0 0.4rem;
-}
-
-.bs-tooltip-left .arrow, .bs-tooltip-auto[x-placement^="left"] .arrow {
-  right: 0;
-  width: 0.4rem;
-  height: 0.8rem;
-}
-
-.bs-tooltip-left .arrow::before, .bs-tooltip-auto[x-placement^="left"] .arrow::before {
-  left: 0;
-  border-width: 0.4rem 0 0.4rem 0.4rem;
-  border-left-color: #000;
-}
-
-.tooltip-inner {
-  max-width: 200px;
-  padding: 0.25rem 0.5rem;
-  color: #fff;
-  text-align: center;
-  background-color: #000;
-  border-radius: 0.25rem;
-}
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1060;
-  display: block;
-  max-width: 276px;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  font-style: normal;
-  font-weight: 400;
-  line-height: 1.5;
-  text-align: left;
-  text-align: start;
-  text-decoration: none;
-  text-shadow: none;
-  text-transform: none;
-  letter-spacing: normal;
-  word-break: normal;
-  word-spacing: normal;
-  white-space: normal;
-  line-break: auto;
-  font-size: 0.875rem;
-  word-wrap: break-word;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 0.3rem;
-}
-
-.popover .arrow {
-  position: absolute;
-  display: block;
-  width: 1rem;
-  height: 0.5rem;
-  margin: 0 0.3rem;
-}
-
-.popover .arrow::before, .popover .arrow::after {
-  position: absolute;
-  display: block;
-  content: "";
-  border-color: transparent;
-  border-style: solid;
-}
-
-.bs-popover-top, .bs-popover-auto[x-placement^="top"] {
-  margin-bottom: 0.5rem;
-}
-
-.bs-popover-top > .arrow, .bs-popover-auto[x-placement^="top"] > .arrow {
-  bottom: calc(-0.5rem - 1px);
-}
-
-.bs-popover-top > .arrow::before, .bs-popover-auto[x-placement^="top"] > .arrow::before {
-  bottom: 0;
-  border-width: 0.5rem 0.5rem 0;
-  border-top-color: rgba(0, 0, 0, 0.25);
-}
-
-.bs-popover-top > .arrow::after, .bs-popover-auto[x-placement^="top"] > .arrow::after {
-  bottom: 1px;
-  border-width: 0.5rem 0.5rem 0;
-  border-top-color: #fff;
-}
-
-.bs-popover-right, .bs-popover-auto[x-placement^="right"] {
-  margin-left: 0.5rem;
-}
-
-.bs-popover-right > .arrow, .bs-popover-auto[x-placement^="right"] > .arrow {
-  left: calc(-0.5rem - 1px);
-  width: 0.5rem;
-  height: 1rem;
-  margin: 0.3rem 0;
-}
-
-.bs-popover-right > .arrow::before, .bs-popover-auto[x-placement^="right"] > .arrow::before {
-  left: 0;
-  border-width: 0.5rem 0.5rem 0.5rem 0;
-  border-right-color: rgba(0, 0, 0, 0.25);
-}
-
-.bs-popover-right > .arrow::after, .bs-popover-auto[x-placement^="right"] > .arrow::after {
-  left: 1px;
-  border-width: 0.5rem 0.5rem 0.5rem 0;
-  border-right-color: #fff;
-}
-
-.bs-popover-bottom, .bs-popover-auto[x-placement^="bottom"] {
-  margin-top: 0.5rem;
-}
-
-.bs-popover-bottom > .arrow, .bs-popover-auto[x-placement^="bottom"] > .arrow {
-  top: calc(-0.5rem - 1px);
-}
-
-.bs-popover-bottom > .arrow::before, .bs-popover-auto[x-placement^="bottom"] > .arrow::before {
-  top: 0;
-  border-width: 0 0.5rem 0.5rem 0.5rem;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
-}
-
-.bs-popover-bottom > .arrow::after, .bs-popover-auto[x-placement^="bottom"] > .arrow::after {
-  top: 1px;
-  border-width: 0 0.5rem 0.5rem 0.5rem;
-  border-bottom-color: #fff;
-}
-
-.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^="bottom"] .popover-header::before {
-  position: absolute;
-  top: 0;
-  left: 50%;
-  display: block;
-  width: 1rem;
-  margin-left: -0.5rem;
-  content: "";
-  border-bottom: 1px solid #f7f7f7;
-}
-
-.bs-popover-left, .bs-popover-auto[x-placement^="left"] {
-  margin-right: 0.5rem;
-}
-
-.bs-popover-left > .arrow, .bs-popover-auto[x-placement^="left"] > .arrow {
-  right: calc(-0.5rem - 1px);
-  width: 0.5rem;
-  height: 1rem;
-  margin: 0.3rem 0;
-}
-
-.bs-popover-left > .arrow::before, .bs-popover-auto[x-placement^="left"] > .arrow::before {
-  right: 0;
-  border-width: 0.5rem 0 0.5rem 0.5rem;
-  border-left-color: rgba(0, 0, 0, 0.25);
-}
-
-.bs-popover-left > .arrow::after, .bs-popover-auto[x-placement^="left"] > .arrow::after {
-  right: 1px;
-  border-width: 0.5rem 0 0.5rem 0.5rem;
-  border-left-color: #fff;
-}
-
-.popover-header {
-  padding: 0.5rem 0.75rem;
-  margin-bottom: 0;
-  font-size: 1rem;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  border-top-left-radius: calc(0.3rem - 1px);
-  border-top-right-radius: calc(0.3rem - 1px);
-}
-
-.popover-header:empty {
-  display: none;
-}
-
-.popover-body {
-  padding: 0.5rem 0.75rem;
-  color: #212529;
-}
-
-.carousel {
-  position: relative;
-}
-
-.carousel.pointer-event {
-  -ms-touch-action: pan-y;
-  touch-action: pan-y;
-}
-
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-.carousel-inner::after {
-  display: block;
-  clear: both;
-  content: "";
-}
-
-.carousel-item {
-  position: relative;
-  display: none;
-  float: left;
-  width: 100%;
-  margin-right: -100%;
-  -webkit-backface-visibility: hidden;
-  backface-visibility: hidden;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .carousel-item {
-    transition: none;
-  }
-}
-
-.carousel-item.active,
-.carousel-item-next,
-.carousel-item-prev {
-  display: block;
-}
-
-.carousel-item-next:not(.carousel-item-left),
-.active.carousel-item-right {
-  -webkit-transform: translateX(100%);
-  transform: translateX(100%);
-}
-
-.carousel-item-prev:not(.carousel-item-right),
-.active.carousel-item-left {
-  -webkit-transform: translateX(-100%);
-  transform: translateX(-100%);
-}
-
-.carousel-fade .carousel-item {
-  opacity: 0;
-  transition-property: opacity;
-  -webkit-transform: none;
-  transform: none;
-}
-
-.carousel-fade .carousel-item.active,
-.carousel-fade .carousel-item-next.carousel-item-left,
-.carousel-fade .carousel-item-prev.carousel-item-right {
-  z-index: 1;
-  opacity: 1;
-}
-
-.carousel-fade .active.carousel-item-left,
-.carousel-fade .active.carousel-item-right {
-  z-index: 0;
-  opacity: 0;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .carousel-fade .active.carousel-item-left,
-  .carousel-fade .active.carousel-item-right {
-    transition: none;
-  }
-}
-
-.carousel-control-prev,
-.carousel-control-next {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  z-index: 1;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-align: center;
-  align-items: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  width: 15%;
-  color: #fff;
-  text-align: center;
-  opacity: 0.5;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .carousel-control-prev,
-  .carousel-control-next {
-    transition: none;
-  }
-}
-
-.carousel-control-prev:hover, .carousel-control-prev:focus,
-.carousel-control-next:hover,
-.carousel-control-next:focus {
-  color: #fff;
-  text-decoration: none;
-  outline: 0;
-  opacity: 0.9;
-}
-
-.carousel-control-prev {
-  left: 0;
-}
-
-.carousel-control-next {
-  right: 0;
-}
-
-.carousel-control-prev-icon,
-.carousel-control-next-icon {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  background: no-repeat 50% / 100% 100%;
-}
-
-.carousel-control-prev-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e");
-}
-
-.carousel-control-next-icon {
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e");
-}
-
-.carousel-indicators {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 15;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-pack: center;
-  justify-content: center;
-  padding-left: 0;
-  margin-right: 15%;
-  margin-left: 15%;
-  list-style: none;
-}
-
-.carousel-indicators li {
-  box-sizing: content-box;
-  -ms-flex: 0 1 auto;
-  flex: 0 1 auto;
-  width: 30px;
-  height: 3px;
-  margin-right: 3px;
-  margin-left: 3px;
-  text-indent: -999px;
-  cursor: pointer;
-  background-color: #fff;
-  background-clip: padding-box;
-  border-top: 10px solid transparent;
-  border-bottom: 10px solid transparent;
-  opacity: .5;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  .carousel-indicators li {
-    transition: none;
-  }
-}
-
-.carousel-indicators .active {
-  opacity: 1;
-}
-
-.carousel-caption {
-  position: absolute;
-  right: 15%;
-  bottom: 20px;
-  left: 15%;
-  z-index: 10;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  color: #fff;
-  text-align: center;
-}
-
-@-webkit-keyframes spinner-border {
-  to {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes spinner-border {
-  to {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-
-.spinner-border {
-  display: inline-block;
-  width: 2rem;
-  height: 2rem;
-  vertical-align: text-bottom;
-  border: 0.25em solid currentColor;
-  border-right-color: transparent;
-  border-radius: 50%;
-  -webkit-animation: spinner-border .75s linear infinite;
-  animation: spinner-border .75s linear infinite;
-}
-
-.spinner-border-sm {
-  width: 1rem;
-  height: 1rem;
-  border-width: 0.2em;
-}
-
-@-webkit-keyframes spinner-grow {
-  0% {
-    -webkit-transform: scale(0);
-    transform: scale(0);
-  }
-  50% {
-    opacity: 1;
-  }
-}
-
-@keyframes spinner-grow {
-  0% {
-    -webkit-transform: scale(0);
-    transform: scale(0);
-  }
-  50% {
-    opacity: 1;
-  }
-}
-
-.spinner-grow {
-  display: inline-block;
-  width: 2rem;
-  height: 2rem;
-  vertical-align: text-bottom;
-  background-color: currentColor;
-  border-radius: 50%;
-  opacity: 0;
-  -webkit-animation: spinner-grow .75s linear infinite;
-  animation: spinner-grow .75s linear infinite;
-}
-
-.spinner-grow-sm {
-  width: 1rem;
-  height: 1rem;
-}
-
-.align-baseline {
-  vertical-align: baseline !important;
-}
-
-.align-top {
-  vertical-align: top !important;
-}
-
-.align-middle {
-  vertical-align: middle !important;
-}
-
-.align-bottom {
-  vertical-align: bottom !important;
-}
-
-.align-text-bottom {
-  vertical-align: text-bottom !important;
-}
-
-.align-text-top {
-  vertical-align: text-top !important;
-}
-
-.bg-primary {
-  background-color: #007bff !important;
-}
-
-a.bg-primary:hover, a.bg-primary:focus,
-button.bg-primary:hover,
-button.bg-primary:focus {
-  background-color: #0062cc !important;
-}
-
-.bg-secondary {
-  background-color: #6c757d !important;
-}
-
-a.bg-secondary:hover, a.bg-secondary:focus,
-button.bg-secondary:hover,
-button.bg-secondary:focus {
-  background-color: #545b62 !important;
-}
-
-.bg-success {
-  background-color: #28a745 !important;
-}
-
-a.bg-success:hover, a.bg-success:focus,
-button.bg-success:hover,
-button.bg-success:focus {
-  background-color: #1e7e34 !important;
-}
-
-.bg-info {
-  background-color: #17a2b8 !important;
-}
-
-a.bg-info:hover, a.bg-info:focus,
-button.bg-info:hover,
-button.bg-info:focus {
-  background-color: #117a8b !important;
-}
-
-.bg-warning {
-  background-color: #ffc107 !important;
-}
-
-a.bg-warning:hover, a.bg-warning:focus,
-button.bg-warning:hover,
-button.bg-warning:focus {
-  background-color: #d39e00 !important;
-}
-
-.bg-danger {
-  background-color: #dc3545 !important;
-}
-
-a.bg-danger:hover, a.bg-danger:focus,
-button.bg-danger:hover,
-button.bg-danger:focus {
-  background-color: #bd2130 !important;
-}
-
-.bg-light {
-  background-color: #f8f9fa !important;
-}
-
-a.bg-light:hover, a.bg-light:focus,
-button.bg-light:hover,
-button.bg-light:focus {
-  background-color: #dae0e5 !important;
-}
-
-.bg-dark {
-  background-color: #343a40 !important;
-}
-
-a.bg-dark:hover, a.bg-dark:focus,
-button.bg-dark:hover,
-button.bg-dark:focus {
-  background-color: #1d2124 !important;
-}
-
-.bg-white {
-  background-color: #fff !important;
-}
-
-.bg-transparent {
-  background-color: transparent !important;
-}
-
-.border {
-  border: 1px solid #dee2e6 !important;
-}
-
-.border-top {
-  border-top: 1px solid #dee2e6 !important;
-}
-
-.border-right {
-  border-right: 1px solid #dee2e6 !important;
-}
-
-.border-bottom {
-  border-bottom: 1px solid #dee2e6 !important;
-}
-
-.border-left {
-  border-left: 1px solid #dee2e6 !important;
-}
-
-.border-0 {
-  border: 0 !important;
-}
-
-.border-top-0 {
-  border-top: 0 !important;
-}
-
-.border-right-0 {
-  border-right: 0 !important;
-}
-
-.border-bottom-0 {
-  border-bottom: 0 !important;
-}
-
-.border-left-0 {
-  border-left: 0 !important;
-}
-
-.border-primary {
-  border-color: #007bff !important;
-}
-
-.border-secondary {
-  border-color: #6c757d !important;
-}
-
-.border-success {
-  border-color: #28a745 !important;
-}
-
-.border-info {
-  border-color: #17a2b8 !important;
-}
-
-.border-warning {
-  border-color: #ffc107 !important;
-}
-
-.border-danger {
-  border-color: #dc3545 !important;
-}
-
-.border-light {
-  border-color: #f8f9fa !important;
-}
-
-.border-dark {
-  border-color: #343a40 !important;
-}
-
-.border-white {
-  border-color: #fff !important;
-}
-
-.rounded-sm {
-  border-radius: 0.2rem !important;
-}
-
-.rounded {
-  border-radius: 0.25rem !important;
-}
-
-.rounded-top {
-  border-top-left-radius: 0.25rem !important;
-  border-top-right-radius: 0.25rem !important;
-}
-
-.rounded-right {
-  border-top-right-radius: 0.25rem !important;
-  border-bottom-right-radius: 0.25rem !important;
-}
-
-.rounded-bottom {
-  border-bottom-right-radius: 0.25rem !important;
-  border-bottom-left-radius: 0.25rem !important;
-}
-
-.rounded-left {
-  border-top-left-radius: 0.25rem !important;
-  border-bottom-left-radius: 0.25rem !important;
-}
-
-.rounded-lg {
-  border-radius: 0.3rem !important;
-}
-
-.rounded-circle {
-  border-radius: 50% !important;
-}
-
-.rounded-pill {
-  border-radius: 50rem !important;
-}
-
-.rounded-0 {
-  border-radius: 0 !important;
-}
-
-.clearfix::after {
-  display: block;
-  clear: both;
-  content: "";
-}
-
-.d-none {
-  display: none !important;
-}
-
-.d-inline {
-  display: inline !important;
-}
-
-.d-inline-block {
-  display: inline-block !important;
-}
-
-.d-block {
-  display: block !important;
-}
-
-.d-table {
-  display: table !important;
-}
-
-.d-table-row {
-  display: table-row !important;
-}
-
-.d-table-cell {
-  display: table-cell !important;
-}
-
-.d-flex {
-  display: -ms-flexbox !important;
-  display: flex !important;
-}
-
-.d-inline-flex {
-  display: -ms-inline-flexbox !important;
-  display: inline-flex !important;
-}
-
-@media (min-width: 576px) {
-  .d-sm-none {
-    display: none !important;
-  }
-  .d-sm-inline {
-    display: inline !important;
-  }
-  .d-sm-inline-block {
-    display: inline-block !important;
-  }
-  .d-sm-block {
-    display: block !important;
-  }
-  .d-sm-table {
-    display: table !important;
-  }
-  .d-sm-table-row {
-    display: table-row !important;
-  }
-  .d-sm-table-cell {
-    display: table-cell !important;
-  }
-  .d-sm-flex {
-    display: -ms-flexbox !important;
-    display: flex !important;
-  }
-  .d-sm-inline-flex {
-    display: -ms-inline-flexbox !important;
-    display: inline-flex !important;
-  }
-}
-
-@media (min-width: 768px) {
-  .d-md-none {
-    display: none !important;
-  }
-  .d-md-inline {
-    display: inline !important;
-  }
-  .d-md-inline-block {
-    display: inline-block !important;
-  }
-  .d-md-block {
-    display: block !important;
-  }
-  .d-md-table {
-    display: table !important;
-  }
-  .d-md-table-row {
-    display: table-row !important;
-  }
-  .d-md-table-cell {
-    display: table-cell !important;
-  }
-  .d-md-flex {
-    display: -ms-flexbox !important;
-    display: flex !important;
-  }
-  .d-md-inline-flex {
-    display: -ms-inline-flexbox !important;
-    display: inline-flex !important;
-  }
-}
-
-@media (min-width: 992px) {
-  .d-lg-none {
-    display: none !important;
-  }
-  .d-lg-inline {
-    display: inline !important;
-  }
-  .d-lg-inline-block {
-    display: inline-block !important;
-  }
-  .d-lg-block {
-    display: block !important;
-  }
-  .d-lg-table {
-    display: table !important;
-  }
-  .d-lg-table-row {
-    display: table-row !important;
-  }
-  .d-lg-table-cell {
-    display: table-cell !important;
-  }
-  .d-lg-flex {
-    display: -ms-flexbox !important;
-    display: flex !important;
-  }
-  .d-lg-inline-flex {
-    display: -ms-inline-flexbox !important;
-    display: inline-flex !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .d-xl-none {
-    display: none !important;
-  }
-  .d-xl-inline {
-    display: inline !important;
-  }
-  .d-xl-inline-block {
-    display: inline-block !important;
-  }
-  .d-xl-block {
-    display: block !important;
-  }
-  .d-xl-table {
-    display: table !important;
-  }
-  .d-xl-table-row {
-    display: table-row !important;
-  }
-  .d-xl-table-cell {
-    display: table-cell !important;
-  }
-  .d-xl-flex {
-    display: -ms-flexbox !important;
-    display: flex !important;
-  }
-  .d-xl-inline-flex {
-    display: -ms-inline-flexbox !important;
-    display: inline-flex !important;
-  }
-}
-
-@media print {
-  .d-print-none {
-    display: none !important;
-  }
-  .d-print-inline {
-    display: inline !important;
-  }
-  .d-print-inline-block {
-    display: inline-block !important;
-  }
-  .d-print-block {
-    display: block !important;
-  }
-  .d-print-table {
-    display: table !important;
-  }
-  .d-print-table-row {
-    display: table-row !important;
-  }
-  .d-print-table-cell {
-    display: table-cell !important;
-  }
-  .d-print-flex {
-    display: -ms-flexbox !important;
-    display: flex !important;
-  }
-  .d-print-inline-flex {
-    display: -ms-inline-flexbox !important;
-    display: inline-flex !important;
-  }
-}
-
-.embed-responsive {
-  position: relative;
-  display: block;
-  width: 100%;
-  padding: 0;
-  overflow: hidden;
-}
-
-.embed-responsive::before {
-  display: block;
-  content: "";
-}
-
-.embed-responsive .embed-responsive-item,
-.embed-responsive iframe,
-.embed-responsive embed,
-.embed-responsive object,
-.embed-responsive video {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  border: 0;
-}
-
-.embed-responsive-21by9::before {
-  padding-top: 42.857143%;
-}
-
-.embed-responsive-16by9::before {
-  padding-top: 56.25%;
-}
-
-.embed-responsive-4by3::before {
-  padding-top: 75%;
-}
-
-.embed-responsive-1by1::before {
-  padding-top: 100%;
-}
-
-.flex-row {
-  -ms-flex-direction: row !important;
-  flex-direction: row !important;
-}
-
-.flex-column {
-  -ms-flex-direction: column !important;
-  flex-direction: column !important;
-}
-
-.flex-row-reverse {
-  -ms-flex-direction: row-reverse !important;
-  flex-direction: row-reverse !important;
-}
-
-.flex-column-reverse {
-  -ms-flex-direction: column-reverse !important;
-  flex-direction: column-reverse !important;
-}
-
-.flex-wrap {
-  -ms-flex-wrap: wrap !important;
-  flex-wrap: wrap !important;
-}
-
-.flex-nowrap {
-  -ms-flex-wrap: nowrap !important;
-  flex-wrap: nowrap !important;
-}
-
-.flex-wrap-reverse {
-  -ms-flex-wrap: wrap-reverse !important;
-  flex-wrap: wrap-reverse !important;
-}
-
-.flex-fill {
-  -ms-flex: 1 1 auto !important;
-  flex: 1 1 auto !important;
-}
-
-.flex-grow-0 {
-  -ms-flex-positive: 0 !important;
-  flex-grow: 0 !important;
-}
-
-.flex-grow-1 {
-  -ms-flex-positive: 1 !important;
-  flex-grow: 1 !important;
-}
-
-.flex-shrink-0 {
-  -ms-flex-negative: 0 !important;
-  flex-shrink: 0 !important;
-}
-
-.flex-shrink-1 {
-  -ms-flex-negative: 1 !important;
-  flex-shrink: 1 !important;
-}
-
-.justify-content-start {
-  -ms-flex-pack: start !important;
-  justify-content: flex-start !important;
-}
-
-.justify-content-end {
-  -ms-flex-pack: end !important;
-  justify-content: flex-end !important;
-}
-
-.justify-content-center {
-  -ms-flex-pack: center !important;
-  justify-content: center !important;
-}
-
-.justify-content-between {
-  -ms-flex-pack: justify !important;
-  justify-content: space-between !important;
-}
-
-.justify-content-around {
-  -ms-flex-pack: distribute !important;
-  justify-content: space-around !important;
-}
-
-.align-items-start {
-  -ms-flex-align: start !important;
-  align-items: flex-start !important;
-}
-
-.align-items-end {
-  -ms-flex-align: end !important;
-  align-items: flex-end !important;
-}
-
-.align-items-center {
-  -ms-flex-align: center !important;
-  align-items: center !important;
-}
-
-.align-items-baseline {
-  -ms-flex-align: baseline !important;
-  align-items: baseline !important;
-}
-
-.align-items-stretch {
-  -ms-flex-align: stretch !important;
-  align-items: stretch !important;
-}
-
-.align-content-start {
-  -ms-flex-line-pack: start !important;
-  align-content: flex-start !important;
-}
-
-.align-content-end {
-  -ms-flex-line-pack: end !important;
-  align-content: flex-end !important;
-}
-
-.align-content-center {
-  -ms-flex-line-pack: center !important;
-  align-content: center !important;
-}
-
-.align-content-between {
-  -ms-flex-line-pack: justify !important;
-  align-content: space-between !important;
-}
-
-.align-content-around {
-  -ms-flex-line-pack: distribute !important;
-  align-content: space-around !important;
-}
-
-.align-content-stretch {
-  -ms-flex-line-pack: stretch !important;
-  align-content: stretch !important;
-}
-
-.align-self-auto {
-  -ms-flex-item-align: auto !important;
-  align-self: auto !important;
-}
-
-.align-self-start {
-  -ms-flex-item-align: start !important;
-  align-self: flex-start !important;
-}
-
-.align-self-end {
-  -ms-flex-item-align: end !important;
-  align-self: flex-end !important;
-}
-
-.align-self-center {
-  -ms-flex-item-align: center !important;
-  align-self: center !important;
-}
-
-.align-self-baseline {
-  -ms-flex-item-align: baseline !important;
-  align-self: baseline !important;
-}
-
-.align-self-stretch {
-  -ms-flex-item-align: stretch !important;
-  align-self: stretch !important;
-}
-
-@media (min-width: 576px) {
-  .flex-sm-row {
-    -ms-flex-direction: row !important;
-    flex-direction: row !important;
-  }
-  .flex-sm-column {
-    -ms-flex-direction: column !important;
-    flex-direction: column !important;
-  }
-  .flex-sm-row-reverse {
-    -ms-flex-direction: row-reverse !important;
-    flex-direction: row-reverse !important;
-  }
-  .flex-sm-column-reverse {
-    -ms-flex-direction: column-reverse !important;
-    flex-direction: column-reverse !important;
-  }
-  .flex-sm-wrap {
-    -ms-flex-wrap: wrap !important;
-    flex-wrap: wrap !important;
-  }
-  .flex-sm-nowrap {
-    -ms-flex-wrap: nowrap !important;
-    flex-wrap: nowrap !important;
-  }
-  .flex-sm-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
-    flex-wrap: wrap-reverse !important;
-  }
-  .flex-sm-fill {
-    -ms-flex: 1 1 auto !important;
-    flex: 1 1 auto !important;
-  }
-  .flex-sm-grow-0 {
-    -ms-flex-positive: 0 !important;
-    flex-grow: 0 !important;
-  }
-  .flex-sm-grow-1 {
-    -ms-flex-positive: 1 !important;
-    flex-grow: 1 !important;
-  }
-  .flex-sm-shrink-0 {
-    -ms-flex-negative: 0 !important;
-    flex-shrink: 0 !important;
-  }
-  .flex-sm-shrink-1 {
-    -ms-flex-negative: 1 !important;
-    flex-shrink: 1 !important;
-  }
-  .justify-content-sm-start {
-    -ms-flex-pack: start !important;
-    justify-content: flex-start !important;
-  }
-  .justify-content-sm-end {
-    -ms-flex-pack: end !important;
-    justify-content: flex-end !important;
-  }
-  .justify-content-sm-center {
-    -ms-flex-pack: center !important;
-    justify-content: center !important;
-  }
-  .justify-content-sm-between {
-    -ms-flex-pack: justify !important;
-    justify-content: space-between !important;
-  }
-  .justify-content-sm-around {
-    -ms-flex-pack: distribute !important;
-    justify-content: space-around !important;
-  }
-  .align-items-sm-start {
-    -ms-flex-align: start !important;
-    align-items: flex-start !important;
-  }
-  .align-items-sm-end {
-    -ms-flex-align: end !important;
-    align-items: flex-end !important;
-  }
-  .align-items-sm-center {
-    -ms-flex-align: center !important;
-    align-items: center !important;
-  }
-  .align-items-sm-baseline {
-    -ms-flex-align: baseline !important;
-    align-items: baseline !important;
-  }
-  .align-items-sm-stretch {
-    -ms-flex-align: stretch !important;
-    align-items: stretch !important;
-  }
-  .align-content-sm-start {
-    -ms-flex-line-pack: start !important;
-    align-content: flex-start !important;
-  }
-  .align-content-sm-end {
-    -ms-flex-line-pack: end !important;
-    align-content: flex-end !important;
-  }
-  .align-content-sm-center {
-    -ms-flex-line-pack: center !important;
-    align-content: center !important;
-  }
-  .align-content-sm-between {
-    -ms-flex-line-pack: justify !important;
-    align-content: space-between !important;
-  }
-  .align-content-sm-around {
-    -ms-flex-line-pack: distribute !important;
-    align-content: space-around !important;
-  }
-  .align-content-sm-stretch {
-    -ms-flex-line-pack: stretch !important;
-    align-content: stretch !important;
-  }
-  .align-self-sm-auto {
-    -ms-flex-item-align: auto !important;
-    align-self: auto !important;
-  }
-  .align-self-sm-start {
-    -ms-flex-item-align: start !important;
-    align-self: flex-start !important;
-  }
-  .align-self-sm-end {
-    -ms-flex-item-align: end !important;
-    align-self: flex-end !important;
-  }
-  .align-self-sm-center {
-    -ms-flex-item-align: center !important;
-    align-self: center !important;
-  }
-  .align-self-sm-baseline {
-    -ms-flex-item-align: baseline !important;
-    align-self: baseline !important;
-  }
-  .align-self-sm-stretch {
-    -ms-flex-item-align: stretch !important;
-    align-self: stretch !important;
-  }
-}
-
-@media (min-width: 768px) {
-  .flex-md-row {
-    -ms-flex-direction: row !important;
-    flex-direction: row !important;
-  }
-  .flex-md-column {
-    -ms-flex-direction: column !important;
-    flex-direction: column !important;
-  }
-  .flex-md-row-reverse {
-    -ms-flex-direction: row-reverse !important;
-    flex-direction: row-reverse !important;
-  }
-  .flex-md-column-reverse {
-    -ms-flex-direction: column-reverse !important;
-    flex-direction: column-reverse !important;
-  }
-  .flex-md-wrap {
-    -ms-flex-wrap: wrap !important;
-    flex-wrap: wrap !important;
-  }
-  .flex-md-nowrap {
-    -ms-flex-wrap: nowrap !important;
-    flex-wrap: nowrap !important;
-  }
-  .flex-md-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
-    flex-wrap: wrap-reverse !important;
-  }
-  .flex-md-fill {
-    -ms-flex: 1 1 auto !important;
-    flex: 1 1 auto !important;
-  }
-  .flex-md-grow-0 {
-    -ms-flex-positive: 0 !important;
-    flex-grow: 0 !important;
-  }
-  .flex-md-grow-1 {
-    -ms-flex-positive: 1 !important;
-    flex-grow: 1 !important;
-  }
-  .flex-md-shrink-0 {
-    -ms-flex-negative: 0 !important;
-    flex-shrink: 0 !important;
-  }
-  .flex-md-shrink-1 {
-    -ms-flex-negative: 1 !important;
-    flex-shrink: 1 !important;
-  }
-  .justify-content-md-start {
-    -ms-flex-pack: start !important;
-    justify-content: flex-start !important;
-  }
-  .justify-content-md-end {
-    -ms-flex-pack: end !important;
-    justify-content: flex-end !important;
-  }
-  .justify-content-md-center {
-    -ms-flex-pack: center !important;
-    justify-content: center !important;
-  }
-  .justify-content-md-between {
-    -ms-flex-pack: justify !important;
-    justify-content: space-between !important;
-  }
-  .justify-content-md-around {
-    -ms-flex-pack: distribute !important;
-    justify-content: space-around !important;
-  }
-  .align-items-md-start {
-    -ms-flex-align: start !important;
-    align-items: flex-start !important;
-  }
-  .align-items-md-end {
-    -ms-flex-align: end !important;
-    align-items: flex-end !important;
-  }
-  .align-items-md-center {
-    -ms-flex-align: center !important;
-    align-items: center !important;
-  }
-  .align-items-md-baseline {
-    -ms-flex-align: baseline !important;
-    align-items: baseline !important;
-  }
-  .align-items-md-stretch {
-    -ms-flex-align: stretch !important;
-    align-items: stretch !important;
-  }
-  .align-content-md-start {
-    -ms-flex-line-pack: start !important;
-    align-content: flex-start !important;
-  }
-  .align-content-md-end {
-    -ms-flex-line-pack: end !important;
-    align-content: flex-end !important;
-  }
-  .align-content-md-center {
-    -ms-flex-line-pack: center !important;
-    align-content: center !important;
-  }
-  .align-content-md-between {
-    -ms-flex-line-pack: justify !important;
-    align-content: space-between !important;
-  }
-  .align-content-md-around {
-    -ms-flex-line-pack: distribute !important;
-    align-content: space-around !important;
-  }
-  .align-content-md-stretch {
-    -ms-flex-line-pack: stretch !important;
-    align-content: stretch !important;
-  }
-  .align-self-md-auto {
-    -ms-flex-item-align: auto !important;
-    align-self: auto !important;
-  }
-  .align-self-md-start {
-    -ms-flex-item-align: start !important;
-    align-self: flex-start !important;
-  }
-  .align-self-md-end {
-    -ms-flex-item-align: end !important;
-    align-self: flex-end !important;
-  }
-  .align-self-md-center {
-    -ms-flex-item-align: center !important;
-    align-self: center !important;
-  }
-  .align-self-md-baseline {
-    -ms-flex-item-align: baseline !important;
-    align-self: baseline !important;
-  }
-  .align-self-md-stretch {
-    -ms-flex-item-align: stretch !important;
-    align-self: stretch !important;
-  }
-}
-
-@media (min-width: 992px) {
-  .flex-lg-row {
-    -ms-flex-direction: row !important;
-    flex-direction: row !important;
-  }
-  .flex-lg-column {
-    -ms-flex-direction: column !important;
-    flex-direction: column !important;
-  }
-  .flex-lg-row-reverse {
-    -ms-flex-direction: row-reverse !important;
-    flex-direction: row-reverse !important;
-  }
-  .flex-lg-column-reverse {
-    -ms-flex-direction: column-reverse !important;
-    flex-direction: column-reverse !important;
-  }
-  .flex-lg-wrap {
-    -ms-flex-wrap: wrap !important;
-    flex-wrap: wrap !important;
-  }
-  .flex-lg-nowrap {
-    -ms-flex-wrap: nowrap !important;
-    flex-wrap: nowrap !important;
-  }
-  .flex-lg-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
-    flex-wrap: wrap-reverse !important;
-  }
-  .flex-lg-fill {
-    -ms-flex: 1 1 auto !important;
-    flex: 1 1 auto !important;
-  }
-  .flex-lg-grow-0 {
-    -ms-flex-positive: 0 !important;
-    flex-grow: 0 !important;
-  }
-  .flex-lg-grow-1 {
-    -ms-flex-positive: 1 !important;
-    flex-grow: 1 !important;
-  }
-  .flex-lg-shrink-0 {
-    -ms-flex-negative: 0 !important;
-    flex-shrink: 0 !important;
-  }
-  .flex-lg-shrink-1 {
-    -ms-flex-negative: 1 !important;
-    flex-shrink: 1 !important;
-  }
-  .justify-content-lg-start {
-    -ms-flex-pack: start !important;
-    justify-content: flex-start !important;
-  }
-  .justify-content-lg-end {
-    -ms-flex-pack: end !important;
-    justify-content: flex-end !important;
-  }
-  .justify-content-lg-center {
-    -ms-flex-pack: center !important;
-    justify-content: center !important;
-  }
-  .justify-content-lg-between {
-    -ms-flex-pack: justify !important;
-    justify-content: space-between !important;
-  }
-  .justify-content-lg-around {
-    -ms-flex-pack: distribute !important;
-    justify-content: space-around !important;
-  }
-  .align-items-lg-start {
-    -ms-flex-align: start !important;
-    align-items: flex-start !important;
-  }
-  .align-items-lg-end {
-    -ms-flex-align: end !important;
-    align-items: flex-end !important;
-  }
-  .align-items-lg-center {
-    -ms-flex-align: center !important;
-    align-items: center !important;
-  }
-  .align-items-lg-baseline {
-    -ms-flex-align: baseline !important;
-    align-items: baseline !important;
-  }
-  .align-items-lg-stretch {
-    -ms-flex-align: stretch !important;
-    align-items: stretch !important;
-  }
-  .align-content-lg-start {
-    -ms-flex-line-pack: start !important;
-    align-content: flex-start !important;
-  }
-  .align-content-lg-end {
-    -ms-flex-line-pack: end !important;
-    align-content: flex-end !important;
-  }
-  .align-content-lg-center {
-    -ms-flex-line-pack: center !important;
-    align-content: center !important;
-  }
-  .align-content-lg-between {
-    -ms-flex-line-pack: justify !important;
-    align-content: space-between !important;
-  }
-  .align-content-lg-around {
-    -ms-flex-line-pack: distribute !important;
-    align-content: space-around !important;
-  }
-  .align-content-lg-stretch {
-    -ms-flex-line-pack: stretch !important;
-    align-content: stretch !important;
-  }
-  .align-self-lg-auto {
-    -ms-flex-item-align: auto !important;
-    align-self: auto !important;
-  }
-  .align-self-lg-start {
-    -ms-flex-item-align: start !important;
-    align-self: flex-start !important;
-  }
-  .align-self-lg-end {
-    -ms-flex-item-align: end !important;
-    align-self: flex-end !important;
-  }
-  .align-self-lg-center {
-    -ms-flex-item-align: center !important;
-    align-self: center !important;
-  }
-  .align-self-lg-baseline {
-    -ms-flex-item-align: baseline !important;
-    align-self: baseline !important;
-  }
-  .align-self-lg-stretch {
-    -ms-flex-item-align: stretch !important;
-    align-self: stretch !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .flex-xl-row {
-    -ms-flex-direction: row !important;
-    flex-direction: row !important;
-  }
-  .flex-xl-column {
-    -ms-flex-direction: column !important;
-    flex-direction: column !important;
-  }
-  .flex-xl-row-reverse {
-    -ms-flex-direction: row-reverse !important;
-    flex-direction: row-reverse !important;
-  }
-  .flex-xl-column-reverse {
-    -ms-flex-direction: column-reverse !important;
-    flex-direction: column-reverse !important;
-  }
-  .flex-xl-wrap {
-    -ms-flex-wrap: wrap !important;
-    flex-wrap: wrap !important;
-  }
-  .flex-xl-nowrap {
-    -ms-flex-wrap: nowrap !important;
-    flex-wrap: nowrap !important;
-  }
-  .flex-xl-wrap-reverse {
-    -ms-flex-wrap: wrap-reverse !important;
-    flex-wrap: wrap-reverse !important;
-  }
-  .flex-xl-fill {
-    -ms-flex: 1 1 auto !important;
-    flex: 1 1 auto !important;
-  }
-  .flex-xl-grow-0 {
-    -ms-flex-positive: 0 !important;
-    flex-grow: 0 !important;
-  }
-  .flex-xl-grow-1 {
-    -ms-flex-positive: 1 !important;
-    flex-grow: 1 !important;
-  }
-  .flex-xl-shrink-0 {
-    -ms-flex-negative: 0 !important;
-    flex-shrink: 0 !important;
-  }
-  .flex-xl-shrink-1 {
-    -ms-flex-negative: 1 !important;
-    flex-shrink: 1 !important;
-  }
-  .justify-content-xl-start {
-    -ms-flex-pack: start !important;
-    justify-content: flex-start !important;
-  }
-  .justify-content-xl-end {
-    -ms-flex-pack: end !important;
-    justify-content: flex-end !important;
-  }
-  .justify-content-xl-center {
-    -ms-flex-pack: center !important;
-    justify-content: center !important;
-  }
-  .justify-content-xl-between {
-    -ms-flex-pack: justify !important;
-    justify-content: space-between !important;
-  }
-  .justify-content-xl-around {
-    -ms-flex-pack: distribute !important;
-    justify-content: space-around !important;
-  }
-  .align-items-xl-start {
-    -ms-flex-align: start !important;
-    align-items: flex-start !important;
-  }
-  .align-items-xl-end {
-    -ms-flex-align: end !important;
-    align-items: flex-end !important;
-  }
-  .align-items-xl-center {
-    -ms-flex-align: center !important;
-    align-items: center !important;
-  }
-  .align-items-xl-baseline {
-    -ms-flex-align: baseline !important;
-    align-items: baseline !important;
-  }
-  .align-items-xl-stretch {
-    -ms-flex-align: stretch !important;
-    align-items: stretch !important;
-  }
-  .align-content-xl-start {
-    -ms-flex-line-pack: start !important;
-    align-content: flex-start !important;
-  }
-  .align-content-xl-end {
-    -ms-flex-line-pack: end !important;
-    align-content: flex-end !important;
-  }
-  .align-content-xl-center {
-    -ms-flex-line-pack: center !important;
-    align-content: center !important;
-  }
-  .align-content-xl-between {
-    -ms-flex-line-pack: justify !important;
-    align-content: space-between !important;
-  }
-  .align-content-xl-around {
-    -ms-flex-line-pack: distribute !important;
-    align-content: space-around !important;
-  }
-  .align-content-xl-stretch {
-    -ms-flex-line-pack: stretch !important;
-    align-content: stretch !important;
-  }
-  .align-self-xl-auto {
-    -ms-flex-item-align: auto !important;
-    align-self: auto !important;
-  }
-  .align-self-xl-start {
-    -ms-flex-item-align: start !important;
-    align-self: flex-start !important;
-  }
-  .align-self-xl-end {
-    -ms-flex-item-align: end !important;
-    align-self: flex-end !important;
-  }
-  .align-self-xl-center {
-    -ms-flex-item-align: center !important;
-    align-self: center !important;
-  }
-  .align-self-xl-baseline {
-    -ms-flex-item-align: baseline !important;
-    align-self: baseline !important;
-  }
-  .align-self-xl-stretch {
-    -ms-flex-item-align: stretch !important;
-    align-self: stretch !important;
-  }
-}
-
-.float-left {
-  float: left !important;
-}
-
-.float-right {
-  float: right !important;
-}
-
-.float-none {
-  float: none !important;
-}
-
-@media (min-width: 576px) {
-  .float-sm-left {
-    float: left !important;
-  }
-  .float-sm-right {
-    float: right !important;
-  }
-  .float-sm-none {
-    float: none !important;
-  }
-}
-
-@media (min-width: 768px) {
-  .float-md-left {
-    float: left !important;
-  }
-  .float-md-right {
-    float: right !important;
-  }
-  .float-md-none {
-    float: none !important;
-  }
-}
-
-@media (min-width: 992px) {
-  .float-lg-left {
-    float: left !important;
-  }
-  .float-lg-right {
-    float: right !important;
-  }
-  .float-lg-none {
-    float: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .float-xl-left {
-    float: left !important;
-  }
-  .float-xl-right {
-    float: right !important;
-  }
-  .float-xl-none {
-    float: none !important;
-  }
-}
-
-.overflow-auto {
-  overflow: auto !important;
-}
-
-.overflow-hidden {
-  overflow: hidden !important;
-}
-
-.position-static {
-  position: static !important;
-}
-
-.position-relative {
-  position: relative !important;
-}
-
-.position-absolute {
-  position: absolute !important;
-}
-
-.position-fixed {
-  position: fixed !important;
-}
-
-.position-sticky {
-  position: -webkit-sticky !important;
-  position: sticky !important;
-}
-
-.fixed-top {
-  position: fixed;
-  top: 0;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-}
-
-.fixed-bottom {
-  position: fixed;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1030;
-}
-
-.sticky-top {
-  position: -webkit-sticky;
-  position: sticky;
-  top: 0;
-  z-index: 1020;
-}
-
-
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  white-space: nowrap;
-  border: 0;
-}
-
-.sr-only-focusable:active, .sr-only-focusable:focus {
-  position: static;
-  width: auto;
-  height: auto;
-  overflow: visible;
-  clip: auto;
-  white-space: normal;
-}
-
-.shadow-sm {
-  box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075) !important;
-}
-
-.shadow {
-  box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
-}
-
-.shadow-lg {
-  box-shadow: 0 1rem 3rem rgba(0, 0, 0, 0.175) !important;
-}
-
-.shadow-none {
-  box-shadow: none !important;
-}
-
-.w-25 {
-  width: 25% !important;
-}
-
-.w-50 {
-  width: 50% !important;
-}
-
-.w-75 {
-  width: 75% !important;
-}
-
-.w-100 {
-  width: 100% !important;
-}
-
-.w-auto {
-  width: auto !important;
-}
-
-.h-25 {
-  height: 25% !important;
-}
-
-.h-50 {
-  height: 50% !important;
-}
-
-.h-75 {
-  height: 75% !important;
-}
-
-.h-100 {
-  height: 100% !important;
-}
-
-.h-auto {
-  height: auto !important;
-}
-
-.mw-100 {
-  max-width: 100% !important;
-}
-
-.mh-100 {
-  max-height: 100% !important;
-}
-
-.min-vw-100 {
-  min-width: 100vw !important;
-}
-
-.min-vh-100 {
-  min-height: 100vh !important;
-}
-
-.vw-100 {
-  width: 100vw !important;
-}
-
-.vh-100 {
-  height: 100vh !important;
-}
-
-.stretched-link::after {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-  pointer-events: auto;
-  content: "";
-  background-color: rgba(0, 0, 0, 0);
-}
-
-.m-0 {
-  margin: 0 !important;
-}
-
-.mt-0,
-.my-0 {
-  margin-top: 0 !important;
-}
-
-.mr-0,
-.mx-0 {
-  margin-right: 0 !important;
-}
-
-.mb-0,
-.my-0 {
-  margin-bottom: 0 !important;
-}
-
-.ml-0,
-.mx-0 {
-  margin-left: 0 !important;
-}
-
-.m-1 {
-  margin: 0.25rem !important;
-}
-
-.mt-1,
-.my-1 {
-  margin-top: 0.25rem !important;
-}
-
-.mr-1,
-.mx-1 {
-  margin-right: 0.25rem !important;
-}
-
-.mb-1,
-.my-1 {
-  margin-bottom: 0.25rem !important;
-}
-
-.ml-1,
-.mx-1 {
-  margin-left: 0.25rem !important;
-}
-
-.m-2 {
-  margin: 0.5rem !important;
-}
-
-.mt-2,
-.my-2 {
-  margin-top: 0.5rem !important;
-}
-
-.mr-2,
-.mx-2 {
-  margin-right: 0.5rem !important;
-}
-
-.mb-2,
-.my-2 {
-  margin-bottom: 0.5rem !important;
-}
-
-.ml-2,
-.mx-2 {
-  margin-left: 0.5rem !important;
-}
-
-.m-3 {
-  margin: 1rem !important;
-}
-
-.mt-3,
-.my-3 {
-  margin-top: 1rem !important;
-}
-
-.mr-3,
-.mx-3 {
-  margin-right: 1rem !important;
-}
-
-.mb-3,
-.my-3 {
-  margin-bottom: 1rem !important;
-}
-
-.ml-3,
-.mx-3 {
-  margin-left: 1rem !important;
-}
-
-.m-4 {
-  margin: 1.5rem !important;
-}
-
-.mt-4,
-.my-4 {
-  margin-top: 1.5rem !important;
-}
-
-.mr-4,
-.mx-4 {
-  margin-right: 1.5rem !important;
-}
-
-.mb-4,
-.my-4 {
-  margin-bottom: 1.5rem !important;
-}
-
-.ml-4,
-.mx-4 {
-  margin-left: 1.5rem !important;
-}
-
-.m-5 {
-  margin: 3rem !important;
-}
-
-.mt-5,
-.my-5 {
-  margin-top: 3rem !important;
-}
-
-.mr-5,
-.mx-5 {
-  margin-right: 3rem !important;
-}
-
-.mb-5,
-.my-5 {
-  margin-bottom: 3rem !important;
-}
-
-.ml-5,
-.mx-5 {
-  margin-left: 3rem !important;
-}
-
-.p-0 {
-  padding: 0 !important;
-}
-
-.pt-0,
-.py-0 {
-  padding-top: 0 !important;
-}
-
-.pr-0,
-.px-0 {
-  padding-right: 0 !important;
-}
-
-.pb-0,
-.py-0 {
-  padding-bottom: 0 !important;
-}
-
-.pl-0,
-.px-0 {
-  padding-left: 0 !important;
-}
-
-.p-1 {
-  padding: 0.25rem !important;
-}
-
-.pt-1,
-.py-1 {
-  padding-top: 0.25rem !important;
-}
-
-.pr-1,
-.px-1 {
-  padding-right: 0.25rem !important;
-}
-
-.pb-1,
-.py-1 {
-  padding-bottom: 0.25rem !important;
-}
-
-.pl-1,
-.px-1 {
-  padding-left: 0.25rem !important;
-}
-
-.p-2 {
-  padding: 0.5rem !important;
-}
-
-.pt-2,
-.py-2 {
-  padding-top: 0.5rem !important;
-}
-
-.pr-2,
-.px-2 {
-  padding-right: 0.5rem !important;
-}
-
-.pb-2,
-.py-2 {
-  padding-bottom: 0.5rem !important;
-}
-
-.pl-2,
-.px-2 {
-  padding-left: 0.5rem !important;
-}
-
-.p-3 {
-  padding: 1rem !important;
-}
-
-.pt-3,
-.py-3 {
-  padding-top: 1rem !important;
-}
-
-.pr-3,
-.px-3 {
-  padding-right: 1rem !important;
-}
-
-.pb-3,
-.py-3 {
-  padding-bottom: 1rem !important;
-}
-
-.pl-3,
-.px-3 {
-  padding-left: 1rem !important;
-}
-
-.p-4 {
-  padding: 1.5rem !important;
-}
-
-.pt-4,
-.py-4 {
-  padding-top: 1.5rem !important;
-}
-
-.pr-4,
-.px-4 {
-  padding-right: 1.5rem !important;
-}
-
-.pb-4,
-.py-4 {
-  padding-bottom: 1.5rem !important;
-}
-
-.pl-4,
-.px-4 {
-  padding-left: 1.5rem !important;
-}
-
-.p-5 {
-  padding: 3rem !important;
-}
-
-.pt-5,
-.py-5 {
-  padding-top: 3rem !important;
-}
-
-.pr-5,
-.px-5 {
-  padding-right: 3rem !important;
-}
-
-.pb-5,
-.py-5 {
-  padding-bottom: 3rem !important;
-}
-
-.pl-5,
-.px-5 {
-  padding-left: 3rem !important;
-}
-
-.m-n1 {
-  margin: -0.25rem !important;
-}
-
-.mt-n1,
-.my-n1 {
-  margin-top: -0.25rem !important;
-}
-
-.mr-n1,
-.mx-n1 {
-  margin-right: -0.25rem !important;
-}
-
-.mb-n1,
-.my-n1 {
-  margin-bottom: -0.25rem !important;
-}
-
-.ml-n1,
-.mx-n1 {
-  margin-left: -0.25rem !important;
-}
-
-.m-n2 {
-  margin: -0.5rem !important;
-}
-
-.mt-n2,
-.my-n2 {
-  margin-top: -0.5rem !important;
-}
-
-.mr-n2,
-.mx-n2 {
-  margin-right: -0.5rem !important;
-}
-
-.mb-n2,
-.my-n2 {
-  margin-bottom: -0.5rem !important;
-}
-
-.ml-n2,
-.mx-n2 {
-  margin-left: -0.5rem !important;
-}
-
-.m-n3 {
-  margin: -1rem !important;
-}
-
-.mt-n3,
-.my-n3 {
-  margin-top: -1rem !important;
-}
-
-.mr-n3,
-.mx-n3 {
-  margin-right: -1rem !important;
-}
-
-.mb-n3,
-.my-n3 {
-  margin-bottom: -1rem !important;
-}
-
-.ml-n3,
-.mx-n3 {
-  margin-left: -1rem !important;
-}
-
-.m-n4 {
-  margin: -1.5rem !important;
-}
-
-.mt-n4,
-.my-n4 {
-  margin-top: -1.5rem !important;
-}
-
-.mr-n4,
-.mx-n4 {
-  margin-right: -1.5rem !important;
-}
-
-.mb-n4,
-.my-n4 {
-  margin-bottom: -1.5rem !important;
-}
-
-.ml-n4,
-.mx-n4 {
-  margin-left: -1.5rem !important;
-}
-
-.m-n5 {
-  margin: -3rem !important;
-}
-
-.mt-n5,
-.my-n5 {
-  margin-top: -3rem !important;
-}
-
-.mr-n5,
-.mx-n5 {
-  margin-right: -3rem !important;
-}
-
-.mb-n5,
-.my-n5 {
-  margin-bottom: -3rem !important;
-}
-
-.ml-n5,
-.mx-n5 {
-  margin-left: -3rem !important;
-}
-
-.m-auto {
-  margin: auto !important;
-}
-
-.mt-auto,
-.my-auto {
-  margin-top: auto !important;
-}
-
-.mr-auto,
-.mx-auto {
-  margin-right: auto !important;
-}
-
-.mb-auto,
-.my-auto {
-  margin-bottom: auto !important;
-}
-
-.ml-auto,
-.mx-auto {
-  margin-left: auto !important;
-}
-
-@media (min-width: 576px) {
-  .m-sm-0 {
-    margin: 0 !important;
-  }
-  .mt-sm-0,
-  .my-sm-0 {
-    margin-top: 0 !important;
-  }
-  .mr-sm-0,
-  .mx-sm-0 {
-    margin-right: 0 !important;
-  }
-  .mb-sm-0,
-  .my-sm-0 {
-    margin-bottom: 0 !important;
-  }
-  .ml-sm-0,
-  .mx-sm-0 {
-    margin-left: 0 !important;
-  }
-  .m-sm-1 {
-    margin: 0.25rem !important;
-  }
-  .mt-sm-1,
-  .my-sm-1 {
-    margin-top: 0.25rem !important;
-  }
-  .mr-sm-1,
-  .mx-sm-1 {
-    margin-right: 0.25rem !important;
-  }
-  .mb-sm-1,
-  .my-sm-1 {
-    margin-bottom: 0.25rem !important;
-  }
-  .ml-sm-1,
-  .mx-sm-1 {
-    margin-left: 0.25rem !important;
-  }
-  .m-sm-2 {
-    margin: 0.5rem !important;
-  }
-  .mt-sm-2,
-  .my-sm-2 {
-    margin-top: 0.5rem !important;
-  }
-  .mr-sm-2,
-  .mx-sm-2 {
-    margin-right: 0.5rem !important;
-  }
-  .mb-sm-2,
-  .my-sm-2 {
-    margin-bottom: 0.5rem !important;
-  }
-  .ml-sm-2,
-  .mx-sm-2 {
-    margin-left: 0.5rem !important;
-  }
-  .m-sm-3 {
-    margin: 1rem !important;
-  }
-  .mt-sm-3,
-  .my-sm-3 {
-    margin-top: 1rem !important;
-  }
-  .mr-sm-3,
-  .mx-sm-3 {
-    margin-right: 1rem !important;
-  }
-  .mb-sm-3,
-  .my-sm-3 {
-    margin-bottom: 1rem !important;
-  }
-  .ml-sm-3,
-  .mx-sm-3 {
-    margin-left: 1rem !important;
-  }
-  .m-sm-4 {
-    margin: 1.5rem !important;
-  }
-  .mt-sm-4,
-  .my-sm-4 {
-    margin-top: 1.5rem !important;
-  }
-  .mr-sm-4,
-  .mx-sm-4 {
-    margin-right: 1.5rem !important;
-  }
-  .mb-sm-4,
-  .my-sm-4 {
-    margin-bottom: 1.5rem !important;
-  }
-  .ml-sm-4,
-  .mx-sm-4 {
-    margin-left: 1.5rem !important;
-  }
-  .m-sm-5 {
-    margin: 3rem !important;
-  }
-  .mt-sm-5,
-  .my-sm-5 {
-    margin-top: 3rem !important;
-  }
-  .mr-sm-5,
-  .mx-sm-5 {
-    margin-right: 3rem !important;
-  }
-  .mb-sm-5,
-  .my-sm-5 {
-    margin-bottom: 3rem !important;
-  }
-  .ml-sm-5,
-  .mx-sm-5 {
-    margin-left: 3rem !important;
-  }
-  .p-sm-0 {
-    padding: 0 !important;
-  }
-  .pt-sm-0,
-  .py-sm-0 {
-    padding-top: 0 !important;
-  }
-  .pr-sm-0,
-  .px-sm-0 {
-    padding-right: 0 !important;
-  }
-  .pb-sm-0,
-  .py-sm-0 {
-    padding-bottom: 0 !important;
-  }
-  .pl-sm-0,
-  .px-sm-0 {
-    padding-left: 0 !important;
-  }
-  .p-sm-1 {
-    padding: 0.25rem !important;
-  }
-  .pt-sm-1,
-  .py-sm-1 {
-    padding-top: 0.25rem !important;
-  }
-  .pr-sm-1,
-  .px-sm-1 {
-    padding-right: 0.25rem !important;
-  }
-  .pb-sm-1,
-  .py-sm-1 {
-    padding-bottom: 0.25rem !important;
-  }
-  .pl-sm-1,
-  .px-sm-1 {
-    padding-left: 0.25rem !important;
-  }
-  .p-sm-2 {
-    padding: 0.5rem !important;
-  }
-  .pt-sm-2,
-  .py-sm-2 {
-    padding-top: 0.5rem !important;
-  }
-  .pr-sm-2,
-  .px-sm-2 {
-    padding-right: 0.5rem !important;
-  }
-  .pb-sm-2,
-  .py-sm-2 {
-    padding-bottom: 0.5rem !important;
-  }
-  .pl-sm-2,
-  .px-sm-2 {
-    padding-left: 0.5rem !important;
-  }
-  .p-sm-3 {
-    padding: 1rem !important;
-  }
-  .pt-sm-3,
-  .py-sm-3 {
-    padding-top: 1rem !important;
-  }
-  .pr-sm-3,
-  .px-sm-3 {
-    padding-right: 1rem !important;
-  }
-  .pb-sm-3,
-  .py-sm-3 {
-    padding-bottom: 1rem !important;
-  }
-  .pl-sm-3,
-  .px-sm-3 {
-    padding-left: 1rem !important;
-  }
-  .p-sm-4 {
-    padding: 1.5rem !important;
-  }
-  .pt-sm-4,
-  .py-sm-4 {
-    padding-top: 1.5rem !important;
-  }
-  .pr-sm-4,
-  .px-sm-4 {
-    padding-right: 1.5rem !important;
-  }
-  .pb-sm-4,
-  .py-sm-4 {
-    padding-bottom: 1.5rem !important;
-  }
-  .pl-sm-4,
-  .px-sm-4 {
-    padding-left: 1.5rem !important;
-  }
-  .p-sm-5 {
-    padding: 3rem !important;
-  }
-  .pt-sm-5,
-  .py-sm-5 {
-    padding-top: 3rem !important;
-  }
-  .pr-sm-5,
-  .px-sm-5 {
-    padding-right: 3rem !important;
-  }
-  .pb-sm-5,
-  .py-sm-5 {
-    padding-bottom: 3rem !important;
-  }
-  .pl-sm-5,
-  .px-sm-5 {
-    padding-left: 3rem !important;
-  }
-  .m-sm-n1 {
-    margin: -0.25rem !important;
-  }
-  .mt-sm-n1,
-  .my-sm-n1 {
-    margin-top: -0.25rem !important;
-  }
-  .mr-sm-n1,
-  .mx-sm-n1 {
-    margin-right: -0.25rem !important;
-  }
-  .mb-sm-n1,
-  .my-sm-n1 {
-    margin-bottom: -0.25rem !important;
-  }
-  .ml-sm-n1,
-  .mx-sm-n1 {
-    margin-left: -0.25rem !important;
-  }
-  .m-sm-n2 {
-    margin: -0.5rem !important;
-  }
-  .mt-sm-n2,
-  .my-sm-n2 {
-    margin-top: -0.5rem !important;
-  }
-  .mr-sm-n2,
-  .mx-sm-n2 {
-    margin-right: -0.5rem !important;
-  }
-  .mb-sm-n2,
-  .my-sm-n2 {
-    margin-bottom: -0.5rem !important;
-  }
-  .ml-sm-n2,
-  .mx-sm-n2 {
-    margin-left: -0.5rem !important;
-  }
-  .m-sm-n3 {
-    margin: -1rem !important;
-  }
-  .mt-sm-n3,
-  .my-sm-n3 {
-    margin-top: -1rem !important;
-  }
-  .mr-sm-n3,
-  .mx-sm-n3 {
-    margin-right: -1rem !important;
-  }
-  .mb-sm-n3,
-  .my-sm-n3 {
-    margin-bottom: -1rem !important;
-  }
-  .ml-sm-n3,
-  .mx-sm-n3 {
-    margin-left: -1rem !important;
-  }
-  .m-sm-n4 {
-    margin: -1.5rem !important;
-  }
-  .mt-sm-n4,
-  .my-sm-n4 {
-    margin-top: -1.5rem !important;
-  }
-  .mr-sm-n4,
-  .mx-sm-n4 {
-    margin-right: -1.5rem !important;
-  }
-  .mb-sm-n4,
-  .my-sm-n4 {
-    margin-bottom: -1.5rem !important;
-  }
-  .ml-sm-n4,
-  .mx-sm-n4 {
-    margin-left: -1.5rem !important;
-  }
-  .m-sm-n5 {
-    margin: -3rem !important;
-  }
-  .mt-sm-n5,
-  .my-sm-n5 {
-    margin-top: -3rem !important;
-  }
-  .mr-sm-n5,
-  .mx-sm-n5 {
-    margin-right: -3rem !important;
-  }
-  .mb-sm-n5,
-  .my-sm-n5 {
-    margin-bottom: -3rem !important;
-  }
-  .ml-sm-n5,
-  .mx-sm-n5 {
-    margin-left: -3rem !important;
-  }
-  .m-sm-auto {
-    margin: auto !important;
-  }
-  .mt-sm-auto,
-  .my-sm-auto {
-    margin-top: auto !important;
-  }
-  .mr-sm-auto,
-  .mx-sm-auto {
-    margin-right: auto !important;
-  }
-  .mb-sm-auto,
-  .my-sm-auto {
-    margin-bottom: auto !important;
-  }
-  .ml-sm-auto,
-  .mx-sm-auto {
-    margin-left: auto !important;
-  }
-}
-
-@media (min-width: 768px) {
-  .m-md-0 {
-    margin: 0 !important;
-  }
-  .mt-md-0,
-  .my-md-0 {
-    margin-top: 0 !important;
-  }
-  .mr-md-0,
-  .mx-md-0 {
-    margin-right: 0 !important;
-  }
-  .mb-md-0,
-  .my-md-0 {
-    margin-bottom: 0 !important;
-  }
-  .ml-md-0,
-  .mx-md-0 {
-    margin-left: 0 !important;
-  }
-  .m-md-1 {
-    margin: 0.25rem !important;
-  }
-  .mt-md-1,
-  .my-md-1 {
-    margin-top: 0.25rem !important;
-  }
-  .mr-md-1,
-  .mx-md-1 {
-    margin-right: 0.25rem !important;
-  }
-  .mb-md-1,
-  .my-md-1 {
-    margin-bottom: 0.25rem !important;
-  }
-  .ml-md-1,
-  .mx-md-1 {
-    margin-left: 0.25rem !important;
-  }
-  .m-md-2 {
-    margin: 0.5rem !important;
-  }
-  .mt-md-2,
-  .my-md-2 {
-    margin-top: 0.5rem !important;
-  }
-  .mr-md-2,
-  .mx-md-2 {
-    margin-right: 0.5rem !important;
-  }
-  .mb-md-2,
-  .my-md-2 {
-    margin-bottom: 0.5rem !important;
-  }
-  .ml-md-2,
-  .mx-md-2 {
-    margin-left: 0.5rem !important;
-  }
-  .m-md-3 {
-    margin: 1rem !important;
-  }
-  .mt-md-3,
-  .my-md-3 {
-    margin-top: 1rem !important;
-  }
-  .mr-md-3,
-  .mx-md-3 {
-    margin-right: 1rem !important;
-  }
-  .mb-md-3,
-  .my-md-3 {
-    margin-bottom: 1rem !important;
-  }
-  .ml-md-3,
-  .mx-md-3 {
-    margin-left: 1rem !important;
-  }
-  .m-md-4 {
-    margin: 1.5rem !important;
-  }
-  .mt-md-4,
-  .my-md-4 {
-    margin-top: 1.5rem !important;
-  }
-  .mr-md-4,
-  .mx-md-4 {
-    margin-right: 1.5rem !important;
-  }
-  .mb-md-4,
-  .my-md-4 {
-    margin-bottom: 1.5rem !important;
-  }
-  .ml-md-4,
-  .mx-md-4 {
-    margin-left: 1.5rem !important;
-  }
-  .m-md-5 {
-    margin: 3rem !important;
-  }
-  .mt-md-5,
-  .my-md-5 {
-    margin-top: 3rem !important;
-  }
-  .mr-md-5,
-  .mx-md-5 {
-    margin-right: 3rem !important;
-  }
-  .mb-md-5,
-  .my-md-5 {
-    margin-bottom: 3rem !important;
-  }
-  .ml-md-5,
-  .mx-md-5 {
-    margin-left: 3rem !important;
-  }
-  .p-md-0 {
-    padding: 0 !important;
-  }
-  .pt-md-0,
-  .py-md-0 {
-    padding-top: 0 !important;
-  }
-  .pr-md-0,
-  .px-md-0 {
-    padding-right: 0 !important;
-  }
-  .pb-md-0,
-  .py-md-0 {
-    padding-bottom: 0 !important;
-  }
-  .pl-md-0,
-  .px-md-0 {
-    padding-left: 0 !important;
-  }
-  .p-md-1 {
-    padding: 0.25rem !important;
-  }
-  .pt-md-1,
-  .py-md-1 {
-    padding-top: 0.25rem !important;
-  }
-  .pr-md-1,
-  .px-md-1 {
-    padding-right: 0.25rem !important;
-  }
-  .pb-md-1,
-  .py-md-1 {
-    padding-bottom: 0.25rem !important;
-  }
-  .pl-md-1,
-  .px-md-1 {
-    padding-left: 0.25rem !important;
-  }
-  .p-md-2 {
-    padding: 0.5rem !important;
-  }
-  .pt-md-2,
-  .py-md-2 {
-    padding-top: 0.5rem !important;
-  }
-  .pr-md-2,
-  .px-md-2 {
-    padding-right: 0.5rem !important;
-  }
-  .pb-md-2,
-  .py-md-2 {
-    padding-bottom: 0.5rem !important;
-  }
-  .pl-md-2,
-  .px-md-2 {
-    padding-left: 0.5rem !important;
-  }
-  .p-md-3 {
-    padding: 1rem !important;
-  }
-  .pt-md-3,
-  .py-md-3 {
-    padding-top: 1rem !important;
-  }
-  .pr-md-3,
-  .px-md-3 {
-    padding-right: 1rem !important;
-  }
-  .pb-md-3,
-  .py-md-3 {
-    padding-bottom: 1rem !important;
-  }
-  .pl-md-3,
-  .px-md-3 {
-    padding-left: 1rem !important;
-  }
-  .p-md-4 {
-    padding: 1.5rem !important;
-  }
-  .pt-md-4,
-  .py-md-4 {
-    padding-top: 1.5rem !important;
-  }
-  .pr-md-4,
-  .px-md-4 {
-    padding-right: 1.5rem !important;
-  }
-  .pb-md-4,
-  .py-md-4 {
-    padding-bottom: 1.5rem !important;
-  }
-  .pl-md-4,
-  .px-md-4 {
-    padding-left: 1.5rem !important;
-  }
-  .p-md-5 {
-    padding: 3rem !important;
-  }
-  .pt-md-5,
-  .py-md-5 {
-    padding-top: 3rem !important;
-  }
-  .pr-md-5,
-  .px-md-5 {
-    padding-right: 3rem !important;
-  }
-  .pb-md-5,
-  .py-md-5 {
-    padding-bottom: 3rem !important;
-  }
-  .pl-md-5,
-  .px-md-5 {
-    padding-left: 3rem !important;
-  }
-  .m-md-n1 {
-    margin: -0.25rem !important;
-  }
-  .mt-md-n1,
-  .my-md-n1 {
-    margin-top: -0.25rem !important;
-  }
-  .mr-md-n1,
-  .mx-md-n1 {
-    margin-right: -0.25rem !important;
-  }
-  .mb-md-n1,
-  .my-md-n1 {
-    margin-bottom: -0.25rem !important;
-  }
-  .ml-md-n1,
-  .mx-md-n1 {
-    margin-left: -0.25rem !important;
-  }
-  .m-md-n2 {
-    margin: -0.5rem !important;
-  }
-  .mt-md-n2,
-  .my-md-n2 {
-    margin-top: -0.5rem !important;
-  }
-  .mr-md-n2,
-  .mx-md-n2 {
-    margin-right: -0.5rem !important;
-  }
-  .mb-md-n2,
-  .my-md-n2 {
-    margin-bottom: -0.5rem !important;
-  }
-  .ml-md-n2,
-  .mx-md-n2 {
-    margin-left: -0.5rem !important;
-  }
-  .m-md-n3 {
-    margin: -1rem !important;
-  }
-  .mt-md-n3,
-  .my-md-n3 {
-    margin-top: -1rem !important;
-  }
-  .mr-md-n3,
-  .mx-md-n3 {
-    margin-right: -1rem !important;
-  }
-  .mb-md-n3,
-  .my-md-n3 {
-    margin-bottom: -1rem !important;
-  }
-  .ml-md-n3,
-  .mx-md-n3 {
-    margin-left: -1rem !important;
-  }
-  .m-md-n4 {
-    margin: -1.5rem !important;
-  }
-  .mt-md-n4,
-  .my-md-n4 {
-    margin-top: -1.5rem !important;
-  }
-  .mr-md-n4,
-  .mx-md-n4 {
-    margin-right: -1.5rem !important;
-  }
-  .mb-md-n4,
-  .my-md-n4 {
-    margin-bottom: -1.5rem !important;
-  }
-  .ml-md-n4,
-  .mx-md-n4 {
-    margin-left: -1.5rem !important;
-  }
-  .m-md-n5 {
-    margin: -3rem !important;
-  }
-  .mt-md-n5,
-  .my-md-n5 {
-    margin-top: -3rem !important;
-  }
-  .mr-md-n5,
-  .mx-md-n5 {
-    margin-right: -3rem !important;
-  }
-  .mb-md-n5,
-  .my-md-n5 {
-    margin-bottom: -3rem !important;
-  }
-  .ml-md-n5,
-  .mx-md-n5 {
-    margin-left: -3rem !important;
-  }
-  .m-md-auto {
-    margin: auto !important;
-  }
-  .mt-md-auto,
-  .my-md-auto {
-    margin-top: auto !important;
-  }
-  .mr-md-auto,
-  .mx-md-auto {
-    margin-right: auto !important;
-  }
-  .mb-md-auto,
-  .my-md-auto {
-    margin-bottom: auto !important;
-  }
-  .ml-md-auto,
-  .mx-md-auto {
-    margin-left: auto !important;
-  }
-}
-
-@media (min-width: 992px) {
-  .m-lg-0 {
-    margin: 0 !important;
-  }
-  .mt-lg-0,
-  .my-lg-0 {
-    margin-top: 0 !important;
-  }
-  .mr-lg-0,
-  .mx-lg-0 {
-    margin-right: 0 !important;
-  }
-  .mb-lg-0,
-  .my-lg-0 {
-    margin-bottom: 0 !important;
-  }
-  .ml-lg-0,
-  .mx-lg-0 {
-    margin-left: 0 !important;
-  }
-  .m-lg-1 {
-    margin: 0.25rem !important;
-  }
-  .mt-lg-1,
-  .my-lg-1 {
-    margin-top: 0.25rem !important;
-  }
-  .mr-lg-1,
-  .mx-lg-1 {
-    margin-right: 0.25rem !important;
-  }
-  .mb-lg-1,
-  .my-lg-1 {
-    margin-bottom: 0.25rem !important;
-  }
-  .ml-lg-1,
-  .mx-lg-1 {
-    margin-left: 0.25rem !important;
-  }
-  .m-lg-2 {
-    margin: 0.5rem !important;
-  }
-  .mt-lg-2,
-  .my-lg-2 {
-    margin-top: 0.5rem !important;
-  }
-  .mr-lg-2,
-  .mx-lg-2 {
-    margin-right: 0.5rem !important;
-  }
-  .mb-lg-2,
-  .my-lg-2 {
-    margin-bottom: 0.5rem !important;
-  }
-  .ml-lg-2,
-  .mx-lg-2 {
-    margin-left: 0.5rem !important;
-  }
-  .m-lg-3 {
-    margin: 1rem !important;
-  }
-  .mt-lg-3,
-  .my-lg-3 {
-    margin-top: 1rem !important;
-  }
-  .mr-lg-3,
-  .mx-lg-3 {
-    margin-right: 1rem !important;
-  }
-  .mb-lg-3,
-  .my-lg-3 {
-    margin-bottom: 1rem !important;
-  }
-  .ml-lg-3,
-  .mx-lg-3 {
-    margin-left: 1rem !important;
-  }
-  .m-lg-4 {
-    margin: 1.5rem !important;
-  }
-  .mt-lg-4,
-  .my-lg-4 {
-    margin-top: 1.5rem !important;
-  }
-  .mr-lg-4,
-  .mx-lg-4 {
-    margin-right: 1.5rem !important;
-  }
-  .mb-lg-4,
-  .my-lg-4 {
-    margin-bottom: 1.5rem !important;
-  }
-  .ml-lg-4,
-  .mx-lg-4 {
-    margin-left: 1.5rem !important;
-  }
-  .m-lg-5 {
-    margin: 3rem !important;
-  }
-  .mt-lg-5,
-  .my-lg-5 {
-    margin-top: 3rem !important;
-  }
-  .mr-lg-5,
-  .mx-lg-5 {
-    margin-right: 3rem !important;
-  }
-  .mb-lg-5,
-  .my-lg-5 {
-    margin-bottom: 3rem !important;
-  }
-  .ml-lg-5,
-  .mx-lg-5 {
-    margin-left: 3rem !important;
-  }
-  .p-lg-0 {
-    padding: 0 !important;
-  }
-  .pt-lg-0,
-  .py-lg-0 {
-    padding-top: 0 !important;
-  }
-  .pr-lg-0,
-  .px-lg-0 {
-    padding-right: 0 !important;
-  }
-  .pb-lg-0,
-  .py-lg-0 {
-    padding-bottom: 0 !important;
-  }
-  .pl-lg-0,
-  .px-lg-0 {
-    padding-left: 0 !important;
-  }
-  .p-lg-1 {
-    padding: 0.25rem !important;
-  }
-  .pt-lg-1,
-  .py-lg-1 {
-    padding-top: 0.25rem !important;
-  }
-  .pr-lg-1,
-  .px-lg-1 {
-    padding-right: 0.25rem !important;
-  }
-  .pb-lg-1,
-  .py-lg-1 {
-    padding-bottom: 0.25rem !important;
-  }
-  .pl-lg-1,
-  .px-lg-1 {
-    padding-left: 0.25rem !important;
-  }
-  .p-lg-2 {
-    padding: 0.5rem !important;
-  }
-  .pt-lg-2,
-  .py-lg-2 {
-    padding-top: 0.5rem !important;
-  }
-  .pr-lg-2,
-  .px-lg-2 {
-    padding-right: 0.5rem !important;
-  }
-  .pb-lg-2,
-  .py-lg-2 {
-    padding-bottom: 0.5rem !important;
-  }
-  .pl-lg-2,
-  .px-lg-2 {
-    padding-left: 0.5rem !important;
-  }
-  .p-lg-3 {
-    padding: 1rem !important;
-  }
-  .pt-lg-3,
-  .py-lg-3 {
-    padding-top: 1rem !important;
-  }
-  .pr-lg-3,
-  .px-lg-3 {
-    padding-right: 1rem !important;
-  }
-  .pb-lg-3,
-  .py-lg-3 {
-    padding-bottom: 1rem !important;
-  }
-  .pl-lg-3,
-  .px-lg-3 {
-    padding-left: 1rem !important;
-  }
-  .p-lg-4 {
-    padding: 1.5rem !important;
-  }
-  .pt-lg-4,
-  .py-lg-4 {
-    padding-top: 1.5rem !important;
-  }
-  .pr-lg-4,
-  .px-lg-4 {
-    padding-right: 1.5rem !important;
-  }
-  .pb-lg-4,
-  .py-lg-4 {
-    padding-bottom: 1.5rem !important;
-  }
-  .pl-lg-4,
-  .px-lg-4 {
-    padding-left: 1.5rem !important;
-  }
-  .p-lg-5 {
-    padding: 3rem !important;
-  }
-  .pt-lg-5,
-  .py-lg-5 {
-    padding-top: 3rem !important;
-  }
-  .pr-lg-5,
-  .px-lg-5 {
-    padding-right: 3rem !important;
-  }
-  .pb-lg-5,
-  .py-lg-5 {
-    padding-bottom: 3rem !important;
-  }
-  .pl-lg-5,
-  .px-lg-5 {
-    padding-left: 3rem !important;
-  }
-  .m-lg-n1 {
-    margin: -0.25rem !important;
-  }
-  .mt-lg-n1,
-  .my-lg-n1 {
-    margin-top: -0.25rem !important;
-  }
-  .mr-lg-n1,
-  .mx-lg-n1 {
-    margin-right: -0.25rem !important;
-  }
-  .mb-lg-n1,
-  .my-lg-n1 {
-    margin-bottom: -0.25rem !important;
-  }
-  .ml-lg-n1,
-  .mx-lg-n1 {
-    margin-left: -0.25rem !important;
-  }
-  .m-lg-n2 {
-    margin: -0.5rem !important;
-  }
-  .mt-lg-n2,
-  .my-lg-n2 {
-    margin-top: -0.5rem !important;
-  }
-  .mr-lg-n2,
-  .mx-lg-n2 {
-    margin-right: -0.5rem !important;
-  }
-  .mb-lg-n2,
-  .my-lg-n2 {
-    margin-bottom: -0.5rem !important;
-  }
-  .ml-lg-n2,
-  .mx-lg-n2 {
-    margin-left: -0.5rem !important;
-  }
-  .m-lg-n3 {
-    margin: -1rem !important;
-  }
-  .mt-lg-n3,
-  .my-lg-n3 {
-    margin-top: -1rem !important;
-  }
-  .mr-lg-n3,
-  .mx-lg-n3 {
-    margin-right: -1rem !important;
-  }
-  .mb-lg-n3,
-  .my-lg-n3 {
-    margin-bottom: -1rem !important;
-  }
-  .ml-lg-n3,
-  .mx-lg-n3 {
-    margin-left: -1rem !important;
-  }
-  .m-lg-n4 {
-    margin: -1.5rem !important;
-  }
-  .mt-lg-n4,
-  .my-lg-n4 {
-    margin-top: -1.5rem !important;
-  }
-  .mr-lg-n4,
-  .mx-lg-n4 {
-    margin-right: -1.5rem !important;
-  }
-  .mb-lg-n4,
-  .my-lg-n4 {
-    margin-bottom: -1.5rem !important;
-  }
-  .ml-lg-n4,
-  .mx-lg-n4 {
-    margin-left: -1.5rem !important;
-  }
-  .m-lg-n5 {
-    margin: -3rem !important;
-  }
-  .mt-lg-n5,
-  .my-lg-n5 {
-    margin-top: -3rem !important;
-  }
-  .mr-lg-n5,
-  .mx-lg-n5 {
-    margin-right: -3rem !important;
-  }
-  .mb-lg-n5,
-  .my-lg-n5 {
-    margin-bottom: -3rem !important;
-  }
-  .ml-lg-n5,
-  .mx-lg-n5 {
-    margin-left: -3rem !important;
-  }
-  .m-lg-auto {
-    margin: auto !important;
-  }
-  .mt-lg-auto,
-  .my-lg-auto {
-    margin-top: auto !important;
-  }
-  .mr-lg-auto,
-  .mx-lg-auto {
-    margin-right: auto !important;
-  }
-  .mb-lg-auto,
-  .my-lg-auto {
-    margin-bottom: auto !important;
-  }
-  .ml-lg-auto,
-  .mx-lg-auto {
-    margin-left: auto !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .m-xl-0 {
-    margin: 0 !important;
-  }
-  .mt-xl-0,
-  .my-xl-0 {
-    margin-top: 0 !important;
-  }
-  .mr-xl-0,
-  .mx-xl-0 {
-    margin-right: 0 !important;
-  }
-  .mb-xl-0,
-  .my-xl-0 {
-    margin-bottom: 0 !important;
-  }
-  .ml-xl-0,
-  .mx-xl-0 {
-    margin-left: 0 !important;
-  }
-  .m-xl-1 {
-    margin: 0.25rem !important;
-  }
-  .mt-xl-1,
-  .my-xl-1 {
-    margin-top: 0.25rem !important;
-  }
-  .mr-xl-1,
-  .mx-xl-1 {
-    margin-right: 0.25rem !important;
-  }
-  .mb-xl-1,
-  .my-xl-1 {
-    margin-bottom: 0.25rem !important;
-  }
-  .ml-xl-1,
-  .mx-xl-1 {
-    margin-left: 0.25rem !important;
-  }
-  .m-xl-2 {
-    margin: 0.5rem !important;
-  }
-  .mt-xl-2,
-  .my-xl-2 {
-    margin-top: 0.5rem !important;
-  }
-  .mr-xl-2,
-  .mx-xl-2 {
-    margin-right: 0.5rem !important;
-  }
-  .mb-xl-2,
-  .my-xl-2 {
-    margin-bottom: 0.5rem !important;
-  }
-  .ml-xl-2,
-  .mx-xl-2 {
-    margin-left: 0.5rem !important;
-  }
-  .m-xl-3 {
-    margin: 1rem !important;
-  }
-  .mt-xl-3,
-  .my-xl-3 {
-    margin-top: 1rem !important;
-  }
-  .mr-xl-3,
-  .mx-xl-3 {
-    margin-right: 1rem !important;
-  }
-  .mb-xl-3,
-  .my-xl-3 {
-    margin-bottom: 1rem !important;
-  }
-  .ml-xl-3,
-  .mx-xl-3 {
-    margin-left: 1rem !important;
-  }
-  .m-xl-4 {
-    margin: 1.5rem !important;
-  }
-  .mt-xl-4,
-  .my-xl-4 {
-    margin-top: 1.5rem !important;
-  }
-  .mr-xl-4,
-  .mx-xl-4 {
-    margin-right: 1.5rem !important;
-  }
-  .mb-xl-4,
-  .my-xl-4 {
-    margin-bottom: 1.5rem !important;
-  }
-  .ml-xl-4,
-  .mx-xl-4 {
-    margin-left: 1.5rem !important;
-  }
-  .m-xl-5 {
-    margin: 3rem !important;
-  }
-  .mt-xl-5,
-  .my-xl-5 {
-    margin-top: 3rem !important;
-  }
-  .mr-xl-5,
-  .mx-xl-5 {
-    margin-right: 3rem !important;
-  }
-  .mb-xl-5,
-  .my-xl-5 {
-    margin-bottom: 3rem !important;
-  }
-  .ml-xl-5,
-  .mx-xl-5 {
-    margin-left: 3rem !important;
-  }
-  .p-xl-0 {
-    padding: 0 !important;
-  }
-  .pt-xl-0,
-  .py-xl-0 {
-    padding-top: 0 !important;
-  }
-  .pr-xl-0,
-  .px-xl-0 {
-    padding-right: 0 !important;
-  }
-  .pb-xl-0,
-  .py-xl-0 {
-    padding-bottom: 0 !important;
-  }
-  .pl-xl-0,
-  .px-xl-0 {
-    padding-left: 0 !important;
-  }
-  .p-xl-1 {
-    padding: 0.25rem !important;
-  }
-  .pt-xl-1,
-  .py-xl-1 {
-    padding-top: 0.25rem !important;
-  }
-  .pr-xl-1,
-  .px-xl-1 {
-    padding-right: 0.25rem !important;
-  }
-  .pb-xl-1,
-  .py-xl-1 {
-    padding-bottom: 0.25rem !important;
-  }
-  .pl-xl-1,
-  .px-xl-1 {
-    padding-left: 0.25rem !important;
-  }
-  .p-xl-2 {
-    padding: 0.5rem !important;
-  }
-  .pt-xl-2,
-  .py-xl-2 {
-    padding-top: 0.5rem !important;
-  }
-  .pr-xl-2,
-  .px-xl-2 {
-    padding-right: 0.5rem !important;
-  }
-  .pb-xl-2,
-  .py-xl-2 {
-    padding-bottom: 0.5rem !important;
-  }
-  .pl-xl-2,
-  .px-xl-2 {
-    padding-left: 0.5rem !important;
-  }
-  .p-xl-3 {
-    padding: 1rem !important;
-  }
-  .pt-xl-3,
-  .py-xl-3 {
-    padding-top: 1rem !important;
-  }
-  .pr-xl-3,
-  .px-xl-3 {
-    padding-right: 1rem !important;
-  }
-  .pb-xl-3,
-  .py-xl-3 {
-    padding-bottom: 1rem !important;
-  }
-  .pl-xl-3,
-  .px-xl-3 {
-    padding-left: 1rem !important;
-  }
-  .p-xl-4 {
-    padding: 1.5rem !important;
-  }
-  .pt-xl-4,
-  .py-xl-4 {
-    padding-top: 1.5rem !important;
-  }
-  .pr-xl-4,
-  .px-xl-4 {
-    padding-right: 1.5rem !important;
-  }
-  .pb-xl-4,
-  .py-xl-4 {
-    padding-bottom: 1.5rem !important;
-  }
-  .pl-xl-4,
-  .px-xl-4 {
-    padding-left: 1.5rem !important;
-  }
-  .p-xl-5 {
-    padding: 3rem !important;
-  }
-  .pt-xl-5,
-  .py-xl-5 {
-    padding-top: 3rem !important;
-  }
-  .pr-xl-5,
-  .px-xl-5 {
-    padding-right: 3rem !important;
-  }
-  .pb-xl-5,
-  .py-xl-5 {
-    padding-bottom: 3rem !important;
-  }
-  .pl-xl-5,
-  .px-xl-5 {
-    padding-left: 3rem !important;
-  }
-  .m-xl-n1 {
-    margin: -0.25rem !important;
-  }
-  .mt-xl-n1,
-  .my-xl-n1 {
-    margin-top: -0.25rem !important;
-  }
-  .mr-xl-n1,
-  .mx-xl-n1 {
-    margin-right: -0.25rem !important;
-  }
-  .mb-xl-n1,
-  .my-xl-n1 {
-    margin-bottom: -0.25rem !important;
-  }
-  .ml-xl-n1,
-  .mx-xl-n1 {
-    margin-left: -0.25rem !important;
-  }
-  .m-xl-n2 {
-    margin: -0.5rem !important;
-  }
-  .mt-xl-n2,
-  .my-xl-n2 {
-    margin-top: -0.5rem !important;
-  }
-  .mr-xl-n2,
-  .mx-xl-n2 {
-    margin-right: -0.5rem !important;
-  }
-  .mb-xl-n2,
-  .my-xl-n2 {
-    margin-bottom: -0.5rem !important;
-  }
-  .ml-xl-n2,
-  .mx-xl-n2 {
-    margin-left: -0.5rem !important;
-  }
-  .m-xl-n3 {
-    margin: -1rem !important;
-  }
-  .mt-xl-n3,
-  .my-xl-n3 {
-    margin-top: -1rem !important;
-  }
-  .mr-xl-n3,
-  .mx-xl-n3 {
-    margin-right: -1rem !important;
-  }
-  .mb-xl-n3,
-  .my-xl-n3 {
-    margin-bottom: -1rem !important;
-  }
-  .ml-xl-n3,
-  .mx-xl-n3 {
-    margin-left: -1rem !important;
-  }
-  .m-xl-n4 {
-    margin: -1.5rem !important;
-  }
-  .mt-xl-n4,
-  .my-xl-n4 {
-    margin-top: -1.5rem !important;
-  }
-  .mr-xl-n4,
-  .mx-xl-n4 {
-    margin-right: -1.5rem !important;
-  }
-  .mb-xl-n4,
-  .my-xl-n4 {
-    margin-bottom: -1.5rem !important;
-  }
-  .ml-xl-n4,
-  .mx-xl-n4 {
-    margin-left: -1.5rem !important;
-  }
-  .m-xl-n5 {
-    margin: -3rem !important;
-  }
-  .mt-xl-n5,
-  .my-xl-n5 {
-    margin-top: -3rem !important;
-  }
-  .mr-xl-n5,
-  .mx-xl-n5 {
-    margin-right: -3rem !important;
-  }
-  .mb-xl-n5,
-  .my-xl-n5 {
-    margin-bottom: -3rem !important;
-  }
-  .ml-xl-n5,
-  .mx-xl-n5 {
-    margin-left: -3rem !important;
-  }
-  .m-xl-auto {
-    margin: auto !important;
-  }
-  .mt-xl-auto,
-  .my-xl-auto {
-    margin-top: auto !important;
-  }
-  .mr-xl-auto,
-  .mx-xl-auto {
-    margin-right: auto !important;
-  }
-  .mb-xl-auto,
-  .my-xl-auto {
-    margin-bottom: auto !important;
-  }
-  .ml-xl-auto,
-  .mx-xl-auto {
-    margin-left: auto !important;
-  }
-}
-
-.text-monospace {
-  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important;
-}
-
-.text-justify {
-  text-align: justify !important;
-}
-
-.text-wrap {
-  white-space: normal !important;
-}
-
-.text-nowrap {
-  white-space: nowrap !important;
-}
-
-.text-truncate {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.text-left {
-  text-align: left !important;
-}
-
-.text-right {
-  text-align: right !important;
-}
-
-.text-center {
-  text-align: center !important;
-}
-
-@media (min-width: 576px) {
-  .text-sm-left {
-    text-align: left !important;
-  }
-  .text-sm-right {
-    text-align: right !important;
-  }
-  .text-sm-center {
-    text-align: center !important;
-  }
-}
-
-@media (min-width: 768px) {
-  .text-md-left {
-    text-align: left !important;
-  }
-  .text-md-right {
-    text-align: right !important;
-  }
-  .text-md-center {
-    text-align: center !important;
-  }
-}
-
-@media (min-width: 992px) {
-  .text-lg-left {
-    text-align: left !important;
-  }
-  .text-lg-right {
-    text-align: right !important;
-  }
-  .text-lg-center {
-    text-align: center !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .text-xl-left {
-    text-align: left !important;
-  }
-  .text-xl-right {
-    text-align: right !important;
-  }
-  .text-xl-center {
-    text-align: center !important;
-  }
-}
-
-.text-lowercase {
-  text-transform: lowercase !important;
-}
-
-.text-uppercase {
-  text-transform: uppercase !important;
-}
-
-.text-capitalize {
-  text-transform: capitalize !important;
-}
-
-.font-weight-light {
-  font-weight: 300 !important;
-}
-
-.font-weight-lighter {
-  font-weight: lighter !important;
-}
-
-.font-weight-normal {
-  font-weight: 400 !important;
-}
-
-.font-weight-bold {
-  font-weight: 700 !important;
-}
-
-.font-weight-bolder {
-  font-weight: bolder !important;
-}
-
-.font-italic {
-  font-style: italic !important;
-}
-
-.text-white {
-  color: #fff !important;
-}
-
-.text-primary {
-  color: #007bff !important;
-}
-
-a.text-primary:hover, a.text-primary:focus {
-  color: #0056b3 !important;
-}
-
-.text-secondary {
-  color: #6c757d !important;
-}
-
-a.text-secondary:hover, a.text-secondary:focus {
-  color: #494f54 !important;
-}
-
-.text-success {
-  color: #28a745 !important;
-}
-
-a.text-success:hover, a.text-success:focus {
-  color: #19692c !important;
-}
-
-.text-info {
-  color: #17a2b8 !important;
-}
-
-a.text-info:hover, a.text-info:focus {
-  color: #0f6674 !important;
-}
-
-.text-warning {
-  color: #ffc107 !important;
-}
-
-a.text-warning:hover, a.text-warning:focus {
-  color: #ba8b00 !important;
-}
-
-.text-danger {
-  color: #dc3545 !important;
-}
-
-a.text-danger:hover, a.text-danger:focus {
-  color: #a71d2a !important;
-}
-
-.text-light {
-  color: #f8f9fa !important;
-}
-
-a.text-light:hover, a.text-light:focus {
-  color: #cbd3da !important;
-}
-
-.text-dark {
-  color: #343a40 !important;
-}
-
-a.text-dark:hover, a.text-dark:focus {
-  color: #121416 !important;
-}
-
-.text-body {
-  color: #212529 !important;
-}
-
-.text-muted {
-  color: #6c757d !important;
-}
-
-.text-black-50 {
-  color: rgba(0, 0, 0, 0.5) !important;
-}
-
-.text-white-50 {
-  color: rgba(255, 255, 255, 0.5) !important;
-}
-
-.text-hide {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.text-decoration-none {
-  text-decoration: none !important;
-}
-
-.text-break {
-  word-break: break-word !important;
-  overflow-wrap: break-word !important;
-}
-
-.text-reset {
-  color: inherit !important;
-}
-
-.visible {
-  visibility: visible !important;
-}
-
-.invisible {
-  visibility: hidden !important;
-}
-
-@media print {
-  *,
-  *::before,
-  *::after {
-    text-shadow: none !important;
-    box-shadow: none !important;
-  }
-  a:not(.btn) {
-    text-decoration: underline;
-  }
-  abbr[title]::after {
-    content: " (" attr(title) ")";
-  }
-  pre {
-    white-space: pre-wrap !important;
-  }
-  pre,
-  blockquote {
-    border: 1px solid #adb5bd;
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-  @page {
-    size: a3;
-  }
-  body {
-    min-width: 992px !important;
-  }
-  .container {
-    min-width: 992px !important;
-  }
-  .navbar {
-    display: none;
-  }
-  .badge {
-    border: 1px solid #000;
-  }
-  .table {
-    border-collapse: collapse !important;
-  }
-  .table td,
-  .table th {
-    background-color: #fff !important;
-  }
-  .table-bordered th,
-  .table-bordered td {
-    border: 1px solid #dee2e6 !important;
-  }
-  .table-dark {
-    color: inherit;
-  }
-  .table-dark th,
-  .table-dark td,
-  .table-dark thead th,
-  .table-dark tbody + tbody {
-    border-color: #dee2e6;
-  }
-  .table .thead-dark th {
-    color: inherit;
-    border-color: #dee2e6;
-  }
-}
-/*# sourceMappingURL=bootstrap.css.map */
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--gray:#6c757d;--gray-dark:#343a40;--brand-primary:#fc0;--brand-secondary:#ff3939;--primary-accent-yellow:#fc0;--primary-accent-light-yellow:#fffaf0;--primary-accent-blue:#257af4;--primary-accent-light-blue:#e3f1fe;--secondary-accent-orange:#ff8c00;--secondary-accent-light-orange:#ffe4b5;--secondary-accent-red:#ff3939;--secondary-accent-light-red:#ffe4e1;--primary:#fc0;--secondary:#212529;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f1f6f9;--dark:#495057;--primary-light:#fffaf0;--secondary-light:#fff;--tertiary:#257af4;--tertiary-light:#e3f1fe;--white:#fff;--black:#212529;--blue:#257af4;--light-blue:#e3f1fe;--yellow:#fc0;--light-yellow:#fffaf0;--orange:#ff8c00;--light-orange:#ffe4b5;--red:#ff3939;--light-red:#ffe4e1;--medium:#d6dbdf;--breakpoint-xxs:0;--breakpoint-xs:400px;--breakpoint-sm:616px;--breakpoint-md:768px;--breakpoint-lg:980px;--breakpoint-xl:1240px;--font-family-sans-serif:"Noto Sans",sans-serif;--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(33,37,41,0)}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:Noto Sans,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:16px}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{font-style:normal;line-height:inherit}address,dl,ol,ul{margin-bottom:1rem}dl,ol,ul{margin-top:0}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{text-decoration:none;background-color:transparent}a,a:hover{color:#ff8c00}a:hover{text-decoration:underline}a:not([href]),a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{border-style:none}img,svg{vertical-align:middle}svg{overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}@media(max-width:1200px){legend{font-size:calc(1.275rem + .3vw)}}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:16px;font-family:Hind Siliguri,sans-serif;font-weight:500;line-height:1.125}.h1,h1{font-size:2.5rem}@media(max-width:1200px){.h1,h1{font-size:calc(1.375rem + 1.5vw)}}.h2,h2{font-size:2rem}@media(max-width:1200px){.h2,h2{font-size:calc(1.325rem + .9vw)}}.h3,h3{font-size:1.75rem}@media(max-width:1200px){.h3,h3{font-size:calc(1.3rem + .6vw)}}.h4,h4{font-size:1.5rem}@media(max-width:1200px){.h4,h4{font-size:calc(1.275rem + .3vw)}}.h5,h5{font-size:1.125rem}.h6,h6{font-size:.875rem}.lead{font-size:1.375rem;font-weight:400}@media(max-width:1200px){.lead{font-size:calc(1.2625rem + .15vw)}}.display-1{font-size:4rem;font-weight:600;line-height:1.125}@media(max-width:1200px){.display-1{font-size:calc(1.525rem + 3.3vw)}}.display-2{font-size:2.5rem;font-weight:600;line-height:1.125}@media(max-width:1200px){.display-2{font-size:calc(1.375rem + 1.5vw)}}.display-3{font-size:2rem;font-weight:500;line-height:1.125}@media(max-width:1200px){.display-3{font-size:calc(1.325rem + .9vw)}}.display-4{font-size:1.75rem;font-weight:500;line-height:1.125}@media(max-width:1200px){.display-4{font-size:calc(1.3rem + .6vw)}}hr{margin-top:8px;margin-bottom:8px;border:0;border-top:1px solid rgba(33,37,41,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-inline,.list-unstyled{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:8px;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer:before{content:"— "}.img-fluid,.img-thumbnail{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:8px}.figure{display:inline-block}.figure-img{margin-bottom:4px;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code{font-size:87.5%;color:#e83e8c;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#495057;border-radius:8px}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#495057}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:20px;padding-left:20px;margin-right:auto;margin-left:auto}@media(min-width:400px){.container{max-width:576px}}@media(min-width:616px){.container{max-width:576px}}@media(min-width:768px){.container{max-width:958px}}@media(min-width:980px){.container{max-width:1008px}}@media(min-width:1240px){.container{max-width:1118px}}.container-fluid,.container-lg,.container-md,.container-sm,.container-xl,.container-xs{width:100%;padding-right:20px;padding-left:20px;margin-right:auto;margin-left:auto}@media(min-width:400px){.container,.container-xs{max-width:576px}}@media(min-width:616px){.container,.container-sm,.container-xs{max-width:576px}}@media(min-width:768px){.container,.container-md,.container-sm,.container-xs{max-width:958px}}@media(min-width:980px){.container,.container-lg,.container-md,.container-sm,.container-xs{max-width:1008px}}@media(min-width:1240px){.container,.container-lg,.container-md,.container-sm,.container-xl,.container-xs{max-width:1118px}}.row{display:flex;flex-wrap:wrap;margin-right:-20px;margin-left:-20px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col-auto,.col-lg,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-auto,.col-md,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md-auto,.col-sm,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-auto,.col-xs,.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-auto{position:relative;width:100%;padding-right:20px;padding-left:20px}.col{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-1>*{flex:0 0 100%;max-width:100%}.row-cols-2>*{flex:0 0 50%;max-width:50%}.row-cols-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-4>*{flex:0 0 25%;max-width:25%}.row-cols-5>*{flex:0 0 20%;max-width:20%}.row-cols-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-auto{flex:0 0 auto;width:auto;max-width:100%}.col-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-3{flex:0 0 25%;max-width:25%}.col-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-6{flex:0 0 50%;max-width:50%}.col-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-9{flex:0 0 75%;max-width:75%}.col-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-12{flex:0 0 100%;max-width:100%}.order-first{order:-1}.order-last{order:13}.order-0{order:0}.order-1{order:1}.order-2{order:2}.order-3{order:3}.order-4{order:4}.order-5{order:5}.order-6{order:6}.order-7{order:7}.order-8{order:8}.order-9{order:9}.order-10{order:10}.order-11{order:11}.order-12{order:12}.offset-1{margin-left:8.3333333333%}.offset-2{margin-left:16.6666666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.3333333333%}.offset-5{margin-left:41.6666666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.3333333333%}.offset-8{margin-left:66.6666666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.3333333333%}.offset-11{margin-left:91.6666666667%}@media(min-width:400px){.col-xs{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-xs-1>*{flex:0 0 100%;max-width:100%}.row-cols-xs-2>*{flex:0 0 50%;max-width:50%}.row-cols-xs-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-xs-4>*{flex:0 0 25%;max-width:25%}.row-cols-xs-5>*{flex:0 0 20%;max-width:20%}.row-cols-xs-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xs-auto{flex:0 0 auto;width:auto;max-width:100%}.col-xs-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-xs-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xs-3{flex:0 0 25%;max-width:25%}.col-xs-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-xs-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-xs-6{flex:0 0 50%;max-width:50%}.col-xs-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-xs-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-xs-9{flex:0 0 75%;max-width:75%}.col-xs-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-xs-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-xs-12{flex:0 0 100%;max-width:100%}.order-xs-first{order:-1}.order-xs-last{order:13}.order-xs-0{order:0}.order-xs-1{order:1}.order-xs-2{order:2}.order-xs-3{order:3}.order-xs-4{order:4}.order-xs-5{order:5}.order-xs-6{order:6}.order-xs-7{order:7}.order-xs-8{order:8}.order-xs-9{order:9}.order-xs-10{order:10}.order-xs-11{order:11}.order-xs-12{order:12}.offset-xs-0{margin-left:0}.offset-xs-1{margin-left:8.3333333333%}.offset-xs-2{margin-left:16.6666666667%}.offset-xs-3{margin-left:25%}.offset-xs-4{margin-left:33.3333333333%}.offset-xs-5{margin-left:41.6666666667%}.offset-xs-6{margin-left:50%}.offset-xs-7{margin-left:58.3333333333%}.offset-xs-8{margin-left:66.6666666667%}.offset-xs-9{margin-left:75%}.offset-xs-10{margin-left:83.3333333333%}.offset-xs-11{margin-left:91.6666666667%}}@media(min-width:616px){.col-sm{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-sm-1>*{flex:0 0 100%;max-width:100%}.row-cols-sm-2>*{flex:0 0 50%;max-width:50%}.row-cols-sm-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-sm-4>*{flex:0 0 25%;max-width:25%}.row-cols-sm-5>*{flex:0 0 20%;max-width:20%}.row-cols-sm-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-sm-auto{flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-sm-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-sm-3{flex:0 0 25%;max-width:25%}.col-sm-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-sm-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-sm-6{flex:0 0 50%;max-width:50%}.col-sm-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-sm-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-sm-9{flex:0 0 75%;max-width:75%}.col-sm-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-sm-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-sm-12{flex:0 0 100%;max-width:100%}.order-sm-first{order:-1}.order-sm-last{order:13}.order-sm-0{order:0}.order-sm-1{order:1}.order-sm-2{order:2}.order-sm-3{order:3}.order-sm-4{order:4}.order-sm-5{order:5}.order-sm-6{order:6}.order-sm-7{order:7}.order-sm-8{order:8}.order-sm-9{order:9}.order-sm-10{order:10}.order-sm-11{order:11}.order-sm-12{order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.3333333333%}.offset-sm-2{margin-left:16.6666666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.3333333333%}.offset-sm-5{margin-left:41.6666666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.3333333333%}.offset-sm-8{margin-left:66.6666666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.3333333333%}.offset-sm-11{margin-left:91.6666666667%}}@media(min-width:768px){.col-md{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-md-1>*{flex:0 0 100%;max-width:100%}.row-cols-md-2>*{flex:0 0 50%;max-width:50%}.row-cols-md-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-md-4>*{flex:0 0 25%;max-width:25%}.row-cols-md-5>*{flex:0 0 20%;max-width:20%}.row-cols-md-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-md-auto{flex:0 0 auto;width:auto;max-width:100%}.col-md-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-md-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-md-3{flex:0 0 25%;max-width:25%}.col-md-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-md-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-md-6{flex:0 0 50%;max-width:50%}.col-md-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-md-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-md-9{flex:0 0 75%;max-width:75%}.col-md-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-md-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-md-12{flex:0 0 100%;max-width:100%}.order-md-first{order:-1}.order-md-last{order:13}.order-md-0{order:0}.order-md-1{order:1}.order-md-2{order:2}.order-md-3{order:3}.order-md-4{order:4}.order-md-5{order:5}.order-md-6{order:6}.order-md-7{order:7}.order-md-8{order:8}.order-md-9{order:9}.order-md-10{order:10}.order-md-11{order:11}.order-md-12{order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.3333333333%}.offset-md-2{margin-left:16.6666666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.3333333333%}.offset-md-5{margin-left:41.6666666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.3333333333%}.offset-md-8{margin-left:66.6666666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.3333333333%}.offset-md-11{margin-left:91.6666666667%}}@media(min-width:980px){.col-lg{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-lg-1>*{flex:0 0 100%;max-width:100%}.row-cols-lg-2>*{flex:0 0 50%;max-width:50%}.row-cols-lg-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-lg-4>*{flex:0 0 25%;max-width:25%}.row-cols-lg-5>*{flex:0 0 20%;max-width:20%}.row-cols-lg-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-lg-auto{flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-lg-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-lg-3{flex:0 0 25%;max-width:25%}.col-lg-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-lg-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-lg-6{flex:0 0 50%;max-width:50%}.col-lg-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-lg-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-lg-9{flex:0 0 75%;max-width:75%}.col-lg-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-lg-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-lg-12{flex:0 0 100%;max-width:100%}.order-lg-first{order:-1}.order-lg-last{order:13}.order-lg-0{order:0}.order-lg-1{order:1}.order-lg-2{order:2}.order-lg-3{order:3}.order-lg-4{order:4}.order-lg-5{order:5}.order-lg-6{order:6}.order-lg-7{order:7}.order-lg-8{order:8}.order-lg-9{order:9}.order-lg-10{order:10}.order-lg-11{order:11}.order-lg-12{order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.3333333333%}.offset-lg-2{margin-left:16.6666666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.3333333333%}.offset-lg-5{margin-left:41.6666666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.3333333333%}.offset-lg-8{margin-left:66.6666666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.3333333333%}.offset-lg-11{margin-left:91.6666666667%}}@media(min-width:1240px){.col-xl{flex-basis:0;flex-grow:1;max-width:100%}.row-cols-xl-1>*{flex:0 0 100%;max-width:100%}.row-cols-xl-2>*{flex:0 0 50%;max-width:50%}.row-cols-xl-3>*{flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-xl-4>*{flex:0 0 25%;max-width:25%}.row-cols-xl-5>*{flex:0 0 20%;max-width:20%}.row-cols-xl-6>*{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xl-auto{flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-xl-2{flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xl-3{flex:0 0 25%;max-width:25%}.col-xl-4{flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-xl-5{flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-xl-6{flex:0 0 50%;max-width:50%}.col-xl-7{flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-xl-8{flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-xl-9{flex:0 0 75%;max-width:75%}.col-xl-10{flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-xl-11{flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-xl-12{flex:0 0 100%;max-width:100%}.order-xl-first{order:-1}.order-xl-last{order:13}.order-xl-0{order:0}.order-xl-1{order:1}.order-xl-2{order:2}.order-xl-3{order:3}.order-xl-4{order:4}.order-xl-5{order:5}.order-xl-6{order:6}.order-xl-7{order:7}.order-xl-8{order:8}.order-xl-9{order:9}.order-xl-10{order:10}.order-xl-11{order:11}.order-xl-12{order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.3333333333%}.offset-xl-2{margin-left:16.6666666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.3333333333%}.offset-xl-5{margin-left:41.6666666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.3333333333%}.offset-xl-8{margin-left:66.6666666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.3333333333%}.offset-xl-11{margin-left:91.6666666667%}}.table{width:100%;margin-bottom:8px;color:#212529}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #d6dbdf}.table thead th{vertical-align:bottom;border-bottom:2px solid #d6dbdf}.table tbody+tbody{border-top:2px solid #d6dbdf}.table-sm td,.table-sm th{padding:.3rem}.table-bordered,.table-bordered td,.table-bordered th{border:1px solid #d6dbdf}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(33,37,41,.05)}.table-hover tbody tr:hover{color:#212529;background-color:rgba(33,37,41,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#fff1b8}.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#ffe47a}.table-hover .table-primary:hover,.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#ffec9f}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#c1c2c3}.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#8c8e90}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#b4b5b6}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-success tbody+tbody,.table-success td,.table-success th,.table-success thead th{border-color:#8fd19e}.table-hover .table-success:hover,.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-info tbody+tbody,.table-info td,.table-info th,.table-info thead th{border-color:#86cfda}.table-hover .table-info:hover,.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-warning tbody+tbody,.table-warning td,.table-warning th,.table-warning thead th{border-color:#ffdf7e}.table-hover .table-warning:hover,.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-danger tbody+tbody,.table-danger td,.table-danger th,.table-danger thead th{border-color:#ed969e}.table-hover .table-danger:hover,.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fbfcfd}.table-light tbody+tbody,.table-light td,.table-light th,.table-light thead th{border-color:#f8fafc}.table-hover .table-light:hover,.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#eaeff5}.table-dark,.table-dark>td,.table-dark>th{background-color:#ccced0}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#a0a4a8}.table-hover .table-dark:hover,.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#bfc1c4}.table-primary-light,.table-primary-light>td,.table-primary-light>th{background-color:#fffefb}.table-primary-light tbody+tbody,.table-primary-light td,.table-primary-light th,.table-primary-light thead th{border-color:#fffcf7}.table-hover .table-primary-light:hover,.table-hover .table-primary-light:hover>td,.table-hover .table-primary-light:hover>th{background-color:#fff8e2}.table-secondary-light,.table-secondary-light>td,.table-secondary-light>th{background-color:#fff}.table-secondary-light tbody+tbody,.table-secondary-light td,.table-secondary-light th,.table-secondary-light thead th{border-color:#fff}.table-hover .table-secondary-light:hover,.table-hover .table-secondary-light:hover>td,.table-hover .table-secondary-light:hover>th{background-color:#f2f2f2}.table-tertiary,.table-tertiary>td,.table-tertiary>th{background-color:#c2dafc}.table-tertiary tbody+tbody,.table-tertiary td,.table-tertiary th,.table-tertiary thead th{border-color:#8ebaf9}.table-hover .table-tertiary:hover,.table-hover .table-tertiary:hover>td,.table-hover .table-tertiary:hover>th{background-color:#aacbfb}.table-tertiary-light,.table-tertiary-light>td,.table-tertiary-light>th{background-color:#f7fbff}.table-tertiary-light tbody+tbody,.table-tertiary-light td,.table-tertiary-light th,.table-tertiary-light thead th{border-color:#f0f8fe}.table-hover .table-tertiary-light:hover,.table-hover .table-tertiary-light:hover>td,.table-hover .table-tertiary-light:hover>th{background-color:#deeeff}.table-white,.table-white>td,.table-white>th{background-color:#fff}.table-white tbody+tbody,.table-white td,.table-white th,.table-white thead th{border-color:#fff}.table-hover .table-white:hover,.table-hover .table-white:hover>td,.table-hover .table-white:hover>th{background-color:#f2f2f2}.table-black,.table-black>td,.table-black>th{background-color:#c1c2c3}.table-black tbody+tbody,.table-black td,.table-black th,.table-black thead th{border-color:#8c8e90}.table-hover .table-black:hover,.table-hover .table-black:hover>td,.table-hover .table-black:hover>th{background-color:#b4b5b6}.table-blue,.table-blue>td,.table-blue>th{background-color:#c2dafc}.table-blue tbody+tbody,.table-blue td,.table-blue th,.table-blue thead th{border-color:#8ebaf9}.table-hover .table-blue:hover,.table-hover .table-blue:hover>td,.table-hover .table-blue:hover>th{background-color:#aacbfb}.table-light-blue,.table-light-blue>td,.table-light-blue>th{background-color:#f7fbff}.table-light-blue tbody+tbody,.table-light-blue td,.table-light-blue th,.table-light-blue thead th{border-color:#f0f8fe}.table-hover .table-light-blue:hover,.table-hover .table-light-blue:hover>td,.table-hover .table-light-blue:hover>th{background-color:#deeeff}.table-yellow,.table-yellow>td,.table-yellow>th{background-color:#fff1b8}.table-yellow tbody+tbody,.table-yellow td,.table-yellow th,.table-yellow thead th{border-color:#ffe47a}.table-hover .table-yellow:hover,.table-hover .table-yellow:hover>td,.table-hover .table-yellow:hover>th{background-color:#ffec9f}.table-light-yellow,.table-light-yellow>td,.table-light-yellow>th{background-color:#fffefb}.table-light-yellow tbody+tbody,.table-light-yellow td,.table-light-yellow th,.table-light-yellow thead th{border-color:#fffcf7}.table-hover .table-light-yellow:hover,.table-hover .table-light-yellow:hover>td,.table-hover .table-light-yellow:hover>th{background-color:#fff8e2}.table-orange,.table-orange>td,.table-orange>th{background-color:#ffdfb8}.table-orange tbody+tbody,.table-orange td,.table-orange th,.table-orange thead th{border-color:#ffc37a}.table-hover .table-orange:hover,.table-hover .table-orange:hover>td,.table-hover .table-orange:hover>th{background-color:#ffd49f}.table-light-orange,.table-light-orange>td,.table-light-orange>th{background-color:#fff7ea}.table-light-orange tbody+tbody,.table-light-orange td,.table-light-orange th,.table-light-orange thead th{border-color:#fff1d9}.table-hover .table-light-orange:hover,.table-hover .table-light-orange:hover>td,.table-hover .table-light-orange:hover>th{background-color:#ffedd1}.table-red,.table-red>td,.table-red>th{background-color:#ffc8c8}.table-red tbody+tbody,.table-red td,.table-red th,.table-red thead th{border-color:#ff9898}.table-hover .table-red:hover,.table-hover .table-red:hover>td,.table-hover .table-red:hover>th{background-color:#ffafaf}.table-light-red,.table-light-red>td,.table-light-red>th{background-color:#fff7f7}.table-light-red tbody+tbody,.table-light-red td,.table-light-red th,.table-light-red thead th{border-color:#fff1ef}.table-hover .table-light-red:hover,.table-hover .table-light-red:hover>td,.table-hover .table-light-red:hover>th{background-color:#ffdede}.table-medium,.table-medium>td,.table-medium>th{background-color:#f4f5f6}.table-medium tbody+tbody,.table-medium td,.table-medium th,.table-medium thead th{border-color:#eaecee}.table-hover .table-medium:hover,.table-hover .table-medium:hover>td,.table-hover .table-medium:hover>th{background-color:#e6e8eb}.table-active,.table-active>td,.table-active>th{background-color:rgba(33,37,41,.075)}.table-hover .table-active:hover,.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(22,24,27,.075)}.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}.table .thead-light th{color:#6c757d;background-color:#e9ecef;border-color:#d6dbdf}.table-dark{color:#fff;background-color:#343a40}.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:hsla(0,0%,100%,.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:hsla(0,0%,100%,.075)}@media(max-width:399.98px){.table-responsive-xs{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xs>.table-bordered{border:0}}@media(max-width:615.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media(max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media(max-width:979.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media(max-width:1239.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#6c757d;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:8px;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.form-control{transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:-moz-focusring{color:transparent;text-shadow:0 0 0 #6c757d}.form-control:focus{color:#6c757d;background-color:#fff;border-color:#ffe680;outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:focus::-ms-value{color:#6c757d;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.125rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding:.375rem 0;margin-bottom:0;font-size:1rem;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.5em + .5rem + 2px);padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:8px}.form-control-lg{height:calc(1.5em + 1rem + 2px);padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:8px}select.form-control[multiple],select.form-control[size],textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:flex;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label,.form-check-input[disabled]~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:inline-flex;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:8px}.is-valid~.valid-feedback,.is-valid~.valid-tooltip,.was-validated :valid~.valid-feedback,.was-validated :valid~.valid-tooltip{display:block}.form-control.is-valid,.was-validated .form-control:valid{border-color:#28a745;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-valid,.was-validated .custom-select:valid{border-color:#28a745;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-valid:focus,.was-validated .custom-select:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label:before,.was-validated .custom-control-input:valid~.custom-control-label:before{border-color:#28a745}.custom-control-input.is-valid:checked~.custom-control-label:before,.was-validated .custom-control-input:valid:checked~.custom-control-label:before{border-color:#34ce57;background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label:before,.was-validated .custom-control-input:valid:focus~.custom-control-label:before{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-control-input.is-valid:focus:not(:checked)~.custom-control-label:before,.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-control-input:valid:focus:not(:checked)~.custom-control-label:before,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875rem;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:8px}.is-invalid~.invalid-feedback,.is-invalid~.invalid-tooltip,.was-validated :invalid~.invalid-feedback,.was-validated :invalid~.invalid-tooltip{display:block}.form-control.is-invalid,.was-validated .form-control:invalid{border-color:#dc3545;padding-right:calc(1.5em + .75rem);background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545'%3E%3Ccircle cx='6' cy='6' r='4.5'/%3E%3Cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3E%3Ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3E%3C/svg%3E");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}.form-control.is-invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}.custom-select.is-invalid,.was-validated .custom-select:invalid{border-color:#dc3545;padding-right:calc(.75em + 2.3125rem);background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center/8px 10px,url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545'%3E%3Ccircle cx='6' cy='6' r='4.5'/%3E%3Cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3E%3Ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3E%3C/svg%3E") #fff no-repeat center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem)}.custom-select.is-invalid:focus,.was-validated .custom-select:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label:before,.was-validated .custom-control-input:invalid~.custom-control-label:before{border-color:#dc3545}.custom-control-input.is-invalid:checked~.custom-control-label:before,.was-validated .custom-control-input:invalid:checked~.custom-control-label:before{border-color:#e4606d;background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label:before,.was-validated .custom-control-input:invalid:focus~.custom-control-label:before{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-control-input.is-invalid:focus:not(:checked)~.custom-control-label:before,.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-control-input:invalid:focus:not(:checked)~.custom-control-label:before,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:flex;flex-flow:row wrap;align-items:center}.form-inline .form-check{width:100%}@media(min-width:616px){.form-inline label{justify-content:center}.form-inline .form-group,.form-inline label{display:flex;align-items:center;margin-bottom:0}.form-inline .form-group{flex:0 0 auto;flex-flow:row wrap}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .custom-select,.form-inline .input-group{width:auto}.form-inline .form-check{display:flex;align-items:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;flex-shrink:0;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{align-items:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-family:inherit;font-weight:700;color:#212529;text-align:center;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:12px 32px;font-size:.875rem;line-height:20px;border-radius:8px;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529;text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:none}.btn.disabled,.btn:disabled{opacity:.65}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#495057;background-color:#fc0;border-color:#fc0}.btn-primary.focus,.btn-primary:focus,.btn-primary:hover{color:#495057;background-color:#d9ad00;border-color:#cca300}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#495057;background-color:#fc0;border-color:#fc0}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#495057;background-color:#cca300;border-color:#bf9900}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-secondary{color:#fff;background-color:#212529;border-color:#212529}.btn-secondary.focus,.btn-secondary:focus,.btn-secondary:hover{color:#fff;background-color:#101214;border-color:#0a0c0d}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#212529;border-color:#212529}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#0a0c0d;border-color:#050506}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success.focus,.btn-success:focus,.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{box-shadow:0 0 0 0 rgba(72,180,97,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(72,180,97,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info.focus,.btn-info:focus,.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{box-shadow:0 0 0 0 rgba(58,176,195,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(58,176,195,.5)}.btn-warning{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-warning.focus,.btn-warning:focus,.btn-warning:hover{color:#495057;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{box-shadow:0 0 0 0 rgba(228,176,19,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#495057;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,176,19,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger.focus,.btn-danger:focus,.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{box-shadow:0 0 0 0 rgba(225,83,97,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(225,83,97,.5)}.btn-light{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-light.focus,.btn-light:focus,.btn-light:hover{color:#495057;background-color:#d6e5ee;border-color:#cddfea}.btn-light.focus,.btn-light:focus{box-shadow:0 0 0 0 rgba(216,221,225,.5)}.btn-light.disabled,.btn-light:disabled{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#495057;background-color:#cddfea;border-color:#c4d9e6}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(216,221,225,.5)}.btn-dark{color:#fff;background-color:#495057;border-color:#495057}.btn-dark.focus,.btn-dark:focus,.btn-dark:hover{color:#fff;background-color:#383d42;border-color:#32373b}.btn-dark.focus,.btn-dark:focus{box-shadow:0 0 0 0 rgba(100,106,112,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#495057;border-color:#495057}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#32373b;border-color:#2c3034}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(100,106,112,.5)}.btn-primary-light{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-primary-light.focus,.btn-primary-light:focus,.btn-primary-light:hover{color:#495057;background-color:#ffedca;border-color:#ffe9bd}.btn-primary-light.focus,.btn-primary-light:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-primary-light.disabled,.btn-primary-light:disabled{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-primary-light:not(:disabled):not(.disabled).active,.btn-primary-light:not(:disabled):not(.disabled):active,.show>.btn-primary-light.dropdown-toggle{color:#495057;background-color:#ffe9bd;border-color:#ffe5b0}.btn-primary-light:not(:disabled):not(.disabled).active:focus,.btn-primary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-primary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-secondary-light{color:#495057;background-color:#fff;border-color:#fff}.btn-secondary-light.focus,.btn-secondary-light:focus,.btn-secondary-light:hover{color:#495057;background-color:#ececec;border-color:#e6e6e6}.btn-secondary-light.focus,.btn-secondary-light:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-secondary-light.disabled,.btn-secondary-light:disabled{color:#495057;background-color:#fff;border-color:#fff}.btn-secondary-light:not(:disabled):not(.disabled).active,.btn-secondary-light:not(:disabled):not(.disabled):active,.show>.btn-secondary-light.dropdown-toggle{color:#495057;background-color:#e6e6e6;border-color:#dfdfdf}.btn-secondary-light:not(:disabled):not(.disabled).active:focus,.btn-secondary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-tertiary{color:#fff;background-color:#257af4;border-color:#257af4}.btn-tertiary.focus,.btn-tertiary:focus,.btn-tertiary:hover{color:#fff;background-color:#0c66e7;border-color:#0b60db}.btn-tertiary.focus,.btn-tertiary:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-tertiary.disabled,.btn-tertiary:disabled{color:#fff;background-color:#257af4;border-color:#257af4}.btn-tertiary:not(:disabled):not(.disabled).active,.btn-tertiary:not(:disabled):not(.disabled):active,.show>.btn-tertiary.dropdown-toggle{color:#fff;background-color:#0b60db;border-color:#0a5bcf}.btn-tertiary:not(:disabled):not(.disabled).active:focus,.btn-tertiary:not(:disabled):not(.disabled):active:focus,.show>.btn-tertiary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-tertiary-light{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-tertiary-light.focus,.btn-tertiary-light:focus,.btn-tertiary-light:hover{color:#495057;background-color:#bedffd;border-color:#b2d8fc}.btn-tertiary-light.focus,.btn-tertiary-light:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-tertiary-light.disabled,.btn-tertiary-light:disabled{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-tertiary-light:not(:disabled):not(.disabled).active,.btn-tertiary-light:not(:disabled):not(.disabled):active,.show>.btn-tertiary-light.dropdown-toggle{color:#495057;background-color:#b2d8fc;border-color:#a5d2fc}.btn-tertiary-light:not(:disabled):not(.disabled).active:focus,.btn-tertiary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-tertiary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-white{color:#495057;background-color:#fff;border-color:#fff}.btn-white.focus,.btn-white:focus,.btn-white:hover{color:#495057;background-color:#ececec;border-color:#e6e6e6}.btn-white.focus,.btn-white:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-white.disabled,.btn-white:disabled{color:#495057;background-color:#fff;border-color:#fff}.btn-white:not(:disabled):not(.disabled).active,.btn-white:not(:disabled):not(.disabled):active,.show>.btn-white.dropdown-toggle{color:#495057;background-color:#e6e6e6;border-color:#dfdfdf}.btn-white:not(:disabled):not(.disabled).active:focus,.btn-white:not(:disabled):not(.disabled):active:focus,.show>.btn-white.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,229,230,.5)}.btn-black{color:#fff;background-color:#212529;border-color:#212529}.btn-black.focus,.btn-black:focus,.btn-black:hover{color:#fff;background-color:#101214;border-color:#0a0c0d}.btn-black.focus,.btn-black:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-black.disabled,.btn-black:disabled{color:#fff;background-color:#212529;border-color:#212529}.btn-black:not(:disabled):not(.disabled).active,.btn-black:not(:disabled):not(.disabled):active,.show>.btn-black.dropdown-toggle{color:#fff;background-color:#0a0c0d;border-color:#050506}.btn-black:not(:disabled):not(.disabled).active:focus,.btn-black:not(:disabled):not(.disabled):active:focus,.show>.btn-black.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(66,70,73,.5)}.btn-blue{color:#fff;background-color:#257af4;border-color:#257af4}.btn-blue.focus,.btn-blue:focus,.btn-blue:hover{color:#fff;background-color:#0c66e7;border-color:#0b60db}.btn-blue.focus,.btn-blue:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-blue.disabled,.btn-blue:disabled{color:#fff;background-color:#257af4;border-color:#257af4}.btn-blue:not(:disabled):not(.disabled).active,.btn-blue:not(:disabled):not(.disabled):active,.show>.btn-blue.dropdown-toggle{color:#fff;background-color:#0b60db;border-color:#0a5bcf}.btn-blue:not(:disabled):not(.disabled).active:focus,.btn-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(70,142,246,.5)}.btn-light-blue{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-light-blue.focus,.btn-light-blue:focus,.btn-light-blue:hover{color:#495057;background-color:#bedffd;border-color:#b2d8fc}.btn-light-blue.focus,.btn-light-blue:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-light-blue.disabled,.btn-light-blue:disabled{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-light-blue:not(:disabled):not(.disabled).active,.btn-light-blue:not(:disabled):not(.disabled):active,.show>.btn-light-blue.dropdown-toggle{color:#495057;background-color:#b2d8fc;border-color:#a5d2fc}.btn-light-blue:not(:disabled):not(.disabled).active:focus,.btn-light-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-light-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(204,217,229,.5)}.btn-yellow{color:#495057;background-color:#fc0;border-color:#fc0}.btn-yellow.focus,.btn-yellow:focus,.btn-yellow:hover{color:#495057;background-color:#d9ad00;border-color:#cca300}.btn-yellow.focus,.btn-yellow:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-yellow.disabled,.btn-yellow:disabled{color:#495057;background-color:#fc0;border-color:#fc0}.btn-yellow:not(:disabled):not(.disabled).active,.btn-yellow:not(:disabled):not(.disabled):active,.show>.btn-yellow.dropdown-toggle{color:#495057;background-color:#cca300;border-color:#bf9900}.btn-yellow:not(:disabled):not(.disabled).active:focus,.btn-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,185,13,.5)}.btn-light-yellow{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-light-yellow.focus,.btn-light-yellow:focus,.btn-light-yellow:hover{color:#495057;background-color:#ffedca;border-color:#ffe9bd}.btn-light-yellow.focus,.btn-light-yellow:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-light-yellow.disabled,.btn-light-yellow:disabled{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-light-yellow:not(:disabled):not(.disabled).active,.btn-light-yellow:not(:disabled):not(.disabled):active,.show>.btn-light-yellow.dropdown-toggle{color:#495057;background-color:#ffe9bd;border-color:#ffe5b0}.btn-light-yellow:not(:disabled):not(.disabled).active:focus,.btn-light-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-light-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,225,217,.5)}.btn-orange{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-orange.focus,.btn-orange:focus,.btn-orange:hover{color:#fff;background-color:#d97700;border-color:#cc7000}.btn-orange.focus,.btn-orange:focus{box-shadow:0 0 0 0 rgba(228,131,13,.5)}.btn-orange.disabled,.btn-orange:disabled{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-orange:not(:disabled):not(.disabled).active,.btn-orange:not(:disabled):not(.disabled):active,.show>.btn-orange.dropdown-toggle{color:#fff;background-color:#cc7000;border-color:#bf6900}.btn-orange:not(:disabled):not(.disabled).active:focus,.btn-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,131,13,.5)}.btn-light-orange{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-light-orange.focus,.btn-light-orange:focus,.btn-light-orange:hover{color:#495057;background-color:#ffd68f;border-color:#ffd182}.btn-light-orange.focus,.btn-light-orange:focus{box-shadow:0 0 0 0 rgba(228,206,167,.5)}.btn-light-orange.disabled,.btn-light-orange:disabled{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-light-orange:not(:disabled):not(.disabled).active,.btn-light-orange:not(:disabled):not(.disabled):active,.show>.btn-light-orange.dropdown-toggle{color:#495057;background-color:#ffd182;border-color:#ffcd75}.btn-light-orange:not(:disabled):not(.disabled).active:focus,.btn-light-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-light-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,206,167,.5)}.btn-red{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-red.focus,.btn-red:focus,.btn-red:hover{color:#fff;background-color:#ff1313;border-color:#ff0606}.btn-red.focus,.btn-red:focus{box-shadow:0 0 0 0 rgba(255,87,87,.5)}.btn-red.disabled,.btn-red:disabled{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-red:not(:disabled):not(.disabled).active,.btn-red:not(:disabled):not(.disabled):active,.show>.btn-red.dropdown-toggle{color:#fff;background-color:#ff0606;border-color:#f80000}.btn-red:not(:disabled):not(.disabled).active:focus,.btn-red:not(:disabled):not(.disabled):active:focus,.show>.btn-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,87,87,.5)}.btn-light-red{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-light-red.focus,.btn-light-red:focus,.btn-light-red:hover{color:#495057;background-color:#ffc2bb;border-color:#ffb6ae}.btn-light-red.focus,.btn-light-red:focus{box-shadow:0 0 0 0 rgba(228,206,204,.5)}.btn-light-red.disabled,.btn-light-red:disabled{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-light-red:not(:disabled):not(.disabled).active,.btn-light-red:not(:disabled):not(.disabled):active,.show>.btn-light-red.dropdown-toggle{color:#495057;background-color:#ffb6ae;border-color:#ffaba1}.btn-light-red:not(:disabled):not(.disabled).active:focus,.btn-light-red:not(:disabled):not(.disabled):active:focus,.show>.btn-light-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(228,206,204,.5)}.btn-medium{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-medium.focus,.btn-medium:focus,.btn-medium:hover{color:#495057;background-color:#c1c8ce;border-color:#b9c2c9}.btn-medium.focus,.btn-medium:focus{box-shadow:0 0 0 0 rgba(193,198,203,.5)}.btn-medium.disabled,.btn-medium:disabled{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-medium:not(:disabled):not(.disabled).active,.btn-medium:not(:disabled):not(.disabled):active,.show>.btn-medium.dropdown-toggle{color:#495057;background-color:#b9c2c9;border-color:#b2bcc3}.btn-medium:not(:disabled):not(.disabled).active:focus,.btn-medium:not(:disabled):not(.disabled):active:focus,.show>.btn-medium.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(193,198,203,.5)}.btn-outline-primary{color:#fc0;border-color:#fc0}.btn-outline-primary:hover{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#fc0;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-secondary{color:#212529;border-color:#212529}.btn-outline-secondary:hover{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#212529;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-success{color:#28a745;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 0 rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 0 rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;border-color:#ffc107}.btn-outline-warning:hover{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 0 rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#495057;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 0 rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(220,53,69,.5)}.btn-outline-light{color:#f1f6f9;border-color:#f1f6f9}.btn-outline-light:hover{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 0 rgba(241,246,249,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f1f6f9;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#495057;background-color:#f1f6f9;border-color:#f1f6f9}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(241,246,249,.5)}.btn-outline-dark{color:#495057;border-color:#495057}.btn-outline-dark:hover{color:#fff;background-color:#495057;border-color:#495057}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 0 rgba(73,80,87,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#495057;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#495057;border-color:#495057}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(73,80,87,.5)}.btn-outline-primary-light{color:#fffaf0;border-color:#fffaf0}.btn-outline-primary-light:hover{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-primary-light.focus,.btn-outline-primary-light:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-primary-light.disabled,.btn-outline-primary-light:disabled{color:#fffaf0;background-color:transparent}.btn-outline-primary-light:not(:disabled):not(.disabled).active,.btn-outline-primary-light:not(:disabled):not(.disabled):active,.show>.btn-outline-primary-light.dropdown-toggle{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-primary-light:not(:disabled):not(.disabled).active:focus,.btn-outline-primary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-secondary-light{color:#fff;border-color:#fff}.btn-outline-secondary-light:hover{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-secondary-light.focus,.btn-outline-secondary-light:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-secondary-light.disabled,.btn-outline-secondary-light:disabled{color:#fff;background-color:transparent}.btn-outline-secondary-light:not(:disabled):not(.disabled).active,.btn-outline-secondary-light:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary-light.dropdown-toggle{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-secondary-light:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-tertiary{color:#257af4;border-color:#257af4}.btn-outline-tertiary:hover{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-tertiary.focus,.btn-outline-tertiary:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-tertiary.disabled,.btn-outline-tertiary:disabled{color:#257af4;background-color:transparent}.btn-outline-tertiary:not(:disabled):not(.disabled).active,.btn-outline-tertiary:not(:disabled):not(.disabled):active,.show>.btn-outline-tertiary.dropdown-toggle{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-tertiary:not(:disabled):not(.disabled).active:focus,.btn-outline-tertiary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-tertiary.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-tertiary-light{color:#e3f1fe;border-color:#e3f1fe}.btn-outline-tertiary-light:hover{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-tertiary-light.focus,.btn-outline-tertiary-light:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-tertiary-light.disabled,.btn-outline-tertiary-light:disabled{color:#e3f1fe;background-color:transparent}.btn-outline-tertiary-light:not(:disabled):not(.disabled).active,.btn-outline-tertiary-light:not(:disabled):not(.disabled):active,.show>.btn-outline-tertiary-light.dropdown-toggle{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-tertiary-light:not(:disabled):not(.disabled).active:focus,.btn-outline-tertiary-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-tertiary-light.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-white{color:#fff;border-color:#fff}.btn-outline-white:hover{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-white.focus,.btn-outline-white:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-white.disabled,.btn-outline-white:disabled{color:#fff;background-color:transparent}.btn-outline-white:not(:disabled):not(.disabled).active,.btn-outline-white:not(:disabled):not(.disabled):active,.show>.btn-outline-white.dropdown-toggle{color:#495057;background-color:#fff;border-color:#fff}.btn-outline-white:not(:disabled):not(.disabled).active:focus,.btn-outline-white:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-white.dropdown-toggle:focus{box-shadow:0 0 0 0 hsla(0,0%,100%,.5)}.btn-outline-black{color:#212529;border-color:#212529}.btn-outline-black:hover{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-black.focus,.btn-outline-black:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-black.disabled,.btn-outline-black:disabled{color:#212529;background-color:transparent}.btn-outline-black:not(:disabled):not(.disabled).active,.btn-outline-black:not(:disabled):not(.disabled):active,.show>.btn-outline-black.dropdown-toggle{color:#fff;background-color:#212529;border-color:#212529}.btn-outline-black:not(:disabled):not(.disabled).active:focus,.btn-outline-black:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-black.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(33,37,41,.5)}.btn-outline-blue{color:#257af4;border-color:#257af4}.btn-outline-blue:hover{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-blue.focus,.btn-outline-blue:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-blue.disabled,.btn-outline-blue:disabled{color:#257af4;background-color:transparent}.btn-outline-blue:not(:disabled):not(.disabled).active,.btn-outline-blue:not(:disabled):not(.disabled):active,.show>.btn-outline-blue.dropdown-toggle{color:#fff;background-color:#257af4;border-color:#257af4}.btn-outline-blue:not(:disabled):not(.disabled).active:focus,.btn-outline-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(37,122,244,.5)}.btn-outline-light-blue{color:#e3f1fe;border-color:#e3f1fe}.btn-outline-light-blue:hover{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-light-blue.focus,.btn-outline-light-blue:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-light-blue.disabled,.btn-outline-light-blue:disabled{color:#e3f1fe;background-color:transparent}.btn-outline-light-blue:not(:disabled):not(.disabled).active,.btn-outline-light-blue:not(:disabled):not(.disabled):active,.show>.btn-outline-light-blue.dropdown-toggle{color:#495057;background-color:#e3f1fe;border-color:#e3f1fe}.btn-outline-light-blue:not(:disabled):not(.disabled).active:focus,.btn-outline-light-blue:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-blue.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(227,241,254,.5)}.btn-outline-yellow{color:#fc0;border-color:#fc0}.btn-outline-yellow:hover{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-yellow.focus,.btn-outline-yellow:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-yellow.disabled,.btn-outline-yellow:disabled{color:#fc0;background-color:transparent}.btn-outline-yellow:not(:disabled):not(.disabled).active,.btn-outline-yellow:not(:disabled):not(.disabled):active,.show>.btn-outline-yellow.dropdown-toggle{color:#495057;background-color:#fc0;border-color:#fc0}.btn-outline-yellow:not(:disabled):not(.disabled).active:focus,.btn-outline-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,204,0,.5)}.btn-outline-light-yellow{color:#fffaf0;border-color:#fffaf0}.btn-outline-light-yellow:hover{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-light-yellow.focus,.btn-outline-light-yellow:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-light-yellow.disabled,.btn-outline-light-yellow:disabled{color:#fffaf0;background-color:transparent}.btn-outline-light-yellow:not(:disabled):not(.disabled).active,.btn-outline-light-yellow:not(:disabled):not(.disabled):active,.show>.btn-outline-light-yellow.dropdown-toggle{color:#495057;background-color:#fffaf0;border-color:#fffaf0}.btn-outline-light-yellow:not(:disabled):not(.disabled).active:focus,.btn-outline-light-yellow:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-yellow.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,250,240,.5)}.btn-outline-orange{color:#ff8c00;border-color:#ff8c00}.btn-outline-orange:hover{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-outline-orange.focus,.btn-outline-orange:focus{box-shadow:0 0 0 0 rgba(255,140,0,.5)}.btn-outline-orange.disabled,.btn-outline-orange:disabled{color:#ff8c00;background-color:transparent}.btn-outline-orange:not(:disabled):not(.disabled).active,.btn-outline-orange:not(:disabled):not(.disabled):active,.show>.btn-outline-orange.dropdown-toggle{color:#495057;background-color:#ff8c00;border-color:#ff8c00}.btn-outline-orange:not(:disabled):not(.disabled).active:focus,.btn-outline-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,140,0,.5)}.btn-outline-light-orange{color:#ffe4b5;border-color:#ffe4b5}.btn-outline-light-orange:hover{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-outline-light-orange.focus,.btn-outline-light-orange:focus{box-shadow:0 0 0 0 rgba(255,228,181,.5)}.btn-outline-light-orange.disabled,.btn-outline-light-orange:disabled{color:#ffe4b5;background-color:transparent}.btn-outline-light-orange:not(:disabled):not(.disabled).active,.btn-outline-light-orange:not(:disabled):not(.disabled):active,.show>.btn-outline-light-orange.dropdown-toggle{color:#495057;background-color:#ffe4b5;border-color:#ffe4b5}.btn-outline-light-orange:not(:disabled):not(.disabled).active:focus,.btn-outline-light-orange:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-orange.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,228,181,.5)}.btn-outline-red{color:#ff3939;border-color:#ff3939}.btn-outline-red:hover{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-outline-red.focus,.btn-outline-red:focus{box-shadow:0 0 0 0 rgba(255,57,57,.5)}.btn-outline-red.disabled,.btn-outline-red:disabled{color:#ff3939;background-color:transparent}.btn-outline-red:not(:disabled):not(.disabled).active,.btn-outline-red:not(:disabled):not(.disabled):active,.show>.btn-outline-red.dropdown-toggle{color:#fff;background-color:#ff3939;border-color:#ff3939}.btn-outline-red:not(:disabled):not(.disabled).active:focus,.btn-outline-red:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,57,57,.5)}.btn-outline-light-red{color:#ffe4e1;border-color:#ffe4e1}.btn-outline-light-red:hover{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-outline-light-red.focus,.btn-outline-light-red:focus{box-shadow:0 0 0 0 rgba(255,228,225,.5)}.btn-outline-light-red.disabled,.btn-outline-light-red:disabled{color:#ffe4e1;background-color:transparent}.btn-outline-light-red:not(:disabled):not(.disabled).active,.btn-outline-light-red:not(:disabled):not(.disabled):active,.show>.btn-outline-light-red.dropdown-toggle{color:#495057;background-color:#ffe4e1;border-color:#ffe4e1}.btn-outline-light-red:not(:disabled):not(.disabled).active:focus,.btn-outline-light-red:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light-red.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(255,228,225,.5)}.btn-outline-medium{color:#d6dbdf;border-color:#d6dbdf}.btn-outline-medium:hover{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-outline-medium.focus,.btn-outline-medium:focus{box-shadow:0 0 0 0 rgba(214,219,223,.5)}.btn-outline-medium.disabled,.btn-outline-medium:disabled{color:#d6dbdf;background-color:transparent}.btn-outline-medium:not(:disabled):not(.disabled).active,.btn-outline-medium:not(:disabled):not(.disabled):active,.show>.btn-outline-medium.dropdown-toggle{color:#495057;background-color:#d6dbdf;border-color:#d6dbdf}.btn-outline-medium:not(:disabled):not(.disabled).active:focus,.btn-outline-medium:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-medium.dropdown-toggle:focus{box-shadow:0 0 0 0 rgba(214,219,223,.5)}.btn-link{font-weight:400;color:#ff8c00;text-decoration:none}.btn-link:hover{color:#ff8c00;text-decoration:underline}.btn-link.focus,.btn-link:focus{text-decoration:underline;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#d6dbdf;pointer-events:none}.btn-group-lg>.btn,.btn-lg{padding:16px 32px;font-size:1.125rem;line-height:26px;border-radius:8px}.btn-group-sm>.btn,.btn-sm{padding:12px 32px;font-size:.875rem;line-height:20px;border-radius:8px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:24px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{transition:opacity .15s linear}@media(prefers-reduced-motion:reduce){.fade{transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}@media(prefers-reduced-motion:reduce){.collapsing{transition:none}}.dropdown,.dropleft,.dropright,.dropup{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty:after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(33,37,41,.15);border-radius:8px}.dropdown-menu-left{right:auto;left:0}.dropdown-menu-right{right:0;left:auto}@media(min-width:400px){.dropdown-menu-xs-left{right:auto;left:0}.dropdown-menu-xs-right{right:0;left:auto}}@media(min-width:616px){.dropdown-menu-sm-left{right:auto;left:0}.dropdown-menu-sm-right{right:0;left:auto}}@media(min-width:768px){.dropdown-menu-md-left{right:auto;left:0}.dropdown-menu-md-right{right:0;left:auto}}@media(min-width:980px){.dropdown-menu-lg-left{right:auto;left:0}.dropdown-menu-lg-right{right:0;left:auto}}@media(min-width:1240px){.dropdown-menu-xl-left{right:auto;left:0}.dropdown-menu-xl-right{right:0;left:auto}}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty:after{margin-left:0}.dropright .dropdown-toggle:after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle:after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";display:none}.dropleft .dropdown-toggle:before{display:inline-block;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty:after{margin-left:0}.dropleft .dropdown-toggle:before{vertical-align:0}.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:4px 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#495057;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#3d4349;text-decoration:none;background-color:#f1f6f9}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#fc0}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;pointer-events:none;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#495057}.btn-group,.btn-group-vertical{position:relative;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;flex:1 1 auto}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:1}.btn-toolbar{display:flex;flex-wrap:wrap;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn-group:not(:first-child),.btn-group>.btn:not(:first-child){margin-left:-1px}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:24px;padding-left:24px}.dropdown-toggle-split:after,.dropright .dropdown-toggle-split:after,.dropup .dropdown-toggle-split:after{margin-left:0}.dropleft .dropdown-toggle-split:before{margin-right:0}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-group-sm>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:24px;padding-left:24px}.btn-group-vertical{flex-direction:column;align-items:flex-start;justify-content:center}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}.btn-group-vertical>.btn-group:not(:first-child),.btn-group-vertical>.btn:not(:first-child){margin-top:-1px}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio],.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:flex;flex-wrap:wrap;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control,.input-group>.form-control-plaintext{position:relative;flex:1 1 0%;min-width:0;margin-bottom:0}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control,.input-group>.form-control-plaintext+.custom-file,.input-group>.form-control-plaintext+.custom-select,.input-group>.form-control-plaintext+.form-control{margin-left:-1px}.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:flex;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label:after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn:focus,.input-group-prepend .btn:focus{z-index:3}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:flex;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#6c757d;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:8px}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group-lg>.custom-select,.input-group-lg>.form-control:not(textarea){height:calc(1.5em + 1rem + 2px)}.input-group-lg>.custom-select,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.125rem;line-height:1.5;border-radius:8px}.input-group-sm>.custom-select,.input-group-sm>.form-control:not(textarea){height:calc(1.5em + .5rem + 2px)}.input-group-sm>.custom-select,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:8px}.input-group-lg>.custom-select,.input-group-sm>.custom-select{padding-right:1.75rem}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;left:0;z-index:-1;width:1rem;height:1.25rem;opacity:0}.custom-control-input:checked~.custom-control-label:before{color:#fff;border-color:#fc0;background-color:#fc0}.custom-control-input:focus~.custom-control-label:before{box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.custom-control-input:focus:not(:checked)~.custom-control-label:before{border-color:#ffe680}.custom-control-input:not(:disabled):active~.custom-control-label:before{color:#fff;background-color:#fff0b3;border-color:#fff0b3}.custom-control-input:disabled~.custom-control-label,.custom-control-input[disabled]~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label:before,.custom-control-input[disabled]~.custom-control-label:before{background-color:#e9ecef}.custom-control-label{position:relative;margin-bottom:0;vertical-align:top}.custom-control-label:before{pointer-events:none;background-color:#fff;border:1px solid #d6dbdf}.custom-control-label:after,.custom-control-label:before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:""}.custom-control-label:after{background:no-repeat 50%/50% 50%}.custom-checkbox .custom-control-label:before{border-radius:8px}.custom-checkbox .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:before{border-color:#fc0;background-color:#fc0}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-radio .custom-control-label:before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label:after{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-switch{padding-left:2.25rem}.custom-switch .custom-control-label:before{left:-2.25rem;width:1.75rem;pointer-events:all;border-radius:.5rem}.custom-switch .custom-control-label:after{top:calc(.25rem + 2px);left:calc(-2.25rem + 2px);width:calc(1rem - 4px);height:calc(1rem - 4px);background-color:#d6dbdf;border-radius:.5rem;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.custom-switch .custom-control-label:after{transition:none}}.custom-switch .custom-control-input:checked~.custom-control-label:after{background-color:#fff;transform:translateX(.75rem)}.custom-switch .custom-control-input:disabled:checked~.custom-control-label:before{background-color:rgba(255,204,0,.5)}.custom-select{display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem 1.75rem .375rem .75rem;font-size:1rem;font-weight:400;line-height:1.5;color:#6c757d;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center/8px 10px;border:1px solid #ced4da;border-radius:8px;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#ffe680;outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.custom-select:focus::-ms-value{color:#6c757d;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{display:none}.custom-select:-moz-focusring{color:transparent;text-shadow:0 0 0 #6c757d}.custom-select-sm{height:calc(1.5em + .5rem + 2px);padding-top:.25rem;padding-bottom:.25rem;padding-left:.5rem;font-size:.875rem}.custom-select-lg{height:calc(1.5em + 1rem + 2px);padding-top:.5rem;padding-bottom:.5rem;padding-left:1rem;font-size:1.125rem}.custom-file{display:inline-block;margin-bottom:0}.custom-file,.custom-file-input{position:relative;width:100%;height:calc(1.5em + .75rem + 2px)}.custom-file-input{z-index:2;margin:0;opacity:0}.custom-file-input:focus~.custom-file-label{border-color:#ffe680;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.custom-file-input:disabled~.custom-file-label,.custom-file-input[disabled]~.custom-file-label{background-color:#e9ecef}.custom-file-input:lang(en)~.custom-file-label:after{content:"Browse"}.custom-file-input~.custom-file-label[data-browse]:after{content:attr(data-browse)}.custom-file-label{left:0;z-index:1;height:calc(1.5em + .75rem + 2px);font-weight:400;background-color:#fff;border:1px solid #ced4da;border-radius:8px}.custom-file-label,.custom-file-label:after{position:absolute;top:0;right:0;padding:.375rem .75rem;line-height:1.5;color:#6c757d}.custom-file-label:after{bottom:0;z-index:3;display:block;height:calc(1.5em + .75rem);content:"Browse";background-color:#e9ecef;border-left:inherit;border-radius:0 8px 8px 0}.custom-range{width:100%;height:1.4rem;padding:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:none}.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(255,204,0,.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(255,204,0,.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(255,204,0,.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#fc0;border:0;border-radius:1rem;-webkit-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}@media(prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#fff0b3}.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#fc0;border:0;border-radius:1rem;-moz-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}@media(prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{-moz-transition:none;transition:none}}.custom-range::-moz-range-thumb:active{background-color:#fff0b3}.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#fc0;border:0;border-radius:1rem;-ms-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}@media(prefers-reduced-motion:reduce){.custom-range::-ms-thumb{-ms-transition:none;transition:none}}.custom-range::-ms-thumb:active{background-color:#fff0b3}.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}.custom-range::-ms-fill-lower,.custom-range::-ms-fill-upper{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px}.custom-range:disabled::-webkit-slider-thumb{background-color:#d6dbdf}.custom-range:disabled::-webkit-slider-runnable-track{cursor:default}.custom-range:disabled::-moz-range-thumb{background-color:#d6dbdf}.custom-range:disabled::-moz-range-track{cursor:default}.custom-range:disabled::-ms-thumb{background-color:#d6dbdf}.custom-control-label:before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.custom-control-label:before,.custom-file-label,.custom-select{transition:none}}.nav{display:flex;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:0}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#d6dbdf;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #6c757d}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:8px;border-top-right-radius:8px}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:transparent}.nav-tabs .nav-link.disabled{color:#d6dbdf;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#257af4;background-color:#fff;border-color:#6c757d}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:8px}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#fc0}.nav-fill .nav-item{flex:1 1 auto;text-align:center}.nav-justified .nav-item{flex-basis:0;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;padding:24px 0}.navbar,.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl,.navbar .container-xs{display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:-.09375rem;padding-bottom:-.09375rem;margin-right:0;font-size:1.125rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:flex;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:0;padding-bottom:0}.navbar-collapse{flex-basis:100%;flex-grow:1;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.125rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:8px}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat 50%;background-size:100% 100%}@media(max-width:399.98px){.navbar-expand-xs>.container,.navbar-expand-xs>.container-fluid,.navbar-expand-xs>.container-lg,.navbar-expand-xs>.container-md,.navbar-expand-xs>.container-sm,.navbar-expand-xs>.container-xl,.navbar-expand-xs>.container-xs{padding-right:0;padding-left:0}}@media(min-width:400px){.navbar-expand-xs{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-xs .navbar-nav{flex-direction:row}.navbar-expand-xs .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xs .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xs>.container,.navbar-expand-xs>.container-fluid,.navbar-expand-xs>.container-lg,.navbar-expand-xs>.container-md,.navbar-expand-xs>.container-sm,.navbar-expand-xs>.container-xl,.navbar-expand-xs>.container-xs{flex-wrap:nowrap}.navbar-expand-xs .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xs .navbar-toggler{display:none}}@media(max-width:615.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl,.navbar-expand-sm>.container-xs{padding-right:0;padding-left:0}}@media(min-width:616px){.navbar-expand-sm{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-sm .navbar-nav{flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl,.navbar-expand-sm>.container-xs{flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media(max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl,.navbar-expand-md>.container-xs{padding-right:0;padding-left:0}}@media(min-width:768px){.navbar-expand-md{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-md .navbar-nav{flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl,.navbar-expand-md>.container-xs{flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media(max-width:979.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl,.navbar-expand-lg>.container-xs{padding-right:0;padding-left:0}}@media(min-width:980px){.navbar-expand-lg{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-lg .navbar-nav{flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl,.navbar-expand-lg>.container-xs{flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media(max-width:1239.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl,.navbar-expand-xl>.container-xs{padding-right:0;padding-left:0}}@media(min-width:1240px){.navbar-expand-xl{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand-xl .navbar-nav{flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl,.navbar-expand-xl>.container-xs{flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{flex-flow:row nowrap;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl,.navbar-expand>.container-xs{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl,.navbar-expand>.container-xs{flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:flex!important;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand,.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(33,37,41,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(33,37,41,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(33,37,41,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(33,37,41,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(33,37,41,.9)}.navbar-light .navbar-toggler{color:rgba(33,37,41,.5);border-color:rgba(33,37,41,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30'%3E%3Cpath stroke='rgba(33, 37, 41, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(33,37,41,.5)}.navbar-light .navbar-text a,.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(33,37,41,.9)}.navbar-dark .navbar-brand,.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:hsla(0,0%,100%,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:hsla(0,0%,100%,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:hsla(0,0%,100%,.5);border-color:hsla(0,0%,100%,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:hsla(0,0%,100%,.5)}.navbar-dark .navbar-text a,.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:flex;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid #d6dbdf;border-radius:8px}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:8px;border-top-right-radius:8px}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:8px;border-bottom-left-radius:8px}.card-body{flex:1 1 auto;min-height:1px;padding:24px}.card-title{margin-bottom:24px}.card-subtitle{margin-top:-12px}.card-subtitle,.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:24px}.card-header{padding:24px;margin-bottom:0;background-color:#f1f6f9;border-bottom:1px solid #d6dbdf}.card-header:first-child{border-radius:subtract(8px,1px) subtract(8px,1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:24px;background-color:#f1f6f9;border-top:1px solid #d6dbdf}.card-footer:last-child{border-radius:0 0 subtract(8px,1px) subtract(8px,1px)}.card-header-tabs{margin-bottom:-24px;border-bottom:0}.card-header-pills,.card-header-tabs{margin-right:-12px;margin-left:-12px}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:24px}.card-img,.card-img-bottom,.card-img-top{flex-shrink:0;width:100%}.card-img,.card-img-top{border-top-left-radius:subtract(8px,1px);border-top-right-radius:subtract(8px,1px)}.card-img,.card-img-bottom{border-bottom-right-radius:subtract(8px,1px);border-bottom-left-radius:subtract(8px,1px)}.card-deck .card{margin-bottom:20px}@media(min-width:616px){.card-deck{display:flex;flex-flow:row wrap;margin-right:-20px;margin-left:-20px}.card-deck .card{flex:1 0 0%;margin-right:20px;margin-bottom:0;margin-left:20px}}.card-group>.card{margin-bottom:20px}@media(min-width:616px){.card-group{display:flex;flex-flow:row wrap}.card-group>.card{flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:not(:last-child) .card-header,.card-group>.card:not(:last-child) .card-img-top{border-top-right-radius:0}.card-group>.card:not(:last-child) .card-footer,.card-group>.card:not(:last-child) .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:not(:first-child) .card-header,.card-group>.card:not(:first-child) .card-img-top{border-top-left-radius:0}.card-group>.card:not(:first-child) .card-footer,.card-group>.card:not(:first-child) .card-img-bottom{border-bottom-left-radius:0}}.card-columns .card{margin-bottom:40px}@media(min-width:616px){.card-columns{-moz-column-count:3;column-count:3;-moz-column-gap:40px;column-gap:40px;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion>.card{overflow:hidden}.accordion>.card:not(:last-of-type){border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion>.card:not(:first-of-type){border-top-left-radius:0;border-top-right-radius:0}.accordion>.card>.card-header{border-radius:0;margin-bottom:-1px}.breadcrumb{display:flex;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:8px}.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}.breadcrumb-item+.breadcrumb-item:before{display:inline-block;padding-right:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover:before{text-decoration:underline;text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:flex;padding-left:0;list-style:none;border-radius:8px}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#ff8c00;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{z-index:2;color:#ff8c00;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:3;outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.25)}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:8px;border-bottom-left-radius:8px}.page-item:last-child .page-link{border-top-right-radius:8px;border-bottom-right-radius:8px}.page-item.active .page-link{z-index:3;color:#fff;background-color:#fc0;border-color:#fc0}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.125rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:8px;border-bottom-left-radius:8px}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:8px;border-bottom-right-radius:8px}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:8px;border-bottom-left-radius:8px}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:8px;border-bottom-right-radius:8px}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:8px;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}@media(prefers-reduced-motion:reduce){.badge{transition:none}}a.badge:focus,a.badge:hover{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#495057;background-color:#fc0}a.badge-primary:focus,a.badge-primary:hover{color:#495057;background-color:#cca300}a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.5)}.badge-secondary{color:#fff;background-color:#212529}a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#0a0c0d}a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(33,37,41,.5)}.badge-success{color:#fff;background-color:#28a745}a.badge-success:focus,a.badge-success:hover{color:#fff;background-color:#1e7e34}a.badge-success.focus,a.badge-success:focus{outline:0;box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.badge-info{color:#fff;background-color:#17a2b8}a.badge-info:focus,a.badge-info:hover{color:#fff;background-color:#117a8b}a.badge-info.focus,a.badge-info:focus{outline:0;box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.badge-warning{color:#495057;background-color:#ffc107}a.badge-warning:focus,a.badge-warning:hover{color:#495057;background-color:#d39e00}a.badge-warning.focus,a.badge-warning:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.badge-danger{color:#fff;background-color:#dc3545}a.badge-danger:focus,a.badge-danger:hover{color:#fff;background-color:#bd2130}a.badge-danger.focus,a.badge-danger:focus{outline:0;box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.badge-light{color:#495057;background-color:#f1f6f9}a.badge-light:focus,a.badge-light:hover{color:#495057;background-color:#cddfea}a.badge-light.focus,a.badge-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(241,246,249,.5)}.badge-dark{color:#fff;background-color:#495057}a.badge-dark:focus,a.badge-dark:hover{color:#fff;background-color:#32373b}a.badge-dark.focus,a.badge-dark:focus{outline:0;box-shadow:0 0 0 .2rem rgba(73,80,87,.5)}.badge-primary-light{color:#495057;background-color:#fffaf0}a.badge-primary-light:focus,a.badge-primary-light:hover{color:#495057;background-color:#ffe9bd}a.badge-primary-light.focus,a.badge-primary-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,250,240,.5)}.badge-secondary-light{color:#495057;background-color:#fff}a.badge-secondary-light:focus,a.badge-secondary-light:hover{color:#495057;background-color:#e6e6e6}a.badge-secondary-light.focus,a.badge-secondary-light:focus{outline:0;box-shadow:0 0 0 .2rem hsla(0,0%,100%,.5)}.badge-tertiary{color:#fff;background-color:#257af4}a.badge-tertiary:focus,a.badge-tertiary:hover{color:#fff;background-color:#0b60db}a.badge-tertiary.focus,a.badge-tertiary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(37,122,244,.5)}.badge-tertiary-light{color:#495057;background-color:#e3f1fe}a.badge-tertiary-light:focus,a.badge-tertiary-light:hover{color:#495057;background-color:#b2d8fc}a.badge-tertiary-light.focus,a.badge-tertiary-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(227,241,254,.5)}.badge-white{color:#495057;background-color:#fff}a.badge-white:focus,a.badge-white:hover{color:#495057;background-color:#e6e6e6}a.badge-white.focus,a.badge-white:focus{outline:0;box-shadow:0 0 0 .2rem hsla(0,0%,100%,.5)}.badge-black{color:#fff;background-color:#212529}a.badge-black:focus,a.badge-black:hover{color:#fff;background-color:#0a0c0d}a.badge-black.focus,a.badge-black:focus{outline:0;box-shadow:0 0 0 .2rem rgba(33,37,41,.5)}.badge-blue{color:#fff;background-color:#257af4}a.badge-blue:focus,a.badge-blue:hover{color:#fff;background-color:#0b60db}a.badge-blue.focus,a.badge-blue:focus{outline:0;box-shadow:0 0 0 .2rem rgba(37,122,244,.5)}.badge-light-blue{color:#495057;background-color:#e3f1fe}a.badge-light-blue:focus,a.badge-light-blue:hover{color:#495057;background-color:#b2d8fc}a.badge-light-blue.focus,a.badge-light-blue:focus{outline:0;box-shadow:0 0 0 .2rem rgba(227,241,254,.5)}.badge-yellow{color:#495057;background-color:#fc0}a.badge-yellow:focus,a.badge-yellow:hover{color:#495057;background-color:#cca300}a.badge-yellow.focus,a.badge-yellow:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,204,0,.5)}.badge-light-yellow{color:#495057;background-color:#fffaf0}a.badge-light-yellow:focus,a.badge-light-yellow:hover{color:#495057;background-color:#ffe9bd}a.badge-light-yellow.focus,a.badge-light-yellow:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,250,240,.5)}.badge-orange{color:#495057;background-color:#ff8c00}a.badge-orange:focus,a.badge-orange:hover{color:#495057;background-color:#cc7000}a.badge-orange.focus,a.badge-orange:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,140,0,.5)}.badge-light-orange{color:#495057;background-color:#ffe4b5}a.badge-light-orange:focus,a.badge-light-orange:hover{color:#495057;background-color:#ffd182}a.badge-light-orange.focus,a.badge-light-orange:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,228,181,.5)}.badge-red{color:#fff;background-color:#ff3939}a.badge-red:focus,a.badge-red:hover{color:#fff;background-color:#ff0606}a.badge-red.focus,a.badge-red:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,57,57,.5)}.badge-light-red{color:#495057;background-color:#ffe4e1}a.badge-light-red:focus,a.badge-light-red:hover{color:#495057;background-color:#ffb6ae}a.badge-light-red.focus,a.badge-light-red:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,228,225,.5)}.badge-medium{color:#495057;background-color:#d6dbdf}a.badge-medium:focus,a.badge-medium:hover{color:#495057;background-color:#b9c2c9}a.badge-medium.focus,a.badge-medium:focus{outline:0;box-shadow:0 0 0 .2rem rgba(214,219,223,.5)}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:8px}@media(min-width:616px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:8px}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#947c14;background-color:#fff5cc;border-color:#fff1b8}.alert-primary hr{border-top-color:#ffec9f}.alert-primary .alert-link{color:#67560e}.alert-secondary{color:#212529;background-color:#d3d3d4;border-color:#c1c2c3}.alert-secondary hr{border-top-color:#b4b5b6}.alert-secondary .alert-link{color:#0a0c0d}.alert-success{color:#256938;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#184324}.alert-info{color:#1c6673;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#12424a}.alert-warning{color:#947617;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#685310}.alert-danger{color:#822d38;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#5c2028}.alert-light{color:#8d9295;background-color:#fcfdfe;border-color:#fbfcfd}.alert-light hr{border-top-color:#eaeff5}.alert-light .alert-link{color:#73797c}.alert-dark{color:#363b41;background-color:#dbdcdd;border-color:#ccced0}.alert-dark hr{border-top-color:#bfc1c4}.alert-dark .alert-link{color:#1f2225}.alert-primary-light{color:#949490;background-color:#fffefc;border-color:#fffefb}.alert-primary-light hr{border-top-color:#fff8e2}.alert-primary-light .alert-link{color:#7b7b76}.alert-secondary-light{color:#949698;background-color:#fff;border-color:#fff}.alert-secondary-light hr{border-top-color:#f2f2f2}.alert-secondary-light .alert-link{color:#7a7d7f}.alert-tertiary{color:#235193;background-color:#d3e4fd;border-color:#c2dafc}.alert-tertiary hr{border-top-color:#aacbfb}.alert-tertiary .alert-link{color:#193a6a}.alert-tertiary-light{color:#868f98;background-color:#f9fcff;border-color:#f7fbff}.alert-tertiary-light hr{border-top-color:#deeeff}.alert-tertiary-light .alert-link{color:#6c767f}.alert-white{color:#949698;background-color:#fff;border-color:#fff}.alert-white hr{border-top-color:#f2f2f2}.alert-white .alert-link{color:#7a7d7f}.alert-black{color:#212529;background-color:#d3d3d4;border-color:#c1c2c3}.alert-black hr{border-top-color:#b4b5b6}.alert-black .alert-link{color:#0a0c0d}.alert-blue{color:#235193;background-color:#d3e4fd;border-color:#c2dafc}.alert-blue hr{border-top-color:#aacbfb}.alert-blue .alert-link{color:#193a6a}.alert-light-blue{color:#868f98;background-color:#f9fcff;border-color:#f7fbff}.alert-light-blue hr{border-top-color:#deeeff}.alert-light-blue .alert-link{color:#6c767f}.alert-yellow{color:#947c14;background-color:#fff5cc;border-color:#fff1b8}.alert-yellow hr{border-top-color:#ffec9f}.alert-yellow .alert-link{color:#67560e}.alert-light-yellow{color:#949490;background-color:#fffefc;border-color:#fffefb}.alert-light-yellow hr{border-top-color:#fff8e2}.alert-light-yellow .alert-link{color:#7b7b76}.alert-orange{color:#945b14;background-color:#ffe8cc;border-color:#ffdfb8}.alert-orange hr{border-top-color:#ffd49f}.alert-orange .alert-link{color:#673f0e}.alert-light-orange{color:#948872;background-color:#fffaf0;border-color:#fff7ea}.alert-light-orange hr{border-top-color:#ffedd1}.alert-light-orange .alert-link{color:#786e5b}.alert-red{color:#942f31;background-color:#ffd7d7;border-color:#ffc8c8}.alert-red hr{border-top-color:#ffafaf}.alert-red .alert-link{color:#6d2324}.alert-light-red{color:#948889;background-color:#fffaf9;border-color:#fff7f7}.alert-light-red hr{border-top-color:#ffdede}.alert-light-red .alert-link{color:#7b6e6f}.alert-medium{color:#7f8488;background-color:#f7f8f9;border-color:#f4f5f6}.alert-medium hr{border-top-color:#e6e8eb}.alert-medium .alert-link{color:#666a6e}@-webkit-keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{0%{background-position:1rem 0}to{background-position:0 0}}.progress{height:1rem;font-size:.75rem;background-color:#e9ecef;border-radius:8px}.progress,.progress-bar{display:flex;overflow:hidden}.progress-bar{flex-direction:column;justify-content:center;color:#fff;text-align:center;white-space:nowrap;background-color:#fc0;transition:width .6s ease}@media(prefers-reduced-motion:reduce){.progress-bar{transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg,hsla(0,0%,100%,.15) 25%,transparent 0,transparent 50%,hsla(0,0%,100%,.15) 0,hsla(0,0%,100%,.15) 75%,transparent 0,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}@media(prefers-reduced-motion:reduce){.progress-bar-animated{-webkit-animation:none;animation:none}}.media{display:flex;align-items:flex-start}.media-body{flex:1}.list-group{display:flex;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#6c757d;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{z-index:1;color:#6c757d;text-decoration:none;background-color:#f1f6f9}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:1px solid rgba(33,37,41,.125)}.list-group-item:first-child{border-top-left-radius:8px;border-top-right-radius:8px}.list-group-item:last-child{border-bottom-right-radius:8px;border-bottom-left-radius:8px}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;pointer-events:none;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#fc0;border-color:#fc0}.list-group-item+.list-group-item{border-top-width:0}.list-group-item+.list-group-item.active{margin-top:-1px;border-top-width:1px}.list-group-horizontal{flex-direction:row}.list-group-horizontal .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal .list-group-item.active{margin-top:0}.list-group-horizontal .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}@media(min-width:400px){.list-group-horizontal-xs{flex-direction:row}.list-group-horizontal-xs .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-xs .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-xs .list-group-item.active{margin-top:0}.list-group-horizontal-xs .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xs .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:616px){.list-group-horizontal-sm{flex-direction:row}.list-group-horizontal-sm .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-sm .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-sm .list-group-item.active{margin-top:0}.list-group-horizontal-sm .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-sm .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:768px){.list-group-horizontal-md{flex-direction:row}.list-group-horizontal-md .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-md .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-md .list-group-item.active{margin-top:0}.list-group-horizontal-md .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-md .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:980px){.list-group-horizontal-lg{flex-direction:row}.list-group-horizontal-lg .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-lg .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-lg .list-group-item.active{margin-top:0}.list-group-horizontal-lg .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-lg .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media(min-width:1240px){.list-group-horizontal-xl{flex-direction:row}.list-group-horizontal-xl .list-group-item:first-child{border-bottom-left-radius:8px;border-top-right-radius:0}.list-group-horizontal-xl .list-group-item:last-child{border-top-right-radius:8px;border-bottom-left-radius:0}.list-group-horizontal-xl .list-group-item.active{margin-top:0}.list-group-horizontal-xl .list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xl .list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}.list-group-flush .list-group-item{border-right-width:0;border-left-width:0;border-radius:0}.list-group-flush .list-group-item:first-child{border-top-width:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom-width:0}.list-group-item-primary{color:#947c14;background-color:#fff1b8}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#947c14;background-color:#ffec9f}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#947c14;border-color:#947c14}.list-group-item-secondary{color:#212529;background-color:#c1c2c3}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#212529;background-color:#b4b5b6}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#212529;border-color:#212529}.list-group-item-success{color:#256938;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#256938;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#256938;border-color:#256938}.list-group-item-info{color:#1c6673;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#1c6673;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#1c6673;border-color:#1c6673}.list-group-item-warning{color:#947617;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#947617;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#947617;border-color:#947617}.list-group-item-danger{color:#822d38;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#822d38;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#822d38;border-color:#822d38}.list-group-item-light{color:#8d9295;background-color:#fbfcfd}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#8d9295;background-color:#eaeff5}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#8d9295;border-color:#8d9295}.list-group-item-dark{color:#363b41;background-color:#ccced0}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#363b41;background-color:#bfc1c4}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#363b41;border-color:#363b41}.list-group-item-primary-light{color:#949490;background-color:#fffefb}.list-group-item-primary-light.list-group-item-action:focus,.list-group-item-primary-light.list-group-item-action:hover{color:#949490;background-color:#fff8e2}.list-group-item-primary-light.list-group-item-action.active{color:#fff;background-color:#949490;border-color:#949490}.list-group-item-secondary-light{color:#949698;background-color:#fff}.list-group-item-secondary-light.list-group-item-action:focus,.list-group-item-secondary-light.list-group-item-action:hover{color:#949698;background-color:#f2f2f2}.list-group-item-secondary-light.list-group-item-action.active{color:#fff;background-color:#949698;border-color:#949698}.list-group-item-tertiary{color:#235193;background-color:#c2dafc}.list-group-item-tertiary.list-group-item-action:focus,.list-group-item-tertiary.list-group-item-action:hover{color:#235193;background-color:#aacbfb}.list-group-item-tertiary.list-group-item-action.active{color:#fff;background-color:#235193;border-color:#235193}.list-group-item-tertiary-light{color:#868f98;background-color:#f7fbff}.list-group-item-tertiary-light.list-group-item-action:focus,.list-group-item-tertiary-light.list-group-item-action:hover{color:#868f98;background-color:#deeeff}.list-group-item-tertiary-light.list-group-item-action.active{color:#fff;background-color:#868f98;border-color:#868f98}.list-group-item-white{color:#949698;background-color:#fff}.list-group-item-white.list-group-item-action:focus,.list-group-item-white.list-group-item-action:hover{color:#949698;background-color:#f2f2f2}.list-group-item-white.list-group-item-action.active{color:#fff;background-color:#949698;border-color:#949698}.list-group-item-black{color:#212529;background-color:#c1c2c3}.list-group-item-black.list-group-item-action:focus,.list-group-item-black.list-group-item-action:hover{color:#212529;background-color:#b4b5b6}.list-group-item-black.list-group-item-action.active{color:#fff;background-color:#212529;border-color:#212529}.list-group-item-blue{color:#235193;background-color:#c2dafc}.list-group-item-blue.list-group-item-action:focus,.list-group-item-blue.list-group-item-action:hover{color:#235193;background-color:#aacbfb}.list-group-item-blue.list-group-item-action.active{color:#fff;background-color:#235193;border-color:#235193}.list-group-item-light-blue{color:#868f98;background-color:#f7fbff}.list-group-item-light-blue.list-group-item-action:focus,.list-group-item-light-blue.list-group-item-action:hover{color:#868f98;background-color:#deeeff}.list-group-item-light-blue.list-group-item-action.active{color:#fff;background-color:#868f98;border-color:#868f98}.list-group-item-yellow{color:#947c14;background-color:#fff1b8}.list-group-item-yellow.list-group-item-action:focus,.list-group-item-yellow.list-group-item-action:hover{color:#947c14;background-color:#ffec9f}.list-group-item-yellow.list-group-item-action.active{color:#fff;background-color:#947c14;border-color:#947c14}.list-group-item-light-yellow{color:#949490;background-color:#fffefb}.list-group-item-light-yellow.list-group-item-action:focus,.list-group-item-light-yellow.list-group-item-action:hover{color:#949490;background-color:#fff8e2}.list-group-item-light-yellow.list-group-item-action.active{color:#fff;background-color:#949490;border-color:#949490}.list-group-item-orange{color:#945b14;background-color:#ffdfb8}.list-group-item-orange.list-group-item-action:focus,.list-group-item-orange.list-group-item-action:hover{color:#945b14;background-color:#ffd49f}.list-group-item-orange.list-group-item-action.active{color:#fff;background-color:#945b14;border-color:#945b14}.list-group-item-light-orange{color:#948872;background-color:#fff7ea}.list-group-item-light-orange.list-group-item-action:focus,.list-group-item-light-orange.list-group-item-action:hover{color:#948872;background-color:#ffedd1}.list-group-item-light-orange.list-group-item-action.active{color:#fff;background-color:#948872;border-color:#948872}.list-group-item-red{color:#942f31;background-color:#ffc8c8}.list-group-item-red.list-group-item-action:focus,.list-group-item-red.list-group-item-action:hover{color:#942f31;background-color:#ffafaf}.list-group-item-red.list-group-item-action.active{color:#fff;background-color:#942f31;border-color:#942f31}.list-group-item-light-red{color:#948889;background-color:#fff7f7}.list-group-item-light-red.list-group-item-action:focus,.list-group-item-light-red.list-group-item-action:hover{color:#948889;background-color:#ffdede}.list-group-item-light-red.list-group-item-action.active{color:#fff;background-color:#948889;border-color:#948889}.list-group-item-medium{color:#7f8488;background-color:#f4f5f6}.list-group-item-medium.list-group-item-action:focus,.list-group-item-medium.list-group-item-action:hover{color:#7f8488;background-color:#e6e8eb}.list-group-item-medium.list-group-item-action.active{color:#fff;background-color:#7f8488;border-color:#7f8488}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#212529;text-shadow:0 1px 0 #fff;opacity:.5}@media(max-width:1200px){.close{font-size:calc(1.275rem + .3vw)}}.close:hover{color:#212529;text-decoration:none}.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{opacity:.75}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}a.close.disabled{pointer-events:none}.toast{max-width:350px;overflow:hidden;font-size:.875rem;background-color:hsla(0,0%,100%,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 .25rem .75rem rgba(33,37,41,.1);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);opacity:0;border-radius:.25rem}.toast:not(:last-child){margin-bottom:.75rem}.toast.showing{opacity:1}.toast.show{display:block;opacity:1}.toast.hide{display:none}.toast-header{display:flex;align-items:center;padding:.25rem .75rem;color:#6c757d;background-color:hsla(0,0%,100%,.85);background-clip:padding-box;border-bottom:1px solid rgba(0,0,0,.05)}.toast-body{padding:.75rem}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:transform .3s ease-out;transform:translateY(-50px)}@media(prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}}.modal.show .modal-dialog{transform:none}.modal.modal-static .modal-dialog{transform:scale(1.02)}.modal-dialog-scrollable{display:flex;max-height:calc(100% - 1rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 1rem);overflow:hidden}.modal-dialog-scrollable .modal-footer,.modal-dialog-scrollable .modal-header{flex-shrink:0}.modal-dialog-scrollable .modal-body{overflow-y:auto}.modal-dialog-centered{display:flex;align-items:center;min-height:calc(100% - 1rem)}.modal-dialog-centered:before{display:block;height:calc(100vh - 1rem);content:""}.modal-dialog-centered.modal-dialog-scrollable{flex-direction:column;justify-content:center;height:100%}.modal-dialog-centered.modal-dialog-scrollable .modal-content{max-height:none}.modal-dialog-centered.modal-dialog-scrollable:before{content:none}.modal-content{position:relative;display:flex;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(33,37,41,.2);border-radius:8px;outline:0}.modal-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#212529}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:flex;align-items:flex-start;justify-content:space-between;padding:1rem;border-bottom:1px solid #d6dbdf;border-top-left-radius:7px;border-top-right-radius:7px}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;flex:1 1 auto;padding:1rem}.modal-footer{display:flex;flex-wrap:wrap;align-items:center;justify-content:flex-end;padding:.75rem;border-top:1px solid #d6dbdf;border-bottom-right-radius:7px;border-bottom-left-radius:7px}.modal-footer>*{margin:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media(min-width:616px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-scrollable{max-height:calc(100% - 3.5rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 3.5rem)}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-dialog-centered:before{height:calc(100vh - 3.5rem)}.modal-sm{max-width:300px}}@media(min-width:980px){.modal-lg,.modal-xl{max-width:800px}}@media(min-width:1240px){.modal-xl{max-width:1140px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:Noto Sans,sans-serif;font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow:before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow:before,.bs-tooltip-top .arrow:before{top:0;border-width:.4rem .4rem 0;border-top-color:#212529}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow:before,.bs-tooltip-right .arrow:before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#212529}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow:before,.bs-tooltip-bottom .arrow:before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#212529}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow:before,.bs-tooltip-left .arrow:before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#212529}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#212529;border-radius:8px}.popover{top:0;left:0;z-index:1060;max-width:276px;font-family:Noto Sans,sans-serif;font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(33,37,41,.2);border-radius:8px}.popover,.popover .arrow{position:absolute;display:block}.popover .arrow{width:1rem;height:.5rem;margin:0 8px}.popover .arrow:after,.popover .arrow:before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top]>.arrow,.bs-popover-top>.arrow{bottom:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=top]>.arrow:before,.bs-popover-top>.arrow:before{bottom:0;border-width:.5rem .5rem 0;border-top-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=top]>.arrow:after,.bs-popover-top>.arrow:after{bottom:1px;border-width:.5rem .5rem 0;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right]>.arrow,.bs-popover-right>.arrow{left:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:8px 0}.bs-popover-auto[x-placement^=right]>.arrow:before,.bs-popover-right>.arrow:before{left:0;border-width:.5rem .5rem .5rem 0;border-right-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=right]>.arrow:after,.bs-popover-right>.arrow:after{left:1px;border-width:.5rem .5rem .5rem 0;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom]>.arrow,.bs-popover-bottom>.arrow{top:calc(-.5rem - 1px)}.bs-popover-auto[x-placement^=bottom]>.arrow:before,.bs-popover-bottom>.arrow:before{top:0;border-width:0 .5rem .5rem;border-bottom-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=bottom]>.arrow:after,.bs-popover-bottom>.arrow:after{top:1px;border-width:0 .5rem .5rem;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header:before,.bs-popover-bottom .popover-header:before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left]>.arrow,.bs-popover-left>.arrow{right:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:8px 0}.bs-popover-auto[x-placement^=left]>.arrow:before,.bs-popover-left>.arrow:before{right:0;border-width:.5rem 0 .5rem .5rem;border-left-color:rgba(33,37,41,.25)}.bs-popover-auto[x-placement^=left]>.arrow:after,.bs-popover-left>.arrow:after{right:1px;border-width:.5rem 0 .5rem .5rem;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:7px;border-top-right-radius:7px}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel.pointer-event{touch-action:pan-y}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner:after{display:block;clear:both;content:""}.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:transform .6s ease-in-out}@media(prefers-reduced-motion:reduce){.carousel-item{transition:none}}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.active.carousel-item-right,.carousel-item-next:not(.carousel-item-left){transform:translateX(100%)}.active.carousel-item-left,.carousel-item-prev:not(.carousel-item-right){transform:translateX(-100%)}.carousel-fade .carousel-item{opacity:0;transition-property:opacity;transform:none}.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{z-index:1;opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{z-index:0;opacity:0;transition:opacity 0s .6s}@media(prefers-reduced-motion:reduce){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{transition:none}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;z-index:1;display:flex;align-items:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5;transition:opacity .15s ease}@media(prefers-reduced-motion:reduce){.carousel-control-next,.carousel-control-prev{transition:none}}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:no-repeat 50%/100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8'%3E%3Cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:15;display:flex;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{box-sizing:content-box;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;transition:opacity .6s ease}@media(prefers-reduced-motion:reduce){.carousel-indicators li{transition:none}}.carousel-indicators .active{opacity:1}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}@-webkit-keyframes spinner-border{to{transform:rotate(1turn)}}@keyframes spinner-border{to{transform:rotate(1turn)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:.25em solid;border-right:.25em solid transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}@-webkit-keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}@keyframes spinner-grow{0%{transform:scale(0)}50%{opacity:1}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#fc0!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#cca300!important}.bg-secondary{background-color:#212529!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#0a0c0d!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f1f6f9!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#cddfea!important}.bg-dark{background-color:#495057!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#32373b!important}.bg-primary-light{background-color:#fffaf0!important}a.bg-primary-light:focus,a.bg-primary-light:hover,button.bg-primary-light:focus,button.bg-primary-light:hover{background-color:#ffe9bd!important}.bg-secondary-light{background-color:#fff!important}a.bg-secondary-light:focus,a.bg-secondary-light:hover,button.bg-secondary-light:focus,button.bg-secondary-light:hover{background-color:#e6e6e6!important}.bg-tertiary{background-color:#257af4!important}a.bg-tertiary:focus,a.bg-tertiary:hover,button.bg-tertiary:focus,button.bg-tertiary:hover{background-color:#0b60db!important}.bg-tertiary-light{background-color:#e3f1fe!important}a.bg-tertiary-light:focus,a.bg-tertiary-light:hover,button.bg-tertiary-light:focus,button.bg-tertiary-light:hover{background-color:#b2d8fc!important}a.bg-white:focus,a.bg-white:hover,button.bg-white:focus,button.bg-white:hover{background-color:#e6e6e6!important}.bg-black{background-color:#212529!important}a.bg-black:focus,a.bg-black:hover,button.bg-black:focus,button.bg-black:hover{background-color:#0a0c0d!important}.bg-blue{background-color:#257af4!important}a.bg-blue:focus,a.bg-blue:hover,button.bg-blue:focus,button.bg-blue:hover{background-color:#0b60db!important}.bg-light-blue{background-color:#e3f1fe!important}a.bg-light-blue:focus,a.bg-light-blue:hover,button.bg-light-blue:focus,button.bg-light-blue:hover{background-color:#b2d8fc!important}.bg-yellow{background-color:#fc0!important}a.bg-yellow:focus,a.bg-yellow:hover,button.bg-yellow:focus,button.bg-yellow:hover{background-color:#cca300!important}.bg-light-yellow{background-color:#fffaf0!important}a.bg-light-yellow:focus,a.bg-light-yellow:hover,button.bg-light-yellow:focus,button.bg-light-yellow:hover{background-color:#ffe9bd!important}.bg-orange{background-color:#ff8c00!important}a.bg-orange:focus,a.bg-orange:hover,button.bg-orange:focus,button.bg-orange:hover{background-color:#cc7000!important}.bg-light-orange{background-color:#ffe4b5!important}a.bg-light-orange:focus,a.bg-light-orange:hover,button.bg-light-orange:focus,button.bg-light-orange:hover{background-color:#ffd182!important}.bg-red{background-color:#ff3939!important}a.bg-red:focus,a.bg-red:hover,button.bg-red:focus,button.bg-red:hover{background-color:#ff0606!important}.bg-light-red{background-color:#ffe4e1!important}a.bg-light-red:focus,a.bg-light-red:hover,button.bg-light-red:focus,button.bg-light-red:hover{background-color:#ffb6ae!important}.bg-medium{background-color:#d6dbdf!important}a.bg-medium:focus,a.bg-medium:hover,button.bg-medium:focus,button.bg-medium:hover{background-color:#b9c2c9!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #d6dbdf!important}.border-top{border-top:1px solid #d6dbdf!important}.border-right{border-right:1px solid #d6dbdf!important}.border-bottom{border-bottom:1px solid #d6dbdf!important}.border-left{border-left:1px solid #d6dbdf!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#fc0!important}.border-secondary{border-color:#212529!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f1f6f9!important}.border-dark{border-color:#495057!important}.border-primary-light{border-color:#fffaf0!important}.border-secondary-light{border-color:#fff!important}.border-tertiary{border-color:#257af4!important}.border-tertiary-light{border-color:#e3f1fe!important}.border-black{border-color:#212529!important}.border-blue{border-color:#257af4!important}.border-light-blue{border-color:#e3f1fe!important}.border-yellow{border-color:#fc0!important}.border-light-yellow{border-color:#fffaf0!important}.border-orange{border-color:#ff8c00!important}.border-light-orange{border-color:#ffe4b5!important}.border-red{border-color:#ff3939!important}.border-light-red{border-color:#ffe4e1!important}.border-medium{border-color:#d6dbdf!important}.border-white{border-color:#fff!important}.rounded,.rounded-sm{border-radius:8px!important}.rounded-top{border-top-left-radius:8px!important}.rounded-right,.rounded-top{border-top-right-radius:8px!important}.rounded-bottom,.rounded-right{border-bottom-right-radius:8px!important}.rounded-bottom,.rounded-left{border-bottom-left-radius:8px!important}.rounded-left{border-top-left-radius:8px!important}.rounded-lg{border-radius:8px!important}.rounded-circle{border-radius:50%!important}.rounded-pill{border-radius:50rem!important}.rounded-0{border-radius:0!important}.clearfix:after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:flex!important}.d-inline-flex{display:inline-flex!important}@media(min-width:400px){.d-xs-none{display:none!important}.d-xs-inline{display:inline!important}.d-xs-inline-block{display:inline-block!important}.d-xs-block{display:block!important}.d-xs-table{display:table!important}.d-xs-table-row{display:table-row!important}.d-xs-table-cell{display:table-cell!important}.d-xs-flex{display:flex!important}.d-xs-inline-flex{display:inline-flex!important}}@media(min-width:616px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:flex!important}.d-sm-inline-flex{display:inline-flex!important}}@media(min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:flex!important}.d-md-inline-flex{display:inline-flex!important}}@media(min-width:980px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:flex!important}.d-lg-inline-flex{display:inline-flex!important}}@media(min-width:1240px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:flex!important}.d-xl-inline-flex{display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:flex!important}.d-print-inline-flex{display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive:before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9:before{padding-top:42.8571428571%}.embed-responsive-16by9:before{padding-top:56.25%}.embed-responsive-4by3:before{padding-top:75%}.embed-responsive-1by1:before{padding-top:100%}.flex-row{flex-direction:row!important}.flex-column{flex-direction:column!important}.flex-row-reverse{flex-direction:row-reverse!important}.flex-column-reverse{flex-direction:column-reverse!important}.flex-wrap{flex-wrap:wrap!important}.flex-nowrap{flex-wrap:nowrap!important}.flex-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-fill{flex:1 1 auto!important}.flex-grow-0{flex-grow:0!important}.flex-grow-1{flex-grow:1!important}.flex-shrink-0{flex-shrink:0!important}.flex-shrink-1{flex-shrink:1!important}.justify-content-start{justify-content:flex-start!important}.justify-content-end{justify-content:flex-end!important}.justify-content-center{justify-content:center!important}.justify-content-between{justify-content:space-between!important}.justify-content-around{justify-content:space-around!important}.align-items-start{align-items:flex-start!important}.align-items-end{align-items:flex-end!important}.align-items-center{align-items:center!important}.align-items-baseline{align-items:baseline!important}.align-items-stretch{align-items:stretch!important}.align-content-start{align-content:flex-start!important}.align-content-end{align-content:flex-end!important}.align-content-center{align-content:center!important}.align-content-between{align-content:space-between!important}.align-content-around{align-content:space-around!important}.align-content-stretch{align-content:stretch!important}.align-self-auto{align-self:auto!important}.align-self-start{align-self:flex-start!important}.align-self-end{align-self:flex-end!important}.align-self-center{align-self:center!important}.align-self-baseline{align-self:baseline!important}.align-self-stretch{align-self:stretch!important}@media(min-width:400px){.flex-xs-row{flex-direction:row!important}.flex-xs-column{flex-direction:column!important}.flex-xs-row-reverse{flex-direction:row-reverse!important}.flex-xs-column-reverse{flex-direction:column-reverse!important}.flex-xs-wrap{flex-wrap:wrap!important}.flex-xs-nowrap{flex-wrap:nowrap!important}.flex-xs-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-xs-fill{flex:1 1 auto!important}.flex-xs-grow-0{flex-grow:0!important}.flex-xs-grow-1{flex-grow:1!important}.flex-xs-shrink-0{flex-shrink:0!important}.flex-xs-shrink-1{flex-shrink:1!important}.justify-content-xs-start{justify-content:flex-start!important}.justify-content-xs-end{justify-content:flex-end!important}.justify-content-xs-center{justify-content:center!important}.justify-content-xs-between{justify-content:space-between!important}.justify-content-xs-around{justify-content:space-around!important}.align-items-xs-start{align-items:flex-start!important}.align-items-xs-end{align-items:flex-end!important}.align-items-xs-center{align-items:center!important}.align-items-xs-baseline{align-items:baseline!important}.align-items-xs-stretch{align-items:stretch!important}.align-content-xs-start{align-content:flex-start!important}.align-content-xs-end{align-content:flex-end!important}.align-content-xs-center{align-content:center!important}.align-content-xs-between{align-content:space-between!important}.align-content-xs-around{align-content:space-around!important}.align-content-xs-stretch{align-content:stretch!important}.align-self-xs-auto{align-self:auto!important}.align-self-xs-start{align-self:flex-start!important}.align-self-xs-end{align-self:flex-end!important}.align-self-xs-center{align-self:center!important}.align-self-xs-baseline{align-self:baseline!important}.align-self-xs-stretch{align-self:stretch!important}}@media(min-width:616px){.flex-sm-row{flex-direction:row!important}.flex-sm-column{flex-direction:column!important}.flex-sm-row-reverse{flex-direction:row-reverse!important}.flex-sm-column-reverse{flex-direction:column-reverse!important}.flex-sm-wrap{flex-wrap:wrap!important}.flex-sm-nowrap{flex-wrap:nowrap!important}.flex-sm-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-sm-fill{flex:1 1 auto!important}.flex-sm-grow-0{flex-grow:0!important}.flex-sm-grow-1{flex-grow:1!important}.flex-sm-shrink-0{flex-shrink:0!important}.flex-sm-shrink-1{flex-shrink:1!important}.justify-content-sm-start{justify-content:flex-start!important}.justify-content-sm-end{justify-content:flex-end!important}.justify-content-sm-center{justify-content:center!important}.justify-content-sm-between{justify-content:space-between!important}.justify-content-sm-around{justify-content:space-around!important}.align-items-sm-start{align-items:flex-start!important}.align-items-sm-end{align-items:flex-end!important}.align-items-sm-center{align-items:center!important}.align-items-sm-baseline{align-items:baseline!important}.align-items-sm-stretch{align-items:stretch!important}.align-content-sm-start{align-content:flex-start!important}.align-content-sm-end{align-content:flex-end!important}.align-content-sm-center{align-content:center!important}.align-content-sm-between{align-content:space-between!important}.align-content-sm-around{align-content:space-around!important}.align-content-sm-stretch{align-content:stretch!important}.align-self-sm-auto{align-self:auto!important}.align-self-sm-start{align-self:flex-start!important}.align-self-sm-end{align-self:flex-end!important}.align-self-sm-center{align-self:center!important}.align-self-sm-baseline{align-self:baseline!important}.align-self-sm-stretch{align-self:stretch!important}}@media(min-width:768px){.flex-md-row{flex-direction:row!important}.flex-md-column{flex-direction:column!important}.flex-md-row-reverse{flex-direction:row-reverse!important}.flex-md-column-reverse{flex-direction:column-reverse!important}.flex-md-wrap{flex-wrap:wrap!important}.flex-md-nowrap{flex-wrap:nowrap!important}.flex-md-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-md-fill{flex:1 1 auto!important}.flex-md-grow-0{flex-grow:0!important}.flex-md-grow-1{flex-grow:1!important}.flex-md-shrink-0{flex-shrink:0!important}.flex-md-shrink-1{flex-shrink:1!important}.justify-content-md-start{justify-content:flex-start!important}.justify-content-md-end{justify-content:flex-end!important}.justify-content-md-center{justify-content:center!important}.justify-content-md-between{justify-content:space-between!important}.justify-content-md-around{justify-content:space-around!important}.align-items-md-start{align-items:flex-start!important}.align-items-md-end{align-items:flex-end!important}.align-items-md-center{align-items:center!important}.align-items-md-baseline{align-items:baseline!important}.align-items-md-stretch{align-items:stretch!important}.align-content-md-start{align-content:flex-start!important}.align-content-md-end{align-content:flex-end!important}.align-content-md-center{align-content:center!important}.align-content-md-between{align-content:space-between!important}.align-content-md-around{align-content:space-around!important}.align-content-md-stretch{align-content:stretch!important}.align-self-md-auto{align-self:auto!important}.align-self-md-start{align-self:flex-start!important}.align-self-md-end{align-self:flex-end!important}.align-self-md-center{align-self:center!important}.align-self-md-baseline{align-self:baseline!important}.align-self-md-stretch{align-self:stretch!important}}@media(min-width:980px){.flex-lg-row{flex-direction:row!important}.flex-lg-column{flex-direction:column!important}.flex-lg-row-reverse{flex-direction:row-reverse!important}.flex-lg-column-reverse{flex-direction:column-reverse!important}.flex-lg-wrap{flex-wrap:wrap!important}.flex-lg-nowrap{flex-wrap:nowrap!important}.flex-lg-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-lg-fill{flex:1 1 auto!important}.flex-lg-grow-0{flex-grow:0!important}.flex-lg-grow-1{flex-grow:1!important}.flex-lg-shrink-0{flex-shrink:0!important}.flex-lg-shrink-1{flex-shrink:1!important}.justify-content-lg-start{justify-content:flex-start!important}.justify-content-lg-end{justify-content:flex-end!important}.justify-content-lg-center{justify-content:center!important}.justify-content-lg-between{justify-content:space-between!important}.justify-content-lg-around{justify-content:space-around!important}.align-items-lg-start{align-items:flex-start!important}.align-items-lg-end{align-items:flex-end!important}.align-items-lg-center{align-items:center!important}.align-items-lg-baseline{align-items:baseline!important}.align-items-lg-stretch{align-items:stretch!important}.align-content-lg-start{align-content:flex-start!important}.align-content-lg-end{align-content:flex-end!important}.align-content-lg-center{align-content:center!important}.align-content-lg-between{align-content:space-between!important}.align-content-lg-around{align-content:space-around!important}.align-content-lg-stretch{align-content:stretch!important}.align-self-lg-auto{align-self:auto!important}.align-self-lg-start{align-self:flex-start!important}.align-self-lg-end{align-self:flex-end!important}.align-self-lg-center{align-self:center!important}.align-self-lg-baseline{align-self:baseline!important}.align-self-lg-stretch{align-self:stretch!important}}@media(min-width:1240px){.flex-xl-row{flex-direction:row!important}.flex-xl-column{flex-direction:column!important}.flex-xl-row-reverse{flex-direction:row-reverse!important}.flex-xl-column-reverse{flex-direction:column-reverse!important}.flex-xl-wrap{flex-wrap:wrap!important}.flex-xl-nowrap{flex-wrap:nowrap!important}.flex-xl-wrap-reverse{flex-wrap:wrap-reverse!important}.flex-xl-fill{flex:1 1 auto!important}.flex-xl-grow-0{flex-grow:0!important}.flex-xl-grow-1{flex-grow:1!important}.flex-xl-shrink-0{flex-shrink:0!important}.flex-xl-shrink-1{flex-shrink:1!important}.justify-content-xl-start{justify-content:flex-start!important}.justify-content-xl-end{justify-content:flex-end!important}.justify-content-xl-center{justify-content:center!important}.justify-content-xl-between{justify-content:space-between!important}.justify-content-xl-around{justify-content:space-around!important}.align-items-xl-start{align-items:flex-start!important}.align-items-xl-end{align-items:flex-end!important}.align-items-xl-center{align-items:center!important}.align-items-xl-baseline{align-items:baseline!important}.align-items-xl-stretch{align-items:stretch!important}.align-content-xl-start{align-content:flex-start!important}.align-content-xl-end{align-content:flex-end!important}.align-content-xl-center{align-content:center!important}.align-content-xl-between{align-content:space-between!important}.align-content-xl-around{align-content:space-around!important}.align-content-xl-stretch{align-content:stretch!important}.align-self-xl-auto{align-self:auto!important}.align-self-xl-start{align-self:flex-start!important}.align-self-xl-end{align-self:flex-end!important}.align-self-xl-center{align-self:center!important}.align-self-xl-baseline{align-self:baseline!important}.align-self-xl-stretch{align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media(min-width:400px){.float-xs-left{float:left!important}.float-xs-right{float:right!important}.float-xs-none{float:none!important}}@media(min-width:616px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media(min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media(min-width:980px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media(min-width:1240px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.overflow-auto{overflow:auto!important}.overflow-hidden{overflow:hidden!important}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:sticky!important}.fixed-top{top:0}.fixed-bottom,.fixed-top{position:fixed;right:0;left:0;z-index:1030}.fixed-bottom{bottom:0}@supports(position:sticky){.sticky-top{position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{box-shadow:0 2px 14px rgba(108,117,125,.2)!important}.shadow{box-shadow:0 8px 20px rgba(108,117,125,.2)!important}.shadow-lg{box-shadow:0 12px 32px rgba(108,117,125,.2)!important}.shadow-none{box-shadow:none!important}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.w-auto{width:auto!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.h-auto{height:auto!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.min-vw-100{min-width:100vw!important}.min-vh-100{min-height:100vh!important}.vw-100{width:100vw!important}.vh-100{height:100vh!important}.stretched-link:after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:transparent}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:8px!important}.mt-1,.my-1{margin-top:8px!important}.mr-1,.mx-1{margin-right:8px!important}.mb-1,.my-1{margin-bottom:8px!important}.ml-1,.mx-1{margin-left:8px!important}.m-2{margin:16px!important}.mt-2,.my-2{margin-top:16px!important}.mr-2,.mx-2{margin-right:16px!important}.mb-2,.my-2{margin-bottom:16px!important}.ml-2,.mx-2{margin-left:16px!important}.m-3{margin:24px!important}.mt-3,.my-3{margin-top:24px!important}.mr-3,.mx-3{margin-right:24px!important}.mb-3,.my-3{margin-bottom:24px!important}.ml-3,.mx-3{margin-left:24px!important}.m-4{margin:32px!important}.mt-4,.my-4{margin-top:32px!important}.mr-4,.mx-4{margin-right:32px!important}.mb-4,.my-4{margin-bottom:32px!important}.ml-4,.mx-4{margin-left:32px!important}.m-5{margin:40px!important}.mt-5,.my-5{margin-top:40px!important}.mr-5,.mx-5{margin-right:40px!important}.mb-5,.my-5{margin-bottom:40px!important}.ml-5,.mx-5{margin-left:40px!important}.m-6{margin:48px!important}.mt-6,.my-6{margin-top:48px!important}.mr-6,.mx-6{margin-right:48px!important}.mb-6,.my-6{margin-bottom:48px!important}.ml-6,.mx-6{margin-left:48px!important}.m-7{margin:56px!important}.mt-7,.my-7{margin-top:56px!important}.mr-7,.mx-7{margin-right:56px!important}.mb-7,.my-7{margin-bottom:56px!important}.ml-7,.mx-7{margin-left:56px!important}.m-8{margin:64px!important}.mt-8,.my-8{margin-top:64px!important}.mr-8,.mx-8{margin-right:64px!important}.mb-8,.my-8{margin-bottom:64px!important}.ml-8,.mx-8{margin-left:64px!important}.m-9{margin:72px!important}.mt-9,.my-9{margin-top:72px!important}.mr-9,.mx-9{margin-right:72px!important}.mb-9,.my-9{margin-bottom:72px!important}.ml-9,.mx-9{margin-left:72px!important}.m-10{margin:80px!important}.mt-10,.my-10{margin-top:80px!important}.mr-10,.mx-10{margin-right:80px!important}.mb-10,.my-10{margin-bottom:80px!important}.ml-10,.mx-10{margin-left:80px!important}.m-12{margin:96px!important}.mt-12,.my-12{margin-top:96px!important}.mr-12,.mx-12{margin-right:96px!important}.mb-12,.my-12{margin-bottom:96px!important}.ml-12,.mx-12{margin-left:96px!important}.m-15{margin:120px!important}.mt-15,.my-15{margin-top:120px!important}.mr-15,.mx-15{margin-right:120px!important}.mb-15,.my-15{margin-bottom:120px!important}.ml-15,.mx-15{margin-left:120px!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:8px!important}.pt-1,.py-1{padding-top:8px!important}.pr-1,.px-1{padding-right:8px!important}.pb-1,.py-1{padding-bottom:8px!important}.pl-1,.px-1{padding-left:8px!important}.p-2{padding:16px!important}.pt-2,.py-2{padding-top:16px!important}.pr-2,.px-2{padding-right:16px!important}.pb-2,.py-2{padding-bottom:16px!important}.pl-2,.px-2{padding-left:16px!important}.p-3{padding:24px!important}.pt-3,.py-3{padding-top:24px!important}.pr-3,.px-3{padding-right:24px!important}.pb-3,.py-3{padding-bottom:24px!important}.pl-3,.px-3{padding-left:24px!important}.p-4{padding:32px!important}.pt-4,.py-4{padding-top:32px!important}.pr-4,.px-4{padding-right:32px!important}.pb-4,.py-4{padding-bottom:32px!important}.pl-4,.px-4{padding-left:32px!important}.p-5{padding:40px!important}.pt-5,.py-5{padding-top:40px!important}.pr-5,.px-5{padding-right:40px!important}.pb-5,.py-5{padding-bottom:40px!important}.pl-5,.px-5{padding-left:40px!important}.p-6{padding:48px!important}.pt-6,.py-6{padding-top:48px!important}.pr-6,.px-6{padding-right:48px!important}.pb-6,.py-6{padding-bottom:48px!important}.pl-6,.px-6{padding-left:48px!important}.p-7{padding:56px!important}.pt-7,.py-7{padding-top:56px!important}.pr-7,.px-7{padding-right:56px!important}.pb-7,.py-7{padding-bottom:56px!important}.pl-7,.px-7{padding-left:56px!important}.p-8{padding:64px!important}.pt-8,.py-8{padding-top:64px!important}.pr-8,.px-8{padding-right:64px!important}.pb-8,.py-8{padding-bottom:64px!important}.pl-8,.px-8{padding-left:64px!important}.p-9{padding:72px!important}.pt-9,.py-9{padding-top:72px!important}.pr-9,.px-9{padding-right:72px!important}.pb-9,.py-9{padding-bottom:72px!important}.pl-9,.px-9{padding-left:72px!important}.p-10{padding:80px!important}.pt-10,.py-10{padding-top:80px!important}.pr-10,.px-10{padding-right:80px!important}.pb-10,.py-10{padding-bottom:80px!important}.pl-10,.px-10{padding-left:80px!important}.p-12{padding:96px!important}.pt-12,.py-12{padding-top:96px!important}.pr-12,.px-12{padding-right:96px!important}.pb-12,.py-12{padding-bottom:96px!important}.pl-12,.px-12{padding-left:96px!important}.p-15{padding:120px!important}.pt-15,.py-15{padding-top:120px!important}.pr-15,.px-15{padding-right:120px!important}.pb-15,.py-15{padding-bottom:120px!important}.pl-15,.px-15{padding-left:120px!important}.m-n1{margin:-8px!important}.mt-n1,.my-n1{margin-top:-8px!important}.mr-n1,.mx-n1{margin-right:-8px!important}.mb-n1,.my-n1{margin-bottom:-8px!important}.ml-n1,.mx-n1{margin-left:-8px!important}.m-n2{margin:-16px!important}.mt-n2,.my-n2{margin-top:-16px!important}.mr-n2,.mx-n2{margin-right:-16px!important}.mb-n2,.my-n2{margin-bottom:-16px!important}.ml-n2,.mx-n2{margin-left:-16px!important}.m-n3{margin:-24px!important}.mt-n3,.my-n3{margin-top:-24px!important}.mr-n3,.mx-n3{margin-right:-24px!important}.mb-n3,.my-n3{margin-bottom:-24px!important}.ml-n3,.mx-n3{margin-left:-24px!important}.m-n4{margin:-32px!important}.mt-n4,.my-n4{margin-top:-32px!important}.mr-n4,.mx-n4{margin-right:-32px!important}.mb-n4,.my-n4{margin-bottom:-32px!important}.ml-n4,.mx-n4{margin-left:-32px!important}.m-n5{margin:-40px!important}.mt-n5,.my-n5{margin-top:-40px!important}.mr-n5,.mx-n5{margin-right:-40px!important}.mb-n5,.my-n5{margin-bottom:-40px!important}.ml-n5,.mx-n5{margin-left:-40px!important}.m-n6{margin:-48px!important}.mt-n6,.my-n6{margin-top:-48px!important}.mr-n6,.mx-n6{margin-right:-48px!important}.mb-n6,.my-n6{margin-bottom:-48px!important}.ml-n6,.mx-n6{margin-left:-48px!important}.m-n7{margin:-56px!important}.mt-n7,.my-n7{margin-top:-56px!important}.mr-n7,.mx-n7{margin-right:-56px!important}.mb-n7,.my-n7{margin-bottom:-56px!important}.ml-n7,.mx-n7{margin-left:-56px!important}.m-n8{margin:-64px!important}.mt-n8,.my-n8{margin-top:-64px!important}.mr-n8,.mx-n8{margin-right:-64px!important}.mb-n8,.my-n8{margin-bottom:-64px!important}.ml-n8,.mx-n8{margin-left:-64px!important}.m-n9{margin:-72px!important}.mt-n9,.my-n9{margin-top:-72px!important}.mr-n9,.mx-n9{margin-right:-72px!important}.mb-n9,.my-n9{margin-bottom:-72px!important}.ml-n9,.mx-n9{margin-left:-72px!important}.m-n10{margin:-80px!important}.mt-n10,.my-n10{margin-top:-80px!important}.mr-n10,.mx-n10{margin-right:-80px!important}.mb-n10,.my-n10{margin-bottom:-80px!important}.ml-n10,.mx-n10{margin-left:-80px!important}.m-n12{margin:-96px!important}.mt-n12,.my-n12{margin-top:-96px!important}.mr-n12,.mx-n12{margin-right:-96px!important}.mb-n12,.my-n12{margin-bottom:-96px!important}.ml-n12,.mx-n12{margin-left:-96px!important}.m-n15{margin:-120px!important}.mt-n15,.my-n15{margin-top:-120px!important}.mr-n15,.mx-n15{margin-right:-120px!important}.mb-n15,.my-n15{margin-bottom:-120px!important}.ml-n15,.mx-n15{margin-left:-120px!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media(min-width:400px){.m-xs-0{margin:0!important}.mt-xs-0,.my-xs-0{margin-top:0!important}.mr-xs-0,.mx-xs-0{margin-right:0!important}.mb-xs-0,.my-xs-0{margin-bottom:0!important}.ml-xs-0,.mx-xs-0{margin-left:0!important}.m-xs-1{margin:8px!important}.mt-xs-1,.my-xs-1{margin-top:8px!important}.mr-xs-1,.mx-xs-1{margin-right:8px!important}.mb-xs-1,.my-xs-1{margin-bottom:8px!important}.ml-xs-1,.mx-xs-1{margin-left:8px!important}.m-xs-2{margin:16px!important}.mt-xs-2,.my-xs-2{margin-top:16px!important}.mr-xs-2,.mx-xs-2{margin-right:16px!important}.mb-xs-2,.my-xs-2{margin-bottom:16px!important}.ml-xs-2,.mx-xs-2{margin-left:16px!important}.m-xs-3{margin:24px!important}.mt-xs-3,.my-xs-3{margin-top:24px!important}.mr-xs-3,.mx-xs-3{margin-right:24px!important}.mb-xs-3,.my-xs-3{margin-bottom:24px!important}.ml-xs-3,.mx-xs-3{margin-left:24px!important}.m-xs-4{margin:32px!important}.mt-xs-4,.my-xs-4{margin-top:32px!important}.mr-xs-4,.mx-xs-4{margin-right:32px!important}.mb-xs-4,.my-xs-4{margin-bottom:32px!important}.ml-xs-4,.mx-xs-4{margin-left:32px!important}.m-xs-5{margin:40px!important}.mt-xs-5,.my-xs-5{margin-top:40px!important}.mr-xs-5,.mx-xs-5{margin-right:40px!important}.mb-xs-5,.my-xs-5{margin-bottom:40px!important}.ml-xs-5,.mx-xs-5{margin-left:40px!important}.m-xs-6{margin:48px!important}.mt-xs-6,.my-xs-6{margin-top:48px!important}.mr-xs-6,.mx-xs-6{margin-right:48px!important}.mb-xs-6,.my-xs-6{margin-bottom:48px!important}.ml-xs-6,.mx-xs-6{margin-left:48px!important}.m-xs-7{margin:56px!important}.mt-xs-7,.my-xs-7{margin-top:56px!important}.mr-xs-7,.mx-xs-7{margin-right:56px!important}.mb-xs-7,.my-xs-7{margin-bottom:56px!important}.ml-xs-7,.mx-xs-7{margin-left:56px!important}.m-xs-8{margin:64px!important}.mt-xs-8,.my-xs-8{margin-top:64px!important}.mr-xs-8,.mx-xs-8{margin-right:64px!important}.mb-xs-8,.my-xs-8{margin-bottom:64px!important}.ml-xs-8,.mx-xs-8{margin-left:64px!important}.m-xs-9{margin:72px!important}.mt-xs-9,.my-xs-9{margin-top:72px!important}.mr-xs-9,.mx-xs-9{margin-right:72px!important}.mb-xs-9,.my-xs-9{margin-bottom:72px!important}.ml-xs-9,.mx-xs-9{margin-left:72px!important}.m-xs-10{margin:80px!important}.mt-xs-10,.my-xs-10{margin-top:80px!important}.mr-xs-10,.mx-xs-10{margin-right:80px!important}.mb-xs-10,.my-xs-10{margin-bottom:80px!important}.ml-xs-10,.mx-xs-10{margin-left:80px!important}.m-xs-12{margin:96px!important}.mt-xs-12,.my-xs-12{margin-top:96px!important}.mr-xs-12,.mx-xs-12{margin-right:96px!important}.mb-xs-12,.my-xs-12{margin-bottom:96px!important}.ml-xs-12,.mx-xs-12{margin-left:96px!important}.m-xs-15{margin:120px!important}.mt-xs-15,.my-xs-15{margin-top:120px!important}.mr-xs-15,.mx-xs-15{margin-right:120px!important}.mb-xs-15,.my-xs-15{margin-bottom:120px!important}.ml-xs-15,.mx-xs-15{margin-left:120px!important}.p-xs-0{padding:0!important}.pt-xs-0,.py-xs-0{padding-top:0!important}.pr-xs-0,.px-xs-0{padding-right:0!important}.pb-xs-0,.py-xs-0{padding-bottom:0!important}.pl-xs-0,.px-xs-0{padding-left:0!important}.p-xs-1{padding:8px!important}.pt-xs-1,.py-xs-1{padding-top:8px!important}.pr-xs-1,.px-xs-1{padding-right:8px!important}.pb-xs-1,.py-xs-1{padding-bottom:8px!important}.pl-xs-1,.px-xs-1{padding-left:8px!important}.p-xs-2{padding:16px!important}.pt-xs-2,.py-xs-2{padding-top:16px!important}.pr-xs-2,.px-xs-2{padding-right:16px!important}.pb-xs-2,.py-xs-2{padding-bottom:16px!important}.pl-xs-2,.px-xs-2{padding-left:16px!important}.p-xs-3{padding:24px!important}.pt-xs-3,.py-xs-3{padding-top:24px!important}.pr-xs-3,.px-xs-3{padding-right:24px!important}.pb-xs-3,.py-xs-3{padding-bottom:24px!important}.pl-xs-3,.px-xs-3{padding-left:24px!important}.p-xs-4{padding:32px!important}.pt-xs-4,.py-xs-4{padding-top:32px!important}.pr-xs-4,.px-xs-4{padding-right:32px!important}.pb-xs-4,.py-xs-4{padding-bottom:32px!important}.pl-xs-4,.px-xs-4{padding-left:32px!important}.p-xs-5{padding:40px!important}.pt-xs-5,.py-xs-5{padding-top:40px!important}.pr-xs-5,.px-xs-5{padding-right:40px!important}.pb-xs-5,.py-xs-5{padding-bottom:40px!important}.pl-xs-5,.px-xs-5{padding-left:40px!important}.p-xs-6{padding:48px!important}.pt-xs-6,.py-xs-6{padding-top:48px!important}.pr-xs-6,.px-xs-6{padding-right:48px!important}.pb-xs-6,.py-xs-6{padding-bottom:48px!important}.pl-xs-6,.px-xs-6{padding-left:48px!important}.p-xs-7{padding:56px!important}.pt-xs-7,.py-xs-7{padding-top:56px!important}.pr-xs-7,.px-xs-7{padding-right:56px!important}.pb-xs-7,.py-xs-7{padding-bottom:56px!important}.pl-xs-7,.px-xs-7{padding-left:56px!important}.p-xs-8{padding:64px!important}.pt-xs-8,.py-xs-8{padding-top:64px!important}.pr-xs-8,.px-xs-8{padding-right:64px!important}.pb-xs-8,.py-xs-8{padding-bottom:64px!important}.pl-xs-8,.px-xs-8{padding-left:64px!important}.p-xs-9{padding:72px!important}.pt-xs-9,.py-xs-9{padding-top:72px!important}.pr-xs-9,.px-xs-9{padding-right:72px!important}.pb-xs-9,.py-xs-9{padding-bottom:72px!important}.pl-xs-9,.px-xs-9{padding-left:72px!important}.p-xs-10{padding:80px!important}.pt-xs-10,.py-xs-10{padding-top:80px!important}.pr-xs-10,.px-xs-10{padding-right:80px!important}.pb-xs-10,.py-xs-10{padding-bottom:80px!important}.pl-xs-10,.px-xs-10{padding-left:80px!important}.p-xs-12{padding:96px!important}.pt-xs-12,.py-xs-12{padding-top:96px!important}.pr-xs-12,.px-xs-12{padding-right:96px!important}.pb-xs-12,.py-xs-12{padding-bottom:96px!important}.pl-xs-12,.px-xs-12{padding-left:96px!important}.p-xs-15{padding:120px!important}.pt-xs-15,.py-xs-15{padding-top:120px!important}.pr-xs-15,.px-xs-15{padding-right:120px!important}.pb-xs-15,.py-xs-15{padding-bottom:120px!important}.pl-xs-15,.px-xs-15{padding-left:120px!important}.m-xs-n1{margin:-8px!important}.mt-xs-n1,.my-xs-n1{margin-top:-8px!important}.mr-xs-n1,.mx-xs-n1{margin-right:-8px!important}.mb-xs-n1,.my-xs-n1{margin-bottom:-8px!important}.ml-xs-n1,.mx-xs-n1{margin-left:-8px!important}.m-xs-n2{margin:-16px!important}.mt-xs-n2,.my-xs-n2{margin-top:-16px!important}.mr-xs-n2,.mx-xs-n2{margin-right:-16px!important}.mb-xs-n2,.my-xs-n2{margin-bottom:-16px!important}.ml-xs-n2,.mx-xs-n2{margin-left:-16px!important}.m-xs-n3{margin:-24px!important}.mt-xs-n3,.my-xs-n3{margin-top:-24px!important}.mr-xs-n3,.mx-xs-n3{margin-right:-24px!important}.mb-xs-n3,.my-xs-n3{margin-bottom:-24px!important}.ml-xs-n3,.mx-xs-n3{margin-left:-24px!important}.m-xs-n4{margin:-32px!important}.mt-xs-n4,.my-xs-n4{margin-top:-32px!important}.mr-xs-n4,.mx-xs-n4{margin-right:-32px!important}.mb-xs-n4,.my-xs-n4{margin-bottom:-32px!important}.ml-xs-n4,.mx-xs-n4{margin-left:-32px!important}.m-xs-n5{margin:-40px!important}.mt-xs-n5,.my-xs-n5{margin-top:-40px!important}.mr-xs-n5,.mx-xs-n5{margin-right:-40px!important}.mb-xs-n5,.my-xs-n5{margin-bottom:-40px!important}.ml-xs-n5,.mx-xs-n5{margin-left:-40px!important}.m-xs-n6{margin:-48px!important}.mt-xs-n6,.my-xs-n6{margin-top:-48px!important}.mr-xs-n6,.mx-xs-n6{margin-right:-48px!important}.mb-xs-n6,.my-xs-n6{margin-bottom:-48px!important}.ml-xs-n6,.mx-xs-n6{margin-left:-48px!important}.m-xs-n7{margin:-56px!important}.mt-xs-n7,.my-xs-n7{margin-top:-56px!important}.mr-xs-n7,.mx-xs-n7{margin-right:-56px!important}.mb-xs-n7,.my-xs-n7{margin-bottom:-56px!important}.ml-xs-n7,.mx-xs-n7{margin-left:-56px!important}.m-xs-n8{margin:-64px!important}.mt-xs-n8,.my-xs-n8{margin-top:-64px!important}.mr-xs-n8,.mx-xs-n8{margin-right:-64px!important}.mb-xs-n8,.my-xs-n8{margin-bottom:-64px!important}.ml-xs-n8,.mx-xs-n8{margin-left:-64px!important}.m-xs-n9{margin:-72px!important}.mt-xs-n9,.my-xs-n9{margin-top:-72px!important}.mr-xs-n9,.mx-xs-n9{margin-right:-72px!important}.mb-xs-n9,.my-xs-n9{margin-bottom:-72px!important}.ml-xs-n9,.mx-xs-n9{margin-left:-72px!important}.m-xs-n10{margin:-80px!important}.mt-xs-n10,.my-xs-n10{margin-top:-80px!important}.mr-xs-n10,.mx-xs-n10{margin-right:-80px!important}.mb-xs-n10,.my-xs-n10{margin-bottom:-80px!important}.ml-xs-n10,.mx-xs-n10{margin-left:-80px!important}.m-xs-n12{margin:-96px!important}.mt-xs-n12,.my-xs-n12{margin-top:-96px!important}.mr-xs-n12,.mx-xs-n12{margin-right:-96px!important}.mb-xs-n12,.my-xs-n12{margin-bottom:-96px!important}.ml-xs-n12,.mx-xs-n12{margin-left:-96px!important}.m-xs-n15{margin:-120px!important}.mt-xs-n15,.my-xs-n15{margin-top:-120px!important}.mr-xs-n15,.mx-xs-n15{margin-right:-120px!important}.mb-xs-n15,.my-xs-n15{margin-bottom:-120px!important}.ml-xs-n15,.mx-xs-n15{margin-left:-120px!important}.m-xs-auto{margin:auto!important}.mt-xs-auto,.my-xs-auto{margin-top:auto!important}.mr-xs-auto,.mx-xs-auto{margin-right:auto!important}.mb-xs-auto,.my-xs-auto{margin-bottom:auto!important}.ml-xs-auto,.mx-xs-auto{margin-left:auto!important}}@media(min-width:616px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:8px!important}.mt-sm-1,.my-sm-1{margin-top:8px!important}.mr-sm-1,.mx-sm-1{margin-right:8px!important}.mb-sm-1,.my-sm-1{margin-bottom:8px!important}.ml-sm-1,.mx-sm-1{margin-left:8px!important}.m-sm-2{margin:16px!important}.mt-sm-2,.my-sm-2{margin-top:16px!important}.mr-sm-2,.mx-sm-2{margin-right:16px!important}.mb-sm-2,.my-sm-2{margin-bottom:16px!important}.ml-sm-2,.mx-sm-2{margin-left:16px!important}.m-sm-3{margin:24px!important}.mt-sm-3,.my-sm-3{margin-top:24px!important}.mr-sm-3,.mx-sm-3{margin-right:24px!important}.mb-sm-3,.my-sm-3{margin-bottom:24px!important}.ml-sm-3,.mx-sm-3{margin-left:24px!important}.m-sm-4{margin:32px!important}.mt-sm-4,.my-sm-4{margin-top:32px!important}.mr-sm-4,.mx-sm-4{margin-right:32px!important}.mb-sm-4,.my-sm-4{margin-bottom:32px!important}.ml-sm-4,.mx-sm-4{margin-left:32px!important}.m-sm-5{margin:40px!important}.mt-sm-5,.my-sm-5{margin-top:40px!important}.mr-sm-5,.mx-sm-5{margin-right:40px!important}.mb-sm-5,.my-sm-5{margin-bottom:40px!important}.ml-sm-5,.mx-sm-5{margin-left:40px!important}.m-sm-6{margin:48px!important}.mt-sm-6,.my-sm-6{margin-top:48px!important}.mr-sm-6,.mx-sm-6{margin-right:48px!important}.mb-sm-6,.my-sm-6{margin-bottom:48px!important}.ml-sm-6,.mx-sm-6{margin-left:48px!important}.m-sm-7{margin:56px!important}.mt-sm-7,.my-sm-7{margin-top:56px!important}.mr-sm-7,.mx-sm-7{margin-right:56px!important}.mb-sm-7,.my-sm-7{margin-bottom:56px!important}.ml-sm-7,.mx-sm-7{margin-left:56px!important}.m-sm-8{margin:64px!important}.mt-sm-8,.my-sm-8{margin-top:64px!important}.mr-sm-8,.mx-sm-8{margin-right:64px!important}.mb-sm-8,.my-sm-8{margin-bottom:64px!important}.ml-sm-8,.mx-sm-8{margin-left:64px!important}.m-sm-9{margin:72px!important}.mt-sm-9,.my-sm-9{margin-top:72px!important}.mr-sm-9,.mx-sm-9{margin-right:72px!important}.mb-sm-9,.my-sm-9{margin-bottom:72px!important}.ml-sm-9,.mx-sm-9{margin-left:72px!important}.m-sm-10{margin:80px!important}.mt-sm-10,.my-sm-10{margin-top:80px!important}.mr-sm-10,.mx-sm-10{margin-right:80px!important}.mb-sm-10,.my-sm-10{margin-bottom:80px!important}.ml-sm-10,.mx-sm-10{margin-left:80px!important}.m-sm-12{margin:96px!important}.mt-sm-12,.my-sm-12{margin-top:96px!important}.mr-sm-12,.mx-sm-12{margin-right:96px!important}.mb-sm-12,.my-sm-12{margin-bottom:96px!important}.ml-sm-12,.mx-sm-12{margin-left:96px!important}.m-sm-15{margin:120px!important}.mt-sm-15,.my-sm-15{margin-top:120px!important}.mr-sm-15,.mx-sm-15{margin-right:120px!important}.mb-sm-15,.my-sm-15{margin-bottom:120px!important}.ml-sm-15,.mx-sm-15{margin-left:120px!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:8px!important}.pt-sm-1,.py-sm-1{padding-top:8px!important}.pr-sm-1,.px-sm-1{padding-right:8px!important}.pb-sm-1,.py-sm-1{padding-bottom:8px!important}.pl-sm-1,.px-sm-1{padding-left:8px!important}.p-sm-2{padding:16px!important}.pt-sm-2,.py-sm-2{padding-top:16px!important}.pr-sm-2,.px-sm-2{padding-right:16px!important}.pb-sm-2,.py-sm-2{padding-bottom:16px!important}.pl-sm-2,.px-sm-2{padding-left:16px!important}.p-sm-3{padding:24px!important}.pt-sm-3,.py-sm-3{padding-top:24px!important}.pr-sm-3,.px-sm-3{padding-right:24px!important}.pb-sm-3,.py-sm-3{padding-bottom:24px!important}.pl-sm-3,.px-sm-3{padding-left:24px!important}.p-sm-4{padding:32px!important}.pt-sm-4,.py-sm-4{padding-top:32px!important}.pr-sm-4,.px-sm-4{padding-right:32px!important}.pb-sm-4,.py-sm-4{padding-bottom:32px!important}.pl-sm-4,.px-sm-4{padding-left:32px!important}.p-sm-5{padding:40px!important}.pt-sm-5,.py-sm-5{padding-top:40px!important}.pr-sm-5,.px-sm-5{padding-right:40px!important}.pb-sm-5,.py-sm-5{padding-bottom:40px!important}.pl-sm-5,.px-sm-5{padding-left:40px!important}.p-sm-6{padding:48px!important}.pt-sm-6,.py-sm-6{padding-top:48px!important}.pr-sm-6,.px-sm-6{padding-right:48px!important}.pb-sm-6,.py-sm-6{padding-bottom:48px!important}.pl-sm-6,.px-sm-6{padding-left:48px!important}.p-sm-7{padding:56px!important}.pt-sm-7,.py-sm-7{padding-top:56px!important}.pr-sm-7,.px-sm-7{padding-right:56px!important}.pb-sm-7,.py-sm-7{padding-bottom:56px!important}.pl-sm-7,.px-sm-7{padding-left:56px!important}.p-sm-8{padding:64px!important}.pt-sm-8,.py-sm-8{padding-top:64px!important}.pr-sm-8,.px-sm-8{padding-right:64px!important}.pb-sm-8,.py-sm-8{padding-bottom:64px!important}.pl-sm-8,.px-sm-8{padding-left:64px!important}.p-sm-9{padding:72px!important}.pt-sm-9,.py-sm-9{padding-top:72px!important}.pr-sm-9,.px-sm-9{padding-right:72px!important}.pb-sm-9,.py-sm-9{padding-bottom:72px!important}.pl-sm-9,.px-sm-9{padding-left:72px!important}.p-sm-10{padding:80px!important}.pt-sm-10,.py-sm-10{padding-top:80px!important}.pr-sm-10,.px-sm-10{padding-right:80px!important}.pb-sm-10,.py-sm-10{padding-bottom:80px!important}.pl-sm-10,.px-sm-10{padding-left:80px!important}.p-sm-12{padding:96px!important}.pt-sm-12,.py-sm-12{padding-top:96px!important}.pr-sm-12,.px-sm-12{padding-right:96px!important}.pb-sm-12,.py-sm-12{padding-bottom:96px!important}.pl-sm-12,.px-sm-12{padding-left:96px!important}.p-sm-15{padding:120px!important}.pt-sm-15,.py-sm-15{padding-top:120px!important}.pr-sm-15,.px-sm-15{padding-right:120px!important}.pb-sm-15,.py-sm-15{padding-bottom:120px!important}.pl-sm-15,.px-sm-15{padding-left:120px!important}.m-sm-n1{margin:-8px!important}.mt-sm-n1,.my-sm-n1{margin-top:-8px!important}.mr-sm-n1,.mx-sm-n1{margin-right:-8px!important}.mb-sm-n1,.my-sm-n1{margin-bottom:-8px!important}.ml-sm-n1,.mx-sm-n1{margin-left:-8px!important}.m-sm-n2{margin:-16px!important}.mt-sm-n2,.my-sm-n2{margin-top:-16px!important}.mr-sm-n2,.mx-sm-n2{margin-right:-16px!important}.mb-sm-n2,.my-sm-n2{margin-bottom:-16px!important}.ml-sm-n2,.mx-sm-n2{margin-left:-16px!important}.m-sm-n3{margin:-24px!important}.mt-sm-n3,.my-sm-n3{margin-top:-24px!important}.mr-sm-n3,.mx-sm-n3{margin-right:-24px!important}.mb-sm-n3,.my-sm-n3{margin-bottom:-24px!important}.ml-sm-n3,.mx-sm-n3{margin-left:-24px!important}.m-sm-n4{margin:-32px!important}.mt-sm-n4,.my-sm-n4{margin-top:-32px!important}.mr-sm-n4,.mx-sm-n4{margin-right:-32px!important}.mb-sm-n4,.my-sm-n4{margin-bottom:-32px!important}.ml-sm-n4,.mx-sm-n4{margin-left:-32px!important}.m-sm-n5{margin:-40px!important}.mt-sm-n5,.my-sm-n5{margin-top:-40px!important}.mr-sm-n5,.mx-sm-n5{margin-right:-40px!important}.mb-sm-n5,.my-sm-n5{margin-bottom:-40px!important}.ml-sm-n5,.mx-sm-n5{margin-left:-40px!important}.m-sm-n6{margin:-48px!important}.mt-sm-n6,.my-sm-n6{margin-top:-48px!important}.mr-sm-n6,.mx-sm-n6{margin-right:-48px!important}.mb-sm-n6,.my-sm-n6{margin-bottom:-48px!important}.ml-sm-n6,.mx-sm-n6{margin-left:-48px!important}.m-sm-n7{margin:-56px!important}.mt-sm-n7,.my-sm-n7{margin-top:-56px!important}.mr-sm-n7,.mx-sm-n7{margin-right:-56px!important}.mb-sm-n7,.my-sm-n7{margin-bottom:-56px!important}.ml-sm-n7,.mx-sm-n7{margin-left:-56px!important}.m-sm-n8{margin:-64px!important}.mt-sm-n8,.my-sm-n8{margin-top:-64px!important}.mr-sm-n8,.mx-sm-n8{margin-right:-64px!important}.mb-sm-n8,.my-sm-n8{margin-bottom:-64px!important}.ml-sm-n8,.mx-sm-n8{margin-left:-64px!important}.m-sm-n9{margin:-72px!important}.mt-sm-n9,.my-sm-n9{margin-top:-72px!important}.mr-sm-n9,.mx-sm-n9{margin-right:-72px!important}.mb-sm-n9,.my-sm-n9{margin-bottom:-72px!important}.ml-sm-n9,.mx-sm-n9{margin-left:-72px!important}.m-sm-n10{margin:-80px!important}.mt-sm-n10,.my-sm-n10{margin-top:-80px!important}.mr-sm-n10,.mx-sm-n10{margin-right:-80px!important}.mb-sm-n10,.my-sm-n10{margin-bottom:-80px!important}.ml-sm-n10,.mx-sm-n10{margin-left:-80px!important}.m-sm-n12{margin:-96px!important}.mt-sm-n12,.my-sm-n12{margin-top:-96px!important}.mr-sm-n12,.mx-sm-n12{margin-right:-96px!important}.mb-sm-n12,.my-sm-n12{margin-bottom:-96px!important}.ml-sm-n12,.mx-sm-n12{margin-left:-96px!important}.m-sm-n15{margin:-120px!important}.mt-sm-n15,.my-sm-n15{margin-top:-120px!important}.mr-sm-n15,.mx-sm-n15{margin-right:-120px!important}.mb-sm-n15,.my-sm-n15{margin-bottom:-120px!important}.ml-sm-n15,.mx-sm-n15{margin-left:-120px!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media(min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:8px!important}.mt-md-1,.my-md-1{margin-top:8px!important}.mr-md-1,.mx-md-1{margin-right:8px!important}.mb-md-1,.my-md-1{margin-bottom:8px!important}.ml-md-1,.mx-md-1{margin-left:8px!important}.m-md-2{margin:16px!important}.mt-md-2,.my-md-2{margin-top:16px!important}.mr-md-2,.mx-md-2{margin-right:16px!important}.mb-md-2,.my-md-2{margin-bottom:16px!important}.ml-md-2,.mx-md-2{margin-left:16px!important}.m-md-3{margin:24px!important}.mt-md-3,.my-md-3{margin-top:24px!important}.mr-md-3,.mx-md-3{margin-right:24px!important}.mb-md-3,.my-md-3{margin-bottom:24px!important}.ml-md-3,.mx-md-3{margin-left:24px!important}.m-md-4{margin:32px!important}.mt-md-4,.my-md-4{margin-top:32px!important}.mr-md-4,.mx-md-4{margin-right:32px!important}.mb-md-4,.my-md-4{margin-bottom:32px!important}.ml-md-4,.mx-md-4{margin-left:32px!important}.m-md-5{margin:40px!important}.mt-md-5,.my-md-5{margin-top:40px!important}.mr-md-5,.mx-md-5{margin-right:40px!important}.mb-md-5,.my-md-5{margin-bottom:40px!important}.ml-md-5,.mx-md-5{margin-left:40px!important}.m-md-6{margin:48px!important}.mt-md-6,.my-md-6{margin-top:48px!important}.mr-md-6,.mx-md-6{margin-right:48px!important}.mb-md-6,.my-md-6{margin-bottom:48px!important}.ml-md-6,.mx-md-6{margin-left:48px!important}.m-md-7{margin:56px!important}.mt-md-7,.my-md-7{margin-top:56px!important}.mr-md-7,.mx-md-7{margin-right:56px!important}.mb-md-7,.my-md-7{margin-bottom:56px!important}.ml-md-7,.mx-md-7{margin-left:56px!important}.m-md-8{margin:64px!important}.mt-md-8,.my-md-8{margin-top:64px!important}.mr-md-8,.mx-md-8{margin-right:64px!important}.mb-md-8,.my-md-8{margin-bottom:64px!important}.ml-md-8,.mx-md-8{margin-left:64px!important}.m-md-9{margin:72px!important}.mt-md-9,.my-md-9{margin-top:72px!important}.mr-md-9,.mx-md-9{margin-right:72px!important}.mb-md-9,.my-md-9{margin-bottom:72px!important}.ml-md-9,.mx-md-9{margin-left:72px!important}.m-md-10{margin:80px!important}.mt-md-10,.my-md-10{margin-top:80px!important}.mr-md-10,.mx-md-10{margin-right:80px!important}.mb-md-10,.my-md-10{margin-bottom:80px!important}.ml-md-10,.mx-md-10{margin-left:80px!important}.m-md-12{margin:96px!important}.mt-md-12,.my-md-12{margin-top:96px!important}.mr-md-12,.mx-md-12{margin-right:96px!important}.mb-md-12,.my-md-12{margin-bottom:96px!important}.ml-md-12,.mx-md-12{margin-left:96px!important}.m-md-15{margin:120px!important}.mt-md-15,.my-md-15{margin-top:120px!important}.mr-md-15,.mx-md-15{margin-right:120px!important}.mb-md-15,.my-md-15{margin-bottom:120px!important}.ml-md-15,.mx-md-15{margin-left:120px!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:8px!important}.pt-md-1,.py-md-1{padding-top:8px!important}.pr-md-1,.px-md-1{padding-right:8px!important}.pb-md-1,.py-md-1{padding-bottom:8px!important}.pl-md-1,.px-md-1{padding-left:8px!important}.p-md-2{padding:16px!important}.pt-md-2,.py-md-2{padding-top:16px!important}.pr-md-2,.px-md-2{padding-right:16px!important}.pb-md-2,.py-md-2{padding-bottom:16px!important}.pl-md-2,.px-md-2{padding-left:16px!important}.p-md-3{padding:24px!important}.pt-md-3,.py-md-3{padding-top:24px!important}.pr-md-3,.px-md-3{padding-right:24px!important}.pb-md-3,.py-md-3{padding-bottom:24px!important}.pl-md-3,.px-md-3{padding-left:24px!important}.p-md-4{padding:32px!important}.pt-md-4,.py-md-4{padding-top:32px!important}.pr-md-4,.px-md-4{padding-right:32px!important}.pb-md-4,.py-md-4{padding-bottom:32px!important}.pl-md-4,.px-md-4{padding-left:32px!important}.p-md-5{padding:40px!important}.pt-md-5,.py-md-5{padding-top:40px!important}.pr-md-5,.px-md-5{padding-right:40px!important}.pb-md-5,.py-md-5{padding-bottom:40px!important}.pl-md-5,.px-md-5{padding-left:40px!important}.p-md-6{padding:48px!important}.pt-md-6,.py-md-6{padding-top:48px!important}.pr-md-6,.px-md-6{padding-right:48px!important}.pb-md-6,.py-md-6{padding-bottom:48px!important}.pl-md-6,.px-md-6{padding-left:48px!important}.p-md-7{padding:56px!important}.pt-md-7,.py-md-7{padding-top:56px!important}.pr-md-7,.px-md-7{padding-right:56px!important}.pb-md-7,.py-md-7{padding-bottom:56px!important}.pl-md-7,.px-md-7{padding-left:56px!important}.p-md-8{padding:64px!important}.pt-md-8,.py-md-8{padding-top:64px!important}.pr-md-8,.px-md-8{padding-right:64px!important}.pb-md-8,.py-md-8{padding-bottom:64px!important}.pl-md-8,.px-md-8{padding-left:64px!important}.p-md-9{padding:72px!important}.pt-md-9,.py-md-9{padding-top:72px!important}.pr-md-9,.px-md-9{padding-right:72px!important}.pb-md-9,.py-md-9{padding-bottom:72px!important}.pl-md-9,.px-md-9{padding-left:72px!important}.p-md-10{padding:80px!important}.pt-md-10,.py-md-10{padding-top:80px!important}.pr-md-10,.px-md-10{padding-right:80px!important}.pb-md-10,.py-md-10{padding-bottom:80px!important}.pl-md-10,.px-md-10{padding-left:80px!important}.p-md-12{padding:96px!important}.pt-md-12,.py-md-12{padding-top:96px!important}.pr-md-12,.px-md-12{padding-right:96px!important}.pb-md-12,.py-md-12{padding-bottom:96px!important}.pl-md-12,.px-md-12{padding-left:96px!important}.p-md-15{padding:120px!important}.pt-md-15,.py-md-15{padding-top:120px!important}.pr-md-15,.px-md-15{padding-right:120px!important}.pb-md-15,.py-md-15{padding-bottom:120px!important}.pl-md-15,.px-md-15{padding-left:120px!important}.m-md-n1{margin:-8px!important}.mt-md-n1,.my-md-n1{margin-top:-8px!important}.mr-md-n1,.mx-md-n1{margin-right:-8px!important}.mb-md-n1,.my-md-n1{margin-bottom:-8px!important}.ml-md-n1,.mx-md-n1{margin-left:-8px!important}.m-md-n2{margin:-16px!important}.mt-md-n2,.my-md-n2{margin-top:-16px!important}.mr-md-n2,.mx-md-n2{margin-right:-16px!important}.mb-md-n2,.my-md-n2{margin-bottom:-16px!important}.ml-md-n2,.mx-md-n2{margin-left:-16px!important}.m-md-n3{margin:-24px!important}.mt-md-n3,.my-md-n3{margin-top:-24px!important}.mr-md-n3,.mx-md-n3{margin-right:-24px!important}.mb-md-n3,.my-md-n3{margin-bottom:-24px!important}.ml-md-n3,.mx-md-n3{margin-left:-24px!important}.m-md-n4{margin:-32px!important}.mt-md-n4,.my-md-n4{margin-top:-32px!important}.mr-md-n4,.mx-md-n4{margin-right:-32px!important}.mb-md-n4,.my-md-n4{margin-bottom:-32px!important}.ml-md-n4,.mx-md-n4{margin-left:-32px!important}.m-md-n5{margin:-40px!important}.mt-md-n5,.my-md-n5{margin-top:-40px!important}.mr-md-n5,.mx-md-n5{margin-right:-40px!important}.mb-md-n5,.my-md-n5{margin-bottom:-40px!important}.ml-md-n5,.mx-md-n5{margin-left:-40px!important}.m-md-n6{margin:-48px!important}.mt-md-n6,.my-md-n6{margin-top:-48px!important}.mr-md-n6,.mx-md-n6{margin-right:-48px!important}.mb-md-n6,.my-md-n6{margin-bottom:-48px!important}.ml-md-n6,.mx-md-n6{margin-left:-48px!important}.m-md-n7{margin:-56px!important}.mt-md-n7,.my-md-n7{margin-top:-56px!important}.mr-md-n7,.mx-md-n7{margin-right:-56px!important}.mb-md-n7,.my-md-n7{margin-bottom:-56px!important}.ml-md-n7,.mx-md-n7{margin-left:-56px!important}.m-md-n8{margin:-64px!important}.mt-md-n8,.my-md-n8{margin-top:-64px!important}.mr-md-n8,.mx-md-n8{margin-right:-64px!important}.mb-md-n8,.my-md-n8{margin-bottom:-64px!important}.ml-md-n8,.mx-md-n8{margin-left:-64px!important}.m-md-n9{margin:-72px!important}.mt-md-n9,.my-md-n9{margin-top:-72px!important}.mr-md-n9,.mx-md-n9{margin-right:-72px!important}.mb-md-n9,.my-md-n9{margin-bottom:-72px!important}.ml-md-n9,.mx-md-n9{margin-left:-72px!important}.m-md-n10{margin:-80px!important}.mt-md-n10,.my-md-n10{margin-top:-80px!important}.mr-md-n10,.mx-md-n10{margin-right:-80px!important}.mb-md-n10,.my-md-n10{margin-bottom:-80px!important}.ml-md-n10,.mx-md-n10{margin-left:-80px!important}.m-md-n12{margin:-96px!important}.mt-md-n12,.my-md-n12{margin-top:-96px!important}.mr-md-n12,.mx-md-n12{margin-right:-96px!important}.mb-md-n12,.my-md-n12{margin-bottom:-96px!important}.ml-md-n12,.mx-md-n12{margin-left:-96px!important}.m-md-n15{margin:-120px!important}.mt-md-n15,.my-md-n15{margin-top:-120px!important}.mr-md-n15,.mx-md-n15{margin-right:-120px!important}.mb-md-n15,.my-md-n15{margin-bottom:-120px!important}.ml-md-n15,.mx-md-n15{margin-left:-120px!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media(min-width:980px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:8px!important}.mt-lg-1,.my-lg-1{margin-top:8px!important}.mr-lg-1,.mx-lg-1{margin-right:8px!important}.mb-lg-1,.my-lg-1{margin-bottom:8px!important}.ml-lg-1,.mx-lg-1{margin-left:8px!important}.m-lg-2{margin:16px!important}.mt-lg-2,.my-lg-2{margin-top:16px!important}.mr-lg-2,.mx-lg-2{margin-right:16px!important}.mb-lg-2,.my-lg-2{margin-bottom:16px!important}.ml-lg-2,.mx-lg-2{margin-left:16px!important}.m-lg-3{margin:24px!important}.mt-lg-3,.my-lg-3{margin-top:24px!important}.mr-lg-3,.mx-lg-3{margin-right:24px!important}.mb-lg-3,.my-lg-3{margin-bottom:24px!important}.ml-lg-3,.mx-lg-3{margin-left:24px!important}.m-lg-4{margin:32px!important}.mt-lg-4,.my-lg-4{margin-top:32px!important}.mr-lg-4,.mx-lg-4{margin-right:32px!important}.mb-lg-4,.my-lg-4{margin-bottom:32px!important}.ml-lg-4,.mx-lg-4{margin-left:32px!important}.m-lg-5{margin:40px!important}.mt-lg-5,.my-lg-5{margin-top:40px!important}.mr-lg-5,.mx-lg-5{margin-right:40px!important}.mb-lg-5,.my-lg-5{margin-bottom:40px!important}.ml-lg-5,.mx-lg-5{margin-left:40px!important}.m-lg-6{margin:48px!important}.mt-lg-6,.my-lg-6{margin-top:48px!important}.mr-lg-6,.mx-lg-6{margin-right:48px!important}.mb-lg-6,.my-lg-6{margin-bottom:48px!important}.ml-lg-6,.mx-lg-6{margin-left:48px!important}.m-lg-7{margin:56px!important}.mt-lg-7,.my-lg-7{margin-top:56px!important}.mr-lg-7,.mx-lg-7{margin-right:56px!important}.mb-lg-7,.my-lg-7{margin-bottom:56px!important}.ml-lg-7,.mx-lg-7{margin-left:56px!important}.m-lg-8{margin:64px!important}.mt-lg-8,.my-lg-8{margin-top:64px!important}.mr-lg-8,.mx-lg-8{margin-right:64px!important}.mb-lg-8,.my-lg-8{margin-bottom:64px!important}.ml-lg-8,.mx-lg-8{margin-left:64px!important}.m-lg-9{margin:72px!important}.mt-lg-9,.my-lg-9{margin-top:72px!important}.mr-lg-9,.mx-lg-9{margin-right:72px!important}.mb-lg-9,.my-lg-9{margin-bottom:72px!important}.ml-lg-9,.mx-lg-9{margin-left:72px!important}.m-lg-10{margin:80px!important}.mt-lg-10,.my-lg-10{margin-top:80px!important}.mr-lg-10,.mx-lg-10{margin-right:80px!important}.mb-lg-10,.my-lg-10{margin-bottom:80px!important}.ml-lg-10,.mx-lg-10{margin-left:80px!important}.m-lg-12{margin:96px!important}.mt-lg-12,.my-lg-12{margin-top:96px!important}.mr-lg-12,.mx-lg-12{margin-right:96px!important}.mb-lg-12,.my-lg-12{margin-bottom:96px!important}.ml-lg-12,.mx-lg-12{margin-left:96px!important}.m-lg-15{margin:120px!important}.mt-lg-15,.my-lg-15{margin-top:120px!important}.mr-lg-15,.mx-lg-15{margin-right:120px!important}.mb-lg-15,.my-lg-15{margin-bottom:120px!important}.ml-lg-15,.mx-lg-15{margin-left:120px!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:8px!important}.pt-lg-1,.py-lg-1{padding-top:8px!important}.pr-lg-1,.px-lg-1{padding-right:8px!important}.pb-lg-1,.py-lg-1{padding-bottom:8px!important}.pl-lg-1,.px-lg-1{padding-left:8px!important}.p-lg-2{padding:16px!important}.pt-lg-2,.py-lg-2{padding-top:16px!important}.pr-lg-2,.px-lg-2{padding-right:16px!important}.pb-lg-2,.py-lg-2{padding-bottom:16px!important}.pl-lg-2,.px-lg-2{padding-left:16px!important}.p-lg-3{padding:24px!important}.pt-lg-3,.py-lg-3{padding-top:24px!important}.pr-lg-3,.px-lg-3{padding-right:24px!important}.pb-lg-3,.py-lg-3{padding-bottom:24px!important}.pl-lg-3,.px-lg-3{padding-left:24px!important}.p-lg-4{padding:32px!important}.pt-lg-4,.py-lg-4{padding-top:32px!important}.pr-lg-4,.px-lg-4{padding-right:32px!important}.pb-lg-4,.py-lg-4{padding-bottom:32px!important}.pl-lg-4,.px-lg-4{padding-left:32px!important}.p-lg-5{padding:40px!important}.pt-lg-5,.py-lg-5{padding-top:40px!important}.pr-lg-5,.px-lg-5{padding-right:40px!important}.pb-lg-5,.py-lg-5{padding-bottom:40px!important}.pl-lg-5,.px-lg-5{padding-left:40px!important}.p-lg-6{padding:48px!important}.pt-lg-6,.py-lg-6{padding-top:48px!important}.pr-lg-6,.px-lg-6{padding-right:48px!important}.pb-lg-6,.py-lg-6{padding-bottom:48px!important}.pl-lg-6,.px-lg-6{padding-left:48px!important}.p-lg-7{padding:56px!important}.pt-lg-7,.py-lg-7{padding-top:56px!important}.pr-lg-7,.px-lg-7{padding-right:56px!important}.pb-lg-7,.py-lg-7{padding-bottom:56px!important}.pl-lg-7,.px-lg-7{padding-left:56px!important}.p-lg-8{padding:64px!important}.pt-lg-8,.py-lg-8{padding-top:64px!important}.pr-lg-8,.px-lg-8{padding-right:64px!important}.pb-lg-8,.py-lg-8{padding-bottom:64px!important}.pl-lg-8,.px-lg-8{padding-left:64px!important}.p-lg-9{padding:72px!important}.pt-lg-9,.py-lg-9{padding-top:72px!important}.pr-lg-9,.px-lg-9{padding-right:72px!important}.pb-lg-9,.py-lg-9{padding-bottom:72px!important}.pl-lg-9,.px-lg-9{padding-left:72px!important}.p-lg-10{padding:80px!important}.pt-lg-10,.py-lg-10{padding-top:80px!important}.pr-lg-10,.px-lg-10{padding-right:80px!important}.pb-lg-10,.py-lg-10{padding-bottom:80px!important}.pl-lg-10,.px-lg-10{padding-left:80px!important}.p-lg-12{padding:96px!important}.pt-lg-12,.py-lg-12{padding-top:96px!important}.pr-lg-12,.px-lg-12{padding-right:96px!important}.pb-lg-12,.py-lg-12{padding-bottom:96px!important}.pl-lg-12,.px-lg-12{padding-left:96px!important}.p-lg-15{padding:120px!important}.pt-lg-15,.py-lg-15{padding-top:120px!important}.pr-lg-15,.px-lg-15{padding-right:120px!important}.pb-lg-15,.py-lg-15{padding-bottom:120px!important}.pl-lg-15,.px-lg-15{padding-left:120px!important}.m-lg-n1{margin:-8px!important}.mt-lg-n1,.my-lg-n1{margin-top:-8px!important}.mr-lg-n1,.mx-lg-n1{margin-right:-8px!important}.mb-lg-n1,.my-lg-n1{margin-bottom:-8px!important}.ml-lg-n1,.mx-lg-n1{margin-left:-8px!important}.m-lg-n2{margin:-16px!important}.mt-lg-n2,.my-lg-n2{margin-top:-16px!important}.mr-lg-n2,.mx-lg-n2{margin-right:-16px!important}.mb-lg-n2,.my-lg-n2{margin-bottom:-16px!important}.ml-lg-n2,.mx-lg-n2{margin-left:-16px!important}.m-lg-n3{margin:-24px!important}.mt-lg-n3,.my-lg-n3{margin-top:-24px!important}.mr-lg-n3,.mx-lg-n3{margin-right:-24px!important}.mb-lg-n3,.my-lg-n3{margin-bottom:-24px!important}.ml-lg-n3,.mx-lg-n3{margin-left:-24px!important}.m-lg-n4{margin:-32px!important}.mt-lg-n4,.my-lg-n4{margin-top:-32px!important}.mr-lg-n4,.mx-lg-n4{margin-right:-32px!important}.mb-lg-n4,.my-lg-n4{margin-bottom:-32px!important}.ml-lg-n4,.mx-lg-n4{margin-left:-32px!important}.m-lg-n5{margin:-40px!important}.mt-lg-n5,.my-lg-n5{margin-top:-40px!important}.mr-lg-n5,.mx-lg-n5{margin-right:-40px!important}.mb-lg-n5,.my-lg-n5{margin-bottom:-40px!important}.ml-lg-n5,.mx-lg-n5{margin-left:-40px!important}.m-lg-n6{margin:-48px!important}.mt-lg-n6,.my-lg-n6{margin-top:-48px!important}.mr-lg-n6,.mx-lg-n6{margin-right:-48px!important}.mb-lg-n6,.my-lg-n6{margin-bottom:-48px!important}.ml-lg-n6,.mx-lg-n6{margin-left:-48px!important}.m-lg-n7{margin:-56px!important}.mt-lg-n7,.my-lg-n7{margin-top:-56px!important}.mr-lg-n7,.mx-lg-n7{margin-right:-56px!important}.mb-lg-n7,.my-lg-n7{margin-bottom:-56px!important}.ml-lg-n7,.mx-lg-n7{margin-left:-56px!important}.m-lg-n8{margin:-64px!important}.mt-lg-n8,.my-lg-n8{margin-top:-64px!important}.mr-lg-n8,.mx-lg-n8{margin-right:-64px!important}.mb-lg-n8,.my-lg-n8{margin-bottom:-64px!important}.ml-lg-n8,.mx-lg-n8{margin-left:-64px!important}.m-lg-n9{margin:-72px!important}.mt-lg-n9,.my-lg-n9{margin-top:-72px!important}.mr-lg-n9,.mx-lg-n9{margin-right:-72px!important}.mb-lg-n9,.my-lg-n9{margin-bottom:-72px!important}.ml-lg-n9,.mx-lg-n9{margin-left:-72px!important}.m-lg-n10{margin:-80px!important}.mt-lg-n10,.my-lg-n10{margin-top:-80px!important}.mr-lg-n10,.mx-lg-n10{margin-right:-80px!important}.mb-lg-n10,.my-lg-n10{margin-bottom:-80px!important}.ml-lg-n10,.mx-lg-n10{margin-left:-80px!important}.m-lg-n12{margin:-96px!important}.mt-lg-n12,.my-lg-n12{margin-top:-96px!important}.mr-lg-n12,.mx-lg-n12{margin-right:-96px!important}.mb-lg-n12,.my-lg-n12{margin-bottom:-96px!important}.ml-lg-n12,.mx-lg-n12{margin-left:-96px!important}.m-lg-n15{margin:-120px!important}.mt-lg-n15,.my-lg-n15{margin-top:-120px!important}.mr-lg-n15,.mx-lg-n15{margin-right:-120px!important}.mb-lg-n15,.my-lg-n15{margin-bottom:-120px!important}.ml-lg-n15,.mx-lg-n15{margin-left:-120px!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media(min-width:1240px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:8px!important}.mt-xl-1,.my-xl-1{margin-top:8px!important}.mr-xl-1,.mx-xl-1{margin-right:8px!important}.mb-xl-1,.my-xl-1{margin-bottom:8px!important}.ml-xl-1,.mx-xl-1{margin-left:8px!important}.m-xl-2{margin:16px!important}.mt-xl-2,.my-xl-2{margin-top:16px!important}.mr-xl-2,.mx-xl-2{margin-right:16px!important}.mb-xl-2,.my-xl-2{margin-bottom:16px!important}.ml-xl-2,.mx-xl-2{margin-left:16px!important}.m-xl-3{margin:24px!important}.mt-xl-3,.my-xl-3{margin-top:24px!important}.mr-xl-3,.mx-xl-3{margin-right:24px!important}.mb-xl-3,.my-xl-3{margin-bottom:24px!important}.ml-xl-3,.mx-xl-3{margin-left:24px!important}.m-xl-4{margin:32px!important}.mt-xl-4,.my-xl-4{margin-top:32px!important}.mr-xl-4,.mx-xl-4{margin-right:32px!important}.mb-xl-4,.my-xl-4{margin-bottom:32px!important}.ml-xl-4,.mx-xl-4{margin-left:32px!important}.m-xl-5{margin:40px!important}.mt-xl-5,.my-xl-5{margin-top:40px!important}.mr-xl-5,.mx-xl-5{margin-right:40px!important}.mb-xl-5,.my-xl-5{margin-bottom:40px!important}.ml-xl-5,.mx-xl-5{margin-left:40px!important}.m-xl-6{margin:48px!important}.mt-xl-6,.my-xl-6{margin-top:48px!important}.mr-xl-6,.mx-xl-6{margin-right:48px!important}.mb-xl-6,.my-xl-6{margin-bottom:48px!important}.ml-xl-6,.mx-xl-6{margin-left:48px!important}.m-xl-7{margin:56px!important}.mt-xl-7,.my-xl-7{margin-top:56px!important}.mr-xl-7,.mx-xl-7{margin-right:56px!important}.mb-xl-7,.my-xl-7{margin-bottom:56px!important}.ml-xl-7,.mx-xl-7{margin-left:56px!important}.m-xl-8{margin:64px!important}.mt-xl-8,.my-xl-8{margin-top:64px!important}.mr-xl-8,.mx-xl-8{margin-right:64px!important}.mb-xl-8,.my-xl-8{margin-bottom:64px!important}.ml-xl-8,.mx-xl-8{margin-left:64px!important}.m-xl-9{margin:72px!important}.mt-xl-9,.my-xl-9{margin-top:72px!important}.mr-xl-9,.mx-xl-9{margin-right:72px!important}.mb-xl-9,.my-xl-9{margin-bottom:72px!important}.ml-xl-9,.mx-xl-9{margin-left:72px!important}.m-xl-10{margin:80px!important}.mt-xl-10,.my-xl-10{margin-top:80px!important}.mr-xl-10,.mx-xl-10{margin-right:80px!important}.mb-xl-10,.my-xl-10{margin-bottom:80px!important}.ml-xl-10,.mx-xl-10{margin-left:80px!important}.m-xl-12{margin:96px!important}.mt-xl-12,.my-xl-12{margin-top:96px!important}.mr-xl-12,.mx-xl-12{margin-right:96px!important}.mb-xl-12,.my-xl-12{margin-bottom:96px!important}.ml-xl-12,.mx-xl-12{margin-left:96px!important}.m-xl-15{margin:120px!important}.mt-xl-15,.my-xl-15{margin-top:120px!important}.mr-xl-15,.mx-xl-15{margin-right:120px!important}.mb-xl-15,.my-xl-15{margin-bottom:120px!important}.ml-xl-15,.mx-xl-15{margin-left:120px!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:8px!important}.pt-xl-1,.py-xl-1{padding-top:8px!important}.pr-xl-1,.px-xl-1{padding-right:8px!important}.pb-xl-1,.py-xl-1{padding-bottom:8px!important}.pl-xl-1,.px-xl-1{padding-left:8px!important}.p-xl-2{padding:16px!important}.pt-xl-2,.py-xl-2{padding-top:16px!important}.pr-xl-2,.px-xl-2{padding-right:16px!important}.pb-xl-2,.py-xl-2{padding-bottom:16px!important}.pl-xl-2,.px-xl-2{padding-left:16px!important}.p-xl-3{padding:24px!important}.pt-xl-3,.py-xl-3{padding-top:24px!important}.pr-xl-3,.px-xl-3{padding-right:24px!important}.pb-xl-3,.py-xl-3{padding-bottom:24px!important}.pl-xl-3,.px-xl-3{padding-left:24px!important}.p-xl-4{padding:32px!important}.pt-xl-4,.py-xl-4{padding-top:32px!important}.pr-xl-4,.px-xl-4{padding-right:32px!important}.pb-xl-4,.py-xl-4{padding-bottom:32px!important}.pl-xl-4,.px-xl-4{padding-left:32px!important}.p-xl-5{padding:40px!important}.pt-xl-5,.py-xl-5{padding-top:40px!important}.pr-xl-5,.px-xl-5{padding-right:40px!important}.pb-xl-5,.py-xl-5{padding-bottom:40px!important}.pl-xl-5,.px-xl-5{padding-left:40px!important}.p-xl-6{padding:48px!important}.pt-xl-6,.py-xl-6{padding-top:48px!important}.pr-xl-6,.px-xl-6{padding-right:48px!important}.pb-xl-6,.py-xl-6{padding-bottom:48px!important}.pl-xl-6,.px-xl-6{padding-left:48px!important}.p-xl-7{padding:56px!important}.pt-xl-7,.py-xl-7{padding-top:56px!important}.pr-xl-7,.px-xl-7{padding-right:56px!important}.pb-xl-7,.py-xl-7{padding-bottom:56px!important}.pl-xl-7,.px-xl-7{padding-left:56px!important}.p-xl-8{padding:64px!important}.pt-xl-8,.py-xl-8{padding-top:64px!important}.pr-xl-8,.px-xl-8{padding-right:64px!important}.pb-xl-8,.py-xl-8{padding-bottom:64px!important}.pl-xl-8,.px-xl-8{padding-left:64px!important}.p-xl-9{padding:72px!important}.pt-xl-9,.py-xl-9{padding-top:72px!important}.pr-xl-9,.px-xl-9{padding-right:72px!important}.pb-xl-9,.py-xl-9{padding-bottom:72px!important}.pl-xl-9,.px-xl-9{padding-left:72px!important}.p-xl-10{padding:80px!important}.pt-xl-10,.py-xl-10{padding-top:80px!important}.pr-xl-10,.px-xl-10{padding-right:80px!important}.pb-xl-10,.py-xl-10{padding-bottom:80px!important}.pl-xl-10,.px-xl-10{padding-left:80px!important}.p-xl-12{padding:96px!important}.pt-xl-12,.py-xl-12{padding-top:96px!important}.pr-xl-12,.px-xl-12{padding-right:96px!important}.pb-xl-12,.py-xl-12{padding-bottom:96px!important}.pl-xl-12,.px-xl-12{padding-left:96px!important}.p-xl-15{padding:120px!important}.pt-xl-15,.py-xl-15{padding-top:120px!important}.pr-xl-15,.px-xl-15{padding-right:120px!important}.pb-xl-15,.py-xl-15{padding-bottom:120px!important}.pl-xl-15,.px-xl-15{padding-left:120px!important}.m-xl-n1{margin:-8px!important}.mt-xl-n1,.my-xl-n1{margin-top:-8px!important}.mr-xl-n1,.mx-xl-n1{margin-right:-8px!important}.mb-xl-n1,.my-xl-n1{margin-bottom:-8px!important}.ml-xl-n1,.mx-xl-n1{margin-left:-8px!important}.m-xl-n2{margin:-16px!important}.mt-xl-n2,.my-xl-n2{margin-top:-16px!important}.mr-xl-n2,.mx-xl-n2{margin-right:-16px!important}.mb-xl-n2,.my-xl-n2{margin-bottom:-16px!important}.ml-xl-n2,.mx-xl-n2{margin-left:-16px!important}.m-xl-n3{margin:-24px!important}.mt-xl-n3,.my-xl-n3{margin-top:-24px!important}.mr-xl-n3,.mx-xl-n3{margin-right:-24px!important}.mb-xl-n3,.my-xl-n3{margin-bottom:-24px!important}.ml-xl-n3,.mx-xl-n3{margin-left:-24px!important}.m-xl-n4{margin:-32px!important}.mt-xl-n4,.my-xl-n4{margin-top:-32px!important}.mr-xl-n4,.mx-xl-n4{margin-right:-32px!important}.mb-xl-n4,.my-xl-n4{margin-bottom:-32px!important}.ml-xl-n4,.mx-xl-n4{margin-left:-32px!important}.m-xl-n5{margin:-40px!important}.mt-xl-n5,.my-xl-n5{margin-top:-40px!important}.mr-xl-n5,.mx-xl-n5{margin-right:-40px!important}.mb-xl-n5,.my-xl-n5{margin-bottom:-40px!important}.ml-xl-n5,.mx-xl-n5{margin-left:-40px!important}.m-xl-n6{margin:-48px!important}.mt-xl-n6,.my-xl-n6{margin-top:-48px!important}.mr-xl-n6,.mx-xl-n6{margin-right:-48px!important}.mb-xl-n6,.my-xl-n6{margin-bottom:-48px!important}.ml-xl-n6,.mx-xl-n6{margin-left:-48px!important}.m-xl-n7{margin:-56px!important}.mt-xl-n7,.my-xl-n7{margin-top:-56px!important}.mr-xl-n7,.mx-xl-n7{margin-right:-56px!important}.mb-xl-n7,.my-xl-n7{margin-bottom:-56px!important}.ml-xl-n7,.mx-xl-n7{margin-left:-56px!important}.m-xl-n8{margin:-64px!important}.mt-xl-n8,.my-xl-n8{margin-top:-64px!important}.mr-xl-n8,.mx-xl-n8{margin-right:-64px!important}.mb-xl-n8,.my-xl-n8{margin-bottom:-64px!important}.ml-xl-n8,.mx-xl-n8{margin-left:-64px!important}.m-xl-n9{margin:-72px!important}.mt-xl-n9,.my-xl-n9{margin-top:-72px!important}.mr-xl-n9,.mx-xl-n9{margin-right:-72px!important}.mb-xl-n9,.my-xl-n9{margin-bottom:-72px!important}.ml-xl-n9,.mx-xl-n9{margin-left:-72px!important}.m-xl-n10{margin:-80px!important}.mt-xl-n10,.my-xl-n10{margin-top:-80px!important}.mr-xl-n10,.mx-xl-n10{margin-right:-80px!important}.mb-xl-n10,.my-xl-n10{margin-bottom:-80px!important}.ml-xl-n10,.mx-xl-n10{margin-left:-80px!important}.m-xl-n12{margin:-96px!important}.mt-xl-n12,.my-xl-n12{margin-top:-96px!important}.mr-xl-n12,.mx-xl-n12{margin-right:-96px!important}.mb-xl-n12,.my-xl-n12{margin-bottom:-96px!important}.ml-xl-n12,.mx-xl-n12{margin-left:-96px!important}.m-xl-n15{margin:-120px!important}.mt-xl-n15,.my-xl-n15{margin-top:-120px!important}.mr-xl-n15,.mx-xl-n15{margin-right:-120px!important}.mb-xl-n15,.my-xl-n15{margin-bottom:-120px!important}.ml-xl-n15,.mx-xl-n15{margin-left:-120px!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-monospace{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace!important}.text-justify{text-align:justify!important}.text-wrap{white-space:normal!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media(min-width:400px){.text-xs-left{text-align:left!important}.text-xs-right{text-align:right!important}.text-xs-center{text-align:center!important}}@media(min-width:616px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media(min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media(min-width:980px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media(min-width:1240px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-lighter{font-weight:lighter!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-weight-bolder{font-weight:bolder!important}.font-italic{font-style:italic!important}.text-primary{color:#fc0!important}a.text-primary:focus,a.text-primary:hover{color:#b38f00!important}.text-secondary{color:#212529!important}a.text-secondary:focus,a.text-secondary:hover{color:#000!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#19692c!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#0f6674!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#ba8b00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#a71d2a!important}.text-light{color:#f1f6f9!important}a.text-light:focus,a.text-light:hover{color:#bbd4e2!important}.text-dark{color:#495057!important}a.text-dark:focus,a.text-dark:hover{color:#262a2d!important}.text-primary-light{color:#fffaf0!important}a.text-primary-light:focus,a.text-primary-light:hover{color:#ffe1a4!important}.text-secondary-light{color:#fff!important}a.text-secondary-light:focus,a.text-secondary-light:hover{color:#d9d9d9!important}.text-tertiary{color:#257af4!important}a.text-tertiary:focus,a.text-tertiary:hover{color:#0a56c3!important}.text-tertiary-light{color:#e3f1fe!important}a.text-tertiary-light:focus,a.text-tertiary-light:hover{color:#99ccfb!important}.text-white{color:#fff!important}a.text-white:focus,a.text-white:hover{color:#d9d9d9!important}.text-black{color:#212529!important}a.text-black:focus,a.text-black:hover{color:#000!important}.text-blue{color:#257af4!important}a.text-blue:focus,a.text-blue:hover{color:#0a56c3!important}.text-light-blue{color:#e3f1fe!important}a.text-light-blue:focus,a.text-light-blue:hover{color:#99ccfb!important}.text-yellow{color:#fc0!important}a.text-yellow:focus,a.text-yellow:hover{color:#b38f00!important}.text-light-yellow{color:#fffaf0!important}a.text-light-yellow:focus,a.text-light-yellow:hover{color:#ffe1a4!important}.text-orange{color:#ff8c00!important}a.text-orange:focus,a.text-orange:hover{color:#b36200!important}.text-light-orange{color:#ffe4b5!important}a.text-light-orange:focus,a.text-light-orange:hover{color:#ffc869!important}.text-red{color:#ff3939!important}a.text-red:focus,a.text-red:hover{color:#ec0000!important}.text-light-red{color:#ffe4e1!important}a.text-light-red:focus,a.text-light-red:hover{color:#ff9f95!important}.text-medium{color:#d6dbdf!important}a.text-medium:focus,a.text-medium:hover{color:#abb5bd!important}.text-body{color:#212529!important}.text-muted{color:#6c757d!important}.text-black-50{color:rgba(33,37,41,.5)!important}.text-white-50{color:hsla(0,0%,100%,.5)!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none!important}.text-break{word-break:break-word!important;overflow-wrap:break-word!important}.text-reset{color:inherit!important}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,:after,:before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]:after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #d6dbdf;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}.container,body{min-width:980px!important}.navbar{display:none}.badge{border:1px solid #212529}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}.table-dark{color:inherit}.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#d6dbdf}.table .thead-dark th{color:inherit;border-color:#d6dbdf}}
\ No newline at end of file
diff --git a/website/css/docs.css b/website/css/docs.css
index 6be02c6343f..735559f384c 100644
--- a/website/css/docs.css
+++ b/website/css/docs.css
@@ -25,6 +25,10 @@ summary {
     color: #666 !important;
 }
 
+#search-icon {
+    width: 40px;
+}
+
 .toc-right {
     right: 0;
 }
diff --git a/website/css/greenhouse.css b/website/css/greenhouse.css
new file mode 100644
index 00000000000..76812a169e8
--- /dev/null
+++ b/website/css/greenhouse.css
@@ -0,0 +1 @@
+#main{padding-bottom:0;padding-top:0}#wrapper{max-width:1078px;padding:0}body>#wrapper>#main>#wrapper>#content,body>#wrapper>#main>#wrapper>#logo,body>#wrapper>#main>#wrapper>h1{display:none}body>#wrapper>#main>#wrapper>#board_title{margin-top:0}body>#wrapper>#main>#logo{margin-top:80px}body>#wrapper>#main>:last-child{margin-bottom:120px}
\ No newline at end of file
diff --git a/website/css/main.css b/website/css/main.css
new file mode 100644
index 00000000000..70a73dda521
--- /dev/null
+++ b/website/css/main.css
@@ -0,0 +1 @@
+@media screen and (max-width:978.98px){.btn{padding:8px 16px}}@media screen and (max-width:978.98px){.btn-lg{padding:12px 24px}}.btn-primary,.btn-primary:active,.btn-primary:hover{color:#212529}.btn-outline-primary{background:#fffaf0;border-color:#fc0;color:#212529}.btn-outline-primary:active,.btn-outline-primary:hover{background:#fc0;border-color:#fc0;color:#212529}.btn-secondary{border-color:#212529;color:#fff}.btn-outline-secondary,.btn-secondary:active,.btn-secondary:hover{background:#fff;border-color:#212529;color:#212529}.btn-outline-secondary:active,.btn-outline-secondary:hover{background:#212529;border-color:#212529;color:#fff}.btn-tertiary{border-color:#257af4;color:#fff}.btn-tertiary:active,.btn-tertiary:hover{background:#257af4;border-color:#257af4;color:#fff}.btn-outline-tertiary{background:#e3f1fe;color:#257af4}.btn-outline-tertiary:active,.btn-outline-tertiary:hover{background:#257af4;color:#fff}.btns{align-items:center;display:flex;justify-content:center}.btns .btn+.btn{margin-left:24px}.btns .btn-lg+.btn-lg{margin-left:40px}.card{box-shadow:0 8px 20px rgba(108,117,125,.2);overflow:hidden;transition:box-shadow .2s,transform .2s;width:100%}.card,.card-body{position:relative}.card-body{z-index:10}.card.is-large .card-body{padding:40px}.card.bg-primary-light{border-color:#fc0}.card.has-dark-border{border-color:#6c757d}.card.has-pattern:after,.card.has-pattern:before{background-repeat:no-repeat;background-size:auto 100%;bottom:0;content:"";display:block;position:absolute;top:0;width:72px}.card.has-pattern:before{background-image:url(../images/backgrounds/bg-card-pattern-blue-1.png);background-position:0 0;left:0}.card.has-pattern:after{background-image:url(../images/backgrounds/bg-card-pattern-blue-2.png);background-position:100% 0;right:0}.card.has-hover:active,.card.has-hover:hover,a.card:active,a.card:hover{box-shadow:0 12px 32px rgba(108,117,125,.2);transform:translateY(-8px)}.card.has-highlight:after,.card.has-hover:after,a.card:after{content:"";display:block;height:8px;margin-top:auto;transition:background .2s;width:100%}.card.has-highlight:after,.card.has-hover:active:after,.card.has-hover:hover:after,a.card:active:after,a.card:hover:after{background:#e3f1fe}.case-study-cards{-moz-column-gap:40px;column-gap:40px;display:grid;grid-template-columns:1fr;row-gap:40px;padding-bottom:40px;position:relative}.case-study-cards>div{align-items:stretch;display:flex}.case-study-cards:before{background:#d6dbdf;bottom:0;content:"";display:block;left:20px;position:absolute;top:40px;width:100vw}@media screen and (min-width:980px){.case-study-cards{grid-template-columns:repeat(2,minmax(0,1fr));row-gap:80px;padding-bottom:120px}.case-study-cards:before{left:-40px;top:120px}}.case-study-card{align-items:stretch;flex-direction:row;flex-shrink:0;left:0;transition:box-shadow .2s,left .4s,width .4s,z-index 0s;transition-delay:0s,.6s,.6s,0s;width:100%;z-index:2}@media screen and (max-width:979.98px){.case-study-card .row{min-height:0!important}}@media screen and (min-width:980px){.case-study-card:active,.case-study-card:hover{box-shadow:0 12px 32px rgba(108,117,125,.2)}.case-study-card:not(.is-open){cursor:pointer}.case-study-card.is-open{transform:none!important;transition-delay:0s,0s,0s,0s;width:calc(200% + 40px);z-index:10}.case-study-card.is-closing{z-index:10}.case-study-card.open-left.is-open{left:calc(-100% - 40px)}.case-study-card:before{background:no-repeat url(../images/backgrounds/bg-card-pattern-red.png);background-position:100%;background-size:contain;content:"";display:block;height:calc(100% - 80px);max-height:224px;max-width:234px;position:absolute;right:0;top:40px;transform:translateX(30%);transition:transform .4s;transition-delay:.6s;width:100%;z-index:1}}@media screen and (min-width:980px)and (min-width:1240px){.case-study-card:before{transform:translateX(10%)}}@media screen and (min-width:980px){.case-study-card.is-open:before{transform:translateX(60%);transition-delay:0s}}@media screen and (min-width:980px){.case-study-card-wrap{align-items:stretch;display:flex;flex-shrink:0;min-height:304px;position:relative;transition:width .4s;transition-delay:.6s;width:calc(200% + 42px);z-index:2}}@media screen and (min-width:980px){.case-study-card.is-open .case-study-card-wrap{transition-delay:0s;width:100%}}@media screen and (min-width:980px){.case-study-card-body{display:flex;flex-direction:column;padding-right:80px!important}.case-study-card-body>.row{align-self:stretch}}@media screen and (min-width:980px){.case-study-card-toggle{background:#fff;box-shadow:0 8px 20px rgba(108,117,125,.2);border-radius:100%;cursor:pointer;height:56px;position:relative;width:56px}.case-study-card-toggle:after,.case-study-card-toggle:before{background:#257af4;content:"";display:block;height:4px;left:calc(50% - 15px);position:absolute;top:calc(50% - 2px);transition:opacity .2s,transform .2s;width:30px}.case-study-card-toggle:after{transform:rotate(90deg)}}@media screen and (min-width:980px){.case-study-card.is-open .case-study-card-toggle:before{opacity:0;transform:rotate(-90deg)}}@media screen and (min-width:980px){.case-study-card.is-open .case-study-card-toggle:after{transform:rotate(0)}}@media screen and (min-width:980px){.case-study-card .col-lg-3,.case-study-card .col-lg-auto{opacity:0;transform:translateX(24px);transition:opacity .4s,transform .4s}}@media screen and (min-width:980px){.case-study-card .col-lg-3{transition-delay:0s}}@media screen and (min-width:980px){.case-study-card .col-lg-auto{transition-delay:.2s}}@media screen and (min-width:980px)and (min-width:980px){.case-study-card .col-lg-auto{max-width:605px;width:calc(100% - 319px)}}@media screen and (min-width:980px){.case-study-card.is-open .col-lg-3,.case-study-card.is-open .col-lg-auto{opacity:1;transform:none}}@media screen and (min-width:980px){.case-study-card.is-open .col-lg-3{transition-delay:.4s}}@media screen and (min-width:980px){.case-study-card.is-open .col-lg-auto{transition-delay:.2s}}.footer-copy{white-space:nowrap}form .form-control{border:1px solid #6c757d;border-radius:6px;height:auto;line-height:20px;min-height:44px;padding:12px 16px;width:100%}form .form-control,form .form-control:focus{box-shadow:0 8px 20px rgba(108,117,125,.2);color:#212529}form .form-control:focus{border-color:#212529}form .form-control::-moz-placeholder{color:#6c757d}form .form-control:-ms-input-placeholder{color:#6c757d}form .form-control::placeholder{color:#6c757d}form select.form-control{-webkit-appearance:none;-moz-appearance:none;appearance:none}form select.form-control:not([data-chosen]){color:#6c757d}form .btn-secondary:active,form .btn-secondary:hover{color:#212529;background:#fc0;border-color:#fc0}.hero{overflow:visible;position:relative}.hero,.hero-bg{background-repeat:no-repeat;background-position:50%;background-size:cover}.hero-bg{display:block;height:100%;left:50%;position:absolute;top:0;transform:translateX(-50%);z-index:1}.hero>.container{position:relative;z-index:2}.hero.has-offset{margin-bottom:-160px;padding-bottom:160px}.base-hero{height:22.5vw;max-height:324px;min-height:280px}.index-hero{background-image:url(/images/backgrounds/bg-hero-home.svg);height:68vw;max-height:980px}.index-hero,.other-hero{max-width:2448px;width:170vw}.other-hero{background-image:url(/images/backgrounds/bg-hero.svg)}.bg-footer-cta{background-image:url(/images/backgrounds/bg-footer-cta.svg);width:2448px}.quickstart-bg{background-image:url(/images/backgrounds/bg-quick-start.svg);height:40vw;top:220px;width:170vw}hr{background:#f1f6f9;border:0;display:block;height:4px;margin:0;width:100%}hr.is-small{height:2px}hr.is-large{height:8px}hr.is-medium{background:#d6dbdf}hr.is-dark{background:#495057}hr.is-yellow{background:linear-gradient(90deg,#ff8c00,#ff8c00 8px,#fc0 16px,rgba(255,204,0,0));-webkit-clip-path:polygon(8px 100%,0 100%,0 0,8px 0,8px 100%,16px 100%,16px 0,100% 0,100% 100%);clip-path:polygon(8px 100%,0 100%,0 0,8px 0,8px 100%,16px 100%,16px 0,100% 0,100% 100%);height:8px}.icon{display:block;height:48px;margin-bottom:24px;-o-object-fit:contain;object-fit:contain;-o-object-position:center;object-position:center}@media screen and (min-width:576px){.icon{height:64px}}@media screen and (min-width:980px){.icon{height:80px}}img{max-width:100%}.kicker{color:#6c757d;font-family:Hind Siliguri,sans-serif;font-size:.875rem;font-weight:600;letter-spacing:1px;margin:0}@media screen and (max-width:978.98px){.lead{font-size:1.125rem}}.logo{display:block;height:36px;max-width:220px;-o-object-fit:contain;object-fit:contain;-o-object-position:center;object-position:center;width:100%}.navbar-clickhouse{border-bottom:4px solid #f1f6f9;height:142px}.navbar-clickhouse>.container{flex-wrap:wrap}.navbar-super{flex-shrink:0;width:100%}.navbar-super ul{list-style:none}.navbar-super li:not(:last-child){margin-bottom:0;margin-right:24px}.navbar-super a{align-items:center;color:#212529;display:flex;font-size:.875rem}.navbar-super a:active,.navbar-super a:hover{color:#257af4;text-decoration:none}.navbar-super img{flex-shrink:0;margin-right:4px}.navbar-brand-clickhouse{background:no-repeat url(../images/logo-clickhouse.svg);background-size:contain;flex-shrink:0;height:28px;margin-right:48px;padding:0;width:180px}.navbar-nav{align-items:center;height:46px}.navbar .nav-item:not(:last-child){margin-bottom:0;margin-right:24px}.navbar .nav-link{color:#212529}.navbar .nav-link:active,.navbar .nav-link:hover{color:#257af4}.navbar .navbar-nav{flex-direction:row}@media screen and (max-width:978.98px){.navbar>.container{padding-left:20px;padding-right:20px}.navbar .navbar-toggler{height:24px;padding:0;width:24px}.navbar .navbar-toggler:focus{outline:none}.navbar .navbar-toggler-icon{background:no-repeat url(../images/icons/icon-menu.svg);background-position:50%;background-size:contain;height:24px;width:24px}.navbar .navbar-collapse{background:#fff;border-bottom:4px solid #f1f6f9;height:56px;left:0;padding:0 20px 16px;position:absolute;right:0;top:100%}.navbar .nav-link{font-size:.875rem;white-space:nowrap}}@media screen and (max-width:615.98px){.navbar .navbar-collapse{height:auto}.navbar .navbar-nav{flex-direction:column;height:auto}.navbar .nav-item:not(:last-child){margin-bottom:16px;margin-right:0}}@media screen and (max-width:399.98px){.navbar{height:80px}}.page,.photo-frame{overflow:hidden;width:100%}.photo-frame{background:hsla(0,0%,100%,.6);border-radius:100%;box-shadow:0 8px 20px rgba(108,117,125,.2);display:block;margin-bottom:24px;max-width:160px;position:relative}.photo-frame:before{content:"";display:block;padding-bottom:100%;width:100%}.photo-frame img{display:block;height:100%;left:0;-o-object-fit:contain;object-fit:contain;-o-object-position:center;object-position:center;position:absolute;top:0;width:100%}.pullquote{position:relative;width:70%}.pullquote:before{background:no-repeat url(../images/backgrounds/bg-quotes.svg);background-position:50%;background-size:100%;content:"";mix-blend-mode:multiply;right:56px;width:calc(100% - 16px);z-index:2}.pullquote-bg,.pullquote:before{bottom:0;display:block;position:absolute;top:0}.pullquote-bg{right:0;width:calc(50vw + 28.57143%);z-index:1}.pullquote-body{padding:64px 40px 64px 0;position:relative;z-index:3}.pullquote-quote{font-family:Hind Siliguri,sans-serif;font-size:32px;font-weight:700}.pullquote-citation{font-size:1.125rem}.section{overflow:visible;position:relative}.section,.section-bg{background-repeat:no-repeat;background-position:50%;background-size:cover}.section-bg{display:block;height:100%;left:50%;position:absolute;top:0;transform:translateX(-50%);z-index:1}.section>.container{position:relative;z-index:2}.social-icons{align-items:center;display:flex}.social-icons>a{aspect-ratio:24/24;background:#6c757d;display:block;height:24px;width:24px;-webkit-mask-position:center;mask-position:center;-webkit-mask-repeat:no-repeat;mask-repeat:no-repeat;-webkit-mask-size:contain;mask-size:contain;transition:background .2s}.social-icons>a:active,.social-icons>a:hover{background:#212529}.social-icons>a+a{margin-left:32px}.social-icons-facebook{-webkit-mask-image:url(/images/icons/icon-facebook-gray.svg);mask-image:url(/images/icons/icon-facebook-gray.svg)}.social-icons-twitter{-webkit-mask-image:url(/images/icons/icon-twitter-gray.svg);mask-image:url(/images/icons/icon-twitter-gray.svg);width:31px}.social-icons-linkedin{-webkit-mask-image:url(/images/icons/icon-linkedin-gray.svg);mask-image:url(/images/icons/icon-linkedin-gray.svg)}.social-icons-linkedin-alt{-webkit-mask-image:url(/images/icons/icon-linkedin-alt-gray.svg);mask-image:url(/images/icons/icon-linkedin-alt-gray.svg)}.social-icons.size-small>a{height:20px;width:20px}.social-icons.size-small>a:active,.social-icons.size-small>a:hover{background:#212529}.social-icons.size-small>a+a{margin-left:16px}.tabs{position:relative}.tabs:before{background:#fff;border-radius:7px 7px 0 0;content:"";display:block;height:8px;left:1px;position:absolute;right:1px;top:68px;z-index:10}@media screen and (min-width:1240px){.tabs:before{top:76px}}.tabs-body{background:#fff;border-radius:8px;border:1px solid #6c757d;box-shadow:0 8px 20px rgba(108,117,125,.2);padding:24px}@media screen and (min-width:980px){.tabs-body{padding:32px}}@media screen and (min-width:1240px){.tabs-body{padding:40px}}.tabs .nav-tabs{border-bottom:0;flex-wrap:nowrap;height:76px;margin:-20px -20px -9px;-webkit-mask-image:linear-gradient(90deg,transparent,#000 20px,#000 calc(100% - 20px),transparent);mask-image:linear-gradient(90deg,transparent,#000 20px,#000 calc(100% - 20px),transparent);overflow:scroll;overflow-x:scroll;overflow-y:visible;padding:20px 20px 0;position:relative}@media screen and (min-width:940px){.tabs .nav-tabs{overflow:visible}}@media screen and (min-width:1240px){.tabs .nav-tabs{height:84px}}.tabs .nav-link{align-items:center;border-bottom:0;color:#6c757d;display:flex;font-size:.875rem;flex-shrink:0;height:56px;justify-content:center;padding:0 12px 8px;text-align:center;white-space:nowrap}@media screen and (min-width:1240px){.tabs .nav-link{height:64px;padding:0 16px 8px}}.tabs .nav-link.active{background:#fff;box-shadow:0 -4px 8px rgba(108,117,125,.1);font-weight:700;padding:0 16px 8px}@media screen and (min-width:980px){.tabs .nav-link.active{padding:0 24px 8px}}@media screen and (min-width:1240px){.tabs .nav-link.active{padding:0 32px 8px}}.tab-pane pre{background:#212529;border-radius:16px;color:#fff;padding:24px 16px}@media screen and (min-width:1240px){.tab-pane pre{padding:32px 24px}}.trailing-link{align-items:center;color:#212529;display:flex;font-size:.875rem;font-weight:700}.trailing-link:after{background:no-repeat url(../images/icons/icon-arrow.svg);background-position:100%;background-size:contain;content:"";display:block;height:12px;transition:transform .2s;width:20px}.trailing-link:active,.trailing-link:hover{color:#212529;text-decoration:none}.trailing-link:active:after,.trailing-link:hover:after{transform:translateX(8px)}.trailing-link.span-full:after{margin-left:auto}ul{color:#495057;list-style-type:square;padding-left:1.25em}ul li:not(:last-child){margin-bottom:16px}ul li::marker{color:#ff3939}ul.has-separators{list-style:none;padding:0}ul.has-separators li:not(:last-child){border-bottom:4px solid #f1f6f9;margin-bottom:24px;padding-bottom:24px}.bg-gradient-secondary{background-image:linear-gradient(58deg,#ff6443 3%,#fe561d 24%,#e32f0d 93%)}.bg-gradient-light-orange{background-image:linear-gradient(90deg,rgba(255,203,128,0),#ffcb80)}.bg-offset-right{bottom:0;left:-24px;position:absolute;top:0;width:calc(100vw + 24px);z-index:-1}@media screen and (min-width:1240px){.bg-offset-right{left:-96px;width:calc(100vw + 96px)}}.bg-inset-right{bottom:0;left:40px;position:absolute;top:0;width:calc(100vw - 40px);z-index:-1}@media screen and (min-width:980px){.bg-inset-right{left:96px;width:calc(100vw - 96px)}}.has-border-left{border-left:8px solid #f1f6f9;padding-left:16px}.font-xl{font-size:1.25rem}.font-lg{font-size:1.125rem}.font-sm{font-size:.875rem}.font-xs{font-size:.625rem}.font-weight-semibold{font-weight:600}.display-5{color:#212529;font-size:20px;font-weight:500}.display-6{color:#212529;font-size:14px;font-weight:700}.text-decoration-underline{text-decoration:underline}.text-upper{text-transform:uppercase}
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-card-pattern-blue-1.png b/website/images/backgrounds/bg-card-pattern-blue-1.png
new file mode 100644
index 00000000000..b15958adcb1
Binary files /dev/null and b/website/images/backgrounds/bg-card-pattern-blue-1.png differ
diff --git a/website/images/backgrounds/bg-card-pattern-blue-2.png b/website/images/backgrounds/bg-card-pattern-blue-2.png
new file mode 100644
index 00000000000..a0bf1a9f752
Binary files /dev/null and b/website/images/backgrounds/bg-card-pattern-blue-2.png differ
diff --git a/website/images/backgrounds/bg-card-pattern-red.png b/website/images/backgrounds/bg-card-pattern-red.png
new file mode 100644
index 00000000000..a944ec45bd0
Binary files /dev/null and b/website/images/backgrounds/bg-card-pattern-red.png differ
diff --git a/website/images/backgrounds/bg-footer-cta.svg b/website/images/backgrounds/bg-footer-cta.svg
new file mode 100644
index 00000000000..d3a89339800
--- /dev/null
+++ b/website/images/backgrounds/bg-footer-cta.svg
@@ -0,0 +1 @@
+<svg width="2448" height="432" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:#fff"><defs><linearGradient x1="50%" y1="5.387%" x2="7.925%" y2="92.027%" id="c"><stop stop-color="#F9FBFD" offset="0%"/><stop stop-color="#F1F6F9" offset="100%"/></linearGradient><linearGradient x1="100%" y1="51.29%" x2="46.829%" y2="50%" id="d"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.974%" x2="0%" y2="49.026%" id="e"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="52.688%" x2="0%" y2="47.312%" id="f"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.075%" x2="0%" y2="49.925%" id="g"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="53.995%" x2="0%" y2="46.005%" id="h"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="174.731%" y1="44.617%" x2="39.814%" y2="50%" id="i"><stop stop-color="#FC0" stop-opacity=".5" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="41.708%" x2="50%" y2="50%" id="j"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="0%" y1="45.225%" x2="100%" y2="45.225%" id="l"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="58.268%" gradientTransform="matrix(0 1 -.83643 0 .918 0)" id="k"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" offset="67.349%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></radialGradient><path id="a" d="M0 0h2440v432H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v432H0z"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g transform="translate(-102.53 -434)"><path fill="#F1F6F9" d="m910.393 42.766 280.178 401.785h51.753V42.766z"/><path fill="url(#c)" d="M1454.914 42.766 1304.35 444.55h60.387l364.967-401.785z"/><path fill="#F1F6F9" d="M404.005 116.997V42.766h215.782L1163.73 444.55h-99.023zM1971.115 42.766 1432.546 444.55h-68.271L1860.29 42.766zM2080.643 67.526 1450.85 444.55h99.557l530.236-249.26zM404.005 1170.053v-29.1l641.914-407.38v6.246zM40.143 777.895-.001 643l1045.92-80.68v36.91zM404.005 1240.003v-35.749l641.914-449.535v7.447z"/><path fill="#E3F1FE" d="M404.005 1121.728v-34.717l641.914-353.437v21.145z"/><path fill="#F1F6F9" d="M404.005 1092.392v-34.716l641.914-344.008v21.145z"/><path stroke="#212529" stroke-width="4.193" stroke-linecap="round" d="m571.921 519.073-209.388-15.732"/><path stroke="url(#d)" stroke-width="4" stroke-linecap="round" d="m326.533 424.551 363.631 58.419"/><path fill="#F1F6F9" d="M500.727 1300h-96.722v-33.122l641.914-483.792v4.88z"/><path fill="#E3F1FE" d="M510.27 1243.866H559.9l486.02-449.729v-7.28z"/><path fill="#F1F6F9" d="m537.253 1300 508.666-498.297v20.886L606.515 1300zM1108.891 1300h-38.07l118.984-457.171h9.533zM690.648 1300h259.057l203.112-457.171h-100.61z"/><path fill="#E3F1FE" d="m1023.785 1300 149.672-457.171h20.54L1070.82 1300z"/><path fill="#F1F6F9" d="m1205.88 1300 28.8-457.171h14.117L1259.772 1300zM1323.541 1300 1265.1 842.829h87.477L1559.838 1300z"/><path fill="#E3F1FE" d="m1631.19 1300-253.687-457.171h14.457L1691.684 1300z"/><path fill="#F1F6F9" d="m1737.126 1300-315.57-457.171h16.719L1779.916 1300zM1828.814 1300l-370.629-457.171h56.593L2025.242 1300z"/><path fill="#E3F1FE" d="M1746.45 1148.382h60.518l-316.816-305.553h-18.72z"/><path fill="#F1F6F9" d="m2080.643 1295.81-530.87-452.981h21.622l509.248 318.638z"/><path fill="#E3F1FE" d="M2005.468 1190.69h68.007l-513.637-347.861h-14.631z"/><path fill="#F1F6F9" d="M1610.137 693.209v149.62l470.506 274.392 209.297-205.83z"/><path fill="#E3F1FE" d="M2080.643 1117.221v-45.807l-448-228.585h-22.506z"/><path fill="#F1F6F9" d="m2578.576 708.117 9.977-176.054-978.416 70.972v56.775z"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1610.137 498.34 503.443-178.173"/><path stroke="url(#e)" stroke-width="4" stroke-linecap="round" d="m1828.809 709.768 266.153 37.145"/><path stroke="url(#f)" stroke-width="4" stroke-linecap="round" d="m1830.992 528.692 261.787-60.703"/><path stroke="url(#g)" stroke-width="4" stroke-linecap="round" d="m871.533 562.321-435.448-16.852"/><path d="M863.48 722.628 444.138 841.162" stroke="url(#h)" stroke-width="4" stroke-linecap="round"/><path d="M1174.48 276.628 755.138 395.162" stroke="url(#i)" stroke-width="4" stroke-linecap="round" transform="rotate(47 964.809 335.895)"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1741.714 774.678 401.515 177.135"/><path stroke="#F1F6F9" stroke-width="4" stroke-linecap="round" d="m391.431 763.066 313.998-66.714"/><path stroke="url(#j)" stroke-width="4" stroke-linecap="round" d="m738.059 813.797-346.628 141.16"/><ellipse fill="url(#k)" cx="1326.533" cy="688.5" rx="860" ry="563.5"/></g></g><path fill="url(#l)" mask="url(#b)" transform="matrix(-1 0 0 1 4690 0)" d="M2242 0h206v799h-206z"/><path fill="url(#l)" mask="url(#b)" d="M0-184h206v799H0z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-hero-home.svg b/website/images/backgrounds/bg-hero-home.svg
new file mode 100644
index 00000000000..5df2ea819d6
--- /dev/null
+++ b/website/images/backgrounds/bg-hero-home.svg
@@ -0,0 +1 @@
+<svg width="2448" height="980" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:#fff"><defs><linearGradient x1="50%" y1="5.387%" x2="7.925%" y2="92.027%" id="c"><stop stop-color="#F9FBFD" offset="0%"/><stop stop-color="#F1F6F9" offset="100%"/></linearGradient><linearGradient x1="100%" y1="58.669%" x2="50%" y2="50%" id="d"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="51.29%" x2="46.829%" y2="50%" id="e"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.974%" x2="0%" y2="49.026%" id="f"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="52.688%" x2="0%" y2="47.312%" id="g"><stop stop-color="#FFE800" offset="0%"/><stop stop-color="#FC0" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="100%" y1="50.075%" x2="0%" y2="49.925%" id="h"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="53.995%" x2="0%" y2="46.005%" id="i"><stop stop-color="#FC0" stop-opacity="0" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="174.731%" y1="44.617%" x2="39.814%" y2="50%" id="j"><stop stop-color="#FC0" stop-opacity=".5" offset="0%"/><stop stop-color="#FFE800" offset="100%"/></linearGradient><linearGradient x1="100%" y1="41.708%" x2="50%" y2="50%" id="k"><stop stop-color="#454C53" stop-opacity="0" offset="0%"/><stop stop-color="#212529" offset="100%"/></linearGradient><linearGradient x1="50%" y1="0%" x2="50%" y2="71.743%" id="l"><stop stop-color="#F8F9FA" stop-opacity="0" offset="0%"/><stop stop-color="#FFF" offset="100%"/></linearGradient><linearGradient x1="0%" y1="45.225%" x2="100%" y2="45.225%" id="n"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></linearGradient><radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="58.268%" gradientTransform="matrix(0 1 -.86232 0 .931 0)" id="m"><stop stop-color="#FFF" offset="0%"/><stop stop-color="#FFF" offset="67.349%"/><stop stop-color="#FFF" stop-opacity="0" offset="100%"/></radialGradient><path id="a" d="M0 0h2448v980H0z"/></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v980H0z"/><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><g transform="translate(-32.69 -169)"><path fill="#F1F6F9" d="M840.551 42.766 1120.73 444.55h51.753V42.766z"/><path fill="url(#c)" d="M1385.072 42.766 1234.508 444.55h60.387l364.967-401.785z"/><path fill="#F1F6F9" d="M334.163 116.997V42.766h215.782l543.943 401.785h-99.023zM1901.273 42.766 1362.704 444.55h-68.271l496.016-401.785zM2010.802 67.526 1381.008 444.55h99.557l643.831-302.47zM334.163 1170.053v-29.1l641.915-407.38v6.246zM0 772.227V636.48l976.078-74.16v36.91zM334.163 1240.003v-35.749l641.915-449.535v7.447z"/><path fill="#E3F1FE" d="M334.163 1121.728v-34.717l641.915-353.437v21.145z"/><path fill="#F1F6F9" d="M334.163 1092.392v-34.716l641.915-344.008v21.145z"/><path stroke="#212529" stroke-width="4.193" stroke-linecap="round" d="m502.08 519.073-209.389-15.732"/><path stroke="url(#d)" stroke-width="4" stroke-linecap="round" d="m435.791 271.35 354.531 147.62"/><path stroke="url(#e)" stroke-width="4" stroke-linecap="round" d="m256.691 424.551 363.631 58.419"/><path fill="#F1F6F9" d="M430.885 1300h-96.722v-33.122l641.915-483.792v4.88z"/><path fill="#E3F1FE" d="M440.429 1243.866h49.628l486.02-449.729v-7.28z"/><path fill="#F1F6F9" d="m467.41 1300 508.668-498.297v20.886L536.673 1300zM1039.05 1300h-38.07l118.983-457.171h9.534zM620.807 1300h259.056l203.112-457.171h-100.61z"/><path fill="#E3F1FE" d="m953.944 1300 149.67-457.171h20.541L1000.98 1300z"/><path fill="#F1F6F9" d="m1136.038 1300 28.8-457.171h14.117L1189.93 1300zM1253.7 1300l-58.443-457.171h87.477L1489.996 1300z"/><path fill="#E3F1FE" d="m1561.349 1300-253.688-457.171h14.457L1621.843 1300z"/><path fill="#F1F6F9" d="m1667.285 1300-315.572-457.171h16.72L1710.074 1300zM1758.972 1300l-370.629-457.171h56.593L1955.4 1300z"/><path fill="#E3F1FE" d="M1676.609 1148.382h60.518L1420.31 842.829h-18.72z"/><path fill="#F1F6F9" d="m2010.802 1295.81-530.87-452.981h21.62l509.25 318.638z"/><path fill="#E3F1FE" d="M1935.626 1190.69h68.007l-513.637-347.861h-14.63z"/><path fill="#F1F6F9" d="M1540.295 693.209v149.62l470.507 274.392 476.694-114.616z"/><path fill="#E3F1FE" d="M2010.802 1117.221v-45.807l-448-228.585h-22.507z"/><path fill="#F1F6F9" d="m2518.71 707.768-5.425-172.963-972.99 68.23v56.775z"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="M1516.717 339.289 2025.12 0M1540.295 498.34l503.443-178.173"/><path stroke="url(#f)" stroke-width="4" stroke-linecap="round" d="m1758.967 709.768 266.153 37.145"/><path stroke="url(#g)" stroke-width="4" stroke-linecap="round" d="m1761.15 528.692 261.787-60.703"/><path stroke="url(#h)" stroke-width="4" stroke-linecap="round" d="m801.691 562.321-435.448-16.852"/><path d="M793.639 722.628 374.295 841.162" stroke="url(#i)" stroke-width="4" stroke-linecap="round"/><path d="M1104.639 276.628 685.295 395.162" stroke="url(#j)" stroke-width="4" stroke-linecap="round" transform="rotate(47 894.967 335.895)"/><path stroke="#212529" stroke-width="4" stroke-linecap="round" d="m1671.872 774.678 401.515 177.135M863.642 243.658 632.443 21.112"/><path stroke="#FC0" stroke-width="4" stroke-linecap="round" d="m1281.983 199.578 25.678-114.798"/><path stroke="#F1F6F9" stroke-width="4" stroke-linecap="round" d="m321.589 763.066 313.998-66.714"/><path stroke="url(#k)" stroke-width="4" stroke-linecap="round" d="m668.217 813.797-346.628 141.16"/><path fill="url(#l)" d="M32.69 649h2448v500h-2448z"/><ellipse fill="url(#m)" cx="1256.202" cy="608" rx="649.877" ry="439"/></g></g><path fill="url(#n)" d="M0 0h206v980H0z"/><path fill="url(#n)" transform="matrix(-1 0 0 1 4690 0)" d="M2242 0h206v980h-206z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-hero.svg b/website/images/backgrounds/bg-hero.svg
new file mode 100644
index 00000000000..a3dd0df7beb
--- /dev/null
+++ b/website/images/backgrounds/bg-hero.svg
@@ -0,0 +1 @@
+<svg width="2448" height="336" xmlns="http://www.w3.org/2000/svg"><g fill="#FFE4B5" fill-rule="evenodd"><path d="M1248 336v-48h1200v48zM1463 253v-48h985v48zM1248 176v-48h1200v48zM1246 96V48h356v48z"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-quick-start.svg b/website/images/backgrounds/bg-quick-start.svg
new file mode 100644
index 00000000000..c68b8f94788
--- /dev/null
+++ b/website/images/backgrounds/bg-quick-start.svg
@@ -0,0 +1 @@
+<svg width="2448" height="576" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient x1="0%" y1="50%" x2="100%" y2="50%" id="a"><stop stop-color="#FF8C00" offset="0%"/><stop stop-color="#FFC000" stop-opacity="0" offset="100%"/></linearGradient><linearGradient x1="0%" y1="50%" x2="50%" y2="50%" id="b"><stop stop-color="#FF8C00" offset="0%"/><stop stop-color="#FFC000" stop-opacity="0" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><path fill="#FFF" d="M0 0h2448v576H0z"/><path fill="#FFFAF0" d="M0 56h2448v480H0z"/><path fill="url(#a)" opacity=".797" style="mix-blend-mode:multiply" d="M504 240h720v320H504z" transform="translate(0 16)"/><path fill="url(#b)" opacity=".797" style="mix-blend-mode:multiply" transform="rotate(-180 1584 88)" d="M1224 0h720v160h-720z"/><path fill="#FF8C00" opacity=".8" style="mix-blend-mode:multiply" d="M1944 0h504v160h-504zM0 240h504v320H0z" transform="translate(0 16)"/></g></svg>
\ No newline at end of file
diff --git a/website/images/backgrounds/bg-quotes.svg b/website/images/backgrounds/bg-quotes.svg
new file mode 100644
index 00000000000..651351a0812
--- /dev/null
+++ b/website/images/backgrounds/bg-quotes.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="700px" height="320px" viewBox="0 0 700 320" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Artboard</title>
+    <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Quote-Panel-BG" fill="#FF8C00">
+            <path d="M577.058824,0 L577.058824,96.5483699 L576.887,96.548 L576.880049,97.4482487 C576.317392,132.334805 548.290575,160.5098 513.587495,161.075432 L512.523092,161.084101 L512.523092,117.946846 C524.315884,117.946846 533.886494,108.382248 533.977629,96.5487133 L480,96.5483699 L480,0 L577.058824,0 Z" id="Combined-Shape"></path>
+            <path d="M700,0 L700,96.5483699 L699.828176,96.548 L699.821226,97.4482487 C699.258568,132.334805 671.231751,160.5098 636.528671,161.075432 L635.464269,161.084101 L635.464269,117.946846 C647.257061,117.946846 656.82767,108.382248 656.918806,96.5487133 L602.941176,96.5483699 L602.941176,0 L700,0 Z" id="Combined-Shape"></path>
+            <path d="M220,159 L220,255.54837 L219.828176,255.548 L219.821226,256.448249 C219.258568,291.334805 191.231751,319.5098 156.528671,320.075432 L155.464269,320.084101 L155.464269,276.946846 C167.257061,276.946846 176.82767,267.382248 176.918806,255.548713 L122.941176,255.54837 L122.941176,159 L220,159 Z" id="Combined-Shape" transform="translate(171.470588, 239.500000) scale(-1, 1) translate(-171.470588, -239.500000) "></path>
+            <path d="M97.0588235,159 L97.0588235,255.54837 L96.887,255.548 L96.8800492,256.448249 C96.3173916,291.334805 68.2905748,319.5098 33.587495,320.075432 L32.5230924,320.084101 L32.5230924,276.946846 C44.3158844,276.946846 53.8864936,267.382248 53.9776294,255.548713 L-7.10542736e-15,255.54837 L-7.10542736e-15,159 L97.0588235,159 Z" id="Combined-Shape" transform="translate(48.529412, 239.500000) scale(-1, 1) translate(-48.529412, -239.500000) "></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-arrow.svg b/website/images/icons/icon-arrow.svg
new file mode 100644
index 00000000000..3a03b2da23b
--- /dev/null
+++ b/website/images/icons/icon-arrow.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-arrow</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-557.000000, -2491.000000)" stroke="#212529" stroke-width="2">
+            <g id="Page/Use-Cases" transform="translate(0.000000, 2108.000000)">
+                <g id="Row-1" transform="translate(185.000000, 134.000000)">
+                    <g id="Link/Read" transform="translate(222.000000, 247.000000)">
+                        <g id="icon-arrow" transform="translate(150.000000, 3.000000)">
+                            <path d="M6,0 L12,6 L6,12 M12,6 L0,6" id="Path-39"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-blog-black.svg b/website/images/icons/icon-blog-black.svg
new file mode 100644
index 00000000000..2e448c5c0da
--- /dev/null
+++ b/website/images/icons/icon-blog-black.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="14px" viewBox="0 0 18 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-blog</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Link/Blog" transform="translate(0.870000, 1.375000)" stroke="#000000" stroke-width="1.25">
+            <g id="Icon/News">
+                <line x1="6.25" y1="4.40736607" x2="12.5" y2="4.40736607" id="Path"></line>
+                <line x1="6.25" y1="6.90736607" x2="12.5" y2="6.90736607" id="Path"></line>
+                <path d="M1.25,11.25 C1.94035594,11.25 2.5,10.6903559 2.5,10 L2.5,0.625 C2.5,0.279822031 2.77982203,0 3.125,0 L15.625,0 C15.970178,0 16.25,0.279822031 16.25,0.625 L16.25,10 C16.25,10.6903559 15.6903559,11.25 15,11.25 L1.25,11.25 Z" id="Path"></path>
+                <path d="M1.25,11.25 C0.559644063,11.25 0,10.6903559 0,10 L0,2.5" id="Path"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-facebook-gray.svg b/website/images/icons/icon-facebook-gray.svg
new file mode 100644
index 00000000000..fc42770a749
--- /dev/null
+++ b/website/images/icons/icon-facebook-gray.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-facebook-gray</title>
+    <defs>
+        <path d="M24,12.0730223 C24,5.40365112 18.6290323,0 12,0 C5.37096774,0 0,5.40365112 0,12.0730223 C0,18.0988235 4.38822581,23.0935497 10.125,24 L10.125,15.563002 L7.0766129,15.563002 L7.0766129,12.0730223 L10.125,12.0730223 L10.125,9.41306288 C10.125,6.38750507 11.9153226,4.71626775 14.6574194,4.71626775 C15.9706452,4.71626775 17.343871,4.95188641 17.343871,4.95188641 L17.343871,7.92146045 L15.8303226,7.92146045 C14.34,7.92146045 13.875,8.85225152 13.875,9.80689655 L13.875,12.0730223 L17.2030645,12.0730223 L16.6708065,15.563002 L13.875,15.563002 L13.875,24 C19.6117742,23.0935497 24,18.0988235 24,12.0730223 Z" id="path-1"></path>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Logo">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Brands/facebook" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"></use>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-facebook.svg b/website/images/icons/icon-facebook.svg
new file mode 100644
index 00000000000..910235c7ed8
--- /dev/null
+++ b/website/images/icons/icon-facebook.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="81px" height="81px" viewBox="0 0 81 81" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group</title>
+    <defs>
+        <polygon id="path-1" points="4.44115232e-15 0 80 0 80 79.5155966 4.44115232e-15 79.5155966"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(0.060000, 0.040000)">
+            <g id="Group-3">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="Clip-2"></g>
+                <path d="M80,39.9992187 C80,17.906518 62.0903569,-0.00312518312 39.9976561,-0.00312518312 C17.9049554,-0.00312518312 -0.00468777467,17.906518 -0.00468777467,39.9992187 C-0.00468777467,59.9655449 14.6235912,76.5146395 33.7472899,79.5155966 L33.7472899,51.5623962 L23.5904448,51.5623962 L23.5904448,39.9992187 L33.7472899,39.9992187 L33.7472899,31.1862023 C33.7472899,21.1606149 39.7193586,15.6227904 48.856769,15.6227904 C53.2333535,15.6227904 57.8111999,16.4040862 57.8111999,16.4040862 L57.8111999,26.248413 L52.7669981,26.248413 C47.7977225,26.248413 46.2480223,29.331953 46.2480223,32.4954197 L46.2480223,39.9992187 L57.3424224,39.9992187 L55.568881,51.5623962 L46.2480223,51.5623962 L46.2480223,79.5155966 C65.371721,76.5146395 80,59.9655449 80,39.9992187" id="Fill-1" fill="#1877F2" mask="url(#mask-2)"></path>
+            </g>
+            <path d="M55.568881,51.5623962 L57.3424224,39.9992187 L46.2480223,39.9992187 L46.2480223,32.4954197 C46.2480223,29.331953 47.7977225,26.248413 52.7669981,26.248413 L57.8111999,26.248413 L57.8111999,16.4040862 C57.8111999,16.4040862 53.2333535,15.6227904 48.856769,15.6227904 C39.7193586,15.6227904 33.7472899,21.1606149 33.7472899,31.1862023 L33.7472899,39.9992187 L23.5904448,39.9992187 L23.5904448,51.5623962 L33.7472899,51.5623962 L33.7472899,79.5155966 C35.7838936,79.8351466 37.8712815,80.0015626 39.9976561,80.0015626 C42.1240307,80.0015626 44.2114186,79.8351466 46.2480223,79.5155966 L46.2480223,51.5623962 L55.568881,51.5623962" id="Fill-4" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-github.svg b/website/images/icons/icon-github.svg
new file mode 100644
index 00000000000..c22c8563b21
--- /dev/null
+++ b/website/images/icons/icon-github.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="82px" height="80px" viewBox="0 0 82 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-github</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-github" fill="#212529" fill-rule="nonzero">
+            <path d="M36.3976019,0.285587315 C17.4993108,2.34863347 2.29853201,17.6152782 0.244369937,36.1826935 C-1.80979214,55.5751211 9.28268307,72.9047088 26.1267915,79.5064565 C27.3592888,79.9190657 28.591786,79.0938472 28.591786,77.4434103 L28.591786,70.8416626 C28.591786,70.8416626 26.9484564,71.2542719 24.8942943,71.2542719 C19.1426405,71.2542719 16.677646,66.3029611 16.2668136,63.4146965 C15.8559812,61.7642595 15.0343163,60.5264319 13.8018191,59.2886042 C12.5693218,58.8759949 12.1584894,58.8762012 12.1584894,58.463592 C12.1584894,57.6383735 13.3909867,57.6381672 13.8018191,57.6381672 C16.2668136,57.6381672 18.3209757,60.5264319 19.1426405,61.7642595 C21.1968026,65.0651334 23.6617971,65.8903519 24.8942943,65.8903519 C26.537624,65.8903519 27.7701212,65.4777426 28.591786,65.0651334 C29.0026185,62.1768688 30.2351157,59.2886042 32.7001102,57.6381672 C23.2509646,55.5751211 16.2668136,50.2114074 16.2668136,41.1340043 C16.2668136,36.5953028 18.3209757,32.0566012 21.1968026,28.7557274 C20.7859702,27.9305089 20.3751377,25.8674628 20.3751377,22.9791982 C20.3751377,21.3287612 20.3751377,19.2657151 21.1968026,17.6152782 C21.1968026,16.7900597 22.0184674,16.3774505 22.4292998,16.3774505 L22.8401322,16.3774505 C24.8942943,16.7900597 29.0026185,18.0278874 32.7001102,21.7413705 C35.1651047,20.916152 38.0409316,20.5035428 40.9167585,20.5035428 C43.7925854,20.5035428 46.6684123,20.916152 49.1334068,21.7413705 C52.8308985,18.0278874 57.3500551,16.7900597 59.4042172,16.3774505 L59.8150496,16.3774505 C60.6367144,16.3774505 61.0475468,16.7900597 61.4583792,17.6152782 C61.4583792,19.2657151 61.4583792,21.3287612 61.4583792,22.9791982 C61.4583792,26.280072 61.0475468,27.9305089 60.6367144,28.7557274 C63.5125413,32.0566012 65.5667034,36.1826935 65.5667034,41.1340043 C65.5667034,50.2114074 58.5825523,55.5751211 49.1334068,57.6381672 C51.5984013,59.7012134 53.2417309,63.4146965 53.2417309,67.1281795 L53.2417309,77.8560195 C53.2417309,79.0938472 54.4742282,80.3316749 56.1175578,79.9190657 C71.3183572,73.7299272 82,58.8759949 82,41.5466135 C82,16.7900597 61.0475468,-2.6026773 36.3976019,0.285587315 Z" id="Path"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-google.svg b/website/images/icons/icon-google.svg
new file mode 100644
index 00000000000..4fa5d1eb118
--- /dev/null
+++ b/website/images/icons/icon-google.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-google</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-google" fill-rule="nonzero">
+            <path d="M79.222,32.1658392 L76,32.1658392 L76,31.99984 L40,31.99984 L40,47.99976 L62.606,47.99976 C59.308,57.3137134 50.446,63.99968 40,63.99968 C26.746,63.99968 16,53.2537337 16,39.9998 C16,26.7458663 26.746,15.99992 40,15.99992 C46.118,15.99992 51.684,18.3079085 55.922,22.0778896 L67.236,10.7639462 C60.092,4.10597947 50.536,0 40,0 C17.91,0 0,17.9099105 0,39.9998 C0,62.0896896 17.91,79.9996 40,79.9996 C62.09,79.9996 80,62.0896896 80,39.9998 C80,37.3178134 79.724,34.6998265 79.222,32.1658392 Z" id="Path" fill="#FFC107"></path>
+            <path d="M4.60938,21.3818931 L17.7514,31.0198449 C21.3074,22.2158889 29.9194,15.99992 39.9974,15.99992 C46.1154,15.99992 51.6814,18.3079085 55.9194,22.0778896 L67.2334,10.7639462 C60.0894,4.10597947 50.5334,0 39.9974,0 C24.6334,0 11.30938,8.67395663 4.60938,21.3818931 Z" id="Path" fill="#FF3D00"></path>
+            <path d="M39.9996,80 C50.3316,80 59.7196,76.0460198 66.8176,69.6160519 L54.4376,59.1401043 C50.4216,62.1820891 45.4296,64.00008 39.9996,64.00008 C29.5956,64.00008 20.7616,57.3661132 17.4336,48.1081595 L4.38964,58.1581092 C11.00964,71.1120444 24.4536,80 39.9996,80 Z" id="Path" fill="#4CAF50"></path>
+            <path d="M79.222,32.1658392 L76,32.1658392 L76,31.99984 L40,31.99984 L40,47.99976 L62.606,47.99976 C61.022,52.4737376 58.144,56.3317183 54.432,59.1417043 C54.434,59.1397043 54.436,59.1397043 54.438,59.1377043 L66.818,69.6136519 C65.942,70.409648 80,59.9997 80,39.9998 C80,37.3178134 79.724,34.6998265 79.222,32.1658392 Z" id="Path" fill="#1976D2"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin-alt-gray.svg b/website/images/icons/icon-linkedin-alt-gray.svg
new file mode 100644
index 00000000000..e286486ab9b
--- /dev/null
+++ b/website/images/icons/icon-linkedin-alt-gray.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-linkedin-gray</title>
+    <defs>
+        <path d="M22.2857143,0 L1.70892857,0 C0.766071429,0 0,0.776785714 0,1.73035714 L0,22.2696429 C0,23.2232143 0.766071429,24 1.70892857,24 L22.2857143,24 C23.2285714,24 24,23.2232143 24,22.2696429 L24,1.73035714 C24,0.776785714 23.2285714,0 22.2857143,0 Z M7.25357143,20.5714286 L3.69642857,20.5714286 L3.69642857,9.11785714 L7.25892857,9.11785714 L7.25892857,20.5714286 L7.25357143,20.5714286 Z M5.475,7.55357143 C4.33392857,7.55357143 3.4125,6.62678571 3.4125,5.49107143 C3.4125,4.35535714 4.33392857,3.42857143 5.475,3.42857143 C6.61071429,3.42857143 7.5375,4.35535714 7.5375,5.49107143 C7.5375,6.63214286 6.61607143,7.55357143 5.475,7.55357143 L5.475,7.55357143 Z M20.5875,20.5714286 L17.0303571,20.5714286 L17.0303571,15 C17.0303571,13.6714286 17.0035714,11.9625 15.1821429,11.9625 C13.3285714,11.9625 13.0446429,13.4089286 13.0446429,14.9035714 L13.0446429,20.5714286 L9.4875,20.5714286 L9.4875,9.11785714 L12.9,9.11785714 L12.9,10.6821429 L12.9482143,10.6821429 C13.425,9.78214286 14.5875,8.83392857 16.3178571,8.83392857 C19.9178571,8.83392857 20.5875,11.2071429 20.5875,14.2928571 L20.5875,20.5714286 L20.5875,20.5714286 Z" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="icon-linkedin-gray" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin-gray.svg b/website/images/icons/icon-linkedin-gray.svg
new file mode 100644
index 00000000000..ff19bbbe686
--- /dev/null
+++ b/website/images/icons/icon-linkedin-gray.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-linkedin-gray</title>
+    <defs>
+        <path d="M5.37214286,24 L0.396428571,24 L0.396428571,7.97642802 L5.37214286,7.97642802 L5.37214286,24 Z M2.88160714,5.79066494 C1.29053571,5.79066494 0,4.47277838 0,2.88167143 C0,1.29016824 1.29013948,0 2.88160714,0 C4.47307481,0 5.76321429,1.29016824 5.76321429,2.88167143 C5.76321429,4.47277838 4.47214286,5.79066494 2.88160714,5.79066494 Z M23.9946429,24 L19.0296429,24 L19.0296429,16.1998259 C19.0296429,14.3408558 18.9921429,11.956874 16.4426786,11.956874 C13.8557143,11.956874 13.4592857,13.976562 13.4592857,16.0658943 L13.4592857,24 L8.48892857,24 L8.48892857,7.97642802 L13.2610714,7.97642802 L13.2610714,10.1621911 L13.3307143,10.1621911 C13.995,8.90323442 15.6176786,7.57463333 18.0385714,7.57463333 C23.0742857,7.57463333 24,10.8907788 24,15.1980178 L24,24 L23.9946429,24 Z" id="path-1"></path>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Logo">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Brands/linkedin-in" fill="#6C757D" fill-rule="nonzero" xlink:href="#path-1"></use>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-linkedin.png b/website/images/icons/icon-linkedin.png
new file mode 100644
index 00000000000..e50cf591487
Binary files /dev/null and b/website/images/icons/icon-linkedin.png differ
diff --git a/website/images/icons/icon-menu.svg b/website/images/icons/icon-menu.svg
new file mode 100644
index 00000000000..49aa5b52d37
--- /dev/null
+++ b/website/images/icons/icon-menu.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="21px" viewBox="0 0 24 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" fill="#495057">
+            <rect id="Rectangle" x="0" y="0" width="24" height="3"></rect>
+            <rect id="Rectangle" x="0" y="9" width="24" height="3"></rect>
+            <rect id="Rectangle" x="0" y="18" width="24" height="3"></rect>
+        </g>
+    </g>
+</svg>
diff --git a/website/images/icons/icon-performance.svg b/website/images/icons/icon-performance.svg
new file mode 100644
index 00000000000..758149fc872
--- /dev/null
+++ b/website/images/icons/icon-performance.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-performance</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-185.000000, -1263.000000)" fill-rule="nonzero">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-1" transform="translate(0.000000, 216.000000)">
+                    <g id="icon-performance" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" cx="40" cy="40" r="40"></circle>
+                        <path d="M35.2021333,19.2 C34.8261333,19.2 34.4621333,19.3328 34.1741333,19.5745333 C33.8861333,19.8161333 33.6924,20.1516 33.6270667,20.5218667 L28.8584,41.1718667 L28.8614667,41.1750667 C28.8226667,41.3133333 28.8026667,41.4564 28.8021333,41.6 C28.8021333,42.0244 28.9706667,42.4313333 29.2706667,42.7314667 C29.5708,43.0314667 29.9777333,43.2 30.4021333,43.2 L39.2021333,43.2 L36.8333333,58.8813333 C36.8122667,58.9862667 36.8018667,59.0930667 36.8021333,59.2 C36.8021333,59.6244 36.9706667,60.0313333 37.2706667,60.3314667 C37.5708,60.6314667 37.9777333,60.8 38.4021333,60.8 C38.6928,60.8 38.978,60.7198667 39.2268,60.5696 C39.4756,60.4193333 39.6789333,60.204 39.8145333,59.9469333 L39.8177333,59.9469333 L50.8926667,39.3437333 L50.8770667,39.3156 C51.0665333,39.0528 51.2021333,38.7485333 51.2021333,38.4 C51.2021333,37.5168 50.4853333,36.8 49.6021333,36.8 L40.8021333,36.8 L46.2614667,21.4562667 C46.3542667,21.25 46.4021333,21.0262667 46.4021333,20.8 C46.4021333,20.3757333 46.2334667,19.9686667 45.9334667,19.6686667 C45.6333333,19.3686667 45.2264,19.2 44.8021333,19.2 L35.2021333,19.2 Z" id="Path" fill="#257AF4"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-reliability.svg b/website/images/icons/icon-reliability.svg
new file mode 100644
index 00000000000..0b18d1451c0
--- /dev/null
+++ b/website/images/icons/icon-reliability.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-reliability</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-185.000000, -1674.000000)">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-3" transform="translate(0.000000, 627.000000)">
+                    <g id="icon-reliability" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" fill-rule="nonzero" cx="40" cy="40" r="40"></circle>
+                        <path d="M39.8666667,62.2222222 C39.8666667,62.2222222 57.6444444,53.3333333 57.6444444,40 L57.6444444,24.4444444 L39.8666667,17.7777778 L22.0888889,24.4444444 L22.0888889,40 C22.0888889,53.3333333 39.8666667,62.2222222 39.8666667,62.2222222 Z" id="Path" stroke="#257AF4" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-scalability.svg b/website/images/icons/icon-scalability.svg
new file mode 100644
index 00000000000..4b0a99dc233
--- /dev/null
+++ b/website/images/icons/icon-scalability.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-scalability</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-741.000000, -1263.000000)" fill-rule="nonzero">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-2" transform="translate(556.000000, 216.000000)">
+                    <g id="icon-scalability" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" cx="40" cy="40" r="40"></circle>
+                        <path d="M25.602,22.4 C25.39,22.3969333 25.1794667,22.4361333 24.9826667,22.5152 C24.786,22.5942667 24.6068,22.7116 24.4558667,22.8605333 C24.3049333,23.0093333 24.1849333,23.1868 24.1032,23.3824 C24.0213333,23.578 23.9792,23.788 23.9792,24 C23.9792,24.212 24.0213333,24.422 24.1032,24.6176 C24.1849333,24.8132 24.3049333,24.9905333 24.4558667,25.1394667 C24.6068,25.2882667 24.786,25.4057333 24.9826667,25.4848 C25.1794667,25.5638667 25.39,25.6029333 25.602,25.6 L39.9769333,25.6 L54.402,25.6 C54.614,25.6029333 54.8245333,25.5638667 55.0212,25.4848 C55.218,25.4057333 55.3970667,25.2882667 55.548,25.1394667 C55.6990667,24.9905333 55.8189333,24.8132 55.9008,24.6176 C55.9825333,24.422 56.0248,24.212 56.0248,24 C56.0248,23.788 55.9825333,23.578 55.9008,23.3824 C55.8189333,23.1868 55.6990667,23.0093333 55.548,22.8605333 C55.3970667,22.7116 55.218,22.5942667 55.0212,22.5152 C54.8245333,22.4361333 54.614,22.3969333 54.402,22.4 L25.602,22.4 Z M39.9769333,25.599807 C39.5613333,25.6066667 39.1645333,25.7746667 38.8706667,26.0686667 L35.6706667,29.2686667 C35.5172,29.4161333 35.3945333,29.5928 35.3101333,29.7881333 C35.2256,29.9836 35.1810667,30.1938667 35.1787197,30.4066667 C35.1766667,30.6196 35.2170667,30.8308 35.2974667,31.0278667 C35.378,31.2249333 35.4969333,31.404 35.6474667,31.5545333 C35.798,31.7050667 35.9770667,31.824 36.1741333,31.9044 C36.3712,31.9849333 36.5824,32.0252 36.7952,32.0230667 C37.0081333,32.0209333 37.2184,31.9762667 37.4137333,31.8918667 C37.6092,31.8073333 37.7857333,31.6848 37.9332,31.5312 L38.402,31.0625333 L38.402,48.9374667 L37.9332,48.4686667 C37.7841333,48.3154667 37.6057333,48.1936 37.4088,48.1104 C37.2118667,48.0272 37.0001333,47.9844 36.7862667,47.9844 C36.468,47.9844 36.1569333,48.0794667 35.8929333,48.2572 C35.6289333,48.4350667 35.424,48.6874667 35.3041333,48.9824 C35.1844,49.2773333 35.1553333,49.6012 35.2206667,49.9126667 C35.2858667,50.2242667 35.4426667,50.5092 35.6706667,50.7312 L38.8706667,53.9312 C39.0222667,54.0828 39.2026667,54.2024 39.4012,54.2829333 C39.5998667,54.3634667 39.8126667,54.4032 40.0269333,54.400179 C40.4425333,54.3933333 40.8393333,54.2252 41.1332,53.9312 L44.3332,50.7312 C44.5656,50.5077333 44.7250667,50.2193333 44.7906667,49.9037333 C44.8564,49.5881333 44.8251472,49.2601333 44.7012,48.9625333 C44.5772,48.6649333 44.3662667,48.4117333 44.096,48.236 C43.8256,48.0604 43.5086667,47.9705333 43.1862667,47.9781333 C42.7642667,47.9881333 42.3633333,48.1644 42.0706667,48.4686667 L41.602,48.9374667 L41.602,31.0625333 L42.0706667,31.5312 C42.2181333,31.6848 42.3946667,31.8073333 42.5901333,31.8918667 C42.7856,31.9762667 42.9958667,32.0209333 43.2086667,32.0230667 C43.4216,32.0252 43.6326667,31.9849333 43.8297333,31.9044 C44.0269333,31.824 44.2058667,31.7050667 44.3564,31.5545333 C44.5069333,31.404 44.626,31.2249333 44.7064,31.0278667 C44.7869333,30.8308 44.8272,30.6196 44.8251472,30.4066667 C44.8229333,30.1938667 44.7782667,29.9836 44.6938667,29.7881333 C44.6093333,29.5928 44.4868,29.4161333 44.3332,29.2686667 L41.1332,26.0686667 C40.9817333,25.9172 40.8013333,25.7976 40.6026667,25.7170667 C40.404,25.6365333 40.1912,25.5966667 39.9769333,25.599807 Z M40.0269333,54.4 L25.602,54.4 C25.39,54.3969333 25.1794667,54.4361333 24.9826667,54.5152 C24.786,54.5942667 24.6068,54.7116 24.4558667,54.8605333 C24.3049333,55.0093333 24.1849333,55.1868 24.1032,55.3824 C24.0213333,55.578 23.9792,55.788 23.9792,56 C23.9792,56.212 24.0213333,56.422 24.1032,56.6176 C24.1849333,56.8132 24.3049333,56.9905333 24.4558667,57.1394667 C24.6068,57.2882667 24.786,57.4057333 24.9826667,57.4848 C25.1794667,57.5638667 25.39,57.6029333 25.602,57.6 L54.402,57.6 C54.614,57.6029333 54.8245333,57.5638667 55.0212,57.4848 C55.218,57.4057333 55.3970667,57.2882667 55.548,57.1394667 C55.6990667,56.9905333 55.8189333,56.8132 55.9008,56.6176 C55.9825333,56.422 56.0248,56.212 56.0248,56 C56.0248,55.788 55.9825333,55.578 55.9008,55.3824 C55.8189333,55.1868 55.6990667,55.0093333 55.548,54.8605333 C55.3970667,54.7116 55.218,54.5942667 55.0212,54.5152 C54.8245333,54.4361333 54.614,54.3969333 54.402,54.4 L40.0269333,54.4 Z M25.602,28.8 C25.1776,28.8 24.7706667,28.9685333 24.4705333,29.2686667 C24.1705333,29.5686667 24.002,29.9756 24.002,30.4 C24.002,30.8242667 24.1705333,31.2313333 24.4705333,31.5313333 C24.7706667,31.8314667 25.1776,32 25.602,32 C26.0262667,32 26.4333333,31.8314667 26.7333333,31.5313333 C27.0333333,31.2313333 27.202,30.8242667 27.202,30.4 C27.202,29.9756 27.0333333,29.5686667 26.7333333,29.2686667 C26.4333333,28.9685333 26.0262667,28.8 25.602,28.8 Z M54.402,28.8 C53.9776,28.8 53.5706667,28.9685333 53.2705333,29.2686667 C52.9705333,29.5686667 52.802,29.9756 52.802,30.4 C52.802,30.8242667 52.9705333,31.2313333 53.2705333,31.5313333 C53.5706667,31.8314667 53.9776,32 54.402,32 C54.8262667,32 55.2332,31.8314667 55.5333333,31.5313333 C55.8333333,31.2313333 56.002,30.8242667 56.002,30.4 C56.002,29.9756 55.8333333,29.5686667 55.5333333,29.2686667 C55.2332,28.9685333 54.8262667,28.8 54.402,28.8 Z M25.602,35.2 C25.1776,35.2 24.7706667,35.3685333 24.4705333,35.6686667 C24.1705333,35.9686667 24.002,36.3756 24.002,36.8 C24.002,37.2242667 24.1705333,37.6313333 24.4705333,37.9313333 C24.7706667,38.2314667 25.1776,38.4 25.602,38.4 C26.0262667,38.4 26.4333333,38.2314667 26.7333333,37.9313333 C27.0333333,37.6313333 27.202,37.2242667 27.202,36.8 C27.202,36.3756 27.0333333,35.9686667 26.7333333,35.6686667 C26.4333333,35.3685333 26.0262667,35.2 25.602,35.2 Z M54.402,35.2 C53.9776,35.2 53.5706667,35.3685333 53.2705333,35.6686667 C52.9705333,35.9686667 52.802,36.3756 52.802,36.8 C52.802,37.2242667 52.9705333,37.6313333 53.2705333,37.9313333 C53.5706667,38.2314667 53.9776,38.4 54.402,38.4 C54.8262667,38.4 55.2332,38.2314667 55.5333333,37.9313333 C55.8333333,37.6313333 56.002,37.2242667 56.002,36.8 C56.002,36.3756 55.8333333,35.9686667 55.5333333,35.6686667 C55.2332,35.3685333 54.8262667,35.2 54.402,35.2 Z M25.602,41.6 C25.1776,41.6 24.7706667,41.7685333 24.4705333,42.0686667 C24.1705333,42.3686667 24.002,42.7756 24.002,43.2 C24.002,43.6242667 24.1705333,44.0313333 24.4705333,44.3313333 C24.7706667,44.6314667 25.1776,44.8 25.602,44.8 C26.0262667,44.8 26.4333333,44.6314667 26.7333333,44.3313333 C27.0333333,44.0313333 27.202,43.6242667 27.202,43.2 C27.202,42.7756 27.0333333,42.3686667 26.7333333,42.0686667 C26.4333333,41.7685333 26.0262667,41.6 25.602,41.6 Z M54.402,41.6 C53.9776,41.6 53.5706667,41.7685333 53.2705333,42.0686667 C52.9705333,42.3686667 52.802,42.7756 52.802,43.2 C52.802,43.6242667 52.9705333,44.0313333 53.2705333,44.3313333 C53.5706667,44.6314667 53.9776,44.8 54.402,44.8 C54.8262667,44.8 55.2332,44.6314667 55.5333333,44.3313333 C55.8333333,44.0313333 56.002,43.6242667 56.002,43.2 C56.002,42.7756 55.8333333,42.3686667 55.5333333,42.0686667 C55.2332,41.7685333 54.8262667,41.6 54.402,41.6 Z M25.602,48 C25.1776,48 24.7706667,48.1685333 24.4705333,48.4686667 C24.1705333,48.7686667 24.002,49.1756 24.002,49.6 C24.002,50.0242667 24.1705333,50.4313333 24.4705333,50.7313333 C24.7706667,51.0314667 25.1776,51.2 25.602,51.2 C26.0262667,51.2 26.4333333,51.0314667 26.7333333,50.7313333 C27.0333333,50.4313333 27.202,50.0242667 27.202,49.6 C27.202,49.1756 27.0333333,48.7686667 26.7333333,48.4686667 C26.4333333,48.1685333 26.0262667,48 25.602,48 Z M54.402,48 C53.9776,48 53.5706667,48.1685333 53.2705333,48.4686667 C52.9705333,48.7686667 52.802,49.1756 52.802,49.6 C52.802,50.0242667 52.9705333,50.4313333 53.2705333,50.7313333 C53.5706667,51.0314667 53.9776,51.2 54.402,51.2 C54.8262667,51.2 55.2332,51.0314667 55.5333333,50.7313333 C55.8333333,50.4313333 56.002,50.0242667 56.002,49.6 C56.002,49.1756 55.8333333,48.7686667 55.5333333,48.4686667 C55.2332,48.1685333 54.8262667,48 54.402,48 Z" id="Shape" fill="#257AF4"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-security.svg b/website/images/icons/icon-security.svg
new file mode 100644
index 00000000000..716f7cc5789
--- /dev/null
+++ b/website/images/icons/icon-security.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-security</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Homepage" transform="translate(-741.000000, -1674.000000)" fill-rule="nonzero">
+            <g id="Page/Why" transform="translate(185.000000, 1047.000000)">
+                <g id="Feature-4" transform="translate(556.000000, 627.000000)">
+                    <g id="icon-security" transform="translate(0.000000, 0.000000)">
+                        <circle id="Oval" fill="#F1F6F9" cx="40" cy="40" r="40"></circle>
+                        <path d="M24,24 C21.794,24 20,25.794 20,28 L20,52 C20,54.206 21.794,56 24,56 C24,57.104 24.896,58 26,58 C27.104,58 28,57.104 28,56 L52,56 C52,57.104 52.896,58 54,58 C55.104,58 56,57.104 56,56 C58.206,56 60,54.206 60,52 L60,28 C60,25.794 58.206,24 56,24 L24,24 Z M53.1757333,30.8281333 C53.6877333,30.8281333 54.1998667,31.0201333 54.5898667,31.4101333 C55.3718667,32.1921333 55.3698667,33.4582667 54.5898667,34.2382667 L52.8672,35.9609333 C53.5712,37.1529333 54,38.52 54,40 C54,41.48 53.5712,42.8490667 52.8672,44.0390667 L54.7656,45.9374667 C55.5456,46.7174667 55.5456,47.9856 54.7656,48.7656 C53.9856,49.5476 52.7194667,49.5456 51.9374667,48.7656 L50.0390667,46.8672 C48.8490667,47.5692 47.48,48 46,48 C44.52,48 43.1509333,47.5712 41.9609333,46.8672 L40.2382667,48.5898667 C39.4582667,49.3698667 38.1901333,49.3698667 37.4101333,48.5898667 C36.6301333,47.8098667 36.6301333,46.5417333 37.4101333,45.7617333 L39.1328,44.0390667 C38.4288,42.8490667 38,41.48 38,40 C38,38.52 38.4288,37.1509333 39.1328,35.9609333 L37.5898667,34.414 C36.8098667,33.634 36.8098667,32.3698667 37.5898667,31.5898667 C38.3698667,30.8098667 39.634,30.8098667 40.414,31.5898667 L41.9609333,33.1328 C43.1509333,32.4288 44.52,32 46,32 C47.48,32 48.8490667,32.4288 50.0390667,33.1328 L51.7617333,31.4101333 C52.1517333,31.0201333 52.6637333,30.8281333 53.1757333,30.8281333 Z M28,34 C29.104,34 30,34.896 30,36 L30,44 C30,45.104 29.104,46 28,46 C26.896,46 26,45.104 26,44 L26,36 C26,34.896 26.896,34 28,34 Z M46,36 C44.9392,36 43.9217333,36.4214667 43.1716,37.1716 C42.4214667,37.9217333 42,38.9392 42,40 C42,41.0608 42.4214667,42.0782667 43.1716,42.8284 C43.9217333,43.5785333 44.9392,44 46,44 C47.0608,44 48.0782667,43.5785333 48.8284,42.8284 C49.5785333,42.0782667 50,41.0608 50,40 C50,38.9392 49.5785333,37.9217333 48.8284,37.1716 C48.0782667,36.4214667 47.0608,36 46,36 Z" id="Shape" fill="#257AF4"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-slack-black.svg b/website/images/icons/icon-slack-black.svg
new file mode 100644
index 00000000000..89b6ddcbada
--- /dev/null
+++ b/website/images/icons/icon-slack-black.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-slack</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Link/Slack" fill="#212529" fill-rule="nonzero">
+            <g id="Icon/Slack">
+                <path d="M5.13302911,0 C4.35912849,0.000570846075 3.73280093,0.627359837 3.73337253,1.39971458 C3.73280093,2.17206932 4.35970047,2.79885831 5.13360109,2.79942915 L6.53382966,2.79942915 L6.53382966,1.40028542 C6.53440125,0.627930683 5.90750171,0.00114169215 5.13302911,0 C5.13360109,0 5.13360109,0 5.13302911,0 M5.13302911,3.73333333 L1.40023129,3.73333333 C0.626330674,3.73390418 -0.000568866549,4.36069317 1.55890848e-06,5.13304791 C-0.00114085518,5.90540265 0.625758685,6.53219164 1.3996593,6.53333333 L5.13302911,6.53333333 C5.90692972,6.53276249 6.53382926,5.9059735 6.53325767,5.13361876 C6.53382926,4.36069317 5.90692972,3.73390418 5.13302911,3.73333333 Z" id="Shape"></path>
+                <path d="M13.9999973,5.13304791 C14.0005689,4.36069317 13.3736693,3.73390418 12.5997687,3.73333333 C11.8258681,3.73390418 11.1989685,4.36069317 11.1995401,5.13304791 L11.1995401,6.53333333 L12.5997687,6.53333333 C13.3736693,6.53276249 14.0005689,5.9059735 13.9999973,5.13304791 Z M10.2666275,5.13304791 L10.2666275,1.39971458 C10.2671991,0.627930683 9.64087151,0.00114169215 8.86697089,0 C8.09307028,0.000570846075 7.46617074,0.627359837 7.46674116,1.39971458 L7.46674116,5.13304791 C7.46559875,5.90540265 8.09249829,6.53219164 8.86639891,6.53333333 C9.64029953,6.53276249 10.2671991,5.9059735 10.2666275,5.13304791 L10.2666275,5.13304791 Z" id="Shape"></path>
+                <path d="M8.86639891,14 C9.64029953,13.9994292 10.2671991,13.3726402 10.2666275,12.6002854 C10.2671991,11.8279307 9.64029953,11.2011417 8.86639891,11.2005708 L7.46617034,11.2005708 L7.46617034,12.6002854 C7.46559875,13.3720693 8.09249829,13.9988583 8.86639891,14 Z M8.86639891,10.2660958 L12.5997687,10.2660958 C13.3736693,10.265525 14.0005689,9.63873598 13.9999984,8.86638124 C14.0011409,8.0940265 13.3742413,7.46723751 12.6003407,7.46609582 L8.86697089,7.46609582 C8.09307028,7.46666667 7.46617074,8.09345566 7.46674233,8.8658104 C7.46617074,9.63873598 8.09249829,10.265525 8.86639891,10.2660958 L8.86639891,10.2660958 Z" id="Shape"></path>
+                <path d="M2.73097794e-06,8.86638124 C-0.00056886655,9.63873598 0.626330674,10.265525 1.40023129,10.2660958 C2.17413191,10.265525 2.80103145,9.63873598 2.80045986,8.86638124 L2.80045986,7.46666667 L1.40023129,7.46666667 C0.626330674,7.46723751 -0.00056886655,8.0940265 2.73097794e-06,8.86638124 Z M3.73337136,8.86638124 L3.73337136,12.5997146 C3.73222895,13.3720693 4.35912849,13.9988583 5.13302911,14 C5.90692972,13.9994292 6.53382926,13.3726402 6.53325884,12.6002854 L6.53325884,8.86752294 C6.53440125,8.0951682 5.90750171,7.4683792 5.13360109,7.46723751 C4.35912849,7.46723751 3.73280093,8.0940265 3.73337136,8.86638124 C3.73337136,8.86638124 3.73337136,8.86695209 3.73337136,8.86638124" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-slack.svg b/website/images/icons/icon-slack.svg
new file mode 100644
index 00000000000..cb74d47cb04
--- /dev/null
+++ b/website/images/icons/icon-slack.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-slack</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-slack" fill-rule="nonzero">
+            <path d="M29.3315949,0 C24.9093056,0.00326197757 21.3302911,3.58491335 21.3335573,7.99836901 C21.3302911,12.4118247 24.9125741,15.993476 29.3348634,15.996738 L37.3361695,15.996738 L37.3361695,8.00163099 C37.3394357,3.58817533 33.7571526,0.00652395515 29.3315949,0 C29.3348634,0 29.3348634,0 29.3315949,0 M29.3315949,21.3333333 L8.00132167,21.3333333 C3.57903242,21.3365953 -0.003250666,24.9182467 8.9080479e-06,29.3317023 C-0.00651917247,33.745158 3.57576392,37.3268094 7.99805317,37.3333333 L29.3315949,37.3333333 C33.7538841,37.3300714 37.3361672,33.74842 37.332901,29.3349643 C37.3361672,24.9182467 33.7538841,21.3365953 29.3315949,21.3333333 Z" id="Shape" fill="#36C5F0"></path>
+            <path d="M79.9999844,29.3317023 C80.0032507,24.9182467 76.4209676,21.3365953 71.9986783,21.3333333 C67.5763891,21.3365953 63.994106,24.9182467 63.9973723,29.3317023 L63.9973723,37.3333333 L71.9986783,37.3333333 C76.4209676,37.3300714 80.0032507,33.74842 79.9999844,29.3317023 Z M58.6664427,29.3317023 L58.6664427,7.99836901 C58.6697089,3.58817533 55.0906944,0.00652395515 50.6684051,0 C46.2461159,0.00326197757 42.6638328,3.58491335 42.6670923,7.99836901 L42.6670923,29.3317023 C42.6605643,33.745158 46.2428474,37.3268094 50.6651366,37.3333333 C55.0874259,37.3300714 58.6697089,33.74842 58.6664427,29.3317023 L58.6664427,29.3317023 Z" id="Shape" fill="#2EB67D"></path>
+            <path d="M50.6651366,80 C55.0874259,79.996738 58.6697089,76.4150866 58.6664427,72.001631 C58.6697089,67.5881753 55.0874259,64.006524 50.6651366,64.003262 L42.6638305,64.003262 L42.6638305,72.001631 C42.6605643,76.4118247 46.2428474,79.993476 50.6651366,80 Z M50.6651366,58.6634047 L71.9986783,58.6634047 C76.4209676,58.6601427 80.0032507,55.0784913 79.9999911,50.6650357 C80.0065192,46.25158 76.4242361,42.6699286 72.0019468,42.6634047 L50.6684051,42.6634047 C46.2461159,42.6666667 42.6638328,46.248318 42.667099,50.6617737 C42.6638328,55.0784913 46.2428474,58.6601427 50.6651366,58.6634047 L50.6651366,58.6634047 Z" id="Shape" fill="#ECB22E"></path>
+            <path d="M1.56055896e-05,50.6650357 C-0.003250666,55.0784913 3.57903242,58.6601427 8.00132167,58.6634047 C12.4236109,58.6601427 16.005894,55.0784913 16.0026277,50.6650357 L16.0026277,42.6666667 L8.00132167,42.6666667 C3.57903242,42.6699286 -0.003250666,46.25158 1.56055896e-05,50.6650357 Z M21.3335506,50.6650357 L21.3335506,71.998369 C21.3270225,76.4118247 24.9093056,79.993476 29.3315949,80 C33.7538841,79.996738 37.3361672,76.4150866 37.3329077,72.001631 L37.3329077,50.6715596 C37.3394357,46.258104 33.7571526,42.6764526 29.3348634,42.6699286 C24.9093056,42.6699286 21.3302911,46.25158 21.3335506,50.6650357 C21.3335506,50.6650357 21.3335506,50.6682977 21.3335506,50.6650357" id="Shape" fill="#E01E5A"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-stack-overflow.svg b/website/images/icons/icon-stack-overflow.svg
new file mode 100644
index 00000000000..5c9a2d57d2b
--- /dev/null
+++ b/website/images/icons/icon-stack-overflow.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="80px" viewBox="0 0 64 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-stack-overflow</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-stack-overflow" fill-rule="nonzero">
+            <polygon id="Path" fill="#607D8B" points="0 47.5675676 6.39914678 47.5675676 6.39914678 77.8378378 0 77.8378378"></polygon>
+            <polygon id="Path" fill="#607D8B" points="0 73.5135135 55.4592721 73.5135135 55.4592721 80 0 80"></polygon>
+            <path d="M49.0601253,47.5675676 L55.4592721,47.5675676 L55.4592721,77.8378378 L49.0601253,77.8378378 L49.0601253,47.5675676 Z M12.7982936,60.5405405 L42.6609785,60.5405405 L42.6609785,67.027027 L12.7982936,67.027027 L12.7982936,60.5405405 Z" id="Shape" fill="#607D8B"></path>
+            <polygon id="Path" fill="#A68A6E" points="12.9732036 48.1292973 42.6646047 51.368 41.979896 57.8170811 12.2887082 54.5783784"></polygon>
+            <polygon id="Path" fill="#EF6C00" points="59.4493534 0 64 29.9145946 57.6735902 30.9033514 53.1229436 0.988864865"></polygon>
+            <polygon id="Path" fill="#FF9800" points="41.5279029 4.83636757 56.0989735 31.2536216 50.5118784 34.4201081 35.9405946 8.0028973"></polygon>
+            <polygon id="Path" fill="#D38B28" points="24.5300627 18.4892973 49.0586322 35.7472432 45.4085589 41.0776216 20.8799893 23.8196757"></polygon>
+            <polygon id="Path" fill="#C09553" points="16.8498067 32.9033514 44.947607 43.1487568 42.7808559 49.2544865 14.6830556 39.0088649"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-telegram.svg b/website/images/icons/icon-telegram.svg
new file mode 100644
index 00000000000..5ab06341383
--- /dev/null
+++ b/website/images/icons/icon-telegram.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-telegram</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-telegram" fill-rule="nonzero">
+            <path d="M40,0 C29.3914,0 19.2172,4.21428 11.71572,11.71572 C4.21428,19.2172 0,29.3914 0,40 C0,50.6086 4.21428,60.7828 11.71572,68.2842 C19.2172,75.7858 29.3914,80 40,80 C50.6086,80 60.7828,75.7858 68.2842,68.2842 C75.7858,60.7828 80,50.6086 80,40 C80,29.3914 75.7858,19.2172 68.2842,11.71572 C60.7828,4.21428 50.6086,0 40,0 Z" id="Path" fill="#29B6F6"></path>
+            <path d="M59.9,21.9999936 L52.408,60.252 C52.408,60.252 52.086,61.9999936 49.918,61.9999936 C48.766,61.9999936 48.172,61.452 48.172,61.452 L31.944,47.986 L24.004,43.984 L13.814,41.274 C13.814,41.274 12,40.75 12,39.25 C12,37.9999936 13.866,37.404 13.866,37.404 L56.498,20.468 C56.496,20.466 57.8,19.998 58.75,19.9999936 C59.334,19.9999936 60,20.25 60,20.9999936 C60,21.4999936 59.9,21.9999936 59.9,21.9999936 Z" id="Path" fill="#FFFFFF"></path>
+            <path d="M37.9996,53.01 L31.1476,59.758 C31.1476,59.758 30.8496,59.988 30.4516,59.998 C30.3136,60.002 30.1656,59.98 30.0136,59.912 L31.9416,47.982 L37.9996,53.01 Z" id="Path" fill="#B0BEC5"></path>
+            <path d="M51.794,28.3918 C51.456,27.9518 50.832,27.8718 50.392,28.2058 L24,43.9998 C24,43.9998 28.212,55.7838 28.854,57.8238 C29.498,59.8658 30.014,59.9138 30.014,59.9138 L31.942,47.9838 L51.606,29.7918 C52.046,29.4578 52.128,28.8318 51.794,28.3918 Z" id="Path" fill="#CFD8DC"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-twitter-gray.svg b/website/images/icons/icon-twitter-gray.svg
new file mode 100644
index 00000000000..115fe5ff390
--- /dev/null
+++ b/website/images/icons/icon-twitter-gray.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31px" height="24px" viewBox="0 0 31 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-twitter-gray</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Twitter-Link" fill="#6C757D" fill-rule="nonzero">
+            <g id="twitter">
+                <path d="M30.2608696,2.8377931 C29.1488762,3.32275862 27.9528319,3.64634483 26.691228,3.79944828 C27.9738447,3.04965517 28.9606022,1.8537931 29.4237226,0.441103448 C28.2234758,1.1337931 26.8937906,1.64275862 25.4792141,1.91089655 C24.34957,0.731586207 22.7383143,0 20.9530733,0 C17.5237967,0 14.7442335,2.71282759 14.7442335,6.05793103 C14.7442335,6.53131034 14.8005476,6.99227586 14.9064518,7.44 C9.74740771,7.18510345 5.17167689,4.7702069 2.11051802,1.10565517 C1.57259228,2.00110345 1.27000905,3.04965517 1.27000905,4.15613793 C1.27000905,6.25903448 2.36351122,8.11034483 4.03110622,9.20110345 C3.01322465,9.17048276 2.05504443,8.89158621 1.21621648,8.44468966 C1.21621648,8.46289655 1.21621648,8.4902069 1.21621648,8.51586207 C1.21621648,11.4546207 3.35699282,13.9017931 6.1945763,14.4587586 C5.67598227,14.5986207 5.12797042,14.6764138 4.5631484,14.6764138 C4.16222562,14.6764138 3.77138895,14.6317241 3.39315992,14.5646897 C4.18323835,16.9663448 6.4753063,18.7216552 9.19099077,18.7737931 C7.0661841,20.3958621 4.39000355,21.3674483 1.48013629,21.3674483 C0.977511929,21.3674483 0.485814183,21.3393103 -7.46521926e-16,21.2813793 C2.74930483,22.9953103 6.01386688,24 9.51794876,24 C20.9362631,24 27.1829257,14.7674483 27.1829257,6.75806897 C27.1829257,6.49572414 27.1745206,6.2342069 27.161913,5.976 C28.380651,5.12855172 29.4312872,4.05931034 30.2608696,2.8377931 Z" id="Path"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/icons/icon-twitter.svg b/website/images/icons/icon-twitter.svg
new file mode 100644
index 00000000000..b25ac9353ac
--- /dev/null
+++ b/website/images/icons/icon-twitter.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Logo" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 248 204" style="enable-background:new 0 0 248 204;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#1D9BF0;}
+</style>
+<g id="Logo_1_">
+	<path id="white_background" class="st0" d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04
+		C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66
+		c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64
+		c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76
+		c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26
+		c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z"/>
+</g>
+</svg>
diff --git a/website/images/icons/icon-youtube-black.svg b/website/images/icons/icon-youtube-black.svg
new file mode 100644
index 00000000000..0cb017d64a4
--- /dev/null
+++ b/website/images/icons/icon-youtube-black.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="14px" viewBox="0 0 20 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-youtube</title>
+    <defs>
+        <path d="M19.5820806,2.19052604 C19.3520638,1.32828646 18.6743546,0.649213542 17.8138699,0.418760417 C16.2541794,0 10,0 10,0 C10,0 3.74585724,0 2.18613014,0.418760417 C1.32564535,0.64925 0.647936221,1.32828646 0.417919412,2.19052604 C0,3.75338542 0,7.01414583 0,7.01414583 C0,7.01414583 0,10.2749062 0.417919412,11.8377656 C0.647936221,12.7000052 1.32564535,13.3507865 2.18613014,13.5812396 C3.74585724,14 10,14 10,14 C10,14 16.2541428,14 17.8138699,13.5812396 C18.6743546,13.3507865 19.3520638,12.7000052 19.5820806,11.8377656 C20,10.2749062 20,7.01414583 20,7.01414583 C20,7.01414583 20,3.75338542 19.5820806,2.19052604 Z M7.95453131,9.97467188 L7.95453131,4.05361979 L13.1817832,7.01421875 L7.95453131,9.97467188 Z" id="path-1"></path>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon/Youtube">
+            <mask id="mask-2" fill="white">
+                <use xlink:href="#path-1"></use>
+            </mask>
+            <use id="Brands/youtube" fill="#212529" fill-rule="nonzero" xlink:href="#path-1"></use>
+        </g>
+    </g>
+</svg>
diff --git a/website/images/icons/icon-youtube.svg b/website/images/icons/icon-youtube.svg
new file mode 100644
index 00000000000..ee676649770
--- /dev/null
+++ b/website/images/icons/icon-youtube.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-youtube</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-youtube" transform="translate(0.000000, 10.000000)" fill-rule="nonzero">
+            <path d="M78.2044888,49.8 C77.4064838,54 74.0149626,57.2 69.8254364,57.8 C63.2418953,58.8 52.2693267,60 39.9002494,60 C27.7306733,60 16.7581047,58.8 9.97506234,57.8 C5.78553616,57.2 2.39401496,54 1.59600998,49.8 C0.798004988,45.2 0,38.4 0,30 C0,21.6 0.798004988,14.8 1.59600998,10.2 C2.39401496,6 5.78553616,2.8 9.97506234,2.2 C16.5586035,1.2 27.5311721,0 39.9002494,0 C52.2693267,0 63.042394,1.2 69.8254364,2.2 C74.0149626,2.8 77.4064838,6 78.2044888,10.2 C79.0024938,14.8 80,21.6 80,30 C79.8004988,38.4 79.0024938,45.2 78.2044888,49.8 Z" id="Path" fill="#FF3D00"></path>
+            <polygon id="Path" fill="#FFFFFF" points="31.9201995 44 31.9201995 16 55.8603491 30"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logo-clickhouse.svg b/website/images/logo-clickhouse.svg
new file mode 100644
index 00000000000..560e15572d9
--- /dev/null
+++ b/website/images/logo-clickhouse.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="180px" height="28px" viewBox="0 0 180 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ClickHouse Logo</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="ClickHouse-Logo" transform="translate(0.000000, 0.500000)" fill-rule="nonzero">
+            <g id="logo">
+                <polygon id="Path" fill="#FF0000" points="0 23.625 3.37552743 23.625 3.37552743 27 0 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="0 0 3.37552743 0 3.37552743 23.625 0 23.625"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="6.75105485 0 10.1265823 0 10.1265823 27 6.75105485 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="13.5021097 0 16.8776371 0 16.8776371 27 13.5021097 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="20.2531646 0 23.628692 0 23.628692 27 20.2531646 27"></polygon>
+                <polygon id="Path" fill="#FFCC00" points="27.0042194 10.96875 30.3797468 10.96875 30.3797468 16.03125 27.0042194 16.03125"></polygon>
+            </g>
+            <g id="clickhouse-black" transform="translate(43.291139, 3.000000)" fill="#231F20">
+                <path d="M9.76370444,20.9560972 C8.43447886,20.9735251 7.11430823,20.7384252 5.875478,20.2636703 C4.72047444,19.8054437 3.67723122,19.1113387 2.81453379,18.2271205 C1.90927726,17.3283139 1.2048111,16.2531042 0.746328237,15.0704684 C-0.248776079,12.2964995 -0.248776079,9.27056268 0.746328237,6.4965938 C1.67159165,4.07354026 3.61800681,2.16434552 6.08229856,1.26266086 C7.35832383,0.792264319 8.71148185,0.557532775 10.0739353,0.570233938 C11.1612577,0.548839362 12.2465336,0.672146838 13.3003359,0.936812899 C14.1575307,1.16603291 14.9890302,1.47989577 15.7821826,1.8736258 L15.0376286,4.17492705 C14.334754,3.70811103 13.5779913,3.32526638 12.7832845,3.03445917 C11.8308864,2.71897047 10.8304102,2.56740693 9.82575061,2.58641822 C7.96245266,2.56886976 6.1853824,3.35817309 4.96546756,4.74516099 C4.30442786,5.50472232 3.79877758,6.38298172 3.47635956,7.33157921 C3.08814385,8.46618422 2.89929764,9.65767851 2.91794407,10.8548103 C2.90195973,12.0219322 3.07653544,13.184001 3.43499545,14.2965795 C3.73382292,15.2302331 4.21899806,16.0957206 4.86205728,16.8422667 C5.46077204,17.5238868 6.21094713,18.0604846 7.05435517,18.41041 C7.95798877,18.7824827 8.9290709,18.969569 9.90847883,18.9602785 C10.8005951,18.9648543 11.68759,18.827308 12.5350999,18.5529685 C13.3447055,18.2769814 14.1214074,17.9150606 14.8514901,17.4735971 L15.575362,19.2046644 C14.8756447,19.7279796 14.0929921,20.1339593 13.2589718,20.4062288 C12.1346344,20.7859604 10.952228,20.9719742 9.76370444,20.9560972 L9.76370444,20.9560972 Z" id="Path"></path>
+                <polygon id="Path" points="21.2008811 0 21.2008811 20.6709803 18.7397165 20.6709803 18.7397165 0 21.2008811 0"></polygon>
+                <path d="M26.5161694,4.15456155 C26.0981094,4.18404053 25.6871808,4.03620327 25.3868859,3.74828616 C25.0865909,3.46036905 24.9255529,3.05981554 24.9443332,2.64751471 C24.9293499,2.23543398 25.0776822,1.83376364 25.3579743,1.52741233 C25.9917593,0.922143971 26.9992154,0.922143971 27.6330004,1.52741233 C27.9227354,1.82938962 28.0789406,2.23223687 28.0673236,2.64751471 C28.0795295,3.0508229 27.9224226,3.44126169 27.6330004,3.7268861 C27.3352303,4.0129939 26.9320049,4.16740365 26.5161694,4.15456155 L26.5161694,4.15456155 Z M27.7570927,6.31330432 L27.7570927,20.5691528 L25.3166102,20.5691528 L25.3166102,6.31330432 L27.7777748,6.31330432 L27.7570927,6.31330432 Z" id="Shape"></path>
+                <path d="M38.2015308,20.9561849 C37.2331788,20.9606473 36.2723959,20.7880054 35.3680892,20.4469598 C34.5040176,20.1277138 33.7207114,19.6274001 33.072381,18.9806439 C32.4086321,18.3083453 31.8882536,17.5120269 31.5419089,16.6386117 C30.789066,14.6134632 30.789066,12.3911868 31.5419089,10.3660384 C31.8953146,9.48650873 32.4305899,8.68894988 33.1137451,8.02400613 C33.8006138,7.36063917 34.6265105,6.85322326 35.5335456,6.53732479 C36.4665869,6.19626518 37.4544707,6.0237894 38.4497154,6.02818735 C39.2367736,6.02254268 40.0215928,6.11144966 40.7867877,6.29293882 C41.402916,6.43127907 41.9904819,6.67235105 42.5240804,7.00573124 L41.7381623,9.14410851 C41.2326995,8.76428196 40.6844527,8.44310218 40.1042799,8.18693012 C39.4990142,7.95244732 38.8516533,7.84158602 38.2015308,7.86108215 C37.5775701,7.85677667 36.958946,7.97445444 36.3815099,8.20729561 C35.8033669,8.44328317 35.2871426,8.80537627 34.8717198,9.2663015 C34.4220004,9.77237252 34.0776687,10.3605404 33.8582991,10.9973688 C33.5836299,11.7832018 33.4506403,12.6102801 33.4653401,13.4412285 C33.3646964,14.9221144 33.8543791,16.3832889 34.8303557,17.5143281 C35.8193073,18.4542588 37.1597853,18.9483223 38.5324437,18.8788165 C39.7296588,18.8515966 40.8932941,18.483801 41.8829366,17.8198106 L42.4413521,19.6119744 C41.8863529,20.0201826 41.2635134,20.3302813 40.6006492,20.5284218 C39.8277327,20.7904738 39.0186907,20.9346965 38.2015308,20.9561849 L38.2015308,20.9561849 Z" id="Path"></path>
+                <path d="M47.9427789,0 L47.9427789,20.6709803 L45.4402502,20.6709803 L45.4402502,0 L47.9427789,0 Z M54.3542161,20.6709803 L48.2736918,13.0135531 L54.2714879,6.33366982 L56.8360628,6.33366982 L50.9003129,12.7284361 L57.2497039,20.6709803 L54.3542161,20.6709803 L54.3542161,20.6709803 Z" id="Shape"></path>
+                <polygon id="Path" points="73.1128405 11.8730852 62.7718127 11.8730852 62.7718127 20.6506148 60.1038276 20.6506148 60.1038276 0.855350908 62.7718127 0.855350908 62.7718127 9.89763193 73.1128405 9.89763193 73.1128405 0.855350908 75.7808256 0.855350908 75.7808256 20.6709803 73.1128405 20.6709803"></polygon>
+                <path d="M86.3079919,20.9560972 C85.38699,20.956828 84.4743522,20.7840259 83.6193247,20.4469598 C82.7801539,20.1243214 82.0191689,19.6317014 81.3856627,19.0010094 C80.7288968,18.3272298 80.2155719,17.5309446 79.8758726,16.6589772 C79.1241518,14.6056391 79.1241518,12.35828 79.8758726,10.3049419 C80.2139667,9.43820628 80.7276537,8.64828849 81.3856627,7.98327514 C82.0210949,7.3549028 82.7815529,6.86262399 83.6193247,6.53732479 C84.4743522,6.20025867 85.38699,6.0274377 86.3079919,6.02818492 C87.235663,6.02783377 88.154999,6.20059422 89.0173412,6.53732479 C89.8608646,6.86326706 90.6279639,7.35528929 91.2716852,7.98327514 C91.9432058,8.64563226 92.4709473,9.43552137 92.8228394,10.3049419 C93.5941835,12.3548594 93.5941835,14.6090597 92.8228394,16.6589772 C92.5001582,17.5252355 92.0083217,18.3208853 91.3750955,19.0010094 C90.7336187,19.6317283 89.9659063,20.1241438 89.1207514,20.4469598 C88.2261198,20.7965781 87.270406,20.9695718 86.3079919,20.9560972 Z M86.3079919,19.1028369 C86.8871906,19.1004754 87.4613802,18.9970483 88.0039204,18.7973545 C88.5665616,18.5933999 89.0704796,18.2579374 89.4723464,17.8198106 C89.93364,17.3107661 90.2854168,16.714971 90.5064492,16.0683778 C90.7858877,15.2345245 90.9187812,14.3598326 90.8994082,13.4819595 C90.921252,12.6039337 90.7882958,11.7288286 90.5064492,10.8955413 C90.2829062,10.2561715 89.9312542,9.66751308 89.4723464,9.16447401 C89.0704796,8.72634722 88.5665616,8.39088465 88.0039204,8.18693012 C87.4613802,7.98723626 86.8871906,7.88380922 86.3079919,7.88144765 C85.7421967,7.88338153 85.1815027,7.98690253 84.6534274,8.18693012 C84.1067964,8.39867016 83.6180769,8.73344525 83.2263656,9.16447401 C82.771108,9.66662382 82.426093,10.2559587 82.2129449,10.8955413 C81.9432303,11.7312023 81.817401,12.6054092 81.8406679,13.4819595 C81.8197008,14.3583785 81.9454766,15.2322137 82.2129449,16.0683778 C82.4234966,16.7151843 82.7686424,17.3116787 83.2263656,17.8198106 C83.6175627,18.2514112 84.1064306,18.586288 84.6534274,18.7973545 C85.1815027,18.9973821 85.7421967,19.1009031 86.3079919,19.1028369 L86.3079919,19.1028369 Z" id="Shape"></path>
+                <path d="M104.218652,20.1211118 C103.261113,20.713834 102.142858,21.0051032 101.012933,20.9560972 C99.7999523,21.0051122 98.6193584,20.5636475 97.7451686,19.7341674 C96.8353108,18.7009502 96.3878256,17.3496664 96.5042453,15.9869158 L96.5042453,6.31330432 L98.9860919,6.31330432 L98.9860919,15.9869158 C98.9742754,16.4701161 99.0441695,16.9518863 99.1929125,17.4125006 C99.3056456,17.7606047 99.5046708,18.0755709 99.77201,18.328948 C100.016574,18.5594167 100.314849,18.7272509 100.640656,18.81772 C100.990271,18.9161408 101.352523,18.9641592 101.716123,18.9602785 C102.655549,19.0038445 103.582007,18.7308795 104.342744,18.1863895 C105.051689,17.6370184 105.630443,16.9420231 106.038673,16.1498398 L106.038673,6.31330432 L108.499837,6.31330432 L108.499837,20.5691528 L106.328222,20.5691528 L106.100719,18.0031001 L106.100719,18.0031001 C105.687922,18.8692089 105.035644,19.6032598 104.218652,20.1211118 L104.218652,20.1211118 Z" id="Path"></path>
+                <path d="M116.421065,20.9560972 C115.801233,20.9950241 115.179512,20.9950241 114.55968,20.9560972 C114.092617,20.8964402 113.62981,20.8080164 113.173982,20.6913458 C112.813228,20.605003 112.460411,20.4891975 112.119197,20.3451323 C111.834495,20.2200141 111.558175,20.0771664 111.291915,19.9174568 L112.098515,17.8809071 C112.279343,18.026767 112.473161,18.156273 112.677613,18.2678515 C112.976636,18.4329534 113.287727,18.5759069 113.608305,18.695527 C114.017173,18.8537321 114.439319,18.9763932 114.869911,19.0621059 C115.380772,19.1609067 115.900459,19.2086684 116.421065,19.2046644 C117.260254,19.2611102 118.095255,19.0466179 118.799501,18.5936995 C119.330358,18.1920161 119.630919,17.5621502 119.606101,16.9033632 C119.629117,16.3456326 119.383876,15.8098319 118.944275,15.4574128 C118.248621,14.9827695 117.47054,14.6376468 116.648567,14.4391379 L114.869911,13.8485385 C114.332933,13.6600961 113.82489,13.3996834 113.36012,13.0746496 C112.918371,12.7629353 112.551287,12.3597625 112.284654,11.8934507 C111.990937,11.3416153 111.84837,10.7239217 111.871013,10.1012869 C111.7928,8.92823263 112.331666,7.79778562 113.298074,7.10755873 C114.467654,6.39295223 115.832855,6.05154147 117.206983,6.13001484 C118.07528,6.11663174 118.942387,6.19859987 119.79224,6.37440081 C120.389496,6.49652839 120.971868,6.68085438 121.529532,6.92426925 L120.950435,8.96081903 C120.479952,8.73041885 119.996597,8.52643737 119.502691,8.3498541 C118.797193,8.1146398 118.054965,8.00432014 117.310393,8.02400613 C116.535101,7.9880419 115.762277,8.13465573 115.056049,8.45168159 C114.47936,8.75940804 114.145458,9.37689414 114.208085,10.0198249 C114.202,10.3323024 114.296078,10.6387208 114.476951,10.8955413 C114.663996,11.1520366 114.903538,11.3670997 115.180141,11.5268718 C115.506126,11.720303 115.852962,11.8774057 116.214244,11.9952782 L117.455167,12.3618572 L119.130414,12.9117256 C119.664383,13.1015363 120.166356,13.3692768 120.619522,13.70598 C121.602378,14.4140087 122.154912,15.5634667 122.087948,16.7608047 C122.121004,17.4696719 121.956505,18.1739382 121.612261,18.7973545 C121.300726,19.3338382 120.869299,19.7934828 120.350655,20.1414773 C119.804193,20.5059941 119.194247,20.7683295 118.551316,20.9153662 C117.845409,21.0123699 117.130265,21.0260437 116.421065,20.9560972 Z" id="Path"></path>
+                <path d="M136.379248,19.4286849 C135.765636,19.9144267 135.063746,20.2807344 134.311043,20.5080563 C133.397586,20.8060079 132.439751,20.9505822 131.477601,20.9357317 C129.484022,21.0457076 127.539179,20.3034303 126.141631,18.899182 C124.819952,17.3656124 124.152831,15.3875844 124.280246,13.3801321 C124.263071,12.3194805 124.438164,11.2643153 124.797297,10.2642109 C125.111353,9.39844373 125.596363,8.60246478 126.224359,7.92217864 C126.799559,7.29363386 127.504769,6.79365416 128.292565,6.4558628 C129.13245,6.11650376 130.03203,5.94349361 130.939868,5.94672536 C131.84844,5.93569173 132.749586,6.10900306 133.587171,6.4558628 C134.355957,6.77570775 135.026242,7.28828126 135.531284,7.94254414 C136.069381,8.66407624 136.423989,9.5021104 136.565387,10.3864039 C136.756685,11.5054228 136.756685,12.6480576 136.565387,13.7670765 L126.720728,13.7670765 C126.831033,17.1749031 128.464915,18.8788165 131.622376,18.8788165 C132.38185,18.8941966 133.138087,18.7769813 133.856038,18.532603 C134.495821,18.304128 135.106567,18.0034291 135.676058,17.6365211 L136.379248,19.4286849 Z M131.022596,7.73888916 C130.017668,7.7293132 129.052936,8.12697327 128.354611,8.83862604 C127.526752,9.75405949 127.031943,10.9148261 126.948231,12.1378367 L134.331725,12.1378367 C134.534684,10.9751452 134.259342,9.78072052 133.566489,8.81826055 C132.931983,8.09270485 131.993938,7.6946933 131.022596,7.73888916 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-almaz-capital.svg b/website/images/logos/logo-almaz-capital.svg
new file mode 100644
index 00000000000..ed2357083ed
--- /dev/null
+++ b/website/images/logos/logo-almaz-capital.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 484.72 95.49"><defs><style>.cls-1{fill:#99b9e2;}.cls-2{fill:#e75204;}.cls-3{fill:#187ac6;}.cls-4{fill:#005cb9;}</style></defs><title>AC Logo</title><path class="cls-1" d="M215.74,253.56l3.72,55.38a4.92,4.92,0,0,0,7.66,3.76l35.4-23.77a5.3,5.3,0,0,0,.13-8.71l-41.49-29.68A3.43,3.43,0,0,0,215.74,253.56Z" transform="translate(-178.92 -249.89)"></path><path class="cls-2" d="M205.9,252.18,180.05,294a7.57,7.57,0,0,0,3.52,11l22.95,9.57a4.83,4.83,0,0,0,6.69-4.74l-3.28-56.55A2.18,2.18,0,0,0,205.9,252.18Z" transform="translate(-178.92 -249.89)"></path><path class="cls-3" d="M182.27,309l19.61,7.73a49.54,49.54,0,0,1,20.43,15l9.57,11.89a1.09,1.09,0,0,1-1.47,1.57l-49-34.65A.89.89,0,0,1,182.27,309Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M228.29,317.16l38.24-25a1.2,1.2,0,0,1,1.73,1.54l-23.83,47.46a5.15,5.15,0,0,1-8.68.83l-9.56-12.39A8.61,8.61,0,0,1,228.29,317.16Z" transform="translate(-178.92 -249.89)"></path><path class="cls-2" d="M432.5,314.24h-4.58c-2.42,0-4-1.07-5.47-4-1.57,1.63-5,5-12.41,5-8,0-12-4.75-12-8.8,0-3.06,1.23-7.87,7.75-9.12,4.1-.79,16.67.37,16.85-4.56,0-1.08-1.44-5-8.22-5s-9.59,3-9.59,6.33l-4.77.06c0-5.81,4.46-10.75,14.7-10.75,8,0,13.14,3.63,13,8.23v15.41c-.11,2.9,3.45,3.13,4.68,3.13Zm-9.83-15c-.72.46-4.49,1.38-10.83,2s-8.08,1.9-8.08,4.83,2.59,4.56,7.52,4.56c6.63,0,10.44-5.23,10.85-7.17A35.09,35.09,0,0,0,422.67,299.28Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M547.58,314.24h-4.38c-2.42,0-4-1.07-5.47-4-1.57,1.63-5,5-12.41,5-8,0-12-4.75-12-8.8,0-3.06,1.23-7.87,7.75-9.12,4.1-.79,16.67.37,16.85-4.56,0-1.08-1.44-5-8.22-5s-9.59,3-9.59,6.33l-4.77.06c0-5.81,4.46-10.75,14.7-10.75,8,0,13.14,3.63,13,8.23v15.41c-.11,2.9,3.24,3.13,4.48,3.13Zm-9.63-15c-.72.46-4.49,1.38-10.83,2s-8.08,1.9-8.08,4.83,2.59,4.56,7.52,4.56c6.63,0,10.44-5.23,10.85-7.17A35.09,35.09,0,0,0,538,299.28Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M654.46,314.24h-4.59c-2.42,0-4-1.07-5.47-4-1.57,1.63-5,5-12.41,5-8,0-12-4.75-12-8.8,0-3.06,1.23-7.87,7.75-9.12,4.1-.79,16.67.37,16.85-4.56,0-1.08-1.44-5-8.22-5s-9.59,3-9.59,6.33l-4.77.06c0-5.81,4.46-10.75,14.7-10.75,8,0,13.14,3.63,13,8.23v15.41c-.11,2.9,3.45,3.13,4.69,3.13Zm-9.84-15c-.72.46-4.49,1.38-10.83,2s-8.08,1.9-8.08,4.83,2.59,4.56,7.52,4.56c6.63,0,10.44-5.23,10.85-7.17A35.09,35.09,0,0,0,644.62,299.28Z" transform="translate(-178.92 -249.89)"></path><path class="cls-2" d="M454.93,289.3H435.06v-4.8H463v4.56l-21.4,20.19h22.35v5H434.1v-5Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M556.83,285.26v3.92H557a8.09,8.09,0,0,1,4.43-3.5,19.39,19.39,0,0,1,6.64-1.09,18.31,18.31,0,0,1,7,1.23,13.76,13.76,0,0,1,8,8.18,16.79,16.79,0,0,1,1,5.83,17.34,17.34,0,0,1-1,5.83,13.1,13.1,0,0,1-3,4.79,13.87,13.87,0,0,1-5,3.22,18.86,18.86,0,0,1-6.94,1.18,20.58,20.58,0,0,1-2.85-.22,18.43,18.43,0,0,1-3.12-.73,13,13,0,0,1-2.92-1.37,8.32,8.32,0,0,1-2.32-2.16h-.13v14.91h-5.7v-40Zm20.5,10.28a10,10,0,0,0-1.95-3.45,9.26,9.26,0,0,0-3.35-2.41,11.88,11.88,0,0,0-4.8-.9,11.39,11.39,0,0,0-4.9,1,9.42,9.42,0,0,0-3.29,2.49,9.66,9.66,0,0,0-1.85,3.5,14.25,14.25,0,0,0,0,8.1,9.21,9.21,0,0,0,5.3,5.94,12.34,12.34,0,0,0,5,.92,11.33,11.33,0,0,0,4.93-1,8.69,8.69,0,0,0,3.19-2.52,10,10,0,0,0,1.74-3.59,16,16,0,0,0,.54-4.15A12.53,12.53,0,0,0,577.32,295.55Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M589,280.05v-5.83h5.48v5.83Zm5.48,5.21v29H589v-29Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M617.88,285v4.26h-8.05v18.61a4.62,4.62,0,0,0,.16,1.36,1.41,1.41,0,0,0,.62.79,3,3,0,0,0,1.27.37q.82.08,2.12.09h4v4.26h-5.7a22.84,22.84,0,0,1-3.69-.26,5.84,5.84,0,0,1-2.48-.94,7.89,7.89,0,0,1-2.12-5.23V289.27h-5.95V285H604v-8.73h5.81V285Z" transform="translate(-178.92 -249.89)"></path><path class="cls-2" d="M336.44,273.5v40.74H331V273.5Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M663.64,273.5v40.74h-5.47V273.5Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M594.48,285.26v29H589v-29Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M594.48,274.22v6H589v-6Z" transform="translate(-178.92 -249.89)"></path><path class="cls-2" d="M382.21,283.79c-5,0-9,2.57-12.42,5.61v0c-2.53-5.36-8.21-5.64-9.9-5.64-5,0-8.1,1.73-11.39,4.83h-.14v-3.33h-5.5v29h5.84V295.53c0-3,4.31-6.78,9.27-6.71,3.33,0,7.22,1.47,7.22,5.72v19.7H371V295.53c0-3,3.6-6.72,9.27-6.71,3.33,0,6.88,1.47,6.88,5.72v19.7H393V295.53C393,284.63,384.41,283.79,382.21,283.79Z" transform="translate(-178.92 -249.89)"></path><path class="cls-2" d="M310,274.22h-7.52l-17.58,40.09h6.31l5.63-12h19l4.83,12h6.93Zm-11.73,23.15,7.42-16.72h1.09l7.18,16.72Z" transform="translate(-178.92 -249.89)"></path><path class="cls-4" d="M503.11,298.78a13.48,13.48,0,0,1-1.16,4.58,11,11,0,0,1-2.67,3.66,12.39,12.39,0,0,1-4.06,2.4,15.51,15.51,0,0,1-5.38.86,17.09,17.09,0,0,1-7.09-1.34,13.49,13.49,0,0,1-4.86-3.6,14.55,14.55,0,0,1-2.8-5.3,22.55,22.55,0,0,1-.9-6.45,20.19,20.19,0,0,1,.9-6,14.73,14.73,0,0,1,2.8-5.16,13.55,13.55,0,0,1,4.83-3.6,16.87,16.87,0,0,1,7.05-1.34,15.83,15.83,0,0,1,8.34,2.12,11.57,11.57,0,0,1,4.86,8.7s4.44-.09,6,0a16.6,16.6,0,0,0-2.35-7.94,14.73,14.73,0,0,0-4.19-4,19.64,19.64,0,0,0-5.73-2.46,27,27,0,0,0-6.83-.84,25,25,0,0,0-9.37,1.65,19.34,19.34,0,0,0-6.83,4.49,19,19,0,0,0-4.15,6.67,23.32,23.32,0,0,0-1.42,8.18,24.61,24.61,0,0,0,1.32,8.15,18.09,18.09,0,0,0,4,6.59A18.28,18.28,0,0,0,480,313.1a25.14,25.14,0,0,0,9.34,1.59q8.82,0,13.91-4.19t6-11.72Z" transform="translate(-178.92 -249.89)"></path></svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-altimeter-capital.png b/website/images/logos/logo-altimeter-capital.png
new file mode 100644
index 00000000000..7c0d3b25b8d
Binary files /dev/null and b/website/images/logos/logo-altimeter-capital.png differ
diff --git a/website/images/logos/logo-benchmark-capital.png b/website/images/logos/logo-benchmark-capital.png
new file mode 100644
index 00000000000..626599c6b35
Binary files /dev/null and b/website/images/logos/logo-benchmark-capital.png differ
diff --git a/website/images/logos/logo-cloudflare.svg b/website/images/logos/logo-cloudflare.svg
new file mode 100644
index 00000000000..e4bf4f2f803
--- /dev/null
+++ b/website/images/logos/logo-cloudflare.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1062px" height="155px" viewBox="0 0 1062 155" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>cf-logo-h</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="cf-logo-h" fill-rule="nonzero">
+            <g id="Group" transform="translate(367.600000, 95.800000)" fill="#404041">
+                <polygon id="Path" points="77.1 1.1 92.7 1.1 92.7 43.6 119.8 43.6 119.8 57.2 77.1 57.2"></polygon>
+                <path d="M135.9,29.3 L135.9,29.2 C135.9,13.1 148.9,0 166.2,0 C183.5,0 196.3,12.9 196.3,29 L196.3,29.2 C196.3,45.3 183.3,58.4 166,58.4 C148.8,58.3 135.9,45.4 135.9,29.3 M180.5,29.3 L180.5,29.2 C180.5,21.1 174.7,14.1 166.1,14.1 C157.6,14.1 151.9,21 151.9,29.1 L151.9,29.3 C151.9,37.4 157.7,44.4 166.2,44.4 C174.8,44.3 180.5,37.4 180.5,29.3" id="Shape"></path>
+                <path d="M215.4,32.6 L215.4,1.1 L231.2,1.1 L231.2,32.3 C231.2,40.4 235.3,44.2 241.5,44.2 C247.7,44.2 251.8,40.5 251.8,32.7 L251.8,1.1 L267.6,1.1 L267.6,32.2 C267.6,50.3 257.3,58.2 241.3,58.2 C225.4,58.3 215.4,50.2 215.4,32.6" id="Path"></path>
+                <path d="M291.4,1.1 L313.1,1.1 C333.1,1.1 344.8,12.6 344.8,28.8 L344.8,29 C344.8,45.2 333,57.2 312.8,57.2 L291.5,57.2 L291.4,1.1 L291.4,1.1 Z M313.3,43.4 C322.6,43.4 328.8,38.3 328.8,29.2 L328.8,29 C328.8,20 322.6,14.8 313.3,14.8 L307,14.8 L307,43.3 L313.3,43.4 L313.3,43.4 Z" id="Shape"></path>
+                <polygon id="Path" points="367.3 1.1 412.2 1.1 412.2 14.8 382.8 14.8 382.8 24.3 409.4 24.3 409.4 37.2 382.8 37.2 382.8 57.2 367.3 57.2"></polygon>
+                <polygon id="Path" points="433.8 1.1 449.3 1.1 449.3 43.6 476.5 43.6 476.5 57.2 433.8 57.2"></polygon>
+                <path d="M517.1,0.7 L532.1,0.7 L556,57.2 L539.3,57.2 L535.2,47.2 L513.6,47.2 L509.6,57.2 L493.3,57.2 L517.1,0.7 Z M530.8,35.1 L524.6,19.2 L518.3,35.1 L530.8,35.1 Z" id="Shape"></path>
+                <path d="M576,1.1 L602.5,1.1 C611.1,1.1 617,3.3 620.8,7.2 C624.1,10.4 625.8,14.7 625.8,20.3 L625.8,20.5 C625.8,29.1 621.2,34.8 614.3,37.7 L627.7,57.3 L609.7,57.3 L598.4,40.3 L591.6,40.3 L591.6,57.3 L576.1,57.3 L576,1.1 L576,1.1 Z M601.8,28.1 C607.1,28.1 610.1,25.5 610.1,21.5 L610.1,21.2 C610.1,16.8 606.9,14.6 601.7,14.6 L591.5,14.6 L591.5,28.1 L601.8,28.1 L601.8,28.1 Z" id="Shape"></path>
+                <polygon id="Path" points="648.2 1.1 693.3 1.1 693.3 14.4 663.6 14.4 663.6 22.8 690.5 22.8 690.5 35.1 663.6 35.1 663.6 44 693.7 44 693.7 57.2 648.2 57.2"></polygon>
+                <path d="M43.1,35.9 C40.9,40.8 36.3,44.3 30.3,44.3 C21.8,44.3 16,37.2 16,29.2 L16,29 C16,20.9 21.7,14 30.2,14 C36.6,14 41.5,17.9 43.5,23.3 L59.9,23.3 C57.3,9.9 45.5,0 30.3,0 C13,0 5.68434189e-14,13.1 5.68434189e-14,29.2 L5.68434189e-14,29.4 C5.68434189e-14,45.5 12.8,58.4 30.1,58.4 C44.9,58.4 56.5,48.8 59.5,36 L43.1,35.9 L43.1,35.9 Z" id="Path"></path>
+            </g>
+            <g id="Group">
+                <polygon id="Path" fill="#FFFFFF" points="312.8 91.6 269.9 67 262.5 63.8 87 65.1 87 154.1 312.8 154.2"></polygon>
+                <path d="M234.7,146 C236.8,138.8 236,132.2 232.5,127.3 C229.3,122.8 223.9,120.2 217.4,119.9 L94.3,118.3 C93.5,118.3 92.8,117.9 92.4,117.3 C92,116.7 91.9,115.9 92.1,115.1 C92.5,113.9 93.7,113 95,112.9 L219.2,111.3 C233.9,110.6 249.9,98.7 255.5,84.1 L262.6,65.6 C262.9,64.8 263,64 262.8,63.2 C254.8,27 222.5,1.42108547e-14 183.9,1.42108547e-14 C148.3,1.42108547e-14 118.1,23 107.3,54.9 C100.3,49.7 91.4,46.9 81.8,47.8 C64.7,49.5 51,63.2 49.3,80.3 C48.9,84.7 49.2,89 50.2,93 C22.3,93.8 1.42108547e-14,116.6 1.42108547e-14,144.7 C1.42108547e-14,147.2 0.2,149.7 0.5,152.2 C0.7,153.4 1.7,154.3 2.9,154.3 L230.1,154.3 C231.4,154.3 232.6,153.4 233,152.1 L234.7,146 Z" id="Path" fill="#F38020"></path>
+                <path d="M273.9,66.9 C272.8,66.9 271.6,66.9 270.5,67 C269.7,67 269,67.6 268.7,68.4 L263.9,85.1 C261.8,92.3 262.6,98.9 266.1,103.8 C269.3,108.3 274.7,110.9 281.2,111.2 L307.4,112.8 C308.2,112.8 308.9,113.2 309.3,113.8 C309.7,114.4 309.8,115.3 309.6,116 C309.2,117.2 308,118.1 306.7,118.2 L279.4,119.8 C264.6,120.5 248.7,132.4 243.1,147 L241.1,152.1 C240.7,153.1 241.4,154.1 242.5,154.1 L336.3,154.1 C337.4,154.1 338.4,153.4 338.7,152.3 C340.3,146.5 341.2,140.4 341.2,134.1 C341.2,97 311.1,66.9 273.9,66.9" id="Path" fill="#FAAE40"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-coatue.png b/website/images/logos/logo-coatue.png
new file mode 100644
index 00000000000..c9331141f5a
Binary files /dev/null and b/website/images/logos/logo-coatue.png differ
diff --git a/website/images/logos/logo-deutsche-bank.png b/website/images/logos/logo-deutsche-bank.png
new file mode 100644
index 00000000000..ba1de3a2873
Binary files /dev/null and b/website/images/logos/logo-deutsche-bank.png differ
diff --git a/website/images/logos/logo-ebay.png b/website/images/logos/logo-ebay.png
new file mode 100644
index 00000000000..6234cd2ac22
Binary files /dev/null and b/website/images/logos/logo-ebay.png differ
diff --git a/website/images/logos/logo-firstmark.svg b/website/images/logos/logo-firstmark.svg
new file mode 100644
index 00000000000..e529766bae4
--- /dev/null
+++ b/website/images/logos/logo-firstmark.svg
@@ -0,0 +1,579 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="206px" height="15px" viewBox="0 0 206 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>logo-firstmark</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="logo-firstmark" transform="translate(0.000000, 0.650000)" fill-rule="nonzero">
+            <polyline id="Fill-1" fill="#0F0F0F" points="12.1 2.65 2 2.65 2 5.85 9 5.85 9 7.75 2 7.75 2 13.25 0 13.25 0 0.75 12.1 0.75 12.1 2.65"></polyline>
+            <polygon id="Fill-2" fill="#0F0F0F" points="18.5 13.25 20.5 13.25 20.5 0.75 18.5 0.75"></polygon>
+            <path d="M37.4,6.65 C38.9,6.65 39.7,6.05 39.7,4.75 C39.7,3.35 38.9,2.65 37.2,2.65 L31,2.65 L31,6.65 L37.4,6.65 L37.4,6.65 Z M41.8,13.25 L39.5,13.25 L36.3,8.45 L31,8.45 L31,13.25 L29,13.25 L29,0.75 L37.7,0.75 C39,0.75 39.9,1.15 40.7,1.85 C41.4,2.55 41.8,3.55 41.8,4.75 C41.8,5.85 41.5,6.65 40.9,7.35 C40.4,7.95 39.6,8.35 38.7,8.45 L41.8,13.25 Z" id="Fill-3" fill="#0F0F0F"></path>
+            <path d="M59.9,3.75 C58.1,2.75 56.3,2.35 54.5,2.35 C53.3,2.35 52.3,2.55 51.7,2.75 C51,3.05 50.7,3.45 50.7,3.95 C50.7,4.55 51,4.95 51.7,5.15 C52.2,5.35 53,5.55 54.2,5.55 C55.9,5.65 56.9,5.75 57.5,5.85 C59,6.05 60.1,6.45 60.8,7.05 C61.5,7.65 61.9,8.45 61.9,9.45 C61.9,10.75 61.3,11.75 60.2,12.55 C59.1,13.25 57.5,13.65 55.4,13.65 C52.3,13.65 50,12.95 48.3,11.55 L49.4,10.05 C51.3,11.25 53.3,11.85 55.5,11.85 C56.9,11.85 58,11.65 58.8,11.25 C59.5,10.85 59.9,10.35 59.9,9.65 C59.9,8.85 59.4,8.35 58.4,8.05 C57.9,7.95 56.5,7.75 54.3,7.65 C52.3,7.55 50.9,7.25 50.1,6.85 C49.2,6.35 48.7,5.55 48.7,4.45 C48.7,3.25 49.2,2.35 50.3,1.65 C51.4,0.95 52.8,0.65 54.8,0.65 C57.4,0.65 59.5,1.25 61.3,2.45 L59.9,3.75" id="Fill-4" fill="#0F0F0F"></path>
+            <polyline id="Fill-5" fill="#0F0F0F" points="80 2.65 74.3 2.65 74.3 13.25 72.3 13.25 72.3 2.65 66.6 2.65 66.6 0.75 80 0.75 80 2.65"></polyline>
+            <polyline id="Fill-6" fill="#0F0F0F" points="102.7 13.25 100.8 13.25 100.8 3.05 100.7 3.05 94.5 11.25 88.3 3.05 88.3 3.05 88.3 13.25 86.3 13.25 86.3 0.75 88.8 0.75 94.5 8.35 100.3 0.75 102.7 0.75 102.7 13.25"></polyline>
+            <path d="M119.8,8.65 L116.7,2.55 L113.6,8.65 L119.8,8.65 Z M124.3,13.25 L122.1,13.25 L120.7,10.45 L112.6,10.45 L111.2,13.25 L109,13.25 L115.3,0.75 L117.8,0.75 L124.3,13.25 Z" id="Fill-7" fill="#0F0F0F"></path>
+            <path d="M138.3,6.65 C139.8,6.65 140.6,6.05 140.6,4.75 C140.6,3.35 139.8,2.65 138.1,2.65 L132,2.65 L132,6.65 L138.3,6.65 L138.3,6.65 Z M142.8,13.25 L140.5,13.25 L137.3,8.45 L132,8.45 L132,13.25 L130,13.25 L130,0.75 L138.7,0.75 C140,0.75 140.9,1.15 141.7,1.85 C142.4,2.55 142.8,3.55 142.8,4.75 C142.8,5.85 142.5,6.65 141.9,7.35 C141.4,7.95 140.6,8.35 139.7,8.45 L142.8,13.25 Z" id="Fill-8" fill="#0F0F0F"></path>
+            <polyline id="Fill-9" fill="#0F0F0F" points="163.9 13.25 161.3 13.25 155.6 6.75 152 9.45 152 13.25 150 13.25 150 0.75 152 0.75 152 7.25 160.4 0.75 163.2 0.75 157.1 5.55 163.9 13.25"></polyline>
+            <path d="M176.1,0.85 C176,0.85 176.1,0.95 176.1,0.85" id="Fill-10" fill="#F6EB3B"></path>
+            <path d="M181.9,0.85 C181.8,0.85 181.9,0.95 181.9,0.85" id="Fill-11" fill="#F6EB3B"></path>
+            <path d="M182,0.85 C181.9,0.85 182,0.95 182,0.85" id="Fill-12" fill="#F6EB3B"></path>
+            <path d="M182,0.85 C182,0.85 182.1,0.95 182,0.85" id="Fill-13" fill="#F6EB3B"></path>
+            <path d="M175.8,1.15 C175.9,0.75 175.9,1.55 175.8,1.15" id="Fill-14" fill="#F6EB3B"></path>
+            <path d="M175.9,1.15 C175.9,1.05 175.9,1.15 175.9,1.15" id="Fill-15" fill="#F6EB3B"></path>
+            <path d="M176,1.15 C176,1.15 176,1.25 176,1.15" id="Fill-16" fill="#F6EB3B"></path>
+            <path d="M191.6,12.25 C191.7,12.05 191.5,12.05 191.5,12.15 C191.5,12.15 191.6,12.25 191.6,12.25 Z M191.2,11.55 C191,11.55 191,11.55 190.8,11.45 C190.8,11.75 191.2,11.55 191.2,11.55 Z M191.6,11.35 C191.6,11.35 191.6,11.25 191.5,11.25 C191.4,11.45 191.6,11.45 191.6,11.35 Z M190.7,11.15 C190.7,11.15 190.9,11.25 190.9,11.05 C190.8,10.95 190.7,11.05 190.7,11.15 Z M190.6,11.05 C190.5,11.05 190.6,10.85 190.5,10.95 C190.5,11.05 190.6,11.25 190.6,11.05 Z M191.6,10.25 C191.7,10.05 191.5,10.05 191.5,10.15 C191.5,10.25 191.5,10.35 191.6,10.25 Z M194.3,9.95 C194.3,9.95 194.3,10.05 194.3,9.95 C194.4,10.05 194.4,9.95 194.5,9.95 C194.8,9.95 194.4,9.75 194.3,9.95 C194.3,9.95 194.3,9.95 194.3,9.95 C194.2,9.85 194.2,9.95 194.2,10.05 C194.3,10.05 194.3,9.95 194.3,9.95 Z M191.6,10.25 C191.8,10.35 192.5,10.35 192.8,10.05 C192.3,10.05 192,9.85 191.6,10.25 Z M192.6,9.55 C192.6,9.55 192.6,9.55 192.6,9.55 C192.7,9.35 192.5,9.35 192.6,9.55 C192.6,9.45 192.6,9.45 192.6,9.55 Z M191.3,9.55 C191.4,9.55 191.4,9.75 191.5,9.55 C191.5,9.55 191.5,9.45 191.5,9.45 C191.5,9.45 191.6,9.45 191.6,9.35 C191.4,9.35 191.3,9.25 191.3,9.55 Z M190.1,9.45 C190.1,9.55 190.1,9.55 190.1,9.45 C190.2,9.45 190.1,9.35 190.1,9.45 Z M193,9.15 C193,9.45 193.1,9.25 193.2,9.25 C193.3,8.95 193.1,9.05 193,9.15 Z M193.7,9.05 C193.7,9.15 193.7,9.15 193.8,9.15 C193.8,9.15 193.9,8.85 193.8,8.85 C193.8,9.05 193.8,9.05 193.7,9.05 C193.7,8.95 193.6,8.95 193.6,8.95 C193.6,9.15 193.7,9.05 193.7,9.05 Z M193.4,9.05 C193.4,9.05 193.4,9.15 193.4,9.05 C193.4,9.05 193.5,9.05 193.4,9.05 C193.5,9.15 193.5,9.15 193.5,9.15 C193.5,9.15 193.6,9.15 193.6,9.15 C193.6,9.05 193.6,9.05 193.6,8.95 C193.5,9.05 193.4,8.85 193.4,9.05 Z M190.9,9.25 C190.9,9.35 191,9.35 191.1,9.35 C191.1,9.25 191.1,9.15 191.1,9.15 C191.1,9.35 190.9,9.05 190.9,9.25 Z M191.3,9.05 C191.3,9.15 191.3,9.15 191.3,9.05 C191.4,8.95 191.4,9.15 191.5,9.15 C191.5,8.85 191.4,9.05 191.3,8.95 C191.3,8.95 191.3,9.05 191.3,9.05 Z M190.4,9.05 C190.3,9.05 190.2,9.05 190.2,9.25 C190.3,9.15 190.4,9.35 190.4,9.05 C190.4,9.05 190.4,8.95 190.4,9.05 Z M193.6,8.65 C193.5,8.65 193.4,8.65 193.4,8.85 C193.5,8.85 193.7,9.05 193.7,8.75 C193.5,8.85 193.8,8.45 193.6,8.55 C193.6,8.55 193.6,8.65 193.6,8.65 Z M194.1,8.45 C194.2,8.45 194.3,8.45 194.3,8.25 C194.2,8.35 194.1,8.35 194.1,8.45 Z M193.4,8.25 C193.4,8.15 193.5,8.15 193.5,8.05 C193.4,7.95 193.3,8.15 193.4,8.25 Z M194.9,6.65 C194.9,6.65 194.7,6.55 194.7,6.75 C194.8,6.75 194.9,6.85 194.9,6.65 Z M196,6.45 C196.2,6.35 196.4,6.75 196.5,6.35 C196.3,6.55 196.1,6.25 196,6.45 Z M194.6,6.25 C194.7,6.35 194.7,6.25 194.6,6.25 C194.6,6.25 194.6,6.15 194.6,6.15 C194.5,6.15 194.9,6.15 194.9,6.35 C195,6.45 194.5,6.25 194.6,6.25 Z M196.1,6.15 C196.1,5.95 196.1,5.85 196,5.95 C196,6.15 196.1,6.05 196.1,6.15 Z M194.8,6.35 C194.8,6.05 195,6.35 195,5.95 C194.9,6.05 194.9,6.05 194.8,5.95 C194.8,6.15 194.7,6.25 194.8,6.35 Z M172.3,6.85 C172.4,6.75 172.4,6.95 172.5,6.95 C172.5,6.65 172.4,6.65 172.3,6.65 C172.4,6.55 172.3,6.35 172.2,6.25 C172.2,6.45 172.2,6.65 172.3,6.85 Z M194.3,5.25 C194.5,5.55 194.6,5.15 195,5.35 C195,5.15 195,5.05 195.1,5.15 C195.1,5.25 195,5.35 195.1,5.35 C195.3,5.05 195.8,5.35 196.1,5.05 C195.3,4.85 195.1,5.05 194.3,5.25 Z M193.3,4.65 C193.3,4.65 193.1,4.55 193.1,4.75 C193.2,4.75 193.4,4.85 193.3,4.65 Z M191,4.95 C191.1,4.95 191.1,4.75 191.1,4.65 C191,4.65 191,4.65 191,4.75 C191.1,4.75 191.1,4.85 191,4.95 Z M193.5,4.35 C193.4,4.45 193.5,4.45 193.5,4.35 C193.5,4.35 193.5,4.35 193.5,4.35 C193.6,4.55 193.5,4.75 193.4,4.45 C193.4,4.55 193.4,4.65 193.4,4.75 C193.5,4.85 193.5,4.55 193.5,4.75 C193.5,4.75 193.5,4.75 193.5,4.85 C193.6,4.75 193.7,4.65 193.7,4.45 C193.5,4.65 193.6,4.25 193.7,4.15 C193.6,4.25 193.4,4.15 193.5,4.35 Z M196,4.05 C196,3.75 196.2,4.05 196.1,3.75 C196.1,3.75 196,3.75 196,3.75 C196,3.75 195.9,4.05 196,4.05 Z M195.9,4.05 C195.9,4.15 195.9,3.95 195.9,4.05 C195.9,3.95 195.9,3.95 195.9,4.05 C195.9,3.85 195.9,3.85 195.9,4.05 C195.9,3.95 195.9,3.85 195.8,3.85 C195.8,3.85 195.8,4.05 195.9,4.05 Z M196.5,3.65 C196.6,3.65 196.6,3.65 196.5,3.65 C196.7,3.45 196.5,3.45 196.5,3.65 C196.5,3.55 196.5,3.55 196.5,3.65 Z M192.6,3.85 C192.6,3.75 192.5,3.75 192.6,3.85 C192.5,3.85 192.6,3.95 192.6,3.85 Z M195.7,3.45 C195.7,3.65 196.7,3.55 196.6,3.55 C196.6,3.75 195.8,3.65 195.9,3.65 C195.8,3.65 195.7,3.55 195.8,3.35 C195.7,3.35 196.7,3.35 196.7,3.35 C196.7,3.45 195.6,3.45 195.7,3.45 Z M196.6,3.35 C196.6,3.35 196.6,3.45 196.6,3.45 C196.6,3.55 196.7,3.25 196.6,3.35 C196.6,3.25 196.6,3.35 196.6,3.35 Z M192.3,3.45 C192.3,3.45 192.3,3.55 192.3,3.45 C192.3,3.35 192.3,3.35 192.3,3.45 Z M194.7,3.15 C194.7,3.05 194.7,3.05 194.7,3.15 C194.8,3.05 194.8,3.05 194.8,3.05 C194.8,3.05 194.8,3.05 194.7,3.05 C194.7,3.05 194.7,3.05 194.7,3.15 Z M193.2,3.15 C193.2,3.15 193.2,3.15 193.2,3.15 C193.3,3.05 193.3,3.05 193.3,3.05 C193.3,3.05 193.3,3.05 193.2,3.05 C193.2,3.05 193.2,3.15 193.2,3.15 Z M193,3.25 C193.1,3.25 193.1,3.25 193.1,3.05 C193,3.05 193,3.05 193,3.25 Z M192.7,3.25 C192.8,3.25 192.8,3.25 192.7,3.25 C192.8,3.15 192.8,3.15 192.8,3.15 C192.8,3.15 192.8,3.15 192.7,3.15 C192.7,3.15 192.7,3.15 192.7,3.25 Z M193.4,3.05 C193.5,3.05 193.6,3.05 193.6,2.85 C193.5,2.85 193.4,2.85 193.4,3.05 Z M185.5,2.85 C185.4,2.85 185.3,2.75 185.3,2.95 C185.4,2.85 185.5,2.95 185.5,2.85 Z M184.5,2.95 C184.5,3.15 184.7,2.85 184.5,2.95 C184.5,2.85 184.4,2.95 184.5,2.95 Z M172,3.35 C172.1,3.35 172.1,3.35 172.1,3.25 C172.1,3.15 172.1,3.05 172,3.05 C172.1,3.25 172,3.15 172,3.35 Z M185,2.95 C185,2.95 185.2,3.05 185.2,2.85 C185.1,2.75 185,2.75 185,2.95 Z M191.2,2.35 C191.2,2.35 191.1,2.35 191.1,2.45 C191.1,2.55 191.2,2.55 191.2,2.35 Z M191,2.55 C191,2.55 191,2.55 191,2.55 C191.1,2.45 191.1,2.45 191.1,2.45 C191.1,2.45 191.1,2.45 191,2.45 C191,2.45 191,2.45 191,2.55 Z M184.7,2.85 C184.6,2.85 184.6,2.85 184.6,2.75 C184.6,2.95 184.8,2.95 184.7,2.85 Z M171.9,3.05 C172,3.05 172,2.95 172,2.95 C172,2.85 171.9,2.85 171.9,3.05 Z M191.7,2.25 C191.7,2.25 191.6,2.25 191.6,2.35 C191.7,2.35 191.7,2.35 191.7,2.25 Z M191.3,2.35 C191.3,2.45 191.3,2.45 191.3,2.35 C191.6,2.45 191.5,2.15 191.3,2.35 Z M186,2.55 C186,2.55 185.9,2.55 185.9,2.65 C186,2.65 186,2.65 186,2.55 Z M193.2,2.15 C193.1,2.25 193.2,2.25 193.2,2.15 C193.3,2.35 193.3,1.95 193.2,2.15 Z M191.8,2.35 C191.9,2.15 192.1,2.55 192.2,2.15 C192.1,2.15 191.8,2.05 191.8,2.35 Z M192.6,2.05 C192.5,1.95 192.5,2.15 192.4,1.95 C192.4,2.25 192.6,2.25 192.6,2.05 Z M192.2,2.35 C192.2,2.25 192.3,2.25 192.3,2.35 C192.3,2.25 192.3,2.25 192.4,2.15 C192.3,2.15 192.3,2.15 192.3,2.25 C192.3,2.15 192.3,2.15 192.2,2.15 C192.1,2.15 192.1,2.25 192.2,2.35 Z M192.3,2.65 C192.2,2.65 192.1,2.35 192,2.75 C192.2,2.75 192.2,2.95 192.3,2.65 C192.3,2.65 192.3,2.55 192.4,2.55 C192.3,2.85 192.5,3.15 192.3,2.95 C192.4,3.45 192.7,3.15 192.9,3.05 C193,3.05 193,3.15 193.1,3.15 C193.1,2.95 193.1,2.75 193.3,2.75 C193.3,3.15 193.6,2.65 193.7,3.05 C193.8,2.35 194,2.95 194.3,2.95 C194.2,2.65 194.4,2.55 194.2,2.45 C194.1,2.65 193.7,2.45 193.6,2.35 C193.8,2.45 193.9,2.05 194,2.25 C194,2.05 194,1.65 193.9,1.95 C193.9,2.45 193,1.95 193,2.75 C192.9,2.55 192.6,2.95 192.7,2.45 C192.6,2.55 192.3,2.35 192.3,2.65 Z M195.3,1.55 C195.2,1.55 195.1,1.45 195.1,1.65 C195.2,1.55 195.3,1.75 195.3,1.55 Z M195,1.55 C195,1.55 194.9,1.55 194.9,1.65 C195,1.65 195,1.65 195,1.55 Z M194.2,1.85 C194.3,1.85 194.3,1.85 194.3,1.65 C194.3,1.65 194.3,1.65 194.3,1.55 C194.3,1.55 194.3,1.55 194.2,1.55 C194.2,1.75 194.2,1.75 194.2,1.85 Z M194.3,1.65 C194.4,1.95 194.6,1.85 194.6,1.65 C194.5,1.45 194.5,1.55 194.3,1.65 Z M194.1,1.65 C194,1.65 194,1.75 194.1,1.65 C194.1,1.85 194.2,2.15 194.2,1.95 C194.1,1.95 194.1,1.65 194.1,1.65 C194.1,1.65 194.1,1.65 194.1,1.65 C194.1,1.55 194.1,1.55 194.1,1.65 Z M193.4,1.85 C193.2,1.95 192.9,1.95 192.7,2.15 C192.9,2.05 193.3,2.05 193.4,1.95 C193.4,1.95 193.4,1.85 193.4,1.85 C193.6,2.05 193.8,1.85 194,1.75 C194,1.75 193.9,1.75 193.9,1.65 C194,1.65 194.1,1.65 194.1,1.45 C193.8,1.55 193.3,1.55 193.4,1.85 Z M192.6,1.55 C192.6,1.95 192.7,1.15 192.6,1.55 C192.6,1.55 192.5,1.55 192.6,1.55 Z M188.1,2.15 C188.1,2.15 188.2,2.15 188.2,2.15 C188.2,1.95 188.2,1.95 188.1,1.95 C188.1,2.05 188.1,2.05 188.1,2.15 Z M186.1,2.05 C186.1,2.05 186,2.05 186,2.15 C186.1,2.15 186.1,2.15 186.1,2.05 Z M192.9,1.55 C193,1.55 193,1.65 193.1,1.45 C193.1,1.45 193.1,1.35 193,1.35 C193,1.45 192.8,1.45 192.9,1.55 Z M192.2,1.65 C192.3,1.65 192.4,1.55 192.3,1.35 C192.2,1.35 192.1,1.45 192.2,1.65 Z M190,1.75 C190,1.75 190.1,1.75 190.1,1.75 C190.1,1.65 190.1,1.35 190,1.45 C190,1.65 189.9,1.65 190,1.75 Z M188.4,2.15 C188.5,2.25 188.5,1.75 188.4,1.85 C188.4,1.95 188.4,2.05 188.4,2.15 Z M193.2,1.45 C193.3,1.45 193.3,1.35 193.3,1.35 C193.2,1.25 193.2,1.25 193.2,1.45 Z M192.1,1.35 C192.2,1.35 192.2,1.25 192.2,1.25 C192.1,1.15 192,1.15 192.1,1.35 Z M192.4,1.15 C192.4,1.25 192.5,1.25 192.4,1.15 C192.5,1.15 192.4,1.05 192.4,1.15 Z M192.3,1.15 C192.3,1.05 192.2,1.05 192.2,1.15 C192.2,1.35 192.3,1.35 192.3,1.15 Z M192,1.25 C192,1.25 192,1.25 192,1.25 C192.1,1.15 192.1,1.15 192.1,1.15 C192.1,1.15 192.1,1.15 192,1.15 C191.9,1.15 192,1.25 192,1.25 Z M191.7,1.25 C191.8,1.35 191.8,1.15 191.7,1.25 C191.7,1.05 191.7,1.25 191.7,1.25 Z M190.7,1.35 C190.8,1.35 190.9,1.45 190.8,1.25 C190.8,1.25 190.7,1.25 190.7,1.25 C190.7,1.25 190.7,1.25 190.7,1.35 Z M190.6,1.15 C190.6,1.25 190.5,1.05 190.4,1.15 C190.4,1.55 190.7,1.35 190.6,1.15 Z M190.2,1.35 C190.3,1.15 190.1,1.15 190.1,1.25 C190.2,1.25 190.2,1.35 190.2,1.35 Z M189.7,1.35 C189.8,1.15 189.5,1.15 189.5,1.25 C189.6,1.35 189.6,1.45 189.7,1.35 Z M189.7,1.35 C189.6,1.35 189.5,1.35 189.4,1.35 C189.4,1.75 189.7,1.75 189.7,1.35 Z M188.5,1.65 C188.5,1.65 188.5,1.75 188.5,1.65 C188.6,1.75 188.7,1.75 188.7,1.45 C188.6,1.55 188.6,1.35 188.5,1.65 Z M188.4,1.45 C188.2,1.45 188.1,1.45 187.9,1.45 C188,1.95 188.4,1.75 188.4,1.45 Z M187.8,1.45 C187.8,1.45 187.2,1.55 187.2,1.55 C187.2,1.65 187.8,1.55 187.8,1.45 Z M186.2,1.65 C186.1,1.55 186,1.55 185.9,1.55 C185.9,1.95 186.1,1.85 186.2,1.65 Z M185.6,1.85 C185.7,1.85 185.7,1.75 185.7,1.65 C185.7,1.65 185.6,1.65 185.6,1.85 Z M185,1.95 C185.3,2.05 185.3,2.05 185.6,1.75 C185.5,1.65 185,1.55 185,1.95 Z M184.1,1.85 C184.2,1.85 184.3,1.85 184.2,1.65 C184.2,1.65 184.1,1.65 184.1,1.65 C184.1,1.75 184.1,1.85 184.1,1.85 Z M193.4,1.05 C193.3,1.05 193.2,0.95 193.2,1.15 C193,1.05 192.6,0.95 192.5,1.35 C192.7,1.25 192.8,1.25 193,1.35 C193,1.55 193.1,1.55 193.1,1.45 C193,1.45 193,1.35 193,1.35 C193,1.15 193.1,1.45 193.1,1.25 C193.2,1.15 193.3,1.25 193.4,1.05 C193.4,0.95 193.4,0.95 193.4,1.05 Z M172.7,1.25 C172.8,1.25 172.9,1.35 172.8,1.15 C172.7,1.15 172.7,1.15 172.7,1.25 Z M190.5,12.65 C190.5,12.75 190.3,12.75 190.3,12.95 C190.2,12.75 190.1,12.65 190,12.85 C189.8,12.45 189.9,13.05 189.6,12.65 C189.5,12.65 189.6,12.75 189.6,12.85 C189.4,12.75 189,12.95 188.7,13.05 C188.6,13.05 188.3,12.85 188.4,13.25 C188.2,13.05 188.1,13.15 187.9,13.35 C187.8,12.95 187.5,13.55 187.4,13.15 C187.2,13.05 186.6,13.35 186.4,13.35 C186.2,13.35 186,12.95 185.8,13.35 C185.7,12.85 185.5,13.55 185.4,13.05 C185,13.75 184.5,12.85 183.9,13.45 C183.8,13.45 183.8,13.25 183.7,13.25 C183.5,13.65 172.2,13.05 171.9,13.15 C171.6,12.95 171.9,12.15 171.8,11.95 C171.8,11.85 171.8,11.35 171.7,11.05 C171.6,10.45 171.7,10.15 171.7,9.65 C171.5,9.45 171.6,8.85 171.6,8.55 C171.9,8.65 171.9,7.95 172,7.75 C172,7.75 172,7.45 172,7.25 C172,7.15 172.1,7.15 172.1,7.15 C172.2,7.25 172.2,6.45 172.1,6.45 C172.1,5.85 172,4.45 171.9,3.85 C172,3.85 172.1,3.65 171.9,3.75 C172,3.55 172.2,3.75 172.2,3.55 C172.1,3.35 172,3.35 171.9,3.35 C172,3.05 171.9,3.05 171.9,2.75 C172,2.75 172,2.65 172,2.65 C172,2.55 171.9,2.55 171.9,2.55 C171.9,2.45 171.9,2.25 172,2.35 C172,2.15 171.9,2.25 171.9,1.95 C171.9,1.95 172,1.85 172,1.85 C172.1,1.15 172.5,0.85 172.8,1.05 C172.9,1.05 178.5,0.65 178.6,0.75 C178.5,1.05 178.7,0.75 178.7,0.75 C178.7,0.95 178.8,1.05 178.9,1.05 C178.9,1.35 179,1.25 179.1,1.35 C179.2,1.05 183.5,1.25 183.6,0.95 C183.7,0.85 183.9,1.05 183.8,1.25 C183.8,1.25 183.9,1.25 183.9,1.35 C184.2,1.05 184.6,1.55 184.9,1.25 C184.9,1.05 184.8,1.15 184.8,0.95 C184.9,0.85 184.8,0.95 184.9,0.95 C184.9,1.05 184.9,1.15 184.9,1.25 C185.2,1.65 185.8,1.15 186,1.45 C186,1.35 186.1,1.35 186.1,1.15 C186.1,1.15 186.1,1.15 186.1,1.15 C186.5,1.25 187.6,1.45 187.8,1.15 C188,1.25 188,1.35 188.2,1.05 C188.3,1.25 188.5,0.95 188.5,1.25 C188.6,0.95 188.7,1.05 188.8,0.75 C188.9,0.75 188.9,1.05 189,1.15 C189.1,1.05 189.2,1.25 189.2,1.15 C189.3,1.25 189.2,1.35 189.1,1.35 C189.2,1.55 189.3,1.45 189.4,1.35 C189.4,1.25 189.3,1.25 189.3,1.25 C189.4,0.95 189.8,0.95 190,0.95 C190.3,0.95 190.5,1.15 190.7,0.95 C190.7,0.95 190.7,0.85 190.7,0.75 C190.8,0.85 190.8,1.05 190.9,1.05 C192.1,0.55 192.8,1.35 193.6,0.55 C193.7,0.55 193.8,0.55 193.8,0.55 C193.8,0.65 193.8,0.65 193.8,0.65 C193.7,0.85 193.5,0.85 193.3,1.15 C193.4,1.65 193.6,0.75 193.7,1.15 C193.6,1.15 193.6,1.25 193.6,1.25 C193.7,1.25 193.7,1.25 193.7,1.15 C193.7,1.15 193.8,1.15 193.7,1.05 C193.7,0.85 193.8,1.15 193.8,1.25 C194,1.15 194.2,1.45 194.3,1.05 C194.4,1.05 194.3,1.25 194.4,1.25 C194.5,1.15 194.3,0.95 194.4,0.95 C194.5,1.05 194.6,1.05 194.6,1.25 C194.6,1.25 194.7,1.25 194.7,1.15 C194.8,1.15 194.8,1.15 194.8,1.05 C194.8,1.15 194.9,1.15 194.9,1.15 C194.9,1.05 194.9,1.05 194.9,0.95 C194.9,0.95 194.9,0.95 194.9,0.95 C194.9,1.05 194.4,1.15 194.4,1.25 C194.5,1.25 195,0.85 194.9,0.95 C194.9,0.75 194.5,0.85 194.6,0.85 C194.6,1.15 194.5,0.75 194.5,1.05 C194.7,1.15 194.8,1.15 194.9,0.95 C194.9,0.95 195,0.85 195,0.85 C195,1.05 194.9,1.05 194.9,1.25 C195.3,0.95 196.5,1.45 197,1.15 C197,1.25 197,1.35 197,1.35 C197.1,0.95 197.3,0.95 197.5,1.35 C197.3,1.55 197,1.15 197,1.75 C196.9,1.75 197,1.65 197,1.45 C196.8,1.45 196.7,1.55 196.6,1.45 C196.5,1.65 195.2,1.65 195.2,1.65 C195.1,1.65 195.1,1.75 195.2,1.85 C195.1,1.85 195.1,1.65 195,1.75 C195,1.65 195,1.75 195,1.75 C195,1.75 194.9,1.75 194.9,1.85 C194.9,1.85 194.8,1.85 194.8,1.75 C194.9,1.65 194.8,1.45 194.7,1.55 C194.7,1.65 194.8,1.55 194.8,1.75 C194.7,1.75 194.8,1.85 194.7,1.95 C194.6,1.95 194.7,1.65 194.6,1.75 C194.6,1.85 194.5,1.95 194.5,2.15 C194.5,2.15 194.5,2.05 194.5,2.05 C194.5,2.05 194.5,1.95 194.5,2.05 C194.4,2.05 194.9,1.85 194.8,1.95 C194.7,1.75 194.6,2.25 194.4,2.15 C194.4,1.95 194.5,1.95 194.6,1.95 C194.6,1.55 194.3,2.05 194.2,1.85 C194.2,2.15 194.4,2.05 194.2,2.25 C194.3,2.45 194.4,2.25 194.5,2.35 C194.5,2.45 194.5,2.45 194.5,2.55 C194.4,2.55 194.4,2.55 194.3,2.55 C194.2,2.85 194.4,2.55 194.4,2.75 C194.5,2.75 194.5,2.65 194.4,2.55 C194.5,2.45 194.5,2.85 194.6,2.55 C194.6,2.65 194.6,2.65 194.6,2.75 C194.7,2.75 194.7,2.75 194.8,2.75 C194.8,2.65 194.7,2.75 194.7,2.65 C194.8,2.65 194.5,2.35 194.5,2.75 C194.5,2.75 194.5,2.75 194.5,2.75 C194.5,2.65 194.4,2.75 194.4,2.85 C194.2,2.85 194.8,2.95 194.8,3.05 C194.8,3.05 194.8,3.05 194.7,3.05 C194.7,2.95 194.7,3.05 194.7,3.05 C194.7,3.15 194.4,3.15 194.4,3.05 C194.4,3.05 194.5,3.15 194.5,3.15 C194.5,3.15 194.5,3.25 194.5,3.25 C194.6,3.25 194.6,3.05 194.7,3.15 C194.7,3.45 194.5,3.25 194.5,3.55 C194.4,3.45 194.9,3.55 194.8,3.45 C194.8,3.35 194.4,3.45 194.5,3.25 C194.5,3.35 194.5,3.25 194.5,3.25 C194.5,3.25 194.5,3.15 194.5,3.15 C194.4,3.25 194.9,3.35 194.8,3.35 C194.9,3.05 194.5,3.45 194.4,3.25 C194.5,3.45 194.5,3.45 194.3,3.45 C194.3,3.35 194.3,3.25 194.3,3.25 C194.4,3.25 194.4,3.05 194.5,3.15 C194.5,2.95 194.4,3.05 194.4,2.85 C194.3,2.85 194.4,3.15 194.4,3.25 C194.3,3.25 194.4,2.95 194.3,3.05 C194.3,3.15 194.3,3.15 194.3,3.45 C194.2,3.45 194.2,3.45 194.1,3.45 C194.2,3.25 194,3.35 194,3.15 C194,3.15 194,3.05 194,3.05 C194,2.95 194.1,3.05 194.1,2.95 C194.1,2.95 194.1,3.05 194.1,3.15 C194,3.15 194.1,3.25 194.1,3.15 C194.1,3.05 194.2,2.95 194.2,2.95 C194,2.55 193.7,3.35 193.9,3.25 C193.9,3.35 193.9,3.35 193.9,3.35 C193.8,3.45 193.8,3.45 193.7,3.55 C193.8,3.45 193.8,3.35 193.7,3.15 C193.9,3.15 193.6,2.95 193.8,3.05 C193.6,2.85 193.5,3.55 193.3,3.55 C193.1,3.55 193.2,3.65 193,3.65 C193,3.75 193.1,3.85 193.1,3.75 L193.1,3.75 C193.1,3.85 192.9,3.85 192.9,3.65 C192.9,3.75 192.8,3.75 192.8,3.95 C192.8,3.95 192.7,3.85 192.7,3.85 C192.7,3.85 192.7,3.85 192.7,3.75 C192.7,3.75 192.7,3.85 192.7,3.85 C192.7,4.05 192.6,3.75 192.6,3.85 C192.6,4.25 192.7,3.85 192.7,4.15 C192.7,4.15 192.7,4.15 192.7,4.25 C192.7,4.25 192.7,4.25 192.7,4.15 C192.8,4.05 193,4.25 192.9,3.95 C192.9,3.95 192.9,3.95 193,3.95 C193.1,4.15 193.1,4.05 193,4.35 C193.1,4.15 193.3,4.15 193.3,3.95 C193.4,3.95 193.3,4.15 193.4,4.05 C193.4,4.05 193.4,4.05 193.4,4.15 C193.4,4.15 193.4,4.05 193.4,4.05 C193.4,3.85 193.5,3.85 193.4,3.65 C193.2,3.85 193.2,4.05 192.9,3.95 C192.9,3.85 193,3.75 193.1,3.75 C193.1,3.65 193.1,3.65 193,3.65 C193,3.55 193.1,3.55 193.1,3.45 C193.2,3.65 193.2,3.45 193.3,3.45 C193.4,3.45 193.6,3.75 193.5,3.55 C193.6,3.55 193.5,3.85 193.5,3.95 C193.5,3.95 193.4,3.95 193.4,3.85 C193.4,4.35 193.6,3.75 193.5,4.25 C193.6,4.05 193.7,4.05 193.7,3.85 C193.8,3.85 193.8,4.15 193.8,4.25 C193.9,4.25 193.9,3.95 193.9,3.75 C194,3.75 194,3.75 194,3.95 C194,3.95 194,4.05 194,3.95 C194.1,4.05 194.1,3.65 194.2,3.75 C194.2,3.85 194.1,3.85 194.1,3.95 C194,3.95 194,3.95 193.9,4.05 C193.9,4.25 194.1,3.95 194,4.25 C194,4.25 194,4.35 193.9,4.35 C193.8,4.25 193.5,4.35 193.3,4.45 C193.3,4.55 193.5,4.45 193.6,4.55 C193.6,4.55 193.6,4.65 193.6,4.65 C193.4,4.55 193.4,4.75 193.2,4.85 C193.2,5.05 193.3,4.85 193.4,4.95 C193.4,5.15 193.3,5.15 193.2,5.05 C193.4,5.45 193.6,4.95 193.8,4.95 C193.8,5.05 193.8,5.05 193.8,5.15 C193.8,5.05 193.9,4.85 193.9,5.15 C194,5.05 194.2,5.05 194.4,4.95 C194.4,4.95 193.9,5.05 194,5.05 C194,4.95 194.4,4.85 194.4,4.95 C194.1,4.95 194.1,4.65 194.1,4.75 C194.1,4.75 194.1,4.75 194.1,4.85 C194.1,4.85 194.1,4.95 194.1,4.85 C194.1,4.85 194.1,4.85 194.1,4.75 C194.2,4.75 194.2,4.75 194.2,4.65 C194.4,4.85 194.7,4.75 194.9,4.65 C194.9,4.15 194.8,4.35 194.8,4.15 C194.7,4.15 194.7,4.35 194.6,4.35 C194.5,3.95 194.1,4.45 194,4.25 C194.1,4.15 194.2,4.15 194.1,3.85 C194.3,4.35 194.7,3.65 194.9,4.05 C195,4.05 194.9,3.85 195,3.75 C195.1,3.75 195,3.85 195,3.95 C195.1,4.05 195.2,3.95 195.4,3.85 C195.5,4.05 195.5,3.55 195.7,3.65 C195.7,3.75 195.8,3.75 195.8,3.75 C195.8,3.65 195.7,3.65 195.7,3.65 C195.7,3.45 195.9,3.25 196,3.45 C195.8,3.45 196,3.95 196,3.45 C196,3.45 196.1,3.35 196.1,3.35 C196.3,3.35 195.3,3.45 195.5,3.35 C195.5,3.45 195.5,3.45 195.5,3.55 C195.6,3.55 195.7,3.35 195.7,3.65 C195.7,3.65 195.6,3.65 195.6,3.75 C195.6,3.75 195.5,3.75 195.5,3.75 C195.5,3.85 195.7,3.95 195.6,3.75 C195.6,3.75 195.7,3.75 195.7,3.65 C195.7,3.65 195.8,3.65 195.8,3.65 C195.8,3.85 195.7,3.85 195.7,3.95 C195.7,4.05 195.9,4.05 195.9,3.95 C195.9,3.95 195.9,3.75 196,3.75 C196,3.75 196.1,3.75 196.1,3.75 C196.1,3.85 196.1,3.85 196.2,3.85 C196.2,3.75 196.2,3.75 196.1,3.75 C196.1,3.45 196.2,3.75 196.3,3.55 C196.3,3.65 196.3,3.85 196.3,3.95 C196.4,3.85 196.3,3.55 196.5,3.65 C196.5,3.75 196.5,3.75 196.5,3.85 C196.5,3.85 196.4,3.85 196.4,3.85 C196.4,3.95 196.5,3.95 196.5,3.85 C196.6,3.75 196.7,3.95 196.8,3.85 C196.8,3.95 196.8,3.95 196.9,3.95 C196.9,3.85 196.9,3.85 196.8,3.85 C196.7,3.65 196.6,3.85 196.6,3.75 C196.6,3.45 196.8,3.65 196.9,3.75 C197,3.75 196.9,3.65 196.9,3.45 C197,3.55 197.4,3.75 197.4,3.45 C197.4,3.45 197.4,3.35 197.4,3.35 C197.4,3.35 197.4,3.45 197.4,3.55 C197.4,3.55 197.4,3.35 197.4,3.25 C197.3,3.25 197.3,3.25 197.3,3.45 C197.2,3.45 197.2,3.25 197.2,3.15 C197.2,3.15 197.2,3.15 197.2,3.05 C197.3,3.05 197.3,3.25 197.4,3.15 C197.4,3.15 197.4,3.25 197.4,3.25 C197.4,3.25 197.4,3.15 197.4,3.15 C197.4,3.05 197.5,3.05 197.5,3.05 C197.5,3.25 197.4,3.25 197.4,3.35 C197.4,3.35 197.4,3.35 197.3,3.35 C197.3,3.45 197.3,3.55 197.3,3.65 C197.2,3.85 196.9,3.75 196.7,3.85 C196.7,3.85 196.7,3.85 196.7,3.85 C196.7,3.95 196.7,3.85 196.7,3.85 C197,3.85 197.4,4.05 197.6,3.85 C197.8,3.85 197.9,3.95 198,3.85 C198.1,4.05 197.9,4.05 197.8,4.05 C197.3,4.15 196.4,3.85 196.1,4.15 C196,4.05 196,3.95 195.9,3.85 C196,4.15 195.8,4.05 195.8,4.25 C195.8,4.25 195.8,4.25 195.8,4.25 C195.8,4.25 195.8,4.15 195.8,4.15 C195.8,4.15 195.8,4.25 195.8,4.25 C195.8,4.35 195.8,4.25 195.8,4.25 C195.8,4.25 195.9,4.25 195.9,4.25 C195.9,4.35 195.9,4.35 195.8,4.35 C195.8,4.45 195.9,4.35 195.9,4.55 C195.8,4.45 195.7,4.65 195.7,4.35 C195.5,4.35 195.5,4.45 195.4,4.55 C195.3,4.45 195.4,4.45 195.4,4.35 C195.4,4.15 195.2,4.35 195.3,4.15 C195.2,4.05 195.2,4.25 195.2,4.35 C195.2,4.25 196.1,4.25 196,4.25 C196,4.25 196,4.35 196,4.35 C195.9,4.35 195.8,4.55 195.8,4.25 C195.6,4.25 195.5,4.45 195.4,4.65 C195.4,4.45 195.4,4.35 195.3,4.45 C195.3,4.35 195,4.35 195.2,4.25 C195.1,4.05 195,4.35 194.9,4.25 C194.9,4.45 195,4.45 195.1,4.35 C195,4.45 195.1,4.55 195.1,4.65 C195.1,4.65 195,4.65 195,4.65 C195,4.25 194.9,4.95 195,4.65 C195,4.75 195.2,4.75 195.1,4.65 C195.1,4.65 195.1,4.65 195.1,4.65 C195.1,4.75 195.1,4.65 195.1,4.65 C195.1,4.75 195.2,4.75 195.3,4.65 C195.3,4.85 195.5,4.45 195.5,4.75 C195.6,4.65 195.6,4.65 195.8,4.55 C195.8,4.45 195.8,4.45 195.7,4.45 C195.8,4.25 194.9,4.55 195,4.65 C195.1,4.65 195.1,4.45 195.2,4.45 C195.1,4.75 195.3,4.65 195.3,4.55 C195.3,4.55 195.4,4.65 195.4,4.75 C195.6,4.65 195.7,4.75 195.7,4.55 C195.8,4.75 196.3,4.75 196.4,4.35 C196.5,4.45 196.4,4.45 196.4,4.65 C196.5,4.55 196.6,4.75 196.7,4.45 C196.8,4.65 196.9,4.45 197,4.55 C197.1,4.55 197.1,4.05 197.2,4.25 C197.2,4.35 197,4.45 197.2,4.45 C197.5,4.65 198.7,4.65 199,4.55 C199.4,4.75 198.7,4.55 199.3,4.85 C198.3,4.95 198.9,4.95 197.9,4.85 C197.8,4.85 197.9,5.15 197.8,5.05 C197.8,4.95 197.8,4.95 197.8,4.85 C197.7,4.95 197.6,4.75 197.5,4.95 C197.6,5.05 197.6,5.15 197.4,5.05 C197.4,5.15 197.5,5.05 197.5,5.25 C197.4,5.15 197.4,5.35 197.3,5.35 C197.4,5.05 197.2,4.95 197.1,5.05 C197.1,4.95 197.1,4.95 197.2,4.95 C196.9,4.85 196.2,4.65 195.9,5.05 C196,5.15 196.1,5.25 196.3,5.25 C195.8,5.25 196.2,5.65 195.8,5.35 C195.7,5.45 195.6,5.45 195.5,5.35 C194.9,5.85 194.6,5.35 193.8,5.85 C194.2,6.05 194.3,5.75 194.6,5.75 C194.7,5.65 195,5.85 195.1,5.65 C195.1,5.65 195.1,5.75 195.1,5.85 C195.5,5.45 195.1,5.75 195.4,5.45 C195.4,5.45 195.5,5.55 195.5,5.65 C195.6,5.45 196.2,5.75 196.2,5.35 C196.2,5.45 196.2,5.45 196.2,5.55 C196.5,5.55 196.8,5.45 197.1,5.45 C197.2,5.45 197.3,5.65 197.4,5.65 C197.6,5.65 197.9,5.35 198,5.65 C198.5,5.45 198,5.45 198.5,5.65 C198.5,5.95 198.3,5.55 198.4,5.85 C198.4,5.85 198.4,5.75 198.4,5.75 C197.9,5.95 198.6,5.75 198,5.75 C197.7,5.75 197.4,5.95 197.1,5.95 C197,5.95 196.7,5.75 196.8,5.95 C196.7,5.85 196.3,6.05 196.2,5.85 C196,6.05 195.4,6.05 195.1,5.95 C194.9,6.15 195.7,6.05 195.5,6.15 C195.6,6.45 194.8,6.35 195,6.35 C195.1,6.35 195.3,6.25 195.4,6.15 C195.9,6.35 196.5,6.15 197,6.25 C197,6.45 197.2,6.45 197.1,6.25 C197.2,6.45 197.3,6.15 197.4,6.35 C197.4,6.35 197.4,6.35 197.3,6.35 C197.3,6.45 197.4,6.45 197.4,6.35 C197.5,6.05 197.5,6.45 197.6,6.25 C197.6,6.35 197.6,6.35 197.6,6.45 C197.8,6.35 198.2,6.35 198.2,6.45 C198.4,6.25 198.6,6.25 198.8,6.35 C198.7,6.35 198.4,6.65 198.3,6.55 C198.4,6.95 198.8,6.45 198.9,6.75 C199,6.65 199.1,6.55 199.2,6.65 C199.2,6.55 199.1,6.45 199.1,6.55 C199.1,6.45 199.1,6.45 199.1,6.45 C199.1,6.35 199.2,6.35 199.2,6.35 C199.2,6.45 199.2,6.45 199.1,6.45 C199.2,6.65 199.4,6.55 199.5,6.25 C199.9,6.55 198.7,6.35 199.1,6.35 C199.1,6.85 198.6,6.55 198.4,6.55 C198.5,6.55 198.4,6.45 198.4,6.55 C198.2,6.65 199.4,6.55 199.2,6.65 C199.3,6.95 198,6.55 198.1,6.85 C198.1,6.85 198.1,6.95 198.1,6.95 C197.8,6.85 199.1,7.15 198.7,6.95 C197.3,7.25 196.5,6.95 195.2,7.35 C195.4,7.65 194.8,7.25 195.1,7.35 C194.9,7.65 195.4,7.45 195,7.55 C195,7.35 195.1,7.45 195.2,7.35 C195.2,7.15 195.1,7.35 195,7.25 C194.9,7.75 194.5,7.35 194.4,7.55 C194.4,7.75 194.6,7.55 194.5,7.75 C194.4,7.85 194.1,7.65 194,7.95 C194,7.95 194,7.95 194,7.85 C194,7.85 194,7.75 194,7.75 C194,7.55 194.1,7.75 194.2,7.65 C194.2,7.65 194.2,7.55 194.2,7.55 C194.2,7.55 194.3,7.55 194.3,7.45 C194.3,7.45 194.3,7.45 194.4,7.45 C194.4,7.55 194.4,7.45 194.4,7.45 C194.7,7.35 194.4,6.95 194.3,7.45 C194.3,7.45 194.2,7.45 194.2,7.55 C194,7.65 193.9,7.55 193.9,7.75 C193.9,7.75 193.8,7.75 193.8,7.85 C193.7,7.75 194,7.85 194,7.65 C194.1,7.65 193.8,7.75 193.9,7.45 C193.9,7.45 194.1,7.55 193.9,7.45 C193.9,7.45 193.9,7.75 193.8,7.55 C193.8,7.55 193.8,7.45 193.8,7.55 C193.7,7.65 193.8,7.75 193.8,7.95 C193.7,7.95 193.6,7.65 193.6,7.85 C193.6,7.85 193.5,7.85 193.5,7.85 C193.5,8.05 193.5,8.15 193.6,8.05 C193.5,8.15 193.3,8.05 193.2,7.95 C193.2,8.25 192.9,8.15 192.8,8.15 C192.7,8.35 192.2,8.55 192,8.45 C192,8.15 192.4,8.25 192.3,8.15 C192.2,8.35 191.8,8.45 191.6,8.45 C191.6,8.35 192.1,8.25 192.1,8.25 C192,8.25 191.5,8.35 191.5,8.55 C191.5,8.55 191.9,8.45 191.9,8.45 C191.8,8.65 191.1,8.55 191,8.55 C191,8.55 191,8.75 190.9,8.75 C191,8.95 191.1,8.55 191.1,8.85 C191,8.95 191,8.85 190.9,9.05 C190.9,9.15 191,9.15 191,9.15 C191,9.35 190.8,9.15 190.9,9.35 C190.8,9.35 190.8,9.15 190.9,9.05 C190.9,8.85 190.8,9.25 190.7,9.15 C190.7,8.95 190.8,9.05 190.8,8.95 C190.7,8.75 190.4,9.05 190.2,9.15 C190.3,9.25 190.4,9.25 190.4,9.05 C190.5,9.05 190.4,9.25 190.4,9.25 C190.5,9.25 190.5,9.15 190.5,9.05 C190.7,9.05 190.9,9.35 190.8,9.55 C190.9,9.65 190.9,9.45 190.9,9.45 C190.9,9.55 190.9,9.45 190.9,9.45 C191.1,9.35 191.3,8.85 191.6,9.05 C191.6,9.15 191.5,9.15 191.5,9.15 C191.5,9.25 191.5,9.25 191.6,9.25 C191.5,9.45 191.5,9.05 191.3,9.15 C191.2,9.45 191.2,9.25 191.1,9.45 C191.1,9.45 191.3,9.55 191.3,9.75 C191.4,9.55 191.2,9.55 191.3,9.35 C191.4,9.35 191.4,9.55 191.5,9.35 C191.6,9.45 191.4,9.55 191.5,9.75 C191.4,9.75 191.4,9.95 191.3,9.95 C191.4,10.15 191.5,9.95 191.5,9.75 C191.6,9.75 191.7,9.65 191.8,9.55 C191.7,9.45 191.6,9.35 191.7,8.95 C191.7,8.95 191.8,9.05 191.8,9.05 C191.8,9.05 191.8,9.05 191.8,9.15 C191.8,9.15 191.8,9.15 191.8,9.05 C192,9.15 192.1,8.85 192.2,8.85 C192.1,9.25 192,9.05 191.8,9.15 C191.8,9.25 191.8,9.25 191.8,9.35 C191.9,9.35 192,8.95 192,9.35 C192,9.35 191.9,9.45 191.9,9.45 C192,9.45 192.2,9.45 192.2,9.35 C192.2,9.25 192.1,9.25 192.1,8.95 C192.2,9.05 192.2,8.95 192.2,8.75 C192.3,8.75 192.3,8.85 192.4,8.85 C192.4,8.95 192.4,9.05 192.4,9.15 C192.5,9.15 192.5,9.05 192.6,9.05 C192.6,8.85 192.5,8.95 192.5,8.65 C192.4,8.75 192.4,8.85 192.3,8.75 C192.3,8.65 192.4,8.65 192.4,8.65 C192.4,8.45 192.2,8.85 192.2,8.55 C192.3,8.55 192.7,8.45 192.8,8.35 C193,8.45 192.8,8.15 193,8.35 C193.2,8.25 193.7,7.95 193.9,8.05 C193.9,8.15 193.8,8.05 193.8,8.15 C193.7,8.15 193.7,8.25 193.7,8.25 C193.7,8.45 193.9,8.35 193.8,8.15 C194,8.15 193.5,8.05 193.7,7.95 C193.7,8.05 193.7,8.15 193.8,8.05 C193.8,8.15 193.8,8.15 193.8,8.15 C194.1,7.95 194.4,7.85 194.8,7.85 C194.8,7.85 194.8,7.95 194.8,7.95 C194.8,7.95 194.8,8.05 194.8,7.95 C194.8,7.95 194.8,7.85 194.8,7.85 C194.9,7.65 194.8,8.15 194.9,8.15 C195,8.15 195,7.95 195,7.95 C195.1,8.15 195.4,8.05 195.5,7.95 C195.6,8.05 194.8,8.15 194.9,7.95 C195,7.95 194.9,8.15 195,8.05 C194.5,8.25 194.5,8.25 194.1,8.25 C194.1,8.35 194.1,8.45 194,8.55 C193.9,8.55 194,8.35 194,8.25 C193.9,8.15 193.8,8.45 193.8,8.25 C193.8,8.55 193.6,8.35 193.5,8.65 C193.5,8.65 193.4,8.65 193.4,8.75 C193.3,8.75 193.3,8.65 193.4,8.55 C193.2,8.55 193.1,8.55 193,8.65 C193,8.55 193,8.55 193.1,8.45 C193,8.25 193.3,8.65 193.2,8.35 C193.1,8.45 193.2,8.75 193.1,8.75 C193.1,8.65 193.1,8.45 193.2,8.45 C193.1,8.35 193,8.75 192.9,8.65 C192.9,8.75 193.1,8.65 193,8.85 C193.1,8.85 193.2,8.85 193.2,8.95 C193.2,9.15 193.1,8.95 193,9.05 C193,9.15 193.1,9.25 193.1,9.15 C193.1,9.25 193.2,9.25 193.2,9.15 C193.3,9.15 193.3,9.15 193.4,9.15 C193.4,9.15 193.4,9.25 193.4,9.25 C193.8,9.25 193.8,9.15 194.3,9.25 C194.3,9.35 194.4,9.35 194.4,9.45 C194.3,9.35 194,9.55 193.8,9.45 C193.8,9.65 193.8,9.65 193.8,9.85 C193.9,9.75 194,9.85 194,9.65 C194.1,9.65 194,9.85 194.1,9.75 C194.1,9.95 193.9,9.85 193.9,9.95 C193.9,9.95 193.9,9.85 193.8,9.85 C193.8,9.95 193.9,10.05 193.9,9.95 C194,10.25 194.1,9.95 194.2,10.05 C194.4,9.95 194.7,10.05 195.1,9.95 C195.1,10.05 195,10.05 195,10.05 C195,10.05 195,10.05 194.9,10.05 C194.9,10.15 195,10.15 195,10.05 C195,10.05 195.2,10.05 195.1,9.95 C195.3,9.95 194.6,9.95 194.9,9.85 C194.9,9.95 194.9,9.95 194.9,9.95 C195.2,9.85 195.2,9.85 195.4,9.95 C195.4,10.05 195.4,10.05 195.5,10.05 C195.5,9.95 195.5,9.95 195.4,9.95 C195.6,9.75 195.8,9.95 196,9.85 C196.1,9.85 196,10.05 196,10.15 C195.9,10.15 195.9,9.95 195.8,9.95 C195.8,10.05 195.8,10.15 195.9,10.05 C195.4,10.25 195,10.15 194.6,10.15 C194.6,10.15 194.6,10.15 194.6,10.05 C194.6,10.05 194.6,10.15 194.6,10.15 C194.1,10.25 194.5,10.35 194.1,10.25 C194.1,10.25 194.1,10.35 194.1,10.45 C194,10.35 193.9,10.25 193.8,10.35 C193.8,10.45 193.8,10.45 193.9,10.45 C193.3,10.65 193.2,10.35 192.6,10.65 C192.5,10.45 192.3,10.65 192.1,10.65 C191.8,10.65 191.5,10.55 191.2,10.75 C191.1,10.85 191.2,11.05 191.1,11.15 C190.9,10.75 190.5,11.05 190.1,11.15 C190.1,11.35 190.3,11.15 190.2,11.45 C190.4,11.25 190.4,11.85 190.6,11.55 C190.5,11.45 190.5,11.25 190.4,11.35 C190.5,11.25 190.7,11.25 190.9,11.25 C190.9,11.35 190.9,11.35 190.9,11.45 C191,11.55 190.9,11.15 191,11.25 C191,11.45 191.1,11.25 191.1,11.55 C191,11.55 191,11.55 190.9,11.65 C191.9,12.45 190.4,12.55 191.4,11.65 C191.5,11.65 191.5,11.65 191.6,11.65 C191.5,12.25 191.3,12.45 191.1,12.65 C190.8,12.85 190.5,12.65 190,12.55 C190.2,12.75 190.5,13.25 190.7,13.25 L190.5,12.65 Z" id="Fill-18" fill="#F6EB3B"></path>
+            <path d="M197.9,1.15 C197.8,1.15 198,0.75 197.9,1.15" id="Fill-20" fill="#F6EB3B"></path>
+            <path d="M189.4,1.55 C189.4,1.25 189.6,1.65 189.4,1.55" id="Fill-21" fill="#F6EB3B"></path>
+            <path d="M198.2,1.45 C198.2,1.05 198.2,1.85 198.2,1.45" id="Fill-22" fill="#F6EB3B"></path>
+            <path d="M197.8,1.55 C197.9,1.25 197.9,1.85 197.8,1.55" id="Fill-23" fill="#F6EB3B"></path>
+            <path d="M198,1.55 C198,1.45 198.1,1.45 198.2,1.45 C198.1,1.55 198,1.55 198,1.55" id="Fill-24" fill="#F6EB3B"></path>
+            <path d="M198.8,1.55 C198.8,1.55 198.8,1.65 198.8,1.55" id="Fill-25" fill="#F6EB3B"></path>
+            <path d="M200.8,0.75 C200.7,0.75 200.8,0.65 200.8,0.75 C200.8,0.75 200.8,0.75 200.8,0.75" id="Fill-26" fill="#F6EB3B"></path>
+            <path d="M197.5,1.25 C197.4,1.45 197.3,1.35 197.2,1.45 C197.2,1.25 197.4,1.25 197.5,1.25" id="Fill-27" fill="#F6EB3B"></path>
+            <path d="M197.7,1.35 C197.6,1.25 197.7,1.35 197.7,1.35" id="Fill-28" fill="#F6EB3B"></path>
+            <path d="M200,1.55 C200,1.45 200.1,1.55 200,1.55" id="Fill-29" fill="#F6EB3B"></path>
+            <path d="M200.8,0.75 C200.8,0.75 200.8,0.85 200.8,0.75 C200.6,0.75 200.7,0.95 200.6,1.05 C200.5,0.75 200.2,0.95 200.2,1.25 C200.1,1.15 200.1,1.15 200,0.95 C199.9,0.95 200,1.15 200,1.15 C199.9,1.45 199.9,0.85 199.8,1.05 C199.8,0.85 199.6,1.15 199.6,0.85 C199.8,1.05 200.3,0.65 200.8,0.75" id="Fill-30" fill="#F6EB3B"></path>
+            <path d="M200.8,0.75 C200.9,0.85 201.1,0.65 201.1,0.85 C201.1,1.15 200.8,1.15 200.7,1.05 C200.7,0.95 200.8,0.95 200.8,0.85 C200.8,0.85 200.9,0.85 200.8,0.75" id="Fill-31" fill="#F6EB3B"></path>
+            <path d="M201,0.75 C201.2,0.65 201.1,0.85 201.3,0.85 C201.3,1.05 200.9,1.05 201,0.75" id="Fill-32" fill="#F6EB3B"></path>
+            <path d="M201.6,0.95 C201.4,0.95 201.6,0.45 201.6,0.95" id="Fill-33" fill="#F6EB3B"></path>
+            <path d="M199.8,1.55 C199.8,1.55 199.9,1.65 199.8,1.55" id="Fill-34" fill="#F6EB3B"></path>
+            <path d="M199.9,1.65 C199.9,1.55 200,1.55 200,1.55 C200,1.55 199.9,1.55 199.9,1.65" id="Fill-35" fill="#F6EB3B"></path>
+            <path d="M198.4,1.65 C198.4,1.55 198.5,1.55 198.4,1.65" id="Fill-36" fill="#F6EB3B"></path>
+            <path d="M198.6,1.65 C198.6,1.55 198.7,1.55 198.7,1.55 C198.7,1.65 198.6,1.65 198.6,1.65" id="Fill-37" fill="#F6EB3B"></path>
+            <path d="M198.8,1.75 C198.6,1.85 198.8,1.45 198.8,1.75" id="Fill-38" fill="#F6EB3B"></path>
+            <path d="M201.3,0.95 C201.4,0.55 201.4,1.35 201.3,0.95" id="Fill-39" fill="#F6EB3B"></path>
+            <path d="M201.4,0.95 C201.4,0.95 201.5,1.05 201.4,0.95" id="Fill-40" fill="#F6EB3B"></path>
+            <path d="M201.6,0.85 C201.6,0.85 201.6,1.05 201.6,0.85" id="Fill-41" fill="#F6EB3B"></path>
+            <path d="M197.2,1.45 C197.2,1.45 197.3,1.45 197.3,1.45 C197.3,1.55 197.3,1.55 197.3,1.65 C197.3,1.65 197.2,1.65 197.2,1.65 C197.2,1.55 197.2,1.55 197.2,1.45" id="Fill-42" fill="#F6EB3B"></path>
+            <path d="M198.3,1.85 C198.2,1.85 198.2,2.05 198.1,2.05 C198.1,1.95 198.3,1.45 198.3,1.85" id="Fill-43" fill="#F6EB3B"></path>
+            <path d="M198,1.75 C198,1.65 198.1,1.75 198,1.75" id="Fill-44" fill="#F6EB3B"></path>
+            <path d="M198.6,1.65 C198.6,1.75 198.5,1.75 198.5,1.95 C198.4,1.85 198.3,2.05 198.1,1.95 C198.1,1.55 198.3,1.75 198.6,1.65" id="Fill-45" fill="#F6EB3B"></path>
+            <path d="M198.8,1.85 C198.8,1.85 198.8,1.75 198.8,1.85 C198.8,1.75 198.8,1.85 198.8,1.85" id="Fill-46" fill="#F6EB3B"></path>
+            <path d="M199.5,1.75 C199.5,1.65 199.5,1.75 199.5,1.75" id="Fill-47" fill="#F6EB3B"></path>
+            <path d="M199.5,1.75 C199.7,1.35 199.6,2.05 199.5,1.75" id="Fill-48" fill="#F6EB3B"></path>
+            <path d="M199.5,1.15 C199.5,1.05 199.6,1.05 199.6,1.05 C199.6,1.15 199.6,1.15 199.5,1.15" id="Fill-49" fill="#F6EB3B"></path>
+            <path d="M199.6,1.15 C199.7,0.75 199.6,1.75 199.6,1.15" id="Fill-50" fill="#F6EB3B"></path>
+            <path d="M199.8,1.05 C199.8,1.15 199.9,1.25 199.9,1.25 C199.9,1.45 199.8,1.35 199.7,1.35 C199.7,1.15 199.7,0.95 199.8,1.05" id="Fill-51" fill="#F6EB3B"></path>
+            <path d="M198.6,1.75 C198.6,1.65 198.7,1.65 198.7,1.65 C198.7,1.75 198.7,1.75 198.6,1.75" id="Fill-52" fill="#F6EB3B"></path>
+            <path d="M198.8,1.85 C198.8,2.05 198.6,1.75 198.8,1.85" id="Fill-53" fill="#F6EB3B"></path>
+            <path d="M200,1.75 C199.9,1.75 199.9,1.65 200,1.75" id="Fill-54" fill="#F6EB3B"></path>
+            <path d="M197.5,1.65 C197.5,1.65 197.5,1.75 197.5,1.65" id="Fill-55" fill="#F6EB3B"></path>
+            <path d="M200,1.85 C199.9,1.85 200,1.95 200,1.85" id="Fill-56" fill="#F6EB3B"></path>
+            <path d="M199.9,1.75 C200,1.75 200,1.85 199.9,1.75" id="Fill-57" fill="#F6EB3B"></path>
+            <path d="M200,1.85 C200,1.75 200.1,1.85 200,1.85" id="Fill-58" fill="#F6EB3B"></path>
+            <path d="M201.1,1.55 C201,1.45 200.9,1.55 200.7,1.45 C200.8,1.55 200.8,1.55 201,1.55 C200.5,1.55 200.2,1.65 199.7,1.55 C199.6,1.55 199.6,1.65 199.6,1.75 C199.3,1.45 199.9,1.75 199.5,1.65 C199.5,1.55 199.6,1.55 199.5,1.55 C200.1,1.35 199.7,1.45 200.8,1.25 C200.8,1.15 200.7,1.15 200.6,1.15 C200.8,1.05 201,1.05 201.2,1.15 C201.1,1.35 201.1,1.05 200.9,1.15 C201,1.45 201.2,1.25 201.4,1.25 C201.4,1.55 201.2,1.35 201.1,1.55 Z" id="Fill-59" fill="#F6EB3B"></path>
+            <path d="M201.2,1.25 C201.2,1.05 201.5,1.05 201.4,1.35 C201.4,1.25 201.2,1.15 201.2,1.25" id="Fill-60" fill="#F6EB3B"></path>
+            <path d="M199.3,2.05 C199.4,1.65 199.4,2.35 199.3,2.05" id="Fill-61" fill="#F6EB3B"></path>
+            <path d="M199.4,1.95 C199.4,1.95 199.5,2.05 199.4,1.95" id="Fill-62" fill="#F6EB3B"></path>
+            <path d="M200.2,1.25 C200.2,1.25 200.3,1.35 200.2,1.25" id="Fill-63" fill="#F6EB3B"></path>
+            <path d="M201.4,1.25 C201.3,1.15 201.4,1.25 201.4,1.25" id="Fill-64" fill="#F6EB3B"></path>
+            <path d="M201.5,1.25 C201.5,1.15 201.6,1.25 201.5,1.25" id="Fill-65" fill="#F6EB3B"></path>
+            <path d="M202.3,1.15 C202.3,1.15 202.4,1.25 202.3,1.15" id="Fill-66" fill="#F6EB3B"></path>
+            <path d="M204.7,0.95 C204.8,0.95 204.8,1.15 204.9,1.15 C204.9,1.35 204.7,1.25 204.6,1.25 C204.5,0.95 204.7,1.15 204.7,0.95" id="Fill-67" fill="#F6EB3B"></path>
+            <path d="M198.8,2.05 C198.8,2.05 198.8,2.15 198.8,2.05" id="Fill-68" fill="#F6EB3B"></path>
+            <path d="M199.5,2.15 C199.5,2.05 199.5,2.05 199.5,2.15" id="Fill-69" fill="#F6EB3B"></path>
+            <path d="M201.5,1.35 C201.4,1.35 201.5,1.45 201.5,1.35" id="Fill-70" fill="#F6EB3B"></path>
+            <path d="M201.6,1.45 C201.6,1.25 201.9,1.35 202,1.35 C201.9,1.55 201.7,1.35 201.6,1.45" id="Fill-71" fill="#F6EB3B"></path>
+            <path d="M202.1,1.35 C202.1,1.15 202.3,1.25 202.4,1.25 C202.4,1.45 202.2,1.35 202.1,1.35" id="Fill-72" fill="#F6EB3B"></path>
+            <path d="M203.2,1.35 C203.2,1.55 203.1,1.45 203,1.35 C203,1.15 203.1,1.25 203.2,1.35" id="Fill-73" fill="#F6EB3B"></path>
+            <path d="M201.8,1.55 C201.8,1.15 201.8,1.95 201.8,1.55" id="Fill-74" fill="#F6EB3B"></path>
+            <path d="M201.1,1.55 C201.2,1.55 201.2,1.55 201.3,1.55 C201.3,1.75 201.2,1.65 201.2,1.85 C201.2,1.75 201.1,1.75 201.1,1.55" id="Fill-79" fill="#F6EB3B"></path>
+            <path d="M201.3,1.65 C201.3,1.45 201.6,1.45 201.5,1.75 C201.5,1.75 201.4,1.75 201.4,1.75 C201.4,1.65 201.4,1.65 201.3,1.65" id="Fill-80" fill="#F6EB3B"></path>
+            <path d="M201.5,1.55 C201.4,1.55 201.5,1.65 201.5,1.55" id="Fill-81" fill="#F6EB3B"></path>
+            <path d="M201.9,1.55 C201.9,1.45 202,1.45 202,1.45 C202,1.55 201.9,1.55 201.9,1.55" id="Fill-82" fill="#F6EB3B"></path>
+            <path d="M204.5,1.25 C204.5,1.25 204.5,1.45 204.5,1.25" id="Fill-83" fill="#F6EB3B"></path>
+            <path d="M196.9,2.15 C196.9,2.05 196.9,2.15 196.9,2.15" id="Fill-84" fill="#F6EB3B"></path>
+            <path d="M200,2.25 C200,2.25 200,2.25 200,2.25 C200,2.35 200,2.35 200,2.25" id="Fill-85" fill="#F6EB3B"></path>
+            <path d="M201.8,1.55 C201.6,1.85 201.4,1.45 201.8,1.55" id="Fill-86" fill="#F6EB3B"></path>
+            <path d="M202.5,1.65 C202.5,1.25 202.8,1.65 202.5,1.65" id="Fill-87" fill="#F6EB3B"></path>
+            <path d="M199.8,1.95 C199.8,1.85 199.9,1.85 200,1.85 C199.9,1.95 199.9,1.85 199.8,1.95" id="Fill-88" fill="#F6EB3B"></path>
+            <path d="M200,1.85 C200.2,1.65 199.9,2.25 200,1.85" id="Fill-89" fill="#F6EB3B"></path>
+            <path d="M200.3,1.85 C200.4,1.45 200.4,2.25 200.3,1.85" id="Fill-90" fill="#F6EB3B"></path>
+            <path d="M200.7,2.15 C200.7,2.15 200.7,2.05 200.7,2.15 C200.6,2.05 200.7,2.15 200.7,2.15 C200.7,2.25 200.6,2.25 200.5,2.25 C200.4,1.85 200.7,2.05 200.7,1.75 C200.8,1.75 200.8,1.95 200.7,2.15 C200.7,2.15 200.7,2.15 200.7,2.15" id="Fill-91" fill="#F6EB3B"></path>
+            <path d="M202.6,1.55 C202.6,1.75 202.5,1.65 202.6,1.55" id="Fill-92" fill="#F6EB3B"></path>
+            <path d="M197.9,2.55 C197.9,2.55 197.9,2.65 197.9,2.55" id="Fill-93" fill="#F6EB3B"></path>
+            <path d="M198.5,2.55 C198.4,2.45 198.5,2.55 198.5,2.55" id="Fill-94" fill="#F6EB3B"></path>
+            <path d="M198.8,2.55 C198.7,2.45 198.8,2.55 198.8,2.55" id="Fill-95" fill="#F6EB3B"></path>
+            <path d="M197.9,2.55 C197.7,2.65 197.9,2.25 197.9,2.55" id="Fill-96" fill="#F6EB3B"></path>
+            <path d="M198.2,2.45 C198.2,2.45 198.2,2.55 198.2,2.45" id="Fill-97" fill="#F6EB3B"></path>
+            <path d="M200.2,1.95 C200.1,1.95 200.1,1.75 200.2,1.95" id="Fill-98" fill="#F6EB3B"></path>
+            <path d="M200.9,1.95 C200.9,1.95 200.8,1.95 200.8,2.05 C200.6,1.95 200.9,1.65 200.9,1.95" id="Fill-99" fill="#F6EB3B"></path>
+            <path d="M201.1,1.85 C201,1.85 201.1,1.95 201.1,1.85" id="Fill-100" fill="#F6EB3B"></path>
+            <path d="M197.2,2.55 C197.3,2.55 197.3,2.45 197.4,2.45 C197.4,2.55 197.3,2.55 197.4,2.75 C197.2,2.75 197.2,2.65 197.2,2.55" id="Fill-101" fill="#F6EB3B"></path>
+            <path d="M197.7,2.35 C197.7,2.35 197.7,2.45 197.7,2.35" id="Fill-102" fill="#F6EB3B"></path>
+            <path d="M198.1,2.35 C198.1,2.35 198.1,2.45 198.1,2.35" id="Fill-103" fill="#F6EB3B"></path>
+            <path d="M197.9,2.55 C198,2.55 198,2.65 198.1,2.65 C198.1,2.75 197.8,2.75 197.9,2.55" id="Fill-104" fill="#F6EB3B"></path>
+            <path d="M199.6,2.05 C199.6,1.95 199.6,1.95 199.6,2.05 C199.6,2.05 199.6,2.05 199.6,2.05" id="Fill-105" fill="#F6EB3B"></path>
+            <path d="M200.2,1.95 C200.3,1.95 200.1,2.35 200.2,1.95" id="Fill-106" fill="#F6EB3B"></path>
+            <path d="M199.7,1.85 C199.8,1.85 199.8,1.95 199.9,1.95 C199.8,2.15 199.8,2.15 199.8,2.35 C199.7,2.35 199.6,2.35 199.5,2.35 C199.3,2.25 199.6,2.25 199.7,2.25 C199.7,2.15 199.6,2.05 199.5,2.15 C199.5,2.05 199.6,2.05 199.7,2.05 C199.7,2.15 199.8,2.05 199.7,2.05 C199.7,1.95 199.7,1.95 199.7,1.85" id="Fill-107" fill="#F6EB3B"></path>
+            <path d="M201.6,1.95 C201.6,1.95 201.6,1.75 201.6,1.95" id="Fill-108" fill="#F6EB3B"></path>
+            <path d="M202.7,1.75 C202.7,1.75 202.8,1.85 202.7,1.75" id="Fill-109" fill="#F6EB3B"></path>
+            <path d="M175,3.05 C175,3.05 175,2.95 175,3.05" id="Fill-110" fill="#F6EB3B"></path>
+            <path d="M197.1,2.55 C197.1,2.55 197.1,2.65 197.1,2.55" id="Fill-111" fill="#F6EB3B"></path>
+            <path d="M198.1,2.35 C198.1,2.35 198.1,2.45 198.1,2.35" id="Fill-112" fill="#F6EB3B"></path>
+            <path d="M199.6,2.05 C199.6,2.15 199.5,2.05 199.6,2.05" id="Fill-113" fill="#F6EB3B"></path>
+            <path d="M199.6,2.05 C199.7,2.05 199.7,2.15 199.6,2.05" id="Fill-114" fill="#F6EB3B"></path>
+            <path d="M199.8,2.45 C199.7,2.45 199.8,2.15 199.7,2.15 C199.8,1.75 199.9,2.25 199.8,2.45" id="Fill-115" fill="#F6EB3B"></path>
+            <path d="M200.4,1.95 C200.2,2.15 200.1,2.35 199.9,2.45 C200,2.05 200.2,1.95 200.4,1.95" id="Fill-116" fill="#F6EB3B"></path>
+            <path d="M201.6,1.95 C201.8,2.05 201.5,2.25 201.6,1.95" id="Fill-117" fill="#F6EB3B"></path>
+            <path d="M197.9,2.35 C198.2,2.25 198.3,2.45 198.6,2.35 C198.9,2.55 199.1,2.45 199.3,2.05 C199.2,2.55 199.4,1.95 199.5,2.45 C198.8,2.55 198.5,2.65 197.9,2.35 C197.9,2.35 197.9,2.35 197.9,2.35" id="Fill-118" fill="#F6EB3B"></path>
+            <path d="M202.3,1.95 C202.3,1.95 202.3,2.05 202.3,1.95" id="Fill-119" fill="#F6EB3B"></path>
+            <path d="M197.3,2.55 C197.2,2.85 197.1,2.65 196.8,2.75 C196.8,2.45 197.1,2.55 197.3,2.55" id="Fill-120" fill="#F6EB3B"></path>
+            <path d="M197.7,2.55 C197.8,2.35 197.5,2.95 197.7,2.55" id="Fill-121" fill="#F6EB3B"></path>
+            <path d="M198,2.45 C198,2.55 198.1,2.55 198.2,2.55 C198.2,2.75 198.1,2.75 198.1,2.65 C198,2.65 198,2.55 198,2.45" id="Fill-122" fill="#F6EB3B"></path>
+            <path d="M198.5,2.55 C198.4,2.55 198.4,2.55 198.3,2.55 C198.4,2.65 198.5,2.65 198.5,2.75 C198.7,2.85 198,2.95 198.1,2.65 C198.1,2.45 198.2,2.75 198.3,2.65 C198.3,2.55 198.2,2.45 198.1,2.45 C198.2,2.15 198.3,2.55 198.4,2.25 C198.5,2.45 198.5,2.45 198.5,2.55" id="Fill-123" fill="#F6EB3B"></path>
+            <path d="M199.9,2.25 C200,1.85 200.1,2.55 199.9,2.25" id="Fill-124" fill="#F6EB3B"></path>
+            <path d="M202.3,2.05 C202.4,2.15 202.4,2.25 202.5,2.25 C202.5,2.65 202.2,2.25 202.3,2.05" id="Fill-125" fill="#F6EB3B"></path>
+            <path d="M197.9,2.65 C197.9,2.55 198,2.55 198,2.55 C198,2.65 197.9,2.65 197.9,2.65" id="Fill-126" fill="#F6EB3B"></path>
+            <path d="M198.1,2.65 C198.1,2.65 198.1,2.75 198.1,2.75 C198,2.75 198,2.75 198,2.95 C197.9,2.75 198.8,2.75 198.7,2.75 C198.7,2.65 198.7,2.55 198.6,2.65 C198.6,2.65 198.6,2.55 198.6,2.55 C198.6,2.55 198.6,2.55 198.6,2.45 C198.6,2.45 198.6,2.55 198.6,2.65 C198.9,2.75 197.9,2.65 198.1,2.65" id="Fill-127" fill="#F6EB3B"></path>
+            <path d="M200.2,2.25 C200.2,2.25 200.2,2.35 200.2,2.25" id="Fill-128" fill="#F6EB3B"></path>
+            <path d="M200.7,2.25 C200.6,2.25 200.7,2.35 200.7,2.25" id="Fill-129" fill="#F6EB3B"></path>
+            <path d="M201.8,2.35 C201.8,2.15 201.9,2.15 202,2.15 C202,2.25 201.9,2.35 201.8,2.35" id="Fill-130" fill="#F6EB3B"></path>
+            <path d="M202,2.25 C202,2.05 202.1,2.25 202.2,2.25 C202.2,2.45 202.1,2.25 202,2.25" id="Fill-131" fill="#F6EB3B"></path>
+            <path d="M196.9,2.65 C196.9,2.55 196.9,2.65 196.9,2.65" id="Fill-132" fill="#F6EB3B"></path>
+            <path d="M197.1,2.65 C197.2,2.25 197.2,3.05 197.1,2.65" id="Fill-133" fill="#F6EB3B"></path>
+            <path d="M198.6,2.75 C198.5,3.05 198.4,2.65 198.3,2.75 C198.4,2.45 198.5,2.75 198.6,2.75" id="Fill-134" fill="#F6EB3B"></path>
+            <path d="M201,2.35 C201,2.25 201.1,2.35 201,2.35" id="Fill-135" fill="#F6EB3B"></path>
+            <path d="M201.4,2.35 C201.4,2.25 201.5,2.25 201.6,2.25 C201.6,2.35 201.5,2.35 201.4,2.35" id="Fill-136" fill="#F6EB3B"></path>
+            <path d="M200.4,2.45 C200.4,1.95 200.6,2.35 200.4,2.45" id="Fill-137" fill="#F6EB3B"></path>
+            <path d="M202.5,2.25 C202.5,2.25 202.6,2.35 202.5,2.25" id="Fill-138" fill="#F6EB3B"></path>
+            <path d="M196.7,2.75 C196.7,2.55 196.9,2.65 197,2.65 C196.8,2.95 196.8,2.95 196.7,2.75" id="Fill-139" fill="#F6EB3B"></path>
+            <path d="M197,2.65 C197,2.65 197,2.75 197,2.65" id="Fill-140" fill="#F6EB3B"></path>
+            <path d="M197.2,2.55 C197.3,2.55 197.3,2.55 197.4,2.55 C197.5,2.85 197.3,2.75 197.2,2.75 C197.2,2.75 197.2,2.65 197.2,2.55" id="Fill-141" fill="#F6EB3B"></path>
+            <path d="M197.4,2.85 C197.5,2.45 197.5,3.15 197.4,2.85" id="Fill-142" fill="#F6EB3B"></path>
+            <path d="M198.5,2.75 C198.5,2.65 198.6,2.65 198.5,2.75 C198.6,2.75 198.5,2.75 198.5,2.75" id="Fill-143" fill="#F6EB3B"></path>
+            <path d="M200,2.35 C200,2.35 200.1,2.45 200,2.35" id="Fill-144" fill="#F6EB3B"></path>
+            <path d="M201.9,2.25 C201.9,2.55 201.6,2.15 201.9,2.25" id="Fill-145" fill="#F6EB3B"></path>
+            <path d="M196.4,2.75 C196.4,2.85 196.5,2.85 196.5,2.75 C196.7,2.85 196.3,3.15 196.4,2.75" id="Fill-146" fill="#F6EB3B"></path>
+            <path d="M196.6,2.85 C196.5,2.85 196.6,2.95 196.6,2.85" id="Fill-147" fill="#F6EB3B"></path>
+            <path d="M197.6,2.75 C197.7,2.95 197.5,3.35 197.8,3.35 C197.8,3.45 197.6,3.45 197.5,3.45 C197.6,3.25 197.5,2.95 197.3,3.05 C197.4,2.85 197.6,3.05 197.6,2.75" id="Fill-148" fill="#F6EB3B"></path>
+            <path d="M198.7,2.95 C198.7,3.15 198.5,2.95 198.5,3.05 C198.5,3.15 198.3,3.15 198.4,3.35 C198.3,3.35 198.3,3.45 198.2,3.45 C198.2,3.25 198.3,3.25 198.4,3.05 C198.3,2.85 198.2,3.15 198.2,2.95 C198.2,2.55 198.5,3.05 198.7,2.95" id="Fill-149" fill="#F6EB3B"></path>
+            <path d="M198.6,2.75 C198.7,2.75 198.7,2.85 198.8,2.85 C198.8,2.95 198.7,2.95 198.8,3.15 C198.8,3.15 198.7,3.05 198.7,3.05 C198.6,2.85 198.6,2.75 198.6,2.75" id="Fill-150" fill="#F6EB3B"></path>
+            <path d="M200.3,2.45 C200.3,2.35 200.3,2.45 200.3,2.45" id="Fill-151" fill="#F6EB3B"></path>
+            <path d="M200.4,2.35 C200.4,2.45 200.3,2.45 200.4,2.35" id="Fill-152" fill="#F6EB3B"></path>
+            <path d="M197.1,2.95 C197,2.95 197.1,3.15 197,3.15 C197,3.05 196.9,3.15 197,3.15 C197,3.15 197,3.25 197,3.25 C196.9,3.25 196.9,3.25 196.9,3.15 C196.9,3.15 196.8,3.25 196.8,3.25 C196.8,3.05 196.7,3.35 196.6,3.25 C196.6,3.25 196.6,3.15 196.6,3.15 C196.6,3.15 196.6,3.05 196.7,3.05 C196.8,3.25 196.8,2.85 196.9,2.95 C196.9,3.05 196.9,3.05 196.9,3.05 C197,3.05 197,2.95 197.1,2.95 C197,2.85 196.9,2.85 196.8,2.85 C196.9,2.65 197.1,2.75 197.1,2.95 C197.1,2.85 197.1,2.95 197.1,2.95" id="Fill-153" fill="#F6EB3B"></path>
+            <path d="M197.9,3.15 C197.9,3.05 197.9,3.05 197.9,2.95 C198,2.75 198.2,2.65 198.3,3.15 C198.1,2.95 198,3.05 197.9,3.15" id="Fill-154" fill="#F6EB3B"></path>
+            <path d="M198.6,2.85 C198.6,2.75 198.7,2.75 198.8,2.75 C198.7,2.85 198.7,2.85 198.6,2.85" id="Fill-155" fill="#F6EB3B"></path>
+            <path d="M201.8,2.45 C201.8,2.35 201.8,2.45 201.8,2.45" id="Fill-156" fill="#F6EB3B"></path>
+            <path d="M196.5,2.95 C196.5,2.95 196.5,3.05 196.5,2.95" id="Fill-157" fill="#F6EB3B"></path>
+            <path d="M196.6,2.95 C196.6,2.95 196.5,2.95 196.6,2.95 C196.6,2.95 196.6,2.95 196.6,2.95" id="Fill-158" fill="#F6EB3B"></path>
+            <path d="M196.8,2.95 C196.8,2.85 196.9,2.85 196.8,2.95 C196.9,2.95 196.8,2.95 196.8,2.95" id="Fill-159" fill="#F6EB3B"></path>
+            <path d="M197.1,2.95 C197.2,2.75 197.3,2.85 197.4,2.85 C197.4,3.05 197.3,2.95 197.2,2.95 C197.2,3.55 197.3,3.25 197.4,3.55 C197.2,3.45 197.1,3.65 196.9,3.55 C196.9,3.35 197,3.45 197.1,3.55 C197.2,3.35 197.3,2.95 197.1,2.95" id="Fill-160" fill="#F6EB3B"></path>
+            <path d="M198,3.05 C198,3.15 198,3.15 198.1,3.15 C198,3.35 197.9,3.25 197.7,3.35 C197.7,3.15 198,2.95 197.6,3.05 C197.5,2.85 197.8,2.95 197.9,2.85 C197.9,2.95 197.8,3.05 197.9,3.15 C197.9,3.15 198,3.15 198,3.05" id="Fill-161" fill="#F6EB3B"></path>
+            <path d="M197.9,2.95 C197.8,2.95 197.9,2.85 197.9,2.95" id="Fill-162" fill="#F6EB3B"></path>
+            <path d="M198.1,2.85 C198.2,3.15 198.6,2.65 198.6,3.15 C198.3,3.15 198.3,3.15 198.1,3.05 C198,2.95 198.1,2.85 198.1,2.85" id="Fill-163" fill="#F6EB3B"></path>
+            <path d="M199.6,2.85 C199.5,2.65 199.4,2.95 199.3,2.85 C199.3,2.55 199.7,2.35 199.6,2.85" id="Fill-164" fill="#F6EB3B"></path>
+            <path d="M199.6,2.65 C199.6,2.55 199.7,2.55 199.7,2.55 C199.7,2.65 199.7,2.65 199.6,2.65" id="Fill-165" fill="#F6EB3B"></path>
+            <path d="M200.2,2.65 C200.1,2.65 200.1,2.75 200,2.75 C200.1,2.95 200.1,2.85 200.2,2.65 C200.2,3.25 199.8,2.95 199.7,2.95 C199.9,2.85 199.9,2.45 200.2,2.65 C200.2,2.55 200.2,2.55 200.2,2.65" id="Fill-166" fill="#F6EB3B"></path>
+            <path d="M201.2,2.45 C201.2,2.45 201.3,2.55 201.2,2.45" id="Fill-167" fill="#F6EB3B"></path>
+            <path d="M201.9,2.45 C201.9,2.35 202,2.45 201.9,2.45" id="Fill-168" fill="#F6EB3B"></path>
+            <path d="M198.7,2.95 C198.7,2.85 198.8,2.85 198.8,2.95 C198.8,3.15 198.8,2.95 198.7,2.95" id="Fill-169" fill="#F6EB3B"></path>
+            <path d="M198.8,2.95 C198.7,3.05 198.6,2.95 198.4,3.05 C198.5,2.95 198.7,2.75 198.8,2.95" id="Fill-170" fill="#F6EB3B"></path>
+            <path d="M198.8,2.45 C198.8,2.05 198.7,3.15 198.8,2.45" id="Fill-171" fill="#F6EB3B"></path>
+            <path d="M198.9,2.45 C198.9,2.35 199,2.35 199,2.35 C199,2.45 199,2.45 198.9,2.45" id="Fill-172" fill="#F6EB3B"></path>
+            <path d="M200,2.65 C200,2.65 200,2.55 200,2.55 C200,2.55 200.1,2.65 200,2.65" id="Fill-173" fill="#F6EB3B"></path>
+            <path d="M197,2.95 C197,2.95 197,2.95 197,2.95 C197.1,2.95 197,3.05 197,2.95" id="Fill-174" fill="#F6EB3B"></path>
+            <path d="M200.1,2.35 C200.3,2.25 200.3,2.65 200.2,2.75 C200.1,2.75 200.1,2.55 200.1,2.35" id="Fill-176" fill="#F6EB3B"></path>
+            <path d="M200.4,2.45 C200.5,2.05 200.5,2.95 200.4,2.45" id="Fill-177" fill="#F6EB3B"></path>
+            <path d="M198.5,3.05 C198.6,3.05 198.6,3.25 198.7,3.05 C198.9,3.25 198.6,3.25 198.6,3.45 C198.4,3.45 198.5,3.15 198.5,3.05" id="Fill-178" fill="#F6EB3B"></path>
+            <path d="M199.1,2.95 C198.9,2.95 199.1,2.65 199,2.65 C199,2.45 199.2,2.55 199.3,2.55 C199.3,2.65 199.2,2.65 199.1,2.65 C199.1,2.75 199.1,2.85 199.1,2.95" id="Fill-179" fill="#F6EB3B"></path>
+            <path d="M197.1,3.15 C197.3,2.85 197,3.45 197.1,3.15" id="Fill-180" fill="#F6EB3B"></path>
+            <path d="M198.8,3.15 C198.7,3.15 198.8,3.25 198.8,3.15" id="Fill-181" fill="#F6EB3B"></path>
+            <path d="M198.6,3.05 C198.6,3.25 198.6,3.35 198.5,3.45 C198.4,3.45 198.4,3.25 198.3,3.25 C198.4,3.15 198.5,3.05 198.6,3.05" id="Fill-182" fill="#F6EB3B"></path>
+            <path d="M198.6,3.15 C198.6,3.05 198.6,3.15 198.6,3.15" id="Fill-183" fill="#F6EB3B"></path>
+            <path d="M198.9,3.15 C198.9,3.15 198.9,3.15 198.9,3.15 C198.8,3.15 198.9,3.15 198.9,3.15 C198.9,3.25 198.9,3.35 198.8,3.35 C198.8,3.25 198.7,3.35 198.8,3.35 C198.8,3.55 198.6,3.35 198.5,3.55 C198.5,3.55 198.4,3.55 198.4,3.45 C198.4,3.45 198.4,3.35 198.4,3.35 C198.4,3.35 198.5,3.35 198.5,3.45 C198.6,3.45 198.5,3.35 198.6,3.35 C198.6,3.45 198.7,3.35 198.6,3.35 C198.6,3.35 198.6,3.25 198.6,3.25 C198.7,3.25 198.8,3.25 198.8,3.15 C198.9,3.05 199,3.05 198.9,3.15 C199,3.15 198.9,3.15 198.9,3.15" id="Fill-184" fill="#F6EB3B"></path>
+            <path d="M198.4,2.75 C198.3,2.75 198.4,2.55 198.4,2.75" id="Fill-185" fill="#F6EB3B"></path>
+            <path d="M198.6,2.75 C198.6,2.85 198.4,2.85 198.4,2.75 C198.5,2.65 198.5,2.55 198.6,2.75" id="Fill-186" fill="#F6EB3B"></path>
+            <path d="M201.9,2.45 C202.1,2.35 202,2.55 202.2,2.55 C202.1,2.85 202,2.85 201.9,2.75 C201.9,2.65 201.9,2.65 201.9,2.45" id="Fill-187" fill="#F6EB3B"></path>
+            <path d="M202.6,2.45 C202.5,2.35 202.6,2.45 202.6,2.45" id="Fill-188" fill="#F6EB3B"></path>
+            <path d="M197,3.25 C197,3.25 197.1,3.15 197,3.25 C197.1,3.25 197.1,3.25 197,3.25" id="Fill-189" fill="#F6EB3B"></path>
+            <path d="M198.5,3.15 C198.5,3.25 198.4,3.35 198.5,3.35 C198.5,3.65 198.3,3.05 198.3,3.55 C198.3,3.45 198.1,3.55 198.1,3.25 C198.3,3.35 198.3,3.05 198.5,3.15" id="Fill-190" fill="#F6EB3B"></path>
+            <path d="M199.3,2.75 C199.2,2.75 199.3,2.55 199.3,2.75" id="Fill-191" fill="#F6EB3B"></path>
+            <path d="M200.9,2.65 C200.7,3.05 200.7,2.35 200.9,2.65" id="Fill-192" fill="#F6EB3B"></path>
+            <path d="M202.8,2.45 C202.7,2.85 202.6,2.15 202.8,2.45" id="Fill-193" fill="#F6EB3B"></path>
+            <path d="M203.2,2.35 C203.4,2.35 203.1,2.85 203.2,2.35" id="Fill-194" fill="#F6EB3B"></path>
+            <path d="M197.1,3.25 C197.1,3.35 197.1,3.45 197.1,3.55 C197,3.65 196.9,3.75 196.8,3.75 C196.9,3.45 197,3.45 197.1,3.25" id="Fill-195" fill="#F6EB3B"></path>
+            <path d="M196.7,3.25 C196.7,3.25 196.7,3.25 196.7,3.25 C196.6,3.25 196.6,3.25 196.7,3.25" id="Fill-196" fill="#F6EB3B"></path>
+            <path d="M196.8,3.25 C196.8,3.25 196.8,3.15 196.8,3.25 C196.8,3.25 196.8,3.35 196.8,3.25" id="Fill-197" fill="#F6EB3B"></path>
+            <path d="M197.3,3.25 C197.3,2.85 197.3,3.65 197.3,3.25" id="Fill-198" fill="#F6EB3B"></path>
+            <path d="M198.7,3.35 C198.6,3.65 198.6,3.05 198.7,3.35" id="Fill-199" fill="#F6EB3B"></path>
+            <path d="M198,3.35 C198,3.25 198.1,3.25 198.1,3.25 C198.1,3.25 198,3.25 198,3.35" id="Fill-200" fill="#F6EB3B"></path>
+            <path d="M199.1,2.85 C199.2,2.85 199.2,2.75 199.3,2.85 C199.3,2.95 199.1,2.95 199.1,2.85" id="Fill-201" fill="#F6EB3B"></path>
+            <path d="M200.4,2.75 C200.4,2.65 200.5,2.65 200.5,2.75 C200.5,2.95 200.5,2.75 200.4,2.75" id="Fill-202" fill="#F6EB3B"></path>
+            <path d="M200.7,2.65 C200.7,2.55 200.8,2.75 200.7,2.65" id="Fill-203" fill="#F6EB3B"></path>
+            <path d="M200.8,2.65 C200.8,2.55 200.9,2.55 200.9,2.55 C200.9,2.65 200.9,2.65 200.8,2.65" id="Fill-204" fill="#F6EB3B"></path>
+            <path d="M201.7,2.55 C201.7,2.55 201.7,2.65 201.7,2.55" id="Fill-205" fill="#F6EB3B"></path>
+            <path d="M196.7,3.35 C196.7,3.25 196.8,3.25 196.7,3.35 C196.8,3.35 196.8,3.35 196.7,3.35" id="Fill-206" fill="#F6EB3B"></path>
+            <path d="M197.4,3.25 C197.4,3.25 197.5,3.35 197.4,3.25" id="Fill-207" fill="#F6EB3B"></path>
+            <path d="M197.8,3.45 C197.8,3.35 197.9,3.35 197.9,3.35 C197.9,3.45 197.8,3.45 197.8,3.45" id="Fill-208" fill="#F6EB3B"></path>
+            <path d="M198.1,3.35 C198.1,3.35 198.1,3.35 198.1,3.35 C198,3.45 198,3.35 198.1,3.35" id="Fill-209" fill="#F6EB3B"></path>
+            <path d="M198.4,3.35 C198.5,3.25 198.4,3.45 198.4,3.35" id="Fill-210" fill="#F6EB3B"></path>
+            <path d="M197.8,3.35 C197.8,3.35 197.8,3.45 197.8,3.35" id="Fill-211" fill="#F6EB3B"></path>
+            <path d="M198.5,2.95 C198.5,2.75 198.6,2.85 198.5,2.95" id="Fill-212" fill="#F6EB3B"></path>
+            <path d="M198.6,2.95 C198.6,2.85 198.7,2.85 198.7,2.95 C198.7,3.05 198.7,2.95 198.6,2.95" id="Fill-213" fill="#F6EB3B"></path>
+            <path d="M198.9,2.85 C199.2,2.75 198.9,3.15 198.9,2.85" id="Fill-214" fill="#F6EB3B"></path>
+            <path d="M199.8,2.85 C199.8,2.75 199.8,2.95 199.8,2.85" id="Fill-215" fill="#F6EB3B"></path>
+            <path d="M201.4,2.75 C201.4,2.75 201.5,2.85 201.4,2.75" id="Fill-216" fill="#F6EB3B"></path>
+            <path d="M202.2,2.75 C202.2,2.65 202.2,2.75 202.2,2.75" id="Fill-217" fill="#F6EB3B"></path>
+            <path d="M198.1,3.35 C198.1,3.35 198.1,3.35 198.1,3.35 C198.2,3.45 198.2,3.45 198.2,3.55 C198.1,3.65 198.2,3.65 198.2,3.55 C198.3,3.35 198.3,3.55 198.4,3.55 C198.3,3.85 198.2,4.05 198.1,3.75 C198,3.65 198,3.55 198.1,3.35" id="Fill-218" fill="#F6EB3B"></path>
+            <path d="M198.5,2.95 C198.5,3.05 198.4,2.95 198.5,2.95" id="Fill-219" fill="#F6EB3B"></path>
+            <path d="M200.6,2.95 C200.7,2.75 201.1,2.75 201.1,3.15 C201,2.95 200.8,2.95 200.6,2.95" id="Fill-220" fill="#F6EB3B"></path>
+            <path d="M198,3.55 C197.9,3.45 198,3.55 198,3.55" id="Fill-221" fill="#F6EB3B"></path>
+            <path d="M198.3,3.55 C198.5,3.25 198.2,3.85 198.3,3.55" id="Fill-222" fill="#F6EB3B"></path>
+            <path d="M198.6,3.05 C198.6,2.95 198.6,3.15 198.6,3.05" id="Fill-223" fill="#F6EB3B"></path>
+            <path d="M199,3.05 C198.9,2.95 199,3.05 199,3.05" id="Fill-224" fill="#F6EB3B"></path>
+            <path d="M199.6,3.05 C199.7,3.15 199.7,3.15 199.8,2.95 C200,3.05 199.5,3.55 199.6,3.05" id="Fill-225" fill="#F6EB3B"></path>
+            <path d="M200.2,2.95 C200.2,2.85 200.3,2.85 200.3,2.85 C200.3,2.95 200.2,2.95 200.2,2.95" id="Fill-226" fill="#F6EB3B"></path>
+            <path d="M201.3,2.95 C201.2,2.85 201.3,2.95 201.3,2.95" id="Fill-227" fill="#F6EB3B"></path>
+            <path d="M202.2,2.95 C202,3.15 201.9,2.95 201.7,3.05 C201.7,2.75 202.1,2.75 202.2,2.95" id="Fill-228" fill="#F6EB3B"></path>
+            <path d="M197.7,3.65 C197.6,4.05 197.6,3.15 197.7,3.65" id="Fill-229" fill="#F6EB3B"></path>
+            <path d="M197.6,3.65 C197.6,3.55 197.7,3.55 197.6,3.65" id="Fill-230" fill="#F6EB3B"></path>
+            <path d="M199.3,3.05 C199.3,2.95 199.4,2.95 199.4,2.95 C199.4,3.05 199.4,3.05 199.3,3.05" id="Fill-231" fill="#F6EB3B"></path>
+            <path d="M198.8,3.45 C198.8,3.45 198.8,3.55 198.8,3.45" id="Fill-232" fill="#F6EB3B"></path>
+            <path d="M198.4,3.15 C198.3,3.05 198.4,3.15 198.4,3.15" id="Fill-233" fill="#F6EB3B"></path>
+            <path d="M199.1,3.15 C199.1,3.05 199.2,3.05 199.3,3.05 C199.3,3.15 199.2,3.15 199.1,3.15" id="Fill-234" fill="#F6EB3B"></path>
+            <path d="M201.6,2.95 C201.6,3.05 201.5,3.15 201.4,3.15 C201.4,3.05 201.5,2.95 201.4,2.95 C201.4,2.85 201.5,2.95 201.6,2.95" id="Fill-235" fill="#F6EB3B"></path>
+            <path d="M201.5,2.95 C201.5,2.85 201.6,2.85 201.6,2.95 C201.6,2.95 201.6,2.95 201.5,2.95" id="Fill-236" fill="#F6EB3B"></path>
+            <path d="M200.6,2.85 C200.6,2.95 200.6,2.95 200.6,3.05 C200.5,3.05 202.2,3.05 202.2,2.95 C202.2,2.85 200.6,2.85 200.6,2.85" id="Fill-237" fill="#F6EB3B"></path>
+            <path d="M201.4,3.05 C201.4,2.65 201.7,3.05 201.4,3.05" id="Fill-239" fill="#F6EB3B"></path>
+            <path d="M202.2,2.85 C202.2,2.85 202.2,2.95 202.2,2.85" id="Fill-240" fill="#F6EB3B"></path>
+            <path d="M196.9,3.65 C196.8,3.55 196.9,3.65 196.9,3.65" id="Fill-241" fill="#F6EB3B"></path>
+            <path d="M197.5,3.65 C197.5,3.65 197.5,3.55 197.5,3.65" id="Fill-242" fill="#F6EB3B"></path>
+            <path d="M197.6,3.65 C197.6,3.75 197.6,3.65 197.6,3.65" id="Fill-243" fill="#F6EB3B"></path>
+            <path d="M197.8,3.65 C197.9,3.35 197.9,4.05 197.8,3.65" id="Fill-244" fill="#F6EB3B"></path>
+            <path d="M198.4,3.55 C198.4,3.55 198.5,3.65 198.4,3.55" id="Fill-245" fill="#F6EB3B"></path>
+            <path d="M200.9,3.05 C201.1,2.85 200.7,3.45 200.9,3.05" id="Fill-246" fill="#F6EB3B"></path>
+            <path d="M201.6,2.95 C201.7,2.95 201.6,3.15 201.6,2.95" id="Fill-247" fill="#F6EB3B"></path>
+            <path d="M202.1,3.05 C202.1,2.95 202.2,2.95 202.2,2.95 C202.2,3.05 202.1,3.05 202.1,3.05" id="Fill-248" fill="#F6EB3B"></path>
+            <path d="M197.5,3.65 C197.6,3.65 197.6,3.85 197.5,3.65" id="Fill-249" fill="#F6EB3B"></path>
+            <path d="M197.7,3.75 C197.8,3.45 197.8,4.15 197.7,3.75" id="Fill-250" fill="#F6EB3B"></path>
+            <path d="M197.9,3.75 C197.9,3.65 198,3.65 198.1,3.65 C198,3.75 198,3.75 197.9,3.75" id="Fill-251" fill="#F6EB3B"></path>
+            <path d="M198.1,3.65 C198.1,4.05 197.9,3.65 198.1,3.65" id="Fill-252" fill="#F6EB3B"></path>
+            <path d="M200.2,3.25 C200,3.35 199.7,3.35 199.6,3.35 C199.8,3.15 200.1,3.05 200.2,3.25" id="Fill-253" fill="#F6EB3B"></path>
+            <path d="M201.2,3.15 C201.2,2.95 201.5,2.95 201.4,3.25 C201.4,3.25 201.2,3.15 201.2,3.15" id="Fill-254" fill="#F6EB3B"></path>
+            <path d="M200.7,2.95 C200.7,2.95 200.7,3.15 200.7,2.95" id="Fill-255" fill="#F6EB3B"></path>
+            <path d="M201.8,3.05 C201.8,3.05 201.8,2.85 201.8,3.05" id="Fill-256" fill="#F6EB3B"></path>
+            <path d="M201.9,3.05 C201.9,2.95 201.9,3.05 201.9,3.05" id="Fill-257" fill="#F6EB3B"></path>
+            <path d="M202.5,2.95 C202.4,2.95 202.5,3.05 202.5,2.95" id="Fill-258" fill="#F6EB3B"></path>
+            <path d="M202.8,2.85 C202.9,2.85 202.8,3.05 202.9,3.05 C202.9,3.35 202.7,3.15 202.8,2.85" id="Fill-259" fill="#F6EB3B"></path>
+            <path d="M203.3,2.95 C203.3,2.85 203.4,3.05 203.3,2.95" id="Fill-260" fill="#F6EB3B"></path>
+            <path d="M197.1,3.75 C197.1,3.75 197.2,3.85 197.1,3.75" id="Fill-261" fill="#F6EB3B"></path>
+            <path d="M197.3,3.85 C197.3,3.75 197.4,3.75 197.4,3.75 C197.4,3.75 197.3,3.75 197.3,3.85" id="Fill-262" fill="#F6EB3B"></path>
+            <path d="M197.4,3.75 C197.5,3.45 197.3,4.45 197.4,3.75" id="Fill-263" fill="#F6EB3B"></path>
+            <path d="M196.9,3.75 C196.9,3.95 196.7,3.75 196.6,3.85 C196.7,3.75 196.9,3.65 196.9,3.75" id="Fill-264" fill="#F6EB3B"></path>
+            <path d="M196.8,3.75 C196.9,3.45 197.1,3.85 196.8,3.75" id="Fill-265" fill="#F6EB3B"></path>
+            <path d="M197,3.75 C196.9,3.65 197,3.75 197,3.75" id="Fill-266" fill="#F6EB3B"></path>
+            <path d="M196.9,3.75 C196.9,3.45 197,4.05 196.9,3.75" id="Fill-267" fill="#F6EB3B"></path>
+            <path d="M197.1,3.65 C197.1,3.65 197.2,3.75 197.1,3.65" id="Fill-268" fill="#F6EB3B"></path>
+            <path d="M197.6,3.75 C197.6,3.75 197.7,3.85 197.6,3.75" id="Fill-269" fill="#F6EB3B"></path>
+            <path d="M200.2,3.25 C200.2,3.05 200.5,3.05 200.4,3.35 C200.4,3.35 200.3,3.35 200.3,3.35 C200.2,3.35 200.2,3.25 200.2,3.25" id="Fill-270" fill="#F6EB3B"></path>
+            <path d="M200.7,3.25 C200.7,3.15 200.8,3.15 200.8,3.15 C200.8,3.25 200.7,3.25 200.7,3.25" id="Fill-271" fill="#F6EB3B"></path>
+            <path d="M200.8,3.15 C200.8,2.95 201,3.05 201.1,3.05 C201.1,3.25 200.9,3.15 200.8,3.15" id="Fill-272" fill="#F6EB3B"></path>
+            <path d="M201.6,3.05 C201.6,3.05 201.6,3.15 201.6,3.05" id="Fill-273" fill="#F6EB3B"></path>
+            <path d="M201.8,3.05 C202,3.05 201.8,3.45 201.8,3.05" id="Fill-274" fill="#F6EB3B"></path>
+            <path d="M202,3.15 C202,3.05 202.1,3.05 202.1,3.05 C202.1,3.05 202.1,3.05 202,3.15" id="Fill-275" fill="#F6EB3B"></path>
+            <path d="M202.3,3.05 C202.3,2.95 202.4,2.95 202.4,2.95 C202.4,3.05 202.3,3.05 202.3,3.05" id="Fill-276" fill="#F6EB3B"></path>
+            <path d="M202.6,3.05 C202.6,3.05 202.6,3.15 202.6,3.05" id="Fill-277" fill="#F6EB3B"></path>
+            <path d="M197.8,3.75 C198,3.85 197.9,3.85 198.1,3.75 C198.1,4.15 197.8,4.15 197.8,3.75" id="Fill-278" fill="#F6EB3B"></path>
+            <path d="M197.8,3.85 C197.8,3.75 197.9,3.75 197.9,3.85 C197.9,3.85 197.8,3.85 197.8,3.85" id="Fill-279" fill="#F6EB3B"></path>
+            <path d="M200.4,3.35 C200.4,3.25 200.5,3.25 200.6,3.25 C200.6,3.35 200.5,3.35 200.4,3.35" id="Fill-280" fill="#F6EB3B"></path>
+            <path d="M201.8,3.25 C201.8,3.15 201.9,3.15 201.9,3.15 C201.9,3.25 201.9,3.25 201.8,3.25" id="Fill-281" fill="#F6EB3B"></path>
+            <path d="M202.3,3.25 C202.3,3.15 202.3,3.25 202.3,3.25" id="Fill-282" fill="#F6EB3B"></path>
+            <path d="M201.9,3.15 C201.9,3.05 202,3.05 202,3.05 C202,3.15 201.9,3.15 201.9,3.15" id="Fill-283" fill="#F6EB3B"></path>
+            <path d="M202.5,3.15 C202.5,3.05 202.6,3.15 202.5,3.15" id="Fill-284" fill="#F6EB3B"></path>
+            <path d="M202.9,3.15 C202.9,3.05 203,3.05 203,3.05 C203,3.15 202.9,3.15 202.9,3.15" id="Fill-285" fill="#F6EB3B"></path>
+            <path d="M199.9,3.55 C199.7,3.55 199.9,3.05 199.9,3.55" id="Fill-286" fill="#F6EB3B"></path>
+            <path d="M201.6,3.25 C201.6,3.15 201.7,3.35 201.6,3.25" id="Fill-287" fill="#F6EB3B"></path>
+            <path d="M202.2,3.25 C202.2,3.15 202.2,3.25 202.2,3.25" id="Fill-288" fill="#F6EB3B"></path>
+            <path d="M196.4,4.15 C196.4,4.15 196.4,4.15 196.4,4.15 C196.4,4.05 196.4,3.95 196.5,3.95 C196.4,4.05 196.4,4.05 196.4,4.15" id="Fill-289" fill="#F6EB3B"></path>
+            <path d="M197.1,3.95 C197.1,3.55 197.1,4.25 197.1,3.95" id="Fill-290" fill="#F6EB3B"></path>
+            <path d="M198.1,3.95 C198.1,3.85 198.1,3.95 198.1,3.95" id="Fill-291" fill="#F6EB3B"></path>
+            <path d="M198.5,3.95 C198.3,4.05 198.5,3.65 198.5,3.95" id="Fill-292" fill="#F6EB3B"></path>
+            <path d="M200.2,3.45 C200.2,3.45 200.2,3.55 200.2,3.45" id="Fill-293" fill="#F6EB3B"></path>
+            <path d="M200.9,3.45 C200.9,3.35 201,3.45 200.9,3.45" id="Fill-294" fill="#F6EB3B"></path>
+            <path d="M201.5,3.45 C201.8,3.15 202,3.75 201.5,3.45" id="Fill-295" fill="#F6EB3B"></path>
+            <path d="M200.4,3.45 C200.5,3.45 200.4,3.65 200.5,3.65 C200.5,3.95 200.3,3.65 200.4,3.45" id="Fill-296" fill="#F6EB3B"></path>
+            <path d="M200.6,3.55 C200.6,3.45 200.6,3.45 200.6,3.55" id="Fill-297" fill="#F6EB3B"></path>
+            <path d="M200.7,3.55 C200.7,3.45 200.7,3.55 200.7,3.55" id="Fill-298" fill="#F6EB3B"></path>
+            <path d="M200.8,3.55 C200.8,3.35 200.9,3.45 200.8,3.55" id="Fill-299" fill="#F6EB3B"></path>
+            <path d="M201.8,3.45 C201.8,3.45 201.9,3.55 201.8,3.45" id="Fill-300" fill="#F6EB3B"></path>
+            <path d="M201.9,3.45 C201.9,3.45 201.9,3.55 201.9,3.45" id="Fill-301" fill="#F6EB3B"></path>
+            <path d="M201.2,3.45 C201.2,3.35 201.3,3.35 201.4,3.35 C201.3,3.45 201.2,3.45 201.2,3.45" id="Fill-302" fill="#F6EB3B"></path>
+            <path d="M201.3,3.35 C201.3,3.35 201.3,3.45 201.3,3.35" id="Fill-303" fill="#F6EB3B"></path>
+            <path d="M175.3,4.75 C175.4,4.35 175.4,5.05 175.3,4.75" id="Fill-304" fill="#F6EB3B"></path>
+            <path d="M196.4,4.05 C196.4,4.15 196.3,4.15 196.4,4.05 C196.3,4.05 196.3,4.05 196.4,4.05" id="Fill-305" fill="#F6EB3B"></path>
+            <path d="M196.5,4.05 C196.7,3.95 196.5,4.25 196.5,4.05" id="Fill-306" fill="#F6EB3B"></path>
+            <path d="M196.7,4.05 C196.6,4.05 196.7,4.15 196.7,4.05" id="Fill-307" fill="#F6EB3B"></path>
+            <path d="M200.6,3.55 C200.6,3.75 200.8,3.65 200.9,3.55 C201,3.55 201.2,3.75 201.3,3.65 C201.3,3.95 200.3,3.95 200.6,3.55" id="Fill-308" fill="#F6EB3B"></path>
+            <path d="M201.8,3.65 C201.8,3.95 201.3,3.85 201.3,3.55 C201.5,3.45 201.7,3.65 201.8,3.65" id="Fill-309" fill="#F6EB3B"></path>
+            <path d="M200.9,3.65 C200.8,3.15 201.1,3.55 200.9,3.65" id="Fill-310" fill="#F6EB3B"></path>
+            <path d="M201,3.45 C201,3.45 201,3.55 201,3.45" id="Fill-311" fill="#F6EB3B"></path>
+            <path d="M201.5,3.35 C201.6,3.35 201.6,3.45 201.5,3.65 C202,3.65 202.2,3.65 202.5,3.65 C202.4,4.05 202.1,3.75 202,3.65 C201.7,3.45 201.2,4.15 201,3.55 C201.2,3.55 201.5,3.85 201.5,3.35" id="Fill-312" fill="#F6EB3B"></path>
+            <path d="M201.7,3.65 C201.7,3.45 201.9,3.65 202,3.55 C202.2,3.55 201.6,3.75 201.9,3.95 C201.8,4.35 201.8,3.65 201.7,3.65" id="Fill-313" fill="#F6EB3B"></path>
+            <path d="M202,3.65 C202,3.45 202.5,3.45 202.3,3.85 C202.2,3.65 202.1,3.85 202,3.65" id="Fill-314" fill="#F6EB3B"></path>
+            <path d="M200.9,3.55 C200.9,3.95 202.3,3.75 202.3,3.75 C202.3,3.35 200.8,3.65 200.9,3.55" id="Fill-315" fill="#F6EB3B"></path>
+            <path d="M203.1,3.45 C203.3,3.85 202.7,4.05 202.7,3.85 C202.6,3.15 203,4.25 203.1,3.45" id="Fill-316" fill="#F6EB3B"></path>
+            <path d="M203.2,3.55 C203.2,3.45 203.3,3.45 203.4,3.45 C203.4,3.55 203.3,3.55 203.2,3.55" id="Fill-317" fill="#F6EB3B"></path>
+            <path d="M198.8,4.15 C199,4.35 198.5,4.55 198.6,4.15 C198.6,4.15 198.7,4.15 198.8,4.15" id="Fill-318" fill="#F6EB3B"></path>
+            <path d="M199.6,4.15 C199.6,4.15 199.7,4.25 199.6,4.15" id="Fill-319" fill="#F6EB3B"></path>
+            <path d="M199.8,4.15 C199.8,4.15 199.8,4.25 199.8,4.15" id="Fill-320" fill="#F6EB3B"></path>
+            <path d="M200,4.15 C199.9,4.15 200,4.25 200,4.15" id="Fill-321" fill="#F6EB3B"></path>
+            <path d="M199.9,3.75 C199.9,3.75 200,3.75 200,3.75 C200,3.85 200,3.85 200,3.95 C200,3.95 199.9,3.95 199.9,3.95 C199.9,3.85 199.9,3.85 199.9,3.75" id="Fill-322" fill="#F6EB3B"></path>
+            <path d="M203.5,3.75 C203.5,3.75 203.4,3.75 203.4,3.85 C203.3,3.75 203.5,3.15 203.5,3.75" id="Fill-323" fill="#F6EB3B"></path>
+            <path d="M197,4.35 C196.9,4.25 197,4.35 197,4.35" id="Fill-324" fill="#F6EB3B"></path>
+            <path d="M197.4,4.15 C197.3,4.55 197.2,4.15 197.1,4.35 C197.1,4.55 197.3,4.25 197.3,4.65 C197.2,4.55 197.1,4.55 197,4.35 C197,4.15 197.2,4.15 197.4,4.15" id="Fill-325" fill="#F6EB3B"></path>
+            <path d="M198.7,4.35 C198.7,4.25 198.7,4.25 198.7,4.35 C198.7,4.35 198.7,4.35 198.7,4.35" id="Fill-326" fill="#F6EB3B"></path>
+            <path d="M198,4.35 C198.2,4.25 197.5,4.35 198,4.35" id="Fill-327" fill="#F6EB3B"></path>
+            <path d="M200,4.25 C200,4.15 200.1,4.25 200,4.25" id="Fill-328" fill="#F6EB3B"></path>
+            <path d="M200.4,3.95 C200.5,3.45 200.5,4.25 200.4,3.95" id="Fill-329" fill="#F6EB3B"></path>
+            <path d="M197.7,4.35 C197.7,4.35 197.7,4.35 197.7,4.35 C197.6,4.45 197.6,4.35 197.7,4.35" id="Fill-330" fill="#F6EB3B"></path>
+            <path d="M196.9,4.35 C196.9,4.55 196.7,4.25 196.9,4.35" id="Fill-331" fill="#F6EB3B"></path>
+            <path d="M196.7,4.45 C196.8,4.35 197,4.15 197.1,4.45 C197,4.65 196.8,4.55 196.7,4.45" id="Fill-332" fill="#F6EB3B"></path>
+            <path d="M197.4,4.35 C197.4,4.25 197.5,4.35 197.4,4.35" id="Fill-333" fill="#F6EB3B"></path>
+            <path d="M198.6,4.35 C198.6,4.35 198.7,4.35 198.6,4.35 C198.7,4.35 198.6,4.45 198.6,4.35" id="Fill-334" fill="#F6EB3B"></path>
+            <path d="M198.7,4.35 C198.8,4.35 198.7,4.45 198.7,4.35" id="Fill-335" fill="#F6EB3B"></path>
+            <path d="M199.2,4.35 C199.3,3.95 199.3,4.75 199.2,4.35" id="Fill-336" fill="#F6EB3B"></path>
+            <path d="M200.4,4.25 C200.4,4.25 200.5,4.35 200.4,4.25" id="Fill-337" fill="#F6EB3B"></path>
+            <path d="M200.6,4.25 C200.6,4.15 200.7,4.15 200.7,4.15 C200.7,4.25 200.6,4.25 200.6,4.25" id="Fill-338" fill="#F6EB3B"></path>
+            <path d="M203.2,3.75 C203.2,3.65 203.3,3.65 203.4,3.65 C203.4,3.75 203.3,3.75 203.2,3.75" id="Fill-340" fill="#F6EB3B"></path>
+            <path d="M203.5,3.75 C203.5,3.75 203.5,3.65 203.5,3.65 C203.6,3.65 203.6,3.75 203.7,3.85 C203.6,3.85 203.5,3.75 203.5,3.75" id="Fill-341" fill="#F6EB3B"></path>
+            <path d="M197.8,4.35 C197.8,4.35 197.9,4.35 197.9,4.35 C197.8,4.65 197.5,4.85 197.4,4.55 C197.4,4.35 197.8,4.65 197.8,4.35" id="Fill-342" fill="#F6EB3B"></path>
+            <path d="M196.7,4.35 C196.7,4.65 196.5,4.35 196.7,4.35" id="Fill-343" fill="#F6EB3B"></path>
+            <path d="M196.7,4.45 C196.4,4.55 196.6,4.15 196.7,4.45" id="Fill-344" fill="#F6EB3B"></path>
+            <path d="M198,4.45 C198,4.75 197.9,4.65 197.9,4.45 C197.9,4.45 198,4.45 198,4.45" id="Fill-345" fill="#F6EB3B"></path>
+            <path d="M198.6,4.45 C198.6,4.65 198.3,4.55 198.2,4.55 C198.2,4.35 198.5,4.35 198.6,4.45" id="Fill-346" fill="#F6EB3B"></path>
+            <path d="M198.5,4.45 C198.5,4.35 198.6,4.45 198.5,4.45" id="Fill-347" fill="#F6EB3B"></path>
+            <path d="M198.6,4.45 C198.6,4.25 198.8,4.35 198.9,4.35 C198.8,4.55 198.7,4.35 198.6,4.45" id="Fill-348" fill="#F6EB3B"></path>
+            <path d="M199,4.45 C199,4.35 199,4.35 199,4.45 C199.1,4.45 199,4.35 199,4.45" id="Fill-349" fill="#F6EB3B"></path>
+            <path d="M199.1,4.35 C199.1,4.35 199.2,4.45 199.1,4.35" id="Fill-350" fill="#F6EB3B"></path>
+            <path d="M199.4,4.35 C199.4,4.05 199.4,4.75 199.4,4.35" id="Fill-351" fill="#F6EB3B"></path>
+            <path d="M199.9,4.35 C199.9,4.35 200,4.35 199.9,4.35" id="Fill-352" fill="#F6EB3B"></path>
+            <path d="M202.1,4.25 C202.1,4.15 202.1,4.25 202.1,4.25" id="Fill-353" fill="#F6EB3B"></path>
+            <path d="M203.4,3.75 C203.4,3.75 203.5,3.75 203.4,3.75 C203.5,3.75 203.4,3.85 203.4,3.75" id="Fill-354" fill="#F6EB3B"></path>
+            <path d="M196.9,4.55 C197.2,4.25 197.3,4.85 196.9,4.55" id="Fill-355" fill="#F6EB3B"></path>
+            <path d="M196.7,4.45 C196.7,4.45 196.8,4.45 196.8,4.45 C196.8,4.55 196.7,4.55 196.7,4.45" id="Fill-356" fill="#F6EB3B"></path>
+            <path d="M197.4,4.45 C197.5,4.25 197.3,4.75 197.4,4.45" id="Fill-357" fill="#F6EB3B"></path>
+            <path d="M198.1,4.55 C198.1,4.45 198.2,4.45 198.1,4.55 C198.2,4.55 198.2,4.45 198.1,4.55" id="Fill-358" fill="#F6EB3B"></path>
+            <path d="M200.1,4.45 C200.2,4.15 200.4,4.55 200.1,4.45" id="Fill-359" fill="#F6EB3B"></path>
+            <path d="M200.3,4.35 C200.4,4.45 200.3,4.85 200.2,4.75 C200.2,4.55 200.3,4.55 200.3,4.35" id="Fill-360" fill="#F6EB3B"></path>
+            <path d="M200.7,4.35 C200.7,4.35 200.8,4.45 200.7,4.35" id="Fill-361" fill="#F6EB3B"></path>
+            <path d="M203.6,3.75 C203.6,3.75 203.6,3.95 203.6,3.75" id="Fill-362" fill="#F6EB3B"></path>
+            <path d="M196.8,4.75 C196.8,4.75 196.7,4.75 196.6,4.75 C196.6,4.45 196.8,4.55 197,4.45 C197,4.75 196.8,4.55 196.8,4.75" id="Fill-363" fill="#F6EB3B"></path>
+            <path d="M197.2,4.55 C197.2,4.45 197.3,4.55 197.2,4.55" id="Fill-364" fill="#F6EB3B"></path>
+            <path d="M197.9,4.65 C197.9,4.55 197.9,4.55 197.9,4.65 C197.9,4.65 197.9,4.65 197.9,4.65" id="Fill-365" fill="#F6EB3B"></path>
+            <path d="M199.5,4.45 C199.5,4.45 199.6,4.55 199.5,4.45" id="Fill-366" fill="#F6EB3B"></path>
+            <path d="M202.1,4.35 C202.2,3.95 202.1,4.85 202.1,4.35" id="Fill-367" fill="#F6EB3B"></path>
+            <path d="M197.9,4.55 C198,4.65 197.9,4.75 197.9,4.95 C197.8,4.95 197.8,4.85 197.8,4.75 C197.8,4.75 197.8,4.75 197.8,4.85 C197.5,4.65 197.9,4.75 197.9,4.55" id="Fill-368" fill="#F6EB3B"></path>
+            <path d="M198.6,4.55 C198.4,4.85 198.1,4.45 198.6,4.55" id="Fill-369" fill="#F6EB3B"></path>
+            <path d="M198.7,4.55 C198.8,4.75 198.8,4.45 199,4.55 C199,4.65 198.7,4.95 198.7,4.55" id="Fill-370" fill="#F6EB3B"></path>
+            <path d="M199.4,4.55 C199.4,4.55 199.4,4.65 199.4,4.55" id="Fill-371" fill="#F6EB3B"></path>
+            <path d="M202.2,4.45 C202.1,4.75 202,4.15 202.2,4.45" id="Fill-372" fill="#F6EB3B"></path>
+            <path d="M202.2,4.45 C202.2,4.35 202.3,4.45 202.2,4.45" id="Fill-373" fill="#F6EB3B"></path>
+            <path d="M202.3,4.45 C202.3,4.35 202.4,4.45 202.3,4.45" id="Fill-374" fill="#F6EB3B"></path>
+            <path d="M201.2,4.45 C201.1,4.45 201.1,4.55 201,4.55 C201.1,4.45 201.1,4.35 201.2,4.45 C201.2,4.35 201.2,4.35 201.2,4.45" id="Fill-375" fill="#F6EB3B"></path>
+            <path d="M201.6,4.45 C201.5,4.45 201.4,4.45 201.4,4.25 C201.4,4.25 201.5,4.25 201.5,4.25 C201.6,4.35 201.6,4.45 201.6,4.45 C201.6,4.45 201.6,4.45 201.6,4.45" id="Fill-376" fill="#F6EB3B"></path>
+            <path d="M201.6,4.35 C201.9,4.35 201.6,4.85 201.6,4.35" id="Fill-377" fill="#F6EB3B"></path>
+            <path d="M202,4.55 C202.1,4.55 202.1,4.35 202.1,4.25 C202.2,4.25 202.2,4.45 202.2,4.45 C202.1,4.55 202.1,4.65 202,4.55 C202,4.65 202,4.65 202,4.55" id="Fill-378" fill="#F6EB3B"></path>
+            <path d="M200.1,4.65 C200.1,4.35 200.3,4.75 200.1,4.65" id="Fill-379" fill="#F6EB3B"></path>
+            <path d="M201.1,4.45 C201.1,4.75 202.5,4.45 202.4,4.45 C202.4,4.25 201,4.45 201.1,4.45" id="Fill-380" fill="#F6EB3B"></path>
+            <path d="M201.2,4.35 C201.3,4.45 201.6,4.15 201.6,4.55 C201.4,4.35 201.2,4.95 201.2,4.35" id="Fill-381" fill="#F6EB3B"></path>
+            <path d="M201.8,4.45 C201.8,4.35 201.9,4.35 201.8,4.45" id="Fill-382" fill="#F6EB3B"></path>
+            <path d="M202.2,4.55 C202.2,4.15 202.4,4.45 202.2,4.55" id="Fill-383" fill="#F6EB3B"></path>
+            <path d="M202.7,4.35 C202.8,4.45 202.7,4.55 202.7,4.65 C202.6,4.55 202.7,4.45 202.7,4.35" id="Fill-384" fill="#F6EB3B"></path>
+            <path d="M202.8,4.45 C202.8,4.35 202.9,4.35 202.9,4.35 C202.9,4.45 202.8,4.35 202.8,4.45" id="Fill-385" fill="#F6EB3B"></path>
+            <path d="M197.2,4.95 C197.2,4.85 197.2,4.85 197.2,4.75 C197.3,4.75 197.3,4.75 197.4,4.75 C197.4,4.85 197.3,4.85 197.4,5.05 C197.3,5.05 197.3,4.95 197.2,4.95" id="Fill-386" fill="#F6EB3B"></path>
+            <path d="M197.4,4.85 C197.4,4.75 197.5,4.75 197.5,4.75 C197.5,4.85 197.4,4.85 197.4,4.85" id="Fill-387" fill="#F6EB3B"></path>
+            <path d="M197.6,4.75 C197.6,4.75 197.6,4.85 197.6,4.75" id="Fill-388" fill="#F6EB3B"></path>
+            <path d="M196.7,4.65 C196.8,4.65 196.9,4.65 196.9,4.85 C196.8,4.85 196.8,4.85 196.7,4.85 C196.7,4.85 196.7,4.75 196.7,4.65" id="Fill-389" fill="#F6EB3B"></path>
+            <path d="M196.9,4.75 C196.9,4.75 196.9,4.85 196.9,4.75" id="Fill-390" fill="#F6EB3B"></path>
+            <path d="M200.7,4.65 C200.7,4.55 200.7,4.55 200.7,4.65 C200.8,4.65 200.7,4.65 200.7,4.65" id="Fill-391" fill="#F6EB3B"></path>
+            <path d="M201.4,4.55 C201.4,4.65 201.2,4.65 201.1,4.75 C201.1,4.55 201.2,4.55 201.4,4.55" id="Fill-392" fill="#F6EB3B"></path>
+            <path d="M201.8,4.55 C202,4.25 201.9,4.95 201.8,4.55" id="Fill-393" fill="#F6EB3B"></path>
+            <path d="M201.6,4.45 C201.6,4.45 201.6,4.55 201.6,4.45" id="Fill-394" fill="#F6EB3B"></path>
+            <path d="M201.8,4.55 C201.8,4.45 201.8,4.45 201.8,4.55 C201.8,4.45 201.8,4.55 201.8,4.55" id="Fill-395" fill="#F6EB3B"></path>
+            <path d="M202,4.45 C201.9,4.55 202,4.35 202,4.45" id="Fill-396" fill="#F6EB3B"></path>
+            <path d="M201.4,4.55 C201.5,4.45 201.4,4.65 201.4,4.55" id="Fill-397" fill="#F6EB3B"></path>
+            <path d="M201.8,4.45 C201.8,4.65 201.7,4.55 201.8,4.45" id="Fill-398" fill="#F6EB3B"></path>
+            <path d="M202.3,4.45 C202.3,4.55 202.2,4.55 202.3,4.45" id="Fill-399" fill="#F6EB3B"></path>
+            <path d="M202.5,4.55 C202.5,4.45 202.6,4.55 202.5,4.55" id="Fill-400" fill="#F6EB3B"></path>
+            <path d="M201.9,4.75 C201.9,4.35 201.9,5.05 201.9,4.75" id="Fill-401" fill="#F6EB3B"></path>
+            <path d="M202.2,4.65 C202.3,4.35 202.3,5.05 202.2,4.65" id="Fill-402" fill="#F6EB3B"></path>
+            <path d="M203.4,4.75 C203.4,4.65 203.5,4.75 203.4,4.75" id="Fill-403" fill="#F6EB3B"></path>
+            <path d="M203.1,4.85 C203,4.75 203.1,4.85 203.1,4.85" id="Fill-404" fill="#F6EB3B"></path>
+            <path d="M203.3,4.85 C203.3,4.75 203.3,4.75 203.3,4.85 C203.4,4.85 203.3,4.85 203.3,4.85" id="Fill-405" fill="#F6EB3B"></path>
+            <path d="M199.6,5.15 C199.7,4.75 199.7,5.55 199.6,5.15" id="Fill-406" fill="#F6EB3B"></path>
+            <path d="M199.7,5.15 C199.8,4.75 199.8,5.55 199.7,5.15" id="Fill-407" fill="#F6EB3B"></path>
+            <path d="M199.4,5.25 C199.4,5.15 199.4,5.25 199.4,5.25" id="Fill-408" fill="#F6EB3B"></path>
+            <path d="M199.8,5.25 C199.8,5.15 199.9,5.15 200,5.15 C200,5.25 199.9,5.25 199.8,5.25" id="Fill-409" fill="#F6EB3B"></path>
+            <path d="M200.1,5.15 C200.1,5.15 200.1,5.25 200.1,5.15" id="Fill-410" fill="#F6EB3B"></path>
+            <path d="M200.8,5.15 C200.7,5.15 200.8,5.25 200.8,5.15" id="Fill-411" fill="#F6EB3B"></path>
+            <path d="M202,4.85 C202.2,5.05 202.3,4.75 202.5,4.85 C202.5,5.05 202.3,4.95 202.4,5.05 C202.4,5.05 202,5.25 202,4.85" id="Fill-412" fill="#F6EB3B"></path>
+            <path d="M202.5,4.95 C202.5,4.85 202.6,4.95 202.5,4.95" id="Fill-413" fill="#F6EB3B"></path>
+            <path d="M201.7,5.15 C201.8,4.85 201.8,5.55 201.7,5.15" id="Fill-414" fill="#F6EB3B"></path>
+            <path d="M201.4,5.05 C201.4,5.05 201.5,5.05 201.5,5.05 C201.5,5.15 201.5,5.15 201.5,5.25 C201.5,5.25 201.4,5.25 201.4,5.25 C201.4,5.15 201.4,5.05 201.4,5.05" id="Fill-415" fill="#F6EB3B"></path>
+            <path d="M198.5,5.35 C198.5,5.15 198.8,5.25 198.9,5.25 C198.8,5.45 198.6,5.25 198.5,5.35" id="Fill-416" fill="#F6EB3B"></path>
+            <path d="M199.4,5.25 C199.3,5.25 199.3,5.15 199.4,5.25" id="Fill-417" fill="#F6EB3B"></path>
+            <path d="M201.5,5.25 C201.5,5.15 201.6,5.25 201.5,5.25" id="Fill-418" fill="#F6EB3B"></path>
+            <path d="M202.6,5.15 C202.6,5.15 202.7,5.25 202.6,5.15" id="Fill-419" fill="#F6EB3B"></path>
+            <path d="M197.7,5.55 C197.7,5.25 197.9,5.45 198,5.35 C198,5.75 197.8,5.25 197.7,5.55" id="Fill-420" fill="#F6EB3B"></path>
+            <path d="M199,5.35 C199,5.25 199.1,5.25 199,5.35 C199.1,5.35 199.1,5.35 199,5.35" id="Fill-421" fill="#F6EB3B"></path>
+            <path d="M199.3,5.25 C199.4,5.25 199.4,5.25 199.3,5.25 C199.4,5.35 199.3,5.35 199.3,5.25" id="Fill-422" fill="#F6EB3B"></path>
+            <path d="M202.1,5.25 C201.9,5.35 202,4.95 202.1,5.25" id="Fill-423" fill="#F6EB3B"></path>
+            <path d="M199,5.45 C198.9,5.35 199,5.45 199,5.45" id="Fill-424" fill="#F6EB3B"></path>
+            <path d="M199.4,5.35 C199.8,5.15 199.5,5.65 199.4,5.35" id="Fill-425" fill="#F6EB3B"></path>
+            <path d="M200,5.35 C200,5.35 200.1,5.25 200,5.35 C200.1,5.35 200.1,5.35 200,5.35" id="Fill-426" fill="#F6EB3B"></path>
+            <path d="M200.1,5.35 C200.2,5.25 200.4,5.45 200.6,5.35 C200.6,5.45 200.5,5.45 200.5,5.65 C200.4,5.25 200.1,5.75 200.1,5.35" id="Fill-427" fill="#F6EB3B"></path>
+            <path d="M200.8,5.35 C200.8,5.25 200.9,5.25 200.8,5.35" id="Fill-428" fill="#F6EB3B"></path>
+            <path d="M200.3,5.15 C200.3,5.25 200.3,5.25 200.3,5.15 C200.3,5.25 200.3,5.25 200.3,5.15" id="Fill-429" fill="#F6EB3B"></path>
+            <path d="M202.4,5.25 C202.4,5.15 202.5,5.15 202.5,5.15 C202.5,5.25 202.5,5.25 202.4,5.25" id="Fill-430" fill="#F6EB3B"></path>
+            <path d="M198.3,5.45 C198.3,5.45 198.4,5.55 198.3,5.45" id="Fill-431" fill="#F6EB3B"></path>
+            <path d="M198.4,5.45 C198.4,5.45 198.4,5.55 198.4,5.45" id="Fill-432" fill="#F6EB3B"></path>
+            <path d="M199.7,5.45 C199.7,5.35 199.7,5.45 199.7,5.45" id="Fill-433" fill="#F6EB3B"></path>
+            <path d="M199.7,5.45 C199.7,5.35 199.8,5.35 199.8,5.35 C199.8,5.45 199.8,5.45 199.7,5.45" id="Fill-434" fill="#F6EB3B"></path>
+            <path d="M200.2,5.35 C200.1,5.45 199.9,5.55 199.9,5.45 C199.9,5.25 200.1,5.45 200.2,5.35" id="Fill-435" fill="#F6EB3B"></path>
+            <path d="M200.5,5.35 C200.4,5.35 200.5,5.45 200.5,5.35" id="Fill-436" fill="#F6EB3B"></path>
+            <path d="M200.3,5.25 C200.5,5.15 200.3,5.55 200.3,5.25" id="Fill-437" fill="#F6EB3B"></path>
+            <path d="M199.4,5.45 C199.4,5.35 199.4,5.45 199.4,5.45" id="Fill-438" fill="#F6EB3B"></path>
+            <path d="M201.6,5.25 C201.7,5.25 201.7,5.45 201.8,5.45 C201.7,5.65 201.5,5.45 201.6,5.25" id="Fill-439" fill="#F6EB3B"></path>
+            <path d="M195.8,6.15 C195.7,6.25 197.1,5.75 197.2,6.05 L195.8,6.15" id="Fill-440" fill="#F6EB3B"></path>
+            <path d="M199,5.65 C199,5.55 199.1,5.55 199.1,5.55 C199.2,5.65 199.1,5.65 199,5.65" id="Fill-441" fill="#F6EB3B"></path>
+            <path d="M200.4,5.55 C200.4,5.45 200.4,5.55 200.4,5.55" id="Fill-442" fill="#F6EB3B"></path>
+            <path d="M201.2,5.45 C201.1,5.35 201.2,5.45 201.2,5.45" id="Fill-443" fill="#F6EB3B"></path>
+            <path d="M201.9,5.45 C201.9,5.45 201.9,5.55 201.9,5.45" id="Fill-444" fill="#F6EB3B"></path>
+            <path d="M202,5.45 C202,5.35 202,5.35 202.1,5.35 C202.1,5.45 202,5.45 202,5.45" id="Fill-445" fill="#F6EB3B"></path>
+            <path d="M175.1,6.45 C175.1,6.45 175.2,6.55 175.1,6.45" id="Fill-446" fill="#F6EB3B"></path>
+            <path d="M200.3,5.55 C200.3,5.55 200.3,5.65 200.3,5.55" id="Fill-447" fill="#F6EB3B"></path>
+            <path d="M201.1,5.55 C201.1,5.55 201.1,5.65 201.1,5.55" id="Fill-448" fill="#F6EB3B"></path>
+            <path d="M199.9,5.65 C199.9,5.35 200.1,5.65 200.1,5.95 C200,5.95 200,5.65 199.9,5.65" id="Fill-449" fill="#F6EB3B"></path>
+            <path d="M200.7,5.65 C200.7,5.25 200.7,6.05 200.7,5.65" id="Fill-450" fill="#F6EB3B"></path>
+            <path d="M200.7,5.65 C200.7,5.55 200.8,5.55 200.8,5.55 C200.8,5.65 200.8,5.65 200.7,5.65" id="Fill-451" fill="#F6EB3B"></path>
+            <path d="M200.2,5.75 C200,5.85 200.2,5.45 200.2,5.75" id="Fill-452" fill="#F6EB3B"></path>
+            <path d="M200.1,5.75 C200.2,5.75 200.2,5.55 200.3,5.75 C200.3,5.85 200.1,6.15 200.1,5.75" id="Fill-453" fill="#F6EB3B"></path>
+            <path d="M175.2,6.65 C175.2,6.65 175.3,6.65 175.4,6.65 C175.5,6.95 175.2,6.75 175.3,7.05 C175.1,6.95 175.2,6.75 175.2,6.65" id="Fill-454" fill="#F6EB3B"></path>
+            <path d="M200.5,5.75 C200.5,5.95 200.4,5.95 200.3,5.95 C200.3,5.65 200.4,5.75 200.5,5.75" id="Fill-455" fill="#F6EB3B"></path>
+            <path d="M200.5,5.75 C200.6,5.75 200.7,5.75 200.6,5.95 C200.6,5.95 200.5,5.95 200.5,5.95 C200.5,5.85 200.5,5.75 200.5,5.75" id="Fill-456" fill="#F6EB3B"></path>
+            <path d="M200.8,5.75 C200.7,5.75 200.7,5.65 200.8,5.75" id="Fill-457" fill="#F6EB3B"></path>
+            <path d="M201.3,5.85 C201,5.95 201.2,5.45 201.3,5.85" id="Fill-458" fill="#F6EB3B"></path>
+            <path d="M200.8,5.75 C200.8,5.75 200.8,5.85 200.8,5.75" id="Fill-459" fill="#F6EB3B"></path>
+            <path d="M200.9,5.85 C200.9,5.75 201,5.75 201,5.75 C201,5.85 200.9,5.85 200.9,5.85" id="Fill-460" fill="#F6EB3B"></path>
+            <path d="M201,5.85 C201,5.75 201.1,5.75 201.1,5.75 C201.1,5.85 201,5.85 201,5.85" id="Fill-461" fill="#F6EB3B"></path>
+            <path d="M201.3,5.75 C201.2,5.75 201.3,5.85 201.3,5.75" id="Fill-462" fill="#F6EB3B"></path>
+            <path d="M198.3,6.05 C198.3,5.95 198.4,5.95 198.4,6.05 C198.4,6.05 198.4,6.05 198.3,6.05" id="Fill-463" fill="#F6EB3B"></path>
+            <path d="M201.8,5.85 C201.8,5.75 201.9,5.75 201.9,5.85 C201.9,5.95 201.9,5.85 201.8,5.85" id="Fill-464" fill="#F6EB3B"></path>
+            <path d="M199.1,6.15 C199.1,6.05 199.1,6.15 199.1,6.15" id="Fill-465" fill="#F6EB3B"></path>
+            <path d="M199.3,6.05 C199.3,6.05 199.4,6.15 199.3,6.05" id="Fill-466" fill="#F6EB3B"></path>
+            <path d="M199.9,5.95 C199.9,5.95 200,6.05 199.9,5.95" id="Fill-467" fill="#F6EB3B"></path>
+            <path d="M200.5,6.15 C200.5,6.35 200.3,6.15 200.2,6.25 C200.3,5.95 200.3,6.25 200.5,6.15" id="Fill-468" fill="#F6EB3B"></path>
+            <path d="M200.5,6.15 C200.5,6.05 200.6,6.15 200.5,6.15" id="Fill-469" fill="#F6EB3B"></path>
+            <path d="M200.2,6.35 C200.1,6.35 200.2,6.45 200.2,6.35" id="Fill-470" fill="#F6EB3B"></path>
+            <path d="M200.2,6.35 C200.2,6.35 200.3,6.45 200.2,6.35" id="Fill-471" fill="#F6EB3B"></path>
+            <path d="M200.7,6.25 C200.7,6.25 200.8,6.25 200.8,6.25 C200.8,6.45 200.7,6.45 200.7,6.45 C200.6,6.35 200.7,6.35 200.7,6.25" id="Fill-472" fill="#F6EB3B"></path>
+            <path d="M200.8,6.25 C200.8,6.15 200.9,6.15 200.9,6.15 C200.9,6.25 200.8,6.25 200.8,6.25" id="Fill-473" fill="#F6EB3B"></path>
+            <path d="M201.6,6.25 C201.5,6.25 201.6,6.15 201.6,6.25" id="Fill-474" fill="#F6EB3B"></path>
+            <path d="M201.6,6.25 C201.7,6.25 201.6,6.35 201.6,6.25" id="Fill-475" fill="#F6EB3B"></path>
+            <path d="M200.5,6.45 C200.5,6.35 200.5,6.45 200.5,6.45" id="Fill-476" fill="#F6EB3B"></path>
+            <path d="M199.5,6.65 C199.4,6.15 199.7,6.75 199.5,6.65" id="Fill-477" fill="#F6EB3B"></path>
+            <path d="M199.6,6.65 C199.6,6.55 199.7,6.55 199.7,6.55 C199.7,6.65 199.6,6.55 199.6,6.65" id="Fill-478" fill="#F6EB3B"></path>
+            <path d="M199.7,6.65 C199.7,6.65 199.8,6.65 199.7,6.65 C199.8,6.75 199.8,6.75 199.8,6.85 C199.8,6.85 199.7,6.85 199.7,6.85 C199.7,6.75 199.7,6.75 199.7,6.65" id="Fill-479" fill="#F6EB3B"></path>
+            <path d="M200.8,6.65 C200.8,6.65 200.8,6.75 200.8,6.65" id="Fill-480" fill="#F6EB3B"></path>
+            <path d="M201.1,6.65 C201.2,6.35 201.2,6.95 201.4,6.75 C201.4,6.95 201.2,6.85 201.1,6.85 C201,6.75 201.1,6.75 201.1,6.65 C201.1,6.65 201.1,6.65 201.1,6.65" id="Fill-481" fill="#F6EB3B"></path>
+            <path d="M201.3,6.55 C201.5,6.55 201.6,6.65 201.7,6.55 C201.9,6.65 201.7,6.75 201.7,6.95 C201.6,6.85 201.5,6.85 201.3,6.85 C201.3,6.75 201.3,6.65 201.3,6.55" id="Fill-482" fill="#F6EB3B"></path>
+            <path d="M199.5,6.85 C199.5,6.75 199.6,6.75 199.6,6.75 C199.7,6.75 199.6,6.75 199.5,6.85" id="Fill-483" fill="#F6EB3B"></path>
+            <path d="M199.9,6.75 C199.9,6.65 200,6.65 200,6.65 C200,6.75 199.9,6.75 199.9,6.75" id="Fill-484" fill="#F6EB3B"></path>
+            <path d="M200.2,6.75 C200.2,6.75 200.2,6.85 200.2,6.75" id="Fill-485" fill="#F6EB3B"></path>
+            <path d="M200.4,6.75 C200.4,6.65 200.4,6.75 200.4,6.75" id="Fill-486" fill="#F6EB3B"></path>
+            <path d="M197.7,6.95 C197.8,6.95 197.7,7.15 197.8,7.25 C197.6,7.15 197.7,7.25 197.5,7.15 C197.5,6.95 197.8,7.25 197.7,6.95" id="Fill-487" fill="#F6EB3B"></path>
+            <path d="M198.2,7.15 C197.6,7.45 197.4,7.15 196.7,7.25 C197.2,6.85 197.8,7.05 198.2,7.15 C198.2,7.05 198.2,7.15 198.2,7.15" id="Fill-488" fill="#F6EB3B"></path>
+            <path d="M200.6,6.75 C200.5,6.75 200.6,6.85 200.6,6.75" id="Fill-489" fill="#F6EB3B"></path>
+            <path d="M200.9,6.75 C200.8,6.75 200.9,6.85 200.9,6.75" id="Fill-490" fill="#F6EB3B"></path>
+            <path d="M201.6,6.75 C201.6,6.85 201.5,6.75 201.6,6.75" id="Fill-491" fill="#F6EB3B"></path>
+            <path d="M198.4,7.05 C198.4,7.05 198.4,7.15 198.4,7.05" id="Fill-492" fill="#F6EB3B"></path>
+            <path d="M200.1,7.15 C199.6,7.35 199.1,7.15 198.5,7.15 C199,6.95 199.5,6.95 200.1,7.15" id="Fill-493" fill="#F6EB3B"></path>
+            <path d="M198.2,7.15 C198.6,6.95 198.4,7.35 198.2,7.15" id="Fill-494" fill="#F6EB3B"></path>
+            <path d="M200.1,7.15 C200.2,7.05 200.3,6.95 200.3,7.05 C200.3,7.25 200.2,7.35 200.1,7.15" id="Fill-495" fill="#F6EB3B"></path>
+            <path d="M201.3,7.15 C201.3,7.05 201.4,7.15 201.3,7.15" id="Fill-496" fill="#F6EB3B"></path>
+            <path d="M199.7,0.55 C199.7,0.45 199.8,0.45 199.8,0.45 C199.8,0.55 199.7,0.55 199.7,0.55" id="Fill-497" fill="#F6EB3B"></path>
+            <path d="M199.8,0.55 C199.8,0.45 199.9,0.45 199.9,0.45 C199.9,0.55 199.9,0.55 199.8,0.55" id="Fill-498" fill="#F6EB3B"></path>
+            <path d="M199.3,0.55 C199.2,0.55 199.2,0.45 199.3,0.55" id="Fill-501" fill="#F6EB3B"></path>
+            <path d="M197,7.55 C197,7.45 197,7.45 197,7.55 C197.1,7.55 197,7.55 197,7.55" id="Fill-503" fill="#F6EB3B"></path>
+            <path d="M198.4,1.15 C198.5,1.45 199.2,1.45 199.2,1.35 C199.2,0.85 198.4,1.55 198.4,1.15" id="Fill-504" fill="#F6EB3B"></path>
+            <path d="M199.4,0.55 C199.4,0.55 199.4,0.65 199.4,0.55" id="Fill-505" fill="#F6EB3B"></path>
+            <path d="M196.2,7.45 C196.4,7.35 196.2,7.85 196.2,7.45" id="Fill-506" fill="#F6EB3B"></path>
+            <path d="M196,7.55 C196.1,7.55 196.1,7.65 196.2,7.65 C196.2,7.85 196,7.65 196,7.55 C196,7.55 196,7.55 196,7.55" id="Fill-507" fill="#F6EB3B"></path>
+            <path d="M196.9,7.55 C196.9,7.15 196.9,7.95 196.9,7.55" id="Fill-508" fill="#F6EB3B"></path>
+            <path d="M196.5,7.55 C196.5,7.55 196.6,7.55 196.6,7.55 C196.6,7.65 196.6,7.65 196.6,7.75 C196.6,7.75 196.5,7.75 196.5,7.75 C196.6,7.65 196.6,7.65 196.5,7.55" id="Fill-509" fill="#F6EB3B"></path>
+            <path d="M199.3,0.85 C199.4,0.45 199.4,1.25 199.3,0.85" id="Fill-510" fill="#F6EB3B"></path>
+            <path d="M196.5,7.75 C196.5,7.35 196.5,8.05 196.5,7.75" id="Fill-511" fill="#F6EB3B"></path>
+            <path d="M196.7,7.65 C196.6,7.65 196.7,7.75 196.7,7.65" id="Fill-512" fill="#F6EB3B"></path>
+            <path d="M197,7.75 C196.9,7.75 197,7.85 197,7.75" id="Fill-513" fill="#F6EB3B"></path>
+            <path d="M199.7,0.85 C199.7,0.55 199.9,0.95 199.7,0.85" id="Fill-514" fill="#F6EB3B"></path>
+            <path d="M199.9,0.85 C199.9,0.75 199.9,0.85 199.9,0.85" id="Fill-515" fill="#F6EB3B"></path>
+            <path d="M196.2,7.85 C196.2,7.75 196.4,7.75 196.5,7.65 C196.4,7.95 196.2,7.95 196.2,7.85" id="Fill-516" fill="#F6EB3B"></path>
+            <path d="M199.1,0.95 C199.1,0.95 199.1,1.05 199.1,0.95" id="Fill-517" fill="#F6EB3B"></path>
+            <path d="M199.8,0.95 C199.8,0.85 199.9,0.85 199.9,0.85 C199.9,0.95 199.9,0.95 199.8,0.95" id="Fill-518" fill="#F6EB3B"></path>
+            <path d="M199.8,0.85 C199.8,1.05 199.6,1.05 199.4,1.05 C199.4,0.65 199.7,0.85 199.8,0.85" id="Fill-519" fill="#F6EB3B"></path>
+            <path d="M200.2,0.95 C200.2,0.95 200.2,0.95 200.2,0.95 C200.2,0.95 200.2,0.95 200.2,0.95 C200.2,1.05 200.1,1.05 200,1.05 C200,0.95 200,0.85 200,0.75 C200.1,0.85 200.3,0.75 200.2,0.95 C200.3,0.95 200.2,0.95 200.2,0.95" id="Fill-520" fill="#F6EB3B"></path>
+            <path d="M198.7,1.65 C198.6,1.75 198.6,1.55 198.7,1.65" id="Fill-521" fill="#F6EB3B"></path>
+            <path d="M199.8,0.85 C199.8,0.85 199.9,0.95 199.9,0.95 C199.7,1.35 201,0.95 201.2,1.15 C201.1,1.35 200.8,1.35 200.6,1.35 C200.2,1.35 199.8,1.25 199.5,1.35 C199.6,1.05 199.8,0.95 199.9,1.05 C199.7,1.05 199.8,0.95 199.8,0.85" id="Fill-522" fill="#F6EB3B"></path>
+            <path d="M200.3,0.95 C200.4,0.55 200.4,1.35 200.3,0.95" id="Fill-523" fill="#F6EB3B"></path>
+            <path d="M202.1,0.85 C202.1,0.75 202.2,0.85 202.1,0.85" id="Fill-524" fill="#F6EB3B"></path>
+            <path d="M196.6,7.95 C196.7,8.05 196.7,8.25 196.8,8.25 C196.8,8.45 196,8.15 196,8.45 C195.9,8.15 196.6,8.15 196.6,7.95" id="Fill-525" fill="#F6EB3B"></path>
+            <path d="M199.3,1.05 C199.3,0.95 199.3,1.05 199.3,1.05" id="Fill-526" fill="#F6EB3B"></path>
+            <path d="M199.9,1.05 C199.9,0.95 200,0.95 200.1,0.95 C200.1,1.05 200,1.05 199.9,1.05" id="Fill-527" fill="#F6EB3B"></path>
+            <path d="M200.5,0.95 C200.5,0.95 200.6,1.05 200.5,0.95" id="Fill-528" fill="#F6EB3B"></path>
+            <path d="M196.4,8.05 C196.4,7.95 196.5,8.05 196.4,8.05" id="Fill-529" fill="#F6EB3B"></path>
+            <path d="M196.1,8.05 C196.1,8.05 196.1,8.25 196.1,8.05" id="Fill-530" fill="#F6EB3B"></path>
+            <path d="M196.3,8.15 C196.1,8.25 196.3,7.85 196.3,8.15" id="Fill-531" fill="#F6EB3B"></path>
+            <path d="M196.5,8.05 C196.5,8.15 196.3,8.65 196.2,8.15 C196.3,8.05 196.4,8.05 196.5,8.05" id="Fill-532" fill="#F6EB3B"></path>
+            <path d="M201.5,1.15 C201.4,1.15 201.4,1.35 201.4,1.45 C201.2,1.35 201.3,0.95 201.5,0.95 C201.5,1.05 201.5,1.15 201.5,1.15" id="Fill-533" fill="#F6EB3B"></path>
+            <path d="M202.3,1.15 C202.3,1.15 202.3,1.15 202.3,1.15 C202.3,1.25 202.3,1.25 202.3,1.15 C202.3,1.15 202.3,1.05 202.4,1.05 C202.9,1.35 203.2,1.05 203.5,1.35 C203.5,1.35 203.5,1.25 203.6,1.15 C203.7,1.25 203.7,1.35 203.6,1.45 C203.1,1.35 202.8,1.45 202.4,1.45 C202.4,1.65 202.1,1.45 202.2,1.35 C201.5,1.35 202.5,1.25 201.6,1.35 C201.6,1.15 201.7,1.25 201.7,1.05 C201.8,1.45 202.2,1.25 202.4,1.05 C203,1.25 201.8,1.25 202.3,1.15 C202.2,1.15 202.3,1.15 202.3,1.15 Z" id="Path_1_" fill="#F6EB3B"></path>
+            <path d="M202,1.05 C202,0.95 202.1,0.95 202,1.05 C202.1,1.05 202.1,1.05 202,1.05" id="Fill-535" fill="#F6EB3B"></path>
+            <path d="M196.9,8.15 C196.7,8.25 196.9,7.95 196.9,8.15" id="Fill-536" fill="#F6EB3B"></path>
+            <path d="M195.9,8.15 C195.8,8.35 195.4,8.35 195.3,8.55 C195.2,8.45 195.1,8.55 195.1,8.25 C195.2,8.15 195.8,8.25 195.9,8.15" id="Fill-537" fill="#F6EB3B"></path>
+            <path d="M199.2,1.25 C199.1,1.25 199.2,1.35 199.2,1.25" id="Fill-538" fill="#F6EB3B"></path>
+            <path d="M199.2,1.35 C199.3,0.95 199.3,1.65 199.2,1.35" id="Fill-539" fill="#F6EB3B"></path>
+            <path d="M201.4,1.15 C201.5,1.15 201.5,1.25 201.6,1.25 C201.6,1.35 201.5,1.45 201.4,1.45 C201.4,1.35 201.4,1.25 201.4,1.15" id="Fill-540" fill="#F6EB3B"></path>
+            <path d="M195.5,8.35 C195.7,7.95 195.6,8.65 195.5,8.35" id="Fill-541" fill="#F6EB3B"></path>
+            <path d="M199.7,1.45 C199.6,1.25 199.7,1.35 199.7,1.45" id="Fill-542" fill="#F6EB3B"></path>
+            <path d="M196.4,8.25 C196.4,8.15 196.9,8.15 197,8.15 C196.9,8.25 196.4,8.25 196.4,8.25" id="Fill-543" fill="#F6EB3B"></path>
+            <path d="M196.5,8.35 C196.5,8.05 196.7,8.45 196.6,8.65 C196.6,8.65 196.5,8.35 196.5,8.35" id="Fill-544" fill="#F6EB3B"></path>
+            <path d="M199.2,1.45 C199.2,1.45 199.2,1.55 199.2,1.45" id="Fill-545" fill="#F6EB3B"></path>
+            <path d="M199.4,1.45 C199.4,1.35 199.5,1.35 199.5,1.35 C199.5,1.45 199.4,1.45 199.4,1.45" id="Fill-546" fill="#F6EB3B"></path>
+            <path d="M199.7,1.35 C199.7,1.55 199.6,1.45 199.7,1.35" id="Fill-547" fill="#F6EB3B"></path>
+            <path d="M199.5,1.45 C199.4,1.35 199.5,1.45 199.5,1.45" id="Fill-548" fill="#F6EB3B"></path>
+            <path d="M199.8,1.45 C199.8,1.35 199.9,1.35 199.9,1.35 C200,1.45 199.9,1.45 199.8,1.45" id="Fill-549" fill="#F6EB3B"></path>
+            <path d="M200.3,1.35 C200.3,1.35 200.4,1.45 200.3,1.35" id="Fill-550" fill="#F6EB3B"></path>
+            <path d="M196,8.25 C196,8.45 195.9,8.45 195.8,8.45 C195.8,8.15 195.9,8.35 196,8.25" id="Fill-551" fill="#F6EB3B"></path>
+            <path d="M199.4,1.55 C199.3,1.65 199.2,1.75 199.1,1.75 C199.1,1.65 200.1,1.55 200.1,1.55 C200.1,1.35 199.2,1.55 199.4,1.55" id="Fill-552" fill="#F6EB3B"></path>
+            <path d="M201,1.45 C201,1.35 201.1,1.35 201,1.45 C201.1,1.45 201,1.45 201,1.45" id="Fill-553" fill="#F6EB3B"></path>
+            <path d="M195.8,8.45 C195.8,8.35 195.8,8.35 195.8,8.45 C195.9,8.45 195.8,8.45 195.8,8.45" id="Fill-554" fill="#F6EB3B"></path>
+            <path d="M204,3.55 C204.1,3.15 204.2,3.85 204,3.55" id="Fill-555" fill="#F6EB3B"></path>
+            <path d="M200,1.55 C200,1.45 200.1,1.55 200,1.55" id="Fill-556" fill="#F6EB3B"></path>
+            <path d="M201.6,1.45 C201.6,1.35 201.6,1.45 201.6,1.45" id="Fill-557" fill="#F6EB3B"></path>
+            <path d="M203.7,1.45 C203.7,1.35 203.7,1.25 203.7,1.15 C203.8,1.15 203.8,1.25 203.9,1.25 C203.9,1.45 203.7,1.65 203.7,1.45" id="Fill-558" fill="#F6EB3B"></path>
+            <path d="M196.1,8.35 C196.1,8.35 196.1,8.35 196.1,8.35 C196.1,8.45 196.1,8.45 196.1,8.35" id="Fill-559" fill="#F6EB3B"></path>
+            <path d="M200.4,1.55 C200.4,1.55 200.4,1.65 200.4,1.55" id="Fill-560" fill="#F6EB3B"></path>
+            <path d="M202.4,1.45 C202.3,1.45 202.4,1.55 202.4,1.45" id="Fill-561" fill="#F6EB3B"></path>
+            <path d="M202.5,1.45 C202.5,1.35 202.6,1.35 202.7,1.35 C202.6,1.45 202.5,1.45 202.5,1.45" id="Fill-562" fill="#F6EB3B"></path>
+            <path d="M202.8,1.45 C202.7,1.45 202.8,1.55 202.8,1.45" id="Fill-563" fill="#F6EB3B"></path>
+            <path d="M202.9,1.45 C202.9,1.35 203,1.35 202.9,1.45 C203,1.45 203,1.45 202.9,1.45" id="Fill-564" fill="#F6EB3B"></path>
+            <path d="M203.9,1.35 C203.8,1.25 203.9,1.35 203.9,1.35" id="Fill-565" fill="#F6EB3B"></path>
+            <path d="M196,8.45 C196.1,8.45 196,8.55 196,8.45" id="Fill-566" fill="#F6EB3B"></path>
+            <path d="M203.5,1.45 C203.4,1.45 203.5,1.55 203.5,1.45" id="Fill-567" fill="#F6EB3B"></path>
+            <path d="M203.6,1.45 C203.6,1.35 203.7,1.35 203.7,1.35 C203.7,1.45 203.6,1.45 203.6,1.45" id="Fill-568" fill="#F6EB3B"></path>
+            <path d="M204,1.35 C204,1.35 204.1,1.45 204,1.35" id="Fill-569" fill="#F6EB3B"></path>
+            <path d="M202.4,1.55 C202.4,1.45 202.5,1.45 202.5,1.45 C202.6,1.55 202.5,1.55 202.4,1.55" id="Fill-570" fill="#F6EB3B"></path>
+            <path d="M203,1.65 C203,1.55 203.1,1.65 203,1.65" id="Fill-571" fill="#F6EB3B"></path>
+            <path d="M204.1,1.45 C204,1.45 204.1,1.55 204.1,1.45" id="Fill-572" fill="#F6EB3B"></path>
+            <path d="M191.6,12.95 C191.6,13.05 191.6,13.05 191.6,12.95" id="Fill-574" fill="#F6EB3B"></path>
+            <path d="M191.4,13.05 C191.4,13.05 191.4,13.15 191.4,13.05" id="Fill-575" fill="#F6EB3B"></path>
+            <path d="M191.5,13.15 C191.5,13.05 191.6,13.05 191.6,13.05 C191.6,13.15 191.5,13.05 191.5,13.15" id="Fill-576" fill="#F6EB3B"></path>
+            <path d="M189.3,12.85 C189.5,12.45 189.5,13.05 189.3,12.85" id="Fill-577" fill="#F6EB3B"></path>
+            <path d="M190.2,12.75 C190.2,12.55 190.2,12.65 190.2,12.85 C190.1,12.85 190.3,12.75 190.2,12.75" id="Fill-578" fill="#F6EB3B"></path>
+            <path d="M191.3,12.55 C191.4,12.55 191.3,12.75 191.3,12.55" id="Fill-579" fill="#F6EB3B"></path>
+            <path d="M192,13.15 C191.9,13.05 192,13.15 192,13.15" id="Fill-580" fill="#F6EB3B"></path>
+            <path d="M189.1,12.85 C189.1,12.85 189.2,12.95 189.1,12.85" id="Fill-581" fill="#F6EB3B"></path>
+            <path d="M190,12.85 C190,12.45 190,13.25 190,12.85" id="Fill-582" fill="#F6EB3B"></path>
+            <path d="M188.7,12.95 C188.6,12.85 188.7,12.95 188.7,12.95" id="Fill-583" fill="#F6EB3B"></path>
+            <path d="M190.4,12.95 C190.3,12.95 190.4,13.05 190.4,12.95" id="Fill-584" fill="#F6EB3B"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/website/images/logos/logo-index-ventures.png b/website/images/logos/logo-index-ventures.png
new file mode 100644
index 00000000000..5bf804bc8b7
Binary files /dev/null and b/website/images/logos/logo-index-ventures.png differ
diff --git a/website/images/logos/logo-leadedge-capital.png b/website/images/logos/logo-leadedge-capital.png
new file mode 100644
index 00000000000..2c7671bfd67
Binary files /dev/null and b/website/images/logos/logo-leadedge-capital.png differ
diff --git a/website/images/logos/logo-lightspeed.png b/website/images/logos/logo-lightspeed.png
new file mode 100644
index 00000000000..6c8a6e5689c
Binary files /dev/null and b/website/images/logos/logo-lightspeed.png differ
diff --git a/website/images/logos/logo-redpoint.png b/website/images/logos/logo-redpoint.png
new file mode 100644
index 00000000000..baf5a9a7392
Binary files /dev/null and b/website/images/logos/logo-redpoint.png differ
diff --git a/website/images/logos/logo-spotify.png b/website/images/logos/logo-spotify.png
new file mode 100644
index 00000000000..bc7c102e6ae
Binary files /dev/null and b/website/images/logos/logo-spotify.png differ
diff --git a/website/images/logos/logo-uber.png b/website/images/logos/logo-uber.png
new file mode 100644
index 00000000000..cb820664636
Binary files /dev/null and b/website/images/logos/logo-uber.png differ
diff --git a/website/images/logos/logo-yandex.png b/website/images/logos/logo-yandex.png
new file mode 100644
index 00000000000..92349036b3f
Binary files /dev/null and b/website/images/logos/logo-yandex.png differ
diff --git a/website/images/photos/aaron-katz.jpg b/website/images/photos/aaron-katz.jpg
new file mode 100644
index 00000000000..02aff426b33
Binary files /dev/null and b/website/images/photos/aaron-katz.jpg differ
diff --git a/website/images/photos/alexander-sapin.jpg b/website/images/photos/alexander-sapin.jpg
new file mode 100644
index 00000000000..83121a980e7
Binary files /dev/null and b/website/images/photos/alexander-sapin.jpg differ
diff --git a/website/images/photos/alexander-tokmakov.jpg b/website/images/photos/alexander-tokmakov.jpg
new file mode 100644
index 00000000000..3215788443f
Binary files /dev/null and b/website/images/photos/alexander-tokmakov.jpg differ
diff --git a/website/images/photos/alexey-milovidov.jpg b/website/images/photos/alexey-milovidov.jpg
new file mode 100644
index 00000000000..31a4ab5311d
Binary files /dev/null and b/website/images/photos/alexey-milovidov.jpg differ
diff --git a/website/images/photos/anne-krechmer.jpg b/website/images/photos/anne-krechmer.jpg
new file mode 100644
index 00000000000..1333ec4774b
Binary files /dev/null and b/website/images/photos/anne-krechmer.jpg differ
diff --git a/website/images/photos/anton-popov.jpg b/website/images/photos/anton-popov.jpg
new file mode 100644
index 00000000000..663fc9255e9
Binary files /dev/null and b/website/images/photos/anton-popov.jpg differ
diff --git a/website/images/photos/arno-van-driel.jpg b/website/images/photos/arno-van-driel.jpg
new file mode 100644
index 00000000000..9a7855491aa
Binary files /dev/null and b/website/images/photos/arno-van-driel.jpg differ
diff --git a/website/images/photos/brian-hunter.jpg b/website/images/photos/brian-hunter.jpg
new file mode 100644
index 00000000000..d0672bb3cfb
Binary files /dev/null and b/website/images/photos/brian-hunter.jpg differ
diff --git a/website/images/photos/caryn-marooney.jpg b/website/images/photos/caryn-marooney.jpg
new file mode 100644
index 00000000000..446e890ebe1
Binary files /dev/null and b/website/images/photos/caryn-marooney.jpg differ
diff --git a/website/images/photos/claire-lucas.jpg b/website/images/photos/claire-lucas.jpg
new file mode 100644
index 00000000000..4ee45630496
Binary files /dev/null and b/website/images/photos/claire-lucas.jpg differ
diff --git a/website/images/photos/dmitry-novik.jpg b/website/images/photos/dmitry-novik.jpg
new file mode 100644
index 00000000000..c2ce965e48d
Binary files /dev/null and b/website/images/photos/dmitry-novik.jpg differ
diff --git a/website/images/photos/dorota-szeremeta.jpg b/website/images/photos/dorota-szeremeta.jpg
new file mode 100644
index 00000000000..70e427a1154
Binary files /dev/null and b/website/images/photos/dorota-szeremeta.jpg differ
diff --git a/website/images/photos/ilya-yatsishin.jpg b/website/images/photos/ilya-yatsishin.jpg
new file mode 100644
index 00000000000..b8d9d0866a1
Binary files /dev/null and b/website/images/photos/ilya-yatsishin.jpg differ
diff --git a/website/images/photos/ivan-blinkov.jpg b/website/images/photos/ivan-blinkov.jpg
new file mode 100644
index 00000000000..0e70ff6f773
Binary files /dev/null and b/website/images/photos/ivan-blinkov.jpg differ
diff --git a/website/images/photos/jason-chan.jpg b/website/images/photos/jason-chan.jpg
new file mode 100644
index 00000000000..6ce0b524cb2
Binary files /dev/null and b/website/images/photos/jason-chan.jpg differ
diff --git a/website/images/photos/kevin-wang.jpg b/website/images/photos/kevin-wang.jpg
new file mode 100644
index 00000000000..90eff0a3402
Binary files /dev/null and b/website/images/photos/kevin-wang.jpg differ
diff --git a/website/images/photos/kristina-frost.jpg b/website/images/photos/kristina-frost.jpg
new file mode 100644
index 00000000000..f15206e51e0
Binary files /dev/null and b/website/images/photos/kristina-frost.jpg differ
diff --git a/website/images/photos/kseniia-sumarokova.jpg b/website/images/photos/kseniia-sumarokova.jpg
new file mode 100644
index 00000000000..0fd4efeee25
Binary files /dev/null and b/website/images/photos/kseniia-sumarokova.jpg differ
diff --git a/website/images/photos/maksim-kita.jpg b/website/images/photos/maksim-kita.jpg
new file mode 100644
index 00000000000..e6aac5737cb
Binary files /dev/null and b/website/images/photos/maksim-kita.jpg differ
diff --git a/website/images/photos/mihir-gokhale.jpg b/website/images/photos/mihir-gokhale.jpg
new file mode 100644
index 00000000000..bc923da21b8
Binary files /dev/null and b/website/images/photos/mihir-gokhale.jpg differ
diff --git a/website/images/photos/mike-hayes.jpg b/website/images/photos/mike-hayes.jpg
new file mode 100644
index 00000000000..13dfbe4cefd
Binary files /dev/null and b/website/images/photos/mike-hayes.jpg differ
diff --git a/website/images/photos/mike-volpi.jpg b/website/images/photos/mike-volpi.jpg
new file mode 100644
index 00000000000..77756349759
Binary files /dev/null and b/website/images/photos/mike-volpi.jpg differ
diff --git a/website/images/photos/nikita-mikhailov.jpg b/website/images/photos/nikita-mikhailov.jpg
new file mode 100644
index 00000000000..549e5bc06e8
Binary files /dev/null and b/website/images/photos/nikita-mikhailov.jpg differ
diff --git a/website/images/photos/nikolai-kochetov.jpg b/website/images/photos/nikolai-kochetov.jpg
new file mode 100644
index 00000000000..924df4e59cb
Binary files /dev/null and b/website/images/photos/nikolai-kochetov.jpg differ
diff --git a/website/images/photos/pavel-kruglov.jpg b/website/images/photos/pavel-kruglov.jpg
new file mode 100644
index 00000000000..6287ef1bfe3
Binary files /dev/null and b/website/images/photos/pavel-kruglov.jpg differ
diff --git a/website/images/photos/peter-fenton.jpg b/website/images/photos/peter-fenton.jpg
new file mode 100644
index 00000000000..b84f25e703e
Binary files /dev/null and b/website/images/photos/peter-fenton.jpg differ
diff --git a/website/images/photos/placeholder.png b/website/images/photos/placeholder.png
new file mode 100644
index 00000000000..820802d67a2
Binary files /dev/null and b/website/images/photos/placeholder.png differ
diff --git a/website/images/photos/rich-raposa.jpg b/website/images/photos/rich-raposa.jpg
new file mode 100644
index 00000000000..f8338d6e3df
Binary files /dev/null and b/website/images/photos/rich-raposa.jpg differ
diff --git a/website/images/photos/shavoyne-mccowan.jpg b/website/images/photos/shavoyne-mccowan.jpg
new file mode 100644
index 00000000000..6aca20bea50
Binary files /dev/null and b/website/images/photos/shavoyne-mccowan.jpg differ
diff --git a/website/images/photos/thom-oconnor.jpg b/website/images/photos/thom-oconnor.jpg
new file mode 100644
index 00000000000..23d2d10382b
Binary files /dev/null and b/website/images/photos/thom-oconnor.jpg differ
diff --git a/website/images/photos/vitaly-baranov.jpg b/website/images/photos/vitaly-baranov.jpg
new file mode 100644
index 00000000000..516b73073c4
Binary files /dev/null and b/website/images/photos/vitaly-baranov.jpg differ
diff --git a/website/images/photos/vladimir-cherkasov.jpg b/website/images/photos/vladimir-cherkasov.jpg
new file mode 100644
index 00000000000..9d8246be2ae
Binary files /dev/null and b/website/images/photos/vladimir-cherkasov.jpg differ
diff --git a/website/images/photos/yury-izrailevsky.jpg b/website/images/photos/yury-izrailevsky.jpg
new file mode 100644
index 00000000000..785479d4ae3
Binary files /dev/null and b/website/images/photos/yury-izrailevsky.jpg differ
diff --git a/website/images/placeholder-contact-form.png b/website/images/placeholder-contact-form.png
new file mode 100644
index 00000000000..297d10e3a89
Binary files /dev/null and b/website/images/placeholder-contact-form.png differ
diff --git a/website/images/placeholder-newsletter-form.png b/website/images/placeholder-newsletter-form.png
new file mode 100644
index 00000000000..dc487941782
Binary files /dev/null and b/website/images/placeholder-newsletter-form.png differ
diff --git a/website/images/welcome-home.png b/website/images/welcome-home.png
new file mode 100644
index 00000000000..7bbcc2c612f
Binary files /dev/null and b/website/images/welcome-home.png differ
diff --git a/website/index.html b/website/index.html
index a1f85f0bbfb..944ad6aab34 100644
--- a/website/index.html
+++ b/website/index.html
@@ -5,30 +5,31 @@
 {% extends "templates/base.html" %}
 
 {% block extra_meta %}
+{% include "templates/common_fonts.html" %}
 <script type="application/ld+json">{
 "@context": "https://schema.org",
 "@type": "SoftwareApplication",
 "name": "ClickHouse",
 "operatingSystem": ["Linux", "FreeBSD", "Mac OS X"],
 "featureList": ["SQL", "columnar storage", "fault-tolerance", "distributed queries"],
-"softwareHelp": "https://clickhouse.tech/docs/en/",
+"softwareHelp": "https://clickhouse.com/docs/en/",
 "license": "https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE",
 "applicationCategory": "https://schema.org/DeveloperApplication",
 "applicationSubCategory": "Database Management System",
 "copyrightHolder": {
   "@type": "Organization",
-  "name": "Yandex LLC",
+  "name": "ClickHouse, Inc.",
   "logo": {
     "@type": "ImageObject",
-    "url": "https://clickhouse.tech/images/yandex.png",
-    "width": 163,
-    "height": 60
+    "url": "https://clickhouse.com/images/logo-400x240.png",
+    "width": 400,
+    "height": 240
   }
 },
 "copyrightYear": 2016,
 "mainEntityOfPage": {
   "@type": "WebSite",
-  "@id": "https://clickhouse.tech"
+  "@id": "https://clickhouse.com"
 },
 "offers": {
   "@type": "Offer",
@@ -38,20 +39,26 @@
 }</script>
 {% endblock %}
 
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
 {% block content %}
 
-{% include "templates/index/nav.html" %}
 {% include "templates/index/hero.html" %}
-{% include "templates/index/events.html" %}
-{% include "templates/index/performance.html" %}
 {% include "templates/index/why.html" %}
 {% include "templates/index/success.html" %}
-{% include "templates/index/efficient.html" %}
-{% include "templates/index/rich.html" %}
-{% include "templates/index/features.html" %}
-{% include "templates/index/scalable.html" %}
-{% include "templates/index/use.html" %}
+
+{% if false %}
+    {% include "templates/index/pullquote.html" %}
+{% endif %}
+
+{% include "templates/index/performance.html" %}
 {% include "templates/index/quickstart.html" %}
 {% include "templates/index/community.html" %}
 
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
 {% endblock %}
diff --git a/website/js/base.js b/website/js/base.js
index aca6f407d24..52b801eb98f 100644
--- a/website/js/base.js
+++ b/website/js/base.js
@@ -1,7 +1,7 @@
 (function () {
     Sentry.init({
         dsn: 'https://2b95b52c943f4ad99baccab7a9048e4d@o388870.ingest.sentry.io/5246103',
-        environment: window.location.hostname === 'clickhouse.tech' ? 'prod' : 'test'
+        environment: window.location.hostname === 'clickhouse.com' ? 'prod' : 'test'
     });
     $(document).click(function (event) {
         var target = $(event.target);
@@ -36,7 +36,7 @@
         }
     });
 
-    if (window.location.hostname.endsWith('clickhouse.tech')) {
+    if (window.location.hostname.endsWith('clickhouse.com')) {
         $('a.favicon').each(function () {
             $(this).css({
                 background: 'url(/favicon/' + this.hostname + ') left center no-repeat',
@@ -67,13 +67,6 @@
         });
     }
 
-    $('#feedback_email, .feedback-email').each(function() {
-        var name = window.location.host.substring(0, 10)
-        var feedback_address = name + '-feedback' + '@yandex-team.com';
-        $(this).attr('href', 'mailto:' + feedback_address);
-        $(this).html(feedback_address);
-    });
-
     (function (d, w, c) {
         (w[c] = w[c] || []).push(function() {
             var is_single_page = $('html').attr('data-single-page') === 'true';
@@ -86,6 +79,14 @@
                     webvisor: !is_single_page
                 });
             } catch(e) { }
+            
+            if (!is_single_page) {
+                $('head').each(function(_, element) {
+                   $(element).append(
+                       '<script async src="https://www.googletagmanager.com/gtag/js?id=G-KF1LLRTQ5Q"></script><script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag(\'js\', new Date());gtag(\'config\', \'G-KF1LLRTQ5Q\');</script>'
+                   );
+                });
+            }
         });
 
         var n = d.getElementsByTagName("script")[0],
@@ -94,7 +95,7 @@
         s.type = "text/javascript";
         s.async = true;
         s.src = "/js/metrika.js";
-        if (window.location.hostname.endsWith('clickhouse.tech')) {
+        if (window.location.hostname.endsWith('clickhouse.com')) {
             if (w.opera == "[object Opera]") {
                 d.addEventListener("DOMContentLoaded", f, false);
             } else {
diff --git a/website/js/docs.js b/website/js/docs.js
index 2af01bc1929..15552fece85 100644
--- a/website/js/docs.js
+++ b/website/js/docs.js
@@ -27,7 +27,7 @@ function onResize() {
         single_page_switch.removeClass('float-right');
     }
     if (window_height < 800 && is_wide) {
-        docs_top_nav.removeClass('sticky-top');
+        docs_top_nav.removeClass('fixed-top');
         $('#sidebar, #toc.toc-right').css({
             'height': window_height,
             'position': 'sticky',
@@ -35,7 +35,7 @@ function onResize() {
         });
     } else {
         var top_nav_height = docs_top_nav.height();
-        docs_top_nav.addClass('sticky-top');
+        docs_top_nav.addClass('fixed-top');
         $('#sidebar, #toc.toc-right').css({
             'height': (window_height - top_nav_height) + 'px',
             'position': 'fixed',
diff --git a/website/js/main.js b/website/js/main.js
new file mode 100644
index 00000000000..97bb490d9f1
--- /dev/null
+++ b/website/js/main.js
@@ -0,0 +1 @@
+!function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){n(1),n(2),n(3),t.exports=n(4)},function(t,e,n){"use strict";n.r(e),e.default=n.p+"./css//bootstrap.css"},function(t,e,n){"use strict";n.r(e),e.default=n.p+"./css//greenhouse.css"},function(t,e,n){"use strict";n.r(e),e.default=n.p+"./css//main.css"},function(t,e,n){"use strict";n.r(e);n(5),n(6),n(7)},function(t,e){function n(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}var o=function(){function t(e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.onOpen=this.onOpen.bind(this),this.onToggle=this.onToggle.bind(this),this.$el=e,this.$el.addEventListener("click",this.onOpen),this.$el.querySelector(".case-study-card-toggle").addEventListener("click",this.onToggle),this.open=!1}var e,o,r;return e=t,(o=[{key:"onOpen",value:function(){this.open=!0,this.$el.classList.toggle("is-open",this.open),this.$el.classList.toggle("is-closing",!this.open),this.closeOthers()}},{key:"onToggle",value:function(t){t.stopPropagation(),this.open=!this.$el.classList.contains("is-open"),this.$el.classList.toggle("is-open",this.open),this.$el.classList.toggle("is-closing",!this.open),this.closeOthers()}},{key:"closeOthers",value:function(){var t=this;this.open&&document.querySelectorAll(".case-study-card").forEach((function(e){e.isSameNode(t.$el)||(e.classList.toggle("is-closing",e.classList.contains("is-open")),e.classList.toggle("is-open",!1))}))}}])&&n(e.prototype,o),r&&n(e,r),t}();document.querySelectorAll(".case-study-card").forEach((function(t){return new o(t)}))},function(t,e){function n(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null==n)return;var o,r,i=[],s=!0,l=!1;try{for(n=n.call(t);!(s=(o=n.next()).done)&&(i.push(o.value),!e||i.length!==e);s=!0);}catch(t){l=!0,r=t}finally{try{s||null==n.return||n.return()}finally{if(l)throw r}}return i}(t,e)||function(t,e){if(!t)return;if("string"==typeof t)return o(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n||"Set"===n)return Array.from(t);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return o(t,e)}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function o(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=t[n];return o}var r=document.querySelectorAll("[equalize-heights]"),i={};function s(){Object.entries(i).forEach((function(t){var e=n(t,2),o=(e[0],e[1]);o.forEach((function(t){"none"===window.getComputedStyle(t).getPropertyValue("display")&&(t.style.display="block"),t.style.minHeight="auto"}));var r=o.reduce((function(t,e){return e.offsetHeight>t&&(t=e.offsetHeight),t}),0);o.forEach((function(t){t.style.display=null,t.style.minHeight="".concat(r,"px")}))}))}r.forEach((function(t){var e=t.getAttribute("equalize-heights");i[e]=i[e]||[],i[e].push(t)})),window.addEventListener("resize",s),window.addEventListener("orientationchange",s),s()},function(t,e){window.addEventListener("load",(function(){if(-1!==window.location.search.indexOf("gh_jid=")){var t=window.scrollY,e=document.querySelector("#jobs").getBoundingClientRect().top;window.scrollTo({left:0,top:t+e}),window.setTimeout((function(){window.scrollTo({left:0,top:t+e-40})}),50)}}))}]);
\ No newline at end of file
diff --git a/website/locale/en/LC_MESSAGES/messages.po b/website/locale/en/LC_MESSAGES/messages.po
index 6b54b96584a..bc8c78f051c 100644
--- a/website/locale/en/LC_MESSAGES/messages.po
+++ b/website/locale/en/LC_MESSAGES/messages.po
@@ -312,12 +312,12 @@ msgid "We'd like to host a public ClickHouse Meetup"
 msgstr "We'd like to host a public ClickHouse Meetup"
 
 #: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
-msgstr "We'd like to invite Yandex ClickHouse team to our office"
+msgid "We'd like to invite ClickHouse team to our office"
+msgstr "We'd like to invite ClickHouse team to our office"
 
 #: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
-msgstr "We'd like to invite Yandex ClickHouse team to another event we organize"
+msgid "We'd like to invite ClickHouse team to another event we organize"
+msgstr "We'd like to invite ClickHouse team to another event we organize"
 
 #: templates/index/community.html:197
 msgid "We're interested in commercial consulting, support or managed service"
@@ -359,7 +359,7 @@ msgstr "turn on JavaScript to see email address"
 #~ " column-oriented database management system"
 #~ " that allows generating analytical data "
 #~ "reports in real time using SQL "
-#~ "queries. Сreated by Yandex ClickHouse "
+#~ "queries. Сreated by ClickHouse "
 #~ "manages extremely large volumes of data"
 #~ " in a stable and sustainable manner."
 #~ msgstr ""
@@ -367,7 +367,7 @@ msgstr "turn on JavaScript to see email address"
 #~ " column-oriented database management system"
 #~ " that allows generating analytical data "
 #~ "reports in real time using SQL "
-#~ "queries. Сreated by Yandex ClickHouse "
+#~ "queries. Сreated by ClickHouse "
 #~ "manages extremely large volumes of data"
 #~ " in a stable and sustainable manner."
 
diff --git a/website/locale/ja/LC_MESSAGES/messages.po b/website/locale/ja/LC_MESSAGES/messages.po
index 1e803f62dc6..c7ad2b5ae85 100644
--- a/website/locale/ja/LC_MESSAGES/messages.po
+++ b/website/locale/ja/LC_MESSAGES/messages.po
@@ -296,11 +296,11 @@ msgid "We'd like to host a public ClickHouse Meetup"
 msgstr ""
 
 #: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
+msgid "We'd like to invite ClickHouse team to our office"
 msgstr ""
 
 #: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
+msgid "We'd like to invite ClickHouse team to another event we organize"
 msgstr ""
 
 #: templates/index/community.html:197
diff --git a/website/locale/messages.pot b/website/locale/messages.pot
index 65d62f8bebb..cfbdf52553b 100644
--- a/website/locale/messages.pot
+++ b/website/locale/messages.pot
@@ -297,11 +297,11 @@ msgid "We'd like to host a public ClickHouse Meetup"
 msgstr ""
 
 #: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
+msgid "We'd like to invite ClickHouse team to our office"
 msgstr ""
 
 #: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
+msgid "We'd like to invite ClickHouse team to another event we organize"
 msgstr ""
 
 #: templates/index/community.html:197
diff --git a/website/locale/ru/LC_MESSAGES/messages.po b/website/locale/ru/LC_MESSAGES/messages.po
index 8760024a107..ec6fbadc33b 100644
--- a/website/locale/ru/LC_MESSAGES/messages.po
+++ b/website/locale/ru/LC_MESSAGES/messages.po
@@ -297,11 +297,11 @@ msgid "We'd like to host a public ClickHouse Meetup"
 msgstr ""
 
 #: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
+msgid "We'd like to invite ClickHouse team to our office"
 msgstr ""
 
 #: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
+msgid "We'd like to invite ClickHouse team to another event we organize"
 msgstr ""
 
 #: templates/index/community.html:197
diff --git a/website/locale/zh/LC_MESSAGES/messages.po b/website/locale/zh/LC_MESSAGES/messages.po
index 77683ea398d..031b66c1a75 100644
--- a/website/locale/zh/LC_MESSAGES/messages.po
+++ b/website/locale/zh/LC_MESSAGES/messages.po
@@ -295,11 +295,11 @@ msgid "We'd like to host a public ClickHouse Meetup"
 msgstr ""
 
 #: templates/index/community.html:185
-msgid "We'd like to invite Yandex ClickHouse team to our office"
+msgid "We'd like to invite ClickHouse team to our office"
 msgstr ""
 
 #: templates/index/community.html:191
-msgid "We'd like to invite Yandex ClickHouse team to another event we organize"
+msgid "We'd like to invite ClickHouse team to another event we organize"
 msgstr ""
 
 #: templates/index/community.html:197
diff --git a/website/main.html b/website/main.html
index ff59f6564ee..768dec3cb57 100644
--- a/website/main.html
+++ b/website/main.html
@@ -9,7 +9,7 @@
 {% set og_type = 'article' %}
 
 {% if page and page.abs_url %}
-    {% set url = 'https://clickhouse.tech' + page.abs_url %}
+    {% set url = 'https://clickhouse.com' + page.abs_url %}
 {% endif %}
 
 {% if page and page.canonical_url %}
@@ -48,7 +48,7 @@
     {% block content %}
     {% if not is_blog %}
         {% include "templates/docs/nav.html" %}
-        <div class="container-fluid{% if direction == 'rtl' %} text-right{% endif %}">
+        <div class="docs container-fluid mt-3{% if direction == 'rtl' %} text-right{% endif %}">
             <div class="row justify-content-end{% if not single_page %} justify-content-xl-center{% endif %}">
                 {% include "templates/docs/sidebar.html" %}
                 {% include "templates/docs/content.html" %}
@@ -66,8 +66,8 @@
         </div>
         {% if page and page.meta.is_index %}
             {% include "templates/index/community.html" %}
-            {% include "templates/blog/footer.html" %}
         {% endif %}
+        {% include "templates/blog/footer.html" %}
     {% endif %}
 
     {% endblock %}
diff --git a/website/opensearch.xml b/website/opensearch.xml
index 731d1fb34bd..f6ab0434bc1 100644
--- a/website/opensearch.xml
+++ b/website/opensearch.xml
@@ -4,9 +4,9 @@
   <ShortName>ClickHouse</ShortName>
   <Description>Search ClickHouse</Description>
   <InputEncoding>UTF-8</InputEncoding>
-  <Image width="16" height="16" type="image/x-icon">https://clickhouse.tech/favicon.ico</Image>
+  <Image width="16" height="16" type="image/x-icon">https://clickhouse.com/favicon.ico</Image>
   <Url type="text/html" method="GET"
-      template="https://www.google.com/search?q={searchTerms}+site%3Aclickhouse.tech"/>
+      template="https://www.google.com/search?q={searchTerms}+site%3Aclickhouse.com"/>
   <Url type="application/x-suggestions+json" method="GET"
        template="https://suggestqueries.google.com/complete/search?output=chrome&amp;q={searchTerms}"/>
 </OpenSearchDescription>
diff --git a/website/robots.txt b/website/robots.txt
index 2cecc12e311..f7d6bd76a33 100644
--- a/website/robots.txt
+++ b/website/robots.txt
@@ -1,5 +1,5 @@
 User-agent: *
 Disallow: /cdn-cgi/
 Allow: /
-Host: https://clickhouse.tech
-Sitemap: https://clickhouse.tech/sitemap-index.xml
+Host: https://clickhouse.com
+Sitemap: https://clickhouse.com/sitemap-index.xml
diff --git a/website/sitemap-index.xml b/website/sitemap-index.xml
index 3fbdd99d372..bcaf6a3fe19 100644
--- a/website/sitemap-index.xml
+++ b/website/sitemap-index.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
    <sitemap>
-      <loc>https://clickhouse.tech/docs/en/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/en/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/docs/zh/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/zh/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/docs/ru/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/ru/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/docs/ja/sitemap.xml</loc>
+      <loc>https://clickhouse.com/docs/ja/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/blog/en/sitemap.xml</loc>
+      <loc>https://clickhouse.com/blog/en/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/blog/ru/sitemap.xml</loc>
+      <loc>https://clickhouse.com/blog/ru/sitemap.xml</loc>
    </sitemap>
    <sitemap>
-      <loc>https://clickhouse.tech/sitemap-static.xml</loc>
+      <loc>https://clickhouse.com/sitemap-static.xml</loc>
    </sitemap>
 </sitemapindex>
diff --git a/website/sitemap-static.xml b/website/sitemap-static.xml
index 6d6b41e5827..b5b5f3aa0d5 100644
--- a/website/sitemap-static.xml
+++ b/website/sitemap-static.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
-  <loc>https://clickhouse.tech/</loc>
+  <loc>https://clickhouse.com/</loc>
   <changefreq>daily</changefreq>
 </url>
-<url>
-  <loc>https://clickhouse.tech/benchmark/dbms/</loc>
+  <url>
+  <loc>https://clickhouse.com/company/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>https://clickhouse.tech/benchmark/hardware/</loc>
+  <loc>https://clickhouse.com/benchmark/dbms/</loc>
   <changefreq>weekly</changefreq>
 </url>
 <url>
-  <loc>https://clickhouse.tech/codebrowser/html_report/ClickHouse/index.html</loc>
+  <loc>https://clickhouse.com/benchmark/hardware/</loc>
+  <changefreq>weekly</changefreq>
+</url>
+<url>
+  <loc>https://clickhouse.com/codebrowser/html_report/ClickHouse/index.html</loc>
   <changefreq>daily</changefreq>
 </url>
 </urlset>
diff --git a/website/src/js/components/case-study-card.js b/website/src/js/components/case-study-card.js
new file mode 100644
index 00000000000..cb20b9d6ac7
--- /dev/null
+++ b/website/src/js/components/case-study-card.js
@@ -0,0 +1,40 @@
+class CaseStudyCard {
+	
+	constructor($el) {
+		this.onOpen = this.onOpen.bind(this)
+		this.onToggle = this.onToggle.bind(this)
+		this.$el = $el
+		this.$el.addEventListener('click', this.onOpen)
+		this.$el.querySelector('.case-study-card-toggle').addEventListener('click', this.onToggle)
+		this.open = false
+	}
+
+	onOpen() {
+		this.open = true
+		this.$el.classList.toggle('is-open', this.open)
+		this.$el.classList.toggle('is-closing', !this.open)
+		this.closeOthers()
+	}
+
+	onToggle(event) {
+		event.stopPropagation()
+		this.open = !this.$el.classList.contains('is-open')
+		this.$el.classList.toggle('is-open', this.open)
+		this.$el.classList.toggle('is-closing', !this.open)
+		this.closeOthers()
+	}
+
+	closeOthers() {
+		if (this.open) {
+			document.querySelectorAll('.case-study-card').forEach(($el) => {
+				if (!$el.isSameNode(this.$el)) {
+					$el.classList.toggle('is-closing', $el.classList.contains('is-open'))
+					$el.classList.toggle('is-open', false)
+				}
+			})
+		}
+	}
+
+}
+
+document.querySelectorAll('.case-study-card').forEach(($el) => new CaseStudyCard($el))
diff --git a/website/src/js/main.js b/website/src/js/main.js
new file mode 100644
index 00000000000..460cbcc4602
--- /dev/null
+++ b/website/src/js/main.js
@@ -0,0 +1,3 @@
+import './components/case-study-card'
+import './utilities/equalize-heights'
+import './utilities/greenhouse'
diff --git a/website/src/js/utilities/equalize-heights.js b/website/src/js/utilities/equalize-heights.js
new file mode 100644
index 00000000000..9d3dc6c604a
--- /dev/null
+++ b/website/src/js/utilities/equalize-heights.js
@@ -0,0 +1,35 @@
+const $allElements = document.querySelectorAll('[equalize-heights]')
+const groupedElements = {}
+
+$allElements.forEach(($el) => {
+	const group = $el.getAttribute('equalize-heights')
+	groupedElements[group] = groupedElements[group] || []
+	groupedElements[group].push($el)
+})
+
+function resizeElements() {
+	Object.entries(groupedElements).forEach(([group, $elements]) => {
+		$elements.forEach(($el) => {
+			const styles = window.getComputedStyle($el)
+			if ('none' === styles.getPropertyValue('display')) {
+				$el.style.display = 'block'
+			}
+			$el.style.minHeight = 'auto'
+		})
+		const minHeight = $elements.reduce((max, $el) => {
+			if ($el.offsetHeight > max) {
+				max = $el.offsetHeight
+			}
+			return max
+		}, 0)
+		$elements.forEach(($el) => {
+			$el.style.display = null
+			$el.style.minHeight = `${minHeight}px`
+		})
+	})
+}
+	
+window.addEventListener('resize', resizeElements)
+window.addEventListener('orientationchange', resizeElements)
+
+resizeElements()
diff --git a/website/src/js/utilities/greenhouse.js b/website/src/js/utilities/greenhouse.js
new file mode 100644
index 00000000000..0b87d1a937b
--- /dev/null
+++ b/website/src/js/utilities/greenhouse.js
@@ -0,0 +1,16 @@
+window.addEventListener('load', () => {
+	if (-1 !== window.location.search.indexOf('gh_jid=')) {
+		const scrollY = window.scrollY
+		const offsetTop = document.querySelector('#jobs').getBoundingClientRect().top
+		window.scrollTo({
+			left: 0,
+			top: scrollY + offsetTop,
+		})
+		window.setTimeout(() => {
+			window.scrollTo({
+				left: 0,
+				top: scrollY + offsetTop - 40,
+			})
+		}, 50)
+	}
+})
diff --git a/website/src/scss/_variables.scss b/website/src/scss/_variables.scss
new file mode 100644
index 00000000000..4d5ef4f4667
--- /dev/null
+++ b/website/src/scss/_variables.scss
@@ -0,0 +1,314 @@
+// Colors
+
+$white: #fff;
+$black: #212529;
+
+$gray-100: #f1f6f9;
+$gray-500: #d6dbdf;
+$gray-700: #6c757d;
+$gray-900: #495057;
+
+$color-brand-primary: #ffcc00;
+$color-brand-secondary: #ff3939;
+
+$color-primary-accent-yellow: #ffcc00;
+$color-primary-accent-light-yellow: #fffaf0;
+$color-primary-accent-blue: #257af4;
+$color-primary-accent-light-blue: #e3f1fe;
+
+$color-secondary-accent-orange: #ff8c00;
+$color-secondary-accent-light-orange: #ffe4b5;
+$color-secondary-accent-red: #ff3939;
+$color-secondary-accent-light-red: #ffe4e1;
+
+$grays: (
+    "100": $gray-100,
+    "500": $gray-500,
+	"700": $gray-700,
+    "900": $gray-900
+);
+
+$colors: (
+	"brand-primary": $color-brand-primary,
+	"brand-secondary": $color-brand-secondary,
+
+	"primary-accent-yellow": $color-brand-primary,
+	"primary-accent-light-yellow": $color-primary-accent-light-yellow,
+	"primary-accent-blue": $color-primary-accent-blue,
+	"primary-accent-light-blue": $color-primary-accent-light-blue,
+
+	"secondary-accent-orange": $color-secondary-accent-orange,
+	"secondary-accent-light-orange": $color-secondary-accent-light-orange,
+	"secondary-accent-red": $color-brand-secondary,
+	"secondary-accent-light-red": $color-secondary-accent-light-red,
+);
+
+$theme-colors: (
+	"primary": $color-brand-primary,
+	"primary-light": $color-primary-accent-light-yellow,
+	"secondary": $black,
+	"secondary-light": $white,
+	"tertiary": $color-primary-accent-blue,
+	"tertiary-light": $color-primary-accent-light-blue,
+
+	"white": $white,
+	"black": $black,
+
+	"blue": $color-primary-accent-blue,
+	"light-blue": $color-primary-accent-light-blue,
+	"yellow": $color-primary-accent-yellow,
+	"light-yellow": $color-primary-accent-light-yellow,
+	"orange": $color-secondary-accent-orange,
+	"light-orange": $color-secondary-accent-light-orange,
+	"red": $color-secondary-accent-red,
+	"light-red": $color-secondary-accent-light-red,
+
+	"light": $gray-100,
+	"medium": $gray-500,
+	"dark": $gray-900
+);
+
+$link-color: $color-secondary-accent-orange;
+$link-hover-color: $color-secondary-accent-orange;
+
+
+// Options
+//
+// Quickly modify global styling by enabling or disabling optional features.
+
+$enable-caret:                                true;
+$enable-rounded:                              true;
+$enable-shadows:                              false;
+$enable-gradients:                            false;
+$enable-transitions:                          true;
+$enable-grid-classes:                         true;
+$enable-responsive-font-sizes:                true;
+
+
+// Spacing
+//
+// Control the default styling of most Bootstrap elements by modifying these
+// variables. Mostly focused on spacing.
+// You can add more entries to the $spacers map, should you need more variation.
+
+$spacer: 8px;
+$spacers: (
+	0: 0,
+	1: $spacer,
+	2: ($spacer * 2),
+	3: ($spacer * 3),
+	4: ($spacer * 4),
+	5: ($spacer * 5),
+	6: ($spacer * 6),
+	7: ($spacer * 7),
+	8: ($spacer * 8),
+	9: ($spacer * 9),
+	10: ($spacer * 10),
+	12: ($spacer * 12),
+	15: ($spacer * 15)
+);
+
+
+// Body
+//
+// Settings for the `<body>` element.
+
+$body-bg:                   $white;
+$body-color:                $black;
+
+
+// Grid breakpoints
+//
+// Define the minimum dimensions at which your layout will change,
+// adapting to different screen sizes, for use in media queries.
+
+$grid-breakpoints: (
+  xxs: 0,
+  xs: 400px,
+  sm: 616px,
+  md: 768px,
+  lg: 980px,
+  xl: 1240px
+);
+
+
+// Grid containers
+//
+// Define the maximum width of `.container` for different screen sizes.
+
+$container-max-widths: (
+  xs: 576px,
+  sm: 576px,
+  md: 958px,
+  lg: 1008px,
+  xl: 1118px
+);
+
+// Grid columns
+//
+// Set the number of columns and specify the width of the gutters.
+
+$grid-columns:                12;
+$grid-gutter-width:           40px;
+$grid-row-columns:            6;
+
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+
+$line-height-lg:              1.5;
+$line-height-sm:              1.5;
+
+$border-width:                1px;
+$border-color:                $gray-500;
+
+$border-radius:               8px;
+$border-radius-lg:            8px;
+$border-radius-sm:            8px;
+
+$box-shadow-sm:               0 2px 14px rgba($gray-700, .2);
+$box-shadow:                  0 8px 20px rgba($gray-700, .2);
+$box-shadow-lg:               0 12px 32px rgba($gray-700, .2);
+
+
+// Typography
+//
+// Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif:      "Noto Sans", sans-serif;
+
+$font-size-base:              1rem; // Assumes the browser default, typically `16px`
+$font-size-xl:                $font-size-base * 1.25; // 20px
+$font-size-lg:                $font-size-base * 1.125; // 18px
+$font-size-sm:                $font-size-base * .875; // 14px
+$font-size-xs:                $font-size-base * .625; // 10px
+
+$font-weight-light:           300;
+$font-weight-normal:          400;
+$font-weight-medium:          500;
+$font-weight-semibold:        600;
+$font-weight-bold:            700;
+
+$font-weight-base:            $font-weight-normal;
+$line-height-base:            1.5;
+
+$h1-font-size:                40px;
+$h2-font-size:                32px;
+$h3-font-size:                28px;
+$h4-font-size:                24px;
+$h5-font-size:                18px;
+$h6-font-size:                14px;
+
+$headings-margin-bottom:      $spacer * 2;
+$headings-font-family:        "Hind Siliguri", sans-serif;
+$headings-font-weight:        500;
+$headings-line-height:        1.125;
+$headings-color:              null;
+
+$display1-size:               64px;
+$display2-size:               40px;
+$display3-size:               32px;
+$display4-size:               28px;
+$display5-size:               20px;
+$display6-size:               14px;
+
+$display1-weight:             600;
+$display2-weight:             600;
+$display3-weight:             500;
+$display4-weight:             500;
+$display5-weight:             500;
+$display6-weight:             700;
+$display-line-height:         $headings-line-height;
+
+$lead-font-size:              22px;
+$lead-font-weight:            400;
+
+$text-muted:                  $gray-700;
+
+
+// Buttons
+//
+// For each of Bootstrap's buttons, define text, background, and border color.
+
+$btn-padding-y:               12px;
+$btn-padding-x:               32px;
+$btn-font-family:             inherit;
+$btn-font-size:               14px;
+$btn-line-height:             20px;
+$btn-white-space:             null; // Set to `nowrap` to prevent text wrapping
+
+$btn-padding-y-sm:            12px;
+$btn-padding-x-sm:            32px;
+$btn-font-size-sm:            14px;
+$btn-line-height-sm:          20px;
+
+$btn-padding-y-lg:            16px;
+$btn-padding-x-lg:            32px;
+$btn-font-size-lg:            18px;
+$btn-line-height-lg:          26px;
+
+$btn-border-width:            1px;
+
+$btn-font-weight:             $font-weight-bold;
+$btn-box-shadow:              none;
+$btn-focus-width:             0;
+$btn-focus-box-shadow:        none;
+$btn-disabled-opacity:        .65;
+$btn-active-box-shadow:       none;
+
+$btn-link-disabled-color:     $gray-500;
+
+$btn-block-spacing-y:         24px;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius:           $border-radius;
+$btn-border-radius-lg:        $border-radius-lg;
+$btn-border-radius-sm:        $border-radius-sm;
+
+$btn-transition:              color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+
+
+// Navs
+
+$nav-link-padding-y:                0;
+$nav-link-padding-x:                0;
+$nav-link-disabled-color:           $gray-500;
+
+$nav-tabs-border-color:             $gray-700;
+$nav-tabs-border-width:             $border-width;
+$nav-tabs-border-radius:            $border-radius;
+$nav-tabs-link-hover-border-color:  transparent;
+$nav-tabs-link-active-color:        $color-primary-accent-blue;
+$nav-tabs-link-active-bg:           $white;
+$nav-tabs-link-active-border-color: $gray-700;
+
+
+// Navbar
+
+$navbar-padding-y:            24px;
+$navbar-padding-x:            0;
+
+
+// Cards
+
+$card-spacer-y:                     24px;
+$card-spacer-x:                     24px;
+$card-border-width:                 $border-width;
+$card-border-radius:                $border-radius;
+$card-border-color:                 $border-color;
+$card-inner-border-radius:          subtract($card-border-radius, $card-border-width);
+$card-cap-bg:                       $gray-100;
+$card-cap-color:                    null;
+$card-height:                       null;
+$card-color:                        null;
+$card-bg:                           $white;
+
+$card-img-overlay-padding:          24px;
+
+$card-group-margin:                 $grid-gutter-width / 2;
+$card-deck-margin:                  $card-group-margin;
+
+$card-columns-count:                3;
+$card-columns-gap:                  $grid-gutter-width;
+$card-columns-margin:               $grid-gutter-width;
diff --git a/website/src/scss/bootstrap.scss b/website/src/scss/bootstrap.scss
new file mode 100644
index 00000000000..0f2559f260f
--- /dev/null
+++ b/website/src/scss/bootstrap.scss
@@ -0,0 +1,2 @@
+@import 'variables';
+@import '~bootstrap';
diff --git a/website/src/scss/components/_btn.scss b/website/src/scss/components/_btn.scss
new file mode 100644
index 00000000000..fd3a45c4cd5
--- /dev/null
+++ b/website/src/scss/components/_btn.scss
@@ -0,0 +1,81 @@
+.btn {
+	@media screen and (max-width: 978.98px) {
+		padding: 8px 16px;
+	}
+}
+
+.btn-lg {
+	@media screen and (max-width: 978.98px) {
+		padding: 12px 24px;
+	}
+}
+
+.btn-primary {
+	color: $black;
+
+	&:active,
+	&:hover {
+		color: $black;
+	}
+}
+
+.btn-outline-primary {
+	background: map-get($theme-colors, "primary-light");
+	border-color: map-get($theme-colors, "primary");
+	color: $black;
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "primary");
+		border-color: map-get($theme-colors, "primary");
+		color: $black;
+	}
+}
+
+.btn-secondary {
+	border-color: map-get($theme-colors, "secondary");
+	color: map-get($theme-colors, "secondary-light");
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "secondary-light");
+		border-color: map-get($theme-colors, "secondary");
+		color: map-get($theme-colors, "secondary");
+	}
+}
+
+.btn-outline-secondary {
+	background: map-get($theme-colors, "secondary-light");
+	border-color: map-get($theme-colors, "secondary");
+	color: map-get($theme-colors, "secondary");
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "secondary");
+		border-color: map-get($theme-colors, "secondary");
+		color: map-get($theme-colors, "secondary-light");
+	}
+}
+
+.btn-tertiary {
+	border-color: map-get($theme-colors, "tertiary");
+	color: $white;
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "tertiary");
+		border-color: map-get($theme-colors, "tertiary");
+		color: $white;
+	}
+}
+
+.btn-outline-tertiary {
+	background: map-get($theme-colors, "tertiary-light");
+	color: map-get($theme-colors, "tertiary");
+
+	&:active,
+	&:hover {
+		background: map-get($theme-colors, "tertiary");
+		color: $white;
+	}
+}
diff --git a/website/src/scss/components/_btns.scss b/website/src/scss/components/_btns.scss
new file mode 100644
index 00000000000..da2d7535e62
--- /dev/null
+++ b/website/src/scss/components/_btns.scss
@@ -0,0 +1,13 @@
+.btns {
+	align-items: center;
+	display: flex;
+	justify-content: center;
+
+	.btn + .btn {
+		margin-left: $spacer * 3;
+	}
+
+	.btn-lg + .btn-lg {
+		margin-left: $spacer * 5;
+	}
+}
diff --git a/website/src/scss/components/_card.scss b/website/src/scss/components/_card.scss
new file mode 100644
index 00000000000..8691234872b
--- /dev/null
+++ b/website/src/scss/components/_card.scss
@@ -0,0 +1,75 @@
+.card {
+	box-shadow: $box-shadow;
+	overflow: hidden;
+	position: relative;
+	transition: box-shadow 0.2s, transform 0.2s;
+	width: 100%;
+
+	&-body {
+		position: relative;
+		z-index: 10;
+	}
+}
+
+.card.is-large .card-body {
+	padding: 40px;
+}
+
+.card.bg-primary-light {
+	border-color: $color-brand-primary;
+}
+
+.card.has-dark-border {
+	border-color: $gray-700;
+}
+
+.card.has-pattern:before,
+.card.has-pattern:after {
+	background-repeat: no-repeat;
+	background-size: auto 100%;
+	bottom: 0;
+	content: '';
+	display: block;
+	position: absolute;
+	top: 0;
+	width: 72px;
+}
+
+.card.has-pattern:before {
+	background-image: url(#{'../images/backgrounds/bg-card-pattern-blue-1.png'});
+	background-position: left top;
+	left: 0;
+}
+
+.card.has-pattern:after {
+	background-image: url(#{'../images/backgrounds/bg-card-pattern-blue-2.png'});
+	background-position: right top;
+	right: 0;
+}
+
+a.card:active,
+a.card:hover,
+.card.has-hover:active,
+.card.has-hover:hover {
+	box-shadow: $box-shadow-lg;
+	transform: translateY(-8px);
+}
+
+a.card:after,
+.card.has-hover:after,
+.card.has-highlight:after {
+	content: '';
+	display: block;
+	height: 8px;
+	margin-top: auto;
+	transition: background 0.2s;
+	width: 100%;
+}
+
+a.card:active:after,
+a.card:hover:after,
+.card.has-hover:active:after,
+.card.has-hover:hover:after,
+.card.has-highlight:after {
+	background: $color-primary-accent-light-blue;
+}
diff --git a/website/src/scss/components/_case-study-card.scss b/website/src/scss/components/_case-study-card.scss
new file mode 100644
index 00000000000..bb2eb53abd1
--- /dev/null
+++ b/website/src/scss/components/_case-study-card.scss
@@ -0,0 +1,204 @@
+.case-study-cards {
+	column-gap: $grid-gutter-width;
+	display: grid;
+	grid-template-columns: 1fr;
+	row-gap: 40px;
+	padding-bottom: 40px;
+	position: relative;
+
+	> div {
+		align-items: stretch;
+		display: flex;
+	}
+
+	&:before {
+		background: $gray-500;
+		bottom: 0;
+		content: '';
+		display: block;
+		left: 20px;
+		position: absolute;
+		top: 40px;
+		width: 100vw;
+	}
+
+	@media screen and (min-width: 980px) {
+		grid-template-columns: repeat(2, minmax(0, 1fr));
+		row-gap: 80px;
+		padding-bottom: 120px;
+
+		&:before {
+			left: -40px;
+			top: 120px;
+		}
+	}
+}
+
+.case-study-card {
+	align-items: stretch;
+	flex-direction: row;
+	flex-shrink: 0;
+	left: 0;
+	transition: 0.2s box-shadow, 0.4s left, 0.4s width, 0s z-index;
+	transition-delay: 0s, 0.6s, 0.6s, 0s;
+	width: 100%;
+	z-index: 2;
+
+	@media screen and (max-width: 979.98px) {
+		.row {
+			min-height: 0 !important;
+		}
+	}
+
+	@media screen and (min-width: 980px) {
+
+		&:active,
+		&:hover {
+			box-shadow: $box-shadow-lg;
+		}
+	
+		&:not(.is-open) {
+			cursor: pointer;
+		}
+	
+		&.is-open {
+			transform: none !important;
+			transition-delay: 0s, 0s, 0s, 0s;
+			width: calc(200% + #{$grid-gutter-width});
+			z-index: 10;
+		}
+	
+		&.is-closing {
+			z-index: 10;
+		}
+	
+		&.open-left.is-open {
+			left: calc(-100% - #{$grid-gutter-width});
+		}
+		
+		&:before {
+			background: no-repeat url(#{'../images/backgrounds/bg-card-pattern-red.png'});
+			background-position: right center;
+			background-size: contain;
+			content: '';
+			display: block;
+			height: calc(100% - 80px);
+			max-height: 224px;
+			max-width: 234px;
+			position: absolute;
+			right: 0;
+			top: 40px;
+			transform: translateX(30%);
+			transition: 0.4s transform;
+			transition-delay: 0.6s;
+			width: 100%;
+			z-index: 1;
+
+			@media screen and (min-width: 1240px) {
+				transform: translateX(10%);
+			}
+		}
+	
+		&.is-open:before {
+			transform: translateX(60%);
+			transition-delay: 0s;
+		}
+	
+		&-wrap {
+			align-items: stretch;
+			display: flex;
+			flex-shrink: 0;
+			min-height: 304px;
+			position: relative;
+			transition: 0.4s width;
+			transition-delay: 0.6s;
+			width: calc(200% + #{2px + $grid-gutter-width});
+			z-index: 2;
+		}
+	
+		&.is-open &-wrap {
+			transition-delay: 0s;
+			width: 100%;
+		}
+	
+		&-body {
+			display: flex;
+			flex-direction: column;
+			padding-right: 80px !important;
+	
+			> .row {
+				align-self: stretch;
+			}
+		}
+	
+		&-toggle {
+			background: $white;
+			box-shadow: $box-shadow;
+			border-radius: 100%;
+			cursor: pointer;
+			height: 56px;
+			position: relative;
+			width: 56px;
+	
+			&:before,
+			&:after {
+				background: $color-primary-accent-blue;
+				content: '';
+				display: block;
+				height: 4px;
+				left: calc(50% - 15px);
+				position: absolute;
+				top: calc(50% - 2px);
+				transition: opacity 0.2s, transform 0.2s;
+				width: 30px;
+			}
+	
+			&:after {
+				transform: rotate(90deg);
+			}
+		}
+	
+		&.is-open &-toggle:before {
+			opacity: 0;
+			transform: rotate(-90deg);
+		}
+	
+		&.is-open &-toggle:after {
+			transform: rotate(0);
+		}
+	
+		.col-lg-3,
+		.col-lg-auto {
+			opacity: 0;
+			transform: translateX(24px);
+			transition: 0.4s opacity, 0.4s transform;
+		}
+	
+		.col-lg-3 {
+			transition-delay: 0s;
+		}
+	
+		.col-lg-auto {
+			transition-delay: 0.2s;
+
+			@media screen and (min-width: 980px) {
+				max-width: 605px;
+				width: calc(100% - 319px);
+			}
+		}
+	
+		&.is-open .col-lg-3,
+		&.is-open .col-lg-auto {
+			opacity: 1;
+			transform: none;
+		}
+	
+		&.is-open .col-lg-3 {
+			transition-delay: 0.4s;
+		}
+	
+		&.is-open .col-lg-auto {
+			transition-delay: 0.2s;
+		}
+	}
+}
diff --git a/website/src/scss/components/_footer.scss b/website/src/scss/components/_footer.scss
new file mode 100644
index 00000000000..94d8f47115f
--- /dev/null
+++ b/website/src/scss/components/_footer.scss
@@ -0,0 +1,5 @@
+.footer {
+	&-copy {
+		white-space: nowrap;
+	}
+}
diff --git a/website/src/scss/components/_form.scss b/website/src/scss/components/_form.scss
new file mode 100644
index 00000000000..b37b7044ce1
--- /dev/null
+++ b/website/src/scss/components/_form.scss
@@ -0,0 +1,38 @@
+form {
+	.form-control {
+		border: 1px solid $gray-700;
+		border-radius: 6px;
+		box-shadow: $box-shadow;
+		color: $black;
+		height: auto;
+		line-height: 20px;
+		min-height: 44px;
+		padding: 12px 16px;
+		width: 100%;
+
+		&:focus {
+			border-color: $black;
+			box-shadow: $box-shadow;
+			color: $black;
+		}
+
+		&::placeholder {
+			color: $gray-700;
+		}
+	}
+
+	select.form-control {
+		appearance: none;
+	}
+
+	select.form-control:not([data-chosen]) {
+		color: $gray-700;
+	}
+
+	.btn-secondary:active,
+	.btn-secondary:hover {
+		color: $black;
+		background: $color-brand-primary;
+		border-color: $color-brand-primary;
+	}
+}
diff --git a/website/src/scss/components/_hero.scss b/website/src/scss/components/_hero.scss
new file mode 100644
index 00000000000..61b22b3e32b
--- /dev/null
+++ b/website/src/scss/components/_hero.scss
@@ -0,0 +1,58 @@
+.hero {
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+	overflow: visible;
+	position: relative;
+
+	&-bg {
+		background-repeat: no-repeat;
+		background-position: center;
+		background-size: cover;
+		display: block;
+		height: 100%;
+		left: 50%;
+		position: absolute;
+		top: 0;
+		transform: translateX(-50%);
+		z-index: 1;
+	}
+
+	> .container {
+		position: relative;
+		z-index: 2;
+	}
+}
+
+.hero.has-offset {
+	margin-bottom: -160px;
+	padding-bottom: 160px;
+}
+
+.base-hero {
+	height:22.5vw;
+	max-height:324px;
+	min-height:280px;
+}
+.index-hero {
+  background-image:url('/images/backgrounds/bg-hero-home.svg');
+  height:68vw;
+  max-height:980px;
+  max-width:2448px;
+  width:170vw;
+}
+.other-hero {
+  background-image: url('/images/backgrounds/bg-hero.svg');
+  max-width: 2448px;
+  width: 170vw;
+}
+.bg-footer-cta {
+  background-image:url('/images/backgrounds/bg-footer-cta.svg');
+  width:2448px;
+}
+.quickstart-bg {
+  background-image:url('/images/backgrounds/bg-quick-start.svg');
+  height:40vw;
+  top:220px;
+  width:170vw;
+}
diff --git a/website/src/scss/components/_hr.scss b/website/src/scss/components/_hr.scss
new file mode 100644
index 00000000000..81ed120367a
--- /dev/null
+++ b/website/src/scss/components/_hr.scss
@@ -0,0 +1,40 @@
+hr {
+	background: $gray-100;
+	border: 0;
+	display: block;
+	height: 4px;
+	margin: 0;
+	width: 100%;
+}
+
+hr.is-small {
+	height: 2px;
+}
+
+hr.is-large {
+	height: 8px;
+}
+
+hr.is-medium {
+	background: $gray-500;
+}
+
+hr.is-dark {
+	background: $gray-900;
+}
+
+hr.is-yellow {
+	background: linear-gradient(90deg, $color-secondary-accent-orange 0, $color-secondary-accent-orange 8px, $color-primary-accent-yellow 16px, rgba($color-primary-accent-yellow, 0) 100%);
+	clip-path: polygon(
+		8px 100%,
+		0 100%,
+		0 0,
+		8px 0,
+		8px 100%,
+		16px 100%,
+		16px 0,
+		100% 0,
+		100% 100%
+	);
+	height: 8px;
+}
diff --git a/website/src/scss/components/_icon.scss b/website/src/scss/components/_icon.scss
new file mode 100644
index 00000000000..090720b049a
--- /dev/null
+++ b/website/src/scss/components/_icon.scss
@@ -0,0 +1,15 @@
+.icon {
+	display: block;
+	height: 48px;
+	margin-bottom: $spacer * 3;
+	object-fit: contain;
+	object-position: center;
+
+	@media screen and (min-width: 576px) {
+		height: 64px;
+	}
+
+	@media screen and (min-width: 980px) {
+		height: 80px;
+	}
+}
diff --git a/website/src/scss/components/_img.scss b/website/src/scss/components/_img.scss
new file mode 100644
index 00000000000..f65a4b5ef42
--- /dev/null
+++ b/website/src/scss/components/_img.scss
@@ -0,0 +1,3 @@
+img {
+	max-width: 100%;
+}
diff --git a/website/src/scss/components/_kicker.scss b/website/src/scss/components/_kicker.scss
new file mode 100644
index 00000000000..bac94510157
--- /dev/null
+++ b/website/src/scss/components/_kicker.scss
@@ -0,0 +1,8 @@
+.kicker {
+	color: $gray-700;
+	font-family: $headings-font-family;
+	font-size: $font-size-sm;
+	font-weight: $font-weight-semibold;	
+	letter-spacing: 1px;
+	margin: 0;
+}
diff --git a/website/src/scss/components/_lead.scss b/website/src/scss/components/_lead.scss
new file mode 100644
index 00000000000..0d028bca549
--- /dev/null
+++ b/website/src/scss/components/_lead.scss
@@ -0,0 +1,5 @@
+.lead {
+	@media screen and (max-width: 978.98px) {
+		font-size: $font-size-lg;
+	}
+}
diff --git a/website/src/scss/components/_logo.scss b/website/src/scss/components/_logo.scss
new file mode 100644
index 00000000000..bbc91f87284
--- /dev/null
+++ b/website/src/scss/components/_logo.scss
@@ -0,0 +1,8 @@
+.logo {
+	display: block;
+	height: 36px;
+	max-width: 220px;
+	object-fit: contain;
+	object-position: center;
+	width: 100%;
+}
diff --git a/website/src/scss/components/_navbar.scss b/website/src/scss/components/_navbar.scss
new file mode 100644
index 00000000000..53a834d2ed7
--- /dev/null
+++ b/website/src/scss/components/_navbar.scss
@@ -0,0 +1,136 @@
+.navbar-clickhouse {
+    border-bottom: 4px solid $gray-100;
+	height: 142px;
+
+	> .container {
+		flex-wrap: wrap;
+	}
+}
+
+.navbar {
+	&-super {
+		flex-shrink: 0;
+		width: 100%;
+
+		ul {
+			list-style: none;
+		}
+
+		li:not(:last-child) {
+			margin-bottom: 0;
+			margin-right: 24px;
+		}
+
+		a {
+			align-items: center;
+			color: $black;
+			display: flex;
+			font-size: $font-size-sm;
+
+			&:active,
+			&:hover {
+				color: $color-primary-accent-blue;
+				text-decoration: none;
+			}
+		}
+
+		img {
+			flex-shrink: 0;
+			margin-right: $spacer * 0.5;
+		}
+	}
+
+	&-brand-clickhouse {
+		background: no-repeat url(#{"../images/logo-clickhouse.svg"});
+		background-size: contain;
+		flex-shrink: 0;
+		height: 28px;
+		margin-right: 48px;
+		padding: 0;
+		width: 180px;
+	}
+
+	&-nav {
+		align-items: center;
+		height: 46px;
+	}
+
+	.nav-item:not(:last-child) {
+		margin-bottom: 0;
+		margin-right: 24px;
+	}
+	
+	.nav-link {
+		color: $black;
+	
+		&:active,
+		&:hover {
+			color: $color-primary-accent-blue;
+		}
+	}
+
+	.navbar-nav {
+		flex-direction: row;
+	}
+
+	@media screen and (max-width: 978.98px) {
+		> .container {
+			padding-left: 20px;
+			padding-right: 20px;
+		}
+
+		.navbar-toggler {
+			height: 24px;
+			padding: 0;
+			width: 24px;
+
+			&:focus {
+				outline: none;
+			}
+		}
+
+		.navbar-toggler-icon {
+			background: no-repeat url(#{"../images/icons/icon-menu.svg"});
+			background-position: center;
+			background-size: contain;
+			height: 24px;
+			width: 24px;
+		}
+		
+		.navbar-collapse {
+			background: $white;
+			border-bottom: 4px solid $gray-100;
+			height: 56px;
+			left: 0;
+			padding: 0 20px 16px;
+			position: absolute;
+			right: 0;
+			top: 100%;
+		}
+
+		.nav-link {
+			font-size: $font-size-sm;
+			white-space: nowrap;
+		}
+	}
+
+	@media screen and (max-width: 615.98px) {
+		.navbar-collapse {
+			height: auto;
+		}
+
+		.navbar-nav {
+			flex-direction: column;
+			height: auto;
+		}
+
+		.nav-item:not(:last-child) {
+			margin-bottom: 16px;
+			margin-right: 0;
+		}
+	}
+
+	@media screen and (max-width: 399.98px) {
+		height: 80px;
+	}
+}
diff --git a/website/src/scss/components/_page.scss b/website/src/scss/components/_page.scss
new file mode 100644
index 00000000000..a411ff7a15c
--- /dev/null
+++ b/website/src/scss/components/_page.scss
@@ -0,0 +1,4 @@
+.page {
+	overflow: hidden;
+	width: 100%;
+}
diff --git a/website/src/scss/components/_photo-frame.scss b/website/src/scss/components/_photo-frame.scss
new file mode 100644
index 00000000000..6f8407fe6c3
--- /dev/null
+++ b/website/src/scss/components/_photo-frame.scss
@@ -0,0 +1,30 @@
+.photo-frame {
+	background: rgba($white, 0.6);
+	//border: 6px solid $color-primary-accent-blue;
+	border-radius: 100%;
+	box-shadow: $box-shadow;
+	display: block;
+	margin-bottom: $spacer * 3;
+	max-width: 160px;
+	overflow: hidden;
+	position: relative;
+	width: 100%;
+
+	&:before {
+		content: '';
+		display: block;
+		padding-bottom: 100%;
+		width: 100%;
+	}
+
+	img {
+		display: block;
+		height: 100%;
+		left: 0;
+		object-fit: contain;
+		object-position: center;
+		position: absolute;
+		top: 0;
+		width: 100%;
+	}
+}
diff --git a/website/src/scss/components/_pullquote.scss b/website/src/scss/components/_pullquote.scss
new file mode 100644
index 00000000000..7ce2771c6f8
--- /dev/null
+++ b/website/src/scss/components/_pullquote.scss
@@ -0,0 +1,47 @@
+@use 'sass:math';
+
+.pullquote {
+	position: relative;
+	width: 70%;
+
+	&:before {
+		background: no-repeat url(#{'../images/backgrounds/bg-quotes.svg'});
+		background-position: center;
+		background-size: 100%;
+		bottom: 0;
+		content: '';
+		display: block;
+		mix-blend-mode: multiply;
+		position: absolute;
+		right: $spacer * 7;
+		top: 0;
+		width: calc(100% - #{$spacer * 2});
+		z-index: 2;
+	}
+
+	&-bg {
+		bottom: 0;
+		display: block;
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: calc(50vw + #{100% * math.div(20, 70)});
+		z-index: 1;
+	}
+
+	&-body {
+		padding: ($spacer * 8) ($spacer * 5) ($spacer * 8) 0;
+		position: relative;
+		z-index: 3;
+	}
+
+	&-quote {
+		font-family: $headings-font-family;
+		font-size: 32px;
+		font-weight: $font-weight-bold;
+	}
+
+	&-citation {
+		font-size: $font-size-lg;
+	}
+}
diff --git a/website/src/scss/components/_section.scss b/website/src/scss/components/_section.scss
new file mode 100644
index 00000000000..6243a9326cc
--- /dev/null
+++ b/website/src/scss/components/_section.scss
@@ -0,0 +1,25 @@
+.section {
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: cover;
+	overflow: visible;
+	position: relative;
+
+	&-bg {
+		background-repeat: no-repeat;
+		background-position: center;
+		background-size: cover;
+		display: block;
+		height: 100%;
+		left: 50%;
+		position: absolute;
+		top: 0;
+		transform: translateX(-50%);
+		z-index: 1;
+	}
+
+	> .container {
+		position: relative;
+		z-index: 2;
+	}
+}
diff --git a/website/src/scss/components/_social-icons.scss b/website/src/scss/components/_social-icons.scss
new file mode 100644
index 00000000000..9b55d5d1469
--- /dev/null
+++ b/website/src/scss/components/_social-icons.scss
@@ -0,0 +1,58 @@
+.social-icons {
+	align-items: center;
+	display: flex;
+
+	> a {
+		aspect-ratio: 24 / 24; 
+		background: $gray-700;
+		display: block;
+		height: 24px; 
+		width: 24px; 
+		mask-position: center; 
+		mask-repeat: no-repeat;
+		mask-size: contain;
+		transition: 0.2s background;
+
+		&:active,
+		&:hover {
+			background: $black;
+		}
+	}
+
+	> a + a {
+		margin-left: $spacer * 4;
+	}
+
+	&-facebook {
+		mask-image: url('/images/icons/icon-facebook-gray.svg');
+	}
+
+	&-twitter {
+		mask-image: url('/images/icons/icon-twitter-gray.svg');
+		width: 31px;
+	}
+
+	&-linkedin {
+		mask-image: url('/images/icons/icon-linkedin-gray.svg');
+	}
+
+	&-linkedin-alt {
+		mask-image: url('/images/icons/icon-linkedin-alt-gray.svg');
+	}
+}
+
+.social-icons.size-small {
+	> a {
+		height: 20px; 
+		width: 20px;
+
+		&:active,
+		&:hover {
+			background: $black;
+		}
+	}
+
+	> a + a {
+		margin-left: $spacer * 2;
+	}
+}
diff --git a/website/src/scss/components/_tabs.scss b/website/src/scss/components/_tabs.scss
new file mode 100644
index 00000000000..620b86e7d00
--- /dev/null
+++ b/website/src/scss/components/_tabs.scss
@@ -0,0 +1,106 @@
+.tabs {
+	position: relative;
+
+	&:before {
+		background: $white;
+		border-radius: ($border-radius - $border-width) ($border-radius - $border-width) 0 0;
+		content: '';
+		display: block;
+		height: $border-radius;
+		left: 1px;
+		position: absolute;
+		right: 1px;
+		top: 68px;
+		z-index: 10;
+		
+		@media screen and (min-width: 1240px) {
+			top: 76px;
+		}
+	}
+
+	&-body {
+		background: $white;
+		border-color: $gray-700;
+		border-radius: $border-radius;
+		border-style: solid;
+		border-width: $border-width;
+		box-shadow: $box-shadow;
+		padding: $spacer * 3;
+
+		@media screen and (min-width: 980px) {
+			padding: $spacer * 4;
+		}
+		
+		@media screen and (min-width: 1240px) {
+			padding: $spacer * 5;
+		}
+	}
+
+	.nav-tabs {
+		border-bottom: 0;
+		flex-wrap: nowrap;
+		height: 68px + $border-radius;
+		margin: -20px -20px #{-($border-radius + $border-width)};
+		mask-image: linear-gradient(90deg, transparent 0%, #000 20px, #000 calc(100% - 20px), transparent 100%);
+		overflow: scroll;
+		overflow-x: scroll;
+		overflow-y: visible;
+		padding: 20px 20px 0;
+		position: relative;
+
+		@media screen and (min-width: 940px) {
+			overflow: visible;
+		}
+		
+		@media screen and (min-width: 1240px) {
+			height: 76px + $border-radius;
+		}
+	}
+
+	.nav-link {
+		align-items: center;
+		border-bottom: 0;
+		color: $gray-700;
+		display: flex;
+		font-size: $font-size-sm;
+		flex-shrink: 0;
+		height: 48px + $border-radius;
+		justify-content: center;
+		padding: 0 12px $border-radius;
+		text-align: center;
+		white-space: nowrap;
+		
+		@media screen and (min-width: 1240px) {
+			height: 56px + $border-radius;
+			padding: 0 16px $border-radius;
+		}
+	}
+
+	.nav-link.active {
+		background: $white;
+		box-shadow: 0 -4px 8px rgba($gray-700, .1);
+		font-weight: $font-weight-bold;
+		padding: 0 16px $border-radius;
+		
+		@media screen and (min-width: 980px) {
+			padding: 0 24px $border-radius;
+		}
+		
+		@media screen and (min-width: 1240px) {
+			padding: 0 32px $border-radius;
+		}
+	}
+}
+
+.tab-pane {
+	pre {
+		background: $black;
+		border-radius: 16px;
+		color: $white;
+		padding: ($spacer * 3) ($spacer * 2);
+		
+		@media screen and (min-width: 1240px) {
+			padding: ($spacer * 4) ($spacer * 3);
+		}
+	}
+}
diff --git a/website/src/scss/components/_trailing-link.scss b/website/src/scss/components/_trailing-link.scss
new file mode 100644
index 00000000000..a2c08ff2543
--- /dev/null
+++ b/website/src/scss/components/_trailing-link.scss
@@ -0,0 +1,32 @@
+.trailing-link {
+	align-items: center;
+	color: $black;
+	display: flex;
+	font-size: $font-size-sm;
+	font-weight: $font-weight-bold;
+
+	&:after {
+		background: no-repeat url(#{'../images/icons/icon-arrow.svg'});
+		background-position: right center;
+		background-size: contain;
+		content: '';
+		display: block;
+		height: 12px;
+		transition: 0.2s transform;
+		width: 20px;
+	}
+
+	&:active,
+	&:hover {
+		color: $black;
+		text-decoration: none;
+
+		&:after {
+			transform: translateX(8px);
+		}
+	}
+
+	&.span-full:after {
+		margin-left: auto;
+	}
+}
diff --git a/website/src/scss/components/_ul.scss b/website/src/scss/components/_ul.scss
new file mode 100644
index 00000000000..9cf03aba169
--- /dev/null
+++ b/website/src/scss/components/_ul.scss
@@ -0,0 +1,24 @@
+ul {
+	color: $gray-900;
+	list-style-type: square;
+	padding-left: 1.25em;
+
+	li:not(:last-child) {
+		margin-bottom: ($spacer * 2);
+	}
+
+	li::marker {
+		color: $color-brand-secondary;
+	}
+}
+
+ul.has-separators {
+	list-style: none;
+	padding: 0;
+
+	li:not(:last-child) {
+		border-bottom: 4px solid $gray-100;
+		margin-bottom: $spacer * 3;
+		padding-bottom: $spacer * 3;
+	}
+}
diff --git a/website/src/scss/greenhouse.scss b/website/src/scss/greenhouse.scss
new file mode 100644
index 00000000000..710b606fa15
--- /dev/null
+++ b/website/src/scss/greenhouse.scss
@@ -0,0 +1,27 @@
+#main {
+	padding-bottom: 0;
+	padding-top: 0;
+}
+
+#wrapper {
+	max-width: 1078px;
+	padding: 0;
+}
+
+body > #wrapper > #main > #wrapper > #logo,
+body > #wrapper > #main > #wrapper > h1,
+body > #wrapper > #main > #wrapper > #content {
+	display: none;
+}
+
+body > #wrapper > #main > #wrapper > #board_title {
+	margin-top: 0;
+}
+
+body > #wrapper > #main > #logo {
+	margin-top: 80px;
+}
+
+body > #wrapper > #main > :last-child {
+	margin-bottom: 120px;
+}
diff --git a/website/src/scss/main.scss b/website/src/scss/main.scss
new file mode 100644
index 00000000000..b77347ee412
--- /dev/null
+++ b/website/src/scss/main.scss
@@ -0,0 +1,3 @@
+@import 'variables';
+@import 'components/**/*';
+@import 'utilities/**/*';
diff --git a/website/src/scss/utilities/_bg.scss b/website/src/scss/utilities/_bg.scss
new file mode 100644
index 00000000000..0b8f63e298f
--- /dev/null
+++ b/website/src/scss/utilities/_bg.scss
@@ -0,0 +1,35 @@
+.bg-gradient-secondary {
+	background-image: linear-gradient(58deg, #FF6443 3%, #FE561D 24%, #E32F0D 93%);
+}
+
+.bg-gradient-light-orange {
+	background-image: linear-gradient(90deg, rgba(#FFCB80, 0) 0%, #FFCB80 100%);
+}
+
+.bg-offset-right {
+	bottom: 0;
+	left: -24px;
+	position: absolute;
+	top: 0;
+	width: calc(100vw + 24px);
+	z-index: -1;
+
+	@media screen and (min-width: 1240px) {
+		left: -96px;
+		width: calc(100vw + 96px);
+	}
+}
+
+.bg-inset-right {
+	bottom: 0;
+	left: 40px;
+	position: absolute;
+	top: 0;
+	width: calc(100vw - 40px);
+	z-index: -1;
+
+	@media screen and (min-width: 980px) {
+		left: 96px;
+		width: calc(100vw - 96px);
+	}
+}
diff --git a/website/src/scss/utilities/_border.scss b/website/src/scss/utilities/_border.scss
new file mode 100644
index 00000000000..7cade2776c3
--- /dev/null
+++ b/website/src/scss/utilities/_border.scss
@@ -0,0 +1,4 @@
+.has-border-left {
+	border-left: 8px solid $gray-100;
+	padding-left: $spacer * 2;
+}
diff --git a/website/src/scss/utilities/_font.scss b/website/src/scss/utilities/_font.scss
new file mode 100644
index 00000000000..44c19e46284
--- /dev/null
+++ b/website/src/scss/utilities/_font.scss
@@ -0,0 +1,31 @@
+.font-xl {
+	font-size: $font-size-xl;
+}
+
+.font-lg {
+	font-size: $font-size-lg;
+}
+
+.font-sm {
+	font-size: $font-size-sm;
+}
+
+.font-xs {
+	font-size: $font-size-xs;
+}
+
+.font-weight-semibold {
+	font-weight: $font-weight-semibold;
+}
+
+.display-5 {
+	color: $black;
+	font-size: $display5-size;
+	font-weight: $display5-weight;
+}
+
+.display-6 {
+	color: $black;
+	font-size: $display6-size;
+	font-weight: $display6-weight;
+}
diff --git a/website/src/scss/utilities/_text.scss b/website/src/scss/utilities/_text.scss
new file mode 100644
index 00000000000..bca5f3bef7c
--- /dev/null
+++ b/website/src/scss/utilities/_text.scss
@@ -0,0 +1,7 @@
+.text-decoration-underline {
+	text-decoration: underline;
+}
+
+.text-upper {
+	text-transform: uppercase;
+}
diff --git a/website/templates/base.html b/website/templates/base.html
index 700f71d61ec..0d849cb120d 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -6,8 +6,11 @@
     {% include "templates/common_css.html" %}
 </head>
 <body dir="{{ direction or 'ltr' }}" {{ extra_body_attrs }}>
-{% block content %}{% endblock %}
-{% include "templates/footer.html" %}
-{% include "templates/common_js.html" %}
+    {% block nav %}{% endblock %}
+    <div class="page">
+        {% block content %}{% endblock %}
+        {% include "templates/footer.html" %}
+        {% include "templates/common_js.html" %}
+    </div>
 </body>
 </html>
diff --git a/website/templates/blog/content.html b/website/templates/blog/content.html
index b14616608a6..d3bb1e159d0 100644
--- a/website/templates/blog/content.html
+++ b/website/templates/blog/content.html
@@ -5,7 +5,7 @@
             {% if page.meta.image %}
                 <img class="img-fluid mb-3" src="{{ page.meta.image }}" alt="{{ title }}" title="{{ title }}" />
             {% endif %}
-            <h1 class="display-4 mb-3">{{ title }}</h1>
+            <h1 class="display-2 mt-3 mb-5">{{ title }}</h1>
         </header>
 
         <div class="row">
@@ -63,5 +63,3 @@
         {% endfor %}
     {% endif %}
 </div>
-
-{% include "templates/blog/footer.html" %}
diff --git a/website/templates/blog/nav.html b/website/templates/blog/nav.html
index 4b99f6c380d..2916ea305eb 100644
--- a/website/templates/blog/nav.html
+++ b/website/templates/blog/nav.html
@@ -4,7 +4,7 @@
             <img id="docs-logo-icon" src="/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"/>
         </a>
         <div class="w-100 navbar-text text-left d-none d-md-block">
-            <h2 class="display-6 m-0 p-0 d-inline">
+            <h2 class="display-4 text-reset m-0 p-0 d-inline">
                 <a href="/blog/{{ language }}/" class="text-reset text-decoration-none">
                     {{ config.site_name }}
                 </a>
@@ -32,10 +32,10 @@
                         GitHub
                      </a>
                 </li>
-                <li id="languages-wrapper" class="nav-item dropdown">
+                <li id="languages-wrapper" class="nav-item dropdown mr-3">
                     <div id="languages-dropdown">
                         <a class="nav-link dropdown-toggle d-inline-block text-reset" href="#" id="lang-dropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="32" class="d-inline-block mt-n1" />
+                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="60" class="d-inline-block" />
                         </a>
                         <div class="dropdown-menu" aria-labelledby="lang-dropdown">
                             {% for code, name in config.extra.languages.items() %}
diff --git a/website/templates/careers/greenhouse.html b/website/templates/careers/greenhouse.html
new file mode 100644
index 00000000000..e4a4b3aba4f
--- /dev/null
+++ b/website/templates/careers/greenhouse.html
@@ -0,0 +1,8 @@
+<div id="jobs" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
+    <div class="container">
+		
+		<div id="grnhse_app"></div>
+		<script src="https://boards.greenhouse.io/embed/job_board/js?for=clickhouse"></script>
+
+    </div>
+</div>
diff --git a/website/templates/careers/hero.html b/website/templates/careers/hero.html
new file mode 100644
index 00000000000..dd4e59aeb3a
--- /dev/null
+++ b/website/templates/careers/hero.html
@@ -0,0 +1,10 @@
+<div class="hero bg-primary-light d-flex align-items-center base-hero">
+    <div class="hero-bg other-hero"></div>
+    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
+        
+        <h1 class="display-1 mb-0">
+            {{ _('Careers') }}
+        </h1>
+
+    </div>
+</div>
diff --git a/website/templates/careers/overview.html b/website/templates/careers/overview.html
new file mode 100644
index 00000000000..1601bf4f4b3
--- /dev/null
+++ b/website/templates/careers/overview.html
@@ -0,0 +1,11 @@
+<div class="section bg-white pt-10">
+    <div class="container">
+        
+        <p class="lead text-dark mb-6">
+			ClickHouse is searching  for individuals who are not just knowledgeable about what they do, but want to learn more. Our ideal candidates are thinkers and doers who are not afraid to take on various roles and responsibilities as they grow with the company. If you are looking for a place to build something new, be an agent of change, and have an opportunity to have a significant impact on the company’s success, this is the place for you.
+        </p>
+
+        <hr class="is-yellow">
+
+    </div>
+</div>
diff --git a/website/templates/common_fonts.html b/website/templates/common_fonts.html
new file mode 100644
index 00000000000..eb61aa2c9b5
--- /dev/null
+++ b/website/templates/common_fonts.html
@@ -0,0 +1,3 @@
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Hind+Siliguri:wght@300;500;600;700&family=Noto+Sans:wght@400;700&display=swap" rel="stylesheet">
diff --git a/website/templates/common_meta.html b/website/templates/common_meta.html
index 0c4f5c30785..018d533e893 100644
--- a/website/templates/common_meta.html
+++ b/website/templates/common_meta.html
@@ -1,5 +1,6 @@
 {% set description = description or _('ClickHouse is a fast open-source column-oriented database management system that allows generating analytical data reports in real-time using SQL queries') %}
 <meta charset="utf-8" />
+<META http-equiv="Content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
 
@@ -14,12 +15,12 @@
 {% if page and page.meta.image %}
 <meta property="og:image" content="{{ page.meta.image}}" />
 {% else %}
-<meta property="og:image" content="https://clickhouse.tech/images/logo.png" />
+<meta property="og:image" content="https://clickhouse.com/images/logo.png" />
 {% endif %}
-<meta property="og:url" content="{{ url or 'https://clickhouse.tech/' }}"/>
-<link rel="canonical" href="{{ canonical_url or 'https://clickhouse.tech/' }}" />
+<meta property="og:url" content="{{ url or 'https://clickhouse.com/' }}"/>
+<link rel="canonical" href="{{ canonical_url or 'https://clickhouse.com/' }}" />
 {% if page and not single_page and not is_blog %}
-<link rel="amphtml" href="{{ url or 'https://clickhouse.tech/' }}amp/" />
+<link rel="amphtml" href="{{ url or 'https://clickhouse.com/' }}amp/" />
 {% endif %}
 <link rel="search" href="/opensearch.xml" title="ClickHouse" type="application/opensearchdescription+xml" />
 {% include "templates/docs/ld_json.html" %}
diff --git a/website/templates/company/contact.html b/website/templates/company/contact.html
new file mode 100644
index 00000000000..2538b184fda
--- /dev/null
+++ b/website/templates/company/contact.html
@@ -0,0 +1,53 @@
+<div id="contact" class="section bg-light-orange pb-8 pb-lg-10 pt-8 pt-lg-10 mb-medium-5 mb-lg-10">
+    <div class="container">
+        
+        <h2 class="display-2 text-center mb-3 mb-lg-5">
+            {{ _('Contact Us') }}
+        </h2>
+
+        <div class="pb-5 pt-5 mb-5 position-relative">
+            <div class="bg-gradient-light-orange bg-offset-right"></div>
+
+            <form action="https://webto.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8" method="POST">
+
+                <input type=hidden name="oid" value="00D5f000000JueF">
+                <input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
+
+                <div class="mb-5 mx-auto" style="max-width:860px;">
+                    <div class="row">
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="first_name" placeholder="First Name*" maxlength="40" name="first_name" size="20" type="text" required>
+                        </div>
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="last_name" placeholder="Last Name*" maxlength="80" name="last_name" size="20" type="text" required>
+                        </div>
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="email" placeholder="Email*" maxlength="80" name="email" size="20" type="text" required>
+                        </div>
+                        <div class="form-group col-md-6 mb-3">
+                            <input class="form-control" id="company" placeholder="Company" maxlength="40" name="company" size="20" type="text">
+                        </div>
+                        <div class="form-group col-md-6 mb-3 mb-md-0">
+                            <input class="form-control" id="00N5f000006YIf5" name="00N5f000006YIf5" placeholder="Country" maxlength="80" size="20" type="text">
+                        </div>
+                        <div class="form-group col-md-6">
+                            <textarea class="form-control" id="00N5f000000lOdD" placeholder="Tell us about your use case, other example..." name="00N5f000000lOdD" rows="1" type="text" wrap="soft" required></textarea>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="d-flex justify-content-center">
+                    <input type="submit" name="submit" value="Submit" class="btn btn-lg btn-secondary">
+                </div>
+                
+            </form>
+
+        </div>
+        
+        <p class="text-center text-muted mx-auto w-75">
+            {{ _('If you have any more thoughts or questions, feel free to contact the ClickHouse team directly at') }}
+            <a class="text-blue text-decoration-underline" href="mailto:feedback@clickhouse.com">feedback@clickhouse.com</a>
+        </p>
+
+    </div>
+</div>
diff --git a/website/templates/company/founders.html b/website/templates/company/founders.html
new file mode 100644
index 00000000000..2f6100e28f7
--- /dev/null
+++ b/website/templates/company/founders.html
@@ -0,0 +1,55 @@
+<div class="section bg-white pb-10 pt-10 pt-lg-15">
+    <div class="container">
+
+        <h2 class="display-2 text-center mb-5 mb-md-8 mb-lg-10">
+            {{ _('Meet the Team') }}
+        </h2>
+
+        <h3 class="display-3 text-center mb-3 mb-md-5 mb-lg-8">
+            {{ _('ClickHouse Co-Founders') }}
+        </h3>
+
+        <div class="row">
+            <div class="col-lg-4 mb-3 mb-lg-0 text-center">
+
+                <a href="https://www.linkedin.com/in/yuryizrailevsky/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/yury-izrailevsky.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Yury Izrailevsky') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Co-Founder & President, Product and Engineering') }}
+                </p>
+
+            </div>
+            <div class="col-lg-4 mb-3 mb-lg-0 text-center">
+
+                <a href=" https://www.linkedin.com/in/aaron-katz-5762094/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/aaron-katz.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Aaron Katz') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Co-Founder & CEO') }}
+                </p>
+
+            </div>
+            <div class="col-lg-4 text-center">
+
+                <a href="https://github.com/alexey-milovidov" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/alexey-milovidov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Alexey Milovidov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Co-Founder & CTO') }}
+                </p>
+
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/company/hero.html b/website/templates/company/hero.html
new file mode 100644
index 00000000000..f7d3fbdb529
--- /dev/null
+++ b/website/templates/company/hero.html
@@ -0,0 +1,10 @@
+<div class="hero bg-primary-light d-flex align-items-center base-hero">
+    <div class="hero-bg other-hero"></div>
+    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
+        
+        <h1 class="display-1 mb-0">
+            {{ _('About Us') }}
+        </h1>
+
+    </div>
+</div>
diff --git a/website/templates/company/investors.html b/website/templates/company/investors.html
new file mode 100644
index 00000000000..fbe15ccd8e9
--- /dev/null
+++ b/website/templates/company/investors.html
@@ -0,0 +1,64 @@
+<h2 class="display-2 text-center mb-3 mb-md-5 mb-lg-8">
+    {{ _('ClickHouse Investors') }}
+</h2>
+
+<div class="row mb-10 mb-lg-15">
+    <div class="col-lg-3 col-md-6 mb-3 mb-lg-0 text-center d-flex flex-column">   
+	<a href="https://www.linkedin.com/in/mavolpi/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+            <img src="/images/photos/mike-volpi.jpg">
+        </a>
+        <h3 class="display-4">
+            {{ _('Mike Volpi') }}
+        </h3>
+        <p class="font-lg text-muted mb-3 mx-auto w-75">
+            {{ _('Board Member') }}
+        </p>
+        <img src="/images/logos/logo-index-ventures.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 286px;">
+	    
+
+    </div>
+    <div class="col-lg-3 col-md-6 mb-3 mb-lg-0 text-center d-flex flex-column">
+        <a href="https://www.linkedin.com/in/peter-fenton-0b117/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+            <img src="/images/photos/peter-fenton.jpg">
+        </a>
+        <h3 class="display-4">
+            {{ _('Peter Fenton') }}
+        </h3>
+        <p class="font-lg text-muted mb-3 mx-auto w-75">
+            {{ _('Board Member') }}
+        </p>
+        <img src="/images/logos/logo-benchmark-capital.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 174px;">
+
+    </div>
+    <div class="col-lg-3 col-md-6 mb-3 mb-md-0 text-center d-flex flex-column">
+
+        <a href="https://www.linkedin.com/in/caryn-marooney/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+            <img src="/images/photos/caryn-marooney.jpg">
+        </a>
+        <h3 class="display-4">
+            {{ _('Caryn Marooney') }}
+        </h3>
+        <img src="/images/logos/logo-coatue.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 160px;">
+
+    </div>
+	<div class="col-lg-3 col-md-6 text-center d-flex flex-column">
+
+        <a href="https://www.linkedin.com/in/kevinjwang/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+            <img src="/images/photos/kevin-wang.jpg">
+        </a>
+        <h3 class="display-4">
+            {{ _('Kevin Wang') }}
+        </h3>
+        <img src="/images/logos/logo-altimeter-capital.png" height="36" width="220" class="logo mx-auto mt-auto" style="max-width: 129px;">
+
+    </div>
+</div>
+
+<div class="d-flex flex-wrap align-items-center justify-content-center mb-n5">
+	<img src="/images/logos/logo-yandex.png" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 132px;">
+	<img src="/images/logos/logo-lightspeed.png" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 178px;">
+	<img src="/images/logos/logo-redpoint.png" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 207px;">
+	<img src="/images/logos/logo-almaz-capital.svg" height="48" width="220" class="logo mb-5 mx-3" style="height: 48px; max-width: 273px;">
+	<img src="/images/logos/logo-firstmark.svg" height="36" width="220" class="logo mb-5 mx-3" style="max-width: 264px;">
+	<img src="/images/logos/logo-leadedge-capital.png" height="48" width="220" class="logo mb-5 mx-3" style="height: 48px; max-width: 192px;">
+</div>
diff --git a/website/templates/company/overview.html b/website/templates/company/overview.html
new file mode 100644
index 00000000000..2d95a57ddd8
--- /dev/null
+++ b/website/templates/company/overview.html
@@ -0,0 +1,17 @@
+<div class="section bg-white pt-10">
+    <div class="container">
+   
+        <p class="lead text-dark mb-3">
+            ClickHouse is an open-source column-oriented DBMS (columnar database management system) for online analytical processing (OLAP) that allows users to generate analytical reports using SQL queries in real-time.
+        </p>
+        <p class="lead text-dark mb-3">
+            Its technology works 100-1000x faster than traditional database management systems and processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second. With a widespread user base around the globe, the technology has received praise for its reliability, ease of use, and fault tolerance.
+        </p>
+        <p class="lead text-dark mb-3">
+            In September of 2021 in San Fransisco, CA, ClickHouse incorporated to house the open source technology with an initial $50 million investment from Index Ventures and Benchmark Capital. On October 28, 2021 the company received Series B funding totaling $250 million at an evaluation of $2 billion from Coatue Management, Altimeter Capital, and other investors. The company continues to build the open source project and engineering the cloud technology.
+        </p>
+        
+        <hr class="is-yellow">
+
+    </div>
+</div>
diff --git a/website/templates/company/press.html b/website/templates/company/press.html
new file mode 100644
index 00000000000..ddb2cf584ac
--- /dev/null
+++ b/website/templates/company/press.html
@@ -0,0 +1,109 @@
+<div id="press" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
+    <div class="container">
+        
+        <div class="row">
+            <div class="col-lg-2">
+                    
+                <h2 class="display-2">
+                    {{ _('Press') }}
+                </h2>
+
+            </div>
+
+            <div class="col-lg-10">
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('10/28/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.businesswire.com/news/home/20211028005287/en" rel="external nofollow noreferrer">{{ _('ClickHouse Raises $250M Series B To Scale Groundbreaking OLAP Database Management System Globally') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('The investment was led by Coatue and Altimeter, with participation from Index Ventures, Benchmark, Lightspeed, Redpoint, Almaz, Yandex N.V., FirstMark and Lead Edge.') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.businesswire.com/news/home/20211028005287/en" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                
+                <div class="mb-5">
+                    
+                    <p class="kicker mb-1">
+                        {{ _('10/28/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.bloomberg.com/news/articles/2021-10-28/clickhouse-valued-at-2-billion-in-round-after-yandex-spinout" rel="external nofollow noreferrer">{{ _('Bloomberg Exclusive') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('ClickHouse Valued at $2 Billion in Round After Yandex Spinout.') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.bloomberg.com/news/articles/2021-10-28/clickhouse-valued-at-2-billion-in-round-after-yandex-spinout" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                
+                <div class="mb-5">
+                    
+                    <p class="kicker mb-1">
+                        {{ _('10/28/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://medium.com/lightspeed-venture-partners/why-lightspeed-invested-in-clickhouse-a-database-built-for-speed-b67ec2d5f041" rel="external nofollow noreferrer">{{ _('Lightspeed Perspective') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('Why Lightspeed invested in ClickHouse: a database built for speed.') }}
+                    </p>
+                    <a class="trailing-link" href="https://medium.com/lightspeed-venture-partners/why-lightspeed-invested-in-clickhouse-a-database-built-for-speed-b67ec2d5f041" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                
+                <div class="mb-5">
+                    
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.businesswire.com/news/home/20210920005219/en/ClickHouse-Inc.-Announces-Incorporation-Along-With-50M-In-Series-A-Funding" rel="external nofollow noreferrer">{{ _('ClickHouse, Inc. Announces Incorporation, Along With $50M In Series A Funding') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('New financing will allow the open source success to build a world-class, commercial-grade cloud solution that’s secure, compliant, and convenient for any customer to use.') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.businesswire.com/news/home/20210920005219/en/ClickHouse-Inc.-Announces-Incorporation-Along-With-50M-In-Series-A-Funding" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.businessinsider.com/clickhouse-creators-raise-50-million-for-new-company-2021-9" rel="external nofollow noreferrer">{{ _('Business Insider Exclusive') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('The creators of the popular ClickHouse project just raised $50 million from Index and Benchmark to form a company that will take on Splunk and Druid in the white-hot data space.') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.businessinsider.com/clickhouse-creators-raise-50-million-for-new-company-2021-9" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://www.indexventures.com/perspectives/clickhouse-from-russia-with-love/" rel="external nofollow noreferrer">{{ _('Index Ventures Perspective') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('Our road to ClickHouse started like a good spy novel, with a complex series of introductions over Telegram, clandestine text conversations spanning months before we finally managed to meet the team “face-to-face” (aka over Zoom).') }}
+                    </p>
+                    <a class="trailing-link" href="https://www.indexventures.com/perspectives/clickhouse-from-russia-with-love/" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+
+                <div class="mb-5">
+                    <p class="kicker mb-1">
+                        {{ _('9/20/21') }}
+                    </p>
+                    <h3 class="display-3 mb-3 w-75">
+                        <a class="text-reset" href="https://yandex.com/company/press_center/press_releases/2021/2021-09-20/" rel="external nofollow noreferrer">{{ _('Yandex Perspective') }}</a>
+                    </h3>
+                    <p class="font-lg text-muted mb-3">
+                        {{ _('Yandex announces the spin off of ClickHouse, Inc., a pioneering company focused on open-source column-oriented database management systems (DBMS) for analytical processing. ') }}
+                    </p>
+                    <a class="trailing-link" href="https://yandex.com/company/press_center/press_releases/2021/2021-09-20" rel="external nofollow noreferrer">{{ _('Read More') }}</a>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/company/team.html b/website/templates/company/team.html
new file mode 100644
index 00000000000..fb68be6af08
--- /dev/null
+++ b/website/templates/company/team.html
@@ -0,0 +1,358 @@
+<div class="section">
+    <div class="container pb-10 pb-lg-15 pt-10">
+        <div class="bg-offset-right bg-light"></div>
+
+        <h2 class="display-3 text-center mb-3 mb-md-5 mb-lg-8">
+            {{ _('ClickHouse Team') }}
+        </h2>
+
+        <div class="row mb-8 mb-md-10 mb-lg-15">
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/vitlibar" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/vitaly-baranov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Vitaly Baranov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Principal Sofware Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/ivanblinkov/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/ivan-blinkov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Ivan Blinkov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Product') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/jasonbchan/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/jason-chan.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Jason Chan') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Adviser, Security, Privacy &amp; Compliance') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/vdimir" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/vladimir-cherkasov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Vladimir Cherkasov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/kristinamfrost/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/kristina-frost.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Kristina Frost') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Director, Business Technology') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/mihir-g-3a8010b8/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/mihir-gokhale.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Mihir Gokhale') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Associate, Business Strategy & Ops') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/mike-hayes-54990310/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/mike-hayes.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Mike Hayes') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Sales') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/brianjohnhunter/" target="_blank" class="photo-frame mx-auto">
+                    <img src="/images/photos/brian-hunter.jpg">
+				</a>
+                <h3 class="display-4">
+                    {{ _('Brian Hunter') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Account Executive, AMER') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/kitaisreal/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/maksim-kita.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Maksim Kita') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/KochetovNicolai/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/nikolai-kochetov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Nikolai Kochetov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Engineering Team Lead') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/anne-krechmer-3790162b/" target="_blank" class="photo-frame mx-auto">
+                    <img src="/images/photos/anne-krechmer.jpg">
+				</a>
+                <h3 class="display-4">
+                    {{ _('Anne Krechmer') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Recruiter') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/Avogar" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/pavel-kruglov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Pavel Kruglov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/claire-g-lucas/" target="_blank" class="photo-frame mx-auto">
+                    <img src="/images/photos/claire-lucas.jpg">
+				</a>
+                <h3 class="display-4">
+                    {{ _('Claire Lucas') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Director, Business Strategy &amp; Ops') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/shavoyne-mccowan-668674221/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/shavoyne-mccowan.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Shavoyne McCowan') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Executive Assistant') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/nikitamikhaylov" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/nikita-mikhailov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Nikita Mikhailov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/novikd" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/dmitry-novik.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Dmitry Novik') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/4thom/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/thom-oconnor.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Thom O’Connor') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Support &amp; Services') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/CurtizJ" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/anton-popov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Anton Popov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/richraposa/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/rich-raposa.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Rich Raposa') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Director, Global Learning') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/Alesapin" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/alexander-sapin.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Alexander Sapin') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Engineering Team Lead') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/kssenii" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/kseniia-sumarokova.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Kseniia Sumarokova') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/dorota-szeremeta-a849b7/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/dorota-szeremeta.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Dorota Szeremeta') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, Operations') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://github.com/tavplubix" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/alexander-tokmakov.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Alexander Tokmakov') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Software Engineer') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 mb-3 mb-md-8 text-center">
+
+                <a href="https://www.linkedin.com/in/arnovandriel" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/arno-van-driel.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Arno Van Driel') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('VP, EMEA') }}
+                </p>
+
+            </div>
+            <div class="col-xl-3 col-lg-4 col-md-6 text-center">
+
+                <a href="https://www.linkedin.com/in/%D1%8F%D1%86%D0%B8%D1%88%D0%B8%D0%BD-%D0%B8%D0%BB%D1%8C%D1%8F-9495b535/" target="_blank" class="photo-frame mx-auto" rel="external nofollow">
+                    <img src="/images/photos/ilya-yatsishin.jpg">
+                </a>
+                <h3 class="display-4">
+                    {{ _('Ilya Yatsishin') }}
+                </h3>
+                <p class="font-lg text-muted mb-0 mx-auto w-75">
+                    {{ _('Senior Technical Project Manager') }}
+                </p>
+
+            </div>
+        </div>
+
+        <div class="card mx-auto mb-8 mb-md-10 mb-lg-15 is-large has-dark-border has-pattern w-50">
+            <div class="card-body">
+
+                <h3 class="display-3 text-center">
+                    {{ _('Join the Team') }}
+                </h3>
+
+                <div class="btns">
+                    <a href="/careers/" class="btn btn-outline-secondary" role="button">
+                        {{ _('Apply Now') }}
+                    </a>
+                </div>
+
+            </div>
+        </div>
+
+        <hr class="is-medium is-large mb-8">
+
+        {% include "templates/company/investors.html" %}
+
+    </div>
+</div>
diff --git a/website/templates/contact-thank-you/hero.html b/website/templates/contact-thank-you/hero.html
new file mode 100644
index 00000000000..0e8cef54ce2
--- /dev/null
+++ b/website/templates/contact-thank-you/hero.html
@@ -0,0 +1,14 @@
+<div class="hero bg-primary-light d-flex align-items-center base-hero">
+    <div class="hero-bg other-hero"></div>
+    <div class="container pt-8 pt-lg-10 pt-xl-15 pb-8 pb-lg-10 pb-xl-15">
+        
+        <h1 class="display-1 mb-3">
+            {{ _('Thank You') }}
+        </h1>
+        
+        <p class="lead text-dark mb-0">
+            {{ _('A salesperson will be in contact with you shortly.') }}
+        </p>
+
+    </div>
+</div>
diff --git a/website/templates/contact-thank-you/overview.html b/website/templates/contact-thank-you/overview.html
new file mode 100644
index 00000000000..67728414adc
--- /dev/null
+++ b/website/templates/contact-thank-you/overview.html
@@ -0,0 +1,8 @@
+<div class="section bg-white pt-10">
+    <div class="container">
+        <div class="card bg-dark">
+            <img src="/images/welcome-home.png" height="682" width="2048" class="mx-auto img-fluid">
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/docs/amp.html b/website/templates/docs/amp.html
index e5794465dfc..5d2777af188 100644
--- a/website/templates/docs/amp.html
+++ b/website/templates/docs/amp.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <script async src="https://cdn.ampproject.org/v0.js"></script>
     <title>{{ title }}</title>
-    <link rel="canonical" href="{{ canonical_url or 'https://clickhouse.tech/' }}" />
+    <link rel="canonical" href="{{ canonical_url or 'https://clickhouse.com/' }}" />
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     {% include "templates/docs/ld_json.html" %}
     {% if config.extra.single_page %}
diff --git a/website/templates/docs/content.html b/website/templates/docs/content.html
index 6a9bd1f69d9..3f4db728e99 100644
--- a/website/templates/docs/content.html
+++ b/website/templates/docs/content.html
@@ -1,5 +1,5 @@
-<div id="content-wrapper" class="{% if single_page %}col-md-10{% else %}col-md-8{% endif %} p-2 p-md-4">
-    <div id="content" class="mt-md-n3">
+<div id="content-wrapper" class="{% if single_page %}col-md-10{% else %}col-md-8{% endif %} mt-5 p-2 p-md-4">
+    <div id="content">
         {% if not single_page %}
             {% set ancestors = page.ancestors|reverse|list %}
             {% if page.is_index %}
diff --git a/website/templates/docs/ld_json.html b/website/templates/docs/ld_json.html
index 7170a88dad0..4dea9fa6cbb 100644
--- a/website/templates/docs/ld_json.html
+++ b/website/templates/docs/ld_json.html
@@ -3,7 +3,7 @@
 "@context": "http://schema.org",
 "@type": "{% if is_blog %}BlogPosting{% else %}TechArticle{% endif %}",
 "headline": "{{ title }}",
-"mainEntityOfPage": "{{ url or 'https://clickhouse.tech/' }}",
+"mainEntityOfPage": "{{ url or 'https://clickhouse.com/' }}",
 {% if page.meta.date %}
 "datePublished": "{{ page.meta.date }}",
 "dateModified": "{{ page.meta.date }}",
@@ -11,19 +11,19 @@
 {% if page.meta.published_date %}"datePublished": "{{ page.meta.published_date.isoformat() }}",{% endif %}
 {% if page.meta.modified_date %}"dateModified": "{{ page.meta.modified_date.isoformat() }}",{% endif %}
 {% endif %}
-"image": "{{ page.meta.image or 'https://clickhouse.tech/images/logo-209x60.png' }}",
+"image": "{{ page.meta.image or 'https://clickhouse.com/images/clickhouse-209x60.png' }}",
 "author": {
   "@type": "Project",
   "name": "ClickHouse"
 },
 "publisher": {
   "@type": "Organization",
-  "name": "Yandex LLC",
+  "name": "ClickHouse, Inc.",
   "logo": {
     "@type": "ImageObject",
-    "url": "https://clickhouse.tech/images/yandex.png",
-    "width": 163,
-    "height": 60
+    "url": "https://clickhouse.com/images/logo-400x240.png",
+    "width": 400,
+    "height": 240
   }
 }}{% if not is_blog %}, {
 "@context": "http://schema.org",
diff --git a/website/templates/docs/nav.html b/website/templates/docs/nav.html
index 047914c2b95..4d57d282796 100644
--- a/website/templates/docs/nav.html
+++ b/website/templates/docs/nav.html
@@ -1,4 +1,4 @@
-<nav id="top-nav" class="navbar navbar-dark navbar-expand-md bg-dark-alt text-white sticky-top">
+<nav id="top-nav" class="navbar py-1 navbar-dark navbar-expand-md bg-dark-alt text-white fixed-top">
     <div class="container-fluid justify-content-between">
         <a class="d-block navbar-brand mr-3" href="/">
             <img id="docs-logo-icon" src="/images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo"/>
@@ -24,18 +24,18 @@
                 {% endif %}
                 {% if edit_url %}
                 <li id="edit-wrapper" class="nav-item">
-                    <a id="edit-link" href="{{ edit_url }}" title="Edit this article" class="nav-link" rel="external nofollow noreferrer" target="_blank"><img src="/images/mkdocs/edit.svg" alt="Edit this article" class="mt-1" height="22" /></a>
+                    <a id="edit-link" href="{{ edit_url }}" title="Edit this article" class="nav-link" rel="external nofollow noreferrer" target="_blank"><img src="/images/mkdocs/edit.svg" alt="Edit this article" height="60" /></a>
                 </li>
                 {% endif %}
                 <li class="nav-item">
                      <a class="nav-link" href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer">
-                        <img src="/images/index/github.svg" alt="GitHub repository" title="Go to GitHub" height="32" />
+                        <img src="/images/index/github.svg" alt="GitHub repository" title="Go to GitHub" height="72" />
                     </a>
                 </li>
-                <li id="languages-wrapper" class="nav-item dropdown">
+                <li id="languages-wrapper" class="nav-item dropdown mr-3">
                     <div id="languages-dropdown">
                         <a class="nav-link dropdown-toggle d-inline-block mt-1 text-muted" href="#" id="lang-dropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="32" class="d-inline-block mt-n1" />
+                            <img src="/images/flags/{{ language }}.svg" alt="{{ config.extra.languages[language] }}" title="{{ config.extra.languages[language] }}" width="60" class="d-inline-block mt-n1" />
                         </a>
                         <div class="dropdown-menu bg-dark" aria-labelledby="lang-dropdown">
                             {% for code, name in config.extra.languages.items() %}
diff --git a/website/templates/footer.html b/website/templates/footer.html
index 1eaf519b58b..71c0923981e 100644
--- a/website/templates/footer.html
+++ b/website/templates/footer.html
@@ -1,16 +1,15 @@
 {% if not no_footer %}
-<div id="footer" class="{{ footer_class or 'bg-dark text-muted' }}">
-    <div class="container {{ footer_container_class or 'py-3' }}">
-        <div class="row">
-            <div class="col-lg-8 text-left">
-                <a href="https://github.com/ClickHouse/ClickHouse/blob/master/LICENSE"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">
-        {{ _('ClickHouse source code is published under the Apache 2.0 License.') }}</a> {{ _('Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.') }}
-            </div>
-            <div class="col-lg-4 text-right">
-                &copy; 2016–2021 <a href="https://yandex.com/company/" rel="external nofollow noreferrer" target="_blank" class="text-muted">{{ _('Yandex LLC') }}</a>
-            </div>
+<div class="footer font-xs {{ footer_class or 'bg-light text-muted' }}">
+    <div class="container d-flex align-items-center {{ footer_container_class or 'py-2' }}">
+
+        <div class="footer-copy font-weight-bold">
+            &copy; 2016–2021 {{ _('ClickHouse, Inc.') }}
         </div>
+
+        <div class="footer-license ml-4">
+            {{ _('ClickHouse source code is published under the Apache 2.0 License.') }}</a> {{ _('Software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.') }}
+        </div>
+
     </div>
 </div>
 {% endif %}
diff --git a/website/templates/global/github_stars.html b/website/templates/global/github_stars.html
new file mode 100644
index 00000000000..668938fcf58
--- /dev/null
+++ b/website/templates/global/github_stars.html
@@ -0,0 +1 @@
+<script async defer src="https://buttons.github.io/buttons.js"></script>
diff --git a/website/templates/global/nav.html b/website/templates/global/nav.html
new file mode 100644
index 00000000000..d775c88e4a5
--- /dev/null
+++ b/website/templates/global/nav.html
@@ -0,0 +1,60 @@
+<nav id="top-nav" class="navbar navbar-clickhouse navbar-expand-lg sticky-top bg-white">
+    <div class="container">
+
+        <nav class="navbar-super mb-2 d-none d-xs-block">
+            <ul class="d-flex align-items-center justify-content-end mb-0">
+                <li class="height-20">
+                    <a class="github-button" href="https://github.com/ClickHouse/ClickHouse" data-show-count="true" aria-label="Star ClickHouse/ClickHouse on GitHub" rel="external nofollow">Star</a>
+                </li>
+                <li>
+                    <a href="/blog/en/">
+                        <img src="/images/icons/icon-blog-black.svg">
+                        Blog
+                    </a>
+                </li>
+                <li>
+                    <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg" target="_blank" rel="external nofollow">
+                        <img src="/images/icons/icon-slack-black.svg">
+                        Slack
+                    </a>
+                </li>
+                <li>
+                    <a href="https://www.youtube.com/c/ClickHouseDB" target="_blank" rel="external nofollow">
+                        <img src="/images/icons/icon-youtube-black.svg">
+                        YouTube
+                </a>
+                </li>
+            </ul>
+        </nav>
+
+        <a class="navbar-brand navbar-brand-clickhouse" href="/" title="ClickHouse"></a>
+
+        <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-toggle" aria-controls="navbar-toggle" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon text-dark"></span>
+        </button>
+
+        <div id="navbar-toggle" class="collapse navbar-collapse">
+            <ul class="navbar-nav ml-auto justify-content-center justify-content-lg-end">
+                <li class="nav-item">
+                    <a class="nav-link" href="/#quick-start">Quick Start</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/docs/en/">Documentation</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/learn/">Learn</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/company/">Company</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/careers/">Careers</a>
+                </li>
+                <li class="nav-item">
+                    <a class="btn btn-outline-tertiary" href="/company/#contact">Contact Us</a>
+                </li>
+            </ul>
+        </div>
+
+    </div>
+</nav>
diff --git a/website/templates/global/newsletter.html b/website/templates/global/newsletter.html
new file mode 100644
index 00000000000..ef0809760e6
--- /dev/null
+++ b/website/templates/global/newsletter.html
@@ -0,0 +1,40 @@
+<div class="section bg-white pt-10 pb-10 pb-lg-12">
+    <div class="section-bg bg-footer-cta"></div>
+    <div class="container">
+
+        <h2 class="display-2 mb-7 mx-auto text-center w-75">
+            {{ _('Stay informed on feature releases, product roadmap, and future support and cloud offerings! ') }}
+        </h2>
+    
+        <div class="card bg-primary-light is-large">
+            <div class="card-body d-flex flex-column flex-lg-row align-items-center">
+
+                <h2 class="display-3 mb-3 mb-lg-0">
+                    {{ _('Sign up for our newsletter') }}
+                </h2>
+
+                <div class="mx-auto mr-lg-0 pl-0 pl-lg-3" style="flex-grow: 1; max-width: 544px; position: relative;">
+
+                    <form action="https://webto.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8" method="POST">
+
+                        <input type=hidden name="oid" value="00D5f000000JueF">
+                        <input type=hidden name="retURL" value="https://clickhouse.com/thank-you/">
+        
+                        <div class="d-flex" style="max-width: 520px;">
+                            <div style="flex-basis: 400px;">
+                                <input class="form-control" id="email" placeholder="Email*" maxlength="80" name="email" size="20" type="text" required style="border-radius:6px 0 0 6px;">
+                            </div>
+                            <div style="flex-basis: 120px;">
+                                <input type="submit" name="submit" value="Sign Up" class="btn btn-secondary" style="border-radius: 0 6px 6px 0;">
+                            </div>
+                        </div>
+                        
+                    </form>
+                    
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/website/templates/index/community.html b/website/templates/index/community.html
index 28e9f12ce93..08ccf0c7580 100644
--- a/website/templates/index/community.html
+++ b/website/templates/index/community.html
@@ -1,215 +1,165 @@
-<div class="bg-secondary-alt my-5 py-5">
+<div id="community"></div>
+<div class="section pb-lg-10 pt-10 pt-lg-15">
     <div class="container">
-        <h2 id="community" class="display-4 text-white mb-5">{{ _('ClickHouse community') }}</h2>
-        <div class="row mb-5">
-            <div class="col-lg">
-                <div class="row">
-                    <div class="col text-center mb-3">
-                        <a href="https://www.youtube.com/c/ClickHouseDB"
-                            rel="external nofollow noreferrer" target="_blank">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/youtube.svg"
-                                     alt="{{ _('ClickHouse YouTube Channel') }}"
-                                     title="{{ _('ClickHouse YouTube Channel') }}"
-                                     class="bg-secondary-alt rounded-circle p-2" />
-                            </div>
-                        </a>
-                    </div>
 
-                    <div class="col text-center mb-3">
-                        <a href="https://twitter.com/ClickHouseDB"
-                            rel="external nofollow noreferrer" target="_blank">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/twitter.svg"
-                                     alt="{{ _('ClickHouse Official Twitter Account') }}"
-                                     title="{{ _('ClickHouse Official Twitter Account') }}"
-                                     class="bg-secondary-alt rounded-circle p-2" />
-                            </div>
-                        </a>
-                    </div>
-                </div>
-                <div class="row mb-3">
-                    <div class="col-lg">
-                        <div class="bg-dark p-4">
-                            <img data-src="/images/index/telegram.svg"
-                                 alt="{{ _('ClickHouse at Telegram') }}"
-                                 title="{{ _('ClickHouse at Telegram') }}"
-                                 class="bg-secondary-alt rounded-circle p-2 mb-4" />
-                            <h5 class="text-white mb-lg-3">Telegram</h5>
-                            <p class="text-muted">{{ _('Chat with real users in ') }}<a
-                               href="https://telegram.me/clickhouse_en"
-                               rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                                <span class="text-yellow">{{ _('English') }}</span>
-                            </a> {{ _('or in') }}
-                            <a href="https://telegram.me/clickhouse_ru"
-                               rel="external nofollow noreferrer" target="_blank" class="text-decoration-none"><span class="text-yellow">{{ _('Russian') }}</span></a></p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg">
-                <div class="row mb-3">
-                    <div class="col">
-                        <a href="https://github.com/ClickHouse/ClickHouse/issues/new/choose"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/github.svg"
-                                     alt="ClickHouse GitHub"
-                                     title="ClickHouse GitHub"
-                                     class="bg-secondary-alt rounded-circle p-2 mb-4" />
-                                <h5 class="text-yellow mb-lg-3">GitHub</h5>
-                                <p class="text-muted">{{ _('Open GitHub issue to ask for help or to file a feature request') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/slack.svg"
-                                     alt="{{ _('ClickHouse Slack Workspace') }}"
-                                     title="{{ _('ClickHouse Slack Workspace') }}"
-                                     class="bg-secondary-alt rounded-circle p-2 mr-4 float-left"
-                                     width="64" height="64"/>
-
-                                <h5 class="text-yellow">Slack</h5>
-                                <p class="text-muted mb-2">{{ _('Multipurpose public hangout') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-lg">
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <a href="https://stackoverflow.com/questions/tagged/clickhouse"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/stack-overflow.svg"
-                                     alt="ClickHouse at Stack Overflow"
-                                     title="ClickHouse at Stack Overflow"
-                                     class="bg-secondary-alt rounded-circle p-2 mr-4 float-left" />
-
-                                <h5 class="text-yellow">Stack Overflow</h5>
-                                <p class="text-muted mb-2">{{ _('Ask any questions') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <div class="bg-dark p-4">
-                            <img data-src="/images/index/blog.svg"
-                                 alt="ClickHouse Blog"
-                                 title="ClickHouse Blog"
-                                 class="bg-secondary-alt rounded-circle p-2 mr-4 float-left" />
-
-                            <h5 class="text-white">{{ _('ClickHouse Blog') }}</h5>
-                            <p class="text-muted mb-2">{{ _('in') }} <a href="/blog/en/" class="text-decoration-none"><span class="text-yellow">{{ _('English') }}</span></a>
-                                or in <a href="/blog/ru/" class="text-decoration-none"><span class="text-yellow">{{ _('Russian') }}</span></a></p>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row mb-3">
-                    <div class="col w-100">
-                        <a href="https://groups.google.com/group/clickhouse"
-                            rel="external nofollow noreferrer" target="_blank" class="text-decoration-none">
-                            <div class="bg-dark p-4">
-                                <img data-src="/images/index/google-groups.svg"
-                                     alt="{{ _('ClickHouse at Google Groups') }}"
-                                     title="{{ _('ClickHouse at Google Groups') }}"
-                                     class="bg-secondary-alt rounded-circle p-2 mr-4 float-left" />
-
-                                <h5 class="text-yellow">Google Group</h5>
-                                <p class="text-muted mb-2">{{ _('Email discussions') }}</p>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
         <div class="row">
-            <div class="col">
-                <h3 class="display-5 text-white">{{ _('Like ClickHouse?') }}</h3>
-                <p class="lead text-white">{{ _('Help to spread the word about it via') }} <a rel="external nofollow noreferrer" target="_blank" href="https://www.facebook.com/sharer.php?u=https://clickhouse.tech" class="text-decoration-none"><span class="text-yellow">Facebook</span></a>,
-                    <a rel="external nofollow noreferrer" target="_blank" href="https://twitter.com/intent/tweet?url=https://clickhouse.tech" class="text-decoration-none"><span class="text-yellow">Twitter</span></a> {{ _('and') }} <a rel="external nofollow noreferrer" target="_blank" href="https://www.linkedin.com/shareArticle?url=https://clickhouse.tech" class="text-decoration-none"><span class="text-yellow">LinkedIn</span></a>!</p>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-<div>
-    <div class="container">
-        <h2 id="meet" class="display-4 mt-5">{{ _('Hosting ClickHouse Meetups') }}</h2>
-        <div class="row">
-            <div class="col-lg  my-3">
-                <p class="lead">
-                    {{ _('ClickHouse meetups are essential for strengthening community worldwide, but they couldn\'t be possible without the help of local organizers. Please, fill this form if you want to become one or want to meet ClickHouse core team for any other reason.') }}
-                </p>
-                <img data-src="/images/index/meetup.svg" alt="{{ _('ClickHouse Meetup') }}" title="{{ _('ClickHouse Meetup') }}" class="img-fluid mt-5" />
-            </div>
-
-            <div class="col-lg">
-                <form id="meetup-form" action="" method="post">
-                  <div class="form-group my-3">
-                    <input type="text" class="form-control" name="name" placeholder="{{ _('Name') }} *" required="true">
-                  </div>
-                  <div class="form-group">
-                    <input type="email" class="form-control" name="email" placeholder="{{ _('Email') }} *" required="true">
-                  </div>
-                  <div class="form-group">
-                    <input type="text" class="form-control" name="company" placeholder="{{ _('Company') }} *" required="true">
-                  </div>
-                  <div class="form-group">
-                    <input type="text" class="form-control" name="city" placeholder="{{ _('City') }} *" required="true">
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-host-meetup" name="want-host-meetup">
-                    <label class="form-check-label" for="want-host-meetup">
-                        {{ _('We\'d like to host a public ClickHouse Meetup') }}
-                    </label>
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-invite-to-office" name="want-invite-to-office">
-                    <label class="form-check-label" for="want-invite-to-office">
-                        {{ _('We\'d like to invite Yandex ClickHouse team to our office') }}
-                    </label>
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-invite-to-event" name="want-invite-to-event">
-                    <label class="form-check-label" for="want-invite-to-event">
-                        {{ _('We\'d like to invite Yandex ClickHouse team to another event we organize') }}
-                    </label>
-                  </div>
-                  <div class="form-group form-check">
-                    <input type="checkbox" class="form-check-input" id="want-commercial" name="want-commercial">
-                    <label class="form-check-label" for="want-commercial">
-                        {{ _('We\'re interested in commercial consulting, support or managed service') }}
-                    </label>
-                  </div>
-                   <div class="form-group">
-                    <textarea class="form-control" name="comments" rows="5" placeholder="{{ _('Additional comments') }}"></textarea>
-                  </div>
-                  <button id="meetup-form-send" type="submit" class="btn btn-yellow w-100 text-center">{{ _('Send') }}</button>
-                  <div id="meetup-form-error"></div>
-                </form>
-            </div>
-        </div>
-
-        <div class="row my-5">
-            <div class="col">
-                <p class="lead">
-                    {{ _('If you have any more thoughts or questions, feel free to contact Yandex ClickHouse team directly at') }}
-                        <a id="feedback_email" href="">{{ _('turn on JavaScript to see email address') }}</a>.
-                </p>
+            <div class="col-lg-4 mb-5 mb-lg-0">
+
+                <h2 class="display-2 mb-3 mb-lg-5" style="max-width: 400px;">
+                    {{ _('Join our growing ClickHouse community') }}
+                </h2>
+
+                <div>
+                    <a href="/blog/en/" class="btn btn-outline-secondary" role="button" rel="nofollow">
+                        {{ _('See Our Blog') }}
+                    </a>
+                </div>
+
+            </div>
+            <div class="col-lg-8">
+
+                <div class="bg-inset-right bg-light" style="bottom:40px;top:40px;"></div>
+
+                <div class="row mx-n2">
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-github.svg" alt="ClickHouse GitHub" title="ClickHouse GitHub" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://join.slack.com/t/clickhousedb/shared_invite/zt-rxm3rdrk-lIUmhLC3V8WTaL0TGxsOmg" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-slack.svg" alt="ClickHouse Slack Workspace" title="ClickHouse Slack Workspace" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://stackoverflow.com/questions/tagged/clickhouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-stack-overflow.svg" alt="ClickHouse at Stack Overflow" title="ClickHouse at Stack Overflow" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://groups.google.com/group/clickhouse" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-google.svg" alt="ClickHouse at Google Groups" title="ClickHouse at Google Groups" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://www.youtube.com/c/ClickHouseDB" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-youtube.svg" alt="ClickHouse YouTube Channel" title="ClickHouse YouTube Channel" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://telegram.me/clickhouse_en" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-telegram.svg" alt="ClickHouse at Telegram" title="ClickHouse at Telegram" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 mb-sm-0 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://www.facebook.com/ClickHouseInc/" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-facebook.svg" alt="ClickHouse at Facebook" title="ClickHouse at Facebook" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 mb-4 mb-sm-0 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://twitter.com/ClickhouseDB" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-twitter.svg" alt="ClickHouse at Twitter" title="ClickHouse at Twitter" class="icon mx-auto mb-0">
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="col-lg-4 col-md-2 col-sm-4 col-xs-6 px-2 d-flex align-items-stretch">
+
+                        <div class="embed-responsive embed-responsive-1by1" style="overflow: visible;">
+                            <div class="embed-responsive-item d-flex align-items-stretch">
+                                <a href="https://www.linkedin.com/company/ClickHouseInc/" rel="external nofollow noreferrer" target="_blank" class="card d-flex align-items-stretch text-decoration-none">
+                                    <div class="card-body d-flex align-items-center justify-content-center">
+
+                                        <img data-src="/images/icons/icon-linkedin.png" alt="ClickHouse at LinkedIn" title="ClickHouse at LinkedIn" class="icon mx-auto mb-0">
+
+
+                                    </div>
+                                </a>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
             </div>
         </div>
+
     </div>
 </div>
diff --git a/website/templates/index/efficient.html b/website/templates/index/efficient.html
deleted file mode 100644
index 97d3e0c20ca..00000000000
--- a/website/templates/index/efficient.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<div>
-    <div class="container my-5">
-        <div class="row mb-5">
-            <div class="col-lg">
-                <h2 id="hardware-efficient" class="display-4 my-4">Hardware efficient</h2>
-                <p class="lead">ClickHouse processes typical analytical queries two to three orders of magnitude faster than traditional
-            row-oriented systems with the same available I/O throughput and CPU capacity. Columnar storage format allows fitting
-            more hot data in RAM, which leads to shorter typical response times.</p>
-                <p class="lead">Total cost of ownership could be further lowered by using commodity hardware with rotating disk drives instead of enterprise grade NVMe or SSD without significant sacrifices in latency for most kinds of queries.</p>
-            </div>
-            <div class="col-lg">
-                <img data-src="images/index/hardware-efficient.svg" class="img-fluid" alt="ClickHouse is hardware efficient" title="ClickHouse is hardware efficient" />
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg">
-                <h3>Strives for CPU efficiency</h3>
-                <p>Vectorized query execution involves relevant SIMD processor instructions
-            and runtime code generation. Processing data in columns increases CPU line cache hit rate.</p>
-
-            </div>
-            <div class="col-lg">
-                <h3>Optimizes disk drive access</h3>
-                <p>ClickHouse minimizes the number of seeks for range queries, which increases the efficiency of using rotational
-            disk drives, as it maintains locality of reference for continually stored data.</p>
-            </div>
-            <div class="col-lg">
-                <h3>Minimizes data transfers</h3>
-                <p>ClickHouse enables companies to manage their data and
-            create reports without using specialized networks that are aimed at high-performance computing.</p>
-
-            </div>
-        </div>
-
-
-    </div>
-</div>
-<div>
-    <div class="container text-center">
-        <img data-src="images/curl.svg" alt="ClickHouse не тормозит" title="ClickHouse не тормозит" />
-    </div>
-</div>
diff --git a/website/templates/index/events.html b/website/templates/index/events.html
deleted file mode 100644
index 60edd5787c9..00000000000
--- a/website/templates/index/events.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% if events %}
-<div id="events" class="bg-light my-0">
-     <div class="container py-5">
-         {% if events|length == 1 %}
-             {% set event = events[0] %}
-             <h2>Upcoming Event</h2>
-             <p class="lead">
-                 <a class="text-reset" rel="external nofollow noreferrer" target="_blank"
-                    href="{{ event.signup_link  }}">
-                    <span class="text-orange">{{ event.event_date }}</span>&nbsp;
-                    {{ event.event_name }}
-                 </a>
-             </p>
-         {% else %}
-            <h2>Upcoming Events</h2>
-            <ul class="lead list-unstyled">
-            {% for event in events %}
-                <li>
-                    <a class="text-reset" rel="external nofollow noreferrer" target="_blank"
-                    href="{{ event.signup_link  }}">
-                    <span class="text-orange">{{ event.event_date }}</span>&nbsp;
-                    {{ event.event_name }}
-                 </a>
-                </li>
-            {% endfor %}
-            </ul>
-         {% endif %}
-     </div>
-</div>
-{% endif %}
diff --git a/website/templates/index/features.html b/website/templates/index/features.html
deleted file mode 100644
index 8f6c02d0f79..00000000000
--- a/website/templates/index/features.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="bg-dark text-light">
-    <div class="container py-5 my-5">
-        <div class="row text-center">
-            <div class="col-lg">
-                <h2 id="key-features" class="display-4">ClickHouse. Just makes you think faster!</h2>
-            </div>
-        </div>
-        <div class="row my-3">
-            <div class="col-lg">
-                <ul class="lead list-unstyled  mb-0 mb-lg-1">
-                    <li><span class="text-yellow">•</span> True column-oriented storage</li>
-                    <li><span class="text-yellow">•</span> Vectorized query execution</li>
-                    <li><span class="text-yellow">•</span> Parallel and distributed query execution</li>
-                    <li><span class="text-yellow">•</span> Real-time query processing</li>
-                    <li><span class="text-yellow">•</span> Real-time data ingestion</li>
-                    <li><span class="text-yellow">•</span> On-disk locality of reference</li>
-                    <li><span class="text-yellow">•</span> Secondary data-skipping indexes</li>
-                    <li><span class="text-yellow">•</span> Data compression</li>
-                    <li><span class="text-yellow">•</span> Hot and cold storage separation</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li><span class="text-yellow">•</span> SQL support</li>
-                    <li><span class="text-yellow">•</span> JSON documents query functions</li>
-                    <li><span class="text-yellow">•</span> Features for web and mobile analytics</li>
-                    <li><span class="text-yellow">•</span> High availability</li>
-                    <li><span class="text-yellow">•</span> Cross-datacenter replication</li>
-                    <li><span class="text-yellow">•</span> Local and distributed joins</li>
-                    <li><span class="text-yellow">•</span> Adaptive join algorithm</li>
-                    <li><span class="text-yellow">•</span> Pluggable external dimension tables</li>
-                    <li><span class="text-yellow">•</span> Arrays and nested data types</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li><span class="text-yellow">•</span> Focus on OLAP workloads</li>
-                    <li><span class="text-yellow">•</span> S3-compatible object storage support</li>
-                    <li><span class="text-yellow">•</span> Hadoop, MySQL, Postgres integration</li>
-                    <li><span class="text-yellow">•</span> Approximate query processing</li>
-                    <li><span class="text-yellow">•</span> Probabilistic data structures</li>
-                    <li><span class="text-yellow">•</span> Full support of IPv6</li>
-                    <li><span class="text-yellow">•</span> State-of-the-art algorithms</li>
-                    <li><span class="text-yellow">•</span> Detailed documentation</li>
-                    <li><span class="text-yellow">•</span> Clean documented code</li>
-                </ul>
-            </div>
-        </div>
-        <div class="row mt-5 mb-3">
-            <div class="col-lg text-lg-right my-lg-0 ">
-                <a href="#quick-start" class="btn btn-lg btn-yellow w-50" role="button">Quick start</a>
-            </div>
-            <div class="col-lg mt-lg-0 mt-3">
-                <a href="docs/en/" class="btn btn-lg btn-outline-yellow w-50" role="button">Documentation</a>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/hero.html b/website/templates/index/hero.html
index efa4643e841..b01e79703df 100644
--- a/website/templates/index/hero.html
+++ b/website/templates/index/hero.html
@@ -1,38 +1,45 @@
-<div class="container">
-    <div class="row">
-        <div class="col-lg-7 py-lg-5 py-1">
-            <h1 class="display-5">ClickHouse® is a fast <a href="https://github.com/ClickHouse/ClickHouse" rel="external nofollow noreferrer" target="_blank">open-source</a> OLAP database management system</h1>
-            <p class="lead">It is column-oriented and allows to generate analytical reports using SQL queries in real-time.</p>
-            <div class="row lead my-3">
-                <div class="col-md mb-0 mb-md-1">
-                    <ul class="list-unstyled mb-0 mb-md-1">
-                        <li><a class="text-reset" href="#blazing-fast">✓ Blazing fast</a></li>
-                        <li><a class="text-reset" href="#linearly-scalable">✓ Linearly scalable</a></li>
-                        <li><a class="text-reset" href="#feature-rich">✓ Feature-rich</a></li>
-                    </ul>
-                </div>
-                <div class="col-md">
-                    <ul class="list-unstyled">
-                        <li><a class="text-reset" href="#hardware-efficient">✓ Hardware efficient</a></li>
-                        <li><a class="text-reset" href="#fault-tolerant">✓ Fault-tolerant</a></li>
-                        <li><a class="text-reset" href="#highly-reliable">✓ Highly reliable</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="row lead">
+<div class="hero bg-white">
+    <div class="hero-bg index-hero"></div>
+    <div class="container pt-5 pt-lg-7 pt-xl-15 pb-5 pb-lg-7">
+        
+        <h1 class="display-1 mb-2 mb-xl-3 mx-auto text-center">
+            ClickHouse <span class="text-orange">v21.10 Released</span>
+        </h1>
 
-                <div class="col-lg pb-2">
-                    <a href="https://play.clickhouse.tech/?file=welcome" class="btn btn-lg btn-yellow w-100 mb-3" role="button" target="_blank" rel="external nofollow">Try online demo</a>
-                    <a href="docs/en/commercial/support/" class="btn btn-lg btn-yellow w-100" role="button">Request support</a>
-                </div>
-                <div class="col-lg pb-2">
-                    <a href="#quick-start" class="btn btn-lg btn-outline-orange w-100 mb-3" role="button">Quick start</a>
-                    <a href="docs/en/" class="btn btn-lg btn-outline-orange w-100" role="button">Documentation</a>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-5 py-lg-5 py-1 px-0">
-            <img src="images/index/intro.svg" alt="ClickHouse is capable of generating analytical data reports in real time, with sub-second latencies" title="ClickHouse is capable of generating analytical data reports in real time" class="my-3 img-fluid" />
+        <p class="lead mb-3 mb-lg-5 mb-xl-7 mx-auto text-muted text-center" style="max-width:780px;">
+            {{ _('ClickHouse® is an open-source, high performance columnar OLAP database management system for real-time analytics using SQL.') }}
+        </p>
+        
+        <div class="btns mb-3 mb-xl-5" role="group">
+            <a href="https://clickhouse.com/learn/lessons/whatsnew-clickhouse-21.10/" class="btn btn-lg btn-primary" role="button" style="width: 220px;">Learn More</a>
+            <a href="https://www.youtube.com/watch?v=b9MeoOtAivQ&ab_channel=ClickHouse" class="btn btn-lg btn-outline-primary" role="button" rel="external nofollow" target="_blank" style="width: 220px;">Release Webinar</a>
         </div>
+
+        <p class="d-flex justify-content-center mb-0">
+            <a href="/blog/en/2021/clickhouse-v21.10-released/" class="trailing-link">Read the Blog Post</a>
+        </p>
+
+    </div>
+</div>
+
+<div class="section">
+    <div class="container">
+
+        <div class="card is-large has-highlight">
+            <div class="card-body">
+                
+                <h4 class="text-blue text-center">ClickHouse Announces $250 Million in Funding</h4>
+				
+				<p class="font-lg text-center mb-6 mx-auto">Raising the Company’s Valuation to $2B</p>
+
+                <div class="btns" role="group">
+                    <a href="/blog/en/2021/clickhouse-raises-250m-series-b/" class="btn btn-secondary" role="button" style="width: 228px;">Read the Blog Post</a>
+                    <a href="https://www.bloomberg.com/news/articles/2021-10-28/clickhouse-valued-at-2-billion-in-round-after-yandex-spinout" class="btn btn-outline-secondary" role="button" rel="external nofollow" target="_blank" style="width: 228px;">Read the News</a>
+		    <a href="https://www.businesswire.com/news/home/20211028005287/en" class="btn btn-outline-secondary" role="button" rel="external nofollow" target="_blank" style="width: 228px;">Read the Press Release</a>
+                </div>
+
+            </div>
+        </div>
+
     </div>
 </div>
diff --git a/website/templates/index/nav.html b/website/templates/index/nav.html
deleted file mode 100644
index 9bae81eb73c..00000000000
--- a/website/templates/index/nav.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<nav id="top-nav" class="navbar navbar-expand-lg navbar-light bg-white sticky-top">
-    <div class="container">
-        <a class="navbar-brand" href="#">
-            <img id="logo-icon" src="images/logo.svg" alt="ClickHouse logo" title="ClickHouse logo" />
-            <img id="logo-text" src="images/clickhouse-black.svg" alt="ClickHouse" title="ClickHouse" />
-        </a>
-
-        <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-toggle" aria-controls="navbar-toggle" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon text-dark"></span>
-        </button>
-
-        <div id="navbar-toggle" class="collapse navbar-collapse">
-            <ul class="navbar-nav ml-auto mt-2 mt-lg-0 justify-content-end">
-                <li class="nav-item">
-                    <a class="nav-link" href="#quick-start">Quick start</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="docs/en/">Documentation</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="blog/en/">Blog</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#community">Community</a>
-                </li>
-            </ul>
-        </div>
-    </div>
-</nav>
diff --git a/website/templates/index/performance.html b/website/templates/index/performance.html
index cea327001bf..1be0e4dafe2 100644
--- a/website/templates/index/performance.html
+++ b/website/templates/index/performance.html
@@ -1,44 +1,56 @@
-<div id="blazing-fast" class="bg-dark my-0">
-     <div class="container text-light py-5">
-         <div class="row text-center">
-             <div class="col">
-                 <h2 class="display-4 col-lg-10 mx-auto mb-3">ClickHouse works 100-1000x faster than traditional approaches</h2>
-                 <p class="lead">ClickHouse's performance <a href="benchmark/dbms/">exceeds</a> comparable column-oriented database management systems that are available on the market. It processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second.</p>
+<div id="blazing-fast" class="section bg-white pb-10 pb-lg-15 pt-10 pt-lg-15">
+     <div class="container">
 
-                 <a href="benchmark/dbms/" class="btn btn-lg btn-yellow mt-3 mx-auto" role="button" rel="nofollow">Detailed comparison</a>
-             </div>
-         </div>
-         <div class="row mt-5">
-             <div class="col">
-                <h2 id="independent-benchmarks" class="mb-3">Independent benchmarks</h2>
-             </div>
-         </div>
          <div class="row">
-             <div class="col-lg p-0-lg">
-                 <ul class="list-unstyled">
-                     <li class="mb-3"><a href="https://www.percona.com/blog/2017/02/13/clickhouse-new-opensource-columnar-database/"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse: New Open Source Columnar Database <div class="text-yellow">Percona</div></a></li>
-                    <li class="mb-3"><a href="https://www.percona.com/blog/2017/03/17/column-store-database-benchmarks-mariadb-columnstore-vs-clickhouse-vs-apache-spark/"
-                           title="MariaDB ColumnStore vs. Clickhouse vs. Apache Spark"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">Column Store Database Benchmarks <div class="text-yellow">Percona</div></a></li>
-                    <li class="mb-3"><a href="http://mafiree.com/blogs.php?ref=Benchmark-::-MySQL-Vs-ColumnStore-Vs-Clickhouse"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">MySQL vs ColumnStore vs ClickHouse<div><span class="text-yellow">Mafiree</span></div></a></li>
-                    <li class="mb-3"><a href="https://tech.marksblogg.com/billion-nyc-taxi-rides-clickhouse-cluster.html"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">1.1 Billion Taxi Rides: 108-core ClickHouse Cluster  <div class="text-yellow">Mark Litwintschik</div></a></li>
-                 </ul>
+             <div class="col-lg-6 mb-5 mb-lg-0">
+                 
+                <h2 id="performance" class="display-2 mb-3 mb-lg-5">
+                    ClickHouse works <span class="text-orange">100-1000x</span> faster than traditional approaches
+                </h2>
+
+                <p class="lead text-muted mb-3">
+                    ClickHouse's performance <a href="/benchmark/dbms/">exceeds</a> comparable column-oriented database management systems that are available on the market. It processes hundreds of millions to over a billion rows and tens of gigabytes of data per server per second.
+                </p>
+
+                <a href="/benchmark/dbms/" class="btn btn-outline-secondary" role="button" rel="nofollow">
+                    {{ _('Detailed comparison') }}
+                </a>
+
              </div>
-             <div class="col-lg p-0-lg">
-                 <ul class="list-unstyled">
-                    <li class="mb-3"><a href="https://altinity.com/blog/tag/redshift+benchmark/"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse vs Amazon RedShift Benchmarks <div class="text-yellow">Altinity</div></a></li>
-                    <li class="mb-3"><a href="https://carto.com/blog/inside/geospatial-processing-with-clickhouse"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">Geospatial processing with Clickhouse  <div class="text-yellow">Carto</div></a></li>
-                    <li class="mb-3"><a href="https://translate.yandex.com/translate?url=http%3A%2F%2Fwww.clickhouse.com.cn%2Ftopic%2F5a72e8ab9d28dfde2ddc5ea2F&amp;lang=zh-en"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse and Vertica comparison <div><span class="text-yellow">zhtsh</span> <span class="text-muted">(machine translation from Chinese)</span></div></a></li>
-                    <li class="mb-3"><a href="http://brandonharris.io/redshift-clickhouse-time-series/"
-                           rel="external nofollow noreferrer" target="_blank" class="text-reset">ClickHouse, Redshift and 2.5 Billion Rows of Time Series Data<div class="text-yellow">Brandon Harris</div></a></li>
-                 </ul>
+             <div class="col-lg-6">
+                
+                <h2 id="independent-benchmarks" class="display-3 mb-4">Independent benchmarks</h2>
+                
+                <ul class="has-separators">
+                    <li>
+                        <div class="kicker">GitLab</div>
+                        <a href="https://www.youtube.com/watch?v=cMdQsxolcqc" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            ClickHouse vs TimescaleDB
+                        </a>
+                    </li>
+                    <li>
+                        <div class="kicker">Mark Litwintschik</div>
+                        <a href="https://tech.marksblogg.com/billion-nyc-taxi-rides-clickhouse-cluster.html" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            1.1 Billion Taxi Rides: 108-core ClickHouse Cluster
+                        </a>
+                    </li>
+                    <li>
+                        <div class="kicker">Brandon Harris</div>
+                        <a href="http://brandonharris.io/redshift-clickhouse-time-series/" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            ClickHouse, Redshift and 2.5 Billion Rows of Time Series Data
+                        </a>
+                    </li>
+                    <li>
+                        <div class="kicker">Percona</div>
+                        <a href="https://www.percona.com/blog/2020/07/27/clickhouse-and-columnstore-in-the-star-schema-benchmark/" rel="external nofollow noreferrer" target="_blank" class="trailing-link span-full">
+                            ClickHouse vs MariaDB ColumnStore
+                        </a>
+                    </li>
+
+                </ul>
+                    
              </div>
          </div>
+         
      </div>
 </div>
diff --git a/website/templates/index/pullquote.html b/website/templates/index/pullquote.html
new file mode 100644
index 00000000000..db6e2c89e0e
--- /dev/null
+++ b/website/templates/index/pullquote.html
@@ -0,0 +1,18 @@
+<div class="section mt-n15">
+    <div class="container">
+
+        <div class="pullquote text-white">
+            <div class="pullquote-bg bg-gradient-secondary"></div>
+            <div class="pullquote-body">
+                <p class="pullquote-quote">
+                    {{ _('"ClickHouse leading the way in real time for Engineering organizations"') }}
+                </p>
+                <p class="pullquote-citation">
+                    <span class="font-weight-bold">{{ _('Author Name') }}</span>,
+                    {{ _('Company Name') }}
+                </p>
+            </div>
+        </div>
+        
+    </div>
+</div>
diff --git a/website/templates/index/quickstart.html b/website/templates/index/quickstart.html
index 47dfef7dfe1..256340b731a 100644
--- a/website/templates/index/quickstart.html
+++ b/website/templates/index/quickstart.html
@@ -1,73 +1,75 @@
-<div>
-    <div class="container lead">
-    <h2 id="quick-start" class="display-4 mt-5">Quick start</h2>
+<div class="section bg-white pb-0 pb-lg-10" style="overflow: hidden;">
+    <div class="section-bg quickstart-bg"></div>
+    <div class="container">
 
-    <ul class="nav nav-tabs mt-1 small" id="install-tab" role="tablist">
-        <li class="nav-item">
-            <a class="nav-link active" id="deb-tab" data-toggle="tab" href="#deb" role="tab" aria-controls="deb" aria-selected="true" title="deb packages">Ubuntu or Debian</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="rpm-tab" data-toggle="tab" href="#rpm" role="tab" aria-controls="rpm" aria-selected="false" title="rpm packages">CentOS or RedHat</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="tgz-tab" data-toggle="tab" href="#tgz" role="tab" aria-controls="tgz" aria-selected="false" title="tgz packages">Other Linux (x86)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="arm-tab" data-toggle="tab" href="#arm" role="tab" aria-controls="arm" aria-selected="false" title="ARM packages">Linux (ARM)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="mac-x86-tab" data-toggle="tab" href="#mac-x86" role="tab" aria-controls="mac-x86" aria-selected="false" title="Mac x86 packages">Mac (x86)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="mac-arm-tab" data-toggle="tab" href="#mac-arm" role="tab" aria-controls="mac-arm" aria-selected="false" title="Mac ARM packages">Mac (ARM)</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" id="freebsd-tab" data-toggle="tab" href="#freebsd" role="tab" aria-controls="freebsd" aria-selected="false" title="FreeBSD packages">FreeBSD</a>
-        </li>
-        <li class="nav-item">
-            <a class="nav-link" href="/docs/en/commercial/cloud/" role="tab" aria-controls="cloud" aria-selected="false" title="Cloud Service Providers"><strong>Cloud</strong></a>
-        </li>
-    </ul>
+        <h2 id="quick-start" class="display-2 mb-5 mb-md-8 mb-lg-10 text-center">Quick Start</h2>
 
-    <div class="tab-content" id="install-tab-content">
-        <div class="tab-pane show active syntax p-3 my-3" id="deb" role="tabpanel" aria-labelledby="deb-tab">
-            <pre>{% include "install/deb.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="rpm" role="tabpanel" aria-labelledby="rpm-tab">
-            <pre>{% include "install/rpm.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="tgz" role="tabpanel" aria-labelledby="tgz-tab">
-            <pre>{% include "install/tgz.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="arm" role="tabpanel" aria-labelledby="arm-tab">
-            <pre>{% include "install/arm.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="mac-x86" role="tabpanel" aria-labelledby="mac-x86-tab">
-            <pre>{% include "install/mac-x86.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="mac-arm" role="tabpanel" aria-labelledby="mac-arm-tab">
-            <pre>{% include "install/mac-arm.sh" %}</pre>
-        </div>
-        <div class="tab-pane syntax p-3 my-3" id="freebsd" role="tabpanel" aria-labelledby="freebsd-tab">
-            <pre>{% include "install/freebsd.sh" %}</pre>
-        </div>
-    </div>
+        <div class="tabs">
 
-    <p>For other operating systems the easiest way to get started is using
-        <a href="https://hub.docker.com/r/yandex/clickhouse-server/" rel="external nofollow noreferrer"
-           target="_blank">
-            official Docker images of ClickHouse</a>, this is not the only <a href="https://clickhouse.tech/docs/en/getting-started/">option</a> though.
-        Alternatively, you can easily get a running ClickHouse instance or cluster at
-        <a href="https://cloud.yandex.com/services/managed-clickhouse?utm_source=referrals&amp;utm_medium=clickhouseofficialsite&amp;utm_campaign=link1" rel="external nofollow noreferrer" target="_blank">
-            Yandex Managed Service for ClickHouse</a>.
-    </p>
+            <ul class="nav nav-tabs" id="install-tab" role="tablist">
+                <li class="nav-item">
+                    <a class="nav-link active" id="deb-tab" data-toggle="tab" href="#deb" role="tab" aria-controls="deb" aria-selected="true" title="deb packages">Ubuntu or Debian</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="rpm-tab" data-toggle="tab" href="#rpm" role="tab" aria-controls="rpm" aria-selected="false" title="rpm packages">CentOS or RedHat</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="tgz-tab" data-toggle="tab" href="#tgz" role="tab" aria-controls="tgz" aria-selected="false" title="tgz packages">Other Linux (x86)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="arm-tab" data-toggle="tab" href="#arm" role="tab" aria-controls="arm" aria-selected="false" title="ARM packages">Linux (ARM)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="mac-x86-tab" data-toggle="tab" href="#mac-x86" role="tab" aria-controls="mac-x86" aria-selected="false" title="Mac x86 packages">Mac (x86)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="mac-arm-tab" data-toggle="tab" href="#mac-arm" role="tab" aria-controls="mac-arm" aria-selected="false" title="Mac ARM packages">Mac (ARM)</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" id="freebsd-tab" data-toggle="tab" href="#freebsd" role="tab" aria-controls="freebsd" aria-selected="false" title="FreeBSD packages">FreeBSD</a>
+                </li>
+            </ul>
 
-    <p>After you got connected to your ClickHouse server, you can proceed to:</p>
-        <p>
-            <a href="/docs/en/getting-started/tutorial/" class="btn btn-lg btn-outline-orange" role="button">
-                &nbsp;&nbsp;&nbsp;Tutorial&nbsp;&nbsp;&nbsp;
-            </a>&nbsp;&nbsp;
-            <a href="/docs/en/" class="btn btn-lg btn-outline-orange" role="button">Documentation</a>
-        </p>
+            <div class="tabs-body">
+
+                <div class="tab-content mb-5" id="install-tab-content">
+                    <div class="tab-pane show active syntax" id="deb" role="tabpanel" aria-labelledby="deb-tab">
+                        <pre>{% include "install/deb.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="rpm" role="tabpanel" aria-labelledby="rpm-tab">
+                        <pre>{% include "install/rpm.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="tgz" role="tabpanel" aria-labelledby="tgz-tab">
+                        <pre>{% include "install/tgz.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="arm" role="tabpanel" aria-labelledby="arm-tab">
+                        <pre>{% include "install/arm.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="mac-x86" role="tabpanel" aria-labelledby="mac-x86-tab">
+                        <pre>{% include "install/mac-x86.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="mac-arm" role="tabpanel" aria-labelledby="mac-arm-tab">
+                        <pre>{% include "install/mac-arm.sh" %}</pre>
+                    </div>
+                    <div class="tab-pane syntax" id="freebsd" role="tabpanel" aria-labelledby="freebsd-tab">
+                        <pre>{% include "install/freebsd.sh" %}</pre>
+                    </div>
+                </div>
+
+                <p class="font-lg text-dark">
+                    There's a number of <a href="/docs/en/getting-started/">alternative options</a> to get started, most notably the
+                    <a href="https://hub.docker.com/r/clickhouse/clickhouse-server/" rel="external nofollow noreferrer" target="_blank">official Docker images of ClickHouse</a>. To learn more about our future cloud offerings, <a href="/company/#contact">contact us</a>.
+                </p>
+
+                <p class="font-lg text-dark mb-5">After you got connected to your ClickHouse server, you can proceed to:</p>
+
+                <div class="btns justify-content-start">
+                    <a href="/docs/en/getting-started/tutorial/" class="btn btn-secondary" role="button">Tutorial</a>
+                    <a href="/docs/en/" class="btn btn-outline-secondary" role="button">Documentation</a>
+                </div>
+
+            </div>
+
+        </div>
     </div>
 </div>
diff --git a/website/templates/index/rich.html b/website/templates/index/rich.html
deleted file mode 100644
index ec2620e0a86..00000000000
--- a/website/templates/index/rich.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<div>
-    <div class="container py-5">
-
-        <div class="row">
-            <div class="col-lg">
-                <h2 id="feature-rich" class="display-4">Feature-rich SQL database</h2>
-            </div>
-        </div>
-        <div class="row my-lg-5 my-0">
-            <div class="col-lg">
-                <div class="bg-number">1</div>
-                <h4>User-friendly SQL dialect</h4>
-                <p>ClickHouse features a SQL query dialect with a number of built-in analytics capabilities. In addition to common functions that could be found in most DBMS, ClickHouse comes with a lot of domain-specific functions and features for OLAP scenarios out of the box.</p>
-            </div>
-            <div class="col-lg">
-                <div class="bg-number">2</div>
-                <h4>Efficient managing of denormalized data</h4>
-                <p>Column-oriented nature of ClickHouse allows having hundreds or thousands of columns per table without slowing down SELECT queries. It's possible to pack even more data in by leveraging wide range data organizing options, such as arrays, tuples and nested data structures.</p>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg">
-                <div class="bg-number">3</div>
-                <h4>Join distributed or co-located data</h4>
-                <p>ClickHouse provides various options for joining tables. Joins could be either cluster local, they can also access data stored in external systems. There's also an external dictionaries support that provides an alternative more simple syntax for accessing data from an outside source.</p>
-            </div>
-            <div class="col-lg">
-                <div class="bg-number">4</div>
-                <h4>Approximate query processing</h4>
-                <p>Users can control the trade-off between result accuracy and query execution time, which is handy when dealing with multiple terabytes or petabytes of data. ClickHouse also provides probabilistic data structures for fast and memory-efficient calculation of cardinalities and quantiles</p>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/scalable.html b/website/templates/index/scalable.html
deleted file mode 100644
index 672a02f202b..00000000000
--- a/website/templates/index/scalable.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div>
-    <div class="container">
-        <div class="row">
-            <div class="col-lg">
-                <h2 id="linearly-scalable" class="display-4 mt-5">Linearly scalable</h2>
-                <p class="lead">ClickHouse scales well both vertically and horizontally. ClickHouse is easily adaptable to perform either on a cluster with hundreds or thousands of nodes or on a single server or even on a tiny virtual machine. Currently, there are installations with more multiple trillion rows or hundreds of terabytes of data per single node.</p>
-                <p class="lead">
-                    There are many ClickHouse clusters consisting of multiple hundred nodes, including few clusters of Yandex Metrica, while the largest known ClickHouse cluster is well over a thousand nodes.
-                </p>
-            </div>
-            <div class="col-lg">
-                <img data-src="/images/index/linearly-scalable.svg" alt="Lineraly scalable" title="Linearly scalable" class="mt-5" />
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/success.html b/website/templates/index/success.html
index 83b5c1427c9..37b31fb2b1e 100644
--- a/website/templates/index/success.html
+++ b/website/templates/index/success.html
@@ -1,72 +1,246 @@
-<div class="bg-light py-5 my-5">
-    <div class="container text-center">
-        <h2 id="success-stories" class="display-4">Success stories</h2>
-        <div class="row">
-            <div class="col-lg-4 py-3">
-                <a href="https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-lb">
-                        <div class="card-body">
-                            <h4 class="card-title">HTTP and DNS analytics</h4>
-                            <p class="card-text text-muted">by Cloudflare</p>
+<div class="section bg-white pt-10 pt-lg-15">
+    <div class="container">
+
+        <h2 class="display-2 mb-5 mb-md-8 mb-lg-10 text-center text-lg-left">
+            What users are saying
+        </h2>
+        
+        <div class="case-study-cards">
+            <div>
+
+                <div class="card case-study-card is-large open-right">
+                    <div class="case-study-card-wrap">
+
+                        <div class="card-body case-study-card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-yandex.png" height="53" width="220" title="Yandex" style="aspect-ratio: 220 / 53;height: auto;object-fit:contain;object-position:left center;max-width: 140px;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                                    
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('ClickHouse was born and in production inside Yandex over a decade ago and now stores 10’s of trillions of rows of data serving a query throughput of 2TB per second for Yandex Metrica. It has also become the de facto standard inside Yandex for advertising systems, monitoring and observability data, business intelligence, recommendations platforms, OLAP, and even cars telemetry.') }}</p>
+                                    
+                                    <a class="trailing-link" href="/docs/en/introduction/history/">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Stores 10’s of trillions of rows of data</li>
+                                        <li class="font-weight-bold">Query throughput of 2TB per second</li>
+                                        <li class="font-weight-bold">Became de facto standard inside Yandex</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
                         </div>
+
                     </div>
-                </a>
+                </div>
+                
             </div>
-            <div class="col-lg-4 py-3">
-                <a href="docs/en/introduction/history/" class="text-reset text-decoration-none">
-                    <div class="card py-3 dots-cc">
-                        <div class="card-body">
-                            <h4 class="card-title">Yandex Metrica</h4>
-                            <p class="card-text text-muted">The original usecase</p>
+            <div>
+
+                <div class="card case-study-card is-large open-left">
+                    <div class="case-study-card-wrap">
+                            
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-uber.png" height="40" width="114" title="Uber" style="aspect-ratio: 114 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                                    
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('Uber moved it’s logging platform to ClickHouse increasing developer productivity and overall reliability of the platform while seeing 3x data compression, 10x performance increase, and ½ the reduction in hardware cost.') }}</p>
+        
+                                    <a class="trailing-link" href="https://eng.uber.com/logging/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">3x data compression</li>
+                                        <li class="font-weight-bold">10x performance increase</li>
+                                        <li class="font-weight-bold">½ the reduction in hardware cost</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
                         </div>
+
                     </div>
-                </a>
+                </div>
+                
             </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-rb">
-                        <div class="card-body">
-                            <h4 class="card-title">Experimentation</h4>
-                            <p class="card-text text-muted">at Spotify</p>
+            <div>
+
+                <div class="card case-study-card is-large open-right">
+                    <div class="case-study-card-wrap">
+                            
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-ebay.png" height="40" width="100" title="eBay" style="aspect-ratio: 100 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('eBay adopted ClickHouse for their real time OLAP events (Logs + Metrics) infrastructure. The simplified architecture with ClickHouse allowed them to reduce their DevOps activity and troubleshooting, reduced the overall infrastructure by 90%%, and they saw a stronger integration with Grafana and ClickHouse for visualization and alerting.') }}</p>
+        
+                                    <a class="trailing-link" href="https://tech.ebayinc.com/engineering/ou-online-analytical-processing/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Reduced DevOps activity and troubleshooting</li>
+                                        <li class="font-weight-bold">10 times less hardware</li>
+                                        <li class="font-weight-bold">Stronger integration with Grafana</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
                         </div>
+
                     </div>
-                </a>
+                </div>
+                
+            </div>
+            <div>
+
+                <div class="card case-study-card is-large open-left">
+                    <div class="case-study-card-wrap">
+                            
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-cloudflare.svg" height="40" width="246" title="Cloudflare" style="aspect-ratio: 246 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                            
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('Cloudflare was having challenges scaling their CitusDB-based system which had a high TCO and maintenance costs due to the complex architecture. By moving their HTTP analytics data to ClickHouse they were able to scale to 8M requests per second, deleted 10’s of thousands of lines of code, reduced their MTTR, and saw a 7x improvement on customer queries per second they could serve.') }}</p>
+        
+                                    <a class="trailing-link" href="https://blog.cloudflare.com/http-analytics-for-6m-requests-per-second-using-clickhouse/" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Scaled to 8M requests per second</li>
+                                        <li class="font-weight-bold">Reduced their MTTR</li>
+                                        <li class="font-weight-bold">7x improvement on query throughput</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
+                        </div>
+                    
+                    </div>
+                </div>
+                
+            </div>
+            <div>
+
+                <div class="card case-study-card is-large open-right">
+                    <div class="case-study-card-wrap">
+
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-spotify.png" height="40" width="134" title="Spotify" style="aspect-ratio: 134 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                                    
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('Spotify\'s A/B Experimentation platform is serving thousands of sub-second queries per second on petabyte-scale datasets with Clickhouse. They reduced the amount of low-variance work by an order of magnitude and enabled feature teams to self-serve insights by introducing a unified SQL interface for Data Platform and tools for automatic decision making for Experimentation.') }}</p>
+        
+                                    <a class="trailing-link" href="https://www.slideshare.net/glebus/using-clickhouse-for-experimentation-104247173" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Reduced the amount of low-variance work</li>
+                                        <li class="font-weight-bold">Enabled feature teams to self-serve insights</li>
+                                        <li class="font-weight-bold">Tools for automatic decision making</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+                
+            </div>
+            <div>
+
+                <div class="card case-study-card is-large open-left">
+                    <div class="case-study-card-wrap">
+
+                        <div class="card-body case-study-card-body">
+
+                            <img class="d-block mb-3" src="/images/logos/logo-deutsche-bank.png" height="40" width="204" title="Deutsche Bank" style="aspect-ratio: 204 / 40;height: auto;object-fit:contain;object-position:left center;">
+
+                            <div class="row flex-lg-nowrap mx-n2" equalize-heights="case-study-card-row">
+                                <div class="px-2 d-none d-lg-flex flex-column" style="width: 104px;">
+                            
+                                    <div class="case-study-card-toggle mt-auto"></div>
+                                    
+                                </div>
+                                <div class="col-lg-auto pb-5 pb-lg-0 px-2">
+
+                                    <p class="mb-3 text-dark">{{ _('ClickHouse helps serve the Client Analytics platform for reporting, deep data analysis as well as advanced data science to provide Deutsche Bank’s front office a clear view on their client\'s activity and profitability.') }}</p>
+        
+                                    <a class="trailing-link" href="https://bigdatadays.ru/wp-content/uploads/2019/10/D2-H3-3_Yakunin-Goihburg.pdf" rel="external nofollow noreferrer">{{ _('Read the Case Study') }}</a>
+                                    
+                                </div>
+                                <div class="col-lg-3 px-2">
+
+                                    <ul>
+                                        <li class="font-weight-bold">Platform for reporting and deep data analysis</li>
+                                        <li class="font-weight-bold">Advanced data science</li>
+                                        <li class="font-weight-bold">Provide clear view of client's activity and profitability</li>
+                                    </ul>
+                                    
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+                </div>
+                
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-4 py-3">
-                <a href="https://translate.yandex.com/translate?url=http%3A%2F%2Fwww.jianshu.com%2Fp%2F4c86a2478cca&amp;lang=zh-en" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-rb">
-                        <div class="card-body">
-                            <h4 class="card-title">OLAP contest victory</h4>
-                            <p class="card-text text-muted">by Analysys</p>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://translate.yandex.com/translate?url=http%3A%2F%2Fsouslecapot.net%2F2018%2F11%2F21%2Fpatrick-chatain-vp-engineering-chez-contentsquare-penser-davantage-amelioration-continue-que-revolution-constante%2F&lang=fr-en" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-rhb">
-                        <div class="card-body">
-                            <h4 class="card-title">Digital experience analytics</h4>
-                            <p class="card-text text-muted">by ContentSquare</p>
-                        </div>
-                    </div>
-                </a>
-            </div>
-            <div class="col-lg-4 py-3">
-                <a href="https://translate.yandex.com/translate?url=https%3A%2F%2Ftech.geniee.co.jp%2Fentry%2F2017%2F07%2F20%2F160100" class="text-reset text-decoration-none" rel="external nofollow noreferrer" target="_blank">
-                    <div class="card py-3 dots-lb">
-                        <div class="card-body">
-                            <h4 class="card-title">Speeding up Report API</h4>
-                            <p class="card-text text-muted">at Geniee</p>
-                        </div>
-                    </div>
-                </a>
-            </div>
-        </div>
-        <div class="row">
-            <a href="docs/en/introduction/adopters/" class="btn btn-lg btn-outline-orange mx-auto mt-3" role="button">Show more</a>
-        </div>
+        
     </div>
 </div>
diff --git a/website/templates/index/use.html b/website/templates/index/use.html
deleted file mode 100644
index 6fa27782acc..00000000000
--- a/website/templates/index/use.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="bg-light py-5 my-5">
-    <div class="container">
-        <div class="row mb-5">
-            <div class="col-lg">
-                <h2 class="display-5">When to use ClickHouse</h2>
-                <p>For analytics over a stream of clean, well structured and immutable events or logs.
-            It is recommended to put each such stream into a single wide fact table with pre-joined dimensions.</p>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li>✓ Web and App analytics</li>
-                    <li>✓ Advertising networks and RTB</li>
-                    <li>✓ Telecommunications</li>
-                    <li>✓ E-commerce and finance</li>
-                    <li>✓ Information security</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled">
-                    <li>✓ Monitoring and telemetry</li>
-                    <li>✓ Time series</li>
-                    <li>✓ Business intelligence</li>
-                    <li>✓ Online games</li>
-                    <li>✓ Internet of Things</li>
-                </ul>
-            </div>
-        </div>
-        <div class="row text-red">
-            <div class="col-lg">
-                <h2 class="display-5">When NOT to use ClickHouse</h2>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled mb-0 mb-lg-1">
-                    <li>✕ Transactional workloads (OLTP)</li>
-                    <li>✕ Key-value requests with a high rate</li>
-                </ul>
-            </div>
-            <div class="col-lg">
-                <ul class="lead list-unstyled">
-                    <li>✕ Blob or document storage</li>
-                    <li>✕ Over-normalized data</li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/website/templates/index/why.html b/website/templates/index/why.html
index 0364b9198cc..58bb42ffd31 100644
--- a/website/templates/index/why.html
+++ b/website/templates/index/why.html
@@ -1,40 +1,40 @@
-<div>
-    <div class="container my-5 py-3 text-lg-left text-center">
-        <div class="row mb-5">
-            <div class="col-lg text-center">
-                <h2 class="display-4">Why ClickHouse might be the right choice?</h2>
+<div class="section pt-10 pt-lg-15">
+    <div class="container">
+
+        <h2 class="display-2 text-center mb-3">
+            Why ClickHouse
+        </h2>
+
+        <p class="lead text-muted text-center mb-5 mb-md-8 mb-lg-10 mx-auto" style="max-width:740px;">
+            {{ _('Our feature rich and hardware efficient OLAP data management system is the right choice for your organization.') }}
+        </p>
+
+        <div class="row mb-5 mb-md-8 mb-lg-10">
+            <div class="col-lg-6 mb-5 mb-md-8 mb-lg-0 mx-auto mx-lg-0 d-flex flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-performance.svg">
+                <h3 class="display-3">Performance</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse supports best in the industry query performance, while significantly reducing storage requirements through our innovative use of columnar storage and compression.</p>
+                <hr class="is-yellow mt-auto">
             </div>
-        </div>
-        <div class="row mb-5">
-            <div class="col-lg-1">
-                <img data-src="images/index/flash.svg" alt="Blazing fast" title="Blazing fast" />
-            </div>
-            <div class="col-lg-5">
-                <h3 class="display-5">Blazing fast</h3>
-                <p>ClickHouse uses all available hardware to its full potential to process each query as fast as possible. Peak processing performance for a single query stands at more than 2&nbsp;terabytes per second <span class="text-muted">(after decompression, only used columns)</span>. In distributed setup reads are automatically balanced among healthy replicas to avoid increasing latency.</p>
-            </div>
-            <div class="col-lg-1">
-                <img data-src="images/index/safe.svg" alt="Fault tolerant" title="Fault tolerant" />
-            </div>
-            <div class="col-lg-5">
-                <h3 id="fault-tolerant" class="display-5">Fault-tolerant</h3>
-                <p>ClickHouse supports multi-master asynchronous replication and can be deployed across multiple datacenters. All nodes are equal, which allows avoiding having single points of failure. Downtime of a single node or the whole datacenter won't affect the system's availability for both reads and writes.</p>
+            <div class="col-lg-6 d-flex mx-auto mx-lg-0 flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-scalability.svg">
+                <h3 class="display-3">Scalability</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">Battle tested in production, with linear horizontal scalability from single-server deployments to clusters with many thousands of nodes.</p>
+                <hr class="is-yellow mt-auto">
             </div>
         </div>
         <div class="row">
-            <div class="col-lg-1">
-                <img data-src="images/index/heart.svg" alt="Easy to use" title="Easy to use" />
+            <div class="col-lg-6 mb-5 mb-md-8 mb-lg-0 mx-auto mx-lg-0 d-flex flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-reliability.svg">
+                <h3 class="display-3">Reliability</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse deployments feature best in class availability. There are no single points of failure, with the architecture supporting multi-master replication, performing effectively in multi-region configurations.</p>
+                <hr class="is-yellow mt-auto">
             </div>
-            <div class="col-lg-5">
-                <h3 class="display-5">Easy to use</h3>
-                <p>ClickHouse is simple and works out-of-the-box. It streamlines all your data processing: ingest all your structured data into the system and it becomes instantly available for building reports. SQL dialect allows expressing the desired result without involving any custom non-standard API that could be found in some alternative systems.</p>
-            </div>
-            <div class="col-lg-1">
-                <img data-src="images/index/shield.svg" alt="Highly reliable" title="Highly reliable" width="60" />
-            </div>
-            <div class="col-lg-5">
-                <h3 id="highly-reliable" class="display-5">Highly reliable</h3>
-                <p>ClickHouse DBMS can be configured as a purely distributed system located on independent nodes, without any single points of failure. It also includes a lot of enterprise-grade security features and fail-safe mechanisms against human errors.</p>
+            <div class="col-lg-6 d-flex mx-auto mx-lg-0 flex-column align-items-center align-items-lg-start text-center text-lg-left" style="max-width: 560px;">
+                <img class="icon" src="/images/icons/icon-security.svg">
+                <h3 class="display-3">Security</h3>
+                <p class="font-lg text-muted mb-3" style="max-width: 440px;">ClickHouse comes with enterprise grade security features and fail-safe mechanisms protecting against data corruption from application bugs and human errors.</p>
+                <hr class="is-yellow mt-auto">
             </div>
         </div>
     </div>
diff --git a/website/thank-you/index.html b/website/thank-you/index.html
new file mode 100644
index 00000000000..2f1a172e277
--- /dev/null
+++ b/website/thank-you/index.html
@@ -0,0 +1,25 @@
+{% set prefetch_items = [
+    ('/docs/en/', 'document')
+] %}
+
+{% extends "templates/base.html" %}
+
+{% block extra_meta %}
+{% include "templates/common_fonts.html" %}
+{% endblock %}
+
+{% block nav %}
+
+{% include "templates/global/nav.html" %}
+
+{% endblock %}
+
+{% block content %}
+
+{% include "templates/contact-thank-you/hero.html" %}
+{% include "templates/contact-thank-you/overview.html" %}
+
+{% include "templates/global/newsletter.html" %}
+{% include "templates/global/github_stars.html" %}
+
+{% endblock %}
diff --git a/ya.make b/ya.make
deleted file mode 100644
index 7f7c1bbce2f..00000000000
--- a/ya.make
+++ /dev/null
@@ -1,12 +0,0 @@
-# What are "ya.make" files?
-# "ya.make" file is a configuration file for "ya" - an internal Yandex build system that is used to build internal Yandex monorepository.
-# We don't use nor "ya" build system neither the Yandex monorepository for development of ClickHouse and you should not pay attention to these files.
-# But ClickHouse source code is synchronized with internal Yandex monorepository, that's why "ya.make" files exist.
-
-OWNER(g:clickhouse)
-
-RECURSE(
-    base
-    programs
-    src
-)